diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7f92a3c6aa..913320e6b5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @opensearch-project/sql
\ No newline at end of file
+*   @pjfitzgibbons @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @rupal-bq @mengweieric @vamsi-amazon @swiddis @penghuo @seankao-az @MaxKsyunz @Yury-Fridlyand @anirudha @forestmvey @acarbonetto @GumpacG @ykmr1224
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index e47d8d88c0..6472a968d8 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   backport:
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -22,7 +23,8 @@ jobs:
           installation_id: 22958780
 
       - name: Backport
-        uses: VachaShah/backport@v1.1.4
+        uses: VachaShah/backport@v2.2.0
         with:
           github_token: ${{ steps.github_app_token.outputs.token }}
-          branch_name: backport/backport-${{ github.event.number }}
+          head_template: backport/backport-<%= number %>-to-<%= base %>
+          failure_labels: backport-failed
diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
deleted file mode 100644
index 0251debb8d..0000000000
--- a/.github/workflows/bi-connectors.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: Build connectors for BI tools
-
-on:
-  pull_request:
-  push:
-    paths:
-      - 'bi-connectors/PowerBIConnector/**'
-      - 'bi-connectors/TableauConnector/**'
-      - '.github/workflows/bi-connectors.yml'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Pack Tableau JDBC connector
-      id: pack-tableau-jdbc
-      run: |
-        zip -r opensearch_sql_jdbc.taco . -x *.taco
-      working-directory: bi-connectors/TableauConnector/src
-    - name: Prepare Power BI ODBC connector for 'OpenSearch Project'
-      run: |
-        cp OpenSearchProject.pq OpenSearchProject.m
-      working-directory: bi-connectors/PowerBIConnector/src
-    - name: Pack Power BI ODBC connector
-      id: pack-powerbi-odbc-os-proj
-      run: |
-        zip OpenSearchProject.mez *.png *.m *.resx *.pqm
-      working-directory: bi-connectors/PowerBIConnector/src
-    - name: Prepare Power BI ODBC connector for 'Amazon OpenSearch Service'
-      id: prep-powerbi-odbc-amz-os-svc
-      run: |
-        mv OpenSearchProject.m AmazonOpenSearchService.m
-        sed -i 's/<value>OpenSearch Project<\/value>/<value>Amazon OpenSearch Service<\/value>/g' resources.resx
-        sed -i 's/OpenSearch Project/Amazon OpenSearch Service/g' AmazonOpenSearchService.m
-        sed -i 's/OpenSearchProject/AmazonOpenSearchService/g' AmazonOpenSearchService.m
-        sed -i 's/opensearchproject/amazonopensearchservice/g' AmazonOpenSearchService.m
-      working-directory: bi-connectors/PowerBIConnector/src
-    - name: Pack Power BI ODBC connector for 'Amazon OpenSearch Service'
-      id: pack-powerbi-odbc-amz-os-svc
-      run: |
-        zip AmazonOpenSearchService.mez *.png *.m *.resx *.pqm
-      working-directory: bi-connectors/PowerBIConnector/src
-    - name: Upload Tableau JDBC connector
-      if: steps.pack-tableau-jdbc.outcome == 'success'
-      uses: actions/upload-artifact@v2
-      with:
-        name: TableauConnectors
-        path: bi-connectors/TableauConnector/src/opensearch_sql_jdbc.taco
-    - name: Upload Power BI ODBC connectors
-      if: steps.pack-powerbi-odbc-os-proj.outcome == 'success' || (steps.prep-powerbi-odbc-amz-os-svc.outcome == 'success' && steps.pack-powerbi-odbc-amz-os-svc.outcome == 'success')
-      uses: actions/upload-artifact@v2
-      with:
-        name: PBIConnectors
-        path: 'bi-connectors/PowerBIConnector/src/*.mez'
diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml
deleted file mode 100644
index cf30ea89dc..0000000000
--- a/.github/workflows/dco.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Developer Certificate of Origin Check
-
-on: [pull_request]
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Get PR Commits
-        id: 'get-pr-commits'
-        uses: tim-actions/get-pr-commits@v1.1.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: DCO Check
-        uses: tim-actions/dco@v1.1.0
-        with:
-          commits: ${{ steps.get-pr-commits.outputs.commits }}
diff --git a/.github/workflows/integ-tests-with-security.yml b/.github/workflows/integ-tests-with-security.yml
new file mode 100644
index 0000000000..753aff410e
--- /dev/null
+++ b/.github/workflows/integ-tests-with-security.yml
@@ -0,0 +1,89 @@
+name: Security Plugin IT
+
+on:
+  pull_request:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+    paths:
+      - 'integ-test/**'
+      - '.github/workflows/integ-tests-with-security.yml'
+
+jobs:
+  Get-CI-Image-Tag:
+    uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main
+    with:
+      product: opensearch
+
+  security-it-linux:
+    needs: Get-CI-Image-Tag
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 11, 17, 21 ]
+    env:
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+    runs-on: ubuntu-latest
+    container:
+      # using the same image which is used by opensearch-build team to build the OpenSearch Distribution
+      # this image tag is subject to change as more dependencies and updates will arrive over time
+      image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
+      # need to switch to root so that github actions can install runner binary on container without permission issues.
+      options: --user root
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+
+    - name: Build with Gradle
+      run: |
+        chown -R 1000:1000 `pwd`
+        su `id -un 1000` -c "./gradlew integTestWithSecurity"
+
+    - name: Upload test reports
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v3
+      continue-on-error: true
+      with:
+        name: test-reports-${{ matrix.os }}-${{ matrix.java }}
+        path: |
+          integ-test/build/reports/**
+          integ-test/build/testclusters/*/logs/*
+          integ-test/build/testclusters/*/config/*
+
+  security-it-windows-macos:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ windows-latest, macos-13 ]
+        java: [ 11, 17, 21 ]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+
+    - name: Build with Gradle
+      run: ./gradlew integTestWithSecurity
+
+    - name: Upload test reports
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v3
+      continue-on-error: true
+      with:
+        name: test-reports-${{ matrix.os }}-${{ matrix.java }}
+        path: |
+          integ-test/build/reports/**
+          integ-test/build/testclusters/*/logs/*
+          integ-test/build/testclusters/*/config/*
diff --git a/.github/workflows/link-checker.yml b/.github/workflows/link-checker.yml
index ef6d858d84..cbc6dbec17 100644
--- a/.github/workflows/link-checker.yml
+++ b/.github/workflows/link-checker.yml
@@ -18,7 +18,7 @@ jobs:
         id: lychee
         uses: lycheeverse/lychee-action@master
         with:
-          args: --accept=200,403,429,999  "./**/*.html" "./**/*.md" "./**/*.txt" --exclude "http://localhost*" "https://localhost" "https://odfe-node1:9200/" "https://community.tableau.com/docs/DOC-17978" ".*family.zzz" "https://pypi.python.org/pypi/opensearchsql/" "opensearch*" ".*@amazon.com" ".*email.com" "git@github.com" "http://timestamp.verisign.com/scripts/timstamp.dll" ".*/PowerBIConnector/bin/Release"
+          args: --accept=200,403,429,999  "./**/*.html" "./**/*.md" "./**/*.txt" --exclude "https://aws.oss.sonatype.*" "http://localhost*" "https://localhost" "https://odfe-node1:9200/" "https://community.tableau.com/docs/DOC-17978" ".*family.zzz" "https://pypi.python.org/pypi/opensearchsql/" "opensearch*" ".*@amazon.com" ".*email.com" "git@github.com" "http://timestamp.verisign.com/scripts/timstamp.dll" ".*/PowerBIConnector/bin/Release"
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       - name: Fail if there were link errors
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
new file mode 100644
index 0000000000..8adf7ae52c
--- /dev/null
+++ b/.github/workflows/maven-publish.yml
@@ -0,0 +1,38 @@
+name: Publish snapshots to maven
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - 1.*
+      - 2.*
+
+jobs:
+  build-and-publish-snapshots:
+    strategy:
+      fail-fast: false
+    if: github.repository == 'opensearch-project/sql'
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write
+      contents: write
+
+    steps:
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin # Temurin is a distribution of adoptium
+          java-version: 11
+      - uses: actions/checkout@v3
+      - uses: aws-actions/configure-aws-credentials@v1.7.0
+        with:
+          role-to-assume: ${{ secrets.PUBLISH_SNAPSHOTS_ROLE }}
+          aws-region: us-east-1
+      - name: publish snapshots to maven
+        run: |
+          export SONATYPE_USERNAME=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-username --query SecretString --output text)
+          export SONATYPE_PASSWORD=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-password --query SecretString --output text)
+          echo "::add-mask::$SONATYPE_USERNAME"
+          echo "::add-mask::$SONATYPE_PASSWORD"
+          ./gradlew publishPluginZipPublicationToSnapshotsRepository
diff --git a/.github/workflows/sql-cli-test-and-build-workflow.yml b/.github/workflows/sql-cli-test-and-build-workflow.yml
deleted file mode 100644
index 9a8f5052a1..0000000000
--- a/.github/workflows/sql-cli-test-and-build-workflow.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-name: SQL CLI Test and Build
-
-on:
-  pull_request:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-    paths:
-      - 'sql-cli/**'
-      - '.github/workflows/sql-cli-test-and-build-workflow.yml'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: sql-cli
-    strategy:
-      matrix:
-        python-version: [3.8]
-        opensearch-version: [ latest ]
-
-    steps:
-      - name: Checkout SQL CLI
-        uses: actions/checkout@v3
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install Python Dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements-dev.txt
-          pip install setuptools wheel
-      
-        # tests are designed to run against http://localhost:9200, so we have to disable/remove security plugin
-      - name: Download and run OpenSearch
-        run: |
-          docker run -p 9200:9200 -e "discovery.type=single-node" -e "DISABLE_SECURITY_PLUGIN=true" --name test -d opensearchproject/opensearch:${{ matrix.opensearch-version }}
-
-      - name: Wait for cluster to start
-        uses: nick-fields/retry@v2
-        with:
-          timeout_seconds: 1
-          max_attempts: 30
-          command: curl -q localhost:9200
-
-      - name: Run Tox Testing
-        run: tox
-
-      - name: Build Artifact
-        run: python setup.py sdist bdist_wheel
-
-      - name: Create Artifact Path
-        run: |
-          mkdir -p opensearchsql-builds
-          cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: opensearchsql
-          path: sql-cli/opensearchsql-builds
-
-      - name: Clean up container
-        if: always()
-        run: |
-          docker container stop test
-          docker container rm test
diff --git a/.github/workflows/sql-jdbc-test-and-build-workflow.yml b/.github/workflows/sql-jdbc-test-and-build-workflow.yml
deleted file mode 100644
index 2d71c61413..0000000000
--- a/.github/workflows/sql-jdbc-test-and-build-workflow.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: SQL JDBC Java CI
-
-on:
-  pull_request:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-    paths:
-      - 'sql-jdbc/**'
-      - '.github/workflows/sql-jdbc-test-and-build-workflow.yml'
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        java:
-          - 11
-          - 17
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: sql-jdbc
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: ${{ matrix.java }}
-    
-    - name: Build with Gradle
-      run: ./gradlew build test shadowJar
-    
-    - name: Create Artifact Path
-      run: |
-        mkdir -p sql-jdbc-builds
-        cp ./build/libs/*.jar sql-jdbc-builds
-
-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: sql-jdbc
-        path: sql-jdbc/sql-jdbc-builds
diff --git a/.github/workflows/sql-odbc-main.yml b/.github/workflows/sql-odbc-main.yml
deleted file mode 100644
index 5ebfcf4dc3..0000000000
--- a/.github/workflows/sql-odbc-main.yml
+++ /dev/null
@@ -1,179 +0,0 @@
-name: OpenSearch ODBC Driver
-
-on:
-  pull_request:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-    paths:
-      - 'sql-odbc/**'
-      - '.github/workflows/sql-odbc-main.yml'
-
-env:
-  CI_OUTPUT_PATH: "sql-odbc/ci-output"
-  ODBC_LIB_PATH: "./build/odbc/lib"
-  ODBC_BIN_PATH: "./build/odbc/bin"
-  ODBC_BUILD_PATH: "./build/odbc/cmake"
-  VCPKG_X64_INSTALL_PATH: ".\\src\\vcpkg_installed\\x64-windows"
-  VCPKG_X86_INSTALL_PATH: ".\\src\\vcpkg_installed\\x86-windows"
-
-# Tests are disabled (commented out) in all jobs because they are fail and/or outdated
-# Keeping them for the brighten future when we can re-activate them
-jobs:    
-  build-mac:
-    runs-on: macos-12
-    defaults:
-      run:
-        working-directory: sql-odbc
-    steps:
-    - uses: actions/checkout@v3
-    - name: run-cppcheck
-      run: |
-        brew install cppcheck
-        sh run_cppcheck.sh
-    - name: upload-cppcheck-results
-      if: failure()
-      uses: actions/upload-artifact@v3
-      with:
-        name: cppcheck-results
-        path: sql-odbc/cppcheck-results.log
-    - name: get-dependencies
-      run: |
-        brew unlink unixodbc
-        brew install curl
-        brew install cmake
-        brew install libiodbc
-    - name: configure-and-build-driver
-      run: |
-        ./build_mac_release64.sh
-    #- name: test
-    #  run: | 
-    #    bash ./run_test_runner.sh
-    - name: build-installer
-      if: success()
-      run: |
-        cd cmake-build64
-        cmake ../src 
-        make
-        cpack .
-        cd ..
-    - name: create-output
-      if: success()
-      run: |
-        mkdir build-output
-        mkdir test-output
-        mkdir installer
-        cp ./build/odbc/lib/*.dylib build-output/
-        cp ./build/odbc/lib/*.a build-output/
-        cp ./cmake-build64/*.pkg installer/
-    # cp $(ls -d ./build/odbc/bin/* | grep -v "\.") build-output
-    #    cp ./bin64/*.html test-output
-    #    cp ./bin64/*.log test-output
-    - name: upload-build
-      if: success()
-      uses: actions/upload-artifact@v3
-      with:
-        name: mac64-build
-        path: sql-odbc/build-output
-    - name: upload-installer
-      if: success()
-      uses: actions/upload-artifact@v3
-      with:
-        name: mac64-installer
-        path: sql-odbc/installer
-    #- name: upload-test-results
-    #  if: always()
-    #  uses: actions/upload-artifact@v3
-    #  with:
-    #    name: mac-test-results
-    #    path: test-output
-  build-windows32:
-    runs-on: windows-2019
-    defaults:
-      run:
-        working-directory: sql-odbc
-    steps:
-    - uses: actions/checkout@v3
-    - name: Get specific version CMake, v3.18.3
-      uses: lukka/get-cmake@v3.18.3
-    - name: add-msbuild-to-path
-      uses: microsoft/setup-msbuild@v1.0.2
-    - name: configure-and-build-driver
-      run: |
-        .\build_win_release32.ps1
-    - name: build-installer
-      if: success()
-      run: |
-        .\scripts\build_installer.ps1 Release Win32 .\src $Env:ODBC_BUILD_PATH $Env:VCPKG_X86_INSTALL_PATH
-    #- name: test
-    #  run: |
-    #    cp .\\libraries\\VisualLeakDetector\\bin32\\*.* .\\bin32\\Release
-    #    cp .\\libraries\\VisualLeakDetector\\lib32\\*.lib .\\lib32\\Release
-    #    .\run_test_runner.bat
-    - name: prepare-output
-      if: always()
-      run: |
-        .\scripts\prepare_ci_output.ps1 $Env:ODBC_BIN_PATH $Env:ODBC_LIB_PATH $Env:ODBC_BUILD_PATH
-    - name: upload-build
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: windows32-build
-        path: sql-odbc/ci-output/build
-    - name: upload-installer
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: windows32-installer
-        path: sql-odbc/ci-output/installer
-    #- name: upload-test-results
-    #  if: always()
-    #  uses: actions/upload-artifact@v3
-    #  with:
-    #    name: windows-test-results
-    #    path: $CI_OUTPUT_PATH/test
-  build-windows64:
-    runs-on: windows-2019
-    defaults:
-      run:
-        working-directory: sql-odbc
-    steps:
-    - uses: actions/checkout@v3
-    - name: Get specific version CMake, v3.18.3
-      uses: lukka/get-cmake@v3.18.3
-    - name: add-msbuild-to-path
-      uses: microsoft/setup-msbuild@v1.0.2
-    - name: configure-and-build-driver
-      run: |
-        .\build_win_release64.ps1
-    - name: build-installer
-      if: success()
-      run: |
-        .\scripts\build_installer.ps1 Release x64 .\src $Env:ODBC_BUILD_PATH $Env:VCPKG_X64_INSTALL_PATH
-    #- name: test
-    #  run: |
-    #    cp .\\libraries\\VisualLeakDetector\\bin64\\*.* .\\bin64\\Release
-    #    cp .\\libraries\\VisualLeakDetector\\lib64\\*.lib .\\lib64\\Release
-    #    .\run_test_runner.bat
-    - name: prepare-output
-      if: always()
-      run: |
-        .\scripts\prepare_ci_output.ps1 $Env:ODBC_BIN_PATH $Env:ODBC_LIB_PATH $Env:ODBC_BUILD_PATH
-    - name: upload-build
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: windows64-build
-        path: sql-odbc/ci-output/build
-    - name: upload-installer
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: windows64-installer
-        path: sql-odbc/ci-output/installer
-    #- name: upload-test-results
-    #  if: always()
-    #  uses: actions/upload-artifact@v3
-    #  with:
-    #    name: windows-test-results
-    #    path: sql-odbc/ci-output/test-output
diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml
index 25e0387cf3..92089589e0 100644
--- a/.github/workflows/sql-test-and-build-workflow.yml
+++ b/.github/workflows/sql-test-and-build-workflow.yml
@@ -11,26 +11,37 @@ on:
       - '!sql-jdbc/**'
       - '**gradle*'
       - '**lombok*'
-      - '**checkstyle*'
+      - '**spotless*'
       - 'integ-test/**'
       - '**/*.jar'
       - '**/*.pom'
       - '.github/workflows/sql-test-and-build-workflow.yml'
 
 jobs:
-  build:
+  Get-CI-Image-Tag:
+    uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main
+    with:
+      product: opensearch
+
+  build-linux:
+    needs: Get-CI-Image-Tag
     strategy:
       # Run all jobs
       fail-fast: false
       matrix:
-        entry:
-          - { os: ubuntu-latest, java: 11 }
-          - { os: windows-latest, java: 11, os_build_args: -x doctest -x integTest -x jacocoTestReport -x compileJdbc -PbuildPlatform=windows }
-          - { os: macos-latest, java: 11, os_build_args: -x doctest -x integTest -x jacocoTestReport -x compileJdbc }
-          - { os: ubuntu-latest, java: 17 }
-          - { os: windows-latest, java: 17, os_build_args: -x doctest -x integTest -x jacocoTestReport -x compileJdbc -PbuildPlatform=windows }
-          - { os: macos-latest, java: 17, os_build_args: -x doctest -x integTest -x jacocoTestReport -x compileJdbc }
-    runs-on: ${{ matrix.entry.os }}
+        java:
+          - 11
+          - 17
+          - 21
+    env:
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+    runs-on: ubuntu-latest
+    container:
+      # using the same image which is used by opensearch-build team to build the OpenSearch Distribution
+      # this image tag is subject to change as more dependencies and updates will arrive over time
+      image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
+      # need to switch to root so that github actions can install runner binary on container without permission issues.
+      options: --user root
 
     steps:
     - uses: actions/checkout@v3
@@ -39,14 +50,17 @@ jobs:
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: ${{ matrix.entry.java }}
+        java-version: ${{ matrix.java }}
 
     - name: Build with Gradle
-      run: ./gradlew --continue build ${{ matrix.entry.os_build_args }}
+      run: |
+        chown -R 1000:1000 `pwd`
+        su `id -un 1000` -c "./gradlew --continue build"
 
     - name: Run backward compatibility tests
-      if: ${{ matrix.entry.os == 'ubuntu-latest' }}
-      run: ./scripts/bwctest.sh
+      run: |
+        chown -R 1000:1000 `pwd`
+        su `id -un 1000` -c "./scripts/bwctest.sh"
 
     - name: Create Artifact Path
       run: |
@@ -55,21 +69,22 @@ jobs:
 
     # This step uses the codecov-action Github action: https://github.com/codecov/codecov-action
     - name: Upload SQL Coverage Report
-      if: ${{ always() && matrix.entry.os == 'ubuntu-latest' }}
+      if: always()
       uses: codecov/codecov-action@v3
       with:
         flags: sql-engine
         token: ${{ secrets.CODECOV_TOKEN }}
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
-        name: opensearch-sql-${{ matrix.entry.os }}
+        name: opensearch-sql-ubuntu-latest
         path: opensearch-sql-builds
 
     - name: Upload test reports
-      if: ${{ always() && matrix.entry.os == 'ubuntu-latest' }}
-      uses: actions/upload-artifact@v2
+      if: always()
+      uses: actions/upload-artifact@v3
+      continue-on-error: true
       with:
         name: test-reports
         path: |
@@ -82,3 +97,40 @@ jobs:
           protocol/build/reports/**
           legacy/build/reports/**
           plugin/build/reports/**
+
+  build-windows-macos:
+    strategy:
+      # Run all jobs
+      fail-fast: false
+      matrix:
+        entry:
+          - { os: windows-latest, java: 11, os_build_args: -x doctest  -PbuildPlatform=windows }
+          - { os: macos-13, java: 11}
+          - { os: windows-latest, java: 17, os_build_args: -x doctest -PbuildPlatform=windows }
+          - { os: macos-13, java: 17 }
+          - { os: windows-latest, java: 21, os_build_args: -x doctest -PbuildPlatform=windows }
+          - { os: macos-13, java: 21 }
+    runs-on: ${{ matrix.entry.os }}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.entry.java }}
+
+    - name: Build with Gradle
+      run: ./gradlew --continue build ${{ matrix.entry.os_build_args }}
+
+    - name: Create Artifact Path
+      run: |
+        mkdir -p opensearch-sql-builds
+        cp -r ./plugin/build/distributions/*.zip opensearch-sql-builds/
+
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: opensearch-sql-${{ matrix.entry.os }}
+        path: opensearch-sql-builds
diff --git a/.github/workflows/sql-test-workflow.yml b/.github/workflows/sql-test-workflow.yml
deleted file mode 100644
index b5a0c4c852..0000000000
--- a/.github/workflows/sql-test-workflow.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-name: SQL Plugin Tests
-
-on:
-  workflow_dispatch:
-    inputs:
-      name:
-        required: false
-        type: string
-
-run-name:
-  ${{ inputs.name == '' && format('{0} @ {1}', github.ref_name, github.sha) || inputs.name }}
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        java:
-          - 11
-          - 17
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: ${{ matrix.java }}
-    
-    - name: Run tests
-      id: tests
-      run: |
-        # checkstyle
-        ./gradlew :opensearch:checkstyleMain              || echo "* Checkstyle failed for opensearch/src" > report.log
-        ./gradlew :opensearch:checkstyleTest              || echo "* Checkstyle failed for opensearch/test" >> report.log
-        ./gradlew :sql:checkstyleMain                     || echo "* Checkstyle failed for sql/src" >> report.log
-        ./gradlew :sql:checkstyleTest                     || echo "* Checkstyle failed for sql/test" >> report.log
-        ./gradlew :ppl:checkstyleMain                     || echo "* Checkstyle failed for ppl/src" >> report.log
-        ./gradlew :ppl:checkstyleTest                     || echo "* Checkstyle failed for ppl/test" >> report.log
-        ./gradlew :core:checkstyleMain                    || echo "* Checkstyle failed for core/src" >> report.log
-        ./gradlew :core:checkstyleTest                    || echo "* Checkstyle failed for core/test" >> report.log
-        ./gradlew :common:checkstyleMain                  || echo "* Checkstyle failed for common/src" >> report.log
-        ./gradlew :common:checkstyleTest                  || echo "* Checkstyle failed for common/test" >> report.log
-        ./gradlew :legacy:checkstyleMain                  || echo "* Checkstyle failed for legacy/src" >> report.log
-        ./gradlew :legacy:checkstyleTest                  || echo "* Checkstyle failed for legacy/test" >> report.log
-        ./gradlew :protocol:checkstyleMain                || echo "* Checkstyle failed for protocol/src" >> report.log
-        ./gradlew :protocol:checkstyleTest                || echo "* Checkstyle failed for protocol/test" >> report.log
-        ./gradlew :opensearch-sql-plugin:checkstyleMain   || echo "* Checkstyle failed for plugin/src" >> report.log
-        ./gradlew :opensearch-sql-plugin:checkstyleTest   || echo "* Checkstyle failed for plugin/test" >> report.log
-        # Add checkstyle for `integ-test` when fixed
-        # Unit tests
-        ./gradlew :opensearch:test                        || echo "* Unit tests failed for opensearch" >> report.log
-        ./gradlew :ppl:test                               || echo "* Unit tests failed for sql" >> report.log
-        ./gradlew :sql:test                               || echo "* Unit tests failed for ppl" >> report.log
-        ./gradlew :core:test                              || echo "* Unit tests failed for core" >> report.log
-        ./gradlew :protocol:test                          || echo "* Unit tests failed for protocol" >> report.log
-        ./gradlew :opensearch-sql-plugin:test             || echo "* Unit tests failed for plugin" >> report.log
-        ./gradlew :legacy:test                            || echo "* Unit tests failed for legacy" >> report.log
-        # jacoco
-        ./gradlew :opensearch:jacocoTestCoverageVerification             || echo "* Jacoco failed for opensearch" >> report.log
-        ./gradlew :ppl:jacocoTestCoverageVerification                    || echo "* Jacoco failed for sql" >> report.log
-        ./gradlew :sql:jacocoTestCoverageVerification                    || echo "* Jacoco failed for ppl" >> report.log
-        ./gradlew :core:jacocoTestCoverageVerification                   || echo "* Jacoco failed for core" >> report.log
-        ./gradlew :protocol:jacocoTestCoverageVerification               || echo "* Jacoco failed for protocol" >> report.log
-        ./gradlew :opensearch-sql-plugin:jacocoTestCoverageVerification  || echo "* Jacoco failed for plugin" >> report.log
-        # Misc tests
-        ./gradlew :integ-test:integTest                   || echo "* Integration test failed" >> report.log
-        ./gradlew :doctest:doctest                        || echo "* Doctest failed" >> report.log
-        ./scripts/bwctest.sh                              || echo "* Backward compatibility test failed" >> report.log
-        
-    - name: Verify test results
-      run: |
-        if [[ -e report.log ]]
-        then
-          echo "## FAILED TESTS :facepalm::warning::bangbang:" >> $GITHUB_STEP_SUMMARY
-          cat report.log >> $GITHUB_STEP_SUMMARY
-          exit 1
-        fi
-
-    - name: Upload test reports
-      if: always()
-      uses: actions/upload-artifact@v2
-      with:
-        name: test-reports
-        path: |
-          sql/build/reports/**
-          ppl/build/reports/**
-          core/build/reports/**
-          common/build/reports/**
-          opensearch/build/reports/**
-          integ-test/build/reports/**
-          protocol/build/reports/**
-          legacy/build/reports/**
-          plugin/build/reports/**
diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml
deleted file mode 100644
index c837f9669b..0000000000
--- a/.github/workflows/sql-workbench-test-and-build-workflow.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-name: SQL Workbench Test and Build
-
-on:
-  pull_request:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-    paths:
-      - 'workbench/**'
-      - '.github/workflows/sql-workbench-test-and-build-workflow.yml'
-
-env: 
-  PLUGIN_NAME: query-workbench-dashboards
-  OPENSEARCH_VERSION: 'main'
-  OPENSEARCH_PLUGIN_VERSION: 2.5.0.0
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Enable longer filenames
-        if: ${{ matrix.os == 'windows-latest' }}
-        run: git config --system core.longpaths true
-
-      - name: Checkout Plugin
-        uses: actions/checkout@v3
-
-      - name: Checkout OpenSearch Dashboards
-        uses: actions/checkout@v1 # can't update to v3 because `setup-node` fails
-        with:
-          repository: opensearch-project/Opensearch-Dashboards
-          ref: ${{ env.OPENSEARCH_VERSION }}
-          path: OpenSearch-Dashboards
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: "../OpenSearch-Dashboards/.nvmrc"
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Move Workbench to Plugins Dir
-        run: |
-          mv workbench ../OpenSearch-Dashboards/plugins
-
-      - name: OpenSearch Dashboards Plugin Bootstrap
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 60
-          max_attempts: 3
-          command: cd ../OpenSearch-Dashboards/plugins/workbench; yarn osd bootstrap
-
-      - name: Test
-        run: |
-          cd ../OpenSearch-Dashboards/plugins/workbench
-          yarn test:jest --coverage
-
-      - name: Upload coverage
-        if: ${{ always() && matrix.os == 'ubuntu-latest' }}
-        uses: codecov/codecov-action@v3
-        with:
-          flags: query-workbench
-          directory: ../OpenSearch-Dashboards/plugins/workbench
-          token: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Build Artifact
-        run: |
-          cd ../OpenSearch-Dashboards/plugins/workbench
-          yarn build
-          mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip
-
-      - name: Upload Artifact
-        if: always()
-        uses: actions/upload-artifact@v1 # can't update to v3 because upload fails
-        with:
-          name: workbench-${{ matrix.os }}
-          path: ../OpenSearch-Dashboards/plugins/workbench/build
-          
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 67e5bb07e9..b9775dea04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.class
+*.http
 .settings/
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
@@ -33,7 +34,6 @@ gen/
 # git mergetool artifact
 *.orig
 gen
-*.tokens
 
 # Python
 */.venv
@@ -46,3 +46,8 @@ gen
 /.prom.pid.lock
 
 .java-version
+.worktrees
+http-client.env.json
+/doctest/sql-cli/
+/doctest/opensearch-job-scheduler/
+.factorypath
diff --git a/DEVELOPER_GUIDE.rst b/DEVELOPER_GUIDE.rst
index bf9e603930..c4fd6cc2d6 100644
--- a/DEVELOPER_GUIDE.rst
+++ b/DEVELOPER_GUIDE.rst
@@ -113,8 +113,8 @@ Note that missing license header will be detected by Gradle license plugin and f
 Making Code Changes
 ===================
 
-Project Strucure
-----------------
+Project Structure
+-----------------
 
 The plugin codebase is in standard layout of Gradle project::
 
@@ -127,7 +127,7 @@ The plugin codebase is in standard layout of Gradle project::
    ├── THIRD-PARTY
    ├── build.gradle
    ├── config
-   │   └── checkstyle
+   │   └── spotless
    ├── docs
    │   ├── attributions.md
    │   ├── category.json
@@ -141,13 +141,13 @@ The plugin codebase is in standard layout of Gradle project::
    ├── core
    ├── doctest
    ├── opensearch
-   ├── filesystem
    ├── prometheus
    ├── integ-test
    ├── legacy
    ├── plugin
    ├── protocol
    ├── ppl
+   ├── spark
    ├── sql
    ├── sql-cli
    ├── sql-jdbc
@@ -162,7 +162,7 @@ Here are sub-folders (Gradle modules) for plugin source code:
 - ``core``: core query engine.
 - ``opensearch``: OpenSearch storage engine.
 - ``prometheus``: Prometheus storage engine.
-- ``filesystem``: File System storage engine (in development).
+- ``spark`` : Spark storage engine
 - ``protocol``: request/response protocol formatter.
 - ``common``: common util code.
 - ``integ-test``: integration and comparison test.
@@ -170,7 +170,7 @@ Here are sub-folders (Gradle modules) for plugin source code:
 Here are other files and sub-folders that you are likely to touch:
 
 - ``build.gradle``: Gradle build script.
-- ``config``: only Checkstyle configuration files for now.
+- ``config``: only Spotless configuration files for now.
 - ``docs``: documentation for developers and reference manual for users.
 - ``doc-test``: code that run .rst docs in ``docs`` folder by Python doctest library.
 
@@ -185,14 +185,31 @@ Note that other related project code has already merged into this single reposit
 Code Convention
 ---------------
 
-We’re integrated Checkstyle plugin into Gradle build: https://github.com/opensearch-project/sql/blob/main/config/checkstyle/google_checks.xml. So any violation will fail the build. You need to identify the offending code from Gradle error message and fix them and rerun the Gradle build. Here are the highlight of some Checkstyle rules:
+Java files in the OpenSearch codebase are formatted with the Eclipse JDT formatter, using the `Spotless Gradle <https://github.com/diffplug/spotless/tree/master/plugin-gradle>`_ plugin. This plugin is configured in the project  `./gradle.properties`.
+
+The formatting check can be run explicitly with::
+
+./gradlew spotlessJavaCheck
+
+The code can be formatted with::
+
+./gradlew spotlessApply
+
+These tasks can also be run for specific modules, e.g.::
+
+./gradlew server:spotlessJavaCheck
 
-* 2 spaces indentation.
-* No line starts with tab character in source file.
-* Line width <= 100 characters.
-* Wildcard imports: You can enforce single import by configuring your IDE. Instructions for Intellij IDEA: https://www.jetbrains.com/help/idea/creating-and-optimizing-imports.html#disable-wildcard-imports.
-* Operator needs to wrap at next line.
+For more information on the spotless for the OpenSearch project please see `https://github.com/opensearch-project/OpenSearch/blob/main/DEVELOPER_GUIDE.md#java-language-formatting-guidelines <https://github.com/opensearch-project/OpenSearch/blob/main/DEVELOPER_GUIDE.md#java-language-formatting-guidelines>`_.
 
+Java files are formatted using `Spotless <https://github.com/diffplug/spotless>`_ conforming to `Google Java Format <https://github.com/google/google-java-format>`_.
+   * - New line at end of file
+   * - No unused import statements
+   * - Fix import order to be alphabetical with static imports first (one block for static and one for non-static imports)
+   * - Max line length is 100 characters (does not apply to import statements)
+   * - Line spacing is 2 spaces
+   * - Javadocs should be properly formatted in accordance to `Javadoc guidelines <https://www.oracle.com/ca-en/technical-resources/articles/java/javadoc-tool.html>`_
+   * - Javadoc format can be maintained by wrapping javadoc with `<pre></pre>` HTML tags
+   * - Strings can be formatted on multiple lines with a `+` with the correct indentation for the string.
 
 Building and Running Tests
 ==========================
@@ -213,15 +230,19 @@ Most of the time you just need to run ./gradlew build which will make sure you p
    * - ./gradlew generateGrammarSource
      - (Re-)Generate ANTLR parser from grammar file.
    * - ./gradlew compileJava
-     - Compile all Java source files. 
-   * - ./gradlew checkstyle
-     - Run all checks according to Checkstyle configuration.
+     - Compile all Java source files.
    * - ./gradlew test
      - Run all unit tests.
    * - ./gradlew :integ-test:integTest
      - Run all integration test (this takes time).
    * - ./gradlew build
      - Build plugin by run all tasks above (this takes time).
+   * - ./gradlew pitest
+     - Run PiTest mutation testing (see more info in `#1204 <https://github.com/opensearch-project/sql/pull/1204>`_)
+   * - ./gradlew spotlessCheck
+     - Runs Spotless to check for code style.
+   * - ./gradlew spotlessApply
+     - Automatically apply spotless code style changes.
 
 For integration test, you can use ``-Dtests.class`` “UT full path” to run a task individually. For example ``./gradlew :integ-test:integTest -Dtests.class="*QueryIT"``.
 
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index ba4ce45209..0ee07757c6 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,14 +1,39 @@
-# OpenSearch SQL Maintainers
-
-## Maintainers
-
-| Maintainer | GitHub ID | Affiliation |
-| --------------- | --------- | ----------- |
-| Anirudha (Ani) Jadhav | [anirudha](https://github.com/anirudha) | Amazon |
-| Peng Huo | [penghuo](https://github.com/penghuo) | Amazon |
-| Chen Dai | [dai-chen](https://github.com/dai-chen) | Amazon |
-| Chloe Zhang | [chloe-zh](https://github.com/chloe-zh) | Amazon |
-| Nick Knize | [nknize](https://github.com/nknize) | Amazon |
-| Charlotte Henkle | [CEHENKLE](https://github.com/CEHENKLE) | Amazon |
-| Max Ksyunz |  [MaxKsyunz](https://github.com/MaxKsyunz) | BitQuill |
-| Yury Fridlyand | [Yury-Fridlyand](https://github.com/Yury-Fridlyand) | BitQuill |
\ No newline at end of file
+## Overview
+
+This document contains a list of maintainers in this repo. See [opensearch-project/.github/RESPONSIBILITIES.md](https://github.com/opensearch-project/.github/blob/main/RESPONSIBILITIES.md#maintainer-responsibilities) that explains what the role of maintainer means, what maintainers do in this and other repos, and how they should be doing it. If you're interested in contributing, and becoming a maintainer, see [CONTRIBUTING](CONTRIBUTING.md).
+
+## Current Maintainers
+
+| Maintainer        | GitHub ID                                           | Affiliation |
+| ----------------- | -------------------------------------------------   | ----------- |
+| Eric Wei          | [mengweieric](https://github.com/mengweieric)       | Amazon      |
+| Joshua Li         | [joshuali925](https://github.com/joshuali925)       | Amazon      |
+| Shenoy Pratik     | [ps48](https://github.com/ps48)                     | Amazon      |
+| Kavitha Mohan     | [kavithacm](https://github.com/kavithacm)           | Amazon      |
+| Rupal Mahajan     | [rupal-bq](https://github.com/rupal-bq)             | Amazon      |
+| Derek Ho          | [derek-ho](https://github.com/derek-ho)             | Amazon      |
+| Lior Perry        | [YANG-DB](https://github.com/YANG-DB)               | Amazon      |
+| Peter Fitzgibbons | [pjfitzgibbons](https://github.com/pjfitzgibbons)   | Amazon      |
+| Simeon Widdis     | [swiddis](https://github.com/swiddis)               | Amazon      |
+| Chen Dai          | [dai-chen](https://github.com/dai-chen)             | Amazon      |
+| Vamsi Manohar     | [vamsi-amazon](https://github.com/vamsi-amazon)     | Amazon      |
+| Peng Huo          | [penghuo](https://github.com/penghuo)               | Amazon      |
+| Sean Kao          | [seankao-az](https://github.com/seankao-az)         | Amazon      |
+| Anirudha Jadhav   | [anirudha](https://github.com/anirudha)             | Amazon      |
+| Tomoyuki Morita   | [ykmr1224](https://github.com/ykmr1224)             | Amazon      |
+| Max Ksyunz        | [MaxKsyunz](https://github.com/MaxKsyunz)           | Improving   |
+| Yury Fridlyand    | [Yury-Fridlyand](https://github.com/Yury-Fridlyand) | Improving   |
+| Andrew Carbonetto | [acarbonetto](https://github.com/acarbonetto)       | Improving   |
+| Forest Vey        | [forestmvey](https://github.com/forestmvey)         | Improving   |
+| Guian Gumpac      | [GumpacG](https://github.com/GumpacG)               | Improving   |
+
+## Emeritus Maintainers
+
+| Maintainer        | GitHub ID                                               | Affiliation |
+| ----------------- | ------------------------------------------------------- | ----------- |
+| Charlotte Henkle  | [CEHENKLE](https://github.com/CEHENKLE)                 | Amazon      |
+| Nick Knize        | [nknize](https://github.com/nknize)                     | Amazon      |
+| David Cui         | [davidcui1225](https://github.com/davidcui1225)         | Amazon      |
+| Eugene Lee        | [eugenesk24](https://github.com/eugenesk24)             | Amazon      |
+| Zhongnan Su       | [zhongnansu](https://github.com/zhongnansu)             | Amazon      |
+| Chloe Zhang       | [chloe-zh](https://github.com/chloe-zh)                 | Amazon      |
diff --git a/README.md b/README.md
index 0c220838b5..95ad52a147 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,30 @@
 <img src="https://opensearch.org/assets/brand/SVG/Logo/opensearch_logo_default.svg" height="64px"/>
 
 - [OpenSearch SQL](#opensearch-sql)
-- [Code Summary](#code-summary)
-- [Highlights](#highlights)
-- [Documentation](#documentation)
-- [OpenSearch Forum](#forum)
-- [Contributing](#contributing)
-- [Attribution](#attribution)
-- [Code of Conduct](#code-of-conduct)
-- [Security](#security)
-- [License](#license)
-- [Copyright](#copyright)
+  - [Code Summary](#code-summary)
+    - [SQL Engine](#sql-engine)
+    - [Repository Checks](#repository-checks)
+    - [Issues](#issues)
+  - [Highlights](#highlights)
+  - [Documentation](#documentation)
+  - [Forum](#forum)
+  - [Contributing](#contributing)
+  - [Attribution](#attribution)
+  - [Code of Conduct](#code-of-conduct)
+  - [Security](#security)
+  - [License](#license)
+  - [Copyright](#copyright)
 
 # OpenSearch SQL
 
 OpenSearch enables you to extract insights out of OpenSearch using the familiar SQL or Piped Processing Language (PPL) query syntax. Use aggregations, group by, and where clauses to investigate your data. Read your data as JSON documents or CSV tables so you have the flexibility to use the format that works best for you.
 
-The following projects have been merged into this repository as separate folders as of July 9, 2020. Please refer to links below for details. This document will focus on the SQL plugin for OpenSearch.
+The following projects are related to the SQL plugin, but stored in the different repos. Please refer to links below for details. This document will focus on the SQL plugin for OpenSearch.
 
-- [SQL CLI](https://github.com/opensearch-project/sql/tree/main/sql-cli)
-- [SQL JDBC](https://github.com/opensearch-project/sql/tree/main/sql-jdbc)
-- [SQL ODBC](https://github.com/opensearch-project/sql/tree/main/sql-odbc)
-- [Query Workbench](https://github.com/opensearch-project/sql/tree/main/workbench)
+- [SQL CLI](https://github.com/opensearch-project/sql-cli)
+- [SQL JDBC](https://github.com/opensearch-project/sql-jdbc)
+- [SQL ODBC](https://github.com/opensearch-project/sql-odbc)
+- [Query Workbench](https://github.com/opensearch-project/dashboards-query-workbench)
 
 ## Code Summary
 
@@ -34,32 +37,6 @@ The following projects have been merged into this repository as separate folders
 | Distribution build tests     | [![OpenSearch IT tests][opensearch-it-badge]][opensearch-it-link] [![OpenSearch IT code][opensearch-it-code-badge]][opensearch-it-code-link] |
 | Backward compatibility tests | [![BWC tests][bwc-tests-badge]][bwc-tests-link]                                                                                              |
 
-### ODBC Driver
-
-|       |                                                 |
-| ----- | ----------------------------------------------- |
-| Build | [![ODBC CI][odbc-build-badge]][odbc-build-link] |
-
-### SQL CLI
-
-|       |                                                 |
-| ----- | ----------------------------------------------- |
-| Test and build | [![SQL CLI CI][sql-cli-build-badge]][sql-cli-build-link] |
-
-### JDBC Driver
-
-|       |                                                 |
-| ----- | ----------------------------------------------- |
-| Build | [![JDBC CI][jdbc-build-badge]][jdbc-build-link] |
-
-### Query WorkBench
-
-|                          |                                                                                                                    |
-| ------------------------ | ------------------------------------------------------------------------------------------------------------------ |
-| Test and build           | [![Observability Dashboards CI][workbench-build-badge]][workbench-build-link]                                      |
-| Code coverage            | [![codecov][workbench-codecov-badge]][sql-codecov-link]                                                                |
-| Distribution build tests | [![cypress tests][cypress-test-badge]][cypress-test-link] [![cypress code][cypress-code-badge]][cypress-code-link] |
-
 ### Repository Checks
 
 |              |                                                                 |
@@ -82,14 +59,6 @@ The following projects have been merged into this repository as separate folders
 [dco-badge-link]: https://github.com/opensearch-project/sql/actions/workflows/dco.yml
 [link-check-badge]: https://github.com/opensearch-project/sql/actions/workflows/link-checker.yml/badge.svg
 [link-check-link]: https://github.com/opensearch-project/sql/actions/workflows/link-checker.yml
-[odbc-build-badge]: https://github.com/opensearch-project/sql/actions/workflows/sql-odbc-main.yml/badge.svg
-[odbc-build-link]: https://github.com/opensearch-project/sql/actions/workflows/sql-odbc-main.yml
-[sql-cli-build-badge]: https://github.com/opensearch-project/sql/actions/workflows/sql-cli-test-and-build-workflow.yml/badge.svg
-[sql-cli-build-link]: https://github.com/opensearch-project/sql/actions/workflows/sql-cli-test-and-build-workflow.yml
-[jdbc-build-badge]: https://github.com/opensearch-project/sql/actions/workflows/sql-jdbc-test-and-build-workflow.yml/badge.svg
-[jdbc-build-link]: https://github.com/opensearch-project/sql/actions/workflows/sql-jdbc-test-and-build-workflow.yml
-[sql-ci-badge]: https://github.com/opensearch-project/sql/actions/workflows/sql-test-and-build-workflow.yml/badge.svg
-[sql-ci-link]: https://github.com/opensearch-project/sql/actions/workflows/sql-test-and-build-workflow.yml
 [bwc-tests-badge]: https://img.shields.io/badge/BWC%20tests-in%20progress-yellow
 [bwc-tests-link]: https://github.com/opensearch-project/sql/issues/193
 [good-first-badge]: https://img.shields.io/github/issues/opensearch-project/sql/good%20first%20issue.svg
@@ -104,14 +73,7 @@ The following projects have been merged into this repository as separate folders
 [untriaged-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3Auntriaged+
 [nolabel-badge]: https://img.shields.io/github/issues-search/opensearch-project/sql?color=yellow&label=no%20label%20issues&query=is%3Aopen%20is%3Aissue%20no%3Alabel
 [nolabel-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+no%3Alabel+
-[workbench-build-badge]: https://github.com/opensearch-project/sql/actions/workflows/sql-workbench-test-and-build-workflow.yml/badge.svg
-[workbench-build-link]: https://github.com/opensearch-project/sql/actions/workflows/sql-workbench-test-and-build-workflow.yml
-[cypress-test-badge]: https://img.shields.io/badge/Cypress%20tests-in%20progress-yellow
-[cypress-test-link]: https://github.com/opensearch-project/opensearch-build/issues/1124
-[cypress-code-badge]: https://img.shields.io/badge/Cypress%20code-blue
-[cypress-code-link]: https://github.com/opensearch-project/sql/tree/main/workbench/.cypress/integration
 [sql-codecov-badge]: https://codecov.io/gh/opensearch-project/sql/branch/main/graphs/badge.svg?flag=sql-engine
-[workbench-codecov-badge]: https://codecov.io/gh/opensearch-project/sql/branch/main/graphs/badge.svg?flag=query-workbench
 [sql-codecov-link]: https://codecov.io/gh/opensearch-project/sql
 [opensearch-it-badge]: https://img.shields.io/badge/SQL%20IT%20tests-in%20progress-yellow
 [opensearch-it-link]: https://github.com/opensearch-project/opensearch-build/issues/1124
diff --git a/async-query-core/.gitignore b/async-query-core/.gitignore
new file mode 100644
index 0000000000..689cc5c548
--- /dev/null
+++ b/async-query-core/.gitignore
@@ -0,0 +1,42 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!src/main/**/build/
+!src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+out/
+!src/main/**/out/
+!src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!src/main/**/bin/
+!src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
\ No newline at end of file
diff --git a/async-query-core/README.md b/async-query-core/README.md
new file mode 100644
index 0000000000..815088bce6
--- /dev/null
+++ b/async-query-core/README.md
@@ -0,0 +1,34 @@
+# async-query-core library
+
+This directory contains async-query-core library, which implements the core logic of async-query and provide extension points to allow plugin different implementation of data storage, etc.
+`async-query` module provides implementations for OpenSearch index based implementation.
+
+## Type of queries
+There are following types of queries, and the type is automatically identified by analysing the query. 
+- BatchQuery: Execute single query in Spark
+- InteractiveQuery: Establish session and execute queries in single Spark session
+- IndexDMLQuery: Handles DROP/ALTER/VACUUM operation for Flint indices
+- RefreshQuery: One time query request to refresh(update) Flint index
+- StreamingQuery: Continuously update flint index in single Spark session
+
+## Extension points
+Following is the list of extension points where the consumer of the library needs to provide their own implementation.
+
+- Data store interface
+  - [AsyncQueryJobMetadataStorageService](src/main/java/org/opensearch/sql/spark/asyncquery/AsyncQueryJobMetadataStorageService.java)
+  - [SessionStorageService](java/org/opensearch/sql/spark/execution/statestore/SessionStorageService.java)
+  - [StatementStorageService](src/main/java/org/opensearch/sql/spark/execution/statestore/StatementStorageService.java)
+  - [FlintIndexMetadataService](src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataService.java)
+  - [FlintIndexStateModelService](src/main/java/org/opensearch/sql/spark/flint/FlintIndexStateModelService.java)
+  - [IndexDMLResultStorageService](src/main/java/org/opensearch/sql/spark/flint/IndexDMLResultStorageService.java)
+- Other
+  - [LeaseManager](src/main/java/org/opensearch/sql/spark/leasemanager/LeaseManager.java)
+  - [JobExecutionResponseReader](src/main/java/org/opensearch/sql/spark/response/JobExecutionResponseReader.java)
+  - [QueryIdProvider](src/main/java/org/opensearch/sql/spark/dispatcher/QueryIdProvider.java)
+  - [SessionIdProvider](src/main/java/org/opensearch/sql/spark/execution/session/SessionIdProvider.java)
+  - [SessionConfigSupplier](src/main/java/org/opensearch/sql/spark/execution/session/SessionConfigSupplier.java)
+  - [EMRServerlessClientFactory](src/main/java/org/opensearch/sql/spark/client/EMRServerlessClientFactory.java)
+  - [SparkExecutionEngineConfigSupplier](src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigSupplier.java)
+  - [DataSourceSparkParameterComposer](src/main/java/org/opensearch/sql/spark/parameter/DataSourceSparkParameterComposer.java)
+  - [GeneralSparkParameterComposer](src/main/java/org/opensearch/sql/spark/parameter/GeneralSparkParameterComposer.java)
+  - [SparkSubmitParameterModifier](src/main/java/org/opensearch/sql/spark/config/SparkSubmitParameterModifier.java) To be deprecated in favor of GeneralSparkParameterComposer
diff --git a/async-query-core/build.gradle b/async-query-core/build.gradle
new file mode 100644
index 0000000000..deba81735d
--- /dev/null
+++ b/async-query-core/build.gradle
@@ -0,0 +1,153 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+plugins {
+    id 'java-library'
+    id "io.freefair.lombok"
+    id 'jacoco'
+    id 'antlr'
+    id 'com.diffplug.spotless' version '6.22.0'
+    id 'com.github.johnrengelman.shadow'
+}
+
+repositories {
+    mavenCentral()
+}
+
+tasks.register('downloadG4Files', Exec) {
+    description = 'Download remote .g4 files from GitHub'
+
+    executable 'curl'
+
+    args '-o', 'src/main/antlr/FlintSparkSqlExtensions.g4', 'https://raw.githubusercontent.com/opensearch-project/opensearch-spark/main/flint-spark-integration/src/main/antlr4/FlintSparkSqlExtensions.g4'
+    args '-o', 'src/main/antlr/SparkSqlBase.g4', 'https://raw.githubusercontent.com/opensearch-project/opensearch-spark/main/flint-spark-integration/src/main/antlr4/SparkSqlBase.g4'
+    args '-o', 'src/main/antlr/SqlBaseParser.g4', 'https://raw.githubusercontent.com/apache/spark/master/sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4'
+    args '-o', 'src/main/antlr/SqlBaseLexer.g4', 'https://raw.githubusercontent.com/apache/spark/master/sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseLexer.g4'
+}
+
+generateGrammarSource {
+    arguments += ['-visitor', '-package', 'org.opensearch.sql.spark.antlr.parser']
+    source = sourceSets.main.antlr
+    outputDirectory = file("build/generated-src/antlr/main/org/opensearch/sql/asyncquery/antlr/parser")
+}
+configurations {
+    compile {
+        extendsFrom = extendsFrom.findAll { it != configurations.antlr }
+    }
+}
+
+// skip download in case of offline build
+if (!gradle.startParameter.offline) {
+    // Make sure the downloadG4File task runs before the generateGrammarSource task
+    generateGrammarSource.dependsOn downloadG4Files
+}
+
+dependencies {
+    antlr "org.antlr:antlr4:4.7.1"
+
+    implementation project(':core')
+    implementation project(':spark') // TODO: dependency to spark should be eliminated
+    implementation project(':datasources') // TODO: dependency to datasources should be eliminated
+    implementation 'org.json:json:20231013'
+    implementation 'com.google.code.gson:gson:2.8.9'
+
+    testImplementation(platform("org.junit:junit-bom:5.9.3"))
+
+    testCompileOnly('org.junit.jupiter:junit-jupiter')
+    testImplementation 'org.mockito:mockito-core:5.7.0'
+    testImplementation 'org.mockito:mockito-junit-jupiter:5.7.0'
+
+    testCompileOnly('junit:junit:4.13.1') {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine") {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher") {
+        because 'allows tests to run from IDEs that bundle older version of launcher'
+    }
+}
+
+spotless {
+    java {
+        target fileTree('.') {
+            include '**/*.java'
+            exclude '**/build/**', '**/build-*/**'
+        }
+        importOrder()
+        removeUnusedImports()
+        trimTrailingWhitespace()
+        endWithNewline()
+        googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
+    }
+}
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "skipped", "failed"
+        exceptionFormat "full"
+    }
+}
+
+jacocoTestReport {
+    reports {
+        html.required = true
+        xml.required = true
+    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it, exclude: ['**/antlr/parser/**'])
+        }))
+    }
+}
+test.finalizedBy(project.tasks.jacocoTestReport)
+jacocoTestCoverageVerification {
+    violationRules {
+        rule {
+            element = 'CLASS'
+            //　TODO: Add unit tests in async-query-core and remove exclusions
+            excludes = [
+                    'org.opensearch.sql.spark.asyncquery.model.*',
+                    'org.opensearch.sql.spark.data.constants.*',
+                    'org.opensearch.sql.spark.dispatcher.model.*',
+                    'org.opensearch.sql.spark.dispatcher.*',
+                    'org.opensearch.sql.spark.execution.session.*',
+                    'org.opensearch.sql.spark.execution.statement.*',
+                    'org.opensearch.sql.spark.flint.*',
+                    'org.opensearch.sql.spark.flint.operation.*',
+                    'org.opensearch.sql.spark.rest.*',
+                    'org.opensearch.sql.spark.utils.SQLQueryUtils.*',
+                    'org.opensearch.sql.spark.validator.SQLQueryValidationVisitor'
+            ]
+            limit {
+                counter = 'LINE'
+                minimum = 1.0
+            }
+            limit {
+                counter = 'BRANCH'
+                minimum = 1.0
+            }
+        }
+    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it, exclude: ['**/antlr/parser/**'])
+        }))
+    }
+}
+check.dependsOn jacocoTestCoverageVerification
+
+shadowJar {
+    archiveBaseName.set('async-query-core')
+    archiveVersion.set('1.0.0')  // Set the desired version
+    archiveClassifier.set('all')
+
+    from sourceSets.main.output
+    configurations = [project.configurations.runtimeClasspath]
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/opensearch/sql/expression/operator/arthmetic/UnaryFunctionTest.java b/async-query-core/src/main/antlr/.gitkeep
similarity index 100%
rename from core/src/test/java/org/opensearch/sql/expression/operator/arthmetic/UnaryFunctionTest.java
rename to async-query-core/src/main/antlr/.gitkeep
diff --git a/async-query-core/src/main/antlr/FlintSparkSqlExtensions.g4 b/async-query-core/src/main/antlr/FlintSparkSqlExtensions.g4
new file mode 100644
index 0000000000..46e814e9f5
--- /dev/null
+++ b/async-query-core/src/main/antlr/FlintSparkSqlExtensions.g4
@@ -0,0 +1,208 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+grammar FlintSparkSqlExtensions;
+
+import SparkSqlBase;
+
+
+// Flint SQL Syntax Extension
+
+singleStatement
+    : statement SEMICOLON* EOF
+    ;
+
+statement
+    : skippingIndexStatement
+    | coveringIndexStatement
+    | materializedViewStatement
+    | indexManagementStatement
+    | indexJobManagementStatement
+    ;
+
+skippingIndexStatement
+    : createSkippingIndexStatement
+    | refreshSkippingIndexStatement
+    | describeSkippingIndexStatement
+    | alterSkippingIndexStatement
+    | dropSkippingIndexStatement
+    | vacuumSkippingIndexStatement
+    | analyzeSkippingIndexStatement
+    ;
+
+createSkippingIndexStatement
+    : CREATE SKIPPING INDEX (IF NOT EXISTS)?
+        ON tableName
+        LEFT_PAREN indexColTypeList RIGHT_PAREN
+        whereClause?
+        (WITH LEFT_PAREN propertyList RIGHT_PAREN)?
+    ;
+
+refreshSkippingIndexStatement
+    : REFRESH SKIPPING INDEX ON tableName
+    ;
+
+describeSkippingIndexStatement
+    : (DESC | DESCRIBE) SKIPPING INDEX ON tableName
+    ;
+
+alterSkippingIndexStatement
+    : ALTER SKIPPING INDEX
+        ON tableName
+        WITH LEFT_PAREN propertyList RIGHT_PAREN
+    ;
+
+dropSkippingIndexStatement
+    : DROP SKIPPING INDEX ON tableName
+    ;
+
+vacuumSkippingIndexStatement
+    : VACUUM SKIPPING INDEX ON tableName
+    ;
+
+coveringIndexStatement
+    : createCoveringIndexStatement
+    | refreshCoveringIndexStatement
+    | showCoveringIndexStatement
+    | describeCoveringIndexStatement
+    | alterCoveringIndexStatement
+    | dropCoveringIndexStatement
+    | vacuumCoveringIndexStatement
+    ;
+
+createCoveringIndexStatement
+    : CREATE INDEX (IF NOT EXISTS)? indexName
+        ON tableName
+        LEFT_PAREN indexColumns=multipartIdentifierPropertyList RIGHT_PAREN
+        whereClause?
+        (WITH LEFT_PAREN propertyList RIGHT_PAREN)?
+    ;
+
+refreshCoveringIndexStatement
+    : REFRESH INDEX indexName ON tableName
+    ;
+
+showCoveringIndexStatement
+    : SHOW (INDEX | INDEXES) ON tableName
+    ;
+
+describeCoveringIndexStatement
+    : (DESC | DESCRIBE) INDEX indexName ON tableName
+    ;
+
+alterCoveringIndexStatement
+    : ALTER INDEX indexName
+        ON tableName
+        WITH LEFT_PAREN propertyList RIGHT_PAREN
+    ;
+
+dropCoveringIndexStatement
+    : DROP INDEX indexName ON tableName
+    ;
+
+vacuumCoveringIndexStatement
+    : VACUUM INDEX indexName ON tableName
+    ;
+
+analyzeSkippingIndexStatement
+    : ANALYZE SKIPPING INDEX ON tableName
+    ;
+
+materializedViewStatement
+    : createMaterializedViewStatement
+    | refreshMaterializedViewStatement
+    | showMaterializedViewStatement
+    | describeMaterializedViewStatement
+    | alterMaterializedViewStatement
+    | dropMaterializedViewStatement
+    | vacuumMaterializedViewStatement
+    ;
+
+createMaterializedViewStatement
+    : CREATE MATERIALIZED VIEW (IF NOT EXISTS)? mvName=multipartIdentifier
+        AS query=materializedViewQuery
+        (WITH LEFT_PAREN propertyList RIGHT_PAREN)?
+    ;
+
+refreshMaterializedViewStatement
+    : REFRESH MATERIALIZED VIEW mvName=multipartIdentifier
+    ;
+
+showMaterializedViewStatement
+    : SHOW MATERIALIZED (VIEW | VIEWS) IN catalogDb=multipartIdentifier
+    ;
+
+describeMaterializedViewStatement
+    : (DESC | DESCRIBE) MATERIALIZED VIEW mvName=multipartIdentifier
+    ;
+
+alterMaterializedViewStatement
+    : ALTER MATERIALIZED VIEW mvName=multipartIdentifier
+        WITH LEFT_PAREN propertyList RIGHT_PAREN
+    ;
+
+dropMaterializedViewStatement
+    : DROP MATERIALIZED VIEW mvName=multipartIdentifier
+    ;
+
+vacuumMaterializedViewStatement
+    : VACUUM MATERIALIZED VIEW mvName=multipartIdentifier
+    ;
+
+indexManagementStatement
+    : showFlintIndexStatement
+    ;
+
+showFlintIndexStatement
+    : SHOW FLINT (INDEX | INDEXES)
+        IN catalogDb=multipartIdentifier        #showFlintIndex
+    | SHOW FLINT (INDEX | INDEXES) EXTENDED
+        IN catalogDb=multipartIdentifier        #showFlintIndexExtended
+    ;
+
+indexJobManagementStatement
+    : recoverIndexJobStatement
+    ;
+
+recoverIndexJobStatement
+    : RECOVER INDEX JOB identifier
+    ;
+
+/*
+ * Match all remaining tokens in non-greedy way
+ * so WITH clause won't be captured by this rule.
+ */
+materializedViewQuery
+    : .+?
+    ;
+
+whereClause
+    : WHERE filterCondition
+    ;
+
+filterCondition
+    : .+?
+    ;
+
+indexColTypeList
+    : indexColType (COMMA indexColType)*
+    ;
+
+indexColType
+    : multipartIdentifier skipType=(PARTITION | VALUE_SET | MIN_MAX | BLOOM_FILTER)
+        (LEFT_PAREN skipParams RIGHT_PAREN)?
+    ;
+
+skipParams
+    : propertyValue (COMMA propertyValue)*
+    ;
+
+indexName
+    : identifier
+    ;
+
+tableName
+    : multipartIdentifier
+    ;
diff --git a/async-query-core/src/main/antlr/SparkSqlBase.g4 b/async-query-core/src/main/antlr/SparkSqlBase.g4
new file mode 100644
index 0000000000..c53c61adfd
--- /dev/null
+++ b/async-query-core/src/main/antlr/SparkSqlBase.g4
@@ -0,0 +1,246 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This file contains code from the Apache Spark project (original license below).
+ * It contains modifications, which are licensed as above:
+ */
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+grammar SparkSqlBase;
+
+// Copy from Spark 3.3.1 SqlBaseParser.g4 and SqlBaseLexer.g4
+
+@members {
+  /**
+   * When true, parser should throw ParseExcetion for unclosed bracketed comment.
+   */
+  public boolean has_unclosed_bracketed_comment = false;
+
+  /**
+   * Verify whether current token is a valid decimal token (which contains dot).
+   * Returns true if the character that follows the token is not a digit or letter or underscore.
+   *
+   * For example:
+   * For char stream "2.3", "2." is not a valid decimal token, because it is followed by digit '3'.
+   * For char stream "2.3_", "2.3" is not a valid decimal token, because it is followed by '_'.
+   * For char stream "2.3W", "2.3" is not a valid decimal token, because it is followed by 'W'.
+   * For char stream "12.0D 34.E2+0.12 "  12.0D is a valid decimal token because it is followed
+   * by a space. 34.E2 is a valid decimal token because it is followed by symbol '+'
+   * which is not a digit or letter or underscore.
+   */
+  public boolean isValidDecimal() {
+    int nextChar = _input.LA(1);
+    if (nextChar >= 'A' && nextChar <= 'Z' || nextChar >= '0' && nextChar <= '9' ||
+      nextChar == '_') {
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  /**
+   * This method will be called when we see '/*' and try to match it as a bracketed comment.
+   * If the next character is '+', it should be parsed as hint later, and we cannot match
+   * it as a bracketed comment.
+   *
+   * Returns true if the next character is '+'.
+   */
+  public boolean isHint() {
+    int nextChar = _input.LA(1);
+    if (nextChar == '+') {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * This method will be called when the character stream ends and try to find out the
+   * unclosed bracketed comment.
+   * If the method be called, it means the end of the entire character stream match,
+   * and we set the flag and fail later.
+   */
+  public void markUnclosedComment() {
+    has_unclosed_bracketed_comment = true;
+  }
+}
+
+
+multipartIdentifierPropertyList
+    : multipartIdentifierProperty (COMMA multipartIdentifierProperty)*
+    ;
+
+multipartIdentifierProperty
+    : multipartIdentifier (options=propertyList)?
+    ;
+
+propertyList
+    : property (COMMA property)*
+    ;
+
+property
+    : key=propertyKey (EQ? value=propertyValue)?
+    ;
+
+propertyKey
+    : identifier (DOT identifier)*
+    | STRING
+    ;
+
+propertyValue
+    : INTEGER_VALUE
+    | DECIMAL_VALUE
+    | booleanValue
+    | STRING
+    ;
+
+booleanValue
+    : TRUE | FALSE
+    ;
+
+
+multipartIdentifier
+    : parts+=identifier (DOT parts+=identifier)*
+    ;
+
+identifier
+    : IDENTIFIER              #unquotedIdentifier
+    | quotedIdentifier        #quotedIdentifierAlternative
+    | nonReserved             #unquotedIdentifier
+    ;
+
+quotedIdentifier
+    : BACKQUOTED_IDENTIFIER
+    ;
+
+nonReserved
+    : DROP | SKIPPING | INDEX
+    ;
+
+
+// Flint lexical tokens
+
+BLOOM_FILTER: 'BLOOM_FILTER';
+MIN_MAX: 'MIN_MAX';
+SKIPPING: 'SKIPPING';
+VALUE_SET: 'VALUE_SET';
+
+
+// Spark lexical tokens
+
+SEMICOLON: ';';
+
+LEFT_PAREN: '(';
+RIGHT_PAREN: ')';
+COMMA: ',';
+DOT: '.';
+
+
+AS: 'AS';
+ALTER: 'ALTER';
+ANALYZE: 'ANALYZE';
+CREATE: 'CREATE';
+DESC: 'DESC';
+DESCRIBE: 'DESCRIBE';
+DROP: 'DROP';
+EXISTS: 'EXISTS';
+EXTENDED: 'EXTENDED';
+FALSE: 'FALSE';
+FLINT: 'FLINT';
+IF: 'IF';
+IN: 'IN';
+INDEX: 'INDEX';
+INDEXES: 'INDEXES';
+JOB: 'JOB';
+MATERIALIZED: 'MATERIALIZED';
+NOT: 'NOT';
+ON: 'ON';
+PARTITION: 'PARTITION';
+RECOVER: 'RECOVER';
+REFRESH: 'REFRESH';
+SHOW: 'SHOW';
+TRUE: 'TRUE';
+VACUUM: 'VACUUM';
+VIEW: 'VIEW';
+VIEWS: 'VIEWS';
+WHERE: 'WHERE';
+WITH: 'WITH';
+
+
+EQ  : '=' | '==';
+MINUS: '-';
+
+
+STRING
+    : '\'' ( ~('\''|'\\') | ('\\' .) )* '\''
+    | '"' ( ~('"'|'\\') | ('\\' .) )* '"'
+    | 'R\'' (~'\'')* '\''
+    | 'R"'(~'"')* '"'
+    ;
+
+INTEGER_VALUE
+    : DIGIT+
+    ;
+
+DECIMAL_VALUE
+    : DECIMAL_DIGITS {isValidDecimal()}?
+    ;
+
+IDENTIFIER
+    : (LETTER | DIGIT | '_')+
+    ;
+
+BACKQUOTED_IDENTIFIER
+    : '`' ( ~'`' | '``' )* '`'
+    ;
+
+fragment DECIMAL_DIGITS
+    : DIGIT+ '.' DIGIT*
+    | '.' DIGIT+
+    ;
+
+fragment DIGIT
+    : [0-9]
+    ;
+
+fragment LETTER
+    : [A-Z]
+    ;
+
+SIMPLE_COMMENT
+    : '--' ('\\\n' | ~[\r\n])* '\r'? '\n'? -> channel(HIDDEN)
+    ;
+
+BRACKETED_COMMENT
+    : '/*' {!isHint()}? ( BRACKETED_COMMENT | . )*? ('*/' | {markUnclosedComment();} EOF) -> channel(HIDDEN)
+    ;
+
+WS
+    : [ \r\n\t]+ -> channel(HIDDEN)
+    ;
+
+// Catch-all for anything we can't recognize.
+// We use this to be able to ignore and recover all the text
+// when splitting statements with DelimiterLexer
+UNRECOGNIZED
+    : .
+    ;
\ No newline at end of file
diff --git a/async-query-core/src/main/antlr/SqlBaseLexer.g4 b/async-query-core/src/main/antlr/SqlBaseLexer.g4
new file mode 100644
index 0000000000..acfc0011f5
--- /dev/null
+++ b/async-query-core/src/main/antlr/SqlBaseLexer.g4
@@ -0,0 +1,617 @@
+/*
+ * 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.
+ *
+ * This file is an adaptation of Presto's presto-parser/src/main/antlr4/com/facebook/presto/sql/parser/SqlBase.g4 grammar.
+ */
+
+lexer grammar SqlBaseLexer;
+
+@members {
+  /**
+   * When true, parser should throw ParseException for unclosed bracketed comment.
+   */
+  public boolean has_unclosed_bracketed_comment = false;
+
+  /**
+   * Verify whether current token is a valid decimal token (which contains dot).
+   * Returns true if the character that follows the token is not a digit or letter or underscore.
+   *
+   * For example:
+   * For char stream "2.3", "2." is not a valid decimal token, because it is followed by digit '3'.
+   * For char stream "2.3_", "2.3" is not a valid decimal token, because it is followed by '_'.
+   * For char stream "2.3W", "2.3" is not a valid decimal token, because it is followed by 'W'.
+   * For char stream "12.0D 34.E2+0.12 "  12.0D is a valid decimal token because it is followed
+   * by a space. 34.E2 is a valid decimal token because it is followed by symbol '+'
+   * which is not a digit or letter or underscore.
+   */
+  public boolean isValidDecimal() {
+    int nextChar = _input.LA(1);
+    if (nextChar >= 'A' && nextChar <= 'Z' || nextChar >= '0' && nextChar <= '9' ||
+      nextChar == '_') {
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  /**
+   * This method will be called when we see '/*' and try to match it as a bracketed comment.
+   * If the next character is '+', it should be parsed as hint later, and we cannot match
+   * it as a bracketed comment.
+   *
+   * Returns true if the next character is '+'.
+   */
+  public boolean isHint() {
+    int nextChar = _input.LA(1);
+    if (nextChar == '+') {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * This method will be called when the character stream ends and try to find out the
+   * unclosed bracketed comment.
+   * If the method be called, it means the end of the entire character stream match,
+   * and we set the flag and fail later.
+   */
+  public void markUnclosedComment() {
+    has_unclosed_bracketed_comment = true;
+  }
+
+  /**
+   * When greater than zero, it's in the middle of parsing ARRAY/MAP/STRUCT type.
+   */
+  public int complex_type_level_counter = 0;
+
+  /**
+   * Increase the counter by one when hits KEYWORD 'ARRAY', 'MAP', 'STRUCT'.
+   */
+  public void incComplexTypeLevelCounter() {
+    complex_type_level_counter++;
+  }
+
+  /**
+   * Decrease the counter by one when hits close tag '>' && the counter greater than zero
+   * which means we are in the middle of complex type parsing. Otherwise, it's a dangling
+   * GT token and we do nothing.
+   */
+  public void decComplexTypeLevelCounter() {
+    if (complex_type_level_counter > 0) complex_type_level_counter--;
+  }
+
+  /**
+   * If the counter is zero, it's a shift right operator. It can be closing tags of an complex
+   * type definition, such as MAP<INT, ARRAY<INT>>.
+   */
+  public boolean isShiftRightOperator() {
+    return complex_type_level_counter == 0 ? true : false;
+  }
+}
+
+SEMICOLON: ';';
+
+LEFT_PAREN: '(';
+RIGHT_PAREN: ')';
+COMMA: ',';
+DOT: '.';
+LEFT_BRACKET: '[';
+RIGHT_BRACKET: ']';
+BANG: '!';
+
+// NOTE: If you add a new token in the list below, you should update the list of keywords
+// and reserved tag in `docs/sql-ref-ansi-compliance.md#sql-keywords`, and
+// modify `ParserUtils.toExprAlias()` which assumes all keywords are between `ADD` and `ZONE`.
+
+//============================
+// Start of the keywords list
+//============================
+//--SPARK-KEYWORD-LIST-START
+ADD: 'ADD';
+AFTER: 'AFTER';
+ALL: 'ALL';
+ALTER: 'ALTER';
+ALWAYS: 'ALWAYS';
+ANALYZE: 'ANALYZE';
+AND: 'AND';
+ANTI: 'ANTI';
+ANY: 'ANY';
+ANY_VALUE: 'ANY_VALUE';
+ARCHIVE: 'ARCHIVE';
+ARRAY: 'ARRAY' {incComplexTypeLevelCounter();};
+AS: 'AS';
+ASC: 'ASC';
+AT: 'AT';
+AUTHORIZATION: 'AUTHORIZATION';
+BEGIN: 'BEGIN';
+BETWEEN: 'BETWEEN';
+BIGINT: 'BIGINT';
+BINARY: 'BINARY';
+BINDING: 'BINDING';
+BOOLEAN: 'BOOLEAN';
+BOTH: 'BOTH';
+BUCKET: 'BUCKET';
+BUCKETS: 'BUCKETS';
+BY: 'BY';
+BYTE: 'BYTE';
+CACHE: 'CACHE';
+CALLED: 'CALLED';
+CASCADE: 'CASCADE';
+CASE: 'CASE';
+CAST: 'CAST';
+CATALOG: 'CATALOG';
+CATALOGS: 'CATALOGS';
+CHANGE: 'CHANGE';
+CHAR: 'CHAR';
+CHARACTER: 'CHARACTER';
+CHECK: 'CHECK';
+CLEAR: 'CLEAR';
+CLUSTER: 'CLUSTER';
+CLUSTERED: 'CLUSTERED';
+CODEGEN: 'CODEGEN';
+COLLATE: 'COLLATE';
+COLLATION: 'COLLATION';
+COLLECTION: 'COLLECTION';
+COLUMN: 'COLUMN';
+COLUMNS: 'COLUMNS';
+COMMENT: 'COMMENT';
+COMMIT: 'COMMIT';
+COMPACT: 'COMPACT';
+COMPACTIONS: 'COMPACTIONS';
+COMPENSATION: 'COMPENSATION';
+COMPUTE: 'COMPUTE';
+CONCATENATE: 'CONCATENATE';
+CONSTRAINT: 'CONSTRAINT';
+CONTAINS: 'CONTAINS';
+COST: 'COST';
+CREATE: 'CREATE';
+CROSS: 'CROSS';
+CUBE: 'CUBE';
+CURRENT: 'CURRENT';
+CURRENT_DATE: 'CURRENT_DATE';
+CURRENT_TIME: 'CURRENT_TIME';
+CURRENT_TIMESTAMP: 'CURRENT_TIMESTAMP';
+CURRENT_USER: 'CURRENT_USER';
+DAY: 'DAY';
+DAYS: 'DAYS';
+DAYOFYEAR: 'DAYOFYEAR';
+DATA: 'DATA';
+DATE: 'DATE';
+DATABASE: 'DATABASE';
+DATABASES: 'DATABASES';
+DATEADD: 'DATEADD';
+DATE_ADD: 'DATE_ADD';
+DATEDIFF: 'DATEDIFF';
+DATE_DIFF: 'DATE_DIFF';
+DBPROPERTIES: 'DBPROPERTIES';
+DEC: 'DEC';
+DECIMAL: 'DECIMAL';
+DECLARE: 'DECLARE';
+DEFAULT: 'DEFAULT';
+DEFINED: 'DEFINED';
+DEFINER: 'DEFINER';
+DELETE: 'DELETE';
+DELIMITED: 'DELIMITED';
+DESC: 'DESC';
+DESCRIBE: 'DESCRIBE';
+DETERMINISTIC: 'DETERMINISTIC';
+DFS: 'DFS';
+DIRECTORIES: 'DIRECTORIES';
+DIRECTORY: 'DIRECTORY';
+DISTINCT: 'DISTINCT';
+DISTRIBUTE: 'DISTRIBUTE';
+DIV: 'DIV';
+DO: 'DO';
+DOUBLE: 'DOUBLE';
+DROP: 'DROP';
+ELSE: 'ELSE';
+END: 'END';
+ESCAPE: 'ESCAPE';
+ESCAPED: 'ESCAPED';
+EVOLUTION: 'EVOLUTION';
+EXCEPT: 'EXCEPT';
+EXCHANGE: 'EXCHANGE';
+EXCLUDE: 'EXCLUDE';
+EXISTS: 'EXISTS';
+EXPLAIN: 'EXPLAIN';
+EXPORT: 'EXPORT';
+EXTENDED: 'EXTENDED';
+EXTERNAL: 'EXTERNAL';
+EXTRACT: 'EXTRACT';
+FALSE: 'FALSE';
+FETCH: 'FETCH';
+FIELDS: 'FIELDS';
+FILTER: 'FILTER';
+FILEFORMAT: 'FILEFORMAT';
+FIRST: 'FIRST';
+FLOAT: 'FLOAT';
+FOLLOWING: 'FOLLOWING';
+FOR: 'FOR';
+FOREIGN: 'FOREIGN';
+FORMAT: 'FORMAT';
+FORMATTED: 'FORMATTED';
+FROM: 'FROM';
+FULL: 'FULL';
+FUNCTION: 'FUNCTION';
+FUNCTIONS: 'FUNCTIONS';
+GENERATED: 'GENERATED';
+GLOBAL: 'GLOBAL';
+GRANT: 'GRANT';
+GROUP: 'GROUP';
+GROUPING: 'GROUPING';
+HAVING: 'HAVING';
+BINARY_HEX: 'X';
+HOUR: 'HOUR';
+HOURS: 'HOURS';
+IDENTIFIER_KW: 'IDENTIFIER';
+IF: 'IF';
+IGNORE: 'IGNORE';
+IMMEDIATE: 'IMMEDIATE';
+IMPORT: 'IMPORT';
+IN: 'IN';
+INCLUDE: 'INCLUDE';
+INDEX: 'INDEX';
+INDEXES: 'INDEXES';
+INNER: 'INNER';
+INPATH: 'INPATH';
+INPUT: 'INPUT';
+INPUTFORMAT: 'INPUTFORMAT';
+INSERT: 'INSERT';
+INTERSECT: 'INTERSECT';
+INTERVAL: 'INTERVAL';
+INT: 'INT';
+INTEGER: 'INTEGER';
+INTO: 'INTO';
+INVOKER: 'INVOKER';
+IS: 'IS';
+ITEMS: 'ITEMS';
+JOIN: 'JOIN';
+KEYS: 'KEYS';
+LANGUAGE: 'LANGUAGE';
+LAST: 'LAST';
+LATERAL: 'LATERAL';
+LAZY: 'LAZY';
+LEADING: 'LEADING';
+LEFT: 'LEFT';
+LIKE: 'LIKE';
+ILIKE: 'ILIKE';
+LIMIT: 'LIMIT';
+LINES: 'LINES';
+LIST: 'LIST';
+LOAD: 'LOAD';
+LOCAL: 'LOCAL';
+LOCATION: 'LOCATION';
+LOCK: 'LOCK';
+LOCKS: 'LOCKS';
+LOGICAL: 'LOGICAL';
+LONG: 'LONG';
+MACRO: 'MACRO';
+MAP: 'MAP' {incComplexTypeLevelCounter();};
+MATCHED: 'MATCHED';
+MERGE: 'MERGE';
+MICROSECOND: 'MICROSECOND';
+MICROSECONDS: 'MICROSECONDS';
+MILLISECOND: 'MILLISECOND';
+MILLISECONDS: 'MILLISECONDS';
+MINUTE: 'MINUTE';
+MINUTES: 'MINUTES';
+MODIFIES: 'MODIFIES';
+MONTH: 'MONTH';
+MONTHS: 'MONTHS';
+MSCK: 'MSCK';
+NAME: 'NAME';
+NAMESPACE: 'NAMESPACE';
+NAMESPACES: 'NAMESPACES';
+NANOSECOND: 'NANOSECOND';
+NANOSECONDS: 'NANOSECONDS';
+NATURAL: 'NATURAL';
+NO: 'NO';
+NONE: 'NONE';
+NOT: 'NOT';
+NULL: 'NULL';
+NULLS: 'NULLS';
+NUMERIC: 'NUMERIC';
+OF: 'OF';
+OFFSET: 'OFFSET';
+ON: 'ON';
+ONLY: 'ONLY';
+OPTION: 'OPTION';
+OPTIONS: 'OPTIONS';
+OR: 'OR';
+ORDER: 'ORDER';
+OUT: 'OUT';
+OUTER: 'OUTER';
+OUTPUTFORMAT: 'OUTPUTFORMAT';
+OVER: 'OVER';
+OVERLAPS: 'OVERLAPS';
+OVERLAY: 'OVERLAY';
+OVERWRITE: 'OVERWRITE';
+PARTITION: 'PARTITION';
+PARTITIONED: 'PARTITIONED';
+PARTITIONS: 'PARTITIONS';
+PERCENTLIT: 'PERCENT';
+PIVOT: 'PIVOT';
+PLACING: 'PLACING';
+POSITION: 'POSITION';
+PRECEDING: 'PRECEDING';
+PRIMARY: 'PRIMARY';
+PRINCIPALS: 'PRINCIPALS';
+PROPERTIES: 'PROPERTIES';
+PURGE: 'PURGE';
+QUARTER: 'QUARTER';
+QUERY: 'QUERY';
+RANGE: 'RANGE';
+READS: 'READS';
+REAL: 'REAL';
+RECORDREADER: 'RECORDREADER';
+RECORDWRITER: 'RECORDWRITER';
+RECOVER: 'RECOVER';
+REDUCE: 'REDUCE';
+REFERENCES: 'REFERENCES';
+REFRESH: 'REFRESH';
+RENAME: 'RENAME';
+REPAIR: 'REPAIR';
+REPEATABLE: 'REPEATABLE';
+REPLACE: 'REPLACE';
+RESET: 'RESET';
+RESPECT: 'RESPECT';
+RESTRICT: 'RESTRICT';
+RETURN: 'RETURN';
+RETURNS: 'RETURNS';
+REVOKE: 'REVOKE';
+RIGHT: 'RIGHT';
+RLIKE: 'RLIKE' | 'REGEXP';
+ROLE: 'ROLE';
+ROLES: 'ROLES';
+ROLLBACK: 'ROLLBACK';
+ROLLUP: 'ROLLUP';
+ROW: 'ROW';
+ROWS: 'ROWS';
+SECOND: 'SECOND';
+SECONDS: 'SECONDS';
+SCHEMA: 'SCHEMA';
+SCHEMAS: 'SCHEMAS';
+SECURITY: 'SECURITY';
+SELECT: 'SELECT';
+SEMI: 'SEMI';
+SEPARATED: 'SEPARATED';
+SERDE: 'SERDE';
+SERDEPROPERTIES: 'SERDEPROPERTIES';
+SESSION_USER: 'SESSION_USER';
+SET: 'SET';
+SETMINUS: 'MINUS';
+SETS: 'SETS';
+SHORT: 'SHORT';
+SHOW: 'SHOW';
+SINGLE: 'SINGLE';
+SKEWED: 'SKEWED';
+SMALLINT: 'SMALLINT';
+SOME: 'SOME';
+SORT: 'SORT';
+SORTED: 'SORTED';
+SOURCE: 'SOURCE';
+SPECIFIC: 'SPECIFIC';
+SQL: 'SQL';
+START: 'START';
+STATISTICS: 'STATISTICS';
+STORED: 'STORED';
+STRATIFY: 'STRATIFY';
+STRING: 'STRING';
+STRUCT: 'STRUCT' {incComplexTypeLevelCounter();};
+SUBSTR: 'SUBSTR';
+SUBSTRING: 'SUBSTRING';
+SYNC: 'SYNC';
+SYSTEM_TIME: 'SYSTEM_TIME';
+SYSTEM_VERSION: 'SYSTEM_VERSION';
+TABLE: 'TABLE';
+TABLES: 'TABLES';
+TABLESAMPLE: 'TABLESAMPLE';
+TARGET: 'TARGET';
+TBLPROPERTIES: 'TBLPROPERTIES';
+TEMPORARY: 'TEMPORARY' | 'TEMP';
+TERMINATED: 'TERMINATED';
+THEN: 'THEN';
+TIME: 'TIME';
+TIMEDIFF: 'TIMEDIFF';
+TIMESTAMP: 'TIMESTAMP';
+TIMESTAMP_LTZ: 'TIMESTAMP_LTZ';
+TIMESTAMP_NTZ: 'TIMESTAMP_NTZ';
+TIMESTAMPADD: 'TIMESTAMPADD';
+TIMESTAMPDIFF: 'TIMESTAMPDIFF';
+TINYINT: 'TINYINT';
+TO: 'TO';
+EXECUTE: 'EXECUTE';
+TOUCH: 'TOUCH';
+TRAILING: 'TRAILING';
+TRANSACTION: 'TRANSACTION';
+TRANSACTIONS: 'TRANSACTIONS';
+TRANSFORM: 'TRANSFORM';
+TRIM: 'TRIM';
+TRUE: 'TRUE';
+TRUNCATE: 'TRUNCATE';
+TRY_CAST: 'TRY_CAST';
+TYPE: 'TYPE';
+UNARCHIVE: 'UNARCHIVE';
+UNBOUNDED: 'UNBOUNDED';
+UNCACHE: 'UNCACHE';
+UNION: 'UNION';
+UNIQUE: 'UNIQUE';
+UNKNOWN: 'UNKNOWN';
+UNLOCK: 'UNLOCK';
+UNPIVOT: 'UNPIVOT';
+UNSET: 'UNSET';
+UPDATE: 'UPDATE';
+USE: 'USE';
+USER: 'USER';
+USING: 'USING';
+VALUES: 'VALUES';
+VARCHAR: 'VARCHAR';
+VAR: 'VAR';
+VARIABLE: 'VARIABLE';
+VARIANT: 'VARIANT';
+VERSION: 'VERSION';
+VIEW: 'VIEW';
+VIEWS: 'VIEWS';
+VOID: 'VOID';
+WEEK: 'WEEK';
+WEEKS: 'WEEKS';
+WHEN: 'WHEN';
+WHERE: 'WHERE';
+WHILE: 'WHILE';
+WINDOW: 'WINDOW';
+WITH: 'WITH';
+WITHIN: 'WITHIN';
+YEAR: 'YEAR';
+YEARS: 'YEARS';
+ZONE: 'ZONE';
+//--SPARK-KEYWORD-LIST-END
+//============================
+// End of the keywords list
+//============================
+
+EQ  : '=' | '==';
+NSEQ: '<=>';
+NEQ : '<>';
+NEQJ: '!=';
+LT  : '<';
+LTE : '<=' | '!>';
+GT  : '>' {decComplexTypeLevelCounter();};
+GTE : '>=' | '!<';
+SHIFT_LEFT: '<<';
+SHIFT_RIGHT: '>>' {isShiftRightOperator()}?;
+SHIFT_RIGHT_UNSIGNED: '>>>' {isShiftRightOperator()}?;
+
+PLUS: '+';
+MINUS: '-';
+ASTERISK: '*';
+SLASH: '/';
+PERCENT: '%';
+TILDE: '~';
+AMPERSAND: '&';
+PIPE: '|';
+CONCAT_PIPE: '||';
+HAT: '^';
+COLON: ':';
+DOUBLE_COLON: '::';
+ARROW: '->';
+FAT_ARROW : '=>';
+HENT_START: '/*+';
+HENT_END: '*/';
+QUESTION: '?';
+
+STRING_LITERAL
+    : '\'' ( ~('\''|'\\') | ('\\' .) )* '\''
+    | 'R\'' (~'\'')* '\''
+    | 'R"'(~'"')* '"'
+    ;
+
+DOUBLEQUOTED_STRING
+    :'"' ( ~('"'|'\\') | ('\\' .) )* '"'
+    ;
+
+// NOTE: If you move a numeric literal, you should modify `ParserUtils.toExprAlias()`
+// which assumes all numeric literals are between `BIGINT_LITERAL` and `BIGDECIMAL_LITERAL`.
+
+BIGINT_LITERAL
+    : DIGIT+ 'L'
+    ;
+
+SMALLINT_LITERAL
+    : DIGIT+ 'S'
+    ;
+
+TINYINT_LITERAL
+    : DIGIT+ 'Y'
+    ;
+
+INTEGER_VALUE
+    : DIGIT+
+    ;
+
+EXPONENT_VALUE
+    : DIGIT+ EXPONENT
+    | DECIMAL_DIGITS EXPONENT {isValidDecimal()}?
+    ;
+
+DECIMAL_VALUE
+    : DECIMAL_DIGITS {isValidDecimal()}?
+    ;
+
+FLOAT_LITERAL
+    : DIGIT+ EXPONENT? 'F'
+    | DECIMAL_DIGITS EXPONENT? 'F' {isValidDecimal()}?
+    ;
+
+DOUBLE_LITERAL
+    : DIGIT+ EXPONENT? 'D'
+    | DECIMAL_DIGITS EXPONENT? 'D' {isValidDecimal()}?
+    ;
+
+BIGDECIMAL_LITERAL
+    : DIGIT+ EXPONENT? 'BD'
+    | DECIMAL_DIGITS EXPONENT? 'BD' {isValidDecimal()}?
+    ;
+
+// Generalize the identifier to give a sensible INVALID_IDENTIFIER error message:
+// * Unicode letters rather than a-z and A-Z only
+// * URI paths for table references using paths
+// We then narrow down to ANSI rules in exitUnquotedIdentifier() in the parser.
+IDENTIFIER
+    : (UNICODE_LETTER | DIGIT | '_')+
+    | UNICODE_LETTER+ '://' (UNICODE_LETTER | DIGIT | '_' | '/' | '-' | '.' | '?' | '=' | '&' | '#' | '%')+
+    ;
+
+BACKQUOTED_IDENTIFIER
+    : '`' ( ~'`' | '``' )* '`'
+    ;
+
+fragment DECIMAL_DIGITS
+    : DIGIT+ '.' DIGIT*
+    | '.' DIGIT+
+    ;
+
+fragment EXPONENT
+    : 'E' [+-]? DIGIT+
+    ;
+
+fragment DIGIT
+    : [0-9]
+    ;
+
+fragment LETTER
+    : [A-Z]
+    ;
+
+fragment UNICODE_LETTER
+    : [\p{L}]
+    ;
+
+SIMPLE_COMMENT
+    : '--' ('\\\n' | ~[\r\n])* '\r'? '\n'? -> channel(HIDDEN)
+    ;
+
+BRACKETED_COMMENT
+    : '/*' {!isHint()}? ( BRACKETED_COMMENT | . )*? ('*/' | {markUnclosedComment();} EOF) -> channel(HIDDEN)
+    ;
+
+WS
+    : [ \t\n\f\r\u000B\u00A0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u202F\u205F\u3000]+ -> channel(HIDDEN)
+    ;
+
+// Catch-all for anything we can't recognize.
+// We use this to be able to ignore and recover all the text
+// when splitting statements with DelimiterLexer
+UNRECOGNIZED
+    : .
+    ;
diff --git a/async-query-core/src/main/antlr/SqlBaseParser.g4 b/async-query-core/src/main/antlr/SqlBaseParser.g4
new file mode 100644
index 0000000000..5b8805821b
--- /dev/null
+++ b/async-query-core/src/main/antlr/SqlBaseParser.g4
@@ -0,0 +1,2120 @@
+/*
+ * 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.
+ *
+ * This file is an adaptation of Presto's presto-parser/src/main/antlr4/com/facebook/presto/sql/parser/SqlBase.g4 grammar.
+ */
+
+parser grammar SqlBaseParser;
+
+options { tokenVocab = SqlBaseLexer; }
+
+@members {
+  /**
+   * When false, INTERSECT is given the greater precedence over the other set
+   * operations (UNION, EXCEPT and MINUS) as per the SQL standard.
+   */
+  public boolean legacy_setops_precedence_enabled = false;
+
+  /**
+   * When false, a literal with an exponent would be converted into
+   * double type rather than decimal type.
+   */
+  public boolean legacy_exponent_literal_as_decimal_enabled = false;
+
+  /**
+   * When true, the behavior of keywords follows ANSI SQL standard.
+   */
+  public boolean SQL_standard_keyword_behavior = false;
+
+  /**
+   * When true, double quoted literals are identifiers rather than STRINGs.
+   */
+  public boolean double_quoted_identifiers = false;
+}
+
+compoundOrSingleStatement
+    : singleStatement
+    | singleCompoundStatement
+    ;
+
+singleCompoundStatement
+    : beginEndCompoundBlock SEMICOLON? EOF
+    ;
+
+beginEndCompoundBlock
+    : beginLabel? BEGIN compoundBody END endLabel?
+    ;
+
+compoundBody
+    : (compoundStatements+=compoundStatement SEMICOLON)*
+    ;
+
+compoundStatement
+    : statement
+    | setStatementWithOptionalVarKeyword
+    | beginEndCompoundBlock
+    | ifElseStatement
+    | whileStatement
+    ;
+
+setStatementWithOptionalVarKeyword
+    : SET variable? assignmentList                              #setVariableWithOptionalKeyword
+    | SET variable? LEFT_PAREN multipartIdentifierList RIGHT_PAREN EQ
+        LEFT_PAREN query RIGHT_PAREN                            #setVariableWithOptionalKeyword
+    ;
+
+whileStatement
+    : beginLabel? WHILE booleanExpression DO compoundBody END WHILE endLabel?
+    ;
+
+ifElseStatement
+    : IF booleanExpression THEN conditionalBodies+=compoundBody
+        (ELSE IF booleanExpression THEN conditionalBodies+=compoundBody)*
+        (ELSE elseBody=compoundBody)? END IF
+    ;
+
+singleStatement
+    : (statement|setResetStatement) SEMICOLON* EOF
+    ;
+
+beginLabel
+    : multipartIdentifier COLON
+    ;
+
+endLabel
+    : multipartIdentifier
+    ;
+
+singleExpression
+    : namedExpression EOF
+    ;
+
+singleTableIdentifier
+    : tableIdentifier EOF
+    ;
+
+singleMultipartIdentifier
+    : multipartIdentifier EOF
+    ;
+
+singleFunctionIdentifier
+    : functionIdentifier EOF
+    ;
+
+singleDataType
+    : dataType EOF
+    ;
+
+singleTableSchema
+    : colTypeList EOF
+    ;
+
+statement
+    : query                                                            #statementDefault
+    | executeImmediate                                                 #visitExecuteImmediate
+    | ctes? dmlStatementNoWith                                         #dmlStatement
+    | USE identifierReference                                          #use
+    | USE namespace identifierReference                                #useNamespace
+    | SET CATALOG (errorCapturingIdentifier | stringLit)                  #setCatalog
+    | CREATE namespace (IF errorCapturingNot EXISTS)? identifierReference
+        (commentSpec |
+         locationSpec |
+         (WITH (DBPROPERTIES | PROPERTIES) propertyList))*             #createNamespace
+    | ALTER namespace identifierReference
+        SET (DBPROPERTIES | PROPERTIES) propertyList                   #setNamespaceProperties
+    | ALTER namespace identifierReference
+        UNSET (DBPROPERTIES | PROPERTIES) propertyList                 #unsetNamespaceProperties
+    | ALTER namespace identifierReference
+        SET locationSpec                                               #setNamespaceLocation
+    | DROP namespace (IF EXISTS)? identifierReference
+        (RESTRICT | CASCADE)?                                          #dropNamespace
+    | SHOW namespaces ((FROM | IN) multipartIdentifier)?
+        (LIKE? pattern=stringLit)?                                        #showNamespaces
+    | createTableHeader (LEFT_PAREN colDefinitionList RIGHT_PAREN)? tableProvider?
+        createTableClauses
+        (AS? query)?                                                   #createTable
+    | CREATE TABLE (IF errorCapturingNot EXISTS)? target=tableIdentifier
+        LIKE source=tableIdentifier
+        (tableProvider |
+        rowFormat |
+        createFileFormat |
+        locationSpec |
+        (TBLPROPERTIES tableProps=propertyList))*                      #createTableLike
+    | replaceTableHeader (LEFT_PAREN colDefinitionList RIGHT_PAREN)? tableProvider?
+        createTableClauses
+        (AS? query)?                                                   #replaceTable
+    | ANALYZE TABLE identifierReference partitionSpec? COMPUTE STATISTICS
+        (identifier | FOR COLUMNS identifierSeq | FOR ALL COLUMNS)?    #analyze
+    | ANALYZE TABLES ((FROM | IN) identifierReference)? COMPUTE STATISTICS
+        (identifier)?                                                  #analyzeTables
+    | ALTER TABLE identifierReference
+        ADD (COLUMN | COLUMNS)
+        columns=qualifiedColTypeWithPositionList                       #addTableColumns
+    | ALTER TABLE identifierReference
+        ADD (COLUMN | COLUMNS)
+        LEFT_PAREN columns=qualifiedColTypeWithPositionList RIGHT_PAREN #addTableColumns
+    | ALTER TABLE table=identifierReference
+        RENAME COLUMN
+        from=multipartIdentifier TO to=errorCapturingIdentifier        #renameTableColumn
+    | ALTER TABLE identifierReference
+        DROP (COLUMN | COLUMNS) (IF EXISTS)?
+        LEFT_PAREN columns=multipartIdentifierList RIGHT_PAREN         #dropTableColumns
+    | ALTER TABLE identifierReference
+        DROP (COLUMN | COLUMNS) (IF EXISTS)?
+        columns=multipartIdentifierList                                #dropTableColumns
+    | ALTER (TABLE | VIEW) from=identifierReference
+        RENAME TO to=multipartIdentifier                               #renameTable
+    | ALTER (TABLE | VIEW) identifierReference
+        SET TBLPROPERTIES propertyList                                 #setTableProperties
+    | ALTER (TABLE | VIEW) identifierReference
+        UNSET TBLPROPERTIES (IF EXISTS)? propertyList                  #unsetTableProperties
+    | ALTER TABLE table=identifierReference
+        (ALTER | CHANGE) COLUMN? column=multipartIdentifier
+        alterColumnAction?                                             #alterTableAlterColumn
+    | ALTER TABLE table=identifierReference partitionSpec?
+        CHANGE COLUMN?
+        colName=multipartIdentifier colType colPosition?               #hiveChangeColumn
+    | ALTER TABLE table=identifierReference partitionSpec?
+        REPLACE COLUMNS
+        LEFT_PAREN columns=qualifiedColTypeWithPositionList
+        RIGHT_PAREN                                                    #hiveReplaceColumns
+    | ALTER TABLE identifierReference (partitionSpec)?
+        SET SERDE stringLit (WITH SERDEPROPERTIES propertyList)?       #setTableSerDe
+    | ALTER TABLE identifierReference (partitionSpec)?
+        SET SERDEPROPERTIES propertyList                               #setTableSerDe
+    | ALTER (TABLE | VIEW) identifierReference ADD (IF errorCapturingNot EXISTS)?
+        partitionSpecLocation+                                         #addTablePartition
+    | ALTER TABLE identifierReference
+        from=partitionSpec RENAME TO to=partitionSpec                  #renameTablePartition
+    | ALTER (TABLE | VIEW) identifierReference
+        DROP (IF EXISTS)? partitionSpec (COMMA partitionSpec)* PURGE?  #dropTablePartitions
+    | ALTER TABLE identifierReference
+        (partitionSpec)? SET locationSpec                              #setTableLocation
+    | ALTER TABLE identifierReference RECOVER PARTITIONS                 #recoverPartitions
+    | ALTER TABLE identifierReference
+        (clusterBySpec | CLUSTER BY NONE)                              #alterClusterBy
+    | DROP TABLE (IF EXISTS)? identifierReference PURGE?               #dropTable
+    | DROP VIEW (IF EXISTS)? identifierReference                       #dropView
+    | CREATE (OR REPLACE)? (GLOBAL? TEMPORARY)?
+        VIEW (IF errorCapturingNot EXISTS)? identifierReference
+        identifierCommentList?
+        (commentSpec |
+         schemaBinding |
+         (PARTITIONED ON identifierList) |
+         (TBLPROPERTIES propertyList))*
+        AS query                                                       #createView
+    | CREATE (OR REPLACE)? GLOBAL? TEMPORARY VIEW
+        tableIdentifier (LEFT_PAREN colTypeList RIGHT_PAREN)? tableProvider
+        (OPTIONS propertyList)?                                        #createTempViewUsing
+    | ALTER VIEW identifierReference AS? query                         #alterViewQuery
+    | ALTER VIEW identifierReference schemaBinding                     #alterViewSchemaBinding
+    | CREATE (OR REPLACE)? TEMPORARY? FUNCTION (IF errorCapturingNot EXISTS)?
+        identifierReference AS className=stringLit
+        (USING resource (COMMA resource)*)?                            #createFunction
+    | CREATE (OR REPLACE)? TEMPORARY? FUNCTION (IF errorCapturingNot EXISTS)?
+        identifierReference LEFT_PAREN parameters=colDefinitionList? RIGHT_PAREN
+        (RETURNS (dataType | TABLE LEFT_PAREN returnParams=colTypeList RIGHT_PAREN))?
+        routineCharacteristics
+        RETURN (query | expression)                                    #createUserDefinedFunction
+    | DROP TEMPORARY? FUNCTION (IF EXISTS)? identifierReference        #dropFunction
+    | DECLARE (OR REPLACE)? variable?
+        identifierReference dataType? variableDefaultExpression?       #createVariable
+    | DROP TEMPORARY variable (IF EXISTS)? identifierReference         #dropVariable
+    | EXPLAIN (LOGICAL | FORMATTED | EXTENDED | CODEGEN | COST)?
+        (statement|setResetStatement)                                  #explain
+    | SHOW TABLES ((FROM | IN) identifierReference)?
+        (LIKE? pattern=stringLit)?                                        #showTables
+    | SHOW TABLE EXTENDED ((FROM | IN) ns=identifierReference)?
+        LIKE pattern=stringLit partitionSpec?                             #showTableExtended
+    | SHOW TBLPROPERTIES table=identifierReference
+        (LEFT_PAREN key=propertyKey RIGHT_PAREN)?                      #showTblProperties
+    | SHOW COLUMNS (FROM | IN) table=identifierReference
+        ((FROM | IN) ns=multipartIdentifier)?                          #showColumns
+    | SHOW VIEWS ((FROM | IN) identifierReference)?
+        (LIKE? pattern=stringLit)?                                        #showViews
+    | SHOW PARTITIONS identifierReference partitionSpec?               #showPartitions
+    | SHOW identifier? FUNCTIONS ((FROM | IN) ns=identifierReference)?
+        (LIKE? (legacy=multipartIdentifier | pattern=stringLit))?      #showFunctions
+    | SHOW CREATE TABLE identifierReference (AS SERDE)?                #showCreateTable
+    | SHOW CURRENT namespace                                           #showCurrentNamespace
+    | SHOW CATALOGS (LIKE? pattern=stringLit)?                            #showCatalogs
+    | (DESC | DESCRIBE) FUNCTION EXTENDED? describeFuncName            #describeFunction
+    | (DESC | DESCRIBE) namespace EXTENDED?
+        identifierReference                                            #describeNamespace
+    | (DESC | DESCRIBE) TABLE? option=(EXTENDED | FORMATTED)?
+        identifierReference partitionSpec? describeColName?            #describeRelation
+    | (DESC | DESCRIBE) QUERY? query                                   #describeQuery
+    | COMMENT ON namespace identifierReference IS
+        comment                                                        #commentNamespace
+    | COMMENT ON TABLE identifierReference IS comment                  #commentTable
+    | REFRESH TABLE identifierReference                                #refreshTable
+    | REFRESH FUNCTION identifierReference                             #refreshFunction
+    | REFRESH (stringLit | .*?)                                        #refreshResource
+    | CACHE LAZY? TABLE identifierReference
+        (OPTIONS options=propertyList)? (AS? query)?                   #cacheTable
+    | UNCACHE TABLE (IF EXISTS)? identifierReference                   #uncacheTable
+    | CLEAR CACHE                                                      #clearCache
+    | LOAD DATA LOCAL? INPATH path=stringLit OVERWRITE? INTO TABLE
+        identifierReference partitionSpec?                             #loadData
+    | TRUNCATE TABLE identifierReference partitionSpec?                #truncateTable
+    | (MSCK)? REPAIR TABLE identifierReference
+        (option=(ADD|DROP|SYNC) PARTITIONS)?                           #repairTable
+    | op=(ADD | LIST) identifier .*?                                   #manageResource
+    | CREATE INDEX (IF errorCapturingNot EXISTS)? identifier ON TABLE?
+        identifierReference (USING indexType=identifier)?
+        LEFT_PAREN columns=multipartIdentifierPropertyList RIGHT_PAREN
+        (OPTIONS options=propertyList)?                                #createIndex
+    | DROP INDEX (IF EXISTS)? identifier ON TABLE? identifierReference #dropIndex
+    | unsupportedHiveNativeCommands .*?                                #failNativeCommand
+    ;
+
+setResetStatement
+    : SET COLLATION collationName=identifier                           #setCollation
+    | SET ROLE .*?                                                     #failSetRole
+    | SET TIME ZONE interval                                           #setTimeZone
+    | SET TIME ZONE timezone                                           #setTimeZone
+    | SET TIME ZONE .*?                                                #setTimeZone
+    | SET variable assignmentList                                      #setVariable
+    | SET variable LEFT_PAREN multipartIdentifierList RIGHT_PAREN EQ
+        LEFT_PAREN query RIGHT_PAREN                                   #setVariable
+    | SET configKey EQ configValue                                     #setQuotedConfiguration
+    | SET configKey (EQ .*?)?                                          #setConfiguration
+    | SET .*? EQ configValue                                           #setQuotedConfiguration
+    | SET .*?                                                          #setConfiguration
+    | RESET configKey                                                  #resetQuotedConfiguration
+    | RESET .*?                                                        #resetConfiguration
+    ;
+
+executeImmediate
+    : EXECUTE IMMEDIATE queryParam=executeImmediateQueryParam (INTO targetVariable=multipartIdentifierList)? executeImmediateUsing?
+    ;
+
+executeImmediateUsing
+    : USING LEFT_PAREN params=namedExpressionSeq RIGHT_PAREN
+    | USING params=namedExpressionSeq
+    ;
+
+executeImmediateQueryParam
+    : stringLit
+    | multipartIdentifier
+    ;
+
+executeImmediateArgument
+    : (constant|multipartIdentifier) (AS name=errorCapturingIdentifier)?
+    ;
+
+executeImmediateArgumentSeq
+    : executeImmediateArgument (COMMA executeImmediateArgument)*
+    ;
+
+timezone
+    : stringLit
+    | LOCAL
+    ;
+
+configKey
+    : quotedIdentifier
+    ;
+
+configValue
+    : backQuotedIdentifier
+    ;
+
+unsupportedHiveNativeCommands
+    : kw1=CREATE kw2=ROLE
+    | kw1=DROP kw2=ROLE
+    | kw1=GRANT kw2=ROLE?
+    | kw1=REVOKE kw2=ROLE?
+    | kw1=SHOW kw2=GRANT
+    | kw1=SHOW kw2=ROLE kw3=GRANT?
+    | kw1=SHOW kw2=PRINCIPALS
+    | kw1=SHOW kw2=ROLES
+    | kw1=SHOW kw2=CURRENT kw3=ROLES
+    | kw1=EXPORT kw2=TABLE
+    | kw1=IMPORT kw2=TABLE
+    | kw1=SHOW kw2=COMPACTIONS
+    | kw1=SHOW kw2=CREATE kw3=TABLE
+    | kw1=SHOW kw2=TRANSACTIONS
+    | kw1=SHOW kw2=INDEXES
+    | kw1=SHOW kw2=LOCKS
+    | kw1=CREATE kw2=INDEX
+    | kw1=DROP kw2=INDEX
+    | kw1=ALTER kw2=INDEX
+    | kw1=LOCK kw2=TABLE
+    | kw1=LOCK kw2=DATABASE
+    | kw1=UNLOCK kw2=TABLE
+    | kw1=UNLOCK kw2=DATABASE
+    | kw1=CREATE kw2=TEMPORARY kw3=MACRO
+    | kw1=DROP kw2=TEMPORARY kw3=MACRO
+    | kw1=ALTER kw2=TABLE tableIdentifier kw3=NOT kw4=CLUSTERED
+    | kw1=ALTER kw2=TABLE tableIdentifier kw3=CLUSTERED kw4=BY
+    | kw1=ALTER kw2=TABLE tableIdentifier kw3=NOT kw4=SORTED
+    | kw1=ALTER kw2=TABLE tableIdentifier kw3=SKEWED kw4=BY
+    | kw1=ALTER kw2=TABLE tableIdentifier kw3=NOT kw4=SKEWED
+    | kw1=ALTER kw2=TABLE tableIdentifier kw3=NOT kw4=STORED kw5=AS kw6=DIRECTORIES
+    | kw1=ALTER kw2=TABLE tableIdentifier kw3=SET kw4=SKEWED kw5=LOCATION
+    | kw1=ALTER kw2=TABLE tableIdentifier kw3=EXCHANGE kw4=PARTITION
+    | kw1=ALTER kw2=TABLE tableIdentifier kw3=ARCHIVE kw4=PARTITION
+    | kw1=ALTER kw2=TABLE tableIdentifier kw3=UNARCHIVE kw4=PARTITION
+    | kw1=ALTER kw2=TABLE tableIdentifier kw3=TOUCH
+    | kw1=ALTER kw2=TABLE tableIdentifier partitionSpec? kw3=COMPACT
+    | kw1=ALTER kw2=TABLE tableIdentifier partitionSpec? kw3=CONCATENATE
+    | kw1=ALTER kw2=TABLE tableIdentifier partitionSpec? kw3=SET kw4=FILEFORMAT
+    | kw1=ALTER kw2=TABLE tableIdentifier partitionSpec? kw3=REPLACE kw4=COLUMNS
+    | kw1=START kw2=TRANSACTION
+    | kw1=COMMIT
+    | kw1=ROLLBACK
+    | kw1=DFS
+    ;
+
+createTableHeader
+    : CREATE TEMPORARY? EXTERNAL? TABLE (IF errorCapturingNot EXISTS)? identifierReference
+    ;
+
+replaceTableHeader
+    : (CREATE OR)? REPLACE TABLE identifierReference
+    ;
+
+clusterBySpec
+    : CLUSTER BY LEFT_PAREN multipartIdentifierList RIGHT_PAREN
+    ;
+
+bucketSpec
+    : CLUSTERED BY identifierList
+      (SORTED BY orderedIdentifierList)?
+      INTO INTEGER_VALUE BUCKETS
+    ;
+
+skewSpec
+    : SKEWED BY identifierList
+      ON (constantList | nestedConstantList)
+      (STORED AS DIRECTORIES)?
+    ;
+
+locationSpec
+    : LOCATION stringLit
+    ;
+
+schemaBinding
+    : WITH SCHEMA (BINDING | COMPENSATION | EVOLUTION | TYPE EVOLUTION)
+    ;
+
+commentSpec
+    : COMMENT stringLit
+    ;
+
+query
+    : ctes? queryTerm queryOrganization
+    ;
+
+insertInto
+    : INSERT OVERWRITE TABLE? identifierReference optionsClause? (partitionSpec (IF errorCapturingNot EXISTS)?)?  ((BY NAME) | identifierList)? #insertOverwriteTable
+    | INSERT INTO TABLE? identifierReference optionsClause? partitionSpec? (IF errorCapturingNot EXISTS)? ((BY NAME) | identifierList)?   #insertIntoTable
+    | INSERT INTO TABLE? identifierReference optionsClause? REPLACE whereClause                                             #insertIntoReplaceWhere
+    | INSERT OVERWRITE LOCAL? DIRECTORY path=stringLit rowFormat? createFileFormat?                     #insertOverwriteHiveDir
+    | INSERT OVERWRITE LOCAL? DIRECTORY (path=stringLit)? tableProvider (OPTIONS options=propertyList)? #insertOverwriteDir
+    ;
+
+partitionSpecLocation
+    : partitionSpec locationSpec?
+    ;
+
+partitionSpec
+    : PARTITION LEFT_PAREN partitionVal (COMMA partitionVal)* RIGHT_PAREN
+    ;
+
+partitionVal
+    : identifier (EQ constant)?
+    | identifier EQ DEFAULT
+    ;
+
+namespace
+    : NAMESPACE
+    | DATABASE
+    | SCHEMA
+    ;
+
+namespaces
+    : NAMESPACES
+    | DATABASES
+    | SCHEMAS
+    ;
+
+variable
+    : VARIABLE
+    | VAR
+    ;
+
+describeFuncName
+    : identifierReference
+    | stringLit
+    | comparisonOperator
+    | arithmeticOperator
+    | predicateOperator
+    | shiftOperator
+    | BANG
+    ;
+
+describeColName
+    : nameParts+=errorCapturingIdentifier (DOT nameParts+=errorCapturingIdentifier)*
+    ;
+
+ctes
+    : WITH namedQuery (COMMA namedQuery)*
+    ;
+
+namedQuery
+    : name=errorCapturingIdentifier (columnAliases=identifierList)? AS? LEFT_PAREN query RIGHT_PAREN
+    ;
+
+tableProvider
+    : USING multipartIdentifier
+    ;
+
+createTableClauses
+    :((OPTIONS options=expressionPropertyList) |
+     (PARTITIONED BY partitioning=partitionFieldList) |
+     skewSpec |
+     clusterBySpec |
+     bucketSpec |
+     rowFormat |
+     createFileFormat |
+     locationSpec |
+     commentSpec |
+     (TBLPROPERTIES tableProps=propertyList))*
+    ;
+
+propertyList
+    : LEFT_PAREN property (COMMA property)* RIGHT_PAREN
+    ;
+
+property
+    : key=propertyKey (EQ? value=propertyValue)?
+    ;
+
+propertyKey
+    : errorCapturingIdentifier (DOT errorCapturingIdentifier)*
+    | stringLit
+    ;
+
+propertyValue
+    : INTEGER_VALUE
+    | DECIMAL_VALUE
+    | booleanValue
+    | stringLit
+    ;
+
+expressionPropertyList
+    : LEFT_PAREN expressionProperty (COMMA expressionProperty)* RIGHT_PAREN
+    ;
+
+expressionProperty
+    : key=propertyKey (EQ? value=expression)?
+    ;
+
+constantList
+    : LEFT_PAREN constant (COMMA constant)* RIGHT_PAREN
+    ;
+
+nestedConstantList
+    : LEFT_PAREN constantList (COMMA constantList)* RIGHT_PAREN
+    ;
+
+createFileFormat
+    : STORED AS fileFormat
+    | STORED BY storageHandler
+    ;
+
+fileFormat
+    : INPUTFORMAT inFmt=stringLit OUTPUTFORMAT outFmt=stringLit    #tableFileFormat
+    | identifier                                             #genericFileFormat
+    ;
+
+storageHandler
+    : stringLit (WITH SERDEPROPERTIES propertyList)?
+    ;
+
+resource
+    : identifier stringLit
+    ;
+
+dmlStatementNoWith
+    : insertInto query                                                             #singleInsertQuery
+    | fromClause multiInsertQueryBody+                                             #multiInsertQuery
+    | DELETE FROM identifierReference tableAlias whereClause?                      #deleteFromTable
+    | UPDATE identifierReference tableAlias setClause whereClause?                 #updateTable
+    | MERGE (WITH SCHEMA EVOLUTION)? INTO target=identifierReference targetAlias=tableAlias
+        USING (source=identifierReference |
+          LEFT_PAREN sourceQuery=query RIGHT_PAREN) sourceAlias=tableAlias
+        ON mergeCondition=booleanExpression
+        matchedClause*
+        notMatchedClause*
+        notMatchedBySourceClause*                                                  #mergeIntoTable
+    ;
+
+identifierReference
+    : IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN
+    | multipartIdentifier
+    ;
+
+queryOrganization
+    : (ORDER BY order+=sortItem (COMMA order+=sortItem)*)?
+      (CLUSTER BY clusterBy+=expression (COMMA clusterBy+=expression)*)?
+      (DISTRIBUTE BY distributeBy+=expression (COMMA distributeBy+=expression)*)?
+      (SORT BY sort+=sortItem (COMMA sort+=sortItem)*)?
+      windowClause?
+      (LIMIT (ALL | limit=expression))?
+      (OFFSET offset=expression)?
+    ;
+
+multiInsertQueryBody
+    : insertInto fromStatementBody
+    ;
+
+queryTerm
+    : queryPrimary                                                                       #queryTermDefault
+    | left=queryTerm {legacy_setops_precedence_enabled}?
+        operator=(INTERSECT | UNION | EXCEPT | SETMINUS) setQuantifier? right=queryTerm  #setOperation
+    | left=queryTerm {!legacy_setops_precedence_enabled}?
+        operator=INTERSECT setQuantifier? right=queryTerm                                #setOperation
+    | left=queryTerm {!legacy_setops_precedence_enabled}?
+        operator=(UNION | EXCEPT | SETMINUS) setQuantifier? right=queryTerm              #setOperation
+    ;
+
+queryPrimary
+    : querySpecification                                                    #queryPrimaryDefault
+    | fromStatement                                                         #fromStmt
+    | TABLE identifierReference                                             #table
+    | inlineTable                                                           #inlineTableDefault1
+    | LEFT_PAREN query RIGHT_PAREN                                          #subquery
+    ;
+
+sortItem
+    : expression ordering=(ASC | DESC)? (NULLS nullOrder=(LAST | FIRST))?
+    ;
+
+fromStatement
+    : fromClause fromStatementBody+
+    ;
+
+fromStatementBody
+    : transformClause
+      whereClause?
+      queryOrganization
+    | selectClause
+      lateralView*
+      whereClause?
+      aggregationClause?
+      havingClause?
+      windowClause?
+      queryOrganization
+    ;
+
+querySpecification
+    : transformClause
+      fromClause?
+      lateralView*
+      whereClause?
+      aggregationClause?
+      havingClause?
+      windowClause?                                                         #transformQuerySpecification
+    | selectClause
+      fromClause?
+      lateralView*
+      whereClause?
+      aggregationClause?
+      havingClause?
+      windowClause?                                                         #regularQuerySpecification
+    ;
+
+transformClause
+    : (SELECT kind=TRANSFORM LEFT_PAREN setQuantifier? expressionSeq RIGHT_PAREN
+            | kind=MAP setQuantifier? expressionSeq
+            | kind=REDUCE setQuantifier? expressionSeq)
+      inRowFormat=rowFormat?
+      (RECORDWRITER recordWriter=stringLit)?
+      USING script=stringLit
+      (AS (identifierSeq | colTypeList | (LEFT_PAREN (identifierSeq | colTypeList) RIGHT_PAREN)))?
+      outRowFormat=rowFormat?
+      (RECORDREADER recordReader=stringLit)?
+    ;
+
+selectClause
+    : SELECT (hints+=hint)* setQuantifier? namedExpressionSeq
+    ;
+
+setClause
+    : SET assignmentList
+    ;
+
+matchedClause
+    : WHEN MATCHED (AND matchedCond=booleanExpression)? THEN matchedAction
+    ;
+notMatchedClause
+    : WHEN errorCapturingNot MATCHED (BY TARGET)? (AND notMatchedCond=booleanExpression)? THEN notMatchedAction
+    ;
+
+notMatchedBySourceClause
+    : WHEN errorCapturingNot MATCHED BY SOURCE (AND notMatchedBySourceCond=booleanExpression)? THEN notMatchedBySourceAction
+    ;
+
+matchedAction
+    : DELETE
+    | UPDATE SET ASTERISK
+    | UPDATE SET assignmentList
+    ;
+
+notMatchedAction
+    : INSERT ASTERISK
+    | INSERT LEFT_PAREN columns=multipartIdentifierList RIGHT_PAREN
+        VALUES LEFT_PAREN expression (COMMA expression)* RIGHT_PAREN
+    ;
+
+notMatchedBySourceAction
+    : DELETE
+    | UPDATE SET assignmentList
+    ;
+
+exceptClause
+    : EXCEPT LEFT_PAREN exceptCols=multipartIdentifierList RIGHT_PAREN
+    ;
+
+assignmentList
+    : assignment (COMMA assignment)*
+    ;
+
+assignment
+    : key=multipartIdentifier EQ value=expression
+    ;
+
+whereClause
+    : WHERE booleanExpression
+    ;
+
+havingClause
+    : HAVING booleanExpression
+    ;
+
+hint
+    : HENT_START hintStatements+=hintStatement (COMMA? hintStatements+=hintStatement)* HENT_END
+    ;
+
+hintStatement
+    : hintName=identifier
+    | hintName=identifier LEFT_PAREN parameters+=primaryExpression (COMMA parameters+=primaryExpression)* RIGHT_PAREN
+    ;
+
+fromClause
+    : FROM relation (COMMA relation)* lateralView* pivotClause? unpivotClause?
+    ;
+
+temporalClause
+    : FOR? (SYSTEM_VERSION | VERSION) AS OF version
+    | FOR? (SYSTEM_TIME | TIMESTAMP) AS OF timestamp=valueExpression
+    ;
+
+aggregationClause
+    : GROUP BY groupingExpressionsWithGroupingAnalytics+=groupByClause
+        (COMMA groupingExpressionsWithGroupingAnalytics+=groupByClause)*
+    | GROUP BY groupingExpressions+=expression (COMMA groupingExpressions+=expression)* (
+      WITH kind=ROLLUP
+    | WITH kind=CUBE
+    | kind=GROUPING SETS LEFT_PAREN groupingSet (COMMA groupingSet)* RIGHT_PAREN)?
+    ;
+
+groupByClause
+    : groupingAnalytics
+    | expression
+    ;
+
+groupingAnalytics
+    : (ROLLUP | CUBE) LEFT_PAREN groupingSet (COMMA groupingSet)* RIGHT_PAREN
+    | GROUPING SETS LEFT_PAREN groupingElement (COMMA groupingElement)* RIGHT_PAREN
+    ;
+
+groupingElement
+    : groupingAnalytics
+    | groupingSet
+    ;
+
+groupingSet
+    : LEFT_PAREN (expression (COMMA expression)*)? RIGHT_PAREN
+    | expression
+    ;
+
+pivotClause
+    : PIVOT LEFT_PAREN aggregates=namedExpressionSeq FOR pivotColumn IN LEFT_PAREN pivotValues+=pivotValue (COMMA pivotValues+=pivotValue)* RIGHT_PAREN RIGHT_PAREN
+    ;
+
+pivotColumn
+    : identifiers+=errorCapturingIdentifier
+    | LEFT_PAREN identifiers+=errorCapturingIdentifier (COMMA identifiers+=errorCapturingIdentifier)* RIGHT_PAREN
+    ;
+
+pivotValue
+    : expression (AS? errorCapturingIdentifier)?
+    ;
+
+unpivotClause
+    : UNPIVOT nullOperator=unpivotNullClause? LEFT_PAREN
+        operator=unpivotOperator
+      RIGHT_PAREN (AS? errorCapturingIdentifier)?
+    ;
+
+unpivotNullClause
+    : (INCLUDE | EXCLUDE) NULLS
+    ;
+
+unpivotOperator
+    : (unpivotSingleValueColumnClause | unpivotMultiValueColumnClause)
+    ;
+
+unpivotSingleValueColumnClause
+    : unpivotValueColumn FOR unpivotNameColumn IN LEFT_PAREN unpivotColumns+=unpivotColumnAndAlias (COMMA unpivotColumns+=unpivotColumnAndAlias)* RIGHT_PAREN
+    ;
+
+unpivotMultiValueColumnClause
+    : LEFT_PAREN unpivotValueColumns+=unpivotValueColumn (COMMA unpivotValueColumns+=unpivotValueColumn)* RIGHT_PAREN
+      FOR unpivotNameColumn
+      IN LEFT_PAREN unpivotColumnSets+=unpivotColumnSet (COMMA unpivotColumnSets+=unpivotColumnSet)* RIGHT_PAREN
+    ;
+
+unpivotColumnSet
+    : LEFT_PAREN unpivotColumns+=unpivotColumn (COMMA unpivotColumns+=unpivotColumn)* RIGHT_PAREN unpivotAlias?
+    ;
+
+unpivotValueColumn
+    : identifier
+    ;
+
+unpivotNameColumn
+    : identifier
+    ;
+
+unpivotColumnAndAlias
+    : unpivotColumn unpivotAlias?
+    ;
+
+unpivotColumn
+    : multipartIdentifier
+    ;
+
+unpivotAlias
+    : AS? errorCapturingIdentifier
+    ;
+
+lateralView
+    : LATERAL VIEW (OUTER)? qualifiedName LEFT_PAREN (expression (COMMA expression)*)? RIGHT_PAREN tblName=identifier (AS? colName+=identifier (COMMA colName+=identifier)*)?
+    ;
+
+setQuantifier
+    : DISTINCT
+    | ALL
+    ;
+
+relation
+    : LATERAL? relationPrimary relationExtension*
+    ;
+
+relationExtension
+    : joinRelation
+    | pivotClause
+    | unpivotClause
+    ;
+
+joinRelation
+    : (joinType) JOIN LATERAL? right=relationPrimary joinCriteria?
+    | NATURAL joinType JOIN LATERAL? right=relationPrimary
+    ;
+
+joinType
+    : INNER?
+    | CROSS
+    | LEFT OUTER?
+    | LEFT? SEMI
+    | RIGHT OUTER?
+    | FULL OUTER?
+    | LEFT? ANTI
+    ;
+
+joinCriteria
+    : ON booleanExpression
+    | USING identifierList
+    ;
+
+sample
+    : TABLESAMPLE LEFT_PAREN sampleMethod? RIGHT_PAREN (REPEATABLE LEFT_PAREN seed=INTEGER_VALUE RIGHT_PAREN)?
+    ;
+
+sampleMethod
+    : negativeSign=MINUS? percentage=(INTEGER_VALUE | DECIMAL_VALUE) PERCENTLIT   #sampleByPercentile
+    | expression ROWS                                                             #sampleByRows
+    | sampleType=BUCKET numerator=INTEGER_VALUE OUT OF denominator=INTEGER_VALUE
+        (ON (identifier | qualifiedName LEFT_PAREN RIGHT_PAREN))?                 #sampleByBucket
+    | bytes=expression                                                            #sampleByBytes
+    ;
+
+identifierList
+    : LEFT_PAREN identifierSeq RIGHT_PAREN
+    ;
+
+identifierSeq
+    : ident+=errorCapturingIdentifier (COMMA ident+=errorCapturingIdentifier)*
+    ;
+
+orderedIdentifierList
+    : LEFT_PAREN orderedIdentifier (COMMA orderedIdentifier)* RIGHT_PAREN
+    ;
+
+orderedIdentifier
+    : ident=errorCapturingIdentifier ordering=(ASC | DESC)?
+    ;
+
+identifierCommentList
+    : LEFT_PAREN identifierComment (COMMA identifierComment)* RIGHT_PAREN
+    ;
+
+identifierComment
+    : identifier commentSpec?
+    ;
+
+relationPrimary
+    : identifierReference temporalClause?
+      optionsClause? sample? tableAlias                     #tableName
+    | LEFT_PAREN query RIGHT_PAREN sample? tableAlias       #aliasedQuery
+    | LEFT_PAREN relation RIGHT_PAREN sample? tableAlias    #aliasedRelation
+    | inlineTable                                           #inlineTableDefault2
+    | functionTable                                         #tableValuedFunction
+    ;
+
+optionsClause
+    : WITH options=propertyList
+    ;
+
+inlineTable
+    : VALUES expression (COMMA expression)* tableAlias
+    ;
+
+functionTableSubqueryArgument
+    : TABLE identifierReference tableArgumentPartitioning?
+    | TABLE LEFT_PAREN identifierReference RIGHT_PAREN tableArgumentPartitioning?
+    | TABLE LEFT_PAREN query RIGHT_PAREN tableArgumentPartitioning?
+    ;
+
+tableArgumentPartitioning
+    : ((WITH SINGLE PARTITION)
+        | ((PARTITION | DISTRIBUTE) BY
+            (((LEFT_PAREN partition+=expression (COMMA partition+=expression)* RIGHT_PAREN))
+            | (expression (COMMA invalidMultiPartitionExpression=expression)+)
+            | partition+=expression)))
+      ((ORDER | SORT) BY
+        (((LEFT_PAREN sortItem (COMMA sortItem)* RIGHT_PAREN)
+        | (sortItem (COMMA invalidMultiSortItem=sortItem)+)
+        | sortItem)))?
+    ;
+
+functionTableNamedArgumentExpression
+    : key=identifier FAT_ARROW table=functionTableSubqueryArgument
+    ;
+
+functionTableReferenceArgument
+    : functionTableSubqueryArgument
+    | functionTableNamedArgumentExpression
+    ;
+
+functionTableArgument
+    : functionTableReferenceArgument
+    | functionArgument
+    ;
+
+functionTable
+    : funcName=functionName LEFT_PAREN
+      (functionTableArgument (COMMA functionTableArgument)*)?
+      RIGHT_PAREN tableAlias
+    ;
+
+tableAlias
+    : (AS? strictIdentifier identifierList?)?
+    ;
+
+rowFormat
+    : ROW FORMAT SERDE name=stringLit (WITH SERDEPROPERTIES props=propertyList)?       #rowFormatSerde
+    | ROW FORMAT DELIMITED
+      (FIELDS TERMINATED BY fieldsTerminatedBy=stringLit (ESCAPED BY escapedBy=stringLit)?)?
+      (COLLECTION ITEMS TERMINATED BY collectionItemsTerminatedBy=stringLit)?
+      (MAP KEYS TERMINATED BY keysTerminatedBy=stringLit)?
+      (LINES TERMINATED BY linesSeparatedBy=stringLit)?
+      (NULL DEFINED AS nullDefinedAs=stringLit)?                                       #rowFormatDelimited
+    ;
+
+multipartIdentifierList
+    : multipartIdentifier (COMMA multipartIdentifier)*
+    ;
+
+multipartIdentifier
+    : parts+=errorCapturingIdentifier (DOT parts+=errorCapturingIdentifier)*
+    ;
+
+multipartIdentifierPropertyList
+    : multipartIdentifierProperty (COMMA multipartIdentifierProperty)*
+    ;
+
+multipartIdentifierProperty
+    : multipartIdentifier (OPTIONS options=propertyList)?
+    ;
+
+tableIdentifier
+    : (db=errorCapturingIdentifier DOT)? table=errorCapturingIdentifier
+    ;
+
+functionIdentifier
+    : (db=errorCapturingIdentifier DOT)? function=errorCapturingIdentifier
+    ;
+
+namedExpression
+    : expression (AS? (name=errorCapturingIdentifier | identifierList))?
+    ;
+
+namedExpressionSeq
+    : namedExpression (COMMA namedExpression)*
+    ;
+
+partitionFieldList
+    : LEFT_PAREN fields+=partitionField (COMMA fields+=partitionField)* RIGHT_PAREN
+    ;
+
+partitionField
+    : transform  #partitionTransform
+    | colType    #partitionColumn
+    ;
+
+transform
+    : qualifiedName                                                                             #identityTransform
+    | transformName=identifier
+      LEFT_PAREN argument+=transformArgument (COMMA argument+=transformArgument)* RIGHT_PAREN   #applyTransform
+    ;
+
+transformArgument
+    : qualifiedName
+    | constant
+    ;
+
+expression
+    : booleanExpression
+    ;
+
+namedArgumentExpression
+    : key=identifier FAT_ARROW value=expression
+    ;
+
+functionArgument
+    : expression
+    | namedArgumentExpression
+    ;
+
+expressionSeq
+    : expression (COMMA expression)*
+    ;
+
+booleanExpression
+    : (NOT | BANG) booleanExpression                               #logicalNot
+    | EXISTS LEFT_PAREN query RIGHT_PAREN                          #exists
+    | valueExpression predicate?                                   #predicated
+    | left=booleanExpression operator=AND right=booleanExpression  #logicalBinary
+    | left=booleanExpression operator=OR right=booleanExpression   #logicalBinary
+    ;
+
+predicate
+    : errorCapturingNot? kind=BETWEEN lower=valueExpression AND upper=valueExpression
+    | errorCapturingNot? kind=IN LEFT_PAREN expression (COMMA expression)* RIGHT_PAREN
+    | errorCapturingNot? kind=IN LEFT_PAREN query RIGHT_PAREN
+    | errorCapturingNot? kind=RLIKE pattern=valueExpression
+    | errorCapturingNot? kind=(LIKE | ILIKE) quantifier=(ANY | SOME | ALL) (LEFT_PAREN RIGHT_PAREN | LEFT_PAREN expression (COMMA expression)* RIGHT_PAREN)
+    | errorCapturingNot? kind=(LIKE | ILIKE) pattern=valueExpression (ESCAPE escapeChar=stringLit)?
+    | IS errorCapturingNot? kind=NULL
+    | IS errorCapturingNot? kind=(TRUE | FALSE | UNKNOWN)
+    | IS errorCapturingNot? kind=DISTINCT FROM right=valueExpression
+    ;
+
+errorCapturingNot
+    : NOT
+    | BANG
+    ;
+
+valueExpression
+    : primaryExpression                                                                      #valueExpressionDefault
+    | operator=(MINUS | PLUS | TILDE) valueExpression                                        #arithmeticUnary
+    | left=valueExpression operator=(ASTERISK | SLASH | PERCENT | DIV) right=valueExpression #arithmeticBinary
+    | left=valueExpression operator=(PLUS | MINUS | CONCAT_PIPE) right=valueExpression       #arithmeticBinary
+    | left=valueExpression shiftOperator right=valueExpression                               #shiftExpression
+    | left=valueExpression operator=AMPERSAND right=valueExpression                          #arithmeticBinary
+    | left=valueExpression operator=HAT right=valueExpression                                #arithmeticBinary
+    | left=valueExpression operator=PIPE right=valueExpression                               #arithmeticBinary
+    | left=valueExpression comparisonOperator right=valueExpression                          #comparison
+    ;
+
+shiftOperator
+    : SHIFT_LEFT
+    | SHIFT_RIGHT
+    | SHIFT_RIGHT_UNSIGNED
+    ;
+
+datetimeUnit
+    : YEAR | QUARTER | MONTH
+    | WEEK | DAY | DAYOFYEAR
+    | HOUR | MINUTE | SECOND | MILLISECOND | MICROSECOND
+    ;
+
+primaryExpression
+    : name=(CURRENT_DATE | CURRENT_TIMESTAMP | CURRENT_USER | USER | SESSION_USER)             #currentLike
+    | name=(TIMESTAMPADD | DATEADD | DATE_ADD) LEFT_PAREN (unit=datetimeUnit | invalidUnit=stringLit) COMMA unitsAmount=valueExpression COMMA timestamp=valueExpression RIGHT_PAREN             #timestampadd
+    | name=(TIMESTAMPDIFF | DATEDIFF | DATE_DIFF | TIMEDIFF) LEFT_PAREN (unit=datetimeUnit | invalidUnit=stringLit) COMMA startTimestamp=valueExpression COMMA endTimestamp=valueExpression RIGHT_PAREN    #timestampdiff
+    | CASE whenClause+ (ELSE elseExpression=expression)? END                                   #searchedCase
+    | CASE value=expression whenClause+ (ELSE elseExpression=expression)? END                  #simpleCase
+    | name=(CAST | TRY_CAST) LEFT_PAREN expression AS dataType RIGHT_PAREN                     #cast
+    | primaryExpression collateClause                                                      #collate
+    | primaryExpression DOUBLE_COLON dataType                                                  #castByColon
+    | STRUCT LEFT_PAREN (argument+=namedExpression (COMMA argument+=namedExpression)*)? RIGHT_PAREN #struct
+    | FIRST LEFT_PAREN expression (IGNORE NULLS)? RIGHT_PAREN                                  #first
+    | ANY_VALUE LEFT_PAREN expression (IGNORE NULLS)? RIGHT_PAREN                              #any_value
+    | LAST LEFT_PAREN expression (IGNORE NULLS)? RIGHT_PAREN                                   #last
+    | POSITION LEFT_PAREN substr=valueExpression IN str=valueExpression RIGHT_PAREN            #position
+    | constant                                                                                 #constantDefault
+    | ASTERISK exceptClause?                                                                   #star
+    | qualifiedName DOT ASTERISK exceptClause?                                                 #star
+    | LEFT_PAREN namedExpression (COMMA namedExpression)+ RIGHT_PAREN                          #rowConstructor
+    | LEFT_PAREN query RIGHT_PAREN                                                             #subqueryExpression
+    | functionName LEFT_PAREN (setQuantifier? argument+=functionArgument
+       (COMMA argument+=functionArgument)*)? RIGHT_PAREN
+       (WITHIN GROUP LEFT_PAREN ORDER BY sortItem (COMMA sortItem)* RIGHT_PAREN)?
+       (FILTER LEFT_PAREN WHERE where=booleanExpression RIGHT_PAREN)?
+       (nullsOption=(IGNORE | RESPECT) NULLS)? ( OVER windowSpec)?                             #functionCall
+    | identifier ARROW expression                                                              #lambda
+    | LEFT_PAREN identifier (COMMA identifier)+ RIGHT_PAREN ARROW expression                   #lambda
+    | value=primaryExpression LEFT_BRACKET index=valueExpression RIGHT_BRACKET                 #subscript
+    | identifier                                                                               #columnReference
+    | base=primaryExpression DOT fieldName=identifier                                          #dereference
+    | LEFT_PAREN expression RIGHT_PAREN                                                        #parenthesizedExpression
+    | EXTRACT LEFT_PAREN field=identifier FROM source=valueExpression RIGHT_PAREN              #extract
+    | (SUBSTR | SUBSTRING) LEFT_PAREN str=valueExpression (FROM | COMMA) pos=valueExpression
+      ((FOR | COMMA) len=valueExpression)? RIGHT_PAREN                                         #substring
+    | TRIM LEFT_PAREN trimOption=(BOTH | LEADING | TRAILING)? (trimStr=valueExpression)?
+       FROM srcStr=valueExpression RIGHT_PAREN                                                 #trim
+    | OVERLAY LEFT_PAREN input=valueExpression PLACING replace=valueExpression
+      FROM position=valueExpression (FOR length=valueExpression)? RIGHT_PAREN                  #overlay
+    ;
+
+literalType
+    : DATE
+    | TIMESTAMP | TIMESTAMP_LTZ | TIMESTAMP_NTZ
+    | INTERVAL
+    | BINARY_HEX
+    | unsupportedType=identifier
+    ;
+
+constant
+    : NULL                                                                                     #nullLiteral
+    | QUESTION                                                                                 #posParameterLiteral
+    | COLON identifier                                                                         #namedParameterLiteral
+    | interval                                                                                 #intervalLiteral
+    | literalType stringLit                                                                    #typeConstructor
+    | number                                                                                   #numericLiteral
+    | booleanValue                                                                             #booleanLiteral
+    | stringLit+                                                                               #stringLiteral
+    ;
+
+comparisonOperator
+    : EQ | NEQ | NEQJ | LT | LTE | GT | GTE | NSEQ
+    ;
+
+arithmeticOperator
+    : PLUS | MINUS | ASTERISK | SLASH | PERCENT | DIV | TILDE | AMPERSAND | PIPE | CONCAT_PIPE | HAT
+    ;
+
+predicateOperator
+    : OR | AND | IN | NOT
+    ;
+
+booleanValue
+    : TRUE | FALSE
+    ;
+
+interval
+    : INTERVAL (errorCapturingMultiUnitsInterval | errorCapturingUnitToUnitInterval)
+    ;
+
+errorCapturingMultiUnitsInterval
+    : body=multiUnitsInterval unitToUnitInterval?
+    ;
+
+multiUnitsInterval
+    : (intervalValue unit+=unitInMultiUnits)+
+    ;
+
+errorCapturingUnitToUnitInterval
+    : body=unitToUnitInterval (error1=multiUnitsInterval | error2=unitToUnitInterval)?
+    ;
+
+unitToUnitInterval
+    : value=intervalValue from=unitInUnitToUnit TO to=unitInUnitToUnit
+    ;
+
+intervalValue
+    : (PLUS | MINUS)?
+      (INTEGER_VALUE | DECIMAL_VALUE | stringLit)
+    ;
+
+unitInMultiUnits
+    : NANOSECOND | NANOSECONDS | MICROSECOND | MICROSECONDS | MILLISECOND | MILLISECONDS
+    | SECOND | SECONDS | MINUTE | MINUTES | HOUR | HOURS | DAY | DAYS | WEEK | WEEKS
+    | MONTH | MONTHS | YEAR | YEARS
+    ;
+
+unitInUnitToUnit
+    : SECOND | MINUTE | HOUR | DAY | MONTH | YEAR
+    ;
+
+colPosition
+    : position=FIRST | position=AFTER afterCol=errorCapturingIdentifier
+    ;
+
+collateClause
+    : COLLATE collationName=identifier
+    ;
+
+type
+    : BOOLEAN
+    | TINYINT | BYTE
+    | SMALLINT | SHORT
+    | INT | INTEGER
+    | BIGINT | LONG
+    | FLOAT | REAL
+    | DOUBLE
+    | DATE
+    | TIMESTAMP | TIMESTAMP_NTZ | TIMESTAMP_LTZ
+    | STRING collateClause?
+    | CHARACTER | CHAR
+    | VARCHAR
+    | BINARY
+    | DECIMAL | DEC | NUMERIC
+    | VOID
+    | INTERVAL
+    | VARIANT
+    | ARRAY | STRUCT | MAP
+    | unsupportedType=identifier
+    ;
+
+dataType
+    : complex=ARRAY LT dataType GT                              #complexDataType
+    | complex=MAP LT dataType COMMA dataType GT                 #complexDataType
+    | complex=STRUCT (LT complexColTypeList? GT | NEQ)          #complexDataType
+    | INTERVAL from=(YEAR | MONTH) (TO to=MONTH)?               #yearMonthIntervalDataType
+    | INTERVAL from=(DAY | HOUR | MINUTE | SECOND)
+      (TO to=(HOUR | MINUTE | SECOND))?                         #dayTimeIntervalDataType
+    | type (LEFT_PAREN INTEGER_VALUE
+      (COMMA INTEGER_VALUE)* RIGHT_PAREN)?                      #primitiveDataType
+    ;
+
+qualifiedColTypeWithPositionList
+    : qualifiedColTypeWithPosition (COMMA qualifiedColTypeWithPosition)*
+    ;
+
+qualifiedColTypeWithPosition
+    : name=multipartIdentifier dataType colDefinitionDescriptorWithPosition*
+    ;
+
+colDefinitionDescriptorWithPosition
+    : errorCapturingNot NULL
+    | defaultExpression
+    | commentSpec
+    | colPosition
+    ;
+
+defaultExpression
+    : DEFAULT expression
+    ;
+
+variableDefaultExpression
+    : (DEFAULT | EQ) expression
+    ;
+
+colTypeList
+    : colType (COMMA colType)*
+    ;
+
+colType
+    : colName=errorCapturingIdentifier dataType (errorCapturingNot NULL)? commentSpec?
+    ;
+
+colDefinitionList
+    : colDefinition (COMMA colDefinition)*
+    ;
+
+colDefinition
+    : colName=errorCapturingIdentifier dataType colDefinitionOption*
+    ;
+
+colDefinitionOption
+    : errorCapturingNot NULL
+    | defaultExpression
+    | generationExpression
+    | commentSpec
+    ;
+
+generationExpression
+    : GENERATED ALWAYS AS LEFT_PAREN expression RIGHT_PAREN
+    ;
+
+complexColTypeList
+    : complexColType (COMMA complexColType)*
+    ;
+
+complexColType
+    : errorCapturingIdentifier COLON? dataType (errorCapturingNot NULL)? commentSpec?
+    ;
+
+routineCharacteristics
+    : (routineLanguage
+    | specificName
+    | deterministic
+    | sqlDataAccess
+    | nullCall
+    | commentSpec
+    | rightsClause)*
+    ;
+
+routineLanguage
+    : LANGUAGE (SQL | IDENTIFIER)
+    ;
+
+specificName
+    : SPECIFIC specific=errorCapturingIdentifier
+    ;
+
+deterministic
+    : DETERMINISTIC
+    | errorCapturingNot DETERMINISTIC
+    ;
+
+sqlDataAccess
+    : access=NO SQL
+    | access=CONTAINS SQL
+    | access=READS SQL DATA
+    | access=MODIFIES SQL DATA
+    ;
+
+nullCall
+    : RETURNS NULL ON NULL INPUT
+    | CALLED ON NULL INPUT
+    ;
+
+rightsClause
+    : SQL SECURITY INVOKER
+    | SQL SECURITY DEFINER
+   ;
+
+whenClause
+    : WHEN condition=expression THEN result=expression
+    ;
+
+windowClause
+    : WINDOW namedWindow (COMMA namedWindow)*
+    ;
+
+namedWindow
+    : name=errorCapturingIdentifier AS windowSpec
+    ;
+
+windowSpec
+    : name=errorCapturingIdentifier                         #windowRef
+    | LEFT_PAREN name=errorCapturingIdentifier RIGHT_PAREN  #windowRef
+    | LEFT_PAREN
+      ( CLUSTER BY partition+=expression (COMMA partition+=expression)*
+      | ((PARTITION | DISTRIBUTE) BY partition+=expression (COMMA partition+=expression)*)?
+        ((ORDER | SORT) BY sortItem (COMMA sortItem)*)?)
+      windowFrame?
+      RIGHT_PAREN                                           #windowDef
+    ;
+
+windowFrame
+    : frameType=RANGE start=frameBound
+    | frameType=ROWS start=frameBound
+    | frameType=RANGE BETWEEN start=frameBound AND end=frameBound
+    | frameType=ROWS BETWEEN start=frameBound AND end=frameBound
+    ;
+
+frameBound
+    : UNBOUNDED boundType=(PRECEDING | FOLLOWING)
+    | boundType=CURRENT ROW
+    | expression boundType=(PRECEDING | FOLLOWING)
+    ;
+
+qualifiedNameList
+    : qualifiedName (COMMA qualifiedName)*
+    ;
+
+functionName
+    : IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN
+    | identFunc=IDENTIFIER_KW   // IDENTIFIER itself is also a valid function name.
+    | qualifiedName
+    | FILTER
+    | LEFT
+    | RIGHT
+    ;
+
+qualifiedName
+    : identifier (DOT identifier)*
+    ;
+
+// this rule is used for explicitly capturing wrong identifiers such as test-table, which should actually be `test-table`
+// replace identifier with errorCapturingIdentifier where the immediate follow symbol is not an expression, otherwise
+// valid expressions such as "a-b" can be recognized as an identifier
+errorCapturingIdentifier
+    : identifier errorCapturingIdentifierExtra
+    ;
+
+// extra left-factoring grammar
+errorCapturingIdentifierExtra
+    : (MINUS identifier)+    #errorIdent
+    |                        #realIdent
+    ;
+
+identifier
+    : strictIdentifier
+    | {!SQL_standard_keyword_behavior}? strictNonReserved
+    ;
+
+strictIdentifier
+    : IDENTIFIER              #unquotedIdentifier
+    | quotedIdentifier        #quotedIdentifierAlternative
+    | {SQL_standard_keyword_behavior}? ansiNonReserved #unquotedIdentifier
+    | {!SQL_standard_keyword_behavior}? nonReserved    #unquotedIdentifier
+    ;
+
+quotedIdentifier
+    : BACKQUOTED_IDENTIFIER
+    | {double_quoted_identifiers}? DOUBLEQUOTED_STRING
+    ;
+
+backQuotedIdentifier
+    : BACKQUOTED_IDENTIFIER
+    ;
+
+number
+    : {!legacy_exponent_literal_as_decimal_enabled}? MINUS? EXPONENT_VALUE #exponentLiteral
+    | {!legacy_exponent_literal_as_decimal_enabled}? MINUS? DECIMAL_VALUE  #decimalLiteral
+    | {legacy_exponent_literal_as_decimal_enabled}? MINUS? (EXPONENT_VALUE | DECIMAL_VALUE) #legacyDecimalLiteral
+    | MINUS? INTEGER_VALUE            #integerLiteral
+    | MINUS? BIGINT_LITERAL           #bigIntLiteral
+    | MINUS? SMALLINT_LITERAL         #smallIntLiteral
+    | MINUS? TINYINT_LITERAL          #tinyIntLiteral
+    | MINUS? DOUBLE_LITERAL           #doubleLiteral
+    | MINUS? FLOAT_LITERAL            #floatLiteral
+    | MINUS? BIGDECIMAL_LITERAL       #bigDecimalLiteral
+    ;
+
+alterColumnAction
+    : TYPE dataType
+    | commentSpec
+    | colPosition
+    | setOrDrop=(SET | DROP) errorCapturingNot NULL
+    | SET defaultExpression
+    | dropDefault=DROP DEFAULT
+    ;
+
+stringLit
+    : STRING_LITERAL
+    | {!double_quoted_identifiers}? DOUBLEQUOTED_STRING
+    ;
+
+comment
+    : stringLit
+    | NULL
+    ;
+
+version
+    : INTEGER_VALUE
+    | stringLit
+    ;
+
+// When `SQL_standard_keyword_behavior=true`, there are 2 kinds of keywords in Spark SQL.
+// - Reserved keywords:
+//     Keywords that are reserved and can't be used as identifiers for table, view, column,
+//     function, alias, etc.
+// - Non-reserved keywords:
+//     Keywords that have a special meaning only in particular contexts and can be used as
+//     identifiers in other contexts. For example, `EXPLAIN SELECT ...` is a command, but EXPLAIN
+//     can be used as identifiers in other places.
+// You can find the full keywords list by searching "Start of the keywords list" in this file.
+// The non-reserved keywords are listed below. Keywords not in this list are reserved keywords.
+ansiNonReserved
+//--ANSI-NON-RESERVED-START
+    : ADD
+    | AFTER
+    | ALTER
+    | ALWAYS
+    | ANALYZE
+    | ANTI
+    | ANY_VALUE
+    | ARCHIVE
+    | ARRAY
+    | ASC
+    | AT
+    | BEGIN
+    | BETWEEN
+    | BIGINT
+    | BINARY
+    | BINARY_HEX
+    | BINDING
+    | BOOLEAN
+    | BUCKET
+    | BUCKETS
+    | BY
+    | BYTE
+    | CACHE
+    | CALLED
+    | CASCADE
+    | CATALOG
+    | CATALOGS
+    | CHANGE
+    | CHAR
+    | CHARACTER
+    | CLEAR
+    | CLUSTER
+    | CLUSTERED
+    | CODEGEN
+    | COLLECTION
+    | COLUMNS
+    | COMMENT
+    | COMMIT
+    | COMPACT
+    | COMPACTIONS
+    | COMPENSATION
+    | COMPUTE
+    | CONCATENATE
+    | CONTAINS
+    | COST
+    | CUBE
+    | CURRENT
+    | DATA
+    | DATABASE
+    | DATABASES
+    | DATE
+    | DATEADD
+    | DATE_ADD
+    | DATEDIFF
+    | DATE_DIFF
+    | DAY
+    | DAYS
+    | DAYOFYEAR
+    | DBPROPERTIES
+    | DEC
+    | DECIMAL
+    | DECLARE
+    | DEFAULT
+    | DEFINED
+    | DEFINER
+    | DELETE
+    | DELIMITED
+    | DESC
+    | DESCRIBE
+    | DETERMINISTIC
+    | DFS
+    | DIRECTORIES
+    | DIRECTORY
+    | DISTRIBUTE
+    | DIV
+    | DO
+    | DOUBLE
+    | DROP
+    | ESCAPED
+    | EVOLUTION
+    | EXCHANGE
+    | EXCLUDE
+    | EXISTS
+    | EXPLAIN
+    | EXPORT
+    | EXTENDED
+    | EXTERNAL
+    | EXTRACT
+    | FIELDS
+    | FILEFORMAT
+    | FIRST
+    | FLOAT
+    | FOLLOWING
+    | FORMAT
+    | FORMATTED
+    | FUNCTION
+    | FUNCTIONS
+    | GENERATED
+    | GLOBAL
+    | GROUPING
+    | HOUR
+    | HOURS
+    | IDENTIFIER_KW
+    | IF
+    | IGNORE
+    | IMMEDIATE
+    | IMPORT
+    | INCLUDE
+    | INDEX
+    | INDEXES
+    | INPATH
+    | INPUT
+    | INPUTFORMAT
+    | INSERT
+    | INT
+    | INTEGER
+    | INTERVAL
+    | INVOKER
+    | ITEMS
+    | KEYS
+    | LANGUAGE
+    | LAST
+    | LAZY
+    | LIKE
+    | ILIKE
+    | LIMIT
+    | LINES
+    | LIST
+    | LOAD
+    | LOCAL
+    | LOCATION
+    | LOCK
+    | LOCKS
+    | LOGICAL
+    | LONG
+    | MACRO
+    | MAP
+    | MATCHED
+    | MERGE
+    | MICROSECOND
+    | MICROSECONDS
+    | MILLISECOND
+    | MILLISECONDS
+    | MINUTE
+    | MINUTES
+    | MODIFIES
+    | MONTH
+    | MONTHS
+    | MSCK
+    | NAME
+    | NAMESPACE
+    | NAMESPACES
+    | NANOSECOND
+    | NANOSECONDS
+    | NO
+    | NONE
+    | NULLS
+    | NUMERIC
+    | OF
+    | OPTION
+    | OPTIONS
+    | OUT
+    | OUTPUTFORMAT
+    | OVER
+    | OVERLAY
+    | OVERWRITE
+    | PARTITION
+    | PARTITIONED
+    | PARTITIONS
+    | PERCENTLIT
+    | PIVOT
+    | PLACING
+    | POSITION
+    | PRECEDING
+    | PRINCIPALS
+    | PROPERTIES
+    | PURGE
+    | QUARTER
+    | QUERY
+    | RANGE
+    | READS
+    | REAL
+    | RECORDREADER
+    | RECORDWRITER
+    | RECOVER
+    | REDUCE
+    | REFRESH
+    | RENAME
+    | REPAIR
+    | REPEATABLE
+    | REPLACE
+    | RESET
+    | RESPECT
+    | RESTRICT
+    | RETURN
+    | RETURNS
+    | REVOKE
+    | RLIKE
+    | ROLE
+    | ROLES
+    | ROLLBACK
+    | ROLLUP
+    | ROW
+    | ROWS
+    | SCHEMA
+    | SCHEMAS
+    | SECOND
+    | SECONDS
+    | SECURITY
+    | SEMI
+    | SEPARATED
+    | SERDE
+    | SERDEPROPERTIES
+    | SET
+    | SETMINUS
+    | SETS
+    | SHORT
+    | SHOW
+    | SINGLE
+    | SKEWED
+    | SMALLINT
+    | SORT
+    | SORTED
+    | SOURCE
+    | SPECIFIC
+    | START
+    | STATISTICS
+    | STORED
+    | STRATIFY
+    | STRING
+    | STRUCT
+    | SUBSTR
+    | SUBSTRING
+    | SYNC
+    | SYSTEM_TIME
+    | SYSTEM_VERSION
+    | TABLES
+    | TABLESAMPLE
+    | TARGET
+    | TBLPROPERTIES
+    | TEMPORARY
+    | TERMINATED
+    | TIMEDIFF
+    | TIMESTAMP
+    | TIMESTAMP_LTZ
+    | TIMESTAMP_NTZ
+    | TIMESTAMPADD
+    | TIMESTAMPDIFF
+    | TINYINT
+    | TOUCH
+    | TRANSACTION
+    | TRANSACTIONS
+    | TRANSFORM
+    | TRIM
+    | TRUE
+    | TRUNCATE
+    | TRY_CAST
+    | TYPE
+    | UNARCHIVE
+    | UNBOUNDED
+    | UNCACHE
+    | UNLOCK
+    | UNPIVOT
+    | UNSET
+    | UPDATE
+    | USE
+    | VALUES
+    | VARCHAR
+    | VAR
+    | VARIABLE
+    | VARIANT
+    | VERSION
+    | VIEW
+    | VIEWS
+    | VOID
+    | WEEK
+    | WEEKS
+    | WHILE
+    | WINDOW
+    | YEAR
+    | YEARS
+    | ZONE
+//--ANSI-NON-RESERVED-END
+    ;
+
+// When `SQL_standard_keyword_behavior=false`, there are 2 kinds of keywords in Spark SQL.
+// - Non-reserved keywords:
+//     Same definition as the one when `SQL_standard_keyword_behavior=true`.
+// - Strict-non-reserved keywords:
+//     A strict version of non-reserved keywords, which can not be used as table alias.
+// You can find the full keywords list by searching "Start of the keywords list" in this file.
+// The strict-non-reserved keywords are listed in `strictNonReserved`.
+// The non-reserved keywords are listed in `nonReserved`.
+// These 2 together contain all the keywords.
+strictNonReserved
+    : ANTI
+    | CROSS
+    | EXCEPT
+    | FULL
+    | INNER
+    | INTERSECT
+    | JOIN
+    | LATERAL
+    | LEFT
+    | NATURAL
+    | ON
+    | RIGHT
+    | SEMI
+    | SETMINUS
+    | UNION
+    | USING
+    ;
+
+nonReserved
+//--DEFAULT-NON-RESERVED-START
+    : ADD
+    | AFTER
+    | ALL
+    | ALTER
+    | ALWAYS
+    | ANALYZE
+    | AND
+    | ANY
+    | ANY_VALUE
+    | ARCHIVE
+    | ARRAY
+    | AS
+    | ASC
+    | AT
+    | AUTHORIZATION
+    | BEGIN
+    | BETWEEN
+    | BIGINT
+    | BINARY
+    | BINARY_HEX
+    | BINDING
+    | BOOLEAN
+    | BOTH
+    | BUCKET
+    | BUCKETS
+    | BY
+    | BYTE
+    | CACHE
+    | CALLED
+    | CASCADE
+    | CASE
+    | CAST
+    | CATALOG
+    | CATALOGS
+    | CHANGE
+    | CHAR
+    | CHARACTER
+    | CHECK
+    | CLEAR
+    | CLUSTER
+    | CLUSTERED
+    | CODEGEN
+    | COLLATE
+    | COLLATION
+    | COLLECTION
+    | COLUMN
+    | COLUMNS
+    | COMMENT
+    | COMMIT
+    | COMPACT
+    | COMPACTIONS
+    | COMPENSATION
+    | COMPUTE
+    | CONCATENATE
+    | CONSTRAINT
+    | CONTAINS
+    | COST
+    | CREATE
+    | CUBE
+    | CURRENT
+    | CURRENT_DATE
+    | CURRENT_TIME
+    | CURRENT_TIMESTAMP
+    | CURRENT_USER
+    | DATA
+    | DATABASE
+    | DATABASES
+    | DATE
+    | DATEADD
+    | DATE_ADD
+    | DATEDIFF
+    | DATE_DIFF
+    | DAY
+    | DAYS
+    | DAYOFYEAR
+    | DBPROPERTIES
+    | DEC
+    | DECIMAL
+    | DECLARE
+    | DEFAULT
+    | DEFINED
+    | DEFINER
+    | DELETE
+    | DELIMITED
+    | DESC
+    | DESCRIBE
+    | DETERMINISTIC
+    | DFS
+    | DIRECTORIES
+    | DIRECTORY
+    | DISTINCT
+    | DISTRIBUTE
+    | DIV
+    | DO
+    | DOUBLE
+    | DROP
+    | ELSE
+    | END
+    | ESCAPE
+    | ESCAPED
+    | EVOLUTION
+    | EXCHANGE
+    | EXCLUDE
+    | EXECUTE
+    | EXISTS
+    | EXPLAIN
+    | EXPORT
+    | EXTENDED
+    | EXTERNAL
+    | EXTRACT
+    | FALSE
+    | FETCH
+    | FILTER
+    | FIELDS
+    | FILEFORMAT
+    | FIRST
+    | FLOAT
+    | FOLLOWING
+    | FOR
+    | FOREIGN
+    | FORMAT
+    | FORMATTED
+    | FROM
+    | FUNCTION
+    | FUNCTIONS
+    | GENERATED
+    | GLOBAL
+    | GRANT
+    | GROUP
+    | GROUPING
+    | HAVING
+    | HOUR
+    | HOURS
+    | IDENTIFIER_KW
+    | IF
+    | IGNORE
+    | IMMEDIATE
+    | IMPORT
+    | IN
+    | INCLUDE
+    | INDEX
+    | INDEXES
+    | INPATH
+    | INPUT
+    | INPUTFORMAT
+    | INSERT
+    | INT
+    | INTEGER
+    | INTERVAL
+    | INTO
+    | INVOKER
+    | IS
+    | ITEMS
+    | KEYS
+    | LANGUAGE
+    | LAST
+    | LAZY
+    | LEADING
+    | LIKE
+    | LONG
+    | ILIKE
+    | LIMIT
+    | LINES
+    | LIST
+    | LOAD
+    | LOCAL
+    | LOCATION
+    | LOCK
+    | LOCKS
+    | LOGICAL
+    | LONG
+    | MACRO
+    | MAP
+    | MATCHED
+    | MERGE
+    | MICROSECOND
+    | MICROSECONDS
+    | MILLISECOND
+    | MILLISECONDS
+    | MINUTE
+    | MINUTES
+    | MODIFIES
+    | MONTH
+    | MONTHS
+    | MSCK
+    | NAME
+    | NAMESPACE
+    | NAMESPACES
+    | NANOSECOND
+    | NANOSECONDS
+    | NO
+    | NONE
+    | NOT
+    | NULL
+    | NULLS
+    | NUMERIC
+    | OF
+    | OFFSET
+    | ONLY
+    | OPTION
+    | OPTIONS
+    | OR
+    | ORDER
+    | OUT
+    | OUTER
+    | OUTPUTFORMAT
+    | OVER
+    | OVERLAPS
+    | OVERLAY
+    | OVERWRITE
+    | PARTITION
+    | PARTITIONED
+    | PARTITIONS
+    | PERCENTLIT
+    | PIVOT
+    | PLACING
+    | POSITION
+    | PRECEDING
+    | PRIMARY
+    | PRINCIPALS
+    | PROPERTIES
+    | PURGE
+    | QUARTER
+    | QUERY
+    | RANGE
+    | READS
+    | REAL
+    | RECORDREADER
+    | RECORDWRITER
+    | RECOVER
+    | REDUCE
+    | REFERENCES
+    | REFRESH
+    | RENAME
+    | REPAIR
+    | REPEATABLE
+    | REPLACE
+    | RESET
+    | RESPECT
+    | RESTRICT
+    | RETURN
+    | RETURNS
+    | REVOKE
+    | RLIKE
+    | ROLE
+    | ROLES
+    | ROLLBACK
+    | ROLLUP
+    | ROW
+    | ROWS
+    | SCHEMA
+    | SCHEMAS
+    | SECOND
+    | SECONDS
+    | SECURITY
+    | SELECT
+    | SEPARATED
+    | SERDE
+    | SERDEPROPERTIES
+    | SESSION_USER
+    | SET
+    | SETS
+    | SHORT
+    | SHOW
+    | SINGLE
+    | SKEWED
+    | SMALLINT
+    | SOME
+    | SORT
+    | SORTED
+    | SOURCE
+    | SPECIFIC
+    | SQL
+    | START
+    | STATISTICS
+    | STORED
+    | STRATIFY
+    | STRING
+    | STRUCT
+    | SUBSTR
+    | SUBSTRING
+    | SYNC
+    | SYSTEM_TIME
+    | SYSTEM_VERSION
+    | TABLE
+    | TABLES
+    | TABLESAMPLE
+    | TARGET
+    | TBLPROPERTIES
+    | TEMPORARY
+    | TERMINATED
+    | THEN
+    | TIME
+    | TIMEDIFF
+    | TIMESTAMP
+    | TIMESTAMP_LTZ
+    | TIMESTAMP_NTZ
+    | TIMESTAMPADD
+    | TIMESTAMPDIFF
+    | TINYINT
+    | TO
+    | TOUCH
+    | TRAILING
+    | TRANSACTION
+    | TRANSACTIONS
+    | TRANSFORM
+    | TRIM
+    | TRUE
+    | TRUNCATE
+    | TRY_CAST
+    | TYPE
+    | UNARCHIVE
+    | UNBOUNDED
+    | UNCACHE
+    | UNIQUE
+    | UNKNOWN
+    | UNLOCK
+    | UNPIVOT
+    | UNSET
+    | UPDATE
+    | USE
+    | USER
+    | VALUES
+    | VARCHAR
+    | VAR
+    | VARIABLE
+    | VARIANT
+    | VERSION
+    | VIEW
+    | VIEWS
+    | VOID
+    | WEEK
+    | WEEKS
+    | WHILE
+    | WHEN
+    | WHERE
+    | WINDOW
+    | WITH
+    | WITHIN
+    | YEAR
+    | YEARS
+    | ZONE
+//--DEFAULT-NON-RESERVED-END
+    ;
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorService.java b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorService.java
new file mode 100644
index 0000000000..1240545acd
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorService.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryExecutionResponse;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse;
+
+/**
+ * AsyncQueryExecutorService exposes functionality to create, get results and cancel an async query.
+ */
+public interface AsyncQueryExecutorService {
+
+  /**
+   * Creates async query job based on the request and returns queryId in the response.
+   *
+   * @param createAsyncQueryRequest createAsyncQueryRequest.
+   * @return {@link CreateAsyncQueryResponse}
+   */
+  CreateAsyncQueryResponse createAsyncQuery(
+      CreateAsyncQueryRequest createAsyncQueryRequest,
+      AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /**
+   * Returns async query response for a given queryId.
+   *
+   * @param queryId queryId.
+   * @return {@link AsyncQueryExecutionResponse}
+   */
+  AsyncQueryExecutionResponse getAsyncQueryResults(
+      String queryId, AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /**
+   * Cancels running async query and returns the cancelled queryId.
+   *
+   * @param queryId queryId.
+   * @return {@link String} cancelledQueryId.
+   */
+  String cancelQuery(String queryId, AsyncQueryRequestContext asyncQueryRequestContext);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceImpl.java b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceImpl.java
new file mode 100644
index 0000000000..0e9e128896
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceImpl.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ERROR_FIELD;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.STATUS_FIELD;
+
+import com.amazonaws.services.emrserverless.model.JobRunState;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import lombok.AllArgsConstructor;
+import org.json.JSONObject;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.spark.asyncquery.exceptions.AsyncQueryNotFoundException;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryExecutionResponse;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfig;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigSupplier;
+import org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
+import org.opensearch.sql.spark.functions.response.DefaultSparkSqlFunctionResponseHandle;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse;
+
+/** AsyncQueryExecutorService implementation of {@link AsyncQueryExecutorService}. */
+@AllArgsConstructor
+public class AsyncQueryExecutorServiceImpl implements AsyncQueryExecutorService {
+  private AsyncQueryJobMetadataStorageService asyncQueryJobMetadataStorageService;
+  private SparkQueryDispatcher sparkQueryDispatcher;
+  private SparkExecutionEngineConfigSupplier sparkExecutionEngineConfigSupplier;
+
+  @Override
+  public CreateAsyncQueryResponse createAsyncQuery(
+      CreateAsyncQueryRequest createAsyncQueryRequest,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    SparkExecutionEngineConfig sparkExecutionEngineConfig =
+        sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(asyncQueryRequestContext);
+    DispatchQueryResponse dispatchQueryResponse =
+        sparkQueryDispatcher.dispatch(
+            DispatchQueryRequest.builder()
+                .accountId(sparkExecutionEngineConfig.getAccountId())
+                .applicationId(sparkExecutionEngineConfig.getApplicationId())
+                .query(createAsyncQueryRequest.getQuery())
+                .datasource(createAsyncQueryRequest.getDatasource())
+                .langType(createAsyncQueryRequest.getLang())
+                .executionRoleARN(sparkExecutionEngineConfig.getExecutionRoleARN())
+                .clusterName(sparkExecutionEngineConfig.getClusterName())
+                .sparkSubmitParameterModifier(
+                    sparkExecutionEngineConfig.getSparkSubmitParameterModifier())
+                .sessionId(createAsyncQueryRequest.getSessionId())
+                .build(),
+            asyncQueryRequestContext);
+    asyncQueryJobMetadataStorageService.storeJobMetadata(
+        AsyncQueryJobMetadata.builder()
+            .queryId(dispatchQueryResponse.getQueryId())
+            .accountId(sparkExecutionEngineConfig.getAccountId())
+            .applicationId(sparkExecutionEngineConfig.getApplicationId())
+            .jobId(dispatchQueryResponse.getJobId())
+            .resultIndex(dispatchQueryResponse.getResultIndex())
+            .sessionId(dispatchQueryResponse.getSessionId())
+            .datasourceName(dispatchQueryResponse.getDatasourceName())
+            .jobType(dispatchQueryResponse.getJobType())
+            .indexName(dispatchQueryResponse.getIndexName())
+            .query(createAsyncQueryRequest.getQuery())
+            .langType(createAsyncQueryRequest.getLang())
+            .state(dispatchQueryResponse.getStatus())
+            .error(dispatchQueryResponse.getError())
+            .build(),
+        asyncQueryRequestContext);
+    return new CreateAsyncQueryResponse(
+        dispatchQueryResponse.getQueryId(), dispatchQueryResponse.getSessionId());
+  }
+
+  @Override
+  public AsyncQueryExecutionResponse getAsyncQueryResults(
+      String queryId, AsyncQueryRequestContext asyncQueryRequestContext) {
+    Optional<AsyncQueryJobMetadata> jobMetadata =
+        asyncQueryJobMetadataStorageService.getJobMetadata(queryId);
+    if (jobMetadata.isPresent()) {
+      String sessionId = jobMetadata.get().getSessionId();
+      JSONObject jsonObject =
+          sparkQueryDispatcher.getQueryResponse(jobMetadata.get(), asyncQueryRequestContext);
+      if (JobRunState.SUCCESS.toString().equals(jsonObject.getString(STATUS_FIELD))) {
+        DefaultSparkSqlFunctionResponseHandle sparkSqlFunctionResponseHandle =
+            new DefaultSparkSqlFunctionResponseHandle(jsonObject);
+        List<ExprValue> result = new ArrayList<>();
+        while (sparkSqlFunctionResponseHandle.hasNext()) {
+          result.add(sparkSqlFunctionResponseHandle.next());
+        }
+        return new AsyncQueryExecutionResponse(
+            JobRunState.SUCCESS.toString(),
+            sparkSqlFunctionResponseHandle.schema(),
+            result,
+            null,
+            sessionId);
+      } else {
+        return new AsyncQueryExecutionResponse(
+            jsonObject.optString(STATUS_FIELD, JobRunState.FAILED.toString()),
+            null,
+            null,
+            jsonObject.optString(ERROR_FIELD, ""),
+            sessionId);
+      }
+    }
+    throw new AsyncQueryNotFoundException(String.format("QueryId: %s not found", queryId));
+  }
+
+  @Override
+  public String cancelQuery(String queryId, AsyncQueryRequestContext asyncQueryRequestContext) {
+    Optional<AsyncQueryJobMetadata> asyncQueryJobMetadata =
+        asyncQueryJobMetadataStorageService.getJobMetadata(queryId);
+    if (asyncQueryJobMetadata.isPresent()) {
+      return sparkQueryDispatcher.cancelJob(asyncQueryJobMetadata.get(), asyncQueryRequestContext);
+    }
+    throw new AsyncQueryNotFoundException(String.format("QueryId: %s not found", queryId));
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/AsyncQueryJobMetadataStorageService.java b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/AsyncQueryJobMetadataStorageService.java
new file mode 100644
index 0000000000..b4e94c984d
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/AsyncQueryJobMetadataStorageService.java
@@ -0,0 +1,21 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import java.util.Optional;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+
+public interface AsyncQueryJobMetadataStorageService {
+
+  void storeJobMetadata(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext);
+
+  Optional<AsyncQueryJobMetadata> getJobMetadata(String jobId);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/exceptions/AsyncQueryNotFoundException.java b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/exceptions/AsyncQueryNotFoundException.java
new file mode 100644
index 0000000000..80a0c34b70
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/exceptions/AsyncQueryNotFoundException.java
@@ -0,0 +1,15 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.spark.asyncquery.exceptions;
+
+/** AsyncQueryNotFoundException. */
+public class AsyncQueryNotFoundException extends RuntimeException {
+  public AsyncQueryNotFoundException(String message) {
+    super(message);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryExecutionResponse.java b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryExecutionResponse.java
new file mode 100644
index 0000000000..e5d9cffd5f
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryExecutionResponse.java
@@ -0,0 +1,23 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.spark.asyncquery.model;
+
+import java.util.List;
+import lombok.Data;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.executor.ExecutionEngine;
+
+/** AsyncQueryExecutionResponse to store the response form spark job execution. */
+@Data
+public class AsyncQueryExecutionResponse {
+  private final String status;
+  private final ExecutionEngine.Schema schema;
+  private final List<ExprValue> results;
+  private final String error;
+  private final String sessionId;
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryJobMetadata.java b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryJobMetadata.java
new file mode 100644
index 0000000000..46aa8ac898
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryJobMetadata.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery.model;
+
+import com.google.common.collect.ImmutableMap;
+import lombok.Builder.Default;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.SuperBuilder;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.execution.statestore.StateModel;
+import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.utils.SerializeUtils;
+
+/** This class models all the metadata required for a job. */
+@Data
+@SuperBuilder
+@EqualsAndHashCode(callSuper = false)
+public class AsyncQueryJobMetadata extends StateModel {
+  private final String queryId;
+  // optional: accountId for EMRS cluster
+  private final String accountId;
+  private final String applicationId;
+  private final String jobId;
+  private final String resultIndex;
+  // optional sessionId.
+  private final String sessionId;
+  // since 2.13
+  // jobType could be null before OpenSearch 2.12. SparkQueryDispatcher use jobType to choose
+  // cancel query handler. if jobType is null, it will invoke BatchQueryHandler.cancel().
+  @Default private final JobType jobType = JobType.INTERACTIVE;
+  // null if JobType is null
+  private final String datasourceName;
+  // null if JobType is INTERACTIVE or null
+  private final String indexName;
+  private final String query;
+  private final LangType langType;
+  private final QueryState state;
+  private final String error;
+
+  @Override
+  public String toString() {
+    return SerializeUtils.buildGson().toJson(this);
+  }
+
+  /** copy builder. update seqNo and primaryTerm */
+  public static AsyncQueryJobMetadata copy(
+      AsyncQueryJobMetadata copy, ImmutableMap<String, Object> metadata) {
+    return builder()
+        .queryId(copy.queryId)
+        .accountId(copy.accountId)
+        .applicationId(copy.getApplicationId())
+        .jobId(copy.getJobId())
+        .resultIndex(copy.getResultIndex())
+        .sessionId(copy.getSessionId())
+        .datasourceName(copy.datasourceName)
+        .jobType(copy.jobType)
+        .indexName(copy.indexName)
+        .query(copy.query)
+        .langType(copy.langType)
+        .state(copy.state)
+        .error(copy.error)
+        .metadata(metadata)
+        .build();
+  }
+
+  @Override
+  public String getId() {
+    return queryId;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryRequestContext.java b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryRequestContext.java
new file mode 100644
index 0000000000..d5a478d592
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/AsyncQueryRequestContext.java
@@ -0,0 +1,11 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery.model;
+
+import org.opensearch.sql.datasource.RequestContext;
+
+/** Context interface to provide additional request related information */
+public interface AsyncQueryRequestContext extends RequestContext {}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/NullAsyncQueryRequestContext.java b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/NullAsyncQueryRequestContext.java
new file mode 100644
index 0000000000..918d1d5929
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/NullAsyncQueryRequestContext.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery.model;
+
+/** An implementation of RequestContext for where context is not required */
+public class NullAsyncQueryRequestContext implements AsyncQueryRequestContext {
+  @Override
+  public Object getAttribute(String name) {
+    return null;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/QueryState.java b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/QueryState.java
new file mode 100644
index 0000000000..62bceb6637
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/model/QueryState.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery.model;
+
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.Getter;
+
+@Getter
+public enum QueryState {
+  WAITING("waiting"),
+  RUNNING("running"),
+  SUCCESS("success"),
+  FAILED("failed"),
+  TIMEOUT("timeout"),
+  CANCELLED("cancelled");
+
+  private final String state;
+
+  QueryState(String state) {
+    this.state = state;
+  }
+
+  private static final Map<String, QueryState> STATES =
+      Arrays.stream(QueryState.values())
+          .collect(Collectors.toMap(t -> t.name().toLowerCase(), t -> t));
+
+  public static QueryState fromString(String key) {
+    for (QueryState ss : QueryState.values()) {
+      if (ss.getState().toLowerCase(Locale.ROOT).equals(key)) {
+        return ss;
+      }
+    }
+    throw new IllegalArgumentException("Invalid query state: " + key);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/client/EMRServerlessClient.java b/async-query-core/src/main/java/org/opensearch/sql/spark/client/EMRServerlessClient.java
new file mode 100644
index 0000000000..98c115fde9
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/client/EMRServerlessClient.java
@@ -0,0 +1,46 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.spark.client;
+
+import com.amazonaws.services.emrserverless.model.CancelJobRunResult;
+import com.amazonaws.services.emrserverless.model.GetJobRunResult;
+
+/**
+ * Client Interface for spark Job Submissions. Can have multiple implementations based on the
+ * underlying spark infrastructure. Currently, we have one for EMRServerless {@link
+ * EmrServerlessClientImpl}
+ */
+public interface EMRServerlessClient {
+
+  /**
+   * Start a new job run.
+   *
+   * @param startJobRequest startJobRequest
+   * @return jobId.
+   */
+  String startJobRun(StartJobRequest startJobRequest);
+
+  /**
+   * Get status of emr serverless job run..
+   *
+   * @param applicationId serverless applicationId
+   * @param jobId jobId.
+   * @return {@link GetJobRunResult}
+   */
+  GetJobRunResult getJobRunResult(String applicationId, String jobId);
+
+  /**
+   * Cancel emr serverless job run.
+   *
+   * @param applicationId applicationId.
+   * @param jobId jobId.
+   * @return {@link CancelJobRunResult}
+   */
+  CancelJobRunResult cancelJobRun(
+      String applicationId, String jobId, boolean allowExceptionPropagation);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/client/EMRServerlessClientFactory.java b/async-query-core/src/main/java/org/opensearch/sql/spark/client/EMRServerlessClientFactory.java
new file mode 100644
index 0000000000..c5305ba445
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/client/EMRServerlessClientFactory.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.client;
+
+/** Factory interface for creating instances of {@link EMRServerlessClient}. */
+public interface EMRServerlessClientFactory {
+
+  /**
+   * Gets an instance of {@link EMRServerlessClient}.
+   *
+   * @param accountId Account ID of the requester. It will be used to decide the cluster.
+   * @return An {@link EMRServerlessClient} instance.
+   */
+  EMRServerlessClient getClient(String accountId);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/client/EMRServerlessClientFactoryImpl.java b/async-query-core/src/main/java/org/opensearch/sql/spark/client/EMRServerlessClientFactoryImpl.java
new file mode 100644
index 0000000000..72973b3bbb
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/client/EMRServerlessClientFactoryImpl.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.client;
+
+import static org.opensearch.sql.common.setting.Settings.Key.SPARK_EXECUTION_ENGINE_CONFIG;
+
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
+import com.amazonaws.services.emrserverless.AWSEMRServerless;
+import com.amazonaws.services.emrserverless.AWSEMRServerlessClientBuilder;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfig;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigSupplier;
+import org.opensearch.sql.spark.metrics.MetricsService;
+
+@RequiredArgsConstructor
+public class EMRServerlessClientFactoryImpl implements EMRServerlessClientFactory {
+
+  private final SparkExecutionEngineConfigSupplier sparkExecutionEngineConfigSupplier;
+  private final MetricsService metricsService;
+  private EMRServerlessClient emrServerlessClient;
+  private String region;
+
+  @Override
+  public EMRServerlessClient getClient(String accountId) {
+    SparkExecutionEngineConfig sparkExecutionEngineConfig =
+        this.sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(
+            new NullAsyncQueryRequestContext());
+    validateSparkExecutionEngineConfig(sparkExecutionEngineConfig);
+    if (isNewClientCreationRequired(sparkExecutionEngineConfig.getRegion())) {
+      region = sparkExecutionEngineConfig.getRegion();
+      this.emrServerlessClient = createEMRServerlessClient(this.region);
+    }
+    return this.emrServerlessClient;
+  }
+
+  private boolean isNewClientCreationRequired(String region) {
+    return !region.equals(this.region);
+  }
+
+  private void validateSparkExecutionEngineConfig(
+      SparkExecutionEngineConfig sparkExecutionEngineConfig) {
+    if (sparkExecutionEngineConfig == null || sparkExecutionEngineConfig.getRegion() == null) {
+      throw new IllegalArgumentException(
+          String.format(
+              "Async Query APIs are disabled. Please configure %s in cluster settings to enable"
+                  + " them.",
+              SPARK_EXECUTION_ENGINE_CONFIG.getKeyValue()));
+    }
+  }
+
+  private EMRServerlessClient createEMRServerlessClient(String awsRegion) {
+    // TODO: It does not handle accountId for now. (it creates client for same account)
+    return AccessController.doPrivileged(
+        (PrivilegedAction<EMRServerlessClient>)
+            () -> {
+              AWSEMRServerless awsemrServerless =
+                  AWSEMRServerlessClientBuilder.standard()
+                      .withRegion(awsRegion)
+                      .withCredentials(new DefaultAWSCredentialsProviderChain())
+                      .build();
+              return new EmrServerlessClientImpl(awsemrServerless, metricsService);
+            });
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/client/EmrServerlessClientImpl.java b/async-query-core/src/main/java/org/opensearch/sql/spark/client/EmrServerlessClientImpl.java
new file mode 100644
index 0000000000..f6f3633bc7
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/client/EmrServerlessClientImpl.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.client;
+
+import static org.opensearch.sql.datasource.model.DataSourceMetadata.DEFAULT_RESULT_INDEX;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_SQL_APPLICATION_JAR;
+import static org.opensearch.sql.spark.metrics.EmrMetrics.EMR_CANCEL_JOB_REQUEST_FAILURE_COUNT;
+import static org.opensearch.sql.spark.metrics.EmrMetrics.EMR_GET_JOB_RESULT_FAILURE_COUNT;
+import static org.opensearch.sql.spark.metrics.EmrMetrics.EMR_START_JOB_REQUEST_FAILURE_COUNT;
+
+import com.amazonaws.services.emrserverless.AWSEMRServerless;
+import com.amazonaws.services.emrserverless.model.CancelJobRunRequest;
+import com.amazonaws.services.emrserverless.model.CancelJobRunResult;
+import com.amazonaws.services.emrserverless.model.GetJobRunRequest;
+import com.amazonaws.services.emrserverless.model.GetJobRunResult;
+import com.amazonaws.services.emrserverless.model.JobDriver;
+import com.amazonaws.services.emrserverless.model.SparkSubmit;
+import com.amazonaws.services.emrserverless.model.StartJobRunRequest;
+import com.amazonaws.services.emrserverless.model.StartJobRunResult;
+import com.amazonaws.services.emrserverless.model.ValidationException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.sql.spark.metrics.MetricsService;
+
+@RequiredArgsConstructor
+public class EmrServerlessClientImpl implements EMRServerlessClient {
+
+  private final AWSEMRServerless emrServerless;
+  private final MetricsService metricsService;
+  private static final Logger logger = LogManager.getLogger(EmrServerlessClientImpl.class);
+
+  private static final int MAX_JOB_NAME_LENGTH = 255;
+
+  public static final String GENERIC_INTERNAL_SERVER_ERROR_MESSAGE = "Internal Server Error.";
+
+  @Override
+  public String startJobRun(StartJobRequest startJobRequest) {
+    String resultIndex =
+        startJobRequest.getResultIndex() == null
+            ? DEFAULT_RESULT_INDEX
+            : startJobRequest.getResultIndex();
+    StartJobRunRequest request =
+        new StartJobRunRequest()
+            .withName(StringUtils.truncate(startJobRequest.getJobName(), MAX_JOB_NAME_LENGTH))
+            .withApplicationId(startJobRequest.getApplicationId())
+            .withExecutionRoleArn(startJobRequest.getExecutionRoleArn())
+            .withTags(startJobRequest.getTags())
+            .withExecutionTimeoutMinutes(startJobRequest.executionTimeout())
+            .withJobDriver(
+                new JobDriver()
+                    .withSparkSubmit(
+                        new SparkSubmit()
+                            .withEntryPoint(SPARK_SQL_APPLICATION_JAR)
+                            .withEntryPointArguments(resultIndex)
+                            .withSparkSubmitParameters(startJobRequest.getSparkSubmitParams())));
+
+    StartJobRunResult startJobRunResult =
+        AccessController.doPrivileged(
+            (PrivilegedAction<StartJobRunResult>)
+                () -> {
+                  try {
+                    return emrServerless.startJobRun(request);
+                  } catch (Throwable t) {
+                    logger.error("Error while making start job request to emr:", t);
+                    metricsService.incrementNumericalMetric(EMR_START_JOB_REQUEST_FAILURE_COUNT);
+                    if (t instanceof ValidationException) {
+                      throw new IllegalArgumentException(
+                          "The input fails to satisfy the constraints specified by AWS EMR"
+                              + " Serverless.");
+                    }
+                    throw new RuntimeException(GENERIC_INTERNAL_SERVER_ERROR_MESSAGE);
+                  }
+                });
+    logger.info("Job Run ID: " + startJobRunResult.getJobRunId());
+    return startJobRunResult.getJobRunId();
+  }
+
+  @Override
+  public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+    GetJobRunRequest request =
+        new GetJobRunRequest().withApplicationId(applicationId).withJobRunId(jobId);
+    GetJobRunResult getJobRunResult =
+        AccessController.doPrivileged(
+            (PrivilegedAction<GetJobRunResult>)
+                () -> {
+                  try {
+                    return emrServerless.getJobRun(request);
+                  } catch (Throwable t) {
+                    logger.error("Error while making get job run request to emr:", t);
+                    metricsService.incrementNumericalMetric(EMR_GET_JOB_RESULT_FAILURE_COUNT);
+                    throw new RuntimeException(GENERIC_INTERNAL_SERVER_ERROR_MESSAGE);
+                  }
+                });
+    logger.info("Job Run state: " + getJobRunResult.getJobRun().getState());
+    return getJobRunResult;
+  }
+
+  @Override
+  public CancelJobRunResult cancelJobRun(
+      String applicationId, String jobId, boolean allowExceptionPropagation) {
+    CancelJobRunRequest cancelJobRunRequest =
+        new CancelJobRunRequest().withJobRunId(jobId).withApplicationId(applicationId);
+    CancelJobRunResult cancelJobRunResult =
+        AccessController.doPrivileged(
+            (PrivilegedAction<CancelJobRunResult>)
+                () -> {
+                  try {
+                    return emrServerless.cancelJobRun(cancelJobRunRequest);
+                  } catch (Throwable t) {
+                    if (allowExceptionPropagation) {
+                      throw t;
+                    }
+
+                    logger.error("Error while making cancel job request to emr: jobId=" + jobId, t);
+                    metricsService.incrementNumericalMetric(EMR_CANCEL_JOB_REQUEST_FAILURE_COUNT);
+                    if (t instanceof ValidationException) {
+                      throw new IllegalArgumentException(
+                          "The input fails to satisfy the constraints specified by AWS EMR"
+                              + " Serverless.");
+                    }
+                    throw new RuntimeException(GENERIC_INTERNAL_SERVER_ERROR_MESSAGE);
+                  }
+                });
+    logger.info(String.format("Job : %s cancelled", cancelJobRunResult.getJobRunId()));
+    return cancelJobRunResult;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/client/StartJobRequest.java b/async-query-core/src/main/java/org/opensearch/sql/spark/client/StartJobRequest.java
new file mode 100644
index 0000000000..173b40d453
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/client/StartJobRequest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.client;
+
+import java.util.Map;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * This POJO carries all the fields required for emr serverless job submission. Used as model in
+ * {@link EMRServerlessClient} interface.
+ */
+@Data
+@EqualsAndHashCode
+public class StartJobRequest {
+
+  public static final Long DEFAULT_JOB_TIMEOUT = 120L;
+
+  private final String jobName;
+  // optional
+  private final String accountId;
+  private final String applicationId;
+  private final String executionRoleArn;
+  private final String sparkSubmitParams;
+  private final Map<String, String> tags;
+
+  /** true if it is Spark Structured Streaming job. */
+  private final boolean isStructuredStreaming;
+
+  private final String resultIndex;
+
+  public Long executionTimeout() {
+    return isStructuredStreaming ? 0L : DEFAULT_JOB_TIMEOUT;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfig.java b/async-query-core/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfig.java
new file mode 100644
index 0000000000..51407111b6
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfig.java
@@ -0,0 +1,20 @@
+package org.opensearch.sql.spark.config;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * POJO for spark Execution Engine Config. Interface between {@link
+ * org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorService} and {@link
+ * SparkExecutionEngineConfigSupplier}
+ */
+@Data
+@Builder
+public class SparkExecutionEngineConfig {
+  private String accountId;
+  private String applicationId;
+  private String region;
+  private String executionRoleARN;
+  private SparkSubmitParameterModifier sparkSubmitParameterModifier;
+  private String clusterName;
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigSupplier.java b/async-query-core/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigSupplier.java
new file mode 100644
index 0000000000..725df6bb0c
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigSupplier.java
@@ -0,0 +1,15 @@
+package org.opensearch.sql.spark.config;
+
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+
+/** Interface for extracting and providing SparkExecutionEngineConfig */
+public interface SparkExecutionEngineConfigSupplier {
+
+  /**
+   * Get SparkExecutionEngineConfig
+   *
+   * @return {@link SparkExecutionEngineConfig}.
+   */
+  SparkExecutionEngineConfig getSparkExecutionEngineConfig(
+      AsyncQueryRequestContext asyncQueryRequestContext);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/config/SparkSubmitParameterModifier.java b/async-query-core/src/main/java/org/opensearch/sql/spark/config/SparkSubmitParameterModifier.java
new file mode 100644
index 0000000000..a50491078c
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/config/SparkSubmitParameterModifier.java
@@ -0,0 +1,12 @@
+package org.opensearch.sql.spark.config;
+
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilder;
+
+/**
+ * Interface for extension point to allow modification of spark submit parameter. modifyParameter
+ * method is called after the default spark submit parameter is build. To be deprecated in favor of
+ * {@link org.opensearch.sql.spark.parameter.GeneralSparkParameterComposer}
+ */
+public interface SparkSubmitParameterModifier {
+  void modifyParameters(SparkSubmitParametersBuilder parametersBuilder);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/data/constants/SparkConstants.java b/async-query-core/src/main/java/org/opensearch/sql/spark/data/constants/SparkConstants.java
new file mode 100644
index 0000000000..43815a9904
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/data/constants/SparkConstants.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.data.constants;
+
+public class SparkConstants {
+
+  public static final String JOB_ID_FIELD = "jobRunId";
+
+  public static final String STATUS_FIELD = "status";
+
+  public static final String DATA_FIELD = "data";
+
+  public static final String ERROR_FIELD = "error";
+
+  // EMR-S will download JAR to local maven
+  public static final String SPARK_SQL_APPLICATION_JAR =
+      "file:///home/hadoop/.ivy2/jars/org.opensearch_opensearch-spark-sql-application_2.12-0.3.0-SNAPSHOT.jar";
+  public static final String SPARK_REQUEST_BUFFER_INDEX_NAME = ".query_execution_request";
+  public static final String FLINT_DEFAULT_CLUSTER_NAME = "opensearch-cluster";
+  public static final String FLINT_DEFAULT_HOST = "localhost";
+  public static final String FLINT_DEFAULT_PORT = "9200";
+  public static final String FLINT_DEFAULT_SCHEME = "http";
+  public static final String FLINT_DEFAULT_AUTH = "noauth";
+  public static final String DEFAULT_CLASS_NAME = "org.apache.spark.sql.FlintJob";
+  public static final String S3_AWS_CREDENTIALS_PROVIDER_KEY =
+      "spark.hadoop.fs.s3.customAWSCredentialsProvider";
+  public static final String DRIVER_ENV_ASSUME_ROLE_ARN_KEY =
+      "spark.emr-serverless.driverEnv.ASSUME_ROLE_CREDENTIALS_ROLE_ARN";
+  public static final String EXECUTOR_ENV_ASSUME_ROLE_ARN_KEY =
+      "spark.executorEnv.ASSUME_ROLE_CREDENTIALS_ROLE_ARN";
+  public static final String HADOOP_CATALOG_CREDENTIALS_PROVIDER_FACTORY_KEY =
+      "spark.hadoop.aws.catalog.credentials.provider.factory.class";
+  public static final String HIVE_METASTORE_GLUE_ARN_KEY = "spark.hive.metastore.glue.role.arn";
+  public static final String SPARK_JARS_KEY = "spark.jars";
+  public static final String SPARK_JAR_PACKAGES_KEY = "spark.jars.packages";
+  public static final String SPARK_JAR_REPOSITORIES_KEY = "spark.jars.repositories";
+  public static final String SPARK_DRIVER_ENV_JAVA_HOME_KEY =
+      "spark.emr-serverless.driverEnv.JAVA_HOME";
+  public static final String SPARK_EXECUTOR_ENV_JAVA_HOME_KEY = "spark.executorEnv.JAVA_HOME";
+  // Used for logging/metrics in Spark (driver)
+  public static final String SPARK_DRIVER_ENV_FLINT_CLUSTER_NAME_KEY =
+      "spark.emr-serverless.driverEnv.FLINT_CLUSTER_NAME";
+  // Used for logging/metrics in Spark (executor)
+  public static final String SPARK_EXECUTOR_ENV_FLINT_CLUSTER_NAME_KEY =
+      "spark.executorEnv.FLINT_CLUSTER_NAME";
+  public static final String FLINT_INDEX_STORE_HOST_KEY = "spark.datasource.flint.host";
+  public static final String FLINT_INDEX_STORE_PORT_KEY = "spark.datasource.flint.port";
+  public static final String FLINT_INDEX_STORE_SCHEME_KEY = "spark.datasource.flint.scheme";
+  public static final String FLINT_INDEX_STORE_AUTH_KEY = "spark.datasource.flint.auth";
+  public static final String FLINT_INDEX_STORE_AUTH_USERNAME =
+      "spark.datasource.flint.auth.username";
+  public static final String FLINT_INDEX_STORE_AUTH_PASSWORD =
+      "spark.datasource.flint.auth.password";
+  public static final String FLINT_INDEX_STORE_AWSREGION_KEY = "spark.datasource.flint.region";
+  public static final String FLINT_CREDENTIALS_PROVIDER_KEY =
+      "spark.datasource.flint.customAWSCredentialsProvider";
+  public static final String FLINT_DATA_SOURCE_KEY = "spark.flint.datasource.name";
+  public static final String SPARK_SQL_EXTENSIONS_KEY = "spark.sql.extensions";
+  public static final String HIVE_METASTORE_CLASS_KEY =
+      "spark.hadoop.hive.metastore.client.factory.class";
+  public static final String DEFAULT_S3_AWS_CREDENTIALS_PROVIDER_VALUE =
+      "com.amazonaws.emr.AssumeRoleAWSCredentialsProvider";
+  public static final String DEFAULT_GLUE_CATALOG_CREDENTIALS_PROVIDER_FACTORY_KEY =
+      "com.amazonaws.glue.catalog.metastore.STSAssumeRoleSessionCredentialsProviderFactory";
+  public static final String SPARK_STANDALONE_PACKAGE =
+      "org.opensearch:opensearch-spark-standalone_2.12:0.3.0-SNAPSHOT";
+  public static final String SPARK_LAUNCHER_PACKAGE =
+      "org.opensearch:opensearch-spark-sql-application_2.12:0.3.0-SNAPSHOT";
+  public static final String PPL_STANDALONE_PACKAGE =
+      "org.opensearch:opensearch-spark-ppl_2.12:0.3.0-SNAPSHOT";
+  public static final String AWS_SNAPSHOT_REPOSITORY =
+      "https://aws.oss.sonatype.org/content/repositories/snapshots";
+  public static final String GLUE_HIVE_CATALOG_FACTORY_CLASS =
+      "com.amazonaws.glue.catalog.metastore.AWSGlueDataCatalogHiveClientFactory";
+  public static final String FLINT_DELEGATE_CATALOG =
+      "org.opensearch.sql.FlintDelegatingSessionCatalog";
+  public static final String FLINT_SQL_EXTENSION =
+      "org.opensearch.flint.spark.FlintSparkExtensions";
+  public static final String FLINT_PPL_EXTENSION =
+      "org.opensearch.flint.spark.FlintPPLSparkExtensions";
+
+  public static final String EMR_ASSUME_ROLE_CREDENTIALS_PROVIDER =
+      "com.amazonaws.emr.AssumeRoleAWSCredentialsProvider";
+  public static final String JAVA_HOME_LOCATION = "/usr/lib/jvm/java-17-amazon-corretto.x86_64/";
+  public static final String FLINT_JOB_QUERY = "spark.flint.job.query";
+  public static final String FLINT_JOB_QUERY_ID = "spark.flint.job.queryId";
+  public static final String FLINT_JOB_EXTERNAL_SCHEDULER_ENABLED =
+      "spark.flint.job.externalScheduler.enabled";
+  public static final String FLINT_JOB_EXTERNAL_SCHEDULER_INTERVAL =
+      "spark.flint.job.externalScheduler.interval";
+  public static final String FLINT_JOB_REQUEST_INDEX = "spark.flint.job.requestIndex";
+  public static final String FLINT_JOB_SESSION_ID = "spark.flint.job.sessionId";
+
+  public static final String FLINT_SESSION_CLASS_NAME = "org.apache.spark.sql.FlintREPL";
+
+  public static final String SPARK_CATALOG = "spark.sql.catalog.spark_catalog";
+  public static final String SPARK_CATALOG_CATALOG_IMPL = SPARK_CATALOG + ".catalog-impl";
+  public static final String SPARK_CATALOG_CLIENT_REGION = SPARK_CATALOG + ".client.region";
+  public static final String SPARK_CATALOG_CLIENT_FACTORY = SPARK_CATALOG + ".client.factory";
+  public static final String SPARK_CATALOG_CLIENT_ASSUME_ROLE_ARN =
+      SPARK_CATALOG + ".client.assume-role.arn";
+  public static final String SPARK_CATALOG_CLIENT_ASSUME_ROLE_REGION =
+      SPARK_CATALOG + ".client.assume-role.region";
+  public static final String SPARK_CATALOG_LF_SESSION_TAG_KEY =
+      SPARK_CATALOG + ".client.assume-role.tags.LakeFormationAuthorizedCaller";
+  public static final String SPARK_CATALOG_GLUE_ACCOUNT_ID = SPARK_CATALOG + ".glue.account-id";
+  public static final String SPARK_CATALOG_GLUE_LF_ENABLED =
+      SPARK_CATALOG + ".glue.lakeformation-enabled";
+
+  public static final String ICEBERG_SESSION_CATALOG =
+      "org.apache.iceberg.spark.SparkSessionCatalog";
+  public static final String ICEBERG_SPARK_EXTENSION =
+      "org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions";
+  public static final String ICEBERG_SPARK_JARS =
+      "org.apache.iceberg:iceberg-spark-runtime-3.3_2.12:1.5.0,software.amazon.awssdk:bundle:2.26.30";
+  public static final String ICEBERG_GLUE_CATALOG = "org.apache.iceberg.aws.glue.GlueCatalog";
+  public static final String ICEBERG_ASSUME_ROLE_CLIENT_FACTORY =
+      "org.apache.iceberg.aws.AssumeRoleAwsClientFactory";
+  public static final String ICEBERG_LF_CLIENT_FACTORY =
+      "org.apache.iceberg.aws.lakeformation.LakeFormationAwsClientFactory";
+  // The following option is needed in Iceberg 1.5 when reading timestamp types that do not
+  // contain timezone in parquet files. The timezone is assumed to be GMT.
+  public static final String ICEBERG_TS_WO_TZ =
+      "spark.sql.iceberg.handle-timestamp-without-timezone";
+
+  public static final String FLINT_ACCELERATE_USING_COVERING_INDEX =
+      "spark.flint.optimizer.covering.enabled";
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/AsyncQueryHandler.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/AsyncQueryHandler.java
new file mode 100644
index 0000000000..441846d678
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/AsyncQueryHandler.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import static org.opensearch.sql.spark.data.constants.SparkConstants.DATA_FIELD;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ERROR_FIELD;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.STATUS_FIELD;
+
+import com.amazonaws.services.emrserverless.model.JobRunState;
+import org.json.JSONObject;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+
+/** Process async query request. */
+public abstract class AsyncQueryHandler {
+
+  public JSONObject getQueryResponse(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    JSONObject result = getResponseFromResultIndex(asyncQueryJobMetadata, asyncQueryRequestContext);
+    if (result.has(DATA_FIELD)) {
+      JSONObject items = result.getJSONObject(DATA_FIELD);
+
+      // If items have STATUS_FIELD, use it; otherwise, mark failed
+      String status = items.optString(STATUS_FIELD, JobRunState.FAILED.toString());
+      result.put(STATUS_FIELD, status);
+
+      // If items have ERROR_FIELD, use it; otherwise, set empty string
+      String error = items.optString(ERROR_FIELD, "");
+      result.put(ERROR_FIELD, error);
+      return result;
+    } else {
+      JSONObject statement =
+          getResponseFromExecutor(asyncQueryJobMetadata, asyncQueryRequestContext);
+
+      // Consider statement still running if state is success but query result unavailable
+      if (isSuccessState(statement)) {
+        statement.put(STATUS_FIELD, StatementState.RUNNING.getState());
+      }
+      return statement;
+    }
+  }
+
+  private boolean isSuccessState(JSONObject statement) {
+    return StatementState.SUCCESS.getState().equalsIgnoreCase(statement.optString(STATUS_FIELD));
+  }
+
+  protected abstract JSONObject getResponseFromResultIndex(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext);
+
+  protected abstract JSONObject getResponseFromExecutor(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext);
+
+  public abstract String cancelJob(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext);
+
+  public abstract DispatchQueryResponse submit(
+      DispatchQueryRequest request, DispatchQueryContext context);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/BatchQueryHandler.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/BatchQueryHandler.java
new file mode 100644
index 0000000000..5a775aa243
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/BatchQueryHandler.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ERROR_FIELD;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.STATUS_FIELD;
+import static org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher.JOB_TYPE_TAG_KEY;
+import static org.opensearch.sql.spark.metrics.EmrMetrics.EMR_BATCH_QUERY_JOBS_CREATION_COUNT;
+
+import com.amazonaws.services.emrserverless.model.GetJobRunResult;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.json.JSONObject;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.QueryState;
+import org.opensearch.sql.spark.client.EMRServerlessClient;
+import org.opensearch.sql.spark.client.StartJobRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.leasemanager.LeaseManager;
+import org.opensearch.sql.spark.metrics.MetricsService;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilderProvider;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+
+/**
+ * The handler for batch query. With batch query, queries are executed as single batch. The queries
+ * are sent along with job execution request ({@link StartJobRequest}) to spark.
+ */
+@RequiredArgsConstructor
+public class BatchQueryHandler extends AsyncQueryHandler {
+  protected final EMRServerlessClient emrServerlessClient;
+  protected final JobExecutionResponseReader jobExecutionResponseReader;
+  protected final LeaseManager leaseManager;
+  protected final MetricsService metricsService;
+  protected final SparkSubmitParametersBuilderProvider sparkSubmitParametersBuilderProvider;
+
+  @Override
+  protected JSONObject getResponseFromResultIndex(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    // either empty json when the result is not available or data with status
+    // Fetch from Result Index
+    return jobExecutionResponseReader.getResultWithJobId(
+        asyncQueryJobMetadata.getJobId(), asyncQueryJobMetadata.getResultIndex());
+  }
+
+  @Override
+  protected JSONObject getResponseFromExecutor(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    JSONObject result = new JSONObject();
+    // make call to EMR Serverless when related result index documents are not available
+    GetJobRunResult getJobRunResult =
+        emrServerlessClient.getJobRunResult(
+            asyncQueryJobMetadata.getApplicationId(), asyncQueryJobMetadata.getJobId());
+    String jobState = getJobRunResult.getJobRun().getState();
+    result.put(STATUS_FIELD, jobState);
+    result.put(ERROR_FIELD, "");
+    return result;
+  }
+
+  @Override
+  public String cancelJob(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    emrServerlessClient.cancelJobRun(
+        asyncQueryJobMetadata.getApplicationId(), asyncQueryJobMetadata.getJobId(), false);
+    return asyncQueryJobMetadata.getQueryId();
+  }
+
+  @Override
+  public DispatchQueryResponse submit(
+      DispatchQueryRequest dispatchQueryRequest, DispatchQueryContext context) {
+    String clusterName = dispatchQueryRequest.getClusterName();
+    Map<String, String> tags = context.getTags();
+    DataSourceMetadata dataSourceMetadata = context.getDataSourceMetadata();
+
+    tags.put(JOB_TYPE_TAG_KEY, JobType.BATCH.getText());
+    StartJobRequest startJobRequest =
+        new StartJobRequest(
+            clusterName + ":" + JobType.BATCH.getText(),
+            dispatchQueryRequest.getAccountId(),
+            dispatchQueryRequest.getApplicationId(),
+            dispatchQueryRequest.getExecutionRoleARN(),
+            sparkSubmitParametersBuilderProvider
+                .getSparkSubmitParametersBuilder()
+                .clusterName(clusterName)
+                .queryId(context.getQueryId())
+                .query(dispatchQueryRequest.getQuery())
+                .dataSource(
+                    context.getDataSourceMetadata(),
+                    dispatchQueryRequest,
+                    context.getAsyncQueryRequestContext())
+                .acceptModifier(dispatchQueryRequest.getSparkSubmitParameterModifier())
+                .acceptComposers(dispatchQueryRequest, context.getAsyncQueryRequestContext())
+                .toString(),
+            tags,
+            false,
+            dataSourceMetadata.getResultIndex());
+    String jobId = emrServerlessClient.startJobRun(startJobRequest);
+    metricsService.incrementNumericalMetric(EMR_BATCH_QUERY_JOBS_CREATION_COUNT);
+    return DispatchQueryResponse.builder()
+        .queryId(context.getQueryId())
+        .jobId(jobId)
+        .resultIndex(dataSourceMetadata.getResultIndex())
+        .datasourceName(dataSourceMetadata.getName())
+        .jobType(JobType.BATCH)
+        .status(QueryState.WAITING)
+        .indexName(getIndexName(context))
+        .build();
+  }
+
+  private static String getIndexName(DispatchQueryContext context) {
+    return context.getIndexQueryDetails() != null
+        ? context.getIndexQueryDetails().openSearchIndexName()
+        : null;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/DatasourceEmbeddedQueryIdProvider.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/DatasourceEmbeddedQueryIdProvider.java
new file mode 100644
index 0000000000..3564fa9552
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/DatasourceEmbeddedQueryIdProvider.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.utils.IDUtils;
+
+/** Generates QueryId by embedding Datasource name and random UUID */
+public class DatasourceEmbeddedQueryIdProvider implements QueryIdProvider {
+
+  @Override
+  public String getQueryId(
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    return IDUtils.encode(dispatchQueryRequest.getDatasource());
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/IndexDMLHandler.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/IndexDMLHandler.java
new file mode 100644
index 0000000000..fe848593a7
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/IndexDMLHandler.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ERROR_FIELD;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.STATUS_FIELD;
+
+import com.amazonaws.services.emrserverless.model.JobRunState;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONObject;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.QueryState;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
+import org.opensearch.sql.spark.dispatcher.model.IndexDMLResult;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryDetails;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+import org.opensearch.sql.spark.flint.FlintIndexMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.IndexDMLResultStorageService;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOp;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+
+/**
+ * The handler for Index DML (Data Manipulation Language) query. Handles DROP/ALTER/VACUUM operation
+ * for flint indices. It will stop streaming query job as needed (e.g. when the flint index is
+ * automatically updated by a streaming query, the streaming query is stopped when the index is
+ * dropped)
+ */
+@RequiredArgsConstructor
+public class IndexDMLHandler extends AsyncQueryHandler {
+  private static final Logger LOG = LogManager.getLogger();
+
+  // To be deprecated in 3.0. Still using for backward compatibility.
+  public static final String DROP_INDEX_JOB_ID = "dropIndexJobId";
+  public static final String DML_QUERY_JOB_ID = "DMLQueryJobId";
+
+  private final JobExecutionResponseReader jobExecutionResponseReader;
+  private final FlintIndexMetadataService flintIndexMetadataService;
+  private final IndexDMLResultStorageService indexDMLResultStorageService;
+  private final FlintIndexOpFactory flintIndexOpFactory;
+
+  public static boolean isIndexDMLQuery(String jobId) {
+    return DROP_INDEX_JOB_ID.equalsIgnoreCase(jobId) || DML_QUERY_JOB_ID.equalsIgnoreCase(jobId);
+  }
+
+  @Override
+  public DispatchQueryResponse submit(
+      DispatchQueryRequest dispatchQueryRequest, DispatchQueryContext context) {
+    DataSourceMetadata dataSourceMetadata = context.getDataSourceMetadata();
+    long startTime = System.currentTimeMillis();
+    try {
+      IndexQueryDetails indexDetails = context.getIndexQueryDetails();
+      FlintIndexMetadata indexMetadata =
+          getFlintIndexMetadata(indexDetails, context.getAsyncQueryRequestContext());
+
+      getIndexOp(dispatchQueryRequest, indexDetails)
+          .apply(indexMetadata, context.getAsyncQueryRequestContext());
+
+      String asyncQueryId =
+          storeIndexDMLResult(
+              context.getQueryId(),
+              dispatchQueryRequest,
+              dataSourceMetadata,
+              JobRunState.SUCCESS.toString(),
+              StringUtils.EMPTY,
+              getElapsedTimeSince(startTime),
+              context.getAsyncQueryRequestContext());
+      return DispatchQueryResponse.builder()
+          .queryId(asyncQueryId)
+          .jobId(DML_QUERY_JOB_ID)
+          .resultIndex(dataSourceMetadata.getResultIndex())
+          .datasourceName(dataSourceMetadata.getName())
+          .jobType(JobType.BATCH)
+          .status(QueryState.SUCCESS)
+          .build();
+    } catch (Exception e) {
+      LOG.error(e.getMessage());
+      String asyncQueryId =
+          storeIndexDMLResult(
+              context.getQueryId(),
+              dispatchQueryRequest,
+              dataSourceMetadata,
+              JobRunState.FAILED.toString(),
+              e.getMessage(),
+              getElapsedTimeSince(startTime),
+              context.getAsyncQueryRequestContext());
+      return DispatchQueryResponse.builder()
+          .queryId(asyncQueryId)
+          .jobId(DML_QUERY_JOB_ID)
+          .resultIndex(dataSourceMetadata.getResultIndex())
+          .datasourceName(dataSourceMetadata.getName())
+          .jobType(JobType.BATCH)
+          .status(QueryState.FAILED)
+          .error(e.getMessage())
+          .build();
+    }
+  }
+
+  private String storeIndexDMLResult(
+      String queryId,
+      DispatchQueryRequest dispatchQueryRequest,
+      DataSourceMetadata dataSourceMetadata,
+      String status,
+      String error,
+      long queryRunTime,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    IndexDMLResult indexDMLResult =
+        IndexDMLResult.builder()
+            .queryId(queryId)
+            .status(status)
+            .error(error)
+            .datasourceName(dispatchQueryRequest.getDatasource())
+            .queryRunTime(queryRunTime)
+            .updateTime(System.currentTimeMillis())
+            .build();
+    indexDMLResultStorageService.createIndexDMLResult(indexDMLResult, asyncQueryRequestContext);
+    return queryId;
+  }
+
+  private long getElapsedTimeSince(long startTime) {
+    return System.currentTimeMillis() - startTime;
+  }
+
+  private FlintIndexOp getIndexOp(
+      DispatchQueryRequest dispatchQueryRequest, IndexQueryDetails indexQueryDetails) {
+    switch (indexQueryDetails.getIndexQueryActionType()) {
+      case DROP:
+        return flintIndexOpFactory.getDrop(dispatchQueryRequest.getDatasource());
+      case ALTER:
+        return flintIndexOpFactory.getAlter(
+            indexQueryDetails.getFlintIndexOptions(), dispatchQueryRequest.getDatasource());
+      default:
+        throw new IllegalStateException(
+            String.format(
+                "IndexQueryActionType: %s is not supported in IndexDMLHandler.",
+                indexQueryDetails.getIndexQueryActionType()));
+    }
+  }
+
+  private FlintIndexMetadata getFlintIndexMetadata(
+      IndexQueryDetails indexDetails, AsyncQueryRequestContext asyncQueryRequestContext) {
+    Map<String, FlintIndexMetadata> indexMetadataMap =
+        flintIndexMetadataService.getFlintIndexMetadata(
+            indexDetails.openSearchIndexName(), asyncQueryRequestContext);
+    if (!indexMetadataMap.containsKey(indexDetails.openSearchIndexName())) {
+      throw new IllegalStateException(
+          String.format(
+              "Couldn't fetch flint index: %s details", indexDetails.openSearchIndexName()));
+    }
+    return indexMetadataMap.get(indexDetails.openSearchIndexName());
+  }
+
+  @Override
+  protected JSONObject getResponseFromResultIndex(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    String queryId = asyncQueryJobMetadata.getQueryId();
+    return jobExecutionResponseReader.getResultWithQueryId(
+        queryId, asyncQueryJobMetadata.getResultIndex());
+  }
+
+  @Override
+  protected JSONObject getResponseFromExecutor(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    // Consider statement still running if result doc created in submit() is not available yet
+    JSONObject result = new JSONObject();
+    result.put(STATUS_FIELD, StatementState.RUNNING.getState());
+    result.put(ERROR_FIELD, "");
+    return result;
+  }
+
+  @Override
+  public String cancelJob(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    throw new IllegalArgumentException("can't cancel index DML query");
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/InteractiveQueryHandler.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/InteractiveQueryHandler.java
new file mode 100644
index 0000000000..75912f3a7c
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/InteractiveQueryHandler.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ERROR_FIELD;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_SESSION_CLASS_NAME;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.STATUS_FIELD;
+import static org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher.JOB_TYPE_TAG_KEY;
+
+import java.util.Map;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.json.JSONObject;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.QueryState;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.execution.session.CreateSessionRequest;
+import org.opensearch.sql.spark.execution.session.Session;
+import org.opensearch.sql.spark.execution.session.SessionManager;
+import org.opensearch.sql.spark.execution.statement.QueryRequest;
+import org.opensearch.sql.spark.execution.statement.Statement;
+import org.opensearch.sql.spark.execution.statement.StatementId;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+import org.opensearch.sql.spark.leasemanager.LeaseManager;
+import org.opensearch.sql.spark.leasemanager.model.LeaseRequest;
+import org.opensearch.sql.spark.metrics.EmrMetrics;
+import org.opensearch.sql.spark.metrics.MetricsService;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilderProvider;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+
+/**
+ * The handler for interactive query. With interactive query, a session will be first established
+ * and then the session will be reused for the following queries(statements). Session is an
+ * abstraction of spark job, and once the job is started, the job will continuously poll the
+ * statements and execute query specified in it.
+ */
+@RequiredArgsConstructor
+public class InteractiveQueryHandler extends AsyncQueryHandler {
+  private final SessionManager sessionManager;
+  private final JobExecutionResponseReader jobExecutionResponseReader;
+  private final LeaseManager leaseManager;
+  private final MetricsService metricsService;
+  protected final SparkSubmitParametersBuilderProvider sparkSubmitParametersBuilderProvider;
+
+  @Override
+  protected JSONObject getResponseFromResultIndex(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    String queryId = asyncQueryJobMetadata.getQueryId();
+    return jobExecutionResponseReader.getResultWithQueryId(
+        queryId, asyncQueryJobMetadata.getResultIndex());
+  }
+
+  @Override
+  protected JSONObject getResponseFromExecutor(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    JSONObject result = new JSONObject();
+    String queryId = asyncQueryJobMetadata.getQueryId();
+    Statement statement =
+        getStatementByQueryId(
+            asyncQueryJobMetadata.getSessionId(),
+            queryId,
+            asyncQueryJobMetadata.getDatasourceName(),
+            asyncQueryRequestContext);
+    StatementState statementState = statement.getStatementState();
+    result.put(STATUS_FIELD, statementState.getState());
+    result.put(ERROR_FIELD, Optional.of(statement.getStatementModel().getError()).orElse(""));
+    return result;
+  }
+
+  @Override
+  public String cancelJob(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    String queryId = asyncQueryJobMetadata.getQueryId();
+    getStatementByQueryId(
+            asyncQueryJobMetadata.getSessionId(),
+            queryId,
+            asyncQueryJobMetadata.getDatasourceName(),
+            asyncQueryRequestContext)
+        .cancel();
+    return queryId;
+  }
+
+  @Override
+  public DispatchQueryResponse submit(
+      DispatchQueryRequest dispatchQueryRequest, DispatchQueryContext context) {
+    Session session = null;
+    String clusterName = dispatchQueryRequest.getClusterName();
+    Map<String, String> tags = context.getTags();
+    DataSourceMetadata dataSourceMetadata = context.getDataSourceMetadata();
+
+    // todo, manage lease lifecycle
+    leaseManager.borrow(
+        new LeaseRequest(JobType.INTERACTIVE, dispatchQueryRequest.getDatasource()));
+
+    if (dispatchQueryRequest.getSessionId() != null) {
+      // get session from request
+      Optional<Session> existingSession =
+          sessionManager.getSession(
+              dispatchQueryRequest.getSessionId(), dispatchQueryRequest.getDatasource());
+      if (existingSession.isPresent()) {
+        session = existingSession.get();
+      }
+    }
+    if (session == null
+        || !session.isOperationalForDataSource(dispatchQueryRequest.getDatasource())) {
+      // create session if not exist or session dead/fail
+      tags.put(JOB_TYPE_TAG_KEY, JobType.INTERACTIVE.getText());
+      session =
+          sessionManager.createSession(
+              new CreateSessionRequest(
+                  clusterName,
+                  dispatchQueryRequest.getAccountId(),
+                  dispatchQueryRequest.getApplicationId(),
+                  dispatchQueryRequest.getExecutionRoleARN(),
+                  sparkSubmitParametersBuilderProvider
+                      .getSparkSubmitParametersBuilder()
+                      .className(FLINT_SESSION_CLASS_NAME)
+                      .clusterName(clusterName)
+                      .dataSource(
+                          dataSourceMetadata,
+                          dispatchQueryRequest,
+                          context.getAsyncQueryRequestContext())
+                      .acceptModifier(dispatchQueryRequest.getSparkSubmitParameterModifier())
+                      .acceptComposers(dispatchQueryRequest, context.getAsyncQueryRequestContext()),
+                  tags,
+                  dataSourceMetadata.getResultIndex(),
+                  dataSourceMetadata.getName()),
+              context.getAsyncQueryRequestContext());
+      metricsService.incrementNumericalMetric(EmrMetrics.EMR_INTERACTIVE_QUERY_JOBS_CREATION_COUNT);
+    }
+    session.submit(
+        new QueryRequest(
+            context.getQueryId(),
+            dispatchQueryRequest.getLangType(),
+            dispatchQueryRequest.getQuery()),
+        context.getAsyncQueryRequestContext());
+    return DispatchQueryResponse.builder()
+        .queryId(context.getQueryId())
+        .jobId(session.getSessionModel().getJobId())
+        .resultIndex(dataSourceMetadata.getResultIndex())
+        .sessionId(session.getSessionId())
+        .datasourceName(dataSourceMetadata.getName())
+        .jobType(JobType.INTERACTIVE)
+        .status(QueryState.WAITING)
+        .build();
+  }
+
+  private Statement getStatementByQueryId(
+      String sessionId,
+      String queryId,
+      String datasourceName,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    Optional<Session> session = sessionManager.getSession(sessionId, datasourceName);
+    if (session.isPresent()) {
+      // todo, statementId == jobId if statement running in session.
+      StatementId statementId = new StatementId(queryId);
+      Optional<Statement> statement = session.get().get(statementId, asyncQueryRequestContext);
+      if (statement.isPresent()) {
+        return statement.get();
+      } else {
+        throw new IllegalArgumentException("no statement found. " + statementId);
+      }
+    } else {
+      throw new IllegalArgumentException("no session found. " + sessionId);
+    }
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/QueryHandlerFactory.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/QueryHandlerFactory.java
new file mode 100644
index 0000000000..d6e70a9d86
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/QueryHandlerFactory.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.execution.session.SessionManager;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.IndexDMLResultStorageService;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
+import org.opensearch.sql.spark.leasemanager.LeaseManager;
+import org.opensearch.sql.spark.metrics.MetricsService;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilderProvider;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+
+@RequiredArgsConstructor
+public class QueryHandlerFactory {
+
+  private final JobExecutionResponseReader jobExecutionResponseReader;
+  private final FlintIndexMetadataService flintIndexMetadataService;
+  private final SessionManager sessionManager;
+  private final LeaseManager leaseManager;
+  private final IndexDMLResultStorageService indexDMLResultStorageService;
+  private final FlintIndexOpFactory flintIndexOpFactory;
+  private final EMRServerlessClientFactory emrServerlessClientFactory;
+  private final MetricsService metricsService;
+  protected final SparkSubmitParametersBuilderProvider sparkSubmitParametersBuilderProvider;
+
+  public RefreshQueryHandler getRefreshQueryHandler(String accountId) {
+    return new RefreshQueryHandler(
+        emrServerlessClientFactory.getClient(accountId),
+        jobExecutionResponseReader,
+        flintIndexMetadataService,
+        leaseManager,
+        flintIndexOpFactory,
+        metricsService,
+        sparkSubmitParametersBuilderProvider);
+  }
+
+  public StreamingQueryHandler getStreamingQueryHandler(String accountId) {
+    return new StreamingQueryHandler(
+        emrServerlessClientFactory.getClient(accountId),
+        jobExecutionResponseReader,
+        leaseManager,
+        metricsService,
+        sparkSubmitParametersBuilderProvider);
+  }
+
+  public BatchQueryHandler getBatchQueryHandler(String accountId) {
+    return new BatchQueryHandler(
+        emrServerlessClientFactory.getClient(accountId),
+        jobExecutionResponseReader,
+        leaseManager,
+        metricsService,
+        sparkSubmitParametersBuilderProvider);
+  }
+
+  public InteractiveQueryHandler getInteractiveQueryHandler() {
+    return new InteractiveQueryHandler(
+        sessionManager,
+        jobExecutionResponseReader,
+        leaseManager,
+        metricsService,
+        sparkSubmitParametersBuilderProvider);
+  }
+
+  public IndexDMLHandler getIndexDMLHandler() {
+    return new IndexDMLHandler(
+        jobExecutionResponseReader,
+        flintIndexMetadataService,
+        indexDMLResultStorageService,
+        flintIndexOpFactory);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/QueryIdProvider.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/QueryIdProvider.java
new file mode 100644
index 0000000000..a108ca1209
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/QueryIdProvider.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+
+/** Interface for extension point to specify queryId. Called when new query is executed. */
+public interface QueryIdProvider {
+  String getQueryId(
+      DispatchQueryRequest dispatchQueryRequest, AsyncQueryRequestContext asyncQueryRequestContext);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/RefreshQueryHandler.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/RefreshQueryHandler.java
new file mode 100644
index 0000000000..52cd863081
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/RefreshQueryHandler.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import java.util.Map;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.QueryState;
+import org.opensearch.sql.spark.client.EMRServerlessClient;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.flint.FlintIndexMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOp;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
+import org.opensearch.sql.spark.leasemanager.LeaseManager;
+import org.opensearch.sql.spark.leasemanager.model.LeaseRequest;
+import org.opensearch.sql.spark.metrics.MetricsService;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilderProvider;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+
+/**
+ * The handler for refresh query. Refresh query is one time query request to refresh(update) flint
+ * index, and new job is submitted to Spark.
+ */
+public class RefreshQueryHandler extends BatchQueryHandler {
+
+  private final FlintIndexMetadataService flintIndexMetadataService;
+  private final FlintIndexOpFactory flintIndexOpFactory;
+
+  public RefreshQueryHandler(
+      EMRServerlessClient emrServerlessClient,
+      JobExecutionResponseReader jobExecutionResponseReader,
+      FlintIndexMetadataService flintIndexMetadataService,
+      LeaseManager leaseManager,
+      FlintIndexOpFactory flintIndexOpFactory,
+      MetricsService metricsService,
+      SparkSubmitParametersBuilderProvider sparkSubmitParametersBuilderProvider) {
+    super(
+        emrServerlessClient,
+        jobExecutionResponseReader,
+        leaseManager,
+        metricsService,
+        sparkSubmitParametersBuilderProvider);
+    this.flintIndexMetadataService = flintIndexMetadataService;
+    this.flintIndexOpFactory = flintIndexOpFactory;
+  }
+
+  @Override
+  public String cancelJob(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    String datasourceName = asyncQueryJobMetadata.getDatasourceName();
+    Map<String, FlintIndexMetadata> indexMetadataMap =
+        flintIndexMetadataService.getFlintIndexMetadata(
+            asyncQueryJobMetadata.getIndexName(), asyncQueryRequestContext);
+    if (!indexMetadataMap.containsKey(asyncQueryJobMetadata.getIndexName())) {
+      throw new IllegalStateException(
+          String.format(
+              "Couldn't fetch flint index: %s details", asyncQueryJobMetadata.getIndexName()));
+    }
+    FlintIndexMetadata indexMetadata = indexMetadataMap.get(asyncQueryJobMetadata.getIndexName());
+    FlintIndexOp jobCancelOp = flintIndexOpFactory.getCancel(datasourceName);
+    jobCancelOp.apply(indexMetadata, asyncQueryRequestContext);
+    return asyncQueryJobMetadata.getQueryId();
+  }
+
+  @Override
+  public DispatchQueryResponse submit(
+      DispatchQueryRequest dispatchQueryRequest, DispatchQueryContext context) {
+    leaseManager.borrow(new LeaseRequest(JobType.REFRESH, dispatchQueryRequest.getDatasource()));
+
+    DispatchQueryResponse resp = super.submit(dispatchQueryRequest, context);
+    DataSourceMetadata dataSourceMetadata = context.getDataSourceMetadata();
+    return DispatchQueryResponse.builder()
+        .queryId(resp.getQueryId())
+        .jobId(resp.getJobId())
+        .resultIndex(resp.getResultIndex())
+        .sessionId(resp.getSessionId())
+        .datasourceName(dataSourceMetadata.getName())
+        .jobType(JobType.REFRESH)
+        .indexName(context.getIndexQueryDetails().openSearchIndexName())
+        .status(QueryState.WAITING)
+        .build();
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/SparkQueryDispatcher.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/SparkQueryDispatcher.java
new file mode 100644
index 0000000000..ff8c8d1fe8
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/SparkQueryDispatcher.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import java.util.HashMap;
+import java.util.Map;
+import lombok.AllArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+import org.json.JSONObject;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryActionType;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryDetails;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.execution.session.SessionManager;
+import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.spark.utils.SQLQueryUtils;
+import org.opensearch.sql.spark.validator.SQLQueryValidator;
+
+/** This class takes care of understanding query and dispatching job query to emr serverless. */
+@AllArgsConstructor
+public class SparkQueryDispatcher {
+
+  public static final String INDEX_TAG_KEY = "index";
+  public static final String DATASOURCE_TAG_KEY = "datasource";
+  public static final String CLUSTER_NAME_TAG_KEY = "domain_ident";
+  public static final String JOB_TYPE_TAG_KEY = "type";
+
+  private final DataSourceService dataSourceService;
+  private final SessionManager sessionManager;
+  private final QueryHandlerFactory queryHandlerFactory;
+  private final QueryIdProvider queryIdProvider;
+  private final SQLQueryValidator sqlQueryValidator;
+
+  public DispatchQueryResponse dispatch(
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    DataSourceMetadata dataSourceMetadata =
+        this.dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            dispatchQueryRequest.getDatasource(), asyncQueryRequestContext);
+
+    if (LangType.SQL.equals(dispatchQueryRequest.getLangType())) {
+      String query = dispatchQueryRequest.getQuery();
+
+      if (SQLQueryUtils.isFlintExtensionQuery(query)) {
+        return handleFlintExtensionQuery(
+            dispatchQueryRequest, asyncQueryRequestContext, dataSourceMetadata);
+      }
+
+      sqlQueryValidator.validate(query, dataSourceMetadata.getConnector());
+    }
+    return handleDefaultQuery(dispatchQueryRequest, asyncQueryRequestContext, dataSourceMetadata);
+  }
+
+  private DispatchQueryResponse handleFlintExtensionQuery(
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext asyncQueryRequestContext,
+      DataSourceMetadata dataSourceMetadata) {
+    IndexQueryDetails indexQueryDetails = getIndexQueryDetails(dispatchQueryRequest);
+    DispatchQueryContext context =
+        getDefaultDispatchContextBuilder(
+                dispatchQueryRequest, dataSourceMetadata, asyncQueryRequestContext)
+            .indexQueryDetails(indexQueryDetails)
+            .asyncQueryRequestContext(asyncQueryRequestContext)
+            .build();
+
+    return getQueryHandlerForFlintExtensionQuery(dispatchQueryRequest, indexQueryDetails)
+        .submit(dispatchQueryRequest, context);
+  }
+
+  private DispatchQueryResponse handleDefaultQuery(
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext asyncQueryRequestContext,
+      DataSourceMetadata dataSourceMetadata) {
+
+    DispatchQueryContext context =
+        getDefaultDispatchContextBuilder(
+                dispatchQueryRequest, dataSourceMetadata, asyncQueryRequestContext)
+            .asyncQueryRequestContext(asyncQueryRequestContext)
+            .build();
+
+    return getDefaultAsyncQueryHandler(dispatchQueryRequest.getAccountId())
+        .submit(dispatchQueryRequest, context);
+  }
+
+  private DispatchQueryContext.DispatchQueryContextBuilder getDefaultDispatchContextBuilder(
+      DispatchQueryRequest dispatchQueryRequest,
+      DataSourceMetadata dataSourceMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    return DispatchQueryContext.builder()
+        .dataSourceMetadata(dataSourceMetadata)
+        .tags(getDefaultTagsForJobSubmission(dispatchQueryRequest))
+        .queryId(queryIdProvider.getQueryId(dispatchQueryRequest, asyncQueryRequestContext));
+  }
+
+  private AsyncQueryHandler getQueryHandlerForFlintExtensionQuery(
+      DispatchQueryRequest dispatchQueryRequest, IndexQueryDetails indexQueryDetails) {
+    if (isEligibleForIndexDMLHandling(indexQueryDetails)) {
+      return queryHandlerFactory.getIndexDMLHandler();
+    } else if (isEligibleForStreamingQuery(indexQueryDetails)) {
+      return queryHandlerFactory.getStreamingQueryHandler(dispatchQueryRequest.getAccountId());
+    } else if (IndexQueryActionType.CREATE.equals(indexQueryDetails.getIndexQueryActionType())) {
+      // Create should be handled by batch handler. This is to avoid DROP index incorrectly cancel
+      // an interactive job.
+      return queryHandlerFactory.getBatchQueryHandler(dispatchQueryRequest.getAccountId());
+    } else if (IndexQueryActionType.REFRESH.equals(indexQueryDetails.getIndexQueryActionType())) {
+      // Manual refresh should be handled by batch handler
+      return queryHandlerFactory.getRefreshQueryHandler(dispatchQueryRequest.getAccountId());
+    } else if (IndexQueryActionType.RECOVER.equals(indexQueryDetails.getIndexQueryActionType())) {
+      // RECOVER INDEX JOB should not be executed from async-query-core
+      throw new IllegalArgumentException("RECOVER INDEX JOB is not allowed.");
+    } else {
+      return getDefaultAsyncQueryHandler(dispatchQueryRequest.getAccountId());
+    }
+  }
+
+  @NotNull
+  private AsyncQueryHandler getDefaultAsyncQueryHandler(String accountId) {
+    return sessionManager.isEnabled()
+        ? queryHandlerFactory.getInteractiveQueryHandler()
+        : queryHandlerFactory.getBatchQueryHandler(accountId);
+  }
+
+  @NotNull
+  private static IndexQueryDetails getIndexQueryDetails(DispatchQueryRequest dispatchQueryRequest) {
+    IndexQueryDetails indexQueryDetails =
+        SQLQueryUtils.extractIndexDetails(dispatchQueryRequest.getQuery());
+    fillDatasourceName(dispatchQueryRequest, indexQueryDetails);
+    return indexQueryDetails;
+  }
+
+  private boolean isEligibleForStreamingQuery(IndexQueryDetails indexQueryDetails) {
+    Boolean isCreateAutoRefreshIndex =
+        IndexQueryActionType.CREATE.equals(indexQueryDetails.getIndexQueryActionType())
+            && indexQueryDetails.getFlintIndexOptions().autoRefresh();
+    Boolean isAlterQuery =
+        IndexQueryActionType.ALTER.equals(indexQueryDetails.getIndexQueryActionType());
+    return isCreateAutoRefreshIndex || isAlterQuery;
+  }
+
+  private boolean isEligibleForIndexDMLHandling(IndexQueryDetails indexQueryDetails) {
+    return IndexQueryActionType.DROP.equals(indexQueryDetails.getIndexQueryActionType())
+        || (IndexQueryActionType.ALTER.equals(indexQueryDetails.getIndexQueryActionType())
+            && (indexQueryDetails
+                    .getFlintIndexOptions()
+                    .getProvidedOptions()
+                    .containsKey("auto_refresh")
+                && !indexQueryDetails.getFlintIndexOptions().autoRefresh()));
+  }
+
+  public JSONObject getQueryResponse(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    return getAsyncQueryHandlerForExistingQuery(asyncQueryJobMetadata)
+        .getQueryResponse(asyncQueryJobMetadata, asyncQueryRequestContext);
+  }
+
+  public String cancelJob(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    return getAsyncQueryHandlerForExistingQuery(asyncQueryJobMetadata)
+        .cancelJob(asyncQueryJobMetadata, asyncQueryRequestContext);
+  }
+
+  private AsyncQueryHandler getAsyncQueryHandlerForExistingQuery(
+      AsyncQueryJobMetadata asyncQueryJobMetadata) {
+    if (asyncQueryJobMetadata.getSessionId() != null) {
+      return queryHandlerFactory.getInteractiveQueryHandler();
+    } else if (IndexDMLHandler.isIndexDMLQuery(asyncQueryJobMetadata.getJobId())) {
+      return queryHandlerFactory.getIndexDMLHandler();
+    } else if (asyncQueryJobMetadata.getJobType() == JobType.REFRESH) {
+      return queryHandlerFactory.getRefreshQueryHandler(asyncQueryJobMetadata.getAccountId());
+    } else if (asyncQueryJobMetadata.getJobType() == JobType.STREAMING) {
+      return queryHandlerFactory.getStreamingQueryHandler(asyncQueryJobMetadata.getAccountId());
+    } else {
+      return queryHandlerFactory.getBatchQueryHandler(asyncQueryJobMetadata.getAccountId());
+    }
+  }
+
+  // TODO: Revisit this logic.
+  // Currently, Spark if datasource is not provided in query.
+  // Spark Assumes the datasource to be catalog.
+  // This is required to handle drop index case properly when datasource name is not provided.
+  private static void fillDatasourceName(
+      DispatchQueryRequest dispatchQueryRequest, IndexQueryDetails indexQueryDetails) {
+    if (indexQueryDetails.getFullyQualifiedTableName() != null
+        && indexQueryDetails.getFullyQualifiedTableName().getDatasourceName() == null) {
+      indexQueryDetails
+          .getFullyQualifiedTableName()
+          .setDatasourceName(dispatchQueryRequest.getDatasource());
+    }
+  }
+
+  private static Map<String, String> getDefaultTagsForJobSubmission(
+      DispatchQueryRequest dispatchQueryRequest) {
+    Map<String, String> tags = new HashMap<>();
+    tags.put(CLUSTER_NAME_TAG_KEY, dispatchQueryRequest.getClusterName());
+    tags.put(DATASOURCE_TAG_KEY, dispatchQueryRequest.getDatasource());
+    return tags;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/StreamingQueryHandler.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/StreamingQueryHandler.java
new file mode 100644
index 0000000000..58fb5244b4
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/StreamingQueryHandler.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import static org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher.INDEX_TAG_KEY;
+import static org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher.JOB_TYPE_TAG_KEY;
+import static org.opensearch.sql.spark.metrics.EmrMetrics.EMR_STREAMING_QUERY_JOBS_CREATION_COUNT;
+
+import java.util.Map;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.QueryState;
+import org.opensearch.sql.spark.client.EMRServerlessClient;
+import org.opensearch.sql.spark.client.StartJobRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryDetails;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.leasemanager.LeaseManager;
+import org.opensearch.sql.spark.leasemanager.model.LeaseRequest;
+import org.opensearch.sql.spark.metrics.MetricsService;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilderProvider;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+
+/**
+ * The handler for streaming query. Streaming query is a job to continuously update flint index.
+ * Once started, the job can be stopped by IndexDML query.
+ */
+public class StreamingQueryHandler extends BatchQueryHandler {
+
+  public StreamingQueryHandler(
+      EMRServerlessClient emrServerlessClient,
+      JobExecutionResponseReader jobExecutionResponseReader,
+      LeaseManager leaseManager,
+      MetricsService metricsService,
+      SparkSubmitParametersBuilderProvider sparkSubmitParametersBuilderProvider) {
+    super(
+        emrServerlessClient,
+        jobExecutionResponseReader,
+        leaseManager,
+        metricsService,
+        sparkSubmitParametersBuilderProvider);
+  }
+
+  @Override
+  public String cancelJob(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    throw new IllegalArgumentException(
+        "can't cancel index DML query, using ALTER auto_refresh=off statement to stop job, using"
+            + " VACUUM statement to stop job and delete data");
+  }
+
+  @Override
+  public DispatchQueryResponse submit(
+      DispatchQueryRequest dispatchQueryRequest, DispatchQueryContext context) {
+
+    leaseManager.borrow(new LeaseRequest(JobType.STREAMING, dispatchQueryRequest.getDatasource()));
+
+    String clusterName = dispatchQueryRequest.getClusterName();
+    IndexQueryDetails indexQueryDetails = context.getIndexQueryDetails();
+    Map<String, String> tags = context.getTags();
+    tags.put(INDEX_TAG_KEY, indexQueryDetails.openSearchIndexName());
+    DataSourceMetadata dataSourceMetadata = context.getDataSourceMetadata();
+    tags.put(JOB_TYPE_TAG_KEY, JobType.STREAMING.getText());
+    String jobName =
+        clusterName
+            + ":"
+            + JobType.STREAMING.getText()
+            + ":"
+            + indexQueryDetails.openSearchIndexName();
+    StartJobRequest startJobRequest =
+        new StartJobRequest(
+            jobName,
+            dispatchQueryRequest.getAccountId(),
+            dispatchQueryRequest.getApplicationId(),
+            dispatchQueryRequest.getExecutionRoleARN(),
+            sparkSubmitParametersBuilderProvider
+                .getSparkSubmitParametersBuilder()
+                .clusterName(clusterName)
+                .queryId(context.getQueryId())
+                .query(dispatchQueryRequest.getQuery())
+                .structuredStreaming(true)
+                .dataSource(
+                    dataSourceMetadata, dispatchQueryRequest, context.getAsyncQueryRequestContext())
+                .acceptModifier(dispatchQueryRequest.getSparkSubmitParameterModifier())
+                .acceptComposers(dispatchQueryRequest, context.getAsyncQueryRequestContext())
+                .toString(),
+            tags,
+            indexQueryDetails.getFlintIndexOptions().autoRefresh(),
+            dataSourceMetadata.getResultIndex());
+    String jobId = emrServerlessClient.startJobRun(startJobRequest);
+    metricsService.incrementNumericalMetric(EMR_STREAMING_QUERY_JOBS_CREATION_COUNT);
+    return DispatchQueryResponse.builder()
+        .queryId(context.getQueryId())
+        .jobId(jobId)
+        .resultIndex(dataSourceMetadata.getResultIndex())
+        .datasourceName(dataSourceMetadata.getName())
+        .jobType(JobType.STREAMING)
+        .indexName(indexQueryDetails.openSearchIndexName())
+        .status(QueryState.WAITING)
+        .build();
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/DispatchQueryContext.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/DispatchQueryContext.java
new file mode 100644
index 0000000000..aabe43f641
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/DispatchQueryContext.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher.model;
+
+import java.util.Map;
+import lombok.Builder;
+import lombok.Getter;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+
+@Getter
+@Builder
+public class DispatchQueryContext {
+  private final String queryId;
+  private final DataSourceMetadata dataSourceMetadata;
+  private final Map<String, String> tags;
+  private final IndexQueryDetails indexQueryDetails;
+  private final AsyncQueryRequestContext asyncQueryRequestContext;
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/DispatchQueryRequest.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/DispatchQueryRequest.java
new file mode 100644
index 0000000000..066349873a
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/DispatchQueryRequest.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import org.opensearch.sql.spark.config.SparkSubmitParameterModifier;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+@AllArgsConstructor
+@Data
+@Builder
+public class DispatchQueryRequest {
+  private final String accountId;
+  private final String applicationId;
+  private final String query;
+  private final String datasource;
+  private final LangType langType;
+  private final String executionRoleARN;
+  private final String clusterName;
+
+  /* extension point to modify or add spark submit parameter */
+  private final SparkSubmitParameterModifier sparkSubmitParameterModifier;
+
+  /** Optional sessionId. */
+  private String sessionId;
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/DispatchQueryResponse.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/DispatchQueryResponse.java
new file mode 100644
index 0000000000..c484236d6e
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/DispatchQueryResponse.java
@@ -0,0 +1,19 @@
+package org.opensearch.sql.spark.dispatcher.model;
+
+import lombok.Builder;
+import lombok.Getter;
+import org.opensearch.sql.spark.asyncquery.model.QueryState;
+
+@Getter
+@Builder
+public class DispatchQueryResponse {
+  private final String queryId;
+  private final String jobId;
+  private final String resultIndex;
+  private final String sessionId;
+  private final String datasourceName;
+  private final JobType jobType;
+  private final String indexName;
+  private final QueryState status;
+  private final String error;
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/FlintIndexOptions.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/FlintIndexOptions.java
new file mode 100644
index 0000000000..6c7cc7c5fb
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/FlintIndexOptions.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * Model to store flint index options. Currently added fields which are required, and we can extend
+ * this in the future.
+ */
+public class FlintIndexOptions {
+
+  public static final String AUTO_REFRESH = "auto_refresh";
+  public static final String INCREMENTAL_REFRESH = "incremental_refresh";
+  public static final String CHECKPOINT_LOCATION = "checkpoint_location";
+  public static final String WATERMARK_DELAY = "watermark_delay";
+  public static final String SCHEDULER_MODE = "scheduler_mode";
+  private final Map<String, String> options = new HashMap<>();
+
+  public void setOption(String key, String value) {
+    options.put(key, value);
+  }
+
+  public Optional<String> getOption(String key) {
+    return Optional.ofNullable(options.get(key));
+  }
+
+  public boolean autoRefresh() {
+    return Boolean.parseBoolean(getOption(AUTO_REFRESH).orElse("false"));
+  }
+
+  public boolean isExternalScheduler() {
+    // Default is false, which means using internal scheduler to refresh the index.
+    return getOption(SCHEDULER_MODE).map(mode -> "external".equals(mode)).orElse(false);
+  }
+
+  public Map<String, String> getProvidedOptions() {
+    return new HashMap<>(options);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/FullyQualifiedTableName.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/FullyQualifiedTableName.java
new file mode 100644
index 0000000000..fc1513241f
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/FullyQualifiedTableName.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher.model;
+
+import static org.apache.commons.lang3.StringUtils.strip;
+import static org.opensearch.sql.spark.dispatcher.model.IndexQueryDetails.STRIP_CHARS;
+
+import java.util.Arrays;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/** Fully Qualified Table Name in the query provided. */
+@Data
+@NoArgsConstructor
+public class FullyQualifiedTableName {
+  private String datasourceName;
+  private String schemaName;
+  private String tableName;
+  private String fullyQualifiedName;
+
+  /**
+   * This constructor also takes care of logic to split the fully qualified name into respective
+   * pieces. If the name has more than three parts, first part is assigned tp datasource name,
+   * second is schemaName, third is tableName If there are only two parts, first part is assigned to
+   * schema name and second to table. If there is only one part it is assigned to table Name.
+   *
+   * @param fullyQualifiedName fullyQualifiedName.
+   */
+  public FullyQualifiedTableName(String fullyQualifiedName) {
+    this.fullyQualifiedName = fullyQualifiedName;
+    String[] parts = fullyQualifiedName.split("\\.");
+    if (parts.length >= 3) {
+      datasourceName = parts[0];
+      schemaName = parts[1];
+      tableName = String.join(".", Arrays.copyOfRange(parts, 2, parts.length));
+    } else if (parts.length == 2) {
+      schemaName = parts[0];
+      tableName = parts[1];
+    } else if (parts.length == 1) {
+      tableName = parts[0];
+    }
+  }
+
+  /**
+   * Convert qualified name to Flint name concat by underscore.
+   *
+   * @return Flint name
+   */
+  public String toFlintName() {
+    StringBuilder builder = new StringBuilder();
+    if (datasourceName != null) {
+      builder.append(strip(datasourceName, STRIP_CHARS)).append("_");
+    }
+    if (schemaName != null) {
+      builder.append(strip(schemaName, STRIP_CHARS)).append("_");
+    }
+    if (tableName != null) {
+      builder.append(strip(tableName, STRIP_CHARS));
+    }
+    return builder.toString();
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexDMLResult.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexDMLResult.java
new file mode 100644
index 0000000000..a276076f4b
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexDMLResult.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher.model;
+
+import com.google.common.collect.ImmutableMap;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.SuperBuilder;
+import org.opensearch.sql.spark.execution.statestore.StateModel;
+
+/** Plugin create Index DML result. */
+@Data
+@SuperBuilder
+@EqualsAndHashCode(callSuper = false)
+public class IndexDMLResult extends StateModel {
+  private final String queryId;
+  private final String status;
+  private final String error;
+  private final String datasourceName;
+  private final Long queryRunTime;
+  private final Long updateTime;
+
+  public static IndexDMLResult copy(IndexDMLResult copy, ImmutableMap<String, Object> metadata) {
+    return builder()
+        .queryId(copy.queryId)
+        .status(copy.status)
+        .error(copy.error)
+        .datasourceName(copy.datasourceName)
+        .queryRunTime(copy.queryRunTime)
+        .updateTime(copy.updateTime)
+        .metadata(metadata)
+        .build();
+  }
+
+  @Override
+  public String getId() {
+    return queryId;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryActionType.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryActionType.java
new file mode 100644
index 0000000000..51e0832217
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryActionType.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher.model;
+
+/** Enum for Index Action in the given query.* */
+public enum IndexQueryActionType {
+  CREATE,
+  REFRESH,
+  DESCRIBE,
+  SHOW,
+  DROP,
+  VACUUM,
+  ALTER,
+  RECOVER
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryDetails.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryDetails.java
new file mode 100644
index 0000000000..50ce95ffe0
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryDetails.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher.model;
+
+import static org.apache.commons.lang3.StringUtils.strip;
+
+import java.util.Set;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+import org.opensearch.sql.spark.flint.FlintIndexType;
+
+/** Index details in an async query. */
+@Getter
+@EqualsAndHashCode
+public class IndexQueryDetails {
+
+  public static final String STRIP_CHARS = "`";
+
+  private static final Set<Character> INVALID_INDEX_NAME_CHARS =
+      Set.of(' ', ',', ':', '"', '+', '/', '\\', '|', '?', '#', '>', '<');
+
+  private String indexName;
+  private FullyQualifiedTableName fullyQualifiedTableName;
+  // by default, auto_refresh = false;
+  private IndexQueryActionType indexQueryActionType;
+  private FlintIndexOptions flintIndexOptions;
+  // materialized view special case where
+  // table name and mv name are combined.
+  private String mvName;
+  private String mvQuery;
+  private FlintIndexType indexType;
+
+  private IndexQueryDetails() {}
+
+  public static IndexQueryDetailsBuilder builder() {
+    return new IndexQueryDetailsBuilder();
+  }
+
+  // Builder class
+  public static class IndexQueryDetailsBuilder {
+    private final IndexQueryDetails indexQueryDetails;
+
+    public IndexQueryDetailsBuilder() {
+      indexQueryDetails = new IndexQueryDetails();
+    }
+
+    public IndexQueryDetailsBuilder indexName(String indexName) {
+      indexQueryDetails.indexName = indexName;
+      return this;
+    }
+
+    public IndexQueryDetailsBuilder fullyQualifiedTableName(FullyQualifiedTableName tableName) {
+      indexQueryDetails.fullyQualifiedTableName = tableName;
+      return this;
+    }
+
+    public IndexQueryDetailsBuilder indexQueryActionType(
+        IndexQueryActionType indexQueryActionType) {
+      indexQueryDetails.indexQueryActionType = indexQueryActionType;
+      return this;
+    }
+
+    public IndexQueryDetailsBuilder indexOptions(FlintIndexOptions flintIndexOptions) {
+      indexQueryDetails.flintIndexOptions = flintIndexOptions;
+      return this;
+    }
+
+    public IndexQueryDetailsBuilder mvName(String mvName) {
+      indexQueryDetails.mvName = mvName;
+      return this;
+    }
+
+    public IndexQueryDetailsBuilder mvQuery(String mvQuery) {
+      indexQueryDetails.mvQuery = mvQuery;
+      return this;
+    }
+
+    public IndexQueryDetailsBuilder indexType(FlintIndexType indexType) {
+      indexQueryDetails.indexType = indexType;
+      return this;
+    }
+
+    public IndexQueryDetails build() {
+      if (indexQueryDetails.flintIndexOptions == null) {
+        indexQueryDetails.flintIndexOptions = new FlintIndexOptions();
+      }
+      return indexQueryDetails;
+    }
+  }
+
+  public String openSearchIndexName() {
+    if (getIndexType() == null) {
+      return null;
+    }
+    FullyQualifiedTableName fullyQualifiedTableName = getFullyQualifiedTableName();
+    String indexName = StringUtils.EMPTY;
+    switch (getIndexType()) {
+      case COVERING:
+        if (getIndexName() != null) { // getIndexName will be null for SHOW INDEX query
+          indexName =
+              "flint_"
+                  + fullyQualifiedTableName.toFlintName()
+                  + "_"
+                  + strip(getIndexName(), STRIP_CHARS)
+                  + "_"
+                  + getIndexType().getSuffix();
+        } else {
+          return null;
+        }
+        break;
+      case SKIPPING:
+        indexName =
+            "flint_" + fullyQualifiedTableName.toFlintName() + "_" + getIndexType().getSuffix();
+        break;
+      case MATERIALIZED_VIEW:
+        if (mvName != null) { // mvName is not available for SHOW MATERIALIZED VIEW query
+          indexName = "flint_" + new FullyQualifiedTableName(mvName).toFlintName();
+        } else {
+          return null;
+        }
+        break;
+    }
+    return percentEncode(indexName).toLowerCase();
+  }
+
+  /*
+   * Percent-encode invalid OpenSearch index name characters.
+   */
+  private String percentEncode(String indexName) {
+    StringBuilder builder = new StringBuilder(indexName.length());
+    for (char ch : indexName.toCharArray()) {
+      if (INVALID_INDEX_NAME_CHARS.contains(ch)) {
+        builder.append(String.format("%%%02X", (int) ch));
+      } else {
+        builder.append(ch);
+      }
+    }
+    return builder.toString();
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/JobType.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/JobType.java
new file mode 100644
index 0000000000..af1f69d74b
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/JobType.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher.model;
+
+public enum JobType {
+  INTERACTIVE("interactive"),
+  STREAMING("streaming"),
+  REFRESH("refresh"),
+  BATCH("batch");
+
+  private String text;
+
+  JobType(String text) {
+    this.text = text;
+  }
+
+  public String getText() {
+    return this.text;
+  }
+
+  /**
+   * Get JobType from text.
+   *
+   * @param text text.
+   * @return JobType {@link JobType}.
+   */
+  public static JobType fromString(String text) {
+    for (JobType JobType : JobType.values()) {
+      if (JobType.text.equalsIgnoreCase(text)) {
+        return JobType;
+      }
+    }
+    throw new IllegalArgumentException("No JobType with text " + text + " found");
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/CreateSessionRequest.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/CreateSessionRequest.java
new file mode 100644
index 0000000000..6398dd224f
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/CreateSessionRequest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import java.util.Map;
+import lombok.Data;
+import org.opensearch.sql.spark.client.StartJobRequest;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilder;
+
+@Data
+public class CreateSessionRequest {
+  private final String clusterName;
+  private final String accountId;
+  private final String applicationId;
+  private final String executionRoleArn;
+  private final SparkSubmitParametersBuilder sparkSubmitParametersBuilder;
+  private final Map<String, String> tags;
+  private final String resultIndex;
+  private final String datasourceName;
+
+  public StartJobRequest getStartJobRequest(String sessionId) {
+    return new InteractiveSessionStartJobRequest(
+        clusterName + ":" + JobType.INTERACTIVE.getText() + ":" + sessionId,
+        accountId,
+        applicationId,
+        executionRoleArn,
+        sparkSubmitParametersBuilder.toString(),
+        tags,
+        resultIndex);
+  }
+
+  static class InteractiveSessionStartJobRequest extends StartJobRequest {
+    public InteractiveSessionStartJobRequest(
+        String jobName,
+        String accountId,
+        String applicationId,
+        String executionRoleArn,
+        String sparkSubmitParams,
+        Map<String, String> tags,
+        String resultIndex) {
+      super(
+          jobName,
+          accountId,
+          applicationId,
+          executionRoleArn,
+          sparkSubmitParams,
+          tags,
+          false,
+          resultIndex);
+    }
+
+    /** Interactive query keep running. */
+    @Override
+    public Long executionTimeout() {
+      return 0L;
+    }
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/DatasourceEmbeddedSessionIdProvider.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/DatasourceEmbeddedSessionIdProvider.java
new file mode 100644
index 0000000000..360563d657
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/DatasourceEmbeddedSessionIdProvider.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import org.opensearch.sql.spark.utils.IDUtils;
+
+public class DatasourceEmbeddedSessionIdProvider implements SessionIdProvider {
+
+  @Override
+  public String getSessionId(CreateSessionRequest createSessionRequest) {
+    return IDUtils.encode(createSessionRequest.getDatasourceName());
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/InteractiveSession.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/InteractiveSession.java
new file mode 100644
index 0000000000..2915e2a3e1
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/InteractiveSession.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import static org.opensearch.sql.spark.execution.session.SessionModel.initInteractiveSession;
+import static org.opensearch.sql.spark.execution.session.SessionState.DEAD;
+import static org.opensearch.sql.spark.execution.session.SessionState.END_STATE;
+import static org.opensearch.sql.spark.execution.session.SessionState.FAIL;
+import static org.opensearch.sql.spark.execution.statement.StatementId.newStatementId;
+
+import java.util.Optional;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClient;
+import org.opensearch.sql.spark.client.StartJobRequest;
+import org.opensearch.sql.spark.execution.statement.QueryRequest;
+import org.opensearch.sql.spark.execution.statement.Statement;
+import org.opensearch.sql.spark.execution.statement.StatementId;
+import org.opensearch.sql.spark.execution.statestore.SessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.StatementStorageService;
+import org.opensearch.sql.spark.utils.TimeProvider;
+
+/**
+ * Interactive session.
+ *
+ * <p>ENTRY_STATE: not_started
+ */
+@Getter
+@Builder
+public class InteractiveSession implements Session {
+  private static final Logger LOG = LogManager.getLogger();
+
+  public static final String SESSION_ID_TAG_KEY = "sid";
+
+  private final String sessionId;
+  private final SessionStorageService sessionStorageService;
+  private final StatementStorageService statementStorageService;
+  private final EMRServerlessClient serverlessClient;
+  private SessionModel sessionModel;
+  // the threshold of elapsed time in milliseconds before we say a session is stale
+  private long sessionInactivityTimeoutMilli;
+  private TimeProvider timeProvider;
+
+  @Override
+  public void open(
+      CreateSessionRequest createSessionRequest,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    // append session id;
+    createSessionRequest
+        .getSparkSubmitParametersBuilder()
+        .sessionExecution(sessionId, createSessionRequest.getDatasourceName());
+    createSessionRequest.getTags().put(SESSION_ID_TAG_KEY, sessionId);
+    StartJobRequest startJobRequest = createSessionRequest.getStartJobRequest(sessionId);
+    String jobID = serverlessClient.startJobRun(startJobRequest);
+    String applicationId = startJobRequest.getApplicationId();
+    String accountId = createSessionRequest.getAccountId();
+
+    sessionModel =
+        initInteractiveSession(
+            accountId, applicationId, jobID, sessionId, createSessionRequest.getDatasourceName());
+    sessionStorageService.createSession(sessionModel, asyncQueryRequestContext);
+  }
+
+  /** todo. StatementSweeper will delete doc. */
+  @Override
+  public void close() {
+    Optional<SessionModel> model =
+        sessionStorageService.getSession(sessionModel.getId(), sessionModel.getDatasourceName());
+    if (model.isEmpty()) {
+      throw new IllegalStateException("session does not exist. " + sessionModel.getSessionId());
+    } else {
+      serverlessClient.cancelJobRun(
+          sessionModel.getApplicationId(), sessionModel.getJobId(), false);
+    }
+  }
+
+  /** Submit statement. If submit successfully, Statement in waiting state. */
+  public StatementId submit(
+      QueryRequest request, AsyncQueryRequestContext asyncQueryRequestContext) {
+    Optional<SessionModel> model =
+        sessionStorageService.getSession(sessionModel.getId(), sessionModel.getDatasourceName());
+    if (model.isEmpty()) {
+      throw new IllegalStateException("session does not exist. " + sessionModel.getSessionId());
+    } else {
+      sessionModel = model.get();
+      if (!END_STATE.contains(sessionModel.getSessionState())) {
+        String qid = request.getQueryId();
+        StatementId statementId = newStatementId(qid);
+        Statement st =
+            Statement.builder()
+                .sessionId(sessionId)
+                .accountId(sessionModel.getAccountId())
+                .applicationId(sessionModel.getApplicationId())
+                .jobId(sessionModel.getJobId())
+                .statementStorageService(statementStorageService)
+                .statementId(statementId)
+                .langType(request.getLangType())
+                .datasourceName(sessionModel.getDatasourceName())
+                .query(request.getQuery())
+                .queryId(qid)
+                .asyncQueryRequestContext(asyncQueryRequestContext)
+                .build();
+        st.open();
+        return statementId;
+      } else {
+        String errMsg =
+            String.format(
+                "can't submit statement, session should not be in end state, "
+                    + "current session state is: %s",
+                sessionModel.getSessionState().getSessionState());
+        LOG.debug(errMsg);
+        throw new IllegalStateException(errMsg);
+      }
+    }
+  }
+
+  @Override
+  public Optional<Statement> get(
+      StatementId stID, AsyncQueryRequestContext asyncQueryRequestContext) {
+    return statementStorageService
+        .getStatement(stID.getId(), sessionModel.getDatasourceName(), asyncQueryRequestContext)
+        .map(
+            model ->
+                Statement.builder()
+                    .sessionId(sessionId)
+                    .accountId(model.getAccountId())
+                    .applicationId(model.getApplicationId())
+                    .jobId(model.getJobId())
+                    .statementId(model.getStatementId())
+                    .langType(model.getLangType())
+                    .query(model.getQuery())
+                    .queryId(model.getQueryId())
+                    .statementStorageService(statementStorageService)
+                    .statementModel(model)
+                    .asyncQueryRequestContext(asyncQueryRequestContext)
+                    .build());
+  }
+
+  @Override
+  public boolean isOperationalForDataSource(String dataSourceName) {
+    boolean isSessionStateValid =
+        sessionModel.getSessionState() != DEAD && sessionModel.getSessionState() != FAIL;
+    boolean isSessionUpdatedRecently =
+        timeProvider.currentEpochMillis() - sessionModel.getLastUpdateTime()
+            <= sessionInactivityTimeoutMilli;
+
+    return isSessionStateValid && isSessionUpdatedRecently;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/Session.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/Session.java
new file mode 100644
index 0000000000..4c083d79c4
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/Session.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import java.util.Optional;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.execution.statement.QueryRequest;
+import org.opensearch.sql.spark.execution.statement.Statement;
+import org.opensearch.sql.spark.execution.statement.StatementId;
+
+/** Session define the statement execution context. Each session is binding to one Spark Job. */
+public interface Session {
+  /** open session. */
+  void open(
+      CreateSessionRequest createSessionRequest, AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /** close session. */
+  void close();
+
+  /**
+   * submit {@link QueryRequest}.
+   *
+   * @param request {@link QueryRequest}
+   * @param asyncQueryRequestContext {@link AsyncQueryRequestContext}
+   * @return {@link StatementId}
+   */
+  StatementId submit(QueryRequest request, AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /**
+   * get {@link Statement}.
+   *
+   * @param stID {@link StatementId}
+   * @return {@link Statement}
+   */
+  Optional<Statement> get(StatementId stID, AsyncQueryRequestContext asyncQueryRequestContext);
+
+  SessionModel getSessionModel();
+
+  String getSessionId();
+
+  /** return true if session is ready to use. */
+  boolean isOperationalForDataSource(String dataSourceName);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionConfigSupplier.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionConfigSupplier.java
new file mode 100644
index 0000000000..4084e0f091
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionConfigSupplier.java
@@ -0,0 +1,11 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+/** Interface to abstract session config */
+public interface SessionConfigSupplier {
+  Long getSessionInactivityTimeoutMillis();
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionIdProvider.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionIdProvider.java
new file mode 100644
index 0000000000..c6636fca0c
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionIdProvider.java
@@ -0,0 +1,11 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+/** Interface for extension point to specify sessionId. Called when new session is created. */
+public interface SessionIdProvider {
+  String getSessionId(CreateSessionRequest createSessionRequest);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionManager.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionManager.java
new file mode 100644
index 0000000000..0c0727294b
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionManager.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.execution.statestore.SessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.StatementStorageService;
+import org.opensearch.sql.spark.utils.RealTimeProvider;
+
+/**
+ * Singleton Class
+ *
+ * <p>todo. add Session cache and Session sweeper.
+ */
+@RequiredArgsConstructor
+public class SessionManager {
+  private final SessionStorageService sessionStorageService;
+  private final StatementStorageService statementStorageService;
+  private final EMRServerlessClientFactory emrServerlessClientFactory;
+  private final SessionConfigSupplier sessionConfigSupplier;
+  private final SessionIdProvider sessionIdProvider;
+
+  public Session createSession(
+      CreateSessionRequest request, AsyncQueryRequestContext asyncQueryRequestContext) {
+    InteractiveSession session =
+        InteractiveSession.builder()
+            .sessionId(sessionIdProvider.getSessionId(request))
+            .sessionStorageService(sessionStorageService)
+            .statementStorageService(statementStorageService)
+            .serverlessClient(emrServerlessClientFactory.getClient(request.getAccountId()))
+            .build();
+    session.open(request, asyncQueryRequestContext);
+    return session;
+  }
+
+  /**
+   * Retrieves the session associated with the given session ID.
+   *
+   * <p>This method is particularly used in scenarios where the data source encoded in the session
+   * ID is deemed untrustworthy. It allows for the safe retrieval of session details based on a
+   * known and validated session ID, rather than relying on potentially outdated data source
+   * information.
+   *
+   * <p>For more context on the use case and implementation, refer to the documentation here:
+   * https://tinyurl.com/bdh6s834
+   *
+   * @param sessionId The unique identifier of the session. It is used to fetch the corresponding
+   *     session details.
+   * @param dataSourceName The name of the data source. This parameter is utilized in the session
+   *     retrieval process.
+   * @return An Optional containing the session associated with the provided session ID. Returns an
+   *     empty Optional if no matching session is found.
+   */
+  public Optional<Session> getSession(String sessionId, String dataSourceName) {
+    Optional<SessionModel> model = sessionStorageService.getSession(sessionId, dataSourceName);
+    if (model.isPresent()) {
+      InteractiveSession session =
+          InteractiveSession.builder()
+              .sessionId(sessionId)
+              .sessionStorageService(sessionStorageService)
+              .statementStorageService(statementStorageService)
+              .serverlessClient(emrServerlessClientFactory.getClient(model.get().getAccountId()))
+              .sessionModel(model.get())
+              .sessionInactivityTimeoutMilli(
+                  sessionConfigSupplier.getSessionInactivityTimeoutMillis())
+              .timeProvider(new RealTimeProvider())
+              .build();
+      return Optional.ofNullable(session);
+    }
+    return Optional.empty();
+  }
+
+  // todo, keep it only for testing, will remove it later.
+  public boolean isEnabled() {
+    return true;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionModel.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionModel.java
new file mode 100644
index 0000000000..d24cd3f3cd
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionModel.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import static org.opensearch.sql.spark.execution.session.SessionState.NOT_STARTED;
+import static org.opensearch.sql.spark.execution.session.SessionType.INTERACTIVE;
+
+import com.google.common.collect.ImmutableMap;
+import lombok.Data;
+import lombok.experimental.SuperBuilder;
+import org.opensearch.sql.spark.execution.statestore.StateModel;
+
+/** Session data in flint.ql.sessions index. */
+@Data
+@SuperBuilder
+public class SessionModel extends StateModel {
+
+  public static final String UNKNOWN = "unknown";
+
+  private final String version;
+  private final SessionType sessionType;
+  private final String sessionId;
+  private final SessionState sessionState;
+  // optional: accountId for EMRS cluster
+  private final String accountId;
+  private final String applicationId;
+  private final String jobId;
+  private final String datasourceName;
+  private final String error;
+  private final long lastUpdateTime;
+
+  public static SessionModel of(SessionModel copy, ImmutableMap<String, Object> metadata) {
+    return builder()
+        .version(copy.version)
+        .sessionType(copy.sessionType)
+        .sessionId(copy.sessionId)
+        .sessionState(copy.sessionState)
+        .datasourceName(copy.datasourceName)
+        .accountId(copy.accountId)
+        .applicationId(copy.getApplicationId())
+        .jobId(copy.jobId)
+        .error(UNKNOWN)
+        .lastUpdateTime(copy.getLastUpdateTime())
+        .metadata(metadata)
+        .build();
+  }
+
+  public static SessionModel copyWithState(
+      SessionModel copy, SessionState state, ImmutableMap<String, Object> metadata) {
+    return builder()
+        .version(copy.version)
+        .sessionType(copy.sessionType)
+        .sessionId(copy.sessionId)
+        .sessionState(state)
+        .datasourceName(copy.datasourceName)
+        .accountId(copy.getAccountId())
+        .applicationId(copy.getApplicationId())
+        .jobId(copy.jobId)
+        .error(UNKNOWN)
+        .lastUpdateTime(copy.getLastUpdateTime())
+        .metadata(metadata)
+        .build();
+  }
+
+  public static SessionModel initInteractiveSession(
+      String accountId,
+      String applicationId,
+      String jobId,
+      String sessionId,
+      String datasourceName) {
+    return builder()
+        .version("1.0")
+        .sessionType(INTERACTIVE)
+        .sessionId(sessionId)
+        .sessionState(NOT_STARTED)
+        .datasourceName(datasourceName)
+        .accountId(accountId)
+        .applicationId(applicationId)
+        .jobId(jobId)
+        .error(UNKNOWN)
+        .lastUpdateTime(System.currentTimeMillis())
+        .build();
+  }
+
+  @Override
+  public String getId() {
+    return sessionId;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionState.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionState.java
new file mode 100644
index 0000000000..bd5d14c603
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionState.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import com.google.common.collect.ImmutableList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.Getter;
+
+@Getter
+public enum SessionState {
+  NOT_STARTED("not_started"),
+  RUNNING("running"),
+  DEAD("dead"),
+  FAIL("fail");
+
+  public static List<SessionState> END_STATE = ImmutableList.of(DEAD, FAIL);
+
+  private final String sessionState;
+
+  SessionState(String sessionState) {
+    this.sessionState = sessionState;
+  }
+
+  private static Map<String, SessionState> STATES =
+      Arrays.stream(SessionState.values())
+          .collect(Collectors.toMap(t -> t.name().toLowerCase(), t -> t));
+
+  public static SessionState fromString(String key) {
+    for (SessionState ss : SessionState.values()) {
+      if (ss.getSessionState().toLowerCase(Locale.ROOT).equals(key)) {
+        return ss;
+      }
+    }
+    throw new IllegalArgumentException("Invalid session state: " + key);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionType.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionType.java
new file mode 100644
index 0000000000..10b9ce7bd5
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/SessionType.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import java.util.Locale;
+import lombok.Getter;
+
+@Getter
+public enum SessionType {
+  INTERACTIVE("interactive");
+
+  private final String sessionType;
+
+  SessionType(String sessionType) {
+    this.sessionType = sessionType;
+  }
+
+  public static SessionType fromString(String key) {
+    for (SessionType sType : SessionType.values()) {
+      if (sType.getSessionType().toLowerCase(Locale.ROOT).equals(key)) {
+        return sType;
+      }
+    }
+    throw new IllegalArgumentException("Invalid session type: " + key);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/QueryRequest.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/QueryRequest.java
new file mode 100644
index 0000000000..db2e96b3cd
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/QueryRequest.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statement;
+
+import lombok.Data;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+@Data
+public class QueryRequest {
+  private final String queryId;
+  private final LangType langType;
+  private final String query;
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/Statement.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/Statement.java
new file mode 100644
index 0000000000..272f0edf4a
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/Statement.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statement;
+
+import static org.opensearch.sql.spark.execution.statement.StatementModel.submitStatement;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.execution.statestore.StatementStorageService;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+/** Statement represent query to execute in session. One statement map to one session. */
+@Getter
+@Builder
+public class Statement {
+  private static final Logger LOG = LogManager.getLogger();
+
+  private final String sessionId;
+  // optional
+  private final String accountId;
+  private final String applicationId;
+  private final String jobId;
+  private final StatementId statementId;
+  private final LangType langType;
+  private final String datasourceName;
+  private final String query;
+  private final String queryId;
+  private final AsyncQueryRequestContext asyncQueryRequestContext;
+  private final StatementStorageService statementStorageService;
+
+  @Setter private StatementModel statementModel;
+
+  /** Open a statement. */
+  public void open() {
+    statementModel =
+        submitStatement(
+            sessionId,
+            accountId,
+            applicationId,
+            jobId,
+            statementId,
+            langType,
+            datasourceName,
+            query,
+            queryId);
+    statementModel =
+        statementStorageService.createStatement(statementModel, asyncQueryRequestContext);
+  }
+
+  /** Cancel a statement. */
+  public void cancel() {
+    StatementState statementState = statementModel.getStatementState();
+
+    if (statementState.equals(StatementState.SUCCESS)
+        || statementState.equals(StatementState.FAILED)
+        || statementState.equals(StatementState.TIMEOUT)
+        || statementState.equals(StatementState.CANCELLED)) {
+      String errorMsg =
+          String.format(
+              "can't cancel statement in %s state. statement: %s.",
+              statementState.getState(), statementId);
+      LOG.error(errorMsg);
+      throw new IllegalStateException(errorMsg);
+    }
+    this.statementModel =
+        statementStorageService.updateStatementState(
+            statementModel, StatementState.CANCELLED, asyncQueryRequestContext);
+  }
+
+  public StatementState getStatementState() {
+    return statementModel.getStatementState();
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/StatementId.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/StatementId.java
new file mode 100644
index 0000000000..33284c4b3d
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/StatementId.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statement;
+
+import lombok.Data;
+
+@Data
+public class StatementId {
+  private final String id;
+
+  // construct statementId from queryId.
+  public static StatementId newStatementId(String qid) {
+    return new StatementId(qid);
+  }
+
+  @Override
+  public String toString() {
+    return "statementId=" + id;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/StatementModel.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/StatementModel.java
new file mode 100644
index 0000000000..dc34af1d92
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/StatementModel.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statement;
+
+import static org.opensearch.sql.spark.execution.statement.StatementState.WAITING;
+
+import com.google.common.collect.ImmutableMap;
+import lombok.Data;
+import lombok.experimental.SuperBuilder;
+import org.opensearch.sql.spark.execution.statestore.StateModel;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+/** Statement data in flint.ql.sessions index. */
+@Data
+@SuperBuilder
+public class StatementModel extends StateModel {
+  public static final String UNKNOWN = "";
+
+  private final String version;
+  private final StatementState statementState;
+  private final StatementId statementId;
+  private final String sessionId;
+  // optional: accountId for EMRS cluster
+  private final String accountId;
+  private final String applicationId;
+  private final String jobId;
+  private final LangType langType;
+  private final String datasourceName;
+  private final String query;
+  private final String queryId;
+  private final long submitTime;
+  private final String error;
+
+  public static StatementModel copy(StatementModel copy, ImmutableMap<String, Object> metadata) {
+    return builder()
+        .version("1.0")
+        .statementState(copy.statementState)
+        .statementId(copy.statementId)
+        .sessionId(copy.sessionId)
+        .accountId(copy.accountId)
+        .applicationId(copy.applicationId)
+        .jobId(copy.jobId)
+        .langType(copy.langType)
+        .datasourceName(copy.datasourceName)
+        .query(copy.query)
+        .queryId(copy.queryId)
+        .submitTime(copy.submitTime)
+        .error(copy.error)
+        .metadata(metadata)
+        .build();
+  }
+
+  public static StatementModel copyWithState(
+      StatementModel copy, StatementState state, ImmutableMap<String, Object> metadata) {
+    return builder()
+        .version("1.0")
+        .statementState(state)
+        .statementId(copy.statementId)
+        .sessionId(copy.sessionId)
+        .accountId(copy.accountId)
+        .applicationId(copy.applicationId)
+        .jobId(copy.jobId)
+        .langType(copy.langType)
+        .datasourceName(copy.datasourceName)
+        .query(copy.query)
+        .queryId(copy.queryId)
+        .submitTime(copy.submitTime)
+        .error(copy.error)
+        .metadata(metadata)
+        .build();
+  }
+
+  public static StatementModel submitStatement(
+      String sessionId,
+      String accountId,
+      String applicationId,
+      String jobId,
+      StatementId statementId,
+      LangType langType,
+      String datasourceName,
+      String query,
+      String queryId) {
+    return builder()
+        .version("1.0")
+        .statementState(WAITING)
+        .statementId(statementId)
+        .sessionId(sessionId)
+        .accountId(accountId)
+        .applicationId(applicationId)
+        .jobId(jobId)
+        .langType(langType)
+        .datasourceName(datasourceName)
+        .query(query)
+        .queryId(queryId)
+        .submitTime(System.currentTimeMillis())
+        .error(UNKNOWN)
+        .build();
+  }
+
+  @Override
+  public String getId() {
+    return statementId.getId();
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/StatementState.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/StatementState.java
new file mode 100644
index 0000000000..d9103e5c03
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/StatementState.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statement;
+
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.Getter;
+
+/** {@link Statement} State. */
+@Getter
+public enum StatementState {
+  WAITING("waiting"),
+  RUNNING("running"),
+  SUCCESS("success"),
+  FAILED("failed"),
+  TIMEOUT("timeout"),
+  CANCELLED("cancelled");
+
+  private final String state;
+
+  StatementState(String state) {
+    this.state = state;
+  }
+
+  private static Map<String, StatementState> STATES =
+      Arrays.stream(StatementState.values())
+          .collect(Collectors.toMap(t -> t.name().toLowerCase(), t -> t));
+
+  public static StatementState fromString(String key) {
+    for (StatementState ss : StatementState.values()) {
+      if (ss.getState().toLowerCase(Locale.ROOT).equals(key)) {
+        return ss;
+      }
+    }
+    throw new IllegalArgumentException("Invalid statement state: " + key);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/CopyBuilder.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/CopyBuilder.java
new file mode 100644
index 0000000000..e9de7064d5
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/CopyBuilder.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statestore;
+
+import com.google.common.collect.ImmutableMap;
+
+/** Interface for copying StateModel object. Refer {@link StateStore} */
+public interface CopyBuilder<T> {
+  T of(T copy, ImmutableMap<String, Object> metadata);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/OpenSearchStateStoreUtil.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/OpenSearchStateStoreUtil.java
new file mode 100644
index 0000000000..da9d166fcf
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/OpenSearchStateStoreUtil.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statestore;
+
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_REQUEST_BUFFER_INDEX_NAME;
+
+import java.util.Locale;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class OpenSearchStateStoreUtil {
+
+  public static String getIndexName(String datasourceName) {
+    return String.format(
+        "%s_%s", SPARK_REQUEST_BUFFER_INDEX_NAME, datasourceName.toLowerCase(Locale.ROOT));
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/SessionStorageService.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/SessionStorageService.java
new file mode 100644
index 0000000000..476e65714b
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/SessionStorageService.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statestore;
+
+import java.util.Optional;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.execution.session.SessionModel;
+import org.opensearch.sql.spark.execution.session.SessionState;
+
+/** Interface for accessing {@link SessionModel} data storage. */
+public interface SessionStorageService {
+
+  SessionModel createSession(
+      SessionModel sessionModel, AsyncQueryRequestContext asyncQueryRequestContext);
+
+  Optional<SessionModel> getSession(String id, String datasourceName);
+
+  SessionModel updateSessionState(SessionModel sessionModel, SessionState sessionState);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/StateCopyBuilder.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/StateCopyBuilder.java
new file mode 100644
index 0000000000..1f38e5a1c5
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/StateCopyBuilder.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statestore;
+
+import com.google.common.collect.ImmutableMap;
+
+public interface StateCopyBuilder<T extends StateModel, S> {
+  T of(T copy, S state, ImmutableMap<String, Object> metadata);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/StateModel.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/StateModel.java
new file mode 100644
index 0000000000..9d29299818
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/StateModel.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statestore;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Optional;
+import lombok.Builder.Default;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
+
+@SuperBuilder
+public abstract class StateModel {
+  @Getter @EqualsAndHashCode.Exclude @Default
+  private final ImmutableMap<String, Object> metadata = ImmutableMap.of();
+
+  public abstract String getId();
+
+  public <T> Optional<T> getMetadataItem(String name, Class<T> type) {
+    if (metadata.containsKey(name)) {
+      Object value = metadata.get(name);
+      if (type.isInstance(value)) {
+        return Optional.of(type.cast(value));
+      } else {
+        throw new RuntimeException(
+            String.format(
+                "The metadata field %s is an instance of %s instead of %s",
+                name, value.getClass(), type));
+      }
+    } else {
+      return Optional.empty();
+    }
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/StatementStorageService.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/StatementStorageService.java
new file mode 100644
index 0000000000..b9446809fb
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/StatementStorageService.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statestore;
+
+import java.util.Optional;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.execution.statement.StatementModel;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+
+/**
+ * Interface for accessing {@link StatementModel} data storage. {@link StatementModel} is an
+ * abstraction over the query request within a Session.
+ */
+public interface StatementStorageService {
+
+  StatementModel createStatement(
+      StatementModel statementModel, AsyncQueryRequestContext asyncQueryRequestContext);
+
+  StatementModel updateStatementState(
+      StatementModel oldStatementModel,
+      StatementState statementState,
+      AsyncQueryRequestContext asyncQueryRequestContext);
+
+  Optional<StatementModel> getStatement(
+      String id, String datasourceName, AsyncQueryRequestContext asyncQueryRequestContext);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializerUtil.java b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializerUtil.java
new file mode 100644
index 0000000000..2f8558d723
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializerUtil.java
@@ -0,0 +1,14 @@
+package org.opensearch.sql.spark.execution.xcontent;
+
+import com.google.common.collect.ImmutableMap;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class XContentSerializerUtil {
+  public static final String SEQ_NO = "seqNo";
+  public static final String PRIMARY_TERM = "primaryTerm";
+
+  public static ImmutableMap<String, Object> buildMetadata(long seqNo, long primaryTerm) {
+    return ImmutableMap.of(SEQ_NO, seqNo, PRIMARY_TERM, primaryTerm);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexClient.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexClient.java
new file mode 100644
index 0000000000..af1a23d8d1
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexClient.java
@@ -0,0 +1,11 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+/** Interface to abstract access to the FlintIndex */
+public interface FlintIndexClient {
+  void deleteIndex(String indexName);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadata.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadata.java
new file mode 100644
index 0000000000..0b00e8390b
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadata.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import java.util.Optional;
+import lombok.Builder;
+import lombok.Data;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+
+@Data
+@Builder
+public class FlintIndexMetadata {
+
+  public static final String META_KEY = "_meta";
+  public static final String LATEST_ID_KEY = "latestId";
+  public static final String KIND_KEY = "kind";
+  public static final String INDEXED_COLUMNS_KEY = "indexedColumns";
+  public static final String NAME_KEY = "name";
+  public static final String OPTIONS_KEY = "options";
+  public static final String SOURCE_KEY = "source";
+  public static final String VERSION_KEY = "version";
+  public static final String PROPERTIES_KEY = "properties";
+  public static final String ENV_KEY = "env";
+  public static final String SERVERLESS_EMR_JOB_ID = "SERVERLESS_EMR_JOB_ID";
+  public static final String APP_ID = "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID";
+
+  private final String opensearchIndexName;
+  private final String jobId;
+  private final String appId;
+  private final String latestId;
+  private final String kind;
+  private final String source;
+  private final String name;
+  private final FlintIndexOptions flintIndexOptions;
+
+  public Optional<String> getLatestId() {
+    return Optional.ofNullable(latestId);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataService.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataService.java
new file mode 100644
index 0000000000..ece14c2a7b
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataService.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import java.util.Map;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+
+/** Interface for FlintIndexMetadataReader */
+public interface FlintIndexMetadataService {
+
+  /**
+   * Retrieves a map of {@link FlintIndexMetadata} instances matching the specified index pattern.
+   *
+   * @param indexPattern indexPattern.
+   * @param asyncQueryRequestContext request context passed to AsyncQueryExecutorService
+   * @return A map of {@link FlintIndexMetadata} instances against indexName, each providing
+   *     metadata access for a matched index. Returns an empty list if no indices match the pattern.
+   */
+  Map<String, FlintIndexMetadata> getFlintIndexMetadata(
+      String indexPattern, AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /**
+   * Performs validation and updates flint index to manual refresh.
+   *
+   * @param indexName indexName.
+   * @param flintIndexOptions flintIndexOptions.
+   * @param asyncQueryRequestContext request context passed to AsyncQueryExecutorService
+   */
+  void updateIndexToManualRefresh(
+      String indexName,
+      FlintIndexOptions flintIndexOptions,
+      AsyncQueryRequestContext asyncQueryRequestContext);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataValidator.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataValidator.java
new file mode 100644
index 0000000000..68ba34c476
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataValidator.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import static org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions.AUTO_REFRESH;
+import static org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions.CHECKPOINT_LOCATION;
+import static org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions.INCREMENTAL_REFRESH;
+import static org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions.WATERMARK_DELAY;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class FlintIndexMetadataValidator {
+  private static final Logger LOGGER = LogManager.getLogger(FlintIndexMetadataValidator.class);
+
+  public static final Set<String> ALTER_TO_FULL_REFRESH_ALLOWED_OPTIONS =
+      new LinkedHashSet<>(Arrays.asList(AUTO_REFRESH, INCREMENTAL_REFRESH));
+  public static final Set<String> ALTER_TO_INCREMENTAL_REFRESH_ALLOWED_OPTIONS =
+      new LinkedHashSet<>(
+          Arrays.asList(AUTO_REFRESH, INCREMENTAL_REFRESH, WATERMARK_DELAY, CHECKPOINT_LOCATION));
+
+  /**
+   * Validate if the flint index options contain valid key/value pairs. Throws
+   * IllegalArgumentException with description about invalid options.
+   */
+  public static void validateFlintIndexOptions(
+      String kind, Map<String, Object> existingOptions, Map<String, String> newOptions) {
+    if ((newOptions.containsKey(INCREMENTAL_REFRESH)
+            && Boolean.parseBoolean(newOptions.get(INCREMENTAL_REFRESH)))
+        || ((!newOptions.containsKey(INCREMENTAL_REFRESH)
+            && Boolean.parseBoolean((String) existingOptions.get(INCREMENTAL_REFRESH))))) {
+      validateConversionToIncrementalRefresh(kind, existingOptions, newOptions);
+    } else {
+      validateConversionToFullRefresh(newOptions);
+    }
+  }
+
+  private static void validateConversionToFullRefresh(Map<String, String> newOptions) {
+    if (!ALTER_TO_FULL_REFRESH_ALLOWED_OPTIONS.containsAll(newOptions.keySet())) {
+      throw new IllegalArgumentException(
+          String.format(
+              "Altering to full refresh only allows: %s options",
+              ALTER_TO_FULL_REFRESH_ALLOWED_OPTIONS));
+    }
+  }
+
+  private static void validateConversionToIncrementalRefresh(
+      String kind, Map<String, Object> existingOptions, Map<String, String> newOptions) {
+    if (!ALTER_TO_INCREMENTAL_REFRESH_ALLOWED_OPTIONS.containsAll(newOptions.keySet())) {
+      throw new IllegalArgumentException(
+          String.format(
+              "Altering to incremental refresh only allows: %s options",
+              ALTER_TO_INCREMENTAL_REFRESH_ALLOWED_OPTIONS));
+    }
+    HashMap<String, Object> mergedOptions = new HashMap<>();
+    mergedOptions.putAll(existingOptions);
+    mergedOptions.putAll(newOptions);
+    List<String> missingAttributes = new ArrayList<>();
+    if (!mergedOptions.containsKey(CHECKPOINT_LOCATION)
+        || StringUtils.isEmpty((String) mergedOptions.get(CHECKPOINT_LOCATION))) {
+      missingAttributes.add(CHECKPOINT_LOCATION);
+    }
+    if (kind.equals("mv")
+        && (!mergedOptions.containsKey(WATERMARK_DELAY)
+            || StringUtils.isEmpty((String) mergedOptions.get(WATERMARK_DELAY)))) {
+      missingAttributes.add(WATERMARK_DELAY);
+    }
+    if (missingAttributes.size() > 0) {
+      String errorMessage =
+          "Conversion to incremental refresh index cannot proceed due to missing attributes: "
+              + String.join(", ", missingAttributes)
+              + ".";
+      LOGGER.error(errorMessage);
+      throw new IllegalArgumentException(errorMessage);
+    }
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexState.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexState.java
new file mode 100644
index 0000000000..3d6532b8ea
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexState.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.Getter;
+
+/** Flint index state. */
+@Getter
+public enum FlintIndexState {
+  // stable state
+  EMPTY("empty"),
+  // transitioning state
+  CREATING("creating"),
+  // stable state
+  ACTIVE("active"),
+  // transitioning state
+  REFRESHING("refreshing"),
+  // transitioning state
+  CANCELLING("cancelling"),
+  // transitioning state
+  DELETING("deleting"),
+  // stable state
+  DELETED("deleted"),
+  // transitioning state
+  RECOVERING("recovering"),
+  // transitioning state
+  VACUUMING("vacuuming"),
+  // transitioning state
+  UPDATING("updating"),
+  // stable state
+  FAILED("failed"),
+  // unknown state, if some state update in Spark side, not reflect in here.
+  UNKNOWN("unknown"),
+  // special state that instructs StateStore to purge the index state doc
+  NONE("none");
+
+  private final String state;
+
+  FlintIndexState(String state) {
+    this.state = state;
+  }
+
+  private static Map<String, FlintIndexState> STATES =
+      Arrays.stream(FlintIndexState.values())
+          .collect(Collectors.toMap(t -> t.name().toLowerCase(), t -> t));
+
+  public static FlintIndexState fromString(String key) {
+    for (FlintIndexState ss : FlintIndexState.values()) {
+      if (ss.getState().toLowerCase(Locale.ROOT).equals(key)) {
+        return ss;
+      }
+    }
+    return UNKNOWN;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexStateModel.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexStateModel.java
new file mode 100644
index 0000000000..3dec869b91
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexStateModel.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import com.google.common.collect.ImmutableMap;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
+import org.opensearch.sql.spark.execution.statestore.StateModel;
+
+/** Flint Index Model maintain the index state. */
+@Getter
+@SuperBuilder
+@EqualsAndHashCode(callSuper = false)
+public class FlintIndexStateModel extends StateModel {
+  private final FlintIndexState indexState;
+  private final String accountId;
+  private final String applicationId;
+  private final String jobId;
+  private final String latestId;
+  private final String datasourceName;
+  private final long lastUpdateTime;
+  private final String error;
+
+  public static FlintIndexStateModel copy(
+      FlintIndexStateModel copy, ImmutableMap<String, Object> metadata) {
+    return builder()
+        .indexState(copy.indexState)
+        .accountId(copy.accountId)
+        .applicationId(copy.applicationId)
+        .jobId(copy.jobId)
+        .latestId(copy.latestId)
+        .datasourceName(copy.datasourceName)
+        .lastUpdateTime(copy.lastUpdateTime)
+        .error(copy.error)
+        .metadata(metadata)
+        .build();
+  }
+
+  public static FlintIndexStateModel copyWithState(
+      FlintIndexStateModel copy, FlintIndexState state, ImmutableMap<String, Object> metadata) {
+    return builder()
+        .indexState(state)
+        .accountId(copy.accountId)
+        .applicationId(copy.applicationId)
+        .jobId(copy.jobId)
+        .latestId(copy.latestId)
+        .datasourceName(copy.datasourceName)
+        .lastUpdateTime(copy.lastUpdateTime)
+        .error(copy.error)
+        .metadata(metadata)
+        .build();
+  }
+
+  @Override
+  public String getId() {
+    return latestId;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexStateModelService.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexStateModelService.java
new file mode 100644
index 0000000000..3872f2d5a0
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexStateModelService.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import java.util.Optional;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+
+/**
+ * Abstraction over flint index state storage. Flint index state will maintain the status of each
+ * flint index.
+ */
+public interface FlintIndexStateModelService {
+
+  /**
+   * Create Flint index state record
+   *
+   * @param flintIndexStateModel the model to be saved
+   * @param asyncQueryRequestContext the request context passed to AsyncQueryExecutorService
+   * @return saved model
+   */
+  FlintIndexStateModel createFlintIndexStateModel(
+      FlintIndexStateModel flintIndexStateModel, AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /**
+   * Get Flint index state record
+   *
+   * @param id ID(latestId) of the Flint index state record
+   * @param datasourceName datasource name
+   * @param asyncQueryRequestContext the request context passed to AsyncQueryExecutorService
+   * @return retrieved model
+   */
+  Optional<FlintIndexStateModel> getFlintIndexStateModel(
+      String id, String datasourceName, AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /**
+   * Update Flint index state record
+   *
+   * @param flintIndexStateModel the model to be updated
+   * @param flintIndexState new state
+   * @param datasourceName Datasource name
+   * @param asyncQueryRequestContext the request context passed to AsyncQueryExecutorService
+   * @return Updated model
+   */
+  FlintIndexStateModel updateFlintIndexState(
+      FlintIndexStateModel flintIndexStateModel,
+      FlintIndexState flintIndexState,
+      String datasourceName,
+      AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /**
+   * Delete Flint index state record
+   *
+   * @param id ID(latestId) of the Flint index state record
+   * @param datasourceName datasource name
+   * @param asyncQueryRequestContext the request context passed to AsyncQueryExecutorService
+   * @return true if deleted, otherwise false
+   */
+  boolean deleteFlintIndexStateModel(
+      String id, String datasourceName, AsyncQueryRequestContext asyncQueryRequestContext);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexType.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexType.java
new file mode 100644
index 0000000000..8922f638e0
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/FlintIndexType.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+/** Enum for FlintIndex Type. */
+public enum FlintIndexType {
+  SKIPPING("skipping_index"),
+  COVERING("index"),
+  MATERIALIZED_VIEW("materialized_view");
+
+  private final String suffix;
+
+  FlintIndexType(String suffix) {
+    this.suffix = suffix;
+  }
+
+  public String getSuffix() {
+    return this.suffix;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/IndexDMLResultStorageService.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/IndexDMLResultStorageService.java
new file mode 100644
index 0000000000..9053e5dbc8
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/IndexDMLResultStorageService.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.IndexDMLResult;
+
+/**
+ * Abstraction over the IndexDMLResult storage. It stores the result of IndexDML query execution.
+ */
+public interface IndexDMLResultStorageService {
+  IndexDMLResult createIndexDMLResult(
+      IndexDMLResult result, AsyncQueryRequestContext asyncQueryRequestContext);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOp.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOp.java
new file mode 100644
index 0000000000..78d217b8dc
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOp.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint.operation;
+
+import static org.opensearch.sql.spark.client.EmrServerlessClientImpl.GENERIC_INTERNAL_SERVER_ERROR_MESSAGE;
+
+import com.amazonaws.services.emrserverless.model.ValidationException;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClient;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.flint.FlintIndexMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexStateModel;
+import org.opensearch.sql.spark.flint.FlintIndexStateModelService;
+
+/** Flint Index Operation. */
+@RequiredArgsConstructor
+public abstract class FlintIndexOp {
+  private static final Logger LOG = LogManager.getLogger();
+
+  private final FlintIndexStateModelService flintIndexStateModelService;
+  private final String datasourceName;
+  private final EMRServerlessClientFactory emrServerlessClientFactory;
+
+  /** Apply operation on {@link FlintIndexMetadata} */
+  public void apply(
+      FlintIndexMetadata metadata, AsyncQueryRequestContext asyncQueryRequestContext) {
+    // todo, remove this logic after IndexState feature is enabled in Flint.
+    Optional<String> latestId = metadata.getLatestId();
+    if (latestId.isEmpty()) {
+      takeActionWithoutOCC(metadata, asyncQueryRequestContext);
+    } else {
+      FlintIndexStateModel initialFlintIndexStateModel =
+          getFlintIndexStateModel(latestId.get(), asyncQueryRequestContext);
+      // 1.validate state.
+      validFlintIndexInitialState(initialFlintIndexStateModel);
+
+      // 2.begin, move to transitioning state
+      FlintIndexStateModel transitionedFlintIndexStateModel =
+          moveToTransitioningState(initialFlintIndexStateModel, asyncQueryRequestContext);
+      // 3.runOp
+      try {
+        runOp(metadata, transitionedFlintIndexStateModel, asyncQueryRequestContext);
+        commit(transitionedFlintIndexStateModel, asyncQueryRequestContext);
+      } catch (Throwable e) {
+        LOG.error("Rolling back transient log due to transaction operation failure", e);
+        try {
+          flintIndexStateModelService.updateFlintIndexState(
+              transitionedFlintIndexStateModel,
+              initialFlintIndexStateModel.getIndexState(),
+              datasourceName,
+              asyncQueryRequestContext);
+        } catch (Exception ex) {
+          LOG.error("Failed to rollback transient log", ex);
+        }
+        throw e;
+      }
+    }
+  }
+
+  @NotNull
+  private FlintIndexStateModel getFlintIndexStateModel(
+      String latestId, AsyncQueryRequestContext asyncQueryRequestContext) {
+    Optional<FlintIndexStateModel> flintIndexOptional =
+        flintIndexStateModelService.getFlintIndexStateModel(
+            latestId, datasourceName, asyncQueryRequestContext);
+    if (flintIndexOptional.isEmpty()) {
+      String errorMsg = String.format(Locale.ROOT, "no state found. docId: %s", latestId);
+      LOG.error(errorMsg);
+      throw new IllegalStateException(errorMsg);
+    }
+    return flintIndexOptional.get();
+  }
+
+  private void takeActionWithoutOCC(
+      FlintIndexMetadata metadata, AsyncQueryRequestContext asyncQueryRequestContext) {
+    // take action without occ.
+    FlintIndexStateModel fakeModel =
+        FlintIndexStateModel.builder()
+            .indexState(FlintIndexState.REFRESHING)
+            .applicationId(metadata.getAppId())
+            .jobId(metadata.getJobId())
+            .latestId("")
+            .datasourceName(datasourceName)
+            .lastUpdateTime(System.currentTimeMillis())
+            .error("")
+            .build();
+    runOp(metadata, fakeModel, asyncQueryRequestContext);
+  }
+
+  private void validFlintIndexInitialState(FlintIndexStateModel flintIndex) {
+    LOG.debug("Validating the state before the transaction.");
+    FlintIndexState currentState = flintIndex.getIndexState();
+    if (!validate(currentState)) {
+      String errorMsg =
+          String.format(Locale.ROOT, "validate failed. unexpected state: [%s]", currentState);
+      LOG.error(errorMsg);
+      throw new IllegalStateException("Transaction failed as flint index is not in a valid state.");
+    }
+  }
+
+  private FlintIndexStateModel moveToTransitioningState(
+      FlintIndexStateModel flintIndex, AsyncQueryRequestContext asyncQueryRequestContext) {
+    LOG.debug("Moving to transitioning state before committing.");
+    FlintIndexState transitioningState = transitioningState();
+    try {
+      flintIndex =
+          flintIndexStateModelService.updateFlintIndexState(
+              flintIndex, transitioningState(), datasourceName, asyncQueryRequestContext);
+    } catch (Exception e) {
+      String errorMsg =
+          String.format(Locale.ROOT, "Moving to transition state:%s failed.", transitioningState);
+      LOG.error(errorMsg, e);
+      throw new IllegalStateException(errorMsg, e);
+    }
+    return flintIndex;
+  }
+
+  private void commit(
+      FlintIndexStateModel flintIndex, AsyncQueryRequestContext asyncQueryRequestContext) {
+    LOG.debug("Committing the transaction and moving to stable state.");
+    FlintIndexState stableState = stableState();
+    try {
+      if (stableState == FlintIndexState.NONE) {
+        LOG.info("Deleting index state with docId: " + flintIndex.getLatestId());
+        flintIndexStateModelService.deleteFlintIndexStateModel(
+            flintIndex.getLatestId(), datasourceName, asyncQueryRequestContext);
+      } else {
+        flintIndexStateModelService.updateFlintIndexState(
+            flintIndex, stableState, datasourceName, asyncQueryRequestContext);
+      }
+    } catch (Exception e) {
+      String errorMsg =
+          String.format(Locale.ROOT, "commit failed. target stable state: [%s]", stableState);
+      LOG.error(errorMsg, e);
+      throw new IllegalStateException(errorMsg, e);
+    }
+  }
+
+  /***
+   * Common operation between AlterOff and Drop. So moved to FlintIndexOp.
+   */
+  public void cancelStreamingJob(FlintIndexStateModel flintIndexStateModel)
+      throws InterruptedException, TimeoutException {
+    String applicationId = flintIndexStateModel.getApplicationId();
+    String jobId = flintIndexStateModel.getJobId();
+    EMRServerlessClient emrServerlessClient =
+        emrServerlessClientFactory.getClient(flintIndexStateModel.getAccountId());
+    try {
+      emrServerlessClient.cancelJobRun(
+          flintIndexStateModel.getApplicationId(), flintIndexStateModel.getJobId(), true);
+    } catch (ValidationException e) {
+      // Exception when the job is not in cancellable state and already in terminal state.
+      if (e.getMessage().contains("Job run is not in a cancellable state")) {
+        LOG.error(e);
+        return;
+      } else {
+        throw new RuntimeException(GENERIC_INTERNAL_SERVER_ERROR_MESSAGE);
+      }
+    } catch (Exception e) {
+      LOG.error(e);
+      throw new RuntimeException(GENERIC_INTERNAL_SERVER_ERROR_MESSAGE);
+    }
+
+    // pull job state until timeout or cancelled.
+    String jobRunState = "";
+    int count = 3;
+    while (count-- != 0) {
+      jobRunState =
+          emrServerlessClient.getJobRunResult(applicationId, jobId).getJobRun().getState();
+      if (jobRunState.equalsIgnoreCase("Cancelled")) {
+        break;
+      }
+      TimeUnit.SECONDS.sleep(1);
+    }
+    if (!jobRunState.equalsIgnoreCase("Cancelled")) {
+      String errMsg =
+          "Cancel job timeout for Application ID: " + applicationId + ", Job ID: " + jobId;
+      LOG.error(errMsg);
+      throw new TimeoutException("Cancel job operation timed out.");
+    }
+  }
+
+  /**
+   * Validate expected state.
+   *
+   * <p>return true if validate.
+   */
+  abstract boolean validate(FlintIndexState state);
+
+  /** get transitioningState */
+  abstract FlintIndexState transitioningState();
+
+  abstract void runOp(
+      FlintIndexMetadata flintIndexMetadata,
+      FlintIndexStateModel flintIndex,
+      AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /** get stableState */
+  abstract FlintIndexState stableState();
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpAlter.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpAlter.java
new file mode 100644
index 0000000000..596d76c24b
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpAlter.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint.operation;
+
+import lombok.SneakyThrows;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+import org.opensearch.sql.spark.flint.FlintIndexMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexStateModel;
+import org.opensearch.sql.spark.flint.FlintIndexStateModelService;
+import org.opensearch.sql.spark.scheduler.AsyncQueryScheduler;
+
+/**
+ * Index Operation for Altering the flint index. Only handles alter operation when
+ * auto_refresh=false.
+ */
+public class FlintIndexOpAlter extends FlintIndexOp {
+  private static final Logger LOG = LogManager.getLogger(FlintIndexOpAlter.class);
+  private final FlintIndexMetadataService flintIndexMetadataService;
+  private final FlintIndexOptions flintIndexOptions;
+  private final AsyncQueryScheduler asyncQueryScheduler;
+
+  public FlintIndexOpAlter(
+      FlintIndexOptions flintIndexOptions,
+      FlintIndexStateModelService flintIndexStateModelService,
+      String datasourceName,
+      EMRServerlessClientFactory emrServerlessClientFactory,
+      FlintIndexMetadataService flintIndexMetadataService,
+      AsyncQueryScheduler asyncQueryScheduler) {
+    super(flintIndexStateModelService, datasourceName, emrServerlessClientFactory);
+    this.flintIndexMetadataService = flintIndexMetadataService;
+    this.flintIndexOptions = flintIndexOptions;
+    this.asyncQueryScheduler = asyncQueryScheduler;
+  }
+
+  @Override
+  protected boolean validate(FlintIndexState state) {
+    return state == FlintIndexState.ACTIVE || state == FlintIndexState.REFRESHING;
+  }
+
+  @Override
+  FlintIndexState transitioningState() {
+    return FlintIndexState.UPDATING;
+  }
+
+  @SneakyThrows
+  @Override
+  void runOp(
+      FlintIndexMetadata flintIndexMetadata,
+      FlintIndexStateModel flintIndexStateModel,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    LOG.debug(
+        "Running alter index operation for index: {}", flintIndexMetadata.getOpensearchIndexName());
+    this.flintIndexMetadataService.updateIndexToManualRefresh(
+        flintIndexMetadata.getOpensearchIndexName(), flintIndexOptions, asyncQueryRequestContext);
+    if (flintIndexMetadata.getFlintIndexOptions().isExternalScheduler()) {
+      asyncQueryScheduler.unscheduleJob(
+          flintIndexMetadata.getOpensearchIndexName(), asyncQueryRequestContext);
+    } else {
+      cancelStreamingJob(flintIndexStateModel);
+    }
+  }
+
+  @Override
+  FlintIndexState stableState() {
+    return FlintIndexState.ACTIVE;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpCancel.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpCancel.java
new file mode 100644
index 0000000000..504a8f93c9
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpCancel.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint.operation;
+
+import lombok.SneakyThrows;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.flint.FlintIndexMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexStateModel;
+import org.opensearch.sql.spark.flint.FlintIndexStateModelService;
+
+/** Cancel refreshing job for refresh query when user clicks cancel button on UI. */
+public class FlintIndexOpCancel extends FlintIndexOp {
+  private static final Logger LOG = LogManager.getLogger();
+
+  public FlintIndexOpCancel(
+      FlintIndexStateModelService flintIndexStateModelService,
+      String datasourceName,
+      EMRServerlessClientFactory emrServerlessClientFactory) {
+    super(flintIndexStateModelService, datasourceName, emrServerlessClientFactory);
+  }
+
+  // Only in refreshing state, the job is cancellable in case of REFRESH query.
+  public boolean validate(FlintIndexState state) {
+    return state == FlintIndexState.REFRESHING;
+  }
+
+  @Override
+  FlintIndexState transitioningState() {
+    return FlintIndexState.CANCELLING;
+  }
+
+  /** cancel EMR-S job, wait cancelled state upto 15s. */
+  @SneakyThrows
+  @Override
+  void runOp(
+      FlintIndexMetadata flintIndexMetadata,
+      FlintIndexStateModel flintIndexStateModel,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    LOG.debug(
+        "Performing drop index operation for index: {}",
+        flintIndexMetadata.getOpensearchIndexName());
+    cancelStreamingJob(flintIndexStateModel);
+  }
+
+  @Override
+  FlintIndexState stableState() {
+    return FlintIndexState.ACTIVE;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpDrop.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpDrop.java
new file mode 100644
index 0000000000..88aca66fef
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpDrop.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint.operation;
+
+import lombok.SneakyThrows;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.flint.FlintIndexMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexStateModel;
+import org.opensearch.sql.spark.flint.FlintIndexStateModelService;
+import org.opensearch.sql.spark.scheduler.AsyncQueryScheduler;
+
+/** Operation to drop Flint index */
+public class FlintIndexOpDrop extends FlintIndexOp {
+  private static final Logger LOG = LogManager.getLogger();
+
+  private final AsyncQueryScheduler asyncQueryScheduler;
+
+  public FlintIndexOpDrop(
+      FlintIndexStateModelService flintIndexStateModelService,
+      String datasourceName,
+      EMRServerlessClientFactory emrServerlessClientFactory,
+      AsyncQueryScheduler asyncQueryScheduler) {
+    super(flintIndexStateModelService, datasourceName, emrServerlessClientFactory);
+    this.asyncQueryScheduler = asyncQueryScheduler;
+  }
+
+  public boolean validate(FlintIndexState state) {
+    return state == FlintIndexState.REFRESHING
+        || state == FlintIndexState.EMPTY
+        || state == FlintIndexState.ACTIVE
+        || state == FlintIndexState.CREATING;
+  }
+
+  @Override
+  FlintIndexState transitioningState() {
+    return FlintIndexState.DELETING;
+  }
+
+  /** cancel EMR-S job, wait cancelled state upto 15s. */
+  @SneakyThrows
+  @Override
+  void runOp(
+      FlintIndexMetadata flintIndexMetadata,
+      FlintIndexStateModel flintIndexStateModel,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    LOG.debug(
+        "Performing drop index operation for index: {}",
+        flintIndexMetadata.getOpensearchIndexName());
+    if (flintIndexMetadata.getFlintIndexOptions().isExternalScheduler()) {
+      asyncQueryScheduler.unscheduleJob(
+          flintIndexMetadata.getOpensearchIndexName(), asyncQueryRequestContext);
+    } else {
+      cancelStreamingJob(flintIndexStateModel);
+    }
+  }
+
+  @Override
+  FlintIndexState stableState() {
+    return FlintIndexState.DELETED;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpFactory.java b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpFactory.java
new file mode 100644
index 0000000000..d82b29e928
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpFactory.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint.operation;
+
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+import org.opensearch.sql.spark.flint.FlintIndexClient;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.FlintIndexStateModelService;
+import org.opensearch.sql.spark.scheduler.AsyncQueryScheduler;
+
+@RequiredArgsConstructor
+public class FlintIndexOpFactory {
+  private final FlintIndexStateModelService flintIndexStateModelService;
+  private final FlintIndexClient flintIndexClient;
+  private final FlintIndexMetadataService flintIndexMetadataService;
+  private final EMRServerlessClientFactory emrServerlessClientFactory;
+  private final AsyncQueryScheduler asyncQueryScheduler;
+
+  public FlintIndexOpDrop getDrop(String datasource) {
+    return new FlintIndexOpDrop(
+        flintIndexStateModelService, datasource, emrServerlessClientFactory, asyncQueryScheduler);
+  }
+
+  public FlintIndexOpAlter getAlter(FlintIndexOptions flintIndexOptions, String datasource) {
+    return new FlintIndexOpAlter(
+        flintIndexOptions,
+        flintIndexStateModelService,
+        datasource,
+        emrServerlessClientFactory,
+        flintIndexMetadataService,
+        asyncQueryScheduler);
+  }
+
+  public FlintIndexOpCancel getCancel(String datasource) {
+    return new FlintIndexOpCancel(
+        flintIndexStateModelService, datasource, emrServerlessClientFactory);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/leasemanager/ConcurrencyLimitExceededException.java b/async-query-core/src/main/java/org/opensearch/sql/spark/leasemanager/ConcurrencyLimitExceededException.java
new file mode 100644
index 0000000000..ab6305c835
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/leasemanager/ConcurrencyLimitExceededException.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.leasemanager;
+
+/** Concurrency limit exceeded. */
+public class ConcurrencyLimitExceededException extends RuntimeException {
+  public ConcurrencyLimitExceededException(String message) {
+    super(message);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/leasemanager/LeaseManager.java b/async-query-core/src/main/java/org/opensearch/sql/spark/leasemanager/LeaseManager.java
new file mode 100644
index 0000000000..6cc74ecdc5
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/leasemanager/LeaseManager.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.leasemanager;
+
+import org.opensearch.sql.spark.leasemanager.model.LeaseRequest;
+
+/** Lease manager */
+public interface LeaseManager {
+
+  /**
+   * Borrow from LeaseManager. If no exception, lease successfully.
+   *
+   * @throws ConcurrencyLimitExceededException
+   */
+  void borrow(LeaseRequest request);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/leasemanager/model/LeaseRequest.java b/async-query-core/src/main/java/org/opensearch/sql/spark/leasemanager/model/LeaseRequest.java
new file mode 100644
index 0000000000..190c033198
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/leasemanager/model/LeaseRequest.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.leasemanager.model;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+
+/** Lease Request. */
+@Getter
+@RequiredArgsConstructor
+public class LeaseRequest {
+  private final JobType jobType;
+  private final String datasourceName;
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/metrics/EmrMetrics.java b/async-query-core/src/main/java/org/opensearch/sql/spark/metrics/EmrMetrics.java
new file mode 100644
index 0000000000..2ec587bcc7
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/metrics/EmrMetrics.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.metrics;
+
+public enum EmrMetrics {
+  EMR_CANCEL_JOB_REQUEST_FAILURE_COUNT,
+  EMR_GET_JOB_RESULT_FAILURE_COUNT,
+  EMR_START_JOB_REQUEST_FAILURE_COUNT,
+  EMR_INTERACTIVE_QUERY_JOBS_CREATION_COUNT,
+  EMR_STREAMING_QUERY_JOBS_CREATION_COUNT,
+  EMR_BATCH_QUERY_JOBS_CREATION_COUNT;
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/metrics/MetricsService.java b/async-query-core/src/main/java/org/opensearch/sql/spark/metrics/MetricsService.java
new file mode 100644
index 0000000000..ca9cb9db4e
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/metrics/MetricsService.java
@@ -0,0 +1,11 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.metrics;
+
+/** Interface to abstract the emit of metrics */
+public interface MetricsService {
+  void incrementNumericalMetric(EmrMetrics emrMetrics);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/DataSourceSparkParameterComposer.java b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/DataSourceSparkParameterComposer.java
new file mode 100644
index 0000000000..324889b6e0
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/DataSourceSparkParameterComposer.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.parameter;
+
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+
+/**
+ * Compose Spark parameters specific to the {@link
+ * org.opensearch.sql.datasource.model.DataSourceType} based on the {@link DataSourceMetadata}. For
+ * the parameters not specific to {@link org.opensearch.sql.datasource.model.DataSourceType}, please
+ * use {@link GeneralSparkParameterComposer}.
+ */
+public interface DataSourceSparkParameterComposer {
+  void compose(
+      DataSourceMetadata dataSourceMetadata,
+      SparkSubmitParameters sparkSubmitParameters,
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext context);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/GeneralSparkParameterComposer.java b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/GeneralSparkParameterComposer.java
new file mode 100644
index 0000000000..c3d46ba5c6
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/GeneralSparkParameterComposer.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.parameter;
+
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+
+/**
+ * Compose spark submit parameters based on the request and context. For {@link
+ * org.opensearch.sql.datasource.model.DataSourceType} specific parameters, please use {@link
+ * DataSourceSparkParameterComposer}. See {@link SparkParameterComposerCollection}.
+ */
+public interface GeneralSparkParameterComposer {
+
+  /**
+   * Modify sparkSubmitParameters based on dispatchQueryRequest and context.
+   *
+   * @param sparkSubmitParameters Implementation of this method will modify this.
+   * @param dispatchQueryRequest Request. Implementation can refer it to compose
+   *     sparkSubmitParameters.
+   * @param context Context of the request. Implementation can refer it to compose
+   *     sparkSubmitParameters.
+   */
+  void compose(
+      SparkSubmitParameters sparkSubmitParameters,
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext context);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkParameterComposerCollection.java b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkParameterComposerCollection.java
new file mode 100644
index 0000000000..a6a88738bf
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkParameterComposerCollection.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.parameter;
+
+import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+
+/**
+ * Stores Spark parameter composers and dispatch compose request to each composer. Composers should
+ * be registered during initialization such as in Guice Module.
+ */
+public class SparkParameterComposerCollection {
+  private Collection<GeneralSparkParameterComposer> generalComposers = new ArrayList<>();
+  private Map<DataSourceType, Collection<DataSourceSparkParameterComposer>> datasourceComposers =
+      new HashMap<>();
+
+  /**
+   * Register composers for specific DataSourceType. The registered composer is called only if the
+   * request is for the dataSourceType.
+   */
+  public void register(DataSourceType dataSourceType, DataSourceSparkParameterComposer composer) {
+    if (!datasourceComposers.containsKey(dataSourceType)) {
+      datasourceComposers.put(dataSourceType, new LinkedList<>());
+    }
+    datasourceComposers.get(dataSourceType).add(composer);
+  }
+
+  /**
+   * Register general composer. The composer is called when spark parameter is generated regardless
+   * of datasource type.
+   */
+  public void register(GeneralSparkParameterComposer composer) {
+    generalComposers.add(composer);
+  }
+
+  /** Execute composers associated with the datasource type */
+  public void composeByDataSource(
+      DataSourceMetadata dataSourceMetadata,
+      SparkSubmitParameters sparkSubmitParameters,
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext context) {
+    for (DataSourceSparkParameterComposer composer :
+        getComposersFor(dataSourceMetadata.getConnector())) {
+      composer.compose(dataSourceMetadata, sparkSubmitParameters, dispatchQueryRequest, context);
+    }
+  }
+
+  /** Execute all the registered generic composers */
+  public void compose(
+      SparkSubmitParameters sparkSubmitParameters,
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext context) {
+    for (GeneralSparkParameterComposer composer : generalComposers) {
+      composer.compose(sparkSubmitParameters, dispatchQueryRequest, context);
+    }
+  }
+
+  private Collection<DataSourceSparkParameterComposer> getComposersFor(DataSourceType type) {
+    return datasourceComposers.getOrDefault(type, ImmutableList.of());
+  }
+
+  public boolean isComposerRegistered(DataSourceType type) {
+    return datasourceComposers.containsKey(type);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkSubmitParameters.java b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkSubmitParameters.java
new file mode 100644
index 0000000000..84fd49b712
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkSubmitParameters.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.parameter;
+
+import static org.opensearch.sql.spark.data.constants.SparkConstants.DEFAULT_CLASS_NAME;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import lombok.Setter;
+
+/** Define Spark Submit Parameters. */
+public class SparkSubmitParameters {
+  public static final String SPACE = " ";
+  public static final String EQUALS = "=";
+
+  @Setter private String className = DEFAULT_CLASS_NAME;
+  private Map<String, String> config = new LinkedHashMap<>();
+
+  /** Extra parameters to append finally */
+  @Setter private String extraParameters;
+
+  public void setConfigItem(String key, String value) {
+    config.put(key, value);
+  }
+
+  public void deleteConfigItem(String key) {
+    config.remove(key);
+  }
+
+  public String getConfigItem(String key) {
+    return config.get(key);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append(" --class ");
+    stringBuilder.append(this.className);
+    stringBuilder.append(SPACE);
+    for (String key : config.keySet()) {
+      stringBuilder.append(" --conf ");
+      stringBuilder.append(key);
+      stringBuilder.append(EQUALS);
+      stringBuilder.append(config.get(key));
+      stringBuilder.append(SPACE);
+    }
+
+    if (extraParameters != null) {
+      stringBuilder.append(extraParameters);
+    }
+    return stringBuilder.toString();
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilder.java b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilder.java
new file mode 100644
index 0000000000..db74d0a5a7
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilder.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.parameter;
+
+import static org.opensearch.sql.spark.data.constants.SparkConstants.AWS_SNAPSHOT_REPOSITORY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.DEFAULT_GLUE_CATALOG_CREDENTIALS_PROVIDER_FACTORY_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.DEFAULT_S3_AWS_CREDENTIALS_PROVIDER_VALUE;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.EMR_ASSUME_ROLE_CREDENTIALS_PROVIDER;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_CREDENTIALS_PROVIDER_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_DEFAULT_AUTH;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_DEFAULT_CLUSTER_NAME;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_DEFAULT_HOST;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_DEFAULT_PORT;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_DEFAULT_SCHEME;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_AUTH_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_HOST_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_PORT_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_SCHEME_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_JOB_QUERY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_JOB_QUERY_ID;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_JOB_REQUEST_INDEX;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_JOB_SESSION_ID;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_PPL_EXTENSION;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_SQL_EXTENSION;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.GLUE_HIVE_CATALOG_FACTORY_CLASS;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.HADOOP_CATALOG_CREDENTIALS_PROVIDER_FACTORY_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.HIVE_METASTORE_CLASS_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.JAVA_HOME_LOCATION;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.PPL_STANDALONE_PACKAGE;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.S3_AWS_CREDENTIALS_PROVIDER_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_DRIVER_ENV_FLINT_CLUSTER_NAME_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_DRIVER_ENV_JAVA_HOME_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_EXECUTOR_ENV_FLINT_CLUSTER_NAME_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_EXECUTOR_ENV_JAVA_HOME_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_JAR_PACKAGES_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_JAR_REPOSITORIES_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_LAUNCHER_PACKAGE;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_SQL_EXTENSIONS_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_STANDALONE_PACKAGE;
+
+import lombok.Getter;
+import org.apache.commons.text.StringEscapeUtils;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.config.SparkSubmitParameterModifier;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchStateStoreUtil;
+
+public class SparkSubmitParametersBuilder {
+  private final SparkParameterComposerCollection sparkParameterComposerCollection;
+  @Getter private final SparkSubmitParameters sparkSubmitParameters;
+
+  public SparkSubmitParametersBuilder(
+      SparkParameterComposerCollection sparkParameterComposerCollection) {
+    this.sparkParameterComposerCollection = sparkParameterComposerCollection;
+    sparkSubmitParameters = new SparkSubmitParameters();
+    setDefaultConfigs();
+  }
+
+  private void setDefaultConfigs() {
+    setConfigItem(S3_AWS_CREDENTIALS_PROVIDER_KEY, DEFAULT_S3_AWS_CREDENTIALS_PROVIDER_VALUE);
+    setConfigItem(
+        HADOOP_CATALOG_CREDENTIALS_PROVIDER_FACTORY_KEY,
+        DEFAULT_GLUE_CATALOG_CREDENTIALS_PROVIDER_FACTORY_KEY);
+    setConfigItem(
+        SPARK_JAR_PACKAGES_KEY,
+        SPARK_STANDALONE_PACKAGE + "," + SPARK_LAUNCHER_PACKAGE + "," + PPL_STANDALONE_PACKAGE);
+    setConfigItem(SPARK_JAR_REPOSITORIES_KEY, AWS_SNAPSHOT_REPOSITORY);
+    setConfigItem(SPARK_DRIVER_ENV_JAVA_HOME_KEY, JAVA_HOME_LOCATION);
+    setConfigItem(SPARK_EXECUTOR_ENV_JAVA_HOME_KEY, JAVA_HOME_LOCATION);
+    setConfigItem(SPARK_DRIVER_ENV_FLINT_CLUSTER_NAME_KEY, FLINT_DEFAULT_CLUSTER_NAME);
+    setConfigItem(SPARK_EXECUTOR_ENV_FLINT_CLUSTER_NAME_KEY, FLINT_DEFAULT_CLUSTER_NAME);
+    setConfigItem(FLINT_INDEX_STORE_HOST_KEY, FLINT_DEFAULT_HOST);
+    setConfigItem(FLINT_INDEX_STORE_PORT_KEY, FLINT_DEFAULT_PORT);
+    setConfigItem(FLINT_INDEX_STORE_SCHEME_KEY, FLINT_DEFAULT_SCHEME);
+    setConfigItem(FLINT_INDEX_STORE_AUTH_KEY, FLINT_DEFAULT_AUTH);
+    setConfigItem(FLINT_CREDENTIALS_PROVIDER_KEY, EMR_ASSUME_ROLE_CREDENTIALS_PROVIDER);
+    setConfigItem(SPARK_SQL_EXTENSIONS_KEY, FLINT_SQL_EXTENSION + "," + FLINT_PPL_EXTENSION);
+    setConfigItem(HIVE_METASTORE_CLASS_KEY, GLUE_HIVE_CATALOG_FACTORY_CLASS);
+  }
+
+  private void setConfigItem(String key, String value) {
+    sparkSubmitParameters.setConfigItem(key, value);
+  }
+
+  public SparkSubmitParametersBuilder className(String className) {
+    sparkSubmitParameters.setClassName(className);
+    return this;
+  }
+
+  /** clusterName will be used for logging and metrics in Spark */
+  public SparkSubmitParametersBuilder clusterName(String clusterName) {
+    setConfigItem(SPARK_DRIVER_ENV_FLINT_CLUSTER_NAME_KEY, clusterName);
+    setConfigItem(SPARK_EXECUTOR_ENV_FLINT_CLUSTER_NAME_KEY, clusterName);
+    return this;
+  }
+
+  /**
+   * For query in spark submit parameters to be parsed correctly, escape the characters in the
+   * query, then wrap the query with double quotes.
+   */
+  public SparkSubmitParametersBuilder query(String query) {
+    String escapedQuery = StringEscapeUtils.escapeJava(query);
+    String wrappedQuery = "\"" + escapedQuery + "\"";
+    setConfigItem(FLINT_JOB_QUERY, wrappedQuery);
+    return this;
+  }
+
+  public SparkSubmitParametersBuilder queryId(String queryId) {
+    setConfigItem(FLINT_JOB_QUERY_ID, queryId);
+    return this;
+  }
+
+  public SparkSubmitParametersBuilder dataSource(
+      DataSourceMetadata metadata,
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext context) {
+    if (sparkParameterComposerCollection.isComposerRegistered(metadata.getConnector())) {
+      sparkParameterComposerCollection.composeByDataSource(
+          metadata, sparkSubmitParameters, dispatchQueryRequest, context);
+      return this;
+    } else {
+      throw new UnsupportedOperationException(
+          String.format(
+              "UnSupported datasource type for async queries:: %s", metadata.getConnector()));
+    }
+  }
+
+  public SparkSubmitParametersBuilder structuredStreaming(Boolean isStructuredStreaming) {
+    if (isStructuredStreaming) {
+      setConfigItem("spark.flint.job.type", "streaming");
+    }
+    return this;
+  }
+
+  public SparkSubmitParametersBuilder extraParameters(String params) {
+    sparkSubmitParameters.setExtraParameters(params);
+    return this;
+  }
+
+  public SparkSubmitParametersBuilder sessionExecution(String sessionId, String datasourceName) {
+    setConfigItem(FLINT_JOB_REQUEST_INDEX, OpenSearchStateStoreUtil.getIndexName(datasourceName));
+    setConfigItem(FLINT_JOB_SESSION_ID, sessionId);
+    return this;
+  }
+
+  public SparkSubmitParametersBuilder acceptModifier(SparkSubmitParameterModifier modifier) {
+    if (modifier != null) {
+      modifier.modifyParameters(this);
+    }
+    return this;
+  }
+
+  public SparkSubmitParametersBuilder acceptComposers(
+      DispatchQueryRequest dispatchQueryRequest, AsyncQueryRequestContext context) {
+    sparkParameterComposerCollection.compose(sparkSubmitParameters, dispatchQueryRequest, context);
+    return this;
+  }
+
+  @Override
+  public String toString() {
+    return sparkSubmitParameters.toString();
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilderProvider.java b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilderProvider.java
new file mode 100644
index 0000000000..ccc9ffb680
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilderProvider.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.parameter;
+
+import lombok.RequiredArgsConstructor;
+
+/** Provide SparkSubmitParametersBuilder instance with SparkParameterComposerCollection injected */
+@RequiredArgsConstructor
+public class SparkSubmitParametersBuilderProvider {
+  private final SparkParameterComposerCollection sparkParameterComposerCollection;
+
+  public SparkSubmitParametersBuilder getSparkSubmitParametersBuilder() {
+    return new SparkSubmitParametersBuilder(sparkParameterComposerCollection);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/response/JobExecutionResponseReader.java b/async-query-core/src/main/java/org/opensearch/sql/spark/response/JobExecutionResponseReader.java
new file mode 100644
index 0000000000..e3184b7326
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/response/JobExecutionResponseReader.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.response;
+
+import org.json.JSONObject;
+
+/** Interface for reading job execution result */
+public interface JobExecutionResponseReader {
+  /**
+   * Retrieves the job execution result based on the job ID.
+   *
+   * @param jobId The job ID.
+   * @param resultLocation The location identifier where the result is stored (optional).
+   * @return A JSONObject containing the result data.
+   */
+  JSONObject getResultWithJobId(String jobId, String resultLocation);
+
+  /**
+   * Retrieves the job execution result based on the query ID.
+   *
+   * @param queryId The query ID.
+   * @param resultLocation The location identifier where the result is stored (optional).
+   * @return A JSONObject containing the result data.
+   */
+  JSONObject getResultWithQueryId(String queryId, String resultLocation);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/rest/model/CreateAsyncQueryRequest.java b/async-query-core/src/main/java/org/opensearch/sql/spark/rest/model/CreateAsyncQueryRequest.java
new file mode 100644
index 0000000000..e3250c7a58
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/rest/model/CreateAsyncQueryRequest.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.rest.model;
+
+import lombok.Data;
+import org.apache.commons.lang3.Validate;
+
+@Data
+public class CreateAsyncQueryRequest {
+  private String query;
+  private String datasource;
+  private LangType lang;
+  // optional sessionId
+  private String sessionId;
+
+  public CreateAsyncQueryRequest(String query, String datasource, LangType lang) {
+    this.query = Validate.notNull(query, "Query can't be null");
+    this.datasource = Validate.notNull(datasource, "Datasource can't be null");
+    this.lang = Validate.notNull(lang, "lang can't be null");
+  }
+
+  public CreateAsyncQueryRequest(String query, String datasource, LangType lang, String sessionId) {
+    this.query = Validate.notNull(query, "Query can't be null");
+    this.datasource = Validate.notNull(datasource, "Datasource can't be null");
+    this.lang = Validate.notNull(lang, "lang can't be null");
+    this.sessionId = sessionId;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/rest/model/CreateAsyncQueryResponse.java b/async-query-core/src/main/java/org/opensearch/sql/spark/rest/model/CreateAsyncQueryResponse.java
new file mode 100644
index 0000000000..2f918308c4
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/rest/model/CreateAsyncQueryResponse.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.rest.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class CreateAsyncQueryResponse {
+  private String queryId;
+  // optional sessionId
+  private String sessionId;
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/rest/model/LangType.java b/async-query-core/src/main/java/org/opensearch/sql/spark/rest/model/LangType.java
new file mode 100644
index 0000000000..51fa8d2b13
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/rest/model/LangType.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.rest.model;
+
+/** Language type accepted in async query apis. */
+public enum LangType {
+  SQL("sql"),
+  PPL("ppl");
+  private final String text;
+
+  LangType(String text) {
+    this.text = text;
+  }
+
+  public String getText() {
+    return this.text;
+  }
+
+  /**
+   * Get LangType from text.
+   *
+   * @param text text.
+   * @return LangType {@link LangType}.
+   */
+  public static LangType fromString(String text) {
+    for (LangType langType : LangType.values()) {
+      if (langType.text.equalsIgnoreCase(text)) {
+        return langType;
+      }
+    }
+    throw new IllegalArgumentException("No LangType with text " + text + " found");
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/scheduler/AsyncQueryScheduler.java b/async-query-core/src/main/java/org/opensearch/sql/spark/scheduler/AsyncQueryScheduler.java
new file mode 100644
index 0000000000..6d5350821b
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/scheduler/AsyncQueryScheduler.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.scheduler;
+
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.scheduler.model.AsyncQuerySchedulerRequest;
+
+/** Scheduler interface for scheduling asynchronous query jobs. */
+public interface AsyncQueryScheduler {
+
+  /**
+   * Schedules a new job in the system. This method creates a new job entry based on the provided
+   * request parameters.
+   *
+   * <p>Use cases: - Creating a new periodic query execution - Setting up a scheduled data refresh
+   * task
+   *
+   * @param asyncQuerySchedulerRequest The request containing job configuration details
+   * @param asyncQueryRequestContext The request context passed to AsyncQueryExecutorService
+   * @throws IllegalArgumentException if a job with the same name already exists
+   * @throws RuntimeException if there's an error during job creation
+   */
+  void scheduleJob(
+      AsyncQuerySchedulerRequest asyncQuerySchedulerRequest,
+      AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /**
+   * Updates an existing job with new parameters. This method modifies the configuration of an
+   * already scheduled job.
+   *
+   * <p>Use cases: - Changing the schedule of an existing job - Modifying query parameters of a
+   * scheduled job - Updating resource allocations for a job
+   *
+   * @param asyncQuerySchedulerRequest The request containing updated job configuration
+   * @param asyncQueryRequestContext The request context passed to AsyncQueryExecutorService
+   * @throws IllegalArgumentException if the job to be updated doesn't exist
+   * @throws RuntimeException if there's an error during the update process
+   */
+  void updateJob(
+      AsyncQuerySchedulerRequest asyncQuerySchedulerRequest,
+      AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /**
+   * Unschedules a job by marking it as disabled and updating its last update time. This method is
+   * used when you want to temporarily stop a job from running but keep its configuration and
+   * history in the system.
+   *
+   * <p>Use cases: - Pausing a job that's causing issues without losing its configuration -
+   * Temporarily disabling a job during maintenance or high-load periods - Allowing for easy
+   * re-enabling of the job in the future
+   *
+   * @param jobId The unique identifier of the job to unschedule
+   * @param asyncQueryRequestContext The request context passed to AsyncQueryExecutorService
+   * @throws IllegalArgumentException if the job to be unscheduled doesn't exist
+   * @throws RuntimeException if there's an error during the unschedule process
+   */
+  void unscheduleJob(String jobId, AsyncQueryRequestContext asyncQueryRequestContext);
+
+  /**
+   * Removes a job completely from the scheduler. This method permanently deletes the job and all
+   * its associated data from the system.
+   *
+   * <p>Use cases: - Cleaning up jobs that are no longer needed - Removing obsolete or erroneously
+   * created jobs - Freeing up resources by deleting unused job configurations
+   *
+   * @param jobId The unique identifier of the job to remove
+   * @param asyncQueryRequestContext The request context passed to AsyncQueryExecutorService
+   * @throws IllegalArgumentException if the job to be removed doesn't exist
+   * @throws RuntimeException if there's an error during the remove process
+   */
+  void removeJob(String jobId, AsyncQueryRequestContext asyncQueryRequestContext);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/scheduler/model/AsyncQuerySchedulerRequest.java b/async-query-core/src/main/java/org/opensearch/sql/spark/scheduler/model/AsyncQuerySchedulerRequest.java
new file mode 100644
index 0000000000..c38d92365a
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/scheduler/model/AsyncQuerySchedulerRequest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.scheduler.model;
+
+import java.time.Instant;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+/** Represents a job request for a scheduled task. */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AsyncQuerySchedulerRequest {
+  protected String accountId;
+  // Scheduler jobid is the opensearch index name until we support multiple jobs per index
+  protected String jobId;
+  protected String dataSource;
+  protected String scheduledQuery;
+  protected LangType queryLang;
+  protected Object schedule;
+  protected boolean enabled;
+  protected Instant lastUpdateTime;
+  protected Instant enabledTime;
+  protected Long lockDurationSeconds;
+  protected Double jitter;
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/utils/IDUtils.java b/async-query-core/src/main/java/org/opensearch/sql/spark/utils/IDUtils.java
new file mode 100644
index 0000000000..438d2342b4
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/utils/IDUtils.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.utils;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import lombok.experimental.UtilityClass;
+import org.apache.commons.lang3.RandomStringUtils;
+
+@UtilityClass
+public class IDUtils {
+  public static final int PREFIX_LEN = 10;
+
+  public static String decode(String id) {
+    return new String(Base64.getDecoder().decode(id)).substring(PREFIX_LEN);
+  }
+
+  public static String encode(String datasourceName) {
+    String randomId = RandomStringUtils.randomAlphanumeric(PREFIX_LEN) + datasourceName;
+    return Base64.getEncoder().encodeToString(randomId.getBytes(StandardCharsets.UTF_8));
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/utils/RealTimeProvider.java b/async-query-core/src/main/java/org/opensearch/sql/spark/utils/RealTimeProvider.java
new file mode 100644
index 0000000000..b42e30532b
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/utils/RealTimeProvider.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.utils;
+
+public class RealTimeProvider implements TimeProvider {
+  @Override
+  public long currentEpochMillis() {
+    return System.currentTimeMillis();
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/utils/SQLQueryUtils.java b/async-query-core/src/main/java/org/opensearch/sql/spark/utils/SQLQueryUtils.java
new file mode 100644
index 0000000000..3ba9c23ed7
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/utils/SQLQueryUtils.java
@@ -0,0 +1,358 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.utils;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import lombok.Getter;
+import lombok.experimental.UtilityClass;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.misc.Interval;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.sql.common.antlr.CaseInsensitiveCharStream;
+import org.opensearch.sql.common.antlr.SyntaxAnalysisErrorListener;
+import org.opensearch.sql.common.antlr.SyntaxCheckException;
+import org.opensearch.sql.spark.antlr.parser.FlintSparkSqlExtensionsBaseVisitor;
+import org.opensearch.sql.spark.antlr.parser.FlintSparkSqlExtensionsLexer;
+import org.opensearch.sql.spark.antlr.parser.FlintSparkSqlExtensionsParser;
+import org.opensearch.sql.spark.antlr.parser.FlintSparkSqlExtensionsParser.MaterializedViewQueryContext;
+import org.opensearch.sql.spark.antlr.parser.FlintSparkSqlExtensionsParser.RecoverIndexJobStatementContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseLexer;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.IdentifierReferenceContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.StatementContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParserBaseVisitor;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+import org.opensearch.sql.spark.dispatcher.model.FullyQualifiedTableName;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryActionType;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryDetails;
+import org.opensearch.sql.spark.flint.FlintIndexType;
+
+/**
+ * This util class parses spark sql query and provides util functions to identify indexName,
+ * tableName and datasourceName.
+ */
+@UtilityClass
+public class SQLQueryUtils {
+  private static final Logger logger = LogManager.getLogger(SQLQueryUtils.class);
+
+  public static List<FullyQualifiedTableName> extractFullyQualifiedTableNames(String sqlQuery) {
+    SqlBaseParser sqlBaseParser =
+        new SqlBaseParser(
+            new CommonTokenStream(new SqlBaseLexer(new CaseInsensitiveCharStream(sqlQuery))));
+    sqlBaseParser.addErrorListener(new SyntaxAnalysisErrorListener());
+    StatementContext statement = sqlBaseParser.statement();
+    SparkSqlTableNameVisitor sparkSqlTableNameVisitor = new SparkSqlTableNameVisitor();
+    statement.accept(sparkSqlTableNameVisitor);
+    return sparkSqlTableNameVisitor.getFullyQualifiedTableNames();
+  }
+
+  public static IndexQueryDetails extractIndexDetails(String sqlQuery) {
+    FlintSparkSqlExtensionsParser flintSparkSqlExtensionsParser =
+        new FlintSparkSqlExtensionsParser(
+            new CommonTokenStream(
+                new FlintSparkSqlExtensionsLexer(new CaseInsensitiveCharStream(sqlQuery))));
+    flintSparkSqlExtensionsParser.addErrorListener(new SyntaxAnalysisErrorListener());
+    FlintSparkSqlExtensionsParser.SingleStatementContext singleStatementContext =
+        flintSparkSqlExtensionsParser.singleStatement();
+    FlintSQLIndexDetailsVisitor flintSQLIndexDetailsVisitor = new FlintSQLIndexDetailsVisitor();
+    singleStatementContext.accept(flintSQLIndexDetailsVisitor);
+    return flintSQLIndexDetailsVisitor.getIndexQueryDetailsBuilder().build();
+  }
+
+  public static boolean isFlintExtensionQuery(String sqlQuery) {
+    FlintSparkSqlExtensionsParser flintSparkSqlExtensionsParser =
+        new FlintSparkSqlExtensionsParser(
+            new CommonTokenStream(
+                new FlintSparkSqlExtensionsLexer(new CaseInsensitiveCharStream(sqlQuery))));
+    flintSparkSqlExtensionsParser.addErrorListener(new SyntaxAnalysisErrorListener());
+    try {
+      flintSparkSqlExtensionsParser.statement();
+      return true;
+    } catch (SyntaxCheckException syntaxCheckException) {
+      return false;
+    }
+  }
+
+  public static SqlBaseParser getBaseParser(String sqlQuery) {
+    SqlBaseParser sqlBaseParser =
+        new SqlBaseParser(
+            new CommonTokenStream(new SqlBaseLexer(new CaseInsensitiveCharStream(sqlQuery))));
+    sqlBaseParser.addErrorListener(new SyntaxAnalysisErrorListener());
+    return sqlBaseParser;
+  }
+
+  public static class SparkSqlTableNameVisitor extends SqlBaseParserBaseVisitor<Void> {
+
+    @Getter private List<FullyQualifiedTableName> fullyQualifiedTableNames = new LinkedList<>();
+
+    public SparkSqlTableNameVisitor() {}
+
+    @Override
+    public Void visitIdentifierReference(IdentifierReferenceContext ctx) {
+      fullyQualifiedTableNames.add(new FullyQualifiedTableName(ctx.getText()));
+      return super.visitIdentifierReference(ctx);
+    }
+
+    @Override
+    public Void visitDropTable(SqlBaseParser.DropTableContext ctx) {
+      for (ParseTree parseTree : ctx.children) {
+        if (parseTree instanceof SqlBaseParser.IdentifierReferenceContext) {
+          fullyQualifiedTableNames.add(new FullyQualifiedTableName(parseTree.getText()));
+        }
+      }
+      return super.visitDropTable(ctx);
+    }
+
+    @Override
+    public Void visitDescribeRelation(SqlBaseParser.DescribeRelationContext ctx) {
+      for (ParseTree parseTree : ctx.children) {
+        if (parseTree instanceof SqlBaseParser.IdentifierReferenceContext) {
+          fullyQualifiedTableNames.add(new FullyQualifiedTableName(parseTree.getText()));
+        }
+      }
+      return super.visitDescribeRelation(ctx);
+    }
+
+    // Extract table name for create Table Statement.
+    @Override
+    public Void visitCreateTableHeader(SqlBaseParser.CreateTableHeaderContext ctx) {
+      for (ParseTree parseTree : ctx.children) {
+        if (parseTree instanceof SqlBaseParser.IdentifierReferenceContext) {
+          fullyQualifiedTableNames.add(new FullyQualifiedTableName(parseTree.getText()));
+        }
+      }
+      return super.visitCreateTableHeader(ctx);
+    }
+  }
+
+  public static class FlintSQLIndexDetailsVisitor extends FlintSparkSqlExtensionsBaseVisitor<Void> {
+
+    @Getter private final IndexQueryDetails.IndexQueryDetailsBuilder indexQueryDetailsBuilder;
+
+    public FlintSQLIndexDetailsVisitor() {
+      this.indexQueryDetailsBuilder = new IndexQueryDetails.IndexQueryDetailsBuilder();
+    }
+
+    @Override
+    public Void visitIndexName(FlintSparkSqlExtensionsParser.IndexNameContext ctx) {
+      indexQueryDetailsBuilder.indexName(ctx.getText());
+      return super.visitIndexName(ctx);
+    }
+
+    @Override
+    public Void visitTableName(FlintSparkSqlExtensionsParser.TableNameContext ctx) {
+      indexQueryDetailsBuilder.fullyQualifiedTableName(new FullyQualifiedTableName(ctx.getText()));
+      return super.visitTableName(ctx);
+    }
+
+    @Override
+    public Void visitCreateSkippingIndexStatement(
+        FlintSparkSqlExtensionsParser.CreateSkippingIndexStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.CREATE);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.SKIPPING);
+      visitPropertyList(ctx.propertyList());
+      return super.visitCreateSkippingIndexStatement(ctx);
+    }
+
+    @Override
+    public Void visitCreateCoveringIndexStatement(
+        FlintSparkSqlExtensionsParser.CreateCoveringIndexStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.CREATE);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.COVERING);
+      visitPropertyList(ctx.propertyList());
+      return super.visitCreateCoveringIndexStatement(ctx);
+    }
+
+    @Override
+    public Void visitCreateMaterializedViewStatement(
+        FlintSparkSqlExtensionsParser.CreateMaterializedViewStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.CREATE);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.MATERIALIZED_VIEW);
+      indexQueryDetailsBuilder.mvName(ctx.mvName.getText());
+      visitPropertyList(ctx.propertyList());
+      return super.visitCreateMaterializedViewStatement(ctx);
+    }
+
+    @Override
+    public Void visitDropCoveringIndexStatement(
+        FlintSparkSqlExtensionsParser.DropCoveringIndexStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.DROP);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.COVERING);
+      return super.visitDropCoveringIndexStatement(ctx);
+    }
+
+    @Override
+    public Void visitDropSkippingIndexStatement(
+        FlintSparkSqlExtensionsParser.DropSkippingIndexStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.DROP);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.SKIPPING);
+      return super.visitDropSkippingIndexStatement(ctx);
+    }
+
+    @Override
+    public Void visitDropMaterializedViewStatement(
+        FlintSparkSqlExtensionsParser.DropMaterializedViewStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.DROP);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.MATERIALIZED_VIEW);
+      indexQueryDetailsBuilder.mvName(ctx.mvName.getText());
+      return super.visitDropMaterializedViewStatement(ctx);
+    }
+
+    @Override
+    public Void visitDescribeCoveringIndexStatement(
+        FlintSparkSqlExtensionsParser.DescribeCoveringIndexStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.DESCRIBE);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.COVERING);
+      return super.visitDescribeCoveringIndexStatement(ctx);
+    }
+
+    @Override
+    public Void visitDescribeSkippingIndexStatement(
+        FlintSparkSqlExtensionsParser.DescribeSkippingIndexStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.DESCRIBE);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.SKIPPING);
+      return super.visitDescribeSkippingIndexStatement(ctx);
+    }
+
+    @Override
+    public Void visitDescribeMaterializedViewStatement(
+        FlintSparkSqlExtensionsParser.DescribeMaterializedViewStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.DESCRIBE);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.MATERIALIZED_VIEW);
+      indexQueryDetailsBuilder.mvName(ctx.mvName.getText());
+      return super.visitDescribeMaterializedViewStatement(ctx);
+    }
+
+    @Override
+    public Void visitShowCoveringIndexStatement(
+        FlintSparkSqlExtensionsParser.ShowCoveringIndexStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.SHOW);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.COVERING);
+      return super.visitShowCoveringIndexStatement(ctx);
+    }
+
+    @Override
+    public Void visitShowMaterializedViewStatement(
+        FlintSparkSqlExtensionsParser.ShowMaterializedViewStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.SHOW);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.MATERIALIZED_VIEW);
+      return super.visitShowMaterializedViewStatement(ctx);
+    }
+
+    @Override
+    public Void visitRefreshCoveringIndexStatement(
+        FlintSparkSqlExtensionsParser.RefreshCoveringIndexStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.REFRESH);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.COVERING);
+      return super.visitRefreshCoveringIndexStatement(ctx);
+    }
+
+    @Override
+    public Void visitRefreshSkippingIndexStatement(
+        FlintSparkSqlExtensionsParser.RefreshSkippingIndexStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.REFRESH);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.SKIPPING);
+      return super.visitRefreshSkippingIndexStatement(ctx);
+    }
+
+    @Override
+    public Void visitRefreshMaterializedViewStatement(
+        FlintSparkSqlExtensionsParser.RefreshMaterializedViewStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.REFRESH);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.MATERIALIZED_VIEW);
+      indexQueryDetailsBuilder.mvName(ctx.mvName.getText());
+      return super.visitRefreshMaterializedViewStatement(ctx);
+    }
+
+    @Override
+    public Void visitPropertyList(FlintSparkSqlExtensionsParser.PropertyListContext ctx) {
+      FlintIndexOptions flintIndexOptions = new FlintIndexOptions();
+      if (ctx != null) {
+        ctx.property()
+            .forEach(
+                property ->
+                    flintIndexOptions.setOption(
+                        removeUnwantedQuotes(propertyKey(property.key).toLowerCase(Locale.ROOT)),
+                        removeUnwantedQuotes(
+                            propertyValue(property.value).toLowerCase(Locale.ROOT))));
+      }
+      indexQueryDetailsBuilder.indexOptions(flintIndexOptions);
+      return null;
+    }
+
+    @Override
+    public Void visitAlterCoveringIndexStatement(
+        FlintSparkSqlExtensionsParser.AlterCoveringIndexStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.ALTER);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.COVERING);
+      visitPropertyList(ctx.propertyList());
+      return super.visitAlterCoveringIndexStatement(ctx);
+    }
+
+    @Override
+    public Void visitAlterSkippingIndexStatement(
+        FlintSparkSqlExtensionsParser.AlterSkippingIndexStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.ALTER);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.SKIPPING);
+      visitPropertyList(ctx.propertyList());
+      return super.visitAlterSkippingIndexStatement(ctx);
+    }
+
+    @Override
+    public Void visitAlterMaterializedViewStatement(
+        FlintSparkSqlExtensionsParser.AlterMaterializedViewStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.ALTER);
+      indexQueryDetailsBuilder.indexType(FlintIndexType.MATERIALIZED_VIEW);
+      indexQueryDetailsBuilder.mvName(ctx.mvName.getText());
+      visitPropertyList(ctx.propertyList());
+      return super.visitAlterMaterializedViewStatement(ctx);
+    }
+
+    @Override
+    public Void visitMaterializedViewQuery(MaterializedViewQueryContext ctx) {
+      int a = ctx.start.getStartIndex();
+      int b = ctx.stop.getStopIndex();
+      String query = ctx.start.getInputStream().getText(new Interval(a, b));
+      indexQueryDetailsBuilder.mvQuery(query);
+      return super.visitMaterializedViewQuery(ctx);
+    }
+
+    @Override
+    public Void visitRecoverIndexJobStatement(RecoverIndexJobStatementContext ctx) {
+      indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.RECOVER);
+      return super.visitRecoverIndexJobStatement(ctx);
+    }
+
+    private String propertyKey(FlintSparkSqlExtensionsParser.PropertyKeyContext key) {
+      if (key.STRING() != null) {
+        return key.STRING().getText();
+      } else {
+        return key.getText();
+      }
+    }
+
+    private String propertyValue(FlintSparkSqlExtensionsParser.PropertyValueContext value) {
+      if (value.STRING() != null) {
+        return value.STRING().getText();
+      } else if (value.booleanValue() != null) {
+        return value.getText();
+      } else {
+        return value.getText();
+      }
+    }
+
+    // TODO: Currently escaping is handled partially.
+    // Full implementation should mirror this:
+    // https://github.com/apache/spark/blob/v3.5.0/sql/api/src/main/scala/org/apache/spark/sql/catalyst/util/SparkParserUtils.scala#L35
+    public String removeUnwantedQuotes(String input) {
+      return input.replaceAll("^\"|\"$", "");
+    }
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/utils/TimeProvider.java b/async-query-core/src/main/java/org/opensearch/sql/spark/utils/TimeProvider.java
new file mode 100644
index 0000000000..13628af579
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/utils/TimeProvider.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.utils;
+
+public interface TimeProvider {
+  long currentEpochMillis();
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/DefaultGrammarElementValidator.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/DefaultGrammarElementValidator.java
new file mode 100644
index 0000000000..ddd0a1d094
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/DefaultGrammarElementValidator.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+public class DefaultGrammarElementValidator implements GrammarElementValidator {
+  @Override
+  public boolean isValid(GrammarElement element) {
+    return true;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/DenyListGrammarElementValidator.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/DenyListGrammarElementValidator.java
new file mode 100644
index 0000000000..514e2c8ad8
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/DenyListGrammarElementValidator.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+import java.util.Set;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class DenyListGrammarElementValidator implements GrammarElementValidator {
+  private final Set<GrammarElement> denyList;
+
+  @Override
+  public boolean isValid(GrammarElement element) {
+    return !denyList.contains(element);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/FunctionType.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/FunctionType.java
new file mode 100644
index 0000000000..da3760efd6
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/FunctionType.java
@@ -0,0 +1,436 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
+
+/**
+ * Enum for defining and looking up SQL function type based on its name. Unknown one will be
+ * considered as UDF (User Defined Function)
+ */
+@AllArgsConstructor
+public enum FunctionType {
+  AGGREGATE("Aggregate"),
+  WINDOW("Window"),
+  ARRAY("Array"),
+  MAP("Map"),
+  DATE_TIMESTAMP("Date and Timestamp"),
+  JSON("JSON"),
+  MATH("Math"),
+  STRING("String"),
+  CONDITIONAL("Conditional"),
+  BITWISE("Bitwise"),
+  CONVERSION("Conversion"),
+  PREDICATE("Predicate"),
+  CSV("CSV"),
+  MISC("Misc"),
+  GENERATOR("Generator"),
+  UDF("User Defined Function");
+
+  private final String name;
+
+  private static final Map<FunctionType, Set<String>> FUNCTION_TYPE_TO_FUNCTION_NAMES_MAP =
+      ImmutableMap.<FunctionType, Set<String>>builder()
+          .put(
+              AGGREGATE,
+              Set.of(
+                  "any",
+                  "any_value",
+                  "approx_count_distinct",
+                  "approx_percentile",
+                  "array_agg",
+                  "avg",
+                  "bit_and",
+                  "bit_or",
+                  "bit_xor",
+                  "bitmap_construct_agg",
+                  "bitmap_or_agg",
+                  "bool_and",
+                  "bool_or",
+                  "collect_list",
+                  "collect_set",
+                  "corr",
+                  "count",
+                  "count_if",
+                  "count_min_sketch",
+                  "covar_pop",
+                  "covar_samp",
+                  "every",
+                  "first",
+                  "first_value",
+                  "grouping",
+                  "grouping_id",
+                  "histogram_numeric",
+                  "hll_sketch_agg",
+                  "hll_union_agg",
+                  "kurtosis",
+                  "last",
+                  "last_value",
+                  "max",
+                  "max_by",
+                  "mean",
+                  "median",
+                  "min",
+                  "min_by",
+                  "mode",
+                  "percentile",
+                  "percentile_approx",
+                  "regr_avgx",
+                  "regr_avgy",
+                  "regr_count",
+                  "regr_intercept",
+                  "regr_r2",
+                  "regr_slope",
+                  "regr_sxx",
+                  "regr_sxy",
+                  "regr_syy",
+                  "skewness",
+                  "some",
+                  "std",
+                  "stddev",
+                  "stddev_pop",
+                  "stddev_samp",
+                  "sum",
+                  "try_avg",
+                  "try_sum",
+                  "var_pop",
+                  "var_samp",
+                  "variance"))
+          .put(
+              WINDOW,
+              Set.of(
+                  "cume_dist",
+                  "dense_rank",
+                  "lag",
+                  "lead",
+                  "nth_value",
+                  "ntile",
+                  "percent_rank",
+                  "rank",
+                  "row_number"))
+          .put(
+              ARRAY,
+              Set.of(
+                  "array",
+                  "array_append",
+                  "array_compact",
+                  "array_contains",
+                  "array_distinct",
+                  "array_except",
+                  "array_insert",
+                  "array_intersect",
+                  "array_join",
+                  "array_max",
+                  "array_min",
+                  "array_position",
+                  "array_prepend",
+                  "array_remove",
+                  "array_repeat",
+                  "array_union",
+                  "arrays_overlap",
+                  "arrays_zip",
+                  "flatten",
+                  "get",
+                  "sequence",
+                  "shuffle",
+                  "slice",
+                  "sort_array"))
+          .put(
+              MAP,
+              Set.of(
+                  "element_at",
+                  "map",
+                  "map_concat",
+                  "map_contains_key",
+                  "map_entries",
+                  "map_from_arrays",
+                  "map_from_entries",
+                  "map_keys",
+                  "map_values",
+                  "str_to_map",
+                  "try_element_at"))
+          .put(
+              DATE_TIMESTAMP,
+              Set.of(
+                  "add_months",
+                  "convert_timezone",
+                  "curdate",
+                  "current_date",
+                  "current_timestamp",
+                  "current_timezone",
+                  "date_add",
+                  "date_diff",
+                  "date_format",
+                  "date_from_unix_date",
+                  "date_part",
+                  "date_sub",
+                  "date_trunc",
+                  "dateadd",
+                  "datediff",
+                  "datepart",
+                  "day",
+                  "dayofmonth",
+                  "dayofweek",
+                  "dayofyear",
+                  "extract",
+                  "from_unixtime",
+                  "from_utc_timestamp",
+                  "hour",
+                  "last_day",
+                  "localtimestamp",
+                  "make_date",
+                  "make_dt_interval",
+                  "make_interval",
+                  "make_timestamp",
+                  "make_timestamp_ltz",
+                  "make_timestamp_ntz",
+                  "make_ym_interval",
+                  "minute",
+                  "month",
+                  "months_between",
+                  "next_day",
+                  "now",
+                  "quarter",
+                  "second",
+                  "session_window",
+                  "timestamp_micros",
+                  "timestamp_millis",
+                  "timestamp_seconds",
+                  "to_date",
+                  "to_timestamp",
+                  "to_timestamp_ltz",
+                  "to_timestamp_ntz",
+                  "to_unix_timestamp",
+                  "to_utc_timestamp",
+                  "trunc",
+                  "try_to_timestamp",
+                  "unix_date",
+                  "unix_micros",
+                  "unix_millis",
+                  "unix_seconds",
+                  "unix_timestamp",
+                  "weekday",
+                  "weekofyear",
+                  "window",
+                  "window_time",
+                  "year"))
+          .put(
+              JSON,
+              Set.of(
+                  "from_json",
+                  "get_json_object",
+                  "json_array_length",
+                  "json_object_keys",
+                  "json_tuple",
+                  "schema_of_json",
+                  "to_json"))
+          .put(
+              MATH,
+              Set.of(
+                  "abs",
+                  "acos",
+                  "acosh",
+                  "asin",
+                  "asinh",
+                  "atan",
+                  "atan2",
+                  "atanh",
+                  "bin",
+                  "bround",
+                  "cbrt",
+                  "ceil",
+                  "ceiling",
+                  "conv",
+                  "cos",
+                  "cosh",
+                  "cot",
+                  "csc",
+                  "degrees",
+                  "e",
+                  "exp",
+                  "expm1",
+                  "factorial",
+                  "floor",
+                  "greatest",
+                  "hex",
+                  "hypot",
+                  "least",
+                  "ln",
+                  "log",
+                  "log10",
+                  "log1p",
+                  "log2",
+                  "negative",
+                  "pi",
+                  "pmod",
+                  "positive",
+                  "pow",
+                  "power",
+                  "radians",
+                  "rand",
+                  "randn",
+                  "random",
+                  "rint",
+                  "round",
+                  "sec",
+                  "shiftleft",
+                  "sign",
+                  "signum",
+                  "sin",
+                  "sinh",
+                  "sqrt",
+                  "tan",
+                  "tanh",
+                  "try_add",
+                  "try_divide",
+                  "try_multiply",
+                  "try_subtract",
+                  "unhex",
+                  "width_bucket"))
+          .put(
+              STRING,
+              Set.of(
+                  "ascii",
+                  "base64",
+                  "bit_length",
+                  "btrim",
+                  "char",
+                  "char_length",
+                  "character_length",
+                  "chr",
+                  "concat",
+                  "concat_ws",
+                  "contains",
+                  "decode",
+                  "elt",
+                  "encode",
+                  "endswith",
+                  "find_in_set",
+                  "format_number",
+                  "format_string",
+                  "initcap",
+                  "instr",
+                  "lcase",
+                  "left",
+                  "len",
+                  "length",
+                  "levenshtein",
+                  "locate",
+                  "lower",
+                  "lpad",
+                  "ltrim",
+                  "luhn_check",
+                  "mask",
+                  "octet_length",
+                  "overlay",
+                  "position",
+                  "printf",
+                  "regexp_count",
+                  "regexp_extract",
+                  "regexp_extract_all",
+                  "regexp_instr",
+                  "regexp_replace",
+                  "regexp_substr",
+                  "repeat",
+                  "replace",
+                  "right",
+                  "rpad",
+                  "rtrim",
+                  "sentences",
+                  "soundex",
+                  "space",
+                  "split",
+                  "split_part",
+                  "startswith",
+                  "substr",
+                  "substring",
+                  "substring_index",
+                  "to_binary",
+                  "to_char",
+                  "to_number",
+                  "to_varchar",
+                  "translate",
+                  "trim",
+                  "try_to_binary",
+                  "try_to_number",
+                  "ucase",
+                  "unbase64",
+                  "upper"))
+          .put(CONDITIONAL, Set.of("coalesce", "if", "ifnull", "nanvl", "nullif", "nvl", "nvl2"))
+          .put(
+              BITWISE, Set.of("bit_count", "bit_get", "getbit", "shiftright", "shiftrightunsigned"))
+          .put(
+              CONVERSION,
+              Set.of(
+                  "bigint",
+                  "binary",
+                  "boolean",
+                  "cast",
+                  "date",
+                  "decimal",
+                  "double",
+                  "float",
+                  "int",
+                  "smallint",
+                  "string",
+                  "timestamp",
+                  "tinyint"))
+          .put(PREDICATE, Set.of("isnan", "isnotnull", "isnull", "regexp", "regexp_like", "rlike"))
+          .put(CSV, Set.of("from_csv", "schema_of_csv", "to_csv"))
+          .put(
+              MISC,
+              Set.of(
+                  "aes_decrypt",
+                  "aes_encrypt",
+                  "assert_true",
+                  "bitmap_bit_position",
+                  "bitmap_bucket_number",
+                  "bitmap_count",
+                  "current_catalog",
+                  "current_database",
+                  "current_schema",
+                  "current_user",
+                  "equal_null",
+                  "hll_sketch_estimate",
+                  "hll_union",
+                  "input_file_block_length",
+                  "input_file_block_start",
+                  "input_file_name",
+                  "java_method",
+                  "monotonically_increasing_id",
+                  "reflect",
+                  "spark_partition_id",
+                  "try_aes_decrypt",
+                  "typeof",
+                  "user",
+                  "uuid",
+                  "version"))
+          .put(
+              GENERATOR,
+              Set.of(
+                  "explode",
+                  "explode_outer",
+                  "inline",
+                  "inline_outer",
+                  "posexplode",
+                  "posexplode_outer",
+                  "stack"))
+          .build();
+
+  private static final Map<String, FunctionType> FUNCTION_NAME_TO_FUNCTION_TYPE_MAP =
+      FUNCTION_TYPE_TO_FUNCTION_NAMES_MAP.entrySet().stream()
+          .flatMap(
+              entry -> entry.getValue().stream().map(value -> Map.entry(value, entry.getKey())))
+          .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+  public static FunctionType fromFunctionName(String functionName) {
+    return FUNCTION_NAME_TO_FUNCTION_TYPE_MAP.getOrDefault(functionName.toLowerCase(), UDF);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/GrammarElement.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/GrammarElement.java
new file mode 100644
index 0000000000..217640bada
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/GrammarElement.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+enum GrammarElement {
+  ALTER_NAMESPACE("ALTER (DATABASE|TABLE|NAMESPACE)"),
+  ALTER_VIEW("ALTER VIEW"),
+  CREATE_NAMESPACE("CREATE (DATABASE|TABLE|NAMESPACE)"),
+  CREATE_FUNCTION("CREATE FUNCTION"),
+  CREATE_VIEW("CREATE VIEW"),
+  DROP_NAMESPACE("DROP (DATABASE|TABLE|NAMESPACE)"),
+  DROP_FUNCTION("DROP FUNCTION"),
+  DROP_VIEW("DROP VIEW"),
+  DROP_TABLE("DROP TABLE"),
+  REPAIR_TABLE("REPAIR TABLE"),
+  TRUNCATE_TABLE("TRUNCATE TABLE"),
+  // DML Statements
+  INSERT("INSERT"),
+  LOAD("LOAD"),
+
+  // Data Retrieval Statements
+  EXPLAIN("EXPLAIN"),
+  WITH("WITH"),
+  CLUSTER_BY("CLUSTER BY"),
+  DISTRIBUTE_BY("DISTRIBUTE BY"),
+  //  GROUP_BY("GROUP BY"),
+  //  HAVING("HAVING"),
+  HINTS("HINTS"),
+  INLINE_TABLE("Inline Table(VALUES)"),
+  FILE("File"),
+  INNER_JOIN("INNER JOIN"),
+  CROSS_JOIN("CROSS JOIN"),
+  LEFT_OUTER_JOIN("LEFT OUTER JOIN"),
+  LEFT_SEMI_JOIN("LEFT SEMI JOIN"),
+  RIGHT_OUTER_JOIN("RIGHT OUTER JOIN"),
+  FULL_OUTER_JOIN("FULL OUTER JOIN"),
+  LEFT_ANTI_JOIN("LEFT ANTI JOIN"),
+  TABLESAMPLE("TABLESAMPLE"),
+  TABLE_VALUED_FUNCTION("Table-valued function"),
+  LATERAL_VIEW("LATERAL VIEW"),
+  LATERAL_SUBQUERY("LATERAL SUBQUERY"),
+  TRANSFORM("TRANSFORM"),
+
+  // Auxiliary Statements
+  MANAGE_RESOURCE("Resource management statements"),
+  ANALYZE_TABLE("ANALYZE TABLE(S)"),
+  CACHE_TABLE("CACHE TABLE"),
+  CLEAR_CACHE("CLEAR CACHE"),
+  DESCRIBE_NAMESPACE("DESCRIBE (NAMESPACE|DATABASE|SCHEMA)"),
+  DESCRIBE_FUNCTION("DESCRIBE FUNCTION"),
+  DESCRIBE_QUERY("DESCRIBE QUERY"),
+  DESCRIBE_TABLE("DESCRIBE TABLE"),
+  REFRESH_RESOURCE("REFRESH"),
+  REFRESH_TABLE("REFRESH TABLE"),
+  REFRESH_FUNCTION("REFRESH FUNCTION"),
+  RESET("RESET"),
+  SET("SET"),
+  SHOW_COLUMNS("SHOW COLUMNS"),
+  SHOW_CREATE_TABLE("SHOW CREATE TABLE"),
+  SHOW_NAMESPACES("SHOW (DATABASES|SCHEMAS)"),
+  SHOW_FUNCTIONS("SHOW FUNCTIONS"),
+  SHOW_PARTITIONS("SHOW PARTITIONS"),
+  SHOW_TABLE_EXTENDED("SHOW TABLE EXTENDED"),
+  SHOW_TABLES("SHOW TABLES"),
+  SHOW_TBLPROPERTIES("SHOW TBLPROPERTIES"),
+  SHOW_VIEWS("SHOW VIEWS"),
+  UNCACHE_TABLE("UNCACHE TABLE"),
+
+  // Functions
+  MAP_FUNCTIONS("Map functions"),
+  CSV_FUNCTIONS("CSV functions"),
+  MISC_FUNCTIONS("Misc functions"),
+
+  // UDF
+  UDF("User Defined functions");
+
+  String description;
+
+  @Override
+  public String toString() {
+    return description;
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/GrammarElementValidator.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/GrammarElementValidator.java
new file mode 100644
index 0000000000..cc49643772
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/GrammarElementValidator.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+/** Interface for validator to decide if each GrammarElement is valid or not. */
+public interface GrammarElementValidator {
+
+  /**
+   * @return true if element is valid (accepted)
+   */
+  boolean isValid(GrammarElement element);
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/GrammarElementValidatorProvider.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/GrammarElementValidatorProvider.java
new file mode 100644
index 0000000000..9755a1c0b6
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/GrammarElementValidatorProvider.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+import java.util.Map;
+import lombok.AllArgsConstructor;
+import org.opensearch.sql.datasource.model.DataSourceType;
+
+/** Provides GrammarElementValidator based on DataSourceType. */
+@AllArgsConstructor
+public class GrammarElementValidatorProvider {
+
+  private final Map<DataSourceType, GrammarElementValidator> validatorMap;
+  private final GrammarElementValidator defaultValidator;
+
+  public GrammarElementValidator getValidatorForDatasource(DataSourceType dataSourceType) {
+    return validatorMap.getOrDefault(dataSourceType, defaultValidator);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/S3GlueGrammarElementValidator.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/S3GlueGrammarElementValidator.java
new file mode 100644
index 0000000000..e7a0ce1b36
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/S3GlueGrammarElementValidator.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+import static org.opensearch.sql.spark.validator.GrammarElement.ALTER_VIEW;
+import static org.opensearch.sql.spark.validator.GrammarElement.CLUSTER_BY;
+import static org.opensearch.sql.spark.validator.GrammarElement.CREATE_FUNCTION;
+import static org.opensearch.sql.spark.validator.GrammarElement.CREATE_VIEW;
+import static org.opensearch.sql.spark.validator.GrammarElement.DESCRIBE_FUNCTION;
+import static org.opensearch.sql.spark.validator.GrammarElement.DISTRIBUTE_BY;
+import static org.opensearch.sql.spark.validator.GrammarElement.DROP_FUNCTION;
+import static org.opensearch.sql.spark.validator.GrammarElement.DROP_VIEW;
+import static org.opensearch.sql.spark.validator.GrammarElement.FILE;
+import static org.opensearch.sql.spark.validator.GrammarElement.HINTS;
+import static org.opensearch.sql.spark.validator.GrammarElement.INLINE_TABLE;
+import static org.opensearch.sql.spark.validator.GrammarElement.INSERT;
+import static org.opensearch.sql.spark.validator.GrammarElement.LOAD;
+import static org.opensearch.sql.spark.validator.GrammarElement.MANAGE_RESOURCE;
+import static org.opensearch.sql.spark.validator.GrammarElement.MISC_FUNCTIONS;
+import static org.opensearch.sql.spark.validator.GrammarElement.REFRESH_FUNCTION;
+import static org.opensearch.sql.spark.validator.GrammarElement.REFRESH_RESOURCE;
+import static org.opensearch.sql.spark.validator.GrammarElement.RESET;
+import static org.opensearch.sql.spark.validator.GrammarElement.SET;
+import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_FUNCTIONS;
+import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_VIEWS;
+import static org.opensearch.sql.spark.validator.GrammarElement.TABLESAMPLE;
+import static org.opensearch.sql.spark.validator.GrammarElement.TABLE_VALUED_FUNCTION;
+import static org.opensearch.sql.spark.validator.GrammarElement.TRANSFORM;
+import static org.opensearch.sql.spark.validator.GrammarElement.UDF;
+
+import com.google.common.collect.ImmutableSet;
+import java.util.Set;
+
+public class S3GlueGrammarElementValidator extends DenyListGrammarElementValidator {
+  private static final Set<GrammarElement> S3GLUE_DENY_LIST =
+      ImmutableSet.<GrammarElement>builder()
+          .add(
+              ALTER_VIEW,
+              CREATE_FUNCTION,
+              CREATE_VIEW,
+              DROP_FUNCTION,
+              DROP_VIEW,
+              INSERT,
+              LOAD,
+              CLUSTER_BY,
+              DISTRIBUTE_BY,
+              HINTS,
+              INLINE_TABLE,
+              FILE,
+              TABLESAMPLE,
+              TABLE_VALUED_FUNCTION,
+              TRANSFORM,
+              MANAGE_RESOURCE,
+              DESCRIBE_FUNCTION,
+              REFRESH_RESOURCE,
+              REFRESH_FUNCTION,
+              RESET,
+              SET,
+              SHOW_FUNCTIONS,
+              SHOW_VIEWS,
+              MISC_FUNCTIONS,
+              UDF)
+          .build();
+
+  public S3GlueGrammarElementValidator() {
+    super(S3GLUE_DENY_LIST);
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SQLQueryValidationVisitor.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SQLQueryValidationVisitor.java
new file mode 100644
index 0000000000..9ec0fb0109
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SQLQueryValidationVisitor.java
@@ -0,0 +1,609 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+import lombok.AllArgsConstructor;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AddTableColumnsContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AddTablePartitionContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AlterClusterByContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AlterTableAlterColumnContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AlterViewQueryContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AlterViewSchemaBindingContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AnalyzeContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.AnalyzeTablesContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.CacheTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ClearCacheContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ClusterBySpecContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.CreateNamespaceContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.CreateTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.CreateTableLikeContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.CreateViewContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.CtesContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.DescribeFunctionContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.DescribeNamespaceContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.DescribeQueryContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.DescribeRelationContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.DropFunctionContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.DropNamespaceContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.DropTableColumnsContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.DropTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.DropTablePartitionsContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.DropViewContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ExplainContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.FunctionNameContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.HintContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.HiveReplaceColumnsContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.InlineTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.InsertIntoReplaceWhereContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.InsertIntoTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.InsertOverwriteDirContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.InsertOverwriteHiveDirContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.InsertOverwriteTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.JoinRelationContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.JoinTypeContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.LateralViewContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.LoadDataContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ManageResourceContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.QueryOrganizationContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.RecoverPartitionsContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.RefreshFunctionContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.RefreshResourceContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.RefreshTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.RelationContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.RenameTableColumnContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.RenameTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.RenameTablePartitionContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.RepairTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ReplaceTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ResetConfigurationContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ResetQuotedConfigurationContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.SampleContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.SetConfigurationContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.SetNamespaceLocationContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.SetNamespacePropertiesContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.SetTableLocationContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.SetTableSerDeContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ShowColumnsContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ShowCreateTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ShowFunctionsContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ShowNamespacesContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ShowPartitionsContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ShowTableExtendedContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ShowTablesContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ShowTblPropertiesContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.ShowViewsContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.TableNameContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.TableValuedFunctionContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.TransformClauseContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.TruncateTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.UncacheTableContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.UnsetNamespacePropertiesContext;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParserBaseVisitor;
+
+/** This visitor validate grammar using GrammarElementValidator */
+@AllArgsConstructor
+public class SQLQueryValidationVisitor extends SqlBaseParserBaseVisitor<Void> {
+  private final GrammarElementValidator grammarElementValidator;
+
+  @Override
+  public Void visitCreateFunction(SqlBaseParser.CreateFunctionContext ctx) {
+    validateAllowed(GrammarElement.CREATE_FUNCTION);
+    return super.visitCreateFunction(ctx);
+  }
+
+  @Override
+  public Void visitSetNamespaceProperties(SetNamespacePropertiesContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitSetNamespaceProperties(ctx);
+  }
+
+  @Override
+  public Void visitUnsetNamespaceProperties(UnsetNamespacePropertiesContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitUnsetNamespaceProperties(ctx);
+  }
+
+  @Override
+  public Void visitAddTableColumns(AddTableColumnsContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitAddTableColumns(ctx);
+  }
+
+  @Override
+  public Void visitAddTablePartition(AddTablePartitionContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitAddTablePartition(ctx);
+  }
+
+  @Override
+  public Void visitRenameTableColumn(RenameTableColumnContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitRenameTableColumn(ctx);
+  }
+
+  @Override
+  public Void visitDropTableColumns(DropTableColumnsContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitDropTableColumns(ctx);
+  }
+
+  @Override
+  public Void visitAlterTableAlterColumn(AlterTableAlterColumnContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitAlterTableAlterColumn(ctx);
+  }
+
+  @Override
+  public Void visitHiveReplaceColumns(HiveReplaceColumnsContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitHiveReplaceColumns(ctx);
+  }
+
+  @Override
+  public Void visitSetTableSerDe(SetTableSerDeContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitSetTableSerDe(ctx);
+  }
+
+  @Override
+  public Void visitRenameTablePartition(RenameTablePartitionContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitRenameTablePartition(ctx);
+  }
+
+  @Override
+  public Void visitDropTablePartitions(DropTablePartitionsContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitDropTablePartitions(ctx);
+  }
+
+  @Override
+  public Void visitSetTableLocation(SetTableLocationContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitSetTableLocation(ctx);
+  }
+
+  @Override
+  public Void visitRecoverPartitions(RecoverPartitionsContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitRecoverPartitions(ctx);
+  }
+
+  @Override
+  public Void visitAlterClusterBy(AlterClusterByContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitAlterClusterBy(ctx);
+  }
+
+  @Override
+  public Void visitSetNamespaceLocation(SetNamespaceLocationContext ctx) {
+    validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    return super.visitSetNamespaceLocation(ctx);
+  }
+
+  @Override
+  public Void visitAlterViewQuery(AlterViewQueryContext ctx) {
+    validateAllowed(GrammarElement.ALTER_VIEW);
+    return super.visitAlterViewQuery(ctx);
+  }
+
+  @Override
+  public Void visitAlterViewSchemaBinding(AlterViewSchemaBindingContext ctx) {
+    validateAllowed(GrammarElement.ALTER_VIEW);
+    return super.visitAlterViewSchemaBinding(ctx);
+  }
+
+  @Override
+  public Void visitRenameTable(RenameTableContext ctx) {
+    if (ctx.VIEW() != null) {
+      validateAllowed(GrammarElement.ALTER_VIEW);
+    } else {
+      validateAllowed(GrammarElement.ALTER_NAMESPACE);
+    }
+
+    return super.visitRenameTable(ctx);
+  }
+
+  @Override
+  public Void visitCreateNamespace(CreateNamespaceContext ctx) {
+    validateAllowed(GrammarElement.CREATE_NAMESPACE);
+    return super.visitCreateNamespace(ctx);
+  }
+
+  @Override
+  public Void visitCreateTable(CreateTableContext ctx) {
+    validateAllowed(GrammarElement.CREATE_NAMESPACE);
+    return super.visitCreateTable(ctx);
+  }
+
+  @Override
+  public Void visitCreateTableLike(CreateTableLikeContext ctx) {
+    validateAllowed(GrammarElement.CREATE_NAMESPACE);
+    return super.visitCreateTableLike(ctx);
+  }
+
+  @Override
+  public Void visitReplaceTable(ReplaceTableContext ctx) {
+    validateAllowed(GrammarElement.CREATE_NAMESPACE);
+    return super.visitReplaceTable(ctx);
+  }
+
+  @Override
+  public Void visitDropNamespace(DropNamespaceContext ctx) {
+    validateAllowed(GrammarElement.DROP_NAMESPACE);
+    return super.visitDropNamespace(ctx);
+  }
+
+  @Override
+  public Void visitDropTable(DropTableContext ctx) {
+    validateAllowed(GrammarElement.DROP_NAMESPACE);
+    return super.visitDropTable(ctx);
+  }
+
+  @Override
+  public Void visitCreateView(CreateViewContext ctx) {
+    validateAllowed(GrammarElement.CREATE_VIEW);
+    return super.visitCreateView(ctx);
+  }
+
+  @Override
+  public Void visitDropView(DropViewContext ctx) {
+    validateAllowed(GrammarElement.DROP_VIEW);
+    return super.visitDropView(ctx);
+  }
+
+  @Override
+  public Void visitDropFunction(DropFunctionContext ctx) {
+    validateAllowed(GrammarElement.DROP_FUNCTION);
+    return super.visitDropFunction(ctx);
+  }
+
+  @Override
+  public Void visitRepairTable(RepairTableContext ctx) {
+    validateAllowed(GrammarElement.REPAIR_TABLE);
+    return super.visitRepairTable(ctx);
+  }
+
+  @Override
+  public Void visitTruncateTable(TruncateTableContext ctx) {
+    validateAllowed(GrammarElement.TRUNCATE_TABLE);
+    return super.visitTruncateTable(ctx);
+  }
+
+  @Override
+  public Void visitInsertOverwriteTable(InsertOverwriteTableContext ctx) {
+    validateAllowed(GrammarElement.INSERT);
+    return super.visitInsertOverwriteTable(ctx);
+  }
+
+  @Override
+  public Void visitInsertIntoReplaceWhere(InsertIntoReplaceWhereContext ctx) {
+    validateAllowed(GrammarElement.INSERT);
+    return super.visitInsertIntoReplaceWhere(ctx);
+  }
+
+  @Override
+  public Void visitInsertIntoTable(InsertIntoTableContext ctx) {
+    validateAllowed(GrammarElement.INSERT);
+    return super.visitInsertIntoTable(ctx);
+  }
+
+  @Override
+  public Void visitInsertOverwriteDir(InsertOverwriteDirContext ctx) {
+    validateAllowed(GrammarElement.INSERT);
+    return super.visitInsertOverwriteDir(ctx);
+  }
+
+  @Override
+  public Void visitInsertOverwriteHiveDir(InsertOverwriteHiveDirContext ctx) {
+    validateAllowed(GrammarElement.INSERT);
+    return super.visitInsertOverwriteHiveDir(ctx);
+  }
+
+  @Override
+  public Void visitLoadData(LoadDataContext ctx) {
+    validateAllowed(GrammarElement.LOAD);
+    return super.visitLoadData(ctx);
+  }
+
+  @Override
+  public Void visitExplain(ExplainContext ctx) {
+    validateAllowed(GrammarElement.EXPLAIN);
+    return super.visitExplain(ctx);
+  }
+
+  @Override
+  public Void visitTableName(TableNameContext ctx) {
+    String reference = ctx.identifierReference().getText();
+    if (isFileReference(reference)) {
+      validateAllowed(GrammarElement.FILE);
+    }
+    return super.visitTableName(ctx);
+  }
+
+  private static final String FILE_REFERENCE_PATTERN = "^[a-zA-Z]+\\.`[^`]+`$";
+
+  private boolean isFileReference(String reference) {
+    return reference.matches(FILE_REFERENCE_PATTERN);
+  }
+
+  @Override
+  public Void visitCtes(CtesContext ctx) {
+    validateAllowed(GrammarElement.WITH);
+    return super.visitCtes(ctx);
+  }
+
+  @Override
+  public Void visitClusterBySpec(ClusterBySpecContext ctx) {
+    validateAllowed(GrammarElement.CLUSTER_BY);
+    return super.visitClusterBySpec(ctx);
+  }
+
+  @Override
+  public Void visitQueryOrganization(QueryOrganizationContext ctx) {
+    if (ctx.CLUSTER() != null) {
+      validateAllowed(GrammarElement.CLUSTER_BY);
+    } else if (ctx.DISTRIBUTE() != null) {
+      validateAllowed(GrammarElement.DISTRIBUTE_BY);
+    }
+    return super.visitQueryOrganization(ctx);
+  }
+
+  @Override
+  public Void visitHint(HintContext ctx) {
+    validateAllowed(GrammarElement.HINTS);
+    return super.visitHint(ctx);
+  }
+
+  @Override
+  public Void visitInlineTable(InlineTableContext ctx) {
+    validateAllowed(GrammarElement.INLINE_TABLE);
+    return super.visitInlineTable(ctx);
+  }
+
+  @Override
+  public Void visitJoinType(JoinTypeContext ctx) {
+    if (ctx.CROSS() != null) {
+      validateAllowed(GrammarElement.CROSS_JOIN);
+    } else if (ctx.LEFT() != null && ctx.SEMI() != null) {
+      validateAllowed(GrammarElement.LEFT_SEMI_JOIN);
+    } else if (ctx.ANTI() != null) {
+      validateAllowed(GrammarElement.LEFT_ANTI_JOIN);
+    } else if (ctx.LEFT() != null) {
+      validateAllowed(GrammarElement.LEFT_OUTER_JOIN);
+    } else if (ctx.RIGHT() != null) {
+      validateAllowed(GrammarElement.RIGHT_OUTER_JOIN);
+    } else if (ctx.FULL() != null) {
+      validateAllowed(GrammarElement.FULL_OUTER_JOIN);
+    } else {
+      validateAllowed(GrammarElement.INNER_JOIN);
+    }
+    return super.visitJoinType(ctx);
+  }
+
+  @Override
+  public Void visitSample(SampleContext ctx) {
+    validateAllowed(GrammarElement.TABLESAMPLE);
+    return super.visitSample(ctx);
+  }
+
+  @Override
+  public Void visitTableValuedFunction(TableValuedFunctionContext ctx) {
+    validateAllowed(GrammarElement.TABLE_VALUED_FUNCTION);
+    return super.visitTableValuedFunction(ctx);
+  }
+
+  @Override
+  public Void visitLateralView(LateralViewContext ctx) {
+    validateAllowed(GrammarElement.LATERAL_VIEW);
+    return super.visitLateralView(ctx);
+  }
+
+  @Override
+  public Void visitRelation(RelationContext ctx) {
+    if (ctx.LATERAL() != null) {
+      validateAllowed(GrammarElement.LATERAL_SUBQUERY);
+    }
+    return super.visitRelation(ctx);
+  }
+
+  @Override
+  public Void visitJoinRelation(JoinRelationContext ctx) {
+    if (ctx.LATERAL() != null) {
+      validateAllowed(GrammarElement.LATERAL_SUBQUERY);
+    }
+    return super.visitJoinRelation(ctx);
+  }
+
+  @Override
+  public Void visitTransformClause(TransformClauseContext ctx) {
+    if (ctx.TRANSFORM() != null) {
+      validateAllowed(GrammarElement.TRANSFORM);
+    }
+    return super.visitTransformClause(ctx);
+  }
+
+  @Override
+  public Void visitManageResource(ManageResourceContext ctx) {
+    validateAllowed(GrammarElement.MANAGE_RESOURCE);
+    return super.visitManageResource(ctx);
+  }
+
+  @Override
+  public Void visitAnalyze(AnalyzeContext ctx) {
+    validateAllowed(GrammarElement.ANALYZE_TABLE);
+    return super.visitAnalyze(ctx);
+  }
+
+  @Override
+  public Void visitAnalyzeTables(AnalyzeTablesContext ctx) {
+    validateAllowed(GrammarElement.ANALYZE_TABLE);
+    return super.visitAnalyzeTables(ctx);
+  }
+
+  @Override
+  public Void visitCacheTable(CacheTableContext ctx) {
+    validateAllowed(GrammarElement.CACHE_TABLE);
+    return super.visitCacheTable(ctx);
+  }
+
+  @Override
+  public Void visitClearCache(ClearCacheContext ctx) {
+    validateAllowed(GrammarElement.CLEAR_CACHE);
+    return super.visitClearCache(ctx);
+  }
+
+  @Override
+  public Void visitDescribeNamespace(DescribeNamespaceContext ctx) {
+    validateAllowed(GrammarElement.DESCRIBE_NAMESPACE);
+    return super.visitDescribeNamespace(ctx);
+  }
+
+  @Override
+  public Void visitDescribeFunction(DescribeFunctionContext ctx) {
+    validateAllowed(GrammarElement.DESCRIBE_FUNCTION);
+    return super.visitDescribeFunction(ctx);
+  }
+
+  @Override
+  public Void visitDescribeRelation(DescribeRelationContext ctx) {
+    validateAllowed(GrammarElement.DESCRIBE_TABLE);
+    return super.visitDescribeRelation(ctx);
+  }
+
+  @Override
+  public Void visitDescribeQuery(DescribeQueryContext ctx) {
+    validateAllowed(GrammarElement.DESCRIBE_QUERY);
+    return super.visitDescribeQuery(ctx);
+  }
+
+  @Override
+  public Void visitRefreshResource(RefreshResourceContext ctx) {
+    validateAllowed(GrammarElement.REFRESH_RESOURCE);
+    return super.visitRefreshResource(ctx);
+  }
+
+  @Override
+  public Void visitRefreshTable(RefreshTableContext ctx) {
+    validateAllowed(GrammarElement.REFRESH_TABLE);
+    return super.visitRefreshTable(ctx);
+  }
+
+  @Override
+  public Void visitRefreshFunction(RefreshFunctionContext ctx) {
+    validateAllowed(GrammarElement.REFRESH_FUNCTION);
+    return super.visitRefreshFunction(ctx);
+  }
+
+  @Override
+  public Void visitResetConfiguration(ResetConfigurationContext ctx) {
+    validateAllowed(GrammarElement.RESET);
+    return super.visitResetConfiguration(ctx);
+  }
+
+  @Override
+  public Void visitResetQuotedConfiguration(ResetQuotedConfigurationContext ctx) {
+    validateAllowed(GrammarElement.RESET);
+    return super.visitResetQuotedConfiguration(ctx);
+  }
+
+  @Override
+  public Void visitSetConfiguration(SetConfigurationContext ctx) {
+    validateAllowed(GrammarElement.SET);
+    return super.visitSetConfiguration(ctx);
+  }
+
+  @Override
+  public Void visitShowColumns(ShowColumnsContext ctx) {
+    validateAllowed(GrammarElement.SHOW_COLUMNS);
+    return super.visitShowColumns(ctx);
+  }
+
+  @Override
+  public Void visitShowCreateTable(ShowCreateTableContext ctx) {
+    validateAllowed(GrammarElement.SHOW_CREATE_TABLE);
+    return super.visitShowCreateTable(ctx);
+  }
+
+  @Override
+  public Void visitShowNamespaces(ShowNamespacesContext ctx) {
+    validateAllowed(GrammarElement.SHOW_NAMESPACES);
+    return super.visitShowNamespaces(ctx);
+  }
+
+  @Override
+  public Void visitShowFunctions(ShowFunctionsContext ctx) {
+    validateAllowed(GrammarElement.SHOW_FUNCTIONS);
+    return super.visitShowFunctions(ctx);
+  }
+
+  @Override
+  public Void visitShowPartitions(ShowPartitionsContext ctx) {
+    validateAllowed(GrammarElement.SHOW_PARTITIONS);
+    return super.visitShowPartitions(ctx);
+  }
+
+  @Override
+  public Void visitShowTableExtended(ShowTableExtendedContext ctx) {
+    validateAllowed(GrammarElement.SHOW_TABLE_EXTENDED);
+    return super.visitShowTableExtended(ctx);
+  }
+
+  @Override
+  public Void visitShowTables(ShowTablesContext ctx) {
+    validateAllowed(GrammarElement.SHOW_TABLES);
+    return super.visitShowTables(ctx);
+  }
+
+  @Override
+  public Void visitShowTblProperties(ShowTblPropertiesContext ctx) {
+    validateAllowed(GrammarElement.SHOW_TBLPROPERTIES);
+    return super.visitShowTblProperties(ctx);
+  }
+
+  @Override
+  public Void visitShowViews(ShowViewsContext ctx) {
+    validateAllowed(GrammarElement.SHOW_VIEWS);
+    return super.visitShowViews(ctx);
+  }
+
+  @Override
+  public Void visitUncacheTable(UncacheTableContext ctx) {
+    validateAllowed(GrammarElement.UNCACHE_TABLE);
+    return super.visitUncacheTable(ctx);
+  }
+
+  @Override
+  public Void visitFunctionName(FunctionNameContext ctx) {
+    validateFunctionAllowed(ctx.qualifiedName().getText());
+    return super.visitFunctionName(ctx);
+  }
+
+  private void validateFunctionAllowed(String function) {
+    FunctionType type = FunctionType.fromFunctionName(function.toLowerCase());
+    switch (type) {
+      case MAP:
+        validateAllowed(GrammarElement.MAP_FUNCTIONS);
+        break;
+      case CSV:
+        validateAllowed(GrammarElement.CSV_FUNCTIONS);
+        break;
+      case MISC:
+        validateAllowed(GrammarElement.MISC_FUNCTIONS);
+        break;
+      case UDF:
+        validateAllowed(GrammarElement.UDF);
+        break;
+    }
+  }
+
+  private void validateAllowed(GrammarElement element) {
+    if (!grammarElementValidator.isValid(element)) {
+      throw new IllegalArgumentException(element + " is not allowed.");
+    }
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SQLQueryValidator.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SQLQueryValidator.java
new file mode 100644
index 0000000000..f387cbad25
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SQLQueryValidator.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+import lombok.AllArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.spark.utils.SQLQueryUtils;
+
+/** Validate input SQL query based on the DataSourceType. */
+@AllArgsConstructor
+public class SQLQueryValidator {
+  private static final Logger log = LogManager.getLogger(SQLQueryValidator.class);
+
+  private final GrammarElementValidatorProvider grammarElementValidatorProvider;
+
+  /**
+   * It will look up validator associated with the DataSourceType, and throw
+   * IllegalArgumentException if invalid grammar element is found.
+   *
+   * @param sqlQuery The query to be validated
+   * @param datasourceType
+   */
+  public void validate(String sqlQuery, DataSourceType datasourceType) {
+    GrammarElementValidator grammarElementValidator =
+        grammarElementValidatorProvider.getValidatorForDatasource(datasourceType);
+    SQLQueryValidationVisitor visitor = new SQLQueryValidationVisitor(grammarElementValidator);
+    try {
+      visitor.visit(SQLQueryUtils.getBaseParser(sqlQuery).singleStatement());
+    } catch (IllegalArgumentException e) {
+      log.error("Query validation failed. DataSourceType=" + datasourceType, e);
+      throw e;
+    }
+  }
+}
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SecurityLakeGrammarElementValidator.java b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SecurityLakeGrammarElementValidator.java
new file mode 100644
index 0000000000..ca8f2b5bdd
--- /dev/null
+++ b/async-query-core/src/main/java/org/opensearch/sql/spark/validator/SecurityLakeGrammarElementValidator.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+import static org.opensearch.sql.spark.validator.GrammarElement.ALTER_NAMESPACE;
+import static org.opensearch.sql.spark.validator.GrammarElement.ALTER_VIEW;
+import static org.opensearch.sql.spark.validator.GrammarElement.ANALYZE_TABLE;
+import static org.opensearch.sql.spark.validator.GrammarElement.CACHE_TABLE;
+import static org.opensearch.sql.spark.validator.GrammarElement.CLEAR_CACHE;
+import static org.opensearch.sql.spark.validator.GrammarElement.CLUSTER_BY;
+import static org.opensearch.sql.spark.validator.GrammarElement.CREATE_FUNCTION;
+import static org.opensearch.sql.spark.validator.GrammarElement.CREATE_NAMESPACE;
+import static org.opensearch.sql.spark.validator.GrammarElement.CREATE_VIEW;
+import static org.opensearch.sql.spark.validator.GrammarElement.CSV_FUNCTIONS;
+import static org.opensearch.sql.spark.validator.GrammarElement.DESCRIBE_FUNCTION;
+import static org.opensearch.sql.spark.validator.GrammarElement.DESCRIBE_NAMESPACE;
+import static org.opensearch.sql.spark.validator.GrammarElement.DESCRIBE_QUERY;
+import static org.opensearch.sql.spark.validator.GrammarElement.DESCRIBE_TABLE;
+import static org.opensearch.sql.spark.validator.GrammarElement.DISTRIBUTE_BY;
+import static org.opensearch.sql.spark.validator.GrammarElement.DROP_FUNCTION;
+import static org.opensearch.sql.spark.validator.GrammarElement.DROP_NAMESPACE;
+import static org.opensearch.sql.spark.validator.GrammarElement.DROP_VIEW;
+import static org.opensearch.sql.spark.validator.GrammarElement.FILE;
+import static org.opensearch.sql.spark.validator.GrammarElement.HINTS;
+import static org.opensearch.sql.spark.validator.GrammarElement.INLINE_TABLE;
+import static org.opensearch.sql.spark.validator.GrammarElement.INSERT;
+import static org.opensearch.sql.spark.validator.GrammarElement.LOAD;
+import static org.opensearch.sql.spark.validator.GrammarElement.MANAGE_RESOURCE;
+import static org.opensearch.sql.spark.validator.GrammarElement.MISC_FUNCTIONS;
+import static org.opensearch.sql.spark.validator.GrammarElement.REFRESH_FUNCTION;
+import static org.opensearch.sql.spark.validator.GrammarElement.REFRESH_RESOURCE;
+import static org.opensearch.sql.spark.validator.GrammarElement.REFRESH_TABLE;
+import static org.opensearch.sql.spark.validator.GrammarElement.REPAIR_TABLE;
+import static org.opensearch.sql.spark.validator.GrammarElement.RESET;
+import static org.opensearch.sql.spark.validator.GrammarElement.SET;
+import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_COLUMNS;
+import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_CREATE_TABLE;
+import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_FUNCTIONS;
+import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_NAMESPACES;
+import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_PARTITIONS;
+import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_TABLES;
+import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_TABLE_EXTENDED;
+import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_TBLPROPERTIES;
+import static org.opensearch.sql.spark.validator.GrammarElement.SHOW_VIEWS;
+import static org.opensearch.sql.spark.validator.GrammarElement.TABLESAMPLE;
+import static org.opensearch.sql.spark.validator.GrammarElement.TABLE_VALUED_FUNCTION;
+import static org.opensearch.sql.spark.validator.GrammarElement.TRANSFORM;
+import static org.opensearch.sql.spark.validator.GrammarElement.TRUNCATE_TABLE;
+import static org.opensearch.sql.spark.validator.GrammarElement.UDF;
+import static org.opensearch.sql.spark.validator.GrammarElement.UNCACHE_TABLE;
+
+import com.google.common.collect.ImmutableSet;
+import java.util.Set;
+
+public class SecurityLakeGrammarElementValidator extends DenyListGrammarElementValidator {
+  private static final Set<GrammarElement> SECURITY_LAKE_DENY_LIST =
+      ImmutableSet.<GrammarElement>builder()
+          .add(
+              ALTER_NAMESPACE,
+              ALTER_VIEW,
+              CREATE_NAMESPACE,
+              CREATE_FUNCTION,
+              CREATE_VIEW,
+              DROP_FUNCTION,
+              DROP_NAMESPACE,
+              DROP_VIEW,
+              REPAIR_TABLE,
+              TRUNCATE_TABLE,
+              INSERT,
+              LOAD,
+              CLUSTER_BY,
+              DISTRIBUTE_BY,
+              HINTS,
+              INLINE_TABLE,
+              FILE,
+              TABLESAMPLE,
+              TABLE_VALUED_FUNCTION,
+              TRANSFORM,
+              MANAGE_RESOURCE,
+              ANALYZE_TABLE,
+              CACHE_TABLE,
+              CLEAR_CACHE,
+              DESCRIBE_NAMESPACE,
+              DESCRIBE_FUNCTION,
+              DESCRIBE_QUERY,
+              DESCRIBE_TABLE,
+              REFRESH_RESOURCE,
+              REFRESH_TABLE,
+              REFRESH_FUNCTION,
+              RESET,
+              SET,
+              SHOW_COLUMNS,
+              SHOW_CREATE_TABLE,
+              SHOW_NAMESPACES,
+              SHOW_FUNCTIONS,
+              SHOW_PARTITIONS,
+              SHOW_TABLE_EXTENDED,
+              SHOW_TABLES,
+              SHOW_TBLPROPERTIES,
+              SHOW_VIEWS,
+              UNCACHE_TABLE,
+              CSV_FUNCTIONS,
+              MISC_FUNCTIONS,
+              UDF)
+          .build();
+
+  public SecurityLakeGrammarElementValidator() {
+    super(SECURITY_LAKE_DENY_LIST);
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryCoreIntegTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryCoreIntegTest.java
new file mode 100644
index 0000000000..57ad4ecf42
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryCoreIntegTest.java
@@ -0,0 +1,754 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH;
+import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_URI;
+import static org.opensearch.sql.spark.dispatcher.IndexDMLHandler.DML_QUERY_JOB_ID;
+import static org.opensearch.sql.spark.dispatcher.IndexDMLHandler.DROP_INDEX_JOB_ID;
+
+import com.amazonaws.services.emrserverless.AWSEMRServerless;
+import com.amazonaws.services.emrserverless.model.CancelJobRunRequest;
+import com.amazonaws.services.emrserverless.model.CancelJobRunResult;
+import com.amazonaws.services.emrserverless.model.GetJobRunRequest;
+import com.amazonaws.services.emrserverless.model.GetJobRunResult;
+import com.amazonaws.services.emrserverless.model.JobRun;
+import com.amazonaws.services.emrserverless.model.StartJobRunRequest;
+import com.amazonaws.services.emrserverless.model.StartJobRunResult;
+import com.google.common.collect.ImmutableMap;
+import java.util.Optional;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.datasources.auth.AuthenticationType;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryExecutionResponse;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata.AsyncQueryJobMetadataBuilder;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.QueryState;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.client.EmrServerlessClientImpl;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfig;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigSupplier;
+import org.opensearch.sql.spark.config.SparkSubmitParameterModifier;
+import org.opensearch.sql.spark.dispatcher.QueryHandlerFactory;
+import org.opensearch.sql.spark.dispatcher.QueryIdProvider;
+import org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+import org.opensearch.sql.spark.dispatcher.model.IndexDMLResult;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.execution.session.CreateSessionRequest;
+import org.opensearch.sql.spark.execution.session.SessionConfigSupplier;
+import org.opensearch.sql.spark.execution.session.SessionIdProvider;
+import org.opensearch.sql.spark.execution.session.SessionManager;
+import org.opensearch.sql.spark.execution.session.SessionModel;
+import org.opensearch.sql.spark.execution.session.SessionState;
+import org.opensearch.sql.spark.execution.statement.StatementId;
+import org.opensearch.sql.spark.execution.statement.StatementModel;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+import org.opensearch.sql.spark.execution.statestore.SessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.StatementStorageService;
+import org.opensearch.sql.spark.flint.FlintIndexClient;
+import org.opensearch.sql.spark.flint.FlintIndexMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.FlintIndexStateModelService;
+import org.opensearch.sql.spark.flint.IndexDMLResultStorageService;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
+import org.opensearch.sql.spark.leasemanager.LeaseManager;
+import org.opensearch.sql.spark.metrics.MetricsService;
+import org.opensearch.sql.spark.parameter.SparkParameterComposerCollection;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilderProvider;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse;
+import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.spark.scheduler.AsyncQueryScheduler;
+import org.opensearch.sql.spark.validator.DefaultGrammarElementValidator;
+import org.opensearch.sql.spark.validator.GrammarElementValidatorProvider;
+import org.opensearch.sql.spark.validator.S3GlueGrammarElementValidator;
+import org.opensearch.sql.spark.validator.SQLQueryValidator;
+
+/**
+ * This tests async-query-core library end-to-end using mocked implementation of extension points.
+ * It intends to cover major happy cases.
+ */
+@ExtendWith(MockitoExtension.class)
+public class AsyncQueryCoreIntegTest {
+
+  public static final String QUERY_ID = "QUERY_ID";
+  public static final String SESSION_ID = "SESSION_ID";
+  public static final String DATASOURCE_NAME = "DATASOURCE_NAME";
+  public static final String INDEX_NAME = "INDEX_NAME";
+  public static final String APPLICATION_ID = "APPLICATION_ID";
+  public static final String JOB_ID = "JOB_ID";
+  public static final String ACCOUNT_ID = "ACCOUNT_ID";
+  public static final String RESULT_INDEX = "RESULT_INDEX";
+  @Mock SparkSubmitParameterModifier sparkSubmitParameterModifier;
+  @Mock SparkExecutionEngineConfigSupplier sparkExecutionEngineConfigSupplier;
+  @Mock SessionConfigSupplier sessionConfigSupplier;
+  @Mock LeaseManager leaseManager;
+  @Mock JobExecutionResponseReader jobExecutionResponseReader;
+  @Mock DataSourceService dataSourceService;
+  EMRServerlessClientFactory emrServerlessClientFactory;
+  @Mock AWSEMRServerless awsemrServerless;
+  @Mock SessionIdProvider sessionIdProvider;
+  @Mock QueryIdProvider queryIdProvider;
+  @Mock FlintIndexClient flintIndexClient;
+  @Mock AsyncQueryRequestContext asyncQueryRequestContext;
+  @Mock MetricsService metricsService;
+  @Mock AsyncQueryScheduler asyncQueryScheduler;
+  @Mock SparkSubmitParametersBuilderProvider sparkSubmitParametersBuilderProvider;
+
+  // storage services
+  @Mock AsyncQueryJobMetadataStorageService asyncQueryJobMetadataStorageService;
+  @Mock SessionStorageService sessionStorageService;
+  @Mock StatementStorageService statementStorageService;
+  @Mock FlintIndexMetadataService flintIndexMetadataService;
+  @Mock FlintIndexStateModelService flintIndexStateModelService;
+  @Mock IndexDMLResultStorageService indexDMLResultStorageService;
+
+  @Captor ArgumentCaptor<DispatchQueryRequest> dispatchQueryRequestArgumentCaptor;
+  @Captor ArgumentCaptor<CancelJobRunRequest> cancelJobRunRequestArgumentCaptor;
+  @Captor ArgumentCaptor<GetJobRunRequest> getJobRunRequestArgumentCaptor;
+  @Captor ArgumentCaptor<IndexDMLResult> indexDMLResultArgumentCaptor;
+  @Captor ArgumentCaptor<AsyncQueryJobMetadata> asyncQueryJobMetadataArgumentCaptor;
+  @Captor ArgumentCaptor<FlintIndexOptions> flintIndexOptionsArgumentCaptor;
+  @Captor ArgumentCaptor<StartJobRunRequest> startJobRunRequestArgumentCaptor;
+  @Captor ArgumentCaptor<CreateSessionRequest> createSessionRequestArgumentCaptor;
+
+  AsyncQueryExecutorService asyncQueryExecutorService;
+
+  @BeforeEach
+  public void setUp() {
+    emrServerlessClientFactory =
+        (accountId) -> new EmrServerlessClientImpl(awsemrServerless, metricsService);
+    SparkParameterComposerCollection collection = new SparkParameterComposerCollection();
+    collection.register(
+        DataSourceType.S3GLUE,
+        (dataSourceMetadata, sparkSubmitParameters, dispatchQueryRequest, context) ->
+            sparkSubmitParameters.setConfigItem(
+                "key.from.datasource.composer", "value.from.datasource.composer"));
+    collection.register(
+        (sparkSubmitParameters, dispatchQueryRequest, context) ->
+            sparkSubmitParameters.setConfigItem(
+                "key.from.generic.composer", "value.from.generic.composer"));
+    SessionManager sessionManager =
+        new SessionManager(
+            sessionStorageService,
+            statementStorageService,
+            emrServerlessClientFactory,
+            sessionConfigSupplier,
+            sessionIdProvider);
+    FlintIndexOpFactory flintIndexOpFactory =
+        new FlintIndexOpFactory(
+            flintIndexStateModelService,
+            flintIndexClient,
+            flintIndexMetadataService,
+            emrServerlessClientFactory,
+            asyncQueryScheduler);
+    QueryHandlerFactory queryHandlerFactory =
+        new QueryHandlerFactory(
+            jobExecutionResponseReader,
+            flintIndexMetadataService,
+            sessionManager,
+            leaseManager,
+            indexDMLResultStorageService,
+            flintIndexOpFactory,
+            emrServerlessClientFactory,
+            metricsService,
+            new SparkSubmitParametersBuilderProvider(collection));
+    SQLQueryValidator sqlQueryValidator =
+        new SQLQueryValidator(
+            new GrammarElementValidatorProvider(
+                ImmutableMap.of(DataSourceType.S3GLUE, new S3GlueGrammarElementValidator()),
+                new DefaultGrammarElementValidator()));
+    SparkQueryDispatcher sparkQueryDispatcher =
+        new SparkQueryDispatcher(
+            dataSourceService,
+            sessionManager,
+            queryHandlerFactory,
+            queryIdProvider,
+            sqlQueryValidator);
+    asyncQueryExecutorService =
+        new AsyncQueryExecutorServiceImpl(
+            asyncQueryJobMetadataStorageService,
+            sparkQueryDispatcher,
+            sparkExecutionEngineConfigSupplier);
+  }
+
+  @Test
+  public void createDropIndexQuery() {
+    givenSparkExecutionEngineConfigIsSupplied();
+    givenValidDataSourceMetadataExist();
+    when(queryIdProvider.getQueryId(any(), eq(asyncQueryRequestContext))).thenReturn(QUERY_ID);
+    String indexName = "flint_datasource_name_table_name_index_name_index";
+    givenFlintIndexMetadataExists(indexName);
+    givenCancelJobRunSucceed();
+    givenGetJobRunReturnJobRunWithState("Cancelled");
+
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "DROP INDEX index_name ON table_name", DATASOURCE_NAME, LangType.SQL),
+            asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, response.getQueryId());
+    assertNull(response.getSessionId());
+    verifyGetQueryIdCalled();
+    verifyCancelJobRunCalled();
+    verifyCreateIndexDMLResultCalled();
+    verifyStoreJobMetadataCalled(DML_QUERY_JOB_ID, QueryState.SUCCESS, JobType.BATCH);
+  }
+
+  @Test
+  public void createDropIndexQueryWithScheduler() {
+    givenSparkExecutionEngineConfigIsSupplied();
+    givenValidDataSourceMetadataExist();
+    when(queryIdProvider.getQueryId(any(), eq(asyncQueryRequestContext))).thenReturn(QUERY_ID);
+
+    String indexName = "flint_datasource_name_table_name_index_name_index";
+    givenFlintIndexMetadataExistsWithExternalScheduler(indexName);
+
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "DROP INDEX index_name ON table_name", DATASOURCE_NAME, LangType.SQL),
+            asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, response.getQueryId());
+    assertNull(response.getSessionId());
+    verifyGetQueryIdCalled();
+    verifyCreateIndexDMLResultCalled();
+    verifyStoreJobMetadataCalled(DML_QUERY_JOB_ID, QueryState.SUCCESS, JobType.BATCH);
+
+    verify(asyncQueryScheduler).unscheduleJob(indexName, asyncQueryRequestContext);
+  }
+
+  @Test
+  public void createVacuumIndexQuery() {
+    givenSparkExecutionEngineConfigIsSupplied();
+    givenValidDataSourceMetadataExist();
+    givenSessionExists();
+    when(queryIdProvider.getQueryId(any(), eq(asyncQueryRequestContext))).thenReturn(QUERY_ID);
+    when(sessionIdProvider.getSessionId(any())).thenReturn(SESSION_ID);
+    givenSessionExists(); // called twice
+    when(awsemrServerless.startJobRun(any()))
+        .thenReturn(new StartJobRunResult().withApplicationId(APPLICATION_ID).withJobRunId(JOB_ID));
+
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "VACUUM INDEX index_name ON table_name", DATASOURCE_NAME, LangType.SQL),
+            asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, response.getQueryId());
+    assertEquals(SESSION_ID, response.getSessionId());
+    verifyGetQueryIdCalled();
+    verifyGetSessionIdCalled();
+    verify(leaseManager).borrow(any());
+    verifyStartJobRunCalled();
+    verifyStoreJobMetadataCalled(JOB_ID, QueryState.WAITING, JobType.INTERACTIVE);
+  }
+
+  @Test
+  public void createAlterIndexQuery() {
+    givenSparkExecutionEngineConfigIsSupplied();
+    givenValidDataSourceMetadataExist();
+    when(queryIdProvider.getQueryId(any(), eq(asyncQueryRequestContext))).thenReturn(QUERY_ID);
+    String indexName = "flint_datasource_name_table_name_index_name_index";
+    givenFlintIndexMetadataExists(indexName);
+    givenCancelJobRunSucceed();
+    givenGetJobRunReturnJobRunWithState("Cancelled");
+
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "ALTER INDEX index_name ON table_name WITH (auto_refresh = false)",
+                DATASOURCE_NAME,
+                LangType.SQL),
+            asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, response.getQueryId());
+    assertNull(response.getSessionId());
+    verifyGetQueryIdCalled();
+    verify(flintIndexMetadataService)
+        .updateIndexToManualRefresh(
+            eq(indexName), flintIndexOptionsArgumentCaptor.capture(), eq(asyncQueryRequestContext));
+    FlintIndexOptions flintIndexOptions = flintIndexOptionsArgumentCaptor.getValue();
+    assertFalse(flintIndexOptions.autoRefresh());
+    verifyCancelJobRunCalled();
+    verifyCreateIndexDMLResultCalled();
+    verifyStoreJobMetadataCalled(DML_QUERY_JOB_ID, QueryState.SUCCESS, JobType.BATCH);
+  }
+
+  @Test
+  public void createAlterIndexQueryWithScheduler() {
+    givenSparkExecutionEngineConfigIsSupplied();
+    givenValidDataSourceMetadataExist();
+    when(queryIdProvider.getQueryId(any(), eq(asyncQueryRequestContext))).thenReturn(QUERY_ID);
+
+    String indexName = "flint_datasource_name_table_name_index_name_index";
+    givenFlintIndexMetadataExistsWithExternalScheduler(indexName);
+
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "ALTER INDEX index_name ON table_name WITH (auto_refresh = false)",
+                DATASOURCE_NAME,
+                LangType.SQL),
+            asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, response.getQueryId());
+    assertNull(response.getSessionId());
+    verifyGetQueryIdCalled();
+
+    verify(flintIndexMetadataService)
+        .updateIndexToManualRefresh(
+            eq(indexName), flintIndexOptionsArgumentCaptor.capture(), eq(asyncQueryRequestContext));
+
+    FlintIndexOptions flintIndexOptions = flintIndexOptionsArgumentCaptor.getValue();
+    assertFalse(flintIndexOptions.autoRefresh());
+
+    verify(asyncQueryScheduler).unscheduleJob(indexName, asyncQueryRequestContext);
+    verifyCreateIndexDMLResultCalled();
+    verifyStoreJobMetadataCalled(DML_QUERY_JOB_ID, QueryState.SUCCESS, JobType.BATCH);
+  }
+
+  @Test
+  public void createStreamingQuery() {
+    givenSparkExecutionEngineConfigIsSupplied();
+    givenValidDataSourceMetadataExist();
+    when(queryIdProvider.getQueryId(any(), eq(asyncQueryRequestContext))).thenReturn(QUERY_ID);
+    when(awsemrServerless.startJobRun(any()))
+        .thenReturn(new StartJobRunResult().withApplicationId(APPLICATION_ID).withJobRunId(JOB_ID));
+
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "CREATE INDEX index_name ON table_name(l_orderkey, l_quantity)"
+                    + " WITH (auto_refresh = true)",
+                DATASOURCE_NAME,
+                LangType.SQL),
+            asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, response.getQueryId());
+    assertNull(response.getSessionId());
+    verifyGetQueryIdCalled();
+    verify(leaseManager).borrow(any());
+    verifyStartJobRunCalled();
+    verifyStoreJobMetadataCalled(JOB_ID, QueryState.WAITING, JobType.STREAMING);
+  }
+
+  private void verifyStartJobRunCalled() {
+    verify(awsemrServerless).startJobRun(startJobRunRequestArgumentCaptor.capture());
+    StartJobRunRequest startJobRunRequest = startJobRunRequestArgumentCaptor.getValue();
+    assertEquals(APPLICATION_ID, startJobRunRequest.getApplicationId());
+    String submitParameters =
+        startJobRunRequest.getJobDriver().getSparkSubmit().getSparkSubmitParameters();
+    assertTrue(
+        submitParameters.contains("key.from.datasource.composer=value.from.datasource.composer"));
+    assertTrue(submitParameters.contains("key.from.generic.composer=value.from.generic.composer"));
+  }
+
+  @Test
+  public void createCreateIndexQuery() {
+    givenSparkExecutionEngineConfigIsSupplied();
+    givenValidDataSourceMetadataExist();
+    when(queryIdProvider.getQueryId(any(), eq(asyncQueryRequestContext))).thenReturn(QUERY_ID);
+    when(awsemrServerless.startJobRun(any()))
+        .thenReturn(new StartJobRunResult().withApplicationId(APPLICATION_ID).withJobRunId(JOB_ID));
+
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "CREATE INDEX index_name ON table_name(l_orderkey, l_quantity)"
+                    + " WITH (auto_refresh = false)",
+                DATASOURCE_NAME,
+                LangType.SQL),
+            asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, response.getQueryId());
+    assertNull(response.getSessionId());
+    verifyGetQueryIdCalled();
+    verifyStartJobRunCalled();
+    verifyStoreJobMetadataCalled(JOB_ID, QueryState.WAITING, JobType.BATCH);
+  }
+
+  @Test
+  public void createRefreshQuery() {
+    givenSparkExecutionEngineConfigIsSupplied();
+    givenValidDataSourceMetadataExist();
+    when(queryIdProvider.getQueryId(any(), eq(asyncQueryRequestContext))).thenReturn(QUERY_ID);
+    when(awsemrServerless.startJobRun(any()))
+        .thenReturn(new StartJobRunResult().withApplicationId(APPLICATION_ID).withJobRunId(JOB_ID));
+
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "REFRESH INDEX index_name ON table_name", DATASOURCE_NAME, LangType.SQL),
+            asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, response.getQueryId());
+    assertNull(response.getSessionId());
+    verifyGetQueryIdCalled();
+    verify(leaseManager).borrow(any());
+    verifyStartJobRunCalled();
+    verifyStoreJobMetadataCalled(JOB_ID, QueryState.WAITING, JobType.REFRESH);
+  }
+
+  @Test
+  public void createInteractiveQuery() {
+    givenSparkExecutionEngineConfigIsSupplied();
+    givenValidDataSourceMetadataExist();
+    givenSessionExists();
+    when(queryIdProvider.getQueryId(any(), eq(asyncQueryRequestContext))).thenReturn(QUERY_ID);
+    when(sessionIdProvider.getSessionId(any())).thenReturn(SESSION_ID);
+    givenSessionExists(); // called twice
+    when(awsemrServerless.startJobRun(any()))
+        .thenReturn(new StartJobRunResult().withApplicationId(APPLICATION_ID).withJobRunId(JOB_ID));
+
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "SELECT * FROM table_name", DATASOURCE_NAME, LangType.SQL, SESSION_ID),
+            asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, response.getQueryId());
+    assertEquals(SESSION_ID, response.getSessionId());
+    verifyGetQueryIdCalled();
+    verifyGetSessionIdCalled();
+    verify(leaseManager).borrow(any());
+    verifyStartJobRunCalled();
+    verifyStoreJobMetadataCalled(JOB_ID, QueryState.WAITING, JobType.INTERACTIVE);
+  }
+
+  @Test
+  public void getResultOfInteractiveQuery() {
+    givenJobMetadataExists(
+        getBaseAsyncQueryJobMetadataBuilder()
+            .queryId(QUERY_ID)
+            .sessionId(SESSION_ID)
+            .resultIndex(RESULT_INDEX));
+    JSONObject result = getValidExecutionResponse();
+    when(jobExecutionResponseReader.getResultWithQueryId(QUERY_ID, RESULT_INDEX))
+        .thenReturn(result);
+
+    AsyncQueryExecutionResponse response =
+        asyncQueryExecutorService.getAsyncQueryResults(QUERY_ID, asyncQueryRequestContext);
+
+    assertEquals("SUCCESS", response.getStatus());
+    assertEquals(SESSION_ID, response.getSessionId());
+    assertEquals("{col1:\"value\"}", response.getResults().get(0).toString());
+  }
+
+  @Test
+  public void getResultOfIndexDMLQuery() {
+    givenJobMetadataExists(
+        getBaseAsyncQueryJobMetadataBuilder()
+            .queryId(QUERY_ID)
+            .jobId(DROP_INDEX_JOB_ID)
+            .resultIndex(RESULT_INDEX));
+    JSONObject result = getValidExecutionResponse();
+    when(jobExecutionResponseReader.getResultWithQueryId(QUERY_ID, RESULT_INDEX))
+        .thenReturn(result);
+
+    AsyncQueryExecutionResponse response =
+        asyncQueryExecutorService.getAsyncQueryResults(QUERY_ID, asyncQueryRequestContext);
+
+    assertEquals("SUCCESS", response.getStatus());
+    assertNull(response.getSessionId());
+    assertEquals("{col1:\"value\"}", response.getResults().get(0).toString());
+  }
+
+  @Test
+  public void getResultOfRefreshQuery() {
+    givenJobMetadataExists(
+        getBaseAsyncQueryJobMetadataBuilder()
+            .queryId(QUERY_ID)
+            .jobId(JOB_ID)
+            .jobType(JobType.BATCH)
+            .resultIndex(RESULT_INDEX));
+    JSONObject result = getValidExecutionResponse();
+    when(jobExecutionResponseReader.getResultWithJobId(JOB_ID, RESULT_INDEX)).thenReturn(result);
+
+    AsyncQueryExecutionResponse response =
+        asyncQueryExecutorService.getAsyncQueryResults(QUERY_ID, asyncQueryRequestContext);
+
+    assertEquals("SUCCESS", response.getStatus());
+    assertNull(response.getSessionId());
+    assertEquals("{col1:\"value\"}", response.getResults().get(0).toString());
+  }
+
+  @Test
+  public void cancelInteractiveQuery() {
+    givenJobMetadataExists(getBaseAsyncQueryJobMetadataBuilder().sessionId(SESSION_ID));
+    givenSessionExists();
+    when(sessionConfigSupplier.getSessionInactivityTimeoutMillis()).thenReturn(100000L);
+    final StatementModel statementModel = givenStatementExists();
+    StatementModel canceledStatementModel =
+        StatementModel.copyWithState(statementModel, StatementState.CANCELLED, ImmutableMap.of());
+    when(statementStorageService.updateStatementState(
+            statementModel, StatementState.CANCELLED, asyncQueryRequestContext))
+        .thenReturn(canceledStatementModel);
+
+    String result = asyncQueryExecutorService.cancelQuery(QUERY_ID, asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, result);
+    verify(statementStorageService)
+        .updateStatementState(statementModel, StatementState.CANCELLED, asyncQueryRequestContext);
+  }
+
+  @Test
+  public void cancelIndexDMLQuery() {
+    givenJobMetadataExists(getBaseAsyncQueryJobMetadataBuilder().jobId(DROP_INDEX_JOB_ID));
+
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> asyncQueryExecutorService.cancelQuery(QUERY_ID, asyncQueryRequestContext));
+  }
+
+  @Test
+  public void cancelRefreshQuery() {
+    givenJobMetadataExists(
+        getBaseAsyncQueryJobMetadataBuilder().jobType(JobType.REFRESH).indexName(INDEX_NAME));
+    when(flintIndexMetadataService.getFlintIndexMetadata(INDEX_NAME, asyncQueryRequestContext))
+        .thenReturn(
+            ImmutableMap.of(
+                INDEX_NAME,
+                FlintIndexMetadata.builder()
+                    .latestId(null)
+                    .appId(APPLICATION_ID)
+                    .jobId(JOB_ID)
+                    .build()));
+    givenCancelJobRunSucceed();
+    when(awsemrServerless.getJobRun(any()))
+        .thenReturn(
+            new GetJobRunResult()
+                .withJobRun(new JobRun().withJobRunId(JOB_ID).withState("Cancelled")));
+
+    String result = asyncQueryExecutorService.cancelQuery(QUERY_ID, asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, result);
+    verifyCancelJobRunCalled();
+    verifyGetJobRunRequest();
+  }
+
+  @Test
+  public void cancelStreamingQuery() {
+    givenJobMetadataExists(getBaseAsyncQueryJobMetadataBuilder().jobType(JobType.STREAMING));
+
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> asyncQueryExecutorService.cancelQuery(QUERY_ID, asyncQueryRequestContext));
+  }
+
+  @Test
+  public void cancelBatchQuery() {
+    givenJobMetadataExists(getBaseAsyncQueryJobMetadataBuilder().jobId(JOB_ID));
+    givenCancelJobRunSucceed();
+
+    String result = asyncQueryExecutorService.cancelQuery(QUERY_ID, asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, result);
+    verifyCancelJobRunCalled();
+  }
+
+  private void givenSparkExecutionEngineConfigIsSupplied() {
+    when(sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(asyncQueryRequestContext))
+        .thenReturn(
+            SparkExecutionEngineConfig.builder()
+                .applicationId(APPLICATION_ID)
+                .accountId(ACCOUNT_ID)
+                .sparkSubmitParameterModifier(sparkSubmitParameterModifier)
+                .build());
+  }
+
+  private void givenFlintIndexMetadataExists(
+      String indexName, FlintIndexOptions flintIndexOptions) {
+    when(flintIndexMetadataService.getFlintIndexMetadata(indexName, asyncQueryRequestContext))
+        .thenReturn(
+            ImmutableMap.of(
+                indexName,
+                FlintIndexMetadata.builder()
+                    .appId(APPLICATION_ID)
+                    .jobId(JOB_ID)
+                    .opensearchIndexName(indexName)
+                    .flintIndexOptions(flintIndexOptions)
+                    .build()));
+  }
+
+  // Overload method for default FlintIndexOptions usage
+  private void givenFlintIndexMetadataExists(String indexName) {
+    givenFlintIndexMetadataExists(indexName, new FlintIndexOptions());
+  }
+
+  // Method to set up FlintIndexMetadata with external scheduler
+  private void givenFlintIndexMetadataExistsWithExternalScheduler(String indexName) {
+    givenFlintIndexMetadataExists(indexName, createExternalSchedulerFlintIndexOptions());
+  }
+
+  // Helper method for creating FlintIndexOptions with external scheduler
+  private FlintIndexOptions createExternalSchedulerFlintIndexOptions() {
+    FlintIndexOptions options = new FlintIndexOptions();
+    options.setOption(FlintIndexOptions.SCHEDULER_MODE, "external");
+    return options;
+  }
+
+  private void givenValidDataSourceMetadataExist() {
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            DATASOURCE_NAME, asyncQueryRequestContext))
+        .thenReturn(
+            new DataSourceMetadata.Builder()
+                .setName(DATASOURCE_NAME)
+                .setConnector(DataSourceType.S3GLUE)
+                .setProperties(
+                    ImmutableMap.<String, String>builder()
+                        .put(GLUE_INDEX_STORE_OPENSEARCH_URI, "https://open.search.cluster:9200/")
+                        .put(GLUE_INDEX_STORE_OPENSEARCH_AUTH, AuthenticationType.NOAUTH.getName())
+                        .build())
+                .build());
+  }
+
+  private void givenGetJobRunReturnJobRunWithState(String state) {
+    when(awsemrServerless.getJobRun(any()))
+        .thenReturn(
+            new GetJobRunResult()
+                .withJobRun(
+                    new JobRun()
+                        .withJobRunId(JOB_ID)
+                        .withApplicationId(APPLICATION_ID)
+                        .withState(state)));
+  }
+
+  private void verifyGetQueryIdCalled() {
+    verify(queryIdProvider)
+        .getQueryId(dispatchQueryRequestArgumentCaptor.capture(), eq(asyncQueryRequestContext));
+    DispatchQueryRequest dispatchQueryRequest = dispatchQueryRequestArgumentCaptor.getValue();
+    assertEquals(ACCOUNT_ID, dispatchQueryRequest.getAccountId());
+    assertEquals(APPLICATION_ID, dispatchQueryRequest.getApplicationId());
+  }
+
+  private void verifyGetSessionIdCalled() {
+    verify(sessionIdProvider).getSessionId(createSessionRequestArgumentCaptor.capture());
+    CreateSessionRequest createSessionRequest = createSessionRequestArgumentCaptor.getValue();
+    assertEquals(ACCOUNT_ID, createSessionRequest.getAccountId());
+    assertEquals(APPLICATION_ID, createSessionRequest.getApplicationId());
+  }
+
+  private void verifyStoreJobMetadataCalled(String jobId, QueryState state, JobType jobType) {
+    verify(asyncQueryJobMetadataStorageService)
+        .storeJobMetadata(
+            asyncQueryJobMetadataArgumentCaptor.capture(), eq(asyncQueryRequestContext));
+    AsyncQueryJobMetadata asyncQueryJobMetadata = asyncQueryJobMetadataArgumentCaptor.getValue();
+    assertEquals(QUERY_ID, asyncQueryJobMetadata.getQueryId());
+    assertEquals(jobId, asyncQueryJobMetadata.getJobId());
+    assertEquals(DATASOURCE_NAME, asyncQueryJobMetadata.getDatasourceName());
+    assertNull(asyncQueryJobMetadata.getError());
+    assertEquals(LangType.SQL, asyncQueryJobMetadata.getLangType());
+    assertEquals(state, asyncQueryJobMetadata.getState());
+    assertEquals(jobType, asyncQueryJobMetadata.getJobType());
+  }
+
+  private void verifyCreateIndexDMLResultCalled() {
+    verify(indexDMLResultStorageService)
+        .createIndexDMLResult(indexDMLResultArgumentCaptor.capture(), eq(asyncQueryRequestContext));
+    IndexDMLResult indexDMLResult = indexDMLResultArgumentCaptor.getValue();
+    assertEquals(QUERY_ID, indexDMLResult.getQueryId());
+    assertEquals(DATASOURCE_NAME, indexDMLResult.getDatasourceName());
+    assertEquals("SUCCESS", indexDMLResult.getStatus());
+    assertEquals("", indexDMLResult.getError());
+  }
+
+  private void verifyCancelJobRunCalled() {
+    verify(awsemrServerless).cancelJobRun(cancelJobRunRequestArgumentCaptor.capture());
+    CancelJobRunRequest cancelJobRunRequest = cancelJobRunRequestArgumentCaptor.getValue();
+    assertEquals(JOB_ID, cancelJobRunRequest.getJobRunId());
+    assertEquals(APPLICATION_ID, cancelJobRunRequest.getApplicationId());
+  }
+
+  private void verifyGetJobRunRequest() {
+    verify(awsemrServerless).getJobRun(getJobRunRequestArgumentCaptor.capture());
+    GetJobRunRequest getJobRunRequest = getJobRunRequestArgumentCaptor.getValue();
+    assertEquals(APPLICATION_ID, getJobRunRequest.getApplicationId());
+    assertEquals(JOB_ID, getJobRunRequest.getJobRunId());
+  }
+
+  private StatementModel givenStatementExists() {
+    StatementModel statementModel =
+        StatementModel.builder()
+            .queryId(QUERY_ID)
+            .statementId(new StatementId(QUERY_ID))
+            .statementState(StatementState.RUNNING)
+            .build();
+    when(statementStorageService.getStatement(QUERY_ID, DATASOURCE_NAME, asyncQueryRequestContext))
+        .thenReturn(Optional.of(statementModel));
+    return statementModel;
+  }
+
+  private void givenSessionExists() {
+    when(sessionStorageService.getSession(SESSION_ID, DATASOURCE_NAME))
+        .thenReturn(
+            Optional.of(
+                SessionModel.builder()
+                    .sessionId(SESSION_ID)
+                    .datasourceName(DATASOURCE_NAME)
+                    .jobId(JOB_ID)
+                    .sessionState(SessionState.RUNNING)
+                    .build()));
+  }
+
+  private AsyncQueryJobMetadataBuilder getBaseAsyncQueryJobMetadataBuilder() {
+    return AsyncQueryJobMetadata.builder()
+        .applicationId(APPLICATION_ID)
+        .queryId(QUERY_ID)
+        .datasourceName(DATASOURCE_NAME);
+  }
+
+  private void givenJobMetadataExists(AsyncQueryJobMetadataBuilder metadataBuilder) {
+    AsyncQueryJobMetadata metadata = metadataBuilder.build();
+    when(asyncQueryJobMetadataStorageService.getJobMetadata(metadata.getQueryId()))
+        .thenReturn(Optional.of(metadata));
+  }
+
+  private void givenCancelJobRunSucceed() {
+    when(awsemrServerless.cancelJobRun(any()))
+        .thenReturn(
+            new CancelJobRunResult().withJobRunId(JOB_ID).withApplicationId(APPLICATION_ID));
+  }
+
+  private static JSONObject getValidExecutionResponse() {
+    return new JSONObject()
+        .put(
+            "data",
+            new JSONObject()
+                .put("status", "SUCCESS")
+                .put(
+                    "schema",
+                    new JSONArray()
+                        .put(
+                            new JSONObject().put("column_name", "col1").put("data_type", "string")))
+                .put("result", new JSONArray().put("{'col1': 'value'}")));
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceImplTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceImplTest.java
new file mode 100644
index 0000000000..73850db83d
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceImplTest.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_APPLICATION_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_EXECUTION_ROLE;
+import static org.opensearch.sql.spark.constants.TestConstants.EMR_JOB_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.TEST_CLUSTER_NAME;
+import static org.opensearch.sql.spark.utils.TestUtils.getJson;
+
+import com.amazonaws.services.emrserverless.model.JobRunState;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Optional;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.spark.asyncquery.exceptions.AsyncQueryNotFoundException;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryExecutionResponse;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfig;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigSupplier;
+import org.opensearch.sql.spark.config.SparkSubmitParameterModifier;
+import org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+@ExtendWith(MockitoExtension.class)
+public class AsyncQueryExecutorServiceImplTest {
+
+  private static final String QUERY = "select * from my_glue.default.http_logs";
+  private static final String QUERY_ID = "QUERY_ID";
+
+  @Mock private SparkQueryDispatcher sparkQueryDispatcher;
+  @Mock private AsyncQueryJobMetadataStorageService asyncQueryJobMetadataStorageService;
+  private AsyncQueryExecutorService jobExecutorService;
+
+  @Mock private SparkExecutionEngineConfigSupplier sparkExecutionEngineConfigSupplier;
+  @Mock private SparkSubmitParameterModifier sparkSubmitParameterModifier;
+  @Mock private AsyncQueryRequestContext asyncQueryRequestContext;
+
+  @BeforeEach
+  void setUp() {
+    jobExecutorService =
+        new AsyncQueryExecutorServiceImpl(
+            asyncQueryJobMetadataStorageService,
+            sparkQueryDispatcher,
+            sparkExecutionEngineConfigSupplier);
+  }
+
+  @Test
+  void testCreateAsyncQuery() {
+    CreateAsyncQueryRequest createAsyncQueryRequest =
+        new CreateAsyncQueryRequest(QUERY, "my_glue", LangType.SQL);
+    when(sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(any()))
+        .thenReturn(
+            SparkExecutionEngineConfig.builder()
+                .applicationId(EMRS_APPLICATION_ID)
+                .region("eu-west-1")
+                .executionRoleARN(EMRS_EXECUTION_ROLE)
+                .sparkSubmitParameterModifier(sparkSubmitParameterModifier)
+                .clusterName(TEST_CLUSTER_NAME)
+                .build());
+    DispatchQueryRequest expectedDispatchQueryRequest =
+        DispatchQueryRequest.builder()
+            .applicationId(EMRS_APPLICATION_ID)
+            .query(QUERY)
+            .datasource("my_glue")
+            .langType(LangType.SQL)
+            .executionRoleARN(EMRS_EXECUTION_ROLE)
+            .clusterName(TEST_CLUSTER_NAME)
+            .sparkSubmitParameterModifier(sparkSubmitParameterModifier)
+            .build();
+    when(sparkQueryDispatcher.dispatch(expectedDispatchQueryRequest, asyncQueryRequestContext))
+        .thenReturn(
+            DispatchQueryResponse.builder()
+                .queryId(QUERY_ID)
+                .jobId(EMR_JOB_ID)
+                .jobType(JobType.INTERACTIVE)
+                .build());
+
+    CreateAsyncQueryResponse createAsyncQueryResponse =
+        jobExecutorService.createAsyncQuery(createAsyncQueryRequest, asyncQueryRequestContext);
+
+    verify(asyncQueryJobMetadataStorageService, times(1))
+        .storeJobMetadata(getAsyncQueryJobMetadata(), asyncQueryRequestContext);
+    verify(sparkExecutionEngineConfigSupplier, times(1))
+        .getSparkExecutionEngineConfig(asyncQueryRequestContext);
+    verify(sparkExecutionEngineConfigSupplier, times(1))
+        .getSparkExecutionEngineConfig(asyncQueryRequestContext);
+    verify(sparkQueryDispatcher, times(1))
+        .dispatch(expectedDispatchQueryRequest, asyncQueryRequestContext);
+    Assertions.assertEquals(QUERY_ID, createAsyncQueryResponse.getQueryId());
+  }
+
+  @Test
+  void testCreateAsyncQueryWithExtraSparkSubmitParameter() {
+    SparkSubmitParameterModifier modifier =
+        (builder) -> builder.extraParameters("--conf spark.dynamicAllocation.enabled=false");
+    when(sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(any()))
+        .thenReturn(
+            SparkExecutionEngineConfig.builder()
+                .applicationId(EMRS_APPLICATION_ID)
+                .region("eu-west-1")
+                .executionRoleARN(EMRS_EXECUTION_ROLE)
+                .sparkSubmitParameterModifier(sparkSubmitParameterModifier)
+                .sparkSubmitParameterModifier(modifier)
+                .clusterName(TEST_CLUSTER_NAME)
+                .build());
+    when(sparkQueryDispatcher.dispatch(any(), any()))
+        .thenReturn(
+            DispatchQueryResponse.builder()
+                .queryId(QUERY_ID)
+                .jobId(EMR_JOB_ID)
+                .jobType(JobType.INTERACTIVE)
+                .build());
+
+    jobExecutorService.createAsyncQuery(
+        new CreateAsyncQueryRequest(QUERY, "my_glue", LangType.SQL), asyncQueryRequestContext);
+
+    verify(sparkQueryDispatcher, times(1))
+        .dispatch(
+            argThat(actualReq -> actualReq.getSparkSubmitParameterModifier().equals(modifier)),
+            eq(asyncQueryRequestContext));
+  }
+
+  @Test
+  void testGetAsyncQueryResultsWithJobNotFoundException() {
+    when(asyncQueryJobMetadataStorageService.getJobMetadata(EMR_JOB_ID))
+        .thenReturn(Optional.empty());
+
+    AsyncQueryNotFoundException asyncQueryNotFoundException =
+        Assertions.assertThrows(
+            AsyncQueryNotFoundException.class,
+            () -> jobExecutorService.getAsyncQueryResults(EMR_JOB_ID, asyncQueryRequestContext));
+
+    Assertions.assertEquals(
+        "QueryId: " + EMR_JOB_ID + " not found", asyncQueryNotFoundException.getMessage());
+    verifyNoInteractions(sparkQueryDispatcher);
+    verifyNoInteractions(sparkExecutionEngineConfigSupplier);
+  }
+
+  @Test
+  void testGetAsyncQueryResultsWithInProgressJob() {
+    when(asyncQueryJobMetadataStorageService.getJobMetadata(EMR_JOB_ID))
+        .thenReturn(Optional.of(getAsyncQueryJobMetadata()));
+    JSONObject jobResult = new JSONObject();
+    jobResult.put("status", JobRunState.PENDING.toString());
+    when(sparkQueryDispatcher.getQueryResponse(
+            getAsyncQueryJobMetadata(), asyncQueryRequestContext))
+        .thenReturn(jobResult);
+
+    AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+        jobExecutorService.getAsyncQueryResults(EMR_JOB_ID, asyncQueryRequestContext);
+
+    Assertions.assertNull(asyncQueryExecutionResponse.getResults());
+    Assertions.assertNull(asyncQueryExecutionResponse.getSchema());
+    Assertions.assertEquals("PENDING", asyncQueryExecutionResponse.getStatus());
+    verifyNoInteractions(sparkExecutionEngineConfigSupplier);
+  }
+
+  @Test
+  void testGetAsyncQueryResultsWithSuccessJob() throws IOException {
+    when(asyncQueryJobMetadataStorageService.getJobMetadata(EMR_JOB_ID))
+        .thenReturn(Optional.of(getAsyncQueryJobMetadata()));
+    JSONObject jobResult = new JSONObject(getJson("select_query_response.json"));
+    jobResult.put("status", JobRunState.SUCCESS.toString());
+    when(sparkQueryDispatcher.getQueryResponse(
+            getAsyncQueryJobMetadata(), asyncQueryRequestContext))
+        .thenReturn(jobResult);
+
+    AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+        jobExecutorService.getAsyncQueryResults(EMR_JOB_ID, asyncQueryRequestContext);
+
+    Assertions.assertEquals("SUCCESS", asyncQueryExecutionResponse.getStatus());
+    Assertions.assertEquals(1, asyncQueryExecutionResponse.getSchema().getColumns().size());
+    Assertions.assertEquals(
+        "1", asyncQueryExecutionResponse.getSchema().getColumns().get(0).getName());
+    Assertions.assertEquals(
+        1,
+        ((HashMap<String, String>) asyncQueryExecutionResponse.getResults().get(0).value())
+            .get("1"));
+    verifyNoInteractions(sparkExecutionEngineConfigSupplier);
+  }
+
+  @Test
+  void testCancelJobWithJobNotFound() {
+    when(asyncQueryJobMetadataStorageService.getJobMetadata(EMR_JOB_ID))
+        .thenReturn(Optional.empty());
+
+    AsyncQueryNotFoundException asyncQueryNotFoundException =
+        Assertions.assertThrows(
+            AsyncQueryNotFoundException.class,
+            () -> jobExecutorService.cancelQuery(EMR_JOB_ID, asyncQueryRequestContext));
+
+    Assertions.assertEquals(
+        "QueryId: " + EMR_JOB_ID + " not found", asyncQueryNotFoundException.getMessage());
+    verifyNoInteractions(sparkQueryDispatcher);
+    verifyNoInteractions(sparkExecutionEngineConfigSupplier);
+  }
+
+  @Test
+  void testCancelJob() {
+    when(asyncQueryJobMetadataStorageService.getJobMetadata(EMR_JOB_ID))
+        .thenReturn(Optional.of(getAsyncQueryJobMetadata()));
+    when(sparkQueryDispatcher.cancelJob(getAsyncQueryJobMetadata(), asyncQueryRequestContext))
+        .thenReturn(EMR_JOB_ID);
+
+    String jobId = jobExecutorService.cancelQuery(EMR_JOB_ID, asyncQueryRequestContext);
+
+    Assertions.assertEquals(EMR_JOB_ID, jobId);
+    verifyNoInteractions(sparkExecutionEngineConfigSupplier);
+  }
+
+  private AsyncQueryJobMetadata getAsyncQueryJobMetadata() {
+    return AsyncQueryJobMetadata.builder()
+        .queryId(QUERY_ID)
+        .applicationId(EMRS_APPLICATION_ID)
+        .jobId(EMR_JOB_ID)
+        .query(QUERY)
+        .langType(LangType.SQL)
+        .build();
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/asyncquery/model/QueryStateTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/asyncquery/model/QueryStateTest.java
new file mode 100644
index 0000000000..8e86e3b176
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/asyncquery/model/QueryStateTest.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+class QueryStateTest {
+  @Test
+  public void testFromString() {
+    assertEquals(QueryState.WAITING, QueryState.fromString("waiting"));
+    assertEquals(QueryState.RUNNING, QueryState.fromString("running"));
+    assertEquals(QueryState.SUCCESS, QueryState.fromString("success"));
+    assertEquals(QueryState.FAILED, QueryState.fromString("failed"));
+    assertEquals(QueryState.CANCELLED, QueryState.fromString("cancelled"));
+    assertEquals(QueryState.TIMEOUT, QueryState.fromString("timeout"));
+  }
+
+  @Test
+  public void testFromStringWithUnknownState() {
+    assertThrows(IllegalArgumentException.class, () -> QueryState.fromString("UNKNOWN_STATE"));
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/client/EMRServerlessClientFactoryImplTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/client/EMRServerlessClientFactoryImplTest.java
new file mode 100644
index 0000000000..309d29c600
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/client/EMRServerlessClientFactoryImplTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.client;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfig;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigSupplier;
+import org.opensearch.sql.spark.constants.TestConstants;
+import org.opensearch.sql.spark.metrics.MetricsService;
+
+@ExtendWith(MockitoExtension.class)
+public class EMRServerlessClientFactoryImplTest {
+
+  public static final String ACCOUNT_ID = "accountId";
+  @Mock private SparkExecutionEngineConfigSupplier sparkExecutionEngineConfigSupplier;
+  @Mock private MetricsService metricsService;
+
+  @Test
+  public void testGetClient() {
+    when(sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(any()))
+        .thenReturn(createSparkExecutionEngineConfig());
+    EMRServerlessClientFactory emrServerlessClientFactory =
+        new EMRServerlessClientFactoryImpl(sparkExecutionEngineConfigSupplier, metricsService);
+
+    EMRServerlessClient emrserverlessClient = emrServerlessClientFactory.getClient(ACCOUNT_ID);
+
+    Assertions.assertNotNull(emrserverlessClient);
+  }
+
+  @Test
+  public void testGetClientWithChangeInSetting() {
+    SparkExecutionEngineConfig sparkExecutionEngineConfig = createSparkExecutionEngineConfig();
+    when(sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(any()))
+        .thenReturn(sparkExecutionEngineConfig);
+    EMRServerlessClientFactory emrServerlessClientFactory =
+        new EMRServerlessClientFactoryImpl(sparkExecutionEngineConfigSupplier, metricsService);
+    EMRServerlessClient emrserverlessClient = emrServerlessClientFactory.getClient(ACCOUNT_ID);
+    Assertions.assertNotNull(emrserverlessClient);
+
+    EMRServerlessClient emrServerlessClient1 = emrServerlessClientFactory.getClient(ACCOUNT_ID);
+    Assertions.assertEquals(emrServerlessClient1, emrserverlessClient);
+
+    sparkExecutionEngineConfig.setRegion(TestConstants.US_WEST_REGION);
+    when(sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(any()))
+        .thenReturn(sparkExecutionEngineConfig);
+    EMRServerlessClient emrServerlessClient2 = emrServerlessClientFactory.getClient(ACCOUNT_ID);
+    Assertions.assertNotEquals(emrServerlessClient2, emrserverlessClient);
+    Assertions.assertNotEquals(emrServerlessClient2, emrServerlessClient1);
+  }
+
+  @Test
+  public void testGetClientWithException() {
+    when(sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(any())).thenReturn(null);
+    EMRServerlessClientFactory emrServerlessClientFactory =
+        new EMRServerlessClientFactoryImpl(sparkExecutionEngineConfigSupplier, metricsService);
+
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> emrServerlessClientFactory.getClient(ACCOUNT_ID));
+
+    Assertions.assertEquals(
+        "Async Query APIs are disabled. Please configure plugins.query.executionengine.spark.config"
+            + " in cluster settings to enable them.",
+        illegalArgumentException.getMessage());
+  }
+
+  @Test
+  public void testGetClientWithExceptionWithNullRegion() {
+    SparkExecutionEngineConfig sparkExecutionEngineConfig =
+        SparkExecutionEngineConfig.builder().build();
+    when(sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(any()))
+        .thenReturn(sparkExecutionEngineConfig);
+    EMRServerlessClientFactory emrServerlessClientFactory =
+        new EMRServerlessClientFactoryImpl(sparkExecutionEngineConfigSupplier, metricsService);
+
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> emrServerlessClientFactory.getClient(ACCOUNT_ID));
+
+    Assertions.assertEquals(
+        "Async Query APIs are disabled. Please configure plugins.query.executionengine.spark.config"
+            + " in cluster settings to enable them.",
+        illegalArgumentException.getMessage());
+  }
+
+  private SparkExecutionEngineConfig createSparkExecutionEngineConfig() {
+    return SparkExecutionEngineConfig.builder()
+        .region(TestConstants.US_EAST_REGION)
+        .executionRoleARN(TestConstants.EMRS_EXECUTION_ROLE)
+        .sparkSubmitParameterModifier((sparkSubmitParameters) -> {})
+        .clusterName(TestConstants.TEST_CLUSTER_NAME)
+        .applicationId(TestConstants.EMRS_APPLICATION_ID)
+        .build();
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/client/EmrServerlessClientImplTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/client/EmrServerlessClientImplTest.java
new file mode 100644
index 0000000000..b3a2bda36a
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/client/EmrServerlessClientImplTest.java
@@ -0,0 +1,255 @@
+/* Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.client;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.spark.constants.TestConstants.DEFAULT_RESULT_INDEX;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_APPLICATION_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_EXECUTION_ROLE;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_JOB_NAME;
+import static org.opensearch.sql.spark.constants.TestConstants.EMR_JOB_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.ENTRY_POINT_START_JAR;
+import static org.opensearch.sql.spark.constants.TestConstants.QUERY;
+import static org.opensearch.sql.spark.constants.TestConstants.SPARK_SUBMIT_PARAMETERS;
+
+import com.amazonaws.services.emrserverless.AWSEMRServerless;
+import com.amazonaws.services.emrserverless.model.AWSEMRServerlessException;
+import com.amazonaws.services.emrserverless.model.CancelJobRunResult;
+import com.amazonaws.services.emrserverless.model.GetJobRunResult;
+import com.amazonaws.services.emrserverless.model.JobRun;
+import com.amazonaws.services.emrserverless.model.StartJobRunRequest;
+import com.amazonaws.services.emrserverless.model.StartJobRunResult;
+import com.amazonaws.services.emrserverless.model.ValidationException;
+import java.util.HashMap;
+import java.util.List;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.spark.metrics.MetricsService;
+import org.opensearch.sql.spark.parameter.SparkParameterComposerCollection;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilder;
+
+@ExtendWith(MockitoExtension.class)
+public class EmrServerlessClientImplTest {
+  @Mock private AWSEMRServerless emrServerless;
+  @Mock private MetricsService metricsService;
+
+  @Captor private ArgumentCaptor<StartJobRunRequest> startJobRunRequestArgumentCaptor;
+
+  @InjectMocks EmrServerlessClientImpl emrServerlessClient;
+
+  @Test
+  void testStartJobRun() {
+    StartJobRunResult response = new StartJobRunResult();
+    when(emrServerless.startJobRun(any())).thenReturn(response);
+
+    String parameters =
+        new SparkSubmitParametersBuilder(new SparkParameterComposerCollection())
+            .query(QUERY)
+            .toString();
+
+    emrServerlessClient.startJobRun(
+        new StartJobRequest(
+            EMRS_JOB_NAME,
+            null,
+            EMRS_APPLICATION_ID,
+            EMRS_EXECUTION_ROLE,
+            parameters,
+            new HashMap<>(),
+            false,
+            DEFAULT_RESULT_INDEX));
+    verify(emrServerless, times(1)).startJobRun(startJobRunRequestArgumentCaptor.capture());
+    StartJobRunRequest startJobRunRequest = startJobRunRequestArgumentCaptor.getValue();
+    Assertions.assertEquals(EMRS_APPLICATION_ID, startJobRunRequest.getApplicationId());
+    Assertions.assertEquals(EMRS_EXECUTION_ROLE, startJobRunRequest.getExecutionRoleArn());
+    Assertions.assertEquals(
+        ENTRY_POINT_START_JAR, startJobRunRequest.getJobDriver().getSparkSubmit().getEntryPoint());
+    Assertions.assertEquals(
+        List.of(DEFAULT_RESULT_INDEX),
+        startJobRunRequest.getJobDriver().getSparkSubmit().getEntryPointArguments());
+    Assertions.assertTrue(
+        startJobRunRequest
+            .getJobDriver()
+            .getSparkSubmit()
+            .getSparkSubmitParameters()
+            .contains(QUERY));
+  }
+
+  @Test
+  void testStartJobRunWithErrorMetric() {
+    doThrow(new AWSEMRServerlessException("Couldn't start job"))
+        .when(emrServerless)
+        .startJobRun(any());
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class,
+            () ->
+                emrServerlessClient.startJobRun(
+                    new StartJobRequest(
+                        EMRS_JOB_NAME,
+                        null,
+                        EMRS_APPLICATION_ID,
+                        EMRS_EXECUTION_ROLE,
+                        SPARK_SUBMIT_PARAMETERS,
+                        new HashMap<>(),
+                        false,
+                        null)));
+    Assertions.assertEquals("Internal Server Error.", runtimeException.getMessage());
+  }
+
+  @Test
+  void testStartJobRunResultIndex() {
+    StartJobRunResult response = new StartJobRunResult();
+    when(emrServerless.startJobRun(any())).thenReturn(response);
+
+    emrServerlessClient.startJobRun(
+        new StartJobRequest(
+            EMRS_JOB_NAME,
+            null,
+            EMRS_APPLICATION_ID,
+            EMRS_EXECUTION_ROLE,
+            SPARK_SUBMIT_PARAMETERS,
+            new HashMap<>(),
+            false,
+            "foo"));
+  }
+
+  @Test
+  void testGetJobRunState() {
+    JobRun jobRun = new JobRun();
+    jobRun.setState("Running");
+    GetJobRunResult response = new GetJobRunResult();
+    response.setJobRun(jobRun);
+    when(emrServerless.getJobRun(any())).thenReturn(response);
+    emrServerlessClient.getJobRunResult(EMRS_APPLICATION_ID, "123");
+  }
+
+  @Test
+  void testGetJobRunStateWithErrorMetric() {
+    doThrow(new ValidationException("Not a good job")).when(emrServerless).getJobRun(any());
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class,
+            () -> emrServerlessClient.getJobRunResult(EMRS_APPLICATION_ID, "123"));
+    Assertions.assertEquals("Internal Server Error.", runtimeException.getMessage());
+  }
+
+  @Test
+  void testCancelJobRun() {
+    when(emrServerless.cancelJobRun(any()))
+        .thenReturn(new CancelJobRunResult().withJobRunId(EMR_JOB_ID));
+
+    CancelJobRunResult cancelJobRunResult =
+        emrServerlessClient.cancelJobRun(EMRS_APPLICATION_ID, EMR_JOB_ID, false);
+
+    Assertions.assertEquals(EMR_JOB_ID, cancelJobRunResult.getJobRunId());
+  }
+
+  @Test
+  void testCancelJobRunWithErrorMetric() {
+    doThrow(new RuntimeException()).when(emrServerless).cancelJobRun(any());
+
+    Assertions.assertThrows(
+        RuntimeException.class,
+        () -> emrServerlessClient.cancelJobRun(EMRS_APPLICATION_ID, "123", false));
+  }
+
+  @Test
+  void testCancelJobRunWithValidationException() {
+    doThrow(new ValidationException("Error")).when(emrServerless).cancelJobRun(any());
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () -> emrServerlessClient.cancelJobRun(EMRS_APPLICATION_ID, EMR_JOB_ID, false));
+
+    Assertions.assertEquals(
+        "The input fails to satisfy the constraints specified by AWS EMR Serverless.",
+        runtimeException.getMessage());
+  }
+
+  @Test
+  void testCancelJobRunWithNativeEMRExceptionWithValidationException() {
+    doThrow(new ValidationException("Error")).when(emrServerless).cancelJobRun(any());
+
+    ValidationException validationException =
+        Assertions.assertThrows(
+            ValidationException.class,
+            () -> emrServerlessClient.cancelJobRun(EMRS_APPLICATION_ID, EMR_JOB_ID, true));
+
+    Assertions.assertTrue(validationException.getMessage().contains("Error"));
+  }
+
+  @Test
+  void testCancelJobRunWithNativeEMRException() {
+    when(emrServerless.cancelJobRun(any()))
+        .thenReturn(new CancelJobRunResult().withJobRunId(EMR_JOB_ID));
+
+    CancelJobRunResult cancelJobRunResult =
+        emrServerlessClient.cancelJobRun(EMRS_APPLICATION_ID, EMR_JOB_ID, true);
+
+    Assertions.assertEquals(EMR_JOB_ID, cancelJobRunResult.getJobRunId());
+  }
+
+  @Test
+  void testStartJobRunWithLongJobName() {
+    StartJobRunResult response = new StartJobRunResult();
+    when(emrServerless.startJobRun(any())).thenReturn(response);
+
+    emrServerlessClient.startJobRun(
+        new StartJobRequest(
+            RandomStringUtils.random(300),
+            null,
+            EMRS_APPLICATION_ID,
+            EMRS_EXECUTION_ROLE,
+            SPARK_SUBMIT_PARAMETERS,
+            new HashMap<>(),
+            false,
+            DEFAULT_RESULT_INDEX));
+
+    verify(emrServerless, times(1)).startJobRun(startJobRunRequestArgumentCaptor.capture());
+    StartJobRunRequest startJobRunRequest = startJobRunRequestArgumentCaptor.getValue();
+    Assertions.assertEquals(255, startJobRunRequest.getName().length());
+  }
+
+  @Test
+  void testStartJobRunThrowsValidationException() {
+    when(emrServerless.startJobRun(any())).thenThrow(new ValidationException("Unmatched quote"));
+
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                emrServerlessClient.startJobRun(
+                    new StartJobRequest(
+                        EMRS_JOB_NAME,
+                        null,
+                        EMRS_APPLICATION_ID,
+                        EMRS_EXECUTION_ROLE,
+                        SPARK_SUBMIT_PARAMETERS,
+                        new HashMap<>(),
+                        false,
+                        DEFAULT_RESULT_INDEX)),
+            "Expected ValidationException to be thrown");
+
+    // Verify that the message in the exception is correct
+    Assertions.assertEquals(
+        "The input fails to satisfy the constraints specified by AWS EMR Serverless.",
+        exception.getMessage());
+
+    // Optionally verify that no job run is started
+    verify(emrServerless, times(1)).startJobRun(any());
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/client/StartJobRequestTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/client/StartJobRequestTest.java
new file mode 100644
index 0000000000..ac5b0dd750
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/client/StartJobRequestTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.client;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.opensearch.sql.spark.client.StartJobRequest.DEFAULT_JOB_TIMEOUT;
+
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class StartJobRequestTest {
+
+  @Test
+  void executionTimeout() {
+    assertEquals(DEFAULT_JOB_TIMEOUT, onDemandJob().executionTimeout());
+    assertEquals(0L, streamingJob().executionTimeout());
+  }
+
+  private StartJobRequest onDemandJob() {
+    return new StartJobRequest("", null, "", "", "", Map.of(), false, null);
+  }
+
+  private StartJobRequest streamingJob() {
+    return new StartJobRequest("", null, "", "", "", Map.of(), true, null);
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/constants/TestConstants.java b/async-query-core/src/test/java/org/opensearch/sql/spark/constants/TestConstants.java
new file mode 100644
index 0000000000..295c74dcee
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/constants/TestConstants.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.constants;
+
+public class TestConstants {
+  public static final String QUERY = "select 1";
+  public static final String EMR_JOB_ID = "job-123xxx";
+  public static final String EMRS_APPLICATION_ID = "app-xxxxx";
+  public static final String EMRS_EXECUTION_ROLE = "execution_role";
+  public static final String EMRS_JOB_NAME = "job_name";
+  public static final String SPARK_SUBMIT_PARAMETERS = "--conf org.flint.sql.SQLJob";
+  public static final String TEST_CLUSTER_NAME = "TEST_CLUSTER";
+  public static final String MOCK_SESSION_ID = "s-0123456";
+  public static final String MOCK_STATEMENT_ID = "st-0123456";
+  public static final String ENTRY_POINT_START_JAR =
+      "file:///home/hadoop/.ivy2/jars/org.opensearch_opensearch-spark-sql-application_2.12-0.3.0-SNAPSHOT.jar";
+  public static final String DEFAULT_RESULT_INDEX = "query_execution_result_ds1";
+  public static final String US_EAST_REGION = "us-east-1";
+  public static final String US_WEST_REGION = "us-west-1";
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/DatasourceEmbeddedQueryIdProviderTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/DatasourceEmbeddedQueryIdProviderTest.java
new file mode 100644
index 0000000000..7f1c92dff3
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/DatasourceEmbeddedQueryIdProviderTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+
+@ExtendWith(MockitoExtension.class)
+class DatasourceEmbeddedQueryIdProviderTest {
+  @Mock AsyncQueryRequestContext asyncQueryRequestContext;
+
+  DatasourceEmbeddedQueryIdProvider datasourceEmbeddedQueryIdProvider =
+      new DatasourceEmbeddedQueryIdProvider();
+
+  @Test
+  public void test() {
+    String queryId =
+        datasourceEmbeddedQueryIdProvider.getQueryId(
+            DispatchQueryRequest.builder().datasource("DATASOURCE").build(),
+            asyncQueryRequestContext);
+
+    assertNotNull(queryId);
+    verifyNoInteractions(asyncQueryRequestContext);
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/IndexDMLHandlerTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/IndexDMLHandlerTest.java
new file mode 100644
index 0000000000..570a7cab7d
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/IndexDMLHandlerTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.datasource.model.DataSourceStatus.ACTIVE;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_APPLICATION_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_EXECUTION_ROLE;
+import static org.opensearch.sql.spark.constants.TestConstants.TEST_CLUSTER_NAME;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ERROR_FIELD;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.STATUS_FIELD;
+
+import java.util.HashMap;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.config.SparkSubmitParameterModifier;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryActionType;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryDetails;
+import org.opensearch.sql.spark.flint.FlintIndexMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.FlintIndexType;
+import org.opensearch.sql.spark.flint.IndexDMLResultStorageService;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+@ExtendWith(MockitoExtension.class)
+class IndexDMLHandlerTest {
+
+  private static final String QUERY_ID = "QUERY_ID";
+  @Mock private JobExecutionResponseReader jobExecutionResponseReader;
+  @Mock private FlintIndexMetadataService flintIndexMetadataService;
+  @Mock private IndexDMLResultStorageService indexDMLResultStorageService;
+  @Mock private FlintIndexOpFactory flintIndexOpFactory;
+  @Mock private SparkSubmitParameterModifier sparkSubmitParameterModifier;
+  @Mock private AsyncQueryRequestContext asyncQueryRequestContext;
+
+  @InjectMocks IndexDMLHandler indexDMLHandler;
+
+  private static final DataSourceMetadata metadata =
+      new DataSourceMetadata.Builder()
+          .setName("mys3")
+          .setDescription("test description")
+          .setConnector(DataSourceType.S3GLUE)
+          .setDataSourceStatus(ACTIVE)
+          .build();
+
+  @Test
+  public void getResponseFromExecutor() {
+    JSONObject result =
+        new IndexDMLHandler(null, null, null, null)
+            .getResponseFromExecutor(null, asyncQueryRequestContext);
+
+    assertEquals("running", result.getString(STATUS_FIELD));
+    assertEquals("", result.getString(ERROR_FIELD));
+  }
+
+  @Test
+  public void testWhenIndexDetailsAreNotFound() {
+    DispatchQueryRequest dispatchQueryRequest = getDispatchQueryRequest("DROP INDEX");
+    IndexQueryDetails indexQueryDetails =
+        IndexQueryDetails.builder()
+            .mvName("mys3.default.http_logs_metrics")
+            .indexType(FlintIndexType.MATERIALIZED_VIEW)
+            .build();
+    DispatchQueryContext dispatchQueryContext =
+        DispatchQueryContext.builder()
+            .queryId(QUERY_ID)
+            .dataSourceMetadata(metadata)
+            .indexQueryDetails(indexQueryDetails)
+            .asyncQueryRequestContext(asyncQueryRequestContext)
+            .build();
+    Mockito.when(
+            flintIndexMetadataService.getFlintIndexMetadata(any(), eq(asyncQueryRequestContext)))
+        .thenReturn(new HashMap<>());
+
+    DispatchQueryResponse dispatchQueryResponse =
+        indexDMLHandler.submit(dispatchQueryRequest, dispatchQueryContext);
+
+    Assertions.assertNotNull(dispatchQueryResponse.getQueryId());
+  }
+
+  @Test
+  public void testWhenIndexDetailsWithInvalidQueryActionType() {
+    FlintIndexMetadata flintIndexMetadata = mock(FlintIndexMetadata.class);
+    DispatchQueryRequest dispatchQueryRequest = getDispatchQueryRequest("CREATE INDEX");
+    IndexQueryDetails indexQueryDetails =
+        IndexQueryDetails.builder()
+            .mvName("mys3.default.http_logs_metrics")
+            .indexQueryActionType(IndexQueryActionType.CREATE)
+            .indexType(FlintIndexType.MATERIALIZED_VIEW)
+            .build();
+    DispatchQueryContext dispatchQueryContext =
+        DispatchQueryContext.builder()
+            .queryId(QUERY_ID)
+            .dataSourceMetadata(metadata)
+            .indexQueryDetails(indexQueryDetails)
+            .asyncQueryRequestContext(asyncQueryRequestContext)
+            .build();
+    HashMap<String, FlintIndexMetadata> flintMetadataMap = new HashMap<>();
+    flintMetadataMap.put(indexQueryDetails.openSearchIndexName(), flintIndexMetadata);
+    when(flintIndexMetadataService.getFlintIndexMetadata(
+            indexQueryDetails.openSearchIndexName(), asyncQueryRequestContext))
+        .thenReturn(flintMetadataMap);
+
+    indexDMLHandler.submit(dispatchQueryRequest, dispatchQueryContext);
+  }
+
+  private DispatchQueryRequest getDispatchQueryRequest(String query) {
+    return DispatchQueryRequest.builder()
+        .applicationId(EMRS_APPLICATION_ID)
+        .query(query)
+        .datasource("my_glue")
+        .langType(LangType.SQL)
+        .executionRoleARN(EMRS_EXECUTION_ROLE)
+        .clusterName(TEST_CLUSTER_NAME)
+        .sparkSubmitParameterModifier(sparkSubmitParameterModifier)
+        .build();
+  }
+
+  @Test
+  public void testStaticMethods() {
+    Assertions.assertTrue(IndexDMLHandler.isIndexDMLQuery("dropIndexJobId"));
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/SparkQueryDispatcherTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/SparkQueryDispatcherTest.java
new file mode 100644
index 0000000000..1a38b6977f
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/dispatcher/SparkQueryDispatcherTest.java
@@ -0,0 +1,1067 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.dispatcher;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_APPLICATION_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_EXECUTION_ROLE;
+import static org.opensearch.sql.spark.constants.TestConstants.EMR_JOB_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.MOCK_SESSION_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.MOCK_STATEMENT_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.TEST_CLUSTER_NAME;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.DATA_FIELD;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ERROR_FIELD;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_AUTH_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_HOST_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_PORT_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_SCHEME_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.STATUS_FIELD;
+import static org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher.CLUSTER_NAME_TAG_KEY;
+import static org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher.DATASOURCE_TAG_KEY;
+import static org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher.INDEX_TAG_KEY;
+import static org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher.JOB_TYPE_TAG_KEY;
+
+import com.amazonaws.services.emrserverless.model.CancelJobRunResult;
+import com.amazonaws.services.emrserverless.model.GetJobRunResult;
+import com.amazonaws.services.emrserverless.model.JobRun;
+import com.amazonaws.services.emrserverless.model.JobRunState;
+import com.google.common.collect.ImmutableMap;
+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.Optional;
+import java.util.stream.Collectors;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClient;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.client.StartJobRequest;
+import org.opensearch.sql.spark.config.SparkSubmitParameterModifier;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryResponse;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.execution.session.Session;
+import org.opensearch.sql.spark.execution.session.SessionManager;
+import org.opensearch.sql.spark.execution.statement.Statement;
+import org.opensearch.sql.spark.execution.statement.StatementId;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.IndexDMLResultStorageService;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
+import org.opensearch.sql.spark.leasemanager.LeaseManager;
+import org.opensearch.sql.spark.metrics.MetricsService;
+import org.opensearch.sql.spark.parameter.DataSourceSparkParameterComposer;
+import org.opensearch.sql.spark.parameter.GeneralSparkParameterComposer;
+import org.opensearch.sql.spark.parameter.SparkParameterComposerCollection;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilderProvider;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.spark.scheduler.AsyncQueryScheduler;
+import org.opensearch.sql.spark.validator.DefaultGrammarElementValidator;
+import org.opensearch.sql.spark.validator.GrammarElementValidatorProvider;
+import org.opensearch.sql.spark.validator.S3GlueGrammarElementValidator;
+import org.opensearch.sql.spark.validator.SQLQueryValidator;
+
+@ExtendWith(MockitoExtension.class)
+public class SparkQueryDispatcherTest {
+
+  public static final String MY_GLUE = "my_glue";
+  public static final String KEY_FROM_COMPOSER = "key.from.composer";
+  public static final String VALUE_FROM_COMPOSER = "value.from.composer";
+  public static final String KEY_FROM_DATASOURCE_COMPOSER = "key.from.datasource.composer";
+  public static final String VALUE_FROM_DATASOURCE_COMPOSER = "value.from.datasource.composer";
+  @Mock private EMRServerlessClient emrServerlessClient;
+  @Mock private EMRServerlessClientFactory emrServerlessClientFactory;
+  @Mock private DataSourceService dataSourceService;
+  @Mock private JobExecutionResponseReader jobExecutionResponseReader;
+  @Mock private FlintIndexMetadataService flintIndexMetadataService;
+  @Mock private SessionManager sessionManager;
+  @Mock private LeaseManager leaseManager;
+  @Mock private IndexDMLResultStorageService indexDMLResultStorageService;
+  @Mock private FlintIndexOpFactory flintIndexOpFactory;
+  @Mock private SparkSubmitParameterModifier sparkSubmitParameterModifier;
+  @Mock private QueryIdProvider queryIdProvider;
+  @Mock private AsyncQueryRequestContext asyncQueryRequestContext;
+  @Mock private MetricsService metricsService;
+  @Mock private AsyncQueryScheduler asyncQueryScheduler;
+
+  private final SQLQueryValidator sqlQueryValidator =
+      new SQLQueryValidator(
+          new GrammarElementValidatorProvider(
+              ImmutableMap.of(DataSourceType.S3GLUE, new S3GlueGrammarElementValidator()),
+              new DefaultGrammarElementValidator()));
+
+  private DataSourceSparkParameterComposer dataSourceSparkParameterComposer =
+      (datasourceMetadata, sparkSubmitParameters, dispatchQueryRequest, context) -> {
+        sparkSubmitParameters.setConfigItem(FLINT_INDEX_STORE_AUTH_KEY, "basic");
+        sparkSubmitParameters.setConfigItem(FLINT_INDEX_STORE_HOST_KEY, "HOST");
+        sparkSubmitParameters.setConfigItem(FLINT_INDEX_STORE_PORT_KEY, "PORT");
+        sparkSubmitParameters.setConfigItem(FLINT_INDEX_STORE_SCHEME_KEY, "SCHEMA");
+        sparkSubmitParameters.setConfigItem(
+            KEY_FROM_DATASOURCE_COMPOSER, VALUE_FROM_DATASOURCE_COMPOSER);
+      };
+
+  private GeneralSparkParameterComposer generalSparkParameterComposer =
+      (sparkSubmitParameters, dispatchQueryRequest, context) -> {
+        sparkSubmitParameters.setConfigItem(KEY_FROM_COMPOSER, VALUE_FROM_COMPOSER);
+      };
+
+  private SparkSubmitParametersBuilderProvider sparkSubmitParametersBuilderProvider;
+
+  @Mock(answer = RETURNS_DEEP_STUBS)
+  private Session session;
+
+  @Mock(answer = RETURNS_DEEP_STUBS)
+  private Statement statement;
+
+  private SparkQueryDispatcher sparkQueryDispatcher;
+
+  private final String QUERY_ID = "QUERY_ID";
+
+  @Captor ArgumentCaptor<StartJobRequest> startJobRequestArgumentCaptor;
+
+  @BeforeEach
+  void setUp() {
+    SparkParameterComposerCollection collection = new SparkParameterComposerCollection();
+    collection.register(DataSourceType.S3GLUE, dataSourceSparkParameterComposer);
+    collection.register(generalSparkParameterComposer);
+    sparkSubmitParametersBuilderProvider = new SparkSubmitParametersBuilderProvider(collection);
+    QueryHandlerFactory queryHandlerFactory =
+        new QueryHandlerFactory(
+            jobExecutionResponseReader,
+            flintIndexMetadataService,
+            sessionManager,
+            leaseManager,
+            indexDMLResultStorageService,
+            flintIndexOpFactory,
+            emrServerlessClientFactory,
+            metricsService,
+            sparkSubmitParametersBuilderProvider);
+    sparkQueryDispatcher =
+        new SparkQueryDispatcher(
+            dataSourceService,
+            sessionManager,
+            queryHandlerFactory,
+            queryIdProvider,
+            sqlQueryValidator);
+  }
+
+  @Test
+  void testDispatchSelectQuery() {
+    testDispatchBatchQuery("select * from my_glue.default.http_logs");
+  }
+
+  @Test
+  void testDispatchSelectQueryWithBasicAuthIndexStoreDatasource() {
+    testDispatchBatchQuery("select * from my_glue.default.http_logs");
+  }
+
+  @Test
+  void testDispatchSelectQueryCreateNewSession() {
+    String query = "select * from my_glue.default.http_logs";
+    DispatchQueryRequest queryRequest = dispatchQueryRequestWithSessionId(query, null);
+
+    doReturn(true).when(sessionManager).isEnabled();
+    doReturn(session).when(sessionManager).createSession(any(), any());
+    doReturn(MOCK_SESSION_ID).when(session).getSessionId();
+    doReturn(new StatementId(MOCK_STATEMENT_ID)).when(session).submit(any(), any());
+    when(session.getSessionModel().getJobId()).thenReturn(EMR_JOB_ID);
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            MY_GLUE, asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    DispatchQueryResponse dispatchQueryResponse =
+        sparkQueryDispatcher.dispatch(queryRequest, asyncQueryRequestContext);
+
+    verifyNoInteractions(emrServerlessClient);
+    verify(sessionManager, never()).getSession(any(), any());
+    assertEquals(EMR_JOB_ID, dispatchQueryResponse.getJobId());
+    assertEquals(MOCK_SESSION_ID, dispatchQueryResponse.getSessionId());
+  }
+
+  @Test
+  void testDispatchSelectQueryReuseSession() {
+    String query = "select * from my_glue.default.http_logs";
+    DispatchQueryRequest queryRequest = dispatchQueryRequestWithSessionId(query, MOCK_SESSION_ID);
+
+    doReturn(true).when(sessionManager).isEnabled();
+    doReturn(Optional.of(session))
+        .when(sessionManager)
+        .getSession(eq(MOCK_SESSION_ID), eq(MY_GLUE));
+    doReturn(MOCK_SESSION_ID).when(session).getSessionId();
+    doReturn(new StatementId(MOCK_STATEMENT_ID)).when(session).submit(any(), any());
+    when(session.getSessionModel().getJobId()).thenReturn(EMR_JOB_ID);
+    when(session.isOperationalForDataSource(any())).thenReturn(true);
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            MY_GLUE, asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    DispatchQueryResponse dispatchQueryResponse =
+        sparkQueryDispatcher.dispatch(queryRequest, asyncQueryRequestContext);
+
+    verifyNoInteractions(emrServerlessClient);
+    verify(sessionManager, never()).createSession(any(), any());
+    assertEquals(EMR_JOB_ID, dispatchQueryResponse.getJobId());
+    assertEquals(MOCK_SESSION_ID, dispatchQueryResponse.getSessionId());
+  }
+
+  @Test
+  void testDispatchSelectQueryFailedCreateSession() {
+    String query = "select * from my_glue.default.http_logs";
+    DispatchQueryRequest queryRequest = dispatchQueryRequestWithSessionId(query, null);
+
+    doReturn(true).when(sessionManager).isEnabled();
+    doThrow(RuntimeException.class).when(sessionManager).createSession(any(), any());
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            MY_GLUE, asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    Assertions.assertThrows(
+        RuntimeException.class,
+        () -> sparkQueryDispatcher.dispatch(queryRequest, asyncQueryRequestContext));
+
+    verifyNoInteractions(emrServerlessClient);
+  }
+
+  @Test
+  void testDispatchCreateAutoRefreshIndexQuery() {
+    when(emrServerlessClientFactory.getClient(any())).thenReturn(emrServerlessClient);
+    when(queryIdProvider.getQueryId(any(), any())).thenReturn(QUERY_ID);
+    HashMap<String, String> tags = new HashMap<>();
+    tags.put(DATASOURCE_TAG_KEY, MY_GLUE);
+    tags.put(INDEX_TAG_KEY, "flint_my_glue_default_http_logs_elb_and_requesturi_index");
+    tags.put(CLUSTER_NAME_TAG_KEY, TEST_CLUSTER_NAME);
+    tags.put(JOB_TYPE_TAG_KEY, JobType.STREAMING.getText());
+    String query =
+        "CREATE INDEX elb_and_requestUri ON my_glue.default.http_logs(l_orderkey, l_quantity) WITH"
+            + " (auto_refresh = true)";
+    String sparkSubmitParameters =
+        constructExpectedSparkSubmitParameterString(query, "streaming", QUERY_ID);
+    StartJobRequest expected =
+        new StartJobRequest(
+            "TEST_CLUSTER:streaming:flint_my_glue_default_http_logs_elb_and_requesturi_index",
+            null,
+            EMRS_APPLICATION_ID,
+            EMRS_EXECUTION_ROLE,
+            sparkSubmitParameters,
+            tags,
+            true,
+            "query_execution_result_my_glue");
+    when(emrServerlessClient.startJobRun(expected)).thenReturn(EMR_JOB_ID);
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            MY_GLUE, asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    DispatchQueryResponse dispatchQueryResponse =
+        sparkQueryDispatcher.dispatch(getBaseDispatchQueryRequest(query), asyncQueryRequestContext);
+
+    verify(emrServerlessClient, times(1)).startJobRun(startJobRequestArgumentCaptor.capture());
+    assertEquals(expected, startJobRequestArgumentCaptor.getValue());
+    assertEquals(EMR_JOB_ID, dispatchQueryResponse.getJobId());
+    verifyNoInteractions(flintIndexMetadataService);
+  }
+
+  @Test
+  void testDispatchCreateManualRefreshIndexQuery() {
+    testDispatchBatchQuery(
+        "CREATE INDEX elb_and_requestUri ON my_glue.default.http_logs(l_orderkey, l_quantity) WITH"
+            + " (auto_refresh = false)");
+  }
+
+  @Test
+  void testDispatchWithPPLQuery() {
+    when(emrServerlessClientFactory.getClient(any())).thenReturn(emrServerlessClient);
+    when(queryIdProvider.getQueryId(any(), any())).thenReturn(QUERY_ID);
+    HashMap<String, String> tags = new HashMap<>();
+    tags.put(DATASOURCE_TAG_KEY, MY_GLUE);
+    tags.put(CLUSTER_NAME_TAG_KEY, TEST_CLUSTER_NAME);
+    tags.put(JOB_TYPE_TAG_KEY, JobType.BATCH.getText());
+    String query = "source = my_glue.default.http_logs";
+    String sparkSubmitParameters =
+        constructExpectedSparkSubmitParameterString(query, null, QUERY_ID);
+    StartJobRequest expected =
+        new StartJobRequest(
+            "TEST_CLUSTER:batch",
+            null,
+            EMRS_APPLICATION_ID,
+            EMRS_EXECUTION_ROLE,
+            sparkSubmitParameters,
+            tags,
+            false,
+            "query_execution_result_my_glue");
+    when(emrServerlessClient.startJobRun(expected)).thenReturn(EMR_JOB_ID);
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            MY_GLUE, asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    DispatchQueryResponse dispatchQueryResponse =
+        sparkQueryDispatcher.dispatch(
+            getBaseDispatchQueryRequestBuilder(query).langType(LangType.PPL).build(),
+            asyncQueryRequestContext);
+
+    verify(emrServerlessClient, times(1)).startJobRun(startJobRequestArgumentCaptor.capture());
+    assertEquals(expected, startJobRequestArgumentCaptor.getValue());
+    assertEquals(EMR_JOB_ID, dispatchQueryResponse.getJobId());
+    verifyNoInteractions(flintIndexMetadataService);
+  }
+
+  @Test
+  void testDispatchWithSparkUDFQuery() {
+    List<String> udfQueries = new ArrayList<>();
+    udfQueries.add(
+        "CREATE FUNCTION celsius_to_fahrenheit AS 'org.apache.spark.sql.functions.expr(\"(celsius *"
+            + " 9/5) + 32\")'");
+    udfQueries.add(
+        "CREATE TEMPORARY FUNCTION square AS 'org.apache.spark.sql.functions.expr(\"num * num\")'");
+    for (String query : udfQueries) {
+      DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+      when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+              MY_GLUE, asyncQueryRequestContext))
+          .thenReturn(dataSourceMetadata);
+
+      IllegalArgumentException illegalArgumentException =
+          Assertions.assertThrows(
+              IllegalArgumentException.class,
+              () ->
+                  sparkQueryDispatcher.dispatch(
+                      getBaseDispatchQueryRequestBuilder(query).langType(LangType.SQL).build(),
+                      asyncQueryRequestContext));
+      assertEquals("CREATE FUNCTION is not allowed.", illegalArgumentException.getMessage());
+      verifyNoInteractions(emrServerlessClient);
+      verifyNoInteractions(flintIndexMetadataService);
+    }
+  }
+
+  @Test
+  void testDispatchQueryWithoutATableAndDataSourceName() {
+    testDispatchBatchQuery("show tables");
+  }
+
+  @Test
+  void testDispatchIndexQueryWithoutADatasourceName() {
+    when(emrServerlessClientFactory.getClient(any())).thenReturn(emrServerlessClient);
+    when(queryIdProvider.getQueryId(any(), any())).thenReturn(QUERY_ID);
+    HashMap<String, String> tags = new HashMap<>();
+    tags.put(DATASOURCE_TAG_KEY, MY_GLUE);
+    tags.put(INDEX_TAG_KEY, "flint_my_glue_default_http_logs_elb_and_requesturi_index");
+    tags.put(CLUSTER_NAME_TAG_KEY, TEST_CLUSTER_NAME);
+    tags.put(JOB_TYPE_TAG_KEY, JobType.STREAMING.getText());
+    String query =
+        "CREATE INDEX elb_and_requestUri ON default.http_logs(l_orderkey, l_quantity) WITH"
+            + " (auto_refresh = true)";
+    String sparkSubmitParameters =
+        constructExpectedSparkSubmitParameterString(query, "streaming", QUERY_ID);
+    StartJobRequest expected =
+        new StartJobRequest(
+            "TEST_CLUSTER:streaming:flint_my_glue_default_http_logs_elb_and_requesturi_index",
+            null,
+            EMRS_APPLICATION_ID,
+            EMRS_EXECUTION_ROLE,
+            sparkSubmitParameters,
+            tags,
+            true,
+            "query_execution_result_my_glue");
+    when(emrServerlessClient.startJobRun(expected)).thenReturn(EMR_JOB_ID);
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            MY_GLUE, asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    DispatchQueryResponse dispatchQueryResponse =
+        sparkQueryDispatcher.dispatch(getBaseDispatchQueryRequest(query), asyncQueryRequestContext);
+
+    verify(emrServerlessClient, times(1)).startJobRun(startJobRequestArgumentCaptor.capture());
+    assertEquals(expected, startJobRequestArgumentCaptor.getValue());
+    assertEquals(EMR_JOB_ID, dispatchQueryResponse.getJobId());
+    verifyNoInteractions(flintIndexMetadataService);
+  }
+
+  @Test
+  void testDispatchMaterializedViewQuery() {
+    when(emrServerlessClientFactory.getClient(any())).thenReturn(emrServerlessClient);
+    when(queryIdProvider.getQueryId(any(), any())).thenReturn(QUERY_ID);
+    HashMap<String, String> tags = new HashMap<>();
+    tags.put(DATASOURCE_TAG_KEY, MY_GLUE);
+    tags.put(INDEX_TAG_KEY, "flint_mv_1");
+    tags.put(CLUSTER_NAME_TAG_KEY, TEST_CLUSTER_NAME);
+    tags.put(JOB_TYPE_TAG_KEY, JobType.STREAMING.getText());
+    String query =
+        "CREATE MATERIALIZED VIEW mv_1 AS select * from logs WITH" + " (auto_refresh = true)";
+    String sparkSubmitParameters =
+        constructExpectedSparkSubmitParameterString(query, "streaming", QUERY_ID);
+    StartJobRequest expected =
+        new StartJobRequest(
+            "TEST_CLUSTER:streaming:flint_mv_1",
+            null,
+            EMRS_APPLICATION_ID,
+            EMRS_EXECUTION_ROLE,
+            sparkSubmitParameters,
+            tags,
+            true,
+            "query_execution_result_my_glue");
+    when(emrServerlessClient.startJobRun(expected)).thenReturn(EMR_JOB_ID);
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            MY_GLUE, asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    DispatchQueryResponse dispatchQueryResponse =
+        sparkQueryDispatcher.dispatch(getBaseDispatchQueryRequest(query), asyncQueryRequestContext);
+
+    verify(emrServerlessClient, times(1)).startJobRun(startJobRequestArgumentCaptor.capture());
+    assertEquals(expected, startJobRequestArgumentCaptor.getValue());
+    assertEquals(EMR_JOB_ID, dispatchQueryResponse.getJobId());
+    verifyNoInteractions(flintIndexMetadataService);
+  }
+
+  @Test
+  void testManualRefreshMaterializedViewQuery() {
+    when(emrServerlessClientFactory.getClient(any())).thenReturn(emrServerlessClient);
+    when(queryIdProvider.getQueryId(any(), any())).thenReturn(QUERY_ID);
+    HashMap<String, String> tags = new HashMap<>();
+    tags.put(DATASOURCE_TAG_KEY, MY_GLUE);
+    tags.put(CLUSTER_NAME_TAG_KEY, TEST_CLUSTER_NAME);
+    tags.put(JOB_TYPE_TAG_KEY, JobType.BATCH.getText());
+    String query =
+        "CREATE MATERIALIZED VIEW mv_1 AS select * from logs WITH" + " (auto_refresh = false)";
+    String sparkSubmitParameters =
+        constructExpectedSparkSubmitParameterString(query, null, QUERY_ID);
+    StartJobRequest expected =
+        new StartJobRequest(
+            "TEST_CLUSTER:batch",
+            null,
+            EMRS_APPLICATION_ID,
+            EMRS_EXECUTION_ROLE,
+            sparkSubmitParameters,
+            tags,
+            false,
+            "query_execution_result_my_glue");
+    when(emrServerlessClient.startJobRun(expected)).thenReturn(EMR_JOB_ID);
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            MY_GLUE, asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    DispatchQueryResponse dispatchQueryResponse =
+        sparkQueryDispatcher.dispatch(getBaseDispatchQueryRequest(query), asyncQueryRequestContext);
+
+    verify(emrServerlessClient, times(1)).startJobRun(startJobRequestArgumentCaptor.capture());
+    assertEquals(expected, startJobRequestArgumentCaptor.getValue());
+    assertEquals(EMR_JOB_ID, dispatchQueryResponse.getJobId());
+    assertEquals("flint_mv_1", dispatchQueryResponse.getIndexName());
+    verifyNoInteractions(flintIndexMetadataService);
+  }
+
+  @Test
+  void testDispatchShowMVQuery() {
+    testDispatchBatchQuery("SHOW MATERIALIZED VIEW IN mys3.default");
+  }
+
+  @Test
+  void testRefreshIndexQuery() {
+    when(emrServerlessClientFactory.getClient(any())).thenReturn(emrServerlessClient);
+    when(queryIdProvider.getQueryId(any(), any())).thenReturn(QUERY_ID);
+    HashMap<String, String> tags = new HashMap<>();
+    tags.put(DATASOURCE_TAG_KEY, MY_GLUE);
+    tags.put(CLUSTER_NAME_TAG_KEY, TEST_CLUSTER_NAME);
+    tags.put(JOB_TYPE_TAG_KEY, JobType.BATCH.getText());
+    String query = "REFRESH SKIPPING INDEX ON my_glue.default.http_logs";
+    String sparkSubmitParameters =
+        constructExpectedSparkSubmitParameterString(query, null, QUERY_ID);
+    StartJobRequest expected =
+        new StartJobRequest(
+            "TEST_CLUSTER:batch",
+            null,
+            EMRS_APPLICATION_ID,
+            EMRS_EXECUTION_ROLE,
+            sparkSubmitParameters,
+            tags,
+            false,
+            "query_execution_result_my_glue");
+    when(emrServerlessClient.startJobRun(expected)).thenReturn(EMR_JOB_ID);
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            MY_GLUE, asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    DispatchQueryResponse dispatchQueryResponse =
+        sparkQueryDispatcher.dispatch(getBaseDispatchQueryRequest(query), asyncQueryRequestContext);
+
+    verify(emrServerlessClient, times(1)).startJobRun(startJobRequestArgumentCaptor.capture());
+    assertEquals(expected, startJobRequestArgumentCaptor.getValue());
+    assertEquals(EMR_JOB_ID, dispatchQueryResponse.getJobId());
+    Assertions.assertEquals(JobType.REFRESH, dispatchQueryResponse.getJobType());
+    verifyNoInteractions(flintIndexMetadataService);
+  }
+
+  @Test
+  void testDispatchDescribeIndexQuery() {
+    testDispatchBatchQuery("DESCRIBE SKIPPING INDEX ON mys3.default.http_logs");
+  }
+
+  @Test
+  void testDispatchAlterToAutoRefreshIndexQuery() {
+    when(emrServerlessClientFactory.getClient(any())).thenReturn(emrServerlessClient);
+    when(queryIdProvider.getQueryId(any(), any())).thenReturn(QUERY_ID);
+    HashMap<String, String> tags = new HashMap<>();
+    tags.put(DATASOURCE_TAG_KEY, "my_glue");
+    tags.put(INDEX_TAG_KEY, "flint_my_glue_default_http_logs_elb_and_requesturi_index");
+    tags.put(CLUSTER_NAME_TAG_KEY, TEST_CLUSTER_NAME);
+    tags.put(JOB_TYPE_TAG_KEY, JobType.STREAMING.getText());
+    String query =
+        "ALTER INDEX elb_and_requestUri ON my_glue.default.http_logs WITH"
+            + " (auto_refresh = true)";
+    String sparkSubmitParameters =
+        constructExpectedSparkSubmitParameterString(query, "streaming", QUERY_ID);
+    StartJobRequest expected =
+        new StartJobRequest(
+            "TEST_CLUSTER:streaming:flint_my_glue_default_http_logs_elb_and_requesturi_index",
+            null,
+            EMRS_APPLICATION_ID,
+            EMRS_EXECUTION_ROLE,
+            sparkSubmitParameters,
+            tags,
+            true,
+            "query_execution_result_my_glue");
+    when(emrServerlessClient.startJobRun(expected)).thenReturn(EMR_JOB_ID);
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            "my_glue", asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    DispatchQueryResponse dispatchQueryResponse =
+        sparkQueryDispatcher.dispatch(getBaseDispatchQueryRequest(query), asyncQueryRequestContext);
+
+    verify(emrServerlessClient, times(1)).startJobRun(startJobRequestArgumentCaptor.capture());
+    assertEquals(expected, startJobRequestArgumentCaptor.getValue());
+    assertEquals(EMR_JOB_ID, dispatchQueryResponse.getJobId());
+    verifyNoInteractions(flintIndexMetadataService);
+  }
+
+  @Test
+  void testDispatchAlterToManualRefreshIndexQuery() {
+    QueryHandlerFactory queryHandlerFactory = mock(QueryHandlerFactory.class);
+    sparkQueryDispatcher =
+        new SparkQueryDispatcher(
+            dataSourceService,
+            sessionManager,
+            queryHandlerFactory,
+            queryIdProvider,
+            sqlQueryValidator);
+    String query =
+        "ALTER INDEX elb_and_requestUri ON my_glue.default.http_logs WITH"
+            + " (auto_refresh = false)";
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            "my_glue", asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+    when(queryHandlerFactory.getIndexDMLHandler())
+        .thenReturn(
+            new IndexDMLHandler(
+                jobExecutionResponseReader,
+                flintIndexMetadataService,
+                indexDMLResultStorageService,
+                flintIndexOpFactory));
+
+    sparkQueryDispatcher.dispatch(getBaseDispatchQueryRequest(query), asyncQueryRequestContext);
+
+    verify(queryHandlerFactory, times(1)).getIndexDMLHandler();
+  }
+
+  @Test
+  void testDispatchDropIndexQuery() {
+    QueryHandlerFactory queryHandlerFactory = mock(QueryHandlerFactory.class);
+    sparkQueryDispatcher =
+        new SparkQueryDispatcher(
+            dataSourceService,
+            sessionManager,
+            queryHandlerFactory,
+            queryIdProvider,
+            sqlQueryValidator);
+    String query = "DROP INDEX elb_and_requestUri ON my_glue.default.http_logs";
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            "my_glue", asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+    when(queryHandlerFactory.getIndexDMLHandler())
+        .thenReturn(
+            new IndexDMLHandler(
+                jobExecutionResponseReader,
+                flintIndexMetadataService,
+                indexDMLResultStorageService,
+                flintIndexOpFactory));
+
+    DispatchQueryResponse response =
+        sparkQueryDispatcher.dispatch(getBaseDispatchQueryRequest(query), asyncQueryRequestContext);
+
+    verify(queryHandlerFactory, times(1)).getIndexDMLHandler();
+  }
+
+  @Test
+  void testDispatchVacuumIndexQuery() {
+    testDispatchBatchQuery("VACUUM INDEX elb_and_requestUri ON my_glue.default.http_logs");
+  }
+
+  @Test
+  void testDispatchRecoverIndexQuery() {
+    String query = "RECOVER INDEX JOB `flint_spark_catalog_default_test_skipping_index`";
+    Assertions.assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            sparkQueryDispatcher.dispatch(
+                getBaseDispatchQueryRequest(query), asyncQueryRequestContext));
+  }
+
+  @Test
+  void testDispatchWithUnSupportedDataSourceType() {
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            "my_prometheus", asyncQueryRequestContext))
+        .thenReturn(constructPrometheusDataSourceType());
+    String query = "select * from my_prometheus.default.http_logs";
+
+    UnsupportedOperationException unsupportedOperationException =
+        Assertions.assertThrows(
+            UnsupportedOperationException.class,
+            () ->
+                sparkQueryDispatcher.dispatch(
+                    getBaseDispatchQueryRequestBuilder(query).datasource("my_prometheus").build(),
+                    asyncQueryRequestContext));
+
+    assertEquals(
+        "UnSupported datasource type for async queries:: PROMETHEUS",
+        unsupportedOperationException.getMessage());
+  }
+
+  @Test
+  void testCancelJob() {
+    givenCancelJobRunSucceed();
+
+    String queryId =
+        sparkQueryDispatcher.cancelJob(asyncQueryJobMetadata(), asyncQueryRequestContext);
+
+    assertEquals(QUERY_ID, queryId);
+  }
+
+  @Test
+  void testCancelQueryWithSession() {
+    doReturn(Optional.of(session)).when(sessionManager).getSession(MOCK_SESSION_ID, MY_GLUE);
+    doReturn(Optional.of(statement)).when(session).get(any(), eq(asyncQueryRequestContext));
+    doNothing().when(statement).cancel();
+
+    String queryId =
+        sparkQueryDispatcher.cancelJob(
+            asyncQueryJobMetadataWithSessionId(MOCK_STATEMENT_ID, MOCK_SESSION_ID),
+            asyncQueryRequestContext);
+
+    verifyNoInteractions(emrServerlessClient);
+    verify(statement, times(1)).cancel();
+    assertEquals(MOCK_STATEMENT_ID, queryId);
+  }
+
+  @Test
+  void testCancelQueryWithInvalidSession() {
+    doReturn(Optional.empty()).when(sessionManager).getSession("invalid", MY_GLUE);
+
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                sparkQueryDispatcher.cancelJob(
+                    asyncQueryJobMetadataWithSessionId(MOCK_STATEMENT_ID, "invalid"),
+                    asyncQueryRequestContext));
+
+    verifyNoInteractions(emrServerlessClient);
+    verifyNoInteractions(session);
+    assertEquals("no session found. invalid", exception.getMessage());
+  }
+
+  @Test
+  void testCancelQueryWithInvalidStatementId() {
+    doReturn(Optional.of(session)).when(sessionManager).getSession(MOCK_SESSION_ID, MY_GLUE);
+
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                sparkQueryDispatcher.cancelJob(
+                    asyncQueryJobMetadataWithSessionId("invalid", MOCK_SESSION_ID),
+                    asyncQueryRequestContext));
+
+    verifyNoInteractions(emrServerlessClient);
+    verifyNoInteractions(statement);
+    assertEquals("no statement found. " + new StatementId("invalid"), exception.getMessage());
+  }
+
+  @Test
+  void testCancelQueryWithNoSessionId() {
+    givenCancelJobRunSucceed();
+
+    String queryId =
+        sparkQueryDispatcher.cancelJob(asyncQueryJobMetadata(), asyncQueryRequestContext);
+
+    Assertions.assertEquals(QUERY_ID, queryId);
+  }
+
+  @Test
+  void testCancelBatchJob() {
+    givenCancelJobRunSucceed();
+
+    String queryId =
+        sparkQueryDispatcher.cancelJob(
+            asyncQueryJobMetadata(JobType.BATCH), asyncQueryRequestContext);
+
+    Assertions.assertEquals(QUERY_ID, queryId);
+  }
+
+  private void givenCancelJobRunSucceed() {
+    when(emrServerlessClientFactory.getClient(any())).thenReturn(emrServerlessClient);
+    when(emrServerlessClient.cancelJobRun(EMRS_APPLICATION_ID, EMR_JOB_ID, false))
+        .thenReturn(
+            new CancelJobRunResult()
+                .withJobRunId(EMR_JOB_ID)
+                .withApplicationId(EMRS_APPLICATION_ID));
+  }
+
+  @Test
+  void testGetQueryResponse() {
+    when(emrServerlessClientFactory.getClient(any())).thenReturn(emrServerlessClient);
+    when(emrServerlessClient.getJobRunResult(EMRS_APPLICATION_ID, EMR_JOB_ID))
+        .thenReturn(new GetJobRunResult().withJobRun(new JobRun().withState(JobRunState.PENDING)));
+    // simulate result index is not created yet
+    when(jobExecutionResponseReader.getResultWithJobId(EMR_JOB_ID, null))
+        .thenReturn(new JSONObject());
+
+    JSONObject result =
+        sparkQueryDispatcher.getQueryResponse(asyncQueryJobMetadata(), asyncQueryRequestContext);
+
+    assertEquals("PENDING", result.get("status"));
+  }
+
+  @Test
+  void testGetQueryResponseWithSession() {
+    doReturn(Optional.of(session)).when(sessionManager).getSession(MOCK_SESSION_ID, MY_GLUE);
+    doReturn(Optional.of(statement)).when(session).get(any(), eq(asyncQueryRequestContext));
+    when(statement.getStatementModel().getError()).thenReturn("mock error");
+    doReturn(StatementState.WAITING).when(statement).getStatementState();
+    doReturn(new JSONObject())
+        .when(jobExecutionResponseReader)
+        .getResultWithQueryId(eq(MOCK_STATEMENT_ID), any());
+
+    JSONObject result =
+        sparkQueryDispatcher.getQueryResponse(
+            asyncQueryJobMetadataWithSessionId(MOCK_STATEMENT_ID, MOCK_SESSION_ID),
+            asyncQueryRequestContext);
+
+    verifyNoInteractions(emrServerlessClient);
+    assertEquals("waiting", result.get("status"));
+  }
+
+  @Test
+  void testGetQueryResponseWithInvalidSession() {
+    doReturn(Optional.empty()).when(sessionManager).getSession(MOCK_SESSION_ID, MY_GLUE);
+    doReturn(new JSONObject())
+        .when(jobExecutionResponseReader)
+        .getResultWithQueryId(eq(MOCK_STATEMENT_ID), any());
+
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                sparkQueryDispatcher.getQueryResponse(
+                    asyncQueryJobMetadataWithSessionId(MOCK_STATEMENT_ID, MOCK_SESSION_ID),
+                    asyncQueryRequestContext));
+
+    verifyNoInteractions(emrServerlessClient);
+    assertEquals("no session found. " + MOCK_SESSION_ID, exception.getMessage());
+  }
+
+  @Test
+  void testGetQueryResponseWithStatementNotExist() {
+    doReturn(Optional.of(session)).when(sessionManager).getSession(MOCK_SESSION_ID, MY_GLUE);
+    doReturn(Optional.empty()).when(session).get(any(), eq(asyncQueryRequestContext));
+    doReturn(new JSONObject())
+        .when(jobExecutionResponseReader)
+        .getResultWithQueryId(eq(MOCK_STATEMENT_ID), any());
+
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                sparkQueryDispatcher.getQueryResponse(
+                    asyncQueryJobMetadataWithSessionId(MOCK_STATEMENT_ID, MOCK_SESSION_ID),
+                    asyncQueryRequestContext));
+
+    verifyNoInteractions(emrServerlessClient);
+    assertEquals(
+        "no statement found. " + new StatementId(MOCK_STATEMENT_ID), exception.getMessage());
+  }
+
+  @Test
+  void testGetQueryResponseWithSuccess() {
+    JSONObject queryResult = new JSONObject();
+    Map<String, Object> resultMap = new HashMap<>();
+    resultMap.put(STATUS_FIELD, "SUCCESS");
+    resultMap.put(ERROR_FIELD, "");
+    queryResult.put(DATA_FIELD, resultMap);
+    when(jobExecutionResponseReader.getResultWithJobId(EMR_JOB_ID, null)).thenReturn(queryResult);
+
+    JSONObject result =
+        sparkQueryDispatcher.getQueryResponse(asyncQueryJobMetadata(), asyncQueryRequestContext);
+
+    verify(jobExecutionResponseReader, times(1)).getResultWithJobId(EMR_JOB_ID, null);
+    assertEquals(
+        new HashSet<>(Arrays.asList(DATA_FIELD, STATUS_FIELD, ERROR_FIELD)), result.keySet());
+    JSONObject dataJson = new JSONObject();
+    dataJson.put(ERROR_FIELD, "");
+    dataJson.put(STATUS_FIELD, "SUCCESS");
+    // JSONObject.similar() compares if two JSON objects are the same, but having perhaps a
+    // different order of its attributes.
+    // The equals() will compare each string caracter, one-by-one checking if it is the same, having
+    // the same order.
+    // We need similar.
+    Assertions.assertTrue(dataJson.similar(result.get(DATA_FIELD)));
+    assertEquals("SUCCESS", result.get(STATUS_FIELD));
+    verifyNoInteractions(emrServerlessClient);
+  }
+
+  @Test
+  void testDispatchQueryWithExtraSparkSubmitParameters() {
+    when(emrServerlessClientFactory.getClient(any())).thenReturn(emrServerlessClient);
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            MY_GLUE, asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    String extraParameters = "--conf spark.dynamicAllocation.enabled=false";
+    DispatchQueryRequest[] requests = {
+      // SQL direct query
+      constructDispatchQueryRequest(
+          "select * from my_glue.default.http_logs", LangType.SQL, extraParameters),
+      // SQL index query
+      constructDispatchQueryRequest(
+          "create skipping index on my_glue.default.http_logs (status VALUE_SET)",
+          LangType.SQL,
+          extraParameters),
+      // PPL query
+      constructDispatchQueryRequest(
+          "source = my_glue.default.http_logs", LangType.PPL, extraParameters)
+    };
+
+    for (DispatchQueryRequest request : requests) {
+      when(emrServerlessClient.startJobRun(any())).thenReturn(EMR_JOB_ID);
+      sparkQueryDispatcher.dispatch(request, asyncQueryRequestContext);
+
+      verify(emrServerlessClient, times(1))
+          .startJobRun(
+              argThat(
+                  actualReq -> actualReq.getSparkSubmitParams().endsWith(" " + extraParameters)));
+      reset(emrServerlessClient);
+    }
+  }
+
+  private void testDispatchBatchQuery(String query) {
+    when(emrServerlessClientFactory.getClient(any())).thenReturn(emrServerlessClient);
+    when(queryIdProvider.getQueryId(any(), any())).thenReturn(QUERY_ID);
+    HashMap<String, String> tags = new HashMap<>();
+    tags.put(DATASOURCE_TAG_KEY, MY_GLUE);
+    tags.put(CLUSTER_NAME_TAG_KEY, TEST_CLUSTER_NAME);
+    tags.put(JOB_TYPE_TAG_KEY, JobType.BATCH.getText());
+
+    String sparkSubmitParameters =
+        constructExpectedSparkSubmitParameterString(query, null, QUERY_ID);
+    StartJobRequest expected =
+        new StartJobRequest(
+            "TEST_CLUSTER:batch",
+            null,
+            EMRS_APPLICATION_ID,
+            EMRS_EXECUTION_ROLE,
+            sparkSubmitParameters,
+            tags,
+            false,
+            "query_execution_result_my_glue");
+    when(emrServerlessClient.startJobRun(expected)).thenReturn(EMR_JOB_ID);
+    DataSourceMetadata dataSourceMetadata = constructMyGlueDataSourceMetadata();
+    when(dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+            MY_GLUE, asyncQueryRequestContext))
+        .thenReturn(dataSourceMetadata);
+
+    DispatchQueryResponse dispatchQueryResponse =
+        sparkQueryDispatcher.dispatch(getBaseDispatchQueryRequest(query), asyncQueryRequestContext);
+
+    verify(emrServerlessClient, times(1)).startJobRun(startJobRequestArgumentCaptor.capture());
+    Assertions.assertEquals(expected, startJobRequestArgumentCaptor.getValue());
+    Assertions.assertEquals(EMR_JOB_ID, dispatchQueryResponse.getJobId());
+    Assertions.assertEquals(JobType.BATCH, dispatchQueryResponse.getJobType());
+    verifyNoInteractions(flintIndexMetadataService);
+  }
+
+  private String constructExpectedSparkSubmitParameterString(String query) {
+    return constructExpectedSparkSubmitParameterString(query, null, null);
+  }
+
+  private String constructExpectedSparkSubmitParameterString(
+      String query, String jobType, String queryId) {
+    query = "\"" + query + "\"";
+    return " --class org.apache.spark.sql.FlintJob "
+        + getConfParam(
+            "spark.hadoop.fs.s3.customAWSCredentialsProvider=com.amazonaws.emr.AssumeRoleAWSCredentialsProvider",
+            "spark.hadoop.aws.catalog.credentials.provider.factory.class=com.amazonaws.glue.catalog.metastore.STSAssumeRoleSessionCredentialsProviderFactory",
+            "spark.jars.packages=org.opensearch:opensearch-spark-standalone_2.12:0.3.0-SNAPSHOT,org.opensearch:opensearch-spark-sql-application_2.12:0.3.0-SNAPSHOT,org.opensearch:opensearch-spark-ppl_2.12:0.3.0-SNAPSHOT",
+            "spark.jars.repositories=https://aws.oss.sonatype.org/content/repositories/snapshots",
+            "spark.emr-serverless.driverEnv.JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto.x86_64/",
+            "spark.executorEnv.JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto.x86_64/",
+            "spark.emr-serverless.driverEnv.FLINT_CLUSTER_NAME=TEST_CLUSTER",
+            "spark.executorEnv.FLINT_CLUSTER_NAME=TEST_CLUSTER",
+            "spark.datasource.flint.host=HOST",
+            "spark.datasource.flint.port=PORT",
+            "spark.datasource.flint.scheme=SCHEMA",
+            "spark.datasource.flint.auth=basic",
+            "spark.datasource.flint.customAWSCredentialsProvider=com.amazonaws.emr.AssumeRoleAWSCredentialsProvider",
+            "spark.sql.extensions=org.opensearch.flint.spark.FlintSparkExtensions,org.opensearch.flint.spark.FlintPPLSparkExtensions",
+            "spark.hadoop.hive.metastore.client.factory.class=com.amazonaws.glue.catalog.metastore.AWSGlueDataCatalogHiveClientFactory")
+        + (queryId != null ? getConfParam("spark.flint.job.queryId=" + queryId) : "")
+        + getConfParam("spark.flint.job.query=" + query)
+        + (jobType != null ? getConfParam("spark.flint.job.type=" + jobType) : "")
+        + getConfParam(
+            KEY_FROM_DATASOURCE_COMPOSER + "=" + VALUE_FROM_DATASOURCE_COMPOSER,
+            KEY_FROM_COMPOSER + "=" + VALUE_FROM_COMPOSER);
+  }
+
+  private String getConfParam(String... params) {
+    return Arrays.stream(params)
+        .map(param -> String.format(" --conf %s ", param))
+        .collect(Collectors.joining());
+  }
+
+  private DataSourceMetadata constructMyGlueDataSourceMetadata() {
+    Map<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put(
+        "glue.auth.role_arn", "arn:aws:iam::924196221507:role/FlintOpensearchServiceRole");
+    properties.put(
+        "glue.indexstore.opensearch.uri",
+        "https://search-flint-dp-benchmark-cf5crj5mj2kfzvgwdeynkxnefy.eu-west-1.es.amazonaws.com");
+    properties.put("glue.indexstore.opensearch.auth", "awssigv4");
+    properties.put("glue.indexstore.opensearch.region", "eu-west-1");
+    return new DataSourceMetadata.Builder()
+        .setName(MY_GLUE)
+        .setConnector(DataSourceType.S3GLUE)
+        .setProperties(properties)
+        .build();
+  }
+
+  private DataSourceMetadata constructMyGlueDataSourceMetadataWithBasicAuth() {
+    Map<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put(
+        "glue.auth.role_arn", "arn:aws:iam::924196221507:role/FlintOpensearchServiceRole");
+    properties.put(
+        "glue.indexstore.opensearch.uri",
+        "https://search-flint-dp-benchmark-cf5crj5mj2kfzvgwdeynkxnefy.eu-west-1.es.amazonaws.com");
+    properties.put("glue.indexstore.opensearch.auth", "basicauth");
+    properties.put("glue.indexstore.opensearch.auth.username", "username");
+    properties.put("glue.indexstore.opensearch.auth.password", "password");
+    return new DataSourceMetadata.Builder()
+        .setName(MY_GLUE)
+        .setConnector(DataSourceType.S3GLUE)
+        .setProperties(properties)
+        .build();
+  }
+
+  private DataSourceMetadata constructPrometheusDataSourceType() {
+    return new DataSourceMetadata.Builder()
+        .setName("my_prometheus")
+        .setConnector(DataSourceType.PROMETHEUS)
+        .build();
+  }
+
+  private DispatchQueryRequest getBaseDispatchQueryRequest(String query) {
+    return getBaseDispatchQueryRequestBuilder(query).build();
+  }
+
+  private DispatchQueryRequest.DispatchQueryRequestBuilder getBaseDispatchQueryRequestBuilder(
+      String query) {
+    return DispatchQueryRequest.builder()
+        .applicationId(EMRS_APPLICATION_ID)
+        .query(query)
+        .datasource(MY_GLUE)
+        .langType(LangType.SQL)
+        .executionRoleARN(EMRS_EXECUTION_ROLE)
+        .clusterName(TEST_CLUSTER_NAME)
+        .sparkSubmitParameterModifier(sparkSubmitParameterModifier);
+  }
+
+  private DispatchQueryRequest constructDispatchQueryRequest(
+      String query, LangType langType, String extraParameters) {
+    return getBaseDispatchQueryRequestBuilder(query)
+        .langType(langType)
+        .sparkSubmitParameterModifier((builder) -> builder.extraParameters(extraParameters))
+        .build();
+  }
+
+  private DispatchQueryRequest dispatchQueryRequestWithSessionId(String query, String sessionId) {
+    return getBaseDispatchQueryRequestBuilder(query).sessionId(sessionId).build();
+  }
+
+  private AsyncQueryJobMetadata asyncQueryJobMetadata() {
+    return asyncQueryJobMetadata(JobType.INTERACTIVE);
+  }
+
+  private AsyncQueryJobMetadata asyncQueryJobMetadata(JobType jobType) {
+    return AsyncQueryJobMetadata.builder()
+        .queryId(QUERY_ID)
+        .applicationId(EMRS_APPLICATION_ID)
+        .jobId(EMR_JOB_ID)
+        .datasourceName(MY_GLUE)
+        .jobType(jobType)
+        .build();
+  }
+
+  private AsyncQueryJobMetadata asyncQueryJobMetadataWithSessionId(
+      String statementId, String sessionId) {
+    return AsyncQueryJobMetadata.builder()
+        .queryId(statementId)
+        .applicationId(EMRS_APPLICATION_ID)
+        .jobId(EMR_JOB_ID)
+        .sessionId(sessionId)
+        .datasourceName(MY_GLUE)
+        .build();
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/execution/session/SessionManagerTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/session/SessionManagerTest.java
new file mode 100644
index 0000000000..0490c619bb
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/session/SessionManagerTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.execution.statestore.SessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.StatementStorageService;
+
+@ExtendWith(MockitoExtension.class)
+public class SessionManagerTest {
+  @Mock private SessionStorageService sessionStorageService;
+  @Mock private StatementStorageService statementStorageService;
+  @Mock private EMRServerlessClientFactory emrServerlessClientFactory;
+  @Mock private SessionConfigSupplier sessionConfigSupplier;
+  @Mock private SessionIdProvider sessionIdProvider;
+
+  @Test
+  public void sessionEnable() {
+    SessionManager sessionManager =
+        new SessionManager(
+            sessionStorageService,
+            statementStorageService,
+            emrServerlessClientFactory,
+            sessionConfigSupplier,
+            sessionIdProvider);
+
+    Assertions.assertTrue(sessionManager.isEnabled());
+  }
+
+  public static org.opensearch.sql.common.setting.Settings sessionSetting() {
+    Map<org.opensearch.sql.common.setting.Settings.Key, Object> settings = new HashMap<>();
+    settings.put(Settings.Key.SPARK_EXECUTION_SESSION_LIMIT, 100);
+    settings.put(
+        org.opensearch.sql.common.setting.Settings.Key.SESSION_INACTIVITY_TIMEOUT_MILLIS, 10000L);
+    return settings(settings);
+  }
+
+  public static Settings settings(Map<Settings.Key, Object> settings) {
+    return new Settings() {
+      @Override
+      public <T> T getSettingValue(Key key) {
+        return (T) settings.get(key);
+      }
+
+      @Override
+      public List<?> getSettings() {
+        return (List<?>) settings;
+      }
+    };
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/execution/session/SessionStateTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/session/SessionStateTest.java
new file mode 100644
index 0000000000..a987c80d59
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/session/SessionStateTest.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+class SessionStateTest {
+  @Test
+  public void invalidSessionType() {
+    IllegalArgumentException exception =
+        assertThrows(IllegalArgumentException.class, () -> SessionState.fromString("invalid"));
+    assertEquals("Invalid session state: invalid", exception.getMessage());
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/execution/session/SessionTypeTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/session/SessionTypeTest.java
new file mode 100644
index 0000000000..a2ab43e709
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/session/SessionTypeTest.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+class SessionTypeTest {
+  @Test
+  public void invalidSessionType() {
+    IllegalArgumentException exception =
+        assertThrows(IllegalArgumentException.class, () -> SessionType.fromString("invalid"));
+    assertEquals("Invalid session type: invalid", exception.getMessage());
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/execution/statement/StatementStateTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/statement/StatementStateTest.java
new file mode 100644
index 0000000000..b7af1123ba
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/statement/StatementStateTest.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statement;
+
+import static org.junit.Assert.assertThrows;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class StatementStateTest {
+  @Test
+  public void invalidStatementState() {
+    IllegalArgumentException exception =
+        assertThrows(IllegalArgumentException.class, () -> StatementState.fromString("invalid"));
+    Assertions.assertEquals("Invalid statement state: invalid", exception.getMessage());
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/execution/statestore/OpenSearchStateStoreUtilTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/statestore/OpenSearchStateStoreUtilTest.java
new file mode 100644
index 0000000000..318080ff2d
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/statestore/OpenSearchStateStoreUtilTest.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statestore;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class OpenSearchStateStoreUtilTest {
+
+  @Test
+  void getIndexName() {
+    String result = OpenSearchStateStoreUtil.getIndexName("DATASOURCE");
+
+    assertEquals(".query_execution_request_datasource", result);
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/execution/statestore/StateModelTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/statestore/StateModelTest.java
new file mode 100644
index 0000000000..15d1ec2ecc
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/statestore/StateModelTest.java
@@ -0,0 +1,49 @@
+package org.opensearch.sql.spark.execution.statestore;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Optional;
+import lombok.Data;
+import lombok.experimental.SuperBuilder;
+import org.junit.jupiter.api.Test;
+
+class StateModelTest {
+
+  public static final String METADATA_KEY = "KEY";
+  public static final String METADATA_VALUE = "VALUE";
+  public static final String UNKNOWN_KEY = "UNKNOWN_KEY";
+
+  @Data
+  @SuperBuilder
+  static class ConcreteStateModel extends StateModel {
+    @Override
+    public String getId() {
+      return null;
+    }
+  }
+
+  ConcreteStateModel model =
+      ConcreteStateModel.builder().metadata(ImmutableMap.of(METADATA_KEY, METADATA_VALUE)).build();
+
+  @Test
+  public void whenMetadataExist() {
+    Optional<String> result = model.getMetadataItem(METADATA_KEY, String.class);
+
+    assertEquals(METADATA_VALUE, result.get());
+  }
+
+  @Test
+  public void whenMetadataNotExist() {
+    Optional<String> result = model.getMetadataItem(UNKNOWN_KEY, String.class);
+
+    assertFalse(result.isPresent());
+  }
+
+  @Test
+  public void whenTypeDoNotMatch() {
+    assertThrows(RuntimeException.class, () -> model.getMetadataItem(METADATA_KEY, Long.class));
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializerUtilTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializerUtilTest.java
new file mode 100644
index 0000000000..5bd8795663
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializerUtilTest.java
@@ -0,0 +1,17 @@
+package org.opensearch.sql.spark.execution.xcontent;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.jupiter.api.Test;
+
+class XContentSerializerUtilTest {
+  @Test
+  public void testBuildMetadata() {
+    ImmutableMap<String, Object> result = XContentSerializerUtil.buildMetadata(1, 2);
+
+    assertEquals(2, result.size());
+    assertEquals(1L, result.get(XContentSerializerUtil.SEQ_NO));
+    assertEquals(2L, result.get(XContentSerializerUtil.PRIMARY_TERM));
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/flint/FlintIndexMetadataValidatorTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/flint/FlintIndexMetadataValidatorTest.java
new file mode 100644
index 0000000000..7a1e718c05
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/flint/FlintIndexMetadataValidatorTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions.AUTO_REFRESH;
+import static org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions.CHECKPOINT_LOCATION;
+import static org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions.INCREMENTAL_REFRESH;
+import static org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions.WATERMARK_DELAY;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class FlintIndexMetadataValidatorTest {
+  @Test
+  public void conversionToIncrementalRefreshWithValidOption() {
+    Map<String, Object> existingOptions =
+        ImmutableMap.<String, Object>builder().put(INCREMENTAL_REFRESH, "false").build();
+    Map<String, String> newOptions =
+        ImmutableMap.<String, String>builder()
+            .put(INCREMENTAL_REFRESH, "true")
+            .put(CHECKPOINT_LOCATION, "checkpoint_location")
+            .put(WATERMARK_DELAY, "1")
+            .build();
+
+    FlintIndexMetadataValidator.validateFlintIndexOptions("mv", existingOptions, newOptions);
+  }
+
+  @Test
+  public void conversionToIncrementalRefreshWithMissingOptions() {
+    Map<String, Object> existingOptions =
+        ImmutableMap.<String, Object>builder().put(AUTO_REFRESH, "true").build();
+    Map<String, String> newOptions =
+        ImmutableMap.<String, String>builder().put(INCREMENTAL_REFRESH, "true").build();
+
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            FlintIndexMetadataValidator.validateFlintIndexOptions(
+                "mv", existingOptions, newOptions));
+  }
+
+  @Test
+  public void conversionToIncrementalRefreshWithInvalidOption() {
+    Map<String, Object> existingOptions =
+        ImmutableMap.<String, Object>builder().put(INCREMENTAL_REFRESH, "false").build();
+    Map<String, String> newOptions =
+        ImmutableMap.<String, String>builder()
+            .put(INCREMENTAL_REFRESH, "true")
+            .put("INVALID_OPTION", "1")
+            .build();
+
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            FlintIndexMetadataValidator.validateFlintIndexOptions(
+                "mv", existingOptions, newOptions));
+  }
+
+  @Test
+  public void conversionToFullRefreshWithValidOption() {
+    Map<String, Object> existingOptions =
+        ImmutableMap.<String, Object>builder().put(AUTO_REFRESH, "false").build();
+    Map<String, String> newOptions =
+        ImmutableMap.<String, String>builder().put(AUTO_REFRESH, "true").build();
+
+    FlintIndexMetadataValidator.validateFlintIndexOptions("mv", existingOptions, newOptions);
+  }
+
+  @Test
+  public void conversionToFullRefreshWithInvalidOption() {
+    Map<String, Object> existingOptions =
+        ImmutableMap.<String, Object>builder().put(AUTO_REFRESH, "false").build();
+    Map<String, String> newOptions =
+        ImmutableMap.<String, String>builder()
+            .put(AUTO_REFRESH, "true")
+            .put(WATERMARK_DELAY, "1")
+            .build();
+
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            FlintIndexMetadataValidator.validateFlintIndexOptions(
+                "mv", existingOptions, newOptions));
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/flint/FlintIndexStateTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/flint/FlintIndexStateTest.java
new file mode 100644
index 0000000000..acd76fa11a
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/flint/FlintIndexStateTest.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.opensearch.sql.spark.flint.FlintIndexState.UNKNOWN;
+
+import org.junit.jupiter.api.Test;
+
+class FlintIndexStateTest {
+  @Test
+  public void unknownState() {
+    assertEquals(UNKNOWN, FlintIndexState.fromString("noSupported"));
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/flint/IndexQueryDetailsTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/flint/IndexQueryDetailsTest.java
new file mode 100644
index 0000000000..4d52baee92
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/flint/IndexQueryDetailsTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+import org.opensearch.sql.spark.dispatcher.model.FullyQualifiedTableName;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryActionType;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryDetails;
+
+public class IndexQueryDetailsTest {
+  @Test
+  public void skippingIndexName() {
+    assertEquals(
+        "flint_mys3_default_http_logs_skipping_index",
+        IndexQueryDetails.builder()
+            .indexName("invalid")
+            .fullyQualifiedTableName(new FullyQualifiedTableName("mys3.default.http_logs"))
+            .indexOptions(new FlintIndexOptions())
+            .indexQueryActionType(IndexQueryActionType.DROP)
+            .indexType(FlintIndexType.SKIPPING)
+            .build()
+            .openSearchIndexName());
+  }
+
+  @Test
+  public void coveringIndexName() {
+    assertEquals(
+        "flint_mys3_default_http_logs_idx_status_index",
+        IndexQueryDetails.builder()
+            .indexName("idx_status")
+            .fullyQualifiedTableName(new FullyQualifiedTableName("mys3.default.http_logs"))
+            .indexType(FlintIndexType.COVERING)
+            .build()
+            .openSearchIndexName());
+  }
+
+  @Test
+  public void materializedViewIndexName() {
+    assertEquals(
+        "flint_mys3_default_http_logs_metrics",
+        IndexQueryDetails.builder()
+            .mvName("mys3.default.http_logs_metrics")
+            .indexType(FlintIndexType.MATERIALIZED_VIEW)
+            .build()
+            .openSearchIndexName());
+  }
+
+  @Test
+  public void materializedViewIndexNameWithBackticks() {
+    assertEquals(
+        "flint_mys3_default_http_logs_metrics",
+        IndexQueryDetails.builder()
+            .mvName("`mys3`.`default`.`http_logs_metrics`")
+            .indexType(FlintIndexType.MATERIALIZED_VIEW)
+            .build()
+            .openSearchIndexName());
+  }
+
+  @Test
+  public void materializedViewIndexNameWithDots() {
+    assertEquals(
+        "flint_mys3_default_http_logs_metrics.1026",
+        IndexQueryDetails.builder()
+            .mvName("`mys3`.`default`.`http_logs_metrics.1026`")
+            .indexType(FlintIndexType.MATERIALIZED_VIEW)
+            .build()
+            .openSearchIndexName());
+  }
+
+  @Test
+  public void materializedViewIndexNameWithDotsInCatalogName() {
+    // FIXME: should not use ctx.getText which is hard to split
+    assertEquals(
+        "flint_mys3_1026_default`.`http_logs_metrics",
+        IndexQueryDetails.builder()
+            .mvName("`mys3.1026`.`default`.`http_logs_metrics`")
+            .indexType(FlintIndexType.MATERIALIZED_VIEW)
+            .build()
+            .openSearchIndexName());
+  }
+
+  @Test
+  public void materializedViewIndexNameNotFullyQualified() {
+    // Normally this should not happen and can add precondition check once confirmed.
+    assertEquals(
+        "flint_default_http_logs_metrics",
+        IndexQueryDetails.builder()
+            .mvName("default.http_logs_metrics")
+            .indexType(FlintIndexType.MATERIALIZED_VIEW)
+            .build()
+            .openSearchIndexName());
+
+    assertEquals(
+        "flint_http_logs_metrics",
+        IndexQueryDetails.builder()
+            .mvName("http_logs_metrics")
+            .indexType(FlintIndexType.MATERIALIZED_VIEW)
+            .build()
+            .openSearchIndexName());
+  }
+
+  @Test
+  public void sanitizedIndexName() {
+    assertEquals(
+        "flint_mys3_default_test%20%2c%3a%22%2b%2f%5c%7c%3f%23%3e%3c_skipping_index",
+        IndexQueryDetails.builder()
+            .indexName("invalid")
+            .fullyQualifiedTableName(
+                new FullyQualifiedTableName("mys3.default.`test ,:\"+/\\|?#><`"))
+            .indexOptions(new FlintIndexOptions())
+            .indexQueryActionType(IndexQueryActionType.DROP)
+            .indexType(FlintIndexType.SKIPPING)
+            .build()
+            .openSearchIndexName());
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpFactoryTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpFactoryTest.java
new file mode 100644
index 0000000000..e73c5614ae
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpFactoryTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint.operation;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+import org.opensearch.sql.spark.flint.FlintIndexClient;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.FlintIndexStateModelService;
+import org.opensearch.sql.spark.scheduler.AsyncQueryScheduler;
+
+@ExtendWith(MockitoExtension.class)
+class FlintIndexOpFactoryTest {
+  public static final String DATASOURCE_NAME = "DATASOURCE_NAME";
+
+  @Mock private FlintIndexStateModelService flintIndexStateModelService;
+  @Mock private FlintIndexClient flintIndexClient;
+  @Mock private FlintIndexMetadataService flintIndexMetadataService;
+  @Mock private EMRServerlessClientFactory emrServerlessClientFactory;
+  @Mock private AsyncQueryScheduler asyncQueryScheduler;
+
+  @InjectMocks FlintIndexOpFactory flintIndexOpFactory;
+
+  @Test
+  void getDrop() {
+    assertNotNull(flintIndexOpFactory.getDrop(DATASOURCE_NAME));
+  }
+
+  @Test
+  void getAlter() {
+    assertNotNull(flintIndexOpFactory.getAlter(new FlintIndexOptions(), DATASOURCE_NAME));
+  }
+
+  @Test
+  void getCancel() {
+    assertNotNull(flintIndexOpFactory.getDrop(DATASOURCE_NAME));
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpTest.java
new file mode 100644
index 0000000000..8105629822
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint.operation;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Optional;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.execution.xcontent.XContentSerializerUtil;
+import org.opensearch.sql.spark.flint.FlintIndexMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexStateModel;
+import org.opensearch.sql.spark.flint.FlintIndexStateModelService;
+
+@ExtendWith(MockitoExtension.class)
+public class FlintIndexOpTest {
+
+  @Mock private FlintIndexStateModelService flintIndexStateModelService;
+  @Mock private EMRServerlessClientFactory mockEmrServerlessClientFactory;
+  @Mock private AsyncQueryRequestContext asyncQueryRequestContext;
+
+  @Test
+  public void testApplyWithTransitioningStateFailure() {
+    FlintIndexMetadata metadata = mock(FlintIndexMetadata.class);
+    when(metadata.getLatestId()).thenReturn(Optional.of("latestId"));
+    FlintIndexStateModel fakeModel = getFlintIndexStateModel(metadata);
+    when(flintIndexStateModelService.getFlintIndexStateModel(
+            eq("latestId"), any(), eq(asyncQueryRequestContext)))
+        .thenReturn(Optional.of(fakeModel));
+    when(flintIndexStateModelService.updateFlintIndexState(
+            any(), any(), any(), eq(asyncQueryRequestContext)))
+        .thenThrow(new RuntimeException("Transitioning state failed"));
+    FlintIndexOp flintIndexOp =
+        new TestFlintIndexOp(flintIndexStateModelService, "myS3", mockEmrServerlessClientFactory);
+
+    IllegalStateException illegalStateException =
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> flintIndexOp.apply(metadata, asyncQueryRequestContext));
+
+    Assertions.assertEquals(
+        "Moving to transition state:DELETING failed.", illegalStateException.getMessage());
+  }
+
+  @Test
+  public void testApplyWithCommitFailure() {
+    FlintIndexMetadata metadata = mock(FlintIndexMetadata.class);
+    when(metadata.getLatestId()).thenReturn(Optional.of("latestId"));
+    FlintIndexStateModel fakeModel = getFlintIndexStateModel(metadata);
+    when(flintIndexStateModelService.getFlintIndexStateModel(
+            eq("latestId"), any(), eq(asyncQueryRequestContext)))
+        .thenReturn(Optional.of(fakeModel));
+    when(flintIndexStateModelService.updateFlintIndexState(
+            any(), any(), any(), eq(asyncQueryRequestContext)))
+        .thenReturn(
+            FlintIndexStateModel.copy(fakeModel, XContentSerializerUtil.buildMetadata(1, 2)))
+        .thenThrow(new RuntimeException("Commit state failed"))
+        .thenReturn(
+            FlintIndexStateModel.copy(fakeModel, XContentSerializerUtil.buildMetadata(1, 3)));
+    FlintIndexOp flintIndexOp =
+        new TestFlintIndexOp(flintIndexStateModelService, "myS3", mockEmrServerlessClientFactory);
+
+    IllegalStateException illegalStateException =
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> flintIndexOp.apply(metadata, asyncQueryRequestContext));
+
+    Assertions.assertEquals(
+        "commit failed. target stable state: [DELETED]", illegalStateException.getMessage());
+  }
+
+  @Test
+  public void testApplyWithRollBackFailure() {
+    FlintIndexMetadata metadata = mock(FlintIndexMetadata.class);
+    when(metadata.getLatestId()).thenReturn(Optional.of("latestId"));
+    FlintIndexStateModel fakeModel = getFlintIndexStateModel(metadata);
+    when(flintIndexStateModelService.getFlintIndexStateModel(
+            eq("latestId"), any(), eq(asyncQueryRequestContext)))
+        .thenReturn(Optional.of(fakeModel));
+    when(flintIndexStateModelService.updateFlintIndexState(
+            any(), any(), any(), eq(asyncQueryRequestContext)))
+        .thenReturn(
+            FlintIndexStateModel.copy(fakeModel, XContentSerializerUtil.buildMetadata(1, 2)))
+        .thenThrow(new RuntimeException("Commit state failed"))
+        .thenThrow(new RuntimeException("Rollback failure"));
+    FlintIndexOp flintIndexOp =
+        new TestFlintIndexOp(flintIndexStateModelService, "myS3", mockEmrServerlessClientFactory);
+
+    IllegalStateException illegalStateException =
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> flintIndexOp.apply(metadata, asyncQueryRequestContext));
+
+    Assertions.assertEquals(
+        "commit failed. target stable state: [DELETED]", illegalStateException.getMessage());
+  }
+
+  private FlintIndexStateModel getFlintIndexStateModel(FlintIndexMetadata metadata) {
+    return FlintIndexStateModel.builder()
+        .indexState(FlintIndexState.ACTIVE)
+        .applicationId(metadata.getAppId())
+        .jobId(metadata.getJobId())
+        .latestId("latestId")
+        .datasourceName("myS3")
+        .lastUpdateTime(System.currentTimeMillis())
+        .error("")
+        .build();
+  }
+
+  static class TestFlintIndexOp extends FlintIndexOp {
+
+    public TestFlintIndexOp(
+        FlintIndexStateModelService flintIndexStateModelService,
+        String datasourceName,
+        EMRServerlessClientFactory emrServerlessClientFactory) {
+      super(flintIndexStateModelService, datasourceName, emrServerlessClientFactory);
+    }
+
+    @Override
+    boolean validate(FlintIndexState state) {
+      return state == FlintIndexState.ACTIVE || state == FlintIndexState.EMPTY;
+    }
+
+    @Override
+    FlintIndexState transitioningState() {
+      return FlintIndexState.DELETING;
+    }
+
+    @Override
+    void runOp(
+        FlintIndexMetadata flintIndexMetadata,
+        FlintIndexStateModel flintIndex,
+        AsyncQueryRequestContext asyncQueryRequestContext) {}
+
+    @Override
+    FlintIndexState stableState() {
+      return FlintIndexState.DELETED;
+    }
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/leasemanager/ConcurrencyLimitExceededExceptionTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/leasemanager/ConcurrencyLimitExceededExceptionTest.java
new file mode 100644
index 0000000000..c0591eaf66
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/leasemanager/ConcurrencyLimitExceededExceptionTest.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.leasemanager;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+class ConcurrencyLimitExceededExceptionTest {
+  @Test
+  public void test() {
+    ConcurrencyLimitExceededException e = new ConcurrencyLimitExceededException("Test");
+
+    assertEquals("Test", e.getMessage());
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/parameter/SparkParameterComposerCollectionTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/parameter/SparkParameterComposerCollectionTest.java
new file mode 100644
index 0000000000..c0c97caa58
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/parameter/SparkParameterComposerCollectionTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.parameter;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+
+@ExtendWith(MockitoExtension.class)
+class SparkParameterComposerCollectionTest {
+
+  @Mock DataSourceSparkParameterComposer composer1;
+  @Mock DataSourceSparkParameterComposer composer2;
+  @Mock DataSourceSparkParameterComposer composer3;
+  @Mock GeneralSparkParameterComposer generalComposer;
+  @Mock DispatchQueryRequest dispatchQueryRequest;
+  @Mock AsyncQueryRequestContext asyncQueryRequestContext;
+
+  DataSourceType type1 = new DataSourceType("TYPE1");
+  DataSourceType type2 = new DataSourceType("TYPE2");
+  DataSourceType type3 = new DataSourceType("TYPE3");
+
+  SparkParameterComposerCollection collection;
+
+  @BeforeEach
+  void setUp() {
+    collection = new SparkParameterComposerCollection();
+    collection.register(type1, composer1);
+    collection.register(type1, composer2);
+    collection.register(type2, composer3);
+    collection.register(generalComposer);
+  }
+
+  @Test
+  void isComposerRegistered() {
+    assertTrue(collection.isComposerRegistered(type1));
+    assertTrue(collection.isComposerRegistered(type2));
+    assertFalse(collection.isComposerRegistered(type3));
+  }
+
+  @Test
+  void composeByDataSourceWithRegisteredType() {
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder().setConnector(type1).setName("name").build();
+    SparkSubmitParameters sparkSubmitParameters = new SparkSubmitParameters();
+
+    collection.composeByDataSource(
+        metadata, sparkSubmitParameters, dispatchQueryRequest, asyncQueryRequestContext);
+
+    verify(composer1)
+        .compose(metadata, sparkSubmitParameters, dispatchQueryRequest, asyncQueryRequestContext);
+    verify(composer2)
+        .compose(metadata, sparkSubmitParameters, dispatchQueryRequest, asyncQueryRequestContext);
+    verifyNoInteractions(composer3);
+  }
+
+  @Test
+  void composeByDataSourceWithUnregisteredType() {
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder().setConnector(type3).setName("name").build();
+    SparkSubmitParameters sparkSubmitParameters = new SparkSubmitParameters();
+
+    collection.composeByDataSource(
+        metadata, sparkSubmitParameters, dispatchQueryRequest, asyncQueryRequestContext);
+
+    verifyNoInteractions(composer1, composer2, composer3);
+  }
+
+  @Test
+  void compose() {
+    SparkSubmitParameters sparkSubmitParameters = new SparkSubmitParameters();
+
+    collection.compose(sparkSubmitParameters, dispatchQueryRequest, asyncQueryRequestContext);
+
+    verify(generalComposer)
+        .compose(sparkSubmitParameters, dispatchQueryRequest, asyncQueryRequestContext);
+    verifyNoInteractions(composer1, composer2, composer3);
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilderTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilderTest.java
new file mode 100644
index 0000000000..8fb975d187
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilderTest.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.parameter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.HADOOP_CATALOG_CREDENTIALS_PROVIDER_FACTORY_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_JARS_KEY;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.config.SparkSubmitParameterModifier;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+
+@ExtendWith(MockitoExtension.class)
+public class SparkSubmitParametersBuilderTest {
+
+  @Mock SparkParameterComposerCollection sparkParameterComposerCollection;
+  @Mock SparkSubmitParameterModifier sparkSubmitParameterModifier;
+  @Mock AsyncQueryRequestContext asyncQueryRequestContext;
+  @Mock DispatchQueryRequest dispatchQueryRequest;
+
+  @InjectMocks SparkSubmitParametersBuilder sparkSubmitParametersBuilder;
+
+  @Test
+  public void testBuildWithoutExtraParameters() {
+    String params = sparkSubmitParametersBuilder.toString();
+
+    assertNotNull(params);
+  }
+
+  @Test
+  public void testBuildWithExtraParameters() {
+    String params = sparkSubmitParametersBuilder.extraParameters("--conf A=1").toString();
+
+    // Assert the conf is included with a space
+    assertTrue(params.endsWith(" --conf A=1"));
+  }
+
+  @Test
+  public void testBuildQueryString() {
+    String rawQuery = "SHOW tables LIKE \"%\";";
+    String expectedQueryInParams = "\"SHOW tables LIKE \\\"%\\\";\"";
+    String params = sparkSubmitParametersBuilder.query(rawQuery).toString();
+    assertTrue(params.contains(expectedQueryInParams));
+  }
+
+  @Test
+  public void testBuildQueryStringNestedQuote() {
+    String rawQuery = "SELECT '\"1\"'";
+    String expectedQueryInParams = "\"SELECT '\\\"1\\\"'\"";
+    String params = sparkSubmitParametersBuilder.query(rawQuery).toString();
+    assertTrue(params.contains(expectedQueryInParams));
+  }
+
+  @Test
+  public void testBuildQueryStringSpecialCharacter() {
+    String rawQuery = "SELECT '{\"test ,:+\\\"inner\\\"/\\|?#><\"}'";
+    String expectedQueryInParams = "SELECT '{\\\"test ,:+\\\\\\\"inner\\\\\\\"/\\\\|?#><\\\"}'";
+    String params = sparkSubmitParametersBuilder.query(rawQuery).toString();
+    assertTrue(params.contains(expectedQueryInParams));
+  }
+
+  @Test
+  public void testClassName() {
+    String params = sparkSubmitParametersBuilder.className("CLASS_NAME").toString();
+    assertTrue(params.contains("--class CLASS_NAME"));
+  }
+
+  @Test
+  public void testClusterName() {
+    String params = sparkSubmitParametersBuilder.clusterName("CLUSTER_NAME").toString();
+    assertTrue(params.contains("spark.emr-serverless.driverEnv.FLINT_CLUSTER_NAME=CLUSTER_NAME"));
+    assertTrue(params.contains("spark.executorEnv.FLINT_CLUSTER_NAME=CLUSTER_NAME"));
+  }
+
+  @Test
+  public void testOverrideConfigItem() {
+    SparkSubmitParameters params = sparkSubmitParametersBuilder.getSparkSubmitParameters();
+    params.setConfigItem(SPARK_JARS_KEY, "Overridden");
+    String result = params.toString();
+
+    assertEquals("Overridden", params.getConfigItem(SPARK_JARS_KEY));
+    assertTrue(result.contains(String.format("%s=Overridden", SPARK_JARS_KEY)));
+  }
+
+  @Test
+  public void testDeleteConfigItem() {
+    SparkSubmitParameters params = sparkSubmitParametersBuilder.getSparkSubmitParameters();
+    params.deleteConfigItem(HADOOP_CATALOG_CREDENTIALS_PROVIDER_FACTORY_KEY);
+    String result = params.toString();
+
+    assertFalse(result.contains(HADOOP_CATALOG_CREDENTIALS_PROVIDER_FACTORY_KEY));
+  }
+
+  @Test
+  public void testAddConfigItem() {
+    SparkSubmitParameters params = sparkSubmitParametersBuilder.getSparkSubmitParameters();
+    params.setConfigItem("AdditionalKey", "Value");
+    String result = params.toString();
+
+    assertTrue(result.contains("AdditionalKey=Value"));
+  }
+
+  @Test
+  public void testStructuredStreaming() {
+    SparkSubmitParameters params =
+        sparkSubmitParametersBuilder.structuredStreaming(true).getSparkSubmitParameters();
+    String result = params.toString();
+
+    assertTrue(result.contains("spark.flint.job.type=streaming"));
+  }
+
+  @Test
+  public void testNonStructuredStreaming() {
+    SparkSubmitParameters params =
+        sparkSubmitParametersBuilder.structuredStreaming(false).getSparkSubmitParameters();
+    String result = params.toString();
+
+    assertFalse(result.contains("spark.flint.job.type=streaming"));
+  }
+
+  @Test
+  public void testSessionExecution() {
+    SparkSubmitParameters params =
+        sparkSubmitParametersBuilder
+            .sessionExecution("SESSION_ID", "DATASOURCE_NAME")
+            .getSparkSubmitParameters();
+    String result = params.toString();
+
+    assertTrue(
+        result.contains("spark.flint.job.requestIndex=.query_execution_request_datasource_name"));
+    assertTrue(result.contains("spark.flint.job.sessionId=SESSION_ID"));
+  }
+
+  @Test
+  public void testAcceptModifier() {
+    sparkSubmitParametersBuilder.acceptModifier(sparkSubmitParameterModifier);
+
+    verify(sparkSubmitParameterModifier).modifyParameters(sparkSubmitParametersBuilder);
+  }
+
+  @Test
+  public void testAcceptNullModifier() {
+    sparkSubmitParametersBuilder.acceptModifier(null);
+  }
+
+  @Test
+  public void testDataSource() {
+    when(sparkParameterComposerCollection.isComposerRegistered(DataSourceType.S3GLUE))
+        .thenReturn(true);
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setConnector(DataSourceType.S3GLUE)
+            .setName("name")
+            .build();
+    SparkSubmitParameters params =
+        sparkSubmitParametersBuilder
+            .dataSource(metadata, dispatchQueryRequest, asyncQueryRequestContext)
+            .getSparkSubmitParameters();
+
+    verify(sparkParameterComposerCollection)
+        .composeByDataSource(metadata, params, dispatchQueryRequest, asyncQueryRequestContext);
+  }
+
+  @Test
+  public void testUnsupportedDataSource() {
+    when(sparkParameterComposerCollection.isComposerRegistered(DataSourceType.S3GLUE))
+        .thenReturn(false);
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setConnector(DataSourceType.S3GLUE)
+            .setName("name")
+            .build();
+    assertThrows(
+        UnsupportedOperationException.class,
+        () ->
+            sparkSubmitParametersBuilder.dataSource(
+                metadata, dispatchQueryRequest, asyncQueryRequestContext));
+  }
+
+  @Test
+  public void testAcceptComposers() {
+    SparkSubmitParameters params =
+        sparkSubmitParametersBuilder
+            .acceptComposers(dispatchQueryRequest, asyncQueryRequestContext)
+            .getSparkSubmitParameters();
+
+    verify(sparkParameterComposerCollection)
+        .compose(params, dispatchQueryRequest, asyncQueryRequestContext);
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/utils/IDUtilsTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/utils/IDUtilsTest.java
new file mode 100644
index 0000000000..1893256c39
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/utils/IDUtilsTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.utils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+class IDUtilsTest {
+  public static final String DATASOURCE_NAME = "DATASOURCE_NAME";
+
+  @Test
+  public void encodeAndDecode() {
+    String id = IDUtils.encode(DATASOURCE_NAME);
+    String decoded = IDUtils.decode(id);
+
+    assertTrue(id.length() > IDUtils.PREFIX_LEN);
+    assertEquals(DATASOURCE_NAME, decoded);
+  }
+
+  @Test
+  public void generateUniqueIds() {
+    String id1 = IDUtils.encode(DATASOURCE_NAME);
+    String id2 = IDUtils.encode(DATASOURCE_NAME);
+
+    assertNotEquals(id1, id2);
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/utils/MockTimeProvider.java b/async-query-core/src/test/java/org/opensearch/sql/spark/utils/MockTimeProvider.java
new file mode 100644
index 0000000000..2f4c960ec0
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/utils/MockTimeProvider.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.utils;
+
+public class MockTimeProvider implements TimeProvider {
+  private final long fixedTime;
+
+  public MockTimeProvider(long fixedTime) {
+    this.fixedTime = fixedTime;
+  }
+
+  @Override
+  public long currentEpochMillis() {
+    return fixedTime;
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/utils/RealTimeProviderTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/utils/RealTimeProviderTest.java
new file mode 100644
index 0000000000..7eb5a56cfe
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/utils/RealTimeProviderTest.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.utils;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+class RealTimeProviderTest {
+  @Test
+  public void testCurrentEpochMillis() {
+    RealTimeProvider realTimeProvider = new RealTimeProvider();
+
+    assertTrue(realTimeProvider.currentEpochMillis() > 0);
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/utils/SQLQueryUtilsTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/utils/SQLQueryUtilsTest.java
new file mode 100644
index 0000000000..881ad0e56a
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/utils/SQLQueryUtilsTest.java
@@ -0,0 +1,487 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.utils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.opensearch.sql.spark.utils.SQLQueryUtilsTest.IndexQuery.index;
+import static org.opensearch.sql.spark.utils.SQLQueryUtilsTest.IndexQuery.mv;
+import static org.opensearch.sql.spark.utils.SQLQueryUtilsTest.IndexQuery.skippingIndex;
+
+import java.util.List;
+import lombok.Getter;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.spark.dispatcher.model.FullyQualifiedTableName;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryActionType;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryDetails;
+import org.opensearch.sql.spark.flint.FlintIndexType;
+
+@ExtendWith(MockitoExtension.class)
+public class SQLQueryUtilsTest {
+
+  @Mock private DataSource dataSource;
+
+  @Test
+  void testExtractionOfTableNameFromSQLQueries() {
+    String sqlQuery = "select * from my_glue.default.http_logs";
+    FullyQualifiedTableName fullyQualifiedTableName =
+        SQLQueryUtils.extractFullyQualifiedTableNames(sqlQuery).get(0);
+    assertFalse(SQLQueryUtils.isFlintExtensionQuery(sqlQuery));
+    assertFullyQualifiedTableName("my_glue", "default", "http_logs", fullyQualifiedTableName);
+
+    sqlQuery = "select * from my_glue.db.http_logs";
+    assertFalse(SQLQueryUtils.isFlintExtensionQuery(sqlQuery));
+    fullyQualifiedTableName = SQLQueryUtils.extractFullyQualifiedTableNames(sqlQuery).get(0);
+    assertFullyQualifiedTableName("my_glue", "db", "http_logs", fullyQualifiedTableName);
+
+    sqlQuery = "select * from my_glue.http_logs";
+    fullyQualifiedTableName = SQLQueryUtils.extractFullyQualifiedTableNames(sqlQuery).get(0);
+    assertFalse(SQLQueryUtils.isFlintExtensionQuery(sqlQuery));
+    assertFullyQualifiedTableName(null, "my_glue", "http_logs", fullyQualifiedTableName);
+
+    sqlQuery = "select * from http_logs";
+    fullyQualifiedTableName = SQLQueryUtils.extractFullyQualifiedTableNames(sqlQuery).get(0);
+    assertFalse(SQLQueryUtils.isFlintExtensionQuery(sqlQuery));
+    assertFullyQualifiedTableName(null, null, "http_logs", fullyQualifiedTableName);
+
+    sqlQuery = "DROP TABLE myS3.default.alb_logs";
+    fullyQualifiedTableName = SQLQueryUtils.extractFullyQualifiedTableNames(sqlQuery).get(0);
+    assertFalse(SQLQueryUtils.isFlintExtensionQuery(sqlQuery));
+    assertFullyQualifiedTableName("myS3", "default", "alb_logs", fullyQualifiedTableName);
+
+    sqlQuery = "DESCRIBE TABLE myS3.default.alb_logs";
+    fullyQualifiedTableName = SQLQueryUtils.extractFullyQualifiedTableNames(sqlQuery).get(0);
+    assertFalse(SQLQueryUtils.isFlintExtensionQuery(sqlQuery));
+    assertFullyQualifiedTableName("myS3", "default", "alb_logs", fullyQualifiedTableName);
+
+    sqlQuery =
+        "CREATE EXTERNAL TABLE\n"
+            + "myS3.default.alb_logs\n"
+            + "[ PARTITIONED BY (col_name [, … ] ) ]\n"
+            + "[ ROW FORMAT DELIMITED row_format ]\n"
+            + "STORED AS file_format\n"
+            + "LOCATION { 's3://bucket/folder/' }";
+    fullyQualifiedTableName = SQLQueryUtils.extractFullyQualifiedTableNames(sqlQuery).get(0);
+    assertFalse(SQLQueryUtils.isFlintExtensionQuery(sqlQuery));
+    assertFullyQualifiedTableName("myS3", "default", "alb_logs", fullyQualifiedTableName);
+  }
+
+  @Test
+  void testMultipleTables() {
+    String[] sqlQueries = {
+      "SELECT * FROM my_glue.default.http_logs, my_glue.default.access_logs",
+      "SELECT * FROM my_glue.default.http_logs LEFT JOIN my_glue.default.access_logs",
+      "SELECT table1.id, table2.id FROM my_glue.default.http_logs table1 LEFT OUTER JOIN"
+          + " (SELECT * FROM my_glue.default.access_logs) table2 ON table1.tag = table2.tag",
+      "SELECT table1.id, table2.id FROM my_glue.default.http_logs FOR VERSION AS OF 1 table1"
+          + " LEFT OUTER JOIN"
+          + " (SELECT * FROM my_glue.default.access_logs) table2"
+          + " ON table1.tag = table2.tag"
+    };
+
+    for (String sqlQuery : sqlQueries) {
+      List<FullyQualifiedTableName> fullyQualifiedTableNames =
+          SQLQueryUtils.extractFullyQualifiedTableNames(sqlQuery);
+
+      assertFalse(SQLQueryUtils.isFlintExtensionQuery(sqlQuery));
+      assertEquals(2, fullyQualifiedTableNames.size());
+      assertFullyQualifiedTableName(
+          "my_glue", "default", "http_logs", fullyQualifiedTableNames.get(0));
+      assertFullyQualifiedTableName(
+          "my_glue", "default", "access_logs", fullyQualifiedTableNames.get(1));
+    }
+  }
+
+  @Test
+  void testMultipleTablesWithJoin() {
+    String sqlQuery =
+        "select * from my_glue.default.http_logs LEFT JOIN my_glue.default.access_logs";
+
+    List<FullyQualifiedTableName> fullyQualifiedTableNames =
+        SQLQueryUtils.extractFullyQualifiedTableNames(sqlQuery);
+
+    assertFalse(SQLQueryUtils.isFlintExtensionQuery(sqlQuery));
+    assertFullyQualifiedTableName(
+        "my_glue", "default", "http_logs", fullyQualifiedTableNames.get(0));
+    assertFullyQualifiedTableName(
+        "my_glue", "default", "access_logs", fullyQualifiedTableNames.get(1));
+  }
+
+  @Test
+  void testNoFullyQualifiedTableName() {
+    String sqlQuery = "SHOW tables";
+
+    List<FullyQualifiedTableName> fullyQualifiedTableNames =
+        SQLQueryUtils.extractFullyQualifiedTableNames(sqlQuery);
+
+    assertEquals(0, fullyQualifiedTableNames.size());
+  }
+
+  @Test
+  void testExtractionFromFlintSkippingIndexQueries() {
+    String[] createSkippingIndexQueries = {
+      "CREATE SKIPPING INDEX ON myS3.default.alb_logs (l_orderkey VALUE_SET)",
+      "CREATE SKIPPING INDEX IF NOT EXISTS"
+          + " ON myS3.default.alb_logs (l_orderkey VALUE_SET) "
+          + " WITH (auto_refresh = true)",
+      "CREATE SKIPPING INDEX ON myS3.default.alb_logs(l_orderkey VALUE_SET)"
+          + " WITH (auto_refresh = true)",
+      "CREATE SKIPPING INDEX ON myS3.default.alb_logs(l_orderkey VALUE_SET) "
+          + " WHERE elb_status_code = 500 "
+          + " WITH (auto_refresh = true)",
+      "DROP SKIPPING INDEX ON myS3.default.alb_logs",
+      "ALTER SKIPPING INDEX ON myS3.default.alb_logs WITH (auto_refresh = false)",
+    };
+
+    for (String query : createSkippingIndexQueries) {
+      assertTrue(SQLQueryUtils.isFlintExtensionQuery(query), "Failed query: " + query);
+
+      IndexQueryDetails indexQueryDetails = SQLQueryUtils.extractIndexDetails(query);
+      FullyQualifiedTableName fullyQualifiedTableName =
+          indexQueryDetails.getFullyQualifiedTableName();
+
+      assertNull(indexQueryDetails.getIndexName());
+      assertFullyQualifiedTableName("myS3", "default", "alb_logs", fullyQualifiedTableName);
+      assertEquals(
+          "flint_mys3_default_alb_logs_skipping_index", indexQueryDetails.openSearchIndexName());
+    }
+  }
+
+  @Test
+  void testExtractionFromFlintCoveringIndexQueries() {
+    String[] coveringIndexQueries = {
+      "CREATE INDEX elb_and_requestUri ON myS3.default.alb_logs(l_orderkey, l_quantity)",
+      "CREATE INDEX IF NOT EXISTS elb_and_requestUri "
+          + " ON myS3.default.alb_logs(l_orderkey, l_quantity) "
+          + " WITH (auto_refresh = true)",
+      "CREATE INDEX elb_and_requestUri ON myS3.default.alb_logs(l_orderkey, l_quantity)"
+          + " WITH (auto_refresh = true)",
+      "CREATE INDEX elb_and_requestUri ON myS3.default.alb_logs(l_orderkey, l_quantity) "
+          + " WHERE elb_status_code = 500 "
+          + " WITH (auto_refresh = true)",
+      "DROP INDEX elb_and_requestUri ON myS3.default.alb_logs",
+      "ALTER INDEX elb_and_requestUri ON myS3.default.alb_logs WITH (auto_refresh = false)"
+    };
+
+    for (String query : coveringIndexQueries) {
+      assertTrue(SQLQueryUtils.isFlintExtensionQuery(query), "Failed query: " + query);
+
+      IndexQueryDetails indexQueryDetails = SQLQueryUtils.extractIndexDetails(query);
+      FullyQualifiedTableName fullyQualifiedTableName =
+          indexQueryDetails.getFullyQualifiedTableName();
+
+      assertEquals("elb_and_requestUri", indexQueryDetails.getIndexName());
+      assertFullyQualifiedTableName("myS3", "default", "alb_logs", fullyQualifiedTableName);
+      assertEquals(
+          "flint_mys3_default_alb_logs_elb_and_requesturi_index",
+          indexQueryDetails.openSearchIndexName());
+    }
+  }
+
+  @Test
+  void testExtractionFromCreateMVQuery() {
+    String mvQuery = "select * from my_glue.default.logs";
+    String query = "CREATE MATERIALIZED VIEW mv_1 AS " + mvQuery + " WITH (auto_refresh = true)";
+
+    assertTrue(SQLQueryUtils.isFlintExtensionQuery(query));
+    IndexQueryDetails indexQueryDetails = SQLQueryUtils.extractIndexDetails(query);
+    assertNull(indexQueryDetails.getIndexName());
+    assertNull(indexQueryDetails.getFullyQualifiedTableName());
+    assertEquals(mvQuery, indexQueryDetails.getMvQuery());
+    assertEquals("mv_1", indexQueryDetails.getMvName());
+    assertEquals("flint_mv_1", indexQueryDetails.openSearchIndexName());
+  }
+
+  @Test
+  void testExtractionFromFlintMVQuery() {
+    String[] mvQueries = {
+      "DROP MATERIALIZED VIEW mv_1", "ALTER MATERIALIZED VIEW mv_1 WITH (auto_refresh = false)",
+    };
+
+    for (String query : mvQueries) {
+      assertTrue(SQLQueryUtils.isFlintExtensionQuery(query));
+
+      IndexQueryDetails indexQueryDetails = SQLQueryUtils.extractIndexDetails(query);
+      FullyQualifiedTableName fullyQualifiedTableName =
+          indexQueryDetails.getFullyQualifiedTableName();
+
+      assertNull(indexQueryDetails.getIndexName());
+      assertNull(fullyQualifiedTableName);
+      assertNull(indexQueryDetails.getMvQuery());
+      assertEquals("mv_1", indexQueryDetails.getMvName());
+      assertEquals("flint_mv_1", indexQueryDetails.openSearchIndexName());
+    }
+  }
+
+  @Test
+  void testDescSkippingIndex() {
+    String descSkippingIndex = "DESC SKIPPING INDEX ON mys3.default.http_logs";
+
+    assertTrue(SQLQueryUtils.isFlintExtensionQuery(descSkippingIndex));
+    IndexQueryDetails indexDetails = SQLQueryUtils.extractIndexDetails(descSkippingIndex);
+    FullyQualifiedTableName fullyQualifiedTableName = indexDetails.getFullyQualifiedTableName();
+
+    assertNull(indexDetails.getIndexName());
+    assertNotNull(fullyQualifiedTableName);
+    assertEquals(FlintIndexType.SKIPPING, indexDetails.getIndexType());
+    assertEquals(IndexQueryActionType.DESCRIBE, indexDetails.getIndexQueryActionType());
+    assertEquals("flint_mys3_default_http_logs_skipping_index", indexDetails.openSearchIndexName());
+  }
+
+  @Test
+  void testDescCoveringIndex() {
+    String descCoveringIndex = "DESC INDEX cv1 ON mys3.default.http_logs";
+
+    assertTrue(SQLQueryUtils.isFlintExtensionQuery(descCoveringIndex));
+    IndexQueryDetails indexDetails = SQLQueryUtils.extractIndexDetails(descCoveringIndex);
+    FullyQualifiedTableName fullyQualifiedTableName = indexDetails.getFullyQualifiedTableName();
+
+    assertEquals("cv1", indexDetails.getIndexName());
+    assertNotNull(fullyQualifiedTableName);
+    assertEquals(FlintIndexType.COVERING, indexDetails.getIndexType());
+    assertEquals(IndexQueryActionType.DESCRIBE, indexDetails.getIndexQueryActionType());
+    assertEquals("flint_mys3_default_http_logs_cv1_index", indexDetails.openSearchIndexName());
+  }
+
+  @Test
+  void testDescMaterializedView() {
+    String descMv = "DESC MATERIALIZED VIEW mv1";
+
+    assertTrue(SQLQueryUtils.isFlintExtensionQuery(descMv));
+    IndexQueryDetails indexDetails = SQLQueryUtils.extractIndexDetails(descMv);
+    FullyQualifiedTableName fullyQualifiedTableName = indexDetails.getFullyQualifiedTableName();
+
+    assertNull(indexDetails.getIndexName());
+    assertEquals("mv1", indexDetails.getMvName());
+    assertNull(fullyQualifiedTableName);
+    assertEquals(FlintIndexType.MATERIALIZED_VIEW, indexDetails.getIndexType());
+    assertEquals(IndexQueryActionType.DESCRIBE, indexDetails.getIndexQueryActionType());
+    assertEquals("flint_mv1", indexDetails.openSearchIndexName());
+  }
+
+  @Test
+  void testShowIndex() {
+    String showCoveringIndex = "SHOW INDEX ON myS3.default.http_logs";
+
+    assertTrue(SQLQueryUtils.isFlintExtensionQuery(showCoveringIndex));
+    IndexQueryDetails indexDetails = SQLQueryUtils.extractIndexDetails(showCoveringIndex);
+    FullyQualifiedTableName fullyQualifiedTableName = indexDetails.getFullyQualifiedTableName();
+
+    assertNull(indexDetails.getIndexName());
+    assertNull(indexDetails.getMvName());
+    assertNotNull(fullyQualifiedTableName);
+    assertEquals(FlintIndexType.COVERING, indexDetails.getIndexType());
+    assertEquals(IndexQueryActionType.SHOW, indexDetails.getIndexQueryActionType());
+    assertNull(indexDetails.openSearchIndexName());
+  }
+
+  @Test
+  void testShowMaterializedView() {
+    String showMV = "SHOW MATERIALIZED VIEW IN my_glue.default";
+
+    assertTrue(SQLQueryUtils.isFlintExtensionQuery(showMV));
+    IndexQueryDetails indexDetails = SQLQueryUtils.extractIndexDetails(showMV);
+    FullyQualifiedTableName fullyQualifiedTableName = indexDetails.getFullyQualifiedTableName();
+
+    assertNull(indexDetails.getIndexName());
+    assertNull(indexDetails.getMvName());
+    assertNull(fullyQualifiedTableName);
+    assertEquals(FlintIndexType.MATERIALIZED_VIEW, indexDetails.getIndexType());
+    assertEquals(IndexQueryActionType.SHOW, indexDetails.getIndexQueryActionType());
+    assertNull(indexDetails.openSearchIndexName());
+  }
+
+  @Test
+  void testRefreshIndex() {
+    String refreshSkippingIndex = "REFRESH SKIPPING INDEX ON mys3.default.http_logs";
+    assertTrue(SQLQueryUtils.isFlintExtensionQuery(refreshSkippingIndex));
+    IndexQueryDetails indexDetails = SQLQueryUtils.extractIndexDetails(refreshSkippingIndex);
+    FullyQualifiedTableName fullyQualifiedTableName = indexDetails.getFullyQualifiedTableName();
+    assertNull(indexDetails.getIndexName());
+    assertNotNull(fullyQualifiedTableName);
+    assertEquals(FlintIndexType.SKIPPING, indexDetails.getIndexType());
+    assertEquals(IndexQueryActionType.REFRESH, indexDetails.getIndexQueryActionType());
+
+    String refreshCoveringIndex = "REFRESH INDEX cv1 ON mys3.default.http_logs";
+    assertTrue(SQLQueryUtils.isFlintExtensionQuery(refreshCoveringIndex));
+    indexDetails = SQLQueryUtils.extractIndexDetails(refreshCoveringIndex);
+    fullyQualifiedTableName = indexDetails.getFullyQualifiedTableName();
+    assertEquals("cv1", indexDetails.getIndexName());
+    assertNotNull(fullyQualifiedTableName);
+    assertEquals(FlintIndexType.COVERING, indexDetails.getIndexType());
+    assertEquals(IndexQueryActionType.REFRESH, indexDetails.getIndexQueryActionType());
+
+    String refreshMV = "REFRESH MATERIALIZED VIEW mv1";
+    assertTrue(SQLQueryUtils.isFlintExtensionQuery(refreshMV));
+    indexDetails = SQLQueryUtils.extractIndexDetails(refreshMV);
+    fullyQualifiedTableName = indexDetails.getFullyQualifiedTableName();
+    assertNull(indexDetails.getIndexName());
+    assertEquals("mv1", indexDetails.getMvName());
+    assertNull(fullyQualifiedTableName);
+    assertEquals(FlintIndexType.MATERIALIZED_VIEW, indexDetails.getIndexType());
+    assertEquals(IndexQueryActionType.REFRESH, indexDetails.getIndexQueryActionType());
+  }
+
+  /** https://github.com/opensearch-project/sql/issues/2206 */
+  @Test
+  void testAutoRefresh() {
+    assertFalse(
+        SQLQueryUtils.extractIndexDetails(skippingIndex().getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertFalse(
+        SQLQueryUtils.extractIndexDetails(
+                skippingIndex().withProperty("auto_refresh", "false").getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertTrue(
+        SQLQueryUtils.extractIndexDetails(
+                skippingIndex().withProperty("auto_refresh", "true").getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertTrue(
+        SQLQueryUtils.extractIndexDetails(
+                skippingIndex().withProperty("auto_refresh", "true").withSemicolon().getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertTrue(
+        SQLQueryUtils.extractIndexDetails(
+                skippingIndex().withProperty("\"auto_refresh\"", "true").getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertTrue(
+        SQLQueryUtils.extractIndexDetails(
+                skippingIndex().withProperty("\"auto_refresh\"", "true").withSemicolon().getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertTrue(
+        SQLQueryUtils.extractIndexDetails(
+                skippingIndex().withProperty("\"auto_refresh\"", "\"true\"").getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertTrue(
+        SQLQueryUtils.extractIndexDetails(
+                skippingIndex()
+                    .withProperty("\"auto_refresh\"", "\"true\"")
+                    .withSemicolon()
+                    .getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertFalse(
+        SQLQueryUtils.extractIndexDetails(
+                skippingIndex().withProperty("auto_refresh", "1").getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertFalse(
+        SQLQueryUtils.extractIndexDetails(skippingIndex().withProperty("interval", "1").getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertFalse(
+        SQLQueryUtils.extractIndexDetails(
+                skippingIndex().withProperty("\"\"", "\"true\"").getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertFalse(
+        SQLQueryUtils.extractIndexDetails(index().getQuery()).getFlintIndexOptions().autoRefresh());
+
+    assertFalse(
+        SQLQueryUtils.extractIndexDetails(index().withProperty("auto_refresh", "false").getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertTrue(
+        SQLQueryUtils.extractIndexDetails(index().withProperty("auto_refresh", "true").getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertTrue(
+        SQLQueryUtils.extractIndexDetails(
+                index().withProperty("auto_refresh", "true").withSemicolon().getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertTrue(
+        SQLQueryUtils.extractIndexDetails(mv().withProperty("auto_refresh", "true").getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+
+    assertTrue(
+        SQLQueryUtils.extractIndexDetails(
+                mv().withProperty("auto_refresh", "true").withSemicolon().getQuery())
+            .getFlintIndexOptions()
+            .autoRefresh());
+  }
+
+  @Test
+  void testRecoverIndex() {
+    String refreshSkippingIndex =
+        "RECOVER INDEX JOB `flint_spark_catalog_default_test_skipping_index`";
+    assertTrue(SQLQueryUtils.isFlintExtensionQuery(refreshSkippingIndex));
+    IndexQueryDetails indexDetails = SQLQueryUtils.extractIndexDetails(refreshSkippingIndex);
+    assertEquals(IndexQueryActionType.RECOVER, indexDetails.getIndexQueryActionType());
+  }
+
+  @Getter
+  protected static class IndexQuery {
+    private String query;
+
+    private IndexQuery(String query) {
+      this.query = query;
+    }
+
+    public static IndexQuery skippingIndex() {
+      return new IndexQuery(
+          "CREATE SKIPPING INDEX ON myS3.default.alb_logs" + "(l_orderkey VALUE_SET)");
+    }
+
+    public static IndexQuery index() {
+      return new IndexQuery(
+          "CREATE INDEX elb_and_requestUri ON myS3.default.alb_logs(l_orderkey, " + "l_quantity)");
+    }
+
+    public static IndexQuery mv() {
+      return new IndexQuery("CREATE MATERIALIZED VIEW mv_1 AS select * from my_glue.default.logs");
+    }
+
+    public IndexQuery withProperty(String key, String value) {
+      query = String.format("%s with (%s = %s)", query, key, value);
+      return this;
+    }
+
+    public IndexQuery withSemicolon() {
+      query += ";";
+      return this;
+    }
+  }
+
+  private void assertFullyQualifiedTableName(
+      String expectedDatasourceName,
+      String expectedSchemaName,
+      String expectedTableName,
+      FullyQualifiedTableName fullyQualifiedTableName) {
+    assertEquals(expectedDatasourceName, fullyQualifiedTableName.getDatasourceName());
+    assertEquals(expectedSchemaName, fullyQualifiedTableName.getSchemaName());
+    assertEquals(expectedTableName, fullyQualifiedTableName.getTableName());
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java b/async-query-core/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java
new file mode 100644
index 0000000000..4336b13aa9
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.utils;
+
+import java.io.IOException;
+import java.util.Objects;
+
+public class TestUtils {
+  public static String getJson(String filename) throws IOException {
+    ClassLoader classLoader = TestUtils.class.getClassLoader();
+    return new String(
+        Objects.requireNonNull(classLoader.getResourceAsStream(filename)).readAllBytes());
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/validator/FunctionTypeTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/validator/FunctionTypeTest.java
new file mode 100644
index 0000000000..a5f868421c
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/validator/FunctionTypeTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+class FunctionTypeTest {
+  @Test
+  public void test() {
+    assertEquals(FunctionType.AGGREGATE, FunctionType.fromFunctionName("any"));
+    assertEquals(FunctionType.AGGREGATE, FunctionType.fromFunctionName("variance"));
+    assertEquals(FunctionType.WINDOW, FunctionType.fromFunctionName("cume_dist"));
+    assertEquals(FunctionType.WINDOW, FunctionType.fromFunctionName("row_number"));
+    assertEquals(FunctionType.ARRAY, FunctionType.fromFunctionName("array"));
+    assertEquals(FunctionType.ARRAY, FunctionType.fromFunctionName("sort_array"));
+    assertEquals(FunctionType.MAP, FunctionType.fromFunctionName("element_at"));
+    assertEquals(FunctionType.MAP, FunctionType.fromFunctionName("try_element_at"));
+    assertEquals(FunctionType.DATE_TIMESTAMP, FunctionType.fromFunctionName("add_months"));
+    assertEquals(FunctionType.DATE_TIMESTAMP, FunctionType.fromFunctionName("year"));
+    assertEquals(FunctionType.JSON, FunctionType.fromFunctionName("from_json"));
+    assertEquals(FunctionType.JSON, FunctionType.fromFunctionName("to_json"));
+    assertEquals(FunctionType.MATH, FunctionType.fromFunctionName("abs"));
+    assertEquals(FunctionType.MATH, FunctionType.fromFunctionName("width_bucket"));
+    assertEquals(FunctionType.STRING, FunctionType.fromFunctionName("ascii"));
+    assertEquals(FunctionType.STRING, FunctionType.fromFunctionName("upper"));
+    assertEquals(FunctionType.CONDITIONAL, FunctionType.fromFunctionName("coalesce"));
+    assertEquals(FunctionType.CONDITIONAL, FunctionType.fromFunctionName("nvl2"));
+    assertEquals(FunctionType.BITWISE, FunctionType.fromFunctionName("bit_count"));
+    assertEquals(FunctionType.BITWISE, FunctionType.fromFunctionName("shiftrightunsigned"));
+    assertEquals(FunctionType.CONVERSION, FunctionType.fromFunctionName("bigint"));
+    assertEquals(FunctionType.CONVERSION, FunctionType.fromFunctionName("tinyint"));
+    assertEquals(FunctionType.PREDICATE, FunctionType.fromFunctionName("isnan"));
+    assertEquals(FunctionType.PREDICATE, FunctionType.fromFunctionName("rlike"));
+    assertEquals(FunctionType.CSV, FunctionType.fromFunctionName("from_csv"));
+    assertEquals(FunctionType.CSV, FunctionType.fromFunctionName("to_csv"));
+    assertEquals(FunctionType.MISC, FunctionType.fromFunctionName("aes_decrypt"));
+    assertEquals(FunctionType.MISC, FunctionType.fromFunctionName("version"));
+    assertEquals(FunctionType.GENERATOR, FunctionType.fromFunctionName("explode"));
+    assertEquals(FunctionType.GENERATOR, FunctionType.fromFunctionName("stack"));
+    assertEquals(FunctionType.UDF, FunctionType.fromFunctionName("unknown"));
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/validator/GrammarElementValidatorProviderTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/validator/GrammarElementValidatorProviderTest.java
new file mode 100644
index 0000000000..7d4b255356
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/validator/GrammarElementValidatorProviderTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.datasource.model.DataSourceType;
+
+class GrammarElementValidatorProviderTest {
+  S3GlueGrammarElementValidator s3GlueGrammarElementValidator = new S3GlueGrammarElementValidator();
+  SecurityLakeGrammarElementValidator securityLakeGrammarElementValidator =
+      new SecurityLakeGrammarElementValidator();
+  DefaultGrammarElementValidator defaultGrammarElementValidator =
+      new DefaultGrammarElementValidator();
+  GrammarElementValidatorProvider grammarElementValidatorProvider =
+      new GrammarElementValidatorProvider(
+          ImmutableMap.of(
+              DataSourceType.S3GLUE, s3GlueGrammarElementValidator,
+              DataSourceType.SECURITY_LAKE, securityLakeGrammarElementValidator),
+          defaultGrammarElementValidator);
+
+  @Test
+  public void test() {
+    assertEquals(
+        s3GlueGrammarElementValidator,
+        grammarElementValidatorProvider.getValidatorForDatasource(DataSourceType.S3GLUE));
+    assertEquals(
+        securityLakeGrammarElementValidator,
+        grammarElementValidatorProvider.getValidatorForDatasource(DataSourceType.SECURITY_LAKE));
+    assertEquals(
+        defaultGrammarElementValidator,
+        grammarElementValidatorProvider.getValidatorForDatasource(DataSourceType.PROMETHEUS));
+  }
+}
diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/validator/SQLQueryValidatorTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/validator/SQLQueryValidatorTest.java
new file mode 100644
index 0000000000..6726b56994
--- /dev/null
+++ b/async-query-core/src/test/java/org/opensearch/sql/spark/validator/SQLQueryValidatorTest.java
@@ -0,0 +1,600 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.validator;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.common.antlr.CaseInsensitiveCharStream;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseLexer;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser;
+import org.opensearch.sql.spark.antlr.parser.SqlBaseParser.SingleStatementContext;
+
+@ExtendWith(MockitoExtension.class)
+class SQLQueryValidatorTest {
+  @Mock GrammarElementValidatorProvider mockedProvider;
+
+  @InjectMocks SQLQueryValidator sqlQueryValidator;
+
+  private enum TestElement {
+    // DDL Statements
+    ALTER_DATABASE(
+        "ALTER DATABASE inventory SET DBPROPERTIES ('Edit-date' = '01/01/2001');",
+        "ALTER DATABASE dbx.tab1 UNSET PROPERTIES ('winner');",
+        "ALTER DATABASE dbx.tab1 SET LOCATION '/path/to/part/ways';"),
+    ALTER_TABLE(
+        "ALTER TABLE default.StudentInfo PARTITION (age='10') RENAME TO PARTITION (age='15');",
+        "ALTER TABLE dbx.tab1 UNSET TBLPROPERTIES ('winner');",
+        "ALTER TABLE StudentInfo ADD columns (LastName string, DOB timestamp);",
+        "ALTER TABLE StudentInfo ADD IF NOT EXISTS PARTITION (age=18);",
+        "ALTER TABLE StudentInfo RENAME COLUMN name TO FirstName;",
+        "ALTER TABLE StudentInfo RENAME TO newName;",
+        "ALTER TABLE StudentInfo DROP columns (LastName, DOB);",
+        "ALTER TABLE StudentInfo ALTER COLUMN FirstName COMMENT \"new comment\";",
+        "ALTER TABLE StudentInfo REPLACE COLUMNS (name string, ID int COMMENT 'new comment');",
+        "ALTER TABLE test_tab SET SERDE 'org.apache.LazyBinaryColumnarSerDe';",
+        "ALTER TABLE StudentInfo DROP IF EXISTS PARTITION (age=18);",
+        "ALTER TABLE dbx.tab1 PARTITION (a='1', b='2') SET LOCATION '/path/to/part/ways';",
+        "ALTER TABLE dbx.tab1 RECOVER PARTITIONS;",
+        "ALTER TABLE dbx.tab1 CLUSTER BY NONE;",
+        "ALTER TABLE dbx.tab1 SET LOCATION '/path/to/part/ways';"),
+    ALTER_VIEW(
+        "ALTER VIEW tempdb1.v1 RENAME TO tempdb1.v2;",
+        "ALTER VIEW tempdb1.v2 AS SELECT * FROM tempdb1.v1;",
+        "ALTER VIEW tempdb1.v2 WITH SCHEMA BINDING"),
+    CREATE_DATABASE("CREATE DATABASE IF NOT EXISTS customer_db;\n"),
+    CREATE_FUNCTION("CREATE FUNCTION simple_udf AS 'SimpleUdf' USING JAR '/tmp/SimpleUdf.jar';"),
+    CREATE_TABLE(
+        "CREATE TABLE Student_Dupli like Student;",
+        "CREATE TABLE student (id INT, name STRING, age INT) USING CSV;",
+        "CREATE TABLE student_copy USING CSV AS SELECT * FROM student;",
+        "CREATE TABLE student (id INT, name STRING, age INT);",
+        "REPLACE TABLE student (id INT, name STRING, age INT) USING CSV;"),
+    CREATE_VIEW(
+        "CREATE OR REPLACE VIEW experienced_employee"
+            + "    (ID COMMENT 'Unique identification number', Name)"
+            + "    COMMENT 'View for experienced employees'"
+            + "    AS SELECT id, name FROM all_employee"
+            + "        WHERE working_years > 5;"),
+    DROP_DATABASE("DROP DATABASE inventory_db CASCADE;"),
+    DROP_FUNCTION("DROP FUNCTION test_avg;"),
+    DROP_TABLE("DROP TABLE employeetable;"),
+    DROP_VIEW("DROP VIEW employeeView;"),
+    REPAIR_TABLE("REPAIR TABLE t1;"),
+    TRUNCATE_TABLE("TRUNCATE TABLE Student partition(age=10);"),
+
+    // DML Statements
+    INSERT_TABLE(
+        "INSERT INTO target_table SELECT * FROM source_table;",
+        "INSERT INTO persons REPLACE WHERE ssn = 123456789 SELECT * FROM persons2;",
+        "INSERT OVERWRITE students VALUES ('Ashua Hill', '456 Erica Ct, Cupertino', 111111);"),
+    INSERT_OVERWRITE_DIRECTORY(
+        "INSERT OVERWRITE DIRECTORY '/path/to/output' SELECT * FROM source_table;",
+        "INSERT OVERWRITE DIRECTORY USING myTable SELECT * FROM source_table;",
+        "INSERT OVERWRITE LOCAL DIRECTORY '/tmp/destination' STORED AS orc SELECT * FROM"
+            + " test_table;"),
+    LOAD("LOAD DATA INPATH '/path/to/data' INTO TABLE target_table;"),
+
+    // Data Retrieval Statements
+    SELECT("SELECT 1;"),
+    EXPLAIN("EXPLAIN SELECT * FROM my_table;"),
+    COMMON_TABLE_EXPRESSION(
+        "WITH cte AS (SELECT * FROM my_table WHERE age > 30) SELECT * FROM cte;"),
+    CLUSTER_BY_CLAUSE(
+        "SELECT * FROM my_table CLUSTER BY age;", "ALTER TABLE testTable CLUSTER BY (age);"),
+    DISTRIBUTE_BY_CLAUSE("SELECT * FROM my_table DISTRIBUTE BY name;"),
+    GROUP_BY_CLAUSE("SELECT name, count(*) FROM my_table GROUP BY name;"),
+    HAVING_CLAUSE("SELECT name, count(*) FROM my_table GROUP BY name HAVING count(*) > 1;"),
+    HINTS("SELECT /*+ BROADCAST(my_table) */ * FROM my_table;"),
+    INLINE_TABLE("SELECT * FROM (VALUES (1, 'a'), (2, 'b')) AS inline_table(id, value);"),
+    FILE("SELECT * FROM text.`/path/to/file.txt`;"),
+    INNER_JOIN("SELECT t1.name, t2.age FROM table1 t1 INNER JOIN table2 t2 ON t1.id = t2.id;"),
+    CROSS_JOIN("SELECT t1.name, t2.age FROM table1 t1 CROSS JOIN table2 t2;"),
+    LEFT_OUTER_JOIN(
+        "SELECT t1.name, t2.age FROM table1 t1 LEFT OUTER JOIN table2 t2 ON t1.id = t2.id;"),
+    LEFT_SEMI_JOIN("SELECT t1.name FROM table1 t1 LEFT SEMI JOIN table2 t2 ON t1.id = t2.id;"),
+    RIGHT_OUTER_JOIN(
+        "SELECT t1.name, t2.age FROM table1 t1 RIGHT OUTER JOIN table2 t2 ON t1.id = t2.id;"),
+    FULL_OUTER_JOIN(
+        "SELECT t1.name, t2.age FROM table1 t1 FULL OUTER JOIN table2 t2 ON t1.id = t2.id;"),
+    LEFT_ANTI_JOIN("SELECT t1.name FROM table1 t1 LEFT ANTI JOIN table2 t2 ON t1.id = t2.id;"),
+    LIKE_PREDICATE("SELECT * FROM my_table WHERE name LIKE 'A%';"),
+    LIMIT_CLAUSE("SELECT * FROM my_table LIMIT 10;"),
+    OFFSET_CLAUSE("SELECT * FROM my_table OFFSET 5;"),
+    ORDER_BY_CLAUSE("SELECT * FROM my_table ORDER BY age DESC;"),
+    SET_OPERATORS("SELECT * FROM table1 UNION SELECT * FROM table2;"),
+    SORT_BY_CLAUSE("SELECT * FROM my_table SORT BY age DESC;"),
+    TABLESAMPLE("SELECT * FROM my_table TABLESAMPLE(10 PERCENT);"),
+    //    TABLE_VALUED_FUNCTION("SELECT explode(array(10, 20));"), TODO: Need to handle this case
+    TABLE_VALUED_FUNCTION("SELECT * FROM explode(array(10, 20));"),
+    WHERE_CLAUSE("SELECT * FROM my_table WHERE age > 30;"),
+    AGGREGATE_FUNCTION("SELECT count(*) FROM my_table;"),
+    WINDOW_FUNCTION("SELECT name, age, rank() OVER (ORDER BY age DESC) FROM my_table;"),
+    CASE_CLAUSE("SELECT name, CASE WHEN age > 30 THEN 'Adult' ELSE 'Young' END FROM my_table;"),
+    PIVOT_CLAUSE(
+        "SELECT * FROM (SELECT name, age, gender FROM my_table) PIVOT (COUNT(*) FOR gender IN ('M',"
+            + " 'F'));"),
+    UNPIVOT_CLAUSE(
+        "SELECT name, value, category FROM (SELECT name, 'M' AS gender, age AS male_age, 0 AS"
+            + " female_age FROM my_table) UNPIVOT (value FOR category IN (male_age, female_age));"),
+    LATERAL_VIEW_CLAUSE(
+        "SELECT name, age, exploded_value FROM my_table LATERAL VIEW OUTER EXPLODE(split(comments,"
+            + " ',')) exploded_table AS exploded_value;"),
+    LATERAL_SUBQUERY(
+        "SELECT * FROM t1, LATERAL (SELECT * FROM t2 WHERE t1.c1 = t2.c1);",
+        "SELECT * FROM t1 JOIN LATERAL (SELECT * FROM t2 WHERE t1.c1 = t2.c1);"),
+    TRANSFORM_CLAUSE(
+        "SELECT transform(zip_code, name, age) USING 'cat' AS (a, b, c) FROM my_table;"),
+
+    // Auxiliary Statements
+    ADD_FILE("ADD FILE /tmp/test.txt;"),
+    ADD_JAR("ADD JAR /path/to/my.jar;"),
+    ANALYZE_TABLE(
+        "ANALYZE TABLE my_table COMPUTE STATISTICS;",
+        "ANALYZE TABLES IN school_db COMPUTE STATISTICS NOSCAN;"),
+    CACHE_TABLE("CACHE TABLE my_table;"),
+    CLEAR_CACHE("CLEAR CACHE;"),
+    DESCRIBE_DATABASE("DESCRIBE DATABASE my_db;"),
+    DESCRIBE_FUNCTION("DESCRIBE FUNCTION my_function;"),
+    DESCRIBE_QUERY("DESCRIBE QUERY SELECT * FROM my_table;"),
+    DESCRIBE_TABLE("DESCRIBE TABLE my_table;"),
+    LIST_FILE("LIST FILE '/path/to/files';"),
+    LIST_JAR("LIST JAR;"),
+    REFRESH("REFRESH;"),
+    REFRESH_TABLE("REFRESH TABLE my_table;"),
+    REFRESH_FUNCTION("REFRESH FUNCTION my_function;"),
+    RESET("RESET;", "RESET spark.abc;", "RESET `key`;"),
+    SET(
+        "SET spark.sql.shuffle.partitions=200;",
+        "SET -v;",
+        "SET;",
+        "SET spark.sql.variable.substitute;"),
+    SHOW_COLUMNS("SHOW COLUMNS FROM my_table;"),
+    SHOW_CREATE_TABLE("SHOW CREATE TABLE my_table;"),
+    SHOW_DATABASES("SHOW DATABASES;"),
+    SHOW_FUNCTIONS("SHOW FUNCTIONS;"),
+    SHOW_PARTITIONS("SHOW PARTITIONS my_table;"),
+    SHOW_TABLE_EXTENDED("SHOW TABLE EXTENDED LIKE 'my_table';"),
+    SHOW_TABLES("SHOW TABLES;"),
+    SHOW_TBLPROPERTIES("SHOW TBLPROPERTIES my_table;"),
+    SHOW_VIEWS("SHOW VIEWS;"),
+    UNCACHE_TABLE("UNCACHE TABLE my_table;"),
+
+    // Functions
+    ARRAY_FUNCTIONS("SELECT array_contains(array(1, 2, 3), 2);"),
+    MAP_FUNCTIONS("SELECT map_keys(map('a', 1, 'b', 2));"),
+    DATE_AND_TIMESTAMP_FUNCTIONS("SELECT date_format(current_date(), 'yyyy-MM-dd');"),
+    JSON_FUNCTIONS("SELECT json_tuple('{\"a\":1, \"b\":2}', 'a', 'b');"),
+    MATHEMATICAL_FUNCTIONS("SELECT round(3.1415, 2);"),
+    STRING_FUNCTIONS("SELECT ascii('Hello');"),
+    BITWISE_FUNCTIONS("SELECT bit_count(42);"),
+    CONVERSION_FUNCTIONS("SELECT cast('2023-04-01' as date);"),
+    CONDITIONAL_FUNCTIONS("SELECT if(1 > 0, 'true', 'false');"),
+    PREDICATE_FUNCTIONS("SELECT isnotnull(1);"),
+    CSV_FUNCTIONS("SELECT from_csv(array('a', 'b', 'c'), ',');"),
+    MISC_FUNCTIONS("SELECT current_user();"),
+
+    // Aggregate-like Functions
+    AGGREGATE_FUNCTIONS("SELECT count(*), max(age), min(age) FROM my_table;"),
+    WINDOW_FUNCTIONS("SELECT name, age, rank() OVER (ORDER BY age DESC) FROM my_table;"),
+
+    // Generator Functions
+    GENERATOR_FUNCTIONS("SELECT explode(array(1, 2, 3));"),
+
+    // UDFs (User-Defined Functions)
+    SCALAR_USER_DEFINED_FUNCTIONS("SELECT my_udf(name) FROM my_table;"),
+    USER_DEFINED_AGGREGATE_FUNCTIONS("SELECT my_udaf(age) FROM my_table GROUP BY name;"),
+    INTEGRATION_WITH_HIVE_UDFS_UDAFS_UDTFS("SELECT my_hive_udf(name) FROM my_table;");
+
+    @Getter private final String[] queries;
+
+    TestElement(String... queries) {
+      this.queries = queries;
+    }
+  }
+
+  @Test
+  void testAllowAllByDefault() {
+    when(mockedProvider.getValidatorForDatasource(any()))
+        .thenReturn(new DefaultGrammarElementValidator());
+    VerifyValidator v = new VerifyValidator(sqlQueryValidator, DataSourceType.SPARK);
+    Arrays.stream(TestElement.values()).forEach(v::ok);
+  }
+
+  @Test
+  void testDenyAllValidator() {
+    when(mockedProvider.getValidatorForDatasource(any())).thenReturn(element -> false);
+    VerifyValidator v = new VerifyValidator(sqlQueryValidator, DataSourceType.SPARK);
+    // The elements which doesn't have validation will be accepted.
+    // That's why there are some ok case
+
+    // DDL Statements
+    v.ng(TestElement.ALTER_DATABASE);
+    v.ng(TestElement.ALTER_TABLE);
+    v.ng(TestElement.ALTER_VIEW);
+    v.ng(TestElement.CREATE_DATABASE);
+    v.ng(TestElement.CREATE_FUNCTION);
+    v.ng(TestElement.CREATE_TABLE);
+    v.ng(TestElement.CREATE_VIEW);
+    v.ng(TestElement.DROP_DATABASE);
+    v.ng(TestElement.DROP_FUNCTION);
+    v.ng(TestElement.DROP_TABLE);
+    v.ng(TestElement.DROP_VIEW);
+    v.ng(TestElement.REPAIR_TABLE);
+    v.ng(TestElement.TRUNCATE_TABLE);
+
+    // DML Statements
+    v.ng(TestElement.INSERT_TABLE);
+    v.ng(TestElement.INSERT_OVERWRITE_DIRECTORY);
+    v.ng(TestElement.LOAD);
+
+    // Data Retrieval
+    v.ng(TestElement.EXPLAIN);
+    v.ng(TestElement.COMMON_TABLE_EXPRESSION);
+    v.ng(TestElement.CLUSTER_BY_CLAUSE);
+    v.ng(TestElement.DISTRIBUTE_BY_CLAUSE);
+    v.ok(TestElement.GROUP_BY_CLAUSE);
+    v.ok(TestElement.HAVING_CLAUSE);
+    v.ng(TestElement.HINTS);
+    v.ng(TestElement.INLINE_TABLE);
+    v.ng(TestElement.FILE);
+    v.ng(TestElement.INNER_JOIN);
+    v.ng(TestElement.CROSS_JOIN);
+    v.ng(TestElement.LEFT_OUTER_JOIN);
+    v.ng(TestElement.LEFT_SEMI_JOIN);
+    v.ng(TestElement.RIGHT_OUTER_JOIN);
+    v.ng(TestElement.FULL_OUTER_JOIN);
+    v.ng(TestElement.LEFT_ANTI_JOIN);
+    v.ok(TestElement.LIKE_PREDICATE);
+    v.ok(TestElement.LIMIT_CLAUSE);
+    v.ok(TestElement.OFFSET_CLAUSE);
+    v.ok(TestElement.ORDER_BY_CLAUSE);
+    v.ok(TestElement.SET_OPERATORS);
+    v.ok(TestElement.SORT_BY_CLAUSE);
+    v.ng(TestElement.TABLESAMPLE);
+    v.ng(TestElement.TABLE_VALUED_FUNCTION);
+    v.ok(TestElement.WHERE_CLAUSE);
+    v.ok(TestElement.AGGREGATE_FUNCTION);
+    v.ok(TestElement.WINDOW_FUNCTION);
+    v.ok(TestElement.CASE_CLAUSE);
+    v.ok(TestElement.PIVOT_CLAUSE);
+    v.ok(TestElement.UNPIVOT_CLAUSE);
+    v.ng(TestElement.LATERAL_VIEW_CLAUSE);
+    v.ng(TestElement.LATERAL_SUBQUERY);
+    v.ng(TestElement.TRANSFORM_CLAUSE);
+
+    // Auxiliary Statements
+    v.ng(TestElement.ADD_FILE);
+    v.ng(TestElement.ADD_JAR);
+    v.ng(TestElement.ANALYZE_TABLE);
+    v.ng(TestElement.CACHE_TABLE);
+    v.ng(TestElement.CLEAR_CACHE);
+    v.ng(TestElement.DESCRIBE_DATABASE);
+    v.ng(TestElement.DESCRIBE_FUNCTION);
+    v.ng(TestElement.DESCRIBE_QUERY);
+    v.ng(TestElement.DESCRIBE_TABLE);
+    v.ng(TestElement.LIST_FILE);
+    v.ng(TestElement.LIST_JAR);
+    v.ng(TestElement.REFRESH);
+    v.ng(TestElement.REFRESH_TABLE);
+    v.ng(TestElement.REFRESH_FUNCTION);
+    v.ng(TestElement.RESET);
+    v.ng(TestElement.SET);
+    v.ng(TestElement.SHOW_COLUMNS);
+    v.ng(TestElement.SHOW_CREATE_TABLE);
+    v.ng(TestElement.SHOW_DATABASES);
+    v.ng(TestElement.SHOW_FUNCTIONS);
+    v.ng(TestElement.SHOW_PARTITIONS);
+    v.ng(TestElement.SHOW_TABLE_EXTENDED);
+    v.ng(TestElement.SHOW_TABLES);
+    v.ng(TestElement.SHOW_TBLPROPERTIES);
+    v.ng(TestElement.SHOW_VIEWS);
+    v.ng(TestElement.UNCACHE_TABLE);
+
+    // Functions
+    v.ok(TestElement.ARRAY_FUNCTIONS);
+    v.ng(TestElement.MAP_FUNCTIONS);
+    v.ok(TestElement.DATE_AND_TIMESTAMP_FUNCTIONS);
+    v.ok(TestElement.JSON_FUNCTIONS);
+    v.ok(TestElement.MATHEMATICAL_FUNCTIONS);
+    v.ok(TestElement.STRING_FUNCTIONS);
+    v.ok(TestElement.BITWISE_FUNCTIONS);
+    v.ok(TestElement.CONVERSION_FUNCTIONS);
+    v.ok(TestElement.CONDITIONAL_FUNCTIONS);
+    v.ok(TestElement.PREDICATE_FUNCTIONS);
+    v.ng(TestElement.CSV_FUNCTIONS);
+    v.ng(TestElement.MISC_FUNCTIONS);
+
+    // Aggregate-like Functions
+    v.ok(TestElement.AGGREGATE_FUNCTIONS);
+    v.ok(TestElement.WINDOW_FUNCTIONS);
+
+    // Generator Functions
+    v.ok(TestElement.GENERATOR_FUNCTIONS);
+
+    // UDFs
+    v.ng(TestElement.SCALAR_USER_DEFINED_FUNCTIONS);
+    v.ng(TestElement.USER_DEFINED_AGGREGATE_FUNCTIONS);
+    v.ng(TestElement.INTEGRATION_WITH_HIVE_UDFS_UDAFS_UDTFS);
+  }
+
+  @Test
+  void testS3glueQueries() {
+    when(mockedProvider.getValidatorForDatasource(any()))
+        .thenReturn(new S3GlueGrammarElementValidator());
+    VerifyValidator v = new VerifyValidator(sqlQueryValidator, DataSourceType.S3GLUE);
+
+    // DDL Statements
+    v.ok(TestElement.ALTER_DATABASE);
+    v.ok(TestElement.ALTER_TABLE);
+    v.ng(TestElement.ALTER_VIEW);
+    v.ok(TestElement.CREATE_DATABASE);
+    v.ng(TestElement.CREATE_FUNCTION);
+    v.ok(TestElement.CREATE_TABLE);
+    v.ng(TestElement.CREATE_VIEW);
+    v.ok(TestElement.DROP_DATABASE);
+    v.ng(TestElement.DROP_FUNCTION);
+    v.ok(TestElement.DROP_TABLE);
+    v.ng(TestElement.DROP_VIEW);
+    v.ok(TestElement.REPAIR_TABLE);
+    v.ok(TestElement.TRUNCATE_TABLE);
+
+    // DML Statements
+    v.ng(TestElement.INSERT_TABLE);
+    v.ng(TestElement.INSERT_OVERWRITE_DIRECTORY);
+    v.ng(TestElement.LOAD);
+
+    // Data Retrieval
+    v.ok(TestElement.SELECT);
+    v.ok(TestElement.EXPLAIN);
+    v.ok(TestElement.COMMON_TABLE_EXPRESSION);
+    v.ng(TestElement.CLUSTER_BY_CLAUSE);
+    v.ng(TestElement.DISTRIBUTE_BY_CLAUSE);
+    v.ok(TestElement.GROUP_BY_CLAUSE);
+    v.ok(TestElement.HAVING_CLAUSE);
+    v.ng(TestElement.HINTS);
+    v.ng(TestElement.INLINE_TABLE);
+    v.ng(TestElement.FILE);
+    v.ok(TestElement.INNER_JOIN);
+    v.ok(TestElement.CROSS_JOIN);
+    v.ok(TestElement.LEFT_OUTER_JOIN);
+    v.ok(TestElement.LEFT_SEMI_JOIN);
+    v.ok(TestElement.RIGHT_OUTER_JOIN);
+    v.ok(TestElement.FULL_OUTER_JOIN);
+    v.ok(TestElement.LEFT_ANTI_JOIN);
+    v.ok(TestElement.LIKE_PREDICATE);
+    v.ok(TestElement.LIMIT_CLAUSE);
+    v.ok(TestElement.OFFSET_CLAUSE);
+    v.ok(TestElement.ORDER_BY_CLAUSE);
+    v.ok(TestElement.SET_OPERATORS);
+    v.ok(TestElement.SORT_BY_CLAUSE);
+    v.ng(TestElement.TABLESAMPLE);
+    v.ng(TestElement.TABLE_VALUED_FUNCTION);
+    v.ok(TestElement.WHERE_CLAUSE);
+    v.ok(TestElement.AGGREGATE_FUNCTION);
+    v.ok(TestElement.WINDOW_FUNCTION);
+    v.ok(TestElement.CASE_CLAUSE);
+    v.ok(TestElement.PIVOT_CLAUSE);
+    v.ok(TestElement.UNPIVOT_CLAUSE);
+    v.ok(TestElement.LATERAL_VIEW_CLAUSE);
+    v.ok(TestElement.LATERAL_SUBQUERY);
+    v.ng(TestElement.TRANSFORM_CLAUSE);
+
+    // Auxiliary Statements
+    v.ng(TestElement.ADD_FILE);
+    v.ng(TestElement.ADD_JAR);
+    v.ok(TestElement.ANALYZE_TABLE);
+    v.ok(TestElement.CACHE_TABLE);
+    v.ok(TestElement.CLEAR_CACHE);
+    v.ok(TestElement.DESCRIBE_DATABASE);
+    v.ng(TestElement.DESCRIBE_FUNCTION);
+    v.ok(TestElement.DESCRIBE_QUERY);
+    v.ok(TestElement.DESCRIBE_TABLE);
+    v.ng(TestElement.LIST_FILE);
+    v.ng(TestElement.LIST_JAR);
+    v.ng(TestElement.REFRESH);
+    v.ok(TestElement.REFRESH_TABLE);
+    v.ng(TestElement.REFRESH_FUNCTION);
+    v.ng(TestElement.RESET);
+    v.ng(TestElement.SET);
+    v.ok(TestElement.SHOW_COLUMNS);
+    v.ok(TestElement.SHOW_CREATE_TABLE);
+    v.ok(TestElement.SHOW_DATABASES);
+    v.ng(TestElement.SHOW_FUNCTIONS);
+    v.ok(TestElement.SHOW_PARTITIONS);
+    v.ok(TestElement.SHOW_TABLE_EXTENDED);
+    v.ok(TestElement.SHOW_TABLES);
+    v.ok(TestElement.SHOW_TBLPROPERTIES);
+    v.ng(TestElement.SHOW_VIEWS);
+    v.ok(TestElement.UNCACHE_TABLE);
+
+    // Functions
+    v.ok(TestElement.ARRAY_FUNCTIONS);
+    v.ok(TestElement.MAP_FUNCTIONS);
+    v.ok(TestElement.DATE_AND_TIMESTAMP_FUNCTIONS);
+    v.ok(TestElement.JSON_FUNCTIONS);
+    v.ok(TestElement.MATHEMATICAL_FUNCTIONS);
+    v.ok(TestElement.STRING_FUNCTIONS);
+    v.ok(TestElement.BITWISE_FUNCTIONS);
+    v.ok(TestElement.CONVERSION_FUNCTIONS);
+    v.ok(TestElement.CONDITIONAL_FUNCTIONS);
+    v.ok(TestElement.PREDICATE_FUNCTIONS);
+    v.ok(TestElement.CSV_FUNCTIONS);
+    v.ng(TestElement.MISC_FUNCTIONS);
+
+    // Aggregate-like Functions
+    v.ok(TestElement.AGGREGATE_FUNCTIONS);
+    v.ok(TestElement.WINDOW_FUNCTIONS);
+
+    // Generator Functions
+    v.ok(TestElement.GENERATOR_FUNCTIONS);
+
+    // UDFs
+    v.ng(TestElement.SCALAR_USER_DEFINED_FUNCTIONS);
+    v.ng(TestElement.USER_DEFINED_AGGREGATE_FUNCTIONS);
+    v.ng(TestElement.INTEGRATION_WITH_HIVE_UDFS_UDAFS_UDTFS);
+  }
+
+  @Test
+  void testSecurityLakeQueries() {
+    when(mockedProvider.getValidatorForDatasource(any()))
+        .thenReturn(new SecurityLakeGrammarElementValidator());
+    VerifyValidator v = new VerifyValidator(sqlQueryValidator, DataSourceType.SECURITY_LAKE);
+
+    // DDL Statements
+    v.ng(TestElement.ALTER_DATABASE);
+    v.ng(TestElement.ALTER_TABLE);
+    v.ng(TestElement.ALTER_VIEW);
+    v.ng(TestElement.CREATE_DATABASE);
+    v.ng(TestElement.CREATE_FUNCTION);
+    v.ng(TestElement.CREATE_TABLE);
+    v.ng(TestElement.CREATE_VIEW);
+    v.ng(TestElement.DROP_DATABASE);
+    v.ng(TestElement.DROP_FUNCTION);
+    v.ng(TestElement.DROP_TABLE);
+    v.ng(TestElement.DROP_VIEW);
+    v.ng(TestElement.REPAIR_TABLE);
+    v.ng(TestElement.TRUNCATE_TABLE);
+
+    // DML Statements
+    v.ng(TestElement.INSERT_TABLE);
+    v.ng(TestElement.INSERT_OVERWRITE_DIRECTORY);
+    v.ng(TestElement.LOAD);
+
+    // Data Retrieval
+    v.ok(TestElement.SELECT);
+    v.ok(TestElement.EXPLAIN);
+    v.ok(TestElement.COMMON_TABLE_EXPRESSION);
+    v.ng(TestElement.CLUSTER_BY_CLAUSE);
+    v.ng(TestElement.DISTRIBUTE_BY_CLAUSE);
+    v.ok(TestElement.GROUP_BY_CLAUSE);
+    v.ok(TestElement.HAVING_CLAUSE);
+    v.ng(TestElement.HINTS);
+    v.ng(TestElement.INLINE_TABLE);
+    v.ng(TestElement.FILE);
+    v.ok(TestElement.INNER_JOIN);
+    v.ok(TestElement.CROSS_JOIN);
+    v.ok(TestElement.LEFT_OUTER_JOIN);
+    v.ok(TestElement.LEFT_SEMI_JOIN);
+    v.ok(TestElement.RIGHT_OUTER_JOIN);
+    v.ok(TestElement.FULL_OUTER_JOIN);
+    v.ok(TestElement.LEFT_ANTI_JOIN);
+    v.ok(TestElement.LIKE_PREDICATE);
+    v.ok(TestElement.LIMIT_CLAUSE);
+    v.ok(TestElement.OFFSET_CLAUSE);
+    v.ok(TestElement.ORDER_BY_CLAUSE);
+    v.ok(TestElement.SET_OPERATORS);
+    v.ok(TestElement.SORT_BY_CLAUSE);
+    v.ng(TestElement.TABLESAMPLE);
+    v.ng(TestElement.TABLE_VALUED_FUNCTION);
+    v.ok(TestElement.WHERE_CLAUSE);
+    v.ok(TestElement.AGGREGATE_FUNCTION);
+    v.ok(TestElement.WINDOW_FUNCTION);
+    v.ok(TestElement.CASE_CLAUSE);
+    v.ok(TestElement.PIVOT_CLAUSE);
+    v.ok(TestElement.UNPIVOT_CLAUSE);
+    v.ok(TestElement.LATERAL_VIEW_CLAUSE);
+    v.ok(TestElement.LATERAL_SUBQUERY);
+    v.ng(TestElement.TRANSFORM_CLAUSE);
+
+    // Auxiliary Statements
+    v.ng(TestElement.ADD_FILE);
+    v.ng(TestElement.ADD_JAR);
+    v.ng(TestElement.ANALYZE_TABLE);
+    v.ng(TestElement.CACHE_TABLE);
+    v.ng(TestElement.CLEAR_CACHE);
+    v.ng(TestElement.DESCRIBE_DATABASE);
+    v.ng(TestElement.DESCRIBE_FUNCTION);
+    v.ng(TestElement.DESCRIBE_QUERY);
+    v.ng(TestElement.DESCRIBE_TABLE);
+    v.ng(TestElement.LIST_FILE);
+    v.ng(TestElement.LIST_JAR);
+    v.ng(TestElement.REFRESH);
+    v.ng(TestElement.REFRESH_TABLE);
+    v.ng(TestElement.REFRESH_FUNCTION);
+    v.ng(TestElement.RESET);
+    v.ng(TestElement.SET);
+    v.ng(TestElement.SHOW_COLUMNS);
+    v.ng(TestElement.SHOW_CREATE_TABLE);
+    v.ng(TestElement.SHOW_DATABASES);
+    v.ng(TestElement.SHOW_FUNCTIONS);
+    v.ng(TestElement.SHOW_PARTITIONS);
+    v.ng(TestElement.SHOW_TABLE_EXTENDED);
+    v.ng(TestElement.SHOW_TABLES);
+    v.ng(TestElement.SHOW_TBLPROPERTIES);
+    v.ng(TestElement.SHOW_VIEWS);
+    v.ng(TestElement.UNCACHE_TABLE);
+
+    // Functions
+    v.ok(TestElement.ARRAY_FUNCTIONS);
+    v.ok(TestElement.MAP_FUNCTIONS);
+    v.ok(TestElement.DATE_AND_TIMESTAMP_FUNCTIONS);
+    v.ok(TestElement.JSON_FUNCTIONS);
+    v.ok(TestElement.MATHEMATICAL_FUNCTIONS);
+    v.ok(TestElement.STRING_FUNCTIONS);
+    v.ok(TestElement.BITWISE_FUNCTIONS);
+    v.ok(TestElement.CONVERSION_FUNCTIONS);
+    v.ok(TestElement.CONDITIONAL_FUNCTIONS);
+    v.ok(TestElement.PREDICATE_FUNCTIONS);
+    v.ng(TestElement.CSV_FUNCTIONS);
+    v.ng(TestElement.MISC_FUNCTIONS);
+
+    // Aggregate-like Functions
+    v.ok(TestElement.AGGREGATE_FUNCTIONS);
+    v.ok(TestElement.WINDOW_FUNCTIONS);
+
+    // Generator Functions
+    v.ok(TestElement.GENERATOR_FUNCTIONS);
+
+    // UDFs
+    v.ng(TestElement.SCALAR_USER_DEFINED_FUNCTIONS);
+    v.ng(TestElement.USER_DEFINED_AGGREGATE_FUNCTIONS);
+    v.ng(TestElement.INTEGRATION_WITH_HIVE_UDFS_UDAFS_UDTFS);
+  }
+
+  @AllArgsConstructor
+  private static class VerifyValidator {
+    private final SQLQueryValidator validator;
+    private final DataSourceType dataSourceType;
+
+    public void ok(TestElement query) {
+      runValidate(query.getQueries());
+    }
+
+    public void ng(TestElement query) {
+      assertThrows(
+          IllegalArgumentException.class,
+          () -> runValidate(query.getQueries()),
+          "The query should throw: query=`" + query.toString() + "`");
+    }
+
+    void runValidate(String[] queries) {
+      Arrays.stream(queries).forEach(query -> validator.validate(query, dataSourceType));
+    }
+
+    void runValidate(String query) {
+      validator.validate(query, dataSourceType);
+    }
+
+    SingleStatementContext getParser(String query) {
+      SqlBaseParser sqlBaseParser =
+          new SqlBaseParser(
+              new CommonTokenStream(new SqlBaseLexer(new CaseInsensitiveCharStream(query))));
+      return sqlBaseParser.singleStatement();
+    }
+  }
+}
diff --git a/async-query-core/src/test/resources/invalid_response.json b/async-query-core/src/test/resources/invalid_response.json
new file mode 100644
index 0000000000..53222e0560
--- /dev/null
+++ b/async-query-core/src/test/resources/invalid_response.json
@@ -0,0 +1,12 @@
+{
+  "content": {
+    "result": [
+      "{'1':1}"
+    ],
+    "schema": [
+      "{'column_name':'1','data_type':'integer'}"
+    ],
+    "stepId": "s-123456789",
+    "applicationId": "application-abc"
+  }
+}
diff --git a/async-query-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/async-query-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000000..ca6ee9cea8
--- /dev/null
+++ b/async-query-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file
diff --git a/async-query-core/src/test/resources/select_query_response.json b/async-query-core/src/test/resources/select_query_response.json
new file mode 100644
index 0000000000..24cb06b49e
--- /dev/null
+++ b/async-query-core/src/test/resources/select_query_response.json
@@ -0,0 +1,12 @@
+{
+  "data": {
+    "result": [
+      "{'1':1}"
+    ],
+    "schema": [
+      "{'column_name':'1','data_type':'integer'}"
+    ],
+    "stepId": "s-123456789",
+    "applicationId": "application-abc"
+  }
+}
diff --git a/async-query/.gitignore b/async-query/.gitignore
new file mode 100644
index 0000000000..689cc5c548
--- /dev/null
+++ b/async-query/.gitignore
@@ -0,0 +1,42 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!src/main/**/build/
+!src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+out/
+!src/main/**/out/
+!src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!src/main/**/bin/
+!src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
\ No newline at end of file
diff --git a/async-query/build.gradle b/async-query/build.gradle
new file mode 100644
index 0000000000..53fdcbe292
--- /dev/null
+++ b/async-query/build.gradle
@@ -0,0 +1,122 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+plugins {
+    id 'java-library'
+    id "io.freefair.lombok"
+    id 'jacoco'
+    id 'antlr'
+}
+
+repositories {
+    mavenCentral()
+}
+
+
+dependencies {
+    implementation "org.opensearch:opensearch-job-scheduler-spi:${opensearch_build}"
+
+    api project(':core')
+    api project(':async-query-core')
+    implementation project(':protocol')
+    implementation project(':datasources')
+    implementation project(':legacy')
+
+    implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
+    implementation group: 'org.json', name: 'json', version: '20231013'
+    api group: 'com.amazonaws', name: 'aws-java-sdk-emr', version: "${aws_java_sdk_version}"
+    api group: 'com.amazonaws', name: 'aws-java-sdk-emrserverless', version: "${aws_java_sdk_version}"
+    implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
+
+    testImplementation(platform("org.junit:junit-bom:5.9.3"))
+
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.7.0'
+
+    testCompileOnly('junit:junit:4.13.1') {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine") {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher") {
+        because 'allows tests to run from IDEs that bundle older version of launcher'
+    }
+    testImplementation("org.opensearch.test:framework:${opensearch_version}")
+    testImplementation project(':opensearch')
+}
+
+test {
+    useJUnitPlatform {
+        includeEngines("junit-jupiter")
+    }
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+    }
+}
+task junit4(type: Test) {
+    useJUnitPlatform {
+        includeEngines("junit-vintage")
+    }
+    systemProperty 'tests.security.manager', 'false'
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+    }
+}
+
+jacocoTestReport {
+    dependsOn test, junit4
+    executionData test, junit4
+    reports {
+        html.required = true
+        xml.required = true
+    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it, exclude: ['**/antlr/parser/**'])
+        }))
+    }
+}
+
+jacocoTestCoverageVerification {
+    dependsOn test, junit4
+    executionData test, junit4
+    violationRules {
+        rule {
+            element = 'CLASS'
+            excludes = [
+                    'org.opensearch.sql.spark.cluster.ClusterManagerEventListener*',
+                    'org.opensearch.sql.spark.cluster.FlintIndexRetention',
+                    'org.opensearch.sql.spark.cluster.IndexCleanup',
+                    // ignore because XContext IOException
+                    'org.opensearch.sql.spark.execution.statestore.StateStore',
+                    'org.opensearch.sql.spark.rest.*',
+                    'org.opensearch.sql.spark.scheduler.parser.OpenSearchScheduleQueryJobRequestParser',
+                    'org.opensearch.sql.spark.transport.model.*'
+            ]
+            limit {
+                counter = 'LINE'
+                minimum = 1.0
+            }
+            limit {
+                counter = 'BRANCH'
+                minimum = 1.0
+            }
+        }
+    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it, exclude: ['**/antlr/parser/**'])
+        }))
+    }
+}
+check.dependsOn jacocoTestCoverageVerification
+jacocoTestCoverageVerification.dependsOn jacocoTestReport
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/asyncquery/OpenSearchAsyncQueryJobMetadataStorageService.java b/async-query/src/main/java/org/opensearch/sql/spark/asyncquery/OpenSearchAsyncQueryJobMetadataStorageService.java
new file mode 100644
index 0000000000..4847c8e00f
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/asyncquery/OpenSearchAsyncQueryJobMetadataStorageService.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.sql.spark.asyncquery.exceptions.AsyncQueryNotFoundException;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchStateStoreUtil;
+import org.opensearch.sql.spark.execution.statestore.StateStore;
+import org.opensearch.sql.spark.execution.xcontent.AsyncQueryJobMetadataXContentSerializer;
+import org.opensearch.sql.spark.utils.IDUtils;
+
+/** OpenSearch implementation of {@link AsyncQueryJobMetadataStorageService} */
+@RequiredArgsConstructor
+public class OpenSearchAsyncQueryJobMetadataStorageService
+    implements AsyncQueryJobMetadataStorageService {
+
+  private final StateStore stateStore;
+  private final AsyncQueryJobMetadataXContentSerializer asyncQueryJobMetadataXContentSerializer;
+
+  private static final Logger LOGGER =
+      LogManager.getLogger(OpenSearchAsyncQueryJobMetadataStorageService.class);
+
+  @Override
+  public void storeJobMetadata(
+      AsyncQueryJobMetadata asyncQueryJobMetadata,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    stateStore.create(
+        mapIdToDocumentId(asyncQueryJobMetadata.getId()),
+        asyncQueryJobMetadata,
+        AsyncQueryJobMetadata::copy,
+        OpenSearchStateStoreUtil.getIndexName(asyncQueryJobMetadata.getDatasourceName()));
+  }
+
+  private String mapIdToDocumentId(String id) {
+    return "qid" + id;
+  }
+
+  @Override
+  public Optional<AsyncQueryJobMetadata> getJobMetadata(String queryId) {
+    try {
+      return stateStore.get(
+          mapIdToDocumentId(queryId),
+          asyncQueryJobMetadataXContentSerializer::fromXContent,
+          OpenSearchStateStoreUtil.getIndexName(IDUtils.decode(queryId)));
+    } catch (Exception e) {
+      LOGGER.error("Error while fetching the job metadata.", e);
+      throw new AsyncQueryNotFoundException(String.format("Invalid QueryId: %s", queryId));
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/cluster/ClusterManagerEventListener.java b/async-query/src/main/java/org/opensearch/sql/spark/cluster/ClusterManagerEventListener.java
new file mode 100644
index 0000000000..6c660f073c
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/cluster/ClusterManagerEventListener.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.cluster;
+
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_REQUEST_BUFFER_INDEX_NAME;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.time.Clock;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.LocalNodeClusterManagerListener;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.lifecycle.LifecycleListener;
+import org.opensearch.common.settings.Setting;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
+import org.opensearch.threadpool.Scheduler.Cancellable;
+import org.opensearch.threadpool.ThreadPool;
+
+public class ClusterManagerEventListener implements LocalNodeClusterManagerListener {
+
+  private Cancellable flintIndexRetentionCron;
+  private Cancellable flintStreamingJobHouseKeeperCron;
+  private ClusterService clusterService;
+  private ThreadPool threadPool;
+  private Client client;
+  private Clock clock;
+  private DataSourceService dataSourceService;
+  private FlintIndexMetadataService flintIndexMetadataService;
+  private FlintIndexOpFactory flintIndexOpFactory;
+  private Duration sessionTtlDuration;
+  private Duration resultTtlDuration;
+  private TimeValue streamingJobHouseKeepingInterval;
+  private boolean isAutoIndexManagementEnabled;
+
+  public ClusterManagerEventListener(
+      ClusterService clusterService,
+      ThreadPool threadPool,
+      Client client,
+      Clock clock,
+      Setting<TimeValue> sessionTtl,
+      Setting<TimeValue> resultTtl,
+      Setting<TimeValue> streamingJobHouseKeepingInterval,
+      Setting<Boolean> isAutoIndexManagementEnabledSetting,
+      Settings settings,
+      DataSourceService dataSourceService,
+      FlintIndexMetadataService flintIndexMetadataService,
+      FlintIndexOpFactory flintIndexOpFactory) {
+    this.clusterService = clusterService;
+    this.threadPool = threadPool;
+    this.client = client;
+    this.clusterService.addLocalNodeClusterManagerListener(this);
+    this.clock = clock;
+    this.dataSourceService = dataSourceService;
+    this.flintIndexMetadataService = flintIndexMetadataService;
+    this.flintIndexOpFactory = flintIndexOpFactory;
+    this.sessionTtlDuration = toDuration(sessionTtl.get(settings));
+    this.resultTtlDuration = toDuration(resultTtl.get(settings));
+    this.streamingJobHouseKeepingInterval = streamingJobHouseKeepingInterval.get(settings);
+
+    clusterService
+        .getClusterSettings()
+        .addSettingsUpdateConsumer(
+            sessionTtl,
+            it -> {
+              this.sessionTtlDuration = toDuration(it);
+              cancel(flintIndexRetentionCron);
+              reInitializeFlintIndexRetention();
+            });
+
+    clusterService
+        .getClusterSettings()
+        .addSettingsUpdateConsumer(
+            resultTtl,
+            it -> {
+              this.resultTtlDuration = toDuration(it);
+              cancel(flintIndexRetentionCron);
+              reInitializeFlintIndexRetention();
+            });
+
+    isAutoIndexManagementEnabled = isAutoIndexManagementEnabledSetting.get(settings);
+    clusterService
+        .getClusterSettings()
+        .addSettingsUpdateConsumer(
+            isAutoIndexManagementEnabledSetting,
+            it -> {
+              if (isAutoIndexManagementEnabled != it) {
+                this.isAutoIndexManagementEnabled = it;
+                if (it) {
+                  onClusterManager();
+                } else {
+                  offClusterManager();
+                }
+              }
+            });
+
+    clusterService
+        .getClusterSettings()
+        .addSettingsUpdateConsumer(
+            streamingJobHouseKeepingInterval,
+            it -> {
+              this.streamingJobHouseKeepingInterval = it;
+              cancel(flintStreamingJobHouseKeeperCron);
+              initializeStreamingJobHouseKeeperCron();
+            });
+  }
+
+  @Override
+  public void onClusterManager() {
+
+    if (isAutoIndexManagementEnabled && flintIndexRetentionCron == null) {
+      reInitializeFlintIndexRetention();
+
+      clusterService.addLifecycleListener(
+          new LifecycleListener() {
+            @Override
+            public void beforeStop() {
+              cancel(flintIndexRetentionCron);
+              flintIndexRetentionCron = null;
+            }
+          });
+    }
+
+    if (flintStreamingJobHouseKeeperCron == null) {
+      initializeStreamingJobHouseKeeperCron();
+      clusterService.addLifecycleListener(
+          new LifecycleListener() {
+            @Override
+            public void beforeStop() {
+              cancel(flintStreamingJobHouseKeeperCron);
+              flintStreamingJobHouseKeeperCron = null;
+            }
+          });
+    }
+  }
+
+  private void initializeStreamingJobHouseKeeperCron() {
+    flintStreamingJobHouseKeeperCron =
+        threadPool.scheduleWithFixedDelay(
+            new FlintStreamingJobHouseKeeperTask(
+                dataSourceService, flintIndexMetadataService, flintIndexOpFactory),
+            streamingJobHouseKeepingInterval,
+            executorName());
+  }
+
+  private void reInitializeFlintIndexRetention() {
+    IndexCleanup indexCleanup = new IndexCleanup(client, clusterService);
+    flintIndexRetentionCron =
+        threadPool.scheduleWithFixedDelay(
+            new FlintIndexRetention(
+                sessionTtlDuration,
+                resultTtlDuration,
+                clock,
+                indexCleanup,
+                SPARK_REQUEST_BUFFER_INDEX_NAME + "*",
+                DataSourceMetadata.DEFAULT_RESULT_INDEX + "*"),
+            TimeValue.timeValueHours(24),
+            executorName());
+  }
+
+  @Override
+  public void offClusterManager() {
+    cancel(flintIndexRetentionCron);
+    flintIndexRetentionCron = null;
+    cancel(flintStreamingJobHouseKeeperCron);
+    flintStreamingJobHouseKeeperCron = null;
+  }
+
+  private void cancel(Cancellable cron) {
+    if (cron != null) {
+      cron.cancel();
+    }
+  }
+
+  @VisibleForTesting
+  public List<Cancellable> getFlintIndexRetentionCron() {
+    return Arrays.asList(flintIndexRetentionCron);
+  }
+
+  private String executorName() {
+    return ThreadPool.Names.GENERIC;
+  }
+
+  public static Duration toDuration(TimeValue timeValue) {
+    return Duration.ofMillis(timeValue.millis());
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/cluster/FlintIndexRetention.java b/async-query/src/main/java/org/opensearch/sql/spark/cluster/FlintIndexRetention.java
new file mode 100644
index 0000000000..628b578ae9
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/cluster/FlintIndexRetention.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.cluster;
+
+import static org.opensearch.sql.spark.execution.xcontent.StatementModelXContentSerializer.SUBMIT_TIME;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.LAST_UPDATE_TIME;
+
+import java.time.Clock;
+import java.time.Duration;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.common.CheckedConsumer;
+import org.opensearch.common.time.FormatNames;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.index.IndexNotFoundException;
+import org.opensearch.index.query.QueryBuilders;
+
+public class FlintIndexRetention implements Runnable {
+  private static final Logger LOG = LogManager.getLogger(FlintIndexRetention.class);
+
+  static final String SESSION_INDEX_NOT_EXIST_MSG = "Checkpoint index does not exist.";
+
+  static final String RESULT_INDEX_NOT_EXIST_MSG = "Result index does not exist.";
+
+  // timestamp field in result index
+  static final String UPDATE_TIME_FIELD = "updateTime";
+
+  private final Duration defaultSessionTtl;
+  private final Duration defaultResultTtl;
+  private final Clock clock;
+  private final IndexCleanup indexCleanup;
+  private final String sessionIndexNameRegex;
+  private final String resultIndexNameRegex;
+
+  public FlintIndexRetention(
+      Duration defaultSessionTtl,
+      Duration defaultResultTtl,
+      Clock clock,
+      IndexCleanup indexCleanup,
+      String sessionIndexNameRegex,
+      String resultIndexNameRegex) {
+    this.defaultSessionTtl = defaultSessionTtl;
+    this.defaultResultTtl = defaultResultTtl;
+    this.clock = clock;
+    this.indexCleanup = indexCleanup;
+    this.sessionIndexNameRegex = sessionIndexNameRegex;
+    this.resultIndexNameRegex = resultIndexNameRegex;
+  }
+
+  @Override
+  public void run() {
+    purgeSessionIndex();
+  }
+
+  private void purgeSessionIndex() {
+    purgeIndex(
+        sessionIndexNameRegex,
+        defaultSessionTtl,
+        LAST_UPDATE_TIME,
+        this::handleSessionPurgeResponse,
+        this::handleSessionPurgeError);
+  }
+
+  private void handleSessionPurgeResponse(Long response) {
+    purgeStatementIndex();
+  }
+
+  private void handleSessionPurgeError(Exception exception) {
+    handlePurgeError(SESSION_INDEX_NOT_EXIST_MSG, "session index", exception);
+    purgeStatementIndex();
+  }
+
+  private void purgeStatementIndex() {
+    purgeIndex(
+        sessionIndexNameRegex,
+        defaultSessionTtl,
+        SUBMIT_TIME,
+        this::handleStatementPurgeResponse,
+        this::handleStatementPurgeError);
+  }
+
+  private void handleStatementPurgeResponse(Long response) {
+    purgeResultIndex();
+  }
+
+  private void handleStatementPurgeError(Exception exception) {
+    handlePurgeError(SESSION_INDEX_NOT_EXIST_MSG, "session index", exception);
+    purgeResultIndex();
+  }
+
+  private void purgeResultIndex() {
+    purgeIndex(
+        resultIndexNameRegex,
+        defaultResultTtl,
+        UPDATE_TIME_FIELD,
+        this::handleResultPurgeResponse,
+        this::handleResultPurgeError);
+  }
+
+  private void handleResultPurgeResponse(Long response) {
+    LOG.debug("purge result index done");
+  }
+
+  private void handleResultPurgeError(Exception exception) {
+    handlePurgeError(RESULT_INDEX_NOT_EXIST_MSG, "result index", exception);
+  }
+
+  private void handlePurgeError(String notExistMsg, String indexType, Exception exception) {
+    if (exception instanceof IndexNotFoundException) {
+      LOG.debug(notExistMsg);
+    } else {
+      LOG.error("delete docs by query fails for " + indexType, exception);
+    }
+  }
+
+  private void purgeIndex(
+      String indexName,
+      Duration ttl,
+      String timeStampField,
+      CheckedConsumer<Long, Exception> successHandler,
+      CheckedConsumer<Exception, Exception> errorHandler) {
+    indexCleanup.deleteDocsByQuery(
+        indexName,
+        QueryBuilders.boolQuery()
+            .filter(
+                QueryBuilders.rangeQuery(timeStampField)
+                    .lte(clock.millis() - ttl.toMillis())
+                    .format(FormatNames.EPOCH_MILLIS.getSnakeCaseName())),
+        ActionListener.wrap(
+            response -> {
+              try {
+                successHandler.accept(response);
+              } catch (Exception e) {
+                LOG.error("Error handling response for index " + indexName, e);
+              }
+            },
+            ex -> {
+              try {
+                errorHandler.accept(ex);
+              } catch (Exception e) {
+                LOG.error("Error handling error for index " + indexName, e);
+              }
+            }));
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/cluster/FlintStreamingJobHouseKeeperTask.java b/async-query/src/main/java/org/opensearch/sql/spark/cluster/FlintStreamingJobHouseKeeperTask.java
new file mode 100644
index 0000000000..2dd0a4a7cf
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/cluster/FlintStreamingJobHouseKeeperTask.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.cluster;
+
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceStatus;
+import org.opensearch.sql.datasources.exceptions.DataSourceNotFoundException;
+import org.opensearch.sql.legacy.metrics.MetricName;
+import org.opensearch.sql.legacy.metrics.Metrics;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+import org.opensearch.sql.spark.flint.FlintIndexMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
+
+/** Cleaner task which alters the active streaming jobs of a disabled datasource. */
+@RequiredArgsConstructor
+public class FlintStreamingJobHouseKeeperTask implements Runnable {
+
+  private final DataSourceService dataSourceService;
+  private final FlintIndexMetadataService flintIndexMetadataService;
+  private final FlintIndexOpFactory flintIndexOpFactory;
+  private final NullAsyncQueryRequestContext nullAsyncQueryRequestContext =
+      new NullAsyncQueryRequestContext();
+
+  private static final Logger LOGGER = LogManager.getLogger(FlintStreamingJobHouseKeeperTask.class);
+  protected static final AtomicBoolean isRunning = new AtomicBoolean(false);
+
+  @Override
+  public void run() {
+    if (!isRunning.compareAndSet(false, true)) {
+      LOGGER.info("Previous task is still running. Skipping this execution.");
+      return;
+    }
+    try {
+      LOGGER.info("Starting housekeeping task for auto refresh streaming jobs.");
+      Map<String, FlintIndexMetadata> autoRefreshFlintIndicesMap = getAllAutoRefreshIndices();
+      autoRefreshFlintIndicesMap.forEach(
+          (autoRefreshIndex, flintIndexMetadata) -> {
+            try {
+              String datasourceName = getDataSourceName(flintIndexMetadata);
+              try {
+                DataSourceMetadata dataSourceMetadata =
+                    this.dataSourceService.getDataSourceMetadata(datasourceName);
+                if (dataSourceMetadata.getStatus() == DataSourceStatus.DISABLED) {
+                  LOGGER.info("Datasource is disabled for autoRefreshIndex: {}", autoRefreshIndex);
+                  alterAutoRefreshIndex(autoRefreshIndex, flintIndexMetadata, datasourceName);
+                } else {
+                  LOGGER.debug("Datasource is enabled for autoRefreshIndex : {}", autoRefreshIndex);
+                }
+              } catch (DataSourceNotFoundException exception) {
+                LOGGER.info("Datasource is deleted for autoRefreshIndex: {}", autoRefreshIndex);
+                try {
+                  dropAutoRefreshIndex(autoRefreshIndex, flintIndexMetadata, datasourceName);
+                } catch (IllegalStateException illegalStateException) {
+                  LOGGER.debug(
+                      "AutoRefresh index: {} is not in valid state for deletion.",
+                      autoRefreshIndex);
+                }
+              }
+            } catch (Exception exception) {
+              LOGGER.error(
+                  "Failed to alter/cancel index {}: {}",
+                  autoRefreshIndex,
+                  exception.getMessage(),
+                  exception);
+              Metrics.getInstance()
+                  .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+                  .increment();
+            }
+          });
+      LOGGER.info("Finished housekeeping task for auto refresh streaming jobs.");
+    } catch (Throwable error) {
+      LOGGER.error("Error while running the streaming job cleaner task: {}", error.getMessage());
+      Metrics.getInstance()
+          .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+          .increment();
+    } finally {
+      isRunning.set(false);
+    }
+  }
+
+  private void dropAutoRefreshIndex(
+      String autoRefreshIndex, FlintIndexMetadata flintIndexMetadata, String datasourceName) {
+    // When the datasource is deleted. Possibly Replace with VACUUM Operation.
+    LOGGER.info("Attempting to drop auto refresh index: {}", autoRefreshIndex);
+    flintIndexOpFactory
+        .getDrop(datasourceName)
+        .apply(flintIndexMetadata, nullAsyncQueryRequestContext);
+    LOGGER.info("Successfully dropped index: {}", autoRefreshIndex);
+  }
+
+  private void alterAutoRefreshIndex(
+      String autoRefreshIndex, FlintIndexMetadata flintIndexMetadata, String datasourceName) {
+    LOGGER.info("Attempting to alter index: {}", autoRefreshIndex);
+    FlintIndexOptions flintIndexOptions = new FlintIndexOptions();
+    flintIndexOptions.setOption(FlintIndexOptions.AUTO_REFRESH, "false");
+    flintIndexOpFactory
+        .getAlter(flintIndexOptions, datasourceName)
+        .apply(flintIndexMetadata, nullAsyncQueryRequestContext);
+    LOGGER.info("Successfully altered index: {}", autoRefreshIndex);
+  }
+
+  private String getDataSourceName(FlintIndexMetadata flintIndexMetadata) {
+    String kind = flintIndexMetadata.getKind();
+    switch (kind) {
+      case "mv":
+        return flintIndexMetadata.getName().split("\\.")[0];
+      case "skipping":
+      case "covering":
+        return flintIndexMetadata.getSource().split("\\.")[0];
+      default:
+        throw new IllegalArgumentException(String.format("Unknown flint index kind: %s", kind));
+    }
+  }
+
+  private Map<String, FlintIndexMetadata> getAllAutoRefreshIndices() {
+    Map<String, FlintIndexMetadata> flintIndexMetadataHashMap =
+        flintIndexMetadataService.getFlintIndexMetadata("flint_*", nullAsyncQueryRequestContext);
+    return flintIndexMetadataHashMap.entrySet().stream()
+        .filter(entry -> entry.getValue().getFlintIndexOptions().autoRefresh())
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/cluster/IndexCleanup.java b/async-query/src/main/java/org/opensearch/sql/spark/cluster/IndexCleanup.java
new file mode 100644
index 0000000000..562f12b69e
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/cluster/IndexCleanup.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.cluster;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.action.support.IndicesOptions;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.reindex.DeleteByQueryAction;
+import org.opensearch.index.reindex.DeleteByQueryRequest;
+
+/** Clean up the old docs for indices. */
+public class IndexCleanup {
+  private static final Logger LOG = LogManager.getLogger(IndexCleanup.class);
+
+  private final Client client;
+  private final ClusterService clusterService;
+
+  public IndexCleanup(Client client, ClusterService clusterService) {
+    this.client = client;
+    this.clusterService = clusterService;
+  }
+
+  /**
+   * Delete docs based on query request
+   *
+   * @param indexName index name
+   * @param queryForDeleteByQueryRequest query request
+   * @param listener action listener
+   */
+  public void deleteDocsByQuery(
+      String indexName, QueryBuilder queryForDeleteByQueryRequest, ActionListener<Long> listener) {
+    DeleteByQueryRequest deleteRequest =
+        new DeleteByQueryRequest(indexName)
+            .setQuery(queryForDeleteByQueryRequest)
+            .setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN)
+            .setRefresh(true);
+
+    try (ThreadContext.StoredContext context =
+        client.threadPool().getThreadContext().stashContext()) {
+      client.execute(
+          DeleteByQueryAction.INSTANCE,
+          deleteRequest,
+          ActionListener.wrap(
+              response -> {
+                long deleted = response.getDeleted();
+                if (deleted > 0) {
+                  // if 0 docs get deleted, it means our query cannot find any matching doc
+                  // or the index does not exist at all
+                  LOG.info("{} docs are deleted for index:{}", deleted, indexName);
+                }
+                listener.onResponse(response.getDeleted());
+              },
+              listener::onFailure));
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/config/OpenSearchAsyncQuerySchedulerConfigComposer.java b/async-query/src/main/java/org/opensearch/sql/spark/config/OpenSearchAsyncQuerySchedulerConfigComposer.java
new file mode 100644
index 0000000000..f791b050a1
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/config/OpenSearchAsyncQuerySchedulerConfigComposer.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.config;
+
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_JOB_EXTERNAL_SCHEDULER_ENABLED;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_JOB_EXTERNAL_SCHEDULER_INTERVAL;
+
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.parameter.GeneralSparkParameterComposer;
+import org.opensearch.sql.spark.parameter.SparkSubmitParameters;
+
+@RequiredArgsConstructor
+public class OpenSearchAsyncQuerySchedulerConfigComposer implements GeneralSparkParameterComposer {
+  private final Settings settings;
+
+  @Override
+  public void compose(
+      SparkSubmitParameters sparkSubmitParameters,
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext context) {
+    Boolean externalSchedulerEnabled =
+        settings.getSettingValue(Settings.Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED);
+    String externalSchedulerInterval =
+        settings.getSettingValue(Settings.Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL);
+    sparkSubmitParameters.setConfigItem(
+        FLINT_JOB_EXTERNAL_SCHEDULER_ENABLED, String.valueOf(externalSchedulerEnabled));
+    sparkSubmitParameters.setConfigItem(
+        FLINT_JOB_EXTERNAL_SCHEDULER_INTERVAL, externalSchedulerInterval);
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/config/OpenSearchExtraParameterComposer.java b/async-query/src/main/java/org/opensearch/sql/spark/config/OpenSearchExtraParameterComposer.java
new file mode 100644
index 0000000000..1925ada46e
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/config/OpenSearchExtraParameterComposer.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.config;
+
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.parameter.GeneralSparkParameterComposer;
+import org.opensearch.sql.spark.parameter.SparkSubmitParameters;
+
+/** Load extra parameters from settings and add to Spark submit parameters */
+@RequiredArgsConstructor
+public class OpenSearchExtraParameterComposer implements GeneralSparkParameterComposer {
+  private final SparkExecutionEngineConfigClusterSettingLoader settingLoader;
+
+  @Override
+  public void compose(
+      SparkSubmitParameters sparkSubmitParameters,
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext context) {
+    settingLoader
+        .load()
+        .ifPresent(
+            settings ->
+                sparkSubmitParameters.setExtraParameters(settings.getSparkSubmitParameters()));
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/config/OpenSearchSparkSubmitParameterModifier.java b/async-query/src/main/java/org/opensearch/sql/spark/config/OpenSearchSparkSubmitParameterModifier.java
new file mode 100644
index 0000000000..117d161440
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/config/OpenSearchSparkSubmitParameterModifier.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.config;
+
+import lombok.AllArgsConstructor;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilder;
+
+@AllArgsConstructor
+public class OpenSearchSparkSubmitParameterModifier implements SparkSubmitParameterModifier {
+
+  private String extraParameters;
+
+  @Override
+  public void modifyParameters(SparkSubmitParametersBuilder builder) {
+    builder.extraParameters(this.extraParameters);
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSetting.java b/async-query/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSetting.java
new file mode 100644
index 0000000000..f940680c06
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSetting.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.config;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.google.gson.Gson;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * This POJO is just for reading stringified json in `plugins.query.executionengine.spark.config`
+ * setting.
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class SparkExecutionEngineConfigClusterSetting {
+  // optional
+  private String accountId;
+  private String applicationId;
+  private String region;
+  private String executionRoleARN;
+
+  /** Additional Spark submit parameters to append to request. */
+  private String sparkSubmitParameters;
+
+  public static SparkExecutionEngineConfigClusterSetting toSparkExecutionEngineConfig(
+      String jsonString) {
+    return new Gson().fromJson(jsonString, SparkExecutionEngineConfigClusterSetting.class);
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSettingLoader.java b/async-query/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSettingLoader.java
new file mode 100644
index 0000000000..73b057ca5c
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSettingLoader.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.config;
+
+import static org.opensearch.sql.common.setting.Settings.Key.SPARK_EXECUTION_ENGINE_CONFIG;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.opensearch.sql.common.setting.Settings;
+
+/** Load SparkExecutionEngineConfigClusterSetting from settings with privilege check. */
+@RequiredArgsConstructor
+public class SparkExecutionEngineConfigClusterSettingLoader {
+  private final Settings settings;
+
+  public Optional<SparkExecutionEngineConfigClusterSetting> load() {
+    String sparkExecutionEngineConfigSettingString =
+        this.settings.getSettingValue(SPARK_EXECUTION_ENGINE_CONFIG);
+    if (!StringUtils.isBlank(sparkExecutionEngineConfigSettingString)) {
+      return Optional.of(
+          AccessController.doPrivileged(
+              (PrivilegedAction<SparkExecutionEngineConfigClusterSetting>)
+                  () ->
+                      SparkExecutionEngineConfigClusterSetting.toSparkExecutionEngineConfig(
+                          sparkExecutionEngineConfigSettingString)));
+    } else {
+      return Optional.empty();
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigSupplierImpl.java b/async-query/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigSupplierImpl.java
new file mode 100644
index 0000000000..66ad964ad1
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigSupplierImpl.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.config;
+
+import static org.opensearch.sql.common.setting.Settings.Key.CLUSTER_NAME;
+
+import lombok.AllArgsConstructor;
+import org.opensearch.cluster.ClusterName;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+
+@AllArgsConstructor
+public class SparkExecutionEngineConfigSupplierImpl implements SparkExecutionEngineConfigSupplier {
+
+  private final Settings settings;
+  private final SparkExecutionEngineConfigClusterSettingLoader settingLoader;
+
+  @Override
+  public SparkExecutionEngineConfig getSparkExecutionEngineConfig(
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    ClusterName clusterName = settings.getSettingValue(CLUSTER_NAME);
+    return getBuilderFromSettingsIfAvailable().clusterName(clusterName.value()).build();
+  }
+
+  private SparkExecutionEngineConfig.SparkExecutionEngineConfigBuilder
+      getBuilderFromSettingsIfAvailable() {
+    return settingLoader
+        .load()
+        .map(
+            setting ->
+                SparkExecutionEngineConfig.builder()
+                    .applicationId(setting.getApplicationId())
+                    .executionRoleARN(setting.getExecutionRoleARN())
+                    .region(setting.getRegion()))
+        .orElse(SparkExecutionEngineConfig.builder());
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/session/OpenSearchSessionConfigSupplier.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/session/OpenSearchSessionConfigSupplier.java
new file mode 100644
index 0000000000..7bad399df8
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/session/OpenSearchSessionConfigSupplier.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.common.setting.Settings;
+
+@RequiredArgsConstructor
+public class OpenSearchSessionConfigSupplier implements SessionConfigSupplier {
+  private final Settings settings;
+
+  @Override
+  public Long getSessionInactivityTimeoutMillis() {
+    return settings.getSettingValue(Settings.Key.SESSION_INACTIVITY_TIMEOUT_MILLIS);
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/FromXContent.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/FromXContent.java
new file mode 100644
index 0000000000..0f691fc9c0
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/FromXContent.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statestore;
+
+import org.opensearch.core.xcontent.XContentParser;
+
+public interface FromXContent<T extends StateModel> {
+  T fromXContent(XContentParser parser, long seqNo, long primaryTerm);
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/OpenSearchSessionStorageService.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/OpenSearchSessionStorageService.java
new file mode 100644
index 0000000000..db5ded46b5
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/OpenSearchSessionStorageService.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statestore;
+
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.index.engine.VersionConflictEngineException;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.execution.session.SessionModel;
+import org.opensearch.sql.spark.execution.session.SessionState;
+import org.opensearch.sql.spark.execution.xcontent.SessionModelXContentSerializer;
+
+@RequiredArgsConstructor
+public class OpenSearchSessionStorageService implements SessionStorageService {
+  private static final Logger LOG = LogManager.getLogger();
+
+  private final StateStore stateStore;
+  private final SessionModelXContentSerializer serializer;
+
+  @Override
+  public SessionModel createSession(
+      SessionModel sessionModel, AsyncQueryRequestContext asyncQueryRequestContext) {
+    try {
+      return stateStore.create(
+          sessionModel.getId(),
+          sessionModel,
+          SessionModel::of,
+          OpenSearchStateStoreUtil.getIndexName(sessionModel.getDatasourceName()));
+    } catch (VersionConflictEngineException e) {
+      String errorMsg = "session already exist. " + sessionModel.getSessionId();
+      LOG.error(errorMsg);
+      throw new IllegalStateException(errorMsg);
+    }
+  }
+
+  @Override
+  public Optional<SessionModel> getSession(String id, String datasourceName) {
+    return stateStore.get(
+        id, serializer::fromXContent, OpenSearchStateStoreUtil.getIndexName(datasourceName));
+  }
+
+  @Override
+  public SessionModel updateSessionState(SessionModel sessionModel, SessionState sessionState) {
+    return stateStore.updateState(
+        sessionModel,
+        sessionState,
+        SessionModel::copyWithState,
+        OpenSearchStateStoreUtil.getIndexName(sessionModel.getDatasourceName()));
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/OpenSearchStatementStorageService.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/OpenSearchStatementStorageService.java
new file mode 100644
index 0000000000..527cd24bc8
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/OpenSearchStatementStorageService.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statestore;
+
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.index.engine.DocumentMissingException;
+import org.opensearch.index.engine.VersionConflictEngineException;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.execution.statement.StatementModel;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+import org.opensearch.sql.spark.execution.xcontent.StatementModelXContentSerializer;
+
+@RequiredArgsConstructor
+public class OpenSearchStatementStorageService implements StatementStorageService {
+  private static final Logger LOG = LogManager.getLogger();
+
+  private final StateStore stateStore;
+  private final StatementModelXContentSerializer serializer;
+
+  @Override
+  public StatementModel createStatement(
+      StatementModel statementModel, AsyncQueryRequestContext asyncQueryRequestContext) {
+    try {
+      return stateStore.create(
+          statementModel.getId(),
+          statementModel,
+          StatementModel::copy,
+          OpenSearchStateStoreUtil.getIndexName(statementModel.getDatasourceName()));
+    } catch (VersionConflictEngineException e) {
+      String errorMsg = "statement already exist. " + statementModel.getStatementId();
+      LOG.error(errorMsg);
+      throw new IllegalStateException(errorMsg);
+    }
+  }
+
+  @Override
+  public Optional<StatementModel> getStatement(
+      String id, String datasourceName, AsyncQueryRequestContext asyncQueryRequestContext) {
+    return stateStore.get(
+        id, serializer::fromXContent, OpenSearchStateStoreUtil.getIndexName(datasourceName));
+  }
+
+  @Override
+  public StatementModel updateStatementState(
+      StatementModel oldStatementModel,
+      StatementState statementState,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    try {
+      return stateStore.updateState(
+          oldStatementModel,
+          statementState,
+          StatementModel::copyWithState,
+          OpenSearchStateStoreUtil.getIndexName(oldStatementModel.getDatasourceName()));
+    } catch (DocumentMissingException e) {
+      String errorMsg =
+          String.format(
+              "cancel statement failed. no statement found. statement: %s.",
+              oldStatementModel.getStatementId());
+      LOG.error(errorMsg);
+      throw new IllegalStateException(errorMsg);
+    } catch (VersionConflictEngineException e) {
+      StatementModel statementModel =
+          getStatement(
+                  oldStatementModel.getId(),
+                  oldStatementModel.getDatasourceName(),
+                  asyncQueryRequestContext)
+              .orElse(oldStatementModel);
+      String errorMsg =
+          String.format(
+              "cancel statement failed. current statementState: %s " + "statement: %s.",
+              statementModel.getStatementState(), statementModel.getStatementId());
+      LOG.error(errorMsg);
+      throw new IllegalStateException(errorMsg);
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/StateStore.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/StateStore.java
new file mode 100644
index 0000000000..8d57198277
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/StateStore.java
@@ -0,0 +1,336 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statestore;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.function.Supplier;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.action.DocWriteResponse;
+import org.opensearch.action.admin.indices.create.CreateIndexRequest;
+import org.opensearch.action.admin.indices.create.CreateIndexResponse;
+import org.opensearch.action.delete.DeleteRequest;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.get.GetRequest;
+import org.opensearch.action.get.GetResponse;
+import org.opensearch.action.index.IndexRequest;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.support.WriteRequest;
+import org.opensearch.action.update.UpdateRequest;
+import org.opensearch.action.update.UpdateResponse;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.dispatcher.model.IndexDMLResult;
+import org.opensearch.sql.spark.execution.session.SessionModel;
+import org.opensearch.sql.spark.execution.session.SessionState;
+import org.opensearch.sql.spark.execution.session.SessionType;
+import org.opensearch.sql.spark.execution.statement.StatementModel;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+import org.opensearch.sql.spark.execution.xcontent.AsyncQueryJobMetadataXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.FlintIndexStateModelXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.IndexDMLResultXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.SessionModelXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.StatementModelXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes;
+import org.opensearch.sql.spark.execution.xcontent.XContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.XContentSerializerUtil;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexStateModel;
+
+/**
+ * State Store maintain the state of Session and Statement. State State create/update/get doc on
+ * index regardless user FGAC permissions.
+ */
+@RequiredArgsConstructor
+public class StateStore {
+  public static String SETTINGS_FILE_NAME = "query_execution_request_settings.yml";
+  public static String MAPPING_FILE_NAME = "query_execution_request_mapping.yml";
+  public static String ALL_DATASOURCE = "*";
+
+  private static final Logger LOG = LogManager.getLogger();
+
+  private final Client client;
+  private final ClusterService clusterService;
+
+  @VisibleForTesting
+  public <T extends StateModel> T create(
+      String docId, T st, CopyBuilder<T> builder, String indexName) {
+    try {
+      if (!this.clusterService.state().routingTable().hasIndex(indexName)) {
+        createIndex(indexName);
+      }
+      XContentSerializer<T> serializer = getXContentSerializer(st);
+      IndexRequest indexRequest =
+          new IndexRequest(indexName)
+              .id(docId)
+              .source(serializer.toXContent(st, ToXContent.EMPTY_PARAMS))
+              .setIfSeqNo(getSeqNo(st))
+              .setIfPrimaryTerm(getPrimaryTerm(st))
+              .create(true)
+              .setRefreshPolicy(WriteRequest.RefreshPolicy.WAIT_UNTIL);
+      try (ThreadContext.StoredContext ignored =
+          client.threadPool().getThreadContext().stashContext()) {
+        IndexResponse indexResponse = client.index(indexRequest).actionGet();
+        if (indexResponse.getResult().equals(DocWriteResponse.Result.CREATED)) {
+          LOG.debug("Successfully created doc. id: {}", st.getId());
+          return builder.of(
+              st,
+              XContentSerializerUtil.buildMetadata(
+                  indexResponse.getSeqNo(), indexResponse.getPrimaryTerm()));
+        } else {
+          throw new RuntimeException(
+              String.format(
+                  Locale.ROOT,
+                  "Failed create doc. id: %s, error: %s",
+                  st.getId(),
+                  indexResponse.getResult().getLowercase()));
+        }
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @VisibleForTesting
+  public <T extends StateModel> Optional<T> get(
+      String sid, FromXContent<T> builder, String indexName) {
+    try {
+      if (!this.clusterService.state().routingTable().hasIndex(indexName)) {
+        createIndex(indexName);
+        return Optional.empty();
+      }
+      GetRequest getRequest = new GetRequest().index(indexName).id(sid).refresh(true);
+      try (ThreadContext.StoredContext ignored =
+          client.threadPool().getThreadContext().stashContext()) {
+        GetResponse getResponse = client.get(getRequest).actionGet();
+        if (getResponse.isExists()) {
+          XContentParser parser =
+              XContentType.JSON
+                  .xContent()
+                  .createParser(
+                      NamedXContentRegistry.EMPTY,
+                      LoggingDeprecationHandler.INSTANCE,
+                      getResponse.getSourceAsString());
+          parser.nextToken();
+          return Optional.of(
+              builder.fromXContent(parser, getResponse.getSeqNo(), getResponse.getPrimaryTerm()));
+        } else {
+          return Optional.empty();
+        }
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @VisibleForTesting
+  public <T extends StateModel, S> T updateState(
+      T st, S state, StateCopyBuilder<T, S> builder, String indexName) {
+    try {
+      T model = builder.of(st, state, st.getMetadata());
+      XContentSerializer<T> serializer = getXContentSerializer(st);
+      UpdateRequest updateRequest =
+          new UpdateRequest()
+              .index(indexName)
+              .id(model.getId())
+              .setIfSeqNo(getSeqNo(model))
+              .setIfPrimaryTerm(getPrimaryTerm(model))
+              .doc(serializer.toXContent(model, ToXContent.EMPTY_PARAMS))
+              .fetchSource(true)
+              .setRefreshPolicy(WriteRequest.RefreshPolicy.WAIT_UNTIL);
+      try (ThreadContext.StoredContext ignored =
+          client.threadPool().getThreadContext().stashContext()) {
+        UpdateResponse updateResponse = client.update(updateRequest).actionGet();
+        LOG.debug("Successfully update doc. id: {}", st.getId());
+        return builder.of(
+            model,
+            state,
+            XContentSerializerUtil.buildMetadata(
+                updateResponse.getSeqNo(), updateResponse.getPrimaryTerm()));
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private long getSeqNo(StateModel model) {
+    return model.getMetadataItem("seqNo", Long.class).orElse(SequenceNumbers.UNASSIGNED_SEQ_NO);
+  }
+
+  private long getPrimaryTerm(StateModel model) {
+    return model
+        .getMetadataItem("primaryTerm", Long.class)
+        .orElse(SequenceNumbers.UNASSIGNED_PRIMARY_TERM);
+  }
+
+  /**
+   * Delete the index state document with the given ID.
+   *
+   * @param sid index state doc ID
+   * @param indexName index store index name
+   * @return true if deleted, otherwise false
+   */
+  @VisibleForTesting
+  public boolean delete(String sid, String indexName) {
+    try {
+      // No action if the index doesn't exist
+      if (!this.clusterService.state().routingTable().hasIndex(indexName)) {
+        return true;
+      }
+
+      try (ThreadContext.StoredContext ignored =
+          client.threadPool().getThreadContext().stashContext()) {
+        DeleteRequest deleteRequest = new DeleteRequest(indexName, sid);
+        DeleteResponse deleteResponse = client.delete(deleteRequest).actionGet();
+        return deleteResponse.getResult() == DocWriteResponse.Result.DELETED;
+      }
+    } catch (Exception e) {
+      throw new RuntimeException(
+          String.format("Failed to delete index state doc %s in index %s", sid, indexName), e);
+    }
+  }
+
+  private void createIndex(String indexName) {
+    try {
+      CreateIndexRequest createIndexRequest = new CreateIndexRequest(indexName);
+      createIndexRequest
+          .mapping(loadConfigFromResource(MAPPING_FILE_NAME), XContentType.YAML)
+          .settings(loadConfigFromResource(SETTINGS_FILE_NAME), XContentType.YAML);
+      ActionFuture<CreateIndexResponse> createIndexResponseActionFuture;
+      try (ThreadContext.StoredContext ignored =
+          client.threadPool().getThreadContext().stashContext()) {
+        createIndexResponseActionFuture = client.admin().indices().create(createIndexRequest);
+      }
+      CreateIndexResponse createIndexResponse = createIndexResponseActionFuture.actionGet();
+      if (createIndexResponse.isAcknowledged()) {
+        LOG.info("Index: {} creation Acknowledged", indexName);
+      } else {
+        throw new RuntimeException("Index creation is not acknowledged.");
+      }
+    } catch (Throwable e) {
+      throw new RuntimeException(
+          "Internal server error while creating" + indexName + " index:: " + e.getMessage());
+    }
+  }
+
+  private long count(String indexName, QueryBuilder query) {
+    SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+    searchSourceBuilder.query(query);
+    searchSourceBuilder.size(0);
+
+    // https://github.com/opensearch-project/sql/issues/1801.
+    SearchRequest searchRequest =
+        new SearchRequest()
+            .indices(indexName)
+            .preference("_primary_first")
+            .source(searchSourceBuilder);
+
+    ActionFuture<SearchResponse> searchResponseActionFuture;
+    try (ThreadContext.StoredContext ignored =
+        client.threadPool().getThreadContext().stashContext()) {
+      searchResponseActionFuture = client.search(searchRequest);
+    }
+    SearchResponse searchResponse = searchResponseActionFuture.actionGet();
+    if (searchResponse.status().getStatus() != 200) {
+      throw new RuntimeException(
+          "Fetching job metadata information failed with status : " + searchResponse.status());
+    } else {
+      return searchResponse.getHits().getTotalHits().value;
+    }
+  }
+
+  private String loadConfigFromResource(String fileName) throws IOException {
+    InputStream fileStream = StateStore.class.getClassLoader().getResourceAsStream(fileName);
+    return IOUtils.toString(fileStream, StandardCharsets.UTF_8);
+  }
+
+  public static Supplier<Long> activeSessionsCount(StateStore stateStore, String datasourceName) {
+    return () ->
+        stateStore.count(
+            OpenSearchStateStoreUtil.getIndexName(datasourceName),
+            QueryBuilders.boolQuery()
+                .must(
+                    QueryBuilders.termQuery(
+                        XContentCommonAttributes.TYPE,
+                        SessionModelXContentSerializer.SESSION_DOC_TYPE))
+                .must(
+                    QueryBuilders.termQuery(
+                        SessionModelXContentSerializer.SESSION_TYPE,
+                        SessionType.INTERACTIVE.getSessionType()))
+                .must(
+                    QueryBuilders.termQuery(
+                        XContentCommonAttributes.STATE, SessionState.RUNNING.getSessionState())));
+  }
+
+  public static Supplier<Long> activeRefreshJobCount(StateStore stateStore, String datasourceName) {
+    return () ->
+        stateStore.count(
+            OpenSearchStateStoreUtil.getIndexName(datasourceName),
+            QueryBuilders.boolQuery()
+                .must(
+                    QueryBuilders.termQuery(
+                        XContentCommonAttributes.TYPE,
+                        FlintIndexStateModelXContentSerializer.FLINT_INDEX_DOC_TYPE))
+                .must(
+                    QueryBuilders.termQuery(
+                        XContentCommonAttributes.STATE, FlintIndexState.REFRESHING.getState())));
+  }
+
+  public static Supplier<Long> activeStatementsCount(StateStore stateStore, String datasourceName) {
+    return () ->
+        stateStore.count(
+            OpenSearchStateStoreUtil.getIndexName(datasourceName),
+            QueryBuilders.boolQuery()
+                .must(
+                    QueryBuilders.termQuery(
+                        XContentCommonAttributes.TYPE,
+                        StatementModelXContentSerializer.STATEMENT_DOC_TYPE))
+                .should(
+                    QueryBuilders.termsQuery(
+                        XContentCommonAttributes.STATE,
+                        StatementState.RUNNING.getState(),
+                        StatementState.WAITING.getState())));
+  }
+
+  @SuppressWarnings("unchecked")
+  private <T extends StateModel> XContentSerializer<T> getXContentSerializer(T st) {
+    if (st instanceof StatementModel) {
+      return (XContentSerializer<T>) new StatementModelXContentSerializer();
+    } else if (st instanceof SessionModel) {
+      return (XContentSerializer<T>) new SessionModelXContentSerializer();
+    } else if (st instanceof FlintIndexStateModel) {
+      return (XContentSerializer<T>) new FlintIndexStateModelXContentSerializer();
+    } else if (st instanceof AsyncQueryJobMetadata) {
+      return (XContentSerializer<T>) new AsyncQueryJobMetadataXContentSerializer();
+    } else if (st instanceof IndexDMLResult) {
+      return (XContentSerializer<T>) new IndexDMLResultXContentSerializer();
+    } else {
+      throw new IllegalArgumentException(
+          "Unsupported StateModel subclass: " + st.getClass().getSimpleName());
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/AsyncQueryJobMetadataXContentSerializer.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/AsyncQueryJobMetadataXContentSerializer.java
new file mode 100644
index 0000000000..1ae20a01b6
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/AsyncQueryJobMetadataXContentSerializer.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.ACCOUNT_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.APPLICATION_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.DATASOURCE_NAME;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.JOB_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.QUERY_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.TYPE;
+
+import java.io.IOException;
+import java.util.Locale;
+import lombok.SneakyThrows;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+
+public class AsyncQueryJobMetadataXContentSerializer
+    implements XContentSerializer<AsyncQueryJobMetadata> {
+  public static final String TYPE_JOBMETA = "jobmeta";
+  public static final String JOB_TYPE = "jobType";
+  public static final String INDEX_NAME = "indexName";
+  public static final String RESULT_INDEX = "resultIndex";
+  public static final String SESSION_ID = "sessionId";
+
+  @Override
+  public XContentBuilder toXContent(AsyncQueryJobMetadata jobMetadata, ToXContent.Params params)
+      throws IOException {
+    return XContentFactory.jsonBuilder()
+        .startObject()
+        .field(QUERY_ID, jobMetadata.getQueryId())
+        .field(TYPE, TYPE_JOBMETA)
+        .field(JOB_ID, jobMetadata.getJobId())
+        .field(ACCOUNT_ID, jobMetadata.getAccountId())
+        .field(APPLICATION_ID, jobMetadata.getApplicationId())
+        .field(RESULT_INDEX, jobMetadata.getResultIndex())
+        .field(SESSION_ID, jobMetadata.getSessionId())
+        .field(DATASOURCE_NAME, jobMetadata.getDatasourceName())
+        .field(JOB_TYPE, jobMetadata.getJobType().getText().toLowerCase(Locale.ROOT))
+        .field(INDEX_NAME, jobMetadata.getIndexName())
+        .endObject();
+  }
+
+  @Override
+  @SneakyThrows
+  public AsyncQueryJobMetadata fromXContent(XContentParser parser, long seqNo, long primaryTerm) {
+    AsyncQueryJobMetadata.AsyncQueryJobMetadataBuilder builder = AsyncQueryJobMetadata.builder();
+    ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser);
+    while (!XContentParser.Token.END_OBJECT.equals(parser.nextToken())) {
+      String fieldName = parser.currentName();
+      parser.nextToken();
+      switch (fieldName) {
+        case QUERY_ID:
+          builder.queryId(parser.textOrNull());
+          break;
+        case JOB_ID:
+          builder.jobId(parser.textOrNull());
+          break;
+        case ACCOUNT_ID:
+          builder.accountId(parser.textOrNull());
+          break;
+        case APPLICATION_ID:
+          builder.applicationId(parser.textOrNull());
+          break;
+        case RESULT_INDEX:
+          builder.resultIndex(parser.textOrNull());
+          break;
+        case SESSION_ID:
+          builder.sessionId(parser.textOrNull());
+          break;
+        case DATASOURCE_NAME:
+          builder.datasourceName(parser.textOrNull());
+          break;
+        case JOB_TYPE:
+          String jobTypeStr = parser.textOrNull();
+          builder.jobType(
+              Strings.isNullOrEmpty(jobTypeStr) ? null : JobType.fromString(jobTypeStr));
+          break;
+        case INDEX_NAME:
+          builder.indexName(parser.textOrNull());
+          break;
+        case TYPE:
+          break;
+        default:
+          throw new IllegalArgumentException("Unknown field: " + fieldName);
+      }
+    }
+    builder.metadata(XContentSerializerUtil.buildMetadata(seqNo, primaryTerm));
+    AsyncQueryJobMetadata result = builder.build();
+    if (result.getJobId() == null || result.getApplicationId() == null) {
+      throw new IllegalArgumentException("jobId and applicationId are required fields.");
+    }
+    return builder.build();
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/FlintIndexStateModelXContentSerializer.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/FlintIndexStateModelXContentSerializer.java
new file mode 100644
index 0000000000..9b1530dddf
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/FlintIndexStateModelXContentSerializer.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.ACCOUNT_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.APPLICATION_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.DATASOURCE_NAME;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.ERROR;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.JOB_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.LAST_UPDATE_TIME;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.STATE;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.TYPE;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.VERSION;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.VERSION_1_0;
+
+import java.io.IOException;
+import lombok.SneakyThrows;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParserUtils;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexStateModel;
+
+public class FlintIndexStateModelXContentSerializer
+    implements XContentSerializer<FlintIndexStateModel> {
+  public static final String FLINT_INDEX_DOC_TYPE = "flintindexstate";
+  public static final String LATEST_ID = "latestId";
+
+  @Override
+  public XContentBuilder toXContent(
+      FlintIndexStateModel flintIndexStateModel, ToXContent.Params params) throws IOException {
+    return XContentFactory.jsonBuilder()
+        .startObject()
+        .field(VERSION, VERSION_1_0)
+        .field(TYPE, FLINT_INDEX_DOC_TYPE)
+        .field(STATE, flintIndexStateModel.getIndexState().getState())
+        .field(ACCOUNT_ID, flintIndexStateModel.getAccountId())
+        .field(APPLICATION_ID, flintIndexStateModel.getApplicationId())
+        .field(JOB_ID, flintIndexStateModel.getJobId())
+        .field(LATEST_ID, flintIndexStateModel.getLatestId())
+        .field(DATASOURCE_NAME, flintIndexStateModel.getDatasourceName())
+        .field(LAST_UPDATE_TIME, flintIndexStateModel.getLastUpdateTime())
+        .field(ERROR, flintIndexStateModel.getError())
+        .endObject();
+  }
+
+  @Override
+  @SneakyThrows
+  public FlintIndexStateModel fromXContent(XContentParser parser, long seqNo, long primaryTerm) {
+    FlintIndexStateModel.FlintIndexStateModelBuilder builder = FlintIndexStateModel.builder();
+    XContentParserUtils.ensureExpectedToken(
+        XContentParser.Token.START_OBJECT, parser.currentToken(), parser);
+    while (!XContentParser.Token.END_OBJECT.equals(parser.nextToken())) {
+      String fieldName = parser.currentName();
+      parser.nextToken();
+      switch (fieldName) {
+        case STATE:
+          builder.indexState(FlintIndexState.fromString(parser.text()));
+          break;
+        case ACCOUNT_ID:
+          builder.accountId(parser.textOrNull());
+          break;
+        case APPLICATION_ID:
+          builder.applicationId(parser.text());
+          break;
+        case JOB_ID:
+          builder.jobId(parser.text());
+          break;
+        case LATEST_ID:
+          builder.latestId(parser.text());
+          break;
+        case DATASOURCE_NAME:
+          builder.datasourceName(parser.text());
+          break;
+        case LAST_UPDATE_TIME:
+          builder.lastUpdateTime(parser.longValue());
+          break;
+        case ERROR:
+          builder.error(parser.text());
+          break;
+      }
+    }
+    builder.metadata(XContentSerializerUtil.buildMetadata(seqNo, primaryTerm));
+    return builder.build();
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/IndexDMLResultXContentSerializer.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/IndexDMLResultXContentSerializer.java
new file mode 100644
index 0000000000..505533157d
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/IndexDMLResultXContentSerializer.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.DATASOURCE_NAME;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.ERROR;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.QUERY_ID;
+
+import com.google.common.collect.ImmutableList;
+import java.io.IOException;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.sql.spark.dispatcher.model.IndexDMLResult;
+
+public class IndexDMLResultXContentSerializer implements XContentSerializer<IndexDMLResult> {
+  public static final String QUERY_RUNTIME = "queryRunTime";
+  public static final String UPDATE_TIME = "updateTime";
+
+  @Override
+  public XContentBuilder toXContent(IndexDMLResult dmlResult, ToXContent.Params params)
+      throws IOException {
+    return XContentFactory.jsonBuilder()
+        .startObject()
+        .field(QUERY_ID, dmlResult.getQueryId())
+        .field("status", dmlResult.getStatus())
+        .field(ERROR, dmlResult.getError())
+        .field(DATASOURCE_NAME, dmlResult.getDatasourceName())
+        .field(QUERY_RUNTIME, dmlResult.getQueryRunTime())
+        .field(UPDATE_TIME, dmlResult.getUpdateTime())
+        .field("result", ImmutableList.of())
+        .field("schema", ImmutableList.of())
+        .endObject();
+  }
+
+  @Override
+  public IndexDMLResult fromXContent(XContentParser parser, long seqNo, long primaryTerm) {
+    throw new UnsupportedOperationException("IndexDMLResult to fromXContent Not supported");
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/SessionModelXContentSerializer.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/SessionModelXContentSerializer.java
new file mode 100644
index 0000000000..c36fc1ffc0
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/SessionModelXContentSerializer.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.ACCOUNT_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.APPLICATION_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.DATASOURCE_NAME;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.ERROR;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.JOB_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.LAST_UPDATE_TIME;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.STATE;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.TYPE;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.VERSION;
+
+import java.io.IOException;
+import lombok.SneakyThrows;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParserUtils;
+import org.opensearch.sql.spark.execution.session.SessionModel;
+import org.opensearch.sql.spark.execution.session.SessionState;
+import org.opensearch.sql.spark.execution.session.SessionType;
+
+public class SessionModelXContentSerializer implements XContentSerializer<SessionModel> {
+  public static final String SESSION_DOC_TYPE = "session";
+  public static final String SESSION_TYPE = "sessionType";
+  public static final String SESSION_ID = "sessionId";
+
+  @Override
+  public XContentBuilder toXContent(SessionModel sessionModel, ToXContent.Params params)
+      throws IOException {
+    return XContentFactory.jsonBuilder()
+        .startObject()
+        .field(VERSION, sessionModel.getVersion())
+        .field(TYPE, SESSION_DOC_TYPE)
+        .field(SESSION_TYPE, sessionModel.getSessionType().getSessionType())
+        .field(SESSION_ID, sessionModel.getSessionId())
+        .field(STATE, sessionModel.getSessionState().getSessionState())
+        .field(DATASOURCE_NAME, sessionModel.getDatasourceName())
+        .field(ACCOUNT_ID, sessionModel.getAccountId())
+        .field(APPLICATION_ID, sessionModel.getApplicationId())
+        .field(JOB_ID, sessionModel.getJobId())
+        .field(LAST_UPDATE_TIME, sessionModel.getLastUpdateTime())
+        .field(ERROR, sessionModel.getError())
+        .endObject();
+  }
+
+  @Override
+  @SneakyThrows
+  public SessionModel fromXContent(XContentParser parser, long seqNo, long primaryTerm) {
+    SessionModel.SessionModelBuilder builder = SessionModel.builder();
+    XContentParserUtils.ensureExpectedToken(
+        XContentParser.Token.START_OBJECT, parser.currentToken(), parser);
+    while (!XContentParser.Token.END_OBJECT.equals(parser.nextToken())) {
+      String fieldName = parser.currentName();
+      parser.nextToken();
+      switch (fieldName) {
+        case VERSION:
+          builder.version(parser.text());
+          break;
+        case SESSION_TYPE:
+          builder.sessionType(SessionType.fromString(parser.text()));
+          break;
+        case SESSION_ID:
+          builder.sessionId(parser.text());
+          break;
+        case STATE:
+          builder.sessionState(SessionState.fromString(parser.text()));
+          break;
+        case DATASOURCE_NAME:
+          builder.datasourceName(parser.text());
+          break;
+        case ERROR:
+          builder.error(parser.text());
+          break;
+        case ACCOUNT_ID:
+          builder.accountId(parser.textOrNull());
+          break;
+        case APPLICATION_ID:
+          builder.applicationId(parser.text());
+          break;
+        case JOB_ID:
+          builder.jobId(parser.text());
+          break;
+        case LAST_UPDATE_TIME:
+          builder.lastUpdateTime(parser.longValue());
+          break;
+        case TYPE:
+          // do nothing.
+          break;
+      }
+    }
+    builder.metadata(XContentSerializerUtil.buildMetadata(seqNo, primaryTerm));
+    return builder.build();
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/StatementModelXContentSerializer.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/StatementModelXContentSerializer.java
new file mode 100644
index 0000000000..07f018f90c
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/StatementModelXContentSerializer.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import static org.opensearch.sql.spark.execution.xcontent.SessionModelXContentSerializer.SESSION_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.ACCOUNT_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.APPLICATION_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.DATASOURCE_NAME;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.ERROR;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.JOB_ID;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.STATE;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.TYPE;
+import static org.opensearch.sql.spark.execution.xcontent.XContentCommonAttributes.VERSION;
+
+import java.io.IOException;
+import lombok.SneakyThrows;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParserUtils;
+import org.opensearch.sql.spark.execution.statement.StatementId;
+import org.opensearch.sql.spark.execution.statement.StatementModel;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+public class StatementModelXContentSerializer implements XContentSerializer<StatementModel> {
+  public static final String STATEMENT_DOC_TYPE = "statement";
+  public static final String STATEMENT_ID = "statementId";
+  public static final String LANG = "lang";
+  public static final String QUERY = "query";
+  public static final String QUERY_ID = "queryId";
+  public static final String SUBMIT_TIME = "submitTime";
+  public static final String UNKNOWN = "";
+
+  @Override
+  public XContentBuilder toXContent(StatementModel statementModel, ToXContent.Params params)
+      throws IOException {
+    return XContentFactory.jsonBuilder()
+        .startObject()
+        .field(VERSION, statementModel.getVersion())
+        .field(TYPE, STATEMENT_DOC_TYPE)
+        .field(STATE, statementModel.getStatementState().getState())
+        .field(STATEMENT_ID, statementModel.getStatementId().getId())
+        .field(SESSION_ID, statementModel.getSessionId())
+        .field(ACCOUNT_ID, statementModel.getAccountId())
+        .field(APPLICATION_ID, statementModel.getApplicationId())
+        .field(JOB_ID, statementModel.getJobId())
+        .field(LANG, statementModel.getLangType().getText())
+        .field(DATASOURCE_NAME, statementModel.getDatasourceName())
+        .field(QUERY, statementModel.getQuery())
+        .field(QUERY_ID, statementModel.getQueryId())
+        .field(SUBMIT_TIME, statementModel.getSubmitTime())
+        .field(ERROR, statementModel.getError())
+        .endObject();
+  }
+
+  @Override
+  @SneakyThrows
+  public StatementModel fromXContent(XContentParser parser, long seqNo, long primaryTerm) {
+    StatementModel.StatementModelBuilder builder = StatementModel.builder();
+    XContentParserUtils.ensureExpectedToken(
+        XContentParser.Token.START_OBJECT, parser.currentToken(), parser);
+    while (!XContentParser.Token.END_OBJECT.equals(parser.nextToken())) {
+      String fieldName = parser.currentName();
+      parser.nextToken();
+      switch (fieldName) {
+        case VERSION:
+          builder.version(parser.text());
+          break;
+        case TYPE:
+          // do nothing
+          break;
+        case STATE:
+          builder.statementState(StatementState.fromString(parser.text()));
+          break;
+        case STATEMENT_ID:
+          builder.statementId(new StatementId(parser.text()));
+          break;
+        case SESSION_ID:
+          builder.sessionId(parser.text());
+          break;
+        case ACCOUNT_ID:
+          builder.accountId(parser.textOrNull());
+          break;
+        case APPLICATION_ID:
+          builder.applicationId(parser.text());
+          break;
+        case JOB_ID:
+          builder.jobId(parser.text());
+          break;
+        case LANG:
+          builder.langType(LangType.fromString(parser.text()));
+          break;
+        case DATASOURCE_NAME:
+          builder.datasourceName(parser.text());
+          break;
+        case QUERY:
+          builder.query(parser.text());
+          break;
+        case QUERY_ID:
+          builder.queryId(parser.text());
+          break;
+        case SUBMIT_TIME:
+          builder.submitTime(parser.longValue());
+          break;
+        case ERROR:
+          builder.error(parser.text());
+          break;
+        default:
+          throw new IllegalArgumentException("Unexpected field: " + fieldName);
+      }
+    }
+    builder.metadata(XContentSerializerUtil.buildMetadata(seqNo, primaryTerm));
+    return builder.build();
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/XContentCommonAttributes.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/XContentCommonAttributes.java
new file mode 100644
index 0000000000..d8f17bf9d6
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/XContentCommonAttributes.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class XContentCommonAttributes {
+  public static final String VERSION = "version";
+  public static final String VERSION_1_0 = "1.0";
+  public static final String TYPE = "type";
+  public static final String QUERY_ID = "queryId";
+  public static final String STATE = "state";
+  public static final String LAST_UPDATE_TIME = "lastUpdateTime";
+  public static final String ACCOUNT_ID = "accountId";
+  public static final String APPLICATION_ID = "applicationId";
+  public static final String DATASOURCE_NAME = "dataSourceName";
+  public static final String JOB_ID = "jobId";
+  public static final String ERROR = "error";
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializer.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializer.java
new file mode 100644
index 0000000000..d8cbcdbe29
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializer.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import java.io.IOException;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.sql.spark.execution.statestore.StateModel;
+
+/** Interface for XContentSerializer, which serialize/deserialize XContent */
+public interface XContentSerializer<T extends StateModel> {
+
+  /**
+   * Serializes the given object to an XContentBuilder using the specified parameters.
+   *
+   * @param object The object to serialize.
+   * @param params The parameters to use for serialization.
+   * @return An XContentBuilder containing the serialized representation of the object.
+   * @throws IOException If an I/O error occurs during serialization.
+   */
+  XContentBuilder toXContent(T object, ToXContent.Params params) throws IOException;
+
+  /**
+   * Deserializes an object from an XContentParser.
+   *
+   * @param parser The XContentParser to read the object from.
+   * @param seqNo The sequence number associated with the object.
+   * @param primaryTerm The primary term associated with the object.
+   * @return The deserialized object.
+   */
+  T fromXContent(XContentParser parser, long seqNo, long primaryTerm);
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImpl.java b/async-query/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImpl.java
new file mode 100644
index 0000000000..38789dd796
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImpl.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import static org.opensearch.sql.spark.flint.FlintIndexMetadata.APP_ID;
+import static org.opensearch.sql.spark.flint.FlintIndexMetadata.ENV_KEY;
+import static org.opensearch.sql.spark.flint.FlintIndexMetadata.KIND_KEY;
+import static org.opensearch.sql.spark.flint.FlintIndexMetadata.LATEST_ID_KEY;
+import static org.opensearch.sql.spark.flint.FlintIndexMetadata.META_KEY;
+import static org.opensearch.sql.spark.flint.FlintIndexMetadata.NAME_KEY;
+import static org.opensearch.sql.spark.flint.FlintIndexMetadata.OPTIONS_KEY;
+import static org.opensearch.sql.spark.flint.FlintIndexMetadata.PROPERTIES_KEY;
+import static org.opensearch.sql.spark.flint.FlintIndexMetadata.SERVERLESS_EMR_JOB_ID;
+import static org.opensearch.sql.spark.flint.FlintIndexMetadata.SOURCE_KEY;
+
+import java.util.HashMap;
+import java.util.Map;
+import lombok.AllArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.opensearch.client.Client;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+
+/** Implementation of {@link FlintIndexMetadataService} */
+@AllArgsConstructor
+public class FlintIndexMetadataServiceImpl implements FlintIndexMetadataService {
+
+  private static final Logger LOGGER = LogManager.getLogger(FlintIndexMetadataServiceImpl.class);
+
+  private final Client client;
+
+  @Override
+  public Map<String, FlintIndexMetadata> getFlintIndexMetadata(
+      String indexPattern, AsyncQueryRequestContext asyncQueryRequestContext) {
+    GetMappingsResponse mappingsResponse =
+        client.admin().indices().prepareGetMappings().setIndices(indexPattern).get();
+    Map<String, FlintIndexMetadata> indexMetadataMap = new HashMap<>();
+    mappingsResponse
+        .getMappings()
+        .forEach(
+            (indexName, mappingMetadata) -> {
+              try {
+                Map<String, Object> mappingSourceMap = mappingMetadata.getSourceAsMap();
+                FlintIndexMetadata metadata =
+                    fromMetadata(indexName, (Map<String, Object>) mappingSourceMap.get(META_KEY));
+                indexMetadataMap.put(indexName, metadata);
+              } catch (Exception exception) {
+                LOGGER.error(
+                    "Exception while building index details for index: {} due to: {}",
+                    indexName,
+                    exception.getMessage());
+              }
+            });
+    return indexMetadataMap;
+  }
+
+  @Override
+  public void updateIndexToManualRefresh(
+      String indexName,
+      FlintIndexOptions flintIndexOptions,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    GetMappingsResponse mappingsResponse =
+        client.admin().indices().prepareGetMappings().setIndices(indexName).get();
+    Map<String, Object> flintMetadataMap =
+        mappingsResponse.getMappings().get(indexName).getSourceAsMap();
+    Map<String, Object> meta = (Map<String, Object>) flintMetadataMap.get("_meta");
+    String kind = (String) meta.get("kind");
+    Map<String, Object> options = (Map<String, Object>) meta.get("options");
+    Map<String, String> newOptions = flintIndexOptions.getProvidedOptions();
+    FlintIndexMetadataValidator.validateFlintIndexOptions(kind, options, newOptions);
+    options.putAll(newOptions);
+    client.admin().indices().preparePutMapping(indexName).setSource(flintMetadataMap).get();
+  }
+
+  private FlintIndexMetadata fromMetadata(String indexName, Map<String, Object> metaMap) {
+    FlintIndexMetadata.FlintIndexMetadataBuilder flintIndexMetadataBuilder =
+        FlintIndexMetadata.builder();
+    Map<String, Object> propertiesMap = (Map<String, Object>) metaMap.get(PROPERTIES_KEY);
+    Map<String, Object> envMap = (Map<String, Object>) propertiesMap.get(ENV_KEY);
+    Map<String, Object> options = (Map<String, Object>) metaMap.get(OPTIONS_KEY);
+    FlintIndexOptions flintIndexOptions = new FlintIndexOptions();
+    for (String key : options.keySet()) {
+      flintIndexOptions.setOption(key, (String) options.get(key));
+    }
+    String jobId = (String) envMap.get(SERVERLESS_EMR_JOB_ID);
+    String appId = (String) envMap.getOrDefault(APP_ID, null);
+    String latestId = (String) metaMap.getOrDefault(LATEST_ID_KEY, null);
+    String kind = (String) metaMap.getOrDefault(KIND_KEY, null);
+    String name = (String) metaMap.getOrDefault(NAME_KEY, null);
+    String source = (String) metaMap.getOrDefault(SOURCE_KEY, null);
+    flintIndexMetadataBuilder.jobId(jobId);
+    flintIndexMetadataBuilder.appId(appId);
+    flintIndexMetadataBuilder.latestId(latestId);
+    flintIndexMetadataBuilder.name(name);
+    flintIndexMetadataBuilder.kind(kind);
+    flintIndexMetadataBuilder.source(source);
+    flintIndexMetadataBuilder.opensearchIndexName(indexName);
+    flintIndexMetadataBuilder.flintIndexOptions(flintIndexOptions);
+    return flintIndexMetadataBuilder.build();
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClient.java b/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClient.java
new file mode 100644
index 0000000000..7a655f0678
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClient.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
+import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.client.Client;
+
+@RequiredArgsConstructor
+public class OpenSearchFlintIndexClient implements FlintIndexClient {
+  private static final Logger LOG = LogManager.getLogger();
+
+  private final Client client;
+
+  @Override
+  public void deleteIndex(String indexName) {
+    DeleteIndexRequest request = new DeleteIndexRequest().indices(indexName);
+    AcknowledgedResponse response = client.admin().indices().delete(request).actionGet();
+    LOG.info("OpenSearch index delete result: {}", response.isAcknowledged());
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexStateModelService.java b/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexStateModelService.java
new file mode 100644
index 0000000000..eba338e912
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexStateModelService.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchStateStoreUtil;
+import org.opensearch.sql.spark.execution.statestore.StateStore;
+import org.opensearch.sql.spark.execution.xcontent.FlintIndexStateModelXContentSerializer;
+
+@RequiredArgsConstructor
+public class OpenSearchFlintIndexStateModelService implements FlintIndexStateModelService {
+  private final StateStore stateStore;
+  private final FlintIndexStateModelXContentSerializer serializer;
+
+  @Override
+  public FlintIndexStateModel updateFlintIndexState(
+      FlintIndexStateModel flintIndexStateModel,
+      FlintIndexState flintIndexState,
+      String datasourceName,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    return stateStore.updateState(
+        flintIndexStateModel,
+        flintIndexState,
+        FlintIndexStateModel::copyWithState,
+        OpenSearchStateStoreUtil.getIndexName(datasourceName));
+  }
+
+  @Override
+  public Optional<FlintIndexStateModel> getFlintIndexStateModel(
+      String id, String datasourceName, AsyncQueryRequestContext asyncQueryRequestContext) {
+    return stateStore.get(
+        id, serializer::fromXContent, OpenSearchStateStoreUtil.getIndexName(datasourceName));
+  }
+
+  @Override
+  public FlintIndexStateModel createFlintIndexStateModel(
+      FlintIndexStateModel flintIndexStateModel,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    return stateStore.create(
+        flintIndexStateModel.getId(),
+        flintIndexStateModel,
+        FlintIndexStateModel::copy,
+        OpenSearchStateStoreUtil.getIndexName(flintIndexStateModel.getDatasourceName()));
+  }
+
+  @Override
+  public boolean deleteFlintIndexStateModel(
+      String id, String datasourceName, AsyncQueryRequestContext asyncQueryRequestContext) {
+    return stateStore.delete(id, OpenSearchStateStoreUtil.getIndexName(datasourceName));
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchIndexDMLResultStorageService.java b/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchIndexDMLResultStorageService.java
new file mode 100644
index 0000000000..3be44ba410
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchIndexDMLResultStorageService.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.IndexDMLResult;
+import org.opensearch.sql.spark.execution.statestore.StateStore;
+
+@RequiredArgsConstructor
+public class OpenSearchIndexDMLResultStorageService implements IndexDMLResultStorageService {
+
+  private final DataSourceService dataSourceService;
+  private final StateStore stateStore;
+
+  @Override
+  public IndexDMLResult createIndexDMLResult(
+      IndexDMLResult result, AsyncQueryRequestContext asyncQueryRequestContexts) {
+    DataSourceMetadata dataSourceMetadata =
+        dataSourceService.getDataSourceMetadata(result.getDatasourceName());
+    return stateStore.create(
+        mapIdToDocumentId(result.getId()),
+        result,
+        IndexDMLResult::copy,
+        dataSourceMetadata.getResultIndex());
+  }
+
+  private String mapIdToDocumentId(String id) {
+    return "index" + id;
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/leasemanager/DefaultLeaseManager.java b/async-query/src/main/java/org/opensearch/sql/spark/leasemanager/DefaultLeaseManager.java
new file mode 100644
index 0000000000..375fa7b11e
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/leasemanager/DefaultLeaseManager.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.leasemanager;
+
+import static org.opensearch.sql.common.setting.Settings.Key.SPARK_EXECUTION_REFRESH_JOB_LIMIT;
+import static org.opensearch.sql.common.setting.Settings.Key.SPARK_EXECUTION_SESSION_LIMIT;
+import static org.opensearch.sql.spark.execution.statestore.StateStore.ALL_DATASOURCE;
+import static org.opensearch.sql.spark.execution.statestore.StateStore.activeRefreshJobCount;
+import static org.opensearch.sql.spark.execution.statestore.StateStore.activeSessionsCount;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.function.Predicate;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.execution.statestore.StateStore;
+import org.opensearch.sql.spark.leasemanager.model.LeaseRequest;
+
+/**
+ * Default Lease Manager
+ * <li>QueryHandler borrow lease before execute the query.
+ * <li>LeaseManagerService check request against domain level concurrent limit.
+ * <li>LeaseManagerService running on data node and check limit based on cluster settings.
+ */
+public class DefaultLeaseManager implements LeaseManager {
+
+  private final List<Rule<LeaseRequest>> concurrentLimitRules;
+  private final Settings settings;
+  private final StateStore stateStore;
+
+  public DefaultLeaseManager(Settings settings, StateStore stateStore) {
+    this.settings = settings;
+    this.stateStore = stateStore;
+    this.concurrentLimitRules =
+        Arrays.asList(
+            new ConcurrentSessionRule(settings, stateStore),
+            new ConcurrentRefreshJobRule(settings, stateStore));
+  }
+
+  @Override
+  public void borrow(LeaseRequest request) {
+    for (Rule<LeaseRequest> rule : concurrentLimitRules) {
+      if (!rule.test(request)) {
+        throw new ConcurrencyLimitExceededException(rule.description());
+      }
+    }
+  }
+
+  interface Rule<T> extends Predicate<T> {
+    String description();
+  }
+
+  @RequiredArgsConstructor
+  public static class ConcurrentSessionRule implements Rule<LeaseRequest> {
+    private final Settings settings;
+    private final StateStore stateStore;
+
+    @Override
+    public String description() {
+      return String.format(
+          Locale.ROOT, "domain concurrent active session can not exceed %d", sessionMaxLimit());
+    }
+
+    @Override
+    public boolean test(LeaseRequest leaseRequest) {
+      if (leaseRequest.getJobType() != JobType.INTERACTIVE) {
+        return true;
+      }
+      return activeSessionsCount(stateStore, ALL_DATASOURCE).get() < sessionMaxLimit();
+    }
+
+    public int sessionMaxLimit() {
+      return settings.getSettingValue(SPARK_EXECUTION_SESSION_LIMIT);
+    }
+  }
+
+  @RequiredArgsConstructor
+  public static class ConcurrentRefreshJobRule implements Rule<LeaseRequest> {
+    private final Settings settings;
+    private final StateStore stateStore;
+
+    @Override
+    public String description() {
+      return String.format(
+          Locale.ROOT, "domain concurrent refresh job can not exceed %d", refreshJobLimit());
+    }
+
+    @Override
+    public boolean test(LeaseRequest leaseRequest) {
+      if (leaseRequest.getJobType() == JobType.INTERACTIVE) {
+        return true;
+      }
+      return activeRefreshJobCount(stateStore, ALL_DATASOURCE).get() < refreshJobLimit();
+    }
+
+    public int refreshJobLimit() {
+      return settings.getSettingValue(SPARK_EXECUTION_REFRESH_JOB_LIMIT);
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/metrics/OpenSearchMetricsService.java b/async-query/src/main/java/org/opensearch/sql/spark/metrics/OpenSearchMetricsService.java
new file mode 100644
index 0000000000..316ab536bc
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/metrics/OpenSearchMetricsService.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.metrics;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+import org.opensearch.sql.legacy.metrics.MetricName;
+import org.opensearch.sql.legacy.utils.MetricUtils;
+
+public class OpenSearchMetricsService implements MetricsService {
+  private static final Map<EmrMetrics, MetricName> mapping =
+      ImmutableMap.of(
+          EmrMetrics.EMR_CANCEL_JOB_REQUEST_FAILURE_COUNT,
+              MetricName.EMR_CANCEL_JOB_REQUEST_FAILURE_COUNT,
+          EmrMetrics.EMR_GET_JOB_RESULT_FAILURE_COUNT, MetricName.EMR_GET_JOB_RESULT_FAILURE_COUNT,
+          EmrMetrics.EMR_START_JOB_REQUEST_FAILURE_COUNT,
+              MetricName.EMR_START_JOB_REQUEST_FAILURE_COUNT,
+          EmrMetrics.EMR_INTERACTIVE_QUERY_JOBS_CREATION_COUNT,
+              MetricName.EMR_INTERACTIVE_QUERY_JOBS_CREATION_COUNT,
+          EmrMetrics.EMR_STREAMING_QUERY_JOBS_CREATION_COUNT,
+              MetricName.EMR_STREAMING_QUERY_JOBS_CREATION_COUNT,
+          EmrMetrics.EMR_BATCH_QUERY_JOBS_CREATION_COUNT,
+              MetricName.EMR_BATCH_QUERY_JOBS_CREATION_COUNT);
+
+  @Override
+  public void incrementNumericalMetric(EmrMetrics metricName) {
+    MetricUtils.incrementNumericalMetric(mapping.get(metricName));
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/parameter/S3GlueDataSourceSparkParameterComposer.java b/async-query/src/main/java/org/opensearch/sql/spark/parameter/S3GlueDataSourceSparkParameterComposer.java
new file mode 100644
index 0000000000..189e140416
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/parameter/S3GlueDataSourceSparkParameterComposer.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.parameter;
+
+import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_ICEBERG_ENABLED;
+import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH;
+import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH_PASSWORD;
+import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH_USERNAME;
+import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_REGION;
+import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_URI;
+import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_LAKEFORMATION_ENABLED;
+import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_LAKEFORMATION_SESSION_TAG;
+import static org.opensearch.sql.datasources.glue.GlueDataSourceFactory.GLUE_ROLE_ARN;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.DRIVER_ENV_ASSUME_ROLE_ARN_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.EXECUTOR_ENV_ASSUME_ROLE_ARN_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_ACCELERATE_USING_COVERING_INDEX;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_DATA_SOURCE_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_DELEGATE_CATALOG;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_AUTH_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_AUTH_PASSWORD;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_AUTH_USERNAME;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_AWSREGION_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_HOST_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_PORT_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_INDEX_STORE_SCHEME_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_PPL_EXTENSION;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_SQL_EXTENSION;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.HIVE_METASTORE_GLUE_ARN_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ICEBERG_ASSUME_ROLE_CLIENT_FACTORY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ICEBERG_GLUE_CATALOG;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ICEBERG_LF_CLIENT_FACTORY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ICEBERG_SESSION_CATALOG;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ICEBERG_SPARK_EXTENSION;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ICEBERG_SPARK_JARS;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.ICEBERG_TS_WO_TZ;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_CATALOG;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_CATALOG_CATALOG_IMPL;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_CATALOG_CLIENT_ASSUME_ROLE_ARN;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_CATALOG_CLIENT_ASSUME_ROLE_REGION;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_CATALOG_CLIENT_FACTORY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_CATALOG_CLIENT_REGION;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_CATALOG_GLUE_ACCOUNT_ID;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_CATALOG_GLUE_LF_ENABLED;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_CATALOG_LF_SESSION_TAG_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_JAR_PACKAGES_KEY;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_SQL_EXTENSIONS_KEY;
+
+import com.amazonaws.arn.Arn;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Optional;
+import java.util.function.Supplier;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasources.auth.AuthenticationType;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigClusterSetting;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigClusterSettingLoader;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+
+@RequiredArgsConstructor
+public class S3GlueDataSourceSparkParameterComposer implements DataSourceSparkParameterComposer {
+  public static final String FLINT_BASIC_AUTH = "basic";
+  public static final String FALSE = "false";
+  public static final String TRUE = "true";
+
+  private final SparkExecutionEngineConfigClusterSettingLoader settingLoader;
+
+  @Override
+  public void compose(
+      DataSourceMetadata metadata,
+      SparkSubmitParameters params,
+      DispatchQueryRequest dispatchQueryRequest,
+      AsyncQueryRequestContext context) {
+    final Optional<SparkExecutionEngineConfigClusterSetting> maybeClusterSettings =
+        settingLoader.load();
+    if (!maybeClusterSettings.isPresent()) {
+      throw new RuntimeException("No cluster settings present");
+    }
+    final SparkExecutionEngineConfigClusterSetting clusterSetting = maybeClusterSettings.get();
+    final String region = clusterSetting.getRegion();
+
+    final String roleArn = metadata.getProperties().get(GLUE_ROLE_ARN);
+    final String accountId = Arn.fromString(roleArn).getAccountId();
+
+    params.setConfigItem(DRIVER_ENV_ASSUME_ROLE_ARN_KEY, roleArn);
+    params.setConfigItem(EXECUTOR_ENV_ASSUME_ROLE_ARN_KEY, roleArn);
+    params.setConfigItem(HIVE_METASTORE_GLUE_ARN_KEY, roleArn);
+    params.setConfigItem("spark.sql.catalog." + metadata.getName(), FLINT_DELEGATE_CATALOG);
+    params.setConfigItem(FLINT_DATA_SOURCE_KEY, metadata.getName());
+
+    final boolean icebergEnabled =
+        BooleanUtils.toBoolean(metadata.getProperties().get(GLUE_ICEBERG_ENABLED));
+    if (icebergEnabled) {
+      params.setConfigItem(
+          SPARK_JAR_PACKAGES_KEY,
+          params.getConfigItem(SPARK_JAR_PACKAGES_KEY) + "," + ICEBERG_SPARK_JARS);
+      params.setConfigItem(SPARK_CATALOG, ICEBERG_SESSION_CATALOG);
+      params.setConfigItem(SPARK_CATALOG_CATALOG_IMPL, ICEBERG_GLUE_CATALOG);
+      params.setConfigItem(
+          SPARK_SQL_EXTENSIONS_KEY,
+          ICEBERG_SPARK_EXTENSION + "," + FLINT_SQL_EXTENSION + "," + FLINT_PPL_EXTENSION);
+
+      params.setConfigItem(SPARK_CATALOG_CLIENT_REGION, region);
+      params.setConfigItem(SPARK_CATALOG_GLUE_ACCOUNT_ID, accountId);
+      params.setConfigItem(SPARK_CATALOG_CLIENT_ASSUME_ROLE_ARN, roleArn);
+      params.setConfigItem(SPARK_CATALOG_CLIENT_ASSUME_ROLE_REGION, region);
+      params.setConfigItem(ICEBERG_TS_WO_TZ, TRUE);
+
+      final boolean lakeFormationEnabled =
+          BooleanUtils.toBoolean(metadata.getProperties().get(GLUE_LAKEFORMATION_ENABLED));
+      if (lakeFormationEnabled) {
+        final String sessionTag = metadata.getProperties().get(GLUE_LAKEFORMATION_SESSION_TAG);
+        if (StringUtils.isBlank(sessionTag)) {
+          throw new IllegalArgumentException(GLUE_LAKEFORMATION_SESSION_TAG + " is required");
+        }
+
+        params.setConfigItem(FLINT_ACCELERATE_USING_COVERING_INDEX, FALSE);
+        params.setConfigItem(SPARK_CATALOG_GLUE_LF_ENABLED, TRUE);
+        params.setConfigItem(SPARK_CATALOG_CLIENT_FACTORY, ICEBERG_LF_CLIENT_FACTORY);
+        params.setConfigItem(SPARK_CATALOG_LF_SESSION_TAG_KEY, sessionTag);
+      } else {
+        params.setConfigItem(SPARK_CATALOG_CLIENT_FACTORY, ICEBERG_ASSUME_ROLE_CLIENT_FACTORY);
+      }
+    }
+
+    setFlintIndexStoreHost(
+        params,
+        parseUri(
+            metadata.getProperties().get(GLUE_INDEX_STORE_OPENSEARCH_URI), metadata.getName()));
+    setFlintIndexStoreAuthProperties(
+        params,
+        metadata.getProperties().get(GLUE_INDEX_STORE_OPENSEARCH_AUTH),
+        () -> metadata.getProperties().get(GLUE_INDEX_STORE_OPENSEARCH_AUTH_USERNAME),
+        () -> metadata.getProperties().get(GLUE_INDEX_STORE_OPENSEARCH_AUTH_PASSWORD),
+        () -> metadata.getProperties().get(GLUE_INDEX_STORE_OPENSEARCH_REGION));
+    params.setConfigItem("spark.flint.datasource.name", metadata.getName());
+  }
+
+  private void setFlintIndexStoreHost(SparkSubmitParameters params, URI uri) {
+    params.setConfigItem(FLINT_INDEX_STORE_HOST_KEY, uri.getHost());
+    params.setConfigItem(FLINT_INDEX_STORE_PORT_KEY, String.valueOf(uri.getPort()));
+    params.setConfigItem(FLINT_INDEX_STORE_SCHEME_KEY, uri.getScheme());
+  }
+
+  private void setFlintIndexStoreAuthProperties(
+      SparkSubmitParameters params,
+      String authType,
+      Supplier<String> userName,
+      Supplier<String> password,
+      Supplier<String> region) {
+    if (AuthenticationType.get(authType).equals(AuthenticationType.BASICAUTH)) {
+      params.setConfigItem(FLINT_INDEX_STORE_AUTH_KEY, FLINT_BASIC_AUTH);
+      params.setConfigItem(FLINT_INDEX_STORE_AUTH_USERNAME, userName.get());
+      params.setConfigItem(FLINT_INDEX_STORE_AUTH_PASSWORD, password.get());
+    } else if (AuthenticationType.get(authType).equals(AuthenticationType.AWSSIGV4AUTH)) {
+      params.setConfigItem(FLINT_INDEX_STORE_AUTH_KEY, "sigv4");
+      params.setConfigItem(FLINT_INDEX_STORE_AWSREGION_KEY, region.get());
+    } else {
+      params.setConfigItem(FLINT_INDEX_STORE_AUTH_KEY, authType);
+    }
+  }
+
+  private URI parseUri(String opensearchUri, String datasourceName) {
+    try {
+      return new URI(opensearchUri);
+    } catch (URISyntaxException e) {
+      throw new IllegalArgumentException(
+          String.format(
+              "Bad URI in indexstore configuration of the : %s datasoure.", datasourceName));
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReader.java b/async-query/src/main/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReader.java
new file mode 100644
index 0000000000..10113ece8d
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReader.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.response;
+
+import static org.opensearch.sql.datasource.model.DataSourceMetadata.DEFAULT_RESULT_INDEX;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.DATA_FIELD;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.JOB_ID_FIELD;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONObject;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.client.Client;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.index.IndexNotFoundException;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.builder.SearchSourceBuilder;
+
+/** JobExecutionResponseReader implementation for reading response from OpenSearch index. */
+public class OpenSearchJobExecutionResponseReader implements JobExecutionResponseReader {
+  private final Client client;
+  private static final Logger LOG = LogManager.getLogger();
+
+  public OpenSearchJobExecutionResponseReader(Client client) {
+    this.client = client;
+  }
+
+  @Override
+  public JSONObject getResultWithJobId(String jobId, String resultLocation) {
+    return searchInSparkIndex(QueryBuilders.termQuery(JOB_ID_FIELD, jobId), resultLocation);
+  }
+
+  @Override
+  public JSONObject getResultWithQueryId(String queryId, String resultLocation) {
+    return searchInSparkIndex(QueryBuilders.termQuery("queryId", queryId), resultLocation);
+  }
+
+  private JSONObject searchInSparkIndex(QueryBuilder query, String resultIndex) {
+    SearchRequest searchRequest = new SearchRequest();
+    String searchResultIndex = resultIndex == null ? DEFAULT_RESULT_INDEX : resultIndex;
+    searchRequest.indices(searchResultIndex);
+    SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+    searchSourceBuilder.query(query);
+    searchRequest.source(searchSourceBuilder);
+    ActionFuture<SearchResponse> searchResponseActionFuture;
+    JSONObject data = new JSONObject();
+    try {
+      searchResponseActionFuture = client.search(searchRequest);
+    } catch (IndexNotFoundException e) {
+      // if there is no result index (e.g., EMR-S hasn't created the index yet), we return empty
+      // json
+      LOG.info(resultIndex + " is not created yet.");
+      return data;
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+    SearchResponse searchResponse = searchResponseActionFuture.actionGet();
+    if (searchResponse.status().getStatus() != 200) {
+      throw new RuntimeException(
+          "Fetching result from "
+              + searchResultIndex
+              + " index failed with status : "
+              + searchResponse.status());
+    } else {
+      for (SearchHit searchHit : searchResponse.getHits().getHits()) {
+        data.put(DATA_FIELD, searchHit.getSourceAsMap());
+      }
+      return data;
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementAction.java b/async-query/src/main/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementAction.java
new file mode 100644
index 0000000000..c188cf693f
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementAction.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.rest;
+
+import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
+import static org.opensearch.core.rest.RestStatus.INTERNAL_SERVER_ERROR;
+import static org.opensearch.core.rest.RestStatus.TOO_MANY_REQUESTS;
+import static org.opensearch.rest.RestRequest.Method.DELETE;
+import static org.opensearch.rest.RestRequest.Method.GET;
+import static org.opensearch.rest.RestRequest.Method.POST;
+
+import com.google.common.collect.ImmutableList;
+import java.io.IOException;
+import java.util.List;
+import java.util.Locale;
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.OpenSearchException;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.rest.BaseRestHandler;
+import org.opensearch.rest.BytesRestResponse;
+import org.opensearch.rest.RestChannel;
+import org.opensearch.rest.RestRequest;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasources.exceptions.DataSourceClientException;
+import org.opensearch.sql.datasources.exceptions.ErrorMessage;
+import org.opensearch.sql.datasources.utils.Scheduler;
+import org.opensearch.sql.legacy.metrics.MetricName;
+import org.opensearch.sql.legacy.utils.MetricUtils;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.sql.opensearch.util.RestRequestUtil;
+import org.opensearch.sql.spark.asyncquery.exceptions.AsyncQueryNotFoundException;
+import org.opensearch.sql.spark.leasemanager.ConcurrencyLimitExceededException;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.transport.TransportCancelAsyncQueryRequestAction;
+import org.opensearch.sql.spark.transport.TransportCreateAsyncQueryRequestAction;
+import org.opensearch.sql.spark.transport.TransportGetAsyncQueryResultAction;
+import org.opensearch.sql.spark.transport.format.CreateAsyncQueryRequestConverter;
+import org.opensearch.sql.spark.transport.model.CancelAsyncQueryActionRequest;
+import org.opensearch.sql.spark.transport.model.CancelAsyncQueryActionResponse;
+import org.opensearch.sql.spark.transport.model.CreateAsyncQueryActionRequest;
+import org.opensearch.sql.spark.transport.model.CreateAsyncQueryActionResponse;
+import org.opensearch.sql.spark.transport.model.GetAsyncQueryResultActionRequest;
+import org.opensearch.sql.spark.transport.model.GetAsyncQueryResultActionResponse;
+
+@RequiredArgsConstructor
+public class RestAsyncQueryManagementAction extends BaseRestHandler {
+
+  public static final String ASYNC_QUERY_ACTIONS = "async_query_actions";
+  public static final String BASE_ASYNC_QUERY_ACTION_URL = "/_plugins/_async_query";
+
+  private static final Logger LOG = LogManager.getLogger(RestAsyncQueryManagementAction.class);
+
+  private final OpenSearchSettings settings;
+
+  @Override
+  public String getName() {
+    return ASYNC_QUERY_ACTIONS;
+  }
+
+  @Override
+  public List<Route> routes() {
+    return ImmutableList.of(
+
+        /*
+         *
+         * Create a new async query using spark execution engine.
+         * Request URL: POST
+         * Request body:
+         * Ref [org.opensearch.sql.spark.transport.model.CreateAsyncQueryActionRequest]
+         * Response body:
+         * Ref [org.opensearch.sql.spark.transport.model.CreateAsyncQueryActionResponse]
+         */
+        new Route(POST, BASE_ASYNC_QUERY_ACTION_URL),
+
+        /*
+         *
+         * GET Async Query result with in spark execution engine.
+         * Request URL: GET
+         * Request body:
+         * Ref [org.opensearch.sql.spark.transport.model.GetAsyncQueryResultActionRequest]
+         * Response body:
+         * Ref [org.opensearch.sql.spark.transport.model.GetAsyncQueryResultActionResponse]
+         */
+        new Route(
+            GET, String.format(Locale.ROOT, "%s/{%s}", BASE_ASYNC_QUERY_ACTION_URL, "queryId")),
+
+        /*
+         *
+         * Cancel a job within spark execution engine.
+         * Request URL: DELETE
+         * Request body:
+         * Ref [org.opensearch.sql.spark.transport.model.CancelAsyncQueryActionRequest]
+         * Response body:
+         * Ref [org.opensearch.sql.spark.transport.model.CancelAsyncQueryActionResponse]
+         */
+        new Route(
+            DELETE, String.format(Locale.ROOT, "%s/{%s}", BASE_ASYNC_QUERY_ACTION_URL, "queryId")));
+  }
+
+  @Override
+  protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient nodeClient)
+      throws IOException {
+    if (!dataSourcesEnabled()) {
+      return dataSourcesDisabledError(restRequest);
+    }
+    switch (restRequest.method()) {
+      case POST:
+        return executePostRequest(restRequest, nodeClient);
+      case GET:
+        return executeGetAsyncQueryResultRequest(restRequest, nodeClient);
+      case DELETE:
+        return executeDeleteRequest(restRequest, nodeClient);
+      default:
+        return restChannel ->
+            restChannel.sendResponse(
+                new BytesRestResponse(
+                    RestStatus.METHOD_NOT_ALLOWED, String.valueOf(restRequest.method())));
+    }
+  }
+
+  private RestChannelConsumer executePostRequest(RestRequest restRequest, NodeClient nodeClient) {
+    return restChannel -> {
+      try {
+        MetricUtils.incrementNumericalMetric(MetricName.ASYNC_QUERY_CREATE_API_REQUEST_COUNT);
+        CreateAsyncQueryRequest submitJobRequest =
+            CreateAsyncQueryRequestConverter.fromXContentParser(restRequest.contentParser());
+        Scheduler.schedule(
+            nodeClient,
+            () ->
+                nodeClient.execute(
+                    TransportCreateAsyncQueryRequestAction.ACTION_TYPE,
+                    new CreateAsyncQueryActionRequest(submitJobRequest),
+                    new ActionListener<>() {
+                      @Override
+                      public void onResponse(
+                          CreateAsyncQueryActionResponse createAsyncQueryActionResponse) {
+                        restChannel.sendResponse(
+                            new BytesRestResponse(
+                                RestStatus.CREATED,
+                                "application/json; charset=UTF-8",
+                                createAsyncQueryActionResponse.getResult()));
+                      }
+
+                      @Override
+                      public void onFailure(Exception e) {
+                        handleException(e, restChannel, restRequest.method());
+                      }
+                    }));
+      } catch (Exception e) {
+        handleException(e, restChannel, restRequest.method());
+      }
+    };
+  }
+
+  private RestChannelConsumer executeGetAsyncQueryResultRequest(
+      RestRequest restRequest, NodeClient nodeClient) {
+    MetricUtils.incrementNumericalMetric(MetricName.ASYNC_QUERY_GET_API_REQUEST_COUNT);
+    String queryId = restRequest.param("queryId");
+    return restChannel ->
+        Scheduler.schedule(
+            nodeClient,
+            () ->
+                nodeClient.execute(
+                    TransportGetAsyncQueryResultAction.ACTION_TYPE,
+                    new GetAsyncQueryResultActionRequest(queryId),
+                    new ActionListener<>() {
+                      @Override
+                      public void onResponse(
+                          GetAsyncQueryResultActionResponse getAsyncQueryResultActionResponse) {
+                        restChannel.sendResponse(
+                            new BytesRestResponse(
+                                RestStatus.OK,
+                                "application/json; charset=UTF-8",
+                                getAsyncQueryResultActionResponse.getResult()));
+                      }
+
+                      @Override
+                      public void onFailure(Exception e) {
+                        handleException(e, restChannel, restRequest.method());
+                      }
+                    }));
+  }
+
+  private void handleException(
+      Exception e, RestChannel restChannel, RestRequest.Method requestMethod) {
+    if (e instanceof OpenSearchException) {
+      OpenSearchException exception = (OpenSearchException) e;
+      reportError(restChannel, exception, exception.status());
+      addCustomerErrorMetric(requestMethod);
+    } else if (e instanceof ConcurrencyLimitExceededException) {
+      LOG.error("Too many request", e);
+      reportError(restChannel, e, TOO_MANY_REQUESTS);
+      addCustomerErrorMetric(requestMethod);
+    } else {
+      LOG.error("Error happened during request handling", e);
+      if (isClientError(e)) {
+        reportError(restChannel, e, BAD_REQUEST);
+        addCustomerErrorMetric(requestMethod);
+      } else {
+        reportError(restChannel, e, INTERNAL_SERVER_ERROR);
+        addSystemErrorMetric(requestMethod);
+      }
+    }
+  }
+
+  private RestChannelConsumer executeDeleteRequest(RestRequest restRequest, NodeClient nodeClient) {
+    MetricUtils.incrementNumericalMetric(MetricName.ASYNC_QUERY_CANCEL_API_REQUEST_COUNT);
+    String queryId = restRequest.param("queryId");
+    return restChannel ->
+        Scheduler.schedule(
+            nodeClient,
+            () ->
+                nodeClient.execute(
+                    TransportCancelAsyncQueryRequestAction.ACTION_TYPE,
+                    new CancelAsyncQueryActionRequest(queryId),
+                    new ActionListener<>() {
+                      @Override
+                      public void onResponse(
+                          CancelAsyncQueryActionResponse cancelAsyncQueryActionResponse) {
+                        restChannel.sendResponse(
+                            new BytesRestResponse(
+                                RestStatus.NO_CONTENT,
+                                "application/json; charset=UTF-8",
+                                cancelAsyncQueryActionResponse.getResult()));
+                      }
+
+                      @Override
+                      public void onFailure(Exception e) {
+                        handleException(e, restChannel, restRequest.method());
+                      }
+                    }));
+  }
+
+  private void reportError(final RestChannel channel, final Exception e, final RestStatus status) {
+    channel.sendResponse(
+        new BytesRestResponse(status, new ErrorMessage(e, status.getStatus()).toString()));
+  }
+
+  private static boolean isClientError(Exception e) {
+    return e instanceof IllegalArgumentException
+        || e instanceof IllegalStateException
+        || e instanceof DataSourceClientException
+        || e instanceof AsyncQueryNotFoundException
+        || e instanceof IllegalAccessException;
+  }
+
+  private void addSystemErrorMetric(RestRequest.Method requestMethod) {
+    switch (requestMethod) {
+      case POST:
+        MetricUtils.incrementNumericalMetric(
+            MetricName.ASYNC_QUERY_CREATE_API_FAILED_REQ_COUNT_SYS);
+        break;
+      case GET:
+        MetricUtils.incrementNumericalMetric(MetricName.ASYNC_QUERY_GET_API_FAILED_REQ_COUNT_SYS);
+        break;
+      case DELETE:
+        MetricUtils.incrementNumericalMetric(
+            MetricName.ASYNC_QUERY_CANCEL_API_FAILED_REQ_COUNT_SYS);
+        break;
+    }
+  }
+
+  private void addCustomerErrorMetric(RestRequest.Method requestMethod) {
+    switch (requestMethod) {
+      case POST:
+        MetricUtils.incrementNumericalMetric(
+            MetricName.ASYNC_QUERY_CREATE_API_FAILED_REQ_COUNT_CUS);
+        break;
+      case GET:
+        MetricUtils.incrementNumericalMetric(MetricName.ASYNC_QUERY_GET_API_FAILED_REQ_COUNT_CUS);
+        break;
+      case DELETE:
+        MetricUtils.incrementNumericalMetric(
+            MetricName.ASYNC_QUERY_CANCEL_API_FAILED_REQ_COUNT_CUS);
+        break;
+    }
+  }
+
+  private boolean dataSourcesEnabled() {
+    return settings.getSettingValue(Settings.Key.DATASOURCES_ENABLED);
+  }
+
+  private RestChannelConsumer dataSourcesDisabledError(RestRequest request) {
+
+    RestRequestUtil.consumeAllRequestParameters(request);
+
+    return channel -> {
+      reportError(
+          channel,
+          new IllegalAccessException(
+              String.format("%s setting is false", Settings.Key.DATASOURCES_ENABLED.getKeyValue())),
+          BAD_REQUEST);
+    };
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQueryScheduler.java b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQueryScheduler.java
new file mode 100644
index 0000000000..59bad14320
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQueryScheduler.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.scheduler;
+
+import static org.opensearch.core.xcontent.ToXContent.EMPTY_PARAMS;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Strings;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.action.DocWriteRequest;
+import org.opensearch.action.DocWriteResponse;
+import org.opensearch.action.admin.indices.create.CreateIndexRequest;
+import org.opensearch.action.admin.indices.create.CreateIndexResponse;
+import org.opensearch.action.delete.DeleteRequest;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.index.IndexRequest;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.support.WriteRequest;
+import org.opensearch.action.update.UpdateRequest;
+import org.opensearch.action.update.UpdateResponse;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContent;
+import org.opensearch.index.engine.DocumentMissingException;
+import org.opensearch.index.engine.VersionConflictEngineException;
+import org.opensearch.jobscheduler.spi.ScheduledJobRunner;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.scheduler.job.ScheduledAsyncQueryJobRunner;
+import org.opensearch.sql.spark.scheduler.model.AsyncQuerySchedulerRequest;
+import org.opensearch.sql.spark.scheduler.model.ScheduledAsyncQueryJobRequest;
+
+/** Scheduler class for managing asynchronous query jobs. */
+@RequiredArgsConstructor
+public class OpenSearchAsyncQueryScheduler implements AsyncQueryScheduler {
+  public static final String SCHEDULER_INDEX_NAME = ".async-query-scheduler";
+  public static final String SCHEDULER_PLUGIN_JOB_TYPE = "async-query-scheduler";
+  private static final String SCHEDULER_INDEX_MAPPING_FILE_NAME =
+      "async-query-scheduler-index-mapping.yml";
+  private static final String SCHEDULER_INDEX_SETTINGS_FILE_NAME =
+      "async-query-scheduler-index-settings.yml";
+  private static final Logger LOG = LogManager.getLogger();
+
+  private final Client client;
+  private final ClusterService clusterService;
+
+  @Override
+  /** Schedules a new job by indexing it into the job index. */
+  public void scheduleJob(
+      AsyncQuerySchedulerRequest asyncQuerySchedulerRequest,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.fromAsyncQuerySchedulerRequest(asyncQuerySchedulerRequest);
+    if (!this.clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)) {
+      createAsyncQuerySchedulerIndex();
+    }
+    IndexRequest indexRequest = new IndexRequest(SCHEDULER_INDEX_NAME);
+    indexRequest.id(request.getName());
+    indexRequest.opType(DocWriteRequest.OpType.CREATE);
+    indexRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
+    IndexResponse indexResponse;
+    try {
+      indexRequest.source(request.toXContent(JsonXContent.contentBuilder(), EMPTY_PARAMS));
+      ActionFuture<IndexResponse> indexResponseActionFuture = client.index(indexRequest);
+      indexResponse = indexResponseActionFuture.actionGet();
+    } catch (VersionConflictEngineException exception) {
+      throw new IllegalArgumentException("A job already exists with name: " + request.getName());
+    } catch (Throwable e) {
+      LOG.error("Failed to schedule job : {}", request.getName(), e);
+      throw new RuntimeException(e);
+    }
+
+    if (indexResponse.getResult().equals(DocWriteResponse.Result.CREATED)) {
+      LOG.debug("Job : {}  successfully created", request.getName());
+    } else {
+      throw new RuntimeException(
+          "Schedule job failed with result : " + indexResponse.getResult().getLowercase());
+    }
+  }
+
+  /** Unschedules a job by marking it as disabled and updating its last update time. */
+  @Override
+  public void unscheduleJob(String jobId, AsyncQueryRequestContext asyncQueryRequestContext) {
+    if (Strings.isNullOrEmpty(jobId)) {
+      throw new IllegalArgumentException("JobId cannot be null or empty");
+    }
+    try {
+      AsyncQuerySchedulerRequest request =
+          ScheduledAsyncQueryJobRequest.builder()
+              .jobId(jobId)
+              .enabled(false)
+              .lastUpdateTime(Instant.now())
+              .build();
+      updateJob(request, asyncQueryRequestContext);
+      LOG.info("Unscheduled job for jobId: {}", jobId);
+    } catch (IllegalStateException | DocumentMissingException e) {
+      LOG.error("Failed to unschedule job: {}", jobId, e);
+    }
+  }
+
+  /** Updates an existing job with new parameters. */
+  @Override
+  @SneakyThrows
+  public void updateJob(
+      AsyncQuerySchedulerRequest asyncQuerySchedulerRequest,
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.fromAsyncQuerySchedulerRequest(asyncQuerySchedulerRequest);
+    assertIndexExists();
+    UpdateRequest updateRequest = new UpdateRequest(SCHEDULER_INDEX_NAME, request.getName());
+    updateRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
+    updateRequest.doc(request.toXContent(JsonXContent.contentBuilder(), EMPTY_PARAMS));
+    UpdateResponse updateResponse;
+    try {
+      ActionFuture<UpdateResponse> updateResponseActionFuture = client.update(updateRequest);
+      updateResponse = updateResponseActionFuture.actionGet();
+    } catch (DocumentMissingException exception) {
+      throw new IllegalArgumentException("Job: " + request.getName() + " doesn't exist");
+    } catch (Throwable e) {
+      LOG.error("Failed to update job : {}", request.getName(), e);
+      throw new RuntimeException(e);
+    }
+
+    if (updateResponse.getResult().equals(DocWriteResponse.Result.UPDATED)
+        || updateResponse.getResult().equals(DocWriteResponse.Result.NOOP)) {
+      LOG.debug("Job : {} successfully updated", request.getName());
+    } else {
+      throw new RuntimeException(
+          "Update job failed with result : " + updateResponse.getResult().getLowercase());
+    }
+  }
+
+  /** Removes a job by deleting its document from the index. */
+  @Override
+  public void removeJob(String jobId, AsyncQueryRequestContext asyncQueryRequestContext) {
+    assertIndexExists();
+    if (Strings.isNullOrEmpty(jobId)) {
+      throw new IllegalArgumentException("JobId cannot be null or empty");
+    }
+    DeleteRequest deleteRequest = new DeleteRequest(SCHEDULER_INDEX_NAME, jobId);
+    deleteRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
+    ActionFuture<DeleteResponse> deleteResponseActionFuture = client.delete(deleteRequest);
+    DeleteResponse deleteResponse = deleteResponseActionFuture.actionGet();
+
+    if (deleteResponse.getResult().equals(DocWriteResponse.Result.DELETED)) {
+      LOG.debug("Job : {} successfully deleted", jobId);
+    } else if (deleteResponse.getResult().equals(DocWriteResponse.Result.NOT_FOUND)) {
+      throw new IllegalArgumentException("Job : " + jobId + " doesn't exist");
+    } else {
+      throw new RuntimeException(
+          "Remove job failed with result : " + deleteResponse.getResult().getLowercase());
+    }
+  }
+
+  /** Creates the async query scheduler index with specified mappings and settings. */
+  @VisibleForTesting
+  void createAsyncQuerySchedulerIndex() {
+    try {
+      InputStream mappingFileStream =
+          OpenSearchAsyncQueryScheduler.class
+              .getClassLoader()
+              .getResourceAsStream(SCHEDULER_INDEX_MAPPING_FILE_NAME);
+      InputStream settingsFileStream =
+          OpenSearchAsyncQueryScheduler.class
+              .getClassLoader()
+              .getResourceAsStream(SCHEDULER_INDEX_SETTINGS_FILE_NAME);
+      CreateIndexRequest createIndexRequest = new CreateIndexRequest(SCHEDULER_INDEX_NAME);
+      createIndexRequest.mapping(
+          IOUtils.toString(mappingFileStream, StandardCharsets.UTF_8), XContentType.YAML);
+      createIndexRequest.settings(
+          IOUtils.toString(settingsFileStream, StandardCharsets.UTF_8), XContentType.YAML);
+      ActionFuture<CreateIndexResponse> createIndexResponseActionFuture =
+          client.admin().indices().create(createIndexRequest);
+      CreateIndexResponse createIndexResponse = createIndexResponseActionFuture.actionGet();
+
+      if (createIndexResponse.isAcknowledged()) {
+        LOG.debug("Index: {} creation Acknowledged", SCHEDULER_INDEX_NAME);
+      } else {
+        throw new RuntimeException("Index creation is not acknowledged.");
+      }
+    } catch (Throwable e) {
+      LOG.error("Error creating index: {}", SCHEDULER_INDEX_NAME, e);
+      throw new RuntimeException(
+          "Internal server error while creating "
+              + SCHEDULER_INDEX_NAME
+              + " index: "
+              + e.getMessage(),
+          e);
+    }
+  }
+
+  private void assertIndexExists() {
+    if (!this.clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)) {
+      throw new IllegalStateException("Job index does not exist.");
+    }
+  }
+
+  /** Returns the job runner instance for the scheduler. */
+  public static ScheduledJobRunner getJobRunner() {
+    return ScheduledAsyncQueryJobRunner.getJobRunnerInstance();
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunner.java b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunner.java
new file mode 100644
index 0000000000..3652acf295
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunner.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.scheduler.job;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.jobscheduler.spi.JobExecutionContext;
+import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
+import org.opensearch.jobscheduler.spi.ScheduledJobRunner;
+import org.opensearch.plugins.Plugin;
+import org.opensearch.sql.legacy.executor.AsyncRestExecutor;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorService;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse;
+import org.opensearch.sql.spark.scheduler.model.ScheduledAsyncQueryJobRequest;
+import org.opensearch.threadpool.ThreadPool;
+
+/**
+ * The job runner class for scheduling async query.
+ *
+ * <p>The job runner should be a singleton class if it uses OpenSearch client or other objects
+ * passed from OpenSearch. Because when registering the job runner to JobScheduler plugin,
+ * OpenSearch has not invoked plugins' createComponents() method. That is saying the plugin is not
+ * completely initialized, and the OpenSearch {@link org.opensearch.client.Client}, {@link
+ * ClusterService} and other objects are not available to plugin and this job runner.
+ *
+ * <p>So we have to move this job runner initialization to {@link Plugin} createComponents() method,
+ * and using singleton job runner to ensure we register a usable job runner instance to JobScheduler
+ * plugin.
+ */
+public class ScheduledAsyncQueryJobRunner implements ScheduledJobRunner {
+  // Share SQL plugin thread pool
+  private static final String ASYNC_QUERY_THREAD_POOL_NAME =
+      AsyncRestExecutor.SQL_WORKER_THREAD_POOL_NAME;
+  private static final Logger LOGGER = LogManager.getLogger(ScheduledAsyncQueryJobRunner.class);
+
+  private static ScheduledAsyncQueryJobRunner INSTANCE = new ScheduledAsyncQueryJobRunner();
+
+  public static ScheduledAsyncQueryJobRunner getJobRunnerInstance() {
+    return INSTANCE;
+  }
+
+  private ClusterService clusterService;
+  private ThreadPool threadPool;
+  private Client client;
+  private AsyncQueryExecutorService asyncQueryExecutorService;
+
+  private ScheduledAsyncQueryJobRunner() {
+    // Singleton class, use getJobRunnerInstance method instead of constructor
+  }
+
+  /** Loads job resources, setting up required services and job runner instance. */
+  public void loadJobResource(
+      Client client,
+      ClusterService clusterService,
+      ThreadPool threadPool,
+      AsyncQueryExecutorService asyncQueryExecutorService) {
+    this.client = client;
+    this.clusterService = clusterService;
+    this.threadPool = threadPool;
+    this.asyncQueryExecutorService = asyncQueryExecutorService;
+  }
+
+  @Override
+  public void runJob(ScheduledJobParameter jobParameter, JobExecutionContext context) {
+    // Parser will convert jobParameter to ScheduledAsyncQueryJobRequest
+    if (!(jobParameter instanceof ScheduledAsyncQueryJobRequest)) {
+      throw new IllegalStateException(
+          "Job parameter is not instance of ScheduledAsyncQueryJobRequest, type: "
+              + jobParameter.getClass().getCanonicalName());
+    }
+
+    if (this.clusterService == null) {
+      throw new IllegalStateException("ClusterService is not initialized.");
+    }
+
+    if (this.threadPool == null) {
+      throw new IllegalStateException("ThreadPool is not initialized.");
+    }
+
+    if (this.client == null) {
+      throw new IllegalStateException("Client is not initialized.");
+    }
+
+    if (this.asyncQueryExecutorService == null) {
+      throw new IllegalStateException("AsyncQueryExecutorService is not initialized.");
+    }
+
+    Runnable runnable =
+        () -> {
+          try {
+            doRefresh((ScheduledAsyncQueryJobRequest) jobParameter);
+          } catch (Throwable throwable) {
+            LOGGER.error(throwable);
+          }
+        };
+    threadPool.executor(ASYNC_QUERY_THREAD_POOL_NAME).submit(runnable);
+  }
+
+  void doRefresh(ScheduledAsyncQueryJobRequest request) {
+    LOGGER.info("Scheduled refresh index job on job: " + request.getName());
+    CreateAsyncQueryRequest createAsyncQueryRequest =
+        new CreateAsyncQueryRequest(
+            request.getScheduledQuery(), request.getDataSource(), request.getQueryLang());
+    CreateAsyncQueryResponse createAsyncQueryResponse =
+        asyncQueryExecutorService.createAsyncQuery(
+            createAsyncQueryRequest, new NullAsyncQueryRequestContext());
+    LOGGER.info("Created async query with queryId: " + createAsyncQueryResponse.getQueryId());
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/scheduler/model/ScheduledAsyncQueryJobRequest.java b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/model/ScheduledAsyncQueryJobRequest.java
new file mode 100644
index 0000000000..48aa52a3ce
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/model/ScheduledAsyncQueryJobRequest.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.scheduler.model;
+
+import java.io.IOException;
+import java.time.Instant;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
+import org.opensearch.jobscheduler.spi.schedule.Schedule;
+import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.spark.scheduler.parser.IntervalScheduleParser;
+
+/** Represents a job request to refresh index. */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ScheduledAsyncQueryJobRequest extends AsyncQuerySchedulerRequest
+    implements ScheduledJobParameter {
+  // Constant fields for JSON serialization
+  public static final String ACCOUNT_ID_FIELD = "accountId";
+  public static final String JOB_ID_FIELD = "jobId";
+  public static final String DATA_SOURCE_NAME_FIELD = "dataSource";
+  public static final String SCHEDULED_QUERY_FIELD = "scheduledQuery";
+  public static final String QUERY_LANG_FIELD = "queryLang";
+  public static final String LAST_UPDATE_TIME_FIELD = "lastUpdateTime";
+  public static final String SCHEDULE_FIELD = "schedule";
+  public static final String ENABLED_TIME_FIELD = "enabledTime";
+  public static final String LOCK_DURATION_SECONDS = "lockDurationSeconds";
+  public static final String JITTER = "jitter";
+  public static final String ENABLED_FIELD = "enabled";
+  private final Schedule schedule;
+
+  @Builder(builderMethodName = "scheduledAsyncQueryJobRequestBuilder")
+  public ScheduledAsyncQueryJobRequest(
+      String accountId,
+      String jobId,
+      String dataSource,
+      String scheduledQuery,
+      LangType queryLang,
+      Schedule schedule, // Use the OpenSearch Schedule type
+      boolean enabled,
+      Instant lastUpdateTime,
+      Instant enabledTime,
+      Long lockDurationSeconds,
+      Double jitter) {
+    super(
+        accountId,
+        jobId,
+        dataSource,
+        scheduledQuery,
+        queryLang,
+        schedule,
+        enabled,
+        lastUpdateTime,
+        enabledTime,
+        lockDurationSeconds,
+        jitter);
+    this.schedule = schedule;
+  }
+
+  @Override
+  public String getName() {
+    return getJobId();
+  }
+
+  @Override
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  @Override
+  public Instant getLastUpdateTime() {
+    return lastUpdateTime;
+  }
+
+  @Override
+  public Instant getEnabledTime() {
+    return enabledTime;
+  }
+
+  @Override
+  public Schedule getSchedule() {
+    return schedule;
+  }
+
+  @Override
+  public Long getLockDurationSeconds() {
+    return lockDurationSeconds;
+  }
+
+  @Override
+  public Double getJitter() {
+    return jitter;
+  }
+
+  @Override
+  public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params)
+      throws IOException {
+    builder.startObject();
+    if (getAccountId() != null) {
+      builder.field(ACCOUNT_ID_FIELD, getAccountId());
+    }
+    builder.field(JOB_ID_FIELD, getJobId()).field(ENABLED_FIELD, isEnabled());
+    if (getDataSource() != null) {
+      builder.field(DATA_SOURCE_NAME_FIELD, getDataSource());
+    }
+    if (getScheduledQuery() != null) {
+      builder.field(SCHEDULED_QUERY_FIELD, getScheduledQuery());
+    }
+    if (getQueryLang() != null) {
+      builder.field(QUERY_LANG_FIELD, getQueryLang());
+    }
+    if (getSchedule() != null) {
+      builder.field(SCHEDULE_FIELD, getSchedule());
+    }
+    if (getEnabledTime() != null) {
+      builder.field(ENABLED_TIME_FIELD, getEnabledTime().toEpochMilli());
+    }
+    builder.field(LAST_UPDATE_TIME_FIELD, getLastUpdateTime().toEpochMilli());
+    if (this.lockDurationSeconds != null) {
+      builder.field(LOCK_DURATION_SECONDS, this.lockDurationSeconds);
+    }
+    if (this.jitter != null) {
+      builder.field(JITTER, this.jitter);
+    }
+    builder.endObject();
+    return builder;
+  }
+
+  public static ScheduledAsyncQueryJobRequest fromAsyncQuerySchedulerRequest(
+      AsyncQuerySchedulerRequest request) {
+    Instant updateTime =
+        request.getLastUpdateTime() != null ? request.getLastUpdateTime() : Instant.now();
+    return ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+        .accountId(request.getAccountId())
+        .jobId(request.getJobId())
+        .dataSource(request.getDataSource())
+        .scheduledQuery(request.getScheduledQuery())
+        .queryLang(request.getQueryLang())
+        .enabled(request.isEnabled())
+        .lastUpdateTime(updateTime)
+        .enabledTime(request.getEnabledTime())
+        .lockDurationSeconds(request.getLockDurationSeconds())
+        .jitter(request.getJitter())
+        .schedule(IntervalScheduleParser.parse(request.getSchedule(), updateTime))
+        .build();
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/scheduler/parser/IntervalScheduleParser.java b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/parser/IntervalScheduleParser.java
new file mode 100644
index 0000000000..47e652c570
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/parser/IntervalScheduleParser.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.scheduler.parser;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule;
+import org.opensearch.jobscheduler.spi.schedule.Schedule;
+
+/** Parse string raw schedule into job scheduler IntervalSchedule */
+public class IntervalScheduleParser {
+  private static final Pattern DURATION_PATTERN =
+      Pattern.compile(
+          "^(\\d+)\\s*(years?|months?|weeks?|days?|hours?|minutes?|minute|mins?|seconds?|secs?|milliseconds?|millis?|microseconds?|microsecond|micros?|micros|nanoseconds?|nanos?)$",
+          Pattern.CASE_INSENSITIVE);
+
+  public static Schedule parse(Object schedule, Instant startTime) {
+    if (schedule == null) {
+      return null;
+    }
+
+    if (schedule instanceof Schedule) {
+      return (Schedule) schedule;
+    }
+
+    if (!(schedule instanceof String)) {
+      throw new IllegalArgumentException("Schedule must be a String object for parsing.");
+    }
+
+    String intervalStr = ((String) schedule).trim().toLowerCase();
+
+    Matcher matcher = DURATION_PATTERN.matcher(intervalStr);
+    if (!matcher.matches()) {
+      throw new IllegalArgumentException("Invalid interval format: " + intervalStr);
+    }
+
+    long value = Long.parseLong(matcher.group(1));
+    String unitStr = matcher.group(2).toLowerCase();
+
+    // Convert to a supported unit or directly return an IntervalSchedule
+    long intervalInMinutes = convertToSupportedUnit(value, unitStr);
+
+    return new IntervalSchedule(startTime, (int) intervalInMinutes, ChronoUnit.MINUTES);
+  }
+
+  @VisibleForTesting
+  protected static long convertToSupportedUnit(long value, String unitStr) {
+    switch (unitStr) {
+      case "years":
+      case "year":
+        throw new IllegalArgumentException("Years cannot be converted to minutes accurately.");
+      case "months":
+      case "month":
+        throw new IllegalArgumentException("Months cannot be converted to minutes accurately.");
+      case "weeks":
+      case "week":
+        return value * 7 * 24 * 60; // Convert weeks to minutes
+      case "days":
+      case "day":
+        return value * 24 * 60; // Convert days to minutes
+      case "hours":
+      case "hour":
+        return value * 60; // Convert hours to minutes
+      case "minutes":
+      case "minute":
+      case "mins":
+      case "min":
+        return value; // Already in minutes
+      case "seconds":
+      case "second":
+      case "secs":
+      case "sec":
+        return value / 60; // Convert seconds to minutes
+      case "milliseconds":
+      case "millisecond":
+      case "millis":
+      case "milli":
+        return value / (60 * 1000); // Convert milliseconds to minutes
+      case "microseconds":
+      case "microsecond":
+      case "micros":
+      case "micro":
+        return value / (60 * 1000 * 1000); // Convert microseconds to minutes
+      case "nanoseconds":
+      case "nanosecond":
+      case "nanos":
+      case "nano":
+        return value / (60 * 1000 * 1000 * 1000L); // Convert nanoseconds to minutes
+      default:
+        throw new IllegalArgumentException("Unsupported time unit: " + unitStr);
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/scheduler/parser/OpenSearchScheduleQueryJobRequestParser.java b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/parser/OpenSearchScheduleQueryJobRequestParser.java
new file mode 100644
index 0000000000..a824797066
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/parser/OpenSearchScheduleQueryJobRequestParser.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.scheduler.parser;
+
+import java.io.IOException;
+import java.time.Instant;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParserUtils;
+import org.opensearch.jobscheduler.spi.ScheduledJobParser;
+import org.opensearch.jobscheduler.spi.schedule.ScheduleParser;
+import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.spark.scheduler.model.ScheduledAsyncQueryJobRequest;
+
+public class OpenSearchScheduleQueryJobRequestParser {
+
+  private static Instant parseInstantValue(XContentParser parser) throws IOException {
+    if (XContentParser.Token.VALUE_NULL.equals(parser.currentToken())) {
+      return null;
+    }
+    if (parser.currentToken().isValue()) {
+      return Instant.ofEpochMilli(parser.longValue());
+    }
+    XContentParserUtils.throwUnknownToken(parser.currentToken(), parser.getTokenLocation());
+    return null;
+  }
+
+  public static ScheduledJobParser getJobParser() {
+    return (parser, id, jobDocVersion) -> {
+      ScheduledAsyncQueryJobRequest.ScheduledAsyncQueryJobRequestBuilder builder =
+          ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder();
+      XContentParserUtils.ensureExpectedToken(
+          XContentParser.Token.START_OBJECT, parser.nextToken(), parser);
+
+      while (!parser.nextToken().equals(XContentParser.Token.END_OBJECT)) {
+        String fieldName = parser.currentName();
+        parser.nextToken();
+        switch (fieldName) {
+          case ScheduledAsyncQueryJobRequest.ACCOUNT_ID_FIELD:
+            builder.accountId(parser.text());
+            break;
+          case ScheduledAsyncQueryJobRequest.JOB_ID_FIELD:
+            builder.jobId(parser.text());
+            break;
+          case ScheduledAsyncQueryJobRequest.DATA_SOURCE_NAME_FIELD:
+            builder.dataSource(parser.text());
+            break;
+          case ScheduledAsyncQueryJobRequest.SCHEDULED_QUERY_FIELD:
+            builder.scheduledQuery(parser.text());
+            break;
+          case ScheduledAsyncQueryJobRequest.QUERY_LANG_FIELD:
+            builder.queryLang(LangType.fromString(parser.text()));
+            break;
+          case ScheduledAsyncQueryJobRequest.ENABLED_FIELD:
+            builder.enabled(parser.booleanValue());
+            break;
+          case ScheduledAsyncQueryJobRequest.ENABLED_TIME_FIELD:
+            builder.enabledTime(parseInstantValue(parser));
+            break;
+          case ScheduledAsyncQueryJobRequest.LAST_UPDATE_TIME_FIELD:
+            builder.lastUpdateTime(parseInstantValue(parser));
+            break;
+          case ScheduledAsyncQueryJobRequest.SCHEDULE_FIELD:
+            builder.schedule(ScheduleParser.parse(parser));
+            break;
+          case ScheduledAsyncQueryJobRequest.LOCK_DURATION_SECONDS:
+            builder.lockDurationSeconds(parser.longValue());
+            break;
+          case ScheduledAsyncQueryJobRequest.JITTER:
+            builder.jitter(parser.doubleValue());
+            break;
+          default:
+            XContentParserUtils.throwUnknownToken(parser.currentToken(), parser.getTokenLocation());
+        }
+      }
+      return builder.build();
+    };
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/TransportCancelAsyncQueryRequestAction.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/TransportCancelAsyncQueryRequestAction.java
new file mode 100644
index 0000000000..ce80351f70
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/TransportCancelAsyncQueryRequestAction.java
@@ -0,0 +1,55 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.spark.transport;
+
+import org.opensearch.action.ActionType;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorServiceImpl;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.transport.model.CancelAsyncQueryActionRequest;
+import org.opensearch.sql.spark.transport.model.CancelAsyncQueryActionResponse;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+public class TransportCancelAsyncQueryRequestAction
+    extends HandledTransportAction<CancelAsyncQueryActionRequest, CancelAsyncQueryActionResponse> {
+
+  public static final String NAME = "cluster:admin/opensearch/ql/async_query/delete";
+  private final AsyncQueryExecutorServiceImpl asyncQueryExecutorService;
+  public static final ActionType<CancelAsyncQueryActionResponse> ACTION_TYPE =
+      new ActionType<>(NAME, CancelAsyncQueryActionResponse::new);
+
+  @Inject
+  public TransportCancelAsyncQueryRequestAction(
+      TransportService transportService,
+      ActionFilters actionFilters,
+      AsyncQueryExecutorServiceImpl asyncQueryExecutorService) {
+    super(NAME, transportService, actionFilters, CancelAsyncQueryActionRequest::new);
+    this.asyncQueryExecutorService = asyncQueryExecutorService;
+  }
+
+  @Override
+  protected void doExecute(
+      Task task,
+      CancelAsyncQueryActionRequest request,
+      ActionListener<CancelAsyncQueryActionResponse> listener) {
+    try {
+      String jobId =
+          asyncQueryExecutorService.cancelQuery(
+              request.getQueryId(), new NullAsyncQueryRequestContext());
+      listener.onResponse(
+          new CancelAsyncQueryActionResponse(
+              String.format("Deleted async query with id: %s", jobId)));
+    } catch (Exception e) {
+      listener.onFailure(e);
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/TransportCreateAsyncQueryRequestAction.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/TransportCreateAsyncQueryRequestAction.java
new file mode 100644
index 0000000000..bef3b29987
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/TransportCreateAsyncQueryRequestAction.java
@@ -0,0 +1,82 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.spark.transport;
+
+import java.util.Locale;
+import org.opensearch.action.ActionType;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.sql.protocol.response.format.JsonResponseFormatter;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorService;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorServiceImpl;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse;
+import org.opensearch.sql.spark.transport.model.CreateAsyncQueryActionRequest;
+import org.opensearch.sql.spark.transport.model.CreateAsyncQueryActionResponse;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+public class TransportCreateAsyncQueryRequestAction
+    extends HandledTransportAction<CreateAsyncQueryActionRequest, CreateAsyncQueryActionResponse> {
+
+  private final AsyncQueryExecutorService asyncQueryExecutorService;
+  private final OpenSearchSettings pluginSettings;
+
+  public static final String NAME = "cluster:admin/opensearch/ql/async_query/create";
+  public static final ActionType<CreateAsyncQueryActionResponse> ACTION_TYPE =
+      new ActionType<>(NAME, CreateAsyncQueryActionResponse::new);
+
+  @Inject
+  public TransportCreateAsyncQueryRequestAction(
+      TransportService transportService,
+      ActionFilters actionFilters,
+      AsyncQueryExecutorServiceImpl jobManagementService,
+      OpenSearchSettings pluginSettings) {
+    super(NAME, transportService, actionFilters, CreateAsyncQueryActionRequest::new);
+    this.asyncQueryExecutorService = jobManagementService;
+    this.pluginSettings = pluginSettings;
+  }
+
+  @Override
+  protected void doExecute(
+      Task task,
+      CreateAsyncQueryActionRequest request,
+      ActionListener<CreateAsyncQueryActionResponse> listener) {
+    try {
+      if (!(Boolean) pluginSettings.getSettingValue(Settings.Key.ASYNC_QUERY_ENABLED)) {
+        listener.onFailure(
+            new IllegalAccessException(
+                String.format(
+                    Locale.ROOT,
+                    "%s setting is " + "false",
+                    Settings.Key.ASYNC_QUERY_ENABLED.getKeyValue())));
+        return;
+      }
+
+      CreateAsyncQueryRequest createAsyncQueryRequest = request.getCreateAsyncQueryRequest();
+      CreateAsyncQueryResponse createAsyncQueryResponse =
+          asyncQueryExecutorService.createAsyncQuery(
+              createAsyncQueryRequest, new NullAsyncQueryRequestContext());
+      String responseContent =
+          new JsonResponseFormatter<CreateAsyncQueryResponse>(JsonResponseFormatter.Style.PRETTY) {
+            @Override
+            protected Object buildJsonObject(CreateAsyncQueryResponse response) {
+              return response;
+            }
+          }.format(createAsyncQueryResponse);
+      listener.onResponse(new CreateAsyncQueryActionResponse(responseContent));
+    } catch (Exception e) {
+      listener.onFailure(e);
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/TransportGetAsyncQueryResultAction.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/TransportGetAsyncQueryResultAction.java
new file mode 100644
index 0000000000..250837e0cd
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/TransportGetAsyncQueryResultAction.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport;
+
+import org.opensearch.action.ActionType;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.executor.pagination.Cursor;
+import org.opensearch.sql.protocol.response.format.JsonResponseFormatter;
+import org.opensearch.sql.protocol.response.format.ResponseFormatter;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorService;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorServiceImpl;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryExecutionResponse;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.transport.format.AsyncQueryResultResponseFormatter;
+import org.opensearch.sql.spark.transport.model.AsyncQueryResult;
+import org.opensearch.sql.spark.transport.model.GetAsyncQueryResultActionRequest;
+import org.opensearch.sql.spark.transport.model.GetAsyncQueryResultActionResponse;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+public class TransportGetAsyncQueryResultAction
+    extends HandledTransportAction<
+        GetAsyncQueryResultActionRequest, GetAsyncQueryResultActionResponse> {
+
+  private final AsyncQueryExecutorService asyncQueryExecutorService;
+
+  public static final String NAME = "cluster:admin/opensearch/ql/async_query/result";
+  public static final ActionType<GetAsyncQueryResultActionResponse> ACTION_TYPE =
+      new ActionType<>(NAME, GetAsyncQueryResultActionResponse::new);
+
+  @Inject
+  public TransportGetAsyncQueryResultAction(
+      TransportService transportService,
+      ActionFilters actionFilters,
+      AsyncQueryExecutorServiceImpl jobManagementService) {
+    super(NAME, transportService, actionFilters, GetAsyncQueryResultActionRequest::new);
+    this.asyncQueryExecutorService = jobManagementService;
+  }
+
+  @Override
+  protected void doExecute(
+      Task task,
+      GetAsyncQueryResultActionRequest request,
+      ActionListener<GetAsyncQueryResultActionResponse> listener) {
+    try {
+      String jobId = request.getQueryId();
+      AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+          asyncQueryExecutorService.getAsyncQueryResults(jobId, new NullAsyncQueryRequestContext());
+      ResponseFormatter<AsyncQueryResult> formatter =
+          new AsyncQueryResultResponseFormatter(JsonResponseFormatter.Style.PRETTY);
+      String responseContent =
+          formatter.format(
+              new AsyncQueryResult(
+                  asyncQueryExecutionResponse.getStatus(),
+                  asyncQueryExecutionResponse.getSchema(),
+                  asyncQueryExecutionResponse.getResults(),
+                  Cursor.None,
+                  asyncQueryExecutionResponse.getError()));
+      listener.onResponse(new GetAsyncQueryResultActionResponse(responseContent));
+    } catch (Exception e) {
+      listener.onFailure(e);
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModule.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModule.java
new file mode 100644
index 0000000000..db070182a3
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModule.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.config;
+
+import static org.opensearch.sql.spark.execution.statestore.StateStore.ALL_DATASOURCE;
+
+import com.google.common.collect.ImmutableMap;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.inject.AbstractModule;
+import org.opensearch.common.inject.Provides;
+import org.opensearch.common.inject.Singleton;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.legacy.metrics.GaugeMetric;
+import org.opensearch.sql.legacy.metrics.Metrics;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorService;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorServiceImpl;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryJobMetadataStorageService;
+import org.opensearch.sql.spark.asyncquery.OpenSearchAsyncQueryJobMetadataStorageService;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactoryImpl;
+import org.opensearch.sql.spark.config.OpenSearchAsyncQuerySchedulerConfigComposer;
+import org.opensearch.sql.spark.config.OpenSearchExtraParameterComposer;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigClusterSettingLoader;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigSupplier;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigSupplierImpl;
+import org.opensearch.sql.spark.dispatcher.DatasourceEmbeddedQueryIdProvider;
+import org.opensearch.sql.spark.dispatcher.QueryHandlerFactory;
+import org.opensearch.sql.spark.dispatcher.QueryIdProvider;
+import org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher;
+import org.opensearch.sql.spark.execution.session.DatasourceEmbeddedSessionIdProvider;
+import org.opensearch.sql.spark.execution.session.OpenSearchSessionConfigSupplier;
+import org.opensearch.sql.spark.execution.session.SessionConfigSupplier;
+import org.opensearch.sql.spark.execution.session.SessionManager;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchSessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchStatementStorageService;
+import org.opensearch.sql.spark.execution.statestore.SessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.StateStore;
+import org.opensearch.sql.spark.execution.statestore.StatementStorageService;
+import org.opensearch.sql.spark.execution.xcontent.AsyncQueryJobMetadataXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.FlintIndexStateModelXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.SessionModelXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.StatementModelXContentSerializer;
+import org.opensearch.sql.spark.flint.FlintIndexClient;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataServiceImpl;
+import org.opensearch.sql.spark.flint.FlintIndexStateModelService;
+import org.opensearch.sql.spark.flint.IndexDMLResultStorageService;
+import org.opensearch.sql.spark.flint.OpenSearchFlintIndexClient;
+import org.opensearch.sql.spark.flint.OpenSearchFlintIndexStateModelService;
+import org.opensearch.sql.spark.flint.OpenSearchIndexDMLResultStorageService;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
+import org.opensearch.sql.spark.leasemanager.DefaultLeaseManager;
+import org.opensearch.sql.spark.metrics.MetricsService;
+import org.opensearch.sql.spark.metrics.OpenSearchMetricsService;
+import org.opensearch.sql.spark.parameter.S3GlueDataSourceSparkParameterComposer;
+import org.opensearch.sql.spark.parameter.SparkParameterComposerCollection;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilderProvider;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+import org.opensearch.sql.spark.response.OpenSearchJobExecutionResponseReader;
+import org.opensearch.sql.spark.scheduler.AsyncQueryScheduler;
+import org.opensearch.sql.spark.scheduler.OpenSearchAsyncQueryScheduler;
+import org.opensearch.sql.spark.validator.DefaultGrammarElementValidator;
+import org.opensearch.sql.spark.validator.GrammarElementValidatorProvider;
+import org.opensearch.sql.spark.validator.S3GlueGrammarElementValidator;
+import org.opensearch.sql.spark.validator.SQLQueryValidator;
+import org.opensearch.sql.spark.validator.SecurityLakeGrammarElementValidator;
+
+@RequiredArgsConstructor
+public class AsyncExecutorServiceModule extends AbstractModule {
+
+  @Override
+  protected void configure() {}
+
+  @Provides
+  public AsyncQueryExecutorService asyncQueryExecutorService(
+      AsyncQueryJobMetadataStorageService asyncQueryJobMetadataStorageService,
+      SparkQueryDispatcher sparkQueryDispatcher,
+      SparkExecutionEngineConfigSupplier sparkExecutionEngineConfigSupplier) {
+    return new AsyncQueryExecutorServiceImpl(
+        asyncQueryJobMetadataStorageService,
+        sparkQueryDispatcher,
+        sparkExecutionEngineConfigSupplier);
+  }
+
+  @Provides
+  public AsyncQueryJobMetadataStorageService asyncQueryJobMetadataStorageService(
+      StateStore stateStore, AsyncQueryJobMetadataXContentSerializer serializer) {
+    return new OpenSearchAsyncQueryJobMetadataStorageService(stateStore, serializer);
+  }
+
+  @Provides
+  @Singleton
+  public StateStore stateStore(NodeClient client, ClusterService clusterService) {
+    StateStore stateStore = new StateStore(client, clusterService);
+    registerStateStoreMetrics(stateStore);
+    return stateStore;
+  }
+
+  @Provides
+  public SparkQueryDispatcher sparkQueryDispatcher(
+      DataSourceService dataSourceService,
+      SessionManager sessionManager,
+      QueryHandlerFactory queryHandlerFactory,
+      QueryIdProvider queryIdProvider,
+      SQLQueryValidator sqlQueryValidator) {
+    return new SparkQueryDispatcher(
+        dataSourceService, sessionManager, queryHandlerFactory, queryIdProvider, sqlQueryValidator);
+  }
+
+  @Provides
+  public QueryIdProvider queryIdProvider() {
+    return new DatasourceEmbeddedQueryIdProvider();
+  }
+
+  @Provides
+  public QueryHandlerFactory queryhandlerFactory(
+      JobExecutionResponseReader openSearchJobExecutionResponseReader,
+      FlintIndexMetadataServiceImpl flintIndexMetadataReader,
+      SessionManager sessionManager,
+      DefaultLeaseManager defaultLeaseManager,
+      IndexDMLResultStorageService indexDMLResultStorageService,
+      FlintIndexOpFactory flintIndexOpFactory,
+      EMRServerlessClientFactory emrServerlessClientFactory,
+      MetricsService metricsService,
+      SparkSubmitParametersBuilderProvider sparkSubmitParametersBuilderProvider) {
+    return new QueryHandlerFactory(
+        openSearchJobExecutionResponseReader,
+        flintIndexMetadataReader,
+        sessionManager,
+        defaultLeaseManager,
+        indexDMLResultStorageService,
+        flintIndexOpFactory,
+        emrServerlessClientFactory,
+        metricsService,
+        sparkSubmitParametersBuilderProvider);
+  }
+
+  @Provides
+  public FlintIndexOpFactory flintIndexOpFactory(
+      FlintIndexStateModelService flintIndexStateModelService,
+      FlintIndexClient flintIndexClient,
+      FlintIndexMetadataServiceImpl flintIndexMetadataService,
+      EMRServerlessClientFactory emrServerlessClientFactory,
+      AsyncQueryScheduler asyncQueryScheduler) {
+    return new FlintIndexOpFactory(
+        flintIndexStateModelService,
+        flintIndexClient,
+        flintIndexMetadataService,
+        emrServerlessClientFactory,
+        asyncQueryScheduler);
+  }
+
+  @Provides
+  public FlintIndexClient flintIndexClient(NodeClient nodeClient) {
+    return new OpenSearchFlintIndexClient(nodeClient);
+  }
+
+  @Provides
+  public FlintIndexStateModelService flintIndexStateModelService(
+      StateStore stateStore, FlintIndexStateModelXContentSerializer serializer) {
+    return new OpenSearchFlintIndexStateModelService(stateStore, serializer);
+  }
+
+  @Provides
+  public SparkSubmitParametersBuilderProvider sparkSubmitParametersBuilderProvider(
+      Settings settings, SparkExecutionEngineConfigClusterSettingLoader clusterSettingLoader) {
+    SparkParameterComposerCollection collection = new SparkParameterComposerCollection();
+    collection.register(
+        DataSourceType.S3GLUE, new S3GlueDataSourceSparkParameterComposer(clusterSettingLoader));
+    collection.register(
+        DataSourceType.SECURITY_LAKE,
+        new S3GlueDataSourceSparkParameterComposer(clusterSettingLoader));
+    collection.register(new OpenSearchAsyncQuerySchedulerConfigComposer(settings));
+    collection.register(new OpenSearchExtraParameterComposer(clusterSettingLoader));
+    return new SparkSubmitParametersBuilderProvider(collection);
+  }
+
+  @Provides
+  public SQLQueryValidator sqlQueryValidator() {
+    GrammarElementValidatorProvider validatorProvider =
+        new GrammarElementValidatorProvider(
+            ImmutableMap.of(
+                DataSourceType.S3GLUE,
+                new S3GlueGrammarElementValidator(),
+                DataSourceType.SECURITY_LAKE,
+                new SecurityLakeGrammarElementValidator()),
+            new DefaultGrammarElementValidator());
+    return new SQLQueryValidator(validatorProvider);
+  }
+
+  @Provides
+  public IndexDMLResultStorageService indexDMLResultStorageService(
+      DataSourceService dataSourceService, StateStore stateStore) {
+    return new OpenSearchIndexDMLResultStorageService(dataSourceService, stateStore);
+  }
+
+  @Provides
+  public SessionManager sessionManager(
+      SessionStorageService sessionStorageService,
+      StatementStorageService statementStorageService,
+      EMRServerlessClientFactory emrServerlessClientFactory,
+      SessionConfigSupplier sessionConfigSupplier) {
+    return new SessionManager(
+        sessionStorageService,
+        statementStorageService,
+        emrServerlessClientFactory,
+        sessionConfigSupplier,
+        new DatasourceEmbeddedSessionIdProvider());
+  }
+
+  @Provides
+  public SessionStorageService sessionStorageService(
+      StateStore stateStore, SessionModelXContentSerializer serializer) {
+    return new OpenSearchSessionStorageService(stateStore, serializer);
+  }
+
+  @Provides
+  public StatementStorageService statementStorageService(
+      StateStore stateStore, StatementModelXContentSerializer serializer) {
+    return new OpenSearchStatementStorageService(stateStore, serializer);
+  }
+
+  @Provides
+  public DefaultLeaseManager defaultLeaseManager(Settings settings, StateStore stateStore) {
+    return new DefaultLeaseManager(settings, stateStore);
+  }
+
+  @Provides
+  public EMRServerlessClientFactory createEMRServerlessClientFactory(
+      SparkExecutionEngineConfigSupplier sparkExecutionEngineConfigSupplier,
+      MetricsService metricsService) {
+    return new EMRServerlessClientFactoryImpl(sparkExecutionEngineConfigSupplier, metricsService);
+  }
+
+  @Provides
+  public MetricsService metricsService() {
+    return new OpenSearchMetricsService();
+  }
+
+  @Provides
+  public SparkExecutionEngineConfigSupplier sparkExecutionEngineConfigSupplier(
+      Settings settings, SparkExecutionEngineConfigClusterSettingLoader clusterSettingLoader) {
+    return new SparkExecutionEngineConfigSupplierImpl(settings, clusterSettingLoader);
+  }
+
+  @Provides
+  public SparkExecutionEngineConfigClusterSettingLoader
+      sparkExecutionEngineConfigClusterSettingLoader(Settings settings) {
+    return new SparkExecutionEngineConfigClusterSettingLoader(settings);
+  }
+
+  @Provides
+  @Singleton
+  public FlintIndexMetadataServiceImpl flintIndexMetadataReader(NodeClient client) {
+    return new FlintIndexMetadataServiceImpl(client);
+  }
+
+  @Provides
+  public JobExecutionResponseReader jobExecutionResponseReader(NodeClient client) {
+    return new OpenSearchJobExecutionResponseReader(client);
+  }
+
+  @Provides
+  public SessionConfigSupplier sessionConfigSupplier(Settings settings) {
+    return new OpenSearchSessionConfigSupplier(settings);
+  }
+
+  @Provides
+  @Singleton
+  public AsyncQueryScheduler asyncQueryScheduler(NodeClient client, ClusterService clusterService) {
+    OpenSearchAsyncQueryScheduler scheduler =
+        new OpenSearchAsyncQueryScheduler(client, clusterService);
+    return scheduler;
+  }
+
+  private void registerStateStoreMetrics(StateStore stateStore) {
+    GaugeMetric<Long> activeSessionMetric =
+        new GaugeMetric<>(
+            "active_async_query_sessions_count",
+            StateStore.activeSessionsCount(stateStore, ALL_DATASOURCE));
+    GaugeMetric<Long> activeStatementMetric =
+        new GaugeMetric<>(
+            "active_async_query_statements_count",
+            StateStore.activeStatementsCount(stateStore, ALL_DATASOURCE));
+    Metrics.getInstance().registerMetric(activeSessionMetric);
+    Metrics.getInstance().registerMetric(activeStatementMetric);
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/format/AsyncQueryResultResponseFormatter.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/format/AsyncQueryResultResponseFormatter.java
new file mode 100644
index 0000000000..afa6797694
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/format/AsyncQueryResultResponseFormatter.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.format;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.core.common.Strings;
+import org.opensearch.sql.protocol.response.QueryResult;
+import org.opensearch.sql.protocol.response.format.JsonResponseFormatter;
+import org.opensearch.sql.spark.transport.model.AsyncQueryResult;
+
+/**
+ * JSON response format with schema header and data rows. For example,
+ *
+ * <pre>
+ *  {
+ *      "schema": [
+ *          {
+ *              "name": "name",
+ *              "type": "string"
+ *          }
+ *      ],
+ *      "datarows": [
+ *          ["John"],
+ *          ["Smith"]
+ *      ],
+ *      "total": 2,
+ *      "size": 2
+ *  }
+ * </pre>
+ */
+public class AsyncQueryResultResponseFormatter extends JsonResponseFormatter<AsyncQueryResult> {
+
+  public AsyncQueryResultResponseFormatter(Style style) {
+    super(style);
+  }
+
+  @Override
+  public Object buildJsonObject(AsyncQueryResult response) {
+    JsonResponse.JsonResponseBuilder json = JsonResponse.builder();
+    if (response.getStatus().equalsIgnoreCase("success")) {
+      json.total(response.size()).size(response.size());
+      json.schema(
+          response.columnNameTypes().entrySet().stream()
+              .map((entry) -> new Column(entry.getKey(), entry.getValue()))
+              .collect(Collectors.toList()));
+      json.datarows(fetchDataRows(response));
+    }
+    json.status(response.getStatus());
+    if (!Strings.isEmpty(response.getError())) {
+      json.error(response.getError());
+    }
+
+    return json.build();
+  }
+
+  private Object[][] fetchDataRows(QueryResult response) {
+    Object[][] rows = new Object[response.size()][];
+    int i = 0;
+    for (Object[] values : response) {
+      rows[i++] = values;
+    }
+    return rows;
+  }
+
+  /** org.json requires these inner data classes be public (and static) */
+  @Builder
+  @Getter
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  public static class JsonResponse {
+
+    private final String status;
+
+    private final List<Column> schema;
+
+    private final Object[][] datarows;
+
+    private Integer total;
+    private Integer size;
+    private final String error;
+  }
+
+  @RequiredArgsConstructor
+  @Getter
+  public static class Column {
+    private final String name;
+    private final String type;
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/format/CreateAsyncQueryRequestConverter.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/format/CreateAsyncQueryRequestConverter.java
new file mode 100644
index 0000000000..c22c2da24d
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/format/CreateAsyncQueryRequestConverter.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.format;
+
+import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
+
+import lombok.experimental.UtilityClass;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+@UtilityClass
+public class CreateAsyncQueryRequestConverter {
+  public static CreateAsyncQueryRequest fromXContentParser(XContentParser parser) {
+    String query = null;
+    LangType lang = null;
+    String datasource = null;
+    String sessionId = null;
+    try {
+      ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser);
+      while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
+        String fieldName = parser.currentName();
+        parser.nextToken();
+        if (fieldName.equals("query")) {
+          query = parser.textOrNull();
+        } else if (fieldName.equals("lang")) {
+          String langString = parser.textOrNull();
+          lang = LangType.fromString(langString);
+        } else if (fieldName.equals("datasource")) {
+          datasource = parser.textOrNull();
+        } else if (fieldName.equals("sessionId")) {
+          sessionId = parser.textOrNull();
+        } else {
+          throw new IllegalArgumentException("Unknown field: " + fieldName);
+        }
+      }
+      return new CreateAsyncQueryRequest(query, datasource, lang, sessionId);
+    } catch (Exception e) {
+      throw new IllegalArgumentException(
+          String.format("Error while parsing the request body: %s", e.getMessage()));
+    }
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/model/AsyncQueryResult.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/AsyncQueryResult.java
new file mode 100644
index 0000000000..712cebf7e1
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/AsyncQueryResult.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.model;
+
+import java.util.Collection;
+import lombok.Getter;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.executor.pagination.Cursor;
+import org.opensearch.sql.protocol.response.QueryResult;
+
+/** AsyncQueryResult for async query APIs. */
+public class AsyncQueryResult extends QueryResult {
+
+  @Getter private final String status;
+  @Getter private final String error;
+
+  public AsyncQueryResult(
+      String status,
+      ExecutionEngine.Schema schema,
+      Collection<ExprValue> exprValues,
+      Cursor cursor,
+      String error) {
+    super(schema, exprValues, cursor);
+    this.status = status;
+    this.error = error;
+  }
+
+  public AsyncQueryResult(
+      String status,
+      ExecutionEngine.Schema schema,
+      Collection<ExprValue> exprValues,
+      String error) {
+    super(schema, exprValues);
+    this.status = status;
+    this.error = error;
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CancelAsyncQueryActionRequest.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CancelAsyncQueryActionRequest.java
new file mode 100644
index 0000000000..8a5f31646f
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CancelAsyncQueryActionRequest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.model;
+
+import java.io.IOException;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.opensearch.action.ActionRequest;
+import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.core.common.io.stream.StreamInput;
+
+@AllArgsConstructor
+@Getter
+public class CancelAsyncQueryActionRequest extends ActionRequest {
+
+  private String queryId;
+
+  /** Constructor of SubmitJobActionRequest from StreamInput. */
+  public CancelAsyncQueryActionRequest(StreamInput in) throws IOException {
+    super(in);
+  }
+
+  @Override
+  public ActionRequestValidationException validate() {
+    return null;
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CancelAsyncQueryActionResponse.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CancelAsyncQueryActionResponse.java
new file mode 100644
index 0000000000..a73430603f
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CancelAsyncQueryActionResponse.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.model;
+
+import java.io.IOException;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+
+@RequiredArgsConstructor
+public class CancelAsyncQueryActionResponse extends ActionResponse {
+
+  @Getter private final String result;
+
+  public CancelAsyncQueryActionResponse(StreamInput in) throws IOException {
+    super(in);
+    result = in.readString();
+  }
+
+  @Override
+  public void writeTo(StreamOutput streamOutput) throws IOException {
+    streamOutput.writeString(result);
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CreateAsyncQueryActionRequest.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CreateAsyncQueryActionRequest.java
new file mode 100644
index 0000000000..d003990311
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CreateAsyncQueryActionRequest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.model;
+
+import java.io.IOException;
+import lombok.Getter;
+import org.opensearch.action.ActionRequest;
+import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+
+public class CreateAsyncQueryActionRequest extends ActionRequest {
+
+  @Getter private CreateAsyncQueryRequest createAsyncQueryRequest;
+
+  /** Constructor of CreateJobActionRequest from StreamInput. */
+  public CreateAsyncQueryActionRequest(StreamInput in) throws IOException {
+    super(in);
+  }
+
+  public CreateAsyncQueryActionRequest(CreateAsyncQueryRequest createAsyncQueryRequest) {
+    this.createAsyncQueryRequest = createAsyncQueryRequest;
+  }
+
+  @Override
+  public ActionRequestValidationException validate() {
+    return null;
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CreateAsyncQueryActionResponse.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CreateAsyncQueryActionResponse.java
new file mode 100644
index 0000000000..17a4a73ed7
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/CreateAsyncQueryActionResponse.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.model;
+
+import java.io.IOException;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+
+@RequiredArgsConstructor
+public class CreateAsyncQueryActionResponse extends ActionResponse {
+
+  @Getter private final String result;
+
+  public CreateAsyncQueryActionResponse(StreamInput in) throws IOException {
+    super(in);
+    result = in.readString();
+  }
+
+  @Override
+  public void writeTo(StreamOutput streamOutput) throws IOException {
+    streamOutput.writeString(result);
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/model/GetAsyncQueryResultActionRequest.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/GetAsyncQueryResultActionRequest.java
new file mode 100644
index 0000000000..f30decbb4d
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/GetAsyncQueryResultActionRequest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.model;
+
+import java.io.IOException;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.opensearch.action.ActionRequest;
+import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.core.common.io.stream.StreamInput;
+
+@AllArgsConstructor
+public class GetAsyncQueryResultActionRequest extends ActionRequest {
+
+  @Getter private String queryId;
+
+  /** Constructor of GetJobQueryResultActionRequest from StreamInput. */
+  public GetAsyncQueryResultActionRequest(StreamInput in) throws IOException {
+    super(in);
+  }
+
+  @Override
+  public ActionRequestValidationException validate() {
+    return null;
+  }
+}
diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/model/GetAsyncQueryResultActionResponse.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/GetAsyncQueryResultActionResponse.java
new file mode 100644
index 0000000000..b2bbedd9ef
--- /dev/null
+++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/model/GetAsyncQueryResultActionResponse.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.model;
+
+import java.io.IOException;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+
+@RequiredArgsConstructor
+public class GetAsyncQueryResultActionResponse extends ActionResponse {
+
+  @Getter private final String result;
+
+  public GetAsyncQueryResultActionResponse(StreamInput in) throws IOException {
+    super(in);
+    result = in.readString();
+  }
+
+  @Override
+  public void writeTo(StreamOutput streamOutput) throws IOException {
+    streamOutput.writeString(result);
+  }
+}
diff --git a/async-query/src/main/resources/async-query-scheduler-index-mapping.yml b/async-query/src/main/resources/async-query-scheduler-index-mapping.yml
new file mode 100644
index 0000000000..1aa90e8ed8
--- /dev/null
+++ b/async-query/src/main/resources/async-query-scheduler-index-mapping.yml
@@ -0,0 +1,47 @@
+---
+##
+# Copyright OpenSearch Contributors
+# SPDX-License-Identifier: Apache-2.0
+##
+
+# Schema file for the .async-query-scheduler index
+# Also "dynamic" is set to "false" so that other fields cannot be added.
+dynamic: false
+properties:
+  accountId:
+    type: keyword
+  jobId:
+    type: keyword
+  dataSource:
+    type: keyword
+  scheduledQuery:
+    type: text
+  queryLang:
+    type: keyword
+  lastUpdateTime:
+    type: date
+    format: epoch_millis
+  enabledTime:
+    type: date
+    format: epoch_millis
+  schedule:
+    properties:
+      initialDelay:
+        type: long
+      interval:
+        properties:
+          start_time:
+            type: date
+            format: "strict_date_time||epoch_millis"
+          period:
+            type: integer
+          unit:
+            type: keyword
+  enabled:
+    type: boolean
+  lockDurationSeconds:
+    type: long
+    null_value: -1
+  jitter:
+    type: double
+    null_value: 0.0
\ No newline at end of file
diff --git a/async-query/src/main/resources/async-query-scheduler-index-settings.yml b/async-query/src/main/resources/async-query-scheduler-index-settings.yml
new file mode 100644
index 0000000000..386f1f4f34
--- /dev/null
+++ b/async-query/src/main/resources/async-query-scheduler-index-settings.yml
@@ -0,0 +1,11 @@
+---
+##
+# Copyright OpenSearch Contributors
+# SPDX-License-Identifier: Apache-2.0
+##
+
+# Settings file for the .async-query-scheduler index
+index:
+  number_of_shards: "1"
+  auto_expand_replicas: "0-2"
+  number_of_replicas: "0"
\ No newline at end of file
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceImplSpecTest.java b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceImplSpecTest.java
new file mode 100644
index 0000000000..175f9ac914
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceImplSpecTest.java
@@ -0,0 +1,645 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import static org.opensearch.sql.spark.data.constants.SparkConstants.DEFAULT_CLASS_NAME;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_JOB_REQUEST_INDEX;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_JOB_SESSION_ID;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_SESSION_CLASS_NAME;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_REQUEST_BUFFER_INDEX_NAME;
+import static org.opensearch.sql.spark.execution.xcontent.SessionModelXContentSerializer.SESSION_DOC_TYPE;
+import static org.opensearch.sql.spark.execution.xcontent.SessionModelXContentSerializer.SESSION_ID;
+import static org.opensearch.sql.spark.execution.xcontent.StatementModelXContentSerializer.STATEMENT_DOC_TYPE;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
+import org.opensearch.core.common.Strings;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceStatus;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.datasources.exceptions.DatasourceDisabledException;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryExecutionResponse;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.execution.session.SessionState;
+import org.opensearch.sql.spark.execution.statement.StatementModel;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+import org.opensearch.sql.spark.leasemanager.ConcurrencyLimitExceededException;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse;
+import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.spark.utils.IDUtils;
+
+public class AsyncQueryExecutorServiceImplSpecTest extends AsyncQueryExecutorServiceSpec {
+  AsyncQueryRequestContext asyncQueryRequestContext = new NullAsyncQueryRequestContext();
+
+  @Disabled("batch query is unsupported")
+  public void withoutSessionCreateAsyncQueryThenGetResultThenCancel() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // disable session
+    enableSession(false);
+
+    // 1. create async query.
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    assertFalse(clusterService().state().routingTable().hasIndex(SPARK_REQUEST_BUFFER_INDEX_NAME));
+    emrsClient.startJobRunCalled(1);
+
+    // 2. fetch async query result.
+    AsyncQueryExecutionResponse asyncQueryResults =
+        asyncQueryExecutorService.getAsyncQueryResults(
+            response.getQueryId(), asyncQueryRequestContext);
+    assertEquals("RUNNING", asyncQueryResults.getStatus());
+    emrsClient.getJobRunResultCalled(1);
+
+    // 3. cancel async query.
+    String cancelQueryId =
+        asyncQueryExecutorService.cancelQuery(response.getQueryId(), asyncQueryRequestContext);
+    assertEquals(response.getQueryId(), cancelQueryId);
+    emrsClient.cancelJobRunCalled(1);
+  }
+
+  @Disabled("batch query is unsupported")
+  public void sessionLimitNotImpactBatchQuery() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // disable session
+    enableSession(false);
+    setSessionLimit(0);
+
+    // 1. create async query.
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    emrsClient.startJobRunCalled(1);
+
+    CreateAsyncQueryResponse resp2 =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    emrsClient.startJobRunCalled(2);
+  }
+
+  @Disabled("batch query is unsupported")
+  public void createAsyncQueryCreateJobWithCorrectParameters() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    enableSession(false);
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    String params = emrsClient.getJobRequest().getSparkSubmitParams();
+    assertNull(response.getSessionId());
+    assertTrue(params.contains(String.format("--class %s", DEFAULT_CLASS_NAME)));
+    assertFalse(
+        params.contains(
+            String.format("%s=%s", FLINT_JOB_REQUEST_INDEX, SPARK_REQUEST_BUFFER_INDEX_NAME)));
+    assertFalse(
+        params.contains(String.format("%s=%s", FLINT_JOB_SESSION_ID, response.getSessionId())));
+
+    // enable session
+    enableSession(true);
+    response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    params = emrsClient.getJobRequest().getSparkSubmitParams();
+    assertTrue(params.contains(String.format("--class %s", FLINT_SESSION_CLASS_NAME)));
+    assertTrue(
+        params.contains(
+            String.format("%s=%s", FLINT_JOB_REQUEST_INDEX, SPARK_REQUEST_BUFFER_INDEX_NAME)));
+    assertTrue(
+        params.contains(String.format("%s=%s", FLINT_JOB_SESSION_ID, response.getSessionId())));
+  }
+
+  @Test
+  public void withSessionCreateAsyncQueryThenGetResultThenCancel() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // 1. create async query.
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    assertNotNull(response.getSessionId());
+    Optional<StatementModel> statementModel =
+        statementStorageService.getStatement(
+            response.getQueryId(), MYS3_DATASOURCE, asyncQueryRequestContext);
+    assertTrue(statementModel.isPresent());
+    assertEquals(StatementState.WAITING, statementModel.get().getStatementState());
+
+    // 2. fetch async query result.
+    AsyncQueryExecutionResponse asyncQueryResults =
+        asyncQueryExecutorService.getAsyncQueryResults(
+            response.getQueryId(), asyncQueryRequestContext);
+    assertEquals("", asyncQueryResults.getError());
+    assertTrue(Strings.isEmpty(asyncQueryResults.getError()));
+    assertEquals(StatementState.WAITING.getState(), asyncQueryResults.getStatus());
+
+    // 3. cancel async query.
+    String cancelQueryId =
+        asyncQueryExecutorService.cancelQuery(response.getQueryId(), asyncQueryRequestContext);
+    assertEquals(response.getQueryId(), cancelQueryId);
+  }
+
+  @Test
+  public void reuseSessionWhenCreateAsyncQuery() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // enable session
+    enableSession(true);
+
+    // 1. create async query.
+    CreateAsyncQueryResponse first =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    assertNotNull(first.getSessionId());
+
+    // 2. reuse session id
+    CreateAsyncQueryResponse second =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "select 1", MYS3_DATASOURCE, LangType.SQL, first.getSessionId()),
+            asyncQueryRequestContext);
+
+    assertEquals(first.getSessionId(), second.getSessionId());
+    assertNotEquals(first.getQueryId(), second.getQueryId());
+    // one session doc.
+    assertEquals(
+        1,
+        search(
+            QueryBuilders.boolQuery()
+                .must(QueryBuilders.termQuery("type", SESSION_DOC_TYPE))
+                .must(QueryBuilders.termQuery(SESSION_ID, first.getSessionId()))));
+    // two statement docs has same sessionId.
+    assertEquals(
+        2,
+        search(
+            QueryBuilders.boolQuery()
+                .must(QueryBuilders.termQuery("type", STATEMENT_DOC_TYPE))
+                .must(QueryBuilders.termQuery(SESSION_ID, first.getSessionId()))));
+
+    Optional<StatementModel> firstModel =
+        statementStorageService.getStatement(
+            first.getQueryId(), MYS3_DATASOURCE, asyncQueryRequestContext);
+    assertTrue(firstModel.isPresent());
+    assertEquals(StatementState.WAITING, firstModel.get().getStatementState());
+    assertEquals(first.getQueryId(), firstModel.get().getStatementId().getId());
+    assertEquals(first.getQueryId(), firstModel.get().getQueryId());
+    Optional<StatementModel> secondModel =
+        statementStorageService.getStatement(
+            second.getQueryId(), MYS3_DATASOURCE, asyncQueryRequestContext);
+    assertEquals(StatementState.WAITING, secondModel.get().getStatementState());
+    assertEquals(second.getQueryId(), secondModel.get().getStatementId().getId());
+    assertEquals(second.getQueryId(), secondModel.get().getQueryId());
+  }
+
+  @Disabled("batch query is unsupported")
+  public void batchQueryHasTimeout() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    enableSession(false);
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+
+    assertEquals(120L, (long) emrsClient.getJobRequest().executionTimeout());
+  }
+
+  @Test
+  public void interactiveQueryNoTimeout() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // enable session
+    enableSession(true);
+
+    asyncQueryExecutorService.createAsyncQuery(
+        new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+        asyncQueryRequestContext);
+    assertEquals(0L, (long) emrsClient.getJobRequest().executionTimeout());
+  }
+
+  @Ignore(
+      "flaky test, java.lang.IllegalArgumentException: Right now only AES/GCM/NoPadding is"
+          + " supported")
+  @Test
+  public void datasourceWithBasicAuth() {
+    Map<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put(
+        "glue.auth.role_arn", "arn:aws:iam::924196221507:role/FlintOpensearchServiceRole");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "basicauth");
+    properties.put("glue.indexstore.opensearch.auth.username", "username");
+    properties.put("glue.indexstore.opensearch.auth.password", "password");
+
+    dataSourceService.createDataSource(
+        new DataSourceMetadata.Builder()
+            .setName("mybasicauth")
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(properties)
+            .build());
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // enable session
+    enableSession(true);
+
+    asyncQueryExecutorService.createAsyncQuery(
+        new CreateAsyncQueryRequest("select 1", "mybasicauth", LangType.SQL, null),
+        asyncQueryRequestContext);
+    String params = emrsClient.getJobRequest().getSparkSubmitParams();
+    assertTrue(params.contains(String.format("--conf spark.datasource.flint.auth=basic")));
+    assertTrue(
+        params.contains(String.format("--conf spark.datasource.flint.auth.username=username")));
+    assertTrue(
+        params.contains(String.format("--conf spark.datasource.flint.auth.password=password")));
+  }
+
+  @Test
+  public void withSessionCreateAsyncQueryFailed() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // enable session
+    enableSession(true);
+
+    // 1. create async query.
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    assertNotNull(response.getSessionId());
+    Optional<StatementModel> statementModel =
+        statementStorageService.getStatement(
+            response.getQueryId(), MYS3_DATASOURCE, asyncQueryRequestContext);
+    assertTrue(statementModel.isPresent());
+    assertEquals(StatementState.WAITING, statementModel.get().getStatementState());
+
+    // 2. fetch async query result. not result write to DEFAULT_RESULT_INDEX yet.
+    // mock failed statement.
+    StatementModel submitted = statementModel.get();
+    StatementModel mocked =
+        StatementModel.builder()
+            .version("1.0")
+            .statementState(submitted.getStatementState())
+            .statementId(submitted.getStatementId())
+            .sessionId(submitted.getSessionId())
+            .applicationId(submitted.getApplicationId())
+            .jobId(submitted.getJobId())
+            .langType(submitted.getLangType())
+            .datasourceName(submitted.getDatasourceName())
+            .query(submitted.getQuery())
+            .queryId(submitted.getQueryId())
+            .submitTime(submitted.getSubmitTime())
+            .error("mock error")
+            .metadata(submitted.getMetadata())
+            .build();
+    statementStorageService.updateStatementState(
+        mocked, StatementState.FAILED, asyncQueryRequestContext);
+
+    AsyncQueryExecutionResponse asyncQueryResults =
+        asyncQueryExecutorService.getAsyncQueryResults(
+            response.getQueryId(), asyncQueryRequestContext);
+    assertEquals(StatementState.FAILED.getState(), asyncQueryResults.getStatus());
+    assertEquals("mock error", asyncQueryResults.getError());
+  }
+
+  // https://github.com/opensearch-project/sql/issues/2344
+  @Test
+  public void createSessionMoreThanLimitFailed() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // enable session
+    enableSession(true);
+    // only allow one session in domain.
+    setSessionLimit(1);
+
+    // 1. create async query.
+    CreateAsyncQueryResponse first =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    assertNotNull(first.getSessionId());
+    setSessionState(first.getSessionId(), SessionState.RUNNING);
+
+    // 2. create async query without session.
+    ConcurrencyLimitExceededException exception =
+        assertThrows(
+            ConcurrencyLimitExceededException.class,
+            () ->
+                asyncQueryExecutorService.createAsyncQuery(
+                    new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+                    asyncQueryRequestContext));
+    assertEquals("domain concurrent active session can not exceed 1", exception.getMessage());
+  }
+
+  // https://github.com/opensearch-project/sql/issues/2360
+  @Test
+  public void recreateSessionIfNotReady() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // enable session
+    enableSession(true);
+
+    // 1. create async query.
+    CreateAsyncQueryResponse first =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    assertNotNull(first.getSessionId());
+
+    // set sessionState to FAIL
+    setSessionState(first.getSessionId(), SessionState.FAIL);
+
+    // 2. reuse session id
+    CreateAsyncQueryResponse second =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "select 1", MYS3_DATASOURCE, LangType.SQL, first.getSessionId()),
+            asyncQueryRequestContext);
+
+    assertNotEquals(first.getSessionId(), second.getSessionId());
+
+    // set sessionState to FAIL
+    setSessionState(second.getSessionId(), SessionState.DEAD);
+
+    // 3. reuse session id
+    CreateAsyncQueryResponse third =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "select 1", MYS3_DATASOURCE, LangType.SQL, second.getSessionId()),
+            asyncQueryRequestContext);
+    assertNotEquals(second.getSessionId(), third.getSessionId());
+  }
+
+  @Test
+  public void submitQueryWithDifferentDataSourceSessionWillCreateNewSession() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // enable session
+    enableSession(true);
+
+    // 1. create async query.
+    CreateAsyncQueryResponse first =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "SHOW SCHEMAS IN " + MYS3_DATASOURCE, MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    assertNotNull(first.getSessionId());
+
+    // set sessionState to RUNNING
+    setSessionState(first.getSessionId(), SessionState.RUNNING);
+
+    // 2. reuse session id
+    CreateAsyncQueryResponse second =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "SHOW SCHEMAS IN " + MYS3_DATASOURCE,
+                MYS3_DATASOURCE,
+                LangType.SQL,
+                first.getSessionId()),
+            asyncQueryRequestContext);
+
+    assertEquals(first.getSessionId(), second.getSessionId());
+
+    // set sessionState to RUNNING
+    setSessionState(second.getSessionId(), SessionState.RUNNING);
+
+    // 3. given different source, create a new session id
+    CreateAsyncQueryResponse third =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "SHOW SCHEMAS IN " + MYGLUE_DATASOURCE,
+                MYGLUE_DATASOURCE,
+                LangType.SQL,
+                second.getSessionId()),
+            asyncQueryRequestContext);
+    assertNotEquals(second.getSessionId(), third.getSessionId());
+  }
+
+  @Test
+  public void recreateSessionIfStale() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // enable session
+    enableSession(true);
+
+    // 1. create async query.
+    CreateAsyncQueryResponse first =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    assertNotNull(first.getSessionId());
+
+    // set sessionState to RUNNING
+    setSessionState(first.getSessionId(), SessionState.RUNNING);
+
+    // 2. reuse session id
+    CreateAsyncQueryResponse second =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "select 1", MYS3_DATASOURCE, LangType.SQL, first.getSessionId()),
+            asyncQueryRequestContext);
+
+    assertEquals(first.getSessionId(), second.getSessionId());
+
+    try {
+      // set timeout setting to 0
+      ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest();
+      org.opensearch.common.settings.Settings settings =
+          org.opensearch.common.settings.Settings.builder()
+              .put(Settings.Key.SESSION_INACTIVITY_TIMEOUT_MILLIS.getKeyValue(), 0)
+              .build();
+      request.transientSettings(settings);
+      client().admin().cluster().updateSettings(request).actionGet(60000);
+
+      // 3. not reuse session id
+      CreateAsyncQueryResponse third =
+          asyncQueryExecutorService.createAsyncQuery(
+              new CreateAsyncQueryRequest(
+                  "select 1", MYS3_DATASOURCE, LangType.SQL, second.getSessionId()),
+              asyncQueryRequestContext);
+      assertNotEquals(second.getSessionId(), third.getSessionId());
+    } finally {
+      // set timeout setting to 0
+      ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest();
+      org.opensearch.common.settings.Settings settings =
+          org.opensearch.common.settings.Settings.builder()
+              .putNull(Settings.Key.SESSION_INACTIVITY_TIMEOUT_MILLIS.getKeyValue())
+              .build();
+      request.transientSettings(settings);
+      client().admin().cluster().updateSettings(request).actionGet(60000);
+    }
+  }
+
+  @Test
+  public void submitQueryInInvalidSessionWillCreateNewSession() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // enable session
+    enableSession(true);
+
+    // 1. create async query with unknown sessionId
+    String unknownSessionId = IDUtils.encode(MYS3_DATASOURCE);
+    CreateAsyncQueryResponse asyncQuery =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "select 1", MYS3_DATASOURCE, LangType.SQL, unknownSessionId),
+            asyncQueryRequestContext);
+
+    assertNotNull(asyncQuery.getSessionId());
+    assertNotEquals(unknownSessionId, asyncQuery.getSessionId());
+  }
+
+  @Test
+  public void datasourceNameIncludeUppercase() {
+    dataSourceService.createDataSource(
+        new DataSourceMetadata.Builder()
+            .setName("TESTS3")
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(
+                ImmutableMap.of(
+                    "glue.auth.type",
+                    "iam_role",
+                    "glue.auth.role_arn",
+                    "arn:aws:iam::924196221507:role/FlintOpensearchServiceRole",
+                    "glue.indexstore.opensearch.uri",
+                    "http://localhost:9200",
+                    "glue.indexstore.opensearch.auth",
+                    "noauth"))
+            .build());
+
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // enable session
+    enableSession(true);
+
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", "TESTS3", LangType.SQL, null),
+            asyncQueryRequestContext);
+    String params = emrsClient.getJobRequest().getSparkSubmitParams();
+
+    assertNotNull(response.getSessionId());
+    assertTrue(
+        params.contains(
+            "--conf spark.sql.catalog.TESTS3=org.opensearch.sql.FlintDelegatingSessionCatalog"));
+  }
+
+  @Test
+  public void concurrentSessionLimitIsDomainLevel() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // only allow one session in domain.
+    setSessionLimit(1);
+
+    // 1. create async query.
+    CreateAsyncQueryResponse first =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    assertNotNull(first.getSessionId());
+    setSessionState(first.getSessionId(), SessionState.RUNNING);
+
+    // 2. create async query without session.
+    ConcurrencyLimitExceededException exception =
+        assertThrows(
+            ConcurrencyLimitExceededException.class,
+            () ->
+                asyncQueryExecutorService.createAsyncQuery(
+                    new CreateAsyncQueryRequest("select 1", MYGLUE_DATASOURCE, LangType.SQL, null),
+                    asyncQueryRequestContext));
+    assertEquals("domain concurrent active session can not exceed 1", exception.getMessage());
+  }
+
+  @Test
+  public void testDatasourceDisabled() {
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // Disable Datasource
+    HashMap<String, Object> datasourceMap = new HashMap<>();
+    datasourceMap.put("name", MYS3_DATASOURCE);
+    datasourceMap.put("status", DataSourceStatus.DISABLED);
+    this.dataSourceService.patchDataSource(datasourceMap);
+
+    // 1. create async query.
+    try {
+      asyncQueryExecutorService.createAsyncQuery(
+          new CreateAsyncQueryRequest("select 1", MYS3_DATASOURCE, LangType.SQL, null),
+          asyncQueryRequestContext);
+      fail("It should have thrown DataSourceDisabledException");
+    } catch (DatasourceDisabledException exception) {
+      Assertions.assertEquals("Datasource mys3 is disabled.", exception.getMessage());
+    }
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceSpec.java b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceSpec.java
new file mode 100644
index 0000000000..72ed17f5aa
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceSpec.java
@@ -0,0 +1,572 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.DATASOURCE_URI_HOSTS_DENY_LIST;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.SPARK_EXECUTION_REFRESH_JOB_LIMIT_SETTING;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.SPARK_EXECUTION_SESSION_LIMIT_SETTING;
+import static org.opensearch.sql.spark.execution.statestore.OpenSearchStateStoreUtil.getIndexName;
+
+import com.amazonaws.services.emrserverless.model.CancelJobRunResult;
+import com.amazonaws.services.emrserverless.model.GetJobRunResult;
+import com.amazonaws.services.emrserverless.model.JobRun;
+import com.amazonaws.services.emrserverless.model.JobRunState;
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.io.Resources;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import org.junit.After;
+import org.junit.Before;
+import org.opensearch.action.admin.indices.create.CreateIndexRequest;
+import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.settings.ClusterSettings;
+import org.opensearch.common.settings.Setting;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.plugins.Plugin;
+import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.sql.common.setting.Settings.Key;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.datasources.encryptor.EncryptorImpl;
+import org.opensearch.sql.datasources.glue.GlueDataSourceFactory;
+import org.opensearch.sql.datasources.service.DataSourceMetadataStorage;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.datasources.storage.OpenSearchDataSourceMetadataStorage;
+import org.opensearch.sql.legacy.esdomain.LocalClusterState;
+import org.opensearch.sql.legacy.metrics.Metrics;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClient;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.client.StartJobRequest;
+import org.opensearch.sql.spark.config.OpenSearchSparkSubmitParameterModifier;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfig;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigClusterSettingLoader;
+import org.opensearch.sql.spark.dispatcher.DatasourceEmbeddedQueryIdProvider;
+import org.opensearch.sql.spark.dispatcher.QueryHandlerFactory;
+import org.opensearch.sql.spark.dispatcher.SparkQueryDispatcher;
+import org.opensearch.sql.spark.execution.session.DatasourceEmbeddedSessionIdProvider;
+import org.opensearch.sql.spark.execution.session.OpenSearchSessionConfigSupplier;
+import org.opensearch.sql.spark.execution.session.SessionConfigSupplier;
+import org.opensearch.sql.spark.execution.session.SessionIdProvider;
+import org.opensearch.sql.spark.execution.session.SessionManager;
+import org.opensearch.sql.spark.execution.session.SessionModel;
+import org.opensearch.sql.spark.execution.session.SessionState;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchSessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchStatementStorageService;
+import org.opensearch.sql.spark.execution.statestore.SessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.StateStore;
+import org.opensearch.sql.spark.execution.statestore.StatementStorageService;
+import org.opensearch.sql.spark.execution.xcontent.AsyncQueryJobMetadataXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.FlintIndexStateModelXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.SessionModelXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.StatementModelXContentSerializer;
+import org.opensearch.sql.spark.flint.FlintIndexClient;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataServiceImpl;
+import org.opensearch.sql.spark.flint.FlintIndexStateModelService;
+import org.opensearch.sql.spark.flint.FlintIndexType;
+import org.opensearch.sql.spark.flint.OpenSearchFlintIndexClient;
+import org.opensearch.sql.spark.flint.OpenSearchFlintIndexStateModelService;
+import org.opensearch.sql.spark.flint.OpenSearchIndexDMLResultStorageService;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
+import org.opensearch.sql.spark.leasemanager.DefaultLeaseManager;
+import org.opensearch.sql.spark.metrics.OpenSearchMetricsService;
+import org.opensearch.sql.spark.parameter.S3GlueDataSourceSparkParameterComposer;
+import org.opensearch.sql.spark.parameter.SparkParameterComposerCollection;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilderProvider;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+import org.opensearch.sql.spark.response.OpenSearchJobExecutionResponseReader;
+import org.opensearch.sql.spark.scheduler.AsyncQueryScheduler;
+import org.opensearch.sql.spark.scheduler.OpenSearchAsyncQueryScheduler;
+import org.opensearch.sql.spark.validator.DefaultGrammarElementValidator;
+import org.opensearch.sql.spark.validator.GrammarElementValidatorProvider;
+import org.opensearch.sql.spark.validator.S3GlueGrammarElementValidator;
+import org.opensearch.sql.spark.validator.SQLQueryValidator;
+import org.opensearch.sql.storage.DataSourceFactory;
+import org.opensearch.test.OpenSearchIntegTestCase;
+
+public class AsyncQueryExecutorServiceSpec extends OpenSearchIntegTestCase {
+
+  public static final String MYS3_DATASOURCE = "mys3";
+  public static final String MYGLUE_DATASOURCE = "my_glue";
+  public static final String ACCOUNT_ID = "accountId";
+  public static final String APPLICATION_ID = "appId";
+  public static final String REGION = "us-west-2";
+  public static final String ROLE_ARN = "roleArn";
+
+  protected ClusterService clusterService;
+  protected org.opensearch.sql.common.setting.Settings pluginSettings;
+  protected SessionConfigSupplier sessionConfigSupplier;
+  protected NodeClient client;
+  protected FlintIndexClient flintIndexClient;
+  protected DataSourceServiceImpl dataSourceService;
+  protected ClusterSettings clusterSettings;
+  protected FlintIndexMetadataService flintIndexMetadataService;
+  protected FlintIndexStateModelService flintIndexStateModelService;
+  protected StateStore stateStore;
+  protected SessionStorageService sessionStorageService;
+  protected StatementStorageService statementStorageService;
+  protected AsyncQueryScheduler asyncQueryScheduler;
+  protected AsyncQueryRequestContext asyncQueryRequestContext;
+  protected SessionIdProvider sessionIdProvider = new DatasourceEmbeddedSessionIdProvider();
+
+  @Override
+  protected Collection<Class<? extends Plugin>> nodePlugins() {
+    return Arrays.asList(TestSettingPlugin.class);
+  }
+
+  public static class TestSettingPlugin extends Plugin {
+
+    @Override
+    public List<Setting<?>> getSettings() {
+      return OpenSearchSettings.pluginSettings();
+    }
+  }
+
+  @Before
+  public void setup() {
+    clusterService = clusterService();
+    clusterSettings = clusterService.getClusterSettings();
+    pluginSettings = new OpenSearchSettings(clusterSettings);
+    LocalClusterState.state().setClusterService(clusterService);
+    LocalClusterState.state().setPluginSettings((OpenSearchSettings) pluginSettings);
+    sessionConfigSupplier = new OpenSearchSessionConfigSupplier(pluginSettings);
+    Metrics.getInstance().registerDefaultMetrics();
+    client = (NodeClient) cluster().client();
+    client
+        .admin()
+        .cluster()
+        .prepareUpdateSettings()
+        .setTransientSettings(
+            Settings.builder()
+                .putList(DATASOURCE_URI_HOSTS_DENY_LIST.getKey(), Collections.emptyList())
+                .build())
+        .get();
+    flintIndexClient = new OpenSearchFlintIndexClient(client);
+    dataSourceService = createDataSourceService();
+    DataSourceMetadata dm =
+        new DataSourceMetadata.Builder()
+            .setName(MYS3_DATASOURCE)
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(
+                ImmutableMap.of(
+                    "glue.auth.type",
+                    "iam_role",
+                    "glue.auth.role_arn",
+                    "arn:aws:iam::924196221507:role/FlintOpensearchServiceRole",
+                    "glue.indexstore.opensearch.uri",
+                    "http://localhost:9200",
+                    "glue.indexstore.opensearch.auth",
+                    "noauth"))
+            .build();
+    dataSourceService.createDataSource(dm);
+    DataSourceMetadata otherDm =
+        new DataSourceMetadata.Builder()
+            .setName(MYGLUE_DATASOURCE)
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(
+                ImmutableMap.of(
+                    "glue.auth.type",
+                    "iam_role",
+                    "glue.auth.role_arn",
+                    "arn:aws:iam::924196221507:role/FlintOpensearchServiceRole",
+                    "glue.indexstore.opensearch.uri",
+                    "http://localhost:9200",
+                    "glue.indexstore.opensearch.auth",
+                    "noauth"))
+            .build();
+    dataSourceService.createDataSource(otherDm);
+    stateStore = new StateStore(client, clusterService);
+    createIndexWithMappings(dm.getResultIndex(), loadResultIndexMappings());
+    createIndexWithMappings(otherDm.getResultIndex(), loadResultIndexMappings());
+    flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    flintIndexStateModelService =
+        new OpenSearchFlintIndexStateModelService(
+            stateStore, new FlintIndexStateModelXContentSerializer());
+    sessionStorageService =
+        new OpenSearchSessionStorageService(stateStore, new SessionModelXContentSerializer());
+    statementStorageService =
+        new OpenSearchStatementStorageService(stateStore, new StatementModelXContentSerializer());
+    asyncQueryScheduler = new OpenSearchAsyncQueryScheduler(client, clusterService);
+  }
+
+  protected FlintIndexOpFactory getFlintIndexOpFactory(
+      EMRServerlessClientFactory emrServerlessClientFactory) {
+    return new FlintIndexOpFactory(
+        flintIndexStateModelService,
+        flintIndexClient,
+        flintIndexMetadataService,
+        emrServerlessClientFactory,
+        asyncQueryScheduler);
+  }
+
+  @After
+  public void clean() {
+    client
+        .admin()
+        .cluster()
+        .prepareUpdateSettings()
+        .setTransientSettings(
+            Settings.builder().putNull(SPARK_EXECUTION_SESSION_LIMIT_SETTING.getKey()).build())
+        .get();
+    client
+        .admin()
+        .cluster()
+        .prepareUpdateSettings()
+        .setTransientSettings(
+            Settings.builder().putNull(SPARK_EXECUTION_REFRESH_JOB_LIMIT_SETTING.getKey()).build())
+        .get();
+    client
+        .admin()
+        .cluster()
+        .prepareUpdateSettings()
+        .setTransientSettings(
+            Settings.builder().putNull(DATASOURCE_URI_HOSTS_DENY_LIST.getKey()).build())
+        .get();
+  }
+
+  private DataSourceServiceImpl createDataSourceService() {
+    String masterKey = "a57d991d9b573f75b9bba1df";
+    DataSourceMetadataStorage dataSourceMetadataStorage =
+        new OpenSearchDataSourceMetadataStorage(
+            client,
+            clusterService,
+            new EncryptorImpl(masterKey),
+            (OpenSearchSettings) pluginSettings);
+    return new DataSourceServiceImpl(
+        new ImmutableSet.Builder<DataSourceFactory>()
+            .add(new GlueDataSourceFactory(pluginSettings))
+            .build(),
+        dataSourceMetadataStorage,
+        meta -> {});
+  }
+
+  protected AsyncQueryExecutorService createAsyncQueryExecutorService(
+      EMRServerlessClientFactory emrServerlessClientFactory) {
+    return createAsyncQueryExecutorService(
+        emrServerlessClientFactory, new OpenSearchJobExecutionResponseReader(client));
+  }
+
+  /** Pass a custom response reader which can mock interaction between PPL plugin and EMR-S job. */
+  protected AsyncQueryExecutorService createAsyncQueryExecutorService(
+      EMRServerlessClientFactory emrServerlessClientFactory,
+      JobExecutionResponseReader jobExecutionResponseReader) {
+    StateStore stateStore = new StateStore(client, clusterService);
+    AsyncQueryJobMetadataStorageService asyncQueryJobMetadataStorageService =
+        new OpenSearchAsyncQueryJobMetadataStorageService(
+            stateStore, new AsyncQueryJobMetadataXContentSerializer());
+    SparkParameterComposerCollection sparkParameterComposerCollection =
+        new SparkParameterComposerCollection();
+    sparkParameterComposerCollection.register(
+        DataSourceType.S3GLUE,
+        new S3GlueDataSourceSparkParameterComposer(
+            getSparkExecutionEngineConfigClusterSettingLoader()));
+    sparkParameterComposerCollection.register(
+        DataSourceType.SECURITY_LAKE,
+        new S3GlueDataSourceSparkParameterComposer(
+            getSparkExecutionEngineConfigClusterSettingLoader()));
+    SparkSubmitParametersBuilderProvider sparkSubmitParametersBuilderProvider =
+        new SparkSubmitParametersBuilderProvider(sparkParameterComposerCollection);
+    QueryHandlerFactory queryHandlerFactory =
+        new QueryHandlerFactory(
+            jobExecutionResponseReader,
+            new FlintIndexMetadataServiceImpl(client),
+            new SessionManager(
+                sessionStorageService,
+                statementStorageService,
+                emrServerlessClientFactory,
+                sessionConfigSupplier,
+                sessionIdProvider),
+            new DefaultLeaseManager(pluginSettings, stateStore),
+            new OpenSearchIndexDMLResultStorageService(dataSourceService, stateStore),
+            new FlintIndexOpFactory(
+                flintIndexStateModelService,
+                flintIndexClient,
+                new FlintIndexMetadataServiceImpl(client),
+                emrServerlessClientFactory,
+                asyncQueryScheduler),
+            emrServerlessClientFactory,
+            new OpenSearchMetricsService(),
+            sparkSubmitParametersBuilderProvider);
+    SQLQueryValidator sqlQueryValidator =
+        new SQLQueryValidator(
+            new GrammarElementValidatorProvider(
+                ImmutableMap.of(DataSourceType.S3GLUE, new S3GlueGrammarElementValidator()),
+                new DefaultGrammarElementValidator()));
+    SparkQueryDispatcher sparkQueryDispatcher =
+        new SparkQueryDispatcher(
+            this.dataSourceService,
+            new SessionManager(
+                sessionStorageService,
+                statementStorageService,
+                emrServerlessClientFactory,
+                sessionConfigSupplier,
+                sessionIdProvider),
+            queryHandlerFactory,
+            new DatasourceEmbeddedQueryIdProvider(),
+            sqlQueryValidator);
+    return new AsyncQueryExecutorServiceImpl(
+        asyncQueryJobMetadataStorageService,
+        sparkQueryDispatcher,
+        this::sparkExecutionEngineConfig);
+  }
+
+  public static class LocalEMRSClient implements EMRServerlessClient {
+
+    private int startJobRunCalled = 0;
+    private int cancelJobRunCalled = 0;
+    private int getJobResult = 0;
+    private JobRunState jobState = JobRunState.RUNNING;
+
+    @Getter private StartJobRequest jobRequest;
+
+    @Override
+    public String startJobRun(StartJobRequest startJobRequest) {
+      jobRequest = startJobRequest;
+      startJobRunCalled++;
+      return "jobId";
+    }
+
+    @Override
+    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+      getJobResult++;
+      JobRun jobRun = new JobRun();
+      jobRun.setState(jobState.toString());
+      return new GetJobRunResult().withJobRun(jobRun);
+    }
+
+    @Override
+    public CancelJobRunResult cancelJobRun(
+        String applicationId, String jobId, boolean allowExceptionPropagation) {
+      cancelJobRunCalled++;
+      return new CancelJobRunResult().withJobRunId(jobId);
+    }
+
+    public void startJobRunCalled(int expectedTimes) {
+      assertEquals(expectedTimes, startJobRunCalled);
+    }
+
+    public void cancelJobRunCalled(int expectedTimes) {
+      assertEquals(expectedTimes, cancelJobRunCalled);
+    }
+
+    public void getJobRunResultCalled(int expectedTimes) {
+      assertEquals(expectedTimes, getJobResult);
+    }
+
+    public void setJobState(JobRunState jobState) {
+      this.jobState = jobState;
+    }
+  }
+
+  protected LocalEMRSClient getCancelledLocalEmrsClient() {
+    return new LocalEMRSClient() {
+      public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+        super.getJobRunResult(applicationId, jobId);
+        JobRun jobRun = new JobRun();
+        jobRun.setState("cancelled");
+        return new GetJobRunResult().withJobRun(jobRun);
+      }
+    };
+  }
+
+  public static class LocalEMRServerlessClientFactory implements EMRServerlessClientFactory {
+
+    @Override
+    public EMRServerlessClient getClient(String accountId) {
+      return new LocalEMRSClient();
+    }
+  }
+
+  public SparkExecutionEngineConfig sparkExecutionEngineConfig(
+      AsyncQueryRequestContext asyncQueryRequestContext) {
+    return SparkExecutionEngineConfig.builder()
+        .applicationId(APPLICATION_ID)
+        .region(REGION)
+        .executionRoleARN(ROLE_ARN)
+        .sparkSubmitParameterModifier(new OpenSearchSparkSubmitParameterModifier(""))
+        .clusterName("myCluster")
+        .build();
+  }
+
+  public static class TestSettings extends org.opensearch.sql.common.setting.Settings {
+    final Map<Key, Object> values;
+
+    public TestSettings() {
+      values = new HashMap<>();
+    }
+
+    /** Get Setting Value. */
+    @Override
+    public <T> T getSettingValue(Key key) {
+      return (T) values.get(key);
+    }
+
+    @Override
+    public List<String> getSettings() {
+      return values.keySet().stream().map(Key::getKeyValue).collect(Collectors.toList());
+    }
+
+    public <T> void putSettingValue(Key key, T value) {
+      values.put(key, value);
+    }
+  }
+
+  public SparkExecutionEngineConfigClusterSettingLoader
+      getSparkExecutionEngineConfigClusterSettingLoader() {
+    Gson gson = new Gson();
+    JsonObject jsonObject = new JsonObject();
+    jsonObject.addProperty("accountId", ACCOUNT_ID);
+    jsonObject.addProperty("applicationId", APPLICATION_ID);
+    jsonObject.addProperty("region", REGION);
+    jsonObject.addProperty("executionRoleARN", ROLE_ARN);
+    jsonObject.addProperty("sparkSubmitParameters", "");
+
+    // Convert JsonObject to JSON string
+    final String jsonString = gson.toJson(jsonObject);
+
+    final TestSettings settings = new TestSettings();
+    settings.putSettingValue(Key.SPARK_EXECUTION_ENGINE_CONFIG, jsonString);
+
+    return new SparkExecutionEngineConfigClusterSettingLoader(settings);
+  }
+
+  public void enableSession(boolean enabled) {
+    // doNothing
+  }
+
+  public void setSessionLimit(long limit) {
+    client
+        .admin()
+        .cluster()
+        .prepareUpdateSettings()
+        .setTransientSettings(
+            Settings.builder().put(SPARK_EXECUTION_SESSION_LIMIT_SETTING.getKey(), limit).build())
+        .get();
+  }
+
+  public void setConcurrentRefreshJob(long limit) {
+    client
+        .admin()
+        .cluster()
+        .prepareUpdateSettings()
+        .setTransientSettings(
+            Settings.builder()
+                .put(SPARK_EXECUTION_REFRESH_JOB_LIMIT_SETTING.getKey(), limit)
+                .build())
+        .get();
+  }
+
+  int search(QueryBuilder query) {
+    SearchRequest searchRequest = new SearchRequest();
+    searchRequest.indices(getIndexName(MYS3_DATASOURCE));
+    SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+    searchSourceBuilder.query(query);
+    searchRequest.source(searchSourceBuilder);
+    SearchResponse searchResponse = client.search(searchRequest).actionGet();
+
+    return searchResponse.getHits().getHits().length;
+  }
+
+  void setSessionState(String sessionId, SessionState sessionState) {
+    Optional<SessionModel> model = sessionStorageService.getSession(sessionId, MYS3_DATASOURCE);
+    SessionModel updated = sessionStorageService.updateSessionState(model.get(), sessionState);
+    assertEquals(sessionState, updated.getSessionState());
+  }
+
+  @SneakyThrows
+  public String loadResultIndexMappings() {
+    URL url = Resources.getResource("query_execution_result_mapping.json");
+    return Resources.toString(url, Charsets.UTF_8);
+  }
+
+  @RequiredArgsConstructor
+  public class FlintDatasetMock {
+
+    final String query;
+    final String refreshQuery;
+    final FlintIndexType indexType;
+    final String indexName;
+    boolean isLegacy = false;
+    boolean isSpecialCharacter = false;
+    String latestId;
+
+    public FlintDatasetMock isLegacy(boolean isLegacy) {
+      this.isLegacy = isLegacy;
+      return this;
+    }
+
+    FlintDatasetMock isSpecialCharacter(boolean isSpecialCharacter) {
+      this.isSpecialCharacter = isSpecialCharacter;
+      return this;
+    }
+
+    public FlintDatasetMock latestId(String latestId) {
+      this.latestId = latestId;
+      return this;
+    }
+
+    public void createIndex() {
+      String pathPrefix = isLegacy ? "flint-index-mappings" : "flint-index-mappings/0.1.1";
+      if (isSpecialCharacter) {
+        createIndexWithMappings(
+            indexName, loadMappings(pathPrefix + "/" + "flint_special_character_index.json"));
+        return;
+      }
+      switch (indexType) {
+        case SKIPPING:
+          createIndexWithMappings(
+              indexName, loadMappings(pathPrefix + "/" + "flint_skipping_index.json"));
+          break;
+        case COVERING:
+          createIndexWithMappings(
+              indexName, loadMappings(pathPrefix + "/" + "flint_covering_index.json"));
+          break;
+        case MATERIALIZED_VIEW:
+          createIndexWithMappings(indexName, loadMappings(pathPrefix + "/" + "flint_mv.json"));
+          break;
+      }
+    }
+
+    @SneakyThrows
+    public void deleteIndex() {
+      client().admin().indices().delete(new DeleteIndexRequest().indices(indexName)).get();
+    }
+  }
+
+  @SneakyThrows
+  public static String loadMappings(String path) {
+    URL url = Resources.getResource(path);
+    return Resources.toString(url, Charsets.UTF_8);
+  }
+
+  public void createIndexWithMappings(String indexName, String metadata) {
+    CreateIndexRequest request = new CreateIndexRequest(indexName);
+    request.mapping(metadata, XContentType.JSON);
+    client().admin().indices().create(request).actionGet();
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryGetResultSpecTest.java b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryGetResultSpecTest.java
new file mode 100644
index 0000000000..7ccbad969d
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryGetResultSpecTest.java
@@ -0,0 +1,573 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import static org.opensearch.action.support.WriteRequest.RefreshPolicy.WAIT_UNTIL;
+import static org.opensearch.sql.data.model.ExprValueUtils.tupleValue;
+import static org.opensearch.sql.datasource.model.DataSourceMetadata.DEFAULT_RESULT_INDEX;
+
+import com.amazonaws.services.emrserverless.model.JobRunState;
+import com.google.common.collect.ImmutableList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.opensearch.action.index.IndexRequest;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.executor.pagination.Cursor;
+import org.opensearch.sql.protocol.response.format.JsonResponseFormatter;
+import org.opensearch.sql.protocol.response.format.ResponseFormatter;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryExecutionResponse;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.MockFlintSparkJob;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.execution.statement.StatementModel;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+import org.opensearch.sql.spark.flint.FlintIndexType;
+import org.opensearch.sql.spark.response.JobExecutionResponseReader;
+import org.opensearch.sql.spark.response.OpenSearchJobExecutionResponseReader;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse;
+import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.spark.transport.format.AsyncQueryResultResponseFormatter;
+import org.opensearch.sql.spark.transport.model.AsyncQueryResult;
+
+public class AsyncQueryGetResultSpecTest extends AsyncQueryExecutorServiceSpec {
+  AsyncQueryRequestContext asyncQueryRequestContext = new NullAsyncQueryRequestContext();
+
+  /** Mock Flint index and index state */
+  private final FlintDatasetMock mockIndex =
+      new FlintDatasetMock(
+              "DROP SKIPPING INDEX ON mys3.default.http_logs",
+              "REFRESH SKIPPING INDEX ON mys3.default.http_logs",
+              FlintIndexType.SKIPPING,
+              "flint_mys3_default_http_logs_skipping_index")
+          .latestId("ZmxpbnRfbXlzM19kZWZhdWx0X2h0dHBfbG9nc19za2lwcGluZ19pbmRleA==");
+
+  private MockFlintSparkJob mockIndexState;
+
+  @Before
+  public void doSetUp() {
+    mockIndexState =
+        new MockFlintSparkJob(flintIndexStateModelService, mockIndex.latestId, MYS3_DATASOURCE);
+  }
+
+  @Test
+  public void testInteractiveQueryGetResult() {
+    createAsyncQuery("SELECT 1")
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("waiting", null)
+        .withInteraction(
+            interaction -> {
+              interaction.emrJobWriteResultDoc(createResultDoc(interaction.queryId));
+              interaction.emrJobUpdateStatementState(StatementState.SUCCESS);
+              return interaction.pluginSearchQueryResult();
+            })
+        .assertQueryResults("SUCCESS", ImmutableList.of(tupleValue(Map.of("1", 1))));
+  }
+
+  @Test
+  public void testInteractiveQueryGetResultWithConcurrentEmrJobUpdate() {
+    createAsyncQuery("SELECT 1")
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("waiting", null)
+        .withInteraction(
+            interaction -> {
+              JSONObject result = interaction.pluginSearchQueryResult();
+              interaction.emrJobWriteResultDoc(createResultDoc(interaction.queryId));
+              interaction.emrJobUpdateStatementState(StatementState.SUCCESS);
+              return result;
+            })
+        .assertQueryResults("running", null)
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("SUCCESS", ImmutableList.of(tupleValue(Map.of("1", 1))));
+  }
+
+  @Test
+  public void testBatchQueryGetResult() {
+    createAsyncQuery("REFRESH SKIPPING INDEX ON test")
+        .withInteraction(
+            interaction -> {
+              interaction.emrJobWriteResultDoc(createEmptyResultDoc(interaction.queryId));
+              interaction.emrJobUpdateJobState(JobRunState.SUCCESS);
+              return interaction.pluginSearchQueryResult();
+            })
+        .assertQueryResults("SUCCESS", ImmutableList.of());
+  }
+
+  @Test
+  public void testBatchQueryGetResultWithConcurrentEmrJobUpdate() {
+    createAsyncQuery("REFRESH SKIPPING INDEX ON test")
+        .withInteraction(
+            interaction -> {
+              JSONObject result = interaction.pluginSearchQueryResult();
+              interaction.emrJobWriteResultDoc(createEmptyResultDoc(interaction.queryId));
+              interaction.emrJobUpdateJobState(JobRunState.SUCCESS);
+              return result;
+            })
+        .assertQueryResults("running", null)
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("SUCCESS", ImmutableList.of());
+  }
+
+  @Test
+  public void testStreamingQueryGetResult() {
+    // Create mock index with index state refreshing
+    mockIndex.createIndex();
+    mockIndexState.refreshing();
+    try {
+      createAsyncQuery(
+              "CREATE SKIPPING INDEX ON mys3.default.http_logs "
+                  + "(l_orderkey VALUE_SET) WITH (auto_refresh = true)")
+          .withInteraction(
+              interaction -> {
+                interaction.emrJobWriteResultDoc(createEmptyResultDoc(interaction.queryId));
+                interaction.emrJobUpdateJobState(JobRunState.SUCCESS);
+                return interaction.pluginSearchQueryResult();
+              })
+          .assertQueryResults("SUCCESS", ImmutableList.of());
+    } finally {
+      mockIndex.deleteIndex();
+      mockIndexState.deleted();
+    }
+  }
+
+  @Test
+  public void testStreamingQueryGetResultWithConcurrentEmrJobUpdate() {
+    // Create mock index with index state refreshing
+    mockIndex.createIndex();
+    mockIndexState.refreshing();
+    try {
+      createAsyncQuery(
+              "CREATE SKIPPING INDEX ON mys3.default.http_logs "
+                  + "(l_orderkey VALUE_SET) WITH (auto_refresh = true)")
+          .withInteraction(
+              interaction -> {
+                JSONObject result = interaction.pluginSearchQueryResult();
+                interaction.emrJobWriteResultDoc(createEmptyResultDoc(interaction.queryId));
+                interaction.emrJobUpdateJobState(JobRunState.SUCCESS);
+                return result;
+              })
+          .assertQueryResults("running", null)
+          .withInteraction(InteractionStep::pluginSearchQueryResult)
+          .assertQueryResults("SUCCESS", ImmutableList.of());
+    } finally {
+      mockIndex.deleteIndex();
+      mockIndexState.deleted();
+    }
+  }
+
+  @Test
+  public void testDropIndexQueryGetResult() {
+    // Create mock index with index state refreshing
+    mockIndex.createIndex();
+    mockIndexState.refreshing();
+
+    LocalEMRSClient emrClient = new LocalEMRSClient();
+    emrClient.setJobState(JobRunState.CANCELLED);
+    createAsyncQuery(mockIndex.query, emrClient)
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("SUCCESS", ImmutableList.of());
+  }
+
+  @Test
+  public void testDropIndexQueryGetResultWithResultDocRefreshDelay() {
+    // Create mock index with index state refreshing
+    mockIndex.createIndex();
+    mockIndexState.refreshing();
+
+    LocalEMRSClient emrClient = new LocalEMRSClient();
+    emrClient.setJobState(JobRunState.CANCELLED);
+    createAsyncQuery(mockIndex.query, emrClient)
+        .withInteraction(interaction -> new JSONObject()) // simulate result index refresh delay
+        .assertQueryResults("running", null)
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("SUCCESS", ImmutableList.of());
+  }
+
+  @Test
+  public void testInteractiveQueryResponse() {
+    createAsyncQuery("SELECT * FROM TABLE")
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("waiting", null)
+        .withInteraction(
+            interaction -> {
+              interaction.emrJobWriteResultDoc(createResultDoc(interaction.queryId));
+              interaction.emrJobUpdateStatementState(StatementState.SUCCESS);
+              return interaction.pluginSearchQueryResult();
+            })
+        .assertFormattedQueryResults(
+            "{\"status\":\"SUCCESS\",\"schema\":[{\"name\":\"1\","
+                + "\"type\":\"integer\"}],\"datarows\":[[1]],\"total\":1,\"size\":1}");
+  }
+
+  @Test
+  public void testInteractiveQueryResponseBasicType() {
+    createAsyncQuery("SELECT * FROM TABLE")
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("waiting", null)
+        .withInteraction(
+            interaction -> {
+              interaction.emrJobWriteResultDoc(
+                  createResultDoc(
+                      interaction.queryId,
+                      ImmutableList.of(
+                          "{'column1': 'value1', 'column2': 123, 'column3': true}",
+                          "{'column1': 'value2', 'column2': 456, 'column3': false}"),
+                      ImmutableList.of(
+                          "{'column_name': 'column1', 'data_type': 'string'}",
+                          "{'column_name': 'column2', 'data_type': 'integer'}",
+                          "{'column_name': 'column3', 'data_type': 'boolean'}")));
+              interaction.emrJobUpdateStatementState(StatementState.SUCCESS);
+              return interaction.pluginSearchQueryResult();
+            })
+        .assertFormattedQueryResults(
+            "{\"status\":\"SUCCESS\",\"schema\":[{\"name\":\"column1\",\"type\":\"string\"},{\"name\":\"column2\",\"type\":\"integer\"},{\"name\":\"column3\",\"type\":\"boolean\"}],\"datarows\":[[\"value1\",123,true],[\"value2\",456,false]],\"total\":2,\"size\":2}");
+  }
+
+  @Test
+  public void testInteractiveQueryResponseJsonArray() {
+    createAsyncQuery("SELECT * FROM TABLE")
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("waiting", null)
+        .withInteraction(
+            interaction -> {
+              interaction.emrJobWriteResultDoc(
+                  createResultDoc(
+                      interaction.queryId,
+                      ImmutableList.of(
+                          "{ 'attributes': [{ 'key': 'telemetry.sdk.language', 'value': {"
+                              + " 'stringValue': 'python' }}, { 'key': 'telemetry.sdk.name',"
+                              + " 'value': { 'stringValue': 'opentelemetry' }}, { 'key':"
+                              + " 'telemetry.sdk.version', 'value': { 'stringValue': '1.19.0' }}, {"
+                              + " 'key': 'service.namespace', 'value': { 'stringValue':"
+                              + " 'opentelemetry-demo' }}, { 'key': 'service.name', 'value': {"
+                              + " 'stringValue': 'recommendationservice' }}, { 'key':"
+                              + " 'telemetry.auto.version', 'value': { 'stringValue': '0.40b0'"
+                              + " }}]}"),
+                      ImmutableList.of("{'column_name':'attributes','data_type':'array'}")));
+              interaction.emrJobUpdateStatementState(StatementState.SUCCESS);
+              return interaction.pluginSearchQueryResult();
+            })
+        .assertFormattedQueryResults(
+            "{\"status\":\"SUCCESS\",\"schema\":[{\"name\":\"attributes\",\"type\":\"array\"}],\"datarows\":[[[{\"value\":{\"stringValue\":\"python\"},\"key\":\"telemetry.sdk.language\"},{\"value\":{\"stringValue\":\"opentelemetry\"},\"key\":\"telemetry.sdk.name\"},{\"value\":{\"stringValue\":\"1.19.0\"},\"key\":\"telemetry.sdk.version\"},{\"value\":{\"stringValue\":\"opentelemetry-demo\"},\"key\":\"service.namespace\"},{\"value\":{\"stringValue\":\"recommendationservice\"},\"key\":\"service.name\"},{\"value\":{\"stringValue\":\"0.40b0\"},\"key\":\"telemetry.auto.version\"}]]],\"total\":1,\"size\":1}");
+  }
+
+  @Test
+  public void testInteractiveQueryResponseJsonNested() {
+    createAsyncQuery("SELECT * FROM TABLE")
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("waiting", null)
+        .withInteraction(
+            interaction -> {
+              interaction.emrJobWriteResultDoc(
+                  createResultDoc(
+                      interaction.queryId,
+                      ImmutableList.of(
+                          "{\n"
+                              + "  'resourceSpans': {\n"
+                              + "    'scopeSpans': {\n"
+                              + "      'spans': {\n"
+                              + "          'key': 'rpc.system',\n"
+                              + "          'value': {\n"
+                              + "            'stringValue': 'grpc'\n"
+                              + "          }\n"
+                              + "      }\n"
+                              + "    }\n"
+                              + "  }\n"
+                              + "}"),
+                      ImmutableList.of("{'column_name':'resourceSpans','data_type':'struct'}")));
+              interaction.emrJobUpdateStatementState(StatementState.SUCCESS);
+              return interaction.pluginSearchQueryResult();
+            })
+        .assertFormattedQueryResults(
+            "{\"status\":\"SUCCESS\",\"schema\":[{\"name\":\"resourceSpans\",\"type\":\"struct\"}],\"datarows\":[[{\"scopeSpans\":{\"spans\":{\"value\":{\"stringValue\":\"grpc\"},\"key\":\"rpc.system\"}}}]],\"total\":1,\"size\":1}");
+  }
+
+  @Test
+  public void testInteractiveQueryResponseJsonNestedObjectArray() {
+    createAsyncQuery("SELECT * FROM TABLE")
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("waiting", null)
+        .withInteraction(
+            interaction -> {
+              interaction.emrJobWriteResultDoc(
+                  createResultDoc(
+                      interaction.queryId,
+                      ImmutableList.of(
+                          "{\n"
+                              + "  'resourceSpans': \n"
+                              + "    {\n"
+                              + "      'scopeSpans': \n"
+                              + "        {\n"
+                              + "          'spans': \n"
+                              + "            [\n"
+                              + "              {\n"
+                              + "                'attribute': {\n"
+                              + "                  'key': 'rpc.system',\n"
+                              + "                  'value': {\n"
+                              + "                    'stringValue': 'grpc'\n"
+                              + "                  }\n"
+                              + "                }\n"
+                              + "              },\n"
+                              + "              {\n"
+                              + "                'attribute': {\n"
+                              + "                  'key': 'rpc.system',\n"
+                              + "                  'value': {\n"
+                              + "                    'stringValue': 'grpc'\n"
+                              + "                  }\n"
+                              + "                }\n"
+                              + "              }\n"
+                              + "            ]\n"
+                              + "        }\n"
+                              + "    }\n"
+                              + "}"),
+                      ImmutableList.of("{'column_name':'resourceSpans','data_type':'struct'}")));
+              interaction.emrJobUpdateStatementState(StatementState.SUCCESS);
+              return interaction.pluginSearchQueryResult();
+            })
+        .assertFormattedQueryResults(
+            "{\"status\":\"SUCCESS\",\"schema\":[{\"name\":\"resourceSpans\",\"type\":\"struct\"}],\"datarows\":[[{\"scopeSpans\":{\"spans\":[{\"attribute\":{\"value\":{\"stringValue\":\"grpc\"},\"key\":\"rpc.system\"}},{\"attribute\":{\"value\":{\"stringValue\":\"grpc\"},\"key\":\"rpc.system\"}}]}}]],\"total\":1,\"size\":1}");
+  }
+
+  @Test
+  public void testExplainResponse() {
+    createAsyncQuery("EXPLAIN SELECT * FROM TABLE")
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("waiting", null)
+        .withInteraction(
+            interaction -> {
+              interaction.emrJobWriteResultDoc(
+                  createResultDoc(
+                      interaction.queryId,
+                      ImmutableList.of("{'plan':'== Physical Plan ==\\nAdaptiveSparkPlan'}"),
+                      ImmutableList.of("{'column_name':'plan','data_type':'string'}")));
+              interaction.emrJobUpdateStatementState(StatementState.SUCCESS);
+              return interaction.pluginSearchQueryResult();
+            })
+        .assertFormattedQueryResults(
+            "{\"status\":\"SUCCESS\",\"schema\":[{\"name\":\"plan\",\"type\":\"string\"}],\"datarows\":[[\"=="
+                + " Physical Plan ==\\n"
+                + "AdaptiveSparkPlan\"]],\"total\":1,\"size\":1}");
+  }
+
+  @Test
+  public void testInteractiveQueryEmptyResponseIssue2367() {
+    createAsyncQuery("SELECT * FROM TABLE")
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("waiting", null)
+        .withInteraction(
+            interaction -> {
+              interaction.emrJobWriteResultDoc(
+                  createResultDoc(
+                      interaction.queryId,
+                      ImmutableList.of(
+                          "{'srcPort':20641}",
+                          "{'srcPort':20641}",
+                          "{}",
+                          "{}",
+                          "{'srcPort':20641}",
+                          "{'srcPort':20641}"),
+                      ImmutableList.of("{'column_name':'srcPort','data_type':'long'}")));
+              interaction.emrJobUpdateStatementState(StatementState.SUCCESS);
+              return interaction.pluginSearchQueryResult();
+            })
+        .assertFormattedQueryResults(
+            "{\"status\":\"SUCCESS\",\"schema\":[{\"name\":\"srcPort\",\"type\":\"long\"}],\"datarows\":[[20641],[20641],[null],[null],[20641],[20641]],\"total\":6,\"size\":6}");
+  }
+
+  @Test
+  public void testInteractiveQueryArrayResponseIssue2367() {
+    createAsyncQuery("SELECT * FROM TABLE")
+        .withInteraction(InteractionStep::pluginSearchQueryResult)
+        .assertQueryResults("waiting", null)
+        .withInteraction(
+            interaction -> {
+              interaction.emrJobWriteResultDoc(
+                  createResultDoc(
+                      interaction.queryId,
+                      ImmutableList.of(
+                          "{'resourceSpans':[{'resource':{'attributes':[{'key':'telemetry.sdk.language','value':{'stringValue':'python'}},{'key':'telemetry.sdk.name','value':{'stringValue':'opentelemetry'}}]},'scopeSpans':[{'scope':{'name':'opentelemetry.instrumentation.grpc','version':'0.40b0'},'spans':[{'attributes':[{'key':'rpc.system','value':{'stringValue':'grpc'}},{'key':'rpc.grpc.status_code','value':{'intValue':'0'}}],'kind':3},{'attributes':[{'key':'rpc.system','value':{'stringValue':'grpc'}},{'key':'rpc.grpc.status_code','value':{'intValue':'0'}}],'kind':3}]}]}]}"),
+                      ImmutableList.of("{'column_name':'resourceSpans','data_type':'array'}")));
+              interaction.emrJobUpdateStatementState(StatementState.SUCCESS);
+              return interaction.pluginSearchQueryResult();
+            })
+        .assertFormattedQueryResults(
+            "{\"status\":\"SUCCESS\",\"schema\":[{\"name\":\"resourceSpans\",\"type\":\"array\"}],\"datarows\":[[[{\"resource\":{\"attributes\":[{\"value\":{\"stringValue\":\"python\"},\"key\":\"telemetry.sdk.language\"},{\"value\":{\"stringValue\":\"opentelemetry\"},\"key\":\"telemetry.sdk.name\"}]},\"scopeSpans\":[{\"spans\":[{\"kind\":3,\"attributes\":[{\"value\":{\"stringValue\":\"grpc\"},\"key\":\"rpc.system\"},{\"value\":{\"intValue\":\"0\"},\"key\":\"rpc.grpc.status_code\"}]},{\"kind\":3,\"attributes\":[{\"value\":{\"stringValue\":\"grpc\"},\"key\":\"rpc.system\"},{\"value\":{\"intValue\":\"0\"},\"key\":\"rpc.grpc.status_code\"}]}],\"scope\":{\"name\":\"opentelemetry.instrumentation.grpc\",\"version\":\"0.40b0\"}}]}]]],\"total\":1,\"size\":1}");
+  }
+
+  private AssertionHelper createAsyncQuery(String query) {
+    return new AssertionHelper(query, new LocalEMRSClient());
+  }
+
+  private AssertionHelper createAsyncQuery(String query, LocalEMRSClient emrClient) {
+    return new AssertionHelper(query, emrClient);
+  }
+
+  private class AssertionHelper {
+    private final AsyncQueryExecutorService queryService;
+    private final CreateAsyncQueryResponse createQueryResponse;
+    private Interaction interaction;
+
+    AssertionHelper(String query, LocalEMRSClient emrClient) {
+      EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrClient;
+      this.queryService =
+          createAsyncQueryExecutorService(
+              emrServerlessClientFactory,
+              /*
+               * Custom reader that intercepts get results call and inject extra steps defined in
+               * current interaction. Intercept both get methods for different query handler which
+               * will only call either of them.
+               */
+              new JobExecutionResponseReader() {
+                @Override
+                public JSONObject getResultWithJobId(String jobId, String resultIndex) {
+                  return interaction.interact(new InteractionStep(emrClient, jobId, resultIndex));
+                }
+
+                @Override
+                public JSONObject getResultWithQueryId(String queryId, String resultIndex) {
+                  return interaction.interact(new InteractionStep(emrClient, queryId, resultIndex));
+                }
+              });
+      this.createQueryResponse =
+          queryService.createAsyncQuery(
+              new CreateAsyncQueryRequest(query, MYS3_DATASOURCE, LangType.SQL, null),
+              asyncQueryRequestContext);
+    }
+
+    AssertionHelper withInteraction(Interaction interaction) {
+      this.interaction = interaction;
+      return this;
+    }
+
+    AssertionHelper assertQueryResults(String status, List<ExprValue> data) {
+      AsyncQueryExecutionResponse results =
+          queryService.getAsyncQueryResults(
+              createQueryResponse.getQueryId(), asyncQueryRequestContext);
+      assertEquals(status, results.getStatus());
+      assertEquals(data, results.getResults());
+      return this;
+    }
+
+    AssertionHelper assertFormattedQueryResults(String expected) {
+      AsyncQueryExecutionResponse results =
+          queryService.getAsyncQueryResults(
+              createQueryResponse.getQueryId(), asyncQueryRequestContext);
+
+      ResponseFormatter<AsyncQueryResult> formatter =
+          new AsyncQueryResultResponseFormatter(JsonResponseFormatter.Style.COMPACT);
+      assertEquals(
+          expected,
+          formatter.format(
+              new AsyncQueryResult(
+                  results.getStatus(),
+                  results.getSchema(),
+                  results.getResults(),
+                  Cursor.None,
+                  results.getError())));
+      return this;
+    }
+  }
+
+  /** Define an interaction between PPL plugin and EMR-S job. */
+  private interface Interaction {
+
+    JSONObject interact(InteractionStep interaction);
+  }
+
+  /**
+   * Each method in this class is one step that can happen in an interaction. These methods are
+   * called in any order to simulate concurrent scenario.
+   */
+  private class InteractionStep {
+    private final LocalEMRSClient emrClient;
+    final String queryId;
+    final String resultIndex;
+
+    private InteractionStep(LocalEMRSClient emrClient, String queryId, String resultIndex) {
+      this.emrClient = emrClient;
+      this.queryId = queryId;
+      this.resultIndex = resultIndex == null ? DEFAULT_RESULT_INDEX : resultIndex;
+    }
+
+    /** Simulate PPL plugin search query_execution_result */
+    JSONObject pluginSearchQueryResult() {
+      return new OpenSearchJobExecutionResponseReader(client)
+          .getResultWithQueryId(queryId, resultIndex);
+    }
+
+    /** Simulate EMR-S bulk writes query_execution_result with refresh = wait_for */
+    void emrJobWriteResultDoc(Map<String, Object> resultDoc) {
+      try {
+        IndexRequest request =
+            new IndexRequest().index(resultIndex).setRefreshPolicy(WAIT_UNTIL).source(resultDoc);
+        client.index(request).get();
+      } catch (Exception e) {
+        Assert.fail("Failed to write result doc: " + e.getMessage());
+      }
+    }
+
+    /** Simulate EMR-S updates query_execution_request with state */
+    void emrJobUpdateStatementState(StatementState newState) {
+      StatementModel stmt =
+          statementStorageService
+              .getStatement(queryId, MYS3_DATASOURCE, asyncQueryRequestContext)
+              .get();
+      statementStorageService.updateStatementState(stmt, newState, asyncQueryRequestContext);
+    }
+
+    void emrJobUpdateJobState(JobRunState jobState) {
+      emrClient.setJobState(jobState);
+    }
+  }
+
+  private Map<String, Object> createEmptyResultDoc(String queryId) {
+    Map<String, Object> document = new HashMap<>();
+    document.put("result", ImmutableList.of());
+    document.put("schema", ImmutableList.of());
+    document.put("jobRunId", "XXX");
+    document.put("applicationId", "YYY");
+    document.put("dataSourceName", MYS3_DATASOURCE);
+    document.put("status", "SUCCESS");
+    document.put("error", "");
+    document.put("queryId", queryId);
+    document.put("queryText", "SELECT 1");
+    document.put("sessionId", "ZZZ");
+    document.put("updateTime", 1699124602715L);
+    document.put("queryRunTime", 123);
+    return document;
+  }
+
+  private Map<String, Object> createResultDoc(String queryId) {
+    return createResultDoc(
+        queryId,
+        ImmutableList.of("{'1':1}"),
+        ImmutableList.of("{'column_name" + "':'1','data_type':'integer'}"));
+  }
+
+  private Map<String, Object> createResultDoc(
+      String queryId, List<String> result, List<String> schema) {
+    Map<String, Object> document = new HashMap<>();
+    document.put("result", result);
+    document.put("schema", schema);
+    document.put("jobRunId", "XXX");
+    document.put("applicationId", "YYY");
+    document.put("dataSourceName", MYS3_DATASOURCE);
+    document.put("status", "SUCCESS");
+    document.put("error", "");
+    document.put("queryId", queryId);
+    document.put("queryText", "SELECT 1");
+    document.put("sessionId", "ZZZ");
+    document.put("updateTime", 1699124602715L);
+    document.put("queryRunTime", 123);
+    return document;
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/IndexQuerySpecAlterTest.java b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/IndexQuerySpecAlterTest.java
new file mode 100644
index 0000000000..d69c7d4864
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/IndexQuerySpecAlterTest.java
@@ -0,0 +1,1124 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import com.amazonaws.services.emrserverless.model.CancelJobRunResult;
+import com.amazonaws.services.emrserverless.model.GetJobRunResult;
+import com.amazonaws.services.emrserverless.model.JobRun;
+import com.amazonaws.services.emrserverless.model.ValidationException;
+import com.google.common.collect.ImmutableList;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryExecutionResponse;
+import org.opensearch.sql.spark.asyncquery.model.MockFlintIndex;
+import org.opensearch.sql.spark.asyncquery.model.MockFlintSparkJob;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.client.StartJobRequest;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexType;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+public class IndexQuerySpecAlterTest extends AsyncQueryExecutorServiceSpec {
+
+  @Test
+  public void testAlterIndexQueryConvertingToManualRefresh() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=false)");
+    MockFlintIndex ALTER_COVERING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_covering_index",
+            FlintIndexType.COVERING,
+            "ALTER INDEX covering ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=false)");
+    MockFlintIndex ALTER_MV =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_mv",
+            FlintIndexType.MATERIALIZED_VIEW,
+            "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (auto_refresh=false,"
+                + " incremental_refresh=false) ");
+    ImmutableList.of(ALTER_SKIPPING, ALTER_COVERING, ALTER_MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              mockDS.updateIndexOptions(existingOptions, false);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("SUCCESS", asyncQueryExecutionResponse.getStatus());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(1);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("false", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryConvertingToManualRefreshWithNoIncrementalRefresh() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=false)");
+    MockFlintIndex ALTER_COVERING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_covering_index",
+            FlintIndexType.COVERING,
+            "ALTER INDEX covering ON my_glue.mydb.http_logs WITH (auto_refresh=false)");
+    MockFlintIndex ALTER_MV =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_mv",
+            FlintIndexType.MATERIALIZED_VIEW,
+            "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (auto_refresh=false)");
+    ImmutableList.of(ALTER_SKIPPING, ALTER_COVERING, ALTER_MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              existingOptions.put("checkpoint_location", "s3://checkpoint/location");
+              mockDS.updateIndexOptions(existingOptions, true);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("SUCCESS", asyncQueryExecutionResponse.getStatus());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(1);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("false", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryWithRedundantOperation() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=false)");
+    MockFlintIndex ALTER_COVERING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_covering_index",
+            FlintIndexType.COVERING,
+            "ALTER INDEX covering ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=false)");
+    MockFlintIndex ALTER_MV =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_mv",
+            FlintIndexType.MATERIALIZED_VIEW,
+            "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (auto_refresh=false,"
+                + " incremental_refresh=false) ");
+    ImmutableList.of(ALTER_SKIPPING, ALTER_COVERING, ALTER_MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public String startJobRun(StartJobRequest startJobRequest) {
+                      return "jobId";
+                    }
+
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+
+                    @Override
+                    public CancelJobRunResult cancelJobRun(
+                        String applicationId, String jobId, boolean allowExceptionPropagation) {
+                      super.cancelJobRun(applicationId, jobId, allowExceptionPropagation);
+                      throw new ValidationException("Job run is not in a cancellable state");
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessCientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessCientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "false");
+              mockDS.updateIndexOptions(existingOptions, false);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("SUCCESS", asyncQueryExecutionResponse.getStatus());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(1);
+              emrsClient.getJobRunResultCalled(0);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("false", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryConvertingToAutoRefresh() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=true,"
+                + " incremental_refresh=false)");
+    MockFlintIndex ALTER_COVERING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_covering_index",
+            FlintIndexType.COVERING,
+            "ALTER INDEX covering ON my_glue.mydb.http_logs WITH (auto_refresh=true,"
+                + " incremental_refresh=false)");
+    MockFlintIndex ALTER_MV =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_mv",
+            FlintIndexType.MATERIALIZED_VIEW,
+            "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (auto_refresh=true,"
+                + " incremental_refresh=false) ");
+    ImmutableList.of(ALTER_SKIPPING, ALTER_COVERING, ALTER_MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient = new LocalEMRSClient();
+              EMRServerlessClientFactory clientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(clientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "false");
+              mockDS.updateIndexOptions(existingOptions, false);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              assertEquals(
+                  "RUNNING",
+                  asyncQueryExecutorService
+                      .getAsyncQueryResults(response.getQueryId(), asyncQueryRequestContext)
+                      .getStatus());
+
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              emrsClient.startJobRunCalled(1);
+              emrsClient.getJobRunResultCalled(1);
+              emrsClient.cancelJobRunCalled(0);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("false", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryWithOutAnyAutoRefresh() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH ("
+                + " incremental_refresh=false)");
+    MockFlintIndex ALTER_COVERING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_covering_index",
+            FlintIndexType.COVERING,
+            "ALTER INDEX covering ON my_glue.mydb.http_logs WITH ("
+                + " incremental_refresh=false)");
+    MockFlintIndex ALTER_MV =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_mv",
+            FlintIndexType.MATERIALIZED_VIEW,
+            "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (" + " incremental_refresh=false) ");
+    ImmutableList.of(ALTER_SKIPPING, ALTER_COVERING, ALTER_MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient = new LocalEMRSClient();
+              EMRServerlessClientFactory clientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(clientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "false");
+              mockDS.updateIndexOptions(existingOptions, false);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              assertEquals(
+                  "RUNNING",
+                  asyncQueryExecutorService
+                      .getAsyncQueryResults(response.getQueryId(), asyncQueryRequestContext)
+                      .getStatus());
+
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              emrsClient.startJobRunCalled(1);
+              emrsClient.getJobRunResultCalled(1);
+              emrsClient.cancelJobRunCalled(0);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("false", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryOfFullRefreshWithInvalidOptions() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=false, checkpoint_location=\"s3://ckp/skp\")");
+    MockFlintIndex ALTER_COVERING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_covering_index",
+            FlintIndexType.COVERING,
+            "ALTER INDEX covering ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=false, checkpoint_location=\"s3://ckp/skp\")");
+    MockFlintIndex ALTER_MV =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_mv",
+            FlintIndexType.MATERIALIZED_VIEW,
+            "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (auto_refresh=false,"
+                + " incremental_refresh=false, checkpoint_location=\"s3://ckp/skp\") ");
+    ImmutableList.of(ALTER_SKIPPING, ALTER_COVERING, ALTER_MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              mockDS.updateIndexOptions(existingOptions, false);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("FAILED", asyncQueryExecutionResponse.getStatus());
+              assertEquals(
+                  "Altering to full refresh only allows: [auto_refresh, incremental_refresh]"
+                      + " options",
+                  asyncQueryExecutionResponse.getError());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(0);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("true", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryOfIncrementalRefreshWithInvalidOptions() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=true, output_mode=\"complete\")");
+    MockFlintIndex ALTER_COVERING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_covering_index",
+            FlintIndexType.COVERING,
+            "ALTER INDEX covering ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=true, output_mode=\"complete\")");
+    MockFlintIndex ALTER_MV =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_mv",
+            FlintIndexType.MATERIALIZED_VIEW,
+            "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (auto_refresh=false,"
+                + " incremental_refresh=true, output_mode=\"complete\") ");
+    ImmutableList.of(ALTER_SKIPPING, ALTER_COVERING, ALTER_MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              mockDS.updateIndexOptions(existingOptions, false);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("FAILED", asyncQueryExecutionResponse.getStatus());
+              assertEquals(
+                  "Altering to incremental refresh only allows: [auto_refresh, incremental_refresh,"
+                      + " watermark_delay, checkpoint_location] options",
+                  asyncQueryExecutionResponse.getError());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(0);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("true", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryOfIncrementalRefreshWithInsufficientOptions() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=true)");
+    MockFlintIndex ALTER_COVERING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_covering_index",
+            FlintIndexType.COVERING,
+            "ALTER INDEX covering ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=true)");
+    ImmutableList.of(ALTER_SKIPPING, ALTER_COVERING)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              existingOptions.put("incremental_refresh", "false");
+              mockDS.updateIndexOptions(existingOptions, true);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("FAILED", asyncQueryExecutionResponse.getStatus());
+              assertEquals(
+                  "Conversion to incremental refresh index cannot proceed due to missing"
+                      + " attributes: checkpoint_location.",
+                  asyncQueryExecutionResponse.getError());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(0);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("true", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryOfIncrementalRefreshWithInsufficientOptionsForMV() {
+    MockFlintIndex ALTER_MV =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_mv",
+            FlintIndexType.MATERIALIZED_VIEW,
+            "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (auto_refresh=false,"
+                + " incremental_refresh=true) ");
+    ImmutableList.of(ALTER_MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              existingOptions.put("incremental_refresh", "false");
+              mockDS.updateIndexOptions(existingOptions, true);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("FAILED", asyncQueryExecutionResponse.getStatus());
+              assertEquals(
+                  "Conversion to incremental refresh index cannot proceed due to missing"
+                      + " attributes: checkpoint_location, watermark_delay.",
+                  asyncQueryExecutionResponse.getError());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(0);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("true", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryOfIncrementalRefreshWithEmptyExistingOptionsForMV() {
+    MockFlintIndex ALTER_MV =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_mv",
+            FlintIndexType.MATERIALIZED_VIEW,
+            "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (auto_refresh=false,"
+                + " incremental_refresh=true) ");
+    ImmutableList.of(ALTER_MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              existingOptions.put("incremental_refresh", "false");
+              existingOptions.put("watermark_delay", "");
+              existingOptions.put("checkpoint_location", "");
+              mockDS.updateIndexOptions(existingOptions, true);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("FAILED", asyncQueryExecutionResponse.getStatus());
+              assertEquals(
+                  "Conversion to incremental refresh index cannot proceed due to missing"
+                      + " attributes: checkpoint_location, watermark_delay.",
+                  asyncQueryExecutionResponse.getError());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(0);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("true", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryOfIncrementalRefresh() {
+    MockFlintIndex ALTER_MV =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_mv",
+            FlintIndexType.MATERIALIZED_VIEW,
+            "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (auto_refresh=false,"
+                + " incremental_refresh=true) ");
+    ImmutableList.of(ALTER_MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              existingOptions.put("incremental_refresh", "false");
+              existingOptions.put("watermark_delay", "watermark_delay");
+              existingOptions.put("checkpoint_location", "s3://checkpoint/location");
+              mockDS.updateIndexOptions(existingOptions, true);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.refreshing();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("SUCCESS", asyncQueryExecutionResponse.getStatus());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.getJobRunResultCalled(1);
+              emrsClient.cancelJobRunCalled(1);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("false", options.get("auto_refresh"));
+              Assertions.assertEquals("true", options.get("incremental_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryWithIncrementalRefreshAlreadyExisting() {
+    MockFlintIndex ALTER_MV =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_mv",
+            FlintIndexType.MATERIALIZED_VIEW,
+            "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (auto_refresh=false) ");
+    ImmutableList.of(ALTER_MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              existingOptions.put("incremental_refresh", "true");
+              existingOptions.put("watermark_delay", "watermark_delay");
+              existingOptions.put("checkpoint_location", "s3://checkpoint/location");
+              mockDS.updateIndexOptions(existingOptions, true);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.refreshing();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("SUCCESS", asyncQueryExecutionResponse.getStatus());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.getJobRunResultCalled(1);
+              emrsClient.cancelJobRunCalled(1);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("false", options.get("auto_refresh"));
+              Assertions.assertEquals("true", options.get("incremental_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryWithInvalidInitialState() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=false)");
+    ImmutableList.of(ALTER_SKIPPING)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              mockDS.updateIndexOptions(existingOptions, false);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.updating();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("FAILED", asyncQueryExecutionResponse.getStatus());
+              assertEquals(
+                  "Transaction failed as flint index is not in a valid state.",
+                  asyncQueryExecutionResponse.getError());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(0);
+              flintIndexJob.assertState(FlintIndexState.UPDATING);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("true", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryWithValidationExceptionWithSuccess() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=false)");
+    ImmutableList.of(ALTER_SKIPPING)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+
+                    @Override
+                    public CancelJobRunResult cancelJobRun(
+                        String applicationId, String jobId, boolean allowExceptionPropagation) {
+                      super.cancelJobRun(applicationId, jobId, allowExceptionPropagation);
+                      throw new ValidationException("Job run is not in a cancellable state");
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              mockDS.updateIndexOptions(existingOptions, false);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("SUCCESS", asyncQueryExecutionResponse.getStatus());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(1);
+              emrsClient.getJobRunResultCalled(0);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("false", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryWithResourceNotFoundExceptionWithSuccess() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=false)");
+    ImmutableList.of(ALTER_SKIPPING)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+
+                    @Override
+                    public CancelJobRunResult cancelJobRun(
+                        String applicationId, String jobId, boolean allowExceptionPropagation) {
+                      super.cancelJobRun(applicationId, jobId, allowExceptionPropagation);
+                      throw new ValidationException("Random validation exception");
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              mockDS.updateIndexOptions(existingOptions, false);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("FAILED", asyncQueryExecutionResponse.getStatus());
+              assertEquals("Internal Server Error.", asyncQueryExecutionResponse.getError());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(1);
+              emrsClient.getJobRunResultCalled(0);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("false", options.get("auto_refresh"));
+            });
+  }
+
+  @Test
+  public void testAlterIndexQueryWithUnknownError() {
+    MockFlintIndex ALTER_SKIPPING =
+        new MockFlintIndex(
+            client,
+            "flint_my_glue_mydb_http_logs_skipping_index",
+            FlintIndexType.SKIPPING,
+            "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+                + " incremental_refresh=false)");
+    ImmutableList.of(ALTER_SKIPPING)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      JobRun jobRun = new JobRun();
+                      jobRun.setState("cancelled");
+                      return new GetJobRunResult().withJobRun(jobRun);
+                    }
+
+                    @Override
+                    public CancelJobRunResult cancelJobRun(
+                        String applicationId, String jobId, boolean allowExceptionPropagation) {
+                      super.cancelJobRun(applicationId, jobId, allowExceptionPropagation);
+                      throw new IllegalArgumentException("Unknown Error");
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+              // Mock flint index
+              mockDS.createIndex();
+              HashMap<String, Object> existingOptions = new HashMap<>();
+              existingOptions.put("auto_refresh", "true");
+              mockDS.updateIndexOptions(existingOptions, false);
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.getLatestId(), MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. alter index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.getQuery(), MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("FAILED", asyncQueryExecutionResponse.getStatus());
+              assertEquals("Internal Server Error.", asyncQueryExecutionResponse.getError());
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(1);
+              emrsClient.getJobRunResultCalled(0);
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+              Map<String, Object> mappings = mockDS.getIndexMappings();
+              Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+              Map<String, Object> options = (Map<String, Object>) meta.get("options");
+              Assertions.assertEquals("false", options.get("auto_refresh"));
+            });
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/IndexQuerySpecTest.java b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/IndexQuerySpecTest.java
new file mode 100644
index 0000000000..920981abf1
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/IndexQuerySpecTest.java
@@ -0,0 +1,1065 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import com.amazonaws.services.emrserverless.model.CancelJobRunResult;
+import com.amazonaws.services.emrserverless.model.GetJobRunResult;
+import com.amazonaws.services.emrserverless.model.JobRun;
+import com.amazonaws.services.emrserverless.model.ValidationException;
+import com.google.common.collect.ImmutableList;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryExecutionResponse;
+import org.opensearch.sql.spark.asyncquery.model.MockFlintIndex;
+import org.opensearch.sql.spark.asyncquery.model.MockFlintSparkJob;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexType;
+import org.opensearch.sql.spark.leasemanager.ConcurrencyLimitExceededException;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+public class IndexQuerySpecTest extends AsyncQueryExecutorServiceSpec {
+  private final String specialName = "`test ,:\"+/\\|?#><`";
+  private final String encodedName = "test%20%2c%3a%22%2b%2f%5c%7c%3f%23%3e%3c";
+
+  public final String REFRESH_SI = "REFRESH SKIPPING INDEX on mys3.default.http_logs";
+  public final String REFRESH_CI = "REFRESH INDEX covering ON mys3.default.http_logs";
+  public final String REFRESH_MV = "REFRESH MATERIALIZED VIEW mys3.default.http_logs_metrics";
+  public final String REFRESH_SCI = "REFRESH SKIPPING INDEX on mys3.default." + specialName;
+
+  public final FlintDatasetMock LEGACY_SKIPPING =
+      new FlintDatasetMock(
+              "DROP SKIPPING INDEX ON mys3.default.http_logs",
+              REFRESH_SI,
+              FlintIndexType.SKIPPING,
+              "flint_mys3_default_http_logs_skipping_index")
+          .isLegacy(true);
+  public final FlintDatasetMock LEGACY_COVERING =
+      new FlintDatasetMock(
+              "DROP INDEX covering ON mys3.default.http_logs",
+              REFRESH_CI,
+              FlintIndexType.COVERING,
+              "flint_mys3_default_http_logs_covering_index")
+          .isLegacy(true);
+  public final FlintDatasetMock LEGACY_MV =
+      new FlintDatasetMock(
+              "DROP MATERIALIZED VIEW mys3.default.http_logs_metrics",
+              REFRESH_MV,
+              FlintIndexType.MATERIALIZED_VIEW,
+              "flint_mys3_default_http_logs_metrics")
+          .isLegacy(true);
+
+  public final FlintDatasetMock LEGACY_SPECIAL_CHARACTERS =
+      new FlintDatasetMock(
+              "DROP SKIPPING INDEX ON mys3.default." + specialName,
+              REFRESH_SCI,
+              FlintIndexType.SKIPPING,
+              "flint_mys3_default_" + encodedName + "_skipping_index")
+          .isLegacy(true)
+          .isSpecialCharacter(true);
+
+  public final FlintDatasetMock SKIPPING =
+      new FlintDatasetMock(
+              "DROP SKIPPING INDEX ON mys3.default.http_logs",
+              REFRESH_SI,
+              FlintIndexType.SKIPPING,
+              "flint_mys3_default_http_logs_skipping_index")
+          .latestId("ZmxpbnRfbXlzM19kZWZhdWx0X2h0dHBfbG9nc19za2lwcGluZ19pbmRleA==");
+  public final FlintDatasetMock COVERING =
+      new FlintDatasetMock(
+              "DROP INDEX covering ON mys3.default.http_logs",
+              REFRESH_CI,
+              FlintIndexType.COVERING,
+              "flint_mys3_default_http_logs_covering_index")
+          .latestId("ZmxpbnRfbXlzM19kZWZhdWx0X2h0dHBfbG9nc19jb3ZlcmluZ19pbmRleA==");
+  public final FlintDatasetMock MV =
+      new FlintDatasetMock(
+              "DROP MATERIALIZED VIEW mys3.default.http_logs_metrics",
+              REFRESH_MV,
+              FlintIndexType.MATERIALIZED_VIEW,
+              "flint_mys3_default_http_logs_metrics")
+          .latestId("ZmxpbnRfbXlzM19kZWZhdWx0X2h0dHBfbG9nc19tZXRyaWNz");
+  public final FlintDatasetMock SPECIAL_CHARACTERS =
+      new FlintDatasetMock(
+              "DROP SKIPPING INDEX ON mys3.default." + specialName,
+              REFRESH_SCI,
+              FlintIndexType.SKIPPING,
+              "flint_mys3_default_" + encodedName + "_skipping_index")
+          .isSpecialCharacter(true)
+          .latestId(
+              "ZmxpbnRfbXlzM19kZWZhdWx0X3Rlc3QlMjAlMmMlM2ElMjIlMmIlMmYlNWMlN2MlM2YlMjMlM2UlM2Nfc2tpcHBpbmdfaW5kZXg=");
+
+  public final String CREATE_SI_AUTO =
+      "CREATE SKIPPING INDEX ON mys3.default.http_logs"
+          + "(l_orderkey VALUE_SET) WITH (auto_refresh = true)";
+
+  public final String CREATE_CI_AUTO =
+      "CREATE INDEX covering ON mys3.default.http_logs "
+          + "(l_orderkey, l_quantity) WITH (auto_refresh = true)";
+
+  public final String CREATE_MV_AUTO =
+      "CREATE MATERIALIZED VIEW mys3.default.http_logs_metrics AS select * "
+          + "from mys3.default.https WITH (auto_refresh = true)";
+
+  /**
+   * Happy case. expectation is
+   *
+   * <p>(1) Drop Index response is SUCCESS
+   */
+  @Test
+  public void legacyBasicDropAndFetchAndCancel() {
+    ImmutableList.of(LEGACY_SKIPPING, LEGACY_COVERING, LEGACY_SPECIAL_CHARACTERS)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      return new GetJobRunResult().withJobRun(new JobRun().withState("Cancelled"));
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+
+              // 1.drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              assertNotNull(response.getQueryId());
+              assertTrue(clusterService.state().routingTable().hasIndex(mockDS.indexName));
+
+              // 2.fetch result
+              AsyncQueryExecutionResponse asyncQueryResults =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("SUCCESS", asyncQueryResults.getStatus());
+              assertNull(asyncQueryResults.getError());
+              emrsClient.cancelJobRunCalled(1);
+
+              // 3.cancel
+              IllegalArgumentException exception =
+                  assertThrows(
+                      IllegalArgumentException.class,
+                      () ->
+                          asyncQueryExecutorService.cancelQuery(
+                              response.getQueryId(), asyncQueryRequestContext));
+              assertEquals("can't cancel index DML query", exception.getMessage());
+            });
+  }
+
+  /**
+   * Legacy Test, without state index support. Not EMR-S job running. expectation is
+   *
+   * <p>(1) Drop Index response is SUCCESS
+   */
+  @Test
+  public void legacyDropIndexNoJobRunning() {
+    ImmutableList.of(LEGACY_SKIPPING, LEGACY_COVERING, LEGACY_MV, LEGACY_SPECIAL_CHARACTERS)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public CancelJobRunResult cancelJobRun(
+                        String applicationId, String jobId, boolean allowExceptionPropagation) {
+                      throw new ValidationException("Job run is not in a cancellable state");
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+
+              // 1.drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2.fetch result.
+              AsyncQueryExecutionResponse asyncQueryResults =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("SUCCESS", asyncQueryResults.getStatus());
+              assertNull(asyncQueryResults.getError());
+            });
+  }
+
+  /**
+   * Legacy Test, without state index support. Cancel EMR-S job call timeout. expectation is
+   *
+   * <p>(1) Drop Index response is FAILED
+   */
+  @Test
+  public void legacyDropIndexCancelJobTimeout() {
+    ImmutableList.of(LEGACY_SKIPPING, LEGACY_COVERING, LEGACY_MV, LEGACY_SPECIAL_CHARACTERS)
+        .forEach(
+            mockDS -> {
+              // Mock EMR-S always return running.
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      return new GetJobRunResult().withJobRun(new JobRun().withState("Running"));
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+
+              // 1. drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryResults =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("FAILED", asyncQueryResults.getStatus());
+              assertEquals("Cancel job operation timed out.", asyncQueryResults.getError());
+            });
+  }
+
+  /**
+   * Legacy Test, without state index support. Not EMR-S job running. expectation is
+   *
+   * <p>(1) Drop Index response is SUCCESS
+   */
+  @Test
+  public void legacyDropIndexSpecialCharacter() {
+    FlintDatasetMock mockDS = LEGACY_SPECIAL_CHARACTERS;
+    LocalEMRSClient emrsClient =
+        new LocalEMRSClient() {
+          @Override
+          public CancelJobRunResult cancelJobRun(
+              String applicationId, String jobId, boolean allowExceptionPropagation) {
+            throw new ValidationException("Job run is not in a cancellable state");
+          }
+        };
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // Mock flint index
+    mockDS.createIndex();
+
+    // 1.drop index
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(mockDS.query, MYGLUE_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+
+    // 2.fetch result.
+    AsyncQueryExecutionResponse asyncQueryResults =
+        asyncQueryExecutorService.getAsyncQueryResults(
+            response.getQueryId(), asyncQueryRequestContext);
+    assertEquals("SUCCESS", asyncQueryResults.getStatus());
+    assertNull(asyncQueryResults.getError());
+  }
+
+  /**
+   * Happy case. expectation is
+   *
+   * <p>(1) Drop Index response is SUCCESS (2) change index state to: DELETED
+   */
+  @Test
+  public void dropAndFetchAndCancel() {
+    ImmutableList.of(SKIPPING, COVERING, MV, SPECIAL_CHARACTERS)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      return new GetJobRunResult().withJobRun(new JobRun().withState("Cancelled"));
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.latestId, MYS3_DATASOURCE);
+              flintIndexJob.refreshing();
+
+              // 1.drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              assertNotNull(response.getQueryId());
+              assertTrue(clusterService.state().routingTable().hasIndex(mockDS.indexName));
+
+              // assert state is DELETED
+              flintIndexJob.assertState(FlintIndexState.DELETED);
+
+              // 2.fetch result
+              AsyncQueryExecutionResponse asyncQueryResults =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("SUCCESS", asyncQueryResults.getStatus());
+              assertNull(asyncQueryResults.getError());
+              emrsClient.cancelJobRunCalled(1);
+
+              // 3.cancel
+              IllegalArgumentException exception =
+                  assertThrows(
+                      IllegalArgumentException.class,
+                      () ->
+                          asyncQueryExecutorService.cancelQuery(
+                              response.getQueryId(), asyncQueryRequestContext));
+              assertEquals("can't cancel index DML query", exception.getMessage());
+            });
+  }
+
+  /**
+   * Cancel EMR-S job, but not job running. expectation is
+   *
+   * <p>(1) Drop Index response is SUCCESS (2) change index state to: DELETED
+   */
+  @Test
+  public void dropIndexNoJobRunning() {
+    ImmutableList.of(SKIPPING, COVERING, MV)
+        .forEach(
+            mockDS -> {
+              // Mock EMR-S job is not running
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public CancelJobRunResult cancelJobRun(
+                        String applicationId, String jobId, boolean allowExceptionPropagation) {
+                      throw new ValidationException("Job run is not in a cancellable state");
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+              // Mock index state in refresh state.
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.latestId, MYS3_DATASOURCE);
+              flintIndexJob.refreshing();
+
+              // 1.drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2.fetch result.
+              AsyncQueryExecutionResponse asyncQueryResults =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("SUCCESS", asyncQueryResults.getStatus());
+              assertNull(asyncQueryResults.getError());
+
+              flintIndexJob.assertState(FlintIndexState.DELETED);
+            });
+  }
+
+  /**
+   * Cancel EMR-S job call timeout, expectation is
+   *
+   * <p>(1) Drop Index response is failed, (2) change index state to: CANCELLING
+   */
+  @Test
+  public void dropIndexCancelJobTimeout() {
+    ImmutableList.of(SKIPPING, COVERING, MV)
+        .forEach(
+            mockDS -> {
+              // Mock EMR-S always return running.
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      return new GetJobRunResult().withJobRun(new JobRun().withState("Running"));
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.latestId, MYS3_DATASOURCE);
+              flintIndexJob.refreshing();
+
+              // 1. drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryResults =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("FAILED", asyncQueryResults.getStatus());
+              assertEquals("Cancel job operation timed out.", asyncQueryResults.getError());
+              flintIndexJob.assertState(FlintIndexState.REFRESHING);
+            });
+  }
+
+  /**
+   * Drop Index operation is retryable, expectation is
+   *
+   * <p>(1) call EMR-S (2) change index state to: DELETED
+   */
+  @Test
+  public void dropIndexWithIndexInRefreshingState() {
+    ImmutableList.of(SKIPPING, COVERING, MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      return new GetJobRunResult().withJobRun(new JobRun().withState("Cancelled"));
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.latestId, MYS3_DATASOURCE);
+              flintIndexJob.refreshing();
+
+              // 1. drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              assertEquals(
+                  "SUCCESS",
+                  asyncQueryExecutorService
+                      .getAsyncQueryResults(response.getQueryId(), asyncQueryRequestContext)
+                      .getStatus());
+
+              flintIndexJob.assertState(FlintIndexState.DELETED);
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(1);
+              emrsClient.getJobRunResultCalled(1);
+            });
+  }
+
+  /**
+   * Index state is stable, Drop Index operation is retryable, expectation is
+   *
+   * <p>(1) call EMR-S (2) change index state to: DELETED
+   */
+  @Test
+  public void dropIndexWithIndexInActiveState() {
+    ImmutableList.of(SKIPPING, COVERING, MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      return new GetJobRunResult().withJobRun(new JobRun().withState("Cancelled"));
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.latestId, MYS3_DATASOURCE);
+              flintIndexJob.active();
+
+              // 1. drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("SUCCESS", asyncQueryExecutionResponse.getStatus());
+              flintIndexJob.assertState(FlintIndexState.DELETED);
+              emrsClient.startJobRunCalled(0);
+              emrsClient.cancelJobRunCalled(1);
+              emrsClient.getJobRunResultCalled(1);
+            });
+  }
+
+  /**
+   * Index state is stable, expectation is
+   *
+   * <p>(1) call EMR-S (2) change index state to: DELETED
+   */
+  @Test
+  public void dropIndexWithIndexInCreatingState() {
+    ImmutableList.of(SKIPPING, COVERING, MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      return new GetJobRunResult().withJobRun(new JobRun().withState("Cancelled"));
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.latestId, MYS3_DATASOURCE);
+              flintIndexJob.creating();
+
+              // 1. drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              assertEquals(
+                  "SUCCESS",
+                  asyncQueryExecutorService
+                      .getAsyncQueryResults(response.getQueryId(), asyncQueryRequestContext)
+                      .getStatus());
+
+              flintIndexJob.assertState(FlintIndexState.DELETED);
+            });
+  }
+
+  /**
+   * Index state is stable, Drop Index operation is retryable, expectation is
+   *
+   * <p>(1) call EMR-S (2) change index state to: DELETED
+   */
+  @Test
+  public void dropIndexWithIndexInEmptyState() {
+    ImmutableList.of(SKIPPING, COVERING, MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      super.getJobRunResult(applicationId, jobId);
+                      return new GetJobRunResult().withJobRun(new JobRun().withState("Cancelled"));
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.latestId, MYS3_DATASOURCE);
+
+              // 1. drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              assertEquals(
+                  "SUCCESS",
+                  asyncQueryExecutorService
+                      .getAsyncQueryResults(response.getQueryId(), asyncQueryRequestContext)
+                      .getStatus());
+
+              flintIndexJob.assertState(FlintIndexState.DELETED);
+            });
+  }
+
+  /**
+   * Couldn't acquire lock as the index is in transitioning state. Will result in error.
+   *
+   * <p>(1) not call EMR-S (2) change index state to: DELETED
+   */
+  @Test
+  public void dropIndexWithIndexInDeletedState() {
+    ImmutableList.of(SKIPPING, COVERING, MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public CancelJobRunResult cancelJobRun(
+                        String applicationId, String jobId, boolean allowExceptionPropagation) {
+                      Assert.fail("should not call cancelJobRun");
+                      return null;
+                    }
+
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      Assert.fail("should not call getJobRunResult");
+                      return null;
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.latestId, MYS3_DATASOURCE);
+              flintIndexJob.deleting();
+
+              // 1. drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              // 2. fetch result
+              assertEquals("FAILED", asyncQueryExecutionResponse.getStatus());
+              assertEquals(
+                  "Transaction failed as flint index is not in a valid state.",
+                  asyncQueryExecutionResponse.getError());
+              flintIndexJob.assertState(FlintIndexState.DELETING);
+            });
+  }
+
+  /**
+   * Cancel EMR-S job, but not job running. expectation is
+   *
+   * <p>(1) Drop Index response is SUCCESS (2) change index state to: DELETED
+   */
+  @Test
+  public void dropIndexSpecialCharacter() {
+    FlintDatasetMock mockDS = SPECIAL_CHARACTERS;
+    // Mock EMR-S job is not running
+    LocalEMRSClient emrsClient =
+        new LocalEMRSClient() {
+          @Override
+          public CancelJobRunResult cancelJobRun(
+              String applicationId, String jobId, boolean allowExceptionPropagation) {
+            throw new IllegalArgumentException("Job run is not in a cancellable state");
+          }
+        };
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // Mock flint index
+    mockDS.createIndex();
+    // Mock index state in refresh state.
+    MockFlintSparkJob flintIndexJob =
+        new MockFlintSparkJob(flintIndexStateModelService, mockDS.latestId, MYGLUE_DATASOURCE);
+    flintIndexJob.refreshing();
+
+    // 1.drop index
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(mockDS.query, MYGLUE_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+
+    // 2.fetch result.
+    AsyncQueryExecutionResponse asyncQueryResults =
+        asyncQueryExecutorService.getAsyncQueryResults(
+            response.getQueryId(), asyncQueryRequestContext);
+    assertEquals("FAILED", asyncQueryResults.getStatus());
+    assertEquals("Internal Server Error.", asyncQueryResults.getError());
+
+    flintIndexJob.assertState(FlintIndexState.REFRESHING);
+  }
+
+  /**
+   * No Job running, expectation is
+   *
+   * <p>(1) not call EMR-S (2) change index state to: DELETED
+   */
+  @Test
+  public void edgeCaseNoIndexStateDoc() {
+    ImmutableList.of(SKIPPING, COVERING, MV)
+        .forEach(
+            mockDS -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public CancelJobRunResult cancelJobRun(
+                        String applicationId, String jobId, boolean allowExceptionPropagation) {
+                      Assert.fail("should not call cancelJobRun");
+                      return null;
+                    }
+
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      Assert.fail("should not call getJobRunResult");
+                      return null;
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // Mock flint index
+              mockDS.createIndex();
+
+              // 1. drop index
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. fetch result
+              AsyncQueryExecutionResponse asyncQueryResults =
+                  asyncQueryExecutorService.getAsyncQueryResults(
+                      response.getQueryId(), asyncQueryRequestContext);
+              assertEquals("FAILED", asyncQueryResults.getStatus());
+              assertTrue(asyncQueryResults.getError().contains("no state found"));
+            });
+  }
+
+  @Test
+  public void concurrentRefreshJobLimitNotApplied() {
+    EMRServerlessClientFactory emrServerlessClientFactory = new LocalEMRServerlessClientFactory();
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    // Mock flint index
+    COVERING.createIndex();
+    // Mock index state
+    MockFlintSparkJob flintIndexJob =
+        new MockFlintSparkJob(flintIndexStateModelService, COVERING.latestId, MYS3_DATASOURCE);
+    flintIndexJob.refreshing();
+
+    // query with auto refresh
+    String query =
+        "CREATE INDEX covering ON mys3.default.http_logs(l_orderkey, "
+            + "l_quantity) WITH (auto_refresh = true)";
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(query, MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+    assertNull(response.getSessionId());
+  }
+
+  @Test
+  public void concurrentRefreshJobLimitAppliedToDDLWithAuthRefresh() {
+    EMRServerlessClientFactory emrServerlessClientFactory = new LocalEMRServerlessClientFactory();
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    setConcurrentRefreshJob(1);
+
+    // Mock flint index
+    COVERING.createIndex();
+    // Mock index state
+    MockFlintSparkJob flintIndexJob =
+        new MockFlintSparkJob(flintIndexStateModelService, COVERING.latestId, MYS3_DATASOURCE);
+    flintIndexJob.refreshing();
+
+    // query with auto_refresh = true.
+    String query =
+        "CREATE INDEX covering ON mys3.default.http_logs(l_orderkey, "
+            + "l_quantity) WITH (auto_refresh = true)";
+    ConcurrencyLimitExceededException exception =
+        assertThrows(
+            ConcurrencyLimitExceededException.class,
+            () ->
+                asyncQueryExecutorService.createAsyncQuery(
+                    new CreateAsyncQueryRequest(query, MYS3_DATASOURCE, LangType.SQL, null),
+                    asyncQueryRequestContext));
+    assertEquals("domain concurrent refresh job can not exceed 1", exception.getMessage());
+  }
+
+  @Test
+  public void concurrentRefreshJobLimitAppliedToRefresh() {
+    EMRServerlessClientFactory emrServerlessClientFactory = new LocalEMRServerlessClientFactory();
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    setConcurrentRefreshJob(1);
+
+    // Mock flint index
+    COVERING.createIndex();
+    // Mock index state
+    MockFlintSparkJob flintIndexJob =
+        new MockFlintSparkJob(flintIndexStateModelService, COVERING.latestId, MYS3_DATASOURCE);
+    flintIndexJob.refreshing();
+
+    // query with auto_refresh = true.
+    String query = "REFRESH INDEX covering ON mys3.default.http_logs";
+    ConcurrencyLimitExceededException exception =
+        assertThrows(
+            ConcurrencyLimitExceededException.class,
+            () ->
+                asyncQueryExecutorService.createAsyncQuery(
+                    new CreateAsyncQueryRequest(query, MYS3_DATASOURCE, LangType.SQL, null),
+                    asyncQueryRequestContext));
+    assertEquals("domain concurrent refresh job can not exceed 1", exception.getMessage());
+  }
+
+  @Test
+  public void concurrentRefreshJobLimitNotAppliedToDDL() {
+    String query = "CREATE INDEX covering ON mys3.default.http_logs(l_orderkey, l_quantity)";
+    EMRServerlessClientFactory emrServerlessClientFactory = new LocalEMRServerlessClientFactory();
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+    setConcurrentRefreshJob(1);
+
+    // Mock flint index
+    COVERING.createIndex();
+    // Mock index state
+    MockFlintSparkJob flintIndexJob =
+        new MockFlintSparkJob(flintIndexStateModelService, COVERING.latestId, MYS3_DATASOURCE);
+    flintIndexJob.refreshing();
+
+    CreateAsyncQueryResponse asyncQueryResponse =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(query, MYS3_DATASOURCE, LangType.SQL, null),
+            asyncQueryRequestContext);
+  }
+
+  /** Cancel create flint index statement with auto_refresh=true, should throw exception. */
+  @Test
+  public void cancelAutoRefreshCreateFlintIndexShouldThrowException() {
+    ImmutableList.of(CREATE_SI_AUTO, CREATE_CI_AUTO, CREATE_MV_AUTO)
+        .forEach(
+            query -> {
+              LocalEMRSClient emrsClient =
+                  new LocalEMRSClient() {
+                    @Override
+                    public CancelJobRunResult cancelJobRun(
+                        String applicationId, String jobId, boolean allowExceptionPropagation) {
+                      Assert.fail("should not call cancelJobRun");
+                      return null;
+                    }
+
+                    @Override
+                    public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                      Assert.fail("should not call getJobRunResult");
+                      return null;
+                    }
+                  };
+              EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(emrServerlessClientFactory);
+
+              // 1. submit create / refresh index query
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(query, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+
+              // 2. cancel query
+              IllegalArgumentException exception =
+                  assertThrows(
+                      IllegalArgumentException.class,
+                      () ->
+                          asyncQueryExecutorService.cancelQuery(
+                              response.getQueryId(), asyncQueryRequestContext));
+              assertEquals(
+                  "can't cancel index DML query, using ALTER auto_refresh=off statement to stop"
+                      + " job, using VACUUM statement to stop job and delete data",
+                  exception.getMessage());
+            });
+  }
+
+  /** Cancel REFRESH statement should success */
+  @Test
+  public void cancelRefreshStatement() {
+    ImmutableList.of(SKIPPING, COVERING, MV)
+        .forEach(
+            mockDS -> {
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(
+                      (accountId) ->
+                          new LocalEMRSClient() {
+                            @Override
+                            public GetJobRunResult getJobRunResult(
+                                String applicationId, String jobId) {
+                              return new GetJobRunResult()
+                                  .withJobRun(new JobRun().withState("Cancelled"));
+                            }
+                          });
+
+              // Mock flint index
+              mockDS.createIndex();
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.latestId, MYS3_DATASOURCE);
+
+              // 1. Submit REFRESH statement
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.refreshQuery, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+              // mock index state.
+              flintIndexJob.refreshing();
+
+              // 2. Cancel query
+              String cancelResponse =
+                  asyncQueryExecutorService.cancelQuery(
+                      response.getQueryId(), asyncQueryRequestContext);
+
+              assertNotNull(cancelResponse);
+              assertTrue(clusterService.state().routingTable().hasIndex(mockDS.indexName));
+
+              // assert state is active
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+            });
+  }
+
+  /** Cancel REFRESH statement should success */
+  @Test
+  public void cancelRefreshStatementWithActiveState() {
+    ImmutableList.of(SKIPPING, COVERING, MV)
+        .forEach(
+            mockDS -> {
+              AsyncQueryExecutorService asyncQueryExecutorService =
+                  createAsyncQueryExecutorService(
+                      (accountId) ->
+                          new LocalEMRSClient() {
+                            @Override
+                            public GetJobRunResult getJobRunResult(
+                                String applicationId, String jobId) {
+                              return new GetJobRunResult()
+                                  .withJobRun(new JobRun().withState("Cancelled"));
+                            }
+                          });
+
+              // Mock flint index
+              mockDS.createIndex();
+              // Mock index state
+              MockFlintSparkJob flintIndexJob =
+                  new MockFlintSparkJob(
+                      flintIndexStateModelService, mockDS.latestId, MYS3_DATASOURCE);
+
+              // 1. Submit REFRESH statement
+              CreateAsyncQueryResponse response =
+                  asyncQueryExecutorService.createAsyncQuery(
+                      new CreateAsyncQueryRequest(
+                          mockDS.refreshQuery, MYS3_DATASOURCE, LangType.SQL, null),
+                      asyncQueryRequestContext);
+              // mock index state.
+              flintIndexJob.active();
+
+              // 2. Cancel query
+              IllegalStateException illegalStateException =
+                  Assertions.assertThrows(
+                      IllegalStateException.class,
+                      () ->
+                          asyncQueryExecutorService.cancelQuery(
+                              response.getQueryId(), asyncQueryRequestContext));
+              Assertions.assertEquals(
+                  "Transaction failed as flint index is not in a valid state.",
+                  illegalStateException.getMessage());
+
+              // assert state is active
+              flintIndexJob.assertState(FlintIndexState.ACTIVE);
+            });
+  }
+
+  @Test
+  public void cancelRefreshStatementWithFailureInFetchingIndexMetadata() {
+    String indexName = "flint_my_glue_mydb_http_logs_covering_corrupted_index";
+    MockFlintIndex mockFlintIndex =
+        new MockFlintIndex(client(), indexName, FlintIndexType.COVERING, null);
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        createAsyncQueryExecutorService(
+            (accountId) ->
+                new LocalEMRSClient() {
+                  @Override
+                  public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+                    return new GetJobRunResult().withJobRun(new JobRun().withState("Cancelled"));
+                  }
+                });
+
+    mockFlintIndex.createIndex();
+    // Mock index state
+    MockFlintSparkJob flintIndexJob =
+        new MockFlintSparkJob(
+            flintIndexStateModelService, indexName + "_latest_id", MYS3_DATASOURCE);
+
+    // 1. Submit REFRESH statement
+    CreateAsyncQueryResponse response =
+        asyncQueryExecutorService.createAsyncQuery(
+            new CreateAsyncQueryRequest(
+                "REFRESH INDEX covering_corrupted ON my_glue.mydb.http_logs",
+                MYS3_DATASOURCE,
+                LangType.SQL,
+                null),
+            asyncQueryRequestContext);
+    // mock index state.
+    flintIndexJob.refreshing();
+
+    // 2. Cancel query
+    Assertions.assertThrows(
+        IllegalStateException.class,
+        () ->
+            asyncQueryExecutorService.cancelQuery(response.getQueryId(), asyncQueryRequestContext));
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/OpenSearchAsyncQueryJobMetadataStorageServiceTest.java b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/OpenSearchAsyncQueryJobMetadataStorageServiceTest.java
new file mode 100644
index 0000000000..c84d68421d
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/OpenSearchAsyncQueryJobMetadataStorageServiceTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery;
+
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_APPLICATION_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.EMR_JOB_ID;
+
+import java.util.Optional;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.opensearch.sql.spark.asyncquery.exceptions.AsyncQueryNotFoundException;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.execution.statestore.StateStore;
+import org.opensearch.sql.spark.execution.xcontent.AsyncQueryJobMetadataXContentSerializer;
+import org.opensearch.sql.spark.utils.IDUtils;
+import org.opensearch.test.OpenSearchIntegTestCase;
+
+public class OpenSearchAsyncQueryJobMetadataStorageServiceTest extends OpenSearchIntegTestCase {
+
+  public static final String DS_NAME = "mys3";
+  private static final String MOCK_SESSION_ID = "sessionId";
+  private static final String MOCK_RESULT_INDEX = "resultIndex";
+  private static final String MOCK_QUERY_ID = "00fdo6u94n7abo0q";
+  private OpenSearchAsyncQueryJobMetadataStorageService openSearchJobMetadataStorageService;
+  private AsyncQueryRequestContext asyncQueryRequestContext = new NullAsyncQueryRequestContext();
+
+  @Before
+  public void setup() {
+    openSearchJobMetadataStorageService =
+        new OpenSearchAsyncQueryJobMetadataStorageService(
+            new StateStore(client(), clusterService()),
+            new AsyncQueryJobMetadataXContentSerializer());
+  }
+
+  @Test
+  public void testStoreJobMetadata() {
+    AsyncQueryJobMetadata expected =
+        AsyncQueryJobMetadata.builder()
+            .queryId(IDUtils.encode(DS_NAME))
+            .jobId(EMR_JOB_ID)
+            .applicationId(EMRS_APPLICATION_ID)
+            .resultIndex(MOCK_RESULT_INDEX)
+            .datasourceName(DS_NAME)
+            .build();
+
+    openSearchJobMetadataStorageService.storeJobMetadata(expected, asyncQueryRequestContext);
+    Optional<AsyncQueryJobMetadata> actual =
+        openSearchJobMetadataStorageService.getJobMetadata(expected.getQueryId());
+
+    assertTrue(actual.isPresent());
+    assertEquals(expected, actual.get());
+    assertEquals(expected, actual.get());
+    assertNull(actual.get().getSessionId());
+  }
+
+  @Test
+  public void testStoreJobMetadataWithResultExtraData() {
+    AsyncQueryJobMetadata expected =
+        AsyncQueryJobMetadata.builder()
+            .queryId(IDUtils.encode(DS_NAME))
+            .jobId(EMR_JOB_ID)
+            .applicationId(EMRS_APPLICATION_ID)
+            .resultIndex(MOCK_RESULT_INDEX)
+            .sessionId(MOCK_SESSION_ID)
+            .datasourceName(DS_NAME)
+            .build();
+
+    openSearchJobMetadataStorageService.storeJobMetadata(expected, asyncQueryRequestContext);
+    Optional<AsyncQueryJobMetadata> actual =
+        openSearchJobMetadataStorageService.getJobMetadata(expected.getQueryId());
+
+    assertTrue(actual.isPresent());
+    assertEquals(expected, actual.get());
+    assertEquals(MOCK_RESULT_INDEX, actual.get().getResultIndex());
+    assertEquals(MOCK_SESSION_ID, actual.get().getSessionId());
+  }
+
+  @Test
+  public void testGetJobMetadataWithMalformedQueryId() {
+    AsyncQueryNotFoundException asyncQueryNotFoundException =
+        Assertions.assertThrows(
+            AsyncQueryNotFoundException.class,
+            () -> openSearchJobMetadataStorageService.getJobMetadata(MOCK_QUERY_ID));
+    Assertions.assertEquals(
+        String.format("Invalid QueryId: %s", MOCK_QUERY_ID),
+        asyncQueryNotFoundException.getMessage());
+  }
+
+  @Test
+  public void testGetJobMetadataWithEmptyQueryId() {
+    AsyncQueryNotFoundException asyncQueryNotFoundException =
+        Assertions.assertThrows(
+            AsyncQueryNotFoundException.class,
+            () -> openSearchJobMetadataStorageService.getJobMetadata(""));
+    Assertions.assertEquals("Invalid QueryId: ", asyncQueryNotFoundException.getMessage());
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/model/MockFlintIndex.java b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/model/MockFlintIndex.java
new file mode 100644
index 0000000000..e25250fd09
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/model/MockFlintIndex.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery.model;
+
+import java.util.Map;
+import lombok.Getter;
+import lombok.SneakyThrows;
+import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
+import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.opensearch.client.Client;
+import org.opensearch.sql.spark.flint.FlintIndexType;
+import org.opensearch.sql.spark.utils.TestUtils;
+
+@Getter
+public class MockFlintIndex {
+  private final String indexName;
+  private final Client client;
+  private final FlintIndexType flintIndexType;
+  private final String query;
+
+  public MockFlintIndex(
+      Client client, String indexName, FlintIndexType flintIndexType, String query) {
+    this.client = client;
+    this.indexName = indexName;
+    this.flintIndexType = flintIndexType;
+    this.query = query;
+  }
+
+  public void createIndex() {
+    String mappingFile = String.format("flint-index-mappings/%s_mapping.json", indexName);
+    TestUtils.createIndexWithMappings(client, indexName, mappingFile);
+  }
+
+  public String getLatestId() {
+    return this.indexName + "_latest_id";
+  }
+
+  @SneakyThrows
+  public void deleteIndex() {
+    client.admin().indices().delete(new DeleteIndexRequest().indices(indexName)).get();
+  }
+
+  public Map<String, Object> getIndexMappings() {
+    return client
+        .admin()
+        .indices()
+        .prepareGetMappings(indexName)
+        .get()
+        .getMappings()
+        .get(indexName)
+        .getSourceAsMap();
+  }
+
+  public void updateIndexOptions(Map<String, Object> newOptions, Boolean replaceCompletely) {
+    GetMappingsResponse mappingsResponse =
+        client.admin().indices().prepareGetMappings().setIndices(indexName).get();
+    Map<String, Object> flintMetadataMap =
+        mappingsResponse.getMappings().get(indexName).getSourceAsMap();
+    Map<String, Object> meta = (Map<String, Object>) flintMetadataMap.get("_meta");
+    Map<String, Object> options = (Map<String, Object>) meta.get("options");
+    if (replaceCompletely) {
+      meta.put("options", newOptions);
+    } else {
+      options.putAll(newOptions);
+    }
+    client.admin().indices().preparePutMapping(indexName).setSource(flintMetadataMap).get();
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/model/MockFlintSparkJob.java b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/model/MockFlintSparkJob.java
new file mode 100644
index 0000000000..0dc8f02820
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/model/MockFlintSparkJob.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.asyncquery.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Optional;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexStateModel;
+import org.opensearch.sql.spark.flint.FlintIndexStateModelService;
+
+public class MockFlintSparkJob {
+  private FlintIndexStateModel stateModel;
+  private FlintIndexStateModelService flintIndexStateModelService;
+  private String datasource;
+  private AsyncQueryRequestContext asyncQueryRequestContext = new NullAsyncQueryRequestContext();
+
+  public MockFlintSparkJob(
+      FlintIndexStateModelService flintIndexStateModelService, String latestId, String datasource) {
+    assertNotNull(latestId);
+    this.flintIndexStateModelService = flintIndexStateModelService;
+    this.datasource = datasource;
+    stateModel =
+        FlintIndexStateModel.builder()
+            .indexState(FlintIndexState.EMPTY)
+            .applicationId("mockAppId")
+            .jobId("mockJobId")
+            .latestId(latestId)
+            .datasourceName(datasource)
+            .lastUpdateTime(System.currentTimeMillis())
+            .error("")
+            .build();
+    stateModel =
+        flintIndexStateModelService.createFlintIndexStateModel(
+            stateModel, asyncQueryRequestContext);
+  }
+
+  public void transition(FlintIndexState newState) {
+    stateModel =
+        flintIndexStateModelService.updateFlintIndexState(
+            stateModel, newState, datasource, asyncQueryRequestContext);
+  }
+
+  public void refreshing() {
+    transition(FlintIndexState.REFRESHING);
+  }
+
+  public void active() {
+    transition(FlintIndexState.ACTIVE);
+  }
+
+  public void creating() {
+    transition(FlintIndexState.CREATING);
+  }
+
+  public void updating() {
+    transition(FlintIndexState.UPDATING);
+  }
+
+  public void deleting() {
+    transition(FlintIndexState.DELETING);
+  }
+
+  public void deleted() {
+    transition(FlintIndexState.DELETED);
+  }
+
+  public void assertState(FlintIndexState expected) {
+    Optional<FlintIndexStateModel> stateModelOpt =
+        flintIndexStateModelService.getFlintIndexStateModel(
+            stateModel.getId(), datasource, asyncQueryRequestContext);
+    assertTrue(stateModelOpt.isPresent());
+    assertEquals(expected, stateModelOpt.get().getIndexState());
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/cluster/FlintStreamingJobHouseKeeperTaskTest.java b/async-query/src/test/java/org/opensearch/sql/spark/cluster/FlintStreamingJobHouseKeeperTaskTest.java
new file mode 100644
index 0000000000..0a3a180932
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/cluster/FlintStreamingJobHouseKeeperTaskTest.java
@@ -0,0 +1,582 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.cluster;
+
+import static org.opensearch.sql.datasource.model.DataSourceStatus.DISABLED;
+import static org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorServiceSpec.MYGLUE_DATASOURCE;
+
+import com.amazonaws.services.emrserverless.model.GetJobRunResult;
+import com.amazonaws.services.emrserverless.model.JobRun;
+import com.google.common.collect.ImmutableList;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.SneakyThrows;
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.opensearch.sql.datasource.model.DataSourceStatus;
+import org.opensearch.sql.legacy.metrics.MetricName;
+import org.opensearch.sql.legacy.metrics.Metrics;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorServiceSpec;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.MockFlintIndex;
+import org.opensearch.sql.spark.asyncquery.model.MockFlintSparkJob;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+import org.opensearch.sql.spark.flint.FlintIndexMetadata;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataService;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataServiceImpl;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexType;
+
+public class FlintStreamingJobHouseKeeperTaskTest extends AsyncQueryExecutorServiceSpec {
+
+  @Test
+  @SneakyThrows
+  public void testStreamingJobHouseKeeperWhenDataSourceDisabled() {
+    ImmutableList<MockFlintIndex> mockFlintIndices = getMockFlintIndices();
+    Map<MockFlintIndex, MockFlintSparkJob> indexJobMapping = new HashMap<>();
+    mockFlintIndices.forEach(
+        INDEX -> {
+          INDEX.createIndex();
+          MockFlintSparkJob flintIndexJob =
+              new MockFlintSparkJob(
+                  flintIndexStateModelService, INDEX.getLatestId(), MYGLUE_DATASOURCE);
+          indexJobMapping.put(INDEX, flintIndexJob);
+          HashMap<String, Object> existingOptions = new HashMap<>();
+          existingOptions.put("auto_refresh", "true");
+          // Making Index Auto Refresh
+          INDEX.updateIndexOptions(existingOptions, false);
+          flintIndexJob.refreshing();
+        });
+    changeDataSourceStatus(MYGLUE_DATASOURCE, DISABLED);
+    LocalEMRSClient emrsClient = getCancelledLocalEmrsClient();
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    FlintStreamingJobHouseKeeperTask flintStreamingJobHouseKeeperTask =
+        new FlintStreamingJobHouseKeeperTask(
+            dataSourceService,
+            flintIndexMetadataService,
+            getFlintIndexOpFactory((accountId) -> emrsClient));
+
+    Thread thread = new Thread(flintStreamingJobHouseKeeperTask);
+    thread.start();
+    thread.join();
+
+    mockFlintIndices.forEach(
+        INDEX -> {
+          MockFlintSparkJob flintIndexJob = indexJobMapping.get(INDEX);
+          flintIndexJob.assertState(FlintIndexState.ACTIVE);
+          Map<String, Object> mappings = INDEX.getIndexMappings();
+          Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+          Map<String, Object> options = (Map<String, Object>) meta.get("options");
+          Assertions.assertEquals("false", options.get("auto_refresh"));
+        });
+    emrsClient.cancelJobRunCalled(3);
+    emrsClient.getJobRunResultCalled(3);
+    emrsClient.startJobRunCalled(0);
+    Assertions.assertEquals(
+        0L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+  }
+
+  private ImmutableList<MockFlintIndex> getMockFlintIndices() {
+    return ImmutableList.of(getSkipping(), getCovering(), getMv());
+  }
+
+  private MockFlintIndex getMv() {
+    return new MockFlintIndex(
+        client,
+        "flint_my_glue_mydb_mv",
+        FlintIndexType.MATERIALIZED_VIEW,
+        "ALTER MATERIALIZED VIEW my_glue.mydb.mv WITH (auto_refresh=false,"
+            + " incremental_refresh=true, output_mode=\"complete\") ");
+  }
+
+  private MockFlintIndex getCovering() {
+    return new MockFlintIndex(
+        client,
+        "flint_my_glue_mydb_http_logs_covering_index",
+        FlintIndexType.COVERING,
+        "ALTER INDEX covering ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+            + " incremental_refresh=true, output_mode=\"complete\")");
+  }
+
+  private MockFlintIndex getSkipping() {
+    return new MockFlintIndex(
+        client,
+        "flint_my_glue_mydb_http_logs_skipping_index",
+        FlintIndexType.SKIPPING,
+        "ALTER SKIPPING INDEX ON my_glue.mydb.http_logs WITH (auto_refresh=false,"
+            + " incremental_refresh=true, output_mode=\"complete\")");
+  }
+
+  @Test
+  @SneakyThrows
+  public void testStreamingJobHouseKeeperWhenCancelJobGivesTimeout() {
+    ImmutableList<MockFlintIndex> mockFlintIndices = getMockFlintIndices();
+    Map<MockFlintIndex, MockFlintSparkJob> indexJobMapping = new HashMap<>();
+    mockFlintIndices.forEach(
+        INDEX -> {
+          INDEX.createIndex();
+          MockFlintSparkJob flintIndexJob =
+              new MockFlintSparkJob(
+                  flintIndexStateModelService, INDEX.getLatestId(), MYGLUE_DATASOURCE);
+          indexJobMapping.put(INDEX, flintIndexJob);
+          HashMap<String, Object> existingOptions = new HashMap<>();
+          existingOptions.put("auto_refresh", "true");
+          // Making Index Auto Refresh
+          INDEX.updateIndexOptions(existingOptions, false);
+          flintIndexJob.refreshing();
+        });
+    changeDataSourceStatus(MYGLUE_DATASOURCE, DISABLED);
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    FlintStreamingJobHouseKeeperTask flintStreamingJobHouseKeeperTask =
+        new FlintStreamingJobHouseKeeperTask(
+            dataSourceService,
+            flintIndexMetadataService,
+            getFlintIndexOpFactory((accountId) -> emrsClient));
+
+    Thread thread = new Thread(flintStreamingJobHouseKeeperTask);
+    thread.start();
+    thread.join();
+
+    mockFlintIndices.forEach(
+        INDEX -> {
+          MockFlintSparkJob flintIndexJob = indexJobMapping.get(INDEX);
+          flintIndexJob.assertState(FlintIndexState.REFRESHING);
+          Map<String, Object> mappings = INDEX.getIndexMappings();
+          Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+          Map<String, Object> options = (Map<String, Object>) meta.get("options");
+          Assertions.assertEquals("false", options.get("auto_refresh"));
+        });
+    emrsClient.cancelJobRunCalled(3);
+    emrsClient.getJobRunResultCalled(9);
+    emrsClient.startJobRunCalled(0);
+    Assertions.assertEquals(
+        3L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+  }
+
+  @Test
+  @SneakyThrows
+  public void testSimulateConcurrentJobHouseKeeperExecution() {
+    ImmutableList<MockFlintIndex> mockFlintIndices = getMockFlintIndices();
+    Map<MockFlintIndex, MockFlintSparkJob> indexJobMapping = new HashMap<>();
+    mockFlintIndices.forEach(
+        INDEX -> {
+          INDEX.createIndex();
+          MockFlintSparkJob flintIndexJob =
+              new MockFlintSparkJob(
+                  flintIndexStateModelService, INDEX.getLatestId(), MYGLUE_DATASOURCE);
+          indexJobMapping.put(INDEX, flintIndexJob);
+          HashMap<String, Object> existingOptions = new HashMap<>();
+          existingOptions.put("auto_refresh", "true");
+          // Making Index Auto Refresh
+          INDEX.updateIndexOptions(existingOptions, false);
+          flintIndexJob.refreshing();
+        });
+    changeDataSourceStatus(MYGLUE_DATASOURCE, DISABLED);
+    LocalEMRSClient emrsClient = new LocalEMRSClient();
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    FlintStreamingJobHouseKeeperTask flintStreamingJobHouseKeeperTask =
+        new FlintStreamingJobHouseKeeperTask(
+            dataSourceService,
+            flintIndexMetadataService,
+            getFlintIndexOpFactory((accountId) -> emrsClient));
+    FlintStreamingJobHouseKeeperTask.isRunning.compareAndSet(false, true);
+
+    Thread thread = new Thread(flintStreamingJobHouseKeeperTask);
+    thread.start();
+    thread.join();
+
+    mockFlintIndices.forEach(
+        INDEX -> {
+          MockFlintSparkJob flintIndexJob = indexJobMapping.get(INDEX);
+          flintIndexJob.assertState(FlintIndexState.REFRESHING);
+          Map<String, Object> mappings = INDEX.getIndexMappings();
+          Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+          Map<String, Object> options = (Map<String, Object>) meta.get("options");
+          Assertions.assertEquals("true", options.get("auto_refresh"));
+        });
+    emrsClient.cancelJobRunCalled(0);
+    emrsClient.getJobRunResultCalled(0);
+    emrsClient.startJobRunCalled(0);
+    Assertions.assertEquals(
+        0L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+    FlintStreamingJobHouseKeeperTask.isRunning.compareAndSet(true, false);
+  }
+
+  @SneakyThrows
+  @Test
+  public void testStreamingJobClearnerWhenDataSourceIsDeleted() {
+    ImmutableList<MockFlintIndex> mockFlintIndices = getMockFlintIndices();
+    Map<MockFlintIndex, MockFlintSparkJob> indexJobMapping = new HashMap<>();
+    mockFlintIndices.forEach(
+        INDEX -> {
+          INDEX.createIndex();
+          MockFlintSparkJob flintIndexJob =
+              new MockFlintSparkJob(
+                  flintIndexStateModelService, INDEX.getLatestId(), MYGLUE_DATASOURCE);
+          indexJobMapping.put(INDEX, flintIndexJob);
+          HashMap<String, Object> existingOptions = new HashMap<>();
+          existingOptions.put("auto_refresh", "true");
+          // Making Index Auto Refresh
+          INDEX.updateIndexOptions(existingOptions, false);
+          flintIndexJob.refreshing();
+        });
+    this.dataSourceService.deleteDataSource(MYGLUE_DATASOURCE);
+    LocalEMRSClient emrsClient = getCancelledLocalEmrsClient();
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    FlintStreamingJobHouseKeeperTask flintStreamingJobHouseKeeperTask =
+        new FlintStreamingJobHouseKeeperTask(
+            dataSourceService,
+            flintIndexMetadataService,
+            getFlintIndexOpFactory((accountId) -> emrsClient));
+
+    Thread thread = new Thread(flintStreamingJobHouseKeeperTask);
+    thread.start();
+    thread.join();
+
+    mockFlintIndices.forEach(
+        INDEX -> {
+          MockFlintSparkJob flintIndexJob = indexJobMapping.get(INDEX);
+          flintIndexJob.assertState(FlintIndexState.DELETED);
+          Map<String, Object> mappings = INDEX.getIndexMappings();
+          Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+          Map<String, Object> options = (Map<String, Object>) meta.get("options");
+          Assertions.assertEquals("true", options.get("auto_refresh"));
+        });
+    emrsClient.cancelJobRunCalled(3);
+    emrsClient.getJobRunResultCalled(3);
+    emrsClient.startJobRunCalled(0);
+    Assertions.assertEquals(
+        0L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+  }
+
+  @Test
+  @SneakyThrows
+  public void testStreamingJobHouseKeeperWhenDataSourceIsNeitherDisabledNorDeleted() {
+    ImmutableList<MockFlintIndex> mockFlintIndices = getMockFlintIndices();
+    Map<MockFlintIndex, MockFlintSparkJob> indexJobMapping = new HashMap<>();
+    mockFlintIndices.forEach(
+        INDEX -> {
+          INDEX.createIndex();
+          MockFlintSparkJob flintIndexJob =
+              new MockFlintSparkJob(
+                  flintIndexStateModelService, INDEX.getLatestId(), MYGLUE_DATASOURCE);
+          indexJobMapping.put(INDEX, flintIndexJob);
+          HashMap<String, Object> existingOptions = new HashMap<>();
+          existingOptions.put("auto_refresh", "true");
+          // Making Index Auto Refresh
+          INDEX.updateIndexOptions(existingOptions, false);
+          flintIndexJob.refreshing();
+        });
+    LocalEMRSClient emrsClient = getCancelledLocalEmrsClient();
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    FlintStreamingJobHouseKeeperTask flintStreamingJobHouseKeeperTask =
+        new FlintStreamingJobHouseKeeperTask(
+            dataSourceService,
+            flintIndexMetadataService,
+            getFlintIndexOpFactory((accountId) -> emrsClient));
+
+    Thread thread = new Thread(flintStreamingJobHouseKeeperTask);
+    thread.start();
+    thread.join();
+
+    mockFlintIndices.forEach(
+        INDEX -> {
+          MockFlintSparkJob flintIndexJob = indexJobMapping.get(INDEX);
+          flintIndexJob.assertState(FlintIndexState.REFRESHING);
+          Map<String, Object> mappings = INDEX.getIndexMappings();
+          Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+          Map<String, Object> options = (Map<String, Object>) meta.get("options");
+          Assertions.assertEquals("true", options.get("auto_refresh"));
+        });
+    emrsClient.cancelJobRunCalled(0);
+    emrsClient.getJobRunResultCalled(0);
+    emrsClient.startJobRunCalled(0);
+    Assertions.assertEquals(
+        0L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+  }
+
+  @Test
+  public void testStreamingJobHouseKeeperWhenS3GlueIsDisabledButNotStreamingJobQueries()
+      throws InterruptedException {
+    changeDataSourceStatus(MYGLUE_DATASOURCE, DISABLED);
+    LocalEMRSClient emrsClient =
+        new LocalEMRSClient() {
+          @Override
+          public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+            super.getJobRunResult(applicationId, jobId);
+            JobRun jobRun = new JobRun();
+            jobRun.setState("cancelled");
+            return new GetJobRunResult().withJobRun(jobRun);
+          }
+        };
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    FlintStreamingJobHouseKeeperTask flintStreamingJobHouseKeeperTask =
+        new FlintStreamingJobHouseKeeperTask(
+            dataSourceService,
+            flintIndexMetadataService,
+            getFlintIndexOpFactory((accountId) -> emrsClient));
+
+    Thread thread = new Thread(flintStreamingJobHouseKeeperTask);
+    thread.start();
+    thread.join();
+
+    emrsClient.getJobRunResultCalled(0);
+    emrsClient.startJobRunCalled(0);
+    emrsClient.cancelJobRunCalled(0);
+    Assertions.assertEquals(
+        0L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+  }
+
+  @Test
+  public void testStreamingJobHouseKeeperWhenFlintIndexIsCorrupted() throws InterruptedException {
+    String indexName = "flint_my_glue_mydb_http_logs_covering_error_index";
+    MockFlintIndex mockFlintIndex =
+        new MockFlintIndex(client(), indexName, FlintIndexType.COVERING, null);
+    mockFlintIndex.createIndex();
+    changeDataSourceStatus(MYGLUE_DATASOURCE, DISABLED);
+    LocalEMRSClient emrsClient = getCancelledLocalEmrsClient();
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    FlintStreamingJobHouseKeeperTask flintStreamingJobHouseKeeperTask =
+        new FlintStreamingJobHouseKeeperTask(
+            dataSourceService,
+            flintIndexMetadataService,
+            getFlintIndexOpFactory((accountId) -> emrsClient));
+
+    Thread thread = new Thread(flintStreamingJobHouseKeeperTask);
+    thread.start();
+    thread.join();
+
+    emrsClient.getJobRunResultCalled(0);
+    emrsClient.startJobRunCalled(0);
+    emrsClient.cancelJobRunCalled(0);
+    Assertions.assertEquals(
+        1L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testErrorScenario() {
+    LocalEMRSClient emrsClient =
+        new LocalEMRSClient() {
+          @Override
+          public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+            super.getJobRunResult(applicationId, jobId);
+            JobRun jobRun = new JobRun();
+            jobRun.setState("cancelled");
+            return new GetJobRunResult().withJobRun(jobRun);
+          }
+        };
+    FlintIndexMetadataService flintIndexMetadataService =
+        new FlintIndexMetadataService() {
+          @Override
+          public Map<String, FlintIndexMetadata> getFlintIndexMetadata(
+              String indexPattern, AsyncQueryRequestContext asyncQueryRequestContext) {
+            throw new RuntimeException("Couldn't fetch details from ElasticSearch");
+          }
+
+          @Override
+          public void updateIndexToManualRefresh(
+              String indexName,
+              FlintIndexOptions flintIndexOptions,
+              AsyncQueryRequestContext asyncQueryRequestContext) {}
+        };
+    FlintStreamingJobHouseKeeperTask flintStreamingJobHouseKeeperTask =
+        new FlintStreamingJobHouseKeeperTask(
+            dataSourceService,
+            flintIndexMetadataService,
+            getFlintIndexOpFactory((accountId) -> emrsClient));
+
+    Thread thread = new Thread(flintStreamingJobHouseKeeperTask);
+    thread.start();
+    thread.join();
+
+    Assertions.assertFalse(FlintStreamingJobHouseKeeperTask.isRunning.get());
+    emrsClient.getJobRunResultCalled(0);
+    emrsClient.startJobRunCalled(0);
+    emrsClient.cancelJobRunCalled(0);
+    Assertions.assertEquals(
+        1L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+  }
+
+  @Test
+  @SneakyThrows
+  public void testStreamingJobHouseKeeperMultipleTimesWhenDataSourceDisabled() {
+    ImmutableList<MockFlintIndex> mockFlintIndices = getMockFlintIndices();
+    Map<MockFlintIndex, MockFlintSparkJob> indexJobMapping = new HashMap<>();
+    mockFlintIndices.forEach(
+        INDEX -> {
+          INDEX.createIndex();
+          MockFlintSparkJob flintIndexJob =
+              new MockFlintSparkJob(
+                  flintIndexStateModelService, INDEX.getLatestId(), MYGLUE_DATASOURCE);
+          indexJobMapping.put(INDEX, flintIndexJob);
+          HashMap<String, Object> existingOptions = new HashMap<>();
+          existingOptions.put("auto_refresh", "true");
+          // Making Index Auto Refresh
+          INDEX.updateIndexOptions(existingOptions, false);
+          flintIndexJob.refreshing();
+        });
+    changeDataSourceStatus(MYGLUE_DATASOURCE, DISABLED);
+    LocalEMRSClient emrsClient = getCancelledLocalEmrsClient();
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    FlintStreamingJobHouseKeeperTask flintStreamingJobHouseKeeperTask =
+        new FlintStreamingJobHouseKeeperTask(
+            dataSourceService,
+            flintIndexMetadataService,
+            getFlintIndexOpFactory((accountId) -> emrsClient));
+
+    Thread thread = new Thread(flintStreamingJobHouseKeeperTask);
+    thread.start();
+    thread.join();
+
+    mockFlintIndices.forEach(
+        INDEX -> {
+          MockFlintSparkJob flintIndexJob = indexJobMapping.get(INDEX);
+          flintIndexJob.assertState(FlintIndexState.ACTIVE);
+          Map<String, Object> mappings = INDEX.getIndexMappings();
+          Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+          Map<String, Object> options = (Map<String, Object>) meta.get("options");
+          Assertions.assertEquals("false", options.get("auto_refresh"));
+        });
+    emrsClient.cancelJobRunCalled(3);
+    emrsClient.getJobRunResultCalled(3);
+    emrsClient.startJobRunCalled(0);
+    Assertions.assertEquals(
+        0L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+
+    // Second Run
+    Thread thread2 = new Thread(flintStreamingJobHouseKeeperTask);
+    thread2.start();
+    thread2.join();
+    mockFlintIndices.forEach(
+        INDEX -> {
+          MockFlintSparkJob flintIndexJob = indexJobMapping.get(INDEX);
+          flintIndexJob.assertState(FlintIndexState.ACTIVE);
+          Map<String, Object> mappings = INDEX.getIndexMappings();
+          Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+          Map<String, Object> options = (Map<String, Object>) meta.get("options");
+          Assertions.assertEquals("false", options.get("auto_refresh"));
+        });
+
+    // No New Calls and Errors
+    emrsClient.cancelJobRunCalled(3);
+    emrsClient.getJobRunResultCalled(3);
+    emrsClient.startJobRunCalled(0);
+    Assertions.assertEquals(
+        0L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testRunStreamingJobHouseKeeperWhenDataSourceIsDeleted() {
+    ImmutableList<MockFlintIndex> mockFlintIndices = getMockFlintIndices();
+    Map<MockFlintIndex, MockFlintSparkJob> indexJobMapping = new HashMap<>();
+    mockFlintIndices.forEach(
+        INDEX -> {
+          INDEX.createIndex();
+          MockFlintSparkJob flintIndexJob =
+              new MockFlintSparkJob(
+                  flintIndexStateModelService, INDEX.getLatestId(), MYGLUE_DATASOURCE);
+          indexJobMapping.put(INDEX, flintIndexJob);
+          HashMap<String, Object> existingOptions = new HashMap<>();
+          existingOptions.put("auto_refresh", "true");
+          // Making Index Auto Refresh
+          INDEX.updateIndexOptions(existingOptions, false);
+          flintIndexJob.refreshing();
+        });
+    this.dataSourceService.deleteDataSource(MYGLUE_DATASOURCE);
+    LocalEMRSClient emrsClient = getCancelledLocalEmrsClient();
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    FlintStreamingJobHouseKeeperTask flintStreamingJobHouseKeeperTask =
+        new FlintStreamingJobHouseKeeperTask(
+            dataSourceService,
+            flintIndexMetadataService,
+            getFlintIndexOpFactory((accountId) -> emrsClient));
+
+    Thread thread = new Thread(flintStreamingJobHouseKeeperTask);
+    thread.start();
+    thread.join();
+
+    mockFlintIndices.forEach(
+        INDEX -> {
+          MockFlintSparkJob flintIndexJob = indexJobMapping.get(INDEX);
+          flintIndexJob.assertState(FlintIndexState.DELETED);
+          Map<String, Object> mappings = INDEX.getIndexMappings();
+          Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+          Map<String, Object> options = (Map<String, Object>) meta.get("options");
+          Assertions.assertEquals("true", options.get("auto_refresh"));
+        });
+    emrsClient.cancelJobRunCalled(3);
+    emrsClient.getJobRunResultCalled(3);
+    emrsClient.startJobRunCalled(0);
+    Assertions.assertEquals(
+        0L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+
+    // Second Run
+    Thread thread2 = new Thread(flintStreamingJobHouseKeeperTask);
+    thread2.start();
+    thread2.join();
+    mockFlintIndices.forEach(
+        INDEX -> {
+          MockFlintSparkJob flintIndexJob = indexJobMapping.get(INDEX);
+          flintIndexJob.assertState(FlintIndexState.DELETED);
+          Map<String, Object> mappings = INDEX.getIndexMappings();
+          Map<String, Object> meta = (HashMap<String, Object>) mappings.get("_meta");
+          Map<String, Object> options = (Map<String, Object>) meta.get("options");
+          Assertions.assertEquals("true", options.get("auto_refresh"));
+        });
+    // No New Calls and Errors
+    emrsClient.cancelJobRunCalled(3);
+    emrsClient.getJobRunResultCalled(3);
+    emrsClient.startJobRunCalled(0);
+    Assertions.assertEquals(
+        0L,
+        Metrics.getInstance()
+            .getNumericalMetric(MetricName.STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+            .getValue());
+  }
+
+  private void changeDataSourceStatus(String dataSourceName, DataSourceStatus dataSourceStatus) {
+    HashMap<String, Object> datasourceMap = new HashMap<>();
+    datasourceMap.put("name", dataSourceName);
+    datasourceMap.put("status", dataSourceStatus);
+    this.dataSourceService.patchDataSource(datasourceMap);
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/config/OpenSearchAsyncQuerySchedulerConfigComposerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/config/OpenSearchAsyncQuerySchedulerConfigComposerTest.java
new file mode 100644
index 0000000000..1556d4db3f
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/config/OpenSearchAsyncQuerySchedulerConfigComposerTest.java
@@ -0,0 +1,68 @@
+package org.opensearch.sql.spark.config;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.parameter.SparkSubmitParameters;
+
+@ExtendWith(MockitoExtension.class)
+public class OpenSearchAsyncQuerySchedulerConfigComposerTest {
+
+  @Mock private Settings settings;
+  @Mock private SparkSubmitParameters sparkSubmitParameters;
+  @Mock private DispatchQueryRequest dispatchQueryRequest;
+  @Mock private AsyncQueryRequestContext context;
+
+  private OpenSearchAsyncQuerySchedulerConfigComposer composer;
+
+  @BeforeEach
+  public void setUp() {
+    composer = new OpenSearchAsyncQuerySchedulerConfigComposer(settings);
+  }
+
+  @Test
+  public void testCompose() {
+    when(settings.getSettingValue(Settings.Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED))
+        .thenReturn(true);
+    when(settings.getSettingValue(Settings.Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL))
+        .thenReturn("10 minutes");
+
+    composer.compose(sparkSubmitParameters, dispatchQueryRequest, context);
+
+    verify(sparkSubmitParameters)
+        .setConfigItem("spark.flint.job.externalScheduler.enabled", "true");
+    verify(sparkSubmitParameters)
+        .setConfigItem("spark.flint.job.externalScheduler.interval", "10 minutes");
+  }
+
+  @Test
+  public void testComposeWithDisabledScheduler() {
+    when(settings.getSettingValue(Settings.Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED))
+        .thenReturn(false);
+
+    composer.compose(sparkSubmitParameters, dispatchQueryRequest, context);
+
+    verify(sparkSubmitParameters)
+        .setConfigItem("spark.flint.job.externalScheduler.enabled", "false");
+  }
+
+  @Test
+  public void testComposeWithMissingInterval() {
+    when(settings.getSettingValue(Settings.Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED))
+        .thenReturn(true);
+    when(settings.getSettingValue(Settings.Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL))
+        .thenReturn("");
+
+    composer.compose(sparkSubmitParameters, dispatchQueryRequest, context);
+
+    verify(sparkSubmitParameters).setConfigItem("spark.flint.job.externalScheduler.interval", "");
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/config/OpenSearchExtraParameterComposerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/config/OpenSearchExtraParameterComposerTest.java
new file mode 100644
index 0000000000..d3b0b2727a
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/config/OpenSearchExtraParameterComposerTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.config;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+import org.opensearch.sql.spark.parameter.SparkSubmitParameters;
+
+@ExtendWith(MockitoExtension.class)
+class OpenSearchExtraParameterComposerTest {
+
+  public static final String PARAMS = "PARAMS";
+  @Mock SparkExecutionEngineConfigClusterSettingLoader settingsLoader;
+  @Mock SparkSubmitParameters sparkSubmitParameters;
+  @Mock DispatchQueryRequest dispatchQueryRequest;
+  @Mock AsyncQueryRequestContext context;
+
+  @InjectMocks OpenSearchExtraParameterComposer openSearchExtraParameterComposer;
+
+  @Test
+  public void paramExists_compose() {
+    SparkExecutionEngineConfigClusterSetting setting =
+        SparkExecutionEngineConfigClusterSetting.builder().sparkSubmitParameters(PARAMS).build();
+    when(settingsLoader.load()).thenReturn(Optional.of(setting));
+
+    openSearchExtraParameterComposer.compose(sparkSubmitParameters, dispatchQueryRequest, context);
+
+    verify(sparkSubmitParameters).setExtraParameters(PARAMS);
+  }
+
+  @Test
+  public void paramNotExist_compose() {
+    when(settingsLoader.load()).thenReturn(Optional.empty());
+
+    openSearchExtraParameterComposer.compose(sparkSubmitParameters, dispatchQueryRequest, context);
+
+    verifyNoInteractions(sparkSubmitParameters);
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSettingLoaderTest.java b/async-query/src/test/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSettingLoaderTest.java
new file mode 100644
index 0000000000..f9ccd93b00
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSettingLoaderTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.config;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.common.setting.Settings.Key.SPARK_EXECUTION_ENGINE_CONFIG;
+import static org.opensearch.sql.spark.constants.TestConstants.ACCOUNT_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_APPLICATION_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_EXECUTION_ROLE;
+import static org.opensearch.sql.spark.constants.TestConstants.SPARK_SUBMIT_PARAMETERS;
+import static org.opensearch.sql.spark.constants.TestConstants.US_WEST_REGION;
+
+import java.util.Optional;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.common.setting.Settings;
+
+@ExtendWith(MockitoExtension.class)
+class SparkExecutionEngineConfigClusterSettingLoaderTest {
+  @Mock Settings settings;
+
+  @InjectMocks
+  SparkExecutionEngineConfigClusterSettingLoader sparkExecutionEngineConfigClusterSettingLoader;
+
+  @Test
+  public void blankConfig() {
+    when(settings.getSettingValue(SPARK_EXECUTION_ENGINE_CONFIG)).thenReturn("");
+
+    Optional<SparkExecutionEngineConfigClusterSetting> result =
+        sparkExecutionEngineConfigClusterSettingLoader.load();
+
+    assertTrue(result.isEmpty());
+  }
+
+  @Test
+  public void validConfig() {
+    when(settings.getSettingValue(SPARK_EXECUTION_ENGINE_CONFIG)).thenReturn(getConfigJson());
+
+    SparkExecutionEngineConfigClusterSetting result =
+        sparkExecutionEngineConfigClusterSettingLoader.load().get();
+
+    Assertions.assertEquals(ACCOUNT_ID, result.getAccountId());
+    Assertions.assertEquals(EMRS_APPLICATION_ID, result.getApplicationId());
+    Assertions.assertEquals(EMRS_EXECUTION_ROLE, result.getExecutionRoleARN());
+    Assertions.assertEquals(US_WEST_REGION, result.getRegion());
+    Assertions.assertEquals(SPARK_SUBMIT_PARAMETERS, result.getSparkSubmitParameters());
+  }
+
+  String getConfigJson() {
+    return new JSONObject()
+        .put("accountId", ACCOUNT_ID)
+        .put("applicationId", EMRS_APPLICATION_ID)
+        .put("executionRoleARN", EMRS_EXECUTION_ROLE)
+        .put("region", US_WEST_REGION)
+        .put("sparkSubmitParameters", SPARK_SUBMIT_PARAMETERS)
+        .toString();
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSettingTest.java b/async-query/src/test/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSettingTest.java
new file mode 100644
index 0000000000..c6be37567d
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigClusterSettingTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.config;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+
+public class SparkExecutionEngineConfigClusterSettingTest {
+
+  @Test
+  public void testToSparkExecutionEngineConfigWithoutAllFields() {
+    String json =
+        "{"
+            + "\"applicationId\": \"app-1\","
+            + "\"executionRoleARN\": \"role-1\","
+            + "\"region\": \"us-west-1\""
+            + "}";
+    SparkExecutionEngineConfigClusterSetting config =
+        SparkExecutionEngineConfigClusterSetting.toSparkExecutionEngineConfig(json);
+
+    assertEquals("app-1", config.getApplicationId());
+    assertEquals("role-1", config.getExecutionRoleARN());
+    assertEquals("us-west-1", config.getRegion());
+    assertNull(config.getSparkSubmitParameters());
+  }
+
+  @Test
+  public void testToSparkExecutionEngineConfigWithAllFields() {
+    String json =
+        "{"
+            + "\"applicationId\": \"app-1\","
+            + "\"executionRoleARN\": \"role-1\","
+            + "\"region\": \"us-west-1\","
+            + "\"sparkSubmitParameters\": \"--conf A=1\""
+            + "}";
+    SparkExecutionEngineConfigClusterSetting config =
+        SparkExecutionEngineConfigClusterSetting.toSparkExecutionEngineConfig(json);
+
+    assertEquals("app-1", config.getApplicationId());
+    assertEquals("role-1", config.getExecutionRoleARN());
+    assertEquals("us-west-1", config.getRegion());
+    assertEquals("--conf A=1", config.getSparkSubmitParameters());
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigSupplierImplTest.java b/async-query/src/test/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigSupplierImplTest.java
new file mode 100644
index 0000000000..124d8d0b6e
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/config/SparkExecutionEngineConfigSupplierImplTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.config;
+
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_APPLICATION_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.EMRS_EXECUTION_ROLE;
+import static org.opensearch.sql.spark.constants.TestConstants.SPARK_SUBMIT_PARAMETERS;
+import static org.opensearch.sql.spark.constants.TestConstants.TEST_CLUSTER_NAME;
+import static org.opensearch.sql.spark.constants.TestConstants.US_WEST_REGION;
+
+import java.util.Optional;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.cluster.ClusterName;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+
+@ExtendWith(MockitoExtension.class)
+public class SparkExecutionEngineConfigSupplierImplTest {
+
+  @Mock private Settings settings;
+  @Mock private AsyncQueryRequestContext asyncQueryRequestContext;
+
+  @Mock
+  private SparkExecutionEngineConfigClusterSettingLoader
+      sparkExecutionEngineConfigClusterSettingLoader;
+
+  @Test
+  void testGetSparkExecutionEngineConfig() {
+    SparkExecutionEngineConfigSupplier sparkExecutionEngineConfigSupplier =
+        new SparkExecutionEngineConfigSupplierImpl(
+            settings, sparkExecutionEngineConfigClusterSettingLoader);
+    when(settings.getSettingValue(Settings.Key.CLUSTER_NAME))
+        .thenReturn(new ClusterName(TEST_CLUSTER_NAME));
+    when(sparkExecutionEngineConfigClusterSettingLoader.load())
+        .thenReturn(Optional.of(getClusterSetting()));
+
+    SparkExecutionEngineConfig sparkExecutionEngineConfig =
+        sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(asyncQueryRequestContext);
+
+    Assertions.assertEquals(EMRS_APPLICATION_ID, sparkExecutionEngineConfig.getApplicationId());
+    Assertions.assertEquals(EMRS_EXECUTION_ROLE, sparkExecutionEngineConfig.getExecutionRoleARN());
+    Assertions.assertEquals(US_WEST_REGION, sparkExecutionEngineConfig.getRegion());
+    Assertions.assertEquals(TEST_CLUSTER_NAME, sparkExecutionEngineConfig.getClusterName());
+  }
+
+  SparkExecutionEngineConfigClusterSetting getClusterSetting() {
+    return SparkExecutionEngineConfigClusterSetting.builder()
+        .applicationId(EMRS_APPLICATION_ID)
+        .executionRoleARN(EMRS_EXECUTION_ROLE)
+        .region(US_WEST_REGION)
+        .sparkSubmitParameters(SPARK_SUBMIT_PARAMETERS)
+        .build();
+  }
+
+  @Test
+  void testGetSparkExecutionEngineConfigWithNullSetting() {
+    SparkExecutionEngineConfigSupplier sparkExecutionEngineConfigSupplier =
+        new SparkExecutionEngineConfigSupplierImpl(
+            settings, sparkExecutionEngineConfigClusterSettingLoader);
+    when(settings.getSettingValue(Settings.Key.CLUSTER_NAME))
+        .thenReturn(new ClusterName(TEST_CLUSTER_NAME));
+    when(sparkExecutionEngineConfigClusterSettingLoader.load()).thenReturn(Optional.empty());
+
+    SparkExecutionEngineConfig sparkExecutionEngineConfig =
+        sparkExecutionEngineConfigSupplier.getSparkExecutionEngineConfig(asyncQueryRequestContext);
+
+    Assertions.assertNull(sparkExecutionEngineConfig.getApplicationId());
+    Assertions.assertNull(sparkExecutionEngineConfig.getExecutionRoleARN());
+    Assertions.assertNull(sparkExecutionEngineConfig.getRegion());
+    Assertions.assertNull(sparkExecutionEngineConfig.getSparkSubmitParameterModifier());
+    Assertions.assertEquals(TEST_CLUSTER_NAME, sparkExecutionEngineConfig.getClusterName());
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/constants/TestConstants.java b/async-query/src/test/java/org/opensearch/sql/spark/constants/TestConstants.java
new file mode 100644
index 0000000000..15871bf6b2
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/constants/TestConstants.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.constants;
+
+public class TestConstants {
+  public static final String TEST_DATASOURCE_NAME = "test_datasource_name";
+  public static final String EMR_JOB_ID = "job-123xxx";
+  public static final String ACCOUNT_ID = "TEST_ACCOUNT_ID";
+  public static final String EMRS_APPLICATION_ID = "app-xxxxx";
+  public static final String EMRS_EXECUTION_ROLE = "execution_role";
+  public static final String SPARK_SUBMIT_PARAMETERS = "--conf org.flint.sql.SQLJob";
+  public static final String TEST_CLUSTER_NAME = "TEST_CLUSTER";
+  public static final String MOCK_SESSION_ID = "s-0123456";
+  public static final String US_WEST_REGION = "us-west-1";
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/execution/session/InteractiveSessionTest.java b/async-query/src/test/java/org/opensearch/sql/spark/execution/session/InteractiveSessionTest.java
new file mode 100644
index 0000000000..d0bfed94c0
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/execution/session/InteractiveSessionTest.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import static org.opensearch.sql.spark.constants.TestConstants.TEST_CLUSTER_NAME;
+import static org.opensearch.sql.spark.constants.TestConstants.TEST_DATASOURCE_NAME;
+import static org.opensearch.sql.spark.execution.session.SessionState.NOT_STARTED;
+import static org.opensearch.sql.spark.execution.session.SessionTestUtil.createSessionRequest;
+
+import java.util.HashMap;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
+import org.opensearch.action.delete.DeleteRequest;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.client.StartJobRequest;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchSessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchStateStoreUtil;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchStatementStorageService;
+import org.opensearch.sql.spark.execution.statestore.SessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.StateStore;
+import org.opensearch.sql.spark.execution.statestore.StatementStorageService;
+import org.opensearch.sql.spark.execution.xcontent.SessionModelXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.StatementModelXContentSerializer;
+import org.opensearch.sql.spark.utils.IDUtils;
+import org.opensearch.test.OpenSearchIntegTestCase;
+
+/** mock-maker-inline does not work with OpenSearchTestCase. */
+public class InteractiveSessionTest extends OpenSearchIntegTestCase {
+
+  private static final String indexName =
+      OpenSearchStateStoreUtil.getIndexName(TEST_DATASOURCE_NAME);
+
+  private TestEMRServerlessClient emrsClient;
+  private StartJobRequest startJobRequest;
+  private SessionStorageService sessionStorageService;
+  private StatementStorageService statementStorageService;
+  private SessionConfigSupplier sessionConfigSupplier = () -> 600000L;
+  private SessionManager sessionManager;
+  private AsyncQueryRequestContext asyncQueryRequestContext = new NullAsyncQueryRequestContext();
+  private SessionIdProvider sessionIdProvider = new DatasourceEmbeddedSessionIdProvider();
+
+  @Before
+  public void setup() {
+    emrsClient = new TestEMRServerlessClient();
+    startJobRequest = new StartJobRequest("", null, "appId", "", "", new HashMap<>(), false, "");
+    StateStore stateStore = new StateStore(client(), clusterService());
+    sessionStorageService =
+        new OpenSearchSessionStorageService(stateStore, new SessionModelXContentSerializer());
+    statementStorageService =
+        new OpenSearchStatementStorageService(stateStore, new StatementModelXContentSerializer());
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+
+    sessionManager =
+        new SessionManager(
+            sessionStorageService,
+            statementStorageService,
+            emrServerlessClientFactory,
+            sessionConfigSupplier,
+            sessionIdProvider);
+  }
+
+  @After
+  public void clean() {
+    if (clusterService().state().routingTable().hasIndex(indexName)) {
+      client().admin().indices().delete(new DeleteIndexRequest(indexName)).actionGet();
+    }
+  }
+
+  @Test
+  public void openCloseSession() {
+    String sessionId = IDUtils.encode(TEST_DATASOURCE_NAME);
+    InteractiveSession session =
+        InteractiveSession.builder()
+            .sessionId(sessionId)
+            .statementStorageService(statementStorageService)
+            .sessionStorageService(sessionStorageService)
+            .serverlessClient(emrsClient)
+            .build();
+
+    SessionAssertions assertions = new SessionAssertions(session);
+    assertions
+        .open(createSessionRequest())
+        .assertSessionState(NOT_STARTED)
+        .assertAppId("appId")
+        .assertJobId("jobId");
+    emrsClient.startJobRunCalled(1);
+    emrsClient.assertJobNameOfLastRequest(
+        TEST_CLUSTER_NAME + ":" + JobType.INTERACTIVE.getText() + ":" + sessionId);
+
+    // close session
+    assertions.close();
+    emrsClient.cancelJobRunCalled(1);
+  }
+
+  @Test
+  public void openSessionFailedConflict() {
+    String sessionId = IDUtils.encode(TEST_DATASOURCE_NAME);
+    InteractiveSession session =
+        InteractiveSession.builder()
+            .sessionId(sessionId)
+            .sessionStorageService(sessionStorageService)
+            .statementStorageService(statementStorageService)
+            .serverlessClient(emrsClient)
+            .build();
+    session.open(createSessionRequest(), asyncQueryRequestContext);
+
+    InteractiveSession duplicateSession =
+        InteractiveSession.builder()
+            .sessionId(sessionId)
+            .sessionStorageService(sessionStorageService)
+            .statementStorageService(statementStorageService)
+            .serverlessClient(emrsClient)
+            .build();
+    IllegalStateException exception =
+        assertThrows(
+            IllegalStateException.class,
+            () -> duplicateSession.open(createSessionRequest(), asyncQueryRequestContext));
+    assertEquals("session already exist. " + sessionId, exception.getMessage());
+  }
+
+  @Test
+  public void closeNotExistSession() {
+    String sessionId = IDUtils.encode(TEST_DATASOURCE_NAME);
+    InteractiveSession session =
+        InteractiveSession.builder()
+            .sessionId(sessionId)
+            .sessionStorageService(sessionStorageService)
+            .statementStorageService(statementStorageService)
+            .serverlessClient(emrsClient)
+            .build();
+    session.open(createSessionRequest(), asyncQueryRequestContext);
+
+    client().delete(new DeleteRequest(indexName, sessionId)).actionGet();
+
+    IllegalStateException exception = assertThrows(IllegalStateException.class, session::close);
+    assertEquals("session does not exist. " + sessionId, exception.getMessage());
+    emrsClient.cancelJobRunCalled(0);
+  }
+
+  @Test
+  public void sessionManagerCreateSession() {
+    Session session =
+        sessionManager.createSession(createSessionRequest(), asyncQueryRequestContext);
+
+    new SessionAssertions(session)
+        .assertSessionState(NOT_STARTED)
+        .assertAppId("appId")
+        .assertJobId("jobId");
+  }
+
+  @Test
+  public void sessionManagerGetSession() {
+    Session session =
+        sessionManager.createSession(createSessionRequest(), asyncQueryRequestContext);
+
+    Optional<Session> managerSession =
+        sessionManager.getSession(session.getSessionId(), TEST_DATASOURCE_NAME);
+    assertTrue(managerSession.isPresent());
+    assertEquals(session.getSessionId(), managerSession.get().getSessionId());
+  }
+
+  @Test
+  public void getSessionWithNonExistingId() {
+    Optional<Session> session =
+        sessionManager.getSession("non-existing-id", "non-existing-datasource");
+
+    assertTrue(session.isEmpty());
+  }
+
+  @RequiredArgsConstructor
+  class SessionAssertions {
+    private final Session session;
+
+    public SessionAssertions assertSessionState(SessionState expected) {
+      assertEquals(expected, session.getSessionModel().getSessionState());
+
+      Optional<SessionModel> sessionStoreState =
+          sessionStorageService.getSession(session.getSessionModel().getId(), TEST_DATASOURCE_NAME);
+      assertTrue(sessionStoreState.isPresent());
+      assertEquals(expected, sessionStoreState.get().getSessionState());
+
+      return this;
+    }
+
+    public SessionAssertions assertAppId(String expected) {
+      assertEquals(expected, session.getSessionModel().getApplicationId());
+      return this;
+    }
+
+    public SessionAssertions assertJobId(String expected) {
+      assertEquals(expected, session.getSessionModel().getJobId());
+      return this;
+    }
+
+    public SessionAssertions open(CreateSessionRequest req) {
+      session.open(req, asyncQueryRequestContext);
+      return this;
+    }
+
+    public SessionAssertions close() {
+      session.close();
+      return this;
+    }
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/execution/session/SessionTestUtil.java b/async-query/src/test/java/org/opensearch/sql/spark/execution/session/SessionTestUtil.java
new file mode 100644
index 0000000000..e5ca93e96e
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/execution/session/SessionTestUtil.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import static org.opensearch.sql.spark.constants.TestConstants.TEST_CLUSTER_NAME;
+import static org.opensearch.sql.spark.constants.TestConstants.TEST_DATASOURCE_NAME;
+
+import java.util.HashMap;
+import org.opensearch.sql.spark.parameter.SparkParameterComposerCollection;
+import org.opensearch.sql.spark.parameter.SparkSubmitParametersBuilder;
+
+public class SessionTestUtil {
+
+  public static CreateSessionRequest createSessionRequest() {
+    return new CreateSessionRequest(
+        TEST_CLUSTER_NAME,
+        null,
+        "appId",
+        "arn",
+        new SparkSubmitParametersBuilder(new SparkParameterComposerCollection()),
+        new HashMap<>(),
+        "resultIndex",
+        TEST_DATASOURCE_NAME);
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/execution/session/TestEMRServerlessClient.java b/async-query/src/test/java/org/opensearch/sql/spark/execution/session/TestEMRServerlessClient.java
new file mode 100644
index 0000000000..a6b0e6038e
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/execution/session/TestEMRServerlessClient.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.session;
+
+import com.amazonaws.services.emrserverless.model.CancelJobRunResult;
+import com.amazonaws.services.emrserverless.model.GetJobRunResult;
+import org.junit.Assert;
+import org.opensearch.sql.spark.client.EMRServerlessClient;
+import org.opensearch.sql.spark.client.StartJobRequest;
+
+public class TestEMRServerlessClient implements EMRServerlessClient {
+
+  private int startJobRunCalled = 0;
+  private int cancelJobRunCalled = 0;
+
+  private StartJobRequest startJobRequest;
+
+  @Override
+  public String startJobRun(StartJobRequest startJobRequest) {
+    this.startJobRequest = startJobRequest;
+    startJobRunCalled++;
+    return "jobId";
+  }
+
+  @Override
+  public GetJobRunResult getJobRunResult(String applicationId, String jobId) {
+    return null;
+  }
+
+  @Override
+  public CancelJobRunResult cancelJobRun(
+      String applicationId, String jobId, boolean allowExceptionPropagation) {
+    cancelJobRunCalled++;
+    return null;
+  }
+
+  public void startJobRunCalled(int expectedTimes) {
+    Assert.assertEquals(expectedTimes, startJobRunCalled);
+  }
+
+  public void cancelJobRunCalled(int expectedTimes) {
+    Assert.assertEquals(expectedTimes, cancelJobRunCalled);
+  }
+
+  public void assertJobNameOfLastRequest(String expectedJobName) {
+    Assert.assertEquals(expectedJobName, startJobRequest.getJobName());
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/execution/statement/StatementTest.java b/async-query/src/test/java/org/opensearch/sql/spark/execution/statement/StatementTest.java
new file mode 100644
index 0000000000..fe3d5f3177
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/execution/statement/StatementTest.java
@@ -0,0 +1,384 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.statement;
+
+import static org.opensearch.sql.spark.constants.TestConstants.TEST_DATASOURCE_NAME;
+import static org.opensearch.sql.spark.execution.session.SessionTestUtil.createSessionRequest;
+import static org.opensearch.sql.spark.execution.statement.StatementState.CANCELLED;
+import static org.opensearch.sql.spark.execution.statement.StatementState.RUNNING;
+import static org.opensearch.sql.spark.execution.statement.StatementState.WAITING;
+import static org.opensearch.sql.spark.execution.statement.StatementTest.TestStatement.testStatement;
+
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
+import org.opensearch.action.delete.DeleteRequest;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.client.EMRServerlessClientFactory;
+import org.opensearch.sql.spark.execution.session.DatasourceEmbeddedSessionIdProvider;
+import org.opensearch.sql.spark.execution.session.Session;
+import org.opensearch.sql.spark.execution.session.SessionConfigSupplier;
+import org.opensearch.sql.spark.execution.session.SessionIdProvider;
+import org.opensearch.sql.spark.execution.session.SessionManager;
+import org.opensearch.sql.spark.execution.session.SessionState;
+import org.opensearch.sql.spark.execution.session.TestEMRServerlessClient;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchSessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchStateStoreUtil;
+import org.opensearch.sql.spark.execution.statestore.OpenSearchStatementStorageService;
+import org.opensearch.sql.spark.execution.statestore.SessionStorageService;
+import org.opensearch.sql.spark.execution.statestore.StateStore;
+import org.opensearch.sql.spark.execution.statestore.StatementStorageService;
+import org.opensearch.sql.spark.execution.xcontent.SessionModelXContentSerializer;
+import org.opensearch.sql.spark.execution.xcontent.StatementModelXContentSerializer;
+import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.spark.utils.IDUtils;
+import org.opensearch.test.OpenSearchIntegTestCase;
+
+public class StatementTest extends OpenSearchIntegTestCase {
+  private static final String indexName =
+      OpenSearchStateStoreUtil.getIndexName(TEST_DATASOURCE_NAME);
+
+  private StatementStorageService statementStorageService;
+  private SessionStorageService sessionStorageService;
+  private TestEMRServerlessClient emrsClient = new TestEMRServerlessClient();
+  private SessionConfigSupplier sessionConfigSupplier = () -> 600000L;
+  private SessionIdProvider sessionIdProvider = new DatasourceEmbeddedSessionIdProvider();
+
+  private SessionManager sessionManager;
+  private AsyncQueryRequestContext asyncQueryRequestContext = new NullAsyncQueryRequestContext();
+
+  @Before
+  public void setup() {
+    StateStore stateStore = new StateStore(client(), clusterService());
+    statementStorageService =
+        new OpenSearchStatementStorageService(stateStore, new StatementModelXContentSerializer());
+    sessionStorageService =
+        new OpenSearchSessionStorageService(stateStore, new SessionModelXContentSerializer());
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+
+    sessionManager =
+        new SessionManager(
+            sessionStorageService,
+            statementStorageService,
+            emrServerlessClientFactory,
+            sessionConfigSupplier,
+            sessionIdProvider);
+  }
+
+  @After
+  public void clean() {
+    if (clusterService().state().routingTable().hasIndex(indexName)) {
+      client().admin().indices().delete(new DeleteIndexRequest(indexName)).actionGet();
+    }
+  }
+
+  @Test
+  public void openThenCancelStatement() {
+    Statement st = buildStatement();
+
+    // submit statement
+    TestStatement testStatement = testStatement(st, statementStorageService);
+    testStatement
+        .open()
+        .assertSessionState(WAITING)
+        .assertStatementId(new StatementId("statementId"));
+
+    // close statement
+    testStatement.cancel().assertSessionState(CANCELLED);
+  }
+
+  private Statement buildStatement() {
+    return buildStatement(new StatementId("statementId"));
+  }
+
+  private Statement buildStatement(StatementId stId) {
+    return Statement.builder()
+        .sessionId("sessionId")
+        .applicationId("appId")
+        .jobId("jobId")
+        .statementId(stId)
+        .langType(LangType.SQL)
+        .datasourceName(TEST_DATASOURCE_NAME)
+        .query("query")
+        .queryId("statementId")
+        .statementStorageService(statementStorageService)
+        .build();
+  }
+
+  @Test
+  public void openFailedBecauseConflict() {
+    Statement st = buildStatement();
+    st.open();
+
+    // open statement with same statement id
+    Statement dupSt = buildStatement();
+    IllegalStateException exception = assertThrows(IllegalStateException.class, dupSt::open);
+    assertEquals("statement already exist. statementId=statementId", exception.getMessage());
+  }
+
+  @Test
+  public void cancelNotExistStatement_throwsException() {
+    StatementId stId = new StatementId("statementId");
+    Statement st = buildStatement(stId);
+    st.open();
+
+    client().delete(new DeleteRequest(indexName, stId.getId())).actionGet();
+
+    IllegalStateException exception = assertThrows(IllegalStateException.class, st::cancel);
+    assertEquals(
+        String.format("cancel statement failed. no statement found. statement: %s.", stId),
+        exception.getMessage());
+  }
+
+  @Test
+  public void cancelFailedBecauseOfConflict() {
+    StatementId stId = new StatementId("statementId");
+    Statement st = buildStatement(stId);
+    st.open();
+
+    StatementModel running =
+        statementStorageService.updateStatementState(
+            st.getStatementModel(), CANCELLED, asyncQueryRequestContext);
+
+    assertEquals(StatementState.CANCELLED, running.getStatementState());
+    IllegalStateException exception = assertThrows(IllegalStateException.class, st::cancel);
+    assertEquals(
+        String.format(
+            "cancel statement failed. current statementState: CANCELLED " + "statement: %s.", stId),
+        exception.getMessage());
+  }
+
+  @Test
+  public void cancelCancelledStatement_throwsException() {
+    testCancelThrowsExceptionGivenStatementState(StatementState.CANCELLED);
+  }
+
+  @Test
+  public void cancelSuccessStatement_throwsException() {
+    testCancelThrowsExceptionGivenStatementState(StatementState.SUCCESS);
+  }
+
+  @Test
+  public void cancelFailedStatement_throwsException() {
+    testCancelThrowsExceptionGivenStatementState(StatementState.FAILED);
+  }
+
+  @Test
+  public void cancelTimeoutStatement_throwsException() {
+    testCancelThrowsExceptionGivenStatementState(StatementState.TIMEOUT);
+  }
+
+  private void testCancelThrowsExceptionGivenStatementState(StatementState state) {
+    StatementId stId = new StatementId("statementId");
+    Statement st = createStatement(stId);
+
+    StatementModel model = st.getStatementModel();
+    st.setStatementModel(
+        StatementModel.copyWithState(st.getStatementModel(), state, model.getMetadata()));
+
+    IllegalStateException exception = assertThrows(IllegalStateException.class, st::cancel);
+    assertEquals(
+        String.format("can't cancel statement in %s state. statement: %s.", state.getState(), stId),
+        exception.getMessage());
+  }
+
+  @Test
+  public void cancelRunningStatementSuccess() {
+    Statement st = buildStatement();
+
+    // submit statement
+    TestStatement testStatement = testStatement(st, statementStorageService);
+    testStatement
+        .open()
+        .assertSessionState(WAITING)
+        .assertStatementId(new StatementId("statementId"));
+
+    testStatement.run();
+
+    // close statement
+    testStatement.cancel().assertSessionState(CANCELLED);
+  }
+
+  @Test
+  public void submitStatementInRunningSession() {
+    Session session =
+        sessionManager.createSession(createSessionRequest(), asyncQueryRequestContext);
+
+    // App change state to running
+    sessionStorageService.updateSessionState(session.getSessionModel(), SessionState.RUNNING);
+
+    StatementId statementId = session.submit(queryRequest(), asyncQueryRequestContext);
+    assertFalse(statementId.getId().isEmpty());
+  }
+
+  @Test
+  public void submitStatementInNotStartedState() {
+    Session session =
+        sessionManager.createSession(createSessionRequest(), asyncQueryRequestContext);
+
+    StatementId statementId = session.submit(queryRequest(), asyncQueryRequestContext);
+    assertFalse(statementId.getId().isEmpty());
+  }
+
+  @Test
+  public void failToSubmitStatementInDeadState() {
+    Session session =
+        sessionManager.createSession(createSessionRequest(), asyncQueryRequestContext);
+
+    sessionStorageService.updateSessionState(session.getSessionModel(), SessionState.DEAD);
+
+    IllegalStateException exception =
+        assertThrows(
+            IllegalStateException.class,
+            () -> session.submit(queryRequest(), asyncQueryRequestContext));
+    assertEquals(
+        "can't submit statement, session should not be in end state, current session state is:"
+            + " dead",
+        exception.getMessage());
+  }
+
+  @Test
+  public void failToSubmitStatementInFailState() {
+    Session session =
+        sessionManager.createSession(createSessionRequest(), asyncQueryRequestContext);
+
+    sessionStorageService.updateSessionState(session.getSessionModel(), SessionState.FAIL);
+
+    IllegalStateException exception =
+        assertThrows(
+            IllegalStateException.class,
+            () -> session.submit(queryRequest(), asyncQueryRequestContext));
+    assertEquals(
+        "can't submit statement, session should not be in end state, current session state is:"
+            + " fail",
+        exception.getMessage());
+  }
+
+  @Test
+  public void newStatementFieldAssert() {
+    Session session =
+        sessionManager.createSession(createSessionRequest(), asyncQueryRequestContext);
+    StatementId statementId = session.submit(queryRequest(), asyncQueryRequestContext);
+    Optional<Statement> statement = session.get(statementId, asyncQueryRequestContext);
+
+    assertTrue(statement.isPresent());
+    assertEquals(session.getSessionId(), statement.get().getSessionId());
+    assertEquals("appId", statement.get().getApplicationId());
+    assertEquals("jobId", statement.get().getJobId());
+    assertEquals(statementId, statement.get().getStatementId());
+    assertEquals(WAITING, statement.get().getStatementState());
+    assertEquals(LangType.SQL, statement.get().getLangType());
+    assertEquals("select 1", statement.get().getQuery());
+  }
+
+  @Test
+  public void failToSubmitStatementInDeletedSession() {
+    EMRServerlessClientFactory emrServerlessClientFactory = (accountId) -> emrsClient;
+    Session session =
+        sessionManager.createSession(createSessionRequest(), asyncQueryRequestContext);
+
+    // other's delete session
+    client().delete(new DeleteRequest(indexName, session.getSessionId())).actionGet();
+
+    IllegalStateException exception =
+        assertThrows(
+            IllegalStateException.class,
+            () -> session.submit(queryRequest(), asyncQueryRequestContext));
+    assertEquals("session does not exist. " + session.getSessionId(), exception.getMessage());
+  }
+
+  @Test
+  public void getStatementSuccess() {
+    Session session =
+        sessionManager.createSession(createSessionRequest(), asyncQueryRequestContext);
+    // App change state to running
+    sessionStorageService.updateSessionState(session.getSessionModel(), SessionState.RUNNING);
+    StatementId statementId = session.submit(queryRequest(), asyncQueryRequestContext);
+
+    Optional<Statement> statement = session.get(statementId, asyncQueryRequestContext);
+    assertTrue(statement.isPresent());
+    assertEquals(WAITING, statement.get().getStatementState());
+    assertEquals(statementId, statement.get().getStatementId());
+  }
+
+  @Test
+  public void getStatementNotExist() {
+    Session session =
+        sessionManager.createSession(createSessionRequest(), asyncQueryRequestContext);
+    // App change state to running
+    sessionStorageService.updateSessionState(session.getSessionModel(), SessionState.RUNNING);
+
+    Optional<Statement> statement =
+        session.get(StatementId.newStatementId("not-exist-id"), asyncQueryRequestContext);
+    assertFalse(statement.isPresent());
+  }
+
+  @RequiredArgsConstructor
+  static class TestStatement {
+    private final Statement st;
+    private final StatementStorageService statementStorageService;
+
+    public static TestStatement testStatement(
+        Statement st, StatementStorageService statementStorageService) {
+      return new TestStatement(st, statementStorageService);
+    }
+
+    public TestStatement assertSessionState(StatementState expected) {
+      assertEquals(expected, st.getStatementModel().getStatementState());
+
+      Optional<StatementModel> model =
+          statementStorageService.getStatement(
+              st.getStatementId().getId(), TEST_DATASOURCE_NAME, st.getAsyncQueryRequestContext());
+      assertTrue(model.isPresent());
+      assertEquals(expected, model.get().getStatementState());
+
+      return this;
+    }
+
+    public TestStatement assertStatementId(StatementId expected) {
+      assertEquals(expected, st.getStatementModel().getStatementId());
+
+      Optional<StatementModel> model =
+          statementStorageService.getStatement(
+              st.getStatementId().getId(), TEST_DATASOURCE_NAME, st.getAsyncQueryRequestContext());
+      assertTrue(model.isPresent());
+      assertEquals(expected, model.get().getStatementId());
+      return this;
+    }
+
+    public TestStatement open() {
+      st.open();
+      return this;
+    }
+
+    public TestStatement cancel() {
+      st.cancel();
+      return this;
+    }
+
+    public TestStatement run() {
+      StatementModel model =
+          statementStorageService.updateStatementState(
+              st.getStatementModel(), RUNNING, st.getAsyncQueryRequestContext());
+      st.setStatementModel(model);
+      return this;
+    }
+  }
+
+  private QueryRequest queryRequest() {
+    return new QueryRequest(IDUtils.encode(TEST_DATASOURCE_NAME), LangType.SQL, "select 1");
+  }
+
+  private Statement createStatement(StatementId stId) {
+    Statement st = buildStatement(stId);
+    st.open();
+    return st;
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/AsyncQueryJobMetadataXContentSerializerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/AsyncQueryJobMetadataXContentSerializerTest.java
new file mode 100644
index 0000000000..c43a6f936e
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/AsyncQueryJobMetadataXContentSerializerTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+
+class AsyncQueryJobMetadataXContentSerializerTest {
+
+  private final AsyncQueryJobMetadataXContentSerializer serializer =
+      new AsyncQueryJobMetadataXContentSerializer();
+
+  @Test
+  void toXContentShouldSerializeAsyncQueryJobMetadata() throws Exception {
+    AsyncQueryJobMetadata jobMetadata =
+        AsyncQueryJobMetadata.builder()
+            .queryId("query1")
+            .accountId("account1")
+            .applicationId("app1")
+            .jobId("job1")
+            .resultIndex("result1")
+            .sessionId("session1")
+            .datasourceName("datasource1")
+            .jobType(JobType.INTERACTIVE)
+            .indexName("index1")
+            .metadata(XContentSerializerUtil.buildMetadata(1L, 1L))
+            .build();
+
+    XContentBuilder xContentBuilder = serializer.toXContent(jobMetadata, ToXContent.EMPTY_PARAMS);
+    String json = xContentBuilder.toString();
+
+    assertEquals(true, json.contains("\"queryId\":\"query1\""));
+    assertEquals(true, json.contains("\"type\":\"jobmeta\""));
+    assertEquals(true, json.contains("\"jobId\":\"job1\""));
+    assertEquals(true, json.contains("\"accountId\":\"account1\""));
+    assertEquals(true, json.contains("\"applicationId\":\"app1\""));
+    assertEquals(true, json.contains("\"resultIndex\":\"result1\""));
+    assertEquals(true, json.contains("\"sessionId\":\"session1\""));
+    assertEquals(true, json.contains("\"dataSourceName\":\"datasource1\""));
+    assertEquals(true, json.contains("\"jobType\":\"interactive\""));
+    assertEquals(true, json.contains("\"indexName\":\"index1\""));
+  }
+
+  @Test
+  void fromXContentShouldDeserializeAsyncQueryJobMetadata() throws Exception {
+    String json = getBaseJson().toString();
+    XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    AsyncQueryJobMetadata jobMetadata = serializer.fromXContent(parser, 1L, 1L);
+
+    assertEquals("query1", jobMetadata.getQueryId());
+    assertEquals("job1", jobMetadata.getJobId());
+    assertEquals("account1", jobMetadata.getAccountId());
+    assertEquals("app1", jobMetadata.getApplicationId());
+    assertEquals("result1", jobMetadata.getResultIndex());
+    assertEquals("session1", jobMetadata.getSessionId());
+    assertEquals("datasource1", jobMetadata.getDatasourceName());
+    assertEquals(JobType.INTERACTIVE, jobMetadata.getJobType());
+    assertEquals("index1", jobMetadata.getIndexName());
+  }
+
+  @Test
+  void fromXContentShouldThrowExceptionWhenMissingJobId() throws Exception {
+    String json = getJsonWithout("jobId").toString();
+    XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    assertThrows(IllegalArgumentException.class, () -> serializer.fromXContent(parser, 1L, 1L));
+  }
+
+  @Test
+  void fromXContentShouldThrowExceptionWhenMissingApplicationId() throws Exception {
+    String json = getJsonWithout("applicationId").toString();
+    XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    assertThrows(IllegalArgumentException.class, () -> serializer.fromXContent(parser, 1L, 1L));
+  }
+
+  @Test
+  void fromXContentShouldThrowExceptionWhenUnknownFields() throws Exception {
+    String json = getBaseJson().put("unknownAttr", "index1").toString();
+    XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    assertThrows(IllegalArgumentException.class, () -> serializer.fromXContent(parser, 1L, 1L));
+  }
+
+  @Test
+  void fromXContentShouldDeserializeAsyncQueryWithJobTypeNUll() throws Exception {
+    String json = getBaseJson().put("jobType", "").toString();
+    XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    AsyncQueryJobMetadata jobMetadata = serializer.fromXContent(parser, 1L, 1L);
+
+    assertEquals("query1", jobMetadata.getQueryId());
+    assertEquals("job1", jobMetadata.getJobId());
+    assertEquals("account1", jobMetadata.getAccountId());
+    assertEquals("app1", jobMetadata.getApplicationId());
+    assertEquals("result1", jobMetadata.getResultIndex());
+    assertEquals("session1", jobMetadata.getSessionId());
+    assertEquals("datasource1", jobMetadata.getDatasourceName());
+    assertNull(jobMetadata.getJobType());
+    assertEquals("index1", jobMetadata.getIndexName());
+  }
+
+  @Test
+  void fromXContentShouldDeserializeAsyncQueryWithAccountIdNUll() throws Exception {
+    String json = getJsonWithout("accountId").put("jobType", "").toString();
+    XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    AsyncQueryJobMetadata jobMetadata = serializer.fromXContent(parser, 1L, 1L);
+
+    assertEquals("query1", jobMetadata.getQueryId());
+    assertEquals("job1", jobMetadata.getJobId());
+    assertEquals("app1", jobMetadata.getApplicationId());
+    assertEquals("result1", jobMetadata.getResultIndex());
+    assertEquals("session1", jobMetadata.getSessionId());
+    assertEquals("datasource1", jobMetadata.getDatasourceName());
+    assertNull(jobMetadata.getJobType());
+    assertEquals("index1", jobMetadata.getIndexName());
+  }
+
+  @Test
+  void fromXContentShouldDeserializeAsyncQueryWithoutJobId() throws Exception {
+    String json = getJsonWithout("jobId").toString();
+    XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    assertThrows(IllegalArgumentException.class, () -> serializer.fromXContent(parser, 1L, 1L));
+  }
+
+  private JSONObject getJsonWithout(String... attrs) {
+    JSONObject result = getBaseJson();
+    for (String attr : attrs) {
+      result.remove(attr);
+    }
+    return result;
+  }
+
+  private JSONObject getBaseJson() {
+    return new JSONObject()
+        .put("queryId", "query1")
+        .put("type", "jobmeta")
+        .put("jobId", "job1")
+        .put("accountId", "account1")
+        .put("applicationId", "app1")
+        .put("resultIndex", "result1")
+        .put("sessionId", "session1")
+        .put("dataSourceName", "datasource1")
+        .put("jobType", "interactive")
+        .put("indexName", "index1");
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/FlintIndexStateModelXContentSerializerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/FlintIndexStateModelXContentSerializerTest.java
new file mode 100644
index 0000000000..0d6d5f3119
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/FlintIndexStateModelXContentSerializerTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.sql.spark.flint.FlintIndexState;
+import org.opensearch.sql.spark.flint.FlintIndexStateModel;
+
+@ExtendWith(MockitoExtension.class)
+class FlintIndexStateModelXContentSerializerTest {
+
+  private FlintIndexStateModelXContentSerializer serializer =
+      new FlintIndexStateModelXContentSerializer();
+
+  @Test
+  void toXContentShouldSerializeFlintIndexStateModel() throws Exception {
+    FlintIndexStateModel flintIndexStateModel =
+        FlintIndexStateModel.builder()
+            .indexState(FlintIndexState.ACTIVE)
+            .accountId("account1")
+            .applicationId("app1")
+            .jobId("job1")
+            .latestId("latest1")
+            .datasourceName("datasource1")
+            .lastUpdateTime(System.currentTimeMillis())
+            .error(null)
+            .build();
+
+    XContentBuilder xContentBuilder =
+        serializer.toXContent(flintIndexStateModel, ToXContent.EMPTY_PARAMS);
+    String json = xContentBuilder.toString();
+
+    assertEquals(true, json.contains("\"version\":\"1.0\""));
+    assertEquals(true, json.contains("\"type\":\"flintindexstate\""));
+    assertEquals(true, json.contains("\"state\":\"active\""));
+    assertEquals(true, json.contains("\"accountId\":\"account1\""));
+    assertEquals(true, json.contains("\"applicationId\":\"app1\""));
+    assertEquals(true, json.contains("\"jobId\":\"job1\""));
+    assertEquals(true, json.contains("\"latestId\":\"latest1\""));
+    assertEquals(true, json.contains("\"dataSourceName\":\"datasource1\""));
+  }
+
+  @Test
+  void fromXContentShouldDeserializeFlintIndexStateModel() throws Exception {
+    String json = getBaseJson().toString();
+    XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    FlintIndexStateModel flintIndexStateModel = serializer.fromXContent(parser, 1L, 1L);
+
+    assertEquals(FlintIndexState.ACTIVE, flintIndexStateModel.getIndexState());
+    assertEquals("account1", flintIndexStateModel.getAccountId());
+    assertEquals("app1", flintIndexStateModel.getApplicationId());
+    assertEquals("job1", flintIndexStateModel.getJobId());
+    assertEquals("latest1", flintIndexStateModel.getLatestId());
+    assertEquals("datasource1", flintIndexStateModel.getDatasourceName());
+  }
+
+  @Test
+  void fromXContentShouldDeserializeFlintIndexStateModelWithoutAccountId() throws Exception {
+    String json = getJsonWithout("accountId").toString();
+    XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    FlintIndexStateModel flintIndexStateModel = serializer.fromXContent(parser, 1L, 1L);
+
+    assertEquals(FlintIndexState.ACTIVE, flintIndexStateModel.getIndexState());
+    assertNull(flintIndexStateModel.getAccountId());
+    assertEquals("app1", flintIndexStateModel.getApplicationId());
+    assertEquals("job1", flintIndexStateModel.getJobId());
+    assertEquals("latest1", flintIndexStateModel.getLatestId());
+    assertEquals("datasource1", flintIndexStateModel.getDatasourceName());
+  }
+
+  private JSONObject getJsonWithout(String attr) {
+    JSONObject result = getBaseJson();
+    result.remove(attr);
+    return result;
+  }
+
+  private JSONObject getBaseJson() {
+    return new JSONObject()
+        .put("version", "1.0")
+        .put("type", "flintindexstate")
+        .put("state", "active")
+        .put("statementId", "statement1")
+        .put("sessionId", "session1")
+        .put("accountId", "account1")
+        .put("applicationId", "app1")
+        .put("jobId", "job1")
+        .put("latestId", "latest1")
+        .put("dataSourceName", "datasource1")
+        .put("lastUpdateTime", 1623456789)
+        .put("error", "");
+  }
+
+  @Test
+  void fromXContentThrowsExceptionWhenParsingInvalidContent() {
+    XContentParser parser = mock(XContentParser.class);
+
+    assertThrows(RuntimeException.class, () -> serializer.fromXContent(parser, 0, 0));
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/IndexDMLResultXContentSerializerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/IndexDMLResultXContentSerializerTest.java
new file mode 100644
index 0000000000..edf88bad42
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/IndexDMLResultXContentSerializerTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.IOException;
+import org.junit.jupiter.api.Test;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.sql.spark.dispatcher.model.IndexDMLResult;
+
+class IndexDMLResultXContentSerializerTest {
+
+  private final IndexDMLResultXContentSerializer serializer =
+      new IndexDMLResultXContentSerializer();
+
+  @Test
+  void toXContentShouldSerializeIndexDMLResult() throws IOException {
+    IndexDMLResult dmlResult =
+        IndexDMLResult.builder()
+            .queryId("query1")
+            .status("SUCCESS")
+            .error(null)
+            .datasourceName("datasource1")
+            .queryRunTime(1000L)
+            .updateTime(2000L)
+            .build();
+
+    XContentBuilder xContentBuilder = serializer.toXContent(dmlResult, ToXContent.EMPTY_PARAMS);
+    String json = xContentBuilder.toString();
+
+    assertTrue(json.contains("\"queryId\":\"query1\""));
+    assertTrue(json.contains("\"status\":\"SUCCESS\""));
+    assertTrue(json.contains("\"error\":null"));
+    assertTrue(json.contains("\"dataSourceName\":\"datasource1\""));
+    assertTrue(json.contains("\"queryRunTime\":1000"));
+    assertTrue(json.contains("\"updateTime\":2000"));
+    assertTrue(json.contains("\"result\":[]"));
+    assertTrue(json.contains("\"schema\":[]"));
+  }
+
+  @Test
+  void toXContentShouldHandleErrorInIndexDMLResult() throws IOException {
+    IndexDMLResult dmlResult =
+        IndexDMLResult.builder()
+            .queryId("query1")
+            .status("FAILURE")
+            .error("An error occurred")
+            .datasourceName("datasource1")
+            .queryRunTime(1000L)
+            .updateTime(2000L)
+            .build();
+
+    XContentBuilder xContentBuilder = serializer.toXContent(dmlResult, ToXContent.EMPTY_PARAMS);
+
+    String json = xContentBuilder.toString();
+    assertTrue(json.contains("\"queryId\":\"query1\""));
+    assertTrue(json.contains("\"status\":\"FAILURE\""));
+    assertTrue(json.contains("\"error\":\"An error occurred\""));
+    assertTrue(json.contains("\"dataSourceName\":\"datasource1\""));
+    assertTrue(json.contains("\"queryRunTime\":1000"));
+    assertTrue(json.contains("\"updateTime\":2000"));
+    assertTrue(json.contains("\"result\":[]"));
+    assertTrue(json.contains("\"schema\":[]"));
+  }
+
+  @Test
+  void fromXContentShouldThrowUnsupportedOperationException() {
+    assertThrows(UnsupportedOperationException.class, () -> serializer.fromXContent(null, 0L, 0L));
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/SessionModelXContentSerializerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/SessionModelXContentSerializerTest.java
new file mode 100644
index 0000000000..0b32bbf020
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/SessionModelXContentSerializerTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.sql.spark.execution.session.SessionModel;
+import org.opensearch.sql.spark.execution.session.SessionState;
+import org.opensearch.sql.spark.execution.session.SessionType;
+
+class SessionModelXContentSerializerTest {
+
+  private final SessionModelXContentSerializer serializer = new SessionModelXContentSerializer();
+
+  @Test
+  void toXContentShouldSerializeSessionModel() throws Exception {
+    SessionModel sessionModel =
+        SessionModel.builder()
+            .version("1.0")
+            .sessionType(SessionType.INTERACTIVE)
+            .sessionId("session1")
+            .sessionState(SessionState.FAIL)
+            .datasourceName("datasource1")
+            .accountId("account1")
+            .applicationId("app1")
+            .jobId("job1")
+            .lastUpdateTime(System.currentTimeMillis())
+            .error(null)
+            .build();
+
+    XContentBuilder xContentBuilder = serializer.toXContent(sessionModel, ToXContent.EMPTY_PARAMS);
+
+    String json = xContentBuilder.toString();
+    assertEquals(true, json.contains("\"version\":\"1.0\""));
+    assertEquals(true, json.contains("\"type\":\"session\""));
+    assertEquals(true, json.contains("\"sessionType\":\"interactive\""));
+    assertEquals(true, json.contains("\"sessionId\":\"session1\""));
+    assertEquals(true, json.contains("\"state\":\"fail\""));
+    assertEquals(true, json.contains("\"dataSourceName\":\"datasource1\""));
+    assertEquals(true, json.contains("\"accountId\":\"account1\""));
+    assertEquals(true, json.contains("\"applicationId\":\"app1\""));
+    assertEquals(true, json.contains("\"jobId\":\"job1\""));
+  }
+
+  @Test
+  void fromXContentShouldDeserializeSessionModel() throws Exception {
+    String json = getBaseJson().toString();
+    XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    SessionModel sessionModel = serializer.fromXContent(parser, 1L, 1L);
+
+    assertEquals("1.0", sessionModel.getVersion());
+    assertEquals(SessionType.INTERACTIVE, sessionModel.getSessionType());
+    assertEquals("session1", sessionModel.getSessionId());
+    assertEquals(SessionState.FAIL, sessionModel.getSessionState());
+    assertEquals("datasource1", sessionModel.getDatasourceName());
+    assertEquals("account1", sessionModel.getAccountId());
+    assertEquals("app1", sessionModel.getApplicationId());
+    assertEquals("job1", sessionModel.getJobId());
+  }
+
+  @Test
+  void fromXContentShouldDeserializeSessionModelWithoutAccountId() throws Exception {
+    String json = getJsonWithout("accountId").toString();
+    XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    SessionModel sessionModel = serializer.fromXContent(parser, 1L, 1L);
+
+    assertEquals("1.0", sessionModel.getVersion());
+    assertEquals(SessionType.INTERACTIVE, sessionModel.getSessionType());
+    assertEquals("session1", sessionModel.getSessionId());
+    assertEquals(SessionState.FAIL, sessionModel.getSessionState());
+    assertEquals("datasource1", sessionModel.getDatasourceName());
+    assertNull(sessionModel.getAccountId());
+    assertEquals("app1", sessionModel.getApplicationId());
+    assertEquals("job1", sessionModel.getJobId());
+  }
+
+  private JSONObject getJsonWithout(String attr) {
+    JSONObject result = getBaseJson();
+    result.remove(attr);
+    return result;
+  }
+
+  private JSONObject getBaseJson() {
+    return new JSONObject()
+        .put("version", "1.0")
+        .put("type", "session")
+        .put("sessionType", "interactive")
+        .put("sessionId", "session1")
+        .put("state", "fail")
+        .put("dataSourceName", "datasource1")
+        .put("accountId", "account1")
+        .put("applicationId", "app1")
+        .put("jobId", "job1")
+        .put("lastUpdateTime", 1623456789)
+        .put("error", "");
+  }
+
+  @Test
+  void fromXContentThrowsExceptionWhenParsingInvalidContent() {
+    XContentParser parser = mock(XContentParser.class);
+
+    assertThrows(RuntimeException.class, () -> serializer.fromXContent(parser, 0, 0));
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/StatementModelXContentSerializerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/StatementModelXContentSerializerTest.java
new file mode 100644
index 0000000000..f85667930e
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/StatementModelXContentSerializerTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.sql.spark.execution.statement.StatementId;
+import org.opensearch.sql.spark.execution.statement.StatementModel;
+import org.opensearch.sql.spark.execution.statement.StatementState;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+@ExtendWith(MockitoExtension.class)
+class StatementModelXContentSerializerTest {
+
+  private StatementModelXContentSerializer serializer;
+
+  @Test
+  void toXContentShouldSerializeStatementModel() throws Exception {
+    serializer = new StatementModelXContentSerializer();
+    StatementModel statementModel =
+        StatementModel.builder()
+            .version("1.0")
+            .statementState(StatementState.RUNNING)
+            .statementId(new StatementId("statement1"))
+            .sessionId("session1")
+            .accountId("account1")
+            .applicationId("app1")
+            .jobId("job1")
+            .langType(LangType.SQL)
+            .datasourceName("datasource1")
+            .query("SELECT * FROM table")
+            .queryId("query1")
+            .submitTime(System.currentTimeMillis())
+            .error(null)
+            .build();
+
+    XContentBuilder xContentBuilder =
+        serializer.toXContent(statementModel, ToXContent.EMPTY_PARAMS);
+
+    String json = xContentBuilder.toString();
+    assertEquals(true, json.contains("\"version\":\"1.0\""));
+    assertEquals(true, json.contains("\"state\":\"running\""));
+    assertEquals(true, json.contains("\"statementId\":\"statement1\""));
+    assertEquals(true, json.contains("\"accountId\":\"account1\""));
+    assertEquals(true, json.contains("\"applicationId\":\"app1\""));
+    assertEquals(true, json.contains("\"jobId\":\"job1\""));
+  }
+
+  @Test
+  void fromXContentShouldDeserializeStatementModel() throws Exception {
+    StatementModelXContentSerializer serializer = new StatementModelXContentSerializer();
+    String json = getBaseJson().toString();
+    final XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    StatementModel statementModel = serializer.fromXContent(parser, 1L, 1L);
+
+    assertEquals("1.0", statementModel.getVersion());
+    assertEquals(StatementState.RUNNING, statementModel.getStatementState());
+    assertEquals("statement1", statementModel.getStatementId().getId());
+    assertEquals("session1", statementModel.getSessionId());
+    assertEquals("account1", statementModel.getAccountId());
+  }
+
+  @Test
+  void fromXContentShouldDeserializeStatementModelWithoutAccountId() throws Exception {
+    StatementModelXContentSerializer serializer = new StatementModelXContentSerializer();
+    String json = getJsonWithout("accountId").toString();
+    final XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    StatementModel statementModel = serializer.fromXContent(parser, 1L, 1L);
+
+    assertEquals("1.0", statementModel.getVersion());
+    assertEquals(StatementState.RUNNING, statementModel.getStatementState());
+    assertEquals("statement1", statementModel.getStatementId().getId());
+    assertEquals("session1", statementModel.getSessionId());
+    assertNull(statementModel.getAccountId());
+  }
+
+  @Test
+  void fromXContentThrowsExceptionWhenParsingInvalidContent() {
+    XContentParser parser = mock(XContentParser.class);
+
+    assertThrows(RuntimeException.class, () -> serializer.fromXContent(parser, 0, 0));
+  }
+
+  @Test
+  void fromXContentShouldThrowExceptionForUnexpectedField() throws Exception {
+    StatementModelXContentSerializer serializer = new StatementModelXContentSerializer();
+    String json = getBaseJson().put("unexpectedField", "someValue").toString();
+    final XContentParser parser = XContentSerializerTestUtil.prepareParser(json);
+
+    IllegalArgumentException exception =
+        assertThrows(IllegalArgumentException.class, () -> serializer.fromXContent(parser, 1L, 1L));
+    assertEquals("Unexpected field: unexpectedField", exception.getMessage());
+  }
+
+  private JSONObject getJsonWithout(String attr) {
+    JSONObject result = getBaseJson();
+    result.remove(attr);
+    return result;
+  }
+
+  private JSONObject getBaseJson() {
+    return new JSONObject()
+        .put("version", "1.0")
+        .put("type", "statement")
+        .put("state", "running")
+        .put("statementId", "statement1")
+        .put("sessionId", "session1")
+        .put("accountId", "account1")
+        .put("applicationId", "app1")
+        .put("jobId", "job1")
+        .put("lang", "SQL")
+        .put("dataSourceName", "datasource1")
+        .put("query", "SELECT * FROM table")
+        .put("queryId", "query1")
+        .put("submitTime", 1623456789)
+        .put("error", "");
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializerTestUtil.java b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializerTestUtil.java
new file mode 100644
index 0000000000..a9356b6908
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/execution/xcontent/XContentSerializerTestUtil.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.execution.xcontent;
+
+import java.io.IOException;
+import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
+
+public class XContentSerializerTestUtil {
+  public static XContentParser prepareParser(String json) throws IOException {
+    XContentParser parser =
+        XContentType.JSON
+            .xContent()
+            .createParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, json);
+    parser.nextToken();
+    return parser;
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImplTest.java b/async-query/src/test/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImplTest.java
new file mode 100644
index 0000000000..b1321cc132
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImplTest.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.metadata.IndexMetadata;
+import org.opensearch.cluster.metadata.MappingMetadata;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions;
+import org.opensearch.sql.spark.dispatcher.model.FullyQualifiedTableName;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryActionType;
+import org.opensearch.sql.spark.dispatcher.model.IndexQueryDetails;
+
+@ExtendWith(MockitoExtension.class)
+public class FlintIndexMetadataServiceImplTest {
+  @Mock(answer = RETURNS_DEEP_STUBS)
+  private Client client;
+
+  @Mock private AsyncQueryRequestContext asyncQueryRequestContext;
+
+  @SneakyThrows
+  @Test
+  void testGetJobIdFromFlintSkippingIndexMetadata() {
+    URL url =
+        Resources.getResource(
+            "flint-index-mappings/flint_mys3_default_http_logs_skipping_index.json");
+    String mappings = Resources.toString(url, Charsets.UTF_8);
+    String indexName = "flint_mys3_default_http_logs_skipping_index";
+    mockNodeClientIndicesMappings(indexName, mappings);
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    IndexQueryDetails indexQueryDetails =
+        IndexQueryDetails.builder()
+            .fullyQualifiedTableName(new FullyQualifiedTableName("mys3.default.http_logs"))
+            .indexOptions(new FlintIndexOptions())
+            .indexQueryActionType(IndexQueryActionType.DROP)
+            .indexType(FlintIndexType.SKIPPING)
+            .build();
+
+    Map<String, FlintIndexMetadata> indexMetadataMap =
+        flintIndexMetadataService.getFlintIndexMetadata(
+            indexQueryDetails.openSearchIndexName(), asyncQueryRequestContext);
+
+    Assertions.assertEquals(
+        "00fhelvq7peuao0",
+        indexMetadataMap.get(indexQueryDetails.openSearchIndexName()).getJobId());
+  }
+
+  @SneakyThrows
+  @Test
+  void testGetJobIdFromFlintSkippingIndexMetadataWithIndexState() {
+    URL url =
+        Resources.getResource(
+            "flint-index-mappings/flint_mys3_default_http_logs_skipping_index.json");
+    String mappings = Resources.toString(url, Charsets.UTF_8);
+    String indexName = "flint_mys3_default_http_logs_skipping_index";
+    mockNodeClientIndicesMappings(indexName, mappings);
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    IndexQueryDetails indexQueryDetails =
+        IndexQueryDetails.builder()
+            .fullyQualifiedTableName(new FullyQualifiedTableName("mys3.default.http_logs"))
+            .indexOptions(new FlintIndexOptions())
+            .indexQueryActionType(IndexQueryActionType.DROP)
+            .indexType(FlintIndexType.SKIPPING)
+            .build();
+
+    Map<String, FlintIndexMetadata> indexMetadataMap =
+        flintIndexMetadataService.getFlintIndexMetadata(
+            indexQueryDetails.openSearchIndexName(), asyncQueryRequestContext);
+
+    FlintIndexMetadata metadata = indexMetadataMap.get(indexQueryDetails.openSearchIndexName());
+    Assertions.assertEquals("00fhelvq7peuao0", metadata.getJobId());
+  }
+
+  @SneakyThrows
+  @Test
+  void testGetJobIdFromFlintCoveringIndexMetadata() {
+    URL url =
+        Resources.getResource("flint-index-mappings/flint_mys3_default_http_logs_cv1_index.json");
+    String mappings = Resources.toString(url, Charsets.UTF_8);
+    String indexName = "flint_mys3_default_http_logs_cv1_index";
+    mockNodeClientIndicesMappings(indexName, mappings);
+    IndexQueryDetails indexQueryDetails =
+        IndexQueryDetails.builder()
+            .indexName("cv1")
+            .fullyQualifiedTableName(new FullyQualifiedTableName("mys3.default.http_logs"))
+            .indexOptions(new FlintIndexOptions())
+            .indexQueryActionType(IndexQueryActionType.DROP)
+            .indexType(FlintIndexType.COVERING)
+            .build();
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+
+    Map<String, FlintIndexMetadata> indexMetadataMap =
+        flintIndexMetadataService.getFlintIndexMetadata(
+            indexQueryDetails.openSearchIndexName(), asyncQueryRequestContext);
+
+    Assertions.assertEquals(
+        "00fdmvv9hp8u0o0q",
+        indexMetadataMap.get(indexQueryDetails.openSearchIndexName()).getJobId());
+  }
+
+  @SneakyThrows
+  @Test
+  void testGetJobIDWithNPEException() {
+    URL url = Resources.getResource("flint-index-mappings/npe_mapping.json");
+    String mappings = Resources.toString(url, Charsets.UTF_8);
+    String indexName = "flint_mys3_default_http_logs_cv1_index";
+    mockNodeClientIndicesMappings(indexName, mappings);
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+    IndexQueryDetails indexQueryDetails =
+        IndexQueryDetails.builder()
+            .indexName("cv1")
+            .fullyQualifiedTableName(new FullyQualifiedTableName("mys3.default.http_logs"))
+            .indexOptions(new FlintIndexOptions())
+            .indexQueryActionType(IndexQueryActionType.DROP)
+            .indexType(FlintIndexType.COVERING)
+            .build();
+
+    Map<String, FlintIndexMetadata> flintIndexMetadataMap =
+        flintIndexMetadataService.getFlintIndexMetadata(
+            indexQueryDetails.openSearchIndexName(), asyncQueryRequestContext);
+
+    Assertions.assertFalse(
+        flintIndexMetadataMap.containsKey("flint_mys3_default_http_logs_cv1_index"));
+  }
+
+  @SneakyThrows
+  @Test
+  void testGetJobIDWithNPEExceptionForMultipleIndices() {
+    HashMap<String, String> indexMappingsMap = new HashMap<>();
+    URL url = Resources.getResource("flint-index-mappings/npe_mapping.json");
+    String mappings = Resources.toString(url, Charsets.UTF_8);
+    String indexName = "flint_mys3_default_http_logs_cv1_index";
+    indexMappingsMap.put(indexName, mappings);
+    url =
+        Resources.getResource(
+            "flint-index-mappings/flint_mys3_default_http_logs_skipping_index.json");
+    mappings = Resources.toString(url, Charsets.UTF_8);
+    indexName = "flint_mys3_default_http_logs_skipping_index";
+    indexMappingsMap.put(indexName, mappings);
+    mockNodeClientIndicesMappings("flint_mys3*", indexMappingsMap);
+    FlintIndexMetadataService flintIndexMetadataService = new FlintIndexMetadataServiceImpl(client);
+
+    Map<String, FlintIndexMetadata> flintIndexMetadataMap =
+        flintIndexMetadataService.getFlintIndexMetadata("flint_mys3*", asyncQueryRequestContext);
+
+    Assertions.assertFalse(
+        flintIndexMetadataMap.containsKey("flint_mys3_default_http_logs_cv1_index"));
+    Assertions.assertTrue(
+        flintIndexMetadataMap.containsKey("flint_mys3_default_http_logs_skipping_index"));
+  }
+
+  @SneakyThrows
+  public void mockNodeClientIndicesMappings(String indexName, String mappings) {
+    GetMappingsResponse mockResponse = mock(GetMappingsResponse.class);
+    when(client.admin().indices().prepareGetMappings().setIndices(indexName).get())
+        .thenReturn(mockResponse);
+    Map<String, MappingMetadata> metadata;
+    metadata = Map.of(indexName, IndexMetadata.fromXContent(createParser(mappings)).mapping());
+    when(mockResponse.getMappings()).thenReturn(metadata);
+  }
+
+  @SneakyThrows
+  public void mockNodeClientIndicesMappings(
+      String indexPattern, HashMap<String, String> indexMappingsMap) {
+    GetMappingsResponse mockResponse = mock(GetMappingsResponse.class);
+    when(client.admin().indices().prepareGetMappings().setIndices(indexPattern).get())
+        .thenReturn(mockResponse);
+    Map<String, MappingMetadata> metadataMap = new HashMap<>();
+    for (String indexName : indexMappingsMap.keySet()) {
+      metadataMap.put(
+          indexName,
+          IndexMetadata.fromXContent(createParser(indexMappingsMap.get(indexName))).mapping());
+    }
+    when(mockResponse.getMappings()).thenReturn(metadataMap);
+  }
+
+  private XContentParser createParser(String mappings) throws IOException {
+    return XContentType.JSON
+        .xContent()
+        .createParser(
+            NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION, mappings);
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClientTest.java b/async-query/src/test/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClientTest.java
new file mode 100644
index 0000000000..d9f2e58dba
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClientTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
+import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.client.Client;
+
+@ExtendWith(MockitoExtension.class)
+public class OpenSearchFlintIndexClientTest {
+
+  @Mock(answer = RETURNS_DEEP_STUBS)
+  private Client client;
+
+  @Mock private AcknowledgedResponse acknowledgedResponse;
+
+  @InjectMocks private OpenSearchFlintIndexClient openSearchFlintIndexClient;
+
+  @Test
+  public void testDeleteIndex() {
+    when(client.admin().indices().delete(any(DeleteIndexRequest.class)).actionGet())
+        .thenReturn(acknowledgedResponse);
+    when(acknowledgedResponse.isAcknowledged()).thenReturn(true);
+
+    openSearchFlintIndexClient.deleteIndex("test-index");
+    verify(client.admin().indices()).delete(any(DeleteIndexRequest.class));
+    verify(acknowledgedResponse).isAcknowledged();
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexStateModelServiceTest.java b/async-query/src/test/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexStateModelServiceTest.java
new file mode 100644
index 0000000000..4faff41fe6
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexStateModelServiceTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.flint;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.execution.statestore.StateStore;
+import org.opensearch.sql.spark.execution.xcontent.FlintIndexStateModelXContentSerializer;
+
+@ExtendWith(MockitoExtension.class)
+public class OpenSearchFlintIndexStateModelServiceTest {
+
+  public static final String DATASOURCE = "DATASOURCE";
+  public static final String ID = "ID";
+
+  @Mock StateStore mockStateStore;
+  @Mock FlintIndexStateModel flintIndexStateModel;
+  @Mock FlintIndexState flintIndexState;
+  @Mock FlintIndexStateModel responseFlintIndexStateModel;
+  @Mock FlintIndexStateModelXContentSerializer flintIndexStateModelXContentSerializer;
+  @Mock AsyncQueryRequestContext asyncQueryRequestContext;
+
+  @InjectMocks OpenSearchFlintIndexStateModelService openSearchFlintIndexStateModelService;
+
+  @Test
+  void updateFlintIndexState() {
+    when(mockStateStore.updateState(any(), any(), any(), any()))
+        .thenReturn(responseFlintIndexStateModel);
+
+    FlintIndexStateModel result =
+        openSearchFlintIndexStateModelService.updateFlintIndexState(
+            flintIndexStateModel, flintIndexState, DATASOURCE, asyncQueryRequestContext);
+
+    assertEquals(responseFlintIndexStateModel, result);
+  }
+
+  @Test
+  void getFlintIndexStateModel() {
+    when(mockStateStore.get(any(), any(), any()))
+        .thenReturn(Optional.of(responseFlintIndexStateModel));
+
+    Optional<FlintIndexStateModel> result =
+        openSearchFlintIndexStateModelService.getFlintIndexStateModel(
+            "ID", DATASOURCE, asyncQueryRequestContext);
+
+    assertEquals(responseFlintIndexStateModel, result.get());
+  }
+
+  @Test
+  void createFlintIndexStateModel() {
+    when(mockStateStore.create(any(), any(), any(), any()))
+        .thenReturn(responseFlintIndexStateModel);
+    when(flintIndexStateModel.getDatasourceName()).thenReturn(DATASOURCE);
+
+    FlintIndexStateModel result =
+        openSearchFlintIndexStateModelService.createFlintIndexStateModel(
+            flintIndexStateModel, asyncQueryRequestContext);
+
+    assertEquals(responseFlintIndexStateModel, result);
+  }
+
+  @Test
+  void deleteFlintIndexStateModel() {
+    when(mockStateStore.delete(any(), any())).thenReturn(true);
+
+    boolean result =
+        openSearchFlintIndexStateModelService.deleteFlintIndexStateModel(
+            ID, DATASOURCE, asyncQueryRequestContext);
+
+    assertTrue(result);
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/leasemanager/DefaultLeaseManagerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/leasemanager/DefaultLeaseManagerTest.java
new file mode 100644
index 0000000000..558f7f7b3a
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/leasemanager/DefaultLeaseManagerTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.leasemanager;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.spark.dispatcher.model.JobType;
+import org.opensearch.sql.spark.execution.statestore.StateStore;
+import org.opensearch.sql.spark.leasemanager.model.LeaseRequest;
+
+@ExtendWith(MockitoExtension.class)
+class DefaultLeaseManagerTest {
+  @Mock private Settings settings;
+
+  @Mock private StateStore stateStore;
+
+  @Test
+  public void concurrentSessionRuleOnlyApplyToInteractiveQuery() {
+    assertTrue(
+        new DefaultLeaseManager.ConcurrentSessionRule(settings, stateStore)
+            .test(new LeaseRequest(JobType.BATCH, "mys3")));
+    assertTrue(
+        new DefaultLeaseManager.ConcurrentSessionRule(settings, stateStore)
+            .test(new LeaseRequest(JobType.STREAMING, "mys3")));
+  }
+
+  @Test
+  public void concurrentRefreshRuleOnlyNotAppliedToInteractiveQuery() {
+    assertTrue(
+        new DefaultLeaseManager.ConcurrentRefreshJobRule(settings, stateStore)
+            .test(new LeaseRequest(JobType.INTERACTIVE, "mys3")));
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/parameter/S3GlueDataSourceSparkParameterComposerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/parameter/S3GlueDataSourceSparkParameterComposerTest.java
new file mode 100644
index 0000000000..3e12aa78d0
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/parameter/S3GlueDataSourceSparkParameterComposerTest.java
@@ -0,0 +1,368 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.parameter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_JAR_PACKAGES_KEY;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.common.setting.Settings.Key;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceStatus;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.datasources.auth.AuthenticationType;
+import org.opensearch.sql.datasources.glue.GlueDataSourceFactory;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.config.SparkExecutionEngineConfigClusterSettingLoader;
+import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
+
+@ExtendWith(MockitoExtension.class)
+class S3GlueDataSourceSparkParameterComposerTest {
+
+  public static final String VALID_URI = "https://test.host.com:9200";
+  public static final String INVALID_URI = "http://test/\r\n";
+  public static final String USERNAME = "USERNAME";
+  public static final String PASSWORD = "PASSWORD";
+  public static final String REGION = "REGION";
+  public static final String TRUE = "true";
+  public static final String ROLE_ARN = "arn:aws:iam::123456789012:role/ROLE_NAME";
+  public static final String APP_ID = "APP_ID";
+  public static final String CLUSTER_NAME = "CLUSTER_NAME";
+  public static final String ACCOUNT_ID = "123456789012";
+  public static final String SESSION_TAG = "SESSION_TAG";
+
+  private static final String COMMON_EXPECTED_PARAMS =
+      " --class org.apache.spark.sql.FlintJob "
+          + getConfList(
+              "spark.emr-serverless.driverEnv.ASSUME_ROLE_CREDENTIALS_ROLE_ARN=arn:aws:iam::123456789012:role/ROLE_NAME",
+              "spark.executorEnv.ASSUME_ROLE_CREDENTIALS_ROLE_ARN=arn:aws:iam::123456789012:role/ROLE_NAME",
+              "spark.hive.metastore.glue.role.arn=arn:aws:iam::123456789012:role/ROLE_NAME",
+              "spark.sql.catalog.DATASOURCE_NAME=org.opensearch.sql.FlintDelegatingSessionCatalog",
+              "spark.flint.datasource.name=DATASOURCE_NAME",
+              "spark.datasource.flint.host=test.host.com",
+              "spark.datasource.flint.port=9200",
+              "spark.datasource.flint.scheme=https");
+
+  @Mock DispatchQueryRequest dispatchQueryRequest;
+
+  @Test
+  public void testBasicAuth() {
+    DataSourceMetadata dataSourceMetadata =
+        getDataSourceMetadata(AuthenticationType.BASICAUTH, VALID_URI);
+    SparkSubmitParameters sparkSubmitParameters = new SparkSubmitParameters();
+
+    new S3GlueDataSourceSparkParameterComposer(getSparkExecutionEngineConfigClusterSettingLoader())
+        .compose(
+            dataSourceMetadata,
+            sparkSubmitParameters,
+            dispatchQueryRequest,
+            new NullAsyncQueryRequestContext());
+
+    assertEquals(
+        COMMON_EXPECTED_PARAMS
+            + getConfList(
+                "spark.datasource.flint.auth=basic",
+                "spark.datasource.flint.auth.username=USERNAME",
+                "spark.datasource.flint.auth.password=PASSWORD"),
+        sparkSubmitParameters.toString());
+  }
+
+  @Test
+  public void testComposeWithSigV4Auth() {
+    DataSourceMetadata dataSourceMetadata =
+        getDataSourceMetadata(AuthenticationType.AWSSIGV4AUTH, VALID_URI);
+    SparkSubmitParameters sparkSubmitParameters = new SparkSubmitParameters();
+
+    new S3GlueDataSourceSparkParameterComposer(getSparkExecutionEngineConfigClusterSettingLoader())
+        .compose(
+            dataSourceMetadata,
+            sparkSubmitParameters,
+            dispatchQueryRequest,
+            new NullAsyncQueryRequestContext());
+
+    assertEquals(
+        COMMON_EXPECTED_PARAMS
+            + getConfList(
+                "spark.datasource.flint.auth=sigv4", "spark.datasource.flint.region=REGION"),
+        sparkSubmitParameters.toString());
+  }
+
+  @Test
+  public void testComposeWithNoAuth() {
+    DataSourceMetadata dataSourceMetadata =
+        getDataSourceMetadata(AuthenticationType.NOAUTH, VALID_URI);
+    SparkSubmitParameters sparkSubmitParameters = new SparkSubmitParameters();
+
+    new S3GlueDataSourceSparkParameterComposer(getSparkExecutionEngineConfigClusterSettingLoader())
+        .compose(
+            dataSourceMetadata,
+            sparkSubmitParameters,
+            dispatchQueryRequest,
+            new NullAsyncQueryRequestContext());
+
+    assertEquals(
+        COMMON_EXPECTED_PARAMS + getConfList("spark.datasource.flint.auth=noauth"),
+        sparkSubmitParameters.toString());
+  }
+
+  @Test
+  public void testComposeWithBadUri() {
+    DataSourceMetadata dataSourceMetadata =
+        getDataSourceMetadata(AuthenticationType.NOAUTH, INVALID_URI);
+    SparkSubmitParameters sparkSubmitParameters = new SparkSubmitParameters();
+
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            new S3GlueDataSourceSparkParameterComposer(
+                    getSparkExecutionEngineConfigClusterSettingLoader())
+                .compose(
+                    dataSourceMetadata,
+                    sparkSubmitParameters,
+                    dispatchQueryRequest,
+                    new NullAsyncQueryRequestContext()));
+  }
+
+  @Test
+  public void testIcebergEnabled() {
+    final Map<String, String> properties =
+        ImmutableMap.<String, String>builder()
+            .put(GlueDataSourceFactory.GLUE_ROLE_ARN, ROLE_ARN)
+            .put(GlueDataSourceFactory.GLUE_ICEBERG_ENABLED, TRUE)
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_URI, VALID_URI)
+            .put(
+                GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH,
+                AuthenticationType.BASICAUTH.getName())
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH_USERNAME, USERNAME)
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH_PASSWORD, PASSWORD)
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_REGION, REGION)
+            .build();
+
+    final String expectedParams =
+        " --class org.apache.spark.sql.FlintJob "
+            + getConfList(
+                "spark.jars.packages=package,org.apache.iceberg:iceberg-spark-runtime-3.3_2.12:1.5.0,software.amazon.awssdk:bundle:2.26.30",
+                "spark.emr-serverless.driverEnv.ASSUME_ROLE_CREDENTIALS_ROLE_ARN=arn:aws:iam::123456789012:role/ROLE_NAME",
+                "spark.executorEnv.ASSUME_ROLE_CREDENTIALS_ROLE_ARN=arn:aws:iam::123456789012:role/ROLE_NAME",
+                "spark.hive.metastore.glue.role.arn=arn:aws:iam::123456789012:role/ROLE_NAME",
+                "spark.sql.catalog.DATASOURCE_NAME=org.opensearch.sql.FlintDelegatingSessionCatalog",
+                "spark.flint.datasource.name=DATASOURCE_NAME",
+                "spark.sql.catalog.spark_catalog=org.apache.iceberg.spark.SparkSessionCatalog",
+                "spark.sql.catalog.spark_catalog.catalog-impl=org.apache.iceberg.aws.glue.GlueCatalog",
+                "spark.sql.extensions=org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions,org.opensearch.flint.spark.FlintSparkExtensions,org.opensearch.flint.spark.FlintPPLSparkExtensions",
+                "spark.sql.catalog.spark_catalog.client.region=REGION",
+                "spark.sql.catalog.spark_catalog.glue.account-id=123456789012",
+                "spark.sql.catalog.spark_catalog.client.assume-role.arn=arn:aws:iam::123456789012:role/ROLE_NAME",
+                "spark.sql.catalog.spark_catalog.client.assume-role.region=REGION",
+                "spark.sql.iceberg.handle-timestamp-without-timezone=true",
+                "spark.sql.catalog.spark_catalog.client.factory=org.apache.iceberg.aws.AssumeRoleAwsClientFactory",
+                "spark.datasource.flint.host=test.host.com",
+                "spark.datasource.flint.port=9200",
+                "spark.datasource.flint.scheme=https",
+                "spark.datasource.flint.auth=basic",
+                "spark.datasource.flint.auth.username=USERNAME",
+                "spark.datasource.flint.auth.password=PASSWORD");
+
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata(properties);
+    SparkSubmitParameters sparkSubmitParameters = new SparkSubmitParameters();
+    sparkSubmitParameters.setConfigItem(SPARK_JAR_PACKAGES_KEY, "package");
+
+    new S3GlueDataSourceSparkParameterComposer(getSparkExecutionEngineConfigClusterSettingLoader())
+        .compose(
+            dataSourceMetadata,
+            sparkSubmitParameters,
+            dispatchQueryRequest,
+            new NullAsyncQueryRequestContext());
+
+    assertEquals(expectedParams, sparkSubmitParameters.toString());
+  }
+
+  @Test
+  public void testIcebergWithLakeFormationEnabled() {
+    final Map<String, String> properties =
+        ImmutableMap.<String, String>builder()
+            .put(GlueDataSourceFactory.GLUE_ROLE_ARN, ROLE_ARN)
+            .put(GlueDataSourceFactory.GLUE_ICEBERG_ENABLED, TRUE)
+            .put(GlueDataSourceFactory.GLUE_LAKEFORMATION_ENABLED, TRUE)
+            .put(GlueDataSourceFactory.GLUE_LAKEFORMATION_SESSION_TAG, SESSION_TAG)
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_URI, VALID_URI)
+            .put(
+                GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH,
+                AuthenticationType.BASICAUTH.getName())
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH_USERNAME, USERNAME)
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH_PASSWORD, PASSWORD)
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_REGION, REGION)
+            .build();
+
+    final String expectedParams =
+        " --class org.apache.spark.sql.FlintJob "
+            + getConfList(
+                "spark.jars.packages=package,org.apache.iceberg:iceberg-spark-runtime-3.3_2.12:1.5.0,software.amazon.awssdk:bundle:2.26.30",
+                "spark.emr-serverless.driverEnv.ASSUME_ROLE_CREDENTIALS_ROLE_ARN=arn:aws:iam::123456789012:role/ROLE_NAME",
+                "spark.executorEnv.ASSUME_ROLE_CREDENTIALS_ROLE_ARN=arn:aws:iam::123456789012:role/ROLE_NAME",
+                "spark.hive.metastore.glue.role.arn=arn:aws:iam::123456789012:role/ROLE_NAME",
+                "spark.sql.catalog.DATASOURCE_NAME=org.opensearch.sql.FlintDelegatingSessionCatalog",
+                "spark.flint.datasource.name=DATASOURCE_NAME",
+                "spark.sql.catalog.spark_catalog=org.apache.iceberg.spark.SparkSessionCatalog",
+                "spark.sql.catalog.spark_catalog.catalog-impl=org.apache.iceberg.aws.glue.GlueCatalog",
+                "spark.sql.extensions=org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions,org.opensearch.flint.spark.FlintSparkExtensions,org.opensearch.flint.spark.FlintPPLSparkExtensions",
+                "spark.sql.catalog.spark_catalog.client.region=REGION",
+                "spark.sql.catalog.spark_catalog.glue.account-id=123456789012",
+                "spark.sql.catalog.spark_catalog.client.assume-role.arn=arn:aws:iam::123456789012:role/ROLE_NAME",
+                "spark.sql.catalog.spark_catalog.client.assume-role.region=REGION",
+                "spark.sql.iceberg.handle-timestamp-without-timezone=true",
+                "spark.flint.optimizer.covering.enabled=false",
+                "spark.sql.catalog.spark_catalog.glue.lakeformation-enabled=true",
+                "spark.sql.catalog.spark_catalog.client.factory=org.apache.iceberg.aws.lakeformation.LakeFormationAwsClientFactory",
+                "spark.sql.catalog.spark_catalog.client.assume-role.tags.LakeFormationAuthorizedCaller=SESSION_TAG",
+                "spark.datasource.flint.host=test.host.com",
+                "spark.datasource.flint.port=9200",
+                "spark.datasource.flint.scheme=https",
+                "spark.datasource.flint.auth=basic",
+                "spark.datasource.flint.auth.username=USERNAME",
+                "spark.datasource.flint.auth.password=PASSWORD");
+
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata(properties);
+    SparkSubmitParameters sparkSubmitParameters = new SparkSubmitParameters();
+    sparkSubmitParameters.setConfigItem(SPARK_JAR_PACKAGES_KEY, "package");
+
+    new S3GlueDataSourceSparkParameterComposer(getSparkExecutionEngineConfigClusterSettingLoader())
+        .compose(
+            dataSourceMetadata,
+            sparkSubmitParameters,
+            dispatchQueryRequest,
+            new NullAsyncQueryRequestContext());
+
+    assertEquals(expectedParams, sparkSubmitParameters.toString());
+  }
+
+  @Test
+  public void testIcebergWithLakeFormationEnabledNoSessionTag() {
+    final Map<String, String> properties =
+        ImmutableMap.<String, String>builder()
+            .put(GlueDataSourceFactory.GLUE_ROLE_ARN, ROLE_ARN)
+            .put(GlueDataSourceFactory.GLUE_ICEBERG_ENABLED, TRUE)
+            .put(GlueDataSourceFactory.GLUE_LAKEFORMATION_ENABLED, TRUE)
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_URI, VALID_URI)
+            .put(
+                GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH,
+                AuthenticationType.BASICAUTH.getName())
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH_USERNAME, USERNAME)
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH_PASSWORD, PASSWORD)
+            .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_REGION, REGION)
+            .build();
+
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata(properties);
+    SparkSubmitParameters sparkSubmitParameters = new SparkSubmitParameters();
+
+    final S3GlueDataSourceSparkParameterComposer composer =
+        new S3GlueDataSourceSparkParameterComposer(
+            getSparkExecutionEngineConfigClusterSettingLoader());
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            composer.compose(
+                dataSourceMetadata,
+                sparkSubmitParameters,
+                dispatchQueryRequest,
+                new NullAsyncQueryRequestContext()));
+  }
+
+  @Test
+  public void testNoClusterConfigAvailable() {
+    DataSourceMetadata dataSourceMetadata =
+        getDataSourceMetadata(AuthenticationType.BASICAUTH, VALID_URI);
+    SparkSubmitParameters sparkSubmitParameters = new SparkSubmitParameters();
+
+    final OpenSearchSettings settings = Mockito.mock(OpenSearchSettings.class);
+    Mockito.when(settings.getSettingValue(Key.SPARK_EXECUTION_ENGINE_CONFIG)).thenReturn(null);
+
+    final S3GlueDataSourceSparkParameterComposer composer =
+        new S3GlueDataSourceSparkParameterComposer(
+            new SparkExecutionEngineConfigClusterSettingLoader(settings));
+
+    assertThrows(
+        RuntimeException.class,
+        () ->
+            composer.compose(
+                dataSourceMetadata,
+                sparkSubmitParameters,
+                dispatchQueryRequest,
+                new NullAsyncQueryRequestContext()));
+  }
+
+  private DataSourceMetadata getDataSourceMetadata(
+      AuthenticationType authenticationType, String uri) {
+    return new DataSourceMetadata.Builder()
+        .setConnector(DataSourceType.S3GLUE)
+        .setName("DATASOURCE_NAME")
+        .setDescription("DESCRIPTION")
+        .setResultIndex("RESULT_INDEX")
+        .setDataSourceStatus(DataSourceStatus.ACTIVE)
+        .setProperties(getProperties(authenticationType, uri))
+        .build();
+  }
+
+  private DataSourceMetadata getDataSourceMetadata(Map<String, String> properties) {
+    return new DataSourceMetadata.Builder()
+        .setConnector(DataSourceType.S3GLUE)
+        .setName("DATASOURCE_NAME")
+        .setDescription("DESCRIPTION")
+        .setResultIndex("RESULT_INDEX")
+        .setDataSourceStatus(DataSourceStatus.ACTIVE)
+        .setProperties(properties)
+        .build();
+  }
+
+  private Map<String, String> getProperties(AuthenticationType authType, String uri) {
+    return ImmutableMap.<String, String>builder()
+        .put(GlueDataSourceFactory.GLUE_ROLE_ARN, ROLE_ARN)
+        .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_URI, uri)
+        .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH, authType.getName())
+        .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH_USERNAME, USERNAME)
+        .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_AUTH_PASSWORD, PASSWORD)
+        .put(GlueDataSourceFactory.GLUE_INDEX_STORE_OPENSEARCH_REGION, REGION)
+        .build();
+  }
+
+  private SparkExecutionEngineConfigClusterSettingLoader
+      getSparkExecutionEngineConfigClusterSettingLoader() {
+    Gson gson = new Gson();
+    JsonObject jsonObject = new JsonObject();
+    jsonObject.addProperty("accountId", ACCOUNT_ID);
+    jsonObject.addProperty("applicationId", APP_ID);
+    jsonObject.addProperty("region", REGION);
+    jsonObject.addProperty("executionRoleARN", ROLE_ARN);
+    jsonObject.addProperty("sparkSubmitParameters", "");
+
+    // Convert JsonObject to JSON string
+    final String jsonString = gson.toJson(jsonObject);
+
+    final OpenSearchSettings settings = Mockito.mock(OpenSearchSettings.class);
+    Mockito.when(settings.getSettingValue(Key.SPARK_EXECUTION_ENGINE_CONFIG))
+        .thenReturn(jsonString);
+
+    return new SparkExecutionEngineConfigClusterSettingLoader(settings);
+  }
+
+  private static String getConfList(String... params) {
+    return Arrays.stream(params)
+        .map(param -> String.format(" --conf %s ", param))
+        .collect(Collectors.joining());
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReaderTest.java b/async-query/src/test/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReaderTest.java
new file mode 100644
index 0000000000..66230464e5
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReaderTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.response;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.datasource.model.DataSourceMetadata.DEFAULT_RESULT_INDEX;
+import static org.opensearch.sql.spark.constants.TestConstants.EMR_JOB_ID;
+
+import java.util.Map;
+import org.apache.lucene.search.TotalHits;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.client.Client;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.index.IndexNotFoundException;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+
+@ExtendWith(MockitoExtension.class)
+public class OpenSearchJobExecutionResponseReaderTest {
+  @Mock private Client client;
+  @Mock private SearchResponse searchResponse;
+  @Mock private SearchHit searchHit;
+  @Mock private ActionFuture<SearchResponse> searchResponseActionFuture;
+
+  @InjectMocks OpenSearchJobExecutionResponseReader jobExecutionResponseReader;
+
+  @Test
+  public void testGetResultFromOpensearchIndex() {
+    when(client.search(any())).thenReturn(searchResponseActionFuture);
+    when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    when(searchResponse.status()).thenReturn(RestStatus.OK);
+    when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit}, new TotalHits(1, TotalHits.Relation.EQUAL_TO), 1.0F));
+    Mockito.when(searchHit.getSourceAsMap()).thenReturn(Map.of("stepId", EMR_JOB_ID));
+
+    assertFalse(jobExecutionResponseReader.getResultWithJobId(EMR_JOB_ID, null).isEmpty());
+  }
+
+  @Test
+  public void testGetResultFromCustomIndex() {
+    when(client.search(any())).thenReturn(searchResponseActionFuture);
+    when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    when(searchResponse.status()).thenReturn(RestStatus.OK);
+    when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit}, new TotalHits(1, TotalHits.Relation.EQUAL_TO), 1.0F));
+    Mockito.when(searchHit.getSourceAsMap()).thenReturn(Map.of("stepId", EMR_JOB_ID));
+
+    assertFalse(jobExecutionResponseReader.getResultWithJobId(EMR_JOB_ID, "foo").isEmpty());
+  }
+
+  @Test
+  public void testInvalidSearchResponse() {
+    when(client.search(any())).thenReturn(searchResponseActionFuture);
+    when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    when(searchResponse.status()).thenReturn(RestStatus.NO_CONTENT);
+
+    RuntimeException exception =
+        assertThrows(
+            RuntimeException.class,
+            () -> jobExecutionResponseReader.getResultWithJobId(EMR_JOB_ID, null));
+
+    Assertions.assertEquals(
+        "Fetching result from "
+            + DEFAULT_RESULT_INDEX
+            + " index failed with status : "
+            + RestStatus.NO_CONTENT,
+        exception.getMessage());
+  }
+
+  @Test
+  public void testSearchFailure() {
+    when(client.search(any())).thenThrow(RuntimeException.class);
+
+    assertThrows(
+        RuntimeException.class,
+        () -> jobExecutionResponseReader.getResultWithJobId(EMR_JOB_ID, null));
+  }
+
+  @Test
+  public void testIndexNotFoundException() {
+    when(client.search(any())).thenThrow(IndexNotFoundException.class);
+
+    assertTrue(jobExecutionResponseReader.getResultWithJobId(EMR_JOB_ID, "foo").isEmpty());
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementActionTest.java b/async-query/src/test/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementActionTest.java
new file mode 100644
index 0000000000..ccee3eb642
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementActionTest.java
@@ -0,0 +1,83 @@
+package org.opensearch.sql.spark.rest;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.rest.RestChannel;
+import org.opensearch.rest.RestRequest;
+import org.opensearch.rest.RestResponse;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.threadpool.ThreadPool;
+
+public class RestAsyncQueryManagementActionTest {
+
+  private OpenSearchSettings settings;
+  private RestRequest request;
+  private RestChannel channel;
+  private NodeClient nodeClient;
+  private ThreadPool threadPool;
+  private RestAsyncQueryManagementAction unit;
+
+  @BeforeEach
+  public void setup() {
+    settings = Mockito.mock(OpenSearchSettings.class);
+    request = Mockito.mock(RestRequest.class);
+    channel = Mockito.mock(RestChannel.class);
+    nodeClient = Mockito.mock(NodeClient.class);
+    threadPool = Mockito.mock(ThreadPool.class);
+
+    Mockito.when(nodeClient.threadPool()).thenReturn(threadPool);
+
+    unit = new RestAsyncQueryManagementAction(settings);
+  }
+
+  @Test
+  @SneakyThrows
+  public void testWhenDataSourcesAreDisabled() {
+    setDataSourcesEnabled(false);
+    unit.handleRequest(request, channel, nodeClient);
+    Mockito.verifyNoInteractions(nodeClient);
+    ArgumentCaptor<RestResponse> response = ArgumentCaptor.forClass(RestResponse.class);
+    Mockito.verify(channel, Mockito.times(1)).sendResponse(response.capture());
+    Assertions.assertEquals(400, response.getValue().status().getStatus());
+    JsonObject actualResponseJson =
+        new Gson().fromJson(response.getValue().content().utf8ToString(), JsonObject.class);
+    JsonObject expectedResponseJson = new JsonObject();
+    expectedResponseJson.addProperty("status", 400);
+    expectedResponseJson.add("error", new JsonObject());
+    expectedResponseJson.getAsJsonObject("error").addProperty("type", "IllegalAccessException");
+    expectedResponseJson.getAsJsonObject("error").addProperty("reason", "Invalid Request");
+    expectedResponseJson
+        .getAsJsonObject("error")
+        .addProperty("details", "plugins.query.datasources.enabled setting is false");
+    Assertions.assertEquals(expectedResponseJson, actualResponseJson);
+  }
+
+  @Test
+  @SneakyThrows
+  public void testWhenDataSourcesAreEnabled() {
+    setDataSourcesEnabled(true);
+    Mockito.when(request.method()).thenReturn(RestRequest.Method.GET);
+    unit.handleRequest(request, channel, nodeClient);
+    Mockito.verify(threadPool, Mockito.times(1))
+        .schedule(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any());
+    Mockito.verifyNoInteractions(channel);
+  }
+
+  @Test
+  public void testGetName() {
+    Assertions.assertEquals("async_query_actions", unit.getName());
+  }
+
+  private void setDataSourcesEnabled(boolean value) {
+    Mockito.when(settings.getSettingValue(Settings.Key.DATASOURCES_ENABLED)).thenReturn(value);
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQuerySchedulerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQuerySchedulerTest.java
new file mode 100644
index 0000000000..d6e672f7a2
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQuerySchedulerTest.java
@@ -0,0 +1,458 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.scheduler;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+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.opensearch.sql.spark.scheduler.OpenSearchAsyncQueryScheduler.SCHEDULER_INDEX_NAME;
+
+import java.time.Instant;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.opensearch.action.DocWriteResponse;
+import org.opensearch.action.admin.indices.create.CreateIndexRequest;
+import org.opensearch.action.admin.indices.create.CreateIndexResponse;
+import org.opensearch.action.delete.DeleteRequest;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.index.IndexRequest;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.support.WriteRequest;
+import org.opensearch.action.update.UpdateRequest;
+import org.opensearch.action.update.UpdateResponse;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.index.engine.DocumentMissingException;
+import org.opensearch.index.engine.VersionConflictEngineException;
+import org.opensearch.jobscheduler.spi.ScheduledJobRunner;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
+import org.opensearch.sql.spark.scheduler.model.AsyncQuerySchedulerRequest;
+import org.opensearch.sql.spark.scheduler.model.ScheduledAsyncQueryJobRequest;
+
+public class OpenSearchAsyncQuerySchedulerTest {
+
+  private static final String TEST_SCHEDULER_INDEX_NAME = "testQS";
+
+  private static final String TEST_JOB_ID = "testJob";
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private Client client;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private ClusterService clusterService;
+
+  @Mock private AsyncQueryRequestContext context;
+
+  @Mock private ActionFuture<IndexResponse> indexResponseActionFuture;
+
+  @Mock private ActionFuture<UpdateResponse> updateResponseActionFuture;
+
+  @Mock private ActionFuture<DeleteResponse> deleteResponseActionFuture;
+
+  @Mock private ActionFuture<CreateIndexResponse> createIndexResponseActionFuture;
+
+  @Mock private IndexResponse indexResponse;
+
+  @Mock private UpdateResponse updateResponse;
+
+  private OpenSearchAsyncQueryScheduler scheduler;
+
+  @BeforeEach
+  public void setup() {
+    MockitoAnnotations.openMocks(this);
+    scheduler = new OpenSearchAsyncQueryScheduler(client, clusterService);
+  }
+
+  @Test
+  public void testScheduleJob() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME))
+        .thenReturn(Boolean.FALSE);
+    when(client.admin().indices().create(any(CreateIndexRequest.class)))
+        .thenReturn(createIndexResponseActionFuture);
+    when(createIndexResponseActionFuture.actionGet())
+        .thenReturn(new CreateIndexResponse(true, true, TEST_SCHEDULER_INDEX_NAME));
+    when(client.index(any(IndexRequest.class))).thenReturn(indexResponseActionFuture);
+
+    // Test the if case
+    when(indexResponseActionFuture.actionGet()).thenReturn(indexResponse);
+    when(indexResponse.getResult()).thenReturn(DocWriteResponse.Result.CREATED);
+
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .jobId(TEST_JOB_ID)
+            .lastUpdateTime(Instant.now())
+            .build();
+
+    scheduler.scheduleJob(request, context);
+
+    // Verify index created
+    verify(client.admin().indices(), times(1)).create(ArgumentMatchers.any());
+
+    // Verify doc indexed
+    ArgumentCaptor<IndexRequest> captor = ArgumentCaptor.forClass(IndexRequest.class);
+    verify(client, times(1)).index(captor.capture());
+    IndexRequest capturedRequest = captor.getValue();
+    assertEquals(request.getName(), capturedRequest.id());
+    assertEquals(WriteRequest.RefreshPolicy.IMMEDIATE, capturedRequest.getRefreshPolicy());
+  }
+
+  @Test
+  public void testScheduleJobWithExistingJob() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME))
+        .thenReturn(Boolean.TRUE);
+
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .jobId(TEST_JOB_ID)
+            .lastUpdateTime(Instant.now())
+            .build();
+
+    when(client.index(any(IndexRequest.class))).thenThrow(VersionConflictEngineException.class);
+
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              scheduler.scheduleJob(request, context);
+            });
+
+    verify(client, times(1)).index(ArgumentCaptor.forClass(IndexRequest.class).capture());
+    assertEquals("A job already exists with name: testJob", exception.getMessage());
+  }
+
+  @Test
+  public void testScheduleJobWithExceptions() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME))
+        .thenReturn(Boolean.FALSE);
+    when(client.admin().indices().create(any(CreateIndexRequest.class)))
+        .thenReturn(createIndexResponseActionFuture);
+    when(createIndexResponseActionFuture.actionGet())
+        .thenReturn(new CreateIndexResponse(true, true, TEST_SCHEDULER_INDEX_NAME));
+    when(client.index(any(IndexRequest.class))).thenThrow(new RuntimeException("Test exception"));
+
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .jobId(TEST_JOB_ID)
+            .lastUpdateTime(Instant.now())
+            .build();
+
+    assertThrows(RuntimeException.class, () -> scheduler.scheduleJob(request, context));
+
+    when(client.index(any(IndexRequest.class))).thenReturn(indexResponseActionFuture);
+    when(indexResponseActionFuture.actionGet()).thenReturn(indexResponse);
+    when(indexResponse.getResult()).thenReturn(DocWriteResponse.Result.NOT_FOUND);
+
+    RuntimeException exception =
+        assertThrows(RuntimeException.class, () -> scheduler.scheduleJob(request, context));
+    assertEquals("Schedule job failed with result : not_found", exception.getMessage());
+  }
+
+  @Test
+  public void testUnscheduleJob() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(true);
+
+    when(updateResponseActionFuture.actionGet()).thenReturn(updateResponse);
+    when(updateResponse.getResult()).thenReturn(DocWriteResponse.Result.UPDATED);
+
+    when(client.update(any(UpdateRequest.class))).thenReturn(updateResponseActionFuture);
+
+    scheduler.unscheduleJob(TEST_JOB_ID, context);
+
+    ArgumentCaptor<UpdateRequest> captor = ArgumentCaptor.forClass(UpdateRequest.class);
+    verify(client).update(captor.capture());
+
+    UpdateRequest capturedRequest = captor.getValue();
+    assertEquals(TEST_JOB_ID, capturedRequest.id());
+    assertEquals(WriteRequest.RefreshPolicy.IMMEDIATE, capturedRequest.getRefreshPolicy());
+
+    // Reset the captor for the next verification
+    captor = ArgumentCaptor.forClass(UpdateRequest.class);
+
+    when(updateResponse.getResult()).thenReturn(DocWriteResponse.Result.NOOP);
+    scheduler.unscheduleJob(TEST_JOB_ID, context);
+
+    verify(client, times(2)).update(captor.capture());
+    capturedRequest = captor.getValue();
+    assertEquals(TEST_JOB_ID, capturedRequest.id());
+    assertEquals(WriteRequest.RefreshPolicy.IMMEDIATE, capturedRequest.getRefreshPolicy());
+  }
+
+  @Test
+  public void testUnscheduleJobInvalidJobId() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(true);
+
+    IllegalArgumentException exception =
+        assertThrows(IllegalArgumentException.class, () -> scheduler.unscheduleJob("", context));
+    assertEquals("JobId cannot be null or empty", exception.getMessage());
+  }
+
+  @Test
+  public void testUnscheduleJobWithIndexNotFound() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(false);
+
+    scheduler.unscheduleJob(TEST_JOB_ID, context);
+
+    // Verify that no update operation was performed
+    verify(client, never()).update(any(UpdateRequest.class));
+  }
+
+  @Test
+  public void testUpdateJob() {
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .jobId(TEST_JOB_ID)
+            .lastUpdateTime(Instant.now())
+            .build();
+
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(true);
+
+    when(updateResponseActionFuture.actionGet()).thenReturn(updateResponse);
+    when(updateResponse.getResult()).thenReturn(DocWriteResponse.Result.UPDATED);
+
+    when(client.update(any(UpdateRequest.class))).thenReturn(updateResponseActionFuture);
+
+    scheduler.updateJob(request, context);
+
+    ArgumentCaptor<UpdateRequest> captor = ArgumentCaptor.forClass(UpdateRequest.class);
+    verify(client).update(captor.capture());
+
+    UpdateRequest capturedRequest = captor.getValue();
+    assertEquals(request.getName(), capturedRequest.id());
+    assertEquals(WriteRequest.RefreshPolicy.IMMEDIATE, capturedRequest.getRefreshPolicy());
+  }
+
+  @Test
+  public void testUpdateJobWithIndexNotFound() {
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .jobId(TEST_JOB_ID)
+            .lastUpdateTime(Instant.now())
+            .build();
+
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(false);
+
+    assertThrows(IllegalStateException.class, () -> scheduler.updateJob(request, context));
+  }
+
+  @Test
+  public void testUpdateJobWithExceptions() {
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .jobId(TEST_JOB_ID)
+            .lastUpdateTime(Instant.now())
+            .build();
+
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(true);
+    when(client.update(any(UpdateRequest.class)))
+        .thenThrow(new DocumentMissingException(null, null));
+
+    IllegalArgumentException exception1 =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              scheduler.updateJob(request, context);
+            });
+
+    assertEquals("Job: testJob doesn't exist", exception1.getMessage());
+
+    when(client.update(any(UpdateRequest.class))).thenThrow(new RuntimeException("Test exception"));
+
+    RuntimeException exception2 =
+        assertThrows(
+            RuntimeException.class,
+            () -> {
+              scheduler.updateJob(request, context);
+            });
+
+    assertEquals("java.lang.RuntimeException: Test exception", exception2.getMessage());
+
+    when(client.update(any(UpdateRequest.class))).thenReturn(updateResponseActionFuture);
+    when(updateResponseActionFuture.actionGet()).thenReturn(updateResponse);
+    when(updateResponse.getResult()).thenReturn(DocWriteResponse.Result.NOT_FOUND);
+
+    RuntimeException exception =
+        assertThrows(RuntimeException.class, () -> scheduler.updateJob(request, context));
+    assertEquals("Update job failed with result : not_found", exception.getMessage());
+  }
+
+  @Test
+  public void testRemoveJob() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(true);
+
+    DeleteResponse deleteResponse = mock(DeleteResponse.class);
+    when(deleteResponseActionFuture.actionGet()).thenReturn(deleteResponse);
+    when(deleteResponse.getResult()).thenReturn(DocWriteResponse.Result.DELETED);
+
+    when(client.delete(any(DeleteRequest.class))).thenReturn(deleteResponseActionFuture);
+
+    scheduler.removeJob(TEST_JOB_ID, context);
+
+    ArgumentCaptor<DeleteRequest> captor = ArgumentCaptor.forClass(DeleteRequest.class);
+    verify(client).delete(captor.capture());
+
+    DeleteRequest capturedRequest = captor.getValue();
+    assertEquals(TEST_JOB_ID, capturedRequest.id());
+    assertEquals(WriteRequest.RefreshPolicy.IMMEDIATE, capturedRequest.getRefreshPolicy());
+  }
+
+  @Test
+  public void testRemoveJobWithIndexNotFound() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(false);
+
+    AsyncQuerySchedulerRequest request =
+        AsyncQuerySchedulerRequest.builder().jobId(TEST_JOB_ID).build();
+    assertThrows(IllegalStateException.class, () -> scheduler.removeJob(TEST_JOB_ID, context));
+  }
+
+  @Test
+  public void testRemoveJobInvalidJobId() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(true);
+
+    IllegalArgumentException exception =
+        assertThrows(IllegalArgumentException.class, () -> scheduler.removeJob("", context));
+    assertEquals("JobId cannot be null or empty", exception.getMessage());
+  }
+
+  @Test
+  public void testCreateAsyncQuerySchedulerIndex() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(false);
+
+    CreateIndexResponse createIndexResponse = mock(CreateIndexResponse.class);
+    when(createIndexResponseActionFuture.actionGet()).thenReturn(createIndexResponse);
+    when(createIndexResponse.isAcknowledged()).thenReturn(true);
+
+    when(client.admin().indices().create(any(CreateIndexRequest.class)))
+        .thenReturn(createIndexResponseActionFuture);
+
+    scheduler.createAsyncQuerySchedulerIndex();
+
+    ArgumentCaptor<CreateIndexRequest> captor = ArgumentCaptor.forClass(CreateIndexRequest.class);
+    verify(client.admin().indices()).create(captor.capture());
+
+    CreateIndexRequest capturedRequest = captor.getValue();
+    assertEquals(SCHEDULER_INDEX_NAME, capturedRequest.index());
+  }
+
+  @Test
+  public void testCreateAsyncQuerySchedulerIndexFailure() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(false);
+
+    when(client.admin().indices().create(any(CreateIndexRequest.class)))
+        .thenThrow(new RuntimeException("Error creating index"));
+
+    RuntimeException exception =
+        assertThrows(
+            RuntimeException.class,
+            () -> {
+              scheduler.createAsyncQuerySchedulerIndex();
+            });
+
+    assertEquals(
+        "Internal server error while creating .async-query-scheduler index: Error creating index",
+        exception.getMessage());
+
+    when(client.admin().indices().create(any(CreateIndexRequest.class)))
+        .thenReturn(createIndexResponseActionFuture);
+    Mockito.when(createIndexResponseActionFuture.actionGet())
+        .thenReturn(new CreateIndexResponse(false, false, SCHEDULER_INDEX_NAME));
+
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .jobId(TEST_JOB_ID)
+            .lastUpdateTime(Instant.now())
+            .build();
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class, () -> scheduler.scheduleJob(request, context));
+    Assertions.assertEquals(
+        "Internal server error while creating .async-query-scheduler index: Index creation is not"
+            + " acknowledged.",
+        runtimeException.getMessage());
+  }
+
+  @Test
+  public void testUpdateJobNotFound() {
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .jobId(TEST_JOB_ID)
+            .lastUpdateTime(Instant.now())
+            .build();
+
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(true);
+
+    when(client.update(any(UpdateRequest.class)))
+        .thenThrow(new DocumentMissingException(null, null));
+
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              scheduler.updateJob(request, context);
+            });
+
+    assertEquals("Job: testJob doesn't exist", exception.getMessage());
+  }
+
+  @Test
+  public void testRemoveJobNotFound() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(true);
+
+    DeleteResponse deleteResponse = mock(DeleteResponse.class);
+    when(deleteResponseActionFuture.actionGet()).thenReturn(deleteResponse);
+    when(deleteResponse.getResult()).thenReturn(DocWriteResponse.Result.NOT_FOUND);
+
+    when(client.delete(any(DeleteRequest.class))).thenReturn(deleteResponseActionFuture);
+
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              scheduler.removeJob(TEST_JOB_ID, context);
+            });
+
+    assertEquals("Job : testJob doesn't exist", exception.getMessage());
+  }
+
+  @Test
+  public void testRemoveJobWithExceptions() {
+    when(clusterService.state().routingTable().hasIndex(SCHEDULER_INDEX_NAME)).thenReturn(true);
+
+    when(client.delete(any(DeleteRequest.class))).thenThrow(new RuntimeException("Test exception"));
+
+    assertThrows(RuntimeException.class, () -> scheduler.removeJob(TEST_JOB_ID, context));
+
+    DeleteResponse deleteResponse = mock(DeleteResponse.class);
+    when(client.delete(any(DeleteRequest.class))).thenReturn(deleteResponseActionFuture);
+    when(deleteResponseActionFuture.actionGet()).thenReturn(deleteResponse);
+    when(deleteResponse.getResult()).thenReturn(DocWriteResponse.Result.NOOP);
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class, () -> scheduler.removeJob(TEST_JOB_ID, context));
+    Assertions.assertEquals("Remove job failed with result : noop", runtimeException.getMessage());
+  }
+
+  @Test
+  public void testGetJobRunner() {
+    ScheduledJobRunner jobRunner = OpenSearchAsyncQueryScheduler.getJobRunner();
+    assertNotNull(jobRunner);
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunnerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunnerTest.java
new file mode 100644
index 0000000000..fdfb138ddb
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunnerTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.scheduler.job;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.time.Instant;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.LogEvent;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.jobscheduler.spi.JobExecutionContext;
+import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
+import org.opensearch.sql.legacy.executor.AsyncRestExecutor;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorService;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.spark.scheduler.model.ScheduledAsyncQueryJobRequest;
+import org.opensearch.threadpool.ThreadPool;
+
+public class ScheduledAsyncQueryJobRunnerTest {
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private ClusterService clusterService;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private ThreadPool threadPool;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private Client client;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private AsyncQueryExecutorService asyncQueryExecutorService;
+
+  @Mock private JobExecutionContext context;
+
+  private ScheduledAsyncQueryJobRunner jobRunner;
+
+  private ScheduledAsyncQueryJobRunner spyJobRunner;
+
+  @BeforeEach
+  public void setup() {
+    MockitoAnnotations.openMocks(this);
+    jobRunner = ScheduledAsyncQueryJobRunner.getJobRunnerInstance();
+    jobRunner.loadJobResource(null, null, null, null);
+  }
+
+  @Test
+  public void testRunJobWithCorrectParameter() {
+    spyJobRunner = spy(jobRunner);
+    spyJobRunner.loadJobResource(client, clusterService, threadPool, asyncQueryExecutorService);
+
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .jobId("testJob")
+            .lastUpdateTime(Instant.now())
+            .lockDurationSeconds(10L)
+            .scheduledQuery("REFRESH INDEX testIndex")
+            .dataSource("testDataSource")
+            .queryLang(LangType.SQL)
+            .build();
+
+    CreateAsyncQueryRequest createAsyncQueryRequest =
+        new CreateAsyncQueryRequest(
+            request.getScheduledQuery(), request.getDataSource(), request.getQueryLang());
+    spyJobRunner.runJob(request, context);
+
+    ArgumentCaptor<Runnable> captor = ArgumentCaptor.forClass(Runnable.class);
+    verify(threadPool.executor(AsyncRestExecutor.SQL_WORKER_THREAD_POOL_NAME))
+        .submit(captor.capture());
+
+    Runnable runnable = captor.getValue();
+    runnable.run();
+
+    verify(spyJobRunner).doRefresh(eq(request));
+    verify(asyncQueryExecutorService)
+        .createAsyncQuery(eq(createAsyncQueryRequest), any(NullAsyncQueryRequestContext.class));
+  }
+
+  @Test
+  public void testRunJobWithIncorrectParameter() {
+    jobRunner = ScheduledAsyncQueryJobRunner.getJobRunnerInstance();
+    jobRunner.loadJobResource(client, clusterService, threadPool, asyncQueryExecutorService);
+
+    ScheduledJobParameter wrongParameter = mock(ScheduledJobParameter.class);
+
+    IllegalStateException exception =
+        assertThrows(
+            IllegalStateException.class,
+            () -> jobRunner.runJob(wrongParameter, context),
+            "Expected IllegalStateException but no exception was thrown");
+
+    assertEquals(
+        "Job parameter is not instance of ScheduledAsyncQueryJobRequest, type: "
+            + wrongParameter.getClass().getCanonicalName(),
+        exception.getMessage());
+  }
+
+  @Test
+  public void testDoRefreshThrowsException() {
+    spyJobRunner = spy(jobRunner);
+    spyJobRunner.loadJobResource(client, clusterService, threadPool, asyncQueryExecutorService);
+
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .jobId("testJob")
+            .lastUpdateTime(Instant.now())
+            .lockDurationSeconds(10L)
+            .scheduledQuery("REFRESH INDEX testIndex")
+            .dataSource("testDataSource")
+            .queryLang(LangType.SQL)
+            .build();
+
+    doThrow(new RuntimeException("Test exception")).when(spyJobRunner).doRefresh(request);
+
+    Logger logger = LogManager.getLogger(ScheduledAsyncQueryJobRunner.class);
+    Appender mockAppender = mock(Appender.class);
+    when(mockAppender.getName()).thenReturn("MockAppender");
+    when(mockAppender.isStarted()).thenReturn(true);
+    when(mockAppender.isStopped()).thenReturn(false);
+    ((org.apache.logging.log4j.core.Logger) logger)
+        .addAppender((org.apache.logging.log4j.core.Appender) mockAppender);
+
+    spyJobRunner.runJob(request, context);
+
+    ArgumentCaptor<Runnable> captor = ArgumentCaptor.forClass(Runnable.class);
+    verify(threadPool.executor(AsyncRestExecutor.SQL_WORKER_THREAD_POOL_NAME))
+        .submit(captor.capture());
+
+    Runnable runnable = captor.getValue();
+    runnable.run();
+
+    verify(spyJobRunner).doRefresh(eq(request));
+    verify(mockAppender).append(any(LogEvent.class));
+  }
+
+  @Test
+  public void testRunJobWithUninitializedServices() {
+    ScheduledAsyncQueryJobRequest jobParameter =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .jobId("testJob")
+            .lastUpdateTime(Instant.now())
+            .build();
+
+    IllegalStateException exception =
+        assertThrows(
+            IllegalStateException.class,
+            () -> jobRunner.runJob(jobParameter, context),
+            "Expected IllegalStateException but no exception was thrown");
+    assertEquals("ClusterService is not initialized.", exception.getMessage());
+
+    jobRunner.loadJobResource(null, clusterService, null, null);
+
+    exception =
+        assertThrows(
+            IllegalStateException.class,
+            () -> jobRunner.runJob(jobParameter, context),
+            "Expected IllegalStateException but no exception was thrown");
+    assertEquals("ThreadPool is not initialized.", exception.getMessage());
+
+    jobRunner.loadJobResource(null, clusterService, threadPool, null);
+
+    exception =
+        assertThrows(
+            IllegalStateException.class,
+            () -> jobRunner.runJob(jobParameter, context),
+            "Expected IllegalStateException but no exception was thrown");
+    assertEquals("Client is not initialized.", exception.getMessage());
+
+    jobRunner.loadJobResource(client, clusterService, threadPool, null);
+
+    exception =
+        assertThrows(
+            IllegalStateException.class,
+            () -> jobRunner.runJob(jobParameter, context),
+            "Expected IllegalStateException but no exception was thrown");
+    assertEquals("AsyncQueryExecutorService is not initialized.", exception.getMessage());
+  }
+
+  @Test
+  public void testGetJobRunnerInstanceMultipleCalls() {
+    ScheduledAsyncQueryJobRunner instance1 = ScheduledAsyncQueryJobRunner.getJobRunnerInstance();
+    ScheduledAsyncQueryJobRunner instance2 = ScheduledAsyncQueryJobRunner.getJobRunnerInstance();
+    ScheduledAsyncQueryJobRunner instance3 = ScheduledAsyncQueryJobRunner.getJobRunnerInstance();
+
+    assertSame(instance1, instance2);
+    assertSame(instance2, instance3);
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/scheduler/model/ScheduledAsyncQueryJobRequestTest.java b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/model/ScheduledAsyncQueryJobRequestTest.java
new file mode 100644
index 0000000000..edf8379195
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/model/ScheduledAsyncQueryJobRequestTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.scheduler.model;
+
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.opensearch.core.xcontent.ToXContent.EMPTY_PARAMS;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import org.junit.jupiter.api.Test;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+public class ScheduledAsyncQueryJobRequestTest {
+
+  @Test
+  public void testBuilderAndGetterMethods() {
+    Instant now = Instant.now();
+    IntervalSchedule schedule = new IntervalSchedule(now, 1, ChronoUnit.MINUTES);
+
+    ScheduledAsyncQueryJobRequest jobRequest =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .accountId("testAccount")
+            .jobId("testJob")
+            .dataSource("testDataSource")
+            .scheduledQuery("SELECT * FROM test")
+            .queryLang(LangType.SQL)
+            .schedule(schedule)
+            .enabled(true)
+            .lastUpdateTime(now)
+            .enabledTime(now)
+            .lockDurationSeconds(60L)
+            .jitter(0.1)
+            .build();
+
+    assertEquals("testAccount", jobRequest.getAccountId());
+    assertEquals("testJob", jobRequest.getJobId());
+    assertEquals("testJob", jobRequest.getName());
+    assertEquals("testDataSource", jobRequest.getDataSource());
+    assertEquals("SELECT * FROM test", jobRequest.getScheduledQuery());
+    assertEquals(LangType.SQL, jobRequest.getQueryLang());
+    assertEquals(schedule, jobRequest.getSchedule());
+    assertTrue(jobRequest.isEnabled());
+    assertEquals(now, jobRequest.getLastUpdateTime());
+    assertEquals(now, jobRequest.getEnabledTime());
+    assertEquals(60L, jobRequest.getLockDurationSeconds());
+    assertEquals(0.1, jobRequest.getJitter());
+  }
+
+  @Test
+  public void testToXContent() throws IOException {
+    Instant now = Instant.now();
+    IntervalSchedule schedule = new IntervalSchedule(now, 1, ChronoUnit.MINUTES);
+
+    ScheduledAsyncQueryJobRequest request =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .accountId("testAccount")
+            .jobId("testJob")
+            .dataSource("testDataSource")
+            .scheduledQuery("SELECT * FROM test")
+            .queryLang(LangType.SQL)
+            .schedule(schedule)
+            .enabled(true)
+            .enabledTime(now)
+            .lastUpdateTime(now)
+            .lockDurationSeconds(60L)
+            .jitter(0.1)
+            .build();
+
+    XContentBuilder builder = XContentFactory.jsonBuilder().prettyPrint();
+    request.toXContent(builder, EMPTY_PARAMS);
+    String jsonString = builder.toString();
+
+    assertTrue(jsonString.contains("\"accountId\" : \"testAccount\""));
+    assertTrue(jsonString.contains("\"jobId\" : \"testJob\""));
+    assertTrue(jsonString.contains("\"dataSource\" : \"testDataSource\""));
+    assertTrue(jsonString.contains("\"scheduledQuery\" : \"SELECT * FROM test\""));
+    assertTrue(jsonString.contains("\"queryLang\" : \"SQL\""));
+    assertTrue(jsonString.contains("\"start_time\" : " + now.toEpochMilli()));
+    assertTrue(jsonString.contains("\"period\" : 1"));
+    assertTrue(jsonString.contains("\"unit\" : \"Minutes\""));
+    assertTrue(jsonString.contains("\"enabled\" : true"));
+    assertTrue(jsonString.contains("\"lastUpdateTime\" : " + now.toEpochMilli()));
+    assertTrue(jsonString.contains("\"enabledTime\" : " + now.toEpochMilli()));
+    assertTrue(jsonString.contains("\"lockDurationSeconds\" : 60"));
+    assertTrue(jsonString.contains("\"jitter\" : 0.1"));
+  }
+
+  @Test
+  public void testFromAsyncQuerySchedulerRequest() {
+    Instant now = Instant.now();
+    AsyncQuerySchedulerRequest request = new AsyncQuerySchedulerRequest();
+    request.setJobId("testJob");
+    request.setAccountId("testAccount");
+    request.setDataSource("testDataSource");
+    request.setScheduledQuery("SELECT * FROM test");
+    request.setQueryLang(LangType.SQL);
+    request.setSchedule("1 minutes");
+    request.setEnabled(true);
+    request.setLastUpdateTime(now);
+    request.setLockDurationSeconds(60L);
+    request.setJitter(0.1);
+
+    ScheduledAsyncQueryJobRequest jobRequest =
+        ScheduledAsyncQueryJobRequest.fromAsyncQuerySchedulerRequest(request);
+
+    assertEquals("testJob", jobRequest.getJobId());
+    assertEquals("testAccount", jobRequest.getAccountId());
+    assertEquals("testDataSource", jobRequest.getDataSource());
+    assertEquals("SELECT * FROM test", jobRequest.getScheduledQuery());
+    assertEquals(LangType.SQL, jobRequest.getQueryLang());
+    assertEquals(new IntervalSchedule(now, 1, ChronoUnit.MINUTES), jobRequest.getSchedule());
+    assertTrue(jobRequest.isEnabled());
+    assertEquals(60L, jobRequest.getLockDurationSeconds());
+    assertEquals(0.1, jobRequest.getJitter());
+  }
+
+  @Test
+  public void testFromAsyncQuerySchedulerRequestWithInvalidSchedule() {
+    AsyncQuerySchedulerRequest request = new AsyncQuerySchedulerRequest();
+    request.setJobId("testJob");
+    request.setSchedule(new Object()); // Set schedule to a non-String object
+
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              ScheduledAsyncQueryJobRequest.fromAsyncQuerySchedulerRequest(request);
+            });
+
+    assertEquals("Schedule must be a String object for parsing.", exception.getMessage());
+  }
+
+  @Test
+  public void testEqualsAndHashCode() {
+    Instant now = Instant.now();
+    IntervalSchedule schedule = new IntervalSchedule(now, 1, ChronoUnit.MINUTES);
+
+    ScheduledAsyncQueryJobRequest request1 =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .accountId("testAccount")
+            .jobId("testJob")
+            .dataSource("testDataSource")
+            .scheduledQuery("SELECT * FROM test")
+            .queryLang(LangType.SQL)
+            .schedule(schedule)
+            .enabled(true)
+            .enabledTime(now)
+            .lastUpdateTime(now)
+            .lockDurationSeconds(60L)
+            .jitter(0.1)
+            .build();
+
+    // Test toString
+    String toString = request1.toString();
+    assertTrue(toString.contains("accountId=testAccount"));
+    assertTrue(toString.contains("jobId=testJob"));
+    assertTrue(toString.contains("dataSource=testDataSource"));
+    assertTrue(toString.contains("scheduledQuery=SELECT * FROM test"));
+    assertTrue(toString.contains("queryLang=SQL"));
+    assertTrue(toString.contains("enabled=true"));
+    assertTrue(toString.contains("lockDurationSeconds=60"));
+    assertTrue(toString.contains("jitter=0.1"));
+
+    ScheduledAsyncQueryJobRequest request2 =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .accountId("testAccount")
+            .jobId("testJob")
+            .dataSource("testDataSource")
+            .scheduledQuery("SELECT * FROM test")
+            .queryLang(LangType.SQL)
+            .schedule(schedule)
+            .enabled(true)
+            .enabledTime(now)
+            .lastUpdateTime(now)
+            .lockDurationSeconds(60L)
+            .jitter(0.1)
+            .build();
+
+    assertEquals(request1, request2);
+    assertEquals(request1.hashCode(), request2.hashCode());
+
+    ScheduledAsyncQueryJobRequest request3 =
+        ScheduledAsyncQueryJobRequest.scheduledAsyncQueryJobRequestBuilder()
+            .accountId("differentAccount")
+            .jobId("testJob")
+            .dataSource("testDataSource")
+            .scheduledQuery("SELECT * FROM test")
+            .queryLang(LangType.SQL)
+            .schedule(schedule)
+            .enabled(true)
+            .enabledTime(now)
+            .lastUpdateTime(now)
+            .lockDurationSeconds(60L)
+            .jitter(0.1)
+            .build();
+
+    assertNotEquals(request1, request3);
+    assertNotEquals(request1.hashCode(), request3.hashCode());
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/scheduler/parser/IntervalScheduleParserTest.java b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/parser/IntervalScheduleParserTest.java
new file mode 100644
index 0000000000..f211548c7c
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/parser/IntervalScheduleParserTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.scheduler.parser;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule;
+import org.opensearch.jobscheduler.spi.schedule.Schedule;
+
+public class IntervalScheduleParserTest {
+
+  private Instant startTime;
+
+  @BeforeEach
+  public void setup() {
+    startTime = Instant.now();
+  }
+
+  @Test
+  public void testConstructor() {
+    // Test that the constructor of IntervalScheduleParser can be invoked
+    IntervalScheduleParser parser = new IntervalScheduleParser();
+    assertNotNull(parser);
+  }
+
+  @Test
+  public void testParseValidScheduleString() {
+    verifyParseSchedule(5, "5 minutes");
+  }
+
+  @Test
+  public void testParseValidScheduleStringWithDifferentUnits() {
+    verifyParseSchedule(120, "2 hours");
+    verifyParseSchedule(1440, "1 day");
+    verifyParseSchedule(30240, "3 weeks");
+  }
+
+  @Test
+  public void testParseNullSchedule() {
+    Schedule schedule = IntervalScheduleParser.parse(null, startTime);
+    assertNull(schedule);
+  }
+
+  @Test
+  public void testParseScheduleObject() {
+    IntervalSchedule expectedSchedule = new IntervalSchedule(startTime, 10, ChronoUnit.MINUTES);
+    Schedule schedule = IntervalScheduleParser.parse(expectedSchedule, startTime);
+    assertEquals(expectedSchedule, schedule);
+  }
+
+  @Test
+  public void testParseInvalidScheduleString() {
+    String scheduleStr = "invalid schedule";
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> IntervalScheduleParser.parse(scheduleStr, startTime),
+            "Expected IllegalArgumentException but no exception was thrown");
+
+    assertEquals("Invalid interval format: " + scheduleStr.toLowerCase(), exception.getMessage());
+  }
+
+  @Test
+  public void testParseUnsupportedUnits() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> IntervalScheduleParser.parse("1 year", startTime),
+        "Expected IllegalArgumentException but no exception was thrown");
+
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> IntervalScheduleParser.parse("1 month", startTime),
+        "Expected IllegalArgumentException but no exception was thrown");
+  }
+
+  @Test
+  public void testParseNonStringSchedule() {
+    Object nonStringSchedule = 12345;
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> IntervalScheduleParser.parse(nonStringSchedule, startTime),
+            "Expected IllegalArgumentException but no exception was thrown");
+
+    assertEquals("Schedule must be a String object for parsing.", exception.getMessage());
+  }
+
+  @Test
+  public void testParseScheduleWithNanoseconds() {
+    verifyParseSchedule(1, "60000000000 nanoseconds");
+  }
+
+  @Test
+  public void testParseScheduleWithMilliseconds() {
+    verifyParseSchedule(1, "60000 milliseconds");
+  }
+
+  @Test
+  public void testParseScheduleWithMicroseconds() {
+    verifyParseSchedule(1, "60000000 microseconds");
+  }
+
+  @Test
+  public void testUnsupportedTimeUnit() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> IntervalScheduleParser.convertToSupportedUnit(10, "unsupportedunit"),
+        "Expected IllegalArgumentException but no exception was thrown");
+  }
+
+  @Test
+  public void testParseScheduleWithSeconds() {
+    verifyParseSchedule(2, "120 seconds");
+  }
+
+  private void verifyParseSchedule(int expectedMinutes, String scheduleStr) {
+    Schedule schedule = IntervalScheduleParser.parse(scheduleStr, startTime);
+    assertEquals(new IntervalSchedule(startTime, expectedMinutes, ChronoUnit.MINUTES), schedule);
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/transport/TransportCancelAsyncQueryRequestActionTest.java b/async-query/src/test/java/org/opensearch/sql/spark/transport/TransportCancelAsyncQueryRequestActionTest.java
new file mode 100644
index 0000000000..a2581fdea2
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/transport/TransportCancelAsyncQueryRequestActionTest.java
@@ -0,0 +1,86 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.spark.transport;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.spark.constants.TestConstants.EMR_JOB_ID;
+
+import java.util.HashSet;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorServiceImpl;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.transport.model.CancelAsyncQueryActionRequest;
+import org.opensearch.sql.spark.transport.model.CancelAsyncQueryActionResponse;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+@ExtendWith(MockitoExtension.class)
+public class TransportCancelAsyncQueryRequestActionTest {
+
+  @Mock private TransportService transportService;
+  @Mock private TransportCancelAsyncQueryRequestAction action;
+  @Mock private Task task;
+  @Mock private ActionListener<CancelAsyncQueryActionResponse> actionListener;
+  @Mock private AsyncQueryExecutorServiceImpl asyncQueryExecutorService;
+
+  @Captor
+  private ArgumentCaptor<CancelAsyncQueryActionResponse> deleteJobActionResponseArgumentCaptor;
+
+  @Captor private ArgumentCaptor<Exception> exceptionArgumentCaptor;
+
+  @BeforeEach
+  public void setUp() {
+    action =
+        new TransportCancelAsyncQueryRequestAction(
+            transportService, new ActionFilters(new HashSet<>()), asyncQueryExecutorService);
+  }
+
+  @Test
+  public void testDoExecute() {
+    CancelAsyncQueryActionRequest request = new CancelAsyncQueryActionRequest(EMR_JOB_ID);
+    when(asyncQueryExecutorService.cancelQuery(
+            eq(EMR_JOB_ID), any(NullAsyncQueryRequestContext.class)))
+        .thenReturn(EMR_JOB_ID);
+
+    action.doExecute(task, request, actionListener);
+
+    Mockito.verify(actionListener).onResponse(deleteJobActionResponseArgumentCaptor.capture());
+    CancelAsyncQueryActionResponse cancelAsyncQueryActionResponse =
+        deleteJobActionResponseArgumentCaptor.getValue();
+    Assertions.assertEquals(
+        "Deleted async query with id: " + EMR_JOB_ID, cancelAsyncQueryActionResponse.getResult());
+  }
+
+  @Test
+  public void testDoExecuteWithException() {
+    CancelAsyncQueryActionRequest request = new CancelAsyncQueryActionRequest(EMR_JOB_ID);
+    doThrow(new RuntimeException("Error"))
+        .when(asyncQueryExecutorService)
+        .cancelQuery(eq(EMR_JOB_ID), any(NullAsyncQueryRequestContext.class));
+
+    action.doExecute(task, request, actionListener);
+
+    Mockito.verify(actionListener).onFailure(exceptionArgumentCaptor.capture());
+    Exception exception = exceptionArgumentCaptor.getValue();
+    Assertions.assertTrue(exception instanceof RuntimeException);
+    Assertions.assertEquals("Error", exception.getMessage());
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/transport/TransportCreateAsyncQueryRequestActionTest.java b/async-query/src/test/java/org/opensearch/sql/spark/transport/TransportCreateAsyncQueryRequestActionTest.java
new file mode 100644
index 0000000000..2a4d33726b
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/transport/TransportCreateAsyncQueryRequestActionTest.java
@@ -0,0 +1,145 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.spark.transport;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doThrow;
+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.opensearch.sql.spark.constants.TestConstants.MOCK_SESSION_ID;
+
+import java.util.HashSet;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorServiceImpl;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse;
+import org.opensearch.sql.spark.rest.model.LangType;
+import org.opensearch.sql.spark.transport.model.CreateAsyncQueryActionRequest;
+import org.opensearch.sql.spark.transport.model.CreateAsyncQueryActionResponse;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+@ExtendWith(MockitoExtension.class)
+public class TransportCreateAsyncQueryRequestActionTest {
+
+  @Mock private TransportService transportService;
+  @Mock private TransportCreateAsyncQueryRequestAction action;
+  @Mock private AsyncQueryExecutorServiceImpl jobExecutorService;
+  @Mock private Task task;
+  @Mock private ActionListener<CreateAsyncQueryActionResponse> actionListener;
+  @Mock private OpenSearchSettings pluginSettings;
+
+  @Captor
+  private ArgumentCaptor<CreateAsyncQueryActionResponse> createJobActionResponseArgumentCaptor;
+
+  @Captor private ArgumentCaptor<Exception> exceptionArgumentCaptor;
+
+  @BeforeEach
+  public void setUp() {
+    action =
+        new TransportCreateAsyncQueryRequestAction(
+            transportService,
+            new ActionFilters(new HashSet<>()),
+            jobExecutorService,
+            pluginSettings);
+  }
+
+  @Test
+  public void testDoExecute() {
+    CreateAsyncQueryRequest createAsyncQueryRequest =
+        new CreateAsyncQueryRequest("source = my_glue.default.alb_logs", "my_glue", LangType.SQL);
+    CreateAsyncQueryActionRequest request =
+        new CreateAsyncQueryActionRequest(createAsyncQueryRequest);
+    when(pluginSettings.getSettingValue(Settings.Key.ASYNC_QUERY_ENABLED)).thenReturn(true);
+    when(jobExecutorService.createAsyncQuery(eq(createAsyncQueryRequest), any()))
+        .thenReturn(new CreateAsyncQueryResponse("123", null));
+
+    action.doExecute(task, request, actionListener);
+
+    Mockito.verify(actionListener).onResponse(createJobActionResponseArgumentCaptor.capture());
+    CreateAsyncQueryActionResponse createAsyncQueryActionResponse =
+        createJobActionResponseArgumentCaptor.getValue();
+    Assertions.assertEquals(
+        "{\n" + "  \"queryId\": \"123\"\n" + "}", createAsyncQueryActionResponse.getResult());
+  }
+
+  @Test
+  public void testDoExecuteWithSessionId() {
+    CreateAsyncQueryRequest createAsyncQueryRequest =
+        new CreateAsyncQueryRequest(
+            "source = my_glue.default.alb_logs", "my_glue", LangType.SQL, MOCK_SESSION_ID);
+    CreateAsyncQueryActionRequest request =
+        new CreateAsyncQueryActionRequest(createAsyncQueryRequest);
+    when(pluginSettings.getSettingValue(Settings.Key.ASYNC_QUERY_ENABLED)).thenReturn(true);
+    when(jobExecutorService.createAsyncQuery(eq(createAsyncQueryRequest), any()))
+        .thenReturn(new CreateAsyncQueryResponse("123", MOCK_SESSION_ID));
+
+    action.doExecute(task, request, actionListener);
+
+    Mockito.verify(actionListener).onResponse(createJobActionResponseArgumentCaptor.capture());
+    CreateAsyncQueryActionResponse createAsyncQueryActionResponse =
+        createJobActionResponseArgumentCaptor.getValue();
+    Assertions.assertEquals(
+        "{\n" + "  \"queryId\": \"123\",\n" + "  \"sessionId\": \"s-0123456\"\n" + "}",
+        createAsyncQueryActionResponse.getResult());
+  }
+
+  @Test
+  public void testDoExecuteWithException() {
+    CreateAsyncQueryRequest createAsyncQueryRequest =
+        new CreateAsyncQueryRequest("source = my_glue.default.alb_logs", "my_glue", LangType.SQL);
+    CreateAsyncQueryActionRequest request =
+        new CreateAsyncQueryActionRequest(createAsyncQueryRequest);
+    when(pluginSettings.getSettingValue(Settings.Key.ASYNC_QUERY_ENABLED)).thenReturn(true);
+    doThrow(new RuntimeException("Error"))
+        .when(jobExecutorService)
+        .createAsyncQuery(eq(createAsyncQueryRequest), any());
+
+    action.doExecute(task, request, actionListener);
+
+    verify(jobExecutorService, times(1)).createAsyncQuery(eq(createAsyncQueryRequest), any());
+    Mockito.verify(actionListener).onFailure(exceptionArgumentCaptor.capture());
+    Exception exception = exceptionArgumentCaptor.getValue();
+    Assertions.assertTrue(exception instanceof RuntimeException);
+    Assertions.assertEquals("Error", exception.getMessage());
+  }
+
+  @Test
+  public void asyncQueryDisabled() {
+    CreateAsyncQueryRequest createAsyncQueryRequest =
+        new CreateAsyncQueryRequest("source = my_glue.default.alb_logs", "my_glue", LangType.SQL);
+    CreateAsyncQueryActionRequest request =
+        new CreateAsyncQueryActionRequest(createAsyncQueryRequest);
+    when(pluginSettings.getSettingValue(Settings.Key.ASYNC_QUERY_ENABLED)).thenReturn(false);
+
+    action.doExecute(task, request, actionListener);
+
+    verify(jobExecutorService, never()).createAsyncQuery(eq(createAsyncQueryRequest), any());
+    Mockito.verify(actionListener).onFailure(exceptionArgumentCaptor.capture());
+    Exception exception = exceptionArgumentCaptor.getValue();
+    Assertions.assertTrue(exception instanceof IllegalAccessException);
+    Assertions.assertEquals(
+        "plugins.query.executionengine.async_query.enabled " + "setting is false",
+        exception.getMessage());
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/transport/TransportGetAsyncQueryResultActionTest.java b/async-query/src/test/java/org/opensearch/sql/spark/transport/TransportGetAsyncQueryResultActionTest.java
new file mode 100644
index 0000000000..475eceb37e
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/transport/TransportGetAsyncQueryResultActionTest.java
@@ -0,0 +1,153 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.spark.transport;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.data.model.ExprValueUtils.tupleValue;
+import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.util.Arrays;
+import java.util.HashSet;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorServiceImpl;
+import org.opensearch.sql.spark.asyncquery.exceptions.AsyncQueryNotFoundException;
+import org.opensearch.sql.spark.asyncquery.model.AsyncQueryExecutionResponse;
+import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
+import org.opensearch.sql.spark.transport.model.GetAsyncQueryResultActionRequest;
+import org.opensearch.sql.spark.transport.model.GetAsyncQueryResultActionResponse;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+@ExtendWith(MockitoExtension.class)
+public class TransportGetAsyncQueryResultActionTest {
+
+  @Mock private TransportService transportService;
+  @Mock private TransportGetAsyncQueryResultAction action;
+  @Mock private Task task;
+  @Mock private ActionListener<GetAsyncQueryResultActionResponse> actionListener;
+  @Mock private AsyncQueryExecutorServiceImpl jobExecutorService;
+
+  @Captor
+  private ArgumentCaptor<GetAsyncQueryResultActionResponse> createJobActionResponseArgumentCaptor;
+
+  @Captor private ArgumentCaptor<Exception> exceptionArgumentCaptor;
+
+  @BeforeEach
+  public void setUp() {
+    action =
+        new TransportGetAsyncQueryResultAction(
+            transportService, new ActionFilters(new HashSet<>()), jobExecutorService);
+  }
+
+  @Test
+  public void testDoExecute() {
+    GetAsyncQueryResultActionRequest request = new GetAsyncQueryResultActionRequest("jobId");
+    AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+        new AsyncQueryExecutionResponse("IN_PROGRESS", null, null, null, null);
+    when(jobExecutorService.getAsyncQueryResults(eq("jobId"), any()))
+        .thenReturn(asyncQueryExecutionResponse);
+
+    action.doExecute(task, request, actionListener);
+
+    verify(actionListener).onResponse(createJobActionResponseArgumentCaptor.capture());
+    GetAsyncQueryResultActionResponse getAsyncQueryResultActionResponse =
+        createJobActionResponseArgumentCaptor.getValue();
+    Assertions.assertEquals(
+        "{\n" + "  \"status\": \"IN_PROGRESS\"\n" + "}",
+        getAsyncQueryResultActionResponse.getResult());
+  }
+
+  @Test
+  public void testDoExecuteWithSuccessResponse() {
+    GetAsyncQueryResultActionRequest request = new GetAsyncQueryResultActionRequest("jobId");
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(
+                new ExecutionEngine.Schema.Column("name", "name", STRING),
+                new ExecutionEngine.Schema.Column("age", "age", INTEGER)));
+    AsyncQueryExecutionResponse asyncQueryExecutionResponse =
+        new AsyncQueryExecutionResponse(
+            "SUCCESS",
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("name", "John", "age", 20)),
+                tupleValue(ImmutableMap.of("name", "Smith", "age", 30))),
+            null,
+            null);
+    when(jobExecutorService.getAsyncQueryResults(eq("jobId"), any()))
+        .thenReturn(asyncQueryExecutionResponse);
+
+    action.doExecute(task, request, actionListener);
+
+    verify(actionListener).onResponse(createJobActionResponseArgumentCaptor.capture());
+    GetAsyncQueryResultActionResponse getAsyncQueryResultActionResponse =
+        createJobActionResponseArgumentCaptor.getValue();
+    Assertions.assertEquals(
+        "{\n"
+            + "  \"status\": \"SUCCESS\",\n"
+            + "  \"schema\": [\n"
+            + "    {\n"
+            + "      \"name\": \"name\",\n"
+            + "      \"type\": \"string\"\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"name\": \"age\",\n"
+            + "      \"type\": \"integer\"\n"
+            + "    }\n"
+            + "  ],\n"
+            + "  \"datarows\": [\n"
+            + "    [\n"
+            + "      \"John\",\n"
+            + "      20\n"
+            + "    ],\n"
+            + "    [\n"
+            + "      \"Smith\",\n"
+            + "      30\n"
+            + "    ]\n"
+            + "  ],\n"
+            + "  \"total\": 2,\n"
+            + "  \"size\": 2\n"
+            + "}",
+        getAsyncQueryResultActionResponse.getResult());
+  }
+
+  @Test
+  public void testDoExecuteWithException() {
+    GetAsyncQueryResultActionRequest request = new GetAsyncQueryResultActionRequest("123");
+    doThrow(new AsyncQueryNotFoundException("JobId 123 not found"))
+        .when(jobExecutorService)
+        .getAsyncQueryResults(eq("123"), any());
+
+    action.doExecute(task, request, actionListener);
+
+    verify(jobExecutorService, times(1))
+        .getAsyncQueryResults(eq("123"), any(NullAsyncQueryRequestContext.class));
+    verify(actionListener).onFailure(exceptionArgumentCaptor.capture());
+    Exception exception = exceptionArgumentCaptor.getValue();
+    Assertions.assertTrue(exception instanceof RuntimeException);
+    Assertions.assertEquals("JobId 123 not found", exception.getMessage());
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModuleTest.java b/async-query/src/test/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModuleTest.java
new file mode 100644
index 0000000000..d45950852f
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModuleTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.config;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.inject.Injector;
+import org.opensearch.common.inject.ModulesBuilder;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.legacy.metrics.Metrics;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorService;
+
+@ExtendWith(MockitoExtension.class)
+public class AsyncExecutorServiceModuleTest {
+
+  @Mock private NodeClient nodeClient;
+
+  @Mock private ClusterService clusterService;
+
+  @Mock private Settings settings;
+
+  @Mock private DataSourceService dataSourceService;
+
+  @Test
+  public void testAsyncQueryExecutorService() {
+    ModulesBuilder modulesBuilder = new ModulesBuilder();
+    modulesBuilder.add(new AsyncExecutorServiceModule());
+    modulesBuilder.add(
+        b -> {
+          b.bind(NodeClient.class).toInstance(nodeClient);
+          b.bind(org.opensearch.sql.common.setting.Settings.class).toInstance(settings);
+          b.bind(DataSourceService.class).toInstance(dataSourceService);
+          b.bind(ClusterService.class).toInstance(clusterService);
+        });
+    Injector injector = modulesBuilder.createInjector();
+    assertNotNull(injector.getInstance(AsyncQueryExecutorService.class));
+    assertNotNull(Metrics.getInstance().getMetric("active_async_query_sessions_count"));
+    assertNotNull(Metrics.getInstance().getMetric("active_async_query_statements_count"));
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/transport/format/AsyncQueryResultResponseFormatterTest.java b/async-query/src/test/java/org/opensearch/sql/spark/transport/format/AsyncQueryResultResponseFormatterTest.java
new file mode 100644
index 0000000000..bb7d5f7893
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/transport/format/AsyncQueryResultResponseFormatterTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.format;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opensearch.sql.data.model.ExprValueUtils.tupleValue;
+import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.Style.COMPACT;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.util.Arrays;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.spark.transport.model.AsyncQueryResult;
+
+public class AsyncQueryResultResponseFormatterTest {
+
+  private final ExecutionEngine.Schema schema =
+      new ExecutionEngine.Schema(
+          ImmutableList.of(
+              new ExecutionEngine.Schema.Column("firstname", null, STRING),
+              new ExecutionEngine.Schema.Column("age", null, INTEGER)));
+
+  @Test
+  void formatAsyncQueryResponse() {
+    AsyncQueryResult response =
+        new AsyncQueryResult(
+            "success",
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("firstname", "John", "age", 20)),
+                tupleValue(ImmutableMap.of("firstname", "Smith", "age", 30))),
+            null);
+    AsyncQueryResultResponseFormatter formatter = new AsyncQueryResultResponseFormatter(COMPACT);
+    assertEquals(
+        "{\"status\":\"success\",\"schema\":[{\"name\":\"firstname\",\"type\":\"string\"},"
+            + "{\"name\":\"age\",\"type\":\"integer\"}],\"datarows\":"
+            + "[[\"John\",20],[\"Smith\",30]],\"total\":2,\"size\":2}",
+        formatter.format(response));
+  }
+
+  @Test
+  void formatAsyncQueryError() {
+    AsyncQueryResult response = new AsyncQueryResult("FAILED", null, null, "foo");
+    AsyncQueryResultResponseFormatter formatter = new AsyncQueryResultResponseFormatter(COMPACT);
+    assertEquals("{\"status\":\"FAILED\",\"error\":\"foo\"}", formatter.format(response));
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/transport/format/CreateAsyncQueryRequestConverterTest.java b/async-query/src/test/java/org/opensearch/sql/spark/transport/format/CreateAsyncQueryRequestConverterTest.java
new file mode 100644
index 0000000000..d7f8046a1b
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/transport/format/CreateAsyncQueryRequestConverterTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.transport.format;
+
+import java.io.IOException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.sql.spark.rest.model.CreateAsyncQueryRequest;
+import org.opensearch.sql.spark.rest.model.LangType;
+
+public class CreateAsyncQueryRequestConverterTest {
+
+  @Test
+  public void fromXContent() throws IOException {
+    String request =
+        "{\n"
+            + "  \"datasource\": \"my_glue\",\n"
+            + "  \"lang\": \"sql\",\n"
+            + "  \"query\": \"select 1\"\n"
+            + "}";
+    CreateAsyncQueryRequest queryRequest =
+        CreateAsyncQueryRequestConverter.fromXContentParser(xContentParser(request));
+    Assertions.assertEquals("my_glue", queryRequest.getDatasource());
+    Assertions.assertEquals(LangType.SQL, queryRequest.getLang());
+    Assertions.assertEquals("select 1", queryRequest.getQuery());
+  }
+
+  @Test
+  public void testConstructor() {
+    Assertions.assertDoesNotThrow(
+        () -> new CreateAsyncQueryRequest("select * from apple", "my_glue", LangType.SQL));
+  }
+
+  @Test
+  public void fromXContentWithDuplicateFields() throws IOException {
+    String request =
+        "{\n"
+            + "  \"datasource\": \"my_glue\",\n"
+            + "  \"datasource\": \"my_glue_1\",\n"
+            + "  \"lang\": \"sql\",\n"
+            + "  \"query\": \"select 1\"\n"
+            + "}";
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () -> CreateAsyncQueryRequestConverter.fromXContentParser(xContentParser(request)));
+    Assertions.assertTrue(
+        illegalArgumentException
+            .getMessage()
+            .contains("Error while parsing the request body: Duplicate field 'datasource'"));
+  }
+
+  @Test
+  public void fromXContentWithUnknownField() throws IOException {
+    String request =
+        "{\n"
+            + "  \"datasource\": \"my_glue\",\n"
+            + "  \"random\": \"my_gue_1\",\n"
+            + "  \"lang\": \"sql\",\n"
+            + "  \"query\": \"select 1\"\n"
+            + "}";
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () -> CreateAsyncQueryRequestConverter.fromXContentParser(xContentParser(request)));
+    Assertions.assertEquals(
+        "Error while parsing the request body: Unknown field: random",
+        illegalArgumentException.getMessage());
+  }
+
+  @Test
+  public void fromXContentWithWrongDatatype() throws IOException {
+    String request =
+        "{\"datasource\": [\"my_glue\", \"my_glue_1\"], \"lang\": \"sql\", \"query\": \"select"
+            + " 1\"}";
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () -> CreateAsyncQueryRequestConverter.fromXContentParser(xContentParser(request)));
+    Assertions.assertEquals(
+        "Error while parsing the request body: Can't get text on a START_ARRAY at 1:16",
+        illegalArgumentException.getMessage());
+  }
+
+  @Test
+  public void fromXContentWithSessionId() throws IOException {
+    String request =
+        "{\n"
+            + "  \"datasource\": \"my_glue\",\n"
+            + "  \"lang\": \"sql\",\n"
+            + "  \"query\": \"select 1\",\n"
+            + "  \"sessionId\": \"00fdjevgkf12s00q\"\n"
+            + "}";
+    CreateAsyncQueryRequest queryRequest =
+        CreateAsyncQueryRequestConverter.fromXContentParser(xContentParser(request));
+    Assertions.assertEquals("00fdjevgkf12s00q", queryRequest.getSessionId());
+  }
+
+  private XContentParser xContentParser(String request) throws IOException {
+    return XContentType.JSON
+        .xContent()
+        .createParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, request);
+  }
+}
diff --git a/async-query/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java b/async-query/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java
new file mode 100644
index 0000000000..24c10ebea9
--- /dev/null
+++ b/async-query/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.utils;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import java.net.URL;
+import lombok.SneakyThrows;
+import org.opensearch.action.admin.indices.create.CreateIndexRequest;
+import org.opensearch.client.Client;
+import org.opensearch.common.xcontent.XContentType;
+
+public class TestUtils {
+  @SneakyThrows
+  public static String loadMappings(String path) {
+    URL url = Resources.getResource(path);
+    return Resources.toString(url, Charsets.UTF_8);
+  }
+
+  public static void createIndexWithMappings(
+      Client client, String indexName, String metadataFileLocation) {
+    CreateIndexRequest request = new CreateIndexRequest(indexName);
+    request.mapping(loadMappings(metadataFileLocation), XContentType.JSON);
+    client.admin().indices().create(request).actionGet();
+  }
+}
diff --git a/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_covering_index.json b/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_covering_index.json
new file mode 100644
index 0000000000..811204847c
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_covering_index.json
@@ -0,0 +1,37 @@
+{
+  "_meta": {
+    "kind": "covering",
+    "indexedColumns": [
+      {
+        "columnType": "timestamp",
+        "columnName": "time"
+      },
+      {
+        "columnType": "string",
+        "columnName": "client_ip"
+      },
+      {
+        "columnType": "int",
+        "columnName": "client_port"
+      },
+      {
+        "columnType": "string",
+        "columnName": "request_url"
+      }
+    ],
+    "name": "covering",
+    "options": {
+      "auto_refresh": "true",
+      "index_settings": "{\"number_of_shards\":1,\"number_of_replicas\":1}"
+    },
+    "source": "mys3.default.http_logs",
+    "version": "0.1.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fd777k3k3ls20p",
+        "SERVERLESS_EMR_JOB_ID": "00fe3gu2tgad000q"
+      }
+    },
+    "latestId": "ZmxpbnRfbXlzM19kZWZhdWx0X2h0dHBfbG9nc19jb3ZlcmluZ19pbmRleA=="
+  }
+}
diff --git a/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_mv.json b/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_mv.json
new file mode 100644
index 0000000000..1369f9c721
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_mv.json
@@ -0,0 +1,30 @@
+{
+  "_meta": {
+    "kind": "mv",
+    "indexedColumns": [
+      {
+        "columnType": "timestamp",
+        "columnName": "start.time"
+      },
+      {
+        "columnType": "long",
+        "columnName": "count"
+      }
+    ],
+    "name": "mys3.default.http_logs_metrics",
+    "options": {
+      "auto_refresh": "true",
+      "checkpoint_location": "s3://flint-data-dp-eu-west-1-beta/data/checkpoint/chen-job-1",
+      "watermark_delay": "30 Minutes"
+    },
+    "source": "SELECT   window.start AS `start.time`,   COUNT(*) AS count FROM mys3.default.http_logs WHERE status != 200 GROUP BY TUMBLE(`@timestamp`, '6 Hours')",
+    "version": "0.1.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fd777k3k3ls20p",
+        "SERVERLESS_EMR_JOB_ID": "00fe86mkk5q3u00q"
+      }
+    },
+    "latestId": "ZmxpbnRfbXlzM19kZWZhdWx0X2h0dHBfbG9nc19tZXRyaWNz"
+  }
+}
diff --git a/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_skipping_index.json b/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_skipping_index.json
new file mode 100644
index 0000000000..2f65b1d8ee
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_skipping_index.json
@@ -0,0 +1,23 @@
+{
+  "_meta": {
+    "kind": "skipping",
+    "indexedColumns": [
+      {
+        "columnType": "int",
+        "kind": "VALUE_SET",
+        "columnName": "status"
+      }
+    ],
+    "name": "flint_mys3_default_http_logs_skipping_index",
+    "options": {},
+    "source": "mys3.default.http_logs",
+    "version": "0.1.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fd777k3k3ls20p",
+        "SERVERLESS_EMR_JOB_ID": "00fdmvv9hp8u0o0q"
+      }
+    },
+    "latestId": "ZmxpbnRfbXlzM19kZWZhdWx0X2h0dHBfbG9nc19za2lwcGluZ19pbmRleA=="
+  }
+}
diff --git a/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_special_character_index.json b/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_special_character_index.json
new file mode 100644
index 0000000000..72c83c59fa
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/0.1.1/flint_special_character_index.json
@@ -0,0 +1,23 @@
+{
+  "_meta": {
+    "kind": "skipping",
+    "indexedColumns": [
+      {
+        "columnType": "int",
+        "kind": "VALUE_SET",
+        "columnName": "status"
+      }
+    ],
+    "name": "flint_mys3_default_test%20%2c%3a%22%2b%2f%5c%7c%3f%23%3e%3c_skipping_index",
+    "options": {},
+    "source": "mys3.default.`test ,:\"+/\\|?#><`",
+    "version": "0.1.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fd777k3k3ls20p",
+        "SERVERLESS_EMR_JOB_ID": "00fdmvv9hp8u0o0q"
+      }
+    },
+    "latestId": "ZmxpbnRfbXlzM19kZWZhdWx0X3Rlc3QlMjAlMmMlM2ElMjIlMmIlMmYlNWMlN2MlM2YlMjMlM2UlM2Nfc2tpcHBpbmdfaW5kZXg="
+  }
+}
diff --git a/async-query/src/test/resources/flint-index-mappings/flint_covering_index.json b/async-query/src/test/resources/flint-index-mappings/flint_covering_index.json
new file mode 100644
index 0000000000..f68a1627ab
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/flint_covering_index.json
@@ -0,0 +1,36 @@
+{
+  "_meta": {
+    "kind": "covering",
+    "indexedColumns": [
+      {
+        "columnType": "timestamp",
+        "columnName": "time"
+      },
+      {
+        "columnType": "string",
+        "columnName": "client_ip"
+      },
+      {
+        "columnType": "int",
+        "columnName": "client_port"
+      },
+      {
+        "columnType": "string",
+        "columnName": "request_url"
+      }
+    ],
+    "name": "test",
+    "options": {
+      "auto_refresh": "true",
+      "index_settings": "{\"number_of_shards\":1,\"number_of_replicas\":1}"
+    },
+    "source": "mys3.default.http_logs",
+    "version": "0.1.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fd777k3k3ls20p",
+        "SERVERLESS_EMR_JOB_ID": "00fe3gu2tgad000q"
+      }
+    }
+  }
+}
diff --git a/async-query/src/test/resources/flint-index-mappings/flint_mv.json b/async-query/src/test/resources/flint-index-mappings/flint_mv.json
new file mode 100644
index 0000000000..3d130832b8
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/flint_mv.json
@@ -0,0 +1,42 @@
+{
+  "_meta": {
+    "kind": "mv",
+    "indexedColumns": [
+      {
+        "columnType": "timestamp",
+        "columnName": "start.time"
+      },
+      {
+        "columnType": "long",
+        "columnName": "count"
+      }
+    ],
+    "name": "spark_catalog.default.http_logs_metrics_chen",
+    "options": {
+      "auto_refresh": "true",
+      "checkpoint_location": "s3://flint-data-dp-eu-west-1-beta/data/checkpoint/chen-job-1",
+      "watermark_delay": "30 Minutes"
+    },
+    "source": "SELECT   window.start AS `start.time`,   COUNT(*) AS count FROM mys3.default.http_logs WHERE status != 200 GROUP BY TUMBLE(`@timestamp`, '6 Hours')",
+    "version": "0.1.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fd777k3k3ls20p",
+        "SERVERLESS_EMR_JOB_ID": "00fe86mkk5q3u00q"
+      }
+    }
+  },
+  "properties": {
+    "count": {
+      "type": "long"
+    },
+    "start": {
+      "properties": {
+        "time": {
+          "type": "date",
+          "format": "strict_date_optional_time_nanos"
+        }
+      }
+    }
+  }
+}
diff --git a/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_covering_corrupted_index_mapping.json b/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_covering_corrupted_index_mapping.json
new file mode 100644
index 0000000000..90d37c3e79
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_covering_corrupted_index_mapping.json
@@ -0,0 +1,33 @@
+{
+  "_meta": {
+    "latestId": "flint_my_glue_mydb_http_logs_covering_corrupted_index_latest_id",
+    "kind": "covering",
+    "indexedColumns": [
+      {
+        "columnType": "string",
+        "columnName": "clientip"
+      },
+      {
+        "columnType": "int",
+        "columnName": "status"
+      }
+    ],
+    "name": "covering",
+    "options": {
+      "auto_refresh": "true",
+      "incremental_refresh": "false",
+      "index_settings": "{\"number_of_shards\":5,\"number_of_replicas\":1}",
+      "checkpoint_location": "s3://vamsicheckpoint/cv/"
+    },
+    "source": "my_glue.mydb.http_logs",
+    "version": "0.2.0"
+  },
+  "properties": {
+    "clientip": {
+      "type": "keyword"
+    },
+    "status": {
+      "type": "integer"
+    }
+  }
+}
\ No newline at end of file
diff --git a/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_covering_error_index_mapping.json b/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_covering_error_index_mapping.json
new file mode 100644
index 0000000000..edd71b41db
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_covering_error_index_mapping.json
@@ -0,0 +1,39 @@
+{
+  "_meta": {
+    "latestId": "flint_my_glue_mydb_http_logs_covering_error_index_latest_id",
+    "kind": "random",
+    "indexedColumns": [
+      {
+        "columnType": "string",
+        "columnName": "clientip"
+      },
+      {
+        "columnType": "int",
+        "columnName": "status"
+      }
+    ],
+    "name": "covering",
+    "options": {
+      "auto_refresh": "true",
+      "incremental_refresh": "false",
+      "index_settings": "{\"number_of_shards\":5,\"number_of_replicas\":1}",
+      "checkpoint_location": "s3://vamsicheckpoint/cv/"
+    },
+    "source": "my_glue.mydb.http_logs",
+    "version": "0.2.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fhh7frokkf0k0l",
+        "SERVERLESS_EMR_JOB_ID": "00fhoag6i0671o0m"
+      }
+    }
+  },
+  "properties": {
+    "clientip": {
+      "type": "keyword"
+    },
+    "status": {
+      "type": "integer"
+    }
+  }
+}
\ No newline at end of file
diff --git a/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_covering_index_mapping.json b/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_covering_index_mapping.json
new file mode 100644
index 0000000000..cb4a6b5366
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_covering_index_mapping.json
@@ -0,0 +1,39 @@
+{
+  "_meta": {
+    "latestId": "flint_my_glue_mydb_http_logs_covering_index_latest_id",
+    "kind": "covering",
+    "indexedColumns": [
+      {
+        "columnType": "string",
+        "columnName": "clientip"
+      },
+      {
+        "columnType": "int",
+        "columnName": "status"
+      }
+    ],
+    "name": "covering",
+    "options": {
+      "auto_refresh": "true",
+      "incremental_refresh": "false",
+      "index_settings": "{\"number_of_shards\":5,\"number_of_replicas\":1}",
+      "checkpoint_location": "s3://vamsicheckpoint/cv/"
+    },
+    "source": "my_glue.mydb.http_logs",
+    "version": "0.2.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fhh7frokkf0k0l",
+        "SERVERLESS_EMR_JOB_ID": "00fhoag6i0671o0m"
+      }
+    }
+  },
+  "properties": {
+    "clientip": {
+      "type": "keyword"
+    },
+    "status": {
+      "type": "integer"
+    }
+  }
+}
\ No newline at end of file
diff --git a/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_skipping_index_mapping.json b/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_skipping_index_mapping.json
new file mode 100644
index 0000000000..4ffd73bf9c
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_http_logs_skipping_index_mapping.json
@@ -0,0 +1,39 @@
+{
+  "_meta": {
+    "latestId": "flint_my_glue_mydb_http_logs_skipping_index_latest_id",
+    "kind": "skipping",
+    "indexedColumns": [
+      {
+        "columnType": "int",
+        "kind": "VALUE_SET",
+        "parameters": {
+          "max_size": "100"
+        },
+        "columnName": "status"
+      }
+    ],
+    "name": "flint_my_glue_mydb_http_logs_skipping_index",
+    "options": {
+      "auto_refresh": "true",
+      "incremental_refresh": "false",
+      "index_settings": "{\"number_of_shards\":5, \"number_of_replicas\":1}",
+      "checkpoint_location": "s3://vamsicheckpoint/skp/"
+    },
+    "source": "my_glue.mydb.http_logs",
+    "version": "0.3.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fhe6d5jpah090l",
+        "SERVERLESS_EMR_JOB_ID": "00fhelvq7peuao0m"
+      }
+    }
+  },
+  "properties": {
+    "file_path": {
+      "type": "keyword"
+    },
+    "status": {
+      "type": "integer"
+    }
+  }
+}
\ No newline at end of file
diff --git a/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_mv_mapping.json b/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_mv_mapping.json
new file mode 100644
index 0000000000..0fcbf299ec
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/flint_my_glue_mydb_mv_mapping.json
@@ -0,0 +1,33 @@
+{
+  "_meta": {
+    "latestId": "flint_my_glue_mydb_mv_latest_id",
+    "kind": "mv",
+    "indexedColumns": [
+      {
+        "columnType": "bigint",
+        "columnName": "counter1"
+      }
+    ],
+    "name": "my_glue.mydb.mv",
+    "options": {
+      "auto_refresh": "true",
+      "incremental_refresh": "false",
+      "index_settings": "{\"number_of_shards\":5,\"number_of_replicas\":1}",
+      "checkpoint_location": "s3://vamsicheckpoint/mv/",
+      "watermark_delay": "10 seconds"
+    },
+    "source": "SELECT    count(`@timestamp`) AS `counter1` FROM my_glue.mydb.http_logs GROUP BY TUMBLE (`@timestamp`, '1 second')",
+    "version": "0.2.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fhh7frokkf0k0l",
+        "SERVERLESS_EMR_JOB_ID": "00fhob01oa7fu00m"
+      }
+    }
+  },
+  "properties": {
+    "counter1": {
+      "type": "long"
+    }
+  }
+}
\ No newline at end of file
diff --git a/async-query/src/test/resources/flint-index-mappings/flint_mys3_default_http_logs_cv1_index.json b/async-query/src/test/resources/flint-index-mappings/flint_mys3_default_http_logs_cv1_index.json
new file mode 100644
index 0000000000..e7ca1ff440
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/flint_mys3_default_http_logs_cv1_index.json
@@ -0,0 +1,41 @@
+{
+  "flint_mys3_default_http_logs_cv1_index": {
+    "mappings": {
+      "_doc": {
+        "_meta": {
+          "kind": "skipping",
+          "indexedColumns": [
+            {
+              "columnType": "int",
+              "kind": "VALUE_SET",
+              "columnName": "status"
+            }
+          ],
+          "name": "flint_mys3_default_http_logs_cv1_index",
+          "options": {},
+          "source": "mys3.default.http_logs",
+          "version": "0.1.0",
+          "properties": {
+            "env": {
+              "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fd777k3k3ls20p",
+              "SERVERLESS_EMR_JOB_ID": "00fdmvv9hp8u0o0q"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "number_of_shards": 5,
+        "number_of_replicas": 0,
+        "max_result_window": 100,
+        "version": {
+          "created": "6050399"
+        }
+      }
+    },
+    "mapping_version": "1",
+    "settings_version": "1",
+    "aliases_version": "1"
+  }
+}
\ No newline at end of file
diff --git a/async-query/src/test/resources/flint-index-mappings/flint_mys3_default_http_logs_skipping_index.json b/async-query/src/test/resources/flint-index-mappings/flint_mys3_default_http_logs_skipping_index.json
new file mode 100644
index 0000000000..1438b257d1
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/flint_mys3_default_http_logs_skipping_index.json
@@ -0,0 +1,50 @@
+{
+  "flint_mys3_default_http_logs_skipping_index": {
+    "mappings": {
+      "_doc": {
+        "_meta":  {
+          "latestId": "ZmxpbnRfdmFtc2lfZ2x1ZV92YW1zaWRiX2h0dHBfbG9nc19za2lwcGluZ19pbmRleA==",
+          "kind": "skipping",
+          "indexedColumns": [
+            {
+              "columnType": "int",
+              "kind": "VALUE_SET",
+              "parameters": {
+                "max_size": "100"
+              },
+              "columnName": "status"
+            }
+          ],
+          "name": "flint_vamsi_glue_vamsidb_http_logs_skipping_index",
+          "options": {
+            "auto_refresh": "true",
+            "incremental_refresh": "false",
+            "index_settings": "{\"number_of_shards\":5,\"number_of_replicas\":1}",
+            "checkpoint_location": "s3://vamsicheckpoint/skp/"
+          },
+          "source": "vamsi_glue.vamsidb.http_logs",
+          "version": "0.3.0",
+          "properties": {
+            "env": {
+              "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fhe6d5jpah090l",
+              "SERVERLESS_EMR_JOB_ID": "00fhelvq7peuao0"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "number_of_shards": 5,
+        "number_of_replicas": 0,
+        "max_result_window": 100,
+        "version": {
+          "created": "6050399"
+        }
+      }
+    },
+    "mapping_version": "1",
+    "settings_version": "1",
+    "aliases_version": "1"
+  }
+}
\ No newline at end of file
diff --git a/async-query/src/test/resources/flint-index-mappings/flint_skipping_index.json b/async-query/src/test/resources/flint-index-mappings/flint_skipping_index.json
new file mode 100644
index 0000000000..edb8a97790
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/flint_skipping_index.json
@@ -0,0 +1,25 @@
+{
+  "_meta": {
+    "kind": "skipping",
+    "indexedColumns": [
+      {
+        "columnType": "int",
+        "kind": "VALUE_SET",
+        "columnName": "status"
+      }
+    ],
+    "name": "flint_mys3_default_http_logs_skipping_index",
+    "options": {
+      "auto_refresh" : "true",
+      "index_settings": "{\"number_of_shards\":1,\"number_of_replicas\":1}"
+    },
+    "source": "mys3.default.http_logs",
+    "version": "0.1.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fd777k3k3ls20p",
+        "SERVERLESS_EMR_JOB_ID": "00fdmvv9hp8u0o0q"
+      }
+    }
+  }
+}
diff --git a/async-query/src/test/resources/flint-index-mappings/flint_special_character_index.json b/async-query/src/test/resources/flint-index-mappings/flint_special_character_index.json
new file mode 100644
index 0000000000..95ae75545f
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/flint_special_character_index.json
@@ -0,0 +1,22 @@
+{
+  "_meta": {
+    "kind": "skipping",
+    "indexedColumns": [
+      {
+        "columnType": "int",
+        "kind": "VALUE_SET",
+        "columnName": "status"
+      }
+    ],
+    "name": "flint_mys3_default_test%20%2c%3a%22%2b%2f%5c%7c%3f%23%3e%3c_skipping_index",
+    "options": {},
+    "source": "mys3.default.`test ,:\"+/\\|?#><`",
+    "version": "0.1.0",
+    "properties": {
+      "env": {
+        "SERVERLESS_EMR_VIRTUAL_CLUSTER_ID": "00fd777k3k3ls20p",
+        "SERVERLESS_EMR_JOB_ID": "00fdmvv9hp8u0o0q"
+      }
+    }
+  }
+}
diff --git a/async-query/src/test/resources/flint-index-mappings/npe_mapping.json b/async-query/src/test/resources/flint-index-mappings/npe_mapping.json
new file mode 100644
index 0000000000..ff1d19f99f
--- /dev/null
+++ b/async-query/src/test/resources/flint-index-mappings/npe_mapping.json
@@ -0,0 +1,35 @@
+{
+  "flint_mys3_default_http_logs_cv1_index": {
+    "mappings": {
+      "_doc": {
+        "_meta": {
+          "kind": "skipping",
+          "indexedColumns": [
+            {
+              "columnType": "int",
+              "kind": "VALUE_SET",
+              "columnName": "status"
+            }
+          ],
+          "name": "flint_mys3_default_http_logs_cv1_index",
+          "options": {},
+          "source": "mys3.default.http_logs",
+          "version": "0.1.0"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "number_of_shards": 5,
+        "number_of_replicas": 0,
+        "max_result_window": 100,
+        "version": {
+          "created": "6050399"
+        }
+      }
+    },
+    "mapping_version": "1",
+    "settings_version": "1",
+    "aliases_version": "1"
+  }
+}
\ No newline at end of file
diff --git a/async-query/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/async-query/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000000..ca6ee9cea8
--- /dev/null
+++ b/async-query/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file
diff --git a/async-query/src/test/resources/query_execution_result_mapping.json b/async-query/src/test/resources/query_execution_result_mapping.json
new file mode 100644
index 0000000000..a76ef77383
--- /dev/null
+++ b/async-query/src/test/resources/query_execution_result_mapping.json
@@ -0,0 +1,44 @@
+{
+  "dynamic": "false",
+  "properties": {
+    "applicationId": {
+      "type": "keyword"
+    },
+    "dataSourceName": {
+      "type": "keyword"
+    },
+    "error": {
+      "type": "text"
+    },
+    "jobRunId": {
+      "type": "keyword"
+    },
+    "queryId": {
+      "type": "keyword"
+    },
+    "queryRunTime": {
+      "type": "long"
+    },
+    "queryText": {
+      "type": "text"
+    },
+    "result": {
+      "type": "object",
+      "enabled": false
+    },
+    "schema": {
+      "type": "object",
+      "enabled": false
+    },
+    "sessionId": {
+      "type": "keyword"
+    },
+    "status": {
+      "type": "keyword"
+    },
+    "updateTime": {
+      "type": "date",
+      "format": "strict_date_time||epoch_millis"
+    }
+  }
+}
diff --git a/benchmarks/README.md b/benchmarks/README.md
new file mode 100644
index 0000000000..d90eb850db
--- /dev/null
+++ b/benchmarks/README.md
@@ -0,0 +1,19 @@
+# OpenSearch SQL/PPL Microbenchmark Suite
+
+This directory contains the microbenchmark suite of OpenSearch SQL/PPL. It relies on [JMH](http://openjdk.java.net/projects/code-tools/jmh/).
+
+## Purpose
+
+Microbenchmarks are intended to spot performance regressions in performance-critical components.
+
+The microbenchmark suite is also handy for ad-hoc microbenchmarks but please remove them again before merging your PR.
+
+## Getting Started
+
+Just run `./gradlew :benchmarks:jmh` from the project root directory or run specific benchmark via your IDE. It will build all microbenchmarks, execute them and print the result.
+
+## Adding Microbenchmarks
+
+Before adding a new microbenchmark, make yourself familiar with the JMH API. You can check our existing microbenchmarks and also the [JMH samples](http://hg.openjdk.java.net/code-tools/jmh/file/tip/jmh-samples/src/main/java/org/openjdk/jmh/samples/).
+
+In contrast to tests, the actual name of the benchmark class is not relevant to JMH. However, stick to the naming convention and end the class name of a benchmark with `Benchmark`. To have JMH execute a benchmark, annotate the respective methods with `@Benchmark`.
\ No newline at end of file
diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
new file mode 100644
index 0000000000..f01819be14
--- /dev/null
+++ b/benchmarks/build.gradle
@@ -0,0 +1,23 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+plugins {
+    id 'java-library'
+    id "me.champeau.jmh" version "0.6.8"
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation project(':core')
+
+    // Dependencies required by JMH micro benchmark
+    api group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.36'
+    annotationProcessor group: 'org.openjdk.jmh', name: 'jmh-generator-annprocess', version: '1.36'
+}
+
+compileJava.options.compilerArgs.addAll(["-processor", "org.openjdk.jmh.generators.BenchmarkProcessor"])
\ No newline at end of file
diff --git a/benchmarks/src/jmh/java/org/opensearch/sql/expression/operator/predicate/ComparisonOperatorBenchmark.java b/benchmarks/src/jmh/java/org/opensearch/sql/expression/operator/predicate/ComparisonOperatorBenchmark.java
new file mode 100644
index 0000000000..01b2068694
--- /dev/null
+++ b/benchmarks/src/jmh/java/org/opensearch/sql/expression/operator/predicate/ComparisonOperatorBenchmark.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.operator.predicate;
+
+import static org.opensearch.sql.data.model.ExprValueUtils.fromObjectValue;
+import static org.opensearch.sql.data.model.ExprValueUtils.integerValue;
+import static org.opensearch.sql.data.model.ExprValueUtils.stringValue;
+import static org.opensearch.sql.data.type.ExprCoreType.DATE;
+import static org.opensearch.sql.expression.DSL.literal;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+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.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.FunctionExpression;
+
+@Warmup(iterations = 1)
+@Measurement(iterations = 3)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@State(Scope.Thread)
+@Fork(value = 1)
+public class ComparisonOperatorBenchmark {
+
+  @Param(value = {"int", "string", "date"})
+  private String testDataType;
+
+  private final Map<String, ExprValue> params =
+      ImmutableMap.<String, ExprValue>builder()
+          .put("int", integerValue(1))
+          .put("string", stringValue("hello"))
+          .put("date", fromObjectValue("2022-01-12", DATE))
+          .build();
+
+  @Benchmark
+  public void testEqualOperator() {
+    run(DSL::equal);
+  }
+
+  @Benchmark
+  public void testLessOperator() {
+    run(DSL::less);
+  }
+
+  @Benchmark
+  public void testGreaterOperator() {
+    run(DSL::greater);
+  }
+
+  private void run(Function<Expression[], FunctionExpression> dsl) {
+    ExprValue param = params.get(testDataType);
+    FunctionExpression func = dsl.apply(new Expression[] {literal(param), literal(param)});
+    func.valueOf();
+  }
+}
diff --git a/bi-connectors/PowerBIConnector/AmazonOpenSearchService.md b/bi-connectors/PowerBIConnector/AmazonOpenSearchService.md
deleted file mode 100644
index d6498a683c..0000000000
--- a/bi-connectors/PowerBIConnector/AmazonOpenSearchService.md
+++ /dev/null
@@ -1,79 +0,0 @@
-#  Connecting Amazon OpenSearch Service to Microsoft Power BI Desktop
-
->[!Note]
-
->The following connector article is provided by Amazon, the owner of this connector and a member of the Microsoft Power Query Connector Certification Program. If you have questions regarding the content of this article or have changes you would like to see made to this article, visit the OpenSearch website and use the support channels there.
-
-## Summary
-| Item | Description |
-| ---- | ----------- |
-| Release State | General Availability |
-| Products | Power BI Desktop |
-| Authentication Types Supported | Basic |
-
-## Prerequisites
-* Microsoft Power BI Desktop
-* [OpenSearch](https://opensearch.org/docs/latest/opensearch/install/index/)
-* [OpenSearch SQL ODBC driver](https://opensearch.org/docs/latest/search-plugins/sql/odbc/)
-
-## Capabilities supported
-* Import
-* DirectQuery
-
-## Connect to Amazon OpenSearch Service
-1. Open Power BI Desktop.
-
-2. Click on **Home** > **Get Data** > **More** > **Other**. Select **Amazon OpenSearch Service**. Click on **Connect**.
-
-<img src="img/pbi_select_connector_amz.png" width="500">
-
-3. You will get a warning for using a third-party service. Click on **Continue**.
-
-<img src="img/pbi_third_party_warning_amz.png" width="500">
-
-4. Enter host and port values and select your preferred SSL and Certificate validation options. Click on **OK**.
-
-<img src="img/pbi_connection_string_options_amz.png" width="500">
-
-5. Select authentication option. Enter credentials if required and click on **Connect**.
-
-<img src="img/pbi_auth_amz.png" width="500">
-
-6. Select required table. Data preview will be loaded.
-
-<img src="img/pbi_data_preview.png">
-
-7. Click on **Load**.
-
-8. Select required columns for creating a graph.
-
-<img src="img/pbi_simple_graph.png">
-
-
-## Troubleshooting 
-
-* If you get the following error, please install the [OpenSearch SQL ODBC Driver](https://docs-beta.opensearch.org/search-plugins/sql/odbc/).
-
-<img src="img/pbi_error_driver_not_installed.png" width="350">
-
-* If you get the following error,
-
-<img src="img/pbi_error_conn.png" width="350">
-
-1. Check if host and port values are correct.
-2. Check if auth credentials are correct.
-3. Check if server is running.
-
-## Limitations and Known issues
-
-There are known limitations and issues that are tracked by OpenSearch including the items listed below.
-
-| Issue | Description |
-| ---- | ----------- |
-| [Visualizations without numerical columns](https://github.com/opensearch-project/sql/issues/347) | Visualizations is only supported if there is a numerical column included due to a known limitation in OpenSearch regarding subqueries. An exception to this would be visualizations with columns only of type string is supported as well. |
-| [Visualizations with First or Last options selected are not yet supported](https://github.com/opensearch-project/sql/issues/279) | First and Last options generate an sql query that uses MAX and MIN for strings which is not yet supported in OpenSearch |
-| [Visualizations with aggregate functions selected are not yet supported](https://github.com/opensearch-project/sql/issues/363) | Specifically Minimum, Maximum, Standard deviation, Variance, or Median options are not yet supported. |
-| [Basic filtering limitations](https://github.com/opensearch-project/sql/issues/347) | Selecting more than one value is not yet supported when using basic filtering. Due to the issue in the first row of this table, selecting one value for basic filtering when there is no numerical column is not yet supported. |
-| [Top N filtering limitations](https://opensearch.org/docs/latest/search-plugins/sql/limitation/) | OpenSearch has limitations on subquery which does not yet support the Top N filtering functionality. |
-| [Advanced filtering limitations](https://github.com/opensearch-project/sql/issues/308) | `does not contain` and `does not start with` filters for string columns are not yet supported. All advanced filtering for numerical columns are not yet supported except for `is` and `is blank`. All advanced filtering for date and time columns are not yet supported except for `is blank` and `is not blank`. |
-| [Relative Date filtering limitations](https://github.com/opensearch-project/sql/issues/364) | Due to a known timestamp issue in OpenSearch, all relative date filtering is not yet supported. |
diff --git a/bi-connectors/PowerBIConnector/AmazonOpenSearchService.mez b/bi-connectors/PowerBIConnector/AmazonOpenSearchService.mez
deleted file mode 100644
index 0f18dfe060..0000000000
Binary files a/bi-connectors/PowerBIConnector/AmazonOpenSearchService.mez and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/CHANGELOG.md b/bi-connectors/PowerBIConnector/CHANGELOG.md
deleted file mode 100644
index 080208c4e7..0000000000
--- a/bi-connectors/PowerBIConnector/CHANGELOG.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Changelog
-All notable changes to the connector will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [1.0.1] 2022-02-28
-### Added
-- Allow users to enable or disable validation for SSL certificate validation.
-### Changed
-- Changed beta to false
diff --git a/bi-connectors/PowerBIConnector/OpenSearchProject.md b/bi-connectors/PowerBIConnector/OpenSearchProject.md
deleted file mode 100644
index 966c55a7e4..0000000000
--- a/bi-connectors/PowerBIConnector/OpenSearchProject.md
+++ /dev/null
@@ -1,79 +0,0 @@
-#  Connecting OpenSearch Project to Microsoft Power BI Desktop
-
->[!Note]
-
->The following connector article is provided by OpenSearch, the owner of this connector and a member of the Microsoft Power Query Connector Certification Program. If you have questions regarding the content of this article or have changes you would like to see made to this article, visit the OpenSearch website and use the support channels there.
-
-## Summary
-| Item | Description |
-| ---- | ----------- |
-| Release State | General Availability |
-| Products | Power BI Desktop |
-| Authentication Types Supported | Basic |
-
-## Prerequisites
-* Microsoft Power BI Desktop
-* [OpenSearch](https://opensearch.org/docs/latest/opensearch/install/index/)
-* [OpenSearch SQL ODBC driver](https://opensearch.org/docs/latest/search-plugins/sql/odbc/)
-
-## Capabilities supported
-* Import
-* DirectQuery
-
-## Connect to OpenSearch Project
-1. Open Power BI Desktop.
-
-2. Click on **Home** > **Get Data** > **More** > **Other**. Select **OpenSearch Project**. Click on **Connect**.
-
-<img src="img/pbi_select_connector.png" width="500">
-
-3. You will get a warning for using a third-party service. Click on **Continue**.
-
-<img src="img/pbi_third_party_warning.png" width="500">
-
-4. Enter host and port values and select your preferred SSL and Certificate validation options. Click on **OK**.
-
-<img src="img/pbi_connection_string_options.png" width="500">
-
-5. Select authentication option. Enter credentials if required and click on **Connect**.
-
-<img src="img/pbi_auth.png" width="500">
-
-6. Select required table. Data preview will be loaded.
-
-<img src="img/pbi_data_preview.png">
-
-7. Click on **Load**.
-
-8. Select required columns for creating a graph.
-
-<img src="img/pbi_simple_graph.png">
-
-
-## Troubleshooting 
-
-* If you get the following error, please install the [OpenSearch SQL ODBC Driver](https://docs-beta.opensearch.org/search-plugins/sql/odbc/).
-
-<img src="img/pbi_error_driver_not_installed.png" width="350">
-
-* If you get the following error,
-
-<img src="img/pbi_error_conn.png" width="350">
-
-1. Check if host and port values are correct.
-2. Check if auth credentials are correct.
-3. Check if server is running.
-
-## Limitations and Known issues
-
-There are known limitations and issues that are tracked by OpenSearch including the items listed below.
-
-| Issue | Description |
-| ---- | ----------- |
-| [Visualizations without numerical columns](https://github.com/opensearch-project/sql/issues/347) | Visualizations is only supported if there is a numerical column included due to a known limitation in OpenSearch regarding subqueries. An exception to this would be visualizations with columns only of type string is supported as well. |
-| [Visualizations with First or Last options selected are not yet supported](https://github.com/opensearch-project/sql/issues/279) | First and Last options generate an sql query that uses MAX and MIN for strings which is not yet supported in OpenSearch |
-| [Visualizations with aggregate functions selected are not yet supported](https://github.com/opensearch-project/sql/issues/363) | Specifically Minimum, Maximum, Standard deviation, Variance, or Median options are not yet supported. |
-| [Basic filtering limitations](https://github.com/opensearch-project/sql/issues/347) | Selecting more than one value is not yet supported when using basic filtering. Due to the issue in the first row of this table, selecting one value for basic filtering when there is no numerical column is not yet supported. |
-| [Top N filtering limitations](https://opensearch.org/docs/latest/search-plugins/sql/limitation/) | OpenSearch has limitations on subquery which does not yet support the Top N filtering functionality. |
-| [Advanced filtering limitations](https://github.com/opensearch-project/sql/issues/308) | `does not contain` and `does not start with` filters for string columns are not yet supported. All advanced filtering for numerical columns are not yet supported except for `is` and `is blank`. All advanced filtering for date and time columns are not yet supported except for `is blank` and `is not blank`. |
-| [Relative Date filtering limitations](https://github.com/opensearch-project/sql/issues/364) | Due to a known timestamp issue in OpenSearch, all relative date filtering is not yet supported. |
diff --git a/bi-connectors/PowerBIConnector/OpenSearchProject.mez b/bi-connectors/PowerBIConnector/OpenSearchProject.mez
deleted file mode 100644
index efe442b6ba..0000000000
Binary files a/bi-connectors/PowerBIConnector/OpenSearchProject.mez and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids b/bi-connectors/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids
deleted file mode 100644
index 1b10587631..0000000000
--- a/bi-connectors/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "version": "0.1",
-    "connections": [
-        {
-            "details": {
-                "protocol": "sqlodbc",
-                "address": {
-                    "server": "localhost:9200"
-                }
-            },
-            "mode": "Import"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/bi-connectors/PowerBIConnector/README.md b/bi-connectors/PowerBIConnector/README.md
deleted file mode 100644
index 8632dc961c..0000000000
--- a/bi-connectors/PowerBIConnector/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## Connector Download
-
-The Power BI connector is available to download from the automated CI workflow: [link](https://github.com/opensearch-project/sql/actions/workflows/bi-connectors.yml).
-The release snapshots are also available here: [OpenSearch Project](OpenSearchProject.mez) and [Amazon OpenSearch Service](AmazonOpenSearchService.mez).
-
-## Connector Install
-
-1. Put connector `mez` file into: `C:\Users\%USERNAME%\Documents\Power BI Desktop\Custom Connectors`.
-2. Install OpenSearch `ODBC` [driver](../../sql-odbc/README.md).
-3. Run `Power BI Desktop`.
-4. Check under `File | Options and settings | Options | Security | Data Extensions` option `(Not Recommended) Allow any extension to load without validation or warning in Power BI Desktop`:
-<img src="img/pbi_settings.png">
-6. Restart `Power BI Desktop`.
-
-## See also
-
-* [Changelog](CHANGELOG.md)
-* Installation instructions for
-  * [OpenSearch Project connector](OpenSearchProject.md)
-  * [Amazon OpenSearch Service connector](AmazonOpenSearchService.md)
-* Connector user manual for
-  * [Power BI Service](power_bi_service_support.md)
-  * [Power BI Desktop](power_bi_support.md)
\ No newline at end of file
diff --git a/bi-connectors/PowerBIConnector/img/pbi_auth.png b/bi-connectors/PowerBIConnector/img/pbi_auth.png
deleted file mode 100644
index 5af0eda576..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_auth.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_auth_amz.png b/bi-connectors/PowerBIConnector/img/pbi_auth_amz.png
deleted file mode 100644
index 3c63ed27a2..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_auth_amz.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_connection_string_options.png b/bi-connectors/PowerBIConnector/img/pbi_connection_string_options.png
deleted file mode 100644
index b7bf7f3ce1..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_connection_string_options.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_connection_string_options_amz.png b/bi-connectors/PowerBIConnector/img/pbi_connection_string_options_amz.png
deleted file mode 100644
index aff8ddc984..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_connection_string_options_amz.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_data_preview.png b/bi-connectors/PowerBIConnector/img/pbi_data_preview.png
deleted file mode 100644
index b26bcee6be..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_data_preview.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_disable_parallel_loading_tables.png b/bi-connectors/PowerBIConnector/img/pbi_disable_parallel_loading_tables.png
deleted file mode 100644
index 4e12022e9e..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_disable_parallel_loading_tables.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_error_conn.png b/bi-connectors/PowerBIConnector/img/pbi_error_conn.png
deleted file mode 100644
index 261999ab80..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_error_conn.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_error_driver_not_installed.png b/bi-connectors/PowerBIConnector/img/pbi_error_driver_not_installed.png
deleted file mode 100644
index 76f5da35fb..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_error_driver_not_installed.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_gateway_connector_path.png b/bi-connectors/PowerBIConnector/img/pbi_gateway_connector_path.png
deleted file mode 100644
index 057882bc93..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_gateway_connector_path.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_gateway_status.png b/bi-connectors/PowerBIConnector/img/pbi_gateway_status.png
deleted file mode 100644
index c7f4272ad6..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_gateway_status.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_publish_report.png b/bi-connectors/PowerBIConnector/img/pbi_publish_report.png
deleted file mode 100644
index a04e66aeb1..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_publish_report.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_publish_status.png b/bi-connectors/PowerBIConnector/img/pbi_publish_status.png
deleted file mode 100644
index 8978c94860..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_publish_status.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_select_connector.png b/bi-connectors/PowerBIConnector/img/pbi_select_connector.png
deleted file mode 100644
index 33188b97a3..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_select_connector.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_select_connector_amz.png b/bi-connectors/PowerBIConnector/img/pbi_select_connector_amz.png
deleted file mode 100644
index 25677e12c7..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_select_connector_amz.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_select_workspace.png b/bi-connectors/PowerBIConnector/img/pbi_select_workspace.png
deleted file mode 100644
index 8d89fe3073..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_select_workspace.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_service_cluster_setting.png b/bi-connectors/PowerBIConnector/img/pbi_service_cluster_setting.png
deleted file mode 100644
index 8c6f46f5b8..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_service_cluster_setting.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_service_data_source.png b/bi-connectors/PowerBIConnector/img/pbi_service_data_source.png
deleted file mode 100644
index 95700aab8b..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_service_data_source.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_service_data_source_success.png b/bi-connectors/PowerBIConnector/img/pbi_service_data_source_success.png
deleted file mode 100644
index aa09fdb45f..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_service_data_source_success.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_service_dataset_gateway.png b/bi-connectors/PowerBIConnector/img/pbi_service_dataset_gateway.png
deleted file mode 100644
index e73eae7084..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_service_dataset_gateway.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_service_dataset_refresh.png b/bi-connectors/PowerBIConnector/img/pbi_service_dataset_refresh.png
deleted file mode 100644
index 4170494d8a..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_service_dataset_refresh.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_service_dataset_refresh_history.png b/bi-connectors/PowerBIConnector/img/pbi_service_dataset_refresh_history.png
deleted file mode 100644
index 3810003117..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_service_dataset_refresh_history.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_service_edit_reoprt.png b/bi-connectors/PowerBIConnector/img/pbi_service_edit_reoprt.png
deleted file mode 100644
index 0e8aff6a63..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_service_edit_reoprt.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_service_modified_report.png b/bi-connectors/PowerBIConnector/img/pbi_service_modified_report.png
deleted file mode 100644
index 098485fba7..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_service_modified_report.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_service_setting.png b/bi-connectors/PowerBIConnector/img/pbi_service_setting.png
deleted file mode 100644
index 574aba671d..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_service_setting.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_settings.png b/bi-connectors/PowerBIConnector/img/pbi_settings.png
deleted file mode 100644
index ebd9ce0284..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_settings.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_simple_graph.png b/bi-connectors/PowerBIConnector/img/pbi_simple_graph.png
deleted file mode 100644
index 9174de438b..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_simple_graph.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_third_party_warning.png b/bi-connectors/PowerBIConnector/img/pbi_third_party_warning.png
deleted file mode 100644
index f05502ad57..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_third_party_warning.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/img/pbi_third_party_warning_amz.png b/bi-connectors/PowerBIConnector/img/pbi_third_party_warning_amz.png
deleted file mode 100644
index 48a11a86f0..0000000000
Binary files a/bi-connectors/PowerBIConnector/img/pbi_third_party_warning_amz.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/power_bi_service_support.md b/bi-connectors/PowerBIConnector/power_bi_service_support.md
deleted file mode 100644
index 1ccb20ccea..0000000000
--- a/bi-connectors/PowerBIConnector/power_bi_service_support.md
+++ /dev/null
@@ -1,82 +0,0 @@
-#  Connecting OpenSearch to Microsoft Power BI Service
-
-## Setup
-* Download and Install [On-premises data gateway](https://docs.microsoft.com/en-us/data-integration/gateway/service-gateway-install)
-* Change the path for custom data connector folder in On-premises data gateway so that the gateway can find the custom connector.
-> NOTE: Ensure the gateway service account (**PBIEgwService**) has permissions to access the custom connector folder. Alternatively, you can copy connector file to `C:\Windows\ServiceProfiles\PBIEgwService\Documents\Power BI Desktop\Custom Connectors\`.
-
-<img src="img/pbi_gateway_connector_path.png" width=500>
-
-* Verify the status of data gateway is ready to be used.
-
-<img src="img/pbi_gateway_status.png" width=500>
-
-* Login to Power BI Service.
-* Click on **Setting** > **Manage Gateway**.
-
-<img src="img/pbi_service_setting.png" width=400>
-
-* Select **Allow user's custom data connectors to refresh through this gateway cluster(preview)**. Click on **Apply**.
-
-<img src="img/pbi_service_cluster_setting.png">
-
-* Click on **Add data sources to use the gateway**.
-* Select Data Source Type as **OpenSearch**.
-* Enter Data Source Name and Server values.
-* Select required **Authentication Method**. Select **Anonymous** for auth **NONE**.
-For **AWS_SIGV4**, select **Key** and set aws access credentials for user **PBIEgwService** at path `C:\Windows\ServiceProfiles\PBIEgwService\.aws\`
-
-* Select Encryption mode for connection.
-* Click on **Add**.
-
-<img src="img/pbi_service_data_source.png" width=650>
-
-* You will get a **Connection Successful** message.
-
-<img src="img/pbi_service_data_source_success.png" width=650>
-
-
-## Publish Report
-
-* Follow [instructions](./power_bi_support.md) to create graph using OpenSearch Data connector.
-* Click on **Publish** to publish the report on Power BI service.
-
-<img src="img/pbi_publish_report.png">
-
-* Select destination and click on **Select**.
-
-<img src="img/pbi_select_workspace.png" width=400>
-
-* You will get a success message when report is published.
-
-<img src="img/pbi_publish_status.png" width=400>
-
-* Click on **Open '%report name%' in Power BI** to open published report in Power BI service.
-
-## Modify report using Power BI Service
-
-* Click on **Edit report** to modfify report.
-
-<img src="img/pbi_service_edit_reoprt.png">
-
-* Use **Filters**,**Visualizations** and **Fields** to modify report.
-
-<img src="img/pbi_service_modified_report.png">
-
-## Dataset Scheduled Refresh
-
-* Click on **Settings** > **Datasets**.
-* Select required Gateway and click on **Apply**.
-
-<img src="img/pbi_service_dataset_gateway.png" width=800>
-
-* Turn on Keep your data up to date option.
-* Select refresh frequency and timezone.
-* Add email for failure notifications if required.
-* Click on **Apply**.
-
-<img src="img/pbi_service_dataset_refresh.png" width=550>
-
-* You can also check history by clicking on **Refresh history**.
-
-<img src="img/pbi_service_dataset_refresh_history.png" width=550>
\ No newline at end of file
diff --git a/bi-connectors/PowerBIConnector/power_bi_support.md b/bi-connectors/PowerBIConnector/power_bi_support.md
deleted file mode 100644
index 2c5451a684..0000000000
--- a/bi-connectors/PowerBIConnector/power_bi_support.md
+++ /dev/null
@@ -1,100 +0,0 @@
-#  Connecting OpenSearch to Microsoft Power BI Desktop
-
-## Prerequisites
-* Microsoft Power BI Desktop
-* [OpenSearch](https://docs-beta.opensearch.org/opensearch/install/index/)
-* [OpenSearch SQL ODBC driver](https://docs-beta.opensearch.org/search-plugins/sql/odbc/)
-* [OpenSearchProject.mez](OpenSearchProject.mez) or [AmazonOpenSearchService.mez](AmazonOpenSearchService.mez)
-* Optional: [sqlodbc_import.pbids](PBIDSExamples/sqlodbc_import.pbids) to help with repeated connections to the same server 
-
-## Setup
-* Copy `mez` file in the `<User>\Documents\Power BI Desktop\Custom Connectors\` folder. This will let Power BI access custom connector.
-* Open Power BI Desktop.
-* Change the security settings. Click on **Files** > **Options and settings** > **Options** > **Security** > Select **Allow any extension to load without validation or warning** for Data Extensions. This will allow the custom connector to load data into Power BI.
-
-<img src="img/pbi_settings.png" width="500">
-
-* Restart Power BI Desktop.
-
-## Load Data
-
-> **NOTE**: Currently only import mode is supported. Direct query support will be added soon.
-
-* Open Power BI Desktop.
-
-* Disable parallel loading of tables. Click on **Files** > **Options and settings** > **Options** > **CURRENT FILE** > **Data Load** > Deselect **Enable parallel loading of tables** and click **OK**.
-
-<img src="img/pbi_disable_parallel_loading_tables.png"  width="500">
-
-* Click on **Home** > **Get Data** > **More** > **Other**. Select **OpenSearch Project**. Click on **Connect**.
-
-<img src="img/pbi_select_connector.png" width="500">
-
-* You will get a warning for using a third-party service. Click on **Continue**.
-
-<img src="img/pbi_third_party_warning.png" width="500">
-
-* Enter host and port values and select your preferred SSL option. Click on **OK**.
-
-<img src="img/pbi_connection_string_options.png" width="500">
-
-* Select authentication option. Enter credentials if required and click on **Connect**.
-
-<img src="img/pbi_auth.png" width="500">
-
-* Select required table. Data preview will be loaded.
-
-<img src="img/pbi_data_preview.png">
-
-* Click on **Load**.
-
-* Select required columns for creating graph.
-
-<img src="img/pbi_simple_graph.png">
-
-## Using .PBIDS Files
-
-More info: https://docs.microsoft.com/en-us/power-bi/connect-data/desktop-data-sources#using-pbids-files-to-get-data
-
-Example PBIDS file for OpenSearch: (available here: [sqlodbc_import.pbids](PBIDSExamples/sqlodbc_import.pbids))
-```json
-{
-    "version": "0.1",
-    "connections": [
-        {
-            "details": {
-                "protocol": "sqlodbc",
-                "address": {
-                    "server": "localhost:9200"
-                }
-            },
-            "mode": "Import"
-        }
-    ]
-}
-```
-
-The only part you should change is the `server` attribute, to point to the location of your OpenSearch server.
-* For AWS connections, this will be the full path of your OpenSearch instance (ex: `https://aws-opensearch-instance.us-west-1.com`).
-* Otherwise, this will be the `host:port` combination for your instance (ex: `localhost:9200`).
-
-Save this as a `.pbids` file. Double-click on it to open up your connection in Power BI Desktop.
-It will take you straight to the **Navigator** window for selecting the tables from the OpenSearch server.
-* If this is the first time you are connecting to this instance, you will be prompted for your credentials.
-
-<img src="img/pbi_auth.png" width="500">
-
-## Troubleshooting 
-
-* If you get an following error, please install [OpenSearch SQL ODBC Driver](https://docs-beta.opensearch.org/search-plugins/sql/odbc/).
-
-<img src="img/pbi_error_driver_not_installed.png" width="350">
-
-* If you get an following error,
-
-<img src="img/pbi_error_conn.png" width="350">
-
-1. Check if host and port values are correct.
-2. Check if auth credentials are correct.
-3. Check if server is running.
-
diff --git a/bi-connectors/PowerBIConnector/src/Diagnostics.pqm b/bi-connectors/PowerBIConnector/src/Diagnostics.pqm
deleted file mode 100644
index ca10c3cf98..0000000000
--- a/bi-connectors/PowerBIConnector/src/Diagnostics.pqm
+++ /dev/null
@@ -1,275 +0,0 @@
-let
-    Diagnostics.LogValue = (prefix, value) => Diagnostics.Trace(TraceLevel.Information, prefix & ": " & (try Diagnostics.ValueToText(value) otherwise "<error getting value>"), value),
-    Diagnostics.LogValue2 = (prefix, value, result, optional delayed) => Diagnostics.Trace(TraceLevel.Information, prefix & ": " & Diagnostics.ValueToText(value), result, delayed),    
-    Diagnostics.LogFailure = (text, function) =>
-        let
-            result = try function()
-        in
-            if result[HasError] then Diagnostics.LogValue2(text, result[Error], () => error result[Error], true) else result[Value],
-
-    Diagnostics.WrapFunctionResult = (innerFunction as function, outerFunction as function) as function =>
-        Function.From(Value.Type(innerFunction), (list) => outerFunction(() => Function.Invoke(innerFunction, list))),
-
-    Diagnostics.WrapHandlers = (handlers as record) as record =>
-        Record.FromList(
-            List.Transform(
-                Record.FieldNames(handlers),
-                (h) => Diagnostics.WrapFunctionResult(Record.Field(handlers, h), (fn) => Diagnostics.LogFailure(h, fn))),
-            Record.FieldNames(handlers)),
-
-    Diagnostics.ValueToText = (value) =>
-        let
-            _canBeIdentifier = (x) =>
-                                            let
-                                                keywords = {"and", "as", "each", "else", "error", "false", "if", "in", "is", "let", "meta", "not", "otherwise", "or", "section", "shared", "then", "true", "try", "type" },
-                                                charAlpha = (c as number) => (c>= 65 and c <= 90) or (c>= 97 and c <= 122) or c=95,
-                                                charDigit = (c as number) => c>= 48 and c <= 57
-                                            in
-                                                try
-                                                    charAlpha(Character.ToNumber(Text.At(x,0))) 
-                                                    and
-                                                        List.MatchesAll(
-                                                            Text.ToList(x),
-                                                            (c)=> let num = Character.ToNumber(c) in charAlpha(num) or charDigit(num)
-                                                        )
-                                                    and not 
-                                                        List.MatchesAny( keywords, (li)=> li=x )
-                                                otherwise 
-                                                    false,
-    
-            Serialize.Binary =      (x) => "#binary(" & Serialize(Binary.ToList(x)) & ") ",
-
-            Serialize.Date =        (x) => "#date(" & 
-                                           Text.From(Date.Year(x))  & ", " & 
-                                           Text.From(Date.Month(x)) & ", " & 
-                                           Text.From(Date.Day(x))   & ") ",
-
-            Serialize.Datetime =    (x) => "#datetime(" &
-                                           Text.From(Date.Year(DateTime.Date(x)))    & ", " &
-                                           Text.From(Date.Month(DateTime.Date(x)))   & ", " &
-                                           Text.From(Date.Day(DateTime.Date(x)))     & ", " &
-                                           Text.From(Time.Hour(DateTime.Time(x)))    & ", " &
-                                           Text.From(Time.Minute(DateTime.Time(x)))  & ", " &
-                                           Text.From(Time.Second(DateTime.Time(x)))  & ") ",
-
-            Serialize.Datetimezone =(x) => let 
-                                              dtz = DateTimeZone.ToRecord(x) 
-                                           in
-                                              "#datetimezone(" & 
-                                              Text.From(dtz[Year])        & ", " &
-                                              Text.From(dtz[Month])       & ", " &
-                                              Text.From(dtz[Day])         & ", " &
-                                              Text.From(dtz[Hour])        & ", " &
-                                              Text.From(dtz[Minute])      & ", " &
-                                              Text.From(dtz[Second])      & ", " &
-                                              Text.From(dtz[ZoneHours])   & ", " &
-                                              Text.From(dtz[ZoneMinutes]) & ") ",
-
-            Serialize.Duration =    (x) => let
-                                              dur = Duration.ToRecord(x)
-                                           in
-                                              "#duration(" &
-                                              Text.From(dur[Days])    & ", " &
-                                              Text.From(dur[Hours])   & ", " &
-                                              Text.From(dur[Minutes]) & ", " &
-                                              Text.From(dur[Seconds]) & ") ",
-
-            Serialize.Function =    (x) => _serialize_function_param_type(
-                                              Type.FunctionParameters(Value.Type(x)),
-                                              Type.FunctionRequiredParameters(Value.Type(x)) ) &
-                                           " as " &
-                                           _serialize_function_return_type(Value.Type(x)) &
-                                           " => (...) ",
-
-            Serialize.List =        (x) => "{" & 
-                                           List.Accumulate(x, "", (seed,item) => if seed="" then Serialize(item) else seed & ", " & Serialize(item)) &
-                                           "} ",
-
-            Serialize.Logical =     (x) => Text.From(x),
-
-            Serialize.Null =        (x) => "null",
-
-            Serialize.Number =      (x) => 
-                                        let Text.From = (i as number) as text => 
-                                            if Number.IsNaN(i) then "#nan" else
-                                            if i=Number.PositiveInfinity then "#infinity" else
-                                            if i=Number.NegativeInfinity then "-#infinity" else
-                                            Text.From(i)
-                                        in
-                                            Text.From(x),
-
-            Serialize.Record =      (x) => "[ " &
-                                           List.Accumulate(
-                                                Record.FieldNames(x), 
-                                                "", 
-                                                (seed,item) => 
-                                                    (if seed="" then Serialize.Identifier(item) else seed & ", " & Serialize.Identifier(item)) & " = " & Serialize(Record.Field(x, item))
-                                           ) &
-                                           " ] ",
-
-            Serialize.Table =       (x) => "#table( type " &
-                                            _serialize_table_type(Value.Type(x)) &
-                                            ", " &
-                                            Serialize(Table.ToRows(x)) &
-                                            ") ",
-                                    
-            Serialize.Text =        (x) => """" & 
-                                           _serialize_text_content(x) & 
-                                           """",
-
-            _serialize_text_content =  (x) => let 
-                                                escapeText = (n as number) as text => "#(#)(" & Text.PadStart(Number.ToText(n, "X", "en-US"), 4, "0") & ")"
-                                            in
-                                            List.Accumulate(
-                                               List.Transform(
-                                                   Text.ToList(x),
-                                                   (c) => let n=Character.ToNumber(c) in 
-                                                            if n = 9   then "#(#)(tab)" else
-                                                            if n = 10  then "#(#)(lf)"  else
-                                                            if n = 13  then "#(#)(cr)"  else
-                                                            if n = 34  then """"""      else
-                                                            if n = 35  then "#(#)(#)"   else
-                                                            if n < 32  then escapeText(n) else 
-                                                            if n < 127 then Character.FromNumber(n) else 
-                                                            escapeText(n) 
-                                                ),
-                                                "",
-                                                (s,i)=>s&i
-                                            ),
-        
-            Serialize.Identifier =   (x) => 
-                                            if _canBeIdentifier(x) then 
-                                                x 
-                                            else 
-                                                "#""" &
-                                                _serialize_text_content(x) &
-                                                """",
-
-            Serialize.Time =        (x) => "#time(" &
-                                           Text.From(Time.Hour(x))   & ", " & 
-                                           Text.From(Time.Minute(x)) & ", " & 
-                                           Text.From(Time.Second(x)) & ") ",
-                                
-            Serialize.Type =        (x) => "type " & _serialize_typename(x),
-                                    
-                             
-            _serialize_typename =    (x, optional funtype as logical) =>                        /* Optional parameter: Is this being used as part of a function signature? */
-                                        let
-                                            isFunctionType = (x as type) => try if Type.FunctionReturn(x) is type then true else false otherwise false,
-                                            isTableType = (x as type) =>  try if Type.TableSchema(x) is table then true else false otherwise false,
-                                            isRecordType = (x as type) => try if Type.ClosedRecord(x) is type then true else false otherwise false,
-                                            isListType = (x as type) => try if Type.ListItem(x) is type then true else false otherwise false
-                                        in
-                                
-                                            if funtype=null and isTableType(x) then _serialize_table_type(x) else
-                                            if funtype=null and isListType(x) then "{ " & @_serialize_typename( Type.ListItem(x) ) & " }" else
-                                            if funtype=null and isFunctionType(x) then "function " & _serialize_function_type(x) else
-                                            if funtype=null and isRecordType(x) then _serialize_record_type(x) else
-                                    
-                                            if x = type any then "any" else
-                                            let base = Type.NonNullable(x) in
-                                              (if Type.IsNullable(x) then "nullable " else "") &       
-                                              (if base = type anynonnull then "anynonnull" else                
-                                              if base = type binary then "binary" else                
-                                              if base = type date   then "date"   else
-                                              if base = type datetime then "datetime" else
-                                              if base = type datetimezone then "datetimezone" else
-                                              if base = type duration then "duration" else
-                                              if base = type logical then "logical" else
-                                              if base = type none then "none" else
-                                              if base = type null then "null" else
-                                              if base = type number then "number" else
-                                              if base = type text then "text" else 
-                                              if base = type time then "time" else 
-                                              if base = type type then "type" else 
-                                      
-                                              /* Abstract types: */
-                                              if base = type function then "function" else
-                                              if base = type table then "table" else
-                                              if base = type record then "record" else
-                                              if base = type list then "list" else
-                                      
-                                              "any /*Actually unknown type*/"),
-
-            _serialize_table_type =     (x) => 
-                                               let 
-                                                 schema = Type.TableSchema(x)
-                                               in
-                                                 "table " &
-                                                 (if Table.IsEmpty(schema) then "" else 
-                                                     "[" & List.Accumulate(
-                                                        List.Transform(
-                                                            Table.ToRecords(Table.Sort(schema,"Position")),
-                                                            each Serialize.Identifier(_[Name]) & " = " & _[Kind]),
-                                                        "",
-                                                        (seed,item) => (if seed="" then item else seed & ", " & item )
-                                                    ) & "] " ),
-
-            _serialize_record_type =    (x) => 
-                                                let flds = Type.RecordFields(x)
-                                                in
-                                                    if Record.FieldCount(flds)=0 then "record" else
-                                                        "[" & List.Accumulate(
-                                                            Record.FieldNames(flds),
-                                                            "",
-                                                            (seed,item) => 
-                                                                seed &
-                                                                (if seed<>"" then ", " else "") &
-                                                                (Serialize.Identifier(item) & "=" & _serialize_typename(Record.Field(flds,item)[Type]) )
-                                                        ) & 
-                                                        (if Type.IsOpenRecord(x) then ",..." else "") &
-                                                        "]",
-
-            _serialize_function_type =  (x) => _serialize_function_param_type(
-                                                  Type.FunctionParameters(x),
-                                                  Type.FunctionRequiredParameters(x) ) &
-                                                " as " &
-                                                _serialize_function_return_type(x),
-    
-            _serialize_function_param_type = (t,n) => 
-                                    let
-                                        funsig = Table.ToRecords(
-                                            Table.TransformColumns(
-                                                Table.AddIndexColumn( Record.ToTable( t ), "isOptional", 1 ),
-                                                { "isOptional", (x)=> x>n } ) )
-                                    in
-                                        "(" & 
-                                        List.Accumulate(
-                                            funsig,
-                                            "",
-                                            (seed,item)=>
-                                                (if seed="" then "" else seed & ", ") &
-                                                (if item[isOptional] then "optional " else "") &
-                                                Serialize.Identifier(item[Name]) & " as " & _serialize_typename(item[Value], true) )
-                                         & ")",
-
-            _serialize_function_return_type = (x) => _serialize_typename(Type.FunctionReturn(x), true), 
-
-            Serialize = (x) as text => 
-                               if x is binary       then try Serialize.Binary(x) otherwise "null /*serialize failed*/"        else 
-                               if x is date         then try Serialize.Date(x) otherwise "null /*serialize failed*/"          else 
-                               if x is datetime     then try Serialize.Datetime(x) otherwise "null /*serialize failed*/"      else 
-                               if x is datetimezone then try Serialize.Datetimezone(x) otherwise "null /*serialize failed*/"  else 
-                               if x is duration     then try Serialize.Duration(x) otherwise "null /*serialize failed*/"      else 
-                               if x is function     then try Serialize.Function(x) otherwise "null /*serialize failed*/"      else 
-                               if x is list         then try Serialize.List(x) otherwise "null /*serialize failed*/"          else 
-                               if x is logical      then try Serialize.Logical(x) otherwise "null /*serialize failed*/"       else
-                               if x is null         then try Serialize.Null(x) otherwise "null /*serialize failed*/"          else
-                               if x is number       then try Serialize.Number(x) otherwise "null /*serialize failed*/"        else
-                               if x is record       then try Serialize.Record(x) otherwise "null /*serialize failed*/"        else 
-                               if x is table        then try Serialize.Table(x) otherwise "null /*serialize failed*/"         else 
-                               if x is text         then try Serialize.Text(x) otherwise "null /*serialize failed*/"          else 
-                               if x is time         then try Serialize.Time(x) otherwise "null /*serialize failed*/"          else 
-                               if x is type         then try Serialize.Type(x) otherwise "null /*serialize failed*/"          else 
-                               "[#_unable_to_serialize_#]"                     
-        in
-            try Serialize(value) otherwise "<serialization failed>"
-in
-    [ 
-        LogValue = Diagnostics.LogValue,
-        LogValue2 = Diagnostics.LogValue2,
-        LogFailure = Diagnostics.LogFailure,
-        WrapFunctionResult = Diagnostics.WrapFunctionResult,
-        WrapHandlers = Diagnostics.WrapHandlers,
-        ValueToText = Diagnostics.ValueToText
-    ]
\ No newline at end of file
diff --git a/bi-connectors/PowerBIConnector/src/OdbcConstants.pqm b/bi-connectors/PowerBIConnector/src/OdbcConstants.pqm
deleted file mode 100644
index 144e525413..0000000000
--- a/bi-connectors/PowerBIConnector/src/OdbcConstants.pqm
+++ /dev/null
@@ -1,1253 +0,0 @@
-// values from https://github.com/Microsoft/ODBC-Specification/blob/master/Windows/inc/sqlext.h
-[
-    Flags = (flags as list) => 
-        if (List.IsEmpty(flags)) then 0 else
-        let
-            Loop = List.Generate(()=> [i = 0, Combined = flags{0}],
-                                    each [i] < List.Count(flags),
-                                    each [Combined = Number.BitwiseOr([Combined], flags{i}), i = [i]+1],
-                                    each [Combined]),
-            Result = List.Last(Loop)
-        in
-            Result,
-
-    SQL_HANDLE =
-    [
-        ENV = 1,
-        DBC = 2,
-        STMT = 3,
-        DESC = 4
-    ],
-
-    RetCode =
-    [
-        SUCCESS = 0,
-        SUCCESS_WITH_INFO = 1,
-        ERROR = -1,
-        INVALID_HANDLE = -2,
-        NO_DATA = 100
-    ],
-
-    SQL_CONVERT =
-    [
-        BIGINT = 53,
-        BINARY = 54,
-        BIT = 55,
-        CHAR = 56,
-        DATE = 57,
-        DECIMAL = 58,
-        DOUBLE = 59,
-        FLOAT = 60,
-        INTEGER = 61,
-        LONGVARCHAR = 62,
-        NUMERIC = 63,
-        REAL = 64,
-        SMALLINT = 65,
-        TIME = 66,
-        TIMESTAMP = 67,
-        TINYINT = 68,
-        VARBINARY = 69,
-        VARCHAR = 70,
-        LONGVARBINARY = 71
-    ],
-
-    SQL_ROW =
-    [
-        PROCEED = 0,
-        IGNORE = 1,
-        SUCCESS = 0,
-        DELETED = 1,
-        UPDATED = 2,
-        NOROW = 3,
-        ADDED = 4,
-        ERROR = 5,
-        SUCCESS_WITH_INFO = 6
-    ],
-
-SQL_CVT =
-[
-    //None = 0,
-
-    CHAR = 0x00000001,
-    NUMERIC = 0x00000002,
-    DECIMAL = 0x00000004,
-    INTEGER = 0x00000008,
-    SMALLINT = 0x00000010,
-    FLOAT = 0x00000020,
-    REAL = 0x00000040,
-    DOUBLE = 0x00000080,
-    VARCHAR = 0x00000100,
-    LONGVARCHAR = 0x00000200,
-    BINARY = 0x00000400,
-    VARBINARY = 0x00000800,
-    BIT = 0x00001000,
-    TINYINT = 0x00002000,
-    BIGINT = 0x00004000,
-    DATE = 0x00008000,
-    TIME = 0x00010000,
-    TIMESTAMP = 0x00020000,
-    LONGVARBINARY = 0x00040000,
-    INTERVAL_YEAR_MONTH = 0x00080000,
-    INTERVAL_DAY_TIME = 0x00100000,
-    WCHAR = 0x00200000,
-    WLONGVARCHAR = 0x00400000,
-    WVARCHAR = 0x00800000,
-    GUID = 0x01000000
-],
-
-    STMT =
-    [
-        CLOSE = 0,
-        DROP = 1,
-        UNBIND = 2,
-        RESET_PARAMS = 3
-    ],
-
-    SQL_MAX =
-    [
-        NUMERIC_LEN = 16
-    ],
-
-    SQL_IS =
-    [
-        POINTER = -4,
-        INTEGER = -6,
-        UINTEGER = -5,
-        SMALLINT = -8
-    ],
-
-    //SQL Server specific defines
-    //
-    SQL_HC =                        // from Odbcss.h
-    [
-        OFF = 0,                //  FOR BROWSE columns are hidden
-        ON = 1                //  FOR BROWSE columns are exposed
-    ],
-
-    SQL_NB =                         // from Odbcss.h
-    [
-        OFF = 0,                //  NO_BROWSETABLE is off
-        ON = 1                //  NO_BROWSETABLE is on
-    ],
-
-    //  SQLColAttributes driver specific defines.
-    //  SQLSet/GetDescField driver specific defines.
-    //  Microsoft has 1200 thru 1249 reserved for Microsoft SQL Server driver usage.
-    //
-    SQL_CA_SS =                      // from Odbcss.h
-    [
-        BASE = 1200,           // SQL_CA_SS_BASE
-
-        COLUMN_HIDDEN = 1200 + 11,      //  Column is hidden (FOR BROWSE)
-        COLUMN_KEY = 1200 + 12,      //  Column is key column (FOR BROWSE)
-        VARIANT_TYPE = 1200 + 15,
-        VARIANT_SQL_TYPE = 1200 + 16,
-        VARIANT_SERVER_TYPE = 1200 + 17
-
-    ],
-
-    SQL_SOPT_SS =                    // from Odbcss.h
-    [
-        BASE = 1225,                // SQL_SOPT_SS_BASE
-        HIDDEN_COLUMNS = 1225 + 2,  // Expose FOR BROWSE hidden columns
-        NOBROWSETABLE = 1225 + 3    // Set NOBROWSETABLE option
-    ],
-
-    SQL_COMMIT = 0,      //Commit
-    SQL_ROLLBACK = 1,      //Abort
-
-    //static public readonly IntPtr SQL_AUTOCOMMIT_OFF = IntPtr.Zero;
-    //static public readonly IntPtr SQL_AUTOCOMMIT_ON = new IntPtr(1);
-
-    SQL_TRANSACTION =
-    [
-        READ_UNCOMMITTED = 0x00000001,
-        READ_COMMITTED = 0x00000002,
-        REPEATABLE_READ = 0x00000004,
-        SERIALIZABLE = 0x00000008,
-        SNAPSHOT = 0x00000020 // VSDD 414121: SQL_TXN_SS_SNAPSHOT == 0x20 (sqlncli.h)
-    ],
-
-    SQL_PARAM =
-    [
-        TYPE_UNKNOWN = 0,          // SQL_PARAM_TYPE_UNKNOWN
-        INPUT = 1,                 // SQL_PARAM_INPUT
-        INPUT_OUTPUT = 2,          // SQL_PARAM_INPUT_OUTPUT
-        RESULT_COL =   3,          // SQL_RESULT_COL
-        OUTPUT = 4,                // SQL_PARAM_OUTPUT
-        RETURN_VALUE = 5           // SQL_RETURN_VALUE
-    ],
-
-    SQL_DESC =
-    [
-        // from sql.h (ODBCVER >= 3.0)
-        //
-        COUNT = 1001,
-        TYPE = 1002,
-        LENGTH = 1003,
-        OCTET_LENGTH_PTR = 1004,
-        PRECISION = 1005,
-        SCALE = 1006,
-        DATETIME_INTERVAL_CODE = 1007,
-        NULLABLE = 1008,
-        INDICATOR_PTR = 1009,
-        DATA_PTR = 1010,
-        NAME = 1011,
-        UNNAMED = 1012,
-        OCTET_LENGTH = 1013,
-        ALLOC_TYPE = 1099,
-
-        // from sqlext.h (ODBCVER >= 3.0)
-        //
-        CONCISE_TYPE = SQL_COLUMN[TYPE],
-        DISPLAY_SIZE = SQL_COLUMN[DISPLAY_SIZE],
-        UNSIGNED = SQL_COLUMN[UNSIGNED],
-        UPDATABLE = SQL_COLUMN[UPDATABLE],
-        AUTO_UNIQUE_VALUE = SQL_COLUMN[AUTO_INCREMENT],
-
-        TYPE_NAME = SQL_COLUMN[TYPE_NAME],
-        TABLE_NAME = SQL_COLUMN[TABLE_NAME],
-        SCHEMA_NAME = SQL_COLUMN[OWNER_NAME],
-        CATALOG_NAME = SQL_COLUMN[QUALIFIER_NAME],
-
-        BASE_COLUMN_NAME = 22,
-        BASE_TABLE_NAME = 23,
-
-        NUM_PREC_RADIX = 32
-    ],
-
-    // ODBC version 2.0 style attributes
-    // All IdentifierValues are ODBC 1.0 unless marked differently
-    //
-    SQL_COLUMN =
-    [
-        COUNT = 0,
-        NAME = 1,
-        TYPE = 2,
-        LENGTH = 3,
-        PRECISION = 4,
-        SCALE = 5,
-        DISPLAY_SIZE = 6,
-        NULLABLE = 7,
-        UNSIGNED = 8,
-        MONEY = 9,
-        UPDATABLE = 10,
-        AUTO_INCREMENT = 11,
-        CASE_SENSITIVE = 12,
-        SEARCHABLE = 13,
-        TYPE_NAME = 14,
-        TABLE_NAME = 15,    // (ODBC 2.0)
-        OWNER_NAME = 16,    // (ODBC 2.0)
-        QUALIFIER_NAME = 17,    // (ODBC 2.0)
-        LABEL = 18
-    ],
-
-    // values from sqlext.h
-    SQL_SQL92_RELATIONAL_JOIN_OPERATORS =
-    [
-        CORRESPONDING_CLAUSE = 0x00000001,    // SQL_SRJO_CORRESPONDING_CLAUSE
-        CROSS_JOIN = 0x00000002,    // SQL_SRJO_CROSS_JOIN
-        EXCEPT_JOIN = 0x00000004,    // SQL_SRJO_EXCEPT_JOIN
-        FULL_OUTER_JOIN = 0x00000008,    // SQL_SRJO_FULL_OUTER_JOIN
-        INNER_JOIN = 0x00000010,    // SQL_SRJO_INNER_JOIN
-        INTERSECT_JOIN = 0x00000020,    // SQL_SRJO_INTERSECT_JOIN
-        LEFT_OUTER_JOIN = 0x00000040,    // SQL_SRJO_LEFT_OUTER_JOIN
-        NATURAL_JOIN = 0x00000080,    // SQL_SRJO_NATURAL_JOIN
-        RIGHT_OUTER_JOIN = 0x00000100,  // SQL_SRJO_RIGHT_OUTER_JOIN
-        UNION_JOIN = 0x00000200         // SQL_SRJO_UNION_JOIN
-    ],
-
-    // values from sqlext.h
-    SQL_QU = 
-    [
-        SQL_QU_DML_STATEMENTS = 0x00000001,
-        SQL_QU_PROCEDURE_INVOCATION = 0x00000002,
-        SQL_QU_TABLE_DEFINITION     = 0x00000004,
-        SQL_QU_INDEX_DEFINITION     = 0x00000008,
-        SQL_QU_PRIVILEGE_DEFINITION = 0x00000010
-    ],
-
-    // values from sql.h
-    SQL_OJ_CAPABILITIES =
-    [
-        LEFT = 0x00000001,    // SQL_OJ_LEFT
-        RIGHT = 0x00000002,    // SQL_OJ_RIGHT
-        FULL = 0x00000004,    // SQL_OJ_FULL
-        NESTED = 0x00000008,    // SQL_OJ_NESTED
-        NOT_ORDERED = 0x00000010,    // SQL_OJ_NOT_ORDERED
-        INNER = 0x00000020,    // SQL_OJ_INNER
-        ALL_COMPARISON_OPS = 0x00000040  //SQL_OJ_ALLCOMPARISION+OPS
-    ],
-
-    SQL_UPDATABLE =
-    [
-        READONLY = 0,          // SQL_ATTR_READ_ONLY
-        WRITE = 1,             // SQL_ATTR_WRITE
-        READWRITE_UNKNOWN = 2  // SQL_ATTR_READWRITE_UNKNOWN
-    ],
-
-    SQL_IDENTIFIER_CASE =
-    [
-        UPPER = 1,    // SQL_IC_UPPER
-        LOWER = 2,    // SQL_IC_LOWER
-        SENSITIVE = 3,    // SQL_IC_SENSITIVE
-        MIXED = 4    // SQL_IC_MIXED
-    ],
-
-    // Uniqueness parameter in the SQLStatistics function
-    SQL_INDEX =
-    [
-        UNIQUE = 0,
-        ALL = 1
-    ],
-
-    // Reserved parameter in the SQLStatistics function
-    SQL_STATISTICS_RESERVED =
-    [
-        QUICK = 0,                // SQL_QUICK
-        ENSURE = 1                // SQL_ENSURE
-    ],
-
-    // Identifier type parameter in the SQLSpecialColumns function
-    SQL_SPECIALCOLS =
-    [
-        BEST_ROWID = 1,            // SQL_BEST_ROWID
-        ROWVER = 2            // SQL_ROWVER
-    ],
-
-    // Scope parameter in the SQLSpecialColumns function
-    SQL_SCOPE =
-    [
-        CURROW = 0,            // SQL_SCOPE_CURROW
-        TRANSACTION = 1,           // SQL_SCOPE_TRANSACTION
-        SESSION = 2           // SQL_SCOPE_SESSION
-    ],
-
-    SQL_NULLABILITY =
-    [
-        NO_NULLS = 0,                // SQL_NO_NULLS
-        NULLABLE = 1,                // SQL_NULLABLE
-        UNKNOWN = 2                 // SQL_NULLABLE_UNKNOWN
-    ],
-
-    SQL_SEARCHABLE =
-    [
-        UNSEARCHABLE = 0,        // SQL_UNSEARCHABLE
-        LIKE_ONLY = 1,        // SQL_LIKE_ONLY
-        ALL_EXCEPT_LIKE = 2,        // SQL_ALL_EXCEPT_LIKE
-        SEARCHABLE = 3        // SQL_SEARCHABLE
-    ],
-
-    SQL_UNNAMED =
-    [
-        NAMED = 0,                   // SQL_NAMED
-        UNNAMED = 1                  // SQL_UNNAMED
-    ],
-    // todo:move
-    // internal constants
-    // not odbc specific
-    //
-    HANDLER =
-    [
-        IGNORE = 0x00000000,
-        THROW = 0x00000001
-    ],
-
-    // values for SQLStatistics TYPE column
-    SQL_STATISTICSTYPE =
-    [
-        TABLE_STAT = 0,                    // TABLE Statistics
-        INDEX_CLUSTERED = 1,               // CLUSTERED index statistics
-        INDEX_HASHED = 2,                  // HASHED index statistics
-        INDEX_OTHER = 3                    // OTHER index statistics
-    ],
-
-    // values for SQLProcedures PROCEDURE_TYPE column
-    SQL_PROCEDURETYPE =
-    [
-        UNKNOWN = 0,                    // procedure is of unknow type
-        PROCEDURE = 1,                    // procedure is a procedure
-        FUNCTION = 2                     // procedure is a function
-    ],
-
-    // private constants
-    // to define data types (see below)
-    //
-    SIGNED_OFFSET = -20,      // SQL_SIGNED_OFFSET
-    UNSIGNED_OFFSET = -22,    // SQL_UNSIGNED_OFFSET
-
-    // C Data Types
-    SQL_C =
-    [
-        CHAR            = 1,
-        WCHAR           = -8,
-        SLONG           = 4     + SIGNED_OFFSET,
-        ULONG           = 4     + UNSIGNED_OFFSET,
-        SSHORT          = 5     + SIGNED_OFFSET,
-        USHORT          = 5     + UNSIGNED_OFFSET,
-        FLOAT           = 7,
-        DOUBLE          = 8,
-        BIT             = -7,
-        STINYINT        = -6    + SIGNED_OFFSET,
-        UTINYINT        = -6    + UNSIGNED_OFFSET,
-        SBIGINT         = -5    + SIGNED_OFFSET,
-        UBIGINT         = -5    + UNSIGNED_OFFSET,
-        BINARY          = -2,
-        TIMESTAMP       = 11,
-
-        TYPE_DATE       = 91,
-        TYPE_TIME       = 92,
-        TYPE_TIMESTAMP  = 93,
-
-        NUMERIC         = 2,
-        GUID            = -11,
-        DEFAULT         = 99,
-        ARD_TYPE        = -99
-    ],
-
-    // SQL Data Types
-    SQL_TYPE =
-    [
-        // Base data types (sql.h)
-        UNKNOWN             = 0,
-        NULL                = 0,
-        CHAR                = 1,
-        NUMERIC             = 2,
-        DECIMAL             = 3,
-        INTEGER             = 4,
-        SMALLINT            = 5,
-        FLOAT               = 6,
-        REAL                = 7,
-        DOUBLE              = 8,
-        DATETIME            = 9,      // V3 Only
-        VARCHAR             = 12,
-
-        // Unicode types (sqlucode.h)
-        WCHAR               = -8,
-        WVARCHAR            = -9,
-        WLONGVARCHAR        = -10,
-
-        // Extended data types (sqlext.h)
-        INTERVAL            = 10,    // V3 Only
-        TIME                = 10,
-        TIMESTAMP           = 11,
-        LONGVARCHAR         = -1,
-        BINARY              = -2,
-        VARBINARY           = -3,
-        LONGVARBINARY       = -4,
-        BIGINT              = -5,
-        TINYINT             = -6,
-        BIT                 = -7,
-        GUID                = -11,   // V3 Only
-
-        // One-parameter shortcuts for date/time data types.
-        TYPE_DATE           = 91,
-        TYPE_TIME           = 92,
-        TYPE_TIMESTAMP      = 93,
-
-        // SQL Server Types -150 to -159 (sqlncli.h)
-        SS_VARIANT          = -150,
-        SS_UDT              = -151,
-        SS_XML              = -152,
-        SS_TABLE            = -153,
-        SS_TIME2            = -154,
-        SS_TIMESTAMPOFFSET  = -155
-    ],
-
-    //SQL_ALL_TYPES = 0,
-    //static public readonly IntPtr SQL_HANDLE_NULL = IntPtr.Zero;
-
-    SQL_LENGTH = 
-    [
-        SQL_IGNORE = -6,
-        SQL_DEFAULT_PARAM = -5,
-        SQL_NO_TOTAL = -4,
-        SQL_NTS = -3,
-        SQL_DATA_AT_EXEC = -2,
-        SQL_NULL_DATA = -1
-    ],
-
-    SQL_DEFAULT_PARAM = -5,        
-
-    // column ordinals for SQLProcedureColumns result set
-    // this column ordinals are not defined in any c/c++ header but in the ODBC Programmer's Reference under SQLProcedureColumns
-    //
-    COLUMN_NAME = 4,
-    COLUMN_TYPE = 5,
-    DATA_TYPE = 6,
-    COLUMN_SIZE = 8,
-    DECIMAL_DIGITS = 10,
-    NUM_PREC_RADIX = 11,
-
-    SQL_ATTR = 
-    [
-        ODBC_VERSION = 200,
-        CONNECTION_POOLING = 201,
-        AUTOCOMMIT = 102,
-        TXN_ISOLATION = 108,
-        CURRENT_CATALOG = 109,
-        LOGIN_TIMEOUT = 103,
-        QUERY_TIMEOUT = 0,
-        CONNECTION_DEAD = 1209,
-
-        SQL_COPT_SS_BASE = 1200,
-        SQL_COPT_SS_ENLIST_IN_DTC = (1200 + 7),
-        SQL_COPT_SS_TXN_ISOLATION = (1200 + 27),
-
-        MAX_LENGTH = 3,
-        ROW_BIND_TYPE = 5,
-        CURSOR_TYPE = 6,
-        RETRIEVE_DATA = 11,
-        ROW_STATUS_PTR = 25, 
-        ROWS_FETCHED_PTR = 26,
-        ROW_ARRAY_SIZE = 27,
-
-        // ODBC 3.0
-        APP_ROW_DESC = 10010,
-        APP_PARAM_DESC = 10011,
-        IMP_ROW_DESC = 10012,
-        IMP_PARAM_DESC = 10013,
-        METADATA_ID = 10014,
-
-        // ODBC 4.0
-        PRIVATE_DRIVER_LOCATION = 204
-    ],
-
-    SQL_RD = 
-    [
-        OFF = 0,
-        ON = 1
-    ],
-
-    SQL_GD = 
-    [
-        //None =  0,
-        ANY_COLUMN = 1,
-        ANY_ORDER = 2,
-        BLOCK = 4,
-        BOUND = 8,
-        OUTPUT_PARAMS = 16
-    ],
-
-    //SQLGetInfo
-/*
-    SQL_INFO =
-    [
-        SQL_ACTIVE_CONNECTIONS = 0,        
-        SQL_MAX_DRIVER_CONNECTIONS = 0,
-        SQL_MAX_CONCURRENT_ACTIVITIES = 1,
-        SQL_ACTIVE_STATEMENTS = 1,         
-        SQL_DATA_SOURCE_NAME = 2,          
-        SQL_DRIVER_HDBC,                   
-        SQL_DRIVER_HENV,                   
-        SQL_DRIVER_HSTMT,                  
-        SQL_DRIVER_NAME,                   
-        SQL_DRIVER_VER,                    
-        SQL_FETCH_DIRECTION,               
-        SQL_ODBC_API_CONFORMANCE,          
-        SQL_ODBC_VER,                      
-        SQL_ROW_UPDATES,                   
-        SQL_ODBC_SAG_CLI_CONFORMANCE,      
-        SQL_SERVER_NAME,                   
-        SQL_SEARCH_PATTERN_ESCAPE,         
-        SQL_ODBC_SQL_CONFORMANCE,          
-
-        SQL_DATABASE_NAME,                 
-        SQL_DBMS_NAME,                     
-        SQL_DBMS_VER,                      
-
-        SQL_ACCESSIBLE_TABLES,             
-        SQL_ACCESSIBLE_PROCEDURES,         
-        SQL_PROCEDURES,                    
-        SQL_CONCAT_NULL_BEHAVIOR,          
-        SQL_CURSOR_COMMIT_BEHAVIOR,        
-        SQL_CURSOR_ROLLBACK_BEHAVIOR,      
-        SQL_DATA_SOURCE_READ_ONLY,         
-        SQL_DEFAULT_TXN_ISOLATION,         
-        SQL_EXPRESSIONS_IN_ORDERBY,        
-        SQL_IDENTIFIER_CASE,               
-        SQL_IDENTIFIER_QUOTE_CHAR,         
-        SQL_MAX_COLUMN_NAME_LEN,           
-        SQL_MAX_CURSOR_NAME_LEN,           
-        SQL_MAX_OWNER_NAME_LEN,            
-        SQL_MAX_SCHEMA_NAME_LEN = 32,
-        SQL_MAX_PROCEDURE_NAME_LEN,        
-        SQL_MAX_QUALIFIER_NAME_LEN,        
-        SQL_MAX_CATALOG_NAME_LEN = 34,
-        SQL_MAX_TABLE_NAME_LEN,            
-        SQL_MULT_RESULT_SETS,              
-        SQL_MULTIPLE_ACTIVE_TXN,           
-        SQL_OUTER_JOINS,                   
-        SQL_SCHEMA_TERM,                   
-        SQL_PROCEDURE_TERM,                
-        SQL_CATALOG_NAME_SEPARATOR,        
-        SQL_CATALOG_TERM,                  
-        SQL_SCROLL_CONCURRENCY,            
-        SQL_SCROLL_OPTIONS,                
-        SQL_TABLE_TERM,                    
-        SQL_TXN_CAPABLE,                   
-        SQL_USER_NAME,                     
-
-        SQL_CONVERT_FUNCTIONS,             
-        SQL_NUMERIC_FUNCTIONS,             
-        SQL_STRING_FUNCTIONS,              
-        SQL_SYSTEM_FUNCTIONS,              
-        SQL_TIMEDATE_FUNCTIONS,            
-
-        SQL_CONVERT_BIGINT,
-        SQL_CONVERT_BINARY,
-        SQL_CONVERT_BIT,
-        SQL_CONVERT_CHAR,
-        SQL_CONVERT_DATE,
-        SQL_CONVERT_DECIMAL,
-        SQL_CONVERT_DOUBLE,
-        SQL_CONVERT_FLOAT,            
-        SQL_CONVERT_INTEGER,
-        SQL_CONVERT_LONGVARCHAR,
-        SQL_CONVERT_NUMERIC,
-        SQL_CONVERT_REAL,
-        SQL_CONVERT_SMALLINT,
-        SQL_CONVERT_TIME,
-        SQL_CONVERT_TIMESTAMP,
-        SQL_CONVERT_TINYINT,
-        SQL_CONVERT_VARBINARY,
-        SQL_CONVERT_VARCHAR,          
-        SQL_CONVERT_LONGVARBINARY,
-
-        SQL_TXN_ISOLATION_OPTION,     
-        SQL_ODBC_SQL_OPT_IEF,
-        SQL_INTEGRITY = 73,
-        SQL_CORRELATION_NAME,
-        SQL_NON_NULLABLE_COLUMNS,
-        SQL_DRIVER_HLIB,
-        SQL_DRIVER_ODBC_VER,
-        SQL_LOCK_TYPES,
-        SQL_POS_OPERATIONS,
-        SQL_POSITIONED_STATEMENTS,        
-        SQL_GETDATA_EXTENSIONS,
-        SQL_BOOKMARK_PERSISTENCE,
-        SQL_STATIC_SENSITIVITY,
-        SQL_FILE_USAGE,
-        SQL_NULL_COLLATION,
-        SQL_ALTER_TABLE,
-        SQL_COLUMN_ALIAS,
-        SQL_GROUP_BY,
-        SQL_KEYWORDS,
-        SQL_ORDER_BY_COLUMNS_IN_SELECT,   
-        SQL_SCHEMA_USAGE,
-        SQL_CATALOG_USAGE,
-        SQL_QUOTED_IDENTIFIER_CASE,
-        SQL_SPECIAL_CHARACTERS,
-        SQL_SUBQUERIES,
-        SQL_UNION_STATEMENT,
-        SQL_MAX_COLUMNS_IN_GROUP_BY,
-        SQL_MAX_COLUMNS_IN_INDEX,
-        SQL_MAX_COLUMNS_IN_ORDER_BY,
-        SQL_MAX_COLUMNS_IN_SELECT,        
-        SQL_MAX_COLUMNS_IN_TABLE,
-        SQL_MAX_INDEX_SIZE,
-        SQL_MAX_ROW_SIZE_INCLUDES_LONG,
-        SQL_MAX_ROW_SIZE,
-        SQL_MAX_STATEMENT_LEN,
-        SQL_MAX_TABLES_IN_SELECT,
-        SQL_MAX_USER_NAME_LEN,
-        SQL_MAX_CHAR_LITERAL_LEN,
-        SQL_TIMEDATE_ADD_INTERVALS,
-        SQL_TIMEDATE_DIFF_INTERVALS,      
-        SQL_NEED_LONG_DATA_LEN,
-        SQL_MAX_BINARY_LITERAL_LEN,
-        SQL_LIKE_ESCAPE_CLAUSE,
-        SQL_CATALOG_LOCATION,
-        SQL_OJ_CAPABILITIES,
-
-        SQL_ACTIVE_ENVIRONMENTS,
-        SQL_ALTER_DOMAIN,
-        SQL_SQL_CONFORMANCE,
-        SQL_DATETIME_LITERALS,
-        SQL_BATCH_ROW_COUNT,              
-        SQL_BATCH_SUPPORT,
-        SQL_CONVERT_WCHAR,
-        SQL_CONVERT_INTERVAL_DAY_TIME,
-        SQL_CONVERT_INTERVAL_YEAR_MONTH,
-        SQL_CONVERT_WLONGVARCHAR,
-        SQL_CONVERT_WVARCHAR,
-        SQL_CREATE_ASSERTION,
-        SQL_CREATE_CHARACTER_SET,
-        SQL_CREATE_COLLATION,
-        SQL_CREATE_DOMAIN,                  
-        SQL_CREATE_SCHEMA,
-        SQL_CREATE_TABLE,
-        SQL_CREATE_TRANSLATION,
-        SQL_CREATE_VIEW,
-        SQL_DRIVER_HDESC,
-        SQL_DROP_ASSERTION,
-        SQL_DROP_CHARACTER_SET,
-        SQL_DROP_COLLATION,
-        SQL_DROP_DOMAIN,
-        SQL_DROP_SCHEMA,                    
-        SQL_DROP_TABLE,
-        SQL_DROP_TRANSLATION,
-        SQL_DROP_VIEW,
-        SQL_DYNAMIC_CURSOR_ATTRIBUTES1,
-        SQL_DYNAMIC_CURSOR_ATTRIBUTES2,
-        SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1,
-        SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2,
-        SQL_INDEX_KEYWORDS,
-        SQL_INFO_SCHEMA_VIEWS,
-        SQL_KEYSET_CURSOR_ATTRIBUTES1,    
-        SQL_KEYSET_CURSOR_ATTRIBUTES2,
-        SQL_ODBC_INTERFACE_CONFORMANCE,
-        SQL_PARAM_ARRAY_ROW_COUNTS,
-        SQL_PARAM_ARRAY_SELECTS,
-        SQL_SQL92_DATETIME_FUNCTIONS,
-        SQL_SQL92_FOREIGN_KEY_DELETE_RULE,
-        SQL_SQL92_FOREIGN_KEY_UPDATE_RULE,
-        SQL_SQL92_GRANT,
-        SQL_SQL92_NUMERIC_VALUE_FUNCTIONS,
-        SQL_SQL92_PREDICATES,              
-        SQL_SQL92_RELATIONAL_JOIN_OPERATORS,
-        SQL_SQL92_REVOKE,
-        SQL_SQL92_ROW_VALUE_CONSTRUCTOR,
-        SQL_SQL92_STRING_FUNCTIONS,
-        SQL_SQL92_VALUE_EXPRESSIONS,
-        SQL_STANDARD_CLI_CONFORMANCE,
-        SQL_STATIC_CURSOR_ATTRIBUTES1,
-        SQL_STATIC_CURSOR_ATTRIBUTES2,
-        SQL_AGGREGATE_FUNCTIONS,
-        SQL_DDL_INDEX,                   
-        SQL_DM_VER,
-        SQL_INSERT_STATEMENT,
-        SQL_CONVERT_GUID,
-
-        SQL_XOPEN_CLI_YEAR = 10000,      
-        SQL_CURSOR_SENSITIVITY,
-        SQL_DESCRIBE_PARAMETER,
-        SQL_CATALOG_NAME,
-        SQL_COLLATION_SEQ,
-        SQL_MAX_IDENTIFIER_LEN,
-        SQL_ASYNC_MODE = 10021,          
-        SQL_MAX_ASYNC_CONCURRENT_STATEMENTS,
-
-        SQL_DTC_TRANSITION_COST = 1750,
-    ],
-*/
-    SQL_OAC = 
-    [
-        SQL_OAC_None = 0x0000,
-        SQL_OAC_LEVEL1 = 0x0001,
-        SQL_OAC_LEVEL2 = 0x0002
-    ],
-
-    SQL_OSC = 
-    [
-        SQL_OSC_MINIMUM = 0x0000,
-        SQL_OSC_CORE = 0x0001,
-        SQL_OSC_EXTENDED = 0x0002
-    ],
-
-    SQL_SCC = 
-    [
-        SQL_SCC_XOPEN_CLI_VERSION1 = 0x00000001,
-        SQL_SCC_ISO92_CLI = 0x00000002
-    ],
-
-    SQL_SVE = 
-    [
-        SQL_SVE_CASE = 0x00000001,
-        SQL_SVE_CAST = 0x00000002,
-        SQL_SVE_COALESCE = 0x00000004,
-        SQL_SVE_NULLIF = 0x00000008
-    ],
-
-    SQL_SSF = 
-    [
-        SQL_SSF_CONVERT = 0x00000001,
-        SQL_SSF_LOWER = 0x00000002,
-        SQL_SSF_UPPER = 0x00000004,
-        SQL_SSF_SUBSTRING = 0x00000008,
-        SQL_SSF_TRANSLATE = 0x00000010,
-        SQL_SSF_TRIM_BOTH = 0x00000020,
-        SQL_SSF_TRIM_LEADING = 0x00000040,
-        SQL_SSF_TRIM_TRAILING = 0x00000080
-    ],
-
-    SQL_SP = 
-    [
-        //None = 0,
-
-        SQL_SP_EXISTS = 0x00000001,
-        SQL_SP_ISNOTNULL = 0x00000002,
-        SQL_SP_ISNULL = 0x00000004,
-        SQL_SP_MATCH_FULL = 0x00000008,
-        SQL_SP_MATCH_PARTIAL = 0x00000010,
-        SQL_SP_MATCH_UNIQUE_FULL = 0x00000020,
-        SQL_SP_MATCH_UNIQUE_PARTIAL = 0x00000040,
-        SQL_SP_OVERLAPS = 0x00000080,
-        SQL_SP_UNIQUE = 0x00000100,
-        SQL_SP_LIKE = 0x00000200,
-        SQL_SP_IN = 0x00000400,
-        SQL_SP_BETWEEN = 0x00000800,
-        SQL_SP_COMPARISON = 0x00001000,
-        SQL_SP_QUANTIFIED_COMPARISON = 0x00002000,
-
-        All = 0x0000FFFF
-    ],
-
-    SQL_OIC =
-    [
-        SQL_OIC_CORE = 1,
-        SQL_OIC_LEVEL1 = 2,
-        SQL_OIC_LEVEL2 = 3
-    ],
-
-    SQL_USAGE = 
-    [
-        SQL_U_DML_STATEMENTS = 0x00000001,
-        SQL_U_PROCEDURE_INVOCATION = 0x00000002,
-        SQL_U_TABLE_DEFINITION = 0x00000004,
-        SQL_U_INDEX_DEFINITION = 0x00000008,
-        SQL_U_PRIVILEGE_DEFINITION = 0x00000010
-    ],
-
-    SQL_GB = 
-    [
-            
-        SQL_GB_NOT_SUPPORTED = 0,
-        SQL_GB_GROUP_BY_EQUALS_SELECT = 1,
-        SQL_GB_GROUP_BY_CONTAINS_SELECT = 2,
-        SQL_GB_NO_RELATION = 3,
-        SQL_GB_COLLATE = 4
-    ],
-
-    SQL_NC =
-    [
-        SQL_NC_END = 0,
-        SQL_NC_HIGH = 1,
-        SQL_NC_LOW = 2,
-        SQL_NC_START = 3
-    ],
-
-    SQL_CN =
-    [
-        SQL_CN_None = 0,
-        SQL_CN_DIFFERENT = 1,
-        SQL_CN_ANY = 2
-    ],
-
-    SQL_NNC = 
-    [
-        SQL_NNC_NULL = 0,
-        SQL_NNC_NON_NULL = 1
-    ],
-
-    SQL_CB = 
-    [
-        SQL_CB_NULL = 0,
-        SQL_CB_NON_NULL = 1
-    ],
-
-    SQL_FD_FETCH = 
-    [
-        SQL_FD_FETCH_NEXT = 0x00000001,
-        SQL_FD_FETCH_FIRST = 0x00000002,
-        SQL_FD_FETCH_LAST = 0x00000004,
-        SQL_FD_FETCH_PRIOR = 0x00000008,
-        SQL_FD_FETCH_ABSOLUTE = 0x00000010,
-        SQL_FD_FETCH_RELATIVE = 0x00000020,
-        SQL_FD_FETCH_BOOKMARK = 0x00000080
-    ],
-
-    SQL_SQ = 
-    [
-        SQL_SQ_COMPARISON = 0x00000001,
-        SQL_SQ_EXISTS = 0x00000002,
-        SQL_SQ_IN = 0x00000004,
-        SQL_SQ_QUANTIFIED = 0x00000008,
-        SQL_SQ_CORRELATED_SUBQUERIES = 0x00000010
-    ],
-
-    SQL_U = 
-    [
-        SQL_U_UNION = 0x00000001,
-        SQL_U_UNION_ALL = 0x00000002
-    ],
-
-    SQL_BP = 
-    [
-        SQL_BP_CLOSE = 0x00000001,
-        SQL_BP_DELETE = 0x00000002,
-        SQL_BP_DROP = 0x00000004,
-        SQL_BP_TRANSACTION = 0x00000008,
-        SQL_BP_UPDATE = 0x00000010,
-        SQL_BP_OTHER_HSTMT = 0x00000020,
-        SQL_BP_SCROLL = 0x00000040
-    ],
-
-    SQL_QL = 
-    [
-        SQL_QL_START = 0x0001,
-        SQL_QL_END = 0x0002
-    ],
-
-    SQL_OJ = 
-    [
-        SQL_OJ_LEFT = 0x00000001,
-        SQL_OJ_RIGHT = 0x00000002,
-        SQL_OJ_FULL = 0x00000004,
-        SQL_OJ_NESTED = 0x00000008,
-        SQL_OJ_NOT_ORDERED = 0x00000010,
-        SQL_OJ_INNER = 0x00000020,
-        SQL_OJ_ALL_COMPARISON_OPS = 0x00000040
-    ],
-
-    SQL_FN_CVT = 
-    [
-        //None = 0,
-
-        SQL_FN_CVT_CONVERT        = 0x00000001,
-        SQL_FN_CVT_CAST        = 0x00000002
-    ],
-
-    SQL_FN_NUM = 
-    [
-        //None = 0,
-
-        SQL_FN_NUM_ABS        = 0x00000001,
-        SQL_FN_NUM_ACOS        = 0x00000002,
-        SQL_FN_NUM_ASIN        = 0x00000004,
-        SQL_FN_NUM_ATAN        = 0x00000008,
-        SQL_FN_NUM_ATAN2    = 0x00000010,
-        SQL_FN_NUM_CEILING    = 0x00000020,
-        SQL_FN_NUM_COS        = 0x00000040,
-        SQL_FN_NUM_COT        = 0x00000080,
-        SQL_FN_NUM_EXP        = 0x00000100,
-        SQL_FN_NUM_FLOOR    = 0x00000200,
-        SQL_FN_NUM_LOG        = 0x00000400,
-        SQL_FN_NUM_MOD        = 0x00000800,
-        SQL_FN_NUM_SIGN        = 0x00001000,
-        SQL_FN_NUM_SIN        = 0x00002000,
-        SQL_FN_NUM_SQRT        = 0x00004000,
-        SQL_FN_NUM_TAN      = 0x00008000,
-        SQL_FN_NUM_PI       = 0x00010000,
-        SQL_FN_NUM_RAND     = 0x00020000,
-        SQL_FN_NUM_DEGREES    = 0x00040000,
-        SQL_FN_NUM_LOG10    = 0x00080000,
-        SQL_FN_NUM_POWER    = 0x00100000,
-        SQL_FN_NUM_RADIANS    = 0x00200000,
-        SQL_FN_NUM_ROUND    = 0x00400000,
-        SQL_FN_NUM_TRUNCATE = 0x00800000
-    ],
-
-    SQL_SNVF = 
-    [
-        SQL_SNVF_BIT_LENGTH = 0x00000001,
-        SQL_SNVF_CHAR_LENGTH = 0x00000002,
-        SQL_SNVF_CHARACTER_LENGTH = 0x00000004,
-        SQL_SNVF_EXTRACT = 0x00000008,
-        SQL_SNVF_OCTET_LENGTH = 0x00000010,
-        SQL_SNVF_POSITION = 0x00000020
-    ],
-
-    SQL_FN_STR =
-    [
-        //None = 0,
-
-        SQL_FN_STR_CONCAT            = 0x00000001,
-        SQL_FN_STR_INSERT            = 0x00000002,
-        SQL_FN_STR_LEFT            = 0x00000004,
-        SQL_FN_STR_LTRIM            = 0x00000008,
-        SQL_FN_STR_LENGTH            = 0x00000010,
-        SQL_FN_STR_LOCATE            = 0x00000020,
-        SQL_FN_STR_LCASE            = 0x00000040,
-        SQL_FN_STR_REPEAT            = 0x00000080,
-        SQL_FN_STR_REPLACE            = 0x00000100,
-        SQL_FN_STR_RIGHT            = 0x00000200,
-        SQL_FN_STR_RTRIM            = 0x00000400,
-        SQL_FN_STR_SUBSTRING        = 0x00000800,
-        SQL_FN_STR_UCASE            = 0x00001000,
-        SQL_FN_STR_ASCII            = 0x00002000,
-        SQL_FN_STR_CHAR            = 0x00004000,
-        SQL_FN_STR_DIFFERENCE = 0x00008000,
-        SQL_FN_STR_LOCATE_2          = 0x00010000,
-        SQL_FN_STR_SOUNDEX          = 0x00020000,
-        SQL_FN_STR_SPACE          = 0x00040000,
-        SQL_FN_STR_BIT_LENGTH      = 0x00080000,
-        SQL_FN_STR_CHAR_LENGTH      = 0x00100000,
-        SQL_FN_STR_CHARACTER_LENGTH      = 0x00200000,
-        SQL_FN_STR_OCTET_LENGTH = 0x00400000,
-        SQL_FN_STR_POSITION = 0x00800000
-    ],
-
-    SQL_FN_SYSTEM = 
-    [
-        //None = 0,
-
-        SQL_FN_SYS_USERNAME = 0x00000001,
-        SQL_FN_SYS_DBNAME = 0x00000002,
-        SQL_FN_SYS_IFNULL = 0x00000004
-    ],
-
-    SQL_FN_TD = 
-    [
-        //None = 0,
-
-        SQL_FN_TD_NOW            = 0x00000001,
-        SQL_FN_TD_CURDATE            = 0x00000002,
-        SQL_FN_TD_DAYOFMONTH        = 0x00000004,
-        SQL_FN_TD_DAYOFWEEK            = 0x00000008,
-        SQL_FN_TD_DAYOFYEAR            = 0x00000010,
-        SQL_FN_TD_MONTH            = 0x00000020,
-        SQL_FN_TD_QUARTER            = 0x00000040,
-        SQL_FN_TD_WEEK            = 0x00000080,
-        SQL_FN_TD_YEAR            = 0x00000100,
-        SQL_FN_TD_CURTIME            = 0x00000200,
-        SQL_FN_TD_HOUR            = 0x00000400,
-        SQL_FN_TD_MINUTE            = 0x00000800,
-        SQL_FN_TD_SECOND            = 0x00001000,
-        SQL_FN_TD_TIMESTAMPADD        = 0x00002000,
-        SQL_FN_TD_TIMESTAMPDIFF        = 0x00004000,
-        SQL_FN_TD_DAYNAME          = 0x00008000,
-        SQL_FN_TD_MONTHNAME          = 0x00010000,
-        SQL_FN_TD_CURRENT_DATE      = 0x00020000,
-        SQL_FN_TD_CURRENT_TIME      = 0x00040000,
-        SQL_FN_TD_CURRENT_TIMESTAMP      = 0x00080000,
-        SQL_FN_TD_EXTRACT = 0x00100000
-    ],
-
-    SQL_SDF = 
-    [
-        SQL_SDF_CURRENT_DATE = 0x00000001,
-        SQL_SDF_CURRENT_TIME = 0x00000002,
-        SQL_SDF_CURRENT_TIMESTAMP = 0x00000004
-    ],
-
-    SQL_TSI =
-    [
-        //None = 0,
-
-        SQL_TSI_FRAC_SECOND = 0x00000001,
-        SQL_TSI_SECOND = 0x00000002,
-        SQL_TSI_MINUTE = 0x00000004,
-        SQL_TSI_HOUR = 0x00000008,
-        SQL_TSI_DAY = 0x00000010,
-        SQL_TSI_WEEK = 0x00000020,
-        SQL_TSI_MONTH = 0x00000040,
-        SQL_TSI_QUARTER = 0x00000080,
-        SQL_TSI_YEAR = 0x00000100
-    ],
-
-    SQL_AF = 
-    [
-        //None = 0,
-
-        SQL_AF_AVG        = 0x00000001,
-        SQL_AF_COUNT    = 0x00000002,
-        SQL_AF_MAX        = 0x00000004,
-        SQL_AF_MIN        = 0x00000008,
-        SQL_AF_SUM        = 0x00000010,
-        SQL_AF_DISTINCT    = 0x00000020,
-        SQL_AF_ALL        = 0x00000040,
-
-        All = 0xFF
-    ],
-
-    SQL_SC = 
-    [
-        //None = 0,
-
-        SQL_SC_SQL92_ENTRY            = 0x00000001,
-        SQL_SC_FIPS127_2_TRANSITIONAL    = 0x00000002,
-        SQL_SC_SQL92_INTERMEDIATE        = 0x00000004,
-        SQL_SC_SQL92_FULL            = 0x00000008
-    ],
-
-    SQL_DL_SQL92 = 
-    [
-        SQL_DL_SQL92_DATE                    = 0x00000001,
-        SQL_DL_SQL92_TIME                    = 0x00000002,
-        SQL_DL_SQL92_TIMESTAMP                = 0x00000004,
-        SQL_DL_SQL92_INTERVAL_YEAR                = 0x00000008,
-        SQL_DL_SQL92_INTERVAL_MONTH                = 0x00000010,
-        SQL_DL_SQL92_INTERVAL_DAY                = 0x00000020,
-        SQL_DL_SQL92_INTERVAL_HOUR                = 0x00000040,
-        SQL_DL_SQL92_INTERVAL_MINUTE            = 0x00000080,
-        SQL_DL_SQL92_INTERVAL_SECOND            = 0x00000100,
-        SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH            = 0x00000200,
-        SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR            = 0x00000400,
-        SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE            = 0x00000800,
-        SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND            = 0x00001000,
-        SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE        = 0x00002000,
-        SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND        = 0x00004000,
-        SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND     = 0x00008000
-    ],
-
-    SQL_IK = 
-    [
-        SQL_IK_NONE        = 0x00000000,
-        SQL_IK_ASC        = 0x00000001,
-        SQL_IK_DESC        = 0x00000002,
-        SQL_IK_ALL = 0x00000003 //SQL_IK_ASC | SQL_IK_DESC
-    ],
-
-    SQL_ISV = 
-    [
-        SQL_ISV_ASSERTIONS            = 0x00000001,
-        SQL_ISV_CHARACTER_SETS        = 0x00000002,
-        SQL_ISV_CHECK_CONSTRAINTS        = 0x00000004,
-        SQL_ISV_COLLATIONS            = 0x00000008,
-        SQL_ISV_COLUMN_DOMAIN_USAGE        = 0x00000010,
-        SQL_ISV_COLUMN_PRIVILEGES        = 0x00000020,
-        SQL_ISV_COLUMNS            = 0x00000040,
-        SQL_ISV_CONSTRAINT_COLUMN_USAGE    = 0x00000080,
-        SQL_ISV_CONSTRAINT_TABLE_USAGE    = 0x00000100,
-        SQL_ISV_DOMAIN_CONSTRAINTS        = 0x00000200,
-        SQL_ISV_DOMAINS            = 0x00000400,
-        SQL_ISV_KEY_COLUMN_USAGE        = 0x00000800,
-        SQL_ISV_REFERENTIAL_CONSTRAINTS    = 0x00001000,
-        SQL_ISV_SCHEMATA            = 0x00002000,
-        SQL_ISV_SQL_LANGUAGES        = 0x00004000,
-        SQL_ISV_TABLE_CONSTRAINTS      = 0x00008000,
-        SQL_ISV_TABLE_PRIVILEGES      = 0x00010000,
-        SQL_ISV_TABLES          = 0x00020000,
-        SQL_ISV_TRANSLATIONS      = 0x00040000,
-        SQL_ISV_USAGE_PRIVILEGES      = 0x00080000,
-        SQL_ISV_VIEW_COLUMN_USAGE      = 0x00100000,
-        SQL_ISV_VIEW_TABLE_USAGE = 0x00200000,
-        SQL_ISV_VIEWS          = 0x00400000
-    ],
-
-    SQL_SRJO = 
-    [
-        //None = 0,
-
-        SQL_SRJO_CORRESPONDING_CLAUSE = 0x00000001,
-        SQL_SRJO_CROSS_JOIN = 0x00000002,
-        SQL_SRJO_EXCEPT_JOIN = 0x00000004,
-        SQL_SRJO_FULL_OUTER_JOIN = 0x00000008,
-        SQL_SRJO_INNER_JOIN = 0x00000010,
-        SQL_SRJO_INTERSECT_JOIN = 0x00000020,
-        SQL_SRJO_LEFT_OUTER_JOIN = 0x00000040,
-        SQL_SRJO_NATURAL_JOIN = 0x00000080,
-        SQL_SRJO_RIGHT_OUTER_JOIN = 0x00000100,
-        SQL_SRJO_UNION_JOIN = 0x00000200
-    ],
-
-    SQL_SRVC = 
-    [
-        SQL_SRVC_VALUE_EXPRESSION = 0x00000001,
-        SQL_SRVC_NULL = 0x00000002,
-        SQL_SRVC_DEFAULT = 0x00000004,
-        SQL_SRVC_ROW_SUBQUERY = 0x00000008
-    ],
-
-    //public static readonly int SQL_OV_ODBC3 = 3;
-    //public const Int32 SQL_NTS = -3;       //flags for null-terminated string
-
-    //Pooling
-    SQL_CP = 
-    [
-        OFF = 0,
-        ONE_PER_DRIVER = 1,
-        ONE_PER_HENV = 2
-    ],
-
-/*
-    public const Int32 SQL_CD_TRUE = 1;
-    public const Int32 SQL_CD_FALSE = 0;
-
-    public const Int32 SQL_DTC_DONE = 0;
-    public const Int32 SQL_IS_POINTER = -4;
-    public const Int32 SQL_IS_PTR = 1;
-*/
-    SQL_DRIVER =
-    [
-        NOPROMPT = 0,
-        COMPLETE = 1,
-        PROMPT = 2,
-        COMPLETE_REQUIRED = 3
-    ],
-
-    // Column set for SQLPrimaryKeys
-    SQL_PRIMARYKEYS =
-    [
-        /*
-                    CATALOGNAME         = 1,                    // TABLE_CAT
-                    SCHEMANAME          = 2,                    // TABLE_SCHEM
-                    TABLENAME           = 3,                    // TABLE_NAME
-        */
-        COLUMNNAME = 4                    // COLUMN_NAME
-        /*
-                    KEY_SEQ             = 5,                    // KEY_SEQ
-                    PKNAME              = 6,                    // PK_NAME
-        */
-    ],
-
-    // Column set for SQLStatistics
-    SQL_STATISTICS =
-    [
-        /*
-                    CATALOGNAME         = 1,                    // TABLE_CAT
-                    SCHEMANAME          = 2,                    // TABLE_SCHEM
-                    TABLENAME           = 3,                    // TABLE_NAME
-                    NONUNIQUE           = 4,                    // NON_UNIQUE
-                    INDEXQUALIFIER      = 5,                    // INDEX_QUALIFIER
-        */
-        INDEXNAME = 6,                    // INDEX_NAME
-        /*
-                    TYPE                = 7,                    // TYPE
-        */
-        ORDINAL_POSITION = 8,                    // ORDINAL_POSITION
-        COLUMN_NAME = 9                    // COLUMN_NAME
-        /*
-                    ASC_OR_DESC         = 10,                   // ASC_OR_DESC
-                    CARDINALITY         = 11,                   // CARDINALITY
-                    PAGES               = 12,                   // PAGES
-                    FILTER_CONDITION    = 13,                   // FILTER_CONDITION
-        */
-    ],
-
-    // Column set for SQLSpecialColumns
-    SQL_SPECIALCOLUMNSET =
-    [
-        /*
-                    SCOPE               = 1,                    // SCOPE
-        */
-        COLUMN_NAME = 2                    // COLUMN_NAME
-        /*
-                    DATA_TYPE           = 3,                    // DATA_TYPE
-                    TYPE_NAME           = 4,                    // TYPE_NAME
-                    COLUMN_SIZE         = 5,                    // COLUMN_SIZE
-                    BUFFER_LENGTH       = 6,                    // BUFFER_LENGTH
-                    DECIMAL_DIGITS      = 7,                    // DECIMAL_DIGITS
-                    PSEUDO_COLUMN       = 8,                    // PSEUDO_COLUMN
-        */
-    ],
-
-    SQL_DIAG =
-    [
-        CURSOR_ROW_COUNT= -1249,
-        ROW_NUMBER = -1248,
-        COLUMN_NUMBER = -1247,
-        RETURNCODE = 1,
-        NUMBER = 2,
-        ROW_COUNT = 3,
-        SQLSTATE = 4,
-        NATIVE = 5,
-        MESSAGE_TEXT = 6,
-        DYNAMIC_FUNCTION = 7,
-        CLASS_ORIGIN = 8,
-        SUBCLASS_ORIGIN = 9,
-        CONNECTION_NAME = 10,
-        SERVER_NAME = 11,
-        DYNAMIC_FUNCTION_CODE = 12
-    ],
-
-    SQL_SU =
-    [
-        SQL_SU_DML_STATEMENTS       = 0x00000001,
-        SQL_SU_PROCEDURE_INVOCATION = 0x00000002,
-        SQL_SU_TABLE_DEFINITION     = 0x00000004,
-        SQL_SU_INDEX_DEFINITION     = 0x00000008,
-        SQL_SU_PRIVILEGE_DEFINITION = 0x00000010
-    ]
-]
diff --git a/bi-connectors/PowerBIConnector/src/OpenSearch16.png b/bi-connectors/PowerBIConnector/src/OpenSearch16.png
deleted file mode 100644
index 67c00e9609..0000000000
Binary files a/bi-connectors/PowerBIConnector/src/OpenSearch16.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/src/OpenSearch20.png b/bi-connectors/PowerBIConnector/src/OpenSearch20.png
deleted file mode 100644
index bd0a960a1c..0000000000
Binary files a/bi-connectors/PowerBIConnector/src/OpenSearch20.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/src/OpenSearch24.png b/bi-connectors/PowerBIConnector/src/OpenSearch24.png
deleted file mode 100644
index dbca9acdf4..0000000000
Binary files a/bi-connectors/PowerBIConnector/src/OpenSearch24.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/src/OpenSearch32.png b/bi-connectors/PowerBIConnector/src/OpenSearch32.png
deleted file mode 100644
index 0698737da4..0000000000
Binary files a/bi-connectors/PowerBIConnector/src/OpenSearch32.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/src/OpenSearch40.png b/bi-connectors/PowerBIConnector/src/OpenSearch40.png
deleted file mode 100644
index 201319e6e0..0000000000
Binary files a/bi-connectors/PowerBIConnector/src/OpenSearch40.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/src/OpenSearch48.png b/bi-connectors/PowerBIConnector/src/OpenSearch48.png
deleted file mode 100644
index 5aed8ebf93..0000000000
Binary files a/bi-connectors/PowerBIConnector/src/OpenSearch48.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/src/OpenSearch64.png b/bi-connectors/PowerBIConnector/src/OpenSearch64.png
deleted file mode 100644
index a42f13babf..0000000000
Binary files a/bi-connectors/PowerBIConnector/src/OpenSearch64.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/src/OpenSearch80.png b/bi-connectors/PowerBIConnector/src/OpenSearch80.png
deleted file mode 100644
index 606f76205a..0000000000
Binary files a/bi-connectors/PowerBIConnector/src/OpenSearch80.png and /dev/null differ
diff --git a/bi-connectors/PowerBIConnector/src/OpenSearchProject.mproj b/bi-connectors/PowerBIConnector/src/OpenSearchProject.mproj
deleted file mode 100644
index 938648e40f..0000000000
--- a/bi-connectors/PowerBIConnector/src/OpenSearchProject.mproj
+++ /dev/null
@@ -1,125 +0,0 @@
-<Project DefaultTargets="BuildExtension" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{75a2dabe-6c5b-498e-8df1-e85d4483a7dc}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>MyRootNamespace</RootNamespace>
-    <AssemblyName>MyAssemblyName</AssemblyName>
-    <EnableUnmanagedDebugging>False</EnableUnmanagedDebugging>
-    <AllowNativeQuery>False</AllowNativeQuery>
-    <AsAction>False</AsAction>
-    <FastCombine>False</FastCombine>
-    <ClearLog>False</ClearLog>
-    <ShowEngineTraces>False</ShowEngineTraces>
-    <ShowUserTraces>False</ShowUserTraces>
-    <LegacyRedirects>False</LegacyRedirects>
-    <SuppressRowErrors>False</SuppressRowErrors>
-    <SuppressCellErrors>False</SuppressCellErrors>
-    <MaxRows>1000</MaxRows>
-    <ExtensionProject>Yes</ExtensionProject>
-    <Name>OpenSearch</Name>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>false</DebugSymbols>
-    <!--Should be true, fix this when the debugger is implemented -->
-    <OutputPath>bin\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugSymbols>false</DebugSymbols>
-    <OutputPath>bin\Release\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="OpenSearchProject.pq">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSearch16.png">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSearch20.png">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSearch24.png">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSearch32.png">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSearch40.png">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSearch48.png">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSearch64.png">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSearch80.png">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="resources.resx">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Diagnostics.pqm">
-      <SubType>Content</SubType>
-    </Compile>
-    <Compile Include="OdbcConstants.pqm">
-      <SubType>Content</SubType>
-    </Compile>
-    <Content Include="OpenSearchProject.query.pq">
-      <SubType>Code</SubType>
-    </Content>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <UsingTask TaskName="BuildExtension" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v12.0.dll">
-    <ParameterGroup>
-      <InputDirectory ParameterType="System.String" Required="true" />
-      <OutputFile ParameterType="System.String" Required="true" />
-    </ParameterGroup>
-    <Task>
-      <Reference Include="System.IO.Compression" />
-      <Reference Include="System.IO.Compression.FileSystem" />
-      <Using Namespace="System.Globalization" />
-      <Using Namespace="System.IO.Compression " />
-      <Code Type="Fragment" Language="cs"><![CDATA[    
-    using(FileStream fileStream = File.Create(OutputFile))
-    using(ZipArchive archiveOut = new ZipArchive(fileStream, ZipArchiveMode.Create, false))
-    {
-        foreach(string fullPath in Directory.EnumerateFiles(InputDirectory))
-        {
-            string filename = Path.GetFileName(fullPath);
-        
-            archiveOut.CreateEntryFromFile(fullPath, filename, CompressionLevel.Optimal);
-        }
-    }
-
-    File.Copy(OutputFile, Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), @"Documents\Power BI Desktop\Custom Connectors", Path.GetFileName(OutputFile)), true);
-]]></Code>
-    </Task>
-  </UsingTask>
-  <Target Name="BuildExtension" DependsOnTargets="ExtensionClean">
-    <ItemGroup>
-      <PQFiles Include="@(Compile)" Condition="'%(Extension)' == '.pq'" />
-    </ItemGroup>
-    <ItemGroup>
-      <NonPQFiles Include="@(Compile)" Condition="'%(Extension)' != '.pq'" />
-    </ItemGroup>
-    <MakeDir Directories="$(IntermediateOutputPath)" />
-    <MakeDir Directories="$(OutputPath)" />
-    <Copy SourceFiles="@(NonPQFiles)" DestinationFolder="$(IntermediateOutputPath)" />
-    <Copy SourceFiles="@(PQFiles)" DestinationFiles="@(PQFiles->'$(IntermediateOutputPath)%(RecursiveDir)%(FileName).m')" />
-    <BuildExtension InputDirectory="$(IntermediateOutputPath)" OutputFile="$(OutputPath)\$(ProjectName).mez" />
-  </Target>
-  <Target Name="ExtensionClean">
-    <!-- Remove obj folder -->
-    <RemoveDir Directories="$(BaseIntermediateOutputPath)" />
-    <!-- Remove bin folder -->
-    <RemoveDir Directories="$(OutputPath)" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/bi-connectors/PowerBIConnector/src/OpenSearchProject.pq b/bi-connectors/PowerBIConnector/src/OpenSearchProject.pq
deleted file mode 100644
index b3f65ddc99..0000000000
--- a/bi-connectors/PowerBIConnector/src/OpenSearchProject.pq
+++ /dev/null
@@ -1,263 +0,0 @@
-// This file contains Data Connector logic
-[Version = "1.0.1"]
-section OpenSearchProject;
-
-// When set to true, additional trace information will be written out to the User log. 
-// This should be set to false before release. Tracing is done through a call to 
-// Diagnostics.LogValue(). When EnableTraceOutput is set to false, the call becomes a 
-// no-op and simply returns the original value.
-EnableTraceOutput = false;
-
-[DataSource.Kind="OpenSearchProject", Publish="OpenSearchProject.Publish"]
-shared OpenSearchProject.Contents = Value.ReplaceType(OpenSearchProjectImpl, OpenSearchProjectType);
-
-// Wrapper function to provide additional UI customization.
-OpenSearchProjectType = type function (
-        Server as (type text meta [
-            Documentation.FieldCaption = "Server",
-            Documentation.FieldDescription = "The hostname of the OpenSearch server.",
-            Documentation.SampleValues = { "localhost" }
-        ]),
-        Port as (type number meta [
-            Documentation.FieldCaption = "Port",
-            Documentation.FieldDescription = "Port which OpenSearch server listens on.",
-            Documentation.SampleValues = { 9200 }
-        ]),
-        UseSSL as (type logical meta [
-            Documentation.FieldCaption = "Use SSL",
-            Documentation.FieldDescription = "Use SSL",
-            Documentation.AllowedValues = { true, false }
-        ]),
-        HostnameVerification as (type logical meta [
-            Documentation.FieldCaption = "Certificate validation",
-            Documentation.FieldDescription = "Certificate validation",
-            Documentation.AllowedValues = { true, false }
-        ])
-    )
-    as table meta [
-        Documentation.Name = "OpenSearch Project"
-    ];
-
-OpenSearchProjectImpl = (Server as text, Port as number, UseSSL as logical, HostnameVerification as logical) as table =>
-    let
-        Credential = Extension.CurrentCredential(),
-        AuthenticationMode = Credential[AuthenticationKind],
-
-        // Sets connection string properties for authentication.
-        CredentialConnectionString =
-            if AuthenticationMode = "UsernamePassword" then
-                [
-                    Auth = "BASIC",
-                    UID = Credential[Username],
-                    PWD = Credential[Password]
-                ]
-            else if AuthenticationMode = "Key" then
-                [
-                    Auth = "AWS_SIGV4",
-                    Region = Credential[Key]
-                ]
-            else 
-                [
-                    Auth = "NONE"
-                ],
-
-        // Sets connection string properties for encrypted connections.
-        EncryptedConnectionString =
-            if Credential[EncryptConnection] = null or Credential[EncryptConnection] = true then
-                [
-                    UseSSL = 1
-                ]
-            else
-                [
-                    UseSSL = 0
-                ],
-
-        // Subtract the server from the user input in case it's entered like 'http://localhost' or 'https://srv.com:100500' or 'localhost:0'
-        // And build the proper string on our own
-        FinalServerString = if UseSSL then
-                "https://" & Uri.Parts(Server)[Host] & ":" & Text.From(Port)
-            else
-                "http://" & Uri.Parts(Server)[Host] & ":" & Text.From(Port),
-
-        ConnectionString = [
-            Driver = "OpenSearch SQL ODBC Driver",
-            Host = FinalServerString,
-            HostnameVerification = if HostnameVerification then 1 else 0
-        ],
-
-        SQLGetInfo = Diagnostics.LogValue("SQLGetInfo_Options", [
-            SQL_AGGREGATE_FUNCTIONS = ODBC[SQL_AF][All],
-            SQL_SQL_CONFORMANCE = ODBC[SQL_SC][SQL_SC_SQL92_INTERMEDIATE]
-        ]),
-
-        SQLGetTypeInfo = (types) => 
-            if (EnableTraceOutput <> true) then types else
-            let
-                // Outputting the entire table might be too large, and result in the value being truncated.
-                // We can output a row at a time instead with Table.TransformRows()
-                rows = Table.TransformRows(types, each Diagnostics.LogValue("SQLGetTypeInfo " & _[TYPE_NAME], _)),
-                toTable = Table.FromRecords(rows)
-            in
-                Value.ReplaceType(toTable, Value.Type(types)),
-
-        // SQLColumns is a function handler that receives the results of an ODBC call to SQLColumns().
-        SQLColumns = (catalogName, schemaName, tableName, columnName, source) =>
-            if (EnableTraceOutput <> true) then source else
-            // the if statement conditions will force the values to evaluated/written to diagnostics
-            if (Diagnostics.LogValue("SQLColumns.TableName", tableName) <> "***" and Diagnostics.LogValue("SQLColumns.ColumnName", columnName) <> "***") then
-                let
-                    // Outputting the entire table might be too large, and result in the value being truncated.
-                    // We can output a row at a time instead with Table.TransformRows()
-                    rows = Table.TransformRows(source, each Diagnostics.LogValue("SQLColumns", _)),
-                    toTable = Table.FromRecords(rows)
-                in
-                    Value.ReplaceType(toTable, Value.Type(source))
-            else
-                source,
-        
-        SQLGetFunctions = Diagnostics.LogValue("SQLGetFunctions_Options", [
-            SQL_API_SQLBINDPARAMETER = false
-        ]),
-
-        SqlCapabilities = Diagnostics.LogValue("SqlCapabilities_Options", [
-            SupportsTop = false,
-            LimitClauseKind = LimitClauseKind.LimitOffset,
-            Sql92Conformance = ODBC[SQL_SC][SQL_SC_SQL92_FULL],
-            SupportsNumericLiterals = true,
-            SupportsStringLiterals = true,
-            SupportsOdbcDateLiterals = true,
-            SupportsOdbcTimeLiterals = true,
-            SupportsOdbcTimestampLiterals = true
-        ]),
-
-        OdbcOptions = [
-             // Do not view the tables grouped by their schema names.
-            HierarchicalNavigation = false,
-            // Prevents execution of native SQL statements. Extensions should set this to true.
-            HideNativeQuery = true,
-            // Allows upconversion of numeric types
-            SoftNumbers = true,
-            // Allow upconversion / resizing of numeric and string types
-            TolerateConcatOverflow = true,
-            // Enables connection pooling via the system ODBC manager
-            ClientConnectionPooling = true,
-
-            // These values should be set by previous steps
-            SQLColumns = SQLColumns,
-            SQLGetTypeInfo = SQLGetTypeInfo,
-            SQLGetInfo = SQLGetInfo,
-            SQLGetFunctions = SQLGetFunctions,
-            SqlCapabilities = SqlCapabilities,
-
-            OnError = OnOdbcError,
-
-            // Connection string properties used for encrypted connections.
-            CredentialConnectionString = EncryptedConnectionString
-        ],
-
-        FullConnectionString = (ConnectionString & CredentialConnectionString & EncryptedConnectionString),
-
-        OdbcDatasource = Odbc.DataSource(FullConnectionString, OdbcOptions)
-    in
-        OdbcDatasource;
-
-// Handles ODBC errors.
-OnOdbcError = (errorRecord as record) =>
-    let
-        ErrorMessage = errorRecord[Message],
-        ConnectionServer = errorRecord[Detail][DataSourcePath], 
-        
-        IsDriverNotInstalled = Text.Contains(ErrorMessage, "doesn't correspond to an installed ODBC driver"),
-        
-        OdbcError = errorRecord[Detail][OdbcErrors]{0},
-        OdbcErrorCode = OdbcError[NativeError],
-        
-        // Failed to connect to given host
-        IsHostUnreachable = 
-            OdbcErrorCode = 202
-    in
-        if IsDriverNotInstalled then
-            error Error.Record("DataSource.Error", "The OpenSearch SQL ODBC driver is not installed. Please install the driver")
-        else if IsHostUnreachable then 
-            error Error.Record("DataSource.Error", "Couldn't reach server. Please double-check the server and auth. [" & ConnectionServer & "]")
-        else 
-            error errorRecord;
-
-// Data Source Kind description
-OpenSearchProject = [
-    // Required for use with Power BI Service.
-    TestConnection = (dataSourcePath) => 
-        let
-            json = Json.Document(dataSourcePath),
-            Server = json[Server],
-            Port = json[Port],
-            UseSSL = json[UseSSL],
-            HostnameVerification = json[HostnameVerification]
-        in
-            { "OpenSearchProject.Contents", Server, Port, UseSSL, HostnameVerification },
-
-    // Authentication modes
-    Authentication = [
-        Implicit = [
-            Label = "NONE"
-        ],
-        UsernamePassword = [
-            Label = "BASIC"
-        ],
-        Key = [
-            Label = "AWS_SIGV4",
-            KeyLabel = "Region"
-        ]
-    ],
-
-    // PBIDS Handler
-    DSRHandlers = [
-      opensearchproject = [
-        GetDSR = (Server, Port, UseSSL, HostnameVerification, optional Options) => [ protocol = "opensearchproject-odbc", address = [ server = Server, port = Port, useSSL = UseSSL, hostnameVerification = HostnameVerification ] ],
-        GetFormula = (dsr, optional options) => () =>
-          let
-            db = OpenSearchProject.Contents(dsr[address][server], dsr[address][port], dsr[address][useSSL], dsr[address][hostnameVerification])
-          in
-            db,
-        GetFriendlyName = (dsr) => "OpenSearch Project"
-      ]
-    ],
-
-    // Enable Encryption
-    SupportsEncryption = true,
-
-    Label = Extension.LoadString("DataSourceLabel")
-];
-
-// Data Source UI publishing description
-OpenSearchProject.Publish = [
-    Beta = false,
-    Category = "Other",
-    ButtonText = { Extension.LoadString("ButtonTitle"), Extension.LoadString("ButtonHelp") },
-    LearnMoreUrl = "https://github.com/opensearch-project/sql/blob/main/bi-connectors/PowerBIConnector/docs/OpenSearchProject.md",
-    
-    SupportsDirectQuery = true,
-
-    SourceImage = OpenSearch.Icons,
-    SourceTypeImage = OpenSearch.Icons
-];
-
-OpenSearch.Icons = [
-    Icon16 = { Extension.Contents("OpenSearch16.png"), Extension.Contents("OpenSearch20.png"), Extension.Contents("OpenSearch24.png"), Extension.Contents("OpenSearch32.png") },
-    Icon32 = { Extension.Contents("OpenSearch32.png"), Extension.Contents("OpenSearch40.png"), Extension.Contents("OpenSearch48.png"), Extension.Contents("OpenSearch64.png") }
-];
-
-// Load common library functions
-Extension.LoadFunction = (name as text) =>
-    let
-        binary = Extension.Contents(name),
-        asText = Text.FromBinary(binary)
-    in
-        Expression.Evaluate(asText, #shared);
-
-// Diagnostics module contains multiple functions. .
-Diagnostics = Extension.LoadFunction("Diagnostics.pqm");
-Diagnostics.LogValue = if (EnableTraceOutput) then Diagnostics[LogValue] else (prefix, value) => value;
-
-// OdbcConstants contains numeric constants from the ODBC header files, and helper function to create bitfield values.
-ODBC = Extension.LoadFunction("OdbcConstants.pqm");
diff --git a/bi-connectors/PowerBIConnector/src/OpenSearchProject.query.pq b/bi-connectors/PowerBIConnector/src/OpenSearchProject.query.pq
deleted file mode 100644
index 45026f96a3..0000000000
--- a/bi-connectors/PowerBIConnector/src/OpenSearchProject.query.pq
+++ /dev/null
@@ -1,324 +0,0 @@
-// This file contains queries to test your data connector
-section OpenSearch.UnitTests;
-
-shared MyExtension.UnitTest =
-[
-    // Common variables for all tests
-    Host = "localhost",
-    Port = 9200,
-    UseSSL = false,
-    HostnameVerification = false,
-
-    facts =
-    {        
-        Fact("Connection Test",  
-             7,                                    
-             let
-                Source = OpenSearchProject.Contents(Host, Port, UseSSL, HostnameVerification),
-                no_of_columns = Table.ColumnCount(Source)
-             in
-                no_of_columns                
-        ),
-        Fact("calcs_data:bool0",
-            #table(type table [bool0 = logical],
-                { {null}, {false}, {true} }),
-            let
-                Source = OpenSearchProject.Contents(Host, Port, UseSSL, HostnameVerification),
-                calcs_null_null = Source{[Item="calcs",Schema=null,Catalog=null]}[Data],
-                grouped = Table.Group(calcs_null_null, {"bool0"}, {})
-            in
-                grouped
-        )
-    },
-
-    report = Facts.Summarize(facts)
-][report];
-
-/// COMMON UNIT TESTING CODE 
-Fact = (_subject as text, _expected, _actual) as record =>
-[   expected = try _expected,
-    safeExpected = if expected[HasError] then "Expected : "& @ValueToText(expected[Error]) else expected[Value],
-    actual = try _actual,
-    safeActual = if actual[HasError] then "Actual : "& @ValueToText(actual[Error]) else actual[Value],
-    attempt = try safeExpected = safeActual,
-    result = if attempt[HasError] or not attempt[Value] then "Failure ⛔" else "Success ✓",
-    resultOp = if result = "Success ✓" then " = " else " <> ",
-    addendumEvalAttempt = if attempt[HasError] then @ValueToText(attempt[Error]) else "",
-    addendumEvalExpected = try @ValueToText(safeExpected) otherwise "...",
-    addendumEvalActual = try @ValueToText(safeActual) otherwise "...",
-    ShortenedAddendumEvalExpected = if Text.Length(addendumEvalExpected) > 20 then Text.Range(addendumEvalExpected, 0, 20) & "..." else addendumEvalExpected,
-    ShortenedAddendumEvalActual = if Text.Length(addendumEvalActual) > 20 then Text.Range(addendumEvalActual, 0, 20) & "..." else addendumEvalActual,
-    fact =
-    [   Result = result & " " & addendumEvalAttempt,
-        Notes =_subject,
-        Details = ShortenedAddendumEvalExpected & resultOp & ShortenedAddendumEvalActual
-    ]
-][fact];
-
-Facts = (_subject as text, _predicates as list) => List.Transform(_predicates, each Fact(_subject,_{0},_{1}));
-
-Facts.Summarize = (_facts as list) as table =>
-[   Fact.CountSuccesses = (count, i) =>
-    [   result = try i[Result],
-        sum = if result[HasError] or not Text.StartsWith(result[Value], "Success") then count else count + 1
-    ][sum],
-    passed = List.Accumulate(_facts, 0, Fact.CountSuccesses),
-    total = List.Count(_facts),
-    format = if passed = total then "All #{0} Passed !!! ✓" else "#{0} Passed ☺  #{1} Failed ☹",
-    result = if passed = total then "Success" else "⛔",
-    rate = Number.IntegerDivide(100*passed, total),
-    header =
-    [   Result = result,
-        Notes = Text.Format(format, {passed, total-passed}),
-        Details = Text.Format("#{0}% success rate", {rate})
-    ],
-    report = Table.FromRecords(List.Combine({{header},_facts}))
-][report];
-
-ValueToText = (value, optional depth) =>
-    let
-        _canBeIdentifier = (x) =>
-                                        let
-                                            keywords = {"and", "as", "each", "else", "error", "false", "if", "in", "is", "let", "meta", "not", "otherwise", "or", "section", "shared", "then", "true", "try", "type" },
-                                            charAlpha = (c as number) => (c>= 65 and c <= 90) or (c>= 97 and c <= 122) or c=95,
-                                            charDigit = (c as number) => c>= 48 and c <= 57
-                                        in
-                                            try
-                                                charAlpha(Character.ToNumber(Text.At(x,0))) 
-                                                and
-                                                    List.MatchesAll(
-                                                        Text.ToList(x),
-                                                        (c)=> let num = Character.ToNumber(c) in charAlpha(num) or charDigit(num)
-                                                    )
-                                                and not 
-                                                    List.MatchesAny( keywords, (li)=> li=x )
-                                            otherwise 
-                                                false,
-    
-        Serialize.Binary =      (x) => "#binary(" & Serialize(Binary.ToList(x)) & ") ",
-
-        Serialize.Date =        (x) => "#date(" & 
-                                       Text.From(Date.Year(x))  & ", " & 
-                                       Text.From(Date.Month(x)) & ", " & 
-                                       Text.From(Date.Day(x))   & ") ",
-
-        Serialize.Datetime =    (x) => "#datetime(" &
-                                       Text.From(Date.Year(DateTime.Date(x)))    & ", " &
-                                       Text.From(Date.Month(DateTime.Date(x)))   & ", " &
-                                       Text.From(Date.Day(DateTime.Date(x)))     & ", " &
-                                       Text.From(Time.Hour(DateTime.Time(x)))    & ", " &
-                                       Text.From(Time.Minute(DateTime.Time(x)))  & ", " &
-                                       Text.From(Time.Second(DateTime.Time(x)))  & ") ",
-
-        Serialize.Datetimezone =(x) => let 
-                                          dtz = DateTimeZone.ToRecord(x) 
-                                       in
-                                          "#datetimezone(" & 
-                                          Text.From(dtz[Year])        & ", " &
-                                          Text.From(dtz[Month])       & ", " &
-                                          Text.From(dtz[Day])         & ", " &
-                                          Text.From(dtz[Hour])        & ", " &
-                                          Text.From(dtz[Minute])      & ", " &
-                                          Text.From(dtz[Second])      & ", " &
-                                          Text.From(dtz[ZoneHours])   & ", " &
-                                          Text.From(dtz[ZoneMinutes]) & ") ",
-
-        Serialize.Duration =    (x) => let
-                                          dur = Duration.ToRecord(x)
-                                       in
-                                          "#duration(" &
-                                          Text.From(dur[Days])    & ", " &
-                                          Text.From(dur[Hours])   & ", " &
-                                          Text.From(dur[Minutes]) & ", " &
-                                          Text.From(dur[Seconds]) & ") ",
-
-        Serialize.Function =    (x) => _serialize_function_param_type(
-                                          Type.FunctionParameters(Value.Type(x)),
-                                          Type.FunctionRequiredParameters(Value.Type(x)) ) &
-                                       " as " &
-                                       _serialize_function_return_type(Value.Type(x)) &
-                                       " => (...) ",
-
-        Serialize.List =        (x) => "{" & 
-                                       List.Accumulate(x, "", (seed,item) => if seed="" then Serialize(item) else seed & ", " & Serialize(item)) &
-                                       "} ",
-
-        Serialize.Logical =     (x) => Text.From(x),
-
-        Serialize.Null =        (x) => "null",
-
-        Serialize.Number =      (x) => 
-                                    let Text.From = (i as number) as text => 
-                                        if Number.IsNaN(i) then "#nan" else
-                                        if i=Number.PositiveInfinity then "#infinity" else
-                                        if i=Number.NegativeInfinity then "-#infinity" else
-                                        Text.From(i)
-                                    in
-                                        Text.From(x),
-
-        Serialize.Record =      (x) => "[ " &
-                                       List.Accumulate(
-                                            Record.FieldNames(x), 
-                                            "", 
-                                            (seed,item) => 
-                                                (if seed="" then Serialize.Identifier(item) else seed & ", " & Serialize.Identifier(item)) & " = " & Serialize(Record.Field(x, item))
-                                       ) &
-                                       " ] ",
-
-        Serialize.Table =       (x) => "#table( type " &
-                                        _serialize_table_type(Value.Type(x)) &
-                                        ", " &
-                                        Serialize(Table.ToRows(x)) &
-                                        ") ",
-                                    
-        Serialize.Text =        (x) => """" & 
-                                       _serialize_text_content(x) & 
-                                       """",
-
-        _serialize_text_content =  (x) => let 
-                                            escapeText = (n as number) as text => "#(#)(" & Text.PadStart(Number.ToText(n, "X", "en-US"), 4, "0") & ")"
-                                        in
-                                        List.Accumulate(
-                                           List.Transform(
-                                               Text.ToList(x),
-                                               (c) => let n=Character.ToNumber(c) in 
-                                                        if n = 9   then "#(#)(tab)" else
-                                                        if n = 10  then "#(#)(lf)"  else
-                                                        if n = 13  then "#(#)(cr)"  else
-                                                        if n = 34  then """"""      else
-                                                        if n = 35  then "#(#)(#)"   else
-                                                        if n < 32  then escapeText(n) else 
-                                                        if n < 127 then Character.FromNumber(n) else 
-                                                        escapeText(n) 
-                                            ),
-                                            "",
-                                            (s,i)=>s&i
-                                        ),
-        
-        Serialize.Identifier =   (x) => 
-                                        if _canBeIdentifier(x) then 
-                                            x 
-                                        else 
-                                            "#""" &
-                                            _serialize_text_content(x) &
-                                            """",
-
-        Serialize.Time =        (x) => "#time(" &
-                                       Text.From(Time.Hour(x))   & ", " & 
-                                       Text.From(Time.Minute(x)) & ", " & 
-                                       Text.From(Time.Second(x)) & ") ",
-                                
-        Serialize.Type =        (x) => "type " & _serialize_typename(x),
-                                    
-                             
-        _serialize_typename =    (x, optional funtype as logical) =>                        /* Optional parameter: Is this being used as part of a function signature? */
-                                    let
-                                        isFunctionType = (x as type) => try if Type.FunctionReturn(x) is type then true else false otherwise false,
-                                        isTableType = (x as type) =>  try if Type.TableSchema(x) is table then true else false otherwise false,
-                                        isRecordType = (x as type) => try if Type.ClosedRecord(x) is type then true else false otherwise false,
-                                        isListType = (x as type) => try if Type.ListItem(x) is type then true else false otherwise false
-                                    in
-                                
-                                        if funtype=null and isTableType(x) then _serialize_table_type(x) else
-                                        if funtype=null and isListType(x) then "{ " & @_serialize_typename( Type.ListItem(x) ) & " }" else
-                                        if funtype=null and isFunctionType(x) then "function " & _serialize_function_type(x) else
-                                        if funtype=null and isRecordType(x) then _serialize_record_type(x) else
-                                    
-                                        if x = type any then "any" else
-                                        let base = Type.NonNullable(x) in
-                                          (if Type.IsNullable(x) then "nullable " else "") &       
-                                          (if base = type anynonnull then "anynonnull" else                
-                                          if base = type binary then "binary" else                
-                                          if base = type date   then "date"   else
-                                          if base = type datetime then "datetime" else
-                                          if base = type datetimezone then "datetimezone" else
-                                          if base = type duration then "duration" else
-                                          if base = type logical then "logical" else
-                                          if base = type none then "none" else
-                                          if base = type null then "null" else
-                                          if base = type number then "number" else
-                                          if base = type text then "text" else 
-                                          if base = type time then "time" else 
-                                          if base = type type then "type" else 
-                                      
-                                          /* Abstract types: */
-                                          if base = type function then "function" else
-                                          if base = type table then "table" else
-                                          if base = type record then "record" else
-                                          if base = type list then "list" else
-                                      
-                                          "any /*Actually unknown type*/"),
-
-        _serialize_table_type =     (x) => 
-                                           let 
-                                             schema = Type.TableSchema(x)
-                                           in
-                                             "table " &
-                                             (if Table.IsEmpty(schema) then "" else 
-                                                 "[" & List.Accumulate(
-                                                    List.Transform(
-                                                        Table.ToRecords(Table.Sort(schema,"Position")),
-                                                        each Serialize.Identifier(_[Name]) & " = " & _[Kind]),
-                                                    "",
-                                                    (seed,item) => (if seed="" then item else seed & ", " & item )
-                                                ) & "] " ),
-
-        _serialize_record_type =    (x) => 
-                                            let flds = Type.RecordFields(x)
-                                            in
-                                                if Record.FieldCount(flds)=0 then "record" else
-                                                    "[" & List.Accumulate(
-                                                        Record.FieldNames(flds),
-                                                        "",
-                                                        (seed,item) => 
-                                                            seed &
-                                                            (if seed<>"" then ", " else "") &
-                                                            (Serialize.Identifier(item) & "=" & _serialize_typename(Record.Field(flds,item)[Type]) )
-                                                    ) & 
-                                                    (if Type.IsOpenRecord(x) then ",..." else "") &
-                                                    "]",
-
-        _serialize_function_type =  (x) => _serialize_function_param_type(
-                                              Type.FunctionParameters(x),
-                                              Type.FunctionRequiredParameters(x) ) &
-                                            " as " &
-                                            _serialize_function_return_type(x),
-    
-        _serialize_function_param_type = (t,n) => 
-                                let
-                                    funsig = Table.ToRecords(
-                                        Table.TransformColumns(
-                                            Table.AddIndexColumn( Record.ToTable( t ), "isOptional", 1 ),
-                                            { "isOptional", (x)=> x>n } ) )
-                                in
-                                    "(" & 
-                                    List.Accumulate(
-                                        funsig,
-                                        "",
-                                        (seed,item)=>
-                                            (if seed="" then "" else seed & ", ") &
-                                            (if item[isOptional] then "optional " else "") &
-                                            Serialize.Identifier(item[Name]) & " as " & _serialize_typename(item[Value], true) )
-                                     & ")",
-
-        _serialize_function_return_type = (x) => _serialize_typename(Type.FunctionReturn(x), true), 
-
-        Serialize = (x) as text => 
-                           if x is binary       then try Serialize.Binary(x) otherwise "null /*serialize failed*/"        else 
-                           if x is date         then try Serialize.Date(x) otherwise "null /*serialize failed*/"          else 
-                           if x is datetime     then try Serialize.Datetime(x) otherwise "null /*serialize failed*/"      else 
-                           if x is datetimezone then try Serialize.Datetimezone(x) otherwise "null /*serialize failed*/"  else 
-                           if x is duration     then try Serialize.Duration(x) otherwise "null /*serialize failed*/"      else 
-                           if x is function     then try Serialize.Function(x) otherwise "null /*serialize failed*/"      else 
-                           if x is list         then try Serialize.List(x) otherwise "null /*serialize failed*/"          else 
-                           if x is logical      then try Serialize.Logical(x) otherwise "null /*serialize failed*/"       else
-                           if x is null         then try Serialize.Null(x) otherwise "null /*serialize failed*/"          else
-                           if x is number       then try Serialize.Number(x) otherwise "null /*serialize failed*/"        else
-                           if x is record       then try Serialize.Record(x) otherwise "null /*serialize failed*/"        else 
-                           if x is table        then try Serialize.Table(x) otherwise "null /*serialize failed*/"         else 
-                           if x is text         then try Serialize.Text(x) otherwise "null /*serialize failed*/"          else 
-                           if x is time         then try Serialize.Time(x) otherwise "null /*serialize failed*/"          else 
-                           if x is type         then try Serialize.Type(x) otherwise "null /*serialize failed*/"          else 
-                           "[#_unable_to_serialize_#]"                     
-    in
-        try Serialize(value) otherwise "<serialization failed>";
diff --git a/bi-connectors/PowerBIConnector/src/resources.resx b/bi-connectors/PowerBIConnector/src/resources.resx
deleted file mode 100644
index 3db608e458..0000000000
--- a/bi-connectors/PowerBIConnector/src/resources.resx
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="ButtonHelp" xml:space="preserve">
-    <value>Connect to OpenSearch</value>
-  </data>
-  <data name="ButtonTitle" xml:space="preserve">
-    <value>OpenSearch Project</value>
-  </data>
-  <data name="DataSourceLabel" xml:space="preserve">
-    <value>OpenSearch Project</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/bi-connectors/TableauConnector/README.md b/bi-connectors/TableauConnector/README.md
deleted file mode 100644
index 71c3d206d1..0000000000
--- a/bi-connectors/TableauConnector/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-## Connector Download
-
-The Tableau connector is available to download from the automated CI workflow: [link](https://github.com/opensearch-project/sql/actions/workflows/bi-connectors.yml).
-The release snapshot is also available [here](opensearch_sql_jdbc.taco).
-
-## Connector Install
-
-1. Put connector `taco` file into
-  * Windows: `C:\Users\%USERNAME%\Documents\My Tableau Repository\Connectors`;
-  * MacOS: `~/Documents/My Tableau Repository/Connectors`.
-2. Put OpenSearch `JDBC` [driver](../../sql-jdbc/README.md) (`jar` file) into
-  * Windows: `C:\Program Files\Tableau\Drivers`;
-  * MacOS: `~/Library/Tableau/Drivers`.
-3. Run `Tableau Desktop` with command line flag `-DDisableVerifyConnectorPluginSignature=true`:
-  * Windows: `"C:\Program Files\Tableau\Tableau 2022.1\bin\tableau.exe" -DDisableVerifyConnectorPluginSignature=true`;
-  * MacOS: `open -n /Applications/Tableau\ Desktop\ 2022.1.app --args -DDisableVerifyConnectorPluginSignature=true`.    
-Adjust the command line accoring to the Tableau version you have. You can create a shortcut or a script to simplify this step.
-
-## TDVT report for OpenSearch JDBC Tableau connector
-
-Each Tableau connector has to be tested and verified using [TDVT](https://tableau.github.io/connector-plugin-sdk/docs/tdvt).
-
-Most recent tests of the connector were performed on OpenSearch v.1.2.0 with SQL plugin v.1.2.0.
-
-TDVT test results are available in [tdvt_test_results.csv](tdvt_test_results.csv).
-
-Test pass rate is 669/837 (80%).
-
-## See also
-
-* [Connector user manual for Tableau Desktop](tableau_support.md)
-* JDBC Driver user manual [describes](../../sql-jdbc/docs/tableau.md) how to use the `JDBC` driver without the connector
\ No newline at end of file
diff --git a/bi-connectors/TableauConnector/img/tableau_columns_list.png b/bi-connectors/TableauConnector/img/tableau_columns_list.png
deleted file mode 100644
index 967ba224ca..0000000000
Binary files a/bi-connectors/TableauConnector/img/tableau_columns_list.png and /dev/null differ
diff --git a/bi-connectors/TableauConnector/img/tableau_data_preview.png b/bi-connectors/TableauConnector/img/tableau_data_preview.png
deleted file mode 100644
index 6c03338f2d..0000000000
Binary files a/bi-connectors/TableauConnector/img/tableau_data_preview.png and /dev/null differ
diff --git a/bi-connectors/TableauConnector/img/tableau_dialog.png b/bi-connectors/TableauConnector/img/tableau_dialog.png
deleted file mode 100644
index 2a3017586a..0000000000
Binary files a/bi-connectors/TableauConnector/img/tableau_dialog.png and /dev/null differ
diff --git a/bi-connectors/TableauConnector/img/tableau_download_taco.png b/bi-connectors/TableauConnector/img/tableau_download_taco.png
deleted file mode 100644
index ec84d503b4..0000000000
Binary files a/bi-connectors/TableauConnector/img/tableau_download_taco.png and /dev/null differ
diff --git a/bi-connectors/TableauConnector/img/tableau_graph.png b/bi-connectors/TableauConnector/img/tableau_graph.png
deleted file mode 100644
index 3d0cdce994..0000000000
Binary files a/bi-connectors/TableauConnector/img/tableau_graph.png and /dev/null differ
diff --git a/bi-connectors/TableauConnector/img/tableau_select_connector.png b/bi-connectors/TableauConnector/img/tableau_select_connector.png
deleted file mode 100644
index d380ecc958..0000000000
Binary files a/bi-connectors/TableauConnector/img/tableau_select_connector.png and /dev/null differ
diff --git a/bi-connectors/TableauConnector/img/tableau_select_table.png b/bi-connectors/TableauConnector/img/tableau_select_table.png
deleted file mode 100644
index 0e79347304..0000000000
Binary files a/bi-connectors/TableauConnector/img/tableau_select_table.png and /dev/null differ
diff --git a/bi-connectors/TableauConnector/img/tableau_table_list.png b/bi-connectors/TableauConnector/img/tableau_table_list.png
deleted file mode 100644
index 104b4becdd..0000000000
Binary files a/bi-connectors/TableauConnector/img/tableau_table_list.png and /dev/null differ
diff --git a/bi-connectors/TableauConnector/opensearch_sql_jdbc.taco b/bi-connectors/TableauConnector/opensearch_sql_jdbc.taco
deleted file mode 100644
index 44dea102d6..0000000000
Binary files a/bi-connectors/TableauConnector/opensearch_sql_jdbc.taco and /dev/null differ
diff --git a/bi-connectors/TableauConnector/src/META-INF/MANIFEST.MF b/bi-connectors/TableauConnector/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 97a662d62c..0000000000
--- a/bi-connectors/TableauConnector/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: 13 (Oracle Corporation)
-
diff --git a/bi-connectors/TableauConnector/src/connection-fields.xml b/bi-connectors/TableauConnector/src/connection-fields.xml
deleted file mode 100644
index 54f5296f7e..0000000000
--- a/bi-connectors/TableauConnector/src/connection-fields.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<connection-fields>
-    <field name="authentication" label="Authentication" category="authentication" value-type="selection" default-value="auth-user-pass">
-        <selection-group>
-            <option value="auth-none" label="No authentication"/>
-            <option value="auth-user-pass" label="Username and Password"/>
-            <option value="auth-integrated" label="AWS_SIGV4"/>
-        </selection-group>
-    </field>
-    <field name="server" label="Server" value-type="string" category="endpoint" default-value="localhost">
-    </field>
-    <field name="port" label="Port" value-type="string" category="endpoint" default-value="9200">
-    </field>
-    <field name="username" label="Username" category="authentication" value-type="string">
-        <conditions>
-            <condition field="authentication" value="auth-user-pass"/>
-        </conditions>
-    </field>
-    <field name="password" label="Password" category="authentication" value-type="string" secure="true">
-        <conditions>
-            <condition field="authentication" value="auth-user-pass"/>
-        </conditions>
-    </field>
-    <field name="v-region" label="Region" category="authentication" value-type="string" optional="true">
-        <conditions>
-            <condition field="authentication" value="auth-integrated"/>
-        </conditions>
-    </field>
-    <field name="sslmode" label="Use SSL" value-type="boolean" category="general" default-value="require">
-        <boolean-options>
-            <false-value value=""/>
-            <true-value value="require"/>
-        </boolean-options>
-    </field>
-    <field name="v-trustSelfSigned" label="Trust Self-Signed Certificate" value-type="boolean" category="general" default-value="false">
-        <conditions>
-            <condition field="authentication" value="auth-user-pass"/>
-            <condition field="authentication" value="auth-none"/>
-        </conditions>
-        <boolean-options>
-            <false-value value="false"/>
-            <true-value value="true"/>
-        </boolean-options>
-    </field>
-</connection-fields>
diff --git a/bi-connectors/TableauConnector/src/connection-metadata.xml b/bi-connectors/TableauConnector/src/connection-metadata.xml
deleted file mode 100644
index 1b3432c317..0000000000
--- a/bi-connectors/TableauConnector/src/connection-metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<connection-metadata>
-  <database enabled='false' />
-  <schema enabled='false' />
-  <table enabled='true' label="Table" />
-</connection-metadata>
diff --git a/bi-connectors/TableauConnector/src/connectionBuilder.js b/bi-connectors/TableauConnector/src/connectionBuilder.js
deleted file mode 100644
index 1a16fddaec..0000000000
--- a/bi-connectors/TableauConnector/src/connectionBuilder.js
+++ /dev/null
@@ -1,28 +0,0 @@
-(function dsbuilder(attr){
-	var connStr = "jdbc:opensearch://";
-	// Set SSL value in connection string 
-	if (attr[connectionHelper.attributeSSLMode] == "require"){
-		connStr += "https://";
-	} else {
-		connStr += "http://";
-	}
-
-	// Set host information in connection string
-	connStr += attr[connectionHelper.attributeServer] + ":" + attr[connectionHelper.attributePort] + "?";
-
-	// Set authentication values in connection string
-	var authAttrValue = attr[connectionHelper.attributeAuthentication];
-	if (authAttrValue == "auth-none"){
-		connStr += "auth=NONE&trustSelfSigned=" + attr["v-trustSelfSigned"];
-	} else if (authAttrValue == "auth-integrated"){
-		connStr += "auth=AWS_SIGV4";
-		var region = attr["v-region"];
-		if (region){
-			connStr += "&Region=" + region;
-		}
-	} else { //if (authAttrValue == "auth-user-pass"){
-		connStr += "auth=BASIC&user=" + attr[connectionHelper.attributeUsername] + "&password=" + attr[connectionHelper.attributePassword] + "&trustSelfSigned=" + attr["v-trustSelfSigned"];
-	}
-
-	return [connStr];
-})
diff --git a/bi-connectors/TableauConnector/src/connectionResolver.tdr b/bi-connectors/TableauConnector/src/connectionResolver.tdr
deleted file mode 100644
index c51adc002e..0000000000
--- a/bi-connectors/TableauConnector/src/connectionResolver.tdr
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<tdr class='opensearch_jdbc'>
-  <connection-resolver>
-    <connection-builder>
-      <script file='connectionBuilder.js'/>
-    </connection-builder>
-    <connection-normalizer>
-      <required-attributes>
-        <default-attributes>
-          <default-attribute name='server'>localhost</default-attribute>
-          <default-attribute name='port'>9200</default-attribute>
-        </default-attributes>
-         <attribute-list>
-          <attr>server</attr>
-          <attr>port</attr>
-          <attr>authentication</attr>
-          <attr>username</attr>
-          <attr>password</attr>
-          <attr>sslmode</attr>
-          <attr>v-region</attr>
-          <attr>v-trustSelfSigned</attr>
-        </attribute-list>
-      </required-attributes>
-    </connection-normalizer>
-  </connection-resolver>
-</tdr>
diff --git a/bi-connectors/TableauConnector/src/dialect.tdd b/bi-connectors/TableauConnector/src/dialect.tdd
deleted file mode 100644
index 0e5dd3723f..0000000000
--- a/bi-connectors/TableauConnector/src/dialect.tdd
+++ /dev/null
@@ -1,494 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dialect name='OpenSearchSqlJdbcDialect'
-         class='opensearch_jdbc'
-         base='MySQL41UnicodeDriverDialect'
-         version='18.1'>   
-   <function-map>   
-        <function group='aggregate' name='STDEV' return-type='real'>
-            <formula>STDDEV_SAMP(%1)</formula>
-            <unagg-formula>NULL</unagg-formula>
-            <argument type='real' />
-        </function>
-        <function group='aggregate' name='VAR' return-type='real'>
-            <formula>VAR_SAMP(%1)</formula>
-            <unagg-formula>NULL</unagg-formula>
-            <argument type='real' />
-        </function>
-
-        <function group='cast' name='DATE' return-type='date'>
-            <formula>DATE_FORMAT(%1, &apos;%Y-%m-%d&apos;)</formula>
-            <argument type='str' />
-        </function>
-        <function group='cast' name='STR' return-type='str'>
-            <formula>DATE_FORMAT(%1, &apos;%Y-%m-%d %H:%i:%s&apos;)</formula>
-            <argument type='datetime' />
-        </function>
-        <function group='cast' name='DATETIME' return-type='datetime'>
-            <formula>CAST(%1 AS TIMESTAMP)</formula>
-            <argument type='str' />
-        </function>
-        <function group='cast' name='FLOAT' return-type='real'>
-            <!-- 693961 = TO_DAYS('1900-01-01'), since this represents the date of the Epoch. -->
-            <formula>TO_DAYS(%1) - 693961.0</formula>
-            <argument type='datetime' />
-        </function>
-        <function group='cast' name='FLOAT' return-type='real'>
-            <formula>CAST(%1 AS DOUBLE)</formula>
-            <argument type='str' />
-        </function>
-        <function group='cast' name='STR' return-type='str'>
-            <formula>CAST(%1 AS STRING)</formula>
-            <argument type='real' />
-        </function>
-        <function group='cast' name='STR' return-type='str'>
-            <formula>CAST(%1 AS STRING)</formula>
-            <argument type='int' />
-        </function>
-        <function group='cast' name='STR' return-type='str'>
-            <formula>CAST(%1 AS STRING)</formula>
-            <argument type='date' />
-        </function>
-        <function group='cast' name='STR' return-type='str'>
-            <formula>CASE WHEN ISNULL(%1) THEN NULL WHEN %1 = TRUE THEN &apos;1&apos; WHEN %1 = FALSE THEN &apos;0&apos; END</formula>
-            <argument type='bool' />
-        </function>
-        <function group='cast' name='INT' return-type='int'>
-            <formula>CAST(%1 AS INT)</formula>
-            <argument type='real' />
-        </function>
-        <function group='cast' name='INT' return-type='int'>
-            <formula>CAST(%1 AS INT)</formula>
-            <argument type='bool' />
-        </function>
-        <function group='cast' name='INT' return-type='int'>
-            <!-- Casting to double covers the case where the string is not an integer. Casting a string double to int fails -->
-            <formula>CAST(CAST(%1 AS DOUBLE) AS INT)</formula>
-            <argument type='str' />
-        </function>
-
-        <function group='logical' name='IFNULL' return-type='datetime'>
-            <formula>CASE WHEN ISNULL(%1) THEN CAST(DATE_FORMAT(%2, '%Y-%m-%d 00:00:00') AS TIMESTAMP) ELSE %1 END</formula>
-            <argument type='datetime' />
-            <argument type='date' />
-        </function>
-        <function group='logical' name='IFNULL' return-type='datetime'>
-            <formula>CASE WHEN ISNULL(%1) THEN %2 ELSE CAST(DATE_FORMAT(%1, '%Y-%m-%d 00:00:00') AS TIMESTAMP) END</formula>
-            <argument type='date' />
-            <argument type='datetime' />
-        </function>
-
-        <function group='operator' name='==' return-type='bool'>
-            <formula>(%1 = CAST(DATE_FORMAT(%2, '%Y-%m-%d 00:00:00') AS TIMESTAMP))</formula>
-            <argument type='datetime' />
-            <argument type='date' />
-        </function>
-        <function group='operator' name='==' return-type='bool'>
-            <formula>(CAST(DATE_FORMAT(%1, '%Y-%m-%d 00:00:00') AS TIMESTAMP) = %2)</formula>
-            <argument type='date' />
-            <argument type='datetime' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 AND NOT %2 OR NOT %1 AND %2)</formula>
-            <argument type='bool' />
-            <argument type='bool' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 AND %2 = 0 OR NOT %1 AND %2 &lt;&gt; 0)</formula>
-            <argument type='bool' />
-            <argument type='int' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 &lt;&gt; %2)</formula>
-            <argument type='real' />
-            <argument type='real' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 = 0 AND %2 OR %1 &lt;&gt; 0 AND NOT %2)</formula>
-            <argument type='int' />
-            <argument type='bool' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 &lt;&gt; %2)</formula>
-            <argument type='str' />
-            <argument type='str' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 &lt;&gt; %2)</formula>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(CAST(DATE_FORMAT(DATE(%1), '%Y-%m-%d 00:00:00') AS TIMESTAMP) &lt;&gt; %2)</formula>
-            <argument type='date' />
-            <argument type='datetime' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 &lt;&gt; CAST(DATE_FORMAT(DATE(%2), '%Y-%m-%d 00:00:00') AS TIMESTAMP))</formula>
-            <argument type='datetime' />
-            <argument type='date' />
-        </function>
-        <function group='operator' name='&gt;' return-type='bool'>
-            <formula>(%1 &gt; CAST(DATE_FORMAT(%2, '%Y-%m-%d 00:00:00') AS TIMESTAMP))</formula>
-            <argument type='datetime' />
-            <argument type='date' />
-        </function>
-        <function group='operator' name='&gt;' return-type='bool'>
-            <formula>(CAST(DATE_FORMAT(%1, '%Y-%m-%d 00:00:00') AS TIMESTAMP)  &gt; %2)</formula>
-            <argument type='date' />
-            <argument type='datetime' />
-        </function>
-        <function group='operator' name='&gt;=' return-type='bool'>
-            <formula>(%1 &gt;= CAST(DATE_FORMAT(%2, '%Y-%m-%d 00:00:00') AS TIMESTAMP))</formula>
-            <argument type='datetime' />
-            <argument type='date' />
-        </function>
-        <function group='operator' name='&gt;=' return-type='bool'>
-            <formula>(CAST(DATE_FORMAT(%1, '%Y-%m-%d 00:00:00') AS TIMESTAMP)  &gt;= %2)</formula>
-            <argument type='date' />
-            <argument type='datetime' />
-        </function>
-        <function group='operator' name='&lt;' return-type='bool'>
-            <formula>(%1 &lt; CAST(DATE_FORMAT(%2, '%Y-%m-%d 00:00:00') AS TIMESTAMP))</formula>
-            <argument type='datetime' />
-            <argument type='date' />
-        </function>
-        <function group='operator' name='&lt;' return-type='bool'>
-            <formula>(CAST(DATE_FORMAT(%1, '%Y-%m-%d 00:00:00') AS TIMESTAMP)  &lt; %2)</formula>
-            <argument type='date' />
-            <argument type='datetime' />
-        </function>
-        <function group='operator' name='&lt;=' return-type='bool'>
-            <formula>(%1 &lt;= CAST(DATE_FORMAT(%2, '%Y-%m-%d 00:00:00') AS TIMESTAMP))</formula>
-            <argument type='datetime' />
-            <argument type='date' />
-        </function>
-        <function group='operator' name='&lt;=' return-type='bool'>
-            <formula>(CAST(DATE_FORMAT(%1, '%Y-%m-%d 00:00:00') AS TIMESTAMP)  &lt;= %2)</formula>
-            <argument type='date' />
-            <argument type='datetime' />
-        </function>
-        <function group='operator' name='+' return-type='datetime'>
-            <!-- 86400 as it represents seconds in a day -->
-            <formula>DATE_ADD(%1, INTERVAL CAST((86400 * %2) AS INT) SECOND)</formula>
-            <argument type='datetime' />
-            <argument type='real' />
-        </function>
-        <function group='operator' name='-' return-type='int'>
-            <formula>(%1 * -1)</formula>
-            <argument type='int' />
-        </function>
-        <function group='operator' name='-' return-type='real'>
-            <formula>(%1 * -1)</formula>
-            <argument type='real' />
-        </function>
-        <function group='operator' name='-' return-type='real'>
-            <!-- 86400 as it represents seconds in a day -->
-            <formula>((TO_DAYS(%1) - TO_DAYS(%2)) + ((TIME_TO_SEC(%1) - TIME_TO_SEC(%2)) / 86400.0))</formula>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </function>
-        <function group='operator' name='-' return-type='real'>
-            <!-- 86400 as it represents seconds in a day -->
-            <formula>((TO_DAYS(%1) - TO_DAYS(CAST(DATE_FORMAT(%2, '%Y-%m-%d 00:00:00') AS TIMESTAMP))) + ((TIME_TO_SEC(%1) - TIME_TO_SEC(CAST(DATE_FORMAT(%2, '%Y-%m-%d 00:00:00') AS TIMESTAMP))) / 86400.0))</formula>
-            <argument type='datetime' />
-            <argument type='date' />
-        </function>
-        <function group='operator' name='-' return-type='real'>
-            <!-- 86400 as it represents seconds in a day -->
-            <formula>((TO_DAYS(CAST(DATE_FORMAT(%1, '%Y-%m-%d 00:00:00') AS TIMESTAMP))) - TO_DAYS(%1) + ((TIME_TO_SEC(CAST(DATE_FORMAT(%1, '%Y-%m-%d 00:00:00') AS TIMESTAMP)) - TIME_TO_SEC(%2)) / 86400.0))</formula>
-            <argument type='date' />
-            <argument type='datetime' />
-        </function>
-        <function group='operator' name='-' return-type='datetime'>
-            <!-- 86400 as it represents seconds in a day -->
-            <formula>DATE_SUB(%1, INTERVAL CAST((86400 * %2) AS INT) SECOND)</formula>
-            <argument type='datetime' />
-            <argument type='real' />
-        </function>
-        <function group='operator' name='/' return-type='real'>
-            <formula>CAST(%1 AS DOUBLE) / %2</formula>
-            <argument type='int' />
-            <argument type='int' />
-        </function>
-
-        <function group="numeric" name="COT" return-type="real">
-            <formula>CASE WHEN %1 = 0 THEN NULL ELSE COT(%1) END</formula>
-            <argument type="real" />
-        </function>
-        <function group='numeric' name='DIV' return-type='int'>
-            <formula>CASE WHEN %2 = 0 THEN NULL ELSE ( %1 / %2 ) END</formula>
-            <argument type='int' />
-            <argument type='int' />
-        </function>
-        <function group='numeric' name='DIV' return-type='real'>
-            <formula>CASE WHEN %2 = 0 THEN NULL ELSE ( %1 / %2 ) END</formula>
-            <argument type='real' />
-            <argument type='real' />
-        </function>
-        <function group="numeric" name="LN" return-type="real">
-            <formula>(CASE WHEN %1 &gt; 0 THEN LN(%1) ELSE NULL END)</formula>
-            <argument type="real" />
-        </function>
-        <function group="numeric" name="LOG" return-type="real">
-            <formula>CASE WHEN %1 &gt; 0 THEN LOG10(%1) ELSE NULL END</formula>
-            <argument type="real" />
-        </function>
-        <function group="numeric" name="LOG" return-type="real">
-            <formula>CASE WHEN %1 &gt; 0 AND %2 &gt; 0 AND %2 &lt;&gt; 1 THEN LOG(%2,%1) ELSE NULL END</formula>
-            <argument type="real" />
-            <argument type="real" />
-        </function>
-        <function group='numeric' name='MAX' return-type='int'>
-            <formula>CASE WHEN ISNULL(%1) THEN NULL
-                WHEN ISNULL(%2) THEN NULL
-	            WHEN %1 &gt; %2 THEN %1
-                ELSE %2 END</formula>
-            <argument type='int' />
-            <argument type='int' />
-        </function>
-        <function group='numeric' name='MAX' return-type='real'>
-            <formula>CASE WHEN ISNULL(%1) THEN NULL
-                WHEN ISNULL(%2) THEN NULL
-	            WHEN %1 &gt; %2 THEN %1
-                ELSE %2 END</formula>
-            <argument type='real' />
-            <argument type='real' />
-        </function>
-        <function group='numeric' name='MAX' return-type='datetime'>
-            <formula>CASE WHEN ISNULL(%1) THEN NULL
-                WHEN ISNULL(%2) THEN NULL
-	            WHEN %1 &gt; %2 THEN %1
-                ELSE %2 END</formula>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </function>
-        <function group='numeric' name='MAX' return-type='str'>
-            <formula>CASE WHEN ISNULL(%1) THEN NULL
-                WHEN ISNULL(%2) THEN NULL
-	            WHEN %1 &gt; %2 THEN %1
-                ELSE %2 END</formula>
-            <argument type='str' />
-            <argument type='str' />
-        </function>
-        <function group='numeric' name='MIN' return-type='int'>
-            <formula>CASE WHEN ISNULL(%1) THEN NULL
-                WHEN ISNULL(%2) THEN NULL
-	            WHEN %1 &lt; %2 THEN %1
-                ELSE %2 END</formula>
-            <argument type='int' />
-            <argument type='int' />
-        </function>
-        <function group='numeric' name='MIN' return-type='real'>
-            <formula>CASE WHEN ISNULL(%1) THEN NULL
-                WHEN ISNULL(%2) THEN NULL
-	            WHEN %1 &lt; %2 THEN %1
-                ELSE %2 END</formula>
-            <argument type='real' />
-            <argument type='real' />
-        </function>
-        <function group='numeric' name='MIN' return-type='datetime'>
-            <formula>CASE WHEN ISNULL(%1) THEN NULL
-                WHEN ISNULL(%2) THEN NULL
-	            WHEN %1 &lt; %2 THEN %1
-                ELSE %2 END</formula>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </function>
-        <function group='numeric' name='MIN' return-type='str'>
-            <formula>CASE WHEN ISNULL(%1) THEN NULL
-                WHEN ISNULL(%2) THEN NULL
-	            WHEN %1 &lt; %2 THEN %1
-                ELSE %2 END</formula>
-            <argument type='str' />
-            <argument type='str' />
-        </function>
-        <function group='numeric' name='CEILING' return-type='int'>
-            <formula>CEIL(%1)</formula>
-            <argument type='real' />
-        </function>
-        <function group='numeric' name='FLOOR' return-type='int'>
-            <formula>FLOOR(%1)</formula>
-            <argument type='real' />
-        </function>
-        <function group='numeric' name='HEXBINX' return-type='real'>
-            <formula>(((CASE WHEN (ABS((%2) - (CAST( ( (%2) / SQRT(3.0) ) AS INT ) * SQRT(3.0)))) + (SQRT(3.0) * ((ABS((%1) - (CAST( ( (%1) / 3.0 ) AS INT ) * 3.0))) - 1.0)) &gt; 0.0 THEN 1.5 ELSE 0.0 END) - (CASE WHEN ((%1) - (CAST( ( (%1) / 3.0 ) AS INT ) * 3.0) &lt; 0.0) AND ((CASE WHEN (ABS((%2) - (CAST( ( (%2) / SQRT(3.0) ) AS INT ) * SQRT(3.0)))) + (SQRT(3.0) * ((ABS((%1) - (CAST( ( (%1) / 3.0 ) AS INT ) * 3.0))) - 1.0)) &gt; 0.0 THEN 1.5 ELSE 0.0 END) &gt; 0.0) THEN 3.0 ELSE 0.0 END)) + (CAST( ( (%1) / 3.0 ) AS INT ) * 3.0))</formula>
-            <argument type='real' />
-            <argument type='real' />
-        </function>
-        <function group='numeric' name='HEXBINY' return-type='real'>
-            <formula>ROUND( (((CASE WHEN (ABS((%2) - (ROUND( ( (%2) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + (SQRT(3.0) * ((ABS((%1) - (ROUND( ( (%1) / 3.0 ), 0 ) * 3.0))) - 1.0)) &gt; 0.0 THEN SQRT(3.0) / 2.0 ELSE 0.0 END) - (CASE WHEN ((%2) - (ROUND( ( (%2) / SQRT(3.0) ), 0 ) * SQRT(3.0)) &lt; 0.0) AND ((CASE WHEN (ABS((%2) - (ROUND( ( (%2) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + (SQRT(3.0) * ((ABS((%1) - (ROUND( ( (%1) / 3.0 ), 0 ) * 3.0))) - 1.0)) &gt; 0.0 THEN SQRT(3.0) / 2.0 ELSE 0.0 END) &gt; 0.0) THEN SQRT(3.0) ELSE 0.0 END)) + (ROUND( ( (%2) / SQRT(3.0) ), 0 ) * SQRT(3.0))), 3)</formula>
-            <argument type='real' />
-            <argument type='real' />
-        </function>
-
-        <function group='date' name='DAYOFYEAR' return-type='int'>
-            <formula>DAY_OF_YEAR(%1)</formula>
-            <argument type='date' />
-        </function>
-        <function group='date' name='DAYOFMONTH' return-type='int'>
-            <formula>DAY_OF_MONTH(%1)</formula>
-            <argument type='date' />
-        </function>
-        <function group='date' name='DAYOFWEEK' return-type='int'>
-            <formula>DAY_OF_WEEK(%1)</formula>
-            <argument type='date' />
-        </function>
-
-        <function group='string' name='LEFT' return-type='str'>
-            <formula>(CASE WHEN %2 >= 0 THEN LEFT(%1, CAST(%2 AS INT)) ELSE NULL END)</formula>
-            <argument type='str' />
-            <argument type='real' />
-        </function>
-        <function group='string' name='RIGHT' return-type='str'>
-            <formula>(CASE WHEN %2 >= 0 THEN RIGHT(%1, CAST(%2 AS INT)) ELSE NULL END)</formula>
-            <argument type='str' />
-            <argument type='real' />
-        </function>
-        <function group='string' name='MID' return-type='str'>
-            <formula>SUBSTR(%1,%2)</formula>
-            <argument type='str' />
-            <argument type='int' />
-        </function>
-        <function group='string' name='MID' return-type='str'>
-            <formula>SUBSTR(%1,CAST(%2 as int))</formula>
-            <argument type='str' />
-            <argument type='real' />
-        </function>
-        <function group='string' name='MID' return-type='str'>
-            <formula>SUBSTR(%1,%2,%3)</formula>
-            <argument type='str' />
-            <argument type='int' />
-            <argument type='int' />
-        </function>
-        <function group='string' name='MID' return-type='str'>
-            <formula>SUBSTR(%1,CAST(%2 as int),%3)</formula>
-            <argument type='str' />
-            <argument type='real' />
-            <argument type='int' />
-        </function>
-        <function group='string' name='MID' return-type='str'>
-            <formula>SUBSTR(%1,%2,CAST(%3 as int))</formula>
-            <argument type='str' />
-            <argument type='int' />
-            <argument type='real' />
-        </function>
-        <function group='string' name='MID' return-type='str'>
-            <formula>CASE WHEN %3 &lt; 1 THEN &apos;&apos; WHEN %2 &lt; 1 THEN SUBSTR(%1,1,CAST(%3 AS INT)) ELSE SUBSTR(%1,CAST(%2 AS INT),CAST(%3 AS INT)) END</formula>
-            <argument type='str' />
-            <argument type='real' />
-            <argument type='real' />
-        </function>
-
-        <function group='string' name='FIND' return-type='int'>
-<!--        The formula was simplified, because OS returns valid results even if the argument is NULL or <1 -->
-<!--        <formula>(CASE WHEN ISNULL(%3) THEN NULL WHEN %3 &gt;= 1 THEN LOCATE(%2,%1,CAST(%3 as int)) ELSE LOCATE(%2,%1,1) END)</formula>-->
-            <formula>LOCATE(%2,%1,CAST(%3 as int))</formula>
-            <argument type='str' />
-            <argument type='str' />
-            <argument type='real' />
-        </function>
-        <function group='string' name='FIND' return-type='int'>
-            <formula>LOCATE(%2,%1,%3)</formula>
-            <argument type='str' />
-            <argument type='str' />
-            <argument type='int' />
-        </function>
-
-        <date-function name='DATEDIFF' return-type='int'>
-            <formula part='year'>(YEAR(%3) - YEAR(%2))</formula>
-            <formula part='quarter'>((YEAR(%3) - YEAR(%2)) * 4 + (QUARTER(%3) - QUARTER(%2)))</formula>
-            <formula part='month'>((YEAR(%3) - YEAR(%2)) * 12 + (MONTH(%3) - MONTH(%2)))</formula>
-            <formula part='dayofyear'>(TO_DAYS(%3) - TO_DAYS(%2))</formula>
-            <formula part='day'>(TO_DAYS(%3) - TO_DAYS(%2))</formula>
-            <formula part='weekday'>(TO_DAYS(%3) - TO_DAYS(%2))</formula>
-            <formula part='week'>FLOOR(((TO_DAYS(%3) - (DAYOFWEEK(%3) - 1)) - (TO_DAYS(%2) - (DAYOFWEEK(%2) - 1)))/7)</formula>
-            <!-- 3600 as it represents seconds in an hour -->
-            <formula part='hour'>((TO_DAYS(%3) - TO_DAYS(%2)) * 24 + FLOOR(TIME_TO_SEC(%3) / 3600) - FLOOR(TIME_TO_SEC(%2) / 3600))</formula>
-            <!-- 1440 as it represents minutes in a day -->
-            <formula part='minute'>((TO_DAYS(%3) - TO_DAYS(%2)) * 1440 + FLOOR(TIME_TO_SEC(%3) / 60) - FLOOR(TIME_TO_SEC(%2) / 60))</formula>
-            <!-- 86400 as represents seconds in a day -->
-            <formula part='second'>((TO_DAYS(%3) - TO_DAYS(%2)) * 86400 + (TIME_TO_SEC(%3) - TIME_TO_SEC(%2)))</formula>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </date-function>
-        <date-function name='DATEDIFF' return-type='int'>
-            <formula part='week'>FLOOR((( TO_DAYS(%3) - ((7 + DAYOFWEEK(%3) - 2) % 7)) - (TO_DAYS(%2) - ((7 + DAYOFWEEK(%2) - 2) % 7) ) )/7)</formula>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </date-function>
-        <date-function name='DATENAME' return-type='str'>
-            <formula part='year'>YEAR(%2)</formula>
-            <formula part='quarter'>QUARTER(%2)</formula>
-            <formula part='month'>MONTH(%2)</formula>
-            <formula part='dayofyear'>DAYOFYEAR(%2)</formula>
-            <formula part='day'>DAYOFMONTH(%2)</formula>
-            <formula part='weekday'>DAYNAME(%2)</formula>
-            <formula part='week'>FLOOR((7 + DAYOFYEAR(%2) - 1 + DAYOFWEEK(DATE_FORMAT(%2, '%Y-01-01 00:00:00')) - 1) / 7)</formula>
-            <formula part='hour'>HOUR(%2)</formula>
-            <formula part='minute'>MINUTE(%2)</formula>
-            <formula part='second'>SECOND(%2)</formula>
-            <argument type='localstr' />
-            <argument type='datetime' />
-        </date-function>
-        <date-function name='DATENAME' return-type='str'>
-            <formula part='week'>FLOOR((7 + DAYOFYEAR(%2) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(%2, '%Y-01-01 00:00:00')) - 2) % 7) ) / 7)</formula>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-       </date-function>
-       <date-function name='DATETRUNC' return-type='datetime'>
-            <formula part='year'>DATE_FORMAT( %2, &apos;%Y-01-01 00:00:00&apos; )</formula>
-            <formula part='quarter'>CONCAT(DATE_FORMAT(%2, '%Y-'), CONCAT(CAST((3*(QUARTER(%2)-1)+1) AS STRING), '-01 00:00:00'))</formula>
-            <formula part='month'>DATE_FORMAT( %2, &apos;%Y-%m-01 00:00:00&apos; )</formula>
-            <formula part='dayofyear'>DATE_FORMAT( %2, &apos;%Y-%m-%d 00:00:00&apos; )</formula>
-            <formula part='day'>DATE_FORMAT( %2, &apos;%Y-%m-%d 00:00:00&apos; )</formula>
-            <formula part='weekday'>DATE_FORMAT( %2, &apos;%Y-%m-%d 00:00:00&apos; )</formula>
-            <formula part='week'>FROM_DAYS( TO_DAYS(%2) - (DAYOFWEEK(%2) - 1))</formula>
-            <formula part='hour'>DATE_FORMAT( %2, &apos;%Y-%m-%d %H:00:00&apos; )</formula>
-            <formula part='minute'>DATE_FORMAT( %2, &apos;%Y-%m-%d %H:%i:00&apos; )</formula>
-            <formula part='second'>DATE_FORMAT( %2, &apos;%Y-%m-%d %H:%i:%s&apos; )</formula>
-            <argument type='localstr' />
-            <argument type='datetime' />
-        </date-function>
-        <date-function name='DATETRUNC' return-type='datetime'>
-            <formula part='week'>FROM_DAYS( TO_DAYS(%2) - ((7 + DAYOFWEEK(%2) - 2) % 7) )</formula>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </date-function>
-
-        <remove-function name='FINDNTH'>
-            <argument type='str' />
-            <argument type='str' />
-            <argument type='real' />        
-        </remove-function>
-
-        <remove-function name='DATEPARSE'>
-            <argument type='localstr' />
-            <argument type='str' />
-        </remove-function>
-
-        <remove-function name='USEC_TO_TIMESTAMP'>
-            <argument type='int' />
-        </remove-function>
-
-        <remove-function name='TIMESTAMP_TO_USEC'>
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='SPACE'>
-            <argument type='int' />
-        </remove-function>
-        <remove-function name='SPACE'>
-            <argument type='real' />
-        </remove-function>
-        <remove-function name='SPLIT'>
-            <argument type='str' />
-            <argument type='localstr' />
-            <argument type='localint' />
-        </remove-function>
-   </function-map>
-</dialect>
diff --git a/bi-connectors/TableauConnector/src/manifest.xml b/bi-connectors/TableauConnector/src/manifest.xml
deleted file mode 100644
index 0fe6f88f85..0000000000
--- a/bi-connectors/TableauConnector/src/manifest.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<connector-plugin class='opensearch_jdbc' superclass='jdbc' plugin-version='2.0.0.0' name='OpenSearch' version='18.1' min-version-tableau='2021.1'>
-  <vendor-information>
-      <company name="OpenSearch Project"/>
-      <support-link url="https://forum.opensearch.org/"/>
-  </vendor-information>
-  <connection-customization class="opensearch_jdbc" enabled="true" version="10.0">
-    <vendor name="OpenSearch Project"/>
-    <driver name="SQL"/>
-    <customizations>
-      <customization name="CAP_CREATE_TEMP_TABLES" value="no"/>
-      <customization name="CAP_SUPPRESS_DISCOVERY_QUERIES" value="yes" />
-      <customization name="CAP_SELECT_INTO" value="no"/>
-      <customization name="CAP_SELECT_TOP_INTO" value="no"/>
-      <customization name="CAP_QUERY_BOOLEXPR_TO_INTEXPR" value="no"/>
-      <customization name="CAP_QUERY_GROUP_BY_ALIAS" value="yes"/>
-      <customization name="CAP_QUERY_GROUP_BY_BOOL" value="yes"/>
-      <customization name="CAP_QUERY_GROUP_BY_DEGREE" value="no"/>
-      <customization name="CAP_QUERY_SORT_BY" value="yes"/>
-      <customization name="CAP_QUERY_SUBQUERIES" value="yes"/>
-      <customization name="CAP_QUERY_TOP_N" value="no"/>
-      <customization name="CAP_QUERY_SUPPORT_EMPTY_GROUPBY" value="no"/>
-      <customization name="CAP_QUERY_WHERE_FALSE_METADATA" value="yes"/>
-      <customization name="CAP_QUERY_SUBQUERIES_WITH_TOP" value="yes"/>
-      <customization name="CAP_SUPPORTS_SPLIT_FROM_LEFT" value="yes"/>
-      <customization name="CAP_SUPPORTS_SPLIT_FROM_RIGHT" value="yes"/>
-      <customization name="CAP_QUERY_ALLOW_PARTIAL_AGGREGATION" value="no"/>
-      <customization name="CAP_QUERY_TIME_REQUIRES_CAST" value="yes"/>
-      <customization name="CAP_JDBC_METADATA_USE_RESULTSET_FOR_TABLE" value="yes"/>
-      <customization name="CAP_JDBC_METADATA_GET_INDEX_INFO" value="no"/>
-      <customization name="CAP_JDBC_METADATA_IGNORE_NULLABILITY" value="yes"/>
-      <customization name="CAP_JDBC_METADATA_READ_FOREIGNKEYS" value="no"/>
-      <customization name="CAP_JDBC_METADATA_READ_PRIMARYKEYS" value="no"/>
-      <customization name="CAP_JDBC_SUPPRESS_ENUMERATE_DATABASES" value="yes"/>
-      <customization name="CAP_JDBC_SUPPRESS_ENUMERATE_SCHEMAS" value="yes"/>
-      <!-- OpenSearch SQL can't proceed queries longer than ~1.5k. This setting could help to avoid this limitation. It limits the max length of the string, not of the query. -->
-      <customization name="CAP_JDBC_MAX_STRING_LENGTH_MEDIUM" value="yes"/>
-      <customization name="CAP_CONNECT_STORED_PROCEDURE" value="no"/>
-      <customization name="CAP_SUPPORTS_UNION" value="no"/>
-      <!-- 
-      CAP_SUPPRESS_GET_SERVER_TIME will fix the error while creating extract in tableau.
-      This can be removed when OpenSearch supports query without FROM clause.
-      For smore details: https://community.tableau.com/message/1092123?et=watches.email.thread#1092123
-      -->
-      <customization name="CAP_SUPPRESS_GET_SERVER_TIME" value="yes"/>
-    </customizations>
-  </connection-customization>
-  <connection-fields file="connection-fields.xml" />
-  <connection-metadata file='connection-metadata.xml'/>
-  <connection-resolver file="connectionResolver.tdr"/>
-  <dialect file='dialect.tdd'/>
-</connector-plugin>
diff --git a/bi-connectors/TableauConnector/tableau_support.md b/bi-connectors/TableauConnector/tableau_support.md
deleted file mode 100644
index 57c3be6eb2..0000000000
--- a/bi-connectors/TableauConnector/tableau_support.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Connecting OpenSearch to Tableau Desktop via the Tableau Connector
-
-## Overview
-
-Connect an OpenSearch data source to Tableau Desktop via the Tableau Connector to create a basic graph.
-
-## Prerequisites
-
-* Download and Install [Tableau Desktop](https://www.tableau.com/products/desktop/download) 2020 and higher
-* Install and Configure [OpenSearch](https://docs-beta.opensearch.org/opensearch/install/index/)
-* Download and Install [OpenSearch SQL JDBC driver](../../sql-jdbc/README.md)
-* Download Tableau Connector ([opensearch_sql_jdbc.taco](opensearch_sql_jdbc.taco)).
-Click on **Download** option for downloading `opensearch_sql_jdbc.taco` file.
-<img src="img/tableau_download_taco.png" >
-
-## Prepare data 
-
-* Copy `opensearch_sql_jdbc.taco` file to My Tableau Repository.
-
-  * On windows: **%User%/Documents/My Tableau Repository/Connectors/**.
-  * On Mac: **~/Documents/My Tableau Repository/Connectors/**.
-
-* Open Tableau using following command
-
-```
-<full-Tableau-path>\bin\tableau.exe -DDisableVerifyConnectorPluginSignature=true
-```
-
-* Click on **Connect** > **More** > **OpenSearch by OpenSearch Project**.
-
-<img src="img/tableau_select_connector.png" width=600>
-
-* Enter **Server** & **Port** value. 
-* Select required authentication option. For **AWS_SIGV4** authentication, select **AWS_SIGv4** and enter value for **Region**. You need to create `~/.aws/credentials` and add `default` profile with aws access key id and secret key.
-* Use **Additional Options** section for specifying options like **FetchSize**, **ResponseTimeout**. Use `;` to separate values. For example,
-
-```
-FetchSize=2000;ResponseTimeout=20;
-```
-
-<img src="img/tableau_dialog.png" width=400>
-
-* Click on **Sign In**.
-* You will get a list of tables when the connection is successful.
-
-<img src="img/tableau_table_list.png">
-
-## Analyze Data
-
-To generate a graph,
-
-* Double click on any required table from the list and click on **Update Now** to load data preview.
-
-<img src="img/tableau_select_table.png">
-
-* Data preview will be loaded.
-
-<img src="img/tableau_data_preview.png">
-
-* Click on **Sheet 1**. You can see a list of attributes under section **Data**.
-
-<img src="img/tableau_columns_list.png">
-
-* Double click on any required attributes to generate a simple graph. 
-
-<img src="img/tableau_graph.png">
-
-* You can change visualizations by selecting any active visualization from **Show Me**.
diff --git a/bi-connectors/TableauConnector/tdvt_test_results.csv b/bi-connectors/TableauConnector/tdvt_test_results.csv
deleted file mode 100644
index df931ed6b4..0000000000
--- a/bi-connectors/TableauConnector/tdvt_test_results.csv
+++ /dev/null
@@ -1,19370 +0,0 @@
-Suite,Test Set,TDSName,TestName,TestPath,Passed,Closest Expected,Diff count,Test Case,Test Type,Priority,Categories,Functions,Process Output,Error Msg,Error Type,Query Time (ms),Generated SQL,Actual (100)tuples,Expected (100)tuples
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,lod.calcs,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests/lodcalcs\setup.lod.calcs.txt,False,0,17,{fixed [str1] : SUM([num1])},expression,Required If Supported,"Level of Detail,Aggregation,Table Calc,Operator,Calculation","COUNT,$AGGREGATE$,EXCLUDE,AVG,/,SUM,FIXED,INDEX",,"
-      Error executing query
-
-    ",Actual does not match expected.,361.0,"
-      SELECT `t0`.`TEMP(Test)(2300115098)(0)` AS `TEMP(Test)(2300115098)(0)`
-FROM (
-  SELECT SUM(`calcs`.`num1`) AS `TEMP(Test)(2300115098)(0)`
-  FROM `calcs`
-  GROUP BY `calcs`.`str1`
-) `t0`
-GROUP BY `TEMP(Test)(2300115098)(0)`
-    ",,"2.47
-6.71
-7.1
-7.12
-7.43
-8.42
-9.05
-9.38
-9.47
-9.78
-10.32
-10.37
-11.38
-12.05
-12.4
-16.42
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,lod.calcs,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests/lodcalcs\setup.lod.calcs.txt,True,0,0,{exclude [str1] : SUM([num1])},expression,Required If Supported,"Level of Detail,Aggregation,Table Calc,Operator,Calculation","COUNT,$AGGREGATE$,EXCLUDE,AVG,/,SUM,FIXED,INDEX",,None,None,145.0,"
-      SELECT SUM(`calcs`.`num1`) AS `TEMP(Test)(4279721284)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",166.68,166.68
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,lod.calcs,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests/lodcalcs\setup.lod.calcs.txt,False,0,17,{include [str1] : SUM([num1])},expression,Required If Supported,"Level of Detail,Aggregation,Table Calc,Operator,Calculation","COUNT,$AGGREGATE$,EXCLUDE,AVG,/,SUM,FIXED,INDEX",,"
-      Error executing query
-
-    ",Actual does not match expected.,64.0,"
-      SELECT `t0`.`TEMP(Test)(3262646021)(0)` AS `TEMP(Test)(3262646021)(0)`
-FROM (
-  SELECT SUM(`calcs`.`num1`) AS `TEMP(Test)(3262646021)(0)`
-  FROM `calcs`
-  GROUP BY `calcs`.`str1`
-) `t0`
-GROUP BY `TEMP(Test)(3262646021)(0)`
-    ",,"2.47
-6.71
-7.1
-7.12
-7.43
-8.42
-9.05
-9.38
-9.47
-9.78
-10.32
-10.37
-11.38
-12.05
-12.4
-16.42
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,lod.calcs,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests/lodcalcs\setup.lod.calcs.txt,False,0,1,SUM([num1]) / AVG({fixed [str1] : SUM([num1])}),expression,Required If Supported,"Level of Detail,Aggregation,Table Calc,Operator,Calculation","COUNT,$AGGREGATE$,EXCLUDE,AVG,/,SUM,FIXED,INDEX",,"
-      Error executing query
-
-    ",Actual does not match expected.,87.0,"
-      SELECT (`t0`.`__measure__0` / `t2`.`__measure__1`) AS `TEMP(Test)(3502400386)(0)`
-FROM (
-  SELECT SUM(`calcs`.`num1`) AS `__measure__0`
-  FROM `calcs`
-  HAVING (COUNT(1) > 0)
-) `t0`
-  CROSS JOIN (
-  SELECT AVG(`t1`.`__measure__0`) AS `__measure__1`
-  FROM (
-    SELECT SUM(`calcs`.`num1`) AS `__measure__0`
-    FROM `calcs`
-    GROUP BY `calcs`.`str1`
-  ) `t1`
-  HAVING (COUNT(1) > 0)
-) `t2`
-    ",,17.0
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,lod.calcs,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests/lodcalcs\setup.lod.calcs.txt,False,0,17,{fixed [str1] : AVG({include [str2] : SUM([num1])})},expression,Required If Supported,"Level of Detail,Aggregation,Table Calc,Operator,Calculation","COUNT,$AGGREGATE$,EXCLUDE,AVG,/,SUM,FIXED,INDEX",,"
-      Error executing query
-
-    ",Actual does not match expected.,63.0,"
-      SELECT `t1`.`TEMP(Test)(1869227114)(0)` AS `TEMP(Test)(1869227114)(0)`
-FROM (
-  SELECT AVG(`t0`.`__measure__1`) AS `TEMP(Test)(1869227114)(0)`
-  FROM (
-    SELECT `calcs`.`str1` AS `str1`,
-      SUM(`calcs`.`num1`) AS `__measure__1`
-    FROM `calcs`
-    GROUP BY `str1`,
-      `calcs`.`str2`
-  ) `t0`
-  GROUP BY `t0`.`str1`
-) `t1`
-GROUP BY `TEMP(Test)(1869227114)(0)`
-    ",,"2.47
-6.71
-7.1
-7.12
-7.43
-8.42
-9.05
-9.38
-9.47
-9.78
-10.32
-10.37
-11.38
-12.05
-12.4
-16.42
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.Date_In,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.Date_In.simple_lower.xml,False,0,3,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.Date_In.simple_lower.xml,logical,Required,Sets,$IN_SET$,"Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      
-
-    ",Actual does not match expected.,37.0,"
-      SELECT `Calcs`.`key` AS `key`
-FROM `calcs` `Calcs`
-WHERE (`Calcs`.`date0` IN (TIMESTAMP('1972-07-04 00:00:00'), TIMESTAMP('1975-11-12 00:00:00'), TIMESTAMP('2004-06-19 00:00:00')))
-GROUP BY `key`
-    ",,"""key01""
-""key02""
-""key04"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.Date_In_Time,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.Date_In_Time.simple_lower.xml,False,0,2,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.Date_In_Time.simple_lower.xml,logical,unknown,unknown,unknown,"Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",Actual does not match expected.,Actual does not match expected.,27.0,"
-      SELECT DATE_FORMAT( DATE(`Calcs`.`date0`), '%Y-%m-%d 00:00:00' ) AS `tdy_Calculation_2683863928708153344_ok`
-FROM `calcs` `Calcs`
-WHERE (DATE_FORMAT( DATE(`Calcs`.`date0`), '%Y-%m-%d 00:00:00' ) IN (TIMESTAMP('1972-07-04 00:00:00'), TIMESTAMP('1975-11-12 00:00:00')))
-GROUP BY `tdy_Calculation_2683863928708153344_ok`
-    ",,"#1972-07-04 00:00:00#
-#1975-11-12 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,BUGS.B26728,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B26728.simple_lower.xml,True,0,0,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B26728.simple_lower.xml,logical,Required,"Bins,Date Filters","SYS_NUMBIN,DATEDIFF","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",None,None,46.0,"
-      SELECT FLOOR((TO_DAYS(`Calcs`.`date0`) - TO_DAYS(`Calcs`.`datetime0`)) / 2) AS `DayDiffs1 (bin)`,
-  FLOOR((TO_DAYS(`Calcs`.`datetime0`) - TO_DAYS(`Calcs`.`date0`)) / 3) AS `DayDiffs2 (bin)`,
-  FLOOR((TO_DAYS(`Calcs`.`date0`) - TO_DAYS(`Calcs`.`date1`)) / 4) AS `DayDiffs3 (bin)`,
-  FLOOR((YEAR(`Calcs`.`date0`) - YEAR(`Calcs`.`datetime0`)) / 2) AS `YearDiffs1 (bin)`,
-  FLOOR((YEAR(`Calcs`.`datetime0`) - YEAR(`Calcs`.`date0`)) / 3) AS `YearDiffs2 (bin)`,
-  FLOOR((YEAR(`Calcs`.`date0`) - YEAR(`Calcs`.`date1`)) / 4) AS `YearDiffs3 (bin)`
-FROM `calcs` `Calcs`
-GROUP BY `DayDiffs1 (bin)`,
-  `DayDiffs2 (bin)`,
-  `DayDiffs3 (bin)`,
-  `YearDiffs1 (bin)`,
-  `YearDiffs2 (bin)`,
-  `YearDiffs3 (bin)`
-    ","%null%
-%null%
-%null%
-%null%
-%null%
-%null%
--5855
-3903
--2898
--16
-10
--8
--5245
-3497
--2592
--14
-9
--7
--42
-28
-3
-0
-0
-0
--19
-13
-18
-0
-0
-0
--15
-10
-15
-0
-0
-0","%null%
-%null%
-%null%
-%null%
-%null%
-%null%
--5855
-3903
--2898
--16
-10
--8
--5245
-3497
--2592
--14
-9
--7
--42
-28
-3
-0
-0
-0
--19
-13
-18
-0
-0
-0
--15
-10
-15
-0
-0
-0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,BUGS.B27875-asc-nulls-first,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B27875-asc-nulls-first.simple_lower.xml,False,0,4,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B27875-asc-nulls-first.simple_lower.xml,logical,Recommended,"Temp Tables and Subqueries,Filters,Aggregation","SUM,TEMP_TABLES_AND_SUBQUERIES","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",Actual does not match expected.,Actual does not match expected.,28.0,"
-      SELECT `Calcs`.`key` AS `key`,
-  SUM(`Calcs`.`num2`) AS `sum_num2_ok`
-FROM `calcs` `Calcs`
-GROUP BY `key`
-ORDER BY `sum_num2_ok` ASC
-LIMIT 10
-    ","""key02""
-0.0
-""key03""
-8.51
-""key04""
-6.46
-""key05""
-8.98
-""key08""
-0.0
-""key10""
-6.8
-""key11""
-3.79
-""key12""
-0.0
-""key14""
-0.0
-""key16""
-7.87","""key02""
-%null%
-""key03""
-8.51
-""key04""
-6.46
-""key05""
-8.98
-""key08""
-%null%
-""key10""
-6.8
-""key11""
-3.79
-""key12""
-%null%
-""key14""
-%null%
-""key16""
-7.87"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,BUGS.B27875-desc-nulls-last,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B27875-desc-nulls-last.simple_lower.xml,True,0,0,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B27875-desc-nulls-last.simple_lower.xml,logical,Recommended,"Temp Tables and Subqueries,Filters,Aggregation","SUM,TEMP_TABLES_AND_SUBQUERIES","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",None,None,23.0,"
-      SELECT `Calcs`.`key` AS `key`,
-  SUM(`Calcs`.`num2`) AS `sum_num2_ok`
-FROM `calcs` `Calcs`
-GROUP BY `key`
-ORDER BY `sum_num2_ok` DESC
-LIMIT 10
-    ","""key00""
-17.86
-""key01""
-16.73
-""key03""
-8.51
-""key05""
-8.98
-""key06""
-11.69
-""key07""
-17.25
-""key09""
-11.5
-""key13""
-13.04
-""key15""
-10.98
-""key16""
-7.87","""key00""
-17.86
-""key01""
-16.73
-""key03""
-8.51
-""key05""
-8.98
-""key06""
-11.69
-""key07""
-17.25
-""key09""
-11.5
-""key13""
-13.04
-""key15""
-10.98
-""key16""
-7.87"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,BUGS.B59740,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B59740.simple_lower.xml,False,0,4,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B59740.simple_lower.xml,logical,Required,"Filters,Sets,Operator","$IN_SET$,==","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,41.0,"
-      SELECT (CASE WHEN (`Calcs`.`str2` IN ('eleven', 'fifteen', 'five', 'fourteen', 'nine', 'one', 'six', 'sixteen', 'ten', 'three', 'twelve')) THEN 'eleven' ELSE `Calcs`.`str2` END) AS `Str2 (group)`
-FROM `calcs` `Calcs`
-GROUP BY `Str2 (group)`
-    ",,"%null%
-""eight""
-""eleven""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,BUGS.B641638,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B641638.simple_lower.xml,False,0,12,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B641638.simple_lower.xml,logical,Recommended,"Sets,Aggregation","SUM,$IN_SET$","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      
-
-    ",Actual does not match expected.,37.0,"
-      SELECT `Calcs`.`str1` AS `str1`,
-  SUM(`Calcs`.`num1`) AS `sum_num1_ok`,
-  `Calcs`.`time0` AS `time0`
-FROM `calcs` `Calcs`
-WHERE (`Calcs`.`time0` IN (TIMESTAMP('1899-12-30 21:07:32'), TIMESTAMP('1899-12-30 22:42:43'), TIMESTAMP('1900-01-01 04:57:51'), TIMESTAMP('1900-01-01 18:51:48')))
-GROUP BY `str1`,
-  `time0`
-    ",,"""BINDER ACCESSORIES""
-7.43
-#1900-01-01 18:51:48#
-""CLAMP ON LAMPS""
-8.42
-#21:07:32#
-""CORDLESS KEYBOARDS""
-10.37
-#1900-01-01 04:57:51#
-""DOT MATRIX PRINTERS""
-7.1
-#22:42:43#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.FilterBy-to-no-results,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.FilterBy-to-no-results.simple_lower.xml,True,0,0,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.FilterBy-to-no-results.simple_lower.xml,logical,Required,"Filters,Operator,Aggregation","SUM,>","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",None,None,23.0,"
-      SELECT `Calcs`.`str2` AS `str2`
-FROM `calcs` `Calcs`
-GROUP BY `str2`
-HAVING (SUM(`Calcs`.`int2`) > 1000)
-    ",,
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.QFilter-Null,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-Null.simple_lower.xml,False,0,18,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-Null.simple_lower.xml,logical,Required,"NULL Semantics,Aggregation,Calculation","SUM,ISNULL","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",Actual does not match expected.,Actual does not match expected.,20.0,"
-      SELECT `Calcs`.`key` AS `key`,
-  SUM(`Calcs`.`int1`) AS `sum_int1_ok`
-FROM `calcs` `Calcs`
-GROUP BY `key`
-HAVING ISNULL(SUM(`Calcs`.`int1`))
-    ",,"""key02""
-%null%
-""key04""
-%null%
-""key05""
-%null%
-""key06""
-%null%
-""key10""
-%null%
-""key12""
-%null%
-""key13""
-%null%
-""key14""
-%null%
-""key15""
-%null%"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.QFilter-max-NotNull,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-max-NotNull.simple_lower.xml,False,0,26,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-max-NotNull.simple_lower.xml,logical,Required,"Filters,Operator,Aggregation","SUM,<=","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",Actual does not match expected.,Actual does not match expected.,21.0,"
-      SELECT `Calcs`.`key` AS `key`,
-  SUM(`Calcs`.`int1`) AS `sum_int1_ok`
-FROM `calcs` `Calcs`
-GROUP BY `key`
-HAVING (SUM(`Calcs`.`int1`) <= 2)
-    ","""key00""
--3
-""key01""
--6
-""key02""
-0
-""key03""
--4
-""key04""
-0
-""key05""
-0
-""key06""
-0
-""key07""
-2
-""key10""
-0
-""key11""
--8
-""key12""
-0
-""key13""
-0
-""key14""
-0
-""key15""
-0
-""key16""
--9","""key00""
--3
-""key01""
--6
-""key03""
--4
-""key07""
-2
-""key11""
--8
-""key16""
--9"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.QFilter-min-NotNull,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-min-NotNull.simple_lower.xml,False,0,24,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-min-NotNull.simple_lower.xml,logical,Required,"Filters,Operator,Aggregation","SUM,>=","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",Actual does not match expected.,Actual does not match expected.,23.0,"
-      SELECT `Calcs`.`key` AS `key`,
-  SUM(`Calcs`.`int1`) AS `sum_int1_ok`
-FROM `calcs` `Calcs`
-GROUP BY `key`
-HAVING (SUM(`Calcs`.`int1`) >= 0)
-    ","""key02""
-0
-""key04""
-0
-""key05""
-0
-""key06""
-0
-""key07""
-2
-""key08""
-3
-""key09""
-3
-""key10""
-0
-""key12""
-0
-""key13""
-0
-""key14""
-0
-""key15""
-0","""key07""
-2
-""key08""
-3
-""key09""
-3"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.datetime_fractional,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.datetime_fractional.simple_lower.xml,True,0,0,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.datetime_fractional.simple_lower.xml,logical,Recommended,"Filters,Operator,Temp Tables and Subqueries","TEMP_TABLES_AND_SUBQUERIES,==","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",None,None,24.0,"
-      SELECT CAST('2016-07-15 10:11:12.123' AS TIMESTAMP) AS `Calculation_958703807427547136`
-FROM `calcs` `Calcs`
-WHERE (CAST('2016-07-15 10:11:12.123' AS TIMESTAMP) = TIMESTAMP('2016-07-15 10:11:12.123'))
-HAVING (COUNT(1) > 0)
-    ",#2016-07-15 10:11:12.123#,#2016-07-15 10:11:12.123#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Query.Filter.IsNULL,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Query.Filter.IsNULL.simple_lower.xml,True,0,0,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Query.Filter.IsNULL.simple_lower.xml,logical,Required,"NULL Semantics,Aggregation,Calculation","SUM,ISNULL","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",None,None,21.0,"
-      SELECT `Calcs`.`str2` AS `str2`,
-  SUM(`Calcs`.`num3`) AS `sum_num3_ok`
-FROM `calcs` `Calcs`
-WHERE ISNULL(`Calcs`.`str2`)
-GROUP BY `str2`
-    ","%null%
--5.54","%null%
--5.54"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,join.null.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.bool.simple_lower.xml,False,0,51,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.bool.simple_lower.xml,logical,Required If Supported,"Aggregation,Column Metadata Nullability","SUM,COLUMN_NULLABILITY","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,39.0,"
-      SELECT `t0`.`__measure__0` AS `Calculation_845269395859349504`,
-  `Calcs`.`bool1` AS `bool1`,
-  SUM(`Calcs`.`num1`) AS `sum_num1_ok`
-FROM `calcs` `Calcs`
-  INNER JOIN (
-  SELECT `Calcs`.`bool1` AS `bool1`,
-    `Calcs`.`key` AS `key`,
-    SUM(`Calcs`.`num1`) AS `__measure__0`
-  FROM `calcs` `Calcs`
-  GROUP BY `bool1`,
-    `key`
-) `t0` ON ((`Calcs`.`bool1` <=> `t0`.`bool1`) AND (`Calcs`.`key` <=> `t0`.`key`))
-GROUP BY `Calculation_845269395859349504`,
-  `bool1`
-    ",,"2.47
-true
-2.47
-6.71
-true
-6.71
-7.1
-false
-7.1
-7.12
-%null%
-7.12
-7.43
-false
-7.43
-8.42
-true
-8.42
-9.05
-false
-9.05
-9.38
-false
-9.38
-9.47
-%null%
-9.47
-9.78
-true
-9.78
-10.32
-true
-10.32
-10.37
-false
-10.37
-11.38
-%null%
-11.38
-12.05
-false
-12.05
-12.4
-true
-12.4
-16.42
-%null%
-16.42
-16.81
-%null%
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,join.null.date,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.date.simple_lower.xml,False,0,51,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.date.simple_lower.xml,logical,Required If Supported,"Aggregation,Column Metadata Nullability","SUM,COLUMN_NULLABILITY","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,42.0,"
-      SELECT `t0`.`__measure__0` AS `Calculation_845269395859349504`,
-  `Calcs`.`date0` AS `date0`,
-  SUM(`Calcs`.`num1`) AS `sum_num1_ok`
-FROM `calcs` `Calcs`
-  INNER JOIN (
-  SELECT `Calcs`.`date0` AS `date0`,
-    `Calcs`.`key` AS `key`,
-    SUM(`Calcs`.`num1`) AS `__measure__0`
-  FROM `calcs` `Calcs`
-  GROUP BY `date0`,
-    `key`
-) `t0` ON ((`Calcs`.`date0` <=> `t0`.`date0`) AND (`Calcs`.`key` <=> `t0`.`key`))
-GROUP BY `Calculation_845269395859349504`,
-  `date0`
-    ",,"2.47
-%null%
-2.47
-6.71
-#1972-07-04 00:00:00#
-6.71
-7.1
-%null%
-7.1
-7.12
-%null%
-7.12
-7.43
-#2004-06-04 00:00:00#
-7.43
-8.42
-#2004-04-15 00:00:00#
-8.42
-9.05
-#2004-06-19 00:00:00#
-9.05
-9.38
-%null%
-9.38
-9.47
-%null%
-9.47
-9.78
-#1975-11-12 00:00:00#
-9.78
-10.32
-%null%
-10.32
-10.37
-%null%
-10.37
-11.38
-%null%
-11.38
-12.05
-%null%
-12.05
-12.4
-%null%
-12.4
-16.42
-%null%
-16.42
-16.81
-%null%
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,join.null.datetime,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.datetime.simple_lower.xml,False,0,51,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.datetime.simple_lower.xml,logical,Required If Supported,"Aggregation,Column Metadata Nullability","SUM,COLUMN_NULLABILITY","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,38.0,"
-      SELECT TIMESTAMP(`Calcs`.`date0`) AS `Calculation_3278620569574133760`,
-  `t0`.`__measure__1` AS `Calculation_845269395859349504`,
-  SUM(`Calcs`.`num1`) AS `sum_num1_ok`
-FROM `calcs` `Calcs`
-  INNER JOIN (
-  SELECT TIMESTAMP(`Calcs`.`date0`) AS `__dimension__0`,
-    `Calcs`.`key` AS `key`,
-    SUM(`Calcs`.`num1`) AS `__measure__1`
-  FROM `calcs` `Calcs`
-  GROUP BY `__dimension__0`,
-    `key`
-) `t0` ON ((TIMESTAMP(`Calcs`.`date0`) <=> `t0`.`__dimension__0`) AND (`Calcs`.`key` <=> `t0`.`key`))
-GROUP BY `Calculation_3278620569574133760`,
-  `Calculation_845269395859349504`
-    ",,"%null%
-2.47
-2.47
-%null%
-7.1
-7.1
-%null%
-7.12
-7.12
-%null%
-9.38
-9.38
-%null%
-9.47
-9.47
-%null%
-10.32
-10.32
-%null%
-10.37
-10.37
-%null%
-11.38
-11.38
-%null%
-12.05
-12.05
-%null%
-12.4
-12.4
-%null%
-16.42
-16.42
-%null%
-16.81
-16.81
-#1972-07-04 00:00:00#
-6.71
-6.71
-#1975-11-12 00:00:00#
-9.78
-9.78
-#2004-04-15 00:00:00#
-8.42
-8.42
-#2004-06-04 00:00:00#
-7.43
-7.43
-#2004-06-19 00:00:00#
-9.05
-9.05"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,join.null.int,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.int.simple_lower.xml,False,0,51,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.int.simple_lower.xml,logical,Required If Supported,"Aggregation,Column Metadata Nullability","SUM,COLUMN_NULLABILITY","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,38.0,"
-      SELECT `t0`.`__measure__0` AS `Calculation_845269395859349504`,
-  `Calcs`.`int1` AS `int1`,
-  SUM(`Calcs`.`num1`) AS `sum_num1_ok`
-FROM `calcs` `Calcs`
-  INNER JOIN (
-  SELECT `Calcs`.`int1` AS `int1`,
-    `Calcs`.`key` AS `key`,
-    SUM(`Calcs`.`num1`) AS `__measure__0`
-  FROM `calcs` `Calcs`
-  GROUP BY `int1`,
-    `key`
-) `t0` ON ((`Calcs`.`int1` <=> `t0`.`int1`) AND (`Calcs`.`key` <=> `t0`.`key`))
-GROUP BY `Calculation_845269395859349504`,
-  `int1`
-    ",,"2.47
--8
-2.47
-6.71
--6
-6.71
-7.1
-%null%
-7.1
-7.12
--9
-7.12
-7.43
--4
-7.43
-8.42
--3
-8.42
-9.05
-%null%
-9.05
-9.38
-%null%
-9.38
-9.47
-3
-9.47
-9.78
-%null%
-9.78
-10.32
-%null%
-10.32
-10.37
-%null%
-10.37
-11.38
-2
-11.38
-12.05
-%null%
-12.05
-12.4
-3
-12.4
-16.42
-%null%
-16.42
-16.81
-%null%
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,join.null.real,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.real.simple_lower.xml,False,0,51,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.real.simple_lower.xml,logical,Required If Supported,"Aggregation,Column Metadata Nullability","SUM,COLUMN_NULLABILITY","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,42.0,"
-      SELECT `t0`.`__measure__0` AS `Calculation_845269395859349504`,
-  `Calcs`.`num2` AS `num2`,
-  SUM(`Calcs`.`num1`) AS `sum_num1_ok`
-FROM `calcs` `Calcs`
-  INNER JOIN (
-  SELECT `Calcs`.`num2` AS `num2`,
-    `Calcs`.`key` AS `key`,
-    SUM(`Calcs`.`num1`) AS `__measure__0`
-  FROM `calcs` `Calcs`
-  GROUP BY `key`,
-    `num2`
-) `t0` ON ((`Calcs`.`num2` <=> `t0`.`num2`) AND (`Calcs`.`key` <=> `t0`.`key`))
-GROUP BY `Calculation_845269395859349504`,
-  `num2`
-    ",,"2.47
-3.79
-2.47
-6.71
-16.73
-6.71
-7.1
-%null%
-7.1
-7.12
-7.87
-7.12
-7.43
-8.51
-7.43
-8.42
-17.86
-8.42
-9.05
-6.46
-9.05
-9.38
-8.98
-9.38
-9.47
-%null%
-9.47
-9.78
-%null%
-9.78
-10.32
-6.8
-10.32
-10.37
-13.04
-10.37
-11.38
-17.25
-11.38
-12.05
-%null%
-12.05
-12.4
-11.5
-12.4
-16.42
-11.69
-16.42
-16.81
-10.98
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,join.null.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.str.simple_lower.xml,False,0,51,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.join.null.str.simple_lower.xml,logical,Required If Supported,"Aggregation,Column Metadata Nullability","SUM,COLUMN_NULLABILITY","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,41.0,"
-      SELECT `t0`.`__measure__0` AS `Calculation_845269395859349504`,
-  `Calcs`.`str2` AS `str2`,
-  SUM(`Calcs`.`num1`) AS `sum_num1_ok`
-FROM `calcs` `Calcs`
-  INNER JOIN (
-  SELECT `Calcs`.`key` AS `key`,
-    `Calcs`.`str2` AS `str2`,
-    SUM(`Calcs`.`num1`) AS `__measure__0`
-  FROM `calcs` `Calcs`
-  GROUP BY `key`,
-    `str2`
-) `t0` ON ((`Calcs`.`key` <=> `t0`.`key`) AND (`Calcs`.`str2` <=> `t0`.`str2`))
-GROUP BY `Calculation_845269395859349504`,
-  `str2`
-    ",,"2.47
-""twelve""
-2.47
-6.71
-""two""
-6.71
-7.1
-""fifteen""
-7.1
-7.12
-%null%
-7.12
-7.43
-%null%
-7.43
-8.42
-""one""
-8.42
-9.05
-""five""
-9.05
-9.38
-""six""
-9.38
-9.47
-""nine""
-9.47
-9.78
-""three""
-9.78
-10.32
-""eleven""
-10.32
-10.37
-""fourteen""
-10.37
-11.38
-""eight""
-11.38
-12.05
-%null%
-12.05
-12.4
-""ten""
-12.4
-16.42
-%null%
-16.42
-16.81
-""sixteen""
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,BUGS.TFS660780,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.TFS660780.simple_lower.xml,False,0,1,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.TFS660780.simple_lower.xml,logical,Required,"Filters,Operator,Aggregation","SUM,COUNT,==","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,37.0,"
-      SELECT SUM(1) AS `sum_Number of Records_ok`
-FROM `calcs` `Calcs`
-WHERE ('All' = 'All')
-HAVING (COUNT(1) > 0)
-    ",,17
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.QFilter-NotNull,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-NotNull.simple_lower.xml,False,0,30,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-NotNull.simple_lower.xml,logical,Required,"NULL Semantics,Operator,Aggregation,Calculation","SUM,!,ISNULL","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",Actual does not match expected.,Actual does not match expected.,22.0,"
-      SELECT `Calcs`.`key` AS `key`,
-  SUM(`Calcs`.`int1`) AS `sum_int1_ok`
-FROM `calcs` `Calcs`
-GROUP BY `key`
-HAVING (NOT ISNULL(SUM(`Calcs`.`int1`)))
-    ","""key00""
--3
-""key01""
--6
-""key02""
-0
-""key03""
--4
-""key04""
-0
-""key05""
-0
-""key06""
-0
-""key07""
-2
-""key08""
-3
-""key09""
-3
-""key10""
-0
-""key11""
--8
-""key12""
-0
-""key13""
-0
-""key14""
-0
-""key15""
-0
-""key16""
--9","""key00""
--3
-""key01""
--6
-""key03""
--4
-""key07""
-2
-""key08""
-3
-""key09""
-3
-""key11""
--8
-""key16""
--9"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.Exclude-list-not-null,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.Exclude-list-not-null.simple_lower.xml,False,0,10,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.Exclude-list-not-null.simple_lower.xml,logical,Required,"NULL Semantics,Sets,Operator,Logical,Calculation","$SYS_NARY_OR$,!,$IN_SET$,ISNULL","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,37.0,"
-      SELECT `Calcs`.`str2` AS `str2`
-FROM `calcs` `Calcs`
-WHERE ((NOT (`Calcs`.`str2` IN ('eight', 'eleven', 'fifteen', 'five'))) OR ISNULL(`Calcs`.`str2`))
-GROUP BY `str2`
-    ",,"%null%
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.QFilter-max-Null,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-max-Null.simple_lower.xml,False,0,9,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-max-Null.simple_lower.xml,logical,Required,"NULL Semantics,Filters,Aggregation,Operator,Logical,Calculation","$SYS_NARY_OR$,<=,SUM,ISNULL","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",Actual does not match expected.,Actual does not match expected.,21.0,"
-      SELECT `Calcs`.`key` AS `key`,
-  SUM(`Calcs`.`int1`) AS `sum_int1_ok`
-FROM `calcs` `Calcs`
-GROUP BY `key`
-HAVING ((SUM(`Calcs`.`int1`) <= 2) OR ISNULL(SUM(`Calcs`.`int1`)))
-    ","""key00""
--3
-""key01""
--6
-""key02""
-0
-""key03""
--4
-""key04""
-0
-""key05""
-0
-""key06""
-0
-""key07""
-2
-""key10""
-0
-""key11""
--8
-""key12""
-0
-""key13""
-0
-""key14""
-0
-""key15""
-0
-""key16""
--9","""key00""
--3
-""key01""
--6
-""key02""
-%null%
-""key03""
--4
-""key04""
-%null%
-""key05""
-%null%
-""key06""
-%null%
-""key07""
-2
-""key10""
-%null%
-""key11""
--8
-""key12""
-%null%
-""key13""
-%null%
-""key14""
-%null%
-""key15""
-%null%
-""key16""
--9"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.QFilter-min-Null,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-min-Null.simple_lower.xml,False,0,9,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-min-Null.simple_lower.xml,logical,Required,"NULL Semantics,Filters,Aggregation,Operator,Logical,Calculation","SUM,$SYS_NARY_OR$,>=,ISNULL","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",Actual does not match expected.,Actual does not match expected.,23.0,"
-      SELECT `Calcs`.`key` AS `key`,
-  SUM(`Calcs`.`int1`) AS `sum_int1_ok`
-FROM `calcs` `Calcs`
-GROUP BY `key`
-HAVING ((SUM(`Calcs`.`int1`) >= 0) OR ISNULL(SUM(`Calcs`.`int1`)))
-    ","""key02""
-0
-""key04""
-0
-""key05""
-0
-""key06""
-0
-""key07""
-2
-""key08""
-3
-""key09""
-3
-""key10""
-0
-""key12""
-0
-""key13""
-0
-""key14""
-0
-""key15""
-0","""key02""
-%null%
-""key04""
-%null%
-""key05""
-%null%
-""key06""
-%null%
-""key07""
-2
-""key08""
-3
-""key09""
-3
-""key10""
-%null%
-""key12""
-%null%
-""key13""
-%null%
-""key14""
-%null%
-""key15""
-%null%"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.QFilter-minmax-NotNull,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-minmax-NotNull.simple_lower.xml,False,0,20,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-minmax-NotNull.simple_lower.xml,logical,Required,"Filters,Logical,Operator,Aggregation","SUM,<=,>=,$SYS_NARY_AND$","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",Actual does not match expected.,Actual does not match expected.,24.0,"
-      SELECT `Calcs`.`key` AS `key`,
-  SUM(`Calcs`.`int1`) AS `sum_int1_ok`
-FROM `calcs` `Calcs`
-GROUP BY `key`
-HAVING ((SUM(`Calcs`.`int1`) >= 0) AND (SUM(`Calcs`.`int1`) <= 2))
-    ","""key02""
-0
-""key04""
-0
-""key05""
-0
-""key06""
-0
-""key07""
-2
-""key10""
-0
-""key12""
-0
-""key13""
-0
-""key14""
-0
-""key15""
-0","""key07""
-2"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Query.Filter.IsNOTNULL,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Query.Filter.IsNOTNULL.simple_lower.xml,True,0,0,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Query.Filter.IsNOTNULL.simple_lower.xml,logical,Required,"Filters,Logical,Operator,Aggregation","SUM,<=,>=,$SYS_NARY_AND$","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",None,None,24.0,"
-      SELECT `Calcs`.`str2` AS `str2`,
-  SUM(`Calcs`.`num3`) AS `sum_num3_ok`
-FROM `calcs` `Calcs`
-WHERE ((`Calcs`.`str2` >= 'eight') AND (`Calcs`.`str2` <= 'two'))
-GROUP BY `str2`
-    ","""eight""
-3.64
-""eleven""
--4.79
-""fifteen""
-6.84
-""five""
-12.93
-""fourteen""
--18.43
-""nine""
--13.38
-""one""
--11.52
-""six""
--19.96
-""sixteen""
--10.98
-""ten""
--10.56
-""three""
--12.17
-""twelve""
--10.81
-""two""
--9.31","""eight""
-3.64
-""eleven""
--4.79
-""fifteen""
-6.84
-""five""
-12.93
-""fourteen""
--18.43
-""nine""
--13.38
-""one""
--11.52
-""six""
--19.96
-""sixteen""
--10.98
-""ten""
--10.56
-""three""
--12.17
-""twelve""
--10.81
-""two""
--9.31"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Query.Filter.NullAndOne,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Query.Filter.NullAndOne.simple_lower.xml,False,0,4,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Query.Filter.NullAndOne.simple_lower.xml,logical,Required,"NULL Semantics,Sets,Aggregation,Logical,Calculation","SUM,$SYS_NARY_OR$,$IN_SET$,ISNULL","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,35.0,"
-      SELECT `Calcs`.`str2` AS `str2`,
-  SUM(`Calcs`.`num3`) AS `sum_num3_ok`
-FROM `calcs` `Calcs`
-WHERE ((`Calcs`.`str2` IN ('sixteen')) OR ISNULL(`Calcs`.`str2`))
-GROUP BY `str2`
-    ",,"%null%
--5.54
-""sixteen""
--10.98"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.Exclude-range-not-null,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.Exclude-range-not-null.simple_lower.xml,True,0,0,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.Exclude-range-not-null.simple_lower.xml,logical,Required,"NULL Semantics,Filters,Operator,Logical,Calculation","$SYS_NARY_AND$,<=,!,$SYS_NARY_OR$,ISNULL,>=","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",None,None,25.0,"
-      SELECT `Calcs`.`str2` AS `str2`
-FROM `calcs` `Calcs`
-WHERE ((NOT ((`Calcs`.`str2` >= 'eight') AND (`Calcs`.`str2` <= 'six'))) OR ISNULL(`Calcs`.`str2`))
-GROUP BY `str2`
-    ","%null%
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two""","%null%
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.QFilter-minmax-Null,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-minmax-Null.simple_lower.xml,False,0,9,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.QFilter-minmax-Null.simple_lower.xml,logical,Required,"NULL Semantics,Filters,Aggregation,Operator,Logical,Calculation","$SYS_NARY_AND$,SUM,<=,$SYS_NARY_OR$,ISNULL,>=","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-",Actual does not match expected.,Actual does not match expected.,23.0,"
-      SELECT `Calcs`.`key` AS `key`,
-  SUM(`Calcs`.`int1`) AS `sum_int1_ok`
-FROM `calcs` `Calcs`
-GROUP BY `key`
-HAVING (((SUM(`Calcs`.`int1`) >= 0) AND (SUM(`Calcs`.`int1`) <= 2)) OR ISNULL(SUM(`Calcs`.`int1`)))
-    ","""key02""
-0
-""key04""
-0
-""key05""
-0
-""key06""
-0
-""key07""
-2
-""key10""
-0
-""key12""
-0
-""key13""
-0
-""key14""
-0
-""key15""
-0","""key02""
-%null%
-""key04""
-%null%
-""key05""
-%null%
-""key06""
-%null%
-""key07""
-2
-""key10""
-%null%
-""key12""
-%null%
-""key13""
-%null%
-""key14""
-%null%
-""key15""
-%null%"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,BUGS.B1713,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml,False,0,1,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml,logical,Required,"Temp Tables and Subqueries,Filters,Aggregation,Operator,Logical","$SYS_NARY_AND$,TEMP_TABLES_AND_SUBQUERIES,SUM,COUNT,<=,$SYS_NARY_OR$,>=","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,74.0,"
-      SELECT `Calcs`.`str0` AS `str0`
-FROM `calcs` `Calcs`
-  INNER JOIN (
-  SELECT `Calcs`.`str0` AS `str0`,
-    SUM(`Calcs`.`int2`) AS `$__alias__0`
-  FROM `calcs` `Calcs`
-  WHERE ((`Calcs`.`str0` >= 'FURNITURE') AND (`Calcs`.`str0` <= 'TECHNOLOGY'))
-  GROUP BY `str0`
-  ORDER BY `$__alias__0` DESC
-  LIMIT 2
-) `t0` ON (`Calcs`.`str0` = `t0`.`str0`)
-  INNER JOIN (
-  SELECT `Calcs`.`str1` AS `str1`,
-    SUM(`Calcs`.`int1`) AS `$__alias__1`
-  FROM `calcs` `Calcs`
-  WHERE (((`Calcs`.`str1` >= 'AIR PURIFIERS') AND (`Calcs`.`str1` <= 'CD-R MEDIA')) OR ((`Calcs`.`str1` >= 'CONFERENCE PHONES') AND (`Calcs`.`str1` <= 'ERICSSON')))
-  GROUP BY `str1`
-  ORDER BY `$__alias__1` DESC
-  LIMIT 5
-) `t1` ON (`Calcs`.`str1` = `t1`.`str1`)
-GROUP BY `str0`
-    ",,"""OFFICE SUPPLIES"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,Filter.TopN-context,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.TopN-context.simple_lower.xml,False,0,2,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.Filter.TopN-context.simple_lower.xml,logical,Required,"Temp Tables and Subqueries,Filters,Aggregation,Operator,Logical","$SYS_NARY_AND$,TEMP_TABLES_AND_SUBQUERIES,SUM,COUNT,<=,$SYS_NARY_OR$,>=","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/calcs\setup.BUGS.B1713.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,40.0,"
-      SELECT `Calcs`.`str0` AS `str0`,
-  SUM(`Calcs`.`int2`) AS `sum_int2_ok`
-FROM `calcs` `Calcs`
-  INNER JOIN (
-  SELECT `Calcs`.`str0` AS `str0`,
-    SUM(`Calcs`.`int2`) AS `$__alias__0`
-  FROM `calcs` `Calcs`
-  GROUP BY `str0`
-  ORDER BY `$__alias__0` DESC
-  LIMIT 2
-) `t0` ON (`Calcs`.`str0` = `t0`.`str0`)
-WHERE (((`Calcs`.`str1` >= 'AIR PURIFIERS') AND (`Calcs`.`str1` <= 'CD-R MEDIA')) OR ((`Calcs`.`str1` >= 'CONFERENCE PHONES') AND (`Calcs`.`str1` <= 'ERICSSON')))
-GROUP BY `str0`
-    ",,"""OFFICE SUPPLIES""
-14"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.10_As in-out Set,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml,False,0,27,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","MIN,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,57.0,"
-      SELECT `t0`.`LOD - Fixed - 1 (copy 2)` AS `LOD - Fixed - 1 (copy 2)`
-FROM (
-  SELECT MIN(`Staples`.`Order Date`) AS `LOD - Fixed - 1 (copy 2)`
-  FROM `staples` `Staples`
-  GROUP BY `Staples`.`Customer Name`
-) `t0`
-GROUP BY `LOD - Fixed - 1 (copy 2)`
-ORDER BY `LOD - Fixed - 1 (copy 2)` ASC
-    ",,"#1997-01-01 00:00:00#
-#1997-01-02 00:00:00#
-#1997-01-03 00:00:00#
-#1997-01-04 00:00:00#
-#1997-01-05 00:00:00#
-#1997-01-06 00:00:00#
-#1997-01-07 00:00:00#
-#1997-01-08 00:00:00#
-#1997-01-09 00:00:00#
-#1997-01-10 00:00:00#
-#1997-01-11 00:00:00#
-#1997-01-12 00:00:00#
-#1997-01-13 00:00:00#
-#1997-01-14 00:00:00#
-#1997-01-15 00:00:00#
-#1997-01-17 00:00:00#
-#1997-01-18 00:00:00#
-#1997-01-19 00:00:00#
-#1997-01-20 00:00:00#
-#1997-01-21 00:00:00#
-#1997-01-23 00:00:00#
-#1997-01-24 00:00:00#
-#1997-01-26 00:00:00#
-#1997-01-28 00:00:00#
-#1997-01-31 00:00:00#
-#1997-02-02 00:00:00#
-#1997-02-10 00:00:00#"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.12_As in-out Set,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.12_As in-out Set.simple_lower.xml,False,0,27,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.12_As in-out Set.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","MIN,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,40.0,"
-      SELECT `t0`.`LOD - Fixed - 1 (copy 2)` AS `LOD - Fixed - 1 (copy 2)`
-FROM (
-  SELECT MIN(`Staples`.`Order Date`) AS `LOD - Fixed - 1 (copy 2)`
-  FROM `staples` `Staples`
-  GROUP BY `Staples`.`Customer Name`
-) `t0`
-GROUP BY `LOD - Fixed - 1 (copy 2)`
-ORDER BY `LOD - Fixed - 1 (copy 2)` ASC
-    ",,"#1997-01-01 00:00:00#
-#1997-01-02 00:00:00#
-#1997-01-03 00:00:00#
-#1997-01-04 00:00:00#
-#1997-01-05 00:00:00#
-#1997-01-06 00:00:00#
-#1997-01-07 00:00:00#
-#1997-01-08 00:00:00#
-#1997-01-09 00:00:00#
-#1997-01-10 00:00:00#
-#1997-01-11 00:00:00#
-#1997-01-12 00:00:00#
-#1997-01-13 00:00:00#
-#1997-01-14 00:00:00#
-#1997-01-15 00:00:00#
-#1997-01-17 00:00:00#
-#1997-01-18 00:00:00#
-#1997-01-19 00:00:00#
-#1997-01-20 00:00:00#
-#1997-01-21 00:00:00#
-#1997-01-23 00:00:00#
-#1997-01-24 00:00:00#
-#1997-01-26 00:00:00#
-#1997-01-28 00:00:00#
-#1997-01-31 00:00:00#
-#1997-02-02 00:00:00#
-#1997-02-10 00:00:00#"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.4_Subset Fixed,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.4_Subset Fixed.simple_lower.xml,False,0,204,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.4_Subset Fixed.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","SUM,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,37.0,"
-      SELECT `t0`.`Market Segment` AS `Market Segment`,
-  `t0`.`Prod Type2` AS `Prod Type2`,
-  `t1`.`__measure__0` AS `sum_Calculation_4501225003531668_ok`
-FROM (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    `Staples`.`Prod Type2` AS `Prod Type2`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`,
-    `Prod Type2`
-) `t0`
-  INNER JOIN (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    SUM(`Staples`.`Product Base Margin`) AS `__measure__0`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`
-) `t1` ON (`t0`.`Market Segment` <=> `t1`.`Market Segment`)
-    ",,"""CONSUMER""
-""APPLIANCES""
-5570.93
-""CONSUMER""
-""BINDERS AND BINDER ACCESSORIES""
-5570.93
-""CONSUMER""
-""BOOKCASES""
-5570.93
-""CONSUMER""
-""CHAIRS & CHAIRMATS""
-5570.93
-""CONSUMER""
-""COMPUTER PERIPHERALS""
-5570.93
-""CONSUMER""
-""COPIERS AND FAX""
-5570.93
-""CONSUMER""
-""ENVELOPES""
-5570.93
-""CONSUMER""
-""LABELS""
-5570.93
-""CONSUMER""
-""OFFICE FURNISHINGS""
-5570.93
-""CONSUMER""
-""OFFICE MACHINES""
-5570.93
-""CONSUMER""
-""PAPER""
-5570.93
-""CONSUMER""
-""PENS & ART SUPPLIES""
-5570.93
-""CONSUMER""
-""RUBBER BANDS""
-5570.93
-""CONSUMER""
-""SCISSORS, RULERS AND TRIMMERS""
-5570.93
-""CONSUMER""
-""STORAGE & ORGANIZATION""
-5570.93
-""CONSUMER""
-""TABLES""
-5570.93
-""CONSUMER""
-""TELEPHONES AND COMMUNICATION""
-5570.93
-""CORPORATE""
-""APPLIANCES""
-10204.72
-""CORPORATE""
-""BINDERS AND BINDER ACCESSORIES""
-10204.72
-""CORPORATE""
-""BOOKCASES""
-10204.72
-""CORPORATE""
-""CHAIRS & CHAIRMATS""
-10204.72
-""CORPORATE""
-""COMPUTER PERIPHERALS""
-10204.72
-""CORPORATE""
-""COPIERS AND FAX""
-10204.72
-""CORPORATE""
-""ENVELOPES""
-10204.72
-""CORPORATE""
-""LABELS""
-10204.72
-""CORPORATE""
-""OFFICE FURNISHINGS""
-10204.72
-""CORPORATE""
-""OFFICE MACHINES""
-10204.72
-""CORPORATE""
-""PAPER""
-10204.72
-""CORPORATE""
-""PENS & ART SUPPLIES""
-10204.72
-""CORPORATE""
-""RUBBER BANDS""
-10204.72
-""CORPORATE""
-""SCISSORS, RULERS AND TRIMMERS""
-10204.72
-""CORPORATE""
-""STORAGE & ORGANIZATION""
-10204.72
-""CORPORATE""
-""TABLES""
-10204.72
-""CORPORATE"""
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.6_Include - 1,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.6_Include - 1.simple_lower.xml,False,0,12,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.6_Include - 1.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","SUM,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,40.0,"
-      SELECT `t0`.`Market Segment` AS `Market Segment`,
-  `t2`.`__measure__0` AS `sum_Calculation_4621225004123988_ok`,
-  `t0`.`sum_Sales Total_ok` AS `sum_Sales Total_ok`
-FROM (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    SUM(`Staples`.`Sales Total`) AS `sum_Sales Total_ok`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`
-) `t0`
-  INNER JOIN (
-  SELECT `t1`.`Market Segment` AS `Market Segment`,
-    SUM(`t1`.`__measure__1`) AS `__measure__0`
-  FROM (
-    SELECT `Staples`.`Market Segment` AS `Market Segment`,
-      SUM(`Staples`.`Sales Total`) AS `__measure__1`
-    FROM `staples` `Staples`
-    GROUP BY `Market Segment`,
-      `Staples`.`Prod Type1`
-  ) `t1`
-  GROUP BY `Market Segment`
-) `t2` ON (`t0`.`Market Segment` <=> `t2`.`Market Segment`)
-    ",,"""CONSUMER""
-19889172.0
-19889172.0
-""CORPORATE""
-35593890.0
-35593890.0
-""HOME OFFICE""
-24513651.0
-24513651.0
-""SMALL BUSINESS""
-18691224.0
-18691224.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.7_Percent of Total 1,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.7_Percent of Total 1.simple_lower.xml,False,0,60,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.7_Percent of Total 1.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","SUM,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,42.0,"
-      SELECT `t0`.`Market Segment` AS `Market Segment`,
-  `t0`.`Prod Type1` AS `Prod Type1`,
-  `t1`.`__measure__0` AS `TEMP(Calculation_5091225004312306)(3462396638)(0)`,
-  `t0`.`TEMP(Calculation_5091225004312306)(357447720)(0)` AS `TEMP(Calculation_5091225004312306)(357447720)(0)`,
-  `t1`.`__measure__0` AS `TEMP(Calculation_5091225004312306)(61826508)(0)`
-FROM (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    `Staples`.`Prod Type1` AS `Prod Type1`,
-    SUM(`Staples`.`Sales Total`) AS `TEMP(Calculation_5091225004312306)(357447720)(0)`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`,
-    `Prod Type1`
-) `t0`
-  INNER JOIN (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    SUM(`Staples`.`Sales Total`) AS `__measure__0`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`
-) `t1` ON (`t0`.`Market Segment` <=> `t1`.`Market Segment`)
-    ",,"""CONSUMER""
-""FURNITURE""
-19889172.0
-6987300.0
-19889172.0
-""CONSUMER""
-""OFFICE SUPPLIES""
-19889172.0
-4599668.9
-19889172.0
-""CONSUMER""
-""TECHNOLOGY""
-19889172.0
-8302202.8
-19889172.0
-""CORPORATE""
-""FURNITURE""
-35593890.0
-12325807.0
-35593890.0
-""CORPORATE""
-""OFFICE SUPPLIES""
-35593890.0
-8644838.2
-35593890.0
-""CORPORATE""
-""TECHNOLOGY""
-35593890.0
-14623245.0
-35593890.0
-""HOME OFFICE""
-""FURNITURE""
-24513651.0
-8354019.3
-24513651.0
-""HOME OFFICE""
-""OFFICE SUPPLIES""
-24513651.0
-6116307.0
-24513651.0
-""HOME OFFICE""
-""TECHNOLOGY""
-24513651.0
-10043325.0
-24513651.0
-""SMALL BUSINESS""
-""FURNITURE""
-18691224.0
-6341959.4
-18691224.0
-""SMALL BUSINESS""
-""OFFICE SUPPLIES""
-18691224.0
-4653925.8
-18691224.0
-""SMALL BUSINESS""
-""TECHNOLOGY""
-18691224.0
-7695338.8
-18691224.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.8_Precent of Total 2,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.8_Precent of Total 2.simple_lower.xml,False,0,85,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.8_Precent of Total 2.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","SUM,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,38.0,"
-      SELECT `t0`.`Prod Type1` AS `Prod Type1`,
-  `t0`.`Prod Type2` AS `Prod Type2`,
-  `t1`.`__measure__0` AS `TEMP(LOD - Percent of Total (copy))(342855174)(0)`,
-  `t1`.`__measure__0` AS `TEMP(LOD - Percent of Total (copy))(3499937668)(0)`,
-  `t0`.`TEMP(LOD - Percent of Total (copy))(357447720)(0)` AS `TEMP(LOD - Percent of Total (copy))(357447720)(0)`
-FROM (
-  SELECT `Staples`.`Prod Type1` AS `Prod Type1`,
-    `Staples`.`Prod Type2` AS `Prod Type2`,
-    SUM(`Staples`.`Sales Total`) AS `TEMP(LOD - Percent of Total (copy))(357447720)(0)`
-  FROM `staples` `Staples`
-  GROUP BY `Prod Type1`,
-    `Prod Type2`
-) `t0`
-  INNER JOIN (
-  SELECT `Staples`.`Prod Type1` AS `Prod Type1`,
-    SUM(`Staples`.`Sales Total`) AS `__measure__0`
-  FROM `staples` `Staples`
-  GROUP BY `Prod Type1`
-) `t1` ON (`t0`.`Prod Type1` <=> `t1`.`Prod Type1`)
-    ",,"""FURNITURE""
-""BOOKCASES""
-34009086.0
-34009086.0
-5257672.7
-""FURNITURE""
-""CHAIRS & CHAIRMATS""
-34009086.0
-34009086.0
-10497117.0
-""FURNITURE""
-""OFFICE FURNISHINGS""
-34009086.0
-34009086.0
-3999750.0
-""FURNITURE""
-""TABLES""
-34009086.0
-34009086.0
-14254546.0
-""OFFICE SUPPLIES""
-""APPLIANCES""
-24014740.0
-24014740.0
-5247729.0
-""OFFICE SUPPLIES""
-""BINDERS AND BINDER ACCESSORIES""
-24014740.0
-24014740.0
-5545569.2
-""OFFICE SUPPLIES""
-""ENVELOPES""
-24014740.0
-24014740.0
-858634.48
-""OFFICE SUPPLIES""
-""LABELS""
-24014740.0
-24014740.0
-400169.21
-""OFFICE SUPPLIES""
-""PAPER""
-24014740.0
-24014740.0
-3098545.7
-""OFFICE SUPPLIES""
-""PENS & ART SUPPLIES""
-24014740.0
-24014740.0
-1209942.5
-""OFFICE SUPPLIES""
-""RUBBER BANDS""
-24014740.0
-24014740.0
-95324.04
-""OFFICE SUPPLIES""
-""SCISSORS, RULERS AND TRIMMERS""
-24014740.0
-24014740.0
-1072184.3
-""OFFICE SUPPLIES""
-""STORAGE & ORGANIZATION""
-24014740.0
-24014740.0
-6486641.5
-""TECHNOLOGY""
-""COMPUTER PERIPHERALS""
-40664111.0
-40664111.0
-5278781.7
-""TECHNOLOGY""
-""COPIERS AND FAX""
-40664111.0
-40664111.0
-6776923.2
-""TECHNOLOGY""
-""OFFICE MACHINES""
-40664111.0
-40664111.0
-15099693.0
-""TECHNOLOGY""
-""TELEPHONES AND COMMUNICATION""
-40664111.0
-40664111.0
-13508713.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.calc.3.LOD Metadata,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.3.LOD Metadata.simple_lower.xml,False,0,9,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.3.LOD Metadata.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","SUM,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,45.0,"
-      SELECT `t0`.`Prod Type1` AS `Prod Type1`,
-  `t0`.`__measure__0` AS `sum_Calculation_0140203111132437_ok`,
-  `t3`.`__measure__1` AS `sum_Calculation_8060203111105400_ok`
-FROM (
-  SELECT `Staples`.`Prod Type1` AS `Prod Type1`,
-    SUM(`Staples`.`Sales Total`) AS `__measure__0`
-  FROM `staples` `Staples`
-  GROUP BY `Prod Type1`
-) `t0`
-  INNER JOIN (
-  SELECT `t1`.`Prod Type1` AS `Prod Type1`,
-    SUM(`t2`.`__measure__2`) AS `__measure__1`
-  FROM (
-    SELECT `Staples`.`Market Segment` AS `Market Segment`,
-      `Staples`.`Prod Type1` AS `Prod Type1`
-    FROM `staples` `Staples`
-    GROUP BY `Market Segment`,
-      `Prod Type1`
-  ) `t1`
-    INNER JOIN (
-    SELECT `Staples`.`Market Segment` AS `Market Segment`,
-      SUM(`Staples`.`Product Base Margin`) AS `__measure__2`
-    FROM `staples` `Staples`
-    GROUP BY `Market Segment`
-  ) `t2` ON (`t1`.`Market Segment` = `t2`.`Market Segment`)
-  GROUP BY `Prod Type1`
-) `t3` ON (`t0`.`Prod Type1` = `t3`.`Prod Type1`)
-    ",,"""FURNITURE""
-34009086.0
-28278.32
-""OFFICE SUPPLIES""
-24014740.0
-28278.32
-""TECHNOLOGY""
-40664111.0
-28278.32"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.calc.5.LOD Set,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.5.LOD Set.simple_lower.xml,False,0,8,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.5.LOD Set.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","SUM,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      No such function SUM that takes arguments of type (str).
-
-    ",Actual does not match expected.,6.0,"
-      
-    ",,"10547
-false
-10807
-false
-13674
-false
-19832
-false"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.calc.6. LOD Dimension,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.6. LOD Dimension.simple_lower.xml,False,0,16,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.6. LOD Dimension.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","SUM,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      No such function SUM that takes arguments of type (str).
-
-    ",Actual does not match expected.,8.0,"
-      
-    ",,"10547
-""SMALL BUSINESS""
-18691224.0
-18691224.0
-10807
-""CONSUMER""
-19889172.0
-19889172.0
-13674
-""HOME OFFICE""
-24513651.0
-24513651.0
-19832
-""CORPORATE""
-35593890.0
-35593890.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.calc.8. Include,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.8. Include.simple_lower.xml,False,0,12,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.8. Include.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","SUM,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,43.0,"
-      SELECT `t0`.`Market Segment` AS `Market Segment`,
-  `t2`.`__measure__0` AS `sum_Calculation_6390203110846546_ok`,
-  `t0`.`sum_Sales Total_ok` AS `sum_Sales Total_ok`
-FROM (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    SUM(`Staples`.`Sales Total`) AS `sum_Sales Total_ok`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`
-) `t0`
-  INNER JOIN (
-  SELECT `t1`.`Market Segment` AS `Market Segment`,
-    SUM(`t1`.`__measure__1`) AS `__measure__0`
-  FROM (
-    SELECT `Staples`.`Market Segment` AS `Market Segment`,
-      SUM(`Staples`.`Sales Total`) AS `__measure__1`
-    FROM `staples` `Staples`
-    GROUP BY `Market Segment`,
-      `Staples`.`Prod Type1`
-  ) `t1`
-  GROUP BY `Market Segment`
-) `t2` ON (`t0`.`Market Segment` = `t2`.`Market Segment`)
-    ",,"""CONSUMER""
-19889172.0
-19889172.0
-""CORPORATE""
-35593890.0
-35593890.0
-""HOME OFFICE""
-24513651.0
-24513651.0
-""SMALL BUSINESS""
-18691224.0
-18691224.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.15_As Bin,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.15_As Bin.simple_lower.xml,False,0,6,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.15_As Bin.simple_lower.xml,logical,Required If Supported,"Bins,Level of Detail,Aggregation","SYS_NUMBIN,SUM,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,42.0,"
-      SELECT FLOOR(`t0`.`__measure__0` / 475) AS `LOD - Fixed - 1 (bin)`,
-  SUM(`Staples`.`Sales Total`) AS `sum_Sales Total_ok`
-FROM `staples` `Staples`
-  INNER JOIN (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    SUM(`Staples`.`Product Base Margin`) AS `__measure__0`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`
-) `t0` ON (`Staples`.`Market Segment` <=> `t0`.`Market Segment`)
-GROUP BY `LOD - Fixed - 1 (bin)`
-    ",,"11
-38580396.0
-14
-24513651.0
-21
-35593890.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.2_Cross Join,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.2_Cross Join.simple_lower.xml,True,0,0,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.2_Cross Join.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","SUM,LOD_STYLE_JOIN,$AGGREGATE$","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-",None,None,43.0,"
-      SELECT `Staples`.`Prod Type2` AS `Prod Type2`,
-  SUM(`Staples`.`Sales Total`) AS `TEMP(Calculation_5921225003343476)(1510386096)(0)`,
-  SUM(`Staples`.`Sales Total`) AS `TEMP(Calculation_5921225003343476)(2532235894)(0)`,
-  SUM(`Staples`.`Sales Total`) AS `TEMP(Calculation_5921225003343476)(357447720)(0)`
-FROM `staples` `Staples`
-GROUP BY `Prod Type2`
-    ","""APPLIANCES""
-5247729.0
-5247729.0
-5247729.0
-""BINDERS AND BINDER ACCESSORIES""
-5545569.2
-5545569.2
-5545569.2
-""BOOKCASES""
-5257672.7
-5257672.7
-5257672.7
-""CHAIRS & CHAIRMATS""
-10497117.0
-10497117.0
-10497117.0
-""COMPUTER PERIPHERALS""
-5278781.7
-5278781.7
-5278781.7
-""COPIERS AND FAX""
-6776923.2
-6776923.2
-6776923.2
-""ENVELOPES""
-858634.48
-858634.48
-858634.48
-""LABELS""
-400169.21
-400169.21
-400169.21
-""OFFICE FURNISHINGS""
-3999750.0
-3999750.0
-3999750.0
-""OFFICE MACHINES""
-15099693.0
-15099693.0
-15099693.0
-""PAPER""
-3098545.7
-3098545.7
-3098545.7
-""PENS & ART SUPPLIES""
-1209942.5
-1209942.5
-1209942.5
-""RUBBER BANDS""
-95324.04
-95324.04
-95324.04
-""SCISSORS, RULERS AND TRIMMERS""
-1072184.3
-1072184.3
-1072184.3
-""STORAGE & ORGANIZATION""
-6486641.5
-6486641.5
-6486641.5
-""TABLES""
-14254546.0
-14254546.0
-14254546.0
-""TELEPHONES AND COMMUNICATION""
-13508713.0
-13508713.0
-13508713.0","""APPLIANCES""
-5247729.0
-5247729.0
-5247729.0
-""BINDERS AND BINDER ACCESSORIES""
-5545569.2
-5545569.2
-5545569.2
-""BOOKCASES""
-5257672.7
-5257672.7
-5257672.7
-""CHAIRS & CHAIRMATS""
-10497117.0
-10497117.0
-10497117.0
-""COMPUTER PERIPHERALS""
-5278781.7
-5278781.7
-5278781.7
-""COPIERS AND FAX""
-6776923.2
-6776923.2
-6776923.2
-""ENVELOPES""
-858634.48
-858634.48
-858634.48
-""LABELS""
-400169.21
-400169.21
-400169.21
-""OFFICE FURNISHINGS""
-3999750.0
-3999750.0
-3999750.0
-""OFFICE MACHINES""
-15099693.0
-15099693.0
-15099693.0
-""PAPER""
-3098545.7
-3098545.7
-3098545.7
-""PENS & ART SUPPLIES""
-1209942.5
-1209942.5
-1209942.5
-""RUBBER BANDS""
-95324.04
-95324.04
-95324.04
-""SCISSORS, RULERS AND TRIMMERS""
-1072184.3
-1072184.3
-1072184.3
-""STORAGE & ORGANIZATION""
-6486641.5
-6486641.5
-6486641.5
-""TABLES""
-14254546.0
-14254546.0
-14254546.0
-""TELEPHONES AND COMMUNICATION""
-13508713.0
-13508713.0
-13508713.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.3_Disjoint LOD,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.3_Disjoint LOD.simple_lower.xml,False,0,34,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.3_Disjoint LOD.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","SUM,LOD_STYLE_JOIN,$AGGREGATE$","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,41.0,"
-      SELECT `t0`.`Prod Type2` AS `Prod Type2`,
-  SUM(`t1`.`__measure__1`) AS `sum_Calculation_4501225003531668_ok`
-FROM (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    `Staples`.`Prod Type2` AS `Prod Type2`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`,
-    `Prod Type2`
-) `t0`
-  INNER JOIN (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    SUM(`Staples`.`Product Base Margin`) AS `__measure__1`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`
-) `t1` ON (`t0`.`Market Segment` <=> `t1`.`Market Segment`)
-GROUP BY `Prod Type2`
-    ",,"""APPLIANCES""
-28278.32
-""BINDERS AND BINDER ACCESSORIES""
-28278.32
-""BOOKCASES""
-28278.32
-""CHAIRS & CHAIRMATS""
-28278.32
-""COMPUTER PERIPHERALS""
-28278.32
-""COPIERS AND FAX""
-28278.32
-""ENVELOPES""
-28278.32
-""LABELS""
-28278.32
-""OFFICE FURNISHINGS""
-28278.32
-""OFFICE MACHINES""
-28278.32
-""PAPER""
-28278.32
-""PENS & ART SUPPLIES""
-28278.32
-""RUBBER BANDS""
-28278.32
-""SCISSORS, RULERS AND TRIMMERS""
-28278.32
-""STORAGE & ORGANIZATION""
-28278.32
-""TABLES""
-28278.32
-""TELEPHONES AND COMMUNICATION""
-28278.32"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.5_Subset Fixed - 2,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.5_Subset Fixed - 2.simple_lower.xml,False,0,204,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.5_Subset Fixed - 2.simple_lower.xml,logical,Required If Supported,"Cast,Level of Detail,Aggregation","SUM,FLOAT,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,35.0,"
-      SELECT `t0`.`Market Segment` AS `Market Segment`,
-  `t0`.`Prod Type2` AS `Prod Type2`,
-  (`t1`.`__measure__0` + 0.0) AS `avg_LOD - Fixed - 1 (copy)_ok`
-FROM (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    `Staples`.`Prod Type2` AS `Prod Type2`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`,
-    `Prod Type2`
-) `t0`
-  INNER JOIN (
-  SELECT `Staples`.`Prod Type2` AS `Prod Type2`,
-    SUM(`Staples`.`Product Base Margin`) AS `__measure__0`
-  FROM `staples` `Staples`
-  GROUP BY `Prod Type2`
-) `t1` ON (`t0`.`Prod Type2` <=> `t1`.`Prod Type2`)
-    ",,"""CONSUMER""
-""APPLIANCES""
-1554.89
-""CONSUMER""
-""BINDERS AND BINDER ACCESSORIES""
-2181.58
-""CONSUMER""
-""BOOKCASES""
-882.51
-""CONSUMER""
-""CHAIRS & CHAIRMATS""
-1530.77
-""CONSUMER""
-""COMPUTER PERIPHERALS""
-2990.1
-""CONSUMER""
-""COPIERS AND FAX""
-235.78
-""CONSUMER""
-""ENVELOPES""
-556.68
-""CONSUMER""
-""LABELS""
-759.24
-""CONSUMER""
-""OFFICE FURNISHINGS""
-2726.96
-""CONSUMER""
-""OFFICE MACHINES""
-1063.25
-""CONSUMER""
-""PAPER""
-2955.39
-""CONSUMER""
-""PENS & ART SUPPLIES""
-2443.31
-""CONSUMER""
-""RUBBER BANDS""
-552.35
-""CONSUMER""
-""SCISSORS, RULERS AND TRIMMERS""
-675.92
-""CONSUMER""
-""STORAGE & ORGANIZATION""
-2484.99
-""CONSUMER""
-""TABLES""
-1653.79
-""CONSUMER""
-""TELEPHONES AND COMMUNICATION""
-3030.81
-""CORPORATE""
-""APPLIANCES""
-1554.89
-""CORPORATE""
-""BINDERS AND BINDER ACCESSORIES""
-2181.58
-""CORPORATE""
-""BOOKCASES""
-882.51
-""CORPORATE""
-""CHAIRS & CHAIRMATS""
-1530.77
-""CORPORATE""
-""COMPUTER PERIPHERALS""
-2990.1
-""CORPORATE""
-""COPIERS AND FAX""
-235.78
-""CORPORATE""
-""ENVELOPES""
-556.68
-""CORPORATE""
-""LABELS""
-759.24
-""CORPORATE""
-""OFFICE FURNISHINGS""
-2726.96
-""CORPORATE""
-""OFFICE MACHINES""
-1063.25
-""CORPORATE""
-""PAPER""
-2955.39
-""CORPORATE""
-""PENS & ART SUPPLIES""
-2443.31
-""CORPORATE""
-""RUBBER BANDS""
-552.35
-""CORPORATE""
-""SCISSORS, RULERS AND TRIMMERS""
-675.92
-""CORPORATE""
-""STORAGE & ORGANIZATION""
-2484.99
-""CORPORATE""
-""TABLES""
-1653.79
-""CORPORATE"""
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.calc.11.Exclude,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.11.Exclude.simple_lower.xml,False,0,8,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.11.Exclude.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","COUNT,SUM,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,36.0,"
-      SELECT `t0`.`Market Segment` AS `Market Segment`,
-  `t1`.`__measure__0` AS `sum_Calculation_0040203110812011_ok`
-FROM (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`
-) `t0`
-  CROSS JOIN (
-  SELECT SUM(`Staples`.`Sales Total`) AS `__measure__0`
-  FROM `staples` `Staples`
-  HAVING (COUNT(1) > 0)
-) `t1`
-    ",,"""CONSUMER""
-98687937.0
-""CORPORATE""
-98687937.0
-""HOME OFFICE""
-98687937.0
-""SMALL BUSINESS""
-98687937.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.calc.4.Lookup,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.4.Lookup.simple_lower.xml,False,0,48,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.4.Lookup.simple_lower.xml,logical,Required If Supported,"Cast,Level of Detail,Aggregation","SUM,FLOAT,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,33.0,"
-      SELECT `t0`.`Market Segment` AS `Market Segment`,
-  `t0`.`Prod Type1` AS `Prod Type1`,
-  (`t1`.`__measure__0` + 0.0) AS `TEMP(Calculation_8290203111048369)(2626528331)(0)`,
-  `t0`.`TEMP(Calculation_8290203111048369)(357447720)(0)` AS `TEMP(Calculation_8290203111048369)(357447720)(0)`
-FROM (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    `Staples`.`Prod Type1` AS `Prod Type1`,
-    SUM(`Staples`.`Sales Total`) AS `TEMP(Calculation_8290203111048369)(357447720)(0)`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`,
-    `Prod Type1`
-) `t0`
-  INNER JOIN (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    SUM(`Staples`.`Sales Total`) AS `__measure__0`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`
-) `t1` ON (`t0`.`Market Segment` = `t1`.`Market Segment`)
-    ",,"""CONSUMER""
-""FURNITURE""
-19889172.0
-6987300.0
-""CONSUMER""
-""OFFICE SUPPLIES""
-19889172.0
-4599668.9
-""CONSUMER""
-""TECHNOLOGY""
-19889172.0
-8302202.8
-""CORPORATE""
-""FURNITURE""
-35593890.0
-12325807.0
-""CORPORATE""
-""OFFICE SUPPLIES""
-35593890.0
-8644838.2
-""CORPORATE""
-""TECHNOLOGY""
-35593890.0
-14623245.0
-""HOME OFFICE""
-""FURNITURE""
-24513651.0
-8354019.3
-""HOME OFFICE""
-""OFFICE SUPPLIES""
-24513651.0
-6116307.0
-""HOME OFFICE""
-""TECHNOLOGY""
-24513651.0
-10043325.0
-""SMALL BUSINESS""
-""FURNITURE""
-18691224.0
-6341959.4
-""SMALL BUSINESS""
-""OFFICE SUPPLIES""
-18691224.0
-4653925.8
-""SMALL BUSINESS""
-""TECHNOLOGY""
-18691224.0
-7695338.8"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.calc.9.Fixed,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.9.Fixed.simple_lower.xml,False,0,34,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.9.Fixed.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","SUM,LOD_STYLE_JOIN,$AGGREGATE$","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,38.0,"
-      SELECT `t0`.`Prod Type2` AS `Prod Type2`,
-  SUM(`t1`.`__measure__1`) AS `sum_Calculation_8940203110829613_ok`
-FROM (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    `Staples`.`Prod Type2` AS `Prod Type2`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`,
-    `Prod Type2`
-) `t0`
-  INNER JOIN (
-  SELECT `Staples`.`Market Segment` AS `Market Segment`,
-    SUM(`Staples`.`Product Base Margin`) AS `__measure__1`
-  FROM `staples` `Staples`
-  GROUP BY `Market Segment`
-) `t1` ON (`t0`.`Market Segment` = `t1`.`Market Segment`)
-GROUP BY `Prod Type2`
-    ",,"""APPLIANCES""
-28278.32
-""BINDERS AND BINDER ACCESSORIES""
-28278.32
-""BOOKCASES""
-28278.32
-""CHAIRS & CHAIRMATS""
-28278.32
-""COMPUTER PERIPHERALS""
-28278.32
-""COPIERS AND FAX""
-28278.32
-""ENVELOPES""
-28278.32
-""LABELS""
-28278.32
-""OFFICE FURNISHINGS""
-28278.32
-""OFFICE MACHINES""
-28278.32
-""PAPER""
-28278.32
-""PENS & ART SUPPLIES""
-28278.32
-""RUBBER BANDS""
-28278.32
-""SCISSORS, RULERS AND TRIMMERS""
-28278.32
-""STORAGE & ORGANIZATION""
-28278.32
-""TABLES""
-28278.32
-""TELEPHONES AND COMMUNICATION""
-28278.32"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.11_As in-out Set,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.11_As in-out Set.simple_lower.xml,True,0,0,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.11_As in-out Set.simple_lower.xml,logical,Required If Supported,"Filters,NULL Semantics,Temp Tables and Subqueries,Calculation,Level of Detail,Aggregation","MIN,ISNULL,TEMP_TABLES_AND_SUBQUERIES,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-",None,None,42.0,"
-      SELECT `t0`.`__measure__0` AS `LOD - Fixed - 1 (copy 2)`
-FROM `staples` `Staples`
-  INNER JOIN (
-  SELECT `Staples`.`Customer Name` AS `Customer Name`,
-    MIN(`Staples`.`Order Date`) AS `__measure__0`
-  FROM `staples` `Staples`
-  GROUP BY `Customer Name`
-) `t0` ON (`Staples`.`Customer Name` <=> `t0`.`Customer Name`)
-WHERE ISNULL(`t0`.`__measure__0`)
-LIMIT 1
-    ",,
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.13_As in-out Set,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.13_As in-out Set.simple_lower.xml,True,0,0,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.13_As in-out Set.simple_lower.xml,logical,Required If Supported,"Filters,NULL Semantics,Temp Tables and Subqueries,Calculation,Level of Detail,Aggregation","MIN,ISNULL,TEMP_TABLES_AND_SUBQUERIES,LOD_STYLE_JOIN","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-",None,None,40.0,"
-      SELECT `t0`.`__measure__0` AS `LOD - Fixed - 1 (copy 2)`
-FROM `staples` `Staples`
-  INNER JOIN (
-  SELECT `Staples`.`Customer Name` AS `Customer Name`,
-    MIN(`Staples`.`Order Date`) AS `__measure__0`
-  FROM `staples` `Staples`
-  GROUP BY `Customer Name`
-) `t0` ON (`Staples`.`Customer Name` <=> `t0`.`Customer Name`)
-WHERE ISNULL(`t0`.`__measure__0`)
-LIMIT 1
-    ",,
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.calc.2.Two-level Agg,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.2.Two-level Agg.simple_lower.xml,False,0,6,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.2.Two-level Agg.simple_lower.xml,logical,Required If Supported,"Level of Detail,Aggregation","AVG,LOD_STYLE_JOIN,SUM,$AGGREGATE$","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,43.0,"
-      SELECT `t0`.`Call Center Region` AS `Call Center Region`,
-  SUM(`t2`.`__measure__1`) AS `sum_Calculation_4560203111140559_ok`
-FROM (
-  SELECT `Staples`.`Call Center Region` AS `Call Center Region`,
-    `Staples`.`Customer State` AS `Customer State`
-  FROM `staples` `Staples`
-  GROUP BY `Call Center Region`,
-    `Customer State`
-) `t0`
-  INNER JOIN (
-  SELECT `t1`.`Customer State` AS `Customer State`,
-    AVG(`t1`.`__measure__2`) AS `__measure__1`
-  FROM (
-    SELECT `Staples`.`Customer State` AS `Customer State`,
-      SUM(`Staples`.`Sales Total`) AS `__measure__2`
-    FROM `staples` `Staples`
-    GROUP BY `Staples`.`Call Center Region`,
-      `Customer State`
-  ) `t1`
-  GROUP BY `Customer State`
-) `t2` ON (`t0`.`Customer State` = `t2`.`Customer State`)
-GROUP BY `Call Center Region`
-    ",,"""CENTRAL""
-21059849.0
-""EAST""
-50720765.0
-""WEST""
-26907323.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.calc.7. LOD Bins,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.7. LOD Bins.simple_lower.xml,False,0,6,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.7. LOD Bins.simple_lower.xml,logical,Required If Supported,"Bins,Level of Detail,Aggregation","SYS_NUMBIN,SUM,LOD_STYLE_JOIN,$AGGREGATE$","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      No such function SUM that takes arguments of type (str).
-
-    ",Actual does not match expected.,7.0,"
-      
-    ",,"10
-2
-13
-1
-19
-1"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.17_Nesting,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.17_Nesting.simple_lower.xml,False,0,72,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.17_Nesting.simple_lower.xml,logical,Required If Supported,"Operator,Cast,Level of Detail,Aggregation","FLOAT,LOD_STYLE_JOIN,+,AVG,/","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,81.0,"
-      SELECT `t4`.`Prod Type1` AS `Prod Type1`,
-  `t4`.`Ship Mode` AS `Ship Mode`,
-  `t8`.`__measure__0` AS `TEMP(attr_LOD - Nesting - 1 (copy)_qk)(1075333431)(0)`,
-  `t8`.`__measure__0` AS `TEMP(attr_LOD - Nesting - 1 (copy)_qk)(260755027)(0)`,
-  `t4`.`avg_Calculation_8601225013155991_ok` AS `avg_Calculation_8601225013155991_ok`,
-  `t8`.`__measure__3` AS `sum_Calculation_9271225012544475_ok`,
-  `t8`.`__measure__4` AS `sum_LOD - Nesting - 2 (copy)_ok`,
-  `t10`.`__measure__0` AS `sum_LOD - Nesting - 3 (copy)_ok`
-FROM (
-  SELECT `Staples`.`Prod Type1` AS `Prod Type1`,
-    `Staples`.`Ship Mode` AS `Ship Mode`,
-    AVG((((`t1`.`__measure__0` + (`t2`.`__measure__1` + 0.0)) + `Staples`.`Sales Total`) / `t3`.`__measure__2`)) AS `avg_Calculation_8601225013155991_ok`
-  FROM `staples` `Staples`
-    INNER JOIN (
-    SELECT `t0`.`Prod Type1` AS `Prod Type1`,
-      AVG(`t0`.`__measure__1`) AS `__measure__0`
-    FROM (
-      SELECT `Staples`.`Prod Type1` AS `Prod Type1`,
-        SUM(`Staples`.`Sales Total`) AS `__measure__1`
-      FROM `staples` `Staples`
-      GROUP BY `Prod Type1`,
-        `Staples`.`Prod Type2`,
-        `Staples`.`Prod Type3`
-    ) `t0`
-    GROUP BY `Prod Type1`
-  ) `t1` ON (`Staples`.`Prod Type1` <=> `t1`.`Prod Type1`)
-    INNER JOIN (
-    SELECT `Staples`.`Prod Type1` AS `Prod Type1`,
-      `Staples`.`Ship Mode` AS `Ship Mode`,
-      SUM(`Staples`.`Sales Total`) AS `__measure__1`
-    FROM `staples` `Staples`
-    GROUP BY `Prod Type1`,
-      `Ship Mode`
-  ) `t2` ON ((`Staples`.`Prod Type1` <=> `t2`.`Prod Type1`) AND (`Staples`.`Ship Mode` <=> `t2`.`Ship Mode`))
-    INNER JOIN (
-    SELECT `Staples`.`Market Segment` AS `Market Segment`,
-      SUM(`Staples`.`Product Base Margin`) AS `__measure__2`
-    FROM `staples` `Staples`
-    GROUP BY `Market Segment`
-  ) `t3` ON (`Staples`.`Market Segment` <=> `t3`.`Market Segment`)
-  GROUP BY `Prod Type1`,
-    `Ship Mode`
-) `t4`
-  INNER JOIN (
-  SELECT `t5`.`Prod Type1` AS `Prod Type1`,
-    `t5`.`Ship Mode` AS `Ship Mode`,
-    AVG(`t5`.`__measure__1`) AS `__measure__0`,
-    SUM((`t6`.`__measure__1` + 0.0)) AS `__measure__3`,
-    SUM((`t7`.`__measure__1` + 0.0)) AS `__measure__4`
-  FROM (
-    SELECT `Staples`.`Prod Type1` AS `Prod Type1`,
-      `Staples`.`Ship Mode` AS `Ship Mode`,
-      SUM(`Staples`.`Sales Total`) AS `__measure__1`
-    FROM `staples` `Staples`
-    GROUP BY `Prod Type1`,
-      `Staples`.`Prod Type2`,
-      `Staples`.`Prod Type3`,
-      `Ship Mode`
-  ) `t5`
-    INNER JOIN (
-    SELECT `Staples`.`Prod Type1` AS `Prod Type1`,
-      `Staples`.`Ship Mode` AS `Ship Mode`,
-      SUM(`Staples`.`Sales Total`) AS `__measure__1`
-    FROM `staples` `Staples`
-    GROUP BY `Prod Type1`,
-      `Ship Mode`
-  ) `t6` ON ((`t5`.`Prod Type1` <=> `t6`.`Prod Type1`) AND (`t5`.`Ship Mode` <=> `t6`.`Ship Mode`))
-    INNER JOIN (
-    SELECT `Staples`.`Prod Type1` AS `Prod Type1`,
-      SUM(`Staples`.`Sales Total`) AS `__measure__1`
-    FROM `staples` `Staples`
-    GROUP BY `Prod Type1`
-  ) `t7` ON (`t5`.`Prod Type1` <=> `t7`.`Prod Type1`)
-  GROUP BY `Prod Type1`,
-    `Ship Mode`
-) `t8` ON ((`t4`.`Prod Type1` <=> `t8`.`Prod Type1`) AND (`t4`.`Ship Mode` <=> `t8`.`Ship Mode`))
-  INNER JOIN (
-  SELECT `t9`.`Prod Type1` AS `Prod Type1`,
-    AVG(`t9`.`__measure__1`) AS `__measure__0`
-  FROM (
-    SELECT `Staples`.`Prod Type1` AS `Prod Type1`,
-      SUM(`Staples`.`Sales Total`) AS `__measure__1`
-    FROM `staples` `Staples`
-    GROUP BY `Prod Type1`,
-      `Staples`.`Prod Type2`,
-      `Staples`.`Prod Type3`
-  ) `t9`
-  GROUP BY `Prod Type1`
-) `t10` ON (`t4`.`Prod Type1` <=> `t10`.`Prod Type1`)
-    ",,"""FURNITURE""
-""DELIVERY TRUCK""
-4002620.2
-4002620.2
-4271.0757
-1.9612839e+08
-2.380636e+08
-2267272.4
-""FURNITURE""
-""EXPRESS AIR""
-76460.766
-76460.766
-443.56198
-9251752.7
-3.7409995e+08
-2267272.4
-""FURNITURE""
-""REGULAR AIR""
-468152.41
-468152.41
-1046.4216
-56646441.0
-3.7409995e+08
-2267272.4
-""OFFICE SUPPLIES""
-""DELIVERY TRUCK""
-819224.44
-819224.44
-435.20844
-7373020.0
-72044220.0
-649047.03
-""OFFICE SUPPLIES""
-""EXPRESS AIR""
-83280.028
-83280.028
-501.43046
-1.0201803e+08
-8.405159e+08
-649047.03
-""OFFICE SUPPLIES""
-""REGULAR AIR""
-532636.16
-532636.16
-2729.3706
-6.524793e+08
-8.405159e+08
-649047.03
-""TECHNOLOGY""
-""DELIVERY TRUCK""
-6038779.5
-6038779.5
-2386.7716
-24155118.0
-81328223.0
-4518234.6
-""TECHNOLOGY""
-""EXPRESS AIR""
-445944.71
-445944.71
-1143.9339
-28540462.0
-3.2531289e+08
-4518234.6
-""TECHNOLOGY""
-""REGULAR AIR""
-3127374.3
-3127374.3
-4182.9544
-2.0015196e+08
-3.2531289e+08
-4518234.6"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.1_Difference From with Cross Join,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.1_Difference From with Cross Join.simple_lower.xml,False,0,14916,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.1_Difference From with Cross Join.simple_lower.xml,logical,Required If Supported,"Level of Detail,Date Filters,Aggregation","MIN,SUM,DATEDIFF,LOD_STYLE_JOIN,COUNT","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,40.0,"
-      SELECT `Staples`.`Customer Name` AS `Customer Name`,
-  ((YEAR(`Staples`.`Order Date`) - YEAR(`t0`.`__measure__0`)) * 12 + (MONTH(`Staples`.`Order Date`) - MONTH(`t0`.`__measure__0`))) AS `LOD - Fixed - 2 (copy)`,
-  SUM(`Staples`.`Sales Total`) AS `sum_Sales Total_ok`
-FROM `staples` `Staples`
-  CROSS JOIN (
-  SELECT MIN(`Staples`.`Order Date`) AS `__measure__0`
-  FROM `staples` `Staples`
-  HAVING (COUNT(1) > 0)
-) `t0`
-GROUP BY `Customer Name`,
-  `LOD - Fixed - 2 (copy)`
-    ",,"""Barbara Fisher""
-0
-2752.47
-""Barbara Fisher""
-1
-17041.71
-""Barbara Fisher""
-2
-9445.89
-""Barbara Fisher""
-3
-2911.44
-""Barbara Fisher""
-4
-4767.19
-""Barbara Fisher""
-5
-7983.44
-""Barbara Fisher""
-6
-10388.9
-""Barbara Fisher""
-7
-13702.02
-""Barbara Fisher""
-8
-416.77
-""Barbara Fisher""
-9
-40965.51
-""Barbara Fisher""
-10
-21988.56
-""Barbara Fisher""
-12
-22536.97
-""Barbara Fisher""
-13
-203.88
-""Barbara Fisher""
-15
-5198.15
-""Barbara Fisher""
-16
-26347.71
-""Barbara Fisher""
-17
-27919.72
-""Barbara Fisher""
-18
-9505.41
-""Barbara Fisher""
-19
-39623.98
-""Barbara Fisher""
-20
-24160.32
-""Barbara Fisher""
-21
-4667.81
-""Barbara Fisher""
-22
-5899.77
-""Barbara Fisher""
-23
-1954.74
-""Barbara Fisher""
-24
-4483.27
-""Barbara Fisher""
-25
-18439.47
-""Barbara Fisher""
-26
-33336.26
-""Barbara Fisher""
-28
-14581.07
-""Barbara Fisher""
-29
-37760.61
-""Barbara Fisher""
-30
-15019.14
-""Barbara Fisher""
-31
-39299.51
-""Barbara Fisher""
-32
-15460.42
-""Barbara Fisher""
-33
-155.77
-""Barbara Fisher""
-34
-23026.96
-""Barbara Fisher""
-35
-3603.8
-""Barbara Fisher"""
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.9_Fixed as Dimension,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.9_Fixed as Dimension.simple_lower.xml,False,0,126,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.9_Fixed as Dimension.simple_lower.xml,logical,Required If Supported,"Level of Detail,Calculation,Date Filters,Aggregation","MIN,SUM,LOD_STYLE_JOIN,FLOOR,DATEPART","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,39.0,"
-      SELECT FLOOR(SUM(`Staples`.`Sales Total`)) AS `sum_Sales Total_ok`,
-  FLOOR((7 + DAYOFYEAR(`t0`.`__measure__0`) - 1 + DAYOFWEEK(DATE_FORMAT(`t0`.`__measure__0`, '%Y-01-01 00:00:00')) - 1) / 7) AS `wk_LOD - Fixed - 1 (copy 2)_ok`,
-  YEAR(`Staples`.`Order Date`) AS `yr_Order Date_ok`
-FROM `staples` `Staples`
-  INNER JOIN (
-  SELECT `Staples`.`Customer Name` AS `Customer Name`,
-    MIN(`Staples`.`Order Date`) AS `__measure__0`
-  FROM `staples` `Staples`
-  GROUP BY `Customer Name`
-) `t0` ON (`Staples`.`Customer Name` <=> `t0`.`Customer Name`)
-GROUP BY `wk_LOD - Fixed - 1 (copy 2)_ok`,
-  `yr_Order Date_ok`
-    ",,"143086.0
-7
-1997
-155398.0
-6
-2000
-171196.0
-7
-2000
-203969.0
-7
-2002
-210031.0
-7
-1999
-229542.0
-7
-2001
-250933.0
-6
-1999
-270968.0
-6
-2002
-272984.0
-6
-1997
-275541.0
-7
-1998
-292277.0
-6
-2001
-333289.0
-6
-1998
-602266.0
-5
-2001
-602510.0
-5
-2000
-631772.0
-5
-1999
-661241.0
-5
-1997
-711393.0
-5
-1998
-740353.0
-5
-2002
-1589284.0
-4
-2001
-1639958.0
-4
-2002
-1658149.0
-4
-1998
-1681972.0
-4
-1997
-1766892.0
-4
-2000
-1847329.0
-4
-1999
-2581528.0
-3
-2002
-2817285.0
-3
-1997
-2903749.0
-3
-2000
-2936721.0
-3
-1999
-2983885.0
-3
-1998
-3106220.0
-3
-2001
-4820443.0
-1
-2002
-4950468.0
-1
-2000
-4953826.0
-1
-1999
-4985164.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.calc.1.TopN,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.1.TopN.simple_lower.xml,False,0,34,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.calc.1.TopN.simple_lower.xml,logical,Required If Supported,"Filters,Temp Tables and Subqueries,Calculation,Level of Detail,Aggregation","MIN,SUM,LOD_STYLE_JOIN,FLOOR,TEMP_TABLES_AND_SUBQUERIES","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,47.0,"
-      SELECT `Staples`.`Prod Type2` AS `Prod Type2`,
-  FLOOR(SUM(`Staples`.`Sales Total`)) AS `sum_Sales Total_ok`
-FROM `staples` `Staples`
-  INNER JOIN (
-  SELECT `t0`.`Market Segment` AS `Market Segment`,
-    SUM(`t0`.`__measure__1`) AS `$__alias__0`
-  FROM (
-    SELECT `Staples`.`Market Segment` AS `Market Segment`,
-      SUM(`Staples`.`Sales Total`) AS `__measure__1`
-    FROM `staples` `Staples`
-    GROUP BY `Market Segment`,
-      `Staples`.`Prod Type1`
-  ) `t0`
-  GROUP BY `Market Segment`
-  ORDER BY `$__alias__0` DESC
-  LIMIT 2
-) `t1` ON (`Staples`.`Market Segment` = `t1`.`Market Segment`)
-GROUP BY `Prod Type2`
-    ",,"""APPLIANCES""
-3211255.0
-""BINDERS AND BINDER ACCESSORIES""
-3486043.0
-""BOOKCASES""
-3192047.0
-""CHAIRS & CHAIRMATS""
-6394825.0
-""COMPUTER PERIPHERALS""
-3181279.0
-""COPIERS AND FAX""
-3937480.0
-""ENVELOPES""
-499500.0
-""LABELS""
-252067.0
-""OFFICE FURNISHINGS""
-2445700.0
-""OFFICE MACHINES""
-9186301.0
-""PAPER""
-1886099.0
-""PENS & ART SUPPLIES""
-728282.0
-""RUBBER BANDS""
-59076.0
-""SCISSORS, RULERS AND TRIMMERS""
-717918.0
-""STORAGE & ORGANIZATION""
-3920902.0
-""TABLES""
-8647254.0
-""TELEPHONES AND COMMUNICATION""
-8361507.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.14_As in-out Set,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.14_As in-out Set.simple_lower.xml,False,0,6,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.14_As in-out Set.simple_lower.xml,logical,Required If Supported,"NULL Semantics,Operator,Sets,Calculation,Level of Detail,Aggregation","MIN,MAX,ISNULL,SUM,LOD_STYLE_JOIN,COUNT,AVG,!,$IN_SET$","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,60.0,"
-      SELECT `t8`.`__measure__1` AS `avg_Calculation_4621225004123988_ok`,
-  `t3`.`io_Set 1_nk` AS `io_Set 1_nk`,
-  `t3`.`sum_Sales Total_ok` AS `sum_Sales Total_ok`
-FROM (
-  SELECT (CASE WHEN (NOT ISNULL(`t2`.`$temp2_output`)) THEN 1 ELSE 0 END) AS `io_Set 1_nk`,
-    SUM(`Staples`.`Sales Total`) AS `sum_Sales Total_ok`
-  FROM `staples` `Staples`
-    INNER JOIN (
-    SELECT `Staples`.`Customer Name` AS `Customer Name`,
-      MIN(`Staples`.`Order Date`) AS `__measure__0`
-    FROM `staples` `Staples`
-    GROUP BY `Customer Name`
-  ) `t0` ON (`Staples`.`Customer Name` <=> `t0`.`Customer Name`)
-    LEFT JOIN (
-    SELECT `t1`.`none_LOD - Fixed - 1 (copy 2)_ok` AS `none_LOD - Fixed - 1 (copy 2)_ok`,
-      1 AS `$temp2_output`
-    FROM (
-      SELECT MIN(`Staples`.`Order Date`) AS `none_LOD - Fixed - 1 (copy 2)_ok`
-      FROM `staples` `Staples`
-      GROUP BY `Staples`.`Customer Name`
-      HAVING (NOT (MIN(`Staples`.`Order Date`) IN (TIMESTAMP('1997-01-03 00:00:00'), TIMESTAMP('1997-01-07 00:00:00'), TIMESTAMP('1997-01-11 00:00:00'))))
-    ) `t1`
-    GROUP BY `none_LOD - Fixed - 1 (copy 2)_ok`
-  ) `t2` ON (`t0`.`__measure__0` = `t2`.`none_LOD - Fixed - 1 (copy 2)_ok`)
-  GROUP BY `io_Set 1_nk`
-) `t3`
-  INNER JOIN (
-  SELECT `t7`.`io_Set 1_nk` AS `io_Set 1_nk`,
-    AVG(`t7`.`__measure__2`) AS `__measure__1`
-  FROM (
-    SELECT (CASE WHEN (NOT ISNULL(`t6`.`$temp5_output`)) THEN 1 ELSE 0 END) AS `io_Set 1_nk`,
-      SUM(`Staples`.`Sales Total`) AS `__measure__2`
-    FROM `staples` `Staples`
-      INNER JOIN (
-      SELECT `Staples`.`Customer Name` AS `Customer Name`,
-        MIN(`Staples`.`Order Date`) AS `__measure__0`
-      FROM `staples` `Staples`
-      GROUP BY `Customer Name`
-    ) `t4` ON (`Staples`.`Customer Name` <=> `t4`.`Customer Name`)
-      LEFT JOIN (
-      SELECT `t5`.`none_LOD - Fixed - 1 (copy 2)_ok` AS `none_LOD - Fixed - 1 (copy 2)_ok`,
-        1 AS `$temp5_output`
-      FROM (
-        SELECT MIN(`Staples`.`Order Date`) AS `none_LOD - Fixed - 1 (copy 2)_ok`
-        FROM `staples` `Staples`
-        GROUP BY `Staples`.`Customer Name`
-        HAVING (NOT (MIN(`Staples`.`Order Date`) IN (TIMESTAMP('1997-01-03 00:00:00'), TIMESTAMP('1997-01-07 00:00:00'), TIMESTAMP('1997-01-11 00:00:00'))))
-      ) `t5`
-      GROUP BY `none_LOD - Fixed - 1 (copy 2)_ok`
-    ) `t6` ON (`t4`.`__measure__0` = `t6`.`none_LOD - Fixed - 1 (copy 2)_ok`)
-    GROUP BY `Staples`.`Prod Type1`,
-      `io_Set 1_nk`
-  ) `t7`
-  GROUP BY `io_Set 1_nk`
-) `t8` ON (`t3`.`io_Set 1_nk` = `t8`.`io_Set 1_nk`)
-    ",,"4330452.9
-false
-12991359.0
-28565526.0
-true
-85696579.0"
-OpenSearch,tempOpenSearch,staples.OpenSearch,lod.16_As Group,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.16_As Group.simple_lower.xml,False,0,16,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.16_As Group.simple_lower.xml,logical,Required If Supported,"Filters,Operator,Cast,Sets,Date Filters,Level of Detail,Aggregation","MIN,FLOAT,SUM,DATEDIFF,LOD_STYLE_JOIN,COUNT,AVG,DATEPART,==,$IN_SET$","Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: No such function SUM that takes arguments of type (str).
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/lod\setup.lod.10_As in-out Set.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,73.0,"
-      SELECT `t1`.`LOD - Fixed - 4 (group)` AS `LOD - Fixed - 4 (group)`,
-  (`t4`.`__measure__1` + 0.0) AS `avg_Calculation_4821225012418421_ok`,
-  `t1`.`avg_Price_ok` AS `avg_Price_ok`,
-  `t7`.`__measure__4` AS `sum_Calculation_4621225004123988_ok`
-FROM (
-  SELECT (CASE WHEN (((YEAR(`Staples`.`Order Date`) - YEAR(`t0`.`__measure__0`)) * 12 + (MONTH(`Staples`.`Order Date`) - MONTH(`t0`.`__measure__0`))) IN (0, 1, 2, 3, 4, 5, 6)) THEN 0 WHEN (((YEAR(`Staples`.`Order Date`) - YEAR(`t0`.`__measure__0`)) * 12 + (MONTH(`Staples`.`Order Date`) - MONTH(`t0`.`__measure__0`))) IN (7, 8, 9, 10, 11, 12, 13, 14, 15)) THEN 7 WHEN (((YEAR(`Staples`.`Order Date`) - YEAR(`t0`.`__measure__0`)) * 12 + (MONTH(`Staples`.`Order Date`) - MONTH(`t0`.`__measure__0`))) IN (16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64)) THEN 16 ELSE 71 END) AS `LOD - Fixed - 4 (group)`,
-    AVG(`Staples`.`Price`) AS `avg_Price_ok`
-  FROM `staples` `Staples`
-    CROSS JOIN (
-    SELECT MIN(`Staples`.`Order Date`) AS `__measure__0`
-    FROM `staples` `Staples`
-    HAVING (COUNT(1) > 0)
-  ) `t0`
-  GROUP BY `LOD - Fixed - 4 (group)`
-) `t1`
-  CROSS JOIN (
-  SELECT MIN(`Staples`.`Order Date`) AS `__measure__0`
-  FROM `staples` `Staples`
-  HAVING (COUNT(1) > 0)
-) `t2`
-  INNER JOIN (
-  SELECT MONTH(`t3`.`__measure__0`) AS `Calculation_8741225012317469`,
-    SUM(`Staples`.`Order Quantity`) AS `__measure__1`
-  FROM `staples` `Staples`
-    CROSS JOIN (
-    SELECT MIN(`Staples`.`Order Date`) AS `__measure__0`
-    FROM `staples` `Staples`
-    HAVING (COUNT(1) > 0)
-  ) `t3`
-  GROUP BY `Calculation_8741225012317469`
-) `t4` ON (MONTH(`t2`.`__measure__0`) <=> `t4`.`Calculation_8741225012317469`)
-  INNER JOIN (
-  SELECT `t6`.`LOD - Fixed - 4 (group)` AS `LOD - Fixed - 4 (group)`,
-    SUM(`t6`.`__measure__3`) AS `__measure__4`
-  FROM (
-    SELECT (CASE WHEN (((YEAR(`Staples`.`Order Date`) - YEAR(`t5`.`__measure__0`)) * 12 + (MONTH(`Staples`.`Order Date`) - MONTH(`t5`.`__measure__0`))) IN (0, 1, 2, 3, 4, 5, 6)) THEN 0 WHEN (((YEAR(`Staples`.`Order Date`) - YEAR(`t5`.`__measure__0`)) * 12 + (MONTH(`Staples`.`Order Date`) - MONTH(`t5`.`__measure__0`))) IN (7, 8, 9, 10, 11, 12, 13, 14, 15)) THEN 7 WHEN (((YEAR(`Staples`.`Order Date`) - YEAR(`t5`.`__measure__0`)) * 12 + (MONTH(`Staples`.`Order Date`) - MONTH(`t5`.`__measure__0`))) IN (16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64)) THEN 16 ELSE 71 END) AS `LOD - Fixed - 4 (group)`,
-      SUM(`Staples`.`Sales Total`) AS `__measure__3`
-    FROM `staples` `Staples`
-      CROSS JOIN (
-      SELECT MIN(`Staples`.`Order Date`) AS `__measure__0`
-      FROM `staples` `Staples`
-      HAVING (COUNT(1) > 0)
-    ) `t5`
-    GROUP BY `LOD - Fixed - 4 (group)`,
-      `Staples`.`Prod Type1`
-  ) `t6`
-  GROUP BY `LOD - Fixed - 4 (group)`
-) `t7` ON (`t1`.`LOD - Fixed - 4 (group)` = `t7`.`LOD - Fixed - 4 (group)`)
-    ",,"0
-1390980.0
-83.376849
-9334296.5
-7
-1390980.0
-90.50068
-12192129.0
-16
-1390980.0
-85.679629
-67941185.0
-71
-1390980.0
-82.764691
-9220327.3"
-OpenSearch,tempOpenSearch,staples.OpenSearch,Filter.slicing_Q_date_month_instance_filter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Filter.slicing_Q_date_month_instance_filter.simple_lower.xml,False,0,0,,logical,Required,Date Filters,DATEPART,,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Sort_Natural_DESC,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Sort_Natural_DESC.simple_lower.xml,False,0,0,,logical,Required,Aggregation,SUM,,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_Include1,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_Include1.simple_lower.xml,False,0,0,,logical,Required,"Filters,Operator,Aggregation","==,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Sort_Alphabetic_DESC_Top1,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Sort_Alphabetic_DESC_Top1.simple_lower.xml,False,0,0,,logical,Required,"Aggregation,Temp Tables and Subqueries,Filters","TEMP_TABLES_AND_SUBQUERIES,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Sort_Alphabetic_DESC_Top10,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Sort_Alphabetic_DESC_Top10.simple_lower.xml,False,0,0,,logical,Required,"Aggregation,Temp Tables and Subqueries,Filters","TEMP_TABLES_AND_SUBQUERIES,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Top99_ByField,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Top99_ByField.simple_lower.xml,False,0,0,,logical,Required,"Aggregation,Temp Tables and Subqueries,Filters","AVG,TEMP_TABLES_AND_SUBQUERIES",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,BUGS.B24394,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.BUGS.B24394.simple_lower.xml,False,0,0,,logical,Required,"Filters,Date Filters,Operator","DATETRUNC,<=,DATEPART",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,BUGS.B530764,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.BUGS.B530764.simple_lower.xml,False,0,0,,logical,Recommended,"Aggregation,Operator","COUNT,SUM,/",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Filter.Q_date_month_instance_filter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Filter.Q_date_month_instance_filter.simple_lower.xml,False,0,0,,logical,Required,"Filters,Date Filters,Operator,Aggregation","<=,DATEPART,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.FilterBy_Q,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.FilterBy_Q.simple_lower.xml,False,0,0,,logical,Required,"Filters,Operator,Aggregation","AVG,<,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Filter.Add_to_context,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Filter.Add_to_context.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical","==,$SYS_NARY_AND$,!,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Filter.Q_date_instance_filter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Filter.Q_date_instance_filter.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical","COUNT,>=,<=,$SYS_NARY_AND$",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Filter.slicing_Q_date_instance_filter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Filter.slicing_Q_date_instance_filter.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical",">=,<=,$SYS_NARY_AND$,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Dates_MDY,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Dates_MDY.simple_lower.xml,False,0,0,,logical,Required,"Aggregation,Date Filters,Operator","*,+,DATEPART,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_AVG,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_AVG.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical","AVG,>=,<=,$SYS_NARY_AND$",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_CNT,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_CNT.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical",">=,<=,$SYS_NARY_AND$,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_MAX,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_MAX.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical",">=,<=,MAX,$SYS_NARY_AND$",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_MIN,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_MIN.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical",">=,<=,MIN,$SYS_NARY_AND$",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_SUM,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_SUM.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical",">=,<=,$SYS_NARY_AND$,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_SliceAggQUnaggQ_AxisQ,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_SliceAggQUnaggQ_AxisQ.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical",">=,<=,$SYS_NARY_AND$,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_SliceAggQ_AxisQ,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_SliceAggQ_AxisQ.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical",">=,<=,$SYS_NARY_AND$,SUM",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_Exclude1,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_Exclude1.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical","$SYS_NARY_OR$,$SYS_NARY_AND$,SUM,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_SliceAggQ,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_SliceAggQ.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical","$SYS_NARY_AND$,SUM,AVG,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_SliceAggQUnaggQ_AxisQO,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_SliceAggQUnaggQ_AxisQO.simple_lower.xml,False,0,0,,logical,Required,"Sets,Filters,Operator,Aggregation,Logical","$SYS_NARY_AND$,$NOT_IN_SET$,SUM,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.HideEmptyRows,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.HideEmptyRows.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical","$SYS_NARY_AND$,AVG,>=,MIN,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Nest_SliceQ,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Nest_SliceQ.simple_lower.xml,False,0,0,,logical,Required,"Filters,Aggregation,Operator,Logical","$SYS_NARY_AND$,SUM,AVG,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,ZTesting.Staples9,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.ZTesting.Staples9.simple_lower.xml,False,0,0,,logical,Recommended,"Filters,Date Filters,Operator,Logical","DATEPART,==,$SYS_NARY_AND$,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,BUGS.B340,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.BUGS.B340.simple_lower.xml,False,0,0,,logical,Recommended,"Filters,Temp Tables and Subqueries,Operator,Aggregation,Logical","TEMP_TABLES_AND_SUBQUERIES,$SYS_NARY_AND$,SUM,>=,MIN,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Filter.Trademark,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Filter.Trademark.simple_lower.xml,False,0,0,,logical,Smoke,"Sets,Filters,Operator,Aggregation,Logical","$IN_SET$,$SYS_NARY_OR$,$SYS_NARY_AND$,SUM,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Nest_FilterO1_SliceOQ,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Nest_FilterO1_SliceOQ.simple_lower.xml,False,0,0,,logical,Required,"Sets,Filters,Operator,Aggregation,Logical","$SYS_NARY_AND$,$NOT_IN_SET$,SUM,AVG,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Nest_SliceQO,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Nest_SliceQO.simple_lower.xml,False,0,0,,logical,Required,"Sets,Filters,Operator,Aggregation,Logical","$SYS_NARY_AND$,$NOT_IN_SET$,SUM,AVG,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Unaggregated_Filter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Unaggregated_Filter.simple_lower.xml,False,0,0,,logical,Required,"Filters,Operator,Sets,Date Filters,Logical","DATEPART,$IN_SET$,$SYS_NARY_AND$,$NOT_IN_SET$,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Unaggregated_Filter_NoDateTime,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Unaggregated_Filter_NoDateTime.simple_lower.xml,False,0,0,,logical,Required,"Filters,Operator,Sets,Date Filters,Logical","DATEPART,$IN_SET$,$SYS_NARY_AND$,$NOT_IN_SET$,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,BUGS.B14080,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.BUGS.B14080.simple_lower.xml,False,0,0,,logical,Required,"Cast,NULL Semantics,Calculation,Operator,Aggregation,Sets,Logical","$IN_SET$,$SYS_NARY_AND$,SUM,-,!,FLOAT,ISNULL",,"Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_SliceAggQUnaggQUnaggDT_AxisQOYear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_SliceAggQUnaggQUnaggDT_AxisQOYear.simple_lower.xml,False,0,0,,logical,Required,"Filters,Operator,Aggregation,Sets,Date Filters,Logical","DATEPART,$IN_SET$,$SYS_NARY_AND$,$NOT_IN_SET$,SUM,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Filter_SliceAggQUnaggQ_AxisQOYear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Filter_SliceAggQUnaggQ_AxisQOYear.simple_lower.xml,False,0,0,,logical,Required,"Filters,Operator,Aggregation,Sets,Date Filters,Logical","DATEPART,$IN_SET$,$SYS_NARY_AND$,$NOT_IN_SET$,SUM,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Dates_MDY_Filtered,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Dates_MDY_Filtered.simple_lower.xml,False,0,0,,logical,Required,"Filters,Operator,Aggregation,Date Filters,Logical","DATEPART,+,$SYS_NARY_OR$,$SYS_NARY_AND$,SUM,*,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Nest_FilterO1O2_SliceOQ_SortByO1,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Nest_FilterO1O2_SliceOQ_SortByO1.simple_lower.xml,False,0,0,,logical,Required,"Sets,Filters,Operator,Aggregation,Logical","$IN_SET$,$SYS_NARY_OR$,$SYS_NARY_AND$,$NOT_IN_SET$,SUM,AVG,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.Nest_FilterO1O2_SliceOQ_SortByO1O2,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.Nest_FilterO1O2_SliceOQ_SortByO1O2.simple_lower.xml,False,0,0,,logical,Required,"Sets,Filters,Operator,Aggregation,Logical","$IN_SET$,$SYS_NARY_OR$,$SYS_NARY_AND$,$NOT_IN_SET$,SUM,AVG,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,BUGS.B8888,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.BUGS.B8888.simple_lower.xml,False,0,0,,logical,Recommended,"Filters,Cast,Operator,Aggregation,Date Filters","DATEPART,DATETRUNC,+,/,-,DATEADD,<,INT,COUNTD",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.MultipleFilters,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.MultipleFilters.simple_lower.xml,False,0,0,,logical,Required,"Sets,Filters,Operator,Aggregation,Date Filters,Logical","DATEPART,==,$IN_SET$,$SYS_NARY_OR$,$SYS_NARY_AND$,SUM,AVG,>=,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,staples.OpenSearch,Query.FilterBy_DateTime_Slices,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/staples\setup.Query.FilterBy_DateTime_Slices.simple_lower.xml,False,0,0,,logical,Required,"Filters,Operator,Aggregation,Sets,Date Filters,Logical","DATEPART,$IN_SET$,$SYS_NARY_OR$,$NOT_IN_SET$,$SYS_NARY_AND$,SUM,>=,MIN,<,<=",,"Error. Previous error message is: Attempting to run query...
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse Belkin ErgoBoardâ„¢ Keyboard as a Double
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Can not parse EAST as a Double
-
-DataSourceException: 
-
-DataSourceException: Error executing query
-
-DataSourceException: Error executing query
-
-TableauException: Tableau cannot evaluate the query that results from this calculation.
-
-Error running query
-",Error.,0.0,,,
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs.union,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/union\setup.calcs.union.simple_lower.xml,False,0,374,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/union\setup.calcs.union.simple_lower.xml,logical,Required If Supported,"Union,Temp Tables and Subqueries,Filters","UNION,TEMP_TABLES_AND_SUBQUERIES","Attempting to run query...
-DataSourceException: Error executing query
-
-Run query successful! Check output file
-Exception processing 'C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\logicaltests/setup/union\setup.calcs.union.simple_lower.xml'
-Problem saving combined output file:
-","
-      Error executing query
-
-    ",Actual does not match expected.,90.0,"
-      SELECT 1 AS `Number of Records`,
-  `t0`.`table_name` AS `table_name`,
-  `t0`.`int0` AS `int0`,
-  `t0`.`int1` AS `int1`,
-  `t0`.`int2` AS `int2`,
-  `t0`.`int3` AS `int3`,
-  `t0`.`key` AS `key`,
-  `t0`.`str0` AS `str0`,
-  `t0`.`str1` AS `str1`,
-  `t0`.`str2` AS `str2`,
-  `t0`.`str3` AS `str3`
-FROM (
-  
-  SELECT `t1`.`int0` AS `int0`, `t1`.`int1` AS `int1`, `t1`.`int2` AS `int2`, `t1`.`int3` AS `int3`, `t1`.`key` AS `key`, `t1`.`str0` AS `str0`, `t1`.`str1` AS `str1`, `t1`.`str2` AS `str2`, `t1`.`str3` AS `str3`, `t1`.`table_name` AS `table_name`
-  FROM (
-    SELECT `Calcs`.`int0` AS `int0`,
-      `Calcs`.`int1` AS `int1`,
-      `Calcs`.`int2` AS `int2`,
-      `Calcs`.`int3` AS `int3`,
-      `Calcs`.`key` AS `key`,
-      `Calcs`.`str0` AS `str0`,
-      `Calcs`.`str1` AS `str1`,
-      `Calcs`.`str2` AS `str2`,
-      `Calcs`.`str3` AS `str3`,
-      'Calcs' AS `table_name`
-    FROM `calcs` `Calcs`
-  ) `t1`
-  
-   UNION  ALL 
-  
-  SELECT `t2`.`int0` AS `int0`, `t2`.`int1` AS `int1`, `t2`.`int2` AS `int2`, `t2`.`int3` AS `int3`, `t2`.`key` AS `key`, `t2`.`str0` AS `str0`, `t2`.`str1` AS `str1`, `t2`.`str2` AS `str2`, `t2`.`str3` AS `str3`, `t2`.`table_name` AS `table_name`
-  FROM (
-    SELECT `Calcs1`.`int0` AS `int0`,
-      `Calcs1`.`int1` AS `int1`,
-      `Calcs1`.`int2` AS `int2`,
-      `Calcs1`.`int3` AS `int3`,
-      `Calcs1`.`key` AS `key`,
-      `Calcs1`.`str0` AS `str0`,
-      `Calcs1`.`str1` AS `str1`,
-      `Calcs1`.`str2` AS `str2`,
-      `Calcs1`.`str3` AS `str3`,
-      'Calcs1' AS `table_name`
-    FROM `calcs` `Calcs1`
-  ) `t2`
-  
-) `t0`
-LIMIT 1000
-    ",,"1
-""Calcs""
-%null%
-%null%
-0
-11
-""key12""
-""TECHNOLOGY""
-""CORDED KEYBOARDS""
-%null%
-%null%
-1
-""Calcs""
-%null%
-%null%
-5
-2
-""key02""
-""OFFICE SUPPLIES""
-""AIR PURIFIERS""
-""three""
-""e""
-1
-""Calcs""
-%null%
--6
--4
-13
-""key01""
-""FURNITURE""
-""CLOCKS""
-""two""
-""e""
-1
-""Calcs""
-%null%
--4
--5
-5
-""key03""
-""OFFICE SUPPLIES""
-""BINDER ACCESSORIES""
-%null%
-""e""
-1
-""Calcs""
-%null%
-2
-0
-3
-""key07""
-""OFFICE SUPPLIES""
-""BUSINESS ENVELOPES""
-""eight""
-""e""
-1
-""Calcs""
-%null%
-3
--6
-17
-""key08""
-""TECHNOLOGY""
-""ANSWERING MACHINES""
-""nine""
-%null%
-1
-""Calcs""
-1
--3
-5
-8
-""key00""
-""FURNITURE""
-""CLAMP ON LAMPS""
-""one""
-""e""
-1
-""Calcs""
-3
-%null%
-2
-7
-""key05""
-""OFFICE SUPPLIES""
-""BINDING MACHINES""
-""six""
-%null%
-1
-""Calcs""
-4
-%null%
--9
-11
-""key15""
-""TECHNOLOGY""
-""DVD""
-""sixteen""
-""e""
-1"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,bad_password_test,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests/pretest\setup.bad_password_test.txt,True,0,0,key,expression,unknown,unknown,unknown,,None,None,103.0,"
-      SELECT `calcs`.`key` AS `TEMP(Test)(3382465274)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3382465274)(0)`
-    ","""key00""
-""key01""
-""key02""
-""key03""
-""key04""
-""key05""
-""key06""
-""key07""
-""key08""
-""key09""
-""key10""
-""key11""
-""key12""
-""key13""
-""key14""
-""key15""
-""key16""","""key00""
-""key01""
-""key02""
-""key03""
-""key04""
-""key05""
-""key06""
-""key07""
-""key08""
-""key09""
-""key10""
-""key11""
-""key12""
-""key13""
-""key14""
-""key15""
-""key16"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.count,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.count.txt,True,0,0,COUNT([int0]),expression,Required,Aggregation,COUNT,,None,None,37.0,"
-      SELECT COUNT(`calcs`.`int0`) AS `TEMP(Test)(3910975586)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",11,11
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.count,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.count.txt,False,0,1,COUNT([bool0]),expression,Required,Aggregation,COUNT,,"
-      Error executing query
-
-    ",Actual does not match expected.,50.0,"
-      SELECT COUNT((`calcs`.`bool0` <> 0)) AS `TEMP(Test)(1133866179)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,10
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.count,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.count.txt,True,0,0,COUNT([date3]),expression,Required,Aggregation,COUNT,,None,None,26.0,"
-      SELECT COUNT(`calcs`.`date3`) AS `TEMP(Test)(3590771088)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",9,9
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.count,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.count.txt,True,0,0,COUNT([num4]),expression,Required,Aggregation,COUNT,,None,None,27.0,"
-      SELECT COUNT(`calcs`.`num4`) AS `TEMP(Test)(1804085677)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",12,12
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.count,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.count.txt,True,0,0,COUNT([str2]),expression,Required,Aggregation,COUNT,,None,None,28.0,"
-      SELECT COUNT(`calcs`.`str2`) AS `TEMP(Test)(2760211945)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",13,13
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.avg,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.avg.txt,True,0,0,AVG([int0]),expression,Required,Aggregation,"COUNT,AVG",,None,None,59.0,"
-      SELECT AVG(`calcs`.`int0`) AS `TEMP(Test)(3952218057)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",6.1818182,6.1818182
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.avg,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.avg.txt,True,0,0,AVG([num4]),expression,Required,Aggregation,"COUNT,AVG",,None,None,41.0,"
-      SELECT AVG(`calcs`.`num4`) AS `TEMP(Test)(1371989636)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",2.0016667,2.0016667
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.max.txt,True,1,0,MAX([int0]),expression,Required,Aggregation,"COUNT,MAX",,None,None,35.0,"
-      SELECT MAX(`calcs`.`int0`) AS `TEMP(Test)(56370746)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",11,11
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.max.txt,True,1,0,MAX([date3]),expression,Required,Aggregation,"COUNT,MAX",,None,None,37.0,"
-      SELECT MAX(`calcs`.`date3`) AS `TEMP(Test)(277748206)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",#1999-08-20 00:00:00#,#1999-08-20 00:00:00#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.max.txt,True,1,0,MAX([num4]),expression,Required,Aggregation,"COUNT,MAX",,None,None,26.0,"
-      SELECT MAX(`calcs`.`num4`) AS `TEMP(Test)(4154938655)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",19.39,19.39
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.max.txt,False,1,1,MAX([str2]),expression,Required,Aggregation,"COUNT,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,41.0,"
-      SELECT MAX(`calcs`.`str2`) AS `TEMP(Test)(1812249092)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,"""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.max.txt,True,1,0,"MAX([int0], [int1])",expression,Required,Aggregation,"COUNT,MAX",,None,None,30.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`int0`) THEN NULL
-                WHEN ISNULL(`calcs`.`int1`) THEN NULL
-	            WHEN `calcs`.`int0` > `calcs`.`int1` THEN `calcs`.`int0`
-                ELSE `calcs`.`int1` END AS `TEMP(Test)(1523549003)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1523549003)(0)`
-    ","%null%
-1
-8
-10","%null%
-1
-8
-10"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.min.txt,True,1,0,MIN([int0]),expression,Required,Aggregation,"COUNT,MIN",,None,None,33.0,"
-      SELECT MIN(`calcs`.`int0`) AS `TEMP(Test)(4016644369)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",1,1
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.min.txt,True,1,0,MIN([date3]),expression,Required,Aggregation,"COUNT,MIN",,None,None,26.0,"
-      SELECT MIN(`calcs`.`date3`) AS `TEMP(Test)(3378300904)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",#1979-04-01 00:00:00#,#1979-04-01 00:00:00#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.min.txt,True,1,0,MIN([num4]),expression,Required,Aggregation,"COUNT,MIN",,None,None,28.0,"
-      SELECT MIN(`calcs`.`num4`) AS `TEMP(Test)(512350875)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",-14.21,-14.21
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.min.txt,False,1,1,MIN([str2]),expression,Required,Aggregation,"COUNT,MIN",,"
-      Error executing query
-
-    ",Actual does not match expected.,41.0,"
-      SELECT MIN(`calcs`.`str2`) AS `TEMP(Test)(3910790823)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,"""eight"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.min.txt,True,1,0,"MIN([int0], [int1])",expression,Required,Aggregation,"COUNT,MIN",,None,None,27.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`int0`) THEN NULL
-                WHEN ISNULL(`calcs`.`int1`) THEN NULL
-	            WHEN `calcs`.`int0` < `calcs`.`int1` THEN `calcs`.`int0`
-                ELSE `calcs`.`int1` END AS `TEMP(Test)(3683900016)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3683900016)(0)`
-    ","%null%
--9
--8
--3
-3","%null%
--9
--8
--3
-3"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.sum,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.sum.txt,True,0,0,SUM([int0]),expression,Required,Aggregation,"SUM,COUNT",,None,None,31.0,"
-      SELECT SUM(`calcs`.`int0`) AS `TEMP(Test)(645427419)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",68,68
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.sum,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.sum.txt,True,0,0,SUM([num4]),expression,Required,Aggregation,"SUM,COUNT",,None,None,27.0,"
-      SELECT SUM(`calcs`.`num4`) AS `TEMP(Test)(1450575838)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",24.02,24.02
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.countd,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.countd.txt,True,0,0,COUNTD([int0]),expression,Required,"Column Metadata Nullability,Aggregation","COUNT,COUNTD,COLUMN_NULLABILITY",,None,None,32.0,"
-      SELECT COUNT(DISTINCT `calcs`.`int0`) AS `TEMP(Test)(1467453495)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",7,7
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.countd,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.countd.txt,False,0,1,COUNTD([bool0]),expression,Required,"Column Metadata Nullability,Aggregation","COUNT,COUNTD,COLUMN_NULLABILITY",,"
-      Error executing query
-
-    ",Actual does not match expected.,42.0,"
-      SELECT COUNT(DISTINCT (`calcs`.`bool0` <> 0)) AS `TEMP(Test)(1408008556)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,2
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.countd,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.countd.txt,True,0,0,COUNTD([date3]),expression,Required,"Column Metadata Nullability,Aggregation","COUNT,COUNTD,COLUMN_NULLABILITY",,None,None,27.0,"
-      SELECT COUNT(DISTINCT `calcs`.`date3`) AS `TEMP(Test)(175600811)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",9,9
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.countd,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.countd.txt,True,0,0,COUNTD([num4]),expression,Required,"Column Metadata Nullability,Aggregation","COUNT,COUNTD,COLUMN_NULLABILITY",,None,None,27.0,"
-      SELECT COUNT(DISTINCT `calcs`.`num4`) AS `TEMP(Test)(41874160)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",12,12
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.countd,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.countd.txt,True,0,0,COUNTD([str2]),expression,Required,"Column Metadata Nullability,Aggregation","COUNT,COUNTD,COLUMN_NULLABILITY",,None,None,27.0,"
-      SELECT COUNT(DISTINCT `calcs`.`str2`) AS `TEMP(Test)(2954817995)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",13,13
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.stddev,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.stddev.txt,True,0,0,STDEV([num4]),expression,Required,Aggregation,"STDEV,COUNT,STDEVP",,None,None,42.0,"
-      SELECT STDDEV_SAMP(`calcs`.`num4`) AS `TEMP(Test)(2430775290)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",10.654484,10.654484
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.stddev,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.stddev.txt,True,0,0,STDEVP([num4]),expression,Required,Aggregation,"STDEV,COUNT,STDEVP",,None,None,25.0,"
-      SELECT STD(`calcs`.`num4`) AS `TEMP(Test)(3542464170)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",10.200892,10.200892
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.var,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.var.txt,True,0,0,VAR([num4]),expression,Required,Aggregation,"VARP,COUNT,VAR",,None,None,32.0,"
-      SELECT VAR_SAMP(`calcs`.`num4`) AS `TEMP(Test)(1358865)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",113.51803,113.51803
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,agg.var,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.agg.var.txt,True,0,0,VARP([num4]),expression,Required,Aggregation,"VARP,COUNT,VAR",,None,None,26.0,"
-      SELECT POWER(STD(`calcs`.`num4`),2) AS `TEMP(Test)(2532468070)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",104.0582,104.0582
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data.dates,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.dates.txt,True,2,0,date0,expression,Required,Date Aggregation,,,None,None,63.0,"
-      SELECT `calcs`.`date0` AS `TEMP(Test)(1090544928)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1090544928)(0)`
-    ","%null%
-#1972-07-04 00:00:00#
-#1975-11-12 00:00:00#
-#2004-04-15 00:00:00#
-#2004-06-04 00:00:00#
-#2004-06-19 00:00:00#","%null%
-#1972-07-04 00:00:00#
-#1975-11-12 00:00:00#
-#2004-04-15 00:00:00#
-#2004-06-04 00:00:00#
-#2004-06-19 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data.dates,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.dates.txt,True,2,0,date1,expression,Required,Date Aggregation,,,None,None,30.0,"
-      SELECT `calcs`.`date1` AS `TEMP(Test)(1295100109)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1295100109)(0)`
-    ","#2004-04-01 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-03 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-07 00:00:00#
-#2004-04-08 00:00:00#
-#2004-04-09 00:00:00#
-#2004-04-10 00:00:00#
-#2004-04-11 00:00:00#
-#2004-04-12 00:00:00#
-#2004-04-13 00:00:00#
-#2004-04-14 00:00:00#
-#2004-04-15 00:00:00#
-#2004-04-16 00:00:00#
-#2004-04-17 00:00:00#","#2004-04-01 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-03 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-07 00:00:00#
-#2004-04-08 00:00:00#
-#2004-04-09 00:00:00#
-#2004-04-10 00:00:00#
-#2004-04-11 00:00:00#
-#2004-04-12 00:00:00#
-#2004-04-13 00:00:00#
-#2004-04-14 00:00:00#
-#2004-04-15 00:00:00#
-#2004-04-16 00:00:00#
-#2004-04-17 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data.dates,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.dates.txt,True,2,0,date2,expression,Required,Date Aggregation,,,None,None,32.0,"
-      SELECT `calcs`.`date2` AS `TEMP(Test)(2028340584)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2028340584)(0)`
-    ","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data.dates,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.dates.txt,True,2,0,date3,expression,Required,Date Aggregation,,,None,None,28.0,"
-      SELECT `calcs`.`date3` AS `TEMP(Test)(550459061)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(550459061)(0)`
-    ","%null%
-#1979-04-01 00:00:00#
-#1983-05-22 00:00:00#
-#1986-03-20 00:00:00#
-#1986-11-08 00:00:00#
-#1992-01-18 00:00:00#
-#1996-03-07 00:00:00#
-#1996-05-13 00:00:00#
-#1997-02-02 00:00:00#
-#1999-08-20 00:00:00#","%null%
-#1979-04-01 00:00:00#
-#1983-05-22 00:00:00#
-#1986-03-20 00:00:00#
-#1986-11-08 00:00:00#
-#1992-01-18 00:00:00#
-#1996-03-07 00:00:00#
-#1996-05-13 00:00:00#
-#1997-02-02 00:00:00#
-#1999-08-20 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data.dates,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.dates.txt,True,2,0,datetime0,expression,Required,Date Aggregation,,,None,None,28.0,"
-      SELECT `calcs`.`datetime0` AS `TEMP(Test)(3848052829)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3848052829)(0)`
-    ","#2004-07-04 22:49:28#
-#2004-07-05 13:14:20#
-#2004-07-09 10:17:35#
-#2004-07-12 17:30:16#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:44#
-#2004-07-17 14:01:56#
-#2004-07-19 22:21:31#
-#2004-07-22 00:30:23#
-#2004-07-23 21:13:37#
-#2004-07-25 15:22:26#
-#2004-07-26 12:30:34#
-#2004-07-28 06:54:50#
-#2004-07-28 12:34:28#
-#2004-07-28 23:30:22#
-#2004-07-31 11:57:52#
-#2004-08-02 07:59:23#","#2004-07-04 22:49:28#
-#2004-07-05 13:14:20#
-#2004-07-09 10:17:35#
-#2004-07-12 17:30:16#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:44#
-#2004-07-17 14:01:56#
-#2004-07-19 22:21:31#
-#2004-07-22 00:30:23#
-#2004-07-23 21:13:37#
-#2004-07-25 15:22:26#
-#2004-07-26 12:30:34#
-#2004-07-28 06:54:50#
-#2004-07-28 12:34:28#
-#2004-07-28 23:30:22#
-#2004-07-31 11:57:52#
-#2004-08-02 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data.dates,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.dates.txt,True,2,0,datetime1,expression,Required,Date Aggregation,,,None,None,28.0,"
-      SELECT DATE_FORMAT(`calcs`.`datetime1`, '%Y-%m-%d %H:%i:%s') AS `TEMP(Test)(1108086785)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1108086785)(0)`
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data.time,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.time.txt,True,0,0,time0,expression,unknown,unknown,unknown,,None,None,41.0,"
-      SELECT `calcs`.`time0` AS `TEMP(Test)(4245842207)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4245842207)(0)`
-    ","#21:07:32#
-#22:15:40#
-#22:24:08#
-#22:42:43#
-#1900-01-01 01:31:32#
-#1900-01-01 04:57:51#
-#1900-01-01 07:37:48#
-#1900-01-01 08:59:39#
-#1900-01-01 09:00:59#
-#1900-01-01 11:58:29#
-#1900-01-01 13:48:48#
-#1900-01-01 13:53:46#
-#1900-01-01 15:01:19#
-#1900-01-01 18:21:08#
-#1900-01-01 18:51:48#
-#1900-01-01 19:45:54#
-#1900-01-01 20:36:00#","#21:07:32#
-#22:15:40#
-#22:24:08#
-#22:42:43#
-#1900-01-01 01:31:32#
-#1900-01-01 04:57:51#
-#1900-01-01 07:37:48#
-#1900-01-01 08:59:39#
-#1900-01-01 09:00:59#
-#1900-01-01 11:58:29#
-#1900-01-01 13:48:48#
-#1900-01-01 13:53:46#
-#1900-01-01 15:01:19#
-#1900-01-01 18:21:08#
-#1900-01-01 18:51:48#
-#1900-01-01 19:45:54#
-#1900-01-01 20:36:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data.time,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.time.txt,False,0,12,time1,expression,unknown,unknown,unknown,,Actual does not match expected.,Actual does not match expected.,28.0,"
-      SELECT DATE_FORMAT(`calcs`.`time1`, '%Y-%m-%d %H:%i:%s') AS `TEMP(Test)(665897456)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(665897456)(0)`
-    ","%null%
-""1970-01-01 00:05:57""
-""1970-01-01 02:05:25""
-""1970-01-01 04:40:49""
-""1970-01-01 04:48:07""
-""1970-01-01 09:33:31""
-""1970-01-01 12:33:57""
-""1970-01-01 18:58:41""
-""1970-01-01 19:36:22""
-""1970-01-01 19:48:23""
-""1970-01-01 19:57:33""
-""1970-01-01 22:20:14""
-""1970-01-01 22:50:16""","%null%
-#00:05:57#
-#02:05:25#
-#04:40:49#
-#04:48:07#
-#09:33:31#
-#12:33:57#
-#18:58:41#
-#19:36:22#
-#19:48:23#
-#19:57:33#
-#22:20:14#
-#22:50:16#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.float,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.float.txt,True,0,0,FLOAT([int1]),expression,Required,Cast,FLOAT,,None,None,34.0,"
-      SELECT (`calcs`.`int1` + 0.0) AS `TEMP(Test)(1533389080)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1533389080)(0)`
-    ","%null%
--9.0
--8.0
--6.0
--4.0
--3.0
-2.0
-3.0","%null%
--9.0
--8.0
--6.0
--4.0
--3.0
-2.0
-3.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.float,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.float.txt,False,0,3,FLOAT([bool0]),expression,Required,Cast,FLOAT,,"
-      Error executing query
-
-    ",Actual does not match expected.,39.0,"
-      SELECT (CASE
-	WHEN (`calcs`.`bool0` <> 0) THEN 1.0
-	WHEN NOT (`calcs`.`bool0` <> 0) THEN 0.0
-	ELSE NULL END) AS `TEMP(Test)(2538631291)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2538631291)(0)`
-    ",,"%null%
-0.0
-1.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.float,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.float.txt,True,0,0,FLOAT([date0]),expression,Required,Cast,FLOAT,,None,None,28.0,"
-      SELECT TO_DAYS(`calcs`.`date0`) - 693961.0 AS `TEMP(Test)(64617177)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(64617177)(0)`
-    ","%null%
-26482.0
-27708.0
-38090.0
-38140.0
-38155.0","%null%
-26482.0
-27708.0
-38090.0
-38140.0
-38155.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.float,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.float.txt,True,0,0,FLOAT([num2]),expression,Required,Cast,FLOAT,,None,None,28.0,"
-      SELECT (`calcs`.`num2` + 0.0) AS `TEMP(Test)(2707307071)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2707307071)(0)`
-    ","%null%
-3.79
-6.46
-6.8
-7.87
-8.51
-8.98
-10.98
-11.5
-11.69
-13.04
-16.73
-17.25
-17.86","%null%
-3.79
-6.46
-6.8
-7.87
-8.51
-8.98
-10.98
-11.5
-11.69
-13.04
-16.73
-17.25
-17.86"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.int,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.int.txt,True,0,0,INT([int1]),expression,Required,Cast,INT,,None,None,34.0,"
-      SELECT CAST(`calcs`.`int1` as int) AS `TEMP(Test)(551720338)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(551720338)(0)`
-    ","%null%
--9
--8
--6
--4
--3
-2
-3","%null%
--9
--8
--6
--4
--3
-2
-3"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.int,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.int.txt,False,0,3,INT([bool0]),expression,Required,Cast,INT,,"
-      Error executing query
-
-    ",Actual does not match expected.,39.0,"
-      SELECT CAST((`calcs`.`bool0` <> 0) as int) AS `TEMP(Test)(2695057561)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2695057561)(0)`
-    ",,"%null%
-0
-1"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.int,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.int.txt,True,0,0,INT([date0]),expression,Required,Cast,INT,,None,None,25.0,"
-      SELECT (TO_DAYS(`calcs`.`date0`) - 693961) AS `TEMP(Test)(2234960540)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2234960540)(0)`
-    ","%null%
-26482
-27708
-38090
-38140
-38155","%null%
-26482
-27708
-38090
-38140
-38155"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.int,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.int.txt,True,0,0,INT([num2]),expression,Required,Cast,INT,,None,None,27.0,"
-      SELECT CAST(`calcs`.`num2` as int) AS `TEMP(Test)(1665700248)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1665700248)(0)`
-    ","%null%
-3
-6
-7
-8
-10
-11
-13
-16
-17","%null%
-3
-6
-7
-8
-10
-11
-13
-16
-17"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.str.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.str.str.txt,True,0,0,STR(STR([str2])),expression,Required,Cast,STR,,None,None,27.0,"
-      SELECT SUBSTRING(`calcs`.`str2`, 1, 1024) AS `TEMP(Test)(2730627169)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2730627169)(0)`
-    ","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two""","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.str.txt,True,1,0,STR([int1]),expression,Required,Cast,STR,,None,None,32.0,"
-      SELECT CAST(`calcs`.`int1` as string) AS `TEMP(Test)(2617331766)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2617331766)(0)`
-    ","%null%
-""-3""
-""-4""
-""-6""
-""-8""
-""-9""
-""2""
-""3""","%null%
-""-3""
-""-4""
-""-6""
-""-8""
-""-9""
-""2""
-""3"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.str.txt,False,1,3,STR([bool0]),expression,Required,Cast,STR,,"
-      Error executing query
-
-    ",Actual does not match expected.,38.0,"
-      SELECT CAST((`calcs`.`bool0` <> 0) as string) AS `TEMP(Test)(3200082645)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3200082645)(0)`
-    ",,"%null%
-""0""
-""1"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.str.txt,True,1,0,STR([num2]),expression,Required,Cast,STR,,None,None,26.0,"
-      SELECT CAST(`calcs`.`num2` as string) AS `TEMP(Test)(3049448927)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3049448927)(0)`
-    ","%null%
-""10.98""
-""11.5""
-""11.69""
-""13.04""
-""16.73""
-""17.25""
-""17.86""
-""3.79""
-""6.46""
-""6.8""
-""7.87""
-""8.51""
-""8.98""","%null%
-""10.98""
-""11.5""
-""11.69""
-""13.04""
-""16.73""
-""17.25""
-""17.86""
-""3.79""
-""6.46""
-""6.8""
-""7.87""
-""8.51""
-""8.98"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.str.txt,True,1,0,STR([str2]),expression,Required,Cast,STR,,None,None,33.0,"
-      SELECT SUBSTRING(`calcs`.`str2`, 1, 1024) AS `TEMP(Test)(3494867617)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3494867617)(0)`
-    ","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two""","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.str.date,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.str.date.txt,True,0,0,DATE(STR([date0])),expression,Required,Cast,"DATE,STR",,None,None,34.0,"
-      SELECT DATE_FORMAT(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s'), '%Y-%m-%d') AS `TEMP(Test)(3072781275)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3072781275)(0)`
-    ","%null%
-#1972-07-04#
-#1975-11-12#
-#2004-04-15#
-#2004-06-04#
-#2004-06-19#","%null%
-#1972-07-04#
-#1975-11-12#
-#2004-04-15#
-#2004-06-04#
-#2004-06-19#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.str.date,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.str.date.txt,True,0,0,DATE(STR([date2])),expression,Required,Cast,"DATE,STR",,None,None,27.0,"
-      SELECT DATE_FORMAT(DATE_FORMAT(`calcs`.`date2`, '%Y-%m-%d %H:%i:%s'), '%Y-%m-%d') AS `TEMP(Test)(3232345613)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3232345613)(0)`
-    ","#1972-07-12#
-#1974-03-17#
-#1974-05-03#
-#1976-09-09#
-#1977-02-08#
-#1977-04-20#
-#1980-07-26#
-#1980-11-07#
-#1988-01-05#
-#1994-04-20#
-#1995-06-04#
-#1995-09-03#
-#1997-05-30#
-#1997-09-19#
-#1998-08-12#
-#2001-02-04#
-#2002-04-27#","#1972-07-12#
-#1974-03-17#
-#1974-05-03#
-#1976-09-09#
-#1977-02-08#
-#1977-04-20#
-#1980-07-26#
-#1980-11-07#
-#1988-01-05#
-#1994-04-20#
-#1995-06-04#
-#1995-09-03#
-#1997-05-30#
-#1997-09-19#
-#1998-08-12#
-#2001-02-04#
-#2002-04-27#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,bool0,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,36.0,"
-      SELECT `calcs`.`bool0` AS `TEMP(Test)(3428507074)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3428507074)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,bool1,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,27.0,"
-      SELECT `calcs`.`bool1` AS `TEMP(Test)(1935567978)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1935567978)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,bool2,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,27.0,"
-      SELECT `calcs`.`bool2` AS `TEMP(Test)(3179501244)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3179501244)(0)`
-    ","false
-true","false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,bool3,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,26.0,"
-      SELECT `calcs`.`bool3` AS `TEMP(Test)(1288552116)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1288552116)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,key,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,31.0,"
-      SELECT `calcs`.`key` AS `TEMP(Test)(3382465274)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3382465274)(0)`
-    ","""key00""
-""key01""
-""key02""
-""key03""
-""key04""
-""key05""
-""key06""
-""key07""
-""key08""
-""key09""
-""key10""
-""key11""
-""key12""
-""key13""
-""key14""
-""key15""
-""key16""","""key00""
-""key01""
-""key02""
-""key03""
-""key04""
-""key05""
-""key06""
-""key07""
-""key08""
-""key09""
-""key10""
-""key11""
-""key12""
-""key13""
-""key14""
-""key15""
-""key16"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,str0,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,26.0,"
-      SELECT `calcs`.`str0` AS `TEMP(Test)(55415805)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(55415805)(0)`
-    ","""FURNITURE""
-""OFFICE SUPPLIES""
-""TECHNOLOGY""","""FURNITURE""
-""OFFICE SUPPLIES""
-""TECHNOLOGY"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,str1,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,36.0,"
-      SELECT `calcs`.`str1` AS `TEMP(Test)(2285743265)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2285743265)(0)`
-    ","""AIR PURIFIERS""
-""ANSWERING MACHINES""
-""BINDER ACCESSORIES""
-""BINDER CLIPS""
-""BINDING MACHINES""
-""BINDING SUPPLIES""
-""BUSINESS COPIERS""
-""BUSINESS ENVELOPES""
-""CD-R MEDIA""
-""CLAMP ON LAMPS""
-""CLOCKS""
-""CONFERENCE PHONES""
-""CORDED KEYBOARDS""
-""CORDLESS KEYBOARDS""
-""DOT MATRIX PRINTERS""
-""DVD""
-""ERICSSON""","""AIR PURIFIERS""
-""ANSWERING MACHINES""
-""BINDER ACCESSORIES""
-""BINDER CLIPS""
-""BINDING MACHINES""
-""BINDING SUPPLIES""
-""BUSINESS COPIERS""
-""BUSINESS ENVELOPES""
-""CD-R MEDIA""
-""CLAMP ON LAMPS""
-""CLOCKS""
-""CONFERENCE PHONES""
-""CORDED KEYBOARDS""
-""CORDLESS KEYBOARDS""
-""DOT MATRIX PRINTERS""
-""DVD""
-""ERICSSON"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,str2,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,31.0,"
-      SELECT `calcs`.`str2` AS `TEMP(Test)(3228347817)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3228347817)(0)`
-    ","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two""","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,str3,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,26.0,"
-      SELECT `calcs`.`str3` AS `TEMP(Test)(286811776)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(286811776)(0)`
-    ","%null%
-""e""","%null%
-""e"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,zzz,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,26.0,"
-      SELECT `calcs`.`zzz` AS `TEMP(Test)(1729594319)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1729594319)(0)`
-    ","""a""
-""b""
-""c""
-""d""
-""e""
-""f""
-""g""
-""h""
-""i""
-""j""
-""k""
-""l""
-""m""
-""n""
-""o""
-""p""
-""q""","""a""
-""b""
-""c""
-""d""
-""e""
-""f""
-""g""
-""h""
-""i""
-""j""
-""k""
-""l""
-""m""
-""n""
-""o""
-""p""
-""q"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,int0,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,27.0,"
-      SELECT `calcs`.`int0` AS `TEMP(Test)(3174765981)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3174765981)(0)`
-    ","%null%
-1
-3
-4
-7
-8
-10
-11","%null%
-1
-3
-4
-7
-8
-10
-11"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,int1,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,28.0,"
-      SELECT `calcs`.`int1` AS `TEMP(Test)(2829869592)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2829869592)(0)`
-    ","%null%
--9
--8
--6
--4
--3
-2
-3","%null%
--9
--8
--6
--4
--3
-2
-3"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,int2,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,27.0,"
-      SELECT `calcs`.`int2` AS `TEMP(Test)(551775594)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(551775594)(0)`
-    ","-9
--8
--6
--5
--4
--3
-0
-2
-3
-4
-5
-6
-9","-9
--8
--6
--5
--4
--3
-0
-2
-3
-4
-5
-6
-9"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,int3,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,26.0,"
-      SELECT `calcs`.`int3` AS `TEMP(Test)(524492059)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(524492059)(0)`
-    ","0
-2
-3
-5
-7
-8
-9
-11
-13
-17
-18","0
-2
-3
-5
-7
-8
-9
-11
-13
-17
-18"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,num0,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,32.0,"
-      SELECT `calcs`.`num0` AS `TEMP(Test)(3934956185)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3934956185)(0)`
-    ","%null%
--15.7
--12.3
--3.5
-0.0
-3.5
-10.0
-12.3
-15.7","%null%
--15.7
--12.3
--3.5
-0.0
-3.5
-10.0
-12.3
-15.7"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,num1,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,26.0,"
-      SELECT `calcs`.`num1` AS `TEMP(Test)(129981160)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(129981160)(0)`
-    ","2.47
-6.71
-7.1
-7.12
-7.43
-8.42
-9.05
-9.38
-9.47
-9.78
-10.32
-10.37
-11.38
-12.05
-12.4
-16.42
-16.81","2.47
-6.71
-7.1
-7.12
-7.43
-8.42
-9.05
-9.38
-9.47
-9.78
-10.32
-10.37
-11.38
-12.05
-12.4
-16.42
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,num2,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,27.0,"
-      SELECT `calcs`.`num2` AS `TEMP(Test)(1053269056)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1053269056)(0)`
-    ","%null%
-3.79
-6.46
-6.8
-7.87
-8.51
-8.98
-10.98
-11.5
-11.69
-13.04
-16.73
-17.25
-17.86","%null%
-3.79
-6.46
-6.8
-7.87
-8.51
-8.98
-10.98
-11.5
-11.69
-13.04
-16.73
-17.25
-17.86"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,num3,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,28.0,"
-      SELECT `calcs`.`num3` AS `TEMP(Test)(3320504981)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3320504981)(0)`
-    ","-19.96
--18.43
--13.38
--12.17
--11.52
--10.98
--10.81
--10.56
--9.31
--7.25
--6.62
--4.79
--2.6
-3.64
-6.84
-10.93
-12.93","-19.96
--18.43
--13.38
--12.17
--11.52
--10.98
--10.81
--10.56
--9.31
--7.25
--6.62
--4.79
--2.6
-3.64
-6.84
-10.93
-12.93"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,calcs_data,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.calcs_data.txt,True,0,0,num4,expression,Required If Supported,"Time Values,Aggregation","MAX,TIME1899,MIN",,None,None,27.0,"
-      SELECT `calcs`.`num4` AS `TEMP(Test)(3786834202)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3786834202)(0)`
-    ","%null%
--14.21
--13.47
--10.24
--6.05
-3.38
-3.82
-4.77
-6.75
-8.32
-10.71
-10.85
-19.39","%null%
--14.21
--13.47
--10.24
--6.05
-3.38
-3.82
-4.77
-6.75
-8.32
-10.71
-10.85
-19.39"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.float.string,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.float.string.txt,False,0,17,"float(""1234."" + RIGHT([key],2))",expression,Required,"Cast,Calculation,Operator","RIGHT,+,FLOAT",,"
-      Error executing query
-
-    ",Actual does not match expected.,52.0,"
-      SELECT (0.0 + CONCAT('1234.', (CASE WHEN 2 >= 0 THEN RIGHT(`calcs`.`key`,2) ELSE NULL END))) AS `TEMP(Test)(93928613)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(93928613)(0)`
-    ",,"1234.0
-1234.01
-1234.02
-1234.03
-1234.04
-1234.05
-1234.06
-1234.07
-1234.08
-1234.09
-1234.1
-1234.11
-1234.12
-1234.13
-1234.14
-1234.15
-1234.16"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.int.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.int.nulls.txt,True,0,0,INT([num4]),expression,Required,"Cast,Operator","INT,+,STR",,None,None,34.0,"
-      SELECT CAST(`calcs`.`num4` as int) AS `TEMP(Test)(663412696)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(663412696)(0)`
-    ","%null%
--14
--13
--10
--6
-3
-4
-6
-8
-10
-19","%null%
--14
--13
--10
--6
-3
-4
-6
-8
-10
-19"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,cast.int.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.cast.int.nulls.txt,False,0,7,int(str(num4)+str(int0)),expression,Required,"Cast,Operator","INT,+,STR",,"
-      Error executing query
-
-    ",Actual does not match expected.,44.0,"
-      SELECT TRUNCATE(CONCAT(CAST(`calcs`.`num4` as string), CAST(`calcs`.`int0` as string)),0) AS `TEMP(Test)(1616170242)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1616170242)(0)`
-    ",,"%null%
--14
-3
-6
-8
-10
-19"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.cast.date,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.cast.date.txt,True,0,0,DATE([date2]),expression,Required,Cast,DATE,,None,None,45.0,"
-      SELECT DATE(`calcs`.`date2`) AS `TEMP(Test)(3817907367)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3817907367)(0)`
-    ","#1972-07-12#
-#1974-03-17#
-#1974-05-03#
-#1976-09-09#
-#1977-02-08#
-#1977-04-20#
-#1980-07-26#
-#1980-11-07#
-#1988-01-05#
-#1994-04-20#
-#1995-06-04#
-#1995-09-03#
-#1997-05-30#
-#1997-09-19#
-#1998-08-12#
-#2001-02-04#
-#2002-04-27#","#1972-07-12#
-#1974-03-17#
-#1974-05-03#
-#1976-09-09#
-#1977-02-08#
-#1977-04-20#
-#1980-07-26#
-#1980-11-07#
-#1988-01-05#
-#1994-04-20#
-#1995-06-04#
-#1995-09-03#
-#1997-05-30#
-#1997-09-19#
-#1998-08-12#
-#2001-02-04#
-#2002-04-27#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.cast.datetime,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.cast.datetime.txt,True,0,0,DATETIME([date2]),expression,Required,Cast,DATETIME,,None,None,36.0,"
-      SELECT TIMESTAMP(`calcs`.`date2`) AS `TEMP(Test)(1486024523)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1486024523)(0)`
-    ","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.cast.float,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.cast.float.txt,True,0,0,FLOAT([date2]),expression,Recommended,Cast,FLOAT,,None,None,44.0,"
-      SELECT TO_DAYS(`calcs`.`date2`) - 693961.0 AS `TEMP(Test)(2671902822)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2671902822)(0)`
-    ","26490.0
-27103.0
-27150.0
-28010.0
-28162.0
-28233.0
-29426.0
-29530.0
-32145.0
-34442.0
-34852.0
-34943.0
-35578.0
-35690.0
-36017.0
-36924.0
-37371.0","26490.0
-27103.0
-27150.0
-28010.0
-28162.0
-28233.0
-29426.0
-29530.0
-32145.0
-34442.0
-34852.0
-34943.0
-35578.0
-35690.0
-36017.0
-36924.0
-37371.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.cast.num_to_date,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.cast.num_to_date.txt,True,0,0,DATE([num4]),expression,Recommended,Cast,DATE,,None,None,40.0,"
-      SELECT FROM_DAYS(FLOOR(`calcs`.`num4`) + 693961) AS `TEMP(Test)(158994214)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(158994214)(0)`
-    ","%null%
-#1899-12-17#
-#1899-12-18#
-#1899-12-21#
-#1899-12-25#
-#1900-01-04#
-#1900-01-05#
-#1900-01-07#
-#1900-01-09#
-#1900-01-11#
-#1900-01-20#","%null%
-#1899-12-17#
-#1899-12-18#
-#1899-12-21#
-#1899-12-25#
-#1900-01-04#
-#1900-01-05#
-#1900-01-07#
-#1900-01-09#
-#1900-01-11#
-#1900-01-20#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math.date_minus_date,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.date_minus_date.txt,True,0,0,[date2] - [date2],expression,Recommended,Operator,-,,None,None,48.0,"
-      SELECT ((TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP))) / 86400.0)) AS `TEMP(Test)(1152843842)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1152843842)(0)`
-    ",0.0,0.0
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.cast.datetime.630831,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.cast.datetime.630831.txt,True,0,0,Date('2017-01-01 12:12:12.0'),expression,Smoke,"Cast,Aggregation","DATE,COUNT",,None,None,35.0,"
-      SELECT DATE_FORMAT('2017-01-01 12:12:12.0', '%Y-%m-%d') AS `TEMP(Test)(1641592311)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",#2017-01-01#,#2017-01-01#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.cast.float.extended,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.cast.float.extended.txt,True,0,0,float(#2050-01-01#),expression,Recommended,"Cast,Aggregation","FLOAT,COUNT",,None,None,34.0,"
-      SELECT TO_DAYS(DATE('2050-01-01')) - 693961.0 AS `TEMP(Test)(3947742720)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",54787.0,54787.0
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.cast.int.extended,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.cast.int.extended.txt,True,0,0,int(#2050-01-01#),expression,Recommended,"Cast,Aggregation","INT,COUNT",,None,None,34.0,"
-      SELECT (TO_DAYS(DATE('2050-01-01')) - 693961) AS `TEMP(Test)(1685825827)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",54787,54787
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.cast.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.cast.str.txt,True,5,0,TRIM(STR([date2])),expression,Required,"Calculation,Data Prep,Cast","STR,TRIM",,None,None,29.0,"
-      SELECT TRIM(DATE_FORMAT(`calcs`.`date2`, '%Y-%m-%d %H:%i:%s')) AS `TEMP(Test)(3929621149)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3929621149)(0)`
-    ","""1972-07-12 00:00:00""
-""1974-03-17 00:00:00""
-""1974-05-03 00:00:00""
-""1976-09-09 00:00:00""
-""1977-02-08 00:00:00""
-""1977-04-20 00:00:00""
-""1980-07-26 00:00:00""
-""1980-11-07 00:00:00""
-""1988-01-05 00:00:00""
-""1994-04-20 00:00:00""
-""1995-06-04 00:00:00""
-""1995-09-03 00:00:00""
-""1997-05-30 00:00:00""
-""1997-09-19 00:00:00""
-""1998-08-12 00:00:00""
-""2001-02-04 00:00:00""
-""2002-04-27 00:00:00""","""1972-07-12 00:00:00""
-""1974-03-17 00:00:00""
-""1974-05-03 00:00:00""
-""1976-09-09 00:00:00""
-""1977-02-08 00:00:00""
-""1977-04-20 00:00:00""
-""1980-07-26 00:00:00""
-""1980-11-07 00:00:00""
-""1988-01-05 00:00:00""
-""1994-04-20 00:00:00""
-""1995-06-04 00:00:00""
-""1995-09-03 00:00:00""
-""1997-05-30 00:00:00""
-""1997-09-19 00:00:00""
-""1998-08-12 00:00:00""
-""2001-02-04 00:00:00""
-""2002-04-27 00:00:00"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.max.txt,True,1,0,MAX([date2]),expression,Required,Aggregation,"MAX,COUNT",,None,None,32.0,"
-      SELECT MAX(`calcs`.`date2`) AS `TEMP(Test)(3325074545)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",#2002-04-27 00:00:00#,#2002-04-27 00:00:00#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.max.txt,True,1,0,"MAX([date2], [date3])",expression,Required,Aggregation,"MAX,COUNT",,None,None,27.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`date2`) THEN NULL
-                WHEN ISNULL(`calcs`.`date3`) THEN NULL
-	            WHEN `calcs`.`date2` > `calcs`.`date3` THEN `calcs`.`date2`
-                ELSE `calcs`.`date3` END AS `TEMP(Test)(1996265231)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1996265231)(0)`
-    ","%null%
-#1980-11-07 00:00:00#
-#1983-05-22 00:00:00#
-#1986-03-20 00:00:00#
-#1986-11-08 00:00:00#
-#1996-05-13 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1999-08-20 00:00:00#
-#2002-04-27 00:00:00#","%null%
-#1980-11-07 00:00:00#
-#1983-05-22 00:00:00#
-#1986-03-20 00:00:00#
-#1986-11-08 00:00:00#
-#1996-05-13 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1999-08-20 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.max.txt,True,1,0,MAX([datetime0]),expression,Required,Aggregation,"MAX,COUNT",,None,None,26.0,"
-      SELECT MAX(`calcs`.`datetime0`) AS `TEMP(Test)(4035984656)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",#2004-08-02 07:59:23#,#2004-08-02 07:59:23#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.min.txt,True,1,0,"MIN([date2], [date3])",expression,Required,Aggregation,"MIN,COUNT",,None,None,44.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`date2`) THEN NULL
-                WHEN ISNULL(`calcs`.`date3`) THEN NULL
-	            WHEN `calcs`.`date2` < `calcs`.`date3` THEN `calcs`.`date2`
-                ELSE `calcs`.`date3` END AS `TEMP(Test)(3951339438)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3951339438)(0)`
-    ","%null%
-#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1976-09-09 00:00:00#
-#1977-04-20 00:00:00#
-#1979-04-01 00:00:00#
-#1988-01-05 00:00:00#
-#1992-01-18 00:00:00#
-#1996-03-07 00:00:00#
-#1997-02-02 00:00:00#","%null%
-#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1976-09-09 00:00:00#
-#1977-04-20 00:00:00#
-#1979-04-01 00:00:00#
-#1988-01-05 00:00:00#
-#1992-01-18 00:00:00#
-#1996-03-07 00:00:00#
-#1997-02-02 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.min.txt,True,1,0,MIN([date2]),expression,Required,Aggregation,"MIN,COUNT",,None,None,30.0,"
-      SELECT MIN(`calcs`.`date2`) AS `TEMP(Test)(1465246653)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",#1972-07-12 00:00:00#,#1972-07-12 00:00:00#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.min.txt,True,1,0,MIN([datetime0]),expression,Required,Aggregation,"MIN,COUNT",,None,None,30.0,"
-      SELECT MIN(`calcs`.`datetime0`) AS `TEMP(Test)(2572329321)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",#2004-07-04 22:49:28#,#2004-07-04 22:49:28#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.misc,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.misc.txt,True,0,0,DAY(DATE([date2])),expression,Required,"Calculation,Date Filters,Date Aggregation,Cast","DATE,MONTH,DAY,YEAR",,None,None,33.0,"
-      SELECT DAYOFMONTH(DATE(`calcs`.`date2`)) AS `TEMP(Test)(2085924889)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2085924889)(0)`
-    ","3
-4
-5
-7
-8
-9
-12
-17
-19
-20
-26
-27
-30","3
-4
-5
-7
-8
-9
-12
-17
-19
-20
-26
-27
-30"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.misc,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.misc.txt,True,0,0,DAY(DATETIME([datetime0])),expression,Required,"Calculation,Date Filters,Date Aggregation,Cast","DATE,MONTH,DAY,YEAR",,None,None,30.0,"
-      SELECT DAYOFMONTH(TIMESTAMP(`calcs`.`datetime0`)) AS `TEMP(Test)(574618496)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(574618496)(0)`
-    ","2
-4
-5
-9
-12
-14
-17
-19
-22
-23
-25
-26
-28
-31","2
-4
-5
-9
-12
-14
-17
-19
-22
-23
-25
-26
-28
-31"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.misc,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.misc.txt,True,0,0,MONTH(DATE([date2])),expression,Required,"Calculation,Date Filters,Date Aggregation,Cast","DATE,MONTH,DAY,YEAR",,None,None,52.0,"
-      SELECT MONTH(DATE(`calcs`.`date2`)) AS `TEMP(Test)(1165289219)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1165289219)(0)`
-    ","1
-2
-3
-4
-5
-6
-7
-8
-9
-11","1
-2
-3
-4
-5
-6
-7
-8
-9
-11"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.misc,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.misc.txt,True,0,0,MONTH(DATETIME([datetime0])),expression,Required,"Calculation,Date Filters,Date Aggregation,Cast","DATE,MONTH,DAY,YEAR",,None,None,61.0,"
-      SELECT MONTH(TIMESTAMP(`calcs`.`datetime0`)) AS `TEMP(Test)(3278952934)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3278952934)(0)`
-    ","7
-8","7
-8"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.misc,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.misc.txt,True,0,0,YEAR(DATE([date2])),expression,Required,"Calculation,Date Filters,Date Aggregation,Cast","DATE,MONTH,DAY,YEAR",,None,None,96.0,"
-      SELECT YEAR(DATE(`calcs`.`date2`)) AS `TEMP(Test)(3434755864)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3434755864)(0)`
-    ","1972
-1974
-1976
-1977
-1980
-1988
-1994
-1995
-1997
-1998
-2001
-2002","1972
-1974
-1976
-1977
-1980
-1988
-1994
-1995
-1997
-1998
-2001
-2002"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.misc,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.misc.txt,True,0,0,YEAR(DATETIME([datetime0])),expression,Required,"Calculation,Date Filters,Date Aggregation,Cast","DATE,MONTH,DAY,YEAR",,None,None,30.0,"
-      SELECT YEAR(TIMESTAMP(`calcs`.`datetime0`)) AS `TEMP(Test)(1819497289)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1819497289)(0)`
-    ",2004,2004
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.B639952,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.B639952.txt,True,1,0,SUM([date0]-1-[date1]),expression,Required,"Operator,Date Filters,Cast,Aggregation","SUM,+,-,DATE,COUNT,DATEADD",,None,None,78.0,"
-      SELECT SUM(((TO_DAYS(CAST(DATE_SUB(DATE_SUB(`calcs`.`date0`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date1` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_SUB(DATE_SUB(`calcs`.`date0`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date1` as TIMESTAMP))) / 86400.0))) AS `TEMP(Test)(852777247)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",-21820.0,-21820.0
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.B639952,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.B639952.txt,True,1,0,SUM([date0]+300-[date1]),expression,Required,"Operator,Date Filters,Cast,Aggregation","SUM,+,-,DATE,COUNT,DATEADD",,None,None,33.0,"
-      SELECT SUM(((TO_DAYS(CAST(DATE_ADD(DATE_ADD(`calcs`.`date0`, INTERVAL FLOOR(300) DAY), INTERVAL CAST(86400 * (300 - FLOOR(300)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date1` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_ADD(DATE_ADD(`calcs`.`date0`, INTERVAL FLOOR(300) DAY), INTERVAL CAST(86400 * (300 - FLOOR(300)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date1` as TIMESTAMP))) / 86400.0))) AS `TEMP(Test)(3920605433)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",-20315.0,-20315.0
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.B639952,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.B639952.txt,True,1,0,[date0]-([date1]-1-[date2]),expression,Required,"Operator,Date Filters,Cast,Aggregation","SUM,+,-,DATE,COUNT,DATEADD",,None,None,59.0,"
-      SELECT DATE_SUB(DATE_SUB(`calcs`.`date0`, INTERVAL FLOOR(((TO_DAYS(CAST(DATE_SUB(DATE_SUB(`calcs`.`date1`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_SUB(DATE_SUB(`calcs`.`date1`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP))) / 86400.0))) DAY), INTERVAL CAST(86400 * (((TO_DAYS(CAST(DATE_SUB(DATE_SUB(`calcs`.`date1`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_SUB(DATE_SUB(`calcs`.`date1`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP))) / 86400.0)) - FLOOR(((TO_DAYS(CAST(DATE_SUB(DATE_SUB(`calcs`.`date1`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_SUB(DATE_SUB(`calcs`.`date1`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP))) / 86400.0)))) AS INT) SECOND) AS `TEMP(Test)(750868662)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(750868662)(0)`
-    ","%null%
-#1963-12-06 00:00:00#
-#1969-04-30 00:00:00#
-#1977-05-05 00:00:00#
-#1980-09-26 00:00:00#
-#1997-08-14 00:00:00#","%null%
-#1963-12-06 00:00:00#
-#1969-04-30 00:00:00#
-#1977-05-05 00:00:00#
-#1980-09-26 00:00:00#
-#1997-08-14 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.B639952,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.B639952.txt,True,1,0,[date1]-([date3]+500-[date2]),expression,Required,"Operator,Date Filters,Cast,Aggregation","SUM,+,-,DATE,COUNT,DATEADD",,None,None,41.0,"
-      SELECT DATE_SUB(DATE_SUB(`calcs`.`date1`, INTERVAL FLOOR(((TO_DAYS(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP))) / 86400.0))) DAY), INTERVAL CAST(86400 * (((TO_DAYS(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP))) / 86400.0)) - FLOOR(((TO_DAYS(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP))) / 86400.0)))) AS INT) SECOND) AS `TEMP(Test)(2315954727)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2315954727)(0)`
-    ","%null%
-#1977-06-25 00:00:00#
-#1988-08-05 00:00:00#
-#1993-12-19 00:00:00#
-#1994-07-25 00:00:00#
-#1996-03-16 00:00:00#
-#2003-07-07 00:00:00#
-#2004-02-14 00:00:00#
-#2004-07-01 00:00:00#
-#2013-03-13 00:00:00#","%null%
-#1977-06-25 00:00:00#
-#1988-08-05 00:00:00#
-#1993-12-19 00:00:00#
-#1994-07-25 00:00:00#
-#1996-03-16 00:00:00#
-#2003-07-07 00:00:00#
-#2004-02-14 00:00:00#
-#2004-07-01 00:00:00#
-#2013-03-13 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.B639952,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.B639952.txt,True,1,0,[date1]-([date3]+500-[date2])+([date3]-[date0]),expression,Required,"Operator,Date Filters,Cast,Aggregation","SUM,+,-,DATE,COUNT,DATEADD",,None,None,40.0,"
-      SELECT DATE_ADD(DATE_ADD(DATE_SUB(DATE_SUB(`calcs`.`date1`, INTERVAL FLOOR(((TO_DAYS(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP))) / 86400.0))) DAY), INTERVAL CAST(86400 * (((TO_DAYS(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP))) / 86400.0)) - FLOOR(((TO_DAYS(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP))) / 86400.0)))) AS INT) SECOND), INTERVAL FLOOR(((TO_DAYS(CAST(`calcs`.`date3` as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date0` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(`calcs`.`date3` as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date0` as TIMESTAMP))) / 86400.0))) DAY), INTERVAL CAST(86400 * (((TO_DAYS(CAST(`calcs`.`date3` as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date0` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(`calcs`.`date3` as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date0` as TIMESTAMP))) / 86400.0)) - FLOOR(((TO_DAYS(CAST(`calcs`.`date3` as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date0` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(`calcs`.`date3` as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date0` as TIMESTAMP))) / 86400.0)))) AS INT) SECOND) AS `TEMP(Test)(268214076)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(268214076)(0)`
-    ","%null%
-#1975-11-23 00:00:00#
-#1995-11-02 00:00:00#
-#2024-09-27 00:00:00#","%null%
-#1975-11-23 00:00:00#
-#1995-11-02 00:00:00#
-#2024-09-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.B639952,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.B639952.txt,True,1,0,SUM(([date3]-400-[date0])+([date3]+500-[date2])),expression,Required,"Operator,Date Filters,Cast,Aggregation","SUM,+,-,DATE,COUNT,DATEADD",,None,None,52.0,"
-      SELECT SUM((((TO_DAYS(CAST(DATE_SUB(DATE_SUB(`calcs`.`date3`, INTERVAL FLOOR(400) DAY), INTERVAL CAST(86400 * (400 - FLOOR(400)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date0` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_SUB(DATE_SUB(`calcs`.`date3`, INTERVAL FLOOR(400) DAY), INTERVAL CAST(86400 * (400 - FLOOR(400)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date0` as TIMESTAMP))) / 86400.0)) + ((TO_DAYS(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`date2` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_ADD(DATE_ADD(`calcs`.`date3`, INTERVAL FLOOR(500) DAY), INTERVAL CAST(86400 * (500 - FLOOR(500)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`date2` as TIMESTAMP))) / 86400.0)))) AS `TEMP(Test)(2422363430)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",1004.0,1004.0
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.B639952,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.B639952.txt,False,1,1,"SUM([date3]-1-(date(dateadd('month', 3, #2004-04-15# )))+1)",expression,Required,"Operator,Date Filters,Cast,Aggregation","SUM,+,-,DATE,COUNT,DATEADD",,"
-      Error executing query
-
-    ",Actual does not match expected.,56.0,"
-      SELECT SUM((((TO_DAYS(CAST(DATE_SUB(DATE_SUB(`calcs`.`date3`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) as TIMESTAMP)) - TO_DAYS(CAST(DATE(DATE_ADD(DATE('2004-04-15'), INTERVAL 3 MONTH)) as TIMESTAMP))) + ((TIME_TO_SEC(CAST(DATE_SUB(DATE_SUB(`calcs`.`date3`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) as TIMESTAMP)) - TIME_TO_SEC(CAST(DATE(DATE_ADD(DATE('2004-04-15'), INTERVAL 3 MONTH)) as TIMESTAMP))) / 86400.0)) + 1)) AS `TEMP(Test)(3637530074)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,-45223.0
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.now,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.now.txt,False,0,1,"datepart('year', now()) = datepart('year', now())",expression,Recommended,"Date Filters,Operator,Aggregation,Filters","NOW,DATEPART,MIN,MAX,==,COUNT",,"
-      Error executing query
-
-    ",Actual does not match expected.,46.0,"
-      SELECT (CASE WHEN (YEAR(NOW()) = YEAR(NOW())) THEN 1 WHEN NOT (YEAR(NOW()) = YEAR(NOW())) THEN 0 ELSE NULL END) AS `TEMP(Test)(3241940546)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.now,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.now.txt,False,0,1,"datepart('second', now()) = datepart('second', now())",expression,Recommended,"Date Filters,Operator,Aggregation,Filters","NOW,DATEPART,MIN,MAX,==,COUNT",,"
-      Error executing query
-
-    ",Actual does not match expected.,42.0,"
-      SELECT (CASE WHEN (SECOND(NOW()) = SECOND(NOW())) THEN 1 WHEN NOT (SECOND(NOW()) = SECOND(NOW())) THEN 0 ELSE NULL END) AS `TEMP(Test)(1432496731)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.today,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.today.txt,False,0,1,"datepart('year', today()) = datepart('year', today())",expression,Required,"Date Filters,Operator,Aggregation,Filters","DATEPART,MIN,MAX,==,TODAY,COUNT",,"
-      Error executing query
-
-    ",Actual does not match expected.,45.0,"
-      SELECT (CASE WHEN (YEAR(CURDATE()) = YEAR(CURDATE())) THEN 1 WHEN NOT (YEAR(CURDATE()) = YEAR(CURDATE())) THEN 0 ELSE NULL END) AS `TEMP(Test)(307093745)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.today,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.today.txt,False,0,1,"datepart('day', today()) = datepart('day', today())",expression,Required,"Date Filters,Operator,Aggregation,Filters","DATEPART,MIN,MAX,==,TODAY,COUNT",,"
-      Error executing query
-
-    ",Actual does not match expected.,38.0,"
-      SELECT (CASE WHEN (DAYOFMONTH(CURDATE()) = DAYOFMONTH(CURDATE())) THEN 1 WHEN NOT (DAYOFMONTH(CURDATE()) = DAYOFMONTH(CURDATE())) THEN 0 ELSE NULL END) AS `TEMP(Test)(3426973691)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,False,1,1,"DATEDIFF('day', NOW(), NOW())",expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,"
-      Error executing query
-
-    ",Actual does not match expected.,48.0,"
-      SELECT (TO_DAYS(NOW()) - TO_DAYS(NOW())) AS `TEMP(Test)(3926981592)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,0
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,False,1,1,"DATEDIFF('day', TODAY(), TODAY())",expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,"
-      Error executing query
-
-    ",Actual does not match expected.,41.0,"
-      SELECT (TO_DAYS(CURDATE()) - TO_DAYS(CURDATE())) AS `TEMP(Test)(1915846221)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,0
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] + 1,expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,28.0,"
-      SELECT DATE_ADD(DATE_ADD(`calcs`.`date2`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) AS `TEMP(Test)(715809068)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(715809068)(0)`
-    ","#1972-07-13 00:00:00#
-#1974-03-18 00:00:00#
-#1974-05-04 00:00:00#
-#1976-09-10 00:00:00#
-#1977-02-09 00:00:00#
-#1977-04-21 00:00:00#
-#1980-07-27 00:00:00#
-#1980-11-08 00:00:00#
-#1988-01-06 00:00:00#
-#1994-04-21 00:00:00#
-#1995-06-05 00:00:00#
-#1995-09-04 00:00:00#
-#1997-05-31 00:00:00#
-#1997-09-20 00:00:00#
-#1998-08-13 00:00:00#
-#2001-02-05 00:00:00#
-#2002-04-28 00:00:00#","#1972-07-13 00:00:00#
-#1974-03-18 00:00:00#
-#1974-05-04 00:00:00#
-#1976-09-10 00:00:00#
-#1977-02-09 00:00:00#
-#1977-04-21 00:00:00#
-#1980-07-27 00:00:00#
-#1980-11-08 00:00:00#
-#1988-01-06 00:00:00#
-#1994-04-21 00:00:00#
-#1995-06-05 00:00:00#
-#1995-09-04 00:00:00#
-#1997-05-31 00:00:00#
-#1997-09-20 00:00:00#
-#1998-08-13 00:00:00#
-#2001-02-05 00:00:00#
-#2002-04-28 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] + 1.5,expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,27.0,"
-      SELECT DATE_ADD(DATE_ADD(`calcs`.`date2`, INTERVAL FLOOR(1.5) DAY), INTERVAL CAST(86400 * (1.5 - FLOOR(1.5)) AS INT) SECOND) AS `TEMP(Test)(299505631)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(299505631)(0)`
-    ","#1972-07-13 12:00:00#
-#1974-03-18 12:00:00#
-#1974-05-04 12:00:00#
-#1976-09-10 12:00:00#
-#1977-02-09 12:00:00#
-#1977-04-21 12:00:00#
-#1980-07-27 12:00:00#
-#1980-11-08 12:00:00#
-#1988-01-06 12:00:00#
-#1994-04-21 12:00:00#
-#1995-06-05 12:00:00#
-#1995-09-04 12:00:00#
-#1997-05-31 12:00:00#
-#1997-09-20 12:00:00#
-#1998-08-13 12:00:00#
-#2001-02-05 12:00:00#
-#2002-04-28 12:00:00#","#1972-07-13 12:00:00#
-#1974-03-18 12:00:00#
-#1974-05-04 12:00:00#
-#1976-09-10 12:00:00#
-#1977-02-09 12:00:00#
-#1977-04-21 12:00:00#
-#1980-07-27 12:00:00#
-#1980-11-08 12:00:00#
-#1988-01-06 12:00:00#
-#1994-04-21 12:00:00#
-#1995-06-05 12:00:00#
-#1995-09-04 12:00:00#
-#1997-05-31 12:00:00#
-#1997-09-20 12:00:00#
-#1998-08-13 12:00:00#
-#2001-02-05 12:00:00#
-#2002-04-28 12:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] - 1,expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,28.0,"
-      SELECT DATE_SUB(DATE_SUB(`calcs`.`date2`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) AS `TEMP(Test)(709470143)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(709470143)(0)`
-    ","#1972-07-11 00:00:00#
-#1974-03-16 00:00:00#
-#1974-05-02 00:00:00#
-#1976-09-08 00:00:00#
-#1977-02-07 00:00:00#
-#1977-04-19 00:00:00#
-#1980-07-25 00:00:00#
-#1980-11-06 00:00:00#
-#1988-01-04 00:00:00#
-#1994-04-19 00:00:00#
-#1995-06-03 00:00:00#
-#1995-09-02 00:00:00#
-#1997-05-29 00:00:00#
-#1997-09-18 00:00:00#
-#1998-08-11 00:00:00#
-#2001-02-03 00:00:00#
-#2002-04-26 00:00:00#","#1972-07-11 00:00:00#
-#1974-03-16 00:00:00#
-#1974-05-02 00:00:00#
-#1976-09-08 00:00:00#
-#1977-02-07 00:00:00#
-#1977-04-19 00:00:00#
-#1980-07-25 00:00:00#
-#1980-11-06 00:00:00#
-#1988-01-04 00:00:00#
-#1994-04-19 00:00:00#
-#1995-06-03 00:00:00#
-#1995-09-02 00:00:00#
-#1997-05-29 00:00:00#
-#1997-09-18 00:00:00#
-#1998-08-11 00:00:00#
-#2001-02-03 00:00:00#
-#2002-04-26 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] - 1.5,expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,29.0,"
-      SELECT DATE_SUB(DATE_SUB(`calcs`.`date2`, INTERVAL FLOOR(1.5) DAY), INTERVAL CAST(86400 * (1.5 - FLOOR(1.5)) AS INT) SECOND) AS `TEMP(Test)(1620718980)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1620718980)(0)`
-    ","#1972-07-10 12:00:00#
-#1974-03-15 12:00:00#
-#1974-05-01 12:00:00#
-#1976-09-07 12:00:00#
-#1977-02-06 12:00:00#
-#1977-04-18 12:00:00#
-#1980-07-24 12:00:00#
-#1980-11-05 12:00:00#
-#1988-01-03 12:00:00#
-#1994-04-18 12:00:00#
-#1995-06-02 12:00:00#
-#1995-09-01 12:00:00#
-#1997-05-28 12:00:00#
-#1997-09-17 12:00:00#
-#1998-08-10 12:00:00#
-#2001-02-02 12:00:00#
-#2002-04-25 12:00:00#","#1972-07-10 12:00:00#
-#1974-03-15 12:00:00#
-#1974-05-01 12:00:00#
-#1976-09-07 12:00:00#
-#1977-02-06 12:00:00#
-#1977-04-18 12:00:00#
-#1980-07-24 12:00:00#
-#1980-11-05 12:00:00#
-#1988-01-03 12:00:00#
-#1994-04-18 12:00:00#
-#1995-06-02 12:00:00#
-#1995-09-01 12:00:00#
-#1997-05-28 12:00:00#
-#1997-09-17 12:00:00#
-#1998-08-10 12:00:00#
-#2001-02-02 12:00:00#
-#2002-04-25 12:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[datetime0] - [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,26.0,"
-      SELECT ((TO_DAYS(CAST(`calcs`.`datetime0` as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`datetime0` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(`calcs`.`datetime0` as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`datetime0` as TIMESTAMP))) / 86400.0)) AS `TEMP(Test)(2141740056)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2141740056)(0)`
-    ",0.0,0.0
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[datetime0] - 1,expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,27.0,"
-      SELECT DATE_SUB(DATE_SUB(`calcs`.`datetime0`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) AS `TEMP(Test)(1797652325)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1797652325)(0)`
-    ","#2004-07-03 22:49:28#
-#2004-07-04 13:14:20#
-#2004-07-08 10:17:35#
-#2004-07-11 17:30:16#
-#2004-07-13 07:43:00#
-#2004-07-13 08:16:44#
-#2004-07-16 14:01:56#
-#2004-07-18 22:21:31#
-#2004-07-21 00:30:23#
-#2004-07-22 21:13:37#
-#2004-07-24 15:22:26#
-#2004-07-25 12:30:34#
-#2004-07-27 06:54:50#
-#2004-07-27 12:34:28#
-#2004-07-27 23:30:22#
-#2004-07-30 11:57:52#
-#2004-08-01 07:59:23#","#2004-07-03 22:49:28#
-#2004-07-04 13:14:20#
-#2004-07-08 10:17:35#
-#2004-07-11 17:30:16#
-#2004-07-13 07:43:00#
-#2004-07-13 08:16:44#
-#2004-07-16 14:01:56#
-#2004-07-18 22:21:31#
-#2004-07-21 00:30:23#
-#2004-07-22 21:13:37#
-#2004-07-24 15:22:26#
-#2004-07-25 12:30:34#
-#2004-07-27 06:54:50#
-#2004-07-27 12:34:28#
-#2004-07-27 23:30:22#
-#2004-07-30 11:57:52#
-#2004-08-01 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[datetime0] + 1,expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,34.0,"
-      SELECT DATE_ADD(DATE_ADD(`calcs`.`datetime0`, INTERVAL FLOOR(1) DAY), INTERVAL CAST(86400 * (1 - FLOOR(1)) AS INT) SECOND) AS `TEMP(Test)(2686481578)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2686481578)(0)`
-    ","#2004-07-05 22:49:28#
-#2004-07-06 13:14:20#
-#2004-07-10 10:17:35#
-#2004-07-13 17:30:16#
-#2004-07-15 07:43:00#
-#2004-07-15 08:16:44#
-#2004-07-18 14:01:56#
-#2004-07-20 22:21:31#
-#2004-07-23 00:30:23#
-#2004-07-24 21:13:37#
-#2004-07-26 15:22:26#
-#2004-07-27 12:30:34#
-#2004-07-29 06:54:50#
-#2004-07-29 12:34:28#
-#2004-07-29 23:30:22#
-#2004-08-01 11:57:52#
-#2004-08-03 07:59:23#","#2004-07-05 22:49:28#
-#2004-07-06 13:14:20#
-#2004-07-10 10:17:35#
-#2004-07-13 17:30:16#
-#2004-07-15 07:43:00#
-#2004-07-15 08:16:44#
-#2004-07-18 14:01:56#
-#2004-07-20 22:21:31#
-#2004-07-23 00:30:23#
-#2004-07-24 21:13:37#
-#2004-07-26 15:22:26#
-#2004-07-27 12:30:34#
-#2004-07-29 06:54:50#
-#2004-07-29 12:34:28#
-#2004-07-29 23:30:22#
-#2004-08-01 11:57:52#
-#2004-08-03 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[datetime0] - 1.5,expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,29.0,"
-      SELECT DATE_SUB(DATE_SUB(`calcs`.`datetime0`, INTERVAL FLOOR(1.5) DAY), INTERVAL CAST(86400 * (1.5 - FLOOR(1.5)) AS INT) SECOND) AS `TEMP(Test)(2341796372)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2341796372)(0)`
-    ","#2004-07-03 10:49:28#
-#2004-07-04 01:14:20#
-#2004-07-07 22:17:35#
-#2004-07-11 05:30:16#
-#2004-07-12 19:43:00#
-#2004-07-12 20:16:44#
-#2004-07-16 02:01:56#
-#2004-07-18 10:21:31#
-#2004-07-20 12:30:23#
-#2004-07-22 09:13:37#
-#2004-07-24 03:22:26#
-#2004-07-25 00:30:34#
-#2004-07-26 18:54:50#
-#2004-07-27 00:34:28#
-#2004-07-27 11:30:22#
-#2004-07-29 23:57:52#
-#2004-07-31 19:59:23#","#2004-07-03 10:49:28#
-#2004-07-04 01:14:20#
-#2004-07-07 22:17:35#
-#2004-07-11 05:30:16#
-#2004-07-12 19:43:00#
-#2004-07-12 20:16:44#
-#2004-07-16 02:01:56#
-#2004-07-18 10:21:31#
-#2004-07-20 12:30:23#
-#2004-07-22 09:13:37#
-#2004-07-24 03:22:26#
-#2004-07-25 00:30:34#
-#2004-07-26 18:54:50#
-#2004-07-27 00:34:28#
-#2004-07-27 11:30:22#
-#2004-07-29 23:57:52#
-#2004-07-31 19:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[datetime0] + 1.5,expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,28.0,"
-      SELECT DATE_ADD(DATE_ADD(`calcs`.`datetime0`, INTERVAL FLOOR(1.5) DAY), INTERVAL CAST(86400 * (1.5 - FLOOR(1.5)) AS INT) SECOND) AS `TEMP(Test)(4017290474)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4017290474)(0)`
-    ","#2004-07-06 10:49:28#
-#2004-07-07 01:14:20#
-#2004-07-10 22:17:35#
-#2004-07-14 05:30:16#
-#2004-07-15 19:43:00#
-#2004-07-15 20:16:44#
-#2004-07-19 02:01:56#
-#2004-07-21 10:21:31#
-#2004-07-23 12:30:23#
-#2004-07-25 09:13:37#
-#2004-07-27 03:22:26#
-#2004-07-28 00:30:34#
-#2004-07-29 18:54:50#
-#2004-07-30 00:34:28#
-#2004-07-30 11:30:22#
-#2004-08-01 23:57:52#
-#2004-08-03 19:59:23#","#2004-07-06 10:49:28#
-#2004-07-07 01:14:20#
-#2004-07-10 22:17:35#
-#2004-07-14 05:30:16#
-#2004-07-15 19:43:00#
-#2004-07-15 20:16:44#
-#2004-07-19 02:01:56#
-#2004-07-21 10:21:31#
-#2004-07-23 12:30:23#
-#2004-07-25 09:13:37#
-#2004-07-27 03:22:26#
-#2004-07-28 00:30:34#
-#2004-07-29 18:54:50#
-#2004-07-30 00:34:28#
-#2004-07-30 11:30:22#
-#2004-08-01 23:57:52#
-#2004-08-03 19:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[datetime0] = [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,43.0,"
-      SELECT (CASE WHEN (`calcs`.`datetime0` = `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`datetime0` = `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(3033382267)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3033382267)(0)`
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[datetime0] > [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,38.0,"
-      SELECT (CASE WHEN (`calcs`.`datetime0` > `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`datetime0` > `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(4196472080)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4196472080)(0)`
-    ",false,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[datetime0] >= [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,30.0,"
-      SELECT (CASE WHEN (`calcs`.`datetime0` >= `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`datetime0` >= `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(1829388090)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1829388090)(0)`
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[datetime0] < [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`datetime0` < `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`datetime0` < `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(2087345109)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2087345109)(0)`
-    ",false,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[datetime0] <= [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,28.0,"
-      SELECT (CASE WHEN (`calcs`.`datetime0` <= `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`datetime0` <= `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(3187080314)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3187080314)(0)`
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[datetime0] <> [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,44.0,"
-      SELECT (CASE WHEN (`calcs`.`datetime0` <> `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`datetime0` <> `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(436529008)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(436529008)(0)`
-    ",false,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] = [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,30.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` = `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`date2` = `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(1122166960)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1122166960)(0)`
-    ",false,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] > [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,30.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` > `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`date2` > `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(2476649334)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2476649334)(0)`
-    ",false,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] >= [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,50.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` >= `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`date2` >= `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(1267352367)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1267352367)(0)`
-    ",false,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] < [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,35.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` < `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`date2` < `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(668774393)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(668774393)(0)`
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] <= [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,26.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` <= `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`date2` <= `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(2801366337)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2801366337)(0)`
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] <> [datetime0],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,26.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` <> `calcs`.`datetime0`) THEN 1 WHEN NOT (`calcs`.`date2` <> `calcs`.`datetime0`) THEN 0 ELSE NULL END) AS `TEMP(Test)(6065346)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(6065346)(0)`
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] =  [date2],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,25.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` = `calcs`.`date2`) THEN 1 WHEN NOT (`calcs`.`date2` = `calcs`.`date2`) THEN 0 ELSE NULL END) AS `TEMP(Test)(4213376628)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4213376628)(0)`
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] >  [date2],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,23.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` > `calcs`.`date2`) THEN 1 WHEN NOT (`calcs`.`date2` > `calcs`.`date2`) THEN 0 ELSE NULL END) AS `TEMP(Test)(284925583)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(284925583)(0)`
-    ",false,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] >= [date2],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,30.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` >= `calcs`.`date2`) THEN 1 WHEN NOT (`calcs`.`date2` >= `calcs`.`date2`) THEN 0 ELSE NULL END) AS `TEMP(Test)(1365124261)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1365124261)(0)`
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] <  [date2],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` < `calcs`.`date2`) THEN 1 WHEN NOT (`calcs`.`date2` < `calcs`.`date2`) THEN 0 ELSE NULL END) AS `TEMP(Test)(4277161941)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4277161941)(0)`
-    ",false,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] <= [date2],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` <= `calcs`.`date2`) THEN 1 WHEN NOT (`calcs`.`date2` <= `calcs`.`date2`) THEN 0 ELSE NULL END) AS `TEMP(Test)(932571096)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(932571096)(0)`
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.math,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.math.txt,True,1,0,[date2] <> [date2],expression,Recommended,"Date Filters,Operator,Aggregation,Filters",">=,NOW,MAX,MIN,!=,TODAY,==,+,<,-,<=,DATEDIFF,COUNT,>",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`date2` <> `calcs`.`date2`) THEN 1 WHEN NOT (`calcs`.`date2` <> `calcs`.`date2`) THEN 0 ELSE NULL END) AS `TEMP(Test)(3666462064)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3666462064)(0)`
-    ",false,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.day.txt,True,0,0,"DATEADD('day', 1, [date2])",expression,Required,Date Filters,DATEADD,,None,None,69.0,"
-      SELECT DATE_ADD(`calcs`.`date2`, INTERVAL 1 DAY) AS `TEMP(Test)(670684053)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(670684053)(0)`
-    ","#1972-07-13 00:00:00#
-#1974-03-18 00:00:00#
-#1974-05-04 00:00:00#
-#1976-09-10 00:00:00#
-#1977-02-09 00:00:00#
-#1977-04-21 00:00:00#
-#1980-07-27 00:00:00#
-#1980-11-08 00:00:00#
-#1988-01-06 00:00:00#
-#1994-04-21 00:00:00#
-#1995-06-05 00:00:00#
-#1995-09-04 00:00:00#
-#1997-05-31 00:00:00#
-#1997-09-20 00:00:00#
-#1998-08-13 00:00:00#
-#2001-02-05 00:00:00#
-#2002-04-28 00:00:00#","#1972-07-13 00:00:00#
-#1974-03-18 00:00:00#
-#1974-05-04 00:00:00#
-#1976-09-10 00:00:00#
-#1977-02-09 00:00:00#
-#1977-04-21 00:00:00#
-#1980-07-27 00:00:00#
-#1980-11-08 00:00:00#
-#1988-01-06 00:00:00#
-#1994-04-21 00:00:00#
-#1995-06-05 00:00:00#
-#1995-09-04 00:00:00#
-#1997-05-31 00:00:00#
-#1997-09-20 00:00:00#
-#1998-08-13 00:00:00#
-#2001-02-05 00:00:00#
-#2002-04-28 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.day.txt,True,0,0,"DATEADD('day', 1, [datetime0])",expression,Required,Date Filters,DATEADD,,None,None,35.0,"
-      SELECT DATE_ADD(`calcs`.`datetime0`, INTERVAL 1 DAY) AS `TEMP(Test)(2728495522)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2728495522)(0)`
-    ","#2004-07-05 22:49:28#
-#2004-07-06 13:14:20#
-#2004-07-10 10:17:35#
-#2004-07-13 17:30:16#
-#2004-07-15 07:43:00#
-#2004-07-15 08:16:44#
-#2004-07-18 14:01:56#
-#2004-07-20 22:21:31#
-#2004-07-23 00:30:23#
-#2004-07-24 21:13:37#
-#2004-07-26 15:22:26#
-#2004-07-27 12:30:34#
-#2004-07-29 06:54:50#
-#2004-07-29 12:34:28#
-#2004-07-29 23:30:22#
-#2004-08-01 11:57:52#
-#2004-08-03 07:59:23#","#2004-07-05 22:49:28#
-#2004-07-06 13:14:20#
-#2004-07-10 10:17:35#
-#2004-07-13 17:30:16#
-#2004-07-15 07:43:00#
-#2004-07-15 08:16:44#
-#2004-07-18 14:01:56#
-#2004-07-20 22:21:31#
-#2004-07-23 00:30:23#
-#2004-07-24 21:13:37#
-#2004-07-26 15:22:26#
-#2004-07-27 12:30:34#
-#2004-07-29 06:54:50#
-#2004-07-29 12:34:28#
-#2004-07-29 23:30:22#
-#2004-08-01 11:57:52#
-#2004-08-03 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.dayofyear.txt,True,0,0,"DATEADD('dayofyear', 1, [date2])",expression,Required,Date Filters,DATEADD,,None,None,39.0,"
-      SELECT DATE_ADD(`calcs`.`date2`, INTERVAL 1 DAY) AS `TEMP(Test)(1139290352)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1139290352)(0)`
-    ","#1972-07-13 00:00:00#
-#1974-03-18 00:00:00#
-#1974-05-04 00:00:00#
-#1976-09-10 00:00:00#
-#1977-02-09 00:00:00#
-#1977-04-21 00:00:00#
-#1980-07-27 00:00:00#
-#1980-11-08 00:00:00#
-#1988-01-06 00:00:00#
-#1994-04-21 00:00:00#
-#1995-06-05 00:00:00#
-#1995-09-04 00:00:00#
-#1997-05-31 00:00:00#
-#1997-09-20 00:00:00#
-#1998-08-13 00:00:00#
-#2001-02-05 00:00:00#
-#2002-04-28 00:00:00#","#1972-07-13 00:00:00#
-#1974-03-18 00:00:00#
-#1974-05-04 00:00:00#
-#1976-09-10 00:00:00#
-#1977-02-09 00:00:00#
-#1977-04-21 00:00:00#
-#1980-07-27 00:00:00#
-#1980-11-08 00:00:00#
-#1988-01-06 00:00:00#
-#1994-04-21 00:00:00#
-#1995-06-05 00:00:00#
-#1995-09-04 00:00:00#
-#1997-05-31 00:00:00#
-#1997-09-20 00:00:00#
-#1998-08-13 00:00:00#
-#2001-02-05 00:00:00#
-#2002-04-28 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.dayofyear.txt,True,0,0,"DATEADD('dayofyear', 1, [datetime0])",expression,Required,Date Filters,DATEADD,,None,None,33.0,"
-      SELECT DATE_ADD(`calcs`.`datetime0`, INTERVAL 1 DAY) AS `TEMP(Test)(748109579)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(748109579)(0)`
-    ","#2004-07-05 22:49:28#
-#2004-07-06 13:14:20#
-#2004-07-10 10:17:35#
-#2004-07-13 17:30:16#
-#2004-07-15 07:43:00#
-#2004-07-15 08:16:44#
-#2004-07-18 14:01:56#
-#2004-07-20 22:21:31#
-#2004-07-23 00:30:23#
-#2004-07-24 21:13:37#
-#2004-07-26 15:22:26#
-#2004-07-27 12:30:34#
-#2004-07-29 06:54:50#
-#2004-07-29 12:34:28#
-#2004-07-29 23:30:22#
-#2004-08-01 11:57:52#
-#2004-08-03 07:59:23#","#2004-07-05 22:49:28#
-#2004-07-06 13:14:20#
-#2004-07-10 10:17:35#
-#2004-07-13 17:30:16#
-#2004-07-15 07:43:00#
-#2004-07-15 08:16:44#
-#2004-07-18 14:01:56#
-#2004-07-20 22:21:31#
-#2004-07-23 00:30:23#
-#2004-07-24 21:13:37#
-#2004-07-26 15:22:26#
-#2004-07-27 12:30:34#
-#2004-07-29 06:54:50#
-#2004-07-29 12:34:28#
-#2004-07-29 23:30:22#
-#2004-08-01 11:57:52#
-#2004-08-03 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.hour.txt,True,0,0,"DATEADD('hour', 1, [datetime0])",expression,Required,Date Filters,DATEADD,,None,None,40.0,"
-      SELECT DATE_ADD(`calcs`.`datetime0`, INTERVAL 1 HOUR) AS `TEMP(Test)(4261466899)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4261466899)(0)`
-    ","#2004-07-04 23:49:28#
-#2004-07-05 14:14:20#
-#2004-07-09 11:17:35#
-#2004-07-12 18:30:16#
-#2004-07-14 08:43:00#
-#2004-07-14 09:16:44#
-#2004-07-17 15:01:56#
-#2004-07-19 23:21:31#
-#2004-07-22 01:30:23#
-#2004-07-23 22:13:37#
-#2004-07-25 16:22:26#
-#2004-07-26 13:30:34#
-#2004-07-28 07:54:50#
-#2004-07-28 13:34:28#
-#2004-07-29 00:30:22#
-#2004-07-31 12:57:52#
-#2004-08-02 08:59:23#","#2004-07-04 23:49:28#
-#2004-07-05 14:14:20#
-#2004-07-09 11:17:35#
-#2004-07-12 18:30:16#
-#2004-07-14 08:43:00#
-#2004-07-14 09:16:44#
-#2004-07-17 15:01:56#
-#2004-07-19 23:21:31#
-#2004-07-22 01:30:23#
-#2004-07-23 22:13:37#
-#2004-07-25 16:22:26#
-#2004-07-26 13:30:34#
-#2004-07-28 07:54:50#
-#2004-07-28 13:34:28#
-#2004-07-29 00:30:22#
-#2004-07-31 12:57:52#
-#2004-08-02 08:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.minute.txt,True,0,0,"DATEADD('minute', 1, [datetime0])",expression,Required,Date Filters,DATEADD,,None,None,39.0,"
-      SELECT DATE_ADD(`calcs`.`datetime0`, INTERVAL 1 MINUTE) AS `TEMP(Test)(2741755004)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2741755004)(0)`
-    ","#2004-07-04 22:50:28#
-#2004-07-05 13:15:20#
-#2004-07-09 10:18:35#
-#2004-07-12 17:31:16#
-#2004-07-14 07:44:00#
-#2004-07-14 08:17:44#
-#2004-07-17 14:02:56#
-#2004-07-19 22:22:31#
-#2004-07-22 00:31:23#
-#2004-07-23 21:14:37#
-#2004-07-25 15:23:26#
-#2004-07-26 12:31:34#
-#2004-07-28 06:55:50#
-#2004-07-28 12:35:28#
-#2004-07-28 23:31:22#
-#2004-07-31 11:58:52#
-#2004-08-02 08:00:23#","#2004-07-04 22:50:28#
-#2004-07-05 13:15:20#
-#2004-07-09 10:18:35#
-#2004-07-12 17:31:16#
-#2004-07-14 07:44:00#
-#2004-07-14 08:17:44#
-#2004-07-17 14:02:56#
-#2004-07-19 22:22:31#
-#2004-07-22 00:31:23#
-#2004-07-23 21:14:37#
-#2004-07-25 15:23:26#
-#2004-07-26 12:31:34#
-#2004-07-28 06:55:50#
-#2004-07-28 12:35:28#
-#2004-07-28 23:31:22#
-#2004-07-31 11:58:52#
-#2004-08-02 08:00:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.month.txt,True,0,0,"DATEADD('month', 1, [date2])",expression,Required,Date Filters,DATEADD,,None,None,40.0,"
-      SELECT DATE_ADD(`calcs`.`date2`, INTERVAL 1 MONTH) AS `TEMP(Test)(2799254343)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2799254343)(0)`
-    ","#1972-08-12 00:00:00#
-#1974-04-17 00:00:00#
-#1974-06-03 00:00:00#
-#1976-10-09 00:00:00#
-#1977-03-08 00:00:00#
-#1977-05-20 00:00:00#
-#1980-08-26 00:00:00#
-#1980-12-07 00:00:00#
-#1988-02-05 00:00:00#
-#1994-05-20 00:00:00#
-#1995-07-04 00:00:00#
-#1995-10-03 00:00:00#
-#1997-06-30 00:00:00#
-#1997-10-19 00:00:00#
-#1998-09-12 00:00:00#
-#2001-03-04 00:00:00#
-#2002-05-27 00:00:00#","#1972-08-12 00:00:00#
-#1974-04-17 00:00:00#
-#1974-06-03 00:00:00#
-#1976-10-09 00:00:00#
-#1977-03-08 00:00:00#
-#1977-05-20 00:00:00#
-#1980-08-26 00:00:00#
-#1980-12-07 00:00:00#
-#1988-02-05 00:00:00#
-#1994-05-20 00:00:00#
-#1995-07-04 00:00:00#
-#1995-10-03 00:00:00#
-#1997-06-30 00:00:00#
-#1997-10-19 00:00:00#
-#1998-09-12 00:00:00#
-#2001-03-04 00:00:00#
-#2002-05-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.month.txt,True,0,0,"DATEADD('month', 1, [datetime0])",expression,Required,Date Filters,DATEADD,,None,None,35.0,"
-      SELECT DATE_ADD(`calcs`.`datetime0`, INTERVAL 1 MONTH) AS `TEMP(Test)(1378354598)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1378354598)(0)`
-    ","#2004-08-04 22:49:28#
-#2004-08-05 13:14:20#
-#2004-08-09 10:17:35#
-#2004-08-12 17:30:16#
-#2004-08-14 07:43:00#
-#2004-08-14 08:16:44#
-#2004-08-17 14:01:56#
-#2004-08-19 22:21:31#
-#2004-08-22 00:30:23#
-#2004-08-23 21:13:37#
-#2004-08-25 15:22:26#
-#2004-08-26 12:30:34#
-#2004-08-28 06:54:50#
-#2004-08-28 12:34:28#
-#2004-08-28 23:30:22#
-#2004-08-31 11:57:52#
-#2004-09-02 07:59:23#","#2004-08-04 22:49:28#
-#2004-08-05 13:14:20#
-#2004-08-09 10:17:35#
-#2004-08-12 17:30:16#
-#2004-08-14 07:43:00#
-#2004-08-14 08:16:44#
-#2004-08-17 14:01:56#
-#2004-08-19 22:21:31#
-#2004-08-22 00:30:23#
-#2004-08-23 21:13:37#
-#2004-08-25 15:22:26#
-#2004-08-26 12:30:34#
-#2004-08-28 06:54:50#
-#2004-08-28 12:34:28#
-#2004-08-28 23:30:22#
-#2004-08-31 11:57:52#
-#2004-09-02 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.quarter.txt,True,0,0,"DATEADD('quarter', 1, [date2])",expression,Required,Date Filters,DATEADD,,None,None,38.0,"
-      SELECT DATE_ADD(`calcs`.`date2`, INTERVAL (3 * 1) MONTH) AS `TEMP(Test)(893348878)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(893348878)(0)`
-    ","#1972-10-12 00:00:00#
-#1974-06-17 00:00:00#
-#1974-08-03 00:00:00#
-#1976-12-09 00:00:00#
-#1977-05-08 00:00:00#
-#1977-07-20 00:00:00#
-#1980-10-26 00:00:00#
-#1981-02-07 00:00:00#
-#1988-04-05 00:00:00#
-#1994-07-20 00:00:00#
-#1995-09-04 00:00:00#
-#1995-12-03 00:00:00#
-#1997-08-30 00:00:00#
-#1997-12-19 00:00:00#
-#1998-11-12 00:00:00#
-#2001-05-04 00:00:00#
-#2002-07-27 00:00:00#","#1972-10-12 00:00:00#
-#1974-06-17 00:00:00#
-#1974-08-03 00:00:00#
-#1976-12-09 00:00:00#
-#1977-05-08 00:00:00#
-#1977-07-20 00:00:00#
-#1980-10-26 00:00:00#
-#1981-02-07 00:00:00#
-#1988-04-05 00:00:00#
-#1994-07-20 00:00:00#
-#1995-09-04 00:00:00#
-#1995-12-03 00:00:00#
-#1997-08-30 00:00:00#
-#1997-12-19 00:00:00#
-#1998-11-12 00:00:00#
-#2001-05-04 00:00:00#
-#2002-07-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.quarter.txt,True,0,0,"DATEADD('quarter', 1, [datetime0])",expression,Required,Date Filters,DATEADD,,None,None,35.0,"
-      SELECT DATE_ADD(`calcs`.`datetime0`, INTERVAL (3 * 1) MONTH) AS `TEMP(Test)(454013980)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(454013980)(0)`
-    ","#2004-10-04 22:49:28#
-#2004-10-05 13:14:20#
-#2004-10-09 10:17:35#
-#2004-10-12 17:30:16#
-#2004-10-14 07:43:00#
-#2004-10-14 08:16:44#
-#2004-10-17 14:01:56#
-#2004-10-19 22:21:31#
-#2004-10-22 00:30:23#
-#2004-10-23 21:13:37#
-#2004-10-25 15:22:26#
-#2004-10-26 12:30:34#
-#2004-10-28 06:54:50#
-#2004-10-28 12:34:28#
-#2004-10-28 23:30:22#
-#2004-10-31 11:57:52#
-#2004-11-02 07:59:23#","#2004-10-04 22:49:28#
-#2004-10-05 13:14:20#
-#2004-10-09 10:17:35#
-#2004-10-12 17:30:16#
-#2004-10-14 07:43:00#
-#2004-10-14 08:16:44#
-#2004-10-17 14:01:56#
-#2004-10-19 22:21:31#
-#2004-10-22 00:30:23#
-#2004-10-23 21:13:37#
-#2004-10-25 15:22:26#
-#2004-10-26 12:30:34#
-#2004-10-28 06:54:50#
-#2004-10-28 12:34:28#
-#2004-10-28 23:30:22#
-#2004-10-31 11:57:52#
-#2004-11-02 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.second.txt,True,0,0,"DATEADD('second', 1, [datetime0])",expression,Required,Date Filters,DATEADD,,None,None,37.0,"
-      SELECT DATE_ADD(`calcs`.`datetime0`, INTERVAL 1 SECOND) AS `TEMP(Test)(621896091)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(621896091)(0)`
-    ","#2004-07-04 22:49:29#
-#2004-07-05 13:14:21#
-#2004-07-09 10:17:36#
-#2004-07-12 17:30:17#
-#2004-07-14 07:43:01#
-#2004-07-14 08:16:45#
-#2004-07-17 14:01:57#
-#2004-07-19 22:21:32#
-#2004-07-22 00:30:24#
-#2004-07-23 21:13:38#
-#2004-07-25 15:22:27#
-#2004-07-26 12:30:35#
-#2004-07-28 06:54:51#
-#2004-07-28 12:34:29#
-#2004-07-28 23:30:23#
-#2004-07-31 11:57:53#
-#2004-08-02 07:59:24#","#2004-07-04 22:49:29#
-#2004-07-05 13:14:21#
-#2004-07-09 10:17:36#
-#2004-07-12 17:30:17#
-#2004-07-14 07:43:01#
-#2004-07-14 08:16:45#
-#2004-07-17 14:01:57#
-#2004-07-19 22:21:32#
-#2004-07-22 00:30:24#
-#2004-07-23 21:13:38#
-#2004-07-25 15:22:27#
-#2004-07-26 12:30:35#
-#2004-07-28 06:54:51#
-#2004-07-28 12:34:29#
-#2004-07-28 23:30:23#
-#2004-07-31 11:57:53#
-#2004-08-02 07:59:24#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.week.txt,True,0,0,"DATEADD('week', 1, [date2])",expression,Required,Date Filters,DATEADD,,None,None,37.0,"
-      SELECT DATE_ADD(`calcs`.`date2`, INTERVAL (7 * 1) DAY) AS `TEMP(Test)(2748179160)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2748179160)(0)`
-    ","#1972-07-19 00:00:00#
-#1974-03-24 00:00:00#
-#1974-05-10 00:00:00#
-#1976-09-16 00:00:00#
-#1977-02-15 00:00:00#
-#1977-04-27 00:00:00#
-#1980-08-02 00:00:00#
-#1980-11-14 00:00:00#
-#1988-01-12 00:00:00#
-#1994-04-27 00:00:00#
-#1995-06-11 00:00:00#
-#1995-09-10 00:00:00#
-#1997-06-06 00:00:00#
-#1997-09-26 00:00:00#
-#1998-08-19 00:00:00#
-#2001-02-11 00:00:00#
-#2002-05-04 00:00:00#","#1972-07-19 00:00:00#
-#1974-03-24 00:00:00#
-#1974-05-10 00:00:00#
-#1976-09-16 00:00:00#
-#1977-02-15 00:00:00#
-#1977-04-27 00:00:00#
-#1980-08-02 00:00:00#
-#1980-11-14 00:00:00#
-#1988-01-12 00:00:00#
-#1994-04-27 00:00:00#
-#1995-06-11 00:00:00#
-#1995-09-10 00:00:00#
-#1997-06-06 00:00:00#
-#1997-09-26 00:00:00#
-#1998-08-19 00:00:00#
-#2001-02-11 00:00:00#
-#2002-05-04 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.week.txt,True,0,0,"DATEADD('week', 1, [datetime0])",expression,Required,Date Filters,DATEADD,,None,None,31.0,"
-      SELECT DATE_ADD(`calcs`.`datetime0`, INTERVAL (7 * 1) DAY) AS `TEMP(Test)(3880453047)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3880453047)(0)`
-    ","#2004-07-11 22:49:28#
-#2004-07-12 13:14:20#
-#2004-07-16 10:17:35#
-#2004-07-19 17:30:16#
-#2004-07-21 07:43:00#
-#2004-07-21 08:16:44#
-#2004-07-24 14:01:56#
-#2004-07-26 22:21:31#
-#2004-07-29 00:30:23#
-#2004-07-30 21:13:37#
-#2004-08-01 15:22:26#
-#2004-08-02 12:30:34#
-#2004-08-04 06:54:50#
-#2004-08-04 12:34:28#
-#2004-08-04 23:30:22#
-#2004-08-07 11:57:52#
-#2004-08-09 07:59:23#","#2004-07-11 22:49:28#
-#2004-07-12 13:14:20#
-#2004-07-16 10:17:35#
-#2004-07-19 17:30:16#
-#2004-07-21 07:43:00#
-#2004-07-21 08:16:44#
-#2004-07-24 14:01:56#
-#2004-07-26 22:21:31#
-#2004-07-29 00:30:23#
-#2004-07-30 21:13:37#
-#2004-08-01 15:22:26#
-#2004-08-02 12:30:34#
-#2004-08-04 06:54:50#
-#2004-08-04 12:34:28#
-#2004-08-04 23:30:22#
-#2004-08-07 11:57:52#
-#2004-08-09 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.weekday.txt,True,0,0,"DATEADD('weekday', 1, [date2])",expression,Required,Date Filters,DATEADD,,None,None,36.0,"
-      SELECT DATE_ADD(`calcs`.`date2`, INTERVAL 1 DAY) AS `TEMP(Test)(1743407296)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1743407296)(0)`
-    ","#1972-07-13 00:00:00#
-#1974-03-18 00:00:00#
-#1974-05-04 00:00:00#
-#1976-09-10 00:00:00#
-#1977-02-09 00:00:00#
-#1977-04-21 00:00:00#
-#1980-07-27 00:00:00#
-#1980-11-08 00:00:00#
-#1988-01-06 00:00:00#
-#1994-04-21 00:00:00#
-#1995-06-05 00:00:00#
-#1995-09-04 00:00:00#
-#1997-05-31 00:00:00#
-#1997-09-20 00:00:00#
-#1998-08-13 00:00:00#
-#2001-02-05 00:00:00#
-#2002-04-28 00:00:00#","#1972-07-13 00:00:00#
-#1974-03-18 00:00:00#
-#1974-05-04 00:00:00#
-#1976-09-10 00:00:00#
-#1977-02-09 00:00:00#
-#1977-04-21 00:00:00#
-#1980-07-27 00:00:00#
-#1980-11-08 00:00:00#
-#1988-01-06 00:00:00#
-#1994-04-21 00:00:00#
-#1995-06-05 00:00:00#
-#1995-09-04 00:00:00#
-#1997-05-31 00:00:00#
-#1997-09-20 00:00:00#
-#1998-08-13 00:00:00#
-#2001-02-05 00:00:00#
-#2002-04-28 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.weekday.txt,True,0,0,"DATEADD('weekday', 1, [datetime0])",expression,Required,Date Filters,DATEADD,,None,None,28.0,"
-      SELECT DATE_ADD(`calcs`.`datetime0`, INTERVAL 1 DAY) AS `TEMP(Test)(2988076353)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2988076353)(0)`
-    ","#2004-07-05 22:49:28#
-#2004-07-06 13:14:20#
-#2004-07-10 10:17:35#
-#2004-07-13 17:30:16#
-#2004-07-15 07:43:00#
-#2004-07-15 08:16:44#
-#2004-07-18 14:01:56#
-#2004-07-20 22:21:31#
-#2004-07-23 00:30:23#
-#2004-07-24 21:13:37#
-#2004-07-26 15:22:26#
-#2004-07-27 12:30:34#
-#2004-07-29 06:54:50#
-#2004-07-29 12:34:28#
-#2004-07-29 23:30:22#
-#2004-08-01 11:57:52#
-#2004-08-03 07:59:23#","#2004-07-05 22:49:28#
-#2004-07-06 13:14:20#
-#2004-07-10 10:17:35#
-#2004-07-13 17:30:16#
-#2004-07-15 07:43:00#
-#2004-07-15 08:16:44#
-#2004-07-18 14:01:56#
-#2004-07-20 22:21:31#
-#2004-07-23 00:30:23#
-#2004-07-24 21:13:37#
-#2004-07-26 15:22:26#
-#2004-07-27 12:30:34#
-#2004-07-29 06:54:50#
-#2004-07-29 12:34:28#
-#2004-07-29 23:30:22#
-#2004-08-01 11:57:52#
-#2004-08-03 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.year.txt,True,0,0,"DATEADD('year', 1, [date2])",expression,Required,Date Filters,DATEADD,,None,None,35.0,"
-      SELECT DATE_ADD(`calcs`.`date2`, INTERVAL 1 YEAR) AS `TEMP(Test)(858668231)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(858668231)(0)`
-    ","#1973-07-12 00:00:00#
-#1975-03-17 00:00:00#
-#1975-05-03 00:00:00#
-#1977-09-09 00:00:00#
-#1978-02-08 00:00:00#
-#1978-04-20 00:00:00#
-#1981-07-26 00:00:00#
-#1981-11-07 00:00:00#
-#1989-01-05 00:00:00#
-#1995-04-20 00:00:00#
-#1996-06-04 00:00:00#
-#1996-09-03 00:00:00#
-#1998-05-30 00:00:00#
-#1998-09-19 00:00:00#
-#1999-08-12 00:00:00#
-#2002-02-04 00:00:00#
-#2003-04-27 00:00:00#","#1973-07-12 00:00:00#
-#1975-03-17 00:00:00#
-#1975-05-03 00:00:00#
-#1977-09-09 00:00:00#
-#1978-02-08 00:00:00#
-#1978-04-20 00:00:00#
-#1981-07-26 00:00:00#
-#1981-11-07 00:00:00#
-#1989-01-05 00:00:00#
-#1995-04-20 00:00:00#
-#1996-06-04 00:00:00#
-#1996-09-03 00:00:00#
-#1998-05-30 00:00:00#
-#1998-09-19 00:00:00#
-#1999-08-12 00:00:00#
-#2002-02-04 00:00:00#
-#2003-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.year.txt,True,0,0,"DATEADD('year', 1, [datetime0])",expression,Required,Date Filters,DATEADD,,None,None,34.0,"
-      SELECT DATE_ADD(`calcs`.`datetime0`, INTERVAL 1 YEAR) AS `TEMP(Test)(1314023193)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1314023193)(0)`
-    ","#2005-07-04 22:49:28#
-#2005-07-05 13:14:20#
-#2005-07-09 10:17:35#
-#2005-07-12 17:30:16#
-#2005-07-14 07:43:00#
-#2005-07-14 08:16:44#
-#2005-07-17 14:01:56#
-#2005-07-19 22:21:31#
-#2005-07-22 00:30:23#
-#2005-07-23 21:13:37#
-#2005-07-25 15:22:26#
-#2005-07-26 12:30:34#
-#2005-07-28 06:54:50#
-#2005-07-28 12:34:28#
-#2005-07-28 23:30:22#
-#2005-07-31 11:57:52#
-#2005-08-02 07:59:23#","#2005-07-04 22:49:28#
-#2005-07-05 13:14:20#
-#2005-07-09 10:17:35#
-#2005-07-12 17:30:16#
-#2005-07-14 07:43:00#
-#2005-07-14 08:16:44#
-#2005-07-17 14:01:56#
-#2005-07-19 22:21:31#
-#2005-07-22 00:30:23#
-#2005-07-23 21:13:37#
-#2005-07-25 15:22:26#
-#2005-07-26 12:30:34#
-#2005-07-28 06:54:50#
-#2005-07-28 12:34:28#
-#2005-07-28 23:30:22#
-#2005-07-31 11:57:52#
-#2005-08-02 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('year', 1, DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,36.0,"
-      SELECT DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 1 YEAR) AS `TEMP(Test)(1053114602)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('year', 1, DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,34.0,"
-      SELECT DATE_ADD(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), INTERVAL 1 YEAR) AS `TEMP(Test)(955333125)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('quarter', 1, DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,35.0,"
-      SELECT DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL (3 * 1) MONTH) AS `TEMP(Test)(2396988690)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('quarter', 1, DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,30.0,"
-      SELECT DATE_ADD(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), INTERVAL (3 * 1) MONTH) AS `TEMP(Test)(2232502461)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('month', 1, DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,27.0,"
-      SELECT DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 1 MONTH) AS `TEMP(Test)(109946472)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('month', 1, DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,31.0,"
-      SELECT DATE_ADD(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), INTERVAL 1 MONTH) AS `TEMP(Test)(2095510626)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('week', 1, DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,31.0,"
-      SELECT DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL (7 * 1) DAY) AS `TEMP(Test)(359186020)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('week', 1, DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,29.0,"
-      SELECT DATE_ADD(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), INTERVAL (7 * 1) DAY) AS `TEMP(Test)(3060670302)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('weekday', 1, DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,33.0,"
-      SELECT DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 1 DAY) AS `TEMP(Test)(592740370)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('weekday', 1, DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,27.0,"
-      SELECT DATE_ADD(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), INTERVAL 1 DAY) AS `TEMP(Test)(4169571243)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('dayofyear', 1, DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,28.0,"
-      SELECT DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 1 DAY) AS `TEMP(Test)(2477057371)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('dayofyear', 1, DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,31.0,"
-      SELECT DATE_ADD(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), INTERVAL 1 DAY) AS `TEMP(Test)(3817976182)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('day', 1, DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,28.0,"
-      SELECT DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 1 DAY) AS `TEMP(Test)(2329360898)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('day', 1, DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,32.0,"
-      SELECT DATE_ADD(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), INTERVAL 1 DAY) AS `TEMP(Test)(1469842605)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('hour', 1, DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,34.0,"
-      SELECT DATE_ADD(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), INTERVAL 1 HOUR) AS `TEMP(Test)(4189387493)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('minute', 1, DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,31.0,"
-      SELECT DATE_ADD(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), INTERVAL 1 MINUTE) AS `TEMP(Test)(3720439076)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.dateadd.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.dateadd.nulls.txt,True,0,0,"DATEADD('second', 1, DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","DATEADD,DATE,COUNT",,None,None,29.0,"
-      SELECT DATE_ADD(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), INTERVAL 1 SECOND) AS `TEMP(Test)(2985757783)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.day.txt,True,0,0,"DATEDIFF('day', [date3], [date2])",expression,Required,Date Filters,DATEDIFF,,None,None,70.0,"
-      SELECT (TO_DAYS(`calcs`.`date2`) - TO_DAYS(`calcs`.`date3`)) AS `TEMP(Test)(885008067)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(885008067)(0)`
-    ","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.day.txt,True,0,0,"DATEDIFF('day', DATETIME([date2]), [datetime0])",expression,Required,Date Filters,DATEDIFF,,None,None,32.0,"
-      SELECT (TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(3554344781)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3554344781)(0)`
-    ","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.dayofyear.txt,True,0,0,"DATEDIFF('dayofyear', [date3], [date2])",expression,Required,Date Filters,DATEDIFF,,None,None,37.0,"
-      SELECT (TO_DAYS(`calcs`.`date2`) - TO_DAYS(`calcs`.`date3`)) AS `TEMP(Test)(2016952657)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2016952657)(0)`
-    ","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.dayofyear.txt,True,0,0,"DATEDIFF('dayofyear', DATETIME([date2]), [datetime0])",expression,Required,Date Filters,DATEDIFF,,None,None,31.0,"
-      SELECT (TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(1256216982)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1256216982)(0)`
-    ","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.hour.txt,True,0,0,"DATEDIFF('hour', DATETIME([date2]), [datetime0])",expression,Required,Date Filters,DATEDIFF,,None,None,47.0,"
-      SELECT ((TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) * 24 + FLOOR(TIME_TO_SEC(`calcs`.`datetime0`) / 3600) - FLOOR(TIME_TO_SEC(TIMESTAMP(`calcs`.`date2`)) / 3600)) AS `TEMP(Test)(289918985)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(289918985)(0)`
-    ","19764
-30230
-52149
-60223
-62807
-77988
-79879
-89991
-144982
-207792
-209893
-238618
-240774
-243862
-264689
-265856
-280979","19764
-30230
-52149
-60223
-62807
-77988
-79879
-89991
-144982
-207792
-209893
-238618
-240774
-243862
-264689
-265856
-280979"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.minute.txt,True,0,0,"DATEDIFF('minute', DATETIME([date2]), [datetime0])",expression,Required,Date Filters,DATEDIFF,,None,None,43.0,"
-      SELECT ((TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) * 1440 + FLOOR(TIME_TO_SEC(`calcs`.`datetime0`) / 60) - FLOOR(TIME_TO_SEC(TIMESTAMP(`calcs`.`date2`)) / 60)) AS `TEMP(Test)(2180476504)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2180476504)(0)`
-    ","1185874
-1813801
-3128953
-3613439
-3768450
-4679310
-4792783
-5399482
-8698941
-12467550
-12593594
-14317097
-14446494
-14631769
-15881370
-15951376
-16858797","1185874
-1813801
-3128953
-3613439
-3768450
-4679310
-4792783
-5399482
-8698941
-12467550
-12593594
-14317097
-14446494
-14631769
-15881370
-15951376
-16858797"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.month.txt,True,0,0,"DATEDIFF('month', [date3], [date2])",expression,Required,Date Filters,DATEDIFF,,None,None,39.0,"
-      SELECT ((YEAR(`calcs`.`date2`) - YEAR(`calcs`.`date3`)) * 12 + (MONTH(`calcs`.`date2`) - MONTH(`calcs`.`date3`))) AS `TEMP(Test)(381839689)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(381839689)(0)`
-    ","%null%
--305
--172
--107
--100
--80
-7
-14
-19
-123","%null%
--305
--172
--107
--100
--80
-7
-14
-19
-123"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.month.txt,True,0,0,"DATEDIFF('month', DATETIME([date2]), [datetime0])",expression,Required,Date Filters,DATEDIFF,,None,None,37.0,"
-      SELECT ((YEAR(`calcs`.`datetime0`) - YEAR(TIMESTAMP(`calcs`.`date2`))) * 12 + (MONTH(`calcs`.`datetime0`) - MONTH(TIMESTAMP(`calcs`.`date2`)))) AS `TEMP(Test)(2416406882)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2416406882)(0)`
-    ","27
-41
-71
-83
-86
-106
-109
-123
-198
-284
-288
-327
-329
-334
-362
-364
-384","27
-41
-71
-83
-86
-106
-109
-123
-198
-284
-288
-327
-329
-334
-362
-364
-384"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.quarter.txt,True,0,0,"DATEDIFF('quarter', [date3], [date2])",expression,Required,Date Filters,DATEDIFF,,None,None,40.0,"
-      SELECT ((YEAR(`calcs`.`date2`) - YEAR(`calcs`.`date3`)) * 4 + (QUARTER(`calcs`.`date2`) - QUARTER(`calcs`.`date3`))) AS `TEMP(Test)(4144088821)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4144088821)(0)`
-    ","%null%
--102
--57
--35
--33
--27
-2
-5
-6
-41","%null%
--102
--57
--35
--33
--27
-2
-5
-6
-41"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.quarter.txt,True,0,0,"DATEDIFF('quarter', DATETIME([date2]), [datetime0])",expression,Required,Date Filters,DATEDIFF,,None,None,31.0,"
-      SELECT ((YEAR(`calcs`.`datetime0`) - YEAR(TIMESTAMP(`calcs`.`date2`))) * 4 + (QUARTER(`calcs`.`datetime0`) - QUARTER(TIMESTAMP(`calcs`.`date2`)))) AS `TEMP(Test)(2035564840)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2035564840)(0)`
-    ","9
-14
-24
-28
-29
-36
-37
-41
-66
-95
-96
-109
-110
-112
-121
-122
-128","9
-14
-24
-28
-29
-36
-37
-41
-66
-95
-96
-109
-110
-112
-121
-122
-128"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.second.txt,True,0,0,"DATEDIFF('second', DATETIME([date2]), [datetime0])",expression,Required,Date Filters,DATEDIFF,,None,None,41.0,"
-      SELECT ((TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) * 86400 + (TIME_TO_SEC(`calcs`.`datetime0`) - TIME_TO_SEC(TIMESTAMP(`calcs`.`date2`)))) AS `TEMP(Test)(3711433751)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3711433751)(0)`
-    ","71152468
-108828116
-187737217
-216806363
-226107022
-280758634
-287566980
-323968946
-521936491
-748053023
-755615660
-859025855
-866789690
-877906168
-952882216
-957082604
-1011527872","71152468
-108828116
-187737217
-216806363
-226107022
-280758634
-287566980
-323968946
-521936491
-748053023
-755615660
-859025855
-866789690
-877906168
-952882216
-957082604
-1011527872"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.day.txt,True,0,0,"DATEDIFF('day', [date3], [date2], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,35.0,"
-      SELECT (TO_DAYS(`calcs`.`date2`) - TO_DAYS(`calcs`.`date3`)) AS `TEMP(Test)(838791689)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(838791689)(0)`
-    ","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.day.txt,True,0,0,"DATEDIFF('day', [date3], [date2], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,30.0,"
-      SELECT (TO_DAYS(`calcs`.`date2`) - TO_DAYS(`calcs`.`date3`)) AS `TEMP(Test)(1647283678)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1647283678)(0)`
-    ","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.day.txt,True,0,0,"DATEDIFF('day', DATETIME([date2]), [datetime0], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,27.0,"
-      SELECT (TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(1719292105)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1719292105)(0)`
-    ","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.day.txt,True,0,0,"DATEDIFF('day', DATETIME([date2]), [datetime0], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,30.0,"
-      SELECT (TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(1567002572)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1567002572)(0)`
-    ","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.dayofyear.txt,True,0,0,"DATEDIFF('dayofyear', [date3], [date2], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,46.0,"
-      SELECT (TO_DAYS(`calcs`.`date2`) - TO_DAYS(`calcs`.`date3`)) AS `TEMP(Test)(1590117682)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1590117682)(0)`
-    ","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.dayofyear.txt,True,0,0,"DATEDIFF('dayofyear', [date3], [date2], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,36.0,"
-      SELECT (TO_DAYS(`calcs`.`date2`) - TO_DAYS(`calcs`.`date3`)) AS `TEMP(Test)(4199707040)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4199707040)(0)`
-    ","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.dayofyear.txt,True,0,0,"DATEDIFF('dayofyear', DATETIME([date2]), [datetime0], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,32.0,"
-      SELECT (TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(2589771434)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2589771434)(0)`
-    ","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.dayofyear.txt,True,0,0,"DATEDIFF('dayofyear', DATETIME([date2]), [datetime0], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,27.0,"
-      SELECT (TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(1875124737)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1875124737)(0)`
-    ","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.hour.txt,True,0,0,"DATEDIFF('hour', DATETIME([date2]), [datetime0], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,36.0,"
-      SELECT ((TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) * 24 + FLOOR(TIME_TO_SEC(`calcs`.`datetime0`) / 3600) - FLOOR(TIME_TO_SEC(TIMESTAMP(`calcs`.`date2`)) / 3600)) AS `TEMP(Test)(1898404202)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1898404202)(0)`
-    ","19764
-30230
-52149
-60223
-62807
-77988
-79879
-89991
-144982
-207792
-209893
-238618
-240774
-243862
-264689
-265856
-280979","19764
-30230
-52149
-60223
-62807
-77988
-79879
-89991
-144982
-207792
-209893
-238618
-240774
-243862
-264689
-265856
-280979"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.hour.txt,True,0,0,"DATEDIFF('hour', DATETIME([date2]), [datetime0], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,34.0,"
-      SELECT ((TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) * 24 + FLOOR(TIME_TO_SEC(`calcs`.`datetime0`) / 3600) - FLOOR(TIME_TO_SEC(TIMESTAMP(`calcs`.`date2`)) / 3600)) AS `TEMP(Test)(4263325709)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4263325709)(0)`
-    ","19764
-30230
-52149
-60223
-62807
-77988
-79879
-89991
-144982
-207792
-209893
-238618
-240774
-243862
-264689
-265856
-280979","19764
-30230
-52149
-60223
-62807
-77988
-79879
-89991
-144982
-207792
-209893
-238618
-240774
-243862
-264689
-265856
-280979"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.minute.txt,True,0,0,"DATEDIFF('minute', DATETIME([date2]), [datetime0], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,35.0,"
-      SELECT ((TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) * 1440 + FLOOR(TIME_TO_SEC(`calcs`.`datetime0`) / 60) - FLOOR(TIME_TO_SEC(TIMESTAMP(`calcs`.`date2`)) / 60)) AS `TEMP(Test)(2300448284)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2300448284)(0)`
-    ","1185874
-1813801
-3128953
-3613439
-3768450
-4679310
-4792783
-5399482
-8698941
-12467550
-12593594
-14317097
-14446494
-14631769
-15881370
-15951376
-16858797","1185874
-1813801
-3128953
-3613439
-3768450
-4679310
-4792783
-5399482
-8698941
-12467550
-12593594
-14317097
-14446494
-14631769
-15881370
-15951376
-16858797"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.minute.txt,True,0,0,"DATEDIFF('minute', DATETIME([date2]), [datetime0], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,29.0,"
-      SELECT ((TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) * 1440 + FLOOR(TIME_TO_SEC(`calcs`.`datetime0`) / 60) - FLOOR(TIME_TO_SEC(TIMESTAMP(`calcs`.`date2`)) / 60)) AS `TEMP(Test)(2077207759)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2077207759)(0)`
-    ","1185874
-1813801
-3128953
-3613439
-3768450
-4679310
-4792783
-5399482
-8698941
-12467550
-12593594
-14317097
-14446494
-14631769
-15881370
-15951376
-16858797","1185874
-1813801
-3128953
-3613439
-3768450
-4679310
-4792783
-5399482
-8698941
-12467550
-12593594
-14317097
-14446494
-14631769
-15881370
-15951376
-16858797"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.month.txt,True,0,0,"DATEDIFF('month', [date3], [date2], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,34.0,"
-      SELECT ((YEAR(`calcs`.`date2`) - YEAR(`calcs`.`date3`)) * 12 + (MONTH(`calcs`.`date2`) - MONTH(`calcs`.`date3`))) AS `TEMP(Test)(2958462977)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2958462977)(0)`
-    ","%null%
--305
--172
--107
--100
--80
-7
-14
-19
-123","%null%
--305
--172
--107
--100
--80
-7
-14
-19
-123"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.month.txt,True,0,0,"DATEDIFF('month', [date3], [date2], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,28.0,"
-      SELECT ((YEAR(`calcs`.`date2`) - YEAR(`calcs`.`date3`)) * 12 + (MONTH(`calcs`.`date2`) - MONTH(`calcs`.`date3`))) AS `TEMP(Test)(667124691)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(667124691)(0)`
-    ","%null%
--305
--172
--107
--100
--80
-7
-14
-19
-123","%null%
--305
--172
--107
--100
--80
-7
-14
-19
-123"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.month.txt,True,0,0,"DATEDIFF('month', DATETIME([date2]), [datetime0], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,28.0,"
-      SELECT ((YEAR(`calcs`.`datetime0`) - YEAR(TIMESTAMP(`calcs`.`date2`))) * 12 + (MONTH(`calcs`.`datetime0`) - MONTH(TIMESTAMP(`calcs`.`date2`)))) AS `TEMP(Test)(2463700949)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2463700949)(0)`
-    ","27
-41
-71
-83
-86
-106
-109
-123
-198
-284
-288
-327
-329
-334
-362
-364
-384","27
-41
-71
-83
-86
-106
-109
-123
-198
-284
-288
-327
-329
-334
-362
-364
-384"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.month.txt,True,0,0,"DATEDIFF('month', DATETIME([date2]), [datetime0], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,28.0,"
-      SELECT ((YEAR(`calcs`.`datetime0`) - YEAR(TIMESTAMP(`calcs`.`date2`))) * 12 + (MONTH(`calcs`.`datetime0`) - MONTH(TIMESTAMP(`calcs`.`date2`)))) AS `TEMP(Test)(3778274693)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3778274693)(0)`
-    ","27
-41
-71
-83
-86
-106
-109
-123
-198
-284
-288
-327
-329
-334
-362
-364
-384","27
-41
-71
-83
-86
-106
-109
-123
-198
-284
-288
-327
-329
-334
-362
-364
-384"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.quarter.txt,True,0,0,"DATEDIFF('quarter', [date3], [date2], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,34.0,"
-      SELECT ((YEAR(`calcs`.`date2`) - YEAR(`calcs`.`date3`)) * 4 + (QUARTER(`calcs`.`date2`) - QUARTER(`calcs`.`date3`))) AS `TEMP(Test)(3028875325)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3028875325)(0)`
-    ","%null%
--102
--57
--35
--33
--27
-2
-5
-6
-41","%null%
--102
--57
--35
--33
--27
-2
-5
-6
-41"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.quarter.txt,True,0,0,"DATEDIFF('quarter', [date3], [date2], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,32.0,"
-      SELECT ((YEAR(`calcs`.`date2`) - YEAR(`calcs`.`date3`)) * 4 + (QUARTER(`calcs`.`date2`) - QUARTER(`calcs`.`date3`))) AS `TEMP(Test)(3483942593)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3483942593)(0)`
-    ","%null%
--102
--57
--35
--33
--27
-2
-5
-6
-41","%null%
--102
--57
--35
--33
--27
-2
-5
-6
-41"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.quarter.txt,True,0,0,"DATEDIFF('quarter', DATETIME([date2]), [datetime0], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,31.0,"
-      SELECT ((YEAR(`calcs`.`datetime0`) - YEAR(TIMESTAMP(`calcs`.`date2`))) * 4 + (QUARTER(`calcs`.`datetime0`) - QUARTER(TIMESTAMP(`calcs`.`date2`)))) AS `TEMP(Test)(4196684004)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4196684004)(0)`
-    ","9
-14
-24
-28
-29
-36
-37
-41
-66
-95
-96
-109
-110
-112
-121
-122
-128","9
-14
-24
-28
-29
-36
-37
-41
-66
-95
-96
-109
-110
-112
-121
-122
-128"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.quarter.txt,True,0,0,"DATEDIFF('quarter', DATETIME([date2]), [datetime0], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,28.0,"
-      SELECT ((YEAR(`calcs`.`datetime0`) - YEAR(TIMESTAMP(`calcs`.`date2`))) * 4 + (QUARTER(`calcs`.`datetime0`) - QUARTER(TIMESTAMP(`calcs`.`date2`)))) AS `TEMP(Test)(351668681)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(351668681)(0)`
-    ","9
-14
-24
-28
-29
-36
-37
-41
-66
-95
-96
-109
-110
-112
-121
-122
-128","9
-14
-24
-28
-29
-36
-37
-41
-66
-95
-96
-109
-110
-112
-121
-122
-128"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.second.txt,True,0,0,"DATEDIFF('second', DATETIME([date2]), [datetime0], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,36.0,"
-      SELECT ((TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) * 86400 + (TIME_TO_SEC(`calcs`.`datetime0`) - TIME_TO_SEC(TIMESTAMP(`calcs`.`date2`)))) AS `TEMP(Test)(3772571288)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3772571288)(0)`
-    ","71152468
-108828116
-187737217
-216806363
-226107022
-280758634
-287566980
-323968946
-521936491
-748053023
-755615660
-859025855
-866789690
-877906168
-952882216
-957082604
-1011527872","71152468
-108828116
-187737217
-216806363
-226107022
-280758634
-287566980
-323968946
-521936491
-748053023
-755615660
-859025855
-866789690
-877906168
-952882216
-957082604
-1011527872"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.second.txt,True,0,0,"DATEDIFF('second', DATETIME([date2]), [datetime0], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,31.0,"
-      SELECT ((TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) * 86400 + (TIME_TO_SEC(`calcs`.`datetime0`) - TIME_TO_SEC(TIMESTAMP(`calcs`.`date2`)))) AS `TEMP(Test)(3405329770)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3405329770)(0)`
-    ","71152468
-108828116
-187737217
-216806363
-226107022
-280758634
-287566980
-323968946
-521936491
-748053023
-755615660
-859025855
-866789690
-877906168
-952882216
-957082604
-1011527872","71152468
-108828116
-187737217
-216806363
-226107022
-280758634
-287566980
-323968946
-521936491
-748053023
-755615660
-859025855
-866789690
-877906168
-952882216
-957082604
-1011527872"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.week.txt,True,0,0,"DATEDIFF('week', [date3], [date2], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,44.0,"
-      SELECT FLOOR((( TO_DAYS(`calcs`.`date2`) - ((7 + DAYOFWEEK(`calcs`.`date2`) - 2) % 7)) - (TO_DAYS(`calcs`.`date3`) - ((7 + DAYOFWEEK(`calcs`.`date3`) - 2) % 7) ) )/7) AS `TEMP(Test)(3550551924)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3550551924)(0)`
-    ","%null%
--1327
--747
--465
--436
--349
-33
-64
-84
-536","%null%
--1327
--747
--465
--436
--349
-33
-64
-84
-536"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.week.txt,True,0,0,"DATEDIFF('week', [date3], [date2], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,30.0,"
-      SELECT FLOOR(((TO_DAYS(`calcs`.`date2`) - (DAYOFWEEK(`calcs`.`date2`) - 1)) - (TO_DAYS(`calcs`.`date3`) - (DAYOFWEEK(`calcs`.`date3`) - 1)))/7) AS `TEMP(Test)(2745903531)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2745903531)(0)`
-    ","%null%
--1326
--747
--465
--436
--350
-32
-64
-83
-536","%null%
--1326
--747
--465
--436
--350
-32
-64
-83
-536"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.week.txt,True,0,0,"DATEDIFF('week', DATETIME([date2]), [datetime0], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,34.0,"
-      SELECT FLOOR((( TO_DAYS(`calcs`.`datetime0`) - ((7 + DAYOFWEEK(`calcs`.`datetime0`) - 2) % 7)) - (TO_DAYS(TIMESTAMP(`calcs`.`date2`)) - ((7 + DAYOFWEEK(TIMESTAMP(`calcs`.`date2`)) - 2) % 7) ) )/7) AS `TEMP(Test)(1341534691)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1341534691)(0)`
-    ","118
-180
-310
-359
-374
-465
-476
-535
-863
-1237
-1250
-1420
-1433
-1451
-1576
-1583
-1672","118
-180
-310
-359
-374
-465
-476
-535
-863
-1237
-1250
-1420
-1433
-1451
-1576
-1583
-1672"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.week.txt,True,0,0,"DATEDIFF('week', DATETIME([date2]), [datetime0], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,29.0,"
-      SELECT FLOOR(((TO_DAYS(`calcs`.`datetime0`) - (DAYOFWEEK(`calcs`.`datetime0`) - 1)) - (TO_DAYS(TIMESTAMP(`calcs`.`date2`)) - (DAYOFWEEK(TIMESTAMP(`calcs`.`date2`)) - 1)))/7) AS `TEMP(Test)(1157868287)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1157868287)(0)`
-    ","118
-179
-310
-359
-374
-464
-475
-536
-863
-1237
-1250
-1420
-1433
-1452
-1576
-1582
-1672","118
-179
-310
-359
-374
-464
-475
-536
-863
-1237
-1250
-1420
-1433
-1452
-1576
-1582
-1672"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.weekday.txt,True,0,0,"DATEDIFF('weekday', [date3], [date2], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,36.0,"
-      SELECT (TO_DAYS(`calcs`.`date2`) - TO_DAYS(`calcs`.`date3`)) AS `TEMP(Test)(4265410721)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4265410721)(0)`
-    ","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.weekday.txt,True,0,0,"DATEDIFF('weekday', [date3], [date2], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,27.0,"
-      SELECT (TO_DAYS(`calcs`.`date2`) - TO_DAYS(`calcs`.`date3`)) AS `TEMP(Test)(1278698096)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1278698096)(0)`
-    ","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.weekday.txt,True,0,0,"DATEDIFF('weekday', DATETIME([date2]), [datetime0], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,28.0,"
-      SELECT (TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(3729248905)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3729248905)(0)`
-    ","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.weekday.txt,True,0,0,"DATEDIFF('weekday', DATETIME([date2]), [datetime0], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,33.0,"
-      SELECT (TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(965356852)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(965356852)(0)`
-    ","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.year.txt,True,0,0,"DATEDIFF('year', [date3], [date2], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,35.0,"
-      SELECT (YEAR(`calcs`.`date2`) - YEAR(`calcs`.`date3`)) AS `TEMP(Test)(427588088)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(427588088)(0)`
-    ","%null%
--25
--14
--9
--8
--7
-0
-1
-10","%null%
--25
--14
--9
--8
--7
-0
-1
-10"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.year.txt,True,0,0,"DATEDIFF('year', [date3], [date2], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,28.0,"
-      SELECT (YEAR(`calcs`.`date2`) - YEAR(`calcs`.`date3`)) AS `TEMP(Test)(2526313076)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2526313076)(0)`
-    ","%null%
--25
--14
--9
--8
--7
-0
-1
-10","%null%
--25
--14
--9
--8
--7
-0
-1
-10"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.year.txt,True,0,0,"DATEDIFF('year', DATETIME([date2]), [datetime0], 'monday')",expression,Required,Date Filters,DATEDIFF,,None,None,33.0,"
-      SELECT (YEAR(`calcs`.`datetime0`) - YEAR(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(1540391660)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1540391660)(0)`
-    ","2
-3
-6
-7
-9
-10
-16
-24
-27
-28
-30
-32","2
-3
-6
-7
-9
-10
-16
-24
-27
-28
-30
-32"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.year.txt,True,0,0,"DATEDIFF('year', DATETIME([date2]), [datetime0], 'sunday')",expression,Required,Date Filters,DATEDIFF,,None,None,28.0,"
-      SELECT (YEAR(`calcs`.`datetime0`) - YEAR(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(3579576882)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3579576882)(0)`
-    ","2
-3
-6
-7
-9
-10
-16
-24
-27
-28
-30
-32","2
-3
-6
-7
-9
-10
-16
-24
-27
-28
-30
-32"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.week.extended,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.week.extended.txt,False,0,4,"DATEDIFF('week', [date2], #2050-01-01#)",expression,Required,Date Filters,DATEDIFF,,Actual does not match expected.,Actual does not match expected.,42.0,"
-      SELECT FLOOR((( TO_DAYS(DATE('2050-01-01')) - ((7 + DAYOFWEEK(DATE('2050-01-01')) - 2) % 7)) - (TO_DAYS(`calcs`.`date2`) - ((7 + DAYOFWEEK(`calcs`.`date2`) - 2) % 7) ) )/7) AS `TEMP(Test)(2771060545)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2771060545)(0)`
-    ","2488
-2552
-2681
-2728
-2744
-2835
-2848
-2906
-3234
-3608
-3623
-3793
-3803
-3825
-3948
-3955
-4042","2488
-2551
-2681
-2728
-2744
-2834
-2847
-2906
-3234
-3608
-3623
-3793
-3803
-3825
-3948
-3954
-4042"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.week.txt,False,0,4,"DATEDIFF('week', [date3], [date2])",expression,Required,Date Filters,DATEDIFF,,Actual does not match expected.,Actual does not match expected.,34.0,"
-      SELECT FLOOR((( TO_DAYS(`calcs`.`date2`) - ((7 + DAYOFWEEK(`calcs`.`date2`) - 2) % 7)) - (TO_DAYS(`calcs`.`date3`) - ((7 + DAYOFWEEK(`calcs`.`date3`) - 2) % 7) ) )/7) AS `TEMP(Test)(859582235)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(859582235)(0)`
-    ","%null%
--1327
--747
--465
--436
--349
-33
-64
-84
-536","%null%
--1326
--747
--465
--436
--350
-32
-64
-83
-536"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.week.txt,False,0,6,"DATEDIFF('week', DATETIME([date2]), [datetime0])",expression,Required,Date Filters,DATEDIFF,,Actual does not match expected.,Actual does not match expected.,29.0,"
-      SELECT FLOOR((( TO_DAYS(`calcs`.`datetime0`) - ((7 + DAYOFWEEK(`calcs`.`datetime0`) - 2) % 7)) - (TO_DAYS(TIMESTAMP(`calcs`.`date2`)) - ((7 + DAYOFWEEK(TIMESTAMP(`calcs`.`date2`)) - 2) % 7) ) )/7) AS `TEMP(Test)(2079052241)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2079052241)(0)`
-    ","118
-180
-310
-359
-374
-465
-476
-535
-863
-1237
-1250
-1420
-1433
-1451
-1576
-1583
-1672","118
-179
-310
-359
-374
-464
-475
-536
-863
-1237
-1250
-1420
-1433
-1452
-1576
-1582
-1672"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.weekday.txt,True,0,0,"DATEDIFF('weekday', [date3], [date2])",expression,Required,Date Filters,DATEDIFF,,None,None,40.0,"
-      SELECT (TO_DAYS(`calcs`.`date2`) - TO_DAYS(`calcs`.`date3`)) AS `TEMP(Test)(3361088979)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3361088979)(0)`
-    ","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752","%null%
--9287
--5232
--3256
--3051
--2446
-229
-449
-586
-3752"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.weekday.txt,True,0,0,"DATEDIFF('weekday', DATETIME([date2]), [datetime0])",expression,Required,Date Filters,DATEDIFF,,None,None,28.0,"
-      SELECT (TO_DAYS(`calcs`.`datetime0`) - TO_DAYS(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(299717125)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(299717125)(0)`
-    ","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707","823
-1259
-2172
-2509
-2616
-3249
-3328
-3749
-6040
-8658
-8745
-9942
-10032
-10160
-11028
-11077
-11707"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.year.txt,True,0,0,"DATEDIFF('year', [date3], [date2])",expression,Required,Date Filters,DATEDIFF,,None,None,32.0,"
-      SELECT (YEAR(`calcs`.`date2`) - YEAR(`calcs`.`date3`)) AS `TEMP(Test)(3489013143)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3489013143)(0)`
-    ","%null%
--25
--14
--9
--8
--7
-0
-1
-10","%null%
--25
--14
--9
--8
--7
-0
-1
-10"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.year.txt,True,0,0,"DATEDIFF('year', DATETIME([date2]), [datetime0])",expression,Required,Date Filters,DATEDIFF,,None,None,32.0,"
-      SELECT (YEAR(`calcs`.`datetime0`) - YEAR(TIMESTAMP(`calcs`.`date2`))) AS `TEMP(Test)(3834106318)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3834106318)(0)`
-    ","2
-3
-6
-7
-9
-10
-16
-24
-27
-28
-30
-32","2
-3
-6
-7
-9
-10
-16
-24
-27
-28
-30
-32"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('year',  DATE(null), DATE(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,35.0,"
-      SELECT (YEAR(FROM_DAYS(FLOOR(NULL) + 693961)) - YEAR(FROM_DAYS(FLOOR(NULL) + 693961))) AS `TEMP(Test)(1128710711)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('year', DATETIME(null), DATETIME(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,30.0,"
-      SELECT (YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) AS `TEMP(Test)(3816818712)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('quarter', DATE(null), DATE(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,30.0,"
-      SELECT ((YEAR(FROM_DAYS(FLOOR(NULL) + 693961)) - YEAR(FROM_DAYS(FLOOR(NULL) + 693961))) * 4 + (QUARTER(FROM_DAYS(FLOOR(NULL) + 693961)) - QUARTER(FROM_DAYS(FLOOR(NULL) + 693961)))) AS `TEMP(Test)(1220694026)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('quarter', DATETIME(null), DATETIME(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,33.0,"
-      SELECT ((YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) * 4 + (QUARTER(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - QUARTER(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)))) AS `TEMP(Test)(1878304808)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('month', DATE(null), DATE(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,30.0,"
-      SELECT ((YEAR(FROM_DAYS(FLOOR(NULL) + 693961)) - YEAR(FROM_DAYS(FLOOR(NULL) + 693961))) * 12 + (MONTH(FROM_DAYS(FLOOR(NULL) + 693961)) - MONTH(FROM_DAYS(FLOOR(NULL) + 693961)))) AS `TEMP(Test)(3201398499)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('month', DATETIME(null), DATETIME(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,35.0,"
-      SELECT ((YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) * 12 + (MONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - MONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)))) AS `TEMP(Test)(2380792894)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('week', DATE(null), DATE(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,32.0,"
-      SELECT FLOOR((( TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - ((7 + DAYOFWEEK(FROM_DAYS(FLOOR(NULL) + 693961)) - 2) % 7)) - (TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - ((7 + DAYOFWEEK(FROM_DAYS(FLOOR(NULL) + 693961)) - 2) % 7) ) )/7) AS `TEMP(Test)(1799303116)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('week', DATETIME(null), DATETIME(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,33.0,"
-      SELECT FLOOR((( TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - ((7 + DAYOFWEEK(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - 2) % 7)) - (TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - ((7 + DAYOFWEEK(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - 2) % 7) ) )/7) AS `TEMP(Test)(3424623419)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('weekday', DATE(null), DATE(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,27.0,"
-      SELECT (TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961))) AS `TEMP(Test)(496128354)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('weekday', DATETIME(null), DATETIME(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,28.0,"
-      SELECT (TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) AS `TEMP(Test)(260207547)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('day', DATE(null), DATE(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,28.0,"
-      SELECT (TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961))) AS `TEMP(Test)(4282303505)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('day', DATETIME(null), DATETIME(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,38.0,"
-      SELECT (TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) AS `TEMP(Test)(2339877044)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('dayofyear', DATE(null), DATE(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,27.0,"
-      SELECT (TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961))) AS `TEMP(Test)(3465754358)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('dayofyear', DATETIME(null), DATETIME(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,29.0,"
-      SELECT (TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) AS `TEMP(Test)(2205674587)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('hour', DATETIME(null), DATETIME(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,33.0,"
-      SELECT ((TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) * 24 + FLOOR(TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) / 3600) - FLOOR(TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) / 3600)) AS `TEMP(Test)(4062119106)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('minute', DATETIME(null), DATETIME(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,36.0,"
-      SELECT ((TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) * 1440 + FLOOR(TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) / 60) - FLOOR(TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) / 60)) AS `TEMP(Test)(2509274079)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.nulls.txt,True,0,0,"DATEDIFF('second', DATETIME(null), DATETIME(null))",expression,Required If Supported,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,35.0,"
-      SELECT ((TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) * 86400 + (TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)))) AS `TEMP(Test)(508245917)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('year',  DATE(null), DATE(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,37.0,"
-      SELECT (YEAR(FROM_DAYS(FLOOR(NULL) + 693961)) - YEAR(FROM_DAYS(FLOOR(NULL) + 693961))) AS `TEMP(Test)(523796786)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('year', DATETIME(null), DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,34.0,"
-      SELECT (YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) AS `TEMP(Test)(1757347367)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('quarter', DATE(null), DATE(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,30.0,"
-      SELECT ((YEAR(FROM_DAYS(FLOOR(NULL) + 693961)) - YEAR(FROM_DAYS(FLOOR(NULL) + 693961))) * 4 + (QUARTER(FROM_DAYS(FLOOR(NULL) + 693961)) - QUARTER(FROM_DAYS(FLOOR(NULL) + 693961)))) AS `TEMP(Test)(2892653053)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('quarter', DATETIME(null), DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,27.0,"
-      SELECT ((YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) * 4 + (QUARTER(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - QUARTER(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)))) AS `TEMP(Test)(208306356)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('month', DATETIME(null), DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,34.0,"
-      SELECT ((YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) * 12 + (MONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - MONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)))) AS `TEMP(Test)(3602652935)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('month', DATE(null), DATE(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,29.0,"
-      SELECT ((YEAR(FROM_DAYS(FLOOR(NULL) + 693961)) - YEAR(FROM_DAYS(FLOOR(NULL) + 693961))) * 12 + (MONTH(FROM_DAYS(FLOOR(NULL) + 693961)) - MONTH(FROM_DAYS(FLOOR(NULL) + 693961)))) AS `TEMP(Test)(2736821)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('week', DATE(null), DATE(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,26.0,"
-      SELECT FLOOR(((TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - (DAYOFWEEK(FROM_DAYS(FLOOR(NULL) + 693961)) - 1)) - (TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - (DAYOFWEEK(FROM_DAYS(FLOOR(NULL) + 693961)) - 1)))/7) AS `TEMP(Test)(4175150207)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('week', DATETIME(null), DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,30.0,"
-      SELECT FLOOR(((TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - (DAYOFWEEK(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - 1)) - (TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - (DAYOFWEEK(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - 1)))/7) AS `TEMP(Test)(573134401)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('weekday', DATE(null), DATE(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,29.0,"
-      SELECT (TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961))) AS `TEMP(Test)(4284829593)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('weekday', DATETIME(null), DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,30.0,"
-      SELECT (TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) AS `TEMP(Test)(2962792486)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('day', DATETIME(null), DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,31.0,"
-      SELECT (TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) AS `TEMP(Test)(2631483492)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('day', DATE(null), DATE(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,27.0,"
-      SELECT (TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961))) AS `TEMP(Test)(1607049625)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('dayofyear', DATETIME(null), DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,29.0,"
-      SELECT (TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) AS `TEMP(Test)(1299959868)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('dayofyear', DATE(null), DATE(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,28.0,"
-      SELECT (TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961))) AS `TEMP(Test)(1641185958)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('hour', DATETIME(null), DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,30.0,"
-      SELECT ((TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) * 24 + FLOOR(TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) / 3600) - FLOOR(TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) / 3600)) AS `TEMP(Test)(1258940435)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('minute', DATETIME(null), DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,31.0,"
-      SELECT ((TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) * 1440 + FLOOR(TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) / 60) - FLOOR(TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) / 60)) AS `TEMP(Test)(401058515)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datediff.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datediff.sow.nulls.txt,True,0,0,"DATEDIFF('second', DATETIME(null), DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Cast,Aggregation","DATE,DATEDIFF,COUNT",,None,None,32.0,"
-      SELECT ((TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))) * 86400 + (TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - TIME_TO_SEC(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)))) AS `TEMP(Test)(2833809390)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.day.txt,True,0,0,"DATENAME('day', [date2])",expression,Required,Date Filters,DATENAME,,None,None,56.0,"
-      SELECT DAYOFMONTH(`calcs`.`date2`) AS `TEMP(Test)(3471130809)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3471130809)(0)`
-    ","""12""
-""17""
-""19""
-""20""
-""26""
-""27""
-""3""
-""30""
-""4""
-""5""
-""7""
-""8""
-""9""","""12""
-""17""
-""19""
-""20""
-""26""
-""27""
-""3""
-""30""
-""4""
-""5""
-""7""
-""8""
-""9"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.day.txt,True,0,0,"DATENAME('day', [datetime0])",expression,Required,Date Filters,DATENAME,,None,None,33.0,"
-      SELECT DAYOFMONTH(`calcs`.`datetime0`) AS `TEMP(Test)(482138814)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(482138814)(0)`
-    ","""12""
-""14""
-""17""
-""19""
-""2""
-""22""
-""23""
-""25""
-""26""
-""28""
-""31""
-""4""
-""5""
-""9""","""12""
-""14""
-""17""
-""19""
-""2""
-""22""
-""23""
-""25""
-""26""
-""28""
-""31""
-""4""
-""5""
-""9"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.dayofyear.txt,True,0,0,"DATENAME('dayofyear', [date2])",expression,Required,Date Filters,DATENAME,,None,None,38.0,"
-      SELECT DAYOFYEAR(`calcs`.`date2`) AS `TEMP(Test)(1667583030)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1667583030)(0)`
-    ","""110""
-""117""
-""123""
-""150""
-""155""
-""194""
-""208""
-""224""
-""246""
-""253""
-""262""
-""312""
-""35""
-""39""
-""5""
-""76""","""110""
-""117""
-""123""
-""150""
-""155""
-""194""
-""208""
-""224""
-""246""
-""253""
-""262""
-""312""
-""35""
-""39""
-""5""
-""76"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.dayofyear.txt,True,0,0,"DATENAME('dayofyear', [datetime0])",expression,Required,Date Filters,DATENAME,,None,None,35.0,"
-      SELECT DAYOFYEAR(`calcs`.`datetime0`) AS `TEMP(Test)(2537119552)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2537119552)(0)`
-    ","""186""
-""187""
-""191""
-""194""
-""196""
-""199""
-""201""
-""204""
-""205""
-""207""
-""208""
-""210""
-""213""
-""215""","""186""
-""187""
-""191""
-""194""
-""196""
-""199""
-""201""
-""204""
-""205""
-""207""
-""208""
-""210""
-""213""
-""215"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.hour.txt,True,0,0,"DATENAME('hour', [datetime0])",expression,Required,Date Filters,DATENAME,,None,None,31.0,"
-      SELECT HOUR(`calcs`.`datetime0`) AS `TEMP(Test)(3233853797)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3233853797)(0)`
-    ","""0""
-""10""
-""11""
-""12""
-""13""
-""14""
-""15""
-""17""
-""21""
-""22""
-""23""
-""6""
-""7""
-""8""","""0""
-""10""
-""11""
-""12""
-""13""
-""14""
-""15""
-""17""
-""21""
-""22""
-""23""
-""6""
-""7""
-""8"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.minute.txt,True,0,0,"DATENAME('minute', [datetime0])",expression,Required,Date Filters,DATENAME,,None,None,31.0,"
-      SELECT MINUTE(`calcs`.`datetime0`) AS `TEMP(Test)(3325657342)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3325657342)(0)`
-    ","""1""
-""13""
-""14""
-""16""
-""17""
-""21""
-""22""
-""30""
-""34""
-""43""
-""49""
-""54""
-""57""
-""59""","""1""
-""13""
-""14""
-""16""
-""17""
-""21""
-""22""
-""30""
-""34""
-""43""
-""49""
-""54""
-""57""
-""59"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.month.txt,True,4,0,"DATENAME('month', [date2])",expression,Required,Date Filters,DATENAME,,None,None,30.0,"
-      SELECT MONTH(`calcs`.`date2`) AS `TEMP(Test)(477986140)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(477986140)(0)`
-    ","""1""
-""11""
-""2""
-""3""
-""4""
-""5""
-""6""
-""7""
-""8""
-""9""","""1""
-""11""
-""2""
-""3""
-""4""
-""5""
-""6""
-""7""
-""8""
-""9"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.month.txt,True,4,0,"DATENAME('month', [datetime0])",expression,Required,Date Filters,DATENAME,,None,None,33.0,"
-      SELECT MONTH(`calcs`.`datetime0`) AS `TEMP(Test)(2224240773)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2224240773)(0)`
-    ","""7""
-""8""","""7""
-""8"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.quarter.txt,True,0,0,"DATENAME('quarter', [date2])",expression,Required,Date Filters,DATENAME,,None,None,29.0,"
-      SELECT QUARTER(`calcs`.`date2`) AS `TEMP(Test)(653088523)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(653088523)(0)`
-    ","""1""
-""2""
-""3""
-""4""","""1""
-""2""
-""3""
-""4"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.quarter.txt,True,0,0,"DATENAME('quarter', [datetime0])",expression,Required,Date Filters,DATENAME,,None,None,29.0,"
-      SELECT QUARTER(`calcs`.`datetime0`) AS `TEMP(Test)(3134852500)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3134852500)(0)`
-    ","""3""","""3"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.second.txt,True,0,0,"DATENAME('second', [datetime0])",expression,Required,Date Filters,DATENAME,,None,None,33.0,"
-      SELECT SECOND(`calcs`.`datetime0`) AS `TEMP(Test)(1235924899)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1235924899)(0)`
-    ","""0""
-""16""
-""20""
-""22""
-""23""
-""26""
-""28""
-""31""
-""34""
-""35""
-""37""
-""44""
-""50""
-""52""
-""56""","""0""
-""16""
-""20""
-""22""
-""23""
-""26""
-""28""
-""31""
-""34""
-""35""
-""37""
-""44""
-""50""
-""52""
-""56"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.day.txt,True,0,0,"DATENAME('day', [date2], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,31.0,"
-      SELECT DAYOFMONTH(`calcs`.`date2`) AS `TEMP(Test)(1699663235)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1699663235)(0)`
-    ","""12""
-""17""
-""19""
-""20""
-""26""
-""27""
-""3""
-""30""
-""4""
-""5""
-""7""
-""8""
-""9""","""12""
-""17""
-""19""
-""20""
-""26""
-""27""
-""3""
-""30""
-""4""
-""5""
-""7""
-""8""
-""9"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.day.txt,True,0,0,"DATENAME('day', [date2], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,34.0,"
-      SELECT DAYOFMONTH(`calcs`.`date2`) AS `TEMP(Test)(1554256126)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1554256126)(0)`
-    ","""12""
-""17""
-""19""
-""20""
-""26""
-""27""
-""3""
-""30""
-""4""
-""5""
-""7""
-""8""
-""9""","""12""
-""17""
-""19""
-""20""
-""26""
-""27""
-""3""
-""30""
-""4""
-""5""
-""7""
-""8""
-""9"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.day.txt,True,0,0,"DATENAME('day', [datetime0], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,28.0,"
-      SELECT DAYOFMONTH(`calcs`.`datetime0`) AS `TEMP(Test)(2171721785)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2171721785)(0)`
-    ","""12""
-""14""
-""17""
-""19""
-""2""
-""22""
-""23""
-""25""
-""26""
-""28""
-""31""
-""4""
-""5""
-""9""","""12""
-""14""
-""17""
-""19""
-""2""
-""22""
-""23""
-""25""
-""26""
-""28""
-""31""
-""4""
-""5""
-""9"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.day.txt,True,0,0,"DATENAME('day', [datetime0], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,31.0,"
-      SELECT DAYOFMONTH(`calcs`.`datetime0`) AS `TEMP(Test)(3941430330)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3941430330)(0)`
-    ","""12""
-""14""
-""17""
-""19""
-""2""
-""22""
-""23""
-""25""
-""26""
-""28""
-""31""
-""4""
-""5""
-""9""","""12""
-""14""
-""17""
-""19""
-""2""
-""22""
-""23""
-""25""
-""26""
-""28""
-""31""
-""4""
-""5""
-""9"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.dayofyear.txt,True,0,0,"DATENAME('dayofyear', [date2], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,31.0,"
-      SELECT DAYOFYEAR(`calcs`.`date2`) AS `TEMP(Test)(554447598)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(554447598)(0)`
-    ","""110""
-""117""
-""123""
-""150""
-""155""
-""194""
-""208""
-""224""
-""246""
-""253""
-""262""
-""312""
-""35""
-""39""
-""5""
-""76""","""110""
-""117""
-""123""
-""150""
-""155""
-""194""
-""208""
-""224""
-""246""
-""253""
-""262""
-""312""
-""35""
-""39""
-""5""
-""76"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.dayofyear.txt,True,0,0,"DATENAME('dayofyear', [date2], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,29.0,"
-      SELECT DAYOFYEAR(`calcs`.`date2`) AS `TEMP(Test)(2130687817)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2130687817)(0)`
-    ","""110""
-""117""
-""123""
-""150""
-""155""
-""194""
-""208""
-""224""
-""246""
-""253""
-""262""
-""312""
-""35""
-""39""
-""5""
-""76""","""110""
-""117""
-""123""
-""150""
-""155""
-""194""
-""208""
-""224""
-""246""
-""253""
-""262""
-""312""
-""35""
-""39""
-""5""
-""76"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.dayofyear.txt,True,0,0,"DATENAME('dayofyear', [datetime0], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,32.0,"
-      SELECT DAYOFYEAR(`calcs`.`datetime0`) AS `TEMP(Test)(903794974)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(903794974)(0)`
-    ","""186""
-""187""
-""191""
-""194""
-""196""
-""199""
-""201""
-""204""
-""205""
-""207""
-""208""
-""210""
-""213""
-""215""","""186""
-""187""
-""191""
-""194""
-""196""
-""199""
-""201""
-""204""
-""205""
-""207""
-""208""
-""210""
-""213""
-""215"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.dayofyear.txt,True,0,0,"DATENAME('dayofyear', [datetime0], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,29.0,"
-      SELECT DAYOFYEAR(`calcs`.`datetime0`) AS `TEMP(Test)(3917828147)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3917828147)(0)`
-    ","""186""
-""187""
-""191""
-""194""
-""196""
-""199""
-""201""
-""204""
-""205""
-""207""
-""208""
-""210""
-""213""
-""215""","""186""
-""187""
-""191""
-""194""
-""196""
-""199""
-""201""
-""204""
-""205""
-""207""
-""208""
-""210""
-""213""
-""215"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.hour.txt,True,0,0,"DATENAME('hour', [datetime0], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,36.0,"
-      SELECT HOUR(`calcs`.`datetime0`) AS `TEMP(Test)(2997515538)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2997515538)(0)`
-    ","""0""
-""10""
-""11""
-""12""
-""13""
-""14""
-""15""
-""17""
-""21""
-""22""
-""23""
-""6""
-""7""
-""8""","""0""
-""10""
-""11""
-""12""
-""13""
-""14""
-""15""
-""17""
-""21""
-""22""
-""23""
-""6""
-""7""
-""8"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.hour.txt,True,0,0,"DATENAME('hour', [datetime0], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,33.0,"
-      SELECT HOUR(`calcs`.`datetime0`) AS `TEMP(Test)(4264664103)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4264664103)(0)`
-    ","""0""
-""10""
-""11""
-""12""
-""13""
-""14""
-""15""
-""17""
-""21""
-""22""
-""23""
-""6""
-""7""
-""8""","""0""
-""10""
-""11""
-""12""
-""13""
-""14""
-""15""
-""17""
-""21""
-""22""
-""23""
-""6""
-""7""
-""8"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.minute.txt,True,0,0,"DATENAME('minute', [datetime0], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,31.0,"
-      SELECT MINUTE(`calcs`.`datetime0`) AS `TEMP(Test)(1695139533)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1695139533)(0)`
-    ","""1""
-""13""
-""14""
-""16""
-""17""
-""21""
-""22""
-""30""
-""34""
-""43""
-""49""
-""54""
-""57""
-""59""","""1""
-""13""
-""14""
-""16""
-""17""
-""21""
-""22""
-""30""
-""34""
-""43""
-""49""
-""54""
-""57""
-""59"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.minute.txt,True,0,0,"DATENAME('minute', [datetime0], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,35.0,"
-      SELECT MINUTE(`calcs`.`datetime0`) AS `TEMP(Test)(1003104432)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1003104432)(0)`
-    ","""1""
-""13""
-""14""
-""16""
-""17""
-""21""
-""22""
-""30""
-""34""
-""43""
-""49""
-""54""
-""57""
-""59""","""1""
-""13""
-""14""
-""16""
-""17""
-""21""
-""22""
-""30""
-""34""
-""43""
-""49""
-""54""
-""57""
-""59"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.month.txt,True,4,0,"DATENAME('month', [date2], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,31.0,"
-      SELECT MONTH(`calcs`.`date2`) AS `TEMP(Test)(1660803953)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1660803953)(0)`
-    ","""1""
-""11""
-""2""
-""3""
-""4""
-""5""
-""6""
-""7""
-""8""
-""9""","""1""
-""11""
-""2""
-""3""
-""4""
-""5""
-""6""
-""7""
-""8""
-""9"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.month.txt,True,4,0,"DATENAME('month', [date2], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,29.0,"
-      SELECT MONTH(`calcs`.`date2`) AS `TEMP(Test)(872696424)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(872696424)(0)`
-    ","""1""
-""11""
-""2""
-""3""
-""4""
-""5""
-""6""
-""7""
-""8""
-""9""","""1""
-""11""
-""2""
-""3""
-""4""
-""5""
-""6""
-""7""
-""8""
-""9"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.month.txt,True,4,0,"DATENAME('month', [datetime0], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,27.0,"
-      SELECT MONTH(`calcs`.`datetime0`) AS `TEMP(Test)(732183378)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(732183378)(0)`
-    ","""7""
-""8""","""7""
-""8"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.month.txt,True,4,0,"DATENAME('month', [datetime0], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,27.0,"
-      SELECT MONTH(`calcs`.`datetime0`) AS `TEMP(Test)(3816689092)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3816689092)(0)`
-    ","""7""
-""8""","""7""
-""8"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.quarter.txt,True,0,0,"DATENAME('quarter', [date2], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,29.0,"
-      SELECT QUARTER(`calcs`.`date2`) AS `TEMP(Test)(2643375604)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2643375604)(0)`
-    ","""1""
-""2""
-""3""
-""4""","""1""
-""2""
-""3""
-""4"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.quarter.txt,True,0,0,"DATENAME('quarter', [date2], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,28.0,"
-      SELECT QUARTER(`calcs`.`date2`) AS `TEMP(Test)(2986242609)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2986242609)(0)`
-    ","""1""
-""2""
-""3""
-""4""","""1""
-""2""
-""3""
-""4"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.quarter.txt,True,0,0,"DATENAME('quarter', [datetime0], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,27.0,"
-      SELECT QUARTER(`calcs`.`datetime0`) AS `TEMP(Test)(1608337423)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1608337423)(0)`
-    ","""3""","""3"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.quarter.txt,True,0,0,"DATENAME('quarter', [datetime0], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,30.0,"
-      SELECT QUARTER(`calcs`.`datetime0`) AS `TEMP(Test)(925465559)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(925465559)(0)`
-    ","""3""","""3"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.second.txt,True,0,0,"DATENAME('second', [datetime0], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,27.0,"
-      SELECT SECOND(`calcs`.`datetime0`) AS `TEMP(Test)(2740605400)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2740605400)(0)`
-    ","""0""
-""16""
-""20""
-""22""
-""23""
-""26""
-""28""
-""31""
-""34""
-""35""
-""37""
-""44""
-""50""
-""52""
-""56""","""0""
-""16""
-""20""
-""22""
-""23""
-""26""
-""28""
-""31""
-""34""
-""35""
-""37""
-""44""
-""50""
-""52""
-""56"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.second.txt,True,0,0,"DATENAME('second', [datetime0], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,28.0,"
-      SELECT SECOND(`calcs`.`datetime0`) AS `TEMP(Test)(356589430)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(356589430)(0)`
-    ","""0""
-""16""
-""20""
-""22""
-""23""
-""26""
-""28""
-""31""
-""34""
-""35""
-""37""
-""44""
-""50""
-""52""
-""56""","""0""
-""16""
-""20""
-""22""
-""23""
-""26""
-""28""
-""31""
-""34""
-""35""
-""37""
-""44""
-""50""
-""52""
-""56"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.week.txt,True,0,0,"DATENAME('week', [date2], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,28.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`date2`) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(`calcs`.`date2`, '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(499182808)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(499182808)(0)`
-    ","""11""
-""17""
-""18""
-""2""
-""22""
-""23""
-""29""
-""30""
-""33""
-""36""
-""37""
-""38""
-""45""
-""5""
-""7""","""11""
-""17""
-""18""
-""2""
-""22""
-""23""
-""29""
-""30""
-""33""
-""36""
-""37""
-""38""
-""45""
-""5""
-""7"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.week.txt,True,0,0,"DATENAME('week', [date2], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,26.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`date2`) - 1 + DAYOFWEEK(DATE_FORMAT(`calcs`.`date2`, '%Y-01-01 00:00:00')) - 1) / 7) AS `TEMP(Test)(2644944117)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2644944117)(0)`
-    ","""12""
-""17""
-""18""
-""2""
-""22""
-""23""
-""29""
-""30""
-""33""
-""36""
-""37""
-""38""
-""45""
-""6""
-""7""","""12""
-""17""
-""18""
-""2""
-""22""
-""23""
-""29""
-""30""
-""33""
-""36""
-""37""
-""38""
-""45""
-""6""
-""7"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.week.txt,True,0,0,"DATENAME('week', [datetime0], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,30.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`datetime0`) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(`calcs`.`datetime0`, '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(3094931040)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3094931040)(0)`
-    ","""27""
-""28""
-""29""
-""30""
-""31""
-""32""","""27""
-""28""
-""29""
-""30""
-""31""
-""32"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.week.txt,True,0,0,"DATENAME('week', [datetime0], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,30.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`datetime0`) - 1 + DAYOFWEEK(DATE_FORMAT(`calcs`.`datetime0`, '%Y-01-01 00:00:00')) - 1) / 7) AS `TEMP(Test)(2831690081)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2831690081)(0)`
-    ","""28""
-""29""
-""30""
-""31""
-""32""","""28""
-""29""
-""30""
-""31""
-""32"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.weekday.txt,True,0,0,"DATENAME('weekday', [date2], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,42.0,"
-      SELECT DAYNAME(`calcs`.`date2`) AS `TEMP(Test)(1706489238)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1706489238)(0)`
-    ","""Friday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Tuesday""
-""Wednesday""","""Friday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Tuesday""
-""Wednesday"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.weekday.txt,True,0,0,"DATENAME('weekday', [date2], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,32.0,"
-      SELECT DAYNAME(`calcs`.`date2`) AS `TEMP(Test)(3326454598)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3326454598)(0)`
-    ","""Friday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Tuesday""
-""Wednesday""","""Friday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Tuesday""
-""Wednesday"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.weekday.txt,True,0,0,"DATENAME('weekday', [datetime0], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,30.0,"
-      SELECT DAYNAME(`calcs`.`datetime0`) AS `TEMP(Test)(1346443059)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1346443059)(0)`
-    ","""Friday""
-""Monday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Wednesday""","""Friday""
-""Monday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Wednesday"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.weekday.txt,True,0,0,"DATENAME('weekday', [datetime0], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,27.0,"
-      SELECT DAYNAME(`calcs`.`datetime0`) AS `TEMP(Test)(2366796649)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2366796649)(0)`
-    ","""Friday""
-""Monday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Wednesday""","""Friday""
-""Monday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Wednesday"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.year.txt,True,0,0,"DATENAME('year', [date2], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,35.0,"
-      SELECT YEAR(`calcs`.`date2`) AS `TEMP(Test)(1876737518)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1876737518)(0)`
-    ","""1972""
-""1974""
-""1976""
-""1977""
-""1980""
-""1988""
-""1994""
-""1995""
-""1997""
-""1998""
-""2001""
-""2002""","""1972""
-""1974""
-""1976""
-""1977""
-""1980""
-""1988""
-""1994""
-""1995""
-""1997""
-""1998""
-""2001""
-""2002"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.year.txt,True,0,0,"DATENAME('year', [date2], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,28.0,"
-      SELECT YEAR(`calcs`.`date2`) AS `TEMP(Test)(1437280163)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1437280163)(0)`
-    ","""1972""
-""1974""
-""1976""
-""1977""
-""1980""
-""1988""
-""1994""
-""1995""
-""1997""
-""1998""
-""2001""
-""2002""","""1972""
-""1974""
-""1976""
-""1977""
-""1980""
-""1988""
-""1994""
-""1995""
-""1997""
-""1998""
-""2001""
-""2002"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.year.txt,True,0,0,"DATENAME('year', [datetime0], 'monday')",expression,Required,Date Filters,DATENAME,,None,None,26.0,"
-      SELECT YEAR(`calcs`.`datetime0`) AS `TEMP(Test)(3178513645)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3178513645)(0)`
-    ","""2004""","""2004"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.year.txt,True,0,0,"DATENAME('year', [datetime0], 'sunday')",expression,Required,Date Filters,DATENAME,,None,None,31.0,"
-      SELECT YEAR(`calcs`.`datetime0`) AS `TEMP(Test)(3727444777)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3727444777)(0)`
-    ","""2004""","""2004"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.week.txt,False,0,2,"DATENAME('week', [date2])",expression,Required,Date Filters,DATENAME,,Actual does not match expected.,Actual does not match expected.,29.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`date2`) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(`calcs`.`date2`, '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(2524080111)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2524080111)(0)`
-    ","""11""
-""17""
-""18""
-""2""
-""22""
-""23""
-""29""
-""30""
-""33""
-""36""
-""37""
-""38""
-""45""
-""5""
-""7""","""12""
-""17""
-""18""
-""2""
-""22""
-""23""
-""29""
-""30""
-""33""
-""36""
-""37""
-""38""
-""45""
-""6""
-""7"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.week.txt,False,0,6,"DATENAME('week', [datetime0])",expression,Required,Date Filters,DATENAME,,Actual does not match expected.,Actual does not match expected.,33.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`datetime0`) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(`calcs`.`datetime0`, '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(1568799041)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1568799041)(0)`
-    ","""27""
-""28""
-""29""
-""30""
-""31""
-""32""","""28""
-""29""
-""30""
-""31""
-""32"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.weekday.txt,True,0,0,"DATENAME('weekday', [date2])",expression,Required,Date Filters,DATENAME,,None,None,29.0,"
-      SELECT DAYNAME(`calcs`.`date2`) AS `TEMP(Test)(4107590482)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4107590482)(0)`
-    ","""Friday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Tuesday""
-""Wednesday""","""Friday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Tuesday""
-""Wednesday"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.weekday.txt,True,0,0,"DATENAME('weekday', [datetime0])",expression,Required,Date Filters,DATENAME,,None,None,28.0,"
-      SELECT DAYNAME(`calcs`.`datetime0`) AS `TEMP(Test)(766794695)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(766794695)(0)`
-    ","""Friday""
-""Monday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Wednesday""","""Friday""
-""Monday""
-""Saturday""
-""Sunday""
-""Thursday""
-""Wednesday"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.year.txt,True,0,0,"DATENAME('year', [date2])",expression,Required,Date Filters,DATENAME,,None,None,32.0,"
-      SELECT YEAR(`calcs`.`date2`) AS `TEMP(Test)(3529528921)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3529528921)(0)`
-    ","""1972""
-""1974""
-""1976""
-""1977""
-""1980""
-""1988""
-""1994""
-""1995""
-""1997""
-""1998""
-""2001""
-""2002""","""1972""
-""1974""
-""1976""
-""1977""
-""1980""
-""1988""
-""1994""
-""1995""
-""1997""
-""1998""
-""2001""
-""2002"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.year.txt,True,0,0,"DATENAME('year', [datetime0])",expression,Required,Date Filters,DATENAME,,None,None,27.0,"
-      SELECT YEAR(`calcs`.`datetime0`) AS `TEMP(Test)(1066073186)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1066073186)(0)`
-    ","""2004""","""2004"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('year', DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT YEAR(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(3057229987)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('year', DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,31.0,"
-      SELECT YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(4063654893)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('quarter', DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,30.0,"
-      SELECT QUARTER(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(2102858309)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('quarter', DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT QUARTER(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3270121971)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('month', DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT MONTH(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(2692233594)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('month', DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT MONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(1772891037)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('week', DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,33.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(FROM_DAYS(FLOOR(NULL) + 693961)) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(FROM_DAYS(FLOOR(NULL) + 693961), '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(3926284460)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('week', DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,35.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(1415178918)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('weekday', DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,30.0,"
-      SELECT DAYNAME(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(3608467423)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('weekday', DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,28.0,"
-      SELECT DAYNAME(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(2920782836)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('day', DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,34.0,"
-      SELECT DAYOFMONTH(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(3132873078)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('day', DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,30.0,"
-      SELECT DAYOFMONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(2450943592)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('dayofyear', DATE(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT DAYOFYEAR(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(3530921297)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('dayofyear', DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,35.0,"
-      SELECT DAYOFYEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(304383277)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('hour', DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,30.0,"
-      SELECT HOUR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3871589708)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('minute', DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,30.0,"
-      SELECT MINUTE(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(2462406212)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.nulls.txt,True,0,0,"DATENAME('second', DATETIME(null))",expression,Required If Supported,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT SECOND(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3443263072)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('year', DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(2699142763)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('year', DATE(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,31.0,"
-      SELECT YEAR(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(1634134069)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('quarter', DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,27.0,"
-      SELECT QUARTER(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(1949844743)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('quarter', DATE(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,28.0,"
-      SELECT QUARTER(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(3376136658)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('month', DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT MONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3672267408)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('month', DATE(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,28.0,"
-      SELECT MONTH(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(2406708804)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('week', DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,28.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - 1 + DAYOFWEEK(DATE_FORMAT(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-01-01 00:00:00')) - 1) / 7) AS `TEMP(Test)(1073594909)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('week', DATE(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,28.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(FROM_DAYS(FLOOR(NULL) + 693961)) - 1 + DAYOFWEEK(DATE_FORMAT(FROM_DAYS(FLOOR(NULL) + 693961), '%Y-01-01 00:00:00')) - 1) / 7) AS `TEMP(Test)(4016689999)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('weekday', DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,30.0,"
-      SELECT DAYNAME(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3405047399)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('weekday', DATE(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,27.0,"
-      SELECT DAYNAME(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(55506858)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('dayofyear', DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,28.0,"
-      SELECT DAYOFYEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3460070750)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('dayofyear', DATE(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,33.0,"
-      SELECT DAYOFYEAR(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(1494289478)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('day', DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT DAYOFMONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3227046355)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('day', DATE(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT DAYOFMONTH(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(1233941598)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('hour', DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,32.0,"
-      SELECT HOUR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3874232094)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('minute', DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT MINUTE(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(1546814749)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datename.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datename.sow.nulls.txt,True,0,0,"DATENAME('second', DATETIME(null), 'sunday')",expression,Recommended,"Date Filters,Aggregation,Cast","COUNT,DATENAME,DATE",,None,None,29.0,"
-      SELECT SECOND(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3692431276)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.day.txt,True,0,0,"DATEPART('day', [date2])",expression,Required,Date Filters,DATEPART,,None,None,45.0,"
-      SELECT DAYOFMONTH(`calcs`.`date2`) AS `TEMP(Test)(3076245501)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3076245501)(0)`
-    ","3
-4
-5
-7
-8
-9
-12
-17
-19
-20
-26
-27
-30","3
-4
-5
-7
-8
-9
-12
-17
-19
-20
-26
-27
-30"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.day.txt,True,0,0,"DATEPART('day', [datetime0])",expression,Required,Date Filters,DATEPART,,None,None,34.0,"
-      SELECT DAYOFMONTH(`calcs`.`datetime0`) AS `TEMP(Test)(148436784)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(148436784)(0)`
-    ","2
-4
-5
-9
-12
-14
-17
-19
-22
-23
-25
-26
-28
-31","2
-4
-5
-9
-12
-14
-17
-19
-22
-23
-25
-26
-28
-31"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.dayofyear.txt,True,0,0,"DATEPART('dayofyear', [date2])",expression,Required,Date Filters,DATEPART,,None,None,49.0,"
-      SELECT DAYOFYEAR(`calcs`.`date2`) AS `TEMP(Test)(877816921)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(877816921)(0)`
-    ","5
-35
-39
-76
-110
-117
-123
-150
-155
-194
-208
-224
-246
-253
-262
-312","5
-35
-39
-76
-110
-117
-123
-150
-155
-194
-208
-224
-246
-253
-262
-312"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.dayofyear.txt,True,0,0,"DATEPART('dayofyear', [datetime0])",expression,Required,Date Filters,DATEPART,,None,None,35.0,"
-      SELECT DAYOFYEAR(`calcs`.`datetime0`) AS `TEMP(Test)(707037378)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(707037378)(0)`
-    ","186
-187
-191
-194
-196
-199
-201
-204
-205
-207
-208
-210
-213
-215","186
-187
-191
-194
-196
-199
-201
-204
-205
-207
-208
-210
-213
-215"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.hour.txt,True,0,0,"DATEPART('hour', [datetime0])",expression,Required,Date Filters,DATEPART,,None,None,45.0,"
-      SELECT HOUR(`calcs`.`datetime0`) AS `TEMP(Test)(1298877827)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1298877827)(0)`
-    ","0
-6
-7
-8
-10
-11
-12
-13
-14
-15
-17
-21
-22
-23","0
-6
-7
-8
-10
-11
-12
-13
-14
-15
-17
-21
-22
-23"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.minute.txt,True,0,0,"DATEPART('minute', [datetime0])",expression,Required,Date Filters,DATEPART,,None,None,41.0,"
-      SELECT MINUTE(`calcs`.`datetime0`) AS `TEMP(Test)(1256004566)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1256004566)(0)`
-    ","1
-13
-14
-16
-17
-21
-22
-30
-34
-43
-49
-54
-57
-59","1
-13
-14
-16
-17
-21
-22
-30
-34
-43
-49
-54
-57
-59"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.month.txt,True,0,0,"DATEPART('month', [date2])",expression,Required,Date Filters,DATEPART,,None,None,44.0,"
-      SELECT MONTH(`calcs`.`date2`) AS `TEMP(Test)(2634030884)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2634030884)(0)`
-    ","1
-2
-3
-4
-5
-6
-7
-8
-9
-11","1
-2
-3
-4
-5
-6
-7
-8
-9
-11"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.month.txt,True,0,0,"DATEPART('month', [datetime0])",expression,Required,Date Filters,DATEPART,,None,None,32.0,"
-      SELECT MONTH(`calcs`.`datetime0`) AS `TEMP(Test)(4000895377)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4000895377)(0)`
-    ","7
-8","7
-8"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.quarter.txt,True,0,0,"DATEPART('quarter', [date2])",expression,Required,Date Filters,DATEPART,,None,None,41.0,"
-      SELECT QUARTER(`calcs`.`date2`) AS `TEMP(Test)(302607578)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(302607578)(0)`
-    ","1
-2
-3
-4","1
-2
-3
-4"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.quarter.txt,True,0,0,"DATEPART('quarter', [datetime0])",expression,Required,Date Filters,DATEPART,,None,None,32.0,"
-      SELECT QUARTER(`calcs`.`datetime0`) AS `TEMP(Test)(2001673842)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2001673842)(0)`
-    ",3,3
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.second.txt,True,0,0,"DATEPART('second', [datetime0])",expression,Required,Date Filters,DATEPART,,None,None,41.0,"
-      SELECT SECOND(`calcs`.`datetime0`) AS `TEMP(Test)(3191651815)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3191651815)(0)`
-    ","0
-16
-20
-22
-23
-26
-28
-31
-34
-35
-37
-44
-50
-52
-56","0
-16
-20
-22
-23
-26
-28
-31
-34
-35
-37
-44
-50
-52
-56"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.day.txt,True,0,0,"DATEPART('day', [date2], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,35.0,"
-      SELECT DAYOFMONTH(`calcs`.`date2`) AS `TEMP(Test)(1438827077)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1438827077)(0)`
-    ","3
-4
-5
-7
-8
-9
-12
-17
-19
-20
-26
-27
-30","3
-4
-5
-7
-8
-9
-12
-17
-19
-20
-26
-27
-30"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.day.txt,True,0,0,"DATEPART('day', [date2], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,31.0,"
-      SELECT DAYOFMONTH(`calcs`.`date2`) AS `TEMP(Test)(331799714)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(331799714)(0)`
-    ","3
-4
-5
-7
-8
-9
-12
-17
-19
-20
-26
-27
-30","3
-4
-5
-7
-8
-9
-12
-17
-19
-20
-26
-27
-30"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.day.txt,True,0,0,"DATEPART('day', [datetime0], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,30.0,"
-      SELECT DAYOFMONTH(`calcs`.`datetime0`) AS `TEMP(Test)(3561169943)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3561169943)(0)`
-    ","2
-4
-5
-9
-12
-14
-17
-19
-22
-23
-25
-26
-28
-31","2
-4
-5
-9
-12
-14
-17
-19
-22
-23
-25
-26
-28
-31"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.day.txt,True,0,0,"DATEPART('day', [datetime0], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,29.0,"
-      SELECT DAYOFMONTH(`calcs`.`datetime0`) AS `TEMP(Test)(2283476857)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2283476857)(0)`
-    ","2
-4
-5
-9
-12
-14
-17
-19
-22
-23
-25
-26
-28
-31","2
-4
-5
-9
-12
-14
-17
-19
-22
-23
-25
-26
-28
-31"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.dayofyear.txt,True,0,0,"DATEPART('dayofyear', [date2], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,39.0,"
-      SELECT DAYOFYEAR(`calcs`.`date2`) AS `TEMP(Test)(3386714330)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3386714330)(0)`
-    ","5
-35
-39
-76
-110
-117
-123
-150
-155
-194
-208
-224
-246
-253
-262
-312","5
-35
-39
-76
-110
-117
-123
-150
-155
-194
-208
-224
-246
-253
-262
-312"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.dayofyear.txt,True,0,0,"DATEPART('dayofyear', [date2], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,30.0,"
-      SELECT DAYOFYEAR(`calcs`.`date2`) AS `TEMP(Test)(1554877814)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1554877814)(0)`
-    ","5
-35
-39
-76
-110
-117
-123
-150
-155
-194
-208
-224
-246
-253
-262
-312","5
-35
-39
-76
-110
-117
-123
-150
-155
-194
-208
-224
-246
-253
-262
-312"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.dayofyear.txt,True,0,0,"DATEPART('dayofyear', [datetime0], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,28.0,"
-      SELECT DAYOFYEAR(`calcs`.`datetime0`) AS `TEMP(Test)(680392169)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(680392169)(0)`
-    ","186
-187
-191
-194
-196
-199
-201
-204
-205
-207
-208
-210
-213
-215","186
-187
-191
-194
-196
-199
-201
-204
-205
-207
-208
-210
-213
-215"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.dayofyear.txt,True,0,0,"DATEPART('dayofyear', [datetime0], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,32.0,"
-      SELECT DAYOFYEAR(`calcs`.`datetime0`) AS `TEMP(Test)(792760981)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(792760981)(0)`
-    ","186
-187
-191
-194
-196
-199
-201
-204
-205
-207
-208
-210
-213
-215","186
-187
-191
-194
-196
-199
-201
-204
-205
-207
-208
-210
-213
-215"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.hour.txt,True,0,0,"DATEPART('hour', [datetime0], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,35.0,"
-      SELECT HOUR(`calcs`.`datetime0`) AS `TEMP(Test)(367110610)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(367110610)(0)`
-    ","0
-6
-7
-8
-10
-11
-12
-13
-14
-15
-17
-21
-22
-23","0
-6
-7
-8
-10
-11
-12
-13
-14
-15
-17
-21
-22
-23"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.hour.txt,True,0,0,"DATEPART('hour', [datetime0], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,30.0,"
-      SELECT HOUR(`calcs`.`datetime0`) AS `TEMP(Test)(1785761163)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1785761163)(0)`
-    ","0
-6
-7
-8
-10
-11
-12
-13
-14
-15
-17
-21
-22
-23","0
-6
-7
-8
-10
-11
-12
-13
-14
-15
-17
-21
-22
-23"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.minute.txt,True,0,0,"DATEPART('minute', [datetime0], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,37.0,"
-      SELECT MINUTE(`calcs`.`datetime0`) AS `TEMP(Test)(232803726)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(232803726)(0)`
-    ","1
-13
-14
-16
-17
-21
-22
-30
-34
-43
-49
-54
-57
-59","1
-13
-14
-16
-17
-21
-22
-30
-34
-43
-49
-54
-57
-59"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.minute.txt,True,0,0,"DATEPART('minute', [datetime0], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,29.0,"
-      SELECT MINUTE(`calcs`.`datetime0`) AS `TEMP(Test)(2176505489)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2176505489)(0)`
-    ","1
-13
-14
-16
-17
-21
-22
-30
-34
-43
-49
-54
-57
-59","1
-13
-14
-16
-17
-21
-22
-30
-34
-43
-49
-54
-57
-59"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.month.txt,True,0,0,"DATEPART('month', [date2], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,35.0,"
-      SELECT MONTH(`calcs`.`date2`) AS `TEMP(Test)(1671202742)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1671202742)(0)`
-    ","1
-2
-3
-4
-5
-6
-7
-8
-9
-11","1
-2
-3
-4
-5
-6
-7
-8
-9
-11"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.month.txt,True,0,0,"DATEPART('month', [date2], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,29.0,"
-      SELECT MONTH(`calcs`.`date2`) AS `TEMP(Test)(536615588)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(536615588)(0)`
-    ","1
-2
-3
-4
-5
-6
-7
-8
-9
-11","1
-2
-3
-4
-5
-6
-7
-8
-9
-11"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.month.txt,True,0,0,"DATEPART('month', [datetime0], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,28.0,"
-      SELECT MONTH(`calcs`.`datetime0`) AS `TEMP(Test)(1933085624)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1933085624)(0)`
-    ","7
-8","7
-8"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.month.txt,True,0,0,"DATEPART('month', [datetime0], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,29.0,"
-      SELECT MONTH(`calcs`.`datetime0`) AS `TEMP(Test)(2986113344)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2986113344)(0)`
-    ","7
-8","7
-8"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.quarter.txt,True,0,0,"DATEPART('quarter', [date2], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,38.0,"
-      SELECT QUARTER(`calcs`.`date2`) AS `TEMP(Test)(3044284514)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3044284514)(0)`
-    ","1
-2
-3
-4","1
-2
-3
-4"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.quarter.txt,True,0,0,"DATEPART('quarter', [date2], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,29.0,"
-      SELECT QUARTER(`calcs`.`date2`) AS `TEMP(Test)(2383411022)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2383411022)(0)`
-    ","1
-2
-3
-4","1
-2
-3
-4"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.quarter.txt,True,0,0,"DATEPART('quarter', [datetime0], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,28.0,"
-      SELECT QUARTER(`calcs`.`datetime0`) AS `TEMP(Test)(3392256124)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3392256124)(0)`
-    ",3,3
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.quarter.txt,True,0,0,"DATEPART('quarter', [datetime0], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,28.0,"
-      SELECT QUARTER(`calcs`.`datetime0`) AS `TEMP(Test)(1426463696)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1426463696)(0)`
-    ",3,3
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.second.txt,True,0,0,"DATEPART('second', DATETIME([datetime0]), 'monday')",expression,Required,Date Filters,DATEPART,,None,None,39.0,"
-      SELECT SECOND(TIMESTAMP(`calcs`.`datetime0`)) AS `TEMP(Test)(1770279206)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1770279206)(0)`
-    ","0
-16
-20
-22
-23
-26
-28
-31
-34
-35
-37
-44
-50
-52
-56","0
-16
-20
-22
-23
-26
-28
-31
-34
-35
-37
-44
-50
-52
-56"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.second.txt,True,0,0,"DATEPART('second', DATETIME([datetime0]), 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,28.0,"
-      SELECT SECOND(TIMESTAMP(`calcs`.`datetime0`)) AS `TEMP(Test)(4279914489)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4279914489)(0)`
-    ","0
-16
-20
-22
-23
-26
-28
-31
-34
-35
-37
-44
-50
-52
-56","0
-16
-20
-22
-23
-26
-28
-31
-34
-35
-37
-44
-50
-52
-56"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.week.txt,True,0,0,"DATEPART('week', [date2], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,53.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`date2`) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(`calcs`.`date2`, '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(3400925592)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3400925592)(0)`
-    ","2
-5
-7
-11
-17
-18
-22
-23
-29
-30
-33
-36
-37
-38
-45","2
-5
-7
-11
-17
-18
-22
-23
-29
-30
-33
-36
-37
-38
-45"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.week.txt,True,0,0,"DATEPART('week', [date2], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,32.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`date2`) - 1 + DAYOFWEEK(DATE_FORMAT(`calcs`.`date2`, '%Y-01-01 00:00:00')) - 1) / 7) AS `TEMP(Test)(1636919423)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1636919423)(0)`
-    ","2
-6
-7
-12
-17
-18
-22
-23
-29
-30
-33
-36
-37
-38
-45","2
-6
-7
-12
-17
-18
-22
-23
-29
-30
-33
-36
-37
-38
-45"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.week.txt,True,0,0,"DATEPART('week', [datetime0], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,29.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`datetime0`) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(`calcs`.`datetime0`, '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(3595934100)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3595934100)(0)`
-    ","27
-28
-29
-30
-31
-32","27
-28
-29
-30
-31
-32"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.week.txt,True,0,0,"DATEPART('week', [datetime0], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,35.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`datetime0`) - 1 + DAYOFWEEK(DATE_FORMAT(`calcs`.`datetime0`, '%Y-01-01 00:00:00')) - 1) / 7) AS `TEMP(Test)(4171408365)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4171408365)(0)`
-    ","28
-29
-30
-31
-32","28
-29
-30
-31
-32"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.weekday.txt,True,0,0,"DATEPART('weekday', [date2], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,36.0,"
-      SELECT DAYOFWEEK(`calcs`.`date2`) AS `TEMP(Test)(3641022413)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3641022413)(0)`
-    ","1
-3
-4
-5
-6
-7","1
-3
-4
-5
-6
-7"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.weekday.txt,True,0,0,"DATEPART('weekday', [date2], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,28.0,"
-      SELECT DAYOFWEEK(`calcs`.`date2`) AS `TEMP(Test)(1193998601)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1193998601)(0)`
-    ","1
-3
-4
-5
-6
-7","1
-3
-4
-5
-6
-7"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.weekday.txt,True,0,0,"DATEPART('weekday', [datetime0], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,25.0,"
-      SELECT DAYOFWEEK(`calcs`.`datetime0`) AS `TEMP(Test)(3800988289)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3800988289)(0)`
-    ","1
-2
-4
-5
-6
-7","1
-2
-4
-5
-6
-7"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.weekday.txt,True,0,0,"DATEPART('weekday', [datetime0], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,27.0,"
-      SELECT DAYOFWEEK(`calcs`.`datetime0`) AS `TEMP(Test)(779479971)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(779479971)(0)`
-    ","1
-2
-4
-5
-6
-7","1
-2
-4
-5
-6
-7"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.year.txt,True,0,0,"DATEPART('year', [date2], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,42.0,"
-      SELECT YEAR(`calcs`.`date2`) AS `TEMP(Test)(840463993)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(840463993)(0)`
-    ","1972
-1974
-1976
-1977
-1980
-1988
-1994
-1995
-1997
-1998
-2001
-2002","1972
-1974
-1976
-1977
-1980
-1988
-1994
-1995
-1997
-1998
-2001
-2002"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.year.txt,True,0,0,"DATEPART('year', [date2], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,27.0,"
-      SELECT YEAR(`calcs`.`date2`) AS `TEMP(Test)(1720545932)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1720545932)(0)`
-    ","1972
-1974
-1976
-1977
-1980
-1988
-1994
-1995
-1997
-1998
-2001
-2002","1972
-1974
-1976
-1977
-1980
-1988
-1994
-1995
-1997
-1998
-2001
-2002"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.year.txt,True,0,0,"DATEPART('year', [datetime0], 'monday')",expression,Required,Date Filters,DATEPART,,None,None,30.0,"
-      SELECT YEAR(`calcs`.`datetime0`) AS `TEMP(Test)(2707942807)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2707942807)(0)`
-    ",2004,2004
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.year.txt,True,0,0,"DATEPART('year', [datetime0], 'sunday')",expression,Required,Date Filters,DATEPART,,None,None,29.0,"
-      SELECT YEAR(`calcs`.`datetime0`) AS `TEMP(Test)(3474280307)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3474280307)(0)`
-    ",2004,2004
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.weekday.txt,True,0,0,"DATEPART('weekday', [date2])",expression,Required,Date Filters,DATEPART,,None,None,34.0,"
-      SELECT DAYOFWEEK(`calcs`.`date2`) AS `TEMP(Test)(3854194266)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3854194266)(0)`
-    ","1
-3
-4
-5
-6
-7","1
-3
-4
-5
-6
-7"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.weekday.txt,True,0,0,"DATEPART('weekday', [datetime0])",expression,Required,Date Filters,DATEPART,,None,None,30.0,"
-      SELECT DAYOFWEEK(`calcs`.`datetime0`) AS `TEMP(Test)(621889678)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(621889678)(0)`
-    ","1
-2
-4
-5
-6
-7","1
-2
-4
-5
-6
-7"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.year.txt,True,0,0,"DATEPART('year', [date2])",expression,Required,Date Filters,DATEPART,,None,None,34.0,"
-      SELECT YEAR(`calcs`.`date2`) AS `TEMP(Test)(3969685894)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3969685894)(0)`
-    ","1972
-1974
-1976
-1977
-1980
-1988
-1994
-1995
-1997
-1998
-2001
-2002","1972
-1974
-1976
-1977
-1980
-1988
-1994
-1995
-1997
-1998
-2001
-2002"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.year.txt,True,0,0,"DATEPART('year', [datetime0])",expression,Required,Date Filters,DATEPART,,None,None,33.0,"
-      SELECT YEAR(`calcs`.`datetime0`) AS `TEMP(Test)(4179095987)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4179095987)(0)`
-    ",2004,2004
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.second.ms,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.second.ms.txt,True,0,0,"DATEPART('second', DATETIME('2010-10-10 10:10:10.4'))",expression,Required,"Date Filters,Aggregation","COUNT,DATEPART",,None,None,37.0,"
-      SELECT SECOND(CAST('2010-10-10 10:10:10.4' AS TIMESTAMP)) AS `TEMP(Test)(2143701310)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",10,10
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.week.txt,False,0,2,"DATEPART('week', [date2])",expression,Required,"Cast,Date Filters","DATE,DATEPART",,Actual does not match expected.,Actual does not match expected.,35.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`date2`) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(`calcs`.`date2`, '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(3370976929)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3370976929)(0)`
-    ","2
-5
-7
-11
-17
-18
-22
-23
-29
-30
-33
-36
-37
-38
-45","2
-6
-7
-12
-17
-18
-22
-23
-29
-30
-33
-36
-37
-38
-45"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.week.txt,False,0,3,"DATEPART('week', DATE([date3]))",expression,Required,"Cast,Date Filters","DATE,DATEPART",,Actual does not match expected.,Actual does not match expected.,39.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(DATE(`calcs`.`date3`)) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(DATE(`calcs`.`date3`), '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(2942029924)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2942029924)(0)`
-    ","%null%
-3
-5
-10
-12
-13
-20
-21
-34
-45","%null%
-3
-6
-10
-12
-14
-20
-22
-34
-45"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.week.txt,False,0,6,"DATEPART('week', [datetime0])",expression,Required,"Cast,Date Filters","DATE,DATEPART",,Actual does not match expected.,Actual does not match expected.,28.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(`calcs`.`datetime0`) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(`calcs`.`datetime0`, '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(3904538922)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3904538922)(0)`
-    ","27
-28
-29
-30
-31
-32","28
-29
-30
-31
-32"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('year', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,38.0,"
-      SELECT YEAR(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(2074921570)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('year', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,34.0,"
-      SELECT YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(2348327946)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('quarter', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,37.0,"
-      SELECT QUARTER(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(3062347157)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('quarter', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,33.0,"
-      SELECT QUARTER(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(1236088422)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('month', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,38.0,"
-      SELECT MONTH(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(1709161123)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('month', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,35.0,"
-      SELECT MONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(941741456)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('week', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,30.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(FROM_DAYS(FLOOR(NULL) + 693961)) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(FROM_DAYS(FLOOR(NULL) + 693961), '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(4070818381)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('week', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,28.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - 1 + ((7 + DAYOFWEEK(DATE_FORMAT(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-01-01 00:00:00')) - 2) % 7) ) / 7) AS `TEMP(Test)(1209329404)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('weekday', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,31.0,"
-      SELECT DAYOFWEEK(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(2284623665)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('weekday', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,29.0,"
-      SELECT DAYOFWEEK(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3556637072)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('day', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,36.0,"
-      SELECT DAYOFMONTH(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(20465857)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('day', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,29.0,"
-      SELECT DAYOFMONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3365622206)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('dayofyear', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,29.0,"
-      SELECT DAYOFYEAR(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(1193407708)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('dayofyear', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,33.0,"
-      SELECT DAYOFYEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3498421513)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('hour', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,30.0,"
-      SELECT HOUR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(1756144708)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('minute', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,33.0,"
-      SELECT MINUTE(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(2635020195)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.nulls.txt,True,0,0,"DATEPART('second', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,30.0,"
-      SELECT SECOND(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(2744314424)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('year', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,35.0,"
-      SELECT YEAR(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(513464674)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('year', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,28.0,"
-      SELECT YEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3512378422)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('quarter', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,29.0,"
-      SELECT QUARTER(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(3084524178)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('quarter', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,35.0,"
-      SELECT QUARTER(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(4202902840)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('month', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,36.0,"
-      SELECT MONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(2836269094)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('month', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,32.0,"
-      SELECT MONTH(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(3924648662)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('week', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,29.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(FROM_DAYS(FLOOR(NULL) + 693961)) - 1 + DAYOFWEEK(DATE_FORMAT(FROM_DAYS(FLOOR(NULL) + 693961), '%Y-01-01 00:00:00')) - 1) / 7) AS `TEMP(Test)(1538264184)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('week', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,30.0,"
-      SELECT FLOOR((7 + DAYOFYEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - 1 + DAYOFWEEK(DATE_FORMAT(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-01-01 00:00:00')) - 1) / 7) AS `TEMP(Test)(4042104093)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('weekday', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,30.0,"
-      SELECT DAYOFWEEK(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(4271712345)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('weekday', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,29.0,"
-      SELECT DAYOFWEEK(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(963247111)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('dayofyear', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,30.0,"
-      SELECT DAYOFYEAR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(738426766)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('dayofyear', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,29.0,"
-      SELECT DAYOFYEAR(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(1202522493)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('day', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,29.0,"
-      SELECT DAYOFMONTH(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(1255819744)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('day', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,29.0,"
-      SELECT DAYOFMONTH(FROM_DAYS(FLOOR(NULL) + 693961)) AS `TEMP(Test)(1639804515)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('hour', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,29.0,"
-      SELECT HOUR(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(299943486)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('minute', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,31.0,"
-      SELECT MINUTE(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(4177149407)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.sow.nulls.txt,True,0,0,"DATEPART('second', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATEPART",,None,None,30.0,"
-      SELECT SECOND(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) AS `TEMP(Test)(1457324017)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datepart.dateadd.defect603107,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datepart.dateadd.defect603107.txt,True,0,0,"DATEPART('year',DATEADD('day',-DATEPART('weekday',[date0])+1,[date0]))",expression,Required,"Operator,Date Filters","+,-,DATEADD,DATEPART",,None,None,83.0,"
-      SELECT YEAR(DATE_ADD(`calcs`.`date0`, INTERVAL ((DAYOFWEEK(`calcs`.`date0`) * -1) + 1) DAY)) AS `TEMP(Test)(1308221269)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1308221269)(0)`
-    ","%null%
-1972
-1975
-2004","%null%
-1972
-1975
-2004"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.day.txt,True,0,0,"DATETRUNC('day', [date2])",expression,Required,Date Filters,DATETRUNC,,None,None,103.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(591126205)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(591126205)(0)`
-    ","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.day.txt,True,0,0,"DATETRUNC('day', [datetime0])",expression,Required,Date Filters,DATETRUNC,,None,None,42.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(3034828475)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3034828475)(0)`
-    ","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.dayofyear.txt,True,0,0,"DATETRUNC('dayofyear', [date2])",expression,Required,Date Filters,DATETRUNC,,None,None,75.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(402015915)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(402015915)(0)`
-    ","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.dayofyear.txt,True,0,0,"DATETRUNC('dayofyear', [datetime0])",expression,Required,Date Filters,DATETRUNC,,None,None,41.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(3033426574)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3033426574)(0)`
-    ","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.hour.txt,True,0,0,"DATETRUNC('hour', [datetime0])",expression,Required,Date Filters,DATETRUNC,,None,None,45.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d %H:00:00' ) AS `TEMP(Test)(2456153780)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2456153780)(0)`
-    ","#2004-07-04 22:00:00#
-#2004-07-05 13:00:00#
-#2004-07-09 10:00:00#
-#2004-07-12 17:00:00#
-#2004-07-14 07:00:00#
-#2004-07-14 08:00:00#
-#2004-07-17 14:00:00#
-#2004-07-19 22:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 21:00:00#
-#2004-07-25 15:00:00#
-#2004-07-26 12:00:00#
-#2004-07-28 06:00:00#
-#2004-07-28 12:00:00#
-#2004-07-28 23:00:00#
-#2004-07-31 11:00:00#
-#2004-08-02 07:00:00#","#2004-07-04 22:00:00#
-#2004-07-05 13:00:00#
-#2004-07-09 10:00:00#
-#2004-07-12 17:00:00#
-#2004-07-14 07:00:00#
-#2004-07-14 08:00:00#
-#2004-07-17 14:00:00#
-#2004-07-19 22:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 21:00:00#
-#2004-07-25 15:00:00#
-#2004-07-26 12:00:00#
-#2004-07-28 06:00:00#
-#2004-07-28 12:00:00#
-#2004-07-28 23:00:00#
-#2004-07-31 11:00:00#
-#2004-08-02 07:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.minute.txt,True,0,0,"DATETRUNC('minute', [datetime0])",expression,Required,Date Filters,DATETRUNC,,None,None,47.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d %H:%i:00' ) AS `TEMP(Test)(1224905293)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1224905293)(0)`
-    ","#2004-07-04 22:49:00#
-#2004-07-05 13:14:00#
-#2004-07-09 10:17:00#
-#2004-07-12 17:30:00#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:00#
-#2004-07-17 14:01:00#
-#2004-07-19 22:21:00#
-#2004-07-22 00:30:00#
-#2004-07-23 21:13:00#
-#2004-07-25 15:22:00#
-#2004-07-26 12:30:00#
-#2004-07-28 06:54:00#
-#2004-07-28 12:34:00#
-#2004-07-28 23:30:00#
-#2004-07-31 11:57:00#
-#2004-08-02 07:59:00#","#2004-07-04 22:49:00#
-#2004-07-05 13:14:00#
-#2004-07-09 10:17:00#
-#2004-07-12 17:30:00#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:00#
-#2004-07-17 14:01:00#
-#2004-07-19 22:21:00#
-#2004-07-22 00:30:00#
-#2004-07-23 21:13:00#
-#2004-07-25 15:22:00#
-#2004-07-26 12:30:00#
-#2004-07-28 06:54:00#
-#2004-07-28 12:34:00#
-#2004-07-28 23:30:00#
-#2004-07-31 11:57:00#
-#2004-08-02 07:59:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.month.txt,True,0,0,"DATETRUNC('month', [date2])",expression,Required,Date Filters,DATETRUNC,,None,None,48.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-01 00:00:00' ) AS `TEMP(Test)(296025979)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(296025979)(0)`
-    ","#1972-07-01 00:00:00#
-#1974-03-01 00:00:00#
-#1974-05-01 00:00:00#
-#1976-09-01 00:00:00#
-#1977-02-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-11-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-06-01 00:00:00#
-#1995-09-01 00:00:00#
-#1997-05-01 00:00:00#
-#1997-09-01 00:00:00#
-#1998-08-01 00:00:00#
-#2001-02-01 00:00:00#
-#2002-04-01 00:00:00#","#1972-07-01 00:00:00#
-#1974-03-01 00:00:00#
-#1974-05-01 00:00:00#
-#1976-09-01 00:00:00#
-#1977-02-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-11-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-06-01 00:00:00#
-#1995-09-01 00:00:00#
-#1997-05-01 00:00:00#
-#1997-09-01 00:00:00#
-#1998-08-01 00:00:00#
-#2001-02-01 00:00:00#
-#2002-04-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.month.txt,True,0,0,"DATETRUNC('month', [datetime0])",expression,Required,Date Filters,DATETRUNC,,None,None,38.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-01 00:00:00' ) AS `TEMP(Test)(595744937)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(595744937)(0)`
-    ","#2004-07-01 00:00:00#
-#2004-08-01 00:00:00#","#2004-07-01 00:00:00#
-#2004-08-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.quarter.txt,True,0,0,"DATETRUNC('quarter', [date2])",expression,Required,Date Filters,DATETRUNC,,None,None,57.0,"
-      SELECT CONCAT(DATE_FORMAT(`calcs`.`date2`, '%Y-'), CONCAT(CAST((3*(QUARTER(`calcs`.`date2`)-1)+1) AS STRING), '-01 00:00:00')) AS `TEMP(Test)(1126788499)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1126788499)(0)`
-    ","#1972-07-01 00:00:00#
-#1974-01-01 00:00:00#
-#1974-04-01 00:00:00#
-#1976-07-01 00:00:00#
-#1977-01-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-10-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-04-01 00:00:00#
-#1995-07-01 00:00:00#
-#1997-04-01 00:00:00#
-#1997-07-01 00:00:00#
-#1998-07-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-04-01 00:00:00#","#1972-07-01 00:00:00#
-#1974-01-01 00:00:00#
-#1974-04-01 00:00:00#
-#1976-07-01 00:00:00#
-#1977-01-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-10-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-04-01 00:00:00#
-#1995-07-01 00:00:00#
-#1997-04-01 00:00:00#
-#1997-07-01 00:00:00#
-#1998-07-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-04-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.quarter.txt,True,0,0,"DATETRUNC('quarter', [datetime0])",expression,Required,Date Filters,DATETRUNC,,None,None,47.0,"
-      SELECT CONCAT(DATE_FORMAT(`calcs`.`datetime0`, '%Y-'), CONCAT(CAST((3*(QUARTER(`calcs`.`datetime0`)-1)+1) AS STRING), '-01 00:00:00')) AS `TEMP(Test)(3855281255)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3855281255)(0)`
-    ",#2004-07-01 00:00:00#,#2004-07-01 00:00:00#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.second.txt,True,0,0,"DATETRUNC('second', [datetime0])",expression,Required,Date Filters,DATETRUNC,,None,None,52.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d %H:%i:%s' ) AS `TEMP(Test)(3300724379)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3300724379)(0)`
-    ","#2004-07-04 22:49:28#
-#2004-07-05 13:14:20#
-#2004-07-09 10:17:35#
-#2004-07-12 17:30:16#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:44#
-#2004-07-17 14:01:56#
-#2004-07-19 22:21:31#
-#2004-07-22 00:30:23#
-#2004-07-23 21:13:37#
-#2004-07-25 15:22:26#
-#2004-07-26 12:30:34#
-#2004-07-28 06:54:50#
-#2004-07-28 12:34:28#
-#2004-07-28 23:30:22#
-#2004-07-31 11:57:52#
-#2004-08-02 07:59:23#","#2004-07-04 22:49:28#
-#2004-07-05 13:14:20#
-#2004-07-09 10:17:35#
-#2004-07-12 17:30:16#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:44#
-#2004-07-17 14:01:56#
-#2004-07-19 22:21:31#
-#2004-07-22 00:30:23#
-#2004-07-23 21:13:37#
-#2004-07-25 15:22:26#
-#2004-07-26 12:30:34#
-#2004-07-28 06:54:50#
-#2004-07-28 12:34:28#
-#2004-07-28 23:30:22#
-#2004-07-31 11:57:52#
-#2004-08-02 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.day.txt,True,0,0,"DATETRUNC('day', [date2], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,47.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(3738830082)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3738830082)(0)`
-    ","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.day.txt,True,0,0,"DATETRUNC('day', [date2], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,39.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(151653785)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(151653785)(0)`
-    ","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.day.txt,True,0,0,"DATETRUNC('day', [datetime0], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,40.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(1373895161)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1373895161)(0)`
-    ","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.day,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.day.txt,True,0,0,"DATETRUNC('day', [datetime0], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,33.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(543203842)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(543203842)(0)`
-    ","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.dayofyear.txt,True,0,0,"DATETRUNC('dayofyear', [date2], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,41.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(1942031084)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1942031084)(0)`
-    ","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.dayofyear.txt,True,0,0,"DATETRUNC('dayofyear', [date2], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,46.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(308042462)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(308042462)(0)`
-    ","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.dayofyear.txt,True,0,0,"DATETRUNC('dayofyear', [datetime0], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,60.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(1290354772)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1290354772)(0)`
-    ","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.dayofyear,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.dayofyear.txt,True,0,0,"DATETRUNC('dayofyear', [datetime0], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,54.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(2022110629)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2022110629)(0)`
-    ","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.hour.txt,True,0,0,"DATETRUNC('hour', [datetime0], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,76.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d %H:00:00' ) AS `TEMP(Test)(2793013592)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2793013592)(0)`
-    ","#2004-07-04 22:00:00#
-#2004-07-05 13:00:00#
-#2004-07-09 10:00:00#
-#2004-07-12 17:00:00#
-#2004-07-14 07:00:00#
-#2004-07-14 08:00:00#
-#2004-07-17 14:00:00#
-#2004-07-19 22:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 21:00:00#
-#2004-07-25 15:00:00#
-#2004-07-26 12:00:00#
-#2004-07-28 06:00:00#
-#2004-07-28 12:00:00#
-#2004-07-28 23:00:00#
-#2004-07-31 11:00:00#
-#2004-08-02 07:00:00#","#2004-07-04 22:00:00#
-#2004-07-05 13:00:00#
-#2004-07-09 10:00:00#
-#2004-07-12 17:00:00#
-#2004-07-14 07:00:00#
-#2004-07-14 08:00:00#
-#2004-07-17 14:00:00#
-#2004-07-19 22:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 21:00:00#
-#2004-07-25 15:00:00#
-#2004-07-26 12:00:00#
-#2004-07-28 06:00:00#
-#2004-07-28 12:00:00#
-#2004-07-28 23:00:00#
-#2004-07-31 11:00:00#
-#2004-08-02 07:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.hour,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.hour.txt,True,0,0,"DATETRUNC('hour', [datetime0], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,41.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d %H:00:00' ) AS `TEMP(Test)(2980130610)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2980130610)(0)`
-    ","#2004-07-04 22:00:00#
-#2004-07-05 13:00:00#
-#2004-07-09 10:00:00#
-#2004-07-12 17:00:00#
-#2004-07-14 07:00:00#
-#2004-07-14 08:00:00#
-#2004-07-17 14:00:00#
-#2004-07-19 22:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 21:00:00#
-#2004-07-25 15:00:00#
-#2004-07-26 12:00:00#
-#2004-07-28 06:00:00#
-#2004-07-28 12:00:00#
-#2004-07-28 23:00:00#
-#2004-07-31 11:00:00#
-#2004-08-02 07:00:00#","#2004-07-04 22:00:00#
-#2004-07-05 13:00:00#
-#2004-07-09 10:00:00#
-#2004-07-12 17:00:00#
-#2004-07-14 07:00:00#
-#2004-07-14 08:00:00#
-#2004-07-17 14:00:00#
-#2004-07-19 22:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 21:00:00#
-#2004-07-25 15:00:00#
-#2004-07-26 12:00:00#
-#2004-07-28 06:00:00#
-#2004-07-28 12:00:00#
-#2004-07-28 23:00:00#
-#2004-07-31 11:00:00#
-#2004-08-02 07:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.minute.txt,True,0,0,"DATETRUNC('minute', [datetime0], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,45.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d %H:%i:00' ) AS `TEMP(Test)(1349416314)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1349416314)(0)`
-    ","#2004-07-04 22:49:00#
-#2004-07-05 13:14:00#
-#2004-07-09 10:17:00#
-#2004-07-12 17:30:00#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:00#
-#2004-07-17 14:01:00#
-#2004-07-19 22:21:00#
-#2004-07-22 00:30:00#
-#2004-07-23 21:13:00#
-#2004-07-25 15:22:00#
-#2004-07-26 12:30:00#
-#2004-07-28 06:54:00#
-#2004-07-28 12:34:00#
-#2004-07-28 23:30:00#
-#2004-07-31 11:57:00#
-#2004-08-02 07:59:00#","#2004-07-04 22:49:00#
-#2004-07-05 13:14:00#
-#2004-07-09 10:17:00#
-#2004-07-12 17:30:00#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:00#
-#2004-07-17 14:01:00#
-#2004-07-19 22:21:00#
-#2004-07-22 00:30:00#
-#2004-07-23 21:13:00#
-#2004-07-25 15:22:00#
-#2004-07-26 12:30:00#
-#2004-07-28 06:54:00#
-#2004-07-28 12:34:00#
-#2004-07-28 23:30:00#
-#2004-07-31 11:57:00#
-#2004-08-02 07:59:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.minute,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.minute.txt,True,0,0,"DATETRUNC('minute', [datetime0], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,31.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d %H:%i:00' ) AS `TEMP(Test)(3032747293)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3032747293)(0)`
-    ","#2004-07-04 22:49:00#
-#2004-07-05 13:14:00#
-#2004-07-09 10:17:00#
-#2004-07-12 17:30:00#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:00#
-#2004-07-17 14:01:00#
-#2004-07-19 22:21:00#
-#2004-07-22 00:30:00#
-#2004-07-23 21:13:00#
-#2004-07-25 15:22:00#
-#2004-07-26 12:30:00#
-#2004-07-28 06:54:00#
-#2004-07-28 12:34:00#
-#2004-07-28 23:30:00#
-#2004-07-31 11:57:00#
-#2004-08-02 07:59:00#","#2004-07-04 22:49:00#
-#2004-07-05 13:14:00#
-#2004-07-09 10:17:00#
-#2004-07-12 17:30:00#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:00#
-#2004-07-17 14:01:00#
-#2004-07-19 22:21:00#
-#2004-07-22 00:30:00#
-#2004-07-23 21:13:00#
-#2004-07-25 15:22:00#
-#2004-07-26 12:30:00#
-#2004-07-28 06:54:00#
-#2004-07-28 12:34:00#
-#2004-07-28 23:30:00#
-#2004-07-31 11:57:00#
-#2004-08-02 07:59:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.month.txt,True,0,0,"DATETRUNC('month', [date2], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,46.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-01 00:00:00' ) AS `TEMP(Test)(3415515666)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3415515666)(0)`
-    ","#1972-07-01 00:00:00#
-#1974-03-01 00:00:00#
-#1974-05-01 00:00:00#
-#1976-09-01 00:00:00#
-#1977-02-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-11-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-06-01 00:00:00#
-#1995-09-01 00:00:00#
-#1997-05-01 00:00:00#
-#1997-09-01 00:00:00#
-#1998-08-01 00:00:00#
-#2001-02-01 00:00:00#
-#2002-04-01 00:00:00#","#1972-07-01 00:00:00#
-#1974-03-01 00:00:00#
-#1974-05-01 00:00:00#
-#1976-09-01 00:00:00#
-#1977-02-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-11-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-06-01 00:00:00#
-#1995-09-01 00:00:00#
-#1997-05-01 00:00:00#
-#1997-09-01 00:00:00#
-#1998-08-01 00:00:00#
-#2001-02-01 00:00:00#
-#2002-04-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.month.txt,True,0,0,"DATETRUNC('month', [date2], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,34.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-01 00:00:00' ) AS `TEMP(Test)(2048935536)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2048935536)(0)`
-    ","#1972-07-01 00:00:00#
-#1974-03-01 00:00:00#
-#1974-05-01 00:00:00#
-#1976-09-01 00:00:00#
-#1977-02-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-11-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-06-01 00:00:00#
-#1995-09-01 00:00:00#
-#1997-05-01 00:00:00#
-#1997-09-01 00:00:00#
-#1998-08-01 00:00:00#
-#2001-02-01 00:00:00#
-#2002-04-01 00:00:00#","#1972-07-01 00:00:00#
-#1974-03-01 00:00:00#
-#1974-05-01 00:00:00#
-#1976-09-01 00:00:00#
-#1977-02-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-11-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-06-01 00:00:00#
-#1995-09-01 00:00:00#
-#1997-05-01 00:00:00#
-#1997-09-01 00:00:00#
-#1998-08-01 00:00:00#
-#2001-02-01 00:00:00#
-#2002-04-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.month.txt,True,0,0,"DATETRUNC('month', [datetime0], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,34.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-01 00:00:00' ) AS `TEMP(Test)(2714077903)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2714077903)(0)`
-    ","#2004-07-01 00:00:00#
-#2004-08-01 00:00:00#","#2004-07-01 00:00:00#
-#2004-08-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.month,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.month.txt,True,0,0,"DATETRUNC('month', [datetime0], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,32.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-01 00:00:00' ) AS `TEMP(Test)(1800100416)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1800100416)(0)`
-    ","#2004-07-01 00:00:00#
-#2004-08-01 00:00:00#","#2004-07-01 00:00:00#
-#2004-08-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.quarter.txt,True,0,0,"DATETRUNC('quarter', [date2], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,39.0,"
-      SELECT CONCAT(DATE_FORMAT(`calcs`.`date2`, '%Y-'), CONCAT(CAST((3*(QUARTER(`calcs`.`date2`)-1)+1) AS STRING), '-01 00:00:00')) AS `TEMP(Test)(4146692480)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4146692480)(0)`
-    ","#1972-07-01 00:00:00#
-#1974-01-01 00:00:00#
-#1974-04-01 00:00:00#
-#1976-07-01 00:00:00#
-#1977-01-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-10-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-04-01 00:00:00#
-#1995-07-01 00:00:00#
-#1997-04-01 00:00:00#
-#1997-07-01 00:00:00#
-#1998-07-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-04-01 00:00:00#","#1972-07-01 00:00:00#
-#1974-01-01 00:00:00#
-#1974-04-01 00:00:00#
-#1976-07-01 00:00:00#
-#1977-01-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-10-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-04-01 00:00:00#
-#1995-07-01 00:00:00#
-#1997-04-01 00:00:00#
-#1997-07-01 00:00:00#
-#1998-07-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-04-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.quarter.txt,True,0,0,"DATETRUNC('quarter', [date2], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,34.0,"
-      SELECT CONCAT(DATE_FORMAT(`calcs`.`date2`, '%Y-'), CONCAT(CAST((3*(QUARTER(`calcs`.`date2`)-1)+1) AS STRING), '-01 00:00:00')) AS `TEMP(Test)(560528826)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(560528826)(0)`
-    ","#1972-07-01 00:00:00#
-#1974-01-01 00:00:00#
-#1974-04-01 00:00:00#
-#1976-07-01 00:00:00#
-#1977-01-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-10-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-04-01 00:00:00#
-#1995-07-01 00:00:00#
-#1997-04-01 00:00:00#
-#1997-07-01 00:00:00#
-#1998-07-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-04-01 00:00:00#","#1972-07-01 00:00:00#
-#1974-01-01 00:00:00#
-#1974-04-01 00:00:00#
-#1976-07-01 00:00:00#
-#1977-01-01 00:00:00#
-#1977-04-01 00:00:00#
-#1980-07-01 00:00:00#
-#1980-10-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-04-01 00:00:00#
-#1995-04-01 00:00:00#
-#1995-07-01 00:00:00#
-#1997-04-01 00:00:00#
-#1997-07-01 00:00:00#
-#1998-07-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-04-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.quarter.txt,True,0,0,"DATETRUNC('quarter', [datetime0], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,31.0,"
-      SELECT CONCAT(DATE_FORMAT(`calcs`.`datetime0`, '%Y-'), CONCAT(CAST((3*(QUARTER(`calcs`.`datetime0`)-1)+1) AS STRING), '-01 00:00:00')) AS `TEMP(Test)(105511240)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(105511240)(0)`
-    ",#2004-07-01 00:00:00#,#2004-07-01 00:00:00#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.quarter,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.quarter.txt,True,0,0,"DATETRUNC('quarter', [datetime0], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,28.0,"
-      SELECT CONCAT(DATE_FORMAT(`calcs`.`datetime0`, '%Y-'), CONCAT(CAST((3*(QUARTER(`calcs`.`datetime0`)-1)+1) AS STRING), '-01 00:00:00')) AS `TEMP(Test)(755301458)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(755301458)(0)`
-    ",#2004-07-01 00:00:00#,#2004-07-01 00:00:00#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.second.txt,True,0,0,"DATETRUNC('second', [datetime0], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,48.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d %H:%i:%s' ) AS `TEMP(Test)(4192719501)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4192719501)(0)`
-    ","#2004-07-04 22:49:28#
-#2004-07-05 13:14:20#
-#2004-07-09 10:17:35#
-#2004-07-12 17:30:16#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:44#
-#2004-07-17 14:01:56#
-#2004-07-19 22:21:31#
-#2004-07-22 00:30:23#
-#2004-07-23 21:13:37#
-#2004-07-25 15:22:26#
-#2004-07-26 12:30:34#
-#2004-07-28 06:54:50#
-#2004-07-28 12:34:28#
-#2004-07-28 23:30:22#
-#2004-07-31 11:57:52#
-#2004-08-02 07:59:23#","#2004-07-04 22:49:28#
-#2004-07-05 13:14:20#
-#2004-07-09 10:17:35#
-#2004-07-12 17:30:16#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:44#
-#2004-07-17 14:01:56#
-#2004-07-19 22:21:31#
-#2004-07-22 00:30:23#
-#2004-07-23 21:13:37#
-#2004-07-25 15:22:26#
-#2004-07-26 12:30:34#
-#2004-07-28 06:54:50#
-#2004-07-28 12:34:28#
-#2004-07-28 23:30:22#
-#2004-07-31 11:57:52#
-#2004-08-02 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.second,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.second.txt,True,0,0,"DATETRUNC('second', [datetime0], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,38.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d %H:%i:%s' ) AS `TEMP(Test)(2927274352)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2927274352)(0)`
-    ","#2004-07-04 22:49:28#
-#2004-07-05 13:14:20#
-#2004-07-09 10:17:35#
-#2004-07-12 17:30:16#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:44#
-#2004-07-17 14:01:56#
-#2004-07-19 22:21:31#
-#2004-07-22 00:30:23#
-#2004-07-23 21:13:37#
-#2004-07-25 15:22:26#
-#2004-07-26 12:30:34#
-#2004-07-28 06:54:50#
-#2004-07-28 12:34:28#
-#2004-07-28 23:30:22#
-#2004-07-31 11:57:52#
-#2004-08-02 07:59:23#","#2004-07-04 22:49:28#
-#2004-07-05 13:14:20#
-#2004-07-09 10:17:35#
-#2004-07-12 17:30:16#
-#2004-07-14 07:43:00#
-#2004-07-14 08:16:44#
-#2004-07-17 14:01:56#
-#2004-07-19 22:21:31#
-#2004-07-22 00:30:23#
-#2004-07-23 21:13:37#
-#2004-07-25 15:22:26#
-#2004-07-26 12:30:34#
-#2004-07-28 06:54:50#
-#2004-07-28 12:34:28#
-#2004-07-28 23:30:22#
-#2004-07-31 11:57:52#
-#2004-08-02 07:59:23#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.week.txt,True,0,0,"DATETRUNC('week', [date2], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,74.0,"
-      SELECT FROM_DAYS( TO_DAYS(`calcs`.`date2`) - ((7 + DAYOFWEEK(`calcs`.`date2`) - 2) % 7) ) AS `TEMP(Test)(1744581337)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1744581337)(0)`
-    ","#1972-07-10 00:00:00#
-#1974-03-11 00:00:00#
-#1974-04-29 00:00:00#
-#1976-09-06 00:00:00#
-#1977-02-07 00:00:00#
-#1977-04-18 00:00:00#
-#1980-07-21 00:00:00#
-#1980-11-03 00:00:00#
-#1988-01-04 00:00:00#
-#1994-04-18 00:00:00#
-#1995-05-29 00:00:00#
-#1995-08-28 00:00:00#
-#1997-05-26 00:00:00#
-#1997-09-15 00:00:00#
-#1998-08-10 00:00:00#
-#2001-01-29 00:00:00#
-#2002-04-22 00:00:00#","#1972-07-10 00:00:00#
-#1974-03-11 00:00:00#
-#1974-04-29 00:00:00#
-#1976-09-06 00:00:00#
-#1977-02-07 00:00:00#
-#1977-04-18 00:00:00#
-#1980-07-21 00:00:00#
-#1980-11-03 00:00:00#
-#1988-01-04 00:00:00#
-#1994-04-18 00:00:00#
-#1995-05-29 00:00:00#
-#1995-08-28 00:00:00#
-#1997-05-26 00:00:00#
-#1997-09-15 00:00:00#
-#1998-08-10 00:00:00#
-#2001-01-29 00:00:00#
-#2002-04-22 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.week.txt,True,0,0,"DATETRUNC('week', [date2], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,35.0,"
-      SELECT FROM_DAYS( TO_DAYS(`calcs`.`date2`) - (DAYOFWEEK(`calcs`.`date2`) - 1)) AS `TEMP(Test)(1635756518)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1635756518)(0)`
-    ","#1972-07-09 00:00:00#
-#1974-03-17 00:00:00#
-#1974-04-28 00:00:00#
-#1976-09-05 00:00:00#
-#1977-02-06 00:00:00#
-#1977-04-17 00:00:00#
-#1980-07-20 00:00:00#
-#1980-11-02 00:00:00#
-#1988-01-03 00:00:00#
-#1994-04-17 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-25 00:00:00#
-#1997-09-14 00:00:00#
-#1998-08-09 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-21 00:00:00#","#1972-07-09 00:00:00#
-#1974-03-17 00:00:00#
-#1974-04-28 00:00:00#
-#1976-09-05 00:00:00#
-#1977-02-06 00:00:00#
-#1977-04-17 00:00:00#
-#1980-07-20 00:00:00#
-#1980-11-02 00:00:00#
-#1988-01-03 00:00:00#
-#1994-04-17 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-25 00:00:00#
-#1997-09-14 00:00:00#
-#1998-08-09 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-21 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.week.txt,True,0,0,"DATETRUNC('week', [datetime0], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,39.0,"
-      SELECT FROM_DAYS( TO_DAYS(`calcs`.`datetime0`) - ((7 + DAYOFWEEK(`calcs`.`datetime0`) - 2) % 7) ) AS `TEMP(Test)(1985269479)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1985269479)(0)`
-    ","#2004-06-28 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-26 00:00:00#
-#2004-08-02 00:00:00#","#2004-06-28 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-26 00:00:00#
-#2004-08-02 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.week.txt,True,0,0,"DATETRUNC('week', [datetime0], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,35.0,"
-      SELECT FROM_DAYS( TO_DAYS(`calcs`.`datetime0`) - (DAYOFWEEK(`calcs`.`datetime0`) - 1)) AS `TEMP(Test)(3887385220)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3887385220)(0)`
-    ","#2004-07-04 00:00:00#
-#2004-07-11 00:00:00#
-#2004-07-18 00:00:00#
-#2004-07-25 00:00:00#
-#2004-08-01 00:00:00#","#2004-07-04 00:00:00#
-#2004-07-11 00:00:00#
-#2004-07-18 00:00:00#
-#2004-07-25 00:00:00#
-#2004-08-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.weekday.txt,True,0,0,"DATETRUNC('weekday', [date2], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,38.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(2526477208)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2526477208)(0)`
-    ","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.weekday.txt,True,0,0,"DATETRUNC('weekday', [date2], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,30.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(2007354609)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2007354609)(0)`
-    ","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.weekday.txt,True,0,0,"DATETRUNC('weekday', [datetime0], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,29.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(3928745396)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3928745396)(0)`
-    ","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.weekday.txt,True,0,0,"DATETRUNC('weekday', [datetime0], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,33.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(746880020)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(746880020)(0)`
-    ","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.year.txt,True,0,0,"DATETRUNC('year', [date2], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,40.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-01-01 00:00:00' ) AS `TEMP(Test)(433583207)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(433583207)(0)`
-    ","#1972-01-01 00:00:00#
-#1974-01-01 00:00:00#
-#1976-01-01 00:00:00#
-#1977-01-01 00:00:00#
-#1980-01-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-01-01 00:00:00#
-#1995-01-01 00:00:00#
-#1997-01-01 00:00:00#
-#1998-01-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-01-01 00:00:00#","#1972-01-01 00:00:00#
-#1974-01-01 00:00:00#
-#1976-01-01 00:00:00#
-#1977-01-01 00:00:00#
-#1980-01-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-01-01 00:00:00#
-#1995-01-01 00:00:00#
-#1997-01-01 00:00:00#
-#1998-01-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-01-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.year.txt,True,0,0,"DATETRUNC('year', [date2], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,26.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-01-01 00:00:00' ) AS `TEMP(Test)(1289371916)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1289371916)(0)`
-    ","#1972-01-01 00:00:00#
-#1974-01-01 00:00:00#
-#1976-01-01 00:00:00#
-#1977-01-01 00:00:00#
-#1980-01-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-01-01 00:00:00#
-#1995-01-01 00:00:00#
-#1997-01-01 00:00:00#
-#1998-01-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-01-01 00:00:00#","#1972-01-01 00:00:00#
-#1974-01-01 00:00:00#
-#1976-01-01 00:00:00#
-#1977-01-01 00:00:00#
-#1980-01-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-01-01 00:00:00#
-#1995-01-01 00:00:00#
-#1997-01-01 00:00:00#
-#1998-01-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-01-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.year.txt,True,0,0,"DATETRUNC('year', [datetime0], 'monday')",expression,Required,Date Filters,DATETRUNC,,None,None,30.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-01-01 00:00:00' ) AS `TEMP(Test)(3917841362)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3917841362)(0)`
-    ",#2004-01-01 00:00:00#,#2004-01-01 00:00:00#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.year.txt,True,0,0,"DATETRUNC('year', [datetime0], 'sunday')",expression,Required,Date Filters,DATETRUNC,,None,None,29.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-01-01 00:00:00' ) AS `TEMP(Test)(1921815362)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1921815362)(0)`
-    ",#2004-01-01 00:00:00#,#2004-01-01 00:00:00#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.week.txt,False,0,17,"DATETRUNC('week', [date2])",expression,Required,Date Filters,DATETRUNC,,Actual does not match expected.,Actual does not match expected.,37.0,"
-      SELECT FROM_DAYS( TO_DAYS(`calcs`.`date2`) - ((7 + DAYOFWEEK(`calcs`.`date2`) - 2) % 7) ) AS `TEMP(Test)(1630131013)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1630131013)(0)`
-    ","#1972-07-10 00:00:00#
-#1974-03-11 00:00:00#
-#1974-04-29 00:00:00#
-#1976-09-06 00:00:00#
-#1977-02-07 00:00:00#
-#1977-04-18 00:00:00#
-#1980-07-21 00:00:00#
-#1980-11-03 00:00:00#
-#1988-01-04 00:00:00#
-#1994-04-18 00:00:00#
-#1995-05-29 00:00:00#
-#1995-08-28 00:00:00#
-#1997-05-26 00:00:00#
-#1997-09-15 00:00:00#
-#1998-08-10 00:00:00#
-#2001-01-29 00:00:00#
-#2002-04-22 00:00:00#","#1972-07-09 00:00:00#
-#1974-03-17 00:00:00#
-#1974-04-28 00:00:00#
-#1976-09-05 00:00:00#
-#1977-02-06 00:00:00#
-#1977-04-17 00:00:00#
-#1980-07-20 00:00:00#
-#1980-11-02 00:00:00#
-#1988-01-03 00:00:00#
-#1994-04-17 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-25 00:00:00#
-#1997-09-14 00:00:00#
-#1998-08-09 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-21 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.week,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.week.txt,False,0,6,"DATETRUNC('week', [datetime0])",expression,Required,Date Filters,DATETRUNC,,Actual does not match expected.,Actual does not match expected.,33.0,"
-      SELECT FROM_DAYS( TO_DAYS(`calcs`.`datetime0`) - ((7 + DAYOFWEEK(`calcs`.`datetime0`) - 2) % 7) ) AS `TEMP(Test)(3937478358)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3937478358)(0)`
-    ","#2004-06-28 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-26 00:00:00#
-#2004-08-02 00:00:00#","#2004-07-04 00:00:00#
-#2004-07-11 00:00:00#
-#2004-07-18 00:00:00#
-#2004-07-25 00:00:00#
-#2004-08-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.weekday.txt,True,0,0,"DATETRUNC('weekday', [date2])",expression,Required,Date Filters,DATETRUNC,,None,None,37.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(3715775174)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3715775174)(0)`
-    ","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#","#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1976-09-09 00:00:00#
-#1977-02-08 00:00:00#
-#1977-04-20 00:00:00#
-#1980-07-26 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1995-09-03 00:00:00#
-#1997-05-30 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.weekday,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.weekday.txt,True,0,0,"DATETRUNC('weekday', [datetime0])",expression,Required,Date Filters,DATETRUNC,,None,None,33.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(2815480624)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2815480624)(0)`
-    ","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#","#2004-07-04 00:00:00#
-#2004-07-05 00:00:00#
-#2004-07-09 00:00:00#
-#2004-07-12 00:00:00#
-#2004-07-14 00:00:00#
-#2004-07-17 00:00:00#
-#2004-07-19 00:00:00#
-#2004-07-22 00:00:00#
-#2004-07-23 00:00:00#
-#2004-07-25 00:00:00#
-#2004-07-26 00:00:00#
-#2004-07-28 00:00:00#
-#2004-07-31 00:00:00#
-#2004-08-02 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.year.txt,True,0,0,"DATETRUNC('year', [date2])",expression,Required,Date Filters,DATETRUNC,,None,None,39.0,"
-      SELECT DATE_FORMAT( `calcs`.`date2`, '%Y-01-01 00:00:00' ) AS `TEMP(Test)(3907469988)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3907469988)(0)`
-    ","#1972-01-01 00:00:00#
-#1974-01-01 00:00:00#
-#1976-01-01 00:00:00#
-#1977-01-01 00:00:00#
-#1980-01-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-01-01 00:00:00#
-#1995-01-01 00:00:00#
-#1997-01-01 00:00:00#
-#1998-01-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-01-01 00:00:00#","#1972-01-01 00:00:00#
-#1974-01-01 00:00:00#
-#1976-01-01 00:00:00#
-#1977-01-01 00:00:00#
-#1980-01-01 00:00:00#
-#1988-01-01 00:00:00#
-#1994-01-01 00:00:00#
-#1995-01-01 00:00:00#
-#1997-01-01 00:00:00#
-#1998-01-01 00:00:00#
-#2001-01-01 00:00:00#
-#2002-01-01 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.year,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.year.txt,True,0,0,"DATETRUNC('year', [datetime0])",expression,Required,Date Filters,DATETRUNC,,None,None,29.0,"
-      SELECT DATE_FORMAT( `calcs`.`datetime0`, '%Y-01-01 00:00:00' ) AS `TEMP(Test)(1153873435)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1153873435)(0)`
-    ",#2004-01-01 00:00:00#,#2004-01-01 00:00:00#
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('year', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,46.0,"
-      SELECT DATE_FORMAT( FROM_DAYS(FLOOR(NULL) + 693961), '%Y-01-01 00:00:00' ) AS `TEMP(Test)(1773778045)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('year', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,44.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-01-01 00:00:00' ) AS `TEMP(Test)(382789366)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('month', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,34.0,"
-      SELECT DATE_FORMAT( FROM_DAYS(FLOOR(NULL) + 693961), '%Y-%m-01 00:00:00' ) AS `TEMP(Test)(444902156)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('month', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,44.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-01 00:00:00' ) AS `TEMP(Test)(581676997)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('quarter', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,40.0,"
-      SELECT CONCAT(DATE_FORMAT(FROM_DAYS(FLOOR(NULL) + 693961), '%Y-'), CONCAT(CAST((3*(QUARTER(FROM_DAYS(FLOOR(NULL) + 693961))-1)+1) AS STRING), '-01 00:00:00')) AS `TEMP(Test)(1831450015)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('quarter', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,41.0,"
-      SELECT CONCAT(DATE_FORMAT(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-'), CONCAT(CAST((3*(QUARTER(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))-1)+1) AS STRING), '-01 00:00:00')) AS `TEMP(Test)(360201683)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('week', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,42.0,"
-      SELECT FROM_DAYS( TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - ((7 + DAYOFWEEK(FROM_DAYS(FLOOR(NULL) + 693961)) - 2) % 7) ) AS `TEMP(Test)(872678106)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('week', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,37.0,"
-      SELECT FROM_DAYS( TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - ((7 + DAYOFWEEK(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - 2) % 7) ) AS `TEMP(Test)(3905701997)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('weekday', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,34.0,"
-      SELECT DATE_FORMAT( FROM_DAYS(FLOOR(NULL) + 693961), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(3359079369)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('weekday', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,36.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(1326289938)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('day', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,32.0,"
-      SELECT DATE_FORMAT( FROM_DAYS(FLOOR(NULL) + 693961), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(2763829899)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('day', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,33.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(717997108)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('dayofyear', DATE(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,35.0,"
-      SELECT DATE_FORMAT( FROM_DAYS(FLOOR(NULL) + 693961), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(2963633898)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('dayofyear', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,33.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(3202209617)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('hour', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,34.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d %H:00:00' ) AS `TEMP(Test)(4266496460)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('second', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,35.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d %H:%i:%s' ) AS `TEMP(Test)(4131996060)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.nulls.txt,True,0,0,"DATETRUNC('minute', DATETIME(null))",expression,Required If Supported,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,47.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d %H:%i:00' ) AS `TEMP(Test)(2935754523)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('year', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,38.0,"
-      SELECT DATE_FORMAT( FROM_DAYS(FLOOR(NULL) + 693961), '%Y-01-01 00:00:00' ) AS `TEMP(Test)(3311335472)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('year', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,32.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-01-01 00:00:00' ) AS `TEMP(Test)(1982106892)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('quarter', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,32.0,"
-      SELECT CONCAT(DATE_FORMAT(FROM_DAYS(FLOOR(NULL) + 693961), '%Y-'), CONCAT(CAST((3*(QUARTER(FROM_DAYS(FLOOR(NULL) + 693961))-1)+1) AS STRING), '-01 00:00:00')) AS `TEMP(Test)(2616948526)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('quarter', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,33.0,"
-      SELECT CONCAT(DATE_FORMAT(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-'), CONCAT(CAST((3*(QUARTER(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND))-1)+1) AS STRING), '-01 00:00:00')) AS `TEMP(Test)(4099405891)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('month', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,40.0,"
-      SELECT DATE_FORMAT( FROM_DAYS(FLOOR(NULL) + 693961), '%Y-%m-01 00:00:00' ) AS `TEMP(Test)(1303420554)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('month', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,36.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-01 00:00:00' ) AS `TEMP(Test)(1705284026)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('week', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,33.0,"
-      SELECT FROM_DAYS( TO_DAYS(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - (DAYOFWEEK(DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND)) - 1)) AS `TEMP(Test)(2964540366)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('week', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,31.0,"
-      SELECT FROM_DAYS( TO_DAYS(FROM_DAYS(FLOOR(NULL) + 693961)) - (DAYOFWEEK(FROM_DAYS(FLOOR(NULL) + 693961)) - 1)) AS `TEMP(Test)(3523871008)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('weekday', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,32.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(3587526928)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('weekday', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,32.0,"
-      SELECT DATE_FORMAT( FROM_DAYS(FLOOR(NULL) + 693961), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(2715649251)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('day', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,28.0,"
-      SELECT DATE_FORMAT( FROM_DAYS(FLOOR(NULL) + 693961), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(3912893816)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('day', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,29.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(453060606)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('dayofyear', DATE(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,33.0,"
-      SELECT DATE_FORMAT( FROM_DAYS(FLOOR(NULL) + 693961), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(1466575961)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('dayofyear', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,31.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d 00:00:00' ) AS `TEMP(Test)(265878863)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('hour', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,34.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d %H:00:00' ) AS `TEMP(Test)(3877847632)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('minute', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,34.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d %H:%i:00' ) AS `TEMP(Test)(263614731)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,date.datetrunc.sow.nulls,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.date.datetrunc.sow.nulls.txt,True,0,0,"DATETRUNC('second', DATETIME(null), 'sunday')",expression,Recommended,"Cast,Date Filters,Aggregation","COUNT,DATE,DATETRUNC",,None,None,31.0,"
-      SELECT DATE_FORMAT( DATE_ADD(FROM_DAYS(FLOOR(NULL) + 693961), INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND), '%Y-%m-%d %H:%i:%s' ) AS `TEMP(Test)(864002214)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.case.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.case.str.txt,True,0,0,case [str0] when 'TECHNOLOGY' then '*Anonymous*'  else [str0] end,expression,Required,"Logical,Operator,Sets,Filters","$IN_SET$,$CASE$,==",,None,None,42.0,"
-      SELECT (CASE `calcs`.`str0` WHEN 'TECHNOLOGY' THEN '*Anonymous*' ELSE `calcs`.`str0` END) AS `TEMP(Test)(1797172313)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1797172313)(0)`
-    ","""*Anonymous*""
-""FURNITURE""
-""OFFICE SUPPLIES""","""*Anonymous*""
-""FURNITURE""
-""OFFICE SUPPLIES"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.ifnull,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.ifnull.txt,True,0,0,"IFNULL(COUNTD(num2), 0)",expression,Required,"Aggregation,Calculation","IFNULL,COUNT,COUNTD",,None,None,36.0,"
-      SELECT COUNT(DISTINCT `calcs`.`num2`) AS `TEMP(Test)(957319405)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",13,13
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.case.null,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.case.null.txt,False,0,13,"case datepart('weekday',date1) when 7 then null when 1 then null else date1 end",expression,Required,"Date Filters,Filters,Operator,Logical,Sets","$IN_SET$,$CASE$,DATEPART,==",,"
-      Error executing query
-
-    ",Actual does not match expected.,47.0,"
-      SELECT (CASE WHEN (DAYOFWEEK(`calcs`.`date1`) IN (7, 1)) THEN NULL ELSE `calcs`.`date1` END) AS `TEMP(Test)(4257957843)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4257957843)(0)`
-    ",,"%null%
-#2004-04-01#
-#2004-04-02#
-#2004-04-05#
-#2004-04-06#
-#2004-04-07#
-#2004-04-08#
-#2004-04-09#
-#2004-04-12#
-#2004-04-13#
-#2004-04-14#
-#2004-04-15#
-#2004-04-16#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,8,"iif(bool0,date0,date1) ",expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,73.0,"
-      SELECT (CASE WHEN (`calcs`.`bool0` <> 0) THEN `calcs`.`date0` WHEN NOT (`calcs`.`bool0` <> 0) THEN `calcs`.`date1` ELSE NULL END) AS `TEMP(Test)(3513628645)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3513628645)(0)`
-    ",,"%null%
-#2004-04-02 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-08 00:00:00#
-#2004-04-12 00:00:00#
-#2004-04-15 00:00:00#
-#2004-04-16 00:00:00#
-#2004-06-04 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,7,"iif(bool0,str2,str3,str0) ",expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,43.0,"
-      SELECT (CASE WHEN (`calcs`.`bool0` <> 0) THEN `calcs`.`str2` WHEN NOT (`calcs`.`bool0` <> 0) THEN `calcs`.`str3` ELSE `calcs`.`str0` END) AS `TEMP(Test)(1007528555)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1007528555)(0)`
-    ",,"%null%
-""e""
-""eleven""
-""fifteen""
-""OFFICE SUPPLIES""
-""one""
-""TECHNOLOGY"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,13,"iif(bool0,num0,num1,num2) ",expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,42.0,"
-      SELECT (CASE WHEN (`calcs`.`bool0` <> 0) THEN `calcs`.`num0` WHEN NOT (`calcs`.`bool0` <> 0) THEN `calcs`.`num1` ELSE `calcs`.`num2` END) AS `TEMP(Test)(3428504110)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3428504110)(0)`
-    ",,"%null%
--15.7
-0.0
-2.47
-6.71
-7.87
-8.98
-9.05
-11.38
-11.5
-12.3
-13.04
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,15,"iif(bool0,date0,date1,date2) ",expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,46.0,"
-      SELECT (CASE WHEN (`calcs`.`bool0` <> 0) THEN `calcs`.`date0` WHEN NOT (`calcs`.`bool0` <> 0) THEN `calcs`.`date1` ELSE `calcs`.`date2` END) AS `TEMP(Test)(1581504649)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1581504649)(0)`
-    ",,"%null%
-#1976-09-09 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-08 00:00:00#
-#2004-04-12 00:00:00#
-#2004-04-15 00:00:00#
-#2004-04-16 00:00:00#
-#2004-06-04 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,9,"iif(bool0,num0,num1) ",expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,42.0,"
-      SELECT (CASE WHEN (`calcs`.`bool0` <> 0) THEN `calcs`.`num0` WHEN NOT (`calcs`.`bool0` <> 0) THEN `calcs`.`num1` ELSE NULL END) AS `TEMP(Test)(750655768)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(750655768)(0)`
-    ",,"%null%
--15.7
-0.0
-2.47
-6.71
-9.05
-11.38
-12.3
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,3,"iif(bool0,bool1,bool2) ",expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,41.0,"
-      SELECT (CASE WHEN (((`calcs`.`bool0` <> 0) AND (`calcs`.`bool1` <> 0)) OR ((NOT (`calcs`.`bool0` <> 0)) AND (`calcs`.`bool2` <> 0))) THEN 1 WHEN NOT (((`calcs`.`bool0` <> 0) AND (`calcs`.`bool1` <> 0)) OR ((NOT (`calcs`.`bool0` <> 0)) AND (`calcs`.`bool2` <> 0))) THEN 0 ELSE NULL END) AS `TEMP(Test)(1656302737)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1656302737)(0)`
-    ",,"%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,2,isnull(bool0) ,expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,43.0,"
-      SELECT (CASE WHEN ISNULL((`calcs`.`bool0` <> 0)) THEN 1 ELSE 0 END) AS `TEMP(Test)(4006206882)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4006206882)(0)`
-    ",,"false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,5,"iif(bool0,str2,str3) ",expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,40.0,"
-      SELECT (CASE WHEN (`calcs`.`bool0` <> 0) THEN `calcs`.`str2` WHEN NOT (`calcs`.`bool0` <> 0) THEN `calcs`.`str3` ELSE NULL END) AS `TEMP(Test)(4173709053)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4173709053)(0)`
-    ",,"%null%
-""e""
-""eleven""
-""fifteen""
-""one"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,3,(if bool0 then int(bool1) else int(bool2) end) == int(true),expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,41.0,"
-      SELECT (CASE WHEN ((CASE WHEN (`calcs`.`bool0` <> 0) THEN CAST((`calcs`.`bool1` <> 0) as int) ELSE CAST((`calcs`.`bool2` <> 0) as int) END) = CAST((1 <> 0) as int)) THEN 1 WHEN NOT ((CASE WHEN (`calcs`.`bool0` <> 0) THEN CAST((`calcs`.`bool1` <> 0) as int) ELSE CAST((`calcs`.`bool2` <> 0) as int) END) = CAST((1 <> 0) as int)) THEN 0 ELSE NULL END) AS `TEMP(Test)(1285160207)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1285160207)(0)`
-    ",,"%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,16,if bool0 then num0 else num1 end,expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,37.0,"
-      SELECT (CASE WHEN (`calcs`.`bool0` <> 0) THEN `calcs`.`num0` ELSE `calcs`.`num1` END) AS `TEMP(Test)(898375479)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(898375479)(0)`
-    ",,"%null%
--15.7
-0.0
-2.47
-6.71
-7.12
-9.05
-9.38
-9.47
-9.78
-10.37
-11.38
-12.05
-12.3
-12.4
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,15,if bool0 then date0 else date1 end,expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,38.0,"
-      SELECT (CASE WHEN (`calcs`.`bool0` <> 0) THEN `calcs`.`date0` ELSE `calcs`.`date1` END) AS `TEMP(Test)(3012038505)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3012038505)(0)`
-    ",,"%null%
-#2004-04-02 00:00:00#
-#2004-04-03 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-08 00:00:00#
-#2004-04-09 00:00:00#
-#2004-04-10 00:00:00#
-#2004-04-12 00:00:00#
-#2004-04-13 00:00:00#
-#2004-04-14 00:00:00#
-#2004-04-15 00:00:00#
-#2004-04-16 00:00:00#
-#2004-04-17 00:00:00#
-#2004-06-04 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.bool.txt,False,0,5,if bool0 then str2 else str3 end,expression,Required,"Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation","MIN,$IF$,IIF,==,INT,ISNULL,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,38.0,"
-      SELECT (CASE WHEN (`calcs`.`bool0` <> 0) THEN `calcs`.`str2` ELSE `calcs`.`str3` END) AS `TEMP(Test)(490796425)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(490796425)(0)`
-    ",,"%null%
-""e""
-""eleven""
-""fifteen""
-""one"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,IF TRUE AND TRUE THEN TRUE END,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,33.0,"
-      SELECT 1 AS `TEMP(Test)(2106812187)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,CASE [int0] WHEN 1 THEN 'test1' WHEN 3 THEN 'test3' ELSE 'testelse' END,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,27.0,"
-      SELECT (CASE `calcs`.`int0` WHEN 1 THEN 'test1' WHEN 3 THEN 'test3' ELSE 'testelse' END) AS `TEMP(Test)(4155671032)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4155671032)(0)`
-    ","""test1""
-""test3""
-""testelse""","""test1""
-""test3""
-""testelse"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,IF [int0] = 1 THEN 'yes' ELSE 'no' END,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,26.0,"
-      SELECT (CASE WHEN (`calcs`.`int0` = 1) THEN 'yes' ELSE 'no' END) AS `TEMP(Test)(344883989)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(344883989)(0)`
-    ","""no""
-""yes""","""no""
-""yes"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,IF [int0] = 1 THEN 'yes' ELSEIF [int0] = 3 THEN 'yes3' ELSE 'no' END,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,26.0,"
-      SELECT (CASE WHEN (`calcs`.`int0` = 1) THEN 'yes' WHEN (`calcs`.`int0` = 3) THEN 'yes3' ELSE 'no' END) AS `TEMP(Test)(1470681487)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1470681487)(0)`
-    ","""no""
-""yes""
-""yes3""","""no""
-""yes""
-""yes3"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"IFNULL([int0], 0)",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,27.0,"
-      SELECT IFNULL(`calcs`.`int0`, 0) AS `TEMP(Test)(404394451)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(404394451)(0)`
-    ","0
-1
-3
-4
-7
-8
-10
-11","0
-1
-3
-4
-7
-8
-10
-11"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"IIF([int0] > 3, 'yes', 'no')",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`int0` > 3) THEN 'yes' WHEN NOT (`calcs`.`int0` > 3) THEN 'no' ELSE NULL END) AS `TEMP(Test)(2582407534)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2582407534)(0)`
-    ","%null%
-""no""
-""yes""","%null%
-""no""
-""yes"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"IIF([int0] > 3, 'yes', 'no', 'I dont know')",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`int0` > 3) THEN 'yes' WHEN NOT (`calcs`.`int0` > 3) THEN 'no' ELSE 'I dont know' END) AS `TEMP(Test)(485230187)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(485230187)(0)`
-    ","""I dont know""
-""no""
-""yes""","""I dont know""
-""no""
-""yes"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,ISNULL([int0]),expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,25.0,"
-      SELECT (CASE WHEN ISNULL(`calcs`.`int0`) THEN 1 ELSE 0 END) AS `TEMP(Test)(3944872634)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3944872634)(0)`
-    ","false
-true","false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,IF NOT FALSE THEN 'yes' END,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,26.0,"
-      SELECT 'yes' AS `TEMP(Test)(1030668643)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ","""yes""","""yes"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,IF NOT [int0] = 1 THEN 'yes' ELSE 'no' END,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,31.0,"
-      SELECT (CASE WHEN (`calcs`.`int0` <> 1) THEN 'yes' ELSE 'no' END) AS `TEMP(Test)(1548476355)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1548476355)(0)`
-    ","""no""
-""yes""","""no""
-""yes"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"iif(num0>num1,num0,num1) ",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,28.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`num0` WHEN NOT (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`num1` ELSE NULL END) AS `TEMP(Test)(2733626226)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2733626226)(0)`
-    ","%null%
-6.71
-7.43
-9.05
-9.38
-10.0
-12.3
-15.7
-16.42","%null%
-6.71
-7.43
-9.05
-9.38
-10.0
-12.3
-15.7
-16.42"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,isnull(num4) ,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,26.0,"
-      SELECT (CASE WHEN ISNULL(`calcs`.`num4`) THEN 1 ELSE 0 END) AS `TEMP(Test)(746449830)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(746449830)(0)`
-    ","false
-true","false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,isnull(str2) ,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,26.0,"
-      SELECT (CASE WHEN ISNULL(`calcs`.`str2`) THEN 1 ELSE 0 END) AS `TEMP(Test)(4153117630)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4153117630)(0)`
-    ","false
-true","false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"iif(str0>str1,str2,str3) ",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`str0` > `calcs`.`str1`) THEN `calcs`.`str2` WHEN NOT (`calcs`.`str0` > `calcs`.`str1`) THEN `calcs`.`str3` ELSE NULL END) AS `TEMP(Test)(661341884)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(661341884)(0)`
-    ","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two""","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"min(date0,date1) ",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,31.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`date0`) THEN NULL
-                WHEN ISNULL(`calcs`.`date1`) THEN NULL
-	            WHEN `calcs`.`date0` < `calcs`.`date1` THEN `calcs`.`date0`
-                ELSE `calcs`.`date1` END AS `TEMP(Test)(1970381992)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1970381992)(0)`
-    ","%null%
-#1972-07-04 00:00:00#
-#1975-11-12 00:00:00#
-#2004-04-01 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#","%null%
-#1972-07-04 00:00:00#
-#1975-11-12 00:00:00#
-#2004-04-01 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"iif(num0>num1,date0,date1,date2) ",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,28.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`date0` WHEN NOT (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`date1` ELSE `calcs`.`date2` END) AS `TEMP(Test)(2049518482)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2049518482)(0)`
-    ","%null%
-#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1975-11-12 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-07 00:00:00#
-#2004-04-15 00:00:00#","%null%
-#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1975-11-12 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-07 00:00:00#
-#2004-04-15 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,lower(str0) ,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,26.0,"
-      SELECT LOWER(`calcs`.`str0`) AS `TEMP(Test)(157987442)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(157987442)(0)`
-    ","""furniture""
-""office supplies""
-""technology""","""furniture""
-""office supplies""
-""technology"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"iif(num0>num1,str2,str3,str0) ",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,26.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`str2` WHEN NOT (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`str3` ELSE `calcs`.`str0` END) AS `TEMP(Test)(3250337019)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3250337019)(0)`
-    ","%null%
-""e""
-""nine""
-""OFFICE SUPPLIES""
-""one""
-""TECHNOLOGY""
-""three""","%null%
-""e""
-""nine""
-""OFFICE SUPPLIES""
-""one""
-""TECHNOLOGY""
-""three"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"iif(num0>num1,date0,date1) ",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,28.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`date0` WHEN NOT (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`date1` ELSE NULL END) AS `TEMP(Test)(1454773621)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1454773621)(0)`
-    ","%null%
-#1975-11-12 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-07 00:00:00#
-#2004-04-15 00:00:00#","%null%
-#1975-11-12 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-07 00:00:00#
-#2004-04-15 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"iif(num0>num1,num0,num1,num2) ",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,32.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`num0` WHEN NOT (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`num1` ELSE `calcs`.`num2` END) AS `TEMP(Test)(1162317302)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1162317302)(0)`
-    ","%null%
-3.79
-6.71
-6.8
-7.43
-7.87
-9.05
-9.38
-10.0
-10.98
-11.5
-12.3
-13.04
-15.7
-16.42
-17.25","%null%
-3.79
-6.71
-6.8
-7.43
-7.87
-9.05
-9.38
-10.0
-10.98
-11.5
-12.3
-13.04
-15.7
-16.42
-17.25"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"min(lower(str0),str2) ",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,28.0,"
-      SELECT CASE WHEN ISNULL(LOWER(`calcs`.`str0`)) THEN NULL
-                WHEN ISNULL(`calcs`.`str2`) THEN NULL
-	            WHEN LOWER(`calcs`.`str0`) < `calcs`.`str2` THEN LOWER(`calcs`.`str0`)
-                ELSE `calcs`.`str2` END AS `TEMP(Test)(1389344980)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1389344980)(0)`
-    ","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""furniture""
-""nine""
-""office supplies""
-""sixteen""
-""technology""","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""furniture""
-""nine""
-""office supplies""
-""sixteen""
-""technology"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,False,6,6,"IFNULL(date0, #4/12/2010#) ",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,"
-      Error executing query
-
-    ",Actual does not match expected.,37.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`date0`) THEN SUBDATE(TIMESTAMP(DATE('2010-04-12')), INTERVAL HOUR(TIMESTAMP(DATE('2010-04-12'))) HOUR) ELSE `calcs`.`date0` END AS `TEMP(Test)(1229425804)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1229425804)(0)`
-    ",,"#1972-07-04 00:00:00#
-#1975-11-12 00:00:00#
-#2004-04-15 00:00:00#
-#2004-06-04 00:00:00#
-#2004-06-19 00:00:00#
-#2010-04-12 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"IFNULL(num4, -1) ",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,29.0,"
-      SELECT IFNULL(`calcs`.`num4`, -1) AS `TEMP(Test)(4224438892)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4224438892)(0)`
-    ","-14.21
--13.47
--10.24
--6.05
--1.0
-3.38
-3.82
-4.77
-6.75
-8.32
-10.71
-10.85
-19.39","-14.21
--13.47
--10.24
--6.05
--1.0
-3.38
-3.82
-4.77
-6.75
-8.32
-10.71
-10.85
-19.39"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,False,6,1,"IFNULL(str2, ""i'm null"") ",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,Actual does not match expected.,Actual does not match expected.,27.0,"
-      SELECT IFNULL(`calcs`.`str2`, 'i''m null') AS `TEMP(Test)(3314993157)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3314993157)(0)`
-    ","""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""i''m null""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two""","""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""i'm null""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,isnull(date0) ,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,25.0,"
-      SELECT (CASE WHEN ISNULL(`calcs`.`date0`) THEN 1 ELSE 0 END) AS `TEMP(Test)(2842042984)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2842042984)(0)`
-    ","false
-true","false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,False,6,3,(if num0>num1 then int(bool1) else int(bool2) end) == int(true),expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,"
-      Error executing query
-
-    ",Actual does not match expected.,40.0,"
-      SELECT (CASE WHEN ((CASE WHEN (`calcs`.`num0` > `calcs`.`num1`) THEN CAST((`calcs`.`bool1` <> 0) as int) ELSE CAST((`calcs`.`bool2` <> 0) as int) END) = CAST((1 <> 0) as int)) THEN 1 WHEN NOT ((CASE WHEN (`calcs`.`num0` > `calcs`.`num1`) THEN CAST((`calcs`.`bool1` <> 0) as int) ELSE CAST((`calcs`.`bool2` <> 0) as int) END) = CAST((1 <> 0) as int)) THEN 0 ELSE NULL END) AS `TEMP(Test)(4227881224)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4227881224)(0)`
-    ",,"%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,if num0>num1 then num0 else num1 end,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`num0` ELSE `calcs`.`num1` END) AS `TEMP(Test)(709594122)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(709594122)(0)`
-    ","2.47
-6.71
-7.1
-7.12
-7.43
-9.05
-9.38
-10.0
-10.32
-10.37
-11.38
-12.05
-12.3
-12.4
-15.7
-16.42
-16.81","2.47
-6.71
-7.1
-7.12
-7.43
-9.05
-9.38
-10.0
-10.32
-10.37
-11.38
-12.05
-12.3
-12.4
-15.7
-16.42
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,if num0>num1 then date0 else date1 end,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` > `calcs`.`num1`) THEN `calcs`.`date0` ELSE `calcs`.`date1` END) AS `TEMP(Test)(467266194)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(467266194)(0)`
-    ","%null%
-#1975-11-12 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-07 00:00:00#
-#2004-04-08 00:00:00#
-#2004-04-10 00:00:00#
-#2004-04-11 00:00:00#
-#2004-04-12 00:00:00#
-#2004-04-13 00:00:00#
-#2004-04-14 00:00:00#
-#2004-04-15 00:00:00#
-#2004-04-16 00:00:00#
-#2004-04-17 00:00:00#","%null%
-#1975-11-12 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-07 00:00:00#
-#2004-04-08 00:00:00#
-#2004-04-10 00:00:00#
-#2004-04-11 00:00:00#
-#2004-04-12 00:00:00#
-#2004-04-13 00:00:00#
-#2004-04-14 00:00:00#
-#2004-04-15 00:00:00#
-#2004-04-16 00:00:00#
-#2004-04-17 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,if str0>str1 then str2 else str3 end,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,26.0,"
-      SELECT (CASE WHEN (`calcs`.`str0` > `calcs`.`str1`) THEN `calcs`.`str2` ELSE `calcs`.`str3` END) AS `TEMP(Test)(2963734906)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2963734906)(0)`
-    ","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two""","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,case int(num0>num1) when int(true) then num0 when int(false) then num1 else num2 end,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,28.0,"
-      SELECT (CASE CAST((`calcs`.`num0` > `calcs`.`num1`) as int) WHEN CAST((1 <> 0) as int) THEN `calcs`.`num0` WHEN CAST((0 <> 0) as int) THEN `calcs`.`num1` ELSE `calcs`.`num2` END) AS `TEMP(Test)(4143049742)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4143049742)(0)`
-    ","%null%
-3.79
-6.71
-6.8
-7.43
-7.87
-9.05
-9.38
-10.0
-10.98
-11.5
-12.3
-13.04
-15.7
-16.42
-17.25","%null%
-3.79
-6.71
-6.8
-7.43
-7.87
-9.05
-9.38
-10.0
-10.98
-11.5
-12.3
-13.04
-15.7
-16.42
-17.25"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,case int(num0>num1) when int(true) then date0 when int(false) then date1 else date2 end,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,29.0,"
-      SELECT (CASE CAST((`calcs`.`num0` > `calcs`.`num1`) as int) WHEN CAST((1 <> 0) as int) THEN `calcs`.`date0` WHEN CAST((0 <> 0) as int) THEN `calcs`.`date1` ELSE `calcs`.`date2` END) AS `TEMP(Test)(1171954805)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1171954805)(0)`
-    ","%null%
-#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1975-11-12 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-07 00:00:00#
-#2004-04-15 00:00:00#","%null%
-#1972-07-12 00:00:00#
-#1974-03-17 00:00:00#
-#1974-05-03 00:00:00#
-#1975-11-12 00:00:00#
-#1988-01-05 00:00:00#
-#1994-04-20 00:00:00#
-#1995-06-04 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-04 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-07 00:00:00#
-#2004-04-15 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,case int(num0>num1) when int(true) then str2 when int(false) then str3 else str0 end,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,33.0,"
-      SELECT (CASE CAST((`calcs`.`num0` > `calcs`.`num1`) as int) WHEN CAST((1 <> 0) as int) THEN `calcs`.`str2` WHEN CAST((0 <> 0) as int) THEN `calcs`.`str3` ELSE `calcs`.`str0` END) AS `TEMP(Test)(2451799140)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2451799140)(0)`
-    ","%null%
-""e""
-""nine""
-""OFFICE SUPPLIES""
-""one""
-""TECHNOLOGY""
-""three""","%null%
-""e""
-""nine""
-""OFFICE SUPPLIES""
-""one""
-""TECHNOLOGY""
-""three"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,False,6,13,case int(bool0) when int(true) then num0 when int(false) then num1 else num2 end,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,"
-      Error executing query
-
-    ",Actual does not match expected.,37.0,"
-      SELECT (CASE CAST((`calcs`.`bool0` <> 0) as int) WHEN CAST((1 <> 0) as int) THEN `calcs`.`num0` WHEN CAST((0 <> 0) as int) THEN `calcs`.`num1` ELSE `calcs`.`num2` END) AS `TEMP(Test)(1574830296)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1574830296)(0)`
-    ",,"%null%
--15.7
-0.0
-2.47
-6.71
-7.87
-8.98
-9.05
-11.38
-11.5
-12.3
-13.04
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,False,6,15,case int(bool0) when int(true) then date0 when int(false) then date1 else date2 end,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,"
-      Error executing query
-
-    ",Actual does not match expected.,37.0,"
-      SELECT (CASE CAST((`calcs`.`bool0` <> 0) as int) WHEN CAST((1 <> 0) as int) THEN `calcs`.`date0` WHEN CAST((0 <> 0) as int) THEN `calcs`.`date1` ELSE `calcs`.`date2` END) AS `TEMP(Test)(49931887)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(49931887)(0)`
-    ",,"%null%
-#1976-09-09 00:00:00#
-#1980-11-07 00:00:00#
-#1988-01-05 00:00:00#
-#1997-09-19 00:00:00#
-#1998-08-12 00:00:00#
-#2001-02-04 00:00:00#
-#2002-04-27 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-08 00:00:00#
-#2004-04-12 00:00:00#
-#2004-04-15 00:00:00#
-#2004-04-16 00:00:00#
-#2004-06-04 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,False,6,13," case datepart('weekday',date1) when 7 then null when 1 then null else date1 end",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,"
-      Error executing query
-
-    ",Actual does not match expected.,38.0,"
-      SELECT (CASE WHEN (DAYOFWEEK(`calcs`.`date1`) IN (7, 1)) THEN NULL ELSE `calcs`.`date1` END) AS `TEMP(Test)(1471931871)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1471931871)(0)`
-    ",,"%null%
-#2004-04-01 00:00:00#
-#2004-04-02 00:00:00#
-#2004-04-05 00:00:00#
-#2004-04-06 00:00:00#
-#2004-04-07 00:00:00#
-#2004-04-08 00:00:00#
-#2004-04-09 00:00:00#
-#2004-04-12 00:00:00#
-#2004-04-13 00:00:00#
-#2004-04-14 00:00:00#
-#2004-04-15 00:00:00#
-#2004-04-16 00:00:00#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,False,6,7,case int(bool0) when int(true) then str2 when int(false) then str3 else str0 end,expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,"
-      Error executing query
-
-    ",Actual does not match expected.,38.0,"
-      SELECT (CASE CAST((`calcs`.`bool0` <> 0) as int) WHEN CAST((1 <> 0) as int) THEN `calcs`.`str2` WHEN CAST((0 <> 0) as int) THEN `calcs`.`str3` ELSE `calcs`.`str0` END) AS `TEMP(Test)(166894492)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(166894492)(0)`
-    ",,"%null%
-""e""
-""eleven""
-""fifteen""
-""OFFICE SUPPLIES""
-""one""
-""TECHNOLOGY"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,logical,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.logical.txt,True,6,0,"if [str1] = ""CLOCKS"" then ""*Anonymous*"" elseif [str1] = ""DVD"" then ""*Public*"" else [str1] end",expression,Required,"Date Filters,Calculation,Cast,Filters,Operator,Logical,NULL Semantics,Aggregation,Sets","MAX,COUNT,MIN,$CASE$,IFNULL,IIF,>,$IF$,$IN_SET$,!,!=,&&,INT,LOWER,ISNULL,DATEPART,==",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`str1` = 'CLOCKS') THEN '*Anonymous*' WHEN (`calcs`.`str1` = 'DVD') THEN '*Public*' ELSE `calcs`.`str1` END) AS `TEMP(Test)(899461877)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(899461877)(0)`
-    ","""*Anonymous*""
-""*Public*""
-""AIR PURIFIERS""
-""ANSWERING MACHINES""
-""BINDER ACCESSORIES""
-""BINDER CLIPS""
-""BINDING MACHINES""
-""BINDING SUPPLIES""
-""BUSINESS COPIERS""
-""BUSINESS ENVELOPES""
-""CD-R MEDIA""
-""CLAMP ON LAMPS""
-""CONFERENCE PHONES""
-""CORDED KEYBOARDS""
-""CORDLESS KEYBOARDS""
-""DOT MATRIX PRINTERS""
-""ERICSSON""","""*Anonymous*""
-""*Public*""
-""AIR PURIFIERS""
-""ANSWERING MACHINES""
-""BINDER ACCESSORIES""
-""BINDER CLIPS""
-""BINDING MACHINES""
-""BINDING SUPPLIES""
-""BUSINESS COPIERS""
-""BUSINESS ENVELOPES""
-""CD-R MEDIA""
-""CLAMP ON LAMPS""
-""CONFERENCE PHONES""
-""CORDED KEYBOARDS""
-""CORDLESS KEYBOARDS""
-""DOT MATRIX PRINTERS""
-""ERICSSON"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.abs,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.abs.txt,True,0,0,ABS([int2]),expression,Required,Calculation,ABS,,None,None,67.0,"
-      SELECT ABS(`calcs`.`int2`) AS `TEMP(Test)(2102582873)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2102582873)(0)`
-    ","0
-2
-3
-4
-5
-6
-8
-9","0
-2
-3
-4
-5
-6
-8
-9"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.abs,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.abs.txt,True,0,0,abs(num0),expression,Required,Calculation,ABS,,None,None,48.0,"
-      SELECT ABS(`calcs`.`num0`) AS `TEMP(Test)(3816473022)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3816473022)(0)`
-    ","%null%
-0.0
-3.5
-10.0
-12.3
-15.7","%null%
-0.0
-3.5
-10.0
-12.3
-15.7"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.atan2,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.atan2.txt,True,0,0,"ATAN2([int2],1)",expression,Required If Supported,Calculation,ATAN2,,None,None,44.0,"
-      SELECT ATAN2(`calcs`.`int2`,1) AS `TEMP(Test)(2745915023)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2745915023)(0)`
-    ","-1.4601391
--1.4464413
--1.4056476
--1.3734008
--1.3258177
--1.2490458
-0.0
-1.1071487
-1.2490458
-1.3258177
-1.3734008
-1.4056476
-1.4601391","-1.4601391
--1.4464413
--1.4056476
--1.3734008
--1.3258177
--1.2490458
-0.0
-1.1071487
-1.2490458
-1.3258177
-1.3734008
-1.4056476
-1.4601391"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.atan2,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.atan2.txt,True,0,0,"atan2(num0,num1)",expression,Required If Supported,Calculation,ATAN2,,None,None,34.0,"
-      SELECT ATAN2(`calcs`.`num0`,`calcs`.`num1`) AS `TEMP(Test)(3341395046)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3341395046)(0)`
-    ","%null%
--1.1287781
--1.0713926
--0.35713401
-0.0
-0.36902363
-0.81261281
-0.97051299
-1.013687","%null%
--1.1287781
--1.0713926
--0.35713401
-0.0
-0.36902363
-0.81261281
-0.97051299
-1.013687"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.cos,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.cos.txt,True,0,0,COS([int2]),expression,Required,Calculation,COS,,None,None,37.0,"
-      SELECT COS(`calcs`.`int2`) AS `TEMP(Test)(344207442)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(344207442)(0)`
-    ","-0.9899925
--0.91113026
--0.65364362
--0.41614684
--0.14550003
-0.28366219
-0.96017029
-1.0","-0.9899925
--0.91113026
--0.65364362
--0.41614684
--0.14550003
-0.28366219
-0.96017029
-1.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.cos,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.cos.txt,True,0,0,cos(num0),expression,Required,Calculation,COS,,None,None,31.0,"
-      SELECT COS(`calcs`.`num0`) AS `TEMP(Test)(1355320598)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1355320598)(0)`
-    ","%null%
--0.99996829
--0.93645669
--0.83907153
-0.96473262
-1.0","%null%
--0.99996829
--0.93645669
--0.83907153
-0.96473262
-1.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.cot,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.cot.txt,True,0,0,COT([int2]),expression,Required,Calculation,COT,,None,None,39.0,"
-      SELECT CASE WHEN `calcs`.`int2` = 0 THEN NULL ELSE COT(`calcs`.`int2`) END AS `TEMP(Test)(2415226193)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2415226193)(0)`
-    ","%null%
--7.0152526
--3.436353
--2.2108454
--0.86369115
--0.45765755
--0.29581292
-0.14706506
-0.29581292
-0.86369115
-2.2108454
-3.436353
-7.0152526","%null%
--7.0152526
--3.436353
--2.2108454
--0.86369115
--0.45765755
--0.29581292
-0.14706506
-0.29581292
-0.86369115
-2.2108454
-3.436353
-7.0152526"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.cot,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.cot.txt,True,0,0,cot(num0),expression,Required,Calculation,COT,,None,None,29.0,"
-      SELECT CASE WHEN `calcs`.`num0` = 0 THEN NULL ELSE COT(`calcs`.`num0`) END AS `TEMP(Test)(2834009176)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2834009176)(0)`
-    ","%null%
--125.57393
--3.6649548
--2.6696165
-1.542351
-2.6696165
-3.6649548
-125.57393","%null%
--125.57393
--3.6649548
--2.6696165
-1.542351
-2.6696165
-3.6649548
-125.57393"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.degree,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.degree.txt,True,0,0,DEGREES([int2]),expression,Required,Calculation,DEGREES,,None,None,46.0,"
-      SELECT DEGREES(`calcs`.`int2`) AS `TEMP(Test)(2688244734)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2688244734)(0)`
-    ","-515.66202
--458.36624
--343.77468
--286.4789
--229.18312
--171.88734
-0.0
-114.59156
-171.88734
-229.18312
-286.4789
-343.77468
-515.66202","-515.66202
--458.36624
--343.77468
--286.4789
--229.18312
--171.88734
-0.0
-114.59156
-171.88734
-229.18312
-286.4789
-343.77468
-515.66202"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.degree,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.degree.txt,True,0,0,degrees(num0),expression,Required,Calculation,DEGREES,,None,None,31.0,"
-      SELECT DEGREES(`calcs`.`num0`) AS `TEMP(Test)(583539797)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(583539797)(0)`
-    ","%null%
--899.54374
--704.73809
--200.53523
-0.0
-200.53523
-572.9578
-704.73809
-899.54374","%null%
--899.54374
--704.73809
--200.53523
-0.0
-200.53523
-572.9578
-704.73809
-899.54374"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.div,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.div.txt,True,0,0,"DIV([int2],2)",expression,Required,Calculation,DIV,,None,None,37.0,"
-      SELECT CASE WHEN 2 = 0 THEN NULL ELSE ( `calcs`.`int2` / 2 ) END AS `TEMP(Test)(266359676)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(266359676)(0)`
-    ","-4
--3
--2
--1
-0
-1
-2
-3
-4","-4
--3
--2
--1
-0
-1
-2
-3
-4"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.div,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.div.txt,True,0,0,"div(int0,int1)",expression,Required,Calculation,DIV,,None,None,30.0,"
-      SELECT CASE WHEN `calcs`.`int1` = 0 THEN NULL ELSE ( `calcs`.`int0` / `calcs`.`int1` ) END AS `TEMP(Test)(2600727600)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2600727600)(0)`
-    ","%null%
--1
-0
-2","%null%
--1
-0
-2"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.div,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.div.txt,True,0,0,"div(int3,int2)",expression,Required,Calculation,DIV,,None,None,29.0,"
-      SELECT CASE WHEN `calcs`.`int2` = 0 THEN NULL ELSE ( `calcs`.`int3` / `calcs`.`int2` ) END AS `TEMP(Test)(3955107424)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3955107424)(0)`
-    ","%null%
--3
--2
--1
-0
-1
-2
-3
-4","%null%
--3
--2
--1
-0
-1
-2
-3
-4"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.ln,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.ln.txt,True,0,0,LN([int2]),expression,Required,Calculation,LN,,None,None,36.0,"
-      SELECT (CASE WHEN `calcs`.`int2` > 0 THEN LN(`calcs`.`int2`) ELSE NULL END) AS `TEMP(Test)(2832324438)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2832324438)(0)`
-    ","%null%
-0.69314718
-1.0986123
-1.3862944
-1.6094379
-1.7917595
-2.1972246","%null%
-0.69314718
-1.0986123
-1.3862944
-1.6094379
-1.7917595
-2.1972246"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.ln,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.ln.txt,True,0,0,ln(num0),expression,Required,Calculation,LN,,None,None,27.0,"
-      SELECT (CASE WHEN `calcs`.`num0` > 0 THEN LN(`calcs`.`num0`) ELSE NULL END) AS `TEMP(Test)(1125921255)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1125921255)(0)`
-    ","%null%
-1.252763
-2.3025851
-2.5095993
-2.7536607","%null%
-1.252763
-2.3025851
-2.5095993
-2.7536607"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.log,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.log.txt,True,0,0,LOG([int2]),expression,Required,Calculation,LOG,,None,None,37.0,"
-      SELECT CASE WHEN `calcs`.`int2` > 0 THEN LOG10(`calcs`.`int2`) ELSE NULL END AS `TEMP(Test)(114283928)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(114283928)(0)`
-    ","%null%
-0.30103
-0.47712125
-0.60205999
-0.69897
-0.77815125
-0.95424251","%null%
-0.30103
-0.47712125
-0.60205999
-0.69897
-0.77815125
-0.95424251"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.log,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.log.txt,True,0,0,"LOG([int2],2)",expression,Required,Calculation,LOG,,None,None,32.0,"
-      SELECT CASE WHEN `calcs`.`int2` > 0 AND 2 > 0 AND 2 <> 1 THEN LOG(2,`calcs`.`int2`) ELSE NULL END AS `TEMP(Test)(3322085183)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3322085183)(0)`
-    ","%null%
-1.0
-1.5849625
-2.0
-2.3219281
-2.5849625
-3.169925","%null%
-1.0
-1.5849625
-2.0
-2.3219281
-2.5849625
-3.169925"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.log,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.log.txt,True,0,0,log(num0),expression,Required,Calculation,LOG,,None,None,27.0,"
-      SELECT CASE WHEN `calcs`.`num0` > 0 THEN LOG10(`calcs`.`num0`) ELSE NULL END AS `TEMP(Test)(1814892178)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1814892178)(0)`
-    ","%null%
-0.54406804
-1.0
-1.0899051
-1.1958997","%null%
-0.54406804
-1.0
-1.0899051
-1.1958997"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.log,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.log.txt,True,0,0,"log(num0,2)",expression,Required,Calculation,LOG,,None,None,27.0,"
-      SELECT CASE WHEN `calcs`.`num0` > 0 AND 2 > 0 AND 2 <> 1 THEN LOG(2,`calcs`.`num0`) ELSE NULL END AS `TEMP(Test)(3081102343)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3081102343)(0)`
-    ","%null%
-1.8073549
-3.3219281
-3.6205864
-3.9726927","%null%
-1.8073549
-3.3219281
-3.6205864
-3.9726927"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.power,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.power.txt,True,0,0,"POWER([int2], 2)",expression,Required,"Calculation,Table Calc",POWER,,None,None,144.0,"
-      SELECT (CASE WHEN `calcs`.`int2` >= 0 OR FLOOR(2) = 2 THEN POWER(`calcs`.`int2`,2) END) AS `TEMP(Test)(3037854782)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3037854782)(0)`
-    ","0.0
-4.0
-9.0
-16.0
-25.0
-36.0
-64.0
-81.0","0.0
-4.0
-9.0
-16.0
-25.0
-36.0
-64.0
-81.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.radians,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.radians.txt,True,0,0,RADIANS([int2]),expression,Required,Calculation,RADIANS,,None,None,102.0,"
-      SELECT RADIANS(`calcs`.`int2`) AS `TEMP(Test)(1973795369)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1973795369)(0)`
-    ","-0.15707963
--0.13962634
--0.10471976
--0.087266463
--0.06981317
--0.052359878
-0.0
-0.034906585
-0.052359878
-0.06981317
-0.087266463
-0.10471976
-0.15707963","-0.15707963
--0.13962634
--0.10471976
--0.087266463
--0.06981317
--0.052359878
-0.0
-0.034906585
-0.052359878
-0.06981317
-0.087266463
-0.10471976
-0.15707963"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.radians,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.radians.txt,True,0,0,radians(num0),expression,Required,Calculation,RADIANS,,None,None,51.0,"
-      SELECT RADIANS(`calcs`.`num0`) AS `TEMP(Test)(2823743498)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2823743498)(0)`
-    ","%null%
--0.27401669
--0.2146755
--0.061086524
-0.0
-0.061086524
-0.17453293
-0.2146755
-0.27401669","%null%
--0.27401669
--0.2146755
--0.061086524
-0.0
-0.061086524
-0.17453293
-0.2146755
-0.27401669"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.round.B584401,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.round.B584401.txt,True,0,0,"ROUND([num3],0)",expression,Recommended,Calculation,ROUND,,None,None,68.0,"
-      SELECT ROUND(`calcs`.`num3`,0) AS `TEMP(Test)(3830326670)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3830326670)(0)`
-    ","-20.0
--18.0
--13.0
--12.0
--11.0
--9.0
--7.0
--5.0
--3.0
-4.0
-7.0
-11.0
-13.0","-20.0
--18.0
--13.0
--12.0
--11.0
--9.0
--7.0
--5.0
--3.0
-4.0
-7.0
-11.0
-13.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.round.B584401,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.round.B584401.txt,True,0,0,ROUND([num3]),expression,Recommended,Calculation,ROUND,,None,None,55.0,"
-      SELECT ROUND(`calcs`.`num3`) AS `TEMP(Test)(4174655436)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4174655436)(0)`
-    ","-20.0
--18.0
--13.0
--12.0
--11.0
--9.0
--7.0
--5.0
--3.0
-4.0
-7.0
-11.0
-13.0","-20.0
--18.0
--13.0
--12.0
--11.0
--9.0
--7.0
--5.0
--3.0
-4.0
-7.0
-11.0
-13.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.round,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.round.txt,True,1,0,ROUND([int2]),expression,Required,Calculation,ROUND,,None,None,70.0,"
-      SELECT ROUND(`calcs`.`int2`) AS `TEMP(Test)(366741644)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(366741644)(0)`
-    ","-9.0
--8.0
--6.0
--5.0
--4.0
--3.0
-0.0
-2.0
-3.0
-4.0
-5.0
-6.0
-9.0","-9.0
--8.0
--6.0
--5.0
--4.0
--3.0
-0.0
-2.0
-3.0
-4.0
-5.0
-6.0
-9.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.round,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.round.txt,True,1,0,"ROUND([int2], 2)",expression,Required,Calculation,ROUND,,None,None,40.0,"
-      SELECT ROUND(`calcs`.`int2`,2) AS `TEMP(Test)(1240237577)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1240237577)(0)`
-    ","-9.0
--8.0
--6.0
--5.0
--4.0
--3.0
-0.0
-2.0
-3.0
-4.0
-5.0
-6.0
-9.0","-9.0
--8.0
--6.0
--5.0
--4.0
--3.0
-0.0
-2.0
-3.0
-4.0
-5.0
-6.0
-9.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.round,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.round.txt,True,1,0,round(num0),expression,Required,Calculation,ROUND,,None,None,35.0,"
-      SELECT ROUND(`calcs`.`num0`) AS `TEMP(Test)(3892529067)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3892529067)(0)`
-    ","%null%
--16.0
--12.0
--4.0
-0.0
-4.0
-10.0
-12.0
-16.0","%null%
--16.0
--12.0
--4.0
-0.0
-4.0
-10.0
-12.0
-16.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.round,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.round.txt,True,1,0,"round(num4,1)",expression,Required,Calculation,ROUND,,None,None,38.0,"
-      SELECT ROUND(`calcs`.`num4`,1) AS `TEMP(Test)(2722044748)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2722044748)(0)`
-    ","%null%
--14.2
--13.5
--10.2
--6.0
-3.4
-3.8
-4.8
-6.8
-8.3
-10.7
-10.8
-19.4","%null%
--14.2
--13.5
--10.2
--6.0
-3.4
-3.8
-4.8
-6.8
-8.3
-10.7
-10.8
-19.4"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.sign,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.sign.txt,True,0,0,SIGN([int2]),expression,Required,Calculation,SIGN,,None,None,58.0,"
-      SELECT SIGN(`calcs`.`int2`) AS `TEMP(Test)(3509671532)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3509671532)(0)`
-    ","-1
-0
-1","-1
-0
-1"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.sign,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.sign.txt,True,0,0,sign(num0),expression,Required,Calculation,SIGN,,None,None,59.0,"
-      SELECT SIGN(`calcs`.`num0`) AS `TEMP(Test)(4247289834)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4247289834)(0)`
-    ","%null%
--1
-0
-1","%null%
--1
-0
-1"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.sin,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.sin.txt,True,0,0,SIN([int2]),expression,Required,Calculation,SIN,,None,None,54.0,"
-      SELECT SIN(`calcs`.`int2`) AS `TEMP(Test)(527156183)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(527156183)(0)`
-    ","-0.98935825
--0.95892427
--0.7568025
--0.41211849
--0.2794155
--0.14112001
-0.0
-0.14112001
-0.2794155
-0.41211849
-0.7568025
-0.90929743
-0.95892427","-0.98935825
--0.95892427
--0.7568025
--0.41211849
--0.2794155
--0.14112001
-0.0
-0.14112001
-0.2794155
-0.41211849
-0.7568025
-0.90929743
-0.95892427"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.sin,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.sin.txt,True,0,0,sin(num0),expression,Required,Calculation,SIN,,None,None,51.0,"
-      SELECT SIN(`calcs`.`num0`) AS `TEMP(Test)(1184030290)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1184030290)(0)`
-    ","%null%
--0.54402111
--0.35078323
--0.26323179
--0.0079631838
-0.0
-0.0079631838
-0.26323179
-0.35078323","%null%
--0.54402111
--0.35078323
--0.26323179
--0.0079631838
-0.0
-0.0079631838
-0.26323179
-0.35078323"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.sqrt,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.sqrt.txt,True,0,0,SQRT([int2]),expression,Required,Calculation,SQRT,,None,None,77.0,"
-      SELECT SQRT(`calcs`.`int2`) AS `TEMP(Test)(2398974448)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2398974448)(0)`
-    ","%null%
-0.0
-1.4142136
-1.7320508
-2.0
-2.236068
-2.4494897
-3.0","%null%
-0.0
-1.4142136
-1.7320508
-2.0
-2.236068
-2.4494897
-3.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.sqrt,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.sqrt.txt,True,0,0,sqrt(num0),expression,Required,Calculation,SQRT,,None,None,40.0,"
-      SELECT SQRT(`calcs`.`num0`) AS `TEMP(Test)(634651992)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(634651992)(0)`
-    ","%null%
-0.0
-1.8708287
-3.1622777
-3.5071356
-3.9623226","%null%
-0.0
-1.8708287
-3.1622777
-3.5071356
-3.9623226"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.square,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.square.txt,True,0,0,SQUARE([int2]),expression,Required,Calculation,SQUARE,,None,None,66.0,"
-      SELECT POWER(`calcs`.`int2`, 2) AS `TEMP(Test)(3898674109)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3898674109)(0)`
-    ","0
-4
-9
-16
-25
-36
-64
-81","0
-4
-9
-16
-25
-36
-64
-81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.square,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.square.txt,True,0,0,square(num0),expression,Required,Calculation,SQUARE,,None,None,68.0,"
-      SELECT POWER(`calcs`.`num0`, 2) AS `TEMP(Test)(1119897860)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1119897860)(0)`
-    ","%null%
-0.0
-12.25
-100.0
-151.29
-246.49","%null%
-0.0
-12.25
-100.0
-151.29
-246.49"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.tan,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.tan.txt,True,0,0,TAN([int2]),expression,Required,Calculation,TAN,,None,None,87.0,"
-      SELECT TAN(`calcs`.`int2`) AS `TEMP(Test)(1227693937)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1227693937)(0)`
-    ","-3.380515
--2.1850399
--1.1578213
--0.45231566
--0.29100619
--0.14254654
-0.0
-0.14254654
-0.29100619
-0.45231566
-1.1578213
-3.380515
-6.7997115","-3.380515
--2.1850399
--1.1578213
--0.45231566
--0.29100619
--0.14254654
-0.0
-0.14254654
-0.29100619
-0.45231566
-1.1578213
-3.380515
-6.7997115"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.acos,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.acos.txt,True,0,0,acos(num0/20),expression,Recommended,"Calculation,Operator","ACOS,/",,None,None,75.0,"
-      SELECT ACOS((`calcs`.`num0` / 20)) AS `TEMP(Test)(4196263986)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4196263986)(0)`
-    ","%null%
-0.6681002
-0.90841036
-1.0471976
-1.3948906
-1.5707963
-1.7467021
-2.2331823
-2.4734925","%null%
-0.6681002
-0.90841036
-1.0471976
-1.3948906
-1.5707963
-1.7467021
-2.2331823
-2.4734925"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.asin,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.asin.txt,True,0,0,asin(num0/20),expression,Recommended,"Calculation,Operator","ASIN,/",,None,None,43.0,"
-      SELECT ASIN((`calcs`.`num0` / 20)) AS `TEMP(Test)(1317198372)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1317198372)(0)`
-    ","%null%
--0.90269613
--0.66238597
--0.17590577
-0.0
-0.17590577
-0.52359878
-0.66238597
-0.90269613","%null%
--0.90269613
--0.66238597
--0.17590577
-0.0
-0.17590577
-0.52359878
-0.66238597
-0.90269613"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.atan,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.atan.txt,True,0,0,ATAN([int2]),expression,Recommended,Calculation,"ATAN,ATAN2",,None,None,38.0,"
-      SELECT ATAN(`calcs`.`int2`) AS `TEMP(Test)(3655856496)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3655856496)(0)`
-    ","-1.4601391
--1.4464413
--1.4056476
--1.3734008
--1.3258177
--1.2490458
-0.0
-1.1071487
-1.2490458
-1.3258177
-1.3734008
-1.4056476
-1.4601391","-1.4601391
--1.4464413
--1.4056476
--1.3734008
--1.3258177
--1.2490458
-0.0
-1.1071487
-1.2490458
-1.3258177
-1.3734008
-1.4056476
-1.4601391"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.atan,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.atan.txt,True,0,0,atan(num0),expression,Recommended,Calculation,"ATAN,ATAN2",,None,None,31.0,"
-      SELECT ATAN(`calcs`.`num0`) AS `TEMP(Test)(4053915117)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4053915117)(0)`
-    ","%null%
--1.507188
--1.4896739
--1.2924967
-0.0
-1.2924967
-1.4711277
-1.4896739
-1.507188","%null%
--1.507188
--1.4896739
--1.2924967
-0.0
-1.2924967
-1.4711277
-1.4896739
-1.507188"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.exp,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.exp.txt,True,0,0,exp(0.1*num0),expression,Required,"Calculation,Operator","EXP,*",,None,None,41.0,"
-      SELECT EXP((0.1 * `calcs`.`num0`)) AS `TEMP(Test)(526466750)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(526466750)(0)`
-    ","%null%
-0.20804518
-0.29229258
-0.70468809
-1.0
-1.4190675
-2.7182818
-3.4212295
-4.8066482","%null%
-0.20804518
-0.29229258
-0.70468809
-1.0
-1.4190675
-2.7182818
-3.4212295
-4.8066482"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.exp,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.exp.txt,True,0,0,EXP([int2]),expression,Required,"Calculation,Operator","EXP,*",,None,None,30.0,"
-      SELECT EXP(`calcs`.`int2`) AS `TEMP(Test)(2988208579)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2988208579)(0)`
-    ","0.0001234098
-0.00033546263
-0.0024787522
-0.006737947
-0.018315639
-0.049787068
-1.0
-7.3890561
-20.085537
-54.59815
-148.41316
-403.42879
-8103.0839","0.0001234098
-0.00033546263
-0.0024787522
-0.006737947
-0.018315639
-0.049787068
-1.0
-7.3890561
-20.085537
-54.59815
-148.41316
-403.42879
-8103.0839"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.hexbin,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.hexbin.txt,True,0,0,"HEXBINX([int2],2)",expression,Recommended,Mapping,"HEXBINY,HEXBINX",,None,None,57.0,"
-      SELECT (((CASE WHEN (ABS((2) - (CAST( ( (2) / SQRT(3.0) ) AS INT ) * SQRT(3.0)))) + (SQRT(3.0) * ((ABS((`calcs`.`int2`) - (CAST( ( (`calcs`.`int2`) / 3.0 ) AS INT ) * 3.0))) - 1.0)) > 0.0 THEN 1.5 ELSE 0.0 END) - (CASE WHEN ((`calcs`.`int2`) - (CAST( ( (`calcs`.`int2`) / 3.0 ) AS INT ) * 3.0) < 0.0) AND ((CASE WHEN (ABS((2) - (CAST( ( (2) / SQRT(3.0) ) AS INT ) * SQRT(3.0)))) + (SQRT(3.0) * ((ABS((`calcs`.`int2`) - (CAST( ( (`calcs`.`int2`) / 3.0 ) AS INT ) * 3.0))) - 1.0)) > 0.0 THEN 1.5 ELSE 0.0 END) > 0.0) THEN 3.0 ELSE 0.0 END)) + (CAST( ( (`calcs`.`int2`) / 3.0 ) AS INT ) * 3.0)) AS `TEMP(Test)(2503102272)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2503102272)(0)`
-    ","-9.0
--7.5
--6.0
--4.5
--3.0
-0.0
-1.5
-3.0
-4.5
-6.0
-9.0","-9.0
--7.5
--6.0
--4.5
--3.0
-0.0
-1.5
-3.0
-4.5
-6.0
-9.0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.hexbin,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.hexbin.txt,True,0,0,"HEXBINY([int2],2)",expression,Recommended,Mapping,"HEXBINY,HEXBINX",,None,None,42.0,"
-      SELECT ROUND( (((CASE WHEN (ABS((2) - (ROUND( ( (2) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + (SQRT(3.0) * ((ABS((`calcs`.`int2`) - (ROUND( ( (`calcs`.`int2`) / 3.0 ), 0 ) * 3.0))) - 1.0)) > 0.0 THEN SQRT(3.0) / 2.0 ELSE 0.0 END) - (CASE WHEN ((2) - (ROUND( ( (2) / SQRT(3.0) ), 0 ) * SQRT(3.0)) < 0.0) AND ((CASE WHEN (ABS((2) - (ROUND( ( (2) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + (SQRT(3.0) * ((ABS((`calcs`.`int2`) - (ROUND( ( (`calcs`.`int2`) / 3.0 ), 0 ) * 3.0))) - 1.0)) > 0.0 THEN SQRT(3.0) / 2.0 ELSE 0.0 END) > 0.0) THEN SQRT(3.0) ELSE 0.0 END)) + (ROUND( ( (2) / SQRT(3.0) ), 0 ) * SQRT(3.0))), 3) AS `TEMP(Test)(2977666156)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2977666156)(0)`
-    ","1.732
-2.598","1.732
-2.598"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.max.txt,True,0,0,MAX([int0]),expression,Required,Aggregation,"MAX,COUNT",,None,None,35.0,"
-      SELECT MAX(`calcs`.`int0`) AS `TEMP(Test)(56370746)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",11,11
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.max.txt,True,0,0,"MAX([int1],[int2] )",expression,Required,Aggregation,"MAX,COUNT",,None,None,27.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`int1`) THEN NULL
-                WHEN ISNULL(`calcs`.`int2`) THEN NULL
-	            WHEN `calcs`.`int1` > `calcs`.`int2` THEN `calcs`.`int1`
-                ELSE `calcs`.`int2` END AS `TEMP(Test)(2763474205)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2763474205)(0)`
-    ","%null%
--4
-2
-3
-5
-6","%null%
--4
-2
-3
-5
-6"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.min.txt,True,0,0,MIN([int0]),expression,Required,Aggregation,"MIN,COUNT",,None,None,31.0,"
-      SELECT MIN(`calcs`.`int0`) AS `TEMP(Test)(4016644369)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",1,1
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.min.txt,True,0,0,"MIN([int1], [int2])",expression,Required,Aggregation,"MIN,COUNT",,None,None,31.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`int1`) THEN NULL
-                WHEN ISNULL(`calcs`.`int2`) THEN NULL
-	            WHEN `calcs`.`int1` < `calcs`.`int2` THEN `calcs`.`int1`
-                ELSE `calcs`.`int2` END AS `TEMP(Test)(1701645592)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1701645592)(0)`
-    ","%null%
--9
--8
--6
--5
--3
-0","%null%
--9
--8
--6
--5
--3
-0"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.power.real,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.power.real.txt,True,0,0,"power(int0,0.5)",expression,Recommended,"Calculation,Operator,Table Calc","*,POWER",,None,None,54.0,"
-      SELECT (CASE WHEN `calcs`.`int0` >= 0 OR FLOOR(0.5) = 0.5 THEN POWER(`calcs`.`int0`,0.5) END) AS `TEMP(Test)(3264960529)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3264960529)(0)`
-    ","%null%
-1.0
-1.7320508
-2.0
-2.6457513
-2.8284271
-3.1622777
-3.3166248","%null%
-1.0
-1.7320508
-2.0
-2.6457513
-2.8284271
-3.1622777
-3.3166248"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.power.real,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.power.real.txt,True,0,0,"power(num1,0.1*num0)",expression,Recommended,"Calculation,Operator,Table Calc","*,POWER",,None,None,63.0,"
-      SELECT (CASE WHEN `calcs`.`num1` >= 0 OR FLOOR((0.1 * `calcs`.`num0`)) = (0.1 * `calcs`.`num0`) THEN POWER(`calcs`.`num1`,(0.1 * `calcs`.`num0`)) END) AS `TEMP(Test)(2631457506)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2631457506)(0)`
-    ","%null%
-0.042908918
-0.096190305
-0.45680306
-1.0
-2.1618572
-9.47
-13.744656
-35.878312","%null%
-0.042908918
-0.096190305
-0.45680306
-1.0
-2.1618572
-9.47
-13.744656
-35.878312"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.zn,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.zn.txt,True,0,0,ZN([int1]),expression,Required,"Calculation,Column Metadata Nullability,Table Calc","ZN,COLUMN_NULLABILITY",,None,None,183.0,"
-      SELECT IFNULL(`calcs`.`int1`, 0) AS `TEMP(Test)(3976315675)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3976315675)(0)`
-    ","-9
--8
--6
--4
--3
-0
-2
-3","-9
--8
--6
--4
--3
-0
-2
-3"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.ceilfloor,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.ceilfloor.txt,True,0,0,CEILING([num0]),expression,Required,"Calculation,Operator","FLOOR,+,CEILING",,None,None,44.0,"
-      SELECT CEIL(`calcs`.`num0`) AS `TEMP(Test)(739736782)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(739736782)(0)`
-    ","%null%
--15
--12
--3
-0
-4
-10
-13
-16","%null%
--15
--12
--3
-0
-4
-10
-13
-16"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.ceilfloor,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.ceilfloor.txt,True,0,0,CEILING([num1]),expression,Required,"Calculation,Operator","FLOOR,+,CEILING",,None,None,31.0,"
-      SELECT CEIL(`calcs`.`num1`) AS `TEMP(Test)(408310354)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(408310354)(0)`
-    ","3
-7
-8
-9
-10
-11
-12
-13
-17","3
-7
-8
-9
-10
-11
-12
-13
-17"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.ceilfloor,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.ceilfloor.txt,True,0,0,CEILING([num3]+[num4]),expression,Required,"Calculation,Operator","FLOOR,+,CEILING",,None,None,28.0,"
-      SELECT CEIL((`calcs`.`num3` + `calcs`.`num4`)) AS `TEMP(Test)(645239290)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(645239290)(0)`
-    ","%null%
--25
--13
--9
--8
--7
--6
--4
--3
-2
-15
-22","%null%
--25
--13
--9
--8
--7
--6
--4
--3
-2
-15
-22"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.ceilfloor,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.ceilfloor.txt,True,0,0,FLOOR([num0]),expression,Required,"Calculation,Operator","FLOOR,+,CEILING",,None,None,27.0,"
-      SELECT FLOOR(`calcs`.`num0`) AS `TEMP(Test)(965933154)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(965933154)(0)`
-    ","%null%
--16
--13
--4
-0
-3
-10
-12
-15","%null%
--16
--13
--4
-0
-3
-10
-12
-15"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.ceilfloor,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.ceilfloor.txt,True,0,0,FLOOR([num1]),expression,Required,"Calculation,Operator","FLOOR,+,CEILING",,None,None,29.0,"
-      SELECT FLOOR(`calcs`.`num1`) AS `TEMP(Test)(3363679606)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3363679606)(0)`
-    ","2
-6
-7
-8
-9
-10
-11
-12
-16","2
-6
-7
-8
-9
-10
-11
-12
-16"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.ceilfloor,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.ceilfloor.txt,True,0,0,FLOOR([num3]+[num4]),expression,Required,"Calculation,Operator","FLOOR,+,CEILING",,None,None,33.0,"
-      SELECT FLOOR((`calcs`.`num3` + `calcs`.`num4`)) AS `TEMP(Test)(4164962185)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4164962185)(0)`
-    ","%null%
--26
--14
--10
--9
--8
--7
--5
--4
-1
-14
-21","%null%
--26
--14
--10
--9
--8
--7
--5
--4
-1
-14
-21"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.pi,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.pi.txt,True,0,0,PI(),expression,Required,"Calculation,Operator,Aggregation","PI,COUNT,*",,None,None,34.0,"
-      SELECT (PI()+0.0000000000000000) AS `TEMP(Test)(356598120)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",3.1415927,3.1415927
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,math.pi,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.math.pi.txt,True,0,0,pi()*num0,expression,Required,"Calculation,Operator,Aggregation","PI,COUNT,*",,None,None,30.0,"
-      SELECT ((PI()+0.0000000000000000) * `calcs`.`num0`) AS `TEMP(Test)(1299212312)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1299212312)(0)`
-    ","%null%
--49.323005
--38.64159
--10.995574
-0.0
-10.995574
-31.415927
-38.64159
-49.323005","%null%
--49.323005
--38.64159
--10.995574
-0.0
-10.995574
-31.415927
-38.64159
-49.323005"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.date.add_num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.date.add_num.txt,False,0,2,date0 + num4,expression,Required,Operator,+,,Actual does not match expected.,Actual does not match expected.,38.0,"
-      SELECT DATE_ADD(DATE_ADD(`calcs`.`date0`, INTERVAL FLOOR(`calcs`.`num4`) DAY), INTERVAL CAST(86400 * (`calcs`.`num4` - FLOOR(`calcs`.`num4`)) AS INT) SECOND) AS `TEMP(Test)(2067341949)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2067341949)(0)`
-    ","%null%
-#1972-07-14 20:23:59#
-#1975-10-29 12:43:11#
-#2004-05-28 22:48:00#
-#2004-06-27 07:40:48#","%null%
-#1972-07-14 20:23:59#
-#1975-10-29 12:43:12#
-#2004-05-28 22:49:00#
-#2004-06-27 07:40:48#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.date.equality,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.date.equality.txt,False,0,3,date0 == #7/4/1972#,expression,Required,"Operator,Filters",==,,"
-      Error executing query
-
-    ",Actual does not match expected.,53.0,"
-      SELECT (CASE WHEN (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') AS TIMESTAMP)) = CAST(DATE_FORMAT(DATE('1972-07-04'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 1 WHEN NOT (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') AS TIMESTAMP)) = CAST(DATE_FORMAT(DATE('1972-07-04'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 0 ELSE NULL END) AS `TEMP(Test)(397499995)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(397499995)(0)`
-    ",,"%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.date.gt,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.date.gt.txt,False,0,3,date0 > #11/12/1975#,expression,Required,"Operator,Filters",>,,"
-      Error executing query
-
-    ",Actual does not match expected.,45.0,"
-      SELECT (CASE WHEN (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) > CAST(DATE_FORMAT(DATE('1975-11-12'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 1 WHEN NOT (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) > CAST(DATE_FORMAT(DATE('1975-11-12'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 0 ELSE NULL END) AS `TEMP(Test)(3193322782)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3193322782)(0)`
-    ",,"%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.date.gte,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.date.gte.txt,False,0,3,date0 >= #11/12/1975#,expression,Required,"Operator,Filters",>=,,"
-      Error executing query
-
-    ",Actual does not match expected.,42.0,"
-      SELECT (CASE WHEN (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') AS TIMESTAMP)) >= CAST(DATE_FORMAT(DATE('1975-11-12'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 1 WHEN NOT (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') AS TIMESTAMP)) >= CAST(DATE_FORMAT(DATE('1975-11-12'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 0 ELSE NULL END) AS `TEMP(Test)(1366787273)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1366787273)(0)`
-    ",,"%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.date.lt,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.date.lt.txt,False,0,3,date0 < #11/12/1975#,expression,Required,"Operator,Filters",<,,"
-      Error executing query
-
-    ",Actual does not match expected.,43.0,"
-      SELECT (CASE WHEN (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) < CAST(DATE_FORMAT(DATE('1975-11-12'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 1 WHEN NOT (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) < CAST(DATE_FORMAT(DATE('1975-11-12'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 0 ELSE NULL END) AS `TEMP(Test)(3764753091)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3764753091)(0)`
-    ",,"%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.date.lte,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.date.lte.txt,False,0,3,date0 <= #11/12/1975#,expression,Required,"Operator,Filters",<=,,"
-      Error executing query
-
-    ",Actual does not match expected.,43.0,"
-      SELECT (CASE WHEN (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) <= CAST(DATE_FORMAT(DATE('1975-11-12'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 1 WHEN NOT (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) <= CAST(DATE_FORMAT(DATE('1975-11-12'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 0 ELSE NULL END) AS `TEMP(Test)(822657216)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(822657216)(0)`
-    ",,"%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.date.minus_datestr,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.date.minus_datestr.txt,False,0,17,datetime0 - #1/1/2004#,expression,Required,Operator,-,,"
-      Error executing query
-
-    ",Actual does not match expected.,45.0,"
-      SELECT ((TO_DAYS(CAST(`calcs`.`datetime0` as TIMESTAMP)) - TO_DAYS(CAST(DATE('2004-01-01') as TIMESTAMP))) + ((TIME_TO_SEC(CAST(`calcs`.`datetime0` as TIMESTAMP)) - TIME_TO_SEC(CAST(DATE('2004-01-01') as TIMESTAMP))) / 86400.0)) AS `TEMP(Test)(100938644)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(100938644)(0)`
-    ",,"185.95102
-186.55162
-190.42888
-193.72935
-195.32153
-195.34495
-198.58468
-200.93161
-203.0211
-204.88446
-206.64058
-207.52123
-209.28808
-209.52394
-209.97942
-212.49852
-214.33291"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.date.minus_datetime,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.date.minus_datetime.txt,True,0,0,date0 - datetime0,expression,Required,Operator,-,,None,None,35.0,"
-      SELECT ((TO_DAYS(CAST(`calcs`.`date0` as TIMESTAMP)) - TO_DAYS(CAST(`calcs`.`datetime0` as TIMESTAMP))) + ((TIME_TO_SEC(CAST(`calcs`.`date0` as TIMESTAMP)) - TIME_TO_SEC(CAST(`calcs`.`datetime0` as TIMESTAMP))) / 86400.0)) AS `TEMP(Test)(937166222)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(937166222)(0)`
-    ","%null%
--11710.521
--10491.333
--85.428877
--39.979421
--31.55162","%null%
--11710.521
--10491.333
--85.428877
--39.979421
--31.55162"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.date.minus_num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.date.minus_num.txt,False,0,2,date0 - num4,expression,Required,Operator,-,,Actual does not match expected.,Actual does not match expected.,33.0,"
-      SELECT DATE_SUB(DATE_SUB(`calcs`.`date0`, INTERVAL FLOOR(`calcs`.`num4`) DAY), INTERVAL CAST(86400 * (`calcs`.`num4` - FLOOR(`calcs`.`num4`)) AS INT) SECOND) AS `TEMP(Test)(2923065813)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2923065813)(0)`
-    ","%null%
-#1972-06-23 03:36:01#
-#1975-11-25 11:16:49#
-#2004-06-10 01:12:00#
-#2004-06-10 16:19:12#","%null%
-#1972-06-23 03:36:01#
-#1975-11-25 11:16:48#
-#2004-06-10 01:11:00#
-#2004-06-10 16:19:12#"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.date.not_equal,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.date.not_equal.txt,False,0,3,date0 != #11/12/1975#,expression,Required,Operator,!=,,"
-      Error executing query
-
-    ",Actual does not match expected.,45.0,"
-      SELECT (CASE WHEN (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') AS TIMESTAMP)) <> CAST(DATE_FORMAT(DATE('1975-11-12'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 1 WHEN NOT (CAST(DATE_FORMAT(`calcs`.`date0`, '%Y-%m-%d %H:%i:%s') AS TIMESTAMP)) <> CAST(DATE_FORMAT(DATE('1975-11-12'), '%Y-%m-%d %H:%i:%s') as TIMESTAMP)) THEN 0 ELSE NULL END) AS `TEMP(Test)(798936259)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(798936259)(0)`
-    ",,"%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.int,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.int.txt,True,0,0,int0 % int1,expression,Required,Operator,"^^,/,%",,None,None,33.0,"
-      SELECT (`calcs`.`int0` % `calcs`.`int1`) AS `TEMP(Test)(1307456344)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1307456344)(0)`
-    ","%null%
-1
-2
-8","%null%
-1
-2
-8"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.int,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.int.txt,True,0,0,int0 / int1,expression,Required,Operator,"^^,/,%",,None,None,25.0,"
-      SELECT CAST(`calcs`.`int0` AS DOUBLE) / `calcs`.`int1` AS `TEMP(Test)(2402101080)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2402101080)(0)`
-    ","%null%
--1.25
--0.88888889
--0.33333333
-2.6666667","%null%
--1.25
--0.88888889
--0.33333333
-2.6666667"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.int,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.int.txt,True,0,0,int3 / int2,expression,Required,Operator,"^^,/,%",,None,None,27.0,"
-      SELECT CAST(`calcs`.`int3` AS DOUBLE) / `calcs`.`int2` AS `TEMP(Test)(3559262472)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3559262472)(0)`
-    ","%null%
--3.6666667
--3.25
--2.8333333
--2.25
--1.2222222
--1.0
--0.5
--0.22222222
-0.0
-0.4
-1.6
-2.0
-3.0
-3.5
-4.5","%null%
--3.6666667
--3.25
--2.8333333
--2.25
--1.2222222
--1.0
--0.5
--0.22222222
-0.0
-0.4
-1.6
-2.0
-3.0
-3.5
-4.5"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.int,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.int.txt,True,0,0,int0 ^ num1,expression,Required,Operator,"^^,/,%",,None,None,27.0,"
-      SELECT (CASE WHEN `calcs`.`int0` >= 0 OR FLOOR(`calcs`.`num1`) = `calcs`.`num1` THEN POWER(`calcs`.`int0`, `calcs`.`num1`) END) AS `TEMP(Test)(4265403921)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4265403921)(0)`
-    ","%null%
-1.0
-295.12092
-29881.154
-1634026.6
-1751306.3
-2691539.2
-24767836.0
-44477182.0
-1.3201657e+10
-1.578759e+11
-6.7412058e+14","%null%
-1.0
-295.12092
-29881.154
-1634026.6
-1751306.3
-2691539.2
-24767836.0
-44477182.0
-1.3201657e+10
-1.578759e+11
-6.7412058e+14"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.bool.txt,True,1,0,not bool0,expression,Required,"Operator,Aggregation,Filters,Logical","!=,COUNT,!,$SYS_NARY_OR$,||,&&,==,MAX,$SYS_NARY_AND$,MIN",,None,None,70.0,"
-      SELECT (CASE WHEN (NOT (`calcs`.`bool0` <> 0)) THEN 1 WHEN NOT (NOT (`calcs`.`bool0` <> 0)) THEN 0 ELSE NULL END) AS `TEMP(Test)(1413132553)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1413132553)(0)`
-    ",,
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.bool.txt,True,1,0,NULL,expression,Required,"Operator,Aggregation,Filters,Logical","!=,COUNT,!,$SYS_NARY_OR$,||,&&,==,MAX,$SYS_NARY_AND$,MIN",,None,None,42.0,"
-      SELECT NULL AS `TEMP(Test)(496893948)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.bool.txt,True,1,0,TRUE,expression,Required,"Operator,Aggregation,Filters,Logical","!=,COUNT,!,$SYS_NARY_OR$,||,&&,==,MAX,$SYS_NARY_AND$,MIN",,None,None,29.0,"
-      SELECT 1 AS `TEMP(Test)(1507734681)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.bool.txt,True,1,0,FALSE,expression,Required,"Operator,Aggregation,Filters,Logical","!=,COUNT,!,$SYS_NARY_OR$,||,&&,==,MAX,$SYS_NARY_AND$,MIN",,None,None,27.0,"
-      SELECT 0 AS `TEMP(Test)(1303362598)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",false,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.bool.txt,True,1,0,bool0 AND bool1,expression,Required,"Operator,Aggregation,Filters,Logical","!=,COUNT,!,$SYS_NARY_OR$,||,&&,==,MAX,$SYS_NARY_AND$,MIN",,None,None,45.0,"
-      SELECT (CASE WHEN ((`calcs`.`bool0` <> 0) AND (`calcs`.`bool1` <> 0)) THEN 1 WHEN NOT ((`calcs`.`bool0` <> 0) AND (`calcs`.`bool1` <> 0)) THEN 0 ELSE NULL END) AS `TEMP(Test)(3618731173)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3618731173)(0)`
-    ",,
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.bool.txt,False,1,3,bool0 == bool1,expression,Required,"Operator,Aggregation,Filters,Logical","!=,COUNT,!,$SYS_NARY_OR$,||,&&,==,MAX,$SYS_NARY_AND$,MIN",,"
-      Error executing query
-
-    ",Actual does not match expected.,42.0,"
-      SELECT (CASE WHEN ((`calcs`.`bool0` <> 0) AND (`calcs`.`bool1` <> 0) OR NOT (`calcs`.`bool0` <> 0) AND NOT (`calcs`.`bool1` <> 0)) THEN 1 WHEN NOT ((`calcs`.`bool0` <> 0) AND (`calcs`.`bool1` <> 0) OR NOT (`calcs`.`bool0` <> 0) AND NOT (`calcs`.`bool1` <> 0)) THEN 0 ELSE NULL END) AS `TEMP(Test)(830571724)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(830571724)(0)`
-    ",,"%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.bool.txt,False,1,3,bool0 != bool1,expression,Required,"Operator,Aggregation,Filters,Logical","!=,COUNT,!,$SYS_NARY_OR$,||,&&,==,MAX,$SYS_NARY_AND$,MIN",,"
-      Error executing query
-
-    ",Actual does not match expected.,45.0,"
-      SELECT (CASE WHEN ((`calcs`.`bool0` <> 0) AND NOT (`calcs`.`bool1` <> 0) OR NOT (`calcs`.`bool0` <> 0) AND (`calcs`.`bool1` <> 0)) THEN 1 WHEN NOT ((`calcs`.`bool0` <> 0) AND NOT (`calcs`.`bool1` <> 0) OR NOT (`calcs`.`bool0` <> 0) AND (`calcs`.`bool1` <> 0)) THEN 0 ELSE NULL END) AS `TEMP(Test)(3090944671)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3090944671)(0)`
-    ",,"%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.bool,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.bool.txt,True,1,0,bool0 or bool1,expression,Required,"Operator,Aggregation,Filters,Logical","!=,COUNT,!,$SYS_NARY_OR$,||,&&,==,MAX,$SYS_NARY_AND$,MIN",,None,None,37.0,"
-      SELECT (CASE WHEN ((`calcs`.`bool0` <> 0) OR (`calcs`.`bool1` <> 0)) THEN 1 WHEN NOT ((`calcs`.`bool0` <> 0) OR (`calcs`.`bool1` <> 0)) THEN 0 ELSE NULL END) AS `TEMP(Test)(4182992858)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4182992858)(0)`
-    ",,
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.str.txt,True,1,0,"str2 == iif(num3>0,str2,str3)",expression,Required,"Calculation,Operator,Aggregation,Filters,Logical","<,>,COUNT,!=,MIN,<=,+,==,MAX,LOWER,>=,IIF",,None,None,33.0,"
-      SELECT (CASE WHEN (`calcs`.`str2` = (CASE WHEN (`calcs`.`num3` > 0) THEN `calcs`.`str2` WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 1 WHEN NOT (`calcs`.`str2` = (CASE WHEN (`calcs`.`num3` > 0) THEN `calcs`.`str2` WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 0 ELSE NULL END) AS `TEMP(Test)(1635792874)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1635792874)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.str.txt,True,1,0,"str2 >= iif(num3>0,lower(str0),str3)",expression,Required,"Calculation,Operator,Aggregation,Filters,Logical","<,>,COUNT,!=,MIN,<=,+,==,MAX,LOWER,>=,IIF",,None,None,29.0,"
-      SELECT (CASE WHEN (`calcs`.`str2` >= (CASE WHEN (`calcs`.`num3` > 0) THEN LOWER(`calcs`.`str0`) WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 1 WHEN NOT (`calcs`.`str2` >= (CASE WHEN (`calcs`.`num3` > 0) THEN LOWER(`calcs`.`str0`) WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 0 ELSE NULL END) AS `TEMP(Test)(1555382477)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1555382477)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.str.txt,True,1,0,"str2 > iif(num3>0,str0,str3)",expression,Required,"Calculation,Operator,Aggregation,Filters,Logical","<,>,COUNT,!=,MIN,<=,+,==,MAX,LOWER,>=,IIF",,None,None,30.0,"
-      SELECT (CASE WHEN (`calcs`.`str2` > (CASE WHEN (`calcs`.`num3` > 0) THEN `calcs`.`str0` WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 1 WHEN NOT (`calcs`.`str2` > (CASE WHEN (`calcs`.`num3` > 0) THEN `calcs`.`str0` WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 0 ELSE NULL END) AS `TEMP(Test)(3821822049)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3821822049)(0)`
-    ","%null%
-true","%null%
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.str.txt,True,1,0,"str2 <= iif(num3>0,lower(str0),str3)",expression,Required,"Calculation,Operator,Aggregation,Filters,Logical","<,>,COUNT,!=,MIN,<=,+,==,MAX,LOWER,>=,IIF",,None,None,28.0,"
-      SELECT (CASE WHEN (`calcs`.`str2` <= (CASE WHEN (`calcs`.`num3` > 0) THEN LOWER(`calcs`.`str0`) WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 1 WHEN NOT (`calcs`.`str2` <= (CASE WHEN (`calcs`.`num3` > 0) THEN LOWER(`calcs`.`str0`) WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 0 ELSE NULL END) AS `TEMP(Test)(2776534421)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2776534421)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.str.txt,True,1,0,"str2 < iif(num3>0,lower(str0),str3)",expression,Required,"Calculation,Operator,Aggregation,Filters,Logical","<,>,COUNT,!=,MIN,<=,+,==,MAX,LOWER,>=,IIF",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`str2` < (CASE WHEN (`calcs`.`num3` > 0) THEN LOWER(`calcs`.`str0`) WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 1 WHEN NOT (`calcs`.`str2` < (CASE WHEN (`calcs`.`num3` > 0) THEN LOWER(`calcs`.`str0`) WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 0 ELSE NULL END) AS `TEMP(Test)(398649381)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(398649381)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.str.txt,True,1,0,"str2 != iif(num3>0,str2,str3)",expression,Required,"Calculation,Operator,Aggregation,Filters,Logical","<,>,COUNT,!=,MIN,<=,+,==,MAX,LOWER,>=,IIF",,None,None,28.0,"
-      SELECT (CASE WHEN (`calcs`.`str2` <> (CASE WHEN (`calcs`.`num3` > 0) THEN `calcs`.`str2` WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 1 WHEN NOT (`calcs`.`str2` <> (CASE WHEN (`calcs`.`num3` > 0) THEN `calcs`.`str2` WHEN NOT (`calcs`.`num3` > 0) THEN `calcs`.`str3` ELSE NULL END)) THEN 0 ELSE NULL END) AS `TEMP(Test)(119026413)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(119026413)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.str.txt,True,1,0,str2 + str3,expression,Required,"Calculation,Operator,Aggregation,Filters,Logical","<,>,COUNT,!=,MIN,<=,+,==,MAX,LOWER,>=,IIF",,None,None,27.0,"
-      SELECT CONCAT(`calcs`.`str2`, `calcs`.`str3`) AS `TEMP(Test)(724155660)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(724155660)(0)`
-    ","%null%
-""eighte""
-""elevene""
-""fifteene""
-""onee""
-""sixteene""
-""tene""
-""threee""
-""twoe""","%null%
-""eighte""
-""elevene""
-""fifteene""
-""onee""
-""sixteene""
-""tene""
-""threee""
-""twoe"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.str,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.str.txt,False,1,1,"""Pat O'Hanrahan & <Matthew Eldridge]'""",expression,Required,"Calculation,Operator,Aggregation,Filters,Logical","<,>,COUNT,!=,MIN,<=,+,==,MAX,LOWER,>=,IIF",,Actual does not match expected.,Actual does not match expected.,25.0,"
-      SELECT 'Pat O''Hanrahan & <Matthew Eldridge]''' AS `TEMP(Test)(627207302)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ","""Pat O''Hanrahan & <Matthew Eldridge]''""","""Pat O'Hanrahan & <Matthew Eldridge]'"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,abs(num0),expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,35.0,"
-      SELECT ABS(`calcs`.`num0`) AS `TEMP(Test)(3816473022)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3816473022)(0)`
-    ","%null%
-0.0
-3.5
-10.0
-12.3
-15.7","%null%
-0.0
-3.5
-10.0
-12.3
-15.7"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,[num0],expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,27.0,"
-      SELECT `calcs`.`num0` AS `TEMP(Test)(965512284)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(965512284)(0)`
-    ","%null%
--15.7
--12.3
--3.5
-0.0
-3.5
-10.0
-12.3
-15.7","%null%
--15.7
--12.3
--3.5
-0.0
-3.5
-10.0
-12.3
-15.7"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,[num1],expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,26.0,"
-      SELECT `calcs`.`num1` AS `TEMP(Test)(1826927073)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1826927073)(0)`
-    ","2.47
-6.71
-7.1
-7.12
-7.43
-8.42
-9.05
-9.38
-9.47
-9.78
-10.32
-10.37
-11.38
-12.05
-12.4
-16.42
-16.81","2.47
-6.71
-7.1
-7.12
-7.43
-8.42
-9.05
-9.38
-9.47
-9.78
-10.32
-10.37
-11.38
-12.05
-12.4
-16.42
-16.81"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,-num0,expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,27.0,"
-      SELECT (`calcs`.`num0` * -1) AS `TEMP(Test)(4188722171)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4188722171)(0)`
-    ","%null%
--15.7
--12.3
--10.0
--3.5
-0.0
-3.5
-12.3
-15.7","%null%
--15.7
--12.3
--10.0
--3.5
-0.0
-3.5
-12.3
-15.7"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0 / num1,expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,27.0,"
-      SELECT (`calcs`.`num0` / `calcs`.`num1`) AS `TEMP(Test)(272703322)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(272703322)(0)`
-    ","%null%
--2.1130552
--1.8330849
--0.37313433
-0.0
-0.38674033
-1.0559662
-1.4608076
-1.605317","%null%
--2.1130552
--1.8330849
--0.37313433
-0.0
-0.38674033
-1.0559662
-1.4608076
-1.605317"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0=abs(num0),expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` = ABS(`calcs`.`num0`)) THEN 1 WHEN NOT (`calcs`.`num0` = ABS(`calcs`.`num0`)) THEN 0 ELSE NULL END) AS `TEMP(Test)(3360366790)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3360366790)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0==abs(num0),expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,28.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` = ABS(`calcs`.`num0`)) THEN 1 WHEN NOT (`calcs`.`num0` = ABS(`calcs`.`num0`)) THEN 0 ELSE NULL END) AS `TEMP(Test)(2564078271)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2564078271)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0 >= num1,expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,34.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` >= `calcs`.`num1`) THEN 1 WHEN NOT (`calcs`.`num0` >= `calcs`.`num1`) THEN 0 ELSE NULL END) AS `TEMP(Test)(1366300770)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1366300770)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0 > num1,expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,26.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` > `calcs`.`num1`) THEN 1 WHEN NOT (`calcs`.`num0` > `calcs`.`num1`) THEN 0 ELSE NULL END) AS `TEMP(Test)(4123004830)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4123004830)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0 <= num1,expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,25.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` <= `calcs`.`num1`) THEN 1 WHEN NOT (`calcs`.`num0` <= `calcs`.`num1`) THEN 0 ELSE NULL END) AS `TEMP(Test)(1224631717)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1224631717)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0 < num1,expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,28.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` < `calcs`.`num1`) THEN 1 WHEN NOT (`calcs`.`num0` < `calcs`.`num1`) THEN 0 ELSE NULL END) AS `TEMP(Test)(1731699042)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1731699042)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0 - num1,expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,26.0,"
-      SELECT (`calcs`.`num0` - `calcs`.`num1`) AS `TEMP(Test)(3781247900)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3781247900)(0)`
-    ","%null%
--23.13
--19.01
--16.42
--12.88
--5.55
-0.53
-3.88
-5.92","%null%
--23.13
--19.01
--16.42
--12.88
--5.55
-0.53
-3.88
-5.92"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0 <> abs(num0),expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` <> ABS(`calcs`.`num0`)) THEN 1 WHEN NOT (`calcs`.`num0` <> ABS(`calcs`.`num0`)) THEN 0 ELSE NULL END) AS `TEMP(Test)(4047276454)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4047276454)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0 != abs(num0),expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,27.0,"
-      SELECT (CASE WHEN (`calcs`.`num0` <> ABS(`calcs`.`num0`)) THEN 1 WHEN NOT (`calcs`.`num0` <> ABS(`calcs`.`num0`)) THEN 0 ELSE NULL END) AS `TEMP(Test)(3492695719)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3492695719)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0 + num1,expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,26.0,"
-      SELECT (`calcs`.`num0` + `calcs`.`num1`) AS `TEMP(Test)(977554451)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(977554451)(0)`
-    ","%null%
--8.27
--5.59
-5.88
-12.55
-16.42
-19.47
-20.72
-25.48","%null%
--8.27
--5.59
-5.88
-12.55
-16.42
-19.47
-20.72
-25.48"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0 ^ num1,expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,39.0,"
-      SELECT (CASE WHEN `calcs`.`num0` >= 0 OR FLOOR(`calcs`.`num1`) = `calcs`.`num1` THEN POWER(`calcs`.`num0`, `calcs`.`num1`) END) AS `TEMP(Test)(637953353)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(637953353)(0)`
-    ",,
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,operator.num,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.operator.num.txt,True,1,0,num0 * num1,expression,Required,"Operator,Filters,Aggregation,Calculation","<,>,!=,-,ABS,<=,+,/,*,==,MAX,^^,MIN,>=",,None,None,27.0,"
-      SELECT (`calcs`.`num0` * `calcs`.`num1`) AS `TEMP(Test)(1861245368)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1861245368)(0)`
-    ","%null%
--116.651
--82.533
--32.83
-0.0
-31.675
-94.7
-103.566
-153.546","%null%
--116.651
--82.533
--32.83
-0.0
-31.675
-94.7
-103.566
-153.546"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.contains.empty,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.contains.empty.txt,True,0,0,"CONTAINS(str2, LEFT(str2, 0))",expression,Required,Calculation,CONTAINS,,None,None,34.0,"
-      SELECT (CASE WHEN (LOCATE((CASE WHEN 0 >= 0 THEN LEFT(`calcs`.`str2`,0) ELSE NULL END),`calcs`.`str2`) > 0) THEN 1 WHEN NOT (LOCATE((CASE WHEN 0 >= 0 THEN LEFT(`calcs`.`str2`,0) ELSE NULL END),`calcs`.`str2`) > 0) THEN 0 ELSE NULL END) AS `TEMP(Test)(3977299552)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3977299552)(0)`
-    ","%null%
-true","%null%
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.contains.regex,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.contains.regex.txt,True,0,0,"CONTAINS(str2, ""A("")",expression,Required If Supported,Calculation,CONTAINS,,None,None,41.0,"
-      SELECT (CASE WHEN (LOCATE('A(',`calcs`.`str2`) > 0) THEN 1 WHEN NOT (LOCATE('A(',`calcs`.`str2`) > 0) THEN 0 ELSE NULL END) AS `TEMP(Test)(2383066519)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2383066519)(0)`
-    ","%null%
-false","%null%
-false"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.contains.regex,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.contains.regex.txt,True,0,0,"CONTAINS(str2, ""A\("")",expression,Required If Supported,Calculation,CONTAINS,,None,None,27.0,"
-      SELECT (CASE WHEN (LOCATE('A\\(',`calcs`.`str2`) > 0) THEN 1 WHEN NOT (LOCATE('A\\(',`calcs`.`str2`) > 0) THEN 0 ELSE NULL END) AS `TEMP(Test)(540594765)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(540594765)(0)`
-    ","%null%
-false","%null%
-false"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.isdate,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.isdate.txt,False,0,1,"ISDATE(""2015-01-01"")",expression,unknown,unknown,unknown,,"
-      Unknown function ISDATE called.
-
-    ",Actual does not match expected.,0.0,"
-      
-    ",,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.isdate,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.isdate.txt,False,0,1,"ISDATE(""data"")",expression,unknown,unknown,unknown,,"
-      Unknown function ISDATE called.
-
-    ",Actual does not match expected.,0.0,"
-      
-    ",,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.left.negative,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.left.negative.txt,True,0,0,"LEFT([str0],-2)",expression,Required If Supported,"Data Prep,Calculation",LEFT,,None,None,30.0,"
-      SELECT (CASE WHEN -2 >= 0 THEN LEFT(`calcs`.`str0`,-2) ELSE NULL END) AS `TEMP(Test)(765040119)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(765040119)(0)`
-    ",%null%,%null%
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.left.real,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.left.real.txt,False,0,8,"left(str0,num4)",expression,Recommended,"Data Prep,Calculation",LEFT,,"
-      Error executing query
-
-    ",Actual does not match expected.,50.0,"
-      SELECT (CASE WHEN `calcs`.`num4` >= 0 THEN LEFT(`calcs`.`str0`,`calcs`.`num4`) ELSE NULL END) AS `TEMP(Test)(1907571572)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1907571572)(0)`
-    ",,"%null%
-""FURNITURE""
-""OFFICE S""
-""OFFICE SUP""
-""TEC""
-""TECH""
-""TECHNO""
-""TECHNOLOGY"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.left,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.left.txt,True,0,0,"LEFT(str1, 2)",expression,Required,"Data Prep,Calculation",LEFT,,None,None,29.0,"
-      SELECT (CASE WHEN 2 >= 0 THEN LEFT(`calcs`.`str1`,2) ELSE NULL END) AS `TEMP(Test)(2443162804)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2443162804)(0)`
-    ","""AI""
-""AN""
-""BI""
-""BU""
-""CD""
-""CL""
-""CO""
-""DO""
-""DV""
-""ER""","""AI""
-""AN""
-""BI""
-""BU""
-""CD""
-""CL""
-""CO""
-""DO""
-""DV""
-""ER"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.left,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.left.txt,True,0,0,"left(str2,3)",expression,Required,"Data Prep,Calculation",LEFT,,None,None,27.0,"
-      SELECT (CASE WHEN 3 >= 0 THEN LEFT(`calcs`.`str2`,3) ELSE NULL END) AS `TEMP(Test)(1954670685)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1954670685)(0)`
-    ","%null%
-""eig""
-""ele""
-""fif""
-""fiv""
-""fou""
-""nin""
-""one""
-""six""
-""ten""
-""thr""
-""twe""
-""two""","%null%
-""eig""
-""ele""
-""fif""
-""fiv""
-""fou""
-""nin""
-""one""
-""six""
-""ten""
-""thr""
-""twe""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.left,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.left.txt,False,0,10,"left(str2,int0)",expression,Required,"Data Prep,Calculation",LEFT,,"
-      Error executing query
-
-    ",Actual does not match expected.,46.0,"
-      SELECT (CASE WHEN `calcs`.`int0` >= 0 THEN LEFT(`calcs`.`str2`,`calcs`.`int0`) ELSE NULL END) AS `TEMP(Test)(3664185027)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3664185027)(0)`
-    ",,"%null%
-""elev""
-""fifteen""
-""five""
-""four""
-""o""
-""six""
-""sixt""
-""ten""
-""twelve"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.lower,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.lower.txt,True,0,0,LOWER(str2),expression,Required,"Filters,Calculation",LOWER,,None,None,27.0,"
-      SELECT LOWER(`calcs`.`str2`) AS `TEMP(Test)(1011144549)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1011144549)(0)`
-    ","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two""","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.lower,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.lower.txt,True,0,0,lower(str1),expression,Required,"Filters,Calculation",LOWER,,None,None,28.0,"
-      SELECT LOWER(`calcs`.`str1`) AS `TEMP(Test)(2419238545)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2419238545)(0)`
-    ","""air purifiers""
-""answering machines""
-""binder accessories""
-""binder clips""
-""binding machines""
-""binding supplies""
-""business copiers""
-""business envelopes""
-""cd-r media""
-""clamp on lamps""
-""clocks""
-""conference phones""
-""corded keyboards""
-""cordless keyboards""
-""dot matrix printers""
-""dvd""
-""ericsson""","""air purifiers""
-""answering machines""
-""binder accessories""
-""binder clips""
-""binding machines""
-""binding supplies""
-""business copiers""
-""business envelopes""
-""cd-r media""
-""clamp on lamps""
-""clocks""
-""conference phones""
-""corded keyboards""
-""cordless keyboards""
-""dot matrix printers""
-""dvd""
-""ericsson"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.max.txt,True,0,0,"MAX(str1, str2)",expression,Required,Aggregation,MAX,,None,None,29.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`str1`) THEN NULL
-                WHEN ISNULL(`calcs`.`str2`) THEN NULL
-	            WHEN `calcs`.`str1` > `calcs`.`str2` THEN `calcs`.`str1`
-                ELSE `calcs`.`str2` END AS `TEMP(Test)(3052188625)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3052188625)(0)`
-    ","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two""","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.max,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.max.txt,True,0,0,"MAX(str3, str2)",expression,Required,Aggregation,MAX,,None,None,25.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`str3`) THEN NULL
-                WHEN ISNULL(`calcs`.`str2`) THEN NULL
-	            WHEN `calcs`.`str3` > `calcs`.`str2` THEN `calcs`.`str3`
-                ELSE `calcs`.`str2` END AS `TEMP(Test)(2280873463)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2280873463)(0)`
-    ","%null%
-""eight""
-""eleven""
-""fifteen""
-""one""
-""sixteen""
-""ten""
-""three""
-""two""","%null%
-""eight""
-""eleven""
-""fifteen""
-""one""
-""sixteen""
-""ten""
-""three""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.mid,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.mid.txt,True,2,0,"mid(str1,6)",expression,Required,"Data Prep,Calculation",MID,,None,None,36.0,"
-      SELECT SUBSTR(`calcs`.`str1`,6) AS `TEMP(Test)(98307893)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(98307893)(0)`
-    ","""""
-"" ON LAMPS""
-""ATRIX PRINTERS""
-""D KEYBOARDS""
-""ESS COPIERS""
-""ESS ENVELOPES""
-""ESS KEYBOARDS""
-""MEDIA""
-""NG MACHINES""
-""NG SUPPLIES""
-""R ACCESSORIES""
-""R CLIPS""
-""RENCE PHONES""
-""RING MACHINES""
-""S""
-""SON""
-""URIFIERS""","""""
-"" ON LAMPS""
-""ATRIX PRINTERS""
-""D KEYBOARDS""
-""ESS COPIERS""
-""ESS ENVELOPES""
-""ESS KEYBOARDS""
-""MEDIA""
-""NG MACHINES""
-""NG SUPPLIES""
-""R ACCESSORIES""
-""R CLIPS""
-""RENCE PHONES""
-""RING MACHINES""
-""S""
-""SON""
-""URIFIERS"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.mid,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.mid.txt,True,2,0,"mid(str1,2, 4)",expression,Required,"Data Prep,Calculation",MID,,None,None,25.0,"
-      SELECT SUBSTR(`calcs`.`str1`,2,4) AS `TEMP(Test)(3472698691)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3472698691)(0)`
-    ","""D-R ""
-""INDE""
-""INDI""
-""IR P""
-""LAMP""
-""LOCK""
-""NSWE""
-""ONFE""
-""ORDE""
-""ORDL""
-""OT M""
-""RICS""
-""USIN""
-""VD""","""D-R ""
-""INDE""
-""INDI""
-""IR P""
-""LAMP""
-""LOCK""
-""NSWE""
-""ONFE""
-""ORDE""
-""ORDL""
-""OT M""
-""RICS""
-""USIN""
-""VD"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.right.real,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.right.real.txt,False,0,8,"right(str0,num4)",expression,Required,Calculation,RIGHT,,"
-      Error executing query
-
-    ",Actual does not match expected.,42.0,"
-      SELECT (CASE WHEN `calcs`.`num4` >= 0 THEN RIGHT(`calcs`.`str0`,`calcs`.`num4`) ELSE NULL END) AS `TEMP(Test)(3619367444)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3619367444)(0)`
-    ",,"%null%
-""E SUPPLIES""
-""FURNITURE""
-""LOGY""
-""NOLOGY""
-""OGY""
-""SUPPLIES""
-""TECHNOLOGY"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.space.int.var,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.space.int.var.txt,False,1,2,SPACE(int2),expression,Required,Calculation,SPACE,,"
-      Error executing query
-
-    ",Actual does not match expected.,40.0,"
-      SELECT IF(`calcs`.`int2` >= 0, SPACE(FLOOR(`calcs`.`int2`)), NULL) AS `TEMP(Test)(3089742405)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3089742405)(0)`
-    ",,"%null%
-"""""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.B21622,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.B21622.txt,True,0,0,str(int([num4])),expression,Required,Cast,"STR,INT",,None,None,52.0,"
-      SELECT CAST(CAST(`calcs`.`num4` as int) as string) AS `TEMP(Test)(1425036653)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1425036653)(0)`
-    ","%null%
-""-10""
-""-13""
-""-14""
-""-6""
-""10""
-""19""
-""3""
-""4""
-""6""
-""8""","%null%
-""-10""
-""-13""
-""-14""
-""-6""
-""10""
-""19""
-""3""
-""4""
-""6""
-""8"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.ascii,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.ascii.txt,True,0,0,"ASCII(""a"")",expression,Recommended,"Calculation,Aggregation","COUNT,ASCII",,None,None,36.0,"
-      SELECT ASCII('a') AS `TEMP(Test)(415603459)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",97,97
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.ascii,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.ascii.txt,True,0,0,ascii(str2),expression,Recommended,"Calculation,Aggregation","COUNT,ASCII",,None,None,27.0,"
-      SELECT ASCII(`calcs`.`str2`) AS `TEMP(Test)(526259814)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(526259814)(0)`
-    ","%null%
-101
-102
-110
-111
-115
-116","%null%
-101
-102
-110
-111
-115
-116"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.ascii,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.ascii.txt,True,0,0,ascii(str1),expression,Recommended,"Calculation,Aggregation","COUNT,ASCII",,None,None,27.0,"
-      SELECT ASCII(`calcs`.`str1`) AS `TEMP(Test)(4258651616)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(4258651616)(0)`
-    ","65
-66
-67
-68
-69","65
-66
-67
-68
-69"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.char,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.char.txt,False,0,1,CHAR(65),expression,Smoke,"Aggregation,Calculation","COUNT,CHAR",,"
-      Unknown function CHAR called.
-
-    ",Actual does not match expected.,0.0,"
-      
-    ",,"""A"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.constants,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.constants.txt,True,0,0,'      ' + str2 + '      ',expression,Required,"Operator,Aggregation","+,COUNT",,None,None,31.0,"
-      SELECT CONCAT(CONCAT('      ', `calcs`.`str2`), '      ') AS `TEMP(Test)(2313738384)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2313738384)(0)`
-    ","%null%
-""      eight      ""
-""      eleven      ""
-""      fifteen      ""
-""      five      ""
-""      fourteen      ""
-""      nine      ""
-""      one      ""
-""      six      ""
-""      sixteen      ""
-""      ten      ""
-""      three      ""
-""      twelve      ""
-""      two      ""","%null%
-""      eight      ""
-""      eleven      ""
-""      fifteen      ""
-""      five      ""
-""      fourteen      ""
-""      nine      ""
-""      one      ""
-""      six      ""
-""      sixteen      ""
-""      ten      ""
-""      three      ""
-""      twelve      ""
-""      two      """
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.constants,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.constants.txt,True,0,0,'CONST',expression,Required,"Operator,Aggregation","+,COUNT",,None,None,26.0,"
-      SELECT 'CONST' AS `TEMP(Test)(3972932107)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ","""CONST""","""CONST"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.find,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.find.txt,True,0,0,"FIND(str2, ""ee"")",expression,Required,"Data Prep,Operator,Calculation","FIND,*",,None,None,30.0,"
-      SELECT LOCATE('ee',`calcs`.`str2`) AS `TEMP(Test)(3981629397)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3981629397)(0)`
-    ","%null%
-0
-4
-5
-6","%null%
-0
-4
-5
-6"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.find,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.find.txt,True,0,0,"find(str1,'E')",expression,Required,"Data Prep,Operator,Calculation","FIND,*",,None,None,35.0,"
-      SELECT LOCATE('E',`calcs`.`str1`) AS `TEMP(Test)(257220821)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(257220821)(0)`
-    ","0
-1
-5
-6
-7
-11
-15
-17","0
-1
-5
-6
-7
-11
-15
-17"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.find,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.find.txt,True,0,0,"find(str1,'E',6)",expression,Required,"Data Prep,Operator,Calculation","FIND,*",,None,None,27.0,"
-      SELECT LOCATE('E',`calcs`.`str1`,6) AS `TEMP(Test)(282093116)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(282093116)(0)`
-    ","0
-6
-7
-9
-11
-15
-17","0
-6
-7
-9
-11
-15
-17"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.find,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.find.txt,True,0,0,"find(str2,str3)",expression,Required,"Data Prep,Operator,Calculation","FIND,*",,None,None,26.0,"
-      SELECT LOCATE(`calcs`.`str3`,`calcs`.`str2`) AS `TEMP(Test)(3096760581)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3096760581)(0)`
-    ","%null%
-0
-1
-2
-3
-4
-5","%null%
-0
-1
-2
-3
-4
-5"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.find,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.find.txt,True,0,0,"find(str2,str3,num4*.2)",expression,Required,"Data Prep,Operator,Calculation","FIND,*",,None,None,26.0,"
-      SELECT LOCATE(`calcs`.`str3`,`calcs`.`str2`,CAST((`calcs`.`num4` * 0.2) as int)) AS `TEMP(Test)(2787932066)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2787932066)(0)`
-    ","%null%
-0
-1
-3
-4
-5","%null%
-0
-1
-3
-4
-5"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.len,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.len.txt,True,0,0,"LEN(""data"")",expression,Required,"Calculation,Data Prep,Aggregation","COUNT,LEN",,None,None,32.0,"
-      SELECT LENGTH('data') AS `TEMP(Test)(5037157)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",4,4
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.len,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.len.txt,True,0,0,len(str2),expression,Required,"Calculation,Data Prep,Aggregation","COUNT,LEN",,None,None,25.0,"
-      SELECT LENGTH(`calcs`.`str2`) AS `TEMP(Test)(382448263)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(382448263)(0)`
-    ","%null%
-3
-4
-5
-6
-7
-8","%null%
-3
-4
-5
-6
-7
-8"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.ltrim,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.ltrim.txt,True,0,0,"LTRIM("" "" + str2 + "" "")",expression,Required,"Operator,Calculation","+,LTRIM",,None,None,27.0,"
-      SELECT LTRIM(CONCAT(CONCAT(' ', `calcs`.`str2`), ' ')) AS `TEMP(Test)(1106979036)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1106979036)(0)`
-    ","%null%
-""eight ""
-""eleven ""
-""fifteen ""
-""five ""
-""fourteen ""
-""nine ""
-""one ""
-""six ""
-""sixteen ""
-""ten ""
-""three ""
-""twelve ""
-""two ""","%null%
-""eight ""
-""eleven ""
-""fifteen ""
-""five ""
-""fourteen ""
-""nine ""
-""one ""
-""six ""
-""sixteen ""
-""ten ""
-""three ""
-""twelve ""
-""two """
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.min.txt,True,0,0,"MIN(""Data"", ""Tableau"")",expression,Required,Aggregation,"COUNT,MIN",,None,None,28.0,"
-      SELECT CASE WHEN ISNULL('Data') THEN NULL
-                WHEN ISNULL('Tableau') THEN NULL
-	            WHEN 'Data' < 'Tableau' THEN 'Data'
-                ELSE 'Tableau' END AS `TEMP(Test)(535453017)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ","""Data""","""Data"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.min.txt,True,0,0,"MIN(str1, str2)",expression,Required,Aggregation,"COUNT,MIN",,None,None,27.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`str1`) THEN NULL
-                WHEN ISNULL(`calcs`.`str2`) THEN NULL
-	            WHEN `calcs`.`str1` < `calcs`.`str2` THEN `calcs`.`str1`
-                ELSE `calcs`.`str2` END AS `TEMP(Test)(497224717)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(497224717)(0)`
-    ","%null%
-""AIR PURIFIERS""
-""ANSWERING MACHINES""
-""BINDER CLIPS""
-""BINDING MACHINES""
-""BUSINESS COPIERS""
-""BUSINESS ENVELOPES""
-""CD-R MEDIA""
-""CLAMP ON LAMPS""
-""CLOCKS""
-""CONFERENCE PHONES""
-""CORDLESS KEYBOARDS""
-""DOT MATRIX PRINTERS""
-""DVD""","%null%
-""AIR PURIFIERS""
-""ANSWERING MACHINES""
-""BINDER CLIPS""
-""BINDING MACHINES""
-""BUSINESS COPIERS""
-""BUSINESS ENVELOPES""
-""CD-R MEDIA""
-""CLAMP ON LAMPS""
-""CLOCKS""
-""CONFERENCE PHONES""
-""CORDLESS KEYBOARDS""
-""DOT MATRIX PRINTERS""
-""DVD"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.min,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.min.txt,True,0,0,"MIN(str2, str3)",expression,Required,Aggregation,"COUNT,MIN",,None,None,27.0,"
-      SELECT CASE WHEN ISNULL(`calcs`.`str2`) THEN NULL
-                WHEN ISNULL(`calcs`.`str3`) THEN NULL
-	            WHEN `calcs`.`str2` < `calcs`.`str3` THEN `calcs`.`str2`
-                ELSE `calcs`.`str3` END AS `TEMP(Test)(1239505702)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1239505702)(0)`
-    ","%null%
-""e""","%null%
-""e"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.replace,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.replace.txt,True,0,0,"REPLACE(""cat"", ""c"", ""b"") //cat->bat",expression,Required If Supported,"Calculation,Aggregation","COUNT,REPLACE",,None,None,29.0,"
-      SELECT REPLACE('cat','c','b') AS `TEMP(Test)(3161246105)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ","""bat""","""bat"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.replace,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.replace.txt,True,0,0,"REPLACE(str2, ""e"", ""o"")",expression,Required If Supported,"Calculation,Aggregation","COUNT,REPLACE",,None,None,26.0,"
-      SELECT REPLACE(`calcs`.`str2`,'e','o') AS `TEMP(Test)(2953834147)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2953834147)(0)`
-    ","%null%
-""fiftoon""
-""fivo""
-""fourtoon""
-""nino""
-""oight""
-""olovon""
-""ono""
-""six""
-""sixtoon""
-""throo""
-""ton""
-""two""
-""twolvo""","%null%
-""fiftoon""
-""fivo""
-""fourtoon""
-""nino""
-""oight""
-""olovon""
-""ono""
-""six""
-""sixtoon""
-""throo""
-""ton""
-""two""
-""twolvo"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.right,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.right.txt,True,0,0,"RIGHT(""Data"", 2)",expression,Required,"Calculation,Aggregation","COUNT,RIGHT",,None,None,26.0,"
-      SELECT (CASE WHEN 2 >= 0 THEN RIGHT('Data',2) ELSE NULL END) AS `TEMP(Test)(2843244905)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ","""ta""","""ta"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.right,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.right.txt,True,0,0,"right(str2,3)",expression,Required,"Calculation,Aggregation","COUNT,RIGHT",,None,None,30.0,"
-      SELECT (CASE WHEN 3 >= 0 THEN RIGHT(`calcs`.`str2`,3) ELSE NULL END) AS `TEMP(Test)(868342576)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(868342576)(0)`
-    ","%null%
-""een""
-""ght""
-""ine""
-""ive""
-""lve""
-""one""
-""ree""
-""six""
-""ten""
-""two""
-""ven""","%null%
-""een""
-""ght""
-""ine""
-""ive""
-""lve""
-""one""
-""ree""
-""six""
-""ten""
-""two""
-""ven"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.right,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.right.txt,False,0,9,"right(str2,int0)",expression,Required,"Calculation,Aggregation","COUNT,RIGHT",,"
-      Error executing query
-
-    ",Actual does not match expected.,41.0,"
-      SELECT (CASE WHEN `calcs`.`int0` >= 0 THEN RIGHT(`calcs`.`str2`,`calcs`.`int0`) ELSE NULL END) AS `TEMP(Test)(427841631)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(427841631)(0)`
-    ",,"%null%
-""e""
-""even""
-""fifteen""
-""five""
-""six""
-""teen""
-""ten""
-""twelve"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.rtrim,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.rtrim.txt,True,0,0,"RTRIM("" "" + str2 + "" "")",expression,Required,"Operator,Calculation","+,RTRIM",,None,None,26.0,"
-      SELECT RTRIM(CONCAT(CONCAT(' ', `calcs`.`str2`), ' ')) AS `TEMP(Test)(2277366246)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2277366246)(0)`
-    ","%null%
-"" eight""
-"" eleven""
-"" fifteen""
-"" five""
-"" fourteen""
-"" nine""
-"" one""
-"" six""
-"" sixteen""
-"" ten""
-"" three""
-"" twelve""
-"" two""","%null%
-"" eight""
-"" eleven""
-"" fifteen""
-"" five""
-"" fourteen""
-"" nine""
-"" one""
-"" six""
-"" sixteen""
-"" ten""
-"" three""
-"" twelve""
-"" two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.split.right,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.split.right.txt,False,0,1,"SPLIT(""a-b-c"", ""-"", -2) //b",expression,Required If Supported,"Calculation,Data Prep,Aggregation","COUNT,SPLIT",,"
-      Error executing query
-
-    ",Actual does not match expected.,40.0,"
-      SELECT TRIM(TRAILING '-' FROM TRIM(TRAILING SUBSTRING_INDEX('a-b-c', '-', (-2 + 1)) FROM SUBSTRING_INDEX('a-b-c', '-', -2))) AS `TEMP(Test)(281150402)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,"""b"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.split,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.split.txt,False,0,1,"SPLIT(""a-b-c"", ""-"", 2) //b",expression,Required,"Calculation,Data Prep,Aggregation","COUNT,SPLIT",,"
-      Error executing query
-
-    ",Actual does not match expected.,46.0,"
-      SELECT TRIM(LEADING '-' FROM TRIM(LEADING SUBSTRING_INDEX('a-b-c', '-', (2 - 1)) FROM SUBSTRING_INDEX('a-b-c', '-', 2))) AS `TEMP(Test)(1221977364)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,"""b"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.trim,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.trim.txt,True,0,0,"TRIM("" "" + str2 + "" "")",expression,Required If Supported,"Data Prep,Operator,Calculation","+,TRIM",,None,None,26.0,"
-      SELECT TRIM(CONCAT(CONCAT(' ', `calcs`.`str2`), ' ')) AS `TEMP(Test)(1903992131)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1903992131)(0)`
-    ","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two""","%null%
-""eight""
-""eleven""
-""fifteen""
-""five""
-""fourteen""
-""nine""
-""one""
-""six""
-""sixteen""
-""ten""
-""three""
-""twelve""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.upper,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.upper.txt,True,0,0,"UPPER(""data"")",expression,Required,"Calculation,Aggregation","UPPER,COUNT",,None,None,28.0,"
-      SELECT UPPER('data') AS `TEMP(Test)(2967749075)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ","""DATA""","""DATA"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.upper,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.upper.txt,True,0,0,upper(str2),expression,Required,"Calculation,Aggregation","UPPER,COUNT",,None,None,27.0,"
-      SELECT UPPER(`calcs`.`str2`) AS `TEMP(Test)(3516395767)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3516395767)(0)`
-    ","%null%
-""EIGHT""
-""ELEVEN""
-""FIFTEEN""
-""FIVE""
-""FOURTEEN""
-""NINE""
-""ONE""
-""SIX""
-""SIXTEEN""
-""TEN""
-""THREE""
-""TWELVE""
-""TWO""","%null%
-""EIGHT""
-""ELEVEN""
-""FIFTEEN""
-""FIVE""
-""FOURTEEN""
-""NINE""
-""ONE""
-""SIX""
-""SIXTEEN""
-""TEN""
-""THREE""
-""TWELVE""
-""TWO"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.contains,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.contains.txt,True,0,0,"CONTAINS(str2, ""e"")",expression,Required,"Calculation,Aggregation,Wildcard Filters","MIN,MAX,CONTAINS",,None,None,33.0,"
-      SELECT (CASE WHEN (LOCATE('e',`calcs`.`str2`) > 0) THEN 1 WHEN NOT (LOCATE('e',`calcs`.`str2`) > 0) THEN 0 ELSE NULL END) AS `TEMP(Test)(1364536471)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1364536471)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.contains,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.contains.txt,True,0,0,"CONTAINS(str1, ""IND"")",expression,Required,"Calculation,Aggregation,Wildcard Filters","MIN,MAX,CONTAINS",,None,None,26.0,"
-      SELECT (CASE WHEN (LOCATE('IND',`calcs`.`str1`) > 0) THEN 1 WHEN NOT (LOCATE('IND',`calcs`.`str1`) > 0) THEN 0 ELSE NULL END) AS `TEMP(Test)(1380546255)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1380546255)(0)`
-    ","false
-true","false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.endswith,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.endswith.txt,True,0,0,"ENDSWITH(str1, ""s"")",expression,Required,"Calculation,Filters,Aggregation","MIN,MAX,ENDSWITH",,None,None,34.0,"
-      SELECT (CASE WHEN (RIGHT(RTRIM(`calcs`.`str1`), LENGTH('s')) = 's') THEN 1 WHEN NOT (RIGHT(RTRIM(`calcs`.`str1`), LENGTH('s')) = 's') THEN 0 ELSE NULL END) AS `TEMP(Test)(1759936097)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1759936097)(0)`
-    ",false,false
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.endswith,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.endswith.txt,True,0,0,"ENDSWITH(str2, ""een"")",expression,Required,"Calculation,Filters,Aggregation","MIN,MAX,ENDSWITH",,None,None,31.0,"
-      SELECT (CASE WHEN (RIGHT(RTRIM(`calcs`.`str2`), LENGTH('een')) = 'een') THEN 1 WHEN NOT (RIGHT(RTRIM(`calcs`.`str2`), LENGTH('een')) = 'een') THEN 0 ELSE NULL END) AS `TEMP(Test)(3179156403)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(3179156403)(0)`
-    ","%null%
-false
-true","%null%
-false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.mid.calc,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.mid.calc.txt,False,0,2,"mid(str2,(num0+5)*.3,num1)",expression,Required,"Data Prep,Operator,Calculation","+,MID,*",,Actual does not match expected.,Actual does not match expected.,29.0,"
-      SELECT SUBSTR(`calcs`.`str2`,CAST(((`calcs`.`num0` + 5) * 0.3) as int),CAST(`calcs`.`num1` as int)) AS `TEMP(Test)(1934432200)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(1934432200)(0)`
-    ","%null%
-""""
-""e""
-""ive""
-""wo""","%null%
-""""
-""e""
-""ive""
-""six""
-""two"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.space.int.constant,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.space.int.constant.txt,False,0,1,SPACE(int(2)),expression,Required,"Calculation,Cast,Aggregation","SPACE,COUNT,INT",,"
-      Error executing query
-
-    ",Actual does not match expected.,43.0,"
-      SELECT IF(CAST(2 as int) >= 0, SPACE(FLOOR(CAST(2 as int))), NULL) AS `TEMP(Test)(1595235754)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,"""  """
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.space,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.space.txt,False,0,1,'>'+SPACE(2)+'<',expression,Required,"Calculation,Operator,Aggregation","+,COUNT,SPACE",,"
-      Error executing query
-
-    ",Actual does not match expected.,38.0,"
-      SELECT CONCAT(CONCAT('>', IF(2 >= 0, SPACE(FLOOR(2)), NULL)), '<') AS `TEMP(Test)(3167158121)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",,""">  <"""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.utf8,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.utf8.txt,True,0,0,"REPLACE(""This is ® replace test."", ""®"", ""RegisterSymbol"")",expression,Recommended,"Calculation,Data Prep,Aggregation","COUNT,FIND,REPLACE",,None,None,26.0,"
-      SELECT REPLACE('This is ® replace test.','®','RegisterSymbol') AS `TEMP(Test)(4256708872)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ","""This is RegisterSymbol replace test.""","""This is RegisterSymbol replace test."""
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.utf8,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.utf8.txt,True,0,0,"FIND(""This is ™ find test."", ""™"")",expression,Recommended,"Calculation,Data Prep,Aggregation","COUNT,FIND,REPLACE",,None,None,28.0,"
-      SELECT LOCATE('™','This is ™ find test.') AS `TEMP(Test)(1040567396)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",9,9
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.startswith,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.startswith.txt,True,0,0,"STARTSWITH(""Data"", ""D"")",expression,Required,"Calculation,Filters,Aggregation","COUNT,MIN,STARTSWITH,MAX",,None,None,32.0,"
-      SELECT (CASE WHEN (LEFT(LTRIM('Data'), LENGTH('D')) = 'D') THEN 1 WHEN NOT (LEFT(LTRIM('Data'), LENGTH('D')) = 'D') THEN 0 ELSE NULL END) AS `TEMP(Test)(3252316215)(0)`
-FROM `calcs`
-HAVING (COUNT(1) > 0)
-    ",true,true
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.startswith,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.startswith.txt,True,0,0,"STARTSWITH([str1], ""BI"" )",expression,Required,"Calculation,Filters,Aggregation","COUNT,MIN,STARTSWITH,MAX",,None,None,25.0,"
-      SELECT (CASE WHEN (LEFT(LTRIM(`calcs`.`str1`), LENGTH('BI')) = 'BI') THEN 1 WHEN NOT (LEFT(LTRIM(`calcs`.`str1`), LENGTH('BI')) = 'BI') THEN 0 ELSE NULL END) AS `TEMP(Test)(535799381)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(535799381)(0)`
-    ","false
-true","false
-true"
-OpenSearch,tempOpenSearch,cast_calcs.OpenSearch,string.startswith,C:\Users\yuryf-windows\AppData\Local\Programs\Python\Python310\lib\site-packages\tdvt\exprtests\standard\setup.string.startswith.txt,False,0,2,"STARTSWITH([str1], [str2])",expression,Required,"Calculation,Filters,Aggregation","COUNT,MIN,STARTSWITH,MAX",,"
-      Error executing query
-
-    ",Actual does not match expected.,43.0,"
-      SELECT (CASE WHEN (LEFT(LTRIM(`calcs`.`str1`), LENGTH(`calcs`.`str2`)) = `calcs`.`str2`) THEN 1 WHEN NOT (LEFT(LTRIM(`calcs`.`str1`), LENGTH(`calcs`.`str2`)) = `calcs`.`str2`) THEN 0 ELSE NULL END) AS `TEMP(Test)(2377293421)(0)`
-FROM `calcs`
-GROUP BY `TEMP(Test)(2377293421)(0)`
-    ",,"%null%
-false"
diff --git a/build-tools/sqlplugin-coverage.gradle b/build-tools/sqlplugin-coverage.gradle
index 6f99ceac1f..1665637690 100644
--- a/build-tools/sqlplugin-coverage.gradle
+++ b/build-tools/sqlplugin-coverage.gradle
@@ -16,6 +16,7 @@
  *  cluster is stopped and dump it to a file. Luckily our current security policy seems to allow this. This will also probably
  *  break if there are multiple nodes in the integTestCluster. But for now... it sorta works.
  */
+import org.apache.tools.ant.taskdefs.condition.Os
 apply plugin: 'jacoco'
 
 // Get gradle to generate the required jvm agent arg for us using a dummy tasks of type Test. Unfortunately Elastic's
@@ -45,7 +46,12 @@ integTest.runner {
 }
 
 testClusters.integTest {
-    jvmArgs " ${dummyIntegTest.jacoco.getAsJvmArg()}"
+    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+        // Replacing build with absolute path to fix the error "error opening zip file or JAR manifest missing : /build/tmp/expandedArchives/..../jacocoagent.jar"
+        jvmArgs " ${dummyIntegTest.jacoco.getAsJvmArg()}".replace('build',"${buildDir}")
+    } else {
+        jvmArgs " ${dummyIntegTest.jacoco.getAsJvmArg()}".replace('javaagent:','javaagent:/')
+    }
     systemProperty 'com.sun.management.jmxremote', "true"
     systemProperty 'com.sun.management.jmxremote.authenticate', "false"
     systemProperty 'com.sun.management.jmxremote.port', "7777"
diff --git a/build.gradle b/build.gradle
index d1c253c1dd..afe18cec59 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,18 +6,19 @@
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.5.0-SNAPSHOT")
-        spring_version = "5.3.22"
-        jackson_version = "2.14.1"
-        jackson_databind_version = "2.14.1"
+        opensearch_version = System.getProperty("opensearch.version", "2.18.0-SNAPSHOT")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'
         prometheus_binary_version = "2.37.2"
+        common_utils_version = System.getProperty("common_utils.version", opensearch_build)
         if (buildVersionQualifier) {
             opensearch_build += "-${buildVersionQualifier}"
         }
+        //this variable for always downloading snapshot version of security plugin.
+        //need to figure out more elegant solution for integ tests with security.
+        opensearch_build_snapshot = opensearch_build + '-SNAPSHOT'
         if (isSnapshot) {
             // 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT (opensearch_build)
             opensearch_build += "-SNAPSHOT"
@@ -48,6 +49,8 @@ buildscript {
         getPrometheusBinaryLocation = { ->
             return "https://github.com/prometheus/prometheus/releases/download/v${prometheus_binary_version}/prometheus-${prometheus_binary_version}."+ getOSFamilyType() + "-" + getArchType() + ".tar.gz"
         }
+        aws_java_sdk_version = "1.12.651"
+        guava_version = "32.1.3-jre"
     }
 
     repositories {
@@ -62,18 +65,42 @@ buildscript {
 }
 
 plugins {
-    id 'nebula.ospackage' version "8.3.0"
+    id "com.netflix.nebula.ospackage-base" version "11.5.0"
     id 'java-library'
-    id 'checkstyle'
-    id "io.freefair.lombok" version "6.4.0"
+    id "io.freefair.lombok" version "8.4"
     id 'jacoco'
+    id 'com.diffplug.spotless' version '6.22.0'
 }
 
+// import versions defined in https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java#L94
+// versions https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties
+apply plugin: 'opensearch.java'
+
 // Repository on root level is for dependencies that project code depends on. And this block must be placed after plugins{}
 repositories {
     mavenLocal()
     maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
     mavenCentral() // For Elastic Libs that you can use to get started coding until open OpenSearch libs are available
+    maven { url 'https://jitpack.io' }
+}
+
+// Spotless checks will be added as PRs are applied to resolve each style issue is approved.
+spotless {
+    java {
+        target fileTree('.') {
+            include '**/*.java'
+            exclude '**/build/**', '**/build-*/**', '**/gen/**'
+        }
+        importOrder()
+//        licenseHeader("/*\n" +
+//                " * Copyright OpenSearch Contributors\n" +
+//                " * SPDX-License-Identifier: Apache-2.0\n" +
+//                " */\n\n")
+        removeUnusedImports()
+        trimTrailingWhitespace()
+        endWithNewline()
+        googleJavaFormat('1.19.2').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
+    }
 }
 
 allprojects {
@@ -89,6 +116,13 @@ allprojects {
     plugins.withId('java') {
         sourceCompatibility = targetCompatibility = "11"
     }
+    configurations.all {
+        resolutionStrategy.force "com.squareup.okio:okio:3.5.0"
+        resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.9.0"
+        resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0"
+        resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0"
+        resolutionStrategy.force "net.bytebuddy:byte-buddy:1.14.9"
+    }
 }
 
 subprojects {
@@ -96,6 +130,8 @@ subprojects {
         mavenLocal()
         maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
         mavenCentral()
+        maven { url "https://d1nvenhzbhpy0q.cloudfront.net/snapshots/lucene/" }
+        maven { url 'https://jitpack.io' }
     }
 }
 
@@ -125,8 +161,8 @@ jacoco {
 }
 jacocoTestReport {
     reports {
-        xml.enabled false
-        csv.enabled false
+        xml.required = false
+        csv.required = false
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {
@@ -154,29 +190,12 @@ jacocoTestCoverageVerification {
 }
 check.dependsOn jacocoTestCoverageVerification
 
-// TODO: fix code style in main and test source code
-allprojects {
-    apply plugin: 'checkstyle'
-    checkstyle {
-        configFile rootProject.file("config/checkstyle/google_checks.xml")
-        toolVersion "10.3.2"
-        configProperties = [
-                "org.checkstyle.google.suppressionfilter.config": rootProject.file("config/checkstyle/suppressions.xml")]
-        ignoreFailures = false
-    }
-}
-checkstyle {
-    configFile file("config/checkstyle/checkstyle.xml")
-}
-checkstyleMain.ignoreFailures = false
-checkstyleTest.ignoreFailures = true
-
 configurations.all {
     resolutionStrategy.force 'junit:junit:4.13.2'
     exclude group: "commons-logging", module: "commons-logging"
     // enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
     resolutionStrategy.force 'commons-codec:commons-codec:1.13'
-    resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
+    resolutionStrategy.force "com.google.guava:guava:${guava_version}"
 }
 
 // updateVersion: Task to auto increment to the next development iteration
@@ -186,14 +205,6 @@ task updateVersion {
         ext.newVersion = System.getProperty('newVersion')
         println "Setting version to ${newVersion}."
         // String tokenization to support -SNAPSHOT
-        ant.replaceregexp(file:'.github/workflows/sql-workbench-test-and-build-workflow.yml', match:'OPENSEARCH_PLUGIN_VERSION: \\d+.\\d+.\\d+.\\d+', replace:'OPENSEARCH_PLUGIN_VERSION: ' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true)
         ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)
-        ant.replaceregexp(match:'"version": "\\d+.\\d+.\\d+.\\d+', replace:'"version": ' + '"' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true) {
-            fileset(dir: projectDir) {
-                include(name: "workbench/package.json")
-                include(name: "workbench/opensearch_dashboards.json")
-            }
-        }
-        ant.replaceregexp(file:'workbench/opensearch_dashboards.json', match:'"opensearchDashboardsVersion": "\\d+.\\d+.\\d+', replace:'"opensearchDashboardsVersion": ' + '"' + newVersion.tokenize('-')[0], flags:'g', byline:true)
     }
 }
diff --git a/buildSrc/src/main/groovy/com/wiredforcode/spawn/KillProcessTask.groovy b/buildSrc/src/main/groovy/com/wiredforcode/spawn/KillProcessTask.groovy
index 15c60b1aec..55bb76f1a1 100644
--- a/buildSrc/src/main/groovy/com/wiredforcode/spawn/KillProcessTask.groovy
+++ b/buildSrc/src/main/groovy/com/wiredforcode/spawn/KillProcessTask.groovy
@@ -1,5 +1,6 @@
 package com.wiredforcode.gradle.spawn
 
+import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.api.tasks.TaskAction
 
 class KillProcessTask extends DefaultSpawnTask {
@@ -12,7 +13,13 @@ class KillProcessTask extends DefaultSpawnTask {
         }
 
         def pid = pidFile.text
-        def process = "kill $pid".execute()
+        def killCommandLine
+        if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+            killCommandLine = Arrays.asList("taskkill", "/F", "/T", "/PID", "$pid")
+        } else {
+            killCommandLine = Arrays.asList("kill", "$pid")
+        }
+        def process = killCommandLine.execute()
 
         try {
             process.waitFor()
diff --git a/buildSrc/src/main/groovy/com/wiredforcode/spawn/SpawnProcessTask.groovy b/buildSrc/src/main/groovy/com/wiredforcode/spawn/SpawnProcessTask.groovy
index 1b3d0c4f00..a79bd13f60 100644
--- a/buildSrc/src/main/groovy/com/wiredforcode/spawn/SpawnProcessTask.groovy
+++ b/buildSrc/src/main/groovy/com/wiredforcode/spawn/SpawnProcessTask.groovy
@@ -95,9 +95,18 @@ class SpawnProcessTask extends DefaultSpawnTask {
     }
 
     private int extractPidFromProcess(Process process) {
-        def pidField = process.class.getDeclaredField('pid')
-        pidField.accessible = true
-
-        return pidField.getInt(process)
+        def pid
+        try {
+            // works since java 9
+            def pidMethod = process.class.getDeclaredMethod('pid')
+            pidMethod.setAccessible(true)
+            pid = pidMethod.invoke(process)
+        } catch (ignored) {
+            // fallback to UNIX-only implementation
+            def pidField = process.class.getDeclaredField('pid')
+            pidField.accessible = true
+            pid = pidField.getInt(process)
+        }
+        return pid
     }
 }
diff --git a/common/build.gradle b/common/build.gradle
index 533fccd9b2..a37e6ea411 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -25,6 +25,7 @@
 plugins {
     id 'java-library'
     id "io.freefair.lombok"
+    id 'com.diffplug.spotless' version '6.22.0'
 }
 
 repositories {
@@ -33,12 +34,35 @@ repositories {
 
 dependencies {
     api "org.antlr:antlr4-runtime:4.7.1"
-    api group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
-    api group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
-    api group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
+    api group: 'com.google.guava', name: 'guava', version: "${guava_version}"
+    api group: 'org.apache.logging.log4j', name: 'log4j-core', version:"${versions.log4j}"
+    api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    api group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.9.3'
+    api group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
+    implementation 'com.github.babbel:okhttp-aws-signer:1.0.2'
+    api group: 'com.amazonaws', name: 'aws-java-sdk-core', version: "${aws_java_sdk_version}"
+    api group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: "${aws_java_sdk_version}"
+    implementation "com.github.seancfoley:ipaddress:5.4.2"
 
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.9.1'
-    testImplementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
+    testImplementation group: 'com.google.guava', name: 'guava', version: "${guava_version}"
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
+    testImplementation('org.junit.jupiter:junit-jupiter:5.9.3')
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.7.0'
+    testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.12.0'
+}
+
+
+configurations.all {
+    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
+    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
+    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
+    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
+    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+    resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.9.3"
+    resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.13"
+    resolutionStrategy.force "joda-time:joda-time:2.10.12"
+    resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36"
 }
diff --git a/common/src/main/java/org/opensearch/sql/common/antlr/CaseInsensitiveCharStream.java b/common/src/main/java/org/opensearch/sql/common/antlr/CaseInsensitiveCharStream.java
index 0036da32a1..89381872ce 100644
--- a/common/src/main/java/org/opensearch/sql/common/antlr/CaseInsensitiveCharStream.java
+++ b/common/src/main/java/org/opensearch/sql/common/antlr/CaseInsensitiveCharStream.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.common.antlr;
 
 import org.antlr.v4.runtime.CharStream;
diff --git a/common/src/main/java/org/opensearch/sql/common/antlr/SyntaxAnalysisErrorListener.java b/common/src/main/java/org/opensearch/sql/common/antlr/SyntaxAnalysisErrorListener.java
index b499a52967..76cbf52d58 100644
--- a/common/src/main/java/org/opensearch/sql/common/antlr/SyntaxAnalysisErrorListener.java
+++ b/common/src/main/java/org/opensearch/sql/common/antlr/SyntaxAnalysisErrorListener.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.common.antlr;
 
 import java.util.Locale;
diff --git a/common/src/main/java/org/opensearch/sql/common/antlr/SyntaxCheckException.java b/common/src/main/java/org/opensearch/sql/common/antlr/SyntaxCheckException.java
index 806cb7208b..d3c9c111ef 100644
--- a/common/src/main/java/org/opensearch/sql/common/antlr/SyntaxCheckException.java
+++ b/common/src/main/java/org/opensearch/sql/common/antlr/SyntaxCheckException.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.common.antlr;
 
 public class SyntaxCheckException extends RuntimeException {
diff --git a/common/src/main/java/org/opensearch/sql/common/grok/Converter.java b/common/src/main/java/org/opensearch/sql/common/grok/Converter.java
index 72bfa3d7f1..ddd3a2bbb4 100644
--- a/common/src/main/java/org/opensearch/sql/common/grok/Converter.java
+++ b/common/src/main/java/org/opensearch/sql/common/grok/Converter.java
@@ -1,168 +1,165 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.common.grok;
-
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAccessor;
-import java.util.AbstractMap;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * Convert String argument to the right type.
- */
-public class Converter {
-
-  public enum Type {
-    BYTE(Byte::valueOf),
-    BOOLEAN(Boolean::valueOf),
-    SHORT(Short::valueOf),
-    INT(Integer::valueOf, "integer"),
-    LONG(Long::valueOf),
-    FLOAT(Float::valueOf),
-    DOUBLE(Double::valueOf),
-    DATETIME(new DateConverter(), "date"),
-    STRING(v -> v, "text");
-
-    public final IConverter<? extends Object> converter;
-    public final List<String> aliases;
-
-    Type(IConverter<? extends Object> converter, String... aliases) {
-      this.converter = converter;
-      this.aliases = Arrays.asList(aliases);
-    }
-  }
-
-  private static final Pattern SPLITTER = Pattern.compile("[:;]");
-
-  private static final Map<String, Type> TYPES =
-      Arrays.stream(Type.values())
-          .collect(Collectors.toMap(t -> t.name().toLowerCase(), t -> t));
-
-  private static final Map<String, Type> TYPE_ALIASES =
-      Arrays.stream(Type.values())
-          .flatMap(type -> type.aliases.stream()
-              .map(alias -> new AbstractMap.SimpleEntry<>(alias, type)))
-          .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
-  private static Type getType(String key) {
-    key = key.toLowerCase();
-    Type type = TYPES.getOrDefault(key, TYPE_ALIASES.get(key));
-    if (type == null) {
-      throw new IllegalArgumentException("Invalid data type :" + key);
-    }
-    return type;
-  }
-
-  /**
-   * getConverters.
-   */
-  public static Map<String, IConverter<? extends Object>>
-      getConverters(Collection<String> groupNames, Object... params) {
-    return groupNames.stream()
-        .filter(Converter::containsDelimiter)
-        .collect(Collectors.toMap(Function.identity(), key -> {
-          String[] list = splitGrokPattern(key);
-          IConverter<? extends Object> converter = getType(list[1]).converter;
-          if (list.length == 3) {
-            converter = converter.newConverter(list[2], params);
-          }
-          return converter;
-        }));
-  }
-
-  /**
-   * getGroupTypes.
-   */
-  public static Map<String, Type> getGroupTypes(Collection<String> groupNames) {
-    return groupNames.stream()
-        .filter(Converter::containsDelimiter)
-        .map(Converter::splitGrokPattern)
-        .collect(Collectors.toMap(
-            l -> l[0],
-            l -> getType(l[1])
-        ));
-  }
-
-  public static String extractKey(String key) {
-    return splitGrokPattern(key)[0];
-  }
-
-  private static boolean containsDelimiter(String string) {
-    return string.indexOf(':') >= 0 || string.indexOf(';') >= 0;
-  }
-
-  private static String[] splitGrokPattern(String string) {
-    return SPLITTER.split(string, 3);
-  }
-
-  interface IConverter<T> {
-
-    T convert(String value);
-
-    default IConverter<T> newConverter(String param, Object... params) {
-      return this;
-    }
-  }
-
-
-  static class DateConverter implements IConverter<Instant> {
-
-    private final DateTimeFormatter formatter;
-    private final ZoneId timeZone;
-
-    public DateConverter() {
-      this.formatter = DateTimeFormatter.ISO_DATE_TIME;
-      this.timeZone = ZoneOffset.UTC;
-    }
-
-    private DateConverter(DateTimeFormatter formatter, ZoneId timeZone) {
-      this.formatter = formatter;
-      this.timeZone = timeZone;
-    }
-
-    @Override
-    public Instant convert(String value) {
-      TemporalAccessor dt = formatter
-          .parseBest(value.trim(), ZonedDateTime::from, LocalDateTime::from, OffsetDateTime::from,
-              Instant::from,
-              LocalDate::from);
-      if (dt instanceof ZonedDateTime) {
-        return ((ZonedDateTime) dt).toInstant();
-      } else if (dt instanceof LocalDateTime) {
-        return ((LocalDateTime) dt).atZone(timeZone).toInstant();
-      } else if (dt instanceof OffsetDateTime) {
-        return ((OffsetDateTime) dt).atZoneSameInstant(timeZone).toInstant();
-      } else if (dt instanceof Instant) {
-        return ((Instant) dt);
-      } else if (dt instanceof LocalDate) {
-        return ((LocalDate) dt).atStartOfDay(timeZone).toInstant();
-      } else {
-        return null;
-      }
-    }
-
-    @Override
-    public DateConverter newConverter(String param, Object... params) {
-      if (!(params.length == 1 && params[0] instanceof ZoneId)) {
-        throw new IllegalArgumentException("Invalid parameters");
-      }
-      return new DateConverter(DateTimeFormatter.ofPattern(param), (ZoneId) params[0]);
-    }
-  }
-}
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.common.grok;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
+import java.util.AbstractMap;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/** Convert String argument to the right type. */
+public class Converter {
+
+  public enum Type {
+    BYTE(Byte::valueOf),
+    BOOLEAN(Boolean::valueOf),
+    SHORT(Short::valueOf),
+    INT(Integer::valueOf, "integer"),
+    LONG(Long::valueOf),
+    FLOAT(Float::valueOf),
+    DOUBLE(Double::valueOf),
+    DATETIME(new DateConverter(), "date"),
+    STRING(v -> v, "text");
+
+    public final IConverter<? extends Object> converter;
+    public final List<String> aliases;
+
+    Type(IConverter<? extends Object> converter, String... aliases) {
+      this.converter = converter;
+      this.aliases = Arrays.asList(aliases);
+    }
+  }
+
+  private static final Pattern SPLITTER = Pattern.compile("[:;]");
+
+  private static final Map<String, Type> TYPES =
+      Arrays.stream(Type.values()).collect(Collectors.toMap(t -> t.name().toLowerCase(), t -> t));
+
+  private static final Map<String, Type> TYPE_ALIASES =
+      Arrays.stream(Type.values())
+          .flatMap(
+              type ->
+                  type.aliases.stream().map(alias -> new AbstractMap.SimpleEntry<>(alias, type)))
+          .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+  private static Type getType(String key) {
+    key = key.toLowerCase();
+    Type type = TYPES.getOrDefault(key, TYPE_ALIASES.get(key));
+    if (type == null) {
+      throw new IllegalArgumentException("Invalid data type :" + key);
+    }
+    return type;
+  }
+
+  /** getConverters. */
+  public static Map<String, IConverter<? extends Object>> getConverters(
+      Collection<String> groupNames, Object... params) {
+    return groupNames.stream()
+        .filter(Converter::containsDelimiter)
+        .collect(
+            Collectors.toMap(
+                Function.identity(),
+                key -> {
+                  String[] list = splitGrokPattern(key);
+                  IConverter<? extends Object> converter = getType(list[1]).converter;
+                  if (list.length == 3) {
+                    converter = converter.newConverter(list[2], params);
+                  }
+                  return converter;
+                }));
+  }
+
+  /** getGroupTypes. */
+  public static Map<String, Type> getGroupTypes(Collection<String> groupNames) {
+    return groupNames.stream()
+        .filter(Converter::containsDelimiter)
+        .map(Converter::splitGrokPattern)
+        .collect(Collectors.toMap(l -> l[0], l -> getType(l[1])));
+  }
+
+  public static String extractKey(String key) {
+    return splitGrokPattern(key)[0];
+  }
+
+  private static boolean containsDelimiter(String string) {
+    return string.indexOf(':') >= 0 || string.indexOf(';') >= 0;
+  }
+
+  private static String[] splitGrokPattern(String string) {
+    return SPLITTER.split(string, 3);
+  }
+
+  interface IConverter<T> {
+
+    T convert(String value);
+
+    default IConverter<T> newConverter(String param, Object... params) {
+      return this;
+    }
+  }
+
+  static class DateConverter implements IConverter<Instant> {
+
+    private final DateTimeFormatter formatter;
+    private final ZoneId timeZone;
+
+    public DateConverter() {
+      this.formatter = DateTimeFormatter.ISO_DATE_TIME;
+      this.timeZone = ZoneOffset.UTC;
+    }
+
+    private DateConverter(DateTimeFormatter formatter, ZoneId timeZone) {
+      this.formatter = formatter;
+      this.timeZone = timeZone;
+    }
+
+    @Override
+    public Instant convert(String value) {
+      TemporalAccessor dt =
+          formatter.parseBest(
+              value.trim(),
+              ZonedDateTime::from,
+              LocalDateTime::from,
+              OffsetDateTime::from,
+              Instant::from,
+              LocalDate::from);
+      if (dt instanceof ZonedDateTime) {
+        return ((ZonedDateTime) dt).toInstant();
+      } else if (dt instanceof LocalDateTime) {
+        return ((LocalDateTime) dt).atZone(timeZone).toInstant();
+      } else if (dt instanceof OffsetDateTime) {
+        return ((OffsetDateTime) dt).atZoneSameInstant(timeZone).toInstant();
+      } else if (dt instanceof Instant) {
+        return ((Instant) dt);
+      } else if (dt instanceof LocalDate) {
+        return ((LocalDate) dt).atStartOfDay(timeZone).toInstant();
+      } else {
+        return null;
+      }
+    }
+
+    @Override
+    public DateConverter newConverter(String param, Object... params) {
+      if (!(params.length == 1 && params[0] instanceof ZoneId)) {
+        throw new IllegalArgumentException("Invalid parameters");
+      }
+      return new DateConverter(DateTimeFormatter.ofPattern(param), (ZoneId) params[0]);
+    }
+  }
+}
diff --git a/common/src/main/java/org/opensearch/sql/common/grok/Grok.java b/common/src/main/java/org/opensearch/sql/common/grok/Grok.java
index f20f99cbc3..6dfab3f791 100644
--- a/common/src/main/java/org/opensearch/sql/common/grok/Grok.java
+++ b/common/src/main/java/org/opensearch/sql/common/grok/Grok.java
@@ -16,36 +16,29 @@
 import org.opensearch.sql.common.grok.Converter.IConverter;
 
 /**
- * {@code Grok} parse arbitrary text and structure it.
- * <br>
- * {@code Grok} is simple API that allows you to easily parse logs
- * and other files (single line). With {@code Grok},
- * you can turn unstructured log and event data into structured data.
+ * {@code Grok} parse arbitrary text and structure it. <br>
+ * {@code Grok} is simple API that allows you to easily parse logs and other files (single line).
+ * With {@code Grok}, you can turn unstructured log and event data into structured data.
  *
  * @since 0.0.1
  */
 public class Grok implements Serializable {
-  /**
-   * Named regex of the originalGrokPattern.
-   */
+  /** Named regex of the originalGrokPattern. */
   private final String namedRegex;
+
   /**
-   * Map of the named regex of the originalGrokPattern
-   * with id = namedregexid and value = namedregex.
+   * Map of the named regex of the originalGrokPattern with id = namedregexid and value =
+   * namedregex.
    */
   private final Map<String, String> namedRegexCollection;
-  /**
-   * Original {@code Grok} pattern (expl: %{IP}).
-   */
+
+  /** Original {@code Grok} pattern (expl: %{IP}). */
   private final String originalGrokPattern;
-  /**
-   * Pattern of the namedRegex.
-   */
+
+  /** Pattern of the namedRegex. */
   private final Pattern compiledNamedRegex;
 
-  /**
-   * {@code Grok} patterns definition.
-   */
+  /** {@code Grok} patterns definition. */
   private final Map<String, String> grokPatternDefinition;
 
   public final Set<String> namedGroups;
@@ -54,19 +47,16 @@ public class Grok implements Serializable {
 
   public final Map<String, IConverter<? extends Object>> converters;
 
-  /**
-   * only use in grok discovery.
-   */
+  /** only use in grok discovery. */
   private String savedPattern = "";
 
-  /**
-   * Grok.
-   */
-  public Grok(String pattern,
-              String namedRegex,
-              Map<String, String> namedRegexCollection,
-              Map<String, String> patternDefinitions,
-              ZoneId defaultTimeZone) {
+  /** Grok. */
+  public Grok(
+      String pattern,
+      String namedRegex,
+      Map<String, String> namedRegexCollection,
+      Map<String, String> patternDefinitions,
+      ZoneId defaultTimeZone) {
     this.originalGrokPattern = pattern;
     this.namedRegex = namedRegex;
     this.compiledNamedRegex = Pattern.compile(namedRegex);
@@ -132,8 +122,8 @@ public Map<String, String> getNamedRegexCollection() {
   }
 
   /**
-   * Match the given <tt>log</tt> with the named regex.
-   * And return the json representation of the matched element
+   * Match the given <tt>log</tt> with the named regex. And return the json representation of the
+   * matched element
    *
    * @param log : log to match
    * @return map containing matches
@@ -144,8 +134,8 @@ public Map<String, Object> capture(String log) {
   }
 
   /**
-   * Match the given list of <tt>log</tt> with the named regex
-   * and return the list of json representation of the matched elements.
+   * Match the given list of <tt>log</tt> with the named regex and return the list of json
+   * representation of the matched elements.
    *
    * @param logs : list of log
    * @return list of maps containing matches
@@ -159,8 +149,8 @@ public ArrayList<Map<String, Object>> capture(List<String> logs) {
   }
 
   /**
-   * Match the given <tt>text</tt> with the named regex
-   * {@code Grok} will extract data from the string and get an extence of {@link Match}.
+   * Match the given <tt>text</tt> with the named regex {@code Grok} will extract data from the
+   * string and get an extence of {@link Match}.
    *
    * @param text : Single line of log
    * @return Grok Match
@@ -172,9 +162,7 @@ public Match match(CharSequence text) {
 
     Matcher matcher = compiledNamedRegex.matcher(text);
     if (matcher.find()) {
-      return new Match(
-          text, this, matcher, matcher.start(0), matcher.end(0)
-      );
+      return new Match(text, this, matcher, matcher.start(0), matcher.end(0));
     }
 
     return Match.EMPTY;
diff --git a/common/src/main/java/org/opensearch/sql/common/grok/GrokCompiler.java b/common/src/main/java/org/opensearch/sql/common/grok/GrokCompiler.java
index 18894fc7a1..aba96ad4cb 100644
--- a/common/src/main/java/org/opensearch/sql/common/grok/GrokCompiler.java
+++ b/common/src/main/java/org/opensearch/sql/common/grok/GrokCompiler.java
@@ -31,13 +31,10 @@ public class GrokCompiler implements Serializable {
   // We don't want \n and commented line
   private static final Pattern patternLinePattern = Pattern.compile("^([A-z0-9_]+)\\s+(.*)$");
 
-  /**
-   * {@code Grok} patterns definitions.
-   */
+  /** {@code Grok} patterns definitions. */
   private final Map<String, String> grokPatternDefinitions = new HashMap<>();
 
-  private GrokCompiler() {
-  }
+  private GrokCompiler() {}
 
   public static GrokCompiler newInstance() {
     return new GrokCompiler();
@@ -50,10 +47,10 @@ public Map<String, String> getPatternDefinitions() {
   /**
    * Registers a new pattern definition.
    *
-   * @param name    : Pattern Name
+   * @param name : Pattern Name
    * @param pattern : Regular expression Or {@code Grok} pattern
    * @throws GrokException runtime expt
-   **/
+   */
   public void register(String name, String pattern) {
     name = Objects.requireNonNull(name).trim();
     pattern = Objects.requireNonNull(pattern).trim();
@@ -63,9 +60,7 @@ public void register(String name, String pattern) {
     }
   }
 
-  /**
-   * Registers multiple pattern definitions.
-   */
+  /** Registers multiple pattern definitions. */
   public void register(Map<String, String> patternDefinitions) {
     Objects.requireNonNull(patternDefinitions);
     patternDefinitions.forEach(this::register);
@@ -78,12 +73,9 @@ public void register(InputStream input) throws IOException {
     register(input, StandardCharsets.UTF_8);
   }
 
-  /**
-   * Registers multiple pattern definitions from a given inputStream.
-   */
+  /** Registers multiple pattern definitions from a given inputStream. */
   public void register(InputStream input, Charset charset) throws IOException {
-    try (
-        BufferedReader in = new BufferedReader(new InputStreamReader(input, charset))) {
+    try (BufferedReader in = new BufferedReader(new InputStreamReader(input, charset))) {
       in.lines()
           .map(patternLinePattern::matcher)
           .filter(Matcher::matches)
@@ -91,11 +83,10 @@ public void register(InputStream input, Charset charset) throws IOException {
     }
   }
 
-  /**
-   * Registers multiple pattern definitions from a given Reader.
-   */
+  /** Registers multiple pattern definitions from a given Reader. */
   public void register(Reader input) throws IOException {
-    new BufferedReader(input).lines()
+    new BufferedReader(input)
+        .lines()
         .map(patternLinePattern::matcher)
         .filter(Matcher::matches)
         .forEach(m -> register(m.group(1), m.group(2)));
@@ -109,9 +100,7 @@ public void registerPatternFromClasspath(String path) throws GrokException {
     registerPatternFromClasspath(path, StandardCharsets.UTF_8);
   }
 
-  /**
-   * registerPatternFromClasspath.
-   */
+  /** registerPatternFromClasspath. */
   public void registerPatternFromClasspath(String path, Charset charset) throws GrokException {
     final InputStream inputStream = this.getClass().getResourceAsStream(path);
     try (Reader reader = new InputStreamReader(inputStream, charset)) {
@@ -121,9 +110,7 @@ public void registerPatternFromClasspath(String path, Charset charset) throws Gr
     }
   }
 
-  /**
-   * Compiles a given Grok pattern and returns a Grok object which can parse the pattern.
-   */
+  /** Compiles a given Grok pattern and returns a Grok object which can parse the pattern. */
   public Grok compile(String pattern) throws IllegalArgumentException {
     return compile(pattern, false);
   }
@@ -135,11 +122,11 @@ public Grok compile(final String pattern, boolean namedOnly) throws IllegalArgum
   /**
    * Compiles a given Grok pattern and returns a Grok object which can parse the pattern.
    *
-   * @param pattern         : Grok pattern (ex: %{IP})
-   * @param defaultTimeZone : time zone used to parse a timestamp when it doesn't contain
-   *                        the time zone
-   * @param namedOnly       : Whether to capture named expressions only or not (i.e. %{IP:ip}
-   *                        but not ${IP})
+   * @param pattern : Grok pattern (ex: %{IP})
+   * @param defaultTimeZone : time zone used to parse a timestamp when it doesn't contain the time
+   *     zone
+   * @param namedOnly : Whether to capture named expressions only or not (i.e. %{IP:ip} but not
+   *     ${IP})
    * @return a compiled pattern
    * @throws IllegalArgumentException when pattern definition is invalid
    */
@@ -184,14 +171,15 @@ public Grok compile(final String pattern, ZoneId defaultTimeZone, boolean namedO
         for (int i = 0; i < count; i++) {
           String definitionOfPattern = patternDefinitions.get(group.get("pattern"));
           if (definitionOfPattern == null) {
-            throw new IllegalArgumentException(format("No definition for key '%s' found, aborting",
-                group.get("pattern")));
+            throw new IllegalArgumentException(
+                format("No definition for key '%s' found, aborting", group.get("pattern")));
           }
           String replacement = String.format("(?<name%d>%s)", index, definitionOfPattern);
           if (namedOnly && group.get("subname") == null) {
             replacement = String.format("(?:%s)", definitionOfPattern);
           }
-          namedRegexCollection.put("name" + index,
+          namedRegexCollection.put(
+              "name" + index,
               (group.get("subname") != null ? group.get("subname") : group.get("name")));
           namedRegex =
               StringUtils.replace(namedRegex, "%{" + group.get("name") + "}", replacement, 1);
@@ -205,12 +193,6 @@ public Grok compile(final String pattern, ZoneId defaultTimeZone, boolean namedO
       throw new IllegalArgumentException("Pattern not found");
     }
 
-    return new Grok(
-        pattern,
-        namedRegex,
-        namedRegexCollection,
-        patternDefinitions,
-        defaultTimeZone
-    );
+    return new Grok(pattern, namedRegex, namedRegexCollection, patternDefinitions, defaultTimeZone);
   }
 }
diff --git a/common/src/main/java/org/opensearch/sql/common/grok/GrokUtils.java b/common/src/main/java/org/opensearch/sql/common/grok/GrokUtils.java
index 9ff65acde2..4b145bbbe8 100644
--- a/common/src/main/java/org/opensearch/sql/common/grok/GrokUtils.java
+++ b/common/src/main/java/org/opensearch/sql/common/grok/GrokUtils.java
@@ -12,7 +12,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 /**
  * {@code GrokUtils} contain set of useful tools or methods.
  *
@@ -20,29 +19,25 @@
  */
 public class GrokUtils {
 
-  /**
-   * Extract Grok patter like %{FOO} to FOO, Also Grok pattern with semantic.
-   */
-  public static final Pattern GROK_PATTERN = Pattern.compile(
-      "%\\{"
-          + "(?<name>"
-          + "(?<pattern>[A-z0-9]+)"
-          + "(?::(?<subname>[A-z0-9_:;,\\-\\/\\s\\.']+))?"
-          + ")"
-          + "(?:=(?<definition>"
-          + "(?:"
-          + "(?:[^{}]+|\\.+)+"
-          + ")+"
-          + ")"
-          + ")?"
-          + "\\}");
-
-  public static final Pattern NAMED_REGEX = Pattern
-      .compile("\\(\\?<([a-zA-Z][a-zA-Z0-9]*)>");
-
-  /**
-   * getNameGroups.
-   */
+  /** Extract Grok patter like %{FOO} to FOO, Also Grok pattern with semantic. */
+  public static final Pattern GROK_PATTERN =
+      Pattern.compile(
+          "%\\{"
+              + "(?<name>"
+              + "(?<pattern>[A-z0-9]+)"
+              + "(?::(?<subname>[A-z0-9_:;,\\-\\/\\s\\.']+))?"
+              + ")"
+              + "(?:=(?<definition>"
+              + "(?:"
+              + "(?:[^{}]+|\\.+)+"
+              + ")+"
+              + ")"
+              + ")?"
+              + "\\}");
+
+  public static final Pattern NAMED_REGEX = Pattern.compile("\\(\\?<([a-zA-Z][a-zA-Z0-9]*)>");
+
+  /** getNameGroups. */
   public static Set<String> getNameGroups(String regex) {
     Set<String> namedGroups = new LinkedHashSet<>();
     Matcher matcher = NAMED_REGEX.matcher(regex);
@@ -52,9 +47,7 @@ public static Set<String> getNameGroups(String regex) {
     return namedGroups;
   }
 
-  /**
-   * namedGroups.
-   */
+  /** namedGroups. */
   public static Map<String, String> namedGroups(Matcher matcher, Set<String> groupNames) {
     Map<String, String> namedGroups = new LinkedHashMap<>();
     for (String groupName : groupNames) {
diff --git a/common/src/main/java/org/opensearch/sql/common/grok/Match.java b/common/src/main/java/org/opensearch/sql/common/grok/Match.java
index 6831f35cee..3771817bba 100644
--- a/common/src/main/java/org/opensearch/sql/common/grok/Match.java
+++ b/common/src/main/java/org/opensearch/sql/common/grok/Match.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.common.grok;
 
-
 import static java.lang.String.format;
 
 import java.util.ArrayList;
@@ -31,9 +30,7 @@ public class Match {
   private boolean keepEmptyCaptures = true;
   private Map<String, Object> capture = Collections.emptyMap();
 
-  /**
-   * Create a new {@code Match} object.
-   */
+  /** Create a new {@code Match} object. */
   public Match(CharSequence subject, Grok grok, Matcher match, int start, int end) {
     this.subject = subject;
     this.grok = grok;
@@ -42,9 +39,7 @@ public Match(CharSequence subject, Grok grok, Matcher match, int start, int end)
     this.end = end;
   }
 
-  /**
-   * Create Empty grok matcher.
-   */
+  /** Create Empty grok matcher. */
   public static final Match EMPTY = new Match("", null, null, 0, 0);
 
   public Matcher getMatch() {
@@ -59,9 +54,7 @@ public int getEnd() {
     return end;
   }
 
-  /**
-   * Ignore empty captures.
-   */
+  /** Ignore empty captures. */
   public void setKeepEmptyCaptures(boolean ignore) {
     // clear any cached captures
     if (capture.size() > 0) {
@@ -97,8 +90,8 @@ public Map<String, Object> capture() {
    *
    * @param flattened will it flatten values.
    * @return the matched elements.
-   * @throws GrokException if a keys has multiple non-null values, but only if flattened is set
-   *                       to true.
+   * @throws GrokException if a keys has multiple non-null values, but only if flattened is set to
+   *     true.
    */
   private Map<String, Object> capture(boolean flattened) throws GrokException {
     if (match == null) {
@@ -116,70 +109,69 @@ private Map<String, Object> capture(boolean flattened) throws GrokException {
 
     Map<String, String> mappedw = GrokUtils.namedGroups(this.match, this.grok.namedGroups);
 
-    mappedw.forEach((key, valueString) -> {
-      String id = this.grok.getNamedRegexCollectionById(key);
-      if (id != null && !id.isEmpty()) {
-        key = id;
-      }
-
-      if ("UNWANTED".equals(key)) {
-        return;
-      }
-
-      Object value = valueString;
-      if (valueString != null) {
-        IConverter<?> converter = grok.converters.get(key);
-
-        if (converter != null) {
-          key = Converter.extractKey(key);
-          try {
-            value = converter.convert(valueString);
-          } catch (Exception e) {
-            capture.put(key + "_grokfailure", e.toString());
+    mappedw.forEach(
+        (key, valueString) -> {
+          String id = this.grok.getNamedRegexCollectionById(key);
+          if (id != null && !id.isEmpty()) {
+            key = id;
           }
 
-          if (value instanceof String) {
-            value = cleanString((String) value);
+          if ("UNWANTED".equals(key)) {
+            return;
           }
-        } else {
-          value = cleanString(valueString);
-        }
-      } else if (!isKeepEmptyCaptures()) {
-        return;
-      }
-
-      if (capture.containsKey(key)) {
-        Object currentValue = capture.get(key);
 
-        if (flattened) {
-          if (currentValue == null && value != null) {
-            capture.put(key, value);
-          }
-          if (currentValue != null && value != null) {
-            throw new GrokException(
-                format(
-                    "key '%s' has multiple non-null values, this is not allowed in flattened mode,"
-                        + " values:'%s', '%s'",
-                    key,
-                    currentValue,
-                    value));
+          Object value = valueString;
+          if (valueString != null) {
+            IConverter<?> converter = grok.converters.get(key);
+
+            if (converter != null) {
+              key = Converter.extractKey(key);
+              try {
+                value = converter.convert(valueString);
+              } catch (Exception e) {
+                capture.put(key + "_grokfailure", e.toString());
+              }
+
+              if (value instanceof String) {
+                value = cleanString((String) value);
+              }
+            } else {
+              value = cleanString(valueString);
+            }
+          } else if (!isKeepEmptyCaptures()) {
+            return;
           }
-        } else {
-          if (currentValue instanceof List) {
-            @SuppressWarnings("unchecked")
-            List<Object> cvl = (List<Object>) currentValue;
-            cvl.add(value);
+
+          if (capture.containsKey(key)) {
+            Object currentValue = capture.get(key);
+
+            if (flattened) {
+              if (currentValue == null && value != null) {
+                capture.put(key, value);
+              }
+              if (currentValue != null && value != null) {
+                throw new GrokException(
+                    format(
+                        "key '%s' has multiple non-null values, this is not allowed in flattened"
+                            + " mode, values:'%s', '%s'",
+                        key, currentValue, value));
+              }
+            } else {
+              if (currentValue instanceof List) {
+                @SuppressWarnings("unchecked")
+                List<Object> cvl = (List<Object>) currentValue;
+                cvl.add(value);
+              } else {
+                List<Object> list = new ArrayList<Object>();
+                list.add(currentValue);
+                list.add(value);
+                capture.put(key, list);
+              }
+            }
           } else {
-            List<Object> list = new ArrayList<Object>();
-            list.add(currentValue);
-            list.add(value);
-            capture.put(key, list);
+            capture.put(key, value);
           }
-        }
-      } else {
-        capture.put(key, value);
-      }
-    });
+        });
 
     capture = Collections.unmodifiableMap(capture);
 
@@ -189,13 +181,11 @@ private Map<String, Object> capture(boolean flattened) throws GrokException {
   /**
    * Match to the <tt>subject</tt> the <tt>regex</tt> and save the matched element into a map
    *
-   * <p>Multiple values to the same key are flattened to one value: the sole non-null value will
-   * be captured.
-   * Should there be multiple non-null values a RuntimeException is being thrown.
+   * <p>Multiple values to the same key are flattened to one value: the sole non-null value will be
+   * captured. Should there be multiple non-null values a RuntimeException is being thrown.
    *
    * <p>This can be used in cases like: (foo (.*:message) bar|bar (.*:message) foo) where the regexp
-   * guarantees that only
-   * one value will be captured.
+   * guarantees that only one value will be captured.
    *
    * <p>See also {@link #capture} which returns multiple values of the same key as list.
    *
@@ -220,9 +210,7 @@ private String cleanString(String value) {
     char firstChar = value.charAt(0);
     char lastChar = value.charAt(value.length() - 1);
 
-    if (firstChar == lastChar
-        && (firstChar == '"' || firstChar == '\'')
-    ) {
+    if (firstChar == lastChar && (firstChar == '"' || firstChar == '\'')) {
       if (value.length() <= 2) {
         return "";
       } else {
@@ -249,5 +237,4 @@ private String cleanString(String value) {
   public Boolean isNull() {
     return this.match == null;
   }
-
 }
diff --git a/common/src/main/java/org/opensearch/sql/common/grok/exception/GrokException.java b/common/src/main/java/org/opensearch/sql/common/grok/exception/GrokException.java
index 54ca8aada3..0e9d6d2ddf 100644
--- a/common/src/main/java/org/opensearch/sql/common/grok/exception/GrokException.java
+++ b/common/src/main/java/org/opensearch/sql/common/grok/exception/GrokException.java
@@ -6,9 +6,8 @@
 package org.opensearch.sql.common.grok.exception;
 
 /**
- * Signals that an {@code Grok} exception of some sort has occurred.
- * This class is the general class of
- * exceptions produced by failed or interrupted Grok operations.
+ * Signals that an {@code Grok} exception of some sort has occurred. This class is the general class
+ * of exceptions produced by failed or interrupted Grok operations.
  *
  * @since 0.0.4
  */
@@ -16,9 +15,7 @@ public class GrokException extends RuntimeException {
 
   private static final long serialVersionUID = 1L;
 
-  /**
-   * Creates a new GrokException.
-   */
+  /** Creates a new GrokException. */
   public GrokException() {
     super();
   }
@@ -27,7 +24,7 @@ public GrokException() {
    * Constructs a new GrokException.
    *
    * @param message the reason for the exception
-   * @param cause   the underlying Throwable that caused this exception to be thrown.
+   * @param cause the underlying Throwable that caused this exception to be thrown.
    */
   public GrokException(String message, Throwable cause) {
     super(message, cause);
@@ -50,5 +47,4 @@ public GrokException(String message) {
   public GrokException(Throwable cause) {
     super(cause);
   }
-
 }
diff --git a/common/src/main/java/org/opensearch/sql/common/interceptors/AwsSigningInterceptor.java b/common/src/main/java/org/opensearch/sql/common/interceptors/AwsSigningInterceptor.java
new file mode 100644
index 0000000000..16196544b5
--- /dev/null
+++ b/common/src/main/java/org/opensearch/sql/common/interceptors/AwsSigningInterceptor.java
@@ -0,0 +1,76 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.common.interceptors;
+
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
+import com.babbel.mobile.android.commons.okhttpawssigner.OkHttpAwsV4Signer;
+import java.io.IOException;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import lombok.NonNull;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class AwsSigningInterceptor implements Interceptor {
+
+  private OkHttpAwsV4Signer okHttpAwsV4Signer;
+
+  private AWSCredentialsProvider awsCredentialsProvider;
+
+  private static final Logger LOG = LogManager.getLogger();
+
+  /**
+   * AwsSigningInterceptor which intercepts http requests and adds required headers for sigv4
+   * authentication.
+   *
+   * @param awsCredentialsProvider awsCredentialsProvider.
+   * @param region region.
+   * @param serviceName serviceName.
+   */
+  public AwsSigningInterceptor(
+      @NonNull AWSCredentialsProvider awsCredentialsProvider,
+      @NonNull String region,
+      @NonNull String serviceName) {
+    this.okHttpAwsV4Signer = new OkHttpAwsV4Signer(region, serviceName);
+    this.awsCredentialsProvider = awsCredentialsProvider;
+  }
+
+  @Override
+  public Response intercept(Interceptor.Chain chain) throws IOException {
+    Request request = chain.request();
+
+    DateTimeFormatter timestampFormat =
+        DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss'Z'").withZone(ZoneId.of("GMT"));
+
+    Request.Builder newRequestBuilder =
+        request
+            .newBuilder()
+            .addHeader("x-amz-date", timestampFormat.format(ZonedDateTime.now()))
+            .addHeader("host", request.url().host());
+
+    AWSCredentials awsCredentials = awsCredentialsProvider.getCredentials();
+    if (awsCredentialsProvider instanceof STSAssumeRoleSessionCredentialsProvider) {
+      newRequestBuilder.addHeader(
+          "x-amz-security-token",
+          ((STSAssumeRoleSessionCredentialsProvider) awsCredentialsProvider)
+              .getCredentials()
+              .getSessionToken());
+    }
+    Request newRequest = newRequestBuilder.build();
+    Request signed =
+        okHttpAwsV4Signer.sign(
+            newRequest, awsCredentials.getAWSAccessKeyId(), awsCredentials.getAWSSecretKey());
+    return chain.proceed(signed);
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/authinterceptors/BasicAuthenticationInterceptor.java b/common/src/main/java/org/opensearch/sql/common/interceptors/BasicAuthenticationInterceptor.java
similarity index 80%
rename from prometheus/src/main/java/org/opensearch/sql/prometheus/authinterceptors/BasicAuthenticationInterceptor.java
rename to common/src/main/java/org/opensearch/sql/common/interceptors/BasicAuthenticationInterceptor.java
index 6151018567..15e9a0fc12 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/authinterceptors/BasicAuthenticationInterceptor.java
+++ b/common/src/main/java/org/opensearch/sql/common/interceptors/BasicAuthenticationInterceptor.java
@@ -5,7 +5,7 @@
  *
  */
 
-package org.opensearch.sql.prometheus.authinterceptors;
+package org.opensearch.sql.common.interceptors;
 
 import java.io.IOException;
 import lombok.NonNull;
@@ -22,13 +22,11 @@ public BasicAuthenticationInterceptor(@NonNull String username, @NonNull String
     this.credentials = Credentials.basic(username, password);
   }
 
-
   @Override
   public Response intercept(Interceptor.Chain chain) throws IOException {
     Request request = chain.request();
-    Request authenticatedRequest = request.newBuilder()
-        .header("Authorization", credentials).build();
+    Request authenticatedRequest =
+        request.newBuilder().header("Authorization", credentials).build();
     return chain.proceed(authenticatedRequest);
   }
-
 }
diff --git a/common/src/main/java/org/opensearch/sql/common/interceptors/URIValidatorInterceptor.java b/common/src/main/java/org/opensearch/sql/common/interceptors/URIValidatorInterceptor.java
new file mode 100644
index 0000000000..68e7339beb
--- /dev/null
+++ b/common/src/main/java/org/opensearch/sql/common/interceptors/URIValidatorInterceptor.java
@@ -0,0 +1,43 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.common.interceptors;
+
+import java.io.IOException;
+import java.util.List;
+import lombok.NonNull;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.jetbrains.annotations.NotNull;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.common.utils.URIValidationUtils;
+
+public class URIValidatorInterceptor implements Interceptor {
+
+  private final List<String> denyHostList;
+
+  public URIValidatorInterceptor(@NonNull List<String> denyHostList) {
+    this.denyHostList = denyHostList;
+  }
+
+  @NotNull
+  @Override
+  public Response intercept(Interceptor.Chain chain) throws IOException {
+    Request request = chain.request();
+    String host = request.url().host();
+    boolean isValidHost = URIValidationUtils.validateURIHost(host, denyHostList);
+    if (isValidHost) {
+      return chain.proceed(request);
+    } else {
+      throw new IllegalArgumentException(
+          String.format(
+              "Disallowed hostname in the uri. Validate with %s config",
+              Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST.getKeyValue()));
+    }
+  }
+}
diff --git a/common/src/main/java/org/opensearch/sql/common/response/ResponseListener.java b/common/src/main/java/org/opensearch/sql/common/response/ResponseListener.java
index 3d5eadc692..bac79ddbbd 100644
--- a/common/src/main/java/org/opensearch/sql/common/response/ResponseListener.java
+++ b/common/src/main/java/org/opensearch/sql/common/response/ResponseListener.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.common.response;
 
 /**
diff --git a/common/src/main/java/org/opensearch/sql/common/setting/LegacySettings.java b/common/src/main/java/org/opensearch/sql/common/setting/LegacySettings.java
index 172a0d8023..e8dc76645a 100644
--- a/common/src/main/java/org/opensearch/sql/common/setting/LegacySettings.java
+++ b/common/src/main/java/org/opensearch/sql/common/setting/LegacySettings.java
@@ -3,42 +3,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.common.setting;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-/**
- * Legacy Open Distro Settings.
- */
+/** Legacy Open Distro Settings. */
 public abstract class LegacySettings {
   @RequiredArgsConstructor
   public enum Key {
 
-    /**
-     * Legacy SQL Settings.
-     */
+    /** Legacy SQL Settings. */
     SQL_ENABLED("opendistro.sql.enabled"),
     SQL_QUERY_SLOWLOG("opendistro.sql.query.slowlog"),
     SQL_CURSOR_KEEPALIVE("opendistro.sql.cursor.keep_alive"),
     METRICS_ROLLING_WINDOW("opendistro.sql.metrics.rollingwindow"),
     METRICS_ROLLING_INTERVAL("opendistro.sql.metrics.rollinginterval"),
 
-    /**
-     * Legacy PPL Settings.
-     */
+    /** Legacy PPL Settings. */
     PPL_ENABLED("opendistro.ppl.enabled"),
     PPL_QUERY_MEMORY_LIMIT("opendistro.ppl.query.memory_limit"),
 
-    /**
-     * Legacy Common Settings.
-     */
+    /** Legacy Common Settings. */
     QUERY_SIZE_LIMIT("opendistro.query.size_limit"),
 
-    /**
-     * Deprecated Settings.
-     */
+    /** Deprecated Settings. */
     SQL_NEW_ENGINE_ENABLED("opendistro.sql.engine.new.enabled"),
     QUERY_ANALYSIS_ENABLED("opendistro.sql.query.analysis.enabled"),
     QUERY_ANALYSIS_SEMANTIC_SUGGESTION("opendistro.sql.query.analysis.semantic.suggestion"),
@@ -47,8 +36,7 @@ public enum Key {
     SQL_CURSOR_ENABLED("opendistro.sql.cursor.enabled"),
     SQL_CURSOR_FETCH_SIZE("opendistro.sql.cursor.fetch_size");
 
-    @Getter
-    private final String keyValue;
+    @Getter private final String keyValue;
   }
 
   public abstract <T> T getSettingValue(Key key);
diff --git a/common/src/main/java/org/opensearch/sql/common/setting/Settings.java b/common/src/main/java/org/opensearch/sql/common/setting/Settings.java
index bb68296626..32babad03f 100644
--- a/common/src/main/java/org/opensearch/sql/common/setting/Settings.java
+++ b/common/src/main/java/org/opensearch/sql/common/setting/Settings.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.common.setting;
 
 import com.google.common.base.Strings;
@@ -14,36 +13,51 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-/**
- * Setting.
- */
+/** Setting. */
 public abstract class Settings {
   @RequiredArgsConstructor
   public enum Key {
 
-    /**
-     * SQL Settings.
-     */
+    /** SQL Settings. */
     SQL_ENABLED("plugins.sql.enabled"),
     SQL_SLOWLOG("plugins.sql.slowlog"),
     SQL_CURSOR_KEEP_ALIVE("plugins.sql.cursor.keep_alive"),
     SQL_DELETE_ENABLED("plugins.sql.delete.enabled"),
 
-    /**
-     * PPL Settings.
-     */
+    /** PPL Settings. */
     PPL_ENABLED("plugins.ppl.enabled"),
 
-    /**
-     * Common Settings for SQL and PPL.
-     */
+    /** Common Settings for SQL and PPL. */
     QUERY_MEMORY_LIMIT("plugins.query.memory_limit"),
     QUERY_SIZE_LIMIT("plugins.query.size_limit"),
+    ENCYRPTION_MASTER_KEY("plugins.query.datasources.encryption.masterkey"),
+    DATASOURCES_URI_HOSTS_DENY_LIST("plugins.query.datasources.uri.hosts.denylist"),
+    DATASOURCES_LIMIT("plugins.query.datasources.limit"),
+    DATASOURCES_ENABLED("plugins.query.datasources.enabled"),
+
     METRICS_ROLLING_WINDOW("plugins.query.metrics.rolling_window"),
-    METRICS_ROLLING_INTERVAL("plugins.query.metrics.rolling_interval");
+    METRICS_ROLLING_INTERVAL("plugins.query.metrics.rolling_interval"),
+    SPARK_EXECUTION_ENGINE_CONFIG("plugins.query.executionengine.spark.config"),
+    CLUSTER_NAME("cluster.name"),
+    SPARK_EXECUTION_SESSION_LIMIT("plugins.query.executionengine.spark.session.limit"),
+    SPARK_EXECUTION_REFRESH_JOB_LIMIT("plugins.query.executionengine.spark.refresh_job.limit"),
+    SESSION_INDEX_TTL("plugins.query.executionengine.spark.session.index.ttl"),
+    RESULT_INDEX_TTL("plugins.query.executionengine.spark.result.index.ttl"),
+    AUTO_INDEX_MANAGEMENT_ENABLED(
+        "plugins.query.executionengine.spark.auto_index_management.enabled"),
+    SESSION_INACTIVITY_TIMEOUT_MILLIS(
+        "plugins.query.executionengine.spark.session_inactivity_timeout_millis"),
+
+    /** Async query Settings * */
+    ASYNC_QUERY_ENABLED("plugins.query.executionengine.async_query.enabled"),
+    ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED(
+        "plugins.query.executionengine.async_query.external_scheduler.enabled"),
+    ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL(
+        "plugins.query.executionengine.async_query.external_scheduler.interval"),
+    STREAMING_JOB_HOUSEKEEPER_INTERVAL(
+        "plugins.query.executionengine.spark.streamingjobs.housekeeper.interval");
 
-    @Getter
-    private final String keyValue;
+    @Getter private final String keyValue;
 
     private static final Map<String, Key> ALL_KEYS;
 
@@ -61,9 +75,7 @@ public static Optional<Key> of(String keyValue) {
     }
   }
 
-  /**
-   * Get Setting Value.
-   */
+  /** Get Setting Value. */
   public abstract <T> T getSettingValue(Key key);
 
   public abstract List<?> getSettings();
diff --git a/common/src/main/java/org/opensearch/sql/common/utils/QueryContext.java b/common/src/main/java/org/opensearch/sql/common/utils/QueryContext.java
index ab11029d73..686263238a 100644
--- a/common/src/main/java/org/opensearch/sql/common/utils/QueryContext.java
+++ b/common/src/main/java/org/opensearch/sql/common/utils/QueryContext.java
@@ -3,35 +3,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.common.utils;
 
-import java.time.LocalDateTime;
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 import org.apache.logging.log4j.ThreadContext;
 
 /**
- * Utility class for recording and accessing context for the query being executed.
- * Implementation Details: context variables is being persisted statically in the thread context
+ * Utility class for recording and accessing context for the query being executed. Implementation
+ * Details: context variables is being persisted statically in the thread context
+ *
  * @see: @ThreadContext
  */
 public class QueryContext {
 
-  /**
-   * The key of the request id in the context map.
-   */
+  /** The key of the request id in the context map. */
   private static final String REQUEST_ID_KEY = "request_id";
 
   /**
    * Generates a random UUID and adds to the {@link ThreadContext} as the request id.
-   * <p>
-   * Note: If a request id already present, this method will overwrite it with a new
-   * one. This is to pre-vent re-using the same request id for different requests in
-   * case the same thread handles both of them. But this also means one should not
-   * call this method twice on the same thread within the lifetime of the request.
-   * </p>
+   *
+   * <p>Note: If a request id already present, this method will overwrite it with a new one. This is
+   * to pre-vent re-using the same request id for different requests in case the same thread handles
+   * both of them. But this also means one should not call this method twice on the same thread
+   * within the lifetime of the request.
    */
   public static String addRequestId() {
     var id = UUID.randomUUID().toString();
@@ -41,6 +36,7 @@ public static String addRequestId() {
 
   /**
    * Get RequestID.
+   *
    * @return the current request id from {@link ThreadContext}.
    */
   public static String getRequestId() {
@@ -52,8 +48,8 @@ public static String getRequestId() {
   }
 
   /**
-   * Wraps a given instance of {@link Runnable} into a new one which gets all the
-   * entries from current ThreadContext map.
+   * Wraps a given instance of {@link Runnable} into a new one which gets all the entries from
+   * current ThreadContext map.
    *
    * @param task the instance of Runnable to wrap
    * @return the new task
diff --git a/common/src/main/java/org/opensearch/sql/common/utils/StringUtils.java b/common/src/main/java/org/opensearch/sql/common/utils/StringUtils.java
index 0699245338..c81f56ef63 100644
--- a/common/src/main/java/org/opensearch/sql/common/utils/StringUtils.java
+++ b/common/src/main/java/org/opensearch/sql/common/utils/StringUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.common.utils;
 
 import com.google.common.base.Strings;
@@ -13,6 +12,7 @@
 public class StringUtils {
   /**
    * Unquote any string with mark specified.
+   *
    * @param text string
    * @param mark quotation mark
    * @return An unquoted string whose outer pair of (single/double/back-tick) quotes have been
@@ -26,11 +26,10 @@ public static String unquote(String text, String mark) {
   }
 
   /**
-   * Unquote Identifier which has " or ' or ` as mark.
-   * Strings quoted by ' or " with two of these quotes appearing next to each other in the quote
-   * acts as an escape
-   * Example: 'Test''s' will result in 'Test's', similar with those single quotes being replaced
-   * with double.
+   * Unquote Identifier which has " or ' or ` as mark. Strings quoted by ' or " with two of these
+   * quotes appearing next to each other in the quote acts as an escape Example: 'Test''s' will
+   * result in 'Test's', similar with those single quotes being replaced with double.
+   *
    * @param text string
    * @return An unquoted string whose outer pair of (single/double/back-tick) quotes have been
    *     removed
@@ -45,10 +44,7 @@ public static String unquoteText(String text) {
     char firstChar = text.charAt(0);
     char lastChar = text.charAt(text.length() - 1);
 
-    if (firstChar == lastChar
-        && (firstChar == '\''
-        || firstChar == '"'
-        || firstChar == '`')) {
+    if (firstChar == lastChar && (firstChar == '\'' || firstChar == '"' || firstChar == '`')) {
       enclosingQuote = firstChar;
     } else {
       return text;
@@ -67,8 +63,7 @@ public static String unquoteText(String text) {
     for (int chIndex = 1; chIndex < text.length() - 1; chIndex++) {
       currentChar = text.charAt(chIndex);
       nextChar = text.charAt(chIndex + 1);
-      if (currentChar == enclosingQuote
-          && nextChar == currentChar) {
+      if (currentChar == enclosingQuote && nextChar == currentChar) {
         chIndex++;
       }
       textSB.append(currentChar);
@@ -79,9 +74,9 @@ public static String unquoteText(String text) {
 
   /**
    * Unquote Identifier which has ` as mark.
+   *
    * @param identifier identifier that possibly enclosed by double quotes or back ticks
-   * @return An unquoted string whose outer pair of (double/back-tick) quotes have been
-   *     removed
+   * @return An unquoted string whose outer pair of (double/back-tick) quotes have been removed
    */
   public static String unquoteIdentifier(String identifier) {
     if (isQuoted(identifier, "`")) {
@@ -92,16 +87,15 @@ public static String unquoteIdentifier(String identifier) {
   }
 
   /**
-   * Returns a formatted string using the specified format string and
-   * arguments, as well as the {@link Locale#ROOT} locale.
+   * Returns a formatted string using the specified format string and arguments, as well as the
+   * {@link Locale#ROOT} locale.
    *
    * @param format format string
-   * @param args   arguments referenced by the format specifiers in the format string
+   * @param args arguments referenced by the format specifiers in the format string
    * @return A formatted string
    * @throws IllegalFormatException If a format string contains an illegal syntax, a format
-   *                                specifier that is incompatible with the given arguments,
-   *                                insufficient arguments given the format string, or other
-   *                                illegal conditions.
+   *     specifier that is incompatible with the given arguments, insufficient arguments given the
+   *     format string, or other illegal conditions.
    * @see java.lang.String#format(Locale, String, Object...)
    */
   public static String format(final String format, Object... args) {
diff --git a/common/src/main/java/org/opensearch/sql/common/utils/URIValidationUtils.java b/common/src/main/java/org/opensearch/sql/common/utils/URIValidationUtils.java
new file mode 100644
index 0000000000..c7893fc053
--- /dev/null
+++ b/common/src/main/java/org/opensearch/sql/common/utils/URIValidationUtils.java
@@ -0,0 +1,22 @@
+package org.opensearch.sql.common.utils;
+
+import inet.ipaddr.IPAddressString;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.List;
+
+/** Utility Class for URI host validation. */
+public class URIValidationUtils {
+
+  public static boolean validateURIHost(String host, List<String> denyHostList)
+      throws UnknownHostException {
+    IPAddressString ipStr = new IPAddressString(InetAddress.getByName(host).getHostAddress());
+    for (String denyHost : denyHostList) {
+      IPAddressString denyHostStr = new IPAddressString(denyHost);
+      if (denyHostStr.contains(ipStr)) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
diff --git a/common/src/test/java/org/opensearch/sql/common/grok/ApacheDataTypeTest.java b/common/src/test/java/org/opensearch/sql/common/grok/ApacheDataTypeTest.java
index 09695c8220..7eb0e964de 100644
--- a/common/src/test/java/org/opensearch/sql/common/grok/ApacheDataTypeTest.java
+++ b/common/src/test/java/org/opensearch/sql/common/grok/ApacheDataTypeTest.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.common.grok;
 
-
 import static org.junit.Assert.assertEquals;
 
 import com.google.common.io.Resources;
@@ -42,12 +41,13 @@ public void setup() throws Exception {
 
   @Test
   public void test002_httpd_access_semi() throws GrokException {
-    Grok grok = compiler.compile(
-        "%{IPORHOST:clientip} %{USER:ident;boolean} %{USER:auth} "
-            + "\\[%{HTTPDATE:timestamp;date;dd/MMM/yyyy:HH:mm:ss Z}\\] \"(?:%{WORD:verb;string} "
-            + "%{NOTSPACE:request}"
-            + "(?: HTTP/%{NUMBER:httpversion;float})?|%{DATA:rawrequest})\" %{NUMBER:response;int} "
-            + "(?:%{NUMBER:bytes;long}|-)");
+    Grok grok =
+        compiler.compile(
+            "%{IPORHOST:clientip} %{USER:ident;boolean} %{USER:auth}"
+                + " \\[%{HTTPDATE:timestamp;date;dd/MMM/yyyy:HH:mm:ss Z}\\]"
+                + " \"(?:%{WORD:verb;string} %{NOTSPACE:request}(?:"
+                + " HTTP/%{NUMBER:httpversion;float})?|%{DATA:rawrequest})\" %{NUMBER:response;int}"
+                + " (?:%{NUMBER:bytes;long}|-)");
 
     System.out.println(line);
     Match gm = grok.match(line);
@@ -61,17 +61,17 @@ public void test002_httpd_access_semi() throws GrokException {
     assertEquals(map.get("httpversion"), 1.1f);
     assertEquals(map.get("bytes"), 12846L);
     assertEquals("GET", map.get("verb"));
-
   }
 
   @Test
   public void test002_httpd_access_colon() throws GrokException {
-    Grok grok = compiler.compile(
-        "%{IPORHOST:clientip} %{USER:ident:boolean} %{USER:auth} "
-            + "\\[%{HTTPDATE:timestamp:date:dd/MMM/yyyy:HH:mm:ss Z}\\] \"(?:%{WORD:verb:string} "
-            + "%{NOTSPACE:request}"
-            + "(?: HTTP/%{NUMBER:httpversion:float})?|%{DATA:rawrequest})\" %{NUMBER:response:int} "
-            + "(?:%{NUMBER:bytes:long}|-)");
+    Grok grok =
+        compiler.compile(
+            "%{IPORHOST:clientip} %{USER:ident:boolean} %{USER:auth}"
+                + " \\[%{HTTPDATE:timestamp:date:dd/MMM/yyyy:HH:mm:ss Z}\\]"
+                + " \"(?:%{WORD:verb:string} %{NOTSPACE:request}(?:"
+                + " HTTP/%{NUMBER:httpversion:float})?|%{DATA:rawrequest})\" %{NUMBER:response:int}"
+                + " (?:%{NUMBER:bytes:long}|-)");
 
     Match gm = grok.match(line);
     Map<String, Object> map = gm.capture();
@@ -85,6 +85,5 @@ public void test002_httpd_access_colon() throws GrokException {
     assertEquals(map.get("httpversion"), 1.1f);
     assertEquals(map.get("bytes"), 12846L);
     assertEquals("GET", map.get("verb"));
-
   }
 }
diff --git a/common/src/test/java/org/opensearch/sql/common/grok/ApacheTest.java b/common/src/test/java/org/opensearch/sql/common/grok/ApacheTest.java
index 33113d1996..db420b16d3 100644
--- a/common/src/test/java/org/opensearch/sql/common/grok/ApacheTest.java
+++ b/common/src/test/java/org/opensearch/sql/common/grok/ApacheTest.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.common.grok;
 
-
 import com.google.common.io.Resources;
 import java.io.BufferedReader;
 import java.io.File;
@@ -65,5 +64,4 @@ public void test002_nasa_httpd_access() throws GrokException, IOException {
       br.close();
     }
   }
-
 }
diff --git a/common/src/test/java/org/opensearch/sql/common/grok/BasicTest.java b/common/src/test/java/org/opensearch/sql/common/grok/BasicTest.java
index f84d156cab..c724b58f3e 100644
--- a/common/src/test/java/org/opensearch/sql/common/grok/BasicTest.java
+++ b/common/src/test/java/org/opensearch/sql/common/grok/BasicTest.java
@@ -33,8 +33,7 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class BasicTest {
 
-  @Rule
-  public TemporaryFolder tempFolder = new TemporaryFolder();
+  @Rule public TemporaryFolder tempFolder = new TemporaryFolder();
 
   private GrokCompiler compiler;
 
@@ -111,24 +110,23 @@ public void test005_testLoadPatternFromFile() throws IOException, GrokException
   public void test006_testLoadPatternFromFileIso_8859_1() throws IOException, GrokException {
     File temp = tempFolder.newFile("grok-tmp-pattern");
     try (FileOutputStream fis = new FileOutputStream(temp);
-         BufferedWriter bw = new BufferedWriter(
-             new OutputStreamWriter(fis, StandardCharsets.ISO_8859_1))) {
-      bw.write("TEST §");
+        BufferedWriter bw =
+            new BufferedWriter(new OutputStreamWriter(fis, StandardCharsets.ISO_8859_1))) {
+      bw.write("TEST \\u2022");
     }
 
     GrokCompiler compiler = GrokCompiler.newInstance();
     compiler.register(new FileInputStream(temp), StandardCharsets.ISO_8859_1);
     Grok grok = compiler.compile("%{TEST}");
-    assertEquals("(?<name0>§)", grok.getNamedRegex());
+    assertEquals("(?<name0>\\u2022)", grok.getNamedRegex());
   }
 
   @Test
   public void test007_testLoadPatternFromReader() throws IOException, GrokException {
-    Reader reader = new StringReader("TEST €");
+    Reader reader = new StringReader("TEST \\u20AC");
     GrokCompiler compiler = GrokCompiler.newInstance();
     compiler.register(reader);
     Grok grok = compiler.compile("%{TEST}");
-    assertEquals("(?<name0>€)", grok.getNamedRegex());
+    assertEquals("(?<name0>\\u20AC)", grok.getNamedRegex());
   }
-
 }
diff --git a/common/src/test/java/org/opensearch/sql/common/grok/CaptureTest.java b/common/src/test/java/org/opensearch/sql/common/grok/CaptureTest.java
index 1173541e16..60e2761c83 100644
--- a/common/src/test/java/org/opensearch/sql/common/grok/CaptureTest.java
+++ b/common/src/test/java/org/opensearch/sql/common/grok/CaptureTest.java
@@ -98,7 +98,8 @@ public void test005_captureSubName() throws GrokException {
     Map<String, Object> map = match.capture();
     assertEquals(1, map.size());
     assertEquals("Hello", map.get(subname).toString());
-    assertEquals("{abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_abcdef=Hello}",
+    assertEquals(
+        "{abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_abcdef=Hello}",
         map.toString());
   }
 
@@ -145,7 +146,8 @@ public void test008_flattenDuplicateKeys() throws GrokException {
       m3.captureFlattened();
       fail("should report error due tu ambiguity");
     } catch (RuntimeException e) {
-      assertThat(e.getMessage(),
+      assertThat(
+          e.getMessage(),
           containsString("has multiple non-null values, this is not allowed in flattened mode"));
     }
   }
diff --git a/common/src/test/java/org/opensearch/sql/common/grok/GrokDocumentationTest.java b/common/src/test/java/org/opensearch/sql/common/grok/GrokDocumentationTest.java
index 22115a825f..15d450e812 100644
--- a/common/src/test/java/org/opensearch/sql/common/grok/GrokDocumentationTest.java
+++ b/common/src/test/java/org/opensearch/sql/common/grok/GrokDocumentationTest.java
@@ -40,23 +40,43 @@ public void assureCodeInReadmeWorks() {
 
     Assertions.assertThat(capture).hasSize(22);
     final boolean debug = false;
-    final Object[] keywordArray = new Object[] {"COMBINEDAPACHELOG",
-        "COMMONAPACHELOG", "clientip", "ident", "auth", "timestamp", "MONTHDAY",
-        "MONTH", "YEAR", "TIME", "HOUR", "MINUTE", "SECOND", "INT", "verb",
-        "httpversion", "rawrequest", "request", "response", "bytes", "referrer",
-        "agent"};
+    final Object[] keywordArray =
+        new Object[] {
+          "COMBINEDAPACHELOG",
+          "COMMONAPACHELOG",
+          "clientip",
+          "ident",
+          "auth",
+          "timestamp",
+          "MONTHDAY",
+          "MONTH",
+          "YEAR",
+          "TIME",
+          "HOUR",
+          "MINUTE",
+          "SECOND",
+          "INT",
+          "verb",
+          "httpversion",
+          "rawrequest",
+          "request",
+          "response",
+          "bytes",
+          "referrer",
+          "agent"
+        };
     if (debug) {
       capture.keySet().stream().forEach(System.err::println);
     }
-    assertTrue(new HashSet<Object>(Arrays.asList(keywordArray))
-        .containsAll(new HashSet<Object>(capture.keySet())));
+    assertTrue(
+        new HashSet<Object>(Arrays.asList(keywordArray))
+            .containsAll(new HashSet<Object>(capture.keySet())));
 
     Arrays.asList(keywordArray).stream()
         .forEach(o -> assertThat(capture.keySet(), hasItem((String) o)));
-    assertThat(new HashSet<Object>(capture.keySet()),
-        containsInAnyOrder(keywordArray));
-    assertTrue(new HashSet<Object>(capture.keySet())
-        .containsAll(new HashSet<Object>(Arrays.asList(keywordArray))));
-
+    assertThat(new HashSet<Object>(capture.keySet()), containsInAnyOrder(keywordArray));
+    assertTrue(
+        new HashSet<Object>(capture.keySet())
+            .containsAll(new HashSet<Object>(Arrays.asList(keywordArray))));
   }
 }
diff --git a/common/src/test/java/org/opensearch/sql/common/grok/GrokTest.java b/common/src/test/java/org/opensearch/sql/common/grok/GrokTest.java
index b5e8366807..862f9b8195 100644
--- a/common/src/test/java/org/opensearch/sql/common/grok/GrokTest.java
+++ b/common/src/test/java/org/opensearch/sql/common/grok/GrokTest.java
@@ -37,7 +37,6 @@
 import org.junit.runners.MethodSorters;
 import org.opensearch.sql.common.grok.exception.GrokException;
 
-
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class GrokTest {
 
@@ -138,7 +137,6 @@ public void test002_numbers() {
     Match gm = grok.match("-42");
     Map<String, Object> map = gm.capture();
     assertEquals("{NUMBER=-42}", map.toString());
-
   }
 
   @Test
@@ -152,7 +150,6 @@ public void test003_word() {
     gm = grok.match("abc");
     map = gm.capture();
     assertEquals("{WORD=abc}", map.toString());
-
   }
 
   @Test
@@ -162,7 +159,6 @@ public void test004_space() {
     Match gm = grok.match("abc dc");
     Map<String, Object> map = gm.capture();
     assertEquals("{SPACE=}", map.toString());
-
   }
 
   @Test
@@ -172,7 +168,6 @@ public void test004_number() {
     Match gm = grok.match("Something costs $55.4!");
     Map<String, Object> map = gm.capture();
     assertEquals("{NUMBER=55.4}", map.toString());
-
   }
 
   @Test
@@ -182,7 +177,6 @@ public void test005_notSpace() {
     Match gm = grok.match("abc dc");
     Map<String, Object> map = gm.capture();
     assertEquals("{NOTSPACE=abc}", map.toString());
-
   }
 
   @Test
@@ -209,7 +203,6 @@ public void test007_uuid() {
     gm = grok.match("03A8413C-F604-4D21-8F4D-24B19D98B5A7");
     map = gm.capture();
     assertEquals("{UUID=03A8413C-F604-4D21-8F4D-24B19D98B5A7}", map.toString());
-
   }
 
   @Test
@@ -219,7 +212,6 @@ public void test008_mac() {
     Match gm = grok.match("5E:FF:56:A2:AF:15");
     Map<String, Object> map = gm.capture();
     assertEquals("{MAC=5E:FF:56:A2:AF:15}", map.toString());
-
   }
 
   @Test
@@ -241,10 +233,12 @@ public void test010_hostPort() {
 
     Match gm = grok.match("www.google.fr:80");
     Map<String, Object> map = gm.capture();
-    assertEquals(ImmutableMap.of(
-        "HOSTPORT", "www.google.fr:80",
-        "IPORHOST", "www.google.fr",
-        "PORT", "80"), map);
+    assertEquals(
+        ImmutableMap.of(
+            "HOSTPORT", "www.google.fr:80",
+            "IPORHOST", "www.google.fr",
+            "PORT", "80"),
+        map);
   }
 
   @Test
@@ -267,10 +261,11 @@ public void test011_combineApache() {
     assertEquals(map.get("TIME").toString(), "01:36:30");
 
     gm =
-        grok.match("112.169.19.192 - - [06/Mar/2013:01:36:30 +0900] \"GET "
-            + "/wp-content/plugins/easy-table/themes/default/style.css?ver=1.0 HTTP/1.1\" "
-            + "304 - \"http://www.nflabs.com/\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) "
-            + "AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.152 Safari/537.22\"");
+        grok.match(
+            "112.169.19.192 - - [06/Mar/2013:01:36:30 +0900] \"GET"
+                + " /wp-content/plugins/easy-table/themes/default/style.css?ver=1.0 HTTP/1.1\" 304"
+                + " - \"http://www.nflabs.com/\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2)"
+                + " AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.152 Safari/537.22\"");
     map = gm.capture();
     assertEquals(
         map.get("agent").toString(),
@@ -278,7 +273,8 @@ public void test011_combineApache() {
             + "Chrome/25.0.1364.152 Safari/537.22");
     assertEquals(map.get("clientip").toString(), "112.169.19.192");
     assertEquals(map.get("httpversion").toString(), "1.1");
-    assertEquals(map.get("request").toString(),
+    assertEquals(
+        map.get("request").toString(),
         "/wp-content/plugins/easy-table/themes/default/style.css?ver=1.0");
     assertEquals(map.get("TIME").toString(), "01:36:30");
   }
@@ -319,7 +315,7 @@ public void test013_IpSet() throws Throwable {
     Grok grok = compiler.compile("%{IP}");
 
     try (FileReader fr = new FileReader(Resources.getResource(ResourceManager.IP).getFile());
-         BufferedReader br = new BufferedReader(fr)) {
+        BufferedReader br = new BufferedReader(fr)) {
       String line;
       System.out.println("Starting test with ip");
       while ((line = br.readLine()) != null) {
@@ -336,10 +332,31 @@ public void test014_month() {
 
     Grok grok = compiler.compile("%{MONTH}");
 
-    String[] months =
-        {"Jan", "January", "Feb", "February", "Mar", "March", "Apr", "April", "May", "Jun", "June",
-            "Jul", "July", "Aug", "August", "Sep", "September", "Oct", "October", "Nov",
-            "November", "Dec", "December"};
+    String[] months = {
+      "Jan",
+      "January",
+      "Feb",
+      "February",
+      "Mar",
+      "March",
+      "Apr",
+      "April",
+      "May",
+      "Jun",
+      "June",
+      "Jul",
+      "July",
+      "Aug",
+      "August",
+      "Sep",
+      "September",
+      "Oct",
+      "October",
+      "Nov",
+      "November",
+      "Dec",
+      "December"
+    };
     int counter = 0;
     for (String month : months) {
       Match match = grok.match(month);
@@ -355,20 +372,21 @@ public void test015_iso8601() throws GrokException {
     Grok grok = compiler.compile("%{TIMESTAMP_ISO8601}");
 
     String[] times = {
-        "2001-01-01T00:00:00",
-        "1974-03-02T04:09:09",
-        "2010-05-03T08:18:18+00:00",
-        "2004-07-04T12:27:27-00:00",
-        "2001-09-05T16:36:36+0000",
-        "2001-11-06T20:45:45-0000",
-        "2001-12-07T23:54:54Z",
-        "2001-01-01T00:00:00.123456",
-        "1974-03-02T04:09:09.123456",
-        "2010-05-03T08:18:18.123456+00:00",
-        "2004-07-04T12:27:27.123456-00:00",
-        "2001-09-05T16:36:36.123456+0000",
-        "2001-11-06T20:45:45.123456-0000",
-        "2001-12-07T23:54:54.123456Z"};
+      "2001-01-01T00:00:00",
+      "1974-03-02T04:09:09",
+      "2010-05-03T08:18:18+00:00",
+      "2004-07-04T12:27:27-00:00",
+      "2001-09-05T16:36:36+0000",
+      "2001-11-06T20:45:45-0000",
+      "2001-12-07T23:54:54Z",
+      "2001-01-01T00:00:00.123456",
+      "1974-03-02T04:09:09.123456",
+      "2010-05-03T08:18:18.123456+00:00",
+      "2004-07-04T12:27:27.123456-00:00",
+      "2001-09-05T16:36:36.123456+0000",
+      "2001-11-06T20:45:45.123456-0000",
+      "2001-12-07T23:54:54.123456Z"
+    };
 
     int counter = 0;
     for (String time : times) {
@@ -385,33 +403,34 @@ public void test016_uri() throws GrokException {
     Grok grok = compiler.compile("%{URI}");
 
     String[] uris = {
-        "http://www.google.com",
-        "telnet://helloworld",
-        "http://www.example.com/",
-        "http://www.example.com/test.html",
-        "http://www.example.com/test.html?foo=bar",
-        "http://www.example.com/test.html?foo=bar&fizzle=baz",
-        "http://www.example.com:80/test.html?foo=bar&fizzle=baz",
-        "https://www.example.com:443/test.html?foo=bar&fizzle=baz",
-        "https://user@www.example.com:443/test.html?foo=bar&fizzle=baz",
-        "https://user:pass@somehost/fetch.pl",
-        "puppet:///",
-        "http://www.foo.com",
-        "http://www.foo.com/",
-        "http://www.foo.com/?testing",
-        "http://www.foo.com/?one=two",
-        "http://www.foo.com/?one=two&foo=bar",
-        "foo://somehost.com:12345",
-        "foo://user@somehost.com:12345",
-        "foo://user@somehost.com:12345/",
-        "foo://user@somehost.com:12345/foo.bar/baz/fizz",
-        "foo://user@somehost.com:12345/foo.bar/baz/fizz?test",
-        "foo://user@somehost.com:12345/foo.bar/baz/fizz?test=1&sink&foo=4",
-        "http://www.google.com/search?hl=en&source=hp&q=hello+world+%5E%40%23%24&btnG=Google+Search",
-        "http://www.freebsd.org/cgi/url.cgi?ports/sysutils/grok/pkg-descr",
-        "http://www.google.com/search?q=CAPTCHA+ssh&start=0&ie=utf-8&oe=utf-8&client=firefox-a"
-            + "&rls=org.mozilla:en-US:official",
-        "svn+ssh://somehost:12345/testing"};
+      "http://www.google.com",
+      "telnet://helloworld",
+      "http://www.example.com/",
+      "http://www.example.com/test.html",
+      "http://www.example.com/test.html?foo=bar",
+      "http://www.example.com/test.html?foo=bar&fizzle=baz",
+      "http://www.example.com:80/test.html?foo=bar&fizzle=baz",
+      "https://www.example.com:443/test.html?foo=bar&fizzle=baz",
+      "https://user@www.example.com:443/test.html?foo=bar&fizzle=baz",
+      "https://user:pass@somehost/fetch.pl",
+      "puppet:///",
+      "http://www.foo.com",
+      "http://www.foo.com/",
+      "http://www.foo.com/?testing",
+      "http://www.foo.com/?one=two",
+      "http://www.foo.com/?one=two&foo=bar",
+      "foo://somehost.com:12345",
+      "foo://user@somehost.com:12345",
+      "foo://user@somehost.com:12345/",
+      "foo://user@somehost.com:12345/foo.bar/baz/fizz",
+      "foo://user@somehost.com:12345/foo.bar/baz/fizz?test",
+      "foo://user@somehost.com:12345/foo.bar/baz/fizz?test=1&sink&foo=4",
+      "http://www.google.com/search?hl=en&source=hp&q=hello+world+%5E%40%23%24&btnG=Google+Search",
+      "http://www.freebsd.org/cgi/url.cgi?ports/sysutils/grok/pkg-descr",
+      "http://www.google.com/search?q=CAPTCHA+ssh&start=0&ie=utf-8&oe=utf-8&client=firefox-a"
+          + "&rls=org.mozilla:en-US:official",
+      "svn+ssh://somehost:12345/testing"
+    };
 
     int counter = 0;
     for (String uri : uris) {
@@ -429,10 +448,7 @@ public void test017_nonMachingList() throws GrokException {
     Grok grok = compiler.compile("%{URI}");
 
     String[] uris = {
-        "http://www.google.com",
-        "telnet://helloworld",
-        "",
-        "svn+ssh://somehost:12345/testing"
+      "http://www.google.com", "telnet://helloworld", "", "svn+ssh://somehost:12345/testing"
     };
 
     int counter = 0;
@@ -458,9 +474,7 @@ public void test018_namedOnlySimpleCase() throws GrokException {
     String text = "<< barfoobarfoo >>";
     Match match = grok.match(text);
     Map<String, Object> map = match.capture();
-    assertEquals("unable to parse: " + text,
-        text,
-        map.get("text"));
+    assertEquals("unable to parse: " + text, text, map.get("text"));
   }
 
   @Test
@@ -488,9 +502,7 @@ private void testPatternRepetitions(boolean namedOnly, String pattern) throws Gr
   private void assertMatches(String description, Grok grok, String text) {
     Match match = grok.match(text);
     Map<String, Object> map = match.capture();
-    assertEquals(format("%s: unable to parse '%s'", description, text),
-        text,
-        map.get("text"));
+    assertEquals(format("%s: unable to parse '%s'", description, text), text, map.get("text"));
   }
 
   @Test
@@ -630,8 +642,8 @@ public void createGrokWithDefaultPatterns() throws GrokException {
     compiler.compile("%{USERNAME}", false);
   }
 
-  private void ensureAbortsWithDefinitionMissing(String pattern, String compilePattern,
-                                                 boolean namedOnly) {
+  private void ensureAbortsWithDefinitionMissing(
+      String pattern, String compilePattern, boolean namedOnly) {
     try {
       compiler.compile(pattern);
       compiler.compile(compilePattern, namedOnly);
@@ -643,10 +655,11 @@ private void ensureAbortsWithDefinitionMissing(String pattern, String compilePat
 
   @Test
   public void testGroupTypes() {
-    Grok grok = compiler.compile(
-        "%{HTTPDATE:timestamp;date;dd/MMM/yyyy:HH:mm:ss Z} %{USERNAME:username:text} "
-            + "%{IPORHOST:host}:%{POSINT:port:integer}",
-        true);
+    Grok grok =
+        compiler.compile(
+            "%{HTTPDATE:timestamp;date;dd/MMM/yyyy:HH:mm:ss Z} %{USERNAME:username:text} "
+                + "%{IPORHOST:host}:%{POSINT:port:integer}",
+            true);
     assertEquals(Converter.Type.DATETIME, grok.groupTypes.get("timestamp"));
     assertEquals(Converter.Type.STRING, grok.groupTypes.get("username"));
     assertEquals(Converter.Type.INT, grok.groupTypes.get("port"));
@@ -667,8 +680,8 @@ public void testTimeZone() {
     DateTimeFormatter dtf = DateTimeFormatter.ofPattern("MM/dd/yyyy HH:mm:ss");
     Grok grok = compiler.compile("%{DATESTAMP:timestamp;date;MM/dd/yyyy HH:mm:ss}", true);
     Instant instant = (Instant) grok.match(date).capture().get("timestamp");
-    assertEquals(ZonedDateTime.parse(date, dtf.withZone(ZoneOffset.systemDefault())).toInstant(),
-        instant);
+    assertEquals(
+        ZonedDateTime.parse(date, dtf.withZone(ZoneOffset.systemDefault())).toInstant(), instant);
 
     // set default timezone to PST
     ZoneId pst = ZoneId.of("PST", ZoneId.SHORT_IDS);
diff --git a/common/src/test/java/org/opensearch/sql/common/grok/MessagesTest.java b/common/src/test/java/org/opensearch/sql/common/grok/MessagesTest.java
index 98cbb3aaeb..930da8caa8 100644
--- a/common/src/test/java/org/opensearch/sql/common/grok/MessagesTest.java
+++ b/common/src/test/java/org/opensearch/sql/common/grok/MessagesTest.java
@@ -16,7 +16,6 @@
 import org.junit.Test;
 import org.opensearch.sql.common.grok.exception.GrokException;
 
-
 public class MessagesTest {
 
   @Test
@@ -26,8 +25,9 @@ public void test001_linux_messages() throws GrokException, IOException {
 
     Grok grok = compiler.compile("%{MESSAGESLOG}");
 
-    BufferedReader br = new BufferedReader(
-        new FileReader(Resources.getResource(ResourceManager.MESSAGES).getFile()));
+    BufferedReader br =
+        new BufferedReader(
+            new FileReader(Resources.getResource(ResourceManager.MESSAGES).getFile()));
     String line;
     System.out.println("Starting test with linux messages log -- may take a while");
     while ((line = br.readLine()) != null) {
@@ -38,5 +38,4 @@ public void test001_linux_messages() throws GrokException, IOException {
     }
     br.close();
   }
-
 }
diff --git a/common/src/test/java/org/opensearch/sql/common/grok/ResourceManager.java b/common/src/test/java/org/opensearch/sql/common/grok/ResourceManager.java
index a13a72cd00..fba64b59d3 100644
--- a/common/src/test/java/org/opensearch/sql/common/grok/ResourceManager.java
+++ b/common/src/test/java/org/opensearch/sql/common/grok/ResourceManager.java
@@ -5,9 +5,7 @@
 
 package org.opensearch.sql.common.grok;
 
-/**
- * {@code ResourceManager} .
- */
+/** {@code ResourceManager} . */
 public final class ResourceManager {
 
   public static final String PATTERNS = "patterns/patterns";
diff --git a/common/src/test/java/org/opensearch/sql/common/interceptors/AwsSigningInterceptorTest.java b/common/src/test/java/org/opensearch/sql/common/interceptors/AwsSigningInterceptorTest.java
new file mode 100644
index 0000000000..6c5d1bac89
--- /dev/null
+++ b/common/src/test/java/org/opensearch/sql/common/interceptors/AwsSigningInterceptorTest.java
@@ -0,0 +1,109 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.common.interceptors;
+
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.AWSSessionCredentials;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
+import lombok.SneakyThrows;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class AwsSigningInterceptorTest {
+
+  @Mock private Interceptor.Chain chain;
+
+  @Captor ArgumentCaptor<Request> requestArgumentCaptor;
+
+  @Mock private STSAssumeRoleSessionCredentialsProvider stsAssumeRoleSessionCredentialsProvider;
+
+  @Test
+  void testConstructors() {
+    Assertions.assertThrows(
+        NullPointerException.class, () -> new AwsSigningInterceptor(null, "us-east-1", "aps"));
+    Assertions.assertThrows(
+        NullPointerException.class,
+        () ->
+            new AwsSigningInterceptor(
+                getStaticAWSCredentialsProvider("accessKey", "secretKey"), null, "aps"));
+    Assertions.assertThrows(
+        NullPointerException.class,
+        () ->
+            new AwsSigningInterceptor(
+                getStaticAWSCredentialsProvider("accessKey", "secretKey"), "us-east-1", null));
+  }
+
+  @Test
+  @SneakyThrows
+  void testIntercept() {
+    Mockito.when(chain.request())
+        .thenReturn(new Request.Builder().url("http://localhost:9090").build());
+    AwsSigningInterceptor awsSigningInterceptor =
+        new AwsSigningInterceptor(
+            getStaticAWSCredentialsProvider("testAccessKey", "testSecretKey"), "us-east-1", "aps");
+    awsSigningInterceptor.intercept(chain);
+    Mockito.verify(chain).proceed(requestArgumentCaptor.capture());
+    Request request = requestArgumentCaptor.getValue();
+    Assertions.assertNotNull(request.headers("Authorization"));
+    Assertions.assertNotNull(request.headers("x-amz-date"));
+    Assertions.assertNotNull(request.headers("host"));
+  }
+
+  @Test
+  @SneakyThrows
+  void testSTSCredentialsProviderInterceptor() {
+    Mockito.when(chain.request())
+        .thenReturn(new Request.Builder().url("http://localhost:9090").build());
+    Mockito.when(stsAssumeRoleSessionCredentialsProvider.getCredentials())
+        .thenReturn(getAWSSessionCredentials());
+    AwsSigningInterceptor awsSigningInterceptor =
+        new AwsSigningInterceptor(stsAssumeRoleSessionCredentialsProvider, "us-east-1", "aps");
+    awsSigningInterceptor.intercept(chain);
+    Mockito.verify(chain).proceed(requestArgumentCaptor.capture());
+    Request request = requestArgumentCaptor.getValue();
+    Assertions.assertNotNull(request.headers("Authorization"));
+    Assertions.assertNotNull(request.headers("x-amz-date"));
+    Assertions.assertNotNull(request.headers("host"));
+    Assertions.assertEquals("session_token", request.headers("x-amz-security-token").get(0));
+  }
+
+  private AWSCredentialsProvider getStaticAWSCredentialsProvider(
+      String accessKey, String secretKey) {
+    return new AWSStaticCredentialsProvider(new BasicAWSCredentials(accessKey, secretKey));
+  }
+
+  private AWSSessionCredentials getAWSSessionCredentials() {
+    return new AWSSessionCredentials() {
+      @Override
+      public String getSessionToken() {
+        return "session_token";
+      }
+
+      @Override
+      public String getAWSAccessKeyId() {
+        return "access_key";
+      }
+
+      @Override
+      public String getAWSSecretKey() {
+        return "secret_key";
+      }
+    };
+  }
+}
diff --git a/common/src/test/java/org/opensearch/sql/common/interceptors/BasicAuthenticationInterceptorTest.java b/common/src/test/java/org/opensearch/sql/common/interceptors/BasicAuthenticationInterceptorTest.java
new file mode 100644
index 0000000000..af93060fab
--- /dev/null
+++ b/common/src/test/java/org/opensearch/sql/common/interceptors/BasicAuthenticationInterceptorTest.java
@@ -0,0 +1,53 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.common.interceptors;
+
+import java.util.Collections;
+import lombok.SneakyThrows;
+import okhttp3.Credentials;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class BasicAuthenticationInterceptorTest {
+
+  @Mock private Interceptor.Chain chain;
+
+  @Captor ArgumentCaptor<Request> requestArgumentCaptor;
+
+  @Test
+  void testConstructors() {
+    Assertions.assertThrows(
+        NullPointerException.class, () -> new BasicAuthenticationInterceptor(null, "test"));
+    Assertions.assertThrows(
+        NullPointerException.class, () -> new BasicAuthenticationInterceptor("testAdmin", null));
+  }
+
+  @Test
+  @SneakyThrows
+  void testIntercept() {
+    Mockito.when(chain.request())
+        .thenReturn(new Request.Builder().url("http://localhost:9090").build());
+    BasicAuthenticationInterceptor basicAuthenticationInterceptor =
+        new BasicAuthenticationInterceptor("testAdmin", "testPassword");
+    basicAuthenticationInterceptor.intercept(chain);
+    Mockito.verify(chain).proceed(requestArgumentCaptor.capture());
+    Request request = requestArgumentCaptor.getValue();
+    Assertions.assertEquals(
+        Collections.singletonList(Credentials.basic("testAdmin", "testPassword")),
+        request.headers("Authorization"));
+  }
+}
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
deleted file mode 100644
index 3d0e8f074d..0000000000
--- a/config/checkstyle/checkstyle.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<module name="Checker">
-  <property name="charset" value="UTF-8" />
-
-  <module name="SuppressionFilter">
-    <property name="file" value="${config_loc}/../../config/checkstyle/suppressions.xml" />
-  </module>
-
-  <!-- Checks Java files and forbids empty Javadoc comments -->
-  <module name="RegexpMultiline">
-    <property name="id" value="EmptyJavadoc"/>
-    <property name="format" value="\/\*[\s\*]*\*\/"/>
-    <property name="fileExtensions" value="java"/>
-    <property name="message" value="Empty javadoc comments are forbidden"/>
-  </module>
-
-  <!-- 
-    We include snippets that are wrapped in `// tag` and `// end` into the
-    docs, stripping the leading spaces. If the context is wider than 76
-    characters then it'll need to scroll. This fails the build if it sees
-    such snippets.
-  -->
-  <module name="RegexpMultiline">
-    <property name="id" value="SnippetLength"/>
-    <property name="format" value="^( *)\/\/\s*tag(.+)\s*\n(.*\n)*\1.{77,}\n(.*\n)*\1\/\/\s*end\2\s*$"/>
-    <property name="fileExtensions" value="java"/>
-    <property name="message" value="Code snippets longer than 76 characters get cut off when rendered in the docs"/>
-  </module>
-
-  <!-- Checks that no tab characters are used in source files -->
-  <module name="FileTabCharacter">
-    <property name="eachLine" value="true"/>
-  </module>
-
-  <module name="TreeWalker">
-    <module name="LineLength">
-      <property name="max" value="120"/>
-      <property name="ignorePattern" value="^ *\* *https?://[^ ]+$|^ ?\* +\+\-+|^ ?\* +\||^ ?\* ?\-+"/>
-    </module>
-
-    <module name="EmptyLineSeparator">
-      <property name="allowNoEmptyLineBetweenFields" value="true"/>
-    </module>
-
-    <module name="AvoidStarImport" />
-
-    <!-- Unused imports are forbidden -->
-    <module name="UnusedImports" />
-
-    <!-- Non-inner classes must be in files that match their names. -->
-    <module name="OuterTypeFilename" />
-    <!-- No line wraps inside of import and package statements. -->
-    <module name="NoLineWrap" />
-    <!-- only one statement per line should be allowed -->
-    <module name="OneStatementPerLine"/>
-    <!-- Each java file has only one outer class -->
-    <module name="OneTopLevelClass" />
-    <!-- The suffix L is preferred, because the letter l (ell) is often
-    hard to distinguish from the digit 1 (one). -->
-    <module name="UpperEll"/>
-
-    <module name="EqualsHashCode" />
-
-    <module name="MethodParamPad"/>
-
-    <module name="ParenPad"/>
-
-    <module name="SingleSpaceSeparator">
-      <property name="validateComments" value="false"/>
-    </module>
-
-    <module name="WhitespaceAfter"/>
-    <module name="NoWhitespaceBefore">
-      <property name="tokens"
-                value="COMMA, DOT, SEMI, ELLIPSIS, POST_INC, POST_DEC, METHOD_REF"/>
-      <property name="allowLineBreaks" value="true"/>
-    </module>
-
-    <module name="OperatorWrap">
-      <property name="option" value="NL"/>
-      <property name="tokens"
-                value="BAND, BOR, BSR, BXOR, LOR, LAND, DIV, EQUAL, GE, GT, LT, LE,
-                    MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF, LITERAL_INSTANCEOF "/>
-    </module>
-
-    <module name="LeftCurly"/>
-    <module name="RightCurly"/>
-    <module name="NeedBraces"/>
-    <!-- Checks that the order of modifiers conforms to the suggestions in the
-    Java Language specification, sections 8.1.1, 8.3.1 and 8.4.3. It is not that
-    the standard is perfect, but having a consistent order makes the code more
-    readable and no other order is compellingly better than the standard.
-    The correct order is:
-            public
-            protected
-            private
-            abstract
-            static
-            final
-            transient
-            volatile
-            synchronized
-            native
-            strictfp
-    -->
-    <module name="ModifierOrder" />
-
-    <!-- Checks that we don't include modifier where they are implied. For
-      example, this does not allow interface methods to be declared public
-      because they are *always* public. -->
-    <module name="RedundantModifier" />
-    <!-- Checks that all java files have a package declaration and that it
-      lines up with the directory structure. -->
-    <module name="PackageDeclaration" />
-  </module>
-</module>
diff --git a/config/checkstyle/google_checks.xml b/config/checkstyle/google_checks.xml
deleted file mode 100644
index a0c7d90fd9..0000000000
--- a/config/checkstyle/google_checks.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!--
-    Checkstyle configuration that checks the Google coding conventions from Google Java Style
-    that can be found at https://google.github.io/styleguide/javaguide.html.
-    Checkstyle is very configurable. Be sure to read the documentation at
-    http://checkstyle.sf.net (or in your downloaded distribution).
-    To completely disable a check, just comment it out or delete it from the file.
-    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
- -->
-
-<module name = "Checker">
-  <property name="charset" value="UTF-8"/>
-
-  <property name="severity" value="error"/>
-
-  <property name="fileExtensions" value="java, properties, xml"/>
-  <!-- Excludes all 'module-info.java' files              -->
-  <!-- See https://checkstyle.org/config_filefilters.html -->
-  <module name="BeforeExecutionExclusionFileFilter">
-    <property name="fileNamePattern" value="module\-info\.java$"/>
-  </module>
-  <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
-  <module name="SuppressionFilter">
-    <property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
-              default="checkstyle-suppressions.xml" />
-    <property name="optional" value="true"/>
-  </module>
-  <!-- Checks for whitespace                               -->
-  <!-- See http://checkstyle.org/config_whitespace.html -->
-  <module name="FileTabCharacter">
-    <property name="eachLine" value="true"/>
-  </module>
-
-  <module name="LineLength">
-    <property name="max" value="100"/>
-    <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-  </module>
-
-  <module name="TreeWalker">
-    <module name="OuterTypeFilename"/>
-    <module name="IllegalTokenText">
-      <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-      <property name="format"
-                value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-      <property name="message"
-                value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
-    </module>
-    <module name="AvoidEscapedUnicodeCharacters">
-      <property name="allowEscapesForControlCharacters" value="true"/>
-      <property name="allowByTailComment" value="true"/>
-      <property name="allowNonPrintableEscapes" value="true"/>
-    </module>
-    <module name="AvoidStarImport"/>
-    <module name="OneTopLevelClass"/>
-    <module name="NoLineWrap">
-      <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
-    </module>
-    <module name="EmptyBlock">
-      <property name="option" value="TEXT"/>
-      <property name="tokens"
-                value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
-    </module>
-    <module name="NeedBraces">
-      <property name="tokens"
-                value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
-    </module>
-    <module name="LeftCurly">
-      <property name="tokens"
-                value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF,
-                    INTERFACE_DEF, LAMBDA, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT,
-                    LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
-                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF,
-                    OBJBLOCK, STATIC_INIT"/>
-    </module>
-    <module name="RightCurly">
-      <property name="id" value="RightCurlySame"/>
-      <property name="tokens"
-                value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
-                    LITERAL_DO"/>
-    </module>
-    <module name="RightCurly">
-      <property name="id" value="RightCurlyAlone"/>
-      <property name="option" value="alone"/>
-      <property name="tokens"
-                value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
-                    INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"/>
-    </module>
-    <module name="WhitespaceAround">
-      <property name="allowEmptyConstructors" value="true"/>
-      <property name="allowEmptyLambdas" value="true"/>
-      <property name="allowEmptyMethods" value="true"/>
-      <property name="allowEmptyTypes" value="true"/>
-      <property name="allowEmptyLoops" value="true"/>
-      <property name="tokens"
-                value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR,
-                    BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND,
-                    LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
-                    LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED,
-                     LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN,
-                     NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
-                     SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
-      <message key="ws.notFollowed"
-               value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-      <message key="ws.notPreceded"
-               value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-    </module>
-    <module name="OneStatementPerLine"/>
-    <module name="MultipleVariableDeclarations"/>
-    <module name="ArrayTypeStyle"/>
-    <module name="MissingSwitchDefault"/>
-    <module name="FallThrough"/>
-    <module name="UpperEll"/>
-    <module name="ModifierOrder"/>
-    <module name="EmptyLineSeparator">
-      <property name="tokens"
-                value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
-                    STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-      <property name="allowNoEmptyLineBetweenFields" value="true"/>
-    </module>
-    <module name="SeparatorWrap">
-      <property name="id" value="SeparatorWrapDot"/>
-      <property name="tokens" value="DOT"/>
-      <property name="option" value="nl"/>
-    </module>
-    <module name="SeparatorWrap">
-      <property name="id" value="SeparatorWrapComma"/>
-      <property name="tokens" value="COMMA"/>
-      <property name="option" value="EOL"/>
-    </module>
-    <module name="SeparatorWrap">
-      <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
-      <property name="id" value="SeparatorWrapEllipsis"/>
-      <property name="tokens" value="ELLIPSIS"/>
-      <property name="option" value="EOL"/>
-    </module>
-    <module name="SeparatorWrap">
-      <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
-      <property name="id" value="SeparatorWrapArrayDeclarator"/>
-      <property name="tokens" value="ARRAY_DECLARATOR"/>
-      <property name="option" value="EOL"/>
-    </module>
-    <module name="SeparatorWrap">
-      <property name="id" value="SeparatorWrapMethodRef"/>
-      <property name="tokens" value="METHOD_REF"/>
-      <property name="option" value="nl"/>
-    </module>
-    <module name="PackageName">
-      <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-      <message key="name.invalidPattern"
-               value="Package name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="TypeName">
-      <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF"/>
-      <message key="name.invalidPattern"
-               value="Type name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="MemberName">
-      <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-      <message key="name.invalidPattern"
-               value="Member name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="ParameterName">
-      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-      <message key="name.invalidPattern"
-               value="Parameter name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="LambdaParameterName">
-      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-      <message key="name.invalidPattern"
-               value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="CatchParameterName">
-      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-      <message key="name.invalidPattern"
-               value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="LocalVariableName">
-      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-      <message key="name.invalidPattern"
-               value="Local variable name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="ClassTypeParameterName">
-      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-      <message key="name.invalidPattern"
-               value="Class type name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="MethodTypeParameterName">
-      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-      <message key="name.invalidPattern"
-               value="Method type name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="InterfaceTypeParameterName">
-      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-      <message key="name.invalidPattern"
-               value="Interface type name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="NoFinalizer"/>
-    <module name="GenericWhitespace">
-      <message key="ws.followed"
-               value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-      <message key="ws.preceded"
-               value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-      <message key="ws.illegalFollow"
-               value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-      <message key="ws.notPreceded"
-               value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
-    </module>
-    <module name="Indentation">
-      <property name="basicOffset" value="2"/>
-      <property name="braceAdjustment" value="0"/>
-      <property name="caseIndent" value="2"/>
-      <property name="throwsIndent" value="4"/>
-      <property name="lineWrappingIndentation" value="4"/>
-      <property name="arrayInitIndent" value="2"/>
-    </module>
-    <module name="AbbreviationAsWordInName">
-      <property name="ignoreFinal" value="false"/>
-      <property name="allowedAbbreviationLength" value="9"/>
-      <property name="tokens"
-                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
-                    PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF"/>
-    </module>
-    <module name="OverloadMethodsDeclarationOrder"/>
-    <module name="VariableDeclarationUsageDistance"/>
-    <module name="CustomImportOrder">
-      <property name="sortImportsInGroupAlphabetically" value="true"/>
-      <property name="separateLineBetweenGroups" value="true"/>
-      <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
-      <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
-    </module>
-    <module name="MethodParamPad">
-      <property name="tokens"
-                value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
-                    SUPER_CTOR_CALL, ENUM_CONSTANT_DEF"/>
-    </module>
-    <module name="NoWhitespaceBefore">
-      <property name="tokens"
-                value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
-      <property name="allowLineBreaks" value="true"/>
-    </module>
-    <module name="ParenPad">
-      <property name="tokens"
-                value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF,
-                    EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW,
-                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL,
-                    METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA"/>
-    </module>
-    <module name="OperatorWrap">
-      <property name="option" value="NL"/>
-      <property name="tokens"
-                value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
-                    LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
-    </module>
-    <module name="AnnotationLocation">
-      <property name="id" value="AnnotationLocationMostCases"/>
-      <property name="tokens"
-                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
-    </module>
-    <module name="AnnotationLocation">
-      <property name="id" value="AnnotationLocationVariables"/>
-      <property name="tokens" value="VARIABLE_DEF"/>
-      <property name="allowSamelineMultipleAnnotations" value="true"/>
-    </module>
-    <module name="NonEmptyAtclauseDescription"/>
-    <module name="InvalidJavadocPosition"/>
-    <module name="JavadocTagContinuationIndentation"/>
-    <module name="SummaryJavadoc">
-      <property name="forbiddenSummaryFragments"
-                value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-    </module>
-    <module name="JavadocParagraph"/>
-    <module name="AtclauseOrder">
-      <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
-      <property name="target"
-                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-    </module>
-    <module name="JavadocMethod">
-      <property name="accessModifiers" value="public"/>
-      <property name="allowMissingParamTags" value="true"/>
-      <property name="allowMissingReturnTag" value="true"/>
-      <property name="allowedAnnotations" value="Override, Test"/>
-      <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
-    </module>
-    <module name="MissingJavadocMethod">
-      <property name="scope" value="public"/>
-      <property name="minLineCount" value="2"/>
-      <property name="allowedAnnotations" value="Override, Test"/>
-      <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
-    </module>
-    <module name="MethodName">
-      <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
-      <message key="name.invalidPattern"
-               value="Method name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="SingleLineJavadoc">
-      <property name="ignoreInlineTags" value="false"/>
-    </module>
-    <module name="EmptyCatchBlock">
-      <property name="exceptionVariableName" value="expected"/>
-    </module>
-    <module name="CommentsIndentation">
-      <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
-    </module>
-    <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
-    <module name="SuppressionXpathFilter">
-      <property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
-                default="checkstyle-xpath-suppressions.xml" />
-      <property name="optional" value="true"/>
-    </module>
-  </module>
-</module>
\ No newline at end of file
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
deleted file mode 100644
index ff366c9457..0000000000
--- a/config/checkstyle/suppressions.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE suppressions PUBLIC
-        "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
-        "https://checkstyle.org/dtds/suppressions_1_2.dtd">
-
-<suppressions>
-
-    <suppress files="org[\\/]opensearch[\\/]sql[\\/]legacy" checks=".*"/>
-    <suppress files="org[\\/]opensearch[\\/]sql[\\/]ppl[\\/]antlr[\\/]parser" checks=".*"/>
-    <suppress files="org[\\/]opensearch[\\/]sql[\\/]sql[\\/]antlr[\\/]parser" checks=".*"/>
-
-</suppressions>
\ No newline at end of file
diff --git a/core/build.gradle b/core/build.gradle
index fe7126fed5..edd16093b4 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -27,6 +27,7 @@ plugins {
     id "io.freefair.lombok"
     id 'jacoco'
     id 'java-test-fixtures'
+    id 'com.diffplug.spotless' version '6.22.0'
 }
 
 repositories {
@@ -34,36 +35,36 @@ repositories {
 }
 
 dependencies {
-    api group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
-    api group: 'org.springframework', name: 'spring-context', version: "${spring_version}"
-    api group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
-    api group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
+    api group: 'com.google.guava', name: 'guava', version: "${guava_version}"
+    api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    api group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
     api group: 'com.facebook.presto', name: 'presto-matching', version: '0.240'
     api group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
-    api "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
-    api "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
-    api "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}"
+    api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
+    api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+    api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
+    api group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
+    api group: 'com.tdunning', name: 't-digest', version: '3.2'
     api project(':common')
 
-    testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
+    testImplementation('org.junit.jupiter:junit-jupiter:5.9.3')
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.springframework', name: 'spring-test', version: "${spring_version}"
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.7.0'
 }
 
 test {
     useJUnitPlatform()
     testLogging {
-        events "passed", "skipped", "failed"
+        events "skipped", "failed"
         exceptionFormat "full"
     }
 }
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required = true
+        xml.required = true
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {
@@ -80,7 +81,9 @@ jacocoTestCoverageVerification {
             excludes = [
                     'org.opensearch.sql.utils.MLCommonsConstants',
                     'org.opensearch.sql.utils.Constants',
-                    'org.opensearch.sql.datasource.model.*'
+                    'org.opensearch.sql.datasource.model.DataSource',
+                    'org.opensearch.sql.datasource.model.DataSourceStatus',
+                    'org.opensearch.sql.datasource.model.DataSourceType'
             ]
             limit {
                 counter = 'LINE'
diff --git a/core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java b/core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java
index 47988097c3..9c9dfa0772 100644
--- a/core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java
+++ b/core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java
@@ -17,5 +17,4 @@ public class DataSourceSchemaName {
   private final String dataSourceName;
 
   private final String schemaName;
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/AnalysisContext.java b/core/src/main/java/org/opensearch/sql/analysis/AnalysisContext.java
index 4704d0566b..f1f29e9b38 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/AnalysisContext.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/AnalysisContext.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import java.util.ArrayList;
@@ -13,19 +12,14 @@
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.function.FunctionProperties;
 
-/**
- * The context used for Analyzer.
- */
+/** The context used for Analyzer. */
 public class AnalysisContext {
-  /**
-   * Environment stack for symbol scope management.
-   */
+  /** Environment stack for symbol scope management. */
   private TypeEnvironment environment;
-  @Getter
-  private final List<NamedExpression> namedParseExpressions;
 
-  @Getter
-  private final FunctionProperties functionProperties;
+  @Getter private final List<NamedExpression> namedParseExpressions;
+
+  @Getter private final FunctionProperties functionProperties;
 
   public AnalysisContext() {
     this(new TypeEnvironment(null));
@@ -33,6 +27,7 @@ public AnalysisContext() {
 
   /**
    * Class CTOR.
+   *
    * @param environment Env to set to a new instance.
    */
   public AnalysisContext(TypeEnvironment environment) {
@@ -41,9 +36,7 @@ public AnalysisContext(TypeEnvironment environment) {
     this.functionProperties = new FunctionProperties();
   }
 
-  /**
-   * Push a new environment.
-   */
+  /** Push a new environment. */
   public void push() {
     environment = new TypeEnvironment(environment);
   }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/Analyzer.java b/core/src/main/java/org/opensearch/sql/analysis/Analyzer.java
index 228b54ba0c..d5e8b93b13 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/Analyzer.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/Analyzer.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
 import static org.opensearch.sql.ast.tree.Sort.NullOrder.NULL_FIRST;
 import static org.opensearch.sql.ast.tree.Sort.NullOrder.NULL_LAST;
 import static org.opensearch.sql.ast.tree.Sort.SortOrder.ASC;
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
@@ -43,13 +42,16 @@
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 import org.opensearch.sql.ast.tree.AD;
 import org.opensearch.sql.ast.tree.Aggregation;
+import org.opensearch.sql.ast.tree.CloseCursor;
 import org.opensearch.sql.ast.tree.Dedupe;
 import org.opensearch.sql.ast.tree.Eval;
+import org.opensearch.sql.ast.tree.FetchCursor;
 import org.opensearch.sql.ast.tree.Filter;
 import org.opensearch.sql.ast.tree.Head;
 import org.opensearch.sql.ast.tree.Kmeans;
 import org.opensearch.sql.ast.tree.Limit;
 import org.opensearch.sql.ast.tree.ML;
+import org.opensearch.sql.ast.tree.Paginate;
 import org.opensearch.sql.ast.tree.Parse;
 import org.opensearch.sql.ast.tree.Project;
 import org.opensearch.sql.ast.tree.RareTopN;
@@ -61,30 +63,35 @@
 import org.opensearch.sql.ast.tree.TableFunction;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.ast.tree.Values;
+import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.data.model.ExprMissingValue;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.datasource.DataSourceService;
-import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.LiteralExpression;
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.aggregation.Aggregator;
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
+import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
 import org.opensearch.sql.expression.function.FunctionName;
 import org.opensearch.sql.expression.function.TableFunctionImplementation;
 import org.opensearch.sql.expression.parse.ParseExpression;
 import org.opensearch.sql.planner.logical.LogicalAD;
 import org.opensearch.sql.planner.logical.LogicalAggregation;
+import org.opensearch.sql.planner.logical.LogicalCloseCursor;
 import org.opensearch.sql.planner.logical.LogicalDedupe;
 import org.opensearch.sql.planner.logical.LogicalEval;
+import org.opensearch.sql.planner.logical.LogicalFetchCursor;
 import org.opensearch.sql.planner.logical.LogicalFilter;
 import org.opensearch.sql.planner.logical.LogicalLimit;
 import org.opensearch.sql.planner.logical.LogicalML;
 import org.opensearch.sql.planner.logical.LogicalMLCommons;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalProject;
 import org.opensearch.sql.planner.logical.LogicalRareTopN;
@@ -113,9 +120,7 @@ public class Analyzer extends AbstractNodeVisitor<LogicalPlan, AnalysisContext>
 
   private final BuiltinFunctionRepository repository;
 
-  /**
-   * Constructor.
-   */
+  /** Constructor. */
   public Analyzer(
       ExpressionAnalyzer expressionAnalyzer,
       DataSourceService dataSourceService,
@@ -134,13 +139,8 @@ public LogicalPlan analyze(UnresolvedPlan unresolved, AnalysisContext context) {
   @Override
   public LogicalPlan visitRelation(Relation node, AnalysisContext context) {
     QualifiedName qualifiedName = node.getTableQualifiedName();
-    Set<String> allowedDataSourceNames = dataSourceService.getDataSources()
-        .stream()
-        .map(DataSource::getName)
-        .collect(Collectors.toSet());
-    DataSourceSchemaIdentifierNameResolver dataSourceSchemaIdentifierNameResolver
-        = new DataSourceSchemaIdentifierNameResolver(qualifiedName.getParts(),
-        allowedDataSourceNames);
+    DataSourceSchemaIdentifierNameResolver dataSourceSchemaIdentifierNameResolver =
+        new DataSourceSchemaIdentifierNameResolver(dataSourceService, qualifiedName.getParts());
     String tableName = dataSourceSchemaIdentifierNameResolver.getIdentifierName();
     context.push();
     TypeEnvironment curEnv = context.peek();
@@ -148,25 +148,30 @@ public LogicalPlan visitRelation(Relation node, AnalysisContext context) {
     if (DATASOURCES_TABLE_NAME.equals(tableName)) {
       table = new DataSourceTable(dataSourceService);
     } else {
-      table = dataSourceService
-          .getDataSource(dataSourceSchemaIdentifierNameResolver.getDataSourceName())
-          .getStorageEngine()
-          .getTable(new DataSourceSchemaName(
-              dataSourceSchemaIdentifierNameResolver.getDataSourceName(),
-              dataSourceSchemaIdentifierNameResolver.getSchemaName()),
-              dataSourceSchemaIdentifierNameResolver.getIdentifierName());
+      table =
+          dataSourceService
+              .getDataSource(dataSourceSchemaIdentifierNameResolver.getDataSourceName())
+              .getStorageEngine()
+              .getTable(
+                  new DataSourceSchemaName(
+                      dataSourceSchemaIdentifierNameResolver.getDataSourceName(),
+                      dataSourceSchemaIdentifierNameResolver.getSchemaName()),
+                  dataSourceSchemaIdentifierNameResolver.getIdentifierName());
     }
     table.getFieldTypes().forEach((k, v) -> curEnv.define(new Symbol(Namespace.FIELD_NAME, k), v));
+    table
+        .getReservedFieldTypes()
+        .forEach((k, v) -> curEnv.define(new Symbol(Namespace.HIDDEN_FIELD_NAME, k), v));
 
     // Put index name or its alias in index namespace on type environment so qualifier
     // can be removed when analyzing qualified name. The value (expr type) here doesn't matter.
-    curEnv.define(new Symbol(Namespace.INDEX_NAME,
-        (node.getAlias() == null) ? tableName : node.getAlias()), STRUCT);
+    curEnv.define(
+        new Symbol(Namespace.INDEX_NAME, (node.getAlias() == null) ? tableName : node.getAlias()),
+        STRUCT);
 
     return new LogicalRelation(tableName, table);
   }
 
-
   @Override
   public LogicalPlan visitRelationSubquery(RelationSubquery node, AnalysisContext context) {
     LogicalPlan subquery = analyze(node.getChild().get(0), context);
@@ -182,33 +187,44 @@ public LogicalPlan visitRelationSubquery(RelationSubquery node, AnalysisContext
   @Override
   public LogicalPlan visitTableFunction(TableFunction node, AnalysisContext context) {
     QualifiedName qualifiedName = node.getFunctionName();
-    Set<String> allowedDataSourceNames = dataSourceService.getDataSources()
-        .stream()
-        .map(DataSource::getName)
-        .collect(Collectors.toSet());
-    DataSourceSchemaIdentifierNameResolver dataSourceSchemaIdentifierNameResolver
-        = new DataSourceSchemaIdentifierNameResolver(qualifiedName.getParts(),
-        allowedDataSourceNames);
-
-    FunctionName functionName
-        = FunctionName.of(dataSourceSchemaIdentifierNameResolver.getIdentifierName());
-    List<Expression> arguments = node.getArguments().stream()
-        .map(unresolvedExpression -> this.expressionAnalyzer.analyze(unresolvedExpression, context))
-        .collect(Collectors.toList());
-    TableFunctionImplementation tableFunctionImplementation
-        = (TableFunctionImplementation) repository.compile(context.getFunctionProperties(),
-        dataSourceSchemaIdentifierNameResolver.getDataSourceName(), functionName, arguments);
+    DataSourceSchemaIdentifierNameResolver dataSourceSchemaIdentifierNameResolver =
+        new DataSourceSchemaIdentifierNameResolver(
+            this.dataSourceService, qualifiedName.getParts());
+
+    FunctionName functionName =
+        FunctionName.of(dataSourceSchemaIdentifierNameResolver.getIdentifierName());
+    List<Expression> arguments =
+        node.getArguments().stream()
+            .map(
+                unresolvedExpression ->
+                    this.expressionAnalyzer.analyze(unresolvedExpression, context))
+            .collect(Collectors.toList());
+    TableFunctionImplementation tableFunctionImplementation =
+        (TableFunctionImplementation)
+            repository.compile(
+                context.getFunctionProperties(),
+                dataSourceService
+                    .getDataSource(dataSourceSchemaIdentifierNameResolver.getDataSourceName())
+                    .getStorageEngine()
+                    .getFunctions(),
+                functionName,
+                arguments);
     context.push();
     TypeEnvironment curEnv = context.peek();
     Table table = tableFunctionImplementation.applyArguments();
     table.getFieldTypes().forEach((k, v) -> curEnv.define(new Symbol(Namespace.FIELD_NAME, k), v));
-    curEnv.define(new Symbol(Namespace.INDEX_NAME,
-            dataSourceSchemaIdentifierNameResolver.getIdentifierName()), STRUCT);
-    return new LogicalRelation(dataSourceSchemaIdentifierNameResolver.getIdentifierName(),
+    table
+        .getReservedFieldTypes()
+        .forEach((k, v) -> curEnv.define(new Symbol(Namespace.HIDDEN_FIELD_NAME, k), v));
+    curEnv.define(
+        new Symbol(
+            Namespace.INDEX_NAME, dataSourceSchemaIdentifierNameResolver.getIdentifierName()),
+        STRUCT);
+    return new LogicalRelation(
+        dataSourceSchemaIdentifierNameResolver.getIdentifierName(),
         tableFunctionImplementation.applyArguments());
   }
 
-
   @Override
   public LogicalPlan visitLimit(Limit node, AnalysisContext context) {
     LogicalPlan child = node.getChild().get(0).accept(this, context);
@@ -227,8 +243,28 @@ public LogicalPlan visitFilter(Filter node, AnalysisContext context) {
   }
 
   /**
-   * Build {@link LogicalRename}.
+   * Ensure NESTED function is not used in GROUP BY, and HAVING clauses. Fallback to legacy engine.
+   * Can remove when support is added for NESTED function in WHERE, GROUP BY, ORDER BY, and HAVING
+   * clauses.
+   *
+   * @param condition : Filter condition
    */
+  private void verifySupportsCondition(Expression condition) {
+    if (condition instanceof FunctionExpression) {
+      if (((FunctionExpression) condition)
+          .getFunctionName()
+          .getFunctionName()
+          .equalsIgnoreCase(BuiltinFunctionName.NESTED.name())) {
+        throw new SyntaxCheckException(
+            "Falling back to legacy engine. Nested function is not supported in WHERE,"
+                + " GROUP BY, and HAVING clauses.");
+      }
+      ((FunctionExpression) condition)
+          .getArguments().stream().forEach(e -> verifySupportsCondition(e));
+    }
+  }
+
+  /** Build {@link LogicalRename}. */
   @Override
   public LogicalPlan visitRename(Rename node, AnalysisContext context) {
     LogicalPlan child = node.getChild().get(0).accept(this, context);
@@ -239,8 +275,8 @@ public LogicalPlan visitRename(Rename node, AnalysisContext context) {
       // We should define the new target field in the context instead of analyze it.
       if (renameMap.getTarget() instanceof Field) {
         ReferenceExpression target =
-            new ReferenceExpression(((Field) renameMap.getTarget()).getField().toString(),
-                origin.type());
+            new ReferenceExpression(
+                ((Field) renameMap.getTarget()).getField().toString(), origin.type());
         ReferenceExpression originExpr = DSL.ref(origin.toString(), origin.type());
         TypeEnvironment curEnv = context.peek();
         curEnv.remove(originExpr);
@@ -255,17 +291,15 @@ public LogicalPlan visitRename(Rename node, AnalysisContext context) {
     return new LogicalRename(child, renameMapBuilder.build());
   }
 
-  /**
-   * Build {@link LogicalAggregation}.
-   */
+  /** Build {@link LogicalAggregation}. */
   @Override
   public LogicalPlan visitAggregation(Aggregation node, AnalysisContext context) {
     final LogicalPlan child = node.getChild().get(0).accept(this, context);
     ImmutableList.Builder<NamedAggregator> aggregatorBuilder = new ImmutableList.Builder<>();
     for (UnresolvedExpression expr : node.getAggExprList()) {
       NamedExpression aggExpr = namedExpressionAnalyzer.analyze(expr, context);
-      aggregatorBuilder
-          .add(new NamedAggregator(aggExpr.getNameOrAlias(), (Aggregator) aggExpr.getDelegated()));
+      aggregatorBuilder.add(
+          new NamedAggregator(aggExpr.getNameOrAlias(), (Aggregator) aggExpr.getDelegated()));
     }
 
     ImmutableList.Builder<NamedExpression> groupbyBuilder = new ImmutableList.Builder<>();
@@ -275,7 +309,9 @@ public LogicalPlan visitAggregation(Aggregation node, AnalysisContext context) {
     }
 
     for (UnresolvedExpression expr : node.getGroupExprList()) {
-      groupbyBuilder.add(namedExpressionAnalyzer.analyze(expr, context));
+      NamedExpression resolvedExpr = namedExpressionAnalyzer.analyze(expr, context);
+      verifySupportsCondition(resolvedExpr.getDelegated());
+      groupbyBuilder.add(resolvedExpr);
     }
     ImmutableList<NamedExpression> groupBys = groupbyBuilder.build();
 
@@ -283,16 +319,17 @@ public LogicalPlan visitAggregation(Aggregation node, AnalysisContext context) {
     // new context
     context.push();
     TypeEnvironment newEnv = context.peek();
-    aggregators.forEach(aggregator -> newEnv.define(new Symbol(Namespace.FIELD_NAME,
-        aggregator.getName()), aggregator.type()));
-    groupBys.forEach(group -> newEnv.define(new Symbol(Namespace.FIELD_NAME,
-        group.getNameOrAlias()), group.type()));
+    aggregators.forEach(
+        aggregator ->
+            newEnv.define(
+                new Symbol(Namespace.FIELD_NAME, aggregator.getName()), aggregator.type()));
+    groupBys.forEach(
+        group ->
+            newEnv.define(new Symbol(Namespace.FIELD_NAME, group.getNameOrAlias()), group.type()));
     return new LogicalAggregation(child, aggregators, groupBys);
   }
 
-  /**
-   * Build {@link LogicalRareTopN}.
-   */
+  /** Build {@link LogicalRareTopN}. */
   @Override
   public LogicalPlan visitRareTopN(RareTopN node, AnalysisContext context) {
     final LogicalPlan child = node.getChild().get(0).accept(this, context);
@@ -312,10 +349,10 @@ public LogicalPlan visitRareTopN(RareTopN node, AnalysisContext context) {
     // new context
     context.push();
     TypeEnvironment newEnv = context.peek();
-    groupBys.forEach(group -> newEnv.define(new Symbol(Namespace.FIELD_NAME,
-        group.toString()), group.type()));
-    fields.forEach(field -> newEnv.define(new Symbol(Namespace.FIELD_NAME,
-        field.toString()), field.type()));
+    groupBys.forEach(
+        group -> newEnv.define(new Symbol(Namespace.FIELD_NAME, group.toString()), group.type()));
+    fields.forEach(
+        field -> newEnv.define(new Symbol(Namespace.FIELD_NAME, field.toString()), field.type()));
 
     List<Argument> options = node.getNoOfResults();
     Integer noOfResults = (Integer) options.get(0).getValue().getValue();
@@ -366,20 +403,28 @@ public LogicalPlan visitProject(Project node, AnalysisContext context) {
     }
 
     List<NamedExpression> namedExpressions =
-        selectExpressionAnalyzer.analyze(node.getProjectList(), context,
+        selectExpressionAnalyzer.analyze(
+            node.getProjectList(),
+            context,
             new ExpressionReferenceOptimizer(expressionAnalyzer.getRepository(), child));
+
+    for (UnresolvedExpression expr : node.getProjectList()) {
+      NestedAnalyzer nestedAnalyzer =
+          new NestedAnalyzer(namedExpressions, expressionAnalyzer, child);
+      child = nestedAnalyzer.analyze(expr, context);
+    }
+
     // new context
     context.push();
     TypeEnvironment newEnv = context.peek();
-    namedExpressions.forEach(expr -> newEnv.define(new Symbol(Namespace.FIELD_NAME,
-        expr.getNameOrAlias()), expr.type()));
+    namedExpressions.forEach(
+        expr ->
+            newEnv.define(new Symbol(Namespace.FIELD_NAME, expr.getNameOrAlias()), expr.type()));
     List<NamedExpression> namedParseExpressions = context.getNamedParseExpressions();
     return new LogicalProject(child, namedExpressions, namedParseExpressions);
   }
 
-  /**
-   * Build {@link LogicalEval}.
-   */
+  /** Build {@link LogicalEval}. */
   @Override
   public LogicalPlan visitEval(Eval node, AnalysisContext context) {
     LogicalPlan child = node.getChild().get(0).accept(this, context);
@@ -396,9 +441,7 @@ public LogicalPlan visitEval(Eval node, AnalysisContext context) {
     return new LogicalEval(child, expressionsBuilder.build());
   }
 
-  /**
-   * Build {@link ParseExpression} to context and skip to child nodes.
-   */
+  /** Build {@link ParseExpression} to context and skip to child nodes. */
   @Override
   public LogicalPlan visitParse(Parse node, AnalysisContext context) {
     LogicalPlan child = node.getChild().get(0).accept(this, context);
@@ -409,18 +452,19 @@ public LogicalPlan visitParse(Parse node, AnalysisContext context) {
     Expression patternExpression = DSL.literal(pattern);
 
     TypeEnvironment curEnv = context.peek();
-    ParseUtils.getNamedGroupCandidates(parseMethod, pattern, arguments).forEach(group -> {
-      ParseExpression expr = ParseUtils.createParseExpression(parseMethod, sourceField,
-          patternExpression, DSL.literal(group));
-      curEnv.define(new Symbol(Namespace.FIELD_NAME, group), expr.type());
-      context.getNamedParseExpressions().add(new NamedExpression(group, expr));
-    });
+    ParseUtils.getNamedGroupCandidates(parseMethod, pattern, arguments)
+        .forEach(
+            group -> {
+              ParseExpression expr =
+                  ParseUtils.createParseExpression(
+                      parseMethod, sourceField, patternExpression, DSL.literal(group));
+              curEnv.define(new Symbol(Namespace.FIELD_NAME, group), expr.type());
+              context.getNamedParseExpressions().add(new NamedExpression(group, expr));
+            });
     return child;
   }
 
-  /**
-   * Build {@link LogicalSort}.
-   */
+  /** Build {@link LogicalSort}. */
   @Override
   public LogicalPlan visitSort(Sort node, AnalysisContext context) {
     LogicalPlan child = node.getChild().get(0).accept(this, context);
@@ -431,17 +475,19 @@ public LogicalPlan visitSort(Sort node, AnalysisContext context) {
         node.getSortList().stream()
             .map(
                 sortField -> {
-                  Expression expression = optimizer.optimize(
-                      expressionAnalyzer.analyze(sortField.getField(), context), context);
+                  var analyzed = expressionAnalyzer.analyze(sortField.getField(), context);
+                  if (analyzed == null) {
+                    throw new UnsupportedOperationException(
+                        String.format("Invalid use of expression %s", sortField.getField()));
+                  }
+                  Expression expression = optimizer.optimize(analyzed, context);
                   return ImmutablePair.of(analyzeSortOption(sortField.getFieldArgs()), expression);
                 })
             .collect(Collectors.toList());
     return new LogicalSort(child, sortList);
   }
 
-  /**
-   * Build {@link LogicalDedupe}.
-   */
+  /** Build {@link LogicalDedupe}. */
   @Override
   public LogicalPlan visitDedupe(Dedupe node, AnalysisContext context) {
     LogicalPlan child = node.getChild().get(0).accept(this, context);
@@ -461,9 +507,7 @@ public LogicalPlan visitDedupe(Dedupe node, AnalysisContext context) {
         consecutive);
   }
 
-  /**
-   * Logical head is identical to {@link LogicalLimit}.
-   */
+  /** Logical head is identical to {@link LogicalLimit}. */
   public LogicalPlan visitHead(Head node, AnalysisContext context) {
     LogicalPlan child = node.getChild().get(0).accept(this, context);
     return new LogicalLimit(child, node.getSize(), node.getFrom());
@@ -474,16 +518,15 @@ public LogicalPlan visitValues(Values node, AnalysisContext context) {
     List<List<Literal>> values = node.getValues();
     List<List<LiteralExpression>> valueExprs = new ArrayList<>();
     for (List<Literal> value : values) {
-      valueExprs.add(value.stream()
-          .map(val -> (LiteralExpression) expressionAnalyzer.analyze(val, context))
-          .collect(Collectors.toList()));
+      valueExprs.add(
+          value.stream()
+              .map(val -> (LiteralExpression) expressionAnalyzer.analyze(val, context))
+              .collect(Collectors.toList()));
     }
     return new LogicalValues(valueExprs);
   }
 
-  /**
-   * Build {@link LogicalMLCommons} for Kmeans command.
-   */
+  /** Build {@link LogicalMLCommons} for Kmeans command. */
   @Override
   public LogicalPlan visitKmeans(Kmeans node, AnalysisContext context) {
     LogicalPlan child = node.getChild().get(0).accept(this, context);
@@ -495,9 +538,7 @@ public LogicalPlan visitKmeans(Kmeans node, AnalysisContext context) {
     return new LogicalMLCommons(child, "kmeans", options);
   }
 
-  /**
-   * Build {@link LogicalAD} for AD command.
-   */
+  /** Build {@link LogicalAD} for AD command. */
   @Override
   public LogicalPlan visitAD(AD node, AnalysisContext context) {
     LogicalPlan child = node.getChild().get(0).accept(this, context);
@@ -510,33 +551,51 @@ public LogicalPlan visitAD(AD node, AnalysisContext context) {
       currentEnv.define(new Symbol(Namespace.FIELD_NAME, RCF_ANOMALOUS), ExprCoreType.BOOLEAN);
     } else {
       currentEnv.define(new Symbol(Namespace.FIELD_NAME, RCF_ANOMALY_GRADE), ExprCoreType.DOUBLE);
-      currentEnv.define(new Symbol(Namespace.FIELD_NAME,
-              (String) node.getArguments().get(TIME_FIELD).getValue()), ExprCoreType.TIMESTAMP);
+      currentEnv.define(
+          new Symbol(Namespace.FIELD_NAME, (String) node.getArguments().get(TIME_FIELD).getValue()),
+          ExprCoreType.TIMESTAMP);
     }
     return new LogicalAD(child, options);
   }
 
-  /**
-   * Build {@link LogicalML} for ml command.
-   */
+  /** Build {@link LogicalML} for ml command. */
   @Override
   public LogicalPlan visitML(ML node, AnalysisContext context) {
     LogicalPlan child = node.getChild().get(0).accept(this, context);
     TypeEnvironment currentEnv = context.peek();
     node.getOutputSchema(currentEnv).entrySet().stream()
-      .forEach(v -> currentEnv.define(new Symbol(Namespace.FIELD_NAME, v.getKey()), v.getValue()));
+        .forEach(
+            v -> currentEnv.define(new Symbol(Namespace.FIELD_NAME, v.getKey()), v.getValue()));
 
     return new LogicalML(child, node.getArguments());
   }
 
+  @Override
+  public LogicalPlan visitPaginate(Paginate paginate, AnalysisContext context) {
+    LogicalPlan child = paginate.getChild().get(0).accept(this, context);
+    return new LogicalPaginate(paginate.getPageSize(), List.of(child));
+  }
+
+  @Override
+  public LogicalPlan visitFetchCursor(FetchCursor cursor, AnalysisContext context) {
+    return new LogicalFetchCursor(
+        cursor.getCursor(),
+        dataSourceService.getDataSource(DEFAULT_DATASOURCE_NAME).getStorageEngine());
+  }
+
+  @Override
+  public LogicalPlan visitCloseCursor(CloseCursor closeCursor, AnalysisContext context) {
+    return new LogicalCloseCursor(closeCursor.getChild().get(0).accept(this, context));
+  }
+
   /**
-   * The first argument is always "asc", others are optional.
-   * Given nullFirst argument, use its value. Otherwise just use DEFAULT_ASC/DESC.
+   * The first argument is always "asc", others are optional. Given nullFirst argument, use its
+   * value. Otherwise just use DEFAULT_ASC/DESC.
    */
   private SortOption analyzeSortOption(List<Argument> fieldArgs) {
     Boolean asc = (Boolean) fieldArgs.get(0).getValue().getValue();
-    Optional<Argument> nullFirst = fieldArgs.stream()
-        .filter(option -> "nullFirst".equals(option.getArgName())).findFirst();
+    Optional<Argument> nullFirst =
+        fieldArgs.stream().filter(option -> "nullFirst".equals(option.getArgName())).findFirst();
 
     if (nullFirst.isPresent()) {
       Boolean isNullFirst = (Boolean) nullFirst.get().getValue().getValue();
@@ -544,5 +603,4 @@ private SortOption analyzeSortOption(List<Argument> fieldArgs) {
     }
     return asc ? SortOption.DEFAULT_ASC : SortOption.DEFAULT_DESC;
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/DataSourceSchemaIdentifierNameResolver.java b/core/src/main/java/org/opensearch/sql/analysis/DataSourceSchemaIdentifierNameResolver.java
index f3552b029b..01145dc7df 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/DataSourceSchemaIdentifierNameResolver.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/DataSourceSchemaIdentifierNameResolver.java
@@ -8,7 +8,7 @@
 package org.opensearch.sql.analysis;
 
 import java.util.List;
-import java.util.Set;
+import org.opensearch.sql.datasource.DataSourceService;
 
 public class DataSourceSchemaIdentifierNameResolver {
 
@@ -19,22 +19,22 @@ public class DataSourceSchemaIdentifierNameResolver {
   private String dataSourceName = DEFAULT_DATASOURCE_NAME;
   private String schemaName = DEFAULT_SCHEMA_NAME;
   private String identifierName;
+  private DataSourceService dataSourceService;
 
   private static final String DOT = ".";
 
   /**
-   * Data model for capturing dataSourceName, schema and identifier from
-   * fully qualifiedName. In the current state, it is used to capture
-   * DataSourceSchemaTable name and DataSourceSchemaFunction in case of table
-   * functions.
+   * Data model for capturing dataSourceName, schema and identifier from fully qualifiedName. In the
+   * current state, it is used to capture DataSourceSchemaTable name and DataSourceSchemaFunction in
+   * case of table functions.
    *
-   * @param parts           parts of qualifiedName.
-   * @param allowedDataSources allowedDataSources.
+   * @param dataSourceService {@link DataSourceService}.
+   * @param parts parts of qualifiedName.
    */
-  public DataSourceSchemaIdentifierNameResolver(List<String> parts,
-                                                Set<String> allowedDataSources) {
-    List<String> remainingParts
-        = captureSchemaName(captureDataSourceName(parts, allowedDataSources));
+  public DataSourceSchemaIdentifierNameResolver(
+      DataSourceService dataSourceService, List<String> parts) {
+    this.dataSourceService = dataSourceService;
+    List<String> remainingParts = captureSchemaName(captureDataSourceName(parts));
     identifierName = String.join(DOT, remainingParts);
   }
 
@@ -50,12 +50,10 @@ public String getSchemaName() {
     return schemaName;
   }
 
-
   // Capture datasource name and return remaining parts(schema name and table name)
   // from the fully qualified name.
-  private List<String> captureDataSourceName(List<String> parts, Set<String> allowedDataSources) {
-    if (parts.size() > 1 && allowedDataSources.contains(parts.get(0))
-        || DEFAULT_DATASOURCE_NAME.equals(parts.get(0))) {
+  private List<String> captureDataSourceName(List<String> parts) {
+    if (parts.size() > 1 && dataSourceService.dataSourceExists(parts.get(0))) {
       dataSourceName = parts.get(0);
       return parts.subList(1, parts.size());
     } else {
@@ -68,13 +66,11 @@ private List<String> captureDataSourceName(List<String> parts, Set<String> allow
   private List<String> captureSchemaName(List<String> parts) {
     if (parts.size() > 1
         && (DEFAULT_SCHEMA_NAME.equals(parts.get(0))
-        || INFORMATION_SCHEMA_NAME.contains(parts.get(0)))) {
+            || INFORMATION_SCHEMA_NAME.contains(parts.get(0)))) {
       schemaName = parts.get(0);
       return parts.subList(1, parts.size());
     } else {
       return parts;
     }
   }
-
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/ExpressionAnalyzer.java b/core/src/main/java/org/opensearch/sql/analysis/ExpressionAnalyzer.java
index 719c3adbce..5a8d6fe976 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/ExpressionAnalyzer.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/ExpressionAnalyzer.java
@@ -3,9 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
+import static org.opensearch.sql.ast.dsl.AstDSL.and;
+import static org.opensearch.sql.ast.dsl.AstDSL.compare;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -22,9 +24,11 @@
 import org.opensearch.sql.ast.expression.AggregateFunction;
 import org.opensearch.sql.ast.expression.AllFields;
 import org.opensearch.sql.ast.expression.And;
+import org.opensearch.sql.ast.expression.Between;
 import org.opensearch.sql.ast.expression.Case;
 import org.opensearch.sql.ast.expression.Cast;
 import org.opensearch.sql.ast.expression.Compare;
+import org.opensearch.sql.ast.expression.DataType;
 import org.opensearch.sql.ast.expression.EqualTo;
 import org.opensearch.sql.ast.expression.Field;
 import org.opensearch.sql.ast.expression.Function;
@@ -36,6 +40,7 @@
 import org.opensearch.sql.ast.expression.Or;
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.RelevanceFieldList;
+import org.opensearch.sql.ast.expression.ScoreFunction;
 import org.opensearch.sql.ast.expression.Span;
 import org.opensearch.sql.ast.expression.UnresolvedArgument;
 import org.opensearch.sql.ast.expression.UnresolvedAttribute;
@@ -43,8 +48,8 @@
 import org.opensearch.sql.ast.expression.When;
 import org.opensearch.sql.ast.expression.WindowFunction;
 import org.opensearch.sql.ast.expression.Xor;
-import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.data.model.ExprValueUtils;
+import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.DSL;
@@ -61,6 +66,7 @@
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
 import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.expression.function.OpenSearchFunctions;
 import org.opensearch.sql.expression.parse.ParseExpression;
 import org.opensearch.sql.expression.span.SpanExpression;
 import org.opensearch.sql.expression.window.aggregation.AggregateWindowFunction;
@@ -70,19 +76,19 @@
  * Expression}.
  */
 public class ExpressionAnalyzer extends AbstractNodeVisitor<Expression, AnalysisContext> {
-  @Getter
-  private final BuiltinFunctionRepository repository;
+  @Getter private final BuiltinFunctionRepository repository;
 
   @Override
   public Expression visitCast(Cast node, AnalysisContext context) {
     final Expression expression = node.getExpression().accept(this, context);
-    return (Expression) repository
-        .compile(context.getFunctionProperties(), node.convertFunctionName(),
+    return (Expression)
+        repository.compile(
+            context.getFunctionProperties(),
+            node.convertFunctionName(),
             Collections.singletonList(expression));
   }
 
-  public ExpressionAnalyzer(
-      BuiltinFunctionRepository repository) {
+  public ExpressionAnalyzer(BuiltinFunctionRepository repository) {
     this.repository = repository;
   }
 
@@ -105,8 +111,8 @@ public Expression visitEqualTo(EqualTo node, AnalysisContext context) {
 
   @Override
   public Expression visitLiteral(Literal node, AnalysisContext context) {
-    return DSL
-        .literal(ExprValueUtils.fromObjectValue(node.getValue(), node.getType().getCoreType()));
+    return DSL.literal(
+        ExprValueUtils.fromObjectValue(node.getValue(), node.getType().getCoreType()));
   }
 
   @Override
@@ -155,8 +161,12 @@ public Expression visitAggregateFunction(AggregateFunction node, AnalysisContext
       for (UnresolvedExpression arg : node.getArgList()) {
         builder.add(arg.accept(this, context));
       }
-      Aggregator aggregator = (Aggregator) repository.compile(
-          context.getFunctionProperties(), builtinFunctionName.get().getName(), builder.build());
+      Aggregator aggregator =
+          (Aggregator)
+              repository.compile(
+                  context.getFunctionProperties(),
+                  builtinFunctionName.get().getName(),
+                  builder.build());
       aggregator.distinct(node.getDistinct());
       if (node.condition() != null) {
         aggregator.condition(analyze(node.condition(), context));
@@ -169,8 +179,8 @@ public Expression visitAggregateFunction(AggregateFunction node, AnalysisContext
 
   @Override
   public Expression visitRelevanceFieldList(RelevanceFieldList node, AnalysisContext context) {
-    return new LiteralExpression(ExprValueUtils.tupleValue(
-        ImmutableMap.copyOf(node.getFieldList())));
+    return new LiteralExpression(
+        ExprValueUtils.tupleValue(ImmutableMap.copyOf(node.getFieldList())));
   }
 
   @Override
@@ -178,10 +188,19 @@ public Expression visitFunction(Function node, AnalysisContext context) {
     FunctionName functionName = FunctionName.of(node.getFuncName());
     List<Expression> arguments =
         node.getFuncArgs().stream()
-            .map(unresolvedExpression -> analyze(unresolvedExpression, context))
+            .map(
+                unresolvedExpression -> {
+                  var ret = analyze(unresolvedExpression, context);
+                  if (ret == null) {
+                    throw new UnsupportedOperationException(
+                        String.format("Invalid use of expression %s", unresolvedExpression));
+                  } else {
+                    return ret;
+                  }
+                })
             .collect(Collectors.toList());
-    return (Expression) repository.compile(context.getFunctionProperties(),
-        functionName, arguments);
+    return (Expression)
+        repository.compile(context.getFunctionProperties(), functionName, arguments);
   }
 
   @SuppressWarnings("unchecked")
@@ -201,6 +220,66 @@ public Expression visitHighlightFunction(HighlightFunction node, AnalysisContext
     return new HighlightExpression(expr);
   }
 
+  /**
+   * visitScoreFunction removes the score function from the AST and replaces it with the child
+   * relevance function node. If the optional boost variable is provided, the boost argument of the
+   * relevance function is combined.
+   *
+   * @param node score function node
+   * @param context analysis context for the query
+   * @return resolved relevance function
+   */
+  public Expression visitScoreFunction(ScoreFunction node, AnalysisContext context) {
+    Literal boostArg = node.getRelevanceFieldWeight();
+    if (!boostArg.getType().equals(DataType.DOUBLE)) {
+      throw new SemanticCheckException(
+          String.format(
+              "Expected boost type '%s' but got '%s'",
+              DataType.DOUBLE.name(), boostArg.getType().name()));
+    }
+    Double thisBoostValue = ((Double) boostArg.getValue());
+
+    // update the existing unresolved expression to add a boost argument if it doesn't exist
+    // OR multiply the existing boost argument
+    Function relevanceQueryUnresolvedExpr = (Function) node.getRelevanceQuery();
+    List<UnresolvedExpression> relevanceFuncArgs = relevanceQueryUnresolvedExpr.getFuncArgs();
+
+    boolean doesFunctionContainBoostArgument = false;
+    List<UnresolvedExpression> updatedFuncArgs = new ArrayList<>();
+    for (UnresolvedExpression expr : relevanceFuncArgs) {
+      String argumentName = ((UnresolvedArgument) expr).getArgName();
+      if (argumentName.equalsIgnoreCase("boost")) {
+        doesFunctionContainBoostArgument = true;
+        Literal boostArgLiteral = (Literal) ((UnresolvedArgument) expr).getValue();
+        Double boostValue =
+            Double.parseDouble((String) boostArgLiteral.getValue()) * thisBoostValue;
+        UnresolvedArgument newBoostArg =
+            new UnresolvedArgument(
+                argumentName, new Literal(boostValue.toString(), DataType.STRING));
+        updatedFuncArgs.add(newBoostArg);
+      } else {
+        updatedFuncArgs.add(expr);
+      }
+    }
+
+    // since nothing was found, add an argument
+    if (!doesFunctionContainBoostArgument) {
+      UnresolvedArgument newBoostArg =
+          new UnresolvedArgument(
+              "boost", new Literal(Double.toString(thisBoostValue), DataType.STRING));
+      updatedFuncArgs.add(newBoostArg);
+    }
+
+    // create a new function expression with boost argument and resolve it
+    Function updatedRelevanceQueryUnresolvedExpr =
+        new Function(relevanceQueryUnresolvedExpr.getFuncName(), updatedFuncArgs);
+    OpenSearchFunctions.OpenSearchFunction relevanceQueryExpr =
+        (OpenSearchFunctions.OpenSearchFunction)
+            updatedRelevanceQueryUnresolvedExpr.accept(this, context);
+    relevanceQueryExpr.setScoreTracked(true);
+    return relevanceQueryExpr;
+  }
+
   @Override
   public Expression visitIn(In node, AnalysisContext context) {
     return visitIn(node.getField(), node.getValueList(), context);
@@ -225,8 +304,16 @@ public Expression visitCompare(Compare node, AnalysisContext context) {
     Expression left = analyze(node.getLeft(), context);
     Expression right = analyze(node.getRight(), context);
     return (Expression)
-        repository.compile(context.getFunctionProperties(),
-            functionName, Arrays.asList(left, right));
+        repository.compile(
+            context.getFunctionProperties(), functionName, Arrays.asList(left, right));
+  }
+
+  @Override
+  public Expression visitBetween(Between node, AnalysisContext context) {
+    return and(
+            compare(">=", node.getValue(), node.getLowerBound()),
+            compare("<=", node.getValue(), node.getUpperBound()))
+        .accept(this, context);
   }
 
   @Override
@@ -237,16 +324,18 @@ public Expression visitCase(Case node, AnalysisContext context) {
         whens.add((WhenClause) analyze(when, context));
       } else {
         // Merge case value and condition (compare value) into a single equal condition
-        whens.add((WhenClause) analyze(
-            new When(
-                new Function("=", Arrays.asList(node.getCaseValue(), when.getCondition())),
-                when.getResult()
-            ), context));
+        whens.add(
+            (WhenClause)
+                analyze(
+                    new When(
+                        new Function("=", Arrays.asList(node.getCaseValue(), when.getCondition())),
+                        when.getResult()),
+                    context));
       }
     }
 
-    Expression defaultResult = (node.getElseClause() == null)
-        ? null : analyze(node.getElseClause(), context);
+    Expression defaultResult =
+        (node.getElseClause() == null) ? null : analyze(node.getElseClause(), context);
     CaseClause caseClause = new CaseClause(whens, defaultResult);
 
     // To make this simple, require all result type same regardless of implicit convert
@@ -262,8 +351,7 @@ public Expression visitCase(Case node, AnalysisContext context) {
   @Override
   public Expression visitWhen(When node, AnalysisContext context) {
     return new WhenClause(
-        analyze(node.getCondition(), context),
-        analyze(node.getResult(), context));
+        analyze(node.getCondition(), context), analyze(node.getResult(), context));
   }
 
   @Override
@@ -283,6 +371,20 @@ public Expression visitAllFields(AllFields node, AnalysisContext context) {
   @Override
   public Expression visitQualifiedName(QualifiedName node, AnalysisContext context) {
     QualifierAnalyzer qualifierAnalyzer = new QualifierAnalyzer(context);
+
+    // check for reserved words in the identifier
+    for (String part : node.getParts()) {
+      for (TypeEnvironment typeEnv = context.peek();
+          typeEnv != null;
+          typeEnv = typeEnv.getParent()) {
+        Optional<ExprType> exprType =
+            Optional.ofNullable(typeEnv.lookupAllFields(Namespace.HIDDEN_FIELD_NAME).get(part));
+        if (exprType.isPresent()) {
+          return visitMetadata(
+              qualifierAnalyzer.unqualified(node), (ExprCoreType) exprType.get(), context);
+        }
+      }
+    }
     return visitIdentifier(qualifierAnalyzer.unqualified(node), context);
   }
 
@@ -299,6 +401,19 @@ public Expression visitUnresolvedArgument(UnresolvedArgument node, AnalysisConte
     return new NamedArgumentExpression(node.getArgName(), node.getValue().accept(this, context));
   }
 
+  /**
+   * If QualifiedName is actually a reserved metadata field, return the expr type associated with
+   * the metadata field.
+   *
+   * @param ident metadata field name
+   * @param context analysis context
+   * @return DSL reference
+   */
+  private Expression visitMetadata(
+      String ident, ExprCoreType exprCoreType, AnalysisContext context) {
+    return DSL.ref(ident, exprCoreType);
+  }
+
   private Expression visitIdentifier(String ident, AnalysisContext context) {
     // ParseExpression will always override ReferenceExpression when ident conflicts
     for (NamedExpression expr : context.getNamedParseExpressions()) {
@@ -308,20 +423,9 @@ private Expression visitIdentifier(String ident, AnalysisContext context) {
     }
 
     TypeEnvironment typeEnv = context.peek();
-    ReferenceExpression ref = DSL.ref(ident,
-        typeEnv.resolve(new Symbol(Namespace.FIELD_NAME, ident)));
+    ReferenceExpression ref =
+        DSL.ref(ident, typeEnv.resolve(new Symbol(Namespace.FIELD_NAME, ident)));
 
-    // Fall back to old engine too if type is not supported semantically
-    if (isTypeNotSupported(ref.type())) {
-      throw new SyntaxCheckException(String.format(
-          "Identifier [%s] of type [%s] is not supported yet", ident, ref.type()));
-    }
     return ref;
   }
-
-  // Array type is not supporte yet.
-  private boolean isTypeNotSupported(ExprType type) {
-    return "array".equalsIgnoreCase(type.typeName());
-  }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizer.java b/core/src/main/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizer.java
index f75bcd5a1d..398f848f16 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizer.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizer.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import java.util.HashMap;
@@ -19,31 +18,32 @@
 import org.opensearch.sql.expression.conditional.cases.CaseClause;
 import org.opensearch.sql.expression.conditional.cases.WhenClause;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
+import org.opensearch.sql.expression.function.OpenSearchFunctions;
 import org.opensearch.sql.planner.logical.LogicalAggregation;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalPlanNodeVisitor;
 import org.opensearch.sql.planner.logical.LogicalWindow;
 
 /**
- * The optimizer used to replace the expression referred in the SelectClause
- * e.g. The query SELECT abs(name), sum(age)-avg(age) FROM test GROUP BY abs(name).
- * will be translated the AST
- * Project[abs(age), sub(sum(age), avg(age))
- *  Agg(agg=[sum(age), avg(age)], group=[abs(age)]]
- *   Relation
- * The sum(age) and avg(age) in the Project could be replace by the analyzed reference, the
- * LogicalPlan should be
- * LogicalProject[Ref("abs(age)"), sub(Ref("sum(age)"), Ref("avg(age)"))
- *  LogicalAgg(agg=[sum(age), avg(age)], group=[abs(age)]]
- *   LogicalRelation
+ * The optimizer used to replace the expression referred in the SelectClause</br> e.g. The query
+ * SELECT abs(name), sum(age)-avg(age) FROM test GROUP BY abs(name).<br>
+ * will be translated the AST<br>
+ * Project[abs(age), sub(sum(age), avg(age))<br>
+ * &ensp Agg(agg=[sum(age), avg(age)], group=[abs(age)]]<br>
+ * &emsp Relation<br>
+ * The sum(age) and avg(age) in the Project could be replaced by the analyzed reference, the
+ * LogicalPlan should be<br>
+ * LogicalProject[Ref("abs(age)"), sub(Ref("sum(age)"), Ref("avg(age)"))<br>
+ * &ensp LogicalAgg(agg=[sum(age), avg(age)], group=[abs(age)]]<br>
+ * &emsp LogicalRelation
  */
 public class ExpressionReferenceOptimizer
     extends ExpressionNodeVisitor<Expression, AnalysisContext> {
   private final BuiltinFunctionRepository repository;
 
   /**
-   * The map of expression and it's reference.
-   * For example, The NamedAggregator should produce the map of Aggregator to Ref(name)
+   * The map of expression and it's reference. For example, The NamedAggregator should produce the
+   * map of Aggregator to Ref(name)
    */
   private final Map<Expression, Expression> expressionMap = new HashMap<>();
 
@@ -68,10 +68,18 @@ public Expression visitFunction(FunctionExpression node, AnalysisContext context
       return expressionMap.get(node);
     } else {
       final List<Expression> args =
-          node.getArguments().stream().map(expr -> expr.accept(this, context))
+          node.getArguments().stream()
+              .map(expr -> expr.accept(this, context))
               .collect(Collectors.toList());
-      return (Expression) repository.compile(context.getFunctionProperties(),
-          node.getFunctionName(), args);
+      Expression optimizedFunctionExpression =
+          (Expression)
+              repository.compile(context.getFunctionProperties(), node.getFunctionName(), args);
+      // Propagate scoreTracked for OpenSearch functions
+      if (optimizedFunctionExpression instanceof OpenSearchFunctions.OpenSearchFunction) {
+        ((OpenSearchFunctions.OpenSearchFunction) optimizedFunctionExpression)
+            .setScoreTracked(((OpenSearchFunctions.OpenSearchFunction) node).isScoreTracked());
+      }
+      return optimizedFunctionExpression;
     }
   }
 
@@ -88,19 +96,17 @@ public Expression visitNamed(NamedExpression node, AnalysisContext context) {
     return node.getDelegated().accept(this, context);
   }
 
-  /**
-   * Implement this because Case/When is not registered in function repository.
-   */
+  /** Implement this because Case/When is not registered in function repository. */
   @Override
   public Expression visitCase(CaseClause node, AnalysisContext context) {
     if (expressionMap.containsKey(node)) {
       return expressionMap.get(node);
     }
 
-    List<WhenClause> whenClauses = node.getWhenClauses()
-                                       .stream()
-                                       .map(expr -> (WhenClause) expr.accept(this, context))
-                                       .collect(Collectors.toList());
+    List<WhenClause> whenClauses =
+        node.getWhenClauses().stream()
+            .map(expr -> (WhenClause) expr.accept(this, context))
+            .collect(Collectors.toList());
     Expression defaultResult = null;
     if (node.getDefaultResult() != null) {
       defaultResult = node.getDefaultResult().accept(this, context);
@@ -111,14 +117,10 @@ public Expression visitCase(CaseClause node, AnalysisContext context) {
   @Override
   public Expression visitWhen(WhenClause node, AnalysisContext context) {
     return new WhenClause(
-        node.getCondition().accept(this, context),
-        node.getResult().accept(this, context));
+        node.getCondition().accept(this, context), node.getResult().accept(this, context));
   }
 
-
-  /**
-   * Expression Map Builder.
-   */
+  /** Expression Map Builder. */
   class ExpressionMapBuilder extends LogicalPlanNodeVisitor<Void, Void> {
 
     @Override
@@ -130,20 +132,27 @@ public Void visitNode(LogicalPlan plan, Void context) {
     @Override
     public Void visitAggregation(LogicalAggregation plan, Void context) {
       // Create the mapping for all the aggregator.
-      plan.getAggregatorList().forEach(namedAggregator -> expressionMap
-          .put(namedAggregator.getDelegated(),
-              new ReferenceExpression(namedAggregator.getName(), namedAggregator.type())));
+      plan.getAggregatorList()
+          .forEach(
+              namedAggregator ->
+                  expressionMap.put(
+                      namedAggregator.getDelegated(),
+                      new ReferenceExpression(namedAggregator.getName(), namedAggregator.type())));
       // Create the mapping for all the group by.
-      plan.getGroupByList().forEach(groupBy -> expressionMap
-          .put(groupBy.getDelegated(),
-              new ReferenceExpression(groupBy.getNameOrAlias(), groupBy.type())));
+      plan.getGroupByList()
+          .forEach(
+              groupBy ->
+                  expressionMap.put(
+                      groupBy.getDelegated(),
+                      new ReferenceExpression(groupBy.getNameOrAlias(), groupBy.type())));
       return null;
     }
 
     @Override
     public Void visitWindow(LogicalWindow plan, Void context) {
       Expression windowFunc = plan.getWindowFunction();
-      expressionMap.put(windowFunc,
+      expressionMap.put(
+          windowFunc,
           new ReferenceExpression(((NamedExpression) windowFunc).getName(), windowFunc.type()));
       return visitNode(plan, context);
     }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/HighlightAnalyzer.java b/core/src/main/java/org/opensearch/sql/analysis/HighlightAnalyzer.java
index 0a15c6bac8..386c6e9d9f 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/HighlightAnalyzer.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/HighlightAnalyzer.java
@@ -14,10 +14,7 @@
 import org.opensearch.sql.planner.logical.LogicalHighlight;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 
-/**
- * Analyze the highlight in the {@link AnalysisContext} to construct the {@link
- * LogicalPlan}.
- */
+/** Analyze the highlight in the {@link AnalysisContext} to construct the {@link LogicalPlan}. */
 @RequiredArgsConstructor
 public class HighlightAnalyzer extends AbstractNodeVisitor<LogicalPlan, AnalysisContext> {
   private final ExpressionAnalyzer expressionAnalyzer;
diff --git a/core/src/main/java/org/opensearch/sql/analysis/NamedExpressionAnalyzer.java b/core/src/main/java/org/opensearch/sql/analysis/NamedExpressionAnalyzer.java
index 1d318c5588..43bd411b42 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/NamedExpressionAnalyzer.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/NamedExpressionAnalyzer.java
@@ -3,33 +3,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.Alias;
 import org.opensearch.sql.ast.expression.QualifiedName;
-import org.opensearch.sql.ast.expression.Span;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.NamedExpression;
-import org.opensearch.sql.expression.span.SpanExpression;
 
 /**
- * Analyze the Alias node in the {@link AnalysisContext} to construct the list of
- * {@link NamedExpression}.
+ * Analyze the Alias node in the {@link AnalysisContext} to construct the list of {@link
+ * NamedExpression}.
  */
 @RequiredArgsConstructor
-public class NamedExpressionAnalyzer extends
-    AbstractNodeVisitor<NamedExpression, AnalysisContext> {
+public class NamedExpressionAnalyzer extends AbstractNodeVisitor<NamedExpression, AnalysisContext> {
   private final ExpressionAnalyzer expressionAnalyzer;
 
-  /**
-   * Analyze Select fields.
-   */
-  public NamedExpression analyze(UnresolvedExpression expression,
-                                       AnalysisContext analysisContext) {
+  /** Analyze Select fields. */
+  public NamedExpression analyze(UnresolvedExpression expression, AnalysisContext analysisContext) {
     return expression.accept(this, analysisContext);
   }
 
diff --git a/core/src/main/java/org/opensearch/sql/analysis/NestedAnalyzer.java b/core/src/main/java/org/opensearch/sql/analysis/NestedAnalyzer.java
new file mode 100644
index 0000000000..ef8f142801
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/analysis/NestedAnalyzer.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.analysis;
+
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.ast.AbstractNodeVisitor;
+import org.opensearch.sql.ast.expression.Alias;
+import org.opensearch.sql.ast.expression.Function;
+import org.opensearch.sql.ast.expression.NestedAllTupleFields;
+import org.opensearch.sql.ast.expression.QualifiedName;
+import org.opensearch.sql.ast.expression.UnresolvedExpression;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.FunctionExpression;
+import org.opensearch.sql.expression.NamedExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
+import org.opensearch.sql.expression.function.BuiltinFunctionName;
+import org.opensearch.sql.planner.logical.LogicalNested;
+import org.opensearch.sql.planner.logical.LogicalPlan;
+
+/**
+ * Analyze the Nested Function in the {@link AnalysisContext} to construct the {@link LogicalPlan}.
+ */
+@RequiredArgsConstructor
+public class NestedAnalyzer extends AbstractNodeVisitor<LogicalPlan, AnalysisContext> {
+  private final List<NamedExpression> namedExpressions;
+  private final ExpressionAnalyzer expressionAnalyzer;
+  private final LogicalPlan child;
+
+  public LogicalPlan analyze(UnresolvedExpression projectItem, AnalysisContext context) {
+    LogicalPlan nested = projectItem.accept(this, context);
+    return (nested == null) ? child : nested;
+  }
+
+  @Override
+  public LogicalPlan visitAlias(Alias node, AnalysisContext context) {
+    return node.getDelegated().accept(this, context);
+  }
+
+  @Override
+  public LogicalPlan visitNestedAllTupleFields(NestedAllTupleFields node, AnalysisContext context) {
+    List<Map<String, ReferenceExpression>> args = new ArrayList<>();
+    for (NamedExpression namedExpr : namedExpressions) {
+      if (isNestedFunction(namedExpr.getDelegated())) {
+        ReferenceExpression field =
+            (ReferenceExpression)
+                ((FunctionExpression) namedExpr.getDelegated()).getArguments().get(0);
+
+        // If path is same as NestedAllTupleFields path
+        if (field
+            .getAttr()
+            .substring(0, field.getAttr().lastIndexOf("."))
+            .equalsIgnoreCase(node.getPath())) {
+          args.add(Map.of("field", field, "path", new ReferenceExpression(node.getPath(), STRING)));
+        }
+      }
+    }
+
+    return mergeChildIfLogicalNested(args);
+  }
+
+  @Override
+  public LogicalPlan visitFunction(Function node, AnalysisContext context) {
+    if (node.getFuncName().equalsIgnoreCase(BuiltinFunctionName.NESTED.name())) {
+
+      List<UnresolvedExpression> expressions = node.getFuncArgs();
+      validateArgs(expressions);
+      ReferenceExpression nestedField =
+          (ReferenceExpression) expressionAnalyzer.analyze(expressions.get(0), context);
+      Map<String, ReferenceExpression> args;
+
+      // Path parameter is supplied
+      if (expressions.size() == 2) {
+        args =
+            Map.of(
+                "field",
+                nestedField,
+                "path",
+                (ReferenceExpression) expressionAnalyzer.analyze(expressions.get(1), context));
+      } else {
+        args =
+            Map.of(
+                "field",
+                (ReferenceExpression) expressionAnalyzer.analyze(expressions.get(0), context),
+                "path",
+                generatePath(nestedField.toString()));
+      }
+
+      return mergeChildIfLogicalNested(new ArrayList<>(Arrays.asList(args)));
+    }
+    return null;
+  }
+
+  /**
+   * NestedAnalyzer visits all functions in SELECT clause, creates logical plans for each and merges
+   * them. This is to avoid another merge rule in LogicalPlanOptimizer:create().
+   *
+   * @param args field and path params to add to logical plan.
+   * @return child of logical nested with added args, or new LogicalNested.
+   */
+  private LogicalPlan mergeChildIfLogicalNested(List<Map<String, ReferenceExpression>> args) {
+    if (child instanceof LogicalNested) {
+      for (var arg : args) {
+        ((LogicalNested) child).addFields(arg);
+      }
+      return child;
+    }
+    return new LogicalNested(child, args, namedExpressions);
+  }
+
+  /**
+   * Validate each parameter used in nested function in SELECT clause. Any supplied parameter for a
+   * nested function in a SELECT statement must be a valid qualified name, and the field parameter
+   * must be nested at least one level.
+   *
+   * @param args : Arguments in nested function.
+   */
+  private void validateArgs(List<UnresolvedExpression> args) {
+    if (args.size() < 1 || args.size() > 2) {
+      throw new IllegalArgumentException(
+          "on nested object only allowed 2 parameters (field,path) or 1 parameter (field)");
+    }
+
+    for (int i = 0; i < args.size(); i++) {
+      if (!(args.get(i) instanceof QualifiedName)) {
+        throw new IllegalArgumentException(
+            String.format("Illegal nested field name: %s", args.get(i).toString()));
+      }
+      if (i == 0 && ((QualifiedName) args.get(i)).getParts().size() < 2) {
+        throw new IllegalArgumentException(
+            String.format("Illegal nested field name: %s", args.get(i).toString()));
+      }
+    }
+  }
+
+  /**
+   * Generate nested path dynamically. Assumes at least one level of nesting in supplied string.
+   *
+   * @param field : Nested field to generate path of.
+   * @return : Path of field derived from last level of nesting.
+   */
+  public static ReferenceExpression generatePath(String field) {
+    return new ReferenceExpression(field.substring(0, field.lastIndexOf(".")), STRING);
+  }
+
+  /**
+   * Check if supplied expression is a nested function.
+   *
+   * @param expr Expression checking if is nested function.
+   * @return True if expression is a nested function.
+   */
+  public static Boolean isNestedFunction(Expression expr) {
+    return (expr instanceof FunctionExpression
+        && ((FunctionExpression) expr)
+            .getFunctionName()
+            .getFunctionName()
+            .equalsIgnoreCase(BuiltinFunctionName.NESTED.name()));
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/analysis/QualifierAnalyzer.java b/core/src/main/java/org/opensearch/sql/analysis/QualifierAnalyzer.java
index d1e31d0079..27dd6a2243 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/QualifierAnalyzer.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/QualifierAnalyzer.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import java.util.Arrays;
@@ -15,9 +14,7 @@
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.exception.SemanticCheckException;
 
-/**
- * Analyzer that analyzes qualifier(s) in a full field name.
- */
+/** Analyzer that analyzes qualifier(s) in a full field name. */
 @RequiredArgsConstructor
 public class QualifierAnalyzer {
 
@@ -28,11 +25,11 @@ public String unqualified(String... parts) {
   }
 
   /**
-   * Get unqualified name if its qualifier symbol found is in index namespace
-   * on type environment. Unqualified name means name with qualifier removed.
-   * For example, unqualified name of "accounts.age" or "acc.age" is "age".
+   * Get unqualified name if its qualifier symbol found is in index namespace on type environment.
+   * Unqualified name means name with qualifier removed. For example, unqualified name of
+   * "accounts.age" or "acc.age" is "age".
    *
-   * @return  unqualified name if criteria met above, otherwise original name
+   * @return unqualified name if criteria met above, otherwise original name
    */
   public String unqualified(QualifiedName fullName) {
     return isQualifierIndexOrAlias(fullName) ? fullName.rest().toString() : fullName.toString();
@@ -66,10 +63,11 @@ private void resolveQualifierSymbol(QualifiedName fullName, String qualifier) {
     } catch (SemanticCheckException e) {
       // Throw syntax check intentionally to indicate fall back to old engine.
       // Need change to semantic check exception in future.
-      throw new SyntaxCheckException(String.format(
-          "The qualifier [%s] of qualified name [%s] must be an field name, index name or its "
-              + "alias", qualifier, fullName));
+      throw new SyntaxCheckException(
+          String.format(
+              "The qualifier [%s] of qualified name [%s] must be an field name, index name or its "
+                  + "alias",
+              qualifier, fullName));
     }
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/SelectExpressionAnalyzer.java b/core/src/main/java/org/opensearch/sql/analysis/SelectExpressionAnalyzer.java
index 3593488f46..5e46cfa629 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/SelectExpressionAnalyzer.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/SelectExpressionAnalyzer.java
@@ -3,20 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.analysis.symbol.Namespace;
+import org.opensearch.sql.analysis.symbol.Symbol;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.Alias;
 import org.opensearch.sql.ast.expression.AllFields;
 import org.opensearch.sql.ast.expression.Field;
+import org.opensearch.sql.ast.expression.Function;
+import org.opensearch.sql.ast.expression.NestedAllTupleFields;
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 import org.opensearch.sql.data.type.ExprType;
@@ -26,23 +29,21 @@
 import org.opensearch.sql.expression.ReferenceExpression;
 
 /**
- * Analyze the select list in the {@link AnalysisContext} to construct the list of
- * {@link NamedExpression}.
+ * Analyze the select list in the {@link AnalysisContext} to construct the list of {@link
+ * NamedExpression}.
  */
 @RequiredArgsConstructor
 public class SelectExpressionAnalyzer
-    extends
-    AbstractNodeVisitor<List<NamedExpression>, AnalysisContext> {
+    extends AbstractNodeVisitor<List<NamedExpression>, AnalysisContext> {
   private final ExpressionAnalyzer expressionAnalyzer;
 
   private ExpressionReferenceOptimizer optimizer;
 
-  /**
-   * Analyze Select fields.
-   */
-  public List<NamedExpression> analyze(List<UnresolvedExpression> selectList,
-                                       AnalysisContext analysisContext,
-                                       ExpressionReferenceOptimizer optimizer) {
+  /** Analyze Select fields. */
+  public List<NamedExpression> analyze(
+      List<UnresolvedExpression> selectList,
+      AnalysisContext analysisContext,
+      ExpressionReferenceOptimizer optimizer) {
     this.optimizer = optimizer;
     ImmutableList.Builder<NamedExpression> builder = new ImmutableList.Builder<>();
     for (UnresolvedExpression unresolvedExpression : selectList) {
@@ -58,56 +59,83 @@ public List<NamedExpression> visitField(Field node, AnalysisContext context) {
 
   @Override
   public List<NamedExpression> visitAlias(Alias node, AnalysisContext context) {
+    // Expand all nested fields if used in SELECT clause
+    if (node.getDelegated() instanceof NestedAllTupleFields) {
+      return node.getDelegated().accept(this, context);
+    }
+
     Expression expr = referenceIfSymbolDefined(node, context);
-    return Collections.singletonList(DSL.named(
-        unqualifiedNameIfFieldOnly(node, context),
-        expr,
-        node.getAlias()));
+    return Collections.singletonList(
+        DSL.named(unqualifiedNameIfFieldOnly(node, context), expr, node.getAlias()));
   }
 
   /**
    * The Alias could be
-   * 1. SELECT name, AVG(age) FROM s BY name ->
-   * Project(Alias("name", expr), Alias("AVG(age)", aggExpr))
-   * Agg(Alias("AVG(age)", aggExpr))
-   * 2. SELECT length(name), AVG(age) FROM s BY length(name)
-   * Project(Alias("name", expr), Alias("AVG(age)", aggExpr))
-   * Agg(Alias("AVG(age)", aggExpr))
-   * 3. SELECT length(name) as l, AVG(age) FROM s BY l
-   * Project(Alias("name", expr, l), Alias("AVG(age)", aggExpr))
-   * Agg(Alias("AVG(age)", aggExpr), Alias("length(name)", groupExpr))
+   *
+   * <ol>
+   *   <li>SELECT name, AVG(age) FROM s BY name -> Project(Alias("name", expr), Alias("AVG(age)",
+   *       aggExpr)) Agg(Alias("AVG(age)", aggExpr))
+   *   <li>SELECT length(name), AVG(age) FROM s BY length(name) Project(Alias("name", expr),
+   *       Alias("AVG(age)", aggExpr)) Agg(Alias("AVG(age)", aggExpr))
+   *   <li>SELECT length(name) as l, AVG(age) FROM s BY l Project(Alias("name", expr, l),
+   *       Alias("AVG(age)", aggExpr)) Agg(Alias("AVG(age)", aggExpr), Alias("length(name)",
+   *       groupExpr))
+   * </ol>
    */
-  private Expression referenceIfSymbolDefined(Alias expr,
-                                              AnalysisContext context) {
+  private Expression referenceIfSymbolDefined(Alias expr, AnalysisContext context) {
     UnresolvedExpression delegatedExpr = expr.getDelegated();
 
     // Pass named expression because expression like window function loses full name
     // (OVER clause) and thus depends on name in alias to be replaced correctly
     return optimizer.optimize(
         DSL.named(
-            expr.getName(),
-            delegatedExpr.accept(expressionAnalyzer, context),
-            expr.getAlias()),
+            expr.getName(), delegatedExpr.accept(expressionAnalyzer, context), expr.getAlias()),
         context);
   }
 
   @Override
-  public List<NamedExpression> visitAllFields(AllFields node,
-                                              AnalysisContext context) {
+  public List<NamedExpression> visitAllFields(AllFields node, AnalysisContext context) {
     TypeEnvironment environment = context.peek();
     Map<String, ExprType> lookupAllFields = environment.lookupAllFields(Namespace.FIELD_NAME);
-    return lookupAllFields.entrySet().stream().map(entry -> DSL.named(entry.getKey(),
-        new ReferenceExpression(entry.getKey(), entry.getValue()))).collect(Collectors.toList());
+    return lookupAllFields.entrySet().stream()
+        .map(
+            entry ->
+                DSL.named(
+                    entry.getKey(), new ReferenceExpression(entry.getKey(), entry.getValue())))
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public List<NamedExpression> visitNestedAllTupleFields(
+      NestedAllTupleFields node, AnalysisContext context) {
+    TypeEnvironment environment = context.peek();
+    Map<String, ExprType> lookupAllTupleFields =
+        environment.lookupAllTupleFields(Namespace.FIELD_NAME);
+    environment.resolve(new Symbol(Namespace.FIELD_NAME, node.getPath()));
+
+    // Match all fields with same path as used in nested function.
+    Pattern p = Pattern.compile(node.getPath() + "\\.[^\\.]+$");
+    return lookupAllTupleFields.entrySet().stream()
+        .filter(field -> p.matcher(field.getKey()).find())
+        .map(
+            entry -> {
+              Expression nestedFunc =
+                  new Function(
+                          "nested",
+                          List.of(new QualifiedName(List.of(entry.getKey().split("\\.")))))
+                      .accept(expressionAnalyzer, context);
+              return DSL.named("nested(" + entry.getKey() + ")", nestedFunc);
+            })
+        .collect(Collectors.toList());
   }
 
   /**
-   * Get unqualified name if select item is just a field. For example, suppose an index
-   * named "accounts", return "age" for "SELECT accounts.age". But do nothing for expression
-   * in "SELECT ABS(accounts.age)".
-   * Note that an assumption is made implicitly that original name field in Alias must be
-   * the same as the values in QualifiedName. This is true because AST builder does this.
-   * Otherwise, what unqualified() returns will override Alias's name as NamedExpression's name
-   * even though the QualifiedName doesn't have qualifier.
+   * Get unqualified name if select item is just a field. For example, suppose an index named
+   * "accounts", return "age" for "SELECT accounts.age". But do nothing for expression in "SELECT
+   * ABS(accounts.age)". Note that an assumption is made implicitly that original name field in
+   * Alias must be the same as the values in QualifiedName. This is true because AST builder does
+   * this. Otherwise, what unqualified() returns will override Alias's name as NamedExpression's
+   * name even though the QualifiedName doesn't have qualifier.
    */
   private String unqualifiedNameIfFieldOnly(Alias node, AnalysisContext context) {
     UnresolvedExpression selectItem = node.getDelegated();
@@ -117,5 +145,4 @@ private String unqualifiedNameIfFieldOnly(Alias node, AnalysisContext context) {
     }
     return node.getName();
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/TypeEnvironment.java b/core/src/main/java/org/opensearch/sql/analysis/TypeEnvironment.java
index c86d8109ad..18693a63e6 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/TypeEnvironment.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/TypeEnvironment.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.opensearch.sql.analysis.symbol.Namespace.FIELD_NAME;
@@ -21,19 +20,27 @@
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.env.Environment;
 
-/**
- * The definition of Type Environment.
- */
+/** The definition of Type Environment. */
 public class TypeEnvironment implements Environment<Symbol, ExprType> {
-  @Getter
-  private final TypeEnvironment parent;
+  @Getter private final TypeEnvironment parent;
   private final SymbolTable symbolTable;
 
+  /**
+   * Constructor with empty symbol tables.
+   *
+   * @param parent parent environment
+   */
   public TypeEnvironment(TypeEnvironment parent) {
     this.parent = parent;
     this.symbolTable = new SymbolTable();
   }
 
+  /**
+   * Constructor with empty reserved symbol table.
+   *
+   * @param parent parent environment
+   * @param symbolTable type table
+   */
   public TypeEnvironment(TypeEnvironment parent, SymbolTable symbolTable) {
     this.parent = parent;
     this.symbolTable = symbolTable;
@@ -53,14 +60,14 @@ public ExprType resolve(Symbol symbol) {
         return typeOptional.get();
       }
     }
-    throw new SemanticCheckException(
-        String.format("can't resolve %s in type env", symbol));
+    throw new SemanticCheckException(String.format("can't resolve %s in type env", symbol));
   }
 
   /**
    * Resolve all fields in the current environment.
-   * @param namespace     a namespace
-   * @return              all symbols in the namespace
+   *
+   * @param namespace a namespace
+   * @return all symbols in the namespace
    */
   public Map<String, ExprType> lookupAllFields(Namespace namespace) {
     Map<String, ExprType> result = new LinkedHashMap<>();
@@ -68,11 +75,23 @@ public Map<String, ExprType> lookupAllFields(Namespace namespace) {
     return result;
   }
 
+  /**
+   * Resolve all fields in the current environment.
+   *
+   * @param namespace a namespace
+   * @return all symbols in the namespace
+   */
+  public Map<String, ExprType> lookupAllTupleFields(Namespace namespace) {
+    Map<String, ExprType> result = new LinkedHashMap<>();
+    symbolTable.lookupAllTupleFields(namespace).forEach(result::putIfAbsent);
+    return result;
+  }
+
   /**
    * Define symbol with the type.
    *
    * @param symbol symbol to define
-   * @param type   type
+   * @param type type
    */
   public void define(Symbol symbol, ExprType type) {
     symbolTable.store(symbol, type);
@@ -91,18 +110,13 @@ public void remove(Symbol symbol) {
     symbolTable.remove(symbol);
   }
 
-  /**
-   * Remove ref.
-   */
+  /** Remove ref. */
   public void remove(ReferenceExpression ref) {
     remove(new Symbol(FIELD_NAME, ref.getAttr()));
   }
 
-  /**
-   * Clear all fields in the current environment.
-   */
+  /** Clear all fields in the current environment. */
   public void clearAllFields() {
-    lookupAllFields(FIELD_NAME).keySet().stream()
-            .forEach(v -> remove(new Symbol(Namespace.FIELD_NAME, v)));
+    lookupAllFields(FIELD_NAME).keySet().forEach(v -> remove(new Symbol(Namespace.FIELD_NAME, v)));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/WindowExpressionAnalyzer.java b/core/src/main/java/org/opensearch/sql/analysis/WindowExpressionAnalyzer.java
index 3abcf9e140..c4229e4664 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/WindowExpressionAnalyzer.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/WindowExpressionAnalyzer.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.opensearch.sql.ast.tree.Sort.SortOption.DEFAULT_ASC;
@@ -29,28 +28,25 @@
 import org.opensearch.sql.planner.logical.LogicalWindow;
 
 /**
- * Window expression analyzer that analyzes window function expression in expression list
- * in project operator.
+ * Window expression analyzer that analyzes window function expression in expression list in project
+ * operator.
  */
 @RequiredArgsConstructor
 public class WindowExpressionAnalyzer extends AbstractNodeVisitor<LogicalPlan, AnalysisContext> {
 
-  /**
-   * Expression analyzer.
-   */
+  /** Expression analyzer. */
   private final ExpressionAnalyzer expressionAnalyzer;
 
-  /**
-   * Child node to be wrapped by a new window operator.
-   */
+  /** Child node to be wrapped by a new window operator. */
   private final LogicalPlan child;
 
   /**
-   * Analyze the given project item and return window operator (with child node inside)
-   * if the given project item is a window function.
-   * @param projectItem   project item
-   * @param context       analysis context
-   * @return              window operator or original child if not windowed
+   * Analyze the given project item and return window operator (with child node inside) if the given
+   * project item is a window function.
+   *
+   * @param projectItem project item
+   * @param context analysis context
+   * @return window operator or original child if not windowed
    */
   public LogicalPlan analyze(UnresolvedExpression projectItem, AnalysisContext context) {
     LogicalPlan window = projectItem.accept(this, context);
@@ -77,26 +73,24 @@ public LogicalPlan visitAlias(Alias node, AnalysisContext context) {
       return new LogicalWindow(child, namedWindowFunction, windowDefinition);
     }
     return new LogicalWindow(
-        new LogicalSort(child, allSortItems),
-        namedWindowFunction,
-        windowDefinition);
+        new LogicalSort(child, allSortItems), namedWindowFunction, windowDefinition);
   }
 
   private List<Expression> analyzePartitionList(WindowFunction node, AnalysisContext context) {
-    return node.getPartitionByList()
-               .stream()
-               .map(expr -> expressionAnalyzer.analyze(expr, context))
-               .collect(Collectors.toList());
+    return node.getPartitionByList().stream()
+        .map(expr -> expressionAnalyzer.analyze(expr, context))
+        .collect(Collectors.toList());
   }
 
-  private List<Pair<SortOption, Expression>> analyzeSortList(WindowFunction node,
-                                                             AnalysisContext context) {
-    return node.getSortList()
-               .stream()
-               .map(pair -> ImmutablePair
-                   .of(analyzeSortOption(pair.getLeft()),
-                       expressionAnalyzer.analyze(pair.getRight(), context)))
-               .collect(Collectors.toList());
+  private List<Pair<SortOption, Expression>> analyzeSortList(
+      WindowFunction node, AnalysisContext context) {
+    return node.getSortList().stream()
+        .map(
+            pair ->
+                ImmutablePair.of(
+                    analyzeSortOption(pair.getLeft()),
+                    expressionAnalyzer.analyze(pair.getRight(), context)))
+        .collect(Collectors.toList());
   }
 
   /**
@@ -107,9 +101,6 @@ private SortOption analyzeSortOption(SortOption option) {
     if (option.getNullOrder() == null) {
       return (option.getSortOrder() == DESC) ? DEFAULT_DESC : DEFAULT_ASC;
     }
-    return new SortOption(
-        (option.getSortOrder() == DESC) ? DESC : ASC,
-        option.getNullOrder());
+    return new SortOption((option.getSortOrder() == DESC) ? DESC : ASC, option.getNullOrder());
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/symbol/Namespace.java b/core/src/main/java/org/opensearch/sql/analysis/symbol/Namespace.java
index b5203033a8..e8a7454014 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/symbol/Namespace.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/symbol/Namespace.java
@@ -3,16 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis.symbol;
 
-/**
- * Namespace of symbol to avoid naming conflict.
- */
+/** Namespace of symbol to avoid naming conflict. */
 public enum Namespace {
-
   INDEX_NAME("Index"),
   FIELD_NAME("Field"),
+  HIDDEN_FIELD_NAME("HiddenField"),
   FUNCTION_NAME("Function");
 
   private final String name;
@@ -20,5 +17,4 @@ public enum Namespace {
   Namespace(String name) {
     this.name = name;
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/symbol/Symbol.java b/core/src/main/java/org/opensearch/sql/analysis/symbol/Symbol.java
index 8cc9505710..98fa4b3569 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/symbol/Symbol.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/symbol/Symbol.java
@@ -3,16 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis.symbol;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
-/**
- * Symbol in the scope.
- */
+/** Symbol in the scope. */
 @ToString
 @Getter
 @RequiredArgsConstructor
diff --git a/core/src/main/java/org/opensearch/sql/analysis/symbol/SymbolTable.java b/core/src/main/java/org/opensearch/sql/analysis/symbol/SymbolTable.java
index 45f77915f2..8bb6824a63 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/symbol/SymbolTable.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/symbol/SymbolTable.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis.symbol;
 
 import static java.util.Collections.emptyMap;
@@ -17,21 +16,16 @@
 import java.util.TreeMap;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Symbol table for symbol definition and resolution.
- */
+/** Symbol table for symbol definition and resolution. */
 public class SymbolTable {
 
-  /**
-   * Two-dimension hash table to manage symbols with type in different namespace.
-   */
+  /** Two-dimension hash table to manage symbols with type in different namespace. */
   private Map<Namespace, NavigableMap<String, ExprType>> tableByNamespace =
       new EnumMap<>(Namespace.class);
 
   /**
-   * Two-dimension hash table to manage symbols with type in different namespace.
-   * Comparing with tableByNamespace, orderedTable use the LinkedHashMap to keep the order of
-   * symbol.
+   * Two-dimension hash table to manage symbols with type in different namespace. Comparing with
+   * tableByNamespace, orderedTable use the LinkedHashMap to keep the order of symbol.
    */
   private Map<Namespace, LinkedHashMap<String, ExprType>> orderedTable =
       new EnumMap<>(Namespace.class);
@@ -40,38 +34,32 @@ public class SymbolTable {
    * Store symbol with the type. Create new map for namespace for the first time.
    *
    * @param symbol symbol to define
-   * @param type   symbol type
+   * @param type symbol type
    */
   public void store(Symbol symbol, ExprType type) {
-    tableByNamespace.computeIfAbsent(
-        symbol.getNamespace(),
-        ns -> new TreeMap<>()
-    ).put(symbol.getName(), type);
+    tableByNamespace
+        .computeIfAbsent(symbol.getNamespace(), ns -> new TreeMap<>())
+        .put(symbol.getName(), type);
 
-    orderedTable.computeIfAbsent(
-        symbol.getNamespace(),
-        ns -> new LinkedHashMap<>()
-    ).put(symbol.getName(), type);
+    orderedTable
+        .computeIfAbsent(symbol.getNamespace(), ns -> new LinkedHashMap<>())
+        .put(symbol.getName(), type);
   }
 
-  /**
-   * Remove a symbol from SymbolTable.
-   */
+  /** Remove a symbol from SymbolTable. */
   public void remove(Symbol symbol) {
     tableByNamespace.computeIfPresent(
         symbol.getNamespace(),
         (k, v) -> {
           v.remove(symbol.getName());
           return v;
-        }
-    );
+        });
     orderedTable.computeIfPresent(
         symbol.getNamespace(),
         (k, v) -> {
           v.remove(symbol.getName());
           return v;
-        }
-    );
+        });
   }
 
   /**
@@ -104,30 +92,45 @@ public Map<String, ExprType> lookupByPrefix(Symbol prefix) {
   }
 
   /**
-   * Look up all top level symbols in the namespace.
-   * this function is mainly used by SELECT * use case to get the top level fields
-   * Todo. currently, the top level fields is the field which doesn't include "." in the name or
-   * the prefix doesn't exist in the symbol table.
-   * e.g. The symbol table includes person, person.name, person/2.0.
-   * person, is the top level field
-   * person.name, isn't the top level field, because the prefix (person) in symbol table
-   * person/2.0, is the top level field, because the prefix (person/2) isn't in symbol table
+   * Look up all top level symbols in the namespace. this function is mainly used by SELECT * use
+   * case to get the top level fields Todo. currently, the top level fields is the field which
+   * doesn't include "." in the name or the prefix doesn't exist in the symbol table. e.g. The
+   * symbol table includes person, person.name, person/2.0. person, is the top level field
+   * person.name, isn't the top level field, because the prefix (person) in symbol table person/2.0,
+   * is the top level field, because the prefix (person/2) isn't in symbol table
    *
-   * @param namespace     a namespace
-   * @return              all symbols in the namespace map
+   * @param namespace a namespace
+   * @return all symbols in the namespace map
    */
   public Map<String, ExprType> lookupAllFields(Namespace namespace) {
     final LinkedHashMap<String, ExprType> allSymbols =
         orderedTable.getOrDefault(namespace, new LinkedHashMap<>());
     final LinkedHashMap<String, ExprType> results = new LinkedHashMap<>();
-    allSymbols.entrySet().stream().filter(entry -> {
-      String symbolName = entry.getKey();
-      int lastDot = symbolName.lastIndexOf(".");
-      return -1 == lastDot || !allSymbols.containsKey(symbolName.substring(0, lastDot));
-    }).forEach(entry -> results.put(entry.getKey(), entry.getValue()));
+    allSymbols.entrySet().stream()
+        .filter(
+            entry -> {
+              String symbolName = entry.getKey();
+              int lastDot = symbolName.lastIndexOf(".");
+              return -1 == lastDot || !allSymbols.containsKey(symbolName.substring(0, lastDot));
+            })
+        .forEach(entry -> results.put(entry.getKey(), entry.getValue()));
     return results;
   }
 
+  /**
+   * Look up all top level symbols in the namespace.
+   *
+   * @param namespace a namespace
+   * @return all symbols in the namespace map
+   */
+  public Map<String, ExprType> lookupAllTupleFields(Namespace namespace) {
+    final LinkedHashMap<String, ExprType> allSymbols =
+        orderedTable.getOrDefault(namespace, new LinkedHashMap<>());
+    final LinkedHashMap<String, ExprType> result = new LinkedHashMap<>();
+    allSymbols.entrySet().stream().forEach(entry -> result.put(entry.getKey(), entry.getValue()));
+    return result;
+  }
+
   /**
    * Check if namespace map in empty (none definition).
    *
diff --git a/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java b/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java
index fe993c899e..973b10310b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast;
 
 import org.opensearch.sql.ast.expression.AggregateFunction;
@@ -12,6 +11,7 @@
 import org.opensearch.sql.ast.expression.And;
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.AttributeList;
+import org.opensearch.sql.ast.expression.Between;
 import org.opensearch.sql.ast.expression.Case;
 import org.opensearch.sql.ast.expression.Cast;
 import org.opensearch.sql.ast.expression.Compare;
@@ -24,10 +24,12 @@
 import org.opensearch.sql.ast.expression.Let;
 import org.opensearch.sql.ast.expression.Literal;
 import org.opensearch.sql.ast.expression.Map;
+import org.opensearch.sql.ast.expression.NestedAllTupleFields;
 import org.opensearch.sql.ast.expression.Not;
 import org.opensearch.sql.ast.expression.Or;
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.RelevanceFieldList;
+import org.opensearch.sql.ast.expression.ScoreFunction;
 import org.opensearch.sql.ast.expression.Span;
 import org.opensearch.sql.ast.expression.UnresolvedArgument;
 import org.opensearch.sql.ast.expression.UnresolvedAttribute;
@@ -39,13 +41,16 @@
 import org.opensearch.sql.ast.statement.Statement;
 import org.opensearch.sql.ast.tree.AD;
 import org.opensearch.sql.ast.tree.Aggregation;
+import org.opensearch.sql.ast.tree.CloseCursor;
 import org.opensearch.sql.ast.tree.Dedupe;
 import org.opensearch.sql.ast.tree.Eval;
+import org.opensearch.sql.ast.tree.FetchCursor;
 import org.opensearch.sql.ast.tree.Filter;
 import org.opensearch.sql.ast.tree.Head;
 import org.opensearch.sql.ast.tree.Kmeans;
 import org.opensearch.sql.ast.tree.Limit;
 import org.opensearch.sql.ast.tree.ML;
+import org.opensearch.sql.ast.tree.Paginate;
 import org.opensearch.sql.ast.tree.Parse;
 import org.opensearch.sql.ast.tree.Project;
 import org.opensearch.sql.ast.tree.RareTopN;
@@ -56,9 +61,7 @@
 import org.opensearch.sql.ast.tree.TableFunction;
 import org.opensearch.sql.ast.tree.Values;
 
-/**
- * AST nodes visitor Defines the traverse path.
- */
+/** AST nodes visitor Defines the traverse path. */
 public abstract class AbstractNodeVisitor<T, C> {
 
   public T visit(Node node, C context) {
@@ -67,6 +70,7 @@ public T visit(Node node, C context) {
 
   /**
    * Visit child node.
+   *
    * @param node {@link Node}
    * @param context Context
    * @return Return Type.
@@ -173,6 +177,10 @@ public T visitCompare(Compare node, C context) {
     return visitChildren(node, context);
   }
 
+  public T visitBetween(Between node, C context) {
+    return visitChildren(node, context);
+  }
+
   public T visitArgument(Argument node, C context) {
     return visitChildren(node, context);
   }
@@ -229,6 +237,10 @@ public T visitAllFields(AllFields node, C context) {
     return visitChildren(node, context);
   }
 
+  public T visitNestedAllTupleFields(NestedAllTupleFields node, C context) {
+    return visitChildren(node, context);
+  }
+
   public T visitInterval(Interval node, C context) {
     return visitChildren(node, context);
   }
@@ -273,6 +285,10 @@ public T visitHighlightFunction(HighlightFunction node, C context) {
     return visitChildren(node, context);
   }
 
+  public T visitScoreFunction(ScoreFunction node, C context) {
+    return visitChildren(node, context);
+  }
+
   public T visitStatement(Statement node, C context) {
     return visit(node, context);
   }
@@ -284,4 +300,16 @@ public T visitQuery(Query node, C context) {
   public T visitExplain(Explain node, C context) {
     return visitStatement(node, context);
   }
+
+  public T visitPaginate(Paginate paginate, C context) {
+    return visitChildren(paginate, context);
+  }
+
+  public T visitFetchCursor(FetchCursor cursor, C context) {
+    return visitChildren(cursor, context);
+  }
+
+  public T visitCloseCursor(CloseCursor closeCursor, C context) {
+    return visitChildren(closeCursor, context);
+  }
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/Node.java b/core/src/main/java/org/opensearch/sql/ast/Node.java
index f3147eeb43..faaf51f221 100644
--- a/core/src/main/java/org/opensearch/sql/ast/Node.java
+++ b/core/src/main/java/org/opensearch/sql/ast/Node.java
@@ -3,16 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast;
 
 import java.util.List;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-/**
- * AST node.
- */
+/** AST node. */
 @EqualsAndHashCode
 @ToString
 public abstract class Node {
diff --git a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
index 2959cae4a1..830dbf0a65 100644
--- a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
+++ b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.dsl;
 
 import java.util.Arrays;
@@ -16,6 +15,7 @@
 import org.opensearch.sql.ast.expression.AllFields;
 import org.opensearch.sql.ast.expression.And;
 import org.opensearch.sql.ast.expression.Argument;
+import org.opensearch.sql.ast.expression.Between;
 import org.opensearch.sql.ast.expression.Case;
 import org.opensearch.sql.ast.expression.Cast;
 import org.opensearch.sql.ast.expression.Compare;
@@ -29,10 +29,12 @@
 import org.opensearch.sql.ast.expression.Let;
 import org.opensearch.sql.ast.expression.Literal;
 import org.opensearch.sql.ast.expression.Map;
+import org.opensearch.sql.ast.expression.NestedAllTupleFields;
 import org.opensearch.sql.ast.expression.Not;
 import org.opensearch.sql.ast.expression.Or;
 import org.opensearch.sql.ast.expression.ParseMethod;
 import org.opensearch.sql.ast.expression.QualifiedName;
+import org.opensearch.sql.ast.expression.ScoreFunction;
 import org.opensearch.sql.ast.expression.Span;
 import org.opensearch.sql.ast.expression.SpanUnit;
 import org.opensearch.sql.ast.expression.UnresolvedArgument;
@@ -60,9 +62,7 @@
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.ast.tree.Values;
 
-/**
- * Class of static methods to create specific node instances.
- */
+/** Class of static methods to create specific node instances. */
 @UtilityClass
 public class AstDSL {
 
@@ -129,8 +129,9 @@ public static UnresolvedPlan rename(UnresolvedPlan input, Map... maps) {
 
   /**
    * Initialize Values node by rows of literals.
-   * @param values  rows in which each row is a list of literal values
-   * @return       Values node
+   *
+   * @param values rows in which each row is a list of literal values
+   * @return Values node
    */
   @SafeVarargs
   public UnresolvedPlan values(List<Literal>... values) {
@@ -246,27 +247,33 @@ public static Function function(String funcName, UnresolvedExpression... funcArg
   }
 
   /**
+   *
+   *
+   * <pre>
    * CASE
    *     WHEN search_condition THEN result_expr
    *     [WHEN search_condition THEN result_expr] ...
    *     [ELSE result_expr]
    * END
+   * </pre>
    */
-  public UnresolvedExpression caseWhen(UnresolvedExpression elseClause,
-                                       When... whenClauses) {
+  public UnresolvedExpression caseWhen(UnresolvedExpression elseClause, When... whenClauses) {
     return caseWhen(null, elseClause, whenClauses);
   }
 
   /**
+   *
+   *
+   * <pre>
    * CASE case_value_expr
    *     WHEN compare_expr THEN result_expr
    *     [WHEN compare_expr THEN result_expr] ...
    *     [ELSE result_expr]
    * END
+   * </pre>
    */
-  public UnresolvedExpression caseWhen(UnresolvedExpression caseValueExpr,
-                                       UnresolvedExpression elseClause,
-                                       When... whenClauses) {
+  public UnresolvedExpression caseWhen(
+      UnresolvedExpression caseValueExpr, UnresolvedExpression elseClause, When... whenClauses) {
     return new Case(caseValueExpr, Arrays.asList(whenClauses), elseClause);
   }
 
@@ -278,14 +285,20 @@ public When when(UnresolvedExpression condition, UnresolvedExpression result) {
     return new When(condition, result);
   }
 
-  public UnresolvedExpression highlight(UnresolvedExpression fieldName,
-      java.util.Map<String, Literal> arguments) {
+  public UnresolvedExpression highlight(
+      UnresolvedExpression fieldName, java.util.Map<String, Literal> arguments) {
     return new HighlightFunction(fieldName, arguments);
   }
 
-  public UnresolvedExpression window(UnresolvedExpression function,
-                                     List<UnresolvedExpression> partitionByList,
-                                     List<Pair<SortOption, UnresolvedExpression>> sortList) {
+  public UnresolvedExpression score(
+      UnresolvedExpression relevanceQuery, Literal relevanceFieldWeight) {
+    return new ScoreFunction(relevanceQuery, relevanceFieldWeight);
+  }
+
+  public UnresolvedExpression window(
+      UnresolvedExpression function,
+      List<UnresolvedExpression> partitionByList,
+      List<Pair<SortOption, UnresolvedExpression>> sortList) {
     return new WindowFunction(function, partitionByList, sortList);
   }
 
@@ -320,6 +333,13 @@ public static UnresolvedExpression compare(
     return new Compare(operator, left, right);
   }
 
+  public static UnresolvedExpression between(
+      UnresolvedExpression value,
+      UnresolvedExpression lowerBound,
+      UnresolvedExpression upperBound) {
+    return new Between(value, lowerBound, upperBound);
+  }
+
   public static Argument argument(String argName, Literal argValue) {
     return new Argument(argName, argValue);
   }
@@ -364,6 +384,10 @@ public Alias alias(String name, UnresolvedExpression expr, String alias) {
     return new Alias(name, expr, alias);
   }
 
+  public NestedAllTupleFields nestedAllTupleFields(String path) {
+    return new NestedAllTupleFields(path);
+  }
+
   public static List<UnresolvedExpression> exprList(UnresolvedExpression... exprList) {
     return Arrays.asList(exprList);
   }
@@ -380,9 +404,7 @@ public static List<Argument> defaultFieldsArgs() {
     return exprList(argument("exclude", booleanLiteral(false)));
   }
 
-  /**
-   * Default Stats Command Args.
-   */
+  /** Default Stats Command Args. */
   public static List<Argument> defaultStatsArgs() {
     return exprList(
         argument("partitions", intLiteral(1)),
@@ -391,9 +413,7 @@ public static List<Argument> defaultStatsArgs() {
         argument("dedupsplit", booleanLiteral(false)));
   }
 
-  /**
-   * Default Dedup Command Args.
-   */
+  /** Default Dedup Command Args. */
   public static List<Argument> defaultDedupArgs() {
     return exprList(
         argument("number", intLiteral(1)),
@@ -429,9 +449,12 @@ public static List<Argument> defaultTopArgs() {
     return exprList(argument("noOfResults", intLiteral(10)));
   }
 
-  public static RareTopN rareTopN(UnresolvedPlan input, CommandType commandType,
-                                  List<Argument> noOfResults, List<UnresolvedExpression> groupList,
-                                  Field... fields) {
+  public static RareTopN rareTopN(
+      UnresolvedPlan input,
+      CommandType commandType,
+      List<Argument> noOfResults,
+      List<UnresolvedExpression> groupList,
+      Field... fields) {
     return new RareTopN(input, commandType, noOfResults, Arrays.asList(fields), groupList)
         .attach(input);
   }
@@ -440,11 +463,12 @@ public static Limit limit(UnresolvedPlan input, Integer limit, Integer offset) {
     return new Limit(limit, offset).attach(input);
   }
 
-  public static Parse parse(UnresolvedPlan input, ParseMethod parseMethod,
-                                  UnresolvedExpression sourceField,
-                                  Literal pattern,
-                                  java.util.Map<String, Literal> arguments) {
+  public static Parse parse(
+      UnresolvedPlan input,
+      ParseMethod parseMethod,
+      UnresolvedExpression sourceField,
+      Literal pattern,
+      java.util.Map<String, Literal> arguments) {
     return new Parse(parseMethod, sourceField, pattern, arguments, input);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java
index e8f730d7e9..5208e39623 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Collections;
@@ -17,8 +16,8 @@
 import org.opensearch.sql.common.utils.StringUtils;
 
 /**
- * Expression node of aggregate functions.
- * Params include aggregate function name (AVG, SUM, MAX etc.) and the field to aggregate.
+ * Expression node of aggregate functions. Params include aggregate function name (AVG, SUM, MAX
+ * etc.) and the field to aggregate.
  */
 @Getter
 @EqualsAndHashCode(callSuper = false)
@@ -27,13 +26,16 @@ public class AggregateFunction extends UnresolvedExpression {
   private final String funcName;
   private final UnresolvedExpression field;
   private final List<UnresolvedExpression> argList;
+
   @Setter
   @Accessors(fluent = true)
   private UnresolvedExpression condition;
+
   private Boolean distinct = false;
 
   /**
    * Constructor.
+   *
    * @param funcName function name.
    * @param field {@link UnresolvedExpression}.
    */
@@ -45,6 +47,7 @@ public AggregateFunction(String funcName, UnresolvedExpression field) {
 
   /**
    * Constructor.
+   *
    * @param funcName function name.
    * @param field {@link UnresolvedExpression}.
    * @param distinct whether distinct field is specified or not.
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java b/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java
index 4183b19a3e..7b3078629b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import lombok.AllArgsConstructor;
@@ -14,10 +13,10 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Alias abstraction that associate an unnamed expression with a name and an optional alias.
- * The name and alias information preserved is useful for semantic analysis and response
- * formatting eventually. This can avoid restoring the info in toString() method which is
- * inaccurate because original info is already lost.
+ * Alias abstraction that associate an unnamed expression with a name and an optional alias. The
+ * name and alias information preserved is useful for semantic analysis and response formatting
+ * eventually. This can avoid restoring the info in toString() method which is inaccurate because
+ * original info is already lost.
  */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
@@ -26,19 +25,13 @@
 @ToString
 public class Alias extends UnresolvedExpression {
 
-  /**
-   * Original field name.
-   */
+  /** Original field name. */
   private final String name;
 
-  /**
-   * Expression aliased.
-   */
+  /** Expression aliased. */
   private final UnresolvedExpression delegated;
 
-  /**
-   * Optional field alias.
-   */
+  /** Optional field alias. */
   private String alias;
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java b/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java
index 1f5d919817..b9b90ea24a 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Collections;
@@ -13,16 +12,13 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * Represent the All fields which is been used in SELECT *.
- */
+/** Represent the All fields which is been used in SELECT *. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 public class AllFields extends UnresolvedExpression {
   public static final AllFields INSTANCE = new AllFields();
 
-  private AllFields() {
-  }
+  private AllFields() {}
 
   public static AllFields of() {
     return INSTANCE;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/And.java b/core/src/main/java/org/opensearch/sql/ast/expression/And.java
index 8d8c48f3b2..565f1eb4ab 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/And.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/And.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of logic AND.
- */
+/** Expression node of logic AND. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java b/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java
index f054710a32..4c2a485ea7 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Argument.
- */
+/** Argument. */
 @Getter
 @ToString
 @RequiredArgsConstructor
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java b/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java
index 7e1fdb1516..d137a83957 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -14,15 +13,12 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node that includes a list of Expression nodes.
- */
+/** Expression node that includes a list of Expression nodes. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @AllArgsConstructor
 public class AttributeList extends UnresolvedExpression {
-  @Getter
-  private List<UnresolvedExpression> attrList;
+  @Getter private List<UnresolvedExpression> attrList;
 
   @Override
   public List<UnresolvedExpression> getChild() {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Between.java b/core/src/main/java/org/opensearch/sql/ast/expression/Between.java
new file mode 100644
index 0000000000..e13c3fb187
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Between.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.ast.expression;
+
+import java.util.Arrays;
+import java.util.List;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.opensearch.sql.ast.AbstractNodeVisitor;
+import org.opensearch.sql.ast.Node;
+
+/** Unresolved expression for BETWEEN. */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Between extends UnresolvedExpression {
+
+  /** Value for range check. */
+  private final UnresolvedExpression value;
+
+  /** Lower bound of the range (inclusive). */
+  private final UnresolvedExpression lowerBound;
+
+  /** Upper bound of the range (inclusive). */
+  private final UnresolvedExpression upperBound;
+
+  @Override
+  public List<? extends Node> getChild() {
+    return Arrays.asList(value, lowerBound, upperBound);
+  }
+
+  @Override
+  public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
+    return nodeVisitor.visitBetween(this, context);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Case.java b/core/src/main/java/org/opensearch/sql/ast/expression/Case.java
index 81c74f3ea4..583bd0de97 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Case.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Case.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -15,29 +14,23 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * AST node that represents CASE clause similar as Switch statement in programming language.
- */
+/** AST node that represents CASE clause similar as Switch statement in programming language. */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Getter
 @ToString
 public class Case extends UnresolvedExpression {
 
-  /**
-   * Value to be compared by WHEN statements. Null in the case of CASE WHEN conditions.
-   */
+  /** Value to be compared by WHEN statements. Null in the case of CASE WHEN conditions. */
   private final UnresolvedExpression caseValue;
 
   /**
-   * Expression list that represents WHEN statements. Each is a mapping from condition
-   * to its result.
+   * Expression list that represents WHEN statements. Each is a mapping from condition to its
+   * result.
    */
   private final List<When> whenClauses;
 
-  /**
-   * Expression that represents ELSE statement result.
-   */
+  /** Expression that represents ELSE statement result. */
   private final UnresolvedExpression elseClause;
 
   @Override
@@ -58,5 +51,4 @@ public List<? extends Node> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitCase(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java b/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
index 3acbe68d45..2019346fb5 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import static org.opensearch.sql.expression.function.BuiltinFunctionName.CAST_TO_BOOLEAN;
@@ -33,9 +32,7 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.function.FunctionName;
 
-/**
- * AST node that represents Cast clause.
- */
+/** AST node that represents Cast clause. */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Getter
@@ -59,19 +56,16 @@ public class Cast extends UnresolvedExpression {
           .put("datetime", CAST_TO_DATETIME.getName())
           .build();
 
-  /**
-   * The source expression cast from.
-   */
+  /** The source expression cast from. */
   private final UnresolvedExpression expression;
 
-  /**
-   * Expression that represents ELSE statement result.
-   */
+  /** Expression that represents name of the target type. */
   private final UnresolvedExpression convertedType;
 
   /**
    * Check if the given function name is a cast function or not.
-   * @param name  function name
+   *
+   * @param name function name
    * @return true if cast function, otherwise false.
    */
   public static boolean isCastFunction(FunctionName name) {
@@ -80,7 +74,8 @@ public static boolean isCastFunction(FunctionName name) {
 
   /**
    * Get the cast function name for a given target data type.
-   * @param targetType  target data type
+   *
+   * @param targetType target data type
    * @return cast function name corresponding
    */
   public static FunctionName getCastFunctionName(ExprType targetType) {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java b/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java
index 25cf3e0f73..8ba6ba5116 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java b/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java
index 8755a15177..0b9add8f55 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java
@@ -3,17 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.data.type.ExprCoreType;
 
-/**
- * The DataType defintion in AST.
- * Question, could we use {@link ExprCoreType} directly in AST?
- */
+/** The DataType defintion in AST. Question, could we use {@link ExprCoreType} directly in AST? */
 @RequiredArgsConstructor
 public enum DataType {
   TYPE_ERROR(ExprCoreType.UNKNOWN),
@@ -32,6 +28,5 @@ public enum DataType {
   TIMESTAMP(ExprCoreType.TIMESTAMP),
   INTERVAL(ExprCoreType.INTERVAL);
 
-  @Getter
-  private final ExprCoreType coreType;
+  @Getter private final ExprCoreType coreType;
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java b/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java
index 806f897abf..344f3c5164 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,17 +13,13 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of binary operator or comparison relation EQUAL.
- */
+/** Expression node of binary operator or comparison relation EQUAL. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @AllArgsConstructor
 public class EqualTo extends UnresolvedExpression {
-  @Getter
-  private UnresolvedExpression left;
-  @Getter
-  private UnresolvedExpression right;
+  @Getter private UnresolvedExpression left;
+  @Getter private UnresolvedExpression right;
 
   @Override
   public List<UnresolvedExpression> getChild() {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Field.java b/core/src/main/java/org/opensearch/sql/ast/expression/Field.java
index 9a8109fbe3..0a2d726ad4 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Field.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Field.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -23,16 +22,12 @@ public class Field extends UnresolvedExpression {
 
   private final List<Argument> fieldArgs;
 
-  /**
-   * Constructor of Field.
-   */
+  /** Constructor of Field. */
   public Field(UnresolvedExpression field) {
     this(field, Collections.emptyList());
   }
 
-  /**
-   * Constructor of Field.
-   */
+  /** Constructor of Field. */
   public Field(UnresolvedExpression field, List<Argument> fieldArgs) {
     this.field = field;
     this.fieldArgs = fieldArgs;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Function.java b/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
index c712d860f4..184342c5e3 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Collections;
@@ -14,10 +13,9 @@
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-
 /**
- * Expression node of scalar function.
- * Params include function name (@funcName) and function arguments (@funcArgs)
+ * Expression node of scalar function. Params include function name (@funcName) and function
+ * arguments (@funcArgs)
  */
 @Getter
 @EqualsAndHashCode(callSuper = false)
@@ -38,9 +36,8 @@ public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
 
   @Override
   public String toString() {
-    return String.format("%s(%s)", funcName,
-        funcArgs.stream()
-            .map(Object::toString)
-            .collect(Collectors.joining(", ")));
+    return String.format(
+        "%s(%s)",
+        funcName, funcArgs.stream().map(Object::toString).collect(Collectors.joining(", ")));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java
index 0d4e57a78c..128d9327e8 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java
@@ -13,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of Highlight function.
- */
+/** Expression node of Highlight function. */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Getter
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/In.java b/core/src/main/java/org/opensearch/sql/ast/expression/In.java
index 9ce1c124cb..38c1b91b43 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/In.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/In.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -15,10 +14,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Expression node of one-to-many mapping relation IN.
- * Params include the field expression and/or wildcard field expression,
- * nested field expression (@field).
- * And the values that the field is mapped to (@valueList).
+ * Expression node of one-to-many mapping relation IN. Params include the field expression and/or
+ * wildcard field expression, nested field expression (@field). And the values that the field is
+ * mapped to (@valueList).
  */
 @Getter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java b/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java
index 84b6ba02d1..c26f829f48 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Collections;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java b/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
index 2a86c89cf6..19e1b07e39 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -13,7 +12,7 @@
 
 @Getter
 @RequiredArgsConstructor
-public enum  IntervalUnit {
+public enum IntervalUnit {
   UNKNOWN,
 
   MICROSECOND,
@@ -44,9 +43,7 @@ public enum  IntervalUnit {
     INTERVAL_UNITS = builder.add(IntervalUnit.values()).build();
   }
 
-  /**
-   * Util method to get interval unit given the unit name.
-   */
+  /** Util method to get interval unit given the unit name. */
   public static IntervalUnit of(String unit) {
     return INTERVAL_UNITS.stream()
         .filter(v -> unit.equalsIgnoreCase(v.name()))
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Let.java b/core/src/main/java/org/opensearch/sql/ast/expression/Let.java
index cea2a091e5..2f63a25f10 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Let.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Let.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Represent the assign operation. e.g. velocity = distance/speed.
- */
+/** Represent the assign operation. e.g. velocity = distance/speed. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java b/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java
index 3ff360dbf0..80c877dd97 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -14,9 +13,8 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Expression node of literal type
- * Params include literal value (@value) and
- * literal data type (@type) which can be selected from {@link DataType}.
+ * Expression node of literal type Params include literal value (@value) and literal data type
+ * (@type) which can be selected from {@link DataType}.
  */
 @Getter
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Map.java b/core/src/main/java/org/opensearch/sql/ast/expression/Map.java
index 45e98f127f..73d8d77261 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Map.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Map.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of one-to-one mapping relation.
- */
+/** Expression node of one-to-one mapping relation. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java b/core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java
new file mode 100644
index 0000000000..be89dd9f19
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.ast.expression;
+
+import java.util.Collections;
+import java.util.List;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.ast.AbstractNodeVisitor;
+import org.opensearch.sql.ast.Node;
+
+/** Represents all tuple fields used in nested function. */
+@RequiredArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class NestedAllTupleFields extends UnresolvedExpression {
+  @Getter private final String path;
+
+  @Override
+  public List<? extends Node> getChild() {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
+    return nodeVisitor.visitNestedAllTupleFields(this, context);
+  }
+
+  @Override
+  public String toString() {
+    return String.format("nested(%s.*)", path);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Not.java b/core/src/main/java/org/opensearch/sql/ast/expression/Not.java
index 2926c7e5cd..423cb088ef 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Not.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Not.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of the logic NOT.
- */
+/** Expression node of the logic NOT. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Or.java b/core/src/main/java/org/opensearch/sql/ast/expression/Or.java
index b0dabb6e4e..cc59170d31 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Or.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Or.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of the logic OR.
- */
+/** Expression node of the logic OR. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java b/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java
index 83a46323e6..7a2587c5f0 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import lombok.Getter;
@@ -15,6 +14,5 @@ public enum ParseMethod {
   GROK("grok"),
   PATTERNS("patterns");
 
-  @Getter
-  private final String name;
+  @Getter private final String name;
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java b/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java
index 8b16119dc0..55784d8113 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import static java.util.Objects.requireNonNull;
@@ -29,9 +28,7 @@ public QualifiedName(String name) {
     this.parts = Collections.singletonList(name);
   }
 
-  /**
-   * QualifiedName Constructor.
-   */
+  /** QualifiedName Constructor. */
   public QualifiedName(Iterable<String> parts) {
     List<String> partsList = StreamSupport.stream(parts.spliterator(), false).collect(toList());
     if (partsList.isEmpty()) {
@@ -40,9 +37,7 @@ public QualifiedName(Iterable<String> parts) {
     this.parts = partsList;
   }
 
-  /**
-   * Construct {@link QualifiedName} from list of string.
-   */
+  /** Construct {@link QualifiedName} from list of string. */
   public static QualifiedName of(String first, String... rest) {
     requireNonNull(first);
     ArrayList<String> parts = new ArrayList<>();
@@ -55,9 +50,7 @@ public static QualifiedName of(Iterable<String> parts) {
     return new QualifiedName(parts);
   }
 
-  /**
-   * Get Prefix of {@link QualifiedName}.
-   */
+  /** Get Prefix of {@link QualifiedName}. */
   public Optional<QualifiedName> getPrefix() {
     if (parts.size() == 1) {
       return Optional.empty();
@@ -71,7 +64,8 @@ public String getSuffix() {
 
   /**
    * Get first part of the qualified name.
-   * @return  first part
+   *
+   * @return first part
    */
   public Optional<String> first() {
     if (parts.size() == 1) {
@@ -81,17 +75,19 @@ public Optional<String> first() {
   }
 
   /**
-   * Get rest parts of the qualified name. Assume that there must be remaining parts
-   * so caller is responsible for the check (first() or size() must be called first).
+   * <pre>
+   * Get rest parts of the qualified name. Assume that there must be remaining parts so caller is
+   * responsible for the check (first() or size() must be called first).
    * For example:
    * {@code
-   *   QualifiedName name = ...
-   *   Optional<String> first = name.first();
-   *   if (first.isPresent()) {
-   *     name.rest() ...
-   *   }
+   * QualifiedName name = ...
+   * Optional<String> first = name.first();
+   * if (first.isPresent()) {
+   *    name.rest() ...
+   * }
    * }
    * @return  rest part(s)
+   * </pre>
    */
   public QualifiedName rest() {
     return QualifiedName.of(parts.subList(1, parts.size()));
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java b/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
index 3166fe45c3..a9e26a611f 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.List;
@@ -13,14 +12,11 @@
 import lombok.Getter;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node that includes a list of RelevanceField nodes.
- */
+/** Expression node that includes a list of RelevanceField nodes. */
 @EqualsAndHashCode(callSuper = false)
 @AllArgsConstructor
 public class RelevanceFieldList extends UnresolvedExpression {
-  @Getter
-  private java.util.Map<String, Float> fieldList;
+  @Getter private java.util.Map<String, Float> fieldList;
 
   @Override
   public List<UnresolvedExpression> getChild() {
@@ -34,9 +30,7 @@ public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
 
   @Override
   public String toString() {
-    return fieldList
-        .entrySet()
-        .stream()
+    return fieldList.entrySet().stream()
         .map(e -> String.format("\"%s\" ^ %s", e.getKey(), e.getValue()))
         .collect(Collectors.joining(", "));
   }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/ScoreFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/ScoreFunction.java
new file mode 100644
index 0000000000..26d784dd8c
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/ScoreFunction.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.ast.expression;
+
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import org.opensearch.sql.ast.AbstractNodeVisitor;
+
+/**
+ * Expression node of Score function. Score takes a relevance-search expression as an argument and
+ * returns it
+ */
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Getter
+@ToString
+public class ScoreFunction extends UnresolvedExpression {
+  private final UnresolvedExpression relevanceQuery;
+  private final Literal relevanceFieldWeight;
+
+  @Override
+  public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
+    return nodeVisitor.visitScoreFunction(this, context);
+  }
+
+  @Override
+  public List<UnresolvedExpression> getChild() {
+    return List.of(relevanceQuery);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Span.java b/core/src/main/java/org/opensearch/sql/ast/expression/Span.java
index e57205c19c..edd309b22d 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Span.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Span.java
@@ -13,10 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Span expression node.
- * Params include field expression and the span value.
- */
+/** Span expression node. Params include field expression and the span value. */
 @Getter
 @EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
@@ -35,5 +32,4 @@ public List<UnresolvedExpression> getChild() {
   public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
     return nodeVisitor.visitSpan(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java b/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
index f1f3fb19d4..5252781edb 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
@@ -42,9 +42,7 @@ public enum SpanUnit {
     SPAN_UNITS = builder.add(SpanUnit.values()).build();
   }
 
-  /**
-   * Util method to get span unit given the unit name.
-   */
+  /** Util method to get span unit given the unit name. */
   public static SpanUnit of(String unit) {
     switch (unit) {
       case "":
@@ -64,5 +62,4 @@ public static SpanUnit of(String unit) {
   public static String getName(SpanUnit unit) {
     return unit.name;
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java
index e4def038ed..2c6eee46e9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -13,9 +12,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Argument.
- */
+/** Argument. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java
index f4bc88853f..e1754cbf76 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -15,9 +14,8 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Expression node, representing the syntax that is not resolved to
- * any other expression nodes yet but non-negligible
- * This expression is often created as the index name, field name etc.
+ * Expression node, representing the syntax that is not resolved to any other expression nodes yet
+ * but non-negligible This expression is often created as the index name, field name etc.
  */
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java
index ee3922f797..9b2d530b7f 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import lombok.EqualsAndHashCode;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/When.java b/core/src/main/java/org/opensearch/sql/ast/expression/When.java
index a52870b408..db747592e5 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/When.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/When.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -15,23 +14,17 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * AST node that represents WHEN clause.
- */
+/** AST node that represents WHEN clause. */
 @EqualsAndHashCode(callSuper = false)
 @Getter
 @RequiredArgsConstructor
 @ToString
 public class When extends UnresolvedExpression {
 
-  /**
-   * WHEN condition, either a search condition or compare value if case value present.
-   */
+  /** WHEN condition, either a search condition or compare value if case value present. */
   private final UnresolvedExpression condition;
 
-  /**
-   * Result to return if condition matched.
-   */
+  /** Result to return if condition matched. */
   private final UnresolvedExpression result;
 
   @Override
@@ -43,5 +36,4 @@ public List<? extends Node> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitWhen(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java
index 9a7535e1fe..47f5265765 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -42,5 +41,4 @@ public List<? extends Node> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitWindowFunction(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java b/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java
index 731feccd33..40db015fd7 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of the logic XOR.
- */
+/** Expression node of the logic XOR. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java b/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java
index d0f2e3b372..5ee260c130 100644
--- a/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java
+++ b/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java
@@ -9,12 +9,12 @@
 package org.opensearch.sql.ast.statement;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Explain Statement.
- */
+/** Explain Statement. */
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class Explain extends Statement {
 
   private final Statement statement;
diff --git a/core/src/main/java/org/opensearch/sql/ast/statement/Query.java b/core/src/main/java/org/opensearch/sql/ast/statement/Query.java
index 17682cd47b..6366451b72 100644
--- a/core/src/main/java/org/opensearch/sql/ast/statement/Query.java
+++ b/core/src/main/java/org/opensearch/sql/ast/statement/Query.java
@@ -16,9 +16,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 
-/**
- * Query Statement.
- */
+/** Query Statement. */
 @Getter
 @Setter
 @ToString
@@ -27,6 +25,7 @@
 public class Query extends Statement {
 
   protected final UnresolvedPlan plan;
+  protected final int fetchSize;
 
   @Override
   public <R, C> R accept(AbstractNodeVisitor<R, C> visitor, C context) {
diff --git a/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java b/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java
index e32a8dbfd8..d90071a0ca 100644
--- a/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java
+++ b/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java
@@ -11,9 +11,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * Statement is the high interface of core engine.
- */
+/** Statement is the high interface of core engine. */
 public abstract class Statement extends Node {
   @Override
   public <R, C> R accept(AbstractNodeVisitor<R, C> visitor, C context) {
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/AD.java b/core/src/main/java/org/opensearch/sql/ast/tree/AD.java
index e9aee25c23..0e1cc33db9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/AD.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/AD.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java b/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java
index e9fa26e981..f098d0ec53 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -17,9 +16,7 @@
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * Logical plan node of Aggregation, the interface for building aggregation actions in queries.
- */
+/** Logical plan node of Aggregation, the interface for building aggregation actions in queries. */
 @Getter
 @Setter
 @ToString
@@ -32,23 +29,21 @@ public class Aggregation extends UnresolvedPlan {
   private List<Argument> argExprList;
   private UnresolvedPlan child;
 
-  /**
-   * Aggregation Constructor without span and argument.
-   */
-  public Aggregation(List<UnresolvedExpression> aggExprList,
-                     List<UnresolvedExpression> sortExprList,
-                     List<UnresolvedExpression> groupExprList) {
+  /** Aggregation Constructor without span and argument. */
+  public Aggregation(
+      List<UnresolvedExpression> aggExprList,
+      List<UnresolvedExpression> sortExprList,
+      List<UnresolvedExpression> groupExprList) {
     this(aggExprList, sortExprList, groupExprList, null, Collections.emptyList());
   }
 
-  /**
-   * Aggregation Constructor.
-   */
-  public Aggregation(List<UnresolvedExpression> aggExprList,
-                     List<UnresolvedExpression> sortExprList,
-                     List<UnresolvedExpression> groupExprList,
-                     UnresolvedExpression span,
-                     List<Argument> argExprList) {
+  /** Aggregation Constructor. */
+  public Aggregation(
+      List<UnresolvedExpression> aggExprList,
+      List<UnresolvedExpression> sortExprList,
+      List<UnresolvedExpression> groupExprList,
+      UnresolvedExpression span,
+      List<Argument> argExprList) {
     this.aggExprList = aggExprList;
     this.sortExprList = sortExprList;
     this.groupExprList = groupExprList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java b/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java
new file mode 100644
index 0000000000..832b79d34a
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.ast.tree;
+
+import java.util.List;
+import org.opensearch.sql.ast.AbstractNodeVisitor;
+import org.opensearch.sql.ast.Node;
+
+/** AST node to represent close cursor operation. Actually a wrapper to the AST. */
+public class CloseCursor extends UnresolvedPlan {
+
+  /** An instance of {@link FetchCursor}. */
+  private UnresolvedPlan cursor;
+
+  @Override
+  public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
+    return nodeVisitor.visitCloseCursor(this, context);
+  }
+
+  @Override
+  public UnresolvedPlan attach(UnresolvedPlan child) {
+    this.cursor = child;
+    return this;
+  }
+
+  @Override
+  public List<? extends Node> getChild() {
+    return List.of(cursor);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java b/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java
index 6514d65a04..3173f42f9c 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -18,9 +17,7 @@
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.Field;
 
-/**
- * AST node represent Dedupe operation.
- */
+/** AST node represent Dedupe operation. */
 @Getter
 @Setter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java b/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java
index 184f2ac497..ecceabd757 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -16,9 +15,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.Let;
 
-/**
- * AST node represent Eval operation.
- */
+/** AST node represent Eval operation. */
 @Getter
 @Setter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java b/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java
new file mode 100644
index 0000000000..d6a260ad0b
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.ast.tree;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.ast.AbstractNodeVisitor;
+
+/** An unresolved plan that represents fetching the next batch in paginated plan. */
+@RequiredArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class FetchCursor extends UnresolvedPlan {
+  @Getter final String cursor;
+
+  @Override
+  public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
+    return nodeVisitor.visitFetchCursor(this, context);
+  }
+
+  @Override
+  public UnresolvedPlan attach(UnresolvedPlan child) {
+    throw new UnsupportedOperationException("Cursor unresolved plan does not support children");
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java b/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java
index 8128078930..6c57275db9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -14,9 +13,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * Logical plan node of Filter, the interface for building filters in queries.
- */
+/** Logical plan node of Filter, the interface for building filters in queries. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @Getter
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Head.java b/core/src/main/java/org/opensearch/sql/ast/tree/Head.java
index 8590c212ad..bf6b2caed1 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Head.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Head.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -16,9 +15,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * AST node represent Head operation.
- */
+/** AST node represent Head operation. */
 @Getter
 @Setter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java b/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java
index 5d2e32c28b..ed03efed8a 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java b/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java
index af6936e6a6..9290776172 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -17,7 +16,7 @@
 @RequiredArgsConstructor
 @Getter
 @ToString
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = false)
 public class Limit extends UnresolvedPlan {
   private UnresolvedPlan child;
   private final Integer limit;
@@ -38,5 +37,4 @@ public List<UnresolvedPlan> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> visitor, C context) {
     return visitor.visitLimit(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/ML.java b/core/src/main/java/org/opensearch/sql/ast/tree/ML.java
index 2f83a993b7..320fb2bcf7 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/ML.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/ML.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import static org.opensearch.sql.utils.MLCommonsConstants.ACTION;
@@ -66,7 +65,7 @@ public List<UnresolvedPlan> getChild() {
   }
 
   private String getAction() {
-    return  (String) arguments.get(ACTION).getValue();
+    return (String) arguments.get(ACTION).getValue();
   }
 
   /**
@@ -85,7 +84,7 @@ public Map<String, ExprCoreType> getOutputSchema(TypeEnvironment env) {
         return getPredictOutputSchema();
       default:
         throw new IllegalArgumentException(
-                "Action error. Please indicate train, predict or trainandpredict.");
+            "Action error. Please indicate train, predict or trainandpredict.");
     }
   }
 
@@ -122,8 +121,8 @@ public Map<String, ExprCoreType> getPredictOutputSchema() {
    * @return the schema
    */
   public Map<String, ExprCoreType> getTrainOutputSchema() {
-    boolean isAsync = arguments.containsKey(ASYNC)
-            ? (boolean) arguments.get(ASYNC).getValue() : false;
+    boolean isAsync =
+        arguments.containsKey(ASYNC) ? (boolean) arguments.get(ASYNC).getValue() : false;
     Map<String, ExprCoreType> res = new HashMap<>(Map.of(STATUS, ExprCoreType.STRING));
     if (isAsync) {
       res.put(TASKID, ExprCoreType.STRING);
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Paginate.java b/core/src/main/java/org/opensearch/sql/ast/tree/Paginate.java
new file mode 100644
index 0000000000..69b11600c9
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Paginate.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.ast.tree;
+
+import java.util.List;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+import org.opensearch.sql.ast.AbstractNodeVisitor;
+import org.opensearch.sql.ast.Node;
+
+/** AST node to represent pagination operation. Actually a wrapper to the AST. */
+@RequiredArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@ToString
+public class Paginate extends UnresolvedPlan {
+  @Getter private final int pageSize;
+  private UnresolvedPlan child;
+
+  public Paginate(int pageSize, UnresolvedPlan child) {
+    this.pageSize = pageSize;
+    this.child = child;
+  }
+
+  @Override
+  public List<? extends Node> getChild() {
+    return List.of(child);
+  }
+
+  @Override
+  public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
+    return nodeVisitor.visitPaginate(this, context);
+  }
+
+  @Override
+  public UnresolvedPlan attach(UnresolvedPlan child) {
+    this.child = child;
+    return this;
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java b/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java
index 02a69c93af..e91c4a68ff 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -20,9 +19,7 @@
 import org.opensearch.sql.ast.expression.ParseMethod;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * AST node represent Parse with regex operation.
- */
+/** AST node represent Parse with regex operation. */
 @Getter
 @Setter
 @ToString
@@ -30,29 +27,19 @@
 @RequiredArgsConstructor
 @AllArgsConstructor
 public class Parse extends UnresolvedPlan {
-  /**
-   * Method used to parse a field.
-   */
+  /** Method used to parse a field. */
   private final ParseMethod parseMethod;
 
-  /**
-   * Field.
-   */
+  /** Field. */
   private final UnresolvedExpression sourceField;
 
-  /**
-   * Pattern.
-   */
+  /** Pattern. */
   private final Literal pattern;
 
-  /**
-   * Optional arguments.
-   */
+  /** Optional arguments. */
   private final Map<String, Literal> arguments;
 
-  /**
-   * Child Plan.
-   */
+  /** Child Plan. */
   private UnresolvedPlan child;
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Project.java b/core/src/main/java/org/opensearch/sql/ast/tree/Project.java
index 33c7128855..cffb4dfdce 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Project.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Project.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -17,15 +16,12 @@
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * Logical plan node of Project, the interface for building the list of searching fields.
- */
+/** Logical plan node of Project, the interface for building the list of searching fields. */
 @ToString
 @Getter
 @EqualsAndHashCode(callSuper = false)
 public class Project extends UnresolvedPlan {
-  @Setter
-  private List<UnresolvedExpression> projectList;
+  @Setter private List<UnresolvedExpression> projectList;
   private List<Argument> argExprList;
   private UnresolvedPlan child;
 
@@ -43,9 +39,7 @@ public boolean hasArgument() {
     return !argExprList.isEmpty();
   }
 
-  /**
-   * The Project could been used to exclude fields from the source.
-   */
+  /** The Project could been used to exclude fields from the source. */
   public boolean isExcluded() {
     if (hasArgument()) {
       Argument argument = argExprList.get(0);
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java b/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
index c884afd86a..2cbe170541 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import java.util.Collections;
@@ -19,9 +18,7 @@
 import org.opensearch.sql.ast.expression.Field;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * AST node represent RareTopN operation.
- */
+/** AST node represent RareTopN operation. */
 @Getter
 @Setter
 @ToString
@@ -57,4 +54,3 @@ public enum CommandType {
     RARE
   }
 }
-
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java b/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
index 8c3868329f..ec5264a86b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -18,9 +17,7 @@
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * Logical plan node of Relation, the interface for building the searching sources.
- */
+/** Logical plan node of Relation, the interface for building the searching sources. */
 @AllArgsConstructor
 @ToString
 @EqualsAndHashCode(callSuper = false)
@@ -39,9 +36,7 @@ public Relation(UnresolvedExpression tableName, String alias) {
     this.alias = alias;
   }
 
-  /**
-   * Optional alias name for the relation.
-   */
+  /** Optional alias name for the relation. */
   private String alias;
 
   /**
@@ -72,9 +67,9 @@ public String getAlias() {
   }
 
   /**
-   * Get Qualified name preservs parts of the user given identifiers.
-   * This can later be utilized to determine DataSource,Schema and Table Name during
-   * Analyzer stage. So Passing QualifiedName directly to Analyzer Stage.
+   * Get Qualified name preservs parts of the user given identifiers. This can later be utilized to
+   * determine DataSource,Schema and Table Name during Analyzer stage. So Passing QualifiedName
+   * directly to Analyzer Stage.
    *
    * @return TableQualifiedName.
    */
@@ -82,9 +77,10 @@ public QualifiedName getTableQualifiedName() {
     if (tableName.size() == 1) {
       return (QualifiedName) tableName.get(0);
     } else {
-      return new QualifiedName(tableName.stream()
-          .map(UnresolvedExpression::toString)
-          .collect(Collectors.joining(COMMA)));
+      return new QualifiedName(
+          tableName.stream()
+              .map(UnresolvedExpression::toString)
+              .collect(Collectors.joining(COMMA)));
     }
   }
 
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java b/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java
index 89122bea7f..5ab4d71dd9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Logical plan node of RelationSubquery.
- */
+/** Logical plan node of RelationSubquery. */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
@@ -25,9 +22,7 @@ public class RelationSubquery extends UnresolvedPlan {
   private UnresolvedPlan query;
   private String alias;
 
-  /**
-   * Take subquery alias as table name.
-   */
+  /** Take subquery alias as table name. */
   public String getAliasAsTableName() {
     return alias;
   }
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java b/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java
index 69700c871c..e6f760aca0 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java b/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java
index 5fb4139bea..073cb7aa1b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import static org.opensearch.sql.ast.tree.Sort.NullOrder.NULL_FIRST;
@@ -22,9 +21,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.Field;
 
-/**
- * AST node for Sort {@link Sort#sortList} represent a list of sort expression and sort options.
- */
+/** AST node for Sort {@link Sort#sortList} represent a list of sort expression and sort options. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @Getter
@@ -50,19 +47,14 @@ public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitSort(this, context);
   }
 
-  /**
-   * Sort Options.
-   */
+  /** Sort Options. */
   @Data
   public static class SortOption {
 
-    /**
-     * Default ascending sort option, null first.
-     */
+    /** Default ascending sort option, null first. */
     public static SortOption DEFAULT_ASC = new SortOption(ASC, NULL_FIRST);
-    /**
-     * Default descending sort option, null last.
-     */
+
+    /** Default descending sort option, null last. */
     public static SortOption DEFAULT_DESC = new SortOption(DESC, NULL_LAST);
 
     private final SortOrder sortOrder;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java b/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
index 064cbf24fe..a67a943dcb 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -11,16 +10,12 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import lombok.Setter;
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
-import org.opensearch.sql.ast.expression.Let;
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * ASTNode for Table Function.
- */
+/** AST Node for Table Function. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
@@ -28,8 +23,7 @@ public class TableFunction extends UnresolvedPlan {
 
   private final UnresolvedExpression functionName;
 
-  @Getter
-  private final List<UnresolvedExpression> arguments;
+  @Getter private final List<UnresolvedExpression> arguments;
 
   public QualifiedName getFunctionName() {
     return (QualifiedName) functionName;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java b/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java
index 672a4602ed..3074303b0d 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import lombok.EqualsAndHashCode;
@@ -11,9 +10,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * Abstract unresolved plan.
- */
+/** Abstract unresolved plan. */
 @EqualsAndHashCode(callSuper = false)
 @ToString
 public abstract class UnresolvedPlan extends Node {
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Values.java b/core/src/main/java/org/opensearch/sql/ast/tree/Values.java
index 5a662912f9..65d7e8d7cb 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Values.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Values.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -16,9 +15,7 @@
 import org.opensearch.sql.ast.Node;
 import org.opensearch.sql.ast.expression.Literal;
 
-/**
- * AST node class for a sequence of literal values.
- */
+/** AST node class for a sequence of literal values. */
 @ToString
 @Getter
 @EqualsAndHashCode(callSuper = false)
@@ -41,5 +38,4 @@ public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
   public List<? extends Node> getChild() {
     return ImmutableList.of();
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/data/model/AbstractExprNumberValue.java b/core/src/main/java/org/opensearch/sql/data/model/AbstractExprNumberValue.java
index 1f6363c068..48781df847 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/AbstractExprNumberValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/AbstractExprNumberValue.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import com.google.common.base.Objects;
 import lombok.RequiredArgsConstructor;
 
-/**
- * Expression Number Value.
- */
+/** Expression Number Value. */
 @RequiredArgsConstructor
 public abstract class AbstractExprNumberValue extends AbstractExprValue {
   private final Number value;
diff --git a/core/src/main/java/org/opensearch/sql/data/model/AbstractExprValue.java b/core/src/main/java/org/opensearch/sql/data/model/AbstractExprValue.java
index 4933592564..f332867645 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/AbstractExprValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/AbstractExprValue.java
@@ -3,25 +3,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 
-/**
- * Abstract ExprValue.
- */
+/** Abstract ExprValue. */
 public abstract class AbstractExprValue implements ExprValue {
-  /**
-   * The customize compareTo logic.
-   */
+  /** The customize compareTo logic. */
   @Override
   public int compareTo(ExprValue other) {
     if (this.isNull() || this.isMissing() || other.isNull() || other.isMissing()) {
       throw new IllegalStateException(
-           String.format("[BUG] Unreachable, Comparing with NULL or MISSING is undefined"));
+          "[BUG] Unreachable, Comparing with NULL or MISSING is undefined");
     }
-    if ((this.isNumber() && other.isNumber()) || this.type() == other.type()) {
+    if ((this.isNumber() && other.isNumber())
+        || (this.isDateTime() && other.isDateTime())
+        || this.type().equals(other.type())) {
       return compare(other);
     } else {
       throw new ExpressionEvaluationException(
@@ -32,13 +29,36 @@ public int compareTo(ExprValue other) {
   }
 
   /**
-   * The customize equals logic.
+   * The customize equals logic.<br>
    * The table below list the NULL and MISSING handling logic.
-   * A       B       A == B
-   * NULL    NULL    TRUE
-   * NULL    MISSING FALSE
-   * MISSING NULL    FALSE
-   * MISSING MISSING TRUE
+   *
+   * <table>
+   *   <tr>
+   *     <th>A</th>
+   *     <th>B</th>
+   *     <th>A == B</th>
+   *   </tr>
+   *   <tr>
+   *     <td>NULL</td>
+   *     <td>NULL</td>
+   *     <td>TRUE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>NULL</td>
+   *     <td>MISSING</td>
+   *     <td>FALSE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>MISSING</td>
+   *     <td>NULL</td>
+   *     <td>FALSE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>MISSING</td>
+   *     <td>MISSING</td>
+   *     <td>TRUE</td>
+   *   </tr>
+   * </table>
    */
   @Override
   public boolean equals(Object o) {
@@ -57,13 +77,9 @@ public boolean equals(Object o) {
     }
   }
 
-  /**
-   * The expression value compare.
-   */
+  /** The expression value compare. */
   public abstract int compare(ExprValue other);
 
-  /**
-   * The expression value equal.
-   */
+  /** The expression value equal. */
   public abstract boolean equal(ExprValue other);
 }
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprBooleanValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprBooleanValue.java
index d655c0dabb..ee97cf2228 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprBooleanValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprBooleanValue.java
@@ -3,16 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import com.google.common.base.Objects;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Expression Boolean Value.
- */
+/** Expression Boolean Value. */
 public class ExprBooleanValue extends AbstractExprValue {
   private static final ExprBooleanValue TRUE = new ExprBooleanValue(true);
   private static final ExprBooleanValue FALSE = new ExprBooleanValue(false);
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprByteValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprByteValue.java
index b39e6e9d7f..8e74a83cf3 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprByteValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprByteValue.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Expression Byte Value.
- */
+/** Expression Byte Value. */
 public class ExprByteValue extends AbstractExprNumberValue {
 
   public ExprByteValue(Number value) {
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprCollectionValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprCollectionValue.java
index 1326733263..d1f56c3d76 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprCollectionValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprCollectionValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import com.google.common.base.Objects;
@@ -15,9 +14,7 @@
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Expression Collection Value.
- */
+/** Expression Collection Value. */
 @RequiredArgsConstructor
 public class ExprCollectionValue extends AbstractExprValue {
   private final List<ExprValue> valueList;
@@ -43,9 +40,7 @@ public List<ExprValue> collectionValue() {
 
   @Override
   public String toString() {
-    return valueList.stream()
-        .map(Object::toString)
-        .collect(Collectors.joining(", ", "[", "]"));
+    return valueList.stream().map(Object::toString).collect(Collectors.joining(", ", "[", "]"));
   }
 
   @Override
@@ -68,9 +63,7 @@ public boolean equal(ExprValue o) {
     }
   }
 
-  /**
-   * Only compare the size of the list.
-   */
+  /** Only compare the size of the list. */
   @Override
   public int compare(ExprValue other) {
     return Integer.compare(valueList.size(), other.collectionValue().size());
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprDateValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprDateValue.java
index 7617e156ba..3f3f67a4fa 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprDateValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprDateValue.java
@@ -3,17 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_VARIABLE_NANOS_OPTIONAL;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
 
 import com.google.common.base.Objects;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -22,23 +21,19 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.exception.SemanticCheckException;
 
-/**
- * Expression Date Value.
- */
+/** Expression Date Value. */
 @RequiredArgsConstructor
 public class ExprDateValue extends AbstractExprValue {
 
   private final LocalDate date;
 
-  /**
-   * Constructor of ExprDateValue.
-   */
+  /** Constructor of ExprDateValue. */
   public ExprDateValue(String date) {
     try {
       this.date = LocalDate.parse(date, DATE_TIME_FORMATTER_VARIABLE_NANOS_OPTIONAL);
     } catch (DateTimeParseException e) {
-      throw new SemanticCheckException(String.format("date:%s in unsupported format, please use "
-          + "yyyy-MM-dd", date));
+      throw new SemanticCheckException(
+          String.format("date:%s in unsupported format, please use 'yyyy-MM-dd'", date));
     }
   }
 
@@ -69,7 +64,12 @@ public LocalDateTime datetimeValue() {
 
   @Override
   public Instant timestampValue() {
-    return ZonedDateTime.of(date, timeValue(), ZoneId.systemDefault()).toInstant();
+    return ZonedDateTime.of(date, timeValue(), UTC_ZONE_ID).toInstant();
+  }
+
+  @Override
+  public boolean isDateTime() {
+    return true;
   }
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprDatetimeValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprDatetimeValue.java
index f5f80f133f..305958043f 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprDatetimeValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprDatetimeValue.java
@@ -3,20 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
+import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_WITH_TZ;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
+
 import com.google.common.base.Objects;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.DateTimeParseException;
-import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.data.type.ExprCoreType;
@@ -27,30 +26,15 @@
 public class ExprDatetimeValue extends AbstractExprValue {
   private final LocalDateTime datetime;
 
-  private static final DateTimeFormatter FORMATTER_VARIABLE_NANOS;
-  private static final int MIN_FRACTION_SECONDS = 0;
-  private static final int MAX_FRACTION_SECONDS = 9;
-
-  static {
-    FORMATTER_VARIABLE_NANOS = new DateTimeFormatterBuilder()
-        .appendPattern("uuuu-MM-dd HH:mm:ss[xxx]")
-        .appendFraction(
-            ChronoField.NANO_OF_SECOND,
-            MIN_FRACTION_SECONDS,
-            MAX_FRACTION_SECONDS,
-            true)
-        .toFormatter();
-  }
-
-  /**
-   * Constructor with datetime string as input.
-   */
+  /** Constructor with datetime string as input. */
   public ExprDatetimeValue(String datetime) {
     try {
-      this.datetime = LocalDateTime.parse(datetime, FORMATTER_VARIABLE_NANOS);
+      this.datetime = LocalDateTime.parse(datetime, DATE_TIME_FORMATTER_WITH_TZ);
     } catch (DateTimeParseException e) {
-      throw new SemanticCheckException(String.format("datetime:%s in unsupported format, please "
-          + "use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]", datetime));
+      throw new SemanticCheckException(
+          String.format(
+              "datetime:%s in unsupported format, please use 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
+              datetime));
     }
   }
 
@@ -71,7 +55,12 @@ public LocalTime timeValue() {
 
   @Override
   public Instant timestampValue() {
-    return ZonedDateTime.of(datetime, ZoneId.of("UTC")).toInstant();
+    return ZonedDateTime.of(datetime, UTC_ZONE_ID).toInstant();
+  }
+
+  @Override
+  public boolean isDateTime() {
+    return true;
   }
 
   @Override
@@ -86,9 +75,11 @@ public boolean equal(ExprValue other) {
 
   @Override
   public String value() {
-    return String.format("%s %s", DateTimeFormatter.ISO_DATE.format(datetime),
-        DateTimeFormatter.ISO_TIME.format((datetime.getNano() == 0)
-            ? datetime.truncatedTo(ChronoUnit.SECONDS) : datetime));
+    return String.format(
+        "%s %s",
+        DateTimeFormatter.ISO_DATE.format(datetime),
+        DateTimeFormatter.ISO_TIME.format(
+            (datetime.getNano() == 0) ? datetime.truncatedTo(ChronoUnit.SECONDS) : datetime));
   }
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprDoubleValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprDoubleValue.java
index 171b064e68..c192fe901c 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprDoubleValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprDoubleValue.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Expression Double Value.
- */
+/** Expression Double Value. */
 public class ExprDoubleValue extends AbstractExprNumberValue {
 
   public ExprDoubleValue(Number value) {
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprFloatValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprFloatValue.java
index dc454b4b50..6d321687fb 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprFloatValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprFloatValue.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Expression Float Value.
- */
+/** Expression Float Value. */
 public class ExprFloatValue extends AbstractExprNumberValue {
 
   public ExprFloatValue(Number value) {
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprIntegerValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprIntegerValue.java
index 06947766fc..81321c1f12 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprIntegerValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprIntegerValue.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Expression Integer Value.
- */
+/** Expression Integer Value. */
 public class ExprIntegerValue extends AbstractExprNumberValue {
 
   public ExprIntegerValue(Number value) {
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprIntervalValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprIntervalValue.java
index 25a3115e8c..754520d7c8 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprIntervalValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprIntervalValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import java.time.temporal.TemporalAmount;
@@ -27,7 +26,8 @@ public int compare(ExprValue other) {
     TemporalAmount otherInterval = other.intervalValue();
     if (!interval.getClass().equals(other.intervalValue().getClass())) {
       throw new ExpressionEvaluationException(
-          String.format("invalid to compare intervals with units %s and %s",
+          String.format(
+              "invalid to compare intervals with units %s and %s",
               unit(), ((ExprIntervalValue) other).unit()));
     }
     return Long.compare(
@@ -49,12 +49,9 @@ public ExprType type() {
     return ExprCoreType.INTERVAL;
   }
 
-  /**
-   * Util method to get temporal unit stored locally.
-   */
+  /** Util method to get temporal unit stored locally. */
   public TemporalUnit unit() {
-    return interval.getUnits()
-        .stream()
+    return interval.getUnits().stream()
         .filter(v -> interval.get(v) != 0)
         .findAny()
         .orElse(interval.getUnits().get(0));
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprLongValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprLongValue.java
index 1df590246c..537a164490 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprLongValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprLongValue.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Expression Long Value.
- */
+/** Expression Long Value. */
 public class ExprLongValue extends AbstractExprNumberValue {
 
   public ExprLongValue(Number value) {
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprMissingValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprMissingValue.java
index 9908074773..80add24042 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprMissingValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprMissingValue.java
@@ -3,21 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import java.util.Objects;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Expression Missing Value.
- */
+/** Expression Missing Value. */
 public class ExprMissingValue extends AbstractExprValue {
   private static final ExprMissingValue instance = new ExprMissingValue();
 
-  private ExprMissingValue() {
-  }
+  private ExprMissingValue() {}
 
   public static ExprMissingValue of() {
     return instance;
@@ -40,13 +36,13 @@ public boolean isMissing() {
 
   @Override
   public int compare(ExprValue other) {
-    throw new IllegalStateException(String.format("[BUG] Unreachable, Comparing with MISSING is "
-        + "undefined"));
+    throw new IllegalStateException(
+        String.format("[BUG] Unreachable, Comparing with MISSING is " + "undefined"));
   }
 
   /**
-   * Missing value is equal to Missing value.
-   * Notes, this function should only used for Java Object Compare.
+   * Missing value is equal to Missing value. Notes, this function should only used for Java Object
+   * Compare.
    */
   @Override
   public boolean equal(ExprValue other) {
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprNullValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprNullValue.java
index 54d4811d33..ac2e185e65 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprNullValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprNullValue.java
@@ -3,21 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import java.util.Objects;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Expression Null Value.
- */
+/** Expression Null Value. */
 public class ExprNullValue extends AbstractExprValue {
   private static final ExprNullValue instance = new ExprNullValue();
 
-  private ExprNullValue() {
-  }
+  private ExprNullValue() {}
 
   @Override
   public int hashCode() {
@@ -55,8 +51,8 @@ public int compare(ExprValue other) {
   }
 
   /**
-   * NULL value is equal to NULL value.
-   * Notes, this function should only used for Java Object Compare.
+   * NULL value is equal to NULL value. Notes, this function should only used for Java Object
+   * Compare.
    */
   @Override
   public boolean equal(ExprValue other) {
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprShortValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprShortValue.java
index 3e5f6858bc..418cefa166 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprShortValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprShortValue.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Expression Short Value.
- */
+/** Expression Short Value. */
 public class ExprShortValue extends AbstractExprNumberValue {
 
   public ExprShortValue(Number value) {
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprStringValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprStringValue.java
index c41c23d6ac..7745af62b6 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprStringValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprStringValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import java.time.LocalDate;
@@ -15,9 +14,7 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.exception.SemanticCheckException;
 
-/**
- * Expression String Value.
- */
+/** Expression String Value. */
 @RequiredArgsConstructor
 public class ExprStringValue extends AbstractExprValue {
   private final String value;
@@ -44,11 +41,13 @@ public LocalDateTime datetimeValue() {
     } catch (SemanticCheckException e) {
       try {
         return new ExprDatetimeValue(
-            LocalDateTime.of(new ExprDateValue(value).dateValue(), LocalTime.of(0, 0, 0)))
+                LocalDateTime.of(new ExprDateValue(value).dateValue(), LocalTime.of(0, 0, 0)))
             .datetimeValue();
       } catch (SemanticCheckException exception) {
-        throw new SemanticCheckException(String.format("datetime:%s in unsupported format, please "
-            + "use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]", value));
+        throw new SemanticCheckException(
+            String.format(
+                "datetime:%s in unsupported format, please use 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
+                value));
       }
     }
   }
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprTimeValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprTimeValue.java
index 6cc4021d2e..d808af49b1 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprTimeValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprTimeValue.java
@@ -3,17 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;
 import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_VARIABLE_NANOS_OPTIONAL;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
 
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeParseException;
 import java.util.Objects;
@@ -21,24 +20,21 @@
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.function.FunctionProperties;
 
-/**
- * Expression Time Value.
- */
+/** Expression Time Value. */
 @RequiredArgsConstructor
 public class ExprTimeValue extends AbstractExprValue {
 
   private final LocalTime time;
 
-  /**
-   * Constructor of ExprTimeValue.
-   */
+  /** Constructor of ExprTimeValue. */
   public ExprTimeValue(String time) {
     try {
       this.time = LocalTime.parse(time, DATE_TIME_FORMATTER_VARIABLE_NANOS_OPTIONAL);
     } catch (DateTimeParseException e) {
-      throw new SemanticCheckException(String.format("time:%s in unsupported format, please use "
-          + "HH:mm:ss[.SSSSSSSSS]", time));
+      throw new SemanticCheckException(
+          String.format("time:%s in unsupported format, please use 'HH:mm:ss[.SSSSSSSSS]'", time));
     }
   }
 
@@ -57,6 +53,23 @@ public LocalTime timeValue() {
     return time;
   }
 
+  public LocalDate dateValue(FunctionProperties functionProperties) {
+    return LocalDate.now(functionProperties.getQueryStartClock());
+  }
+
+  public LocalDateTime datetimeValue(FunctionProperties functionProperties) {
+    return LocalDateTime.of(dateValue(functionProperties), timeValue());
+  }
+
+  public Instant timestampValue(FunctionProperties functionProperties) {
+    return ZonedDateTime.of(dateValue(functionProperties), timeValue(), UTC_ZONE_ID).toInstant();
+  }
+
+  @Override
+  public boolean isDateTime() {
+    return true;
+  }
+
   @Override
   public String toString() {
     return String.format("TIME '%s'", value());
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprTimestampValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprTimestampValue.java
index 219a4c2663..455a379b03 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprTimestampValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprTimestampValue.java
@@ -3,17 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_VARIABLE_NANOS;
 import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_WITHOUT_NANO;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
 
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeParseException;
 import java.time.temporal.ChronoUnit;
 import java.util.Objects;
@@ -22,38 +21,34 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.exception.SemanticCheckException;
 
-/**
- * Expression Timestamp Value.
- */
+/** Expression Timestamp Value. */
 @RequiredArgsConstructor
 public class ExprTimestampValue extends AbstractExprValue {
-  /**
-   * todo. only support UTC now.
-   */
-  private static final ZoneId ZONE = ZoneId.of("UTC");
 
   private final Instant timestamp;
 
-  /**
-   * Constructor.
-   */
+  /** Constructor. */
   public ExprTimestampValue(String timestamp) {
     try {
-      this.timestamp = LocalDateTime.parse(timestamp, DATE_TIME_FORMATTER_VARIABLE_NANOS)
-          .atZone(ZONE)
-          .toInstant();
+      this.timestamp =
+          LocalDateTime.parse(timestamp, DATE_TIME_FORMATTER_VARIABLE_NANOS)
+              .atZone(UTC_ZONE_ID)
+              .toInstant();
     } catch (DateTimeParseException e) {
-      throw new SemanticCheckException(String.format("timestamp:%s in unsupported format, please "
-          + "use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]", timestamp));
+      throw new SemanticCheckException(
+          String.format(
+              "timestamp:%s in unsupported format, please use 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
+              timestamp));
     }
-
   }
 
   @Override
   public String value() {
-    return timestamp.getNano() == 0 ? DATE_TIME_FORMATTER_WITHOUT_NANO.withZone(ZONE)
-        .format(timestamp.truncatedTo(ChronoUnit.SECONDS))
-        : DATE_TIME_FORMATTER_VARIABLE_NANOS.withZone(ZONE).format(timestamp);
+    return timestamp.getNano() == 0
+        ? DATE_TIME_FORMATTER_WITHOUT_NANO
+            .withZone(UTC_ZONE_ID)
+            .format(timestamp.truncatedTo(ChronoUnit.SECONDS))
+        : DATE_TIME_FORMATTER_VARIABLE_NANOS.withZone(UTC_ZONE_ID).format(timestamp);
   }
 
   @Override
@@ -68,17 +63,22 @@ public Instant timestampValue() {
 
   @Override
   public LocalDate dateValue() {
-    return timestamp.atZone(ZONE).toLocalDate();
+    return timestamp.atZone(UTC_ZONE_ID).toLocalDate();
   }
 
   @Override
   public LocalTime timeValue() {
-    return timestamp.atZone(ZONE).toLocalTime();
+    return timestamp.atZone(UTC_ZONE_ID).toLocalTime();
   }
 
   @Override
   public LocalDateTime datetimeValue() {
-    return timestamp.atZone(ZONE).toLocalDateTime();
+    return timestamp.atZone(UTC_ZONE_ID).toLocalDateTime();
+  }
+
+  @Override
+  public boolean isDateTime() {
+    return true;
   }
 
   @Override
@@ -88,12 +88,12 @@ public String toString() {
 
   @Override
   public int compare(ExprValue other) {
-    return timestamp.compareTo(other.timestampValue().atZone(ZONE).toInstant());
+    return timestamp.compareTo(other.timestampValue().atZone(UTC_ZONE_ID).toInstant());
   }
 
   @Override
   public boolean equal(ExprValue other) {
-    return timestamp.equals(other.timestampValue().atZone(ZONE).toInstant());
+    return timestamp.equals(other.timestampValue().atZone(UTC_ZONE_ID).toInstant());
   }
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprTupleValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprTupleValue.java
index 749de931ee..856075bed8 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprTupleValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprTupleValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import java.util.Iterator;
@@ -18,9 +17,7 @@
 import org.opensearch.sql.storage.bindingtuple.BindingTuple;
 import org.opensearch.sql.storage.bindingtuple.LazyBindingTuple;
 
-/**
- * Expression Tuple Value.
- */
+/** Expression Tuple Value. */
 @RequiredArgsConstructor
 public class ExprTupleValue extends AbstractExprValue {
 
@@ -47,8 +44,7 @@ public ExprType type() {
 
   @Override
   public String toString() {
-    return valueMap.entrySet()
-        .stream()
+    return valueMap.entrySet().stream()
         .map(entry -> String.format("%s:%s", entry.getKey(), entry.getValue()))
         .collect(Collectors.joining(",", "{", "}"));
   }
@@ -70,6 +66,7 @@ public ExprValue keyValue(String key) {
 
   /**
    * Override the equals method.
+   *
    * @return true for equal, otherwise false.
    */
   public boolean equal(ExprValue o) {
@@ -91,9 +88,7 @@ public boolean equal(ExprValue o) {
     }
   }
 
-  /**
-   * Only compare the size of the map.
-   */
+  /** Only compare the size of the map. */
   @Override
   public int compare(ExprValue other) {
     return Integer.compare(valueMap.size(), other.tupleValue().size());
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprValue.java
index 53909184e8..86bead77b7 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import java.io.Serializable;
@@ -19,18 +18,12 @@
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.storage.bindingtuple.BindingTuple;
 
-/**
- * The definition of the Expression Value.
- */
+/** The definition of the Expression Value. */
 public interface ExprValue extends Serializable, Comparable<ExprValue> {
-  /**
-   * Get the Object value of the Expression Value.
-   */
+  /** Get the Object value of the Expression Value. */
   Object value();
 
-  /**
-   * Get the {@link ExprCoreType} of the Expression Value.
-   */
+  /** Get the {@link ExprCoreType} of the Expression Value. */
   ExprType type();
 
   /**
@@ -61,135 +54,112 @@ default boolean isNumber() {
   }
 
   /**
-   * Get the {@link BindingTuple}.
+   * Is Datetime value.
+   *
+   * @return true: is a datetime value, otherwise false
    */
+  default boolean isDateTime() {
+    return false;
+  }
+
+  /** Get the {@link BindingTuple}. */
   default BindingTuple bindingTuples() {
     return BindingTuple.EMPTY;
   }
 
-  /**
-   * Get byte value.
-   */
+  /** Get byte value. */
   default Byte byteValue() {
     throw new ExpressionEvaluationException(
         "invalid to get byteValue from value of type " + type());
   }
 
-  /**
-   * Get short value.
-   */
+  /** Get short value. */
   default Short shortValue() {
     throw new ExpressionEvaluationException(
         "invalid to get shortValue from value of type " + type());
   }
 
-  /**
-   * Get integer value.
-   */
+  /** Get integer value. */
   default Integer integerValue() {
     throw new ExpressionEvaluationException(
         "invalid to get integerValue from value of type " + type());
   }
 
-  /**
-   * Get long value.
-   */
+  /** Get long value. */
   default Long longValue() {
     throw new ExpressionEvaluationException(
         "invalid to get longValue from value of type " + type());
   }
 
-  /**
-   * Get float value.
-   */
+  /** Get float value. */
   default Float floatValue() {
     throw new ExpressionEvaluationException(
         "invalid to get floatValue from value of type " + type());
   }
 
-  /**
-   * Get float value.
-   */
+  /** Get float value. */
   default Double doubleValue() {
     throw new ExpressionEvaluationException(
         "invalid to get doubleValue from value of type " + type());
   }
 
-  /**
-   * Get string value.
-   */
+  /** Get string value. */
   default String stringValue() {
     throw new ExpressionEvaluationException(
         "invalid to get stringValue from value of type " + type());
   }
 
-  /**
-   * Get boolean value.
-   */
+  /** Get boolean value. */
   default Boolean booleanValue() {
     throw new ExpressionEvaluationException(
         "invalid to get booleanValue from value of type " + type());
   }
 
-  /**
-   * Get timestamp value.
-   */
+  /** Get timestamp value. */
   default Instant timestampValue() {
     throw new ExpressionEvaluationException(
         "invalid to get timestampValue from value of type " + type());
   }
 
-  /**
-   * Get time value.
-   */
+  /** Get time value. */
   default LocalTime timeValue() {
     throw new ExpressionEvaluationException(
         "invalid to get timeValue from value of type " + type());
   }
 
-  /**
-   * Get date value.
-   */
+  /** Get date value. */
   default LocalDate dateValue() {
     throw new ExpressionEvaluationException(
         "invalid to get dateValue from value of type " + type());
   }
 
-  /**
-   * Get datetime value.
-   */
+  /** Get datetime value. */
   default LocalDateTime datetimeValue() {
     throw new ExpressionEvaluationException(
         "invalid to get datetimeValue from value of type " + type());
   }
 
-  /**
-   * Get interval value.
-   */
+  /** Get interval value. */
   default TemporalAmount intervalValue() {
     throw new ExpressionEvaluationException(
         "invalid to get intervalValue from value of type " + type());
   }
 
-  /**
-   * Get map value.
-   */
+  /** Get map value. */
   default Map<String, ExprValue> tupleValue() {
     throw new ExpressionEvaluationException(
         "invalid to get tupleValue from value of type " + type());
   }
 
-  /**
-   * Get collection value.
-   */
+  /** Get collection value. */
   default List<ExprValue> collectionValue() {
     throw new ExpressionEvaluationException(
         "invalid to get collectionValue from value of type " + type());
   }
 
   /**
-   * Get the value specified by key from {@link ExprTupleValue}.
-   * This method only be implemented in {@link ExprTupleValue}.
+   * Get the value specified by key from {@link ExprTupleValue}. This method only be implemented in
+   * {@link ExprTupleValue}.
    */
   default ExprValue keyValue(String key) {
     return ExprMissingValue.of();
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprValueUtils.java b/core/src/main/java/org/opensearch/sql/data/model/ExprValueUtils.java
index 407b6df5b3..a259eb9fba 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprValueUtils.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprValueUtils.java
@@ -3,9 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.temporal.TemporalAmount;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -15,9 +18,7 @@
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 
-/**
- * The definition of {@link ExprValue} factory.
- */
+/** The definition of {@link ExprValue} factory. */
 @UtilityClass
 public class ExprValueUtils {
   public static final ExprValue LITERAL_TRUE = ExprBooleanValue.of(true);
@@ -61,19 +62,31 @@ public static ExprValue intervalValue(TemporalAmount value) {
     return new ExprIntervalValue(value);
   }
 
-  /**
-   * {@link ExprTupleValue} constructor.
-   */
+  public static ExprValue dateValue(LocalDate value) {
+    return new ExprDateValue(value);
+  }
+
+  public static ExprValue datetimeValue(LocalDateTime value) {
+    return new ExprDatetimeValue(value);
+  }
+
+  public static ExprValue timeValue(LocalTime value) {
+    return new ExprTimeValue(value);
+  }
+
+  public static ExprValue timestampValue(Instant value) {
+    return new ExprTimestampValue(value);
+  }
+
+  /** {@link ExprTupleValue} constructor. */
   public static ExprValue tupleValue(Map<String, Object> map) {
     LinkedHashMap<String, ExprValue> valueMap = new LinkedHashMap<>();
-    map.forEach((k, v) -> valueMap
-        .put(k, v instanceof ExprValue ? (ExprValue) v : fromObjectValue(v)));
+    map.forEach(
+        (k, v) -> valueMap.put(k, v instanceof ExprValue ? (ExprValue) v : fromObjectValue(v)));
     return new ExprTupleValue(valueMap);
   }
 
-  /**
-   * {@link ExprCollectionValue} constructor.
-   */
+  /** {@link ExprCollectionValue} constructor. */
   public static ExprValue collectionValue(List<Object> list) {
     List<ExprValue> valueList = new ArrayList<>();
     list.forEach(o -> valueList.add(fromObjectValue(o)));
@@ -88,9 +101,7 @@ public static ExprValue nullValue() {
     return ExprNullValue.of();
   }
 
-  /**
-   * Construct ExprValue from Object.
-   */
+  /** Construct ExprValue from Object. */
   public static ExprValue fromObjectValue(Object o) {
     if (null == o) {
       return LITERAL_NULL;
@@ -115,24 +126,32 @@ public static ExprValue fromObjectValue(Object o) {
       return stringValue((String) o);
     } else if (o instanceof Float) {
       return floatValue((Float) o);
+    } else if (o instanceof LocalDate) {
+      return dateValue((LocalDate) o);
+    } else if (o instanceof LocalDateTime) {
+      return datetimeValue((LocalDateTime) o);
+    } else if (o instanceof LocalTime) {
+      return timeValue((LocalTime) o);
+    } else if (o instanceof Instant) {
+      return timestampValue((Instant) o);
+    } else if (o instanceof TemporalAmount) {
+      return intervalValue((TemporalAmount) o);
     } else {
       throw new ExpressionEvaluationException("unsupported object " + o.getClass());
     }
   }
 
-  /**
-   * Construct ExprValue from Object with ExprCoreType.
-   */
+  /** Construct ExprValue from Object with ExprCoreType. */
   public static ExprValue fromObjectValue(Object o, ExprCoreType type) {
     switch (type) {
       case TIMESTAMP:
-        return new ExprTimestampValue((String)o);
+        return new ExprTimestampValue((String) o);
       case DATE:
-        return new ExprDateValue((String)o);
+        return new ExprDateValue((String) o);
       case TIME:
-        return new ExprTimeValue((String)o);
+        return new ExprTimeValue((String) o);
       case DATETIME:
-        return new ExprDatetimeValue((String)o);
+        return new ExprDatetimeValue((String) o);
       default:
         return fromObjectValue(o);
     }
diff --git a/core/src/main/java/org/opensearch/sql/data/type/ExprCoreType.java b/core/src/main/java/org/opensearch/sql/data/type/ExprCoreType.java
index ad2e42596d..f1979d8666 100644
--- a/core/src/main/java/org/opensearch/sql/data/type/ExprCoreType.java
+++ b/core/src/main/java/org/opensearch/sql/data/type/ExprCoreType.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.type;
 
 import com.google.common.collect.ImmutableMap;
@@ -15,25 +14,18 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-/**
- * Expression Type.
- */
+/** Expression Type. */
 public enum ExprCoreType implements ExprType {
-  /**
-   * Unknown due to unsupported data type.
-   */
+  /** Unknown due to unsupported data type. */
   UNKNOWN,
 
   /**
-   * Undefined type for special literal such as NULL.
-   * As the root of data type tree, it is compatible with any other type.
-   * In other word, undefined type is the "narrowest" type.
+   * Undefined type for special literal such as NULL. As the root of data type tree, it is
+   * compatible with any other type. In other word, undefined type is the "narrowest" type.
    */
   UNDEFINED,
 
-  /**
-   * Numbers.
-   */
+  /** Numbers. */
   BYTE(UNDEFINED),
   SHORT(BYTE),
   INTEGER(SHORT),
@@ -41,49 +33,34 @@ public enum ExprCoreType implements ExprType {
   FLOAT(LONG),
   DOUBLE(FLOAT),
 
-  /**
-   * String.
-   */
+  /** String. */
   STRING(UNDEFINED),
 
-  /**
-   * Boolean.
-   */
+  /** Boolean. */
   BOOLEAN(STRING),
 
-  /**
-   * Date.
-   * Todo. compatible relationship.
-   */
-  TIMESTAMP(STRING),
+  /** Date. */
   DATE(STRING),
   TIME(STRING),
-  DATETIME(STRING),
+  DATETIME(STRING, DATE, TIME),
+  TIMESTAMP(STRING, DATETIME),
   INTERVAL(UNDEFINED),
 
-  /**
-   * Struct.
-   */
+  /** Struct. */
   STRUCT(UNDEFINED),
 
-  /**
-   * Array.
-   */
+  /** Array. */
   ARRAY(UNDEFINED);
 
-  /**
-   * Parents (wider/compatible types) of current base type.
-   */
+  /** Parents (wider/compatible types) of current base type. */
   private final List<ExprType> parents = new ArrayList<>();
 
-  /**
-   * The mapping between Type and legacy JDBC type name.
-   */
+  /** The mapping between Type and legacy JDBC type name. */
   private static final Map<ExprCoreType, String> LEGACY_TYPE_NAME_MAPPING =
       new ImmutableMap.Builder<ExprCoreType, String>()
-          .put(STRUCT, "object")
-          .put(ARRAY, "nested")
-          .put(STRING, "keyword")
+          .put(STRUCT, "OBJECT")
+          .put(ARRAY, "NESTED")
+          .put(STRING, "KEYWORD")
           .build();
 
   private static final Set<ExprType> NUMBER_TYPES =
@@ -117,14 +94,12 @@ public String legacyTypeName() {
     return LEGACY_TYPE_NAME_MAPPING.getOrDefault(this, this.name());
   }
 
-  /**
-   * Return all the valid ExprCoreType.
-   */
+  /** Return all the valid ExprCoreType. */
   public static List<ExprCoreType> coreTypes() {
     return Arrays.stream(ExprCoreType.values())
-                 .filter(type -> type != UNKNOWN)
-                 .filter(type -> type != UNDEFINED)
-                 .collect(Collectors.toList());
+        .filter(type -> type != UNKNOWN)
+        .filter(type -> type != UNDEFINED)
+        .collect(Collectors.toList());
   }
 
   public static Set<ExprType> numberTypes() {
diff --git a/core/src/main/java/org/opensearch/sql/data/type/ExprType.java b/core/src/main/java/org/opensearch/sql/data/type/ExprType.java
index 782714ba70..58d6ee346b 100644
--- a/core/src/main/java/org/opensearch/sql/data/type/ExprType.java
+++ b/core/src/main/java/org/opensearch/sql/data/type/ExprType.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.type;
 
 import static org.opensearch.sql.data.type.ExprCoreType.UNKNOWN;
@@ -13,13 +12,9 @@
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * The Type of {@link Expression} and {@link ExprValue}.
- */
+/** The Type of {@link Expression} and {@link ExprValue}. */
 public interface ExprType {
-  /**
-   * Is compatible with other types.
-   */
+  /** Is compatible with other types. */
   default boolean isCompatible(ExprType other) {
     if (this.equals(other)) {
       return true;
@@ -37,30 +32,25 @@ default boolean isCompatible(ExprType other) {
   }
 
   /**
-   * Should cast this type to other type or not. By default, cast is always required
-   * if the given type is different from this type.
+   * Should cast this type to other type or not. By default, cast is always required if the given
+   * type is different from this type.
+   *
    * @param other other data type
-   * @return      true if cast is required, otherwise false
+   * @return true if cast is required, otherwise false
    */
   default boolean shouldCast(ExprType other) {
     return !this.equals(other);
   }
 
-  /**
-   * Get the parent type.
-   */
+  /** Get the parent type. */
   default List<ExprType> getParent() {
     return Arrays.asList(UNKNOWN);
   }
 
-  /**
-   * Get the type name.
-   */
+  /** Get the type name. */
   String typeName();
 
-  /**
-   * Get the legacy type name for old engine.
-   */
+  /** Get the legacy type name for old engine. */
   default String legacyTypeName() {
     return typeName();
   }
diff --git a/core/src/main/java/org/opensearch/sql/data/type/WideningTypeRule.java b/core/src/main/java/org/opensearch/sql/data/type/WideningTypeRule.java
index e1f356782f..299c35812c 100644
--- a/core/src/main/java/org/opensearch/sql/data/type/WideningTypeRule.java
+++ b/core/src/main/java/org/opensearch/sql/data/type/WideningTypeRule.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.type;
 
 import static org.opensearch.sql.data.type.ExprCoreType.UNKNOWN;
@@ -13,15 +12,18 @@
 
 /**
  * The definition of widening type rule for expression value.
- * ExprType     Widens to data types
- * INTEGER      LONG, FLOAT, DOUBLE
- * LONG         FLOAT, DOUBLE
- * FLOAT        DOUBLE
- * DOUBLE       DOUBLE
- * STRING       STRING
- * BOOLEAN      BOOLEAN
- * ARRAY        ARRAY
- * STRUCT       STRUCT
+ *
+ * <table border="3">
+ * <tr><th>ExprType</th><th>Widens to data types</th></tr>
+ * <tr><td>INTEGER</td><td>LONG, FLOAT, DOUBLE</td></tr>
+ * <tr><td>LONG</td><td>FLOAT, DOUBLE</td></tr>
+ * <tr><td>FLOAT</td><td>DOUBLE</td></tr>
+ * <tr><td>DOUBLE</td><td>DOUBLE</td></tr>
+ * <tr><td>STRING</td><td>STRING</td></tr>
+ * <tr><td>BOOLEAN</td><td>BOOLEAN</td></tr>
+ * <tr><td>ARRAY</td><td>ARRAY</td></tr>
+ * <tr><td>STRUCT</td><td>STRUCT</td></tr>
+ * </table>
  */
 @UtilityClass
 public class WideningTypeRule {
@@ -29,8 +31,8 @@ public class WideningTypeRule {
   public static final int TYPE_EQUAL = 0;
 
   /**
-   * The widening distance is calculated from the leaf to root.
-   * e.g. distance(INTEGER, FLOAT) = 2, but distance(FLOAT, INTEGER) = IMPOSSIBLE_WIDENING
+   * The widening distance is calculated from the leaf to root. e.g. distance(INTEGER, FLOAT) = 2,
+   * but distance(FLOAT, INTEGER) = IMPOSSIBLE_WIDENING
    *
    * @param type1 widen from type
    * @param type2 widen to type
@@ -48,14 +50,14 @@ private static int distance(ExprType type1, ExprType type2, int distance) {
     } else {
       return type1.getParent().stream()
           .map(parentOfType1 -> distance(parentOfType1, type2, distance + 1))
-          .reduce(Math::min).get();
+          .reduce(Math::min)
+          .get();
     }
   }
 
   /**
-   * The max type among two types. The max is defined as follow
-   * if type1 could widen to type2, then max is type2, vice versa
-   * if type1 could't widen to type2 and type2 could't widen to type1,
+   * The max type among two types. The max is defined as follows if type1 could widen to type2, then
+   * max is type2, vice versa if type1 couldn't widen to type2 and type2 could't widen to type1,
    * then throw {@link ExpressionEvaluationException}.
    *
    * @param type1 type1
diff --git a/core/src/main/java/org/opensearch/sql/data/utils/ExprValueOrdering.java b/core/src/main/java/org/opensearch/sql/data/utils/ExprValueOrdering.java
index ef390dc53b..812c8dba3d 100644
--- a/core/src/main/java/org/opensearch/sql/data/utils/ExprValueOrdering.java
+++ b/core/src/main/java/org/opensearch/sql/data/utils/ExprValueOrdering.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import com.google.common.collect.Ordering;
diff --git a/core/src/main/java/org/opensearch/sql/data/utils/NaturalExprValueOrdering.java b/core/src/main/java/org/opensearch/sql/data/utils/NaturalExprValueOrdering.java
index 13c3606f72..f3285fd6f9 100644
--- a/core/src/main/java/org/opensearch/sql/data/utils/NaturalExprValueOrdering.java
+++ b/core/src/main/java/org/opensearch/sql/data/utils/NaturalExprValueOrdering.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import com.google.common.collect.Ordering;
diff --git a/core/src/main/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrdering.java b/core/src/main/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrdering.java
index 03890bba61..82fac55e0c 100644
--- a/core/src/main/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrdering.java
+++ b/core/src/main/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrdering.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import com.google.common.collect.Ordering;
diff --git a/core/src/main/java/org/opensearch/sql/data/utils/NullsLastExprValueOrdering.java b/core/src/main/java/org/opensearch/sql/data/utils/NullsLastExprValueOrdering.java
index 589d4b3043..0221e50887 100644
--- a/core/src/main/java/org/opensearch/sql/data/utils/NullsLastExprValueOrdering.java
+++ b/core/src/main/java/org/opensearch/sql/data/utils/NullsLastExprValueOrdering.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import com.google.common.collect.Ordering;
diff --git a/core/src/main/java/org/opensearch/sql/data/utils/ReverseExprValueOrdering.java b/core/src/main/java/org/opensearch/sql/data/utils/ReverseExprValueOrdering.java
index 65fceacf99..ca3cb251f4 100644
--- a/core/src/main/java/org/opensearch/sql/data/utils/ReverseExprValueOrdering.java
+++ b/core/src/main/java/org/opensearch/sql/data/utils/ReverseExprValueOrdering.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import com.google.common.collect.Ordering;
diff --git a/core/src/main/java/org/opensearch/sql/datasource/DataSourceService.java b/core/src/main/java/org/opensearch/sql/datasource/DataSourceService.java
index 37e6f8e085..a8caa4719a 100644
--- a/core/src/main/java/org/opensearch/sql/datasource/DataSourceService.java
+++ b/core/src/main/java/org/opensearch/sql/datasource/DataSourceService.java
@@ -5,39 +5,86 @@
 
 package org.opensearch.sql.datasource;
 
+import java.util.Map;
 import java.util.Set;
 import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 
-/**
- * DataSource Service manage {@link DataSource}.
- */
+/** DataSource Service manage {@link DataSource}. */
 public interface DataSourceService {
 
   /**
-   * Returns all DataSource objects.
+   * Returns {@link DataSource} corresponding to the DataSource name only if the datasource is
+   * active and authorized.
    *
-   * @return set of {@link DataSource}.
+   * @param dataSourceName Name of the {@link DataSource}.
+   * @return {@link DataSource}.
    */
-  Set<DataSource> getDataSources();
+  DataSource getDataSource(String dataSourceName);
 
   /**
-   * Returns {@link DataSource} with corresponding to the DataSource name.
+   * Returns all dataSource Metadata objects. The returned objects won't contain any of the
+   * credential info.
    *
-   * @param dataSourceName Name of the {@link DataSource}.
-   * @return {@link DataSource}.
+   * @param isDefaultDataSourceRequired is used to specify if default opensearch connector is
+   *     required in the output list.
+   * @return set of {@link DataSourceMetadata}.
    */
-  DataSource getDataSource(String dataSourceName);
+  Set<DataSourceMetadata> getDataSourceMetadata(boolean isDefaultDataSourceRequired);
+
+  /**
+   * Returns dataSourceMetadata object with specific name. The returned objects won't contain any
+   * crendetial info.
+   *
+   * @param name name of the {@link DataSource}.
+   * @return set of {@link DataSourceMetadata}.
+   */
+  DataSourceMetadata getDataSourceMetadata(String name);
 
   /**
    * Register {@link DataSource} defined by {@link DataSourceMetadata}.
    *
-   * @param metadatas list of {@link DataSourceMetadata}.
+   * @param metadata {@link DataSourceMetadata}.
+   */
+  void createDataSource(DataSourceMetadata metadata);
+
+  /**
+   * Updates {@link DataSource} corresponding to dataSourceMetadata (all fields needed).
+   *
+   * @param dataSourceMetadata {@link DataSourceMetadata}.
+   */
+  void updateDataSource(DataSourceMetadata dataSourceMetadata);
+
+  /**
+   * Patches {@link DataSource} corresponding to the given name (only fields to be changed needed).
+   *
+   * @param dataSourceData
+   */
+  void patchDataSource(Map<String, Object> dataSourceData);
+
+  /**
+   * Deletes {@link DataSource} corresponding to the DataSource name.
+   *
+   * @param dataSourceName name of the {@link DataSource}.
    */
-  void addDataSource(DataSourceMetadata... metadatas);
+  void deleteDataSource(String dataSourceName);
 
   /**
-   * remove all the registered {@link DataSource}.
+   * Returns true {@link Boolean} if datasource with dataSourceName exists or else false {@link
+   * Boolean}.
+   *
+   * @param dataSourceName name of the {@link DataSource}.
+   */
+  Boolean dataSourceExists(String dataSourceName);
+
+  /**
+   * Performs authorization and datasource status check and then returns RawDataSourceMetadata.
+   * Specifically for addressing use cases in SparkQueryDispatcher.
+   *
+   * @param dataSourceName of the {@link DataSource}
+   * @param context request context used by the implementation. It is passed by async-query-core.
+   *     refer {@link RequestContext}
    */
-  void clear();
+  DataSourceMetadata verifyDataSourceAccessAndGetRawMetadata(
+      String dataSourceName, RequestContext context);
 }
diff --git a/core/src/main/java/org/opensearch/sql/datasource/DataSourceServiceImpl.java b/core/src/main/java/org/opensearch/sql/datasource/DataSourceServiceImpl.java
deleted file mode 100644
index 274024e548..0000000000
--- a/core/src/main/java/org/opensearch/sql/datasource/DataSourceServiceImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.datasource;
-
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-import org.opensearch.sql.common.utils.StringUtils;
-import org.opensearch.sql.datasource.model.DataSource;
-import org.opensearch.sql.datasource.model.DataSourceMetadata;
-import org.opensearch.sql.datasource.model.DataSourceType;
-import org.opensearch.sql.storage.DataSourceFactory;
-
-/**
- * Default implementation of {@link DataSourceService}. It is per-jvm single instance.
- *
- * <p>{@link DataSourceService} is constructed by the list of {@link DataSourceFactory} at service
- * bootstrap time. The set of {@link DataSourceFactory} is immutable. Client could add {@link
- * DataSource} defined by {@link DataSourceMetadata} at any time. {@link DataSourceService} use
- * {@link DataSourceFactory} to create {@link DataSource}.
- */
-public class DataSourceServiceImpl implements DataSourceService {
-
-  private static String DATASOURCE_NAME_REGEX = "[@*A-Za-z]+?[*a-zA-Z_\\-0-9]*";
-
-  private final ConcurrentHashMap<String, DataSource> dataSourceMap;
-
-  private final Map<DataSourceType, DataSourceFactory> dataSourceFactoryMap;
-
-  /**
-   * Construct from the set of {@link DataSourceFactory} at bootstrap time.
-   */
-  public DataSourceServiceImpl(Set<DataSourceFactory> dataSourceFactories) {
-    dataSourceFactoryMap =
-        dataSourceFactories.stream()
-            .collect(Collectors.toMap(DataSourceFactory::getDataSourceType, f -> f));
-    dataSourceMap = new ConcurrentHashMap<>();
-  }
-
-  @Override
-  public Set<DataSource> getDataSources() {
-    return Set.copyOf(dataSourceMap.values());
-  }
-
-  @Override
-  public DataSource getDataSource(String dataSourceName) {
-    if (!dataSourceMap.containsKey(dataSourceName)) {
-      throw new IllegalArgumentException(
-          String.format("DataSource with name %s doesn't exist.", dataSourceName));
-    }
-    return dataSourceMap.get(dataSourceName);
-  }
-
-  @Override
-  public void addDataSource(DataSourceMetadata... metadatas) {
-    for (DataSourceMetadata metadata : metadatas) {
-      validateDataSourceMetaData(metadata);
-      dataSourceMap.put(
-          metadata.getName(),
-          dataSourceFactoryMap.get(metadata.getConnector()).createDataSource(metadata));
-    }
-  }
-
-  @Override
-  public void clear() {
-    dataSourceMap.clear();
-  }
-
-  /**
-   * This can be moved to a different validator class when we introduce more connectors.
-   *
-   * @param metadata {@link DataSourceMetadata}.
-   */
-  private void validateDataSourceMetaData(DataSourceMetadata metadata) {
-    Preconditions.checkArgument(
-        !Strings.isNullOrEmpty(metadata.getName()),
-        "Missing Name Field from a DataSource. Name is a required parameter.");
-    Preconditions.checkArgument(
-        !dataSourceMap.containsKey(metadata.getName()),
-        StringUtils.format(
-            "Datasource name should be unique, Duplicate datasource found %s.",
-            metadata.getName()));
-    Preconditions.checkArgument(
-        metadata.getName().matches(DATASOURCE_NAME_REGEX),
-        StringUtils.format(
-            "DataSource Name: %s contains illegal characters. Allowed characters: a-zA-Z0-9_-*@.",
-            metadata.getName()));
-    Preconditions.checkArgument(
-        !Objects.isNull(metadata.getProperties()),
-        "Missing properties field in catalog configuration. Properties are required parameters.");
-  }
-}
diff --git a/core/src/main/java/org/opensearch/sql/datasource/RequestContext.java b/core/src/main/java/org/opensearch/sql/datasource/RequestContext.java
new file mode 100644
index 0000000000..199930d340
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/datasource/RequestContext.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasource;
+
+/**
+ * Context interface to provide additional request related information. It is introduced to allow
+ * async-query-core library user to pass request context information to implementations of data
+ * accessors.
+ */
+public interface RequestContext {
+  Object getAttribute(String name);
+}
diff --git a/core/src/main/java/org/opensearch/sql/datasource/model/DataSource.java b/core/src/main/java/org/opensearch/sql/datasource/model/DataSource.java
index 5deb460961..9623102efb 100644
--- a/core/src/main/java/org/opensearch/sql/datasource/model/DataSource.java
+++ b/core/src/main/java/org/opensearch/sql/datasource/model/DataSource.java
@@ -12,9 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.storage.StorageEngine;
 
-/**
- * Each user configured datasource mapping to one instance of DataSource per JVM.
- */
+/** Each user configured datasource mapping to one instance of DataSource per JVM. */
 @Getter
 @RequiredArgsConstructor
 @EqualsAndHashCode
@@ -24,7 +22,5 @@ public class DataSource {
 
   private final DataSourceType connectorType;
 
-  @EqualsAndHashCode.Exclude
-  private final StorageEngine storageEngine;
-
+  @EqualsAndHashCode.Exclude private final StorageEngine storageEngine;
 }
diff --git a/core/src/main/java/org/opensearch/sql/datasource/model/DataSourceMetadata.java b/core/src/main/java/org/opensearch/sql/datasource/model/DataSourceMetadata.java
index f97d272bb9..6efc7c935c 100644
--- a/core/src/main/java/org/opensearch/sql/datasource/model/DataSourceMetadata.java
+++ b/core/src/main/java/org/opensearch/sql/datasource/model/DataSourceMetadata.java
@@ -5,44 +5,244 @@
 
 package org.opensearch.sql.datasource.model;
 
-
 import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 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.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 import org.opensearch.sql.datasource.DataSourceService;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 @Getter
-@Setter
 @EqualsAndHashCode
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class DataSourceMetadata {
 
-  @JsonProperty(required = true)
-  private String name;
+  public static final String DEFAULT_RESULT_INDEX = "query_execution_result";
+  public static final int MAX_RESULT_INDEX_NAME_SIZE = 255;
+  private static String DATASOURCE_NAME_REGEX = "[@*A-Za-z]+?[*a-zA-Z_\\-0-9]*";
+  // OS doesn’t allow uppercase: https://tinyurl.com/yse2xdbx
+  public static final String RESULT_INDEX_NAME_PATTERN = "[a-z0-9_-]+";
+  public static String INVALID_RESULT_INDEX_NAME_SIZE =
+      "Result index name size must contains less than "
+          + MAX_RESULT_INDEX_NAME_SIZE
+          + " characters.";
+  public static String INVALID_CHAR_IN_RESULT_INDEX_NAME =
+      "Result index name has invalid character. Valid characters are a-z, 0-9, -(hyphen) and"
+          + " _(underscore).";
+  public static String INVALID_RESULT_INDEX_PREFIX =
+      "Result index must start with " + DEFAULT_RESULT_INDEX;
+
+  @JsonProperty private String name;
 
-  @JsonProperty(required = true)
+  @JsonProperty private String description;
+
+  @JsonProperty
   @JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
   private DataSourceType connector;
 
-  @JsonProperty(required = true)
-  private Map<String, String> properties;
+  @JsonProperty private List<String> allowedRoles;
+
+  @JsonProperty private Map<String, String> properties;
+
+  @JsonProperty private String resultIndex;
+
+  @JsonProperty private DataSourceStatus status;
+
+  public static Function<String, String> DATASOURCE_TO_RESULT_INDEX =
+      datasourceName -> String.format("%s_%s", DEFAULT_RESULT_INDEX, datasourceName);
+
+  private DataSourceMetadata(Builder builder) {
+    this.name = builder.name;
+    this.description = builder.description;
+    this.connector = builder.connector;
+    this.allowedRoles = builder.allowedRoles;
+    this.properties = builder.properties;
+    this.resultIndex = builder.resultIndex;
+    this.status = builder.status;
+  }
+
+  public static class Builder {
+    private String name;
+    private String description;
+    private DataSourceType connector;
+    private List<String> allowedRoles;
+    private Map<String, String> properties;
+    private String resultIndex; // Optional
+    private DataSourceStatus status;
+
+    public Builder() {}
+
+    public Builder(DataSourceMetadata dataSourceMetadata) {
+      this.name = dataSourceMetadata.getName();
+      this.description = dataSourceMetadata.getDescription();
+      this.connector = dataSourceMetadata.getConnector();
+      this.resultIndex = dataSourceMetadata.getResultIndex();
+      this.status = dataSourceMetadata.getStatus();
+      this.allowedRoles = new ArrayList<>(dataSourceMetadata.getAllowedRoles());
+      this.properties = new HashMap<>(dataSourceMetadata.getProperties());
+    }
+
+    public Builder setName(String name) {
+      this.name = name;
+      return this;
+    }
+
+    public Builder setDescription(String description) {
+      this.description = description;
+      return this;
+    }
+
+    public Builder setConnector(DataSourceType connector) {
+      this.connector = connector;
+      return this;
+    }
+
+    public Builder setAllowedRoles(List<String> allowedRoles) {
+      this.allowedRoles = allowedRoles;
+      return this;
+    }
+
+    public Builder setProperties(Map<String, String> properties) {
+      this.properties = properties;
+      return this;
+    }
+
+    public Builder setResultIndex(String resultIndex) {
+      this.resultIndex = resultIndex;
+      return this;
+    }
+
+    public Builder setDataSourceStatus(DataSourceStatus status) {
+      this.status = status;
+      return this;
+    }
+
+    public DataSourceMetadata validateAndBuild() {
+      validateMissingAttributes();
+      validateName();
+      validateCustomResultIndex();
+      return build();
+    }
+
+    public DataSourceMetadata build() {
+      fillNullAttributes();
+      return new DataSourceMetadata(this);
+    }
+
+    private void fillNullAttributes() {
+      if (resultIndex == null) {
+        this.resultIndex = fromNameToCustomResultIndex();
+      }
+      if (status == null) {
+        this.status = DataSourceStatus.ACTIVE;
+      }
+      if (description == null) {
+        this.description = StringUtils.EMPTY;
+      }
+      if (properties == null) {
+        this.properties = ImmutableMap.of();
+      }
+      if (allowedRoles == null) {
+        this.allowedRoles = ImmutableList.of();
+      }
+    }
+
+    private void validateMissingAttributes() {
+      List<String> missingAttributes = new ArrayList<>();
+      if (name == null) {
+        missingAttributes.add("name");
+      }
+      if (connector == null) {
+        missingAttributes.add("connector");
+      }
+      if (!missingAttributes.isEmpty()) {
+        String errorMessage =
+            "Datasource configuration error: "
+                + String.join(", ", missingAttributes)
+                + " cannot be null or empty.";
+        throw new IllegalArgumentException(errorMessage);
+      }
+    }
+
+    private void validateName() {
+      if (!name.matches(DATASOURCE_NAME_REGEX)) {
+        throw new IllegalArgumentException(
+            String.format(
+                "DataSource Name: %s contains illegal characters. Allowed characters:"
+                    + " a-zA-Z0-9_-*@.",
+                name));
+      }
+    }
+
+    private void validateCustomResultIndex() {
+      if (resultIndex == null) {
+        return;
+      }
+      StringBuilder errorMessage = new StringBuilder();
+      if (resultIndex.length() > MAX_RESULT_INDEX_NAME_SIZE) {
+        errorMessage.append(INVALID_RESULT_INDEX_NAME_SIZE);
+      }
+      if (!resultIndex.matches(RESULT_INDEX_NAME_PATTERN)) {
+        errorMessage.append(INVALID_CHAR_IN_RESULT_INDEX_NAME);
+      }
+      if (!resultIndex.startsWith(DEFAULT_RESULT_INDEX)) {
+        errorMessage.append(INVALID_RESULT_INDEX_PREFIX);
+      }
+      if (errorMessage.length() > 0) {
+        throw new IllegalArgumentException(errorMessage.toString());
+      }
+    }
+
+    /**
+     * Since we are using datasource name to create result index, we need to make sure that the
+     * final name is valid
+     *
+     * @param resultIndex result index name
+     * @return valid result index name
+     */
+    private String convertToValidResultIndex(String resultIndex) {
+      // Limit Length
+      if (resultIndex.length() > MAX_RESULT_INDEX_NAME_SIZE) {
+        resultIndex = resultIndex.substring(0, MAX_RESULT_INDEX_NAME_SIZE);
+      }
+
+      // Pattern Matching: Remove characters that don't match the pattern
+      StringBuilder validChars = new StringBuilder();
+      for (char c : resultIndex.toCharArray()) {
+        if (String.valueOf(c).matches(RESULT_INDEX_NAME_PATTERN)) {
+          validChars.append(c);
+        }
+      }
+      return validChars.toString();
+    }
+
+    private String fromNameToCustomResultIndex() {
+      return convertToValidResultIndex(DATASOURCE_TO_RESULT_INDEX.apply(name.toLowerCase()));
+    }
+  }
 
   /**
    * Default OpenSearch {@link DataSourceMetadata}. Which is used to register default OpenSearch
    * {@link DataSource} to {@link DataSourceService}.
    */
   public static DataSourceMetadata defaultOpenSearchDataSourceMetadata() {
-    DataSourceMetadata dataSourceMetadata = new DataSourceMetadata();
-    dataSourceMetadata.setName(DEFAULT_DATASOURCE_NAME);
-    dataSourceMetadata.setConnector(DataSourceType.OPENSEARCH);
-    dataSourceMetadata.setProperties(ImmutableMap.of());
-    return dataSourceMetadata;
+    return new DataSourceMetadata.Builder()
+        .setName(DEFAULT_DATASOURCE_NAME)
+        .setDescription(StringUtils.EMPTY)
+        .setConnector(DataSourceType.OPENSEARCH)
+        .setAllowedRoles(Collections.emptyList())
+        .setProperties(ImmutableMap.of())
+        .validateAndBuild();
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/datasource/model/DataSourceStatus.java b/core/src/main/java/org/opensearch/sql/datasource/model/DataSourceStatus.java
new file mode 100644
index 0000000000..bca47217c1
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/datasource/model/DataSourceStatus.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasource.model;
+
+/** Enum for capturing the current datasource status. */
+public enum DataSourceStatus {
+  ACTIVE("active"),
+  DISABLED("disabled");
+
+  private String text;
+
+  DataSourceStatus(String text) {
+    this.text = text;
+  }
+
+  public String getText() {
+    return this.text;
+  }
+
+  /**
+   * Get DataSourceStatus from text.
+   *
+   * @param text text.
+   * @return DataSourceStatus {@link DataSourceStatus}.
+   */
+  public static DataSourceStatus fromString(String text) {
+    for (DataSourceStatus dataSourceStatus : DataSourceStatus.values()) {
+      if (dataSourceStatus.text.equalsIgnoreCase(text)) {
+        return dataSourceStatus;
+      }
+    }
+    throw new IllegalArgumentException("No DataSourceStatus with text " + text + " found");
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/datasource/model/DataSourceType.java b/core/src/main/java/org/opensearch/sql/datasource/model/DataSourceType.java
index 1895b431c7..ac8ae1a5e1 100644
--- a/core/src/main/java/org/opensearch/sql/datasource/model/DataSourceType.java
+++ b/core/src/main/java/org/opensearch/sql/datasource/model/DataSourceType.java
@@ -5,8 +5,57 @@
 
 package org.opensearch.sql.datasource.model;
 
-public enum DataSourceType {
-  PROMETHEUS,
-  OPENSEARCH,
-  FILESYSTEM
+import java.util.HashMap;
+import java.util.Map;
+import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@EqualsAndHashCode
+public class DataSourceType {
+  public static DataSourceType PROMETHEUS = new DataSourceType("PROMETHEUS");
+  public static DataSourceType OPENSEARCH = new DataSourceType("OPENSEARCH");
+  public static DataSourceType SPARK = new DataSourceType("SPARK");
+  public static DataSourceType S3GLUE = new DataSourceType("S3GLUE");
+  public static DataSourceType SECURITY_LAKE = new DataSourceType("SECURITY_LAKE");
+
+  // Map from uppercase DataSourceType name to DataSourceType object
+  private static Map<String, DataSourceType> knownValues = new HashMap<>();
+
+  static {
+    register(PROMETHEUS, OPENSEARCH, SPARK, S3GLUE, SECURITY_LAKE);
+  }
+
+  private final String name;
+
+  public String name() {
+    return name;
+  }
+
+  @Override
+  public String toString() {
+    return name;
+  }
+
+  /** Register DataSourceType to be used in fromString method */
+  public static void register(DataSourceType... dataSourceTypes) {
+    for (DataSourceType type : dataSourceTypes) {
+      String upperCaseName = type.name().toUpperCase();
+      if (!knownValues.containsKey(upperCaseName)) {
+        knownValues.put(type.name().toUpperCase(), type);
+      } else {
+        throw new IllegalArgumentException(
+            "DataSourceType with name " + type.name() + " already exists");
+      }
+    }
+  }
+
+  public static DataSourceType fromString(String name) {
+    String upperCaseName = name.toUpperCase();
+    if (knownValues.containsKey(upperCaseName)) {
+      return knownValues.get(upperCaseName);
+    } else {
+      throw new IllegalArgumentException("No DataSourceType with name " + name + " found");
+    }
+  }
 }
diff --git a/core/src/main/java/org/opensearch/sql/datasource/model/auth/AuthenticationType.java b/core/src/main/java/org/opensearch/sql/datasource/model/auth/AuthenticationType.java
deleted file mode 100644
index 9cf3e01509..0000000000
--- a/core/src/main/java/org/opensearch/sql/datasource/model/auth/AuthenticationType.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.opensearch.sql.datasource.model.auth;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public enum AuthenticationType {
-
-  BASICAUTH("basicauth"), AWSSIGV4AUTH("awssigv4");
-
-  private String name;
-
-  private static final Map<String, AuthenticationType> ENUM_MAP;
-
-  AuthenticationType(String name) {
-    this.name = name;
-  }
-
-  public String getName() {
-    return this.name;
-  }
-
-  static {
-    Map<String, AuthenticationType> map = new HashMap<>();
-    for (AuthenticationType instance : AuthenticationType.values()) {
-      map.put(instance.getName().toLowerCase(), instance);
-    }
-    ENUM_MAP = Collections.unmodifiableMap(map);
-  }
-
-  public static AuthenticationType get(String name) {
-    return ENUM_MAP.get(name.toLowerCase());
-  }
-}
diff --git a/core/src/main/java/org/opensearch/sql/exception/ExpressionEvaluationException.java b/core/src/main/java/org/opensearch/sql/exception/ExpressionEvaluationException.java
index 65ea187666..d11f6e4f9e 100644
--- a/core/src/main/java/org/opensearch/sql/exception/ExpressionEvaluationException.java
+++ b/core/src/main/java/org/opensearch/sql/exception/ExpressionEvaluationException.java
@@ -3,12 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.exception;
 
-/**
- * Exception for Expression Evaluation.
- */
+/** Exception for Expression Evaluation. */
 public class ExpressionEvaluationException extends QueryEngineException {
   public ExpressionEvaluationException(String message) {
     super(message);
diff --git a/core/src/main/java/org/opensearch/sql/exception/NoCursorException.java b/core/src/main/java/org/opensearch/sql/exception/NoCursorException.java
new file mode 100644
index 0000000000..57f75c2cb0
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/exception/NoCursorException.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.exception;
+
+/**
+ * This should be thrown on serialization of a PhysicalPlan tree if paging is finished. Processing
+ * of such exception should outcome of responding no cursor to the user.
+ */
+public class NoCursorException extends RuntimeException {}
diff --git a/core/src/main/java/org/opensearch/sql/exception/QueryEngineException.java b/core/src/main/java/org/opensearch/sql/exception/QueryEngineException.java
index ce90ecff5c..b3d13bef71 100644
--- a/core/src/main/java/org/opensearch/sql/exception/QueryEngineException.java
+++ b/core/src/main/java/org/opensearch/sql/exception/QueryEngineException.java
@@ -3,12 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.exception;
 
-/**
- * Query analysis abstract exception.
- */
+/** Query analysis abstract exception. */
 public class QueryEngineException extends RuntimeException {
 
   public QueryEngineException(String message) {
diff --git a/core/src/main/java/org/opensearch/sql/exception/SemanticCheckException.java b/core/src/main/java/org/opensearch/sql/exception/SemanticCheckException.java
index 8673dbfc3c..6e0c184af8 100644
--- a/core/src/main/java/org/opensearch/sql/exception/SemanticCheckException.java
+++ b/core/src/main/java/org/opensearch/sql/exception/SemanticCheckException.java
@@ -3,12 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.exception;
 
-/**
- * Semantic Check Exception.
- */
+/** Semantic Check Exception. */
 public class SemanticCheckException extends QueryEngineException {
   public SemanticCheckException(String message) {
     super(message);
diff --git a/core/src/main/java/org/opensearch/sql/exception/UnsupportedCursorRequestException.java b/core/src/main/java/org/opensearch/sql/exception/UnsupportedCursorRequestException.java
new file mode 100644
index 0000000000..8117304571
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/exception/UnsupportedCursorRequestException.java
@@ -0,0 +1,9 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.exception;
+
+/** This should be thrown by V2 engine to support fallback scenario. */
+public class UnsupportedCursorRequestException extends RuntimeException {}
diff --git a/core/src/main/java/org/opensearch/sql/executor/ExecutionContext.java b/core/src/main/java/org/opensearch/sql/executor/ExecutionContext.java
index 8a3162068f..22d14972eb 100644
--- a/core/src/main/java/org/opensearch/sql/executor/ExecutionContext.java
+++ b/core/src/main/java/org/opensearch/sql/executor/ExecutionContext.java
@@ -9,12 +9,9 @@
 import lombok.Getter;
 import org.opensearch.sql.storage.split.Split;
 
-/**
- * Execution context hold planning related information.
- */
+/** Execution context hold planning related information. */
 public class ExecutionContext {
-  @Getter
-  private final Optional<Split> split;
+  @Getter private final Optional<Split> split;
 
   public ExecutionContext(Split split) {
     this.split = Optional.of(split);
diff --git a/core/src/main/java/org/opensearch/sql/executor/ExecutionEngine.java b/core/src/main/java/org/opensearch/sql/executor/ExecutionEngine.java
index 1936a0f517..43b8ccb62e 100644
--- a/core/src/main/java/org/opensearch/sql/executor/ExecutionEngine.java
+++ b/core/src/main/java/org/opensearch/sql/executor/ExecutionEngine.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.executor;
 
 import java.util.List;
@@ -14,45 +13,41 @@
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.executor.pagination.Cursor;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 
-/**
- * Execution engine that encapsulates execution details.
- */
+/** Execution engine that encapsulates execution details. */
 public interface ExecutionEngine {
 
   /**
-   * Execute physical plan and call back response listener.
+   * Execute physical plan and call back response listener.<br>
    * Todo. deprecated this interface after finalize {@link ExecutionContext}.
    *
-   * @param plan     executable physical plan
+   * @param plan executable physical plan
    * @param listener response listener
    */
   void execute(PhysicalPlan plan, ResponseListener<QueryResponse> listener);
 
-  /**
-   * Execute physical plan with {@link ExecutionContext} and call back response listener.
-   */
-  void execute(PhysicalPlan plan, ExecutionContext context,
-               ResponseListener<QueryResponse> listener);
+  /** Execute physical plan with {@link ExecutionContext} and call back response listener. */
+  void execute(
+      PhysicalPlan plan, ExecutionContext context, ResponseListener<QueryResponse> listener);
 
   /**
-   * Explain physical plan and call back response listener. The reason why this has to
-   * be part of execution engine interface is that the physical plan probably needs to
-   * be executed to get more info for profiling, such as actual execution time, rows fetched etc.
+   * Explain physical plan and call back response listener. The reason why this has to be part of
+   * execution engine interface is that the physical plan probably needs to be executed to get more
+   * info for profiling, such as actual execution time, rows fetched etc.
    *
-   * @param plan     physical plan to explain
+   * @param plan physical plan to explain
    * @param listener response listener
    */
   void explain(PhysicalPlan plan, ResponseListener<ExplainResponse> listener);
 
-  /**
-   * Data class that encapsulates ExprValue.
-   */
+  /** Data class that encapsulates ExprValue. */
   @Data
   class QueryResponse {
     private final Schema schema;
     private final List<ExprValue> results;
+    private final Cursor cursor;
   }
 
   @Data
@@ -68,8 +63,8 @@ public static class Column {
   }
 
   /**
-   * Data class that encapsulates explain result. This can help decouple core engine
-   * from concrete explain response format.
+   * Data class that encapsulates explain result. This can help decouple core engine from concrete
+   * explain response format.
    */
   @Data
   class ExplainResponse {
@@ -84,5 +79,4 @@ class ExplainResponseNode {
     private Map<String, Object> description;
     private List<ExplainResponseNode> children;
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/executor/Explain.java b/core/src/main/java/org/opensearch/sql/executor/Explain.java
index db2f4bdb11..fffbe6f693 100644
--- a/core/src/main/java/org/opensearch/sql/executor/Explain.java
+++ b/core/src/main/java/org/opensearch/sql/executor/Explain.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.executor;
 
 import com.google.common.collect.ImmutableMap;
@@ -23,6 +22,7 @@
 import org.opensearch.sql.planner.physical.EvalOperator;
 import org.opensearch.sql.planner.physical.FilterOperator;
 import org.opensearch.sql.planner.physical.LimitOperator;
+import org.opensearch.sql.planner.physical.NestedOperator;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
 import org.opensearch.sql.planner.physical.ProjectOperator;
@@ -30,15 +30,14 @@
 import org.opensearch.sql.planner.physical.RemoveOperator;
 import org.opensearch.sql.planner.physical.RenameOperator;
 import org.opensearch.sql.planner.physical.SortOperator;
+import org.opensearch.sql.planner.physical.TakeOrderedOperator;
 import org.opensearch.sql.planner.physical.ValuesOperator;
 import org.opensearch.sql.planner.physical.WindowOperator;
 import org.opensearch.sql.storage.TableScanOperator;
 
-/**
- * Visitor that explains a physical plan to JSON format.
- */
+/** Visitor that explains a physical plan to JSON format. */
 public class Explain extends PhysicalPlanNodeVisitor<ExplainResponseNode, Object>
-                     implements Function<PhysicalPlan, ExplainResponse> {
+    implements Function<PhysicalPlan, ExplainResponse> {
 
   @Override
   public ExplainResponse apply(PhysicalPlan plan) {
@@ -47,103 +46,173 @@ public ExplainResponse apply(PhysicalPlan plan) {
 
   @Override
   public ExplainResponseNode visitProject(ProjectOperator node, Object context) {
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "fields", node.getProjectList().toString())));
+    return explain(
+        node,
+        context,
+        explainNode ->
+            explainNode.setDescription(
+                ImmutableMap.of("fields", node.getProjectList().toString())));
   }
 
   @Override
   public ExplainResponseNode visitFilter(FilterOperator node, Object context) {
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "conditions", node.getConditions().toString())));
+    return explain(
+        node,
+        context,
+        explainNode ->
+            explainNode.setDescription(
+                ImmutableMap.of("conditions", node.getConditions().toString())));
   }
 
   @Override
   public ExplainResponseNode visitSort(SortOperator node, Object context) {
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "sortList", describeSortList(node.getSortList()))));
+    return explain(
+        node,
+        context,
+        explainNode ->
+            explainNode.setDescription(
+                ImmutableMap.of("sortList", describeSortList(node.getSortList()))));
+  }
+
+  @Override
+  public ExplainResponseNode visitTakeOrdered(TakeOrderedOperator node, Object context) {
+    return explain(
+        node,
+        context,
+        explainNode ->
+            explainNode.setDescription(
+                ImmutableMap.of(
+                    "limit", node.getLimit(),
+                    "offset", node.getOffset(),
+                    "sortList", describeSortList(node.getSortList()))));
   }
 
   @Override
   public ExplainResponseNode visitTableScan(TableScanOperator node, Object context) {
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "request", node.toString())));
+    return explain(
+        node,
+        context,
+        explainNode -> explainNode.setDescription(ImmutableMap.of("request", node.toString())));
   }
 
   @Override
   public ExplainResponseNode visitAggregation(AggregationOperator node, Object context) {
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "aggregators", node.getAggregatorList().toString(),
-        "groupBy", node.getGroupByExprList().toString())));
+    return explain(
+        node,
+        context,
+        explainNode ->
+            explainNode.setDescription(
+                ImmutableMap.of(
+                    "aggregators", node.getAggregatorList().toString(),
+                    "groupBy", node.getGroupByExprList().toString())));
   }
 
   @Override
   public ExplainResponseNode visitWindow(WindowOperator node, Object context) {
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "function", node.getWindowFunction().toString(),
-        "definition", ImmutableMap.of(
-            "partitionBy", node.getWindowDefinition().getPartitionByList().toString(),
-            "sortList", describeSortList(node.getWindowDefinition().getSortList())))));
+    return explain(
+        node,
+        context,
+        explainNode ->
+            explainNode.setDescription(
+                ImmutableMap.of(
+                    "function", node.getWindowFunction().toString(),
+                    "definition",
+                        ImmutableMap.of(
+                            "partitionBy",
+                                node.getWindowDefinition().getPartitionByList().toString(),
+                            "sortList",
+                                describeSortList(node.getWindowDefinition().getSortList())))));
   }
 
   @Override
   public ExplainResponseNode visitRename(RenameOperator node, Object context) {
     Map<String, String> renameMappingDescription =
-        node.getMapping()
-            .entrySet()
-            .stream()
-            .collect(Collectors.toMap(
-                e -> e.getKey().toString(),
-                e -> e.getValue().toString()));
+        node.getMapping().entrySet().stream()
+            .collect(Collectors.toMap(e -> e.getKey().toString(), e -> e.getValue().toString()));
 
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "mapping", renameMappingDescription)));
+    return explain(
+        node,
+        context,
+        explainNode ->
+            explainNode.setDescription(ImmutableMap.of("mapping", renameMappingDescription)));
   }
 
   @Override
   public ExplainResponseNode visitRemove(RemoveOperator node, Object context) {
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "removeList", node.getRemoveList().toString())));
+    return explain(
+        node,
+        context,
+        explainNode ->
+            explainNode.setDescription(
+                ImmutableMap.of("removeList", node.getRemoveList().toString())));
   }
 
   @Override
   public ExplainResponseNode visitEval(EvalOperator node, Object context) {
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "expressions", convertPairListToMap(node.getExpressionList()))));
+    return explain(
+        node,
+        context,
+        explainNode ->
+            explainNode.setDescription(
+                ImmutableMap.of("expressions", convertPairListToMap(node.getExpressionList()))));
   }
 
   @Override
   public ExplainResponseNode visitDedupe(DedupeOperator node, Object context) {
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "dedupeList", node.getDedupeList().toString(),
-        "allowedDuplication", node.getAllowedDuplication(),
-        "keepEmpty", node.getKeepEmpty(),
-        "consecutive", node.getConsecutive())));
+    return explain(
+        node,
+        context,
+        explainNode ->
+            explainNode.setDescription(
+                ImmutableMap.of(
+                    "dedupeList", node.getDedupeList().toString(),
+                    "allowedDuplication", node.getAllowedDuplication(),
+                    "keepEmpty", node.getKeepEmpty(),
+                    "consecutive", node.getConsecutive())));
   }
 
   @Override
   public ExplainResponseNode visitRareTopN(RareTopNOperator node, Object context) {
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "commandType", node.getCommandType(),
-        "noOfResults", node.getNoOfResults(),
-        "fields", node.getFieldExprList().toString(),
-        "groupBy", node.getGroupByExprList().toString()
-    )));
+    return explain(
+        node,
+        context,
+        explainNode ->
+            explainNode.setDescription(
+                ImmutableMap.of(
+                    "commandType", node.getCommandType(),
+                    "noOfResults", node.getNoOfResults(),
+                    "fields", node.getFieldExprList().toString(),
+                    "groupBy", node.getGroupByExprList().toString())));
   }
 
   @Override
   public ExplainResponseNode visitValues(ValuesOperator node, Object context) {
-    return explain(node, context, explainNode -> explainNode.setDescription(ImmutableMap.of(
-        "values", node.getValues())));
+    return explain(
+        node,
+        context,
+        explainNode -> explainNode.setDescription(ImmutableMap.of("values", node.getValues())));
   }
 
   @Override
   public ExplainResponseNode visitLimit(LimitOperator node, Object context) {
-    return explain(node, context, explanNode -> explanNode.setDescription(ImmutableMap.of(
-        "limit", node.getLimit(), "offset", node.getOffset())));
+    return explain(
+        node,
+        context,
+        explanNode ->
+            explanNode.setDescription(
+                ImmutableMap.of("limit", node.getLimit(), "offset", node.getOffset())));
   }
 
-  protected ExplainResponseNode explain(PhysicalPlan node, Object context,
-                                        Consumer<ExplainResponseNode> doExplain) {
+  @Override
+  public ExplainResponseNode visitNested(NestedOperator node, Object context) {
+    return explain(
+        node,
+        context,
+        explanNode -> explanNode.setDescription(ImmutableMap.of("nested", node.getFields())));
+  }
+
+  protected ExplainResponseNode explain(
+      PhysicalPlan node, Object context, Consumer<ExplainResponseNode> doExplain) {
     ExplainResponseNode explainNode = new ExplainResponseNode(getOperatorName(node));
 
     List<ExplainResponseNode> children = new ArrayList<>();
@@ -162,19 +231,18 @@ private String getOperatorName(PhysicalPlan node) {
 
   private <T, U> Map<String, String> convertPairListToMap(List<Pair<T, U>> pairs) {
     return pairs.stream()
-                .collect(Collectors.toMap(
-                    p -> p.getLeft().toString(),
-                    p -> p.getRight().toString()));
+        .collect(Collectors.toMap(p -> p.getLeft().toString(), p -> p.getRight().toString()));
   }
 
   private Map<String, Map<String, String>> describeSortList(
       List<Pair<Sort.SortOption, Expression>> sortList) {
     return sortList.stream()
-                   .collect(Collectors.toMap(
-                       p -> p.getRight().toString(),
-                       p -> ImmutableMap.of(
-                           "sortOrder", p.getLeft().getSortOrder().toString(),
-                           "nullOrder", p.getLeft().getNullOrder().toString())));
+        .collect(
+            Collectors.toMap(
+                p -> p.getRight().toString(),
+                p ->
+                    ImmutableMap.of(
+                        "sortOrder", p.getLeft().getSortOrder().toString(),
+                        "nullOrder", p.getLeft().getNullOrder().toString())));
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/executor/QueryId.java b/core/src/main/java/org/opensearch/sql/executor/QueryId.java
index 933cb5d82d..eea8166e2a 100644
--- a/core/src/main/java/org/opensearch/sql/executor/QueryId.java
+++ b/core/src/main/java/org/opensearch/sql/executor/QueryId.java
@@ -12,18 +12,14 @@
 import org.apache.commons.lang3.RandomStringUtils;
 import org.opensearch.sql.executor.execution.AbstractPlan;
 
-/**
- * Query id of {@link AbstractPlan}.
- */
+/** Query id of {@link AbstractPlan}. */
 public class QueryId {
-  /**
-   * Query id.
-   */
-  @Getter
-  private final String queryId;
+  /** Query id. */
+  @Getter private final String queryId;
 
   /**
    * Generate {@link QueryId}.
+   *
    * @return {@link QueryId}.
    */
   public static QueryId queryId() {
diff --git a/core/src/main/java/org/opensearch/sql/executor/QueryManager.java b/core/src/main/java/org/opensearch/sql/executor/QueryManager.java
index 5b41d7ce2e..44d6a1cd84 100644
--- a/core/src/main/java/org/opensearch/sql/executor/QueryManager.java
+++ b/core/src/main/java/org/opensearch/sql/executor/QueryManager.java
@@ -11,13 +11,14 @@
 import org.opensearch.sql.executor.execution.AbstractPlan;
 
 /**
- * QueryManager is the high-level interface of core engine.
- * Frontend submit {@link AbstractPlan} to QueryManager.
+ * QueryManager is the high-level interface of core engine. Frontend submit an {@link AbstractPlan}
+ * to QueryManager.
  */
 public interface QueryManager {
 
   /**
    * Submit {@link AbstractPlan}.
+   *
    * @param queryPlan {@link AbstractPlan}.
    * @return {@link QueryId}.
    */
diff --git a/core/src/main/java/org/opensearch/sql/executor/QueryService.java b/core/src/main/java/org/opensearch/sql/executor/QueryService.java
index 94e7081920..3e939212bf 100644
--- a/core/src/main/java/org/opensearch/sql/executor/QueryService.java
+++ b/core/src/main/java/org/opensearch/sql/executor/QueryService.java
@@ -18,9 +18,7 @@
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 
-/**
- * The low level interface of core engine.
- */
+/** The low level interface of core engine. */
 @RequiredArgsConstructor
 public class QueryService {
 
@@ -31,14 +29,14 @@ public class QueryService {
   private final Planner planner;
 
   /**
-   * Execute the {@link UnresolvedPlan}, using {@link ResponseListener} to get response.
+   * Execute the {@link UnresolvedPlan}, using {@link ResponseListener} to get response.<br>
    * Todo. deprecated this interface after finalize {@link PlanContext}.
    *
-   * @param plan  {@link UnresolvedPlan}
+   * @param plan {@link UnresolvedPlan}
    * @param listener {@link ResponseListener}
    */
-  public void execute(UnresolvedPlan plan,
-                      ResponseListener<ExecutionEngine.QueryResponse> listener) {
+  public void execute(
+      UnresolvedPlan plan, ResponseListener<ExecutionEngine.QueryResponse> listener) {
     try {
       executePlan(analyze(plan), PlanContext.emptyPlanContext(), listener);
     } catch (Exception e) {
@@ -48,22 +46,24 @@ public void execute(UnresolvedPlan plan,
 
   /**
    * Execute the {@link UnresolvedPlan}, with {@link PlanContext} and using {@link ResponseListener}
-   * to get response.
+   * to get response.<br>
    * Todo. Pass split from PlanContext to ExecutionEngine in following PR.
    *
    * @param plan {@link LogicalPlan}
    * @param planContext {@link PlanContext}
    * @param listener {@link ResponseListener}
    */
-  public void executePlan(LogicalPlan plan,
-                          PlanContext planContext,
-                          ResponseListener<ExecutionEngine.QueryResponse> listener) {
+  public void executePlan(
+      LogicalPlan plan,
+      PlanContext planContext,
+      ResponseListener<ExecutionEngine.QueryResponse> listener) {
     try {
       planContext
           .getSplit()
           .ifPresentOrElse(
               split -> executionEngine.execute(plan(plan), new ExecutionContext(split), listener),
-              () -> executionEngine.execute(
+              () ->
+                  executionEngine.execute(
                       plan(plan), ExecutionContext.emptyExecutionContext(), listener));
     } catch (Exception e) {
       listener.onFailure(e);
@@ -71,14 +71,14 @@ public void executePlan(LogicalPlan plan,
   }
 
   /**
-   * Explain the query in {@link UnresolvedPlan} using {@link ResponseListener} to
-   * get and format explain response.
+   * Explain the query in {@link UnresolvedPlan} using {@link ResponseListener} to get and format
+   * explain response.
    *
    * @param plan {@link UnresolvedPlan}
    * @param listener {@link ResponseListener} for explain response
    */
-  public void explain(UnresolvedPlan plan,
-                      ResponseListener<ExecutionEngine.ExplainResponse> listener) {
+  public void explain(
+      UnresolvedPlan plan, ResponseListener<ExecutionEngine.ExplainResponse> listener) {
     try {
       executionEngine.explain(plan(analyze(plan)), listener);
     } catch (Exception e) {
@@ -86,16 +86,12 @@ public void explain(UnresolvedPlan plan,
     }
   }
 
-  /**
-   * Analyze {@link UnresolvedPlan}.
-   */
+  /** Analyze {@link UnresolvedPlan}. */
   public LogicalPlan analyze(UnresolvedPlan plan) {
     return analyzer.analyze(plan, new AnalysisContext());
   }
 
-  /**
-   * Translate {@link LogicalPlan} to {@link PhysicalPlan}.
-   */
+  /** Translate {@link LogicalPlan} to {@link PhysicalPlan}. */
   public PhysicalPlan plan(LogicalPlan plan) {
     return planner.plan(plan);
   }
diff --git a/core/src/main/java/org/opensearch/sql/executor/execution/AbstractPlan.java b/core/src/main/java/org/opensearch/sql/executor/execution/AbstractPlan.java
index 1654293c04..23091777ce 100644
--- a/core/src/main/java/org/opensearch/sql/executor/execution/AbstractPlan.java
+++ b/core/src/main/java/org/opensearch/sql/executor/execution/AbstractPlan.java
@@ -8,28 +8,20 @@
 
 package org.opensearch.sql.executor.execution;
 
-
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.QueryId;
 
-/**
- * AbstractPlan represent the execution entity of the Statement.
- */
+/** AbstractPlan represent the execution entity of the Statement. */
 @RequiredArgsConstructor
 public abstract class AbstractPlan {
 
-  /**
-   * Uniq query id.
-   */
-  @Getter
-  private final QueryId queryId;
+  /** Uniq query id. */
+  @Getter private final QueryId queryId;
 
-  /**
-   * Start query execution.
-   */
+  /** Start query execution. */
   public abstract void execute();
 
   /**
diff --git a/core/src/main/java/org/opensearch/sql/executor/execution/CommandPlan.java b/core/src/main/java/org/opensearch/sql/executor/execution/CommandPlan.java
new file mode 100644
index 0000000000..103e0e1081
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/executor/execution/CommandPlan.java
@@ -0,0 +1,52 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.sql.executor.execution;
+
+import org.opensearch.sql.ast.tree.UnresolvedPlan;
+import org.opensearch.sql.common.response.ResponseListener;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.executor.QueryId;
+import org.opensearch.sql.executor.QueryService;
+
+/**
+ * Query plan which does not reflect a search query being executed. It contains a command or an
+ * action, for example, a DDL query.
+ */
+public class CommandPlan extends AbstractPlan {
+
+  /** The query plan ast. */
+  protected final UnresolvedPlan plan;
+
+  /** Query service. */
+  protected final QueryService queryService;
+
+  protected final ResponseListener<ExecutionEngine.QueryResponse> listener;
+
+  /** Constructor. */
+  public CommandPlan(
+      QueryId queryId,
+      UnresolvedPlan plan,
+      QueryService queryService,
+      ResponseListener<ExecutionEngine.QueryResponse> listener) {
+    super(queryId);
+    this.plan = plan;
+    this.queryService = queryService;
+    this.listener = listener;
+  }
+
+  @Override
+  public void execute() {
+    queryService.execute(plan, listener);
+  }
+
+  @Override
+  public void explain(ResponseListener<ExecutionEngine.ExplainResponse> listener) {
+    throw new UnsupportedOperationException("CommandPlan does not support explain");
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/executor/execution/ExplainPlan.java b/core/src/main/java/org/opensearch/sql/executor/execution/ExplainPlan.java
index 8c784f82ed..7868a39001 100644
--- a/core/src/main/java/org/opensearch/sql/executor/execution/ExplainPlan.java
+++ b/core/src/main/java/org/opensearch/sql/executor/execution/ExplainPlan.java
@@ -12,21 +12,18 @@
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.QueryId;
 
-/**
- * Explain plan.
- */
+/** Explain plan. */
 public class ExplainPlan extends AbstractPlan {
 
   private final AbstractPlan plan;
 
   private final ResponseListener<ExecutionEngine.ExplainResponse> explainListener;
 
-  /**
-   * Constructor.
-   */
-  public ExplainPlan(QueryId queryId,
-                     AbstractPlan plan,
-                     ResponseListener<ExecutionEngine.ExplainResponse> explainListener) {
+  /** Constructor. */
+  public ExplainPlan(
+      QueryId queryId,
+      AbstractPlan plan,
+      ResponseListener<ExecutionEngine.ExplainResponse> explainListener) {
     super(queryId);
     this.plan = plan;
     this.explainListener = explainListener;
diff --git a/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlan.java b/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlan.java
index af5c032d49..0ebdb875f6 100644
--- a/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlan.java
+++ b/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlan.java
@@ -8,50 +8,72 @@
 
 package org.opensearch.sql.executor.execution;
 
+import java.util.Optional;
+import org.apache.commons.lang3.NotImplementedException;
+import org.opensearch.sql.ast.tree.Paginate;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.QueryId;
 import org.opensearch.sql.executor.QueryService;
 
-/**
- * Query plan. Which includes.
- *
- * <p>select query.
- */
+/** Query plan which includes a <em>select</em> query. */
 public class QueryPlan extends AbstractPlan {
 
-  /**
-   * The query plan ast.
-   */
+  /** The query plan ast. */
   protected final UnresolvedPlan plan;
 
-  /**
-   * Query service.
-   */
+  /** Query service. */
   protected final QueryService queryService;
 
   protected final ResponseListener<ExecutionEngine.QueryResponse> listener;
 
-  /** constructor. */
+  protected final Optional<Integer> pageSize;
+
+  /** Constructor. */
+  public QueryPlan(
+      QueryId queryId,
+      UnresolvedPlan plan,
+      QueryService queryService,
+      ResponseListener<ExecutionEngine.QueryResponse> listener) {
+    super(queryId);
+    this.plan = plan;
+    this.queryService = queryService;
+    this.listener = listener;
+    this.pageSize = Optional.empty();
+  }
+
+  /** Constructor with page size. */
   public QueryPlan(
       QueryId queryId,
       UnresolvedPlan plan,
+      int pageSize,
       QueryService queryService,
       ResponseListener<ExecutionEngine.QueryResponse> listener) {
     super(queryId);
     this.plan = plan;
     this.queryService = queryService;
     this.listener = listener;
+    this.pageSize = Optional.of(pageSize);
   }
 
   @Override
   public void execute() {
-    queryService.execute(plan, listener);
+    if (pageSize.isPresent()) {
+      queryService.execute(new Paginate(pageSize.get(), plan), listener);
+    } else {
+      queryService.execute(plan, listener);
+    }
   }
 
   @Override
   public void explain(ResponseListener<ExecutionEngine.ExplainResponse> listener) {
-    queryService.explain(plan, listener);
+    if (pageSize.isPresent()) {
+      listener.onFailure(
+          new NotImplementedException(
+              "`explain` feature for paginated requests is not implemented yet."));
+    } else {
+      queryService.explain(plan, listener);
+    }
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlanFactory.java b/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlanFactory.java
index 851381cc7a..52d7126e17 100644
--- a/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlanFactory.java
+++ b/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlanFactory.java
@@ -17,14 +17,17 @@
 import org.opensearch.sql.ast.statement.Explain;
 import org.opensearch.sql.ast.statement.Query;
 import org.opensearch.sql.ast.statement.Statement;
+import org.opensearch.sql.ast.tree.CloseCursor;
+import org.opensearch.sql.ast.tree.FetchCursor;
+import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.common.response.ResponseListener;
+import org.opensearch.sql.exception.UnsupportedCursorRequestException;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.QueryId;
 import org.opensearch.sql.executor.QueryService;
+import org.opensearch.sql.executor.pagination.CanPaginateVisitor;
 
-/**
- * QueryExecution Factory.
- */
+/** QueryExecution Factory. */
 @RequiredArgsConstructor
 public class QueryPlanFactory
     extends AbstractNodeVisitor<
@@ -33,14 +36,12 @@ public class QueryPlanFactory
             Optional<ResponseListener<ExecutionEngine.QueryResponse>>,
             Optional<ResponseListener<ExecutionEngine.ExplainResponse>>>> {
 
-  /**
-   * Query Service.
-   */
+  /** Query Service. */
   private final QueryService queryService;
 
   /**
-   * NO_CONSUMER_RESPONSE_LISTENER should never been called. It is only used as constructor
-   * parameter of {@link QueryPlan}.
+   * NO_CONSUMER_RESPONSE_LISTENER should never be called. It is only used as constructor parameter
+   * of {@link QueryPlan}.
    */
   @VisibleForTesting
   protected static final ResponseListener<ExecutionEngine.QueryResponse>
@@ -59,9 +60,7 @@ public void onFailure(Exception e) {
             }
           };
 
-  /**
-   * Create QueryExecution from Statement.
-   */
+  /** Create QueryExecution from Statement. */
   public AbstractPlan create(
       Statement statement,
       Optional<ResponseListener<ExecutionEngine.QueryResponse>> queryListener,
@@ -69,6 +68,31 @@ public AbstractPlan create(
     return statement.accept(this, Pair.of(queryListener, explainListener));
   }
 
+  /** Creates a QueryPlan from a cursor. */
+  public AbstractPlan create(
+      String cursor,
+      boolean isExplain,
+      ResponseListener<ExecutionEngine.QueryResponse> queryResponseListener,
+      ResponseListener<ExecutionEngine.ExplainResponse> explainListener) {
+    QueryId queryId = QueryId.queryId();
+    var plan = new QueryPlan(queryId, new FetchCursor(cursor), queryService, queryResponseListener);
+    return isExplain ? new ExplainPlan(queryId, plan, explainListener) : plan;
+  }
+
+  boolean canConvertToCursor(UnresolvedPlan plan) {
+    return plan.accept(new CanPaginateVisitor(), null);
+  }
+
+  /** Creates a {@link CloseCursor} command on a cursor. */
+  public AbstractPlan createCloseCursor(
+      String cursor, ResponseListener<ExecutionEngine.QueryResponse> queryResponseListener) {
+    return new CommandPlan(
+        QueryId.queryId(),
+        new CloseCursor().attach(new FetchCursor(cursor)),
+        queryService,
+        queryResponseListener);
+  }
+
   @Override
   public AbstractPlan visitQuery(
       Query node,
@@ -79,7 +103,22 @@ public AbstractPlan visitQuery(
     Preconditions.checkArgument(
         context.getLeft().isPresent(), "[BUG] query listener must be not null");
 
-    return new QueryPlan(QueryId.queryId(), node.getPlan(), queryService, context.getLeft().get());
+    if (node.getFetchSize() > 0) {
+      if (canConvertToCursor(node.getPlan())) {
+        return new QueryPlan(
+            QueryId.queryId(),
+            node.getPlan(),
+            node.getFetchSize(),
+            queryService,
+            context.getLeft().get());
+      } else {
+        // This should be picked up by the legacy engine.
+        throw new UnsupportedCursorRequestException();
+      }
+    } else {
+      return new QueryPlan(
+          QueryId.queryId(), node.getPlan(), queryService, context.getLeft().get());
+    }
   }
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/executor/execution/StreamingQueryPlan.java b/core/src/main/java/org/opensearch/sql/executor/execution/StreamingQueryPlan.java
index 9bb37b064c..5adb9644e9 100644
--- a/core/src/main/java/org/opensearch/sql/executor/execution/StreamingQueryPlan.java
+++ b/core/src/main/java/org/opensearch/sql/executor/execution/StreamingQueryPlan.java
@@ -24,9 +24,7 @@
 import org.opensearch.sql.planner.logical.LogicalPlanNodeVisitor;
 import org.opensearch.sql.planner.logical.LogicalRelation;
 
-/**
- * Streaming Query Plan.
- */
+/** Streaming Query Plan. */
 public class StreamingQueryPlan extends QueryPlan {
 
   private static final Logger log = LogManager.getLogger(StreamingQueryPlan.class);
@@ -35,14 +33,13 @@ public class StreamingQueryPlan extends QueryPlan {
 
   private MicroBatchStreamingExecution streamingExecution;
 
-  /**
-   * constructor.
-   */
-  public StreamingQueryPlan(QueryId queryId,
-                            UnresolvedPlan plan,
-                            QueryService queryService,
-                            ResponseListener<ExecutionEngine.QueryResponse> listener,
-                            ExecutionStrategy executionStrategy) {
+  /** constructor. */
+  public StreamingQueryPlan(
+      QueryId queryId,
+      UnresolvedPlan plan,
+      QueryService queryService,
+      ResponseListener<ExecutionEngine.QueryResponse> listener,
+      ExecutionStrategy executionStrategy) {
     super(queryId, plan, queryService, listener);
 
     this.executionStrategy = executionStrategy;
@@ -70,15 +67,13 @@ public void execute() {
   }
 
   interface ExecutionStrategy {
-    /**
-     * execute task.
-     */
+    /** execute task. */
     void execute(Runnable task) throws InterruptedException;
   }
 
   /**
-   * execute task with fixed interval.
-   * if task run time < interval, trigger next task on next interval.
+   * execute task with fixed interval.<br>
+   * if task run time < interval, trigger next task on next interval.<br>
    * if task run time >= interval, trigger next task immediately.
    */
   @RequiredArgsConstructor
diff --git a/core/src/main/java/org/opensearch/sql/executor/pagination/CanPaginateVisitor.java b/core/src/main/java/org/opensearch/sql/executor/pagination/CanPaginateVisitor.java
new file mode 100644
index 0000000000..9f14ba1e5d
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/executor/pagination/CanPaginateVisitor.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.executor.pagination;
+
+import org.opensearch.sql.ast.AbstractNodeVisitor;
+import org.opensearch.sql.ast.Node;
+import org.opensearch.sql.ast.expression.Alias;
+import org.opensearch.sql.ast.expression.AllFields;
+import org.opensearch.sql.ast.expression.And;
+import org.opensearch.sql.ast.expression.Argument;
+import org.opensearch.sql.ast.expression.Between;
+import org.opensearch.sql.ast.expression.Case;
+import org.opensearch.sql.ast.expression.Cast;
+import org.opensearch.sql.ast.expression.Compare;
+import org.opensearch.sql.ast.expression.EqualTo;
+import org.opensearch.sql.ast.expression.Field;
+import org.opensearch.sql.ast.expression.Function;
+import org.opensearch.sql.ast.expression.HighlightFunction;
+import org.opensearch.sql.ast.expression.In;
+import org.opensearch.sql.ast.expression.Interval;
+import org.opensearch.sql.ast.expression.Literal;
+import org.opensearch.sql.ast.expression.Not;
+import org.opensearch.sql.ast.expression.Or;
+import org.opensearch.sql.ast.expression.QualifiedName;
+import org.opensearch.sql.ast.expression.RelevanceFieldList;
+import org.opensearch.sql.ast.expression.UnresolvedArgument;
+import org.opensearch.sql.ast.expression.UnresolvedAttribute;
+import org.opensearch.sql.ast.expression.When;
+import org.opensearch.sql.ast.expression.WindowFunction;
+import org.opensearch.sql.ast.expression.Xor;
+import org.opensearch.sql.ast.tree.Aggregation;
+import org.opensearch.sql.ast.tree.Filter;
+import org.opensearch.sql.ast.tree.Limit;
+import org.opensearch.sql.ast.tree.Project;
+import org.opensearch.sql.ast.tree.Relation;
+import org.opensearch.sql.ast.tree.Sort;
+import org.opensearch.sql.ast.tree.Values;
+import org.opensearch.sql.expression.function.BuiltinFunctionName;
+
+/**
+ * Use this unresolved plan visitor to check if a plan can be serialized by PaginatedPlanCache.<br>
+ * If
+ *
+ * <pre>plan.accept(new CanPaginateVisitor(...))</pre>
+ *
+ * returns <em>true</em>, <em>PaginatedPlanCache.convertToCursor</em> will succeed.<br>
+ * Otherwise, it will fail.<br>
+ * The purpose of this visitor is to activate legacy engine fallback mechanism.<br>
+ * Currently, V2 engine does not support queries with:<br>
+ *
+ * <ul>
+ *   <li>aggregation (GROUP BY clause or aggregation functions like min/max)
+ *   <li>in memory aggregation (window function)
+ *   <li>LIMIT/OFFSET clause(s)
+ *   <li>without FROM clause
+ *   <li>JOIN
+ *   <li>a subquery
+ * </ul>
+ *
+ * V2 also requires that the table being queried should be an OpenSearch index.<br>
+ * See PaginatedPlanCache.canConvertToCursor for usage.
+ */
+public class CanPaginateVisitor extends AbstractNodeVisitor<Boolean, Object> {
+
+  @Override
+  public Boolean visitRelation(Relation node, Object context) {
+    if (!node.getChild().isEmpty()) {
+      // Relation instance should never have a child, but check just in case.
+      return Boolean.FALSE;
+    }
+
+    return Boolean.TRUE;
+  }
+
+  protected Boolean canPaginate(Node node, Object context) {
+    var childList = node.getChild();
+    if (childList != null) {
+      return childList.stream().allMatch(n -> n.accept(this, context));
+    }
+    return Boolean.TRUE;
+  }
+
+  // Only column references in ORDER BY clause are supported in pagination,
+  // because expressions can't be pushed down due to #1471.
+  // https://github.com/opensearch-project/sql/issues/1471
+  @Override
+  public Boolean visitSort(Sort node, Object context) {
+    return node.getSortList().stream()
+            .allMatch(f -> f.getField() instanceof QualifiedName && visitField(f, context))
+        && canPaginate(node, context);
+  }
+
+  // For queries with WHERE clause:
+  @Override
+  public Boolean visitFilter(Filter node, Object context) {
+    return canPaginate(node, context) && node.getCondition().accept(this, context);
+  }
+
+  // Queries with GROUP BY clause are not supported
+  @Override
+  public Boolean visitAggregation(Aggregation node, Object context) {
+    return Boolean.FALSE;
+  }
+
+  // For queries without FROM clause:
+  @Override
+  public Boolean visitValues(Values node, Object context) {
+    return Boolean.TRUE;
+  }
+
+  // Queries with LIMIT/OFFSET clauses are unsupported
+  @Override
+  public Boolean visitLimit(Limit node, Object context) {
+    return Boolean.FALSE;
+  }
+
+  @Override
+  public Boolean visitLiteral(Literal node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitField(Field node, Object context) {
+    return canPaginate(node, context)
+        && node.getFieldArgs().stream().allMatch(n -> n.accept(this, context));
+  }
+
+  @Override
+  public Boolean visitAlias(Alias node, Object context) {
+    return canPaginate(node, context) && node.getDelegated().accept(this, context);
+  }
+
+  @Override
+  public Boolean visitAllFields(AllFields node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitQualifiedName(QualifiedName node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitEqualTo(EqualTo node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitRelevanceFieldList(RelevanceFieldList node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitInterval(Interval node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitCompare(Compare node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitNot(Not node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitOr(Or node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitAnd(And node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitArgument(Argument node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitXor(Xor node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitFunction(Function node, Object context) {
+    // https://github.com/opensearch-project/sql/issues/1718
+    if (node.getFuncName()
+        .equalsIgnoreCase(BuiltinFunctionName.NESTED.getName().getFunctionName())) {
+      return Boolean.FALSE;
+    }
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitIn(In node, Object context) {
+    return canPaginate(node, context)
+        && node.getValueList().stream().allMatch(n -> n.accept(this, context));
+  }
+
+  @Override
+  public Boolean visitBetween(Between node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitCase(Case node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitWhen(When node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitCast(Cast node, Object context) {
+    return canPaginate(node, context) && node.getConvertedType().accept(this, context);
+  }
+
+  @Override
+  public Boolean visitHighlightFunction(HighlightFunction node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitUnresolvedArgument(UnresolvedArgument node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitUnresolvedAttribute(UnresolvedAttribute node, Object context) {
+    return canPaginate(node, context);
+  }
+
+  @Override
+  public Boolean visitChildren(Node node, Object context) {
+    // for all not listed (= unchecked) - false
+    return Boolean.FALSE;
+  }
+
+  @Override
+  public Boolean visitWindowFunction(WindowFunction node, Object context) {
+    // don't support in-memory aggregation
+    // SELECT max(age) OVER (PARTITION BY city) ...
+    return Boolean.FALSE;
+  }
+
+  @Override
+  public Boolean visitProject(Project node, Object context) {
+    if (!node.getProjectList().stream().allMatch(n -> n.accept(this, context))) {
+      return Boolean.FALSE;
+    }
+
+    var children = node.getChild();
+    if (children.size() != 1) {
+      return Boolean.FALSE;
+    }
+
+    return children.get(0).accept(this, context);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/executor/pagination/Cursor.java b/core/src/main/java/org/opensearch/sql/executor/pagination/Cursor.java
new file mode 100644
index 0000000000..59a14a2d72
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/executor/pagination/Cursor.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.executor.pagination;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@EqualsAndHashCode
+@RequiredArgsConstructor
+public class Cursor {
+  public static final Cursor None = new Cursor(null);
+
+  @Getter private final String data;
+
+  public String toString() {
+    return data;
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/executor/pagination/PlanSerializer.java b/core/src/main/java/org/opensearch/sql/executor/pagination/PlanSerializer.java
new file mode 100644
index 0000000000..40a6cdfa84
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/executor/pagination/PlanSerializer.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.executor.pagination;
+
+import com.google.common.hash.HashCode;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.zip.Deflater;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.exception.NoCursorException;
+import org.opensearch.sql.planner.SerializablePlan;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+import org.opensearch.sql.storage.StorageEngine;
+
+/**
+ * This class is entry point to paged requests. It is responsible to cursor serialization and
+ * deserialization.
+ */
+@RequiredArgsConstructor
+public class PlanSerializer {
+  public static final String CURSOR_PREFIX = "n:";
+
+  private final StorageEngine engine;
+
+  /** Converts a physical plan tree to a cursor. */
+  public Cursor convertToCursor(PhysicalPlan plan) {
+    try {
+      return new Cursor(
+          CURSOR_PREFIX + serialize(((SerializablePlan) plan).getPlanForSerialization()));
+      // ClassCastException thrown when a plan in the tree doesn't implement SerializablePlan
+    } catch (NotSerializableException | ClassCastException | NoCursorException e) {
+      return Cursor.None;
+    }
+  }
+
+  /**
+   * Serializes and compresses the object.
+   *
+   * @param object The object.
+   * @return Encoded binary data.
+   */
+  protected String serialize(Serializable object) throws NotSerializableException {
+    try {
+      ByteArrayOutputStream output = new ByteArrayOutputStream();
+      ObjectOutputStream objectOutput = new ObjectOutputStream(output);
+      objectOutput.writeObject(object);
+      objectOutput.flush();
+
+      ByteArrayOutputStream out = new ByteArrayOutputStream();
+      // GZIP provides 35-45%, lzma from apache commons-compress has few % better compression
+      GZIPOutputStream gzip =
+          new GZIPOutputStream(out) {
+            {
+              this.def.setLevel(Deflater.BEST_COMPRESSION);
+            }
+          };
+      gzip.write(output.toByteArray());
+      gzip.close();
+
+      return HashCode.fromBytes(out.toByteArray()).toString();
+    } catch (NotSerializableException e) {
+      throw e;
+    } catch (IOException e) {
+      throw new IllegalStateException("Failed to serialize: " + object, e);
+    }
+  }
+
+  /**
+   * Decompresses and deserializes the binary data.
+   *
+   * @param code Encoded binary data.
+   * @return An object.
+   */
+  protected Serializable deserialize(String code) {
+    try {
+      GZIPInputStream gzip =
+          new GZIPInputStream(new ByteArrayInputStream(HashCode.fromString(code).asBytes()));
+      ObjectInputStream objectInput =
+          new CursorDeserializationStream(new ByteArrayInputStream(gzip.readAllBytes()));
+      return (Serializable) objectInput.readObject();
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to deserialize object", e);
+    }
+  }
+
+  /** Converts a cursor to a physical plan tree. */
+  public PhysicalPlan convertToPlan(String cursor) {
+    if (!cursor.startsWith(CURSOR_PREFIX)) {
+      throw new UnsupportedOperationException("Unsupported cursor");
+    }
+    try {
+      return (PhysicalPlan) deserialize(cursor.substring(CURSOR_PREFIX.length()));
+    } catch (Exception e) {
+      throw new UnsupportedOperationException("Unsupported cursor", e);
+    }
+  }
+
+  /**
+   * This function is used in testing only, to get access to {@link CursorDeserializationStream}.
+   */
+  public CursorDeserializationStream getCursorDeserializationStream(InputStream in)
+      throws IOException {
+    return new CursorDeserializationStream(in);
+  }
+
+  public class CursorDeserializationStream extends ObjectInputStream {
+    public CursorDeserializationStream(InputStream in) throws IOException {
+      super(in);
+    }
+
+    @Override
+    public Object resolveObject(Object obj) throws IOException {
+      return obj.equals("engine") ? engine : obj;
+    }
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/executor/streaming/Batch.java b/core/src/main/java/org/opensearch/sql/executor/streaming/Batch.java
index cd7d7dae5a..ab03c4fb53 100644
--- a/core/src/main/java/org/opensearch/sql/executor/streaming/Batch.java
+++ b/core/src/main/java/org/opensearch/sql/executor/streaming/Batch.java
@@ -8,9 +8,7 @@
 import lombok.Data;
 import org.opensearch.sql.storage.split.Split;
 
-/**
- * A batch of streaming execution.
- */
+/** A batch of streaming execution. */
 @Data
 public class Batch {
   private final Split split;
diff --git a/core/src/main/java/org/opensearch/sql/executor/streaming/MicroBatchStreamingExecution.java b/core/src/main/java/org/opensearch/sql/executor/streaming/MicroBatchStreamingExecution.java
index c31ed18c57..4e05484f15 100644
--- a/core/src/main/java/org/opensearch/sql/executor/streaming/MicroBatchStreamingExecution.java
+++ b/core/src/main/java/org/opensearch/sql/executor/streaming/MicroBatchStreamingExecution.java
@@ -20,9 +20,7 @@
 import org.opensearch.sql.planner.PlanContext;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 
-/**
- * Micro batch streaming execution. 
- */
+/** Micro batch streaming execution. */
 public class MicroBatchStreamingExecution {
 
   private static final Logger log = LogManager.getLogger(MicroBatchStreamingExecution.class);
@@ -46,9 +44,7 @@ public class MicroBatchStreamingExecution {
   /** keep track the latest commit batchId. */
   private final MetadataLog<Offset> committedLog;
 
-  /**
-   * Constructor.
-   */
+  /** Constructor. */
   public MicroBatchStreamingExecution(
       StreamingSource source,
       LogicalPlan batchPlan,
@@ -63,9 +59,7 @@ public MicroBatchStreamingExecution(
     this.committedLog = committedLog;
   }
 
-  /**
-   * Pull the {@link Batch} from {@link StreamingSource} and execute the {@link Batch}.
-   */
+  /** Pull the {@link Batch} from {@link StreamingSource} and execute the {@link Batch}. */
   public void execute() {
     Long latestBatchId = offsetLog.getLatest().map(Pair::getKey).orElse(INITIAL_LATEST_BATCH_ID);
     Long latestCommittedBatchId =
diff --git a/core/src/main/java/org/opensearch/sql/executor/streaming/Offset.java b/core/src/main/java/org/opensearch/sql/executor/streaming/Offset.java
index 00f040e437..27960da84d 100644
--- a/core/src/main/java/org/opensearch/sql/executor/streaming/Offset.java
+++ b/core/src/main/java/org/opensearch/sql/executor/streaming/Offset.java
@@ -7,9 +7,7 @@
 
 import lombok.Data;
 
-/**
- * Offset.
- */
+/** Offset. */
 @Data
 public class Offset {
 
diff --git a/core/src/main/java/org/opensearch/sql/executor/streaming/StreamingSource.java b/core/src/main/java/org/opensearch/sql/executor/streaming/StreamingSource.java
index ebd3fa714b..2b45a45d9a 100644
--- a/core/src/main/java/org/opensearch/sql/executor/streaming/StreamingSource.java
+++ b/core/src/main/java/org/opensearch/sql/executor/streaming/StreamingSource.java
@@ -7,9 +7,7 @@
 
 import java.util.Optional;
 
-/**
- * Streaming source.
- */
+/** Streaming source. */
 public interface StreamingSource {
   /**
    * Get current {@link Offset} of stream data.
diff --git a/core/src/main/java/org/opensearch/sql/expression/DSL.java b/core/src/main/java/org/opensearch/sql/expression/DSL.java
index fc425c6c20..49a1197957 100644
--- a/core/src/main/java/org/opensearch/sql/expression/DSL.java
+++ b/core/src/main/java/org/opensearch/sql/expression/DSL.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression;
 
 import java.util.Arrays;
@@ -29,8 +28,7 @@
 
 public class DSL {
 
-  private DSL() {
-  }
+  private DSL() {}
 
   public static LiteralExpression literal(Byte value) {
     return new LiteralExpression(ExprValueUtils.byteValue(value));
@@ -68,9 +66,7 @@ public static LiteralExpression literal(ExprValue value) {
     return new LiteralExpression(value);
   }
 
-  /**
-   * Wrap a number to {@link LiteralExpression}.
-   */
+  /** Wrap a number to {@link LiteralExpression}. */
   public static LiteralExpression literal(Number value) {
     if (value instanceof Integer) {
       return new LiteralExpression(ExprValueUtils.integerValue(value.intValue()));
@@ -88,21 +84,21 @@ public static ReferenceExpression ref(String ref, ExprType type) {
   }
 
   /**
-   * Wrap a named expression if not yet. The intent is that different languages may use
-   * Alias or not when building AST. This caused either named or unnamed expression
-   * is resolved by analyzer. To make unnamed expression acceptable for logical project,
-   * it is required to wrap it by named expression here before passing to logical project.
+   * Wrap a named expression if not yet. The intent is that different languages may use Alias or not
+   * when building AST. This caused either named or unnamed expression is resolved by analyzer. To
+   * make unnamed expression acceptable for logical project, it is required to wrap it by named
+   * expression here before passing to logical project.
    *
-   * @param expression  expression
-   * @return            expression if named already or expression wrapped by named expression.
+   * @param expression expression
+   * @return expression if named already or expression wrapped by named expression.
    */
   public static NamedExpression named(Expression expression) {
     if (expression instanceof NamedExpression) {
       return (NamedExpression) expression;
     }
     if (expression instanceof ParseExpression) {
-      return named(((ParseExpression) expression).getIdentifier().valueOf().stringValue(),
-          expression);
+      return named(
+          ((ParseExpression) expression).getIdentifier().valueOf().stringValue(), expression);
     }
     return named(expression.toString(), expression);
   }
@@ -127,18 +123,18 @@ public static NamedArgumentExpression namedArgument(String name, String value) {
     return namedArgument(name, literal(value));
   }
 
-  public static GrokExpression grok(Expression sourceField, Expression pattern,
-                                    Expression identifier) {
+  public static GrokExpression grok(
+      Expression sourceField, Expression pattern, Expression identifier) {
     return new GrokExpression(sourceField, pattern, identifier);
   }
 
-  public static RegexExpression regex(Expression sourceField, Expression pattern,
-                                      Expression identifier) {
+  public static RegexExpression regex(
+      Expression sourceField, Expression pattern, Expression identifier) {
     return new RegexExpression(sourceField, pattern, identifier);
   }
 
-  public static PatternsExpression patterns(Expression sourceField, Expression pattern,
-                                            Expression identifier) {
+  public static PatternsExpression patterns(
+      Expression sourceField, Expression pattern, Expression identifier) {
     return new PatternsExpression(sourceField, pattern, identifier);
   }
 
@@ -150,6 +146,14 @@ public static FunctionExpression abs(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.ABS, expressions);
   }
 
+  public static FunctionExpression add(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.ADD, expressions);
+  }
+
+  public static FunctionExpression addFunction(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.ADDFUNCTION, expressions);
+  }
+
   public static FunctionExpression ceil(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.CEIL, expressions);
   }
@@ -166,6 +170,14 @@ public static FunctionExpression crc32(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.CRC32, expressions);
   }
 
+  public static FunctionExpression divide(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.DIVIDE, expressions);
+  }
+
+  public static FunctionExpression divideFunction(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.DIVIDEFUNCTION, expressions);
+  }
+
   public static FunctionExpression euler(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.E, expressions);
   }
@@ -174,6 +186,10 @@ public static FunctionExpression exp(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.EXP, expressions);
   }
 
+  public static FunctionExpression expm1(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.EXPM1, expressions);
+  }
+
   public static FunctionExpression floor(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.FLOOR, expressions);
   }
@@ -198,6 +214,22 @@ public static FunctionExpression mod(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.MOD, expressions);
   }
 
+  public static FunctionExpression modulus(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.MODULUS, expressions);
+  }
+
+  public static FunctionExpression modulusFunction(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.MODULUSFUNCTION, expressions);
+  }
+
+  public static FunctionExpression multiply(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.MULTIPLY, expressions);
+  }
+
+  public static FunctionExpression multiplyFunction(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.MULTIPLYFUNCTION, expressions);
+  }
+
   public static FunctionExpression pi(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.PI, expressions);
   }
@@ -214,6 +246,10 @@ public static FunctionExpression rand(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.RAND, expressions);
   }
 
+  public static FunctionExpression rint(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.RINT, expressions);
+  }
+
   public static FunctionExpression round(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.ROUND, expressions);
   }
@@ -222,6 +258,14 @@ public static FunctionExpression sign(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.SIGN, expressions);
   }
 
+  public static FunctionExpression signum(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.SIGNUM, expressions);
+  }
+
+  public static FunctionExpression sinh(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.SINH, expressions);
+  }
+
   public static FunctionExpression sqrt(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.SQRT, expressions);
   }
@@ -258,6 +302,10 @@ public static FunctionExpression cos(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.COS, expressions);
   }
 
+  public static FunctionExpression cosh(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.COSH, expressions);
+  }
+
   public static FunctionExpression cot(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.COT, expressions);
   }
@@ -274,24 +322,16 @@ public static FunctionExpression sin(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.SIN, expressions);
   }
 
-  public static FunctionExpression tan(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.TAN, expressions);
-  }
-
-  public static FunctionExpression add(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.ADD, expressions);
-  }
-
   public static FunctionExpression subtract(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.SUBTRACT, expressions);
   }
 
-  public static FunctionExpression multiply(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.MULTIPLY, expressions);
+  public static FunctionExpression subtractFunction(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.SUBTRACTFUNCTION, expressions);
   }
 
-  public static FunctionExpression adddate(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.ADDDATE, expressions);
+  public static FunctionExpression tan(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.TAN, expressions);
   }
 
   public static FunctionExpression convert_tz(Expression... expressions) {
@@ -310,10 +350,6 @@ public static FunctionExpression date_add(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.DATE_ADD, expressions);
   }
 
-  public static FunctionExpression date_sub(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.DATE_SUB, expressions);
-  }
-
   public static FunctionExpression day(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.DAY, expressions);
   }
@@ -322,30 +358,65 @@ public static FunctionExpression dayname(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.DAYNAME, expressions);
   }
 
-  public static FunctionExpression dayofmonth(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.DAYOFMONTH, expressions);
+  public static FunctionExpression dayofmonth(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.DAYOFMONTH, expressions);
   }
 
-  public static FunctionExpression dayofweek(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.DAYOFWEEK, expressions);
+  public static FunctionExpression dayofweek(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.DAYOFWEEK, expressions);
   }
 
   public static FunctionExpression dayofyear(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.DAYOFYEAR, expressions);
   }
 
-  public static FunctionExpression day_of_year(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.DAY_OF_YEAR, expressions);
+  public static FunctionExpression day_of_month(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.DAY_OF_MONTH, expressions);
+  }
+
+  public static FunctionExpression day_of_year(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.DAY_OF_YEAR, expressions);
+  }
+
+  public static FunctionExpression day_of_week(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.DAY_OF_WEEK, expressions);
+  }
+
+  public static FunctionExpression extract(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.EXTRACT, expressions);
+  }
+
+  public static FunctionExpression extract(Expression... expressions) {
+    return extract(FunctionProperties.None, expressions);
   }
 
   public static FunctionExpression from_days(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.FROM_DAYS, expressions);
   }
 
+  public static FunctionExpression get_format(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.GET_FORMAT, expressions);
+  }
+
   public static FunctionExpression hour(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.HOUR, expressions);
   }
 
+  public static FunctionExpression hour_of_day(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.HOUR_OF_DAY, expressions);
+  }
+
+  public static FunctionExpression last_day(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.LAST_DAY, expressions);
+  }
+
   public static FunctionExpression microsecond(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.MICROSECOND, expressions);
   }
@@ -354,12 +425,21 @@ public static FunctionExpression minute(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.MINUTE, expressions);
   }
 
+  public static FunctionExpression minute_of_day(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.MINUTE_OF_DAY, expressions);
+  }
+
+  public static FunctionExpression minute_of_hour(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.MINUTE_OF_HOUR, expressions);
+  }
+
   public static FunctionExpression month(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.MONTH, expressions);
   }
 
-  public static FunctionExpression month_of_year(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.MONTH_OF_YEAR, expressions);
+  public static FunctionExpression month_of_year(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.MONTH_OF_YEAR, expressions);
   }
 
   public static FunctionExpression monthname(Expression... expressions) {
@@ -374,8 +454,8 @@ public static FunctionExpression second(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.SECOND, expressions);
   }
 
-  public static FunctionExpression subdate(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.SUBDATE, expressions);
+  public static FunctionExpression second_of_minute(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.SECOND_OF_MINUTE, expressions);
   }
 
   public static FunctionExpression time(Expression... expressions) {
@@ -387,35 +467,68 @@ public static FunctionExpression time_to_sec(Expression... expressions) {
   }
 
   public static FunctionExpression timestamp(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.TIMESTAMP, expressions);
+    return timestamp(FunctionProperties.None, expressions);
+  }
+
+  public static FunctionExpression timestamp(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.TIMESTAMP, expressions);
   }
 
-  public static FunctionExpression date_format(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.DATE_FORMAT, expressions);
+  public static FunctionExpression date_format(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.DATE_FORMAT, expressions);
   }
 
   public static FunctionExpression to_days(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.TO_DAYS, expressions);
   }
 
-  public static FunctionExpression week(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.WEEK, expressions);
+  public static FunctionExpression to_seconds(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.TO_SECONDS, expressions);
+  }
+
+  public static FunctionExpression to_seconds(Expression... expressions) {
+    return to_seconds(FunctionProperties.None, expressions);
+  }
+
+  public static FunctionExpression week(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.WEEK, expressions);
+  }
+
+  public static FunctionExpression weekday(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.WEEKDAY, expressions);
   }
 
-  public static FunctionExpression week_of_year(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.WEEK_OF_YEAR, expressions);
+  public static FunctionExpression weekofyear(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.WEEKOFYEAR, expressions);
+  }
+
+  public static FunctionExpression week_of_year(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.WEEK_OF_YEAR, expressions);
   }
 
   public static FunctionExpression year(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.YEAR, expressions);
   }
 
-  public static FunctionExpression divide(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.DIVIDE, expressions);
+  public static FunctionExpression yearweek(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.YEARWEEK, expressions);
+  }
+
+  public static FunctionExpression str_to_date(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.STR_TO_DATE, expressions);
   }
 
-  public static FunctionExpression module(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.MODULES, expressions);
+  public static FunctionExpression sec_to_time(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.SEC_TO_TIME, expressions);
   }
 
   public static FunctionExpression substr(Expression... expressions) {
@@ -502,32 +615,60 @@ public static FunctionExpression xor(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.XOR, expressions);
   }
 
+  public static FunctionExpression nested(Expression... expressions) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.NESTED, expressions);
+  }
+
   public static FunctionExpression not(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.NOT, expressions);
   }
 
+  public static FunctionExpression equal(FunctionProperties fp, Expression... expressions) {
+    return compile(fp, BuiltinFunctionName.EQUAL, expressions);
+  }
+
   public static FunctionExpression equal(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.EQUAL, expressions);
+    return equal(FunctionProperties.None, expressions);
+  }
+
+  public static FunctionExpression notequal(FunctionProperties fp, Expression... expressions) {
+    return compile(fp, BuiltinFunctionName.NOTEQUAL, expressions);
   }
 
   public static FunctionExpression notequal(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.NOTEQUAL, expressions);
+    return notequal(FunctionProperties.None, expressions);
+  }
+
+  public static FunctionExpression less(FunctionProperties fp, Expression... expressions) {
+    return compile(fp, BuiltinFunctionName.LESS, expressions);
   }
 
   public static FunctionExpression less(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.LESS, expressions);
+    return less(FunctionProperties.None, expressions);
+  }
+
+  public static FunctionExpression lte(FunctionProperties fp, Expression... expressions) {
+    return compile(fp, BuiltinFunctionName.LTE, expressions);
   }
 
   public static FunctionExpression lte(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.LTE, expressions);
+    return lte(FunctionProperties.None, expressions);
+  }
+
+  public static FunctionExpression greater(FunctionProperties fp, Expression... expressions) {
+    return compile(fp, BuiltinFunctionName.GREATER, expressions);
   }
 
   public static FunctionExpression greater(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.GREATER, expressions);
+    return greater(FunctionProperties.None, expressions);
+  }
+
+  public static FunctionExpression gte(FunctionProperties fp, Expression... expressions) {
+    return compile(fp, BuiltinFunctionName.GTE, expressions);
   }
 
   public static FunctionExpression gte(Expression... expressions) {
-    return compile(FunctionProperties.None, BuiltinFunctionName.GTE, expressions);
+    return gte(FunctionProperties.None, expressions);
   }
 
   public static FunctionExpression like(Expression... expressions) {
@@ -594,6 +735,18 @@ public static Aggregator max(Expression... expressions) {
     return aggregate(BuiltinFunctionName.MAX, expressions);
   }
 
+  /**
+   * OpenSearch uses T-Digest to approximate percentile, so PERCENTILE and PERCENTILE_APPROX are the
+   * same function.
+   */
+  public static Aggregator percentile(Expression... expressions) {
+    return percentileApprox(expressions);
+  }
+
+  public static Aggregator percentileApprox(Expression... expressions) {
+    return aggregate(BuiltinFunctionName.PERCENTILE_APPROX, expressions);
+  }
+
   private static Aggregator aggregate(BuiltinFunctionName functionName, Expression... expressions) {
     return compile(FunctionProperties.None, functionName, expressions);
   }
@@ -622,8 +775,7 @@ public static FunctionExpression iffunction(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.IF, expressions);
   }
 
-  public static Expression cases(Expression defaultResult,
-                                 WhenClause... whenClauses) {
+  public static Expression cases(Expression defaultResult, WhenClause... whenClauses) {
     return new CaseClause(Arrays.asList(whenClauses), defaultResult);
   }
 
@@ -720,59 +872,104 @@ public static FunctionExpression match_bool_prefix(Expression... args) {
   }
 
   public static FunctionExpression wildcard_query(Expression... args) {
-    return compile(FunctionProperties.None,BuiltinFunctionName.WILDCARD_QUERY, args);
+    return compile(FunctionProperties.None, BuiltinFunctionName.WILDCARD_QUERY, args);
+  }
+
+  public static FunctionExpression score(Expression... args) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.SCORE, args);
+  }
+
+  public static FunctionExpression scorequery(Expression... args) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.SCOREQUERY, args);
+  }
+
+  public static FunctionExpression score_query(Expression... args) {
+    return compile(FunctionProperties.None, BuiltinFunctionName.SCORE_QUERY, args);
   }
 
-  public static FunctionExpression now(FunctionProperties functionProperties,
-                                       Expression... args) {
+  public static FunctionExpression now(FunctionProperties functionProperties, Expression... args) {
     return compile(functionProperties, BuiltinFunctionName.NOW, args);
   }
 
-  public static FunctionExpression current_timestamp(FunctionProperties functionProperties,
-                                                     Expression... args) {
+  public static FunctionExpression current_timestamp(
+      FunctionProperties functionProperties, Expression... args) {
     return compile(functionProperties, BuiltinFunctionName.CURRENT_TIMESTAMP, args);
   }
 
-  public static FunctionExpression localtimestamp(FunctionProperties functionProperties,
-                                                  Expression... args) {
+  public static FunctionExpression localtimestamp(
+      FunctionProperties functionProperties, Expression... args) {
     return compile(functionProperties, BuiltinFunctionName.LOCALTIMESTAMP, args);
   }
 
-  public static FunctionExpression localtime(FunctionProperties functionProperties,
-                                             Expression... args) {
+  public static FunctionExpression localtime(
+      FunctionProperties functionProperties, Expression... args) {
     return compile(functionProperties, BuiltinFunctionName.LOCALTIME, args);
   }
 
-  public static FunctionExpression sysdate(FunctionProperties functionProperties,
-                                           Expression... args) {
+  public static FunctionExpression sysdate(
+      FunctionProperties functionProperties, Expression... args) {
     return compile(functionProperties, BuiltinFunctionName.SYSDATE, args);
   }
 
-  public static FunctionExpression curtime(FunctionProperties functionProperties,
-                                           Expression... args) {
+  public static FunctionExpression curtime(
+      FunctionProperties functionProperties, Expression... args) {
     return compile(functionProperties, BuiltinFunctionName.CURTIME, args);
   }
 
-  public static FunctionExpression current_time(FunctionProperties functionProperties,
-                                                Expression... args) {
+  public static FunctionExpression current_time(
+      FunctionProperties functionProperties, Expression... args) {
     return compile(functionProperties, BuiltinFunctionName.CURRENT_TIME, args);
   }
 
-  public static FunctionExpression curdate(FunctionProperties functionProperties,
-                                           Expression... args) {
+  public static FunctionExpression curdate(
+      FunctionProperties functionProperties, Expression... args) {
     return compile(functionProperties, BuiltinFunctionName.CURDATE, args);
   }
 
-  public static FunctionExpression current_date(FunctionProperties functionProperties,
-                                                Expression... args) {
+  public static FunctionExpression current_date(
+      FunctionProperties functionProperties, Expression... args) {
     return compile(functionProperties, BuiltinFunctionName.CURRENT_DATE, args);
   }
 
+  public static FunctionExpression time_format(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.TIME_FORMAT, expressions);
+  }
+
+  public static FunctionExpression timestampadd(Expression... expressions) {
+    return timestampadd(FunctionProperties.None, expressions);
+  }
+
+  public static FunctionExpression timestampadd(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.TIMESTAMPADD, expressions);
+  }
+
+  public static FunctionExpression timestampdiff(
+      FunctionProperties functionProperties, Expression... expressions) {
+    return compile(functionProperties, BuiltinFunctionName.TIMESTAMPDIFF, expressions);
+  }
+
+  public static FunctionExpression utc_date(
+      FunctionProperties functionProperties, Expression... args) {
+    return compile(functionProperties, BuiltinFunctionName.UTC_DATE, args);
+  }
+
+  public static FunctionExpression utc_time(
+      FunctionProperties functionProperties, Expression... args) {
+    return compile(functionProperties, BuiltinFunctionName.UTC_TIME, args);
+  }
+
+  public static FunctionExpression utc_timestamp(
+      FunctionProperties functionProperties, Expression... args) {
+    return compile(functionProperties, BuiltinFunctionName.UTC_TIMESTAMP, args);
+  }
+
   @SuppressWarnings("unchecked")
-  private static <T extends FunctionImplementation>
-      T compile(FunctionProperties functionProperties,
-                BuiltinFunctionName bfn, Expression... args) {
-    return (T) BuiltinFunctionRepository.getInstance().compile(functionProperties,
-        bfn.getName(), Arrays.asList(args));
+  private static <T extends FunctionImplementation> T compile(
+      FunctionProperties functionProperties, BuiltinFunctionName bfn, Expression... args) {
+    return (T)
+        BuiltinFunctionRepository.getInstance()
+            .compile(functionProperties, bfn.getName(), Arrays.asList(args));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/Expression.java b/core/src/main/java/org/opensearch/sql/expression/Expression.java
index 25a8173efa..e4a5f908e5 100644
--- a/core/src/main/java/org/opensearch/sql/expression/Expression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/Expression.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression;
 
 import java.io.Serializable;
@@ -11,36 +10,28 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.env.Environment;
 
-/**
- * The definition of the resolved expression.
- */
+/** The definition of the resolved expression. */
 public interface Expression extends Serializable {
 
-  /**
-   * Evaluate the value of expression that does not depend on value environment.
-   */
+  /** Evaluate the value of expression that does not depend on value environment. */
   default ExprValue valueOf() {
     return valueOf(null);
   }
 
-  /**
-   * Evaluate the value of expression in the value environment.
-   */
+  /** Evaluate the value of expression in the value environment. */
   ExprValue valueOf(Environment<Expression, ExprValue> valueEnv);
 
-  /**
-   * The type of the expression.
-   */
+  /** The type of the expression. */
   ExprType type();
 
   /**
    * Accept a visitor to visit current expression node.
-   * @param visitor   visitor
-   * @param context   context
-   * @param <T>       result type
-   * @param <C>       context type
-   * @return          result accumulated by visitor when visiting
+   *
+   * @param visitor visitor
+   * @param context context
+   * @param <T> result type
+   * @param <C> context type
+   * @return result accumulated by visitor when visiting
    */
   <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context);
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/ExpressionNodeVisitor.java b/core/src/main/java/org/opensearch/sql/expression/ExpressionNodeVisitor.java
index e3d4e38674..17dc7f5cd7 100644
--- a/core/src/main/java/org/opensearch/sql/expression/ExpressionNodeVisitor.java
+++ b/core/src/main/java/org/opensearch/sql/expression/ExpressionNodeVisitor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression;
 
 import org.opensearch.sql.expression.aggregation.Aggregator;
@@ -15,8 +14,9 @@
 
 /**
  * Abstract visitor for expression tree nodes.
- * @param <T>   type of return value to accumulate when visiting.
- * @param <C>   type of context.
+ *
+ * @param <T> type of return value to accumulate when visiting.
+ * @param <C> type of context.
  */
 public abstract class ExpressionNodeVisitor<T, C> {
 
@@ -26,9 +26,10 @@ public T visitNode(Expression node, C context) {
 
   /**
    * Visit children nodes in function arguments.
-   * @param node      function node
-   * @param context   context
-   * @return          result
+   *
+   * @param node function node
+   * @param context context
+   * @return result
    */
   public T visitChildren(FunctionImplementation node, C context) {
     T result = defaultResult();
@@ -81,10 +82,13 @@ public T visitNamedAggregator(NamedAggregator node, C context) {
   }
 
   /**
-   * Call visitFunction() by default rather than visitChildren().
-   * This makes CASE/WHEN able to be handled:
-   *  1) by visitFunction() if not overwritten: ex. FilterQueryBuilder
-   *  2) by visitCase/When() otherwise if any special logic: ex. ExprReferenceOptimizer
+   * Call visitFunction() by default rather than visitChildren(). This makes CASE/WHEN able to be
+   * handled:
+   *
+   * <ol>
+   *   <li>by visitFunction() if not overwritten: ex. FilterQueryBuilder
+   *   <li>by visitCase/When() otherwise if any special logic: ex. ExprReferenceOptimizer
+   * </ol>
    */
   public T visitCase(CaseClause node, C context) {
     return visitFunction(node, context);
diff --git a/core/src/main/java/org/opensearch/sql/expression/FunctionExpression.java b/core/src/main/java/org/opensearch/sql/expression/FunctionExpression.java
index 2a695f26e6..b67eb38c00 100644
--- a/core/src/main/java/org/opensearch/sql/expression/FunctionExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/FunctionExpression.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression;
 
 import java.util.List;
@@ -14,22 +13,17 @@
 import org.opensearch.sql.expression.function.FunctionImplementation;
 import org.opensearch.sql.expression.function.FunctionName;
 
-/**
- * Function Expression.
- */
+/** Function Expression. */
 @EqualsAndHashCode
 @RequiredArgsConstructor
 @ToString
 public abstract class FunctionExpression implements Expression, FunctionImplementation {
-  @Getter
-  private final FunctionName functionName;
+  @Getter private final FunctionName functionName;
 
-  @Getter
-  private final List<Expression> arguments;
+  @Getter private final List<Expression> arguments;
 
   @Override
   public <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context) {
     return visitor.visitFunction(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/HighlightExpression.java b/core/src/main/java/org/opensearch/sql/expression/HighlightExpression.java
index 804c38a6f7..79cc07f048 100644
--- a/core/src/main/java/org/opensearch/sql/expression/HighlightExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/HighlightExpression.java
@@ -20,9 +20,7 @@
 import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 
-/**
- * Highlight Expression.
- */
+/** Highlight Expression. */
 @Getter
 public class HighlightExpression extends FunctionExpression {
   private final Expression highlightField;
@@ -30,17 +28,19 @@ public class HighlightExpression extends FunctionExpression {
 
   /**
    * HighlightExpression Constructor.
+   *
    * @param highlightField : Highlight field for expression.
    */
   public HighlightExpression(Expression highlightField) {
     super(BuiltinFunctionName.HIGHLIGHT.getName(), List.of(highlightField));
     this.highlightField = highlightField;
-    this.type = this.highlightField.toString().contains("*")
-        ? ExprCoreType.STRUCT : ExprCoreType.ARRAY;
+    this.type =
+        this.highlightField.toString().contains("*") ? ExprCoreType.STRUCT : ExprCoreType.ARRAY;
   }
 
   /**
    * Return collection value matching highlight field.
+   *
    * @param valueEnv : Dataset to parse value from.
    * @return : collection value of highlight fields.
    */
@@ -57,15 +57,15 @@ public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
     // used in conjunction with other highlight calls, we need to ensure
     // only wildcard regex matching is mapped to wildcard call.
     if (this.type == ExprCoreType.STRUCT && value.type() == ExprCoreType.STRUCT) {
-      value = new ExprTupleValue(
-          new LinkedHashMap<String, ExprValue>(value.tupleValue()
-              .entrySet()
-              .stream()
-              .filter(s -> matchesHighlightRegex(s.getKey(),
-                  StringUtils.unquoteText(highlightField.toString())))
-              .collect(Collectors.toMap(
-                  e -> e.getKey(),
-                  e -> e.getValue()))));
+      value =
+          new ExprTupleValue(
+              new LinkedHashMap<String, ExprValue>(
+                  value.tupleValue().entrySet().stream()
+                      .filter(
+                          s ->
+                              matchesHighlightRegex(
+                                  s.getKey(), StringUtils.unquoteText(highlightField.toString())))
+                      .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue()))));
       if (value.tupleValue().isEmpty()) {
         value = ExprValueUtils.missingValue();
       }
@@ -76,6 +76,7 @@ public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
 
   /**
    * Get type for HighlightExpression.
+   *
    * @return : Expression type.
    */
   @Override
@@ -90,6 +91,7 @@ public <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context) {
 
   /**
    * Check if field matches the wildcard pattern used in highlight query.
+   *
    * @param field Highlight selected field for query
    * @param pattern Wildcard regex to match field against
    * @return True if field matches wildcard pattern
diff --git a/core/src/main/java/org/opensearch/sql/expression/LiteralExpression.java b/core/src/main/java/org/opensearch/sql/expression/LiteralExpression.java
index adb8e197d1..eba03e8430 100644
--- a/core/src/main/java/org/opensearch/sql/expression/LiteralExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/LiteralExpression.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression;
 
 import lombok.EqualsAndHashCode;
@@ -12,9 +11,7 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.env.Environment;
 
-/**
- * Literal Expression.
- */
+/** Literal Expression. */
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class LiteralExpression implements Expression {
diff --git a/core/src/main/java/org/opensearch/sql/expression/NamedArgumentExpression.java b/core/src/main/java/org/opensearch/sql/expression/NamedArgumentExpression.java
index 0f4601f1bf..c3ce60bd4a 100644
--- a/core/src/main/java/org/opensearch/sql/expression/NamedArgumentExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/NamedArgumentExpression.java
@@ -13,9 +13,7 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.env.Environment;
 
-/**
- * Named argument expression that represents function argument with name.
- */
+/** Named argument expression that represents function argument with name. */
 @RequiredArgsConstructor
 @Getter
 @EqualsAndHashCode
diff --git a/core/src/main/java/org/opensearch/sql/expression/NamedExpression.java b/core/src/main/java/org/opensearch/sql/expression/NamedExpression.java
index 26996eb93d..03118311a9 100644
--- a/core/src/main/java/org/opensearch/sql/expression/NamedExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/NamedExpression.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression;
 
 import com.google.common.base.Strings;
@@ -16,8 +15,8 @@
 import org.opensearch.sql.expression.env.Environment;
 
 /**
- * Named expression that represents expression with name.
- * Please see more details in associated unresolved expression operator
+ * Named expression that represents expression with name.<br>
+ * Please see more details in associated unresolved expression operator<br>
  * {@link org.opensearch.sql.ast.expression.Alias}.
  */
 @AllArgsConstructor
@@ -26,19 +25,13 @@
 @RequiredArgsConstructor
 public class NamedExpression implements Expression {
 
-  /**
-   * Expression name.
-   */
+  /** Expression name. */
   private final String name;
 
-  /**
-   * Expression that being named.
-   */
+  /** Expression that being named. */
   private final Expression delegated;
 
-  /**
-   * Optional alias.
-   */
+  /** Optional alias. */
   private String alias;
 
   @Override
@@ -53,7 +46,8 @@ public ExprType type() {
 
   /**
    * Get expression name using name or its alias (if it's present).
-   * @return  expression name
+   *
+   * @return expression name
    */
   public String getNameOrAlias() {
     return Strings.isNullOrEmpty(alias) ? name : alias;
@@ -68,5 +62,4 @@ public <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context) {
   public String toString() {
     return getNameOrAlias();
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/ReferenceExpression.java b/core/src/main/java/org/opensearch/sql/expression/ReferenceExpression.java
index 94bb4e067d..eb510e3b8a 100644
--- a/core/src/main/java/org/opensearch/sql/expression/ReferenceExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/ReferenceExpression.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression;
 
 import static org.opensearch.sql.utils.ExpressionUtils.PATH_SEP;
@@ -15,22 +14,22 @@
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.env.Environment;
 
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class ReferenceExpression implements Expression {
-  @Getter
-  private final String attr;
+  @Getter private final String attr;
 
-  @Getter
-  private final List<String> paths;
+  @Getter private final List<String> paths;
 
   private final ExprType type;
 
   /**
    * Constructor of ReferenceExpression.
+   *
    * @param ref the field name. e.g. addr.state/addr.
    * @param type type.
    */
@@ -62,6 +61,7 @@ public String toString() {
   }
 
   /**
+   * <pre>
    * Resolve the ExprValue from {@link ExprTupleValue} using paths.
    * Considering the following sample data.
    * {
@@ -94,13 +94,19 @@ public String toString() {
    *
    * @param value {@link ExprTupleValue}.
    * @return {@link ExprTupleValue}.
+   * </pre>
    */
   public ExprValue resolve(ExprTupleValue value) {
     return resolve(value, paths);
   }
 
   private ExprValue resolve(ExprValue value, List<String> paths) {
-    final ExprValue wholePathValue = value.keyValue(String.join(PATH_SEP, paths));
+    ExprValue wholePathValue = value.keyValue(String.join(PATH_SEP, paths));
+    // For array types only first index currently supported.
+    if (value.type().equals(ExprCoreType.ARRAY)) {
+      wholePathValue = value.collectionValue().get(0).keyValue(paths.get(0));
+    }
+
     if (!wholePathValue.isMissing() || paths.size() == 1) {
       return wholePathValue;
     } else {
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/AggregationState.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/AggregationState.java
index 345c6c00dd..478e3caf54 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/AggregationState.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/AggregationState.java
@@ -3,18 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.storage.bindingtuple.BindingTuple;
 
-/**
- * Maintain the state when {@link Aggregator} iterate on the {@link BindingTuple}.
- */
+/** Maintain the state when {@link Aggregator} iterate on the {@link BindingTuple}. */
 public interface AggregationState {
-  /**
-   * Get {@link ExprValue} result.
-   */
+  /** Get {@link ExprValue} result. */
   ExprValue result();
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java
index a122ea6540..a2a3ce76c3 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import java.util.List;
@@ -26,36 +25,34 @@
 import org.opensearch.sql.storage.bindingtuple.BindingTuple;
 
 /**
- * Aggregator which will iterate on the {@link BindingTuple}s to aggregate the result.
- * The Aggregator is not well fit into Expression, because it has side effect.
- * But we still want to make it implement {@link Expression} interface to make
- * {@link ExpressionAnalyzer} easier.
+ * Aggregator which will iterate on the {@link BindingTuple}s to aggregate the result. The
+ * Aggregator is not well fit into Expression, because it has side effect. But we still want to make
+ * it implement {@link Expression} interface to make {@link ExpressionAnalyzer} easier.
  */
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public abstract class Aggregator<S extends AggregationState>
     implements FunctionImplementation, Expression {
-  @Getter
-  private final FunctionName functionName;
-  @Getter
-  private final List<Expression> arguments;
+  @Getter private final FunctionName functionName;
+  @Getter private final List<Expression> arguments;
   protected final ExprCoreType returnType;
+
   @Setter
   @Getter
   @Accessors(fluent = true)
   protected Expression condition;
+
   @Setter
   @Getter
   @Accessors(fluent = true)
   protected Boolean distinct = false;
 
-  /**
-   * Create an {@link AggregationState} which will be used for aggregation.
-   */
+  /** Create an {@link AggregationState} which will be used for aggregation. */
   public abstract S create();
 
   /**
    * Iterate on {@link ExprValue}.
+   *
    * @param value {@link ExprValue}
    * @param state {@link AggregationState}
    * @return {@link AggregationState}
@@ -63,9 +60,9 @@ public abstract class Aggregator<S extends AggregationState>
   protected abstract S iterate(ExprValue value, S state);
 
   /**
-   * Let the aggregator iterate on the {@link BindingTuple}
-   * To filter out ExprValues that are missing, null or cannot satisfy {@link #condition}
-   * Before the specific aggregator iterating ExprValue in the tuple.
+   * Let the aggregator iterate on the {@link BindingTuple} To filter out ExprValues that are
+   * missing, null or cannot satisfy {@link #condition} Before the specific aggregator iterating
+   * ExprValue in the tuple.
    *
    * @param tuple {@link BindingTuple}
    * @param state {@link AggregationState}
@@ -95,14 +92,11 @@ public <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context) {
     return visitor.visitAggregator(this, context);
   }
 
-  /**
-   * Util method to get value of condition in aggregation filter.
-   */
+  /** Util method to get value of condition in aggregation filter. */
   public boolean conditionValue(BindingTuple tuple) {
     if (condition == null) {
       return true;
     }
     return ExprValueUtils.getBooleanValue(condition.valueOf(tuple));
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/AggregatorFunction.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/AggregatorFunction.java
index c30ca13351..1f5106576e 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/AggregatorFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/AggregatorFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.opensearch.sql.data.type.ExprCoreType.ARRAY;
@@ -35,12 +34,11 @@
 import org.opensearch.sql.expression.function.FunctionSignature;
 
 /**
- * The definition of aggregator function
- * avg, Accepts two numbers and produces a number.
- * sum, Accepts two numbers and produces a number.
- * max, Accepts two numbers and produces a number.
- * min, Accepts two numbers and produces a number.
- * count, Accepts two numbers and produces a number.
+ * The definition of aggregator functions <em>avg</em>, <em>sum</em>, <em>min</em>, <em>max</em> and
+ * <em>count</em>.<br>
+ * All of them accept a list of numbers and produce a number. <em>avg</em>, <em>min</em> and
+ * <em>max</em> also accept datetime types.<br>
+ * <em>count</em> accepts values of all types.
  */
 @UtilityClass
 public class AggregatorFunction {
@@ -60,6 +58,7 @@ public static void register(BuiltinFunctionRepository repository) {
     repository.register(stddevSamp());
     repository.register(stddevPop());
     repository.register(take());
+    repository.register(percentileApprox());
   }
 
   private static DefaultFunctionResolver avg() {
@@ -67,18 +66,37 @@ private static DefaultFunctionResolver avg() {
     return new DefaultFunctionResolver(
         functionName,
         new ImmutableMap.Builder<FunctionSignature, FunctionBuilder>()
-            .put(new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
                 (functionProperties, arguments) -> new AvgAggregator(arguments, DOUBLE))
-            .build()
-    );
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DATE)),
+                (functionProperties, arguments) -> new AvgAggregator(arguments, DATE))
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DATETIME)),
+                (functionProperties, arguments) -> new AvgAggregator(arguments, DATETIME))
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(TIME)),
+                (functionProperties, arguments) -> new AvgAggregator(arguments, TIME))
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(TIMESTAMP)),
+                (functionProperties, arguments) -> new AvgAggregator(arguments, TIMESTAMP))
+            .build());
   }
 
   private static DefaultFunctionResolver count() {
     FunctionName functionName = BuiltinFunctionName.COUNT.getName();
-    DefaultFunctionResolver functionResolver = new DefaultFunctionResolver(functionName,
-        ExprCoreType.coreTypes().stream().collect(Collectors.toMap(
-          type -> new FunctionSignature(functionName, Collections.singletonList(type)),
-          type -> (functionProperties, arguments) -> new CountAggregator(arguments, INTEGER))));
+    DefaultFunctionResolver functionResolver =
+        new DefaultFunctionResolver(
+            functionName,
+            ExprCoreType.coreTypes().stream()
+                .collect(
+                    Collectors.toMap(
+                        type ->
+                            new FunctionSignature(functionName, Collections.singletonList(type)),
+                        type ->
+                            (functionProperties, arguments) ->
+                                new CountAggregator(arguments, INTEGER))));
     return functionResolver;
   }
 
@@ -87,16 +105,19 @@ private static DefaultFunctionResolver sum() {
     return new DefaultFunctionResolver(
         functionName,
         new ImmutableMap.Builder<FunctionSignature, FunctionBuilder>()
-            .put(new FunctionSignature(functionName, Collections.singletonList(INTEGER)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(INTEGER)),
                 (functionProperties, arguments) -> new SumAggregator(arguments, INTEGER))
-            .put(new FunctionSignature(functionName, Collections.singletonList(LONG)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(LONG)),
                 (functionProperties, arguments) -> new SumAggregator(arguments, LONG))
-            .put(new FunctionSignature(functionName, Collections.singletonList(FLOAT)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(FLOAT)),
                 (functionProperties, arguments) -> new SumAggregator(arguments, FLOAT))
-            .put(new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
                 (functionProperties, arguments) -> new SumAggregator(arguments, DOUBLE))
-            .build()
-    );
+            .build());
   }
 
   private static DefaultFunctionResolver min() {
@@ -104,23 +125,32 @@ private static DefaultFunctionResolver min() {
     return new DefaultFunctionResolver(
         functionName,
         new ImmutableMap.Builder<FunctionSignature, FunctionBuilder>()
-            .put(new FunctionSignature(functionName, Collections.singletonList(INTEGER)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(INTEGER)),
                 (functionProperties, arguments) -> new MinAggregator(arguments, INTEGER))
-            .put(new FunctionSignature(functionName, Collections.singletonList(LONG)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(LONG)),
                 (functionProperties, arguments) -> new MinAggregator(arguments, LONG))
-            .put(new FunctionSignature(functionName, Collections.singletonList(FLOAT)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(FLOAT)),
                 (functionProperties, arguments) -> new MinAggregator(arguments, FLOAT))
-            .put(new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
                 (functionProperties, arguments) -> new MinAggregator(arguments, DOUBLE))
-            .put(new FunctionSignature(functionName, Collections.singletonList(STRING)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(STRING)),
                 (functionProperties, arguments) -> new MinAggregator(arguments, STRING))
-            .put(new FunctionSignature(functionName, Collections.singletonList(DATE)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DATE)),
                 (functionProperties, arguments) -> new MinAggregator(arguments, DATE))
-            .put(new FunctionSignature(functionName, Collections.singletonList(DATETIME)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DATETIME)),
                 (functionProperties, arguments) -> new MinAggregator(arguments, DATETIME))
-            .put(new FunctionSignature(functionName, Collections.singletonList(TIME)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(TIME)),
                 (functionProperties, arguments) -> new MinAggregator(arguments, TIME))
-            .put(new FunctionSignature(functionName, Collections.singletonList(TIMESTAMP)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(TIMESTAMP)),
                 (functionProperties, arguments) -> new MinAggregator(arguments, TIMESTAMP))
             .build());
   }
@@ -130,26 +160,34 @@ private static DefaultFunctionResolver max() {
     return new DefaultFunctionResolver(
         functionName,
         new ImmutableMap.Builder<FunctionSignature, FunctionBuilder>()
-            .put(new FunctionSignature(functionName, Collections.singletonList(INTEGER)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(INTEGER)),
                 (functionProperties, arguments) -> new MaxAggregator(arguments, INTEGER))
-            .put(new FunctionSignature(functionName, Collections.singletonList(LONG)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(LONG)),
                 (functionProperties, arguments) -> new MaxAggregator(arguments, LONG))
-            .put(new FunctionSignature(functionName, Collections.singletonList(FLOAT)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(FLOAT)),
                 (functionProperties, arguments) -> new MaxAggregator(arguments, FLOAT))
-            .put(new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
                 (functionProperties, arguments) -> new MaxAggregator(arguments, DOUBLE))
-            .put(new FunctionSignature(functionName, Collections.singletonList(STRING)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(STRING)),
                 (functionProperties, arguments) -> new MaxAggregator(arguments, STRING))
-            .put(new FunctionSignature(functionName, Collections.singletonList(DATE)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DATE)),
                 (functionProperties, arguments) -> new MaxAggregator(arguments, DATE))
-            .put(new FunctionSignature(functionName, Collections.singletonList(DATETIME)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DATETIME)),
                 (functionProperties, arguments) -> new MaxAggregator(arguments, DATETIME))
-            .put(new FunctionSignature(functionName, Collections.singletonList(TIME)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(TIME)),
                 (functionProperties, arguments) -> new MaxAggregator(arguments, TIME))
-            .put(new FunctionSignature(functionName, Collections.singletonList(TIMESTAMP)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(TIMESTAMP)),
                 (functionProperties, arguments) -> new MaxAggregator(arguments, TIMESTAMP))
-            .build()
-    );
+            .build());
   }
 
   private static DefaultFunctionResolver varSamp() {
@@ -157,10 +195,10 @@ private static DefaultFunctionResolver varSamp() {
     return new DefaultFunctionResolver(
         functionName,
         new ImmutableMap.Builder<FunctionSignature, FunctionBuilder>()
-            .put(new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
                 (functionProperties, arguments) -> varianceSample(arguments, DOUBLE))
-            .build()
-    );
+            .build());
   }
 
   private static DefaultFunctionResolver varPop() {
@@ -168,10 +206,10 @@ private static DefaultFunctionResolver varPop() {
     return new DefaultFunctionResolver(
         functionName,
         new ImmutableMap.Builder<FunctionSignature, FunctionBuilder>()
-            .put(new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
                 (functionProperties, arguments) -> variancePopulation(arguments, DOUBLE))
-            .build()
-    );
+            .build());
   }
 
   private static DefaultFunctionResolver stddevSamp() {
@@ -179,10 +217,10 @@ private static DefaultFunctionResolver stddevSamp() {
     return new DefaultFunctionResolver(
         functionName,
         new ImmutableMap.Builder<FunctionSignature, FunctionBuilder>()
-            .put(new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
                 (functionProperties, arguments) -> stddevSample(arguments, DOUBLE))
-            .build()
-    );
+            .build());
   }
 
   private static DefaultFunctionResolver stddevPop() {
@@ -190,20 +228,64 @@ private static DefaultFunctionResolver stddevPop() {
     return new DefaultFunctionResolver(
         functionName,
         new ImmutableMap.Builder<FunctionSignature, FunctionBuilder>()
-            .put(new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
+            .put(
+                new FunctionSignature(functionName, Collections.singletonList(DOUBLE)),
                 (functionProperties, arguments) -> stddevPopulation(arguments, DOUBLE))
-            .build()
-    );
+            .build());
   }
 
   private static DefaultFunctionResolver take() {
     FunctionName functionName = BuiltinFunctionName.TAKE.getName();
-    DefaultFunctionResolver functionResolver = new DefaultFunctionResolver(functionName,
-        new ImmutableMap.Builder<FunctionSignature, FunctionBuilder>()
-            .put(new FunctionSignature(functionName, ImmutableList.of(STRING, INTEGER)),
-                (functionProperties, arguments) -> new TakeAggregator(arguments, ARRAY))
-            .build());
+    DefaultFunctionResolver functionResolver =
+        new DefaultFunctionResolver(
+            functionName,
+            new ImmutableMap.Builder<FunctionSignature, FunctionBuilder>()
+                .put(
+                    new FunctionSignature(functionName, ImmutableList.of(STRING, INTEGER)),
+                    (functionProperties, arguments) -> new TakeAggregator(arguments, ARRAY))
+                .build());
     return functionResolver;
   }
 
+  private static DefaultFunctionResolver percentileApprox() {
+    FunctionName functionName = BuiltinFunctionName.PERCENTILE_APPROX.getName();
+    DefaultFunctionResolver functionResolver =
+        new DefaultFunctionResolver(
+            functionName,
+            new ImmutableMap.Builder<FunctionSignature, FunctionBuilder>()
+                .put(
+                    new FunctionSignature(functionName, ImmutableList.of(INTEGER, DOUBLE)),
+                    (functionProperties, arguments) ->
+                        PercentileApproximateAggregator.percentileApprox(arguments, INTEGER))
+                .put(
+                    new FunctionSignature(functionName, ImmutableList.of(INTEGER, DOUBLE, DOUBLE)),
+                    (functionProperties, arguments) ->
+                        PercentileApproximateAggregator.percentileApprox(arguments, INTEGER))
+                .put(
+                    new FunctionSignature(functionName, ImmutableList.of(LONG, DOUBLE)),
+                    (functionProperties, arguments) ->
+                        PercentileApproximateAggregator.percentileApprox(arguments, LONG))
+                .put(
+                    new FunctionSignature(functionName, ImmutableList.of(LONG, DOUBLE, DOUBLE)),
+                    (functionProperties, arguments) ->
+                        PercentileApproximateAggregator.percentileApprox(arguments, LONG))
+                .put(
+                    new FunctionSignature(functionName, ImmutableList.of(FLOAT, DOUBLE)),
+                    (functionProperties, arguments) ->
+                        PercentileApproximateAggregator.percentileApprox(arguments, FLOAT))
+                .put(
+                    new FunctionSignature(functionName, ImmutableList.of(FLOAT, DOUBLE, DOUBLE)),
+                    (functionProperties, arguments) ->
+                        PercentileApproximateAggregator.percentileApprox(arguments, FLOAT))
+                .put(
+                    new FunctionSignature(functionName, ImmutableList.of(DOUBLE, DOUBLE)),
+                    (functionProperties, arguments) ->
+                        PercentileApproximateAggregator.percentileApprox(arguments, DOUBLE))
+                .put(
+                    new FunctionSignature(functionName, ImmutableList.of(DOUBLE, DOUBLE, DOUBLE)),
+                    (functionProperties, arguments) ->
+                        PercentileApproximateAggregator.percentileApprox(arguments, DOUBLE))
+                .build());
+    return functionResolver;
+  }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/AvgAggregator.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/AvgAggregator.java
index cadfdee87d..c528968018 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/AvgAggregator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/AvgAggregator.java
@@ -3,40 +3,67 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
+import static java.time.temporal.ChronoUnit.MILLIS;
 import static org.opensearch.sql.utils.ExpressionUtils.format;
 
+import java.time.Instant;
+import java.time.LocalTime;
 import java.util.List;
 import java.util.Locale;
+import org.opensearch.sql.data.model.ExprDateValue;
+import org.opensearch.sql.data.model.ExprDatetimeValue;
+import org.opensearch.sql.data.model.ExprDoubleValue;
+import org.opensearch.sql.data.model.ExprIntegerValue;
 import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprTimeValue;
+import org.opensearch.sql.data.model.ExprTimestampValue;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 
 /**
- * The average aggregator aggregate the value evaluated by the expression.
- * If the expression evaluated result is NULL or MISSING, then the result is NULL.
+ * The average aggregator aggregate the value evaluated by the expression. If the expression
+ * evaluated result is NULL or MISSING, then the result is NULL.
  */
 public class AvgAggregator extends Aggregator<AvgAggregator.AvgState> {
 
+  /**
+   * To process by different ways different data types, we need to store the type. Input data has
+   * the same type as the result.
+   */
+  private final ExprCoreType dataType;
+
   public AvgAggregator(List<Expression> arguments, ExprCoreType returnType) {
     super(BuiltinFunctionName.AVG.getName(), arguments, returnType);
+    dataType = returnType;
   }
 
   @Override
   public AvgState create() {
-    return new AvgState();
+    switch (dataType) {
+      case DATE:
+        return new DateAvgState();
+      case DATETIME:
+        return new DateTimeAvgState();
+      case TIMESTAMP:
+        return new TimestampAvgState();
+      case TIME:
+        return new TimeAvgState();
+      case DOUBLE:
+        return new DoubleAvgState();
+      default: // unreachable code - we don't expose signatures for unsupported types
+        throw new IllegalArgumentException(
+            String.format("avg aggregation over %s type is not supported", dataType));
+    }
   }
 
   @Override
   protected AvgState iterate(ExprValue value, AvgState state) {
-    state.count++;
-    state.total += ExprValueUtils.getDoubleValue(value);
-    return state;
+    return state.iterate(value);
   }
 
   @Override
@@ -44,21 +71,123 @@ public String toString() {
     return String.format(Locale.ROOT, "avg(%s)", format(getArguments()));
   }
 
-  /**
-   * Average State.
-   */
-  protected static class AvgState implements AggregationState {
-    private int count;
-    private double total;
+  /** Average State. */
+  protected abstract static class AvgState implements AggregationState {
+    protected ExprValue count;
+    protected ExprValue total;
 
     AvgState() {
-      this.count = 0;
-      this.total = 0d;
+      this.count = new ExprIntegerValue(0);
+      this.total = new ExprDoubleValue(0D);
+    }
+
+    @Override
+    public abstract ExprValue result();
+
+    protected AvgState iterate(ExprValue value) {
+      count = DSL.add(DSL.literal(count), DSL.literal(1)).valueOf();
+      return this;
+    }
+  }
+
+  protected static class DoubleAvgState extends AvgState {
+    @Override
+    public ExprValue result() {
+      if (0 == count.integerValue()) {
+        return ExprNullValue.of();
+      }
+      return DSL.divide(DSL.literal(total), DSL.literal(count)).valueOf();
     }
 
+    @Override
+    protected AvgState iterate(ExprValue value) {
+      total = DSL.add(DSL.literal(total), DSL.literal(value)).valueOf();
+      return super.iterate(value);
+    }
+  }
+
+  protected static class DateAvgState extends AvgState {
     @Override
     public ExprValue result() {
-      return count == 0 ? ExprNullValue.of() : ExprValueUtils.doubleValue(total / count);
+      if (0 == count.integerValue()) {
+        return ExprNullValue.of();
+      }
+
+      return new ExprDateValue(
+          new ExprTimestampValue(
+                  Instant.ofEpochMilli(
+                      DSL.divide(DSL.literal(total), DSL.literal(count)).valueOf().longValue()))
+              .dateValue());
+    }
+
+    @Override
+    protected AvgState iterate(ExprValue value) {
+      total =
+          DSL.add(DSL.literal(total), DSL.literal(value.timestampValue().toEpochMilli())).valueOf();
+      return super.iterate(value);
+    }
+  }
+
+  protected static class DateTimeAvgState extends AvgState {
+    @Override
+    public ExprValue result() {
+      if (0 == count.integerValue()) {
+        return ExprNullValue.of();
+      }
+
+      return new ExprDatetimeValue(
+          new ExprTimestampValue(
+                  Instant.ofEpochMilli(
+                      DSL.divide(DSL.literal(total), DSL.literal(count)).valueOf().longValue()))
+              .datetimeValue());
+    }
+
+    @Override
+    protected AvgState iterate(ExprValue value) {
+      total =
+          DSL.add(DSL.literal(total), DSL.literal(value.timestampValue().toEpochMilli())).valueOf();
+      return super.iterate(value);
+    }
+  }
+
+  protected static class TimestampAvgState extends AvgState {
+    @Override
+    public ExprValue result() {
+      if (0 == count.integerValue()) {
+        return ExprNullValue.of();
+      }
+
+      return new ExprTimestampValue(
+          Instant.ofEpochMilli(
+              DSL.divide(DSL.literal(total), DSL.literal(count)).valueOf().longValue()));
+    }
+
+    @Override
+    protected AvgState iterate(ExprValue value) {
+      total =
+          DSL.add(DSL.literal(total), DSL.literal(value.timestampValue().toEpochMilli())).valueOf();
+      return super.iterate(value);
+    }
+  }
+
+  protected static class TimeAvgState extends AvgState {
+    @Override
+    public ExprValue result() {
+      if (0 == count.integerValue()) {
+        return ExprNullValue.of();
+      }
+
+      return new ExprTimeValue(
+          LocalTime.MIN.plus(
+              DSL.divide(DSL.literal(total), DSL.literal(count)).valueOf().longValue(), MILLIS));
+    }
+
+    @Override
+    protected AvgState iterate(ExprValue value) {
+      total =
+          DSL.add(DSL.literal(total), DSL.literal(MILLIS.between(LocalTime.MIN, value.timeValue())))
+              .valueOf();
+      return super.iterate(value);
     }
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java
index 813842cadc..c4c02eb1d3 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.opensearch.sql.utils.ExpressionUtils.format;
@@ -43,9 +42,7 @@ public String toString() {
         : String.format(Locale.ROOT, "count(%s)", format(getArguments()));
   }
 
-  /**
-   * Count State.
-   */
+  /** Count State. */
   protected static class CountState implements AggregationState {
     protected int count;
 
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/MaxAggregator.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/MaxAggregator.java
index e9123c0ac2..863d4603a7 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/MaxAggregator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/MaxAggregator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_NULL;
@@ -45,9 +44,7 @@ protected static class MaxState implements AggregationState {
     }
 
     public void max(ExprValue value) {
-      maxResult = maxResult.isNull() ? value
-          : (maxResult.compareTo(value) > 0)
-          ? maxResult : value;
+      maxResult = maxResult.isNull() ? value : (maxResult.compareTo(value) > 0) ? maxResult : value;
     }
 
     @Override
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java
index 897fe857ff..c1b9ebcd4f 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_NULL;
@@ -16,8 +15,8 @@
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 
 /**
- * The minimum aggregator aggregate the value evaluated by the expression.
- * If the expression evaluated result is NULL or MISSING, then the result is NULL.
+ * The minimum aggregator aggregate the value evaluated by the expression. If the expression
+ * evaluated result is NULL or MISSING, then the result is NULL.
  */
 public class MinAggregator extends Aggregator<MinAggregator.MinState> {
 
@@ -25,7 +24,6 @@ public MinAggregator(List<Expression> arguments, ExprCoreType returnType) {
     super(BuiltinFunctionName.MIN.getName(), arguments, returnType);
   }
 
-
   @Override
   public MinState create() {
     return new MinState();
@@ -50,9 +48,7 @@ protected static class MinState implements AggregationState {
     }
 
     public void min(ExprValue value) {
-      minResult = minResult.isNull() ? value
-          : (minResult.compareTo(value) < 0)
-          ? minResult : value;
+      minResult = minResult.isNull() ? value : (minResult.compareTo(value) < 0) ? minResult : value;
     }
 
     @Override
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java
index 510c5d1e45..fa84b74ba5 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import lombok.EqualsAndHashCode;
@@ -12,35 +11,27 @@
 import org.opensearch.sql.expression.ExpressionNodeVisitor;
 
 /**
- * NamedAggregator expression that represents expression with name.
- * Please see more details in associated unresolved expression operator
+ * NamedAggregator expression that represents expression with name. Please see more details in
+ * associated unresolved expression operator<br>
  * {@link org.opensearch.sql.ast.expression.Alias}.
  */
 @EqualsAndHashCode(callSuper = false)
 public class NamedAggregator extends Aggregator<AggregationState> {
 
-  /**
-   * Aggregator name.
-   */
+  /** Aggregator name. */
   private final String name;
 
-  /**
-   * Aggregator that being named.
-   */
-  @Getter
-  private final Aggregator<AggregationState> delegated;
+  /** Aggregator that being named. */
+  @Getter private final Aggregator<AggregationState> delegated;
 
   /**
-   * NamedAggregator.
-   * The aggregator properties {@link #condition} and {@link #distinct}
-   * are inherited by named aggregator to avoid errors introduced by the property inconsistency.
+   * NamedAggregator. The aggregator properties {@link #condition} and {@link #distinct} are
+   * inherited by named aggregator to avoid errors introduced by the property inconsistency.
    *
    * @param name name
    * @param delegated delegated
    */
-  public NamedAggregator(
-      String name,
-      Aggregator<AggregationState> delegated) {
+  public NamedAggregator(String name, Aggregator<AggregationState> delegated) {
     super(delegated.getFunctionName(), delegated.getArguments(), delegated.returnType);
     this.name = name;
     this.delegated = delegated;
@@ -60,7 +51,8 @@ protected AggregationState iterate(ExprValue value, AggregationState state) {
 
   /**
    * Get expression name using name or its alias (if it's present).
-   * @return  expression name
+   *
+   * @return expression name
    */
   public String getName() {
     return name;
@@ -75,5 +67,4 @@ public <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context) {
   public String toString() {
     return getName();
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/PercentileApproximateAggregator.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/PercentileApproximateAggregator.java
new file mode 100644
index 0000000000..8ec5df2d45
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/PercentileApproximateAggregator.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.aggregation;
+
+import static org.opensearch.sql.data.model.ExprValueUtils.doubleValue;
+import static org.opensearch.sql.utils.ExpressionUtils.format;
+
+import com.tdunning.math.stats.AVLTreeDigest;
+import java.util.List;
+import org.opensearch.sql.common.utils.StringUtils;
+import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.function.BuiltinFunctionName;
+
+/** Aggregator to calculate approximate percentile. */
+public class PercentileApproximateAggregator
+    extends Aggregator<PercentileApproximateAggregator.PercentileApproximateState> {
+
+  public static Aggregator percentileApprox(List<Expression> arguments, ExprCoreType returnType) {
+    return new PercentileApproximateAggregator(arguments, returnType);
+  }
+
+  public PercentileApproximateAggregator(List<Expression> arguments, ExprCoreType returnType) {
+    super(BuiltinFunctionName.PERCENTILE_APPROX.getName(), arguments, returnType);
+    if (!ExprCoreType.numberTypes().contains(returnType)) {
+      throw new IllegalArgumentException(
+          String.format("percentile aggregation over %s type is not supported", returnType));
+    }
+  }
+
+  @Override
+  public PercentileApproximateState create() {
+    if (getArguments().size() == 2) {
+      return new PercentileApproximateState(getArguments().get(1).valueOf().doubleValue());
+    } else {
+      return new PercentileApproximateState(
+          getArguments().get(1).valueOf().doubleValue(),
+          getArguments().get(2).valueOf().doubleValue());
+    }
+  }
+
+  @Override
+  protected PercentileApproximateState iterate(ExprValue value, PercentileApproximateState state) {
+    state.evaluate(value);
+    return state;
+  }
+
+  @Override
+  public String toString() {
+    return StringUtils.format("%s(%s)", "percentile", format(getArguments()));
+  }
+
+  /**
+   * PercentileApproximateState is used to store the AVLTreeDigest state for percentile estimation.
+   */
+  protected static class PercentileApproximateState extends AVLTreeDigest
+      implements AggregationState {
+    // The compression level for the AVLTreeDigest, keep the same default value as OpenSearch core.
+    public static final double DEFAULT_COMPRESSION = 100.0;
+    private final double percent;
+
+    PercentileApproximateState(double percent) {
+      super(DEFAULT_COMPRESSION);
+      if (percent < 0.0 || percent > 100.0) {
+        throw new IllegalArgumentException("out of bounds percent value, must be in [0, 100]");
+      }
+      this.percent = percent / 100.0;
+    }
+
+    /**
+     * Constructor for specifying both percent and compression level.
+     *
+     * @param percent the percent to compute, must be in [0, 100]
+     * @param compression the compression factor of the t-digest sketches used
+     */
+    PercentileApproximateState(double percent, double compression) {
+      super(compression);
+      if (percent < 0.0 || percent > 100.0) {
+        throw new IllegalArgumentException("out of bounds percent value, must be in [0, 100]");
+      }
+      this.percent = percent / 100.0;
+    }
+
+    public void evaluate(ExprValue value) {
+      this.add(value.doubleValue());
+    }
+
+    @Override
+    public ExprValue result() {
+      return this.size() == 0 ? ExprNullValue.of() : doubleValue(this.quantile(percent));
+    }
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/StdDevAggregator.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/StdDevAggregator.java
index 0cd8494449..d5422bc788 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/StdDevAggregator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/StdDevAggregator.java
@@ -26,26 +26,18 @@
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 
-/**
- * StandardDeviation Aggregator.
- */
+/** StandardDeviation Aggregator. */
 public class StdDevAggregator extends Aggregator<StdDevAggregator.StdDevState> {
 
   private final boolean isSampleStdDev;
 
-  /**
-   * Build Population Variance {@link VarianceAggregator}.
-   */
-  public static Aggregator stddevPopulation(List<Expression> arguments,
-                                              ExprCoreType returnType) {
+  /** Build Population Variance {@link VarianceAggregator}. */
+  public static Aggregator stddevPopulation(List<Expression> arguments, ExprCoreType returnType) {
     return new StdDevAggregator(false, arguments, returnType);
   }
 
-  /**
-   * Build Sample Variance {@link VarianceAggregator}.
-   */
-  public static Aggregator stddevSample(List<Expression> arguments,
-                                          ExprCoreType returnType) {
+  /** Build Sample Variance {@link VarianceAggregator}. */
+  public static Aggregator stddevSample(List<Expression> arguments, ExprCoreType returnType) {
     return new StdDevAggregator(true, arguments, returnType);
   }
 
@@ -53,7 +45,7 @@ public static Aggregator stddevSample(List<Expression> arguments,
    * VarianceAggregator constructor.
    *
    * @param isSampleStdDev true for sample standard deviation aggregator, false for population
-   *                       standard deviation aggregator.
+   *     standard deviation aggregator.
    * @param arguments aggregator arguments.
    * @param returnType aggregator return types.
    */
@@ -74,8 +66,8 @@ public StdDevAggregator.StdDevState create() {
   }
 
   @Override
-  protected StdDevAggregator.StdDevState iterate(ExprValue value,
-                                                 StdDevAggregator.StdDevState state) {
+  protected StdDevAggregator.StdDevState iterate(
+      ExprValue value, StdDevAggregator.StdDevState state) {
     state.evaluate(value);
     return state;
   }
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/SumAggregator.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/SumAggregator.java
index f5b042034a..d637721980 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/SumAggregator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/SumAggregator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.opensearch.sql.data.model.ExprValueUtils.doubleValue;
@@ -28,8 +27,8 @@
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 
 /**
- * The sum aggregator aggregate the value evaluated by the expression.
- * If the expression evaluated result is NULL or MISSING, then the result is NULL.
+ * The sum aggregator aggregate the value evaluated by the expression. If the expression evaluated
+ * result is NULL or MISSING, then the result is NULL.
  */
 public class SumAggregator extends Aggregator<SumState> {
 
@@ -54,9 +53,7 @@ public String toString() {
     return String.format(Locale.ROOT, "sum(%s)", format(getArguments()));
   }
 
-  /**
-   * Sum State.
-   */
+  /** Sum State. */
   protected static class SumState implements AggregationState {
 
     private final ExprCoreType type;
@@ -69,9 +66,7 @@ protected static class SumState implements AggregationState {
       isEmptyCollection = true;
     }
 
-    /**
-     * Add value to current sumResult.
-     */
+    /** Add value to current sumResult. */
     public void add(ExprValue value) {
       switch (type) {
         case INTEGER:
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/TakeAggregator.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/TakeAggregator.java
index cff08bb098..8791973353 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/TakeAggregator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/TakeAggregator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.opensearch.sql.utils.ExpressionUtils.format;
@@ -18,8 +17,8 @@
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 
 /**
- * The take aggregator keeps and returns the original values of a field.
- * If the field value is NULL or MISSING, then it is skipped.
+ * The take aggregator keeps and returns the original values of a field. If the field value is NULL
+ * or MISSING, then it is skipped.
  */
 public class TakeAggregator extends Aggregator<TakeAggregator.TakeState> {
 
@@ -43,9 +42,7 @@ public String toString() {
     return String.format(Locale.ROOT, "take(%s)", format(getArguments()));
   }
 
-  /**
-   * Take State.
-   */
+  /** Take State. */
   protected static class TakeState implements AggregationState {
     protected int index;
     protected int size;
diff --git a/core/src/main/java/org/opensearch/sql/expression/aggregation/VarianceAggregator.java b/core/src/main/java/org/opensearch/sql/expression/aggregation/VarianceAggregator.java
index bd9f0948f6..920830d266 100644
--- a/core/src/main/java/org/opensearch/sql/expression/aggregation/VarianceAggregator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/aggregation/VarianceAggregator.java
@@ -26,26 +26,18 @@
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 
-/**
- * Variance Aggregator.
- */
+/** Variance Aggregator. */
 public class VarianceAggregator extends Aggregator<VarianceAggregator.VarianceState> {
 
   private final boolean isSampleVariance;
 
-  /**
-   * Build Population Variance {@link VarianceAggregator}.
-   */
-  public static Aggregator variancePopulation(List<Expression> arguments,
-                                                      ExprCoreType returnType) {
+  /** Build Population Variance {@link VarianceAggregator}. */
+  public static Aggregator variancePopulation(List<Expression> arguments, ExprCoreType returnType) {
     return new VarianceAggregator(false, arguments, returnType);
   }
 
-  /**
-   * Build Sample Variance {@link VarianceAggregator}.
-   */
-  public static Aggregator varianceSample(List<Expression> arguments,
-                                                      ExprCoreType returnType) {
+  /** Build Sample Variance {@link VarianceAggregator}. */
+  public static Aggregator varianceSample(List<Expression> arguments, ExprCoreType returnType) {
     return new VarianceAggregator(true, arguments, returnType);
   }
 
diff --git a/core/src/main/java/org/opensearch/sql/expression/conditional/cases/CaseClause.java b/core/src/main/java/org/opensearch/sql/expression/conditional/cases/CaseClause.java
index ad7860a6dc..e18f33c6ae 100644
--- a/core/src/main/java/org/opensearch/sql/expression/conditional/cases/CaseClause.java
+++ b/core/src/main/java/org/opensearch/sql/expression/conditional/cases/CaseClause.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.conditional.cases;
 
 import static org.opensearch.sql.data.type.ExprCoreType.UNDEFINED;
@@ -32,19 +31,13 @@
 @ToString
 public class CaseClause extends FunctionExpression {
 
-  /**
-   * List of WHEN clauses.
-   */
+  /** List of WHEN clauses. */
   private final List<WhenClause> whenClauses;
 
-  /**
-   * Default result if none of WHEN conditions match.
-   */
+  /** Default result if none of WHEN conditions match. */
   private final Expression defaultResult;
 
-  /**
-   * Initialize case clause.
-   */
+  /** Initialize case clause. */
   public CaseClause(List<WhenClause> whenClauses, Expression defaultResult) {
     super(FunctionName.of("case"), concatArgs(whenClauses, defaultResult));
     this.whenClauses = whenClauses;
@@ -75,15 +68,13 @@ public <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context) {
   }
 
   /**
-   * Get types of each result in WHEN clause and ELSE clause.
-   * Exclude UNKNOWN type from NULL literal which means NULL in THEN or ELSE clause
-   * is not included in result.
+   * Get types of each result in WHEN clause and ELSE clause. Exclude UNKNOWN type from NULL literal
+   * which means NULL in THEN or ELSE clause is not included in result.
+   *
    * @return all result types. Use list so caller can generate friendly error message.
    */
   public List<ExprType> allResultTypes() {
-    List<ExprType> types = whenClauses.stream()
-                                      .map(WhenClause::type)
-                                      .collect(Collectors.toList());
+    List<ExprType> types = whenClauses.stream().map(WhenClause::type).collect(Collectors.toList());
     if (defaultResult != null) {
       types.add(defaultResult.type());
     }
@@ -92,8 +83,8 @@ public List<ExprType> allResultTypes() {
     return types;
   }
 
-  private static List<Expression> concatArgs(List<WhenClause> whenClauses,
-                                             Expression defaultResult) {
+  private static List<Expression> concatArgs(
+      List<WhenClause> whenClauses, Expression defaultResult) {
     ImmutableList.Builder<Expression> args = ImmutableList.builder();
     whenClauses.forEach(args::add);
 
@@ -102,5 +93,4 @@ private static List<Expression> concatArgs(List<WhenClause> whenClauses,
     }
     return args.build();
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/conditional/cases/WhenClause.java b/core/src/main/java/org/opensearch/sql/expression/conditional/cases/WhenClause.java
index fd2eeab983..7eb731a1f2 100644
--- a/core/src/main/java/org/opensearch/sql/expression/conditional/cases/WhenClause.java
+++ b/core/src/main/java/org/opensearch/sql/expression/conditional/cases/WhenClause.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.conditional.cases;
 
 import com.google.common.collect.ImmutableList;
@@ -18,27 +17,19 @@
 import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.FunctionName;
 
-/**
- * WHEN clause that consists of a condition and a result corresponding.
- */
+/** WHEN clause that consists of a condition and a result corresponding. */
 @EqualsAndHashCode(callSuper = false)
 @Getter
 @ToString
 public class WhenClause extends FunctionExpression {
 
-  /**
-   * Condition that must be a predicate.
-   */
+  /** Condition that must be a predicate. */
   private final Expression condition;
 
-  /**
-   * Result to return if condition is evaluated to true.
-   */
+  /** Result to return if condition is evaluated to true. */
   private final Expression result;
 
-  /**
-   * Initialize when clause.
-   */
+  /** Initialize when clause. */
   public WhenClause(Expression condition, Expression result) {
     super(FunctionName.of("when"), ImmutableList.of(condition, result));
     this.condition = condition;
@@ -47,8 +38,9 @@ public WhenClause(Expression condition, Expression result) {
 
   /**
    * Evaluate when condition.
-   * @param valueEnv  value env
-   * @return          is condition satisfied
+   *
+   * @param valueEnv value env
+   * @return is condition satisfied
    */
   public boolean isTrue(Environment<Expression, ExprValue> valueEnv) {
     ExprValue result = condition.valueOf(valueEnv);
@@ -72,5 +64,4 @@ public ExprType type() {
   public <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context) {
     return visitor.visitWhen(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/datetime/CalendarLookup.java b/core/src/main/java/org/opensearch/sql/expression/datetime/CalendarLookup.java
index c5b6343991..0837075f7c 100644
--- a/core/src/main/java/org/opensearch/sql/expression/datetime/CalendarLookup.java
+++ b/core/src/main/java/org/opensearch/sql/expression/datetime/CalendarLookup.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.datetime;
 
 import com.google.common.collect.ImmutableList;
@@ -18,6 +17,7 @@ class CalendarLookup {
 
   /**
    * Get a calendar for the specific mode.
+   *
    * @param mode Mode to get calendar for.
    * @param date Date to get calendar for.
    */
@@ -38,6 +38,7 @@ private static Calendar getCalendar(int mode, LocalDate date) {
 
   /**
    * Set first day of week, minimal days in first week and date in calendar.
+   *
    * @param firstDayOfWeek the given first day of the week.
    * @param minimalDaysInWeek the given minimal days required in the first week of the year.
    * @param date the given date.
@@ -52,6 +53,7 @@ private static Calendar getCalendar(int firstDayOfWeek, int minimalDaysInWeek, L
 
   /**
    * Returns week number for date according to mode.
+   *
    * @param mode Integer for mode. Valid mode values are 0 to 7.
    * @param date LocalDate for date.
    */
@@ -68,6 +70,7 @@ static int getWeekNumber(int mode, LocalDate date) {
 
   /**
    * Returns year for date according to mode.
+   *
    * @param mode Integer for mode. Valid mode values are 0 to 7.
    * @param date LocalDate for date.
    */
diff --git a/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFormatterUtil.java b/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFormatterUtil.java
index d351a8808a..13f9a077e4 100644
--- a/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFormatterUtil.java
+++ b/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFormatterUtil.java
@@ -6,26 +6,40 @@
 package org.opensearch.sql.expression.datetime;
 
 import com.google.common.collect.ImmutableMap;
+import java.text.ParsePosition;
+import java.time.Clock;
+import java.time.DateTimeException;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.ResolverStyle;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
 import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.opensearch.sql.data.model.ExprDatetimeValue;
+import org.opensearch.sql.data.model.ExprNullValue;
 import org.opensearch.sql.data.model.ExprStringValue;
 import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.function.FunctionProperties;
 
 /**
- * This class converts a SQL style DATE_FORMAT format specifier and converts it to a
- * Java SimpleDateTime format.
+ * This class converts a SQL style DATE_FORMAT format specifier and converts it to a Java
+ * SimpleDateTime format.
  */
 class DateTimeFormatterUtil {
   private static final int SUFFIX_SPECIAL_START_TH = 11;
   private static final int SUFFIX_SPECIAL_END_TH = 13;
   private static final String SUFFIX_SPECIAL_TH = "th";
+
+  private static final String NANO_SEC_FORMAT = "'%06d'";
+
   private static final Map<Integer, String> SUFFIX_CONVERTER =
-      ImmutableMap.<Integer, String>builder()
-      .put(1, "st").put(2, "nd").put(3, "rd").build();
+      ImmutableMap.<Integer, String>builder().put(1, "st").put(2, "nd").put(3, "rd").build();
 
   // The following have special cases that need handling outside of the format options provided
   // by the DateTimeFormatter class.
@@ -33,94 +47,329 @@ interface DateTimeFormatHandler {
     String getFormat(LocalDateTime date);
   }
 
-  private static final Map<String, DateTimeFormatHandler> HANDLERS =
+  private static final Map<String, DateTimeFormatHandler> DATE_HANDLERS =
+      ImmutableMap.<String, DateTimeFormatHandler>builder()
+          .put("%a", (date) -> "EEE") // %a => EEE - Abbreviated weekday name (Sun..Sat)
+          .put("%b", (date) -> "LLL") // %b => LLL - Abbreviated month name (Jan..Dec)
+          .put("%c", (date) -> "MM") // %c => MM - Month, numeric (0..12)
+          .put("%d", (date) -> "dd") // %d => dd - Day of the month, numeric (00..31)
+          .put("%e", (date) -> "d") // %e => d - Day of the month, numeric (0..31)
+          .put("%H", (date) -> "HH") // %H => HH - (00..23)
+          .put("%h", (date) -> "hh") // %h => hh - (01..12)
+          .put("%I", (date) -> "hh") // %I => hh - (01..12)
+          .put("%i", (date) -> "mm") // %i => mm - Minutes, numeric (00..59)
+          .put("%j", (date) -> "DDD") // %j => DDD - (001..366)
+          .put("%k", (date) -> "H") // %k => H - (0..23)
+          .put("%l", (date) -> "h") // %l => h - (1..12)
+          .put("%p", (date) -> "a") // %p => a - AM or PM
+          .put("%M", (date) -> "LLLL") // %M => LLLL - Month name (January..December)
+          .put("%m", (date) -> "MM") // %m => MM - Month, numeric (00..12)
+          .put("%r", (date) -> "hh:mm:ss a") // %r => hh:mm:ss a - hh:mm:ss followed by AM or PM
+          .put("%S", (date) -> "ss") // %S => ss - Seconds (00..59)
+          .put("%s", (date) -> "ss") // %s => ss - Seconds (00..59)
+          .put("%T", (date) -> "HH:mm:ss") // %T => HH:mm:ss
+          .put("%W", (date) -> "EEEE") // %W => EEEE - Weekday name (Sunday..Saturday)
+          .put("%Y", (date) -> "yyyy") // %Y => yyyy - Year, numeric, 4 digits
+          .put("%y", (date) -> "yy") // %y => yy - Year, numeric, 2 digits
+          // The following are not directly supported by DateTimeFormatter.
+          .put(
+              "%D",
+              (date) -> // %w - Day of month with English suffix
+              String.format("'%d%s'", date.getDayOfMonth(), getSuffix(date.getDayOfMonth())))
+          .put(
+              "%f",
+              (date) -> // %f - Microseconds
+              String.format(NANO_SEC_FORMAT, (date.getNano() / 1000)))
+          .put(
+              "%w",
+              (date) -> // %w - Day of week (0 indexed)
+              String.format("'%d'", date.getDayOfWeek().getValue()))
+          .put(
+              "%U",
+              (date) -> // %U Week where Sunday is the first day - WEEK() mode 0
+              String.format("'%d'", CalendarLookup.getWeekNumber(0, date.toLocalDate())))
+          .put(
+              "%u",
+              (date) -> // %u Week where Monday is the first day - WEEK() mode 1
+              String.format("'%d'", CalendarLookup.getWeekNumber(1, date.toLocalDate())))
+          .put(
+              "%V",
+              (date) -> // %V Week where Sunday is the first day - WEEK() mode 2 used with %X
+              String.format("'%d'", CalendarLookup.getWeekNumber(2, date.toLocalDate())))
+          .put(
+              "%v",
+              (date) -> // %v Week where Monday is the first day - WEEK() mode 3 used with %x
+              String.format("'%d'", CalendarLookup.getWeekNumber(3, date.toLocalDate())))
+          .put(
+              "%X",
+              (date) -> // %X Year for week where Sunday is the first day, 4 digits used with %V
+              String.format("'%d'", CalendarLookup.getYearNumber(2, date.toLocalDate())))
+          .put(
+              "%x",
+              (date) -> // %x Year for week where Monday is the first day, 4 digits used with %v
+              String.format("'%d'", CalendarLookup.getYearNumber(3, date.toLocalDate())))
+          .build();
+
+  // Handlers for the time_format function.
+  // Some format specifiers return 0 or null to align with MySQL.
+  // https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html#function_time-format
+  private static final Map<String, DateTimeFormatHandler> TIME_HANDLERS =
       ImmutableMap.<String, DateTimeFormatHandler>builder()
-      .put("%a", (date) -> "EEE") // %a => EEE - Abbreviated weekday name (Sun..Sat)
-      .put("%b", (date) -> "LLL") // %b => LLL - Abbreviated month name (Jan..Dec)
-      .put("%c", (date) -> "MM") // %c => MM - Month, numeric (0..12)
-      .put("%d", (date) -> "dd") // %d => dd - Day of the month, numeric (00..31)
-      .put("%e", (date) -> "d") // %e => d - Day of the month, numeric (0..31)
-      .put("%H", (date) -> "HH") // %H => HH - (00..23)
-      .put("%h", (date) -> "hh") // %h => hh - (01..12)
-      .put("%I", (date) -> "hh") // %I => hh - (01..12)
-      .put("%i", (date) -> "mm") // %i => mm - Minutes, numeric (00..59)
-      .put("%j", (date) -> "DDD") // %j => DDD - (001..366)
-      .put("%k", (date) -> "H") // %k => H - (0..23)
-      .put("%l", (date) -> "h") // %l => h - (1..12)
-      .put("%p", (date) -> "a") // %p => a - AM or PM
-      .put("%M", (date) -> "LLLL") // %M => LLLL - Month name (January..December)
-      .put("%m", (date) -> "MM") // %m => MM - Month, numeric (00..12)
-      .put("%r", (date) -> "hh:mm:ss a") // %r => hh:mm:ss a - hh:mm:ss followed by AM or PM
-      .put("%S", (date) -> "ss") // %S => ss - Seconds (00..59)
-      .put("%s", (date) -> "ss") // %s => ss - Seconds (00..59)
-      .put("%T", (date) -> "HH:mm:ss") // %T => HH:mm:ss
-      .put("%W", (date) -> "EEEE") // %W => EEEE - Weekday name (Sunday..Saturday)
-      .put("%Y", (date) -> "yyyy") // %Y => yyyy - Year, numeric, 4 digits
-      .put("%y", (date) -> "yy") // %y => yy - Year, numeric, 2 digits
-      // The following are not directly supported by DateTimeFormatter.
-      .put("%D", (date) -> // %w - Day of month with English suffix
-          String.format("'%d%s'", date.getDayOfMonth(), getSuffix(date.getDayOfMonth())))
-      .put("%f", (date) -> // %f - Microseconds
-          String.format("'%d'", (date.getNano() / 1000)))
-      .put("%w", (date) -> // %w - Day of week (0 indexed)
-          String.format("'%d'", date.getDayOfWeek().getValue()))
-      .put("%U", (date) -> // %U Week where Sunday is the first day - WEEK() mode 0
-          String.format("'%d'", CalendarLookup.getWeekNumber(0, date.toLocalDate())))
-      .put("%u", (date) -> // %u Week where Monday is the first day - WEEK() mode 1
-          String.format("'%d'", CalendarLookup.getWeekNumber(1, date.toLocalDate())))
-      .put("%V", (date) -> // %V Week where Sunday is the first day - WEEK() mode 2 used with %X
-          String.format("'%d'", CalendarLookup.getWeekNumber(2, date.toLocalDate())))
-      .put("%v", (date) -> // %v Week where Monday is the first day - WEEK() mode 3 used with %x
-          String.format("'%d'", CalendarLookup.getWeekNumber(3, date.toLocalDate())))
-      .put("%X", (date) -> // %X Year for week where Sunday is the first day, 4 digits used with %V
-          String.format("'%d'", CalendarLookup.getYearNumber(2, date.toLocalDate())))
-      .put("%x", (date) -> // %x Year for week where Monday is the first day, 4 digits used with %v
-          String.format("'%d'", CalendarLookup.getYearNumber(3, date.toLocalDate())))
-      .build();
+          .put("%a", (date) -> null)
+          .put("%b", (date) -> null)
+          .put("%c", (date) -> "0")
+          .put("%d", (date) -> "00")
+          .put("%e", (date) -> "0")
+          .put("%H", (date) -> "HH") // %H => HH - (00..23)
+          .put("%h", (date) -> "hh") // %h => hh - (01..12)
+          .put("%I", (date) -> "hh") // %I => hh - (01..12)
+          .put("%i", (date) -> "mm") // %i => mm - Minutes, numeric (00..59)
+          .put("%j", (date) -> null)
+          .put("%k", (date) -> "H") // %k => H - (0..23)
+          .put("%l", (date) -> "h") // %l => h - (1..12)
+          .put("%p", (date) -> "a") // %p => a - AM or PM
+          .put("%M", (date) -> null)
+          .put("%m", (date) -> "00")
+          .put("%r", (date) -> "hh:mm:ss a") // %r => hh:mm:ss a - hh:mm:ss followed by AM or PM
+          .put("%S", (date) -> "ss") // %S => ss - Seconds (00..59)
+          .put("%s", (date) -> "ss") // %s => ss - Seconds (00..59)
+          .put("%T", (date) -> "HH:mm:ss") // %T => HH:mm:ss
+          .put("%W", (date) -> null)
+          .put("%Y", (date) -> "0000")
+          .put("%y", (date) -> "00")
+          .put("%D", (date) -> null)
+          // %f - Microseconds
+          .put("%f", (date) -> String.format(NANO_SEC_FORMAT, (date.getNano() / 1000)))
+          .put("%w", (date) -> null)
+          .put("%U", (date) -> null)
+          .put("%u", (date) -> null)
+          .put("%V", (date) -> null)
+          .put("%v", (date) -> null)
+          .put("%X", (date) -> null)
+          .put("%x", (date) -> null)
+          .build();
+
+  private static final Map<String, String> STR_TO_DATE_FORMATS =
+      ImmutableMap.<String, String>builder()
+          .put("%a", "EEE") // %a => EEE - Abbreviated weekday name (Sun..Sat)
+          .put("%b", "LLL") // %b => LLL - Abbreviated month name (Jan..Dec)
+          .put("%c", "M") // %c => MM - Month, numeric (0..12)
+          .put("%d", "d") // %d => dd - Day of the month, numeric (00..31)
+          .put("%e", "d") // %e => d - Day of the month, numeric (0..31)
+          .put("%H", "H") // %H => HH - (00..23)
+          .put("%h", "H") // %h => hh - (01..12)
+          .put("%I", "h") // %I => hh - (01..12)
+          .put("%i", "m") // %i => mm - Minutes, numeric (00..59)
+          .put("%j", "DDD") // %j => DDD - (001..366)
+          .put("%k", "H") // %k => H - (0..23)
+          .put("%l", "h") // %l => h - (1..12)
+          .put("%p", "a") // %p => a - AM or PM
+          .put("%M", "LLLL") // %M => LLLL - Month name (January..December)
+          .put("%m", "M") // %m => MM - Month, numeric (00..12)
+          .put("%r", "hh:mm:ss a") // %r => hh:mm:ss a - hh:mm:ss followed by AM or PM
+          .put("%S", "s") // %S => ss - Seconds (00..59)
+          .put("%s", "s") // %s => ss - Seconds (00..59)
+          .put("%T", "HH:mm:ss") // %T => HH:mm:ss
+          .put("%W", "EEEE") // %W => EEEE - Weekday name (Sunday..Saturday)
+          .put("%Y", "u") // %Y => yyyy - Year, numeric, 4 digits
+          .put("%y", "u") // %y => yy - Year, numeric, 2 digits
+          .put("%f", "n") // %f => n - Nanoseconds
+          // The following have been implemented but cannot be aligned with
+          // MySQL due to the limitations of the DatetimeFormatter
+          .put("%D", "d") // %w - Day of month with English suffix
+          .put("%w", "e") // %w - Day of week (0 indexed)
+          .put("%U", "w") // %U Week where Sunday is the first day - WEEK() mode 0
+          .put("%u", "w") // %u Week where Monday is the first day - WEEK() mode 1
+          .put("%V", "w") // %V Week where Sunday is the first day - WEEK() mode 2
+          .put("%v", "w") // %v Week where Monday is the first day - WEEK() mode 3
+          .put("%X", "u") // %X Year for week where Sunday is the first day
+          .put("%x", "u") // %x Year for week where Monday is the first day
+          .build();
 
   private static final Pattern pattern = Pattern.compile("%.");
-  private static final Pattern CHARACTERS_WITH_NO_MOD_LITERAL_BEHIND_PATTERN
-          = Pattern.compile("(?<!%)[a-zA-Z&&[^aydmshiHIMYDSEL]]+");
+  private static final Pattern CHARACTERS_WITH_NO_MOD_LITERAL_BEHIND_PATTERN =
+      Pattern.compile("(?<!%)[a-zA-Z&&[^aydmshiHIMYDSEL]]+");
   private static final String MOD_LITERAL = "%";
 
-  private DateTimeFormatterUtil() {
+  private DateTimeFormatterUtil() {}
+
+  static StringBuffer getCleanFormat(ExprValue formatExpr) {
+    final StringBuffer cleanFormat = new StringBuffer();
+    final Matcher m =
+        CHARACTERS_WITH_NO_MOD_LITERAL_BEHIND_PATTERN.matcher(formatExpr.stringValue());
+
+    while (m.find()) {
+      m.appendReplacement(cleanFormat, String.format("'%s'", m.group()));
+    }
+    m.appendTail(cleanFormat);
+
+    return cleanFormat;
+  }
+
+  /**
+   * Helper function to format a DATETIME according to a provided handler and matcher.
+   *
+   * @param formatExpr ExprValue containing the format expression
+   * @param handler Map of character patterns to their associated datetime format
+   * @param datetime The datetime argument being formatted
+   * @return A formatted string expression
+   */
+  static ExprValue getFormattedString(
+      ExprValue formatExpr, Map<String, DateTimeFormatHandler> handler, LocalDateTime datetime) {
+    StringBuffer cleanFormat = getCleanFormat(formatExpr);
+
+    final Matcher matcher = pattern.matcher(cleanFormat.toString());
+    final StringBuffer format = new StringBuffer();
+    try {
+      while (matcher.find()) {
+        matcher.appendReplacement(
+            format,
+            handler
+                .getOrDefault(
+                    matcher.group(),
+                    (d) -> String.format("'%s'", matcher.group().replaceFirst(MOD_LITERAL, "")))
+                .getFormat(datetime));
+      }
+    } catch (Exception e) {
+      return ExprNullValue.of();
+    }
+    matcher.appendTail(format);
+
+    // English Locale matches SQL requirements.
+    // 'AM'/'PM' instead of 'a.m.'/'p.m.'
+    // 'Sat' instead of 'Sat.' etc
+    return new ExprStringValue(
+        datetime.format(DateTimeFormatter.ofPattern(format.toString(), Locale.ENGLISH)));
   }
 
   /**
    * Format the date using the date format String.
+   *
    * @param dateExpr the date ExprValue of Date/Datetime/Timestamp/String type.
    * @param formatExpr the format ExprValue of String type.
    * @return Date formatted using format and returned as a String.
    */
   static ExprValue getFormattedDate(ExprValue dateExpr, ExprValue formatExpr) {
     final LocalDateTime date = dateExpr.datetimeValue();
-    final StringBuffer cleanFormat = new StringBuffer();
-    final Matcher m = CHARACTERS_WITH_NO_MOD_LITERAL_BEHIND_PATTERN
-            .matcher(formatExpr.stringValue());
-    while (m.find()) {
-      m.appendReplacement(cleanFormat,String.format("'%s'", m.group()));
-    }
-    m.appendTail(cleanFormat);
+    return getFormattedString(formatExpr, DATE_HANDLERS, date);
+  }
 
+  static ExprValue getFormattedDateOfToday(ExprValue formatExpr, ExprValue time, Clock current) {
+    final LocalDateTime date = LocalDateTime.of(LocalDate.now(current), time.timeValue());
+
+    return getFormattedString(formatExpr, DATE_HANDLERS, date);
+  }
+
+  /**
+   * Format the date using the date format String.
+   *
+   * @param timeExpr the date ExprValue of Date/Datetime/Timestamp/String type.
+   * @param formatExpr the format ExprValue of String type.
+   * @return Date formatted using format and returned as a String.
+   */
+  static ExprValue getFormattedTime(ExprValue timeExpr, ExprValue formatExpr) {
+    // Initializes DateTime with LocalDate.now(). This is safe because the date is ignored.
+    // The time_format function will only return 0 or null for invalid string format specifiers.
+    final LocalDateTime time = LocalDateTime.of(LocalDate.now(), timeExpr.timeValue());
+
+    return getFormattedString(formatExpr, TIME_HANDLERS, time);
+  }
+
+  private static boolean canGetDate(TemporalAccessor ta) {
+    return (ta.isSupported(ChronoField.YEAR)
+        && ta.isSupported(ChronoField.MONTH_OF_YEAR)
+        && ta.isSupported(ChronoField.DAY_OF_MONTH));
+  }
+
+  private static boolean canGetTime(TemporalAccessor ta) {
+    return (ta.isSupported(ChronoField.HOUR_OF_DAY)
+        && ta.isSupported(ChronoField.MINUTE_OF_HOUR)
+        && ta.isSupported(ChronoField.SECOND_OF_MINUTE));
+  }
+
+  static ExprValue parseStringWithDateOrTime(
+      FunctionProperties fp, ExprValue datetimeStringExpr, ExprValue formatExpr) {
+
+    // Replace patterns with % for Java DateTimeFormatter
+    StringBuffer cleanFormat = getCleanFormat(formatExpr);
     final Matcher matcher = pattern.matcher(cleanFormat.toString());
     final StringBuffer format = new StringBuffer();
+
     while (matcher.find()) {
-      matcher.appendReplacement(format,
-          HANDLERS.getOrDefault(matcher.group(), (d) ->
-              String.format("'%s'", matcher.group().replaceFirst(MOD_LITERAL, "")))
-              .getFormat(date));
+      matcher.appendReplacement(
+          format,
+          STR_TO_DATE_FORMATS.getOrDefault(
+              matcher.group(),
+              String.format("'%s'", matcher.group().replaceFirst(MOD_LITERAL, ""))));
     }
     matcher.appendTail(format);
 
-    // English Locale matches SQL requirements.
-    // 'AM'/'PM' instead of 'a.m.'/'p.m.'
-    // 'Sat' instead of 'Sat.' etc
-    return new ExprStringValue(date.format(
-        DateTimeFormatter.ofPattern(format.toString(), Locale.ENGLISH)));
+    TemporalAccessor taWithMissingFields;
+    // Return NULL for invalid parse in string to align with MySQL
+    try {
+      // Get Temporal Accessor to initially parse string without default values
+      taWithMissingFields =
+          new DateTimeFormatterBuilder()
+              .appendPattern(format.toString())
+              .toFormatter()
+              .withResolverStyle(ResolverStyle.STRICT)
+              .parseUnresolved(datetimeStringExpr.stringValue(), new ParsePosition(0));
+      if (taWithMissingFields == null) {
+        throw new DateTimeException("Input string could not be parsed properly.");
+      }
+      if (!canGetDate(taWithMissingFields) && !canGetTime(taWithMissingFields)) {
+        throw new DateTimeException("Not enough data to build a valid Date, Time, or Datetime.");
+      }
+    } catch (DateTimeException e) {
+      return ExprNullValue.of();
+    }
+
+    int year =
+        taWithMissingFields.isSupported(ChronoField.YEAR)
+            ? taWithMissingFields.get(ChronoField.YEAR)
+            : 2000;
+
+    int month =
+        taWithMissingFields.isSupported(ChronoField.MONTH_OF_YEAR)
+            ? taWithMissingFields.get(ChronoField.MONTH_OF_YEAR)
+            : 1;
+
+    int day =
+        taWithMissingFields.isSupported(ChronoField.DAY_OF_MONTH)
+            ? taWithMissingFields.get(ChronoField.DAY_OF_MONTH)
+            : 1;
+
+    int hour =
+        taWithMissingFields.isSupported(ChronoField.HOUR_OF_DAY)
+            ? taWithMissingFields.get(ChronoField.HOUR_OF_DAY)
+            : 0;
+
+    int minute =
+        taWithMissingFields.isSupported(ChronoField.MINUTE_OF_HOUR)
+            ? taWithMissingFields.get(ChronoField.MINUTE_OF_HOUR)
+            : 0;
+
+    int second =
+        taWithMissingFields.isSupported(ChronoField.SECOND_OF_MINUTE)
+            ? taWithMissingFields.get(ChronoField.SECOND_OF_MINUTE)
+            : 0;
+
+    // Fill returned datetime with current date if only Time information was parsed
+    LocalDateTime output;
+    if (!canGetDate(taWithMissingFields)) {
+      output =
+          LocalDateTime.of(
+              LocalDate.now(fp.getQueryStartClock()), LocalTime.of(hour, minute, second));
+    } else {
+      output = LocalDateTime.of(year, month, day, hour, minute, second);
+    }
+
+    return new ExprDatetimeValue(output);
   }
 
   /**
    * Returns English suffix of incoming value.
+   *
    * @param val Incoming value.
    * @return English suffix as String (st, nd, rd, th)
    */
diff --git a/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFunction.java b/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFunction.java
index a111f672af..d17d59d358 100644
--- a/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFunction.java
@@ -3,13 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.datetime;
 
+import static java.time.temporal.ChronoUnit.DAYS;
+import static java.time.temporal.ChronoUnit.HOURS;
+import static java.time.temporal.ChronoUnit.MICROS;
+import static java.time.temporal.ChronoUnit.MINUTES;
 import static java.time.temporal.ChronoUnit.MONTHS;
+import static java.time.temporal.ChronoUnit.SECONDS;
+import static java.time.temporal.ChronoUnit.WEEKS;
+import static java.time.temporal.ChronoUnit.YEARS;
 import static org.opensearch.sql.data.type.ExprCoreType.DATE;
 import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
 import static org.opensearch.sql.data.type.ExprCoreType.DOUBLE;
+import static org.opensearch.sql.data.type.ExprCoreType.FLOAT;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.INTERVAL;
 import static org.opensearch.sql.data.type.ExprCoreType.LONG;
@@ -20,17 +27,33 @@
 import static org.opensearch.sql.expression.function.FunctionDSL.impl;
 import static org.opensearch.sql.expression.function.FunctionDSL.implWithProperties;
 import static org.opensearch.sql.expression.function.FunctionDSL.nullMissingHandling;
+import static org.opensearch.sql.expression.function.FunctionDSL.nullMissingHandlingWithProperties;
 import static org.opensearch.sql.utils.DateTimeFormatters.DATE_FORMATTER_LONG_YEAR;
+import static org.opensearch.sql.utils.DateTimeFormatters.DATE_FORMATTER_NO_YEAR;
 import static org.opensearch.sql.utils.DateTimeFormatters.DATE_FORMATTER_SHORT_YEAR;
+import static org.opensearch.sql.utils.DateTimeFormatters.DATE_FORMATTER_SINGLE_DIGIT_MONTH;
+import static org.opensearch.sql.utils.DateTimeFormatters.DATE_FORMATTER_SINGLE_DIGIT_YEAR;
 import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_LONG_YEAR;
 import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_SHORT_YEAR;
 import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_STRICT_WITH_TZ;
-
+import static org.opensearch.sql.utils.DateTimeFormatters.FULL_DATE_LENGTH;
+import static org.opensearch.sql.utils.DateTimeFormatters.NO_YEAR_DATE_LENGTH;
+import static org.opensearch.sql.utils.DateTimeFormatters.SHORT_DATE_LENGTH;
+import static org.opensearch.sql.utils.DateTimeFormatters.SINGLE_DIGIT_MONTH_DATE_LENGTH;
+import static org.opensearch.sql.utils.DateTimeFormatters.SINGLE_DIGIT_YEAR_DATE_LENGTH;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
+import static org.opensearch.sql.utils.DateTimeUtils.extractDate;
+import static org.opensearch.sql.utils.DateTimeUtils.extractDateTime;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableTable;
+import com.google.common.collect.Table;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.time.Clock;
 import java.time.DateTimeException;
+import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -41,10 +64,15 @@
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.time.format.TextStyle;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAmount;
 import java.util.Locale;
+import java.util.Map;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
 import lombok.experimental.UtilityClass;
+import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.data.model.ExprDateValue;
 import org.opensearch.sql.data.model.ExprDatetimeValue;
 import org.opensearch.sql.data.model.ExprDoubleValue;
@@ -53,27 +81,32 @@
 import org.opensearch.sql.data.model.ExprNullValue;
 import org.opensearch.sql.data.model.ExprStringValue;
 import org.opensearch.sql.data.model.ExprTimeValue;
-import org.opensearch.sql.data.model.ExprTimestampValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
-import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
 import org.opensearch.sql.expression.function.DefaultFunctionResolver;
+import org.opensearch.sql.expression.function.FunctionBuilder;
 import org.opensearch.sql.expression.function.FunctionDSL;
 import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.expression.function.FunctionProperties;
 import org.opensearch.sql.expression.function.FunctionResolver;
+import org.opensearch.sql.expression.function.FunctionSignature;
+import org.opensearch.sql.expression.function.SerializableFunction;
+import org.opensearch.sql.expression.function.SerializableTriFunction;
 import org.opensearch.sql.utils.DateTimeUtils;
 
 /**
- * The definition of date and time functions.
- * 1) have the clear interface for function define.
- * 2) the implementation should rely on ExprValue.
+ * The definition of date and time functions. 1) have the clear interface for function define. 2)
+ * the implementation should rely on ExprValue.
  */
 @UtilityClass
 @SuppressWarnings("unchecked")
 public class DateTimeFunction {
+  // The number of seconds per day
+  public static final long SECONDS_PER_DAY = 86400;
+
   // The number of days from year zero to year 1970.
   private static final Long DAYS_0000_TO_1970 = (146097 * 5L) - (30L * 365L + 7L);
 
@@ -81,6 +114,59 @@ public class DateTimeFunction {
   // 32536771199.999999, or equivalent '3001-01-18 23:59:59.999999' UTC
   private static final Double MYSQL_MAX_TIMESTAMP = 32536771200d;
 
+  // Mode used for week/week_of_year function by default when no argument is provided
+  private static final ExprIntegerValue DEFAULT_WEEK_OF_YEAR_MODE = new ExprIntegerValue(0);
+
+  // Map used to determine format output for the extract function
+  private static final Map<String, String> extract_formats =
+      ImmutableMap.<String, String>builder()
+          .put("MICROSECOND", "SSSSSS")
+          .put("SECOND", "ss")
+          .put("MINUTE", "mm")
+          .put("HOUR", "HH")
+          .put("DAY", "dd")
+          .put("WEEK", "w")
+          .put("MONTH", "MM")
+          .put("YEAR", "yyyy")
+          .put("SECOND_MICROSECOND", "ssSSSSSS")
+          .put("MINUTE_MICROSECOND", "mmssSSSSSS")
+          .put("MINUTE_SECOND", "mmss")
+          .put("HOUR_MICROSECOND", "HHmmssSSSSSS")
+          .put("HOUR_SECOND", "HHmmss")
+          .put("HOUR_MINUTE", "HHmm")
+          .put("DAY_MICROSECOND", "ddHHmmssSSSSSS")
+          .put("DAY_SECOND", "ddHHmmss")
+          .put("DAY_MINUTE", "ddHHmm")
+          .put("DAY_HOUR", "ddHH")
+          .put("YEAR_MONTH", "yyyyMM")
+          .put("QUARTER", "Q")
+          .build();
+
+  // Map used to determine format output for the get_format function
+  private static final Table<String, String, String> formats =
+      ImmutableTable.<String, String, String>builder()
+          .put("date", "usa", "%m.%d.%Y")
+          .put("date", "jis", "%Y-%m-%d")
+          .put("date", "iso", "%Y-%m-%d")
+          .put("date", "eur", "%d.%m.%Y")
+          .put("date", "internal", "%Y%m%d")
+          .put("datetime", "usa", "%Y-%m-%d %H.%i.%s")
+          .put("datetime", "jis", "%Y-%m-%d %H:%i:%s")
+          .put("datetime", "iso", "%Y-%m-%d %H:%i:%s")
+          .put("datetime", "eur", "%Y-%m-%d %H.%i.%s")
+          .put("datetime", "internal", "%Y%m%d%H%i%s")
+          .put("time", "usa", "%h:%i:%s %p")
+          .put("time", "jis", "%H:%i:%s")
+          .put("time", "iso", "%H:%i:%s")
+          .put("time", "eur", "%H.%i.%s")
+          .put("time", "internal", "%H%i%s")
+          .put("timestamp", "usa", "%Y-%m-%d %H.%i.%s")
+          .put("timestamp", "jis", "%Y-%m-%d %H:%i:%s")
+          .put("timestamp", "iso", "%Y-%m-%d %H:%i:%s")
+          .put("timestamp", "eur", "%Y-%m-%d %H.%i.%s")
+          .put("timestamp", "internal", "%Y%m%d%H%i%s")
+          .build();
+
   /**
    * Register Date and Time Functions.
    *
@@ -88,6 +174,7 @@ public class DateTimeFunction {
    */
   public void register(BuiltinFunctionRepository repository) {
     repository.register(adddate());
+    repository.register(addtime());
     repository.register(convert_tz());
     repository.register(curtime());
     repository.register(curdate());
@@ -95,24 +182,34 @@ public void register(BuiltinFunctionRepository repository) {
     repository.register(current_time());
     repository.register(current_timestamp());
     repository.register(date());
+    repository.register(datediff());
     repository.register(datetime());
     repository.register(date_add());
+    repository.register(date_format());
     repository.register(date_sub());
     repository.register(day());
     repository.register(dayName());
-    repository.register(dayOfMonth());
-    repository.register(dayOfWeek());
+    repository.register(dayOfMonth(BuiltinFunctionName.DAYOFMONTH));
+    repository.register(dayOfMonth(BuiltinFunctionName.DAY_OF_MONTH));
+    repository.register(dayOfWeek(BuiltinFunctionName.DAYOFWEEK.getName()));
+    repository.register(dayOfWeek(BuiltinFunctionName.DAY_OF_WEEK.getName()));
     repository.register(dayOfYear(BuiltinFunctionName.DAYOFYEAR));
     repository.register(dayOfYear(BuiltinFunctionName.DAY_OF_YEAR));
+    repository.register(extract());
     repository.register(from_days());
     repository.register(from_unixtime());
-    repository.register(hour());
+    repository.register(get_format());
+    repository.register(hour(BuiltinFunctionName.HOUR));
+    repository.register(hour(BuiltinFunctionName.HOUR_OF_DAY));
+    repository.register(last_day());
     repository.register(localtime());
     repository.register(localtimestamp());
     repository.register(makedate());
     repository.register(maketime());
     repository.register(microsecond());
-    repository.register(minute());
+    repository.register(minute(BuiltinFunctionName.MINUTE));
+    repository.register(minute_of_day());
+    repository.register(minute(BuiltinFunctionName.MINUTE_OF_HOUR));
     repository.register(month(BuiltinFunctionName.MONTH));
     repository.register(month(BuiltinFunctionName.MONTH_OF_YEAR));
     repository.register(monthName());
@@ -120,18 +217,32 @@ public void register(BuiltinFunctionRepository repository) {
     repository.register(period_add());
     repository.register(period_diff());
     repository.register(quarter());
-    repository.register(second());
+    repository.register(sec_to_time());
+    repository.register(second(BuiltinFunctionName.SECOND));
+    repository.register(second(BuiltinFunctionName.SECOND_OF_MINUTE));
     repository.register(subdate());
+    repository.register(subtime());
+    repository.register(str_to_date());
     repository.register(sysdate());
     repository.register(time());
+    repository.register(time_format());
     repository.register(time_to_sec());
+    repository.register(timediff());
     repository.register(timestamp());
-    repository.register(date_format());
+    repository.register(timestampadd());
+    repository.register(timestampdiff());
     repository.register(to_days());
+    repository.register(to_seconds());
     repository.register(unix_timestamp());
+    repository.register(utc_date());
+    repository.register(utc_time());
+    repository.register(utc_timestamp());
     repository.register(week(BuiltinFunctionName.WEEK));
+    repository.register(week(BuiltinFunctionName.WEEKOFYEAR));
     repository.register(week(BuiltinFunctionName.WEEK_OF_YEAR));
+    repository.register(weekday());
     repository.register(year());
+    repository.register(yearweek());
   }
 
   /**
@@ -140,11 +251,12 @@ public void register(BuiltinFunctionRepository repository) {
    * `now(y) return different values.
    */
   private FunctionResolver now(FunctionName functionName) {
-    return define(functionName,
+    return define(
+        functionName,
         implWithProperties(
-            functionProperties -> new ExprDatetimeValue(
-                formatNow(functionProperties.getQueryStartClock())), DATETIME)
-    );
+            functionProperties ->
+                new ExprDatetimeValue(formatNow(functionProperties.getQueryStartClock())),
+            DATETIME));
   }
 
   private FunctionResolver now() {
@@ -163,25 +275,28 @@ private FunctionResolver localtime() {
     return now(BuiltinFunctionName.LOCALTIME.getName());
   }
 
-  /**
-   * SYSDATE() returns the time at which it executes.
-   */
+  /** SYSDATE() returns the time at which it executes. */
   private FunctionResolver sysdate() {
-    return define(BuiltinFunctionName.SYSDATE.getName(),
-        implWithProperties(functionProperties
-            -> new ExprDatetimeValue(formatNow(Clock.systemDefaultZone())), DATETIME),
-        FunctionDSL.implWithProperties((functionProperties, v) -> new ExprDatetimeValue(
-            formatNow(Clock.systemDefaultZone(), v.integerValue())), DATETIME, INTEGER)
-    );
+    return define(
+        BuiltinFunctionName.SYSDATE.getName(),
+        implWithProperties(
+            functionProperties -> new ExprDatetimeValue(formatNow(Clock.systemDefaultZone())),
+            DATETIME),
+        FunctionDSL.implWithProperties(
+            (functionProperties, v) ->
+                new ExprDatetimeValue(formatNow(Clock.systemDefaultZone(), v.integerValue())),
+            DATETIME,
+            INTEGER));
   }
 
-  /**
-   * Synonym for @see `now`.
-   */
+  /** Synonym for @see `now`. */
   private FunctionResolver curtime(FunctionName functionName) {
-    return define(functionName,
-        implWithProperties(functionProperties -> new ExprTimeValue(
-            formatNow(functionProperties.getQueryStartClock()).toLocalTime()), TIME));
+    return define(
+        functionName,
+        implWithProperties(
+            functionProperties ->
+                new ExprTimeValue(formatNow(functionProperties.getQueryStartClock()).toLocalTime()),
+            TIME));
   }
 
   private FunctionResolver curtime() {
@@ -193,9 +308,12 @@ private FunctionResolver current_time() {
   }
 
   private FunctionResolver curdate(FunctionName functionName) {
-    return define(functionName,
-        implWithProperties(functionProperties -> new ExprDateValue(
-            formatNow(functionProperties.getQueryStartClock()).toLocalDate()), DATE));
+    return define(
+        functionName,
+        implWithProperties(
+            functionProperties ->
+                new ExprDateValue(formatNow(functionProperties.getQueryStartClock()).toLocalDate()),
+            DATE));
   }
 
   private FunctionResolver curdate() {
@@ -207,253 +325,477 @@ private FunctionResolver current_date() {
   }
 
   /**
-   * Specify a start date and add a temporal amount to the date.
+   * A common signature for `date_add` and `date_sub`.<br>
+   * Specify a start date and add/subtract a temporal amount to/from the date.<br>
    * The return type depends on the date type and the interval unit. Detailed supported signatures:
-   * (STRING/DATE/DATETIME/TIMESTAMP, INTERVAL) -> DATETIME
-   * (DATE, LONG) -> DATE
-   * (STRING/DATETIME/TIMESTAMP, LONG) -> DATETIME
-   */
-  private DefaultFunctionResolver add_date(FunctionName functionName) {
-    return define(functionName,
-        impl(nullMissingHandling(DateTimeFunction::exprAddDateInterval),
-            DATETIME, STRING, INTERVAL),
-        impl(nullMissingHandling(DateTimeFunction::exprAddDateInterval), DATETIME, DATE, INTERVAL),
-        impl(nullMissingHandling(DateTimeFunction::exprAddDateInterval),
-            DATETIME, DATETIME, INTERVAL),
-        impl(nullMissingHandling(DateTimeFunction::exprAddDateInterval),
-            DATETIME, TIMESTAMP, INTERVAL),
-        impl(nullMissingHandling(DateTimeFunction::exprAddDateDays), DATE, DATE, LONG),
-        impl(nullMissingHandling(DateTimeFunction::exprAddDateDays), DATETIME, DATETIME, LONG),
-        impl(nullMissingHandling(DateTimeFunction::exprAddDateDays), DATETIME, TIMESTAMP, LONG),
-        impl(nullMissingHandling(DateTimeFunction::exprAddDateDays), DATETIME, STRING, LONG)
-    );
+   * <br>
+   * (DATE/DATETIME/TIMESTAMP/TIME, INTERVAL) -> DATETIME<br>
+   * MySQL has these signatures too<br>
+   * (DATE, INTERVAL) -> DATE // when interval has no time part<br>
+   * (TIME, INTERVAL) -> TIME // when interval has no date part<br>
+   * (STRING, INTERVAL) -> STRING // when argument has date or datetime string,<br>
+   * // result has date or datetime depending on interval type<br>
+   */
+  private Stream<SerializableFunction<?, ?>> get_date_add_date_sub_signatures(
+      SerializableTriFunction<FunctionProperties, ExprValue, ExprValue, ExprValue> function) {
+    return Stream.of(
+        implWithProperties(nullMissingHandlingWithProperties(function), DATETIME, DATE, INTERVAL),
+        implWithProperties(
+            nullMissingHandlingWithProperties(function), DATETIME, DATETIME, INTERVAL),
+        implWithProperties(
+            nullMissingHandlingWithProperties(function), DATETIME, TIMESTAMP, INTERVAL),
+        implWithProperties(nullMissingHandlingWithProperties(function), DATETIME, TIME, INTERVAL));
+  }
+
+  /**
+   * A common signature for `adddate` and `subdate`.<br>
+   * Adds/subtracts an integer number of days to/from the first argument.<br>
+   * (DATE, LONG) -> DATE<br>
+   * (TIME/DATETIME/TIMESTAMP, LONG) -> DATETIME
+   */
+  private Stream<SerializableFunction<?, ?>> get_adddate_subdate_signatures(
+      SerializableTriFunction<FunctionProperties, ExprValue, ExprValue, ExprValue> function) {
+    return Stream.of(
+        implWithProperties(nullMissingHandlingWithProperties(function), DATE, DATE, LONG),
+        implWithProperties(nullMissingHandlingWithProperties(function), DATETIME, DATETIME, LONG),
+        implWithProperties(nullMissingHandlingWithProperties(function), DATETIME, TIMESTAMP, LONG),
+        implWithProperties(nullMissingHandlingWithProperties(function), DATETIME, TIME, LONG));
   }
 
   private DefaultFunctionResolver adddate() {
-    return add_date(BuiltinFunctionName.ADDDATE.getName());
+    return define(
+        BuiltinFunctionName.ADDDATE.getName(),
+        (SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>[])
+            (Stream.concat(
+                    get_date_add_date_sub_signatures(DateTimeFunction::exprAddDateInterval),
+                    get_adddate_subdate_signatures(DateTimeFunction::exprAddDateDays))
+                .toArray(SerializableFunction<?, ?>[]::new)));
   }
 
   /**
-   * Converts date/time from a specified timezone to another specified timezone.
-   * The supported signatures:
-   * (DATETIME, STRING, STRING) -> DATETIME
+   * Adds expr2 to expr1 and returns the result.<br>
+   * (TIME, TIME/DATE/DATETIME/TIMESTAMP) -> TIME<br>
+   * (DATE/DATETIME/TIMESTAMP, TIME/DATE/DATETIME/TIMESTAMP) -> DATETIME<br>
+   * TODO: MySQL has these signatures too<br>
+   * (STRING, STRING/TIME) -> STRING // second arg - string with time only<br>
+   * (x, STRING) -> NULL // second arg - string with timestamp<br>
+   * (x, STRING/DATE) -> x // second arg - string with date only
+   */
+  private DefaultFunctionResolver addtime() {
+    return define(
+        BuiltinFunctionName.ADDTIME.getName(),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime), TIME, TIME, TIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime), TIME, TIME, DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime), TIME, TIME, DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime),
+            TIME,
+            TIME,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime),
+            DATETIME,
+            DATETIME,
+            TIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime),
+            DATETIME,
+            DATETIME,
+            DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime),
+            DATETIME,
+            DATETIME,
+            DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime),
+            DATETIME,
+            DATETIME,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime), DATETIME, DATE, TIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime), DATETIME, DATE, DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime),
+            DATETIME,
+            DATE,
+            DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime),
+            DATETIME,
+            DATE,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime),
+            DATETIME,
+            TIMESTAMP,
+            TIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime),
+            DATETIME,
+            TIMESTAMP,
+            DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime),
+            DATETIME,
+            TIMESTAMP,
+            DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprAddTime),
+            DATETIME,
+            TIMESTAMP,
+            TIMESTAMP));
+  }
+
+  /**
+   * Converts date/time from a specified timezone to another specified timezone.<br>
+   * The supported signatures:<br>
+   * (DATETIME, STRING, STRING) -> DATETIME<br>
    * (STRING, STRING, STRING) -> DATETIME
    */
   private DefaultFunctionResolver convert_tz() {
-    return define(BuiltinFunctionName.CONVERT_TZ.getName(),
-        impl(nullMissingHandling(DateTimeFunction::exprConvertTZ),
-            DATETIME, DATETIME, STRING, STRING),
-        impl(nullMissingHandling(DateTimeFunction::exprConvertTZ),
-            DATETIME, STRING, STRING, STRING)
-    );
+    return define(
+        BuiltinFunctionName.CONVERT_TZ.getName(),
+        impl(
+            nullMissingHandling(DateTimeFunction::exprConvertTZ),
+            DATETIME,
+            DATETIME,
+            STRING,
+            STRING),
+        impl(
+            nullMissingHandling(DateTimeFunction::exprConvertTZ),
+            DATETIME,
+            STRING,
+            STRING,
+            STRING));
   }
 
   /**
-   * Extracts the date part of a date and time value.
-   * Also to construct a date type. The supported signatures:
-   * STRING/DATE/DATETIME/TIMESTAMP -> DATE
+   * Extracts the date part of a date and time value. Also to construct a date type. The supported
+   * signatures: STRING/DATE/DATETIME/TIMESTAMP -> DATE
    */
   private DefaultFunctionResolver date() {
-    return define(BuiltinFunctionName.DATE.getName(),
+    return define(
+        BuiltinFunctionName.DATE.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprDate), DATE, STRING),
         impl(nullMissingHandling(DateTimeFunction::exprDate), DATE, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprDate), DATE, DATETIME),
         impl(nullMissingHandling(DateTimeFunction::exprDate), DATE, TIMESTAMP));
   }
 
+  /*
+   * Calculates the difference of date part of given values.
+   * (DATE/DATETIME/TIMESTAMP/TIME, DATE/DATETIME/TIMESTAMP/TIME) -> LONG
+   */
+  private DefaultFunctionResolver datediff() {
+    return define(
+        BuiltinFunctionName.DATEDIFF.getName(),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff), LONG, DATE, DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            DATETIME,
+            DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            DATE,
+            DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            DATETIME,
+            DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff), LONG, DATE, TIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff), LONG, TIME, DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff), LONG, TIME, TIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            TIMESTAMP,
+            DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            DATE,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            TIMESTAMP,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            TIMESTAMP,
+            TIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            TIME,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            TIMESTAMP,
+            DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            DATETIME,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            TIME,
+            DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprDateDiff),
+            LONG,
+            DATETIME,
+            TIME));
+  }
+
   /**
-   * Specify a datetime with time zone field and a time zone to convert to.
-   * Returns a local date time.
-   * (STRING, STRING) -> DATETIME
+   * Specify a datetime with time zone field and a time zone to convert to.<br>
+   * Returns a local date time.<br>
+   * (STRING, STRING) -> DATETIME<br>
    * (STRING) -> DATETIME
    */
   private FunctionResolver datetime() {
-    return define(BuiltinFunctionName.DATETIME.getName(),
-        impl(nullMissingHandling(DateTimeFunction::exprDateTime),
-            DATETIME, STRING, STRING),
-        impl(nullMissingHandling(DateTimeFunction::exprDateTimeNoTimezone),
-            DATETIME, STRING)
-    );
+    return define(
+        BuiltinFunctionName.DATETIME.getName(),
+        impl(nullMissingHandling(DateTimeFunction::exprDateTime), DATETIME, STRING, STRING),
+        impl(nullMissingHandling(DateTimeFunction::exprDateTimeNoTimezone), DATETIME, STRING));
   }
 
   private DefaultFunctionResolver date_add() {
-    return add_date(BuiltinFunctionName.DATE_ADD.getName());
-  }
-
-  /**
-   * Specify a start date and subtract a temporal amount to the date.
-   * The return type depends on the date type and the interval unit. Detailed supported signatures:
-   * (STRING/DATE/DATETIME/TIMESTAMP, INTERVAL) -> DATETIME
-   * (DATE, LONG) -> DATE
-   * (STRING/DATETIME/TIMESTAMP, LONG) -> DATETIME
-   */
-  private DefaultFunctionResolver sub_date(FunctionName functionName) {
-    return define(functionName,
-        impl(nullMissingHandling(DateTimeFunction::exprSubDateInterval),
-            DATETIME, STRING, INTERVAL),
-        impl(nullMissingHandling(DateTimeFunction::exprSubDateInterval), DATETIME, DATE, INTERVAL),
-        impl(nullMissingHandling(DateTimeFunction::exprSubDateInterval),
-            DATETIME, DATETIME, INTERVAL),
-        impl(nullMissingHandling(DateTimeFunction::exprSubDateInterval),
-            DATETIME, TIMESTAMP, INTERVAL),
-        impl(nullMissingHandling(DateTimeFunction::exprSubDateDays), DATE, DATE, LONG),
-        impl(nullMissingHandling(DateTimeFunction::exprSubDateDays), DATETIME, DATETIME, LONG),
-        impl(nullMissingHandling(DateTimeFunction::exprSubDateDays), DATETIME, TIMESTAMP, LONG),
-        impl(nullMissingHandling(DateTimeFunction::exprSubDateDays), DATETIME, STRING, LONG)
-    );
+    return define(
+        BuiltinFunctionName.DATE_ADD.getName(),
+        (SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>[])
+            get_date_add_date_sub_signatures(DateTimeFunction::exprAddDateInterval)
+                .toArray(SerializableFunction<?, ?>[]::new));
   }
 
   private DefaultFunctionResolver date_sub() {
-    return sub_date(BuiltinFunctionName.DATE_SUB.getName());
+    return define(
+        BuiltinFunctionName.DATE_SUB.getName(),
+        (SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>[])
+            get_date_add_date_sub_signatures(DateTimeFunction::exprSubDateInterval)
+                .toArray(SerializableFunction<?, ?>[]::new));
   }
 
-  /**
-   * DAY(STRING/DATE/DATETIME/TIMESTAMP). return the day of the month (1-31).
-   */
+  /** DAY(STRING/DATE/DATETIME/TIMESTAMP). return the day of the month (1-31). */
   private DefaultFunctionResolver day() {
-    return define(BuiltinFunctionName.DAY.getName(),
+    return define(
+        BuiltinFunctionName.DAY.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprDayOfMonth), INTEGER, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprDayOfMonth), INTEGER, DATETIME),
         impl(nullMissingHandling(DateTimeFunction::exprDayOfMonth), INTEGER, TIMESTAMP),
-        impl(nullMissingHandling(DateTimeFunction::exprDayOfMonth), INTEGER, STRING)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprDayOfMonth), INTEGER, STRING));
   }
 
   /**
-   * DAYNAME(STRING/DATE/DATETIME/TIMESTAMP).
-   * return the name of the weekday for date, including Monday, Tuesday, Wednesday,
-   * Thursday, Friday, Saturday and Sunday.
+   * DAYNAME(STRING/DATE/DATETIME/TIMESTAMP). return the name of the weekday for date, including
+   * Monday, Tuesday, Wednesday, Thursday, Friday, Saturday and Sunday.
    */
   private DefaultFunctionResolver dayName() {
-    return define(BuiltinFunctionName.DAYNAME.getName(),
+    return define(
+        BuiltinFunctionName.DAYNAME.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprDayName), STRING, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprDayName), STRING, DATETIME),
         impl(nullMissingHandling(DateTimeFunction::exprDayName), STRING, TIMESTAMP),
-        impl(nullMissingHandling(DateTimeFunction::exprDayName), STRING, STRING)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprDayName), STRING, STRING));
   }
 
-  /**
-   * DAYOFMONTH(STRING/DATE/DATETIME/TIMESTAMP). return the day of the month (1-31).
-   */
-  private DefaultFunctionResolver dayOfMonth() {
-    return define(BuiltinFunctionName.DAYOFMONTH.getName(),
+  /** DAYOFMONTH(STRING/DATE/DATETIME/TIMESTAMP). return the day of the month (1-31). */
+  private DefaultFunctionResolver dayOfMonth(BuiltinFunctionName name) {
+    return define(
+        name.getName(),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, arg) ->
+                    DateTimeFunction.dayOfMonthToday(functionProperties.getQueryStartClock())),
+            INTEGER,
+            TIME),
         impl(nullMissingHandling(DateTimeFunction::exprDayOfMonth), INTEGER, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprDayOfMonth), INTEGER, DATETIME),
-        impl(nullMissingHandling(DateTimeFunction::exprDayOfMonth), INTEGER, TIMESTAMP),
-        impl(nullMissingHandling(DateTimeFunction::exprDayOfMonth), INTEGER, STRING)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprDayOfMonth), INTEGER, STRING),
+        impl(nullMissingHandling(DateTimeFunction::exprDayOfMonth), INTEGER, TIMESTAMP));
   }
 
   /**
-   * DAYOFWEEK(STRING/DATE/DATETIME/TIMESTAMP).
-   * return the weekday index for date (1 = Sunday, 2 = Monday, …, 7 = Saturday).
+   * DAYOFWEEK(STRING/DATE/DATETIME/TIME/TIMESTAMP). return the weekday index for date (1 = Sunday,
+   * 2 = Monday, ..., 7 = Saturday).
    */
-  private DefaultFunctionResolver dayOfWeek() {
-    return define(BuiltinFunctionName.DAYOFWEEK.getName(),
+  private DefaultFunctionResolver dayOfWeek(FunctionName name) {
+    return define(
+        name,
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, arg) ->
+                    DateTimeFunction.dayOfWeekToday(functionProperties.getQueryStartClock())),
+            INTEGER,
+            TIME),
         impl(nullMissingHandling(DateTimeFunction::exprDayOfWeek), INTEGER, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprDayOfWeek), INTEGER, DATETIME),
         impl(nullMissingHandling(DateTimeFunction::exprDayOfWeek), INTEGER, TIMESTAMP),
-        impl(nullMissingHandling(DateTimeFunction::exprDayOfWeek), INTEGER, STRING)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprDayOfWeek), INTEGER, STRING));
   }
 
-  /**
-   * DAYOFYEAR(STRING/DATE/DATETIME/TIMESTAMP).
-   * return the day of the year for date (1-366).
-   */
+  /** DAYOFYEAR(STRING/DATE/DATETIME/TIMESTAMP). return the day of the year for date (1-366). */
   private DefaultFunctionResolver dayOfYear(BuiltinFunctionName dayOfYear) {
-    return define(dayOfYear.getName(),
+    return define(
+        dayOfYear.getName(),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, arg) ->
+                    DateTimeFunction.dayOfYearToday(functionProperties.getQueryStartClock())),
+            INTEGER,
+            TIME),
         impl(nullMissingHandling(DateTimeFunction::exprDayOfYear), INTEGER, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprDayOfYear), INTEGER, DATETIME),
         impl(nullMissingHandling(DateTimeFunction::exprDayOfYear), INTEGER, TIMESTAMP),
-        impl(nullMissingHandling(DateTimeFunction::exprDayOfYear), INTEGER, STRING)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprDayOfYear), INTEGER, STRING));
   }
 
-  /**
-   * FROM_DAYS(LONG). return the date value given the day number N.
-   */
+  private DefaultFunctionResolver extract() {
+    return define(
+        BuiltinFunctionName.EXTRACT.getName(),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprExtractForTime),
+            LONG,
+            STRING,
+            TIME),
+        impl(nullMissingHandling(DateTimeFunction::exprExtract), LONG, STRING, DATE),
+        impl(nullMissingHandling(DateTimeFunction::exprExtract), LONG, STRING, DATETIME),
+        impl(nullMissingHandling(DateTimeFunction::exprExtract), LONG, STRING, TIMESTAMP),
+        impl(nullMissingHandling(DateTimeFunction::exprExtract), LONG, STRING, STRING));
+  }
+
+  /** FROM_DAYS(LONG). return the date value given the day number N. */
   private DefaultFunctionResolver from_days() {
-    return define(BuiltinFunctionName.FROM_DAYS.getName(),
+    return define(
+        BuiltinFunctionName.FROM_DAYS.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprFromDays), DATE, LONG));
   }
 
   private FunctionResolver from_unixtime() {
-    return define(BuiltinFunctionName.FROM_UNIXTIME.getName(),
+    return define(
+        BuiltinFunctionName.FROM_UNIXTIME.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprFromUnixTime), DATETIME, DOUBLE),
-        impl(nullMissingHandling(DateTimeFunction::exprFromUnixTimeFormat),
-            STRING, DOUBLE, STRING));
+        impl(
+            nullMissingHandling(DateTimeFunction::exprFromUnixTimeFormat), STRING, DOUBLE, STRING));
   }
 
-  /**
-   * HOUR(STRING/TIME/DATETIME/TIMESTAMP). return the hour value for time.
-   */
-  private DefaultFunctionResolver hour() {
-    return define(BuiltinFunctionName.HOUR.getName(),
+  private DefaultFunctionResolver get_format() {
+    return define(
+        BuiltinFunctionName.GET_FORMAT.getName(),
+        impl(nullMissingHandling(DateTimeFunction::exprGetFormat), STRING, STRING, STRING));
+  }
+
+  /** HOUR(STRING/TIME/DATETIME/DATE/TIMESTAMP). return the hour value for time. */
+  private DefaultFunctionResolver hour(BuiltinFunctionName name) {
+    return define(
+        name.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprHour), INTEGER, STRING),
         impl(nullMissingHandling(DateTimeFunction::exprHour), INTEGER, TIME),
+        impl(nullMissingHandling(DateTimeFunction::exprHour), INTEGER, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprHour), INTEGER, DATETIME),
-        impl(nullMissingHandling(DateTimeFunction::exprHour), INTEGER, TIMESTAMP)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprHour), INTEGER, TIMESTAMP));
+  }
+
+  private DefaultFunctionResolver last_day() {
+    return define(
+        BuiltinFunctionName.LAST_DAY.getName(),
+        impl(nullMissingHandling(DateTimeFunction::exprLastDay), DATE, STRING),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, arg) ->
+                    DateTimeFunction.exprLastDayToday(functionProperties.getQueryStartClock())),
+            DATE,
+            TIME),
+        impl(nullMissingHandling(DateTimeFunction::exprLastDay), DATE, DATE),
+        impl(nullMissingHandling(DateTimeFunction::exprLastDay), DATE, DATETIME),
+        impl(nullMissingHandling(DateTimeFunction::exprLastDay), DATE, TIMESTAMP));
   }
 
   private FunctionResolver makedate() {
-    return define(BuiltinFunctionName.MAKEDATE.getName(),
+    return define(
+        BuiltinFunctionName.MAKEDATE.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprMakeDate), DATE, DOUBLE, DOUBLE));
   }
 
   private FunctionResolver maketime() {
-    return define(BuiltinFunctionName.MAKETIME.getName(),
+    return define(
+        BuiltinFunctionName.MAKETIME.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprMakeTime), TIME, DOUBLE, DOUBLE, DOUBLE));
   }
 
-  /**
-   * MICROSECOND(STRING/TIME/DATETIME/TIMESTAMP). return the microsecond value for time.
-   */
+  /** MICROSECOND(STRING/TIME/DATETIME/TIMESTAMP). return the microsecond value for time. */
   private DefaultFunctionResolver microsecond() {
-    return define(BuiltinFunctionName.MICROSECOND.getName(),
+    return define(
+        BuiltinFunctionName.MICROSECOND.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprMicrosecond), INTEGER, STRING),
         impl(nullMissingHandling(DateTimeFunction::exprMicrosecond), INTEGER, TIME),
         impl(nullMissingHandling(DateTimeFunction::exprMicrosecond), INTEGER, DATETIME),
-        impl(nullMissingHandling(DateTimeFunction::exprMicrosecond), INTEGER, TIMESTAMP)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprMicrosecond), INTEGER, TIMESTAMP));
   }
 
-  /**
-   * MINUTE(STRING/TIME/DATETIME/TIMESTAMP). return the minute value for time.
-   */
-  private DefaultFunctionResolver minute() {
-    return define(BuiltinFunctionName.MINUTE.getName(),
+  /** MINUTE(STRING/TIME/DATETIME/TIMESTAMP). return the minute value for time. */
+  private DefaultFunctionResolver minute(BuiltinFunctionName name) {
+    return define(
+        name.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprMinute), INTEGER, STRING),
         impl(nullMissingHandling(DateTimeFunction::exprMinute), INTEGER, TIME),
         impl(nullMissingHandling(DateTimeFunction::exprMinute), INTEGER, DATETIME),
-        impl(nullMissingHandling(DateTimeFunction::exprMinute), INTEGER, TIMESTAMP)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprMinute), INTEGER, DATE),
+        impl(nullMissingHandling(DateTimeFunction::exprMinute), INTEGER, TIMESTAMP));
   }
 
-  /**
-   * MONTH(STRING/DATE/DATETIME/TIMESTAMP). return the month for date (1-12).
-   */
+  /** MINUTE(STRING/TIME/DATETIME/TIMESTAMP). return the minute value for time. */
+  private DefaultFunctionResolver minute_of_day() {
+    return define(
+        BuiltinFunctionName.MINUTE_OF_DAY.getName(),
+        impl(nullMissingHandling(DateTimeFunction::exprMinuteOfDay), INTEGER, STRING),
+        impl(nullMissingHandling(DateTimeFunction::exprMinuteOfDay), INTEGER, TIME),
+        impl(nullMissingHandling(DateTimeFunction::exprMinuteOfDay), INTEGER, DATE),
+        impl(nullMissingHandling(DateTimeFunction::exprMinuteOfDay), INTEGER, DATETIME),
+        impl(nullMissingHandling(DateTimeFunction::exprMinuteOfDay), INTEGER, TIMESTAMP));
+  }
+
+  /** MONTH(STRING/DATE/DATETIME/TIMESTAMP). return the month for date (1-12). */
   private DefaultFunctionResolver month(BuiltinFunctionName month) {
-    return define(month.getName(),
+    return define(
+        month.getName(),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, arg) ->
+                    DateTimeFunction.monthOfYearToday(functionProperties.getQueryStartClock())),
+            INTEGER,
+            TIME),
         impl(nullMissingHandling(DateTimeFunction::exprMonth), INTEGER, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprMonth), INTEGER, DATETIME),
         impl(nullMissingHandling(DateTimeFunction::exprMonth), INTEGER, TIMESTAMP),
-        impl(nullMissingHandling(DateTimeFunction::exprMonth), INTEGER, STRING)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprMonth), INTEGER, STRING));
   }
 
-  /**
-   * MONTHNAME(STRING/DATE/DATETIME/TIMESTAMP). return the full name of the month for date.
-   */
+  /** MONTHNAME(STRING/DATE/DATETIME/TIMESTAMP). return the full name of the month for date. */
   private DefaultFunctionResolver monthName() {
-    return define(BuiltinFunctionName.MONTHNAME.getName(),
+    return define(
+        BuiltinFunctionName.MONTHNAME.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprMonthName), STRING, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprMonthName), STRING, DATETIME),
         impl(nullMissingHandling(DateTimeFunction::exprMonthName), STRING, TIMESTAMP),
-        impl(nullMissingHandling(DateTimeFunction::exprMonthName), STRING, STRING)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprMonthName), STRING, STRING));
   }
 
   /**
@@ -461,57 +803,164 @@ private DefaultFunctionResolver monthName() {
    * (INTEGER, INTEGER) -> INTEGER
    */
   private DefaultFunctionResolver period_add() {
-    return define(BuiltinFunctionName.PERIOD_ADD.getName(),
-        impl(nullMissingHandling(DateTimeFunction::exprPeriodAdd), INTEGER, INTEGER, INTEGER)
-    );
+    return define(
+        BuiltinFunctionName.PERIOD_ADD.getName(),
+        impl(nullMissingHandling(DateTimeFunction::exprPeriodAdd), INTEGER, INTEGER, INTEGER));
   }
 
   /**
-   * Returns the number of months between periods P1 and P2.
-   * P1 and P2 should be in the format YYMM or YYYYMM.
+   * Returns the number of months between periods P1 and P2. P1 and P2 should be in the format YYMM
+   * or YYYYMM.<br>
    * (INTEGER, INTEGER) -> INTEGER
    */
   private DefaultFunctionResolver period_diff() {
-    return define(BuiltinFunctionName.PERIOD_DIFF.getName(),
-        impl(nullMissingHandling(DateTimeFunction::exprPeriodDiff), INTEGER, INTEGER, INTEGER)
-    );
+    return define(
+        BuiltinFunctionName.PERIOD_DIFF.getName(),
+        impl(nullMissingHandling(DateTimeFunction::exprPeriodDiff), INTEGER, INTEGER, INTEGER));
   }
 
-  /**
-   * QUARTER(STRING/DATE/DATETIME/TIMESTAMP). return the month for date (1-4).
-   */
+  /** QUARTER(STRING/DATE/DATETIME/TIMESTAMP). return the month for date (1-4). */
   private DefaultFunctionResolver quarter() {
-    return define(BuiltinFunctionName.QUARTER.getName(),
+    return define(
+        BuiltinFunctionName.QUARTER.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprQuarter), INTEGER, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprQuarter), INTEGER, DATETIME),
         impl(nullMissingHandling(DateTimeFunction::exprQuarter), INTEGER, TIMESTAMP),
-        impl(nullMissingHandling(DateTimeFunction::exprQuarter), INTEGER, STRING)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprQuarter), INTEGER, STRING));
   }
 
-  /**
-   * SECOND(STRING/TIME/DATETIME/TIMESTAMP). return the second value for time.
-   */
-  private DefaultFunctionResolver second() {
-    return define(BuiltinFunctionName.SECOND.getName(),
+  private DefaultFunctionResolver sec_to_time() {
+    return define(
+        BuiltinFunctionName.SEC_TO_TIME.getName(),
+        impl((nullMissingHandling(DateTimeFunction::exprSecToTime)), TIME, INTEGER),
+        impl((nullMissingHandling(DateTimeFunction::exprSecToTime)), TIME, LONG),
+        impl((nullMissingHandling(DateTimeFunction::exprSecToTimeWithNanos)), TIME, DOUBLE),
+        impl((nullMissingHandling(DateTimeFunction::exprSecToTimeWithNanos)), TIME, FLOAT));
+  }
+
+  /** SECOND(STRING/TIME/DATETIME/TIMESTAMP). return the second value for time. */
+  private DefaultFunctionResolver second(BuiltinFunctionName name) {
+    return define(
+        name.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprSecond), INTEGER, STRING),
         impl(nullMissingHandling(DateTimeFunction::exprSecond), INTEGER, TIME),
+        impl(nullMissingHandling(DateTimeFunction::exprSecond), INTEGER, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprSecond), INTEGER, DATETIME),
-        impl(nullMissingHandling(DateTimeFunction::exprSecond), INTEGER, TIMESTAMP)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprSecond), INTEGER, TIMESTAMP));
   }
 
   private DefaultFunctionResolver subdate() {
-    return sub_date(BuiltinFunctionName.SUBDATE.getName());
+    return define(
+        BuiltinFunctionName.SUBDATE.getName(),
+        (SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>[])
+            (Stream.concat(
+                    get_date_add_date_sub_signatures(DateTimeFunction::exprSubDateInterval),
+                    get_adddate_subdate_signatures(DateTimeFunction::exprSubDateDays))
+                .toArray(SerializableFunction<?, ?>[]::new)));
+  }
+
+  /**
+   * Subtracts expr2 from expr1 and returns the result.<br>
+   * (TIME, TIME/DATE/DATETIME/TIMESTAMP) -> TIME<br>
+   * (DATE/DATETIME/TIMESTAMP, TIME/DATE/DATETIME/TIMESTAMP) -> DATETIME<br>
+   * TODO: MySQL has these signatures too<br>
+   * (STRING, STRING/TIME) -> STRING // second arg - string with time only<br>
+   * (x, STRING) -> NULL // second arg - string with timestamp<br>
+   * (x, STRING/DATE) -> x // second arg - string with date only
+   */
+  private DefaultFunctionResolver subtime() {
+    return define(
+        BuiltinFunctionName.SUBTIME.getName(),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime), TIME, TIME, TIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime), TIME, TIME, DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime), TIME, TIME, DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime),
+            TIME,
+            TIME,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime),
+            DATETIME,
+            DATETIME,
+            TIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime),
+            DATETIME,
+            DATETIME,
+            DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime),
+            DATETIME,
+            DATETIME,
+            DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime),
+            DATETIME,
+            DATETIME,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime), DATETIME, DATE, TIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime), DATETIME, DATE, DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime),
+            DATETIME,
+            DATE,
+            DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime),
+            DATETIME,
+            DATE,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime),
+            DATETIME,
+            TIMESTAMP,
+            TIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime),
+            DATETIME,
+            TIMESTAMP,
+            DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime),
+            DATETIME,
+            TIMESTAMP,
+            DATETIME),
+        implWithProperties(
+            nullMissingHandlingWithProperties(DateTimeFunction::exprSubTime),
+            DATETIME,
+            TIMESTAMP,
+            TIMESTAMP));
+  }
+
+  /**
+   * Extracts a date, time, or datetime from the given string. It accomplishes this using another
+   * string which specifies the input format.
+   */
+  private DefaultFunctionResolver str_to_date() {
+    return define(
+        BuiltinFunctionName.STR_TO_DATE.getName(),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, arg, format) ->
+                    DateTimeFunction.exprStrToDate(functionProperties, arg, format)),
+            DATETIME,
+            STRING,
+            STRING));
   }
 
   /**
-   * Extracts the time part of a date and time value.
-   * Also to construct a time type. The supported signatures:
-   * STRING/DATE/DATETIME/TIME/TIMESTAMP -> TIME
+   * Extracts the time part of a date and time value. Also to construct a time type. The supported
+   * signatures: STRING/DATE/DATETIME/TIME/TIMESTAMP -> TIME
    */
   private DefaultFunctionResolver time() {
-    return define(BuiltinFunctionName.TIME.getName(),
+    return define(
+        BuiltinFunctionName.TIME.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprTime), TIME, STRING),
         impl(nullMissingHandling(DateTimeFunction::exprTime), TIME, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprTime), TIME, DATETIME),
@@ -519,135 +968,464 @@ private DefaultFunctionResolver time() {
         impl(nullMissingHandling(DateTimeFunction::exprTime), TIME, TIMESTAMP));
   }
 
+  /**
+   * Returns different between two times as a time.<br>
+   * (TIME, TIME) -> TIME<br>
+   * MySQL has these signatures too<br>
+   * (DATE, DATE) -> TIME // result is > 24 hours<br>
+   * (DATETIME, DATETIME) -> TIME // result is > 24 hours<br>
+   * (TIMESTAMP, TIMESTAMP) -> TIME // result is > 24 hours<br>
+   * (x, x) -> NULL // when args have different types<br>
+   * (STRING, STRING) -> TIME // argument strings contain same types only<br>
+   * (STRING, STRING) -> NULL // argument strings are different types
+   */
+  private DefaultFunctionResolver timediff() {
+    return define(
+        BuiltinFunctionName.TIMEDIFF.getName(),
+        impl(nullMissingHandling(DateTimeFunction::exprTimeDiff), TIME, TIME, TIME));
+  }
+
   /**
    * TIME_TO_SEC(STRING/TIME/DATETIME/TIMESTAMP). return the time argument, converted to seconds.
    */
   private DefaultFunctionResolver time_to_sec() {
-    return define(BuiltinFunctionName.TIME_TO_SEC.getName(),
+    return define(
+        BuiltinFunctionName.TIME_TO_SEC.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprTimeToSec), LONG, STRING),
         impl(nullMissingHandling(DateTimeFunction::exprTimeToSec), LONG, TIME),
         impl(nullMissingHandling(DateTimeFunction::exprTimeToSec), LONG, TIMESTAMP),
-        impl(nullMissingHandling(DateTimeFunction::exprTimeToSec), LONG, DATETIME)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprTimeToSec), LONG, DATETIME));
   }
 
   /**
-   * Extracts the timestamp of a date and time value.
-   * Also to construct a date type. The supported signatures:
-   * STRING/DATE/DATETIME/TIMESTAMP -> DATE
+   * Extracts the timestamp of a date and time value.<br>
+   * Input strings may contain a timestamp only in format 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'<br>
+   * STRING/DATE/TIME/DATETIME/TIMESTAMP -> TIMESTAMP<br>
+   * STRING/DATE/TIME/DATETIME/TIMESTAMP, STRING/DATE/TIME/DATETIME/TIMESTAMP -> TIMESTAMP<br>
+   * All types are converted to TIMESTAMP actually before the function call - it is responsibility
+   * <br>
+   * of the automatic cast mechanism defined in `ExprCoreType` and performed by `TypeCastOperator`.
    */
   private DefaultFunctionResolver timestamp() {
-    return define(BuiltinFunctionName.TIMESTAMP.getName(),
-        impl(nullMissingHandling(DateTimeFunction::exprTimestamp), TIMESTAMP, STRING),
-        impl(nullMissingHandling(DateTimeFunction::exprTimestamp), TIMESTAMP, DATE),
-        impl(nullMissingHandling(DateTimeFunction::exprTimestamp), TIMESTAMP, DATETIME),
-        impl(nullMissingHandling(DateTimeFunction::exprTimestamp), TIMESTAMP, TIMESTAMP));
+    return define(
+        BuiltinFunctionName.TIMESTAMP.getName(),
+        impl(nullMissingHandling(v -> v), TIMESTAMP, TIMESTAMP),
+        // We can use FunctionProperties.None, because it is not used. It is required to convert
+        // TIME to other datetime types, but arguments there are already converted.
+        impl(
+            nullMissingHandling((v1, v2) -> exprAddTime(FunctionProperties.None, v1, v2)),
+            TIMESTAMP,
+            TIMESTAMP,
+            TIMESTAMP));
+  }
+
+  /**
+   * Adds an interval of time to the provided DATE/DATETIME/TIME/TIMESTAMP/STRING argument. The
+   * interval of time added is determined by the given first and second arguments. The first
+   * argument is an interval type, and must be one of the tokens below... [MICROSECOND, SECOND,
+   * MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER, YEAR] The second argument is the amount of the
+   * interval type to be added. The third argument is the DATE/DATETIME/TIME/TIMESTAMP/STRING to add
+   * to.
+   *
+   * @return The DATETIME representing the summed DATE/DATETIME/TIME/TIMESTAMP and interval.
+   */
+  private DefaultFunctionResolver timestampadd() {
+    return define(
+        BuiltinFunctionName.TIMESTAMPADD.getName(),
+        impl(
+            nullMissingHandling(DateTimeFunction::exprTimestampAdd),
+            DATETIME,
+            STRING,
+            INTEGER,
+            DATETIME),
+        impl(
+            nullMissingHandling(DateTimeFunction::exprTimestampAdd),
+            DATETIME,
+            STRING,
+            INTEGER,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, part, amount, time) ->
+                    exprTimestampAddForTimeType(
+                        functionProperties.getQueryStartClock(), part, amount, time)),
+            DATETIME,
+            STRING,
+            INTEGER,
+            TIME));
   }
 
   /**
-   * TO_DAYS(STRING/DATE/DATETIME/TIMESTAMP). return the day number of the given date.
+   * Finds the difference between provided DATE/DATETIME/TIME/TIMESTAMP/STRING arguments. The first
+   * argument is an interval type, and must be one of the tokens below... [MICROSECOND, SECOND,
+   * MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER, YEAR] The second argument the
+   * DATE/DATETIME/TIME/TIMESTAMP/STRING representing the start time. The third argument is the
+   * DATE/DATETIME/TIME/TIMESTAMP/STRING representing the end time.
+   *
+   * @return A LONG representing the difference between arguments, using the given interval type.
    */
+  private DefaultFunctionResolver timestampdiff() {
+    return define(
+        BuiltinFunctionName.TIMESTAMPDIFF.getName(),
+        impl(
+            nullMissingHandling(DateTimeFunction::exprTimestampDiff),
+            DATETIME,
+            STRING,
+            DATETIME,
+            DATETIME),
+        impl(
+            nullMissingHandling(DateTimeFunction::exprTimestampDiff),
+            DATETIME,
+            STRING,
+            DATETIME,
+            TIMESTAMP),
+        impl(
+            nullMissingHandling(DateTimeFunction::exprTimestampDiff),
+            DATETIME,
+            STRING,
+            TIMESTAMP,
+            DATETIME),
+        impl(
+            nullMissingHandling(DateTimeFunction::exprTimestampDiff),
+            DATETIME,
+            STRING,
+            TIMESTAMP,
+            TIMESTAMP),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, part, startTime, endTime) ->
+                    exprTimestampDiffForTimeType(functionProperties, part, startTime, endTime)),
+            DATETIME,
+            STRING,
+            TIME,
+            TIME));
+  }
+
+  /** TO_DAYS(STRING/DATE/DATETIME/TIMESTAMP). return the day number of the given date. */
   private DefaultFunctionResolver to_days() {
-    return define(BuiltinFunctionName.TO_DAYS.getName(),
+    return define(
+        BuiltinFunctionName.TO_DAYS.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprToDays), LONG, STRING),
         impl(nullMissingHandling(DateTimeFunction::exprToDays), LONG, TIMESTAMP),
         impl(nullMissingHandling(DateTimeFunction::exprToDays), LONG, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprToDays), LONG, DATETIME));
   }
 
+  /**
+   * TO_SECONDS(TIMESTAMP/LONG). return the seconds number of the given date. Arguments of type
+   * STRING/TIMESTAMP/LONG are also accepted. STRING/TIMESTAMP/LONG arguments are automatically cast
+   * to TIMESTAMP.
+   */
+  private DefaultFunctionResolver to_seconds() {
+    return define(
+        BuiltinFunctionName.TO_SECONDS.getName(),
+        impl(nullMissingHandling(DateTimeFunction::exprToSeconds), LONG, TIMESTAMP),
+        impl(nullMissingHandling(DateTimeFunction::exprToSecondsForIntType), LONG, LONG));
+  }
+
   private FunctionResolver unix_timestamp() {
-    return define(BuiltinFunctionName.UNIX_TIMESTAMP.getName(),
-        implWithProperties(functionProperties
-            -> DateTimeFunction.unixTimeStamp(functionProperties.getQueryStartClock()), LONG),
+    return define(
+        BuiltinFunctionName.UNIX_TIMESTAMP.getName(),
+        implWithProperties(
+            functionProperties ->
+                DateTimeFunction.unixTimeStamp(functionProperties.getQueryStartClock()),
+            LONG),
         impl(nullMissingHandling(DateTimeFunction::unixTimeStampOf), DOUBLE, DATE),
         impl(nullMissingHandling(DateTimeFunction::unixTimeStampOf), DOUBLE, DATETIME),
         impl(nullMissingHandling(DateTimeFunction::unixTimeStampOf), DOUBLE, TIMESTAMP),
-        impl(nullMissingHandling(DateTimeFunction::unixTimeStampOf), DOUBLE, DOUBLE)
-    );
+        impl(nullMissingHandling(DateTimeFunction::unixTimeStampOf), DOUBLE, DOUBLE));
   }
 
-  /**
-   * WEEK(DATE[,mode]). return the week number for date.
-   */
+  /** UTC_DATE(). return the current UTC Date in format yyyy-MM-dd */
+  private DefaultFunctionResolver utc_date() {
+    return define(
+        BuiltinFunctionName.UTC_DATE.getName(),
+        implWithProperties(functionProperties -> exprUtcDate(functionProperties), DATE));
+  }
+
+  /** UTC_TIME(). return the current UTC Time in format HH:mm:ss */
+  private DefaultFunctionResolver utc_time() {
+    return define(
+        BuiltinFunctionName.UTC_TIME.getName(),
+        implWithProperties(functionProperties -> exprUtcTime(functionProperties), TIME));
+  }
+
+  /** UTC_TIMESTAMP(). return the current UTC TimeStamp in format yyyy-MM-dd HH:mm:ss */
+  private DefaultFunctionResolver utc_timestamp() {
+    return define(
+        BuiltinFunctionName.UTC_TIMESTAMP.getName(),
+        implWithProperties(functionProperties -> exprUtcTimeStamp(functionProperties), DATETIME));
+  }
+
+  /** WEEK(DATE[,mode]). return the week number for date. */
   private DefaultFunctionResolver week(BuiltinFunctionName week) {
-    return define(week.getName(),
+    return define(
+        week.getName(),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, arg) ->
+                    DateTimeFunction.weekOfYearToday(
+                        DEFAULT_WEEK_OF_YEAR_MODE, functionProperties.getQueryStartClock())),
+            INTEGER,
+            TIME),
         impl(nullMissingHandling(DateTimeFunction::exprWeekWithoutMode), INTEGER, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprWeekWithoutMode), INTEGER, DATETIME),
         impl(nullMissingHandling(DateTimeFunction::exprWeekWithoutMode), INTEGER, TIMESTAMP),
         impl(nullMissingHandling(DateTimeFunction::exprWeekWithoutMode), INTEGER, STRING),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, time, modeArg) ->
+                    DateTimeFunction.weekOfYearToday(
+                        modeArg, functionProperties.getQueryStartClock())),
+            INTEGER,
+            TIME,
+            INTEGER),
         impl(nullMissingHandling(DateTimeFunction::exprWeek), INTEGER, DATE, INTEGER),
         impl(nullMissingHandling(DateTimeFunction::exprWeek), INTEGER, DATETIME, INTEGER),
         impl(nullMissingHandling(DateTimeFunction::exprWeek), INTEGER, TIMESTAMP, INTEGER),
-        impl(nullMissingHandling(DateTimeFunction::exprWeek), INTEGER, STRING, INTEGER)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprWeek), INTEGER, STRING, INTEGER));
   }
 
-  /**
-   * YEAR(STRING/DATE/DATETIME/TIMESTAMP). return the year for date (1000-9999).
-   */
+  private DefaultFunctionResolver weekday() {
+    return define(
+        BuiltinFunctionName.WEEKDAY.getName(),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, arg) ->
+                    new ExprIntegerValue(
+                        formatNow(functionProperties.getQueryStartClock()).getDayOfWeek().getValue()
+                            - 1)),
+            INTEGER,
+            TIME),
+        impl(nullMissingHandling(DateTimeFunction::exprWeekday), INTEGER, DATE),
+        impl(nullMissingHandling(DateTimeFunction::exprWeekday), INTEGER, DATETIME),
+        impl(nullMissingHandling(DateTimeFunction::exprWeekday), INTEGER, TIMESTAMP),
+        impl(nullMissingHandling(DateTimeFunction::exprWeekday), INTEGER, STRING));
+  }
+
+  /** YEAR(STRING/DATE/DATETIME/TIMESTAMP). return the year for date (1000-9999). */
   private DefaultFunctionResolver year() {
-    return define(BuiltinFunctionName.YEAR.getName(),
+    return define(
+        BuiltinFunctionName.YEAR.getName(),
         impl(nullMissingHandling(DateTimeFunction::exprYear), INTEGER, DATE),
         impl(nullMissingHandling(DateTimeFunction::exprYear), INTEGER, DATETIME),
         impl(nullMissingHandling(DateTimeFunction::exprYear), INTEGER, TIMESTAMP),
-        impl(nullMissingHandling(DateTimeFunction::exprYear), INTEGER, STRING)
-    );
+        impl(nullMissingHandling(DateTimeFunction::exprYear), INTEGER, STRING));
+  }
+
+  /** YEARWEEK(DATE[,mode]). return the week number for date. */
+  private DefaultFunctionResolver yearweek() {
+    return define(
+        BuiltinFunctionName.YEARWEEK.getName(),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, arg) ->
+                    yearweekToday(
+                        DEFAULT_WEEK_OF_YEAR_MODE, functionProperties.getQueryStartClock())),
+            INTEGER,
+            TIME),
+        impl(nullMissingHandling(DateTimeFunction::exprYearweekWithoutMode), INTEGER, DATE),
+        impl(nullMissingHandling(DateTimeFunction::exprYearweekWithoutMode), INTEGER, DATETIME),
+        impl(nullMissingHandling(DateTimeFunction::exprYearweekWithoutMode), INTEGER, TIMESTAMP),
+        impl(nullMissingHandling(DateTimeFunction::exprYearweekWithoutMode), INTEGER, STRING),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, time, modeArg) ->
+                    yearweekToday(modeArg, functionProperties.getQueryStartClock())),
+            INTEGER,
+            TIME,
+            INTEGER),
+        impl(nullMissingHandling(DateTimeFunction::exprYearweek), INTEGER, DATE, INTEGER),
+        impl(nullMissingHandling(DateTimeFunction::exprYearweek), INTEGER, DATETIME, INTEGER),
+        impl(nullMissingHandling(DateTimeFunction::exprYearweek), INTEGER, TIMESTAMP, INTEGER),
+        impl(nullMissingHandling(DateTimeFunction::exprYearweek), INTEGER, STRING, INTEGER));
   }
 
   /**
-   * Formats date according to format specifier. First argument is date, second is format.
-   * Detailed supported signatures:
-   * (STRING, STRING) -> STRING
-   * (DATE, STRING) -> STRING
-   * (DATETIME, STRING) -> STRING
+   * Formats date according to format specifier. First argument is date, second is format.<br>
+   * Detailed supported signatures:<br>
+   * (STRING, STRING) -> STRING<br>
+   * (DATE, STRING) -> STRING<br>
+   * (DATETIME, STRING) -> STRING<br>
+   * (TIME, STRING) -> STRING<br>
    * (TIMESTAMP, STRING) -> STRING
    */
   private DefaultFunctionResolver date_format() {
-    return define(BuiltinFunctionName.DATE_FORMAT.getName(),
-        impl(nullMissingHandling(DateTimeFormatterUtil::getFormattedDate),
-            STRING, STRING, STRING),
-        impl(nullMissingHandling(DateTimeFormatterUtil::getFormattedDate),
-            STRING, DATE, STRING),
-        impl(nullMissingHandling(DateTimeFormatterUtil::getFormattedDate),
-            STRING, DATETIME, STRING),
-        impl(nullMissingHandling(DateTimeFormatterUtil::getFormattedDate),
-            STRING, TIMESTAMP, STRING)
-    );
+    return define(
+        BuiltinFunctionName.DATE_FORMAT.getName(),
+        impl(nullMissingHandling(DateTimeFormatterUtil::getFormattedDate), STRING, STRING, STRING),
+        impl(nullMissingHandling(DateTimeFormatterUtil::getFormattedDate), STRING, DATE, STRING),
+        impl(
+            nullMissingHandling(DateTimeFormatterUtil::getFormattedDate), STRING, DATETIME, STRING),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (functionProperties, time, formatString) ->
+                    DateTimeFormatterUtil.getFormattedDateOfToday(
+                        formatString, time, functionProperties.getQueryStartClock())),
+            STRING,
+            TIME,
+            STRING),
+        impl(
+            nullMissingHandling(DateTimeFormatterUtil::getFormattedDate),
+            STRING,
+            TIMESTAMP,
+            STRING));
+  }
+
+  private ExprValue dayOfMonthToday(Clock clock) {
+    return new ExprIntegerValue(LocalDateTime.now(clock).getDayOfMonth());
+  }
+
+  private ExprValue dayOfYearToday(Clock clock) {
+    return new ExprIntegerValue(LocalDateTime.now(clock).getDayOfYear());
+  }
+
+  private ExprValue weekOfYearToday(ExprValue mode, Clock clock) {
+    return new ExprIntegerValue(
+        CalendarLookup.getWeekNumber(mode.integerValue(), LocalDateTime.now(clock).toLocalDate()));
   }
 
   /**
-   * ADDDATE function implementation for ExprValue.
+   * Day of Week implementation for ExprValue when passing in an arguemt of type TIME.
+   *
+   * @param clock Current clock taken from function properties
+   * @return ExprValue.
+   */
+  private ExprValue dayOfWeekToday(Clock clock) {
+    return new ExprIntegerValue((formatNow(clock).getDayOfWeek().getValue() % 7) + 1);
+  }
+
+  /**
+   * DATE_ADD function implementation for ExprValue.
+   *
+   * @param functionProperties An FunctionProperties object.
+   * @param datetime ExprValue of Date/Time/Datetime/Timestamp type.
+   * @param interval ExprValue of Interval type, the temporal amount to add.
+   * @return Datetime resulted from `interval` added to `datetime`.
+   */
+  private ExprValue exprAddDateInterval(
+      FunctionProperties functionProperties, ExprValue datetime, ExprValue interval) {
+    return exprDateApplyInterval(functionProperties, datetime, interval.intervalValue(), true);
+  }
+
+  /**
+   * Adds or subtracts `interval` to/from `datetime`.
    *
-   * @param date ExprValue of String/Date/Datetime/Timestamp type.
-   * @param expr ExprValue of Interval type, the temporal amount to add.
-   * @return Datetime resulted from expr added to date.
+   * @param functionProperties An FunctionProperties object.
+   * @param datetime A Date/Time/Datetime/Timestamp value to change.
+   * @param interval An Interval to isAdd or subtract.
+   * @param isAdd A flag: true to isAdd, false to subtract.
+   * @return Datetime calculated.
+   */
+  private ExprValue exprDateApplyInterval(
+      FunctionProperties functionProperties,
+      ExprValue datetime,
+      TemporalAmount interval,
+      Boolean isAdd) {
+    var dt = extractDateTime(datetime, functionProperties);
+    return new ExprDatetimeValue(isAdd ? dt.plus(interval) : dt.minus(interval));
+  }
+
+  /**
+   * Formats date according to format specifier. First argument is time, second is format.<br>
+   * Detailed supported signatures:<br>
+   * (STRING, STRING) -> STRING<br>
+   * (DATE, STRING) -> STRING<br>
+   * (DATETIME, STRING) -> STRING<br>
+   * (TIME, STRING) -> STRING<br>
+   * (TIMESTAMP, STRING) -> STRING
    */
-  private ExprValue exprAddDateInterval(ExprValue date, ExprValue expr) {
-    ExprValue exprValue = new ExprDatetimeValue(date.datetimeValue().plus(expr.intervalValue()));
-    return (exprValue.timeValue().toSecondOfDay() == 0 ? new ExprDateValue(exprValue.dateValue())
-        : exprValue);
+  private DefaultFunctionResolver time_format() {
+    return define(
+        BuiltinFunctionName.TIME_FORMAT.getName(),
+        impl(nullMissingHandling(DateTimeFormatterUtil::getFormattedTime), STRING, STRING, STRING),
+        impl(nullMissingHandling(DateTimeFormatterUtil::getFormattedTime), STRING, DATE, STRING),
+        impl(
+            nullMissingHandling(DateTimeFormatterUtil::getFormattedTime), STRING, DATETIME, STRING),
+        impl(nullMissingHandling(DateTimeFormatterUtil::getFormattedTime), STRING, TIME, STRING),
+        impl(
+            nullMissingHandling(DateTimeFormatterUtil::getFormattedTime),
+            STRING,
+            TIMESTAMP,
+            STRING));
   }
 
   /**
    * ADDDATE function implementation for ExprValue.
    *
-   * @param date ExprValue of String/Date/Datetime/Timestamp type.
+   * @param functionProperties An FunctionProperties object.
+   * @param datetime ExprValue of Time/Date/Datetime/Timestamp type.
    * @param days ExprValue of Long type, representing the number of days to add.
-   * @return Date/Datetime resulted from days added to date.
+   * @return Date/Datetime resulted from days added to `datetime`.
    */
-  private ExprValue exprAddDateDays(ExprValue date, ExprValue days) {
-    ExprValue exprValue = new ExprDatetimeValue(date.datetimeValue().plusDays(days.longValue()));
-    return (exprValue.timeValue().toSecondOfDay() == 0 ? new ExprDateValue(exprValue.dateValue())
-        : exprValue);
+  private ExprValue exprAddDateDays(
+      FunctionProperties functionProperties, ExprValue datetime, ExprValue days) {
+    return exprDateApplyDays(functionProperties, datetime, days.longValue(), true);
   }
 
   /**
-   * CONVERT_TZ function implementation for ExprValue.
-   * Returns null for time zones outside of +13:00 and -12:00.
+   * Adds or subtracts `days` to/from `datetime`.
+   *
+   * @param functionProperties An FunctionProperties object.
+   * @param datetime A Date/Time/Datetime/Timestamp value to change.
+   * @param days A days amount to add or subtract.
+   * @param isAdd A flag: true to add, false to subtract.
+   * @return Datetime calculated.
+   */
+  private ExprValue exprDateApplyDays(
+      FunctionProperties functionProperties, ExprValue datetime, Long days, Boolean isAdd) {
+    if (datetime.type() == DATE) {
+      return new ExprDateValue(
+          isAdd ? datetime.dateValue().plusDays(days) : datetime.dateValue().minusDays(days));
+    }
+    var dt = extractDateTime(datetime, functionProperties);
+    return new ExprDatetimeValue(isAdd ? dt.plusDays(days) : dt.minusDays(days));
+  }
+
+  /**
+   * Adds or subtracts time to/from date and returns the result.
+   *
+   * @param functionProperties A FunctionProperties object.
+   * @param temporal A Date/Time/Datetime/Timestamp value to change.
+   * @param temporalDelta A Date/Time/Datetime/Timestamp object to add/subtract time from.
+   * @param isAdd A flag: true to add, false to subtract.
+   * @return A value calculated.
+   */
+  private ExprValue exprApplyTime(
+      FunctionProperties functionProperties,
+      ExprValue temporal,
+      ExprValue temporalDelta,
+      Boolean isAdd) {
+    var interval = Duration.between(LocalTime.MIN, temporalDelta.timeValue());
+    var result =
+        isAdd
+            ? extractDateTime(temporal, functionProperties).plus(interval)
+            : extractDateTime(temporal, functionProperties).minus(interval);
+    return temporal.type() == TIME
+        ? new ExprTimeValue(result.toLocalTime())
+        : new ExprDatetimeValue(result);
+  }
+
+  /**
+   * Adds time to date and returns the result.
+   *
+   * @param functionProperties A FunctionProperties object.
+   * @param temporal A Date/Time/Datetime/Timestamp value to change.
+   * @param temporalDelta A Date/Time/Datetime/Timestamp object to add time from.
+   * @return A value calculated.
+   */
+  private ExprValue exprAddTime(
+      FunctionProperties functionProperties, ExprValue temporal, ExprValue temporalDelta) {
+    return exprApplyTime(functionProperties, temporal, temporalDelta, true);
+  }
+
+  /**
+   * CONVERT_TZ function implementation for ExprValue. Returns null for time zones outside of +13:00
+   * and -12:00.
    *
    * @param startingDateTime ExprValue of DateTime that is being converted from
-   * @param fromTz           ExprValue of time zone, representing the time to convert from.
-   * @param toTz             ExprValue of time zone, representing the time to convert to.
+   * @param fromTz ExprValue of time zone, representing the time to convert from.
+   * @param toTz ExprValue of time zone, representing the time to convert to.
    * @return DateTime that has been converted to the to_tz timezone.
    */
   private ExprValue exprConvertTZ(ExprValue startingDateTime, ExprValue fromTz, ExprValue toTz) {
@@ -664,12 +1442,10 @@ private ExprValue exprConvertTZ(ExprValue startingDateTime, ExprValue fromTz, Ex
           || !DateTimeUtils.isValidMySqlTimeZoneId(convertedToTz)) {
         return ExprNullValue.of();
       }
-      ZonedDateTime zonedDateTime =
-          startingDateTime.datetimeValue().atZone(convertedFromTz);
+      ZonedDateTime zonedDateTime = startingDateTime.datetimeValue().atZone(convertedFromTz);
       return new ExprDatetimeValue(
           zonedDateTime.withZoneSameInstant(convertedToTz).toLocalDateTime());
 
-
       // Catches exception for invalid timezones.
       // ex. "+0:00" is an invalid timezone and would result in this exception being thrown.
     } catch (ExpressionEvaluationException | DateTimeException e) {
@@ -691,6 +1467,22 @@ private ExprValue exprDate(ExprValue exprValue) {
     }
   }
 
+  /**
+   * Calculate the value in days from one date to the other. Only the date parts of the values are
+   * used in the calculation.
+   *
+   * @param first The first value.
+   * @param second The second value.
+   * @return The diff.
+   */
+  private ExprValue exprDateDiff(
+      FunctionProperties functionProperties, ExprValue first, ExprValue second) {
+    // java inverses the value, so we have to swap 1 and 2
+    return new ExprLongValue(
+        DAYS.between(
+            extractDate(second, functionProperties), extractDate(first, functionProperties)));
+  }
+
   /**
    * DateTime implementation for ExprValue.
    *
@@ -701,7 +1493,6 @@ private ExprValue exprDate(ExprValue exprValue) {
   private ExprValue exprDateTime(ExprValue dateTime, ExprValue timeZone) {
     String defaultTimeZone = TimeZone.getDefault().getID();
 
-
     try {
       LocalDateTime ldtFormatted =
           LocalDateTime.parse(dateTime.stringValue(), DATE_TIME_FORMATTER_STRICT_WITH_TZ);
@@ -729,10 +1520,7 @@ private ExprValue exprDateTime(ExprValue dateTime, ExprValue timeZone) {
       ldt = new ExprDatetimeValue(dateTime.stringValue());
       toTz = defaultTimeZone;
     }
-    convertTZResult = exprConvertTZ(
-        ldt,
-        new ExprStringValue(toTz),
-        timeZone);
+    convertTZResult = exprConvertTZ(ldt, new ExprStringValue(toTz), timeZone);
 
     return convertTZResult;
   }
@@ -761,7 +1549,7 @@ private ExprValue exprDayName(ExprValue date) {
   /**
    * Day of Month implementation for ExprValue.
    *
-   * @param date ExprValue of Date/String type.
+   * @param date ExprValue of Date/Datetime/String/Time/Timestamp type.
    * @return ExprValue.
    */
   private ExprValue exprDayOfMonth(ExprValue date) {
@@ -771,7 +1559,7 @@ private ExprValue exprDayOfMonth(ExprValue date) {
   /**
    * Day of Week implementation for ExprValue.
    *
-   * @param date ExprValue of Date/String type.
+   * @param date ExprValue of Date/Datetime/String/Timstamp type.
    * @return ExprValue.
    */
   private ExprValue exprDayOfWeek(ExprValue date) {
@@ -788,6 +1576,46 @@ private ExprValue exprDayOfYear(ExprValue date) {
     return new ExprIntegerValue(date.dateValue().getDayOfYear());
   }
 
+  /**
+   * Obtains a formatted long value for a specified part and datetime for the 'extract' function.
+   *
+   * @param part is an ExprValue which comes from a defined list of accepted values.
+   * @param datetime the date to be formatted as an ExprValue.
+   * @return is a LONG formatted according to the input arguments.
+   */
+  public ExprLongValue formatExtractFunction(ExprValue part, ExprValue datetime) {
+    String partName = part.stringValue().toUpperCase();
+    LocalDateTime arg = datetime.datetimeValue();
+    String text =
+        arg.format(DateTimeFormatter.ofPattern(extract_formats.get(partName), Locale.ENGLISH));
+
+    return new ExprLongValue(Long.parseLong(text));
+  }
+
+  /**
+   * Implements extract function. Returns a LONG formatted according to the 'part' argument.
+   *
+   * @param part Literal that determines the format of the outputted LONG.
+   * @param datetime The date/datetime to be formatted.
+   * @return A LONG
+   */
+  private ExprValue exprExtract(ExprValue part, ExprValue datetime) {
+    return formatExtractFunction(part, datetime);
+  }
+
+  /**
+   * Implements extract function. Returns a LONG formatted according to the 'part' argument.
+   *
+   * @param part Literal that determines the format of the outputted LONG.
+   * @param time The time to be formatted.
+   * @return A LONG
+   */
+  private ExprValue exprExtractForTime(
+      FunctionProperties functionProperties, ExprValue part, ExprValue time) {
+    return formatExtractFunction(
+        part, new ExprDatetimeValue(extractDateTime(time, functionProperties)));
+  }
+
   /**
    * From_days implementation for ExprValue.
    *
@@ -814,9 +1642,8 @@ private ExprValue exprFromUnixTime(ExprValue time) {
 
   private LocalDateTime exprFromUnixTimeImpl(ExprValue time) {
     return LocalDateTime.ofInstant(
-            Instant.ofEpochSecond((long)Math.floor(time.doubleValue())),
-            ZoneId.of("UTC"))
-        .withNano((int)((time.doubleValue() % 1) * 1E9));
+            Instant.ofEpochSecond((long) Math.floor(time.doubleValue())), UTC_ZONE_ID)
+        .withNano((int) ((time.doubleValue() % 1) * 1E9));
   }
 
   private ExprValue exprFromUnixTimeFormat(ExprValue time, ExprValue format) {
@@ -827,6 +1654,22 @@ private ExprValue exprFromUnixTimeFormat(ExprValue time, ExprValue format) {
     return DateTimeFormatterUtil.getFormattedDate(value, format);
   }
 
+  /**
+   * get_format implementation for ExprValue.
+   *
+   * @param type ExprValue of the type.
+   * @param format ExprValue of Time/String type
+   * @return ExprValue..
+   */
+  private ExprValue exprGetFormat(ExprValue type, ExprValue format) {
+    if (formats.contains(type.stringValue().toLowerCase(), format.stringValue().toLowerCase())) {
+      return new ExprStringValue(
+          formats.get(type.stringValue().toLowerCase(), format.stringValue().toLowerCase()));
+    }
+
+    return ExprNullValue.of();
+  }
+
   /**
    * Hour implementation for ExprValue.
    *
@@ -834,16 +1677,50 @@ private ExprValue exprFromUnixTimeFormat(ExprValue time, ExprValue format) {
    * @return ExprValue.
    */
   private ExprValue exprHour(ExprValue time) {
-    return new ExprIntegerValue(time.timeValue().getHour());
+    return new ExprIntegerValue(HOURS.between(LocalTime.MIN, time.timeValue()));
+  }
+
+  /**
+   * Helper function to retrieve the last day of a month based on a LocalDate argument.
+   *
+   * @param today a LocalDate.
+   * @return a LocalDate associated with the last day of the month for the given input.
+   */
+  private LocalDate getLastDay(LocalDate today) {
+    return LocalDate.of(
+        today.getYear(), today.getMonth(), today.getMonth().length(today.isLeapYear()));
   }
 
   /**
-   * Following MySQL, function receives arguments of type double and rounds them before use.
-   * Furthermore:
-   *  - zero year interpreted as 2000
-   *  - negative year is not accepted
-   *  - @dayOfYear should be greater than 1
-   *  - if @dayOfYear is greater than 365/366, calculation goes to the next year(s)
+   * Returns a DATE for the last day of the month of a given argument.
+   *
+   * @param datetime A DATE/DATETIME/TIMESTAMP/STRING ExprValue.
+   * @return An DATE value corresponding to the last day of the month of the given argument.
+   */
+  private ExprValue exprLastDay(ExprValue datetime) {
+    return new ExprDateValue(getLastDay(datetime.dateValue()));
+  }
+
+  /**
+   * Returns a DATE for the last day of the current month.
+   *
+   * @param clock The clock for the query start time from functionProperties.
+   * @return An DATE value corresponding to the last day of the month of the given argument.
+   */
+  private ExprValue exprLastDayToday(Clock clock) {
+    return new ExprDateValue(getLastDay(formatNow(clock).toLocalDate()));
+  }
+
+  /**
+   * Following MySQL, function receives arguments of type double and rounds them before use.<br>
+   * Furthermore:<br>
+   *
+   * <ul>
+   *   <li>zero year interpreted as 2000
+   *   <li>negative year is not accepted
+   *   <li>@dayOfYear should be greater than 1
+   *   <li>if @dayOfYear is greater than 365/366, calculation goes to the next year(s)
+   * </ul>
    *
    * @param yearExpr year
    * @param dayOfYearExp day of the @year, starting from 1
@@ -859,12 +1736,13 @@ private ExprValue exprMakeDate(ExprValue yearExpr, ExprValue dayOfYearExp) {
     if (0 == year) {
       year = 2000;
     }
-    return new ExprDateValue(LocalDate.ofYearDay((int)year, 1).plusDays(dayOfYear - 1));
+    return new ExprDateValue(LocalDate.ofYearDay((int) year, 1).plusDays(dayOfYear - 1));
   }
 
   /**
    * Following MySQL, function receives arguments of type double. @hour and @minute are rounded,
    * while @second used as is, including fraction part.
+   *
    * @param hourExpr hour
    * @param minuteExpr minute
    * @param secondExpr second
@@ -877,8 +1755,9 @@ private ExprValue exprMakeTime(ExprValue hourExpr, ExprValue minuteExpr, ExprVal
     if (0 > hour || 0 > minute || 0 > second) {
       return ExprNullValue.of();
     }
-    return new ExprTimeValue(LocalTime.parse(String.format("%02d:%02d:%012.9f",
-        hour, minute, second), DateTimeFormatter.ISO_TIME));
+    return new ExprTimeValue(
+        LocalTime.parse(
+            String.format("%02d:%02d:%012.9f", hour, minute, second), DateTimeFormatter.ISO_TIME));
   }
 
   /**
@@ -899,7 +1778,17 @@ private ExprValue exprMicrosecond(ExprValue time) {
    * @return ExprValue.
    */
   private ExprValue exprMinute(ExprValue time) {
-    return new ExprIntegerValue(time.timeValue().getMinute());
+    return new ExprIntegerValue((MINUTES.between(LocalTime.MIN, time.timeValue()) % 60));
+  }
+
+  /**
+   * Minute_of_day implementation for ExprValue.
+   *
+   * @param time ExprValue of Time/String type.
+   * @return ExprValue.
+   */
+  private ExprValue exprMinuteOfDay(ExprValue time) {
+    return new ExprIntegerValue(MINUTES.between(LocalTime.MIN, time.timeValue()));
   }
 
   /**
@@ -942,8 +1831,7 @@ private LocalDate parseDatePeriod(Integer period) {
   }
 
   /**
-   * Adds N months to period P (in the format YYMM or YYYYMM).
-   * Returns a value in the format YYYYMM.
+   * Adds N months to period P (in the format YYMM or YYYYMM). Returns a value in the format YYYYMM.
    *
    * @param period Period in the format YYMM or YYYYMM.
    * @param months Amount of months to add.
@@ -951,19 +1839,20 @@ private LocalDate parseDatePeriod(Integer period) {
    */
   private ExprValue exprPeriodAdd(ExprValue period, ExprValue months) {
     // We should add a day to make string parsable and remove it afterwards
-    var input =  period.integerValue() * 100 + 1; // adds 01 to end of the string
+    var input = period.integerValue() * 100 + 1; // adds 01 to end of the string
     var parsedDate = parseDatePeriod(input);
     if (parsedDate == null) {
       return ExprNullValue.of();
     }
     var res = DATE_FORMATTER_LONG_YEAR.format(parsedDate.plusMonths(months.integerValue()));
-    return new ExprIntegerValue(Integer.parseInt(
-        res.substring(0, res.length() - 2))); // Remove the day part, .eg. 20070101 -> 200701
+    return new ExprIntegerValue(
+        Integer.parseInt(
+            res.substring(0, res.length() - 2))); // Remove the day part, .eg. 20070101 -> 200701
   }
 
   /**
-   * Returns the number of months between periods P1 and P2.
-   * P1 and P2 should be in the format YYMM or YYYYMM.
+   * Returns the number of months between periods P1 and P2. P1 and P2 should be in the format YYMM
+   * or YYYYMM.
    *
    * @param period1 Period in the format YYMM or YYYYMM.
    * @param period2 Period in the format YYMM or YYYYMM.
@@ -989,6 +1878,46 @@ private ExprValue exprQuarter(ExprValue date) {
     return new ExprIntegerValue((month / 3) + ((month % 3) == 0 ? 0 : 1));
   }
 
+  /**
+   * Returns TIME value of sec_to_time function for an INTEGER or LONG arguments.
+   *
+   * @param totalSeconds The total number of seconds
+   * @return A TIME value
+   */
+  private ExprValue exprSecToTime(ExprValue totalSeconds) {
+    return new ExprTimeValue(LocalTime.MIN.plus(Duration.ofSeconds(totalSeconds.longValue())));
+  }
+
+  /**
+   * Helper function which obtains the decimal portion of the seconds value passed in. Uses
+   * BigDecimal to prevent issues with math on floating point numbers. Return is formatted to be
+   * used with Duration.ofSeconds();
+   *
+   * @param seconds and ExprDoubleValue or ExprFloatValue for the seconds
+   * @return A LONG representing the nanoseconds portion
+   */
+  private long formatNanos(ExprValue seconds) {
+    // Convert ExprValue to BigDecimal
+    BigDecimal formattedNanos = BigDecimal.valueOf(seconds.doubleValue());
+    // Extract only the nanosecond part
+    formattedNanos = formattedNanos.subtract(BigDecimal.valueOf(formattedNanos.intValue()));
+
+    return formattedNanos.scaleByPowerOfTen(9).longValue();
+  }
+
+  /**
+   * Returns TIME value of sec_to_time function for FLOAT or DOUBLE arguments.
+   *
+   * @param totalSeconds The total number of seconds
+   * @return A TIME value
+   */
+  private ExprValue exprSecToTimeWithNanos(ExprValue totalSeconds) {
+    long nanos = formatNanos(totalSeconds);
+
+    return new ExprTimeValue(
+        LocalTime.MIN.plus(Duration.ofSeconds(totalSeconds.longValue(), nanos)));
+  }
+
   /**
    * Second implementation for ExprValue.
    *
@@ -996,33 +1925,50 @@ private ExprValue exprQuarter(ExprValue date) {
    * @return ExprValue.
    */
   private ExprValue exprSecond(ExprValue time) {
-    return new ExprIntegerValue(time.timeValue().getSecond());
+    return new ExprIntegerValue((SECONDS.between(LocalTime.MIN, time.timeValue()) % 60));
   }
 
   /**
    * SUBDATE function implementation for ExprValue.
    *
-   * @param date ExprValue of String/Date/Datetime/Timestamp type.
+   * @param functionProperties An FunctionProperties object.
+   * @param date ExprValue of Time/Date/Datetime/Timestamp type.
    * @param days ExprValue of Long type, representing the number of days to subtract.
    * @return Date/Datetime resulted from days subtracted to date.
    */
-  private ExprValue exprSubDateDays(ExprValue date, ExprValue days) {
-    ExprValue exprValue = new ExprDatetimeValue(date.datetimeValue().minusDays(days.longValue()));
-    return (exprValue.timeValue().toSecondOfDay() == 0 ? new ExprDateValue(exprValue.dateValue())
-        : exprValue);
+  private ExprValue exprSubDateDays(
+      FunctionProperties functionProperties, ExprValue date, ExprValue days) {
+    return exprDateApplyDays(functionProperties, date, days.longValue(), false);
   }
 
   /**
-   * SUBDATE function implementation for ExprValue.
+   * DATE_SUB function implementation for ExprValue.
    *
-   * @param date ExprValue of String/Date/Datetime/Timestamp type.
+   * @param functionProperties An FunctionProperties object.
+   * @param datetime ExprValue of Time/Date/Datetime/Timestamp type.
    * @param expr ExprValue of Interval type, the temporal amount to subtract.
-   * @return Datetime resulted from expr subtracted to date.
+   * @return Datetime resulted from expr subtracted to `datetime`.
+   */
+  private ExprValue exprSubDateInterval(
+      FunctionProperties functionProperties, ExprValue datetime, ExprValue expr) {
+    return exprDateApplyInterval(functionProperties, datetime, expr.intervalValue(), false);
+  }
+
+  /**
+   * Subtracts expr2 from expr1 and returns the result.
+   *
+   * @param temporal A Date/Time/Datetime/Timestamp value to change.
+   * @param temporalDelta A Date/Time/Datetime/Timestamp to subtract time from.
+   * @return A value calculated.
    */
-  private ExprValue exprSubDateInterval(ExprValue date, ExprValue expr) {
-    ExprValue exprValue = new ExprDatetimeValue(date.datetimeValue().minus(expr.intervalValue()));
-    return (exprValue.timeValue().toSecondOfDay() == 0 ? new ExprDateValue(exprValue.dateValue())
-        : exprValue);
+  private ExprValue exprSubTime(
+      FunctionProperties functionProperties, ExprValue temporal, ExprValue temporalDelta) {
+    return exprApplyTime(functionProperties, temporal, temporalDelta, false);
+  }
+
+  private ExprValue exprStrToDate(
+      FunctionProperties fp, ExprValue dateTimeExpr, ExprValue formatStringExp) {
+    return DateTimeFormatterUtil.parseStringWithDateOrTime(fp, dateTimeExpr, formatStringExp);
   }
 
   /**
@@ -1040,17 +1986,16 @@ private ExprValue exprTime(ExprValue exprValue) {
   }
 
   /**
-   * Timestamp implementation for ExprValue.
+   * Calculate the time difference between two times.
    *
-   * @param exprValue ExprValue of Timestamp type or String type.
-   * @return ExprValue.
+   * @param first The first value.
+   * @param second The second value.
+   * @return The diff.
    */
-  private ExprValue exprTimestamp(ExprValue exprValue) {
-    if (exprValue instanceof ExprStringValue) {
-      return new ExprTimestampValue(exprValue.stringValue());
-    } else {
-      return new ExprTimestampValue(exprValue.timestampValue());
-    }
+  private ExprValue exprTimeDiff(ExprValue first, ExprValue second) {
+    // java inverses the value, so we have to swap 1 and 2
+    return new ExprTimeValue(
+        LocalTime.MIN.plus(Duration.between(second.timeValue(), first.timeValue())));
   }
 
   /**
@@ -1063,6 +2008,136 @@ private ExprValue exprTimeToSec(ExprValue time) {
     return new ExprLongValue(time.timeValue().toSecondOfDay());
   }
 
+  private ExprValue exprTimestampAdd(
+      ExprValue partExpr, ExprValue amountExpr, ExprValue datetimeExpr) {
+    String part = partExpr.stringValue();
+    int amount = amountExpr.integerValue();
+    LocalDateTime datetime = datetimeExpr.datetimeValue();
+    ChronoUnit temporalUnit;
+
+    switch (part) {
+      case "MICROSECOND":
+        temporalUnit = MICROS;
+        break;
+      case "SECOND":
+        temporalUnit = SECONDS;
+        break;
+      case "MINUTE":
+        temporalUnit = MINUTES;
+        break;
+      case "HOUR":
+        temporalUnit = HOURS;
+        break;
+      case "DAY":
+        temporalUnit = DAYS;
+        break;
+      case "WEEK":
+        temporalUnit = WEEKS;
+        break;
+      case "MONTH":
+        temporalUnit = MONTHS;
+        break;
+      case "QUARTER":
+        temporalUnit = MONTHS;
+        amount *= 3;
+        break;
+      case "YEAR":
+        temporalUnit = YEARS;
+        break;
+      default:
+        return ExprNullValue.of();
+    }
+    return new ExprDatetimeValue(datetime.plus(amount, temporalUnit));
+  }
+
+  private ExprValue exprTimestampAddForTimeType(
+      Clock clock, ExprValue partExpr, ExprValue amountExpr, ExprValue timeExpr) {
+    LocalDateTime datetime = LocalDateTime.of(formatNow(clock).toLocalDate(), timeExpr.timeValue());
+    return exprTimestampAdd(partExpr, amountExpr, new ExprDatetimeValue(datetime));
+  }
+
+  private ExprValue getTimeDifference(String part, LocalDateTime startTime, LocalDateTime endTime) {
+    long returnVal;
+    switch (part) {
+      case "MICROSECOND":
+        returnVal = MICROS.between(startTime, endTime);
+        break;
+      case "SECOND":
+        returnVal = SECONDS.between(startTime, endTime);
+        break;
+      case "MINUTE":
+        returnVal = MINUTES.between(startTime, endTime);
+        break;
+      case "HOUR":
+        returnVal = HOURS.between(startTime, endTime);
+        break;
+      case "DAY":
+        returnVal = DAYS.between(startTime, endTime);
+        break;
+      case "WEEK":
+        returnVal = WEEKS.between(startTime, endTime);
+        break;
+      case "MONTH":
+        returnVal = MONTHS.between(startTime, endTime);
+        break;
+      case "QUARTER":
+        returnVal = MONTHS.between(startTime, endTime) / 3;
+        break;
+      case "YEAR":
+        returnVal = YEARS.between(startTime, endTime);
+        break;
+      default:
+        return ExprNullValue.of();
+    }
+    return new ExprLongValue(returnVal);
+  }
+
+  private ExprValue exprTimestampDiff(
+      ExprValue partExpr, ExprValue startTimeExpr, ExprValue endTimeExpr) {
+    return getTimeDifference(
+        partExpr.stringValue(), startTimeExpr.datetimeValue(), endTimeExpr.datetimeValue());
+  }
+
+  private ExprValue exprTimestampDiffForTimeType(
+      FunctionProperties fp, ExprValue partExpr, ExprValue startTimeExpr, ExprValue endTimeExpr) {
+    return getTimeDifference(
+        partExpr.stringValue(),
+        extractDateTime(startTimeExpr, fp),
+        extractDateTime(endTimeExpr, fp));
+  }
+
+  /**
+   * UTC_DATE implementation for ExprValue.
+   *
+   * @param functionProperties FunctionProperties.
+   * @return ExprValue.
+   */
+  private ExprValue exprUtcDate(FunctionProperties functionProperties) {
+    return new ExprDateValue(exprUtcTimeStamp(functionProperties).dateValue());
+  }
+
+  /**
+   * UTC_TIME implementation for ExprValue.
+   *
+   * @param functionProperties FunctionProperties.
+   * @return ExprValue.
+   */
+  private ExprValue exprUtcTime(FunctionProperties functionProperties) {
+    return new ExprTimeValue(exprUtcTimeStamp(functionProperties).timeValue());
+  }
+
+  /**
+   * UTC_TIMESTAMP implementation for ExprValue.
+   *
+   * @param functionProperties FunctionProperties.
+   * @return ExprValue.
+   */
+  private ExprValue exprUtcTimeStamp(FunctionProperties functionProperties) {
+    var zdt =
+        ZonedDateTime.now(functionProperties.getQueryStartClock()).withZoneSameInstant(UTC_ZONE_ID);
+    return new ExprDatetimeValue(zdt.toLocalDateTime());
+  }
+
   /**
    * To_days implementation for ExprValue.
    *
@@ -1073,6 +2148,81 @@ private ExprValue exprToDays(ExprValue date) {
     return new ExprLongValue(date.dateValue().toEpochDay() + DAYS_0000_TO_1970);
   }
 
+  /**
+   * To_seconds implementation for ExprValue.
+   *
+   * @param date ExprValue of Date/Datetime/Timestamp/String type.
+   * @return ExprValue.
+   */
+  private ExprValue exprToSeconds(ExprValue date) {
+    return new ExprLongValue(
+        date.datetimeValue().toEpochSecond(ZoneOffset.UTC) + DAYS_0000_TO_1970 * SECONDS_PER_DAY);
+  }
+
+  /**
+   * Helper function to determine the correct formatter for date arguments passed in as integers.
+   *
+   * @param dateAsInt is an integer formatted as one of YYYYMMDD, YYMMDD, YMMDD, MMDD, MDD
+   * @return is a DateTimeFormatter that can parse the input.
+   */
+  private DateTimeFormatter getFormatter(int dateAsInt) {
+    int length = String.format("%d", dateAsInt).length();
+
+    if (length > 8) {
+      throw new DateTimeException("Integer argument was out of range");
+    }
+
+    // Check below from YYYYMMDD - MMDD which format should be used
+    switch (length) {
+        // Check if dateAsInt is at least 8 digits long
+      case FULL_DATE_LENGTH:
+        return DATE_FORMATTER_LONG_YEAR;
+
+        // Check if dateAsInt is at least 6 digits long
+      case SHORT_DATE_LENGTH:
+        return DATE_FORMATTER_SHORT_YEAR;
+
+        // Check if dateAsInt is at least 5 digits long
+      case SINGLE_DIGIT_YEAR_DATE_LENGTH:
+        return DATE_FORMATTER_SINGLE_DIGIT_YEAR;
+
+        // Check if dateAsInt is at least 4 digits long
+      case NO_YEAR_DATE_LENGTH:
+        return DATE_FORMATTER_NO_YEAR;
+
+        // Check if dateAsInt is at least 3 digits long
+      case SINGLE_DIGIT_MONTH_DATE_LENGTH:
+        return DATE_FORMATTER_SINGLE_DIGIT_MONTH;
+
+      default:
+        break;
+    }
+
+    throw new DateTimeException("No Matching Format");
+  }
+
+  /**
+   * To_seconds implementation with an integer argument for ExprValue.
+   *
+   * @param dateExpr ExprValue of an Integer/Long formatted for a date (e.g., 950501 = 1995-05-01)
+   * @return ExprValue.
+   */
+  private ExprValue exprToSecondsForIntType(ExprValue dateExpr) {
+    try {
+      // Attempt to parse integer argument as date
+      LocalDate date =
+          LocalDate.parse(
+              String.valueOf(dateExpr.integerValue()), getFormatter(dateExpr.integerValue()));
+
+      return new ExprLongValue(
+          date.toEpochSecond(LocalTime.MIN, ZoneOffset.UTC) + DAYS_0000_TO_1970 * SECONDS_PER_DAY);
+
+    } catch (DateTimeException ignored) {
+      // Return null if parsing error
+      return ExprNullValue.of();
+    }
+  }
+
   /**
    * Week for date implementation for ExprValue.
    *
@@ -1084,6 +2234,16 @@ private ExprValue exprWeek(ExprValue date, ExprValue mode) {
         CalendarLookup.getWeekNumber(mode.integerValue(), date.dateValue()));
   }
 
+  /**
+   * Weekday implementation for ExprValue.
+   *
+   * @param date ExprValue of Date/Datetime/String/Timstamp type.
+   * @return ExprValue.
+   */
+  private ExprValue exprWeekday(ExprValue date) {
+    return new ExprIntegerValue(date.dateValue().getDayOfWeek().getValue() - 1);
+  }
+
   private ExprValue unixTimeStamp(Clock clock) {
     return new ExprLongValue(Instant.now(clock).getEpochSecond());
   }
@@ -1107,12 +2267,14 @@ private ExprValue unixTimeStampOf(ExprValue value) {
   private Double unixTimeStampOfImpl(ExprValue value) {
     // Also, according to MySQL documentation:
     //    The date argument may be a DATE, DATETIME, or TIMESTAMP ...
-    switch ((ExprCoreType)value.type()) {
-      case DATE: return value.dateValue().toEpochSecond(LocalTime.MIN, ZoneOffset.UTC) + 0d;
-      case DATETIME: return value.datetimeValue().toEpochSecond(ZoneOffset.UTC)
-          + value.datetimeValue().getNano() / 1E9;
-      case TIMESTAMP: return value.timestampValue().getEpochSecond()
-          + value.timestampValue().getNano() / 1E9;
+    switch ((ExprCoreType) value.type()) {
+      case DATE:
+        return value.dateValue().toEpochSecond(LocalTime.MIN, ZoneOffset.UTC) + 0d;
+      case DATETIME:
+        return value.datetimeValue().toEpochSecond(ZoneOffset.UTC)
+            + value.datetimeValue().getNano() / 1E9;
+      case TIMESTAMP:
+        return value.timestampValue().getEpochSecond() + value.timestampValue().getNano() / 1E9;
       default:
         //     ... or a number in YYMMDD, YYMMDDhhmmss, YYYYMMDD, or YYYYMMDDhhmmss format.
         //     If the argument includes a time part, it may optionally include a fractional
@@ -1158,14 +2320,14 @@ private Double unixTimeStampOfImpl(ExprValue value) {
   }
 
   /**
-   * Week for date implementation for ExprValue.
-   * When mode is not specified default value mode 0 is used for default_week_format.
+   * Week for date implementation for ExprValue. When mode is not specified default value mode 0 is
+   * used for default_week_format.
    *
    * @param date ExprValue of Date/Datetime/Timestamp/String type.
    * @return ExprValue.
    */
   private ExprValue exprWeekWithoutMode(ExprValue date) {
-    return exprWeek(date, new ExprIntegerValue(0));
+    return exprWeek(date, DEFAULT_WEEK_OF_YEAR_MODE);
   }
 
   /**
@@ -1178,25 +2340,77 @@ private ExprValue exprYear(ExprValue date) {
     return new ExprIntegerValue(date.dateValue().getYear());
   }
 
+  /**
+   * Helper function to extract the yearweek output from a given date.
+   *
+   * @param date is a LocalDate input argument.
+   * @param mode is an integer containing the mode used to parse the LocalDate.
+   * @return is a long containing the formatted output for the yearweek function.
+   */
+  private ExprIntegerValue extractYearweek(LocalDate date, int mode) {
+    // Needed to align with MySQL. Due to how modes for this function work.
+    // See description of modes here ...
+    // https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html#function_week
+    int modeJava = CalendarLookup.getWeekNumber(mode, date) != 0 ? mode : mode <= 4 ? 2 : 7;
+
+    int formatted =
+        CalendarLookup.getYearNumber(modeJava, date) * 100
+            + CalendarLookup.getWeekNumber(modeJava, date);
+
+    return new ExprIntegerValue(formatted);
+  }
+
+  /**
+   * Yearweek for date implementation for ExprValue.
+   *
+   * @param date ExprValue of Date/Datetime/Time/Timestamp/String type.
+   * @param mode ExprValue of Integer type.
+   */
+  private ExprValue exprYearweek(ExprValue date, ExprValue mode) {
+    return extractYearweek(date.dateValue(), mode.integerValue());
+  }
+
+  /**
+   * Yearweek for date implementation for ExprValue. When mode is not specified default value mode 0
+   * is used.
+   *
+   * @param date ExprValue of Date/Datetime/Time/Timestamp/String type.
+   * @return ExprValue.
+   */
+  private ExprValue exprYearweekWithoutMode(ExprValue date) {
+    return exprYearweek(date, new ExprIntegerValue(0));
+  }
+
+  private ExprValue yearweekToday(ExprValue mode, Clock clock) {
+    return extractYearweek(LocalDateTime.now(clock).toLocalDate(), mode.integerValue());
+  }
+
+  private ExprValue monthOfYearToday(Clock clock) {
+    return new ExprIntegerValue(LocalDateTime.now(clock).getMonthValue());
+  }
+
   private LocalDateTime formatNow(Clock clock) {
     return formatNow(clock, 0);
   }
 
   /**
    * Prepare LocalDateTime value. Truncate fractional second part according to the argument.
-   * @param fsp argument is given to specify a fractional seconds precision from 0 to 6,
-   *            the return value includes a fractional seconds part of that many digits.
+   *
+   * @param fsp argument is given to specify a fractional seconds precision from 0 to 6, the return
+   *     value includes a fractional seconds part of that many digits.
    * @return LocalDateTime object.
    */
-  private LocalDateTime formatNow(Clock clock,  Integer fsp) {
+  private LocalDateTime formatNow(Clock clock, Integer fsp) {
     var res = LocalDateTime.now(clock);
     var defaultPrecision = 9; // There are 10^9 nanoseconds in one second
     if (fsp < 0 || fsp > 6) { // Check that the argument is in the allowed range [0, 6]
       throw new IllegalArgumentException(
           String.format("Invalid `fsp` value: %d, allowed 0 to 6", fsp));
     }
-    var nano = new BigDecimal(res.getNano())
-        .setScale(fsp - defaultPrecision, RoundingMode.DOWN).intValue();
+    var nano =
+        new BigDecimal(res.getNano())
+            .setScale(fsp - defaultPrecision, RoundingMode.DOWN)
+            .intValue();
     return res.withNano(nano);
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/datetime/IntervalClause.java b/core/src/main/java/org/opensearch/sql/expression/datetime/IntervalClause.java
index c5076431cc..5170d49fc7 100644
--- a/core/src/main/java/org/opensearch/sql/expression/datetime/IntervalClause.java
+++ b/core/src/main/java/org/opensearch/sql/expression/datetime/IntervalClause.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.datetime;
 
 import static org.opensearch.sql.data.model.ExprValueUtils.getIntegerValue;
@@ -45,7 +44,8 @@ public void register(BuiltinFunctionRepository repository) {
   }
 
   private DefaultFunctionResolver interval() {
-    return define(BuiltinFunctionName.INTERVAL.getName(),
+    return define(
+        BuiltinFunctionName.INTERVAL.getName(),
         impl(nullMissingHandling(IntervalClause::interval), INTERVAL, INTEGER, STRING),
         impl(nullMissingHandling(IntervalClause::interval), INTERVAL, LONG, STRING));
   }
@@ -93,7 +93,7 @@ private ExprValue hour(ExprValue value) {
   }
 
   private ExprValue day(ExprValue value) {
-    return new ExprIntervalValue(Duration.ofDays(getIntegerValue(value)));
+    return new ExprIntervalValue(Period.ofDays(getIntegerValue(value)));
   }
 
   private ExprValue week(ExprValue value) {
diff --git a/core/src/main/java/org/opensearch/sql/expression/env/Environment.java b/core/src/main/java/org/opensearch/sql/expression/env/Environment.java
index d96d0c0a50..b1377f22ae 100644
--- a/core/src/main/java/org/opensearch/sql/expression/env/Environment.java
+++ b/core/src/main/java/org/opensearch/sql/expression/env/Environment.java
@@ -3,33 +3,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.env;
 
 /**
  * The definition of the environment.
- * @param <E>  the type of expression
+ *
+ * @param <E> the type of expression
  * @param <V> the type of expression value
  */
 public interface Environment<E, V> {
 
-  /**
-   * resolve the value of expression from the environment.
-   */
+  /** resolve the value of expression from the environment. */
   V resolve(E var);
 
   /**
    * Extend the environment.
    *
-   * @param env     environment
-   * @param expr    expression.
-   * @param value   expression value.
-   * @param <E>  the type of expression
+   * @param env environment
+   * @param expr expression.
+   * @param value expression value.
+   * @param <E> the type of expression
    * @param <V> the type of expression value
    * @return extended environment.
    */
-  static <E, V> Environment<E, V> extendEnv(
-      Environment<E, V> env, E expr, V value) {
+  static <E, V> Environment<E, V> extendEnv(Environment<E, V> env, E expr, V value) {
     return var -> {
       if (var.equals(expr)) {
         return value;
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionName.java b/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionName.java
index b23c7613d6..fd5ea14a2e 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionName.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionName.java
@@ -12,15 +12,11 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-/**
- * Builtin Function Name.
- */
+/** Builtin Function Name. */
 @Getter
 @RequiredArgsConstructor
 public enum BuiltinFunctionName {
-  /**
-   * Mathematical Functions.
-   */
+  /** Mathematical Functions. */
   ABS(FunctionName.of("abs")),
   CEIL(FunctionName.of("ceil")),
   CEILING(FunctionName.of("ceiling")),
@@ -28,18 +24,21 @@ public enum BuiltinFunctionName {
   CRC32(FunctionName.of("crc32")),
   E(FunctionName.of("e")),
   EXP(FunctionName.of("exp")),
+  EXPM1(FunctionName.of("expm1")),
   FLOOR(FunctionName.of("floor")),
   LN(FunctionName.of("ln")),
   LOG(FunctionName.of("log")),
   LOG10(FunctionName.of("log10")),
   LOG2(FunctionName.of("log2")),
-  MOD(FunctionName.of("mod")),
   PI(FunctionName.of("pi")),
   POW(FunctionName.of("pow")),
   POWER(FunctionName.of("power")),
   RAND(FunctionName.of("rand")),
+  RINT(FunctionName.of("rint")),
   ROUND(FunctionName.of("round")),
   SIGN(FunctionName.of("sign")),
+  SIGNUM(FunctionName.of("signum")),
+  SINH(FunctionName.of("sinh")),
   SQRT(FunctionName.of("sqrt")),
   CBRT(FunctionName.of("cbrt")),
   TRUNCATE(FunctionName.of("truncate")),
@@ -49,51 +48,76 @@ public enum BuiltinFunctionName {
   ATAN(FunctionName.of("atan")),
   ATAN2(FunctionName.of("atan2")),
   COS(FunctionName.of("cos")),
+  COSH(FunctionName.of("cosh")),
   COT(FunctionName.of("cot")),
   DEGREES(FunctionName.of("degrees")),
   RADIANS(FunctionName.of("radians")),
   SIN(FunctionName.of("sin")),
   TAN(FunctionName.of("tan")),
 
-  /**
-   * Date and Time Functions.
-   */
+  /** Date and Time Functions. */
   ADDDATE(FunctionName.of("adddate")),
+  ADDTIME(FunctionName.of("addtime")),
   CONVERT_TZ(FunctionName.of("convert_tz")),
   DATE(FunctionName.of("date")),
+  DATEDIFF(FunctionName.of("datediff")),
   DATETIME(FunctionName.of("datetime")),
   DATE_ADD(FunctionName.of("date_add")),
+  DATE_FORMAT(FunctionName.of("date_format")),
   DATE_SUB(FunctionName.of("date_sub")),
   DAY(FunctionName.of("day")),
   DAYNAME(FunctionName.of("dayname")),
   DAYOFMONTH(FunctionName.of("dayofmonth")),
+  DAY_OF_MONTH(FunctionName.of("day_of_month")),
   DAYOFWEEK(FunctionName.of("dayofweek")),
   DAYOFYEAR(FunctionName.of("dayofyear")),
+  DAY_OF_WEEK(FunctionName.of("day_of_week")),
   DAY_OF_YEAR(FunctionName.of("day_of_year")),
+  EXTRACT(FunctionName.of("extract")),
   FROM_DAYS(FunctionName.of("from_days")),
   FROM_UNIXTIME(FunctionName.of("from_unixtime")),
+  GET_FORMAT(FunctionName.of("get_format")),
   HOUR(FunctionName.of("hour")),
+  HOUR_OF_DAY(FunctionName.of("hour_of_day")),
+  LAST_DAY(FunctionName.of("last_day")),
   MAKEDATE(FunctionName.of("makedate")),
   MAKETIME(FunctionName.of("maketime")),
   MICROSECOND(FunctionName.of("microsecond")),
   MINUTE(FunctionName.of("minute")),
+  MINUTE_OF_DAY(FunctionName.of("minute_of_day")),
+  MINUTE_OF_HOUR(FunctionName.of("minute_of_hour")),
   MONTH(FunctionName.of("month")),
   MONTH_OF_YEAR(FunctionName.of("month_of_year")),
   MONTHNAME(FunctionName.of("monthname")),
   PERIOD_ADD(FunctionName.of("period_add")),
   PERIOD_DIFF(FunctionName.of("period_diff")),
   QUARTER(FunctionName.of("quarter")),
+  SEC_TO_TIME(FunctionName.of("sec_to_time")),
   SECOND(FunctionName.of("second")),
+  SECOND_OF_MINUTE(FunctionName.of("second_of_minute")),
+  STR_TO_DATE(FunctionName.of("str_to_date")),
   SUBDATE(FunctionName.of("subdate")),
+  SUBTIME(FunctionName.of("subtime")),
   TIME(FunctionName.of("time")),
+  TIMEDIFF(FunctionName.of("timediff")),
   TIME_TO_SEC(FunctionName.of("time_to_sec")),
   TIMESTAMP(FunctionName.of("timestamp")),
-  DATE_FORMAT(FunctionName.of("date_format")),
+  TIMESTAMPADD(FunctionName.of("timestampadd")),
+  TIMESTAMPDIFF(FunctionName.of("timestampdiff")),
+  TIME_FORMAT(FunctionName.of("time_format")),
   TO_DAYS(FunctionName.of("to_days")),
+  TO_SECONDS(FunctionName.of("to_seconds")),
+  UTC_DATE(FunctionName.of("utc_date")),
+  UTC_TIME(FunctionName.of("utc_time")),
+  UTC_TIMESTAMP(FunctionName.of("utc_timestamp")),
   UNIX_TIMESTAMP(FunctionName.of("unix_timestamp")),
   WEEK(FunctionName.of("week")),
+  WEEKDAY(FunctionName.of("weekday")),
+  WEEKOFYEAR(FunctionName.of("weekofyear")),
   WEEK_OF_YEAR(FunctionName.of("week_of_year")),
   YEAR(FunctionName.of("year")),
+  YEARWEEK(FunctionName.of("yearweek")),
+
   // `now`-like functions
   NOW(FunctionName.of("now")),
   CURDATE(FunctionName.of("curdate")),
@@ -104,23 +128,24 @@ public enum BuiltinFunctionName {
   CURRENT_TIMESTAMP(FunctionName.of("current_timestamp")),
   LOCALTIMESTAMP(FunctionName.of("localtimestamp")),
   SYSDATE(FunctionName.of("sysdate")),
-  /**
-   * Text Functions.
-   */
+
+  /** Text Functions. */
   TOSTRING(FunctionName.of("tostring")),
 
-  /**
-   * Arithmetic Operators.
-   */
+  /** Arithmetic Operators. */
   ADD(FunctionName.of("+")),
-  SUBTRACT(FunctionName.of("-")),
-  MULTIPLY(FunctionName.of("*")),
+  ADDFUNCTION(FunctionName.of("add")),
   DIVIDE(FunctionName.of("/")),
-  MODULES(FunctionName.of("%")),
+  DIVIDEFUNCTION(FunctionName.of("divide")),
+  MOD(FunctionName.of("mod")),
+  MODULUS(FunctionName.of("%")),
+  MODULUSFUNCTION(FunctionName.of("modulus")),
+  MULTIPLY(FunctionName.of("*")),
+  MULTIPLYFUNCTION(FunctionName.of("multiply")),
+  SUBTRACT(FunctionName.of("-")),
+  SUBTRACTFUNCTION(FunctionName.of("subtract")),
 
-  /**
-   * Boolean Operators.
-   */
+  /** Boolean Operators. */
   AND(FunctionName.of("and")),
   OR(FunctionName.of("or")),
   XOR(FunctionName.of("xor")),
@@ -134,9 +159,7 @@ public enum BuiltinFunctionName {
   LIKE(FunctionName.of("like")),
   NOT_LIKE(FunctionName.of("not like")),
 
-  /**
-   * Aggregation Function.
-   */
+  /** Aggregation Function. */
   AVG(FunctionName.of("avg")),
   SUM(FunctionName.of("sum")),
   COUNT(FunctionName.of("count")),
@@ -152,10 +175,12 @@ public enum BuiltinFunctionName {
   STDDEV_POP(FunctionName.of("stddev_pop")),
   // take top documents from aggregation bucket.
   TAKE(FunctionName.of("take")),
+  // t-digest percentile which is used in OpenSearch core by default.
+  PERCENTILE_APPROX(FunctionName.of("percentile_approx")),
+  // Not always an aggregation query
+  NESTED(FunctionName.of("nested")),
 
-  /**
-   * Text Functions.
-   */
+  /** Text Functions. */
   ASCII(FunctionName.of("ascii")),
   CONCAT(FunctionName.of("concat")),
   CONCAT_WS(FunctionName.of("concat_ws")),
@@ -176,9 +201,7 @@ public enum BuiltinFunctionName {
   TRIM(FunctionName.of("trim")),
   UPPER(FunctionName.of("upper")),
 
-  /**
-   * NULL Test.
-   */
+  /** NULL Test. */
   IS_NULL(FunctionName.of("is null")),
   IS_NOT_NULL(FunctionName.of("is not null")),
   IFNULL(FunctionName.of("ifnull")),
@@ -192,9 +215,7 @@ public enum BuiltinFunctionName {
 
   INTERVAL(FunctionName.of("interval")),
 
-  /**
-   * Data Type Convert Function.
-   */
+  /** Data Type Convert Function. */
   CAST_TO_STRING(FunctionName.of("cast_to_string")),
   CAST_TO_BYTE(FunctionName.of("cast_to_byte")),
   CAST_TO_SHORT(FunctionName.of("cast_to_short")),
@@ -209,9 +230,7 @@ public enum BuiltinFunctionName {
   CAST_TO_DATETIME(FunctionName.of("cast_to_datetime")),
   TYPEOF(FunctionName.of("typeof")),
 
-  /**
-   * Relevance Function.
-   */
+  /** Relevance Function. */
   MATCH(FunctionName.of("match")),
   SIMPLE_QUERY_STRING(FunctionName.of("simple_query_string")),
   MATCH_PHRASE(FunctionName.of("match_phrase")),
@@ -221,9 +240,11 @@ public enum BuiltinFunctionName {
   MATCH_BOOL_PREFIX(FunctionName.of("match_bool_prefix")),
   HIGHLIGHT(FunctionName.of("highlight")),
   MATCH_PHRASE_PREFIX(FunctionName.of("match_phrase_prefix")),
-  /**
-   * Legacy Relevance Function.
-   */
+  SCORE(FunctionName.of("score")),
+  SCOREQUERY(FunctionName.of("scorequery")),
+  SCORE_QUERY(FunctionName.of("score_query")),
+
+  /** Legacy Relevance Function. */
   QUERY(FunctionName.of("query")),
   MATCH_QUERY(FunctionName.of("match_query")),
   MATCHQUERY(FunctionName.of("matchquery")),
@@ -260,6 +281,8 @@ public enum BuiltinFunctionName {
           .put("stddev_pop", BuiltinFunctionName.STDDEV_POP)
           .put("stddev_samp", BuiltinFunctionName.STDDEV_SAMP)
           .put("take", BuiltinFunctionName.TAKE)
+          .put("percentile", BuiltinFunctionName.PERCENTILE_APPROX)
+          .put("percentile_approx", BuiltinFunctionName.PERCENTILE_APPROX)
           .build();
 
   public static Optional<BuiltinFunctionName> of(String str) {
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionRepository.java b/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionRepository.java
index 71fd19991e..2e16d5f01f 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionRepository.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionRepository.java
@@ -10,9 +10,12 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.tuple.Pair;
@@ -32,17 +35,15 @@
 import org.opensearch.sql.expression.system.SystemFunctions;
 import org.opensearch.sql.expression.text.TextFunction;
 import org.opensearch.sql.expression.window.WindowFunctions;
+import org.opensearch.sql.storage.StorageEngine;
 
 /**
- * Builtin Function Repository.
- * Repository registers datasource specific functions under datasource namespace and
- * universal functions under default namespace.
- *
+ * Builtin Function Repository. Repository registers datasource specific functions under datasource
+ * namespace and universal functions under default namespace.
  */
 public class BuiltinFunctionRepository {
-  public static final String DEFAULT_NAMESPACE = "default";
 
-  private final Map<String, Map<FunctionName, FunctionResolver>> namespaceFunctionResolverMap;
+  private final Map<FunctionName, FunctionResolver> functionResolverMap;
 
   /** The singleton instance. */
   private static BuiltinFunctionRepository instance;
@@ -50,12 +51,11 @@ public class BuiltinFunctionRepository {
   /**
    * Construct a function repository with the given function registered. This is only used in test.
    *
-   * @param namespaceFunctionResolverMap function supported
+   * @param functionResolverMap function supported
    */
   @VisibleForTesting
-  BuiltinFunctionRepository(
-      Map<String, Map<FunctionName, FunctionResolver>> namespaceFunctionResolverMap) {
-    this.namespaceFunctionResolverMap = namespaceFunctionResolverMap;
+  BuiltinFunctionRepository(Map<FunctionName, FunctionResolver> functionResolverMap) {
+    this.functionResolverMap = functionResolverMap;
   }
 
   /**
@@ -86,115 +86,94 @@ public static synchronized BuiltinFunctionRepository getInstance() {
   }
 
   /**
-   * Register {@link DefaultFunctionResolver} to the Builtin Function Repository
-   * under default namespace.
+   * Register {@link DefaultFunctionResolver} to the Builtin Function Repository.
    *
    * @param resolver {@link DefaultFunctionResolver} to be registered
    */
   public void register(FunctionResolver resolver) {
-    register(DEFAULT_NAMESPACE, resolver);
+    functionResolverMap.put(resolver.getFunctionName(), resolver);
   }
 
-  /**
-   * Register {@link DefaultFunctionResolver} to the Builtin Function Repository with
-   * specified namespace.
-   *
-   * @param resolver {@link DefaultFunctionResolver} to be registered
-   */
-  public void register(String namespace, FunctionResolver resolver) {
-    Map<FunctionName, FunctionResolver> functionResolverMap;
-    if (!namespaceFunctionResolverMap.containsKey(namespace)) {
-      functionResolverMap = new HashMap<>();
-      namespaceFunctionResolverMap.put(namespace, functionResolverMap);
-    }
-    namespaceFunctionResolverMap.get(namespace).put(resolver.getFunctionName(), resolver);
-  }
-
-  /**
-   * Compile FunctionExpression under default namespace.
-   *
-   */
-  public FunctionImplementation compile(FunctionProperties functionProperties,
-                                        FunctionName functionName, List<Expression> expressions) {
-    return compile(functionProperties, DEFAULT_NAMESPACE, functionName, expressions);
+  /** Compile FunctionExpression using core function resolver. */
+  public FunctionImplementation compile(
+      FunctionProperties functionProperties,
+      FunctionName functionName,
+      List<Expression> expressions) {
+    return compile(functionProperties, Collections.emptyList(), functionName, expressions);
   }
 
-
-  /**
-   * Compile FunctionExpression within given namespace.
-   * Checks for default namespace first and then tries to compile from given namespace.
-   */
-  public FunctionImplementation compile(FunctionProperties functionProperties,
-                                        String namespace,
-                                        FunctionName functionName,
-                                        List<Expression> expressions) {
-    List<String> namespaceList = new ArrayList<>(List.of(DEFAULT_NAMESPACE));
-    if (!namespace.equals(DEFAULT_NAMESPACE)) {
-      namespaceList.add(namespace);
-    }
-    FunctionBuilder resolvedFunctionBuilder = resolve(
-        namespaceList, new FunctionSignature(functionName, expressions
-            .stream().map(Expression::type).collect(Collectors.toList())));
+  /** Compile FunctionExpression within {@link StorageEngine} provided {@link FunctionResolver}. */
+  public FunctionImplementation compile(
+      FunctionProperties functionProperties,
+      Collection<FunctionResolver> dataSourceFunctionResolver,
+      FunctionName functionName,
+      List<Expression> expressions) {
+    FunctionBuilder resolvedFunctionBuilder =
+        resolve(
+            dataSourceFunctionResolver,
+            new FunctionSignature(
+                functionName,
+                expressions.stream().map(Expression::type).collect(Collectors.toList())));
     return resolvedFunctionBuilder.apply(functionProperties, expressions);
   }
 
   /**
-   * Resolve the {@link FunctionBuilder} in
-   * repository under a list of namespaces.
-   * Returns the First FunctionBuilder found.
-   * So list of namespaces is also the priority of namespaces.
+   * Resolve the {@link FunctionBuilder} in repository under a list of namespaces. Returns the First
+   * FunctionBuilder found. So list of namespaces is also the priority of namespaces.
    *
    * @param functionSignature {@link FunctionSignature} functionsignature.
    * @return Original function builder if it's a cast function or all arguments have expected types
-   *      or otherwise wrap its arguments by cast function as needed.
+   *     or otherwise wrap its arguments by cast function as needed.
    */
-  public FunctionBuilder
-      resolve(List<String> namespaces,
-              FunctionSignature functionSignature) {
-    FunctionName functionName = functionSignature.getFunctionName();
-    FunctionBuilder result = null;
-    for (String namespace : namespaces) {
-      if (namespaceFunctionResolverMap.containsKey(namespace)
-          && namespaceFunctionResolverMap.get(namespace).containsKey(functionName)) {
-        result = getFunctionBuilder(functionSignature, functionName,
-            namespaceFunctionResolverMap.get(namespace));
-        break;
-      }
-    }
-    if (result == null) {
-      throw new ExpressionEvaluationException(
-          String.format("unsupported function name: %s", functionName.getFunctionName()));
-    } else {
-      return result;
-    }
+  @VisibleForTesting
+  public FunctionBuilder resolve(
+      Collection<FunctionResolver> dataSourceFunctionResolver,
+      FunctionSignature functionSignature) {
+    Map<FunctionName, FunctionResolver> dataSourceFunctionMap =
+        dataSourceFunctionResolver.stream()
+            .collect(Collectors.toMap(FunctionResolver::getFunctionName, t -> t));
+
+    // first, resolve in datasource provide function resolver.
+    // second, resolve in builtin function resolver.
+    return resolve(functionSignature, dataSourceFunctionMap)
+        .or(() -> resolve(functionSignature, functionResolverMap))
+        .orElseThrow(
+            () ->
+                new ExpressionEvaluationException(
+                    String.format(
+                        "unsupported function name: %s", functionSignature.getFunctionName())));
   }
 
-  private FunctionBuilder getFunctionBuilder(
+  private Optional<FunctionBuilder> resolve(
       FunctionSignature functionSignature,
-      FunctionName functionName,
       Map<FunctionName, FunctionResolver> functionResolverMap) {
-    Pair<FunctionSignature, FunctionBuilder> resolvedSignature =
-        functionResolverMap.get(functionName).resolve(functionSignature);
-
-    List<ExprType> sourceTypes = functionSignature.getParamTypeList();
-    List<ExprType> targetTypes = resolvedSignature.getKey().getParamTypeList();
-    FunctionBuilder funcBuilder = resolvedSignature.getValue();
-    if (isCastFunction(functionName) || sourceTypes.equals(targetTypes)) {
-      return funcBuilder;
+    FunctionName functionName = functionSignature.getFunctionName();
+    if (functionResolverMap.containsKey(functionName)) {
+      Pair<FunctionSignature, FunctionBuilder> resolvedSignature =
+          functionResolverMap.get(functionName).resolve(functionSignature);
+
+      List<ExprType> sourceTypes = functionSignature.getParamTypeList();
+      List<ExprType> targetTypes = resolvedSignature.getKey().getParamTypeList();
+      FunctionBuilder funcBuilder = resolvedSignature.getValue();
+      if (isCastFunction(functionName)
+          || FunctionSignature.isVarArgFunction(targetTypes)
+          || sourceTypes.equals(targetTypes)) {
+        return Optional.of(funcBuilder);
+      }
+      return Optional.of(castArguments(sourceTypes, targetTypes, funcBuilder));
+    } else {
+      return Optional.empty();
     }
-    return castArguments(sourceTypes,
-        targetTypes, funcBuilder);
   }
 
   /**
-   * Wrap resolved function builder's arguments by cast function to cast input expression value
-   * to value of target type at runtime. For example, suppose unresolved signature is
-   * equal(BOOL,STRING) and its resolved function builder is F with signature equal(BOOL,BOOL).
-   * In this case, wrap F and return equal(BOOL, cast_to_bool(STRING)).
+   * Wrap resolved function builder's arguments by cast function to cast input expression value to
+   * value of target type at runtime. For example, suppose unresolved signature is
+   * equal(BOOL,STRING) and its resolved function builder is F with signature equal(BOOL,BOOL). In
+   * this case, wrap F and return equal(BOOL, cast_to_bool(STRING)).
    */
-  private FunctionBuilder castArguments(List<ExprType> sourceTypes,
-                                        List<ExprType> targetTypes,
-                                        FunctionBuilder funcBuilder) {
+  private FunctionBuilder castArguments(
+      List<ExprType> sourceTypes, List<ExprType> targetTypes, FunctionBuilder funcBuilder) {
     return (fp, arguments) -> {
       List<Expression> argsCasted = new ArrayList<>();
       for (int i = 0; i < arguments.size(); i++) {
@@ -224,10 +203,10 @@ private boolean isCastRequired(ExprType sourceType, ExprType targetType) {
   private Function<FunctionProperties, Expression> cast(Expression arg, ExprType targetType) {
     FunctionName castFunctionName = getCastFunctionName(targetType);
     if (castFunctionName == null) {
-      throw new ExpressionEvaluationException(StringUtils.format(
-          "Type conversion to type %s is not supported", targetType));
+      throw new ExpressionEvaluationException(
+          StringUtils.format("Type conversion to type %s is not supported", targetType));
     }
-    return functionProperties -> (Expression) compile(functionProperties,
-        castFunctionName, List.of(arg));
+    return functionProperties ->
+        (Expression) compile(functionProperties, castFunctionName, List.of(arg));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/DefaultFunctionResolver.java b/core/src/main/java/org/opensearch/sql/expression/function/DefaultFunctionResolver.java
index 7081179162..5d0f31594b 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/DefaultFunctionResolver.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/DefaultFunctionResolver.java
@@ -18,44 +18,53 @@
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 
 /**
- * The Function Resolver hold the overload {@link FunctionBuilder} implementation.
- * is composed by {@link FunctionName} which identified the function name
- * and a map of {@link FunctionSignature} and {@link FunctionBuilder}
- * to represent the overloaded implementation
+ * The Function Resolver hold the overload {@link FunctionBuilder} implementation. is composed by
+ * {@link FunctionName} which identified the function name and a map of {@link FunctionSignature}
+ * and {@link FunctionBuilder} to represent the overloaded implementation
  */
 @Builder
 @RequiredArgsConstructor
 public class DefaultFunctionResolver implements FunctionResolver {
-  @Getter
-  private final FunctionName functionName;
+  @Getter private final FunctionName functionName;
+
   @Singular("functionBundle")
   private final Map<FunctionSignature, FunctionBuilder> functionBundle;
 
   /**
-   * Resolve the {@link FunctionBuilder} by using input {@link FunctionSignature}.
-   * If the {@link FunctionBuilder} exactly match the input {@link FunctionSignature}, return it.
-   * If applying the widening rule, found the most match one, return it.
-   * If nothing found, throw {@link ExpressionEvaluationException}
+   * Resolve the {@link FunctionBuilder} by using input {@link FunctionSignature}. If the {@link
+   * FunctionBuilder} exactly match the input {@link FunctionSignature}, return it. If applying the
+   * widening rule, found the most match one, return it. If nothing found, throw {@link
+   * ExpressionEvaluationException}
    *
    * @return function signature and its builder
    */
   @Override
   public Pair<FunctionSignature, FunctionBuilder> resolve(FunctionSignature unresolvedSignature) {
-    PriorityQueue<Map.Entry<Integer, FunctionSignature>> functionMatchQueue = new PriorityQueue<>(
-        Map.Entry.comparingByKey());
+    PriorityQueue<Map.Entry<Integer, FunctionSignature>> functionMatchQueue =
+        new PriorityQueue<>(Map.Entry.comparingByKey());
 
     for (FunctionSignature functionSignature : functionBundle.keySet()) {
       functionMatchQueue.add(
-          new AbstractMap.SimpleEntry<>(unresolvedSignature.match(functionSignature),
-              functionSignature));
+          new AbstractMap.SimpleEntry<>(
+              unresolvedSignature.match(functionSignature), functionSignature));
     }
     Map.Entry<Integer, FunctionSignature> bestMatchEntry = functionMatchQueue.peek();
-    if (FunctionSignature.NOT_MATCH.equals(bestMatchEntry.getKey())) {
+    if (FunctionSignature.isVarArgFunction(bestMatchEntry.getValue().getParamTypeList())
+        && (unresolvedSignature.getParamTypeList().isEmpty()
+            || unresolvedSignature.getParamTypeList().size() > 9)) {
+      throw new ExpressionEvaluationException(
+          String.format(
+              "%s function expected 1-9 arguments, but got %d",
+              functionName, unresolvedSignature.getParamTypeList().size()));
+    }
+    if (FunctionSignature.NOT_MATCH.equals(bestMatchEntry.getKey())
+        && !FunctionSignature.isVarArgFunction(bestMatchEntry.getValue().getParamTypeList())) {
       throw new ExpressionEvaluationException(
-          String.format("%s function expected %s, but get %s", functionName,
+          String.format(
+              "%s function expected %s, but get %s",
+              functionName,
               formatFunctions(functionBundle.keySet()),
-              unresolvedSignature.formatTypes()
-          ));
+              unresolvedSignature.formatTypes()));
     } else {
       FunctionSignature resolvedSignature = bestMatchEntry.getValue();
       return Pair.of(resolvedSignature, functionBundle.get(resolvedSignature));
@@ -63,7 +72,8 @@ public Pair<FunctionSignature, FunctionBuilder> resolve(FunctionSignature unreso
   }
 
   private String formatFunctions(Set<FunctionSignature> functionSignatures) {
-    return functionSignatures.stream().map(FunctionSignature::formatTypes)
+    return functionSignatures.stream()
+        .map(FunctionSignature::formatTypes)
         .collect(Collectors.joining(",", "{", "}"));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/FunctionBuilder.java b/core/src/main/java/org/opensearch/sql/expression/function/FunctionBuilder.java
index b6e32a1d27..a529885c16 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/FunctionBuilder.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/FunctionBuilder.java
@@ -3,15 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import java.util.List;
 import org.opensearch.sql.expression.Expression;
 
 /**
- * The definition of function which create {@link FunctionImplementation}
- * from input {@link Expression} list.
+ * The definition of function which create {@link FunctionImplementation} from input {@link
+ * Expression} list.
  */
 public interface FunctionBuilder {
 
@@ -19,7 +18,7 @@ public interface FunctionBuilder {
    * Create {@link FunctionImplementation} from input {@link Expression} list.
    *
    * @param functionProperties context for function execution.
-   * @param arguments          {@link Expression} list.
+   * @param arguments {@link Expression} list.
    * @return {@link FunctionImplementation}
    */
   FunctionImplementation apply(FunctionProperties functionProperties, List<Expression> arguments);
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/FunctionDSL.java b/core/src/main/java/org/opensearch/sql/expression/function/FunctionDSL.java
index 5b182f76f4..8ebbfd3a3c 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/FunctionDSL.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/FunctionDSL.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import java.util.Arrays;
@@ -21,21 +20,19 @@
 import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.DefaultFunctionResolver.DefaultFunctionResolverBuilder;
 
-/**
- * Function Define Utility.
- */
+/** Function Define Utility. */
 @UtilityClass
 public class FunctionDSL {
   /**
    * Define overloaded function with implementation.
    *
    * @param functionName function name.
-   * @param functions    a list of function implementation.
+   * @param functions a list of function implementation.
    * @return FunctionResolver.
    */
-  public static DefaultFunctionResolver define(FunctionName functionName,
-               SerializableFunction<FunctionName, Pair<FunctionSignature,
-                FunctionBuilder>>... functions) {
+  public static DefaultFunctionResolver define(
+      FunctionName functionName,
+      SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>... functions) {
     return define(functionName, List.of(functions));
   }
 
@@ -43,11 +40,13 @@ public static DefaultFunctionResolver define(FunctionName functionName,
    * Define overloaded function with implementation.
    *
    * @param functionName function name.
-   * @param functions    a list of function implementation.
+   * @param functions a list of function implementation.
    * @return FunctionResolver.
    */
-  public static DefaultFunctionResolver define(FunctionName functionName, List<
-      SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>> functions) {
+  public static DefaultFunctionResolver define(
+      FunctionName functionName,
+      List<SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>>
+          functions) {
 
     DefaultFunctionResolverBuilder builder = DefaultFunctionResolver.builder();
     builder.functionName(functionName);
@@ -58,7 +57,6 @@ public static DefaultFunctionResolver define(FunctionName functionName, List<
     return builder.build();
   }
 
-
   /**
    * Implementation of no args function that uses FunctionProperties.
    *
@@ -67,8 +65,8 @@ public static DefaultFunctionResolver define(FunctionName functionName, List<
    * @return no args function implementation.
    */
   public static SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>
-      implWithProperties(SerializableFunction<FunctionProperties, ExprValue> function,
-                     ExprType returnType) {
+      implWithProperties(
+          SerializableFunction<FunctionProperties, ExprValue> function, ExprType returnType) {
     return functionName -> {
       FunctionSignature functionSignature =
           new FunctionSignature(functionName, Collections.emptyList());
@@ -95,44 +93,143 @@ public String toString() {
   }
 
   /**
-   * Implementation of a function that takes one argument, returns a value, and
-   * requires FunctionProperties to complete.
+   * Implementation of a function that takes one argument, returns a value, and requires
+   * FunctionProperties to complete.
    *
-   * @param function   {@link ExprValue} based unary function.
+   * @param function {@link ExprValue} based unary function.
    * @param returnType return type.
    * @param argsType argument type.
    * @return Unary Function Implementation.
    */
   public static SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>
       implWithProperties(
-      SerializableBiFunction<FunctionProperties, ExprValue, ExprValue> function,
-      ExprType returnType,
-      ExprType argsType) {
+          SerializableBiFunction<FunctionProperties, ExprValue, ExprValue> function,
+          ExprType returnType,
+          ExprType argsType) {
 
     return functionName -> {
       FunctionSignature functionSignature =
           new FunctionSignature(functionName, Collections.singletonList(argsType));
       FunctionBuilder functionBuilder =
-          (functionProperties, arguments) -> new FunctionExpression(functionName, arguments) {
-            @Override
-            public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-              ExprValue value = arguments.get(0).valueOf(valueEnv);
-              return function.apply(functionProperties, value);
-            }
-
-            @Override
-            public ExprType type() {
-              return returnType;
-            }
-
-            @Override
-            public String toString() {
-              return String.format("%s(%s)", functionName,
-                  arguments.stream()
-                      .map(Object::toString)
-                      .collect(Collectors.joining(", ")));
-            }
-          };
+          (functionProperties, arguments) ->
+              new FunctionExpression(functionName, arguments) {
+                @Override
+                public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
+                  ExprValue value = arguments.get(0).valueOf(valueEnv);
+                  return function.apply(functionProperties, value);
+                }
+
+                @Override
+                public ExprType type() {
+                  return returnType;
+                }
+
+                @Override
+                public String toString() {
+                  return String.format(
+                      "%s(%s)",
+                      functionName,
+                      arguments.stream().map(Object::toString).collect(Collectors.joining(", ")));
+                }
+              };
+      return Pair.of(functionSignature, functionBuilder);
+    };
+  }
+
+  /**
+   * Implementation of a function that takes two arguments, returns a value, and requires
+   * FunctionProperties to complete.
+   *
+   * @param function {@link ExprValue} based Binary function.
+   * @param returnType return type.
+   * @param args1Type first argument type.
+   * @param args2Type second argument type.
+   * @return Binary Function Implementation.
+   */
+  public static SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>
+      implWithProperties(
+          SerializableTriFunction<FunctionProperties, ExprValue, ExprValue, ExprValue> function,
+          ExprType returnType,
+          ExprType args1Type,
+          ExprType args2Type) {
+
+    return functionName -> {
+      FunctionSignature functionSignature =
+          new FunctionSignature(functionName, Arrays.asList(args1Type, args2Type));
+      FunctionBuilder functionBuilder =
+          (functionProperties, arguments) ->
+              new FunctionExpression(functionName, arguments) {
+                @Override
+                public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
+                  ExprValue arg1 = arguments.get(0).valueOf(valueEnv);
+                  ExprValue arg2 = arguments.get(1).valueOf(valueEnv);
+                  return function.apply(functionProperties, arg1, arg2);
+                }
+
+                @Override
+                public ExprType type() {
+                  return returnType;
+                }
+
+                @Override
+                public String toString() {
+                  return String.format(
+                      "%s(%s)",
+                      functionName,
+                      arguments.stream().map(Object::toString).collect(Collectors.joining(", ")));
+                }
+              };
+      return Pair.of(functionSignature, functionBuilder);
+    };
+  }
+
+  /**
+   * Implementation of a function that takes three arguments, returns a value, and requires
+   * FunctionProperties to complete.
+   *
+   * @param function {@link ExprValue} based Binary function.
+   * @param returnType return type.
+   * @param args1Type first argument type.
+   * @param args2Type second argument type.
+   * @param args3Type third argument type.
+   * @return Binary Function Implementation.
+   */
+  public static SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>
+      implWithProperties(
+          SerializableQuadFunction<FunctionProperties, ExprValue, ExprValue, ExprValue, ExprValue>
+              function,
+          ExprType returnType,
+          ExprType args1Type,
+          ExprType args2Type,
+          ExprType args3Type) {
+
+    return functionName -> {
+      FunctionSignature functionSignature =
+          new FunctionSignature(functionName, Arrays.asList(args1Type, args2Type, args3Type));
+      FunctionBuilder functionBuilder =
+          (functionProperties, arguments) ->
+              new FunctionExpression(functionName, arguments) {
+                @Override
+                public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
+                  ExprValue arg1 = arguments.get(0).valueOf(valueEnv);
+                  ExprValue arg2 = arguments.get(1).valueOf(valueEnv);
+                  ExprValue arg3 = arguments.get(2).valueOf(valueEnv);
+                  return function.apply(functionProperties, arg1, arg2, arg3);
+                }
+
+                @Override
+                public ExprType type() {
+                  return returnType;
+                }
+
+                @Override
+                public String toString() {
+                  return String.format(
+                      "%s(%s)",
+                      functionName,
+                      arguments.stream().map(Object::toString).collect(Collectors.joining(", ")));
+                }
+              };
       return Pair.of(functionSignature, functionBuilder);
     };
   }
@@ -140,28 +237,25 @@ public String toString() {
   /**
    * No Arg Function Implementation.
    *
-   * @param function   {@link ExprValue} based unary function.
+   * @param function {@link ExprValue} based unary function.
    * @param returnType return type.
    * @return Unary Function Implementation.
    */
   public static SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>> impl(
-      SerializableNoArgFunction<ExprValue> function,
-      ExprType returnType) {
+      SerializableNoArgFunction<ExprValue> function, ExprType returnType) {
     return implWithProperties(fp -> function.get(), returnType);
   }
 
   /**
    * Unary Function Implementation.
    *
-   * @param function   {@link ExprValue} based unary function.
+   * @param function {@link ExprValue} based unary function.
    * @param returnType return type.
-   * @param argsType   argument type.
+   * @param argsType argument type.
    * @return Unary Function Implementation.
    */
   public static SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>> impl(
-      SerializableFunction<ExprValue, ExprValue> function,
-      ExprType returnType,
-      ExprType argsType) {
+      SerializableFunction<ExprValue, ExprValue> function, ExprType returnType, ExprType argsType) {
 
     return implWithProperties((fp, arg) -> function.apply(arg), returnType, argsType);
   }
@@ -169,10 +263,10 @@ public static SerializableFunction<FunctionName, Pair<FunctionSignature, Functio
   /**
    * Binary Function Implementation.
    *
-   * @param function   {@link ExprValue} based unary function.
+   * @param function {@link ExprValue} based unary function.
    * @param returnType return type.
-   * @param args1Type   argument type.
-   * @param args2Type   argument type.
+   * @param args1Type argument type.
+   * @param args2Type argument type.
    * @return Binary Function Implementation.
    */
   public static SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>> impl(
@@ -181,40 +275,17 @@ public static SerializableFunction<FunctionName, Pair<FunctionSignature, Functio
       ExprType args1Type,
       ExprType args2Type) {
 
-    return functionName -> {
-      FunctionSignature functionSignature =
-          new FunctionSignature(functionName, Arrays.asList(args1Type, args2Type));
-      FunctionBuilder functionBuilder =
-          (functionProperties, arguments) -> new FunctionExpression(functionName, arguments) {
-            @Override
-            public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-              ExprValue arg1 = arguments.get(0).valueOf(valueEnv);
-              ExprValue arg2 = arguments.get(1).valueOf(valueEnv);
-              return function.apply(arg1, arg2);
-            }
-
-            @Override
-            public ExprType type() {
-              return returnType;
-            }
-
-            @Override
-            public String toString() {
-              return String.format("%s(%s, %s)", functionName, arguments.get(0).toString(),
-                  arguments.get(1).toString());
-            }
-          };
-      return Pair.of(functionSignature, functionBuilder);
-    };
+    return implWithProperties(
+        (fp, arg1, arg2) -> function.apply(arg1, arg2), returnType, args1Type, args2Type);
   }
 
   /**
    * Triple Function Implementation.
    *
-   * @param function   {@link ExprValue} based unary function.
+   * @param function {@link ExprValue} based unary function.
    * @param returnType return type.
-   * @param args1Type  argument type.
-   * @param args2Type  argument type.
+   * @param args1Type argument type.
+   * @param args2Type argument type.
    * @return Binary Function Implementation.
    */
   public static SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>> impl(
@@ -228,33 +299,90 @@ public static SerializableFunction<FunctionName, Pair<FunctionSignature, Functio
       FunctionSignature functionSignature =
           new FunctionSignature(functionName, Arrays.asList(args1Type, args2Type, args3Type));
       FunctionBuilder functionBuilder =
-          (functionProperties, arguments) -> new FunctionExpression(functionName, arguments) {
-            @Override
-            public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-              ExprValue arg1 = arguments.get(0).valueOf(valueEnv);
-              ExprValue arg2 = arguments.get(1).valueOf(valueEnv);
-              ExprValue arg3 = arguments.get(2).valueOf(valueEnv);
-              return function.apply(arg1, arg2, arg3);
-            }
-
-            @Override
-            public ExprType type() {
-              return returnType;
-            }
-
-            @Override
-            public String toString() {
-              return String.format("%s(%s, %s, %s)", functionName, arguments.get(0).toString(),
-                  arguments.get(1).toString(), arguments.get(2).toString());
-            }
-          };
+          (functionProperties, arguments) ->
+              new FunctionExpression(functionName, arguments) {
+                @Override
+                public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
+                  ExprValue arg1 = arguments.get(0).valueOf(valueEnv);
+                  ExprValue arg2 = arguments.get(1).valueOf(valueEnv);
+                  ExprValue arg3 = arguments.get(2).valueOf(valueEnv);
+                  return function.apply(arg1, arg2, arg3);
+                }
+
+                @Override
+                public ExprType type() {
+                  return returnType;
+                }
+
+                @Override
+                public String toString() {
+                  return String.format(
+                      "%s(%s, %s, %s)",
+                      functionName,
+                      arguments.get(0).toString(),
+                      arguments.get(1).toString(),
+                      arguments.get(2).toString());
+                }
+              };
       return Pair.of(functionSignature, functionBuilder);
     };
   }
 
   /**
-   * Wrapper the unary ExprValue function with default NULL and MISSING handling.
+   * Quadruple Function Implementation.
+   *
+   * @param function {@link ExprValue} based unary function.
+   * @param returnType return type.
+   * @param args1Type argument type.
+   * @param args2Type argument type.
+   * @param args3Type argument type.
+   * @return Quadruple Function Implementation.
    */
+  public static SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>> impl(
+      SerializableQuadFunction<ExprValue, ExprValue, ExprValue, ExprValue, ExprValue> function,
+      ExprType returnType,
+      ExprType args1Type,
+      ExprType args2Type,
+      ExprType args3Type,
+      ExprType args4Type) {
+
+    return functionName -> {
+      FunctionSignature functionSignature =
+          new FunctionSignature(
+              functionName, Arrays.asList(args1Type, args2Type, args3Type, args4Type));
+      FunctionBuilder functionBuilder =
+          (functionProperties, arguments) ->
+              new FunctionExpression(functionName, arguments) {
+                @Override
+                public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
+                  ExprValue arg1 = arguments.get(0).valueOf(valueEnv);
+                  ExprValue arg2 = arguments.get(1).valueOf(valueEnv);
+                  ExprValue arg3 = arguments.get(2).valueOf(valueEnv);
+                  ExprValue arg4 = arguments.get(3).valueOf(valueEnv);
+                  return function.apply(arg1, arg2, arg3, arg4);
+                }
+
+                @Override
+                public ExprType type() {
+                  return returnType;
+                }
+
+                @Override
+                public String toString() {
+                  return String.format(
+                      "%s(%s, %s, %s, %s)",
+                      functionName,
+                      arguments.get(0).toString(),
+                      arguments.get(1).toString(),
+                      arguments.get(2).toString(),
+                      arguments.get(3).toString());
+                }
+              };
+      return Pair.of(functionSignature, functionBuilder);
+    };
+  }
+
+  /** Wrapper the unary ExprValue function with default NULL and MISSING handling. */
   public static SerializableFunction<ExprValue, ExprValue> nullMissingHandling(
       SerializableFunction<ExprValue, ExprValue> function) {
     return value -> {
@@ -268,9 +396,7 @@ public static SerializableFunction<ExprValue, ExprValue> nullMissingHandling(
     };
   }
 
-  /**
-   * Wrapper the binary ExprValue function with default NULL and MISSING handling.
-   */
+  /** Wrapper the binary ExprValue function with default NULL and MISSING handling. */
   public static SerializableBiFunction<ExprValue, ExprValue, ExprValue> nullMissingHandling(
       SerializableBiFunction<ExprValue, ExprValue, ExprValue> function) {
     return (v1, v2) -> {
@@ -284,9 +410,7 @@ public static SerializableBiFunction<ExprValue, ExprValue, ExprValue> nullMissin
     };
   }
 
-  /**
-   * Wrapper the triple ExprValue function with default NULL and MISSING handling.
-   */
+  /** Wrapper the triple ExprValue function with default NULL and MISSING handling. */
   public SerializableTriFunction<ExprValue, ExprValue, ExprValue, ExprValue> nullMissingHandling(
       SerializableTriFunction<ExprValue, ExprValue, ExprValue, ExprValue> function) {
     return (v1, v2, v3) -> {
@@ -301,12 +425,12 @@ public SerializableTriFunction<ExprValue, ExprValue, ExprValue, ExprValue> nullM
   }
 
   /**
-   * Wrapper the unary ExprValue function that is aware of FunctionProperties,
-   * with default NULL and MISSING handling.
+   * Wrapper the unary ExprValue function that is aware of FunctionProperties, with default NULL and
+   * MISSING handling.
    */
   public static SerializableBiFunction<FunctionProperties, ExprValue, ExprValue>
-        nullMissingHandlingWithProperties(
-      SerializableBiFunction<FunctionProperties, ExprValue, ExprValue>  implementation) {
+      nullMissingHandlingWithProperties(
+          SerializableBiFunction<FunctionProperties, ExprValue, ExprValue> implementation) {
     return (functionProperties, v1) -> {
       if (v1.isMissing()) {
         return ExprValueUtils.missingValue();
@@ -317,4 +441,45 @@ public SerializableTriFunction<ExprValue, ExprValue, ExprValue, ExprValue> nullM
       }
     };
   }
+
+  /**
+   * Wrapper for the ExprValue function that takes 2 arguments and is aware of FunctionProperties,
+   * with default NULL and MISSING handling.
+   */
+  public static SerializableTriFunction<FunctionProperties, ExprValue, ExprValue, ExprValue>
+      nullMissingHandlingWithProperties(
+          SerializableTriFunction<FunctionProperties, ExprValue, ExprValue, ExprValue>
+              implementation) {
+    return (functionProperties, v1, v2) -> {
+      if (v1.isMissing() || v2.isMissing()) {
+        return ExprValueUtils.missingValue();
+      } else if (v1.isNull() || v2.isNull()) {
+        return ExprValueUtils.nullValue();
+      } else {
+        return implementation.apply(functionProperties, v1, v2);
+      }
+    };
+  }
+
+  /**
+   * Wrapper for the ExprValue function that takes 3 arguments and is aware of FunctionProperties,
+   * with default NULL and MISSING handling.
+   */
+  public static SerializableQuadFunction<
+          FunctionProperties, ExprValue, ExprValue, ExprValue, ExprValue>
+      nullMissingHandlingWithProperties(
+          SerializableQuadFunction<FunctionProperties, ExprValue, ExprValue, ExprValue, ExprValue>
+              implementation) {
+    return (functionProperties, v1, v2, v3) -> {
+      if (v1.isMissing() || v2.isMissing() || v3.isMissing()) {
+        return ExprValueUtils.missingValue();
+      }
+
+      if (v1.isNull() || v2.isNull() || v3.isNull()) {
+        return ExprValueUtils.nullValue();
+      }
+
+      return implementation.apply(functionProperties, v1, v2, v3);
+    };
+  }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/FunctionImplementation.java b/core/src/main/java/org/opensearch/sql/expression/function/FunctionImplementation.java
index d829e01225..4fd265a890 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/FunctionImplementation.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/FunctionImplementation.java
@@ -3,24 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import java.util.List;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * The definition of Function Implementation.
- */
+/** The definition of Function Implementation. */
 public interface FunctionImplementation {
 
-  /**
-   * Get Function Name.
-   */
+  /** Get Function Name. */
   FunctionName getFunctionName();
 
-  /**
-   * Get Function Arguments.
-   */
+  /** Get Function Arguments. */
   List<Expression> getArguments();
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/FunctionName.java b/core/src/main/java/org/opensearch/sql/expression/function/FunctionName.java
index cb3d5fab92..ae2987a164 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/FunctionName.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/FunctionName.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import java.io.Serializable;
@@ -11,14 +10,11 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-/**
- * The definition of Function Name.
- */
+/** The definition of Function Name. */
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class FunctionName implements Serializable {
-  @Getter
-  private final String functionName;
+  @Getter private final String functionName;
 
   public static FunctionName of(String functionName) {
     return new FunctionName(functionName.toLowerCase());
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/FunctionProperties.java b/core/src/main/java/org/opensearch/sql/expression/function/FunctionProperties.java
index 4222748051..100c98bd38 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/FunctionProperties.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/FunctionProperties.java
@@ -19,9 +19,7 @@ public class FunctionProperties implements Serializable {
   private final Instant nowInstant;
   private final ZoneId currentZoneId;
 
-  /**
-   * By default, use current time and current timezone.
-   */
+  /** By default, use current time and current timezone. */
   public FunctionProperties() {
     nowInstant = Instant.now();
     currentZoneId = ZoneId.systemDefault();
@@ -29,6 +27,7 @@ public FunctionProperties() {
 
   /**
    * Method to access current system clock.
+   *
    * @return a ticking clock that tells the time.
    */
   public Clock getSystemClock() {
@@ -36,29 +35,28 @@ public Clock getSystemClock() {
   }
 
   /**
-   * Method to get time when query began execution.
-   * Clock class combines an instant Supplier and a time zone.
-   * @return a fixed clock that returns the time execution started at.
+   * Method to get time when query began execution. Clock class combines an instant Supplier and a
+   * time zone.
    *
+   * @return a fixed clock that returns the time execution started at.
    */
   public Clock getQueryStartClock() {
     return Clock.fixed(nowInstant, currentZoneId);
   }
 
-  /**
-   * Use when compiling functions that do not rely on function properties.
-   */
-  public static final FunctionProperties None = new FunctionProperties() {
-    @Override
-    public Clock getSystemClock() {
-      throw new UnexpectedCallException();
-    }
+  /** Use when compiling functions that do not rely on function properties. */
+  public static final FunctionProperties None =
+      new FunctionProperties() {
+        @Override
+        public Clock getSystemClock() {
+          throw new UnexpectedCallException();
+        }
 
-    @Override
-    public Clock getQueryStartClock() {
-      throw new UnexpectedCallException();
-    }
-  };
+        @Override
+        public Clock getQueryStartClock() {
+          throw new UnexpectedCallException();
+        }
+      };
 
   class UnexpectedCallException extends RuntimeException {
     public UnexpectedCallException() {
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/FunctionResolver.java b/core/src/main/java/org/opensearch/sql/expression/function/FunctionResolver.java
index 1635b6f846..eaede1da7e 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/FunctionResolver.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/FunctionResolver.java
@@ -8,8 +8,8 @@
 import org.apache.commons.lang3.tuple.Pair;
 
 /**
- * An interface for any class that can provide a {@ref FunctionBuilder}
- * given a {@ref FunctionSignature}.
+ * An interface for any class that can provide a {@ref FunctionBuilder} given a {@ref
+ * FunctionSignature}.
  */
 public interface FunctionResolver {
   Pair<FunctionSignature, FunctionBuilder> resolve(FunctionSignature unresolvedSignature);
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/FunctionSignature.java b/core/src/main/java/org/opensearch/sql/expression/function/FunctionSignature.java
index adb1698386..e1246cde28 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/FunctionSignature.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/FunctionSignature.java
@@ -5,6 +5,8 @@
 
 package org.opensearch.sql.expression.function;
 
+import static org.opensearch.sql.data.type.ExprCoreType.ARRAY;
+
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.EqualsAndHashCode;
@@ -13,9 +15,7 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.data.type.WideningTypeRule;
 
-/**
- * Function signature is composed by function name and arguments list.
- */
+/** Function signature is composed by function name and arguments list. */
 @Getter
 @RequiredArgsConstructor
 @EqualsAndHashCode
@@ -29,9 +29,10 @@ public class FunctionSignature {
   /**
    * calculate the function signature match degree.
    *
-   * @return  EXACTLY_MATCH: exactly match
-   *          NOT_MATCH: not match
-   *          By widening rule, the small number means better match
+   * @return<br>
+   *     EXACTLY_MATCH: exactly match<br>
+   *     NOT_MATCH: not match<br>
+   *     By widening rule, the small number means better match
    */
   public int match(FunctionSignature functionSignature) {
     List<ExprType> functionTypeList = functionSignature.getParamTypeList();
@@ -39,6 +40,10 @@ public int match(FunctionSignature functionSignature) {
         || paramTypeList.size() != functionTypeList.size()) {
       return NOT_MATCH;
     }
+    // TODO: improve to support regular and array type mixed, ex. func(int,string,array)
+    if (isVarArgFunction(functionTypeList)) {
+      return EXACTLY_MATCH;
+    }
 
     int matchDegree = EXACTLY_MATCH;
     for (int i = 0; i < paramTypeList.size(); i++) {
@@ -54,12 +59,15 @@ public int match(FunctionSignature functionSignature) {
     return matchDegree;
   }
 
-  /**
-   * util function for formatted arguments list.
-   */
+  /** util function for formatted arguments list. */
   public String formatTypes() {
     return getParamTypeList().stream()
         .map(ExprType::typeName)
         .collect(Collectors.joining(",", "[", "]"));
   }
+
+  /** util function - returns true if function has variable arguments. */
+  protected static boolean isVarArgFunction(List<ExprType> argTypes) {
+    return argTypes.size() == 1 && argTypes.get(0) == ARRAY;
+  }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/OpenSearchFunctions.java b/core/src/main/java/org/opensearch/sql/expression/function/OpenSearchFunctions.java
index d8efe42640..8d8928c16a 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/OpenSearchFunctions.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/OpenSearchFunctions.java
@@ -5,15 +5,15 @@
 
 package org.opensearch.sql.expression.function;
 
-import static org.opensearch.sql.data.type.ExprCoreType.STRING;
-import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
+import static org.opensearch.sql.data.type.ExprCoreType.BOOLEAN;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.List;
 import java.util.stream.Collectors;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.UtilityClass;
+import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.FunctionExpression;
@@ -22,9 +22,7 @@
 
 @UtilityClass
 public class OpenSearchFunctions {
-  /**
-   * Add functions specific to OpenSearch to repository.
-   */
+  /** Add functions specific to OpenSearch to repository. */
   public void register(BuiltinFunctionRepository repository) {
     repository.register(match_bool_prefix());
     repository.register(multi_match(BuiltinFunctionName.MULTI_MATCH));
@@ -36,6 +34,7 @@ public void register(BuiltinFunctionRepository repository) {
     repository.register(simple_query_string());
     repository.register(query());
     repository.register(query_string());
+
     // Register MATCHPHRASE as MATCH_PHRASE as well for backwards
     // compatibility.
     repository.register(match_phrase(BuiltinFunctionName.MATCH_PHRASE));
@@ -44,58 +43,99 @@ public void register(BuiltinFunctionRepository repository) {
     repository.register(match_phrase_prefix());
     repository.register(wildcard_query(BuiltinFunctionName.WILDCARD_QUERY));
     repository.register(wildcard_query(BuiltinFunctionName.WILDCARDQUERY));
+    repository.register(score(BuiltinFunctionName.SCORE));
+    repository.register(score(BuiltinFunctionName.SCOREQUERY));
+    repository.register(score(BuiltinFunctionName.SCORE_QUERY));
+    // Functions supported in SELECT clause
+    repository.register(nested());
   }
 
   private static FunctionResolver match_bool_prefix() {
     FunctionName name = BuiltinFunctionName.MATCH_BOOL_PREFIX.getName();
-    return new RelevanceFunctionResolver(name, STRING);
+    return new RelevanceFunctionResolver(name);
   }
 
   private static FunctionResolver match(BuiltinFunctionName match) {
     FunctionName funcName = match.getName();
-    return new RelevanceFunctionResolver(funcName, STRING);
+    return new RelevanceFunctionResolver(funcName);
   }
 
   private static FunctionResolver match_phrase_prefix() {
     FunctionName funcName = BuiltinFunctionName.MATCH_PHRASE_PREFIX.getName();
-    return new RelevanceFunctionResolver(funcName, STRING);
+    return new RelevanceFunctionResolver(funcName);
   }
 
   private static FunctionResolver match_phrase(BuiltinFunctionName matchPhrase) {
     FunctionName funcName = matchPhrase.getName();
-    return new RelevanceFunctionResolver(funcName, STRING);
+    return new RelevanceFunctionResolver(funcName);
   }
 
   private static FunctionResolver multi_match(BuiltinFunctionName multiMatchName) {
-    return new RelevanceFunctionResolver(multiMatchName.getName(), STRUCT);
+    return new RelevanceFunctionResolver(multiMatchName.getName());
   }
 
   private static FunctionResolver simple_query_string() {
     FunctionName funcName = BuiltinFunctionName.SIMPLE_QUERY_STRING.getName();
-    return new RelevanceFunctionResolver(funcName, STRUCT);
+    return new RelevanceFunctionResolver(funcName);
   }
 
   private static FunctionResolver query() {
     FunctionName funcName = BuiltinFunctionName.QUERY.getName();
-    return new RelevanceFunctionResolver(funcName, STRING);
+    return new RelevanceFunctionResolver(funcName);
   }
 
   private static FunctionResolver query_string() {
     FunctionName funcName = BuiltinFunctionName.QUERY_STRING.getName();
-    return new RelevanceFunctionResolver(funcName, STRUCT);
+    return new RelevanceFunctionResolver(funcName);
   }
 
   private static FunctionResolver wildcard_query(BuiltinFunctionName wildcardQuery) {
     FunctionName funcName = wildcardQuery.getName();
-    return new RelevanceFunctionResolver(funcName, STRING);
+    return new RelevanceFunctionResolver(funcName);
+  }
+
+  private static FunctionResolver nested() {
+    return new FunctionResolver() {
+      @Override
+      public Pair<FunctionSignature, FunctionBuilder> resolve(
+          FunctionSignature unresolvedSignature) {
+        return Pair.of(
+            unresolvedSignature,
+            (functionProperties, arguments) ->
+                new FunctionExpression(BuiltinFunctionName.NESTED.getName(), arguments) {
+                  @Override
+                  public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
+                    return valueEnv.resolve(getArguments().get(0));
+                  }
+
+                  @Override
+                  public ExprType type() {
+                    return getArguments().get(0).type();
+                  }
+                });
+      }
+
+      @Override
+      public FunctionName getFunctionName() {
+        return BuiltinFunctionName.NESTED.getName();
+      }
+    };
+  }
+
+  private static FunctionResolver score(BuiltinFunctionName score) {
+    FunctionName funcName = score.getName();
+    return new RelevanceFunctionResolver(funcName);
   }
 
   public static class OpenSearchFunction extends FunctionExpression {
     private final FunctionName functionName;
     private final List<Expression> arguments;
 
+    @Getter @Setter private boolean isScoreTracked;
+
     /**
      * Required argument constructor.
+     *
      * @param functionName name of the function
      * @param arguments a list of expressions
      */
@@ -103,26 +143,33 @@ public OpenSearchFunction(FunctionName functionName, List<Expression> arguments)
       super(functionName, arguments);
       this.functionName = functionName;
       this.arguments = arguments;
+      this.isScoreTracked = false;
     }
 
     @Override
     public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-      throw new UnsupportedOperationException(String.format(
-          "OpenSearch defined function [%s] is only supported in WHERE and HAVING clause.",
-          functionName));
+      throw new UnsupportedOperationException(
+          String.format(
+              "OpenSearch defined function [%s] is only supported in WHERE and HAVING clause.",
+              functionName));
     }
 
     @Override
     public ExprType type() {
-      return ExprCoreType.BOOLEAN;
+      return BOOLEAN;
     }
 
     @Override
     public String toString() {
-      List<String> args = arguments.stream()
-          .map(arg -> String.format("%s=%s", ((NamedArgumentExpression) arg)
-              .getArgName(), ((NamedArgumentExpression) arg).getValue().toString()))
-          .collect(Collectors.toList());
+      List<String> args =
+          arguments.stream()
+              .map(
+                  arg ->
+                      String.format(
+                          "%s=%s",
+                          ((NamedArgumentExpression) arg).getArgName(),
+                          ((NamedArgumentExpression) arg).getValue().toString()))
+              .collect(Collectors.toList());
       return String.format("%s(%s)", functionName, String.join(", ", args));
     }
   }
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/RelevanceFunctionResolver.java b/core/src/main/java/org/opensearch/sql/expression/function/RelevanceFunctionResolver.java
index 7066622e1b..ae882897d0 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/RelevanceFunctionResolver.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/RelevanceFunctionResolver.java
@@ -14,30 +14,20 @@
 import org.opensearch.sql.exception.SemanticCheckException;
 
 @RequiredArgsConstructor
-public class RelevanceFunctionResolver
-    implements FunctionResolver {
+public class RelevanceFunctionResolver implements FunctionResolver {
 
-  @Getter
-  private final FunctionName functionName;
-
-  @Getter
-  private final ExprType declaredFirstParamType;
+  @Getter private final FunctionName functionName;
 
   @Override
   public Pair<FunctionSignature, FunctionBuilder> resolve(FunctionSignature unresolvedSignature) {
     if (!unresolvedSignature.getFunctionName().equals(functionName)) {
-      throw new SemanticCheckException(String.format("Expected '%s' but got '%s'",
-          functionName.getFunctionName(), unresolvedSignature.getFunctionName().getFunctionName()));
-    }
-    List<ExprType> paramTypes = unresolvedSignature.getParamTypeList();
-    ExprType providedFirstParamType = paramTypes.get(0);
-
-    // Check if the first parameter is of the specified type.
-    if (!declaredFirstParamType.equals(providedFirstParamType)) {
       throw new SemanticCheckException(
-          getWrongParameterErrorMessage(0, providedFirstParamType, declaredFirstParamType));
+          String.format(
+              "Expected '%s' but got '%s'",
+              functionName.getFunctionName(),
+              unresolvedSignature.getFunctionName().getFunctionName()));
     }
-
+    List<ExprType> paramTypes = unresolvedSignature.getParamTypeList();
     // Check if all but the first parameter are of type STRING.
     for (int i = 1; i < paramTypes.size(); i++) {
       ExprType paramType = paramTypes.get(i);
@@ -47,13 +37,15 @@ public Pair<FunctionSignature, FunctionBuilder> resolve(FunctionSignature unreso
       }
     }
 
-    FunctionBuilder buildFunction = (functionProperties, args)
-        -> new OpenSearchFunctions.OpenSearchFunction(functionName, args);
+    FunctionBuilder buildFunction =
+        (functionProperties, args) ->
+            new OpenSearchFunctions.OpenSearchFunction(functionName, args);
     return Pair.of(unresolvedSignature, buildFunction);
   }
 
-  /** Returns a helpful error message when expected parameter type does not match the
-   * specified parameter type.
+  /**
+   * Returns a helpful error message when expected parameter type does not match the specified
+   * parameter type.
    *
    * @param i 0-based index of the parameter in a function signature.
    * @param paramType the type of the ith parameter at run-time.
@@ -61,7 +53,8 @@ public Pair<FunctionSignature, FunctionBuilder> resolve(FunctionSignature unreso
    * @return A user-friendly error message that informs of the type difference.
    */
   private String getWrongParameterErrorMessage(int i, ExprType paramType, ExprType expectedType) {
-    return String.format("Expected type %s instead of %s for parameter #%d",
+    return String.format(
+        "Expected type %s instead of %s for parameter #%d",
         expectedType.typeName(), paramType.typeName(), i + 1);
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/SerializableBiFunction.java b/core/src/main/java/org/opensearch/sql/expression/function/SerializableBiFunction.java
index 5b3aaf31f3..9f182e4c85 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/SerializableBiFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/SerializableBiFunction.java
@@ -3,14 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import java.io.Serializable;
 import java.util.function.BiFunction;
 
-/**
- * Serializable BiFunction.
- */
-public interface SerializableBiFunction<T, U, R> extends BiFunction<T, U, R>, Serializable {
-}
+/** Serializable BiFunction. */
+public interface SerializableBiFunction<T, U, R> extends BiFunction<T, U, R>, Serializable {}
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/SerializableFunction.java b/core/src/main/java/org/opensearch/sql/expression/function/SerializableFunction.java
index 467c034c39..fb3e2f2cfb 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/SerializableFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/SerializableFunction.java
@@ -3,11 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import java.io.Serializable;
 import java.util.function.Function;
 
-public interface SerializableFunction<T, R> extends Function<T, R>, Serializable {
-}
+public interface SerializableFunction<T, R> extends Function<T, R>, Serializable {}
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/SerializableNoArgFunction.java b/core/src/main/java/org/opensearch/sql/expression/function/SerializableNoArgFunction.java
index e68d6084b4..6eaf699bf9 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/SerializableNoArgFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/SerializableNoArgFunction.java
@@ -3,14 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import java.io.Serializable;
 import java.util.function.Supplier;
 
-/**
- * Serializable no argument function.
- */
-public interface SerializableNoArgFunction<T> extends Supplier<T>, Serializable {
-}
+/** Serializable no argument function. */
+public interface SerializableNoArgFunction<T> extends Supplier<T>, Serializable {}
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/SerializableQuadFunction.java b/core/src/main/java/org/opensearch/sql/expression/function/SerializableQuadFunction.java
new file mode 100644
index 0000000000..7285d9a32f
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/expression/function/SerializableQuadFunction.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.function;
+
+import java.io.Serializable;
+
+/**
+ * Serializable Triple Function.
+ *
+ * @param <T> the type of the first argument to the function
+ * @param <U> the type of the second argument to the function
+ * @param <V> the type of the third argument to the function
+ * @param <W> the type of the fourth argument to the function
+ * @param <R> the type of the result of the function
+ */
+public interface SerializableQuadFunction<T, U, V, W, R> extends Serializable {
+  /**
+   * Applies this function to the given arguments.
+   *
+   * @param t the first function argument
+   * @param u the second function argument
+   * @param v the third function argument
+   * @param w the fourth function argument
+   * @return the function result
+   */
+  R apply(T t, U u, V v, W w);
+}
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/SerializableTriFunction.java b/core/src/main/java/org/opensearch/sql/expression/function/SerializableTriFunction.java
index 911012fcdb..e980b1c82a 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/SerializableTriFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/SerializableTriFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import java.io.Serializable;
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/TableFunctionImplementation.java b/core/src/main/java/org/opensearch/sql/expression/function/TableFunctionImplementation.java
index f35ffe4898..b8b90bf5e3 100644
--- a/core/src/main/java/org/opensearch/sql/expression/function/TableFunctionImplementation.java
+++ b/core/src/main/java/org/opensearch/sql/expression/function/TableFunctionImplementation.java
@@ -9,11 +9,8 @@
 
 import org.opensearch.sql.storage.Table;
 
-/**
- * Interface for table function which returns Table when executed.
- */
+/** Interface for table function which returns Table when executed. */
 public interface TableFunctionImplementation extends FunctionImplementation {
 
   Table applyArguments();
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/operator/arthmetic/ArithmeticFunction.java b/core/src/main/java/org/opensearch/sql/expression/operator/arthmetic/ArithmeticFunction.java
index c4b106bbf4..82b91e1d34 100644
--- a/core/src/main/java/org/opensearch/sql/expression/operator/arthmetic/ArithmeticFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/operator/arthmetic/ArithmeticFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.operator.arthmetic;
 
 import static org.opensearch.sql.data.type.ExprCoreType.BYTE;
@@ -12,6 +11,9 @@
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.LONG;
 import static org.opensearch.sql.data.type.ExprCoreType.SHORT;
+import static org.opensearch.sql.expression.function.FunctionDSL.define;
+import static org.opensearch.sql.expression.function.FunctionDSL.impl;
+import static org.opensearch.sql.expression.function.FunctionDSL.nullMissingHandling;
 
 import lombok.experimental.UtilityClass;
 import org.opensearch.sql.data.model.ExprByteValue;
@@ -24,14 +26,14 @@
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
 import org.opensearch.sql.expression.function.DefaultFunctionResolver;
-import org.opensearch.sql.expression.function.FunctionDSL;
+import org.opensearch.sql.expression.function.FunctionName;
 
 /**
- * The definition of arithmetic function
- * add, Accepts two numbers and produces a number.
- * subtract, Accepts two numbers and produces a number.
- * multiply, Accepts two numbers and produces a number.
- * divide, Accepts two numbers and produces a number.
+ * The definition of arithmetic function<br>
+ * add, Accepts two numbers and produces a number.<br>
+ * subtract, Accepts two numbers and produces a number.<br>
+ * multiply, Accepts two numbers and produces a number.<br>
+ * divide, Accepts two numbers and produces a number.<br>
  * module, Accepts two numbers and produces a number.
  */
 @UtilityClass
@@ -43,168 +45,329 @@ public class ArithmeticFunction {
    */
   public static void register(BuiltinFunctionRepository repository) {
     repository.register(add());
-    repository.register(subtract());
-    repository.register(multiply());
+    repository.register(addFunction());
     repository.register(divide());
-    repository.register(modules());
+    repository.register(divideFunction());
+    repository.register(mod());
+    repository.register(modulus());
+    repository.register(modulusFunction());
+    repository.register(multiply());
+    repository.register(multiplyFunction());
+    repository.register(subtract());
+    repository.register(subtractFunction());
   }
 
-  private static DefaultFunctionResolver add() {
-    return FunctionDSL.define(BuiltinFunctionName.ADD.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprByteValue(v1.byteValue() + v2.byteValue())),
-            BYTE, BYTE, BYTE),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprShortValue(v1.shortValue() + v2.shortValue())),
-            SHORT, SHORT, SHORT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprIntegerValue(Math.addExact(v1.integerValue(),
-                    v2.integerValue()))),
-            INTEGER, INTEGER, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
+  /**
+   * Definition of add(x, y) function.<br>
+   * Returns the number x plus number y<br>
+   * The supported signature of add function is<br>
+   * (x: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE, y: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE)<br>
+   * -> wider type between types of x and y
+   */
+  private static DefaultFunctionResolver addBase(FunctionName functionName) {
+    return define(
+        functionName,
+        impl(
+            nullMissingHandling((v1, v2) -> new ExprByteValue(v1.byteValue() + v2.byteValue())),
+            BYTE,
+            BYTE,
+            BYTE),
+        impl(
+            nullMissingHandling((v1, v2) -> new ExprShortValue(v1.shortValue() + v2.shortValue())),
+            SHORT,
+            SHORT,
+            SHORT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    new ExprIntegerValue(Math.addExact(v1.integerValue(), v2.integerValue()))),
+            INTEGER,
+            INTEGER,
+            INTEGER),
+        impl(
+            nullMissingHandling(
                 (v1, v2) -> new ExprLongValue(Math.addExact(v1.longValue(), v2.longValue()))),
-            LONG, LONG, LONG),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprFloatValue(v1.floatValue() + v2.floatValue())),
-            FLOAT, FLOAT, FLOAT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
+            LONG,
+            LONG,
+            LONG),
+        impl(
+            nullMissingHandling((v1, v2) -> new ExprFloatValue(v1.floatValue() + v2.floatValue())),
+            FLOAT,
+            FLOAT,
+            FLOAT),
+        impl(
+            nullMissingHandling(
                 (v1, v2) -> new ExprDoubleValue(v1.doubleValue() + v2.doubleValue())),
-            DOUBLE, DOUBLE, DOUBLE)
-    );
+            DOUBLE,
+            DOUBLE,
+            DOUBLE));
   }
 
-  private static DefaultFunctionResolver subtract() {
-    return FunctionDSL.define(BuiltinFunctionName.SUBTRACT.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprByteValue(v1.byteValue() - v2.byteValue())),
-            BYTE, BYTE, BYTE),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprShortValue(v1.shortValue() - v2.shortValue())),
-            SHORT, SHORT, SHORT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprIntegerValue(Math.subtractExact(v1.integerValue(),
-                    v2.integerValue()))),
-            INTEGER, INTEGER, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprLongValue(Math.subtractExact(v1.longValue(), v2.longValue()))),
-            LONG, LONG, LONG),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprFloatValue(v1.floatValue() - v2.floatValue())),
-            FLOAT, FLOAT, FLOAT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprDoubleValue(v1.doubleValue() - v2.doubleValue())),
-            DOUBLE, DOUBLE, DOUBLE)
-    );
+  private static DefaultFunctionResolver add() {
+    return addBase(BuiltinFunctionName.ADD.getName());
   }
 
-  private static DefaultFunctionResolver multiply() {
-    return FunctionDSL.define(BuiltinFunctionName.MULTIPLY.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprByteValue(v1.byteValue() * v2.byteValue())),
-            BYTE, BYTE, BYTE),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprShortValue(v1.shortValue() * v2.shortValue())),
-            SHORT, SHORT, SHORT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprIntegerValue(Math.multiplyExact(v1.integerValue(),
-                    v2.integerValue()))),
-            INTEGER, INTEGER, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
+  private static DefaultFunctionResolver addFunction() {
+    return addBase(BuiltinFunctionName.ADDFUNCTION.getName());
+  }
+
+  /**
+   * Definition of divide(x, y) function.<br>
+   * Returns the number x divided by number y<br>
+   * The supported signature of divide function is<br>
+   * (x: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE, y: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE)<br>
+   * -> wider type between types of x and y
+   */
+  private static DefaultFunctionResolver divideBase(FunctionName functionName) {
+    return define(
+        functionName,
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.byteValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprByteValue(v1.byteValue() / v2.byteValue())),
+            BYTE,
+            BYTE,
+            BYTE),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.shortValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprShortValue(v1.shortValue() / v2.shortValue())),
+            SHORT,
+            SHORT,
+            SHORT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.integerValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprIntegerValue(v1.integerValue() / v2.integerValue())),
+            INTEGER,
+            INTEGER,
+            INTEGER),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.longValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprLongValue(v1.longValue() / v2.longValue())),
+            LONG,
+            LONG,
+            LONG),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.floatValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprFloatValue(v1.floatValue() / v2.floatValue())),
+            FLOAT,
+            FLOAT,
+            FLOAT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.doubleValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprDoubleValue(v1.doubleValue() / v2.doubleValue())),
+            DOUBLE,
+            DOUBLE,
+            DOUBLE));
+  }
+
+  private static DefaultFunctionResolver divide() {
+    return divideBase(BuiltinFunctionName.DIVIDE.getName());
+  }
+
+  private static DefaultFunctionResolver divideFunction() {
+    return divideBase(BuiltinFunctionName.DIVIDEFUNCTION.getName());
+  }
+
+  /**
+   * Definition of modulus(x, y) function.<br>
+   * Returns the number x modulo by number y<br>
+   * The supported signature of modulo function is<br>
+   * (x: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE, y: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE)<br>
+   * -> wider type between types of x and y
+   */
+  private static DefaultFunctionResolver modulusBase(FunctionName functionName) {
+    return define(
+        functionName,
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.byteValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprByteValue(v1.byteValue() % v2.byteValue())),
+            BYTE,
+            BYTE,
+            BYTE),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.shortValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprShortValue(v1.shortValue() % v2.shortValue())),
+            SHORT,
+            SHORT,
+            SHORT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.integerValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprIntegerValue(v1.integerValue() % v2.integerValue())),
+            INTEGER,
+            INTEGER,
+            INTEGER),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.longValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprLongValue(v1.longValue() % v2.longValue())),
+            LONG,
+            LONG,
+            LONG),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.floatValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprFloatValue(v1.floatValue() % v2.floatValue())),
+            FLOAT,
+            FLOAT,
+            FLOAT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.doubleValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprDoubleValue(v1.doubleValue() % v2.doubleValue())),
+            DOUBLE,
+            DOUBLE,
+            DOUBLE));
+  }
+
+  private static DefaultFunctionResolver mod() {
+    return modulusBase(BuiltinFunctionName.MOD.getName());
+  }
+
+  private static DefaultFunctionResolver modulus() {
+    return modulusBase(BuiltinFunctionName.MODULUS.getName());
+  }
+
+  private static DefaultFunctionResolver modulusFunction() {
+    return modulusBase(BuiltinFunctionName.MODULUSFUNCTION.getName());
+  }
+
+  /**
+   * Definition of multiply(x, y) function.<br>
+   * Returns the number x multiplied by number y<br>
+   * The supported signature of multiply function is<br>
+   * (x: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE, y: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE)<br>
+   * </> -> wider type between types of x and y
+   */
+  private static DefaultFunctionResolver multiplyBase(FunctionName functionName) {
+    return define(
+        functionName,
+        impl(
+            nullMissingHandling((v1, v2) -> new ExprByteValue(v1.byteValue() * v2.byteValue())),
+            BYTE,
+            BYTE,
+            BYTE),
+        impl(
+            nullMissingHandling((v1, v2) -> new ExprShortValue(v1.shortValue() * v2.shortValue())),
+            SHORT,
+            SHORT,
+            SHORT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    new ExprIntegerValue(Math.multiplyExact(v1.integerValue(), v2.integerValue()))),
+            INTEGER,
+            INTEGER,
+            INTEGER),
+        impl(
+            nullMissingHandling(
                 (v1, v2) -> new ExprLongValue(Math.multiplyExact(v1.longValue(), v2.longValue()))),
-            LONG, LONG, LONG),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprFloatValue(v1.floatValue() * v2.floatValue())),
-            FLOAT, FLOAT, FLOAT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
+            LONG,
+            LONG,
+            LONG),
+        impl(
+            nullMissingHandling((v1, v2) -> new ExprFloatValue(v1.floatValue() * v2.floatValue())),
+            FLOAT,
+            FLOAT,
+            FLOAT),
+        impl(
+            nullMissingHandling(
                 (v1, v2) -> new ExprDoubleValue(v1.doubleValue() * v2.doubleValue())),
-            DOUBLE, DOUBLE, DOUBLE)
-    );
+            DOUBLE,
+            DOUBLE,
+            DOUBLE));
   }
 
-  private static DefaultFunctionResolver divide() {
-    return FunctionDSL.define(BuiltinFunctionName.DIVIDE.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprByteValue(v1.byteValue() / v2.byteValue())),
-            BYTE, BYTE, BYTE),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.shortValue() == 0 ? ExprNullValue.of() :
-                    new ExprShortValue(v1.shortValue() / v2.shortValue())),
-            SHORT, SHORT, SHORT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.integerValue() == 0 ? ExprNullValue.of() :
-                    new ExprIntegerValue(v1.integerValue() / v2.integerValue())),
-            INTEGER, INTEGER, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.longValue() == 0 ? ExprNullValue.of() :
-                    new ExprLongValue(v1.longValue() / v2.longValue())),
-            LONG, LONG, LONG),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.floatValue() == 0 ? ExprNullValue.of() :
-                    new ExprFloatValue(v1.floatValue() / v2.floatValue())),
-            FLOAT, FLOAT, FLOAT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.doubleValue() == 0 ? ExprNullValue.of() :
-                    new ExprDoubleValue(v1.doubleValue() / v2.doubleValue())),
-            DOUBLE, DOUBLE, DOUBLE)
-    );
-  }
-
-
-  private static DefaultFunctionResolver modules() {
-    return FunctionDSL.define(BuiltinFunctionName.MODULES.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprByteValue(v1.byteValue() % v2.byteValue())),
-            BYTE, BYTE, BYTE),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.shortValue() == 0 ? ExprNullValue.of() :
-                    new ExprShortValue(v1.shortValue() % v2.shortValue())),
-            SHORT, SHORT, SHORT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.integerValue() == 0 ? ExprNullValue.of() :
-                    new ExprIntegerValue(v1.integerValue() % v2.integerValue())),
-            INTEGER, INTEGER, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.longValue() == 0 ? ExprNullValue.of() :
-                    new ExprLongValue(v1.longValue() % v2.longValue())),
-            LONG, LONG, LONG),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.floatValue() == 0 ? ExprNullValue.of() :
-                    new ExprFloatValue(v1.floatValue() % v2.floatValue())),
-            FLOAT, FLOAT, FLOAT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.doubleValue() == 0 ? ExprNullValue.of() :
-                    new ExprDoubleValue(v1.doubleValue() % v2.doubleValue())),
-            DOUBLE, DOUBLE, DOUBLE)
-    );
+  private static DefaultFunctionResolver multiply() {
+    return multiplyBase(BuiltinFunctionName.MULTIPLY.getName());
+  }
+
+  private static DefaultFunctionResolver multiplyFunction() {
+    return multiplyBase(BuiltinFunctionName.MULTIPLYFUNCTION.getName());
+  }
+
+  /**
+   * Definition of subtract(x, y) function.<br>
+   * Returns the number x minus number y<br>
+   * The supported signature of subtract function is<br>
+   * (x: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE, y: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE)<br>
+   * -> wider type between types of x and y
+   */
+  private static DefaultFunctionResolver subtractBase(FunctionName functionName) {
+    return define(
+        functionName,
+        impl(
+            nullMissingHandling((v1, v2) -> new ExprByteValue(v1.byteValue() - v2.byteValue())),
+            BYTE,
+            BYTE,
+            BYTE),
+        impl(
+            nullMissingHandling((v1, v2) -> new ExprShortValue(v1.shortValue() - v2.shortValue())),
+            SHORT,
+            SHORT,
+            SHORT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    new ExprIntegerValue(Math.subtractExact(v1.integerValue(), v2.integerValue()))),
+            INTEGER,
+            INTEGER,
+            INTEGER),
+        impl(
+            nullMissingHandling(
+                (v1, v2) -> new ExprLongValue(Math.subtractExact(v1.longValue(), v2.longValue()))),
+            LONG,
+            LONG,
+            LONG),
+        impl(
+            nullMissingHandling((v1, v2) -> new ExprFloatValue(v1.floatValue() - v2.floatValue())),
+            FLOAT,
+            FLOAT,
+            FLOAT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) -> new ExprDoubleValue(v1.doubleValue() - v2.doubleValue())),
+            DOUBLE,
+            DOUBLE,
+            DOUBLE));
+  }
+
+  private static DefaultFunctionResolver subtract() {
+    return subtractBase(BuiltinFunctionName.SUBTRACT.getName());
+  }
+
+  private static DefaultFunctionResolver subtractFunction() {
+    return subtractBase(BuiltinFunctionName.SUBTRACTFUNCTION.getName());
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/operator/arthmetic/MathematicalFunction.java b/core/src/main/java/org/opensearch/sql/expression/operator/arthmetic/MathematicalFunction.java
index 0e4df086fb..22f4b76573 100644
--- a/core/src/main/java/org/opensearch/sql/expression/operator/arthmetic/MathematicalFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/operator/arthmetic/MathematicalFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.operator.arthmetic;
 
 import static org.opensearch.sql.data.type.ExprCoreType.BYTE;
@@ -13,6 +12,9 @@
 import static org.opensearch.sql.data.type.ExprCoreType.LONG;
 import static org.opensearch.sql.data.type.ExprCoreType.SHORT;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.expression.function.FunctionDSL.define;
+import static org.opensearch.sql.expression.function.FunctionDSL.impl;
+import static org.opensearch.sql.expression.function.FunctionDSL.nullMissingHandling;
 
 import com.google.common.collect.ImmutableList;
 import java.math.BigDecimal;
@@ -32,13 +34,13 @@
 import org.opensearch.sql.data.model.ExprNullValue;
 import org.opensearch.sql.data.model.ExprShortValue;
 import org.opensearch.sql.data.model.ExprStringValue;
+import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
 import org.opensearch.sql.expression.function.DefaultFunctionResolver;
 import org.opensearch.sql.expression.function.FunctionBuilder;
-import org.opensearch.sql.expression.function.FunctionDSL;
 import org.opensearch.sql.expression.function.FunctionName;
 import org.opensearch.sql.expression.function.FunctionSignature;
 import org.opensearch.sql.expression.function.SerializableFunction;
@@ -52,161 +54,202 @@ public class MathematicalFunction {
    */
   public static void register(BuiltinFunctionRepository repository) {
     repository.register(abs());
+    repository.register(acos());
+    repository.register(asin());
+    repository.register(atan());
+    repository.register(atan2());
     repository.register(cbrt());
     repository.register(ceil());
     repository.register(ceiling());
     repository.register(conv());
+    repository.register(cos());
+    repository.register(cosh());
+    repository.register(cot());
     repository.register(crc32());
+    repository.register(degrees());
     repository.register(euler());
     repository.register(exp());
+    repository.register(expm1());
     repository.register(floor());
     repository.register(ln());
     repository.register(log());
     repository.register(log10());
     repository.register(log2());
     repository.register(mod());
+    repository.register(pi());
     repository.register(pow());
     repository.register(power());
+    repository.register(radians());
+    repository.register(rand());
+    repository.register(rint());
     repository.register(round());
     repository.register(sign());
-    repository.register(sqrt());
-    repository.register(truncate());
-    repository.register(pi());
-    repository.register(rand());
-    repository.register(acos());
-    repository.register(asin());
-    repository.register(atan());
-    repository.register(atan2());
-    repository.register(cos());
-    repository.register(cot());
-    repository.register(degrees());
-    repository.register(radians());
+    repository.register(signum());
     repository.register(sin());
+    repository.register(sinh());
+    repository.register(sqrt());
     repository.register(tan());
+    repository.register(truncate());
+  }
+
+  /**
+   * Base function for math functions with similar formats that return DOUBLE.
+   *
+   * @param functionName BuiltinFunctionName of math function.
+   * @param formula lambda function of math formula.
+   * @param returnType data type return type of the calling function
+   * @return DefaultFunctionResolver for math functions.
+   */
+  private static DefaultFunctionResolver baseMathFunction(
+      FunctionName functionName,
+      SerializableFunction<ExprValue, ExprValue> formula,
+      ExprCoreType returnType) {
+    return define(
+        functionName,
+        ExprCoreType.numberTypes().stream()
+            .map(type -> impl(nullMissingHandling(formula), returnType, type))
+            .collect(Collectors.toList()));
   }
 
   /**
-   * Definition of abs() function. The supported signature of abs() function are INT -> INT LONG ->
-   * LONG FLOAT -> FLOAT DOUBLE -> DOUBLE
+   * <b>Definition of abs() function.<\b><br>
+   * The supported signature of abs() function are<br>
+   * INT/LONG/FLOAT/DOUBLE -> INT/LONG/FLOAT/DOUBLE
    */
   private static DefaultFunctionResolver abs() {
-    return FunctionDSL.define(BuiltinFunctionName.ABS.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(v -> new ExprByteValue(Math.abs(v.byteValue()))),
-            BYTE, BYTE),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(v -> new ExprShortValue(Math.abs(v.shortValue()))),
-            SHORT, SHORT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(v -> new ExprIntegerValue(Math.abs(v.integerValue()))),
-            INTEGER, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(v -> new ExprLongValue(Math.abs(v.longValue()))),
-            LONG, LONG),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(v -> new ExprFloatValue(Math.abs(v.floatValue()))),
-            FLOAT, FLOAT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(v -> new ExprDoubleValue(Math.abs(v.doubleValue()))),
-            DOUBLE, DOUBLE)
-    );
-  }
-
-  /**
-   * Definition of ceil(x)/ceiling(x) function. Calculate the next highest integer that x rounds up
-   * to The supported signature of ceil/ceiling function is DOUBLE -> INTEGER
+    return define(
+        BuiltinFunctionName.ABS.getName(),
+        impl(nullMissingHandling(v -> new ExprByteValue(Math.abs(v.byteValue()))), BYTE, BYTE),
+        impl(nullMissingHandling(v -> new ExprShortValue(Math.abs(v.shortValue()))), SHORT, SHORT),
+        impl(
+            nullMissingHandling(v -> new ExprIntegerValue(Math.abs(v.integerValue()))),
+            INTEGER,
+            INTEGER),
+        impl(nullMissingHandling(v -> new ExprLongValue(Math.abs(v.longValue()))), LONG, LONG),
+        impl(nullMissingHandling(v -> new ExprFloatValue(Math.abs(v.floatValue()))), FLOAT, FLOAT),
+        impl(
+            nullMissingHandling(v -> new ExprDoubleValue(Math.abs(v.doubleValue()))),
+            DOUBLE,
+            DOUBLE));
+  }
+
+  /**
+   * <b>Definition of ceil(x)/ceiling(x) function.<\b><br>
+   * Calculate the next highest integer that x rounds up to The supported signature of ceil/ceiling
+   * function is DOUBLE -> INTEGER
    */
   private static DefaultFunctionResolver ceil() {
-    return FunctionDSL.define(BuiltinFunctionName.CEIL.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(v -> new ExprIntegerValue(Math.ceil(v.doubleValue()))),
-            INTEGER, DOUBLE)
-    );
+    return define(
+        BuiltinFunctionName.CEIL.getName(),
+        impl(
+            nullMissingHandling(v -> new ExprLongValue(Math.ceil(v.doubleValue()))), LONG, DOUBLE));
   }
 
   private static DefaultFunctionResolver ceiling() {
-    return FunctionDSL.define(BuiltinFunctionName.CEILING.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(v -> new ExprIntegerValue(Math.ceil(v.doubleValue()))),
-            INTEGER, DOUBLE)
-    );
+    return define(
+        BuiltinFunctionName.CEILING.getName(),
+        impl(
+            nullMissingHandling(v -> new ExprLongValue(Math.ceil(v.doubleValue()))), LONG, DOUBLE));
   }
 
   /**
-   * Definition of conv(x, a, b) function.
-   * Convert number x from base a to base b
-   * The supported signature of floor function is
-   * (STRING, INTEGER, INTEGER) -> STRING
+   * <b>Definition of conv(x, a, b) function.<\b><br>
+   * Convert number x from base a to base b<br>
+   * The supported signature of floor function is<br>
+   * (STRING, INTEGER, INTEGER) -> STRING<br>
    * (INTEGER, INTEGER, INTEGER) -> STRING
    */
   private static DefaultFunctionResolver conv() {
-    return FunctionDSL.define(BuiltinFunctionName.CONV.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling((x, a, b) -> new ExprStringValue(
-                Integer.toString(Integer.parseInt(x.stringValue(), a.integerValue()),
-                    b.integerValue())
-            )),
-            STRING, STRING, INTEGER, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling((x, a, b) -> new ExprStringValue(
-                Integer.toString(Integer.parseInt(x.integerValue().toString(), a.integerValue()),
-                    b.integerValue())
-            )),
-            STRING, INTEGER, INTEGER, INTEGER)
-    );
-  }
-
-  /**
-   * Definition of crc32(x) function.
-   * Calculate a cyclic redundancy check value and returns a 32-bit unsigned value
-   * The supported signature of crc32 function is
+    return define(
+        BuiltinFunctionName.CONV.getName(),
+        impl(
+            nullMissingHandling(
+                (x, a, b) ->
+                    new ExprStringValue(
+                        Integer.toString(
+                            Integer.parseInt(x.stringValue(), a.integerValue()),
+                            b.integerValue()))),
+            STRING,
+            STRING,
+            INTEGER,
+            INTEGER),
+        impl(
+            nullMissingHandling(
+                (x, a, b) ->
+                    new ExprStringValue(
+                        Integer.toString(
+                            Integer.parseInt(x.integerValue().toString(), a.integerValue()),
+                            b.integerValue()))),
+            STRING,
+            INTEGER,
+            INTEGER,
+            INTEGER));
+  }
+
+  /**
+   * <b>Definition of crc32(x) function.<\b><br>
+   * Calculate a cyclic redundancy check value and returns a 32-bit unsigned value<br>
+   * The supported signature of crc32 function is<br>
    * STRING -> LONG
    */
   private static DefaultFunctionResolver crc32() {
-    return FunctionDSL.define(BuiltinFunctionName.CRC32.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(v -> {
-              CRC32 crc = new CRC32();
-              crc.update(v.stringValue().getBytes());
-              return new ExprLongValue(crc.getValue());
-            }),
-            LONG, STRING)
-    );
+    return define(
+        BuiltinFunctionName.CRC32.getName(),
+        impl(
+            nullMissingHandling(
+                v -> {
+                  CRC32 crc = new CRC32();
+                  crc.update(v.stringValue().getBytes());
+                  return new ExprLongValue(crc.getValue());
+                }),
+            LONG,
+            STRING));
   }
 
   /**
-   * Definition of e() function.
-   * Get the Euler's number.
-   * () -> DOUBLE
+   * <b>Definition of e() function.</b><br>
+   * Get the Euler's number. () -> DOUBLE
    */
   private static DefaultFunctionResolver euler() {
-    return FunctionDSL.define(BuiltinFunctionName.E.getName(),
-        FunctionDSL.impl(() -> new ExprDoubleValue(Math.E), DOUBLE)
-    );
+    return define(BuiltinFunctionName.E.getName(), impl(() -> new ExprDoubleValue(Math.E), DOUBLE));
   }
 
   /**
-   * Definition of exp(x) function. Calculate exponent function e to the x The supported signature
-   * of exp function is INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
+   * <b>Definition of exp(x) function.<b><br>
+   * Calculate exponent function e to the x The supported signature of exp function is
+   * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver exp() {
-    return FunctionDSL.define(BuiltinFunctionName.EXP.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue(Math.exp(v.doubleValue()))),
-                type, DOUBLE)).collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.EXP.getName(),
+        v -> new ExprDoubleValue(Math.exp(v.doubleValue())),
+        DOUBLE);
+  }
+
+  /**
+   * <b>Definition of expm1(x) function.</b><br>
+   * Calculate exponent function e to the x, minus 1 The supported signature of exp function is
+   * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
+   */
+  private static DefaultFunctionResolver expm1() {
+    return baseMathFunction(
+        BuiltinFunctionName.EXPM1.getName(),
+        v -> new ExprDoubleValue(Math.expm1(v.doubleValue())),
+        DOUBLE);
   }
 
   /**
-   * Definition of floor(x) function. Calculate the next nearest whole integer that x rounds down to
-   * The supported signature of floor function is DOUBLE -> INTEGER
+   * <b>Definition of floor(x) function.</b><br>
+   * Calculate the next nearest whole integer that x rounds down to The supported signature of floor
+   * function is DOUBLE -> INTEGER
    */
   private static DefaultFunctionResolver floor() {
-    return FunctionDSL.define(BuiltinFunctionName.FLOOR.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(v -> new ExprIntegerValue(Math.floor(v.doubleValue()))),
-            INTEGER, DOUBLE)
-    );
+    return define(
+        BuiltinFunctionName.FLOOR.getName(),
+        impl(
+            nullMissingHandling(v -> new ExprLongValue(Math.floor(v.doubleValue()))),
+            LONG,
+            DOUBLE));
   }
 
   /**
@@ -214,479 +257,660 @@ private static DefaultFunctionResolver floor() {
    * ln function is INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver ln() {
-    return FunctionDSL.define(BuiltinFunctionName.LN.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue(Math.log(v.doubleValue()))),
-                type, DOUBLE)).collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.LN.getName(),
+        v ->
+            v.doubleValue() <= 0
+                ? ExprNullValue.of()
+                : new ExprDoubleValue(Math.log(v.doubleValue())),
+        DOUBLE);
   }
 
   /**
-   * Definition of log(b, x) function. Calculate the logarithm of x using b as the base The
-   * supported signature of log function is (b: INTEGER/LONG/FLOAT/DOUBLE, x:
-   * INTEGER/LONG/FLOAT/DOUBLE]) -> DOUBLE
+   * <b>Definition of log(b, x) function.</b><br>
+   * Calculate the logarithm of x using b as the base The supported signature of log function is<br>
+   * (b: INTEGER/LONG/FLOAT/DOUBLE, x: INTEGER/LONG/FLOAT/DOUBLE]) -> DOUBLE
    */
   private static DefaultFunctionResolver log() {
-    ImmutableList.Builder<SerializableFunction<FunctionName, Pair<FunctionSignature,
-        FunctionBuilder>>> builder = new ImmutableList.Builder<>();
+    ImmutableList.Builder<
+            SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>>
+        builder = new ImmutableList.Builder<>();
 
     // build unary log(x), SHORT/INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
     for (ExprType type : ExprCoreType.numberTypes()) {
-      builder.add(FunctionDSL.impl(FunctionDSL
-              .nullMissingHandling(v -> new ExprDoubleValue(Math.log(v.doubleValue()))),
-          DOUBLE, type));
+      builder.add(
+          impl(
+              nullMissingHandling(
+                  v ->
+                      v.doubleValue() <= 0
+                          ? ExprNullValue.of()
+                          : new ExprDoubleValue(Math.log(v.doubleValue()))),
+              DOUBLE,
+              type));
     }
 
     // build binary function log(b, x)
     for (ExprType baseType : ExprCoreType.numberTypes()) {
       for (ExprType numberType : ExprCoreType.numberTypes()) {
-        builder.add(FunctionDSL.impl(FunctionDSL
-                .nullMissingHandling((b, x) -> new ExprDoubleValue(
-                    Math.log(x.doubleValue()) / Math.log(b.doubleValue()))),
-            DOUBLE, baseType, numberType));
+        builder.add(
+            impl(
+                nullMissingHandling(
+                    (b, x) ->
+                        b.doubleValue() <= 0 || x.doubleValue() <= 0
+                            ? ExprNullValue.of()
+                            : new ExprDoubleValue(
+                                Math.log(x.doubleValue()) / Math.log(b.doubleValue()))),
+                DOUBLE,
+                baseType,
+                numberType));
       }
     }
-    return FunctionDSL.define(BuiltinFunctionName.LOG.getName(), builder.build());
+    return define(BuiltinFunctionName.LOG.getName(), builder.build());
   }
 
-
   /**
-   * Definition of log10(x) function. Calculate base-10 logarithm of x The supported signature of
+   * <b>Definition of log10(x) function.</b><br>
+   * Calculate base-10 logarithm of x The supported signature of<br>
    * log function is SHORT/INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver log10() {
-    return FunctionDSL.define(BuiltinFunctionName.LOG10.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue(Math.log10(v.doubleValue()))),
-                type, DOUBLE)).collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.LOG10.getName(),
+        v ->
+            v.doubleValue() <= 0
+                ? ExprNullValue.of()
+                : new ExprDoubleValue(Math.log10(v.doubleValue())),
+        DOUBLE);
   }
 
   /**
-   * Definition of log2(x) function. Calculate base-2 logarithm of x The supported signature of log
+   * <b>Definition of log2(x) function.</b><br>
+   * Calculate base-2 logarithm of x The supported signature of log<br>
    * function is SHORT/INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver log2() {
-    return FunctionDSL.define(BuiltinFunctionName.LOG2.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue(Math.log(v.doubleValue()) / Math.log(2))), DOUBLE, type))
-            .collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.LOG2.getName(),
+        v ->
+            v.doubleValue() <= 0
+                ? ExprNullValue.of()
+                : new ExprDoubleValue(Math.log(v.doubleValue()) / Math.log(2)),
+        DOUBLE);
   }
 
   /**
-   * Definition of mod(x, y) function.
-   * Calculate the remainder of x divided by y
-   * The supported signature of mod function is
-   * (x: INTEGER/LONG/FLOAT/DOUBLE, y: INTEGER/LONG/FLOAT/DOUBLE)
+   * <b>Definition of mod(x, y) function.</b><br>
+   * Calculate the remainder of x divided by y<br>
+   * The supported signature of mod function is<br>
+   * (x: INTEGER/LONG/FLOAT/DOUBLE, y: INTEGER/LONG/FLOAT/DOUBLE)<br>
    * -> wider type between types of x and y
    */
   private static DefaultFunctionResolver mod() {
-    return FunctionDSL.define(BuiltinFunctionName.MOD.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.byteValue() == 0 ? ExprNullValue.of() :
-                    new ExprByteValue(v1.byteValue() % v2.byteValue())),
-            BYTE, BYTE, BYTE),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.shortValue() == 0 ? ExprNullValue.of() :
-                    new ExprShortValue(v1.shortValue() % v2.shortValue())),
-            SHORT, SHORT, SHORT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.shortValue() == 0 ? ExprNullValue.of() :
-                    new ExprIntegerValue(Math.floorMod(v1.integerValue(),
-                        v2.integerValue()))),
-            INTEGER, INTEGER, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.shortValue() == 0 ? ExprNullValue.of() :
-                    new ExprLongValue(Math.floorMod(v1.longValue(), v2.longValue()))),
-            LONG, LONG, LONG),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.shortValue() == 0 ? ExprNullValue.of() :
-                    new ExprFloatValue(v1.floatValue() % v2.floatValue())),
-            FLOAT, FLOAT, FLOAT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> v2.shortValue() == 0 ? ExprNullValue.of() :
-                    new ExprDoubleValue(v1.doubleValue() % v2.doubleValue())),
-            DOUBLE, DOUBLE, DOUBLE)
-    );
-  }
-
-  /**
-   * Definition of pi() function.
-   * Get the value of pi.
+    return define(
+        BuiltinFunctionName.MOD.getName(),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.byteValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprByteValue(v1.byteValue() % v2.byteValue())),
+            BYTE,
+            BYTE,
+            BYTE),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.shortValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprShortValue(v1.shortValue() % v2.shortValue())),
+            SHORT,
+            SHORT,
+            SHORT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.shortValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprIntegerValue(
+                            Math.floorMod(v1.integerValue(), v2.integerValue()))),
+            INTEGER,
+            INTEGER,
+            INTEGER),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.shortValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprLongValue(Math.floorMod(v1.longValue(), v2.longValue()))),
+            LONG,
+            LONG,
+            LONG),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.shortValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprFloatValue(v1.floatValue() % v2.floatValue())),
+            FLOAT,
+            FLOAT,
+            FLOAT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v2.shortValue() == 0
+                        ? ExprNullValue.of()
+                        : new ExprDoubleValue(v1.doubleValue() % v2.doubleValue())),
+            DOUBLE,
+            DOUBLE,
+            DOUBLE));
+  }
+
+  /**
+   * <b>Definition of pi() function.</b><br>
+   * Get the value of pi.<br>
    * () -> DOUBLE
    */
   private static DefaultFunctionResolver pi() {
-    return FunctionDSL.define(BuiltinFunctionName.PI.getName(),
-        FunctionDSL.impl(() -> new ExprDoubleValue(Math.PI), DOUBLE)
-    );
+    return define(
+        BuiltinFunctionName.PI.getName(), impl(() -> new ExprDoubleValue(Math.PI), DOUBLE));
   }
 
   /**
-   * Definition of pow(x, y)/power(x, y) function.
-   * Calculate the value of x raised to the power of y
-   * The supported signature of pow/power function is
-   * (INTEGER, INTEGER) -> DOUBLE
-   * (LONG, LONG) -> DOUBLE
-   * (FLOAT, FLOAT) -> DOUBLE
+   * <b>Definition of pow(x, y)/power(x, y) function.</b><br>
+   * Calculate the value of x raised to the power of y<br>
+   * The supported signature of pow/power function is<br>
+   * (INTEGER, INTEGER) -> DOUBLE<br>
+   * (LONG, LONG) -> DOUBLE<br>
+   * (FLOAT, FLOAT) -> DOUBLE<br>
    * (DOUBLE, DOUBLE) -> DOUBLE
    */
   private static DefaultFunctionResolver pow() {
-    return FunctionDSL.define(BuiltinFunctionName.POW.getName(), powerFunctionImpl());
+    return define(BuiltinFunctionName.POW.getName(), powerFunctionImpl());
   }
 
   private static DefaultFunctionResolver power() {
-    return FunctionDSL.define(BuiltinFunctionName.POWER.getName(), powerFunctionImpl());
-  }
-
-  private List<SerializableFunction<FunctionName, Pair<FunctionSignature,
-      FunctionBuilder>>> powerFunctionImpl() {
-    return Arrays.asList(FunctionDSL.impl(
-        FunctionDSL.nullMissingHandling(
-            (v1, v2) -> new ExprDoubleValue(Math.pow(v1.shortValue(), v2.shortValue()))),
-        DOUBLE, SHORT, SHORT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprDoubleValue(Math.pow(v1.integerValue(),
-                    v2.integerValue()))),
-            DOUBLE, INTEGER, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
+    return define(BuiltinFunctionName.POWER.getName(), powerFunctionImpl());
+  }
+
+  private List<SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>>
+      powerFunctionImpl() {
+    return Arrays.asList(
+        impl(
+            nullMissingHandling(
+                (v1, v2) -> new ExprDoubleValue(Math.pow(v1.shortValue(), v2.shortValue()))),
+            DOUBLE,
+            SHORT,
+            SHORT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) -> new ExprDoubleValue(Math.pow(v1.integerValue(), v2.integerValue()))),
+            DOUBLE,
+            INTEGER,
+            INTEGER),
+        impl(
+            nullMissingHandling(
                 (v1, v2) -> new ExprDoubleValue(Math.pow(v1.longValue(), v2.longValue()))),
-            DOUBLE, LONG, LONG),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprDoubleValue(Math.pow(v1.floatValue(), v2.floatValue()))),
-            DOUBLE, FLOAT, FLOAT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (v1, v2) -> new ExprDoubleValue(Math.pow(v1.doubleValue(), v2.doubleValue()))),
-            DOUBLE, DOUBLE, DOUBLE));
+            DOUBLE,
+            LONG,
+            LONG),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v1.floatValue() <= 0 && v2.floatValue() != Math.floor(v2.floatValue())
+                        ? ExprNullValue.of()
+                        : new ExprDoubleValue(Math.pow(v1.floatValue(), v2.floatValue()))),
+            DOUBLE,
+            FLOAT,
+            FLOAT),
+        impl(
+            nullMissingHandling(
+                (v1, v2) ->
+                    v1.doubleValue() <= 0 && v2.doubleValue() != Math.floor(v2.doubleValue())
+                        ? ExprNullValue.of()
+                        : new ExprDoubleValue(Math.pow(v1.doubleValue(), v2.doubleValue()))),
+            DOUBLE,
+            DOUBLE,
+            DOUBLE));
   }
 
   /**
-   * Definition of rand() and rand(N) function.
-   * rand() returns a random floating-point value in the range 0 <= value < 1.0
-   * If integer N is specified, the seed is initialized prior to execution.
+   * <b>Definition of rand() and rand(N) function.</b><br>
+   * rand() returns a random floating-point value in the range 0 <= value < 1.0<br>
+   * If integer N is specified, the seed is initialized prior to execution.<br>
    * One implication of this behavior is with identical argument N,rand(N) returns the same value
-   * each time, and thus produces a repeatable sequence of column values.
-   * The supported signature of rand function is
-   * ([INTEGER]) -> FLOAT
+   * <br>
+   * each time, and thus produces a repeatable sequence of column values. The supported signature of
+   * <br>
+   * rand function is ([INTEGER]) -> FLOAT
    */
   private static DefaultFunctionResolver rand() {
-    return FunctionDSL.define(BuiltinFunctionName.RAND.getName(),
-        FunctionDSL.impl(() -> new ExprFloatValue(new Random().nextFloat()), FLOAT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                v -> new ExprFloatValue(new Random(v.integerValue()).nextFloat())), FLOAT, INTEGER)
-    );
+    return define(
+        BuiltinFunctionName.RAND.getName(),
+        impl(() -> new ExprFloatValue(new Random().nextFloat()), FLOAT),
+        impl(
+            nullMissingHandling(v -> new ExprFloatValue(new Random(v.integerValue()).nextFloat())),
+            FLOAT,
+            INTEGER));
   }
 
   /**
-   * Definition of round(x)/round(x, d) function.
-   * Rounds the argument x to d decimal places, d defaults to 0 if not specified.
-   * The supported signature of round function is
-   * (x: INTEGER [, y: INTEGER]) -> INTEGER
-   * (x: LONG [, y: INTEGER]) -> LONG
-   * (x: FLOAT [, y: INTEGER]) -> FLOAT
+   * <b>Definition of rint(x) function.</b><br>
+   * Returns the closest whole integer value to x<br>
+   * The supported signature is<br>
+   * BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
+   */
+  private static DefaultFunctionResolver rint() {
+    return baseMathFunction(
+        BuiltinFunctionName.RINT.getName(),
+        v -> new ExprDoubleValue(Math.rint(v.doubleValue())),
+        DOUBLE);
+  }
+
+  /**
+   * <b>Definition of round(x)/round(x, d) function.</b><br>
+   * Rounds the argument x to d decimal places, d defaults to 0 if not specified.<br>
+   * The supported signature of round function is<br>
+   * (x: INTEGER [, y: INTEGER]) -> INTEGER<br>
+   * (x: LONG [, y: INTEGER]) -> LONG<br>
+   * (x: FLOAT [, y: INTEGER]) -> FLOAT<br>
    * (x: DOUBLE [, y: INTEGER]) -> DOUBLE
    */
   private static DefaultFunctionResolver round() {
-    return FunctionDSL.define(BuiltinFunctionName.ROUND.getName(),
+    return define(
+        BuiltinFunctionName.ROUND.getName(),
         // rand(x)
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                v -> new ExprLongValue((long) Math.round(v.integerValue()))),
-            LONG, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                v -> new ExprLongValue((long) Math.round(v.longValue()))),
-            LONG, LONG),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue((double) Math.round(v.floatValue()))),
-            DOUBLE, FLOAT),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue(new BigDecimal(v.doubleValue()).setScale(0,
-                    RoundingMode.HALF_UP).doubleValue())),
-            DOUBLE, DOUBLE),
+        impl(
+            nullMissingHandling(v -> new ExprLongValue((long) Math.round(v.integerValue()))),
+            LONG,
+            INTEGER),
+        impl(
+            nullMissingHandling(v -> new ExprLongValue((long) Math.round(v.longValue()))),
+            LONG,
+            LONG),
+        impl(
+            nullMissingHandling(v -> new ExprDoubleValue((double) Math.round(v.floatValue()))),
+            DOUBLE,
+            FLOAT),
+        impl(
+            nullMissingHandling(
+                v ->
+                    new ExprDoubleValue(
+                        new BigDecimal(v.doubleValue())
+                            .setScale(0, RoundingMode.HALF_UP)
+                            .doubleValue())),
+            DOUBLE,
+            DOUBLE),
 
         // rand(x, d)
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (x, d) -> new ExprLongValue(
-                    new BigDecimal(x.integerValue()).setScale(d.integerValue(),
-                        RoundingMode.HALF_UP).longValue())),
-            LONG, INTEGER, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (x, d) -> new ExprLongValue(new BigDecimal(x.longValue()).setScale(d.integerValue(),
-                    RoundingMode.HALF_UP).longValue())),
-            LONG, LONG, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (x, d) -> new ExprDoubleValue(new BigDecimal(x.floatValue())
-                    .setScale(d.integerValue(), RoundingMode.HALF_UP).doubleValue())),
-            DOUBLE, FLOAT, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (x, d) -> new ExprDoubleValue(new BigDecimal(x.doubleValue())
-                    .setScale(d.integerValue(), RoundingMode.HALF_UP).doubleValue())),
-            DOUBLE, DOUBLE, INTEGER));
-  }
-
-  /**
-   * Definition of sign(x) function.
-   * Returns the sign of the argument as -1, 0, or 1
-   * depending on whether x is negative, zero, or positive
-   * The supported signature is
+        impl(
+            nullMissingHandling(
+                (x, d) ->
+                    new ExprLongValue(
+                        new BigDecimal(x.integerValue())
+                            .setScale(d.integerValue(), RoundingMode.HALF_UP)
+                            .longValue())),
+            LONG,
+            INTEGER,
+            INTEGER),
+        impl(
+            nullMissingHandling(
+                (x, d) ->
+                    new ExprLongValue(
+                        new BigDecimal(x.longValue())
+                            .setScale(d.integerValue(), RoundingMode.HALF_UP)
+                            .longValue())),
+            LONG,
+            LONG,
+            INTEGER),
+        impl(
+            nullMissingHandling(
+                (x, d) ->
+                    new ExprDoubleValue(
+                        new BigDecimal(x.floatValue())
+                            .setScale(d.integerValue(), RoundingMode.HALF_UP)
+                            .doubleValue())),
+            DOUBLE,
+            FLOAT,
+            INTEGER),
+        impl(
+            nullMissingHandling(
+                (x, d) ->
+                    new ExprDoubleValue(
+                        new BigDecimal(x.doubleValue())
+                            .setScale(d.integerValue(), RoundingMode.HALF_UP)
+                            .doubleValue())),
+            DOUBLE,
+            DOUBLE,
+            INTEGER));
+  }
+
+  /**
+   * <b>Definition of sign(x) function.</b><br>
+   * Returns the sign of the argument as -1, 0, or 1<br>
+   * depending on whether x is negative, zero, or positive<br>
+   * The supported signature is<br>
    * SHORT/INTEGER/LONG/FLOAT/DOUBLE -> INTEGER
    */
   private static DefaultFunctionResolver sign() {
-    return FunctionDSL.define(BuiltinFunctionName.SIGN.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> new ExprIntegerValue(Math.signum(v.doubleValue()))),
-                INTEGER, type)).collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.SIGN.getName(),
+        v -> new ExprIntegerValue(Math.signum(v.doubleValue())),
+        INTEGER);
+  }
+
+  /**
+   * <b>Definition of signum(x) function.</b><br>
+   * Returns the sign of the argument as -1.0, 0, or 1.0<br>
+   * depending on whether x is negative, zero, or positive<br>
+   * The supported signature is<br>
+   * BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE -> INTEGER
+   */
+  private static DefaultFunctionResolver signum() {
+    return baseMathFunction(
+        BuiltinFunctionName.SIGNUM.getName(),
+        v -> new ExprIntegerValue(Math.signum(v.doubleValue())),
+        INTEGER);
+  }
+
+  /**
+   * <b>Definition of sinh(x) function.</b><br>
+   * Returns the hyperbolix sine of x, defined as (((e^x) - (e^(-x))) / 2)<br>
+   * The supported signature is<br>
+   * BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
+   */
+  private static DefaultFunctionResolver sinh() {
+    return baseMathFunction(
+        BuiltinFunctionName.SINH.getName(),
+        v -> new ExprDoubleValue(Math.sinh(v.doubleValue())),
+        DOUBLE);
   }
 
   /**
-   * Definition of sqrt(x) function.
-   * Calculate the square root of a non-negative number x
-   * The supported signature is
+   * <b>Definition of sqrt(x) function.</b><br>
+   * Calculate the square root of a non-negative number x<br>
+   * The supported signature is<br>
    * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver sqrt() {
-    return FunctionDSL.define(BuiltinFunctionName.SQRT.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> v.doubleValue() < 0 ? ExprNullValue.of() :
-                    new ExprDoubleValue(Math.sqrt(v.doubleValue()))),
-                DOUBLE, type)).collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.SQRT.getName(),
+        v ->
+            v.doubleValue() < 0
+                ? ExprNullValue.of()
+                : new ExprDoubleValue(Math.sqrt(v.doubleValue())),
+        DOUBLE);
   }
 
   /**
-   * Definition of cbrt(x) function.
-   * Calculate the cube root of a number x
-   * The supported signature is
+   * <b>Definition of cbrt(x) function.</b><br>
+   * Calculate the cube root of a number x<br>
+   * The supported signature is<br>
    * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver cbrt() {
-    return FunctionDSL.define(BuiltinFunctionName.CBRT.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue(Math.cbrt(v.doubleValue()))),
-                DOUBLE, type)).collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.CBRT.getName(),
+        v -> new ExprDoubleValue(Math.cbrt(v.doubleValue())),
+        DOUBLE);
   }
 
   /**
-   * Definition of truncate(x, d) function.
-   * Returns the number x, truncated to d decimal places
-   * The supported signature of round function is
-   * (x: INTEGER, y: INTEGER) -> LONG
-   * (x: LONG, y: INTEGER) -> LONG
-   * (x: FLOAT, y: INTEGER) -> DOUBLE
+   * <b>Definition of truncate(x, d) function.</b><br>
+   * Returns the number x, truncated to d decimal places<br>
+   * The supported signature of round function is<br>
+   * (x: INTEGER, y: INTEGER) -> LONG<br>
+   * (x: LONG, y: INTEGER) -> LONG<br>
+   * (x: FLOAT, y: INTEGER) -> DOUBLE<br>
    * (x: DOUBLE, y: INTEGER) -> DOUBLE
    */
   private static DefaultFunctionResolver truncate() {
-    return FunctionDSL.define(BuiltinFunctionName.TRUNCATE.getName(),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (x, y) -> new ExprLongValue(
-                    new BigDecimal(x.integerValue()).setScale(y.integerValue(),
-                        RoundingMode.DOWN).longValue())),
-            LONG, INTEGER, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (x, y) -> new ExprLongValue(
-                    new BigDecimal(x.integerValue()).setScale(y.integerValue(),
-                        RoundingMode.DOWN).longValue())),
-            LONG, LONG, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (x, y) -> new ExprDoubleValue(
-                    new BigDecimal(x.floatValue()).setScale(y.integerValue(),
-                        RoundingMode.DOWN).doubleValue())),
-            DOUBLE, FLOAT, INTEGER),
-        FunctionDSL.impl(
-            FunctionDSL.nullMissingHandling(
-                (x, y) -> new ExprDoubleValue(
-                    new BigDecimal(x.doubleValue()).setScale(y.integerValue(),
-                        RoundingMode.DOWN).doubleValue())),
-            DOUBLE, DOUBLE, INTEGER));
-  }
-
-  /**
-   * Definition of acos(x) function.
-   * Calculates the arc cosine of x, that is, the value whose cosine is x.
-   * Returns NULL if x is not in the range -1 to 1.
-   * The supported signature of acos function is
+    return define(
+        BuiltinFunctionName.TRUNCATE.getName(),
+        impl(
+            nullMissingHandling(
+                (x, y) ->
+                    new ExprLongValue(
+                        BigDecimal.valueOf(x.integerValue())
+                            .setScale(y.integerValue(), RoundingMode.DOWN)
+                            .longValue())),
+            LONG,
+            INTEGER,
+            INTEGER),
+        impl(
+            nullMissingHandling(
+                (x, y) ->
+                    new ExprLongValue(
+                        BigDecimal.valueOf(x.longValue())
+                            .setScale(y.integerValue(), RoundingMode.DOWN)
+                            .longValue())),
+            LONG,
+            LONG,
+            INTEGER),
+        impl(
+            nullMissingHandling(
+                (x, y) ->
+                    new ExprDoubleValue(
+                        BigDecimal.valueOf(x.floatValue())
+                            .setScale(y.integerValue(), RoundingMode.DOWN)
+                            .doubleValue())),
+            DOUBLE,
+            FLOAT,
+            INTEGER),
+        impl(
+            nullMissingHandling(
+                (x, y) ->
+                    new ExprDoubleValue(
+                        BigDecimal.valueOf(x.doubleValue())
+                            .setScale(y.integerValue(), RoundingMode.DOWN)
+                            .doubleValue())),
+            DOUBLE,
+            DOUBLE,
+            INTEGER));
+  }
+
+  /**
+   * <b>Definition of acos(x) function.</b><br>
+   * Calculates the arc cosine of x, that is, the value whose cosine is x.<br>
+   * Returns NULL if x is not in the range -1 to 1.<br>
+   * The supported signature of acos function is<br>
    * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver acos() {
-    return FunctionDSL.define(BuiltinFunctionName.ACOS.getName(),
+    return define(
+        BuiltinFunctionName.ACOS.getName(),
         ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> v.doubleValue() < -1 || v.doubleValue() > 1 ? ExprNullValue.of() :
-                    new ExprDoubleValue(Math.acos(v.doubleValue()))),
-                DOUBLE, type)).collect(Collectors.toList()));
+            .map(
+                type ->
+                    impl(
+                        nullMissingHandling(
+                            v ->
+                                v.doubleValue() < -1 || v.doubleValue() > 1
+                                    ? ExprNullValue.of()
+                                    : new ExprDoubleValue(Math.acos(v.doubleValue()))),
+                        DOUBLE,
+                        type))
+            .collect(Collectors.toList()));
   }
 
   /**
-   * Definition of asin(x) function.
-   * Calculates the arc sine of x, that is, the value whose sine is x.
-   * Returns NULL if x is not in the range -1 to 1.
-   * The supported signature of asin function is
-   * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
+   * <b>Definition of asin(x) function.</b><br>
+   * Calculates the arc sine of x, that is, the value whose sine is x.<br>
+   * Returns NULL if x is not in the range -1 to 1.<br>
+   * The supported signature of asin function is<br>
+   * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE<br>
    */
   private static DefaultFunctionResolver asin() {
-    return FunctionDSL.define(BuiltinFunctionName.ASIN.getName(),
+    return define(
+        BuiltinFunctionName.ASIN.getName(),
         ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> v.doubleValue() < -1 || v.doubleValue() > 1 ? ExprNullValue.of() :
-                    new ExprDoubleValue(Math.asin(v.doubleValue()))),
-                DOUBLE, type)).collect(Collectors.toList()));
+            .map(
+                type ->
+                    impl(
+                        nullMissingHandling(
+                            v ->
+                                v.doubleValue() < -1 || v.doubleValue() > 1
+                                    ? ExprNullValue.of()
+                                    : new ExprDoubleValue(Math.asin(v.doubleValue()))),
+                        DOUBLE,
+                        type))
+            .collect(Collectors.toList()));
   }
 
   /**
-   * Definition of atan(x) and atan(y, x) function.
-   * atan(x) calculates the arc tangent of x, that is, the value whose tangent is x.
-   * atan(y, x) calculates the arc tangent of y / x, except that the signs of both arguments
-   * are used to determine the quadrant of the result.
-   * The supported signature of atan function is
+   * <b>Definition of atan(x) and atan(y, x) function.</b><br>
+   * atan(x) calculates the arc tangent of x, that is, the value whose tangent is x.<br>
+   * atan(y, x) calculates the arc tangent of y / x, except that the signs of both arguments<br>
+   * are used to determine the quadrant of the result.<br>
+   * The supported signature of atan function is<br>
    * (x: INTEGER/LONG/FLOAT/DOUBLE, y: INTEGER/LONG/FLOAT/DOUBLE) -> DOUBLE
    */
   private static DefaultFunctionResolver atan() {
-    ImmutableList.Builder<SerializableFunction<FunctionName, Pair<FunctionSignature,
-        FunctionBuilder>>> builder = new ImmutableList.Builder<>();
+    ImmutableList.Builder<
+            SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>>
+        builder = new ImmutableList.Builder<>();
 
     for (ExprType type : ExprCoreType.numberTypes()) {
-      builder.add(FunctionDSL.impl(FunctionDSL
-              .nullMissingHandling(x -> new ExprDoubleValue(Math.atan(x.doubleValue()))), type,
-          DOUBLE));
-      builder.add(FunctionDSL.impl(FunctionDSL
-          .nullMissingHandling((y, x) -> new ExprDoubleValue(Math.atan2(y.doubleValue(),
-              x.doubleValue()))), DOUBLE, type, type));
+      builder.add(
+          impl(
+              nullMissingHandling(x -> new ExprDoubleValue(Math.atan(x.doubleValue()))),
+              type,
+              DOUBLE));
+      builder.add(
+          impl(
+              nullMissingHandling(
+                  (y, x) -> new ExprDoubleValue(Math.atan2(y.doubleValue(), x.doubleValue()))),
+              DOUBLE,
+              type,
+              type));
     }
 
-    return FunctionDSL.define(BuiltinFunctionName.ATAN.getName(), builder.build());
+    return define(BuiltinFunctionName.ATAN.getName(), builder.build());
   }
 
   /**
-   * Definition of atan2(y, x) function.
-   * Calculates the arc tangent of y / x, except that the signs of both arguments
-   * are used to determine the quadrant of the result.
-   * The supported signature of atan2 function is
+   * <b>Definition of atan2(y, x) function.</b><br>
+   * Calculates the arc tangent of y / x, except that the signs of both arguments are used to
+   * determine the quadrant of the result.<br>
+   * The supported signature of atan2 function is<br>
    * (x: INTEGER/LONG/FLOAT/DOUBLE, y: INTEGER/LONG/FLOAT/DOUBLE) -> DOUBLE
    */
   private static DefaultFunctionResolver atan2() {
-    ImmutableList.Builder<SerializableFunction<FunctionName, Pair<FunctionSignature,
-        FunctionBuilder>>> builder = new ImmutableList.Builder<>();
+    ImmutableList.Builder<
+            SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>>
+        builder = new ImmutableList.Builder<>();
 
     for (ExprType type : ExprCoreType.numberTypes()) {
-      builder.add(FunctionDSL.impl(FunctionDSL
-          .nullMissingHandling((y, x) -> new ExprDoubleValue(Math.atan2(y.doubleValue(),
-              x.doubleValue()))), DOUBLE, type, type));
+      builder.add(
+          impl(
+              nullMissingHandling(
+                  (y, x) -> new ExprDoubleValue(Math.atan2(y.doubleValue(), x.doubleValue()))),
+              DOUBLE,
+              type,
+              type));
     }
 
-    return FunctionDSL.define(BuiltinFunctionName.ATAN2.getName(), builder.build());
+    return define(BuiltinFunctionName.ATAN2.getName(), builder.build());
   }
 
   /**
-   * Definition of cos(x) function.
-   * Calculates the cosine of X, where X is given in radians
-   * The supported signature of cos function is
+   * <b>Definition of cos(x) function.</b><br>
+   * Calculates the cosine of X, where X is given in radians<br>
+   * The supported signature of cos function is<br>
    * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver cos() {
-    return FunctionDSL.define(BuiltinFunctionName.COS.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue(Math.cos(v.doubleValue()))),
-                DOUBLE, type)).collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.COS.getName(),
+        v -> new ExprDoubleValue(Math.cos(v.doubleValue())),
+        DOUBLE);
   }
 
   /**
-   * Definition of cot(x) function.
-   * Calculates the cotangent of x
-   * The supported signature of cot function is
+   * <b>Definition of cosh(x) function.</b><br>
+   * Returns the hyperbolic cosine of x, defined as (((e^x) + (e^(-x))) / 2)<br>
+   * The supported signature is<br>
+   * BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
+   */
+  private static DefaultFunctionResolver cosh() {
+    return baseMathFunction(
+        BuiltinFunctionName.COSH.getName(),
+        v -> new ExprDoubleValue(Math.cosh(v.doubleValue())),
+        DOUBLE);
+  }
+
+  /**
+   * <b>Definition of cot(x) function.<\b><br>
+   * Calculates the cotangent of x The supported signature of cot function is
    * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver cot() {
-    return FunctionDSL.define(BuiltinFunctionName.COT.getName(),
+    return define(
+        BuiltinFunctionName.COT.getName(),
         ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> {
-                  Double value = v.doubleValue();
-                  if (value == 0) {
-                    throw new ArithmeticException(
-                        String.format("Out of range value for cot(%s)", value));
-                  }
-                  return new ExprDoubleValue(1 / Math.tan(value));
-                }),
-                DOUBLE, type)).collect(Collectors.toList()));
+            .map(
+                type ->
+                    impl(
+                        nullMissingHandling(
+                            v -> {
+                              Double value = v.doubleValue();
+                              if (value == 0) {
+                                throw new ArithmeticException(
+                                    String.format("Out of range value for cot(%s)", value));
+                              }
+                              return new ExprDoubleValue(1 / Math.tan(value));
+                            }),
+                        DOUBLE,
+                        type))
+            .collect(Collectors.toList()));
   }
 
   /**
-   * Definition of degrees(x) function.
-   * Converts x from radians to degrees
-   * The supported signature of degrees function is
+   * <b>Definition of degrees(x) function.</b><br>
+   * Converts x from radians to degrees The supported signature of degrees function is
    * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver degrees() {
-    return FunctionDSL.define(BuiltinFunctionName.DEGREES.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue(Math.toDegrees(v.doubleValue()))),
-                type, DOUBLE)).collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.DEGREES.getName(),
+        v -> new ExprDoubleValue(Math.toDegrees(v.doubleValue())),
+        DOUBLE);
   }
 
   /**
-   * Definition of radians(x) function.
-   * Converts x from degrees to radians
-   * The supported signature of radians function is
+   * <b>Definition of radians(x) function.</b><br>
+   * Converts x from degrees to radians The supported signature of radians function is
    * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver radians() {
-    return FunctionDSL.define(BuiltinFunctionName.RADIANS.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue(Math.toRadians(v.doubleValue()))),
-                DOUBLE, type)).collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.RADIANS.getName(),
+        v -> new ExprDoubleValue(Math.toRadians(v.doubleValue())),
+        DOUBLE);
   }
 
   /**
-   * Definition of sin(x) function.
-   * Calculates the sine of x, where x is given in radians
-   * The supported signature of sin function is
+   * <b>Definition of sin(x) function.</b><br>
+   * Calculates the sine of x, where x is given in radians The supported signature of sin function
+   * is<br>
    * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver sin() {
-    return FunctionDSL.define(BuiltinFunctionName.SIN.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue(Math.sin(v.doubleValue()))),
-                DOUBLE, type)).collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.SIN.getName(),
+        v -> new ExprDoubleValue(Math.sin(v.doubleValue())),
+        DOUBLE);
   }
 
   /**
-   * Definition of tan(x) function.
-   * Calculates the tangent of x, where x is given in radians
-   * The supported signature of tan function is
+   * <b>Definition of tan(x) function.</b><br>
+   * Calculates the tangent of x, where x is given in radians The supported signature of tan
+   * function is<br>
    * INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
    */
   private static DefaultFunctionResolver tan() {
-    return FunctionDSL.define(BuiltinFunctionName.TAN.getName(),
-        ExprCoreType.numberTypes().stream()
-            .map(type -> FunctionDSL.impl(FunctionDSL.nullMissingHandling(
-                v -> new ExprDoubleValue(Math.tan(v.doubleValue()))),
-                DOUBLE, type)).collect(Collectors.toList()));
+    return baseMathFunction(
+        BuiltinFunctionName.TAN.getName(),
+        v -> new ExprDoubleValue(Math.tan(v.doubleValue())),
+        DOUBLE);
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/operator/convert/TypeCastOperator.java b/core/src/main/java/org/opensearch/sql/expression/operator/convert/TypeCastOperator.java
index 8f904bfbf7..7c3565f69c 100644
--- a/core/src/main/java/org/opensearch/sql/expression/operator/convert/TypeCastOperator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/operator/convert/TypeCastOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.operator.convert;
 
 import static org.opensearch.sql.data.type.ExprCoreType.BOOLEAN;
@@ -19,7 +18,9 @@
 import static org.opensearch.sql.data.type.ExprCoreType.TIME;
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
 import static org.opensearch.sql.expression.function.FunctionDSL.impl;
+import static org.opensearch.sql.expression.function.FunctionDSL.implWithProperties;
 import static org.opensearch.sql.expression.function.FunctionDSL.nullMissingHandling;
+import static org.opensearch.sql.expression.function.FunctionDSL.nullMissingHandlingWithProperties;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;
@@ -44,9 +45,7 @@
 
 @UtilityClass
 public class TypeCastOperator {
-  /**
-   * Register Type Cast Operator.
-   */
+  /** Register Type Cast Operator. */
   public static void register(BuiltinFunctionRepository repository) {
     repository.register(castToString());
     repository.register(castToByte());
@@ -62,138 +61,175 @@ public static void register(BuiltinFunctionRepository repository) {
     repository.register(castToDatetime());
   }
 
-
   private static DefaultFunctionResolver castToString() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_STRING.getName(),
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_STRING.getName(),
         Stream.concat(
-            Arrays.asList(BYTE, SHORT, INTEGER, LONG, FLOAT, DOUBLE, BOOLEAN, TIME, DATE,
-                TIMESTAMP, DATETIME).stream()
-                .map(type -> impl(
-                    nullMissingHandling((v) -> new ExprStringValue(v.value().toString())),
-                    STRING, type)),
-            Stream.of(impl(nullMissingHandling((v) -> v), STRING, STRING)))
-            .collect(Collectors.toList())
-    );
+                Arrays.asList(
+                        BYTE, SHORT, INTEGER, LONG, FLOAT, DOUBLE, BOOLEAN, TIME, DATE, TIMESTAMP,
+                        DATETIME)
+                    .stream()
+                    .map(
+                        type ->
+                            impl(
+                                nullMissingHandling(
+                                    (v) -> new ExprStringValue(v.value().toString())),
+                                STRING,
+                                type)),
+                Stream.of(impl(nullMissingHandling((v) -> v), STRING, STRING)))
+            .collect(Collectors.toList()));
   }
 
   private static DefaultFunctionResolver castToByte() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_BYTE.getName(),
-        impl(nullMissingHandling(
-            (v) -> new ExprByteValue(Byte.valueOf(v.stringValue()))), BYTE, STRING),
-        impl(nullMissingHandling(
-            (v) -> new ExprByteValue(v.byteValue())), BYTE, DOUBLE),
-        impl(nullMissingHandling(
-            (v) -> new ExprByteValue(v.booleanValue() ? 1 : 0)), BYTE, BOOLEAN)
-    );
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_BYTE.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprByteValue(Byte.valueOf(v.stringValue()))),
+            BYTE,
+            STRING),
+        impl(nullMissingHandling((v) -> new ExprByteValue(v.byteValue())), BYTE, DOUBLE),
+        impl(
+            nullMissingHandling((v) -> new ExprByteValue(v.booleanValue() ? 1 : 0)),
+            BYTE,
+            BOOLEAN));
   }
 
   private static DefaultFunctionResolver castToShort() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_SHORT.getName(),
-        impl(nullMissingHandling(
-            (v) -> new ExprShortValue(Short.valueOf(v.stringValue()))), SHORT, STRING),
-        impl(nullMissingHandling(
-            (v) -> new ExprShortValue(v.shortValue())), SHORT, DOUBLE),
-        impl(nullMissingHandling(
-            (v) -> new ExprShortValue(v.booleanValue() ? 1 : 0)), SHORT, BOOLEAN)
-    );
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_SHORT.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprShortValue(Short.valueOf(v.stringValue()))),
+            SHORT,
+            STRING),
+        impl(nullMissingHandling((v) -> new ExprShortValue(v.shortValue())), SHORT, DOUBLE),
+        impl(
+            nullMissingHandling((v) -> new ExprShortValue(v.booleanValue() ? 1 : 0)),
+            SHORT,
+            BOOLEAN));
   }
 
   private static DefaultFunctionResolver castToInt() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_INT.getName(),
-        impl(nullMissingHandling(
-            (v) -> new ExprIntegerValue(Integer.valueOf(v.stringValue()))), INTEGER, STRING),
-        impl(nullMissingHandling(
-            (v) -> new ExprIntegerValue(v.integerValue())), INTEGER, DOUBLE),
-        impl(nullMissingHandling(
-            (v) -> new ExprIntegerValue(v.booleanValue() ? 1 : 0)), INTEGER, BOOLEAN)
-    );
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_INT.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprIntegerValue(Integer.valueOf(v.stringValue()))),
+            INTEGER,
+            STRING),
+        impl(nullMissingHandling((v) -> new ExprIntegerValue(v.integerValue())), INTEGER, DOUBLE),
+        impl(
+            nullMissingHandling((v) -> new ExprIntegerValue(v.booleanValue() ? 1 : 0)),
+            INTEGER,
+            BOOLEAN));
   }
 
   private static DefaultFunctionResolver castToLong() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_LONG.getName(),
-        impl(nullMissingHandling(
-            (v) -> new ExprLongValue(Long.valueOf(v.stringValue()))), LONG, STRING),
-        impl(nullMissingHandling(
-            (v) -> new ExprLongValue(v.longValue())), LONG, DOUBLE),
-        impl(nullMissingHandling(
-            (v) -> new ExprLongValue(v.booleanValue() ? 1L : 0L)), LONG, BOOLEAN)
-    );
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_LONG.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprLongValue(Long.valueOf(v.stringValue()))),
+            LONG,
+            STRING),
+        impl(nullMissingHandling((v) -> new ExprLongValue(v.longValue())), LONG, DOUBLE),
+        impl(
+            nullMissingHandling((v) -> new ExprLongValue(v.booleanValue() ? 1L : 0L)),
+            LONG,
+            BOOLEAN));
   }
 
   private static DefaultFunctionResolver castToFloat() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_FLOAT.getName(),
-        impl(nullMissingHandling(
-            (v) -> new ExprFloatValue(Float.valueOf(v.stringValue()))), FLOAT, STRING),
-        impl(nullMissingHandling(
-            (v) -> new ExprFloatValue(v.floatValue())), FLOAT, DOUBLE),
-        impl(nullMissingHandling(
-            (v) -> new ExprFloatValue(v.booleanValue() ? 1f : 0f)), FLOAT, BOOLEAN)
-    );
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_FLOAT.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprFloatValue(Float.valueOf(v.stringValue()))),
+            FLOAT,
+            STRING),
+        impl(nullMissingHandling((v) -> new ExprFloatValue(v.floatValue())), FLOAT, DOUBLE),
+        impl(
+            nullMissingHandling((v) -> new ExprFloatValue(v.booleanValue() ? 1f : 0f)),
+            FLOAT,
+            BOOLEAN));
   }
 
   private static DefaultFunctionResolver castToDouble() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_DOUBLE.getName(),
-        impl(nullMissingHandling(
-            (v) -> new ExprDoubleValue(Double.valueOf(v.stringValue()))), DOUBLE, STRING),
-        impl(nullMissingHandling(
-            (v) -> new ExprDoubleValue(v.doubleValue())), DOUBLE, DOUBLE),
-        impl(nullMissingHandling(
-            (v) -> new ExprDoubleValue(v.booleanValue() ? 1D : 0D)), DOUBLE, BOOLEAN)
-    );
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_DOUBLE.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprDoubleValue(Double.valueOf(v.stringValue()))),
+            DOUBLE,
+            STRING),
+        impl(nullMissingHandling((v) -> new ExprDoubleValue(v.doubleValue())), DOUBLE, DOUBLE),
+        impl(
+            nullMissingHandling((v) -> new ExprDoubleValue(v.booleanValue() ? 1D : 0D)),
+            DOUBLE,
+            BOOLEAN));
   }
 
   private static DefaultFunctionResolver castToBoolean() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_BOOLEAN.getName(),
-        impl(nullMissingHandling(
-            (v) -> ExprBooleanValue.of(Boolean.valueOf(v.stringValue()))), BOOLEAN, STRING),
-        impl(nullMissingHandling(
-            (v) -> ExprBooleanValue.of(v.doubleValue() != 0)), BOOLEAN, DOUBLE),
-        impl(nullMissingHandling((v) -> v), BOOLEAN, BOOLEAN)
-    );
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_BOOLEAN.getName(),
+        impl(
+            nullMissingHandling((v) -> ExprBooleanValue.of(Boolean.valueOf(v.stringValue()))),
+            BOOLEAN,
+            STRING),
+        impl(
+            nullMissingHandling((v) -> ExprBooleanValue.of(v.doubleValue() != 0)), BOOLEAN, DOUBLE),
+        impl(nullMissingHandling((v) -> v), BOOLEAN, BOOLEAN));
   }
 
   private static DefaultFunctionResolver castToDate() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_DATE.getName(),
-        impl(nullMissingHandling(
-            (v) -> new ExprDateValue(v.stringValue())), DATE, STRING),
-        impl(nullMissingHandling(
-            (v) -> new ExprDateValue(v.dateValue())), DATE, DATETIME),
-        impl(nullMissingHandling(
-            (v) -> new ExprDateValue(v.dateValue())), DATE, TIMESTAMP),
-        impl(nullMissingHandling((v) -> v), DATE, DATE)
-    );
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_DATE.getName(),
+        impl(nullMissingHandling((v) -> new ExprDateValue(v.stringValue())), DATE, STRING),
+        impl(nullMissingHandling((v) -> new ExprDateValue(v.dateValue())), DATE, DATETIME),
+        impl(nullMissingHandling((v) -> new ExprDateValue(v.dateValue())), DATE, TIMESTAMP),
+        impl(nullMissingHandling((v) -> v), DATE, DATE));
   }
 
   private static DefaultFunctionResolver castToTime() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_TIME.getName(),
-        impl(nullMissingHandling(
-            (v) -> new ExprTimeValue(v.stringValue())), TIME, STRING),
-        impl(nullMissingHandling(
-            (v) -> new ExprTimeValue(v.timeValue())), TIME, DATETIME),
-        impl(nullMissingHandling(
-            (v) -> new ExprTimeValue(v.timeValue())), TIME, TIMESTAMP),
-        impl(nullMissingHandling((v) -> v), TIME, TIME)
-    );
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_TIME.getName(),
+        impl(nullMissingHandling((v) -> new ExprTimeValue(v.stringValue())), TIME, STRING),
+        impl(nullMissingHandling((v) -> new ExprTimeValue(v.timeValue())), TIME, DATETIME),
+        impl(nullMissingHandling((v) -> new ExprTimeValue(v.timeValue())), TIME, TIMESTAMP),
+        impl(nullMissingHandling((v) -> v), TIME, TIME));
   }
 
+  // `DATE`/`TIME`/`DATETIME` -> `DATETIME`/TIMESTAMP` cast tested in BinaryPredicateOperatorTest
   private static DefaultFunctionResolver castToTimestamp() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_TIMESTAMP.getName(),
-        impl(nullMissingHandling(
-            (v) -> new ExprTimestampValue(v.stringValue())), TIMESTAMP, STRING),
-        impl(nullMissingHandling(
-            (v) -> new ExprTimestampValue(v.timestampValue())), TIMESTAMP, DATETIME),
-        impl(nullMissingHandling((v) -> v), TIMESTAMP, TIMESTAMP)
-    );
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_TIMESTAMP.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprTimestampValue(v.stringValue())), TIMESTAMP, STRING),
+        impl(
+            nullMissingHandling((v) -> new ExprTimestampValue(v.timestampValue())),
+            TIMESTAMP,
+            DATETIME),
+        impl(
+            nullMissingHandling((v) -> new ExprTimestampValue(v.timestampValue())),
+            TIMESTAMP,
+            DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (fp, v) -> new ExprTimestampValue(((ExprTimeValue) v).timestampValue(fp))),
+            TIMESTAMP,
+            TIME),
+        impl(nullMissingHandling((v) -> v), TIMESTAMP, TIMESTAMP));
   }
 
   private static DefaultFunctionResolver castToDatetime() {
-    return FunctionDSL.define(BuiltinFunctionName.CAST_TO_DATETIME.getName(),
-        impl(nullMissingHandling(
-            (v) -> new ExprDatetimeValue(v.stringValue())), DATETIME, STRING),
-        impl(nullMissingHandling(
-            (v) -> new ExprDatetimeValue(v.datetimeValue())), DATETIME, TIMESTAMP),
-        impl(nullMissingHandling(
-            (v) -> new ExprDatetimeValue(v.datetimeValue())), DATETIME, DATE)
-    );
+    return FunctionDSL.define(
+        BuiltinFunctionName.CAST_TO_DATETIME.getName(),
+        impl(nullMissingHandling((v) -> new ExprDatetimeValue(v.stringValue())), DATETIME, STRING),
+        impl(
+            nullMissingHandling((v) -> new ExprDatetimeValue(v.datetimeValue())),
+            DATETIME,
+            TIMESTAMP),
+        impl(nullMissingHandling((v) -> new ExprDatetimeValue(v.datetimeValue())), DATETIME, DATE),
+        implWithProperties(
+            nullMissingHandlingWithProperties(
+                (fp, v) -> new ExprDatetimeValue(((ExprTimeValue) v).datetimeValue(fp))),
+            DATETIME,
+            TIME),
+        impl(nullMissingHandling((v) -> v), DATETIME, DATETIME));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/operator/predicate/BinaryPredicateOperator.java b/core/src/main/java/org/opensearch/sql/expression/operator/predicate/BinaryPredicateOperator.java
index 99399249c2..bf6b3c22f5 100644
--- a/core/src/main/java/org/opensearch/sql/expression/operator/predicate/BinaryPredicateOperator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/operator/predicate/BinaryPredicateOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.operator.predicate;
 
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_FALSE;
@@ -13,6 +12,9 @@
 import static org.opensearch.sql.data.type.ExprCoreType.BOOLEAN;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.expression.function.FunctionDSL.define;
+import static org.opensearch.sql.expression.function.FunctionDSL.impl;
+import static org.opensearch.sql.expression.function.FunctionDSL.nullMissingHandling;
 
 import com.google.common.collect.ImmutableTable;
 import com.google.common.collect.Table;
@@ -24,14 +26,13 @@
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
 import org.opensearch.sql.expression.function.DefaultFunctionResolver;
-import org.opensearch.sql.expression.function.FunctionDSL;
 import org.opensearch.sql.utils.OperatorUtils;
 
 /**
- * The definition of binary predicate function
- * and, Accepts two Boolean values and produces a Boolean.
- * or,  Accepts two Boolean values and produces a Boolean.
- * xor, Accepts two Boolean values and produces a Boolean.
+ * The definition of binary predicate function<br>
+ * and, Accepts two Boolean values and produces a Boolean.<br>
+ * or, Accepts two Boolean values and produces a Boolean.<br>
+ * xor, Accepts two Boolean values and produces a Boolean.<br>
  * equalTo, Compare the left expression and right expression and produces a Boolean.
  */
 @UtilityClass
@@ -58,17 +59,64 @@ public static void register(BuiltinFunctionRepository repository) {
 
   /**
    * The and logic.
-   * A       B       A AND B
-   * TRUE    TRUE    TRUE
-   * TRUE    FALSE   FALSE
-   * TRUE    NULL    NULL
-   * TRUE    MISSING MISSING
-   * FALSE   FALSE   FALSE
-   * FALSE   NULL    FALSE
-   * FALSE   MISSING FALSE
-   * NULL    NULL    NULL
-   * NULL    MISSING MISSING
-   * MISSING MISSING MISSING
+   *
+   * <table>
+   *   <tr>
+   *     <th>A</th>
+   *     <th>B</th>
+   *     <th>A AND B</th>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>TRUE</td>
+   *     <td>TRUE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>FALSE</td>
+   *     <td>FALSE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>NULL</td>
+   *     <td>NULL</td>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>MISSING</td>
+   *     <td>MISSING</td>
+   *   </tr>
+   *   <tr>
+   *     <td>FALSE</td>
+   *     <td>FALSE</td>
+   *     <td>FALSE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>FALSE</td>
+   *     <td>NULL</td>
+   *     <td>FALSE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>FALSE</td>
+   *     <td>MISSING</td>
+   *     <td>FALSE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>NULL</td>
+   *     <td>NULL</td>
+   *     <td>NULL</td>
+   *   </tr>
+   *   <tr>
+   *       <td>NULL</td>
+   *       <td>MISSING</td>
+   *       <td>MISSING</td>
+   *   </tr>
+   *   <tr>
+   *       <td>MISSING</td>
+   *       <td>MISSING</td>
+   *       <td>MISSING</td>
+   *   </tr>
+   * </table>
    */
   private static Table<ExprValue, ExprValue, ExprValue> andTable =
       new ImmutableTable.Builder<ExprValue, ExprValue, ExprValue>()
@@ -86,17 +134,64 @@ public static void register(BuiltinFunctionRepository repository) {
 
   /**
    * The or logic.
-   * A       B       A AND B
-   * TRUE    TRUE    TRUE
-   * TRUE    FALSE   TRUE
-   * TRUE    NULL    TRUE
-   * TRUE    MISSING TRUE
-   * FALSE   FALSE   FALSE
-   * FALSE   NULL    NULL
-   * FALSE   MISSING MISSING
-   * NULL    NULL    NULL
-   * NULL    MISSING NULL
-   * MISSING MISSING MISSING
+   *
+   * <table>
+   *   <tr>
+   *     <th>A</th>
+   *     <th>B</th>
+   *     <th>A OR B</th>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>TRUE</td>
+   *     <td>TRUE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>FALSE</td>
+   *     <td>TRUE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>NULL</td>
+   *     <td>TRUE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>MISSING</td>
+   *     <td>TRUE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>FALSE</td>
+   *     <td>FALSE</td>
+   *     <td>FALSE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>FALSE</td>
+   *     <td>NULL</td>
+   *     <td>NULL</td>
+   *   </tr>
+   *   <tr>
+   *     <td>FALSE</td>
+   *     <td>MISSING</td>
+   *     <td>MISSING</td>
+   *   </tr>
+   *   <tr>
+   *     <td>NULL</td>
+   *     <td>NULL</td>
+   *     <td>NULL</td>
+   *   </tr>
+   *   <tr>
+   *       <td>NULL</td>
+   *       <td>MISSING</td>
+   *       <td>NULL</td>
+   *   </tr>
+   *   <tr>
+   *       <td>MISSING</td>
+   *       <td>MISSING</td>
+   *       <td>MISSING</td>
+   *   </tr>
+   * </table>
    */
   private static Table<ExprValue, ExprValue, ExprValue> orTable =
       new ImmutableTable.Builder<ExprValue, ExprValue, ExprValue>()
@@ -114,17 +209,64 @@ public static void register(BuiltinFunctionRepository repository) {
 
   /**
    * The xor logic.
-   * A       B       A AND B
-   * TRUE    TRUE    FALSE
-   * TRUE    FALSE   TRUE
-   * TRUE    NULL    TRUE
-   * TRUE    MISSING TRUE
-   * FALSE   FALSE   FALSE
-   * FALSE   NULL    NULL
-   * FALSE   MISSING MISSING
-   * NULL    NULL    NULL
-   * NULL    MISSING NULL
-   * MISSING MISSING MISSING
+   *
+   * <table>
+   *   <tr>
+   *     <th>A</th>
+   *     <th>B</th>
+   *     <th>A XOR B</th>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>TRUE</td>
+   *     <td>FALSE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>FALSE</td>
+   *     <td>TRUE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>NULL</td>
+   *     <td>TRUE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>TRUE</td>
+   *     <td>MISSING</td>
+   *     <td>TRUE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>FALSE</td>
+   *     <td>FALSE</td>
+   *     <td>FALSE</td>
+   *   </tr>
+   *   <tr>
+   *     <td>FALSE</td>
+   *     <td>NULL</td>
+   *     <td>NULL</td>
+   *   </tr>
+   *   <tr>
+   *     <td>FALSE</td>
+   *     <td>MISSING</td>
+   *     <td>MISSING</td>
+   *   </tr>
+   *   <tr>
+   *     <td>NULL</td>
+   *     <td>NULL</td>
+   *     <td>NULL</td>
+   *   </tr>
+   *   <tr>
+   *       <td>NULL</td>
+   *       <td>MISSING</td>
+   *       <td>NULL</td>
+   *   </tr>
+   *   <tr>
+   *       <td>MISSING</td>
+   *       <td>MISSING</td>
+   *       <td>MISSING</td>
+   *   </tr>
+   * </table>
    */
   private static Table<ExprValue, ExprValue, ExprValue> xorTable =
       new ImmutableTable.Builder<ExprValue, ExprValue, ExprValue>()
@@ -141,120 +283,132 @@ public static void register(BuiltinFunctionRepository repository) {
           .build();
 
   private static DefaultFunctionResolver and() {
-    return FunctionDSL.define(BuiltinFunctionName.AND.getName(), FunctionDSL
-        .impl((v1, v2) -> lookupTableFunction(v1, v2, andTable), BOOLEAN, BOOLEAN,
-            BOOLEAN));
+    return define(
+        BuiltinFunctionName.AND.getName(),
+        impl((v1, v2) -> lookupTableFunction(v1, v2, andTable), BOOLEAN, BOOLEAN, BOOLEAN));
   }
 
   private static DefaultFunctionResolver or() {
-    return FunctionDSL.define(BuiltinFunctionName.OR.getName(), FunctionDSL
-        .impl((v1, v2) -> lookupTableFunction(v1, v2, orTable), BOOLEAN, BOOLEAN,
-            BOOLEAN));
+    return define(
+        BuiltinFunctionName.OR.getName(),
+        impl((v1, v2) -> lookupTableFunction(v1, v2, orTable), BOOLEAN, BOOLEAN, BOOLEAN));
   }
 
   private static DefaultFunctionResolver xor() {
-    return FunctionDSL.define(BuiltinFunctionName.XOR.getName(), FunctionDSL
-        .impl((v1, v2) -> lookupTableFunction(v1, v2, xorTable), BOOLEAN, BOOLEAN,
-            BOOLEAN));
+    return define(
+        BuiltinFunctionName.XOR.getName(),
+        impl((v1, v2) -> lookupTableFunction(v1, v2, xorTable), BOOLEAN, BOOLEAN, BOOLEAN));
   }
 
   private static DefaultFunctionResolver equal() {
-    return FunctionDSL.define(BuiltinFunctionName.EQUAL.getName(),
+    return define(
+        BuiltinFunctionName.EQUAL.getName(),
         ExprCoreType.coreTypes().stream()
-            .map(type -> FunctionDSL.impl(
-                FunctionDSL.nullMissingHandling((v1, v2) -> ExprBooleanValue.of(v1.equals(v2))),
-                BOOLEAN, type, type))
-            .collect(
-                Collectors.toList()));
+            .map(
+                type ->
+                    impl(
+                        nullMissingHandling((v1, v2) -> ExprBooleanValue.of(v1.equals(v2))),
+                        BOOLEAN,
+                        type,
+                        type))
+            .collect(Collectors.toList()));
   }
 
   private static DefaultFunctionResolver notEqual() {
-    return FunctionDSL
-        .define(BuiltinFunctionName.NOTEQUAL.getName(), ExprCoreType.coreTypes().stream()
-            .map(type -> FunctionDSL
-                .impl(
-                    FunctionDSL
-                        .nullMissingHandling((v1, v2) -> ExprBooleanValue.of(!v1.equals(v2))),
-                    BOOLEAN,
-                    type,
-                    type))
-            .collect(
-                Collectors.toList()));
+    return define(
+        BuiltinFunctionName.NOTEQUAL.getName(),
+        ExprCoreType.coreTypes().stream()
+            .map(
+                type ->
+                    impl(
+                        nullMissingHandling((v1, v2) -> ExprBooleanValue.of(!v1.equals(v2))),
+                        BOOLEAN,
+                        type,
+                        type))
+            .collect(Collectors.toList()));
   }
 
   private static DefaultFunctionResolver less() {
-    return FunctionDSL
-        .define(BuiltinFunctionName.LESS.getName(), ExprCoreType.coreTypes().stream()
-            .map(type -> FunctionDSL
-                .impl(FunctionDSL
-                        .nullMissingHandling((v1, v2) -> ExprBooleanValue.of(v1.compareTo(v2) < 0)),
-                    BOOLEAN,
-                    type, type))
-            .collect(
-                Collectors.toList()));
+    return define(
+        BuiltinFunctionName.LESS.getName(),
+        ExprCoreType.coreTypes().stream()
+            .map(
+                type ->
+                    impl(
+                        nullMissingHandling((v1, v2) -> ExprBooleanValue.of(v1.compareTo(v2) < 0)),
+                        BOOLEAN,
+                        type,
+                        type))
+            .collect(Collectors.toList()));
   }
 
   private static DefaultFunctionResolver lte() {
-    return FunctionDSL
-        .define(BuiltinFunctionName.LTE.getName(), ExprCoreType.coreTypes().stream()
-            .map(type -> FunctionDSL
-                .impl(
-                    FunctionDSL
-                        .nullMissingHandling(
-                            (v1, v2) -> ExprBooleanValue.of(v1.compareTo(v2) <= 0)),
-                    BOOLEAN,
-                    type, type))
-            .collect(
-                Collectors.toList()));
+    return define(
+        BuiltinFunctionName.LTE.getName(),
+        ExprCoreType.coreTypes().stream()
+            .map(
+                type ->
+                    impl(
+                        nullMissingHandling((v1, v2) -> ExprBooleanValue.of(v1.compareTo(v2) <= 0)),
+                        BOOLEAN,
+                        type,
+                        type))
+            .collect(Collectors.toList()));
   }
 
   private static DefaultFunctionResolver greater() {
-    return FunctionDSL
-        .define(BuiltinFunctionName.GREATER.getName(), ExprCoreType.coreTypes().stream()
-            .map(type -> FunctionDSL
-                .impl(FunctionDSL
-                        .nullMissingHandling((v1, v2) -> ExprBooleanValue.of(v1.compareTo(v2) > 0)),
-                    BOOLEAN, type, type))
-            .collect(
-                Collectors.toList()));
+    return define(
+        BuiltinFunctionName.GREATER.getName(),
+        ExprCoreType.coreTypes().stream()
+            .map(
+                type ->
+                    impl(
+                        nullMissingHandling((v1, v2) -> ExprBooleanValue.of(v1.compareTo(v2) > 0)),
+                        BOOLEAN,
+                        type,
+                        type))
+            .collect(Collectors.toList()));
   }
 
   private static DefaultFunctionResolver gte() {
-    return FunctionDSL
-        .define(BuiltinFunctionName.GTE.getName(), ExprCoreType.coreTypes().stream()
-            .map(type -> FunctionDSL
-                .impl(
-                    FunctionDSL.nullMissingHandling(
-                        (v1, v2) -> ExprBooleanValue.of(v1.compareTo(v2) >= 0)),
-                    BOOLEAN,
-                    type, type))
-            .collect(
-                Collectors.toList()));
+    return define(
+        BuiltinFunctionName.GTE.getName(),
+        ExprCoreType.coreTypes().stream()
+            .map(
+                type ->
+                    impl(
+                        nullMissingHandling((v1, v2) -> ExprBooleanValue.of(v1.compareTo(v2) >= 0)),
+                        BOOLEAN,
+                        type,
+                        type))
+            .collect(Collectors.toList()));
   }
 
   private static DefaultFunctionResolver like() {
-    return FunctionDSL.define(BuiltinFunctionName.LIKE.getName(), FunctionDSL
-        .impl(FunctionDSL.nullMissingHandling(OperatorUtils::matches), BOOLEAN, STRING,
-            STRING));
+    return define(
+        BuiltinFunctionName.LIKE.getName(),
+        impl(nullMissingHandling(OperatorUtils::matches), BOOLEAN, STRING, STRING));
   }
 
   private static DefaultFunctionResolver regexp() {
-    return FunctionDSL.define(BuiltinFunctionName.REGEXP.getName(), FunctionDSL
-        .impl(FunctionDSL.nullMissingHandling(OperatorUtils::matchesRegexp),
-            INTEGER, STRING, STRING));
+    return define(
+        BuiltinFunctionName.REGEXP.getName(),
+        impl(nullMissingHandling(OperatorUtils::matchesRegexp), INTEGER, STRING, STRING));
   }
 
   private static DefaultFunctionResolver notLike() {
-    return FunctionDSL.define(BuiltinFunctionName.NOT_LIKE.getName(), FunctionDSL
-        .impl(FunctionDSL.nullMissingHandling(
-            (v1, v2) -> UnaryPredicateOperator.not(OperatorUtils.matches(v1, v2))),
+    return define(
+        BuiltinFunctionName.NOT_LIKE.getName(),
+        impl(
+            nullMissingHandling(
+                (v1, v2) -> UnaryPredicateOperator.not(OperatorUtils.matches(v1, v2))),
             BOOLEAN,
             STRING,
             STRING));
   }
 
-  private static ExprValue lookupTableFunction(ExprValue arg1, ExprValue arg2,
-                                               Table<ExprValue, ExprValue, ExprValue> table) {
+  private static ExprValue lookupTableFunction(
+      ExprValue arg1, ExprValue arg2, Table<ExprValue, ExprValue, ExprValue> table) {
     if (table.contains(arg1, arg2)) {
       return table.get(arg1, arg2);
     } else {
diff --git a/core/src/main/java/org/opensearch/sql/expression/operator/predicate/UnaryPredicateOperator.java b/core/src/main/java/org/opensearch/sql/expression/operator/predicate/UnaryPredicateOperator.java
index 7d79d9d923..ad9d9ac934 100644
--- a/core/src/main/java/org/opensearch/sql/expression/operator/predicate/UnaryPredicateOperator.java
+++ b/core/src/main/java/org/opensearch/sql/expression/operator/predicate/UnaryPredicateOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.operator.predicate;
 
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_NULL;
@@ -28,14 +27,11 @@
 import org.opensearch.sql.expression.function.SerializableFunction;
 
 /**
- * The definition of unary predicate function
- * not, Accepts one Boolean value and produces a Boolean.
+ * The definition of unary predicate function not, Accepts one Boolean value and produces a Boolean.
  */
 @UtilityClass
 public class UnaryPredicateOperator {
-  /**
-   * Register Unary Predicate Function.
-   */
+  /** Register Unary Predicate Function. */
   public static void register(BuiltinFunctionRepository repository) {
     repository.register(not());
     repository.register(isNotNull());
@@ -47,17 +43,36 @@ public static void register(BuiltinFunctionRepository repository) {
   }
 
   private static DefaultFunctionResolver not() {
-    return FunctionDSL.define(BuiltinFunctionName.NOT.getName(), FunctionDSL
-        .impl(UnaryPredicateOperator::not, BOOLEAN, BOOLEAN));
+    return FunctionDSL.define(
+        BuiltinFunctionName.NOT.getName(),
+        FunctionDSL.impl(UnaryPredicateOperator::not, BOOLEAN, BOOLEAN));
   }
 
   /**
    * The not logic.
-   * A       NOT A
-   * TRUE    FALSE
-   * FALSE   TRUE
-   * NULL    NULL
-   * MISSING MISSING
+   *
+   * <table>
+   *     <tr>
+   *         <th>A</th>
+   *         <th>NOT A</th>
+   *     </tr>
+   *     <tr>
+   *         <th>TRUE</th>
+   *         <th>FALSE</th>
+   *     </tr>
+   *     <tr>
+   *         <th>FALSE</th>
+   *         <th>TRUE</th>
+   *     </tr>
+   *     <tr>
+   *         <th>NULL</th>
+   *         <th>NULL</th>
+   *     </tr>
+   *     <tr>
+   *         <th>MISSING</th>
+   *         <th>MISSING</th>
+   *     </tr>
+   * </table>
    */
   public ExprValue not(ExprValue v) {
     if (v.isMissing() || v.isNull()) {
@@ -68,31 +83,33 @@ public ExprValue not(ExprValue v) {
   }
 
   private static DefaultFunctionResolver isNull(BuiltinFunctionName funcName) {
-    return FunctionDSL
-        .define(funcName.getName(), Arrays.stream(ExprCoreType.values())
-            .map(type -> FunctionDSL
-                .impl((v) -> ExprBooleanValue.of(v.isNull()), BOOLEAN, type))
-            .collect(
-                Collectors.toList()));
+    return FunctionDSL.define(
+        funcName.getName(),
+        Arrays.stream(ExprCoreType.values())
+            .map(type -> FunctionDSL.impl((v) -> ExprBooleanValue.of(v.isNull()), BOOLEAN, type))
+            .collect(Collectors.toList()));
   }
 
   private static DefaultFunctionResolver isNotNull() {
-    return FunctionDSL
-        .define(BuiltinFunctionName.IS_NOT_NULL.getName(), Arrays.stream(ExprCoreType.values())
-            .map(type -> FunctionDSL
-                .impl((v) -> ExprBooleanValue.of(!v.isNull()), BOOLEAN, type))
-            .collect(
-                Collectors.toList()));
+    return FunctionDSL.define(
+        BuiltinFunctionName.IS_NOT_NULL.getName(),
+        Arrays.stream(ExprCoreType.values())
+            .map(type -> FunctionDSL.impl((v) -> ExprBooleanValue.of(!v.isNull()), BOOLEAN, type))
+            .collect(Collectors.toList()));
   }
 
   private static DefaultFunctionResolver ifFunction() {
     FunctionName functionName = BuiltinFunctionName.IF.getName();
     List<ExprCoreType> typeList = ExprCoreType.coreTypes();
 
-    List<SerializableFunction<FunctionName, org.apache.commons.lang3.tuple.Pair<FunctionSignature,
-            FunctionBuilder>>> functionsOne = typeList.stream().map(v ->
-            impl((UnaryPredicateOperator::exprIf), v, BOOLEAN, v, v))
-            .collect(Collectors.toList());
+    List<
+            SerializableFunction<
+                FunctionName,
+                org.apache.commons.lang3.tuple.Pair<FunctionSignature, FunctionBuilder>>>
+        functionsOne =
+            typeList.stream()
+                .map(v -> impl((UnaryPredicateOperator::exprIf), v, BOOLEAN, v, v))
+                .collect(Collectors.toList());
 
     DefaultFunctionResolver functionResolver = FunctionDSL.define(functionName, functionsOne);
     return functionResolver;
@@ -102,10 +119,14 @@ private static DefaultFunctionResolver ifNull() {
     FunctionName functionName = BuiltinFunctionName.IFNULL.getName();
     List<ExprCoreType> typeList = ExprCoreType.coreTypes();
 
-    List<SerializableFunction<FunctionName, org.apache.commons.lang3.tuple.Pair<FunctionSignature,
-            FunctionBuilder>>> functionsOne = typeList.stream().map(v ->
-            impl((UnaryPredicateOperator::exprIfNull), v, v, v))
-            .collect(Collectors.toList());
+    List<
+            SerializableFunction<
+                FunctionName,
+                org.apache.commons.lang3.tuple.Pair<FunctionSignature, FunctionBuilder>>>
+        functionsOne =
+            typeList.stream()
+                .map(v -> impl((UnaryPredicateOperator::exprIfNull), v, v, v))
+                .collect(Collectors.toList());
 
     DefaultFunctionResolver functionResolver = FunctionDSL.define(functionName, functionsOne);
     return functionResolver;
@@ -116,14 +137,16 @@ private static DefaultFunctionResolver nullIf() {
     List<ExprCoreType> typeList = ExprCoreType.coreTypes();
 
     DefaultFunctionResolver functionResolver =
-        FunctionDSL.define(functionName,
-            typeList.stream().map(v ->
-              impl((UnaryPredicateOperator::exprNullIf), v, v, v))
-              .collect(Collectors.toList()));
+        FunctionDSL.define(
+            functionName,
+            typeList.stream()
+                .map(v -> impl((UnaryPredicateOperator::exprNullIf), v, v, v))
+                .collect(Collectors.toList()));
     return functionResolver;
   }
 
-  /** v2 if v1 is null.
+  /**
+   * v2 if v1 is null.
    *
    * @param v1 varable 1
    * @param v2 varable 2
@@ -133,7 +156,8 @@ public static ExprValue exprIfNull(ExprValue v1, ExprValue v2) {
     return (v1.isNull() || v1.isMissing()) ? v2 : v1;
   }
 
-  /** return null if v1 equls to v2.
+  /**
+   * return null if v1 equls to v2.
    *
    * @param v1 varable 1
    * @param v2 varable 2
@@ -146,5 +170,4 @@ public static ExprValue exprNullIf(ExprValue v1, ExprValue v2) {
   public static ExprValue exprIf(ExprValue v1, ExprValue v2, ExprValue v3) {
     return !v1.isNull() && !v1.isMissing() && LITERAL_TRUE.equals(v1) ? v2 : v3;
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/parse/GrokExpression.java b/core/src/main/java/org/opensearch/sql/expression/parse/GrokExpression.java
index 9797832f07..748ce5f559 100644
--- a/core/src/main/java/org/opensearch/sql/expression/parse/GrokExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/parse/GrokExpression.java
@@ -20,9 +20,7 @@
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * GrokExpression with grok patterns.
- */
+/** GrokExpression with grok patterns. */
 @EqualsAndHashCode(callSuper = true)
 @ToString
 public class GrokExpression extends ParseExpression {
@@ -33,15 +31,14 @@ public class GrokExpression extends ParseExpression {
     grokCompiler.registerDefaultPatterns();
   }
 
-  @EqualsAndHashCode.Exclude
-  private final Grok grok;
+  @EqualsAndHashCode.Exclude private final Grok grok;
 
   /**
    * GrokExpression.
    *
    * @param sourceField source text field
-   * @param pattern     pattern used for parsing
-   * @param identifier  derived field
+   * @param pattern pattern used for parsing
+   * @param identifier derived field
    */
   public GrokExpression(Expression sourceField, Expression pattern, Expression identifier) {
     super("grok", sourceField, pattern, identifier);
@@ -69,7 +66,9 @@ ExprValue parseValue(ExprValue value) throws ExpressionEvaluationException {
    */
   public static List<String> getNamedGroupCandidates(String pattern) {
     Grok grok = grokCompiler.compile(pattern);
-    return grok.namedGroups.stream().map(grok::getNamedRegexCollectionById)
-        .filter(group -> !group.equals("UNWANTED")).collect(Collectors.toUnmodifiableList());
+    return grok.namedGroups.stream()
+        .map(grok::getNamedRegexCollectionById)
+        .filter(group -> !group.equals("UNWANTED"))
+        .collect(Collectors.toUnmodifiableList());
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/parse/ParseExpression.java b/core/src/main/java/org/opensearch/sql/expression/parse/ParseExpression.java
index d99242bdde..6e2456ecc2 100644
--- a/core/src/main/java/org/opensearch/sql/expression/parse/ParseExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/parse/ParseExpression.java
@@ -21,29 +21,25 @@
 import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.FunctionName;
 
-/**
- * ParseExpression.
- */
-@EqualsAndHashCode
+/** ParseExpression. */
+@EqualsAndHashCode(callSuper = false)
 @ToString
 public abstract class ParseExpression extends FunctionExpression {
-  @Getter
-  protected final Expression sourceField;
+  @Getter protected final Expression sourceField;
   protected final Expression pattern;
-  @Getter
-  protected final Expression identifier;
+  @Getter protected final Expression identifier;
   protected final String identifierStr;
 
   /**
    * ParseExpression.
    *
    * @param functionName name of function expression
-   * @param sourceField  source text field
-   * @param pattern      pattern used for parsing
-   * @param identifier   derived field
+   * @param sourceField source text field
+   * @param pattern pattern used for parsing
+   * @param identifier derived field
    */
-  public ParseExpression(String functionName, Expression sourceField, Expression pattern,
-                         Expression identifier) {
+  public ParseExpression(
+      String functionName, Expression sourceField, Expression pattern, Expression identifier) {
     super(FunctionName.of(functionName), ImmutableList.of(sourceField, pattern, identifier));
     this.sourceField = sourceField;
     this.pattern = pattern;
diff --git a/core/src/main/java/org/opensearch/sql/expression/parse/PatternsExpression.java b/core/src/main/java/org/opensearch/sql/expression/parse/PatternsExpression.java
index 67160dad58..5b92779c35 100644
--- a/core/src/main/java/org/opensearch/sql/expression/parse/PatternsExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/parse/PatternsExpression.java
@@ -17,30 +17,28 @@
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * PatternsExpression with regex filter.
- */
+/** PatternsExpression with regex filter. */
 @EqualsAndHashCode(callSuper = true)
 @ToString
 public class PatternsExpression extends ParseExpression {
-  /**
-   * Default name of the derived field.
-   */
+  /** Default name of the derived field. */
   public static final String DEFAULT_NEW_FIELD = "patterns_field";
 
-  private static final ImmutableSet<Character> DEFAULT_IGNORED_CHARS = ImmutableSet.copyOf(
-      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".chars()
-          .mapToObj(c -> (char) c).toArray(Character[]::new));
+  private static final ImmutableSet<Character> DEFAULT_IGNORED_CHARS =
+      ImmutableSet.copyOf(
+          "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+              .chars()
+              .mapToObj(c -> (char) c)
+              .toArray(Character[]::new));
   private final boolean useCustomPattern;
-  @EqualsAndHashCode.Exclude
-  private Pattern pattern;
+  @EqualsAndHashCode.Exclude private Pattern pattern;
 
   /**
    * PatternsExpression.
    *
    * @param sourceField source text field
-   * @param pattern     pattern used for parsing
-   * @param identifier  derived field
+   * @param pattern pattern used for parsing
+   * @param identifier derived field
    */
   public PatternsExpression(Expression sourceField, Expression pattern, Expression identifier) {
     super("patterns", sourceField, pattern, identifier);
diff --git a/core/src/main/java/org/opensearch/sql/expression/parse/RegexExpression.java b/core/src/main/java/org/opensearch/sql/expression/parse/RegexExpression.java
index f3a3ff0b66..7514c9df69 100644
--- a/core/src/main/java/org/opensearch/sql/expression/parse/RegexExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/parse/RegexExpression.java
@@ -19,24 +19,20 @@
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * RegexExpression with regex and named capture group.
- */
+/** RegexExpression with regex and named capture group. */
 @EqualsAndHashCode(callSuper = true)
 @ToString
 public class RegexExpression extends ParseExpression {
   private static final Logger log = LogManager.getLogger(RegexExpression.class);
   private static final Pattern GROUP_PATTERN = Pattern.compile("\\(\\?<([a-zA-Z][a-zA-Z0-9]*)>");
-  @Getter
-  @EqualsAndHashCode.Exclude
-  private final Pattern regexPattern;
+  @Getter @EqualsAndHashCode.Exclude private final Pattern regexPattern;
 
   /**
    * RegexExpression.
    *
    * @param sourceField source text field
-   * @param pattern     pattern used for parsing
-   * @param identifier  derived field
+   * @param pattern pattern used for parsing
+   * @param identifier derived field
    */
   public RegexExpression(Expression sourceField, Expression pattern, Expression identifier) {
     super("regex", sourceField, pattern, identifier);
diff --git a/core/src/main/java/org/opensearch/sql/expression/span/SpanExpression.java b/core/src/main/java/org/opensearch/sql/expression/span/SpanExpression.java
index aff114145e..949ed52e7f 100644
--- a/core/src/main/java/org/opensearch/sql/expression/span/SpanExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/span/SpanExpression.java
@@ -24,9 +24,7 @@ public class SpanExpression implements Expression {
   private final Expression value;
   private final SpanUnit unit;
 
-  /**
-   * Construct a span expression by field and span interval expression.
-   */
+  /** Construct a span expression by field and span interval expression. */
   public SpanExpression(Expression field, Expression value, SpanUnit unit) {
     this.field = field;
     this.value = value;
@@ -35,18 +33,46 @@ public SpanExpression(Expression field, Expression value, SpanUnit unit) {
 
   @Override
   public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-    Rounding<?> rounding = Rounding.createRounding(this); //TODO: will integrate with WindowAssigner
+    Rounding<?> rounding =
+        Rounding.createRounding(this); // TODO: will integrate with WindowAssigner
     return rounding.round(field.valueOf(valueEnv));
   }
 
   /**
    * Return type follows the following table.
-   *  FIELD         VALUE     RETURN_TYPE
-   *  int/long      integer   int/long (field type)
-   *  int/long      double    double
-   *  float/double  integer   float/double (field type)
-   *  float/double  double    float/double (field type)
-   *  other         any       field type
+   *
+   * <table>
+   *   <tr>
+   *     <th>FIELD</th>
+   *     <th>VALUE</th>
+   *     <th>RETURN_TYPE</th>
+   *   </tr>
+   *   <tr>
+   *       <th>int/long</th>
+   *       <th>integer</th>
+   *       <th>int/long (field type)</th>
+   *   </tr>
+   *   <tr>
+   *       <th>int/long</th>
+   *       <th>double</th>
+   *       <th>double</th>
+   *   </tr>
+   *   <tr>
+   *       <th>float/double</th>
+   *       <th>integer</th>
+   *       <th>float/double (field type)</th>
+   *   </tr>
+   *   <tr>
+   *       <th>float/double</th>
+   *       <th>double</th>
+   *       <th>float/double (field type)</th>
+   *   </tr>
+   *   <tr>
+   *       <th>other</th>
+   *       <th>any</th>
+   *       <th>field type</th>
+   *   </tr>
+   *  </table>
    */
   @Override
   public ExprType type() {
diff --git a/core/src/main/java/org/opensearch/sql/expression/system/SystemFunctions.java b/core/src/main/java/org/opensearch/sql/expression/system/SystemFunctions.java
index 6d8dd5093e..cf071c4f31 100644
--- a/core/src/main/java/org/opensearch/sql/expression/system/SystemFunctions.java
+++ b/core/src/main/java/org/opensearch/sql/expression/system/SystemFunctions.java
@@ -24,9 +24,7 @@
 
 @UtilityClass
 public class SystemFunctions {
-  /**
-   * Register TypeOf Operator.
-   */
+  /** Register TypeOf Operator. */
   public static void register(BuiltinFunctionRepository repository) {
     repository.register(typeof());
   }
@@ -37,19 +35,20 @@ private static FunctionResolver typeof() {
       @Override
       public Pair<FunctionSignature, FunctionBuilder> resolve(
           FunctionSignature unresolvedSignature) {
-        return Pair.of(unresolvedSignature,
+        return Pair.of(
+            unresolvedSignature,
             (functionProperties, arguments) ->
                 new FunctionExpression(BuiltinFunctionName.TYPEOF.getName(), arguments) {
-              @Override
-              public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-                return new ExprStringValue(getArguments().get(0).type().toString());
-              }
+                  @Override
+                  public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
+                    return new ExprStringValue(getArguments().get(0).type().legacyTypeName());
+                  }
 
-              @Override
-              public ExprType type() {
-                return STRING;
-              }
-            });
+                  @Override
+                  public ExprType type() {
+                    return STRING;
+                  }
+                });
       }
 
       @Override
diff --git a/core/src/main/java/org/opensearch/sql/expression/text/TextFunction.java b/core/src/main/java/org/opensearch/sql/expression/text/TextFunction.java
index 25eb25489c..d670843551 100644
--- a/core/src/main/java/org/opensearch/sql/expression/text/TextFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/text/TextFunction.java
@@ -3,31 +3,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.text;
 
+import static org.opensearch.sql.data.type.ExprCoreType.ARRAY;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 import static org.opensearch.sql.expression.function.FunctionDSL.define;
 import static org.opensearch.sql.expression.function.FunctionDSL.impl;
 import static org.opensearch.sql.expression.function.FunctionDSL.nullMissingHandling;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 import lombok.experimental.UtilityClass;
+import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.data.model.ExprIntegerValue;
 import org.opensearch.sql.data.model.ExprStringValue;
 import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.model.ExprValueUtils;
+import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.FunctionExpression;
+import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
 import org.opensearch.sql.expression.function.DefaultFunctionResolver;
 import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.expression.function.FunctionSignature;
 import org.opensearch.sql.expression.function.SerializableBiFunction;
 import org.opensearch.sql.expression.function.SerializableTriFunction;
 
-
 /**
- * The definition of text functions.
- * 1) have the clear interface for function define.
- * 2) the implementation should rely on ExprValue.
+ * The definition of text functions. 1) have the clear interface for function define. 2) the
+ * implementation should rely on ExprValue.
  */
 @UtilityClass
 public class TextFunction {
@@ -60,17 +68,21 @@ public void register(BuiltinFunctionRepository repository) {
   }
 
   /**
-   * Gets substring starting at given point, for optional given length.
-   * Form of this function using keywords instead of comma delimited variables is not supported.
-   * Supports following signatures:
+   * <b>Gets substring starting at given point, for optional given length.</b><br>
+   * Form of this function using keywords instead of comma delimited variables is not supported.<br>
+   * Supports following signatures:<br>
    * (STRING, INTEGER)/(STRING, INTEGER, INTEGER) -> STRING
    */
   private DefaultFunctionResolver substringSubstr(FunctionName functionName) {
-    return define(functionName,
-            impl(nullMissingHandling(TextFunction::exprSubstrStart),
-                    STRING, STRING, INTEGER),
-            impl(nullMissingHandling(TextFunction::exprSubstrStartLength),
-                    STRING, STRING, INTEGER, INTEGER));
+    return define(
+        functionName,
+        impl(nullMissingHandling(TextFunction::exprSubstrStart), STRING, STRING, INTEGER),
+        impl(
+            nullMissingHandling(TextFunction::exprSubstrStartLength),
+            STRING,
+            STRING,
+            INTEGER,
+            INTEGER));
   }
 
   private DefaultFunctionResolver substring() {
@@ -82,201 +94,277 @@ private DefaultFunctionResolver substr() {
   }
 
   /**
-   * Removes leading whitespace from string.
-   * Supports following signatures:
+   * <b>Removes leading whitespace from string.</b><br>
+   * Supports following signatures:<br>
    * STRING -> STRING
    */
   private DefaultFunctionResolver ltrim() {
-    return define(BuiltinFunctionName.LTRIM.getName(),
-        impl(nullMissingHandling((v) -> new ExprStringValue(v.stringValue().stripLeading())),
-            STRING, STRING));
+    return define(
+        BuiltinFunctionName.LTRIM.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprStringValue(v.stringValue().stripLeading())),
+            STRING,
+            STRING));
   }
 
   /**
-   * Removes trailing whitespace from string.
-   * Supports following signatures:
+   * <b>Removes trailing whitespace from string.</b><br>
+   * Supports following signatures:<br>
    * STRING -> STRING
    */
   private DefaultFunctionResolver rtrim() {
-    return define(BuiltinFunctionName.RTRIM.getName(),
-        impl(nullMissingHandling((v) -> new ExprStringValue(v.stringValue().stripTrailing())),
-                STRING, STRING));
+    return define(
+        BuiltinFunctionName.RTRIM.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprStringValue(v.stringValue().stripTrailing())),
+            STRING,
+            STRING));
   }
 
   /**
-   * Removes leading and trailing whitespace from string.
-   * Has option to specify a String to trim instead of whitespace but this is not yet supported.
-   * Supporting String specification requires finding keywords inside TRIM command.
-   * Supports following signatures:
+   * <b>Removes leading and trailing whitespace from string.</b><br>
+   * Has option to specify a String to trim instead of whitespace but this is not yet supported.<br>
+   * Supporting String specification requires finding keywords inside TRIM command.<br>
+   * Supports following signatures:<br>
    * STRING -> STRING
    */
   private DefaultFunctionResolver trim() {
-    return define(BuiltinFunctionName.TRIM.getName(),
-        impl(nullMissingHandling((v) -> new ExprStringValue(v.stringValue().trim())),
-            STRING, STRING));
+    return define(
+        BuiltinFunctionName.TRIM.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprStringValue(v.stringValue().trim())),
+            STRING,
+            STRING));
   }
 
   /**
-   * Converts String to lowercase.
-   * Supports following signatures:
+   * <b>Converts String to lowercase.</b><br>
+   * Supports following signatures:<br>
    * STRING -> STRING
    */
   private DefaultFunctionResolver lower() {
-    return define(BuiltinFunctionName.LOWER.getName(),
-        impl(nullMissingHandling((v) -> new ExprStringValue((v.stringValue().toLowerCase()))),
-            STRING, STRING)
-    );
+    return define(
+        BuiltinFunctionName.LOWER.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprStringValue((v.stringValue().toLowerCase()))),
+            STRING,
+            STRING));
   }
 
   /**
-   * Converts String to uppercase.
-   * Supports following signatures:
+   * <b>Converts String to uppercase.</b><br>
+   * Supports following signatures:<br>
    * STRING -> STRING
    */
   private DefaultFunctionResolver upper() {
-    return define(BuiltinFunctionName.UPPER.getName(),
-        impl(nullMissingHandling((v) -> new ExprStringValue((v.stringValue().toUpperCase()))),
-            STRING, STRING)
-    );
+    return define(
+        BuiltinFunctionName.UPPER.getName(),
+        impl(
+            nullMissingHandling((v) -> new ExprStringValue((v.stringValue().toUpperCase()))),
+            STRING,
+            STRING));
   }
 
   /**
-   * TODO: https://github.com/opendistro-for-elasticsearch/sql/issues/710
-   *  Extend to accept variable argument amounts.
-   * Concatenates a list of Strings.
-   * Supports following signatures:
-   * (STRING, STRING) -> STRING
+   * <b>Concatenates a list of Strings.</b><br>
+   * Supports following signatures:<br>
+   * (STRING, STRING, ...., STRING) -> STRING
    */
   private DefaultFunctionResolver concat() {
-    return define(BuiltinFunctionName.CONCAT.getName(),
-        impl(nullMissingHandling((str1, str2) ->
-            new ExprStringValue(str1.stringValue() + str2.stringValue())), STRING, STRING, STRING));
+    FunctionName concatFuncName = BuiltinFunctionName.CONCAT.getName();
+    return define(
+        concatFuncName,
+        funcName ->
+            Pair.of(
+                new FunctionSignature(concatFuncName, Collections.singletonList(ARRAY)),
+                (funcProp, args) ->
+                    new FunctionExpression(funcName, args) {
+                      @Override
+                      public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
+                        List<ExprValue> exprValues =
+                            args.stream()
+                                .map(arg -> arg.valueOf(valueEnv))
+                                .collect(Collectors.toList());
+                        if (exprValues.stream().anyMatch(ExprValue::isMissing)) {
+                          return ExprValueUtils.missingValue();
+                        }
+                        if (exprValues.stream().anyMatch(ExprValue::isNull)) {
+                          return ExprValueUtils.nullValue();
+                        }
+                        return new ExprStringValue(
+                            exprValues.stream()
+                                .map(ExprValue::stringValue)
+                                .collect(Collectors.joining()));
+                      }
+
+                      @Override
+                      public ExprType type() {
+                        return STRING;
+                      }
+                    }));
   }
 
   /**
-   * TODO: https://github.com/opendistro-for-elasticsearch/sql/issues/710
-   *  Extend to accept variable argument amounts.
-   * Concatenates a list of Strings with a separator string.
-   * Supports following signatures:
+   * TODO: https://github.com/opendistro-for-elasticsearch/sql/issues/710<br>
+   * Extend to accept variable argument amounts.<br>
+   * <br>
+   * Concatenates a list of Strings with a separator string. Supports following<br>
+   * signatures:<br>
    * (STRING, STRING, STRING) -> STRING
    */
   private DefaultFunctionResolver concat_ws() {
-    return define(BuiltinFunctionName.CONCAT_WS.getName(),
-        impl(nullMissingHandling((sep, str1, str2) ->
-            new ExprStringValue(str1.stringValue() + sep.stringValue() + str2.stringValue())),
-                STRING, STRING, STRING, STRING));
+    return define(
+        BuiltinFunctionName.CONCAT_WS.getName(),
+        impl(
+            nullMissingHandling(
+                (sep, str1, str2) ->
+                    new ExprStringValue(
+                        str1.stringValue() + sep.stringValue() + str2.stringValue())),
+            STRING,
+            STRING,
+            STRING,
+            STRING));
   }
 
   /**
-   * Calculates length of String in bytes.
-   * Supports following signatures:
+   * <b>Calculates length of String in bytes.</b><br>
+   * Supports following signatures:<br>
    * STRING -> INTEGER
    */
   private DefaultFunctionResolver length() {
-    return define(BuiltinFunctionName.LENGTH.getName(),
-        impl(nullMissingHandling((str) ->
-            new ExprIntegerValue(str.stringValue().getBytes().length)), INTEGER, STRING));
+    return define(
+        BuiltinFunctionName.LENGTH.getName(),
+        impl(
+            nullMissingHandling((str) -> new ExprIntegerValue(str.stringValue().getBytes().length)),
+            INTEGER,
+            STRING));
   }
 
   /**
-   * Does String comparison of two Strings and returns Integer value.
-   * Supports following signatures:
+   * <b>Does String comparison of two Strings and returns Integer value.</b><br>
+   * Supports following signatures:<br>
    * (STRING, STRING) -> INTEGER
    */
   private DefaultFunctionResolver strcmp() {
-    return define(BuiltinFunctionName.STRCMP.getName(),
-        impl(nullMissingHandling((str1, str2) ->
-            new ExprIntegerValue(Integer.compare(
-                str1.stringValue().compareTo(str2.stringValue()), 0))),
-            INTEGER, STRING, STRING));
+    return define(
+        BuiltinFunctionName.STRCMP.getName(),
+        impl(
+            nullMissingHandling(
+                (str1, str2) ->
+                    new ExprIntegerValue(
+                        Integer.compare(str1.stringValue().compareTo(str2.stringValue()), 0))),
+            INTEGER,
+            STRING,
+            STRING));
   }
 
   /**
-   * Returns the rightmost len characters from the string str, or NULL if any argument is NULL.
-   * Supports following signatures:
+   * <b>Returns the rightmost len characters from the string str, or NULL if any argument is
+   * NULL.</b><br>
+   * Supports following signatures:<br>
    * (STRING, INTEGER) -> STRING
    */
   private DefaultFunctionResolver right() {
-    return define(BuiltinFunctionName.RIGHT.getName(),
-            impl(nullMissingHandling(TextFunction::exprRight), STRING, STRING, INTEGER));
+    return define(
+        BuiltinFunctionName.RIGHT.getName(),
+        impl(nullMissingHandling(TextFunction::exprRight), STRING, STRING, INTEGER));
   }
 
   /**
-   * Returns the leftmost len characters from the string str, or NULL if any argument is NULL.
-   * Supports following signature:
+   * <b>Returns the leftmost len characters from the string str, or NULL if any argument is
+   * NULL.</b><br>
+   * Supports following signature:<br>
    * (STRING, INTEGER) -> STRING
    */
   private DefaultFunctionResolver left() {
-    return define(BuiltinFunctionName.LEFT.getName(),
+    return define(
+        BuiltinFunctionName.LEFT.getName(),
         impl(nullMissingHandling(TextFunction::exprLeft), STRING, STRING, INTEGER));
   }
 
   /**
-   * Returns the numeric value of the leftmost character of the string str.
-   * Returns 0 if str is the empty string. Returns NULL if str is NULL.
-   * ASCII() works for 8-bit characters.
-   * Supports following signature:
+   * <b>Returns the numeric value of the leftmost character of the string str.</b><br>
+   * Returns 0 if str is the empty string. Returns NULL if str is NULL.<br>
+   * ASCII() works for 8-bit characters.<br>
+   * Supports following signature:<br>
    * STRING -> INTEGER
    */
   private DefaultFunctionResolver ascii() {
-    return define(BuiltinFunctionName.ASCII.getName(),
+    return define(
+        BuiltinFunctionName.ASCII.getName(),
         impl(nullMissingHandling(TextFunction::exprAscii), INTEGER, STRING));
   }
 
   /**
-   * LOCATE(substr, str) returns the position of the first occurrence of substring substr
-   * in string str. LOCATE(substr, str, pos) returns the position of the first occurrence
-   * of substring substr in string str, starting at position pos.
-   * Returns 0 if substr is not in str.
-   * Returns NULL if any argument is NULL.
-   * Supports following signature:
-   * (STRING, STRING) -> INTEGER
+   * <b>LOCATE(substr, str) returns the position of the first occurrence of substring substr</b><br>
+   * in string str. LOCATE(substr, str, pos) returns the position of the first occurrence<br>
+   * of substring substr in string str, starting at position pos.<br>
+   * Returns 0 if substr is not in str.<br>
+   * Returns NULL if any argument is NULL.<br>
+   * Supports following signature:<br>
+   * (STRING, STRING) -> INTEGER<br>
    * (STRING, STRING, INTEGER) -> INTEGER
    */
   private DefaultFunctionResolver locate() {
-    return define(BuiltinFunctionName.LOCATE.getName(),
-        impl(nullMissingHandling(
-            (SerializableBiFunction<ExprValue, ExprValue, ExprValue>)
-                TextFunction::exprLocate), INTEGER, STRING, STRING),
-        impl(nullMissingHandling(
-            (SerializableTriFunction<ExprValue, ExprValue, ExprValue, ExprValue>)
-                TextFunction::exprLocate), INTEGER, STRING, STRING, INTEGER));
+    return define(
+        BuiltinFunctionName.LOCATE.getName(),
+        impl(
+            nullMissingHandling(
+                (SerializableBiFunction<ExprValue, ExprValue, ExprValue>) TextFunction::exprLocate),
+            INTEGER,
+            STRING,
+            STRING),
+        impl(
+            nullMissingHandling(
+                (SerializableTriFunction<ExprValue, ExprValue, ExprValue, ExprValue>)
+                    TextFunction::exprLocate),
+            INTEGER,
+            STRING,
+            STRING,
+            INTEGER));
   }
 
   /**
-   * Returns the position of the first occurrence of a substring in a string starting from 1.
-   * Returns 0 if substring is not in string.
-   * Returns NULL if any argument is NULL.
-   * Supports following signature:
+   * <b>Returns the position of the first occurrence of a substring in a string starting from 1.</b>
+   * <br>
+   * Returns 0 if substring is not in string.<br>
+   * Returns NULL if any argument is NULL.<br>
+   * Supports following signature:<br>
    * (STRING IN STRING) -> INTEGER
    */
   private DefaultFunctionResolver position() {
-    return define(BuiltinFunctionName.POSITION.getName(),
-            impl(nullMissingHandling(
-                    (SerializableBiFunction<ExprValue, ExprValue, ExprValue>)
-                            TextFunction::exprLocate), INTEGER, STRING, STRING));
+    return define(
+        BuiltinFunctionName.POSITION.getName(),
+        impl(
+            nullMissingHandling(
+                (SerializableBiFunction<ExprValue, ExprValue, ExprValue>) TextFunction::exprLocate),
+            INTEGER,
+            STRING,
+            STRING));
   }
 
   /**
-   * REPLACE(str, from_str, to_str) returns the string str with all occurrences of
-   * the string from_str replaced by the string to_str.
-   * REPLACE() performs a case-sensitive match when searching for from_str.
-   * Supports following signature:
+   * <b>REPLACE(str, from_str, to_str) returns the string str with all occurrences of<br>
+   * the string from_str replaced by the string to_str.</b><br>
+   * REPLACE() performs a case-sensitive match when searching for from_str.<br>
+   * Supports following signature:<br>
    * (STRING, STRING, STRING) -> STRING
    */
   private DefaultFunctionResolver replace() {
-    return define(BuiltinFunctionName.REPLACE.getName(),
+    return define(
+        BuiltinFunctionName.REPLACE.getName(),
         impl(nullMissingHandling(TextFunction::exprReplace), STRING, STRING, STRING, STRING));
   }
 
   /**
-   * REVERSE(str) returns reversed string of the string supplied as an argument
-   * Returns NULL if the argument is NULL.
-   * Supports the following signature:
+   * <b>REVERSE(str) returns reversed string of the string supplied as an argument</b></b><br>
+   * Returns NULL if the argument is NULL.<br>
+   * Supports the following signature:<br>
    * (STRING) -> STRING
    */
   private DefaultFunctionResolver reverse() {
-    return define(BuiltinFunctionName.REVERSE.getName(),
+    return define(
+        BuiltinFunctionName.REVERSE.getName(),
         impl(nullMissingHandling(TextFunction::exprReverse), STRING, STRING));
   }
 
@@ -290,7 +378,7 @@ private static ExprValue exprSubstrStart(ExprValue exprValue, ExprValue start) {
   }
 
   private static ExprValue exprSubstrStartLength(
-          ExprValue exprValue, ExprValue start, ExprValue length) {
+      ExprValue exprValue, ExprValue start, ExprValue length) {
     int startIdx = start.integerValue();
     int len = length.integerValue();
     if ((startIdx == 0) || (len == 0)) {
@@ -328,7 +416,8 @@ private static ExprValue exprLeft(ExprValue expr, ExprValue length) {
   }
 
   private static ExprValue exprAscii(ExprValue expr) {
-    return new ExprIntegerValue((int) expr.stringValue().charAt(0));
+    return new ExprIntegerValue(
+        expr.stringValue().length() == 0 ? 0 : (int) expr.stringValue().charAt(0));
   }
 
   private static ExprValue exprLocate(ExprValue subStr, ExprValue str) {
@@ -348,4 +437,3 @@ private static ExprValue exprReverse(ExprValue str) {
     return new ExprStringValue(new StringBuilder(str.stringValue()).reverse().toString());
   }
 }
-
diff --git a/core/src/main/java/org/opensearch/sql/expression/window/WindowDefinition.java b/core/src/main/java/org/opensearch/sql/expression/window/WindowDefinition.java
index 24751633de..2030ce8062 100644
--- a/core/src/main/java/org/opensearch/sql/expression/window/WindowDefinition.java
+++ b/core/src/main/java/org/opensearch/sql/expression/window/WindowDefinition.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window;
 
 import static org.opensearch.sql.ast.tree.Sort.SortOption;
@@ -16,9 +15,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Window definition that consists of partition and sort by information for a window.
- */
+/** Window definition that consists of partition and sort by information for a window. */
 @Data
 public class WindowDefinition {
 
@@ -27,7 +24,8 @@ public class WindowDefinition {
 
   /**
    * Return all items in partition by and sort list.
-   * @return  all sort items
+   *
+   * @return all sort items
    */
   public List<Pair<SortOption, Expression>> getAllSortItems() {
     List<Pair<SortOption, Expression>> allSorts = new ArrayList<>();
@@ -35,5 +33,4 @@ public List<Pair<SortOption, Expression>> getAllSortItems() {
     allSorts.addAll(sortList);
     return allSorts;
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/window/WindowFunctionExpression.java b/core/src/main/java/org/opensearch/sql/expression/window/WindowFunctionExpression.java
index a15919bf03..73f0734953 100644
--- a/core/src/main/java/org/opensearch/sql/expression/window/WindowFunctionExpression.java
+++ b/core/src/main/java/org/opensearch/sql/expression/window/WindowFunctionExpression.java
@@ -3,27 +3,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window;
 
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.window.frame.WindowFrame;
 
-/**
- * Window function abstraction.
- */
+/** Window function abstraction. */
 public interface WindowFunctionExpression extends Expression {
 
   /**
-   * Create specific window frame based on window definition and what's current window function.
-   * For now two types of cumulative window frame is returned:
-   *  1. Ranking window functions: ignore frame definition and always operates on
-   *      previous and current row.
-   *  2. Aggregate window functions: frame partition into peers and sliding window is not supported.
+   * Create specific window frame based on window definition and what's current window function. For
+   * now two types of cumulative window frame is returned:
+   *
+   * <ol>
+   *   <li>Ranking window functions: ignore frame definition and always operates on previous and
+   *       current row.
+   *   <li>Aggregate window functions: frame partition into peers and sliding window is not
+   *       supported.
+   * </ol>
    *
    * @param definition window definition
-   * @return           window frame
+   * @return window frame
    */
   WindowFrame createWindowFrame(WindowDefinition definition);
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/window/WindowFunctions.java b/core/src/main/java/org/opensearch/sql/expression/window/WindowFunctions.java
index 9a9e0c4c86..3df59c52c0 100644
--- a/core/src/main/java/org/opensearch/sql/expression/window/WindowFunctions.java
+++ b/core/src/main/java/org/opensearch/sql/expression/window/WindowFunctions.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window;
 
 import static java.util.Collections.emptyList;
@@ -22,16 +21,14 @@
 import org.opensearch.sql.expression.window.ranking.RankingWindowFunction;
 import org.opensearch.sql.expression.window.ranking.RowNumberFunction;
 
-/**
- * Window functions that register all window functions in function repository.
- */
+/** Window functions that register all window functions in function repository. */
 @UtilityClass
 public class WindowFunctions {
 
   /**
    * Register all window functions to function repository.
    *
-   * @param repository  function repository
+   * @param repository function repository
    */
   public void register(BuiltinFunctionRepository repository) {
     repository.register(rowNumber());
@@ -51,11 +48,11 @@ private DefaultFunctionResolver denseRank() {
     return rankingFunction(BuiltinFunctionName.DENSE_RANK.getName(), DenseRankFunction::new);
   }
 
-  private DefaultFunctionResolver rankingFunction(FunctionName functionName,
-                                                  Supplier<RankingWindowFunction> constructor) {
+  private DefaultFunctionResolver rankingFunction(
+      FunctionName functionName, Supplier<RankingWindowFunction> constructor) {
     FunctionSignature functionSignature = new FunctionSignature(functionName, emptyList());
     FunctionBuilder functionBuilder = (functionProperties, arguments) -> constructor.get();
-    return new DefaultFunctionResolver(functionName,
-        ImmutableMap.of(functionSignature, functionBuilder));
+    return new DefaultFunctionResolver(
+        functionName, ImmutableMap.of(functionSignature, functionBuilder));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/window/aggregation/AggregateWindowFunction.java b/core/src/main/java/org/opensearch/sql/expression/window/aggregation/AggregateWindowFunction.java
index 604f65e6ff..63922ac3fd 100644
--- a/core/src/main/java/org/opensearch/sql/expression/window/aggregation/AggregateWindowFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/window/aggregation/AggregateWindowFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window.aggregation;
 
 import java.util.List;
@@ -21,9 +20,7 @@
 import org.opensearch.sql.expression.window.frame.PeerRowsWindowFrame;
 import org.opensearch.sql.expression.window.frame.WindowFrame;
 
-/**
- * Aggregate function adapter that adapts Aggregator for window operator use.
- */
+/** Aggregate function adapter that adapts Aggregator for window operator use. */
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class AggregateWindowFunction implements WindowFunctionExpression {
@@ -64,5 +61,4 @@ public <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context) {
   public String toString() {
     return aggregator.toString();
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/window/frame/CurrentRowWindowFrame.java b/core/src/main/java/org/opensearch/sql/expression/window/frame/CurrentRowWindowFrame.java
index 06b19a1488..359486a4ef 100644
--- a/core/src/main/java/org/opensearch/sql/expression/window/frame/CurrentRowWindowFrame.java
+++ b/core/src/main/java/org/opensearch/sql/expression/window/frame/CurrentRowWindowFrame.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window.frame;
 
 import com.google.common.collect.PeekingIterator;
@@ -21,18 +20,17 @@
 import org.opensearch.sql.expression.window.WindowDefinition;
 
 /**
- * Conceptually, cumulative window frame should hold all seen rows till next partition.
- * This class is actually an optimized version that only hold previous and current row. This is
- * efficient and sufficient for ranking and aggregate window function support for now, though need
- * to add "real" cumulative frame implementation in future as needed.
+ * Conceptually, cumulative window frame should hold all seen rows till next partition. This class
+ * is actually an optimized version that only hold previous and current row. This is efficient and
+ * sufficient for ranking and aggregate window function support for now, though need to add "real"
+ * cumulative frame implementation in future as needed.
  */
 @EqualsAndHashCode
 @RequiredArgsConstructor
 @ToString
 public class CurrentRowWindowFrame implements WindowFrame {
 
-  @Getter
-  private final WindowDefinition windowDefinition;
+  @Getter private final WindowDefinition windowDefinition;
 
   private ExprValue previous;
   private ExprValue current;
@@ -67,14 +65,12 @@ public ExprValue previous() {
 
   private List<ExprValue> resolve(List<Expression> expressions, ExprValue row) {
     Environment<Expression, ExprValue> valueEnv = row.bindingTuples();
-    return expressions.stream()
-                      .map(expr -> expr.valueOf(valueEnv))
-                      .collect(Collectors.toList());
+    return expressions.stream().map(expr -> expr.valueOf(valueEnv)).collect(Collectors.toList());
   }
 
   /**
-   * Current row window frame won't pre-fetch any row ahead.
-   * So always return false as nothing "cached" in frame.
+   * Current row window frame won't pre-fetch any row ahead. So always return false as nothing
+   * "cached" in frame.
    */
   @Override
   public boolean hasNext() {
@@ -85,5 +81,4 @@ public boolean hasNext() {
   public List<ExprValue> next() {
     return Collections.emptyList();
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/window/frame/PeerRowsWindowFrame.java b/core/src/main/java/org/opensearch/sql/expression/window/frame/PeerRowsWindowFrame.java
index a3e8de40c1..a98826d333 100644
--- a/core/src/main/java/org/opensearch/sql/expression/window/frame/PeerRowsWindowFrame.java
+++ b/core/src/main/java/org/opensearch/sql/expression/window/frame/PeerRowsWindowFrame.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window.frame;
 
 import com.google.common.collect.PeekingIterator;
@@ -19,9 +18,9 @@
 import org.opensearch.sql.expression.window.WindowDefinition;
 
 /**
- * Window frame that only keep peers (tuples with same value of fields specified in sort list
- * in window definition). See PeerWindowFrameTest for details about how this window frame
- * interacts with window operator and window function.
+ * Window frame that only keep peers (tuples with same value of fields specified in sort list in
+ * window definition). See PeerWindowFrameTest for details about how this window frame interacts
+ * with window operator and window function.
  */
 @RequiredArgsConstructor
 public class PeerRowsWindowFrame implements WindowFrame {
@@ -29,34 +28,27 @@ public class PeerRowsWindowFrame implements WindowFrame {
   private final WindowDefinition windowDefinition;
 
   /**
-   * All peer rows (peer means rows in a partition that share same sort key
-   * based on sort list in window definition.
+   * All peer rows (peer means rows in a partition that share same sort key based on sort list in
+   * window definition.
    */
   private final List<ExprValue> peers = new ArrayList<>();
 
-  /**
-   * Which row in the peer is currently being enriched by window function.
-   */
+  /** Which row in the peer is currently being enriched by window function. */
   private int position;
 
-  /**
-   * Does row at current position represents a new partition.
-   */
+  /** Does row at current position represents a new partition. */
   private boolean isNewPartition = true;
 
-  /**
-   * If any more pre-fetched rows not returned to window operator yet.
-   */
+  /** If any more pre-fetched rows not returned to window operator yet. */
   @Override
   public boolean hasNext() {
     return position < peers.size();
   }
 
   /**
-   * Move position and clear new partition flag.
-   * Note that because all peer rows have same result from window function,
-   * this is only returned at first time to change window function state.
-   * Afterwards, empty list is returned to avoid changes until next peer loaded.
+   * Move position and clear new partition flag. Note that because all peer rows have same result
+   * from window function, this is only returned at first time to change window function state.
+   * Afterward, empty list is returned to avoid changes until next peer loaded.
    *
    * @return all rows for the peer
    */
@@ -70,8 +62,9 @@ public List<ExprValue> next() {
   }
 
   /**
-   * Current row at the position. Because rows are pre-fetched here,
-   * window operator needs to get them from here too.
+   * Current row at the position. Because rows are pre-fetched here, window operator needs to get
+   * them from here too.
+   *
    * @return row at current position that being enriched by window function
    */
   @Override
@@ -82,11 +75,16 @@ public ExprValue current() {
   /**
    * Preload all peer rows if last peer rows done. Note that when no more data in peeking iterator,
    * there must be rows in frame (hasNext()=true), so no need to check it.hasNext() in this method.
-   * Load until:
-   *  1. Different peer found (row with different sort key)
-   *  2. Or new partition (row with different partition key)
-   *  3. Or no more rows
-   * @param it  rows iterator
+   * <br>
+   * Load until:<br>
+   *
+   * <ol>
+   *   <li>Different peer found (row with different sort key)
+   *   <li>Or new partition (row with different partition key)
+   *   <li>Or no more rows
+   * </ol>
+   *
+   * @param it rows iterator
    */
   @Override
   public void load(PeekingIterator<ExprValue> it) {
@@ -118,10 +116,7 @@ public boolean isNewPartition() {
 
   private boolean isPeer(ExprValue next) {
     List<Expression> sortFields =
-        windowDefinition.getSortList()
-                        .stream()
-                        .map(Pair::getRight)
-                        .collect(Collectors.toList());
+        windowDefinition.getSortList().stream().map(Pair::getRight).collect(Collectors.toList());
 
     ExprValue last = peers.get(peers.size() - 1);
     return resolve(sortFields, last).equals(resolve(sortFields, next));
@@ -139,9 +134,6 @@ private boolean isSamePartition(ExprValue next) {
 
   private List<ExprValue> resolve(List<Expression> expressions, ExprValue row) {
     Environment<Expression, ExprValue> valueEnv = row.bindingTuples();
-    return expressions.stream()
-                      .map(expr -> expr.valueOf(valueEnv))
-                      .collect(Collectors.toList());
+    return expressions.stream().map(expr -> expr.valueOf(valueEnv)).collect(Collectors.toList());
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/window/frame/WindowFrame.java b/core/src/main/java/org/opensearch/sql/expression/window/frame/WindowFrame.java
index 323656547f..657f63e4c9 100644
--- a/core/src/main/java/org/opensearch/sql/expression/window/frame/WindowFrame.java
+++ b/core/src/main/java/org/opensearch/sql/expression/window/frame/WindowFrame.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window.frame;
 
 import com.google.common.collect.PeekingIterator;
@@ -14,13 +13,17 @@
 import org.opensearch.sql.expression.env.Environment;
 
 /**
- * Window frame that represents a subset of a window which is all data accessible to
- * the window function when calculation. Basically there are 3 types of window frame:
- *  1) Entire window frame that holds all data of the window
- *  2) Cumulative window frame that accumulates one row by another
- *  3) Sliding window frame that maintains a sliding window of fixed size
- * Note that which type of window frame is used is determined by both window function itself
- * and frame definition in a window definition.
+ * Window frame that represents a subset of a window which is all data accessible to the window
+ * function when calculation. Basically there are 3 types of window frame:
+ *
+ * <ol>
+ *   <li>Entire window frame that holds all data of the window
+ *   <li>Cumulative window frame that accumulates one row by another
+ *   <li>Sliding window frame that maintains a sliding window of fixed size
+ * </ol>
+ *
+ * Note that which type of window frame is used is determined by both window function itself and
+ * frame definition in a window definition.
  */
 public interface WindowFrame extends Environment<Expression, ExprValue>, Iterator<List<ExprValue>> {
 
@@ -31,20 +34,22 @@ default ExprValue resolve(Expression var) {
 
   /**
    * Check is current row the beginning of a new partition according to window definition.
-   * @return  true if a new partition begins here, otherwise false.
+   *
+   * @return true if a new partition begins here, otherwise false.
    */
   boolean isNewPartition();
 
   /**
    * Load one or more rows as window function calculation needed.
-   * @param iterator  peeking iterator that can peek next element without moving iterator
+   *
+   * @param iterator peeking iterator that can peek next element without moving iterator
    */
   void load(PeekingIterator<ExprValue> iterator);
 
   /**
    * Get current data row for giving window operator chance to get rows preloaded into frame.
+   *
    * @return data row
    */
   ExprValue current();
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/window/ranking/DenseRankFunction.java b/core/src/main/java/org/opensearch/sql/expression/window/ranking/DenseRankFunction.java
index ba6e88d98d..87506ef63e 100644
--- a/core/src/main/java/org/opensearch/sql/expression/window/ranking/DenseRankFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/window/ranking/DenseRankFunction.java
@@ -3,15 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window.ranking;
 
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.window.frame.CurrentRowWindowFrame;
 
 /**
- * Dense rank window function that assigns a rank number to each row similarly as
- * rank function. The difference is there is no gap between rank number assigned.
+ * Dense rank window function that assigns a rank number to each row similarly as rank function. The
+ * difference is there is no gap between rank number assigned.
  */
 public class DenseRankFunction extends RankingWindowFunction {
 
@@ -30,5 +29,4 @@ protected int rank(CurrentRowWindowFrame frame) {
     }
     return rank;
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/window/ranking/RankFunction.java b/core/src/main/java/org/opensearch/sql/expression/window/ranking/RankFunction.java
index c1f33e6137..f72a28cd9a 100644
--- a/core/src/main/java/org/opensearch/sql/expression/window/ranking/RankFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/window/ranking/RankFunction.java
@@ -3,22 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window.ranking;
 
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.window.frame.CurrentRowWindowFrame;
 
 /**
- * Rank window function that assigns a rank number to each row based on sort items
- * defined in window definition. Use same rank number if sort item values same on
- * previous and current row.
+ * Rank window function that assigns a rank number to each row based on sort items defined in window
+ * definition. Use same rank number if sort item values same on previous and current row.
  */
 public class RankFunction extends RankingWindowFunction {
 
-  /**
-   * Total number of rows have seen in current partition.
-   */
+  /** Total number of rows have seen in current partition. */
   private int total;
 
   public RankFunction() {
@@ -38,5 +34,4 @@ protected int rank(CurrentRowWindowFrame frame) {
     }
     return rank;
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/expression/window/ranking/RankingWindowFunction.java b/core/src/main/java/org/opensearch/sql/expression/window/ranking/RankingWindowFunction.java
index 07a4b42dbd..c119629cda 100644
--- a/core/src/main/java/org/opensearch/sql/expression/window/ranking/RankingWindowFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/window/ranking/RankingWindowFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window.ranking;
 
 import static java.util.Collections.emptyList;
@@ -30,11 +29,9 @@
  * such as same return type (integer), same argument list (no arg).
  */
 public abstract class RankingWindowFunction extends FunctionExpression
-                                            implements WindowFunctionExpression {
+    implements WindowFunctionExpression {
 
-  /**
-   * Current rank number assigned.
-   */
+  /** Current rank number assigned. */
   protected int rank;
 
   public RankingWindowFunction(FunctionName functionName) {
@@ -58,26 +55,27 @@ public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
 
   /**
    * Rank logic that sub-class needs to implement.
-   * @param frame   window frame
-   * @return        rank number
+   *
+   * @param frame window frame
+   * @return rank number
    */
   protected abstract int rank(CurrentRowWindowFrame frame);
 
   /**
    * Check sort field to see if current value is different from previous.
-   * @param frame   window frame
-   * @return        true if different, false if same or no sort list defined
+   *
+   * @param frame window frame
+   * @return true if different, false if same or no sort list defined
    */
   protected boolean isSortFieldValueDifferent(CurrentRowWindowFrame frame) {
     if (isSortItemsNotDefined(frame)) {
       return false;
     }
 
-    List<Expression> sortItems = frame.getWindowDefinition()
-                                      .getSortList()
-                                      .stream()
-                                      .map(Pair::getRight)
-                                      .collect(Collectors.toList());
+    List<Expression> sortItems =
+        frame.getWindowDefinition().getSortList().stream()
+            .map(Pair::getRight)
+            .collect(Collectors.toList());
 
     List<ExprValue> previous = resolve(frame, sortItems, frame.previous());
     List<ExprValue> current = resolve(frame, sortItems, frame.current());
@@ -90,9 +88,7 @@ private boolean isSortItemsNotDefined(CurrentRowWindowFrame frame) {
 
   private List<ExprValue> resolve(WindowFrame frame, List<Expression> expressions, ExprValue row) {
     BindingTuple valueEnv = row.bindingTuples();
-    return expressions.stream()
-                      .map(expr -> expr.valueOf(valueEnv))
-                      .collect(Collectors.toList());
+    return expressions.stream().map(expr -> expr.valueOf(valueEnv)).collect(Collectors.toList());
   }
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/expression/window/ranking/RowNumberFunction.java b/core/src/main/java/org/opensearch/sql/expression/window/ranking/RowNumberFunction.java
index 067dfa569d..90bb2ed8ff 100644
--- a/core/src/main/java/org/opensearch/sql/expression/window/ranking/RowNumberFunction.java
+++ b/core/src/main/java/org/opensearch/sql/expression/window/ranking/RowNumberFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window.ranking;
 
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
@@ -25,5 +24,4 @@ protected int rank(CurrentRowWindowFrame frame) {
     }
     return rank++;
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/monitor/AlwaysHealthyMonitor.java b/core/src/main/java/org/opensearch/sql/monitor/AlwaysHealthyMonitor.java
index 94bb8d6936..84cec4c9c7 100644
--- a/core/src/main/java/org/opensearch/sql/monitor/AlwaysHealthyMonitor.java
+++ b/core/src/main/java/org/opensearch/sql/monitor/AlwaysHealthyMonitor.java
@@ -3,19 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.monitor;
 
-/**
- * Always healthy resource monitor.
- */
+/** Always healthy resource monitor. */
 public class AlwaysHealthyMonitor extends ResourceMonitor {
-  public static final ResourceMonitor ALWAYS_HEALTHY_MONITOR =
-      new AlwaysHealthyMonitor();
+  public static final ResourceMonitor ALWAYS_HEALTHY_MONITOR = new AlwaysHealthyMonitor();
 
-  /**
-   * always healthy.
-   */
+  /** always healthy. */
   @Override
   public boolean isHealthy() {
     return true;
diff --git a/core/src/main/java/org/opensearch/sql/monitor/ResourceMonitor.java b/core/src/main/java/org/opensearch/sql/monitor/ResourceMonitor.java
index ce76a3f982..bbd1c67a62 100644
--- a/core/src/main/java/org/opensearch/sql/monitor/ResourceMonitor.java
+++ b/core/src/main/java/org/opensearch/sql/monitor/ResourceMonitor.java
@@ -3,12 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.monitor;
 
 /**
- * The abstract interface of ResourceMonitor.
- * When an fault is detected, the circuit breaker is open.
+ * The abstract interface of ResourceMonitor. When an fault is detected, the circuit breaker is
+ * open.
  */
 public abstract class ResourceMonitor {
   /**
diff --git a/core/src/main/java/org/opensearch/sql/planner/DefaultImplementor.java b/core/src/main/java/org/opensearch/sql/planner/DefaultImplementor.java
index 4a5276418d..9a5cf03766 100644
--- a/core/src/main/java/org/opensearch/sql/planner/DefaultImplementor.java
+++ b/core/src/main/java/org/opensearch/sql/planner/DefaultImplementor.java
@@ -3,14 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner;
 
+import org.opensearch.sql.executor.pagination.PlanSerializer;
 import org.opensearch.sql.planner.logical.LogicalAggregation;
+import org.opensearch.sql.planner.logical.LogicalCloseCursor;
 import org.opensearch.sql.planner.logical.LogicalDedupe;
 import org.opensearch.sql.planner.logical.LogicalEval;
+import org.opensearch.sql.planner.logical.LogicalFetchCursor;
 import org.opensearch.sql.planner.logical.LogicalFilter;
 import org.opensearch.sql.planner.logical.LogicalLimit;
+import org.opensearch.sql.planner.logical.LogicalNested;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalPlanNodeVisitor;
 import org.opensearch.sql.planner.logical.LogicalProject;
@@ -22,29 +26,32 @@
 import org.opensearch.sql.planner.logical.LogicalValues;
 import org.opensearch.sql.planner.logical.LogicalWindow;
 import org.opensearch.sql.planner.physical.AggregationOperator;
+import org.opensearch.sql.planner.physical.CursorCloseOperator;
 import org.opensearch.sql.planner.physical.DedupeOperator;
 import org.opensearch.sql.planner.physical.EvalOperator;
 import org.opensearch.sql.planner.physical.FilterOperator;
 import org.opensearch.sql.planner.physical.LimitOperator;
+import org.opensearch.sql.planner.physical.NestedOperator;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.planner.physical.ProjectOperator;
 import org.opensearch.sql.planner.physical.RareTopNOperator;
 import org.opensearch.sql.planner.physical.RemoveOperator;
 import org.opensearch.sql.planner.physical.RenameOperator;
 import org.opensearch.sql.planner.physical.SortOperator;
+import org.opensearch.sql.planner.physical.TakeOrderedOperator;
 import org.opensearch.sql.planner.physical.ValuesOperator;
 import org.opensearch.sql.planner.physical.WindowOperator;
 import org.opensearch.sql.storage.read.TableScanBuilder;
+import org.opensearch.sql.storage.write.TableWriteBuilder;
 
 /**
  * Default implementor for implementing logical to physical translation. "Default" here means all
- * logical operator will be translated to correspondent physical operator to pipeline operations
- * in post-processing style in memory.
- * Different storage can override methods here to optimize default pipelining operator, for example
- * a storage has the flexibility to override visitFilter and visitRelation to push down filtering
- * operation and return a single physical index scan operator.
+ * logical operator will be translated to correspondent physical operator to pipeline operations in
+ * post-processing style in memory. Different storage can override methods here to optimize default
+ * pipelining operator, for example a storage has the flexibility to override visitFilter and
+ * visitRelation to push down filtering operation and return a single physical index scan operator.
  *
- * @param <C>   context type
+ * @param <C> context type
  */
 public class DefaultImplementor<C> extends LogicalPlanNodeVisitor<PhysicalPlan, C> {
 
@@ -55,8 +62,7 @@ public PhysicalPlan visitRareTopN(LogicalRareTopN node, C context) {
         node.getCommandType(),
         node.getNoOfResults(),
         node.getFieldList(),
-        node.getGroupByList()
-    );
+        node.getGroupByList());
   }
 
   @Override
@@ -71,16 +77,14 @@ public PhysicalPlan visitDedupe(LogicalDedupe node, C context) {
 
   @Override
   public PhysicalPlan visitProject(LogicalProject node, C context) {
-    return new ProjectOperator(visitChild(node, context), node.getProjectList(),
-        node.getNamedParseExpressions());
+    return new ProjectOperator(
+        visitChild(node, context), node.getProjectList(), node.getNamedParseExpressions());
   }
 
   @Override
   public PhysicalPlan visitWindow(LogicalWindow node, C context) {
     return new WindowOperator(
-        visitChild(node, context),
-        node.getWindowFunction(),
-        node.getWindowDefinition());
+        visitChild(node, context), node.getWindowFunction(), node.getWindowDefinition());
   }
 
   @Override
@@ -93,6 +97,11 @@ public PhysicalPlan visitEval(LogicalEval node, C context) {
     return new EvalOperator(visitChild(node, context), node.getExpressions());
   }
 
+  @Override
+  public PhysicalPlan visitNested(LogicalNested node, C context) {
+    return new NestedOperator(visitChild(node, context), node.getFields());
+  }
+
   @Override
   public PhysicalPlan visitSort(LogicalSort node, C context) {
     return new SortOperator(visitChild(node, context), node.getSortList());
@@ -121,7 +130,14 @@ public PhysicalPlan visitValues(LogicalValues node, C context) {
 
   @Override
   public PhysicalPlan visitLimit(LogicalLimit node, C context) {
-    return new LimitOperator(visitChild(node, context), node.getLimit(), node.getOffset());
+    PhysicalPlan child = visitChild(node, context);
+    // Optimize sort + limit to take ordered operator
+    if (child instanceof SortOperator) {
+      SortOperator sortChild = (SortOperator) child;
+      return new TakeOrderedOperator(
+          sortChild.getInput(), node.getLimit(), node.getOffset(), sortChild.getSortList());
+    }
+    return new LimitOperator(child, node.getLimit(), node.getOffset());
   }
 
   @Override
@@ -129,15 +145,36 @@ public PhysicalPlan visitTableScanBuilder(TableScanBuilder plan, C context) {
     return plan.build();
   }
 
+  @Override
+  public PhysicalPlan visitTableWriteBuilder(TableWriteBuilder plan, C context) {
+    return plan.build(visitChild(plan, context));
+  }
+
   @Override
   public PhysicalPlan visitRelation(LogicalRelation node, C context) {
-    throw new UnsupportedOperationException("Storage engine is responsible for "
-        + "implementing and optimizing logical plan with relation involved");
+    throw new UnsupportedOperationException(
+        "Storage engine is responsible for "
+            + "implementing and optimizing logical plan with relation involved");
+  }
+
+  @Override
+  public PhysicalPlan visitFetchCursor(LogicalFetchCursor plan, C context) {
+    return new PlanSerializer(plan.getEngine()).convertToPlan(plan.getCursor());
+  }
+
+  @Override
+  public PhysicalPlan visitCloseCursor(LogicalCloseCursor node, C context) {
+    return new CursorCloseOperator(visitChild(node, context));
+  }
+
+  // Called when paging query requested without `FROM` clause only
+  @Override
+  public PhysicalPlan visitPaginate(LogicalPaginate plan, C context) {
+    return visitChild(plan, context);
   }
 
   protected PhysicalPlan visitChild(LogicalPlan node, C context) {
     // Logical operators visited here must have a single child
     return node.getChild().get(0).accept(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/PlanContext.java b/core/src/main/java/org/opensearch/sql/planner/PlanContext.java
index 3d43c02d61..38f2bde244 100644
--- a/core/src/main/java/org/opensearch/sql/planner/PlanContext.java
+++ b/core/src/main/java/org/opensearch/sql/planner/PlanContext.java
@@ -9,13 +9,10 @@
 import lombok.Getter;
 import org.opensearch.sql.storage.split.Split;
 
-/**
- * Plan context hold planning related information.
- */
+/** Plan context hold planning related information. */
 public class PlanContext {
 
-  @Getter
-  private final Optional<Split> split;
+  @Getter private final Optional<Split> split;
 
   public PlanContext(Split split) {
     this.split = Optional.of(split);
diff --git a/core/src/main/java/org/opensearch/sql/planner/PlanNode.java b/core/src/main/java/org/opensearch/sql/planner/PlanNode.java
index 8cd6e088e5..a79997cd7f 100644
--- a/core/src/main/java/org/opensearch/sql/planner/PlanNode.java
+++ b/core/src/main/java/org/opensearch/sql/planner/PlanNode.java
@@ -3,14 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner;
 
 import java.util.List;
 
-/**
- * The definition of Plan Node.
- */
+/** The definition of Plan Node. */
 public interface PlanNode<T extends PlanNode> {
 
   /**
diff --git a/core/src/main/java/org/opensearch/sql/planner/Planner.java b/core/src/main/java/org/opensearch/sql/planner/Planner.java
index 8333425091..1397fa8a18 100644
--- a/core/src/main/java/org/opensearch/sql/planner/Planner.java
+++ b/core/src/main/java/org/opensearch/sql/planner/Planner.java
@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner;
 
-
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.planner.logical.LogicalPlan;
@@ -16,17 +14,15 @@
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.storage.Table;
 
-/**
- * Planner that plans and chooses the optimal physical plan.
- */
+/** Planner that plans and chooses the optimal physical plan. */
 @RequiredArgsConstructor
 public class Planner {
 
   private final LogicalPlanOptimizer logicalOptimizer;
 
   /**
-   * Generate optimal physical plan for logical plan. If no table involved,
-   * translate logical plan to physical by default implementor.
+   * Generate optimal physical plan for logical plan. If no table involved, translate logical plan
+   * to physical by default implementor.<br>
    * TODO: for now just delegate entire logical plan to storage engine.
    *
    * @param plan logical plan
@@ -37,28 +33,28 @@ public PhysicalPlan plan(LogicalPlan plan) {
     if (table == null) {
       return plan.accept(new DefaultImplementor<>(), null);
     }
-    return table.implement(
-        table.optimize(optimize(plan)));
+    return table.implement(table.optimize(optimize(plan)));
   }
 
   private Table findTable(LogicalPlan plan) {
-    return plan.accept(new LogicalPlanNodeVisitor<Table, Object>() {
-
-      @Override
-      public Table visitNode(LogicalPlan node, Object context) {
-        List<LogicalPlan> children = node.getChild();
-        if (children.isEmpty()) {
-          return null;
-        }
-        return children.get(0).accept(this, context);
-      }
-
-      @Override
-      public Table visitRelation(LogicalRelation node, Object context) {
-        return node.getTable();
-      }
-
-    }, null);
+    return plan.accept(
+        new LogicalPlanNodeVisitor<Table, Object>() {
+
+          @Override
+          public Table visitNode(LogicalPlan node, Object context) {
+            List<LogicalPlan> children = node.getChild();
+            if (children.isEmpty()) {
+              return null;
+            }
+            return children.get(0).accept(this, context);
+          }
+
+          @Override
+          public Table visitRelation(LogicalRelation node, Object context) {
+            return node.getTable();
+          }
+        },
+        null);
   }
 
   private LogicalPlan optimize(LogicalPlan plan) {
diff --git a/core/src/main/java/org/opensearch/sql/planner/SerializablePlan.java b/core/src/main/java/org/opensearch/sql/planner/SerializablePlan.java
new file mode 100644
index 0000000000..1503946abc
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/SerializablePlan.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner;
+
+import java.io.Externalizable;
+
+/**
+ * All subtypes of PhysicalPlan which needs to be serialized (in cursor, for pagination feature)
+ * should follow one of the following options.
+ *
+ * <ul>
+ *   <li>Both:
+ *       <ul>
+ *         <li>Override both methods from {@link Externalizable}.
+ *         <li>Define a public no-arg constructor.
+ *       </ul>
+ *   <li>Overwrite {@link #getPlanForSerialization} to return another instance of {@link
+ *       SerializablePlan}.
+ * </ul>
+ */
+public interface SerializablePlan extends Externalizable {
+
+  /**
+   * Override to return child or delegated plan, so parent plan should skip this one for
+   * serialization, but it should try to serialize grandchild plan. Imagine plan structure like this
+   *
+   * <pre>
+   *    A         -> this
+   *    `- B      -> child
+   *      `- C    -> this
+   * </pre>
+   *
+   * In that case only plans A and C should be attempted to serialize. It is needed to skip a
+   * `ResourceMonitorPlan` instance only, actually.
+   *
+   * <pre>{@code
+   * * A.writeObject(B.getPlanForSerialization());
+   *
+   * }</pre>
+   *
+   * @return Next plan for serialization.
+   */
+  default SerializablePlan getPlanForSerialization() {
+    return this;
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalAD.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalAD.java
index c8c04b1817..25dbd14f1a 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalAD.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalAD.java
@@ -18,6 +18,7 @@ public class LogicalAD extends LogicalPlan {
 
   /**
    * Constructor of LogicalAD.
+   *
    * @param child child logical plan
    * @param arguments arguments of the algorithm
    */
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalAggregation.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalAggregation.java
index ebca01cdf8..ecbcece623 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalAggregation.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalAggregation.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.Collections;
@@ -14,26 +13,18 @@
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
 
-/**
- * Logical Aggregation.
- */
+/** Logical Aggregation. */
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class LogicalAggregation extends LogicalPlan {
 
-  @Getter
-  private final List<NamedAggregator> aggregatorList;
+  @Getter private final List<NamedAggregator> aggregatorList;
 
-  @Getter
-  private final List<NamedExpression> groupByList;
+  @Getter private final List<NamedExpression> groupByList;
 
-  /**
-   * Constructor of LogicalAggregation.
-   */
+  /** Constructor of LogicalAggregation. */
   public LogicalAggregation(
-      LogicalPlan child,
-      List<NamedAggregator> aggregatorList,
-      List<NamedExpression> groupByList) {
+      LogicalPlan child, List<NamedAggregator> aggregatorList, List<NamedExpression> groupByList) {
     super(Collections.singletonList(child));
     this.aggregatorList = aggregatorList;
     this.groupByList = groupByList;
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalCloseCursor.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalCloseCursor.java
new file mode 100644
index 0000000000..d1b98df8ed
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalCloseCursor.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.logical;
+
+import java.util.List;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * A logical plan node which wraps {@link org.opensearch.sql.planner.LogicalCursor} and represent a
+ * cursor close operation.
+ */
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class LogicalCloseCursor extends LogicalPlan {
+
+  public LogicalCloseCursor(LogicalPlan child) {
+    super(List.of(child));
+  }
+
+  @Override
+  public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
+    return visitor.visitCloseCursor(this, context);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalDedupe.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalDedupe.java
index 020352287d..92734440f7 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalDedupe.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalDedupe.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.Arrays;
@@ -13,9 +12,7 @@
 import lombok.ToString;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Logical Dedupe Plan.
- */
+/** Logical Dedupe Plan. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = true)
@@ -26,12 +23,12 @@ public class LogicalDedupe extends LogicalPlan {
   private final Boolean keepEmpty;
   private final Boolean consecutive;
 
-  /**
-   * Constructor of LogicalDedupe.
-   */
+  /** Constructor of LogicalDedupe. */
   public LogicalDedupe(
       LogicalPlan child,
-      List<Expression> dedupeList, Integer allowedDuplication, Boolean keepEmpty,
+      List<Expression> dedupeList,
+      Integer allowedDuplication,
+      Boolean keepEmpty,
       Boolean consecutive) {
     super(Arrays.asList(child));
     this.dedupeList = dedupeList;
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalEval.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalEval.java
index 8ec0b84dad..e7b8f353bc 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalEval.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalEval.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.Collections;
@@ -24,15 +23,10 @@
 @EqualsAndHashCode(callSuper = true)
 public class LogicalEval extends LogicalPlan {
 
-  @Getter
-  private final List<Pair<ReferenceExpression, Expression>> expressions;
+  @Getter private final List<Pair<ReferenceExpression, Expression>> expressions;
 
-  /**
-   * Constructor of LogicalEval.
-   */
-  public LogicalEval(
-      LogicalPlan child,
-      List<Pair<ReferenceExpression, Expression>> expressions) {
+  /** Constructor of LogicalEval. */
+  public LogicalEval(LogicalPlan child, List<Pair<ReferenceExpression, Expression>> expressions) {
     super(Collections.singletonList(child));
     this.expressions = expressions;
   }
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalFetchCursor.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalFetchCursor.java
new file mode 100644
index 0000000000..ca16b41597
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalFetchCursor.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.logical;
+
+import java.util.List;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import org.opensearch.sql.storage.StorageEngine;
+
+/** A plan node which represents operation of fetching a next page from the cursor. */
+@EqualsAndHashCode(callSuper = false)
+@ToString
+public class LogicalFetchCursor extends LogicalPlan {
+  @Getter private final String cursor;
+
+  @Getter private final StorageEngine engine;
+
+  /** LogicalCursor constructor. Does not have child plans. */
+  public LogicalFetchCursor(String cursor, StorageEngine engine) {
+    super(List.of());
+    this.cursor = cursor;
+    this.engine = engine;
+  }
+
+  @Override
+  public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
+    return visitor.visitFetchCursor(this, context);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalFilter.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalFilter.java
index 78887ad448..49280e8709 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalFilter.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalFilter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.Collections;
@@ -12,19 +11,14 @@
 import lombok.ToString;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Logical Filter represent the filter relation.
- */
+/** Logical Filter represent the filter relation. */
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class LogicalFilter extends LogicalPlan {
 
-  @Getter
-  private final Expression condition;
+  @Getter private final Expression condition;
 
-  /**
-   * Constructor of LogicalFilter.
-   */
+  /** Constructor of LogicalFilter. */
   public LogicalFilter(LogicalPlan child, Expression condition) {
     super(Collections.singletonList(child));
     this.condition = condition;
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalHighlight.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalHighlight.java
index c1e873a00d..41fcd48f81 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalHighlight.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalHighlight.java
@@ -20,11 +20,9 @@ public class LogicalHighlight extends LogicalPlan {
   private final Expression highlightField;
   private final Map<String, Literal> arguments;
 
-  /**
-   * Constructor of LogicalHighlight.
-   */
-  public LogicalHighlight(LogicalPlan childPlan, Expression highlightField,
-      Map<String, Literal> arguments) {
+  /** Constructor of LogicalHighlight. */
+  public LogicalHighlight(
+      LogicalPlan childPlan, Expression highlightField, Map<String, Literal> arguments) {
     super(Collections.singletonList(childPlan));
     this.highlightField = highlightField;
     this.arguments = arguments;
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalLimit.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalLimit.java
index e6253cb2cc..bec77d9b6f 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalLimit.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalLimit.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.Collections;
@@ -18,9 +17,7 @@ public class LogicalLimit extends LogicalPlan {
   private final Integer limit;
   private final Integer offset;
 
-  /**
-   * Constructor of LogicalLimit.
-   */
+  /** Constructor of LogicalLimit. */
   public LogicalLimit(LogicalPlan input, Integer limit, Integer offset) {
     super(Collections.singletonList(input));
     this.limit = limit;
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalML.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalML.java
index c54ee92e08..780e0bba94 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalML.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalML.java
@@ -7,17 +7,16 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.expression.Literal;
 
-/**
- * ML logical plan.
- */
+/** ML logical plan. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class LogicalML extends LogicalPlan {
-  private final  Map<String, Literal> arguments;
+  private final Map<String, Literal> arguments;
 
   /**
    * Constructor of LogicalML.
+   *
    * @param child child logical plan
    * @param arguments arguments of the algorithm
    */
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalMLCommons.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalMLCommons.java
index 22771b42de..cfc313a68d 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalMLCommons.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalMLCommons.java
@@ -7,25 +7,23 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.expression.Literal;
 
-/**
- * ml-commons logical plan.
- */
+/** ml-commons logical plan. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class LogicalMLCommons extends LogicalPlan {
   private final String algorithm;
 
-  private final  Map<String, Literal> arguments;
+  private final Map<String, Literal> arguments;
 
   /**
    * Constructor of LogicalMLCommons.
+   *
    * @param child child logical plan
    * @param algorithm algorithm name
    * @param arguments arguments of the algorithm
    */
-  public LogicalMLCommons(LogicalPlan child, String algorithm,
-                          Map<String, Literal> arguments) {
+  public LogicalMLCommons(LogicalPlan child, String algorithm, Map<String, Literal> arguments) {
     super(Collections.singletonList(child));
     this.algorithm = algorithm;
     this.arguments = arguments;
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalNested.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalNested.java
new file mode 100644
index 0000000000..e791a1fad1
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalNested.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.logical;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import org.opensearch.sql.expression.NamedExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
+
+/** Logical Nested plan. */
+@EqualsAndHashCode(callSuper = true)
+@Getter
+@ToString
+public class LogicalNested extends LogicalPlan {
+  private List<Map<String, ReferenceExpression>> fields;
+  private final List<NamedExpression> projectList;
+
+  /** Constructor of LogicalNested. */
+  public LogicalNested(
+      LogicalPlan childPlan,
+      List<Map<String, ReferenceExpression>> fields,
+      List<NamedExpression> projectList) {
+    super(Collections.singletonList(childPlan));
+    this.fields = fields;
+    this.projectList = projectList;
+  }
+
+  public void addFields(Map<String, ReferenceExpression> fields) {
+    this.fields.add(fields);
+  }
+
+  @Override
+  public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
+    return visitor.visitNested(this, context);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPaginate.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPaginate.java
new file mode 100644
index 0000000000..bd9f20e055
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPaginate.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.logical;
+
+import java.util.List;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+/** LogicalPaginate represents pagination operation for underlying plan. */
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class LogicalPaginate extends LogicalPlan {
+  @Getter private final int pageSize;
+
+  public LogicalPaginate(int pageSize, List<LogicalPlan> childPlans) {
+    super(childPlans);
+    this.pageSize = pageSize;
+  }
+
+  @Override
+  public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
+    return visitor.visitPaginate(this, context);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlan.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlan.java
index ad4a0b3794..2bc1a8756f 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlan.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlan.java
@@ -3,16 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.List;
 import lombok.EqualsAndHashCode;
 import org.opensearch.sql.planner.PlanNode;
 
-/**
- * The abstract base class for all the Logical Plan node.
- */
+/** The abstract base class for all the Logical Plan node. */
 @EqualsAndHashCode(callSuper = false)
 public abstract class LogicalPlan implements PlanNode<LogicalPlan> {
 
@@ -27,8 +24,8 @@ public LogicalPlan(List<LogicalPlan> childPlans) {
    *
    * @param visitor visitor.
    * @param context visitor context.
-   * @param <R>     returned object type.
-   * @param <C>     context type.
+   * @param <R> returned object type.
+   * @param <C> context type.
    * @return returned object.
    */
   public abstract <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context);
@@ -38,7 +35,6 @@ public LogicalPlan replaceChildPlans(List<LogicalPlan> childPlans) {
     return this;
   }
 
-
   @Override
   public List<LogicalPlan> getChild() {
     return childPlans;
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlanDSL.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlanDSL.java
index b18e099afa..2a886ba0ca 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlanDSL.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlanDSL.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import com.google.common.collect.ImmutableList;
@@ -11,27 +10,32 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import lombok.experimental.UtilityClass;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.ast.expression.Literal;
 import org.opensearch.sql.ast.tree.RareTopN.CommandType;
 import org.opensearch.sql.ast.tree.Sort.SortOption;
-import org.opensearch.sql.data.model.ExprCollectionValue;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.LiteralExpression;
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
 import org.opensearch.sql.expression.window.WindowDefinition;
+import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.storage.Table;
 
-/**
- * Logical Plan DSL.
- */
+/** Logical Plan DSL. */
 @UtilityClass
 public class LogicalPlanDSL {
 
+  public static LogicalPlan fetchCursor(String cursor, StorageEngine engine) {
+    return new LogicalFetchCursor(cursor, engine);
+  }
+
+  public static LogicalPlan write(LogicalPlan input, Table table, List<String> columns) {
+    return new LogicalWrite(input, table, columns);
+  }
+
   public static LogicalPlan aggregation(
       LogicalPlan input, List<NamedAggregator> aggregatorList, List<NamedExpression> groupByList) {
     return new LogicalAggregation(input, aggregatorList, groupByList);
@@ -50,26 +54,38 @@ public static LogicalPlan rename(
     return new LogicalRename(input, renameMap);
   }
 
+  public static LogicalPlan paginate(LogicalPlan input, int fetchSize) {
+    return new LogicalPaginate(fetchSize, List.of(input));
+  }
+
   public static LogicalPlan project(LogicalPlan input, NamedExpression... fields) {
     return new LogicalProject(input, Arrays.asList(fields), ImmutableList.of());
   }
 
-  public static LogicalPlan project(LogicalPlan input, List<NamedExpression> fields,
-                                    List<NamedExpression> namedParseExpressions) {
+  public static LogicalPlan project(
+      LogicalPlan input,
+      List<NamedExpression> fields,
+      List<NamedExpression> namedParseExpressions) {
     return new LogicalProject(input, fields, namedParseExpressions);
   }
 
-  public LogicalPlan window(LogicalPlan input,
-                            NamedExpression windowFunction,
-                            WindowDefinition windowDefinition) {
+  public LogicalPlan window(
+      LogicalPlan input, NamedExpression windowFunction, WindowDefinition windowDefinition) {
     return new LogicalWindow(input, windowFunction, windowDefinition);
   }
 
-  public LogicalPlan highlight(LogicalPlan input, Expression field,
-      Map<String, Literal> arguments) {
+  public LogicalPlan highlight(
+      LogicalPlan input, Expression field, Map<String, Literal> arguments) {
     return new LogicalHighlight(input, field, arguments);
   }
 
+  public static LogicalPlan nested(
+      LogicalPlan input,
+      List<Map<String, ReferenceExpression>> nestedArgs,
+      List<NamedExpression> projectList) {
+    return new LogicalNested(input, nestedArgs, projectList);
+  }
+
   public static LogicalPlan remove(LogicalPlan input, ReferenceExpression... fields) {
     return new LogicalRemove(input, ImmutableSet.copyOf(fields));
   }
@@ -97,13 +113,20 @@ public static LogicalPlan dedupe(
         input, Arrays.asList(fields), allowedDuplication, keepEmpty, consecutive);
   }
 
-  public static LogicalPlan rareTopN(LogicalPlan input, CommandType commandType,
-                                     List<Expression> groupByList, Expression... fields) {
+  public static LogicalPlan rareTopN(
+      LogicalPlan input,
+      CommandType commandType,
+      List<Expression> groupByList,
+      Expression... fields) {
     return rareTopN(input, commandType, 10, groupByList, fields);
   }
 
-  public static LogicalPlan rareTopN(LogicalPlan input, CommandType commandType, int noOfResults,
-                                     List<Expression> groupByList, Expression... fields) {
+  public static LogicalPlan rareTopN(
+      LogicalPlan input,
+      CommandType commandType,
+      int noOfResults,
+      List<Expression> groupByList,
+      Expression... fields) {
     return new LogicalRareTopN(input, commandType, noOfResults, Arrays.asList(fields), groupByList);
   }
 
@@ -115,5 +138,4 @@ public LogicalPlan values(List<LiteralExpression>... values) {
   public static LogicalPlan limit(LogicalPlan input, Integer limit, Integer offset) {
     return new LogicalLimit(input, limit, offset);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlanNodeVisitor.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlanNodeVisitor.java
index 0386eb6e2a..156db35306 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlanNodeVisitor.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalPlanNodeVisitor.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import org.opensearch.sql.storage.read.TableScanBuilder;
+import org.opensearch.sql.storage.write.TableWriteBuilder;
 
 /**
  * The visitor of {@link LogicalPlan}.
@@ -28,6 +28,14 @@ public R visitTableScanBuilder(TableScanBuilder plan, C context) {
     return visitNode(plan, context);
   }
 
+  public R visitWrite(LogicalWrite plan, C context) {
+    return visitNode(plan, context);
+  }
+
+  public R visitTableWriteBuilder(TableWriteBuilder plan, C context) {
+    return visitNode(plan, context);
+  }
+
   public R visitFilter(LogicalFilter plan, C context) {
     return visitNode(plan, context);
   }
@@ -64,6 +72,10 @@ public R visitEval(LogicalEval plan, C context) {
     return visitNode(plan, context);
   }
 
+  public R visitNested(LogicalNested plan, C context) {
+    return visitNode(plan, context);
+  }
+
   public R visitSort(LogicalSort plan, C context) {
     return visitNode(plan, context);
   }
@@ -91,4 +103,16 @@ public R visitML(LogicalML plan, C context) {
   public R visitAD(LogicalAD plan, C context) {
     return visitNode(plan, context);
   }
+
+  public R visitPaginate(LogicalPaginate plan, C context) {
+    return visitNode(plan, context);
+  }
+
+  public R visitFetchCursor(LogicalFetchCursor plan, C context) {
+    return visitNode(plan, context);
+  }
+
+  public R visitCloseCursor(LogicalCloseCursor plan, C context) {
+    return visitNode(plan, context);
+  }
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalProject.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalProject.java
index 427ccffc62..5978620480 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalProject.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalProject.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.Collections;
@@ -13,21 +12,15 @@
 import lombok.ToString;
 import org.opensearch.sql.expression.NamedExpression;
 
-/**
- * Project field specified by the {@link LogicalProject#projectList}.
- */
+/** Project field specified by the {@link LogicalProject#projectList}. */
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class LogicalProject extends LogicalPlan {
 
-  @Getter
-  private final List<NamedExpression> projectList;
-  @Getter
-  private final List<NamedExpression> namedParseExpressions;
+  @Getter private final List<NamedExpression> projectList;
+  @Getter private final List<NamedExpression> namedParseExpressions;
 
-  /**
-   * Constructor of LogicalProject.
-   */
+  /** Constructor of LogicalProject. */
   public LogicalProject(
       LogicalPlan child,
       List<NamedExpression> projectList,
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRareTopN.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRareTopN.java
index 4744bc590f..2c387eca9c 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRareTopN.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRareTopN.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.Collections;
@@ -14,9 +13,7 @@
 import org.opensearch.sql.ast.tree.RareTopN.CommandType;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Logical Rare and TopN Plan.
- */
+/** Logical Rare and TopN Plan. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = true)
@@ -27,12 +24,11 @@ public class LogicalRareTopN extends LogicalPlan {
   private final List<Expression> fieldList;
   private final List<Expression> groupByList;
 
-  /**
-   * Constructor of LogicalRareTopN.
-   */
+  /** Constructor of LogicalRareTopN. */
   public LogicalRareTopN(
       LogicalPlan child,
-      CommandType commandType, Integer noOfResults,
+      CommandType commandType,
+      Integer noOfResults,
       List<Expression> fieldList,
       List<Expression> groupByList) {
     super(Collections.singletonList(child));
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRelation.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRelation.java
index a49c3d5cbe..d50e286e1d 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRelation.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRelation.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import com.google.common.collect.ImmutableList;
@@ -12,22 +11,16 @@
 import lombok.ToString;
 import org.opensearch.sql.storage.Table;
 
-/**
- * Logical Relation represent the data source.
- */
+/** Logical Relation represent the data source. */
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class LogicalRelation extends LogicalPlan {
 
-  @Getter
-  private final String relationName;
+  @Getter private final String relationName;
 
-  @Getter
-  private final Table table;
+  @Getter private final Table table;
 
-  /**
-   * Constructor of LogicalRelation.
-   */
+  /** Constructor of LogicalRelation. */
   public LogicalRelation(String relationName, Table table) {
     super(ImmutableList.of());
     this.relationName = relationName;
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRemove.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRemove.java
index cda7282c40..c1aeda22c7 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRemove.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRemove.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.Collections;
@@ -13,22 +12,15 @@
 import lombok.ToString;
 import org.opensearch.sql.expression.ReferenceExpression;
 
-/**
- * Remove field specified by the {@link LogicalRemove#removeList}.
- */
+/** Remove field specified by the {@link LogicalRemove#removeList}. */
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class LogicalRemove extends LogicalPlan {
 
-  @Getter
-  private final Set<ReferenceExpression> removeList;
+  @Getter private final Set<ReferenceExpression> removeList;
 
-  /**
-   * Constructor of LogicalRemove.
-   */
-  public LogicalRemove(
-      LogicalPlan child,
-      Set<ReferenceExpression> removeList) {
+  /** Constructor of LogicalRemove. */
+  public LogicalRemove(LogicalPlan child, Set<ReferenceExpression> removeList) {
     super(Collections.singletonList(child));
     this.removeList = removeList;
   }
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRename.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRename.java
index 007a0a6fca..25ee645932 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRename.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalRename.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.Collections;
@@ -13,23 +12,15 @@
 import lombok.ToString;
 import org.opensearch.sql.expression.ReferenceExpression;
 
-/**
- * Rename Operator.
- * renameList is list of mapping of source and target.
- */
+/** Rename Operator. renameList is list of mapping of source and target. */
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class LogicalRename extends LogicalPlan {
 
-  @Getter
-  private final Map<ReferenceExpression, ReferenceExpression> renameMap;
+  @Getter private final Map<ReferenceExpression, ReferenceExpression> renameMap;
 
-  /**
-   * Constructor of LogicalRename.
-   */
-  public LogicalRename(
-      LogicalPlan child,
-      Map<ReferenceExpression, ReferenceExpression> renameMap) {
+  /** Constructor of LogicalRename. */
+  public LogicalRename(LogicalPlan child, Map<ReferenceExpression, ReferenceExpression> renameMap) {
     super(Collections.singletonList(child));
     this.renameMap = renameMap;
   }
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalSort.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalSort.java
index 947411518f..569ca7e309 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalSort.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalSort.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.Collections;
@@ -15,9 +14,7 @@
 import org.opensearch.sql.ast.tree.Sort.SortOption;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Sort Plan.
- */
+/** Sort Plan. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = true)
@@ -25,12 +22,8 @@ public class LogicalSort extends LogicalPlan {
 
   private final List<Pair<SortOption, Expression>> sortList;
 
-  /**
-   * Constructor of LogicalSort.
-   */
-  public LogicalSort(
-      LogicalPlan child,
-      List<Pair<SortOption, Expression>> sortList) {
+  /** Constructor of LogicalSort. */
+  public LogicalSort(LogicalPlan child, List<Pair<SortOption, Expression>> sortList) {
     super(Collections.singletonList(child));
     this.sortList = sortList;
   }
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalValues.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalValues.java
index 29d2db54b2..325650db33 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalValues.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalValues.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import com.google.common.collect.ImmutableList;
@@ -14,19 +13,22 @@
 import org.opensearch.sql.expression.LiteralExpression;
 
 /**
- * Logical operator which is a sequence of literal rows (like a relation).
- * Basically, Values operator is used to create rows of constant literals
- * "out of nothing" which is corresponding with VALUES clause in SQL.
- * Mostly all rows must have the same number of literals and each column should
- * have same type or can be converted implicitly.
- * In particular, typical use cases include:
- *  1. Project without relation involved.
- *  2. Defining query or insertion without a relation.
+ * Logical operator which is a sequence of literal rows (like a relation).<br>
+ * Basically, Values operator is used to create rows of constant literals<br>
+ * "out of nothing" which is corresponding with VALUES clause in SQL. <br>
+ * Mostly all rows must have the same number of literals and each column should have same type or
+ * can be converted implicitly. In particular, typical use cases include:
+ *
+ * <ol>
+ *   <li>Project without relation involved.
+ *   <li>Defining query or insertion without a relation.
+ * </ol>
+ *
  * Take the following logical plan for example:
- *  <pre>
- *  LogicalProject(expr=[log(2),true,1+2])
- *   |_ LogicalValues([[]])  #an empty row so that Project can evaluate its expressions in next()
- *  </pre>
+ *
+ * <p>LogicalProject(expr=[log(2),true,1+2])<br>
+ * &ensp; |_ LogicalValues([[]]) #an empty row so that Project can evaluate its expressions in
+ * next()
  */
 @ToString
 @Getter
@@ -35,11 +37,8 @@ public class LogicalValues extends LogicalPlan {
 
   private final List<List<LiteralExpression>> values;
 
-  /**
-   * Constructor of LogicalValues.
-   */
-  public LogicalValues(
-      List<List<LiteralExpression>> values) {
+  /** Constructor of LogicalValues. */
+  public LogicalValues(List<List<LiteralExpression>> values) {
     super(ImmutableList.of());
     this.values = values;
   }
@@ -48,5 +47,4 @@ public LogicalValues(
   public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
     return visitor.visitValues(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalWindow.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalWindow.java
index 022b284674..00c89410a7 100644
--- a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalWindow.java
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalWindow.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import java.util.Collections;
@@ -25,13 +24,9 @@ public class LogicalWindow extends LogicalPlan {
   private final NamedExpression windowFunction;
   private final WindowDefinition windowDefinition;
 
-  /**
-   * Constructor of logical window.
-   */
+  /** Constructor of logical window. */
   public LogicalWindow(
-      LogicalPlan child,
-      NamedExpression windowFunction,
-      WindowDefinition windowDefinition) {
+      LogicalPlan child, NamedExpression windowFunction, WindowDefinition windowDefinition) {
     super(Collections.singletonList(child));
     this.windowFunction = windowFunction;
     this.windowDefinition = windowDefinition;
@@ -41,5 +36,4 @@ public LogicalWindow(
   public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
     return visitor.visitWindow(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/logical/LogicalWrite.java b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalWrite.java
new file mode 100644
index 0000000000..a253739a68
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/logical/LogicalWrite.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.logical;
+
+import java.util.Collections;
+import java.util.List;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import org.opensearch.sql.storage.Table;
+
+/** Logical operator for insert statement. */
+@EqualsAndHashCode(callSuper = true)
+@Getter
+@ToString
+public class LogicalWrite extends LogicalPlan {
+
+  /** Table that handles the write operation. */
+  private final Table table;
+
+  /** Optional column name list specified in insert statement. */
+  private final List<String> columns;
+
+  /** Construct a logical write with given child node, table and column name list. */
+  public LogicalWrite(LogicalPlan child, Table table, List<String> columns) {
+    super(Collections.singletonList(child));
+    this.table = table;
+    this.columns = columns;
+  }
+
+  @Override
+  public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
+    return visitor.visitWrite(this, context);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/optimizer/LogicalPlanOptimizer.java b/core/src/main/java/org/opensearch/sql/planner/optimizer/LogicalPlanOptimizer.java
index f241e76993..5c115f0db8 100644
--- a/core/src/main/java/org/opensearch/sql/planner/optimizer/LogicalPlanOptimizer.java
+++ b/core/src/main/java/org/opensearch/sql/planner/optimizer/LogicalPlanOptimizer.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.optimizer;
 
 import static com.facebook.presto.matching.DefaultMatcher.DEFAULT_MATCHER;
@@ -17,55 +16,56 @@
 import org.opensearch.sql.planner.optimizer.rule.PushFilterUnderSort;
 import org.opensearch.sql.planner.optimizer.rule.read.CreateTableScanBuilder;
 import org.opensearch.sql.planner.optimizer.rule.read.TableScanPushDown;
+import org.opensearch.sql.planner.optimizer.rule.write.CreateTableWriteBuilder;
 
 /**
- * {@link LogicalPlan} Optimizer.
- * The Optimizer will run in the TopDown manner.
- * 1> Optimize the current node with all the rules.
- * 2> Optimize the all the child nodes with all the rules.
- * 3) In case the child node could change, Optimize the current node again.
+ * {@link LogicalPlan} Optimizer.<br>
+ * The Optimizer will run in the TopDown manner.<br>
+ *
+ * <ol>
+ *   <li>Optimize the current node with all the rules.
+ *   <li>Optimize the all the child nodes with all the rules.
+ *   <li>In case the child node could change, Optimize the current node again.
+ * </ol>
  */
 public class LogicalPlanOptimizer {
 
   private final List<Rule<?>> rules;
 
-  /**
-   * Create {@link LogicalPlanOptimizer} with customized rules.
-   */
+  /** Create {@link LogicalPlanOptimizer} with customized rules. */
   public LogicalPlanOptimizer(List<Rule<?>> rules) {
     this.rules = rules;
   }
 
-  /**
-   * Create {@link LogicalPlanOptimizer} with pre-defined rules.
-   */
+  /** Create {@link LogicalPlanOptimizer} with pre-defined rules. */
   public static LogicalPlanOptimizer create() {
-    return new LogicalPlanOptimizer(Arrays.asList(
-        /*
-         * Phase 1: Transformations that rely on relational algebra equivalence
-         */
-        new MergeFilterAndFilter(),
-        new PushFilterUnderSort(),
-        /*
-         * Phase 2: Transformations that rely on data source push down capability
-         */
-        new CreateTableScanBuilder(),
-        TableScanPushDown.PUSH_DOWN_FILTER,
-        TableScanPushDown.PUSH_DOWN_AGGREGATION,
-        TableScanPushDown.PUSH_DOWN_SORT,
-        TableScanPushDown.PUSH_DOWN_LIMIT,
-        TableScanPushDown.PUSH_DOWN_HIGHLIGHT,
-        TableScanPushDown.PUSH_DOWN_PROJECT));
+    return new LogicalPlanOptimizer(
+        Arrays.asList(
+            /*
+             * Phase 1: Transformations that rely on relational algebra equivalence
+             */
+            new MergeFilterAndFilter(),
+            new PushFilterUnderSort(),
+            /*
+             * Phase 2: Transformations that rely on data source push down capability
+             */
+            new CreateTableScanBuilder(),
+            TableScanPushDown.PUSH_DOWN_FILTER,
+            TableScanPushDown.PUSH_DOWN_AGGREGATION,
+            TableScanPushDown.PUSH_DOWN_SORT,
+            TableScanPushDown.PUSH_DOWN_LIMIT,
+            new PushDownPageSize(),
+            TableScanPushDown.PUSH_DOWN_HIGHLIGHT,
+            TableScanPushDown.PUSH_DOWN_NESTED,
+            TableScanPushDown.PUSH_DOWN_PROJECT,
+            new CreateTableWriteBuilder()));
   }
 
-  /**
-   * Optimize {@link LogicalPlan}.
-   */
+  /** Optimize {@link LogicalPlan}. */
   public LogicalPlan optimize(LogicalPlan plan) {
     LogicalPlan optimized = internalOptimize(plan);
     optimized.replaceChildPlans(
-        optimized.getChild().stream().map(this::optimize).collect(
-            Collectors.toList()));
+        optimized.getChild().stream().map(this::optimize).collect(Collectors.toList()));
     return internalOptimize(optimized);
   }
 
diff --git a/core/src/main/java/org/opensearch/sql/planner/optimizer/PushDownPageSize.java b/core/src/main/java/org/opensearch/sql/planner/optimizer/PushDownPageSize.java
new file mode 100644
index 0000000000..5201c83c25
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/optimizer/PushDownPageSize.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.optimizer;
+
+import com.facebook.presto.matching.Captures;
+import com.facebook.presto.matching.Pattern;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.Optional;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
+import org.opensearch.sql.planner.logical.LogicalPlan;
+import org.opensearch.sql.storage.read.TableScanBuilder;
+
+/** A {@link LogicalPlanOptimizer} rule that pushes down page size to table scan builder. */
+public class PushDownPageSize implements Rule<LogicalPaginate> {
+  @Override
+  public Pattern<LogicalPaginate> pattern() {
+    return Pattern.typeOf(LogicalPaginate.class)
+        .matching(lp -> findTableScanBuilder(lp).isPresent());
+  }
+
+  @Override
+  public LogicalPlan apply(LogicalPaginate plan, Captures captures) {
+
+    var builder = findTableScanBuilder(plan).orElseThrow();
+    if (!builder.pushDownPageSize(plan)) {
+      throw new IllegalStateException("Failed to push down LogicalPaginate");
+    }
+    return plan.getChild().get(0);
+  }
+
+  private Optional<TableScanBuilder> findTableScanBuilder(LogicalPaginate logicalPaginate) {
+    Deque<LogicalPlan> plans = new ArrayDeque<>();
+    plans.add(logicalPaginate);
+    do {
+      var plan = plans.removeFirst();
+      var children = plan.getChild();
+      if (children.stream().anyMatch(TableScanBuilder.class::isInstance)) {
+        if (children.size() > 1) {
+          throw new UnsupportedOperationException(
+              "Unsupported plan: relation operator cannot have siblings");
+        }
+        return Optional.of((TableScanBuilder) children.get(0));
+      }
+      plans.addAll(children);
+    } while (!plans.isEmpty());
+    return Optional.empty();
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/optimizer/Rule.java b/core/src/main/java/org/opensearch/sql/planner/optimizer/Rule.java
index 123754d3d0..b06ca3e968 100644
--- a/core/src/main/java/org/opensearch/sql/planner/optimizer/Rule.java
+++ b/core/src/main/java/org/opensearch/sql/planner/optimizer/Rule.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.optimizer;
 
 import com.facebook.presto.matching.Captures;
@@ -12,17 +11,17 @@
 
 /**
  * Optimization Rule.
+ *
  * @param <T> LogicalPlan.
  */
 public interface Rule<T> {
 
-  /**
-   * Get the {@link Pattern}.
-   */
+  /** Get the {@link Pattern}. */
   Pattern<T> pattern();
 
   /**
    * Apply the Rule to the LogicalPlan.
+   *
    * @param plan LogicalPlan which match the Pattern.
    * @param captures A list of LogicalPlan which are captured by the Pattern.
    * @return the transfromed LogicalPlan.
diff --git a/core/src/main/java/org/opensearch/sql/planner/optimizer/pattern/Patterns.java b/core/src/main/java/org/opensearch/sql/planner/optimizer/pattern/Patterns.java
index 0ba478594a..ee4e9a20cc 100644
--- a/core/src/main/java/org/opensearch/sql/planner/optimizer/pattern/Patterns.java
+++ b/core/src/main/java/org/opensearch/sql/planner/optimizer/pattern/Patterns.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.optimizer.pattern;
 
 import com.facebook.presto.matching.Capture;
@@ -16,98 +15,98 @@
 import org.opensearch.sql.planner.logical.LogicalFilter;
 import org.opensearch.sql.planner.logical.LogicalHighlight;
 import org.opensearch.sql.planner.logical.LogicalLimit;
+import org.opensearch.sql.planner.logical.LogicalNested;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalProject;
 import org.opensearch.sql.planner.logical.LogicalRelation;
 import org.opensearch.sql.planner.logical.LogicalSort;
+import org.opensearch.sql.planner.logical.LogicalWrite;
 import org.opensearch.sql.storage.Table;
 import org.opensearch.sql.storage.read.TableScanBuilder;
 
-/**
- * Pattern helper class.
- */
+/** Pattern helper class. */
 @UtilityClass
 public class Patterns {
 
-  /**
-   * Logical filter with a given pattern on inner field.
-   */
+  /** Logical filter with a given pattern on inner field. */
   public static <T extends LogicalPlan> Pattern<LogicalFilter> filter(Pattern<T> pattern) {
     return Pattern.typeOf(LogicalFilter.class).with(source(pattern));
   }
 
-  /**
-   * Logical aggregate operator with a given pattern on inner field.
-   */
+  /** Logical aggregate operator with a given pattern on inner field. */
   public static <T extends LogicalPlan> Pattern<LogicalAggregation> aggregate(Pattern<T> pattern) {
     return Pattern.typeOf(LogicalAggregation.class).with(source(pattern));
   }
 
-  /**
-   * Logical sort operator with a given pattern on inner field.
-   */
+  /** Logical sort operator with a given pattern on inner field. */
   public static <T extends LogicalPlan> Pattern<LogicalSort> sort(Pattern<T> pattern) {
     return Pattern.typeOf(LogicalSort.class).with(source(pattern));
   }
 
-  /**
-   * Logical limit operator with a given pattern on inner field.
-   */
+  /** Logical limit operator with a given pattern on inner field. */
   public static <T extends LogicalPlan> Pattern<LogicalLimit> limit(Pattern<T> pattern) {
     return Pattern.typeOf(LogicalLimit.class).with(source(pattern));
   }
 
-  /**
-   * Logical highlight operator with a given pattern on inner field.
-   */
+  /** Logical highlight operator with a given pattern on inner field. */
   public static <T extends LogicalPlan> Pattern<LogicalHighlight> highlight(Pattern<T> pattern) {
     return Pattern.typeOf(LogicalHighlight.class).with(source(pattern));
   }
 
-  /**
-   * Logical project operator with a given pattern on inner field.
-   */
+  /** Logical nested operator with a given pattern on inner field. */
+  public static <T extends LogicalPlan> Pattern<LogicalNested> nested(Pattern<T> pattern) {
+    return Pattern.typeOf(LogicalNested.class).with(source(pattern));
+  }
+
+  /** Logical project operator with a given pattern on inner field. */
   public static <T extends LogicalPlan> Pattern<LogicalProject> project(Pattern<T> pattern) {
     return Pattern.typeOf(LogicalProject.class).with(source(pattern));
   }
 
-  /**
-   * Pattern for {@link TableScanBuilder} and capture it meanwhile.
-   */
+  /** Pattern for {@link TableScanBuilder} and capture it meanwhile. */
   public static Pattern<TableScanBuilder> scanBuilder() {
     return Pattern.typeOf(TableScanBuilder.class).capturedAs(Capture.newCapture());
   }
 
-  /**
-   * LogicalPlan source {@link Property}.
-   */
+  /** LogicalPlan source {@link Property}. */
   public static Property<LogicalPlan, LogicalPlan> source() {
-    return Property.optionalProperty("source", plan -> plan.getChild().size() == 1
-        ? Optional.of(plan.getChild().get(0))
-        : Optional.empty());
+    return Property.optionalProperty(
+        "source",
+        plan ->
+            plan.getChild().size() == 1 ? Optional.of(plan.getChild().get(0)) : Optional.empty());
   }
 
-  /**
-   * Source (children field) with a given pattern.
-   */
+  /** Source (children field) with a given pattern. */
   @SuppressWarnings("unchecked")
-  public static <T extends LogicalPlan>
-      PropertyPattern<LogicalPlan, T> source(Pattern<T> pattern) {
-    Property<LogicalPlan, T> property = Property.optionalProperty("source",
-        plan -> plan.getChild().size() == 1
-            ? Optional.of((T) plan.getChild().get(0))
-            : Optional.empty());
+  public static <T extends LogicalPlan> PropertyPattern<LogicalPlan, T> source(Pattern<T> pattern) {
+    Property<LogicalPlan, T> property =
+        Property.optionalProperty(
+            "source",
+            plan ->
+                plan.getChild().size() == 1
+                    ? Optional.of((T) plan.getChild().get(0))
+                    : Optional.empty());
 
     return property.matching(pattern);
   }
 
-  /**
-   * Logical relation with table field.
-   */
+  /** Logical relation with table field. */
   public static Property<LogicalPlan, Table> table() {
-    return Property.optionalProperty("table",
-        plan -> plan instanceof LogicalRelation
-            ? Optional.of(((LogicalRelation) plan).getTable())
-            : Optional.empty());
+    return Property.optionalProperty(
+        "table",
+        plan ->
+            plan instanceof LogicalRelation
+                ? Optional.of(((LogicalRelation) plan).getTable())
+                : Optional.empty());
+  }
+
+  /** Logical write with table field. */
+  public static Property<LogicalPlan, Table> writeTable() {
+    return Property.optionalProperty(
+        "table",
+        plan ->
+            plan instanceof LogicalWrite
+                ? Optional.of(((LogicalWrite) plan).getTable())
+                : Optional.empty());
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/MergeFilterAndFilter.java b/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/MergeFilterAndFilter.java
index 57763728d5..6270eee131 100644
--- a/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/MergeFilterAndFilter.java
+++ b/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/MergeFilterAndFilter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.optimizer.rule;
 
 import static com.facebook.presto.matching.Pattern.typeOf;
@@ -19,9 +18,7 @@
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.optimizer.Rule;
 
-/**
- * Merge Filter --> Filter to the single Filter condition.
- */
+/** Merge Filter --> Filter to the single Filter condition. */
 public class MergeFilterAndFilter implements Rule<LogicalFilter> {
 
   private final Capture<LogicalFilter> capture;
@@ -30,22 +27,18 @@ public class MergeFilterAndFilter implements Rule<LogicalFilter> {
   @Getter
   private final Pattern<LogicalFilter> pattern;
 
-  /**
-   * Constructor of MergeFilterAndFilter.
-   */
+  /** Constructor of MergeFilterAndFilter. */
   public MergeFilterAndFilter() {
     this.capture = Capture.newCapture();
-    this.pattern = typeOf(LogicalFilter.class)
-        .with(source().matching(typeOf(LogicalFilter.class).capturedAs(capture)));
+    this.pattern =
+        typeOf(LogicalFilter.class)
+            .with(source().matching(typeOf(LogicalFilter.class).capturedAs(capture)));
   }
 
   @Override
-  public LogicalPlan apply(LogicalFilter filter,
-                           Captures captures) {
+  public LogicalPlan apply(LogicalFilter filter, Captures captures) {
     LogicalFilter childFilter = captures.get(capture);
     return new LogicalFilter(
-        childFilter.getChild().get(0),
-        DSL.and(filter.getCondition(), childFilter.getCondition())
-    );
+        childFilter.getChild().get(0), DSL.and(filter.getCondition(), childFilter.getCondition()));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/PushFilterUnderSort.java b/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/PushFilterUnderSort.java
index e3347b402b..b5cd312e64 100644
--- a/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/PushFilterUnderSort.java
+++ b/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/PushFilterUnderSort.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.optimizer.rule;
 
 import static com.facebook.presto.matching.Pattern.typeOf;
@@ -20,7 +19,7 @@
 import org.opensearch.sql.planner.optimizer.Rule;
 
 /**
- * Push Filter under Sort.
+ * Push Filter under Sort.<br>
  * Filter - Sort - Child --> Sort - Filter - Child
  */
 public class PushFilterUnderSort implements Rule<LogicalFilter> {
@@ -31,22 +30,17 @@ public class PushFilterUnderSort implements Rule<LogicalFilter> {
   @Getter
   private final Pattern<LogicalFilter> pattern;
 
-  /**
-   * Constructor of PushFilterUnderSort.
-   */
+  /** Constructor of PushFilterUnderSort. */
   public PushFilterUnderSort() {
     this.capture = Capture.newCapture();
-    this.pattern = typeOf(LogicalFilter.class)
-        .with(source().matching(typeOf(LogicalSort.class).capturedAs(capture)));
+    this.pattern =
+        typeOf(LogicalFilter.class)
+            .with(source().matching(typeOf(LogicalSort.class).capturedAs(capture)));
   }
 
   @Override
-  public LogicalPlan apply(LogicalFilter filter,
-                           Captures captures) {
+  public LogicalPlan apply(LogicalFilter filter, Captures captures) {
     LogicalSort sort = captures.get(capture);
-    return new LogicalSort(
-        filter.replaceChildPlans(sort.getChild()),
-        sort.getSortList()
-    );
+    return new LogicalSort(filter.replaceChildPlans(sort.getChild()), sort.getSortList());
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/read/CreateTableScanBuilder.java b/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/read/CreateTableScanBuilder.java
index dbe61ca8c3..6ed8e1faeb 100644
--- a/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/read/CreateTableScanBuilder.java
+++ b/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/read/CreateTableScanBuilder.java
@@ -19,9 +19,9 @@
 import org.opensearch.sql.storage.read.TableScanBuilder;
 
 /**
- * Rule that replace logical relation operator to {@link TableScanBuilder} for later
- * push down optimization. All push down optimization rules that depends on table scan
- * builder needs to run after this.
+ * Rule that replace logical relation operator to {@link TableScanBuilder} for later push down
+ * optimization. All push down optimization rules that depends on table scan builder needs to run
+ * after this.
  */
 public class CreateTableScanBuilder implements Rule<LogicalRelation> {
 
@@ -33,13 +33,10 @@ public class CreateTableScanBuilder implements Rule<LogicalRelation> {
   @Getter
   private final Pattern<LogicalRelation> pattern;
 
-  /**
-   * Construct create table scan builder rule.
-   */
+  /** Construct create table scan builder rule. */
   public CreateTableScanBuilder() {
     this.capture = Capture.newCapture();
-    this.pattern = Pattern.typeOf(LogicalRelation.class)
-        .with(table().capturedAs(capture));
+    this.pattern = Pattern.typeOf(LogicalRelation.class).with(table().capturedAs(capture));
   }
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/read/TableScanPushDown.java b/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/read/TableScanPushDown.java
index 556a12bb34..b83155d90f 100644
--- a/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/read/TableScanPushDown.java
+++ b/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/read/TableScanPushDown.java
@@ -9,6 +9,7 @@
 import static org.opensearch.sql.planner.optimizer.pattern.Patterns.filter;
 import static org.opensearch.sql.planner.optimizer.pattern.Patterns.highlight;
 import static org.opensearch.sql.planner.optimizer.pattern.Patterns.limit;
+import static org.opensearch.sql.planner.optimizer.pattern.Patterns.nested;
 import static org.opensearch.sql.planner.optimizer.pattern.Patterns.project;
 import static org.opensearch.sql.planner.optimizer.pattern.Patterns.scanBuilder;
 import static org.opensearch.sql.planner.optimizer.pattern.Patterns.sort;
@@ -25,10 +26,10 @@
 import org.opensearch.sql.storage.read.TableScanBuilder;
 
 /**
- * Rule template for all table scan push down rules. Because all push down optimization rules
- * have similar workflow in common, such as a pattern that match an operator on top of table scan
- * builder, and action that eliminates the original operator if pushed down, this class helps
- * remove redundant code and improve readability.
+ * Rule template for all table scan push down rules. Because all push down optimization rules have
+ * similar workflow in common, such as a pattern that match an operator on top of table scan
+ * builder, and action that eliminates the original operator if pushed down, this class helps remove
+ * redundant code and improve readability.
  *
  * @param <T> logical plan node type
  */
@@ -36,44 +37,33 @@ public class TableScanPushDown<T extends LogicalPlan> implements Rule<T> {
 
   /** Push down optimize rule for filtering condition. */
   public static final Rule<?> PUSH_DOWN_FILTER =
-      match(
-          filter(
-              scanBuilder()))
-      .apply((filter, scanBuilder) -> scanBuilder.pushDownFilter(filter));
+      match(filter(scanBuilder()))
+          .apply((filter, scanBuilder) -> scanBuilder.pushDownFilter(filter));
 
   /** Push down optimize rule for aggregate operator. */
   public static final Rule<?> PUSH_DOWN_AGGREGATION =
-      match(
-          aggregate(
-              scanBuilder()))
-      .apply((agg, scanBuilder) -> scanBuilder.pushDownAggregation(agg));
+      match(aggregate(scanBuilder()))
+          .apply((agg, scanBuilder) -> scanBuilder.pushDownAggregation(agg));
 
   /** Push down optimize rule for sort operator. */
   public static final Rule<?> PUSH_DOWN_SORT =
-      match(
-          sort(
-              scanBuilder()))
-      .apply((sort, scanBuilder) -> scanBuilder.pushDownSort(sort));
+      match(sort(scanBuilder())).apply((sort, scanBuilder) -> scanBuilder.pushDownSort(sort));
 
   /** Push down optimize rule for limit operator. */
   public static final Rule<?> PUSH_DOWN_LIMIT =
-      match(
-          limit(
-              scanBuilder()))
-      .apply((limit, scanBuilder) -> scanBuilder.pushDownLimit(limit));
+      match(limit(scanBuilder())).apply((limit, scanBuilder) -> scanBuilder.pushDownLimit(limit));
 
   public static final Rule<?> PUSH_DOWN_PROJECT =
-      match(
-          project(
-              scanBuilder()))
-      .apply((project, scanBuilder) -> scanBuilder.pushDownProject(project));
+      match(project(scanBuilder()))
+          .apply((project, scanBuilder) -> scanBuilder.pushDownProject(project));
 
   public static final Rule<?> PUSH_DOWN_HIGHLIGHT =
-      match(
-          highlight(
-              scanBuilder()))
+      match(highlight(scanBuilder()))
           .apply((highlight, scanBuilder) -> scanBuilder.pushDownHighlight(highlight));
 
+  public static final Rule<?> PUSH_DOWN_NESTED =
+      match(nested(scanBuilder()))
+          .apply((nested, scanBuilder) -> scanBuilder.pushDownNested(nested));
 
   /** Pattern that matches a plan node. */
   private final WithPattern<T> pattern;
@@ -84,10 +74,9 @@ public class TableScanPushDown<T extends LogicalPlan> implements Rule<T> {
   /** Push down function applied to the plan node and captured table scan builder. */
   private final BiFunction<T, TableScanBuilder, Boolean> pushDownFunction;
 
-
   @SuppressWarnings("unchecked")
-  private TableScanPushDown(WithPattern<T> pattern,
-                           BiFunction<T, TableScanBuilder, Boolean> pushDownFunction) {
+  private TableScanPushDown(
+      WithPattern<T> pattern, BiFunction<T, TableScanBuilder, Boolean> pushDownFunction) {
     this.pattern = pattern;
     this.capture = ((CapturePattern<TableScanBuilder>) pattern.getPattern()).capture();
     this.pushDownFunction = pushDownFunction;
@@ -107,22 +96,18 @@ public LogicalPlan apply(T plan, Captures captures) {
     return plan;
   }
 
-  /**
-   * Custom builder class other than generated by Lombok to provide more readable code.
-   */
+  /** Custom builder class other than generated by Lombok to provide more readable code. */
   static class TableScanPushDownBuilder<T extends LogicalPlan> {
 
     private WithPattern<T> pattern;
 
-    public static <T extends LogicalPlan>
-        TableScanPushDownBuilder<T> match(Pattern<T> pattern) {
+    public static <T extends LogicalPlan> TableScanPushDownBuilder<T> match(Pattern<T> pattern) {
       TableScanPushDownBuilder<T> builder = new TableScanPushDownBuilder<>();
       builder.pattern = (WithPattern<T>) pattern;
       return builder;
     }
 
-    public TableScanPushDown<T> apply(
-        BiFunction<T, TableScanBuilder, Boolean> pushDownFunction) {
+    public TableScanPushDown<T> apply(BiFunction<T, TableScanBuilder, Boolean> pushDownFunction) {
       return new TableScanPushDown<>(pattern, pushDownFunction);
     }
   }
diff --git a/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/write/CreateTableWriteBuilder.java b/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/write/CreateTableWriteBuilder.java
new file mode 100644
index 0000000000..0a4045d404
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/optimizer/rule/write/CreateTableWriteBuilder.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.optimizer.rule.write;
+
+import static org.opensearch.sql.planner.optimizer.pattern.Patterns.writeTable;
+
+import com.facebook.presto.matching.Capture;
+import com.facebook.presto.matching.Captures;
+import com.facebook.presto.matching.Pattern;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+import org.opensearch.sql.planner.logical.LogicalPlan;
+import org.opensearch.sql.planner.logical.LogicalWrite;
+import org.opensearch.sql.planner.optimizer.Rule;
+import org.opensearch.sql.storage.Table;
+import org.opensearch.sql.storage.write.TableWriteBuilder;
+
+/**
+ * Rule that replaces logical write operator with {@link TableWriteBuilder} for later optimization
+ * and transforming to physical operator.
+ */
+public class CreateTableWriteBuilder implements Rule<LogicalWrite> {
+
+  /** Capture the table inside matched logical relation operator. */
+  private final Capture<Table> capture;
+
+  /** Pattern that matches logical relation operator. */
+  @Accessors(fluent = true)
+  @Getter
+  private final Pattern<LogicalWrite> pattern;
+
+  /** Construct create table write builder rule. */
+  public CreateTableWriteBuilder() {
+    this.capture = Capture.newCapture();
+    this.pattern = Pattern.typeOf(LogicalWrite.class).with(writeTable().capturedAs(capture));
+  }
+
+  @Override
+  public LogicalPlan apply(LogicalWrite plan, Captures captures) {
+    return captures.get(capture).createWriteBuilder(plan);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/AggregationOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/AggregationOperator.java
index 1d9523464b..cc1c047c31 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/AggregationOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/AggregationOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import java.util.Collections;
@@ -17,7 +16,6 @@
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.aggregation.Aggregator;
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
-import org.opensearch.sql.expression.span.SpanExpression;
 import org.opensearch.sql.planner.physical.collector.Collector;
 import org.opensearch.sql.storage.bindingtuple.BindingTuple;
 
@@ -28,30 +26,26 @@
 @EqualsAndHashCode(callSuper = false)
 @ToString
 public class AggregationOperator extends PhysicalPlan {
-  @Getter
-  private final PhysicalPlan input;
-  @Getter
-  private final List<NamedAggregator> aggregatorList;
-  @Getter
-  private final List<NamedExpression> groupByExprList;
+  @Getter private final PhysicalPlan input;
+  @Getter private final List<NamedAggregator> aggregatorList;
+  @Getter private final List<NamedExpression> groupByExprList;
 
-  /**
-   * {@link BindingTuple} Collector.
-   */
-  @EqualsAndHashCode.Exclude
-  private final Collector collector;
-  @EqualsAndHashCode.Exclude
-  private Iterator<ExprValue> iterator;
+  /** {@link BindingTuple} Collector. */
+  @EqualsAndHashCode.Exclude private final Collector collector;
+
+  @EqualsAndHashCode.Exclude private Iterator<ExprValue> iterator;
 
   /**
    * AggregationOperator Constructor.
    *
-   * @param input           Input {@link PhysicalPlan}
-   * @param aggregatorList  List of {@link Aggregator}
+   * @param input Input {@link PhysicalPlan}
+   * @param aggregatorList List of {@link Aggregator}
    * @param groupByExprList List of group by {@link Expression}
    */
-  public AggregationOperator(PhysicalPlan input, List<NamedAggregator> aggregatorList,
-                             List<NamedExpression> groupByExprList) {
+  public AggregationOperator(
+      PhysicalPlan input,
+      List<NamedAggregator> aggregatorList,
+      List<NamedExpression> groupByExprList) {
     this.input = input;
     this.aggregatorList = aggregatorList;
     this.groupByExprList = groupByExprList;
@@ -68,7 +62,6 @@ public List<PhysicalPlan> getChild() {
     return Collections.singletonList(input);
   }
 
-
   @Override
   public boolean hasNext() {
     return iterator.hasNext();
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/CursorCloseOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/CursorCloseOperator.java
new file mode 100644
index 0000000000..688ffa0d8d
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/CursorCloseOperator.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.physical;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.executor.ExecutionEngine;
+
+/**
+ * A plan node which blocks issuing a request in {@link #open} and getting results in {@link
+ * #hasNext}, but doesn't block releasing resources in {@link #close}. Designed to be on top of the
+ * deserialized tree.
+ */
+@RequiredArgsConstructor
+public class CursorCloseOperator extends PhysicalPlan {
+
+  // Entire deserialized from cursor plan tree
+  private final PhysicalPlan input;
+
+  @Override
+  public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
+    return visitor.visitCursorClose(this, context);
+  }
+
+  @Override
+  public boolean hasNext() {
+    return false;
+  }
+
+  @Override
+  public ExprValue next() {
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public List<PhysicalPlan> getChild() {
+    return List.of(input);
+  }
+
+  /** Provides an empty schema, because this plan node is always located on the top of the tree. */
+  @Override
+  public ExecutionEngine.Schema schema() {
+    return new ExecutionEngine.Schema(List.of());
+  }
+
+  @Override
+  public void open() {
+    // no-op, no search should be invoked.
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/DedupeOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/DedupeOperator.java
index 452fbd9707..7faec2154b 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/DedupeOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/DedupeOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import com.google.common.collect.ImmutableList;
@@ -28,21 +27,14 @@
 @Getter
 @EqualsAndHashCode(callSuper = false)
 public class DedupeOperator extends PhysicalPlan {
-  @Getter
-  private final PhysicalPlan input;
-  @Getter
-  private final List<Expression> dedupeList;
-  @Getter
-  private final Integer allowedDuplication;
-  @Getter
-  private final Boolean keepEmpty;
-  @Getter
-  private final Boolean consecutive;
-
-  @EqualsAndHashCode.Exclude
-  private final Deduper<List<ExprValue>> deduper;
-  @EqualsAndHashCode.Exclude
-  private ExprValue next;
+  @Getter private final PhysicalPlan input;
+  @Getter private final List<Expression> dedupeList;
+  @Getter private final Integer allowedDuplication;
+  @Getter private final Boolean keepEmpty;
+  @Getter private final Boolean consecutive;
+
+  @EqualsAndHashCode.Exclude private final Deduper<List<ExprValue>> deduper;
+  @EqualsAndHashCode.Exclude private ExprValue next;
 
   private static final Integer ALL_ONE_DUPLICATION = 1;
   private static final Boolean IGNORE_EMPTY = false;
@@ -57,6 +49,7 @@ public DedupeOperator(PhysicalPlan input, List<Expression> dedupeList) {
 
   /**
    * Dedup Constructor.
+   *
    * @param input input {@link PhysicalPlan}
    * @param dedupeList list of dedupe {@link Expression}
    * @param allowedDuplication max allowed duplication
@@ -140,9 +133,7 @@ static class Deduper<K> {
     private final BiFunction<Map<K, Integer>, K, Integer> seenFirstTime;
     private final Map<K, Integer> seenMap = new ConcurrentHashMap<>();
 
-    /**
-     * The Historical Deduper monitor the duplicated element with all the seen value.
-     */
+    /** The Historical Deduper monitor the duplicated element with all the seen value. */
     public static <K> Deduper<K> historicalDeduper() {
       return new Deduper<>(
           (map, key) -> {
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/EvalOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/EvalOperator.java
index 3b9e1a8214..ac62fe1b86 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/EvalOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/EvalOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
@@ -34,17 +33,15 @@
  * If the field name exist in the input, a new value will be put into to output.
  *
  * <p>The {@link EvalOperator#expressionList} are evaluated from left to right. It means you can
- * reference previous evaluated field.
- * e.g. fields velocity = distance/time, doubleVelocity = 2 * velocity
+ * reference previous evaluated field. e.g. fields velocity = distance/time, doubleVelocity = 2 *
+ * velocity
  */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
 public class EvalOperator extends PhysicalPlan {
-  @Getter
-  private final PhysicalPlan input;
-  @Getter
-  private final List<Pair<ReferenceExpression, Expression>> expressionList;
+  @Getter private final PhysicalPlan input;
+  @Getter private final List<Pair<ReferenceExpression, Expression>> expressionList;
 
   @Override
   public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
@@ -86,6 +83,7 @@ public ExprValue next() {
 
   /**
    * Evaluate the expression in the {@link EvalOperator#expressionList} with {@link Environment}.
+   *
    * @param env {@link Environment}
    * @return The mapping of reference and {@link ExprValue} for each expression.
    */
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/FilterOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/FilterOperator.java
index 86cd411a2d..ec61d53163 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/FilterOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/FilterOperator.java
@@ -17,18 +17,16 @@
 import org.opensearch.sql.storage.bindingtuple.BindingTuple;
 
 /**
- * The Filter operator use the conditions to evaluate the input {@link BindingTuple}.
- * The Filter operator only return the results that evaluated to true.
- * The NULL and MISSING are handled by the logic defined in {@link BinaryPredicateOperator}.
+ * The Filter operator represents WHERE clause and uses the conditions to evaluate the input {@link
+ * BindingTuple}. The Filter operator only returns the results that evaluated to true. The NULL and
+ * MISSING are handled by the logic defined in {@link BinaryPredicateOperator}.
  */
 @EqualsAndHashCode(callSuper = false)
 @ToString
 @RequiredArgsConstructor
 public class FilterOperator extends PhysicalPlan {
-  @Getter
-  private final PhysicalPlan input;
-  @Getter
-  private final Expression conditions;
+  @Getter private final PhysicalPlan input;
+  @Getter private final Expression conditions;
   @ToString.Exclude private ExprValue next = null;
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/LimitOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/LimitOperator.java
index cd84234c4b..dc9038f2a3 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/LimitOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/LimitOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import com.google.common.collect.ImmutableList;
@@ -15,15 +14,15 @@
 import org.opensearch.sql.data.model.ExprValue;
 
 /**
- * The limit operator sets a window, to and block the rows out of the window
- * and allow only the result subset within this window to the output.
+ * The limit operator sets a window, to and block the rows out of the window and allow only the
+ * result subset within this window to the output.
  *
- * <p>The result subset is enframed from original result with {@link LimitOperator#offset}
- * as the offset and {@link LimitOperator#limit} as the size, thus the output
- * is the subset of the original result set that has indices from {index + 1} to {index + limit}.
- * Special cases might occur where the result subset has a size smaller than expected {limit},
- * it occurs when the original result set has a size smaller than {index + limit},
- * or even not greater than the offset. The latter results in an empty output.</p>
+ * <p>The result subset is enframed from original result with {@link LimitOperator#offset} as the
+ * offset and {@link LimitOperator#limit} as the size, thus the output is the subset of the original
+ * result set that has indices from {index + 1} to {index + limit}. Special cases might occur where
+ * the result subset has a size smaller than expected {limit}, it occurs when the original result
+ * set has a size smaller than {index + limit}, or even not greater than the offset. The latter
+ * results in an empty output.
  */
 @RequiredArgsConstructor
 @Getter
@@ -66,5 +65,4 @@ public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
   public List<PhysicalPlan> getChild() {
     return ImmutableList.of(input);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/NestedOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/NestedOperator.java
new file mode 100644
index 0000000000..8539df5463
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/NestedOperator.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.physical;
+
+import static java.util.stream.Collectors.mapping;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+import org.opensearch.sql.data.model.ExprCollectionValue;
+import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprTupleValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.ReferenceExpression;
+
+/**
+ * The NestedOperator evaluates the {@link NestedOperator#fields} and generates {@link
+ * NestedOperator#nonNestedFields} to form the {@link NestedOperator#result} output. Resolve two
+ * nested fields with differing paths will result in a cartesian product(inner join).
+ */
+@EqualsAndHashCode(callSuper = false)
+public class NestedOperator extends PhysicalPlan {
+  @Getter private final PhysicalPlan input;
+  @Getter private final Set<String> fields; // Needs to be a Set to match legacy implementation
+  @Getter private final Map<String, List<String>> groupedPathsAndFields;
+  @EqualsAndHashCode.Exclude private List<Map<String, ExprValue>> result = new ArrayList<>();
+  @EqualsAndHashCode.Exclude private List<String> nonNestedFields = new ArrayList<>();
+
+  @EqualsAndHashCode.Exclude
+  private ListIterator<Map<String, ExprValue>> flattenedResult = result.listIterator();
+
+  /**
+   * Constructor for NestedOperator with list of map as arg.
+   *
+   * @param input : PhysicalPlan input.
+   * @param fields : List of all fields and paths for nested fields.
+   */
+  public NestedOperator(PhysicalPlan input, List<Map<String, ReferenceExpression>> fields) {
+    this.input = input;
+    this.fields = fields.stream().map(m -> m.get("field").toString()).collect(Collectors.toSet());
+    this.groupedPathsAndFields =
+        fields.stream()
+            .collect(
+                Collectors.groupingBy(
+                    m -> m.get("path").toString(),
+                    mapping(m -> m.get("field").toString(), toList())));
+  }
+
+  /**
+   * Constructor for NestedOperator with Set of fields.
+   *
+   * @param input : PhysicalPlan input.
+   * @param fields : List of all fields for nested fields.
+   * @param groupedPathsAndFields : Map of fields grouped by their path.
+   */
+  public NestedOperator(
+      PhysicalPlan input, Set<String> fields, Map<String, List<String>> groupedPathsAndFields) {
+    this.input = input;
+    this.fields = fields;
+    this.groupedPathsAndFields = groupedPathsAndFields;
+  }
+
+  @Override
+  public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
+    return visitor.visitNested(this, context);
+  }
+
+  @Override
+  public List<PhysicalPlan> getChild() {
+    return Collections.singletonList(input);
+  }
+
+  @Override
+  public boolean hasNext() {
+    return input.hasNext() || flattenedResult.hasNext();
+  }
+
+  @Override
+  public ExprValue next() {
+    if (!flattenedResult.hasNext()) {
+      result.clear();
+      nonNestedFields.clear();
+
+      ExprValue inputValue = input.next();
+      generateNonNestedFieldsMap(inputValue);
+      // Add all nested fields to result map
+      for (String field : fields) {
+        result = flatten(field, inputValue, result);
+      }
+
+      // Add all non-nested fields to result map
+      for (String nonNestedField : nonNestedFields) {
+        result = flatten(nonNestedField, inputValue, result);
+      }
+
+      if (result.isEmpty()) {
+        flattenedResult = result.listIterator();
+        return new ExprTupleValue(new LinkedHashMap<>());
+      }
+
+      flattenedResult = result.listIterator();
+    }
+    return new ExprTupleValue(new LinkedHashMap<>(flattenedResult.next()));
+  }
+
+  /**
+   * Generate list of non-nested fields that are in inputMap, but not in the member variable fields
+   * list.
+   *
+   * @param inputMap : Row to parse non-nested fields.
+   */
+  public void generateNonNestedFieldsMap(ExprValue inputMap) {
+    for (Map.Entry<String, ExprValue> inputField : inputMap.tupleValue().entrySet()) {
+      boolean foundNestedField =
+          this.fields.stream()
+              .anyMatch(field -> field.split("\\.")[0].equalsIgnoreCase(inputField.getKey()));
+
+      if (!foundNestedField) {
+        this.nonNestedFields.add(inputField.getKey());
+      }
+    }
+  }
+
+  /**
+   * Simplifies the structure of row's source Map by flattening it, making the full path of an
+   * object the key and the Object it refers to the value.
+   *
+   * <pre>
+   * <p>Sample input:
+   * keys = ['comments.likes']
+   * row = comments: {
+   * likes: 2
+   * }
+   *
+   * <p>Return:
+   * flattenedRow = {comment.likes: 2}
+   * </pre>
+   *
+   * @param nestedField : Field to query in row.
+   * @param row : Row returned from OS.
+   * @param prevList : List of previous nested calls.
+   * @return : List of nested select items or cartesian product of nested calls.
+   */
+  private List<Map<String, ExprValue>> flatten(
+      String nestedField, ExprValue row, List<Map<String, ExprValue>> prevList) {
+    List<Map<String, ExprValue>> copy = new ArrayList<>();
+    List<Map<String, ExprValue>> newList = new ArrayList<>();
+
+    ExprValue nestedObj = null;
+    getNested(nestedField, nestedField, row, copy, nestedObj);
+
+    // Only one field in select statement
+    if (prevList.size() == 0) {
+      return copy;
+    }
+
+    if (containSamePath(copy.get(0))) {
+      var resultIt = this.result.iterator();
+      Map<String, ExprValue> resultVal = resultIt.next();
+      var copyIt = copy.iterator();
+      Map<String, ExprValue> copyVal = copyIt.next();
+      for (int i = 0; i < this.result.size(); i++) {
+        resultVal.putAll(copyVal);
+        if (copyIt.hasNext()) {
+          copyVal = copyIt.next();
+        }
+        if (resultIt.hasNext()) {
+          resultVal = resultIt.next();
+        }
+      }
+      return this.result;
+    } else {
+      // Generate cartesian product
+      for (Map<String, ExprValue> prevMap : prevList) {
+        for (Map<String, ExprValue> newMap : copy) {
+          newList.add(
+              Stream.of(newMap, prevMap)
+                  .flatMap(map -> map.entrySet().stream())
+                  .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
+        }
+      }
+      return newList;
+    }
+  }
+
+  /**
+   * Check if newMap field has any sharing paths in prevMap.
+   *
+   * @param newMap : New map to add to result set.
+   * @return : true if there is already a field added to result set with same path.
+   */
+  boolean containSamePath(Map<String, ExprValue> newMap) {
+    String newKey = newMap.keySet().iterator().next();
+    Map<String, ExprValue> resultMap = this.result.iterator().next();
+    for (var entry : this.groupedPathsAndFields.entrySet()) {
+      if (entry.getValue().contains(newKey)) {
+        for (var map : resultMap.entrySet()) {
+          if (entry.getValue().contains(map.getKey())) {
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Retrieve nested field(s) in row.
+   *
+   * @param field : Path for nested field.
+   * @param nestedField : Current level to nested field path.
+   * @param row : Row to resolve nested field.
+   * @param ret : List to add nested field to.
+   * @param nestedObj : Object at current nested level.
+   * @return : Object at current nested level.
+   */
+  private void getNested(
+      String field,
+      String nestedField,
+      ExprValue row,
+      List<Map<String, ExprValue>> ret,
+      ExprValue nestedObj) {
+    ExprValue currentObj = (nestedObj == null) ? row : nestedObj;
+    String[] splitKeys = nestedField.split("\\.");
+
+    if (currentObj instanceof ExprTupleValue) {
+      ExprTupleValue currentMap = (ExprTupleValue) currentObj;
+      if (currentMap.tupleValue().containsKey(splitKeys[0])) {
+        currentObj = currentMap.tupleValue().get(splitKeys[0]);
+      } else {
+        currentObj = null;
+        ret.add(new LinkedHashMap<>(Map.of(field, ExprNullValue.of())));
+      }
+    } else if (currentObj instanceof ExprCollectionValue) {
+      ExprValue arrayObj = currentObj;
+      for (int x = 0; x < arrayObj.collectionValue().size(); x++) {
+        currentObj = arrayObj.collectionValue().get(x);
+        getNested(field, nestedField, row, ret, currentObj);
+        currentObj = null;
+      }
+    } else {
+      currentObj = null;
+    }
+
+    // Return final nested result
+    if (currentObj != null
+        && (StringUtils.substringAfterLast(field, ".").equals(nestedField)
+            || !field.contains("."))) {
+      ret.add(new LinkedHashMap<>(Map.of(field, currentObj)));
+    } else if (currentObj != null) {
+      getNested(field, nestedField.substring(nestedField.indexOf(".") + 1), row, ret, currentObj);
+    }
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlan.java b/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlan.java
index b476b01557..0ae795aa31 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlan.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlan.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import java.util.Iterator;
@@ -12,19 +11,16 @@
 import org.opensearch.sql.planner.PlanNode;
 import org.opensearch.sql.storage.split.Split;
 
-/**
- * Physical plan.
- */
-public abstract class PhysicalPlan implements PlanNode<PhysicalPlan>,
-    Iterator<ExprValue>,
-    AutoCloseable {
+/** Physical plan. */
+public abstract class PhysicalPlan
+    implements PlanNode<PhysicalPlan>, Iterator<ExprValue>, AutoCloseable {
   /**
    * Accept the {@link PhysicalPlanNodeVisitor}.
    *
    * @param visitor visitor.
    * @param context visitor context.
-   * @param <R>     returned object type.
-   * @param <C>     context type.
+   * @param <R> returned object type.
+   * @param <C> context type.
    * @return returned object.
    */
   public abstract <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context);
@@ -42,7 +38,9 @@ public void add(Split split) {
   }
 
   public ExecutionEngine.Schema schema() {
-    throw new IllegalStateException(String.format("[BUG] schema can been only applied to "
-        + "ProjectOperator, instead of %s", toString()));
+    throw new IllegalStateException(
+        String.format(
+            "[BUG] schema can been only applied to " + "ProjectOperator, instead of %s",
+            this.getClass().getSimpleName()));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlanDSL.java b/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlanDSL.java
index e6e59990c8..0c2764112d 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlanDSL.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlanDSL.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import com.google.common.collect.ImmutableList;
@@ -11,6 +10,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import lombok.experimental.UtilityClass;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.ast.tree.RareTopN.CommandType;
@@ -22,9 +22,7 @@
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
 import org.opensearch.sql.expression.window.WindowDefinition;
 
-/**
- * Physical Plan DSL.
- */
+/** Physical Plan DSL. */
 @UtilityClass
 public class PhysicalPlanDSL {
 
@@ -46,8 +44,10 @@ public static ProjectOperator project(PhysicalPlan input, NamedExpression... fie
     return new ProjectOperator(input, Arrays.asList(fields), ImmutableList.of());
   }
 
-  public static ProjectOperator project(PhysicalPlan input, List<NamedExpression> fields,
-                                        List<NamedExpression> namedParseExpressions) {
+  public static ProjectOperator project(
+      PhysicalPlan input,
+      List<NamedExpression> fields,
+      List<NamedExpression> namedParseExpressions) {
     return new ProjectOperator(input, fields, namedParseExpressions);
   }
 
@@ -60,11 +60,15 @@ public static EvalOperator eval(
     return new EvalOperator(input, Arrays.asList(expressions));
   }
 
-  public static SortOperator sort(PhysicalPlan input, Pair<SortOption,
-      Expression>... sorts) {
+  public static SortOperator sort(PhysicalPlan input, Pair<SortOption, Expression>... sorts) {
     return new SortOperator(input, Arrays.asList(sorts));
   }
 
+  public static TakeOrderedOperator takeOrdered(
+      PhysicalPlan input, Integer limit, Integer offset, Pair<SortOption, Expression>... sorts) {
+    return new TakeOrderedOperator(input, limit, offset, Arrays.asList(sorts));
+  }
+
   public static DedupeOperator dedupe(PhysicalPlan input, Expression... expressions) {
     return new DedupeOperator(input, Arrays.asList(expressions));
   }
@@ -79,22 +83,27 @@ public static DedupeOperator dedupe(
         input, Arrays.asList(expressions), allowedDuplication, keepEmpty, consecutive);
   }
 
-  public WindowOperator window(PhysicalPlan input,
-                               NamedExpression windowFunction,
-                               WindowDefinition windowDefinition) {
+  public WindowOperator window(
+      PhysicalPlan input, NamedExpression windowFunction, WindowDefinition windowDefinition) {
     return new WindowOperator(input, windowFunction, windowDefinition);
   }
 
-  public static RareTopNOperator rareTopN(PhysicalPlan input, CommandType commandType,
-                                          List<Expression> groups, Expression... expressions) {
+  public static RareTopNOperator rareTopN(
+      PhysicalPlan input,
+      CommandType commandType,
+      List<Expression> groups,
+      Expression... expressions) {
     return new RareTopNOperator(input, commandType, Arrays.asList(expressions), groups);
   }
 
-  public static RareTopNOperator rareTopN(PhysicalPlan input, CommandType commandType,
-                                          int noOfResults,
-                                          List<Expression> groups, Expression... expressions) {
-    return new RareTopNOperator(input, commandType, noOfResults, Arrays.asList(expressions),
-        groups);
+  public static RareTopNOperator rareTopN(
+      PhysicalPlan input,
+      CommandType commandType,
+      int noOfResults,
+      List<Expression> groups,
+      Expression... expressions) {
+    return new RareTopNOperator(
+        input, commandType, noOfResults, Arrays.asList(expressions), groups);
   }
 
   @SafeVarargs
@@ -105,4 +114,9 @@ public ValuesOperator values(List<LiteralExpression>... values) {
   public static LimitOperator limit(PhysicalPlan input, Integer limit, Integer offset) {
     return new LimitOperator(input, limit, offset);
   }
+
+  public static NestedOperator nested(
+      PhysicalPlan input, Set<String> args, Map<String, List<String>> groupedFieldsByPath) {
+    return new NestedOperator(input, args, groupedFieldsByPath);
+  }
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitor.java b/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitor.java
index 63dd05cc6b..67d7a05135 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitor.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitor.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import org.opensearch.sql.storage.TableScanOperator;
+import org.opensearch.sql.storage.write.TableWriteOperator;
 
 /**
  * The visitor of {@link PhysicalPlan}.
@@ -36,6 +36,10 @@ public R visitTableScan(TableScanOperator node, C context) {
     return visitNode(node, context);
   }
 
+  public R visitTableWrite(TableWriteOperator node, C context) {
+    return visitNode(node, context);
+  }
+
   public R visitProject(ProjectOperator node, C context) {
     return visitNode(node, context);
   }
@@ -52,6 +56,10 @@ public R visitEval(EvalOperator node, C context) {
     return visitNode(node, context);
   }
 
+  public R visitNested(NestedOperator node, C context) {
+    return visitNode(node, context);
+  }
+
   public R visitDedupe(DedupeOperator node, C context) {
     return visitNode(node, context);
   }
@@ -63,7 +71,11 @@ public R visitValues(ValuesOperator node, C context) {
   public R visitSort(SortOperator node, C context) {
     return visitNode(node, context);
   }
-  
+
+  public R visitTakeOrdered(TakeOrderedOperator node, C context) {
+    return visitNode(node, context);
+  }
+
   public R visitRareTopN(RareTopNOperator node, C context) {
     return visitNode(node, context);
   }
@@ -83,4 +95,8 @@ public R visitAD(PhysicalPlan node, C context) {
   public R visitML(PhysicalPlan node, C context) {
     return visitNode(node, context);
   }
+
+  public R visitCursorClose(CursorCloseOperator node, C context) {
+    return visitNode(node, context);
+  }
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/ProjectOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/ProjectOperator.java
index 496e4e6ddb..55422dacd3 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/ProjectOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/ProjectOperator.java
@@ -3,18 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
@@ -22,20 +24,16 @@
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.parse.ParseExpression;
+import org.opensearch.sql.planner.SerializablePlan;
 
-/**
- * Project the fields specified in {@link ProjectOperator#projectList} from input.
- */
+/** Project the fields specified in {@link ProjectOperator#projectList} from input. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
-@RequiredArgsConstructor
-public class ProjectOperator extends PhysicalPlan {
-  @Getter
-  private final PhysicalPlan input;
-  @Getter
-  private final List<NamedExpression> projectList;
-  @Getter
-  private final List<NamedExpression> namedParseExpressions;
+@AllArgsConstructor
+public class ProjectOperator extends PhysicalPlan implements SerializablePlan {
+  @Getter private PhysicalPlan input;
+  @Getter private List<NamedExpression> projectList;
+  @Getter private List<NamedExpression> namedParseExpressions;
 
   @Override
   public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
@@ -61,17 +59,20 @@ public ExprValue next() {
     // TODO needs a better implementation, see https://github.com/opensearch-project/sql/issues/458
     for (NamedExpression expr : projectList) {
       ExprValue exprValue = expr.valueOf(inputValue.bindingTuples());
-      Optional<NamedExpression> optionalParseExpression = namedParseExpressions.stream()
-          .filter(parseExpr -> parseExpr.getNameOrAlias().equals(expr.getNameOrAlias()))
-          .findFirst();
+      Optional<NamedExpression> optionalParseExpression =
+          namedParseExpressions.stream()
+              .filter(parseExpr -> parseExpr.getNameOrAlias().equals(expr.getNameOrAlias()))
+              .findFirst();
       if (optionalParseExpression.isEmpty()) {
         mapBuilder.put(expr.getNameOrAlias(), exprValue);
         continue;
       }
 
       NamedExpression parseExpression = optionalParseExpression.get();
-      ExprValue sourceFieldValue = inputValue.bindingTuples()
-          .resolve(((ParseExpression) parseExpression.getDelegated()).getSourceField());
+      ExprValue sourceFieldValue =
+          inputValue
+              .bindingTuples()
+              .resolve(((ParseExpression) parseExpression.getDelegated()).getSourceField());
       if (sourceFieldValue.isMissing()) {
         // source field will be missing after stats command, read from inputValue if it exists
         // otherwise do nothing since it should not appear as a field
@@ -90,8 +91,30 @@ public ExprValue next() {
 
   @Override
   public ExecutionEngine.Schema schema() {
-    return new ExecutionEngine.Schema(getProjectList().stream()
-        .map(expr -> new ExecutionEngine.Schema.Column(expr.getName(),
-            expr.getAlias(), expr.type())).collect(Collectors.toList()));
+    return new ExecutionEngine.Schema(
+        getProjectList().stream()
+            .map(
+                expr ->
+                    new ExecutionEngine.Schema.Column(expr.getName(), expr.getAlias(), expr.type()))
+            .collect(Collectors.toList()));
+  }
+
+  /** Don't use, it is for deserialization needs only. */
+  @Deprecated
+  public ProjectOperator() {}
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    projectList = (List<NamedExpression>) in.readObject();
+    // note: namedParseExpressions aren't serialized and deserialized
+    namedParseExpressions = List.of();
+    input = (PhysicalPlan) in.readObject();
+  }
+
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    out.writeObject(projectList);
+    out.writeObject(((SerializablePlan) input).getPlanForSerialization());
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/RareTopNOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/RareTopNOperator.java
index fb3a91e2e6..ecf997f7ae 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/RareTopNOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/RareTopNOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -36,40 +35,38 @@
 @EqualsAndHashCode(callSuper = false)
 public class RareTopNOperator extends PhysicalPlan {
 
-  @Getter
-  private final PhysicalPlan input;
-  @Getter
-  private final CommandType commandType;
-  @Getter
-  private final Integer noOfResults;
-  @Getter
-  private final List<Expression> fieldExprList;
-  @Getter
-  private final List<Expression> groupByExprList;
-
-  @EqualsAndHashCode.Exclude
-  private final Group group;
-  @EqualsAndHashCode.Exclude
-  private Iterator<ExprValue> iterator;
+  @Getter private final PhysicalPlan input;
+  @Getter private final CommandType commandType;
+  @Getter private final Integer noOfResults;
+  @Getter private final List<Expression> fieldExprList;
+  @Getter private final List<Expression> groupByExprList;
 
-  private static final Integer DEFAULT_NO_OF_RESULTS = 10;
+  @EqualsAndHashCode.Exclude private final Group group;
+  @EqualsAndHashCode.Exclude private Iterator<ExprValue> iterator;
 
+  private static final Integer DEFAULT_NO_OF_RESULTS = 10;
 
-  public RareTopNOperator(PhysicalPlan input, CommandType commandType,
-      List<Expression> fieldExprList, List<Expression> groupByExprList) {
+  public RareTopNOperator(
+      PhysicalPlan input,
+      CommandType commandType,
+      List<Expression> fieldExprList,
+      List<Expression> groupByExprList) {
     this(input, commandType, DEFAULT_NO_OF_RESULTS, fieldExprList, groupByExprList);
   }
 
   /**
    * RareTopNOperator Constructor.
    *
-   * @param input           Input {@link PhysicalPlan}
-   * @param commandType     Enum for Rare/TopN command.
-   * @param noOfResults     Number of results
-   * @param fieldExprList   List of {@link Expression}
+   * @param input Input {@link PhysicalPlan}
+   * @param commandType Enum for Rare/TopN command.
+   * @param noOfResults Number of results
+   * @param fieldExprList List of {@link Expression}
    * @param groupByExprList List of group by {@link Expression}
    */
-  public RareTopNOperator(PhysicalPlan input, CommandType commandType, int noOfResults,
+  public RareTopNOperator(
+      PhysicalPlan input,
+      CommandType commandType,
+      int noOfResults,
       List<Expression> fieldExprList,
       List<Expression> groupByExprList) {
     this.input = input;
@@ -115,48 +112,50 @@ public class Group {
 
     private final Map<Key, Map<Key, Integer>> groupListMap = new HashMap<>();
 
-    /**
-     * Push the BindingTuple to Group.
-     */
+    /** Push the BindingTuple to Group. */
     public void push(ExprValue inputValue) {
       Key groupKey = new Key(inputValue, groupByExprList);
       Key fieldKey = new Key(inputValue, fieldExprList);
-      groupListMap.computeIfAbsent(groupKey, k -> {
-        Map<Key, Integer> map = new HashMap<>();
-        map.put(fieldKey, 1);
-        return map;
-      });
-      groupListMap.computeIfPresent(groupKey, (key, map) -> {
-        map.computeIfAbsent(fieldKey, f -> 1);
-        map.computeIfPresent(fieldKey, (field, count) -> {
-          return count + 1;
-        });
-        return map;
-      });
+      groupListMap.computeIfAbsent(
+          groupKey,
+          k -> {
+            Map<Key, Integer> map = new HashMap<>();
+            map.put(fieldKey, 1);
+            return map;
+          });
+      groupListMap.computeIfPresent(
+          groupKey,
+          (key, map) -> {
+            map.computeIfAbsent(fieldKey, f -> 1);
+            map.computeIfPresent(
+                fieldKey,
+                (field, count) -> {
+                  return count + 1;
+                });
+            return map;
+          });
     }
 
-    /**
-     * Get the list of {@link BindingTuple} for each group.
-     */
+    /** Get the list of {@link BindingTuple} for each group. */
     public List<ExprValue> result() {
       ImmutableList.Builder<ExprValue> resultBuilder = new ImmutableList.Builder<>();
 
-      groupListMap.forEach((groups, fieldMap) -> {
-        Map<String, ExprValue> map = new LinkedHashMap<>();
-        List<Key> result = find(fieldMap);
-        result.forEach(field -> {
-          map.putAll(groups.keyMap(groupByExprList));
-          map.putAll(field.keyMap(fieldExprList));
-          resultBuilder.add(ExprTupleValue.fromExprValueMap(map));
-        });
-      });
+      groupListMap.forEach(
+          (groups, fieldMap) -> {
+            Map<String, ExprValue> map = new LinkedHashMap<>();
+            List<Key> result = find(fieldMap);
+            result.forEach(
+                field -> {
+                  map.putAll(groups.keyMap(groupByExprList));
+                  map.putAll(field.keyMap(fieldExprList));
+                  resultBuilder.add(ExprTupleValue.fromExprValueMap(map));
+                });
+          });
 
       return resultBuilder.build();
     }
 
-    /**
-     * Get a list of result.
-     */
+    /** Get a list of result. */
     public List<Key> find(Map<Key, Integer> map) {
       Comparator<Map.Entry<Key, Integer>> valueComparator;
       if (CommandType.TOP.equals(commandType)) {
@@ -165,40 +164,37 @@ public List<Key> find(Map<Key, Integer> map) {
         valueComparator = Map.Entry.comparingByValue();
       }
 
-      return map.entrySet().stream().sorted(valueComparator).limit(noOfResults)
-          .map(Map.Entry::getKey).collect(Collectors.toList());
+      return map.entrySet().stream()
+          .sorted(valueComparator)
+          .limit(noOfResults)
+          .map(Map.Entry::getKey)
+          .collect(Collectors.toList());
     }
   }
 
-  /**
-   * Key.
-   */
+  /** Key. */
   @EqualsAndHashCode
   @VisibleForTesting
   public class Key {
 
     private final List<ExprValue> valueList;
 
-    /**
-     * Key constructor.
-     */
+    /** Key constructor. */
     public Key(ExprValue value, List<Expression> exprList) {
-      this.valueList = exprList.stream()
-          .map(expr -> expr.valueOf(value.bindingTuples())).collect(Collectors.toList());
+      this.valueList =
+          exprList.stream()
+              .map(expr -> expr.valueOf(value.bindingTuples()))
+              .collect(Collectors.toList());
     }
 
-    /**
-     * Return the Map of key and key value.
-     */
+    /** Return the Map of key and key value. */
     public Map<String, ExprValue> keyMap(List<Expression> exprList) {
 
       return Streams.zip(
-          exprList.stream().map(
-              expression -> expression.toString()),
-          valueList.stream(),
-          AbstractMap.SimpleEntry::new
-      ).collect(Collectors.toMap(key -> key.getKey(), key -> key.getValue()));
+              exprList.stream().map(expression -> expression.toString()),
+              valueList.stream(),
+              AbstractMap.SimpleEntry::new)
+          .collect(Collectors.toMap(key -> key.getKey(), key -> key.getValue()));
     }
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/RemoveOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/RemoveOperator.java
index 3fa3519d10..b4a724aa7a 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/RemoveOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/RemoveOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
@@ -24,26 +23,19 @@
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.expression.ReferenceExpression;
 
-/**
- * Remove the fields specified in {@link RemoveOperator#removeList} from input.
- */
+/** Remove the fields specified in {@link RemoveOperator#removeList} from input. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 public class RemoveOperator extends PhysicalPlan {
-  @Getter
-  private final PhysicalPlan input;
-  @Getter
-  private final Set<ReferenceExpression> removeList;
-  @ToString.Exclude
-  @EqualsAndHashCode.Exclude
-  private final Set<String> nameRemoveList;
+  @Getter private final PhysicalPlan input;
+  @Getter private final Set<ReferenceExpression> removeList;
+  @ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;
 
   /**
    * Todo. This is the temporary solution that add the mapping between string and ref. because when
    * rename the field from input, there we can only get the string field.
    */
-  public RemoveOperator(PhysicalPlan input,
-                        Set<ReferenceExpression> removeList) {
+  public RemoveOperator(PhysicalPlan input, Set<ReferenceExpression> removeList) {
     this.input = input;
     this.removeList = removeList;
     this.nameRemoveList =
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/RenameOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/RenameOperator.java
index f0b0d13c50..e6f97dab4a 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/RenameOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/RenameOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
@@ -24,35 +23,30 @@
 import org.opensearch.sql.storage.bindingtuple.BindingTuple;
 
 /**
- * Rename the binding name in {@link BindingTuple}.
- * The mapping maintain the relation between source and target.
- * it means BindingTuple.resolve(target) = BindingTuple.resolve(source).
+ * Rename the binding name in {@link BindingTuple}. The mapping maintain the relation between source
+ * and target. it means BindingTuple.resolve(target) = BindingTuple.resolve(source).
  */
 @EqualsAndHashCode(callSuper = false)
 @ToString
 public class RenameOperator extends PhysicalPlan {
-  @Getter
-  private final PhysicalPlan input;
-  @Getter
-  private final Map<ReferenceExpression, ReferenceExpression> mapping;
+  @Getter private final PhysicalPlan input;
+  @Getter private final Map<ReferenceExpression, ReferenceExpression> mapping;
+
   /**
    * Todo. This is the temporary solution that add the mapping between string and ref. because when
    * rename the field from input, there we can only get the string field.
    */
-  @ToString.Exclude
-  @EqualsAndHashCode.Exclude
+  @ToString.Exclude @EqualsAndHashCode.Exclude
   private final Map<String, ReferenceExpression> nameMapping;
 
-  /**
-   * Constructor of RenameOperator.
-   */
-  public RenameOperator(PhysicalPlan input,
-                        Map<ReferenceExpression, ReferenceExpression> mapping) {
+  /** Constructor of RenameOperator. */
+  public RenameOperator(PhysicalPlan input, Map<ReferenceExpression, ReferenceExpression> mapping) {
     this.input = input;
     this.mapping = mapping;
     this.nameMapping =
-        mapping.entrySet().stream().collect(Collectors.toMap(entry -> entry.getKey().getAttr(),
-            entry -> entry.getValue()));
+        mapping.entrySet().stream()
+            .collect(
+                Collectors.toMap(entry -> entry.getKey().getAttr(), entry -> entry.getValue()));
   }
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/SortHelper.java b/core/src/main/java/org/opensearch/sql/planner/physical/SortHelper.java
new file mode 100644
index 0000000000..ea117ee6df
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/SortHelper.java
@@ -0,0 +1,70 @@
+package org.opensearch.sql.planner.physical;
+
+import static org.opensearch.sql.ast.tree.Sort.NullOrder.NULL_FIRST;
+import static org.opensearch.sql.ast.tree.Sort.SortOrder.ASC;
+
+import com.google.common.collect.Ordering;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import org.apache.commons.lang3.tuple.Pair;
+import org.opensearch.sql.ast.tree.Sort.SortOption;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.utils.ExprValueOrdering;
+import org.opensearch.sql.expression.Expression;
+
+public interface SortHelper {
+
+  /**
+   * Construct an expr comparator for sorting on ExprValue.
+   *
+   * @param sortList list of sort fields and their related sort options.
+   * @return A comparator for ExprValue
+   */
+  static Comparator<ExprValue> constructExprComparator(
+      List<Pair<SortOption, Expression>> sortList) {
+    return (o1, o2) -> compareWithExpressions(o1, o2, constructComparator(sortList));
+  }
+
+  /**
+   * Construct an expr ordering for efficiently taking the top-k elements on ExprValue.
+   *
+   * @param sortList list of sort fields and their related sort options.
+   * @return An guava ordering for ExprValue
+   */
+  static Ordering<ExprValue> constructExprOrdering(List<Pair<SortOption, Expression>> sortList) {
+    return Ordering.from(constructExprComparator(sortList));
+  }
+
+  private static List<Pair<Expression, Comparator<ExprValue>>> constructComparator(
+      List<Pair<SortOption, Expression>> sortList) {
+    List<Pair<Expression, Comparator<ExprValue>>> comparators = new ArrayList<>();
+    for (Pair<SortOption, Expression> pair : sortList) {
+      SortOption option = pair.getLeft();
+      ExprValueOrdering ordering =
+          ASC.equals(option.getSortOrder())
+              ? ExprValueOrdering.natural()
+              : ExprValueOrdering.natural().reverse();
+      ordering =
+          NULL_FIRST.equals(option.getNullOrder()) ? ordering.nullsFirst() : ordering.nullsLast();
+      comparators.add(Pair.of(pair.getRight(), ordering));
+    }
+    return comparators;
+  }
+
+  private static int compareWithExpressions(
+      ExprValue o1, ExprValue o2, List<Pair<Expression, Comparator<ExprValue>>> comparators) {
+    for (Pair<Expression, Comparator<ExprValue>> comparator : comparators) {
+      Expression expression = comparator.getKey();
+      int result =
+          comparator
+              .getValue()
+              .compare(
+                  expression.valueOf(o1.bindingTuples()), expression.valueOf(o2.bindingTuples()));
+      if (result != 0) {
+        return result;
+      }
+    }
+    return 0;
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/SortOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/SortOperator.java
index 4463892ca5..b635f01d18 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/SortOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/SortOperator.java
@@ -3,69 +3,46 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
-import static org.opensearch.sql.ast.tree.Sort.NullOrder.NULL_FIRST;
-import static org.opensearch.sql.ast.tree.Sort.SortOrder.ASC;
-
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.PriorityQueue;
-import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.Singular;
 import lombok.ToString;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.ast.tree.Sort.SortOption;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.utils.ExprValueOrdering;
 import org.opensearch.sql.expression.Expression;
-import org.opensearch.sql.planner.physical.SortOperator.Sorter.SorterBuilder;
 
 /**
  * Sort Operator.The input data is sorted by the sort fields in the {@link SortOperator#sortList}.
- * The sort field is specified by the {@link Expression} with {@link SortOption}.
- * The count indicate how many sorted result should been return.
+ * The sort field is specified by the {@link Expression} with {@link SortOption}. The count indicate
+ * how many sorted result should been return.
  */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 public class SortOperator extends PhysicalPlan {
-  @Getter
-  private final PhysicalPlan input;
+  @Getter private final PhysicalPlan input;
 
-  @Getter
-  private final List<Pair<SortOption, Expression>> sortList;
-  @EqualsAndHashCode.Exclude
-  private final Sorter sorter;
-  @EqualsAndHashCode.Exclude
-  private Iterator<ExprValue> iterator;
+  @Getter private final List<Pair<SortOption, Expression>> sortList;
+  @EqualsAndHashCode.Exclude private final Comparator<ExprValue> sorter;
+  @EqualsAndHashCode.Exclude private Iterator<ExprValue> iterator;
 
   /**
    * Sort Operator Constructor.
+   *
    * @param input input {@link PhysicalPlan}
-   * @param sortList list of sort sort field.
-   *                 The sort field is specified by the {@link Expression} with {@link SortOption}
+   * @param sortList list of sort sort field. The sort field is specified by the {@link Expression}
+   *     with {@link SortOption}
    */
-  public SortOperator(
-      PhysicalPlan input, List<Pair<SortOption, Expression>> sortList) {
+  public SortOperator(PhysicalPlan input, List<Pair<SortOption, Expression>> sortList) {
     this.input = input;
     this.sortList = sortList;
-    SorterBuilder sorterBuilder = Sorter.builder();
-    for (Pair<SortOption, Expression> pair : sortList) {
-      SortOption option = pair.getLeft();
-      ExprValueOrdering ordering =
-          ASC.equals(option.getSortOrder())
-              ? ExprValueOrdering.natural()
-              : ExprValueOrdering.natural().reverse();
-      ordering =
-          NULL_FIRST.equals(option.getNullOrder()) ? ordering.nullsFirst() : ordering.nullsLast();
-      sorterBuilder.comparator(Pair.of(pair.getRight(), ordering));
-    }
-    this.sorter = sorterBuilder.build();
+    this.sorter = SortHelper.constructExprComparator(sortList);
   }
 
   @Override
@@ -99,28 +76,6 @@ public ExprValue next() {
     return iterator.next();
   }
 
-  @Builder
-  public static class Sorter implements Comparator<ExprValue> {
-    @Singular
-    private final List<Pair<Expression, Comparator<ExprValue>>> comparators;
-
-    @Override
-    public int compare(ExprValue o1, ExprValue o2) {
-      for (Pair<Expression, Comparator<ExprValue>> comparator : comparators) {
-        Expression expression = comparator.getKey();
-        int result =
-            comparator
-                .getValue()
-                .compare(
-                    expression.valueOf(o1.bindingTuples()), expression.valueOf(o2.bindingTuples()));
-        if (result != 0) {
-          return result;
-        }
-      }
-      return 0;
-    }
-  }
-
   private Iterator<ExprValue> iterator(PriorityQueue<ExprValue> result) {
     return new Iterator<ExprValue>() {
       @Override
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/TakeOrderedOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/TakeOrderedOperator.java
new file mode 100644
index 0000000000..a6e0f968e6
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/TakeOrderedOperator.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.physical;
+
+import com.google.common.collect.Ordering;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import org.apache.commons.lang3.tuple.Pair;
+import org.opensearch.sql.ast.tree.Sort.SortOption;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.Expression;
+
+/**
+ * TakeOrdered Operator. This operator will sort input data as the order of {@link this#sortList}
+ * specifies and return {@link this#limit} rows from the {@link this#offset} index.
+ *
+ * <p>Functionally, this operator is a combination of {@link SortOperator} and {@link
+ * LimitOperator}. But it can reduce the time complexity from O(nlogn) to O(n), and memory from O(n)
+ * to O(k) due to use guava {@link com.google.common.collect.Ordering}.
+ *
+ * <p>Overall, it's an optimization to replace `Limit(Sort)` in physical plan level since it's all
+ * about execution. Because most execution engine may not support this operator, it doesn't have a
+ * related logical operator.
+ */
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class TakeOrderedOperator extends PhysicalPlan {
+  @Getter private final PhysicalPlan input;
+
+  @Getter private final List<Pair<SortOption, Expression>> sortList;
+  @Getter private final Integer limit;
+  @Getter private final Integer offset;
+  @EqualsAndHashCode.Exclude private final Ordering<ExprValue> ordering;
+  @EqualsAndHashCode.Exclude private Iterator<ExprValue> iterator;
+
+  /**
+   * TakeOrdered Operator Constructor.
+   *
+   * @param input input {@link PhysicalPlan}
+   * @param limit the limit value from LimitOperator
+   * @param offset the offset value from LimitOperator
+   * @param sortList list of sort field from SortOperator
+   */
+  public TakeOrderedOperator(
+      PhysicalPlan input,
+      Integer limit,
+      Integer offset,
+      List<Pair<SortOption, Expression>> sortList) {
+    this.input = input;
+    this.sortList = sortList;
+    this.limit = limit;
+    this.offset = offset;
+    this.ordering = SortHelper.constructExprOrdering(sortList);
+  }
+
+  @Override
+  public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
+    return visitor.visitTakeOrdered(this, context);
+  }
+
+  @Override
+  public void open() {
+    super.open();
+    iterator = ordering.leastOf(input, offset + limit).stream().skip(offset).iterator();
+  }
+
+  @Override
+  public List<PhysicalPlan> getChild() {
+    return Collections.singletonList(input);
+  }
+
+  @Override
+  public boolean hasNext() {
+    return iterator.hasNext();
+  }
+
+  @Override
+  public ExprValue next() {
+    return iterator.next();
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/ValuesOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/ValuesOperator.java
index 51d2850df7..4a4ce27da8 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/ValuesOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/ValuesOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import com.google.common.collect.ImmutableList;
@@ -15,24 +14,18 @@
 import lombok.ToString;
 import org.opensearch.sql.data.model.ExprCollectionValue;
 import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.LiteralExpression;
 
-/**
- * Physical operator for Values.
- */
+/** Physical operator for Values. */
 @ToString
 @EqualsAndHashCode(callSuper = false, of = "values")
 public class ValuesOperator extends PhysicalPlan {
 
-  /**
-   * Original values list for print and equality check.
-   */
-  @Getter
-  private final List<List<LiteralExpression>> values;
+  /** Original values list for print and equality check. */
+  @Getter private final List<List<LiteralExpression>> values;
 
-  /**
-   * Values iterator.
-   */
+  /** Values iterator. */
   private final Iterator<List<LiteralExpression>> valuesIterator;
 
   public ValuesOperator(List<List<LiteralExpression>> values) {
@@ -57,10 +50,8 @@ public boolean hasNext() {
 
   @Override
   public ExprValue next() {
-    List<ExprValue> values = valuesIterator.next().stream()
-                                           .map(expr -> expr.valueOf())
-                                           .collect(Collectors.toList());
+    List<ExprValue> values =
+        valuesIterator.next().stream().map(Expression::valueOf).collect(Collectors.toList());
     return new ExprCollectionValue(values);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/WindowOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/WindowOperator.java
index 8ecdcfbf49..10377ce47a 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/WindowOperator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/WindowOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import com.google.common.collect.ImmutableMap;
@@ -21,43 +20,34 @@
 import org.opensearch.sql.expression.window.WindowFunctionExpression;
 import org.opensearch.sql.expression.window.frame.WindowFrame;
 
-/**
- * Physical operator for window function computation.
- */
+/** Physical operator for window function computation. */
 @EqualsAndHashCode(callSuper = false)
 @ToString
 public class WindowOperator extends PhysicalPlan {
-  @Getter
-  private final PhysicalPlan input;
+  @Getter private final PhysicalPlan input;
 
-  @Getter
-  private final NamedExpression windowFunction;
+  @Getter private final NamedExpression windowFunction;
 
-  @Getter
-  private final WindowDefinition windowDefinition;
+  @Getter private final WindowDefinition windowDefinition;
 
-  @EqualsAndHashCode.Exclude
-  @ToString.Exclude
-  private final WindowFrame windowFrame;
+  @EqualsAndHashCode.Exclude @ToString.Exclude private final WindowFrame windowFrame;
 
   /**
-   * Peeking iterator that can peek next element which is required
-   * by window frame such as peer frame to prefetch all rows related
-   * to same peer (of same sorting key).
+   * Peeking iterator that can peek next element which is required by window frame such as peer
+   * frame to prefetch all rows related to same peer (of same sorting key).
    */
-  @EqualsAndHashCode.Exclude
-  @ToString.Exclude
+  @EqualsAndHashCode.Exclude @ToString.Exclude
   private final PeekingIterator<ExprValue> peekingIterator;
 
   /**
    * Initialize window operator.
-   * @param input             child operator
-   * @param windowFunction    window function
-   * @param windowDefinition  window definition
+   *
+   * @param input child operator
+   * @param windowFunction window function
+   * @param windowDefinition window definition
    */
-  public WindowOperator(PhysicalPlan input,
-                        NamedExpression windowFunction,
-                        WindowDefinition windowDefinition) {
+  public WindowOperator(
+      PhysicalPlan input, NamedExpression windowFunction, WindowDefinition windowDefinition) {
     this.input = input;
     this.windowFunction = windowFunction;
     this.windowDefinition = windowDefinition;
@@ -107,5 +97,4 @@ private void addWindowFunctionResultColumn(ImmutableMap.Builder<String, ExprValu
     ExprValue exprValue = windowFunction.valueOf(windowFrame);
     mapBuilder.put(windowFunction.getName(), exprValue);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/collector/BucketCollector.java b/core/src/main/java/org/opensearch/sql/planner/physical/collector/BucketCollector.java
index a00fd3cdf3..37ea5495f7 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/collector/BucketCollector.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/collector/BucketCollector.java
@@ -21,37 +21,29 @@
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.storage.bindingtuple.BindingTuple;
 
-/**
- * Collect Bucket from {@link BindingTuple}.
- */
+/** Collect Bucket from {@link BindingTuple}. */
 @RequiredArgsConstructor
 public class BucketCollector implements Collector {
 
-  /**
-   * Bucket Expression.
-   */
+  /** Bucket Expression. */
   private final NamedExpression bucketExpr;
 
-  /**
-   * Collector Constructor.
-   */
+  /** Collector Constructor. */
   private final Supplier<Collector> supplier;
 
   /**
-   * Map from bucketKey to nested collector sorted by key to make sure
-   * final result is in order after traversal.
+   * Map from bucketKey to nested collector sorted by key to make sure final result is in order
+   * after traversal.
    */
   private final Map<ExprValue, Collector> collectorMap = new TreeMap<>();
 
-  /**
-   * Bucket Index.
-   */
+  /** Bucket Index. */
   private int bucketIndex = 0;
 
   /**
-   * Collect Bucket from {@link BindingTuple}.
-   * If bucket not exist, create new bucket and {@link Collector}.
-   * If bucket exist, let {@link Collector} in the bucket collect from {@link BindingTuple}.
+   * Collect Bucket from {@link BindingTuple}. If bucket not exist, create new bucket and {@link
+   * Collector}. If bucket exist, let {@link Collector} in the bucket collect from {@link
+   * BindingTuple}.
    *
    * @param input {@link BindingTuple}.
    */
@@ -64,6 +56,7 @@ public void collect(BindingTuple input) {
 
   /**
    * Bucket Key.
+   *
    * @param tuple {@link BindingTuple}.
    * @return Bucket Key.
    */
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/collector/Collector.java b/core/src/main/java/org/opensearch/sql/planner/physical/collector/Collector.java
index a2b3a41a27..e696d5068f 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/collector/Collector.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/collector/Collector.java
@@ -13,9 +13,7 @@
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
 import org.opensearch.sql.storage.bindingtuple.BindingTuple;
 
-/**
- * Interface of {@link BindingTuple} Collector.
- */
+/** Interface of {@link BindingTuple} Collector. */
 public interface Collector {
 
   /**
@@ -32,16 +30,12 @@ public interface Collector {
    */
   List<ExprValue> results();
 
-  /**
-   * {@link Collector} tree builder.
-   */
+  /** {@link Collector} tree builder. */
   @UtilityClass
   class Builder {
-    /**
-     * build {@link Collector}.
-     */
-    public static Collector build(List<NamedExpression> buckets,
-                                  List<NamedAggregator> aggregators) {
+    /** build {@link Collector}. */
+    public static Collector build(
+        List<NamedExpression> buckets, List<NamedAggregator> aggregators) {
       if (buckets.isEmpty()) {
         return new MetricCollector(aggregators);
       } else {
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/collector/MetricCollector.java b/core/src/main/java/org/opensearch/sql/planner/physical/collector/MetricCollector.java
index c804c7bc9b..2cfa3c9457 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/collector/MetricCollector.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/collector/MetricCollector.java
@@ -22,9 +22,7 @@
  */
 public class MetricCollector implements Collector {
 
-  /**
-   * List of {@link NamedAggregator}.
-   */
+  /** List of {@link NamedAggregator}. */
   private final List<Map.Entry<NamedAggregator, AggregationState>> aggregators;
 
   /**
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/collector/Rounding.java b/core/src/main/java/org/opensearch/sql/planner/physical/collector/Rounding.java
index 71ae5dc7c3..81a1a0230f 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/collector/Rounding.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/collector/Rounding.java
@@ -11,12 +11,12 @@
 import static org.opensearch.sql.data.type.ExprCoreType.LONG;
 import static org.opensearch.sql.data.type.ExprCoreType.TIME;
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
 
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.ZoneId;
 import java.time.temporal.ChronoField;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
@@ -34,15 +34,11 @@
 import org.opensearch.sql.expression.span.SpanExpression;
 import org.opensearch.sql.utils.DateTimeUtils;
 
-/**
- * Rounding.
- */
+/** Rounding. */
 @EqualsAndHashCode
 public abstract class Rounding<T> {
 
-  /**
-   * Create Rounding instance.
-   */
+  /** Create Rounding instance. */
   public static Rounding<?> createRounding(SpanExpression span) {
     ExprValue interval = span.getValue().valueOf();
     ExprType type = span.type();
@@ -70,7 +66,6 @@ public static Rounding<?> createRounding(SpanExpression span) {
 
   public abstract ExprValue round(ExprValue value);
 
-
   static class TimestampRounding extends Rounding<Instant> {
     private final ExprValue interval;
     private final DateTimeUnit dateTimeUnit;
@@ -82,13 +77,13 @@ public TimestampRounding(ExprValue interval, String unit) {
 
     @Override
     public ExprValue round(ExprValue var) {
-      Instant instant = Instant.ofEpochMilli(dateTimeUnit.round(var.timestampValue()
-          .toEpochMilli(), interval.integerValue()));
+      Instant instant =
+          Instant.ofEpochMilli(
+              dateTimeUnit.round(var.timestampValue().toEpochMilli(), interval.integerValue()));
       return new ExprTimestampValue(instant);
     }
   }
 
-
   static class DatetimeRounding extends Rounding<LocalDateTime> {
     private final ExprValue interval;
     private final DateTimeUnit dateTimeUnit;
@@ -100,13 +95,15 @@ public DatetimeRounding(ExprValue interval, String unit) {
 
     @Override
     public ExprValue round(ExprValue var) {
-      Instant instant = Instant.ofEpochMilli(dateTimeUnit.round(var.datetimeValue()
-          .atZone(ZoneId.of("UTC")).toInstant().toEpochMilli(), interval.integerValue()));
-      return new ExprDatetimeValue(instant.atZone(ZoneId.of("UTC")).toLocalDateTime());
+      Instant instant =
+          Instant.ofEpochMilli(
+              dateTimeUnit.round(
+                  var.datetimeValue().atZone(UTC_ZONE_ID).toInstant().toEpochMilli(),
+                  interval.integerValue()));
+      return new ExprDatetimeValue(instant.atZone(UTC_ZONE_ID).toLocalDateTime());
     }
   }
 
-
   static class DateRounding extends Rounding<LocalDate> {
     private final ExprValue interval;
     private final DateTimeUnit dateTimeUnit;
@@ -118,9 +115,12 @@ public DateRounding(ExprValue interval, String unit) {
 
     @Override
     public ExprValue round(ExprValue var) {
-      Instant instant = Instant.ofEpochMilli(dateTimeUnit.round(var.dateValue().atStartOfDay()
-          .atZone(ZoneId.of("UTC")).toInstant().toEpochMilli(), interval.integerValue()));
-      return new ExprDateValue(instant.atZone(ZoneId.of("UTC")).toLocalDate());
+      Instant instant =
+          Instant.ofEpochMilli(
+              dateTimeUnit.round(
+                  var.dateValue().atStartOfDay().atZone(UTC_ZONE_ID).toInstant().toEpochMilli(),
+                  interval.integerValue()));
+      return new ExprDateValue(instant.atZone(UTC_ZONE_ID).toLocalDate());
     }
   }
 
@@ -136,17 +136,18 @@ public TimeRounding(ExprValue interval, String unit) {
     @Override
     public ExprValue round(ExprValue var) {
       if (dateTimeUnit.id > 4) {
-        throw new ExpressionEvaluationException(String
-            .format("Unable to set span unit %s for TIME type", dateTimeUnit.getName()));
+        throw new ExpressionEvaluationException(
+            String.format("Unable to set span unit %s for TIME type", dateTimeUnit.getName()));
       }
 
-      Instant instant = Instant.ofEpochMilli(dateTimeUnit.round(var.timeValue().getLong(
-          ChronoField.MILLI_OF_DAY), interval.integerValue()));
-      return new ExprTimeValue(instant.atZone(ZoneId.of("UTC")).toLocalTime());
+      Instant instant =
+          Instant.ofEpochMilli(
+              dateTimeUnit.round(
+                  var.timeValue().getLong(ChronoField.MILLI_OF_DAY), interval.integerValue()));
+      return new ExprTimeValue(instant.atZone(UTC_ZONE_ID).toLocalTime());
     }
   }
 
-
   static class LongRounding extends Rounding<Long> {
     private final Long longInterval;
 
@@ -161,7 +162,6 @@ public ExprValue round(ExprValue value) {
     }
   }
 
-
   static class DoubleRounding extends Rounding<Double> {
     private final Double doubleInterval;
 
@@ -171,13 +171,12 @@ protected DoubleRounding(ExprValue interval) {
 
     @Override
     public ExprValue round(ExprValue value) {
-      double rounded = Double
-          .valueOf(value.doubleValue() / doubleInterval).intValue() * doubleInterval;
+      double rounded =
+          Double.valueOf(value.doubleValue() / doubleInterval).intValue() * doubleInterval;
       return ExprValueUtils.doubleValue(rounded);
     }
   }
 
-
   @RequiredArgsConstructor
   static class UnknownRounding extends Rounding<Object> {
     @Override
@@ -186,43 +185,37 @@ public ExprValue round(ExprValue var) {
     }
   }
 
-
   @RequiredArgsConstructor
   public enum DateTimeUnit {
-    MILLISECOND(1, "ms", true, ChronoField.MILLI_OF_SECOND
-        .getBaseUnit().getDuration().toMillis()) {
+    MILLISECOND(1, "ms", true, ChronoField.MILLI_OF_SECOND.getBaseUnit().getDuration().toMillis()) {
       @Override
       long round(long utcMillis, int interval) {
         return DateTimeUtils.roundFloor(utcMillis, ratio * interval);
       }
     },
 
-    SECOND(2, "s", true, ChronoField.SECOND_OF_MINUTE
-        .getBaseUnit().getDuration().toMillis()) {
+    SECOND(2, "s", true, ChronoField.SECOND_OF_MINUTE.getBaseUnit().getDuration().toMillis()) {
       @Override
       long round(long utcMillis, int interval) {
         return DateTimeUtils.roundFloor(utcMillis, ratio * interval);
       }
     },
 
-    MINUTE(3, "m", true, ChronoField.MINUTE_OF_HOUR
-        .getBaseUnit().getDuration().toMillis()) {
+    MINUTE(3, "m", true, ChronoField.MINUTE_OF_HOUR.getBaseUnit().getDuration().toMillis()) {
       @Override
       long round(long utcMillis, int interval) {
         return DateTimeUtils.roundFloor(utcMillis, ratio * interval);
       }
     },
 
-    HOUR(4, "h", true, ChronoField.HOUR_OF_DAY
-        .getBaseUnit().getDuration().toMillis()) {
+    HOUR(4, "h", true, ChronoField.HOUR_OF_DAY.getBaseUnit().getDuration().toMillis()) {
       @Override
       long round(long utcMillis, int interval) {
         return DateTimeUtils.roundFloor(utcMillis, ratio * interval);
       }
     },
 
-    DAY(5, "d", true, ChronoField.DAY_OF_MONTH
-        .getBaseUnit().getDuration().toMillis()) {
+    DAY(5, "d", true, ChronoField.DAY_OF_MONTH.getBaseUnit().getDuration().toMillis()) {
       @Override
       long round(long utcMillis, int interval) {
         return DateTimeUtils.roundFloor(utcMillis, ratio * interval);
@@ -257,18 +250,14 @@ long round(long utcMillis, int interval) {
       }
     };
 
-    @Getter
-    private final int id;
-    @Getter
-    private final String name;
+    @Getter private final int id;
+    @Getter private final String name;
     protected final boolean isMillisBased;
     protected final long ratio;
 
     abstract long round(long utcMillis, int interval);
 
-    /**
-     * Resolve the date time unit.
-     */
+    /** Resolve the date time unit. */
     public static Rounding.DateTimeUnit resolve(String name) {
       switch (name) {
         case "M":
@@ -283,5 +272,4 @@ public static Rounding.DateTimeUnit resolve(String name) {
       }
     }
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTable.java b/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTable.java
index 105ad5ed32..5542d0f0e4 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTable.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTable.java
@@ -19,12 +19,9 @@
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.storage.Table;
 
-
 /**
- * Table implementation to handle show datasources command.
- * Since datasource information is not tied to any storage engine, this info
- * is handled via DataSource Table.
- *
+ * Table implementation to handle show datasources command. Since datasource information is not tied
+ * to any storage engine, this info is handled via DataSource Table.
  */
 @RequiredArgsConstructor
 @EqualsAndHashCode
@@ -44,8 +41,7 @@ public PhysicalPlan implement(LogicalPlan plan) {
 
   @VisibleForTesting
   @RequiredArgsConstructor
-  public static class DataSourceTableDefaultImplementor
-      extends DefaultImplementor<Object> {
+  public static class DataSourceTableDefaultImplementor extends DefaultImplementor<Object> {
 
     private final DataSourceService dataSourceService;
 
@@ -54,5 +50,4 @@ public PhysicalPlan visitRelation(LogicalRelation node, Object context) {
       return new DataSourceTableScan(dataSourceService);
     }
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScan.java b/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScan.java
index 14cd09e162..89e21377dc 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScan.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScan.java
@@ -18,15 +18,13 @@
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.datasource.DataSourceService;
-import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.storage.TableScanOperator;
 
 /**
- * This class handles table scan of data source table.
- * Right now these are derived from dataSourceService thorough static fields.
- * In future this might scan data from underlying datastore if we start
- * persisting datasource info somewhere.
- *
+ * This class handles table scan of data source table. Right now these are derived from
+ * dataSourceService thorough static fields. In future this might scan data from underlying
+ * datastore if we start persisting datasource info somewhere.
  */
 public class DataSourceTableScan extends TableScanOperator {
 
@@ -47,14 +45,16 @@ public String explain() {
   @Override
   public void open() {
     List<ExprValue> exprValues = new ArrayList<>();
-    Set<DataSource> dataSources = dataSourceService.getDataSources();
-    for (DataSource dataSource : dataSources) {
+    Set<DataSourceMetadata> dataSourceMetadataSet = dataSourceService.getDataSourceMetadata(false);
+    for (DataSourceMetadata dataSourceMetadata : dataSourceMetadataSet) {
       exprValues.add(
-          new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-              "DATASOURCE_NAME",
-              ExprValueUtils.stringValue(dataSource.getName()),
-              "CONNECTOR_TYPE",
-              ExprValueUtils.stringValue(dataSource.getConnectorType().name())))));
+          new ExprTupleValue(
+              new LinkedHashMap<>(
+                  ImmutableMap.of(
+                      "DATASOURCE_NAME",
+                      ExprValueUtils.stringValue(dataSourceMetadata.getName()),
+                      "CONNECTOR_TYPE",
+                      ExprValueUtils.stringValue(dataSourceMetadata.getConnector().name())))));
     }
     iterator = exprValues.iterator();
   }
@@ -68,5 +68,4 @@ public boolean hasNext() {
   public ExprValue next() {
     return iterator.next();
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableSchema.java b/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableSchema.java
index dd959d9b56..469305a15d 100644
--- a/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableSchema.java
+++ b/core/src/main/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableSchema.java
@@ -13,19 +13,16 @@
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Definition of the data source table schema.
- */
+/** Definition of the data source table schema. */
 @Getter
 @RequiredArgsConstructor
 public enum DataSourceTableSchema {
-
-  DATASOURCE_TABLE_SCHEMA(new LinkedHashMap<>() {
-    {
-      put("DATASOURCE_NAME", STRING);
-      put("CONNECTOR_TYPE", STRING);
-    }
-  }
-  );
+  DATASOURCE_TABLE_SCHEMA(
+      new LinkedHashMap<>() {
+        {
+          put("DATASOURCE_NAME", STRING);
+          put("CONNECTOR_TYPE", STRING);
+        }
+      });
   private final Map<String, ExprType> mapping;
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/streaming/StreamContext.java b/core/src/main/java/org/opensearch/sql/planner/streaming/StreamContext.java
index 18eb10f19d..87ff048531 100644
--- a/core/src/main/java/org/opensearch/sql/planner/streaming/StreamContext.java
+++ b/core/src/main/java/org/opensearch/sql/planner/streaming/StreamContext.java
@@ -8,8 +8,8 @@
 import lombok.Data;
 
 /**
- * Stream context required by stream processing components and can be
- * stored and restored between executions.
+ * Stream context required by stream processing components and can be stored and restored between
+ * executions.
  */
 @Data
 public class StreamContext {
diff --git a/core/src/main/java/org/opensearch/sql/planner/streaming/watermark/BoundedOutOfOrderWatermarkGenerator.java b/core/src/main/java/org/opensearch/sql/planner/streaming/watermark/BoundedOutOfOrderWatermarkGenerator.java
index 63d6a5b163..49a91dd9cc 100644
--- a/core/src/main/java/org/opensearch/sql/planner/streaming/watermark/BoundedOutOfOrderWatermarkGenerator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/streaming/watermark/BoundedOutOfOrderWatermarkGenerator.java
@@ -7,9 +7,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-/**
- * Watermark generator that generates watermark with bounded out-of-order delay.
- */
+/** Watermark generator that generates watermark with bounded out-of-order delay. */
 @RequiredArgsConstructor
 public class BoundedOutOfOrderWatermarkGenerator implements WatermarkGenerator {
 
diff --git a/core/src/main/java/org/opensearch/sql/planner/streaming/watermark/WatermarkGenerator.java b/core/src/main/java/org/opensearch/sql/planner/streaming/watermark/WatermarkGenerator.java
index 4f4c9a8a00..e4a44e5169 100644
--- a/core/src/main/java/org/opensearch/sql/planner/streaming/watermark/WatermarkGenerator.java
+++ b/core/src/main/java/org/opensearch/sql/planner/streaming/watermark/WatermarkGenerator.java
@@ -6,8 +6,8 @@
 package org.opensearch.sql.planner.streaming.watermark;
 
 /**
- * A watermark generator generates watermark timestamp based on some strategy which is defined
- * in implementation class.
+ * A watermark generator generates watermark timestamp based on some strategy which is defined in
+ * implementation class.
  */
 public interface WatermarkGenerator {
 
@@ -18,5 +18,4 @@ public interface WatermarkGenerator {
    * @return watermark timestamp in millisecond
    */
   long generate(long timestamp);
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/Window.java b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/Window.java
index 2a85ea391c..3d5b180346 100644
--- a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/Window.java
+++ b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/Window.java
@@ -7,9 +7,7 @@
 
 import lombok.Data;
 
-/**
- * A time window is a window of time interval with inclusive start time and exclusive end time.
- */
+/** A time window is a window of time interval with inclusive start time and exclusive end time. */
 @Data
 public class Window {
 
@@ -19,9 +17,7 @@ public class Window {
   /** End timestamp (exclusive) of the time window. */
   private final long endTime;
 
-  /**
-   * Return the maximum timestamp (inclusive) of the window.
-   */
+  /** Return the maximum timestamp (inclusive) of the window. */
   public long maxTimestamp() {
     return endTime - 1;
   }
diff --git a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/SlidingWindowAssigner.java b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/SlidingWindowAssigner.java
index f0f47fd575..1b1f12a573 100644
--- a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/SlidingWindowAssigner.java
+++ b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/SlidingWindowAssigner.java
@@ -12,8 +12,8 @@
 import org.opensearch.sql.utils.DateTimeUtils;
 
 /**
- * A sliding window assigner assigns multiple overlapped window per event timestamp.
- * The overlap size is determined by the given slide interval.
+ * A sliding window assigner assigns multiple overlapped window per event timestamp. The overlap
+ * size is determined by the given slide interval.
  */
 public class SlidingWindowAssigner implements WindowAssigner {
 
@@ -27,13 +27,13 @@ public class SlidingWindowAssigner implements WindowAssigner {
    * Create sliding window assigner with the given window and slide size in millisecond.
    *
    * @param windowSize window size in millisecond
-   * @param slideSize  slide size in millisecond
+   * @param slideSize slide size in millisecond
    */
   public SlidingWindowAssigner(long windowSize, long slideSize) {
-    Preconditions.checkArgument(windowSize > 0,
-        "Window size [%s] must be positive number", windowSize);
-    Preconditions.checkArgument(slideSize > 0,
-        "Slide size [%s] must be positive number", slideSize);
+    Preconditions.checkArgument(
+        windowSize > 0, "Window size [%s] must be positive number", windowSize);
+    Preconditions.checkArgument(
+        slideSize > 0, "Slide size [%s] must be positive number", slideSize);
     this.windowSize = windowSize;
     this.slideSize = slideSize;
   }
diff --git a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/TumblingWindowAssigner.java b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/TumblingWindowAssigner.java
index 192bb6c429..2591689a35 100644
--- a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/TumblingWindowAssigner.java
+++ b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/TumblingWindowAssigner.java
@@ -11,9 +11,7 @@
 import org.opensearch.sql.planner.streaming.windowing.Window;
 import org.opensearch.sql.utils.DateTimeUtils;
 
-/**
- * A tumbling window assigner assigns a single window per event timestamp without overlap.
- */
+/** A tumbling window assigner assigns a single window per event timestamp without overlap. */
 public class TumblingWindowAssigner implements WindowAssigner {
 
   /** Window size in millisecond. */
@@ -25,8 +23,8 @@ public class TumblingWindowAssigner implements WindowAssigner {
    * @param windowSize window size in millisecond
    */
   public TumblingWindowAssigner(long windowSize) {
-    Preconditions.checkArgument(windowSize > 0,
-        "Window size [%s] must be positive number", windowSize);
+    Preconditions.checkArgument(
+        windowSize > 0, "Window size [%s] must be positive number", windowSize);
     this.windowSize = windowSize;
   }
 
diff --git a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/WindowAssigner.java b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/WindowAssigner.java
index dac882c5ff..fd615c2d5e 100644
--- a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/WindowAssigner.java
+++ b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/assigner/WindowAssigner.java
@@ -9,16 +9,16 @@
 import org.opensearch.sql.planner.streaming.windowing.Window;
 
 /**
- * A window assigner assigns zero or more window to an event timestamp
- * based on different windowing approach.
+ * A window assigner assigns zero or more window to an event timestamp based on different windowing
+ * approach.
  */
 public interface WindowAssigner {
 
   /**
    * Return window(s) assigned to the timestamp.
+   *
    * @param timestamp given event timestamp
    * @return windows assigned
    */
   List<Window> assign(long timestamp);
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/trigger/AfterWatermarkWindowTrigger.java b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/trigger/AfterWatermarkWindowTrigger.java
index 1801880961..f614ce847e 100644
--- a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/trigger/AfterWatermarkWindowTrigger.java
+++ b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/trigger/AfterWatermarkWindowTrigger.java
@@ -11,8 +11,8 @@
 
 /**
  * After watermark window trigger fires window state output once a window is below watermark.
- * Precisely speaking, after watermark means the window boundary (max timestamp) is equal to
- * or less than the current watermark timestamp.
+ * Precisely speaking, after watermark means the window boundary (max timestamp) is equal to or less
+ * than the current watermark timestamp.
  */
 @RequiredArgsConstructor
 public class AfterWatermarkWindowTrigger implements WindowTrigger {
diff --git a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/trigger/TriggerResult.java b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/trigger/TriggerResult.java
index 465f0aa9eb..30dba22725 100644
--- a/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/trigger/TriggerResult.java
+++ b/core/src/main/java/org/opensearch/sql/planner/streaming/windowing/trigger/TriggerResult.java
@@ -8,9 +8,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-/**
- * Result determined by a trigger for what should happen to the window.
- */
+/** Result determined by a trigger for what should happen to the window. */
 @Getter
 @RequiredArgsConstructor
 public enum TriggerResult {
diff --git a/core/src/main/java/org/opensearch/sql/storage/DataSourceFactory.java b/core/src/main/java/org/opensearch/sql/storage/DataSourceFactory.java
index 20d263e601..69d902c1d7 100644
--- a/core/src/main/java/org/opensearch/sql/storage/DataSourceFactory.java
+++ b/core/src/main/java/org/opensearch/sql/storage/DataSourceFactory.java
@@ -19,13 +19,9 @@
  * {@link DataSourceFactory}.
  */
 public interface DataSourceFactory {
-  /**
-   * Get {@link DataSourceType}.
-   */
+  /** Get {@link DataSourceType}. */
   DataSourceType getDataSourceType();
 
-  /**
-   * Create {@link DataSource}.
-   */
+  /** Create {@link DataSource}. */
   DataSource createDataSource(DataSourceMetadata metadata);
 }
diff --git a/core/src/main/java/org/opensearch/sql/storage/StorageEngine.java b/core/src/main/java/org/opensearch/sql/storage/StorageEngine.java
index 246a50ea09..c3b54beaaa 100644
--- a/core/src/main/java/org/opensearch/sql/storage/StorageEngine.java
+++ b/core/src/main/java/org/opensearch/sql/storage/StorageEngine.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.storage;
 
 import java.util.Collection;
@@ -11,14 +10,10 @@
 import org.opensearch.sql.DataSourceSchemaName;
 import org.opensearch.sql.expression.function.FunctionResolver;
 
-/**
- * Storage engine for different storage to provide data access API implementation.
- */
+/** Storage engine for different storage to provide data access API implementation. */
 public interface StorageEngine {
 
-  /**
-   * Get {@link Table} from storage engine.
-   */
+  /** Get {@link Table} from storage engine. */
   Table getTable(DataSourceSchemaName dataSourceSchemaName, String tableName);
 
   /**
@@ -29,5 +24,4 @@ public interface StorageEngine {
   default Collection<FunctionResolver> getFunctions() {
     return Collections.emptyList();
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/storage/Table.java b/core/src/main/java/org/opensearch/sql/storage/Table.java
index ae0aaaf17b..33dbd7d66d 100644
--- a/core/src/main/java/org/opensearch/sql/storage/Table.java
+++ b/core/src/main/java/org/opensearch/sql/storage/Table.java
@@ -3,19 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.storage;
 
 import java.util.Map;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.executor.streaming.StreamingSource;
 import org.opensearch.sql.planner.logical.LogicalPlan;
+import org.opensearch.sql.planner.logical.LogicalWrite;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.storage.read.TableScanBuilder;
+import org.opensearch.sql.storage.write.TableWriteBuilder;
 
-/**
- * Table.
- */
+/** Table. */
 public interface Table {
 
   /**
@@ -36,11 +35,14 @@ default void create(Map<String, ExprType> schema) {
     throw new UnsupportedOperationException("Unsupported Operation");
   }
 
-  /**
-   * Get the {@link ExprType} for each field in the table.
-   */
+  /** Get the {@link ExprType} for each field in the table. */
   Map<String, ExprType> getFieldTypes();
 
+  /** Get the {@link ExprType} for each meta-field (reserved fields) in the table. */
+  default Map<String, ExprType> getReservedFieldTypes() {
+    return Map.of();
+  }
+
   /**
    * Implement a {@link LogicalPlan} by {@link PhysicalPlan} in storage engine.
    *
@@ -52,8 +54,8 @@ default void create(Map<String, ExprType> schema) {
   PhysicalPlan implement(LogicalPlan plan);
 
   /**
-   * Optimize the {@link LogicalPlan} by storage engine rule.
-   * The default optimize solution is no optimization.
+   * Optimize the {@link LogicalPlan} by storage engine rule. The default optimize solution is no
+   * optimization.
    *
    * @param plan logical plan.
    * @return logical plan.
@@ -73,9 +75,17 @@ default TableScanBuilder createScanBuilder() {
     return null; // TODO: Enforce all subclasses to implement this later
   }
 
-  /**
-   * Translate {@link Table} to {@link StreamingSource} if possible.
+  /*
+   * Create table write builder for logical to physical transformation.
+   *
+   * @param plan logical write plan
+   * @return table write builder
    */
+  default TableWriteBuilder createWriteBuilder(LogicalWrite plan) {
+    throw new UnsupportedOperationException("Write operation is not supported on current table");
+  }
+
+  /** Translate {@link Table} to {@link StreamingSource} if possible. */
   default StreamingSource asStreamingSource() {
     throw new UnsupportedOperationException();
   }
diff --git a/core/src/main/java/org/opensearch/sql/storage/TableScanOperator.java b/core/src/main/java/org/opensearch/sql/storage/TableScanOperator.java
index 1b8e33bc4f..130516b3ef 100644
--- a/core/src/main/java/org/opensearch/sql/storage/TableScanOperator.java
+++ b/core/src/main/java/org/opensearch/sql/storage/TableScanOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.storage;
 
 import java.util.Collections;
@@ -12,8 +11,8 @@
 import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
 
 /**
- * Abstract table scan class for different storage to implement.
- * This is also to avoid "polluting" physical plan visitor by concrete table scan implementation.
+ * Abstract table scan class for different storage to implement. This is also to avoid "polluting"
+ * physical plan visitor by concrete table scan implementation.
  */
 public abstract class TableScanOperator extends PhysicalPlan {
 
diff --git a/core/src/main/java/org/opensearch/sql/storage/bindingtuple/BindingTuple.java b/core/src/main/java/org/opensearch/sql/storage/bindingtuple/BindingTuple.java
index 51a0348116..2487c651ad 100644
--- a/core/src/main/java/org/opensearch/sql/storage/bindingtuple/BindingTuple.java
+++ b/core/src/main/java/org/opensearch/sql/storage/bindingtuple/BindingTuple.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.storage.bindingtuple;
 
 import org.opensearch.sql.data.model.ExprMissingValue;
@@ -14,20 +13,19 @@
 import org.opensearch.sql.expression.env.Environment;
 
 /**
- * BindingTuple represents the a relationship between bindingName and ExprValue.
- * e.g. The operation output column name is bindingName, the value is the ExprValue.
+ * BindingTuple represents the a relationship between bindingName and ExprValue. e.g. The operation
+ * output column name is bindingName, the value is the ExprValue.
  */
 public abstract class BindingTuple implements Environment<Expression, ExprValue> {
-  public static BindingTuple EMPTY = new BindingTuple() {
-    @Override
-    public ExprValue resolve(ReferenceExpression ref) {
-      return ExprMissingValue.of();
-    }
-  };
+  public static BindingTuple EMPTY =
+      new BindingTuple() {
+        @Override
+        public ExprValue resolve(ReferenceExpression ref) {
+          return ExprMissingValue.of();
+        }
+      };
 
-  /**
-   * Resolve {@link Expression} in the BindingTuple environment.
-   */
+  /** Resolve {@link Expression} in the BindingTuple environment. */
   @Override
   public ExprValue resolve(Expression var) {
     if (var instanceof ReferenceExpression) {
@@ -37,8 +35,6 @@ public ExprValue resolve(Expression var) {
     }
   }
 
-  /**
-   * Resolve the {@link ReferenceExpression} in BindingTuple context.
-   */
+  /** Resolve the {@link ReferenceExpression} in BindingTuple context. */
   public abstract ExprValue resolve(ReferenceExpression ref);
 }
diff --git a/core/src/main/java/org/opensearch/sql/storage/bindingtuple/LazyBindingTuple.java b/core/src/main/java/org/opensearch/sql/storage/bindingtuple/LazyBindingTuple.java
index 4589731442..d43a3f2a1b 100644
--- a/core/src/main/java/org/opensearch/sql/storage/bindingtuple/LazyBindingTuple.java
+++ b/core/src/main/java/org/opensearch/sql/storage/bindingtuple/LazyBindingTuple.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.storage.bindingtuple;
 
 import java.util.function.Supplier;
@@ -12,9 +11,7 @@
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.expression.ReferenceExpression;
 
-/**
- * Lazy Implementation of {@link BindingTuple}.
- */
+/** Lazy Implementation of {@link BindingTuple}. */
 @RequiredArgsConstructor
 public class LazyBindingTuple extends BindingTuple {
   private final Supplier<ExprTupleValue> lazyBinding;
diff --git a/core/src/main/java/org/opensearch/sql/storage/read/TableScanBuilder.java b/core/src/main/java/org/opensearch/sql/storage/read/TableScanBuilder.java
index c0fdf36e70..b2da0b67a4 100644
--- a/core/src/main/java/org/opensearch/sql/storage/read/TableScanBuilder.java
+++ b/core/src/main/java/org/opensearch/sql/storage/read/TableScanBuilder.java
@@ -10,6 +10,8 @@
 import org.opensearch.sql.planner.logical.LogicalFilter;
 import org.opensearch.sql.planner.logical.LogicalHighlight;
 import org.opensearch.sql.planner.logical.LogicalLimit;
+import org.opensearch.sql.planner.logical.LogicalNested;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalPlanNodeVisitor;
 import org.opensearch.sql.planner.logical.LogicalProject;
@@ -17,17 +19,15 @@
 import org.opensearch.sql.storage.TableScanOperator;
 
 /**
- * A TableScanBuilder represents transition state between logical planning and physical planning
- * for table scan operator. The concrete implementation class gets involved in the logical
- * optimization through this abstraction and thus get the chance to handle push down optimization
- * without intruding core engine.
+ * A TableScanBuilder represents transition state between logical planning and physical planning for
+ * table scan operator. The concrete implementation class gets involved in the logical optimization
+ * through this abstraction and thus get the chance to handle push down optimization without
+ * intruding core engine.
  */
 public abstract class TableScanBuilder extends LogicalPlan {
 
-  /**
-   * Construct and initialize children to empty list.
-   */
-  public TableScanBuilder() {
+  /** Construct and initialize children to empty list. */
+  protected TableScanBuilder() {
     super(Collections.emptyList());
   }
 
@@ -39,8 +39,8 @@ public TableScanBuilder() {
   public abstract TableScanOperator build();
 
   /**
-   * Can a given filter operator be pushed down to table scan builder. Assume no such support
-   * by default unless subclass override this.
+   * Can a given filter operator be pushed down to table scan builder. Assume no such support by
+   * default unless subclass override this.
    *
    * @param filter logical filter operator
    * @return true if pushed down, otherwise false
@@ -50,8 +50,8 @@ public boolean pushDownFilter(LogicalFilter filter) {
   }
 
   /**
-   * Can a given aggregate operator be pushed down to table scan builder. Assume no such support
-   * by default unless subclass override this.
+   * Can a given aggregate operator be pushed down to table scan builder. Assume no such support by
+   * default unless subclass override this.
    *
    * @param aggregation logical aggregate operator
    * @return true if pushed down, otherwise false
@@ -61,8 +61,8 @@ public boolean pushDownAggregation(LogicalAggregation aggregation) {
   }
 
   /**
-   * Can a given sort operator be pushed down to table scan builder. Assume no such support
-   * by default unless subclass override this.
+   * Can a given sort operator be pushed down to table scan builder. Assume no such support by
+   * default unless subclass override this.
    *
    * @param sort logical sort operator
    * @return true if pushed down, otherwise false
@@ -72,8 +72,8 @@ public boolean pushDownSort(LogicalSort sort) {
   }
 
   /**
-   * Can a given limit operator be pushed down to table scan builder. Assume no such support
-   * by default unless subclass override this.
+   * Can a given limit operator be pushed down to table scan builder. Assume no such support by
+   * default unless subclass override this.
    *
    * @param limit logical limit operator
    * @return true if pushed down, otherwise false
@@ -83,8 +83,8 @@ public boolean pushDownLimit(LogicalLimit limit) {
   }
 
   /**
-   * Can a given project operator be pushed down to table scan builder. Assume no such support
-   * by default unless subclass override this.
+   * Can a given project operator be pushed down to table scan builder. Assume no such support by
+   * default unless subclass override this.
    *
    * @param project logical project operator
    * @return true if pushed down, otherwise false
@@ -94,8 +94,8 @@ public boolean pushDownProject(LogicalProject project) {
   }
 
   /**
-   * Can a given highlight operator be pushed down to table scan builder. Assume no such support
-   * by default unless subclass override this.
+   * Can a given highlight operator be pushed down to table scan builder. Assume no such support by
+   * default unless subclass override this.
    *
    * @param highlight logical highlight operator
    * @return true if pushed down, otherwise false
@@ -104,6 +104,21 @@ public boolean pushDownHighlight(LogicalHighlight highlight) {
     return false;
   }
 
+  /**
+   * Can a given nested operator be pushed down to table scan builder. Assume no such support by
+   * default unless subclass override this.
+   *
+   * @param nested logical nested operator
+   * @return true if pushed down, otherwise false
+   */
+  public boolean pushDownNested(LogicalNested nested) {
+    return false;
+  }
+
+  public boolean pushDownPageSize(LogicalPaginate paginate) {
+    return false;
+  }
+
   @Override
   public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
     return visitor.visitTableScanBuilder(this, context);
diff --git a/core/src/main/java/org/opensearch/sql/storage/split/Split.java b/core/src/main/java/org/opensearch/sql/storage/split/Split.java
index e9e0c6fcc1..1cb0ca57ce 100644
--- a/core/src/main/java/org/opensearch/sql/storage/split/Split.java
+++ b/core/src/main/java/org/opensearch/sql/storage/split/Split.java
@@ -8,13 +8,14 @@
 import org.opensearch.sql.storage.StorageEngine;
 
 /**
- * Split is a sections of a data set. Each {@link StorageEngine} should have specific
- * implementation of Split.
+ * Split is a sections of a data set. Each {@link StorageEngine} should have specific implementation
+ * of Split.
  */
 public interface Split {
 
   /**
    * Get the split id.
+   *
    * @return split id.
    */
   String getSplitId();
diff --git a/core/src/main/java/org/opensearch/sql/storage/write/TableWriteBuilder.java b/core/src/main/java/org/opensearch/sql/storage/write/TableWriteBuilder.java
new file mode 100644
index 0000000000..af18916f71
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/storage/write/TableWriteBuilder.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.storage.write;
+
+import java.util.Collections;
+import org.opensearch.sql.planner.logical.LogicalPlan;
+import org.opensearch.sql.planner.logical.LogicalPlanNodeVisitor;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+
+/**
+ * A {@link TableWriteBuilder} represents transition state between logical planning and physical
+ * planning for table write operator. The concrete implementation class gets involved in the logical
+ * optimization through this abstraction and thus transform to specific {@link TableWriteOperator}
+ * in a certain storage engine.
+ */
+public abstract class TableWriteBuilder extends LogicalPlan {
+
+  /** Construct table write builder with child node. */
+  public TableWriteBuilder(LogicalPlan child) {
+    super(Collections.singletonList(child));
+  }
+
+  /**
+   * Build table write operator with given child node.
+   *
+   * @param child child operator node
+   * @return table write operator
+   */
+  public abstract TableWriteOperator build(PhysicalPlan child);
+
+  @Override
+  public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
+    return visitor.visitTableWriteBuilder(this, context);
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/storage/write/TableWriteOperator.java b/core/src/main/java/org/opensearch/sql/storage/write/TableWriteOperator.java
new file mode 100644
index 0000000000..92cdc6eb41
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/storage/write/TableWriteOperator.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.storage.write;
+
+import java.util.Collections;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
+
+/**
+ * {@link TableWriteOperator} is the abstraction for data source to implement different physical
+ * write operator on a data source. This is also to avoid "polluting" physical plan visitor by
+ * concrete table scan implementation.
+ */
+@RequiredArgsConstructor
+public abstract class TableWriteOperator extends PhysicalPlan {
+
+  /** Input physical node. */
+  protected final PhysicalPlan input;
+
+  @Override
+  public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
+    return visitor.visitTableWrite(this, context);
+  }
+
+  @Override
+  public List<PhysicalPlan> getChild() {
+    return Collections.singletonList(input);
+  }
+
+  /**
+   * Explain the execution plan.
+   *
+   * @return explain output
+   */
+  public abstract String explain();
+}
diff --git a/core/src/main/java/org/opensearch/sql/utils/DateTimeFormatters.java b/core/src/main/java/org/opensearch/sql/utils/DateTimeFormatters.java
index 2556aed8d8..18e6541514 100644
--- a/core/src/main/java/org/opensearch/sql/utils/DateTimeFormatters.java
+++ b/core/src/main/java/org/opensearch/sql/utils/DateTimeFormatters.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.utils;
 
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
@@ -22,13 +21,28 @@
 import java.util.Locale;
 import lombok.experimental.UtilityClass;
 
-/**
- * DateTimeFormatter.
- * Reference org.opensearch.common.time.DateFormatters.
- */
+/** DateTimeFormatter. Reference org.opensearch.common.time.DateFormatters. */
 @UtilityClass
 public class DateTimeFormatters {
 
+  // Length of a date formatted as YYYYMMDD.
+  public static final int FULL_DATE_LENGTH = 8;
+
+  // Length of a date formatted as YYMMDD.
+  public static final int SHORT_DATE_LENGTH = 6;
+
+  // Length of a date formatted as YMMDD.
+  public static final int SINGLE_DIGIT_YEAR_DATE_LENGTH = 5;
+
+  // Length of a date formatted as MMDD.
+  public static final int NO_YEAR_DATE_LENGTH = 4;
+
+  // Length of a date formatted as MDD.
+  public static final int SINGLE_DIGIT_MONTH_DATE_LENGTH = 3;
+
+  private static final int MIN_FRACTION_SECONDS = 0;
+  private static final int MAX_FRACTION_SECONDS = 9;
+
   public static final DateTimeFormatter TIME_ZONE_FORMATTER_NO_COLON =
       new DateTimeFormatterBuilder()
           .appendOffset("+HHmm", "Z")
@@ -92,8 +106,8 @@ public class DateTimeFormatters {
           .toFormatter(Locale.ROOT)
           .withResolverStyle(ResolverStyle.STRICT);
 
-  public static final DateTimeFormatter SQL_LITERAL_DATE_TIME_FORMAT = DateTimeFormatter
-          .ofPattern("yyyy-MM-dd HH:mm:ss");
+  public static final DateTimeFormatter SQL_LITERAL_DATE_TIME_FORMAT =
+      DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
   public static final DateTimeFormatter DATE_TIME_FORMATTER =
       new DateTimeFormatterBuilder()
@@ -102,23 +116,15 @@ public class DateTimeFormatters {
           .appendOptional(STRICT_HOUR_MINUTE_SECOND_FORMATTER)
           .toFormatter();
 
-  /**
-   * todo. only support timestamp in format yyyy-MM-dd HH:mm:ss.
-   */
+  /** todo. only support timestamp in format yyyy-MM-dd HH:mm:ss. */
   public static final DateTimeFormatter DATE_TIME_FORMATTER_WITHOUT_NANO =
       SQL_LITERAL_DATE_TIME_FORMAT;
 
-  private static final int MIN_FRACTION_SECONDS = 0;
-  private static final int MAX_FRACTION_SECONDS = 9;
-
   public static final DateTimeFormatter DATE_TIME_FORMATTER_VARIABLE_NANOS =
       new DateTimeFormatterBuilder()
           .appendPattern("uuuu-MM-dd HH:mm:ss")
           .appendFraction(
-              ChronoField.NANO_OF_SECOND,
-              MIN_FRACTION_SECONDS,
-              MAX_FRACTION_SECONDS,
-              true)
+              ChronoField.NANO_OF_SECOND, MIN_FRACTION_SECONDS, MAX_FRACTION_SECONDS, true)
           .toFormatter(Locale.ROOT)
           .withResolverStyle(ResolverStyle.STRICT);
 
@@ -126,13 +132,34 @@ public class DateTimeFormatters {
       new DateTimeFormatterBuilder()
           .appendPattern("[uuuu-MM-dd HH:mm:ss][uuuu-MM-dd HH:mm][HH:mm:ss][HH:mm][uuuu-MM-dd]")
           .appendFraction(
-              ChronoField.NANO_OF_SECOND,
-              MIN_FRACTION_SECONDS,
-              MAX_FRACTION_SECONDS,
-              true)
+              ChronoField.NANO_OF_SECOND, MIN_FRACTION_SECONDS, MAX_FRACTION_SECONDS, true)
           .toFormatter(Locale.ROOT)
           .withResolverStyle(ResolverStyle.STRICT);
 
+  // MDD
+  public static final DateTimeFormatter DATE_FORMATTER_SINGLE_DIGIT_MONTH =
+      new DateTimeFormatterBuilder()
+          .parseDefaulting(YEAR, 2000)
+          .appendPattern("Mdd")
+          .toFormatter()
+          .withResolverStyle(ResolverStyle.STRICT);
+
+  // MMDD
+  public static final DateTimeFormatter DATE_FORMATTER_NO_YEAR =
+      new DateTimeFormatterBuilder()
+          .parseDefaulting(YEAR, 2000)
+          .appendPattern("MMdd")
+          .toFormatter()
+          .withResolverStyle(ResolverStyle.STRICT);
+
+  // YMMDD
+  public static final DateTimeFormatter DATE_FORMATTER_SINGLE_DIGIT_YEAR =
+      new DateTimeFormatterBuilder()
+          .appendValueReduced(YEAR, 1, 1, 2000)
+          .appendPattern("MMdd")
+          .toFormatter()
+          .withResolverStyle(ResolverStyle.STRICT);
+
   // YYMMDD
   public static final DateTimeFormatter DATE_FORMATTER_SHORT_YEAR =
       new DateTimeFormatterBuilder()
@@ -160,14 +187,23 @@ public class DateTimeFormatters {
   // YYYYMMDDhhmmss
   public static final DateTimeFormatter DATE_TIME_FORMATTER_LONG_YEAR =
       new DateTimeFormatterBuilder()
-          .appendValue(YEAR,4)
+          .appendValue(YEAR, 4)
           .appendPattern("MMddHHmmss")
           .toFormatter()
           .withResolverStyle(ResolverStyle.STRICT);
 
+  // uuuu-MM-dd HH:mm:ss[xxx]
   public static final DateTimeFormatter DATE_TIME_FORMATTER_STRICT_WITH_TZ =
       new DateTimeFormatterBuilder()
           .appendPattern("uuuu-MM-dd HH:mm:ss[xxx]")
           .toFormatter()
           .withResolverStyle(ResolverStyle.STRICT);
+
+  // uuuu-MM-dd HH:mm:ss[xxx]
+  public static final DateTimeFormatter DATE_TIME_FORMATTER_WITH_TZ =
+      new DateTimeFormatterBuilder()
+          .appendPattern("uuuu-MM-dd HH:mm:ss[xxx]")
+          .appendFraction(
+              ChronoField.NANO_OF_SECOND, MIN_FRACTION_SECONDS, MAX_FRACTION_SECONDS, true)
+          .toFormatter();
 }
diff --git a/core/src/main/java/org/opensearch/sql/utils/DateTimeUtils.java b/core/src/main/java/org/opensearch/sql/utils/DateTimeUtils.java
index 5a99af3f83..593b4c4471 100644
--- a/core/src/main/java/org/opensearch/sql/utils/DateTimeUtils.java
+++ b/core/src/main/java/org/opensearch/sql/utils/DateTimeUtils.java
@@ -6,10 +6,14 @@
 package org.opensearch.sql.utils;
 
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import lombok.experimental.UtilityClass;
+import org.opensearch.sql.data.model.ExprTimeValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.function.FunctionProperties;
 
 @UtilityClass
 public class DateTimeUtils {
@@ -17,9 +21,9 @@ public class DateTimeUtils {
   /**
    * Util method to round the date/time with given unit.
    *
-   * @param utcMillis     Date/time value to round, given in utc millis
-   * @param unitMillis    Date/time interval unit in utc millis
-   * @return              Rounded date/time value in utc millis
+   * @param utcMillis Date/time value to round, given in utc millis
+   * @param unitMillis Date/time interval unit in utc millis
+   * @return Rounded date/time value in utc millis
    */
   public static long roundFloor(long utcMillis, long unitMillis) {
     return utcMillis - utcMillis % unitMillis;
@@ -28,9 +32,9 @@ public static long roundFloor(long utcMillis, long unitMillis) {
   /**
    * Util method to round the date/time in week(s).
    *
-   * @param utcMillis     Date/time value to round, given in utc millis
-   * @param interval      Number of weeks as the rounding interval
-   * @return              Rounded date/time value in utc millis
+   * @param utcMillis Date/time value to round, given in utc millis
+   * @param interval Number of weeks as the rounding interval
+   * @return Rounded date/time value in utc millis
    */
   public static long roundWeek(long utcMillis, int interval) {
     return roundFloor(utcMillis + 259200000L, 604800000L * interval) - 259200000L;
@@ -39,16 +43,18 @@ public static long roundWeek(long utcMillis, int interval) {
   /**
    * Util method to round the date/time in month(s).
    *
-   * @param utcMillis     Date/time value to round, given in utc millis
-   * @param interval      Number of months as the rounding interval
-   * @return              Rounded date/time value in utc millis
+   * @param utcMillis Date/time value to round, given in utc millis
+   * @param interval Number of months as the rounding interval
+   * @return Rounded date/time value in utc millis
    */
   public static long roundMonth(long utcMillis, int interval) {
-    ZonedDateTime initDateTime = ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC"));
-    ZonedDateTime zonedDateTime = Instant.ofEpochMilli(utcMillis).atZone(ZoneId.of("UTC"))
-        .plusMonths(interval);
-    long monthDiff = (zonedDateTime.getYear() - initDateTime.getYear()) * 12L + zonedDateTime
-        .getMonthValue() - initDateTime.getMonthValue();
+    ZonedDateTime initDateTime = ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, UTC_ZONE_ID);
+    ZonedDateTime zonedDateTime =
+        Instant.ofEpochMilli(utcMillis).atZone(UTC_ZONE_ID).plusMonths(interval);
+    long monthDiff =
+        (zonedDateTime.getYear() - initDateTime.getYear()) * 12L
+            + zonedDateTime.getMonthValue()
+            - initDateTime.getMonthValue();
     long monthToAdd = (monthDiff / interval - 1) * interval;
     return initDateTime.plusMonths(monthToAdd).toInstant().toEpochMilli();
   }
@@ -56,16 +62,18 @@ public static long roundMonth(long utcMillis, int interval) {
   /**
    * Util method to round the date/time in quarter(s).
    *
-   * @param utcMillis     Date/time value to round, given in utc millis
-   * @param interval      Number of quarters as the rounding interval
-   * @return              Rounded date/time value in utc millis
+   * @param utcMillis Date/time value to round, given in utc millis
+   * @param interval Number of quarters as the rounding interval
+   * @return Rounded date/time value in utc millis
    */
   public static long roundQuarter(long utcMillis, int interval) {
-    ZonedDateTime initDateTime = ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC"));
-    ZonedDateTime zonedDateTime = Instant.ofEpochMilli(utcMillis).atZone(ZoneId.of("UTC"))
-        .plusMonths(interval * 3L);
-    long monthDiff = ((zonedDateTime.getYear() - initDateTime.getYear()) * 12L + zonedDateTime
-        .getMonthValue() - initDateTime.getMonthValue());
+    ZonedDateTime initDateTime = ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, UTC_ZONE_ID);
+    ZonedDateTime zonedDateTime =
+        Instant.ofEpochMilli(utcMillis).atZone(UTC_ZONE_ID).plusMonths(interval * 3L);
+    long monthDiff =
+        ((zonedDateTime.getYear() - initDateTime.getYear()) * 12L
+            + zonedDateTime.getMonthValue()
+            - initDateTime.getMonthValue());
     long monthToAdd = (monthDiff / (interval * 3L) - 1) * interval * 3;
     return initDateTime.plusMonths(monthToAdd).toInstant().toEpochMilli();
   }
@@ -73,13 +81,13 @@ public static long roundQuarter(long utcMillis, int interval) {
   /**
    * Util method to round the date/time in year(s).
    *
-   * @param utcMillis     Date/time value to round, given in utc millis
-   * @param interval      Number of years as the rounding interval
-   * @return              Rounded date/time value in utc millis
+   * @param utcMillis Date/time value to round, given in utc millis
+   * @param interval Number of years as the rounding interval
+   * @return Rounded date/time value in utc millis
    */
   public static long roundYear(long utcMillis, int interval) {
-    ZonedDateTime initDateTime = ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC"));
-    ZonedDateTime zonedDateTime = Instant.ofEpochMilli(utcMillis).atZone(ZoneId.of("UTC"));
+    ZonedDateTime initDateTime = ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, UTC_ZONE_ID);
+    ZonedDateTime zonedDateTime = Instant.ofEpochMilli(utcMillis).atZone(UTC_ZONE_ID);
     int yearDiff = zonedDateTime.getYear() - initDateTime.getYear();
     int yearToAdd = (yearDiff / interval) * interval;
     return initDateTime.plusYears(yearToAdd).toInstant().toEpochMilli();
@@ -120,9 +128,29 @@ public Boolean isValidMySqlTimeZoneId(ZoneId zone) {
     ZonedDateTime passedTzValidator =
         defaultDateTime.withZoneSameInstant(zone).withZoneSameLocal(defaultTz);
 
-    return (passedTzValidator.isBefore(maxTzValidator)
-        || passedTzValidator.isEqual(maxTzValidator))
-        && (passedTzValidator.isAfter(minTzValidator)
-        || passedTzValidator.isEqual(minTzValidator));
+    return (passedTzValidator.isBefore(maxTzValidator) || passedTzValidator.isEqual(maxTzValidator))
+        && (passedTzValidator.isAfter(minTzValidator) || passedTzValidator.isEqual(minTzValidator));
   }
+
+  /**
+   * Extracts LocalDateTime from a datetime ExprValue. Uses `FunctionProperties` for
+   * `ExprTimeValue`.
+   */
+  public static LocalDateTime extractDateTime(
+      ExprValue value, FunctionProperties functionProperties) {
+    return value instanceof ExprTimeValue
+        ? ((ExprTimeValue) value).datetimeValue(functionProperties)
+        : value.datetimeValue();
+  }
+
+  /**
+   * Extracts LocalDate from a datetime ExprValue. Uses `FunctionProperties` for `ExprTimeValue`.
+   */
+  public static LocalDate extractDate(ExprValue value, FunctionProperties functionProperties) {
+    return value instanceof ExprTimeValue
+        ? ((ExprTimeValue) value).dateValue(functionProperties)
+        : value.dateValue();
+  }
+
+  public static final ZoneId UTC_ZONE_ID = ZoneId.of("UTC");
 }
diff --git a/core/src/main/java/org/opensearch/sql/utils/ExpressionUtils.java b/core/src/main/java/org/opensearch/sql/utils/ExpressionUtils.java
index e8324af5f4..f04bf3748f 100644
--- a/core/src/main/java/org/opensearch/sql/utils/ExpressionUtils.java
+++ b/core/src/main/java/org/opensearch/sql/utils/ExpressionUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.utils;
 
 import java.util.List;
@@ -11,17 +10,13 @@
 import lombok.experimental.UtilityClass;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Utils for {@link Expression}.
- */
+/** Utils for {@link Expression}. */
 @UtilityClass
 public class ExpressionUtils {
 
   public static String PATH_SEP = ".";
 
-  /**
-   * Format the list of {@link Expression}.
-   */
+  /** Format the list of {@link Expression}. */
   public static String format(List<Expression> expressionList) {
     return expressionList.stream().map(Expression::toString).collect(Collectors.joining(","));
   }
diff --git a/core/src/main/java/org/opensearch/sql/utils/OperatorUtils.java b/core/src/main/java/org/opensearch/sql/utils/OperatorUtils.java
index f4ece6a190..d9ae0b4258 100644
--- a/core/src/main/java/org/opensearch/sql/utils/OperatorUtils.java
+++ b/core/src/main/java/org/opensearch/sql/utils/OperatorUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.utils;
 
 import java.util.regex.Pattern;
@@ -15,9 +14,10 @@
 @UtilityClass
 public class OperatorUtils {
   /**
-   * Wildcard pattern matcher util.
-   * Percent (%) character for wildcard,
+   * Wildcard pattern matcher util.<br>
+   * Percent (%) character for wildcard,<br>
    * Underscore (_) character for a single character match.
+   *
    * @param pattern string pattern to match.
    * @return if text matches pattern returns true; else return false.
    */
@@ -30,12 +30,13 @@ public static ExprBooleanValue matches(ExprValue text, ExprValue pattern) {
 
   /**
    * Checks if text matches regular expression pattern.
+   *
    * @param pattern string pattern to match.
    * @return if text matches pattern returns true; else return false.
    */
   public static ExprIntegerValue matchesRegexp(ExprValue text, ExprValue pattern) {
-    return new ExprIntegerValue(Pattern.compile(pattern.stringValue()).matcher(text.stringValue())
-                    .matches() ? 1 : 0);
+    return new ExprIntegerValue(
+        Pattern.compile(pattern.stringValue()).matcher(text.stringValue()).matches() ? 1 : 0);
   }
 
   private static final char DEFAULT_ESCAPE = '\\';
diff --git a/core/src/main/java/org/opensearch/sql/utils/ParseUtils.java b/core/src/main/java/org/opensearch/sql/utils/ParseUtils.java
index 6c640482d0..e659cfdf50 100644
--- a/core/src/main/java/org/opensearch/sql/utils/ParseUtils.java
+++ b/core/src/main/java/org/opensearch/sql/utils/ParseUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.utils;
 
 import com.google.common.collect.ImmutableMap;
@@ -18,30 +17,27 @@
 import org.opensearch.sql.expression.parse.PatternsExpression;
 import org.opensearch.sql.expression.parse.RegexExpression;
 
-/**
- * Utils for {@link ParseExpression}.
- */
+/** Utils for {@link ParseExpression}. */
 @UtilityClass
 public class ParseUtils {
   private static final String NEW_FIELD_KEY = "new_field";
-  private static final Map<ParseMethod, ParseExpressionFactory> FACTORY_MAP = ImmutableMap.of(
-      ParseMethod.REGEX, RegexExpression::new,
-      ParseMethod.GROK, GrokExpression::new,
-      ParseMethod.PATTERNS, PatternsExpression::new
-  );
+  private static final Map<ParseMethod, ParseExpressionFactory> FACTORY_MAP =
+      ImmutableMap.of(
+          ParseMethod.REGEX, RegexExpression::new,
+          ParseMethod.GROK, GrokExpression::new,
+          ParseMethod.PATTERNS, PatternsExpression::new);
 
   /**
    * Construct corresponding ParseExpression by {@link ParseMethod}.
    *
    * @param parseMethod method used to parse
    * @param sourceField source text field
-   * @param pattern     pattern used for parsing
-   * @param identifier  derived field
+   * @param pattern pattern used for parsing
+   * @param identifier derived field
    * @return {@link ParseExpression}
    */
-  public static ParseExpression createParseExpression(ParseMethod parseMethod,
-                                                      Expression sourceField, Expression pattern,
-                                                      Expression identifier) {
+  public static ParseExpression createParseExpression(
+      ParseMethod parseMethod, Expression sourceField, Expression pattern, Expression identifier) {
     return FACTORY_MAP.get(parseMethod).initialize(sourceField, pattern, identifier);
   }
 
@@ -51,21 +47,23 @@ public static ParseExpression createParseExpression(ParseMethod parseMethod,
    * @param pattern pattern used for parsing
    * @return list of names of the derived fields
    */
-  public static List<String> getNamedGroupCandidates(ParseMethod parseMethod, String pattern,
-                                                     Map<String, Literal> arguments) {
+  public static List<String> getNamedGroupCandidates(
+      ParseMethod parseMethod, String pattern, Map<String, Literal> arguments) {
     switch (parseMethod) {
       case REGEX:
         return RegexExpression.getNamedGroupCandidates(pattern);
       case GROK:
         return GrokExpression.getNamedGroupCandidates(pattern);
       default:
-        return PatternsExpression.getNamedGroupCandidates(arguments.containsKey(NEW_FIELD_KEY)
-            ? (String) arguments.get(NEW_FIELD_KEY).getValue() : null);
+        return PatternsExpression.getNamedGroupCandidates(
+            arguments.containsKey(NEW_FIELD_KEY)
+                ? (String) arguments.get(NEW_FIELD_KEY).getValue()
+                : null);
     }
   }
 
   private interface ParseExpressionFactory {
-    ParseExpression initialize(Expression sourceField, Expression expression,
-                               Expression identifier);
+    ParseExpression initialize(
+        Expression sourceField, Expression expression, Expression identifier);
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/utils/SerializeUtils.java b/core/src/main/java/org/opensearch/sql/utils/SerializeUtils.java
new file mode 100644
index 0000000000..3e30bdc563
--- /dev/null
+++ b/core/src/main/java/org/opensearch/sql/utils/SerializeUtils.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.utils;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import java.lang.reflect.Type;
+import lombok.experimental.UtilityClass;
+import org.opensearch.sql.datasource.model.DataSourceType;
+
+@UtilityClass
+public class SerializeUtils {
+  private static class DataSourceTypeSerializer implements JsonSerializer<DataSourceType> {
+    @Override
+    public JsonElement serialize(
+        DataSourceType dataSourceType,
+        Type type,
+        JsonSerializationContext jsonSerializationContext) {
+      return new JsonPrimitive(dataSourceType.name());
+    }
+  }
+
+  private static class DataSourceTypeDeserializer implements JsonDeserializer<DataSourceType> {
+    @Override
+    public DataSourceType deserialize(
+        JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext)
+        throws JsonParseException {
+      return DataSourceType.fromString(jsonElement.getAsString());
+    }
+  }
+
+  public static GsonBuilder getGsonBuilder() {
+    return new GsonBuilder()
+        .registerTypeAdapter(DataSourceType.class, new DataSourceTypeSerializer())
+        .registerTypeAdapter(DataSourceType.class, new DataSourceTypeDeserializer());
+  }
+
+  public static Gson buildGson() {
+    return getGsonBuilder().create();
+  }
+}
diff --git a/core/src/main/java/org/opensearch/sql/utils/SystemIndexUtils.java b/core/src/main/java/org/opensearch/sql/utils/SystemIndexUtils.java
index 5325ea371a..38d2753f6c 100644
--- a/core/src/main/java/org/opensearch/sql/utils/SystemIndexUtils.java
+++ b/core/src/main/java/org/opensearch/sql/utils/SystemIndexUtils.java
@@ -3,44 +3,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.utils;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.UtilityClass;
 
-/**
- * System Index Utils.
- * Todo. Find the better name for this class.
- */
+/** System Index Utils. Todo. Find the better name for this class. */
 @UtilityClass
 public class SystemIndexUtils {
 
   public static final String TABLE_NAME_FOR_TABLES_INFO = "tables";
-  /**
-   * The suffix of all the system tables.
-   */
+
+  /** The suffix of all the system tables. */
   private static final String SYS_TABLES_SUFFIX = "ODFE_SYS_TABLE";
 
-  /**
-   * The suffix of all the meta tables.
-   */
+  /** The suffix of all the meta tables. */
   private static final String SYS_META_SUFFIX = "META_" + SYS_TABLES_SUFFIX;
 
-  /**
-   * The suffix of all the table mappings.
-   */
-  private static final String SYS_MAPPINGS_SUFFIX =  "MAPPINGS_" + SYS_TABLES_SUFFIX;
+  /** The suffix of all the table mappings. */
+  private static final String SYS_MAPPINGS_SUFFIX = "MAPPINGS_" + SYS_TABLES_SUFFIX;
 
-  /**
-   * The ALL.META_ODFE_SYS_TABLE contain all the table info.
-   */
+  /** The ALL.META_ODFE_SYS_TABLE contain all the table info. */
   public static final String TABLE_INFO = "ALL." + SYS_META_SUFFIX;
 
   public static final String DATASOURCES_TABLE_NAME = ".DATASOURCES";
 
-
   public static Boolean isSystemIndex(String indexName) {
     return indexName.endsWith(SYS_TABLES_SUFFIX);
   }
@@ -62,8 +50,7 @@ public static String mappingTable(String indexName) {
   public static SystemTable systemTable(String indexName) {
     final int lastDot = indexName.lastIndexOf(".");
     String suffix = indexName.substring(lastDot + 1);
-    String tableName = indexName.substring(0, lastDot)
-        .replace("%", "*");
+    String tableName = indexName.substring(0, lastDot).replace("%", "*");
 
     if (suffix.equalsIgnoreCase(SYS_META_SUFFIX)) {
       return new SystemInfoTable(tableName);
@@ -74,9 +61,7 @@ public static SystemTable systemTable(String indexName) {
     }
   }
 
-  /**
-   * System Table.
-   */
+  /** System Table. */
   public interface SystemTable {
 
     String getTableName();
@@ -90,9 +75,7 @@ default boolean isMetaInfoTable() {
     }
   }
 
-  /**
-   * System Info Table.
-   */
+  /** System Info Table. */
   @Getter
   @RequiredArgsConstructor
   public static class SystemInfoTable implements SystemTable {
@@ -104,9 +87,7 @@ public boolean isSystemInfoTable() {
     }
   }
 
-  /**
-   * System Table.
-   */
+  /** System Table. */
   @Getter
   @RequiredArgsConstructor
   public static class MetaInfoTable implements SystemTable {
diff --git a/core/src/test/java/org/opensearch/sql/analysis/AnalysisContextTest.java b/core/src/test/java/org/opensearch/sql/analysis/AnalysisContextTest.java
index 0d643aa53f..b052fe47ce 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/AnalysisContextTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/AnalysisContextTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTest.java
index 044949ea35..2f4d6e8ada 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTest.java
@@ -3,14 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static java.util.Collections.emptyList;
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
+import static org.opensearch.sql.analysis.NestedAnalyzer.isNestedFunction;
 import static org.opensearch.sql.ast.dsl.AstDSL.aggregate;
 import static org.opensearch.sql.ast.dsl.AstDSL.alias;
 import static org.opensearch.sql.ast.dsl.AstDSL.argument;
@@ -21,6 +23,7 @@
 import static org.opensearch.sql.ast.dsl.AstDSL.filteredAggregate;
 import static org.opensearch.sql.ast.dsl.AstDSL.function;
 import static org.opensearch.sql.ast.dsl.AstDSL.intLiteral;
+import static org.opensearch.sql.ast.dsl.AstDSL.nestedAllTupleFields;
 import static org.opensearch.sql.ast.dsl.AstDSL.qualifiedName;
 import static org.opensearch.sql.ast.dsl.AstDSL.relation;
 import static org.opensearch.sql.ast.dsl.AstDSL.span;
@@ -31,12 +34,14 @@
 import static org.opensearch.sql.ast.tree.Sort.SortOption.DEFAULT_ASC;
 import static org.opensearch.sql.ast.tree.Sort.SortOrder;
 import static org.opensearch.sql.data.model.ExprValueUtils.integerValue;
+import static org.opensearch.sql.data.model.ExprValueUtils.stringValue;
 import static org.opensearch.sql.data.type.ExprCoreType.BOOLEAN;
 import static org.opensearch.sql.data.type.ExprCoreType.DOUBLE;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.LONG;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
+import static org.opensearch.sql.expression.DSL.literal;
 import static org.opensearch.sql.utils.MLCommonsConstants.ACTION;
 import static org.opensearch.sql.utils.MLCommonsConstants.ALGO;
 import static org.opensearch.sql.utils.MLCommonsConstants.ASYNC;
@@ -65,39 +70,43 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.DataType;
 import org.opensearch.sql.ast.expression.HighlightFunction;
 import org.opensearch.sql.ast.expression.Literal;
 import org.opensearch.sql.ast.expression.ParseMethod;
+import org.opensearch.sql.ast.expression.ScoreFunction;
 import org.opensearch.sql.ast.expression.SpanUnit;
 import org.opensearch.sql.ast.tree.AD;
+import org.opensearch.sql.ast.tree.CloseCursor;
+import org.opensearch.sql.ast.tree.FetchCursor;
 import org.opensearch.sql.ast.tree.Kmeans;
 import org.opensearch.sql.ast.tree.ML;
+import org.opensearch.sql.ast.tree.Paginate;
 import org.opensearch.sql.ast.tree.RareTopN.CommandType;
+import org.opensearch.sql.ast.tree.UnresolvedPlan;
+import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.HighlightExpression;
+import org.opensearch.sql.expression.NamedExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
+import org.opensearch.sql.expression.function.OpenSearchFunctions;
 import org.opensearch.sql.expression.window.WindowDefinition;
 import org.opensearch.sql.planner.logical.LogicalAD;
+import org.opensearch.sql.planner.logical.LogicalCloseCursor;
+import org.opensearch.sql.planner.logical.LogicalFetchCursor;
+import org.opensearch.sql.planner.logical.LogicalFilter;
 import org.opensearch.sql.planner.logical.LogicalMLCommons;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalPlanDSL;
 import org.opensearch.sql.planner.logical.LogicalProject;
 import org.opensearch.sql.planner.logical.LogicalRelation;
 import org.opensearch.sql.planner.physical.datasource.DataSourceTable;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {AnalyzerTest.class})
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+
 class AnalyzerTest extends AnalyzerTestBase {
 
   @Test
@@ -111,6 +120,48 @@ public void filter_relation() {
             AstDSL.equalTo(AstDSL.field("integer_value"), AstDSL.intLiteral(1))));
   }
 
+  @Test
+  public void filter_relation_with_reserved_qualifiedName() {
+    assertAnalyzeEqual(
+        LogicalPlanDSL.filter(
+            LogicalPlanDSL.relation("schema", table),
+            DSL.equal(DSL.ref("_test", STRING), DSL.literal(stringValue("value")))),
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            AstDSL.equalTo(AstDSL.qualifiedName("_test"), AstDSL.stringLiteral("value"))));
+  }
+
+  @Test
+  public void filter_relation_with_invalid_qualifiedName_SemanticCheckException() {
+    UnresolvedPlan invalidFieldPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            AstDSL.equalTo(AstDSL.qualifiedName("_invalid"), AstDSL.stringLiteral("value")));
+
+    SemanticCheckException exception =
+        assertThrows(SemanticCheckException.class, () -> analyze(invalidFieldPlan));
+    assertEquals(
+        "can't resolve Symbol(namespace=FIELD_NAME, name=_invalid) in type env",
+        exception.getMessage());
+  }
+
+  @Test
+  public void filter_relation_with_invalid_qualifiedName_ExpressionEvaluationException() {
+    UnresolvedPlan typeMismatchPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            AstDSL.equalTo(AstDSL.qualifiedName("_test"), AstDSL.intLiteral(1)));
+
+    ExpressionEvaluationException exception =
+        assertThrows(ExpressionEvaluationException.class, () -> analyze(typeMismatchPlan));
+    assertEquals(
+        "= function expected {[BYTE,BYTE],[SHORT,SHORT],[INTEGER,INTEGER],[LONG,LONG],"
+            + "[FLOAT,FLOAT],[DOUBLE,DOUBLE],[STRING,STRING],[BOOLEAN,BOOLEAN],[DATE,DATE],"
+            + "[TIME,TIME],[DATETIME,DATETIME],[TIMESTAMP,TIMESTAMP],[INTERVAL,INTERVAL],"
+            + "[STRUCT,STRUCT],[ARRAY,ARRAY]}, but get [STRING,INTEGER]",
+        exception.getMessage());
+  }
+
   @Test
   public void filter_relation_with_alias() {
     assertAnalyzeEqual(
@@ -207,8 +258,8 @@ public void filter_relation_with_non_existing_datasource_with_three_parts() {
             LogicalPlanDSL.relation("test.nonexisting_schema.http_total_requests", table),
             DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(1)))),
         AstDSL.filter(
-            AstDSL.relation(AstDSL.qualifiedName("test",
-                "nonexisting_schema", "http_total_requests")),
+            AstDSL.relation(
+                AstDSL.qualifiedName("test", "nonexisting_schema", "http_total_requests")),
             AstDSL.equalTo(AstDSL.field("integer_value"), AstDSL.intLiteral(1))));
   }
 
@@ -223,11 +274,108 @@ public void filter_relation_with_multiple_tables() {
             AstDSL.equalTo(AstDSL.field("integer_value"), AstDSL.intLiteral(1))));
   }
 
+  @Test
+  public void analyze_filter_visit_score_function() {
+    UnresolvedPlan unresolvedPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            new ScoreFunction(
+                AstDSL.function(
+                    "match_phrase_prefix",
+                    AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
+                    AstDSL.unresolvedArg("query", stringLiteral("search query")),
+                    AstDSL.unresolvedArg("boost", stringLiteral("3"))),
+                AstDSL.doubleLiteral(1.0)));
+    assertAnalyzeEqual(
+        LogicalPlanDSL.filter(
+            LogicalPlanDSL.relation("schema", table),
+            DSL.match_phrase_prefix(
+                DSL.namedArgument("field", "field_value1"),
+                DSL.namedArgument("query", "search query"),
+                DSL.namedArgument("boost", "3.0"))),
+        unresolvedPlan);
+
+    LogicalPlan logicalPlan = analyze(unresolvedPlan);
+    OpenSearchFunctions.OpenSearchFunction relevanceQuery =
+        (OpenSearchFunctions.OpenSearchFunction) ((LogicalFilter) logicalPlan).getCondition();
+    assertEquals(true, relevanceQuery.isScoreTracked());
+  }
+
+  @Test
+  public void analyze_filter_visit_without_score_function() {
+    UnresolvedPlan unresolvedPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            AstDSL.function(
+                "match_phrase_prefix",
+                AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
+                AstDSL.unresolvedArg("query", stringLiteral("search query")),
+                AstDSL.unresolvedArg("boost", stringLiteral("3"))));
+    assertAnalyzeEqual(
+        LogicalPlanDSL.filter(
+            LogicalPlanDSL.relation("schema", table),
+            DSL.match_phrase_prefix(
+                DSL.namedArgument("field", "field_value1"),
+                DSL.namedArgument("query", "search query"),
+                DSL.namedArgument("boost", "3"))),
+        unresolvedPlan);
+
+    LogicalPlan logicalPlan = analyze(unresolvedPlan);
+    OpenSearchFunctions.OpenSearchFunction relevanceQuery =
+        (OpenSearchFunctions.OpenSearchFunction) ((LogicalFilter) logicalPlan).getCondition();
+    assertEquals(false, relevanceQuery.isScoreTracked());
+  }
+
+  @Test
+  public void analyze_filter_visit_score_function_with_double_boost() {
+    UnresolvedPlan unresolvedPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            new ScoreFunction(
+                AstDSL.function(
+                    "match_phrase_prefix",
+                    AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
+                    AstDSL.unresolvedArg("query", stringLiteral("search query")),
+                    AstDSL.unresolvedArg("slop", stringLiteral("3"))),
+                new Literal(3.0, DataType.DOUBLE)));
+
+    assertAnalyzeEqual(
+        LogicalPlanDSL.filter(
+            LogicalPlanDSL.relation("schema", table),
+            DSL.match_phrase_prefix(
+                DSL.namedArgument("field", "field_value1"),
+                DSL.namedArgument("query", "search query"),
+                DSL.namedArgument("slop", "3"),
+                DSL.namedArgument("boost", "3.0"))),
+        unresolvedPlan);
+
+    LogicalPlan logicalPlan = analyze(unresolvedPlan);
+    OpenSearchFunctions.OpenSearchFunction relevanceQuery =
+        (OpenSearchFunctions.OpenSearchFunction) ((LogicalFilter) logicalPlan).getCondition();
+    assertEquals(true, relevanceQuery.isScoreTracked());
+  }
+
+  @Test
+  public void analyze_filter_visit_score_function_with_unsupported_boost_SemanticCheckException() {
+    UnresolvedPlan unresolvedPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            new ScoreFunction(
+                AstDSL.function(
+                    "match_phrase_prefix",
+                    AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
+                    AstDSL.unresolvedArg("query", stringLiteral("search query")),
+                    AstDSL.unresolvedArg("boost", stringLiteral("3"))),
+                AstDSL.stringLiteral("3.0")));
+    SemanticCheckException exception =
+        assertThrows(SemanticCheckException.class, () -> analyze(unresolvedPlan));
+    assertEquals("Expected boost type 'DOUBLE' but got 'STRING'", exception.getMessage());
+  }
+
   @Test
   public void head_relation() {
     assertAnalyzeEqual(
-        LogicalPlanDSL.limit(LogicalPlanDSL.relation("schema", table),
-            10, 0),
+        LogicalPlanDSL.limit(LogicalPlanDSL.relation("schema", table), 10, 0),
         AstDSL.head(AstDSL.relation("schema"), 10, 0));
   }
 
@@ -250,7 +398,7 @@ public void analyze_filter_aggregation_relation() {
                     DSL.named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER))),
                     DSL.named("MIN(integer_value)", DSL.min(DSL.ref("integer_value", INTEGER)))),
                 ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING)))),
-            DSL.greater(// Expect to be replaced with reference by expression optimizer
+            DSL.greater( // Expect to be replaced with reference by expression optimizer
                 DSL.ref("MIN(integer_value)", INTEGER), DSL.literal(integerValue(10)))),
         AstDSL.filter(
             AstDSL.agg(
@@ -261,8 +409,7 @@ public void analyze_filter_aggregation_relation() {
                 emptyList(),
                 ImmutableList.of(alias("string_value", qualifiedName("string_value"))),
                 emptyList()),
-            compare(">",
-                aggregate("MIN", qualifiedName("integer_value")), intLiteral(10))));
+            compare(">", aggregate("MIN", qualifiedName("integer_value")), intLiteral(10))));
   }
 
   @Test
@@ -281,19 +428,16 @@ public void stats_source() {
     assertAnalyzeEqual(
         LogicalPlanDSL.aggregation(
             LogicalPlanDSL.relation("schema", table),
-            ImmutableList
-                .of(DSL.named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+            ImmutableList.of(
+                DSL.named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
             ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING)))),
         AstDSL.agg(
             AstDSL.relation("schema"),
             AstDSL.exprList(
                 AstDSL.alias(
-                    "avg(integer_value)",
-                    AstDSL.aggregate("avg", field("integer_value")))
-            ),
+                    "avg(integer_value)", AstDSL.aggregate("avg", field("integer_value")))),
             null,
-            ImmutableList.of(
-                AstDSL.alias("string_value", field("string_value"))),
+            ImmutableList.of(AstDSL.alias("string_value", field("string_value"))),
             AstDSL.defaultStatsArgs()));
   }
 
@@ -305,16 +449,13 @@ public void rare_source() {
             CommandType.RARE,
             10,
             ImmutableList.of(DSL.ref("string_value", STRING)),
-            DSL.ref("integer_value", INTEGER)
-        ),
+            DSL.ref("integer_value", INTEGER)),
         AstDSL.rareTopN(
             AstDSL.relation("schema"),
             CommandType.RARE,
             ImmutableList.of(argument("noOfResults", intLiteral(10))),
             ImmutableList.of(field("string_value")),
-            field("integer_value")
-        )
-    );
+            field("integer_value")));
   }
 
   @Test
@@ -325,16 +466,13 @@ public void top_source() {
             CommandType.TOP,
             5,
             ImmutableList.of(DSL.ref("string_value", STRING)),
-            DSL.ref("integer_value", INTEGER)
-        ),
+            DSL.ref("integer_value", INTEGER)),
         AstDSL.rareTopN(
             AstDSL.relation("schema"),
             CommandType.TOP,
             ImmutableList.of(argument("noOfResults", intLiteral(5))),
             ImmutableList.of(field("string_value")),
-            field("integer_value")
-        )
-    );
+            field("integer_value")));
   }
 
   @Test
@@ -348,8 +486,9 @@ public void rename_to_invalid_expression() {
                         AstDSL.agg(
                             AstDSL.relation("schema"),
                             AstDSL.exprList(
-                                AstDSL.alias("avg(integer_value)", AstDSL.aggregate("avg", field(
-                                    "integer_value")))),
+                                AstDSL.alias(
+                                    "avg(integer_value)",
+                                    AstDSL.aggregate("avg", field("integer_value")))),
                             Collections.emptyList(),
                             ImmutableList.of(),
                             AstDSL.defaultStatsArgs()),
@@ -367,8 +506,7 @@ public void project_source() {
         LogicalPlanDSL.project(
             LogicalPlanDSL.relation("schema", table),
             DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-            DSL.named("double_value", DSL.ref("double_value", DOUBLE))
-        ),
+            DSL.named("double_value", DSL.ref("double_value", DOUBLE))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
@@ -376,6 +514,340 @@ public void project_source() {
             AstDSL.alias("double_value", AstDSL.field("double_value"))));
   }
 
+  @Test
+  public void project_nested_field_arg() {
+    List<Map<String, ReferenceExpression>> nestedArgs =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression(
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING)), null));
+
+    assertAnalyzeEqual(
+        LogicalPlanDSL.project(
+            LogicalPlanDSL.nested(
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING)))),
+        AstDSL.projectWithArg(
+            AstDSL.relation("schema"),
+            AstDSL.defaultFieldsArgs(),
+            AstDSL.alias(
+                "nested(message.info)",
+                function("nested", qualifiedName("message", "info")),
+                null)));
+
+    assertTrue(isNestedFunction(DSL.nested(DSL.ref("message.info", STRING))));
+    assertFalse(isNestedFunction(DSL.literal("fieldA")));
+    assertFalse(isNestedFunction(DSL.match(DSL.namedArgument("field", literal("message")))));
+  }
+
+  @Test
+  public void sort_with_nested_all_tuple_fields_throws_exception() {
+    assertThrows(
+        UnsupportedOperationException.class,
+        () ->
+            analyze(
+                AstDSL.project(
+                    AstDSL.sort(AstDSL.relation("schema"), field(nestedAllTupleFields("message"))),
+                    AstDSL.alias("nested(message.*)", nestedAllTupleFields("message")))));
+  }
+
+  @Test
+  public void filter_with_nested_all_tuple_fields_throws_exception() {
+    assertThrows(
+        UnsupportedOperationException.class,
+        () ->
+            analyze(
+                AstDSL.project(
+                    AstDSL.filter(
+                        AstDSL.relation("schema"),
+                        AstDSL.function(
+                            "=", nestedAllTupleFields("message"), AstDSL.intLiteral(1))),
+                    AstDSL.alias("nested(message.*)", nestedAllTupleFields("message")))));
+  }
+
+  @Test
+  public void project_nested_field_star_arg() {
+    List<Map<String, ReferenceExpression>> nestedArgs =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression(
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))));
+
+    assertAnalyzeEqual(
+        LogicalPlanDSL.project(
+            LogicalPlanDSL.nested(
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING)))),
+        AstDSL.projectWithArg(
+            AstDSL.relation("schema"),
+            AstDSL.defaultFieldsArgs(),
+            AstDSL.alias("nested(message.*)", nestedAllTupleFields("message"))));
+  }
+
+  @Test
+  public void project_nested_field_star_arg_with_another_nested_function() {
+    List<Map<String, ReferenceExpression>> nestedArgs =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)),
+            Map.of(
+                "field", new ReferenceExpression("comment.data", STRING),
+                "path", new ReferenceExpression("comment", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression(
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            new NamedExpression(
+                "nested(comment.data)", DSL.nested(DSL.ref("comment.data", STRING))));
+
+    assertAnalyzeEqual(
+        LogicalPlanDSL.project(
+            LogicalPlanDSL.nested(
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            DSL.named("nested(comment.data)", DSL.nested(DSL.ref("comment.data", STRING)))),
+        AstDSL.projectWithArg(
+            AstDSL.relation("schema"),
+            AstDSL.defaultFieldsArgs(),
+            AstDSL.alias("nested(message.*)", nestedAllTupleFields("message")),
+            AstDSL.alias("nested(comment.*)", nestedAllTupleFields("comment"))));
+  }
+
+  @Test
+  public void project_nested_field_star_arg_with_another_field() {
+    List<Map<String, ReferenceExpression>> nestedArgs =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression(
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            new NamedExpression("comment.data", DSL.ref("comment.data", STRING)));
+
+    assertAnalyzeEqual(
+        LogicalPlanDSL.project(
+            LogicalPlanDSL.nested(
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            DSL.named("comment.data", DSL.ref("comment.data", STRING))),
+        AstDSL.projectWithArg(
+            AstDSL.relation("schema"),
+            AstDSL.defaultFieldsArgs(),
+            AstDSL.alias("nested(message.*)", nestedAllTupleFields("message")),
+            AstDSL.alias("comment.data", field("comment.data"))));
+  }
+
+  @Test
+  public void project_nested_field_star_arg_with_highlight() {
+    List<Map<String, ReferenceExpression>> nestedArgs =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression(
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            DSL.named("highlight(fieldA)", new HighlightExpression(DSL.literal("fieldA"))));
+
+    Map<String, Literal> highlightArgs = new HashMap<>();
+
+    assertAnalyzeEqual(
+        LogicalPlanDSL.project(
+            LogicalPlanDSL.nested(
+                LogicalPlanDSL.highlight(
+                    LogicalPlanDSL.relation("schema", table), DSL.literal("fieldA"), highlightArgs),
+                nestedArgs,
+                projectList),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            DSL.named("highlight(fieldA)", new HighlightExpression(DSL.literal("fieldA")))),
+        AstDSL.projectWithArg(
+            AstDSL.relation("schema"),
+            AstDSL.defaultFieldsArgs(),
+            AstDSL.alias("nested(message.*)", nestedAllTupleFields("message")),
+            AstDSL.alias(
+                "highlight(fieldA)",
+                new HighlightFunction(AstDSL.stringLiteral("fieldA"), highlightArgs))));
+  }
+
+  @Test
+  public void project_nested_field_and_path_args() {
+    List<Map<String, ReferenceExpression>> nestedArgs =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression(
+                "nested(message.info)",
+                DSL.nested(DSL.ref("message.info", STRING), DSL.ref("message", STRING)),
+                null));
+
+    assertAnalyzeEqual(
+        LogicalPlanDSL.project(
+            LogicalPlanDSL.nested(
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named(
+                "nested(message.info)",
+                DSL.nested(DSL.ref("message.info", STRING), DSL.ref("message", STRING)))),
+        AstDSL.projectWithArg(
+            AstDSL.relation("schema"),
+            AstDSL.defaultFieldsArgs(),
+            AstDSL.alias(
+                "nested(message.info)",
+                function("nested", qualifiedName("message", "info"), qualifiedName("message")),
+                null)));
+  }
+
+  @Test
+  public void project_nested_deep_field_arg() {
+    List<Map<String, ReferenceExpression>> nestedArgs =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info.id", STRING),
+                "path", new ReferenceExpression("message.info", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression(
+                "nested(message.info.id)", DSL.nested(DSL.ref("message.info.id", STRING)), null));
+
+    assertAnalyzeEqual(
+        LogicalPlanDSL.project(
+            LogicalPlanDSL.nested(
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info.id)", DSL.nested(DSL.ref("message.info.id", STRING)))),
+        AstDSL.projectWithArg(
+            AstDSL.relation("schema"),
+            AstDSL.defaultFieldsArgs(),
+            AstDSL.alias(
+                "nested(message.info.id)",
+                function("nested", qualifiedName("message", "info", "id")),
+                null)));
+  }
+
+  @Test
+  public void project_multiple_nested() {
+    List<Map<String, ReferenceExpression>> nestedArgs =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)),
+            Map.of(
+                "field", new ReferenceExpression("comment.data", STRING),
+                "path", new ReferenceExpression("comment", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression(
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING)), null),
+            new NamedExpression(
+                "nested(comment.data)", DSL.nested(DSL.ref("comment.data", STRING)), null));
+
+    assertAnalyzeEqual(
+        LogicalPlanDSL.project(
+            LogicalPlanDSL.nested(
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            DSL.named("nested(comment.data)", DSL.nested(DSL.ref("comment.data", STRING)))),
+        AstDSL.projectWithArg(
+            AstDSL.relation("schema"),
+            AstDSL.defaultFieldsArgs(),
+            AstDSL.alias(
+                "nested(message.info)", function("nested", qualifiedName("message", "info")), null),
+            AstDSL.alias(
+                "nested(comment.data)",
+                function("nested", qualifiedName("comment", "data")),
+                null)));
+  }
+
+  @Test
+  public void project_nested_invalid_field_throws_exception() {
+    var exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.projectWithArg(
+                        AstDSL.relation("schema"),
+                        AstDSL.defaultFieldsArgs(),
+                        AstDSL.alias(
+                            "message", function("nested", qualifiedName("message")), null))));
+    assertEquals(exception.getMessage(), "Illegal nested field name: message");
+  }
+
+  @Test
+  public void project_nested_invalid_arg_type_throws_exception() {
+    var exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.projectWithArg(
+                        AstDSL.relation("schema"),
+                        AstDSL.defaultFieldsArgs(),
+                        AstDSL.alias(
+                            "message", function("nested", stringLiteral("message")), null))));
+    assertEquals(exception.getMessage(), "Illegal nested field name: message");
+  }
+
+  @Test
+  public void project_nested_no_args_throws_exception() {
+    var exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.projectWithArg(
+                        AstDSL.relation("schema"),
+                        AstDSL.defaultFieldsArgs(),
+                        AstDSL.alias("message", function("nested"), null))));
+    assertEquals(
+        exception.getMessage(),
+        "on nested object only allowed 2 parameters (field,path) or 1 parameter (field)");
+  }
+
+  @Test
+  public void project_nested_too_many_args_throws_exception() {
+    var exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.projectWithArg(
+                        AstDSL.relation("schema"),
+                        AstDSL.defaultFieldsArgs(),
+                        AstDSL.alias(
+                            "message",
+                            function(
+                                "nested",
+                                stringLiteral("message.info"),
+                                stringLiteral("message"),
+                                stringLiteral("message")),
+                            null))));
+    assertEquals(
+        exception.getMessage(),
+        "on nested object only allowed 2 parameters (field,path) or 1 parameter (field)");
+  }
+
   @Test
   public void project_highlight() {
     Map<String, Literal> args = new HashMap<>();
@@ -384,18 +856,17 @@ public void project_highlight() {
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
-            LogicalPlanDSL.highlight(LogicalPlanDSL.relation("schema", table),
-                DSL.literal("fieldA"), args),
-            DSL.named("highlight(fieldA, pre_tags='<mark>', post_tags='</mark>')",
-                new HighlightExpression(DSL.literal("fieldA")))
-        ),
+            LogicalPlanDSL.highlight(
+                LogicalPlanDSL.relation("schema", table), DSL.literal("fieldA"), args),
+            DSL.named(
+                "highlight(fieldA, pre_tags='<mark>', post_tags='</mark>')",
+                new HighlightExpression(DSL.literal("fieldA")))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("highlight(fieldA, pre_tags='<mark>', post_tags='</mark>')",
-                new HighlightFunction(AstDSL.stringLiteral("fieldA"), args))
-        )
-    );
+            AstDSL.alias(
+                "highlight(fieldA, pre_tags='<mark>', post_tags='</mark>')",
+                new HighlightFunction(AstDSL.stringLiteral("fieldA"), args))));
   }
 
   @Test
@@ -403,18 +874,13 @@ public void project_highlight_wildcard() {
     Map<String, Literal> args = new HashMap<>();
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
-            LogicalPlanDSL.highlight(LogicalPlanDSL.relation("schema", table),
-                DSL.literal("*"), args),
-            DSL.named("highlight(*)",
-                new HighlightExpression(DSL.literal("*")))
-        ),
+            LogicalPlanDSL.highlight(
+                LogicalPlanDSL.relation("schema", table), DSL.literal("*"), args),
+            DSL.named("highlight(*)", new HighlightExpression(DSL.literal("*")))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("highlight(*)",
-                new HighlightFunction(AstDSL.stringLiteral("*"), args))
-        )
-    );
+            AstDSL.alias("highlight(*)", new HighlightFunction(AstDSL.stringLiteral("*"), args))));
   }
 
   @Test
@@ -422,8 +888,8 @@ public void remove_source() {
     assertAnalyzeEqual(
         LogicalPlanDSL.remove(
             LogicalPlanDSL.relation("schema", table),
-            DSL.ref("integer_value", INTEGER), DSL.ref(
-                "double_value", DOUBLE)),
+            DSL.ref("integer_value", INTEGER),
+            DSL.ref("double_value", DOUBLE)),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             Collections.singletonList(argument("exclude", booleanLiteral(true))),
@@ -431,7 +897,8 @@ public void remove_source() {
             AstDSL.field("double_value")));
   }
 
-  @Disabled("the project/remove command should shrink the type env. Should be enabled once "
+  @Disabled(
+      "the project/remove command should shrink the type env. Should be enabled once "
           + "https://github.com/opensearch-project/sql/issues/917 is resolved")
   @Test
   public void project_source_change_type_env() {
@@ -457,15 +924,12 @@ public void project_values() {
             LogicalPlanDSL.values(ImmutableList.of(DSL.literal(123))),
             DSL.named("123", DSL.literal(123)),
             DSL.named("hello", DSL.literal("hello")),
-            DSL.named("false", DSL.literal(false))
-        ),
+            DSL.named("false", DSL.literal(false))),
         AstDSL.project(
             AstDSL.values(ImmutableList.of(AstDSL.intLiteral(123))),
             AstDSL.alias("123", AstDSL.intLiteral(123)),
             AstDSL.alias("hello", AstDSL.stringLiteral("hello")),
-            AstDSL.alias("false", AstDSL.booleanLiteral(false))
-        )
-    );
+            AstDSL.alias("false", AstDSL.booleanLiteral(false))));
   }
 
   @SuppressWarnings("unchecked")
@@ -478,8 +942,7 @@ public void sort_with_aggregator() {
                     LogicalPlanDSL.relation("test", table),
                     ImmutableList.of(
                         DSL.named(
-                            "avg(integer_value)",
-                            DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                            "avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
                     ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING)))),
                 // Aggregator in Sort AST node is replaced with reference by expression optimizer
                 Pair.of(SortOption.DEFAULT_ASC, DSL.ref("avg(integer_value)", DOUBLE))),
@@ -490,12 +953,10 @@ public void sort_with_aggregator() {
                     AstDSL.relation("test"),
                     ImmutableList.of(
                         AstDSL.alias(
-                            "avg(integer_value)",
-                            function("avg", qualifiedName("integer_value")))),
+                            "avg(integer_value)", function("avg", qualifiedName("integer_value")))),
                     emptyList(),
                     ImmutableList.of(AstDSL.alias("string_value", qualifiedName("string_value"))),
-                    emptyList()
-                ),
+                    emptyList()),
                 field(
                     function("avg", qualifiedName("integer_value")),
                     argument("asc", booleanLiteral(true)))),
@@ -507,40 +968,49 @@ public void sort_with_aggregator() {
   public void sort_with_options() {
     ImmutableMap<Argument[], SortOption> argOptions =
         ImmutableMap.<Argument[], SortOption>builder()
-            .put(new Argument[] {argument("asc", booleanLiteral(true))},
+            .put(
+                new Argument[] {argument("asc", booleanLiteral(true))},
                 new SortOption(SortOrder.ASC, NullOrder.NULL_FIRST))
-            .put(new Argument[] {argument("asc", booleanLiteral(false))},
+            .put(
+                new Argument[] {argument("asc", booleanLiteral(false))},
                 new SortOption(SortOrder.DESC, NullOrder.NULL_LAST))
-            .put(new Argument[] {
-                    argument("asc", booleanLiteral(true)),
-                    argument("nullFirst", booleanLiteral(true))},
+            .put(
+                new Argument[] {
+                  argument("asc", booleanLiteral(true)), argument("nullFirst", booleanLiteral(true))
+                },
                 new SortOption(SortOrder.ASC, NullOrder.NULL_FIRST))
-            .put(new Argument[] {
-                    argument("asc", booleanLiteral(true)),
-                    argument("nullFirst", booleanLiteral(false))},
+            .put(
+                new Argument[] {
+                  argument("asc", booleanLiteral(true)),
+                  argument("nullFirst", booleanLiteral(false))
+                },
                 new SortOption(SortOrder.ASC, NullOrder.NULL_LAST))
-            .put(new Argument[] {
-                    argument("asc", booleanLiteral(false)),
-                    argument("nullFirst", booleanLiteral(true))},
+            .put(
+                new Argument[] {
+                  argument("asc", booleanLiteral(false)),
+                  argument("nullFirst", booleanLiteral(true))
+                },
                 new SortOption(SortOrder.DESC, NullOrder.NULL_FIRST))
-            .put(new Argument[] {
-                    argument("asc", booleanLiteral(false)),
-                    argument("nullFirst", booleanLiteral(false))},
+            .put(
+                new Argument[] {
+                  argument("asc", booleanLiteral(false)),
+                  argument("nullFirst", booleanLiteral(false))
+                },
                 new SortOption(SortOrder.DESC, NullOrder.NULL_LAST))
             .build();
 
-    argOptions.forEach((args, expectOption) ->
-        assertAnalyzeEqual(
-            LogicalPlanDSL.project(
-                LogicalPlanDSL.sort(
-                    LogicalPlanDSL.relation("test", table),
-                    Pair.of(expectOption, DSL.ref("integer_value", INTEGER))),
-                DSL.named("string_value", DSL.ref("string_value", STRING))),
-            AstDSL.project(
-                AstDSL.sort(
-                    AstDSL.relation("test"),
-                    field(qualifiedName("integer_value"), args)),
-                AstDSL.alias("string_value", qualifiedName("string_value")))));
+    argOptions.forEach(
+        (args, expectOption) ->
+            assertAnalyzeEqual(
+                LogicalPlanDSL.project(
+                    LogicalPlanDSL.sort(
+                        LogicalPlanDSL.relation("test", table),
+                        Pair.of(expectOption, DSL.ref("integer_value", INTEGER))),
+                    DSL.named("string_value", DSL.ref("string_value", STRING))),
+                AstDSL.project(
+                    AstDSL.sort(
+                        AstDSL.relation("test"), field(qualifiedName("integer_value"), args)),
+                    AstDSL.alias("string_value", qualifiedName("string_value")))));
   }
 
   @SuppressWarnings("unchecked")
@@ -565,7 +1035,8 @@ public void window_function() {
         AstDSL.project(
             AstDSL.relation("test"),
             AstDSL.alias("string_value", AstDSL.qualifiedName("string_value")),
-            AstDSL.alias("window_function",
+            AstDSL.alias(
+                "window_function",
                 AstDSL.window(
                     AstDSL.function("row_number"),
                     Collections.singletonList(AstDSL.qualifiedName("string_value")),
@@ -573,11 +1044,7 @@ public void window_function() {
                         ImmutablePair.of(DEFAULT_ASC, AstDSL.qualifiedName("integer_value")))))));
   }
 
-  /**
-   * SELECT name FROM (
-   * SELECT name, age FROM test
-   * ) AS schema.
-   */
+  /** SELECT name FROM ( SELECT name, age FROM test ) AS schema. */
   @Test
   public void from_subquery() {
     assertAnalyzeEqual(
@@ -585,29 +1052,19 @@ public void from_subquery() {
             LogicalPlanDSL.project(
                 LogicalPlanDSL.relation("schema", table),
                 DSL.named("string_value", DSL.ref("string_value", STRING)),
-                DSL.named("integer_value", DSL.ref("integer_value", INTEGER))
-            ),
-            DSL.named("string_value", DSL.ref("string_value", STRING))
-        ),
+                DSL.named("integer_value", DSL.ref("integer_value", INTEGER))),
+            DSL.named("string_value", DSL.ref("string_value", STRING))),
         AstDSL.project(
             AstDSL.relationSubquery(
                 AstDSL.project(
                     AstDSL.relation("schema"),
                     AstDSL.alias("string_value", AstDSL.qualifiedName("string_value")),
-                    AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"))
-                ),
-                "schema"
-            ),
-            AstDSL.alias("string_value", AstDSL.qualifiedName("string_value"))
-        )
-    );
+                    AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"))),
+                "schema"),
+            AstDSL.alias("string_value", AstDSL.qualifiedName("string_value"))));
   }
 
-  /**
-   * SELECT * FROM (
-   * SELECT name FROM test
-   * ) AS schema.
-   */
+  /** SELECT * FROM ( SELECT name FROM test ) AS schema. */
   @Test
   public void select_all_from_subquery() {
     assertAnalyzeEqual(
@@ -615,123 +1072,130 @@ public void select_all_from_subquery() {
             LogicalPlanDSL.project(
                 LogicalPlanDSL.relation("schema", table),
                 DSL.named("string_value", DSL.ref("string_value", STRING))),
-            DSL.named("string_value", DSL.ref("string_value", STRING))
-        ),
+            DSL.named("string_value", DSL.ref("string_value", STRING))),
         AstDSL.project(
             AstDSL.relationSubquery(
                 AstDSL.project(
                     AstDSL.relation("schema"),
-                    AstDSL.alias("string_value", AstDSL.qualifiedName("string_value"))
-                ),
-                "schema"
-            ),
-            AstDSL.allFields()
-        )
-    );
+                    AstDSL.alias("string_value", AstDSL.qualifiedName("string_value"))),
+                "schema"),
+            AstDSL.allFields()));
   }
 
   /**
-   * SELECT name, AVG(age) FROM test GROUP BY name.
+   * Ensure Nested function falls back to legacy engine when used in GROUP BY clause. TODO Remove
+   * this test when support is added.
    */
   @Test
+  public void nested_group_by_clause_throws_syntax_exception() {
+    SyntaxCheckException exception =
+        assertThrows(
+            SyntaxCheckException.class,
+            () ->
+                analyze(
+                    AstDSL.project(
+                        AstDSL.agg(
+                            AstDSL.relation("schema"),
+                            emptyList(),
+                            emptyList(),
+                            ImmutableList.of(
+                                alias(
+                                    "nested(message.info)",
+                                    function("nested", qualifiedName("message", "info")))),
+                            emptyList()))));
+    assertEquals(
+        "Falling back to legacy engine. Nested function is not supported in WHERE,"
+            + " GROUP BY, and HAVING clauses.",
+        exception.getMessage());
+  }
+
+  /** SELECT name, AVG(age) FROM test GROUP BY name. */
+  @Test
   public void sql_group_by_field() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList
-                    .of(DSL
-                        .named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
                 ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING)))),
             DSL.named("string_value", DSL.ref("string_value", STRING)),
             DSL.named("AVG(integer_value)", DSL.ref("AVG(integer_value)", DOUBLE))),
         AstDSL.project(
             AstDSL.agg(
                 AstDSL.relation("schema"),
-                ImmutableList.of(alias("AVG(integer_value)",
-                    aggregate("AVG", qualifiedName("integer_value")))),
+                ImmutableList.of(
+                    alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))),
                 emptyList(),
                 ImmutableList.of(alias("string_value", qualifiedName("string_value"))),
                 emptyList()),
             AstDSL.alias("string_value", qualifiedName("string_value")),
-            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value"))))
-    );
+            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))));
   }
 
-  /**
-   * SELECT abs(name), AVG(age) FROM test GROUP BY abs(name).
-   */
+  /** SELECT abs(name), AVG(age) FROM test GROUP BY abs(name). */
   @Test
   public void sql_group_by_function() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList
-                    .of(DSL
-                        .named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
-                ImmutableList.of(DSL.named("abs(long_value)",
-                    DSL.abs(DSL.ref("long_value", LONG))))),
+                ImmutableList.of(
+                    DSL.named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("abs(long_value)", DSL.abs(DSL.ref("long_value", LONG))))),
             DSL.named("abs(long_value)", DSL.ref("abs(long_value)", LONG)),
             DSL.named("AVG(integer_value)", DSL.ref("AVG(integer_value)", DOUBLE))),
         AstDSL.project(
             AstDSL.agg(
                 AstDSL.relation("schema"),
-                ImmutableList.of(alias("AVG(integer_value)",
-                    aggregate("AVG", qualifiedName("integer_value")))),
+                ImmutableList.of(
+                    alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))),
                 emptyList(),
-                ImmutableList
-                    .of(alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
+                ImmutableList.of(
+                    alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
                 emptyList()),
             AstDSL.alias("abs(long_value)", function("abs", qualifiedName("long_value"))),
-            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value"))))
-    );
+            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))));
   }
 
-  /**
-   * SELECT abs(name), AVG(age) FROM test GROUP BY ABS(name).
-   */
+  /** SELECT abs(name), AVG(age) FROM test GROUP BY ABS(name). */
   @Test
   public void sql_group_by_function_in_uppercase() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList
-                    .of(DSL
-                        .named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
-                ImmutableList.of(DSL.named("ABS(long_value)",
-                    DSL.abs(DSL.ref("long_value", LONG))))),
+                ImmutableList.of(
+                    DSL.named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("ABS(long_value)", DSL.abs(DSL.ref("long_value", LONG))))),
             DSL.named("abs(long_value)", DSL.ref("ABS(long_value)", LONG)),
             DSL.named("AVG(integer_value)", DSL.ref("AVG(integer_value)", DOUBLE))),
         AstDSL.project(
             AstDSL.agg(
                 AstDSL.relation("schema"),
-                ImmutableList.of(alias("AVG(integer_value)",
-                    aggregate("AVG", qualifiedName("integer_value")))),
+                ImmutableList.of(
+                    alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))),
                 emptyList(),
-                ImmutableList
-                    .of(alias("ABS(long_value)", function("ABS", qualifiedName("long_value")))),
+                ImmutableList.of(
+                    alias("ABS(long_value)", function("ABS", qualifiedName("long_value")))),
                 emptyList()),
             AstDSL.alias("abs(long_value)", function("abs", qualifiedName("long_value"))),
-            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value"))))
-    );
+            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))));
   }
 
-  /**
-   * SELECT abs(name), abs(avg(age) FROM test GROUP BY abs(name).
-   */
+  /** SELECT abs(name), abs(avg(age) FROM test GROUP BY abs(name). */
   @Test
   public void sql_expression_over_one_aggregation() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList
-                    .of(DSL.named("avg(integer_value)",
-                        DSL.avg(DSL.ref("integer_value", INTEGER)))),
-                ImmutableList.of(DSL.named("abs(long_value)",
-                    DSL.abs(DSL.ref("long_value", LONG))))),
+                ImmutableList.of(
+                    DSL.named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("abs(long_value)", DSL.abs(DSL.ref("long_value", LONG))))),
             DSL.named("abs(long_value)", DSL.ref("abs(long_value)", LONG)),
             DSL.named("abs(avg(integer_value)", DSL.abs(DSL.ref("avg(integer_value)", DOUBLE)))),
         AstDSL.project(
@@ -740,34 +1204,32 @@ public void sql_expression_over_one_aggregation() {
                 ImmutableList.of(
                     alias("avg(integer_value)", aggregate("avg", qualifiedName("integer_value")))),
                 emptyList(),
-                ImmutableList
-                    .of(alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
+                ImmutableList.of(
+                    alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
                 emptyList()),
             AstDSL.alias("abs(long_value)", function("abs", qualifiedName("long_value"))),
-            AstDSL.alias("abs(avg(integer_value)",
-                function("abs", aggregate("avg", qualifiedName("integer_value")))))
-    );
+            AstDSL.alias(
+                "abs(avg(integer_value)",
+                function("abs", aggregate("avg", qualifiedName("integer_value"))))));
   }
 
-  /**
-   * SELECT abs(name), sum(age)-avg(age) FROM test GROUP BY abs(name).
-   */
+  /** SELECT abs(name), sum(age)-avg(age) FROM test GROUP BY abs(name). */
   @Test
   public void sql_expression_over_two_aggregation() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList
-                    .of(DSL.named("sum(integer_value)",
-                            DSL.sum(DSL.ref("integer_value", INTEGER))),
-                        DSL.named("avg(integer_value)",
-                            DSL.avg(DSL.ref("integer_value", INTEGER)))),
-                ImmutableList.of(DSL.named("abs(long_value)",
-                    DSL.abs(DSL.ref("long_value", LONG))))),
+                ImmutableList.of(
+                    DSL.named("sum(integer_value)", DSL.sum(DSL.ref("integer_value", INTEGER))),
+                    DSL.named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("abs(long_value)", DSL.abs(DSL.ref("long_value", LONG))))),
             DSL.named("abs(long_value)", DSL.ref("abs(long_value)", LONG)),
-            DSL.named("sum(integer_value)-avg(integer_value)",
-                DSL.subtract(DSL.ref("sum(integer_value)", INTEGER),
+            DSL.named(
+                "sum(integer_value)-avg(integer_value)",
+                DSL.subtract(
+                    DSL.ref("sum(integer_value)", INTEGER),
                     DSL.ref("avg(integer_value)", DOUBLE)))),
         AstDSL.project(
             AstDSL.agg(
@@ -776,40 +1238,33 @@ public void sql_expression_over_two_aggregation() {
                     alias("sum(integer_value)", aggregate("sum", qualifiedName("integer_value"))),
                     alias("avg(integer_value)", aggregate("avg", qualifiedName("integer_value")))),
                 emptyList(),
-                ImmutableList
-                    .of(alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
+                ImmutableList.of(
+                    alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
                 emptyList()),
             AstDSL.alias("abs(long_value)", function("abs", qualifiedName("long_value"))),
-            AstDSL.alias("sum(integer_value)-avg(integer_value)",
-                function("-", aggregate("sum", qualifiedName("integer_value")),
-                    aggregate("avg", qualifiedName("integer_value")))))
-    );
+            AstDSL.alias(
+                "sum(integer_value)-avg(integer_value)",
+                function(
+                    "-",
+                    aggregate("sum", qualifiedName("integer_value")),
+                    aggregate("avg", qualifiedName("integer_value"))))));
   }
 
   @Test
   public void limit_offset() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
-            LogicalPlanDSL.limit(
-                LogicalPlanDSL.relation("schema", table),
-                1, 1
-            ),
-            DSL.named("integer_value", DSL.ref("integer_value", INTEGER))
-        ),
+            LogicalPlanDSL.limit(LogicalPlanDSL.relation("schema", table), 1, 1),
+            DSL.named("integer_value", DSL.ref("integer_value", INTEGER))),
         AstDSL.project(
-            AstDSL.limit(
-                AstDSL.relation("schema"),
-                1, 1
-            ),
-            AstDSL.alias("integer_value", qualifiedName("integer_value"))
-        )
-    );
+            AstDSL.limit(AstDSL.relation("schema"), 1, 1),
+            AstDSL.alias("integer_value", qualifiedName("integer_value"))));
   }
 
   /**
-   * SELECT COUNT(NAME) FILTER(WHERE age > 1) FROM test.
-   * This test is to verify that the aggregator properties are taken
-   * when wrapping it to {@link org.opensearch.sql.expression.aggregation.NamedAggregator}
+   * SELECT COUNT(NAME) FILTER(WHERE age > 1) FROM test. This test is to verify that the aggregator
+   * properties are taken when wrapping it to {@link
+   * org.opensearch.sql.expression.aggregation.NamedAggregator}
    */
   @Test
   public void named_aggregator_with_condition() {
@@ -818,36 +1273,37 @@ public void named_aggregator_with_condition() {
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
                 ImmutableList.of(
-                    DSL.named("count(string_value) filter(where integer_value > 1)",
-                        DSL.count(DSL.ref("string_value", STRING)).condition(DSL.greater(DSL.ref(
-                            "integer_value", INTEGER), DSL.literal(1))))
-                ),
-                emptyList()
-            ),
-            DSL.named("count(string_value) filter(where integer_value > 1)", DSL.ref(
-                "count(string_value) filter(where integer_value > 1)", INTEGER))
-        ),
+                    DSL.named(
+                        "count(string_value) filter(where integer_value > 1)",
+                        DSL.count(DSL.ref("string_value", STRING))
+                            .condition(
+                                DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))))),
+                emptyList()),
+            DSL.named(
+                "count(string_value) filter(where integer_value > 1)",
+                DSL.ref("count(string_value) filter(where integer_value > 1)", INTEGER))),
         AstDSL.project(
             AstDSL.agg(
                 AstDSL.relation("schema"),
                 ImmutableList.of(
-                    alias("count(string_value) filter(where integer_value > 1)", filteredAggregate(
-                        "count", qualifiedName("string_value"), function(
-                            ">", qualifiedName("integer_value"), intLiteral(1))))),
+                    alias(
+                        "count(string_value) filter(where integer_value > 1)",
+                        filteredAggregate(
+                            "count",
+                            qualifiedName("string_value"),
+                            function(">", qualifiedName("integer_value"), intLiteral(1))))),
                 emptyList(),
                 emptyList(),
-                emptyList()
-            ),
-            AstDSL.alias("count(string_value) filter(where integer_value > 1)", filteredAggregate(
-                "count", qualifiedName("string_value"), function(
-                    ">", qualifiedName("integer_value"), intLiteral(1))))
-        )
-    );
+                emptyList()),
+            AstDSL.alias(
+                "count(string_value) filter(where integer_value > 1)",
+                filteredAggregate(
+                    "count",
+                    qualifiedName("string_value"),
+                    function(">", qualifiedName("integer_value"), intLiteral(1))))));
   }
 
-  /**
-   * stats avg(integer_value) by string_value span(long_value, 10).
-   */
+  /** stats avg(integer_value) by string_value span(long_value, 10). */
   @Test
   public void ppl_stats_by_fieldAndSpan() {
     assertAnalyzeEqual(
@@ -874,10 +1330,13 @@ public void parse_relation_with_grok_expression() {
         LogicalPlanDSL.project(
             LogicalPlanDSL.relation("schema", table),
             ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING))),
-            ImmutableList.of(DSL.named("grok_field",
-                DSL.grok(DSL.ref("string_value", STRING), DSL.literal("%{IPV4:grok_field}"),
-                    DSL.literal("grok_field"))))
-        ),
+            ImmutableList.of(
+                DSL.named(
+                    "grok_field",
+                    DSL.grok(
+                        DSL.ref("string_value", STRING),
+                        DSL.literal("%{IPV4:grok_field}"),
+                        DSL.literal("grok_field"))))),
         AstDSL.project(
             AstDSL.parse(
                 AstDSL.relation("schema"),
@@ -885,8 +1344,7 @@ public void parse_relation_with_grok_expression() {
                 AstDSL.field("string_value"),
                 AstDSL.stringLiteral("%{IPV4:grok_field}"),
                 ImmutableMap.of()),
-            AstDSL.alias("string_value", qualifiedName("string_value"))
-        ));
+            AstDSL.alias("string_value", qualifiedName("string_value"))));
   }
 
   @Test
@@ -895,10 +1353,13 @@ public void parse_relation_with_regex_expression() {
         LogicalPlanDSL.project(
             LogicalPlanDSL.relation("schema", table),
             ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING))),
-            ImmutableList.of(DSL.named("group",
-                DSL.regex(DSL.ref("string_value", STRING), DSL.literal("(?<group>.*)"),
-                    DSL.literal("group"))))
-        ),
+            ImmutableList.of(
+                DSL.named(
+                    "group",
+                    DSL.regex(
+                        DSL.ref("string_value", STRING),
+                        DSL.literal("(?<group>.*)"),
+                        DSL.literal("group"))))),
         AstDSL.project(
             AstDSL.parse(
                 AstDSL.relation("schema"),
@@ -906,25 +1367,28 @@ public void parse_relation_with_regex_expression() {
                 AstDSL.field("string_value"),
                 AstDSL.stringLiteral("(?<group>.*)"),
                 ImmutableMap.of()),
-            AstDSL.alias("string_value", qualifiedName("string_value"))
-        ));
+            AstDSL.alias("string_value", qualifiedName("string_value"))));
   }
 
   @Test
   public void parse_relation_with_patterns_expression() {
-    Map<String, Literal> arguments = ImmutableMap.<String, Literal>builder()
-        .put("new_field", AstDSL.stringLiteral("custom_field"))
-        .put("pattern", AstDSL.stringLiteral("custom_pattern"))
-        .build();
+    Map<String, Literal> arguments =
+        ImmutableMap.<String, Literal>builder()
+            .put("new_field", AstDSL.stringLiteral("custom_field"))
+            .put("pattern", AstDSL.stringLiteral("custom_pattern"))
+            .build();
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.relation("schema", table),
             ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING))),
-            ImmutableList.of(DSL.named("custom_field",
-                DSL.patterns(DSL.ref("string_value", STRING), DSL.literal("custom_pattern"),
-                    DSL.literal("custom_field"))))
-        ),
+            ImmutableList.of(
+                DSL.named(
+                    "custom_field",
+                    DSL.patterns(
+                        DSL.ref("string_value", STRING),
+                        DSL.literal("custom_pattern"),
+                        DSL.literal("custom_field"))))),
         AstDSL.project(
             AstDSL.parse(
                 AstDSL.relation("schema"),
@@ -932,8 +1396,7 @@ public void parse_relation_with_patterns_expression() {
                 AstDSL.field("string_value"),
                 AstDSL.stringLiteral("custom_pattern"),
                 arguments),
-            AstDSL.alias("string_value", qualifiedName("string_value"))
-        ));
+            AstDSL.alias("string_value", qualifiedName("string_value"))));
   }
 
   @Test
@@ -942,10 +1405,13 @@ public void parse_relation_with_patterns_expression_no_args() {
         LogicalPlanDSL.project(
             LogicalPlanDSL.relation("schema", table),
             ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING))),
-            ImmutableList.of(DSL.named("patterns_field",
-                DSL.patterns(DSL.ref("string_value", STRING), DSL.literal(""),
-                    DSL.literal("patterns_field"))))
-        ),
+            ImmutableList.of(
+                DSL.named(
+                    "patterns_field",
+                    DSL.patterns(
+                        DSL.ref("string_value", STRING),
+                        DSL.literal(""),
+                        DSL.literal("patterns_field"))))),
         AstDSL.project(
             AstDSL.parse(
                 AstDSL.relation("schema"),
@@ -953,89 +1419,109 @@ public void parse_relation_with_patterns_expression_no_args() {
                 AstDSL.field("string_value"),
                 AstDSL.stringLiteral(""),
                 ImmutableMap.of()),
-            AstDSL.alias("string_value", qualifiedName("string_value"))
-        ));
+            AstDSL.alias("string_value", qualifiedName("string_value"))));
   }
 
   @Test
   public void kmeanns_relation() {
-    Map<String, Literal> argumentMap = new HashMap<String, Literal>() {{
-        put("centroids", new Literal(3, DataType.INTEGER));
-        put("iterations", new Literal(2, DataType.INTEGER));
-        put("distance_type", new Literal("COSINE", DataType.STRING));
-      }};
+    Map<String, Literal> argumentMap =
+        new HashMap<String, Literal>() {
+          {
+            put("centroids", new Literal(3, DataType.INTEGER));
+            put("iterations", new Literal(2, DataType.INTEGER));
+            put("distance_type", new Literal("COSINE", DataType.STRING));
+          }
+        };
     assertAnalyzeEqual(
-        new LogicalMLCommons(LogicalPlanDSL.relation("schema", table),
-            "kmeans", argumentMap),
-        new Kmeans(AstDSL.relation("schema"), argumentMap)
-    );
+        new LogicalMLCommons(LogicalPlanDSL.relation("schema", table), "kmeans", argumentMap),
+        new Kmeans(AstDSL.relation("schema"), argumentMap));
   }
 
   @Test
   public void ad_batchRCF_relation() {
     Map<String, Literal> argumentMap =
-        new HashMap<String, Literal>() {{
+        new HashMap<String, Literal>() {
+          {
             put("shingle_size", new Literal(8, DataType.INTEGER));
-          }};
+          }
+        };
     assertAnalyzeEqual(
         new LogicalAD(LogicalPlanDSL.relation("schema", table), argumentMap),
-        new AD(AstDSL.relation("schema"), argumentMap)
-    );
+        new AD(AstDSL.relation("schema"), argumentMap));
   }
 
   @Test
   public void ad_fitRCF_relation() {
-    Map<String, Literal> argumentMap = new HashMap<String, Literal>() {{
-        put("shingle_size", new Literal(8, DataType.INTEGER));
-        put("time_decay", new Literal(0.0001, DataType.DOUBLE));
-        put("time_field", new Literal("timestamp", DataType.STRING));
-      }};
+    Map<String, Literal> argumentMap =
+        new HashMap<String, Literal>() {
+          {
+            put("shingle_size", new Literal(8, DataType.INTEGER));
+            put("time_decay", new Literal(0.0001, DataType.DOUBLE));
+            put("time_field", new Literal("timestamp", DataType.STRING));
+          }
+        };
     assertAnalyzeEqual(
-        new LogicalAD(LogicalPlanDSL.relation("schema", table),
-            argumentMap),
-        new AD(AstDSL.relation("schema"), argumentMap)
-    );
+        new LogicalAD(LogicalPlanDSL.relation("schema", table), argumentMap),
+        new AD(AstDSL.relation("schema"), argumentMap));
   }
 
   @Test
   public void ad_fitRCF_relation_with_time_field() {
-    Map<String, Literal> argumentMap = new HashMap<String, Literal>() {{
-        put("shingle_size", new Literal(8, DataType.INTEGER));
-        put("time_decay", new Literal(0.0001, DataType.DOUBLE));
-        put("time_field", new Literal("ts", DataType.STRING));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new AD(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<String, Literal>() {
+          {
+            put("shingle_size", new Literal(8, DataType.INTEGER));
+            put("time_decay", new Literal(0.0001, DataType.DOUBLE));
+            put("time_field", new Literal("ts", DataType.STRING));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new AD(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 3);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("score", DSL.ref("score", DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("anomaly_grade", DSL.ref("anomaly_grade", DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("ts", DSL.ref("ts", TIMESTAMP))));
   }
 
   @Test
   public void ad_fitRCF_relation_without_time_field() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put("shingle_size", new Literal(8, DataType.INTEGER));
-        put("time_decay", new Literal(0.0001, DataType.DOUBLE));
-      }};
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put("shingle_size", new Literal(8, DataType.INTEGER));
+            put("time_decay", new Literal(0.0001, DataType.DOUBLE));
+          }
+        };
 
-    LogicalPlan actual = analyze(AstDSL.project(
-            new AD(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    LogicalPlan actual =
+        analyze(AstDSL.project(new AD(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 2);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("score", DSL.ref("score", DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("anomalous", DSL.ref("anomalous", BOOLEAN))));
   }
 
   @Test
   public void table_function() {
-    assertAnalyzeEqual(new LogicalRelation("query_range", table),
-        AstDSL.tableFunction(List.of("prometheus", "query_range"),
+    assertAnalyzeEqual(
+        new LogicalRelation("query_range", table),
+        AstDSL.tableFunction(
+            List.of("prometheus", "query_range"),
             unresolvedArg("query", stringLiteral("http_latency")),
             unresolvedArg("starttime", intLiteral(12345)),
             unresolvedArg("endtime", intLiteral(12345)),
@@ -1044,158 +1530,241 @@ public void table_function() {
 
   @Test
   public void table_function_with_no_datasource() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> analyze(AstDSL.tableFunction(List.of("query_range"),
-            unresolvedArg("query", stringLiteral("http_latency")),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg(null, intLiteral(14)))));
-    assertEquals("unsupported function name: query_range",
-        exception.getMessage());
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () ->
+                analyze(
+                    AstDSL.tableFunction(
+                        List.of("query_range"),
+                        unresolvedArg("query", stringLiteral("http_latency")),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg(null, intLiteral(14)))));
+    assertEquals("unsupported function name: query_range", exception.getMessage());
   }
 
   @Test
   public void table_function_with_wrong_datasource() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> analyze(AstDSL.tableFunction(Arrays.asList("prome", "query_range"),
-            unresolvedArg("query", stringLiteral("http_latency")),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg(null, intLiteral(14)))));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () ->
+                analyze(
+                    AstDSL.tableFunction(
+                        Arrays.asList("prome", "query_range"),
+                        unresolvedArg("query", stringLiteral("http_latency")),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg(null, intLiteral(14)))));
     assertEquals("unsupported function name: prome.query_range", exception.getMessage());
   }
 
   @Test
   public void table_function_with_wrong_table_function() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> analyze(AstDSL.tableFunction(Arrays.asList("prometheus", "queryrange"),
-            unresolvedArg("query", stringLiteral("http_latency")),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg(null, intLiteral(14)))));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () ->
+                analyze(
+                    AstDSL.tableFunction(
+                        Arrays.asList("prometheus", "queryrange"),
+                        unresolvedArg("query", stringLiteral("http_latency")),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg(null, intLiteral(14)))));
     assertEquals("unsupported function name: queryrange", exception.getMessage());
   }
 
   @Test
   public void show_datasources() {
-    assertAnalyzeEqual(new LogicalRelation(DATASOURCES_TABLE_NAME,
-            new DataSourceTable(dataSourceService)),
+    assertAnalyzeEqual(
+        new LogicalRelation(DATASOURCES_TABLE_NAME, new DataSourceTable(dataSourceService)),
         AstDSL.relation(qualifiedName(DATASOURCES_TABLE_NAME)));
   }
 
   @Test
   public void ml_relation_unsupported_action() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal("unsupported", DataType.STRING));
-        put(ALGO, new Literal(KMEANS, DataType.STRING));
-      }};
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal("unsupported", DataType.STRING));
+            put(ALGO, new Literal(KMEANS, DataType.STRING));
+          }
+        };
 
     IllegalArgumentException exception =
-            assertThrows(
-                    IllegalArgumentException.class,
-                    () -> analyze(AstDSL.project(
-                            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields())));
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.project(
+                        new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields())));
     assertEquals(
-            "Action error. Please indicate train, predict or trainandpredict.",
-            exception.getMessage());
+        "Action error. Please indicate train, predict or trainandpredict.", exception.getMessage());
   }
 
   @Test
   public void ml_relation_unsupported_algorithm() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(PREDICT, DataType.STRING));
-        put(ALGO, new Literal("unsupported", DataType.STRING));
-      }};
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(PREDICT, DataType.STRING));
+            put(ALGO, new Literal("unsupported", DataType.STRING));
+          }
+        };
 
     IllegalArgumentException exception =
-            assertThrows(
-                    IllegalArgumentException.class,
-                    () -> analyze(AstDSL.project(
-                            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields())));
-    assertEquals(
-            "Unsupported algorithm: unsupported",
-            exception.getMessage());
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.project(
+                        new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields())));
+    assertEquals("Unsupported algorithm: unsupported", exception.getMessage());
   }
 
   @Test
   public void ml_relation_train_sync() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(TRAIN, DataType.STRING));
-        put(ALGO, new Literal(KMEANS, DataType.STRING));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(TRAIN, DataType.STRING));
+            put(ALGO, new Literal(KMEANS, DataType.STRING));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 2);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(STATUS, DSL.ref(STATUS, STRING))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(MODELID, DSL.ref(MODELID, STRING))));
   }
 
   @Test
   public void ml_relation_train_async() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(TRAIN, DataType.STRING));
-        put(ALGO, new Literal(KMEANS, DataType.STRING));
-        put(ASYNC, new Literal(true, DataType.BOOLEAN));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(TRAIN, DataType.STRING));
+            put(ALGO, new Literal(KMEANS, DataType.STRING));
+            put(ASYNC, new Literal(true, DataType.BOOLEAN));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 2);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(STATUS, DSL.ref(STATUS, STRING))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(TASKID, DSL.ref(TASKID, STRING))));
   }
 
   @Test
   public void ml_relation_predict_kmeans() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(PREDICT, DataType.STRING));
-        put(ALGO, new Literal(KMEANS, DataType.STRING));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(PREDICT, DataType.STRING));
+            put(ALGO, new Literal(KMEANS, DataType.STRING));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 1);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(CLUSTERID, DSL.ref(CLUSTERID, INTEGER))));
   }
 
   @Test
   public void ml_relation_predict_rcf_with_time_field() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(PREDICT, DataType.STRING));
-        put(ALGO, new Literal(RCF, DataType.STRING));
-        put(RCF_TIME_FIELD, new Literal("ts", DataType.STRING));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(PREDICT, DataType.STRING));
+            put(ALGO, new Literal(RCF, DataType.STRING));
+            put(RCF_TIME_FIELD, new Literal("ts", DataType.STRING));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 3);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(RCF_SCORE, DSL.ref(RCF_SCORE, DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(RCF_ANOMALY_GRADE, DSL.ref(RCF_ANOMALY_GRADE, DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("ts", DSL.ref("ts", TIMESTAMP))));
   }
 
   @Test
   public void ml_relation_predict_rcf_without_time_field() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(PREDICT, DataType.STRING));
-        put(ALGO, new Literal(RCF, DataType.STRING));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(PREDICT, DataType.STRING));
+            put(ALGO, new Literal(RCF, DataType.STRING));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 2);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(RCF_SCORE, DSL.ref(RCF_SCORE, DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(RCF_ANOMALOUS, DSL.ref(RCF_ANOMALOUS, BOOLEAN))));
   }
+
+  @Test
+  public void visit_paginate() {
+    LogicalPlan actual = analyze(new Paginate(10, AstDSL.relation("dummy")));
+    assertTrue(actual instanceof LogicalPaginate);
+    assertEquals(10, ((LogicalPaginate) actual).getPageSize());
+  }
+
+  @Test
+  void visit_cursor() {
+    LogicalPlan actual = analyze((new FetchCursor("test")));
+    assertTrue(actual instanceof LogicalFetchCursor);
+    assertEquals(
+        new LogicalFetchCursor(
+            "test", dataSourceService.getDataSource("@opensearch").getStorageEngine()),
+        actual);
+  }
+
+  @Test
+  public void visit_close_cursor() {
+    var analyzed = analyze(new CloseCursor().attach(new FetchCursor("pewpew")));
+    assertAll(
+        () -> assertTrue(analyzed instanceof LogicalCloseCursor),
+        () -> assertTrue(analyzed.getChild().get(0) instanceof LogicalFetchCursor),
+        () ->
+            assertEquals("pewpew", ((LogicalFetchCursor) analyzed.getChild().get(0)).getCursor()));
+  }
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java
index c68ba2653e..0bf959a1b7 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java
@@ -3,18 +3,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
 import static org.opensearch.sql.data.type.ExprCoreType.LONG;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableMap;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.commons.lang3.tuple.Pair;
+import org.opensearch.sql.DataSourceSchemaName;
 import org.opensearch.sql.analysis.symbol.Namespace;
 import org.opensearch.sql.analysis.symbol.Symbol;
 import org.opensearch.sql.analysis.symbol.SymbolTable;
@@ -22,6 +28,7 @@
 import org.opensearch.sql.config.TestConfig;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.RequestContext;
 import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.datasource.model.DataSourceType;
@@ -39,9 +46,6 @@
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.storage.Table;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-
 
 public class AnalyzerTestBase {
 
@@ -49,68 +53,89 @@ protected Map<String, ExprType> typeMapping() {
     return TestConfig.typeMapping;
   }
 
-  @Bean
   protected StorageEngine storageEngine() {
     return (dataSourceSchemaName, tableName) -> table;
   }
 
-  @Bean
-  protected Table table() {
-    return new Table() {
-      @Override
-      public boolean exists() {
-        return true;
-      }
-
-      @Override
-      public void create(Map<String, ExprType> schema) {
-        throw new UnsupportedOperationException("Create table is not supported");
-      }
-
+  protected StorageEngine prometheusStorageEngine() {
+    return new StorageEngine() {
       @Override
-      public Map<String, ExprType> getFieldTypes() {
-        return typeMapping();
+      public Collection<FunctionResolver> getFunctions() {
+        return Collections.singletonList(
+            new FunctionResolver() {
+
+              @Override
+              public Pair<FunctionSignature, FunctionBuilder> resolve(
+                  FunctionSignature unresolvedSignature) {
+                FunctionName functionName = FunctionName.of("query_range");
+                FunctionSignature functionSignature =
+                    new FunctionSignature(functionName, List.of(STRING, LONG, LONG, STRING));
+                return Pair.of(
+                    functionSignature,
+                    (functionProperties, args) ->
+                        new TestTableFunctionImplementation(functionName, args, table));
+              }
+
+              @Override
+              public FunctionName getFunctionName() {
+                return FunctionName.of("query_range");
+              }
+            });
       }
 
       @Override
-      public PhysicalPlan implement(LogicalPlan plan) {
-        throw new UnsupportedOperationException();
+      public Table getTable(DataSourceSchemaName dataSourceSchemaName, String tableName) {
+        return table;
       }
     };
   }
 
-  @Bean
-  protected Table dataSourceTable() {
-    return new Table() {
-      @Override
-      public Map<String, ExprType> getFieldTypes() {
-        return typeMapping();
-      }
-
-      @Override
-      public PhysicalPlan implement(LogicalPlan plan) {
-        throw new UnsupportedOperationException();
-      }
-    };
+  protected Table table() {
+    return Optional.ofNullable(table)
+        .orElseGet(
+            () ->
+                new Table() {
+                  @Override
+                  public boolean exists() {
+                    return true;
+                  }
+
+                  @Override
+                  public void create(Map<String, ExprType> schema) {
+                    throw new UnsupportedOperationException("Create table is not supported");
+                  }
+
+                  @Override
+                  public Map<String, ExprType> getFieldTypes() {
+                    return typeMapping();
+                  }
+
+                  @Override
+                  public PhysicalPlan implement(LogicalPlan plan) {
+                    throw new UnsupportedOperationException();
+                  }
+
+                  public Map<String, ExprType> getReservedFieldTypes() {
+                    return ImmutableMap.of("_test", STRING);
+                  }
+                });
   }
 
-  @Bean
   protected DataSourceService dataSourceService() {
-    return new DefaultDataSourceService();
+    return Optional.ofNullable(dataSourceService).orElseGet(DefaultDataSourceService::new);
   }
 
-
-  @Bean
   protected SymbolTable symbolTable() {
     SymbolTable symbolTable = new SymbolTable();
-    typeMapping().entrySet()
+    typeMapping()
+        .entrySet()
         .forEach(
-            entry -> symbolTable
-                .store(new Symbol(Namespace.FIELD_NAME, entry.getKey()), entry.getValue()));
+            entry ->
+                symbolTable.store(
+                    new Symbol(Namespace.FIELD_NAME, entry.getKey()), entry.getValue()));
     return symbolTable;
   }
 
-  @Bean
   protected Environment<Expression, ExprType> typeEnv() {
     return var -> {
       if (var instanceof ReferenceExpression) {
@@ -123,61 +148,30 @@ protected Environment<Expression, ExprType> typeEnv() {
     };
   }
 
-  @Autowired
-  protected AnalysisContext analysisContext;
-
-  @Autowired
-  protected ExpressionAnalyzer expressionAnalyzer;
+  protected AnalysisContext analysisContext = analysisContext(typeEnvironment(symbolTable()));
 
-  @Autowired
-  protected Analyzer analyzer;
+  protected ExpressionAnalyzer expressionAnalyzer = expressionAnalyzer();
 
-  @Autowired
-  protected Table table;
+  protected Table table = table();
 
-  @Autowired
-  protected DataSourceService dataSourceService;
+  protected DataSourceService dataSourceService = dataSourceService();
 
-  @Autowired
-  protected Environment<Expression, ExprType> typeEnv;
+  protected Analyzer analyzer = analyzer(expressionAnalyzer(), dataSourceService);
 
-  @Bean
-  protected Analyzer analyzer(ExpressionAnalyzer expressionAnalyzer,
-                      DataSourceService dataSourceService,
-                      Table table) {
+  protected Analyzer analyzer(
+      ExpressionAnalyzer expressionAnalyzer, DataSourceService dataSourceService) {
     BuiltinFunctionRepository functionRepository = BuiltinFunctionRepository.getInstance();
-    functionRepository.register("prometheus", new FunctionResolver() {
-
-      @Override
-      public Pair<FunctionSignature, FunctionBuilder> resolve(
-          FunctionSignature unresolvedSignature) {
-        FunctionName functionName = FunctionName.of("query_range");
-        FunctionSignature functionSignature =
-            new FunctionSignature(functionName, List.of(STRING, LONG, LONG, LONG));
-        return Pair.of(functionSignature,
-            (functionProperties, args) -> new TestTableFunctionImplementation(functionName, args,
-                table));
-      }
-
-      @Override
-      public FunctionName getFunctionName() {
-        return FunctionName.of("query_range");
-      }
-    });
     return new Analyzer(expressionAnalyzer, dataSourceService, functionRepository);
   }
 
-  @Bean
   protected TypeEnvironment typeEnvironment(SymbolTable symbolTable) {
     return new TypeEnvironment(null, symbolTable);
   }
 
-  @Bean
   protected AnalysisContext analysisContext(TypeEnvironment typeEnvironment) {
     return new AnalysisContext(typeEnvironment);
   }
 
-  @Bean
   protected ExpressionAnalyzer expressionAnalyzer() {
     return new ExpressionAnalyzer(BuiltinFunctionRepository.getInstance());
   }
@@ -192,29 +186,60 @@ protected LogicalPlan analyze(UnresolvedPlan unresolvedPlan) {
 
   private class DefaultDataSourceService implements DataSourceService {
 
-    private StorageEngine storageEngine = storageEngine();
-    private final DataSource dataSource
-        = new DataSource("prometheus", DataSourceType.PROMETHEUS, storageEngine);
+    private final DataSource opensearchDataSource =
+        new DataSource(DEFAULT_DATASOURCE_NAME, DataSourceType.OPENSEARCH, storageEngine());
+    private final DataSource prometheusDataSource =
+        new DataSource("prometheus", DataSourceType.PROMETHEUS, prometheusStorageEngine());
+
+    @Override
+    public Set<DataSourceMetadata> getDataSourceMetadata(boolean isDefaultDataSourceRequired) {
+      return Stream.of(opensearchDataSource, prometheusDataSource)
+          .map(
+              ds ->
+                  new DataSourceMetadata.Builder()
+                      .setName(ds.getName())
+                      .setConnector(ds.getConnectorType())
+                      .build())
+          .collect(Collectors.toSet());
+    }
 
+    @Override
+    public DataSourceMetadata getDataSourceMetadata(String name) {
+      return null;
+    }
 
     @Override
-    public Set<DataSource> getDataSources() {
-      return ImmutableSet.of(dataSource);
+    public void createDataSource(DataSourceMetadata metadata) {
+      throw new UnsupportedOperationException("unsupported operation");
     }
 
     @Override
     public DataSource getDataSource(String dataSourceName) {
-      return dataSource;
+      if ("prometheus".equals(dataSourceName)) {
+        return prometheusDataSource;
+      } else {
+        return opensearchDataSource;
+      }
     }
 
     @Override
-    public void addDataSource(DataSourceMetadata... metadatas) {
-      throw new UnsupportedOperationException();
+    public void updateDataSource(DataSourceMetadata dataSourceMetadata) {}
+
+    @Override
+    public void patchDataSource(Map<String, Object> dataSourceData) {}
+
+    @Override
+    public void deleteDataSource(String dataSourceName) {}
+
+    @Override
+    public Boolean dataSourceExists(String dataSourceName) {
+      return dataSourceName.equals(DEFAULT_DATASOURCE_NAME) || dataSourceName.equals("prometheus");
     }
 
     @Override
-    public void clear() {
-      throw new UnsupportedOperationException();
+    public DataSourceMetadata verifyDataSourceAccessAndGetRawMetadata(
+        String dataSourceName, RequestContext requestContext) {
+      return null;
     }
   }
 
@@ -226,8 +251,8 @@ private class TestTableFunctionImplementation implements TableFunctionImplementa
 
     private Table table;
 
-    public TestTableFunctionImplementation(FunctionName functionName, List<Expression> arguments,
-                                           Table table) {
+    public TestTableFunctionImplementation(
+        FunctionName functionName, List<Expression> arguments, Table table) {
       this.functionName = functionName;
       this.arguments = arguments;
       this.table = table;
diff --git a/core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
index 7114b220ab..b27b8348e2 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static java.util.Collections.emptyList;
@@ -20,7 +19,9 @@
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_TRUE;
 import static org.opensearch.sql.data.model.ExprValueUtils.integerValue;
 import static org.opensearch.sql.data.type.ExprCoreType.BOOLEAN;
+import static org.opensearch.sql.data.type.ExprCoreType.FLOAT;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+import static org.opensearch.sql.data.type.ExprCoreType.LONG;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
 import static org.opensearch.sql.expression.DSL.ref;
@@ -31,7 +32,6 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.analysis.symbol.Namespace;
 import org.opensearch.sql.analysis.symbol.Symbol;
 import org.opensearch.sql.ast.dsl.AstDSL;
@@ -48,63 +48,58 @@
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.FunctionExpression;
-import org.opensearch.sql.expression.function.FunctionPropertiesTestConfig;
 import org.opensearch.sql.expression.window.aggregation.AggregateWindowFunction;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {FunctionPropertiesTestConfig.class, AnalyzerTestBase.class})
 class ExpressionAnalyzerTest extends AnalyzerTestBase {
 
   @Test
   public void equal() {
     assertAnalyzeEqual(
         DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(1))),
-        AstDSL.equalTo(AstDSL.unresolvedAttr("integer_value"), AstDSL.intLiteral(1))
-    );
+        AstDSL.equalTo(AstDSL.unresolvedAttr("integer_value"), AstDSL.intLiteral(1)));
   }
 
   @Test
   public void and() {
     assertAnalyzeEqual(
         DSL.and(DSL.ref("boolean_value", BOOLEAN), DSL.literal(LITERAL_TRUE)),
-        AstDSL.and(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true))
-    );
+        AstDSL.and(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true)));
   }
 
   @Test
   public void or() {
     assertAnalyzeEqual(
         DSL.or(DSL.ref("boolean_value", BOOLEAN), DSL.literal(LITERAL_TRUE)),
-        AstDSL.or(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true))
-    );
+        AstDSL.or(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true)));
   }
 
   @Test
   public void xor() {
     assertAnalyzeEqual(
         DSL.xor(DSL.ref("boolean_value", BOOLEAN), DSL.literal(LITERAL_TRUE)),
-        AstDSL.xor(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true))
-    );
+        AstDSL.xor(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true)));
   }
 
   @Test
   public void not() {
     assertAnalyzeEqual(
         DSL.not(DSL.ref("boolean_value", BOOLEAN)),
-        AstDSL.not(AstDSL.unresolvedAttr("boolean_value"))
-    );
+        AstDSL.not(AstDSL.unresolvedAttr("boolean_value")));
   }
 
   @Test
   public void qualified_name() {
+    assertAnalyzeEqual(DSL.ref("integer_value", INTEGER), qualifiedName("integer_value"));
+  }
+
+  @Test
+  public void between() {
     assertAnalyzeEqual(
-        DSL.ref("integer_value", INTEGER),
-        qualifiedName("integer_value")
-    );
+        DSL.and(
+            DSL.gte(DSL.ref("integer_value", INTEGER), DSL.literal(20)),
+            DSL.lte(DSL.ref("integer_value", INTEGER), DSL.literal(30))),
+        AstDSL.between(
+            qualifiedName("integer_value"), AstDSL.intLiteral(20), AstDSL.intLiteral(30)));
   }
 
   @Test
@@ -139,36 +134,38 @@ public void case_conditions() {
         AstDSL.caseWhen(
             null,
             AstDSL.when(
-                AstDSL.function(">",
-                    qualifiedName("integer_value"),
-                    AstDSL.intLiteral(50)), AstDSL.stringLiteral("Fifty")),
+                AstDSL.function(">", qualifiedName("integer_value"), AstDSL.intLiteral(50)),
+                AstDSL.stringLiteral("Fifty")),
             AstDSL.when(
-                AstDSL.function(">",
-                    qualifiedName("integer_value"),
-                    AstDSL.intLiteral(30)), AstDSL.stringLiteral("Thirty"))));
+                AstDSL.function(">", qualifiedName("integer_value"), AstDSL.intLiteral(30)),
+                AstDSL.stringLiteral("Thirty"))));
   }
 
   @Test
   public void castAnalyzer() {
     assertAnalyzeEqual(
         DSL.castInt(DSL.ref("boolean_value", BOOLEAN)),
-        AstDSL.cast(AstDSL.unresolvedAttr("boolean_value"), AstDSL.stringLiteral("INT"))
-    );
+        AstDSL.cast(AstDSL.unresolvedAttr("boolean_value"), AstDSL.stringLiteral("INT")));
 
-    assertThrows(IllegalStateException.class, () -> analyze(AstDSL.cast(AstDSL.unresolvedAttr(
-        "boolean_value"), AstDSL.stringLiteral("INTERVAL"))));
+    assertThrows(
+        IllegalStateException.class,
+        () ->
+            analyze(
+                AstDSL.cast(
+                    AstDSL.unresolvedAttr("boolean_value"), AstDSL.stringLiteral("INTERVAL"))));
   }
 
   @Test
   public void case_with_default_result_type_different() {
-    UnresolvedExpression caseWhen = AstDSL.caseWhen(
-        qualifiedName("integer_value"),
-        AstDSL.intLiteral(60),
-        AstDSL.when(AstDSL.intLiteral(30), AstDSL.stringLiteral("Thirty")),
-        AstDSL.when(AstDSL.intLiteral(50), AstDSL.stringLiteral("Fifty")));
-
-    SemanticCheckException exception = assertThrows(
-        SemanticCheckException.class, () -> analyze(caseWhen));
+    UnresolvedExpression caseWhen =
+        AstDSL.caseWhen(
+            qualifiedName("integer_value"),
+            AstDSL.intLiteral(60),
+            AstDSL.when(AstDSL.intLiteral(30), AstDSL.stringLiteral("Thirty")),
+            AstDSL.when(AstDSL.intLiteral(50), AstDSL.stringLiteral("Fifty")));
+
+    SemanticCheckException exception =
+        assertThrows(SemanticCheckException.class, () -> analyze(caseWhen));
     assertEquals(
         "All result types of CASE clause must be the same, but found [STRING, STRING, INTEGER]",
         exception.getMessage());
@@ -177,8 +174,7 @@ public void case_with_default_result_type_different() {
   @Test
   public void scalar_window_function() {
     assertAnalyzeEqual(
-        DSL.rank(),
-        AstDSL.window(AstDSL.function("rank"), emptyList(), emptyList()));
+        DSL.rank(), AstDSL.window(AstDSL.function("rank"), emptyList(), emptyList()));
   }
 
   @SuppressWarnings("unchecked")
@@ -187,9 +183,7 @@ public void aggregate_window_function() {
     assertAnalyzeEqual(
         new AggregateWindowFunction(DSL.avg(DSL.ref("integer_value", INTEGER))),
         AstDSL.window(
-            AstDSL.aggregate("avg", qualifiedName("integer_value")),
-            emptyList(),
-            emptyList()));
+            AstDSL.aggregate("avg", qualifiedName("integer_value")), emptyList(), emptyList()));
   }
 
   @Test
@@ -197,26 +191,41 @@ public void qualified_name_with_qualifier() {
     analysisContext.push();
     analysisContext.peek().define(new Symbol(Namespace.INDEX_NAME, "index_alias"), STRUCT);
     assertAnalyzeEqual(
-        DSL.ref("integer_value", INTEGER),
-        qualifiedName("index_alias", "integer_value")
-    );
+        DSL.ref("integer_value", INTEGER), qualifiedName("index_alias", "integer_value"));
 
     analysisContext.peek().define(new Symbol(Namespace.FIELD_NAME, "object_field"), STRUCT);
-    analysisContext.peek().define(new Symbol(Namespace.FIELD_NAME, "object_field.integer_value"),
-        INTEGER);
+    analysisContext
+        .peek()
+        .define(new Symbol(Namespace.FIELD_NAME, "object_field.integer_value"), INTEGER);
     assertAnalyzeEqual(
         DSL.ref("object_field.integer_value", INTEGER),
-        qualifiedName("object_field", "integer_value")
-    );
+        qualifiedName("object_field", "integer_value"));
 
     SyntaxCheckException exception =
-        assertThrows(SyntaxCheckException.class,
+        assertThrows(
+            SyntaxCheckException.class,
             () -> analyze(qualifiedName("nested_field", "integer_value")));
     assertEquals(
         "The qualifier [nested_field] of qualified name [nested_field.integer_value] "
             + "must be an field name, index name or its alias",
-        exception.getMessage()
-    );
+        exception.getMessage());
+    analysisContext.pop();
+  }
+
+  @Test
+  public void qualified_name_with_reserved_symbol() {
+    analysisContext.push();
+
+    analysisContext.peek().define(new Symbol(Namespace.HIDDEN_FIELD_NAME, "_reserved"), STRING);
+    analysisContext.peek().define(new Symbol(Namespace.HIDDEN_FIELD_NAME, "_priority"), FLOAT);
+    analysisContext.peek().define(new Symbol(Namespace.INDEX_NAME, "index_alias"), STRUCT);
+    assertAnalyzeEqual(DSL.ref("_priority", FLOAT), qualifiedName("_priority"));
+    assertAnalyzeEqual(DSL.ref("_reserved", STRING), qualifiedName("index_alias", "_reserved"));
+
+    // cannot replace an existing field type
+    analysisContext.peek().define(new Symbol(Namespace.FIELD_NAME, "_reserved"), LONG);
+    assertAnalyzeEqual(DSL.ref("_reserved", STRING), qualifiedName("index_alias", "_reserved"));
+
     analysisContext.pop();
   }
 
@@ -229,9 +238,7 @@ public void interval() {
 
   @Test
   public void all_fields() {
-    assertAnalyzeEqual(
-        DSL.literal("*"),
-        AllFields.of());
+    assertAnalyzeEqual(DSL.literal("*"), AllFields.of());
   }
 
   @Test
@@ -245,36 +252,30 @@ public void case_clause() {
         AstDSL.caseWhen(
             AstDSL.nullLiteral(),
             AstDSL.when(
-                AstDSL.function("=",
-                    qualifiedName("integer_value"),
-                    AstDSL.intLiteral(30)),
+                AstDSL.function("=", qualifiedName("integer_value"), AstDSL.intLiteral(30)),
                 AstDSL.stringLiteral("test"))));
   }
 
-  @Test
-  public void skip_array_data_type() {
-    SyntaxCheckException exception =
-        assertThrows(SyntaxCheckException.class,
-            () -> analyze(qualifiedName("array_value")));
-    assertEquals(
-        "Identifier [array_value] of type [ARRAY] is not supported yet",
-        exception.getMessage()
-    );
-  }
-
   @Test
   public void undefined_var_semantic_check_failed() {
-    SemanticCheckException exception = assertThrows(SemanticCheckException.class,
-        () -> analyze(
-            AstDSL.and(AstDSL.unresolvedAttr("undefined_field"), AstDSL.booleanLiteral(true))));
-    assertEquals("can't resolve Symbol(namespace=FIELD_NAME, name=undefined_field) in type env",
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () ->
+                analyze(
+                    AstDSL.and(
+                        AstDSL.unresolvedAttr("undefined_field"), AstDSL.booleanLiteral(true))));
+    assertEquals(
+        "can't resolve Symbol(namespace=FIELD_NAME, name=undefined_field) in type env",
         exception.getMessage());
   }
 
   @Test
   public void undefined_aggregation_function() {
-    SemanticCheckException exception = assertThrows(SemanticCheckException.class,
-        () -> analyze(AstDSL.aggregate("ESTDC_ERROR", field("integer_value"))));
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> analyze(AstDSL.aggregate("ESTDC_ERROR", field("integer_value"))));
     assertEquals("Unsupported aggregation function ESTDC_ERROR", exception.getMessage());
   }
 
@@ -283,25 +284,24 @@ public void aggregation_filter() {
     assertAnalyzeEqual(
         DSL.avg(DSL.ref("integer_value", INTEGER))
             .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))),
-        AstDSL.filteredAggregate("avg", qualifiedName("integer_value"),
-            function(">", qualifiedName("integer_value"), intLiteral(1)))
-    );
+        AstDSL.filteredAggregate(
+            "avg",
+            qualifiedName("integer_value"),
+            function(">", qualifiedName("integer_value"), intLiteral(1))));
   }
 
   @Test
   public void variance_mapto_varPop() {
     assertAnalyzeEqual(
         DSL.varPop(DSL.ref("integer_value", INTEGER)),
-        AstDSL.aggregate("variance", qualifiedName("integer_value"))
-    );
+        AstDSL.aggregate("variance", qualifiedName("integer_value")));
   }
 
   @Test
   public void distinct_count() {
     assertAnalyzeEqual(
         DSL.distinctCount(DSL.ref("integer_value", INTEGER)),
-        AstDSL.distinctAggregate("count", qualifiedName("integer_value"))
-    );
+        AstDSL.distinctAggregate("count", qualifiedName("integer_value")));
   }
 
   @Test
@@ -309,48 +309,49 @@ public void filtered_distinct_count() {
     assertAnalyzeEqual(
         DSL.distinctCount(DSL.ref("integer_value", INTEGER))
             .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))),
-        AstDSL.filteredDistinctCount("count", qualifiedName("integer_value"), function(
-            ">", qualifiedName("integer_value"), intLiteral(1)))
-    );
+        AstDSL.filteredDistinctCount(
+            "count",
+            qualifiedName("integer_value"),
+            function(">", qualifiedName("integer_value"), intLiteral(1))));
   }
 
   @Test
   public void take_aggregation() {
     assertAnalyzeEqual(
         DSL.take(DSL.ref("string_value", STRING), DSL.literal(10)),
-        AstDSL.aggregate("take", qualifiedName("string_value"), intLiteral(10))
-    );
+        AstDSL.aggregate("take", qualifiedName("string_value"), intLiteral(10)));
   }
 
   @Test
   public void named_argument() {
     assertAnalyzeEqual(
         DSL.namedArgument("arg_name", DSL.literal("query")),
-        AstDSL.unresolvedArg("arg_name", stringLiteral("query"))
-    );
+        AstDSL.unresolvedArg("arg_name", stringLiteral("query")));
   }
 
   @Test
   public void named_parse_expression() {
     analysisContext.push();
     analysisContext.peek().define(new Symbol(Namespace.FIELD_NAME, "string_field"), STRING);
-    analysisContext.getNamedParseExpressions()
-        .add(DSL.named("group",
-            DSL.regex(ref("string_field", STRING), DSL.literal("(?<group>\\d+)"),
-            DSL.literal("group"))));
+    analysisContext
+        .getNamedParseExpressions()
+        .add(
+            DSL.named(
+                "group",
+                DSL.regex(
+                    ref("string_field", STRING),
+                    DSL.literal("(?<group>\\d+)"),
+                    DSL.literal("group"))));
     assertAnalyzeEqual(
-        DSL.regex(ref("string_field", STRING), DSL.literal("(?<group>\\d+)"),
-            DSL.literal("group")),
-        qualifiedName("group")
-    );
+        DSL.regex(ref("string_field", STRING), DSL.literal("(?<group>\\d+)"), DSL.literal("group")),
+        qualifiedName("group"));
   }
 
   @Test
   public void named_non_parse_expression() {
     analysisContext.push();
     analysisContext.peek().define(new Symbol(Namespace.FIELD_NAME, "string_field"), STRING);
-    analysisContext.getNamedParseExpressions()
-        .add(DSL.named("string_field", DSL.literal("123")));
+    analysisContext.getNamedParseExpressions().add(DSL.named("string_field", DSL.literal("123")));
     assertAnalyzeEqual(DSL.ref("string_field", STRING), qualifiedName("string_field"));
   }
 
@@ -358,27 +359,31 @@ public void named_non_parse_expression() {
   void match_bool_prefix_expression() {
     assertAnalyzeEqual(
         DSL.match_bool_prefix(
-            DSL.namedArgument("field", DSL.literal("fieldA")),
+            DSL.namedArgument("field", DSL.literal("field_value1")),
             DSL.namedArgument("query", DSL.literal("sample query"))),
-        AstDSL.function("match_bool_prefix",
-            AstDSL.unresolvedArg("field", stringLiteral("fieldA")),
+        AstDSL.function(
+            "match_bool_prefix",
+            AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
             AstDSL.unresolvedArg("query", stringLiteral("sample query"))));
   }
 
   @Test
   void match_bool_prefix_wrong_expression() {
-    assertThrows(SemanticCheckException.class,
-        () -> analyze(AstDSL.function("match_bool_prefix",
-            AstDSL.unresolvedArg("field", stringLiteral("fieldA")),
-            AstDSL.unresolvedArg("query", floatLiteral(1.2f)))));
+    assertThrows(
+        SemanticCheckException.class,
+        () ->
+            analyze(
+                AstDSL.function(
+                    "match_bool_prefix",
+                    AstDSL.unresolvedArg("field", stringLiteral("fieldA")),
+                    AstDSL.unresolvedArg("query", floatLiteral(1.2f)))));
   }
 
   @Test
   void visit_span() {
     assertAnalyzeEqual(
         DSL.span(DSL.ref("integer_value", INTEGER), DSL.literal(1), ""),
-        AstDSL.span(qualifiedName("integer_value"), intLiteral(1), SpanUnit.NONE)
-    );
+        AstDSL.span(qualifiedName("integer_value"), intLiteral(1), SpanUnit.NONE));
   }
 
   @Test
@@ -400,13 +405,16 @@ void visit_in() {
   void multi_match_expression() {
     assertAnalyzeEqual(
         DSL.multi_match(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("sample query"))),
-        AstDSL.function("multi_match",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field", 1.F))),
+        AstDSL.function(
+            "multi_match",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query"))));
   }
 
@@ -414,14 +422,17 @@ void multi_match_expression() {
   void multi_match_expression_with_params() {
     assertAnalyzeEqual(
         DSL.multi_match(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("sample query")),
             DSL.namedArgument("analyzer", DSL.literal("keyword"))),
-        AstDSL.function("multi_match",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field", 1.F))),
+        AstDSL.function(
+            "multi_match",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query")),
             AstDSL.unresolvedArg("analyzer", stringLiteral("keyword"))));
   }
@@ -430,14 +441,20 @@ void multi_match_expression_with_params() {
   void multi_match_expression_two_fields() {
     assertAnalyzeEqual(
         DSL.multi_match(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field1", ExprValueUtils.floatValue(1.F),
-                    "field2", ExprValueUtils.floatValue(.3F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of(
+                                "field_value1", ExprValueUtils.floatValue(1.F),
+                                "field_value2", ExprValueUtils.floatValue(.3F)))))),
             DSL.namedArgument("query", DSL.literal("sample query"))),
-        AstDSL.function("multi_match",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field1", 1.F, "field2", .3F))),
+        AstDSL.function(
+            "multi_match",
+            AstDSL.unresolvedArg(
+                "fields",
+                new RelevanceFieldList(ImmutableMap.of("field_value1", 1.F, "field_value2", .3F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query"))));
   }
 
@@ -445,13 +462,16 @@ void multi_match_expression_two_fields() {
   void simple_query_string_expression() {
     assertAnalyzeEqual(
         DSL.simple_query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("sample query"))),
-        AstDSL.function("simple_query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field", 1.F))),
+        AstDSL.function(
+            "simple_query_string",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query"))));
   }
 
@@ -459,14 +479,17 @@ void simple_query_string_expression() {
   void simple_query_string_expression_with_params() {
     assertAnalyzeEqual(
         DSL.simple_query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("sample query")),
             DSL.namedArgument("analyzer", DSL.literal("keyword"))),
-        AstDSL.function("simple_query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field", 1.F))),
+        AstDSL.function(
+            "simple_query_string",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query")),
             AstDSL.unresolvedArg("analyzer", stringLiteral("keyword"))));
   }
@@ -475,37 +498,44 @@ void simple_query_string_expression_with_params() {
   void simple_query_string_expression_two_fields() {
     assertAnalyzeEqual(
         DSL.simple_query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field1", ExprValueUtils.floatValue(1.F),
-                    "field2", ExprValueUtils.floatValue(.3F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of(
+                                "field_value1", ExprValueUtils.floatValue(1.F),
+                                "field_value2", ExprValueUtils.floatValue(.3F)))))),
             DSL.namedArgument("query", DSL.literal("sample query"))),
-        AstDSL.function("simple_query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field1", 1.F, "field2", .3F))),
+        AstDSL.function(
+            "simple_query_string",
+            AstDSL.unresolvedArg(
+                "fields",
+                new RelevanceFieldList(ImmutableMap.of("field_value1", 1.F, "field_value2", .3F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query"))));
   }
 
   @Test
   void query_expression() {
     assertAnalyzeEqual(
-            DSL.query(
-                    DSL.namedArgument("query", DSL.literal("field:query"))),
-            AstDSL.function("query",
-                    AstDSL.unresolvedArg("query", stringLiteral("field:query"))));
+        DSL.query(DSL.namedArgument("query", DSL.literal("field:query"))),
+        AstDSL.function("query", AstDSL.unresolvedArg("query", stringLiteral("field:query"))));
   }
 
   @Test
   void query_string_expression() {
     assertAnalyzeEqual(
         DSL.query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("query_value"))),
-        AstDSL.function("query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field", 1.F))),
+        AstDSL.function(
+            "query_string",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("query_value"))));
   }
 
@@ -513,14 +543,17 @@ void query_string_expression() {
   void query_string_expression_with_params() {
     assertAnalyzeEqual(
         DSL.query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("query_value")),
             DSL.namedArgument("escape", DSL.literal("false"))),
-        AstDSL.function("query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field", 1.F))),
+        AstDSL.function(
+            "query_string",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("query_value")),
             AstDSL.unresolvedArg("escape", stringLiteral("false"))));
   }
@@ -529,14 +562,20 @@ void query_string_expression_with_params() {
   void query_string_expression_two_fields() {
     assertAnalyzeEqual(
         DSL.query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field1", ExprValueUtils.floatValue(1.F),
-                    "field2", ExprValueUtils.floatValue(.3F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of(
+                                "field_value1", ExprValueUtils.floatValue(1.F),
+                                "field_value2", ExprValueUtils.floatValue(.3F)))))),
             DSL.namedArgument("query", DSL.literal("query_value"))),
-        AstDSL.function("query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field1", 1.F, "field2", .3F))),
+        AstDSL.function(
+            "query_string",
+            AstDSL.unresolvedArg(
+                "fields",
+                new RelevanceFieldList(ImmutableMap.of("field_value1", 1.F, "field_value2", .3F))),
             AstDSL.unresolvedArg("query", stringLiteral("query_value"))));
   }
 
@@ -546,7 +585,8 @@ void wildcard_query_expression() {
         DSL.wildcard_query(
             DSL.namedArgument("field", DSL.literal("test")),
             DSL.namedArgument("query", DSL.literal("query_value*"))),
-        AstDSL.function("wildcard_query",
+        AstDSL.function(
+            "wildcard_query",
             unresolvedArg("field", stringLiteral("test")),
             unresolvedArg("query", stringLiteral("query_value*"))));
   }
@@ -560,7 +600,8 @@ void wildcard_query_expression_all_params() {
             DSL.namedArgument("boost", DSL.literal("1.5")),
             DSL.namedArgument("case_insensitive", DSL.literal("true")),
             DSL.namedArgument("rewrite", DSL.literal("scoring_boolean"))),
-        AstDSL.function("wildcard_query",
+        AstDSL.function(
+            "wildcard_query",
             unresolvedArg("field", stringLiteral("test")),
             unresolvedArg("query", stringLiteral("query_value*")),
             unresolvedArg("boost", stringLiteral("1.5")),
@@ -572,24 +613,150 @@ void wildcard_query_expression_all_params() {
   public void match_phrase_prefix_all_params() {
     assertAnalyzeEqual(
         DSL.match_phrase_prefix(
-            DSL.namedArgument("field", "test"),
+            DSL.namedArgument("field", "field_value1"),
             DSL.namedArgument("query", "search query"),
             DSL.namedArgument("slop", "3"),
             DSL.namedArgument("boost", "1.5"),
             DSL.namedArgument("analyzer", "standard"),
             DSL.namedArgument("max_expansions", "4"),
-            DSL.namedArgument("zero_terms_query", "NONE")
-            ),
-        AstDSL.function("match_phrase_prefix",
-          unresolvedArg("field", stringLiteral("test")),
-          unresolvedArg("query", stringLiteral("search query")),
-          unresolvedArg("slop", stringLiteral("3")),
-          unresolvedArg("boost", stringLiteral("1.5")),
-          unresolvedArg("analyzer", stringLiteral("standard")),
-          unresolvedArg("max_expansions", stringLiteral("4")),
-          unresolvedArg("zero_terms_query", stringLiteral("NONE"))
-          )
-    );
+            DSL.namedArgument("zero_terms_query", "NONE")),
+        AstDSL.function(
+            "match_phrase_prefix",
+            unresolvedArg("field", stringLiteral("field_value1")),
+            unresolvedArg("query", stringLiteral("search query")),
+            unresolvedArg("slop", stringLiteral("3")),
+            unresolvedArg("boost", stringLiteral("1.5")),
+            unresolvedArg("analyzer", stringLiteral("standard")),
+            unresolvedArg("max_expansions", stringLiteral("4")),
+            unresolvedArg("zero_terms_query", stringLiteral("NONE"))));
+  }
+
+  @Test
+  void score_function_expression() {
+    assertAnalyzeEqual(
+        DSL.score(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.match_phrase_prefix(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query"),
+                    DSL.namedArgument("slop", "3")))),
+        AstDSL.function(
+            "score",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "match_phrase_prefix",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query")),
+                    unresolvedArg("slop", stringLiteral("3"))))));
+  }
+
+  @Test
+  void score_function_with_boost() {
+    assertAnalyzeEqual(
+        DSL.score(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.match_phrase_prefix(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query"),
+                    DSL.namedArgument("boost", "3.0"))),
+            DSL.namedArgument("boost", "2")),
+        AstDSL.function(
+            "score",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "match_phrase_prefix",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query")),
+                    unresolvedArg("boost", stringLiteral("3.0")))),
+            unresolvedArg("boost", stringLiteral("2"))));
+  }
+
+  @Test
+  void score_query_function_expression() {
+    assertAnalyzeEqual(
+        DSL.score_query(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.wildcard_query(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query")))),
+        AstDSL.function(
+            "score_query",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "wildcard_query",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query"))))));
+  }
+
+  @Test
+  void score_query_function_with_boost() {
+    assertAnalyzeEqual(
+        DSL.score_query(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.wildcard_query(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query"))),
+            DSL.namedArgument("boost", "2.0")),
+        AstDSL.function(
+            "score_query",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "wildcard_query",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query")))),
+            unresolvedArg("boost", stringLiteral("2.0"))));
+  }
+
+  @Test
+  void scorequery_function_expression() {
+    assertAnalyzeEqual(
+        DSL.scorequery(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.simple_query_string(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query"),
+                    DSL.namedArgument("slop", "3")))),
+        AstDSL.function(
+            "scorequery",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "simple_query_string",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query")),
+                    unresolvedArg("slop", stringLiteral("3"))))));
+  }
+
+  @Test
+  void scorequery_function_with_boost() {
+    assertAnalyzeEqual(
+        DSL.scorequery(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.simple_query_string(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query"),
+                    DSL.namedArgument("slop", "3"))),
+            DSL.namedArgument("boost", "2.0")),
+        AstDSL.function(
+            "scorequery",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "simple_query_string",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query")),
+                    unresolvedArg("slop", stringLiteral("3")))),
+            unresolvedArg("boost", stringLiteral("2.0"))));
   }
 
   @Test
@@ -603,8 +770,12 @@ public void function_returns_non_constant_value() {
     // Even a function returns the same values - they are calculated on each call
     // `sysdate()` which returns `LocalDateTime.now()` shouldn't be cached and should return always
     // different values
-    var values = List.of(analyze(function("sysdate")), analyze(function("sysdate")),
-        analyze(function("sysdate")), analyze(function("sysdate")));
+    var values =
+        List.of(
+            analyze(function("sysdate")),
+            analyze(function("sysdate")),
+            analyze(function("sysdate")),
+            analyze(function("sysdate")));
     var referenceValue = analyze(function("sysdate")).valueOf();
     assertTrue(values.stream().noneMatch(v -> v.valueOf() == referenceValue));
   }
@@ -612,8 +783,12 @@ public void function_returns_non_constant_value() {
   @Test
   public void now_as_a_function_not_cached() {
     // // We can call `now()` as a function, in that case nothing should be cached
-    var values = List.of(analyze(function("now")), analyze(function("now")),
-        analyze(function("now")), analyze(function("now")));
+    var values =
+        List.of(
+            analyze(function("now")),
+            analyze(function("now")),
+            analyze(function("now")),
+            analyze(function("now")));
     var referenceValue = analyze(function("now")).valueOf();
     assertTrue(values.stream().noneMatch(v -> v.valueOf() == referenceValue));
   }
@@ -622,13 +797,12 @@ protected Expression analyze(UnresolvedExpression unresolvedExpression) {
     return expressionAnalyzer.analyze(unresolvedExpression, analysisContext);
   }
 
-  protected void assertAnalyzeEqual(Expression expected,
-                                    UnresolvedExpression unresolvedExpression) {
+  protected void assertAnalyzeEqual(
+      Expression expected, UnresolvedExpression unresolvedExpression) {
     assertEquals(expected, analyze(unresolvedExpression));
   }
 
-  protected void assertAnalyzeEqual(Expression expected,
-                                    UnresolvedPlan unresolvedPlan) {
+  protected void assertAnalyzeEqual(Expression expected, UnresolvedPlan unresolvedPlan) {
     assertEquals(expected, analyze(unresolvedPlan));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizerTest.java b/core/src/test/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizerTest.java
index 287cff0e3a..28bcb8793f 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static java.util.Collections.emptyList;
@@ -14,85 +13,71 @@
 
 import com.google.common.collect.ImmutableList;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
 import org.opensearch.sql.expression.window.WindowDefinition;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalPlanDSL;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {AnalyzerTest.class})
 class ExpressionReferenceOptimizerTest extends AnalyzerTestBase {
 
   @Test
   void expression_without_aggregation_should_not_be_replaced() {
     assertEquals(
         DSL.subtract(DSL.ref("age", INTEGER), DSL.literal(1)),
-        optimize(DSL.subtract(DSL.ref("age", INTEGER), DSL.literal(1)))
-    );
+        optimize(DSL.subtract(DSL.ref("age", INTEGER), DSL.literal(1))));
   }
 
   @Test
   void group_expression_should_be_replaced() {
-    assertEquals(
-        DSL.ref("abs(balance)", INTEGER),
-        optimize(DSL.abs(DSL.ref("balance", INTEGER)))
-    );
+    assertEquals(DSL.ref("abs(balance)", INTEGER), optimize(DSL.abs(DSL.ref("balance", INTEGER))));
   }
 
   @Test
   void aggregation_expression_should_be_replaced() {
-    assertEquals(
-        DSL.ref("AVG(age)", DOUBLE),
-        optimize(DSL.avg(DSL.ref("age", INTEGER)))
-    );
+    assertEquals(DSL.ref("AVG(age)", DOUBLE), optimize(DSL.avg(DSL.ref("age", INTEGER))));
   }
 
   @Test
   void aggregation_in_expression_should_be_replaced() {
     assertEquals(
         DSL.subtract(DSL.ref("AVG(age)", DOUBLE), DSL.literal(1)),
-        optimize(DSL.subtract(DSL.avg(DSL.ref("age", INTEGER)), DSL.literal(1)))
-    );
+        optimize(DSL.subtract(DSL.avg(DSL.ref("age", INTEGER)), DSL.literal(1))));
   }
 
   @Test
   void case_clause_should_be_replaced() {
-    Expression caseClause = DSL.cases(
-        null,
-        DSL.when(
-            DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)),
-            DSL.literal("true")));
+    Expression caseClause =
+        DSL.cases(
+            null,
+            DSL.when(DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)), DSL.literal("true")));
 
     LogicalPlan logicalPlan =
         LogicalPlanDSL.aggregation(
             LogicalPlanDSL.relation("test", table),
             emptyList(),
-            ImmutableList.of(DSL.named(
-                "CaseClause(whenClauses=[WhenClause(condition==(age, 30), result=\"true\")],"
-                    + " defaultResult=null)",
-                caseClause)));
+            ImmutableList.of(
+                DSL.named(
+                    "CaseClause(whenClauses=[WhenClause(condition==(age, 30), result=\"true\")],"
+                        + " defaultResult=null)",
+                    caseClause)));
 
     assertEquals(
         DSL.ref(
             "CaseClause(whenClauses=[WhenClause(condition==(age, 30), result=\"true\")],"
-                + " defaultResult=null)", STRING),
+                + " defaultResult=null)",
+            STRING),
         optimize(caseClause, logicalPlan));
   }
 
   @Test
   void aggregation_in_case_when_clause_should_be_replaced() {
-    Expression caseClause = DSL.cases(
-        null,
-        DSL.when(
-            DSL.equal(DSL.avg(DSL.ref("age", INTEGER)), DSL.literal(30)),
-            DSL.literal("true")));
+    Expression caseClause =
+        DSL.cases(
+            null,
+            DSL.when(
+                DSL.equal(DSL.avg(DSL.ref("age", INTEGER)), DSL.literal(30)), DSL.literal("true")));
 
     LogicalPlan logicalPlan =
         LogicalPlanDSL.aggregation(
@@ -103,19 +88,16 @@ void aggregation_in_case_when_clause_should_be_replaced() {
     assertEquals(
         DSL.cases(
             null,
-            DSL.when(
-                DSL.equal(DSL.ref("AVG(age)", DOUBLE), DSL.literal(30)),
-                DSL.literal("true"))),
+            DSL.when(DSL.equal(DSL.ref("AVG(age)", DOUBLE), DSL.literal(30)), DSL.literal("true"))),
         optimize(caseClause, logicalPlan));
   }
 
   @Test
   void aggregation_in_case_else_clause_should_be_replaced() {
-    Expression caseClause = DSL.cases(
-        DSL.avg(DSL.ref("age", INTEGER)),
-        DSL.when(
-            DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)),
-            DSL.literal("true")));
+    Expression caseClause =
+        DSL.cases(
+            DSL.avg(DSL.ref("age", INTEGER)),
+            DSL.when(DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)), DSL.literal("true")));
 
     LogicalPlan logicalPlan =
         LogicalPlanDSL.aggregation(
@@ -126,9 +108,7 @@ void aggregation_in_case_else_clause_should_be_replaced() {
     assertEquals(
         DSL.cases(
             DSL.ref("AVG(age)", DOUBLE),
-            DSL.when(
-                DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)),
-                DSL.literal("true"))),
+            DSL.when(DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)), DSL.literal("true"))),
         optimize(caseClause, logicalPlan));
   }
 
@@ -143,12 +123,8 @@ void window_expression_should_be_replaced() {
             DSL.named(DSL.denseRank()),
             new WindowDefinition(emptyList(), emptyList()));
 
-    assertEquals(
-        DSL.ref("rank()", INTEGER),
-        optimize(DSL.rank(), logicalPlan));
-    assertEquals(
-        DSL.ref("dense_rank()", INTEGER),
-        optimize(DSL.denseRank(), logicalPlan));
+    assertEquals(DSL.ref("rank()", INTEGER), optimize(DSL.rank(), logicalPlan));
+    assertEquals(DSL.ref("dense_rank()", INTEGER), optimize(DSL.denseRank(), logicalPlan));
   }
 
   Expression optimize(Expression expression) {
@@ -165,11 +141,11 @@ Expression optimize(Expression expression, LogicalPlan logicalPlan) {
   LogicalPlan logicalPlan() {
     return LogicalPlanDSL.aggregation(
         LogicalPlanDSL.relation("schema", table),
-        ImmutableList
-            .of(DSL.named("AVG(age)", DSL.avg(DSL.ref("age", INTEGER))),
-                DSL.named("SUM(age)", DSL.sum(DSL.ref("age", INTEGER)))),
-        ImmutableList.of(DSL.named("balance", DSL.ref("balance", INTEGER)),
-            DSL.named("abs(balance)", DSL.abs(DSL.ref("balance", INTEGER))))
-    );
+        ImmutableList.of(
+            DSL.named("AVG(age)", DSL.avg(DSL.ref("age", INTEGER))),
+            DSL.named("SUM(age)", DSL.sum(DSL.ref("age", INTEGER)))),
+        ImmutableList.of(
+            DSL.named("balance", DSL.ref("balance", INTEGER)),
+            DSL.named("abs(balance)", DSL.abs(DSL.ref("balance", INTEGER)))));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java
index 913593add3..68c508b645 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -11,26 +10,18 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.ast.expression.Alias;
 import org.opensearch.sql.ast.expression.HighlightFunction;
 import org.opensearch.sql.ast.expression.Literal;
 import org.opensearch.sql.expression.NamedExpression;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {AnalyzerTestBase.class})
 class NamedExpressionAnalyzerTest extends AnalyzerTestBase {
   @Test
   void visit_named_select_item() {
     Alias alias = AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"));
 
-    NamedExpressionAnalyzer analyzer =
-        new NamedExpressionAnalyzer(expressionAnalyzer);
+    NamedExpressionAnalyzer analyzer = new NamedExpressionAnalyzer(expressionAnalyzer);
 
     NamedExpression analyze = analyzer.analyze(alias, analysisContext);
     assertEquals("integer_value", analyze.getNameOrAlias());
@@ -39,11 +30,10 @@ void visit_named_select_item() {
   @Test
   void visit_highlight() {
     Map<String, Literal> args = new HashMap<>();
-    Alias alias = AstDSL.alias("highlight(fieldA)",
-        new HighlightFunction(
-            AstDSL.stringLiteral("fieldA"), args));
-    NamedExpressionAnalyzer analyzer =
-        new NamedExpressionAnalyzer(expressionAnalyzer);
+    Alias alias =
+        AstDSL.alias(
+            "highlight(fieldA)", new HighlightFunction(AstDSL.stringLiteral("fieldA"), args));
+    NamedExpressionAnalyzer analyzer = new NamedExpressionAnalyzer(expressionAnalyzer);
 
     NamedExpression analyze = analyzer.analyze(alias, analysisContext);
     assertEquals("highlight(fieldA)", analyze.getNameOrAlias());
diff --git a/core/src/test/java/org/opensearch/sql/analysis/QualifierAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/QualifierAnalyzerTest.java
index 8c87b24d3e..3599a86918 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/QualifierAnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/QualifierAnalyzerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -13,18 +12,11 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.analysis.symbol.Namespace;
 import org.opensearch.sql.analysis.symbol.Symbol;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.data.type.ExprType;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {AnalyzerTestBase.class})
 class QualifierAnalyzerTest extends AnalyzerTestBase {
 
   private QualifierAnalyzer qualifierAnalyzer;
@@ -41,18 +33,26 @@ void should_return_original_name_if_no_qualifier() {
 
   @Test
   void should_report_error_if_qualifier_is_not_index() {
-    runInScope(new Symbol(Namespace.FIELD_NAME, "aIndex"), ARRAY, () -> {
-      SyntaxCheckException error = assertThrows(SyntaxCheckException.class,
-          () -> qualifierAnalyzer.unqualified("a", "integer_value"));
-      assertEquals("The qualifier [a] of qualified name [a.integer_value] "
-              + "must be an field name, index name or its alias", error.getMessage());
-    });
+    runInScope(
+        new Symbol(Namespace.FIELD_NAME, "aIndex"),
+        ARRAY,
+        () -> {
+          SyntaxCheckException error =
+              assertThrows(
+                  SyntaxCheckException.class,
+                  () -> qualifierAnalyzer.unqualified("a", "integer_value"));
+          assertEquals(
+              "The qualifier [a] of qualified name [a.integer_value] "
+                  + "must be an field name, index name or its alias",
+              error.getMessage());
+        });
   }
 
   @Test
   void should_report_error_if_qualifier_is_not_exist() {
-    SyntaxCheckException error = assertThrows(SyntaxCheckException.class,
-        () -> qualifierAnalyzer.unqualified("a", "integer_value"));
+    SyntaxCheckException error =
+        assertThrows(
+            SyntaxCheckException.class, () -> qualifierAnalyzer.unqualified("a", "integer_value"));
     assertEquals(
         "The qualifier [a] of qualified name [a.integer_value] must be an field name, index name "
             + "or its alias",
@@ -61,23 +61,26 @@ void should_report_error_if_qualifier_is_not_exist() {
 
   @Test
   void should_return_qualified_name_if_qualifier_is_index() {
-    runInScope(new Symbol(Namespace.INDEX_NAME, "a"), STRUCT, () ->
-        assertEquals("integer_value", qualifierAnalyzer.unqualified("a", "integer_value"))
-    );
+    runInScope(
+        new Symbol(Namespace.INDEX_NAME, "a"),
+        STRUCT,
+        () -> assertEquals("integer_value", qualifierAnalyzer.unqualified("a", "integer_value")));
   }
 
   @Test
   void should_return_qualified_name_if_qualifier_is_field() {
-    runInScope(new Symbol(Namespace.FIELD_NAME, "a"), STRUCT, () ->
-        assertEquals("a.integer_value", qualifierAnalyzer.unqualified("a", "integer_value"))
-    );
+    runInScope(
+        new Symbol(Namespace.FIELD_NAME, "a"),
+        STRUCT,
+        () -> assertEquals("a.integer_value", qualifierAnalyzer.unqualified("a", "integer_value")));
   }
 
   @Test
   void should_report_error_if_more_parts_in_qualified_name() {
-    runInScope(new Symbol(Namespace.INDEX_NAME, "a"), STRUCT, () ->
-        qualifierAnalyzer.unqualified("a", "integer_value", "invalid")
-    );
+    runInScope(
+        new Symbol(Namespace.INDEX_NAME, "a"),
+        STRUCT,
+        () -> qualifierAnalyzer.unqualified("a", "integer_value", "invalid"));
   }
 
   private void runInScope(Symbol symbol, ExprType type, Runnable test) {
@@ -89,5 +92,4 @@ private void runInScope(Symbol symbol, ExprType type, Runnable test) {
       analysisContext.pop();
     }
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/SelectAnalyzeTest.java b/core/src/test/java/org/opensearch/sql/analysis/SelectAnalyzeTest.java
index 82f3a87e30..27edc588fa 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/SelectAnalyzeTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/SelectAnalyzeTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.opensearch.sql.ast.dsl.AstDSL.argument;
@@ -17,20 +16,13 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.ast.expression.AllFields;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.planner.logical.LogicalPlanDSL;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {SelectAnalyzeTest.class})
 public class SelectAnalyzeTest extends AnalyzerTestBase {
 
   @Override
@@ -51,8 +43,7 @@ public void project_all_from_source() {
             DSL.named("double_value", DSL.ref("double_value", DOUBLE)),
             DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
             DSL.named("double_value", DSL.ref("double_value", DOUBLE)),
-            DSL.named("string_value", DSL.ref("string_value", STRING))
-        ),
+            DSL.named("string_value", DSL.ref("string_value", STRING))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
@@ -68,11 +59,9 @@ public void select_and_project_all() {
             LogicalPlanDSL.project(
                 LogicalPlanDSL.relation("schema", table),
                 DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-                DSL.named("double_value", DSL.ref("double_value", DOUBLE))
-            ),
+                DSL.named("double_value", DSL.ref("double_value", DOUBLE))),
             DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-            DSL.named("double_value", DSL.ref("double_value", DOUBLE))
-        ),
+            DSL.named("double_value", DSL.ref("double_value", DOUBLE))),
         AstDSL.projectWithArg(
             AstDSL.projectWithArg(
                 AstDSL.relation("schema"),
@@ -80,8 +69,7 @@ public void select_and_project_all() {
                 AstDSL.field("integer_value"),
                 AstDSL.field("double_value")),
             AstDSL.defaultFieldsArgs(),
-            AllFields.of()
-        ));
+            AllFields.of()));
   }
 
   @Test
@@ -91,10 +79,8 @@ public void remove_and_project_all() {
             LogicalPlanDSL.remove(
                 LogicalPlanDSL.relation("schema", table),
                 DSL.ref("integer_value", INTEGER),
-                DSL.ref("double_value", DOUBLE)
-            ),
-            DSL.named("string_value", DSL.ref("string_value", STRING))
-        ),
+                DSL.ref("double_value", DOUBLE)),
+            DSL.named("string_value", DSL.ref("string_value", STRING))),
         AstDSL.projectWithArg(
             AstDSL.projectWithArg(
                 AstDSL.relation("schema"),
@@ -102,8 +88,7 @@ public void remove_and_project_all() {
                 AstDSL.field("integer_value"),
                 AstDSL.field("double_value")),
             AstDSL.defaultFieldsArgs(),
-            AllFields.of()
-        ));
+            AllFields.of()));
   }
 
   @Test
@@ -112,20 +97,21 @@ public void stats_and_project_all() {
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList.of(DSL
-                    .named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
                 ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING)))),
             DSL.named("avg(integer_value)", DSL.ref("avg(integer_value)", DOUBLE)),
-            DSL.named("string_value", DSL.ref("string_value", STRING))
-        ),
+            DSL.named("string_value", DSL.ref("string_value", STRING))),
         AstDSL.projectWithArg(
             AstDSL.agg(
                 AstDSL.relation("schema"),
-                AstDSL.exprList(AstDSL.alias("avg(integer_value)", AstDSL.aggregate("avg",
-                    field("integer_value")))),
+                AstDSL.exprList(
+                    AstDSL.alias(
+                        "avg(integer_value)", AstDSL.aggregate("avg", field("integer_value")))),
                 null,
                 ImmutableList.of(AstDSL.alias("string_value", field("string_value"))),
-                AstDSL.defaultStatsArgs()), AstDSL.defaultFieldsArgs(),
+                AstDSL.defaultStatsArgs()),
+            AstDSL.defaultFieldsArgs(),
             AllFields.of()));
   }
 
@@ -138,14 +124,12 @@ public void rename_and_project_all() {
                 ImmutableMap.of(DSL.ref("integer_value", INTEGER), DSL.ref("ivalue", INTEGER))),
             DSL.named("double_value", DSL.ref("double_value", DOUBLE)),
             DSL.named("string_value", DSL.ref("string_value", STRING)),
-            DSL.named("ivalue", DSL.ref("ivalue", INTEGER))
-        ),
+            DSL.named("ivalue", DSL.ref("ivalue", INTEGER))),
         AstDSL.projectWithArg(
             AstDSL.rename(
                 AstDSL.relation("schema"),
                 AstDSL.map(AstDSL.field("integer_value"), AstDSL.field("ivalue"))),
             AstDSL.defaultFieldsArgs(),
-            AllFields.of()
-        ));
+            AllFields.of()));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/SelectExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/SelectExpressionAnalyzerTest.java
index a9fb03d2d5..38d4704bcd 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/SelectExpressionAnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/SelectExpressionAnalyzerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -24,33 +23,24 @@
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.NamedExpression;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
 @ExtendWith(MockitoExtension.class)
-@ContextConfiguration(classes = {SelectExpressionAnalyzerTest.class})
 public class SelectExpressionAnalyzerTest extends AnalyzerTestBase {
 
-  @Mock
-  private ExpressionReferenceOptimizer optimizer;
+  @Mock private ExpressionReferenceOptimizer optimizer;
 
   @Test
   public void named_expression() {
     assertAnalyzeEqual(
         DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-        AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"))
-    );
+        AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value")));
   }
 
   @Test
   public void named_expression_with_alias() {
     assertAnalyzeEqual(
         DSL.named("integer_value", DSL.ref("integer_value", INTEGER), "int"),
-        AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"), "int")
-    );
+        AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"), "int"));
   }
 
   @Test
@@ -58,9 +48,8 @@ public void field_name_with_qualifier() {
     analysisContext.peek().define(new Symbol(Namespace.INDEX_NAME, "index_alias"), STRUCT);
     assertAnalyzeEqual(
         DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-        AstDSL.alias("integer_alias.integer_value",
-            AstDSL.qualifiedName("index_alias", "integer_value"))
-    );
+        AstDSL.alias(
+            "integer_alias.integer_value", AstDSL.qualifiedName("index_alias", "integer_value")));
   }
 
   @Test
@@ -68,9 +57,9 @@ public void field_name_with_qualifier_quoted() {
     analysisContext.peek().define(new Symbol(Namespace.INDEX_NAME, "index_alias"), STRUCT);
     assertAnalyzeEqual(
         DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-        AstDSL.alias("`integer_alias`.integer_value", // qualifier in SELECT is quoted originally
-            AstDSL.qualifiedName("index_alias", "integer_value"))
-    );
+        AstDSL.alias(
+            "`integer_alias`.integer_value", // qualifier in SELECT is quoted originally
+            AstDSL.qualifiedName("index_alias", "integer_value")));
   }
 
   @Test
@@ -78,21 +67,21 @@ public void field_name_in_expression_with_qualifier() {
     analysisContext.peek().define(new Symbol(Namespace.INDEX_NAME, "index_alias"), STRUCT);
     assertAnalyzeEqual(
         DSL.named("abs(index_alias.integer_value)", DSL.abs(DSL.ref("integer_value", INTEGER))),
-        AstDSL.alias("abs(index_alias.integer_value)",
-            AstDSL.function("abs", AstDSL.qualifiedName("index_alias", "integer_value")))
-    );
+        AstDSL.alias(
+            "abs(index_alias.integer_value)",
+            AstDSL.function("abs", AstDSL.qualifiedName("index_alias", "integer_value"))));
   }
 
   protected List<NamedExpression> analyze(UnresolvedExpression unresolvedExpression) {
-    doAnswer(invocation -> ((NamedExpression) invocation.getArgument(0))
-        .getDelegated()).when(optimizer).optimize(any(), any());
+    doAnswer(invocation -> ((NamedExpression) invocation.getArgument(0)).getDelegated())
+        .when(optimizer)
+        .optimize(any(), any());
     return new SelectExpressionAnalyzer(expressionAnalyzer)
-        .analyze(Arrays.asList(unresolvedExpression),
-            analysisContext, optimizer);
+        .analyze(Arrays.asList(unresolvedExpression), analysisContext, optimizer);
   }
 
-  protected void assertAnalyzeEqual(NamedExpression expected,
-                                    UnresolvedExpression unresolvedExpression) {
+  protected void assertAnalyzeEqual(
+      NamedExpression expected, UnresolvedExpression unresolvedExpression) {
     assertEquals(Arrays.asList(expected), analyze(unresolvedExpression));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/TypeEnvironmentTest.java b/core/src/test/java/org/opensearch/sql/analysis/TypeEnvironmentTest.java
index c963e1d30d..91677a901e 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/TypeEnvironmentTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/TypeEnvironmentTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -21,9 +20,7 @@
 
 public class TypeEnvironmentTest {
 
-  /**
-   * Use context class for push/pop.
-   */
+  /** Use context class for push/pop. */
   private AnalysisContext context = new AnalysisContext();
 
   @Test
@@ -69,20 +66,24 @@ public void defineFieldSymbolInDifferentEnvironmentsShouldNotAbleToResolveOncePo
     assertEquals(INTEGER, environment().resolve(toSymbol(age)));
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class, () -> environment().resolve(toSymbol(city)));
-    assertEquals("can't resolve Symbol(namespace=FIELD_NAME, name=s.city) in type env",
+    assertEquals(
+        "can't resolve Symbol(namespace=FIELD_NAME, name=s.city) in type env",
         exception.getMessage());
-    exception = assertThrows(SemanticCheckException.class,
-        () -> environment().resolve(toSymbol(manager)));
-    assertEquals("can't resolve Symbol(namespace=FIELD_NAME, name=s.manager) in type env",
+    exception =
+        assertThrows(SemanticCheckException.class, () -> environment().resolve(toSymbol(manager)));
+    assertEquals(
+        "can't resolve Symbol(namespace=FIELD_NAME, name=s.manager) in type env",
         exception.getMessage());
   }
 
   @Test
   public void resolveLiteralInEnvFailed() {
-    SemanticCheckException exception = assertThrows(SemanticCheckException.class,
-        () -> environment().resolve(new Symbol(Namespace.FIELD_NAME, "1")));
-    assertEquals("can't resolve Symbol(namespace=FIELD_NAME, name=1) in type env",
-        exception.getMessage());
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> environment().resolve(new Symbol(Namespace.FIELD_NAME, "1")));
+    assertEquals(
+        "can't resolve Symbol(namespace=FIELD_NAME, name=1) in type env", exception.getMessage());
   }
 
   private TypeEnvironment environment() {
@@ -92,5 +93,4 @@ private TypeEnvironment environment() {
   private Symbol toSymbol(ReferenceExpression ref) {
     return new Symbol(Namespace.FIELD_NAME, ref.getAttr());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/WindowExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/WindowExpressionAnalyzerTest.java
index cf0a90a436..acb11f0b57 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/WindowExpressionAnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/WindowExpressionAnalyzerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -21,10 +20,7 @@
 import java.util.Collections;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayNameGeneration;
-import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.ast.expression.Alias;
 import org.opensearch.sql.ast.tree.Sort.SortOption;
@@ -34,14 +30,7 @@
 import org.opensearch.sql.planner.logical.LogicalPlanDSL;
 import org.opensearch.sql.planner.logical.LogicalRelation;
 import org.opensearch.sql.planner.logical.LogicalSort;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {SelectExpressionAnalyzerTest.class})
-@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class WindowExpressionAnalyzerTest extends AnalyzerTestBase {
 
   private LogicalPlan child;
@@ -85,16 +74,12 @@ void should_not_generate_sort_operator_if_no_partition_by_and_order_by_list() {
         LogicalPlanDSL.window(
             LogicalPlanDSL.relation("test", table),
             DSL.named("row_number", DSL.rowNumber()),
-            new WindowDefinition(
-                ImmutableList.of(),
-                ImmutableList.of())),
+            new WindowDefinition(ImmutableList.of(), ImmutableList.of())),
         analyzer.analyze(
             AstDSL.alias(
                 "row_number",
                 AstDSL.window(
-                    AstDSL.function("row_number"),
-                    ImmutableList.of(),
-                    ImmutableList.of())),
+                    AstDSL.function("row_number"), ImmutableList.of(), ImmutableList.of())),
             analysisContext));
   }
 
@@ -103,10 +88,7 @@ void should_return_original_child_if_project_item_not_windowed() {
     assertEquals(
         child,
         analyzer.analyze(
-            AstDSL.alias(
-                "string_value",
-                AstDSL.qualifiedName("string_value")),
-            analysisContext));
+            AstDSL.alias("string_value", AstDSL.qualifiedName("string_value")), analysisContext));
   }
 
   @Test
@@ -124,20 +106,23 @@ void can_analyze_sort_options() {
             .put(new SortOption(DESC, NULL_LAST), DEFAULT_DESC)
             .build();
 
-    expects.forEach((option, expect) -> {
-      Alias ast = AstDSL.alias(
-          "row_number",
-          AstDSL.window(
-              AstDSL.function("row_number"),
-              Collections.emptyList(),
-              ImmutableList.of(
-                  ImmutablePair.of(option, AstDSL.qualifiedName("integer_value")))));
+    expects.forEach(
+        (option, expect) -> {
+          Alias ast =
+              AstDSL.alias(
+                  "row_number",
+                  AstDSL.window(
+                      AstDSL.function("row_number"),
+                      Collections.emptyList(),
+                      ImmutableList.of(
+                          ImmutablePair.of(option, AstDSL.qualifiedName("integer_value")))));
 
-      LogicalPlan plan = analyzer.analyze(ast, analysisContext);
-      LogicalSort sort = (LogicalSort) plan.getChild().get(0);
-      assertEquals(expect, sort.getSortList().get(0).getLeft(),
-          "Assertion failed on input option: " + option);
-    });
+          LogicalPlan plan = analyzer.analyze(ast, analysisContext);
+          LogicalSort sort = (LogicalSort) plan.getChild().get(0);
+          assertEquals(
+              expect,
+              sort.getSortList().get(0).getLeft(),
+              "Assertion failed on input option: " + option);
+        });
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/model/DataSourceSchemaIdentifierNameResolverTest.java b/core/src/test/java/org/opensearch/sql/analysis/model/DataSourceSchemaIdentifierNameResolverTest.java
index 7d7c92f3ed..775984a528 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/model/DataSourceSchemaIdentifierNameResolverTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/model/DataSourceSchemaIdentifierNameResolverTest.java
@@ -7,24 +7,84 @@
 
 package org.opensearch.sql.analysis.model;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_SCHEMA_NAME;
+import static org.opensearch.sql.analysis.model.DataSourceSchemaIdentifierNameResolverTest.Identifier.identifierOf;
 
 import java.util.Arrays;
-import java.util.Collections;
-import org.junit.jupiter.api.Assertions;
+import java.util.List;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver;
+import org.opensearch.sql.datasource.DataSourceService;
 
+@ExtendWith(MockitoExtension.class)
 public class DataSourceSchemaIdentifierNameResolverTest {
 
+  @Mock private DataSourceService dataSourceService;
+
   @Test
   void testFullyQualifiedName() {
-    DataSourceSchemaIdentifierNameResolver
-        dataSourceSchemaIdentifierNameResolver = new DataSourceSchemaIdentifierNameResolver(
-        Arrays.asList("prom", "information_schema", "tables"), Collections.singleton("prom"));
-    Assertions.assertEquals("information_schema",
-        dataSourceSchemaIdentifierNameResolver.getSchemaName());
-    Assertions.assertEquals("prom", dataSourceSchemaIdentifierNameResolver.getDataSourceName());
-    Assertions.assertEquals("tables", dataSourceSchemaIdentifierNameResolver.getIdentifierName());
+    when(dataSourceService.dataSourceExists("prom")).thenReturn(Boolean.TRUE);
+    identifierOf(Arrays.asList("prom", "information_schema", "tables"), dataSourceService)
+        .datasource("prom")
+        .schema("information_schema")
+        .name("tables");
+  }
+
+  @Test
+  void defaultDataSourceNameResolve() {
+    when(dataSourceService.dataSourceExists(any())).thenReturn(Boolean.FALSE);
+    identifierOf(Arrays.asList("tables"), dataSourceService)
+        .datasource(DEFAULT_DATASOURCE_NAME)
+        .schema(DEFAULT_SCHEMA_NAME)
+        .name("tables");
+
+    when(dataSourceService.dataSourceExists(any())).thenReturn(Boolean.FALSE);
+    identifierOf(Arrays.asList("information_schema", "tables"), dataSourceService)
+        .datasource(DEFAULT_DATASOURCE_NAME)
+        .schema("information_schema")
+        .name("tables");
+
+    when(dataSourceService.dataSourceExists(any())).thenReturn(Boolean.TRUE);
+    identifierOf(
+            Arrays.asList(DEFAULT_DATASOURCE_NAME, "information_schema", "tables"),
+            dataSourceService)
+        .datasource(DEFAULT_DATASOURCE_NAME)
+        .schema("information_schema")
+        .name("tables");
   }
 
+  static class Identifier {
+    private final DataSourceSchemaIdentifierNameResolver resolver;
+
+    protected static Identifier identifierOf(
+        List<String> parts, DataSourceService dataSourceService) {
+      return new Identifier(parts, dataSourceService);
+    }
+
+    Identifier(List<String> parts, DataSourceService dataSourceService) {
+      resolver = new DataSourceSchemaIdentifierNameResolver(dataSourceService, parts);
+    }
+
+    Identifier datasource(String expectedDatasource) {
+      assertEquals(expectedDatasource, resolver.getDataSourceName());
+      return this;
+    }
+
+    Identifier schema(String expectedSchema) {
+      assertEquals(expectedSchema, resolver.getSchemaName());
+      return this;
+    }
+
+    Identifier name(String expectedName) {
+      assertEquals(expectedName, resolver.getIdentifierName());
+      return this;
+    }
+  }
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/symbol/SymbolTableTest.java b/core/src/test/java/org/opensearch/sql/analysis/symbol/SymbolTableTest.java
index 90f98e8492..176390560e 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/symbol/SymbolTableTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/symbol/SymbolTableTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis.symbol;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -24,7 +23,6 @@
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.data.type.ExprType;
 
-
 public class SymbolTableTest {
 
   private SymbolTable symbolTable;
@@ -60,13 +58,7 @@ public void defineFieldSymbolShouldBeAbleToResolveByPrefix() {
     Map<String, ExprType> typeByName =
         symbolTable.lookupByPrefix(new Symbol(Namespace.FIELD_NAME, "s.projects"));
 
-    assertThat(
-        typeByName,
-        allOf(
-            aMapWithSize(1),
-            hasEntry("s.projects.active", BOOLEAN)
-        )
-    );
+    assertThat(typeByName, allOf(aMapWithSize(1), hasEntry("s.projects.active", BOOLEAN)));
   }
 
   @Test
@@ -76,17 +68,11 @@ public void lookupAllFieldsReturnUnnestedFields() {
     symbolTable.store(new Symbol(Namespace.FIELD_NAME, "active.manager.name"), STRING);
     symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.address"), BOOLEAN);
 
-    Map<String, ExprType> typeByName =
-        symbolTable.lookupAllFields(Namespace.FIELD_NAME);
+    Map<String, ExprType> typeByName = symbolTable.lookupAllFields(Namespace.FIELD_NAME);
 
     assertThat(
         typeByName,
-        allOf(
-            aMapWithSize(2),
-            hasEntry("active", BOOLEAN),
-            hasEntry("s.address", BOOLEAN)
-        )
-    );
+        allOf(aMapWithSize(2), hasEntry("active", BOOLEAN), hasEntry("s.address", BOOLEAN)));
   }
 
   @Test
@@ -94,8 +80,8 @@ public void failedToResolveSymbolNoNamespaceMatched() {
     symbolTable.store(new Symbol(Namespace.FUNCTION_NAME, "customFunction"), BOOLEAN);
     assertFalse(symbolTable.lookup(new Symbol(Namespace.FIELD_NAME, "s.projects")).isPresent());
 
-    assertThat(symbolTable.lookupByPrefix(new Symbol(Namespace.FIELD_NAME, "s.projects")),
-        anEmptyMap());
+    assertThat(
+        symbolTable.lookupByPrefix(new Symbol(Namespace.FIELD_NAME, "s.projects")), anEmptyMap());
   }
 
   @Test
@@ -111,5 +97,4 @@ private void defineSymbolShouldBeAbleToResolve(Symbol symbol, ExprType expectedT
     assertTrue(actualType.isPresent());
     assertEquals(expectedType, actualType.get());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/ast/expression/CastTest.java b/core/src/test/java/org/opensearch/sql/ast/expression/CastTest.java
index d9386ab122..741db07eb3 100644
--- a/core/src/test/java/org/opensearch/sql/ast/expression/CastTest.java
+++ b/core/src/test/java/org/opensearch/sql/ast/expression/CastTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -23,5 +22,4 @@ void cast_to_int_and_integer_should_convert_to_same_function_impl() {
         new Cast(booleanLiteral(true), stringLiteral("INT")).convertFunctionName(),
         new Cast(booleanLiteral(true), stringLiteral("INTEGER")).convertFunctionName());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/ast/expression/QualifiedNameTest.java b/core/src/test/java/org/opensearch/sql/ast/expression/QualifiedNameTest.java
index b0ab66bc0e..c211f36ba7 100644
--- a/core/src/test/java/org/opensearch/sql/ast/expression/QualifiedNameTest.java
+++ b/core/src/test/java/org/opensearch/sql/ast/expression/QualifiedNameTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,5 +35,4 @@ void should_return_empty_if_only_single_part() {
     assertFalse(name.first().isPresent());
     assertFalse(name.getPrefix().isPresent());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/common/utils/StringUtilsTest.java b/core/src/test/java/org/opensearch/sql/common/utils/StringUtilsTest.java
index 06ea404fc2..157b60cbc7 100644
--- a/core/src/test/java/org/opensearch/sql/common/utils/StringUtilsTest.java
+++ b/core/src/test/java/org/opensearch/sql/common/utils/StringUtilsTest.java
@@ -42,7 +42,5 @@ void unquoteTest() {
     assertEquals("don't", unquoteText("'don't'"));
     assertEquals("hello`", unquoteText("`hello``"));
     assertEquals("don\"t", unquoteText("\"don\"t\""));
-
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/config/TestConfig.java b/core/src/test/java/org/opensearch/sql/config/TestConfig.java
index a0ef436162..92b6aac64f 100644
--- a/core/src/test/java/org/opensearch/sql/config/TestConfig.java
+++ b/core/src/test/java/org/opensearch/sql/config/TestConfig.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.config;
 
 import com.google.common.collect.ImmutableMap;
@@ -22,13 +21,8 @@
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.storage.Table;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-/**
- * Configuration will be used for UT.
- */
-@Configuration
+/** Configuration will be used for UT. */
 public class TestConfig {
   public static final String INT_TYPE_NULL_VALUE_FIELD = "int_null_value";
   public static final String INT_TYPE_MISSING_VALUE_FIELD = "int_missing_value";
@@ -39,27 +33,34 @@ public class TestConfig {
   public static final String STRING_TYPE_NULL_VALUE_FIELD = "string_null_value";
   public static final String STRING_TYPE_MISSING_VALUE_FIELD = "string_missing_value";
 
-  public static Map<String, ExprType> typeMapping = new ImmutableMap.Builder<String, ExprType>()
-      .put("integer_value", ExprCoreType.INTEGER)
-      .put(INT_TYPE_NULL_VALUE_FIELD, ExprCoreType.INTEGER)
-      .put(INT_TYPE_MISSING_VALUE_FIELD, ExprCoreType.INTEGER)
-      .put("long_value", ExprCoreType.LONG)
-      .put("float_value", ExprCoreType.FLOAT)
-      .put("double_value", ExprCoreType.DOUBLE)
-      .put(DOUBLE_TYPE_NULL_VALUE_FIELD, ExprCoreType.DOUBLE)
-      .put(DOUBLE_TYPE_MISSING_VALUE_FIELD, ExprCoreType.DOUBLE)
-      .put("boolean_value", ExprCoreType.BOOLEAN)
-      .put(BOOL_TYPE_NULL_VALUE_FIELD, ExprCoreType.BOOLEAN)
-      .put(BOOL_TYPE_MISSING_VALUE_FIELD, ExprCoreType.BOOLEAN)
-      .put("string_value", ExprCoreType.STRING)
-      .put(STRING_TYPE_NULL_VALUE_FIELD, ExprCoreType.STRING)
-      .put(STRING_TYPE_MISSING_VALUE_FIELD, ExprCoreType.STRING)
-      .put("struct_value", ExprCoreType.STRUCT)
-      .put("array_value", ExprCoreType.ARRAY)
-      .put("timestamp_value", ExprCoreType.TIMESTAMP)
-      .build();
+  public static Map<String, ExprType> typeMapping =
+      new ImmutableMap.Builder<String, ExprType>()
+          .put("integer_value", ExprCoreType.INTEGER)
+          .put(INT_TYPE_NULL_VALUE_FIELD, ExprCoreType.INTEGER)
+          .put(INT_TYPE_MISSING_VALUE_FIELD, ExprCoreType.INTEGER)
+          .put("long_value", ExprCoreType.LONG)
+          .put("float_value", ExprCoreType.FLOAT)
+          .put("double_value", ExprCoreType.DOUBLE)
+          .put(DOUBLE_TYPE_NULL_VALUE_FIELD, ExprCoreType.DOUBLE)
+          .put(DOUBLE_TYPE_MISSING_VALUE_FIELD, ExprCoreType.DOUBLE)
+          .put("boolean_value", ExprCoreType.BOOLEAN)
+          .put(BOOL_TYPE_NULL_VALUE_FIELD, ExprCoreType.BOOLEAN)
+          .put(BOOL_TYPE_MISSING_VALUE_FIELD, ExprCoreType.BOOLEAN)
+          .put("string_value", ExprCoreType.STRING)
+          .put(STRING_TYPE_NULL_VALUE_FIELD, ExprCoreType.STRING)
+          .put(STRING_TYPE_MISSING_VALUE_FIELD, ExprCoreType.STRING)
+          .put("struct_value", ExprCoreType.STRUCT)
+          .put("array_value", ExprCoreType.ARRAY)
+          .put("timestamp_value", ExprCoreType.TIMESTAMP)
+          .put("field_value1", ExprCoreType.STRING)
+          .put("field_value2", ExprCoreType.STRING)
+          .put("message", ExprCoreType.STRING)
+          .put("message.info", ExprCoreType.STRING)
+          .put("message.info.id", ExprCoreType.STRING)
+          .put("comment", ExprCoreType.STRING)
+          .put("comment.data", ExprCoreType.STRING)
+          .build();
 
-  @Bean
   protected StorageEngine storageEngine() {
     return new StorageEngine() {
       @Override
@@ -89,18 +90,17 @@ public PhysicalPlan implement(LogicalPlan plan) {
     };
   }
 
-
-  @Bean
   protected SymbolTable symbolTable() {
     SymbolTable symbolTable = new SymbolTable();
-    typeMapping.entrySet()
+    typeMapping
+        .entrySet()
         .forEach(
-            entry -> symbolTable
-                .store(new Symbol(Namespace.FIELD_NAME, entry.getKey()), entry.getValue()));
+            entry ->
+                symbolTable.store(
+                    new Symbol(Namespace.FIELD_NAME, entry.getKey()), entry.getValue()));
     return symbolTable;
   }
 
-  @Bean
   protected Environment<Expression, ExprType> typeEnv() {
     return var -> {
       if (var instanceof ReferenceExpression) {
diff --git a/core/src/test/java/org/opensearch/sql/data/model/DateTimeValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/DateTimeValueTest.java
index 3a7df17d90..01fe4a5e4e 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/DateTimeValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/DateTimeValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -11,15 +10,16 @@
 import static org.opensearch.sql.data.model.ExprValueUtils.integerValue;
 import static org.opensearch.sql.data.type.ExprCoreType.TIME;
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.function.FunctionProperties;
 
 public class DateTimeValueTest {
 
@@ -27,14 +27,34 @@ public class DateTimeValueTest {
 
   @Test
   public void timeValueInterfaceTest() {
-    ExprValue timeValue = new ExprTimeValue("01:01:01");
+    ExprTimeValue timeValue = new ExprTimeValue("01:01:01");
 
     assertEquals(TIME, timeValue.type());
+
     assertEquals(LocalTime.parse("01:01:01"), timeValue.timeValue());
+    // It is prohibited to acquire values which include date part from `ExprTimeValue`
+    // without a FunctionProperties object
+    var exception = assertThrows(ExpressionEvaluationException.class, timeValue::dateValue);
+    assertEquals("invalid to get dateValue from value of type TIME", exception.getMessage());
+    exception = assertThrows(ExpressionEvaluationException.class, timeValue::datetimeValue);
+    assertEquals("invalid to get datetimeValue from value of type TIME", exception.getMessage());
+    exception = assertThrows(ExpressionEvaluationException.class, timeValue::timestampValue);
+    assertEquals("invalid to get timestampValue from value of type TIME", exception.getMessage());
+
+    var functionProperties = new FunctionProperties();
+    var today = LocalDate.now(functionProperties.getQueryStartClock());
+
+    assertEquals(today, timeValue.dateValue(functionProperties));
+    assertEquals(today.atTime(1, 1, 1), timeValue.datetimeValue(functionProperties));
+    assertEquals(
+        ZonedDateTime.of(LocalTime.parse("01:01:01").atDate(today), UTC_ZONE_ID).toInstant(),
+        timeValue.timestampValue(functionProperties));
+
     assertEquals("01:01:01", timeValue.value());
     assertEquals("TIME '01:01:01'", timeValue.toString());
-    assertThrows(ExpressionEvaluationException.class, () -> integerValue(1).timeValue(),
-        "invalid to get timeValue from value of type INTEGER");
+    exception =
+        assertThrows(ExpressionEvaluationException.class, () -> integerValue(1).timeValue());
+    assertEquals("invalid to get timeValue from value of type INTEGER", exception.getMessage());
   }
 
   @Test
@@ -42,14 +62,17 @@ public void timestampValueInterfaceTest() {
     ExprValue timestampValue = new ExprTimestampValue("2020-07-07 01:01:01");
 
     assertEquals(TIMESTAMP, timestampValue.type());
-    assertEquals(ZonedDateTime.of(LocalDateTime.parse("2020-07-07T01:01:01"),
-        ZoneId.of("UTC")).toInstant(), timestampValue.timestampValue());
+    assertEquals(
+        ZonedDateTime.of(LocalDateTime.parse("2020-07-07T01:01:01"), UTC_ZONE_ID).toInstant(),
+        timestampValue.timestampValue());
     assertEquals("2020-07-07 01:01:01", timestampValue.value());
     assertEquals("TIMESTAMP '2020-07-07 01:01:01'", timestampValue.toString());
     assertEquals(LocalDate.parse("2020-07-07"), timestampValue.dateValue());
     assertEquals(LocalTime.parse("01:01:01"), timestampValue.timeValue());
     assertEquals(LocalDateTime.parse("2020-07-07T01:01:01"), timestampValue.datetimeValue());
-    assertThrows(ExpressionEvaluationException.class, () -> integerValue(1).timestampValue(),
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> integerValue(1).timestampValue(),
         "invalid to get timestampValue from value of type INTEGER");
   }
 
@@ -60,12 +83,12 @@ public void dateValueInterfaceTest() {
     assertEquals(LocalDate.parse("2012-07-07"), dateValue.dateValue());
     assertEquals(LocalTime.parse("00:00:00"), dateValue.timeValue());
     assertEquals(LocalDateTime.parse("2012-07-07T00:00:00"), dateValue.datetimeValue());
-    assertEquals(ZonedDateTime.of(LocalDateTime.parse("2012-07-07T00:00:00"),
-        ZoneId.systemDefault()).toInstant(), dateValue.timestampValue());
+    assertEquals(
+        ZonedDateTime.of(LocalDateTime.parse("2012-07-07T00:00:00"), UTC_ZONE_ID).toInstant(),
+        dateValue.timestampValue());
     ExpressionEvaluationException exception =
         assertThrows(ExpressionEvaluationException.class, () -> integerValue(1).dateValue());
-    assertEquals("invalid to get dateValue from value of type INTEGER",
-        exception.getMessage());
+    assertEquals("invalid to get dateValue from value of type INTEGER", exception.getMessage());
   }
 
   @Test
@@ -75,10 +98,13 @@ public void datetimeValueInterfaceTest() {
     assertEquals(LocalDateTime.parse("2020-08-17T19:44:00"), datetimeValue.datetimeValue());
     assertEquals(LocalDate.parse("2020-08-17"), datetimeValue.dateValue());
     assertEquals(LocalTime.parse("19:44:00"), datetimeValue.timeValue());
-    assertEquals(ZonedDateTime.of(LocalDateTime.parse("2020-08-17T19:44:00"),
-        ZoneId.of("UTC")).toInstant(), datetimeValue.timestampValue());
+    assertEquals(
+        ZonedDateTime.of(LocalDateTime.parse("2020-08-17T19:44:00"), UTC_ZONE_ID).toInstant(),
+        datetimeValue.timestampValue());
     assertEquals("DATETIME '2020-08-17 19:44:00'", datetimeValue.toString());
-    assertThrows(ExpressionEvaluationException.class, () -> integerValue(1).datetimeValue(),
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> integerValue(1).datetimeValue(),
         "invalid to get datetimeValue from value of type INTEGER");
   }
 
@@ -86,37 +112,38 @@ public void datetimeValueInterfaceTest() {
   public void dateInUnsupportedFormat() {
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class, () -> new ExprDateValue("2020-07-07Z"));
-    assertEquals("date:2020-07-07Z in unsupported format, please use yyyy-MM-dd",
-        exception.getMessage());
+    assertEquals(
+        "date:2020-07-07Z in unsupported format, please use 'yyyy-MM-dd'", exception.getMessage());
   }
 
   @Test
   public void timeInUnsupportedFormat() {
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class, () -> new ExprTimeValue("01:01:0"));
-    assertEquals("time:01:01:0 in unsupported format, please use HH:mm:ss[.SSSSSSSSS]",
+    assertEquals(
+        "time:01:01:0 in unsupported format, please use 'HH:mm:ss[.SSSSSSSSS]'",
         exception.getMessage());
   }
 
   @Test
   public void timestampInUnsupportedFormat() {
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
-            () -> new ExprTimestampValue("2020-07-07T01:01:01Z"));
+        assertThrows(
+            SemanticCheckException.class, () -> new ExprTimestampValue("2020-07-07T01:01:01Z"));
     assertEquals(
         "timestamp:2020-07-07T01:01:01Z in unsupported format, "
-            + "please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
+            + "please use 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
         exception.getMessage());
   }
 
   @Test
   public void datetimeInUnsupportedFormat() {
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
-            () -> new ExprDatetimeValue("2020-07-07T01:01:01Z"));
+        assertThrows(
+            SemanticCheckException.class, () -> new ExprDatetimeValue("2020-07-07T01:01:01Z"));
     assertEquals(
         "datetime:2020-07-07T01:01:01Z in unsupported format, "
-            + "please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
+            + "please use 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
         exception.getMessage());
   }
 
@@ -130,11 +157,12 @@ public void stringDateTimeValue() {
     assertEquals("\"2020-08-17 19:44:00\"", stringValue.toString());
 
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
+        assertThrows(
+            SemanticCheckException.class,
             () -> new ExprStringValue("2020-07-07T01:01:01Z").datetimeValue());
     assertEquals(
         "datetime:2020-07-07T01:01:01Z in unsupported format, "
-            + "please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
+            + "please use 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
         exception.getMessage());
   }
 
@@ -147,10 +175,10 @@ public void stringDateValue() {
     assertEquals("\"2020-08-17\"", stringValue.toString());
 
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
-            () -> new ExprStringValue("2020-07-07Z").dateValue());
-    assertEquals("date:2020-07-07Z in unsupported format, please use yyyy-MM-dd",
-        exception.getMessage());
+        assertThrows(
+            SemanticCheckException.class, () -> new ExprStringValue("2020-07-07Z").dateValue());
+    assertEquals(
+        "date:2020-07-07Z in unsupported format, please use 'yyyy-MM-dd'", exception.getMessage());
   }
 
   @Test
@@ -161,9 +189,10 @@ public void stringTimeValue() {
     assertEquals("\"19:44:00\"", stringValue.toString());
 
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
-            () -> new ExprStringValue("01:01:0").timeValue());
-    assertEquals("time:01:01:0 in unsupported format, please use HH:mm:ss[.SSSSSSSSS]",
+        assertThrows(
+            SemanticCheckException.class, () -> new ExprStringValue("01:01:0").timeValue());
+    assertEquals(
+        "time:01:01:0 in unsupported format, please use 'HH:mm:ss[.SSSSSSSSS]'",
         exception.getMessage());
   }
 
@@ -227,32 +256,33 @@ public void datetimeWithVariableNanoPrecision() {
   @Test
   public void timestampOverMaxNanoPrecision() {
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
+        assertThrows(
+            SemanticCheckException.class,
             () -> new ExprTimestampValue("2020-07-07 01:01:01.1234567890"));
     assertEquals(
-        "timestamp:2020-07-07 01:01:01.1234567890 in unsupported format, "
-                + "please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
+        "timestamp:2020-07-07 01:01:01.1234567890 in unsupported format, please use "
+            + "'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
         exception.getMessage());
   }
 
   @Test
   public void datetimeOverMaxNanoPrecision() {
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
+        assertThrows(
+            SemanticCheckException.class,
             () -> new ExprDatetimeValue("2020-07-07 01:01:01.1234567890"));
     assertEquals(
         "datetime:2020-07-07 01:01:01.1234567890 in unsupported format, "
-                + "please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
+            + "please use 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
         exception.getMessage());
   }
 
   @Test
   public void timeOverMaxNanoPrecision() {
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
-            () -> new ExprTimeValue("01:01:01.1234567890"));
+        assertThrows(SemanticCheckException.class, () -> new ExprTimeValue("01:01:01.1234567890"));
     assertEquals(
-        "time:01:01:01.1234567890 in unsupported format, please use HH:mm:ss[.SSSSSSSSS]",
+        "time:01:01:01.1234567890 in unsupported format, please use 'HH:mm:ss[.SSSSSSSSS]'",
         exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprBooleanValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprBooleanValueTest.java
index a2eda4419b..b77112528c 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprBooleanValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprBooleanValueTest.java
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.opensearch.sql.utils.ComparisonUtil.compare;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.opensearch.sql.data.type.ExprCoreType.BOOLEAN;
 
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
@@ -16,10 +16,48 @@
 public class ExprBooleanValueTest {
 
   @Test
-  public void comparabilityTest() {
-    ExprValue booleanValue = ExprValueUtils.booleanValue(false);
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> compare(booleanValue, booleanValue));
-    assertEquals("ExprBooleanValue instances are not comparable", exception.getMessage());
+  public void equals_to_self() {
+    ExprValue value = ExprValueUtils.booleanValue(false);
+    assertEquals(value.booleanValue(), false);
+    assertTrue(value.equals(value));
+  }
+
+  @Test
+  public void equal() {
+    ExprValue v1 = ExprBooleanValue.of(true);
+    ExprValue v2 = ExprBooleanValue.of(true);
+    assertTrue(v1.equals(v2));
+    assertTrue(v2.equals(v1));
+    assertEquals(0, ((ExprBooleanValue) v1).compare((ExprBooleanValue) v2));
+    assertEquals(0, ((ExprBooleanValue) v2).compare((ExprBooleanValue) v1));
+  }
+
+  @Test
+  public void compare() {
+    var v1 = ExprBooleanValue.of(true);
+    var v2 = ExprBooleanValue.of(false);
+    assertEquals(1, v1.compare(v2));
+    assertEquals(-1, v2.compare(v1));
+  }
+
+  @Test
+  public void invalid_get_value() {
+    ExprDateValue value = new ExprDateValue("2020-08-20");
+    assertThrows(
+        ExpressionEvaluationException.class,
+        value::booleanValue,
+        String.format("invalid to get booleanValue from value of type %s", value.type()));
+  }
+
+  @Test
+  public void value() {
+    ExprValue value = ExprBooleanValue.of(true);
+    assertEquals(true, value.value());
+  }
+
+  @Test
+  public void type() {
+    ExprValue value = ExprBooleanValue.of(false);
+    assertEquals(BOOLEAN, value.type());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprCollectionValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprCollectionValueTest.java
index e61bdb111d..edd4e0d844 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprCollectionValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprCollectionValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -48,8 +47,9 @@ public void compare_collection_with_int_object() {
   @Test
   public void comparabilityTest() {
     ExprValue collectionValue = ExprValueUtils.collectionValue(Arrays.asList(0, 1));
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> compare(collectionValue, collectionValue));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class, () -> compare(collectionValue, collectionValue));
     assertEquals("ExprCollectionValue instances are not comparable", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprIntervalValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprIntervalValueTest.java
index ff86ad70a1..36785d383e 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprIntervalValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprIntervalValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -41,14 +40,18 @@ public void compare() {
   public void invalid_compare() {
     ExprIntervalValue v1 = new ExprIntervalValue(Period.ofYears(1));
     ExprIntervalValue v2 = new ExprIntervalValue(Duration.ofHours(1));
-    assertThrows(ExpressionEvaluationException.class, () -> v1.compare(v2),
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> v1.compare(v2),
         String.format("invalid to compare intervals with units %s and %s", v1.unit(), v2.unit()));
   }
 
   @Test
   public void invalid_get_value() {
     ExprDateValue value = new ExprDateValue("2020-08-20");
-    assertThrows(ExpressionEvaluationException.class, value::intervalValue,
+    assertThrows(
+        ExpressionEvaluationException.class,
+        value::intervalValue,
         String.format("invalid to get intervalValue from value of type %s", value.type()));
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprMissingValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprMissingValueTest.java
index 871f312c6f..121ceb6ce2 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprMissingValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprMissingValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -19,7 +18,6 @@
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 
-
 class ExprMissingValueTest {
 
   @Test
@@ -51,8 +49,9 @@ public void equal() {
 
   @Test
   public void comparabilityTest() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> compare(LITERAL_MISSING, LITERAL_MISSING));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class, () -> compare(LITERAL_MISSING, LITERAL_MISSING));
     assertEquals("invalid to call compare operation on missing value", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprNullValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprNullValueTest.java
index f7087a949d..81bcf8f7b3 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprNullValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprNullValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -50,8 +49,9 @@ public void equal() {
 
   @Test
   public void comparabilityTest() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> compare(LITERAL_NULL, LITERAL_NULL));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class, () -> compare(LITERAL_NULL, LITERAL_NULL));
     assertEquals("invalid to call compare operation on null value", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprNumberValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprNumberValueTest.java
index 8c3f9dc742..ee245d73b4 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprNumberValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprNumberValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -17,8 +16,9 @@ public class ExprNumberValueTest {
   @Test
   public void getShortValueFromIncompatibleExprValue() {
     ExprBooleanValue booleanValue = ExprBooleanValue.of(true);
-    ExpressionEvaluationException exception = Assertions
-        .assertThrows(ExpressionEvaluationException.class, () -> booleanValue.shortValue());
+    ExpressionEvaluationException exception =
+        Assertions.assertThrows(
+            ExpressionEvaluationException.class, () -> booleanValue.shortValue());
     assertEquals("invalid to get shortValue from value of type BOOLEAN", exception.getMessage());
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprStringValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprStringValueTest.java
new file mode 100644
index 0000000000..2a5e5033f7
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprStringValueTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.data.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.exception.ExpressionEvaluationException;
+
+public class ExprStringValueTest {
+  @Test
+  public void equals_to_self() {
+    ExprValue string = ExprValueUtils.stringValue("str");
+    assertEquals(string.stringValue(), "str");
+    assertTrue(string.equals(string));
+  }
+
+  @Test
+  public void equal() {
+    ExprValue v1 = new ExprStringValue("str");
+    ExprValue v2 = ExprValueUtils.stringValue("str");
+    assertTrue(v1.equals(v2));
+    assertTrue(v2.equals(v1));
+    assertEquals(0, ((ExprStringValue) v1).compare((ExprStringValue) v2));
+    assertEquals(0, ((ExprStringValue) v2).compare((ExprStringValue) v1));
+  }
+
+  @Test
+  public void compare() {
+    ExprStringValue v1 = new ExprStringValue("str1");
+    ExprStringValue v2 = new ExprStringValue("str2");
+    assertEquals(-1, v1.compare(v2));
+    assertEquals(1, v2.compare(v1));
+  }
+
+  @Test
+  public void invalid_get_value() {
+    ExprDateValue value = new ExprDateValue("2020-08-20");
+    assertThrows(
+        ExpressionEvaluationException.class,
+        value::stringValue,
+        String.format("invalid to get intervalValue from value of type %s", value.type()));
+  }
+
+  @Test
+  public void value() {
+    ExprValue value = new ExprStringValue("string");
+    assertEquals("string", value.value());
+  }
+
+  @Test
+  public void type() {
+    ExprValue value = new ExprStringValue("string");
+    assertEquals(STRING, value.type());
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprTupleValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprTupleValueTest.java
index f2568e5cb4..567e1e78db 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprTupleValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprTupleValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -52,8 +51,8 @@ public void compare_tuple_with_different_size() {
   @Test
   public void comparabilityTest() {
     ExprValue tupleValue = ExprValueUtils.tupleValue(ImmutableMap.of("integer_value", 2));
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> compare(tupleValue, tupleValue));
+    ExpressionEvaluationException exception =
+        assertThrows(ExpressionEvaluationException.class, () -> compare(tupleValue, tupleValue));
     assertEquals("ExprTupleValue instances are not comparable", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprValueCompareTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprValueCompareTest.java
index e2eec475ae..b965dff643 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprValueCompareTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprValueCompareTest.java
@@ -3,18 +3,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_FALSE;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_MISSING;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_NULL;
+import static org.opensearch.sql.utils.DateTimeUtils.extractDateTime;
 
+import java.time.LocalDate;
+import java.time.Period;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.sql.exception.ExpressionEvaluationException;
+import org.opensearch.sql.expression.ExpressionTestBase;
 
-public class ExprValueCompareTest {
+public class ExprValueCompareTest extends ExpressionTestBase {
 
   @Test
   public void timeValueCompare() {
@@ -32,63 +41,249 @@ public void dateValueCompare() {
 
   @Test
   public void datetimeValueCompare() {
-    assertEquals(0,
+    assertEquals(
+        0,
         new ExprDatetimeValue("2012-08-07 18:00:00")
             .compareTo(new ExprDatetimeValue("2012-08-07 18:00:00")));
-    assertEquals(1,
+    assertEquals(
+        1,
         new ExprDatetimeValue("2012-08-07 19:00:00")
             .compareTo(new ExprDatetimeValue("2012-08-07 18:00:00")));
-    assertEquals(-1,
+    assertEquals(
+        -1,
         new ExprDatetimeValue("2012-08-07 18:00:00")
             .compareTo(new ExprDatetimeValue("2012-08-07 19:00:00")));
   }
 
   @Test
   public void timestampValueCompare() {
-    assertEquals(0,
+    assertEquals(
+        0,
         new ExprTimestampValue("2012-08-07 18:00:00")
             .compareTo(new ExprTimestampValue("2012-08-07 18:00:00")));
-    assertEquals(1,
+    assertEquals(
+        1,
         new ExprTimestampValue("2012-08-07 19:00:00")
             .compareTo(new ExprTimestampValue("2012-08-07 18:00:00")));
-    assertEquals(-1,
+    assertEquals(
+        -1,
         new ExprTimestampValue("2012-08-07 18:00:00")
             .compareTo(new ExprTimestampValue("2012-08-07 19:00:00")));
   }
 
+  private static Stream<Arguments> getEqualDatetimeValuesOfDifferentTypes() {
+    return Stream.of(
+        Arguments.of(
+            new ExprTimestampValue("1961-04-12 09:07:00"),
+            new ExprDatetimeValue("1961-04-12 09:07:00")),
+        Arguments.of(
+            new ExprTimestampValue("1984-11-22 00:00:00"), new ExprDateValue("1984-11-22")),
+        Arguments.of(
+            new ExprTimestampValue(LocalDate.now() + " 00:00:00"),
+            new ExprDateValue(LocalDate.now())),
+        Arguments.of(
+            new ExprDatetimeValue(LocalDate.now() + " 17:42:15"), new ExprTimeValue("17:42:15")),
+        Arguments.of(
+            new ExprDatetimeValue("2012-08-07 19:14:38"),
+            new ExprTimestampValue("2012-08-07 19:14:38")),
+        Arguments.of(new ExprDateValue("2012-08-07"), new ExprDatetimeValue("2012-08-07 00:00:00")),
+        Arguments.of(new ExprDateValue("2007-01-27"), new ExprDatetimeValue("2007-01-27 00:00:00")),
+        Arguments.of(new ExprDateValue(LocalDate.now()), new ExprTimeValue("00:00:00")),
+        Arguments.of(
+            new ExprTimestampValue("1984-11-22 00:00:00"), new ExprDateValue("1984-11-22")),
+        Arguments.of(
+            new ExprTimeValue("19:14:38"), new ExprDatetimeValue(LocalDate.now() + " 19:14:38")),
+        Arguments.of(
+            new ExprTimeValue("17:42:15"), new ExprTimestampValue(LocalDate.now() + " 17:42:15")));
+  }
+
+  /**
+   * We can't compare directly ExprValues of different datetime types, we need to use
+   * `FunctionProperties` object to extract comparable values.
+   */
+  @ParameterizedTest
+  @MethodSource("getEqualDatetimeValuesOfDifferentTypes")
+  public void compareEqDifferentDateTimeValueTypes(ExprValue left, ExprValue right) {
+    assertEquals(
+        0,
+        extractDateTime(left, functionProperties)
+            .compareTo(extractDateTime(right, functionProperties)));
+    assertEquals(
+        0,
+        extractDateTime(right, functionProperties)
+            .compareTo(extractDateTime(left, functionProperties)));
+  }
+
+  private static Stream<Arguments> getNotEqualDatetimeValuesOfDifferentTypes() {
+    return Stream.of(
+        Arguments.of(
+            new ExprDatetimeValue("2012-08-07 19:14:38"),
+            new ExprTimestampValue("1961-04-12 09:07:00")),
+        Arguments.of(new ExprDatetimeValue("2012-08-07 19:14:38"), new ExprTimeValue("09:07:00")),
+        Arguments.of(
+            new ExprDatetimeValue(LocalDate.now() + " 19:14:38"), new ExprTimeValue("09:07:00")),
+        Arguments.of(new ExprDatetimeValue("2012-08-07 00:00:00"), new ExprDateValue("1961-04-12")),
+        Arguments.of(new ExprDatetimeValue("1961-04-12 19:14:38"), new ExprDateValue("1961-04-12")),
+        Arguments.of(new ExprDateValue("1984-11-22"), new ExprDatetimeValue("1961-04-12 19:14:38")),
+        Arguments.of(
+            new ExprDateValue("1984-11-22"), new ExprTimestampValue("2020-09-16 17:30:00")),
+        Arguments.of(new ExprDateValue("1984-11-22"), new ExprTimeValue("19:14:38")),
+        Arguments.of(new ExprTimeValue("19:14:38"), new ExprDateValue(LocalDate.now())),
+        Arguments.of(new ExprTimeValue("19:14:38"), new ExprDatetimeValue("2012-08-07 09:07:00")),
+        Arguments.of(new ExprTimeValue("19:14:38"), new ExprTimestampValue("1984-02-03 04:05:07")),
+        Arguments.of(
+            new ExprTimestampValue("2012-08-07 19:14:38"),
+            new ExprDatetimeValue("1961-04-12 09:07:00")),
+        Arguments.of(new ExprTimestampValue("2012-08-07 19:14:38"), new ExprTimeValue("09:07:00")),
+        Arguments.of(
+            new ExprTimestampValue(LocalDate.now() + " 19:14:38"), new ExprTimeValue("09:07:00")),
+        Arguments.of(
+            new ExprTimestampValue("2012-08-07 00:00:00"), new ExprDateValue("1961-04-12")),
+        Arguments.of(
+            new ExprTimestampValue("1961-04-12 19:14:38"), new ExprDateValue("1961-04-12")));
+  }
+
+  /**
+   * We can't compare directly ExprValues of different datetime types, we need to use
+   * `FunctionProperties` object to extract comparable values.
+   */
+  @ParameterizedTest
+  @MethodSource("getNotEqualDatetimeValuesOfDifferentTypes")
+  public void compareNeqDifferentDateTimeValueTypes(ExprValue left, ExprValue right) {
+    assertNotEquals(
+        0,
+        extractDateTime(left, functionProperties)
+            .compareTo(extractDateTime(right, functionProperties)));
+    assertNotEquals(
+        0,
+        extractDateTime(right, functionProperties)
+            .compareTo(extractDateTime(left, functionProperties)));
+  }
+
   @Test
-  public void missingCompareToMethodShouldNotBeenCalledDirectly() {
-    IllegalStateException exception = assertThrows(IllegalStateException.class,
-        () -> LITERAL_MISSING.compareTo(LITERAL_FALSE));
-    assertEquals("[BUG] Unreachable, Comparing with NULL or MISSING is undefined",
+  public void compareDateTimeWithNotADateTime() {
+    var exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> new ExprDoubleValue(3.1415).compareTo(new ExprIntervalValue(Period.ofDays(1))));
+    assertEquals(
+        "compare expected value have same type, but with [DOUBLE, INTERVAL]",
         exception.getMessage());
 
-    exception = assertThrows(IllegalStateException.class,
-        () -> LITERAL_FALSE.compareTo(LITERAL_MISSING));
-    assertEquals("[BUG] Unreachable, Comparing with NULL or MISSING is undefined",
-        exception.getMessage());
+    exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> new ExprDateValue("1961-04-12").compareTo(new ExprIntegerValue(1)));
+    assertEquals(
+        "compare expected value have same type, but with [DATE, INTEGER]", exception.getMessage());
 
-    exception = assertThrows(IllegalStateException.class,
-        () -> ExprMissingValue.of().compare(LITERAL_MISSING));
-    assertEquals("[BUG] Unreachable, Comparing with MISSING is undefined",
-        exception.getMessage());
+    exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> new ExprStringValue("something").compareTo(new ExprTimeValue("10:20:30")));
+    assertEquals(
+        "compare expected value have same type, but with [STRING, TIME]", exception.getMessage());
+  }
+
+  @Test
+  public void intValueCompare() {
+    assertEquals(0, new ExprIntegerValue(1).compareTo(new ExprIntegerValue(1)));
+    assertEquals(1, new ExprIntegerValue(2).compareTo(new ExprIntegerValue(1)));
+    assertEquals(-1, new ExprIntegerValue(1).compareTo(new ExprIntegerValue(2)));
+  }
+
+  @Test
+  public void doubleValueCompare() {
+    assertEquals(0, new ExprDoubleValue(1).compareTo(new ExprDoubleValue(1)));
+    assertEquals(1, new ExprDoubleValue(2).compareTo(new ExprDoubleValue(1)));
+    assertEquals(-1, new ExprDoubleValue(1).compareTo(new ExprDoubleValue(2)));
+  }
+
+  private static Stream<Arguments> getEqualNumericValuesOfDifferentTypes() {
+    return Stream.of(
+        Arguments.of(new ExprIntegerValue(42), new ExprByteValue(42)),
+        Arguments.of(new ExprIntegerValue(42), new ExprShortValue(42)),
+        Arguments.of(new ExprIntegerValue(42), new ExprLongValue(42)),
+        Arguments.of(new ExprIntegerValue(42), new ExprFloatValue(42)),
+        Arguments.of(new ExprIntegerValue(42), new ExprDoubleValue(42)));
+  }
+
+  @ParameterizedTest
+  @MethodSource("getEqualNumericValuesOfDifferentTypes")
+  public void compareEqDifferentNumericValueTypes(ExprValue left, ExprValue right) {
+    assertEquals(0, left.compareTo(right));
+    assertEquals(0, right.compareTo(left));
+  }
+
+  private static Stream<Arguments> getNotEqualNumericValuesOfDifferentTypes() {
+    return Stream.of(
+        Arguments.of(new ExprIntegerValue(42), new ExprByteValue(1)),
+        Arguments.of(new ExprIntegerValue(42), new ExprShortValue(146)),
+        Arguments.of(new ExprIntegerValue(42), new ExprLongValue(100500)),
+        Arguments.of(new ExprIntegerValue(42), new ExprFloatValue(-1.5)),
+        Arguments.of(new ExprIntegerValue(42), new ExprDoubleValue(1468.84138)));
+  }
+
+  @ParameterizedTest
+  @MethodSource("getNotEqualNumericValuesOfDifferentTypes")
+  public void compareNeqDifferentNumericValueTypes(ExprValue left, ExprValue right) {
+    assertNotEquals(0, left.compareTo(right));
+    assertNotEquals(0, right.compareTo(left));
+  }
+
+  @Test
+  public void stringValueCompare() {
+    assertEquals(0, new ExprStringValue("str1").compareTo(new ExprStringValue("str1")));
+    assertEquals(1, new ExprStringValue("str2").compareTo(new ExprStringValue("str1")));
+    assertEquals(-1, new ExprStringValue("str1").compareTo(new ExprStringValue("str2")));
+  }
+
+  @Test
+  public void intervalValueCompare() {
+    assertEquals(
+        0,
+        new ExprIntervalValue(Period.ofDays(1)).compareTo(new ExprIntervalValue(Period.ofDays(1))));
+    assertEquals(
+        1,
+        new ExprIntervalValue(Period.ofDays(2)).compareTo(new ExprIntervalValue(Period.ofDays(1))));
+    assertEquals(
+        -1,
+        new ExprIntervalValue(Period.ofDays(1)).compareTo(new ExprIntervalValue(Period.ofDays(2))));
+  }
+
+  @Test
+  public void missingCompareToMethodShouldNotBeenCalledDirectly() {
+    IllegalStateException exception =
+        assertThrows(IllegalStateException.class, () -> LITERAL_MISSING.compareTo(LITERAL_FALSE));
+    assertEquals(
+        "[BUG] Unreachable, Comparing with NULL or MISSING is undefined", exception.getMessage());
+
+    exception =
+        assertThrows(IllegalStateException.class, () -> LITERAL_FALSE.compareTo(LITERAL_MISSING));
+    assertEquals(
+        "[BUG] Unreachable, Comparing with NULL or MISSING is undefined", exception.getMessage());
+
+    exception =
+        assertThrows(
+            IllegalStateException.class, () -> ExprMissingValue.of().compare(LITERAL_MISSING));
+    assertEquals("[BUG] Unreachable, Comparing with MISSING is undefined", exception.getMessage());
   }
 
   @Test
   public void nullCompareToMethodShouldNotBeenCalledDirectly() {
-    IllegalStateException exception = assertThrows(IllegalStateException.class,
-        () -> LITERAL_NULL.compareTo(LITERAL_FALSE));
-    assertEquals("[BUG] Unreachable, Comparing with NULL or MISSING is undefined",
-        exception.getMessage());
+    IllegalStateException exception =
+        assertThrows(IllegalStateException.class, () -> LITERAL_NULL.compareTo(LITERAL_FALSE));
+    assertEquals(
+        "[BUG] Unreachable, Comparing with NULL or MISSING is undefined", exception.getMessage());
 
-    exception = assertThrows(IllegalStateException.class,
-        () -> LITERAL_FALSE.compareTo(LITERAL_NULL));
-    assertEquals("[BUG] Unreachable, Comparing with NULL or MISSING is undefined",
-        exception.getMessage());
+    exception =
+        assertThrows(IllegalStateException.class, () -> LITERAL_FALSE.compareTo(LITERAL_NULL));
+    assertEquals(
+        "[BUG] Unreachable, Comparing with NULL or MISSING is undefined", exception.getMessage());
 
-    exception = assertThrows(IllegalStateException.class,
-        () -> ExprNullValue.of().compare(LITERAL_MISSING));
-    assertEquals("[BUG] Unreachable, Comparing with NULL is undefined",
-        exception.getMessage());
+    exception =
+        assertThrows(
+            IllegalStateException.class, () -> ExprNullValue.of().compare(LITERAL_MISSING));
+    assertEquals("[BUG] Unreachable, Comparing with NULL is undefined", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprValueUtilsTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprValueUtilsTest.java
index 3c3f5a2c24..c879384955 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprValueUtilsTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprValueUtilsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -20,6 +19,7 @@
 import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
 import static org.opensearch.sql.data.type.ExprCoreType.TIME;
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -29,7 +29,6 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -58,71 +57,87 @@ public class ExprValueUtilsTest {
     testTuple.put("1", new ExprIntegerValue(1));
   }
 
-  private static List<ExprValue> numberValues = Stream.of((byte) 1, (short) 1, 1, 1L, 1f, 1D)
-      .map(ExprValueUtils::fromObjectValue).collect(Collectors.toList());
+  private static List<ExprValue> numberValues =
+      Stream.of((byte) 1, (short) 1, 1, 1L, 1f, 1D)
+          .map(ExprValueUtils::fromObjectValue)
+          .collect(Collectors.toList());
 
-  private static List<ExprValue> nonNumberValues = Arrays.asList(
-      new ExprStringValue("1"),
-      ExprBooleanValue.of(true),
-      new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1))),
-      new ExprTupleValue(testTuple),
-      new ExprDateValue("2012-08-07"),
-      new ExprTimeValue("18:00:00"),
-      new ExprDatetimeValue("2012-08-07 18:00:00"),
-      new ExprTimestampValue("2012-08-07 18:00:00"),
-      new ExprIntervalValue(Duration.ofSeconds(100)));
+  private static List<ExprValue> nonNumberValues =
+      Arrays.asList(
+          new ExprStringValue("1"),
+          ExprBooleanValue.of(true),
+          new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1))),
+          new ExprTupleValue(testTuple),
+          new ExprDateValue("2012-08-07"),
+          new ExprTimeValue("18:00:00"),
+          new ExprDatetimeValue("2012-08-07 18:00:00"),
+          new ExprTimestampValue("2012-08-07 18:00:00"),
+          new ExprIntervalValue(Duration.ofSeconds(100)));
 
   private static List<ExprValue> allValues =
       Lists.newArrayList(Iterables.concat(numberValues, nonNumberValues));
 
-  private static List<Function<ExprValue, Object>> numberValueExtractor = Arrays.asList(
-      ExprValueUtils::getByteValue,
-      ExprValueUtils::getShortValue,
-      ExprValueUtils::getIntegerValue,
-      ExprValueUtils::getLongValue,
-      ExprValueUtils::getFloatValue,
-      ExprValueUtils::getDoubleValue);
-  private static List<Function<ExprValue, Object>> nonNumberValueExtractor = Arrays.asList(
-      ExprValueUtils::getStringValue,
-      ExprValueUtils::getBooleanValue,
-      ExprValueUtils::getCollectionValue,
-      ExprValueUtils::getTupleValue
-  );
-  private static List<Function<ExprValue, Object>> dateAndTimeValueExtractor = Arrays.asList(
-      ExprValue::dateValue,
-      ExprValue::timeValue,
-      ExprValue::datetimeValue,
-      ExprValue::timestampValue,
-      ExprValue::intervalValue);
-  private static List<Function<ExprValue, Object>> allValueExtractor = Lists.newArrayList(
-      Iterables.concat(numberValueExtractor, nonNumberValueExtractor, dateAndTimeValueExtractor));
+  private static List<Function<ExprValue, Object>> numberValueExtractor =
+      Arrays.asList(
+          ExprValueUtils::getByteValue,
+          ExprValueUtils::getShortValue,
+          ExprValueUtils::getIntegerValue,
+          ExprValueUtils::getLongValue,
+          ExprValueUtils::getFloatValue,
+          ExprValueUtils::getDoubleValue);
+  private static List<Function<ExprValue, Object>> nonNumberValueExtractor =
+      Arrays.asList(
+          ExprValueUtils::getStringValue,
+          ExprValueUtils::getBooleanValue,
+          ExprValueUtils::getCollectionValue,
+          ExprValueUtils::getTupleValue);
+  private static List<Function<ExprValue, Object>> dateAndTimeValueExtractor =
+      Arrays.asList(
+          ExprValue::dateValue,
+          ExprValue::timeValue,
+          ExprValue::datetimeValue,
+          ExprValue::timestampValue,
+          ExprValue::intervalValue);
+  private static List<Function<ExprValue, Object>> allValueExtractor =
+      Lists.newArrayList(
+          Iterables.concat(
+              numberValueExtractor, nonNumberValueExtractor, dateAndTimeValueExtractor));
 
   private static List<ExprCoreType> numberTypes =
-      Arrays.asList(ExprCoreType.BYTE, ExprCoreType.SHORT, ExprCoreType.INTEGER, ExprCoreType.LONG,
-          ExprCoreType.FLOAT, ExprCoreType.DOUBLE);
-  private static List<ExprCoreType> nonNumberTypes =
-      Arrays.asList(STRING, BOOLEAN, ARRAY, STRUCT);
+      Arrays.asList(
+          ExprCoreType.BYTE,
+          ExprCoreType.SHORT,
+          ExprCoreType.INTEGER,
+          ExprCoreType.LONG,
+          ExprCoreType.FLOAT,
+          ExprCoreType.DOUBLE);
+  private static List<ExprCoreType> nonNumberTypes = Arrays.asList(STRING, BOOLEAN, ARRAY, STRUCT);
   private static List<ExprCoreType> dateAndTimeTypes =
       Arrays.asList(DATE, TIME, DATETIME, TIMESTAMP, INTERVAL);
   private static List<ExprCoreType> allTypes =
       Lists.newArrayList(Iterables.concat(numberTypes, nonNumberTypes, dateAndTimeTypes));
 
   private static Stream<Arguments> getValueTestArgumentStream() {
-    List<Object> expectedValues = Arrays.asList((byte) 1, (short) 1, 1, 1L, 1f, 1D, "1", true,
-        Arrays.asList(integerValue(1)),
-        ImmutableMap.of("1", integerValue(1)),
-        LocalDate.parse("2012-08-07"),
-        LocalTime.parse("18:00:00"),
-        LocalDateTime.parse("2012-08-07T18:00:00"),
-        ZonedDateTime.of(LocalDateTime.parse("2012-08-07T18:00:00"), ZoneId.of("UTC")).toInstant(),
-        Duration.ofSeconds(100)
-    );
+    List<Object> expectedValues =
+        Arrays.asList(
+            (byte) 1,
+            (short) 1,
+            1,
+            1L,
+            1f,
+            1D,
+            "1",
+            true,
+            Arrays.asList(integerValue(1)),
+            ImmutableMap.of("1", integerValue(1)),
+            LocalDate.parse("2012-08-07"),
+            LocalTime.parse("18:00:00"),
+            LocalDateTime.parse("2012-08-07T18:00:00"),
+            ZonedDateTime.of(LocalDateTime.parse("2012-08-07T18:00:00"), UTC_ZONE_ID).toInstant(),
+            Duration.ofSeconds(100));
     Stream.Builder<Arguments> builder = Stream.builder();
     for (int i = 0; i < expectedValues.size(); i++) {
-      builder.add(Arguments.of(
-          allValues.get(i),
-          allValueExtractor.get(i),
-          expectedValues.get(i)));
+      builder.add(Arguments.of(allValues.get(i), allValueExtractor.get(i), expectedValues.get(i)));
     }
     return builder.build();
   }
@@ -130,16 +145,13 @@ private static Stream<Arguments> getValueTestArgumentStream() {
   private static Stream<Arguments> getTypeTestArgumentStream() {
     Stream.Builder<Arguments> builder = Stream.builder();
     for (int i = 0; i < allValues.size(); i++) {
-      builder.add(Arguments.of(
-          allValues.get(i),
-          allTypes.get(i)));
+      builder.add(Arguments.of(allValues.get(i), allTypes.get(i)));
     }
     return builder.build();
   }
 
   private static Stream<Arguments> invalidGetNumberValueArgumentStream() {
-    return Lists.cartesianProduct(nonNumberValues, numberValueExtractor)
-        .stream()
+    return Lists.cartesianProduct(nonNumberValues, numberValueExtractor).stream()
         .map(list -> Arguments.of(list.get(0), list.get(1)));
   }
 
@@ -151,23 +163,20 @@ private static Stream<Arguments> invalidConvert() {
       extractorWithTypeList.add(
           new AbstractMap.SimpleEntry<>(nonNumberValueExtractor.get(i), nonNumberTypes.get(i)));
     }
-    return Lists.cartesianProduct(allValues, extractorWithTypeList)
-        .stream()
-        .filter(list -> {
-          ExprValue value = (ExprValue) list.get(0);
-          Map.Entry<Function<ExprValue, Object>, ExprCoreType> entry =
-              (Map.Entry<Function<ExprValue, Object>,
-                  ExprCoreType>) list
-                  .get(1);
-          return entry.getValue() != value.type();
-        })
-        .map(list -> {
-          Map.Entry<Function<ExprValue, Object>, ExprCoreType> entry =
-              (Map.Entry<Function<ExprValue, Object>,
-                  ExprCoreType>) list
-                  .get(1);
-          return Arguments.of(list.get(0), entry.getKey(), entry.getValue());
-        });
+    return Lists.cartesianProduct(allValues, extractorWithTypeList).stream()
+        .filter(
+            list -> {
+              ExprValue value = (ExprValue) list.get(0);
+              Map.Entry<Function<ExprValue, Object>, ExprCoreType> entry =
+                  (Map.Entry<Function<ExprValue, Object>, ExprCoreType>) list.get(1);
+              return entry.getValue() != value.type();
+            })
+        .map(
+            list -> {
+              Map.Entry<Function<ExprValue, Object>, ExprCoreType> entry =
+                  (Map.Entry<Function<ExprValue, Object>, ExprCoreType>) list.get(1);
+              return Arguments.of(list.get(0), entry.getKey(), entry.getValue());
+            });
   }
 
   @ParameterizedTest(name = "the value of ExprValue:{0} is: {2} ")
@@ -182,36 +191,33 @@ public void getType(ExprValue value, ExprCoreType expectType) {
     assertEquals(expectType, value.type());
   }
 
-  /**
-   * Test Invalid to get number.
-   */
+  /** Test Invalid to get number. */
   @ParameterizedTest(name = "invalid to get number value of ExprValue:{0}")
   @MethodSource("invalidGetNumberValueArgumentStream")
   public void invalidGetNumberValue(ExprValue value, Function<ExprValue, Object> extractor) {
-    Exception exception = assertThrows(ExpressionEvaluationException.class,
-        () -> extractor.apply(value));
+    Exception exception =
+        assertThrows(ExpressionEvaluationException.class, () -> extractor.apply(value));
     assertThat(exception.getMessage(), Matchers.containsString("invalid"));
   }
 
-  /**
-   * Test Invalid to convert.
-   */
+  /** Test Invalid to convert. */
   @ParameterizedTest(name = "invalid convert ExprValue:{0} to ExprType:{2}")
   @MethodSource("invalidConvert")
-  public void invalidConvertExprValue(ExprValue value, Function<ExprValue, Object> extractor,
-                                      ExprCoreType toType) {
-    Exception exception = assertThrows(ExpressionEvaluationException.class,
-        () -> extractor.apply(value));
+  public void invalidConvertExprValue(
+      ExprValue value, Function<ExprValue, Object> extractor, ExprCoreType toType) {
+    Exception exception =
+        assertThrows(ExpressionEvaluationException.class, () -> extractor.apply(value));
     assertThat(exception.getMessage(), Matchers.containsString("invalid"));
   }
 
   @Test
   public void unSupportedObject() {
-    Exception exception = assertThrows(ExpressionEvaluationException.class,
-        () -> ExprValueUtils.fromObjectValue(integerValue(1)));
+    Exception exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> ExprValueUtils.fromObjectValue(integerValue(1)));
     assertEquals(
-        "unsupported object "
-            + "class org.opensearch.sql.data.model.ExprIntegerValue",
+        "unsupported object " + "class org.opensearch.sql.data.model.ExprIntegerValue",
         exception.getMessage());
   }
 
@@ -228,13 +234,14 @@ public void bindingTuples() {
 
   @Test
   public void constructDateAndTimeValue() {
-    assertEquals(new ExprDateValue("2012-07-07"),
-        ExprValueUtils.fromObjectValue("2012-07-07", DATE));
-    assertEquals(new ExprTimeValue("01:01:01"),
-        ExprValueUtils.fromObjectValue("01:01:01", TIME));
-    assertEquals(new ExprDatetimeValue("2012-07-07 01:01:01"),
+    assertEquals(
+        new ExprDateValue("2012-07-07"), ExprValueUtils.fromObjectValue("2012-07-07", DATE));
+    assertEquals(new ExprTimeValue("01:01:01"), ExprValueUtils.fromObjectValue("01:01:01", TIME));
+    assertEquals(
+        new ExprDatetimeValue("2012-07-07 01:01:01"),
         ExprValueUtils.fromObjectValue("2012-07-07 01:01:01", DATETIME));
-    assertEquals(new ExprTimestampValue("2012-07-07 01:01:01"),
+    assertEquals(
+        new ExprTimestampValue("2012-07-07 01:01:01"),
         ExprValueUtils.fromObjectValue("2012-07-07 01:01:01", TIMESTAMP));
   }
 
@@ -244,17 +251,20 @@ public void hashCodeTest() {
     assertEquals(new ExprShortValue(1).hashCode(), new ExprShortValue(1).hashCode());
     assertEquals(new ExprIntegerValue(1).hashCode(), new ExprIntegerValue(1).hashCode());
     assertEquals(new ExprStringValue("1").hashCode(), new ExprStringValue("1").hashCode());
-    assertEquals(new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1))).hashCode(),
+    assertEquals(
+        new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1))).hashCode(),
         new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1))).hashCode());
-    assertEquals(new ExprTupleValue(testTuple).hashCode(),
-        new ExprTupleValue(testTuple).hashCode());
-    assertEquals(new ExprDateValue("2012-08-07").hashCode(),
-        new ExprDateValue("2012-08-07").hashCode());
-    assertEquals(new ExprTimeValue("18:00:00").hashCode(),
-        new ExprTimeValue("18:00:00").hashCode());
-    assertEquals(new ExprDatetimeValue("2012-08-07 18:00:00").hashCode(),
+    assertEquals(
+        new ExprTupleValue(testTuple).hashCode(), new ExprTupleValue(testTuple).hashCode());
+    assertEquals(
+        new ExprDateValue("2012-08-07").hashCode(), new ExprDateValue("2012-08-07").hashCode());
+    assertEquals(
+        new ExprTimeValue("18:00:00").hashCode(), new ExprTimeValue("18:00:00").hashCode());
+    assertEquals(
+        new ExprDatetimeValue("2012-08-07 18:00:00").hashCode(),
         new ExprDatetimeValue("2012-08-07 18:00:00").hashCode());
-    assertEquals(new ExprTimestampValue("2012-08-07 18:00:00").hashCode(),
+    assertEquals(
+        new ExprTimestampValue("2012-08-07 18:00:00").hashCode(),
         new ExprTimestampValue("2012-08-07 18:00:00").hashCode());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/type/ExprTypeTest.java b/core/src/test/java/org/opensearch/sql/data/type/ExprTypeTest.java
index 204ca197e1..1def15cc6f 100644
--- a/core/src/test/java/org/opensearch/sql/data/type/ExprTypeTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/type/ExprTypeTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.type;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -76,9 +75,9 @@ public void getParent() {
 
   @Test
   void legacyName() {
-    assertEquals("keyword", STRING.legacyTypeName());
-    assertEquals("nested", ARRAY.legacyTypeName());
-    assertEquals("object", STRUCT.legacyTypeName());
+    assertEquals("KEYWORD", STRING.legacyTypeName());
+    assertEquals("NESTED", ARRAY.legacyTypeName());
+    assertEquals("OBJECT", STRUCT.legacyTypeName());
     assertEquals("integer", INTEGER.legacyTypeName().toLowerCase());
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/data/utils/ExprValueOrderingTest.java b/core/src/test/java/org/opensearch/sql/data/utils/ExprValueOrderingTest.java
index ec00aebe18..cf9bb538c4 100644
--- a/core/src/test/java/org/opensearch/sql/data/utils/ExprValueOrderingTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/utils/ExprValueOrderingTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,10 +31,8 @@
 
 @ExtendWith(MockitoExtension.class)
 class ExprValueOrderingTest {
-  @Mock
-  ExprValue left;
-  @Mock
-  ExprValue right;
+  @Mock ExprValue left;
+  @Mock ExprValue right;
 
   @Test
   public void natural() {
diff --git a/core/src/test/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrderingTest.java b/core/src/test/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrderingTest.java
index c13f95ad63..97014fc410 100644
--- a/core/src/test/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrderingTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrderingTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/src/test/java/org/opensearch/sql/data/utils/NullsLastExprValueOrderingTest.java b/core/src/test/java/org/opensearch/sql/data/utils/NullsLastExprValueOrderingTest.java
index ab36247089..3625dc3760 100644
--- a/core/src/test/java/org/opensearch/sql/data/utils/NullsLastExprValueOrderingTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/utils/NullsLastExprValueOrderingTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/src/test/java/org/opensearch/sql/data/utils/ReverseExprValueOrderingTest.java b/core/src/test/java/org/opensearch/sql/data/utils/ReverseExprValueOrderingTest.java
index 297079fca5..ad88eb2c76 100644
--- a/core/src/test/java/org/opensearch/sql/data/utils/ReverseExprValueOrderingTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/utils/ReverseExprValueOrderingTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/src/test/java/org/opensearch/sql/datasource/DataSourceServiceImplTest.java b/core/src/test/java/org/opensearch/sql/datasource/DataSourceServiceImplTest.java
deleted file mode 100644
index 2b40b32ee6..0000000000
--- a/core/src/test/java/org/opensearch/sql/datasource/DataSourceServiceImplTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.datasource;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.when;
-import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
-
-import com.google.common.collect.ImmutableMap;
-import java.util.HashSet;
-import java.util.Map;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.sql.datasource.model.DataSource;
-import org.opensearch.sql.datasource.model.DataSourceMetadata;
-import org.opensearch.sql.datasource.model.DataSourceType;
-import org.opensearch.sql.storage.DataSourceFactory;
-import org.opensearch.sql.storage.StorageEngine;
-
-@ExtendWith(MockitoExtension.class)
-class DataSourceServiceImplTest {
-
-  static final String NAME = "opensearch";
-
-  @Mock private DataSourceFactory dataSourceFactory;
-
-  @Mock private StorageEngine storageEngine;
-
-  private DataSourceService dataSourceService;
-
-  @BeforeEach
-  public void setup() {
-    lenient()
-        .doAnswer(
-            invocation -> {
-              DataSourceMetadata metadata = invocation.getArgument(0);
-              return new DataSource(metadata.getName(), metadata.getConnector(), storageEngine);
-            })
-        .when(dataSourceFactory)
-        .createDataSource(any());
-    when(dataSourceFactory.getDataSourceType()).thenReturn(DataSourceType.OPENSEARCH);
-    dataSourceService =
-        new DataSourceServiceImpl(
-            new HashSet<>() {
-              {
-                add(dataSourceFactory);
-              }
-            });
-  }
-
-  @AfterEach
-  public void clear() {
-    dataSourceService.clear();
-  }
-
-  @Test
-  void getDataSourceSuccess() {
-    dataSourceService.addDataSource(DataSourceMetadata.defaultOpenSearchDataSourceMetadata());
-
-    assertEquals(
-        new DataSource(DEFAULT_DATASOURCE_NAME, DataSourceType.OPENSEARCH, storageEngine),
-        dataSourceService.getDataSource(DEFAULT_DATASOURCE_NAME));
-  }
-
-  @Test
-  void getNotExistDataSourceShouldFail() {
-    IllegalArgumentException exception =
-        assertThrows(IllegalArgumentException.class, () -> dataSourceService.getDataSource("mock"));
-    assertEquals("DataSource with name mock doesn't exist.", exception.getMessage());
-  }
-
-  @Test
-  void getAddDataSourcesShouldSuccess() {
-    assertEquals(0, dataSourceService.getDataSources().size());
-
-    dataSourceService.addDataSource(metadata(NAME, DataSourceType.OPENSEARCH, ImmutableMap.of()));
-    assertEquals(1, dataSourceService.getDataSources().size());
-  }
-
-  @Test
-  void noDataSourceExistAfterClear() {
-    dataSourceService.addDataSource(metadata(NAME, DataSourceType.OPENSEARCH, ImmutableMap.of()));
-    assertEquals(1, dataSourceService.getDataSources().size());
-
-    dataSourceService.clear();
-    assertEquals(0, dataSourceService.getDataSources().size());
-  }
-
-  @Test
-  void metaDataMissingNameShouldFail() {
-    IllegalArgumentException exception =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                dataSourceService.addDataSource(
-                    metadata(null, DataSourceType.OPENSEARCH, ImmutableMap.of())));
-    assertEquals(
-        "Missing Name Field from a DataSource. Name is a required parameter.",
-        exception.getMessage());
-  }
-
-  @Test
-  void metaDataHasIllegalDataSourceNameShouldFail() {
-    IllegalArgumentException exception =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                dataSourceService.addDataSource(
-                    metadata("prometheus.test", DataSourceType.OPENSEARCH, ImmutableMap.of())));
-    assertEquals(
-        "DataSource Name: prometheus.test contains illegal characters. "
-            + "Allowed characters: a-zA-Z0-9_-*@.",
-        exception.getMessage());
-  }
-
-  @Test
-  void metaDataMissingPropertiesShouldFail() {
-    IllegalArgumentException exception =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> dataSourceService.addDataSource(metadata(NAME, DataSourceType.OPENSEARCH, null)));
-    assertEquals(
-        "Missing properties field in catalog configuration. Properties are required parameters.",
-        exception.getMessage());
-  }
-
-  @Test
-  void metaDataHasDuplicateNameShouldFail() {
-    dataSourceService.addDataSource(metadata(NAME, DataSourceType.OPENSEARCH, ImmutableMap.of()));
-    assertEquals(1, dataSourceService.getDataSources().size());
-
-    IllegalArgumentException exception =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> dataSourceService.addDataSource(metadata(NAME, DataSourceType.OPENSEARCH, null)));
-    assertEquals(
-        String.format("Datasource name should be unique, Duplicate datasource found %s.", NAME),
-        exception.getMessage());
-  }
-
-  DataSourceMetadata metadata(String name, DataSourceType type, Map<String, String> properties) {
-    DataSourceMetadata dataSourceMetadata = new DataSourceMetadata();
-    dataSourceMetadata.setName(name);
-    dataSourceMetadata.setConnector(type);
-    dataSourceMetadata.setProperties(properties);
-    return dataSourceMetadata;
-  }
-}
diff --git a/core/src/test/java/org/opensearch/sql/datasource/model/DataSourceMetadataTest.java b/core/src/test/java/org/opensearch/sql/datasource/model/DataSourceMetadataTest.java
new file mode 100644
index 0000000000..fe40fac868
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/datasource/model/DataSourceMetadataTest.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasource.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.opensearch.sql.datasource.model.DataSourceStatus.ACTIVE;
+import static org.opensearch.sql.datasource.model.DataSourceType.PROMETHEUS;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.Test;
+
+public class DataSourceMetadataTest {
+
+  @Test
+  public void testBuilderAndGetterMethods() {
+    List<String> allowedRoles = Arrays.asList("role1", "role2");
+    Map<String, String> properties = new HashMap<>();
+    properties.put("key", "value");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("test")
+            .setDescription("test description")
+            .setConnector(DataSourceType.OPENSEARCH)
+            .setAllowedRoles(allowedRoles)
+            .setProperties(properties)
+            .setResultIndex("query_execution_result_test123")
+            .setDataSourceStatus(ACTIVE)
+            .validateAndBuild();
+
+    assertEquals("test", metadata.getName());
+    assertEquals("test description", metadata.getDescription());
+    assertEquals(DataSourceType.OPENSEARCH, metadata.getConnector());
+    assertEquals(allowedRoles, metadata.getAllowedRoles());
+    assertEquals(properties, metadata.getProperties());
+    assertEquals("query_execution_result_test123", metadata.getResultIndex());
+    assertEquals(ACTIVE, metadata.getStatus());
+  }
+
+  @Test
+  public void testDefaultDataSourceMetadata() {
+    DataSourceMetadata defaultMetadata = DataSourceMetadata.defaultOpenSearchDataSourceMetadata();
+    assertNotNull(defaultMetadata);
+    assertEquals(DataSourceType.OPENSEARCH, defaultMetadata.getConnector());
+    assertTrue(defaultMetadata.getAllowedRoles().isEmpty());
+    assertTrue(defaultMetadata.getProperties().isEmpty());
+  }
+
+  @Test
+  public void testNameValidation() {
+    try {
+      new DataSourceMetadata.Builder()
+          .setName("Invalid$$$Name")
+          .setConnector(PROMETHEUS)
+          .validateAndBuild();
+      fail("Should have thrown an IllegalArgumentException");
+    } catch (IllegalArgumentException e) {
+      assertEquals(
+          "DataSource Name: Invalid$$$Name contains illegal characters. Allowed characters:"
+              + " a-zA-Z0-9_-*@.",
+          e.getMessage());
+    }
+  }
+
+  @Test
+  public void testResultIndexValidation() {
+    try {
+      new DataSourceMetadata.Builder()
+          .setName("test")
+          .setConnector(PROMETHEUS)
+          .setResultIndex("invalid_result_index")
+          .validateAndBuild();
+      fail("Should have thrown an IllegalArgumentException");
+    } catch (IllegalArgumentException e) {
+      assertEquals(DataSourceMetadata.INVALID_RESULT_INDEX_PREFIX, e.getMessage());
+    }
+  }
+
+  @Test
+  public void testMissingAttributes() {
+    try {
+      new DataSourceMetadata.Builder().validateAndBuild();
+      fail("Should have thrown an IllegalArgumentException due to missing attributes");
+    } catch (IllegalArgumentException e) {
+      assertTrue(e.getMessage().contains("name"));
+      assertTrue(e.getMessage().contains("connector"));
+    }
+  }
+
+  @Test
+  public void testFillAttributes() {
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("test")
+            .setConnector(PROMETHEUS)
+            .validateAndBuild();
+
+    assertEquals("test", metadata.getName());
+    assertEquals(PROMETHEUS, metadata.getConnector());
+    assertTrue(metadata.getDescription().isEmpty());
+    assertTrue(metadata.getAllowedRoles().isEmpty());
+    assertTrue(metadata.getProperties().isEmpty());
+    assertEquals("query_execution_result_test", metadata.getResultIndex());
+    assertEquals(ACTIVE, metadata.getStatus());
+  }
+
+  @Test
+  public void testLengthyResultIndexName() {
+    try {
+      new DataSourceMetadata.Builder()
+          .setName("test")
+          .setConnector(PROMETHEUS)
+          .setResultIndex("query_execution_result_" + RandomStringUtils.randomAlphanumeric(300))
+          .validateAndBuild();
+      fail("Should have thrown an IllegalArgumentException");
+    } catch (IllegalArgumentException e) {
+      assertEquals(
+          "Result index name size must contains less than 255 characters.Result index name has"
+              + " invalid character. Valid characters are a-z, 0-9, -(hyphen) and _(underscore).",
+          e.getMessage());
+    }
+  }
+
+  @Test
+  public void testInbuiltLengthyResultIndexName() {
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName(RandomStringUtils.randomAlphabetic(250))
+            .setConnector(PROMETHEUS)
+            .validateAndBuild();
+    assertEquals(255, dataSourceMetadata.getResultIndex().length());
+  }
+
+  @Test
+  public void testCopyFromAnotherMetadata() {
+    List<String> allowedRoles = Arrays.asList("role1", "role2");
+    Map<String, String> properties = new HashMap<>();
+    properties.put("key", "value");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("test")
+            .setDescription("test description")
+            .setConnector(DataSourceType.OPENSEARCH)
+            .setAllowedRoles(allowedRoles)
+            .setProperties(properties)
+            .setResultIndex("query_execution_result_test123")
+            .setDataSourceStatus(ACTIVE)
+            .validateAndBuild();
+    DataSourceMetadata copiedMetadata = new DataSourceMetadata.Builder(metadata).validateAndBuild();
+    assertEquals(metadata.getResultIndex(), copiedMetadata.getResultIndex());
+    assertEquals(metadata.getProperties(), copiedMetadata.getProperties());
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/datasource/model/DataSourceTypeTest.java b/core/src/test/java/org/opensearch/sql/datasource/model/DataSourceTypeTest.java
new file mode 100644
index 0000000000..de487be2e8
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/datasource/model/DataSourceTypeTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasource.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+class DataSourceTypeTest {
+  @Test
+  public void fromString_succeed() {
+    testFromString("PROMETHEUS", DataSourceType.PROMETHEUS);
+    testFromString("OPENSEARCH", DataSourceType.OPENSEARCH);
+    testFromString("SPARK", DataSourceType.SPARK);
+    testFromString("S3GLUE", DataSourceType.S3GLUE);
+
+    testFromString("prometheus", DataSourceType.PROMETHEUS);
+  }
+
+  private void testFromString(String name, DataSourceType expectedType) {
+    assertEquals(expectedType, DataSourceType.fromString(name));
+  }
+
+  @Test
+  public void fromStringWithUnknownName_throws() {
+    assertThrows(IllegalArgumentException.class, () -> DataSourceType.fromString("UnknownName"));
+  }
+
+  @Test
+  public void registerExistingType_throwsException() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> DataSourceType.register(new DataSourceType("s3glue")));
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/executor/ExplainTest.java b/core/src/test/java/org/opensearch/sql/executor/ExplainTest.java
index c2763e7120..eaeae07242 100644
--- a/core/src/test/java/org/opensearch/sql/executor/ExplainTest.java
+++ b/core/src/test/java/org/opensearch/sql/executor/ExplainTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.executor;
 
 import static java.util.Collections.emptyList;
@@ -22,18 +21,19 @@
 import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.eval;
 import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.filter;
 import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.limit;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.nested;
 import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.project;
 import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.rareTopN;
 import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.remove;
 import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.rename;
 import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.sort;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.takeOrdered;
 import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.values;
 import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.window;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -68,43 +68,37 @@ void can_explain_project_filter_table_scan() {
             DSL.equal(ref("balance", INTEGER), literal(10000)),
             DSL.greater(ref("age", INTEGER), literal(30)));
     NamedExpression[] projectList = {
-        named("full_name", ref("full_name", STRING), "name"),
-        named("age", ref("age", INTEGER))
+      named("full_name", ref("full_name", STRING), "name"), named("age", ref("age", INTEGER))
     };
 
-    PhysicalPlan plan =
-        project(
-            filter(
-                tableScan,
-                filterExpr),
-            projectList);
+    PhysicalPlan plan = project(filter(tableScan, filterExpr), projectList);
 
     assertEquals(
         new ExplainResponse(
             new ExplainResponseNode(
                 "ProjectOperator",
-                ImmutableMap.of("fields", "[name, age]"),
-                singletonList(new ExplainResponseNode(
-                    "FilterOperator",
-                    ImmutableMap.of("conditions", "and(=(balance, 10000), >(age, 30))"),
-                    singletonList(tableScan.explainNode()))))),
+                Map.of("fields", "[name, age]"),
+                singletonList(
+                    new ExplainResponseNode(
+                        "FilterOperator",
+                        Map.of("conditions", "and(=(balance, 10000), >(age, 30))"),
+                        singletonList(tableScan.explainNode()))))),
         explain.apply(plan));
   }
 
   @Test
   void can_explain_aggregations() {
-    List<Expression> aggExprs = ImmutableList.of(ref("balance", DOUBLE));
-    List<NamedAggregator> aggList = ImmutableList.of(
-        named("avg(balance)", DSL.avg(aggExprs.toArray(new Expression[0]))));
-    List<NamedExpression> groupByList = ImmutableList.of(
-        named("state", ref("state", STRING)));
+    List<Expression> aggExprs = List.of(ref("balance", DOUBLE));
+    List<NamedAggregator> aggList =
+        List.of(named("avg(balance)", DSL.avg(aggExprs.toArray(new Expression[0]))));
+    List<NamedExpression> groupByList = List.of(named("state", ref("state", STRING)));
 
     PhysicalPlan plan = agg(new FakeTableScan(), aggList, groupByList);
     assertEquals(
         new ExplainResponse(
             new ExplainResponseNode(
                 "AggregationOperator",
-                ImmutableMap.of(
+                Map.of(
                     "aggregators", "[avg(balance)]",
                     "groupBy", "[state]"),
                 singletonList(tableScan.explainNode()))),
@@ -120,34 +114,35 @@ void can_explain_rare_top_n() {
         new ExplainResponse(
             new ExplainResponseNode(
                 "RareTopNOperator",
-                ImmutableMap.of(
-                    "commandType", TOP,
-                    "noOfResults", 10,
-                    "fields", "[state]",
-                    "groupBy", "[]"),
+                Map.of("commandType", TOP, "noOfResults", 10, "fields", "[state]", "groupBy", "[]"),
                 singletonList(tableScan.explainNode()))),
         explain.apply(plan));
   }
 
   @Test
   void can_explain_window() {
-    List<Expression> partitionByList = ImmutableList.of(DSL.ref("state", STRING));
-    List<Pair<Sort.SortOption, Expression>> sortList = ImmutableList.of(
-        ImmutablePair.of(DEFAULT_ASC, ref("age", INTEGER)));
+    List<Expression> partitionByList = List.of(DSL.ref("state", STRING));
+    List<Pair<Sort.SortOption, Expression>> sortList =
+        List.of(ImmutablePair.of(DEFAULT_ASC, ref("age", INTEGER)));
 
-    PhysicalPlan plan = window(tableScan, named(DSL.rank()),
-        new WindowDefinition(partitionByList, sortList));
+    PhysicalPlan plan =
+        window(tableScan, named(DSL.rank()), new WindowDefinition(partitionByList, sortList));
 
     assertEquals(
         new ExplainResponse(
             new ExplainResponseNode(
                 "WindowOperator",
-                ImmutableMap.of(
-                    "function", "rank()",
-                    "definition", ImmutableMap.of(
-                        "partitionBy", "[state]",
-                        "sortList", ImmutableMap.of(
-                            "age", ImmutableMap.of(
+                Map.of(
+                    "function",
+                    "rank()",
+                    "definition",
+                    Map.of(
+                        "partitionBy",
+                        "[state]",
+                        "sortList",
+                        Map.of(
+                            "age",
+                            Map.of(
                                 "sortOrder", "ASC",
                                 "nullOrder", "NULL_FIRST")))),
                 singletonList(tableScan.explainNode()))),
@@ -157,60 +152,61 @@ void can_explain_window() {
   @Test
   void can_explain_other_operators() {
     ReferenceExpression[] removeList = {ref("state", STRING)};
-    Map<ReferenceExpression, ReferenceExpression> renameMapping = ImmutableMap.of(
-        ref("state", STRING), ref("s", STRING));
-    Pair<ReferenceExpression, Expression> evalExprs = ImmutablePair.of(
-        ref("age", INTEGER), DSL.add(ref("age", INTEGER), literal(2)));
+    Map<ReferenceExpression, ReferenceExpression> renameMapping =
+        Map.of(ref("state", STRING), ref("s", STRING));
+    Pair<ReferenceExpression, Expression> evalExprs =
+        ImmutablePair.of(ref("age", INTEGER), DSL.add(ref("age", INTEGER), literal(2)));
     Expression[] dedupeList = {ref("age", INTEGER)};
-    Pair<Sort.SortOption, Expression> sortList = ImmutablePair.of(
-        DEFAULT_ASC, ref("age", INTEGER));
-    List<LiteralExpression> values = ImmutableList.of(literal("WA"), literal(30));
+    Pair<Sort.SortOption, Expression> sortList = ImmutablePair.of(DEFAULT_ASC, ref("age", INTEGER));
+    List<LiteralExpression> values = List.of(literal("WA"), literal(30));
 
     PhysicalPlan plan =
         remove(
             rename(
-                eval(
-                    dedupe(
-                        sort(
-                            values(values),
-                            sortList),
-                        dedupeList),
-                    evalExprs),
-                renameMapping),
-        removeList);
+                eval(dedupe(sort(values(values), sortList), dedupeList), evalExprs), renameMapping),
+            removeList);
 
     assertEquals(
         new ExplainResponse(
             new ExplainResponseNode(
                 "RemoveOperator",
-                ImmutableMap.of("removeList", "[state]"),
-                singletonList(new ExplainResponseNode(
-                    "RenameOperator",
-                    ImmutableMap.of("mapping", ImmutableMap.of("state", "s")),
-                    singletonList(new ExplainResponseNode(
-                        "EvalOperator",
-                        ImmutableMap.of("expressions", ImmutableMap.of("age", "+(age, 2)")),
-                        singletonList(new ExplainResponseNode(
-                            "DedupeOperator",
-                            ImmutableMap.of(
-                                "dedupeList", "[age]",
-                                "allowedDuplication", 1,
-                                "keepEmpty", false,
-                                "consecutive", false),
-                            singletonList(new ExplainResponseNode(
-                                "SortOperator",
-                                ImmutableMap.of(
-                                    "sortList", ImmutableMap.of(
-                                        "age", ImmutableMap.of(
-                                            "sortOrder", "ASC",
-                                            "nullOrder", "NULL_FIRST"))),
-                                singletonList(new ExplainResponseNode(
-                                    "ValuesOperator",
-                                    ImmutableMap.of("values", ImmutableList.of(values)),
-                                    emptyList())))))))))))
-        ),
-        explain.apply(plan)
-    );
+                Map.of("removeList", "[state]"),
+                singletonList(
+                    new ExplainResponseNode(
+                        "RenameOperator",
+                        Map.of("mapping", Map.of("state", "s")),
+                        singletonList(
+                            new ExplainResponseNode(
+                                "EvalOperator",
+                                Map.of("expressions", Map.of("age", "+(age, 2)")),
+                                singletonList(
+                                    new ExplainResponseNode(
+                                        "DedupeOperator",
+                                        Map.of(
+                                            "dedupeList",
+                                            "[age]",
+                                            "allowedDuplication",
+                                            1,
+                                            "keepEmpty",
+                                            false,
+                                            "consecutive",
+                                            false),
+                                        singletonList(
+                                            new ExplainResponseNode(
+                                                "SortOperator",
+                                                Map.of(
+                                                    "sortList",
+                                                    Map.of(
+                                                        "age",
+                                                        Map.of(
+                                                            "sortOrder", "ASC",
+                                                            "nullOrder", "NULL_FIRST"))),
+                                                singletonList(
+                                                    new ExplainResponseNode(
+                                                        "ValuesOperator",
+                                                        Map.of("values", List.of(values)),
+                                                        emptyList())))))))))))),
+        explain.apply(plan));
   }
 
   @Test
@@ -220,10 +216,44 @@ void can_explain_limit() {
         new ExplainResponse(
             new ExplainResponseNode(
                 "LimitOperator",
-                ImmutableMap.of("limit", 10, "offset", 5),
+                Map.of("limit", 10, "offset", 5),
                 singletonList(tableScan.explainNode()))),
-        explain.apply(plan)
-    );
+        explain.apply(plan));
+  }
+
+  @Test
+  void can_explain_takeOrdered() {
+    Pair<Sort.SortOption, Expression> sort =
+        ImmutablePair.of(Sort.SortOption.DEFAULT_ASC, ref("a", INTEGER));
+    PhysicalPlan plan = takeOrdered(tableScan, 10, 5, sort);
+    assertEquals(
+        new ExplainResponse(
+            new ExplainResponseNode(
+                "TakeOrderedOperator",
+                Map.of(
+                    "limit",
+                    10,
+                    "offset",
+                    5,
+                    "sortList",
+                    Map.of("a", Map.of("sortOrder", "ASC", "nullOrder", "NULL_FIRST"))),
+                singletonList(tableScan.explainNode()))),
+        explain.apply(plan));
+  }
+
+  @Test
+  void can_explain_nested() {
+    Set<String> nestedOperatorArgs = Set.of("message.info", "message");
+    Map<String, List<String>> groupedFieldsByPath = Map.of("message", List.of("message.info"));
+    PhysicalPlan plan = nested(tableScan, nestedOperatorArgs, groupedFieldsByPath);
+
+    assertEquals(
+        new ExplainResponse(
+            new ExplainResponseNode(
+                "NestedOperator",
+                Map.of("nested", Set.of("message.info", "message")),
+                singletonList(tableScan.explainNode()))),
+        explain.apply(plan));
   }
 
   private static class FakeTableScan extends TableScanOperator {
@@ -245,14 +275,11 @@ public String toString() {
     /** Used to ignore table scan which is duplicate but required for each operator test. */
     public ExplainResponseNode explainNode() {
       return new ExplainResponseNode(
-          "FakeTableScan",
-          ImmutableMap.of("request", "Fake DSL request"),
-          emptyList());
+          "FakeTableScan", Map.of("request", "Fake DSL request"), emptyList());
     }
 
     public String explain() {
       return "explain";
     }
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/executor/QueryServiceTest.java b/core/src/test/java/org/opensearch/sql/executor/QueryServiceTest.java
index 431efd9fb4..f6b66b4e77 100644
--- a/core/src/test/java/org/opensearch/sql/executor/QueryServiceTest.java
+++ b/core/src/test/java/org/opensearch/sql/executor/QueryServiceTest.java
@@ -15,11 +15,9 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.when;
 
 import java.util.Collections;
 import java.util.Optional;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -27,86 +25,64 @@
 import org.opensearch.sql.analysis.Analyzer;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.common.response.ResponseListener;
+import org.opensearch.sql.executor.pagination.Cursor;
 import org.opensearch.sql.planner.PlanContext;
 import org.opensearch.sql.planner.Planner;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.storage.split.Split;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 @ExtendWith(MockitoExtension.class)
 class QueryServiceTest {
-  private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 
   private QueryService queryService;
 
-  @Mock
-  private ExecutionEngine executionEngine;
+  @Mock private ExecutionEngine executionEngine;
 
-  @Mock
-  private Analyzer analyzer;
+  @Mock private Analyzer analyzer;
 
-  @Mock
-  private Planner planner;
+  @Mock private Planner planner;
 
-  @Mock
-  private UnresolvedPlan ast;
+  @Mock private UnresolvedPlan ast;
 
-  @Mock
-  private LogicalPlan logicalPlan;
+  @Mock private LogicalPlan logicalPlan;
 
-  @Mock
-  private PhysicalPlan plan;
+  @Mock private PhysicalPlan plan;
 
-  @Mock
-  private ExecutionEngine.Schema schema;
+  @Mock private ExecutionEngine.Schema schema;
 
-  @Mock
-  private PlanContext planContext;
+  @Mock private PlanContext planContext;
 
-  @Mock
-  private Split split;
+  @Mock private Split split;
 
   @Test
   public void executeWithoutContext() {
-    queryService()
-        .executeSuccess()
-        .handledByOnResponse();
+    queryService().executeSuccess().handledByOnResponse();
   }
 
   @Test
   public void executeWithContext() {
-    queryService()
-        .executeSuccess(split)
-        .handledByOnResponse();
+    queryService().executeSuccess(split).handledByOnResponse();
   }
 
   @Test
   public void testExplainShouldPass() {
-    queryService()
-        .explainSuccess()
-        .handledByExplainOnResponse();
+    queryService().explainSuccess().handledByExplainOnResponse();
   }
 
   @Test
   public void testExecuteWithExceptionShouldBeCaughtByHandler() {
-    queryService()
-        .executeFail()
-        .handledByOnFailure();
+    queryService().executeFail().handledByOnFailure();
   }
 
   @Test
   public void explainWithIllegalQueryShouldBeCaughtByHandler() {
-    queryService()
-        .explainFail()
-        .handledByExplainOnFailure();
+    queryService().explainFail().handledByExplainOnFailure();
   }
 
   @Test
   public void analyzeExceptionShouldBeCached() {
-    queryService()
-        .analyzeFail()
-        .handledByOnFailure();
+    queryService().analyzeFail().handledByOnFailure();
   }
 
   Helper queryService() {
@@ -133,12 +109,14 @@ Helper executeSuccess() {
     Helper executeSuccess(Split split) {
       this.split = Optional.ofNullable(split);
       doAnswer(
-          invocation -> {
-            ResponseListener<ExecutionEngine.QueryResponse> listener = invocation.getArgument(2);
-            listener.onResponse(
-                new ExecutionEngine.QueryResponse(schema, Collections.emptyList()));
-            return null;
-          })
+              invocation -> {
+                ResponseListener<ExecutionEngine.QueryResponse> listener =
+                    invocation.getArgument(2);
+                listener.onResponse(
+                    new ExecutionEngine.QueryResponse(
+                        schema, Collections.emptyList(), Cursor.None));
+                return null;
+              })
           .when(executionEngine)
           .execute(any(), any(), any());
       lenient().when(planContext.getSplit()).thenReturn(this.split);
@@ -147,9 +125,7 @@ Helper executeSuccess(Split split) {
     }
 
     Helper analyzeFail() {
-      doThrow(new IllegalStateException("analyze exception"))
-          .when(analyzer)
-          .analyze(any(), any());
+      doThrow(new IllegalStateException("analyze exception")).when(analyzer).analyze(any(), any());
 
       return this;
     }
@@ -164,14 +140,14 @@ Helper executeFail() {
 
     Helper explainSuccess() {
       doAnswer(
-          invocation -> {
-            ResponseListener<ExecutionEngine.ExplainResponse> listener =
-                invocation.getArgument(1);
-            listener.onResponse(
-                new ExecutionEngine.ExplainResponse(
-                    new ExecutionEngine.ExplainResponseNode("test")));
-            return null;
-          })
+              invocation -> {
+                ResponseListener<ExecutionEngine.ExplainResponse> listener =
+                    invocation.getArgument(1);
+                listener.onResponse(
+                    new ExecutionEngine.ExplainResponse(
+                        new ExecutionEngine.ExplainResponseNode("test")));
+                return null;
+              })
           .when(executionEngine)
           .explain(any(), any());
 
@@ -186,36 +162,37 @@ Helper explainFail() {
       return this;
     }
 
-
     void handledByOnResponse() {
-      ResponseListener<ExecutionEngine.QueryResponse> responseListener = new ResponseListener<>() {
-        @Override
-        public void onResponse(ExecutionEngine.QueryResponse pplQueryResponse) {
-          assertNotNull(pplQueryResponse);
-        }
-
-        @Override
-        public void onFailure(Exception e) {
-          fail();
-        }
-      };
+      ResponseListener<ExecutionEngine.QueryResponse> responseListener =
+          new ResponseListener<>() {
+            @Override
+            public void onResponse(ExecutionEngine.QueryResponse pplQueryResponse) {
+              assertNotNull(pplQueryResponse);
+            }
+
+            @Override
+            public void onFailure(Exception e) {
+              fail();
+            }
+          };
       split.ifPresentOrElse(
           split -> queryService.executePlan(logicalPlan, planContext, responseListener),
           () -> queryService.execute(ast, responseListener));
     }
 
     void handledByOnFailure() {
-      ResponseListener<ExecutionEngine.QueryResponse> responseListener = new ResponseListener<>() {
-        @Override
-        public void onResponse(ExecutionEngine.QueryResponse pplQueryResponse) {
-          fail();
-        }
-
-        @Override
-        public void onFailure(Exception e) {
-          assertTrue(e instanceof IllegalStateException);
-        }
-      };
+      ResponseListener<ExecutionEngine.QueryResponse> responseListener =
+          new ResponseListener<>() {
+            @Override
+            public void onResponse(ExecutionEngine.QueryResponse pplQueryResponse) {
+              fail();
+            }
+
+            @Override
+            public void onFailure(Exception e) {
+              assertTrue(e instanceof IllegalStateException);
+            }
+          };
       split.ifPresentOrElse(
           split -> queryService.executePlan(logicalPlan, planContext, responseListener),
           () -> queryService.execute(ast, responseListener));
@@ -252,6 +229,5 @@ public void onFailure(Exception e) {
             }
           });
     }
-
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/executor/execution/CommandPlanTest.java b/core/src/test/java/org/opensearch/sql/executor/execution/CommandPlanTest.java
new file mode 100644
index 0000000000..aff5a0d867
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/executor/execution/CommandPlanTest.java
@@ -0,0 +1,77 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.sql.executor.execution;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.CALLS_REAL_METHODS;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.withSettings;
+
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.ast.tree.UnresolvedPlan;
+import org.opensearch.sql.common.response.ResponseListener;
+import org.opensearch.sql.executor.QueryId;
+import org.opensearch.sql.executor.QueryService;
+import org.opensearch.sql.planner.logical.LogicalPlan;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+public class CommandPlanTest {
+
+  @Test
+  public void execute_without_error() {
+    QueryService qs = mock(QueryService.class);
+    ResponseListener listener = mock(ResponseListener.class);
+    doNothing().when(qs).execute(any(), any());
+
+    new CommandPlan(QueryId.queryId(), mock(UnresolvedPlan.class), qs, listener).execute();
+
+    verify(qs).execute(any(), any());
+    verify(listener, never()).onFailure(any());
+  }
+
+  @Test
+  public void execute_with_error() {
+    QueryService qs = mock(QueryService.class, withSettings().defaultAnswer(CALLS_REAL_METHODS));
+    ResponseListener listener = mock(ResponseListener.class);
+    doThrow(new RuntimeException()).when(qs).executePlan(any(LogicalPlan.class), any(), any());
+
+    new CommandPlan(QueryId.queryId(), mock(UnresolvedPlan.class), qs, listener).execute();
+
+    verify(listener).onFailure(any());
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void explain_not_supported() {
+    QueryService qs = mock(QueryService.class);
+    ResponseListener listener = mock(ResponseListener.class);
+    ResponseListener explainListener = mock(ResponseListener.class);
+
+    var exception =
+        assertThrows(
+            Throwable.class,
+            () ->
+                new CommandPlan(QueryId.queryId(), mock(UnresolvedPlan.class), qs, listener)
+                    .explain(explainListener));
+    assertEquals("CommandPlan does not support explain", exception.getMessage());
+
+    verify(listener, never()).onResponse(any());
+    verify(listener, never()).onFailure(any());
+    verify(explainListener, never()).onResponse(any());
+    verify(explainListener, never()).onFailure(any());
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/executor/execution/ExplainPlanTest.java b/core/src/test/java/org/opensearch/sql/executor/execution/ExplainPlanTest.java
index 54b4f24db0..cdb7f9dcb8 100644
--- a/core/src/test/java/org/opensearch/sql/executor/execution/ExplainPlanTest.java
+++ b/core/src/test/java/org/opensearch/sql/executor/execution/ExplainPlanTest.java
@@ -25,14 +25,11 @@
 
 @ExtendWith(MockitoExtension.class)
 public class ExplainPlanTest {
-  @Mock
-  private QueryId queryId;
+  @Mock private QueryId queryId;
 
-  @Mock
-  private QueryPlan queryPlan;
+  @Mock private QueryPlan queryPlan;
 
-  @Mock
-  private ResponseListener<ExecutionEngine.ExplainResponse> explainListener;
+  @Mock private ResponseListener<ExecutionEngine.ExplainResponse> explainListener;
 
   @Test
   public void execute() {
diff --git a/core/src/test/java/org/opensearch/sql/executor/execution/IntervalTriggerExecutionTest.java b/core/src/test/java/org/opensearch/sql/executor/execution/IntervalTriggerExecutionTest.java
index e0638ba88f..9eb99d37e3 100644
--- a/core/src/test/java/org/opensearch/sql/executor/execution/IntervalTriggerExecutionTest.java
+++ b/core/src/test/java/org/opensearch/sql/executor/execution/IntervalTriggerExecutionTest.java
@@ -18,16 +18,12 @@ public class IntervalTriggerExecutionTest {
 
   @Test
   void executeTaskWithInterval() {
-    triggerTask(2)
-        .taskRun(1)
-        .aroundInterval();
+    triggerTask(2).taskRun(1).aroundInterval();
   }
 
   @Test
   void continueExecuteIfTaskRunningLongerThanInterval() {
-    triggerTask(1)
-        .taskRun(2)
-        .aroundTaskRuntime();
+    triggerTask(1).taskRun(2).aroundTaskRuntime();
   }
 
   Helper triggerTask(long interval) {
diff --git a/core/src/test/java/org/opensearch/sql/executor/execution/QueryPlanFactoryTest.java b/core/src/test/java/org/opensearch/sql/executor/execution/QueryPlanFactoryTest.java
index cc4bf070fb..5aed9acc63 100644
--- a/core/src/test/java/org/opensearch/sql/executor/execution/QueryPlanFactoryTest.java
+++ b/core/src/test/java/org/opensearch/sql/executor/execution/QueryPlanFactoryTest.java
@@ -8,42 +8,48 @@
 
 package org.opensearch.sql.executor.execution;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.opensearch.sql.executor.execution.QueryPlanFactory.NO_CONSUMER_RESPONSE_LISTENER;
 
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.ast.statement.Explain;
 import org.opensearch.sql.ast.statement.Query;
 import org.opensearch.sql.ast.statement.Statement;
+import org.opensearch.sql.ast.tree.CloseCursor;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.common.response.ResponseListener;
+import org.opensearch.sql.exception.UnsupportedCursorRequestException;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.QueryService;
+import org.opensearch.sql.executor.pagination.CanPaginateVisitor;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class QueryPlanFactoryTest {
 
-  @Mock
-  private UnresolvedPlan plan;
+  @Mock private UnresolvedPlan plan;
 
-  @Mock
-  private QueryService queryService;
+  @Mock private QueryService queryService;
 
-  @Mock
-  private ResponseListener<ExecutionEngine.QueryResponse> queryListener;
+  @Mock private ResponseListener<ExecutionEngine.QueryResponse> queryListener;
 
-  @Mock
-  private ResponseListener<ExecutionEngine.ExplainResponse> explainListener;
+  @Mock private ResponseListener<ExecutionEngine.ExplainResponse> explainListener;
 
-  @Mock
-  private ExecutionEngine.QueryResponse queryResponse;
+  @Mock private ExecutionEngine.QueryResponse queryResponse;
 
   private QueryPlanFactory factory;
 
@@ -53,43 +59,54 @@ void init() {
   }
 
   @Test
-  public void createFromQueryShouldSuccess() {
-    Statement query = new Query(plan);
+  public void create_from_query_should_success() {
+    Statement query = new Query(plan, 0);
     AbstractPlan queryExecution =
         factory.create(query, Optional.of(queryListener), Optional.empty());
     assertTrue(queryExecution instanceof QueryPlan);
   }
 
   @Test
-  public void createFromExplainShouldSuccess() {
-    Statement query = new Explain(new Query(plan));
+  public void create_from_explain_should_success() {
+    Statement query = new Explain(new Query(plan, 0));
     AbstractPlan queryExecution =
         factory.create(query, Optional.empty(), Optional.of(explainListener));
     assertTrue(queryExecution instanceof ExplainPlan);
   }
 
   @Test
-  public void createFromQueryWithoutQueryListenerShouldThrowException() {
-    Statement query = new Query(plan);
+  public void create_from_cursor_should_success() {
+    AbstractPlan queryExecution = factory.create("", false, queryListener, explainListener);
+    AbstractPlan explainExecution = factory.create("", true, queryListener, explainListener);
+    assertAll(
+        () -> assertTrue(queryExecution instanceof QueryPlan),
+        () -> assertTrue(explainExecution instanceof ExplainPlan));
+  }
+
+  @Test
+  public void create_from_query_without_query_listener_should_throw_exception() {
+    Statement query = new Query(plan, 0);
 
     IllegalArgumentException exception =
-        assertThrows(IllegalArgumentException.class, () -> factory.create(query,
-            Optional.empty(), Optional.empty()));
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> factory.create(query, Optional.empty(), Optional.empty()));
     assertEquals("[BUG] query listener must be not null", exception.getMessage());
   }
 
   @Test
-  public void createFromExplainWithoutExplainListenerShouldThrowException() {
-    Statement query = new Explain(new Query(plan));
+  public void create_from_explain_without_explain_listener_should_throw_exception() {
+    Statement query = new Explain(new Query(plan, 0));
 
     IllegalArgumentException exception =
-        assertThrows(IllegalArgumentException.class, () -> factory.create(query,
-            Optional.empty(), Optional.empty()));
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> factory.create(query, Optional.empty(), Optional.empty()));
     assertEquals("[BUG] explain listener must be not null", exception.getMessage());
   }
 
   @Test
-  public void noConsumerResponseChannel() {
+  public void no_consumer_response_channel() {
     IllegalStateException exception =
         assertThrows(
             IllegalStateException.class,
@@ -104,4 +121,35 @@ public void noConsumerResponseChannel() {
     assertEquals(
         "[BUG] exception response should not sent to unexpected channel", exception.getMessage());
   }
+
+  @Test
+  public void create_query_with_fetch_size_which_can_be_paged() {
+    when(plan.accept(any(CanPaginateVisitor.class), any())).thenReturn(Boolean.TRUE);
+    factory = new QueryPlanFactory(queryService);
+    Statement query = new Query(plan, 10);
+    AbstractPlan queryExecution =
+        factory.create(query, Optional.of(queryListener), Optional.empty());
+    assertTrue(queryExecution instanceof QueryPlan);
+  }
+
+  @Test
+  public void create_query_with_fetch_size_which_cannot_be_paged() {
+    when(plan.accept(any(CanPaginateVisitor.class), any())).thenReturn(Boolean.FALSE);
+    factory = new QueryPlanFactory(queryService);
+    Statement query = new Query(plan, 10);
+    assertThrows(
+        UnsupportedCursorRequestException.class,
+        () -> factory.create(query, Optional.of(queryListener), Optional.empty()));
+  }
+
+  @Test
+  public void create_close_cursor() {
+    factory = new QueryPlanFactory(queryService);
+    var plan = factory.createCloseCursor("pewpew", queryListener);
+    assertTrue(plan instanceof CommandPlan);
+    plan.execute();
+    var captor = ArgumentCaptor.forClass(UnresolvedPlan.class);
+    verify(queryService).execute(captor.capture(), any());
+    assertTrue(captor.getValue() instanceof CloseCursor);
+  }
 }
diff --git a/core/src/test/java/org/opensearch/sql/executor/execution/QueryPlanTest.java b/core/src/test/java/org/opensearch/sql/executor/execution/QueryPlanTest.java
index 834db76996..57ff5c70e9 100644
--- a/core/src/test/java/org/opensearch/sql/executor/execution/QueryPlanTest.java
+++ b/core/src/test/java/org/opensearch/sql/executor/execution/QueryPlanTest.java
@@ -8,40 +8,44 @@
 
 package org.opensearch.sql.executor.execution;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import org.apache.commons.lang3.NotImplementedException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.common.response.ResponseListener;
+import org.opensearch.sql.executor.DefaultExecutionEngine;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.QueryId;
 import org.opensearch.sql.executor.QueryService;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class QueryPlanTest {
 
-  @Mock
-  private QueryId queryId;
+  @Mock private QueryId queryId;
 
-  @Mock
-  private UnresolvedPlan plan;
+  @Mock private UnresolvedPlan plan;
 
-  @Mock
-  private QueryService queryService;
+  @Mock private QueryService queryService;
 
-  @Mock
-  private ResponseListener<ExecutionEngine.ExplainResponse> explainListener;
+  @Mock private ResponseListener<ExecutionEngine.ExplainResponse> explainListener;
 
-  @Mock
-  private ResponseListener<ExecutionEngine.QueryResponse> queryListener;
+  @Mock private ResponseListener<ExecutionEngine.QueryResponse> queryListener;
 
   @Test
-  public void execute() {
+  public void execute_no_page_size() {
     QueryPlan query = new QueryPlan(queryId, plan, queryService, queryListener);
     query.execute();
 
@@ -49,10 +53,71 @@ public void execute() {
   }
 
   @Test
-  public void explain() {
+  public void explain_no_page_size() {
     QueryPlan query = new QueryPlan(queryId, plan, queryService, queryListener);
     query.explain(explainListener);
 
     verify(queryService, times(1)).explain(plan, explainListener);
   }
+
+  @Test
+  public void can_execute_paginated_plan() {
+    var listener =
+        new ResponseListener<ExecutionEngine.QueryResponse>() {
+          @Override
+          public void onResponse(ExecutionEngine.QueryResponse response) {
+            assertNotNull(response);
+          }
+
+          @Override
+          public void onFailure(Exception e) {
+            fail();
+          }
+        };
+    var plan =
+        new QueryPlan(QueryId.queryId(), mock(UnresolvedPlan.class), 10, queryService, listener);
+    plan.execute();
+  }
+
+  @Test
+  // Same as previous test, but with incomplete QueryService
+  public void can_handle_error_while_executing_plan() {
+    var listener =
+        new ResponseListener<ExecutionEngine.QueryResponse>() {
+          @Override
+          public void onResponse(ExecutionEngine.QueryResponse response) {
+            fail();
+          }
+
+          @Override
+          public void onFailure(Exception e) {
+            assertNotNull(e);
+          }
+        };
+    var plan =
+        new QueryPlan(
+            QueryId.queryId(),
+            mock(UnresolvedPlan.class),
+            10,
+            new QueryService(null, new DefaultExecutionEngine(), null),
+            listener);
+    plan.execute();
+  }
+
+  @Test
+  public void explain_is_not_supported_for_pagination() {
+    new QueryPlan(null, null, 0, null, null)
+        .explain(
+            new ResponseListener<>() {
+              @Override
+              public void onResponse(ExecutionEngine.ExplainResponse response) {
+                fail();
+              }
+
+              @Override
+              public void onFailure(Exception e) {
+                assertTrue(e instanceof NotImplementedException);
+              }
+            });
+  }
 }
diff --git a/core/src/test/java/org/opensearch/sql/executor/execution/StreamingQueryPlanTest.java b/core/src/test/java/org/opensearch/sql/executor/execution/StreamingQueryPlanTest.java
index 7357e99d18..2e8666aea4 100644
--- a/core/src/test/java/org/opensearch/sql/executor/execution/StreamingQueryPlanTest.java
+++ b/core/src/test/java/org/opensearch/sql/executor/execution/StreamingQueryPlanTest.java
@@ -49,9 +49,7 @@ class StreamingQueryPlanTest {
 
   @Test
   void executionSuccess() throws InterruptedException {
-    streamingQuery()
-        .streamingSource()
-        .shouldSuccess();
+    streamingQuery().streamingSource().shouldSuccess();
   }
 
   @Test
@@ -70,9 +68,7 @@ void failIfNoStreamingSource() throws InterruptedException {
 
   @Test
   void taskExecutionShouldNotCallListener() throws InterruptedException {
-    streamingQuery()
-        .streamingSource()
-        .taskExecutionShouldNotCallListener();
+    streamingQuery().streamingSource().taskExecutionShouldNotCallListener();
   }
 
   Helper streamingQuery() {
diff --git a/core/src/test/java/org/opensearch/sql/executor/pagination/CanPaginateVisitorTest.java b/core/src/test/java/org/opensearch/sql/executor/pagination/CanPaginateVisitorTest.java
new file mode 100644
index 0000000000..5f2ba86c2f
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/executor/pagination/CanPaginateVisitorTest.java
@@ -0,0 +1,507 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.executor.pagination;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
+import static org.opensearch.sql.ast.dsl.AstDSL.agg;
+import static org.opensearch.sql.ast.dsl.AstDSL.aggregate;
+import static org.opensearch.sql.ast.dsl.AstDSL.alias;
+import static org.opensearch.sql.ast.dsl.AstDSL.allFields;
+import static org.opensearch.sql.ast.dsl.AstDSL.and;
+import static org.opensearch.sql.ast.dsl.AstDSL.argument;
+import static org.opensearch.sql.ast.dsl.AstDSL.between;
+import static org.opensearch.sql.ast.dsl.AstDSL.booleanLiteral;
+import static org.opensearch.sql.ast.dsl.AstDSL.caseWhen;
+import static org.opensearch.sql.ast.dsl.AstDSL.cast;
+import static org.opensearch.sql.ast.dsl.AstDSL.compare;
+import static org.opensearch.sql.ast.dsl.AstDSL.equalTo;
+import static org.opensearch.sql.ast.dsl.AstDSL.eval;
+import static org.opensearch.sql.ast.dsl.AstDSL.field;
+import static org.opensearch.sql.ast.dsl.AstDSL.filter;
+import static org.opensearch.sql.ast.dsl.AstDSL.function;
+import static org.opensearch.sql.ast.dsl.AstDSL.highlight;
+import static org.opensearch.sql.ast.dsl.AstDSL.in;
+import static org.opensearch.sql.ast.dsl.AstDSL.intLiteral;
+import static org.opensearch.sql.ast.dsl.AstDSL.intervalLiteral;
+import static org.opensearch.sql.ast.dsl.AstDSL.limit;
+import static org.opensearch.sql.ast.dsl.AstDSL.map;
+import static org.opensearch.sql.ast.dsl.AstDSL.not;
+import static org.opensearch.sql.ast.dsl.AstDSL.or;
+import static org.opensearch.sql.ast.dsl.AstDSL.project;
+import static org.opensearch.sql.ast.dsl.AstDSL.qualifiedName;
+import static org.opensearch.sql.ast.dsl.AstDSL.relation;
+import static org.opensearch.sql.ast.dsl.AstDSL.sort;
+import static org.opensearch.sql.ast.dsl.AstDSL.stringLiteral;
+import static org.opensearch.sql.ast.dsl.AstDSL.tableFunction;
+import static org.opensearch.sql.ast.dsl.AstDSL.unresolvedArg;
+import static org.opensearch.sql.ast.dsl.AstDSL.unresolvedAttr;
+import static org.opensearch.sql.ast.dsl.AstDSL.values;
+import static org.opensearch.sql.ast.dsl.AstDSL.when;
+import static org.opensearch.sql.ast.dsl.AstDSL.window;
+import static org.opensearch.sql.ast.dsl.AstDSL.xor;
+
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.ast.Node;
+import org.opensearch.sql.ast.expression.Alias;
+import org.opensearch.sql.ast.expression.Argument;
+import org.opensearch.sql.ast.expression.DataType;
+import org.opensearch.sql.ast.expression.Field;
+import org.opensearch.sql.ast.expression.Literal;
+import org.opensearch.sql.ast.expression.RelevanceFieldList;
+import org.opensearch.sql.ast.expression.UnresolvedExpression;
+import org.opensearch.sql.ast.tree.Project;
+import org.opensearch.sql.ast.tree.Relation;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+public class CanPaginateVisitorTest {
+
+  static final CanPaginateVisitor visitor = new CanPaginateVisitor();
+
+  @Test
+  // select * from y
+  public void accept_query_with_select_star_and_from() {
+    var plan = project(relation("dummy"), allFields());
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select x from y
+  public void allow_query_with_select_field_and_from() {
+    var plan = project(relation("dummy"), field("pewpew"));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select x from y
+  public void visitUnresolvedAttribute() {
+    var plan = project(relation("dummy"), unresolvedAttr("pewpew"));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select x as z from y
+  public void allow_query_with_select_alias_and_from() {
+    var plan = project(relation("dummy"), alias("pew", field("pewpew"), "pew"));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select N from y
+  public void allow_query_with_select_literal_and_from() {
+    var plan = project(relation("dummy"), intLiteral(42));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select x.z from y
+  public void allow_query_with_select_qn_and_from() {
+    var plan = project(relation("dummy"), qualifiedName("field.subfield"));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select x,z from y
+  public void allow_query_with_select_fields_and_from() {
+    var plan = project(relation("dummy"), field("pewpew"), field("pewpew"));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select x
+  public void allow_query_without_from() {
+    var plan = project(values(List.of(intLiteral(1))), alias("1", intLiteral(1)));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  public void visitField() {
+    // test combinations of acceptable and not acceptable args for coverage
+    assertAll(
+        () ->
+            assertFalse(
+                project(relation("dummy"), field(map("1", "2"), argument("name", intLiteral(0))))
+                    .accept(visitor, null)),
+        () ->
+            assertFalse(
+                project(
+                        relation("dummy"),
+                        field(
+                            "field",
+                            new Argument(
+                                "",
+                                new Literal(1, DataType.INTEGER) {
+                                  @Override
+                                  public List<UnresolvedExpression> getChild() {
+                                    return List.of(map("1", "2"));
+                                  }
+                                })))
+                    .accept(visitor, null)));
+  }
+
+  @Test
+  public void visitAlias() {
+    // test combinations of acceptable and not acceptable args for coverage
+    assertAll(
+        () ->
+            assertFalse(
+                project(relation("dummy"), alias("pew", map("1", "2"), "pew"))
+                    .accept(visitor, null)),
+        () ->
+            assertFalse(
+                project(
+                        relation("dummy"),
+                        new Alias("pew", field("pew")) {
+                          @Override
+                          public List<? extends Node> getChild() {
+                            return List.of(map("1", "2"));
+                          }
+                        })
+                    .accept(visitor, null)));
+  }
+
+  @Test
+  // select a = b
+  public void visitEqualTo() {
+    var plan =
+        project(values(List.of(intLiteral(1))), alias("1", equalTo(intLiteral(1), intLiteral(1))));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select interval
+  public void visitInterval() {
+    var plan =
+        project(
+            values(List.of(intLiteral(1))),
+            alias("1", intervalLiteral(intLiteral(1), DataType.INTEGER, "days")));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select a != b
+  public void visitCompare() {
+    var plan =
+        project(
+            values(List.of(intLiteral(1))),
+            alias("1", compare("!=", intLiteral(1), intLiteral(1))));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select NOT a
+  public void visitNot() {
+    var plan = project(values(List.of(intLiteral(1))), alias("1", not(booleanLiteral(true))));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select a OR b
+  public void visitOr() {
+    var plan =
+        project(
+            values(List.of(intLiteral(1))),
+            alias("1", or(booleanLiteral(true), booleanLiteral(false))));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select a AND b
+  public void visitAnd() {
+    var plan =
+        project(
+            values(List.of(intLiteral(1))),
+            alias("1", and(booleanLiteral(true), booleanLiteral(false))));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select a XOR b
+  public void visitXor() {
+    var plan =
+        project(
+            values(List.of(intLiteral(1))),
+            alias("1", xor(booleanLiteral(true), booleanLiteral(false))));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select f()
+  public void visitFunction() {
+    var plan = project(values(List.of(intLiteral(1))), function("func"));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select nested() ...
+  public void visitNested() {
+    var plan = project(values(List.of(intLiteral(1))), function("nested"));
+    assertFalse(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select a IN ()
+  public void visitIn() {
+    // test combinations of acceptable and not acceptable args for coverage
+    assertAll(
+        () ->
+            assertTrue(
+                project(values(List.of(intLiteral(1))), alias("1", in(field("a"))))
+                    .accept(visitor, null)),
+        () ->
+            assertFalse(
+                project(values(List.of(intLiteral(1))), alias("1", in(field("a"), map("1", "2"))))
+                    .accept(visitor, null)),
+        () ->
+            assertFalse(
+                project(values(List.of(intLiteral(1))), alias("1", in(map("1", "2"), field("a"))))
+                    .accept(visitor, null)));
+  }
+
+  @Test
+  // select a BETWEEN 1 AND 2
+  public void visitBetween() {
+    var plan =
+        project(
+            values(List.of(intLiteral(1))),
+            alias("1", between(field("a"), intLiteral(1), intLiteral(2))));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select a CASE 1 WHEN 2
+  public void visitCase() {
+    var plan =
+        project(
+            values(List.of(intLiteral(1))),
+            alias("1", caseWhen(intLiteral(1), when(intLiteral(3), intLiteral(4)))));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select CAST(a as TYPE)
+  public void visitCast() {
+    // test combinations of acceptable and not acceptable args for coverage
+    assertAll(
+        () ->
+            assertTrue(
+                project(
+                        values(List.of(intLiteral(1))),
+                        alias("1", cast(intLiteral(2), stringLiteral("int"))))
+                    .accept(visitor, null)),
+        () ->
+            assertFalse(
+                project(
+                        values(List.of(intLiteral(1))),
+                        alias(
+                            "1",
+                            cast(
+                                intLiteral(2),
+                                new Literal(1, DataType.INTEGER) {
+                                  @Override
+                                  public List<UnresolvedExpression> getChild() {
+                                    return List.of(map("1", "2"));
+                                  }
+                                })))
+                    .accept(visitor, null)),
+        () ->
+            assertFalse(
+                project(
+                        values(List.of(intLiteral(1))),
+                        alias("1", cast(map("1", "2"), stringLiteral("int"))))
+                    .accept(visitor, null)));
+  }
+
+  @Test
+  public void visitArgument() {
+    var plan = project(relation("dummy"), field("pewpew", argument("name", intLiteral(0))));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // source=x | eval a = b
+  public void reject_query_with_eval() {
+    var plan = project(eval(relation("dummy")));
+    assertFalse(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select highlight("Body") from beer.stackexchange where
+  // simple_query_string(["Tags" ^ 1.5, "Title", "Body" 4.2], "taste")
+  // and Tags like "% % %" and Title like "%";
+  public void accept_query_with_highlight_and_relevance_func() {
+    var plan =
+        project(
+            filter(
+                relation("beer.stackexchange"),
+                and(
+                    and(
+                        function("like", qualifiedName("Tags"), stringLiteral("% % %")),
+                        function("like", qualifiedName("Title"), stringLiteral("%"))),
+                    function(
+                        "simple_query_string",
+                        unresolvedArg(
+                            "fields",
+                            new RelevanceFieldList(
+                                Map.of("Title", 1.0F, "Body", 4.2F, "Tags", 1.5F))),
+                        unresolvedArg("query", stringLiteral("taste"))))),
+            alias("highlight(\"Body\")", highlight(stringLiteral("Body"), Map.of())));
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select * from y limit z
+  public void reject_query_with_limit_but_no_offset() {
+    var plan = project(limit(relation("dummy"), 1, 0), allFields());
+    assertFalse(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select * from y limit z, n
+  public void reject_query_with_offset() {
+    var plan = project(limit(relation("dummy"), 0, 1), allFields());
+    assertFalse(plan.accept(visitor, null));
+  }
+
+  // test added for coverage only
+  @Test
+  public void visitLimit() {
+    var visitor =
+        new CanPaginateVisitor() {
+          @Override
+          public Boolean visitRelation(Relation node, Object context) {
+            return Boolean.FALSE;
+          }
+        };
+    var plan = project(limit(relation("dummy"), 0, 0), allFields());
+    assertFalse(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select * from y where z
+  public void allow_query_with_where() {
+    var plan = project(filter(relation("dummy"), booleanLiteral(true)), allFields());
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select * from y order by z
+  public void allow_query_with_order_by_with_column_references_only() {
+    var plan = project(sort(relation("dummy"), field("1")), allFields());
+    assertTrue(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select * from y order by func(z)
+  public void reject_query_with_order_by_with_an_expression() {
+    var plan = project(sort(relation("dummy"), field(function("func"))), allFields());
+    assertFalse(plan.accept(visitor, null));
+  }
+
+  // test added for coverage only
+  @Test
+  public void visitSort() {
+    CanPaginateVisitor visitor =
+        new CanPaginateVisitor() {
+          @Override
+          public Boolean visitRelation(Relation node, Object context) {
+            return Boolean.FALSE;
+          }
+        };
+    var plan = project(sort(relation("dummy"), field("1")), allFields());
+    assertFalse(plan.accept(visitor, null));
+    visitor =
+        new CanPaginateVisitor() {
+          @Override
+          public Boolean visitField(Field node, Object context) {
+            return Boolean.FALSE;
+          }
+        };
+    plan = project(sort(relation("dummy"), field("1")), allFields());
+    assertFalse(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select * from y group by z
+  public void reject_query_with_group_by() {
+    var plan =
+        project(
+            agg(relation("dummy"), List.of(), List.of(), List.of(field("1")), List.of()),
+            allFields());
+    assertFalse(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select agg(x) from y
+  public void reject_query_with_aggregation_function() {
+    var plan =
+        project(
+            agg(
+                relation("dummy"),
+                List.of(alias("agg", aggregate("func", field("pewpew")))),
+                List.of(),
+                List.of(),
+                List.of()),
+            allFields());
+    assertFalse(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select window(x) from y
+  public void reject_query_with_window_function() {
+    var plan =
+        project(
+            relation("dummy"),
+            alias(
+                "pewpew",
+                window(
+                    aggregate("func", field("pewpew")), List.of(qualifiedName("1")), List.of())));
+    assertFalse(plan.accept(visitor, null));
+  }
+
+  @Test
+  // select * from y, z
+  public void reject_query_with_select_from_multiple_indices() {
+    var plan = mock(Project.class);
+    when(plan.getChild()).thenReturn(List.of(relation("dummy"), relation("pummy")));
+    when(plan.getProjectList()).thenReturn(List.of(allFields()));
+    assertFalse(visitor.visitProject(plan, null));
+  }
+
+  @Test
+  // unreal case, added for coverage only
+  public void reject_project_when_relation_has_child() {
+    var relation = mock(Relation.class, withSettings().useConstructor(qualifiedName("42")));
+    when(relation.getChild()).thenReturn(List.of(relation("pewpew")));
+    when(relation.accept(visitor, null)).thenCallRealMethod();
+    var plan = mock(Project.class);
+    when(plan.getChild()).thenReturn(List.of(relation));
+    when(plan.getProjectList()).thenReturn(List.of(allFields()));
+    assertFalse(visitor.visitProject((Project) plan, null));
+  }
+
+  @Test
+  // test combinations of acceptable and not acceptable args for coverage
+  public void visitFilter() {
+    assertAll(
+        () ->
+            assertTrue(
+                project(filter(relation("dummy"), booleanLiteral(true))).accept(visitor, null)),
+        () -> assertFalse(project(filter(relation("dummy"), map("1", "2"))).accept(visitor, null)),
+        () ->
+            assertFalse(
+                project(filter(tableFunction(List.of("1", "2")), booleanLiteral(true)))
+                    .accept(visitor, null)));
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/executor/pagination/CursorTest.java b/core/src/test/java/org/opensearch/sql/executor/pagination/CursorTest.java
new file mode 100644
index 0000000000..fe9590b60b
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/executor/pagination/CursorTest.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.executor.pagination;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+class CursorTest {
+
+  @Test
+  void empty_array_is_none() {
+    Assertions.assertEquals(Cursor.None, new Cursor(null));
+  }
+
+  @Test
+  void toString_is_array_value() {
+    String cursorTxt = "This is a test";
+    Assertions.assertEquals(cursorTxt, new Cursor(cursorTxt).toString());
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/executor/pagination/PlanSerializerTest.java b/core/src/test/java/org/opensearch/sql/executor/pagination/PlanSerializerTest.java
new file mode 100644
index 0000000000..495a7db80c
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/executor/pagination/PlanSerializerTest.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.executor.pagination;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.opensearch.sql.exception.NoCursorException;
+import org.opensearch.sql.planner.SerializablePlan;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+import org.opensearch.sql.storage.StorageEngine;
+import org.opensearch.sql.utils.TestOperator;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+public class PlanSerializerTest {
+
+  StorageEngine storageEngine;
+
+  PlanSerializer planCache;
+
+  @BeforeEach
+  void setUp() {
+    storageEngine = mock(StorageEngine.class);
+    planCache = new PlanSerializer(storageEngine);
+  }
+
+  @ParameterizedTest
+  @ValueSource(
+      strings = {
+        "pewpew",
+        "asdkfhashdfjkgakgfwuigfaijkb",
+        "ajdhfgajklghadfjkhgjkadhgad"
+            + "kadfhgadhjgfjklahdgqheygvskjfbvgsdklgfuirehiluANUIfgauighbahfuasdlhfnhaughsdlfhaughaggf"
+            + "and_some_other_funny_stuff_which_could_be_generated_while_sleeping_on_the_keyboard"
+      })
+  void serialize_deserialize_str(String input) {
+    var compressed = serialize(input);
+    assertEquals(input, deserialize(compressed));
+    if (input.length() > 200) {
+      // Compression of short strings isn't profitable, because encoding into string and gzip
+      // headers add more bytes than input string has.
+      assertTrue(compressed.length() < input.length());
+    }
+  }
+
+  public static class SerializableTestClass implements Serializable {
+    public int field;
+
+    @Override
+    public boolean equals(Object obj) {
+      return field == ((SerializableTestClass) obj).field;
+    }
+  }
+
+  // Can't serialize private classes because they are not accessible
+  private class NotSerializableTestClass implements Serializable {
+    public int field;
+
+    @Override
+    public boolean equals(Object obj) {
+      return field == ((SerializableTestClass) obj).field;
+    }
+  }
+
+  @Test
+  void serialize_deserialize_obj() {
+    var obj = new SerializableTestClass();
+    obj.field = 42;
+    assertEquals(obj, deserialize(serialize(obj)));
+    assertNotSame(obj, deserialize(serialize(obj)));
+  }
+
+  @Test
+  void serialize_throws() {
+    assertThrows(Throwable.class, () -> serialize(new NotSerializableTestClass()));
+    var testObj = new TestOperator();
+    testObj.setThrowIoOnWrite(true);
+    assertThrows(Throwable.class, () -> serialize(testObj));
+  }
+
+  @Test
+  void deserialize_throws() {
+    assertAll(
+        // from gzip - damaged header
+        () -> assertThrows(Throwable.class, () -> deserialize("00")),
+        // from HashCode::fromString
+        () -> assertThrows(Throwable.class, () -> deserialize("000")));
+  }
+
+  @Test
+  @SneakyThrows
+  void convertToCursor_returns_no_cursor_if_cant_serialize() {
+    var plan = new TestOperator(42);
+    plan.setThrowNoCursorOnWrite(true);
+    assertAll(
+        () -> assertThrows(NoCursorException.class, () -> serialize(plan)),
+        () -> assertEquals(Cursor.None, planCache.convertToCursor(plan)));
+  }
+
+  @Test
+  @SneakyThrows
+  void convertToCursor_returns_no_cursor_if_plan_is_not_paginate() {
+    var plan = mock(PhysicalPlan.class);
+    assertEquals(Cursor.None, planCache.convertToCursor(plan));
+  }
+
+  @Test
+  void convertToPlan_throws_cursor_has_no_prefix() {
+    assertThrows(UnsupportedOperationException.class, () -> planCache.convertToPlan("abc"));
+  }
+
+  @Test
+  void convertToPlan_throws_if_failed_to_deserialize() {
+    assertThrows(
+        UnsupportedOperationException.class,
+        () -> planCache.convertToPlan("n:" + serialize(mock(Serializable.class))));
+  }
+
+  @Test
+  @SneakyThrows
+  void serialize_and_deserialize() {
+    var plan = new TestOperator(42);
+    var roundTripPlan = planCache.deserialize(planCache.serialize(plan));
+    assertEquals(roundTripPlan, plan);
+    assertNotSame(roundTripPlan, plan);
+  }
+
+  @Test
+  void convertToCursor_and_convertToPlan() {
+    var plan = new TestOperator(100500);
+    var roundTripPlan =
+        (SerializablePlan) planCache.convertToPlan(planCache.convertToCursor(plan).toString());
+    assertEquals(plan, roundTripPlan);
+    assertNotSame(plan, roundTripPlan);
+  }
+
+  @Test
+  @SneakyThrows
+  void resolveObject() {
+    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    ObjectOutputStream objectOutput = new ObjectOutputStream(output);
+    objectOutput.writeObject("Hello, world!");
+    objectOutput.flush();
+
+    var cds =
+        planCache.getCursorDeserializationStream(new ByteArrayInputStream(output.toByteArray()));
+    assertEquals(storageEngine, cds.resolveObject("engine"));
+    var object = new Object();
+    assertSame(object, cds.resolveObject(object));
+  }
+
+  // Helpers and auxiliary classes section below
+
+  @SneakyThrows
+  private String serialize(Serializable input) {
+    return new PlanSerializer(null).serialize(input);
+  }
+
+  private Serializable deserialize(String input) {
+    return new PlanSerializer(null).deserialize(input);
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/executor/streaming/DefaultMetadataLogTest.java b/core/src/test/java/org/opensearch/sql/executor/streaming/DefaultMetadataLogTest.java
index 4d8c4f3e93..17ea253e2a 100644
--- a/core/src/test/java/org/opensearch/sql/executor/streaming/DefaultMetadataLogTest.java
+++ b/core/src/test/java/org/opensearch/sql/executor/streaming/DefaultMetadataLogTest.java
@@ -8,7 +8,6 @@
 
 package org.opensearch.sql.executor.streaming;
 
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/core/src/test/java/org/opensearch/sql/executor/streaming/MicroBatchStreamingExecutionTest.java b/core/src/test/java/org/opensearch/sql/executor/streaming/MicroBatchStreamingExecutionTest.java
index 1a2b6e3f2a..bd0c8ed3e1 100644
--- a/core/src/test/java/org/opensearch/sql/executor/streaming/MicroBatchStreamingExecutionTest.java
+++ b/core/src/test/java/org/opensearch/sql/executor/streaming/MicroBatchStreamingExecutionTest.java
@@ -26,6 +26,7 @@
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.QueryService;
+import org.opensearch.sql.executor.pagination.Cursor;
 import org.opensearch.sql.planner.PlanContext;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.storage.split.Split;
@@ -44,19 +45,12 @@ void executedSuccess() {
 
   @Test
   void executedFailed() {
-    streamingQuery()
-        .addData()
-        .executeFailed()
-        .latestOffsetLogShouldBe(0L)
-        .noCommittedLog();
+    streamingQuery().addData().executeFailed().latestOffsetLogShouldBe(0L).noCommittedLog();
   }
 
   @Test
   void noDataInSource() {
-    streamingQuery()
-        .neverProcess()
-        .noOffsetLog()
-        .noCommittedLog();
+    streamingQuery().neverProcess().noOffsetLog().noCommittedLog();
   }
 
   @Test
@@ -169,7 +163,7 @@ Helper executeSuccess(Long... offsets) {
                 ResponseListener<ExecutionEngine.QueryResponse> listener =
                     invocation.getArgument(2);
                 listener.onResponse(
-                    new ExecutionEngine.QueryResponse(null, Collections.emptyList()));
+                    new ExecutionEngine.QueryResponse(null, Collections.emptyList(), Cursor.None));
 
                 PlanContext planContext = invocation.getArgument(1);
                 assertTrue(planContext.getSplit().isPresent());
@@ -228,7 +222,7 @@ Helper latestOffsetLogShouldBe(Long offsetId) {
    * StreamingSource impl only for testing.
    *
    * <p>initially, offset is -1, getLatestOffset() will return Optional.emtpy().
-   * 
+   *
    * <p>call addData() add offset by one.
    */
   static class TestStreamingSource implements StreamingSource {
@@ -255,8 +249,8 @@ public Optional<Offset> getLatestOffset() {
     public Batch getBatch(Optional<Offset> start, Offset end) {
       return new Batch(
           new TestOffsetSplit(
-              start.map(v -> v.getOffset() + 1).orElse(0L), Long.min(offset.get(),
-              end.getOffset())));
+              start.map(v -> v.getOffset() + 1).orElse(0L),
+              Long.min(offset.get(), end.getOffset())));
     }
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/expression/ExpressionNodeVisitorTest.java b/core/src/test/java/org/opensearch/sql/expression/ExpressionNodeVisitorTest.java
index 47fe9dad0f..2f3e855430 100644
--- a/core/src/test/java/org/opensearch/sql/expression/ExpressionNodeVisitorTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/ExpressionNodeVisitorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,70 +30,69 @@ class ExpressionNodeVisitorTest {
 
   @Test
   void should_return_null_by_default() {
-    ExpressionNodeVisitor<Object, Object> visitor = new ExpressionNodeVisitor<Object, Object>(){};
+    ExpressionNodeVisitor<Object, Object> visitor = new ExpressionNodeVisitor<Object, Object>() {};
     assertNull(new HighlightExpression(DSL.literal("Title")).accept(visitor, null));
     assertNull(literal(10).accept(visitor, null));
     assertNull(ref("name", STRING).accept(visitor, null));
     assertNull(named("bool", literal(true)).accept(visitor, null));
     assertNull(DSL.abs(literal(-10)).accept(visitor, null));
     assertNull(DSL.sum(literal(10)).accept(visitor, null));
-    assertNull(named("avg", new AvgAggregator(Collections.singletonList(ref("age", INTEGER)),
-        INTEGER)).accept(visitor, null));
+    assertNull(
+        named("avg", new AvgAggregator(Collections.singletonList(ref("age", INTEGER)), INTEGER))
+            .accept(visitor, null));
     assertNull(new CaseClause(ImmutableList.of(), null).accept(visitor, null));
     assertNull(new WhenClause(literal("test"), literal(10)).accept(visitor, null));
     assertNull(DSL.namedArgument("field", literal("message")).accept(visitor, null));
     assertNull(DSL.span(ref("age", INTEGER), literal(1), "").accept(visitor, null));
-    assertNull(DSL.regex(ref("name", STRING), DSL.literal("(?<group>\\d+)"), DSL.literal("group"))
-        .accept(visitor, null));
+    assertNull(
+        DSL.regex(ref("name", STRING), DSL.literal("(?<group>\\d+)"), DSL.literal("group"))
+            .accept(visitor, null));
   }
 
   @Test
   void can_visit_all_types_of_expression_node() {
     Expression expr =
         DSL.regex(
-            DSL.castString(
-                DSL.sum(
-                    DSL.add(
-                        ref("balance", INTEGER),
-                        literal(10))
-                )),
+            DSL.castString(DSL.sum(DSL.add(ref("balance", INTEGER), literal(10)))),
             DSL.literal("(?<group>\\d+)"),
             DSL.literal("group"));
 
-    Expression actual = expr.accept(new ExpressionNodeVisitor<Expression, Object>() {
-      @Override
-      public Expression visitLiteral(LiteralExpression node, Object context) {
-        return node;
-      }
+    Expression actual =
+        expr.accept(
+            new ExpressionNodeVisitor<Expression, Object>() {
+              @Override
+              public Expression visitLiteral(LiteralExpression node, Object context) {
+                return node;
+              }
 
-      @Override
-      public Expression visitReference(ReferenceExpression node, Object context) {
-        return node;
-      }
+              @Override
+              public Expression visitReference(ReferenceExpression node, Object context) {
+                return node;
+              }
 
-      @Override
-      public Expression visitParse(ParseExpression node, Object context) {
-        return node;
-      }
+              @Override
+              public Expression visitParse(ParseExpression node, Object context) {
+                return node;
+              }
 
-      @Override
-      public Expression visitFunction(FunctionExpression node, Object context) {
-        return DSL.add(visitArguments(node.getArguments(), context));
-      }
+              @Override
+              public Expression visitFunction(FunctionExpression node, Object context) {
+                return DSL.add(visitArguments(node.getArguments(), context));
+              }
 
-      @Override
-      public Expression visitAggregator(Aggregator<?> node, Object context) {
-        return DSL.sum(visitArguments(node.getArguments(), context));
-      }
+              @Override
+              public Expression visitAggregator(Aggregator<?> node, Object context) {
+                return DSL.sum(visitArguments(node.getArguments(), context));
+              }
 
-      private Expression[] visitArguments(List<Expression> arguments, Object context) {
-        return arguments.stream()
-                        .map(arg -> arg.accept(this, context))
-                        .toArray(Expression[]::new);
-      }
-    }, null);
+              private Expression[] visitArguments(List<Expression> arguments, Object context) {
+                return arguments.stream()
+                    .map(arg -> arg.accept(this, context))
+                    .toArray(Expression[]::new);
+              }
+            },
+            null);
 
     assertEquals(expr, actual);
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/ExpressionTestBase.java b/core/src/test/java/org/opensearch/sql/expression/ExpressionTestBase.java
index c73bd8ac18..fd886cdda3 100644
--- a/core/src/test/java/org/opensearch/sql/expression/ExpressionTestBase.java
+++ b/core/src/test/java/org/opensearch/sql/expression/ExpressionTestBase.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression;
 
 import static org.opensearch.sql.config.TestConfig.BOOL_TYPE_MISSING_VALUE_FIELD;
@@ -29,33 +28,18 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.List;
 import java.util.function.Function;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.opensearch.sql.config.TestConfig;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.function.FunctionProperties;
-import org.opensearch.sql.expression.function.FunctionPropertiesTestConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {FunctionPropertiesTestConfig.class, ExpressionTestBase.class,
-    TestConfig.class})
 public class ExpressionTestBase {
 
-  @Autowired
-  protected FunctionProperties functionProperties;
+  protected FunctionProperties functionProperties = new FunctionProperties();
 
-  @Autowired
   protected Environment<Expression, ExprType> typeEnv;
 
-  @Bean
   protected static Environment<Expression, ExprValue> valueEnv() {
     return var -> {
       if (var instanceof ReferenceExpression) {
@@ -95,7 +79,6 @@ protected static Environment<Expression, ExprValue> valueEnv() {
     };
   }
 
-  @Bean
   protected Environment<Expression, ExprType> typeEnv() {
     return typeEnv;
   }
@@ -111,8 +94,8 @@ protected Function<List<Expression>, FunctionExpression> functionMapping(
         return (expressions) -> DSL.multiply(expressions.get(0), expressions.get(1));
       case DIVIDE:
         return (expressions) -> DSL.divide(expressions.get(0), expressions.get(1));
-      case MODULES:
-        return (expressions) -> DSL.module(expressions.get(0), expressions.get(1));
+      case MODULUS:
+        return (expressions) -> DSL.modulus(expressions.get(0), expressions.get(1));
       default:
         throw new RuntimeException();
     }
diff --git a/core/src/test/java/org/opensearch/sql/expression/HighlightExpressionTest.java b/core/src/test/java/org/opensearch/sql/expression/HighlightExpressionTest.java
index 41f3bad030..bc6b3628b0 100644
--- a/core/src/test/java/org/opensearch/sql/expression/HighlightExpressionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/HighlightExpressionTest.java
@@ -18,13 +18,13 @@
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.expression.env.Environment;
 
-
 public class HighlightExpressionTest extends ExpressionTestBase {
 
   @Test
   public void single_highlight_test() {
-    Environment<Expression, ExprValue> hlTuple = ExprValueUtils.tupleValue(
-        ImmutableMap.of("_highlight.Title", "result value")).bindingTuples();
+    Environment<Expression, ExprValue> hlTuple =
+        ExprValueUtils.tupleValue(ImmutableMap.of("_highlight.Title", "result value"))
+            .bindingTuples();
     HighlightExpression expr = new HighlightExpression(DSL.literal("Title"));
     ExprValue resultVal = expr.valueOf(hlTuple);
 
@@ -34,8 +34,9 @@ public void single_highlight_test() {
 
   @Test
   public void missing_highlight_test() {
-    Environment<Expression, ExprValue> hlTuple = ExprValueUtils.tupleValue(
-        ImmutableMap.of("_highlight.Title", "result value")).bindingTuples();
+    Environment<Expression, ExprValue> hlTuple =
+        ExprValueUtils.tupleValue(ImmutableMap.of("_highlight.Title", "result value"))
+            .bindingTuples();
 
     HighlightExpression expr = new HighlightExpression(DSL.literal("invalid"));
     ExprValue resultVal = expr.valueOf(hlTuple);
@@ -52,8 +53,8 @@ public void missing_highlight_wildcard_test() {
     builder.put("_highlight", ExprTupleValue.fromExprValueMap(hlBuilder.build()));
 
     HighlightExpression hlExpr = new HighlightExpression(DSL.literal("invalid*"));
-    ExprValue resultVal = hlExpr.valueOf(
-        ExprTupleValue.fromExprValueMap(builder.build()).bindingTuples());
+    ExprValue resultVal =
+        hlExpr.valueOf(ExprTupleValue.fromExprValueMap(builder.build()).bindingTuples());
 
     assertTrue(resultVal.isMissing());
   }
@@ -67,20 +68,23 @@ public void highlight_all_test() {
     builder.put("_highlight", ExprTupleValue.fromExprValueMap(hlBuilder.build()));
 
     HighlightExpression hlExpr = new HighlightExpression(DSL.literal("T*"));
-    ExprValue resultVal = hlExpr.valueOf(
-        ExprTupleValue.fromExprValueMap(builder.build()).bindingTuples());
+    ExprValue resultVal =
+        hlExpr.valueOf(ExprTupleValue.fromExprValueMap(builder.build()).bindingTuples());
 
     assertEquals(STRUCT, resultVal.type());
-    assertTrue(resultVal.tupleValue().containsValue(
-        ExprValueUtils.stringValue("correct result value")));
-    assertFalse(resultVal.tupleValue().containsValue(
-        ExprValueUtils.stringValue("secondary correct result value")));
+    assertTrue(
+        resultVal.tupleValue().containsValue(ExprValueUtils.stringValue("correct result value")));
+    assertFalse(
+        resultVal
+            .tupleValue()
+            .containsValue(ExprValueUtils.stringValue("secondary correct result value")));
   }
 
   @Test
   public void do_nothing_with_missing_value() {
-    Environment<Expression, ExprValue> hlTuple = ExprValueUtils.tupleValue(
-        ImmutableMap.of("NonHighlightField", "ResultValue")).bindingTuples();
+    Environment<Expression, ExprValue> hlTuple =
+        ExprValueUtils.tupleValue(ImmutableMap.of("NonHighlightField", "ResultValue"))
+            .bindingTuples();
     HighlightExpression expr = new HighlightExpression(DSL.literal("*"));
     ExprValue resultVal = expr.valueOf(hlTuple);
 
@@ -96,13 +100,13 @@ public void highlight_wildcard_test() {
     builder.put("_highlight", ExprTupleValue.fromExprValueMap(hlBuilder.build()));
 
     HighlightExpression hlExpr = new HighlightExpression(DSL.literal("T*"));
-    ExprValue resultVal = hlExpr.valueOf(
-        ExprTupleValue.fromExprValueMap(builder.build()).bindingTuples());
+    ExprValue resultVal =
+        hlExpr.valueOf(ExprTupleValue.fromExprValueMap(builder.build()).bindingTuples());
 
     assertEquals(STRUCT, resultVal.type());
-    assertTrue(resultVal.tupleValue().containsValue(
-        ExprValueUtils.stringValue("correct result value")));
-    assertFalse(resultVal.tupleValue().containsValue(
-        ExprValueUtils.stringValue("incorrect result value")));
+    assertTrue(
+        resultVal.tupleValue().containsValue(ExprValueUtils.stringValue("correct result value")));
+    assertFalse(
+        resultVal.tupleValue().containsValue(ExprValueUtils.stringValue("incorrect result value")));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/NamedExpressionTest.java b/core/src/test/java/org/opensearch/sql/expression/NamedExpressionTest.java
index 38f1ce3ca9..915952cca8 100644
--- a/core/src/test/java/org/opensearch/sql/expression/NamedExpressionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/NamedExpressionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -55,11 +54,12 @@ void name_a_span_expression() {
   @Test
   void name_a_parse_expression() {
     ParseExpression parse =
-        DSL.regex(DSL.ref("string_value", STRING), DSL.literal("(?<group>\\w{2})\\w"),
+        DSL.regex(
+            DSL.ref("string_value", STRING),
+            DSL.literal("(?<group>\\w{2})\\w"),
             DSL.literal("group"));
     NamedExpression named = DSL.named(parse);
     assertEquals(parse, named.getDelegated());
     assertEquals(parse.getIdentifier().valueOf().stringValue(), named.getName());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/ReferenceExpressionTest.java b/core/src/test/java/org/opensearch/sql/expression/ReferenceExpressionTest.java
index d3b44fe6a1..da8c15d19f 100644
--- a/core/src/test/java/org/opensearch/sql/expression/ReferenceExpressionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/ReferenceExpressionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,6 +34,7 @@
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
+import org.opensearch.sql.data.model.ExprCollectionValue;
 import org.opensearch.sql.data.model.ExprIntegerValue;
 import org.opensearch.sql.data.model.ExprStringValue;
 import org.opensearch.sql.data.model.ExprTupleValue;
@@ -53,13 +53,13 @@ public void resolve_value() {
     assertEquals(doubleValue(1d), DSL.ref("double_value", DOUBLE).valueOf(valueEnv()));
     assertEquals(booleanValue(true), DSL.ref("boolean_value", BOOLEAN).valueOf(valueEnv()));
     assertEquals(stringValue("str"), DSL.ref("string_value", STRING).valueOf(valueEnv()));
-    assertEquals(tupleValue(ImmutableMap.of("str", 1)),
-        DSL.ref("struct_value", STRUCT).valueOf(valueEnv()));
-    assertEquals(collectionValue(ImmutableList.of(1)),
-        DSL.ref("array_value", ARRAY).valueOf(valueEnv()));
+    assertEquals(
+        tupleValue(ImmutableMap.of("str", 1)), DSL.ref("struct_value", STRUCT).valueOf(valueEnv()));
+    assertEquals(
+        collectionValue(ImmutableList.of(1)), DSL.ref("array_value", ARRAY).valueOf(valueEnv()));
     assertEquals(LITERAL_NULL, DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN).valueOf(valueEnv()));
-    assertEquals(LITERAL_MISSING,
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN).valueOf(valueEnv()));
+    assertEquals(
+        LITERAL_MISSING, DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN).valueOf(valueEnv()));
   }
 
   @Test
@@ -126,7 +126,20 @@ public void innner_none_object_field_contain_dot() {
     assertEquals(1990, actualValue.integerValue());
   }
 
+  @Test
+  public void array_with_multiple_path_value() {
+    ReferenceExpression expr = new ReferenceExpression("message.info", STRING);
+    ExprValue actualValue = expr.resolve(tuple());
+
+    assertEquals(STRING, actualValue.type());
+    // Array of object, only first index is used
+    assertEquals("First message in array", actualValue.stringValue());
+  }
+
   /**
+   *
+   *
+   * <pre>
    * {
    *   "name": "bob smith"
    *   "project.year": 1990,
@@ -140,24 +153,37 @@ public void innner_none_object_field_contain_dot() {
    *   },
    *   "address.local": {
    *     "state": "WA",
-   *   }
+   *   },
+   *   "message": [
+   *     { "info": "message in array" },
+   *     { "info": "Only first index of array used" }
+   *   ]
    * }
+   * </pre>
    */
   private ExprTupleValue tuple() {
     ExprValue address =
-        ExprValueUtils.tupleValue(ImmutableMap.of("state", "WA", "city", "seattle", "project"
-            + ".year", 1990));
-    ExprValue project =
-        ExprValueUtils.tupleValue(ImmutableMap.of("year", 2020));
-    ExprValue addressLocal =
-        ExprValueUtils.tupleValue(ImmutableMap.of("state", "WA"));
-    ExprTupleValue tuple = ExprTupleValue.fromExprValueMap(ImmutableMap.of(
-        "name", new ExprStringValue("bob smith"),
-        "project.year", new ExprIntegerValue(1990),
-        "project", project,
-        "address", address,
-        "address.local", addressLocal
-        ));
+        ExprValueUtils.tupleValue(
+            ImmutableMap.of("state", "WA", "city", "seattle", "project" + ".year", 1990));
+    ExprValue project = ExprValueUtils.tupleValue(ImmutableMap.of("year", 2020));
+    ExprValue addressLocal = ExprValueUtils.tupleValue(ImmutableMap.of("state", "WA"));
+    ExprValue messageCollectionValue =
+        new ExprCollectionValue(
+            ImmutableList.of(
+                ExprValueUtils.tupleValue(
+                    ImmutableMap.of("info", stringValue("First message in array"))),
+                ExprValueUtils.tupleValue(
+                    ImmutableMap.of("info", stringValue("Only first index of array used")))));
+
+    ExprTupleValue tuple =
+        ExprTupleValue.fromExprValueMap(
+            ImmutableMap.of(
+                "name", new ExprStringValue("bob smith"),
+                "project.year", new ExprIntegerValue(1990),
+                "project", project,
+                "address", address,
+                "address.local", addressLocal,
+                "message", messageCollectionValue));
     return tuple;
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/aggregation/AggregationTest.java b/core/src/test/java/org/opensearch/sql/expression/aggregation/AggregationTest.java
index 7742e6c4d0..f1a3a9d948 100644
--- a/core/src/test/java/org/opensearch/sql/expression/aggregation/AggregationTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/aggregation/AggregationTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import com.google.common.collect.ImmutableList;
@@ -98,26 +97,46 @@ public class AggregationTest extends ExpressionTestBase {
 
   protected static List<ExprValue> tuples_with_duplicates =
       Arrays.asList(
-          ExprValueUtils.tupleValue(ImmutableMap.of(
-              "integer_value", 1,
-              "double_value", 4d,
-              "struct_value", ImmutableMap.of("str", 1),
-              "array_value", ImmutableList.of(1))),
-          ExprValueUtils.tupleValue(ImmutableMap.of(
-              "integer_value", 1,
-              "double_value", 3d,
-              "struct_value", ImmutableMap.of("str", 1),
-              "array_value", ImmutableList.of(1))),
-          ExprValueUtils.tupleValue(ImmutableMap.of(
-              "integer_value", 2,
-              "double_value", 2d,
-              "struct_value", ImmutableMap.of("str", 2),
-              "array_value", ImmutableList.of(2))),
-          ExprValueUtils.tupleValue(ImmutableMap.of(
-              "integer_value", 3,
-              "double_value", 1d,
-              "struct_value", ImmutableMap.of("str1", 1),
-              "array_value", ImmutableList.of(1, 2))));
+          ExprValueUtils.tupleValue(
+              ImmutableMap.of(
+                  "integer_value",
+                  1,
+                  "double_value",
+                  4d,
+                  "struct_value",
+                  ImmutableMap.of("str", 1),
+                  "array_value",
+                  ImmutableList.of(1))),
+          ExprValueUtils.tupleValue(
+              ImmutableMap.of(
+                  "integer_value",
+                  1,
+                  "double_value",
+                  3d,
+                  "struct_value",
+                  ImmutableMap.of("str", 1),
+                  "array_value",
+                  ImmutableList.of(1))),
+          ExprValueUtils.tupleValue(
+              ImmutableMap.of(
+                  "integer_value",
+                  2,
+                  "double_value",
+                  2d,
+                  "struct_value",
+                  ImmutableMap.of("str", 2),
+                  "array_value",
+                  ImmutableList.of(2))),
+          ExprValueUtils.tupleValue(
+              ImmutableMap.of(
+                  "integer_value",
+                  3,
+                  "double_value",
+                  1d,
+                  "struct_value",
+                  ImmutableMap.of("str1", 1),
+                  "array_value",
+                  ImmutableList.of(1, 2))));
 
   protected static List<ExprValue> tuples_with_null_and_missing =
       Arrays.asList(
diff --git a/core/src/test/java/org/opensearch/sql/expression/aggregation/AvgAggregatorTest.java b/core/src/test/java/org/opensearch/sql/expression/aggregation/AvgAggregatorTest.java
index 1fb7a1061c..f465a6477e 100644
--- a/core/src/test/java/org/opensearch/sql/expression/aggregation/AvgAggregatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/aggregation/AvgAggregatorTest.java
@@ -3,15 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.opensearch.sql.data.type.ExprCoreType.DATE;
+import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
 import static org.opensearch.sql.data.type.ExprCoreType.DOUBLE;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.data.type.ExprCoreType.TIME;
+import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.model.ExprValueUtils;
@@ -28,16 +36,23 @@ public void avg_field_expression() {
 
   @Test
   public void avg_arithmetic_expression() {
-    ExprValue result = aggregation(DSL.avg(
-        DSL.multiply(DSL.ref("integer_value", INTEGER),
-            DSL.literal(ExprValueUtils.integerValue(10)))), tuples);
+    ExprValue result =
+        aggregation(
+            DSL.avg(
+                DSL.multiply(
+                    DSL.ref("integer_value", INTEGER),
+                    DSL.literal(ExprValueUtils.integerValue(10)))),
+            tuples);
     assertEquals(25.0, result.value());
   }
 
   @Test
   public void filtered_avg() {
-    ExprValue result = aggregation(DSL.avg(DSL.ref("integer_value", INTEGER))
-        .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))), tuples);
+    ExprValue result =
+        aggregation(
+            DSL.avg(DSL.ref("integer_value", INTEGER))
+                .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))),
+            tuples);
     assertEquals(3.0, result.value());
   }
 
@@ -62,13 +77,77 @@ public void avg_with_all_missing_or_null() {
     assertTrue(result.isNull());
   }
 
+  @Test
+  public void avg_numeric_no_values() {
+    ExprValue result = aggregation(DSL.avg(DSL.ref("dummy", INTEGER)), List.of());
+    assertTrue(result.isNull());
+  }
+
+  @Test
+  public void avg_date_no_values() {
+    ExprValue result = aggregation(DSL.avg(DSL.ref("dummy", DATE)), List.of());
+    assertTrue(result.isNull());
+  }
+
+  @Test
+  public void avg_datetime_no_values() {
+    ExprValue result = aggregation(DSL.avg(DSL.ref("dummy", DATETIME)), List.of());
+    assertTrue(result.isNull());
+  }
+
+  @Test
+  public void avg_timestamp_no_values() {
+    ExprValue result = aggregation(DSL.avg(DSL.ref("dummy", TIMESTAMP)), List.of());
+    assertTrue(result.isNull());
+  }
+
+  @Test
+  public void avg_time_no_values() {
+    ExprValue result = aggregation(DSL.avg(DSL.ref("dummy", TIME)), List.of());
+    assertTrue(result.isNull());
+  }
+
+  @Test
+  public void avg_date() {
+    ExprValue result = aggregation(DSL.avg(DSL.date(DSL.ref("date_value", STRING))), tuples);
+    assertEquals(LocalDate.of(2007, 7, 2), result.dateValue());
+  }
+
+  @Test
+  public void avg_datetime() {
+    var result = aggregation(DSL.avg(DSL.datetime(DSL.ref("datetime_value", STRING))), tuples);
+    assertEquals(LocalDateTime.of(2012, 7, 2, 3, 30), result.datetimeValue());
+  }
+
+  @Test
+  public void avg_time() {
+    ExprValue result = aggregation(DSL.avg(DSL.time(DSL.ref("time_value", STRING))), tuples);
+    assertEquals(LocalTime.of(9, 30), result.timeValue());
+  }
+
+  @Test
+  public void avg_timestamp() {
+    var result = aggregation(DSL.avg(DSL.timestamp(DSL.ref("timestamp_value", STRING))), tuples);
+    assertEquals(TIMESTAMP, result.type());
+    assertEquals(LocalDateTime.of(2012, 7, 2, 3, 30), result.datetimeValue());
+  }
+
   @Test
   public void valueOf() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> DSL.avg(DSL.ref("double_value", DOUBLE)).valueOf(valueEnv()));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> DSL.avg(DSL.ref("double_value", DOUBLE)).valueOf(valueEnv()));
     assertEquals("can't evaluate on aggregator: avg", exception.getMessage());
   }
 
+  @Test
+  public void avg_on_unsupported_type() {
+    var aggregator = new AvgAggregator(List.of(DSL.ref("string", STRING)), STRING);
+    var exception = assertThrows(IllegalArgumentException.class, () -> aggregator.create());
+    assertEquals("avg aggregation over STRING type is not supported", exception.getMessage());
+  }
+
   @Test
   public void test_to_string() {
     Aggregator avgAggregator = DSL.avg(DSL.ref("integer_value", INTEGER));
@@ -77,9 +156,12 @@ public void test_to_string() {
 
   @Test
   public void test_nested_to_string() {
-    Aggregator avgAggregator = DSL.avg(DSL.multiply(DSL.ref("integer_value", INTEGER),
-        DSL.literal(ExprValueUtils.integerValue(10))));
-    assertEquals(String.format("avg(*(%s, %d))", DSL.ref("integer_value", INTEGER), 10),
+    Aggregator avgAggregator =
+        DSL.avg(
+            DSL.multiply(
+                DSL.ref("integer_value", INTEGER), DSL.literal(ExprValueUtils.integerValue(10))));
+    assertEquals(
+        String.format("avg(*(%s, %d))", DSL.ref("integer_value", INTEGER), 10),
         avgAggregator.toString());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/aggregation/CountAggregatorTest.java b/core/src/test/java/org/opensearch/sql/expression/aggregation/CountAggregatorTest.java
index fd27529a70..50bd3fedfe 100644
--- a/core/src/test/java/org/opensearch/sql/expression/aggregation/CountAggregatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/aggregation/CountAggregatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -72,9 +71,13 @@ public void count_datetime_field_expression() {
 
   @Test
   public void count_arithmetic_expression() {
-    ExprValue result = aggregation(DSL.count(
-        DSL.multiply(DSL.ref("integer_value", INTEGER),
-            DSL.literal(ExprValueUtils.integerValue(10)))), tuples);
+    ExprValue result =
+        aggregation(
+            DSL.count(
+                DSL.multiply(
+                    DSL.ref("integer_value", INTEGER),
+                    DSL.literal(ExprValueUtils.integerValue(10)))),
+            tuples);
     assertEquals(4, result.value());
   }
 
@@ -104,51 +107,56 @@ public void count_array_field_expression() {
 
   @Test
   public void filtered_count() {
-    ExprValue result = aggregation(DSL.count(DSL.ref("integer_value", INTEGER))
-        .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))), tuples);
+    ExprValue result =
+        aggregation(
+            DSL.count(DSL.ref("integer_value", INTEGER))
+                .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))),
+            tuples);
     assertEquals(3, result.value());
   }
 
   @Test
   public void distinct_count() {
-    ExprValue result = aggregation(DSL.distinctCount(DSL.ref("integer_value", INTEGER)),
-        tuples_with_duplicates);
+    ExprValue result =
+        aggregation(DSL.distinctCount(DSL.ref("integer_value", INTEGER)), tuples_with_duplicates);
     assertEquals(3, result.value());
   }
 
   @Test
   public void filtered_distinct_count() {
-    ExprValue result = aggregation(DSL.distinctCount(DSL.ref("integer_value", INTEGER))
-        .condition(DSL.greater(DSL.ref("double_value", DOUBLE), DSL.literal(1d))),
-        tuples_with_duplicates);
+    ExprValue result =
+        aggregation(
+            DSL.distinctCount(DSL.ref("integer_value", INTEGER))
+                .condition(DSL.greater(DSL.ref("double_value", DOUBLE), DSL.literal(1d))),
+            tuples_with_duplicates);
     assertEquals(2, result.value());
   }
 
   @Test
   public void distinct_count_map() {
-    ExprValue result = aggregation(DSL.distinctCount(DSL.ref("struct_value", STRUCT)),
-        tuples_with_duplicates);
+    ExprValue result =
+        aggregation(DSL.distinctCount(DSL.ref("struct_value", STRUCT)), tuples_with_duplicates);
     assertEquals(3, result.value());
   }
 
   @Test
   public void distinct_count_array() {
-    ExprValue result = aggregation(DSL.distinctCount(DSL.ref("array_value", ARRAY)),
-        tuples_with_duplicates);
+    ExprValue result =
+        aggregation(DSL.distinctCount(DSL.ref("array_value", ARRAY)), tuples_with_duplicates);
     assertEquals(3, result.value());
   }
 
   @Test
   public void count_with_missing() {
-    ExprValue result = aggregation(DSL.count(DSL.ref("integer_value", INTEGER)),
-        tuples_with_null_and_missing);
+    ExprValue result =
+        aggregation(DSL.count(DSL.ref("integer_value", INTEGER)), tuples_with_null_and_missing);
     assertEquals(2, result.value());
   }
 
   @Test
   public void count_with_null() {
-    ExprValue result = aggregation(DSL.count(DSL.ref("double_value", DOUBLE)),
-        tuples_with_null_and_missing);
+    ExprValue result =
+        aggregation(DSL.count(DSL.ref("double_value", DOUBLE)), tuples_with_null_and_missing);
     assertEquals(2, result.value());
   }
 
@@ -166,8 +174,10 @@ public void count_literal_with_null_and_missing() {
 
   @Test
   public void valueOf() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> DSL.count(DSL.ref("double_value", DOUBLE)).valueOf(valueEnv()));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> DSL.count(DSL.ref("double_value", DOUBLE)).valueOf(valueEnv()));
     assertEquals("can't evaluate on aggregator: count", exception.getMessage());
   }
 
@@ -183,7 +193,8 @@ public void test_to_string() {
   @Test
   public void test_nested_to_string() {
     Aggregator countAggregator = DSL.count(DSL.abs(DSL.ref("integer_value", INTEGER)));
-    assertEquals(String.format("count(abs(%s))", DSL.ref("integer_value", INTEGER)),
+    assertEquals(
+        String.format("count(abs(%s))", DSL.ref("integer_value", INTEGER)),
         countAggregator.toString());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/aggregation/MaxAggregatorTest.java b/core/src/test/java/org/opensearch/sql/expression/aggregation/MaxAggregatorTest.java
index 6886622704..c6cd380ad5 100644
--- a/core/src/test/java/org/opensearch/sql/expression/aggregation/MaxAggregatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/aggregation/MaxAggregatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -83,16 +82,23 @@ public void test_max_timestamp() {
 
   @Test
   public void test_max_arithmetic_expression() {
-    ExprValue result = aggregation(
-        DSL.max(DSL.add(DSL.ref("integer_value", INTEGER),
-            DSL.literal(ExprValueUtils.integerValue(0)))), tuples);
+    ExprValue result =
+        aggregation(
+            DSL.max(
+                DSL.add(
+                    DSL.ref("integer_value", INTEGER),
+                    DSL.literal(ExprValueUtils.integerValue(0)))),
+            tuples);
     assertEquals(4, result.value());
   }
 
   @Test
   public void filtered_max() {
-    ExprValue result = aggregation(DSL.max(DSL.ref("integer_value", INTEGER))
-        .condition(DSL.less(DSL.ref("integer_value", INTEGER), DSL.literal(4))), tuples);
+    ExprValue result =
+        aggregation(
+            DSL.max(DSL.ref("integer_value", INTEGER))
+                .condition(DSL.less(DSL.ref("integer_value", INTEGER), DSL.literal(4))),
+            tuples);
     assertEquals(3, result.value());
   }
 
@@ -119,8 +125,10 @@ public void test_max_all_missing_or_null() {
 
   @Test
   public void test_value_of() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> DSL.max(DSL.ref("double_value", DOUBLE)).valueOf(valueEnv()));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> DSL.max(DSL.ref("double_value", DOUBLE)).valueOf(valueEnv()));
     assertEquals("can't evaluate on aggregator: max", exception.getMessage());
   }
 
@@ -132,9 +140,12 @@ public void test_to_string() {
 
   @Test
   public void test_nested_to_string() {
-    Aggregator maxAggregator = DSL.max(DSL.add(DSL.ref("integer_value", INTEGER),
-        DSL.literal(ExprValueUtils.integerValue(10))));
-    assertEquals(String.format("max(+(%s, %d))", DSL.ref("integer_value", INTEGER), 10),
+    Aggregator maxAggregator =
+        DSL.max(
+            DSL.add(
+                DSL.ref("integer_value", INTEGER), DSL.literal(ExprValueUtils.integerValue(10))));
+    assertEquals(
+        String.format("max(+(%s, %d))", DSL.ref("integer_value", INTEGER), 10),
         maxAggregator.toString());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/aggregation/MinAggregatorTest.java b/core/src/test/java/org/opensearch/sql/expression/aggregation/MinAggregatorTest.java
index 1437f4dfda..1aee0f3a6c 100644
--- a/core/src/test/java/org/opensearch/sql/expression/aggregation/MinAggregatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/aggregation/MinAggregatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -83,16 +82,23 @@ public void test_min_timestamp() {
 
   @Test
   public void test_min_arithmetic_expression() {
-    ExprValue result = aggregation(
-        DSL.min(DSL.add(DSL.ref("integer_value", INTEGER),
-            DSL.literal(ExprValueUtils.integerValue(0)))), tuples);
+    ExprValue result =
+        aggregation(
+            DSL.min(
+                DSL.add(
+                    DSL.ref("integer_value", INTEGER),
+                    DSL.literal(ExprValueUtils.integerValue(0)))),
+            tuples);
     assertEquals(1, result.value());
   }
 
   @Test
   public void filtered_min() {
-    ExprValue result = aggregation(DSL.min(DSL.ref("integer_value", INTEGER))
-        .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))), tuples);
+    ExprValue result =
+        aggregation(
+            DSL.min(DSL.ref("integer_value", INTEGER))
+                .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))),
+            tuples);
     assertEquals(2, result.value());
   }
 
@@ -119,8 +125,10 @@ public void test_min_all_missing_or_null() {
 
   @Test
   public void test_value_of() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> DSL.min(DSL.ref("double_value", DOUBLE)).valueOf(valueEnv()));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> DSL.min(DSL.ref("double_value", DOUBLE)).valueOf(valueEnv()));
     assertEquals("can't evaluate on aggregator: min", exception.getMessage());
   }
 
@@ -132,9 +140,12 @@ public void test_to_string() {
 
   @Test
   public void test_nested_to_string() {
-    Aggregator minAggregator = DSL.min(DSL.add(DSL.ref("integer_value", INTEGER),
-        DSL.literal(ExprValueUtils.integerValue(10))));
-    assertEquals(String.format("min(+(%s, %d))", DSL.ref("integer_value", INTEGER), 10),
+    Aggregator minAggregator =
+        DSL.min(
+            DSL.add(
+                DSL.ref("integer_value", INTEGER), DSL.literal(ExprValueUtils.integerValue(10))));
+    assertEquals(
+        String.format("min(+(%s, %d))", DSL.ref("integer_value", INTEGER), 10),
         minAggregator.toString());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/aggregation/PercentileApproxAggregatorTest.java b/core/src/test/java/org/opensearch/sql/expression/aggregation/PercentileApproxAggregatorTest.java
new file mode 100644
index 0000000000..7f0eaec9c0
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/aggregation/PercentileApproxAggregatorTest.java
@@ -0,0 +1,319 @@
+/*
+ *   Licensed under the Apache License, Version 2.0 (the "License").
+ *   You may not use this file except in compliance with the License.
+ *   A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file. This file is distributed
+ *   on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *   express or implied. See the License for the specific language governing
+ *   permissions and limitations under the License.
+ */
+
+package org.opensearch.sql.expression.aggregation;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.data.model.ExprValueUtils.*;
+import static org.opensearch.sql.data.type.ExprCoreType.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.model.ExprValueUtils;
+import org.opensearch.sql.exception.ExpressionEvaluationException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.LiteralExpression;
+import org.opensearch.sql.storage.bindingtuple.BindingTuple;
+
+@ExtendWith(MockitoExtension.class)
+public class PercentileApproxAggregatorTest extends AggregationTest {
+
+  @Mock Expression expression;
+
+  @Mock ExprValue tupleValue;
+
+  @Mock BindingTuple tuple;
+
+  @Test
+  public void test_percentile_field_expression() {
+    ExprValue result =
+        aggregation(DSL.percentile(DSL.ref("integer_value", INTEGER), DSL.literal(50)), tuples);
+    assertEquals(2.5, result.value());
+    result = aggregation(DSL.percentile(DSL.ref("long_value", LONG), DSL.literal(50)), tuples);
+    assertEquals(2.5, result.value());
+    result = aggregation(DSL.percentile(DSL.ref("double_value", DOUBLE), DSL.literal(50)), tuples);
+    assertEquals(2.5, result.value());
+    result = aggregation(DSL.percentile(DSL.ref("float_value", FLOAT), DSL.literal(50)), tuples);
+    assertEquals(2.5, result.value());
+  }
+
+  @Test
+  public void test_percentile_field_expression_with_user_defined_compression() {
+    ExprValue result =
+        aggregation(
+            DSL.percentile(DSL.ref("integer_value", INTEGER), DSL.literal(50), DSL.literal(0.1)),
+            tuples);
+    assertEquals(2.5, result.value());
+    result =
+        aggregation(
+            DSL.percentile(DSL.ref("long_value", LONG), DSL.literal(50), DSL.literal(0.1)), tuples);
+    assertEquals(2.5, result.value());
+    result =
+        aggregation(
+            DSL.percentile(DSL.ref("double_value", DOUBLE), DSL.literal(50), DSL.literal(0.1)),
+            tuples);
+    assertEquals(2.5, result.value());
+    result =
+        aggregation(
+            DSL.percentile(DSL.ref("float_value", FLOAT), DSL.literal(50), DSL.literal(0.1)),
+            tuples);
+    assertEquals(2.5, result.value());
+  }
+
+  @Test
+  public void test_percentile_expression() {
+    ExprValue result =
+        percentile(
+            DSL.literal(50),
+            integerValue(0),
+            integerValue(1),
+            integerValue(2),
+            integerValue(3),
+            integerValue(4));
+    assertEquals(2.0, result.value());
+    result = percentile(DSL.literal(30), integerValue(2012), integerValue(2013));
+    assertEquals(2012, result.integerValue());
+  }
+
+  @Test
+  public void test_percentile_with_negative() {
+    ExprValue result =
+        percentile(
+            DSL.literal(50),
+            longValue(-100000L),
+            longValue(-50000L),
+            longValue(40000L),
+            longValue(50000L));
+    assertEquals(-5000.0, result.value());
+    ExprValue[] results =
+        percentiles(longValue(-100000L), longValue(-50000L), longValue(40000L), longValue(50000L));
+    assertPercentileValues(
+        results,
+        -100000.0, // p=1.0
+        -100000.0, // p=5.0
+        -100000.0, // p=10.0
+        -85000.0, // p=20.0
+        -75000.0, // p=25.0
+        -65000.0, // p=30.0
+        -40999.999999999985, // p=40.0
+        -5000.0, // p=50.0
+        30999.999999999996, // p=60.0
+        43000.0, // p=70.0
+        45000.0, // p=75.0
+        47000.0, // p=80.0
+        50000.0, // p=90.0
+        50000.0, // p=95.0
+        50000.0, // p=99.0
+        50000.0, // p=99.9
+        50000.0); // p=100.0
+  }
+
+  @Test
+  public void test_percentile_value() {
+    ExprValue[] results =
+        percentiles(
+            integerValue(0), integerValue(1), integerValue(2), integerValue(3), integerValue(4));
+    assertPercentileValues(
+        results, 0.0, // p=1.0
+        0.0, // p=5.0
+        0.0, // p=10.0
+        0.5, // p=20.0
+        0.75, // p=25.0
+        1.0, // p=30.0
+        1.5, // p=40.0
+        2.0, // p=50.0
+        2.5, // p=60.0
+        3.0, // p=70.0
+        3.25, // p=75.0
+        3.5, // p=80.0
+        4.0, // p=90.0
+        4.0, // p=95.0
+        4.0, // p=99.0
+        4.0, // p=99.9
+        4.0); // p=100.0
+  }
+
+  @Test
+  public void test_percentile_with_invalid_size() {
+    var exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                aggregation(
+                    DSL.percentile(DSL.ref("double_value", DOUBLE), DSL.literal(-1)), tuples));
+    assertEquals("out of bounds percent value, must be in [0, 100]", exception.getMessage());
+    exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                aggregation(
+                    DSL.percentile(DSL.ref("double_value", DOUBLE), DSL.literal(200)), tuples));
+    assertEquals("out of bounds percent value, must be in [0, 100]", exception.getMessage());
+    exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                aggregation(
+                    DSL.percentile(
+                        DSL.ref("double_value", DOUBLE), DSL.literal(-1), DSL.literal(100)),
+                    tuples));
+    assertEquals("out of bounds percent value, must be in [0, 100]", exception.getMessage());
+    exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                aggregation(
+                    DSL.percentile(
+                        DSL.ref("double_value", DOUBLE), DSL.literal(200), DSL.literal(100)),
+                    tuples));
+    assertEquals("out of bounds percent value, must be in [0, 100]", exception.getMessage());
+    var exception2 =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () ->
+                aggregation(
+                    DSL.percentile(DSL.ref("double_value", DOUBLE), DSL.literal("string")),
+                    tuples));
+    assertEquals(
+        "percentile_approx function expected"
+            + " {[INTEGER,DOUBLE],[INTEGER,DOUBLE,DOUBLE],[LONG,DOUBLE],[LONG,DOUBLE,DOUBLE],"
+            + "[FLOAT,DOUBLE],[FLOAT,DOUBLE,DOUBLE],[DOUBLE,DOUBLE],[DOUBLE,DOUBLE,DOUBLE]},"
+            + " but get [DOUBLE,STRING]",
+        exception2.getMessage());
+  }
+
+  @Test
+  public void test_arithmetic_expression() {
+    ExprValue result =
+        aggregation(
+            DSL.percentile(
+                DSL.multiply(
+                    DSL.ref("integer_value", INTEGER),
+                    DSL.literal(ExprValueUtils.integerValue(10))),
+                DSL.literal(50)),
+            tuples);
+    assertEquals(25.0, result.value());
+  }
+
+  @Test
+  public void test_filtered_percentile() {
+    ExprValue result =
+        aggregation(
+            DSL.percentile(DSL.ref("integer_value", INTEGER), DSL.literal(50))
+                .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))),
+            tuples);
+    assertEquals(3.0, result.value());
+  }
+
+  @Test
+  public void test_with_missing() {
+    ExprValue result =
+        aggregation(
+            DSL.percentile(DSL.ref("integer_value", INTEGER), DSL.literal(50)),
+            tuples_with_null_and_missing);
+    assertEquals(1.5, result.value());
+  }
+
+  @Test
+  public void test_with_null() {
+    ExprValue result =
+        aggregation(
+            DSL.percentile(DSL.ref("double_value", DOUBLE), DSL.literal(50)),
+            tuples_with_null_and_missing);
+    assertEquals(3.5, result.value());
+  }
+
+  @Test
+  public void test_with_all_missing_or_null() {
+    ExprValue result =
+        aggregation(
+            DSL.percentile(DSL.ref("integer_value", INTEGER), DSL.literal(50)),
+            tuples_with_all_null_or_missing);
+    assertTrue(result.isNull());
+  }
+
+  @Test
+  public void test_unsupported_type() {
+    var exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                new PercentileApproximateAggregator(
+                    List.of(DSL.ref("string", STRING), DSL.ref("string", STRING)), STRING));
+    assertEquals(
+        "percentile aggregation over STRING type is not supported", exception.getMessage());
+  }
+
+  @Test
+  public void test_to_string() {
+    Aggregator aggregator = DSL.percentile(DSL.ref("integer_value", INTEGER), DSL.literal(50));
+    assertEquals("percentile(integer_value,50)", aggregator.toString());
+    aggregator =
+        DSL.percentile(DSL.ref("integer_value", INTEGER), DSL.literal(50), DSL.literal(0.1));
+    assertEquals("percentile(integer_value,50,0.1)", aggregator.toString());
+  }
+
+  private ExprValue[] percentiles(ExprValue value, ExprValue... values) {
+    return new ExprValue[] {
+      percentile(DSL.literal(1.0), value, values),
+      percentile(DSL.literal(5.0), value, values),
+      percentile(DSL.literal(10.0), value, values),
+      percentile(DSL.literal(20.0), value, values),
+      percentile(DSL.literal(25.0), value, values),
+      percentile(DSL.literal(30.0), value, values),
+      percentile(DSL.literal(40.0), value, values),
+      percentile(DSL.literal(50.0), value, values),
+      percentile(DSL.literal(60.0), value, values),
+      percentile(DSL.literal(70.0), value, values),
+      percentile(DSL.literal(75.0), value, values),
+      percentile(DSL.literal(80.0), value, values),
+      percentile(DSL.literal(90.0), value, values),
+      percentile(DSL.literal(95.0), value, values),
+      percentile(DSL.literal(99.0), value, values),
+      percentile(DSL.literal(99.9), value, values),
+      percentile(DSL.literal(100.0), value, values)
+    };
+  }
+
+  private void assertPercentileValues(ExprValue[] actualValues, Double... expectedValues) {
+    int i = 0;
+    for (Double expected : expectedValues) {
+      assertEquals(expected, actualValues[i].value());
+      i++;
+    }
+  }
+
+  private ExprValue percentile(LiteralExpression p, ExprValue value, ExprValue... values) {
+    when(expression.valueOf(any())).thenReturn(value, values);
+    when(expression.type()).thenReturn(DOUBLE);
+    return aggregation(DSL.percentile(expression, p), mockTuples(value, values));
+  }
+
+  private List<ExprValue> mockTuples(ExprValue value, ExprValue... values) {
+    List<ExprValue> mockTuples = new ArrayList<>();
+    when(tupleValue.bindingTuples()).thenReturn(tuple);
+    mockTuples.add(tupleValue);
+    for (ExprValue exprValue : values) {
+      mockTuples.add(tupleValue);
+    }
+    return mockTuples;
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/aggregation/StdDevAggregatorTest.java b/core/src/test/java/org/opensearch/sql/expression/aggregation/StdDevAggregatorTest.java
index fe4923d4df..ceb76815dc 100644
--- a/core/src/test/java/org/opensearch/sql/expression/aggregation/StdDevAggregatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/aggregation/StdDevAggregatorTest.java
@@ -40,14 +40,11 @@
 @ExtendWith(MockitoExtension.class)
 public class StdDevAggregatorTest extends AggregationTest {
 
-  @Mock
-  Expression expression;
+  @Mock Expression expression;
 
-  @Mock
-  ExprValue tupleValue;
+  @Mock ExprValue tupleValue;
 
-  @Mock
-  BindingTuple tuple;
+  @Mock BindingTuple tuple;
 
   @Test
   public void stddev_sample_field_expression() {
diff --git a/core/src/test/java/org/opensearch/sql/expression/aggregation/SumAggregatorTest.java b/core/src/test/java/org/opensearch/sql/expression/aggregation/SumAggregatorTest.java
index 676306041e..eb5a18f248 100644
--- a/core/src/test/java/org/opensearch/sql/expression/aggregation/SumAggregatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/aggregation/SumAggregatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -53,9 +52,13 @@ public void sum_double_field_expression() {
 
   @Test
   public void sum_arithmetic_expression() {
-    ExprValue result = aggregation(DSL.sum(
-        DSL.multiply(DSL.ref("integer_value", INTEGER),
-            DSL.literal(ExprValueUtils.integerValue(10)))), tuples);
+    ExprValue result =
+        aggregation(
+            DSL.sum(
+                DSL.multiply(
+                    DSL.ref("integer_value", INTEGER),
+                    DSL.literal(ExprValueUtils.integerValue(10)))),
+            tuples);
     assertEquals(100, result.value());
   }
 
@@ -64,19 +67,23 @@ public void sum_string_field_expression() {
     SumAggregator sumAggregator =
         new SumAggregator(ImmutableList.of(DSL.ref("string_value", STRING)), ExprCoreType.STRING);
     SumState sumState = sumAggregator.create();
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> sumAggregator
-            .iterate(
-                ExprValueUtils.tupleValue(ImmutableMap.of("string_value", "m")).bindingTuples(),
-                sumState)
-    );
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () ->
+                sumAggregator.iterate(
+                    ExprValueUtils.tupleValue(ImmutableMap.of("string_value", "m")).bindingTuples(),
+                    sumState));
     assertEquals("unexpected type [STRING] in sum aggregation", exception.getMessage());
   }
 
   @Test
   public void filtered_sum() {
-    ExprValue result = aggregation(DSL.sum(DSL.ref("integer_value", INTEGER))
-        .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))), tuples);
+    ExprValue result =
+        aggregation(
+            DSL.sum(DSL.ref("integer_value", INTEGER))
+                .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))),
+            tuples);
     assertEquals(9, result.value());
   }
 
@@ -103,8 +110,10 @@ public void sum_with_all_missing_or_null() {
 
   @Test
   public void valueOf() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> DSL.sum(DSL.ref("double_value", DOUBLE)).valueOf(valueEnv()));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> DSL.sum(DSL.ref("double_value", DOUBLE)).valueOf(valueEnv()));
     assertEquals("can't evaluate on aggregator: sum", exception.getMessage());
   }
 
@@ -116,9 +125,12 @@ public void test_to_string() {
 
   @Test
   public void test_nested_to_string() {
-    Aggregator sumAggregator = DSL.sum(DSL.multiply(DSL.ref("integer_value", INTEGER),
-        DSL.literal(ExprValueUtils.integerValue(10))));
-    assertEquals(String.format("sum(*(%s, %d))", DSL.ref("integer_value", INTEGER), 10),
+    Aggregator sumAggregator =
+        DSL.sum(
+            DSL.multiply(
+                DSL.ref("integer_value", INTEGER), DSL.literal(ExprValueUtils.integerValue(10))));
+    assertEquals(
+        String.format("sum(*(%s, %d))", DSL.ref("integer_value", INTEGER), 10),
         sumAggregator.toString());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/aggregation/TakeAggregatorTest.java b/core/src/test/java/org/opensearch/sql/expression/aggregation/TakeAggregatorTest.java
index 6d9aac4957..2409ec49d2 100644
--- a/core/src/test/java/org/opensearch/sql/expression/aggregation/TakeAggregatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/aggregation/TakeAggregatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.aggregation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,15 +34,18 @@ public void take_string_field_expression_with_large_size() {
   @Test
   public void filtered_take() {
     ExprValue result =
-        aggregation(DSL.take(DSL.ref("string_value", STRING), DSL.literal(10))
-            .condition(DSL.equal(DSL.ref("string_value", STRING), DSL.literal("m"))), tuples);
+        aggregation(
+            DSL.take(DSL.ref("string_value", STRING), DSL.literal(10))
+                .condition(DSL.equal(DSL.ref("string_value", STRING), DSL.literal("m"))),
+            tuples);
     assertEquals(ImmutableList.of("m", "m"), result.value());
   }
 
   @Test
   public void test_take_null() {
     ExprValue result =
-        aggregation(DSL.take(DSL.ref("string_value", STRING), DSL.literal(10)),
+        aggregation(
+            DSL.take(DSL.ref("string_value", STRING), DSL.literal(10)),
             tuples_with_null_and_missing);
     assertEquals(ImmutableList.of("m", "f"), result.value());
   }
@@ -51,7 +53,8 @@ public void test_take_null() {
   @Test
   public void test_take_missing() {
     ExprValue result =
-        aggregation(DSL.take(DSL.ref("string_value", STRING), DSL.literal(10)),
+        aggregation(
+            DSL.take(DSL.ref("string_value", STRING), DSL.literal(10)),
             tuples_with_null_and_missing);
     assertEquals(ImmutableList.of("m", "f"), result.value());
   }
@@ -59,22 +62,27 @@ public void test_take_missing() {
   @Test
   public void test_take_all_missing_or_null() {
     ExprValue result =
-        aggregation(DSL.take(DSL.ref("string_value", STRING), DSL.literal(10)),
+        aggregation(
+            DSL.take(DSL.ref("string_value", STRING), DSL.literal(10)),
             tuples_with_all_null_or_missing);
     assertEquals(ImmutableList.of(), result.value());
   }
 
   @Test
   public void test_take_with_invalid_size() {
-    IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-        () -> aggregation(DSL.take(DSL.ref("string_value", STRING), DSL.literal(0)), tuples));
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> aggregation(DSL.take(DSL.ref("string_value", STRING), DSL.literal(0)), tuples));
     assertEquals("size must be greater than 0", exception.getMessage());
   }
 
   @Test
   public void test_value_of() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> DSL.take(DSL.ref("string_value", STRING), DSL.literal(10)).valueOf(valueEnv()));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> DSL.take(DSL.ref("string_value", STRING), DSL.literal(10)).valueOf(valueEnv()));
     assertEquals("can't evaluate on aggregator: take", exception.getMessage());
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/expression/conditional/ConditionalFunctionTest.java b/core/src/test/java/org/opensearch/sql/expression/conditional/ConditionalFunctionTest.java
index ae8b714dd8..33654a71cf 100644
--- a/core/src/test/java/org/opensearch/sql/expression/conditional/ConditionalFunctionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/conditional/ConditionalFunctionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.conditional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -29,12 +28,9 @@
 @ExtendWith(MockitoExtension.class)
 public class ConditionalFunctionTest extends ExpressionTestBase {
 
-  @Mock
-  Environment<Expression, ExprValue> env;
+  @Mock Environment<Expression, ExprValue> env;
 
-  /**
-   * Arguments for case test.
-   */
+  /** Arguments for case test. */
   private static Stream<Arguments> caseArguments() {
     Stream.Builder<Arguments> builder = Stream.builder();
     return builder
@@ -46,28 +42,25 @@ private static Stream<Arguments> caseArguments() {
 
   @ParameterizedTest(name = "case {0} when {1} then {2} when {3} then {4} else {5}")
   @MethodSource("caseArguments")
-  void case_value(int value,
-                  int cond1, int result1,
-                  int cond2, int result2,
-                  int defaultVal) throws Exception {
-    Callable<Integer> expect = () -> {
-      if (cond1 == value) {
-        return result1;
-      } else if (cond2 == value) {
-        return result2;
-      } else {
-        return defaultVal;
-      }
-    };
+  void case_value(int value, int cond1, int result1, int cond2, int result2, int defaultVal)
+      throws Exception {
+    Callable<Integer> expect =
+        () -> {
+          if (cond1 == value) {
+            return result1;
+          } else if (cond2 == value) {
+            return result2;
+          } else {
+            return defaultVal;
+          }
+        };
 
-    Expression cases = DSL.cases(
-        DSL.literal(defaultVal),
-        DSL.when(DSL.equal(DSL.literal(cond1), DSL.literal(value)), DSL.literal(result1)),
-        DSL.when(DSL.equal(DSL.literal(cond2), DSL.literal(value)), DSL.literal(result2)));
+    Expression cases =
+        DSL.cases(
+            DSL.literal(defaultVal),
+            DSL.when(DSL.equal(DSL.literal(cond1), DSL.literal(value)), DSL.literal(result1)),
+            DSL.when(DSL.equal(DSL.literal(cond2), DSL.literal(value)), DSL.literal(result2)));
 
-    assertEquals(
-        new ExprIntegerValue(expect.call()),
-        cases.valueOf(env));
+    assertEquals(new ExprIntegerValue(expect.call()), cases.valueOf(env));
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/conditional/cases/CaseClauseTest.java b/core/src/test/java/org/opensearch/sql/expression/conditional/cases/CaseClauseTest.java
index 3c95c4f461..61ff7ef022 100644
--- a/core/src/test/java/org/opensearch/sql/expression/conditional/cases/CaseClauseTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/conditional/cases/CaseClauseTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.conditional.cases;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -29,8 +28,7 @@
 @ExtendWith(MockitoExtension.class)
 class CaseClauseTest extends ExpressionTestBase {
 
-  @Mock
-  private WhenClause whenClause;
+  @Mock private WhenClause whenClause;
 
   @Test
   void should_return_when_clause_result_if_matched() {
@@ -93,8 +91,7 @@ void should_return_all_result_types_including_default() {
 
     CaseClause caseClause = new CaseClause(ImmutableList.of(whenClause), defaultResult);
     assertEquals(
-        ImmutableList.of(ExprCoreType.INTEGER, ExprCoreType.STRING),
-        caseClause.allResultTypes());
+        ImmutableList.of(ExprCoreType.INTEGER, ExprCoreType.STRING), caseClause.allResultTypes());
   }
 
   @Test
@@ -104,9 +101,6 @@ void should_return_all_result_types_excluding_null_result() {
     when(defaultResult.type()).thenReturn(ExprCoreType.UNDEFINED);
 
     CaseClause caseClause = new CaseClause(ImmutableList.of(whenClause), defaultResult);
-    assertEquals(
-        ImmutableList.of(),
-        caseClause.allResultTypes());
+    assertEquals(ImmutableList.of(), caseClause.allResultTypes());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/conditional/cases/WhenClauseTest.java b/core/src/test/java/org/opensearch/sql/expression/conditional/cases/WhenClauseTest.java
index a13f072510..e03c851694 100644
--- a/core/src/test/java/org/opensearch/sql/expression/conditional/cases/WhenClauseTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/conditional/cases/WhenClauseTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.conditional.cases;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -59,5 +58,4 @@ void should_use_result_expression_type() {
     WhenClause whenClause = new WhenClause(DSL.literal(true), DSL.literal(30));
     assertEquals(ExprCoreType.INTEGER, whenClause.type());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/AddTimeAndSubTimeTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/AddTimeAndSubTimeTest.java
new file mode 100644
index 0000000000..eed83f4fa9
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/AddTimeAndSubTimeTest.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
+import static org.opensearch.sql.data.type.ExprCoreType.TIME;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.Temporal;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class AddTimeAndSubTimeTest extends DateTimeTestBase {
+
+  @Test
+  // (TIME, TIME/DATE/DATETIME/TIMESTAMP) -> TIME
+  public void return_time_when_first_arg_is_time() {
+    var res = addtime(LocalTime.of(21, 0), LocalTime.of(0, 5));
+    assertEquals(TIME, res.type());
+    assertEquals(LocalTime.of(21, 5), res.timeValue());
+
+    res = subtime(LocalTime.of(21, 0), LocalTime.of(0, 5));
+    assertEquals(TIME, res.type());
+    assertEquals(LocalTime.of(20, 55), res.timeValue());
+
+    res = addtime(LocalTime.of(12, 20), Instant.ofEpochSecond(42));
+    assertEquals(TIME, res.type());
+    assertEquals(LocalTime.of(12, 20, 42), res.timeValue());
+
+    res = subtime(LocalTime.of(10, 0), Instant.ofEpochSecond(42));
+    assertEquals(TIME, res.type());
+    assertEquals(LocalTime.of(9, 59, 18), res.timeValue());
+
+    res = addtime(LocalTime.of(2, 3, 4), LocalDateTime.of(1961, 4, 12, 9, 7));
+    assertEquals(TIME, res.type());
+    assertEquals(LocalTime.of(11, 10, 4), res.timeValue());
+
+    res = subtime(LocalTime.of(12, 3, 4), LocalDateTime.of(1961, 4, 12, 9, 7));
+    assertEquals(TIME, res.type());
+    assertEquals(LocalTime.of(2, 56, 4), res.timeValue());
+
+    res = addtime(LocalTime.of(9, 7), LocalDate.now());
+    assertEquals(TIME, res.type());
+    assertEquals(LocalTime.of(9, 7), res.timeValue());
+
+    res = subtime(LocalTime.of(9, 7), LocalDate.of(1961, 4, 12));
+    assertEquals(TIME, res.type());
+    assertEquals(LocalTime.of(9, 7), res.timeValue());
+  }
+
+  @Test
+  public void time_limited_by_24_hours() {
+    var res = addtime(LocalTime.of(21, 0), LocalTime.of(14, 5));
+    assertEquals(TIME, res.type());
+    assertEquals(LocalTime.of(11, 5), res.timeValue());
+
+    res = subtime(LocalTime.of(14, 0), LocalTime.of(21, 5));
+    assertEquals(TIME, res.type());
+    assertEquals(LocalTime.of(16, 55), res.timeValue());
+  }
+
+  // Function signature is:
+  // (DATE/DATETIME/TIMESTAMP, TIME/DATE/DATETIME/TIMESTAMP) -> DATETIME
+  private static Stream<Arguments> getTestData() {
+    return Stream.of(
+        // DATETIME and TIME/DATE/DATETIME/TIMESTAMP
+        Arguments.of(
+            LocalDateTime.of(1961, 4, 12, 9, 7),
+            LocalTime.of(1, 48),
+            LocalDateTime.of(1961, 4, 12, 10, 55),
+            LocalDateTime.of(1961, 4, 12, 7, 19)),
+        Arguments.of(
+            LocalDateTime.of(1961, 4, 12, 9, 7),
+            LocalDate.of(2000, 1, 1),
+            LocalDateTime.of(1961, 4, 12, 9, 7),
+            LocalDateTime.of(1961, 4, 12, 9, 7)),
+        Arguments.of(
+            LocalDateTime.of(1961, 4, 12, 9, 7),
+            LocalDateTime.of(1235, 5, 6, 1, 48),
+            LocalDateTime.of(1961, 4, 12, 10, 55),
+            LocalDateTime.of(1961, 4, 12, 7, 19)),
+        Arguments.of(
+            LocalDateTime.of(1961, 4, 12, 9, 7),
+            Instant.ofEpochSecond(42),
+            LocalDateTime.of(1961, 4, 12, 9, 7, 42),
+            LocalDateTime.of(1961, 4, 12, 9, 6, 18)),
+        // DATE and TIME/DATE/DATETIME/TIMESTAMP
+        Arguments.of(
+            LocalDate.of(1961, 4, 12),
+            LocalTime.of(9, 7),
+            LocalDateTime.of(1961, 4, 12, 9, 7),
+            LocalDateTime.of(1961, 4, 11, 14, 53)),
+        Arguments.of(
+            LocalDate.of(1961, 4, 12),
+            LocalDate.of(2000, 1, 1),
+            LocalDateTime.of(1961, 4, 12, 0, 0),
+            LocalDateTime.of(1961, 4, 12, 0, 0)),
+        Arguments.of(
+            LocalDate.of(1961, 4, 12),
+            LocalDateTime.of(1235, 5, 6, 1, 48),
+            LocalDateTime.of(1961, 4, 12, 1, 48),
+            LocalDateTime.of(1961, 4, 11, 22, 12)),
+        Arguments.of(
+            LocalDate.of(1961, 4, 12),
+            Instant.ofEpochSecond(42),
+            LocalDateTime.of(1961, 4, 12, 0, 0, 42),
+            LocalDateTime.of(1961, 4, 11, 23, 59, 18)),
+        // TIMESTAMP and TIME/DATE/DATETIME/TIMESTAMP
+        Arguments.of(
+            Instant.ofEpochSecond(42),
+            LocalTime.of(9, 7),
+            LocalDateTime.of(1970, 1, 1, 9, 7, 42),
+            LocalDateTime.of(1969, 12, 31, 14, 53, 42)),
+        Arguments.of(
+            Instant.ofEpochSecond(42),
+            LocalDate.of(1961, 4, 12),
+            LocalDateTime.of(1970, 1, 1, 0, 0, 42),
+            LocalDateTime.of(1970, 1, 1, 0, 0, 42)),
+        Arguments.of(
+            Instant.ofEpochSecond(42),
+            LocalDateTime.of(1961, 4, 12, 9, 7),
+            LocalDateTime.of(1970, 1, 1, 9, 7, 42),
+            LocalDateTime.of(1969, 12, 31, 14, 53, 42)),
+        Arguments.of(
+            Instant.ofEpochSecond(42),
+            Instant.ofEpochMilli(42),
+            LocalDateTime.of(1970, 1, 1, 0, 0, 42, 42000000),
+            LocalDateTime.of(1970, 1, 1, 0, 0, 41, 958000000)));
+  }
+
+  /**
+   * Check that `ADDTIME` and `SUBTIME` functions result value and type.
+   *
+   * @param arg1 First argument.
+   * @param arg2 Second argument.
+   * @param addTimeExpectedResult Expected result for `ADDTIME`.
+   * @param subTimeExpectedResult Expected result for `SUBTIME`.
+   */
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void return_datetime_when_first_arg_is_not_time(
+      Temporal arg1,
+      Temporal arg2,
+      LocalDateTime addTimeExpectedResult,
+      LocalDateTime subTimeExpectedResult) {
+    var res = addtime(arg1, arg2);
+    assertEquals(DATETIME, res.type());
+    assertEquals(addTimeExpectedResult, res.datetimeValue());
+
+    res = subtime(arg1, arg2);
+    assertEquals(DATETIME, res.type());
+    assertEquals(subTimeExpectedResult, res.datetimeValue());
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/ConvertTZTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/ConvertTZTest.java
index 38cb3c5a63..17ff4f67ab 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/ConvertTZTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/ConvertTZTest.java
@@ -3,181 +3,179 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.datetime;
 
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.opensearch.sql.data.model.ExprValueUtils.nullValue;
 import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.data.model.ExprDatetimeValue;
-import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.expression.DSL;
-import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ExpressionTestBase;
 import org.opensearch.sql.expression.FunctionExpression;
-import org.opensearch.sql.expression.env.Environment;
-
 
-
-@ExtendWith(MockitoExtension.class)
 class ConvertTZTest extends ExpressionTestBase {
 
-  @Mock
-  Environment<Expression, ExprValue> env;
-
   @Test
   public void invalidDate() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2021-04-31 10:00:00")),
-        DSL.literal("+00:00"),
-        DSL.literal("+00:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2021-04-31 10:00:00")),
+            DSL.literal("+00:00"),
+            DSL.literal("+00:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void conversionFromNoOffset() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2008-05-15 22:00:00")),
-        DSL.literal("+00:00"),
-        DSL.literal("+10:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2008-05-15 22:00:00")),
+            DSL.literal("+00:00"),
+            DSL.literal("+10:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2008-05-16 08:00:00"), expr.valueOf(env));
+    assertEquals(new ExprDatetimeValue("2008-05-16 08:00:00"), expr.valueOf());
   }
 
   @Test
   public void conversionToInvalidInput3Over() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2008-05-15 22:00:00")),
-        DSL.literal("+00:00"),
-        DSL.literal("+16:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2008-05-15 22:00:00")),
+            DSL.literal("+00:00"),
+            DSL.literal("+16:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void conversionToInvalidInput3Under() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2008-05-15 22:00:00")),
-        DSL.literal("+00:00"),
-        DSL.literal("-16:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2008-05-15 22:00:00")),
+            DSL.literal("+00:00"),
+            DSL.literal("-16:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void conversionFromPositiveToPositive() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2008-05-15 22:00:00")),
-        DSL.literal("+15:00"),
-        DSL.literal("+01:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2008-05-15 22:00:00")),
+            DSL.literal("+15:00"),
+            DSL.literal("+01:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void invalidInput2Under() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2008-05-15 22:00:00")),
-        DSL.literal("-15:00"),
-        DSL.literal("+01:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2008-05-15 22:00:00")),
+            DSL.literal("-15:00"),
+            DSL.literal("+01:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void invalidInput3Over() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2008-05-15 22:00:00")),
-        DSL.literal("-12:00"),
-        DSL.literal("+15:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2008-05-15 22:00:00")),
+            DSL.literal("-12:00"),
+            DSL.literal("+15:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void conversionToPositiveEdge() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2008-05-15 22:00:00")),
-        DSL.literal("+00:00"),
-        DSL.literal("+14:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2008-05-15 22:00:00")),
+            DSL.literal("+00:00"),
+            DSL.literal("+14:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2008-05-16 12:00:00"), expr.valueOf(env));
+    assertEquals(new ExprDatetimeValue("2008-05-16 12:00:00"), expr.valueOf());
   }
 
   @Test
   public void conversionToNegativeEdge() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2008-05-15 22:00:00")),
-        DSL.literal("+00:01"),
-        DSL.literal("-13:59"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2008-05-15 22:00:00")),
+            DSL.literal("+00:01"),
+            DSL.literal("-13:59"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2008-05-15 08:00:00"), expr.valueOf(env));
+    assertEquals(new ExprDatetimeValue("2008-05-15 08:00:00"), expr.valueOf());
   }
 
   @Test
   public void invalidInput2() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2008-05-15 22:00:00")),
-        DSL.literal("+)()"),
-        DSL.literal("+12:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2008-05-15 22:00:00")),
+            DSL.literal("+)()"),
+            DSL.literal("+12:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void invalidInput3() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2008-05-15 22:00:00")),
-        DSL.literal("+00:00"),
-        DSL.literal("test"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2008-05-15 22:00:00")),
+            DSL.literal("+00:00"),
+            DSL.literal("test"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void invalidInput1() {
-    FunctionExpression expr = DSL.convert_tz(
-        DSL.literal("test"),
-        DSL.literal("+00:00"),
-        DSL.literal("+00:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(DSL.literal("test"), DSL.literal("+00:00"), DSL.literal("+00:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void invalidDateFeb30() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2021-02-30 10:00:00")),
-        DSL.literal("+00:00"),
-        DSL.literal("+00:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2021-02-30 10:00:00")),
+            DSL.literal("+00:00"),
+            DSL.literal("+00:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void invalidDateApril31() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2021-04-31 10:00:00")),
-        DSL.literal("+00:00"),
-        DSL.literal("+00:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2021-04-31 10:00:00")),
+            DSL.literal("+00:00"),
+            DSL.literal("+00:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void invalidMonth13() {
-    FunctionExpression expr = DSL.convert_tz(DSL.datetime(
-            DSL.literal("2021-13-03 10:00:00")),
-        DSL.literal("+00:00"),
-        DSL.literal("+00:00"));
+    FunctionExpression expr =
+        DSL.convert_tz(
+            DSL.datetime(DSL.literal("2021-13-03 10:00:00")),
+            DSL.literal("+00:00"),
+            DSL.literal("+00:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/DateAddAndAddDateTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/DateAddAndAddDateTest.java
new file mode 100644
index 0000000000..52db0a17e5
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/DateAddAndAddDateTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opensearch.sql.data.type.ExprCoreType.DATE;
+import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Period;
+import java.time.ZoneOffset;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.exception.ExpressionEvaluationException;
+
+public class DateAddAndAddDateTest extends DateTimeTestBase {
+
+  private LocalDate today() {
+    return LocalDate.now(functionProperties.getQueryStartClock());
+  }
+
+  @Test
+  public void adddate_returns_datetime_when_args_are_time_and_time_interval() {
+    var res = adddate(LocalTime.MIN, Duration.ofHours(1).plusMinutes(2));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalTime.of(1, 2).atDate(today()), res.datetimeValue());
+  }
+
+  @Test
+  public void date_add_returns_datetime_when_args_are_time_and_time_interval() {
+    var res =
+        date_add(LocalTime.of(10, 20, 30), Duration.ofHours(1).plusMinutes(2).plusSeconds(42));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalTime.of(11, 23, 12).atDate(today()), res.datetimeValue());
+  }
+
+  @Test
+  public void adddate_time_limited_by_24_hours() {
+    var res = adddate(LocalTime.MAX, Duration.ofNanos(1));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalTime.MIN, res.datetimeValue().toLocalTime());
+  }
+
+  @Test
+  public void date_add_time_limited_by_24_hours() {
+    var res =
+        date_add(LocalTime.of(10, 20, 30), Duration.ofHours(20).plusMinutes(50).plusSeconds(7));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalTime.of(7, 10, 37), res.datetimeValue().toLocalTime());
+  }
+
+  @Test
+  public void adddate_returns_datetime_when_args_are_date_and_date_interval() {
+    var res = adddate(LocalDate.of(2020, 2, 20), Period.of(3, 11, 21));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDate.of(2024, 2, 10).atStartOfDay(), res.datetimeValue());
+  }
+
+  @Test
+  public void date_add_returns_datetime_when_args_are_date_and_date_interval() {
+    var res = date_add(LocalDate.of(1961, 4, 12), Period.of(50, 50, 50));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDate.of(2015, 8, 1).atStartOfDay(), res.datetimeValue());
+  }
+
+  @Test
+  public void adddate_returns_datetime_when_args_are_date_and_time_interval() {
+    var res = adddate(LocalDate.of(2020, 2, 20), Duration.ofHours(1).plusMinutes(2));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(2020, 2, 20, 1, 2), res.datetimeValue());
+  }
+
+  @Test
+  public void date_add_returns_datetime_when_args_are_date_and_time_interval() {
+    var res = date_add(LocalDate.of(1961, 4, 12), Duration.ofHours(9).plusMinutes(7));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(1961, 4, 12, 9, 7), res.datetimeValue());
+  }
+
+  @Test
+  public void adddate_returns_datetime_when_args_are_time_and_date_interval() {
+    // Date based on today
+    var res = adddate(LocalTime.of(1, 2, 0), Period.ofDays(1));
+    assertEquals(DATETIME, res.type());
+    assertEquals(today().plusDays(1).atTime(LocalTime.of(1, 2, 0)), res.datetimeValue());
+  }
+
+  @Test
+  public void date_add_returns_datetime_when_args_are_time_and_date_interval() {
+    var res = date_add(LocalTime.MIDNIGHT, Period.ofDays(0));
+    assertEquals(DATETIME, res.type());
+    assertEquals(today().atStartOfDay(), res.datetimeValue());
+  }
+
+  @Test
+  public void adddate_returns_datetime_when_first_arg_is_datetime() {
+    var res = adddate(LocalDateTime.of(1961, 4, 12, 9, 7), Duration.ofMinutes(108));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(1961, 4, 12, 10, 55), res.datetimeValue());
+  }
+
+  @Test
+  public void date_add_returns_datetime_when_first_arg_is_timestamp() {
+    var res =
+        date_add(
+            LocalDateTime.of(1961, 4, 12, 9, 7).toInstant(ZoneOffset.UTC), Duration.ofMinutes(108));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(1961, 4, 12, 10, 55), res.datetimeValue());
+  }
+
+  @Test
+  public void adddate_accepts_negative_interval() {
+    var res = adddate(LocalDateTime.of(2020, 10, 20, 14, 42), Duration.ofDays(-10));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(2020, 10, 10, 14, 42), res.datetimeValue());
+    assertEquals(subdate(LocalDateTime.of(2020, 10, 20, 14, 42), Duration.ofDays(10)), res);
+  }
+
+  @Test
+  public void adddate_has_second_signature_but_not_date_add() {
+    var res = adddate(LocalDateTime.of(1961, 4, 12, 9, 7), 100500);
+    assertEquals(DATETIME, res.type());
+
+    var exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> date_add(LocalDateTime.of(1961, 4, 12, 9, 7), 100500));
+    assertEquals(
+        "date_add function expected {[DATE,INTERVAL],[DATETIME,INTERVAL],"
+            + "[TIMESTAMP,INTERVAL],[TIME,INTERVAL]}, but get [DATETIME,INTEGER]",
+        exception.getMessage());
+  }
+
+  @Test
+  public void adddate_returns_date_when_args_are_date_and_days() {
+    var res = adddate(LocalDate.of(1961, 4, 12), 100500);
+    assertEquals(DATE, res.type());
+    assertEquals(LocalDate.of(1961, 4, 12).plusDays(100500), res.dateValue());
+  }
+
+  @Test
+  public void adddate_returns_datetime_when_args_are_date_but_days() {
+    var res = adddate(LocalDate.of(2000, 1, 1).atStartOfDay(), 2);
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(2000, 1, 3, 0, 0), res.datetimeValue());
+
+    res = adddate(LocalTime.now(), 2);
+    assertEquals(DATETIME, res.type());
+    assertEquals(today().plusDays(2), res.dateValue());
+
+    res = adddate(Instant.ofEpochSecond(42), 2);
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(1970, 1, 3, 0, 0, 42), res.datetimeValue());
+  }
+
+  @Test
+  public void adddate_accepts_negative_days() {
+    var res = adddate(LocalDateTime.of(2020, 10, 20, 8, 16, 32), -40);
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(2020, 10, 20, 8, 16, 32).minusDays(40), res.datetimeValue());
+    assertEquals(subdate(LocalDateTime.of(2020, 10, 20, 8, 16, 32), 40), res);
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/DateDiffTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/DateDiffTest.java
new file mode 100644
index 0000000000..a630758456
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/DateDiffTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static java.time.temporal.ChronoUnit.DAYS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.temporal.Temporal;
+import java.util.TimeZone;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class DateDiffTest extends DateTimeTestBase {
+
+  private static final LocalTime timeSample1 = LocalTime.of(12, 42);
+  private static final LocalTime timeSample2 = LocalTime.of(7, 40);
+  private static final LocalDate dateSample1 = LocalDate.of(2022, 6, 6);
+  private static final LocalDate dateSample2 = LocalDate.of(1961, 4, 12);
+  private static final LocalDate dateSample3 = LocalDate.of(1993, 3, 4);
+  private static final LocalDate epochStart = LocalDate.of(1970, 1, 1);
+  private static final LocalDate dateNow = LocalDate.now();
+  private static final LocalDateTime dateTimeSample1 = LocalDateTime.of(1961, 4, 12, 9, 7);
+  private static final LocalDateTime dateTimeSample2 = LocalDateTime.of(1993, 3, 4, 5, 6);
+
+  // Function signature is:
+  // (DATE/DATETIME/TIMESTAMP/TIME, DATE/DATETIME/TIMESTAMP/TIME) -> LONG
+  private static Stream<Arguments> getTestData() {
+    // Arguments are: first argument for `DATE_DIFF` function, second argument and expected result.
+    return Stream.of(
+        Arguments.of(timeSample1, timeSample2, 0L),
+        Arguments.of(timeSample1, dateNow, 0L),
+        Arguments.of(timeSample1, LocalDateTime.now(), 0L),
+        Arguments.of(
+            timeSample1, Instant.now().plusMillis(TimeZone.getDefault().getRawOffset()), 0L),
+        Arguments.of(dateSample1, timeSample1, -DAYS.between(dateSample1, dateNow)),
+        Arguments.of(dateSample1, dateSample3, -DAYS.between(dateSample1, dateSample3)),
+        Arguments.of(dateSample1, dateTimeSample1, -DAYS.between(dateSample1, dateSample2)),
+        Arguments.of(
+            dateSample1, Instant.ofEpochSecond(42), -DAYS.between(dateSample1, epochStart)),
+        Arguments.of(dateTimeSample1, LocalTime.now(), -DAYS.between(dateSample2, dateNow)),
+        Arguments.of(dateTimeSample1, dateSample3, -DAYS.between(dateSample2, dateSample3)),
+        Arguments.of(dateTimeSample1, dateTimeSample2, -DAYS.between(dateSample2, dateSample3)),
+        Arguments.of(
+            dateTimeSample1, Instant.ofEpochSecond(0), -DAYS.between(dateSample2, epochStart)),
+        Arguments.of(Instant.ofEpochSecond(0), LocalTime.MAX, -DAYS.between(epochStart, dateNow)),
+        Arguments.of(Instant.ofEpochSecond(0), dateSample3, -DAYS.between(epochStart, dateSample3)),
+        Arguments.of(
+            Instant.ofEpochSecond(0), dateTimeSample2, -DAYS.between(epochStart, dateSample3)),
+        Arguments.of(
+            Instant.ofEpochSecond(0),
+            Instant.now(),
+            -DAYS.between(epochStart, LocalDateTime.now(ZoneId.of("UTC")))));
+  }
+
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void try_different_data(Temporal arg1, Temporal arg2, Long expectedResult) {
+    assertEquals(expectedResult, datediff(arg1, arg2));
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/DateSubAndSubDateTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/DateSubAndSubDateTest.java
new file mode 100644
index 0000000000..460e12384b
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/DateSubAndSubDateTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opensearch.sql.data.type.ExprCoreType.DATE;
+import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Period;
+import java.time.ZoneOffset;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.exception.ExpressionEvaluationException;
+
+public class DateSubAndSubDateTest extends DateTimeTestBase {
+
+  private LocalDate today() {
+    return LocalDate.now(functionProperties.getQueryStartClock());
+  }
+
+  @Test
+  public void subdate_returns_datetime_when_args_are_time_and_time_interval() {
+    var res = subdate(LocalTime.of(21, 0), Duration.ofHours(1).plusMinutes(2));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalTime.of(19, 58).atDate(today()), res.datetimeValue());
+  }
+
+  @Test
+  public void date_sub_returns_datetime_when_args_are_time_and_time_interval() {
+    var res =
+        date_sub(LocalTime.of(10, 20, 30), Duration.ofHours(1).plusMinutes(2).plusSeconds(42));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalTime.of(9, 17, 48).atDate(today()), res.datetimeValue());
+  }
+
+  @Test
+  public void subdate_time_limited_by_24_hours() {
+    var res = subdate(LocalTime.MIN, Duration.ofNanos(1));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalTime.MAX, res.datetimeValue().toLocalTime());
+  }
+
+  @Test
+  public void date_sub_time_limited_by_24_hours() {
+    var res =
+        date_sub(LocalTime.of(10, 20, 30), Duration.ofHours(20).plusMinutes(50).plusSeconds(7));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalTime.of(13, 30, 23), res.datetimeValue().toLocalTime());
+  }
+
+  @Test
+  public void subdate_returns_datetime_when_args_are_date_and_date_interval() {
+    var res = subdate(LocalDate.of(2020, 2, 20), Period.of(3, 11, 21));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDate.of(2016, 2, 28).atStartOfDay(), res.datetimeValue());
+  }
+
+  @Test
+  public void date_sub_returns_datetime_when_args_are_date_and_date_interval() {
+    var res = date_sub(LocalDate.of(1961, 4, 12), Period.of(50, 50, 50));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDate.of(1906, 12, 24).atStartOfDay(), res.datetimeValue());
+  }
+
+  @Test
+  public void subdate_returns_datetime_when_args_are_date_and_time_interval() {
+    var res = subdate(LocalDate.of(2020, 2, 20), Duration.ofHours(1).plusMinutes(2));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(2020, 2, 19, 22, 58), res.datetimeValue());
+  }
+
+  @Test
+  public void date_sub_returns_datetime_when_args_are_date_and_time_interval() {
+    var res = date_sub(LocalDate.of(1961, 4, 12), Duration.ofHours(9).plusMinutes(7));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(1961, 4, 11, 14, 53), res.datetimeValue());
+  }
+
+  @Test
+  public void subdate_returns_datetime_when_args_are_time_and_date_interval() {
+    // Date based on today
+    var res = subdate(LocalTime.of(1, 2, 0), Period.ofDays(1));
+    assertEquals(DATETIME, res.type());
+    assertEquals(today().minusDays(1).atTime(LocalTime.of(1, 2, 0)), res.datetimeValue());
+  }
+
+  @Test
+  public void date_sub_returns_datetime_when_args_are_time_and_date_interval() {
+    var res = date_sub(LocalTime.MIDNIGHT, Period.ofDays(0));
+    assertEquals(DATETIME, res.type());
+    assertEquals(today().atStartOfDay(), res.datetimeValue());
+  }
+
+  @Test
+  public void subdate_returns_datetime_when_first_arg_is_datetime() {
+    var res = subdate(LocalDateTime.of(1961, 4, 12, 9, 7), Duration.ofMinutes(108));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(1961, 4, 12, 7, 19), res.datetimeValue());
+  }
+
+  @Test
+  public void date_sub_returns_datetime_when_first_arg_is_timestamp() {
+    var res =
+        date_sub(
+            LocalDateTime.of(1961, 4, 12, 9, 7).toInstant(ZoneOffset.UTC), Duration.ofMinutes(108));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(1961, 4, 12, 7, 19), res.datetimeValue());
+  }
+
+  @Test
+  public void subdate_accepts_negative_interval() {
+    var res = subdate(LocalDateTime.of(2020, 10, 20, 14, 42), Duration.ofDays(-10));
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(2020, 10, 30, 14, 42), res.datetimeValue());
+    assertEquals(adddate(LocalDateTime.of(2020, 10, 20, 14, 42), Duration.ofDays(10)), res);
+  }
+
+  @Test
+  public void subdate_has_second_signature_but_not_date_sub() {
+    var res = subdate(LocalDateTime.of(1961, 4, 12, 9, 7), 100500);
+    assertEquals(DATETIME, res.type());
+
+    var exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> date_sub(LocalDateTime.of(1961, 4, 12, 9, 7), 100500));
+    assertEquals(
+        "date_sub function expected {[DATE,INTERVAL],[DATETIME,INTERVAL],"
+            + "[TIMESTAMP,INTERVAL],[TIME,INTERVAL]}, but get [DATETIME,INTEGER]",
+        exception.getMessage());
+  }
+
+  @Test
+  public void subdate_returns_date_when_args_are_date_and_days() {
+    var res = subdate(LocalDate.of(1961, 4, 12), 100500);
+    assertEquals(DATE, res.type());
+    assertEquals(LocalDate.of(1961, 4, 12).minusDays(100500), res.dateValue());
+  }
+
+  @Test
+  public void subdate_returns_datetime_when_args_are_date_but_days() {
+    var res = subdate(LocalDate.of(2000, 1, 1).atStartOfDay(), 2);
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(1999, 12, 30, 0, 0), res.datetimeValue());
+
+    res = subdate(LocalTime.now(), 2);
+    assertEquals(DATETIME, res.type());
+    assertEquals(today().minusDays(2), res.dateValue());
+
+    res = subdate(Instant.ofEpochSecond(42), 2);
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(1969, 12, 30, 0, 0, 42), res.datetimeValue());
+  }
+
+  @Test
+  public void subdate_accepts_negative_days() {
+    var res = subdate(LocalDateTime.of(2020, 10, 20, 8, 16, 32), -40);
+    assertEquals(DATETIME, res.type());
+    assertEquals(LocalDateTime.of(2020, 10, 20, 8, 16, 32).plusDays(40), res.datetimeValue());
+    assertEquals(adddate(LocalDateTime.of(2020, 10, 20, 8, 16, 32), 40), res);
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java
index 092b64d5d7..18e5df8034 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java
@@ -3,23 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.datetime;
 
+import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.when;
 import static org.opensearch.sql.data.model.ExprValueUtils.integerValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.longValue;
-import static org.opensearch.sql.data.model.ExprValueUtils.missingValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.nullValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.stringValue;
 import static org.opensearch.sql.data.type.ExprCoreType.DATE;
-import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
-import static org.opensearch.sql.data.type.ExprCoreType.INTERVAL;
 import static org.opensearch.sql.data.type.ExprCoreType.LONG;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 import static org.opensearch.sql.data.type.ExprCoreType.TIME;
@@ -27,118 +22,109 @@
 
 import com.google.common.collect.ImmutableList;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.stream.Stream;
 import lombok.AllArgsConstructor;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.opensearch.sql.data.model.ExprDateValue;
 import org.opensearch.sql.data.model.ExprDatetimeValue;
+import org.opensearch.sql.data.model.ExprDoubleValue;
+import org.opensearch.sql.data.model.ExprIntegerValue;
 import org.opensearch.sql.data.model.ExprLongValue;
+import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprStringValue;
 import org.opensearch.sql.data.model.ExprTimeValue;
 import org.opensearch.sql.data.model.ExprTimestampValue;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ExpressionTestBase;
 import org.opensearch.sql.expression.FunctionExpression;
-import org.opensearch.sql.expression.env.Environment;
+import org.opensearch.sql.expression.LiteralExpression;
 
-@ExtendWith(MockitoExtension.class)
 class DateTimeFunctionTest extends ExpressionTestBase {
 
-  @Mock
-  Environment<Expression, ExprValue> env;
-
-  @Mock
-  Expression nullRef;
-
-  @Mock
-  Expression missingRef;
-
-  @BeforeEach
-  public void setup() {
-    when(nullRef.valueOf(env)).thenReturn(nullValue());
-    when(missingRef.valueOf(env)).thenReturn(missingValue());
-  }
-
-  final List<DateFormatTester> dateFormatTesters = ImmutableList.of(
-      new DateFormatTester("1998-01-31 13:14:15.012345",
-          ImmutableList.of("%H","%I","%k","%l","%i","%p","%r","%S","%T"," %M",
-              "%W","%D","%Y","%y","%a","%b","%j","%m","%d","%h","%s","%w","%f",
-              "%q","%"),
-          ImmutableList.of("13","01","13","1","14","PM","01:14:15 PM","15","13:14:15"," January",
-              "Saturday","31st","1998","98","Sat","Jan","031","01","31","01","15","6","12345",
-              "q","%")
-      ),
-      new DateFormatTester("1999-12-01",
-          ImmutableList.of("%D"),
-          ImmutableList.of("1st")
-      ),
-      new DateFormatTester("1999-12-02",
-          ImmutableList.of("%D"),
-          ImmutableList.of("2nd")
-      ),
-      new DateFormatTester("1999-12-03",
-          ImmutableList.of("%D"),
-          ImmutableList.of("3rd")
-      ),
-      new DateFormatTester("1999-12-04",
-          ImmutableList.of("%D"),
-          ImmutableList.of("4th")
-      ),
-      new DateFormatTester("1999-12-11",
-          ImmutableList.of("%D"),
-          ImmutableList.of("11th")
-      ),
-      new DateFormatTester("1999-12-12",
-          ImmutableList.of("%D"),
-          ImmutableList.of("12th")
-      ),
-      new DateFormatTester("1999-12-13",
-          ImmutableList.of("%D"),
-          ImmutableList.of("13th")
-      ),
-      new DateFormatTester("1999-12-31",
-          ImmutableList.of("%x","%v","%X","%V","%u","%U"),
-          ImmutableList.of("1999", "52", "1999", "52", "52", "52")
-      ),
-      new DateFormatTester("2000-01-01",
-          ImmutableList.of("%x","%v","%X","%V","%u","%U"),
-          ImmutableList.of("1999", "52", "1999", "52", "0", "0")
-      ),
-      new DateFormatTester("1998-12-31",
-          ImmutableList.of("%x","%v","%X","%V","%u","%U"),
-          ImmutableList.of("1998", "52", "1998", "52", "52", "52")
-      ),
-      new DateFormatTester("1999-01-01",
-          ImmutableList.of("%x","%v","%X","%V","%u","%U"),
-          ImmutableList.of("1998", "52", "1998", "52", "0", "0")
-      ),
-      new DateFormatTester("2020-01-04",
-          ImmutableList.of("%x","%X"),
-          ImmutableList.of("2020", "2019")
-      ),
-      new DateFormatTester("2008-12-31",
-          ImmutableList.of("%v","%V","%u","%U"),
-          ImmutableList.of("53","52","53","52")
-      ),
-      new DateFormatTester("1998-01-31 13:14:15.012345",
-          ImmutableList.of("%Y-%m-%dT%TZ"),
-          ImmutableList.of("1998-01-31T13:14:15Z")
-      ),
-      new DateFormatTester("1998-01-31 13:14:15.012345",
-          ImmutableList.of("%Y-%m-%da %T a"),
-          ImmutableList.of("1998-01-31PM 13:14:15 PM")
-      ),
-      new DateFormatTester("1998-01-31 13:14:15.012345",
-          ImmutableList.of("%Y-%m-%db %T b"),
-          ImmutableList.of("1998-01-31b 13:14:15 b"))
-  );
+  final List<DateFormatTester> dateFormatTesters =
+      ImmutableList.of(
+          new DateFormatTester(
+              "1998-01-31 13:14:15.012345",
+              ImmutableList.of(
+                  "%H",
+                  "%I", "%k", "%l", "%i", "%p", "%r", "%S", "%T", " %M", "%W", "%D", "%Y", "%y",
+                  "%a", "%b", "%j", "%m", "%d", "%h", "%s", "%w", "%f", "%q", "%"),
+              ImmutableList.of(
+                  "13",
+                  "01",
+                  "13",
+                  "1",
+                  "14",
+                  "PM",
+                  "01:14:15 PM",
+                  "15",
+                  "13:14:15",
+                  " January",
+                  "Saturday",
+                  "31st",
+                  "1998",
+                  "98",
+                  "Sat",
+                  "Jan",
+                  "031",
+                  "01",
+                  "31",
+                  "01",
+                  "15",
+                  "6",
+                  "012345",
+                  "q",
+                  "%")),
+          new DateFormatTester("1999-12-01", ImmutableList.of("%D"), ImmutableList.of("1st")),
+          new DateFormatTester("1999-12-02", ImmutableList.of("%D"), ImmutableList.of("2nd")),
+          new DateFormatTester("1999-12-03", ImmutableList.of("%D"), ImmutableList.of("3rd")),
+          new DateFormatTester("1999-12-04", ImmutableList.of("%D"), ImmutableList.of("4th")),
+          new DateFormatTester("1999-12-11", ImmutableList.of("%D"), ImmutableList.of("11th")),
+          new DateFormatTester("1999-12-12", ImmutableList.of("%D"), ImmutableList.of("12th")),
+          new DateFormatTester("1999-12-13", ImmutableList.of("%D"), ImmutableList.of("13th")),
+          new DateFormatTester(
+              "1999-12-31",
+              ImmutableList.of("%x", "%v", "%X", "%V", "%u", "%U"),
+              ImmutableList.of("1999", "52", "1999", "52", "52", "52")),
+          new DateFormatTester(
+              "2000-01-01",
+              ImmutableList.of("%x", "%v", "%X", "%V", "%u", "%U"),
+              ImmutableList.of("1999", "52", "1999", "52", "0", "0")),
+          new DateFormatTester(
+              "1998-12-31",
+              ImmutableList.of("%x", "%v", "%X", "%V", "%u", "%U"),
+              ImmutableList.of("1998", "52", "1998", "52", "52", "52")),
+          new DateFormatTester(
+              "1999-01-01",
+              ImmutableList.of("%x", "%v", "%X", "%V", "%u", "%U"),
+              ImmutableList.of("1998", "52", "1998", "52", "0", "0")),
+          new DateFormatTester(
+              "2020-01-04", ImmutableList.of("%x", "%X"), ImmutableList.of("2020", "2019")),
+          new DateFormatTester(
+              "2008-12-31",
+              ImmutableList.of("%v", "%V", "%u", "%U"),
+              ImmutableList.of("53", "52", "53", "52")),
+          new DateFormatTester(
+              "1998-01-31 13:14:15.012345",
+              ImmutableList.of("%Y-%m-%dT%TZ"),
+              ImmutableList.of("1998-01-31T13:14:15Z")),
+          new DateFormatTester(
+              "1998-01-31 13:14:15.012345",
+              ImmutableList.of("%Y-%m-%da %T a"),
+              ImmutableList.of("1998-01-31PM 13:14:15 PM")),
+          new DateFormatTester(
+              "1998-01-31 13:14:15.012345",
+              ImmutableList.of("%Y-%m-%db %T b"),
+              ImmutableList.of("1998-01-31b 13:14:15 b")));
 
   @AllArgsConstructor
   private class DateFormatTester {
@@ -156,84 +142,12 @@ String getFormatted() {
     }
 
     FunctionExpression getDateFormatExpression() {
-      return DSL.date_format(DSL.literal(date), DSL.literal(getFormatter()));
+      return DSL.date_format(functionProperties, DSL.literal(date), DSL.literal(getFormatter()));
     }
   }
 
-  @Test
-  public void adddate() {
-    FunctionExpression expr = DSL.adddate(DSL.date(DSL.literal("2020-08-26")), DSL.literal(7));
-    assertEquals(DATE, expr.type());
-    assertEquals(new ExprDateValue("2020-09-02"), expr.valueOf(env));
-    assertEquals("adddate(date(\"2020-08-26\"), 7)", expr.toString());
-
-    expr = DSL.adddate(DSL.timestamp(DSL.literal("2020-08-26 12:05:00")), DSL.literal(7));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-09-02 12:05:00"), expr.valueOf(env));
-    assertEquals("adddate(timestamp(\"2020-08-26 12:05:00\"), 7)", expr.toString());
-
-    expr = DSL.adddate(
-        DSL.date(DSL.literal("2020-08-26")), DSL.interval(DSL.literal(1), DSL.literal("hour")));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-08-26 01:00:00"), expr.valueOf(env));
-    assertEquals("adddate(date(\"2020-08-26\"), interval(1, \"hour\"))", expr.toString());
-
-    expr = DSL.adddate(DSL.literal("2020-08-26"), DSL.literal(7));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDateValue("2020-09-02"), expr.valueOf(env));
-    assertEquals("adddate(\"2020-08-26\", 7)", expr.toString());
-
-    expr = DSL.adddate(DSL.literal("2020-08-26 12:05:00"), DSL.literal(7));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-09-02 12:05:00"), expr.valueOf(env));
-    assertEquals("adddate(\"2020-08-26 12:05:00\", 7)", expr.toString());
-
-    expr = DSL
-        .adddate(DSL.literal("2020-08-26"), DSL.interval(DSL.literal(1), DSL.literal("hour")));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-08-26 01:00:00"), expr.valueOf(env));
-    assertEquals("adddate(\"2020-08-26\", interval(1, \"hour\"))", expr.toString());
-
-    expr = DSL
-        .adddate(DSL.literal("2020-08-26"), DSL.interval(DSL.literal(1), DSL.literal("day")));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDateValue("2020-08-27"), expr.valueOf(env));
-    assertEquals("adddate(\"2020-08-26\", interval(1, \"day\"))", expr.toString());
-
-    when(nullRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.adddate(nullRef, DSL.literal(1L))));
-    assertEquals(nullValue(),
-        eval(DSL.adddate(nullRef, DSL.interval(DSL.literal(1), DSL.literal("month")))));
-
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(missingValue(), eval(DSL.adddate(missingRef, DSL.literal(1L))));
-    assertEquals(missingValue(),
-        eval(DSL.adddate(missingRef, DSL.interval(DSL.literal(1), DSL.literal("month")))));
-
-    when(nullRef.type()).thenReturn(LONG);
-    when(missingRef.type()).thenReturn(LONG);
-    assertEquals(nullValue(), eval(DSL.adddate(DSL.date(DSL.literal("2020-08-26")), nullRef)));
-    assertEquals(missingValue(),
-        eval(DSL.adddate(DSL.date(DSL.literal("2020-08-26")), missingRef)));
-
-    when(nullRef.type()).thenReturn(INTERVAL);
-    when(missingRef.type()).thenReturn(INTERVAL);
-    assertEquals(nullValue(), eval(DSL.adddate(DSL.date(DSL.literal("2020-08-26")), nullRef)));
-    assertEquals(missingValue(),
-        eval(DSL.adddate(DSL.date(DSL.literal("2020-08-26")), missingRef)));
-
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(INTERVAL);
-    assertEquals(missingValue(), eval(DSL.adddate(nullRef, missingRef)));
-  }
-
   @Test
   public void date() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.date(nullRef)));
-    assertEquals(missingValue(), eval(DSL.date(missingRef)));
-
     FunctionExpression expr = DSL.date(DSL.literal("2020-08-17"));
     assertEquals(DATE, expr.type());
     assertEquals(new ExprDateValue("2020-08-17"), eval(expr));
@@ -253,136 +167,10 @@ public void date() {
     assertEquals(DATE, expr.type());
     assertEquals(new ExprDateValue("2020-08-17 12:12"), eval(expr));
     assertEquals("date(DATE '2020-08-17')", expr.toString());
-
-
-  }
-
-  @Test
-  public void date_add() {
-    FunctionExpression expr = DSL.date_add(DSL.date(DSL.literal("2020-08-26")), DSL.literal(7));
-    assertEquals(DATE, expr.type());
-    assertEquals(new ExprDateValue("2020-09-02"), expr.valueOf(env));
-    assertEquals("date_add(date(\"2020-08-26\"), 7)", expr.toString());
-
-    expr = DSL.date_add(DSL.literal("2020-08-26 12:05:00"), DSL.literal(7));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-09-02 12:05:00"), expr.valueOf(env));
-    assertEquals("date_add(\"2020-08-26 12:05:00\", 7)", expr.toString());
-
-    expr = DSL.date_add(DSL.timestamp(DSL.literal("2020-08-26 12:05:00")), DSL.literal(7));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-09-02 12:05:00"), expr.valueOf(env));
-    assertEquals("date_add(timestamp(\"2020-08-26 12:05:00\"), 7)", expr.toString());
-
-    expr = DSL.date_add(
-        DSL.date(DSL.literal("2020-08-26")), DSL.interval(DSL.literal(1), DSL.literal("hour")));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-08-26 01:00:00"), expr.valueOf(env));
-    assertEquals("date_add(date(\"2020-08-26\"), interval(1, \"hour\"))", expr.toString());
-
-    expr = DSL
-        .date_add(DSL.literal("2020-08-26"), DSL.interval(DSL.literal(1), DSL.literal("hour")));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-08-26 01:00:00"), expr.valueOf(env));
-    assertEquals("date_add(\"2020-08-26\", interval(1, \"hour\"))", expr.toString());
-
-    when(nullRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.date_add(nullRef, DSL.literal(1L))));
-    assertEquals(nullValue(),
-        eval(DSL.date_add(nullRef, DSL.interval(DSL.literal(1), DSL.literal("month")))));
-
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(missingValue(), eval(DSL.date_add(missingRef, DSL.literal(1L))));
-    assertEquals(missingValue(),
-        eval(DSL.date_add(missingRef, DSL.interval(DSL.literal(1), DSL.literal("month")))));
-
-    when(nullRef.type()).thenReturn(LONG);
-    when(missingRef.type()).thenReturn(LONG);
-    assertEquals(nullValue(), eval(DSL.date_add(DSL.date(DSL.literal("2020-08-26")), nullRef)));
-    assertEquals(missingValue(),
-        eval(DSL.date_add(DSL.date(DSL.literal("2020-08-26")), missingRef)));
-
-    when(nullRef.type()).thenReturn(INTERVAL);
-    when(missingRef.type()).thenReturn(INTERVAL);
-    assertEquals(nullValue(), eval(DSL.date_add(DSL.date(DSL.literal("2020-08-26")), nullRef)));
-    assertEquals(missingValue(),
-        eval(DSL.date_add(DSL.date(DSL.literal("2020-08-26")), missingRef)));
-
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(INTERVAL);
-    assertEquals(missingValue(), eval(DSL.date_add(nullRef, missingRef)));
-  }
-
-  @Test
-  public void date_sub() {
-    FunctionExpression expr = DSL.date_sub(DSL.date(DSL.literal("2020-08-26")), DSL.literal(7));
-    assertEquals(DATE, expr.type());
-    assertEquals(new ExprDateValue("2020-08-19"), expr.valueOf(env));
-    assertEquals("date_sub(date(\"2020-08-26\"), 7)", expr.toString());
-
-    expr = DSL.date_sub(DSL.literal("2020-08-26"), DSL.literal(7));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDateValue("2020-08-19"), expr.valueOf(env));
-    assertEquals("date_sub(\"2020-08-26\", 7)", expr.toString());
-
-    expr = DSL.date_sub(DSL.timestamp(DSL.literal("2020-08-26 12:05:00")), DSL.literal(7));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-08-19 12:05:00"), expr.valueOf(env));
-    assertEquals("date_sub(timestamp(\"2020-08-26 12:05:00\"), 7)", expr.toString());
-
-    expr = DSL.date_sub(DSL.literal("2020-08-26 12:05:00"), DSL.literal(7));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-08-19 12:05:00"), expr.valueOf(env));
-    assertEquals("date_sub(\"2020-08-26 12:05:00\", 7)", expr.toString());
-
-    expr = DSL.date_sub(DSL.timestamp(DSL.literal("2020-08-26 12:05:00")),
-        DSL.interval(DSL.literal(1), DSL.literal("hour")));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-08-26 11:05:00"), expr.valueOf(env));
-    assertEquals("date_sub(timestamp(\"2020-08-26 12:05:00\"), interval(1, \"hour\"))",
-        expr.toString());
-
-    expr = DSL.date_sub(DSL.literal("2020-08-26 12:05:00"),
-        DSL.interval(DSL.literal(1), DSL.literal("year")));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2019-08-26 12:05:00"), expr.valueOf(env));
-    assertEquals("date_sub(\"2020-08-26 12:05:00\", interval(1, \"year\"))",
-        expr.toString());
-
-    when(nullRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.date_sub(nullRef, DSL.literal(1L))));
-    assertEquals(nullValue(),
-        eval(DSL.date_sub(nullRef, DSL.interval(DSL.literal(1), DSL.literal("month")))));
-
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(missingValue(), eval(DSL.date_sub(missingRef, DSL.literal(1L))));
-    assertEquals(missingValue(),
-        eval(DSL.date_sub(missingRef, DSL.interval(DSL.literal(1), DSL.literal("month")))));
-
-    when(nullRef.type()).thenReturn(LONG);
-    when(missingRef.type()).thenReturn(LONG);
-    assertEquals(nullValue(), eval(DSL.date_sub(DSL.date(DSL.literal("2020-08-26")), nullRef)));
-    assertEquals(missingValue(),
-        eval(DSL.date_sub(DSL.date(DSL.literal("2020-08-26")), missingRef)));
-
-    when(nullRef.type()).thenReturn(INTERVAL);
-    when(missingRef.type()).thenReturn(INTERVAL);
-    assertEquals(nullValue(), eval(DSL.date_sub(DSL.date(DSL.literal("2020-08-26")), nullRef)));
-    assertEquals(missingValue(),
-        eval(DSL.date_sub(DSL.date(DSL.literal("2020-08-26")), missingRef)));
-
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(INTERVAL);
-    assertEquals(missingValue(), eval(DSL.date_sub(nullRef, missingRef)));
   }
 
   @Test
   public void day() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.day(nullRef)));
-    assertEquals(missingValue(), eval(DSL.day(missingRef)));
-
     FunctionExpression expression = DSL.day(DSL.literal(new ExprDateValue("2020-08-07")));
     assertEquals(INTEGER, expression.type());
     assertEquals("day(DATE '2020-08-07')", expression.toString());
@@ -396,11 +184,6 @@ public void day() {
 
   @Test
   public void dayName() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.dayname(nullRef)));
-    assertEquals(missingValue(), eval(DSL.dayname(missingRef)));
-
     FunctionExpression expression = DSL.dayname(DSL.literal(new ExprDateValue("2020-08-07")));
     assertEquals(STRING, expression.type());
     assertEquals("dayname(DATE '2020-08-07')", expression.toString());
@@ -414,57 +197,187 @@ public void dayName() {
 
   @Test
   public void dayOfMonth() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.dayofmonth(nullRef)));
-    assertEquals(missingValue(), eval(DSL.dayofmonth(missingRef)));
-
-    FunctionExpression expression = DSL.dayofmonth(DSL.literal(new ExprDateValue("2020-08-07")));
+    FunctionExpression expression =
+        DSL.dayofmonth(functionProperties, DSL.literal(new ExprDateValue("2020-08-07")));
     assertEquals(INTEGER, expression.type());
     assertEquals("dayofmonth(DATE '2020-08-07')", expression.toString());
     assertEquals(integerValue(7), eval(expression));
 
-    expression = DSL.dayofmonth(DSL.literal("2020-07-08"));
+    expression = DSL.dayofmonth(functionProperties, DSL.literal("2020-07-08"));
     assertEquals(INTEGER, expression.type());
     assertEquals("dayofmonth(\"2020-07-08\")", expression.toString());
     assertEquals(integerValue(8), eval(expression));
   }
 
+  private void testDayOfMonthWithUnderscores(FunctionExpression dateExpression, int dayOfMonth) {
+    assertEquals(INTEGER, dateExpression.type());
+    assertEquals(integerValue(dayOfMonth), eval(dateExpression));
+  }
+
+  @Test
+  public void dayOfMonthWithUnderscores() {
+    FunctionExpression expression1 =
+        DSL.dayofmonth(functionProperties, DSL.literal(new ExprDateValue("2020-08-07")));
+    FunctionExpression expression2 = DSL.dayofmonth(functionProperties, DSL.literal("2020-07-08"));
+
+    assertAll(
+        () -> testDayOfMonthWithUnderscores(expression1, 7),
+        () -> assertEquals("dayofmonth(DATE '2020-08-07')", expression1.toString()),
+        () -> testDayOfMonthWithUnderscores(expression2, 8),
+        () -> assertEquals("dayofmonth(\"2020-07-08\")", expression2.toString()));
+  }
+
+  @Test
+  public void testDayOfMonthWithTimeType() {
+    FunctionExpression expression =
+        DSL.day_of_month(functionProperties, DSL.literal(new ExprTimeValue("12:23:34")));
+
+    assertEquals(INTEGER, eval(expression).type());
+    assertEquals(
+        LocalDate.now(functionProperties.getQueryStartClock()).getDayOfMonth(),
+        eval(expression).integerValue());
+    assertEquals("day_of_month(TIME '12:23:34')", expression.toString());
+  }
+
+  private void testInvalidDayOfMonth(String date) {
+    FunctionExpression expression =
+        DSL.day_of_month(functionProperties, DSL.literal(new ExprDateValue(date)));
+    eval(expression);
+  }
+
+  @Test
+  public void dayOfMonthWithUnderscoresLeapYear() {
+    // Feb. 29 of a leap year
+    testDayOfMonthWithUnderscores(
+        DSL.day_of_month(functionProperties, DSL.literal("2020-02-29")), 29);
+
+    // Feb. 29 of a non-leap year
+    assertThrows(SemanticCheckException.class, () -> testInvalidDayOfMonth("2021-02-29"));
+  }
+
+  @Test
+  public void dayOfMonthWithUnderscoresInvalidArguments() {
+    assertAll(
+        // 40th day of the month
+        () -> assertThrows(SemanticCheckException.class, () -> testInvalidDayOfMonth("2021-02-40")),
+        // 13th month of the year
+        () -> assertThrows(SemanticCheckException.class, () -> testInvalidDayOfMonth("2021-13-40")),
+        // incorrect format
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> testInvalidDayOfMonth("asdfasdfasdf")));
+  }
+
+  private void dayOfWeekQuery(FunctionExpression dateExpression, int dayOfWeek, String testExpr) {
+    assertEquals(INTEGER, dateExpression.type());
+    assertEquals(integerValue(dayOfWeek), eval(dateExpression));
+    assertEquals(testExpr, dateExpression.toString());
+  }
+
   @Test
   public void dayOfWeek() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.dayofweek(nullRef)));
-    assertEquals(missingValue(), eval(DSL.dayofweek(missingRef)));
+    FunctionExpression expression1 =
+        DSL.dayofweek(functionProperties, DSL.literal(new ExprDateValue("2020-08-07")));
+    FunctionExpression expression2 =
+        DSL.dayofweek(functionProperties, DSL.literal(new ExprDateValue("2020-08-09")));
+    FunctionExpression expression3 = DSL.dayofweek(functionProperties, DSL.literal("2020-08-09"));
+    FunctionExpression expression4 =
+        DSL.dayofweek(functionProperties, DSL.literal("2020-08-09 01:02:03"));
 
-    FunctionExpression expression = DSL.dayofweek(DSL.literal(new ExprDateValue("2020-08-07")));
-    assertEquals(INTEGER, expression.type());
-    assertEquals("dayofweek(DATE '2020-08-07')", expression.toString());
-    assertEquals(integerValue(6), eval(expression));
+    assertAll(
+        () -> dayOfWeekQuery(expression1, 6, "dayofweek(DATE '2020-08-07')"),
+        () -> dayOfWeekQuery(expression2, 1, "dayofweek(DATE '2020-08-09')"),
+        () -> dayOfWeekQuery(expression3, 1, "dayofweek(\"2020-08-09\")"),
+        () -> dayOfWeekQuery(expression4, 1, "dayofweek(\"2020-08-09 01:02:03\")"));
+  }
 
-    expression = DSL.dayofweek(DSL.literal(new ExprDateValue("2020-08-09")));
-    assertEquals(INTEGER, expression.type());
-    assertEquals("dayofweek(DATE '2020-08-09')", expression.toString());
-    assertEquals(integerValue(1), eval(expression));
+  private void dayOfWeekWithUnderscoresQuery(
+      FunctionExpression dateExpression, int dayOfWeek, String testExpr) {
+    assertEquals(INTEGER, dateExpression.type());
+    assertEquals(integerValue(dayOfWeek), eval(dateExpression));
+    assertEquals(testExpr, dateExpression.toString());
+  }
 
-    expression = DSL.dayofweek(DSL.literal("2020-08-09"));
-    assertEquals(INTEGER, expression.type());
-    assertEquals("dayofweek(\"2020-08-09\")", expression.toString());
-    assertEquals(integerValue(1), eval(expression));
+  @Test
+  public void dayOfWeekWithUnderscores() {
+    FunctionExpression expression1 =
+        DSL.day_of_week(functionProperties, DSL.literal(new ExprDateValue("2020-08-07")));
+    FunctionExpression expression2 =
+        DSL.day_of_week(functionProperties, DSL.literal(new ExprDateValue("2020-08-09")));
+    FunctionExpression expression3 = DSL.day_of_week(functionProperties, DSL.literal("2020-08-09"));
+    FunctionExpression expression4 =
+        DSL.day_of_week(functionProperties, DSL.literal("2020-08-09 01:02:03"));
 
-    expression = DSL.dayofweek(DSL.literal("2020-08-09 01:02:03"));
-    assertEquals(INTEGER, expression.type());
-    assertEquals("dayofweek(\"2020-08-09 01:02:03\")", expression.toString());
-    assertEquals(integerValue(1), eval(expression));
+    assertAll(
+        () -> dayOfWeekWithUnderscoresQuery(expression1, 6, "day_of_week(DATE '2020-08-07')"),
+        () -> dayOfWeekWithUnderscoresQuery(expression2, 1, "day_of_week(DATE '2020-08-09')"),
+        () -> dayOfWeekWithUnderscoresQuery(expression3, 1, "day_of_week(\"2020-08-09\")"),
+        () ->
+            dayOfWeekWithUnderscoresQuery(expression4, 1, "day_of_week(\"2020-08-09 01:02:03\")"));
   }
 
   @Test
-  public void dayOfYear() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.dayofyear(nullRef)));
-    assertEquals(missingValue(), eval(DSL.dayofyear(missingRef)));
+  public void testDayOfWeekWithTimeType() {
+    FunctionExpression expression =
+        DSL.day_of_week(functionProperties, DSL.literal(new ExprTimeValue("12:23:34")));
 
+    assertAll(
+        () -> assertEquals(INTEGER, eval(expression).type()),
+        () ->
+            assertEquals(
+                (LocalDate.now(functionProperties.getQueryStartClock()).getDayOfWeek().getValue()
+                        % 7)
+                    + 1,
+                eval(expression).integerValue()),
+        () -> assertEquals("day_of_week(TIME '12:23:34')", expression.toString()));
+  }
+
+  private void testInvalidDayOfWeek(String date) {
+    FunctionExpression expression =
+        DSL.day_of_week(functionProperties, DSL.literal(new ExprDateValue(date)));
+    eval(expression);
+  }
+
+  @Test
+  public void dayOfWeekWithUnderscoresLeapYear() {
+    assertAll(
+        // Feb. 29 of a leap year
+        () ->
+            dayOfWeekWithUnderscoresQuery(
+                DSL.day_of_week(functionProperties, DSL.literal("2020-02-29")),
+                7,
+                "day_of_week(\"2020-02-29\")"),
+        // day after Feb. 29 of a leap year
+        () ->
+            dayOfWeekWithUnderscoresQuery(
+                DSL.day_of_week(functionProperties, DSL.literal("2020-03-01")),
+                1,
+                "day_of_week(\"2020-03-01\")"),
+        // Feb. 28 of a non-leap year
+        () ->
+            dayOfWeekWithUnderscoresQuery(
+                DSL.day_of_week(functionProperties, DSL.literal("2021-02-28")),
+                1,
+                "day_of_week(\"2021-02-28\")"),
+        // Feb. 29 of a non-leap year
+        () -> assertThrows(SemanticCheckException.class, () -> testInvalidDayOfWeek("2021-02-29")));
+  }
+
+  @Test
+  public void dayOfWeekWithUnderscoresInvalidArgument() {
+    assertAll(
+        // 40th day of the month
+        () -> assertThrows(SemanticCheckException.class, () -> testInvalidDayOfWeek("2021-02-40")),
+
+        // 13th month of the year
+        () -> assertThrows(SemanticCheckException.class, () -> testInvalidDayOfWeek("2021-13-29")),
+
+        // incorrect format
+        () -> assertThrows(SemanticCheckException.class, () -> testInvalidDayOfWeek("asdfasdf")));
+  }
+
+  @Test
+  public void dayOfYear() {
     FunctionExpression expression = DSL.dayofyear(DSL.literal(new ExprDateValue("2020-08-07")));
     assertEquals(INTEGER, expression.type());
     assertEquals("dayofyear(DATE '2020-08-07')", expression.toString());
@@ -481,113 +394,169 @@ public void dayOfYear() {
     assertEquals(integerValue(220), eval(expression));
   }
 
-  public void testDayOfYearWithUnderscores(String date, int dayOfYear) {
-    FunctionExpression expression = DSL.day_of_year(DSL.literal(new ExprDateValue(date)));
-    assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(dayOfYear), eval(expression));
+  private static Stream<Arguments> getTestDataForDayOfYear() {
+    return Stream.of(
+        Arguments.of(
+            DSL.literal(new ExprDateValue("2020-08-07")), "day_of_year(DATE '2020-08-07')", 220),
+        Arguments.of(
+            DSL.literal(new ExprDatetimeValue("2020-08-07 12:23:34")),
+            "day_of_year(DATETIME '2020-08-07 12:23:34')",
+            220),
+        Arguments.of(
+            DSL.literal(new ExprTimestampValue("2020-08-07 12:23:34")),
+            "day_of_year(TIMESTAMP '2020-08-07 12:23:34')",
+            220),
+        Arguments.of(DSL.literal("2020-08-07"), "day_of_year(\"2020-08-07\")", 220),
+        Arguments.of(
+            DSL.literal("2020-08-07 01:02:03"), "day_of_year(\"2020-08-07 01:02:03\")", 220));
   }
 
-  @Test
-  public void dayOfYearWithUnderscoresDifferentArgumentFormats() {
-    lenient().when(nullRef.valueOf(env)).thenReturn(nullValue());
-    lenient().when(missingRef.valueOf(env)).thenReturn(missingValue());
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("getTestDataForDayOfYear")
+  public void dayOfYearWithUnderscores(
+      LiteralExpression arg, String expectedString, int expectedResult) {
+    validateStringFormat(DSL.day_of_year(functionProperties, arg), expectedString, expectedResult);
+  }
 
-    FunctionExpression expression1 = DSL.day_of_year(DSL.literal(new ExprDateValue("2020-08-07")));
-    FunctionExpression expression2 = DSL.day_of_year(DSL.literal("2020-08-07"));
-    FunctionExpression expression3 = DSL.day_of_year(DSL.literal("2020-08-07 01:02:03"));
+  @Test
+  public void testDayOfYearWithTimeType() {
+    validateStringFormat(
+        DSL.day_of_year(functionProperties, DSL.literal(new ExprTimeValue("12:23:34"))),
+        "day_of_year(TIME '12:23:34')",
+        LocalDate.now(functionProperties.getQueryStartClock()).getDayOfYear());
+  }
 
+  public void dayOfYearWithUnderscoresQuery(String date, int dayOfYear) {
+    FunctionExpression expression =
+        DSL.day_of_year(functionProperties, DSL.literal(new ExprDateValue(date)));
     assertAll(
-        () -> testDayOfYearWithUnderscores("2020-08-07", 220),
-        () -> assertEquals("day_of_year(DATE '2020-08-07')", expression1.toString()),
+        () -> assertEquals(INTEGER, expression.type()),
+        () -> assertEquals(integerValue(dayOfYear), eval(expression)));
+  }
 
-        () -> testDayOfYearWithUnderscores("2020-08-07", 220),
-        () ->     assertEquals("day_of_year(\"2020-08-07\")", expression2.toString()),
+  @Test
+  public void dayOfYearWithUnderscoresDifferentArgumentFormats() {
+    FunctionExpression expression1 =
+        DSL.day_of_year(functionProperties, DSL.literal(new ExprDateValue("2020-08-07")));
+    FunctionExpression expression2 = DSL.day_of_year(functionProperties, DSL.literal("2020-08-07"));
+    FunctionExpression expression3 =
+        DSL.day_of_year(functionProperties, DSL.literal("2020-08-07 01:02:03"));
 
-        () -> testDayOfYearWithUnderscores("2020-08-07 01:02:03", 220),
-        () ->     assertEquals("day_of_year(\"2020-08-07 01:02:03\")", expression3.toString())
-    );
+    assertAll(
+        () -> dayOfYearWithUnderscoresQuery("2020-08-07", 220),
+        () -> assertEquals("day_of_year(DATE '2020-08-07')", expression1.toString()),
+        () -> dayOfYearWithUnderscoresQuery("2020-08-07", 220),
+        () -> assertEquals("day_of_year(\"2020-08-07\")", expression2.toString()),
+        () -> dayOfYearWithUnderscoresQuery("2020-08-07 01:02:03", 220),
+        () -> assertEquals("day_of_year(\"2020-08-07 01:02:03\")", expression3.toString()));
   }
 
   @Test
   public void dayOfYearWithUnderscoresCornerCaseDates() {
-    lenient().when(nullRef.valueOf(env)).thenReturn(nullValue());
-    lenient().when(missingRef.valueOf(env)).thenReturn(missingValue());
-
     assertAll(
-        //31st of December during non leap year (should be 365)
-        () -> testDayOfYearWithUnderscores("2019-12-31", 365),
-        //Year 1200
-        () -> testDayOfYearWithUnderscores("1200-02-28", 59),
-        //Year 4000
-        () -> testDayOfYearWithUnderscores("4000-02-28", 59)
-    );
+        // 31st of December during non leap year (should be 365)
+        () -> dayOfYearWithUnderscoresQuery("2019-12-31", 365),
+        // Year 1200
+        () -> dayOfYearWithUnderscoresQuery("1200-02-28", 59),
+        // Year 4000
+        () -> dayOfYearWithUnderscoresQuery("4000-02-28", 59));
   }
 
   @Test
   public void dayOfYearWithUnderscoresLeapYear() {
-    lenient().when(nullRef.valueOf(env)).thenReturn(nullValue());
-    lenient().when(missingRef.valueOf(env)).thenReturn(missingValue());
-
     assertAll(
-        //28th of Feb
-        () -> testDayOfYearWithUnderscores("2020-02-28", 59),
+        // 28th of Feb
+        () -> dayOfYearWithUnderscoresQuery("2020-02-28", 59),
 
-        //29th of Feb during leap year
-        () -> testDayOfYearWithUnderscores("2020-02-29 23:59:59", 60),
-        () -> testDayOfYearWithUnderscores("2020-02-29", 60),
+        // 29th of Feb during leap year
+        () -> dayOfYearWithUnderscoresQuery("2020-02-29 23:59:59", 60),
+        () -> dayOfYearWithUnderscoresQuery("2020-02-29", 60),
 
-        //1st of March during leap year
-        () -> testDayOfYearWithUnderscores("2020-03-01 00:00:00", 61),
-        () -> testDayOfYearWithUnderscores("2020-03-01", 61),
+        // 1st of March during leap year
+        () -> dayOfYearWithUnderscoresQuery("2020-03-01 00:00:00", 61),
+        () -> dayOfYearWithUnderscoresQuery("2020-03-01", 61),
 
-        //1st of March during non leap year
-        () -> testDayOfYearWithUnderscores("2019-03-01", 60),
+        // 1st of March during non leap year
+        () -> dayOfYearWithUnderscoresQuery("2019-03-01", 60),
 
-        //31st of December during  leap year (should be 366)
-        () -> testDayOfYearWithUnderscores("2020-12-31", 366)
-    );
+        // 31st of December during  leap year (should be 366)
+        () -> dayOfYearWithUnderscoresQuery("2020-12-31", 366));
   }
 
-  public void testInvalidDayOfYear(String date) {
-    FunctionExpression expression = DSL.day_of_year(DSL.literal(new ExprDateValue(date)));
+  private void invalidDayOfYearQuery(String date) {
+    FunctionExpression expression =
+        DSL.day_of_year(functionProperties, DSL.literal(new ExprDateValue(date)));
     eval(expression);
   }
 
   @Test
   public void invalidDayOfYearArgument() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.day_of_year(nullRef)));
-    assertEquals(missingValue(), eval(DSL.day_of_year(missingRef)));
-
-    //29th of Feb non-leapyear
-    assertThrows(SemanticCheckException.class, () ->  testInvalidDayOfYear("2019-02-29"));
-    //13th month
-    assertThrows(SemanticCheckException.class, () ->  testInvalidDayOfYear("2019-13-15"));
-    //incorrect format for type
-    assertThrows(SemanticCheckException.class, () ->  testInvalidDayOfYear("asdfasdfasdf"));
-  }
-  
+    assertAll(
+        // 29th of Feb non-leapyear
+        () -> assertThrows(SemanticCheckException.class, () -> invalidDayOfYearQuery("2019-02-29")),
+
+        // 13th month
+        () -> assertThrows(SemanticCheckException.class, () -> invalidDayOfYearQuery("2019-13-15")),
+
+        // incorrect format for type
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> invalidDayOfYearQuery("asdfasdfasdf")));
+  }
+
   @Test
   public void from_days() {
-    when(nullRef.type()).thenReturn(LONG);
-    when(missingRef.type()).thenReturn(LONG);
-    assertEquals(nullValue(), eval(DSL.from_days(nullRef)));
-    assertEquals(missingValue(), eval(DSL.from_days(missingRef)));
-
     FunctionExpression expression = DSL.from_days(DSL.literal(new ExprLongValue(730669)));
     assertEquals(DATE, expression.type());
     assertEquals("from_days(730669)", expression.toString());
-    assertEquals(new ExprDateValue("2000-07-03"), expression.valueOf(env));
+    assertEquals(new ExprDateValue("2000-07-03"), expression.valueOf());
+  }
+
+  private static Stream<Arguments> getTestDataForGetFormat() {
+    return Stream.of(
+        Arguments.of("DATE", "USA", "%m.%d.%Y"),
+        Arguments.of("DATE", "JIS", "%Y-%m-%d"),
+        Arguments.of("DATE", "ISO", "%Y-%m-%d"),
+        Arguments.of("DATE", "EUR", "%d.%m.%Y"),
+        Arguments.of("DATE", "INTERNAL", "%Y%m%d"),
+        Arguments.of("DATETIME", "USA", "%Y-%m-%d %H.%i.%s"),
+        Arguments.of("DATETIME", "JIS", "%Y-%m-%d %H:%i:%s"),
+        Arguments.of("DATETIME", "ISO", "%Y-%m-%d %H:%i:%s"),
+        Arguments.of("DATETIME", "EUR", "%Y-%m-%d %H.%i.%s"),
+        Arguments.of("DATETIME", "INTERNAL", "%Y%m%d%H%i%s"),
+        Arguments.of("TIME", "USA", "%h:%i:%s %p"),
+        Arguments.of("TIME", "JIS", "%H:%i:%s"),
+        Arguments.of("TIME", "ISO", "%H:%i:%s"),
+        Arguments.of("TIME", "EUR", "%H.%i.%s"),
+        Arguments.of("TIME", "INTERNAL", "%H%i%s"),
+        Arguments.of("TIMESTAMP", "USA", "%Y-%m-%d %H.%i.%s"),
+        Arguments.of("TIMESTAMP", "JIS", "%Y-%m-%d %H:%i:%s"),
+        Arguments.of("TIMESTAMP", "ISO", "%Y-%m-%d %H:%i:%s"),
+        Arguments.of("TIMESTAMP", "EUR", "%Y-%m-%d %H.%i.%s"),
+        Arguments.of("TIMESTAMP", "INTERNAL", "%Y%m%d%H%i%s"));
+  }
+
+  private void getFormatQuery(
+      LiteralExpression argType, LiteralExpression namedFormat, String expectedResult) {
+    FunctionExpression expr = DSL.get_format(argType, namedFormat);
+    assertEquals(STRING, expr.type());
+    assertEquals(expectedResult, eval(expr).stringValue());
+  }
+
+  @ParameterizedTest(name = "{0}{1}")
+  @MethodSource("getTestDataForGetFormat")
+  public void testGetFormat(String arg, String format, String expectedResult) {
+    getFormatQuery(DSL.literal(arg), DSL.literal(new ExprStringValue(format)), expectedResult);
   }
 
   @Test
-  public void hour() {
-    when(nullRef.type()).thenReturn(TIME);
-    when(missingRef.type()).thenReturn(TIME);
-    assertEquals(nullValue(), eval(DSL.hour(nullRef)));
-    assertEquals(missingValue(), eval(DSL.hour(missingRef)));
+  public void testGetFormatInvalidFormat() {
+    FunctionExpression expr = DSL.get_format(DSL.literal("DATE"), DSL.literal("1SA"));
+    assertEquals(nullValue(), eval(expr));
+  }
 
+  @Test
+  public void hour() {
     FunctionExpression expression = DSL.hour(DSL.literal(new ExprTimeValue("01:02:03")));
     assertEquals(INTEGER, expression.type());
     assertEquals(integerValue(1), eval(expression));
@@ -600,29 +569,154 @@ public void hour() {
 
     expression = DSL.hour(DSL.literal(new ExprTimestampValue("2020-08-17 01:02:03")));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(1), expression.valueOf(env));
+    assertEquals(integerValue(1), expression.valueOf());
     assertEquals("hour(TIMESTAMP '2020-08-17 01:02:03')", expression.toString());
 
     expression = DSL.hour(DSL.literal(new ExprDatetimeValue("2020-08-17 01:02:03")));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(1), expression.valueOf(env));
+    assertEquals(integerValue(1), expression.valueOf());
     assertEquals("hour(DATETIME '2020-08-17 01:02:03')", expression.toString());
 
     expression = DSL.hour(DSL.literal("2020-08-17 01:02:03"));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(1), expression.valueOf(env));
+    assertEquals(integerValue(1), expression.valueOf());
     assertEquals("hour(\"2020-08-17 01:02:03\")", expression.toString());
   }
 
+  private void testInvalidMinuteOfDay(String date) {
+    FunctionExpression expression = DSL.minute_of_day(DSL.literal(new ExprDateValue(date)));
+    eval(expression);
+  }
+
   @Test
-  public void microsecond() {
-    when(nullRef.type()).thenReturn(TIME);
-    when(missingRef.type()).thenReturn(TIME);
-    assertEquals(nullValue(), eval(DSL.microsecond(nullRef)));
-    assertEquals(missingValue(), eval(DSL.microsecond(missingRef)));
+  public void invalidMinuteOfDay() {
+    assertThrows(
+        SemanticCheckException.class, () -> testInvalidMinuteOfDay("2022-12-14 12:23:3400"));
+    assertThrows(
+        SemanticCheckException.class, () -> testInvalidMinuteOfDay("2022-12-14 12:2300:34"));
+    assertThrows(
+        SemanticCheckException.class, () -> testInvalidMinuteOfDay("2022-12-14 1200:23:34"));
+    assertThrows(
+        SemanticCheckException.class, () -> testInvalidMinuteOfDay("2022-12-1400 12:23:34"));
+    assertThrows(
+        SemanticCheckException.class, () -> testInvalidMinuteOfDay("2022-1200-14 12:23:34"));
+    assertThrows(SemanticCheckException.class, () -> testInvalidMinuteOfDay("12:23:3400"));
+    assertThrows(SemanticCheckException.class, () -> testInvalidMinuteOfDay("12:2300:34"));
+    assertThrows(SemanticCheckException.class, () -> testInvalidMinuteOfDay("1200:23:34"));
+    assertThrows(SemanticCheckException.class, () -> testInvalidMinuteOfDay("asdfasdfasdf"));
+  }
+
+  private void hourOfDayQuery(FunctionExpression dateExpression, int hour) {
+    assertEquals(INTEGER, dateExpression.type());
+    assertEquals(integerValue(hour), eval(dateExpression));
+  }
+
+  @Test
+  public void hourOfDay() {
+    FunctionExpression expression1 = DSL.hour_of_day(DSL.literal(new ExprTimeValue("01:02:03")));
+    FunctionExpression expression2 = DSL.hour_of_day(DSL.literal("01:02:03"));
+    FunctionExpression expression3 =
+        DSL.hour_of_day(DSL.literal(new ExprTimestampValue("2020-08-17 01:02:03")));
+    FunctionExpression expression4 =
+        DSL.hour_of_day(DSL.literal(new ExprDatetimeValue("2020-08-17 01:02:03")));
+    FunctionExpression expression5 = DSL.hour_of_day(DSL.literal("2020-08-17 01:02:03"));
+
+    assertAll(
+        () -> hourOfDayQuery(expression1, 1),
+        () -> assertEquals("hour_of_day(TIME '01:02:03')", expression1.toString()),
+        () -> hourOfDayQuery(expression2, 1),
+        () -> assertEquals("hour_of_day(\"01:02:03\")", expression2.toString()),
+        () -> hourOfDayQuery(expression3, 1),
+        () -> assertEquals("hour_of_day(TIMESTAMP '2020-08-17 01:02:03')", expression3.toString()),
+        () -> hourOfDayQuery(expression4, 1),
+        () -> assertEquals("hour_of_day(DATETIME '2020-08-17 01:02:03')", expression4.toString()),
+        () -> hourOfDayQuery(expression5, 1),
+        () -> assertEquals("hour_of_day(\"2020-08-17 01:02:03\")", expression5.toString()));
+  }
+
+  private void invalidHourOfDayQuery(String time) {
+    FunctionExpression expression = DSL.hour_of_day(DSL.literal(new ExprTimeValue(time)));
+    eval(expression);
+  }
+
+  @Test
+  public void hourOfDayInvalidArguments() {
+    assertAll(
+        // Invalid Seconds
+        () -> assertThrows(SemanticCheckException.class, () -> invalidHourOfDayQuery("12:23:61")),
+        // Invalid Minutes
+        () -> assertThrows(SemanticCheckException.class, () -> invalidHourOfDayQuery("12:61:34")),
+
+        // Invalid Hours
+        () -> assertThrows(SemanticCheckException.class, () -> invalidHourOfDayQuery("25:23:34")),
+
+        // incorrect format
+        () -> assertThrows(SemanticCheckException.class, () -> invalidHourOfDayQuery("asdfasdf")));
+  }
+
+  private void checkForExpectedDay(
+      FunctionExpression functionExpression, String expectedDay, String testExpr) {
+    assertEquals(DATE, functionExpression.type());
+    assertEquals(new ExprDateValue(expectedDay), eval(functionExpression));
+    assertEquals(testExpr, functionExpression.toString());
+  }
+
+  private static Stream<Arguments> getTestDataForLastDay() {
+    return Stream.of(
+        Arguments.of(new ExprDateValue("2017-01-20"), "2017-01-31", "last_day(DATE '2017-01-20')"),
+        // Leap year
+        Arguments.of(new ExprDateValue("2020-02-20"), "2020-02-29", "last_day(DATE '2020-02-20')"),
+        // Non leap year
+        Arguments.of(new ExprDateValue("2017-02-20"), "2017-02-28", "last_day(DATE '2017-02-20')"),
+        Arguments.of(new ExprDateValue("2017-03-20"), "2017-03-31", "last_day(DATE '2017-03-20')"),
+        Arguments.of(new ExprDateValue("2017-04-20"), "2017-04-30", "last_day(DATE '2017-04-20')"),
+        Arguments.of(new ExprDateValue("2017-05-20"), "2017-05-31", "last_day(DATE '2017-05-20')"),
+        Arguments.of(new ExprDateValue("2017-06-20"), "2017-06-30", "last_day(DATE '2017-06-20')"),
+        Arguments.of(new ExprDateValue("2017-07-20"), "2017-07-31", "last_day(DATE '2017-07-20')"),
+        Arguments.of(new ExprDateValue("2017-08-20"), "2017-08-31", "last_day(DATE '2017-08-20')"),
+        Arguments.of(new ExprDateValue("2017-09-20"), "2017-09-30", "last_day(DATE '2017-09-20')"),
+        Arguments.of(new ExprDateValue("2017-10-20"), "2017-10-31", "last_day(DATE '2017-10-20')"),
+        Arguments.of(new ExprDateValue("2017-11-20"), "2017-11-30", "last_day(DATE '2017-11-20')"),
+        Arguments.of(new ExprDateValue("2017-12-20"), "2017-12-31", "last_day(DATE '2017-12-20')"));
+  }
+
+  @ParameterizedTest(name = "{2}")
+  @MethodSource("getTestDataForLastDay")
+  public void testLastDay(ExprValue testedDateTime, String expectedResult, String expectedQuery) {
+    checkForExpectedDay(
+        DSL.last_day(functionProperties, DSL.literal(testedDateTime)),
+        expectedResult,
+        expectedQuery);
+  }
 
-    FunctionExpression expression = DSL
-        .microsecond(DSL.literal(new ExprTimeValue("01:02:03.123456")));
+  @Test
+  public void testLastDayWithTimeType() {
+    FunctionExpression expression =
+        DSL.last_day(functionProperties, DSL.literal(new ExprTimeValue("12:23:34")));
+
+    LocalDate expected = LocalDate.now(functionProperties.getQueryStartClock());
+    LocalDate result = eval(expression).dateValue();
+
+    assertAll(
+        () -> assertEquals((expected.lengthOfMonth()), result.getDayOfMonth()),
+        () -> assertEquals("last_day(TIME '12:23:34')", expression.toString()));
+  }
+
+  private void lastDay(String date) {
+    FunctionExpression expression =
+        DSL.day_of_week(functionProperties, DSL.literal(new ExprDateValue(date)));
+    eval(expression);
+  }
+
+  @Test
+  public void testLastDayInvalidArgument() {
+    assertThrows(SemanticCheckException.class, () -> lastDay("asdfasdf"));
+  }
+
+  @Test
+  public void microsecond() {
+    FunctionExpression expression =
+        DSL.microsecond(DSL.literal(new ExprTimeValue("01:02:03.123456")));
     assertEquals(INTEGER, expression.type());
     assertEquals(integerValue(123456), eval(expression));
     assertEquals("microsecond(TIME '01:02:03.123456')", expression.toString());
@@ -639,32 +733,27 @@ public void microsecond() {
 
     expression = DSL.microsecond(DSL.literal(new ExprDatetimeValue("2020-08-17 01:02:03.000010")));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(10), expression.valueOf(env));
+    assertEquals(integerValue(10), expression.valueOf());
     assertEquals("microsecond(DATETIME '2020-08-17 01:02:03.00001')", expression.toString());
 
     expression = DSL.microsecond(DSL.literal(new ExprDatetimeValue("2020-08-17 01:02:03.123456")));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(123456), expression.valueOf(env));
+    assertEquals(integerValue(123456), expression.valueOf());
     assertEquals("microsecond(DATETIME '2020-08-17 01:02:03.123456')", expression.toString());
 
     expression = DSL.microsecond(DSL.literal("2020-08-17 01:02:03.123456"));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(123456), expression.valueOf(env));
+    assertEquals(integerValue(123456), expression.valueOf());
     assertEquals("microsecond(\"2020-08-17 01:02:03.123456\")", expression.toString());
 
     expression = DSL.microsecond(DSL.literal(new ExprTimestampValue("2020-08-17 01:02:03.000010")));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(10), expression.valueOf(env));
+    assertEquals(integerValue(10), expression.valueOf());
     assertEquals("microsecond(TIMESTAMP '2020-08-17 01:02:03.00001')", expression.toString());
   }
 
   @Test
   public void minute() {
-    when(nullRef.type()).thenReturn(TIME);
-    when(missingRef.type()).thenReturn(TIME);
-    assertEquals(nullValue(), eval(DSL.minute(nullRef)));
-    assertEquals(missingValue(), eval(DSL.minute(missingRef)));
-
     FunctionExpression expression = DSL.minute(DSL.literal(new ExprTimeValue("01:02:03")));
     assertEquals(INTEGER, expression.type());
     assertEquals(integerValue(2), eval(expression));
@@ -677,27 +766,114 @@ public void minute() {
 
     expression = DSL.minute(DSL.literal(new ExprTimestampValue("2020-08-17 01:02:03")));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(2), expression.valueOf(env));
+    assertEquals(integerValue(2), expression.valueOf());
     assertEquals("minute(TIMESTAMP '2020-08-17 01:02:03')", expression.toString());
 
     expression = DSL.minute(DSL.literal(new ExprDatetimeValue("2020-08-17 01:02:03")));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(2), expression.valueOf(env));
+    assertEquals(integerValue(2), expression.valueOf());
     assertEquals("minute(DATETIME '2020-08-17 01:02:03')", expression.toString());
 
     expression = DSL.minute(DSL.literal("2020-08-17 01:02:03"));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(2), expression.valueOf(env));
+    assertEquals(integerValue(2), expression.valueOf());
     assertEquals("minute(\"2020-08-17 01:02:03\")", expression.toString());
   }
 
+  private void testMinuteOfDay(String date, int value) {
+    FunctionExpression expression = DSL.minute_of_day(DSL.literal(new ExprTimeValue(date)));
+    assertEquals(INTEGER, expression.type());
+    assertEquals(integerValue(value), eval(expression));
+  }
+
   @Test
-  public void month() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.month(nullRef)));
-    assertEquals(missingValue(), eval(DSL.month(missingRef)));
+  public void minuteOfDay() {
+    FunctionExpression expression = DSL.minute_of_day(DSL.literal(new ExprTimeValue("01:02:03")));
+    assertEquals(INTEGER, expression.type());
+    assertEquals(integerValue(62), eval(expression));
+    assertEquals("minute_of_day(TIME '01:02:03')", expression.toString());
+
+    expression = DSL.minute_of_day(DSL.literal("01:02:03"));
+    assertEquals(INTEGER, expression.type());
+    assertEquals(integerValue(62), eval(expression));
+    assertEquals("minute_of_day(\"01:02:03\")", expression.toString());
+
+    expression = DSL.minute_of_day(DSL.literal(new ExprTimestampValue("2020-08-17 01:02:03")));
+    assertEquals(INTEGER, expression.type());
+    assertEquals(integerValue(62), expression.valueOf());
+    assertEquals("minute_of_day(TIMESTAMP '2020-08-17 01:02:03')", expression.toString());
+
+    expression = DSL.minute_of_day(DSL.literal(new ExprDatetimeValue("2020-08-17 01:02:03")));
+    assertEquals(INTEGER, expression.type());
+    assertEquals(integerValue(62), expression.valueOf());
+    assertEquals("minute_of_day(DATETIME '2020-08-17 01:02:03')", expression.toString());
+
+    expression = DSL.minute_of_day(DSL.literal("2020-08-17 01:02:03"));
+    assertEquals(INTEGER, expression.type());
+    assertEquals(integerValue(62), expression.valueOf());
+    assertEquals("minute_of_day(\"2020-08-17 01:02:03\")", expression.toString());
+
+    testMinuteOfDay("2020-08-17 23:59:59", 1439);
+    testMinuteOfDay("2020-08-17 00:00:01", 0);
+  }
+
+  private void minuteOfHourQuery(FunctionExpression dateExpression, int minute, String testExpr) {
+    assertAll(
+        () -> assertEquals(INTEGER, dateExpression.type()),
+        () -> assertEquals(integerValue(minute), eval(dateExpression)),
+        () -> assertEquals(testExpr, dateExpression.toString()));
+  }
+
+  private static Stream<Arguments> getTestDataForMinuteOfHour() {
+    return Stream.of(
+        Arguments.of(
+            DSL.literal(new ExprTimeValue("01:02:03")), 2, "minute_of_hour(TIME '01:02:03')"),
+        Arguments.of(DSL.literal("01:02:03"), 2, "minute_of_hour(\"01:02:03\")"),
+        Arguments.of(
+            DSL.literal(new ExprTimestampValue("2020-08-17 01:02:03")),
+            2,
+            "minute_of_hour(TIMESTAMP '2020-08-17 01:02:03')"),
+        Arguments.of(
+            DSL.literal(new ExprDatetimeValue("2020-08-17 01:02:03")),
+            2,
+            "minute_of_hour(DATETIME '2020-08-17 01:02:03')"),
+        Arguments.of(
+            DSL.literal("2020-08-17 01:02:03"), 2, "minute_of_hour(\"2020-08-17 01:02:03\")"));
+  }
+
+  @ParameterizedTest(name = "{2}")
+  @MethodSource("getTestDataForMinuteOfHour")
+  public void minuteOfHour(LiteralExpression arg, int expectedResult, String expectedString) {
+    minuteOfHourQuery(DSL.minute_of_hour(arg), expectedResult, expectedString);
+  }
 
+  private void invalidMinuteOfHourQuery(String time) {
+    FunctionExpression expression = DSL.minute_of_hour(DSL.literal(new ExprTimeValue(time)));
+    eval(expression);
+  }
+
+  @Test
+  public void minuteOfHourInvalidArguments() {
+    assertAll(
+        // Invalid Seconds
+        () ->
+            assertThrows(SemanticCheckException.class, () -> invalidMinuteOfHourQuery("12:23:61")),
+
+        // Invalid Minutes
+        () ->
+            assertThrows(SemanticCheckException.class, () -> invalidMinuteOfHourQuery("12:61:34")),
+
+        // Invalid Hours
+        () ->
+            assertThrows(SemanticCheckException.class, () -> invalidMinuteOfHourQuery("25:23:34")),
+
+        // incorrect format
+        () ->
+            assertThrows(SemanticCheckException.class, () -> invalidMinuteOfHourQuery("asdfasdf")));
+  }
+
+  @Test
+  public void month() {
     FunctionExpression expression = DSL.month(DSL.literal(new ExprDateValue("2020-08-07")));
     assertEquals(INTEGER, expression.type());
     assertEquals("month(DATE '2020-08-07')", expression.toString());
@@ -714,39 +890,67 @@ public void month() {
     assertEquals(integerValue(8), eval(expression));
   }
 
-  public void testInvalidDates(String date) throws SemanticCheckException {
-    FunctionExpression expression = DSL.month_of_year(DSL.literal(new ExprDateValue(date)));
-    eval(expression);
+  private static Stream<Arguments> getTestDataForMonthOfYear() {
+    return Stream.of(
+        Arguments.of(
+            DSL.literal(new ExprDateValue("2020-08-07")), "month_of_year(DATE '2020-08-07')", 8),
+        Arguments.of(
+            DSL.literal(new ExprDatetimeValue("2020-08-07 12:23:34")),
+            "month_of_year(DATETIME '2020-08-07 12:23:34')",
+            8),
+        Arguments.of(
+            DSL.literal(new ExprTimestampValue("2020-08-07 12:23:34")),
+            "month_of_year(TIMESTAMP '2020-08-07 12:23:34')",
+            8),
+        Arguments.of(DSL.literal("2020-08-07"), "month_of_year(\"2020-08-07\")", 8),
+        Arguments.of(
+            DSL.literal("2020-08-07 01:02:03"), "month_of_year(\"2020-08-07 01:02:03\")", 8));
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("getTestDataForMonthOfYear")
+  public void monthOfYear(LiteralExpression arg, String expectedString, int expectedResult) {
+    validateStringFormat(
+        DSL.month_of_year(functionProperties, arg), expectedString, expectedResult);
+  }
+
+  @Test
+  public void testMonthOfYearWithTimeType() {
+    validateStringFormat(
+        DSL.month_of_year(functionProperties, DSL.literal(new ExprTimeValue("12:23:34"))),
+        "month_of_year(TIME '12:23:34')",
+        LocalDate.now(functionProperties.getQueryStartClock()).getMonthValue());
   }
 
-  @Test void monthOfYearInvalidDates() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.month_of_year(nullRef)));
-    assertEquals(missingValue(), eval(DSL.month_of_year(missingRef)));
+  private void invalidDatesQuery(String date) throws SemanticCheckException {
+    FunctionExpression expression =
+        DSL.month_of_year(functionProperties, DSL.literal(new ExprDateValue(date)));
+    eval(expression);
+  }
 
-    assertThrows(SemanticCheckException.class, () ->  testInvalidDates("2019-01-50"));
-    assertThrows(SemanticCheckException.class, () ->  testInvalidDates("2019-02-29"));
-    assertThrows(SemanticCheckException.class, () ->  testInvalidDates("2019-02-31"));
-    assertThrows(SemanticCheckException.class, () ->  testInvalidDates("2019-13-05"));
+  @Test
+  public void monthOfYearInvalidDates() {
+    assertAll(
+        () -> assertThrows(SemanticCheckException.class, () -> invalidDatesQuery("2019-01-50")),
+        () -> assertThrows(SemanticCheckException.class, () -> invalidDatesQuery("2019-02-29")),
+        () -> assertThrows(SemanticCheckException.class, () -> invalidDatesQuery("2019-02-31")),
+        () -> assertThrows(SemanticCheckException.class, () -> invalidDatesQuery("2019-13-05")));
   }
 
   @Test
   public void monthOfYearAlternateArgumentSyntaxes() {
-    lenient().when(nullRef.valueOf(env)).thenReturn(nullValue());
-    lenient().when(missingRef.valueOf(env)).thenReturn(missingValue());
-
-    FunctionExpression expression = DSL.month_of_year(DSL.literal(new ExprDateValue("2020-08-07")));
+    FunctionExpression expression =
+        DSL.month_of_year(functionProperties, DSL.literal(new ExprDateValue("2020-08-07")));
     assertEquals(INTEGER, expression.type());
     assertEquals("month_of_year(DATE '2020-08-07')", expression.toString());
     assertEquals(integerValue(8), eval(expression));
 
-    expression = DSL.month_of_year(DSL.literal("2020-08-07"));
+    expression = DSL.month_of_year(functionProperties, DSL.literal("2020-08-07"));
     assertEquals(INTEGER, expression.type());
     assertEquals("month_of_year(\"2020-08-07\")", expression.toString());
     assertEquals(integerValue(8), eval(expression));
 
-    expression = DSL.month_of_year(DSL.literal("2020-08-07 01:02:03"));
+    expression = DSL.month_of_year(functionProperties, DSL.literal("2020-08-07 01:02:03"));
     assertEquals(INTEGER, expression.type());
     assertEquals("month_of_year(\"2020-08-07 01:02:03\")", expression.toString());
     assertEquals(integerValue(8), eval(expression));
@@ -754,11 +958,6 @@ public void monthOfYearAlternateArgumentSyntaxes() {
 
   @Test
   public void monthName() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.monthname(nullRef)));
-    assertEquals(missingValue(), eval(DSL.monthname(missingRef)));
-
     FunctionExpression expression = DSL.monthname(DSL.literal(new ExprDateValue("2020-08-07")));
     assertEquals(STRING, expression.type());
     assertEquals("monthname(DATE '2020-08-07')", expression.toString());
@@ -777,11 +976,6 @@ public void monthName() {
 
   @Test
   public void quarter() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.quarter(nullRef)));
-    assertEquals(missingValue(), eval(DSL.quarter(missingRef)));
-
     FunctionExpression expression = DSL.quarter(DSL.literal(new ExprDateValue("2020-08-07")));
     assertEquals(INTEGER, expression.type());
     assertEquals("quarter(DATE '2020-08-07')", expression.toString());
@@ -798,13 +992,47 @@ public void quarter() {
     assertEquals(integerValue(4), eval(expression));
   }
 
+  private static Stream<Arguments> getTestDataForSecToTime() {
+    return Stream.of(
+        Arguments.of(1, "00:00:01"),
+        Arguments.of(2378, "00:39:38"),
+        Arguments.of(6897, "01:54:57"),
+        Arguments.of(-82800, "01:00:00"),
+        Arguments.of(-169200, "01:00:00"),
+        Arguments.of(3600, "01:00:00"),
+        Arguments.of(90000, "01:00:00"),
+        Arguments.of(176400, "01:00:00"));
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("getTestDataForSecToTime")
+  public void testSecToTime(int seconds, String expected) {
+    FunctionExpression expr = DSL.sec_to_time(DSL.literal(new ExprIntegerValue(seconds)));
+
+    assertEquals(TIME, expr.type());
+    assertEquals(new ExprTimeValue(expected), eval(expr));
+  }
+
+  private static Stream<Arguments> getTestDataForSecToTimeWithDecimal() {
+    return Stream.of(
+        Arguments.of(1.123, "00:00:01.123"),
+        Arguments.of(1.00123, "00:00:01.00123"),
+        Arguments.of(1.001023, "00:00:01.001023"),
+        Arguments.of(1.000000042, "00:00:01.000000042"),
+        Arguments.of(3.14, "00:00:03.14"));
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("getTestDataForSecToTimeWithDecimal")
+  public void testSecToTimeWithDecimal(double arg, String expected) {
+    FunctionExpression expr = DSL.sec_to_time(DSL.literal(new ExprDoubleValue(arg)));
+
+    assertEquals(TIME, expr.type());
+    assertEquals(new ExprTimeValue(expected), eval(expr));
+  }
+
   @Test
   public void second() {
-    when(nullRef.type()).thenReturn(TIME);
-    when(missingRef.type()).thenReturn(TIME);
-    assertEquals(nullValue(), eval(DSL.second(nullRef)));
-    assertEquals(missingValue(), eval(DSL.second(missingRef)));
-
     FunctionExpression expression = DSL.second(DSL.literal(new ExprTimeValue("01:02:03")));
     assertEquals(INTEGER, expression.type());
     assertEquals(integerValue(3), eval(expression));
@@ -822,92 +1050,72 @@ public void second() {
 
     expression = DSL.second(DSL.literal(new ExprTimestampValue("2020-08-17 01:02:03")));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(3), expression.valueOf(env));
+    assertEquals(integerValue(3), expression.valueOf());
     assertEquals("second(TIMESTAMP '2020-08-17 01:02:03')", expression.toString());
 
     expression = DSL.second(DSL.literal(new ExprDatetimeValue("2020-08-17 01:02:03")));
     assertEquals(INTEGER, expression.type());
-    assertEquals(integerValue(3), expression.valueOf(env));
+    assertEquals(integerValue(3), expression.valueOf());
     assertEquals("second(DATETIME '2020-08-17 01:02:03')", expression.toString());
   }
 
+  private void secondOfMinuteQuery(FunctionExpression dateExpression, int second, String testExpr) {
+    assertEquals(INTEGER, dateExpression.type());
+    assertEquals(integerValue(second), eval(dateExpression));
+    assertEquals(testExpr, dateExpression.toString());
+  }
+
+  private static Stream<Arguments> getTestDataForSecondOfMinute() {
+    return Stream.of(
+        Arguments.of(
+            DSL.literal(new ExprTimeValue("01:02:03")), 3, "second_of_minute(TIME '01:02:03')"),
+        Arguments.of(DSL.literal("01:02:03"), 3, "second_of_minute(\"01:02:03\")"),
+        Arguments.of(
+            DSL.literal("2020-08-17 01:02:03"), 3, "second_of_minute(\"2020-08-17 01:02:03\")"),
+        Arguments.of(
+            DSL.literal(new ExprTimestampValue("2020-08-17 01:02:03")),
+            3,
+            "second_of_minute(TIMESTAMP '2020-08-17 01:02:03')"),
+        Arguments.of(
+            DSL.literal(new ExprDatetimeValue("2020-08-17 01:02:03")),
+            3,
+            "second_of_minute(DATETIME '2020-08-17 01:02:03')"));
+  }
+
+  @ParameterizedTest(name = "{2}")
+  @MethodSource("getTestDataForSecondOfMinute")
+  public void secondOfMinute(LiteralExpression arg, int expectedResult, String expectedString) {
+    secondOfMinuteQuery(DSL.second_of_minute(arg), expectedResult, expectedString);
+  }
+
+  private void invalidSecondOfMinuteQuery(String time) {
+    FunctionExpression expression = DSL.second_of_minute(DSL.literal(new ExprTimeValue(time)));
+    eval(expression);
+  }
+
   @Test
-  public void subdate() {
-    FunctionExpression expr = DSL.subdate(DSL.date(DSL.literal("2020-08-26")), DSL.literal(7));
-    assertEquals(DATE, expr.type());
-    assertEquals(new ExprDateValue("2020-08-19"), expr.valueOf(env));
-    assertEquals("subdate(date(\"2020-08-26\"), 7)", expr.toString());
-
-    expr = DSL.subdate(DSL.literal("2020-08-26"), DSL.literal(7));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDateValue("2020-08-19"), expr.valueOf(env));
-    assertEquals("subdate(\"2020-08-26\", 7)", expr.toString());
-
-    expr = DSL.subdate(DSL.timestamp(DSL.literal("2020-08-26 12:05:00")), DSL.literal(7));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-08-19 12:05:00"), expr.valueOf(env));
-    assertEquals("subdate(timestamp(\"2020-08-26 12:05:00\"), 7)", expr.toString());
-
-    expr = DSL.subdate(DSL.literal("2020-08-26 12:05:00"), DSL.literal(7));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-08-19 12:05:00"), expr.valueOf(env));
-    assertEquals("subdate(\"2020-08-26 12:05:00\", 7)", expr.toString());
-
-    expr = DSL.subdate(DSL.timestamp(DSL.literal("2020-08-26 12:05:00")),
-        DSL.interval(DSL.literal(1), DSL.literal("hour")));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-08-26 11:05:00"), expr.valueOf(env));
-    assertEquals("subdate(timestamp(\"2020-08-26 12:05:00\"), interval(1, \"hour\"))",
-        expr.toString());
-
-    expr = DSL.subdate(DSL.literal("2020-08-26 12:05:00"),
-        DSL.interval(DSL.literal(1), DSL.literal("hour")));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2020-08-26 11:05:00"), expr.valueOf(env));
-    assertEquals("subdate(\"2020-08-26 12:05:00\", interval(1, \"hour\"))",
-        expr.toString());
-
-    expr = DSL.subdate(DSL.literal("2020-08-26"),
-        DSL.interval(DSL.literal(1), DSL.literal("day")));
-    assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDateValue("2020-08-25"), expr.valueOf(env));
-    assertEquals("subdate(\"2020-08-26\", interval(1, \"day\"))",
-        expr.toString());
-
-    when(nullRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.subdate(nullRef, DSL.literal(1L))));
-    assertEquals(nullValue(),
-        eval(DSL.subdate(nullRef, DSL.interval(DSL.literal(1), DSL.literal("month")))));
-
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(missingValue(), eval(DSL.subdate(missingRef, DSL.literal(1L))));
-    assertEquals(missingValue(),
-        eval(DSL.subdate(missingRef, DSL.interval(DSL.literal(1), DSL.literal("month")))));
-
-    when(nullRef.type()).thenReturn(LONG);
-    when(missingRef.type()).thenReturn(LONG);
-    assertEquals(nullValue(), eval(DSL.subdate(DSL.date(DSL.literal("2020-08-26")), nullRef)));
-    assertEquals(missingValue(),
-        eval(DSL.subdate(DSL.date(DSL.literal("2020-08-26")), missingRef)));
-
-    when(nullRef.type()).thenReturn(INTERVAL);
-    when(missingRef.type()).thenReturn(INTERVAL);
-    assertEquals(nullValue(), eval(DSL.subdate(DSL.date(DSL.literal("2020-08-26")), nullRef)));
-    assertEquals(missingValue(),
-        eval(DSL.subdate(DSL.date(DSL.literal("2020-08-26")), missingRef)));
-
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(INTERVAL);
-    assertEquals(missingValue(), eval(DSL.subdate(nullRef, missingRef)));
+  public void secondOfMinuteInvalidArguments() {
+    assertAll(
+        // Invalid Seconds
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> invalidSecondOfMinuteQuery("12:23:61")),
+        // Invalid Minutes
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> invalidSecondOfMinuteQuery("12:61:34")),
+        // Invalid Hours
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> invalidSecondOfMinuteQuery("25:23:34")),
+        // incorrect format
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> invalidSecondOfMinuteQuery("asdfasdf")));
   }
 
   @Test
   public void time_to_sec() {
-    when(nullRef.type()).thenReturn(TIME);
-    when(missingRef.type()).thenReturn(TIME);
-    assertEquals(nullValue(), eval(DSL.time_to_sec(nullRef)));
-    assertEquals(missingValue(), eval(DSL.time_to_sec(missingRef)));
-
     FunctionExpression expression = DSL.time_to_sec(DSL.literal(new ExprTimeValue("22:23:00")));
     assertEquals(LONG, expression.type());
     assertEquals("time_to_sec(TIME '22:23:00')", expression.toString());
@@ -921,11 +1129,6 @@ public void time_to_sec() {
 
   @Test
   public void time() {
-    when(nullRef.type()).thenReturn(TIME);
-    when(missingRef.type()).thenReturn(TIME);
-    assertEquals(nullValue(), eval(DSL.time(nullRef)));
-    assertEquals(missingValue(), eval(DSL.time(missingRef)));
-
     FunctionExpression expr = DSL.time(DSL.literal("01:01:01"));
     assertEquals(TIME, expr.type());
     assertEquals(new ExprTimeValue("01:01:01"), eval(expr));
@@ -963,244 +1166,216 @@ public void time() {
 
   @Test
   public void timestamp() {
-    when(nullRef.type()).thenReturn(TIMESTAMP);
-    when(missingRef.type()).thenReturn(TIMESTAMP);
-    assertEquals(nullValue(), eval(DSL.timestamp(nullRef)));
-    assertEquals(missingValue(), eval(DSL.timestamp(missingRef)));
-
     FunctionExpression expr = DSL.timestamp(DSL.literal("2020-08-17 01:01:01"));
     assertEquals(TIMESTAMP, expr.type());
-    assertEquals(new ExprTimestampValue("2020-08-17 01:01:01"), expr.valueOf(env));
-    assertEquals("timestamp(\"2020-08-17 01:01:01\")", expr.toString());
+    assertEquals(new ExprTimestampValue("2020-08-17 01:01:01"), expr.valueOf());
+    assertEquals("timestamp(cast_to_timestamp(\"2020-08-17 01:01:01\"))", expr.toString());
 
     expr = DSL.timestamp(DSL.literal(new ExprTimestampValue("2020-08-17 01:01:01")));
     assertEquals(TIMESTAMP, expr.type());
-    assertEquals(new ExprTimestampValue("2020-08-17 01:01:01"), expr.valueOf(env));
+    assertEquals(new ExprTimestampValue("2020-08-17 01:01:01"), expr.valueOf());
     assertEquals("timestamp(TIMESTAMP '2020-08-17 01:01:01')", expr.toString());
   }
 
-  private void testWeek(String date, int mode, int expectedResult) {
-    FunctionExpression expression = DSL
-        .week(DSL.literal(new ExprDateValue(date)), DSL.literal(mode));
+  private void weekQuery(String date, int mode, int expectedResult) {
+    FunctionExpression expression =
+        DSL.week(functionProperties, DSL.literal(new ExprDateValue(date)), DSL.literal(mode));
     assertEquals(INTEGER, expression.type());
     assertEquals(String.format("week(DATE '%s', %d)", date, mode), expression.toString());
     assertEquals(integerValue(expectedResult), eval(expression));
   }
 
-  private void testNullMissingWeek(ExprCoreType date) {
-    when(nullRef.type()).thenReturn(date);
-    when(missingRef.type()).thenReturn(date);
-    assertEquals(nullValue(), eval(DSL.week(nullRef)));
-    assertEquals(missingValue(), eval(DSL.week(missingRef)));
-  }
-
-  @Test
-  public void week() {
-    testNullMissingWeek(DATE);
-    testNullMissingWeek(DATETIME);
-    testNullMissingWeek(TIMESTAMP);
-    testNullMissingWeek(STRING);
-
-    when(nullRef.type()).thenReturn(INTEGER);
-    when(missingRef.type()).thenReturn(INTEGER);
-    assertEquals(nullValue(), eval(DSL.week(DSL.literal("2019-01-05"), nullRef)));
-    assertEquals(missingValue(), eval(DSL.week(DSL.literal("2019-01-05"), missingRef)));
-
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(INTEGER);
-    assertEquals(missingValue(), eval(DSL.week(nullRef, missingRef)));
-
-    FunctionExpression expression = DSL
-        .week(DSL.literal(new ExprTimestampValue("2019-01-05 01:02:03")));
-    assertEquals(INTEGER, expression.type());
-    assertEquals("week(TIMESTAMP '2019-01-05 01:02:03')", expression.toString());
-    assertEquals(integerValue(0), eval(expression));
-
-    expression = DSL.week(DSL.literal("2019-01-05"));
+  private void weekOfYearUnderscoresQuery(String date, int mode, int expectedResult) {
+    FunctionExpression expression =
+        DSL.week_of_year(
+            functionProperties, DSL.literal(new ExprDateValue(date)), DSL.literal(mode));
     assertEquals(INTEGER, expression.type());
-    assertEquals("week(\"2019-01-05\")", expression.toString());
-    assertEquals(integerValue(0), eval(expression));
+    assertEquals(String.format("week_of_year(DATE '%s', %d)", date, mode), expression.toString());
+    assertEquals(integerValue(expectedResult), eval(expression));
+  }
 
-    expression = DSL.week(DSL.literal("2019-01-05 00:01:00"));
+  private void weekOfYearQuery(String date, int mode, int expectedResult) {
+    FunctionExpression expression =
+        DSL.weekofyear(functionProperties, DSL.literal(new ExprDateValue(date)), DSL.literal(mode));
     assertEquals(INTEGER, expression.type());
-    assertEquals("week(\"2019-01-05 00:01:00\")", expression.toString());
-    assertEquals(integerValue(0), eval(expression));
-
-    testWeek("2019-01-05", 0, 0);
-    testWeek("2019-01-05", 1, 1);
-    testWeek("2019-01-05", 2, 52);
-    testWeek("2019-01-05", 3, 1);
-    testWeek("2019-01-05", 4, 1);
-    testWeek("2019-01-05", 5, 0);
-    testWeek("2019-01-05", 6, 1);
-    testWeek("2019-01-05", 7, 53);
-
-    testWeek("2019-01-06", 0, 1);
-    testWeek("2019-01-06", 1, 1);
-    testWeek("2019-01-06", 2, 1);
-    testWeek("2019-01-06", 3, 1);
-    testWeek("2019-01-06", 4, 2);
-    testWeek("2019-01-06", 5, 0);
-    testWeek("2019-01-06", 6, 2);
-    testWeek("2019-01-06", 7, 53);
-
-    testWeek("2019-01-07", 0, 1);
-    testWeek("2019-01-07", 1, 2);
-    testWeek("2019-01-07", 2, 1);
-    testWeek("2019-01-07", 3, 2);
-    testWeek("2019-01-07", 4, 2);
-    testWeek("2019-01-07", 5, 1);
-    testWeek("2019-01-07", 6, 2);
-    testWeek("2019-01-07", 7, 1);
-
-    testWeek("2000-01-01", 0, 0);
-    testWeek("2000-01-01", 2, 52);
-    testWeek("1999-12-31", 0, 52);
+    assertEquals(String.format("weekofyear(DATE '%s', %d)", date, mode), expression.toString());
+    assertEquals(integerValue(expectedResult), eval(expression));
   }
 
-  @Test
-  public void modeInUnsupportedFormat() {
-    testNullMissingWeek(DATE);
+  private static Stream<Arguments> getTestDataForWeek() {
+    // Test the behavior of different modes passed into the 'week_of_year' function
+    return Stream.of(
+        Arguments.of("2019-01-05", 0, 0),
+        Arguments.of("2019-01-05", 1, 1),
+        Arguments.of("2019-01-05", 2, 52),
+        Arguments.of("2019-01-05", 3, 1),
+        Arguments.of("2019-01-05", 4, 1),
+        Arguments.of("2019-01-05", 5, 0),
+        Arguments.of("2019-01-05", 6, 1),
+        Arguments.of("2019-01-05", 7, 53),
+        Arguments.of("2019-01-06", 0, 1),
+        Arguments.of("2019-01-06", 1, 1),
+        Arguments.of("2019-01-06", 2, 1),
+        Arguments.of("2019-01-06", 3, 1),
+        Arguments.of("2019-01-06", 4, 2),
+        Arguments.of("2019-01-06", 5, 0),
+        Arguments.of("2019-01-06", 6, 2),
+        Arguments.of("2019-01-06", 7, 53),
+        Arguments.of("2019-01-07", 0, 1),
+        Arguments.of("2019-01-07", 1, 2),
+        Arguments.of("2019-01-07", 2, 1),
+        Arguments.of("2019-01-07", 3, 2),
+        Arguments.of("2019-01-07", 4, 2),
+        Arguments.of("2019-01-07", 5, 1),
+        Arguments.of("2019-01-07", 6, 2),
+        Arguments.of("2019-01-07", 7, 1),
+        Arguments.of("2000-01-01", 0, 0),
+        Arguments.of("2000-01-01", 2, 52),
+        Arguments.of("1999-12-31", 0, 52));
+  }
 
-    FunctionExpression expression1 = DSL
-        .week(DSL.literal(new ExprDateValue("2019-01-05")), DSL.literal(8));
-    SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class, () -> eval(expression1));
-    assertEquals("mode:8 is invalid, please use mode value between 0-7",
-        exception.getMessage());
+  @ParameterizedTest(name = "{1}{2}")
+  @MethodSource("getTestDataForWeek")
+  public void testWeek(String date, int mode, int expected) {
+    weekQuery(date, mode, expected);
+    weekOfYearQuery(date, mode, expected);
+    weekOfYearUnderscoresQuery(date, mode, expected);
+  }
 
-    FunctionExpression expression2 = DSL
-        .week(DSL.literal(new ExprDateValue("2019-01-05")), DSL.literal(-1));
-    exception = assertThrows(SemanticCheckException.class, () -> eval(expression2));
-    assertEquals("mode:-1 is invalid, please use mode value between 0-7",
-        exception.getMessage());
+  private void validateStringFormat(
+      FunctionExpression expr, String expectedString, int expectedResult) {
+    assertAll(
+        () -> assertEquals(INTEGER, expr.type()),
+        () -> assertEquals(expectedString, expr.toString()),
+        () -> assertEquals(integerValue(expectedResult), eval(expr)));
   }
 
-  private void testWeekOfYear(String date, int mode, int expectedResult) {
-    FunctionExpression expression = DSL
-        .week_of_year(DSL.literal(new ExprDateValue(date)), DSL.literal(mode));
-    assertEquals(INTEGER, expression.type());
-    assertEquals(String.format("week_of_year(DATE '%s', %d)", date, mode), expression.toString());
-    assertEquals(integerValue(expectedResult), eval(expression));
+  private static Stream<Arguments> getTestDataForWeekFormats() {
+    return Stream.of(
+        Arguments.of(DSL.literal(new ExprDateValue("2019-01-05")), "DATE '2019-01-05'", 0),
+        Arguments.of(
+            DSL.literal(new ExprDatetimeValue("2019-01-05 01:02:03")),
+            "DATETIME '2019-01-05 01:02:03'",
+            0),
+        Arguments.of(
+            DSL.literal(new ExprTimestampValue("2019-01-05 01:02:03")),
+            "TIMESTAMP '2019-01-05 01:02:03'",
+            0),
+        Arguments.of(DSL.literal("2019-01-05"), "\"2019-01-05\"", 0),
+        Arguments.of(DSL.literal("2019-01-05 00:01:00"), "\"2019-01-05 00:01:00\"", 0));
   }
 
-  private void testNullMissingWeekOfYear(ExprCoreType date) {
-    when(nullRef.type()).thenReturn(date);
-    when(missingRef.type()).thenReturn(date);
-    assertEquals(nullValue(), eval(DSL.week_of_year(nullRef)));
-    assertEquals(missingValue(), eval(DSL.week_of_year(missingRef)));
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("getTestDataForWeekFormats")
+  public void testWeekFormats(
+      LiteralExpression arg, String expectedString, Integer expectedInteger) {
+    validateStringFormat(
+        DSL.week(functionProperties, arg),
+        String.format("week(%s)", expectedString),
+        expectedInteger);
+    validateStringFormat(
+        DSL.week_of_year(functionProperties, arg),
+        String.format("week_of_year(%s)", expectedString),
+        expectedInteger);
+    validateStringFormat(
+        DSL.weekofyear(functionProperties, arg),
+        String.format("weekofyear(%s)", expectedString),
+        expectedInteger);
   }
 
+  // subtracting 1 as a temporary fix for year 2024.
+  // Issue: https://github.com/opensearch-project/sql/issues/2477
   @Test
-  public void testInvalidWeekOfYear() {
-    testNullMissingWeekOfYear(DATE);
-    testNullMissingWeekOfYear(DATETIME);
-    testNullMissingWeekOfYear(TIMESTAMP);
-    testNullMissingWeekOfYear(STRING);
-
-    when(nullRef.type()).thenReturn(INTEGER);
-    when(missingRef.type()).thenReturn(INTEGER);
-    assertEquals(nullValue(), eval(DSL.week_of_year(DSL.literal("2019-01-05"), nullRef)));
-    assertEquals(missingValue(), eval(DSL.week_of_year(DSL.literal("2019-01-05"), missingRef)));
-
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(INTEGER);
-    assertEquals(missingValue(), eval(DSL.week_of_year(nullRef, missingRef)));
-
-    //test invalid month
-    assertThrows(SemanticCheckException.class, () -> testWeekOfYear("2019-13-05 01:02:03", 0, 0));
-    //test invalid day
-    assertThrows(SemanticCheckException.class, () -> testWeekOfYear("2019-01-50 01:02:03", 0, 0));
-    //test invalid leap year
-    assertThrows(SemanticCheckException.class, () -> testWeekOfYear("2019-02-29 01:02:03", 0, 0));
+  public void testWeekOfYearWithTimeType() {
+    assertAll(
+        () ->
+            validateStringFormat(
+                DSL.week(
+                    functionProperties, DSL.literal(new ExprTimeValue("12:23:34")), DSL.literal(0)),
+                "week(TIME '12:23:34', 0)",
+                LocalDate.now(functionProperties.getQueryStartClock()).get(ALIGNED_WEEK_OF_YEAR)
+                    - 1),
+        () ->
+            validateStringFormat(
+                DSL.week_of_year(functionProperties, DSL.literal(new ExprTimeValue("12:23:34"))),
+                "week_of_year(TIME '12:23:34')",
+                LocalDate.now(functionProperties.getQueryStartClock()).get(ALIGNED_WEEK_OF_YEAR)
+                    - 1),
+        () ->
+            validateStringFormat(
+                DSL.weekofyear(functionProperties, DSL.literal(new ExprTimeValue("12:23:34"))),
+                "weekofyear(TIME '12:23:34')",
+                LocalDate.now(functionProperties.getQueryStartClock()).get(ALIGNED_WEEK_OF_YEAR)
+                    - 1));
   }
 
   @Test
-  public void testWeekOfYearAlternateArgumentFormats() {
-    lenient().when(nullRef.valueOf(env)).thenReturn(nullValue());
-    lenient().when(missingRef.valueOf(env)).thenReturn(missingValue());
-
-    FunctionExpression expression = DSL
-        .week_of_year(DSL.literal(new ExprTimestampValue("2019-01-05 01:02:03")));
-    assertEquals(INTEGER, expression.type());
-    assertEquals("week_of_year(TIMESTAMP '2019-01-05 01:02:03')", expression.toString());
-    assertEquals(integerValue(0), eval(expression));
-
-    expression = DSL.week_of_year(DSL.literal("2019-01-05"));
-    assertEquals(INTEGER, expression.type());
-    assertEquals("week_of_year(\"2019-01-05\")", expression.toString());
-    assertEquals(integerValue(0), eval(expression));
+  public void modeInUnsupportedFormat() {
+    FunctionExpression expression1 =
+        DSL.week(functionProperties, DSL.literal(new ExprDateValue("2019-01-05")), DSL.literal(8));
+    SemanticCheckException exception =
+        assertThrows(SemanticCheckException.class, () -> eval(expression1));
+    assertEquals("mode:8 is invalid, please use mode value between 0-7", exception.getMessage());
 
-    expression = DSL.week_of_year(DSL.literal("2019-01-05 00:01:00"));
-    assertEquals(INTEGER, expression.type());
-    assertEquals("week_of_year(\"2019-01-05 00:01:00\")", expression.toString());
-    assertEquals(integerValue(0), eval(expression));
+    FunctionExpression expression2 =
+        DSL.week(functionProperties, DSL.literal(new ExprDateValue("2019-01-05")), DSL.literal(-1));
+    exception = assertThrows(SemanticCheckException.class, () -> eval(expression2));
+    assertEquals("mode:-1 is invalid, please use mode value between 0-7", exception.getMessage());
   }
 
   @Test
-  public void testWeekOfYearDifferentModes() {
-    lenient().when(nullRef.valueOf(env)).thenReturn(nullValue());
-    lenient().when(missingRef.valueOf(env)).thenReturn(missingValue());
-
-    //Test the behavior of different modes passed into the 'week_of_year' function
-    testWeekOfYear("2019-01-05", 0, 0);
-    testWeekOfYear("2019-01-05", 1, 1);
-    testWeekOfYear("2019-01-05", 2, 52);
-    testWeekOfYear("2019-01-05", 3, 1);
-    testWeekOfYear("2019-01-05", 4, 1);
-    testWeekOfYear("2019-01-05", 5, 0);
-    testWeekOfYear("2019-01-05", 6, 1);
-    testWeekOfYear("2019-01-05", 7, 53);
-
-    testWeekOfYear("2019-01-06", 0, 1);
-    testWeekOfYear("2019-01-06", 1, 1);
-    testWeekOfYear("2019-01-06", 2, 1);
-    testWeekOfYear("2019-01-06", 3, 1);
-    testWeekOfYear("2019-01-06", 4, 2);
-    testWeekOfYear("2019-01-06", 5, 0);
-    testWeekOfYear("2019-01-06", 6, 2);
-    testWeekOfYear("2019-01-06", 7, 53);
-
-    testWeekOfYear("2019-01-07", 0, 1);
-    testWeekOfYear("2019-01-07", 1, 2);
-    testWeekOfYear("2019-01-07", 2, 1);
-    testWeekOfYear("2019-01-07", 3, 2);
-    testWeekOfYear("2019-01-07", 4, 2);
-    testWeekOfYear("2019-01-07", 5, 1);
-    testWeekOfYear("2019-01-07", 6, 2);
-    testWeekOfYear("2019-01-07", 7, 1);
-
-    testWeekOfYear("2000-01-01", 0, 0);
-    testWeekOfYear("2000-01-01", 2, 52);
-    testWeekOfYear("1999-12-31", 0, 52);
-
+  public void testInvalidWeekOfYear() {
+    assertAll(
+        // Test for WeekOfYear
+        // test invalid month
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> weekOfYearQuery("2019-13-05 01:02:03", 0, 0)),
+        // test invalid day
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> weekOfYearQuery("2019-01-50 01:02:03", 0, 0)),
+        // test invalid leap year
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> weekOfYearQuery("2019-02-29 01:02:03", 0, 0)),
+
+        // Test for Week_Of_Year
+        // test invalid month
+        () ->
+            assertThrows(
+                SemanticCheckException.class,
+                () -> weekOfYearUnderscoresQuery("2019-13-05 01:02:03", 0, 0)),
+        // test invalid day
+        () ->
+            assertThrows(
+                SemanticCheckException.class,
+                () -> weekOfYearUnderscoresQuery("2019-01-50 01:02:03", 0, 0)),
+        // test invalid leap year
+        () ->
+            assertThrows(
+                SemanticCheckException.class,
+                () -> weekOfYearUnderscoresQuery("2019-02-29 01:02:03", 0, 0)));
   }
 
   @Test
   public void weekOfYearModeInUnsupportedFormat() {
-    testNullMissingWeekOfYear(DATE);
-
-    FunctionExpression expression1 = DSL
-        .week_of_year(DSL.literal(new ExprDateValue("2019-01-05")), DSL.literal(8));
+    FunctionExpression expression1 =
+        DSL.week_of_year(
+            functionProperties, DSL.literal(new ExprDateValue("2019-01-05")), DSL.literal(8));
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class, () -> eval(expression1));
-    assertEquals("mode:8 is invalid, please use mode value between 0-7",
-        exception.getMessage());
+    assertEquals("mode:8 is invalid, please use mode value between 0-7", exception.getMessage());
 
-    FunctionExpression expression2 = DSL
-        .week_of_year(DSL.literal(new ExprDateValue("2019-01-05")), DSL.literal(-1));
+    FunctionExpression expression2 =
+        DSL.week_of_year(
+            functionProperties, DSL.literal(new ExprDateValue("2019-01-05")), DSL.literal(-1));
     exception = assertThrows(SemanticCheckException.class, () -> eval(expression2));
-    assertEquals("mode:-1 is invalid, please use mode value between 0-7",
-        exception.getMessage());
+    assertEquals("mode:-1 is invalid, please use mode value between 0-7", exception.getMessage());
   }
 
   @Test
   public void to_days() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.to_days(nullRef)));
-    assertEquals(missingValue(), eval(DSL.to_days(missingRef)));
-
     FunctionExpression expression = DSL.to_days(DSL.literal(new ExprDateValue("2008-10-07")));
     assertEquals(LONG, expression.type());
     assertEquals("to_days(DATE '2008-10-07')", expression.toString());
@@ -1219,11 +1394,6 @@ public void to_days() {
 
   @Test
   public void year() {
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.year(nullRef)));
-    assertEquals(missingValue(), eval(DSL.year(missingRef)));
-
     FunctionExpression expression = DSL.year(DSL.literal(new ExprDateValue("2020-08-07")));
     assertEquals(INTEGER, expression.type());
     assertEquals("year(DATE '2020-08-07')", expression.toString());
@@ -1244,45 +1414,155 @@ public void year() {
   public void date_format() {
     dateFormatTesters.forEach(this::testDateFormat);
     String timestamp = "1998-01-31 13:14:15.012345";
-    String timestampFormat = "%a %b %c %D %d %e %f %H %h %I %i %j %k %l %M "
-        + "%m %p %r %S %s %T %% %P";
-    String timestampFormatted = "Sat Jan 01 31st 31 31 12345 13 01 01 14 031 13 1 "
-        + "January 01 PM 01:14:15 PM 15 15 13:14:15 % P";
-
-    FunctionExpression expr = DSL.date_format(DSL.literal(timestamp), DSL.literal(timestampFormat));
+    String timestampFormat =
+        "%a %b %c %D %d %e %f %H %h %I %i %j %k %l %M " + "%m %p %r %S %s %T %% %P";
+    String timestampFormatted =
+        "Sat Jan 01 31st 31 31 012345 13 01 01 14 031 13 1 "
+            + "January 01 PM 01:14:15 PM 15 15 13:14:15 % P";
+
+    FunctionExpression expr =
+        DSL.date_format(functionProperties, DSL.literal(timestamp), DSL.literal(timestampFormat));
     assertEquals(STRING, expr.type());
     assertEquals(timestampFormatted, eval(expr).stringValue());
+  }
 
-    when(nullRef.type()).thenReturn(DATE);
-    when(missingRef.type()).thenReturn(DATE);
-    assertEquals(nullValue(), eval(DSL.date_format(nullRef, DSL.literal(""))));
-    assertEquals(missingValue(), eval(DSL.date_format(missingRef, DSL.literal(""))));
+  void testDateFormat(DateFormatTester dft) {
+    FunctionExpression expr = dft.getDateFormatExpression();
+    assertEquals(STRING, expr.type());
+    assertEquals(dft.getFormatted(), eval(expr).stringValue());
+  }
 
-    when(nullRef.type()).thenReturn(DATETIME);
-    when(missingRef.type()).thenReturn(DATETIME);
-    assertEquals(nullValue(), eval(DSL.date_format(nullRef, DSL.literal(""))));
-    assertEquals(missingValue(), eval(DSL.date_format(missingRef, DSL.literal(""))));
+  @Test
+  public void testDateFormatWithTimeType() {
+    FunctionExpression expr =
+        DSL.date_format(
+            functionProperties,
+            DSL.literal(new ExprTimeValue("12:23:34")),
+            DSL.literal(new ExprStringValue("%m %d")));
+
+    assertEquals(expr.toString(), "date_format(TIME '12:23:34', \"%m %d\")");
+    assertEquals(
+        LocalDateTime.now(functionProperties.getQueryStartClock())
+            .format(DateTimeFormatter.ofPattern("\"MM dd\"")),
+        eval(expr).toString());
+  }
 
-    when(nullRef.type()).thenReturn(TIMESTAMP);
-    when(missingRef.type()).thenReturn(TIMESTAMP);
-    assertEquals(nullValue(), eval(DSL.date_format(nullRef, DSL.literal(""))));
-    assertEquals(missingValue(), eval(DSL.date_format(missingRef, DSL.literal(""))));
+  @Test
+  public void testTimeFormatWithDateType() {
+    FunctionExpression expr =
+        DSL.time_format(
+            functionProperties,
+            DSL.literal(new ExprDateValue("2023-01-16")),
+            DSL.literal(new ExprStringValue("%h %s")));
+
+    assertEquals(expr.toString(), "time_format(DATE '2023-01-16', \"%h %s\")");
+    assertEquals("\"12 00\"", eval(expr).toString());
+  }
 
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(nullValue(), eval(DSL.date_format(nullRef, DSL.literal(""))));
-    assertEquals(missingValue(), eval(DSL.date_format(missingRef, DSL.literal(""))));
-    assertEquals(nullValue(), eval(DSL.date_format(DSL.literal(""), nullRef)));
-    assertEquals(missingValue(), eval(DSL.date_format(DSL.literal(""), missingRef)));
+  private static Stream<Arguments> getTestDataForTimeFormat() {
+    return Stream.of(
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%f"), "012345"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.002345"), DSL.literal("%f"), "002345"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012300"), DSL.literal("%f"), "012300"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%H"), "13"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%h"), "01"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%I"), "01"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%i"), "14"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%k"), "13"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%l"), "1"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%p"), "PM"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%r"), "01:14:15 PM"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%S"), "15"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%s"), "15"),
+        Arguments.of(DSL.literal("1998-01-31 13:14:15.012345"), DSL.literal("%T"), "13:14:15"),
+        Arguments.of(
+            DSL.literal("1998-01-31 13:14:15.012345"),
+            DSL.literal("%f %H %h %I %i %k %l %p %r %S %s %T"),
+            "012345 13 01 01 14 13 1 PM 01:14:15 PM 15 15 13:14:15"));
   }
 
-  void testDateFormat(DateFormatTester dft) {
-    FunctionExpression expr = dft.getDateFormatExpression();
+  private void timeFormatQuery(
+      LiteralExpression arg, LiteralExpression format, String expectedResult) {
+    FunctionExpression expr = DSL.time_format(functionProperties, arg, format);
     assertEquals(STRING, expr.type());
-    assertEquals(dft.getFormatted(), eval(expr).stringValue());
+    assertEquals(expectedResult, eval(expr).stringValue());
+  }
+
+  @ParameterizedTest(name = "{0}{1}")
+  @MethodSource("getTestDataForTimeFormat")
+  public void testTimeFormat(
+      LiteralExpression arg, LiteralExpression format, String expectedResult) {
+    timeFormatQuery(arg, format, expectedResult);
+  }
+
+  private static Stream<Arguments> getInvalidTestDataForTimeFormat() {
+    return Stream.of(
+        Arguments.of(DSL.literal("asdfasdf"), DSL.literal("%f")),
+        Arguments.of(DSL.literal("12345"), DSL.literal("%h")),
+        Arguments.of(DSL.literal("10:11:61"), DSL.literal("%h")),
+        Arguments.of(DSL.literal("10:61:12"), DSL.literal("%h")),
+        Arguments.of(DSL.literal("61:11:12"), DSL.literal("%h")));
+  }
+
+  @ParameterizedTest(name = "{0}{1}")
+  @MethodSource("getInvalidTestDataForTimeFormat")
+  public void testInvalidTimeFormat(LiteralExpression arg, LiteralExpression format) {
+    FunctionExpression expr = DSL.time_format(functionProperties, arg, format);
+    assertThrows(SemanticCheckException.class, () -> eval(expr));
+  }
+
+  private static Stream<Arguments> getInvalidTimeFormatHandlers() {
+    return Stream.of(
+        Arguments.of("%a"),
+        Arguments.of("%b"),
+        Arguments.of("%j"),
+        Arguments.of("%M"),
+        Arguments.of("%W"),
+        Arguments.of("%D"),
+        Arguments.of("%w"),
+        Arguments.of("%U"),
+        Arguments.of("%u"),
+        Arguments.of("%V"),
+        Arguments.of("%v"),
+        Arguments.of("%X"),
+        Arguments.of("%x"));
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("getInvalidTimeFormatHandlers")
+  public void testTimeFormatWithInvalidHandlers(String handler) {
+    FunctionExpression expr =
+        DSL.time_format(functionProperties, DSL.literal("12:23:34"), DSL.literal(handler));
+    assertEquals(ExprNullValue.of(), eval(expr));
+  }
+
+  @Test
+  public void testTimeFormatWithDateHandlers() {
+    FunctionExpression expr =
+        DSL.time_format(
+            functionProperties,
+            DSL.literal(new ExprDateValue("2023-01-17")),
+            DSL.literal("%c %d %e %m %Y %y"));
+    assertEquals("0 00 0 00 0000 00", eval(expr).stringValue());
+  }
+
+  @Test
+  public void testTimeFormatAndDateFormatReturnSameResult() {
+    FunctionExpression timeFormatExpr =
+        DSL.time_format(
+            functionProperties,
+            DSL.literal(new ExprDateValue("1998-01-31 13:14:15.012345")),
+            DSL.literal("%f %H %h %I %i %k %l %p %r %S %s %T"));
+    FunctionExpression dateFormatExpr =
+        DSL.date_format(
+            functionProperties,
+            DSL.literal(new ExprDateValue("1998-01-31 13:14:15.012345")),
+            DSL.literal("%f %H %h %I %i %k %l %p %r %S %s %T"));
+
+    assertEquals(eval(dateFormatExpr), eval(timeFormatExpr));
   }
 
   private ExprValue eval(Expression expression) {
-    return expression.valueOf(env);
+    return expression.valueOf();
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeTest.java
index b5e184dbf0..d857122534 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.datetime;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -16,45 +15,33 @@
 import java.time.format.DateTimeFormatter;
 import java.util.TimeZone;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.data.model.ExprDatetimeValue;
-import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.expression.DSL;
-import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ExpressionTestBase;
 import org.opensearch.sql.expression.FunctionExpression;
-import org.opensearch.sql.expression.env.Environment;
-
 
-
-@ExtendWith(MockitoExtension.class)
 class DateTimeTest extends ExpressionTestBase {
 
-  @Mock
-  Environment<Expression, ExprValue> env;
-
   @Test
   public void noTimeZoneNoField2() {
     FunctionExpression expr = DSL.datetime(DSL.literal("2008-05-15 22:00:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2008-05-15 22:00:00"), expr.valueOf(env));
+    assertEquals(new ExprDatetimeValue("2008-05-15 22:00:00"), expr.valueOf());
   }
 
   @Test
   public void positiveTimeZoneNoField2() {
     FunctionExpression expr = DSL.datetime(DSL.literal("2008-05-15 22:00:00+01:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2008-05-15 22:00:00"), expr.valueOf(env));
+    assertEquals(new ExprDatetimeValue("2008-05-15 22:00:00"), expr.valueOf());
   }
 
   @Test
   public void positiveField1WrittenField2() {
-    FunctionExpression expr = DSL.datetime(DSL.literal("2008-05-15 22:00:00+01:00"),
-        DSL.literal("America/Los_Angeles"));
+    FunctionExpression expr =
+        DSL.datetime(DSL.literal("2008-05-15 22:00:00+01:00"), DSL.literal("America/Los_Angeles"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2008-05-15 14:00:00"), expr.valueOf(env));
+    assertEquals(new ExprDatetimeValue("2008-05-15 14:00:00"), expr.valueOf());
   }
 
   // When no timezone argument is passed inside the datetime field, it assumes local time.
@@ -65,50 +52,51 @@ public void localDateTimeConversion() {
     String dt = "2008-05-15 22:00:00";
     String timeZone = "America/Los_Angeles";
     LocalDateTime timeConverted = LocalDateTime.parse(dt, formatter);
-    ZonedDateTime timeZoneLocal = timeConverted.atZone(ZoneId.of(TimeZone.getDefault().getID()))
-        .withZoneSameInstant(ZoneId.of(timeZone));
-    FunctionExpression expr = DSL.datetime(DSL.literal(dt),
-        DSL.literal(timeZone));
+    ZonedDateTime timeZoneLocal =
+        timeConverted
+            .atZone(ZoneId.of(TimeZone.getDefault().getID()))
+            .withZoneSameInstant(ZoneId.of(timeZone));
+    FunctionExpression expr = DSL.datetime(DSL.literal(dt), DSL.literal(timeZone));
     assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue(timeZoneLocal.toLocalDateTime()), expr.valueOf(env));
+    assertEquals(new ExprDatetimeValue(timeZoneLocal.toLocalDateTime()), expr.valueOf());
   }
 
   @Test
   public void negativeField1WrittenField2() {
-    FunctionExpression expr = DSL.datetime(DSL.literal("2008-05-15 22:00:00-11:00"),
-        DSL.literal("America/Los_Angeles"));
+    FunctionExpression expr =
+        DSL.datetime(DSL.literal("2008-05-15 22:00:00-11:00"), DSL.literal("America/Los_Angeles"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(new ExprDatetimeValue("2008-05-16 02:00:00"), expr.valueOf(env));
+    assertEquals(new ExprDatetimeValue("2008-05-16 02:00:00"), expr.valueOf());
   }
 
   @Test
   public void negativeField1PositiveField2() {
-    FunctionExpression expr = DSL.datetime(DSL.literal("2008-05-15 22:00:00-12:00"),
-        DSL.literal("+15:00"));
+    FunctionExpression expr =
+        DSL.datetime(DSL.literal("2008-05-15 22:00:00-12:00"), DSL.literal("+15:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void twentyFourHourDifference() {
-    FunctionExpression expr = DSL.datetime(DSL.literal("2008-05-15 22:00:00-14:00"),
-        DSL.literal("+10:00"));
+    FunctionExpression expr =
+        DSL.datetime(DSL.literal("2008-05-15 22:00:00-14:00"), DSL.literal("+10:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void negativeToNull() {
-    FunctionExpression expr = DSL.datetime(DSL.literal("2008-05-15 22:00:00-11:00"),
-        DSL.literal(nullValue()));
+    FunctionExpression expr =
+        DSL.datetime(DSL.literal("2008-05-15 22:00:00-11:00"), DSL.literal(nullValue()));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 
   @Test
   public void invalidDate() {
     FunctionExpression expr = DSL.datetime(DSL.literal("2008-04-31 22:00:00-11:00"));
     assertEquals(DATETIME, expr.type());
-    assertEquals(nullValue(), expr.valueOf(env));
+    assertEquals(nullValue(), expr.valueOf());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeTestBase.java b/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeTestBase.java
index 555759f1b1..023a3574aa 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeTestBase.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeTestBase.java
@@ -5,53 +5,89 @@
 
 package org.opensearch.sql.expression.datetime;
 
+import static org.opensearch.sql.data.model.ExprValueUtils.fromObjectValue;
+
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.temporal.Temporal;
 import java.util.List;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.data.model.ExprDateValue;
 import org.opensearch.sql.data.model.ExprDatetimeValue;
-import org.opensearch.sql.data.model.ExprMissingValue;
-import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprTimeValue;
 import org.opensearch.sql.data.model.ExprTimestampValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ExpressionTestBase;
 import org.opensearch.sql.expression.FunctionExpression;
-import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
-import org.opensearch.sql.expression.function.FunctionProperties;
 
-@ExtendWith(MockitoExtension.class)
 public class DateTimeTestBase extends ExpressionTestBase {
 
-  protected final BuiltinFunctionRepository functionRepository
-      = BuiltinFunctionRepository.getInstance();
+  protected final BuiltinFunctionRepository functionRepository =
+      BuiltinFunctionRepository.getInstance();
 
-  @Mock
-  protected Environment<Expression, ExprValue> env;
+  protected ExprValue eval(Expression expression) {
+    return expression.valueOf();
+  }
 
+  protected FunctionExpression adddate(Expression date, Expression interval) {
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.ADDDATE.getName(), List.of(date, interval));
+  }
 
-  protected static FunctionProperties functionProperties;
+  protected ExprValue adddate(Object first, Object interval) {
+    return adddate(DSL.literal(fromObjectValue(first)), DSL.literal(fromObjectValue(interval)))
+        .valueOf(null);
+  }
 
-  @BeforeAll
-  public static void setup() {
-    functionProperties = new FunctionProperties();
+  protected FunctionExpression addtime(Expression date, Expression interval) {
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.ADDTIME.getName(), List.of(date, interval));
   }
 
-  protected Expression nullRef = DSL.literal(ExprNullValue.of());
+  protected ExprValue addtime(Temporal first, Temporal second) {
+    return addtime(DSL.literal(fromObjectValue(first)), DSL.literal(fromObjectValue(second)))
+        .valueOf();
+  }
 
-  protected Expression missingRef = DSL.literal(ExprMissingValue.of());
+  protected FunctionExpression date_add(Expression date, Expression interval) {
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.DATE_ADD.getName(), List.of(date, interval));
+  }
 
-  protected ExprValue eval(Expression expression) {
-    return expression.valueOf(env);
+  protected ExprValue date_add(Object first, Object second) {
+    return date_add(DSL.literal(fromObjectValue(first)), DSL.literal(fromObjectValue(second)))
+        .valueOf(null);
+  }
+
+  protected FunctionExpression date_sub(Expression date, Expression interval) {
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.DATE_SUB.getName(), List.of(date, interval));
+  }
+
+  protected ExprValue date_sub(Object first, Object second) {
+    return date_sub(DSL.literal(fromObjectValue(first)), DSL.literal(fromObjectValue(second)))
+        .valueOf(null);
+  }
+
+  protected FunctionExpression datediff(Expression first, Expression second) {
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.DATEDIFF.getName(), List.of(first, second));
+  }
+
+  protected Long datediff(Temporal first, Temporal second) {
+    return datediff(DSL.literal(fromObjectValue(first)), DSL.literal(fromObjectValue(second)))
+        .valueOf()
+        .longValue();
   }
 
   protected LocalDateTime fromUnixTime(Double value) {
@@ -60,15 +96,16 @@ protected LocalDateTime fromUnixTime(Double value) {
 
   protected FunctionExpression fromUnixTime(Expression value) {
     return (FunctionExpression)
-        functionRepository.compile(functionProperties,
-            BuiltinFunctionName.FROM_UNIXTIME.getName(), List.of(value));
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.FROM_UNIXTIME.getName(), List.of(value));
   }
 
   protected FunctionExpression fromUnixTime(Expression value, Expression format) {
     return (FunctionExpression)
         functionRepository.compile(
             functionProperties,
-            BuiltinFunctionName.FROM_UNIXTIME.getName(), List.of(value, format));
+            BuiltinFunctionName.FROM_UNIXTIME.getName(),
+            List.of(value, format));
   }
 
   protected LocalDateTime fromUnixTime(Long value) {
@@ -76,63 +113,95 @@ protected LocalDateTime fromUnixTime(Long value) {
   }
 
   protected String fromUnixTime(Long value, String format) {
-    return fromUnixTime(DSL.literal(value), DSL.literal(format))
-        .valueOf().stringValue();
+    return fromUnixTime(DSL.literal(value), DSL.literal(format)).valueOf().stringValue();
   }
 
   protected String fromUnixTime(Double value, String format) {
-    return fromUnixTime(DSL.literal(value), DSL.literal(format))
-        .valueOf().stringValue();
+    return fromUnixTime(DSL.literal(value), DSL.literal(format)).valueOf().stringValue();
   }
 
   protected FunctionExpression maketime(Expression hour, Expression minute, Expression second) {
     return (FunctionExpression)
         functionRepository.compile(
             functionProperties,
-            BuiltinFunctionName.MAKETIME.getName(), List.of(hour, minute, second));
+            BuiltinFunctionName.MAKETIME.getName(),
+            List.of(hour, minute, second));
   }
 
-
   protected LocalTime maketime(Double hour, Double minute, Double second) {
     return maketime(DSL.literal(hour), DSL.literal(minute), DSL.literal(second))
-        .valueOf().timeValue();
+        .valueOf()
+        .timeValue();
   }
 
   protected FunctionExpression makedate(Expression year, Expression dayOfYear) {
-    return (FunctionExpression) functionRepository.compile(
-        functionProperties,
-        BuiltinFunctionName.MAKEDATE.getName(), List.of(year, dayOfYear));
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.MAKEDATE.getName(), List.of(year, dayOfYear));
   }
 
   protected LocalDate makedate(double year, double dayOfYear) {
-    return makedate(DSL.literal(year), DSL.literal(dayOfYear)).valueOf(null).dateValue();
+    return makedate(DSL.literal(year), DSL.literal(dayOfYear)).valueOf().dateValue();
   }
 
   protected FunctionExpression period_add(Expression period, Expression months) {
-    return (FunctionExpression) functionRepository.compile(
-        functionProperties,
-        BuiltinFunctionName.PERIOD_ADD.getName(), List.of(period, months));
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.PERIOD_ADD.getName(), List.of(period, months));
   }
 
   protected Integer period_add(Integer period, Integer months) {
-    return period_add(DSL.literal(period), DSL.literal(months))
-        .valueOf().integerValue();
+    return period_add(DSL.literal(period), DSL.literal(months)).valueOf().integerValue();
   }
 
   protected FunctionExpression period_diff(Expression first, Expression second) {
-    return (FunctionExpression) functionRepository.compile(
-        functionProperties,
-        BuiltinFunctionName.PERIOD_DIFF.getName(), List.of(first, second));
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.PERIOD_DIFF.getName(), List.of(first, second));
   }
 
   protected Integer period_diff(Integer first, Integer second) {
-    return period_diff(DSL.literal(first), DSL.literal(second))
-        .valueOf().integerValue();
+    return period_diff(DSL.literal(first), DSL.literal(second)).valueOf().integerValue();
+  }
+
+  protected FunctionExpression subdate(Expression date, Expression interval) {
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.SUBDATE.getName(), List.of(date, interval));
+  }
+
+  protected ExprValue subdate(Object first, Object interval) {
+    return subdate(DSL.literal(fromObjectValue(first)), DSL.literal(fromObjectValue(interval)))
+        .valueOf(null);
+  }
+
+  protected FunctionExpression subtime(Expression date, Expression interval) {
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.SUBTIME.getName(), List.of(date, interval));
+  }
+
+  protected ExprValue subtime(Temporal first, Temporal second) {
+    return subtime(DSL.literal(fromObjectValue(first)), DSL.literal(fromObjectValue(second)))
+        .valueOf();
+  }
+
+  protected FunctionExpression timediff(Expression first, Expression second) {
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.TIMEDIFF.getName(), List.of(first, second));
+  }
+
+  protected LocalTime timediff(LocalTime first, LocalTime second) {
+    return timediff(DSL.literal(new ExprTimeValue(first)), DSL.literal(new ExprTimeValue(second)))
+        .valueOf()
+        .timeValue();
   }
 
   protected FunctionExpression unixTimeStampExpr() {
-    return (FunctionExpression) functionRepository.compile(
-        functionProperties, BuiltinFunctionName.UNIX_TIMESTAMP.getName(), List.of());
+    return (FunctionExpression)
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.UNIX_TIMESTAMP.getName(), List.of());
   }
 
   protected Long unixTimeStamp() {
@@ -141,27 +210,23 @@ protected Long unixTimeStamp() {
 
   protected FunctionExpression unixTimeStampOf(Expression value) {
     return (FunctionExpression)
-        functionRepository.compile(functionProperties,
-            BuiltinFunctionName.UNIX_TIMESTAMP.getName(), List.of(value));
+        functionRepository.compile(
+            functionProperties, BuiltinFunctionName.UNIX_TIMESTAMP.getName(), List.of(value));
   }
 
-
   protected Double unixTimeStampOf(Double value) {
     return unixTimeStampOf(DSL.literal(value)).valueOf().doubleValue();
   }
 
   protected Double unixTimeStampOf(LocalDate value) {
-    return unixTimeStampOf(DSL.literal(new ExprDateValue(value)))
-        .valueOf().doubleValue();
+    return unixTimeStampOf(DSL.literal(new ExprDateValue(value))).valueOf().doubleValue();
   }
 
   protected Double unixTimeStampOf(LocalDateTime value) {
-    return unixTimeStampOf(DSL.literal(new ExprDatetimeValue(value)))
-        .valueOf().doubleValue();
+    return unixTimeStampOf(DSL.literal(new ExprDatetimeValue(value))).valueOf().doubleValue();
   }
 
   protected Double unixTimeStampOf(Instant value) {
-    return unixTimeStampOf(DSL.literal(new ExprTimestampValue(value)))
-        .valueOf().doubleValue();
+    return unixTimeStampOf(DSL.literal(new ExprTimestampValue(value))).valueOf().doubleValue();
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/ExtractTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/ExtractTest.java
new file mode 100644
index 0000000000..820158b722
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/ExtractTest.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opensearch.sql.data.type.ExprCoreType.LONG;
+
+import java.time.LocalDate;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.sql.data.model.ExprDateValue;
+import org.opensearch.sql.data.model.ExprDatetimeValue;
+import org.opensearch.sql.data.model.ExprTimeValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.ExpressionTestBase;
+import org.opensearch.sql.expression.FunctionExpression;
+
+class ExtractTest extends ExpressionTestBase {
+
+  private final String datetimeInput = "2023-02-11 10:11:12.123";
+
+  private final String timeInput = "10:11:12.123";
+
+  private final String dateInput = "2023-02-11";
+
+  private static Stream<Arguments> getDatetimeResultsForExtractFunction() {
+    return Stream.of(
+        Arguments.of("DAY_MICROSECOND", 11101112123000L),
+        Arguments.of("DAY_SECOND", 11101112),
+        Arguments.of("DAY_MINUTE", 111011),
+        Arguments.of("DAY_HOUR", 1110));
+  }
+
+  private static Stream<Arguments> getTimeResultsForExtractFunction() {
+    return Stream.of(
+        Arguments.of("MICROSECOND", 123000),
+        Arguments.of("SECOND", 12),
+        Arguments.of("MINUTE", 11),
+        Arguments.of("HOUR", 10),
+        Arguments.of("SECOND_MICROSECOND", 12123000),
+        Arguments.of("MINUTE_MICROSECOND", 1112123000),
+        Arguments.of("MINUTE_SECOND", 1112),
+        Arguments.of("HOUR_MICROSECOND", 101112123000L),
+        Arguments.of("HOUR_SECOND", 101112),
+        Arguments.of("HOUR_MINUTE", 1011));
+  }
+
+  private static Stream<Arguments> getDateResultsForExtractFunction() {
+    return Stream.of(
+        Arguments.of("DAY", 11),
+        Arguments.of("WEEK", 6),
+        Arguments.of("MONTH", 2),
+        Arguments.of("QUARTER", 1),
+        Arguments.of("YEAR", 2023),
+        Arguments.of("YEAR_MONTH", 202302));
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource({
+    "getDatetimeResultsForExtractFunction",
+    "getTimeResultsForExtractFunction",
+    "getDateResultsForExtractFunction"
+  })
+  public void testExtractWithDatetime(String part, long expected) {
+    FunctionExpression datetimeExpression =
+        DSL.extract(DSL.literal(part), DSL.literal(new ExprDatetimeValue(datetimeInput)));
+
+    assertEquals(LONG, datetimeExpression.type());
+    assertEquals(expected, eval(datetimeExpression).longValue());
+    assertEquals(
+        String.format("extract(\"%s\", DATETIME '2023-02-11 10:11:12.123')", part),
+        datetimeExpression.toString());
+  }
+
+  private void datePartWithTimeArgQuery(String part, String time, long expected) {
+    ExprTimeValue timeValue = new ExprTimeValue(time);
+    FunctionExpression datetimeExpression =
+        DSL.extract(functionProperties, DSL.literal(part), DSL.literal(timeValue));
+
+    assertEquals(LONG, datetimeExpression.type());
+    assertEquals(expected, eval(datetimeExpression).longValue());
+  }
+
+  @Test
+  public void testExtractDatePartWithTimeType() {
+    datePartWithTimeArgQuery(
+        "DAY", timeInput, LocalDate.now(functionProperties.getQueryStartClock()).getDayOfMonth());
+
+    datePartWithTimeArgQuery(
+        "WEEK",
+        timeInput,
+        LocalDate.now(functionProperties.getQueryStartClock()).get(ALIGNED_WEEK_OF_YEAR));
+
+    datePartWithTimeArgQuery(
+        "MONTH", timeInput, LocalDate.now(functionProperties.getQueryStartClock()).getMonthValue());
+
+    datePartWithTimeArgQuery(
+        "YEAR", timeInput, LocalDate.now(functionProperties.getQueryStartClock()).getYear());
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("getDateResultsForExtractFunction")
+  public void testExtractWithDate(String part, long expected) {
+    FunctionExpression datetimeExpression =
+        DSL.extract(DSL.literal(part), DSL.literal(new ExprDateValue(dateInput)));
+
+    assertEquals(LONG, datetimeExpression.type());
+    assertEquals(expected, eval(datetimeExpression).longValue());
+    assertEquals(
+        String.format("extract(\"%s\", DATE '2023-02-11')", part), datetimeExpression.toString());
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("getTimeResultsForExtractFunction")
+  public void testExtractWithTime(String part, long expected) {
+    FunctionExpression datetimeExpression =
+        DSL.extract(
+            functionProperties, DSL.literal(part), DSL.literal(new ExprTimeValue(timeInput)));
+
+    assertEquals(LONG, datetimeExpression.type());
+    assertEquals(expected, eval(datetimeExpression).longValue());
+    assertEquals(
+        String.format("extract(\"%s\", TIME '10:11:12.123')", part), datetimeExpression.toString());
+  }
+
+  private ExprValue eval(Expression expression) {
+    return expression.valueOf();
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/FromUnixTimeTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/FromUnixTimeTest.java
index 58387ef04f..8fcc6904b2 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/FromUnixTimeTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/FromUnixTimeTest.java
@@ -31,20 +31,21 @@ private static Stream<Arguments> getLongSamples() {
         Arguments.of(1L),
         Arguments.of(1447430881L),
         Arguments.of(2147483647L),
-        Arguments.of(1662577241L)
-    );
+        Arguments.of(1662577241L));
   }
 
   /**
    * Test processing different Long values.
+   *
    * @param value a value
    */
   @ParameterizedTest
   @MethodSource("getLongSamples")
   public void checkOfLong(Long value) {
-    assertEquals(LocalDateTime.of(1970, 1, 1, 0, 0, 0).plus(value, ChronoUnit.SECONDS),
-        fromUnixTime(value));
-    assertEquals(LocalDateTime.of(1970, 1, 1, 0, 0, 0).plus(value, ChronoUnit.SECONDS),
+    assertEquals(
+        LocalDateTime.of(1970, 1, 1, 0, 0, 0).plus(value, ChronoUnit.SECONDS), fromUnixTime(value));
+    assertEquals(
+        LocalDateTime.of(1970, 1, 1, 0, 0, 0).plus(value, ChronoUnit.SECONDS),
         eval(fromUnixTime(DSL.literal(new ExprLongValue(value)))).datetimeValue());
   }
 
@@ -54,12 +55,12 @@ private static Stream<Arguments> getDoubleSamples() {
         Arguments.of(100500.100500d),
         Arguments.of(1447430881.564d),
         Arguments.of(2147483647.451232d),
-        Arguments.of(1662577241.d)
-    );
+        Arguments.of(1662577241.d));
   }
 
   /**
    * Test processing different Double values.
+   *
    * @param value a value
    */
   @ParameterizedTest
@@ -70,11 +71,11 @@ public void checkOfDouble(Double value) {
     var valueAsString = new DecimalFormat("0.#").format(value);
 
     assertEquals(
-        LocalDateTime.ofEpochSecond(intPart, (int)Math.round(fracPart * 1E9), ZoneOffset.UTC),
+        LocalDateTime.ofEpochSecond(intPart, (int) Math.round(fracPart * 1E9), ZoneOffset.UTC),
         fromUnixTime(value),
         valueAsString);
     assertEquals(
-        LocalDateTime.ofEpochSecond(intPart, (int)Math.round(fracPart * 1E9), ZoneOffset.UTC),
+        LocalDateTime.ofEpochSecond(intPart, (int) Math.round(fracPart * 1E9), ZoneOffset.UTC),
         eval(fromUnixTime(DSL.literal(new ExprDoubleValue(value)))).datetimeValue(),
         valueAsString);
   }
@@ -88,11 +89,12 @@ private static Stream<Arguments> getLongSamplesWithFormat() {
         Arguments.of(1447430881L, "%s", "01"), // 2015-11-13 16:08:01, %s - second
         Arguments.of(2147483647L, "%T", "03:14:07"), // 2038-01-19 03:14:07, %T - time
         Arguments.of(1662577241L, "%d", "07") // 1662577241, %d - day of the month
-    );
+        );
   }
 
   /**
    * Test processing different Long values with format.
+   *
    * @param value a value
    * @param format a format
    * @param expected expected result
@@ -101,8 +103,11 @@ private static Stream<Arguments> getLongSamplesWithFormat() {
   @MethodSource("getLongSamplesWithFormat")
   public void checkOfLongWithFormat(Long value, String format, String expected) {
     assertEquals(expected, fromUnixTime(value, format));
-    assertEquals(expected, eval(fromUnixTime(DSL.literal(new ExprLongValue(value)),
-        DSL.literal(new ExprStringValue(format)))).stringValue());
+    assertEquals(
+        expected,
+        eval(fromUnixTime(
+                DSL.literal(new ExprLongValue(value)), DSL.literal(new ExprStringValue(format))))
+            .stringValue());
   }
 
   private static Stream<Arguments> getDoubleSamplesWithFormat() {
@@ -112,11 +117,12 @@ private static Stream<Arguments> getDoubleSamplesWithFormat() {
         Arguments.of(1447430881.56d, "%M", "November"), // 2015-11-13 16:08:01.56, %M - Month name
         Arguments.of(2147483647.42d, "%j", "019"), // 2038-01-19 03:14:07.42, %j - day of the year
         Arguments.of(1662577241.d, "%l", "7") // 2022-09-07 19:00:41, %l - 12 hour clock, no 0 pad
-    );
+        );
   }
 
   /**
    * Test processing different Double values with format.
+   *
    * @param value a value
    * @param format a format
    * @param expected expected result
@@ -125,16 +131,18 @@ private static Stream<Arguments> getDoubleSamplesWithFormat() {
   @MethodSource("getDoubleSamplesWithFormat")
   public void checkOfDoubleWithFormat(Double value, String format, String expected) {
     assertEquals(expected, fromUnixTime(value, format));
-    assertEquals(expected, eval(fromUnixTime(DSL.literal(new ExprDoubleValue(value)),
-        DSL.literal(new ExprStringValue(format)))).stringValue());
+    assertEquals(
+        expected,
+        eval(fromUnixTime(
+                DSL.literal(new ExprDoubleValue(value)), DSL.literal(new ExprStringValue(format))))
+            .stringValue());
   }
 
   @Test
   public void checkInvalidFormat() {
-    assertEquals(new ExprStringValue("q"),
-        fromUnixTime(DSL.literal(0L), DSL.literal("%q")).valueOf());
-    assertEquals(new ExprStringValue(""),
-        fromUnixTime(DSL.literal(0L), DSL.literal("")).valueOf());
+    assertEquals(
+        new ExprStringValue("q"), fromUnixTime(DSL.literal(0L), DSL.literal("%q")).valueOf());
+    assertEquals(new ExprStringValue(""), fromUnixTime(DSL.literal(0L), DSL.literal("")).valueOf());
   }
 
   @Test
@@ -153,33 +161,33 @@ public void checkInsideTheRangeWithoutFormat() {
 
   @Test
   public void checkValueOutsideOfTheRangeWithFormat() {
-    assertEquals(ExprNullValue.of(),
-        fromUnixTime(DSL.literal(32536771200L), DSL.literal("%d")).valueOf());
-    assertEquals(ExprNullValue.of(),
-        fromUnixTime(DSL.literal(32536771200d), DSL.literal("%d")).valueOf());
+    assertEquals(
+        ExprNullValue.of(), fromUnixTime(DSL.literal(32536771200L), DSL.literal("%d")).valueOf());
+    assertEquals(
+        ExprNullValue.of(), fromUnixTime(DSL.literal(32536771200d), DSL.literal("%d")).valueOf());
   }
 
   @Test
   public void checkInsideTheRangeWithFormat() {
-    assertNotEquals(ExprNullValue.of(),
-        fromUnixTime(DSL.literal(32536771199L), DSL.literal("%d")).valueOf());
-    assertNotEquals(ExprNullValue.of(),
-        fromUnixTime(DSL.literal(32536771199d), DSL.literal("%d")).valueOf());
+    assertNotEquals(
+        ExprNullValue.of(), fromUnixTime(DSL.literal(32536771199L), DSL.literal("%d")).valueOf());
+    assertNotEquals(
+        ExprNullValue.of(), fromUnixTime(DSL.literal(32536771199d), DSL.literal("%d")).valueOf());
   }
 
   @Test
   public void checkNullOrNegativeValues() {
     assertEquals(ExprNullValue.of(), fromUnixTime(DSL.literal(ExprNullValue.of())).valueOf());
-    assertEquals(ExprNullValue.of(),
-        fromUnixTime(DSL.literal(-1L), DSL.literal("%d")).valueOf());
-    assertEquals(ExprNullValue.of(),
-        fromUnixTime(DSL.literal(-1.5d), DSL.literal("%d")).valueOf());
-    assertEquals(ExprNullValue.of(),
+    assertEquals(ExprNullValue.of(), fromUnixTime(DSL.literal(-1L), DSL.literal("%d")).valueOf());
+    assertEquals(ExprNullValue.of(), fromUnixTime(DSL.literal(-1.5d), DSL.literal("%d")).valueOf());
+    assertEquals(
+        ExprNullValue.of(),
         fromUnixTime(DSL.literal(42L), DSL.literal(ExprNullValue.of())).valueOf());
-    assertEquals(ExprNullValue.of(),
+    assertEquals(
+        ExprNullValue.of(),
         fromUnixTime(DSL.literal(ExprNullValue.of()), DSL.literal("%d")).valueOf());
-    assertEquals(ExprNullValue.of(),
-        fromUnixTime(DSL.literal(ExprNullValue.of()), DSL.literal(ExprNullValue.of()))
-            .valueOf());
+    assertEquals(
+        ExprNullValue.of(),
+        fromUnixTime(DSL.literal(ExprNullValue.of()), DSL.literal(ExprNullValue.of())).valueOf());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/IntervalClauseTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/IntervalClauseTest.java
index 3e2d7f04cb..d89e5f978a 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/IntervalClauseTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/IntervalClauseTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.datetime;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,14 +30,11 @@
 
 @ExtendWith(MockitoExtension.class)
 public class IntervalClauseTest extends ExpressionTestBase {
-  @Mock
-  Environment<Expression, ExprValue> env;
+  @Mock Environment<Expression, ExprValue> env;
 
-  @Mock
-  Expression nullRef;
+  @Mock Expression nullRef;
 
-  @Mock
-  Expression missingRef;
+  @Mock Expression missingRef;
 
   @Test
   public void microsecond() {
@@ -72,7 +68,7 @@ public void hour() {
   public void day() {
     FunctionExpression expr = DSL.interval(DSL.literal(1), DSL.literal("day"));
     assertEquals(INTERVAL, expr.type());
-    assertEquals(intervalValue(Duration.ofDays(1)), expr.valueOf(env));
+    assertEquals(intervalValue(Period.ofDays(1)), expr.valueOf(env));
   }
 
   @Test
@@ -106,7 +102,9 @@ public void year() {
   @Test
   public void unsupported_unit() {
     FunctionExpression expr = DSL.interval(DSL.literal(1), DSL.literal("year_month"));
-    assertThrows(ExpressionEvaluationException.class, () -> expr.valueOf(env),
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> expr.valueOf(env),
         "interval unit year_month is not supported");
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/MakeDateTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/MakeDateTest.java
index 87cbc7ae48..b607d907db 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/MakeDateTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/MakeDateTest.java
@@ -3,12 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.datetime;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.when;
-import static org.opensearch.sql.data.model.ExprValueUtils.missingValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.nullValue;
 
 import java.time.LocalDate;
@@ -24,21 +21,32 @@ public class MakeDateTest extends DateTimeTestBase {
 
   @Test
   public void checkEdgeCases() {
-    assertEquals(LocalDate.ofYearDay(2002, 1), makedate(2001., 366.),
+    assertEquals(
+        LocalDate.ofYearDay(2002, 1),
+        makedate(2001., 366.),
         "No switch to the next year on getting 366th day of a non-leap year");
-    assertEquals(LocalDate.ofYearDay(2005, 1), makedate(2004., 367.),
+    assertEquals(
+        LocalDate.ofYearDay(2005, 1),
+        makedate(2004., 367.),
         "No switch to the next year on getting 367th day of a leap year");
-    assertEquals(LocalDate.ofYearDay(2000, 42), makedate(0., 42.),
+    assertEquals(
+        LocalDate.ofYearDay(2000, 42),
+        makedate(0., 42.),
         "0 year is not interpreted as 2000 as in MySQL");
-    assertEquals(nullValue(), eval(makedate(DSL.literal(-1.), DSL.literal(42.))),
+    assertEquals(
+        nullValue(),
+        eval(makedate(DSL.literal(-1.), DSL.literal(42.))),
         "Negative year doesn't produce NULL");
-    assertEquals(nullValue(), eval(makedate(DSL.literal(42.), DSL.literal(-1.))),
+    assertEquals(
+        nullValue(),
+        eval(makedate(DSL.literal(42.), DSL.literal(-1.))),
         "Negative dayOfYear doesn't produce NULL");
-    assertEquals(nullValue(), eval(makedate(DSL.literal(42.), DSL.literal(0.))),
+    assertEquals(
+        nullValue(),
+        eval(makedate(DSL.literal(42.), DSL.literal(0.))),
         "Zero dayOfYear doesn't produce NULL");
 
-    assertEquals(LocalDate.of(1999, 3, 1), makedate(1999., 60.),
-        "Got Feb 29th of a non-lear year");
+    assertEquals(LocalDate.of(1999, 3, 1), makedate(1999., 60.), "Got Feb 29th of a non-lear year");
     assertEquals(LocalDate.of(1999, 12, 31), makedate(1999., 365.));
     assertEquals(LocalDate.of(2004, 12, 31), makedate(2004., 366.));
   }
@@ -49,20 +57,6 @@ public void checkRounding() {
     assertEquals(LocalDate.of(43, 1, 2), makedate(42.50, 1.50));
   }
 
-  @Test
-  public void checkNullValues() {
-    assertEquals(nullValue(), eval(makedate(nullRef, DSL.literal(42.))));
-    assertEquals(nullValue(), eval(makedate(DSL.literal(42.), nullRef)));
-    assertEquals(nullValue(), eval(makedate(nullRef, nullRef)));
-  }
-
-  @Test
-  public void checkMissingValues() {
-    assertEquals(missingValue(), eval(makedate(missingRef, DSL.literal(42.))));
-    assertEquals(missingValue(), eval(makedate(DSL.literal(42.), missingRef)));
-    assertEquals(missingValue(), eval(makedate(missingRef, missingRef)));
-  }
-
   private static Stream<Arguments> getTestData() {
     return Stream.of(
         Arguments.of(3755.421154, 9.300720),
@@ -89,12 +83,12 @@ private static Stream<Arguments> getTestData() {
         Arguments.of(3617.452566, 619.795467),
         Arguments.of(2210.322073, 106.914268),
         Arguments.of(675.757974, 147.702828),
-        Arguments.of(1101.801820, 40.055318)
-    );
+        Arguments.of(1101.801820, 40.055318));
   }
 
   /**
    * Test function with given pseudo-random values.
+   *
    * @param year year
    * @param dayOfYear day of year
    */
@@ -104,20 +98,20 @@ public void checkRandomValues(double year, double dayOfYear) {
     LocalDate actual = makedate(year, dayOfYear);
     LocalDate expected = getReferenceValue(year, dayOfYear);
 
-    assertEquals(expected, actual,
-        String.format("year = %f, dayOfYear = %f", year, dayOfYear));
+    assertEquals(expected, actual, String.format("year = %f, dayOfYear = %f", year, dayOfYear));
   }
 
   /**
-   * Using another algorithm to get reference value.
-   * We should go to the next year until remaining @dayOfYear is bigger than 365/366.
+   * Using another algorithm to get reference value. We should go to the next year until
+   * remaining @dayOfYear is bigger than 365/366.
+   *
    * @param year Year.
    * @param dayOfYear Day of the year.
    * @return The calculated date.
    */
   private LocalDate getReferenceValue(double year, double dayOfYear) {
-    var yearL = (int)Math.round(year);
-    var dayL = (int)Math.round(dayOfYear);
+    var yearL = (int) Math.round(year);
+    var dayL = (int) Math.round(dayOfYear);
     while (true) {
       int daysInYear = Year.isLeap(yearL) ? 366 : 365;
       if (dayL > daysInYear) {
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/MakeTimeTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/MakeTimeTest.java
index 3fb2472c18..ff6896647d 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/MakeTimeTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/MakeTimeTest.java
@@ -3,13 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.datetime;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.when;
-import static org.opensearch.sql.data.model.ExprValueUtils.missingValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.nullValue;
 
 import java.time.Duration;
@@ -26,18 +23,27 @@ public class MakeTimeTest extends DateTimeTestBase {
 
   @Test
   public void checkEdgeCases() {
-    assertEquals(nullValue(), eval(maketime(DSL.literal(-1.), DSL.literal(42.), DSL.literal(42.))),
+    assertEquals(
+        nullValue(),
+        eval(maketime(DSL.literal(-1.), DSL.literal(42.), DSL.literal(42.))),
         "Negative hour doesn't produce NULL");
-    assertEquals(nullValue(), eval(maketime(DSL.literal(42.), DSL.literal(-1.), DSL.literal(42.))),
+    assertEquals(
+        nullValue(),
+        eval(maketime(DSL.literal(42.), DSL.literal(-1.), DSL.literal(42.))),
         "Negative minute doesn't produce NULL");
-    assertEquals(nullValue(), eval(maketime(DSL.literal(12.), DSL.literal(42.), DSL.literal(-1.))),
+    assertEquals(
+        nullValue(),
+        eval(maketime(DSL.literal(12.), DSL.literal(42.), DSL.literal(-1.))),
         "Negative second doesn't produce NULL");
 
-    assertThrows(DateTimeParseException.class,
+    assertThrows(
+        DateTimeParseException.class,
         () -> eval(maketime(DSL.literal(24.), DSL.literal(42.), DSL.literal(42.))));
-    assertThrows(DateTimeParseException.class,
+    assertThrows(
+        DateTimeParseException.class,
         () -> eval(maketime(DSL.literal(12.), DSL.literal(60.), DSL.literal(42.))));
-    assertThrows(DateTimeParseException.class,
+    assertThrows(
+        DateTimeParseException.class,
         () -> eval(maketime(DSL.literal(12.), DSL.literal(42.), DSL.literal(60.))));
 
     assertEquals(LocalTime.of(23, 59, 59), maketime(23., 59., 59.));
@@ -56,28 +62,6 @@ public void checkSecondFraction() {
     assertEquals(LocalTime.of(0, 0, 0).withNano(100502000), maketime(0., 0., 0.100502));
   }
 
-  @Test
-  public void checkNullValues() {
-    assertEquals(nullValue(), eval(maketime(nullRef, DSL.literal(42.), DSL.literal(42.))));
-    assertEquals(nullValue(), eval(maketime(DSL.literal(42.), nullRef, DSL.literal(42.))));
-    assertEquals(nullValue(), eval(maketime(DSL.literal(42.), DSL.literal(42.), nullRef)));
-    assertEquals(nullValue(), eval(maketime(nullRef, nullRef, DSL.literal(42.))));
-    assertEquals(nullValue(), eval(maketime(nullRef, DSL.literal(42.), nullRef)));
-    assertEquals(nullValue(), eval(maketime(nullRef, nullRef, nullRef)));
-    assertEquals(nullValue(), eval(maketime(DSL.literal(42.), nullRef, nullRef)));
-  }
-
-  @Test
-  public void checkMissingValues() {
-    assertEquals(missingValue(), eval(maketime(missingRef, DSL.literal(42.), DSL.literal(42.))));
-    assertEquals(missingValue(), eval(maketime(DSL.literal(42.), missingRef, DSL.literal(42.))));
-    assertEquals(missingValue(), eval(maketime(DSL.literal(42.), DSL.literal(42.), missingRef)));
-    assertEquals(missingValue(), eval(maketime(missingRef, missingRef, DSL.literal(42.))));
-    assertEquals(missingValue(), eval(maketime(missingRef, DSL.literal(42.), missingRef)));
-    assertEquals(missingValue(), eval(maketime(missingRef, missingRef, missingRef)));
-    assertEquals(missingValue(), eval(maketime(DSL.literal(42.), missingRef, missingRef)));
-  }
-
   private static Stream<Arguments> getTestData() {
     return Stream.of(
         Arguments.of(20., 30., 40.),
@@ -105,12 +89,12 @@ private static Stream<Arguments> getTestData() {
         Arguments.of(7.494112, 9.761983, 17.444988),
         Arguments.of(17.867756, 10.313120, 36.391815),
         Arguments.of(19.712155, 3.197562, 6.607233),
-        Arguments.of(2.385090, 41.761568, 33.342590)
-    );
+        Arguments.of(2.385090, 41.761568, 33.342590));
   }
 
   /**
    * Test function with given pseudo-random values.
+   *
    * @param hour hour
    * @param minute minute
    * @param second second
@@ -119,11 +103,15 @@ private static Stream<Arguments> getTestData() {
   @MethodSource("getTestData")
   public void checkRandomValues(double hour, double minute, double second) {
     // results could have 1 nanosec diff because of rounding FP
-    var expected = LocalTime.of((int)Math.round(hour), (int)Math.round(minute),
-        // pick fraction second part as nanos
-        (int)Math.floor(second)).withNano((int)((second % 1) * 1E9));
+    var expected =
+        LocalTime.of(
+                (int) Math.round(hour),
+                (int) Math.round(minute),
+                // pick fraction second part as nanos
+                (int) Math.floor(second))
+            .withNano((int) ((second % 1) * 1E9));
     var delta = Duration.between(expected, maketime(hour, minute, second)).getNano();
-    assertEquals(0, delta, 1,
-        String.format("hour = %f, minute = %f, second = %f", hour, minute, second));
+    assertEquals(
+        0, delta, 1, String.format("hour = %f, minute = %f, second = %f", hour, minute, second));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/NowLikeFunctionTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/NowLikeFunctionTest.java
index 6f7548b5cb..0e5c00084f 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/NowLikeFunctionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/NowLikeFunctionTest.java
@@ -3,27 +3,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.datetime;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opensearch.sql.data.type.ExprCoreType.DATE;
 import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
 import static org.opensearch.sql.data.type.ExprCoreType.TIME;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
 
-import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.Period;
+import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.Temporal;
 import java.time.temporal.TemporalUnit;
 import java.util.List;
-import java.util.concurrent.Callable;
+import java.util.TimeZone;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -42,11 +40,11 @@
 import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.function.FunctionProperties;
 
-
 class NowLikeFunctionTest extends ExpressionTestBase {
   @Test
   void now() {
-    test_now_like_functions(DSL::now,
+    test_now_like_functions(
+        DSL::now,
         DATETIME,
         false,
         () -> LocalDateTime.now(functionProperties.getQueryStartClock()));
@@ -54,19 +52,28 @@ void now() {
 
   @Test
   void current_timestamp() {
-    test_now_like_functions(DSL::current_timestamp, DATETIME, false,
+    test_now_like_functions(
+        DSL::current_timestamp,
+        DATETIME,
+        false,
         () -> LocalDateTime.now(functionProperties.getQueryStartClock()));
   }
 
   @Test
   void localtimestamp() {
-    test_now_like_functions(DSL::localtimestamp, DATETIME, false,
+    test_now_like_functions(
+        DSL::localtimestamp,
+        DATETIME,
+        false,
         () -> LocalDateTime.now(functionProperties.getQueryStartClock()));
   }
 
   @Test
   void localtime() {
-    test_now_like_functions(DSL::localtime, DATETIME, false,
+    test_now_like_functions(
+        DSL::localtime,
+        DATETIME,
+        false,
         () -> LocalDateTime.now(functionProperties.getQueryStartClock()));
   }
 
@@ -77,21 +84,21 @@ void sysdate() {
 
   @Test
   void curtime() {
-    test_now_like_functions(DSL::curtime, TIME, false,
-        () -> LocalTime.now(functionProperties.getQueryStartClock()));
+    test_now_like_functions(
+        DSL::curtime, TIME, false, () -> LocalTime.now(functionProperties.getQueryStartClock()));
   }
 
   @Test
   void currdate() {
 
-    test_now_like_functions(DSL::curdate,
-        DATE, false,
-        () -> LocalDate.now(functionProperties.getQueryStartClock()));
+    test_now_like_functions(
+        DSL::curdate, DATE, false, () -> LocalDate.now(functionProperties.getQueryStartClock()));
   }
 
   @Test
   void current_time() {
-    test_now_like_functions(DSL::current_time,
+    test_now_like_functions(
+        DSL::current_time,
         TIME,
         false,
         () -> LocalTime.now(functionProperties.getQueryStartClock()));
@@ -99,23 +106,51 @@ void current_time() {
 
   @Test
   void current_date() {
-    test_now_like_functions(DSL::current_date, DATE, false,
+    test_now_like_functions(
+        DSL::current_date,
+        DATE,
+        false,
         () -> LocalDate.now(functionProperties.getQueryStartClock()));
   }
 
+  @Test
+  void utc_date() {
+    test_now_like_functions(
+        DSL::utc_date, DATE, false, () -> utcDateTimeNow(functionProperties).toLocalDate());
+  }
+
+  @Test
+  void utc_time() {
+    test_now_like_functions(
+        DSL::utc_time, TIME, false, () -> utcDateTimeNow(functionProperties).toLocalTime());
+  }
+
+  @Test
+  void utc_timestamp() {
+    test_now_like_functions(
+        DSL::utc_timestamp, DATETIME, false, () -> utcDateTimeNow(functionProperties));
+  }
+
+  private static LocalDateTime utcDateTimeNow(FunctionProperties functionProperties) {
+    ZonedDateTime zonedDateTime =
+        LocalDateTime.now(functionProperties.getQueryStartClock())
+            .atZone(TimeZone.getDefault().toZoneId());
+    return zonedDateTime.withZoneSameInstant(UTC_ZONE_ID).toLocalDateTime();
+  }
+
   /**
    * Check how NOW-like functions are processed.
    *
-   * @param function        Function
-   * @param resType         Return type
-   * @param hasFsp          Whether function has fsp argument
+   * @param function Function
+   * @param resType Return type
+   * @param hasFsp Whether function has fsp argument
    * @param referenceGetter A callback to get reference value
    */
   void test_now_like_functions(
       BiFunction<FunctionProperties, Expression[], FunctionExpression> function,
-                               ExprCoreType resType,
-                               Boolean hasFsp,
-                               Supplier<Temporal> referenceGetter) {
+      ExprCoreType resType,
+      Boolean hasFsp,
+      Supplier<Temporal> referenceGetter) {
     // Check return types:
     // `func()`
     FunctionExpression expr = function.apply(functionProperties, new Expression[] {});
@@ -129,10 +164,15 @@ void test_now_like_functions(
       assertEquals(resType, expr.type());
 
       for (var wrongFspValue : List.of(-1, 10)) {
-        var exception = assertThrows(IllegalArgumentException.class,
-            () -> function.apply(functionProperties,
-                new Expression[] {DSL.literal(wrongFspValue)}).valueOf());
-        assertEquals(String.format("Invalid `fsp` value: %d, allowed 0 to 6", wrongFspValue),
+        var exception =
+            assertThrows(
+                IllegalArgumentException.class,
+                () ->
+                    function
+                        .apply(functionProperties, new Expression[] {DSL.literal(wrongFspValue)})
+                        .valueOf());
+        assertEquals(
+            String.format("Invalid `fsp` value: %d, allowed 0 to 6", wrongFspValue),
             exception.getMessage());
       }
     }
@@ -146,11 +186,9 @@ void test_now_like_functions(
     assertThat(sample, isCloseTo(reference, maxDiff, unit));
     if (hasFsp) {
       // `func(fsp)`
-      Temporal value = extractValue(function.apply(functionProperties,
-          new Expression[] {DSL.literal(0)}));
-      assertThat(referenceGetter.get(),
-          isCloseTo(value, maxDiff, unit));
-
+      Temporal value =
+          extractValue(function.apply(functionProperties, new Expression[] {DSL.literal(0)}));
+      assertThat(referenceGetter.get(), isCloseTo(value, maxDiff, unit));
     }
   }
 
@@ -158,7 +196,8 @@ static Matcher<Temporal> isCloseTo(Temporal reference, long maxDiff, TemporalUni
     return new BaseMatcher<>() {
       @Override
       public void describeTo(Description description) {
-        description.appendText("value between ")
+        description
+            .appendText("value between ")
             .appendValue(reference.minus(maxDiff, units))
             .appendText(" and ")
             .appendValue(reference.plus(maxDiff, units));
@@ -173,24 +212,21 @@ public boolean matches(Object value) {
         }
         return false;
       }
-
-
     };
   }
 
   @TestFactory
   Stream<DynamicTest> constantValueTestFactory() {
-    BiFunction<String, Function<FunctionProperties, FunctionExpression>, DynamicTest> buildTest
-        = (name, action) ->
-        DynamicTest.dynamicTest(
-          String.format("multiple_invocations_same_value_test[%s]", name),
-          () -> {
-            var v1 = extractValue(action.apply(functionProperties));
-            Thread.sleep(1000);
-            var v2 = extractValue(action.apply(functionProperties));
-            assertEquals(v1, v2);
-          }
-      );
+    BiFunction<String, Function<FunctionProperties, FunctionExpression>, DynamicTest> buildTest =
+        (name, action) ->
+            DynamicTest.dynamicTest(
+                String.format("multiple_invocations_same_value_test[%s]", name),
+                () -> {
+                  var v1 = extractValue(action.apply(functionProperties));
+                  Thread.sleep(1000);
+                  var v2 = extractValue(action.apply(functionProperties));
+                  assertEquals(v1, v2);
+                });
     return Stream.of(
         buildTest.apply("now", DSL::now),
         buildTest.apply("current_timestamp", DSL::current_timestamp),
@@ -198,8 +234,7 @@ Stream<DynamicTest> constantValueTestFactory() {
         buildTest.apply("curdate", DSL::curdate),
         buildTest.apply("curtime", DSL::curtime),
         buildTest.apply("localtimestamp", DSL::localtimestamp),
-        buildTest.apply("localtime", DSL::localtime)
-    );
+        buildTest.apply("localtime", DSL::localtime));
   }
 
   @Test
@@ -208,7 +243,6 @@ void sysdate_multiple_invocations_differ() throws InterruptedException {
     Thread.sleep(1000);
     var v2 = extractValue(DSL.sysdate(functionProperties));
     assertThat(v1, IsNot.not(isCloseTo(v2, 1, ChronoUnit.NANOS)));
-
   }
 
   private Temporal extractValue(FunctionExpression func) {
@@ -219,7 +253,7 @@ private Temporal extractValue(FunctionExpression func) {
         return func.valueOf().datetimeValue();
       case TIME:
         return func.valueOf().timeValue();
-      // unreachable code
+        // unreachable code
       default:
         throw new IllegalArgumentException(String.format("%s", func.type()));
     }
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/PeriodFunctionsTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/PeriodFunctionsTest.java
index bf228dd509..c6a6392c9b 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/PeriodFunctionsTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/PeriodFunctionsTest.java
@@ -18,6 +18,7 @@ public class PeriodFunctionsTest extends DateTimeTestBase {
 
   /**
    * Generate sample data for `PERIOD_ADD` function.
+   *
    * @return A data set.
    */
   public static Stream<Arguments> getTestDataForPeriodAdd() {
@@ -27,8 +28,7 @@ public static Stream<Arguments> getTestDataForPeriodAdd() {
         Arguments.of(3, -1, 200002), // Mar 2000 - 1
         Arguments.of(12, 0, 200012), // Dec 2000 + 0
         Arguments.of(6104, 100, 206908), // Apr 2061 + 100m (8y4m)
-        Arguments.of(201510, 14, 201612)
-    );
+        Arguments.of(201510, 14, 201612));
   }
 
   @ParameterizedTest
@@ -39,6 +39,7 @@ public void period_add_with_different_data(int period, int months, int expected)
 
   /**
    * Generate sample data for `PERIOD_DIFF` function.
+   *
    * @return A data set.
    */
   public static Stream<Arguments> getTestDataForPeriodDiff() {
@@ -51,7 +52,7 @@ public static Stream<Arguments> getTestDataForPeriodDiff() {
         Arguments.of(200505, 7505, 360), // May 2005 - May 1975
         Arguments.of(6104, 8509, 907), // Apr 2061 - Sep 1985
         Arguments.of(207707, 7707, 1200) // Jul 2077 - Jul 1977
-    );
+        );
   }
 
   @ParameterizedTest
@@ -68,29 +69,30 @@ public void two_way_conversion(int period1, int period2, int expected) {
 
   /**
    * Generate invalid sample data for test.
+   *
    * @return A data set.
    */
   public static Stream<Arguments> getInvalidTestData() {
     return Stream.of(
-      Arguments.of(0),
-      Arguments.of(123),
-      Arguments.of(100),
-      Arguments.of(1234),
-      Arguments.of(1000),
-      Arguments.of(2020),
-      Arguments.of(12345),
-      Arguments.of(123456),
-      Arguments.of(1234567),
-      Arguments.of(200213),
-      Arguments.of(200300),
-      Arguments.of(-1),
-      Arguments.of(-1234),
-      Arguments.of(-123401)
-    );
+        Arguments.of(0),
+        Arguments.of(123),
+        Arguments.of(100),
+        Arguments.of(1234),
+        Arguments.of(1000),
+        Arguments.of(2020),
+        Arguments.of(12345),
+        Arguments.of(123456),
+        Arguments.of(1234567),
+        Arguments.of(200213),
+        Arguments.of(200300),
+        Arguments.of(-1),
+        Arguments.of(-1234),
+        Arguments.of(-123401));
   }
 
   /**
    * Check that `PERIOD_ADD` and `PERIOD_DIFF` return NULL on invalid input.
+   *
    * @param period An invalid data.
    */
   @ParameterizedTest
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/StrToDateTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/StrToDateTest.java
new file mode 100644
index 0000000000..42d4aab1f6
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/StrToDateTest.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
+import static org.opensearch.sql.data.type.ExprCoreType.UNDEFINED;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.sql.data.model.ExprDatetimeValue;
+import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprStringValue;
+import org.opensearch.sql.data.model.ExprTimeValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.ExpressionTestBase;
+import org.opensearch.sql.expression.FunctionExpression;
+
+class StrToDateTest extends ExpressionTestBase {
+
+  private static Stream<Arguments> getTestDataForStrToDate() {
+    return Stream.of(
+        // Date arguments
+        Arguments.of(
+            "01,5,2013", "%d,%m,%Y", new ExprDatetimeValue("2013-05-01 00:00:00"), DATETIME),
+        Arguments.of(
+            "May 1, 2013", "%M %d, %Y", new ExprDatetimeValue("2013-05-01 00:00:00"), DATETIME),
+        Arguments.of(
+            "May 1, 2013 - 9,23,11",
+            "%M %d, %Y - %h,%i,%s",
+            new ExprDatetimeValue("2013-05-01 09:23:11"),
+            DATETIME),
+        Arguments.of(
+            "2000,1,1", "%Y,%m,%d", new ExprDatetimeValue("2000-01-01 00:00:00"), DATETIME),
+        Arguments.of(
+            "2000,1,1,10", "%Y,%m,%d,%h", new ExprDatetimeValue("2000-01-01 10:00:00"), DATETIME),
+        Arguments.of(
+            "2000,1,1,10,11",
+            "%Y,%m,%d,%h,%i",
+            new ExprDatetimeValue("2000-01-01 10:11:00"),
+            DATETIME),
+
+        // Invalid Arguments (should return null)
+        Arguments.of("a09:30:17", "a%h:%i:%s", ExprNullValue.of(), UNDEFINED),
+        Arguments.of("abc", "abc", ExprNullValue.of(), UNDEFINED),
+        Arguments.of("2000,1", "%Y,%m", ExprNullValue.of(), UNDEFINED),
+        Arguments.of("2000,1,10", "%Y,%m,%h", ExprNullValue.of(), UNDEFINED),
+        Arguments.of("2000,1,10,11", "%Y,%m,%h,%i", ExprNullValue.of(), UNDEFINED),
+        Arguments.of("9", "%m", ExprNullValue.of(), UNDEFINED),
+        Arguments.of("9", "%s", ExprNullValue.of(), UNDEFINED));
+  }
+
+  @ParameterizedTest(name = "{0} | {1}")
+  @MethodSource("getTestDataForStrToDate")
+  public void test_str_to_date(
+      String datetime, String format, ExprValue expectedResult, ExprCoreType expectedType) {
+
+    FunctionExpression expression =
+        DSL.str_to_date(
+            functionProperties,
+            DSL.literal(new ExprStringValue(datetime)),
+            DSL.literal(new ExprStringValue(format)));
+
+    ExprValue result = eval(expression);
+
+    assertEquals(expectedType, result.type());
+    assertEquals(expectedResult, result);
+  }
+
+  private static LocalDateTime getExpectedTimeResult(int hour, int minute, int seconds) {
+    return LocalDateTime.of(
+        LocalDate.now().getYear(),
+        LocalDate.now().getMonthValue(),
+        LocalDate.now().getDayOfMonth(),
+        hour,
+        minute,
+        seconds);
+  }
+
+  private static Stream<Arguments> getTestDataForStrToDateWithTime() {
+    return Stream.of(
+        Arguments.of("9,23,11", "%h,%i,%s"),
+        Arguments.of("2000,9,23,11", "%Y,%h,%i,%s"),
+        Arguments.of("2000,3,9,23,11", "%Y,%m,%h,%i,%s"));
+  }
+
+  @ParameterizedTest(name = "{1}")
+  @MethodSource("getTestDataForStrToDateWithTime")
+  public void test_str_to_date_with_time_type(String parsed, String format) {
+
+    FunctionExpression expression =
+        DSL.str_to_date(
+            functionProperties,
+            DSL.literal(new ExprStringValue(parsed)),
+            DSL.literal(new ExprStringValue(format)));
+
+    ExprValue result = eval(expression);
+
+    assertEquals(DATETIME, result.type());
+    assertEquals(getExpectedTimeResult(9, 23, 11), result.datetimeValue());
+  }
+
+  @Test
+  public void test_str_to_date_with_date_format() {
+
+    LocalDateTime arg = LocalDateTime.of(2023, 2, 27, 10, 11, 12);
+    String format = "%Y,%m,%d %h,%i,%s";
+
+    FunctionExpression dateFormatExpr =
+        DSL.date_format(
+            functionProperties,
+            DSL.literal(new ExprDatetimeValue(arg)),
+            DSL.literal(new ExprStringValue(format)));
+    String dateFormatResult = eval(dateFormatExpr).stringValue();
+
+    FunctionExpression strToDateExpr =
+        DSL.str_to_date(
+            functionProperties,
+            DSL.literal(new ExprStringValue(dateFormatResult)),
+            DSL.literal(new ExprStringValue(format)));
+    LocalDateTime strToDateResult = eval(strToDateExpr).datetimeValue();
+
+    assertEquals(arg, strToDateResult);
+  }
+
+  @Test
+  public void test_str_to_date_with_time_format() {
+    final int HOURS = 10;
+    final int MINUTES = 11;
+    final int SECONDS = 12;
+
+    LocalTime arg = LocalTime.of(HOURS, MINUTES, SECONDS);
+    String format = "%h,%i,%s";
+
+    FunctionExpression dateFormatExpr =
+        DSL.time_format(
+            functionProperties,
+            DSL.literal(new ExprTimeValue(arg)),
+            DSL.literal(new ExprStringValue(format)));
+    String timeFormatResult = eval(dateFormatExpr).stringValue();
+
+    FunctionExpression strToDateExpr =
+        DSL.str_to_date(
+            functionProperties,
+            DSL.literal(new ExprStringValue(timeFormatResult)),
+            DSL.literal(new ExprStringValue(format)));
+    LocalDateTime strToDateResult = eval(strToDateExpr).datetimeValue();
+
+    assertEquals(getExpectedTimeResult(HOURS, MINUTES, SECONDS), strToDateResult);
+  }
+
+  private ExprValue eval(Expression expression) {
+    return expression.valueOf();
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/TimeDiffTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/TimeDiffTest.java
new file mode 100644
index 0000000000..88218bc63c
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/TimeDiffTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.time.LocalTime;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.sql.data.model.ExprTimeValue;
+import org.opensearch.sql.expression.DSL;
+
+public class TimeDiffTest extends DateTimeTestBase {
+
+  private static Stream<Arguments> getTestData() {
+    return Stream.of(
+        Arguments.of(LocalTime.of(12, 42), LocalTime.of(7, 40), LocalTime.of(5, 2)),
+        Arguments.of(LocalTime.of(7, 40), LocalTime.of(12, 42), LocalTime.of(18, 58)),
+        Arguments.of(LocalTime.of(7, 40), LocalTime.of(7, 40), LocalTime.of(0, 0)),
+        Arguments.of(LocalTime.MAX, LocalTime.MIN, LocalTime.MAX));
+  }
+
+  /**
+   * Test `TIME_DIFF` function with different data.
+   *
+   * @param arg1 First argument.
+   * @param arg2 Second argument.
+   * @param expectedResult Expected result.
+   */
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void try_different_data(LocalTime arg1, LocalTime arg2, LocalTime expectedResult) {
+    assertEquals(expectedResult, timediff(arg1, arg2));
+    assertEquals(
+        expectedResult,
+        eval(timediff(DSL.literal(new ExprTimeValue(arg1)), DSL.literal(new ExprTimeValue(arg2))))
+            .timeValue());
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/TimeStampAddTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/TimeStampAddTest.java
new file mode 100644
index 0000000000..243eb6bb7b
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/TimeStampAddTest.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.sql.data.model.ExprDateValue;
+import org.opensearch.sql.data.model.ExprDatetimeValue;
+import org.opensearch.sql.data.model.ExprIntegerValue;
+import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprStringValue;
+import org.opensearch.sql.data.model.ExprTimeValue;
+import org.opensearch.sql.data.model.ExprTimestampValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.ExpressionTestBase;
+import org.opensearch.sql.expression.FunctionExpression;
+
+class TimeStampAddTest extends ExpressionTestBase {
+
+  private static Stream<Arguments> getTestDataForTimestampAdd() {
+    return Stream.of(
+        Arguments.of(
+            "MINUTE", 1, new ExprStringValue("2003-01-02 00:00:00"), "2003-01-02 00:01:00"),
+        Arguments.of("WEEK", 1, new ExprStringValue("2003-01-02 00:00:00"), "2003-01-09 00:00:00"),
+
+        // Date
+        Arguments.of("MINUTE", 1, new ExprDateValue("2003-01-02"), "2003-01-02 00:01:00"),
+        Arguments.of("WEEK", 1, new ExprDateValue("2003-01-02"), "2003-01-09 00:00:00"),
+
+        // Datetime
+        Arguments.of(
+            "MINUTE", 1, new ExprDatetimeValue("2003-01-02 00:00:00"), "2003-01-02 00:01:00"),
+        Arguments.of(
+            "WEEK", 1, new ExprDatetimeValue("2003-01-02 00:00:00"), "2003-01-09 00:00:00"),
+
+        // Timestamp
+        Arguments.of(
+            "MINUTE", 1, new ExprTimestampValue("2003-01-02 00:00:00"), "2003-01-02 00:01:00"),
+        Arguments.of(
+            "WEEK", 1, new ExprTimestampValue("2003-01-02 00:00:00"), "2003-01-09 00:00:00"),
+
+        // Cases surrounding leap year
+        Arguments.of(
+            "SECOND", 1, new ExprTimestampValue("2020-02-28 23:59:59"), "2020-02-29 00:00:00"),
+        Arguments.of(
+            "MINUTE", 1, new ExprTimestampValue("2020-02-28 23:59:59"), "2020-02-29 00:00:59"),
+        Arguments.of(
+            "HOUR", 1, new ExprTimestampValue("2020-02-28 23:59:59"), "2020-02-29 00:59:59"),
+        Arguments.of(
+            "DAY", 1, new ExprTimestampValue("2020-02-28 23:59:59"), "2020-02-29 23:59:59"),
+        Arguments.of(
+            "WEEK", 1, new ExprTimestampValue("2020-02-28 23:59:59"), "2020-03-06 23:59:59"),
+
+        // Cases surrounding end-of-year
+        Arguments.of(
+            "SECOND", 1, new ExprTimestampValue("2020-12-31 23:59:59"), "2021-01-01 00:00:00"),
+        Arguments.of(
+            "MINUTE", 1, new ExprTimestampValue("2020-12-31 23:59:59"), "2021-01-01 00:00:59"),
+        Arguments.of(
+            "HOUR", 1, new ExprTimestampValue("2020-12-31 23:59:59"), "2021-01-01 00:59:59"),
+        Arguments.of(
+            "DAY", 1, new ExprTimestampValue("2020-12-31 23:59:59"), "2021-01-01 23:59:59"),
+        Arguments.of(
+            "WEEK", 1, new ExprTimestampValue("2020-12-31 23:59:59"), "2021-01-07 23:59:59"),
+
+        // Test adding a month (including special cases)
+        Arguments.of("MONTH", 1, new ExprStringValue("2003-01-02 00:00:00"), "2003-02-02 00:00:00"),
+        Arguments.of("MONTH", 1, new ExprDateValue("2024-03-30"), "2024-04-30 00:00:00"),
+        Arguments.of("MONTH", 1, new ExprDateValue("2024-03-31"), "2024-04-30 00:00:00"),
+
+        // Test remaining interval types
+        Arguments.of(
+            "MICROSECOND",
+            123,
+            new ExprStringValue("2003-01-02 00:00:00"),
+            "2003-01-02 00:00:00.000123"),
+        Arguments.of(
+            "QUARTER", 1, new ExprStringValue("2003-01-02 00:00:00"), "2003-04-02 00:00:00"),
+        Arguments.of("YEAR", 1, new ExprStringValue("2003-01-02 00:00:00"), "2004-01-02 00:00:00"),
+
+        // Test negative value for amount (Test for all intervals)
+        Arguments.of(
+            "MICROSECOND",
+            -1,
+            new ExprStringValue("2000-01-01 00:00:00"),
+            "1999-12-31 23:59:59.999999"),
+        Arguments.of(
+            "SECOND", -1, new ExprStringValue("2000-01-01 00:00:00"), "1999-12-31 23:59:59"),
+        Arguments.of(
+            "MINUTE", -1, new ExprStringValue("2000-01-01 00:00:00"), "1999-12-31 23:59:00"),
+        Arguments.of("HOUR", -1, new ExprStringValue("2000-01-01 00:00:00"), "1999-12-31 23:00:00"),
+        Arguments.of("DAY", -1, new ExprStringValue("2000-01-01 00:00:00"), "1999-12-31 00:00:00"),
+        Arguments.of("WEEK", -1, new ExprStringValue("2000-01-01 00:00:00"), "1999-12-25 00:00:00"),
+        Arguments.of(
+            "MONTH", -1, new ExprStringValue("2000-01-01 00:00:00"), "1999-12-01 00:00:00"),
+        Arguments.of(
+            "QUARTER", -1, new ExprStringValue("2000-01-01 00:00:00"), "1999-10-01 00:00:00"),
+        Arguments.of(
+            "YEAR", -1, new ExprStringValue("2000-01-01 00:00:00"), "1999-01-01 00:00:00"));
+  }
+
+  private static FunctionExpression timestampaddQuery(
+      String unit, int amount, ExprValue datetimeExpr) {
+    return DSL.timestampadd(
+        DSL.literal(unit), DSL.literal(new ExprIntegerValue(amount)), DSL.literal(datetimeExpr));
+  }
+
+  @ParameterizedTest
+  @MethodSource("getTestDataForTimestampAdd")
+  public void testTimestampadd(String unit, int amount, ExprValue datetimeExpr, String expected) {
+    FunctionExpression expr = timestampaddQuery(unit, amount, datetimeExpr);
+    assertEquals(new ExprDatetimeValue(expected), eval(expr));
+  }
+
+  private static Stream<Arguments> getTestDataForTestAddingDatePartToTime() {
+    return Stream.of(
+        Arguments.of("DAY", 1, "10:11:12", LocalDate.now().plusDays(1)),
+        Arguments.of("DAY", 5, "10:11:12", LocalDate.now().plusDays(5)),
+        Arguments.of("DAY", 10, "10:11:12", LocalDate.now().plusDays(10)),
+        Arguments.of("DAY", -10, "10:11:12", LocalDate.now().plusDays(-10)),
+        Arguments.of("WEEK", 1, "10:11:12", LocalDate.now().plusWeeks(1)),
+        Arguments.of("WEEK", 5, "10:11:12", LocalDate.now().plusWeeks(5)),
+        Arguments.of("WEEK", 10, "10:11:12", LocalDate.now().plusWeeks(10)),
+        Arguments.of("WEEK", -10, "10:11:12", LocalDate.now().plusWeeks(-10)),
+        Arguments.of("MONTH", 1, "10:11:12", LocalDate.now().plusMonths(1)),
+        Arguments.of("MONTH", 5, "10:11:12", LocalDate.now().plusMonths(5)),
+        Arguments.of("MONTH", 10, "10:11:12", LocalDate.now().plusMonths(10)),
+        Arguments.of("MONTH", -10, "10:11:12", LocalDate.now().plusMonths(-10)),
+        Arguments.of("QUARTER", 1, "10:11:12", LocalDate.now().plusMonths(3 * 1)),
+        Arguments.of("QUARTER", 3, "10:11:12", LocalDate.now().plusMonths(3 * 3)),
+        Arguments.of("QUARTER", 5, "10:11:12", LocalDate.now().plusMonths(3 * 5)),
+        Arguments.of("QUARTER", -5, "10:11:12", LocalDate.now().plusMonths(3 * -5)),
+        Arguments.of("YEAR", 1, "10:11:12", LocalDate.now().plusYears(1)),
+        Arguments.of("YEAR", 5, "10:11:12", LocalDate.now().plusYears(5)),
+        Arguments.of("YEAR", 10, "10:11:12", LocalDate.now().plusYears(10)),
+        Arguments.of("YEAR", -10, "10:11:12", LocalDate.now().plusYears(-10)));
+  }
+
+  @ParameterizedTest
+  @MethodSource("getTestDataForTestAddingDatePartToTime")
+  public void testAddingDatePartToTime(
+      String interval, int addedInterval, String timeArg, LocalDate expectedDate) {
+    FunctionExpression expr =
+        DSL.timestampadd(
+            functionProperties,
+            DSL.literal(interval),
+            DSL.literal(new ExprIntegerValue(addedInterval)),
+            DSL.literal(new ExprTimeValue(timeArg)));
+
+    LocalDateTime expected1 = LocalDateTime.of(expectedDate, LocalTime.parse(timeArg));
+
+    assertEquals(new ExprDatetimeValue(expected1), eval(expr));
+  }
+
+  @Test
+  public void testAddingTimePartToTime() {
+    String interval = "MINUTE";
+    int addedInterval = 1;
+    String timeArg = "10:11:12";
+
+    FunctionExpression expr =
+        DSL.timestampadd(
+            functionProperties,
+            DSL.literal(interval),
+            DSL.literal(new ExprIntegerValue(addedInterval)),
+            DSL.literal(new ExprTimeValue(timeArg)));
+
+    LocalDateTime expected =
+        LocalDateTime.of(LocalDate.now(), LocalTime.parse(timeArg).plusMinutes(addedInterval));
+
+    assertEquals(new ExprDatetimeValue(expected), eval(expr));
+  }
+
+  @Test
+  public void testDifferentInputTypesHaveSameResult() {
+    String part = "SECOND";
+    int amount = 1;
+    FunctionExpression dateExpr = timestampaddQuery(part, amount, new ExprDateValue("2000-01-01"));
+
+    FunctionExpression stringExpr =
+        timestampaddQuery(part, amount, new ExprStringValue("2000-01-01 00:00:00"));
+
+    FunctionExpression datetimeExpr =
+        timestampaddQuery(part, amount, new ExprDatetimeValue("2000-01-01 00:00:00"));
+
+    FunctionExpression timestampExpr =
+        timestampaddQuery(part, amount, new ExprTimestampValue("2000-01-01 00:00:00"));
+
+    assertAll(
+        () -> assertEquals(eval(dateExpr), eval(stringExpr)),
+        () -> assertEquals(eval(dateExpr), eval(datetimeExpr)),
+        () -> assertEquals(eval(dateExpr), eval(timestampExpr)));
+  }
+
+  private static Stream<Arguments> getInvalidTestDataForTimestampAdd() {
+    return Stream.of(
+        Arguments.of("WEEK", 1, new ExprStringValue("2000-13-01")),
+        Arguments.of("WEEK", 1, new ExprStringValue("2000-01-40")));
+  }
+
+  @ParameterizedTest
+  @MethodSource("getInvalidTestDataForTimestampAdd")
+  public void testInvalidArguments(String interval, int amount, ExprValue datetimeExpr) {
+    FunctionExpression expr = timestampaddQuery(interval, amount, datetimeExpr);
+    assertThrows(SemanticCheckException.class, () -> eval(expr));
+  }
+
+  @Test
+  public void testNullReturnValue() {
+    FunctionExpression expr = timestampaddQuery("INVALID", 1, new ExprDateValue("2000-01-01"));
+    assertEquals(ExprNullValue.of(), eval(expr));
+  }
+
+  private ExprValue eval(Expression expression) {
+    return expression.valueOf();
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/TimeStampDiffTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/TimeStampDiffTest.java
new file mode 100644
index 0000000000..061420ceee
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/TimeStampDiffTest.java
@@ -0,0 +1,321 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.util.Arrays;
+import java.util.stream.Stream;
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.sql.data.model.ExprDateValue;
+import org.opensearch.sql.data.model.ExprDatetimeValue;
+import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprStringValue;
+import org.opensearch.sql.data.model.ExprTimeValue;
+import org.opensearch.sql.data.model.ExprTimestampValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.ExpressionTestBase;
+import org.opensearch.sql.expression.FunctionExpression;
+import org.opensearch.sql.expression.function.FunctionProperties;
+
+class TimeStampDiffTest extends ExpressionTestBase {
+
+  // Helper function to create an argument based on a passed in interval type
+  private static ExprValue generateArg(
+      String intervalType, String argType, LocalDateTime base, int added) {
+    LocalDateTime arg;
+    switch (intervalType) {
+      case "MICROSECOND":
+        arg = base.plusNanos(added * 1000);
+        break;
+      case "SECOND":
+        arg = base.plusSeconds(added);
+        break;
+      case "MINUTE":
+        arg = base.plusMinutes(added);
+        break;
+      case "HOUR":
+        arg = base.plusHours(added);
+        break;
+      case "DAY":
+        arg = base.plusDays(added);
+        break;
+      case "WEEK":
+        arg = base.plusWeeks(added);
+        break;
+      case "MONTH":
+        arg = base.plusMonths(added);
+        break;
+      case "QUARTER":
+        arg = base.plusMonths(added * 3);
+        break;
+      case "YEAR":
+        arg = base.plusYears(added);
+        break;
+      default:
+        throw new SemanticCheckException(
+            String.format("%s is not a valid interval type.", intervalType));
+    }
+
+    switch (argType) {
+      case "TIME":
+        return new ExprTimeValue(arg.toLocalTime());
+      case "TIMESTAMP":
+        return new ExprTimestampValue(arg.toInstant(ZoneOffset.UTC));
+      case "DATE":
+        return new ExprDateValue(arg.toLocalDate());
+      case "DATETIME":
+        return new ExprDatetimeValue(arg);
+      case "STRING":
+        return new ExprStringValue(
+            String.format(
+                "%04d-%02d-%02d %02d:%02d:%02d.%06d",
+                arg.getYear(),
+                arg.getMonthValue(),
+                arg.getDayOfMonth(),
+                arg.getHour(),
+                arg.getMinute(),
+                arg.getSecond(),
+                arg.getNano() / 1000));
+      default:
+        throw new SemanticCheckException(
+            String.format("%s is not a valid ExprCoreValueType.", argType));
+    }
+  }
+
+  // Generate test data to test all permutations for args (intervalType, arg1, arg2)
+  private static Stream<Arguments> getGeneralTestDataForTimestampDiff() {
+
+    // Needs to be initialized with a value to prevent a null pointer exception.
+    Stream<Arguments> testData =
+        Stream.of(
+            Arguments.of(
+                "DAY",
+                new ExprDateValue("2000-01-01 00:00:00"),
+                new ExprDateValue("2000-01-01"),
+                0));
+
+    final String[] timeIntervalTypes = {"MICROSECOND", "SECOND", "MINUTE", "HOUR"};
+
+    final String[] dateIntervalTypes = {"DAY", "WEEK", "MONTH", "QUARTER", "YEAR"};
+
+    final String[] intervalTypes = ArrayUtils.addAll(timeIntervalTypes, dateIntervalTypes);
+
+    // TIME type not included here as it is a special case handled by a different test
+    final String[] expressionTypes = {"DATE", "DATETIME", "TIMESTAMP", "STRING"};
+
+    final LocalDateTime baseDateTime = LocalDateTime.of(2000, 1, 1, 0, 0, 0);
+    final int intervalDifference = 5;
+
+    // Iterate through each permutation of argument
+    for (String intervalType : intervalTypes) {
+      for (String firstArgExpressionType : expressionTypes) {
+        for (String secondArgExpressionType : expressionTypes) {
+
+          ExprValue firstArg = generateArg(intervalType, firstArgExpressionType, baseDateTime, 0);
+          ExprValue secondArg =
+              generateArg(intervalType, secondArgExpressionType, baseDateTime, intervalDifference);
+
+          // If second arg is a DATE and you are using a unit of TIME to measure then expected is 0.
+          // The second arg is equal to baseDatetime in this case.
+          int expected =
+              (secondArgExpressionType == "DATE"
+                      && Arrays.asList(timeIntervalTypes).contains(intervalType))
+                  ? 0
+                  : intervalDifference;
+
+          testData =
+              Stream.concat(
+                  testData,
+                  Stream.of(
+                      Arguments.of(intervalType, firstArg, secondArg, expected),
+                      Arguments.of(intervalType, secondArg, firstArg, -expected)));
+        }
+      }
+    }
+
+    return testData;
+  }
+
+  private static Stream<Arguments> getCornerCaseTestDataForTimestampDiff() {
+    return Stream.of(
+
+        // Test around Leap Year
+        Arguments.of(
+            "DAY",
+            new ExprDatetimeValue("2019-02-28 00:00:00"),
+            new ExprDatetimeValue("2019-03-01 00:00:00"),
+            1),
+        Arguments.of(
+            "DAY",
+            new ExprDatetimeValue("2020-02-28 00:00:00"),
+            new ExprDatetimeValue("2020-03-01 00:00:00"),
+            2),
+
+        // Test around year change
+        Arguments.of(
+            "SECOND",
+            new ExprDatetimeValue("2019-12-31 23:59:59"),
+            new ExprDatetimeValue("2020-01-01 00:00:00"),
+            1),
+        Arguments.of(
+            "DAY",
+            new ExprDatetimeValue("2019-12-31 23:59:59"),
+            new ExprDatetimeValue("2020-01-01 00:00:00"),
+            0),
+        Arguments.of(
+            "DAY",
+            new ExprDatetimeValue("2019-12-31 00:00:00"),
+            new ExprDatetimeValue("2020-01-01 00:00:00"),
+            1));
+  }
+
+  private static FunctionExpression timestampdiffQuery(
+      FunctionProperties functionProperties,
+      String unit,
+      ExprValue datetimeExpr1,
+      ExprValue datetimeExpr2) {
+    return DSL.timestampdiff(
+        functionProperties,
+        DSL.literal(unit),
+        DSL.literal(datetimeExpr1),
+        DSL.literal(datetimeExpr2));
+  }
+
+  @ParameterizedTest
+  @MethodSource({"getGeneralTestDataForTimestampDiff", "getCornerCaseTestDataForTimestampDiff"})
+  public void testTimestampdiff(
+      String unit, ExprValue datetimeExpr1, ExprValue datetimeExpr2, long expected) {
+    FunctionExpression expr =
+        timestampdiffQuery(functionProperties, unit, datetimeExpr1, datetimeExpr2);
+    assertEquals(expected, eval(expr).longValue());
+  }
+
+  private static Stream<Arguments> getUnits() {
+    return Stream.of(
+        Arguments.of("MICROSECOND"),
+        Arguments.of("SECOND"),
+        Arguments.of("MINUTE"),
+        Arguments.of("HOUR"),
+        Arguments.of("DAY"),
+        Arguments.of("WEEK"),
+        Arguments.of("MONTH"),
+        Arguments.of("QUARTER"),
+        Arguments.of("YEAR"));
+  }
+
+  // Test that Time arg uses today's date with all interval/part arguments
+  @ParameterizedTest
+  @MethodSource("getUnits")
+  public void testTimestampDiffWithTimeType(String unit) {
+    LocalDateTime base = LocalDateTime.of(LocalDate.now(), LocalTime.of(10, 11, 12));
+
+    ExprValue timeExpr = generateArg(unit, "TIME", base, 0);
+    ExprValue timestampExpr = generateArg(unit, "TIMESTAMP", base, 0);
+    ExprValue dateExpr = generateArg(unit, "TIMESTAMP", base, 0);
+    ExprValue datetimeExpr = generateArg(unit, "TIMESTAMP", base, 0);
+    ExprValue stringExpr = generateArg(unit, "TIMESTAMP", base, 0);
+
+    ExprValue[] expressions = {timeExpr, timestampExpr, dateExpr, datetimeExpr, stringExpr};
+
+    for (ExprValue arg1 : expressions) {
+      for (ExprValue arg2 : expressions) {
+        FunctionExpression funcExpr = timestampdiffQuery(functionProperties, unit, arg1, arg2);
+
+        assertEquals(0L, eval(funcExpr).longValue());
+      }
+    }
+  }
+
+  private static Stream<Arguments> getTimestampDiffInvalidArgs() {
+    return Stream.of(
+        Arguments.of("SECOND", "2023-13-01 10:11:12", "2000-01-01 10:11:12"),
+        Arguments.of("SECOND", "2023-01-40 10:11:12", "2000-01-01 10:11:12"),
+        Arguments.of("SECOND", "2023-01-01 25:11:12", "2000-01-01 10:11:12"),
+        Arguments.of("SECOND", "2023-01-01 10:70:12", "2000-01-01 10:11:12"),
+        Arguments.of("SECOND", "2023-01-01 10:11:70", "2000-01-01 10:11:12"),
+        Arguments.of("SECOND", "2023-01-01 10:11:12", "2000-13-01 10:11:12"),
+        Arguments.of("SECOND", "2023-01-01 10:11:12", "2000-01-40 10:11:12"),
+        Arguments.of("SECOND", "2023-01-01 10:11:12", "2000-01-01 25:11:12"),
+        Arguments.of("SECOND", "2023-01-01 10:11:12", "2000-01-01 10:70:12"),
+        Arguments.of("SECOND", "2023-01-01 10:11:12", "2000-01-01 10:11:70"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("getTimestampDiffInvalidArgs")
+  public void testTimestampDiffWithInvalidTimeArgs(String unit, String arg1, String arg2) {
+    FunctionExpression expr =
+        timestampdiffQuery(
+            functionProperties, unit, new ExprStringValue(arg1), new ExprStringValue(arg2));
+    assertThrows(SemanticCheckException.class, () -> eval(expr));
+  }
+
+  @Test
+  public void testTimestampDiffWithInvalidPartReturnsNull() {
+    FunctionExpression expr =
+        timestampdiffQuery(
+            functionProperties,
+            "INVALID",
+            new ExprStringValue("2023-01-01 10:11:12"),
+            new ExprStringValue("2000-01-01 10:11:12"));
+    assertEquals(ExprNullValue.of(), eval(expr));
+  }
+
+  // Test that different input types have the same result
+  @Test
+  public void testDifferentInputTypesHaveSameResult() {
+    String part = "SECOND";
+    FunctionExpression dateExpr =
+        timestampdiffQuery(
+            functionProperties,
+            part,
+            new ExprDateValue("2000-01-01"),
+            new ExprDateValue("2000-01-02"));
+
+    FunctionExpression stringExpr =
+        timestampdiffQuery(
+            functionProperties,
+            part,
+            new ExprStringValue("2000-01-01 00:00:00"),
+            new ExprStringValue("2000-01-02 00:00:00"));
+
+    FunctionExpression datetimeExpr =
+        timestampdiffQuery(
+            functionProperties,
+            part,
+            new ExprDatetimeValue("2000-01-01 00:00:00"),
+            new ExprDatetimeValue("2000-01-02 00:00:00"));
+
+    FunctionExpression timestampExpr =
+        timestampdiffQuery(
+            functionProperties,
+            part,
+            new ExprTimestampValue("2000-01-01 00:00:00"),
+            new ExprTimestampValue("2000-01-02 00:00:00"));
+
+    assertAll(
+        () -> assertEquals(eval(dateExpr), eval(stringExpr)),
+        () -> assertEquals(eval(dateExpr), eval(datetimeExpr)),
+        () -> assertEquals(eval(dateExpr), eval(timestampExpr)));
+  }
+
+  private ExprValue eval(Expression expression) {
+    return expression.valueOf();
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/TimestampTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/TimestampTest.java
new file mode 100644
index 0000000000..7d25c0041b
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/TimestampTest.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.sql.data.model.ExprTimestampValue;
+import org.opensearch.sql.data.model.ExprValueUtils;
+import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.ExpressionTestBase;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+public class TimestampTest extends ExpressionTestBase {
+
+  @Test
+  public void timestamp_one_arg_string() {
+    var expr = DSL.timestamp(functionProperties, DSL.literal("1961-04-12 09:07:00"));
+    assertEquals(TIMESTAMP, expr.type());
+    assertEquals(new ExprTimestampValue("1961-04-12 09:07:00"), expr.valueOf());
+
+    expr = DSL.timestamp(functionProperties, DSL.literal("1961-04-12 09:07:00.123456"));
+    assertEquals(TIMESTAMP, expr.type());
+    assertEquals(LocalDateTime.of(1961, 4, 12, 9, 7, 0, 123456000), expr.valueOf().datetimeValue());
+  }
+
+  /**
+   * Check that `TIMESTAMP` function throws an exception on incorrect string input.
+   *
+   * @param value A value.
+   * @param testName A test name.
+   */
+  @ParameterizedTest(name = "{1}")
+  @CsvSource({
+    "1984-02-30 12:20:42, Feb 30th",
+    "1984-02-10 24:00:00, 24:00:00",
+    "84-02-10 12:20:42, 2 digit year"
+  })
+  public void timestamp_one_arg_string_invalid_format(String value, String testName) {
+    // exception thrown from ExprTimestampValue(String) CTOR
+    var exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> DSL.timestamp(functionProperties, DSL.literal(value)).valueOf());
+    assertEquals(
+        String.format(
+            "timestamp:%s in unsupported format, please " + "use 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
+            value),
+        exception.getMessage());
+  }
+
+  @Test
+  public void timestamp_one_arg_time() {
+    var expr = DSL.timestamp(functionProperties, DSL.time(DSL.literal("22:33:44")));
+    assertEquals(TIMESTAMP, expr.type());
+    var refValue = LocalDate.now().atTime(LocalTime.of(22, 33, 44)).atZone(UTC_ZONE_ID).toInstant();
+    assertEquals(new ExprTimestampValue(refValue), expr.valueOf());
+  }
+
+  @Test
+  public void timestamp_one_arg_date() {
+    var expr = DSL.timestamp(functionProperties, DSL.date(DSL.literal("2077-12-15")));
+    assertEquals(TIMESTAMP, expr.type());
+    var refValue = LocalDate.of(2077, 12, 15).atStartOfDay().atZone(UTC_ZONE_ID).toInstant();
+    assertEquals(new ExprTimestampValue(refValue), expr.valueOf());
+  }
+
+  @Test
+  public void timestamp_one_arg_datetime() {
+    var expr = DSL.timestamp(functionProperties, DSL.datetime(DSL.literal("1961-04-12 09:07:00")));
+    assertEquals(TIMESTAMP, expr.type());
+    assertEquals(LocalDateTime.of(1961, 4, 12, 9, 7, 0), expr.valueOf().datetimeValue());
+  }
+
+  @Test
+  public void timestamp_one_arg_timestamp() {
+    var refValue = new ExprTimestampValue(Instant.ofEpochSecond(10050042));
+    var expr =
+        DSL.timestamp(functionProperties, DSL.timestamp(functionProperties, DSL.literal(refValue)));
+    assertEquals(TIMESTAMP, expr.type());
+    assertEquals(refValue, expr.valueOf());
+  }
+
+  private static Instant dateTime2Instant(LocalDateTime dt) {
+    return dt.atZone(UTC_ZONE_ID).toInstant();
+  }
+
+  private static ExprTimestampValue dateTime2ExprTs(LocalDateTime dt) {
+    return new ExprTimestampValue(dateTime2Instant(dt));
+  }
+
+  private static Stream<Arguments> getTestData() {
+    var today = LocalDate.now();
+    // First argument of `TIMESTAMP` function, second argument and expected result value
+    return Stream.of(
+        // STRING and STRING/DATE/TIME/DATETIME/TIMESTAMP
+        Arguments.of(
+            "1961-04-12 09:07:00",
+            "2077-12-15 01:48:00",
+            dateTime2ExprTs(LocalDateTime.of(1961, 4, 12, 10, 55, 0))),
+        Arguments.of(
+            "1984-02-10 12:20:42",
+            LocalDate.of(2077, 12, 21),
+            dateTime2ExprTs(LocalDateTime.of(1984, 2, 10, 12, 20, 42))),
+        Arguments.of(
+            "1961-04-12 09:07:00",
+            LocalTime.of(1, 48),
+            dateTime2ExprTs(LocalDateTime.of(1961, 4, 12, 10, 55, 0))),
+        Arguments.of(
+            "2020-12-31 17:30:00",
+            LocalDateTime.of(2077, 12, 21, 12, 20, 42),
+            dateTime2ExprTs(LocalDateTime.of(2021, 1, 1, 5, 50, 42))),
+        Arguments.of(
+            "2020-12-31 17:30:00",
+            Instant.ofEpochSecond(42),
+            dateTime2ExprTs(LocalDateTime.of(2020, 12, 31, 17, 30, 42))),
+        // DATE and STRING/DATE/TIME/DATETIME/TIMESTAMP
+        Arguments.of(
+            LocalDate.of(2077, 12, 21),
+            "2077-12-15 01:48:00",
+            dateTime2ExprTs(LocalDateTime.of(2077, 12, 21, 1, 48, 0))),
+        Arguments.of(
+            LocalDate.of(2077, 12, 21),
+            LocalDate.of(1984, 2, 3),
+            dateTime2ExprTs(LocalDateTime.of(2077, 12, 21, 0, 0, 0))),
+        Arguments.of(
+            LocalDate.of(2077, 12, 21),
+            LocalTime.of(22, 33, 44),
+            dateTime2ExprTs(LocalDateTime.of(2077, 12, 21, 22, 33, 44))),
+        Arguments.of(
+            LocalDate.of(2077, 12, 21),
+            LocalDateTime.of(1999, 9, 9, 22, 33, 44),
+            dateTime2ExprTs(LocalDateTime.of(2077, 12, 21, 22, 33, 44))),
+        Arguments.of(
+            LocalDate.of(2077, 12, 21),
+            Instant.ofEpochSecond(42),
+            dateTime2ExprTs(LocalDateTime.of(2077, 12, 21, 0, 0, 42))),
+        // TIME and STRING/DATE/TIME/DATETIME/TIMESTAMP
+        Arguments.of(
+            LocalTime.of(9, 7, 0),
+            "2077-12-15 01:48:00",
+            dateTime2ExprTs(today.atTime(LocalTime.of(10, 55, 0)))),
+        Arguments.of(
+            LocalTime.of(12, 20, 42),
+            LocalDate.of(2077, 12, 21),
+            dateTime2ExprTs(today.atTime(LocalTime.of(12, 20, 42)))),
+        Arguments.of(
+            LocalTime.of(9, 7, 0),
+            LocalTime.of(1, 48),
+            dateTime2ExprTs(today.atTime(LocalTime.of(10, 55, 0)))),
+        Arguments.of(
+            LocalTime.of(17, 30, 0),
+            LocalDateTime.of(2077, 12, 21, 12, 20, 42),
+            dateTime2ExprTs(today.plusDays(1).atTime(LocalTime.of(5, 50, 42)))),
+        Arguments.of(
+            LocalTime.of(17, 30, 0),
+            Instant.ofEpochSecond(42),
+            dateTime2ExprTs(today.atTime(LocalTime.of(17, 30, 42)))),
+        // DATETIME and STRING/DATE/TIME/DATETIME/TIMESTAMP
+        Arguments.of(
+            LocalDateTime.of(1961, 4, 12, 9, 7, 0),
+            "2077-12-15 01:48:00",
+            dateTime2ExprTs(LocalDateTime.of(1961, 4, 12, 10, 55, 0))),
+        Arguments.of(
+            LocalDateTime.of(1984, 2, 10, 12, 20, 42),
+            LocalDate.of(2077, 12, 21),
+            dateTime2ExprTs(LocalDateTime.of(1984, 2, 10, 12, 20, 42))),
+        Arguments.of(
+            LocalDateTime.of(1961, 4, 12, 9, 7, 0),
+            LocalTime.of(1, 48),
+            dateTime2ExprTs(LocalDateTime.of(1961, 4, 12, 10, 55, 0))),
+        Arguments.of(
+            LocalDateTime.of(2020, 12, 31, 17, 30, 0),
+            LocalDateTime.of(2077, 12, 21, 12, 20, 42),
+            dateTime2ExprTs(LocalDateTime.of(2021, 1, 1, 5, 50, 42))),
+        Arguments.of(
+            LocalDateTime.of(2020, 12, 31, 17, 30, 0),
+            Instant.ofEpochSecond(42),
+            dateTime2ExprTs(LocalDateTime.of(2020, 12, 31, 17, 30, 42))),
+        // TIMESTAMP and STRING/DATE/TIME/DATETIME/TIMESTAMP
+        Arguments.of(
+            dateTime2Instant(LocalDateTime.of(1961, 4, 12, 9, 7, 0)),
+            "2077-12-15 01:48:00",
+            dateTime2ExprTs(LocalDateTime.of(1961, 4, 12, 10, 55, 0))),
+        Arguments.of(
+            dateTime2Instant(LocalDateTime.of(1984, 2, 10, 12, 20, 42)),
+            LocalDate.of(2077, 12, 21),
+            dateTime2ExprTs(LocalDateTime.of(1984, 2, 10, 12, 20, 42))),
+        Arguments.of(
+            dateTime2Instant(LocalDateTime.of(1961, 4, 12, 9, 7, 0)),
+            LocalTime.of(1, 48),
+            dateTime2ExprTs(LocalDateTime.of(1961, 4, 12, 10, 55, 0))),
+        Arguments.of(
+            dateTime2Instant(LocalDateTime.of(2020, 12, 31, 17, 30, 0)),
+            LocalDateTime.of(2077, 12, 21, 12, 20, 42),
+            dateTime2ExprTs(LocalDateTime.of(2021, 1, 1, 5, 50, 42))),
+        Arguments.of(
+            dateTime2Instant(LocalDateTime.of(2020, 12, 31, 17, 30, 0)),
+            Instant.ofEpochSecond(42),
+            dateTime2ExprTs(LocalDateTime.of(2020, 12, 31, 17, 30, 42))));
+  }
+
+  /**
+   * Test `TIMESTAMP` function which takes 2 arguments with input of different types.
+   *
+   * @param arg1 First argument to be passed to `TIMESTAMP` function.
+   * @param arg2 Second argument to be passed to `TIMESTAMP` function.
+   * @param expected The expected result.
+   */
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void timestamp_with_two_args(Object arg1, Object arg2, ExprTimestampValue expected) {
+    var expr =
+        DSL.timestamp(
+            functionProperties,
+            DSL.literal(ExprValueUtils.fromObjectValue(arg1)),
+            DSL.literal(ExprValueUtils.fromObjectValue(arg2)));
+    assertEquals(TIMESTAMP, expr.type());
+    assertEquals(expected, expr.valueOf());
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/ToSecondsTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/ToSecondsTest.java
new file mode 100644
index 0000000000..7aa824e61d
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/ToSecondsTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opensearch.sql.data.type.ExprCoreType.LONG;
+import static org.opensearch.sql.expression.datetime.DateTimeFunction.SECONDS_PER_DAY;
+
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.sql.data.model.ExprDateValue;
+import org.opensearch.sql.data.model.ExprDatetimeValue;
+import org.opensearch.sql.data.model.ExprIntervalValue;
+import org.opensearch.sql.data.model.ExprLongValue;
+import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprStringValue;
+import org.opensearch.sql.data.model.ExprTimeValue;
+import org.opensearch.sql.data.model.ExprTimestampValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.ExpressionTestBase;
+import org.opensearch.sql.expression.FunctionExpression;
+
+class ToSecondsTest extends ExpressionTestBase {
+
+  private static final long SECONDS_FROM_0001_01_01_TO_EPOCH_START = 62167219200L;
+
+  private static Stream<Arguments> getTestDataForToSeconds() {
+    return Stream.of(
+        Arguments.of(new ExprLongValue(101), new ExprLongValue(63113904000L)),
+        Arguments.of(new ExprLongValue(1030), new ExprLongValue(63140083200L)),
+        Arguments.of(new ExprLongValue(50101), new ExprLongValue(63271756800L)),
+        Arguments.of(new ExprLongValue(950501), new ExprLongValue(62966505600L)),
+        Arguments.of(new ExprLongValue(19950501), new ExprLongValue(62966505600L)),
+        Arguments.of(new ExprLongValue(9950501), ExprNullValue.of()),
+        Arguments.of(new ExprLongValue(-123L), ExprNullValue.of()),
+        Arguments.of(new ExprLongValue(1), ExprNullValue.of()),
+        Arguments.of(new ExprLongValue(919950501), ExprNullValue.of()),
+        Arguments.of(new ExprStringValue("2009-11-29 00:00:00"), new ExprLongValue(63426672000L)),
+        Arguments.of(new ExprStringValue("2009-11-29 13:43:32"), new ExprLongValue(63426721412L)),
+        Arguments.of(new ExprDateValue("2009-11-29"), new ExprLongValue(63426672000L)),
+        Arguments.of(new ExprDatetimeValue("2009-11-29 13:43:32"), new ExprLongValue(63426721412L)),
+        Arguments.of(
+            new ExprTimestampValue("2009-11-29 13:43:32"), new ExprLongValue(63426721412L)));
+  }
+
+  @ParameterizedTest
+  @MethodSource("getTestDataForToSeconds")
+  public void testToSeconds(ExprValue arg, ExprValue expected) {
+    FunctionExpression expr = DSL.to_seconds(DSL.literal(arg));
+    assertEquals(LONG, expr.type());
+    assertEquals(expected, eval(expr));
+  }
+
+  @Test
+  public void testToSecondsWithTimeType() {
+    FunctionExpression expr =
+        DSL.to_seconds(functionProperties, DSL.literal(new ExprTimeValue("10:11:12")));
+
+    long expected =
+        SECONDS_FROM_0001_01_01_TO_EPOCH_START
+            + LocalDate.now(functionProperties.getQueryStartClock())
+                .toEpochSecond(LocalTime.parse("10:11:12"), ZoneOffset.UTC);
+
+    assertEquals(expected, eval(expr).longValue());
+  }
+
+  private static Stream<Arguments> getInvalidTestDataForToSeconds() {
+    return Stream.of(
+        Arguments.of(new ExprStringValue("asdfasdf")),
+        Arguments.of(new ExprStringValue("2000-14-10")),
+        Arguments.of(new ExprStringValue("2000-10-45")),
+        Arguments.of(new ExprStringValue("2000-10-10 70:00:00")),
+        Arguments.of(new ExprStringValue("2000-10-10 00:70:00")),
+        Arguments.of(new ExprStringValue("2000-10-10 00:00:70")));
+  }
+
+  @ParameterizedTest
+  @MethodSource("getInvalidTestDataForToSeconds")
+  public void testToSecondsInvalidArg(ExprValue arg) {
+    FunctionExpression expr = DSL.to_seconds(DSL.literal(arg));
+    assertThrows(SemanticCheckException.class, () -> eval(expr));
+  }
+
+  @Test
+  public void testToSecondsWithDateAdd() {
+    LocalDate date = LocalDate.of(2000, 1, 1);
+    FunctionExpression dateExpr = DSL.to_seconds(DSL.literal(new ExprDateValue(date)));
+    long addedSeconds = SECONDS_PER_DAY;
+    long expected = eval(dateExpr).longValue() + addedSeconds;
+
+    FunctionExpression dateAddExpr =
+        DSL.date_add(
+            DSL.literal(new ExprDateValue(date)),
+            DSL.literal(new ExprIntervalValue(Duration.ofSeconds(addedSeconds))));
+
+    long result = eval(DSL.to_seconds(DSL.literal(eval(dateAddExpr)))).longValue();
+
+    assertEquals(expected, result);
+  }
+
+  private ExprValue eval(Expression expression) {
+    return expression.valueOf();
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/UnixTimeStampTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/UnixTimeStampTest.java
index f6e24f4e27..c979b68302 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/UnixTimeStampTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/UnixTimeStampTest.java
@@ -43,19 +43,20 @@ private static Stream<Arguments> getDateSamples() {
         Arguments.of(LocalDate.of(1999, 12, 31)),
         Arguments.of(LocalDate.of(2004, 2, 29)),
         Arguments.of(LocalDate.of(2100, 2, 28)),
-        Arguments.of(LocalDate.of(2012, 2, 21))
-    );
+        Arguments.of(LocalDate.of(2012, 2, 21)));
   }
 
   /**
    * Check processing valid values of type LocalDate.
+   *
    * @param value a value
    */
   @ParameterizedTest
   @MethodSource("getDateSamples")
   public void checkOfDate(LocalDate value) {
     assertEquals(value.getLong(ChronoField.EPOCH_DAY) * 24 * 3600, unixTimeStampOf(value));
-    assertEquals(value.getLong(ChronoField.EPOCH_DAY) * 24 * 3600,
+    assertEquals(
+        value.getLong(ChronoField.EPOCH_DAY) * 24 * 3600,
         eval(unixTimeStampOf(DSL.literal(new ExprDateValue(value)))).longValue());
   }
 
@@ -66,36 +67,39 @@ private static Stream<Arguments> getDateTimeSamples() {
         Arguments.of(LocalDateTime.of(1999, 12, 31, 23, 59)),
         Arguments.of(LocalDateTime.of(2004, 2, 29, 7, 40)),
         Arguments.of(LocalDateTime.of(2100, 2, 28, 13, 14)),
-        Arguments.of(LocalDateTime.of(2012, 2, 21, 0, 0))
-    );
+        Arguments.of(LocalDateTime.of(2012, 2, 21, 0, 0)));
   }
 
   /**
    * Check processing valid values of type LocalDateTime.
+   *
    * @param value a value
    */
   @ParameterizedTest
   @MethodSource("getDateTimeSamples")
   public void checkOfDateTime(LocalDateTime value) {
     assertEquals(value.toEpochSecond(ZoneOffset.UTC), unixTimeStampOf(value));
-    assertEquals(value.toEpochSecond(ZoneOffset.UTC),
+    assertEquals(
+        value.toEpochSecond(ZoneOffset.UTC),
         eval(unixTimeStampOf(DSL.literal(new ExprDatetimeValue(value)))).longValue());
   }
 
   private static Stream<Arguments> getInstantSamples() {
     return getDateTimeSamples()
-        .map(v -> Arguments.of(((LocalDateTime)v.get()[0]).toInstant(ZoneOffset.UTC)));
+        .map(v -> Arguments.of(((LocalDateTime) v.get()[0]).toInstant(ZoneOffset.UTC)));
   }
 
   /**
    * Check processing valid values of type Instant.
+   *
    * @param value a value
    */
   @ParameterizedTest
   @MethodSource("getInstantSamples")
   public void checkOfInstant(Instant value) {
     assertEquals(value.getEpochSecond(), unixTimeStampOf(value));
-    assertEquals(value.getEpochSecond(),
+    assertEquals(
+        value.getEpochSecond(),
         eval(unixTimeStampOf(DSL.literal(new ExprTimestampValue(value)))).longValue());
   }
 
@@ -104,17 +108,17 @@ public void checkOfInstant(Instant value) {
   private static Stream<Arguments> getDoubleSamples() {
     return Stream.of(
         Arguments.of(840101d, LocalDateTime.of(1984, 1, 1, 0, 0, 0)),
-        Arguments.of(840101112233d, LocalDateTime.of(1984, 1, 1, 11,22,33)),
+        Arguments.of(840101112233d, LocalDateTime.of(1984, 1, 1, 11, 22, 33)),
         Arguments.of(840101112233.123456, LocalDateTime.of(1984, 1, 1, 11, 22, 33, 123456000)),
         Arguments.of(19840101d, LocalDateTime.of(1984, 1, 1, 0, 0, 0)),
         Arguments.of(19840101000000d, LocalDateTime.of(1984, 1, 1, 0, 0, 0)),
-        Arguments.of(19840101112233d, LocalDateTime.of(1984, 1, 1, 11,22,33)),
-        Arguments.of(19840101112233.123456, LocalDateTime.of(1984, 1, 1, 11, 22, 33, 123456000))
-    );
+        Arguments.of(19840101112233d, LocalDateTime.of(1984, 1, 1, 11, 22, 33)),
+        Arguments.of(19840101112233.123456, LocalDateTime.of(1984, 1, 1, 11, 22, 33, 123456000)));
   }
 
   /**
    * Check processing valid Double values.
+   *
    * @param valueAsDouble a value
    * @param valueAsLDT the value as LocalDateTime
    */
@@ -122,11 +126,13 @@ private static Stream<Arguments> getDoubleSamples() {
   @MethodSource("getDoubleSamples")
   public void checkOfDoubleFormats(Double valueAsDouble, LocalDateTime valueAsLDT) {
     var valueAsStr = new DecimalFormat("0.#").format(valueAsDouble);
-    assertEquals(valueAsLDT.toEpochSecond(ZoneOffset.UTC),
-        unixTimeStampOf(valueAsDouble), 1d, valueAsStr);
-    assertEquals(valueAsLDT.toEpochSecond(ZoneOffset.UTC),
+    assertEquals(
+        valueAsLDT.toEpochSecond(ZoneOffset.UTC), unixTimeStampOf(valueAsDouble), 1d, valueAsStr);
+    assertEquals(
+        valueAsLDT.toEpochSecond(ZoneOffset.UTC),
         eval(unixTimeStampOf(DSL.literal(new ExprDoubleValue(valueAsDouble)))).longValue(),
-        1d, valueAsStr);
+        1d,
+        valueAsStr);
   }
 
   @Test
@@ -165,7 +171,7 @@ public void checkMaxValue() {
 
   private static Stream<Arguments> getInvalidDoubleSamples() {
     return Stream.of(
-        //invalid dates
+        // invalid dates
         Arguments.of(19990231.d),
         Arguments.of(19991320.d),
         Arguments.of(19991232.d),
@@ -181,7 +187,7 @@ private static Stream<Arguments> getInvalidDoubleSamples() {
         Arguments.of(9912.d),
         Arguments.of(199912.d),
         Arguments.of(1999102.d),
-        //same as above, but with valid time
+        // same as above, but with valid time
         Arguments.of(19990231112233.d),
         Arguments.of(19991320112233.d),
         Arguments.of(19991232112233.d),
@@ -197,7 +203,7 @@ private static Stream<Arguments> getInvalidDoubleSamples() {
         Arguments.of(9912112233.d),
         Arguments.of(199912112233.d),
         Arguments.of(1999102112233.d),
-        //invalid time
+        // invalid time
         Arguments.of(19840101242233.d),
         Arguments.of(19840101116033.d),
         Arguments.of(19840101112260.d),
@@ -206,7 +212,7 @@ private static Stream<Arguments> getInvalidDoubleSamples() {
         Arguments.of(19840101123.d),
         Arguments.of(1984010113.d),
         Arguments.of(198401011.d),
-        //same, but with short date
+        // same, but with short date
         Arguments.of(840101242233.d),
         Arguments.of(840101116033.d),
         Arguments.of(840101112260.d),
@@ -214,23 +220,24 @@ private static Stream<Arguments> getInvalidDoubleSamples() {
         Arguments.of(8401011123.d),
         Arguments.of(840101123.d),
         Arguments.of(8401011.d),
-        //misc
+        // misc
         Arguments.of(0d),
         Arguments.of(-1d),
         Arguments.of(42d),
-        //too many digits
-        Arguments.of(199902201122330d)
-    );
+        // too many digits
+        Arguments.of(199902201122330d));
   }
 
   /**
    * Check processing invalid Double values.
+   *
    * @param value a value
    */
   @ParameterizedTest
   @MethodSource("getInvalidDoubleSamples")
   public void checkInvalidDoubleCausesNull(Double value) {
-    assertEquals(ExprNullValue.of(),
+    assertEquals(
+        ExprNullValue.of(),
         unixTimeStampOf(DSL.literal(new ExprDoubleValue(value))).valueOf(),
         new DecimalFormat("0.#").format(value));
   }
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/UnixTwoWayConversionTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/UnixTwoWayConversionTest.java
index cb4d318eb3..c74b062fba 100644
--- a/core/src/test/java/org/opensearch/sql/expression/datetime/UnixTwoWayConversionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/UnixTwoWayConversionTest.java
@@ -3,13 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.datetime;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
 
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -33,8 +32,7 @@ public void checkConvertNow_with_eval() {
   }
 
   private LocalDateTime getExpectedNow() {
-    return LocalDateTime.now(
-            functionProperties.getQueryStartClock().withZone(ZoneId.of("UTC")))
+    return LocalDateTime.now(functionProperties.getQueryStartClock().withZone(UTC_ZONE_ID))
         .withNano(0);
   }
 
@@ -44,23 +42,25 @@ private static Stream<Arguments> getDoubleSamples() {
         Arguments.of(100500.100500d),
         Arguments.of(1447430881.564d),
         Arguments.of(2147483647.451232d),
-        Arguments.of(1662577241.d)
-    );
+        Arguments.of(1662577241.d));
   }
 
   /**
    * Test converting valid Double values EpochTime -> DateTime -> EpochTime.
+   *
    * @param value a value
    */
   @ParameterizedTest
   @MethodSource("getDoubleSamples")
   public void convertEpoch2DateTime2Epoch(Double value) {
     assertEquals(value, unixTimeStampOf(fromUnixTime(value)));
-    assertEquals(value,
+    assertEquals(
+        value,
         eval(unixTimeStampOf(fromUnixTime(DSL.literal(new ExprDoubleValue(value))))).doubleValue());
 
     assertEquals(Math.round(value) + 0d, unixTimeStampOf(fromUnixTime(Math.round(value))));
-    assertEquals(Math.round(value) + 0d,
+    assertEquals(
+        Math.round(value) + 0d,
         eval(unixTimeStampOf(fromUnixTime(DSL.literal(new ExprLongValue(Math.round(value))))))
             .doubleValue());
   }
@@ -72,19 +72,20 @@ private static Stream<Arguments> getDateTimeSamples() {
         Arguments.of(LocalDateTime.of(1999, 12, 31, 23, 59, 59)),
         Arguments.of(LocalDateTime.of(2004, 2, 29, 7, 40)),
         Arguments.of(LocalDateTime.of(2100, 2, 28, 13, 14, 15)),
-        Arguments.of(LocalDateTime.of(2012, 2, 21, 0, 0, 17))
-    );
+        Arguments.of(LocalDateTime.of(2012, 2, 21, 0, 0, 17)));
   }
 
   /**
    * Test converting valid values DateTime -> EpochTime -> DateTime.
+   *
    * @param value a value
    */
   @ParameterizedTest
   @MethodSource("getDateTimeSamples")
   public void convertDateTime2Epoch2DateTime(LocalDateTime value) {
     assertEquals(value, fromUnixTime(unixTimeStampOf(value)));
-    assertEquals(value,
+    assertEquals(
+        value,
         eval(fromUnixTime(unixTimeStampOf(DSL.literal(new ExprDatetimeValue(value)))))
             .datetimeValue());
   }
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/WeekdayTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/WeekdayTest.java
new file mode 100644
index 0000000000..d2a6394503
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/WeekdayTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opensearch.sql.data.model.ExprValueUtils.integerValue;
+import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+
+import java.time.LocalDate;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.sql.data.model.ExprDateValue;
+import org.opensearch.sql.data.model.ExprTimeValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.ExpressionTestBase;
+import org.opensearch.sql.expression.FunctionExpression;
+import org.opensearch.sql.expression.LiteralExpression;
+
+class WeekdayTest extends ExpressionTestBase {
+
+  private void weekdayQuery(FunctionExpression dateExpression, int dayOfWeek, String testExpr) {
+
+    assertAll(
+        () -> assertEquals(INTEGER, dateExpression.type()),
+        () -> assertEquals(integerValue(dayOfWeek), eval(dateExpression)),
+        () -> assertEquals(testExpr, dateExpression.toString()));
+  }
+
+  private static Stream<Arguments> getTestDataForWeekday() {
+    return Stream.of(
+        Arguments.of(DSL.literal(new ExprDateValue("2020-08-07")), 4, "weekday(DATE '2020-08-07')"),
+        Arguments.of(DSL.literal(new ExprDateValue("2020-08-09")), 6, "weekday(DATE '2020-08-09')"),
+        Arguments.of(DSL.literal("2020-08-09"), 6, "weekday(\"2020-08-09\")"),
+        Arguments.of(DSL.literal("2020-08-09 01:02:03"), 6, "weekday(\"2020-08-09 01:02:03\")"));
+  }
+
+  @MethodSource("getTestDataForWeekday")
+  @ParameterizedTest
+  public void weekday(LiteralExpression arg, int expectedInt, String expectedString) {
+    FunctionExpression expression = DSL.weekday(functionProperties, arg);
+
+    weekdayQuery(expression, expectedInt, expectedString);
+  }
+
+  @Test
+  public void testWeekdayWithTimeType() {
+    FunctionExpression expression =
+        DSL.weekday(functionProperties, DSL.literal(new ExprTimeValue("12:23:34")));
+
+    assertAll(
+        () -> assertEquals(INTEGER, eval(expression).type()),
+        () ->
+            assertEquals(
+                (LocalDate.now(functionProperties.getQueryStartClock()).getDayOfWeek().getValue()
+                    - 1),
+                eval(expression).integerValue()),
+        () -> assertEquals("weekday(TIME '12:23:34')", expression.toString()));
+  }
+
+  private void testInvalidWeekday(String date) {
+    FunctionExpression expression =
+        DSL.weekday(functionProperties, DSL.literal(new ExprDateValue(date)));
+    eval(expression);
+  }
+
+  @Test
+  public void weekdayLeapYear() {
+    assertAll(
+        // Feb. 29 of a leap year
+        () ->
+            weekdayQuery(
+                DSL.weekday(functionProperties, DSL.literal("2020-02-29")),
+                5,
+                "weekday(\"2020-02-29\")"),
+        // day after Feb. 29 of a leap year
+        () ->
+            weekdayQuery(
+                DSL.weekday(functionProperties, DSL.literal("2020-03-01")),
+                6,
+                "weekday(\"2020-03-01\")"),
+        // Feb. 28 of a non-leap year
+        () ->
+            weekdayQuery(
+                DSL.weekday(functionProperties, DSL.literal("2021-02-28")),
+                6,
+                "weekday(\"2021-02-28\")"),
+        // Feb. 29 of a non-leap year
+        () -> assertThrows(SemanticCheckException.class, () -> testInvalidWeekday("2021-02-29")));
+  }
+
+  @Test
+  public void weekdayInvalidArgument() {
+    assertAll(
+        // 40th day of the month
+        () -> assertThrows(SemanticCheckException.class, () -> testInvalidWeekday("2021-02-40")),
+
+        // 13th month of the year
+        () -> assertThrows(SemanticCheckException.class, () -> testInvalidWeekday("2021-13-29")),
+
+        // incorrect format
+        () -> assertThrows(SemanticCheckException.class, () -> testInvalidWeekday("asdfasdf")));
+  }
+
+  private ExprValue eval(Expression expression) {
+    return expression.valueOf();
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/YearweekTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/YearweekTest.java
new file mode 100644
index 0000000000..010952509d
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/datetime/YearweekTest.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.datetime;
+
+import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opensearch.sql.data.model.ExprValueUtils.integerValue;
+import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+
+import java.time.LocalDate;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.sql.data.model.ExprDateValue;
+import org.opensearch.sql.data.model.ExprDatetimeValue;
+import org.opensearch.sql.data.model.ExprTimeValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.ExpressionTestBase;
+import org.opensearch.sql.expression.FunctionExpression;
+
+class YearweekTest extends ExpressionTestBase {
+
+  private void yearweekQuery(String date, int mode, int expectedResult) {
+    FunctionExpression expression =
+        DSL.yearweek(functionProperties, DSL.literal(new ExprDateValue(date)), DSL.literal(mode));
+    assertAll(
+        () -> assertEquals(INTEGER, expression.type()),
+        () ->
+            assertEquals(
+                String.format("yearweek(DATE '%s', %d)", date, mode), expression.toString()),
+        () -> assertEquals(integerValue(expectedResult), eval(expression)));
+  }
+
+  private static Stream<Arguments> getTestDataForYearweek() {
+    // Test the behavior of different modes passed into the 'yearweek' function
+    return Stream.of(
+        Arguments.of("2019-01-05", 0, 201852),
+        Arguments.of("2019-01-05", 1, 201901),
+        Arguments.of("2019-01-05", 2, 201852),
+        Arguments.of("2019-01-05", 3, 201901),
+        Arguments.of("2019-01-05", 4, 201901),
+        Arguments.of("2019-01-05", 5, 201853),
+        Arguments.of("2019-01-05", 6, 201901),
+        Arguments.of("2019-01-05", 7, 201853),
+        Arguments.of("2019-01-06", 0, 201901),
+        Arguments.of("2019-01-06", 1, 201901),
+        Arguments.of("2019-01-06", 2, 201901),
+        Arguments.of("2019-01-06", 3, 201901),
+        Arguments.of("2019-01-06", 4, 201902),
+        Arguments.of("2019-01-06", 5, 201853),
+        Arguments.of("2019-01-06", 6, 201902),
+        Arguments.of("2019-01-06", 7, 201853),
+        Arguments.of("2019-01-07", 0, 201901),
+        Arguments.of("2019-01-07", 1, 201902),
+        Arguments.of("2019-01-07", 2, 201901),
+        Arguments.of("2019-01-07", 3, 201902),
+        Arguments.of("2019-01-07", 4, 201902),
+        Arguments.of("2019-01-07", 5, 201901),
+        Arguments.of("2019-01-07", 6, 201902),
+        Arguments.of("2019-01-07", 7, 201901),
+        Arguments.of("2000-01-01", 0, 199952),
+        Arguments.of("2000-01-01", 2, 199952),
+        Arguments.of("1999-12-31", 0, 199952),
+        Arguments.of("1999-01-01", 0, 199852),
+        Arguments.of("1999-01-01", 1, 199852),
+        Arguments.of("1999-01-01", 4, 199852),
+        Arguments.of("1999-01-01", 5, 199852),
+        Arguments.of("1999-01-01", 6, 199852));
+  }
+
+  @ParameterizedTest(name = "{0} | {1}")
+  @MethodSource("getTestDataForYearweek")
+  public void testYearweak(String date, int mode, int expected) {
+    yearweekQuery(date, mode, expected);
+  }
+
+  @Test
+  public void testYearweekWithoutMode() {
+    LocalDate date = LocalDate.of(2019, 1, 05);
+
+    FunctionExpression expression =
+        DSL.yearweek(functionProperties, DSL.literal(new ExprDateValue(date)), DSL.literal(0));
+
+    FunctionExpression expressionWithoutMode =
+        DSL.yearweek(functionProperties, DSL.literal(new ExprDateValue(date)));
+
+    assertEquals(eval(expression), eval(expressionWithoutMode));
+  }
+
+  // subtracting 1 as a temporary fix for year 2024.
+  // Issue: https://github.com/opensearch-project/sql/issues/2477
+  @Test
+  public void testYearweekWithTimeType() {
+    int week = LocalDate.now(functionProperties.getQueryStartClock()).get(ALIGNED_WEEK_OF_YEAR) - 1;
+    int year = LocalDate.now(functionProperties.getQueryStartClock()).getYear();
+    int expected = Integer.parseInt(String.format("%d%02d", year, week));
+
+    FunctionExpression expression =
+        DSL.yearweek(
+            functionProperties, DSL.literal(new ExprTimeValue("10:11:12")), DSL.literal(0));
+
+    FunctionExpression expressionWithoutMode =
+        DSL.yearweek(functionProperties, DSL.literal(new ExprTimeValue("10:11:12")));
+
+    assertAll(
+        () -> assertEquals(expected, eval(expression).integerValue()),
+        () -> assertEquals(expected, eval(expressionWithoutMode).integerValue()));
+  }
+
+  @Test
+  public void testInvalidYearWeek() {
+    assertAll(
+        // test invalid month
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> yearweekQuery("2019-13-05 01:02:03", 0, 0)),
+        // test invalid day
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> yearweekQuery("2019-01-50 01:02:03", 0, 0)),
+        // test invalid leap year
+        () ->
+            assertThrows(
+                SemanticCheckException.class, () -> yearweekQuery("2019-02-29 01:02:03", 0, 0)));
+  }
+
+  @Test
+  public void yearweekModeInUnsupportedFormat() {
+    FunctionExpression expression1 =
+        DSL.yearweek(
+            functionProperties,
+            DSL.literal(new ExprDatetimeValue("2019-01-05 10:11:12")),
+            DSL.literal(8));
+    SemanticCheckException exception =
+        assertThrows(SemanticCheckException.class, () -> eval(expression1));
+    assertEquals("mode:8 is invalid, please use mode value between 0-7", exception.getMessage());
+
+    FunctionExpression expression2 =
+        DSL.yearweek(
+            functionProperties,
+            DSL.literal(new ExprDatetimeValue("2019-01-05 10:11:12")),
+            DSL.literal(-1));
+    exception = assertThrows(SemanticCheckException.class, () -> eval(expression2));
+    assertEquals("mode:-1 is invalid, please use mode value between 0-7", exception.getMessage());
+  }
+
+  private ExprValue eval(Expression expression) {
+    return expression.valueOf();
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/BuiltinFunctionNameTest.java b/core/src/test/java/org/opensearch/sql/expression/function/BuiltinFunctionNameTest.java
index 075d809544..774c471b7d 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/BuiltinFunctionNameTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/BuiltinFunctionNameTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -20,8 +19,7 @@ class BuiltinFunctionNameTest {
 
   private static Stream<Arguments> ofArguments() {
     Stream.Builder<Arguments> builder = Stream.builder();
-    return Arrays.asList(BuiltinFunctionName.values())
-        .stream()
+    return Arrays.asList(BuiltinFunctionName.values()).stream()
         .map(functionName -> Arguments.of(functionName.getName().getFunctionName(), functionName));
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/BuiltinFunctionRepositoryTest.java b/core/src/test/java/org/opensearch/sql/expression/function/BuiltinFunctionRepositoryTest.java
index 8bba3bd9b9..3ee12f59d4 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/BuiltinFunctionRepositoryTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/BuiltinFunctionRepositoryTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -23,7 +22,6 @@
 import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
 import static org.opensearch.sql.data.type.ExprCoreType.UNDEFINED;
 import static org.opensearch.sql.expression.function.BuiltinFunctionName.CAST_TO_BOOLEAN;
-import static org.opensearch.sql.expression.function.BuiltinFunctionRepository.DEFAULT_NAMESPACE;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
@@ -39,7 +37,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.expression.Expression;
@@ -49,97 +46,62 @@
 @ExtendWith(MockitoExtension.class)
 class BuiltinFunctionRepositoryTest {
 
-  public static final String TEST_NAMESPACE = "TEST";
-
-  @Mock
-  private DefaultFunctionResolver mockfunctionResolver;
-  @Mock
-  private Map<String, Map<FunctionName, FunctionResolver>> mockNamespaceMap;
-  @Mock
-  private Map<FunctionName, FunctionResolver> mockMap;
-  @Mock
-  FunctionProperties functionProperties;
-  @Mock
-  private FunctionName mockFunctionName;
-  @Mock
-  private FunctionBuilder functionExpressionBuilder;
-  @Mock
-  private FunctionSignature functionSignature;
-  @Mock
-  private Expression mockExpression;
-  @Mock
-  private Environment<Expression, ExprCoreType> emptyEnv;
+  @Mock private DefaultFunctionResolver mockfunctionResolver;
+  @Mock private Map<FunctionName, FunctionResolver> mockMap;
+  @Mock FunctionProperties functionProperties;
+  @Mock private FunctionName mockFunctionName;
+  @Mock private FunctionBuilder functionExpressionBuilder;
+  @Mock private FunctionSignature functionSignature;
+  @Mock private Expression mockExpression;
 
   private BuiltinFunctionRepository repo;
 
   @BeforeEach
   void setUp() {
-    repo = new BuiltinFunctionRepository(mockNamespaceMap);
+    repo = new BuiltinFunctionRepository(mockMap);
   }
 
   @Test
   void register() {
-    when(mockNamespaceMap.get(DEFAULT_NAMESPACE)).thenReturn(mockMap);
-    when(mockNamespaceMap.containsKey(DEFAULT_NAMESPACE)).thenReturn(true);
     when(mockfunctionResolver.getFunctionName()).thenReturn(mockFunctionName);
-    BuiltinFunctionRepository repo = new BuiltinFunctionRepository(mockNamespaceMap);
+    BuiltinFunctionRepository repo = new BuiltinFunctionRepository(mockMap);
     repo.register(mockfunctionResolver);
 
     verify(mockMap, times(1)).put(mockFunctionName, mockfunctionResolver);
   }
 
-  @Test
-  void register_under_datasource_namespace() {
-    when(mockNamespaceMap.containsKey(TEST_NAMESPACE)).thenReturn(false);
-    when(mockNamespaceMap.put(eq(TEST_NAMESPACE), any())).thenReturn(null);
-    when(mockNamespaceMap.get(TEST_NAMESPACE)).thenReturn(mockMap);
-    when(mockfunctionResolver.getFunctionName()).thenReturn(mockFunctionName);
-    BuiltinFunctionRepository repo = new BuiltinFunctionRepository(mockNamespaceMap);
-    repo.register(TEST_NAMESPACE, mockfunctionResolver);
-
-    verify(mockNamespaceMap, times(1)).put(eq(TEST_NAMESPACE), any());
-    verify(mockNamespaceMap, times(1)).get(TEST_NAMESPACE);
-    verify(mockMap, times(1)).put(mockFunctionName, mockfunctionResolver);
-  }
-
   @Test
   void compile() {
     when(mockExpression.type()).thenReturn(UNDEFINED);
     when(functionSignature.getParamTypeList()).thenReturn(Arrays.asList(UNDEFINED));
     when(mockfunctionResolver.getFunctionName()).thenReturn(mockFunctionName);
-    when(mockfunctionResolver.resolve(any())).thenReturn(
-        Pair.of(functionSignature, functionExpressionBuilder));
-    when(mockNamespaceMap.get(DEFAULT_NAMESPACE)).thenReturn(mockMap);
-    when(mockNamespaceMap.containsKey(DEFAULT_NAMESPACE)).thenReturn(true);
+    when(mockfunctionResolver.resolve(any()))
+        .thenReturn(Pair.of(functionSignature, functionExpressionBuilder));
     when(mockMap.containsKey(mockFunctionName)).thenReturn(true);
     when(mockMap.get(mockFunctionName)).thenReturn(mockfunctionResolver);
-    BuiltinFunctionRepository repo = new BuiltinFunctionRepository(mockNamespaceMap);
+    BuiltinFunctionRepository repo = new BuiltinFunctionRepository(mockMap);
     repo.register(mockfunctionResolver);
 
     repo.compile(functionProperties, mockFunctionName, Arrays.asList(mockExpression));
-    verify(functionExpressionBuilder, times(1))
-        .apply(eq(functionProperties), any());
+    verify(functionExpressionBuilder, times(1)).apply(eq(functionProperties), any());
   }
 
-
   @Test
-  void compile_function_under_datasource_namespace() {
+  void compile_datasource_defined_function() {
+    DefaultFunctionResolver dataSourceFunctionResolver = mock(DefaultFunctionResolver.class);
     when(mockExpression.type()).thenReturn(UNDEFINED);
     when(functionSignature.getParamTypeList()).thenReturn(Arrays.asList(UNDEFINED));
-    when(mockfunctionResolver.getFunctionName()).thenReturn(mockFunctionName);
-    when(mockfunctionResolver.resolve(any())).thenReturn(
-        Pair.of(functionSignature, functionExpressionBuilder));
-    when(mockNamespaceMap.get(TEST_NAMESPACE)).thenReturn(mockMap);
-    when(mockNamespaceMap.containsKey(TEST_NAMESPACE)).thenReturn(true);
-    when(mockMap.containsKey(mockFunctionName)).thenReturn(true);
-    when(mockMap.get(mockFunctionName)).thenReturn(mockfunctionResolver);
-    BuiltinFunctionRepository repo = new BuiltinFunctionRepository(mockNamespaceMap);
-    repo.register(TEST_NAMESPACE, mockfunctionResolver);
-
-    repo.compile(functionProperties, TEST_NAMESPACE, mockFunctionName,
+    when(dataSourceFunctionResolver.getFunctionName()).thenReturn(mockFunctionName);
+    when(dataSourceFunctionResolver.resolve(any()))
+        .thenReturn(Pair.of(functionSignature, functionExpressionBuilder));
+    BuiltinFunctionRepository repo = new BuiltinFunctionRepository(Map.of());
+
+    repo.compile(
+        functionProperties,
+        Collections.singletonList(dataSourceFunctionResolver),
+        mockFunctionName,
         Arrays.asList(mockExpression));
-    verify(functionExpressionBuilder, times(1))
-        .apply(eq(functionProperties), any());
+    verify(functionExpressionBuilder, times(1)).apply(eq(functionProperties), any());
   }
 
   @Test
@@ -147,17 +109,15 @@ void compile_function_under_datasource_namespace() {
   void resolve() {
     when(functionSignature.getFunctionName()).thenReturn(mockFunctionName);
     when(mockfunctionResolver.getFunctionName()).thenReturn(mockFunctionName);
-    when(mockfunctionResolver.resolve(functionSignature)).thenReturn(
-        Pair.of(functionSignature, functionExpressionBuilder));
-    when(mockNamespaceMap.get(DEFAULT_NAMESPACE)).thenReturn(mockMap);
-    when(mockNamespaceMap.containsKey(DEFAULT_NAMESPACE)).thenReturn(true);
+    when(mockfunctionResolver.resolve(functionSignature))
+        .thenReturn(Pair.of(functionSignature, functionExpressionBuilder));
     when(mockMap.containsKey(mockFunctionName)).thenReturn(true);
     when(mockMap.get(mockFunctionName)).thenReturn(mockfunctionResolver);
-    BuiltinFunctionRepository repo = new BuiltinFunctionRepository(mockNamespaceMap);
+    BuiltinFunctionRepository repo = new BuiltinFunctionRepository(mockMap);
     repo.register(mockfunctionResolver);
 
-    assertEquals(functionExpressionBuilder, repo.resolve(
-        Collections.singletonList(DEFAULT_NAMESPACE), functionSignature));
+    assertEquals(
+        functionExpressionBuilder, repo.resolve(Collections.emptyList(), functionSignature));
   }
 
   @Test
@@ -165,7 +125,7 @@ void resolve_should_not_cast_arguments_in_cast_function() {
     when(mockExpression.toString()).thenReturn("string");
     FunctionImplementation function =
         repo.resolve(
-                Collections.singletonList(DEFAULT_NAMESPACE),
+                Collections.emptyList(),
                 registerFunctionResolver(CAST_TO_BOOLEAN.getName(), DATETIME, BOOLEAN))
             .apply(functionProperties, ImmutableList.of(mockExpression));
     assertEquals("cast_to_boolean(string)", function.toString());
@@ -177,8 +137,7 @@ void resolve_should_not_cast_arguments_if_same_type() {
     when(mockExpression.toString()).thenReturn("string");
     FunctionImplementation function =
         repo.resolve(
-                Collections.singletonList(DEFAULT_NAMESPACE),
-                registerFunctionResolver(mockFunctionName, STRING, STRING))
+                Collections.emptyList(), registerFunctionResolver(mockFunctionName, STRING, STRING))
             .apply(functionProperties, ImmutableList.of(mockExpression));
     assertEquals("mock(string)", function.toString());
   }
@@ -189,8 +148,7 @@ void resolve_should_not_cast_arguments_if_both_numbers() {
     when(mockExpression.toString()).thenReturn("byte");
     FunctionImplementation function =
         repo.resolve(
-                Collections.singletonList(DEFAULT_NAMESPACE),
-                registerFunctionResolver(mockFunctionName, BYTE, INTEGER))
+                Collections.emptyList(), registerFunctionResolver(mockFunctionName, BYTE, INTEGER))
             .apply(functionProperties, ImmutableList.of(mockExpression));
     assertEquals("mock(byte)", function.toString());
   }
@@ -201,12 +159,11 @@ void resolve_should_cast_arguments() {
     when(mockExpression.toString()).thenReturn("string");
     when(mockExpression.type()).thenReturn(STRING);
 
-    FunctionSignature signature =
-        registerFunctionResolver(mockFunctionName, STRING, BOOLEAN);
+    FunctionSignature signature = registerFunctionResolver(mockFunctionName, STRING, BOOLEAN);
     registerFunctionResolver(CAST_TO_BOOLEAN.getName(), STRING, STRING);
 
     FunctionImplementation function =
-        repo.resolve(Collections.singletonList(DEFAULT_NAMESPACE), signature)
+        repo.resolve(Collections.emptyList(), signature)
             .apply(functionProperties, ImmutableList.of(mockExpression));
     assertEquals("mock(cast_to_boolean(string))", function.toString());
   }
@@ -214,53 +171,54 @@ void resolve_should_cast_arguments() {
   @Test
   void resolve_should_throw_exception_for_unsupported_conversion() {
     ExpressionEvaluationException error =
-        assertThrows(ExpressionEvaluationException.class, () ->
-            repo.resolve(
-                    Collections.singletonList(DEFAULT_NAMESPACE),
-                    registerFunctionResolver(mockFunctionName, BYTE, STRUCT))
-                .apply(functionProperties, ImmutableList.of(mockExpression)));
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () ->
+                repo.resolve(
+                        Collections.emptyList(),
+                        registerFunctionResolver(mockFunctionName, BYTE, STRUCT))
+                    .apply(functionProperties, ImmutableList.of(mockExpression)));
     assertEquals(error.getMessage(), "Type conversion to type STRUCT is not supported");
   }
 
   @Test
   @DisplayName("resolve unregistered function should throw exception")
   void resolve_unregistered() {
-    when(mockNamespaceMap.get(DEFAULT_NAMESPACE)).thenReturn(mockMap);
-    when(mockNamespaceMap.containsKey(DEFAULT_NAMESPACE)).thenReturn(true);
     when(mockMap.containsKey(any())).thenReturn(false);
-    BuiltinFunctionRepository repo = new BuiltinFunctionRepository(mockNamespaceMap);
+    BuiltinFunctionRepository repo = new BuiltinFunctionRepository(mockMap);
     repo.register(mockfunctionResolver);
 
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> repo.resolve(
-            Collections.singletonList(DEFAULT_NAMESPACE),
-            new FunctionSignature(FunctionName.of("unknown"), List.of())));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () ->
+                repo.resolve(
+                    Collections.emptyList(),
+                    new FunctionSignature(FunctionName.of("unknown"), List.of())));
     assertEquals("unsupported function name: unknown", exception.getMessage());
   }
 
-  private FunctionSignature registerFunctionResolver(FunctionName funcName,
-                                                     ExprType sourceType,
-                                                     ExprType targetType) {
-    FunctionSignature unresolvedSignature = new FunctionSignature(
-        funcName, ImmutableList.of(sourceType));
-    FunctionSignature resolvedSignature = new FunctionSignature(
-        funcName, ImmutableList.of(targetType));
+  private FunctionSignature registerFunctionResolver(
+      FunctionName funcName, ExprType sourceType, ExprType targetType) {
+    FunctionSignature unresolvedSignature =
+        new FunctionSignature(funcName, ImmutableList.of(sourceType));
+    FunctionSignature resolvedSignature =
+        new FunctionSignature(funcName, ImmutableList.of(targetType));
 
     DefaultFunctionResolver funcResolver = mock(DefaultFunctionResolver.class);
     FunctionBuilder funcBuilder = mock(FunctionBuilder.class);
 
-    when(mockNamespaceMap.get(DEFAULT_NAMESPACE)).thenReturn(mockMap);
-    when(mockNamespaceMap.containsKey(DEFAULT_NAMESPACE)).thenReturn(true);
     when(mockMap.containsKey(eq(funcName))).thenReturn(true);
     when(mockMap.get(eq(funcName))).thenReturn(funcResolver);
-    when(funcResolver.resolve(eq(unresolvedSignature))).thenReturn(
-        Pair.of(resolvedSignature, funcBuilder));
+    when(funcResolver.resolve(eq(unresolvedSignature)))
+        .thenReturn(Pair.of(resolvedSignature, funcBuilder));
     repo.register(funcResolver);
 
     // Relax unnecessary stubbing check because error case test doesn't call this
-    lenient().doAnswer(invocation ->
-        new FakeFunctionExpression(funcName, invocation.getArgument(1))
-    ).when(funcBuilder).apply(eq(functionProperties), any());
+    lenient()
+        .doAnswer(invocation -> new FakeFunctionExpression(funcName, invocation.getArgument(1)))
+        .when(funcBuilder)
+        .apply(eq(functionProperties), any());
     return unresolvedSignature;
   }
 
@@ -283,8 +241,9 @@ public ExprType type() {
     @Override
     public String toString() {
       return getFunctionName().getFunctionName()
-          + "(" + StringUtils.join(getArguments(), ", ") + ")";
+          + "("
+          + StringUtils.join(getArguments(), ", ")
+          + ")";
     }
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/DefaultFunctionResolverTest.java b/core/src/test/java/org/opensearch/sql/expression/function/DefaultFunctionResolverTest.java
index baa299b60b..ad9e8a6661 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/DefaultFunctionResolverTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/DefaultFunctionResolverTest.java
@@ -3,14 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
+import static org.opensearch.sql.data.type.ExprCoreType.ARRAY;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import java.util.Collections;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -23,32 +26,24 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @ExtendWith(MockitoExtension.class)
 class DefaultFunctionResolverTest {
-  @Mock
-  private FunctionSignature exactlyMatchFS;
-  @Mock
-  private FunctionSignature bestMatchFS;
-  @Mock
-  private FunctionSignature leastMatchFS;
-  @Mock
-  private FunctionSignature notMatchFS;
-  @Mock
-  private FunctionSignature functionSignature;
-  @Mock
-  private FunctionBuilder exactlyMatchBuilder;
-  @Mock
-  private FunctionBuilder bestMatchBuilder;
-  @Mock
-  private FunctionBuilder leastMatchBuilder;
-  @Mock
-  private FunctionBuilder notMatchBuilder;
+  @Mock private FunctionSignature exactlyMatchFS;
+  @Mock private FunctionSignature bestMatchFS;
+  @Mock private FunctionSignature leastMatchFS;
+  @Mock private FunctionSignature notMatchFS;
+  @Mock private FunctionSignature functionSignature;
+  @Mock private FunctionBuilder exactlyMatchBuilder;
+  @Mock private FunctionBuilder bestMatchBuilder;
+  @Mock private FunctionBuilder leastMatchBuilder;
+  @Mock private FunctionBuilder notMatchBuilder;
 
   private FunctionName functionName = FunctionName.of("add");
 
   @Test
   void resolve_function_signature_exactly_match() {
     when(functionSignature.match(exactlyMatchFS)).thenReturn(WideningTypeRule.TYPE_EQUAL);
-    DefaultFunctionResolver resolver = new DefaultFunctionResolver(functionName,
-        ImmutableMap.of(exactlyMatchFS, exactlyMatchBuilder));
+    DefaultFunctionResolver resolver =
+        new DefaultFunctionResolver(
+            functionName, ImmutableMap.of(exactlyMatchFS, exactlyMatchBuilder));
 
     assertEquals(exactlyMatchBuilder, resolver.resolve(functionSignature).getValue());
   }
@@ -57,8 +52,10 @@ void resolve_function_signature_exactly_match() {
   void resolve_function_signature_best_match() {
     when(functionSignature.match(bestMatchFS)).thenReturn(1);
     when(functionSignature.match(leastMatchFS)).thenReturn(2);
-    DefaultFunctionResolver resolver = new DefaultFunctionResolver(functionName,
-        ImmutableMap.of(bestMatchFS, bestMatchBuilder, leastMatchFS, leastMatchBuilder));
+    DefaultFunctionResolver resolver =
+        new DefaultFunctionResolver(
+            functionName,
+            ImmutableMap.of(bestMatchFS, bestMatchBuilder, leastMatchFS, leastMatchBuilder));
 
     assertEquals(bestMatchBuilder, resolver.resolve(functionSignature).getValue());
   }
@@ -68,12 +65,64 @@ void resolve_function_not_match() {
     when(functionSignature.match(notMatchFS)).thenReturn(WideningTypeRule.IMPOSSIBLE_WIDENING);
     when(notMatchFS.formatTypes()).thenReturn("[INTEGER,INTEGER]");
     when(functionSignature.formatTypes()).thenReturn("[BOOLEAN,BOOLEAN]");
-    DefaultFunctionResolver resolver = new DefaultFunctionResolver(functionName,
-        ImmutableMap.of(notMatchFS, notMatchBuilder));
+    DefaultFunctionResolver resolver =
+        new DefaultFunctionResolver(functionName, ImmutableMap.of(notMatchFS, notMatchBuilder));
 
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> resolver.resolve(functionSignature));
-    assertEquals("add function expected {[INTEGER,INTEGER]}, but get [BOOLEAN,BOOLEAN]",
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class, () -> resolver.resolve(functionSignature));
+    assertEquals(
+        "add function expected {[INTEGER,INTEGER]}, but get [BOOLEAN,BOOLEAN]",
         exception.getMessage());
   }
+
+  @Test
+  void resolve_varargs_function_signature_match() {
+    functionName = FunctionName.of("concat");
+    when(functionSignature.match(bestMatchFS)).thenReturn(WideningTypeRule.TYPE_EQUAL);
+    when(functionSignature.getParamTypeList()).thenReturn(ImmutableList.of(STRING));
+    when(bestMatchFS.getParamTypeList()).thenReturn(ImmutableList.of(ARRAY));
+
+    DefaultFunctionResolver resolver =
+        new DefaultFunctionResolver(functionName, ImmutableMap.of(bestMatchFS, bestMatchBuilder));
+
+    assertEquals(bestMatchBuilder, resolver.resolve(functionSignature).getValue());
+  }
+
+  @Test
+  void resolve_varargs_no_args_function_signature_not_match() {
+    functionName = FunctionName.of("concat");
+    when(functionSignature.match(bestMatchFS)).thenReturn(WideningTypeRule.TYPE_EQUAL);
+    when(bestMatchFS.getParamTypeList()).thenReturn(ImmutableList.of(ARRAY));
+    // Concat function with no arguments
+    when(functionSignature.getParamTypeList()).thenReturn(Collections.emptyList());
+
+    DefaultFunctionResolver resolver =
+        new DefaultFunctionResolver(functionName, ImmutableMap.of(bestMatchFS, bestMatchBuilder));
+
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class, () -> resolver.resolve(functionSignature));
+    assertEquals("concat function expected 1-9 arguments, but got 0", exception.getMessage());
+  }
+
+  @Test
+  void resolve_varargs_too_many_args_function_signature_not_match() {
+    functionName = FunctionName.of("concat");
+    when(functionSignature.match(bestMatchFS)).thenReturn(WideningTypeRule.TYPE_EQUAL);
+    when(bestMatchFS.getParamTypeList()).thenReturn(ImmutableList.of(ARRAY));
+    // Concat function with more than 9 arguments
+    when(functionSignature.getParamTypeList())
+        .thenReturn(
+            ImmutableList.of(
+                STRING, STRING, STRING, STRING, STRING, STRING, STRING, STRING, STRING, STRING));
+
+    DefaultFunctionResolver resolver =
+        new DefaultFunctionResolver(functionName, ImmutableMap.of(bestMatchFS, bestMatchBuilder));
+
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class, () -> resolver.resolve(functionSignature));
+    assertEquals("concat function expected 1-9 arguments, but got 10", exception.getMessage());
+  }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLDefineTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLDefineTest.java
index 8bf4d7ba24..670605c5a0 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLDefineTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLDefineTest.java
@@ -52,16 +52,15 @@ void define_name_test() {
 
   static class SampleFunctionBuilder implements FunctionBuilder {
     @Override
-    public FunctionImplementation apply(FunctionProperties functionProperties,
-                                        List<Expression> arguments) {
+    public FunctionImplementation apply(
+        FunctionProperties functionProperties, List<Expression> arguments) {
       return new SampleFunctionImplementation(arguments);
     }
   }
 
   @RequiredArgsConstructor
   static class SampleFunctionImplementation implements FunctionImplementation {
-    @Getter
-    private final List<Expression> arguments;
+    @Getter private final List<Expression> arguments;
 
     @Override
     public FunctionName getFunctionName() {
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLTestBase.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLTestBase.java
index 193066e626..a8b9e8da96 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLTestBase.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLTestBase.java
@@ -11,40 +11,39 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.data.model.ExprMissingValue;
 import org.opensearch.sql.data.model.ExprNullValue;
-import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
 @ExtendWith(MockitoExtension.class)
 public class FunctionDSLTestBase {
-  @Mock
-  FunctionProperties functionProperties;
+  @Mock FunctionProperties functionProperties;
 
   public static final ExprNullValue NULL = ExprNullValue.of();
   public static final ExprMissingValue MISSING = ExprMissingValue.of();
   protected static final ExprType ANY_TYPE = () -> "ANY";
-  protected static final ExprValue ANY = new ExprValue() {
-    @Override
-    public Object value() {
-      throw new RuntimeException();
-    }
-
-    @Override
-    public ExprType type() {
-      return ANY_TYPE;
-    }
-
-    @Override
-    public String toString() {
-      return "ANY";
-    }
-
-    @Override
-    public int compareTo(ExprValue o) {
-      throw new RuntimeException();
-    }
-  };
+  protected static final ExprValue ANY =
+      new ExprValue() {
+        @Override
+        public Object value() {
+          throw new RuntimeException();
+        }
+
+        @Override
+        public ExprType type() {
+          return ANY_TYPE;
+        }
+
+        @Override
+        public String toString() {
+          return "ANY";
+        }
+
+        @Override
+        public int compareTo(ExprValue o) {
+          throw new RuntimeException();
+        }
+      };
   static final FunctionName SAMPLE_NAME = FunctionName.of("sample");
   static final FunctionSignature SAMPLE_SIGNATURE_A =
       new FunctionSignature(SAMPLE_NAME, List.of(ExprCoreType.UNDEFINED));
@@ -52,11 +51,19 @@ public int compareTo(ExprValue o) {
   static final SerializableFunction<ExprValue, ExprValue> oneArg = v -> ANY;
   static final SerializableBiFunction<FunctionProperties, ExprValue, ExprValue>
       oneArgWithProperties = (functionProperties, v) -> ANY;
+  static final SerializableTriFunction<FunctionProperties, ExprValue, ExprValue, ExprValue>
+      twoArgWithProperties = (functionProperties, v1, v2) -> ANY;
+
+  static final SerializableQuadFunction<
+          FunctionProperties, ExprValue, ExprValue, ExprValue, ExprValue>
+      threeArgsWithProperties = (functionProperties, v1, v2, v3) -> ANY;
+
+  static final SerializableBiFunction<ExprValue, ExprValue, ExprValue> twoArgs = (v1, v2) -> ANY;
+  static final SerializableTriFunction<ExprValue, ExprValue, ExprValue, ExprValue> threeArgs =
+      (v1, v2, v3) -> ANY;
+
+  static final SerializableQuadFunction<ExprValue, ExprValue, ExprValue, ExprValue, ExprValue>
+      fourArgs = (v1, v2, v3, v4) -> ANY;
 
-  static final SerializableBiFunction<ExprValue, ExprValue, ExprValue>
-      twoArgs = (v1, v2) -> ANY;
-  static final SerializableTriFunction<ExprValue, ExprValue, ExprValue, ExprValue>
-      threeArgs = (v1, v2, v3) -> ANY;
-  @Mock
-  FunctionProperties mockProperties;
+  @Mock FunctionProperties mockProperties;
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplFourArgTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplFourArgTest.java
new file mode 100644
index 0000000000..ea3cbc1166
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplFourArgTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.function;
+
+import static org.opensearch.sql.expression.function.FunctionDSL.impl;
+
+import java.util.List;
+import org.apache.commons.lang3.tuple.Pair;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+
+class FunctionDSLimplFourArgTest extends FunctionDSLimplTestBase {
+
+  @Override
+  SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>
+      getImplementationGenerator() {
+    return impl(fourArgs, ANY_TYPE, ANY_TYPE, ANY_TYPE, ANY_TYPE, ANY_TYPE);
+  }
+
+  @Override
+  List<Expression> getSampleArguments() {
+    return List.of(DSL.literal(ANY), DSL.literal(ANY), DSL.literal(ANY), DSL.literal(ANY));
+  }
+
+  @Override
+  String getExpected_toString() {
+    return "sample(ANY, ANY, ANY, ANY)";
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplNoArgTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplNoArgTest.java
index 5d970803ed..907cd49f26 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplNoArgTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplNoArgTest.java
@@ -9,7 +9,6 @@
 
 import java.util.List;
 import org.apache.commons.lang3.tuple.Pair;
-import org.junit.jupiter.api.BeforeEach;
 import org.opensearch.sql.expression.Expression;
 
 class FunctionDSLimplNoArgTest extends FunctionDSLimplTestBase {
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplTestBase.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplTestBase.java
index 8f494c01c3..a76e738e2d 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplTestBase.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplTestBase.java
@@ -42,16 +42,16 @@ void implementation_valid_functionBuilder() {
 
   @Test
   void implementation_functionBuilder_return_functionExpression() {
-    FunctionImplementation executable = getImplementation().getValue()
-        .apply(functionProperties, getSampleArguments());
+    FunctionImplementation executable =
+        getImplementation().getValue().apply(functionProperties, getSampleArguments());
     assertTrue(executable instanceof FunctionExpression);
   }
 
   @Test
   void implementation_functionExpression_valueOf() {
     FunctionExpression executable =
-        (FunctionExpression) getImplementation().getValue()
-            .apply(functionProperties, getSampleArguments());
+        (FunctionExpression)
+            getImplementation().getValue().apply(functionProperties, getSampleArguments());
 
     assertEquals(ANY, executable.valueOf(null));
   }
@@ -59,23 +59,20 @@ void implementation_functionExpression_valueOf() {
   @Test
   void implementation_functionExpression_type() {
     FunctionExpression executable =
-        (FunctionExpression) getImplementation().getValue()
-            .apply(functionProperties, getSampleArguments());
+        (FunctionExpression)
+            getImplementation().getValue().apply(functionProperties, getSampleArguments());
     assertEquals(ANY_TYPE, executable.type());
   }
 
   @Test
   void implementation_functionExpression_toString() {
     FunctionExpression executable =
-        (FunctionExpression) getImplementation().getValue()
-            .apply(functionProperties, getSampleArguments());
+        (FunctionExpression)
+            getImplementation().getValue().apply(functionProperties, getSampleArguments());
     assertEquals(getExpected_toString(), executable.toString());
   }
 
-  /**
-   * A lambda that takes a function name and returns an implementation
-   * of the function.
-   */
+  /** A lambda that takes a function name and returns an implementation of the function. */
   abstract SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>
       getImplementationGenerator();
 
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplTwoArgTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplTwoArgTest.java
index 87d097c9eb..4e2626b9c3 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplTwoArgTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplTwoArgTest.java
@@ -19,7 +19,6 @@ class FunctionDSLimplTwoArgTest extends FunctionDSLimplTestBase {
     return impl(twoArgs, ANY_TYPE, ANY_TYPE, ANY_TYPE);
   }
 
-
   @Override
   List<Expression> getSampleArguments() {
     return List.of(DSL.literal(ANY), DSL.literal(ANY));
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesNoArgsTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesNoArgsTest.java
index c3c41b6c0c..f4b8d0090e 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesNoArgsTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesNoArgsTest.java
@@ -9,7 +9,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.expression.Expression;
 
-class FunctionDSLimplWithPropertiesNoArgsTest extends  FunctionDSLimplTestBase {
+class FunctionDSLimplWithPropertiesNoArgsTest extends FunctionDSLimplTestBase {
 
   @Override
   SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesOneArgTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesOneArgTest.java
index 4a05326c0a..57960b5c1c 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesOneArgTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesOneArgTest.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.expression.function;
 
-
 import java.util.List;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.data.model.ExprValue;
@@ -17,8 +16,8 @@ class FunctionDSLimplWithPropertiesOneArgTest extends FunctionDSLimplTestBase {
   @Override
   SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>
       getImplementationGenerator() {
-    SerializableBiFunction<FunctionProperties, ExprValue, ExprValue> functionBody
-        = (fp, arg) -> ANY;
+    SerializableBiFunction<FunctionProperties, ExprValue, ExprValue> functionBody =
+        (fp, arg) -> ANY;
     return FunctionDSL.implWithProperties(functionBody, ANY_TYPE, ANY_TYPE);
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesThreeArgsTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesThreeArgsTest.java
new file mode 100644
index 0000000000..b79860abc2
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesThreeArgsTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.function;
+
+import java.util.List;
+import org.apache.commons.lang3.tuple.Pair;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+
+class FunctionDSLimplWithPropertiesThreeArgsTest extends FunctionDSLimplTestBase {
+
+  @Override
+  SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>
+      getImplementationGenerator() {
+    SerializableQuadFunction<FunctionProperties, ExprValue, ExprValue, ExprValue, ExprValue>
+        functionBody = (fp, arg1, arg2, arg3) -> ANY;
+    return FunctionDSL.implWithProperties(functionBody, ANY_TYPE, ANY_TYPE, ANY_TYPE, ANY_TYPE);
+  }
+
+  @Override
+  List<Expression> getSampleArguments() {
+    return List.of(DSL.literal(ANY), DSL.literal(ANY), DSL.literal(ANY));
+  }
+
+  @Override
+  String getExpected_toString() {
+    return "sample(ANY, ANY, ANY)";
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesTwoArgTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesTwoArgTest.java
new file mode 100644
index 0000000000..3c42b412c8
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesTwoArgTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.function;
+
+import java.util.List;
+import org.apache.commons.lang3.tuple.Pair;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+
+class FunctionDSLimplWithPropertiesTwoArgTest extends FunctionDSLimplTestBase {
+
+  @Override
+  SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>
+      getImplementationGenerator() {
+    SerializableTriFunction<FunctionProperties, ExprValue, ExprValue, ExprValue> functionBody =
+        (fp, arg1, arg2) -> ANY;
+    return FunctionDSL.implWithProperties(functionBody, ANY_TYPE, ANY_TYPE, ANY_TYPE);
+  }
+
+  @Override
+  List<Expression> getSampleArguments() {
+    return List.of(DSL.literal(ANY), DSL.literal(ANY));
+  }
+
+  @Override
+  String getExpected_toString() {
+    return "sample(ANY, ANY)";
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesTwoArgsTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesTwoArgsTest.java
new file mode 100644
index 0000000000..748d734373
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLimplWithPropertiesTwoArgsTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.expression.function;
+
+import java.util.List;
+import org.apache.commons.lang3.tuple.Pair;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+
+class FunctionDSLimplWithPropertiesTwoArgsTest extends FunctionDSLimplTestBase {
+
+  @Override
+  SerializableFunction<FunctionName, Pair<FunctionSignature, FunctionBuilder>>
+      getImplementationGenerator() {
+    SerializableTriFunction<FunctionProperties, ExprValue, ExprValue, ExprValue> functionBody =
+        (fp, arg1, arg2) -> ANY;
+    return FunctionDSL.implWithProperties(functionBody, ANY_TYPE, ANY_TYPE, ANY_TYPE);
+  }
+
+  @Override
+  List<Expression> getSampleArguments() {
+    return List.of(DSL.literal(ANY), DSL.literal(ANY));
+  }
+
+  @Override
+  String getExpected_toString() {
+    return "sample(ANY, ANY)";
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLnullMissingHandlingTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLnullMissingHandlingTest.java
index 64cac278f6..a1cc305003 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLnullMissingHandlingTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionDSLnullMissingHandlingTest.java
@@ -28,25 +28,123 @@ void nullMissingHandling_oneArg_apply() {
     assertEquals(ANY, nullMissingHandling(oneArg).apply(ANY));
   }
 
-
   @Test
   void nullMissingHandling_oneArg_FunctionProperties_nullValue() {
-    assertEquals(NULL,
+    assertEquals(
+        NULL,
         nullMissingHandlingWithProperties(oneArgWithProperties).apply(functionProperties, NULL));
   }
 
   @Test
   void nullMissingHandling_oneArg_FunctionProperties_missingValue() {
-    assertEquals(MISSING,
+    assertEquals(
+        MISSING,
         nullMissingHandlingWithProperties(oneArgWithProperties).apply(functionProperties, MISSING));
   }
 
   @Test
   void nullMissingHandling_oneArg_FunctionProperties_apply() {
-    assertEquals(ANY,
+    assertEquals(
+        ANY,
         nullMissingHandlingWithProperties(oneArgWithProperties).apply(functionProperties, ANY));
   }
 
+  @Test
+  void nullMissingHandling_twoArgs_FunctionProperties_nullValue_firstArg() {
+    assertEquals(
+        NULL,
+        nullMissingHandlingWithProperties(twoArgWithProperties)
+            .apply(functionProperties, NULL, ANY));
+  }
+
+  @Test
+  void nullMissingHandling_twoArgs_FunctionProperties_nullValue_secondArg() {
+    assertEquals(
+        NULL,
+        nullMissingHandlingWithProperties(twoArgWithProperties)
+            .apply(functionProperties, ANY, NULL));
+  }
+
+  @Test
+  void nullMissingHandling_twoArgs_FunctionProperties_missingValue_firstArg() {
+    assertEquals(
+        MISSING,
+        nullMissingHandlingWithProperties(twoArgWithProperties)
+            .apply(functionProperties, MISSING, ANY));
+  }
+
+  @Test
+  void nullMissingHandling_twoArgs_FunctionProperties_missingValue_secondArg() {
+    assertEquals(
+        MISSING,
+        nullMissingHandlingWithProperties(twoArgWithProperties)
+            .apply(functionProperties, ANY, MISSING));
+  }
+
+  @Test
+  void nullMissingHandling_twoArgs_FunctionProperties_apply() {
+    assertEquals(
+        ANY,
+        nullMissingHandlingWithProperties(twoArgWithProperties)
+            .apply(functionProperties, ANY, ANY));
+  }
+
+  @Test
+  void nullMissingHandling_threeArgs_FunctionProperties_nullValue_firstArg() {
+    assertEquals(
+        NULL,
+        nullMissingHandlingWithProperties(threeArgsWithProperties)
+            .apply(functionProperties, NULL, ANY, ANY));
+  }
+
+  @Test
+  void nullMissingHandling_threeArgs_FunctionProperties_nullValue_secondArg() {
+    assertEquals(
+        NULL,
+        nullMissingHandlingWithProperties(threeArgsWithProperties)
+            .apply(functionProperties, ANY, NULL, ANY));
+  }
+
+  @Test
+  void nullMissingHandling_threeArgs_FunctionProperties_nullValue_thirdArg() {
+    assertEquals(
+        NULL,
+        nullMissingHandlingWithProperties(threeArgsWithProperties)
+            .apply(functionProperties, ANY, ANY, NULL));
+  }
+
+  @Test
+  void nullMissingHandling_threeArgs_FunctionProperties_missingValue_firstArg() {
+    assertEquals(
+        MISSING,
+        nullMissingHandlingWithProperties(threeArgsWithProperties)
+            .apply(functionProperties, MISSING, ANY, ANY));
+  }
+
+  @Test
+  void nullMissingHandling_threeArgs_FunctionProperties_missingValue_secondArg() {
+    assertEquals(
+        MISSING,
+        nullMissingHandlingWithProperties(threeArgsWithProperties)
+            .apply(functionProperties, ANY, MISSING, ANY));
+  }
+
+  @Test
+  void nullMissingHandling_threeArgs_FunctionProperties_missingValue_thirdArg() {
+    assertEquals(
+        MISSING,
+        nullMissingHandlingWithProperties(threeArgsWithProperties)
+            .apply(functionProperties, ANY, ANY, MISSING));
+  }
+
+  @Test
+  void nullMissingHandling_threeArgs_FunctionProperties_apply() {
+    assertEquals(
+        ANY,
+        nullMissingHandlingWithProperties(threeArgsWithProperties)
+            .apply(functionProperties, ANY, ANY, ANY));
+  }
+
   @Test
   void nullMissingHandling_twoArgs_firstArg_nullValue() {
     assertEquals(NULL, nullMissingHandling(twoArgs).apply(NULL, ANY));
@@ -57,7 +155,6 @@ void nullMissingHandling_twoArgs_secondArg_nullValue() {
     assertEquals(NULL, nullMissingHandling(twoArgs).apply(ANY, NULL));
   }
 
-
   @Test
   void nullMissingHandling_twoArgs_firstArg_missingValue() {
     assertEquals(MISSING, nullMissingHandling(twoArgs).apply(MISSING, ANY));
@@ -73,7 +170,6 @@ void nullMissingHandling_twoArgs_apply() {
     assertEquals(ANY, nullMissingHandling(twoArgs).apply(ANY, ANY));
   }
 
-
   @Test
   void nullMissingHandling_threeArgs_firstArg_nullValue() {
     assertEquals(NULL, nullMissingHandling(threeArgs).apply(NULL, ANY, ANY));
@@ -89,7 +185,6 @@ void nullMissingHandling_threeArgs_thirdArg_nullValue() {
     assertEquals(NULL, nullMissingHandling(threeArgs).apply(ANY, ANY, NULL));
   }
 
-
   @Test
   void nullMissingHandling_threeArgs_firstArg_missingValue() {
     assertEquals(MISSING, nullMissingHandling(threeArgs).apply(MISSING, ANY, ANY));
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionPropertiesTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionPropertiesTest.java
index 64ec21e7e1..b531d049fd 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/FunctionPropertiesTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionPropertiesTest.java
@@ -17,9 +17,7 @@
 import java.time.Clock;
 import java.time.Instant;
 import java.time.ZoneId;
-import java.util.concurrent.Callable;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DynamicTest;
@@ -77,16 +75,17 @@ void functionProperties_can_be_deserialized() throws IOException, ClassNotFoundE
 
   @TestFactory
   Stream<DynamicTest> functionProperties_none_throws_on_access() {
-    Consumer<Executable> tb = tc -> {
-      RuntimeException e = assertThrows(FunctionProperties.UnexpectedCallException.class, tc);
-      assertEquals("FunctionProperties.None is a null object and not meant to be accessed.",
-          e.getMessage());
-    };
+    Consumer<Executable> tb =
+        tc -> {
+          RuntimeException e = assertThrows(FunctionProperties.UnexpectedCallException.class, tc);
+          assertEquals(
+              "FunctionProperties.None is a null object and not meant to be accessed.",
+              e.getMessage());
+        };
     return Stream.of(
-        DynamicTest.dynamicTest("getQueryStartClock",
-            () -> tb.accept(FunctionProperties.None::getQueryStartClock)),
-        DynamicTest.dynamicTest("getSystemClock",
-            () -> tb.accept(FunctionProperties.None::getSystemClock))
-    );
+        DynamicTest.dynamicTest(
+            "getQueryStartClock", () -> tb.accept(FunctionProperties.None::getQueryStartClock)),
+        DynamicTest.dynamicTest(
+            "getSystemClock", () -> tb.accept(FunctionProperties.None::getSystemClock)));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionPropertiesTestConfig.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionPropertiesTestConfig.java
deleted file mode 100644
index dfc9b543ae..0000000000
--- a/core/src/test/java/org/opensearch/sql/expression/function/FunctionPropertiesTestConfig.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.expression.function;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class FunctionPropertiesTestConfig {
-  @Bean
-  FunctionProperties functionProperties() {
-    return new FunctionProperties();
-  }
-}
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/FunctionSignatureTest.java b/core/src/test/java/org/opensearch/sql/expression/function/FunctionSignatureTest.java
index cc658bff98..2fb5dc468e 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/FunctionSignatureTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/FunctionSignatureTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,10 +24,8 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @ExtendWith(MockitoExtension.class)
 class FunctionSignatureTest {
-  @Mock
-  private FunctionSignature funcSignature;
-  @Mock
-  private List<ExprType> funcParamTypeList;
+  @Mock private FunctionSignature funcSignature;
+  @Mock private List<ExprType> funcParamTypeList;
 
   private FunctionName unresolvedFuncName = FunctionName.of("add");
   private List<ExprType> unresolvedParamTypeList =
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/OpenSearchFunctionsTest.java b/core/src/test/java/org/opensearch/sql/expression/function/OpenSearchFunctionsTest.java
index 6e4fff2fb0..168b73acc4 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/OpenSearchFunctionsTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/OpenSearchFunctionsTest.java
@@ -8,56 +8,64 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.opensearch.sql.data.type.ExprCoreType.BOOLEAN;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.data.model.ExprTupleValue;
+import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ExpressionTestBase;
 import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.NamedArgumentExpression;
-
+import org.opensearch.sql.expression.env.Environment;
 
 public class OpenSearchFunctionsTest extends ExpressionTestBase {
-  private final NamedArgumentExpression field = new NamedArgumentExpression(
-      "field", DSL.literal("message"));
-  private final NamedArgumentExpression fields = new NamedArgumentExpression(
-      "fields", DSL.literal(new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-          "title", ExprValueUtils.floatValue(1.F),
-          "body", ExprValueUtils.floatValue(.3F))))));
-  private final NamedArgumentExpression query = new NamedArgumentExpression(
-      "query", DSL.literal("search query"));
-  private final NamedArgumentExpression analyzer = new NamedArgumentExpression(
-      "analyzer", DSL.literal("keyword"));
-  private final NamedArgumentExpression autoGenerateSynonymsPhrase = new NamedArgumentExpression(
-      "auto_generate_synonyms_phrase", DSL.literal("true"));
-  private final NamedArgumentExpression fuzziness = new NamedArgumentExpression(
-      "fuzziness", DSL.literal("AUTO"));
-  private final NamedArgumentExpression maxExpansions = new NamedArgumentExpression(
-      "max_expansions", DSL.literal("10"));
-  private final NamedArgumentExpression prefixLength = new NamedArgumentExpression(
-      "prefix_length", DSL.literal("1"));
-  private final NamedArgumentExpression fuzzyTranspositions = new NamedArgumentExpression(
-      "fuzzy_transpositions", DSL.literal("false"));
-  private final NamedArgumentExpression fuzzyRewrite = new NamedArgumentExpression(
-      "fuzzy_rewrite", DSL.literal("rewrite method"));
-  private final NamedArgumentExpression lenient = new NamedArgumentExpression(
-      "lenient", DSL.literal("true"));
-  private final NamedArgumentExpression operator = new NamedArgumentExpression(
-      "operator", DSL.literal("OR"));
-  private final NamedArgumentExpression minimumShouldMatch = new NamedArgumentExpression(
-      "minimum_should_match", DSL.literal("1"));
-  private final NamedArgumentExpression zeroTermsQueryAll = new NamedArgumentExpression(
-      "zero_terms_query", DSL.literal("ALL"));
-  private final NamedArgumentExpression zeroTermsQueryNone = new NamedArgumentExpression(
-      "zero_terms_query", DSL.literal("None"));
-  private final NamedArgumentExpression boost = new NamedArgumentExpression(
-      "boost", DSL.literal("2.0"));
-  private final NamedArgumentExpression slop = new NamedArgumentExpression(
-      "slop", DSL.literal("3"));
+  private final NamedArgumentExpression field =
+      new NamedArgumentExpression("field", DSL.literal("message"));
+  private final NamedArgumentExpression fields =
+      new NamedArgumentExpression(
+          "fields",
+          DSL.literal(
+              new ExprTupleValue(
+                  new LinkedHashMap<>(
+                      Map.of(
+                          "title", ExprValueUtils.floatValue(1.F),
+                          "body", ExprValueUtils.floatValue(.3F))))));
+  private final NamedArgumentExpression query =
+      new NamedArgumentExpression("query", DSL.literal("search query"));
+  private final NamedArgumentExpression analyzer =
+      new NamedArgumentExpression("analyzer", DSL.literal("keyword"));
+  private final NamedArgumentExpression autoGenerateSynonymsPhrase =
+      new NamedArgumentExpression("auto_generate_synonyms_phrase", DSL.literal("true"));
+  private final NamedArgumentExpression fuzziness =
+      new NamedArgumentExpression("fuzziness", DSL.literal("AUTO"));
+  private final NamedArgumentExpression maxExpansions =
+      new NamedArgumentExpression("max_expansions", DSL.literal("10"));
+  private final NamedArgumentExpression prefixLength =
+      new NamedArgumentExpression("prefix_length", DSL.literal("1"));
+  private final NamedArgumentExpression fuzzyTranspositions =
+      new NamedArgumentExpression("fuzzy_transpositions", DSL.literal("false"));
+  private final NamedArgumentExpression fuzzyRewrite =
+      new NamedArgumentExpression("fuzzy_rewrite", DSL.literal("rewrite method"));
+  private final NamedArgumentExpression lenient =
+      new NamedArgumentExpression("lenient", DSL.literal("true"));
+  private final NamedArgumentExpression operator =
+      new NamedArgumentExpression("operator", DSL.literal("OR"));
+  private final NamedArgumentExpression minimumShouldMatch =
+      new NamedArgumentExpression("minimum_should_match", DSL.literal("1"));
+  private final NamedArgumentExpression zeroTermsQueryAll =
+      new NamedArgumentExpression("zero_terms_query", DSL.literal("ALL"));
+  private final NamedArgumentExpression zeroTermsQueryNone =
+      new NamedArgumentExpression("zero_terms_query", DSL.literal("None"));
+  private final NamedArgumentExpression boost =
+      new NamedArgumentExpression("boost", DSL.literal("2.0"));
+  private final NamedArgumentExpression slop =
+      new NamedArgumentExpression("slop", DSL.literal("3"));
 
   @Test
   void match() {
@@ -76,50 +84,135 @@ void match() {
     expr = DSL.match(field, query, analyzer, autoGenerateSynonymsPhrase, fuzziness, maxExpansions);
     assertEquals(BOOLEAN, expr.type());
 
-    expr = DSL.match(
-        field, query, analyzer, autoGenerateSynonymsPhrase, fuzziness, maxExpansions, prefixLength);
+    expr =
+        DSL.match(
+            field,
+            query,
+            analyzer,
+            autoGenerateSynonymsPhrase,
+            fuzziness,
+            maxExpansions,
+            prefixLength);
     assertEquals(BOOLEAN, expr.type());
 
-    expr = DSL.match(
-        field, query, analyzer, autoGenerateSynonymsPhrase, fuzziness, maxExpansions, prefixLength,
-        fuzzyTranspositions);
+    expr =
+        DSL.match(
+            field,
+            query,
+            analyzer,
+            autoGenerateSynonymsPhrase,
+            fuzziness,
+            maxExpansions,
+            prefixLength,
+            fuzzyTranspositions);
     assertEquals(BOOLEAN, expr.type());
 
-    expr = DSL.match(
-        field, query, analyzer, autoGenerateSynonymsPhrase, fuzziness, maxExpansions, prefixLength,
-        fuzzyTranspositions, fuzzyRewrite);
+    expr =
+        DSL.match(
+            field,
+            query,
+            analyzer,
+            autoGenerateSynonymsPhrase,
+            fuzziness,
+            maxExpansions,
+            prefixLength,
+            fuzzyTranspositions,
+            fuzzyRewrite);
     assertEquals(BOOLEAN, expr.type());
 
-    expr = DSL.match(
-        field, query, analyzer, autoGenerateSynonymsPhrase, fuzziness, maxExpansions, prefixLength,
-        fuzzyTranspositions, fuzzyRewrite, lenient);
+    expr =
+        DSL.match(
+            field,
+            query,
+            analyzer,
+            autoGenerateSynonymsPhrase,
+            fuzziness,
+            maxExpansions,
+            prefixLength,
+            fuzzyTranspositions,
+            fuzzyRewrite,
+            lenient);
     assertEquals(BOOLEAN, expr.type());
 
-    expr = DSL.match(
-        field, query, analyzer, autoGenerateSynonymsPhrase, fuzziness, maxExpansions, prefixLength,
-        fuzzyTranspositions, fuzzyRewrite, lenient, operator);
+    expr =
+        DSL.match(
+            field,
+            query,
+            analyzer,
+            autoGenerateSynonymsPhrase,
+            fuzziness,
+            maxExpansions,
+            prefixLength,
+            fuzzyTranspositions,
+            fuzzyRewrite,
+            lenient,
+            operator);
     assertEquals(BOOLEAN, expr.type());
 
-    expr = DSL.match(
-        field, query, analyzer, autoGenerateSynonymsPhrase, fuzziness, maxExpansions, prefixLength,
-        fuzzyTranspositions, fuzzyRewrite, lenient, operator);
+    expr =
+        DSL.match(
+            field,
+            query,
+            analyzer,
+            autoGenerateSynonymsPhrase,
+            fuzziness,
+            maxExpansions,
+            prefixLength,
+            fuzzyTranspositions,
+            fuzzyRewrite,
+            lenient,
+            operator);
     assertEquals(BOOLEAN, expr.type());
 
-    expr = DSL.match(
-        field, query, analyzer, autoGenerateSynonymsPhrase, fuzziness, maxExpansions, prefixLength,
-        fuzzyTranspositions, fuzzyRewrite, lenient, operator, minimumShouldMatch);
+    expr =
+        DSL.match(
+            field,
+            query,
+            analyzer,
+            autoGenerateSynonymsPhrase,
+            fuzziness,
+            maxExpansions,
+            prefixLength,
+            fuzzyTranspositions,
+            fuzzyRewrite,
+            lenient,
+            operator,
+            minimumShouldMatch);
     assertEquals(BOOLEAN, expr.type());
 
-    expr = DSL.match(
-        field, query, analyzer, autoGenerateSynonymsPhrase, fuzziness, maxExpansions, prefixLength,
-        fuzzyTranspositions, fuzzyRewrite, lenient, operator, minimumShouldMatch,
-        zeroTermsQueryAll);
+    expr =
+        DSL.match(
+            field,
+            query,
+            analyzer,
+            autoGenerateSynonymsPhrase,
+            fuzziness,
+            maxExpansions,
+            prefixLength,
+            fuzzyTranspositions,
+            fuzzyRewrite,
+            lenient,
+            operator,
+            minimumShouldMatch,
+            zeroTermsQueryAll);
     assertEquals(BOOLEAN, expr.type());
 
-    expr = DSL.match(
-        field, query, analyzer, autoGenerateSynonymsPhrase, fuzziness, maxExpansions, prefixLength,
-        fuzzyTranspositions, fuzzyRewrite, lenient, operator, minimumShouldMatch,
-        zeroTermsQueryNone, boost);
+    expr =
+        DSL.match(
+            field,
+            query,
+            analyzer,
+            autoGenerateSynonymsPhrase,
+            fuzziness,
+            maxExpansions,
+            prefixLength,
+            fuzzyTranspositions,
+            fuzzyRewrite,
+            lenient,
+            operator,
+            minimumShouldMatch,
+            zeroTermsQueryNone,
+            boost);
     assertEquals(BOOLEAN, expr.type());
   }
 
@@ -130,20 +223,16 @@ void match_phrase() {
     }
   }
 
-
   List<FunctionExpression> match_phrase_dsl_expressions() {
     return List.of(
-      DSL.match_phrase(field, query),
-      DSL.match_phrase(field, query, analyzer),
-      DSL.match_phrase(field, query, analyzer, zeroTermsQueryAll),
-      DSL.match_phrase(field, query, analyzer, zeroTermsQueryNone, slop)
-    );
+        DSL.match_phrase(field, query),
+        DSL.match_phrase(field, query, analyzer),
+        DSL.match_phrase(field, query, analyzer, zeroTermsQueryAll),
+        DSL.match_phrase(field, query, analyzer, zeroTermsQueryNone, slop));
   }
 
   List<FunctionExpression> match_phrase_prefix_dsl_expressions() {
-    return List.of(
-        DSL.match_phrase_prefix(field, query)
-    );
+    return List.of(DSL.match_phrase_prefix(field, query));
   }
 
   @Test
@@ -156,7 +245,8 @@ public void match_phrase_prefix() {
   @Test
   void match_in_memory() {
     FunctionExpression expr = DSL.match(field, query);
-    assertThrows(UnsupportedOperationException.class,
+    assertThrows(
+        UnsupportedOperationException.class,
         () -> expr.valueOf(valueEnv()),
         "OpenSearch defined function [match] is only supported in WHERE and HAVING clause.");
   }
@@ -170,39 +260,53 @@ void match_to_string() {
   @Test
   void multi_match() {
     FunctionExpression expr = DSL.multi_match(fields, query);
-    assertEquals(String.format("multi_match(fields=%s, query=%s)",
-            fields.getValue(), query.getValue()),
+    assertEquals(
+        String.format("multi_match(fields=%s, query=%s)", fields.getValue(), query.getValue()),
         expr.toString());
   }
 
   @Test
   void simple_query_string() {
     FunctionExpression expr = DSL.simple_query_string(fields, query);
-    assertEquals(String.format("simple_query_string(fields=%s, query=%s)",
-            fields.getValue(), query.getValue()),
+    assertEquals(
+        String.format(
+            "simple_query_string(fields=%s, query=%s)", fields.getValue(), query.getValue()),
         expr.toString());
   }
 
   @Test
   void query() {
     FunctionExpression expr = DSL.query(query);
-    assertEquals(String.format("query(query=%s)", query.getValue()),
-            expr.toString());
+    assertEquals(String.format("query(query=%s)", query.getValue()), expr.toString());
   }
 
   @Test
   void query_string() {
     FunctionExpression expr = DSL.query_string(fields, query);
-    assertEquals(String.format("query_string(fields=%s, query=%s)",
-            fields.getValue(), query.getValue()),
+    assertEquals(
+        String.format("query_string(fields=%s, query=%s)", fields.getValue(), query.getValue()),
         expr.toString());
   }
 
   @Test
   void wildcard_query() {
     FunctionExpression expr = DSL.wildcard_query(field, query);
-    assertEquals(String.format("wildcard_query(field=%s, query=%s)",
-            field.getValue(), query.getValue()),
+    assertEquals(
+        String.format("wildcard_query(field=%s, query=%s)", field.getValue(), query.getValue()),
+        expr.toString());
+  }
+
+  @Test
+  void nested_query() {
+    FunctionExpression expr = DSL.nested(DSL.ref("message.info", STRING));
+    assertEquals(
+        String.format(
+            "FunctionExpression(functionName=%s, arguments=[message.info])",
+            BuiltinFunctionName.NESTED.getName()),
         expr.toString());
+    Environment<Expression, ExprValue> nestedTuple =
+        ExprValueUtils.tupleValue(Map.of("message", Map.of("info", "result"))).bindingTuples();
+    assertEquals(expr.valueOf(nestedTuple), ExprValueUtils.stringValue("result"));
+    assertEquals(expr.type(), STRING);
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/RelevanceFunctionResolverTest.java b/core/src/test/java/org/opensearch/sql/expression/function/RelevanceFunctionResolverTest.java
index d8547057c4..c678ac6eb4 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/RelevanceFunctionResolverTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/RelevanceFunctionResolverTest.java
@@ -6,9 +6,7 @@
 package org.opensearch.sql.expression.function;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 
@@ -24,7 +22,7 @@ class RelevanceFunctionResolverTest {
 
   @BeforeEach
   void setUp() {
-    resolver = new RelevanceFunctionResolver(sampleFuncName, STRING);
+    resolver = new RelevanceFunctionResolver(sampleFuncName);
   }
 
   @Test
@@ -38,27 +36,15 @@ void resolve_correct_name_test() {
   void resolve_invalid_name_test() {
     var wrongFuncName = FunctionName.of("wrong_func");
     var sig = new FunctionSignature(wrongFuncName, List.of(STRING));
-    Exception exception = assertThrows(SemanticCheckException.class,
-        () -> resolver.resolve(sig));
-    assertEquals("Expected 'sample_function' but got 'wrong_func'",
-        exception.getMessage());
-  }
-
-  @Test
-  void resolve_invalid_first_param_type_test() {
-    var sig = new FunctionSignature(sampleFuncName, List.of(INTEGER));
-    Exception exception = assertThrows(SemanticCheckException.class,
-        () -> resolver.resolve(sig));
-    assertEquals("Expected type STRING instead of INTEGER for parameter #1",
-        exception.getMessage());
+    Exception exception = assertThrows(SemanticCheckException.class, () -> resolver.resolve(sig));
+    assertEquals("Expected 'sample_function' but got 'wrong_func'", exception.getMessage());
   }
 
   @Test
   void resolve_invalid_third_param_type_test() {
     var sig = new FunctionSignature(sampleFuncName, List.of(STRING, STRING, INTEGER, STRING));
-    Exception exception = assertThrows(SemanticCheckException.class,
-        () -> resolver.resolve(sig));
-    assertEquals("Expected type STRING instead of INTEGER for parameter #3",
-        exception.getMessage());
+    Exception exception = assertThrows(SemanticCheckException.class, () -> resolver.resolve(sig));
+    assertEquals(
+        "Expected type STRING instead of INTEGER for parameter #3", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/function/WideningTypeRuleTest.java b/core/src/test/java/org/opensearch/sql/expression/function/WideningTypeRuleTest.java
index 7e494fc8b2..3b6e5f7586 100644
--- a/core/src/test/java/org/opensearch/sql/expression/function/WideningTypeRuleTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/function/WideningTypeRuleTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.function;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -39,8 +38,7 @@
 
 class WideningTypeRuleTest {
   private static Table<ExprCoreType, ExprCoreType, Integer> numberWidenRule =
-      new ImmutableTable.Builder<ExprCoreType, ExprCoreType,
-          Integer>()
+      new ImmutableTable.Builder<ExprCoreType, ExprCoreType, Integer>()
           .put(BYTE, SHORT, 1)
           .put(BYTE, INTEGER, 2)
           .put(BYTE, LONG, 3)
@@ -61,6 +59,11 @@ class WideningTypeRuleTest {
           .put(STRING, DATE, 1)
           .put(STRING, TIME, 1)
           .put(STRING, DATETIME, 1)
+          .put(DATE, DATETIME, 1)
+          .put(TIME, DATETIME, 1)
+          .put(DATE, TIMESTAMP, 2)
+          .put(TIME, TIMESTAMP, 2)
+          .put(DATETIME, TIMESTAMP, 1)
           .put(UNDEFINED, BYTE, 1)
           .put(UNDEFINED, SHORT, 2)
           .put(UNDEFINED, INTEGER, 3)
@@ -72,35 +75,37 @@ class WideningTypeRuleTest {
   private static Stream<Arguments> distanceArguments() {
     List<ExprCoreType> exprTypes = ExprCoreType.coreTypes();
     return Lists.cartesianProduct(exprTypes, exprTypes).stream()
-        .map(list -> {
-          ExprCoreType type1 = list.get(0);
-          ExprCoreType type2 = list.get(1);
-          if (type1 == type2) {
-            return Arguments.of(type1, type2, TYPE_EQUAL);
-          } else if (numberWidenRule.contains(type1, type2)) {
-            return Arguments.of(type1, type2, numberWidenRule.get(type1, type2));
-          } else {
-            return Arguments.of(type1, type2, IMPOSSIBLE_WIDENING);
-          }
-        });
+        .map(
+            list -> {
+              ExprCoreType type1 = list.get(0);
+              ExprCoreType type2 = list.get(1);
+              if (type1 == type2) {
+                return Arguments.of(type1, type2, TYPE_EQUAL);
+              } else if (numberWidenRule.contains(type1, type2)) {
+                return Arguments.of(type1, type2, numberWidenRule.get(type1, type2));
+              } else {
+                return Arguments.of(type1, type2, IMPOSSIBLE_WIDENING);
+              }
+            });
   }
 
   private static Stream<Arguments> validMaxTypes() {
     List<ExprCoreType> exprTypes = ExprCoreType.coreTypes();
     return Lists.cartesianProduct(exprTypes, exprTypes).stream()
-        .map(list -> {
-          ExprCoreType type1 = list.get(0);
-          ExprCoreType type2 = list.get(1);
-          if (type1 == type2) {
-            return Arguments.of(type1, type2, type1);
-          } else if (numberWidenRule.contains(type1, type2)) {
-            return Arguments.of(type1, type2, type2);
-          } else if (numberWidenRule.contains(type2, type1)) {
-            return Arguments.of(type1, type2, type1);
-          } else {
-            return Arguments.of(type1, type2, null);
-          }
-        });
+        .map(
+            list -> {
+              ExprCoreType type1 = list.get(0);
+              ExprCoreType type2 = list.get(1);
+              if (type1 == type2) {
+                return Arguments.of(type1, type2, type1);
+              } else if (numberWidenRule.contains(type1, type2)) {
+                return Arguments.of(type1, type2, type2);
+              } else if (numberWidenRule.contains(type2, type1)) {
+                return Arguments.of(type1, type2, type1);
+              } else {
+                return Arguments.of(type1, type2, null);
+              }
+            });
   }
 
   @ParameterizedTest
@@ -113,8 +118,8 @@ public void distance(ExprCoreType v1, ExprCoreType v2, Integer expected) {
   @MethodSource("validMaxTypes")
   public void max(ExprCoreType v1, ExprCoreType v2, ExprCoreType expected) {
     if (null == expected) {
-      ExpressionEvaluationException exception = assertThrows(
-          ExpressionEvaluationException.class, () -> WideningTypeRule.max(v1, v2));
+      ExpressionEvaluationException exception =
+          assertThrows(ExpressionEvaluationException.class, () -> WideningTypeRule.max(v1, v2));
       assertEquals(String.format("no max type of %s and %s ", v1, v2), exception.getMessage());
     } else {
       assertEquals(expected, WideningTypeRule.max(v1, v2));
@@ -123,10 +128,9 @@ public void max(ExprCoreType v1, ExprCoreType v2, ExprCoreType expected) {
 
   @Test
   public void maxOfUndefinedAndOthersShouldBeTheOtherType() {
-    ExprCoreType.coreTypes().forEach(type ->
-        assertEquals(type, WideningTypeRule.max(type, UNDEFINED)));
-    ExprCoreType.coreTypes().forEach(type ->
-        assertEquals(type, WideningTypeRule.max(UNDEFINED, type)));
+    ExprCoreType.coreTypes()
+        .forEach(type -> assertEquals(type, WideningTypeRule.max(type, UNDEFINED)));
+    ExprCoreType.coreTypes()
+        .forEach(type -> assertEquals(type, WideningTypeRule.max(UNDEFINED, type)));
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/operator/arthmetic/ArithmeticFunctionTest.java b/core/src/test/java/org/opensearch/sql/expression/operator/arthmetic/ArithmeticFunctionTest.java
index 7c0c6f8a82..24c0d0decf 100644
--- a/core/src/test/java/org/opensearch/sql/expression/operator/arthmetic/ArithmeticFunctionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/operator/arthmetic/ArithmeticFunctionTest.java
@@ -3,25 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.operator.arthmetic;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opensearch.sql.config.TestConfig.INT_TYPE_MISSING_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.INT_TYPE_NULL_VALUE_FIELD;
-import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_MISSING;
-import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_NULL;
-import static org.opensearch.sql.data.model.ExprValueUtils.integerValue;
-import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
-import static org.opensearch.sql.data.type.ExprCoreType.SHORT;
 import static org.opensearch.sql.expression.DSL.literal;
-import static org.opensearch.sql.expression.DSL.ref;
 
 import com.google.common.collect.Lists;
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.Function;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -39,31 +30,43 @@
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.data.type.WideningTypeRule;
+import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.expression.DSL;
-import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ExpressionTestBase;
 import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class ArithmeticFunctionTest extends ExpressionTestBase {
-
   private static Stream<Arguments> arithmeticFunctionArguments() {
-    List<ExprValue> numberOp1 = Arrays.asList(new ExprByteValue(3), new ExprShortValue(3),
-        new ExprIntegerValue(3), new ExprLongValue(3L), new ExprFloatValue(3f),
-        new ExprDoubleValue(3D));
+    List<ExprValue> numberOp1 =
+        Arrays.asList(
+            new ExprByteValue(3),
+            new ExprShortValue(3),
+            new ExprIntegerValue(3),
+            new ExprLongValue(3L),
+            new ExprFloatValue(3f),
+            new ExprDoubleValue(3D));
     List<ExprValue> numberOp2 =
-        Arrays.asList(new ExprByteValue(2), new ExprShortValue(2), new ExprIntegerValue(2),
+        Arrays.asList(
+            new ExprByteValue(2),
+            new ExprShortValue(2),
+            new ExprIntegerValue(2),
             new ExprLongValue(3L),
-            new ExprFloatValue(2f), new ExprDoubleValue(2D));
+            new ExprFloatValue(2f),
+            new ExprDoubleValue(2D));
     return Lists.cartesianProduct(numberOp1, numberOp2).stream()
         .map(list -> Arguments.of(list.get(0), list.get(1)));
   }
 
   private static Stream<Arguments> arithmeticOperatorArguments() {
-    return Stream
-        .of(BuiltinFunctionName.ADD, BuiltinFunctionName.SUBTRACT, BuiltinFunctionName.MULTIPLY,
-            BuiltinFunctionName.DIVIDE, BuiltinFunctionName.DIVIDE).map(Arguments::of);
+    return Stream.of(
+            BuiltinFunctionName.ADD,
+            BuiltinFunctionName.SUBTRACT,
+            BuiltinFunctionName.MULTIPLY,
+            BuiltinFunctionName.DIVIDE,
+            BuiltinFunctionName.DIVIDE)
+        .map(Arguments::of);
   }
 
   @ParameterizedTest(name = "add({1}, {2})")
@@ -76,81 +79,83 @@ public void add(ExprValue op1, ExprValue op2) {
     assertEquals(String.format("+(%s, %s)", op1.toString(), op2.toString()), expression.toString());
   }
 
-  @ParameterizedTest(name = "{0}(int,null)")
-  @MethodSource("arithmeticOperatorArguments")
-  public void arithmetic_int_null(BuiltinFunctionName builtinFunctionName) {
-    Function<
-        List<Expression>, FunctionExpression> function = functionMapping(builtinFunctionName);
-
-    FunctionExpression functionExpression =
-        function.apply(Arrays.asList(literal(integerValue(1)),
-            ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER)));
-    assertEquals(INTEGER, functionExpression.type());
-    assertEquals(LITERAL_NULL, functionExpression.valueOf(valueEnv()));
-
-    functionExpression = function.apply(
-        Arrays.asList(ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), literal(integerValue(1))));
-    assertEquals(INTEGER, functionExpression.type());
-    assertEquals(LITERAL_NULL, functionExpression.valueOf(valueEnv()));
+  @ParameterizedTest(name = "addFunction({1}, {2})")
+  @MethodSource("arithmeticFunctionArguments")
+  public void addFunction(ExprValue op1, ExprValue op2) {
+    FunctionExpression expression = DSL.addFunction(literal(op1), literal(op2));
+    ExprType expectedType = WideningTypeRule.max(op1.type(), op2.type());
+    assertEquals(expectedType, expression.type());
+    assertValueEqual(BuiltinFunctionName.ADDFUNCTION, expectedType, op1, op2, expression.valueOf());
+    assertEquals(
+        String.format("add(%s, %s)", op1.toString(), op2.toString()), expression.toString());
   }
 
-  @ParameterizedTest(name = "{0}(int,missing)")
-  @MethodSource("arithmeticOperatorArguments")
-  public void arithmetic_int_missing(BuiltinFunctionName builtinFunctionName) {
-    Function<
-        List<Expression>, FunctionExpression> function = functionMapping(builtinFunctionName);
-    FunctionExpression functionExpression =
-        function.apply(Arrays.asList(literal(integerValue(1)),
-            ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER)));
-    assertEquals(INTEGER, functionExpression.type());
-    assertEquals(LITERAL_MISSING, functionExpression.valueOf(valueEnv()));
+  @ParameterizedTest(name = "subtract({1}, {2})")
+  @MethodSource("arithmeticFunctionArguments")
+  public void subtract(ExprValue op1, ExprValue op2) {
+    FunctionExpression expression = DSL.subtract(literal(op1), literal(op2));
+    ExprType expectedType = WideningTypeRule.max(op1.type(), op2.type());
+    assertEquals(expectedType, expression.type());
+    assertValueEqual(BuiltinFunctionName.SUBTRACT, expectedType, op1, op2, expression.valueOf());
+    assertEquals(String.format("-(%s, %s)", op1.toString(), op2.toString()), expression.toString());
+  }
 
-    functionExpression = function.apply(Arrays.asList(ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        literal(integerValue(1))));
-    assertEquals(INTEGER, functionExpression.type());
-    assertEquals(LITERAL_MISSING, functionExpression.valueOf(valueEnv()));
+  @ParameterizedTest(name = "subtractFunction({1}, {2})")
+  @MethodSource("arithmeticFunctionArguments")
+  public void subtractFunction(ExprValue op1, ExprValue op2) {
+    FunctionExpression expression = DSL.subtractFunction(literal(op1), literal(op2));
+    ExprType expectedType = WideningTypeRule.max(op1.type(), op2.type());
+    assertEquals(expectedType, expression.type());
+    assertValueEqual(
+        BuiltinFunctionName.SUBTRACTFUNCTION, expectedType, op1, op2, expression.valueOf());
+    assertEquals(
+        String.format("subtract(%s, %s)", op1.toString(), op2.toString()), expression.toString());
   }
 
-  @ParameterizedTest(name = "{0}(null,missing)")
-  @MethodSource("arithmeticOperatorArguments")
-  public void arithmetic_null_missing(BuiltinFunctionName builtinFunctionName) {
-    Function<
-        List<Expression>, FunctionExpression> function = functionMapping(builtinFunctionName);
-    FunctionExpression functionExpression = function.apply(
-        Arrays.asList(ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-            ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER)));
-    assertEquals(INTEGER, functionExpression.type());
-    assertEquals(LITERAL_NULL, functionExpression.valueOf(valueEnv()));
+  @ParameterizedTest(name = "mod({1}, {2})")
+  @MethodSource("arithmeticFunctionArguments")
+  public void mod(ExprValue op1, ExprValue op2) {
+    FunctionExpression expression = DSL.mod(literal(op1), literal(op2));
+    ExprType expectedType = WideningTypeRule.max(op1.type(), op2.type());
+    assertEquals(expectedType, expression.type());
+    assertValueEqual(BuiltinFunctionName.MOD, expectedType, op1, op2, expression.valueOf());
+    assertEquals(
+        String.format("mod(%s, %s)", op1.toString(), op2.toString()), expression.toString());
 
-    functionExpression = function.apply(
-        Arrays.asList(ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-            ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER)));
-    assertEquals(INTEGER, functionExpression.type());
-    assertEquals(LITERAL_MISSING, functionExpression.valueOf(valueEnv()));
+    expression = DSL.mod(literal(op1), literal(new ExprByteValue(0)));
+    assertTrue(expression.valueOf(valueEnv()).isNull());
+    assertEquals(String.format("mod(%s, 0)", op1.toString()), expression.toString());
+  }
 
-    functionExpression = function.apply(
-        Arrays.asList(ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-            ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER)));
-    assertEquals(INTEGER, functionExpression.type());
-    assertEquals(LITERAL_MISSING, functionExpression.valueOf(valueEnv()));
+  @ParameterizedTest(name = "modulus({1}, {2})")
+  @MethodSource("arithmeticFunctionArguments")
+  public void modulus(ExprValue op1, ExprValue op2) {
+    FunctionExpression expression = DSL.modulus(literal(op1), literal(op2));
+    ExprType expectedType = WideningTypeRule.max(op1.type(), op2.type());
+    assertEquals(expectedType, expression.type());
+    assertValueEqual(BuiltinFunctionName.MODULUS, expectedType, op1, op2, expression.valueOf());
+    assertEquals(
+        String.format("%%(%s, %s)", op1.toString(), op2.toString()), expression.toString());
 
-    functionExpression = function.apply(
-        Arrays.asList(ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-            ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER)));
-    assertEquals(INTEGER, functionExpression.type());
-    assertEquals(LITERAL_MISSING, functionExpression.valueOf(valueEnv()));
+    expression = DSL.modulus(literal(op1), literal(new ExprByteValue(0)));
+    assertTrue(expression.valueOf(valueEnv()).isNull());
+    assertEquals(String.format("%%(%s, 0)", op1.toString()), expression.toString());
   }
 
-  @ParameterizedTest(name = "subtract({1}, {2})")
+  @ParameterizedTest(name = "modulusFunction({1}, {2})")
   @MethodSource("arithmeticFunctionArguments")
-  public void subtract(ExprValue op1, ExprValue op2) {
-    FunctionExpression expression = DSL.subtract(literal(op1), literal(op2));
+  public void modulusFunction(ExprValue op1, ExprValue op2) {
+    FunctionExpression expression = DSL.modulusFunction(literal(op1), literal(op2));
     ExprType expectedType = WideningTypeRule.max(op1.type(), op2.type());
     assertEquals(expectedType, expression.type());
-    assertValueEqual(BuiltinFunctionName.SUBTRACT, expectedType, op1, op2,
-        expression.valueOf());
-    assertEquals(String.format("-(%s, %s)", op1.toString(), op2.toString()),
-        expression.toString());
+    assertValueEqual(
+        BuiltinFunctionName.MODULUSFUNCTION, expectedType, op1, op2, expression.valueOf());
+    assertEquals(
+        String.format("modulus(%s, %s)", op1.toString(), op2.toString()), expression.toString());
+
+    expression = DSL.modulusFunction(literal(op1), literal(new ExprByteValue(0)));
+    assertTrue(expression.valueOf(valueEnv()).isNull());
+    assertEquals(String.format("modulus(%s, 0)", op1.toString()), expression.toString());
   }
 
   @ParameterizedTest(name = "multiply({1}, {2})")
@@ -159,10 +164,20 @@ public void multiply(ExprValue op1, ExprValue op2) {
     FunctionExpression expression = DSL.multiply(literal(op1), literal(op2));
     ExprType expectedType = WideningTypeRule.max(op1.type(), op2.type());
     assertEquals(expectedType, expression.type());
-    assertValueEqual(BuiltinFunctionName.MULTIPLY, expectedType, op1, op2,
-        expression.valueOf());
-    assertEquals(String.format("*(%s, %s)", op1.toString(), op2.toString()),
-        expression.toString());
+    assertValueEqual(BuiltinFunctionName.MULTIPLY, expectedType, op1, op2, expression.valueOf());
+    assertEquals(String.format("*(%s, %s)", op1.toString(), op2.toString()), expression.toString());
+  }
+
+  @ParameterizedTest(name = "multiplyFunction({1}, {2})")
+  @MethodSource("arithmeticFunctionArguments")
+  public void multiplyFunction(ExprValue op1, ExprValue op2) {
+    FunctionExpression expression = DSL.multiplyFunction(literal(op1), literal(op2));
+    ExprType expectedType = WideningTypeRule.max(op1.type(), op2.type());
+    assertEquals(expectedType, expression.type());
+    assertValueEqual(
+        BuiltinFunctionName.MULTIPLYFUNCTION, expectedType, op1, op2, expression.valueOf());
+    assertEquals(
+        String.format("multiply(%s, %s)", op1.toString(), op2.toString()), expression.toString());
   }
 
   @ParameterizedTest(name = "divide({1}, {2})")
@@ -172,37 +187,77 @@ public void divide(ExprValue op1, ExprValue op2) {
     ExprType expectedType = WideningTypeRule.max(op1.type(), op2.type());
     assertEquals(expectedType, expression.type());
     assertValueEqual(BuiltinFunctionName.DIVIDE, expectedType, op1, op2, expression.valueOf());
-    assertEquals(String.format("/(%s, %s)", op1.toString(), op2.toString()),
-        expression.toString());
+    assertEquals(String.format("/(%s, %s)", op1.toString(), op2.toString()), expression.toString());
 
-    expression = DSL.divide(literal(op1), literal(new ExprShortValue(0)));
-    expectedType = WideningTypeRule.max(op1.type(), SHORT);
-    assertEquals(expectedType, expression.type());
+    expression = DSL.divide(literal(op1), literal(new ExprByteValue(0)));
     assertTrue(expression.valueOf(valueEnv()).isNull());
     assertEquals(String.format("/(%s, 0)", op1.toString()), expression.toString());
   }
 
-  @ParameterizedTest(name = "module({1}, {2})")
+  @ParameterizedTest(name = "divideFunction({1}, {2})")
   @MethodSource("arithmeticFunctionArguments")
-  public void module(ExprValue op1, ExprValue op2) {
-    FunctionExpression expression = DSL.module(literal(op1), literal(op2));
+  public void divideFunction(ExprValue op1, ExprValue op2) {
+    FunctionExpression expression = DSL.divideFunction(literal(op1), literal(op2));
     ExprType expectedType = WideningTypeRule.max(op1.type(), op2.type());
     assertEquals(expectedType, expression.type());
-    assertValueEqual(BuiltinFunctionName.MODULES, expectedType, op1, op2, expression.valueOf());
-    assertEquals(String.format("%%(%s, %s)", op1.toString(), op2.toString()),
-        expression.toString());
+    assertValueEqual(
+        BuiltinFunctionName.DIVIDEFUNCTION, expectedType, op1, op2, expression.valueOf());
+    assertEquals(
+        String.format("divide(%s, %s)", op1.toString(), op2.toString()), expression.toString());
 
-    expression = DSL.module(literal(op1), literal(new ExprShortValue(0)));
-    expectedType = WideningTypeRule.max(op1.type(), SHORT);
-    assertEquals(expectedType, expression.type());
+    expression = DSL.divideFunction(literal(op1), literal(new ExprByteValue(0)));
     assertTrue(expression.valueOf(valueEnv()).isNull());
-    assertEquals(String.format("%%(%s, 0)", op1.toString()), expression.toString());
+    assertEquals(String.format("divide(%s, 0)", op1.toString()), expression.toString());
+  }
+
+  @ParameterizedTest(name = "multipleParameters({1},{2})")
+  @MethodSource("arithmeticFunctionArguments")
+  public void multipleParameters(ExprValue op1) {
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> DSL.add(literal(op1), literal(op1), literal(op1)));
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> DSL.addFunction(literal(op1), literal(op1), literal(op1)));
+
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> DSL.subtract(literal(op1), literal(op1), literal(op1)));
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> DSL.subtractFunction(literal(op1), literal(op1), literal(op1)));
+
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> DSL.multiply(literal(op1), literal(op1), literal(op1)));
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> DSL.multiplyFunction(literal(op1), literal(op1), literal(op1)));
+
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> DSL.divide(literal(op1), literal(op1), literal(op1)));
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> DSL.divideFunction(literal(op1), literal(op1), literal(op1)));
+
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> DSL.mod(literal(op1), literal(op1), literal(op1)));
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> DSL.modulus(literal(op1), literal(op1), literal(op1)));
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> DSL.modulusFunction(literal(op1), literal(op1), literal(op1)));
   }
 
-  protected void assertValueEqual(BuiltinFunctionName builtinFunctionName, ExprType type,
-                                  ExprValue op1,
-                                  ExprValue op2,
-                                  ExprValue actual) {
+  protected void assertValueEqual(
+      BuiltinFunctionName builtinFunctionName,
+      ExprType type,
+      ExprValue op1,
+      ExprValue op2,
+      ExprValue actual) {
     switch ((ExprCoreType) type) {
       case BYTE:
         Byte vb1 = op1.byteValue();
@@ -210,19 +265,25 @@ protected void assertValueEqual(BuiltinFunctionName builtinFunctionName, ExprTyp
         Integer vbActual = actual.integerValue();
         switch (builtinFunctionName) {
           case ADD:
+          case ADDFUNCTION:
             assertEquals(vb1 + vb2, vbActual);
             return;
-          case SUBTRACT:
-            assertEquals(vb1 - vb2, vbActual);
-            return;
           case DIVIDE:
+          case DIVIDEFUNCTION:
             assertEquals(vb1 / vb2, vbActual);
             return;
+          case MOD:
+          case MODULUS:
+          case MODULUSFUNCTION:
+            assertEquals(vb1 % vb2, vbActual);
+            return;
           case MULTIPLY:
+          case MULTIPLYFUNCTION:
             assertEquals(vb1 * vb2, vbActual);
             return;
-          case MODULES:
-            assertEquals(vb1 % vb2, vbActual);
+          case SUBTRACT:
+          case SUBTRACTFUNCTION:
+            assertEquals(vb1 - vb2, vbActual);
             return;
           default:
             throw new IllegalStateException("illegal function name: " + builtinFunctionName);
@@ -233,19 +294,25 @@ protected void assertValueEqual(BuiltinFunctionName builtinFunctionName, ExprTyp
         Integer vsActual = actual.integerValue();
         switch (builtinFunctionName) {
           case ADD:
+          case ADDFUNCTION:
             assertEquals(vs1 + vs2, vsActual);
             return;
-          case SUBTRACT:
-            assertEquals(vs1 - vs2, vsActual);
-            return;
           case DIVIDE:
+          case DIVIDEFUNCTION:
             assertEquals(vs1 / vs2, vsActual);
             return;
+          case MOD:
+          case MODULUS:
+          case MODULUSFUNCTION:
+            assertEquals(vs1 % vs2, vsActual);
+            return;
           case MULTIPLY:
+          case MULTIPLYFUNCTION:
             assertEquals(vs1 * vs2, vsActual);
             return;
-          case MODULES:
-            assertEquals(vs1 % vs2, vsActual);
+          case SUBTRACT:
+          case SUBTRACTFUNCTION:
+            assertEquals(vs1 - vs2, vsActual);
             return;
           default:
             throw new IllegalStateException("illegal function name " + builtinFunctionName);
@@ -256,19 +323,25 @@ protected void assertValueEqual(BuiltinFunctionName builtinFunctionName, ExprTyp
         Integer viActual = ExprValueUtils.getIntegerValue(actual);
         switch (builtinFunctionName) {
           case ADD:
+          case ADDFUNCTION:
             assertEquals(vi1 + vi2, viActual);
             return;
-          case SUBTRACT:
-            assertEquals(vi1 - vi2, viActual);
-            return;
           case DIVIDE:
+          case DIVIDEFUNCTION:
             assertEquals(vi1 / vi2, viActual);
             return;
+          case MOD:
+          case MODULUS:
+          case MODULUSFUNCTION:
+            assertEquals(vi1 % vi2, viActual);
+            return;
           case MULTIPLY:
+          case MULTIPLYFUNCTION:
             assertEquals(vi1 * vi2, viActual);
             return;
-          case MODULES:
-            assertEquals(vi1 % vi2, viActual);
+          case SUBTRACT:
+          case SUBTRACTFUNCTION:
+            assertEquals(vi1 - vi2, viActual);
             return;
           default:
             throw new IllegalStateException("illegal function name " + builtinFunctionName);
@@ -279,19 +352,25 @@ protected void assertValueEqual(BuiltinFunctionName builtinFunctionName, ExprTyp
         Long vlActual = ExprValueUtils.getLongValue(actual);
         switch (builtinFunctionName) {
           case ADD:
+          case ADDFUNCTION:
             assertEquals(vl1 + vl2, vlActual);
             return;
-          case SUBTRACT:
-            assertEquals(vl1 - vl2, vlActual);
-            return;
           case DIVIDE:
+          case DIVIDEFUNCTION:
             assertEquals(vl1 / vl2, vlActual);
             return;
+          case MOD:
+          case MODULUS:
+          case MODULUSFUNCTION:
+            assertEquals(vl1 % vl2, vlActual);
+            return;
           case MULTIPLY:
+          case MULTIPLYFUNCTION:
             assertEquals(vl1 * vl2, vlActual);
             return;
-          case MODULES:
-            assertEquals(vl1 % vl2, vlActual);
+          case SUBTRACT:
+          case SUBTRACTFUNCTION:
+            assertEquals(vl1 - vl2, vlActual);
             return;
           default:
             throw new IllegalStateException("illegal function name " + builtinFunctionName);
@@ -302,19 +381,25 @@ protected void assertValueEqual(BuiltinFunctionName builtinFunctionName, ExprTyp
         Float vfActual = ExprValueUtils.getFloatValue(actual);
         switch (builtinFunctionName) {
           case ADD:
+          case ADDFUNCTION:
             assertEquals(vf1 + vf2, vfActual);
             return;
-          case SUBTRACT:
-            assertEquals(vf1 - vf2, vfActual);
-            return;
           case DIVIDE:
+          case DIVIDEFUNCTION:
             assertEquals(vf1 / vf2, vfActual);
             return;
+          case MODULUS:
+          case MODULUSFUNCTION:
+          case MOD:
+            assertEquals(vf1 % vf2, vfActual);
+            return;
           case MULTIPLY:
+          case MULTIPLYFUNCTION:
             assertEquals(vf1 * vf2, vfActual);
             return;
-          case MODULES:
-            assertEquals(vf1 % vf2, vfActual);
+          case SUBTRACT:
+          case SUBTRACTFUNCTION:
+            assertEquals(vf1 - vf2, vfActual);
             return;
           default:
             throw new IllegalStateException("illegal function name " + builtinFunctionName);
@@ -325,19 +410,25 @@ protected void assertValueEqual(BuiltinFunctionName builtinFunctionName, ExprTyp
         Double vdActual = ExprValueUtils.getDoubleValue(actual);
         switch (builtinFunctionName) {
           case ADD:
+          case ADDFUNCTION:
             assertEquals(vd1 + vd2, vdActual);
             return;
-          case SUBTRACT:
-            assertEquals(vd1 - vd2, vdActual);
-            return;
           case DIVIDE:
+          case DIVIDEFUNCTION:
             assertEquals(vd1 / vd2, vdActual);
             return;
+          case MOD:
+          case MODULUS:
+          case MODULUSFUNCTION:
+            assertEquals(vd1 % vd2, vdActual);
+            return;
           case MULTIPLY:
+          case MULTIPLYFUNCTION:
             assertEquals(vd1 * vd2, vdActual);
             return;
-          case MODULES:
-            assertEquals(vd1 % vd2, vdActual);
+          case SUBTRACT:
+          case SUBTRACTFUNCTION:
+            assertEquals(vd1 - vd2, vdActual);
             return;
           default:
             throw new IllegalStateException("illegal function name " + builtinFunctionName);
diff --git a/core/src/test/java/org/opensearch/sql/expression/operator/arthmetic/MathematicalFunctionTest.java b/core/src/test/java/org/opensearch/sql/expression/operator/arthmetic/MathematicalFunctionTest.java
index 3d7cdaeb41..e084bf1d53 100644
--- a/core/src/test/java/org/opensearch/sql/expression/operator/arthmetic/MathematicalFunctionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/operator/arthmetic/MathematicalFunctionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.operator.arthmetic;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -12,12 +11,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opensearch.sql.config.TestConfig.DOUBLE_TYPE_MISSING_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.DOUBLE_TYPE_NULL_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.INT_TYPE_MISSING_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.INT_TYPE_NULL_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.STRING_TYPE_MISSING_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.STRING_TYPE_NULL_VALUE_FIELD;
 import static org.opensearch.sql.data.model.ExprValueUtils.getDoubleValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.getFloatValue;
 import static org.opensearch.sql.data.type.ExprCoreType.BYTE;
@@ -81,23 +74,31 @@ private static Stream<Arguments> testLogDoubleArguments() {
     return builder.add(Arguments.of(2D, 2D)).build();
   }
 
+  private static Stream<Arguments> testLogInvalidDoubleArguments() {
+    return Stream.of(Arguments.of(0D, -2D), Arguments.of(0D, 2D), Arguments.of(2D, 0D));
+  }
+
   private static Stream<Arguments> trigonometricArguments() {
     Stream.Builder<Arguments> builder = Stream.builder();
     return builder
-        .add(Arguments.of(1)).add(Arguments.of(1L)).add(Arguments.of(1F)).add(Arguments.of(1D))
+        .add(Arguments.of(1))
+        .add(Arguments.of(1L))
+        .add(Arguments.of(1F))
+        .add(Arguments.of(1D))
         .build();
   }
 
   private static Stream<Arguments> trigonometricDoubleArguments() {
     Stream.Builder<Arguments> builder = Stream.builder();
     return builder
-        .add(Arguments.of(1, 2)).add(Arguments.of(1L, 2L)).add(Arguments.of(1F, 2F))
-        .add(Arguments.of(1D, 2D)).build();
+        .add(Arguments.of(1, 2))
+        .add(Arguments.of(1L, 2L))
+        .add(Arguments.of(1F, 2F))
+        .add(Arguments.of(1D, 2D))
+        .build();
   }
 
-  /**
-   * Test abs with byte value.
-   */
+  /** Test abs with byte value. */
   @ParameterizedTest(name = "abs({0})")
   @ValueSource(bytes = {-2, 2})
   public void abs_byte_value(Byte value) {
@@ -106,61 +107,43 @@ public void abs_byte_value(Byte value) {
     assertEquals(String.format("abs(%s)", value.toString()), abs.toString());
   }
 
-  /**
-   * Test abs with integer value.
-   */
+  /** Test abs with integer value. */
   @ParameterizedTest(name = "abs({0})")
   @ValueSource(ints = {-2, 2})
   public void abs_int_value(Integer value) {
     FunctionExpression abs = DSL.abs(DSL.literal(value));
-    assertThat(
-        abs.valueOf(valueEnv()),
-        allOf(hasType(INTEGER), hasValue(Math.abs(value))));
+    assertThat(abs.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue(Math.abs(value))));
     assertEquals(String.format("abs(%s)", value.toString()), abs.toString());
   }
 
-  /**
-   * Test abs with long value.
-   */
+  /** Test abs with long value. */
   @ParameterizedTest(name = "abs({0})")
   @ValueSource(longs = {-2L, 2L})
   public void abs_long_value(Long value) {
     FunctionExpression abs = DSL.abs(DSL.literal(value));
-    assertThat(
-        abs.valueOf(valueEnv()),
-        allOf(hasType(LONG), hasValue(Math.abs(value))));
+    assertThat(abs.valueOf(valueEnv()), allOf(hasType(LONG), hasValue(Math.abs(value))));
     assertEquals(String.format("abs(%s)", value.toString()), abs.toString());
   }
 
-  /**
-   * Test abs with float value.
-   */
+  /** Test abs with float value. */
   @ParameterizedTest(name = "abs({0})")
   @ValueSource(floats = {-2f, 2f})
   public void abs_float_value(Float value) {
     FunctionExpression abs = DSL.abs(DSL.literal(value));
-    assertThat(
-        abs.valueOf(valueEnv()),
-        allOf(hasType(FLOAT), hasValue(Math.abs(value))));
+    assertThat(abs.valueOf(valueEnv()), allOf(hasType(FLOAT), hasValue(Math.abs(value))));
     assertEquals(String.format("abs(%s)", value.toString()), abs.toString());
   }
 
-  /**
-   * Test abs with double value.
-   */
+  /** Test abs with double value. */
   @ParameterizedTest(name = "abs({0})")
   @ValueSource(doubles = {-2L, 2L})
   public void abs_double_value(Double value) {
     FunctionExpression abs = DSL.abs(DSL.literal(value));
-    assertThat(
-        abs.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.abs(value))));
+    assertThat(abs.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.abs(value))));
     assertEquals(String.format("abs(%s)", value.toString()), abs.toString());
   }
 
-  /**
-   * Test abs with short value.
-   */
+  /** Test abs with short value. */
   @ParameterizedTest(name = "abs({0})")
   @ValueSource(shorts = {-2, 2})
   public void abs_short_value(Short value) {
@@ -171,117 +154,77 @@ public void abs_short_value(Short value) {
     assertEquals(String.format("abs(%s)", value.toString()), abs.toString());
   }
 
-  @Test
-  public void abs_null_value() {
-    assertTrue(DSL.abs(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER)).valueOf(valueEnv()).isNull());
-  }
-
-  @Test
-  public void abs_missing_value() {
-    assertTrue(
-        DSL.abs(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER)).valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test ceil/ceiling with integer value.
-   */
+  /** Test ceil/ceiling with integer value. */
   @ParameterizedTest(name = "ceil({0})")
   @ValueSource(ints = {2, -2})
   public void ceil_int_value(Integer value) {
     FunctionExpression ceil = DSL.ceil(DSL.literal(value));
-    assertThat(
-        ceil.valueOf(valueEnv()),
-        allOf(hasType(INTEGER), hasValue((int) Math.ceil(value))));
+    assertThat(ceil.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.ceil(value))));
     assertEquals(String.format("ceil(%s)", value.toString()), ceil.toString());
 
     FunctionExpression ceiling = DSL.ceiling(DSL.literal(value));
     assertThat(
-        ceiling.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.ceil(value))));
+        ceiling.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.ceil(value))));
     assertEquals(String.format("ceiling(%s)", value.toString()), ceiling.toString());
   }
 
-  /**
-   * Test ceil/ceiling with long value.
-   */
+  /** Test ceil/ceiling with long value. */
   @ParameterizedTest(name = "ceil({0})")
   @ValueSource(longs = {2L, -2L})
   public void ceil_long_value(Long value) {
     FunctionExpression ceil = DSL.ceil(DSL.literal(value));
+    assertThat(ceil.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.ceil(value))));
+    assertEquals(String.format("ceil(%s)", value.toString()), ceil.toString());
+
+    FunctionExpression ceiling = DSL.ceiling(DSL.literal(value));
     assertThat(
-        ceil.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.ceil(value))));
+        ceiling.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.ceil(value))));
+    assertEquals(String.format("ceiling(%s)", value.toString()), ceiling.toString());
+  }
+
+  /** Test ceil/ceiling with long value. */
+  @ParameterizedTest(name = "ceil({0})")
+  @ValueSource(longs = {9223372036854775805L, -9223372036854775805L})
+  public void ceil_long_value_long(Long value) {
+    FunctionExpression ceil = DSL.ceil(DSL.literal(value));
+    assertThat(ceil.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.ceil(value))));
     assertEquals(String.format("ceil(%s)", value.toString()), ceil.toString());
 
     FunctionExpression ceiling = DSL.ceiling(DSL.literal(value));
     assertThat(
-        ceiling.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.ceil(value))));
+        ceiling.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.ceil(value))));
     assertEquals(String.format("ceiling(%s)", value.toString()), ceiling.toString());
   }
 
-  /**
-   * Test ceil/ceiling with float value.
-   */
+  /** Test ceil/ceiling with float value. */
   @ParameterizedTest(name = "ceil({0})")
   @ValueSource(floats = {2F, -2F})
   public void ceil_float_value(Float value) {
     FunctionExpression ceil = DSL.ceil(DSL.literal(value));
-    assertThat(
-        ceil.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.ceil(value))));
+    assertThat(ceil.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.ceil(value))));
     assertEquals(String.format("ceil(%s)", value.toString()), ceil.toString());
 
     FunctionExpression ceiling = DSL.ceiling(DSL.literal(value));
     assertThat(
-        ceiling.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.ceil(value))));
+        ceiling.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.ceil(value))));
     assertEquals(String.format("ceiling(%s)", value.toString()), ceiling.toString());
   }
 
-  /**
-   * Test ceil/ceiling with double value.
-   */
+  /** Test ceil/ceiling with double value. */
   @ParameterizedTest(name = "ceil({0})")
   @ValueSource(doubles = {-2L, 2L})
   public void ceil_double_value(Double value) {
     FunctionExpression ceil = DSL.ceil(DSL.literal(value));
-    assertThat(
-        ceil.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.ceil(value))));
+    assertThat(ceil.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.ceil(value))));
     assertEquals(String.format("ceil(%s)", value.toString()), ceil.toString());
 
     FunctionExpression ceiling = DSL.ceiling(DSL.literal(value));
     assertThat(
-        ceiling.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.ceil(value))));
+        ceiling.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.ceil(value))));
     assertEquals(String.format("ceiling(%s)", value.toString()), ceiling.toString());
   }
 
-  /**
-   * Test ceil/ceiling with null value.
-   */
-  @Test
-  public void ceil_null_value() {
-    FunctionExpression ceil = DSL.ceil(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(INTEGER, ceil.type());
-    assertTrue(ceil.valueOf(valueEnv()).isNull());
-
-    FunctionExpression ceiling = DSL.ceiling(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(INTEGER, ceiling.type());
-    assertTrue(ceiling.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test ceil/ceiling with missing value.
-   */
-  @Test
-  public void ceil_missing_value() {
-    FunctionExpression ceil = DSL.ceil(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(INTEGER, ceil.type());
-    assertTrue(ceil.valueOf(valueEnv()).isMissing());
-
-    FunctionExpression ceiling = DSL.ceiling(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(INTEGER, ceiling.type());
-    assertTrue(ceiling.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test conv from decimal base with string as a number.
-   */
+  /** Test conv from decimal base with string as a number. */
   @ParameterizedTest(name = "conv({0})")
   @ValueSource(strings = {"1", "0", "-1"})
   public void conv_from_decimal(String value) {
@@ -304,34 +247,27 @@ public void conv_from_decimal(String value) {
     assertEquals(String.format("conv(\"%s\", 10, 16)", value), conv.toString());
   }
 
-  /**
-   * Test conv from decimal base with integer as a number.
-   */
+  /** Test conv from decimal base with integer as a number. */
   @ParameterizedTest(name = "conv({0})")
   @ValueSource(ints = {1, 0, -1})
   public void conv_from_decimal(Integer value) {
     FunctionExpression conv = DSL.conv(DSL.literal(value), DSL.literal(10), DSL.literal(2));
     assertThat(
-        conv.valueOf(valueEnv()),
-        allOf(hasType(STRING), hasValue(Integer.toString(value, 2))));
+        conv.valueOf(valueEnv()), allOf(hasType(STRING), hasValue(Integer.toString(value, 2))));
     assertEquals(String.format("conv(%s, 10, 2)", value), conv.toString());
 
     conv = DSL.conv(DSL.literal(value), DSL.literal(10), DSL.literal(8));
     assertThat(
-        conv.valueOf(valueEnv()),
-        allOf(hasType(STRING), hasValue(Integer.toString(value, 8))));
+        conv.valueOf(valueEnv()), allOf(hasType(STRING), hasValue(Integer.toString(value, 8))));
     assertEquals(String.format("conv(%s, 10, 8)", value), conv.toString());
 
     conv = DSL.conv(DSL.literal(value), DSL.literal(10), DSL.literal(16));
     assertThat(
-        conv.valueOf(valueEnv()),
-        allOf(hasType(STRING), hasValue(Integer.toString(value, 16))));
+        conv.valueOf(valueEnv()), allOf(hasType(STRING), hasValue(Integer.toString(value, 16))));
     assertEquals(String.format("conv(%s, 10, 16)", value), conv.toString());
   }
 
-  /**
-   * Test conv to decimal base with string as a number.
-   */
+  /** Test conv to decimal base with string as a number. */
   @ParameterizedTest(name = "conv({0})")
   @ValueSource(strings = {"11", "0", "11111"})
   public void conv_to_decimal(String value) {
@@ -354,9 +290,7 @@ public void conv_to_decimal(String value) {
     assertEquals(String.format("conv(\"%s\", 16, 10)", value), conv.toString());
   }
 
-  /**
-   * Test conv to decimal base with integer as a number.
-   */
+  /** Test conv to decimal base with integer as a number. */
   @ParameterizedTest(name = "conv({0})")
   @ValueSource(ints = {11, 0, 11111})
   public void conv_to_decimal(Integer value) {
@@ -379,684 +313,396 @@ public void conv_to_decimal(Integer value) {
     assertEquals(String.format("conv(%s, 16, 10)", value), conv.toString());
   }
 
-  /**
-   * Test conv with null value.
-   */
-  @Test
-  public void conv_null_value() {
-    FunctionExpression conv = DSL.conv(
-        DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING), DSL.literal(10), DSL.literal(2));
-    assertEquals(STRING, conv.type());
-    assertTrue(conv.valueOf(valueEnv()).isNull());
-
-    conv = DSL.conv(
-        DSL.literal("1"), DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.literal(2));
-    assertEquals(STRING, conv.type());
-    assertTrue(conv.valueOf(valueEnv()).isNull());
-
-    conv = DSL.conv(
-        DSL.literal("1"), DSL.literal(10), DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(STRING, conv.type());
-    assertTrue(conv.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test conv with missing value.
-   */
-  @Test
-  public void conv_missing_value() {
-    FunctionExpression conv = DSL.conv(
-        DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING), DSL.literal(10), DSL.literal(2));
-    assertEquals(STRING, conv.type());
-    assertTrue(conv.valueOf(valueEnv()).isMissing());
-
-    conv = DSL.conv(
-        DSL.literal("1"), DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER), DSL.literal(2));
-    assertEquals(STRING, conv.type());
-    assertTrue(conv.valueOf(valueEnv()).isMissing());
-
-    conv = DSL.conv(
-        DSL.literal("1"), DSL.literal(10), DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(STRING, conv.type());
-    assertTrue(conv.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test conv with null and missing values.
-   */
-  @Test
-  public void conv_null_missing() {
-    FunctionExpression conv = DSL.conv(DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER), DSL.literal(2));
-    assertEquals(STRING, conv.type());
-    assertTrue(conv.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test crc32 with string value.
-   */
+  /** Test crc32 with string value. */
   @ParameterizedTest(name = "crc({0})")
   @ValueSource(strings = {"odfe", "sql"})
   public void crc32_string_value(String value) {
     FunctionExpression crc = DSL.crc32(DSL.literal(value));
     CRC32 crc32 = new CRC32();
     crc32.update(value.getBytes());
-    assertThat(
-        crc.valueOf(valueEnv()),
-        allOf(hasType(LONG), hasValue(crc32.getValue())));
+    assertThat(crc.valueOf(valueEnv()), allOf(hasType(LONG), hasValue(crc32.getValue())));
     assertEquals(String.format("crc32(\"%s\")", value), crc.toString());
   }
 
-  /**
-   * Test crc32 with null value.
-   */
-  @Test
-  public void crc32_null_value() {
-    FunctionExpression crc = DSL.crc32(DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING));
-    assertEquals(LONG, crc.type());
-    assertTrue(crc.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test crc32 with missing value.
-   */
-  @Test
-  public void crc32_missing_value() {
-    FunctionExpression crc = DSL.crc32(DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING));
-    assertEquals(LONG, crc.type());
-    assertTrue(crc.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test constant e.
-   */
+  /** Test constant e. */
   @Test
   public void test_e() {
     FunctionExpression e = DSL.euler();
     assertThat(e.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.E)));
   }
 
-  /**
-   * Test exp with integer value.
-   */
+  /** Test exp with integer value. */
   @ParameterizedTest(name = "exp({0})")
   @ValueSource(ints = {-2, 2})
   public void exp_int_value(Integer value) {
     FunctionExpression exp = DSL.exp(DSL.literal(value));
-    assertThat(
-        exp.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.exp(value))));
+    assertThat(exp.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.exp(value))));
     assertEquals(String.format("exp(%s)", value.toString()), exp.toString());
   }
 
-  /**
-   * Test exp with long value.
-   */
+  /** Test exp with long value. */
   @ParameterizedTest(name = "exp({0})")
   @ValueSource(longs = {-2L, 2L})
   public void exp_long_value(Long value) {
     FunctionExpression exp = DSL.exp(DSL.literal(value));
-    assertThat(
-        exp.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.exp(value))));
+    assertThat(exp.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.exp(value))));
     assertEquals(String.format("exp(%s)", value.toString()), exp.toString());
   }
 
-  /**
-   * Test exp with float value.
-   */
+  /** Test exp with float value. */
   @ParameterizedTest(name = "exp({0})")
   @ValueSource(floats = {-2F, 2F})
   public void exp_float_value(Float value) {
     FunctionExpression exp = DSL.exp(DSL.literal(value));
-    assertThat(
-        exp.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.exp(value))));
+    assertThat(exp.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.exp(value))));
     assertEquals(String.format("exp(%s)", value.toString()), exp.toString());
   }
 
-  /**
-   * Test exp with double value.
-   */
+  /** Test exp with double value. */
   @ParameterizedTest(name = "exp({0})")
   @ValueSource(doubles = {-2D, 2D})
   public void exp_double_value(Double value) {
     FunctionExpression exp = DSL.exp(DSL.literal(value));
-    assertThat(
-        exp.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.exp(value))));
+    assertThat(exp.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.exp(value))));
     assertEquals(String.format("exp(%s)", value.toString()), exp.toString());
   }
 
-  /**
-   * Test exp with null value.
-   */
-  @Test
-  public void exp_null_value() {
-    FunctionExpression exp =  DSL.exp(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, exp.type());
-    assertTrue(exp.valueOf(valueEnv()).isNull());
+  /** Test expm1 with integer value. */
+  @ParameterizedTest(name = "expm1({0})")
+  @ValueSource(ints = {-1, 0, 1, Integer.MAX_VALUE, Integer.MIN_VALUE})
+  public void expm1_int_value(Integer value) {
+    FunctionExpression expm1 = DSL.expm1(DSL.literal(value));
+    assertThat(expm1.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.expm1(value))));
+    assertEquals(String.format("expm1(%s)", value), expm1.toString());
   }
 
-  /**
-   * Test exp with missing value.
-   */
-  @Test
-  public void exp_missing_value() {
-    FunctionExpression exp = DSL.exp(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, exp.type());
-    assertTrue(exp.valueOf(valueEnv()).isMissing());
+  /** Test expm1 with long value. */
+  @ParameterizedTest(name = "expm1({0})")
+  @ValueSource(longs = {-1L, 0L, 1L, Long.MAX_VALUE, Long.MIN_VALUE})
+  public void expm1_long_value(Long value) {
+    FunctionExpression expm1 = DSL.expm1(DSL.literal(value));
+    assertThat(expm1.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.expm1(value))));
+    assertEquals(String.format("expm1(%s)", value), expm1.toString());
+  }
+
+  /** Test expm1 with float value. */
+  @ParameterizedTest(name = "expm1({0})")
+  @ValueSource(floats = {-1.5F, -1F, 0F, 1F, 1.5F, Float.MAX_VALUE, Float.MIN_VALUE})
+  public void expm1_float_value(Float value) {
+    FunctionExpression expm1 = DSL.expm1(DSL.literal(value));
+    assertThat(expm1.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.expm1(value))));
+    assertEquals(String.format("expm1(%s)", value), expm1.toString());
+  }
+
+  /** Test expm1 with double value. */
+  @ParameterizedTest(name = "expm1({0})")
+  @ValueSource(doubles = {-1.5D, -1D, 0D, 1D, 1.5D, Double.MAX_VALUE, Double.MIN_VALUE})
+  public void expm1_double_value(Double value) {
+    FunctionExpression expm1 = DSL.expm1(DSL.literal(value));
+    assertThat(expm1.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.expm1(value))));
+    assertEquals(String.format("expm1(%s)", value), expm1.toString());
+  }
+
+  /** Test expm1 with short value. */
+  @ParameterizedTest(name = "expm1({0})")
+  @ValueSource(shorts = {-1, 0, 1, Short.MAX_VALUE, Short.MIN_VALUE})
+  public void expm1_short_value(Short value) {
+    FunctionExpression expm1 = DSL.expm1(DSL.literal(value));
+    assertThat(expm1.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.expm1(value))));
+    assertEquals(String.format("expm1(%s)", value), expm1.toString());
+  }
+
+  /** Test expm1 with byte value. */
+  @ParameterizedTest(name = "expm1({0})")
+  @ValueSource(bytes = {-1, 0, 1, Byte.MAX_VALUE, Byte.MIN_VALUE})
+  public void expm1_byte_value(Byte value) {
+    FunctionExpression expm1 = DSL.expm1(DSL.literal(value));
+    assertThat(expm1.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.expm1(value))));
+    assertEquals(String.format("expm1(%s)", value), expm1.toString());
   }
 
-  /**
-   * Test floor with integer value.
-   */
+  /** Test floor with integer value. */
   @ParameterizedTest(name = "floor({0})")
   @ValueSource(ints = {-2, 2})
   public void floor_int_value(Integer value) {
     FunctionExpression floor = DSL.floor(DSL.literal(value));
-    assertThat(
-        floor.valueOf(valueEnv()),
-        allOf(hasType(INTEGER), hasValue((int) Math.floor(value))));
-    assertEquals(String.format("floor(%s)", value.toString()), floor.toString());
+    assertThat(floor.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.floor(value))));
+    assertEquals(String.format("floor(%s)", value), floor.toString());
   }
 
-  /**
-   * Test floor with long value.
-   */
+  /** Test floor with long value. */
   @ParameterizedTest(name = "floor({0})")
   @ValueSource(longs = {-2L, 2L})
   public void floor_long_value(Long value) {
     FunctionExpression floor = DSL.floor(DSL.literal(value));
-    assertThat(
-        floor.valueOf(valueEnv()),
-        allOf(hasType(INTEGER), hasValue((int) Math.floor(value))));
+    assertThat(floor.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.floor(value))));
     assertEquals(String.format("floor(%s)", value.toString()), floor.toString());
   }
 
-  /**
-   * Test floor with float value.
-   */
+  /** Test floor with float value. */
   @ParameterizedTest(name = "floor({0})")
   @ValueSource(floats = {-2F, 2F})
   public void floor_float_value(Float value) {
     FunctionExpression floor = DSL.floor(DSL.literal(value));
-    assertThat(
-        floor.valueOf(valueEnv()),
-        allOf(hasType(INTEGER), hasValue((int) Math.floor(value))));
+    assertThat(floor.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.floor(value))));
     assertEquals(String.format("floor(%s)", value.toString()), floor.toString());
   }
 
-  /**
-   * Test floor with double value.
-   */
+  /** Test floor with double value. */
   @ParameterizedTest(name = "floor({0})")
   @ValueSource(doubles = {-2D, 2D})
   public void floor_double_value(Double value) {
     FunctionExpression floor = DSL.floor(DSL.literal(value));
-    assertThat(
-        floor.valueOf(valueEnv()),
-        allOf(hasType(INTEGER), hasValue((int) Math.floor(value))));
+    assertThat(floor.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.floor(value))));
     assertEquals(String.format("floor(%s)", value.toString()), floor.toString());
   }
 
-  /**
-   * Test floor with null value.
-   */
-  @Test
-  public void floor_null_value() {
-    FunctionExpression floor = DSL.floor(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(INTEGER, floor.type());
-    assertTrue(floor.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test floor with missing value.
-   */
-  @Test
-  public void floor_missing_value() {
-    FunctionExpression floor = DSL.floor(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(INTEGER, floor.type());
-    assertTrue(floor.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test ln with integer value.
-   */
+  /** Test ln with integer value. */
   @ParameterizedTest(name = "ln({0})")
-  @ValueSource(ints = {2, -2})
+  @ValueSource(ints = {2, 3})
   public void ln_int_value(Integer value) {
     FunctionExpression ln = DSL.ln(DSL.literal(value));
-    assertThat(
-        ln.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.log(value))));
+    assertThat(ln.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.log(value))));
     assertEquals(String.format("ln(%s)", value.toString()), ln.toString());
   }
 
-  /**
-   * Test ln with long value.
-   */
+  /** Test ln with long value. */
   @ParameterizedTest(name = "ln({0})")
-  @ValueSource(longs = {2L, -2L})
+  @ValueSource(longs = {2L, 3L})
   public void ln_long_value(Long value) {
     FunctionExpression ln = DSL.ln(DSL.literal(value));
-    assertThat(
-        ln.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.log(value))));
+    assertThat(ln.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.log(value))));
     assertEquals(String.format("ln(%s)", value.toString()), ln.toString());
   }
 
-  /**
-   * Test ln with float value.
-   */
+  /** Test ln with float value. */
   @ParameterizedTest(name = "ln({0})")
-  @ValueSource(floats = {2F, -2F})
+  @ValueSource(floats = {2F, 3F})
   public void ln_float_value(Float value) {
     FunctionExpression ln = DSL.ln(DSL.literal(value));
-    assertThat(
-        ln.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.log(value))));
+    assertThat(ln.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.log(value))));
     assertEquals(String.format("ln(%s)", value.toString()), ln.toString());
   }
 
-  /**
-   * Test ln with double value.
-   */
+  /** Test ln with double value. */
   @ParameterizedTest(name = "ln({0})")
-  @ValueSource(doubles = {2D, -2D})
+  @ValueSource(doubles = {2D, 3D})
   public void ln_double_value(Double value) {
     FunctionExpression ln = DSL.ln(DSL.literal(value));
-    assertThat(
-        ln.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.log(value))));
+    assertThat(ln.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.log(value))));
     assertEquals(String.format("ln(%s)", value.toString()), ln.toString());
   }
 
-  /**
-   * Test ln with null value.
-   */
-  @Test
-  public void ln_null_value() {
-    FunctionExpression ln = DSL.ln(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
+  /** Test ln with invalid value. */
+  @ParameterizedTest(name = "ln({0})")
+  @ValueSource(doubles = {0D, -3D})
+  public void ln_invalid_value(Double value) {
+    FunctionExpression ln = DSL.ln(DSL.literal(value));
     assertEquals(DOUBLE, ln.type());
     assertTrue(ln.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test ln with missing value.
-   */
-  @Test
-  public void ln_missing_value() {
-    FunctionExpression ln = DSL.ln(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, ln.type());
-    assertTrue(ln.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test log with 1 int argument.
-   */
+  /** Test log with 1 int argument. */
   @ParameterizedTest(name = "log({0})")
   @ValueSource(ints = {2, 3})
   public void log_int_value(Integer v) {
     FunctionExpression log = DSL.log(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v), 0.0001));
     assertEquals(String.format("log(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log with 1 long argument.
-   */
+  /** Test log with 1 long argument. */
   @ParameterizedTest(name = "log({0})")
   @ValueSource(longs = {2L, 3L})
   public void log_int_value(Long v) {
     FunctionExpression log = DSL.log(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v), 0.0001));
     assertEquals(String.format("log(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log with 1 float argument.
-   */
+  /** Test log with 1 float argument. */
   @ParameterizedTest(name = "log({0})")
   @ValueSource(floats = {2F, 3F})
   public void log_float_value(Float v) {
     FunctionExpression log = DSL.log(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v), 0.0001));
     assertEquals(String.format("log(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log with 1 double argument.
-   */
+  /** Test log with 1 double argument. */
   @ParameterizedTest(name = "log({0})")
   @ValueSource(doubles = {2D, 3D})
   public void log_double_value(Double v) {
     FunctionExpression log = DSL.log(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v), 0.0001));
     assertEquals(String.format("log(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log with 1 null value argument.
-   */
-  @Test
-  public void log_null_value() {
-    FunctionExpression log = DSL.log(
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
+  /** Test log with 1 invalid value. */
+  @ParameterizedTest(name = "log({0})")
+  @ValueSource(doubles = {0D, -3D})
+  public void log_invalid_value(Double value) {
+    FunctionExpression log = DSL.log(DSL.literal(value));
     assertEquals(DOUBLE, log.type());
     assertTrue(log.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test log with 1 missing value argument.
-   */
-  @Test
-  public void log_missing_value() {
-    FunctionExpression log = DSL.log(
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, log.type());
-    assertTrue(log.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test log with 2 int arguments.
-   */
+  /** Test log with 2 int arguments. */
   @ParameterizedTest(name = "log({0}, {1})")
   @MethodSource("testLogIntegerArguments")
   public void log_two_int_value(Integer v1, Integer v2) {
     FunctionExpression log = DSL.log(DSL.literal(v1), DSL.literal(v2));
     assertEquals(log.type(), DOUBLE);
     assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v2) / Math.log(v1), 0.0001));
+        getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v2) / Math.log(v1), 0.0001));
     assertEquals(String.format("log(%s, %s)", v1.toString(), v2.toString()), log.toString());
   }
 
-  /**
-   * Test log with 2 long arguments.
-   */
+  /** Test log with 2 long arguments. */
   @ParameterizedTest(name = "log({0}, {1})")
   @MethodSource("testLogLongArguments")
   public void log_two_long_value(Long v1, Long v2) {
     FunctionExpression log = DSL.log(DSL.literal(v1), DSL.literal(v2));
     assertEquals(log.type(), DOUBLE);
     assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v2) / Math.log(v1), 0.0001));
+        getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v2) / Math.log(v1), 0.0001));
     assertEquals(String.format("log(%s, %s)", v1.toString(), v2.toString()), log.toString());
   }
 
-  /**
-   * Test log with 2 float arguments.
-   */
+  /** Test log with 2 float arguments. */
   @ParameterizedTest(name = "log({0}, {1})")
   @MethodSource("testLogFloatArguments")
   public void log_two_double_value(Float v1, Float v2) {
     FunctionExpression log = DSL.log(DSL.literal(v1), DSL.literal(v2));
     assertEquals(log.type(), DOUBLE);
     assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v2) / Math.log(v1), 0.0001));
+        getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v2) / Math.log(v1), 0.0001));
     assertEquals(String.format("log(%s, %s)", v1.toString(), v2.toString()), log.toString());
   }
 
-  /**
-   * Test log with 2 double arguments.
-   */
+  /** Test log with 2 double arguments. */
   @ParameterizedTest(name = "log({0}, {1})")
   @MethodSource("testLogDoubleArguments")
   public void log_two_double_value(Double v1, Double v2) {
     FunctionExpression log = DSL.log(DSL.literal(v1), DSL.literal(v2));
     assertEquals(log.type(), DOUBLE);
     assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v2) / Math.log(v1), 0.0001));
+        getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v2) / Math.log(v1), 0.0001));
     assertEquals(String.format("log(%s, %s)", v1.toString(), v2.toString()), log.toString());
   }
 
-  /**
-   * Test log with 2 null value arguments.
-   */
-  @Test
-  public void log_two_null_value() {
-    FunctionExpression log = DSL.log(
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE), DSL.literal(2D));
-    assertEquals(DOUBLE, log.type());
-    assertTrue(log.valueOf(valueEnv()).isNull());
-
-    log = DSL.log(DSL.literal(2D), DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, log.type());
-    assertTrue(log.valueOf(valueEnv()).isNull());
-
-    log = DSL.log(
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, log.type());
+  /** Test log with 2 invalid double arguments. */
+  @ParameterizedTest(name = "log({0}, {2})")
+  @MethodSource("testLogInvalidDoubleArguments")
+  public void log_two_invalid_double_value(Double v1, Double v2) {
+    FunctionExpression log = DSL.log(DSL.literal(v1), DSL.literal(v2));
+    assertEquals(log.type(), DOUBLE);
     assertTrue(log.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test log with 2 missing value arguments.
-   */
-  @Test
-  public void log_two_missing_value() {
-    FunctionExpression log = DSL.log(
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE), DSL.literal(2D));
-    assertEquals(DOUBLE, log.type());
-    assertTrue(log.valueOf(valueEnv()).isMissing());
-
-    log = DSL.log(DSL.literal(2D), DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, log.type());
-    assertTrue(log.valueOf(valueEnv()).isMissing());
-
-    log = DSL.log(
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, log.type());
-    assertTrue(log.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test log with null and missing value arguments.
-   */
-  @Test
-  public void log_null_missing() {
-    FunctionExpression log = DSL.log(
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, log.type());
-    assertTrue(log.valueOf(valueEnv()).isMissing());
-
-    log = DSL.log(
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, log.type());
-    assertTrue(log.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test log10 with int value.
-   */
+  /** Test log10 with int value. */
   @ParameterizedTest(name = "log10({0})")
   @ValueSource(ints = {2, 3})
   public void log10_int_value(Integer v) {
     FunctionExpression log = DSL.log10(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log10(v), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log10(v), 0.0001));
     assertEquals(String.format("log10(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log10 with long value.
-   */
+  /** Test log10 with long value. */
   @ParameterizedTest(name = "log10({0})")
   @ValueSource(longs = {2L, 3L})
   public void log10_long_value(Long v) {
     FunctionExpression log = DSL.log10(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log10(v), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log10(v), 0.0001));
     assertEquals(String.format("log10(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log10 with float value.
-   */
+  /** Test log10 with float value. */
   @ParameterizedTest(name = "log10({0})")
   @ValueSource(floats = {2F, 3F})
   public void log10_float_value(Float v) {
     FunctionExpression log = DSL.log10(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log10(v), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log10(v), 0.0001));
     assertEquals(String.format("log10(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log10 with int value.
-   */
+  /** Test log10 with int value. */
   @ParameterizedTest(name = "log10({0})")
   @ValueSource(doubles = {2D, 3D})
   public void log10_double_value(Double v) {
     FunctionExpression log = DSL.log10(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log10(v), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log10(v), 0.0001));
     assertEquals(String.format("log10(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log10 with null value.
-   */
-  @Test
-  public void log10_null_value() {
-    FunctionExpression log = DSL.log10(
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, log.type());
+  /** Test log10 with 1 invalid double argument. */
+  @ParameterizedTest(name = "log10({0})")
+  @ValueSource(doubles = {0D, -3D})
+  public void log10_two_invalid_value(Double v) {
+    FunctionExpression log = DSL.log10(DSL.literal(v));
+    assertEquals(log.type(), DOUBLE);
     assertTrue(log.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test log10 with missing value.
-   */
-  @Test
-  public void log10_missing_value() {
-    FunctionExpression log = DSL.log10(
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, log.type());
-    assertTrue(log.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test log2 with int value.
-   */
+  /** Test log2 with int value. */
   @ParameterizedTest(name = "log10({0})")
   @ValueSource(ints = {2, 3})
   public void log2_int_value(Integer v) {
     FunctionExpression log = DSL.log2(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v) / Math.log(2), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v) / Math.log(2), 0.0001));
     assertEquals(String.format("log2(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log2 with long value.
-   */
+  /** Test log2 with long value. */
   @ParameterizedTest(name = "log10({0})")
   @ValueSource(longs = {2L, 3L})
   public void log2_long_value(Long v) {
     FunctionExpression log = DSL.log2(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v) / Math.log(2), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v) / Math.log(2), 0.0001));
     assertEquals(String.format("log2(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log2 with float value.
-   */
+  /** Test log2 with float value. */
   @ParameterizedTest(name = "log10({0})")
   @ValueSource(floats = {2F, 3F})
   public void log2_float_value(Float v) {
     FunctionExpression log = DSL.log2(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v) / Math.log(2), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v) / Math.log(2), 0.0001));
     assertEquals(String.format("log2(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log2 with double value.
-   */
+  /** Test log2 with double value. */
   @ParameterizedTest(name = "log10({0})")
   @ValueSource(doubles = {2D, 3D})
   public void log2_double_value(Double v) {
     FunctionExpression log = DSL.log2(DSL.literal(v));
     assertEquals(log.type(), DOUBLE);
-    assertThat(
-        getDoubleValue(log.valueOf(valueEnv())),
-        closeTo(Math.log(v) / Math.log(2), 0.0001)
-    );
+    assertThat(getDoubleValue(log.valueOf(valueEnv())), closeTo(Math.log(v) / Math.log(2), 0.0001));
     assertEquals(String.format("log2(%s)", v.toString()), log.toString());
   }
 
-  /**
-   * Test log2 with null value.
-   */
-  @Test
-  public void log2_null_value() {
-    FunctionExpression log = DSL.log2(
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, log.type());
+  /** Test log2 with an invalid double value. */
+  @ParameterizedTest(name = "log2({0})")
+  @ValueSource(doubles = {0D, -2D})
+  public void log2_invalid_double_value(Double v) {
+    FunctionExpression log = DSL.log2(DSL.literal(v));
+    assertEquals(log.type(), DOUBLE);
     assertTrue(log.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test log2 with missing value.
-   */
-  @Test
-  public void log2_missing_value() {
-    FunctionExpression log = DSL.log2(
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, log.type());
-    assertTrue(log.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test mod with byte value.
-   */
+  /** Test mod with byte value. */
   @ParameterizedTest(name = "mod({0}, {1})")
   @MethodSource("testLogByteArguments")
   public void mod_byte_value(Byte v1, Byte v2) {
@@ -1072,9 +718,7 @@ public void mod_byte_value(Byte v1, Byte v2) {
     assertTrue(mod.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test mod with short value.
-   */
+  /** Test mod with short value. */
   @ParameterizedTest(name = "mod({0}, {1})")
   @MethodSource("testLogShortArguments")
   public void mod_short_value(Short v1, Short v2) {
@@ -1082,8 +726,7 @@ public void mod_short_value(Short v1, Short v2) {
 
     assertThat(
         mod.valueOf(valueEnv()),
-        allOf(hasType(SHORT),
-            hasValue(Integer.valueOf(v1 % v2).shortValue())));
+        allOf(hasType(SHORT), hasValue(Integer.valueOf(v1 % v2).shortValue())));
     assertEquals(String.format("mod(%s, %s)", v1, v2), mod.toString());
 
     mod = DSL.mod(DSL.literal(v1), DSL.literal(new ExprShortValue(0)));
@@ -1091,16 +734,12 @@ public void mod_short_value(Short v1, Short v2) {
     assertTrue(mod.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test mod with integer value.
-   */
+  /** Test mod with integer value. */
   @ParameterizedTest(name = "mod({0}, {1})")
   @MethodSource("testLogIntegerArguments")
   public void mod_int_value(Integer v1, Integer v2) {
     FunctionExpression mod = DSL.mod(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        mod.valueOf(valueEnv()),
-        allOf(hasType(INTEGER), hasValue(v1 % v2)));
+    assertThat(mod.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue(v1 % v2)));
     assertEquals(String.format("mod(%s, %s)", v1, v2), mod.toString());
 
     mod = DSL.mod(DSL.literal(v1), DSL.literal(0));
@@ -1108,16 +747,12 @@ public void mod_int_value(Integer v1, Integer v2) {
     assertTrue(mod.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test mod with long value.
-   */
+  /** Test mod with long value. */
   @ParameterizedTest(name = "mod({0}, {1})")
   @MethodSource("testLogLongArguments")
   public void mod_long_value(Long v1, Long v2) {
     FunctionExpression mod = DSL.mod(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        mod.valueOf(valueEnv()),
-        allOf(hasType(LONG), hasValue(v1 % v2)));
+    assertThat(mod.valueOf(valueEnv()), allOf(hasType(LONG), hasValue(v1 % v2)));
     assertEquals(String.format("mod(%s, %s)", v1, v2), mod.toString());
 
     mod = DSL.mod(DSL.literal(v1), DSL.literal(0));
@@ -1125,16 +760,12 @@ public void mod_long_value(Long v1, Long v2) {
     assertTrue(mod.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test mod with long value.
-   */
+  /** Test mod with long value. */
   @ParameterizedTest(name = "mod({0}, {1})")
   @MethodSource("testLogFloatArguments")
   public void mod_float_value(Float v1, Float v2) {
     FunctionExpression mod = DSL.mod(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        mod.valueOf(valueEnv()),
-        allOf(hasType(FLOAT), hasValue(v1 % v2)));
+    assertThat(mod.valueOf(valueEnv()), allOf(hasType(FLOAT), hasValue(v1 % v2)));
     assertEquals(String.format("mod(%s, %s)", v1, v2), mod.toString());
 
     mod = DSL.mod(DSL.literal(v1), DSL.literal(0));
@@ -1142,16 +773,12 @@ public void mod_float_value(Float v1, Float v2) {
     assertTrue(mod.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test mod with double value.
-   */
+  /** Test mod with double value. */
   @ParameterizedTest(name = "mod({0}, {1})")
   @MethodSource("testLogDoubleArguments")
   public void mod_double_value(Double v1, Double v2) {
     FunctionExpression mod = DSL.mod(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        mod.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(v1 % v2)));
+    assertThat(mod.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(v1 % v2)));
     assertEquals(String.format("mod(%s, %s)", v1, v2), mod.toString());
 
     mod = DSL.mod(DSL.literal(v1), DSL.literal(0));
@@ -1159,492 +786,451 @@ public void mod_double_value(Double v1, Double v2) {
     assertTrue(mod.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test mod with null value.
-   */
-  @Test
-  public void mod_null_value() {
-    FunctionExpression mod = DSL.mod(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(INTEGER, mod.type());
-    assertTrue(mod.valueOf(valueEnv()).isNull());
-
-    mod = DSL.mod(DSL.literal(1), DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(INTEGER, mod.type());
-    assertTrue(mod.valueOf(valueEnv()).isNull());
-
-    mod = DSL.mod(
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(INTEGER, mod.type());
-    assertTrue(mod.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test mod with missing value.
-   */
-  @Test
-  public void mod_missing_value() {
-    FunctionExpression mod =
-        DSL.mod(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(INTEGER, mod.type());
-    assertTrue(mod.valueOf(valueEnv()).isMissing());
-
-    mod = DSL.mod(DSL.literal(1), DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(INTEGER, mod.type());
-    assertTrue(mod.valueOf(valueEnv()).isMissing());
-
-    mod = DSL.mod(
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(INTEGER, mod.type());
-    assertTrue(mod.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test mod with null and missing values.
-   */
-  @Test
-  public void mod_null_missing() {
-    FunctionExpression mod = DSL.mod(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(INTEGER, mod.type());
-    assertTrue(mod.valueOf(valueEnv()).isMissing());
-
-    mod = DSL.mod(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(INTEGER, mod.type());
-    assertTrue(mod.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test pow/power with short value.
-   */
+  /** Test pow/power with short value. */
   @ParameterizedTest(name = "pow({0}, {1}")
   @MethodSource("testLogShortArguments")
   public void pow_short_value(Short v1, Short v2) {
     FunctionExpression pow = DSL.pow(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        pow.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
+    assertThat(pow.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
     assertEquals(String.format("pow(%s, %s)", v1, v2), pow.toString());
 
-    FunctionExpression power =
-        DSL.power(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        power.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
+    FunctionExpression power = DSL.power(DSL.literal(v1), DSL.literal(v2));
+    assertThat(power.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
     assertEquals(String.format("pow(%s, %s)", v1, v2), pow.toString());
   }
 
-  /**
-   * Test pow/power with integer value.
-   */
+  /** Test pow/power with integer value. */
   @ParameterizedTest(name = "pow({0}, {1}")
   @MethodSource("testLogIntegerArguments")
   public void pow_int_value(Integer v1, Integer v2) {
     FunctionExpression pow = DSL.pow(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        pow.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
+    assertThat(pow.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
     assertEquals(String.format("pow(%s, %s)", v1, v2), pow.toString());
 
     FunctionExpression power = DSL.power(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        power.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
+    assertThat(power.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
     assertEquals(String.format("pow(%s, %s)", v1, v2), pow.toString());
   }
 
-  /**
-   * Test pow/power with long value.
-   */
+  /** Test pow/power with long value. */
   @ParameterizedTest(name = "pow({0}, {1}")
   @MethodSource("testLogLongArguments")
   public void pow_long_value(Long v1, Long v2) {
     FunctionExpression pow = DSL.pow(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        pow.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
+    assertThat(pow.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
     assertEquals(String.format("pow(%s, %s)", v1, v2), pow.toString());
 
     FunctionExpression power = DSL.power(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        power.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
+    assertThat(power.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
     assertEquals(String.format("pow(%s, %s)", v1, v2), pow.toString());
   }
 
-  /**
-   * Test pow/power with float value.
-   */
+  /** Test pow/power with float value. */
   @ParameterizedTest(name = "pow({0}, {1}")
   @MethodSource("testLogFloatArguments")
   public void pow_float_value(Float v1, Float v2) {
     FunctionExpression pow = DSL.pow(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        pow.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
+    assertThat(pow.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
     assertEquals(String.format("pow(%s, %s)", v1, v2), pow.toString());
 
     FunctionExpression power = DSL.power(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        power.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
+    assertThat(power.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
     assertEquals(String.format("pow(%s, %s)", v1, v2), pow.toString());
   }
 
-  /**
-   * Test pow/power with double value.
-   */
+  /** Test pow/power with double value. */
   @ParameterizedTest(name = "pow({0}, {1}")
   @MethodSource("testLogDoubleArguments")
   public void pow_double_value(Double v1, Double v2) {
     FunctionExpression pow = DSL.pow(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        pow.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
+    assertThat(pow.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
     assertEquals(String.format("pow(%s, %s)", v1, v2), pow.toString());
 
     FunctionExpression power = DSL.power(DSL.literal(v1), DSL.literal(v2));
-    assertThat(
-        power.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
+    assertThat(power.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(v1, v2))));
     assertEquals(String.format("pow(%s, %s)", v1, v2), pow.toString());
   }
 
-  /**
-   * Test pow/power with null value.
-   */
+  /** Test pow/power with null output. */
   @Test
-  public void pow_null_value() {
-    FunctionExpression pow = DSL.pow(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(DOUBLE, pow.type());
-    assertTrue(pow.valueOf(valueEnv()).isNull());
-
-    DSL.pow(DSL.literal(1), DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, pow.type());
+  public void pow_null_output() {
+    FunctionExpression pow = DSL.pow(DSL.literal((double) -2), DSL.literal(1.5));
+    assertEquals(pow.type(), DOUBLE);
+    assertEquals(String.format("pow(%s, %s)", (double) -2, 1.5), pow.toString());
     assertTrue(pow.valueOf(valueEnv()).isNull());
 
-    DSL.pow(
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, pow.type());
+    pow = DSL.pow(DSL.literal((float) -2), DSL.literal((float) 1.5));
+    assertEquals(pow.type(), DOUBLE);
+    assertEquals(String.format("pow(%s, %s)", (float) -2, (float) 1.5), pow.toString());
     assertTrue(pow.valueOf(valueEnv()).isNull());
+  }
 
-    FunctionExpression power =
-        DSL.power(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(DOUBLE, power.type());
-    assertTrue(power.valueOf(valueEnv()).isNull());
+  /** Test pow/power with edge cases. */
+  @Test
+  public void pow_edge_cases() {
+    FunctionExpression pow = DSL.pow(DSL.literal((double) -2), DSL.literal((double) 2));
+    assertEquals(pow.type(), DOUBLE);
+    assertEquals(String.format("pow(%s, %s)", (double) -2, (double) 2), pow.toString());
+    assertThat(pow.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(-2, 2))));
 
-    power = DSL.power(DSL.literal(1), DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, power.type());
-    assertTrue(power.valueOf(valueEnv()).isNull());
+    pow = DSL.pow(DSL.literal((double) 2), DSL.literal((double) 1.5));
+    assertEquals(pow.type(), DOUBLE);
+    assertEquals(String.format("pow(%s, %s)", (double) 2, (double) 1.5), pow.toString());
+    assertThat(pow.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow(2, 1.5))));
 
-    power = DSL.power(
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, power.type());
-    assertTrue(power.valueOf(valueEnv()).isNull());
-  }
+    pow = DSL.pow(DSL.literal((float) -2), DSL.literal((float) 2));
+    assertEquals(pow.type(), DOUBLE);
+    assertEquals(String.format("pow(%s, %s)", (float) -2, (float) 2), pow.toString());
+    assertThat(
+        pow.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.pow((float) -2, (float) 2))));
 
-  /**
-   * Test pow/power with missing value.
-   */
-  @Test
-  public void pow_missing_value() {
-    FunctionExpression pow =
-        DSL.pow(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(DOUBLE, pow.type());
-    assertTrue(pow.valueOf(valueEnv()).isMissing());
-
-    DSL.pow(DSL.literal(1), DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, pow.type());
-    assertTrue(pow.valueOf(valueEnv()).isMissing());
-
-    DSL.pow(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, pow.type());
-    assertTrue(pow.valueOf(valueEnv()).isMissing());
-
-    FunctionExpression power =
-        DSL.power(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(DOUBLE, power.type());
-    assertTrue(power.valueOf(valueEnv()).isMissing());
-
-    power = DSL.power(DSL.literal(1), DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, power.type());
-    assertTrue(power.valueOf(valueEnv()).isMissing());
-
-    power = DSL.power(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, power.type());
-    assertTrue(power.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test pow/power with null and missing values.
-   */
-  @Test
-  public void pow_null_missing() {
-    FunctionExpression pow = DSL.pow(
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, pow.type());
-    assertTrue(pow.valueOf(valueEnv()).isMissing());
-
-    pow = DSL.pow(
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, pow.type());
-    assertTrue(pow.valueOf(valueEnv()).isMissing());
-
-    FunctionExpression power = DSL.power(
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, power.type());
-    assertTrue(power.valueOf(valueEnv()).isMissing());
-
-    power = DSL.power(
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, power.type());
-    assertTrue(power.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test round with integer value.
-   */
+    pow = DSL.pow(DSL.literal((float) 2), DSL.literal((float) 1.5));
+    assertEquals(pow.type(), DOUBLE);
+    assertEquals(String.format("pow(%s, %s)", (float) 2, (float) 1.5), pow.toString());
+    assertThat(
+        pow.valueOf(valueEnv()),
+        allOf(hasType(DOUBLE), hasValue(Math.pow((float) 2, (float) 1.5))));
+  }
+
+  /** Test rint with byte value. */
+  @ParameterizedTest(name = "rint({0})")
+  @ValueSource(bytes = {-1, 0, 1, Byte.MAX_VALUE, Byte.MIN_VALUE})
+  public void rint_byte_value(Byte value) {
+    FunctionExpression rint = DSL.rint(DSL.literal(value));
+    assertThat(rint.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.rint(value))));
+    assertEquals(String.format("rint(%s)", value), rint.toString());
+  }
+
+  /** Test rint with short value. */
+  @ParameterizedTest(name = "rint({0})")
+  @ValueSource(shorts = {-1, 0, 1, Short.MAX_VALUE, Short.MIN_VALUE})
+  public void rint_short_value(Short value) {
+    FunctionExpression rint = DSL.rint(DSL.literal(value));
+    assertThat(rint.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.rint(value))));
+    assertEquals(String.format("rint(%s)", value), rint.toString());
+  }
+
+  /** Test rint with integer value. */
+  @ParameterizedTest(name = "rint({0})")
+  @ValueSource(ints = {-1, 0, 1, Integer.MAX_VALUE, Integer.MIN_VALUE})
+  public void rint_int_value(Integer value) {
+    FunctionExpression rint = DSL.rint(DSL.literal(value));
+    assertThat(rint.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.rint(value))));
+    assertEquals(String.format("rint(%s)", value), rint.toString());
+  }
+
+  /** Test rint with long value. */
+  @ParameterizedTest(name = "rint({0})")
+  @ValueSource(longs = {-1L, 0L, 1L, Long.MAX_VALUE, Long.MIN_VALUE})
+  public void rint_long_value(Long value) {
+    FunctionExpression rint = DSL.rint(DSL.literal(value));
+    assertThat(rint.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.rint(value))));
+    assertEquals(String.format("rint(%s)", value), rint.toString());
+  }
+
+  /** Test rint with float value. */
+  @ParameterizedTest(name = "rint({0})")
+  @ValueSource(
+      floats = {
+        -1F,
+        -0.75F,
+        -0.5F,
+        0F,
+        0.5F,
+        0.500000001F,
+        0.75F,
+        1F,
+        1.9999F,
+        42.42F,
+        Float.MAX_VALUE,
+        Float.MIN_VALUE
+      })
+  public void rint_float_value(Float value) {
+    FunctionExpression rint = DSL.rint(DSL.literal(value));
+    assertThat(rint.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.rint(value))));
+    assertEquals(String.format("rint(%s)", value), rint.toString());
+  }
+
+  /** Test rint with double value. */
+  @ParameterizedTest(name = "rint({0})")
+  @ValueSource(
+      doubles = {
+        -1F,
+        -0.75F,
+        -0.5F,
+        0F,
+        0.5F,
+        0.500000001F,
+        0.75F,
+        1F,
+        1.9999F,
+        42.42F,
+        Double.MAX_VALUE,
+        Double.MIN_VALUE
+      })
+  public void rint_double_value(Double value) {
+    FunctionExpression rint = DSL.rint(DSL.literal(value));
+    assertThat(rint.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.rint(value))));
+    assertEquals(String.format("rint(%s)", value), rint.toString());
+  }
+
+  /** Test round with integer value. */
   @ParameterizedTest(name = "round({0}")
   @ValueSource(ints = {21, -21})
   public void round_int_value(Integer value) {
     FunctionExpression round = DSL.round(DSL.literal(value));
-    assertThat(
-        round.valueOf(valueEnv()),
-        allOf(hasType(LONG), hasValue((long) Math.round(value))));
+    assertThat(round.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.round(value))));
     assertEquals(String.format("round(%s)", value), round.toString());
 
     round = DSL.round(DSL.literal(value), DSL.literal(1));
     assertThat(
         round.valueOf(valueEnv()),
-        allOf(hasType(LONG), hasValue(
-            new BigDecimal(value).setScale(1, RoundingMode.HALF_UP).longValue())));
+        allOf(
+            hasType(LONG),
+            hasValue(new BigDecimal(value).setScale(1, RoundingMode.HALF_UP).longValue())));
     assertEquals(String.format("round(%s, 1)", value), round.toString());
 
     round = DSL.round(DSL.literal(value), DSL.literal(-1));
     assertThat(
         round.valueOf(valueEnv()),
-        allOf(hasType(LONG), hasValue(
-            new BigDecimal(value).setScale(-1, RoundingMode.HALF_UP).longValue())));
+        allOf(
+            hasType(LONG),
+            hasValue(new BigDecimal(value).setScale(-1, RoundingMode.HALF_UP).longValue())));
     assertEquals(String.format("round(%s, -1)", value), round.toString());
   }
 
-  /**
-   * Test round with long value.
-   */
+  /** Test round with long value. */
   @ParameterizedTest(name = "round({0}")
   @ValueSource(longs = {21L, -21L})
   public void round_long_value(Long value) {
     FunctionExpression round = DSL.round(DSL.literal(value));
-    assertThat(
-        round.valueOf(valueEnv()),
-        allOf(hasType(LONG), hasValue((long) Math.round(value))));
+    assertThat(round.valueOf(valueEnv()), allOf(hasType(LONG), hasValue((long) Math.round(value))));
     assertEquals(String.format("round(%s)", value), round.toString());
 
     round = DSL.round(DSL.literal(value), DSL.literal(1));
     assertThat(
         round.valueOf(valueEnv()),
-        allOf(hasType(LONG), hasValue(
-            new BigDecimal(value).setScale(1, RoundingMode.HALF_UP).longValue())));
+        allOf(
+            hasType(LONG),
+            hasValue(new BigDecimal(value).setScale(1, RoundingMode.HALF_UP).longValue())));
     assertEquals(String.format("round(%s, 1)", value), round.toString());
 
     round = DSL.round(DSL.literal(value), DSL.literal(-1));
     assertThat(
         round.valueOf(valueEnv()),
-        allOf(hasType(LONG), hasValue(
-            new BigDecimal(value).setScale(-1, RoundingMode.HALF_UP).longValue())));
+        allOf(
+            hasType(LONG),
+            hasValue(new BigDecimal(value).setScale(-1, RoundingMode.HALF_UP).longValue())));
     assertEquals(String.format("round(%s, -1)", value), round.toString());
   }
 
-  /**
-   * Test round with float value.
-   */
+  /** Test round with float value. */
   @ParameterizedTest(name = "round({0}")
   @ValueSource(floats = {21F, -21F})
   public void round_float_value(Float value) {
     FunctionExpression round = DSL.round(DSL.literal(value));
     assertThat(
-        round.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue((double) Math.round(value))));
+        round.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue((double) Math.round(value))));
     assertEquals(String.format("round(%s)", value), round.toString());
 
     round = DSL.round(DSL.literal(value), DSL.literal(1));
     assertThat(
         round.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(
-            new BigDecimal(value).setScale(1, RoundingMode.HALF_UP).doubleValue())));
+        allOf(
+            hasType(DOUBLE),
+            hasValue(new BigDecimal(value).setScale(1, RoundingMode.HALF_UP).doubleValue())));
     assertEquals(String.format("round(%s, 1)", value), round.toString());
 
     round = DSL.round(DSL.literal(value), DSL.literal(-1));
     assertThat(
         round.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(
-            new BigDecimal(value).setScale(-1, RoundingMode.HALF_UP).doubleValue())));
+        allOf(
+            hasType(DOUBLE),
+            hasValue(new BigDecimal(value).setScale(-1, RoundingMode.HALF_UP).doubleValue())));
     assertEquals(String.format("round(%s, -1)", value), round.toString());
   }
 
-  /**
-   * Test round with double value.
-   */
+  /** Test round with double value. */
   @ParameterizedTest(name = "round({0}")
   @ValueSource(doubles = {21D, -21D})
   public void round_double_value(Double value) {
     FunctionExpression round = DSL.round(DSL.literal(value));
     assertThat(
-        round.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue((double) Math.round(value))));
+        round.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue((double) Math.round(value))));
     assertEquals(String.format("round(%s)", value), round.toString());
 
     round = DSL.round(DSL.literal(value), DSL.literal(1));
     assertThat(
         round.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(
-            new BigDecimal(value).setScale(1, RoundingMode.HALF_UP).doubleValue())));
+        allOf(
+            hasType(DOUBLE),
+            hasValue(new BigDecimal(value).setScale(1, RoundingMode.HALF_UP).doubleValue())));
     assertEquals(String.format("round(%s, 1)", value), round.toString());
 
     round = DSL.round(DSL.literal(value), DSL.literal(-1));
     assertThat(
         round.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(
-            new BigDecimal(value).setScale(-1, RoundingMode.HALF_UP).doubleValue())));
+        allOf(
+            hasType(DOUBLE),
+            hasValue(new BigDecimal(value).setScale(-1, RoundingMode.HALF_UP).doubleValue())));
     assertEquals(String.format("round(%s, -1)", value), round.toString());
   }
 
-  /**
-   * Test round with null value.
-   */
-  @Test
-  public void round_null_value() {
-    FunctionExpression round = DSL.round(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, round.type());
-    assertTrue(round.valueOf(valueEnv()).isNull());
-
-    round = DSL.round(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(LONG, round.type());
-    assertTrue(round.valueOf(valueEnv()).isNull());
-
-    round = DSL.round(DSL.literal(1), DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, round.type());
-    assertTrue(round.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test round with null value.
-   */
-  @Test
-  public void round_missing_value() {
-    FunctionExpression round = DSL.round(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, round.type());
-    assertTrue(round.valueOf(valueEnv()).isMissing());
-
-    round = DSL.round(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(LONG, round.type());
-    assertTrue(round.valueOf(valueEnv()).isMissing());
-
-    round = DSL.round(DSL.literal(1), DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, round.type());
-    assertTrue(round.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test round with null and missing values.
-   */
-  @Test
-  public void round_null_missing() {
-    FunctionExpression round = DSL.round(
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, round.type());
-    assertTrue(round.valueOf(valueEnv()).isMissing());
-
-    round = DSL.round(
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, round.type());
-    assertTrue(round.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test sign with integer value.
-   */
+  /** Test sign with integer value. */
   @ParameterizedTest(name = "sign({0})")
   @ValueSource(ints = {2, -2})
   public void sign_int_value(Integer value) {
     FunctionExpression sign = DSL.sign(DSL.literal(value));
     assertThat(
-        sign.valueOf(valueEnv()),
-        allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
+        sign.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
     assertEquals(String.format("sign(%s)", value), sign.toString());
   }
 
-  /**
-   * Test sign with long value.
-   */
+  /** Test sign with long value. */
   @ParameterizedTest(name = "sign({0})")
   @ValueSource(longs = {2L, -2L})
   public void sign_long_value(Long value) {
     FunctionExpression sign = DSL.sign(DSL.literal(value));
     assertThat(
-        sign.valueOf(valueEnv()),
-        allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
+        sign.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
     assertEquals(String.format("sign(%s)", value), sign.toString());
   }
 
-  /**
-   * Test sign with float value.
-   */
+  /** Test sign with float value. */
   @ParameterizedTest(name = "sign({0})")
   @ValueSource(floats = {2F, -2F})
   public void sign_float_value(Float value) {
     FunctionExpression sign = DSL.sign(DSL.literal(value));
     assertThat(
-        sign.valueOf(valueEnv()),
-        allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
+        sign.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
     assertEquals(String.format("sign(%s)", value), sign.toString());
   }
 
-  /**
-   * Test sign with double value.
-   */
+  /** Test sign with double value. */
   @ParameterizedTest(name = "sign({0})")
   @ValueSource(doubles = {2, -2})
   public void sign_double_value(Double value) {
     FunctionExpression sign = DSL.sign(DSL.literal(value));
     assertThat(
-        sign.valueOf(valueEnv()),
-        allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
+        sign.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
     assertEquals(String.format("sign(%s)", value), sign.toString());
   }
 
-  /**
-   * Test sign with null value.
-   */
-  @Test
-  public void sign_null_value() {
-    FunctionExpression sign = DSL.sign(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(INTEGER, sign.type());
-    assertTrue(sign.valueOf(valueEnv()).isNull());
+  /** Test signum with byte value. */
+  @ParameterizedTest(name = "signum({0})")
+  @ValueSource(bytes = {2, 0, -2})
+  public void signum_bytes_value(Byte value) {
+    FunctionExpression signum = DSL.signum(DSL.literal(value));
+    assertThat(
+        signum.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
+    assertEquals(String.format("signum(%s)", value), signum.toString());
   }
 
-  /**
-   * Test sign with missing value.
-   */
-  @Test
-  public void sign_missing_value() {
-    FunctionExpression sign = DSL.sign(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(INTEGER, sign.type());
-    assertTrue(sign.valueOf(valueEnv()).isMissing());
+  /** Test signum with short value. */
+  @ParameterizedTest(name = "signum({0})")
+  @ValueSource(shorts = {2, 0, -2})
+  public void signum_short_value(Short value) {
+    FunctionExpression signum = DSL.signum(DSL.literal(value));
+    assertThat(
+        signum.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
+    assertEquals(String.format("signum(%s)", value), signum.toString());
   }
 
-  /**
-   * Test sqrt with int value.
-   */
+  /** Test signum with integer value. */
+  @ParameterizedTest(name = "signum({0})")
+  @ValueSource(ints = {2, 0, -2})
+  public void signum_int_value(Integer value) {
+    FunctionExpression signum = DSL.signum(DSL.literal(value));
+    assertThat(
+        signum.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
+    assertEquals(String.format("signum(%s)", value), signum.toString());
+  }
+
+  /** Test signum with long value. */
+  @ParameterizedTest(name = "signum({0})")
+  @ValueSource(longs = {2L, 0L, -2L})
+  public void signum_long_value(Long value) {
+    FunctionExpression signum = DSL.signum(DSL.literal(value));
+    assertThat(
+        signum.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
+    assertEquals(String.format("signum(%s)", value), signum.toString());
+  }
+
+  /** Test signum with float value. */
+  @ParameterizedTest(name = "signum({0})")
+  @ValueSource(floats = {2F, 0F, -2F})
+  public void signum_float_value(Float value) {
+    FunctionExpression signum = DSL.signum(DSL.literal(value));
+    assertThat(
+        signum.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
+    assertEquals(String.format("signum(%s)", value), signum.toString());
+  }
+
+  /** Test signum with double value. */
+  @ParameterizedTest(name = "signum({0})")
+  @ValueSource(doubles = {2, 0, -2})
+  public void signum_double_value(Double value) {
+    FunctionExpression signum = DSL.signum(DSL.literal(value));
+    assertThat(
+        signum.valueOf(valueEnv()), allOf(hasType(INTEGER), hasValue((int) Math.signum(value))));
+    assertEquals(String.format("signum(%s)", value), signum.toString());
+  }
+
+  /** Test sinh with byte value. */
+  @ParameterizedTest(name = "sinh({0})")
+  @ValueSource(bytes = {-1, 1, 2, Byte.MAX_VALUE, Byte.MIN_VALUE})
+  public void sinh_byte_value(Byte value) {
+    FunctionExpression sinh = DSL.sinh(DSL.literal(value));
+    assertThat(sinh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.sinh(value))));
+    assertEquals(String.format("sinh(%s)", value), sinh.toString());
+  }
+
+  /** Test sinh with short value. */
+  @ParameterizedTest(name = "sinh({0})")
+  @ValueSource(shorts = {-1, 1, 2, Short.MAX_VALUE, Short.MIN_VALUE})
+  public void sinh_short_value(Short value) {
+    FunctionExpression sinh = DSL.sinh(DSL.literal(value));
+    assertThat(sinh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.sinh(value))));
+    assertEquals(String.format("sinh(%s)", value), sinh.toString());
+  }
+
+  /** Test sinh with integer value. */
+  @ParameterizedTest(name = "sinh({0})")
+  @ValueSource(ints = {-1, 1, 2, Integer.MAX_VALUE, Integer.MIN_VALUE})
+  public void sinh_int_value(Integer value) {
+    FunctionExpression sinh = DSL.sinh(DSL.literal(value));
+    assertThat(sinh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.sinh(value))));
+    assertEquals(String.format("sinh(%s)", value), sinh.toString());
+  }
+
+  /** Test sinh with long value. */
+  @ParameterizedTest(name = "sinh({0})")
+  @ValueSource(longs = {-1L, 1L, 2L, Long.MAX_VALUE, Long.MIN_VALUE})
+  public void sinh_long_value(Long value) {
+    FunctionExpression sinh = DSL.sinh(DSL.literal(value));
+    assertThat(sinh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.sinh(value))));
+    assertEquals(String.format("sinh(%s)", value), sinh.toString());
+  }
+
+  /** Test sinh with float value. */
+  @ParameterizedTest(name = "sinh({0})")
+  @ValueSource(floats = {-1.5F, -1F, 1F, 1.5F, 2F, 2.7F, Float.MAX_VALUE, Float.MIN_VALUE})
+  public void sinh_float_value(Float value) {
+    FunctionExpression sinh = DSL.sinh(DSL.literal(value));
+    assertThat(sinh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.sinh(value))));
+    assertEquals(String.format("sinh(%s)", value), sinh.toString());
+  }
+
+  /** Test sinh with double value. */
+  @ParameterizedTest(name = "sinh({0})")
+  @ValueSource(doubles = {-1.5, -1D, 1D, 1.5D, 2D, 2.7D, Double.MAX_VALUE, Double.MIN_VALUE})
+  public void sinh_double_value(Double value) {
+    FunctionExpression sinh = DSL.sinh(DSL.literal(value));
+    assertThat(sinh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.sinh(value))));
+    assertEquals(String.format("sinh(%s)", value), sinh.toString());
+  }
+
+  /** Test sqrt with int value. */
   @ParameterizedTest(name = "sqrt({0})")
   @ValueSource(ints = {1, 2})
   public void sqrt_int_value(Integer value) {
@@ -1653,9 +1239,7 @@ public void sqrt_int_value(Integer value) {
     assertEquals(String.format("sqrt(%s)", value), sqrt.toString());
   }
 
-  /**
-   * Test sqrt with long value.
-   */
+  /** Test sqrt with long value. */
   @ParameterizedTest(name = "sqrt({0})")
   @ValueSource(longs = {1L, 2L})
   public void sqrt_long_value(Long value) {
@@ -1664,9 +1248,7 @@ public void sqrt_long_value(Long value) {
     assertEquals(String.format("sqrt(%s)", value), sqrt.toString());
   }
 
-  /**
-   * Test sqrt with float value.
-   */
+  /** Test sqrt with float value. */
   @ParameterizedTest(name = "sqrt({0})")
   @ValueSource(floats = {1F, 2F})
   public void sqrt_float_value(Float value) {
@@ -1675,9 +1257,7 @@ public void sqrt_float_value(Float value) {
     assertEquals(String.format("sqrt(%s)", value), sqrt.toString());
   }
 
-  /**
-   * Test sqrt with double value.
-   */
+  /** Test sqrt with double value. */
   @ParameterizedTest(name = "sqrt({0})")
   @ValueSource(doubles = {1D, 2D})
   public void sqrt_double_value(Double value) {
@@ -1686,9 +1266,7 @@ public void sqrt_double_value(Double value) {
     assertEquals(String.format("sqrt(%s)", value), sqrt.toString());
   }
 
-  /**
-   * Test sqrt with negative value.
-   */
+  /** Test sqrt with negative value. */
   @ParameterizedTest(name = "sqrt({0})")
   @ValueSource(doubles = {-1D, -2D})
   public void sqrt_negative_value(Double value) {
@@ -1697,147 +1275,90 @@ public void sqrt_negative_value(Double value) {
     assertTrue(sqrt.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test sqrt with null value.
-   */
-  @Test
-  public void sqrt_null_value() {
-    FunctionExpression sqrt = DSL.sqrt(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, sqrt.type());
-    assertTrue(sqrt.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test sqrt with missing value.
-   */
-  @Test
-  public void sqrt_missing_value() {
-    FunctionExpression sqrt = DSL.sqrt(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, sqrt.type());
-    assertTrue(sqrt.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test truncate with integer value.
-   */
+  /** Test truncate with integer value. */
   @ParameterizedTest(name = "truncate({0}, {1})")
-  @ValueSource(ints = {2, -2})
+  @ValueSource(ints = {2, -2, Integer.MAX_VALUE, Integer.MIN_VALUE})
   public void truncate_int_value(Integer value) {
     FunctionExpression truncate = DSL.truncate(DSL.literal(value), DSL.literal(1));
     assertThat(
-        truncate.valueOf(valueEnv()), allOf(hasType(LONG),
-            hasValue(new BigDecimal(value).setScale(1, RoundingMode.DOWN).longValue())));
+        truncate.valueOf(valueEnv()),
+        allOf(
+            hasType(LONG),
+            hasValue(BigDecimal.valueOf(value).setScale(1, RoundingMode.DOWN).longValue())));
     assertEquals(String.format("truncate(%s, 1)", value), truncate.toString());
   }
 
-  /**
-   * Test truncate with long value.
-   */
+  /** Test truncate with long value. */
   @ParameterizedTest(name = "truncate({0}, {1})")
-  @ValueSource(longs = {2L, -2L})
+  @ValueSource(longs = {2L, -2L, Long.MAX_VALUE, Long.MIN_VALUE})
   public void truncate_long_value(Long value) {
     FunctionExpression truncate = DSL.truncate(DSL.literal(value), DSL.literal(1));
     assertThat(
-        truncate.valueOf(valueEnv()), allOf(hasType(LONG),
-            hasValue(new BigDecimal(value).setScale(1, RoundingMode.DOWN).longValue())));
+        truncate.valueOf(valueEnv()),
+        allOf(
+            hasType(LONG),
+            hasValue(BigDecimal.valueOf(value).setScale(1, RoundingMode.DOWN).longValue())));
     assertEquals(String.format("truncate(%s, 1)", value), truncate.toString());
   }
 
-  /**
-   * Test truncate with float value.
-   */
+  /** Test truncate with float value. */
   @ParameterizedTest(name = "truncate({0}, {1})")
-  @ValueSource(floats = {2F, -2F})
+  @ValueSource(floats = {2F, -2F, Float.MAX_VALUE, Float.MIN_VALUE})
   public void truncate_float_value(Float value) {
     FunctionExpression truncate = DSL.truncate(DSL.literal(value), DSL.literal(1));
     assertThat(
-        truncate.valueOf(valueEnv()), allOf(hasType(DOUBLE),
-            hasValue(new BigDecimal(value).setScale(1, RoundingMode.DOWN).doubleValue())));
+        truncate.valueOf(valueEnv()),
+        allOf(
+            hasType(DOUBLE),
+            hasValue(BigDecimal.valueOf(value).setScale(1, RoundingMode.DOWN).doubleValue())));
     assertEquals(String.format("truncate(%s, 1)", value), truncate.toString());
   }
 
-  /**
-   * Test truncate with double value.
-   */
+  /** Test truncate with double value. */
   @ParameterizedTest(name = "truncate({0}, {1})")
-  @ValueSource(doubles = {2D, -2D})
+  @ValueSource(
+      doubles = {
+        2D,
+        -9.223372036854776e+18D,
+        -2147483649.0D,
+        -2147483648.0D,
+        -32769.0D,
+        -32768.0D,
+        -34.84D,
+        -2.0D,
+        -1.2D,
+        -1.0D,
+        0.0D,
+        1.0D,
+        1.3D,
+        2.0D,
+        1004.3D,
+        32767.0D,
+        32768.0D,
+        2147483647.0D,
+        2147483648.0D,
+        9.223372036854776e+18D,
+        Double.MAX_VALUE,
+        Double.MIN_VALUE
+      })
   public void truncate_double_value(Double value) {
     FunctionExpression truncate = DSL.truncate(DSL.literal(value), DSL.literal(1));
     assertThat(
-        truncate.valueOf(valueEnv()), allOf(hasType(DOUBLE),
-            hasValue(new BigDecimal(value).setScale(1, RoundingMode.DOWN).doubleValue())));
+        truncate.valueOf(valueEnv()),
+        allOf(
+            hasType(DOUBLE),
+            hasValue(BigDecimal.valueOf(value).setScale(1, RoundingMode.DOWN).doubleValue())));
     assertEquals(String.format("truncate(%s, 1)", value), truncate.toString());
   }
 
-  /**
-   * Test truncate with null value.
-   */
-  @Test
-  public void truncate_null_value() {
-    FunctionExpression truncate =
-        DSL.truncate(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(LONG, truncate.type());
-    assertTrue(truncate.valueOf(valueEnv()).isNull());
-
-    truncate = DSL.truncate(DSL.literal(1), DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, truncate.type());
-    assertTrue(truncate.valueOf(valueEnv()).isNull());
-
-    truncate = DSL.truncate(
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, truncate.type());
-    assertTrue(truncate.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test truncate with missing value.
-   */
-  @Test
-  public void truncate_missing_value() {
-    FunctionExpression truncate =
-        DSL.truncate(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(LONG, truncate.type());
-    assertTrue(truncate.valueOf(valueEnv()).isMissing());
-
-    truncate = DSL.truncate(DSL.literal(1), DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, truncate.type());
-    assertTrue(truncate.valueOf(valueEnv()).isMissing());
-
-    truncate = DSL.truncate(
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, truncate.type());
-    assertTrue(truncate.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test truncate with null and missing values.
-   */
-  @Test
-  public void truncate_null_missing() {
-    FunctionExpression truncate = DSL.truncate(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, truncate.type());
-    assertTrue(truncate.valueOf(valueEnv()).isMissing());
-
-    truncate = DSL.truncate(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(LONG, truncate.type());
-    assertTrue(truncate.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test constant pi.
-   */
+  /** Test constant pi. */
   @Test
   public void test_pi() {
     FunctionExpression pi = DSL.pi();
     assertThat(pi.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.PI)));
   }
 
-  /**
-   * Test rand with no argument.
-   */
+  /** Test rand with no argument. */
   @Test
   public void rand_no_arg() {
     FunctionExpression rand = DSL.rand();
@@ -1848,9 +1369,7 @@ public void rand_no_arg() {
     assertEquals("rand()", rand.toString());
   }
 
-  /**
-   * Test rand with integer value.
-   */
+  /** Test rand with integer value. */
   @ParameterizedTest(name = "rand({0})")
   @ValueSource(ints = {2, 3})
   public void rand_int_value(Integer n) {
@@ -1858,34 +1377,22 @@ public void rand_int_value(Integer n) {
     assertEquals(FLOAT, rand.type());
     assertTrue(
         getFloatValue(rand.valueOf(valueEnv())) >= 0
-        && getFloatValue(rand.valueOf(valueEnv())) < 1);
+            && getFloatValue(rand.valueOf(valueEnv())) < 1);
     assertEquals(getFloatValue(rand.valueOf(valueEnv())), new Random(n).nextFloat());
     assertEquals(String.format("rand(%s)", n), rand.toString());
   }
 
-  @Test
-  public void rand_null_value() {
-    FunctionExpression rand = DSL.rand(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(FLOAT, rand.type());
-    assertTrue(rand.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test acos with integer, long, float, double values.
-   */
+  /** Test acos with integer, long, float, double values. */
   @ParameterizedTest(name = "acos({0})")
   @MethodSource("trigonometricArguments")
   public void test_acos(Number value) {
     FunctionExpression acos = DSL.acos(DSL.literal(value));
     assertThat(
-        acos.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.acos(value.doubleValue()))));
+        acos.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.acos(value.doubleValue()))));
     assertEquals(String.format("acos(%s)", value), acos.toString());
   }
 
-  /**
-   * Test acos with illegal values.
-   */
+  /** Test acos with illegal values. */
   @ParameterizedTest(name = "acos({0})")
   @ValueSource(doubles = {2D, -2D})
   public void acos_with_illegal_value(Number value) {
@@ -1894,42 +1401,17 @@ public void acos_with_illegal_value(Number value) {
     assertTrue(acos.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test acos with null value.
-   */
-  @Test
-  public void acos_null_value() {
-    FunctionExpression acos = DSL.acos(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, acos.type());
-    assertTrue(acos.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test acos with missing value.
-   */
-  @Test
-  public void acos_missing_value() {
-    FunctionExpression acos = DSL.acos(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, acos.type());
-    assertTrue(acos.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test asin with integer, long, float, double values.
-   */
+  /** Test asin with integer, long, float, double values. */
   @ParameterizedTest(name = "asin({0})")
   @MethodSource("trigonometricArguments")
   public void test_asin(Number value) {
     FunctionExpression asin = DSL.asin(DSL.literal(value));
     assertThat(
-        asin.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.asin(value.doubleValue()))));
+        asin.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.asin(value.doubleValue()))));
     assertEquals(String.format("asin(%s)", value), asin.toString());
   }
 
-  /**
-   * Test asin with illegal value.
-   */
+  /** Test asin with illegal value. */
   @ParameterizedTest(name = "asin({0})")
   @ValueSource(doubles = {2D, -2D})
   public void asin_with_illegal_value(Number value) {
@@ -1938,119 +1420,28 @@ public void asin_with_illegal_value(Number value) {
     assertTrue(asin.valueOf(valueEnv()).isNull());
   }
 
-  /**
-   * Test asin with null value.
-   */
-  @Test
-  public void asin_null_value() {
-    FunctionExpression asin = DSL.asin(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, asin.type());
-    assertTrue(asin.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test asin with missing value.
-   */
-  @Test
-  public void asin_missing_value() {
-    FunctionExpression asin = DSL.asin(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, asin.type());
-    assertTrue(asin.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test atan with one argument integer, long, float, double values.
-   */
+  /** Test atan with one argument integer, long, float, double values. */
   @ParameterizedTest(name = "atan({0})")
   @MethodSource("trigonometricArguments")
   public void atan_one_arg(Number value) {
     FunctionExpression atan = DSL.atan(DSL.literal(value));
     assertThat(
-        atan.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.atan(value.doubleValue()))));
+        atan.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.atan(value.doubleValue()))));
     assertEquals(String.format("atan(%s)", value), atan.toString());
   }
 
-  /**
-   * Test atan with two arguments of integer, long, float, double values.
-   */
+  /** Test atan with two arguments of integer, long, float, double values. */
   @ParameterizedTest(name = "atan({0}, {1})")
   @MethodSource("trigonometricDoubleArguments")
   public void atan_two_args(Number v1, Number v2) {
-    FunctionExpression atan =
-        DSL.atan(DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression atan = DSL.atan(DSL.literal(v1), DSL.literal(v2));
     assertThat(
         atan.valueOf(valueEnv()),
         allOf(hasType(DOUBLE), hasValue(Math.atan2(v1.doubleValue(), v2.doubleValue()))));
     assertEquals(String.format("atan(%s, %s)", v1, v2), atan.toString());
   }
 
-  /**
-   * Test atan with null value.
-   */
-  @Test
-  public void atan_null_value() {
-    FunctionExpression atan = DSL.atan(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan.type());
-    assertTrue(atan.valueOf(valueEnv()).isNull());
-
-    atan = DSL.atan(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE), DSL.literal(1));
-    assertEquals(DOUBLE, atan.type());
-    assertTrue(atan.valueOf(valueEnv()).isNull());
-
-    atan = DSL.atan(DSL.literal(1), DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan.type());
-    assertTrue(atan.valueOf(valueEnv()).isNull());
-
-    atan = DSL.atan(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan.type());
-    assertTrue(atan.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test atan with missing value.
-   */
-  @Test
-  public void atan_missing_value() {
-    FunctionExpression atan = DSL.atan(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan.type());
-    assertTrue(atan.valueOf(valueEnv()).isMissing());
-
-    atan = DSL.atan(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE), DSL.literal(1));
-    assertEquals(DOUBLE, atan.type());
-    assertTrue(atan.valueOf(valueEnv()).isMissing());
-
-    atan = DSL.atan(DSL.literal(1), DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan.type());
-    assertTrue(atan.valueOf(valueEnv()).isMissing());
-
-    atan = DSL.atan(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan.type());
-    assertTrue(atan.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test atan with missing value.
-   */
-  @Test
-  public void atan_null_missing() {
-    FunctionExpression atan = DSL.atan(
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan.type());
-    assertTrue(atan.valueOf(valueEnv()).isMissing());
-
-    atan = DSL.atan(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan.type());
-    assertTrue(atan.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test atan2 with integer, long, float, double values.
-   */
+  /** Test atan2 with integer, long, float, double values. */
   @ParameterizedTest(name = "atan2({0}, {1})")
   @MethodSource("trigonometricDoubleArguments")
   public void test_atan2(Number v1, Number v2) {
@@ -2061,99 +1452,71 @@ public void test_atan2(Number v1, Number v2) {
     assertEquals(String.format("atan2(%s, %s)", v1, v2), atan2.toString());
   }
 
-  /**
-   * Test atan2 with null value.
-   */
-  @Test
-  public void atan2_null_value() {
-    FunctionExpression atan2 = DSL.atan2(
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE), DSL.literal(1));
-    assertEquals(DOUBLE, atan2.type());
-    assertTrue(atan2.valueOf(valueEnv()).isNull());
-
-    atan2 = DSL.atan2(DSL.literal(1), DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan2.type());
-    assertTrue(atan2.valueOf(valueEnv()).isNull());
-
-    atan2 = DSL.atan2(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan2.type());
-    assertTrue(atan2.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test atan2 with missing value.
-   */
-  @Test
-  public void atan2_missing_value() {
-    FunctionExpression atan2 = DSL.atan2(
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE), DSL.literal(1));
-    assertEquals(DOUBLE, atan2.type());
-    assertTrue(atan2.valueOf(valueEnv()).isMissing());
-
-    atan2 = DSL.atan2(DSL.literal(1), DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan2.type());
-    assertTrue(atan2.valueOf(valueEnv()).isMissing());
-
-    atan2 = DSL.atan2(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan2.type());
-    assertTrue(atan2.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test atan2 with missing value.
-   */
-  @Test
-  public void atan2_null_missing() {
-    FunctionExpression atan2 = DSL.atan2(
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan2.type());
-    assertTrue(atan2.valueOf(valueEnv()).isMissing());
-
-    atan2 = DSL.atan2(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE),
-        DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, atan2.type());
-    assertTrue(atan2.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test cos with integer, long, float, double values.
-   */
+  /** Test cos with integer, long, float, double values. */
   @ParameterizedTest(name = "cos({0})")
   @MethodSource("trigonometricArguments")
   public void test_cos(Number value) {
     FunctionExpression cos = DSL.cos(DSL.literal(value));
     assertThat(
-        cos.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.cos(value.doubleValue()))));
+        cos.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.cos(value.doubleValue()))));
     assertEquals(String.format("cos(%s)", value), cos.toString());
   }
 
-  /**
-   * Test cos with null value.
-   */
-  @Test
-  public void cos_null_value() {
-    FunctionExpression cos = DSL.cos(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, cos.type());
-    assertTrue(cos.valueOf(valueEnv()).isNull());
+  /** Test cosh with byte value. */
+  @ParameterizedTest(name = "cosh({0})")
+  @ValueSource(bytes = {-1, 1, 2})
+  public void cosh_byte_value(Byte value) {
+    FunctionExpression cosh = DSL.cosh(DSL.literal(value));
+    assertThat(cosh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.cosh(value))));
+    assertEquals(String.format("cosh(%s)", value), cosh.toString());
   }
 
-  /**
-   * Test cos with missing value.
-   */
-  @Test
-  public void cos_missing_value() {
-    FunctionExpression cos = DSL.cos(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, cos.type());
-    assertTrue(cos.valueOf(valueEnv()).isMissing());
+  /** Test cosh with short value. */
+  @ParameterizedTest(name = "cosh({0})")
+  @ValueSource(shorts = {-1, 1, 2})
+  public void cosh_short_value(Short value) {
+    FunctionExpression cosh = DSL.cosh(DSL.literal(value));
+    assertThat(cosh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.cosh(value))));
+    assertEquals(String.format("cosh(%s)", value), cosh.toString());
+  }
+
+  /** Test cosh with integer value. */
+  @ParameterizedTest(name = "cosh({0})")
+  @ValueSource(ints = {-1, 1, 2})
+  public void cosh_int_value(Integer value) {
+    FunctionExpression cosh = DSL.cosh(DSL.literal(value));
+    assertThat(cosh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.cosh(value))));
+    assertEquals(String.format("cosh(%s)", value), cosh.toString());
+  }
+
+  /** Test cosh with long value. */
+  @ParameterizedTest(name = "cosh({0})")
+  @ValueSource(longs = {-1L, 1L, 2L})
+  public void cosh_long_value(Long value) {
+    FunctionExpression cosh = DSL.cosh(DSL.literal(value));
+    assertThat(cosh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.cosh(value))));
+    assertEquals(String.format("cosh(%s)", value), cosh.toString());
+  }
+
+  /** Test cosh with float value. */
+  @ParameterizedTest(name = "cosh({0})")
+  @ValueSource(floats = {-1F, 1F, 2F})
+  public void cosh_float_value(Float value) {
+    FunctionExpression cosh = DSL.cosh(DSL.literal(value));
+    assertThat(cosh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.cosh(value))));
+    assertEquals(String.format("cosh(%s)", value), cosh.toString());
   }
 
-  /**
-   * Test cot with integer, long, float, double values.
-   */
+  /** Test cosh with double value. */
+  @ParameterizedTest(name = "cosh({0})")
+  @ValueSource(doubles = {-1D, 1D, 2D})
+  public void cosh_double_value(Double value) {
+    FunctionExpression cosh = DSL.cosh(DSL.literal(value));
+    assertThat(cosh.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.cosh(value))));
+    assertEquals(String.format("cosh(%s)", value), cosh.toString());
+  }
+
+  /** Test cot with integer, long, float, double values. */
   @ParameterizedTest(name = "cot({0})")
   @MethodSource("trigonometricArguments")
   public void test_cot(Number value) {
@@ -2164,41 +1527,18 @@ public void test_cot(Number value) {
     assertEquals(String.format("cot(%s)", value), cot.toString());
   }
 
-  /**
-   * Test cot with out-of-range value 0.
-   */
+  /** Test cot with out-of-range value 0. */
   @ParameterizedTest(name = "cot({0})")
   @ValueSource(doubles = {0})
   public void cot_with_zero(Number value) {
     FunctionExpression cot = DSL.cot(DSL.literal(value));
     assertThrows(
-        ArithmeticException.class, () -> cot.valueOf(valueEnv()),
+        ArithmeticException.class,
+        () -> cot.valueOf(valueEnv()),
         String.format("Out of range value for cot(%s)", value));
   }
 
-  /**
-   * Test cot with null value.
-   */
-  @Test
-  public void cot_null_value() {
-    FunctionExpression cot = DSL.cot(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, cot.type());
-    assertTrue(cot.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test cot with missing value.
-   */
-  @Test
-  public void cot_missing_value() {
-    FunctionExpression cot = DSL.cot(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, cot.type());
-    assertTrue(cot.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test degrees with integer, long, float, double values.
-   */
+  /** Test degrees with integer, long, float, double values. */
   @ParameterizedTest(name = "degrees({0})")
   @MethodSource("trigonometricArguments")
   public void test_degrees(Number value) {
@@ -2209,29 +1549,7 @@ public void test_degrees(Number value) {
     assertEquals(String.format("degrees(%s)", value), degrees.toString());
   }
 
-  /**
-   * Test degrees with null value.
-   */
-  @Test
-  public void degrees_null_value() {
-    FunctionExpression degrees = DSL.degrees(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, degrees.type());
-    assertTrue(degrees.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test degrees with missing value.
-   */
-  @Test
-  public void degrees_missing_value() {
-    FunctionExpression degrees = DSL.degrees(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, degrees.type());
-    assertTrue(degrees.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test radians with integer, long, float, double values.
-   */
+  /** Test radians with integer, long, float, double values. */
   @ParameterizedTest(name = "radians({0})")
   @MethodSource("trigonometricArguments")
   public void test_radians(Number value) {
@@ -2242,95 +1560,27 @@ public void test_radians(Number value) {
     assertEquals(String.format("radians(%s)", value), radians.toString());
   }
 
-  /**
-   * Test radians with null value.
-   */
-  @Test
-  public void radians_null_value() {
-    FunctionExpression radians = DSL.radians(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, radians.type());
-    assertTrue(radians.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test radians with missing value.
-   */
-  @Test
-  public void radians_missing_value() {
-    FunctionExpression radians = DSL.radians(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, radians.type());
-    assertTrue(radians.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test sin with integer, long, float, double values.
-   */
+  /** Test sin with integer, long, float, double values. */
   @ParameterizedTest(name = "sin({0})")
   @MethodSource("trigonometricArguments")
   public void test_sin(Number value) {
     FunctionExpression sin = DSL.sin(DSL.literal(value));
     assertThat(
-        sin.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.sin(value.doubleValue()))));
+        sin.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.sin(value.doubleValue()))));
     assertEquals(String.format("sin(%s)", value), sin.toString());
   }
 
-  /**
-   * Test sin with null value.
-   */
-  @Test
-  public void sin_null_value() {
-    FunctionExpression sin = DSL.sin(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, sin.type());
-    assertTrue(sin.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test sin with missing value.
-   */
-  @Test
-  public void sin_missing_value() {
-    FunctionExpression sin = DSL.sin(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, sin.type());
-    assertTrue(sin.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test tan with integer, long, float, double values.
-   */
+  /** Test tan with integer, long, float, double values. */
   @ParameterizedTest(name = "tan({0})")
   @MethodSource("trigonometricArguments")
   public void test_tan(Number value) {
     FunctionExpression tan = DSL.tan(DSL.literal(value));
     assertThat(
-        tan.valueOf(valueEnv()),
-        allOf(hasType(DOUBLE), hasValue(Math.tan(value.doubleValue()))));
+        tan.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.tan(value.doubleValue()))));
     assertEquals(String.format("tan(%s)", value), tan.toString());
   }
 
-  /**
-   * Test tan with null value.
-   */
-  @Test
-  public void tan_null_value() {
-    FunctionExpression tan = DSL.tan(DSL.ref(DOUBLE_TYPE_NULL_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, tan.type());
-    assertTrue(tan.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test tan with missing value.
-   */
-  @Test
-  public void tan_missing_value() {
-    FunctionExpression tan = DSL.tan(DSL.ref(DOUBLE_TYPE_MISSING_VALUE_FIELD, DOUBLE));
-    assertEquals(DOUBLE, tan.type());
-    assertTrue(tan.valueOf(valueEnv()).isMissing());
-  }
-
-  /**
-   * Test cbrt with int value.
-   */
+  /** Test cbrt with int value. */
   @ParameterizedTest(name = "cbrt({0})")
   @ValueSource(ints = {1, 2})
   public void cbrt_int_value(Integer value) {
@@ -2339,9 +1589,7 @@ public void cbrt_int_value(Integer value) {
     assertEquals(String.format("cbrt(%s)", value), cbrt.toString());
   }
 
-  /**
-   * Test cbrt with long value.
-   */
+  /** Test cbrt with long value. */
   @ParameterizedTest(name = "cbrt({0})")
   @ValueSource(longs = {1L, 2L})
   public void cbrt_long_value(Long value) {
@@ -2350,9 +1598,7 @@ public void cbrt_long_value(Long value) {
     assertEquals(String.format("cbrt(%s)", value), cbrt.toString());
   }
 
-  /**
-   * Test cbrt with float value.
-   */
+  /** Test cbrt with float value. */
   @ParameterizedTest(name = "cbrt({0})")
   @ValueSource(floats = {1F, 2F})
   public void cbrt_float_value(Float value) {
@@ -2361,9 +1607,7 @@ public void cbrt_float_value(Float value) {
     assertEquals(String.format("cbrt(%s)", value), cbrt.toString());
   }
 
-  /**
-   * Test cbrt with double value.
-   */
+  /** Test cbrt with double value. */
   @ParameterizedTest(name = "cbrt({0})")
   @ValueSource(doubles = {1D, 2D, Double.MAX_VALUE, Double.MIN_VALUE})
   public void cbrt_double_value(Double value) {
@@ -2372,9 +1616,7 @@ public void cbrt_double_value(Double value) {
     assertEquals(String.format("cbrt(%s)", value), cbrt.toString());
   }
 
-  /**
-   * Test cbrt with negative value.
-   */
+  /** Test cbrt with negative value. */
   @ParameterizedTest(name = "cbrt({0})")
   @ValueSource(doubles = {-1D, -2D})
   public void cbrt_negative_value(Double value) {
@@ -2382,24 +1624,4 @@ public void cbrt_negative_value(Double value) {
     assertThat(cbrt.valueOf(valueEnv()), allOf(hasType(DOUBLE), hasValue(Math.cbrt(value))));
     assertEquals(String.format("cbrt(%s)", value), cbrt.toString());
   }
-
-  /**
-   * Test cbrt with null value.
-   */
-  @Test
-  public void cbrt_null_value() {
-    FunctionExpression cbrt = DSL.cbrt(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, cbrt.type());
-    assertTrue(cbrt.valueOf(valueEnv()).isNull());
-  }
-
-  /**
-   * Test cbrt with missing value.
-   */
-  @Test
-  public void cbrt_missing_value() {
-    FunctionExpression cbrt = DSL.cbrt(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(DOUBLE, cbrt.type());
-    assertTrue(cbrt.valueOf(valueEnv()).isMissing());
-  }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/operator/convert/TypeCastOperatorTest.java b/core/src/test/java/org/opensearch/sql/expression/operator/convert/TypeCastOperatorTest.java
index 742313922a..7803a4dbca 100644
--- a/core/src/test/java/org/opensearch/sql/expression/operator/convert/TypeCastOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/operator/convert/TypeCastOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.operator.convert;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -44,8 +43,12 @@
 class TypeCastOperatorTest {
 
   private static Stream<ExprValue> numberData() {
-    return Stream.of(new ExprByteValue(3), new ExprShortValue(3),
-        new ExprIntegerValue(3), new ExprLongValue(3L), new ExprFloatValue(3.14f),
+    return Stream.of(
+        new ExprByteValue(3),
+        new ExprShortValue(3),
+        new ExprIntegerValue(3),
+        new ExprLongValue(3L),
+        new ExprFloatValue(3.14f),
         new ExprDoubleValue(3.1415D));
   }
 
@@ -357,5 +360,4 @@ void castToDatetime() {
     assertEquals(DATETIME, expression.type());
     assertEquals(new ExprDatetimeValue("2012-08-07 00:00:00"), expression.valueOf());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/operator/predicate/BinaryPredicateOperatorTest.java b/core/src/test/java/org/opensearch/sql/expression/operator/predicate/BinaryPredicateOperatorTest.java
index 7354b52e24..e6290553ce 100644
--- a/core/src/test/java/org/opensearch/sql/expression/operator/predicate/BinaryPredicateOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/operator/predicate/BinaryPredicateOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.operator.predicate;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -11,19 +10,18 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opensearch.sql.config.TestConfig.BOOL_TYPE_MISSING_VALUE_FIELD;
 import static org.opensearch.sql.config.TestConfig.BOOL_TYPE_NULL_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.INT_TYPE_MISSING_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.INT_TYPE_NULL_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.STRING_TYPE_MISSING_VALUE_FIELD;
-import static org.opensearch.sql.config.TestConfig.STRING_TYPE_NULL_VALUE_FIELD;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_FALSE;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_MISSING;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_NULL;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_TRUE;
 import static org.opensearch.sql.data.model.ExprValueUtils.booleanValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.fromObjectValue;
+import static org.opensearch.sql.data.type.ExprCoreType.ARRAY;
 import static org.opensearch.sql.data.type.ExprCoreType.BOOLEAN;
+import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
-import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
+import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
 import static org.opensearch.sql.utils.ComparisonUtil.compare;
 import static org.opensearch.sql.utils.OperatorUtils.matches;
 
@@ -34,6 +32,11 @@
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.List;
@@ -44,18 +47,10 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.opensearch.sql.data.model.ExprBooleanValue;
-import org.opensearch.sql.data.model.ExprByteValue;
-import org.opensearch.sql.data.model.ExprCollectionValue;
-import org.opensearch.sql.data.model.ExprDoubleValue;
-import org.opensearch.sql.data.model.ExprFloatValue;
-import org.opensearch.sql.data.model.ExprIntegerValue;
-import org.opensearch.sql.data.model.ExprLongValue;
-import org.opensearch.sql.data.model.ExprShortValue;
 import org.opensearch.sql.data.model.ExprStringValue;
-import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.model.ExprValueUtils;
+import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ExpressionTestBase;
@@ -63,7 +58,8 @@
 
 class BinaryPredicateOperatorTest extends ExpressionTestBase {
 
-  private static List<StringPatternPair> STRING_PATTERN_PAIRS = ImmutableList.of(
+  private static List<StringPatternPair> STRING_PATTERN_PAIRS =
+      ImmutableList.of(
           new StringPatternPair("Michael!", ".*"),
           new StringPatternPair("new*\\n*line", "new\\\\*.\\\\*line"),
           new StringPatternPair("a", "^[a-d]"),
@@ -87,65 +83,126 @@ private static Stream<Arguments> binaryPredicateArguments() {
         .map(list -> Arguments.of(list.get(0), list.get(1)));
   }
 
+  private static List<List<Object>> getValuesForComparisonTests() {
+    return List.of(
+        List.of(1, 2),
+        List.of((byte) 1, (byte) 2),
+        List.of((short) 1, (short) 2),
+        List.of(1L, 2L),
+        List.of(1F, 2F),
+        List.of(1D, 2D),
+        List.of("str", "str0"),
+        List.of(true, false),
+        List.of(LocalTime.of(9, 7, 0), LocalTime.of(7, 40, 0)),
+        List.of(LocalDate.of(1961, 4, 12), LocalDate.of(1984, 10, 25)),
+        List.of(Instant.ofEpochSecond(42), Instant.ofEpochSecond(100500)),
+        List.of(LocalDateTime.of(1961, 4, 12, 9, 7, 0), LocalDateTime.of(1984, 10, 25, 7, 40)),
+        List.of(LocalDate.of(1961, 4, 12), LocalTime.now().minusHours(1)),
+        List.of(LocalDate.of(1961, 4, 12), LocalDateTime.of(1984, 10, 25, 7, 40)),
+        List.of(Instant.ofEpochSecond(100500), LocalDate.of(1961, 4, 12)),
+        List.of(Instant.ofEpochSecond(100500), LocalTime.of(7, 40, 0)),
+        List.of(LocalTime.of(7, 40, 0), LocalDateTime.of(1984, 10, 25, 7, 40)),
+        List.of(Instant.ofEpochSecond(42), LocalDateTime.of(1984, 10, 25, 7, 40)));
+  }
+
   private static Stream<Arguments> testEqualArguments() {
     Stream.Builder<Arguments> builder = Stream.builder();
-    builder.add(Arguments.of(new ExprByteValue(1), new ExprByteValue(1)));
-    builder.add(Arguments.of(new ExprShortValue(1), new ExprShortValue(1)));
-    builder.add(Arguments.of(new ExprIntegerValue(1), new ExprIntegerValue(1)));
-    builder.add(Arguments.of(new ExprLongValue(1L), new ExprLongValue(1L)));
-    builder.add(Arguments.of(new ExprFloatValue(1F), new ExprFloatValue(1F)));
-    builder.add(Arguments.of(new ExprDoubleValue(1D), new ExprDoubleValue(1D)));
-    builder.add(Arguments.of(new ExprStringValue("str"), new ExprStringValue("str")));
-    builder.add(Arguments.of(ExprBooleanValue.of(true), ExprBooleanValue.of(true)));
-    builder.add(Arguments.of(new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1))),
-        new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1)))));
-    builder.add(Arguments.of(ExprTupleValue.fromExprValueMap(ImmutableMap.of("str",
-        new ExprIntegerValue(1))),
-        ExprTupleValue.fromExprValueMap(ImmutableMap.of("str", new ExprIntegerValue(1)))));
+    for (List<Object> argPair : getValuesForComparisonTests()) {
+      builder.add(Arguments.of(fromObjectValue(argPair.get(0)), fromObjectValue(argPair.get(0))));
+      builder.add(Arguments.of(fromObjectValue(argPair.get(1)), fromObjectValue(argPair.get(1))));
+    }
+    builder.add(
+        Arguments.of(
+            fromObjectValue(LocalTime.of(7, 40, 0)),
+            fromObjectValue(LocalTime.of(7, 40, 0).atDate(LocalDate.now()))));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(LocalDateTime.of(1970, 1, 1, 0, 0, 42)),
+            fromObjectValue(Instant.ofEpochSecond(42))));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(LocalDate.of(1970, 1, 1)), fromObjectValue(Instant.ofEpochSecond(0))));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(LocalDate.of(1984, 10, 25)),
+            fromObjectValue(LocalDateTime.of(1984, 10, 25, 0, 0))));
+    builder.add(
+        Arguments.of(fromObjectValue(LocalTime.of(0, 0, 0)), fromObjectValue(LocalDate.now())));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(LocalTime.of(0, 0, 0)),
+            fromObjectValue(LocalDate.now().atStartOfDay(ZoneId.of("UTC")).toInstant())));
+    builder.add(
+        Arguments.of(fromObjectValue(ImmutableList.of(1)), fromObjectValue(ImmutableList.of(1))));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(ImmutableMap.of("str", 1)),
+            fromObjectValue(ImmutableMap.of("str", 1))));
     return builder.build();
   }
 
   private static Stream<Arguments> testNotEqualArguments() {
-    List<List<Object>> arguments = Arrays.asList(
-        Arrays.asList((byte) 1, (byte) 2), Arrays.asList(1, 2), Arrays.asList(1L, 2L),
-        Arrays.asList(1F, 2F), Arrays.asList(1D, 2D),
-        Arrays.asList("str0", "str1"), Arrays.asList(true, false),
-        Arrays.asList(ImmutableList.of(1), ImmutableList.of(2)),
-        Arrays.asList(ImmutableMap.of("str", 1), ImmutableMap.of("str", 2))
-    );
     Stream.Builder<Arguments> builder = Stream.builder();
-    for (List<Object> argPair : arguments) {
+    for (List<Object> argPair : getValuesForComparisonTests()) {
       builder.add(Arguments.of(fromObjectValue(argPair.get(0)), fromObjectValue(argPair.get(1))));
+      builder.add(Arguments.of(fromObjectValue(argPair.get(1)), fromObjectValue(argPair.get(0))));
     }
+    builder.add(
+        Arguments.of(
+            fromObjectValue(LocalTime.of(7, 40, 0)),
+            fromObjectValue(LocalDateTime.of(1984, 10, 25, 7, 40, 0))));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(LocalDateTime.of(1984, 10, 25, 7, 40, 0)),
+            fromObjectValue(Instant.ofEpochSecond(42))));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(LocalDate.of(1984, 10, 25)),
+            fromObjectValue(Instant.ofEpochSecond(42))));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(LocalTime.of(7, 40, 0)), fromObjectValue(Instant.ofEpochSecond(42))));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(LocalDate.of(1984, 10, 25)),
+            fromObjectValue(LocalDateTime.of(1984, 10, 25, 7, 40))));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(LocalDate.of(1984, 10, 25)), fromObjectValue(LocalTime.of(7, 40, 0))));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(ImmutableList.of(1)), fromObjectValue(ImmutableList.of(1, 2))));
+    builder.add(
+        Arguments.of(fromObjectValue(ImmutableList.of(1)), fromObjectValue(ImmutableList.of(2))));
+    builder.add(
+        Arguments.of(
+            fromObjectValue(ImmutableMap.of("str", 1)),
+            fromObjectValue(ImmutableMap.of("str2", 2))));
     return builder.build();
   }
 
   private static Stream<Arguments> testCompareValueArguments() {
-    List<List<Object>> arguments = Arrays.asList(
-        Arrays.asList(1, 1), Arrays.asList(1, 2), Arrays.asList(2, 1),
-        Arrays.asList(1L, 1L), Arrays.asList(1L, 2L), Arrays.asList(2L, 1L),
-        Arrays.asList(1F, 1F), Arrays.asList(1F, 2F), Arrays.asList(2F, 1F),
-        Arrays.asList(1D, 1D), Arrays.asList(1D, 2D), Arrays.asList(2D, 1D),
-        Arrays.asList("str", "str"), Arrays.asList("str", "str0"), Arrays.asList("str0", "str")
-    );
     Stream.Builder<Arguments> builder = Stream.builder();
-    for (List<Object> argPair : arguments) {
+    for (List<Object> argPair : getValuesForComparisonTests()) {
+      builder.add(Arguments.of(fromObjectValue(argPair.get(0)), fromObjectValue(argPair.get(0))));
       builder.add(Arguments.of(fromObjectValue(argPair.get(0)), fromObjectValue(argPair.get(1))));
+      builder.add(Arguments.of(fromObjectValue(argPair.get(1)), fromObjectValue(argPair.get(0))));
     }
-    builder.add(Arguments.of(new ExprShortValue(1), new ExprShortValue(1)));
-    builder.add(Arguments.of(new ExprShortValue(1), new ExprShortValue(2)));
-    builder.add(Arguments.of(new ExprShortValue(2), new ExprShortValue(1)));
     return builder.build();
   }
 
   private static Stream<Arguments> testLikeArguments() {
-    List<List<String>> arguments = Arrays.asList(
-        Arrays.asList("foo", "foo"), Arrays.asList("notFoo", "foo"),
-        Arrays.asList("foobar", "%bar"), Arrays.asList("bar", "%bar"),
-        Arrays.asList("foo", "fo_"), Arrays.asList("foo", "foo_"),
-        Arrays.asList("foorbar", "%o_ar"), Arrays.asList("foobar", "%o_a%"),
-        Arrays.asList("fooba%_\\^$.*[]()|+r", "%\\%\\_\\\\\\^\\$\\.\\*\\[\\]\\(\\)\\|\\+_")
-    );
+    List<List<String>> arguments =
+        Arrays.asList(
+            Arrays.asList("foo", "foo"),
+            Arrays.asList("notFoo", "foo"),
+            Arrays.asList("foobar", "%bar"),
+            Arrays.asList("bar", "%bar"),
+            Arrays.asList("foo", "fo_"),
+            Arrays.asList("foo", "foo_"),
+            Arrays.asList("foorbar", "%o_ar"),
+            Arrays.asList("foobar", "%o_a%"),
+            Arrays.asList("fooba%_\\^$.*[]()|+r", "%\\%\\_\\\\\\^\\$\\.\\*\\[\\]\\(\\)\\|\\+_"));
     Stream.Builder<Arguments> builder = Stream.builder();
     for (List<String> argPair : arguments) {
       builder.add(Arguments.of(fromObjectValue(argPair.get(0)), fromObjectValue(argPair.get(1))));
@@ -156,8 +213,7 @@ private static Stream<Arguments> testLikeArguments() {
   @ParameterizedTest(name = "and({0}, {1})")
   @MethodSource("binaryPredicateArguments")
   public void test_and(Boolean v1, Boolean v2) {
-    FunctionExpression and =
-        DSL.and(DSL.literal(booleanValue(v1)), DSL.literal(booleanValue(v2)));
+    FunctionExpression and = DSL.and(DSL.literal(booleanValue(v1)), DSL.literal(booleanValue(v2)));
     assertEquals(BOOLEAN, and.type());
     assertEquals(v1 && v2, ExprValueUtils.getBooleanValue(and.valueOf(valueEnv())));
     assertEquals(String.format("and(%s, %s)", v1.toString(), v2.toString()), and.toString());
@@ -205,23 +261,31 @@ public void test_boolean_and_missing() {
 
   @Test
   public void test_null_and_missing() {
-    FunctionExpression and = DSL.and(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
+    FunctionExpression and =
+        DSL.and(
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, and.type());
     assertEquals(LITERAL_MISSING, and.valueOf(valueEnv()));
 
-    and = DSL.and(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
+    and =
+        DSL.and(
+            DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
+            DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, and.type());
     assertEquals(LITERAL_NULL, and.valueOf(valueEnv()));
 
-    and = DSL.and(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
+    and =
+        DSL.and(
+            DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, and.type());
     assertEquals(LITERAL_MISSING, and.valueOf(valueEnv()));
 
-    and = DSL.and(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
+    and =
+        DSL.and(
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
+            DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, and.type());
     assertEquals(LITERAL_MISSING, and.valueOf(valueEnv()));
   }
@@ -229,8 +293,7 @@ public void test_null_and_missing() {
   @ParameterizedTest(name = "or({0}, {1})")
   @MethodSource("binaryPredicateArguments")
   public void test_or(Boolean v1, Boolean v2) {
-    FunctionExpression or =
-        DSL.or(DSL.literal(booleanValue(v1)), DSL.literal(booleanValue(v2)));
+    FunctionExpression or = DSL.or(DSL.literal(booleanValue(v1)), DSL.literal(booleanValue(v2)));
     assertEquals(BOOLEAN, or.type());
     assertEquals(v1 || v2, ExprValueUtils.getBooleanValue(or.valueOf(valueEnv())));
     assertEquals(String.format("or(%s, %s)", v1.toString(), v2.toString()), or.toString());
@@ -278,34 +341,39 @@ public void test_boolean_or_missing() {
 
   @Test
   public void test_null_or_missing() {
-    FunctionExpression or = DSL.or(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
+    FunctionExpression or =
+        DSL.or(
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, or.type());
     assertEquals(LITERAL_MISSING, or.valueOf(valueEnv()));
 
     or =
-        DSL.or(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
+        DSL.or(
+            DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
             DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, or.type());
     assertEquals(LITERAL_NULL, or.valueOf(valueEnv()));
 
-    or = DSL.or(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
+    or =
+        DSL.or(
+            DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, or.type());
     assertEquals(LITERAL_NULL, or.valueOf(valueEnv()));
 
-    or = DSL.or(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
+    or =
+        DSL.or(
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
+            DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, or.type());
     assertEquals(LITERAL_NULL, or.valueOf(valueEnv()));
   }
 
-
   @ParameterizedTest(name = "xor({0}, {1})")
   @MethodSource("binaryPredicateArguments")
   public void test_xor(Boolean v1, Boolean v2) {
-    FunctionExpression xor =
-        DSL.xor(DSL.literal(booleanValue(v1)), DSL.literal(booleanValue(v2)));
+    FunctionExpression xor = DSL.xor(DSL.literal(booleanValue(v1)), DSL.literal(booleanValue(v2)));
     assertEquals(BOOLEAN, xor.type());
     assertEquals(v1 ^ v2, ExprValueUtils.getBooleanValue(xor.valueOf(valueEnv())));
     assertEquals(String.format("xor(%s, %s)", v1.toString(), v2.toString()), xor.toString());
@@ -353,23 +421,31 @@ public void test_boolean_xor_missing() {
 
   @Test
   public void test_null_xor_missing() {
-    FunctionExpression xor = DSL.xor(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
+    FunctionExpression xor =
+        DSL.xor(
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, xor.type());
     assertEquals(LITERAL_MISSING, xor.valueOf(valueEnv()));
 
-    xor = DSL.xor(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
+    xor =
+        DSL.xor(
+            DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
+            DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, xor.type());
     assertEquals(LITERAL_NULL, xor.valueOf(valueEnv()));
 
-    xor = DSL.xor(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
+    xor =
+        DSL.xor(
+            DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, xor.type());
     assertEquals(LITERAL_NULL, xor.valueOf(valueEnv()));
 
-    xor = DSL.xor(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
+    xor =
+        DSL.xor(
+            DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
+            DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
     assertEquals(BOOLEAN, xor.type());
     assertEquals(LITERAL_NULL, xor.valueOf(valueEnv()));
   }
@@ -377,331 +453,102 @@ public void test_null_xor_missing() {
   @ParameterizedTest(name = "equal({0}, {1})")
   @MethodSource("testEqualArguments")
   public void test_equal(ExprValue v1, ExprValue v2) {
-    FunctionExpression equal = DSL.equal(DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression equal = DSL.equal(functionProperties, DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, equal.type());
-    assertEquals(v1.value().equals(v2.value()),
-        ExprValueUtils.getBooleanValue(equal.valueOf(valueEnv())));
-    assertEquals(String.format("=(%s, %s)", v1.toString(), v2.toString()), equal.toString());
+    if (v1.type() == v2.type()) {
+      assertEquals(
+          v1.value().equals(v2.value()), ExprValueUtils.getBooleanValue(equal.valueOf(valueEnv())));
+    }
+    if (v1.type() != STRUCT && v1.type() != ARRAY) {
+      assertEquals(
+          0 == compare(functionProperties, v1, v2),
+          ExprValueUtils.getBooleanValue(equal.valueOf(valueEnv())));
+    }
+    assertStringRepr(v1, v2, "=", equal);
+  }
+
+  private void assertStringRepr(
+      ExprValue v1, ExprValue v2, String function, FunctionExpression functionExpression) {
+    if (v1.type() == v2.type()) {
+      assertEquals(String.format("%s(%s, %s)", function, v1, v2), functionExpression.toString());
+    } else {
+      var widerType = v1.type() == TIMESTAMP || v2.type() == TIMESTAMP ? TIMESTAMP : DATETIME;
+      assertEquals(
+          String.format(
+              "%s(%s, %s)",
+              function, getExpectedStringRepr(widerType, v1), getExpectedStringRepr(widerType, v2)),
+          functionExpression.toString());
+    }
   }
 
-  @Test
-  public void test_null_equal_missing() {
-    FunctionExpression equal = DSL.equal(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
-    assertEquals(BOOLEAN, equal.type());
-    assertEquals(LITERAL_MISSING, equal.valueOf(valueEnv()));
-
-    equal = DSL.equal(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
-    assertEquals(BOOLEAN, equal.type());
-    assertEquals(LITERAL_NULL, equal.valueOf(valueEnv()));
-
-    equal = DSL.equal(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
-    assertEquals(BOOLEAN, equal.type());
-    assertEquals(LITERAL_MISSING, equal.valueOf(valueEnv()));
-
-    equal = DSL.equal(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
-    assertEquals(BOOLEAN, equal.type());
-    assertEquals(LITERAL_MISSING, equal.valueOf(valueEnv()));
-
-    equal = DSL.equal(DSL.literal(LITERAL_TRUE), DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
-    assertEquals(BOOLEAN, equal.type());
-    assertEquals(LITERAL_MISSING, equal.valueOf(valueEnv()));
-
-    equal = DSL.equal(DSL.literal(LITERAL_TRUE), DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
-    assertEquals(BOOLEAN, equal.type());
-    assertEquals(LITERAL_NULL, equal.valueOf(valueEnv()));
-
-    equal = DSL.equal(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN), DSL.literal(LITERAL_TRUE));
-    assertEquals(BOOLEAN, equal.type());
-    assertEquals(LITERAL_MISSING, equal.valueOf(valueEnv()));
-
-    equal = DSL.equal(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN), DSL.literal(LITERAL_TRUE));
-    assertEquals(BOOLEAN, equal.type());
-    assertEquals(LITERAL_NULL, equal.valueOf(valueEnv()));
+  private String getExpectedStringRepr(ExprType widerType, ExprValue value) {
+    if (widerType == value.type()) {
+      return value.toString();
+    }
+    return String.format("cast_to_%s(%s)", widerType.toString().toLowerCase(), value);
   }
 
   @ParameterizedTest(name = "equal({0}, {1})")
   @MethodSource({"testEqualArguments", "testNotEqualArguments"})
   public void test_notequal(ExprValue v1, ExprValue v2) {
-    FunctionExpression notequal = DSL.notequal(DSL.literal(v1), DSL.literal(v2));
-    assertEquals(BOOLEAN, notequal.type());
-    assertEquals(!v1.value().equals(v2.value()),
-        ExprValueUtils.getBooleanValue(notequal.valueOf(valueEnv())));
-    assertEquals(String.format("!=(%s, %s)", v1.toString(), v2.toString()), notequal.toString());
-  }
-
-  @Test
-  public void test_null_notequal_missing() {
-    FunctionExpression notequal = DSL.notequal(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
+    FunctionExpression notequal =
+        DSL.notequal(functionProperties, DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, notequal.type());
-    assertEquals(LITERAL_MISSING, notequal.valueOf(valueEnv()));
-
-    notequal = DSL.notequal(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
-    assertEquals(BOOLEAN, notequal.type());
-    assertEquals(LITERAL_NULL, notequal.valueOf(valueEnv()));
-
-    notequal = DSL.notequal(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
-    assertEquals(BOOLEAN, notequal.type());
-    assertEquals(LITERAL_MISSING, notequal.valueOf(valueEnv()));
-
-    notequal = DSL.notequal(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
-        DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
-    assertEquals(BOOLEAN, notequal.type());
-    assertEquals(LITERAL_MISSING, notequal.valueOf(valueEnv()));
-
-    notequal = DSL.notequal(DSL.literal(LITERAL_TRUE),
-        DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN));
-    assertEquals(BOOLEAN, notequal.type());
-    assertEquals(LITERAL_MISSING, notequal.valueOf(valueEnv()));
-
-    notequal = DSL.notequal(DSL.literal(LITERAL_TRUE),
-        DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN));
-    assertEquals(BOOLEAN, notequal.type());
-    assertEquals(LITERAL_NULL, notequal.valueOf(valueEnv()));
-
-    notequal = DSL.notequal(DSL.ref(BOOL_TYPE_MISSING_VALUE_FIELD, BOOLEAN),
-        DSL.literal(LITERAL_TRUE));
-    assertEquals(BOOLEAN, notequal.type());
-    assertEquals(LITERAL_MISSING, notequal.valueOf(valueEnv()));
-
-    notequal = DSL.notequal(DSL.ref(BOOL_TYPE_NULL_VALUE_FIELD, BOOLEAN),
-        DSL.literal(LITERAL_TRUE));
-    assertEquals(BOOLEAN, notequal.type());
-    assertEquals(LITERAL_NULL, notequal.valueOf(valueEnv()));
+    if (v1.type() == v2.type()) {
+      assertEquals(
+          !v1.value().equals(v2.value()),
+          ExprValueUtils.getBooleanValue(notequal.valueOf(valueEnv())));
+    }
+    if (v1.type() != STRUCT && v1.type() != ARRAY) {
+      assertEquals(
+          0 != compare(functionProperties, v1, v2),
+          ExprValueUtils.getBooleanValue(notequal.valueOf(valueEnv())));
+    }
+    assertStringRepr(v1, v2, "!=", notequal);
   }
 
   @ParameterizedTest(name = "less({0}, {1})")
   @MethodSource("testCompareValueArguments")
   public void test_less(ExprValue v1, ExprValue v2) {
-    FunctionExpression less = DSL.less(DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression less = DSL.less(functionProperties, DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, less.type());
-    assertEquals(compare(v1, v2) < 0,
+    assertEquals(
+        compare(functionProperties, v1, v2) < 0,
         ExprValueUtils.getBooleanValue(less.valueOf(valueEnv())));
-    assertEquals(String.format("<(%s, %s)", v1.toString(), v2.toString()), less.toString());
-  }
-
-  @Test
-  public void test_less_null() {
-    FunctionExpression less = DSL.less(DSL.literal(1),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, less.type());
-    assertEquals(LITERAL_NULL, less.valueOf(valueEnv()));
-
-    less = DSL.less(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(BOOLEAN, less.type());
-    assertEquals(LITERAL_NULL, less.valueOf(valueEnv()));
-
-    less = DSL.less(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, less.type());
-    assertEquals(LITERAL_NULL, less.valueOf(valueEnv()));
-  }
-
-  @Test
-  public void test_less_missing() {
-    FunctionExpression less = DSL.less(DSL.literal(1),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, less.type());
-    assertEquals(LITERAL_MISSING, less.valueOf(valueEnv()));
-
-    less = DSL.less(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(BOOLEAN, less.type());
-    assertEquals(LITERAL_MISSING, less.valueOf(valueEnv()));
-
-    less = DSL.less(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, less.type());
-    assertEquals(LITERAL_MISSING, less.valueOf(valueEnv()));
-  }
-
-  @Test
-  public void test_null_less_missing() {
-    FunctionExpression less = DSL.less(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, less.type());
-    assertEquals(LITERAL_MISSING, less.valueOf(valueEnv()));
-
-    less = DSL.less(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, less.type());
-    assertEquals(LITERAL_MISSING, less.valueOf(valueEnv()));
+    assertStringRepr(v1, v2, "<", less);
   }
 
   @ParameterizedTest(name = "lte({0}, {1})")
   @MethodSource("testCompareValueArguments")
   public void test_lte(ExprValue v1, ExprValue v2) {
-    FunctionExpression lte = DSL.lte(DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression lte = DSL.lte(functionProperties, DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, lte.type());
-    assertEquals(compare(v1, v2) <= 0,
+    assertEquals(
+        compare(functionProperties, v1, v2) <= 0,
         ExprValueUtils.getBooleanValue(lte.valueOf(valueEnv())));
-    assertEquals(String.format("<=(%s, %s)", v1.toString(), v2.toString()), lte.toString());
-  }
-
-  @Test
-  public void test_lte_null() {
-    FunctionExpression lte = DSL.lte(DSL.literal(1),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, lte.type());
-    assertEquals(LITERAL_NULL, lte.valueOf(valueEnv()));
-
-    lte = DSL.lte(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(BOOLEAN, lte.type());
-    assertEquals(LITERAL_NULL, lte.valueOf(valueEnv()));
-
-    lte = DSL.lte(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, lte.type());
-    assertEquals(LITERAL_NULL, lte.valueOf(valueEnv()));
-  }
-
-  @Test
-  public void test_lte_missing() {
-    FunctionExpression lte = DSL.lte(DSL.literal(1),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, lte.type());
-    assertEquals(LITERAL_MISSING, lte.valueOf(valueEnv()));
-
-    lte = DSL.lte(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(BOOLEAN, lte.type());
-    assertEquals(LITERAL_MISSING, lte.valueOf(valueEnv()));
-
-    lte = DSL.lte(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, lte.type());
-    assertEquals(LITERAL_MISSING, lte.valueOf(valueEnv()));
-  }
-
-  @Test
-  public void test_null_lte_missing() {
-    FunctionExpression lte = DSL.lte(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, lte.type());
-    assertEquals(LITERAL_MISSING, lte.valueOf(valueEnv()));
-
-    lte = DSL.lte(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, lte.type());
-    assertEquals(LITERAL_MISSING, lte.valueOf(valueEnv()));
+    assertStringRepr(v1, v2, "<=", lte);
   }
 
   @ParameterizedTest(name = "greater({0}, {1})")
   @MethodSource("testCompareValueArguments")
   public void test_greater(ExprValue v1, ExprValue v2) {
-    FunctionExpression greater = DSL.greater(DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression greater = DSL.greater(functionProperties, DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, greater.type());
-    assertEquals(compare(v1, v2) > 0,
+    assertEquals(
+        compare(functionProperties, v1, v2) > 0,
         ExprValueUtils.getBooleanValue(greater.valueOf(valueEnv())));
-    assertEquals(String.format(">(%s, %s)", v1.toString(), v2.toString()), greater.toString());
-  }
-
-  @Test
-  public void test_greater_null() {
-    FunctionExpression greater = DSL.greater(DSL.literal(1),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, greater.type());
-    assertEquals(LITERAL_NULL, greater.valueOf(valueEnv()));
-
-    greater = DSL.greater(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(BOOLEAN, greater.type());
-    assertEquals(LITERAL_NULL, greater.valueOf(valueEnv()));
-
-    greater = DSL.greater(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, greater.type());
-    assertEquals(LITERAL_NULL, greater.valueOf(valueEnv()));
-  }
-
-  @Test
-  public void test_greater_missing() {
-    FunctionExpression greater = DSL.greater(DSL.literal(1),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, greater.type());
-    assertEquals(LITERAL_MISSING, greater.valueOf(valueEnv()));
-
-    greater = DSL.greater(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(BOOLEAN, greater.type());
-    assertEquals(LITERAL_MISSING, greater.valueOf(valueEnv()));
-
-    greater = DSL.greater(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, greater.type());
-    assertEquals(LITERAL_MISSING, greater.valueOf(valueEnv()));
-  }
-
-  @Test
-  public void test_null_greater_missing() {
-    FunctionExpression greater = DSL.greater(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, greater.type());
-    assertEquals(LITERAL_MISSING, greater.valueOf(valueEnv()));
-
-    greater = DSL.greater(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, greater.type());
-    assertEquals(LITERAL_MISSING, greater.valueOf(valueEnv()));
+    assertStringRepr(v1, v2, ">", greater);
   }
 
   @ParameterizedTest(name = "gte({0}, {1})")
   @MethodSource("testCompareValueArguments")
   public void test_gte(ExprValue v1, ExprValue v2) {
-    FunctionExpression gte = DSL.gte(DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression gte = DSL.gte(functionProperties, DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, gte.type());
-    assertEquals(compare(v1, v2) >= 0,
+    assertEquals(
+        compare(functionProperties, v1, v2) >= 0,
         ExprValueUtils.getBooleanValue(gte.valueOf(valueEnv())));
-    assertEquals(String.format(">=(%s, %s)", v1.toString(), v2.toString()), gte.toString());
-  }
-
-  @Test
-  public void test_gte_null() {
-    FunctionExpression gte = DSL.gte(DSL.literal(1),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, gte.type());
-    assertEquals(LITERAL_NULL, gte.valueOf(valueEnv()));
-
-    gte = DSL.gte(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(BOOLEAN, gte.type());
-    assertEquals(LITERAL_NULL, gte.valueOf(valueEnv()));
-
-    gte = DSL.gte(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, gte.type());
-    assertEquals(LITERAL_NULL, gte.valueOf(valueEnv()));
-  }
-
-  @Test
-  public void test_gte_missing() {
-    FunctionExpression gte = DSL.gte(DSL.literal(1),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, gte.type());
-    assertEquals(LITERAL_MISSING, gte.valueOf(valueEnv()));
-
-    gte = DSL.gte(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER), DSL.literal(1));
-    assertEquals(BOOLEAN, gte.type());
-    assertEquals(LITERAL_MISSING, gte.valueOf(valueEnv()));
-
-    gte = DSL.gte(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, gte.type());
-    assertEquals(LITERAL_MISSING, gte.valueOf(valueEnv()));
-  }
-
-  @Test
-  public void test_null_gte_missing() {
-    FunctionExpression gte = DSL.gte(DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, gte.type());
-    assertEquals(LITERAL_MISSING, gte.valueOf(valueEnv()));
-
-    gte = DSL.gte(DSL.ref(INT_TYPE_MISSING_VALUE_FIELD, INTEGER),
-        DSL.ref(INT_TYPE_NULL_VALUE_FIELD, INTEGER));
-    assertEquals(BOOLEAN, gte.type());
-    assertEquals(LITERAL_MISSING, gte.valueOf(valueEnv()));
+    assertStringRepr(v1, v2, ">=", gte);
   }
 
   @ParameterizedTest(name = "like({0}, {1})")
@@ -713,53 +560,6 @@ public void test_like(ExprValue v1, ExprValue v2) {
     assertEquals(String.format("like(%s, %s)", v1.toString(), v2.toString()), like.toString());
   }
 
-  @Test
-  public void test_like_null() {
-    FunctionExpression like =
-        DSL.like(DSL.literal("str"), DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING));
-    assertEquals(BOOLEAN, like.type());
-    assertEquals(LITERAL_NULL, like.valueOf(valueEnv()));
-
-    like = DSL.like(DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING), DSL.literal("str"));
-    assertEquals(BOOLEAN, like.type());
-    assertEquals(LITERAL_NULL, like.valueOf(valueEnv()));
-
-    like = DSL.like(DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING),
-        DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING));
-    assertEquals(BOOLEAN, like.type());
-    assertEquals(LITERAL_NULL, like.valueOf(valueEnv()));
-  }
-
-  @Test
-  public void test_like_missing() {
-    FunctionExpression like =
-        DSL.like(DSL.literal("str"), DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING));
-    assertEquals(BOOLEAN, like.type());
-    assertEquals(LITERAL_MISSING, like.valueOf(valueEnv()));
-
-    like = DSL.like(DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING), DSL.literal("str"));
-    assertEquals(BOOLEAN, like.type());
-    assertEquals(LITERAL_MISSING, like.valueOf(valueEnv()));
-
-    like = DSL.like(DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING),
-        DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING));
-    assertEquals(BOOLEAN, like.type());
-    assertEquals(LITERAL_MISSING, like.valueOf(valueEnv()));
-  }
-
-  @Test
-  public void test_null_like_missing() {
-    FunctionExpression like = DSL.like(DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING),
-        DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING));
-    assertEquals(BOOLEAN, like.type());
-    assertEquals(LITERAL_MISSING, like.valueOf(valueEnv()));
-
-    like = DSL.like(DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING),
-        DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING));
-    assertEquals(BOOLEAN, like.type());
-    assertEquals(LITERAL_MISSING, like.valueOf(valueEnv()));
-  }
-
   @Test
   public void test_not_like() {
     FunctionExpression notLike = DSL.notLike(DSL.literal("bob"), DSL.literal("tom"));
@@ -778,17 +578,15 @@ void test_regexp() {
   }
 
   void testRegexpString(StringPatternPair stringPatternPair) {
-    FunctionExpression expression = DSL.regexp(
+    FunctionExpression expression =
+        DSL.regexp(
             DSL.literal(new ExprStringValue(stringPatternPair.getStr())),
             DSL.literal(new ExprStringValue(stringPatternPair.getPatt())));
     assertEquals(INTEGER, expression.type());
-    assertEquals(stringPatternPair.regExpTest(), expression
-        .valueOf(valueEnv()).integerValue());
+    assertEquals(stringPatternPair.regExpTest(), expression.valueOf(valueEnv()).integerValue());
   }
 
-  /**
-   * Todo. remove this test cases after script serilization implemented.
-   */
+  /** Todo. remove this test cases after script serilization implemented. */
   @Test
   public void serializationTest() throws Exception {
     Expression expression = DSL.equal(DSL.literal("v1"), DSL.literal("v2"));
diff --git a/core/src/test/java/org/opensearch/sql/expression/operator/predicate/UnaryPredicateOperatorTest.java b/core/src/test/java/org/opensearch/sql/expression/operator/predicate/UnaryPredicateOperatorTest.java
index de3f5a3e7e..f7a1a7008a 100644
--- a/core/src/test/java/org/opensearch/sql/expression/operator/predicate/UnaryPredicateOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/operator/predicate/UnaryPredicateOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.operator.predicate;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -50,15 +49,15 @@ private static Stream<Arguments> isNullArguments() {
     expressions.add(DSL.literal(LITERAL_NULL));
 
     return Lists.cartesianProduct(expressions, expressions).stream()
-        .map(list -> {
-          Expression e1 = list.get(0);
-          if (e1.valueOf(valueEnv()).isNull()
-                  || e1.valueOf(valueEnv()).isMissing()) {
-            return Arguments.of(e1, DSL.literal(LITERAL_TRUE));
-          } else {
-            return Arguments.of(e1, DSL.literal(LITERAL_FALSE));
-          }
-        });
+        .map(
+            list -> {
+              Expression e1 = list.get(0);
+              if (e1.valueOf(valueEnv()).isNull() || e1.valueOf(valueEnv()).isMissing()) {
+                return Arguments.of(e1, DSL.literal(LITERAL_TRUE));
+              } else {
+                return Arguments.of(e1, DSL.literal(LITERAL_FALSE));
+              }
+            });
   }
 
   private static Stream<Arguments> ifNullArguments() {
@@ -69,16 +68,17 @@ private static Stream<Arguments> ifNullArguments() {
     exprValueArrayList.add(DSL.literal(LITERAL_NULL));
 
     return Lists.cartesianProduct(exprValueArrayList, exprValueArrayList).stream()
-        .map(list -> {
-          Expression e1 = list.get(0);
-          Expression e2 = list.get(1);
-          if (e1.valueOf(valueEnv()).value() == LITERAL_NULL.value()
+        .map(
+            list -> {
+              Expression e1 = list.get(0);
+              Expression e2 = list.get(1);
+              if (e1.valueOf(valueEnv()).value() == LITERAL_NULL.value()
                   || e1.valueOf(valueEnv()).value() == LITERAL_MISSING) {
-            return Arguments.of(e1, e2, e2);
-          } else {
-            return Arguments.of(e1, e2, e1);
-          }
-        });
+                return Arguments.of(e1, e2, e2);
+              } else {
+                return Arguments.of(e1, e2, e1);
+              }
+            });
   }
 
   private static Stream<Arguments> nullIfArguments() {
@@ -87,16 +87,17 @@ private static Stream<Arguments> nullIfArguments() {
     exprValueArrayList.add(DSL.literal(321));
 
     return Lists.cartesianProduct(exprValueArrayList, exprValueArrayList).stream()
-        .map(list -> {
-          Expression e1 = list.get(0);
-          Expression e2 = list.get(1);
+        .map(
+            list -> {
+              Expression e1 = list.get(0);
+              Expression e2 = list.get(1);
 
-          if (e1.equals(e2)) {
-            return Arguments.of(e1, e2, DSL.literal(LITERAL_NULL));
-          } else {
-            return Arguments.of(e1, e2, e1);
-          }
-        });
+              if (e1.equals(e2)) {
+                return Arguments.of(e1, e2, DSL.literal(LITERAL_NULL));
+              } else {
+                return Arguments.of(e1, e2, e1);
+              }
+            });
   }
 
   private static Stream<Arguments> ifArguments() {
@@ -107,14 +108,15 @@ private static Stream<Arguments> ifArguments() {
     exprValueArrayList.add(DSL.literal(LITERAL_MISSING));
 
     return Lists.cartesianProduct(exprValueArrayList, exprValueArrayList).stream()
-        .map(list -> {
-          Expression e1 = list.get(0);
-          if (e1.valueOf(valueEnv()).value() == LITERAL_TRUE.value()) {
-            return Arguments.of(e1, DSL.literal("123"), DSL.literal("321"), DSL.literal("123"));
-          } else {
-            return Arguments.of(e1, DSL.literal("123"), DSL.literal("321"), DSL.literal("321"));
-          }
-        });
+        .map(
+            list -> {
+              Expression e1 = list.get(0);
+              if (e1.valueOf(valueEnv()).value() == LITERAL_TRUE.value()) {
+                return Arguments.of(e1, DSL.literal("123"), DSL.literal("321"), DSL.literal("123"));
+              } else {
+                return Arguments.of(e1, DSL.literal("123"), DSL.literal("321"), DSL.literal("321"));
+              }
+            });
   }
 
   private static Stream<Arguments> exprIfNullArguments() {
@@ -125,15 +127,16 @@ private static Stream<Arguments> exprIfNullArguments() {
     exprValues.add(ExprValueUtils.integerValue(456));
 
     return Lists.cartesianProduct(exprValues, exprValues).stream()
-        .map(list -> {
-          ExprValue e1 = list.get(0);
-          ExprValue e2 = list.get(1);
-          if (e1.isNull() || e1.isMissing()) {
-            return Arguments.of(e1, e2, e2);
-          } else {
-            return Arguments.of(e1, e2, e1);
-          }
-        });
+        .map(
+            list -> {
+              ExprValue e1 = list.get(0);
+              ExprValue e2 = list.get(1);
+              if (e1.isNull() || e1.isMissing()) {
+                return Arguments.of(e1, e2, e2);
+              } else {
+                return Arguments.of(e1, e2, e1);
+              }
+            });
   }
 
   private static Stream<Arguments> exprNullIfArguments() {
@@ -143,15 +146,16 @@ private static Stream<Arguments> exprNullIfArguments() {
     exprValues.add(ExprValueUtils.integerValue(123));
 
     return Lists.cartesianProduct(exprValues, exprValues).stream()
-        .map(list -> {
-          ExprValue e1 = list.get(0);
-          ExprValue e2 = list.get(1);
-          if (e1.equals(e2)) {
-            return Arguments.of(e1, e2, LITERAL_NULL);
-          } else {
-            return Arguments.of(e1, e2, e1);
-          }
-        });
+        .map(
+            list -> {
+              ExprValue e1 = list.get(0);
+              ExprValue e2 = list.get(1);
+              if (e1.equals(e2)) {
+                return Arguments.of(e1, e2, LITERAL_NULL);
+              } else {
+                return Arguments.of(e1, e2, e1);
+              }
+            });
   }
 
   @Test
@@ -225,5 +229,4 @@ public void test_exprIfNull_predicate(ExprValue v1, ExprValue v2, ExprValue expe
   public void test_exprNullIf_predicate(ExprValue v1, ExprValue v2, ExprValue expected) {
     assertEquals(expected.value(), UnaryPredicateOperator.exprNullIf(v1, v2).value());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/parse/GrokExpressionTest.java b/core/src/test/java/org/opensearch/sql/expression/parse/GrokExpressionTest.java
index 28bd3467fd..fec851c1ed 100644
--- a/core/src/test/java/org/opensearch/sql/expression/parse/GrokExpressionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/parse/GrokExpressionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.parse;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -37,70 +36,100 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class GrokExpressionTest extends ExpressionTestBase {
 
-  @Mock
-  Environment<Expression, ExprValue> env;
+  @Mock Environment<Expression, ExprValue> env;
 
   @Test
   public void resolve_grok_groups_and_parsed_values() {
-    when(DSL.ref("log_value", STRING).valueOf(env)).thenReturn(stringValue(
-        "145.128.75.121 - - [29/Aug/2022:13:26:44 -0700] \"GET /deliverables HTTP/2.0\" 501 2721"));
+    when(DSL.ref("log_value", STRING).valueOf(env))
+        .thenReturn(
+            stringValue(
+                "145.128.75.121 - - [29/Aug/2022:13:26:44 -0700] \"GET /deliverables HTTP/2.0\" 501"
+                    + " 2721"));
 
     String rawPattern = "%{COMMONAPACHELOG}";
-    Map<String, String> expected = ImmutableMap.<String, String>builder()
-        .put("COMMONAPACHELOG", "145.128.75.121 - - [29/Aug/2022:13:26:44 -0700] "
-            + "\"GET /deliverables HTTP/2.0\" 501 2721")
-        .put("clientip", "145.128.75.121")
-        .put("ident", "-")
-        .put("auth", "-")
-        .put("timestamp", "29/Aug/2022:13:26:44 -0700")
-        .put("MONTHDAY", "29")
-        .put("MONTH", "Aug")
-        .put("YEAR", "2022")
-        .put("TIME", "13:26:44")
-        .put("HOUR", "13")
-        .put("MINUTE", "26")
-        .put("SECOND", "44")
-        .put("INT", "-0700")
-        .put("verb", "GET")
-        .put("request", "/deliverables")
-        .put("httpversion", "2.0")
-        .put("rawrequest", "")
-        .put("response", "501")
-        .put("bytes", "2721")
-        .build();
+    Map<String, String> expected =
+        ImmutableMap.<String, String>builder()
+            .put(
+                "COMMONAPACHELOG",
+                "145.128.75.121 - - [29/Aug/2022:13:26:44 -0700] "
+                    + "\"GET /deliverables HTTP/2.0\" 501 2721")
+            .put("clientip", "145.128.75.121")
+            .put("ident", "-")
+            .put("auth", "-")
+            .put("timestamp", "29/Aug/2022:13:26:44 -0700")
+            .put("MONTHDAY", "29")
+            .put("MONTH", "Aug")
+            .put("YEAR", "2022")
+            .put("TIME", "13:26:44")
+            .put("HOUR", "13")
+            .put("MINUTE", "26")
+            .put("SECOND", "44")
+            .put("INT", "-0700")
+            .put("verb", "GET")
+            .put("request", "/deliverables")
+            .put("httpversion", "2.0")
+            .put("rawrequest", "")
+            .put("response", "501")
+            .put("bytes", "2721")
+            .build();
     List<String> identifiers = new ArrayList<>(expected.keySet());
     assertEquals(identifiers, GrokExpression.getNamedGroupCandidates(rawPattern));
-    identifiers.forEach(identifier -> assertEquals(stringValue(expected.get(identifier)),
-        DSL.grok(DSL.ref("log_value", STRING), DSL.literal(rawPattern), DSL.literal(identifier))
-            .valueOf(env)));
+    identifiers.forEach(
+        identifier ->
+            assertEquals(
+                stringValue(expected.get(identifier)),
+                DSL.grok(
+                        DSL.ref("log_value", STRING),
+                        DSL.literal(rawPattern),
+                        DSL.literal(identifier))
+                    .valueOf(env)));
   }
 
   @Test
   public void resolve_null_and_empty_values() {
-    assertEquals(stringValue(""),
-        DSL.grok(DSL.ref("string_value", STRING), DSL.literal("%{COMMONAPACHELOG}"),
-            DSL.literal("request")).valueOf(valueEnv()));
-    assertEquals(LITERAL_NULL,
-        DSL.grok(DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING),
-            DSL.literal("%{COMMONAPACHELOG}"), DSL.literal("request")).valueOf(valueEnv()));
-    assertEquals(LITERAL_NULL,
-        DSL.grok(DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING),
-            DSL.literal("p%{COMMONAPACHELOG}"), DSL.literal("request")).valueOf(valueEnv()));
+    assertEquals(
+        stringValue(""),
+        DSL.grok(
+                DSL.ref("string_value", STRING),
+                DSL.literal("%{COMMONAPACHELOG}"),
+                DSL.literal("request"))
+            .valueOf(valueEnv()));
+    assertEquals(
+        LITERAL_NULL,
+        DSL.grok(
+                DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING),
+                DSL.literal("%{COMMONAPACHELOG}"),
+                DSL.literal("request"))
+            .valueOf(valueEnv()));
+    assertEquals(
+        LITERAL_NULL,
+        DSL.grok(
+                DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING),
+                DSL.literal("p%{COMMONAPACHELOG}"),
+                DSL.literal("request"))
+            .valueOf(valueEnv()));
   }
 
   @Test
   public void resolve_type() {
-    assertEquals(STRING,
-        DSL.grok(DSL.ref("string_value", STRING), DSL.literal("%{COMMONAPACHELOG}"),
-            DSL.literal("request")).type());
+    assertEquals(
+        STRING,
+        DSL.grok(
+                DSL.ref("string_value", STRING),
+                DSL.literal("%{COMMONAPACHELOG}"),
+                DSL.literal("request"))
+            .type());
   }
 
   @Test
   public void throws_semantic_exception_if_value_type_is_not_string() {
     assertThrows(
         SemanticCheckException.class,
-        () -> DSL.grok(DSL.ref("boolean_value", BOOLEAN), DSL.literal("%{COMMONAPACHELOG}"),
-                DSL.literal("request"))
-            .valueOf(valueEnv()));
+        () ->
+            DSL.grok(
+                    DSL.ref("boolean_value", BOOLEAN),
+                    DSL.literal("%{COMMONAPACHELOG}"),
+                    DSL.literal("request"))
+                .valueOf(valueEnv()));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/parse/PatternsExpressionTest.java b/core/src/test/java/org/opensearch/sql/expression/parse/PatternsExpressionTest.java
index 1593e94a8a..7237f0673b 100644
--- a/core/src/test/java/org/opensearch/sql/expression/parse/PatternsExpressionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/parse/PatternsExpressionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.parse;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -33,46 +32,58 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class PatternsExpressionTest extends ExpressionTestBase {
 
-  @Mock
-  Environment<Expression, ExprValue> env;
+  @Mock Environment<Expression, ExprValue> env;
 
   @Test
   public void resolve_value() {
-    when(DSL.ref("log_value", STRING).valueOf(env)).thenReturn(stringValue(
-        "145.128.75.121 - - [29/Aug/2022:13:26:44 -0700] \"GET /deliverables HTTP/2.0\" 501 2721"));
-    assertEquals(stringValue("... - - [//::: -] \" / /.\"  "),
-        DSL.patterns(DSL.ref("log_value", STRING), DSL.literal(""),
-            DSL.literal("punct_field")).valueOf(env));
-    assertEquals(stringValue("... - - [/Aug/::: -] \"GET /deliverables HTTP/.\"  "),
-        DSL.patterns(DSL.ref("log_value", STRING), DSL.literal("[0-9]"),
-            DSL.literal("regex_field")).valueOf(env));
+    when(DSL.ref("log_value", STRING).valueOf(env))
+        .thenReturn(
+            stringValue(
+                "145.128.75.121 - - [29/Aug/2022:13:26:44 -0700] \"GET /deliverables HTTP/2.0\" 501"
+                    + " 2721"));
+    assertEquals(
+        stringValue("... - - [//::: -] \" / /.\"  "),
+        DSL.patterns(DSL.ref("log_value", STRING), DSL.literal(""), DSL.literal("punct_field"))
+            .valueOf(env));
+    assertEquals(
+        stringValue("... - - [/Aug/::: -] \"GET /deliverables HTTP/.\"  "),
+        DSL.patterns(DSL.ref("log_value", STRING), DSL.literal("[0-9]"), DSL.literal("regex_field"))
+            .valueOf(env));
   }
 
   @Test
   public void resolve_null_and_missing_values() {
-    assertEquals(LITERAL_NULL,
-        DSL.patterns(DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING),
-            DSL.literal("pattern"), DSL.literal("patterns_field")).valueOf(valueEnv()));
-    assertEquals(LITERAL_NULL,
-        DSL.patterns(DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING),
-            DSL.literal("pattern"), DSL.literal("patterns_field")).valueOf(valueEnv()));
+    assertEquals(
+        LITERAL_NULL,
+        DSL.patterns(
+                DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING),
+                DSL.literal("pattern"),
+                DSL.literal("patterns_field"))
+            .valueOf(valueEnv()));
+    assertEquals(
+        LITERAL_NULL,
+        DSL.patterns(
+                DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING),
+                DSL.literal("pattern"),
+                DSL.literal("patterns_field"))
+            .valueOf(valueEnv()));
   }
 
   @Test
   public void resolve_type() {
-    assertEquals(STRING,
-        DSL.patterns(DSL.ref("string_value", STRING),
-            DSL.literal("pattern"),
-            DSL.literal("group")).type());
+    assertEquals(
+        STRING,
+        DSL.patterns(DSL.ref("string_value", STRING), DSL.literal("pattern"), DSL.literal("group"))
+            .type());
   }
 
   @Test
   public void throws_semantic_exception_if_value_type_is_not_string() {
     assertThrows(
         SemanticCheckException.class,
-        () -> DSL.patterns(DSL.ref("boolean_value", BOOLEAN),
-                DSL.literal("pattern"),
-                DSL.literal("group"))
-            .valueOf(valueEnv()));
+        () ->
+            DSL.patterns(
+                    DSL.ref("boolean_value", BOOLEAN), DSL.literal("pattern"), DSL.literal("group"))
+                .valueOf(valueEnv()));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/parse/RegexExpressionTest.java b/core/src/test/java/org/opensearch/sql/expression/parse/RegexExpressionTest.java
index 95d836042e..846aff6911 100644
--- a/core/src/test/java/org/opensearch/sql/expression/parse/RegexExpressionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/parse/RegexExpressionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.parse;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -37,62 +36,97 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class RegexExpressionTest extends ExpressionTestBase {
 
-  @Mock
-  Environment<Expression, ExprValue> env;
+  @Mock Environment<Expression, ExprValue> env;
 
   @Test
   public void resolve_regex_groups_and_parsed_values() {
-    when(DSL.ref("log_value", STRING).valueOf(env)).thenReturn(stringValue(
-        "130.246.123.197 - - [2018-07-22T03:26:21.326Z] \"GET /beats/metricbeat_1 HTTP/1.1\" "
-            + "200 6850 \"-\" \"Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 "
-            + "Firefox/6.0a1\""));
+    when(DSL.ref("log_value", STRING).valueOf(env))
+        .thenReturn(
+            stringValue(
+                "130.246.123.197 - - [2018-07-22T03:26:21.326Z] \"GET /beats/metricbeat_1"
+                    + " HTTP/1.1\" 200 6850 \"-\" \"Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1)"
+                    + " Gecko/20110421 Firefox/6.0a1\""));
 
     String rawPattern =
         "(?<ip>(\\d{1,3}\\.){3}\\d{1,3}) - - \\[(?<date>\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:"
             + "[0-5]\\d:[0-5]\\d\\.\\d+([+-][0-2]\\d:[0-5]\\d|Z))] \"(?<request>[^\"]+)\" "
             + "(?<status>\\d+) (?<bytes>\\d+) \"-\" \"(?<userAgent>[^\"]+)\"";
     Map<String, String> expected =
-        ImmutableMap.of("ip", "130.246.123.197", "date", "2018-07-22T03:26:21.326Z", "request",
-            "GET /beats/metricbeat_1 HTTP/1.1", "status", "200", "bytes", "6850", "userAgent",
+        ImmutableMap.of(
+            "ip",
+            "130.246.123.197",
+            "date",
+            "2018-07-22T03:26:21.326Z",
+            "request",
+            "GET /beats/metricbeat_1 HTTP/1.1",
+            "status",
+            "200",
+            "bytes",
+            "6850",
+            "userAgent",
             "Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1");
     List<String> identifiers = new ArrayList<>(expected.keySet());
     assertEquals(identifiers, RegexExpression.getNamedGroupCandidates(rawPattern));
-    identifiers.forEach(identifier -> assertEquals(stringValue(expected.get(identifier)),
-        DSL.regex(DSL.ref("log_value", STRING), DSL.literal(rawPattern), DSL.literal(identifier))
-            .valueOf(env)));
+    identifiers.forEach(
+        identifier ->
+            assertEquals(
+                stringValue(expected.get(identifier)),
+                DSL.regex(
+                        DSL.ref("log_value", STRING),
+                        DSL.literal(rawPattern),
+                        DSL.literal(identifier))
+                    .valueOf(env)));
   }
 
   @Test
   public void resolve_not_parsable_inputs_as_empty_string() {
-    assertEquals(stringValue(""),
-        DSL.regex(DSL.ref("string_value", STRING), DSL.literal("(?<group>not-matching)"),
-            DSL.literal("group")).valueOf(valueEnv()));
+    assertEquals(
+        stringValue(""),
+        DSL.regex(
+                DSL.ref("string_value", STRING),
+                DSL.literal("(?<group>not-matching)"),
+                DSL.literal("group"))
+            .valueOf(valueEnv()));
   }
 
   @Test
   public void resolve_null_and_missing_values() {
-    assertEquals(LITERAL_NULL,
-        DSL.regex(DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING),
-            DSL.literal("(?<group>\\w{2})\\w"), DSL.literal("group")).valueOf(valueEnv()));
-    assertEquals(LITERAL_NULL,
-        DSL.regex(DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING),
-            DSL.literal("(?<group>\\w{2})\\w"), DSL.literal("group")).valueOf(valueEnv()));
+    assertEquals(
+        LITERAL_NULL,
+        DSL.regex(
+                DSL.ref(STRING_TYPE_NULL_VALUE_FIELD, STRING),
+                DSL.literal("(?<group>\\w{2})\\w"),
+                DSL.literal("group"))
+            .valueOf(valueEnv()));
+    assertEquals(
+        LITERAL_NULL,
+        DSL.regex(
+                DSL.ref(STRING_TYPE_MISSING_VALUE_FIELD, STRING),
+                DSL.literal("(?<group>\\w{2})\\w"),
+                DSL.literal("group"))
+            .valueOf(valueEnv()));
   }
 
   @Test
   public void resolve_type() {
-    assertEquals(STRING,
-        DSL.regex(DSL.ref("string_value", STRING), DSL.literal("(?<group>\\w{2})\\w"),
-            DSL.literal("group")).type());
+    assertEquals(
+        STRING,
+        DSL.regex(
+                DSL.ref("string_value", STRING),
+                DSL.literal("(?<group>\\w{2})\\w"),
+                DSL.literal("group"))
+            .type());
   }
 
   @Test
   public void throws_semantic_exception_if_value_type_is_not_string() {
     assertThrows(
         SemanticCheckException.class,
-        () -> DSL.regex(DSL.ref("boolean_value", BOOLEAN), DSL.literal("(?<group>\\w{2})\\w"),
-                DSL.literal("group"))
-            .valueOf(valueEnv()));
+        () ->
+            DSL.regex(
+                    DSL.ref("boolean_value", BOOLEAN),
+                    DSL.literal("(?<group>\\w{2})\\w"),
+                    DSL.literal("group"))
+                .valueOf(valueEnv()));
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/system/SystemFunctionsTest.java b/core/src/test/java/org/opensearch/sql/expression/system/SystemFunctionsTest.java
index cdf8e6ec31..ac4153f59f 100644
--- a/core/src/test/java/org/opensearch/sql/expression/system/SystemFunctionsTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/system/SystemFunctionsTest.java
@@ -45,7 +45,7 @@ public class SystemFunctionsTest {
   void typeof() {
     assertEquals(STRING, DSL.typeof(DSL.literal(1)).type());
 
-    assertEquals("ARRAY", typeofGetValue(new ExprCollectionValue(List.of())));
+    assertEquals("NESTED", typeofGetValue(new ExprCollectionValue(List.of())));
     assertEquals("BOOLEAN", typeofGetValue(ExprBooleanValue.of(false)));
     assertEquals("BYTE", typeofGetValue(new ExprByteValue(0)));
     assertEquals("DATE", typeofGetValue(new ExprDateValue(LocalDate.now())));
@@ -56,33 +56,36 @@ void typeof() {
     assertEquals("INTERVAL", typeofGetValue(new ExprIntervalValue(Duration.ofDays(0))));
     assertEquals("LONG", typeofGetValue(new ExprLongValue(0)));
     assertEquals("SHORT", typeofGetValue(new ExprShortValue(0)));
-    assertEquals("STRING", typeofGetValue(new ExprStringValue("")));
-    assertEquals("STRUCT", typeofGetValue(new ExprTupleValue(new LinkedHashMap<>())));
+    assertEquals("KEYWORD", typeofGetValue(new ExprStringValue("")));
+    assertEquals("OBJECT", typeofGetValue(new ExprTupleValue(new LinkedHashMap<>())));
     assertEquals("TIME", typeofGetValue(new ExprTimeValue(LocalTime.now())));
     assertEquals("TIMESTAMP", typeofGetValue(new ExprTimestampValue(Instant.now())));
     assertEquals("UNDEFINED", typeofGetValue(ExprNullValue.of()));
     assertEquals("UNDEFINED", typeofGetValue(ExprMissingValue.of()));
-    assertEquals("UNKNOWN", typeofGetValue(new AbstractExprValue() {
-      @Override
-      public int compare(ExprValue other) {
-        return 0;
-      }
+    assertEquals(
+        "UNKNOWN",
+        typeofGetValue(
+            new AbstractExprValue() {
+              @Override
+              public int compare(ExprValue other) {
+                return 0;
+              }
 
-      @Override
-      public boolean equal(ExprValue other) {
-        return false;
-      }
+              @Override
+              public boolean equal(ExprValue other) {
+                return false;
+              }
 
-      @Override
-      public Object value() {
-        return null;
-      }
+              @Override
+              public Object value() {
+                return null;
+              }
 
-      @Override
-      public ExprType type() {
-        return ExprCoreType.UNKNOWN;
-      }
-    }));
+              @Override
+              public ExprType type() {
+                return ExprCoreType.UNKNOWN;
+              }
+            }));
   }
 
   private String typeofGetValue(ExprValue input) {
diff --git a/core/src/test/java/org/opensearch/sql/expression/text/TextFunctionTest.java b/core/src/test/java/org/opensearch/sql/expression/text/TextFunctionTest.java
index 515b436c82..b58f3031b7 100644
--- a/core/src/test/java/org/opensearch/sql/expression/text/TextFunctionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/text/TextFunctionTest.java
@@ -3,10 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.text;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.opensearch.sql.data.model.ExprValueUtils.missingValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.nullValue;
@@ -18,13 +19,12 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.opensearch.sql.data.model.ExprIntegerValue;
 import org.opensearch.sql.data.model.ExprStringValue;
 import org.opensearch.sql.data.model.ExprValue;
@@ -32,46 +32,52 @@
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ExpressionTestBase;
 import org.opensearch.sql.expression.FunctionExpression;
-import org.opensearch.sql.expression.env.Environment;
 
-@ExtendWith(MockitoExtension.class)
 public class TextFunctionTest extends ExpressionTestBase {
-  @Mock
-  Environment<Expression, ExprValue> env;
-
-  @Mock
-  Expression nullRef;
-
-  @Mock
-  Expression missingRef;
-
-
-  private static List<SubstringInfo> SUBSTRING_STRINGS = ImmutableList.of(
-      new SubstringInfo("", 1, 1, ""),
-      new SubstringInfo("Quadratically", 5, null, "ratically"),
-      new SubstringInfo("foobarbar", 4, null, "barbar"),
-      new SubstringInfo("Quadratically", 5, 6, "ratica"),
-      new SubstringInfo("Quadratically", 5, 600, "ratically"),
-      new SubstringInfo("Quadratically", 500, 1, ""),
-      new SubstringInfo("Quadratically", 500, null, ""),
-      new SubstringInfo("Sakila", -3, null, "ila"),
-      new SubstringInfo("Sakila", -5, 3, "aki"),
-      new SubstringInfo("Sakila", -4, 2, "ki"),
-      new SubstringInfo("Quadratically", 0, null, ""),
-      new SubstringInfo("Sakila", 0, 2, ""),
-      new SubstringInfo("Sakila", 2, 0, ""),
-      new SubstringInfo("Sakila", 0, 0, ""));
-  private static List<String> UPPER_LOWER_STRINGS = ImmutableList.of(
-      "test", " test", "test ", " test ", "TesT", "TEST", " TEST", "TEST ", " TEST ", " ", "");
-  private static List<StringPatternPair> STRING_PATTERN_PAIRS = ImmutableList.of(
-      new StringPatternPair("Michael!", "Michael!"),
-      new StringPatternPair("hello", "world"),
-      new StringPatternPair("world", "hello"));
-  private static List<String> TRIM_STRINGS = ImmutableList.of(
-      " test", "     test", "test     ", "test", "     test    ", "", " ");
-  private static List<List<String>> CONCAT_STRING_LISTS = ImmutableList.of(
-      ImmutableList.of("hello", "world"),
-      ImmutableList.of("123", "5325"));
+
+  private static Stream<SubstringInfo> getStringsForSubstr() {
+    return Stream.of(
+        new SubstringInfo("", 1, 1, ""),
+        new SubstringInfo("Quadratically", 5, null, "ratically"),
+        new SubstringInfo("foobarbar", 4, null, "barbar"),
+        new SubstringInfo("Quadratically", 5, 6, "ratica"),
+        new SubstringInfo("Quadratically", 5, 600, "ratically"),
+        new SubstringInfo("Quadratically", 500, 1, ""),
+        new SubstringInfo("Quadratically", 500, null, ""),
+        new SubstringInfo("Sakila", -3, null, "ila"),
+        new SubstringInfo("Sakila", -5, 3, "aki"),
+        new SubstringInfo("Sakila", -4, 2, "ki"),
+        new SubstringInfo("Quadratically", 0, null, ""),
+        new SubstringInfo("Sakila", 0, 2, ""),
+        new SubstringInfo("Sakila", 2, 0, ""),
+        new SubstringInfo("Sakila", 0, 0, ""));
+  }
+
+  private static Stream<String> getStringsForUpperAndLower() {
+    return Stream.of(
+        "test", " test", "test ", " test ", "TesT", "TEST", " TEST", "TEST ", " TEST ", " ", "");
+  }
+
+  private static Stream<StringPatternPair> getStringsForComparison() {
+    return Stream.of(
+        new StringPatternPair("Michael!", "Michael!"),
+        new StringPatternPair("hello", "world"),
+        new StringPatternPair("world", "hello"));
+  }
+
+  private static Stream<String> getStringsForTrim() {
+    return Stream.of(" test", "     test", "test     ", "test", "     test    ", "", " ");
+  }
+
+  private static Stream<List<String>> getStringsForConcat() {
+    return Stream.of(ImmutableList.of("hello", "world"), ImmutableList.of("123", "5325"));
+  }
+
+  private static Stream<List<String>> getMultipleStringsForConcat() {
+    return Stream.of(
+        ImmutableList.of("he", "llo", "wo", "rld", "!"),
+        ImmutableList.of("0", "123", "53", "25", "7"));
+  }
 
   interface SubstrSubstring {
     FunctionExpression getFunction(SubstringInfo strInfo);
@@ -83,9 +89,11 @@ public FunctionExpression getFunction(SubstringInfo strInfo) {
       if (strInfo.getLen() == null) {
         expr = DSL.substr(DSL.literal(strInfo.getExpr()), DSL.literal(strInfo.getStart()));
       } else {
-        expr = DSL.substr(DSL.literal(strInfo.getExpr()),
-            DSL.literal(strInfo.getStart()),
-            DSL.literal(strInfo.getLen()));
+        expr =
+            DSL.substr(
+                DSL.literal(strInfo.getExpr()),
+                DSL.literal(strInfo.getStart()),
+                DSL.literal(strInfo.getLen()));
       }
       return expr;
     }
@@ -97,9 +105,11 @@ public FunctionExpression getFunction(SubstringInfo strInfo) {
       if (strInfo.getLen() == null) {
         expr = DSL.substring(DSL.literal(strInfo.getExpr()), DSL.literal(strInfo.getStart()));
       } else {
-        expr = DSL.substring(DSL.literal(strInfo.getExpr()),
-            DSL.literal(strInfo.getStart()),
-            DSL.literal(strInfo.getLen()));
+        expr =
+            DSL.substring(
+                DSL.literal(strInfo.getExpr()),
+                DSL.literal(strInfo.getStart()),
+                DSL.literal(strInfo.getLen()));
       }
       return expr;
     }
@@ -125,30 +135,11 @@ static class SubstringInfo {
     String res;
   }
 
-  @BeforeEach
-  public void setup() {
-    when(nullRef.valueOf(env)).thenReturn(nullValue());
-    when(missingRef.valueOf(env)).thenReturn(missingValue());
-  }
-
-  @Test
-  public void substrSubstring() {
-    SUBSTRING_STRINGS.forEach(s -> substrSubstringTest(s, new Substr()));
-    SUBSTRING_STRINGS.forEach(s -> substrSubstringTest(s, new Substring()));
-
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.substr(missingRef, DSL.literal(1))));
-    assertEquals(nullValue(), eval(DSL.substr(nullRef, DSL.literal(1))));
-    assertEquals(missingValue(), eval(DSL.substring(missingRef, DSL.literal(1))));
-    assertEquals(nullValue(), eval(DSL.substring(nullRef, DSL.literal(1))));
-
-    when(nullRef.type()).thenReturn(INTEGER);
-    when(missingRef.type()).thenReturn(INTEGER);
-    assertEquals(missingValue(), eval(DSL.substr(DSL.literal("hello"), missingRef)));
-    assertEquals(nullValue(), eval(DSL.substr(DSL.literal("hello"), nullRef)));
-    assertEquals(missingValue(), eval(DSL.substring(DSL.literal("hello"), missingRef)));
-    assertEquals(nullValue(), eval(DSL.substring(DSL.literal("hello"), nullRef)));
+  @ParameterizedTest
+  @MethodSource("getStringsForSubstr")
+  void substrSubstring(SubstringInfo s) {
+    substrSubstringTest(s, new Substr());
+    substrSubstringTest(s, new Substring());
   }
 
   void substrSubstringTest(SubstringInfo strInfo, SubstrSubstring substrSubstring) {
@@ -157,137 +148,61 @@ void substrSubstringTest(SubstringInfo strInfo, SubstrSubstring substrSubstring)
     assertEquals(strInfo.getRes(), eval(expr).stringValue());
   }
 
-  @Test
-  public void ltrim() {
-    TRIM_STRINGS.forEach(this::ltrimString);
-
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.ltrim(missingRef)));
-    assertEquals(nullValue(), eval(DSL.ltrim(nullRef)));
-  }
-
-  @Test
-  public void rtrim() {
-    TRIM_STRINGS.forEach(this::rtrimString);
-
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.ltrim(missingRef)));
-    assertEquals(nullValue(), eval(DSL.ltrim(nullRef)));
-  }
-
-  @Test
-  public void trim() {
-    TRIM_STRINGS.forEach(this::trimString);
-
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.ltrim(missingRef)));
-    assertEquals(nullValue(), eval(DSL.ltrim(nullRef)));
-  }
-
-  void ltrimString(String str) {
+  @ParameterizedTest
+  @MethodSource("getStringsForTrim")
+  void ltrim(String str) {
     FunctionExpression expression = DSL.ltrim(DSL.literal(str));
     assertEquals(STRING, expression.type());
     assertEquals(str.stripLeading(), eval(expression).stringValue());
   }
 
-  void rtrimString(String str) {
+  @ParameterizedTest
+  @MethodSource("getStringsForTrim")
+  void rtrim(String str) {
     FunctionExpression expression = DSL.rtrim(DSL.literal(str));
     assertEquals(STRING, expression.type());
     assertEquals(str.stripTrailing(), eval(expression).stringValue());
   }
 
-  void trimString(String str) {
+  @ParameterizedTest
+  @MethodSource("getStringsForTrim")
+  void trim(String str) {
     FunctionExpression expression = DSL.trim(DSL.literal(str));
     assertEquals(STRING, expression.type());
     assertEquals(str.trim(), eval(expression).stringValue());
   }
 
-  @Test
-  public void lower() {
-    UPPER_LOWER_STRINGS.forEach(this::testLowerString);
-
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.lower(missingRef)));
-    assertEquals(nullValue(), eval(DSL.lower(nullRef)));
-  }
-
-  @Test
-  public void upper() {
-    UPPER_LOWER_STRINGS.forEach(this::testUpperString);
+  @ParameterizedTest
+  @MethodSource("getStringsForConcat")
+  void concat(List<String> strings) {
+    testConcatString(strings);
 
+    // Since `concat` isn't wrapped with `nullMissingHandling` (which has its own tests),
+    // we have to test there case with NULL and MISSING values
+    Expression nullRef = mock(Expression.class);
+    Expression missingRef = mock(Expression.class);
+    when(nullRef.valueOf(any())).thenReturn(nullValue());
+    when(missingRef.valueOf(any())).thenReturn(missingValue());
     when(nullRef.type()).thenReturn(STRING);
     when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.upper(missingRef)));
-    assertEquals(nullValue(), eval(DSL.upper(nullRef)));
+    assertEquals(missingValue(), eval(DSL.concat(missingRef, DSL.literal("1"))));
+    // If any of the expressions is a NULL value, it returns NULL.
+    assertEquals(nullValue(), eval(DSL.concat(nullRef, DSL.literal("1"))));
+    assertEquals(missingValue(), eval(DSL.concat(DSL.literal("1"), missingRef)));
+    assertEquals(nullValue(), eval(DSL.concat(DSL.literal("1"), nullRef)));
   }
 
-  @Test
-  void concat() {
-    CONCAT_STRING_LISTS.forEach(this::testConcatString);
-
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(
-            DSL.concat(missingRef, DSL.literal("1"))));
-    assertEquals(nullValue(), eval(
-            DSL.concat(nullRef, DSL.literal("1"))));
-    assertEquals(missingValue(), eval(
-            DSL.concat(DSL.literal("1"), missingRef)));
-    assertEquals(nullValue(), eval(
-            DSL.concat(DSL.literal("1"), nullRef)));
-  }
-
-  @Test
-  void concat_ws() {
-    CONCAT_STRING_LISTS.forEach(s -> testConcatString(s, ","));
-
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(
-        DSL.concat_ws(missingRef, DSL.literal("1"), DSL.literal("1"))));
-    assertEquals(nullValue(), eval(
-        DSL.concat_ws(nullRef, DSL.literal("1"), DSL.literal("1"))));
-    assertEquals(missingValue(), eval(
-        DSL.concat_ws(DSL.literal("1"), missingRef, DSL.literal("1"))));
-    assertEquals(nullValue(), eval(
-        DSL.concat_ws(DSL.literal("1"), nullRef, DSL.literal("1"))));
-    assertEquals(missingValue(), eval(
-        DSL.concat_ws(DSL.literal("1"), DSL.literal("1"), missingRef)));
-    assertEquals(nullValue(), eval(
-        DSL.concat_ws(DSL.literal("1"), DSL.literal("1"), nullRef)));
-  }
-
-  @Test
-  void length() {
-    UPPER_LOWER_STRINGS.forEach(this::testLengthString);
-
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.length(missingRef)));
-    assertEquals(nullValue(), eval(DSL.length(nullRef)));
-  }
-
-  @Test
-  void strcmp() {
-    STRING_PATTERN_PAIRS.forEach(this::testStcmpString);
-
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.strcmp(missingRef, missingRef)));
-    assertEquals(nullValue(), eval(DSL.strcmp(nullRef, nullRef)));
-    assertEquals(missingValue(), eval(DSL.strcmp(nullRef, missingRef)));
-    assertEquals(missingValue(), eval(DSL.strcmp(missingRef, nullRef)));
+  @ParameterizedTest
+  @MethodSource("getStringsForConcat")
+  void concat_ws(List<String> strings) {
+    testConcatString(strings, ",");
   }
 
   @Test
   void right() {
-    FunctionExpression expression = DSL.right(
-            DSL.literal(new ExprStringValue("foobarbar")),
-            DSL.literal(new ExprIntegerValue(4)));
+    FunctionExpression expression =
+        DSL.right(
+            DSL.literal(new ExprStringValue("foobarbar")), DSL.literal(new ExprIntegerValue(4)));
     assertEquals(STRING, expression.type());
     assertEquals("rbar", eval(expression).stringValue());
 
@@ -302,21 +217,13 @@ void right() {
     expression = DSL.right(DSL.literal(""), DSL.literal(10));
     assertEquals(STRING, expression.type());
     assertEquals("", eval(expression).value());
-
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(INTEGER);
-    assertEquals(missingValue(), eval(DSL.right(nullRef, missingRef)));
-    assertEquals(nullValue(), eval(DSL.right(nullRef, DSL.literal(new ExprIntegerValue(1)))));
-
-    when(nullRef.type()).thenReturn(INTEGER);
-    assertEquals(nullValue(), eval(DSL.right(DSL.literal(new ExprStringValue("value")), nullRef)));
   }
 
   @Test
   void left() {
-    FunctionExpression expression = DSL.left(
-        DSL.literal(new ExprStringValue("helloworld")),
-        DSL.literal(new ExprIntegerValue(5)));
+    FunctionExpression expression =
+        DSL.left(
+            DSL.literal(new ExprStringValue("helloworld")), DSL.literal(new ExprIntegerValue(5)));
     assertEquals(STRING, expression.type());
     assertEquals("hello", eval(expression).stringValue());
 
@@ -331,14 +238,6 @@ void left() {
     expression = DSL.left(DSL.literal(""), DSL.literal(10));
     assertEquals(STRING, expression.type());
     assertEquals("", eval(expression).value());
-
-    when(nullRef.type()).thenReturn(STRING);
-    when(missingRef.type()).thenReturn(INTEGER);
-    assertEquals(missingValue(), eval(DSL.left(nullRef, missingRef)));
-    assertEquals(nullValue(), eval(DSL.left(nullRef, DSL.literal(new ExprIntegerValue(1)))));
-
-    when(nullRef.type()).thenReturn(INTEGER);
-    assertEquals(nullValue(), eval(DSL.left(DSL.literal(new ExprStringValue("value")), nullRef)));
   }
 
   @Test
@@ -346,70 +245,38 @@ void ascii() {
     FunctionExpression expression = DSL.ascii(DSL.literal(new ExprStringValue("hello")));
     assertEquals(INTEGER, expression.type());
     assertEquals(104, eval(expression).integerValue());
-
-    when(nullRef.type()).thenReturn(STRING);
-    assertEquals(nullValue(), eval(DSL.ascii(nullRef)));
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.ascii(missingRef)));
+    assertEquals(0, DSL.ascii(DSL.literal("")).valueOf().integerValue());
   }
 
   @Test
   void locate() {
-    FunctionExpression expression = DSL.locate(
-        DSL.literal("world"),
-        DSL.literal("helloworld"));
+    FunctionExpression expression = DSL.locate(DSL.literal("world"), DSL.literal("helloworld"));
     assertEquals(INTEGER, expression.type());
     assertEquals(6, eval(expression).integerValue());
 
-    expression = DSL.locate(
-        DSL.literal("world"),
-        DSL.literal("helloworldworld"),
-        DSL.literal(7));
+    expression = DSL.locate(DSL.literal("world"), DSL.literal("helloworldworld"), DSL.literal(7));
     assertEquals(INTEGER, expression.type());
     assertEquals(11, eval(expression).integerValue());
-
-    when(nullRef.type()).thenReturn(STRING);
-    assertEquals(nullValue(), eval(DSL.locate(nullRef, DSL.literal("hello"))));
-    assertEquals(nullValue(), eval(DSL.locate(nullRef, DSL.literal("hello"), DSL.literal(1))));
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.locate(missingRef, DSL.literal("hello"))));
-    assertEquals(missingValue(), eval(
-        DSL.locate(missingRef, DSL.literal("hello"), DSL.literal(1))));
   }
 
   @Test
   void position() {
-    FunctionExpression expression = DSL.position(
-        DSL.literal("world"),
-        DSL.literal("helloworldworld"));
+    FunctionExpression expression =
+        DSL.position(DSL.literal("world"), DSL.literal("helloworldworld"));
     assertEquals(INTEGER, expression.type());
     assertEquals(6, eval(expression).integerValue());
 
-    expression = DSL.position(
-            DSL.literal("abc"),
-            DSL.literal("hello world"));
+    expression = DSL.position(DSL.literal("abc"), DSL.literal("hello world"));
     assertEquals(INTEGER, expression.type());
     assertEquals(0, eval(expression).integerValue());
-
-    when(nullRef.type()).thenReturn(STRING);
-    assertEquals(nullValue(), eval(DSL.position(nullRef, DSL.literal("hello"))));
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.position(missingRef, DSL.literal("hello"))));
   }
 
   @Test
   void replace() {
-    FunctionExpression expression = DSL.replace(
-        DSL.literal("helloworld"),
-        DSL.literal("world"),
-        DSL.literal("opensearch"));
+    FunctionExpression expression =
+        DSL.replace(DSL.literal("helloworld"), DSL.literal("world"), DSL.literal("opensearch"));
     assertEquals(STRING, expression.type());
     assertEquals("helloopensearch", eval(expression).stringValue());
-
-    when(nullRef.type()).thenReturn(STRING);
-    assertEquals(nullValue(), eval(DSL.replace(nullRef, DSL.literal("a"), DSL.literal("b"))));
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.replace(missingRef, DSL.literal("a"), DSL.literal("b"))));
   }
 
   @Test
@@ -417,11 +284,6 @@ void reverse() {
     FunctionExpression expression = DSL.reverse(DSL.literal("abcde"));
     assertEquals(STRING, expression.type());
     assertEquals("edcba", eval(expression).stringValue());
-
-    when(nullRef.type()).thenReturn(STRING);
-    assertEquals(nullValue(), eval(DSL.reverse(nullRef)));
-    when(missingRef.type()).thenReturn(STRING);
-    assertEquals(missingValue(), eval(DSL.reverse(missingRef)));
   }
 
   void testConcatString(List<String> strings) {
@@ -430,49 +292,76 @@ void testConcatString(List<String> strings) {
       expected = String.join("", strings);
     }
 
-    FunctionExpression expression = DSL.concat(
-        DSL.literal(strings.get(0)), DSL.literal(strings.get(1)));
+    FunctionExpression expression =
+        DSL.concat(DSL.literal(strings.get(0)), DSL.literal(strings.get(1)));
     assertEquals(STRING, expression.type());
     assertEquals(expected, eval(expression).stringValue());
   }
 
   void testConcatString(List<String> strings, String delim) {
-    String expected = strings.stream()
-        .filter(Objects::nonNull).collect(Collectors.joining(","));
+    String expected = strings.stream().filter(Objects::nonNull).collect(Collectors.joining(","));
+
+    FunctionExpression expression =
+        DSL.concat_ws(DSL.literal(delim), DSL.literal(strings.get(0)), DSL.literal(strings.get(1)));
+    assertEquals(STRING, expression.type());
+    assertEquals(expected, eval(expression).stringValue());
+  }
+
+  @ParameterizedTest
+  @MethodSource("getMultipleStringsForConcat")
+  void testConcatMultipleString(List<String> strings) {
+    String expected = null;
+    if (strings.stream().noneMatch(Objects::isNull)) {
+      expected = String.join("", strings);
+    }
 
-    FunctionExpression expression = DSL.concat_ws(
-        DSL.literal(delim), DSL.literal(strings.get(0)), DSL.literal(strings.get(1)));
+    FunctionExpression expression =
+        DSL.concat(
+            DSL.literal(strings.get(0)),
+            DSL.literal(strings.get(1)),
+            DSL.literal(strings.get(2)),
+            DSL.literal(strings.get(3)),
+            DSL.literal(strings.get(4)));
     assertEquals(STRING, expression.type());
     assertEquals(expected, eval(expression).stringValue());
   }
 
-  void testLengthString(String str) {
+  @ParameterizedTest
+  @MethodSource("getStringsForUpperAndLower")
+  void length(String str) {
     FunctionExpression expression = DSL.length(DSL.literal(new ExprStringValue(str)));
     assertEquals(INTEGER, expression.type());
     assertEquals(str.getBytes().length, eval(expression).integerValue());
   }
 
-  void testStcmpString(StringPatternPair stringPatternPair) {
-    FunctionExpression expression = DSL.strcmp(
+  @ParameterizedTest
+  @MethodSource("getStringsForComparison")
+  void strcmp(StringPatternPair stringPatternPair) {
+    FunctionExpression expression =
+        DSL.strcmp(
             DSL.literal(new ExprStringValue(stringPatternPair.getStr())),
             DSL.literal(new ExprStringValue(stringPatternPair.getPatt())));
     assertEquals(INTEGER, expression.type());
     assertEquals(stringPatternPair.strCmpTest(), eval(expression).integerValue());
   }
 
-  void testLowerString(String str) {
+  @ParameterizedTest
+  @MethodSource("getStringsForUpperAndLower")
+  void lower(String str) {
     FunctionExpression expression = DSL.lower(DSL.literal(new ExprStringValue(str)));
     assertEquals(STRING, expression.type());
     assertEquals(stringValue(str.toLowerCase()), eval(expression));
   }
 
-  void testUpperString(String str) {
+  @ParameterizedTest
+  @MethodSource("getStringsForUpperAndLower")
+  void upper(String str) {
     FunctionExpression expression = DSL.upper(DSL.literal(new ExprStringValue(str)));
     assertEquals(STRING, expression.type());
     assertEquals(stringValue(str.toUpperCase()), eval(expression));
   }
 
   private ExprValue eval(Expression expression) {
-    return expression.valueOf(env);
+    return expression.valueOf();
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/window/CurrentRowWindowFrameTest.java b/core/src/test/java/org/opensearch/sql/expression/window/CurrentRowWindowFrameTest.java
index f2e54f9654..3964f36fb7 100644
--- a/core/src/test/java/org/opensearch/sql/expression/window/CurrentRowWindowFrameTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/window/CurrentRowWindowFrameTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -29,10 +28,11 @@
 
 class CurrentRowWindowFrameTest {
 
-  private final CurrentRowWindowFrame windowFrame = new CurrentRowWindowFrame(
-      new WindowDefinition(
-          ImmutableList.of(DSL.ref("state", STRING)),
-          ImmutableList.of(ImmutablePair.of(DEFAULT_ASC, DSL.ref("age", INTEGER)))));
+  private final CurrentRowWindowFrame windowFrame =
+      new CurrentRowWindowFrame(
+          new WindowDefinition(
+              ImmutableList.of(DSL.ref("state", STRING)),
+              ImmutableList.of(ImmutablePair.of(DEFAULT_ASC, DSL.ref("age", INTEGER)))));
 
   @Test
   void test_iterator_methods() {
@@ -42,17 +42,21 @@ void test_iterator_methods() {
 
   @Test
   void should_return_new_partition_if_partition_by_field_value_changed() {
-    PeekingIterator<ExprValue> iterator = Iterators.peekingIterator(
-        Iterators.forArray(
-            ExprTupleValue.fromExprValueMap(ImmutableMap.of(
-                "state", new ExprStringValue("WA"),
-                "age", new ExprIntegerValue(20))),
-            ExprTupleValue.fromExprValueMap(ImmutableMap.of(
-                "state", new ExprStringValue("WA"),
-                "age", new ExprIntegerValue(30))),
-            ExprTupleValue.fromExprValueMap(ImmutableMap.of(
-                "state", new ExprStringValue("CA"),
-                "age", new ExprIntegerValue(18)))));
+    PeekingIterator<ExprValue> iterator =
+        Iterators.peekingIterator(
+            Iterators.forArray(
+                ExprTupleValue.fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"),
+                        "age", new ExprIntegerValue(20))),
+                ExprTupleValue.fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"),
+                        "age", new ExprIntegerValue(30))),
+                ExprTupleValue.fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("CA"),
+                        "age", new ExprIntegerValue(18)))));
 
     windowFrame.load(iterator);
     assertTrue(windowFrame.isNewPartition());
@@ -66,24 +70,28 @@ void should_return_new_partition_if_partition_by_field_value_changed() {
 
   @Test
   void can_resolve_single_expression_value() {
-    windowFrame.load(Iterators.peekingIterator(
-        Iterators.singletonIterator(
-            ExprTupleValue.fromExprValueMap(ImmutableMap.of(
-            "state", new ExprStringValue("WA"),
-            "age", new ExprIntegerValue(20))))));
-    assertEquals(
-        new ExprIntegerValue(20),
-        windowFrame.resolve(DSL.ref("age", INTEGER)));
+    windowFrame.load(
+        Iterators.peekingIterator(
+            Iterators.singletonIterator(
+                ExprTupleValue.fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"),
+                        "age", new ExprIntegerValue(20))))));
+    assertEquals(new ExprIntegerValue(20), windowFrame.resolve(DSL.ref("age", INTEGER)));
   }
 
   @Test
   void can_return_previous_and_current_row() {
-    ExprValue row1 = ExprTupleValue.fromExprValueMap(ImmutableMap.of(
-        "state", new ExprStringValue("WA"),
-        "age", new ExprIntegerValue(20)));
-    ExprValue row2 = ExprTupleValue.fromExprValueMap(ImmutableMap.of(
-        "state", new ExprStringValue("WA"),
-        "age", new ExprIntegerValue(30)));
+    ExprValue row1 =
+        ExprTupleValue.fromExprValueMap(
+            ImmutableMap.of(
+                "state", new ExprStringValue("WA"),
+                "age", new ExprIntegerValue(20)));
+    ExprValue row2 =
+        ExprTupleValue.fromExprValueMap(
+            ImmutableMap.of(
+                "state", new ExprStringValue("WA"),
+                "age", new ExprIntegerValue(30)));
     PeekingIterator<ExprValue> iterator = Iterators.peekingIterator(Iterators.forArray(row1, row2));
 
     windowFrame.load(iterator);
@@ -94,5 +102,4 @@ void can_return_previous_and_current_row() {
     assertEquals(row1, windowFrame.previous());
     assertEquals(row2, windowFrame.current());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/window/aggregation/AggregateWindowFunctionTest.java b/core/src/test/java/org/opensearch/sql/expression/window/aggregation/AggregateWindowFunctionTest.java
index d7062d4e47..b728a413ba 100644
--- a/core/src/test/java/org/opensearch/sql/expression/window/aggregation/AggregateWindowFunctionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/window/aggregation/AggregateWindowFunctionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window.aggregation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -27,9 +26,7 @@
 import org.opensearch.sql.expression.aggregation.Aggregator;
 import org.opensearch.sql.expression.window.frame.PeerRowsWindowFrame;
 
-/**
- * Aggregate window function test collection.
- */
+/** Aggregate window function test collection. */
 @SuppressWarnings("unchecked")
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @ExtendWith(MockitoExtension.class)
@@ -56,15 +53,17 @@ void should_accumulate_all_peer_values_and_not_reset_state_if_same_partition() {
         new AggregateWindowFunction(DSL.sum(DSL.ref("age", INTEGER)));
 
     when(windowFrame.isNewPartition()).thenReturn(true);
-    when(windowFrame.next()).thenReturn(ImmutableList.of(
-        fromExprValueMap(ImmutableMap.of("age", new ExprIntegerValue(10))),
-        fromExprValueMap(ImmutableMap.of("age", new ExprIntegerValue(20)))));
+    when(windowFrame.next())
+        .thenReturn(
+            ImmutableList.of(
+                fromExprValueMap(ImmutableMap.of("age", new ExprIntegerValue(10))),
+                fromExprValueMap(ImmutableMap.of("age", new ExprIntegerValue(20)))));
     assertEquals(new ExprIntegerValue(30), windowFunction.valueOf(windowFrame));
 
     when(windowFrame.isNewPartition()).thenReturn(false);
-    when(windowFrame.next()).thenReturn(ImmutableList.of(
-        fromExprValueMap(ImmutableMap.of("age", new ExprIntegerValue(30)))));
+    when(windowFrame.next())
+        .thenReturn(
+            ImmutableList.of(fromExprValueMap(ImmutableMap.of("age", new ExprIntegerValue(30)))));
     assertEquals(new ExprIntegerValue(60), windowFunction.valueOf(windowFrame));
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/window/frame/PeerRowsWindowFrameTest.java b/core/src/test/java/org/opensearch/sql/expression/window/frame/PeerRowsWindowFrameTest.java
index 26f6bb2f5e..1da2e50322 100644
--- a/core/src/test/java/org/opensearch/sql/expression/window/frame/PeerRowsWindowFrameTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/window/frame/PeerRowsWindowFrameTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window.frame;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -34,15 +33,16 @@
 @ExtendWith(MockitoExtension.class)
 class PeerRowsWindowFrameTest {
 
-  private final PeerRowsWindowFrame windowFrame = new PeerRowsWindowFrame(
-      new WindowDefinition(
-          ImmutableList.of(DSL.ref("state", STRING)),
-          ImmutableList.of(Pair.of(DEFAULT_ASC, DSL.ref("age", INTEGER)))));
+  private final PeerRowsWindowFrame windowFrame =
+      new PeerRowsWindowFrame(
+          new WindowDefinition(
+              ImmutableList.of(DSL.ref("state", STRING)),
+              ImmutableList.of(Pair.of(DEFAULT_ASC, DSL.ref("age", INTEGER)))));
 
   @Test
   void test_single_row() {
-    PeekingIterator<ExprValue> tuples = Iterators.peekingIterator(
-        Iterators.singletonIterator(tuple("WA", 10, 100)));
+    PeekingIterator<ExprValue> tuples =
+        Iterators.peekingIterator(Iterators.singletonIterator(tuple("WA", 10, 100)));
     windowFrame.load(tuples);
     assertTrue(windowFrame.isNewPartition());
     assertEquals(ImmutableList.of(tuple("WA", 10, 100)), windowFrame.next());
@@ -50,11 +50,9 @@ void test_single_row() {
 
   @Test
   void test_single_partition_with_no_more_rows_after_peers() {
-    PeekingIterator<ExprValue> tuples = Iterators.peekingIterator(
-        Iterators.forArray(
-            tuple("WA", 10, 100),
-            tuple("WA", 20, 200),
-            tuple("WA", 20, 50)));
+    PeekingIterator<ExprValue> tuples =
+        Iterators.peekingIterator(
+            Iterators.forArray(tuple("WA", 10, 100), tuple("WA", 20, 200), tuple("WA", 20, 50)));
 
     // Here we simulate how WindowFrame interacts with WindowOperator which calls load()
     // and WindowFunction which calls isNewPartition() and move()
@@ -64,9 +62,7 @@ void test_single_partition_with_no_more_rows_after_peers() {
 
     windowFrame.load(tuples);
     assertFalse(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(tuple("WA", 20, 200), tuple("WA", 20, 50)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("WA", 20, 200), tuple("WA", 20, 50)), windowFrame.next());
 
     windowFrame.load(tuples);
     assertFalse(windowFrame.isNewPartition());
@@ -75,180 +71,124 @@ void test_single_partition_with_no_more_rows_after_peers() {
 
   @Test
   void test_single_partition_with_more_rows_after_peers() {
-    PeekingIterator<ExprValue> tuples = Iterators.peekingIterator(
-        Iterators.forArray(
-            tuple("WA", 10, 100),
-            tuple("WA", 20, 200),
-            tuple("WA", 20, 50),
-            tuple("WA", 35, 150)));
+    PeekingIterator<ExprValue> tuples =
+        Iterators.peekingIterator(
+            Iterators.forArray(
+                tuple("WA", 10, 100),
+                tuple("WA", 20, 200),
+                tuple("WA", 20, 50),
+                tuple("WA", 35, 150)));
 
     windowFrame.load(tuples);
     assertTrue(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("WA", 10, 100)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("WA", 10, 100)), windowFrame.next());
 
     windowFrame.load(tuples);
     assertFalse(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("WA", 20, 200),
-            tuple("WA", 20, 50)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("WA", 20, 200), tuple("WA", 20, 50)), windowFrame.next());
 
     windowFrame.load(tuples);
     assertFalse(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(), windowFrame.next());
 
     windowFrame.load(tuples);
     assertFalse(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("WA", 35, 150)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("WA", 35, 150)), windowFrame.next());
   }
 
   @Test
   void test_two_partitions_with_all_same_peers_in_second_partition() {
-    PeekingIterator<ExprValue> tuples = Iterators.peekingIterator(
-        Iterators.forArray(
-            tuple("WA", 10, 100),
-            tuple("CA", 18, 150),
-            tuple("CA", 18, 100)));
+    PeekingIterator<ExprValue> tuples =
+        Iterators.peekingIterator(
+            Iterators.forArray(tuple("WA", 10, 100), tuple("CA", 18, 150), tuple("CA", 18, 100)));
 
     windowFrame.load(tuples);
     assertTrue(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("WA", 10, 100)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("WA", 10, 100)), windowFrame.next());
 
     windowFrame.load(tuples);
     assertTrue(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("CA", 18, 150),
-            tuple("CA", 18, 100)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("CA", 18, 150), tuple("CA", 18, 100)), windowFrame.next());
 
     windowFrame.load(tuples);
     assertFalse(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(), windowFrame.next());
   }
 
   @Test
   void test_two_partitions_with_single_row_in_each_partition() {
-    PeekingIterator<ExprValue> tuples = Iterators.peekingIterator(
-        Iterators.forArray(
-            tuple("WA", 10, 100),
-            tuple("CA", 30, 200)));
+    PeekingIterator<ExprValue> tuples =
+        Iterators.peekingIterator(Iterators.forArray(tuple("WA", 10, 100), tuple("CA", 30, 200)));
 
     windowFrame.load(tuples);
     assertTrue(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("WA", 10, 100)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("WA", 10, 100)), windowFrame.next());
 
     windowFrame.load(tuples);
     assertTrue(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("CA", 30, 200)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("CA", 30, 200)), windowFrame.next());
   }
 
   @Test
   void test_window_definition_with_no_partition_by() {
-    PeerRowsWindowFrame windowFrame = new PeerRowsWindowFrame(
-        new WindowDefinition(
-            ImmutableList.of(),
-            ImmutableList.of(Pair.of(DEFAULT_ASC, DSL.ref("age", INTEGER)))));
+    PeerRowsWindowFrame windowFrame =
+        new PeerRowsWindowFrame(
+            new WindowDefinition(
+                ImmutableList.of(),
+                ImmutableList.of(Pair.of(DEFAULT_ASC, DSL.ref("age", INTEGER)))));
 
-    PeekingIterator<ExprValue> tuples = Iterators.peekingIterator(
-        Iterators.forArray(
-            tuple("WA", 10, 100),
-            tuple("CA", 30, 200)));
+    PeekingIterator<ExprValue> tuples =
+        Iterators.peekingIterator(Iterators.forArray(tuple("WA", 10, 100), tuple("CA", 30, 200)));
 
     windowFrame.load(tuples);
     assertTrue(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("WA", 10, 100)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("WA", 10, 100)), windowFrame.next());
 
     windowFrame.load(tuples);
     assertFalse(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("CA", 30, 200)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("CA", 30, 200)), windowFrame.next());
   }
 
   @Test
   void test_window_definition_with_no_order_by() {
-    PeerRowsWindowFrame windowFrame = new PeerRowsWindowFrame(
-        new WindowDefinition(
-            ImmutableList.of(DSL.ref("state", STRING)),
-            ImmutableList.of()));
+    PeerRowsWindowFrame windowFrame =
+        new PeerRowsWindowFrame(
+            new WindowDefinition(ImmutableList.of(DSL.ref("state", STRING)), ImmutableList.of()));
 
-    PeekingIterator<ExprValue> tuples = Iterators.peekingIterator(
-        Iterators.forArray(
-            tuple("WA", 10, 100),
-            tuple("CA", 30, 200)));
+    PeekingIterator<ExprValue> tuples =
+        Iterators.peekingIterator(Iterators.forArray(tuple("WA", 10, 100), tuple("CA", 30, 200)));
 
     windowFrame.load(tuples);
     assertTrue(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("WA", 10, 100)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("WA", 10, 100)), windowFrame.next());
 
     windowFrame.load(tuples);
     assertTrue(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("CA", 30, 200)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("CA", 30, 200)), windowFrame.next());
   }
 
   @Test
   void test_window_definition_with_no_partition_by_and_order_by() {
-    PeerRowsWindowFrame windowFrame = new PeerRowsWindowFrame(
-        new WindowDefinition(
-            ImmutableList.of(),
-            ImmutableList.of()));
+    PeerRowsWindowFrame windowFrame =
+        new PeerRowsWindowFrame(new WindowDefinition(ImmutableList.of(), ImmutableList.of()));
 
-    PeekingIterator<ExprValue> tuples = Iterators.peekingIterator(
-        Iterators.forArray(
-            tuple("WA", 10, 100),
-            tuple("CA", 30, 200)));
+    PeekingIterator<ExprValue> tuples =
+        Iterators.peekingIterator(Iterators.forArray(tuple("WA", 10, 100), tuple("CA", 30, 200)));
 
     windowFrame.load(tuples);
     assertTrue(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(
-            tuple("WA", 10, 100),
-            tuple("CA", 30, 200)),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(tuple("WA", 10, 100), tuple("CA", 30, 200)), windowFrame.next());
 
     windowFrame.load(tuples);
     assertFalse(windowFrame.isNewPartition());
-    assertEquals(
-        ImmutableList.of(),
-        windowFrame.next());
+    assertEquals(ImmutableList.of(), windowFrame.next());
   }
 
   private ExprValue tuple(String state, int age, int balance) {
-    return fromExprValueMap(ImmutableMap.of(
-        "state", new ExprStringValue(state),
-        "age", new ExprIntegerValue(age),
-        "balance", new ExprIntegerValue(balance)));
+    return fromExprValueMap(
+        ImmutableMap.of(
+            "state", new ExprStringValue(state),
+            "age", new ExprIntegerValue(age),
+            "balance", new ExprIntegerValue(balance)));
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/window/ranking/RankingWindowFunctionTest.java b/core/src/test/java/org/opensearch/sql/expression/window/ranking/RankingWindowFunctionTest.java
index 7b2b5a42f2..dc2f8fd147 100644
--- a/core/src/test/java/org/opensearch/sql/expression/window/ranking/RankingWindowFunctionTest.java
+++ b/core/src/test/java/org/opensearch/sql/expression/window/ranking/RankingWindowFunctionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.expression.window.ranking;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,57 +30,72 @@
 import org.opensearch.sql.expression.window.WindowDefinition;
 import org.opensearch.sql.expression.window.frame.CurrentRowWindowFrame;
 
-/**
- * Rank window function test collection.
- */
+/** Rank window function test collection. */
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @ExtendWith(MockitoExtension.class)
 class RankingWindowFunctionTest extends ExpressionTestBase {
 
-  private final CurrentRowWindowFrame windowFrame1 = new CurrentRowWindowFrame(
-      new WindowDefinition(
-          ImmutableList.of(DSL.ref("state", STRING)),
-          ImmutableList.of(Pair.of(DEFAULT_ASC, DSL.ref("age", INTEGER)))));
+  private final CurrentRowWindowFrame windowFrame1 =
+      new CurrentRowWindowFrame(
+          new WindowDefinition(
+              ImmutableList.of(DSL.ref("state", STRING)),
+              ImmutableList.of(Pair.of(DEFAULT_ASC, DSL.ref("age", INTEGER)))));
 
-  private final CurrentRowWindowFrame windowFrame2 = new CurrentRowWindowFrame(
-      new WindowDefinition(
-          ImmutableList.of(DSL.ref("state", STRING)),
-          ImmutableList.of())); // No sort items defined
+  private final CurrentRowWindowFrame windowFrame2 =
+      new CurrentRowWindowFrame(
+          new WindowDefinition(
+              ImmutableList.of(DSL.ref("state", STRING)),
+              ImmutableList.of())); // No sort items defined
 
   private PeekingIterator<ExprValue> iterator1;
   private PeekingIterator<ExprValue> iterator2;
 
   @BeforeEach
   void set_up() {
-    iterator1 = Iterators.peekingIterator(Iterators.forArray(
-        fromExprValueMap(ImmutableMap.of(
-            "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
-        fromExprValueMap(ImmutableMap.of(
-            "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
-        fromExprValueMap(ImmutableMap.of(
-            "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(40))),
-        fromExprValueMap(ImmutableMap.of(
-            "state", new ExprStringValue("CA"), "age", new ExprIntegerValue(20)))));
-
-    iterator2 = Iterators.peekingIterator(Iterators.forArray(
-        fromExprValueMap(ImmutableMap.of(
-            "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
-        fromExprValueMap(ImmutableMap.of(
-            "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
-        fromExprValueMap(ImmutableMap.of(
-            "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(50))),
-        fromExprValueMap(ImmutableMap.of(
-            "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(55))),
-        fromExprValueMap(ImmutableMap.of(
-            "state", new ExprStringValue("CA"), "age", new ExprIntegerValue(15)))));
+    iterator1 =
+        Iterators.peekingIterator(
+            Iterators.forArray(
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(40))),
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("CA"), "age", new ExprIntegerValue(20)))));
+
+    iterator2 =
+        Iterators.peekingIterator(
+            Iterators.forArray(
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(50))),
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(55))),
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("CA"), "age", new ExprIntegerValue(15)))));
   }
 
   @Test
   void test_value_of() {
-    PeekingIterator<ExprValue> iterator = Iterators.peekingIterator(
-        Iterators.singletonIterator(
-            fromExprValueMap(ImmutableMap.of(
-                "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30)))));
+    PeekingIterator<ExprValue> iterator =
+        Iterators.peekingIterator(
+            Iterators.singletonIterator(
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30)))));
 
     RankingWindowFunction rowNumber = DSL.rowNumber();
 
@@ -165,18 +179,24 @@ void row_number_should_work_if_no_sort_items_defined() {
 
   @Test
   void rank_should_always_return_1_if_no_sort_items_defined() {
-    PeekingIterator<ExprValue> iterator = Iterators.peekingIterator(
-        Iterators.forArray(
-            fromExprValueMap(ImmutableMap.of(
-                "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
-            fromExprValueMap(ImmutableMap.of(
-                "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
-            fromExprValueMap(ImmutableMap.of(
-                "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(50))),
-            fromExprValueMap(ImmutableMap.of(
-                "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(55))),
-            fromExprValueMap(ImmutableMap.of(
-                "state", new ExprStringValue("CA"), "age", new ExprIntegerValue(15)))));
+    PeekingIterator<ExprValue> iterator =
+        Iterators.peekingIterator(
+            Iterators.forArray(
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(30))),
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(50))),
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("WA"), "age", new ExprIntegerValue(55))),
+                fromExprValueMap(
+                    ImmutableMap.of(
+                        "state", new ExprStringValue("CA"), "age", new ExprIntegerValue(15)))));
 
     RankingWindowFunction rank = DSL.rank();
 
@@ -215,5 +235,4 @@ void dense_rank_should_always_return_1_if_no_sort_items_defined() {
     windowFrame2.load(iterator2);
     assertEquals(1, denseRank.rank(windowFrame2));
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/monitor/AlwaysHealthyMonitorTest.java b/core/src/test/java/org/opensearch/sql/monitor/AlwaysHealthyMonitorTest.java
index 676f59a44b..9eb7a816a7 100644
--- a/core/src/test/java/org/opensearch/sql/monitor/AlwaysHealthyMonitorTest.java
+++ b/core/src/test/java/org/opensearch/sql/monitor/AlwaysHealthyMonitorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.monitor;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/core/src/test/java/org/opensearch/sql/planner/DefaultImplementorTest.java b/core/src/test/java/org/opensearch/sql/planner/DefaultImplementorTest.java
index 2322e4684e..8e71fc2bec 100644
--- a/core/src/test/java/org/opensearch/sql/planner/DefaultImplementorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/DefaultImplementorTest.java
@@ -3,12 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner;
 
 import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 import static org.opensearch.sql.expression.DSL.literal;
@@ -18,6 +21,7 @@
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.eval;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.filter;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.limit;
+import static org.opensearch.sql.planner.logical.LogicalPlanDSL.nested;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.project;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.rareTopN;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.remove;
@@ -31,17 +35,20 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.ast.tree.RareTopN.CommandType;
 import org.opensearch.sql.ast.tree.Sort;
 import org.opensearch.sql.data.model.ExprBooleanValue;
 import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.executor.pagination.PlanSerializer;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.NamedExpression;
@@ -50,34 +57,36 @@
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
 import org.opensearch.sql.expression.window.WindowDefinition;
 import org.opensearch.sql.expression.window.ranking.RowNumberFunction;
+import org.opensearch.sql.planner.logical.LogicalCloseCursor;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalPlanDSL;
+import org.opensearch.sql.planner.logical.LogicalProject;
 import org.opensearch.sql.planner.logical.LogicalRelation;
+import org.opensearch.sql.planner.logical.LogicalValues;
+import org.opensearch.sql.planner.physical.CursorCloseOperator;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.planner.physical.PhysicalPlanDSL;
+import org.opensearch.sql.planner.physical.ProjectOperator;
+import org.opensearch.sql.planner.physical.ValuesOperator;
+import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.storage.Table;
 import org.opensearch.sql.storage.TableScanOperator;
 import org.opensearch.sql.storage.read.TableScanBuilder;
+import org.opensearch.sql.storage.write.TableWriteBuilder;
+import org.opensearch.sql.storage.write.TableWriteOperator;
+import org.opensearch.sql.utils.TestOperator;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class DefaultImplementorTest {
 
-  @Mock
-  private Expression filter;
-
-  @Mock
-  private NamedAggregator aggregator;
-
-  @Mock
-  private NamedExpression groupBy;
-
-  @Mock
-  private Table table;
+  @Mock private Table table;
 
   private final DefaultImplementor<Object> implementor = new DefaultImplementor<>();
 
   @Test
-  public void visitShouldReturnDefaultPhysicalOperator() {
+  public void visit_should_return_default_physical_operator() {
     String indexName = "test";
     NamedExpression include = named("age", ref("age", INTEGER));
     ReferenceExpression exclude = ref("name", STRING);
@@ -97,103 +106,111 @@ public void visitShouldReturnDefaultPhysicalOperator() {
         ImmutablePair.of(Sort.SortOption.DEFAULT_ASC, ref("name1", STRING));
     Integer limit = 1;
     Integer offset = 1;
+    List<Map<String, ReferenceExpression>> nestedArgs =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+    List<NamedExpression> nestedProjectList =
+        List.of(
+            new NamedExpression("message.info", DSL.nested(DSL.ref("message.info", STRING)), null));
+    Set<String> nestedOperatorArgs = Set.of("message.info");
+    Map<String, List<String>> groupedFieldsByPath = Map.of("message", List.of("message.info"));
 
     LogicalPlan plan =
         project(
-            limit(
-                LogicalPlanDSL.dedupe(
-                    rareTopN(
-                        sort(
-                            eval(
-                                remove(
-                                    rename(
-                                        aggregation(
-                                            filter(values(emptyList()), filterExpr),
-                                            aggregators,
-                                            groupByExprs),
-                                        mappings),
-                                    exclude),
-                                newEvalField),
-                            sortField),
-                        CommandType.TOP,
-                        topByExprs,
-                        rareTopNField),
-                    dedupeField),
-                limit,
-                offset),
+            nested(
+                limit(
+                    LogicalPlanDSL.dedupe(
+                        rareTopN(
+                            sort(
+                                eval(
+                                    remove(
+                                        rename(
+                                            aggregation(
+                                                filter(values(emptyList()), filterExpr),
+                                                aggregators,
+                                                groupByExprs),
+                                            mappings),
+                                        exclude),
+                                    newEvalField),
+                                sortField),
+                            CommandType.TOP,
+                            topByExprs,
+                            rareTopNField),
+                        dedupeField),
+                    limit,
+                    offset),
+                nestedArgs,
+                nestedProjectList),
             include);
 
     PhysicalPlan actual = plan.accept(implementor, null);
 
     assertEquals(
         PhysicalPlanDSL.project(
-            PhysicalPlanDSL.limit(
-                PhysicalPlanDSL.dedupe(
-                    PhysicalPlanDSL.rareTopN(
-                        PhysicalPlanDSL.sort(
-                            PhysicalPlanDSL.eval(
-                                PhysicalPlanDSL.remove(
-                                    PhysicalPlanDSL.rename(
-                                        PhysicalPlanDSL.agg(
-                                            PhysicalPlanDSL.filter(
-                                                PhysicalPlanDSL.values(emptyList()),
-                                                filterExpr),
-                                            aggregators,
-                                            groupByExprs),
-                                        mappings),
-                                    exclude),
-                                newEvalField),
-                            sortField),
-                        CommandType.TOP,
-                        topByExprs,
-                        rareTopNField),
-                    dedupeField),
-                limit,
-                offset),
+            PhysicalPlanDSL.nested(
+                PhysicalPlanDSL.limit(
+                    PhysicalPlanDSL.dedupe(
+                        PhysicalPlanDSL.rareTopN(
+                            PhysicalPlanDSL.sort(
+                                PhysicalPlanDSL.eval(
+                                    PhysicalPlanDSL.remove(
+                                        PhysicalPlanDSL.rename(
+                                            PhysicalPlanDSL.agg(
+                                                PhysicalPlanDSL.filter(
+                                                    PhysicalPlanDSL.values(emptyList()),
+                                                    filterExpr),
+                                                aggregators,
+                                                groupByExprs),
+                                            mappings),
+                                        exclude),
+                                    newEvalField),
+                                sortField),
+                            CommandType.TOP,
+                            topByExprs,
+                            rareTopNField),
+                        dedupeField),
+                    limit,
+                    offset),
+                nestedOperatorArgs,
+                groupedFieldsByPath),
             include),
         actual);
   }
 
   @Test
-  public void visitRelationShouldThrowException() {
-    assertThrows(UnsupportedOperationException.class,
+  public void visitRelation_should_throw_an_exception() {
+    assertThrows(
+        UnsupportedOperationException.class,
         () -> new LogicalRelation("test", table).accept(implementor, null));
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})
   @Test
-  public void visitWindowOperatorShouldReturnPhysicalWindowOperator() {
+  public void visitWindowOperator_should_return_PhysicalWindowOperator() {
     NamedExpression windowFunction = named(new RowNumberFunction());
-    WindowDefinition windowDefinition = new WindowDefinition(
-        Collections.singletonList(ref("state", STRING)),
-        Collections.singletonList(
-            ImmutablePair.of(Sort.SortOption.DEFAULT_DESC, ref("age", INTEGER))));
+    WindowDefinition windowDefinition =
+        new WindowDefinition(
+            Collections.singletonList(ref("state", STRING)),
+            Collections.singletonList(
+                ImmutablePair.of(Sort.SortOption.DEFAULT_DESC, ref("age", INTEGER))));
 
     NamedExpression[] projectList = {
-        named("state", ref("state", STRING)),
-        named("row_number", ref("row_number", INTEGER))
+      named("state", ref("state", STRING)), named("row_number", ref("row_number", INTEGER))
     };
     Pair[] sortList = {
-        ImmutablePair.of(Sort.SortOption.DEFAULT_ASC, ref("state", STRING)),
-        ImmutablePair.of(Sort.SortOption.DEFAULT_DESC, ref("age", STRING))
+      ImmutablePair.of(Sort.SortOption.DEFAULT_ASC, ref("state", STRING)),
+      ImmutablePair.of(Sort.SortOption.DEFAULT_DESC, ref("age", STRING))
     };
 
     LogicalPlan logicalPlan =
-        project(
-            window(
-                sort(
-                    values(),
-                    sortList),
-                windowFunction,
-                windowDefinition),
-            projectList);
+        project(window(sort(values(), sortList), windowFunction, windowDefinition), projectList);
 
     PhysicalPlan physicalPlan =
         PhysicalPlanDSL.project(
             PhysicalPlanDSL.window(
-                PhysicalPlanDSL.sort(
-                    PhysicalPlanDSL.values(),
-                    sortList),
+                PhysicalPlanDSL.sort(PhysicalPlanDSL.values(), sortList),
                 windowFunction,
                 windowDefinition),
             projectList);
@@ -202,14 +219,89 @@ public void visitWindowOperatorShouldReturnPhysicalWindowOperator() {
   }
 
   @Test
-  public void visitTableScanBuilderShouldBuildTableScanOperator() {
-    TableScanOperator tableScanOperator = Mockito.mock(TableScanOperator.class);
-    TableScanBuilder tableScanBuilder = new TableScanBuilder() {
-      @Override
-      public TableScanOperator build() {
-        return tableScanOperator;
-      }
-    };
+  void visitLogicalCursor_deserializes_it() {
+    var engine = mock(StorageEngine.class);
+
+    var physicalPlan = new TestOperator();
+    var logicalPlan =
+        LogicalPlanDSL.fetchCursor(
+            new PlanSerializer(engine).convertToCursor(physicalPlan).toString(), engine);
+    assertEquals(physicalPlan, logicalPlan.accept(implementor, null));
+  }
+
+  @Test
+  public void visitTableScanBuilder_should_build_TableScanOperator() {
+    TableScanOperator tableScanOperator = mock(TableScanOperator.class);
+    TableScanBuilder tableScanBuilder =
+        new TableScanBuilder() {
+          @Override
+          public TableScanOperator build() {
+            return tableScanOperator;
+          }
+        };
     assertEquals(tableScanOperator, tableScanBuilder.accept(implementor, null));
   }
+
+  @Test
+  public void visitTableWriteBuilder_should_build_TableWriteOperator() {
+    LogicalPlan child = values();
+    TableWriteOperator tableWriteOperator = mock(TableWriteOperator.class);
+    TableWriteBuilder logicalPlan =
+        new TableWriteBuilder(child) {
+          @Override
+          public TableWriteOperator build(PhysicalPlan child) {
+            return tableWriteOperator;
+          }
+        };
+    assertEquals(tableWriteOperator, logicalPlan.accept(implementor, null));
+  }
+
+  @Test
+  public void visitCloseCursor_should_build_CursorCloseOperator() {
+    var logicalChild = mock(LogicalPlan.class);
+    var physicalChild = mock(PhysicalPlan.class);
+    when(logicalChild.accept(implementor, null)).thenReturn(physicalChild);
+    var logicalPlan = new LogicalCloseCursor(logicalChild);
+    var implemented = logicalPlan.accept(implementor, null);
+    assertTrue(implemented instanceof CursorCloseOperator);
+    assertSame(physicalChild, implemented.getChild().get(0));
+  }
+
+  @Test
+  public void visitPaginate_should_remove_it_from_tree() {
+    var logicalPlanTree =
+        new LogicalPaginate(
+            42,
+            List.of(
+                new LogicalProject(new LogicalValues(List.of(List.of())), List.of(), List.of())));
+    var physicalPlanTree =
+        new ProjectOperator(new ValuesOperator(List.of(List.of())), List.of(), List.of());
+    assertEquals(physicalPlanTree, logicalPlanTree.accept(implementor, null));
+  }
+
+  @Test
+  public void visitLimit_support_return_takeOrdered() {
+    // replace SortOperator + LimitOperator with TakeOrderedOperator
+    Pair<Sort.SortOption, Expression> sort =
+        ImmutablePair.of(Sort.SortOption.DEFAULT_ASC, ref("a", INTEGER));
+    var logicalValues = values(emptyList());
+    var logicalSort = sort(logicalValues, sort);
+    var logicalLimit = limit(logicalSort, 10, 5);
+    PhysicalPlan physicalPlanTree =
+        PhysicalPlanDSL.takeOrdered(PhysicalPlanDSL.values(emptyList()), 10, 5, sort);
+    assertEquals(physicalPlanTree, logicalLimit.accept(implementor, null));
+
+    // don't replace if LimitOperator's child is not SortOperator
+    Pair<ReferenceExpression, Expression> newEvalField =
+        ImmutablePair.of(ref("name1", STRING), ref("name", STRING));
+    var logicalEval = eval(logicalSort, newEvalField);
+    logicalLimit = limit(logicalEval, 10, 5);
+    physicalPlanTree =
+        PhysicalPlanDSL.limit(
+            PhysicalPlanDSL.eval(
+                PhysicalPlanDSL.sort(PhysicalPlanDSL.values(emptyList()), sort), newEvalField),
+            10,
+            5);
+    assertEquals(physicalPlanTree, logicalLimit.accept(implementor, null));
+  }
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/PlanContextTest.java b/core/src/test/java/org/opensearch/sql/planner/PlanContextTest.java
index 77ae78f77e..76ccb6613a 100644
--- a/core/src/test/java/org/opensearch/sql/planner/PlanContextTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/PlanContextTest.java
@@ -16,8 +16,7 @@
 @ExtendWith(MockitoExtension.class)
 class PlanContextTest {
 
-  @Mock
-  private Split split;
+  @Mock private Split split;
 
   @Test
   void createEmptyPlanContext() {
diff --git a/core/src/test/java/org/opensearch/sql/planner/PlannerTest.java b/core/src/test/java/org/opensearch/sql/planner/PlannerTest.java
index 64498f76cd..6ad44c303b 100644
--- a/core/src/test/java/org/opensearch/sql/planner/PlannerTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/PlannerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner;
 
 import static java.util.Collections.emptyList;
@@ -47,14 +46,11 @@
 
 @ExtendWith(MockitoExtension.class)
 public class PlannerTest extends PhysicalPlanTestBase {
-  @Mock
-  private PhysicalPlan scan;
+  @Mock private PhysicalPlan scan;
 
-  @Mock
-  private StorageEngine storageEngine;
+  @Mock private StorageEngine storageEngine;
 
-  @Mock
-  private LogicalPlanOptimizer optimizer;
+  @Mock private LogicalPlanOptimizer optimizer;
 
   @BeforeEach
   public void setUp() {
@@ -68,29 +64,22 @@ public void planner_test() {
         PhysicalPlanDSL.rename(
             PhysicalPlanDSL.agg(
                 PhysicalPlanDSL.filter(
-                    scan,
-                    DSL.equal(DSL.ref("response", INTEGER), DSL.literal(10))
-                ),
+                    scan, DSL.equal(DSL.ref("response", INTEGER), DSL.literal(10))),
                 ImmutableList.of(DSL.named("avg(response)", DSL.avg(DSL.ref("response", INTEGER)))),
-                ImmutableList.of()
-            ),
-            ImmutableMap.of(DSL.ref("ivalue", INTEGER), DSL.ref("avg(response)", DOUBLE))
-        ),
+                ImmutableList.of()),
+            ImmutableMap.of(DSL.ref("ivalue", INTEGER), DSL.ref("avg(response)", DOUBLE))),
         LogicalPlanDSL.rename(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.filter(
-                    LogicalPlanDSL.relation("schema",
+                    LogicalPlanDSL.relation(
+                        "schema",
                         storageEngine.getTable(
                             new DataSourceSchemaName(DEFAULT_DATASOURCE_NAME, "default"),
-                        "schema")),
-                    DSL.equal(DSL.ref("response", INTEGER), DSL.literal(10))
-                ),
+                            "schema")),
+                    DSL.equal(DSL.ref("response", INTEGER), DSL.literal(10))),
                 ImmutableList.of(DSL.named("avg(response)", DSL.avg(DSL.ref("response", INTEGER)))),
-                ImmutableList.of()
-            ),
-            ImmutableMap.of(DSL.ref("ivalue", INTEGER), DSL.ref("avg(response)", DOUBLE))
-        )
-    );
+                ImmutableList.of()),
+            ImmutableMap.of(DSL.ref("ivalue", INTEGER), DSL.ref("avg(response)", DOUBLE))));
   }
 
   @Test
@@ -103,15 +92,12 @@ public void plan_a_query_without_relation_involved() {
             PhysicalPlanDSL.values(emptyList()),
             DSL.named("123", DSL.literal(123)),
             DSL.named("hello", DSL.literal("hello")),
-            DSL.named("false", DSL.literal(false))
-        ),
+            DSL.named("false", DSL.literal(false))),
         LogicalPlanDSL.project(
             LogicalPlanDSL.values(emptyList()),
             DSL.named("123", DSL.literal(123)),
             DSL.named("hello", DSL.literal("hello")),
-            DSL.named("false", DSL.literal(false))
-        )
-    );
+            DSL.named("false", DSL.literal(false))));
   }
 
   protected void assertPhysicalPlan(PhysicalPlan expected, LogicalPlan logicalPlan) {
@@ -156,15 +142,15 @@ public PhysicalPlan visitFilter(LogicalFilter plan, Object context) {
 
     @Override
     public PhysicalPlan visitAggregation(LogicalAggregation plan, Object context) {
-      return new AggregationOperator(plan.getChild().get(0).accept(this, context),
-          plan.getAggregatorList(), plan.getGroupByList()
-      );
+      return new AggregationOperator(
+          plan.getChild().get(0).accept(this, context),
+          plan.getAggregatorList(),
+          plan.getGroupByList());
     }
 
     @Override
     public PhysicalPlan visitRename(LogicalRename plan, Object context) {
-      return new RenameOperator(plan.getChild().get(0).accept(this, context),
-          plan.getRenameMap());
+      return new RenameOperator(plan.getChild().get(0).accept(this, context), plan.getRenameMap());
     }
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/SerializablePlanTest.java b/core/src/test/java/org/opensearch/sql/planner/SerializablePlanTest.java
new file mode 100644
index 0000000000..f00ef61ee1
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/planner/SerializablePlanTest.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.Answers.CALLS_REAL_METHODS;
+
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+public class SerializablePlanTest {
+  @Mock(answer = CALLS_REAL_METHODS)
+  SerializablePlan plan;
+
+  @Test
+  void getPlanForSerialization_defaults_to_self() {
+    assertSame(plan, plan.getPlanForSerialization());
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/planner/logical/LogicalDedupeTest.java b/core/src/test/java/org/opensearch/sql/planner/logical/LogicalDedupeTest.java
index 84cef2cbf3..d128885a6a 100644
--- a/core/src/test/java/org/opensearch/sql/planner/logical/LogicalDedupeTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/logical/LogicalDedupeTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import static org.opensearch.sql.ast.dsl.AstDSL.argument;
@@ -18,16 +17,9 @@
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.analysis.AnalyzerTestBase;
 import org.opensearch.sql.expression.DSL;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {AnalyzerTestBase.class})
 class LogicalDedupeTest extends AnalyzerTestBase {
   @Test
   public void analyze_dedup_with_two_field_with_default_option() {
@@ -37,10 +29,7 @@ public void analyze_dedup_with_two_field_with_default_option() {
             DSL.ref("integer_value", INTEGER),
             DSL.ref("double_value", DOUBLE)),
         dedupe(
-            relation("schema"),
-            defaultDedupArgs(),
-            field("integer_value"), field("double_value")
-        ));
+            relation("schema"), defaultDedupArgs(), field("integer_value"), field("double_value")));
   }
 
   @Test
@@ -48,7 +37,9 @@ public void analyze_dedup_with_one_field_with_customize_option() {
     assertAnalyzeEqual(
         LogicalPlanDSL.dedupe(
             LogicalPlanDSL.relation("schema", table),
-            3, false, true,
+            3,
+            false,
+            true,
             DSL.ref("integer_value", INTEGER),
             DSL.ref("double_value", DOUBLE)),
         dedupe(
@@ -56,9 +47,8 @@ public void analyze_dedup_with_one_field_with_customize_option() {
             exprList(
                 argument("number", intLiteral(3)),
                 argument("keepempty", booleanLiteral(false)),
-                argument("consecutive", booleanLiteral(true))
-            ),
-            field("integer_value"), field("double_value")
-        ));
+                argument("consecutive", booleanLiteral(true))),
+            field("integer_value"),
+            field("double_value")));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/logical/LogicalEvalTest.java b/core/src/test/java/org/opensearch/sql/planner/logical/LogicalEvalTest.java
index 63429453f9..746441ef4a 100644
--- a/core/src/test/java/org/opensearch/sql/planner/logical/LogicalEvalTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/logical/LogicalEvalTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import static org.opensearch.sql.ast.dsl.AstDSL.field;
@@ -16,13 +15,7 @@
 import org.opensearch.sql.analysis.AnalyzerTestBase;
 import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.expression.DSL;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {AnalyzerTestBase.class})
 @ExtendWith(MockitoExtension.class)
 public class LogicalEvalTest extends AnalyzerTestBase {
 
@@ -31,8 +24,8 @@ public void analyze_eval_with_one_field() {
     assertAnalyzeEqual(
         LogicalPlanDSL.eval(
             LogicalPlanDSL.relation("schema", table),
-            ImmutablePair
-                .of(DSL.ref("absValue", INTEGER), DSL.abs(DSL.ref("integer_value", INTEGER)))),
+            ImmutablePair.of(
+                DSL.ref("absValue", INTEGER), DSL.abs(DSL.ref("integer_value", INTEGER)))),
         AstDSL.eval(
             AstDSL.relation("schema"),
             AstDSL.let(AstDSL.field("absValue"), AstDSL.function("abs", field("integer_value")))));
@@ -43,8 +36,8 @@ public void analyze_eval_with_two_field() {
     assertAnalyzeEqual(
         LogicalPlanDSL.eval(
             LogicalPlanDSL.relation("schema", table),
-            ImmutablePair
-                .of(DSL.ref("absValue", INTEGER), DSL.abs(DSL.ref("integer_value", INTEGER))),
+            ImmutablePair.of(
+                DSL.ref("absValue", INTEGER), DSL.abs(DSL.ref("integer_value", INTEGER))),
             ImmutablePair.of(DSL.ref("iValue", INTEGER), DSL.abs(DSL.ref("absValue", INTEGER)))),
         AstDSL.eval(
             AstDSL.relation("schema"),
diff --git a/core/src/test/java/org/opensearch/sql/planner/logical/LogicalPlanNodeVisitorTest.java b/core/src/test/java/org/opensearch/sql/planner/logical/LogicalPlanNodeVisitorTest.java
index 33c6b02c38..f212749f48 100644
--- a/core/src/test/java/org/opensearch/sql/planner/logical/LogicalPlanNodeVisitorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/logical/LogicalPlanNodeVisitorTest.java
@@ -3,55 +3,65 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.mock;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 import static org.opensearch.sql.expression.DSL.named;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import java.util.HashMap;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.sql.ast.expression.DataType;
-import org.opensearch.sql.ast.expression.Literal;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.opensearch.sql.ast.tree.RareTopN.CommandType;
 import org.opensearch.sql.ast.tree.Sort.SortOption;
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.LiteralExpression;
+import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.aggregation.Aggregator;
 import org.opensearch.sql.expression.window.WindowDefinition;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.storage.Table;
 import org.opensearch.sql.storage.TableScanOperator;
 import org.opensearch.sql.storage.read.TableScanBuilder;
+import org.opensearch.sql.storage.write.TableWriteBuilder;
+import org.opensearch.sql.storage.write.TableWriteOperator;
 
-/**
- * Todo. Temporary added for UT coverage, Will be removed.
- */
-@ExtendWith(MockitoExtension.class)
+/** Added for UT coverage */
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class LogicalPlanNodeVisitorTest {
 
-  @Mock
-  Expression expression;
-  @Mock
-  ReferenceExpression ref;
-  @Mock
-  Aggregator aggregator;
-  @Mock
-  Table table;
+  static Expression expression;
+  static ReferenceExpression ref;
+  static Aggregator aggregator;
+  static Table table;
+
+  @BeforeAll
+  public static void initMocks() {
+    expression = mock(Expression.class);
+    ref = mock(ReferenceExpression.class);
+    aggregator = mock(Aggregator.class);
+    table = mock(Table.class);
+  }
 
   @Test
-  public void logicalPlanShouldTraversable() {
+  public void logical_plan_should_be_traversable() {
     LogicalPlan logicalPlan =
         LogicalPlanDSL.rename(
             LogicalPlanDSL.aggregation(
@@ -68,104 +78,99 @@ public void logicalPlanShouldTraversable() {
     assertEquals(5, result);
   }
 
-  @Test
-  public void testAbstractPlanNodeVisitorShouldReturnNull() {
+  @SuppressWarnings("unchecked")
+  private static Stream<Arguments> getLogicalPlansForVisitorTest() {
     LogicalPlan relation = LogicalPlanDSL.relation("schema", table);
-    assertNull(relation.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    LogicalPlan tableScanBuilder = new TableScanBuilder() {
-      @Override
-      public TableScanOperator build() {
-        return null;
-      }
-    };
-    assertNull(tableScanBuilder.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
+    LogicalPlan tableScanBuilder =
+        new TableScanBuilder() {
+          @Override
+          public TableScanOperator build() {
+            return null;
+          }
+        };
+    TableWriteBuilder tableWriteBuilder =
+        new TableWriteBuilder(null) {
+          @Override
+          public TableWriteOperator build(PhysicalPlan child) {
+            return null;
+          }
+        };
+    LogicalPlan write = LogicalPlanDSL.write(null, table, Collections.emptyList());
     LogicalPlan filter = LogicalPlanDSL.filter(relation, expression);
-    assertNull(filter.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
     LogicalPlan aggregation =
         LogicalPlanDSL.aggregation(
-            filter, ImmutableList.of(DSL.named("avg", aggregator)), ImmutableList.of(DSL.named(
-                "group", expression)));
-    assertNull(aggregation.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
+            filter,
+            ImmutableList.of(DSL.named("avg", aggregator)),
+            ImmutableList.of(DSL.named("group", expression)));
     LogicalPlan rename = LogicalPlanDSL.rename(aggregation, ImmutableMap.of(ref, ref));
-    assertNull(rename.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
     LogicalPlan project = LogicalPlanDSL.project(relation, named("ref", ref));
-    assertNull(project.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
     LogicalPlan remove = LogicalPlanDSL.remove(relation, ref);
-    assertNull(remove.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
     LogicalPlan eval = LogicalPlanDSL.eval(relation, Pair.of(ref, expression));
-    assertNull(eval.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    LogicalPlan sort = LogicalPlanDSL.sort(relation,
-        Pair.of(SortOption.DEFAULT_ASC, expression));
-    assertNull(sort.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
+    LogicalPlan sort = LogicalPlanDSL.sort(relation, Pair.of(SortOption.DEFAULT_ASC, expression));
     LogicalPlan dedup = LogicalPlanDSL.dedupe(relation, 1, false, false, expression);
-    assertNull(dedup.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    LogicalPlan window = LogicalPlanDSL.window(relation, named(expression), new WindowDefinition(
-        ImmutableList.of(ref), ImmutableList.of(Pair.of(SortOption.DEFAULT_ASC, expression))));
-    assertNull(window.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    LogicalPlan rareTopN = LogicalPlanDSL.rareTopN(
-        relation, CommandType.TOP, ImmutableList.of(expression), expression);
-    assertNull(rareTopN.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    Map<String, Literal> args = new HashMap<>();
-    LogicalPlan highlight = new LogicalHighlight(filter,
-        new LiteralExpression(ExprValueUtils.stringValue("fieldA")), args);
-    assertNull(highlight.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    LogicalPlan mlCommons = new LogicalMLCommons(LogicalPlanDSL.relation("schema", table),
-            "kmeans",
-            ImmutableMap.<String, Literal>builder()
-                    .put("centroids", new Literal(3, DataType.INTEGER))
-                    .put("iterations", new Literal(3, DataType.DOUBLE))
-                    .put("distance_type", new Literal(null, DataType.STRING))
-                    .build());
-    assertNull(mlCommons.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    LogicalPlan ad = new LogicalAD(LogicalPlanDSL.relation("schema", table),
-            new HashMap<String, Literal>() {{
-              put("shingle_size", new Literal(8, DataType.INTEGER));
-              put("time_decay", new Literal(0.0001, DataType.DOUBLE));
-              put("time_field", new Literal(null, DataType.STRING));
-            }
-        });
-    assertNull(ad.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    LogicalPlan ml = new LogicalML(LogicalPlanDSL.relation("schema", table),
-            new HashMap<String, Literal>() {{
-              put("action", new Literal("train", DataType.STRING));
-              put("algorithm", new Literal("rcf", DataType.STRING));
-              put("shingle_size", new Literal(8, DataType.INTEGER));
-              put("time_decay", new Literal(0.0001, DataType.DOUBLE));
-              put("time_field", new Literal(null, DataType.STRING));
-            }
-            });
-    assertNull(ml.accept(new LogicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
+    LogicalPlan window =
+        LogicalPlanDSL.window(
+            relation,
+            named(expression),
+            new WindowDefinition(
+                ImmutableList.of(ref),
+                ImmutableList.of(Pair.of(SortOption.DEFAULT_ASC, expression))));
+    LogicalPlan rareTopN =
+        LogicalPlanDSL.rareTopN(
+            relation, CommandType.TOP, ImmutableList.of(expression), expression);
+    LogicalPlan highlight =
+        new LogicalHighlight(
+            filter, new LiteralExpression(ExprValueUtils.stringValue("fieldA")), Map.of());
+    LogicalPlan mlCommons = new LogicalMLCommons(relation, "kmeans", Map.of());
+    LogicalPlan ad = new LogicalAD(relation, Map.of());
+    LogicalPlan ml = new LogicalML(relation, Map.of());
+    LogicalPlan paginate = new LogicalPaginate(42, List.of(relation));
+
+    List<Map<String, ReferenceExpression>> nestedArgs =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression("message.info", DSL.nested(DSL.ref("message.info", STRING)), null));
+
+    LogicalNested nested = new LogicalNested(null, nestedArgs, projectList);
+
+    LogicalFetchCursor cursor = new LogicalFetchCursor("n:test", mock(StorageEngine.class));
+
+    LogicalCloseCursor closeCursor = new LogicalCloseCursor(cursor);
+
+    return Stream.of(
+            relation,
+            tableScanBuilder,
+            write,
+            tableWriteBuilder,
+            filter,
+            aggregation,
+            rename,
+            project,
+            remove,
+            eval,
+            sort,
+            dedup,
+            window,
+            rareTopN,
+            highlight,
+            mlCommons,
+            ad,
+            ml,
+            paginate,
+            nested,
+            cursor,
+            closeCursor)
+        .map(Arguments::of);
+  }
+
+  @ParameterizedTest
+  @MethodSource("getLogicalPlansForVisitorTest")
+  public void abstract_plan_node_visitor_should_return_null(LogicalPlan plan) {
+    assertNull(plan.accept(new LogicalPlanNodeVisitor<Integer, Object>() {}, null));
   }
 
   private static class NodesCount extends LogicalPlanNodeVisitor<Integer, Object> {
@@ -178,32 +183,36 @@ public Integer visitRelation(LogicalRelation plan, Object context) {
     public Integer visitFilter(LogicalFilter plan, Object context) {
       return 1
           + plan.getChild().stream()
-          .map(child -> child.accept(this, context))
-          .collect(Collectors.summingInt(Integer::intValue));
+              .map(child -> child.accept(this, context))
+              .mapToInt(Integer::intValue)
+              .sum();
     }
 
     @Override
     public Integer visitAggregation(LogicalAggregation plan, Object context) {
       return 1
           + plan.getChild().stream()
-          .map(child -> child.accept(this, context))
-          .collect(Collectors.summingInt(Integer::intValue));
+              .map(child -> child.accept(this, context))
+              .mapToInt(Integer::intValue)
+              .sum();
     }
 
     @Override
     public Integer visitRename(LogicalRename plan, Object context) {
       return 1
           + plan.getChild().stream()
-          .map(child -> child.accept(this, context))
-          .collect(Collectors.summingInt(Integer::intValue));
+              .map(child -> child.accept(this, context))
+              .mapToInt(Integer::intValue)
+              .sum();
     }
 
     @Override
     public Integer visitRareTopN(LogicalRareTopN plan, Object context) {
       return 1
           + plan.getChild().stream()
-          .map(child -> child.accept(this, context))
-          .collect(Collectors.summingInt(Integer::intValue));
+              .map(child -> child.accept(this, context))
+              .mapToInt(Integer::intValue)
+              .sum();
     }
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/logical/LogicalRelationTest.java b/core/src/test/java/org/opensearch/sql/planner/logical/LogicalRelationTest.java
index dacd84e12b..7181c91da9 100644
--- a/core/src/test/java/org/opensearch/sql/planner/logical/LogicalRelationTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/logical/LogicalRelationTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -12,14 +11,12 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.storage.Table;
 
 @ExtendWith(MockitoExtension.class)
 class LogicalRelationTest {
 
-  @Mock
-  Table table;
+  @Mock Table table;
 
   @Test
   public void logicalRelationHasNoInput() {
@@ -32,5 +29,4 @@ public void logicalRelationWithDataSourceHasNoInput() {
     LogicalPlan relation = LogicalPlanDSL.relation("prometheus.index", table);
     assertEquals(0, relation.getChild().size());
   }
-
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/opensearch/sql/planner/logical/LogicalSortTest.java b/core/src/test/java/org/opensearch/sql/planner/logical/LogicalSortTest.java
index deeda2b82c..8757473d24 100644
--- a/core/src/test/java/org/opensearch/sql/planner/logical/LogicalSortTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/logical/LogicalSortTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.logical;
 
 import static org.opensearch.sql.ast.dsl.AstDSL.argument;
@@ -19,17 +18,10 @@
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.analysis.AnalyzerTestBase;
 import org.opensearch.sql.ast.tree.Sort.SortOption;
 import org.opensearch.sql.expression.DSL;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {AnalyzerTestBase.class})
 class LogicalSortTest extends AnalyzerTestBase {
   @Test
   public void analyze_sort_with_two_field_with_default_option() {
diff --git a/core/src/test/java/org/opensearch/sql/planner/optimizer/LogicalPlanOptimizerTest.java b/core/src/test/java/org/opensearch/sql/planner/optimizer/LogicalPlanOptimizerTest.java
index e2510ec464..c25e415cfa 100644
--- a/core/src/test/java/org/opensearch/sql/planner/optimizer/LogicalPlanOptimizerTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/optimizer/LogicalPlanOptimizerTest.java
@@ -3,29 +3,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.optimizer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.opensearch.sql.data.model.ExprValueUtils.integerValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.longValue;
-import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
-import static org.opensearch.sql.data.type.ExprCoreType.LONG;
+import static org.opensearch.sql.data.type.ExprCoreType.*;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.aggregation;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.filter;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.highlight;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.limit;
+import static org.opensearch.sql.planner.logical.LogicalPlanDSL.nested;
+import static org.opensearch.sql.planner.logical.LogicalPlanDSL.paginate;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.project;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.relation;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.sort;
+import static org.opensearch.sql.planner.logical.LogicalPlanDSL.values;
+import static org.opensearch.sql.planner.logical.LogicalPlanDSL.write;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -35,125 +43,100 @@
 import org.opensearch.sql.ast.tree.Sort;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.NamedExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
 import org.opensearch.sql.planner.logical.LogicalPlan;
+import org.opensearch.sql.planner.logical.LogicalPlanNodeVisitor;
+import org.opensearch.sql.planner.logical.LogicalRelation;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.storage.Table;
 import org.opensearch.sql.storage.read.TableScanBuilder;
+import org.opensearch.sql.storage.write.TableWriteBuilder;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class LogicalPlanOptimizerTest {
 
-  @Mock
-  private Table table;
+  @Mock private Table table;
 
-  @Spy
-  private TableScanBuilder tableScanBuilder;
+  @Spy private TableScanBuilder tableScanBuilder;
 
   @BeforeEach
   void setUp() {
-    when(table.createScanBuilder()).thenReturn(tableScanBuilder);
+    lenient().when(table.createScanBuilder()).thenReturn(tableScanBuilder);
   }
 
-  /**
-   * Filter - Filter --> Filter.
-   */
+  /** Filter - Filter --> Filter. */
   @Test
   void filter_merge_filter() {
     assertEquals(
         filter(
             tableScanBuilder,
-            DSL.and(DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(2))),
-                DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(1))))
-        ),
+            DSL.and(
+                DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(2))),
+                DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(1))))),
         optimize(
             filter(
                 filter(
                     relation("schema", table),
-                    DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(1)))
-                ),
-                DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(2)))
-            )
-        )
-    );
+                    DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(1)))),
+                DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(2))))));
   }
 
-  /**
-   * Filter - Sort --> Sort - Filter.
-   */
+  /** Filter - Sort --> Sort - Filter. */
   @Test
   void push_filter_under_sort() {
     assertEquals(
         sort(
             filter(
                 tableScanBuilder,
-                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))
-            ),
-            Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))
-        ),
+                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))),
+            Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))),
         optimize(
             filter(
                 sort(
                     relation("schema", table),
-                    Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))
-                ),
-                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))
-            )
-        )
-    );
+                    Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))),
+                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1))))));
   }
 
-  /**
-   * Filter - Sort --> Sort - Filter.
-   */
+  /** Filter - Sort --> Sort - Filter. */
   @Test
   void multiple_filter_should_eventually_be_merged() {
     assertEquals(
         sort(
             filter(
                 tableScanBuilder,
-                DSL.and(DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1))),
-                    DSL.less(DSL.ref("longV", INTEGER), DSL.literal(longValue(1L))))
-            ),
-            Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))
-        ),
+                DSL.and(
+                    DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1))),
+                    DSL.less(DSL.ref("longV", INTEGER), DSL.literal(longValue(1L))))),
+            Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))),
         optimize(
             filter(
                 sort(
                     filter(
                         relation("schema", table),
-                        DSL.less(DSL.ref("longV", INTEGER), DSL.literal(longValue(1L)))
-                    ),
-                    Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))
-                ),
-                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))
-            )
-        )
-    );
+                        DSL.less(DSL.ref("longV", INTEGER), DSL.literal(longValue(1L)))),
+                    Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))),
+                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1))))));
   }
 
   @Test
   void default_table_scan_builder_should_not_push_down_anything() {
     LogicalPlan[] plans = {
-        project(
-            relation("schema", table),
-            DSL.named("i", DSL.ref("intV", INTEGER))
-        ),
-        filter(
-            relation("schema", table),
-            DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))
-        ),
-        aggregation(
-            relation("schema", table),
-            ImmutableList
-                .of(DSL.named("AVG(intV)",
-                    DSL.avg(DSL.ref("intV", INTEGER)))),
-            ImmutableList.of(DSL.named("longV", DSL.ref("longV", LONG)))),
-        sort(
-            relation("schema", table),
-            Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("intV", INTEGER))),
-        limit(
-            relation("schema", table),
-            1, 1)
+      project(relation("schema", table), DSL.named("i", DSL.ref("intV", INTEGER))),
+      filter(
+          relation("schema", table),
+          DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))),
+      aggregation(
+          relation("schema", table),
+          ImmutableList.of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
+          ImmutableList.of(DSL.named("longV", DSL.ref("longV", LONG)))),
+      sort(
+          relation("schema", table),
+          Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("intV", INTEGER))),
+      limit(relation("schema", table), 1, 1)
     };
 
     for (LogicalPlan plan : plans) {
@@ -167,12 +150,7 @@ void table_scan_builder_support_project_push_down_can_apply_its_rule() {
 
     assertEquals(
         tableScanBuilder,
-        optimize(
-            project(
-                relation("schema", table),
-                DSL.named("i", DSL.ref("intV", INTEGER)))
-        )
-    );
+        optimize(project(relation("schema", table), DSL.named("i", DSL.ref("intV", INTEGER)))));
   }
 
   @Test
@@ -184,9 +162,7 @@ void table_scan_builder_support_filter_push_down_can_apply_its_rule() {
         optimize(
             filter(
                 relation("schema", table),
-                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1))))
-        )
-    );
+                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1))))));
   }
 
   @Test
@@ -198,12 +174,24 @@ void table_scan_builder_support_aggregation_push_down_can_apply_its_rule() {
         optimize(
             aggregation(
                 relation("schema", table),
-                ImmutableList
-                    .of(DSL.named("AVG(intV)",
-                        DSL.avg(DSL.ref("intV", INTEGER)))),
-                ImmutableList.of(DSL.named("longV", DSL.ref("longV", LONG))))
-        )
-    );
+                ImmutableList.of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
+                ImmutableList.of(DSL.named("longV", DSL.ref("longV", LONG))))));
+  }
+
+  @Test
+  void table_scan_builder_support_percentile_aggregation_push_down_can_apply_its_rule() {
+    when(tableScanBuilder.pushDownAggregation(any())).thenReturn(true);
+
+    assertEquals(
+        tableScanBuilder,
+        optimize(
+            aggregation(
+                relation("schema", table),
+                ImmutableList.of(
+                    DSL.named(
+                        "PERCENTILE(intV, 1)",
+                        DSL.percentile(DSL.ref("intV", INTEGER), DSL.ref("percentile", DOUBLE)))),
+                ImmutableList.of(DSL.named("longV", DSL.ref("longV", LONG))))));
   }
 
   @Test
@@ -215,64 +203,150 @@ void table_scan_builder_support_sort_push_down_can_apply_its_rule() {
         optimize(
             sort(
                 relation("schema", table),
-                Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("intV", INTEGER)))
-        )
-    );
+                Pair.of(Sort.SortOption.DEFAULT_ASC, DSL.ref("intV", INTEGER)))));
   }
 
   @Test
   void table_scan_builder_support_limit_push_down_can_apply_its_rule() {
     when(tableScanBuilder.pushDownLimit(any())).thenReturn(true);
 
-    assertEquals(
-        tableScanBuilder,
-        optimize(
-            limit(
-                relation("schema", table),
-                1, 1)
-        )
-    );
+    assertEquals(tableScanBuilder, optimize(limit(relation("schema", table), 1, 1)));
   }
 
   @Test
   void table_scan_builder_support_highlight_push_down_can_apply_its_rule() {
     when(tableScanBuilder.pushDownHighlight(any())).thenReturn(true);
 
+    assertEquals(
+        tableScanBuilder,
+        optimize(highlight(relation("schema", table), DSL.literal("*"), Collections.emptyMap())));
+  }
+
+  @Test
+  void table_scan_builder_support_nested_push_down_can_apply_its_rule() {
+    when(tableScanBuilder.pushDownNested(any())).thenReturn(true);
+
     assertEquals(
         tableScanBuilder,
         optimize(
-            highlight(
+            nested(
                 relation("schema", table),
-                DSL.literal("*"),
-                Collections.emptyMap())
-        )
-    );
+                List.of(Map.of("field", new ReferenceExpression("message.info", STRING))),
+                List.of(
+                    new NamedExpression(
+                        "message.info", DSL.nested(DSL.ref("message.info", STRING)), null)))));
   }
 
   @Test
   void table_not_support_scan_builder_should_not_be_impact() {
-    Mockito.reset(table, tableScanBuilder);
-    Table table = new Table() {
-      @Override
-      public Map<String, ExprType> getFieldTypes() {
-        return null;
-      }
-
-      @Override
-      public PhysicalPlan implement(LogicalPlan plan) {
-        return null;
-      }
-    };
+    Table table =
+        new Table() {
+          @Override
+          public Map<String, ExprType> getFieldTypes() {
+            return null;
+          }
+
+          @Override
+          public PhysicalPlan implement(LogicalPlan plan) {
+            return null;
+          }
+        };
+
+    assertEquals(relation("schema", table), optimize(relation("schema", table)));
+  }
 
+  @Test
+  void table_support_write_builder_should_be_replaced() {
+    TableWriteBuilder writeBuilder = Mockito.mock(TableWriteBuilder.class);
+    when(table.createWriteBuilder(any())).thenReturn(writeBuilder);
+
+    assertEquals(writeBuilder, optimize(write(values(), table, Collections.emptyList())));
+  }
+
+  @Test
+  void table_not_support_write_builder_should_report_error() {
+    Table table =
+        new Table() {
+          @Override
+          public Map<String, ExprType> getFieldTypes() {
+            return null;
+          }
+
+          @Override
+          public PhysicalPlan implement(LogicalPlan plan) {
+            return null;
+          }
+        };
+
+    assertThrows(UnsupportedOperationException.class, () -> table.createWriteBuilder(null));
+  }
+
+  @Test
+  void paged_table_scan_builder_support_project_push_down_can_apply_its_rule() {
+    when(tableScanBuilder.pushDownPageSize(any())).thenReturn(true);
+
+    var relation = relation("schema", table);
+    var optimized = LogicalPlanOptimizer.create().optimize(paginate(project(relation), 4));
+    verify(tableScanBuilder).pushDownPageSize(any());
+
+    assertEquals(project(tableScanBuilder), optimized);
+  }
+
+  @Test
+  void push_down_page_size_multiple_children() {
+    var relation = relation("schema", table);
+    var twoChildrenPlan =
+        new LogicalPlan(List.of(relation, relation)) {
+          @Override
+          public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
+            return null;
+          }
+        };
+    var queryPlan = paginate(twoChildrenPlan, 4);
+    var optimizer = LogicalPlanOptimizer.create();
+    final var exception =
+        assertThrows(UnsupportedOperationException.class, () -> optimizer.optimize(queryPlan));
     assertEquals(
-        relation("schema", table),
-        optimize(relation("schema", table))
-    );
+        "Unsupported plan: relation operator cannot have siblings", exception.getMessage());
+  }
+
+  @Test
+  void push_down_page_size_push_failed() {
+    when(tableScanBuilder.pushDownPageSize(any())).thenReturn(false);
+
+    var queryPlan = paginate(project(relation("schema", table)), 4);
+    var optimizer = LogicalPlanOptimizer.create();
+    final var exception =
+        assertThrows(IllegalStateException.class, () -> optimizer.optimize(queryPlan));
+    assertEquals("Failed to push down LogicalPaginate", exception.getMessage());
+  }
+
+  @Test
+  void push_page_size_noop_if_no_relation() {
+    var paginate = new LogicalPaginate(42, List.of(project(values())));
+    assertEquals(paginate, LogicalPlanOptimizer.create().optimize(paginate));
+  }
+
+  @Test
+  void push_page_size_noop_if_no_sub_plans() {
+    var paginate = new LogicalPaginate(42, List.of());
+    assertEquals(paginate, LogicalPlanOptimizer.create().optimize(paginate));
+  }
+
+  @Test
+  void table_scan_builder_support_offset_push_down_can_apply_its_rule() {
+    when(tableScanBuilder.pushDownPageSize(any())).thenReturn(true);
+
+    var relation = new LogicalRelation("schema", table);
+    var optimized =
+        LogicalPlanOptimizer.create().optimize(new LogicalPaginate(42, List.of(project(relation))));
+    // `optimized` structure: LogicalProject -> TableScanBuilder
+    // LogicalRelation replaced by a TableScanBuilder instance
+    assertEquals(project(tableScanBuilder), optimized);
   }
 
   private LogicalPlan optimize(LogicalPlan plan) {
     final LogicalPlanOptimizer optimizer = LogicalPlanOptimizer.create();
-    final LogicalPlan optimize = optimizer.optimize(plan);
-    return optimize;
+    return optimizer.optimize(plan);
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/optimizer/pattern/PatternsTest.java b/core/src/test/java/org/opensearch/sql/planner/optimizer/pattern/PatternsTest.java
index 61d192362a..d1e1a03521 100644
--- a/core/src/test/java/org/opensearch/sql/planner/optimizer/pattern/PatternsTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/optimizer/pattern/PatternsTest.java
@@ -3,37 +3,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.optimizer.pattern;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.Collections;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.planner.logical.LogicalFilter;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 
-@ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class PatternsTest {
 
-  @Mock
-  LogicalPlan plan;
-
   @Test
   void source_is_empty() {
+    var plan = mock(LogicalPlan.class);
     when(plan.getChild()).thenReturn(Collections.emptyList());
-    assertFalse(Patterns.source().getFunction().apply(plan).isPresent());
-    assertFalse(Patterns.source(null).getProperty().getFunction().apply(plan).isPresent());
+    assertAll(
+        () -> assertFalse(Patterns.source().getFunction().apply(plan).isPresent()),
+        () ->
+            assertFalse(Patterns.source(null).getProperty().getFunction().apply(plan).isPresent()));
   }
 
   @Test
   void table_is_empty() {
-    plan = Mockito.mock(LogicalFilter.class);
-    assertFalse(Patterns.table().getFunction().apply(plan).isPresent());
+    var plan = mock(LogicalFilter.class);
+    assertAll(
+        () -> assertFalse(Patterns.table().getFunction().apply(plan).isPresent()),
+        () -> assertFalse(Patterns.writeTable().getFunction().apply(plan).isPresent()));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/AggregationOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/AggregationOperatorTest.java
index 2585a21d7a..0f3f4bd61f 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/AggregationOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/AggregationOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -38,563 +37,733 @@ class AggregationOperatorTest extends PhysicalPlanTestBase {
 
   @Test
   public void sum_without_groups() {
-    PhysicalPlan plan = new AggregationOperator(new TestScan(),
-        Collections
-            .singletonList(DSL.named("sum(response)", DSL.sum(DSL.ref("response", INTEGER)))),
-        Collections.emptyList());
+    PhysicalPlan plan =
+        new AggregationOperator(
+            new TestScan(),
+            Collections.singletonList(
+                DSL.named("sum(response)", DSL.sum(DSL.ref("response", INTEGER)))),
+            Collections.emptyList());
     List<ExprValue> result = execute(plan);
     assertEquals(1, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("sum(response)", 1504d))
-    ));
+    assertThat(
+        result,
+        containsInAnyOrder(ExprValueUtils.tupleValue(ImmutableMap.of("sum(response)", 1504d))));
   }
 
   @Test
   public void avg_with_one_groups() {
-    PhysicalPlan plan = new AggregationOperator(new TestScan(),
-        Collections
-            .singletonList(DSL.named("avg(response)", DSL.avg(DSL.ref("response", INTEGER)))),
-        Collections.singletonList(DSL.named("action", DSL.ref("action", STRING))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            new TestScan(),
+            Collections.singletonList(
+                DSL.named("avg(response)", DSL.avg(DSL.ref("response", INTEGER)))),
+            Collections.singletonList(DSL.named("action", DSL.ref("action", STRING))));
     List<ExprValue> result = execute(plan);
     assertEquals(2, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "avg(response)", 268d)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "avg(response)", 350d))
-    ));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "avg(response)", 268d)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "avg(response)", 350d))));
   }
 
   @Test
   public void avg_with_two_groups() {
-    PhysicalPlan plan = new AggregationOperator(new TestScan(),
-        Collections
-            .singletonList(DSL.named("avg(response)", DSL.avg(DSL.ref("response", INTEGER)))),
-        Arrays.asList(DSL.named("action", DSL.ref("action", STRING)),
-            DSL.named("ip", DSL.ref("ip", STRING))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            new TestScan(),
+            Collections.singletonList(
+                DSL.named("avg(response)", DSL.avg(DSL.ref("response", INTEGER)))),
+            Arrays.asList(
+                DSL.named("action", DSL.ref("action", STRING)),
+                DSL.named("ip", DSL.ref("ip", STRING))));
     List<ExprValue> result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(
-            ImmutableMap.of("action", "GET", "ip", "209.160.24.63", "avg(response)", 302d)),
-        ExprValueUtils.tupleValue(
-            ImmutableMap.of("action", "GET", "ip", "112.111.162.4", "avg(response)", 200d)),
-        ExprValueUtils.tupleValue(
-            ImmutableMap.of("action", "POST", "ip", "74.125.19.106", "avg(response)", 350d))
-    ));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("action", "GET", "ip", "209.160.24.63", "avg(response)", 302d)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("action", "GET", "ip", "112.111.162.4", "avg(response)", 200d)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("action", "POST", "ip", "74.125.19.106", "avg(response)", 350d))));
   }
 
   @Test
   public void sum_with_one_groups() {
-    PhysicalPlan plan = new AggregationOperator(new TestScan(),
-        Collections
-            .singletonList(DSL.named("sum(response)", DSL.sum(DSL.ref("response", INTEGER)))),
-        Collections.singletonList(DSL.named("action", DSL.ref("action", STRING))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            new TestScan(),
+            Collections.singletonList(
+                DSL.named("sum(response)", DSL.sum(DSL.ref("response", INTEGER)))),
+            Collections.singletonList(DSL.named("action", DSL.ref("action", STRING))));
     List<ExprValue> result = execute(plan);
     assertEquals(2, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "sum(response)", 804)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "sum(response)", 700))
-    ));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "sum(response)", 804)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "sum(response)", 700))));
   }
 
   @Test
   public void millisecond_span() {
-    PhysicalPlan plan = new AggregationOperator(testScan(datetimeInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("second", TIMESTAMP)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("second", TIMESTAMP), DSL.literal(6 * 1000), "ms"))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(datetimeInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("second", TIMESTAMP)))),
+            Collections.singletonList(
+                DSL.named(
+                    "span", DSL.span(DSL.ref("second", TIMESTAMP), DSL.literal(6 * 1000), "ms"))));
     List<ExprValue> result = execute(plan);
     assertEquals(2, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("2021-01-01 00:00:00"), "count", 2)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("2021-01-01 00:00:12"), "count", 3))
-    ));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimestampValue("2021-01-01 00:00:00"), "count", 2)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprTimestampValue("2021-01-01 00:00:12"), "count", 3))));
   }
 
   @Test
   public void second_span() {
-    PhysicalPlan plan = new AggregationOperator(testScan(datetimeInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("second", TIMESTAMP)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("second", TIMESTAMP), DSL.literal(6), "s"))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(datetimeInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("second", TIMESTAMP)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("second", TIMESTAMP), DSL.literal(6), "s"))));
     List<ExprValue> result = execute(plan);
     assertEquals(2, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("2021-01-01 00:00:00"), "count", 2)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("2021-01-01 00:00:12"), "count", 3))
-    ));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimestampValue("2021-01-01 00:00:00"), "count", 2)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprTimestampValue("2021-01-01 00:00:12"), "count", 3))));
   }
 
   @Test
   public void minute_span() {
-    PhysicalPlan plan = new AggregationOperator(testScan(datetimeInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("minute", DATETIME)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("minute", DATETIME), DSL.literal(5), "m"))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(datetimeInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("minute", DATETIME)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("minute", DATETIME), DSL.literal(5), "m"))));
     List<ExprValue> result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDatetimeValue("2020-12-31 23:50:00"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDatetimeValue("2021-01-01 00:00:00"), "count", 3)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDatetimeValue("2021-01-01 00:05:00"), "count", 1))
-    ));
-
-    plan = new AggregationOperator(testScan(datetimeInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("hour", TIME)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("hour", TIME), DSL.literal(30), "m"))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDatetimeValue("2020-12-31 23:50:00"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDatetimeValue("2021-01-01 00:00:00"), "count", 3)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprDatetimeValue("2021-01-01 00:05:00"), "count", 1))));
+
+    plan =
+        new AggregationOperator(
+            testScan(datetimeInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("hour", TIME)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("hour", TIME), DSL.literal(30), "m"))));
     result = execute(plan);
     assertEquals(4, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimeValue("17:00:00"), "count", 2)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimeValue("18:00:00"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimeValue("18:30:00"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimeValue("19:00:00"), "count", 1))
-    ));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimeValue("17:00:00"), "count", 2)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimeValue("18:00:00"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimeValue("18:30:00"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimeValue("19:00:00"), "count", 1))));
   }
 
   @Test
   public void hour_span() {
-    PhysicalPlan plan = new AggregationOperator(testScan(datetimeInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("hour", TIME)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("hour", TIME), DSL.literal(1), "h"))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(datetimeInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("hour", TIME)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("hour", TIME), DSL.literal(1), "h"))));
     List<ExprValue> result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimeValue("17:00:00"), "count", 2)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimeValue("18:00:00"), "count", 2)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimeValue("19:00:00"), "count", 1))
-    ));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimeValue("17:00:00"), "count", 2)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimeValue("18:00:00"), "count", 2)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimeValue("19:00:00"), "count", 1))));
   }
 
   @Test
   public void day_span() {
-    PhysicalPlan plan = new AggregationOperator(testScan(dateInputs),
-        Collections.singletonList(DSL
-            .named("count(day)", DSL.count(DSL.ref("day", DATE)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("day", DATE), DSL.literal(1), "d"))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(dateInputs),
+            Collections.singletonList(DSL.named("count(day)", DSL.count(DSL.ref("day", DATE)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("day", DATE), DSL.literal(1), "d"))));
     List<ExprValue> result = execute(plan);
     assertEquals(4, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2021-01-01"), "count(day)", 2)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2021-01-02"), "count(day)", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2021-01-03"), "count(day)", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2021-01-04"), "count(day)", 1))
-    ));
-
-    plan = new AggregationOperator(testScan(dateInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("month", DATE)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("month", DATE), DSL.literal(30), "d"))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2021-01-01"), "count(day)", 2)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2021-01-02"), "count(day)", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2021-01-03"), "count(day)", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2021-01-04"), "count(day)", 1))));
+
+    plan =
+        new AggregationOperator(
+            testScan(dateInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("month", DATE)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("month", DATE), DSL.literal(30), "d"))));
     result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2020-12-04"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2021-02-02"), "count", 3)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2021-03-04"), "count", 1))
-    ));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2020-12-04"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2021-02-02"), "count", 3)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2021-03-04"), "count", 1))));
   }
 
   @Test
   public void week_span() {
-    PhysicalPlan plan = new AggregationOperator(testScan(dateInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("month", DATE)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("month", DATE), DSL.literal(5), "w"))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(dateInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("month", DATE)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("month", DATE), DSL.literal(5), "w"))));
     List<ExprValue> result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2020-11-16"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2021-01-25"), "count", 3)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2021-03-01"), "count", 1))
-    ));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2020-11-16"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2021-01-25"), "count", 3)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2021-03-01"), "count", 1))));
   }
 
   @Test
   public void month_span() {
-    PhysicalPlan plan = new AggregationOperator(testScan(dateInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("month", DATE)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("month", DATE), DSL.literal(1), "M"))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(dateInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("month", DATE)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("month", DATE), DSL.literal(1), "M"))));
     List<ExprValue> result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2020-12-01"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2021-02-01"), "count", 3)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDateValue("2021-03-01"), "count", 1))
-    ));
-
-    plan = new AggregationOperator(testScan(dateInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("quarter", DATETIME)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("quarter", DATETIME), DSL.literal(2), "M"))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2020-12-01"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2021-02-01"), "count", 3)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDateValue("2021-03-01"), "count", 1))));
+
+    plan =
+        new AggregationOperator(
+            testScan(dateInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("quarter", DATETIME)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("quarter", DATETIME), DSL.literal(2), "M"))));
     result = execute(plan);
     assertEquals(4, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDatetimeValue("2020-09-01 00:00:00"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDatetimeValue("2020-11-01 00:00:00"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDatetimeValue("2021-01-01 00:00:00"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDatetimeValue("2021-05-01 00:00:00"), "count", 2))
-    ));
-
-    plan = new AggregationOperator(testScan(dateInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("year", TIMESTAMP)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("year", TIMESTAMP), DSL.literal(10 * 12), "M"))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDatetimeValue("2020-09-01 00:00:00"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDatetimeValue("2020-11-01 00:00:00"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDatetimeValue("2021-01-01 00:00:00"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprDatetimeValue("2021-05-01 00:00:00"), "count", 2))));
+
+    plan =
+        new AggregationOperator(
+            testScan(dateInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("year", TIMESTAMP)))),
+            Collections.singletonList(
+                DSL.named(
+                    "span", DSL.span(DSL.ref("year", TIMESTAMP), DSL.literal(10 * 12), "M"))));
     result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("1990-01-01 00:00:00"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("2010-01-01 00:00:00"), "count", 3)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("2020-01-01 00:00:00"), "count", 1))
-    ));
-
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimestampValue("1990-01-01 00:00:00"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimestampValue("2010-01-01 00:00:00"), "count", 3)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprTimestampValue("2020-01-01 00:00:00"), "count", 1))));
   }
 
   @Test
   public void quarter_span() {
-    PhysicalPlan plan = new AggregationOperator(testScan(dateInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("quarter", DATETIME)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("quarter", DATETIME), DSL.literal(2), "q"))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(dateInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("quarter", DATETIME)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("quarter", DATETIME), DSL.literal(2), "q"))));
     List<ExprValue> result = execute(plan);
     assertEquals(2, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDatetimeValue("2020-07-01 00:00:00"), "count", 2)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprDatetimeValue("2021-01-01 00:00:00"), "count", 3))
-    ));
-
-    plan = new AggregationOperator(testScan(dateInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("year", TIMESTAMP)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("year", TIMESTAMP), DSL.literal(10 * 4), "q"))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprDatetimeValue("2020-07-01 00:00:00"), "count", 2)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprDatetimeValue("2021-01-01 00:00:00"), "count", 3))));
+
+    plan =
+        new AggregationOperator(
+            testScan(dateInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("year", TIMESTAMP)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("year", TIMESTAMP), DSL.literal(10 * 4), "q"))));
     result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("1990-01-01 00:00:00"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("2010-01-01 00:00:00"), "count", 3)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("2020-01-01 00:00:00"), "count", 1))
-    ));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimestampValue("1990-01-01 00:00:00"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimestampValue("2010-01-01 00:00:00"), "count", 3)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprTimestampValue("2020-01-01 00:00:00"), "count", 1))));
   }
 
   @Test
   public void year_span() {
-    PhysicalPlan plan = new AggregationOperator(testScan(dateInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("year", TIMESTAMP)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("year", TIMESTAMP), DSL.literal(10), "y"))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(dateInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("year", TIMESTAMP)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("year", TIMESTAMP), DSL.literal(10), "y"))));
     List<ExprValue> result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("1990-01-01 00:00:00"), "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("2010-01-01 00:00:00"), "count", 3)),
-        ExprValueUtils.tupleValue(ImmutableMap
-            .of("span", new ExprTimestampValue("2020-01-01 00:00:00"), "count", 1))
-    ));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimestampValue("1990-01-01 00:00:00"), "count", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of("span", new ExprTimestampValue("2010-01-01 00:00:00"), "count", 3)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprTimestampValue("2020-01-01 00:00:00"), "count", 1))));
   }
 
   @Test
   public void integer_field() {
-    PhysicalPlan plan = new AggregationOperator(testScan(numericInputs),
-        Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("integer", INTEGER)))),
-        Collections.singletonList(DSL.named("span", DSL.span(DSL.ref("integer", INTEGER), DSL
-            .literal(1), ""))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(numericInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("integer", INTEGER)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("integer", INTEGER), DSL.literal(1), ""))));
     List<ExprValue> result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 1, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 2, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 5, "count", 1))));
-
-    plan = new AggregationOperator(testScan(numericInputs),
-        Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("integer", INTEGER)))),
-        Collections.singletonList(DSL.named("span", DSL.span(DSL.ref("integer", INTEGER), DSL
-            .literal(1.5), ""))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 1, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 2, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 5, "count", 1))));
+
+    plan =
+        new AggregationOperator(
+            testScan(numericInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("integer", INTEGER)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("integer", INTEGER), DSL.literal(1.5), ""))));
     result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 0D, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 1.5D, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 4.5D, "count", 1))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 0D, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 1.5D, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 4.5D, "count", 1))));
   }
 
   @Test
   public void long_field() {
-    PhysicalPlan plan = new AggregationOperator(testScan(numericInputs),
-        Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("long", LONG)))),
-        Collections.singletonList(DSL.named("span", DSL.span(DSL.ref("long", LONG), DSL
-            .literal(1), ""))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(numericInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("long", LONG)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("long", LONG), DSL.literal(1), ""))));
     List<ExprValue> result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 1L, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 2L, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 5L, "count", 1))));
-
-    plan = new AggregationOperator(testScan(numericInputs),
-        Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("long", LONG)))),
-        Collections.singletonList(DSL.named("span", DSL.span(DSL.ref("long", LONG), DSL
-            .literal(1.5), ""))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 1L, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 2L, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 5L, "count", 1))));
+
+    plan =
+        new AggregationOperator(
+            testScan(numericInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("long", LONG)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("long", LONG), DSL.literal(1.5), ""))));
     result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 0D, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 1.5D, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 4.5D, "count", 1))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 0D, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 1.5D, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 4.5D, "count", 1))));
   }
 
   @Test
   public void float_field() {
-    PhysicalPlan plan = new AggregationOperator(testScan(numericInputs),
-        Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("float", FLOAT)))),
-        Collections.singletonList(DSL.named("span", DSL.span(DSL.ref("float", FLOAT), DSL
-            .literal(1), ""))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(numericInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("float", FLOAT)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("float", FLOAT), DSL.literal(1), ""))));
     List<ExprValue> result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 1F, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 2F, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 5F, "count", 1))));
-
-    plan = new AggregationOperator(testScan(numericInputs),
-        Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("float", FLOAT)))),
-        Collections.singletonList(DSL.named("span", DSL.span(DSL.ref("float", FLOAT), DSL
-            .literal(1.5), ""))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 1F, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 2F, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 5F, "count", 1))));
+
+    plan =
+        new AggregationOperator(
+            testScan(numericInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("float", FLOAT)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("float", FLOAT), DSL.literal(1.5), ""))));
     result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 0D, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 1.5D, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 4.5D, "count", 1))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 0D, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 1.5D, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 4.5D, "count", 1))));
   }
 
   @Test
   public void double_field() {
-    PhysicalPlan plan = new AggregationOperator(testScan(numericInputs),
-        Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("double", DOUBLE)))),
-        Collections.singletonList(DSL.named("span", DSL.span(DSL.ref("double", DOUBLE), DSL
-            .literal(1), ""))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(numericInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("double", DOUBLE)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("double", DOUBLE), DSL.literal(1), ""))));
     List<ExprValue> result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 1D, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 2D, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 5D, "count", 1))));
-
-    plan = new AggregationOperator(testScan(numericInputs),
-        Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("double", DOUBLE)))),
-        Collections.singletonList(DSL.named("span", DSL.span(DSL.ref("double", DOUBLE), DSL
-            .literal(1.5), ""))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 1D, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 2D, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 5D, "count", 1))));
+
+    plan =
+        new AggregationOperator(
+            testScan(numericInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("double", DOUBLE)))),
+            Collections.singletonList(
+                DSL.named("span", DSL.span(DSL.ref("double", DOUBLE), DSL.literal(1.5), ""))));
     result = execute(plan);
     assertEquals(3, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 0D, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 1.5D, "count", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("span", 4.5D, "count", 1))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 0D, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 1.5D, "count", 1)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("span", 4.5D, "count", 1))));
   }
 
   @Test
   public void twoBucketsSpanAndLong() {
-    PhysicalPlan plan = new AggregationOperator(testScan(compoundInputs),
-        Collections.singletonList(DSL.named("max", DSL.max(DSL.ref("errors", INTEGER)))),
-        Arrays.asList(
-            DSL.named("span", DSL.span(DSL.ref("day", DATE), DSL.literal(1), "d")),
-            DSL.named("region", DSL.ref("region", STRING)))
-        );
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(compoundInputs),
+            Collections.singletonList(DSL.named("max", DSL.max(DSL.ref("errors", INTEGER)))),
+            Arrays.asList(
+                DSL.named("span", DSL.span(DSL.ref("day", DATE), DSL.literal(1), "d")),
+                DSL.named("region", DSL.ref("region", STRING))));
     List<ExprValue> result = execute(plan);
     assertEquals(4, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "span", new ExprDateValue("2021-01-03"), "region","iad", "max", 3)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "span", new ExprDateValue("2021-01-04"), "region","iad", "max", 10)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "span", new ExprDateValue("2021-01-06"), "region","iad", "max", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "span", new ExprDateValue("2021-01-07"), "region","iad", "max", 8))
-    ));
-
-    plan = new AggregationOperator(testScan(compoundInputs),
-        Collections.singletonList(DSL.named("max", DSL.max(DSL.ref("errors", INTEGER)))),
-        Arrays.asList(
-            DSL.named("span", DSL.span(DSL.ref("day", DATE), DSL.literal(1), "d")),
-            DSL.named("region", DSL.ref("region", STRING)),
-            DSL.named("host", DSL.ref("host", STRING)))
-    );
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprDateValue("2021-01-03"), "region", "iad", "max", 3)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprDateValue("2021-01-04"), "region", "iad", "max", 10)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprDateValue("2021-01-06"), "region", "iad", "max", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span", new ExprDateValue("2021-01-07"), "region", "iad", "max", 8))));
+
+    plan =
+        new AggregationOperator(
+            testScan(compoundInputs),
+            Collections.singletonList(DSL.named("max", DSL.max(DSL.ref("errors", INTEGER)))),
+            Arrays.asList(
+                DSL.named("span", DSL.span(DSL.ref("day", DATE), DSL.literal(1), "d")),
+                DSL.named("region", DSL.ref("region", STRING)),
+                DSL.named("host", DSL.ref("host", STRING))));
     result = execute(plan);
     assertEquals(7, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "span", new ExprDateValue("2021-01-03"), "region","iad", "host", "h1", "max", 2)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "span", new ExprDateValue("2021-01-03"), "region","iad", "host", "h2", "max", 3)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "span", new ExprDateValue("2021-01-04"), "region","iad", "host", "h1", "max", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "span", new ExprDateValue("2021-01-04"), "region","iad", "host", "h2", "max", 10)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "span", new ExprDateValue("2021-01-06"), "region","iad", "host", "h1", "max", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "span", new ExprDateValue("2021-01-07"), "region","iad", "host", "h1", "max", 6)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "span", new ExprDateValue("2021-01-07"), "region","iad", "host", "h2", "max", 8))
-    ));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span",
+                    new ExprDateValue("2021-01-03"),
+                    "region",
+                    "iad",
+                    "host",
+                    "h1",
+                    "max",
+                    2)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span",
+                    new ExprDateValue("2021-01-03"),
+                    "region",
+                    "iad",
+                    "host",
+                    "h2",
+                    "max",
+                    3)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span",
+                    new ExprDateValue("2021-01-04"),
+                    "region",
+                    "iad",
+                    "host",
+                    "h1",
+                    "max",
+                    1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span",
+                    new ExprDateValue("2021-01-04"),
+                    "region",
+                    "iad",
+                    "host",
+                    "h2",
+                    "max",
+                    10)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span",
+                    new ExprDateValue("2021-01-06"),
+                    "region",
+                    "iad",
+                    "host",
+                    "h1",
+                    "max",
+                    1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span",
+                    new ExprDateValue("2021-01-07"),
+                    "region",
+                    "iad",
+                    "host",
+                    "h1",
+                    "max",
+                    6)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "span",
+                    new ExprDateValue("2021-01-07"),
+                    "region",
+                    "iad",
+                    "host",
+                    "h2",
+                    "max",
+                    8))));
   }
 
   @Test
   public void aggregate_with_two_groups_with_windowing() {
-    PhysicalPlan plan = new AggregationOperator(testScan(compoundInputs),
-        Collections.singletonList(DSL.named("sum", DSL.sum(DSL.ref("errors", INTEGER)))),
-        Arrays.asList(
-            DSL.named("host", DSL.ref("host", STRING)),
-            DSL.named("span", DSL.span(DSL.ref("day", DATE), DSL.literal(1), "d"))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(compoundInputs),
+            Collections.singletonList(DSL.named("sum", DSL.sum(DSL.ref("errors", INTEGER)))),
+            Arrays.asList(
+                DSL.named("host", DSL.ref("host", STRING)),
+                DSL.named("span", DSL.span(DSL.ref("day", DATE), DSL.literal(1), "d"))));
 
     List<ExprValue> result = execute(plan);
     assertEquals(7, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h1"),
-            "span", new ExprDateValue("2021-01-03"),
-            "sum", 2)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h1"),
-            "span", new ExprDateValue("2021-01-04"),
-            "sum", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h1"),
-            "span", new ExprDateValue("2021-01-06"),
-            "sum", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h1"),
-            "span", new ExprDateValue("2021-01-07"),
-            "sum", 6)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h2"),
-            "span", new ExprDateValue("2021-01-03"),
-            "sum", 3)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h2"),
-            "span", new ExprDateValue("2021-01-04"),
-            "sum", 10)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h2"),
-            "span", new ExprDateValue("2021-01-07"),
-            "sum", 8))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h1"),
+                    "span", new ExprDateValue("2021-01-03"),
+                    "sum", 2)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h1"),
+                    "span", new ExprDateValue("2021-01-04"),
+                    "sum", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h1"),
+                    "span", new ExprDateValue("2021-01-06"),
+                    "sum", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h1"),
+                    "span", new ExprDateValue("2021-01-07"),
+                    "sum", 6)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h2"),
+                    "span", new ExprDateValue("2021-01-03"),
+                    "sum", 3)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h2"),
+                    "span", new ExprDateValue("2021-01-04"),
+                    "sum", 10)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h2"),
+                    "span", new ExprDateValue("2021-01-07"),
+                    "sum", 8))));
   }
 
   @Test
   public void aggregate_with_three_groups_with_windowing() {
-    PhysicalPlan plan = new AggregationOperator(testScan(compoundInputs),
-        Collections.singletonList(DSL.named("sum", DSL.sum(DSL.ref("errors", INTEGER)))),
-        Arrays.asList(
-            DSL.named("host", DSL.ref("host", STRING)),
-            DSL.named("span", DSL.span(DSL.ref("day", DATE), DSL.literal(1), "d")),
-            DSL.named("region", DSL.ref("region", STRING))));
+    PhysicalPlan plan =
+        new AggregationOperator(
+            testScan(compoundInputs),
+            Collections.singletonList(DSL.named("sum", DSL.sum(DSL.ref("errors", INTEGER)))),
+            Arrays.asList(
+                DSL.named("host", DSL.ref("host", STRING)),
+                DSL.named("span", DSL.span(DSL.ref("day", DATE), DSL.literal(1), "d")),
+                DSL.named("region", DSL.ref("region", STRING))));
 
     List<ExprValue> result = execute(plan);
     assertEquals(7, result.size());
-    assertThat(result, containsInRelativeOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h1"),
-            "span", new ExprDateValue("2021-01-03"),
-            "region", new ExprStringValue("iad"),
-            "sum", 2)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h1"),
-            "span", new ExprDateValue("2021-01-04"),
-            "region", new ExprStringValue("iad"),
-            "sum", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h1"),
-            "span", new ExprDateValue("2021-01-06"),
-            "region", new ExprStringValue("iad"),
-            "sum", 1)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h1"),
-            "span", new ExprDateValue("2021-01-07"),
-            "region", new ExprStringValue("iad"),
-            "sum", 6)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h2"),
-            "span", new ExprDateValue("2021-01-03"),
-            "region", new ExprStringValue("iad"),
-            "sum", 3)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h2"),
-            "span", new ExprDateValue("2021-01-04"),
-            "region", new ExprStringValue("iad"),
-            "sum", 10)),
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "host", new ExprStringValue("h2"),
-            "span", new ExprDateValue("2021-01-07"),
-            "region", new ExprStringValue("iad"),
-            "sum", 8))));
+    assertThat(
+        result,
+        containsInRelativeOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h1"),
+                    "span", new ExprDateValue("2021-01-03"),
+                    "region", new ExprStringValue("iad"),
+                    "sum", 2)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h1"),
+                    "span", new ExprDateValue("2021-01-04"),
+                    "region", new ExprStringValue("iad"),
+                    "sum", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h1"),
+                    "span", new ExprDateValue("2021-01-06"),
+                    "region", new ExprStringValue("iad"),
+                    "sum", 1)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h1"),
+                    "span", new ExprDateValue("2021-01-07"),
+                    "region", new ExprStringValue("iad"),
+                    "sum", 6)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h2"),
+                    "span", new ExprDateValue("2021-01-03"),
+                    "region", new ExprStringValue("iad"),
+                    "sum", 3)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h2"),
+                    "span", new ExprDateValue("2021-01-04"),
+                    "region", new ExprStringValue("iad"),
+                    "sum", 10)),
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "host", new ExprStringValue("h2"),
+                    "span", new ExprDateValue("2021-01-07"),
+                    "region", new ExprStringValue("iad"),
+                    "sum", 8))));
   }
 
   @Test
   public void copyOfAggregationOperatorShouldSame() {
-    AggregationOperator plan = new AggregationOperator(testScan(datetimeInputs),
-        Collections.singletonList(DSL
-            .named("count", DSL.count(DSL.ref("second", TIMESTAMP)))),
-        Collections.singletonList(DSL
-            .named("span", DSL.span(DSL.ref("second", TIMESTAMP), DSL.literal(6 * 1000), "ms"))));
-    AggregationOperator copy = new AggregationOperator(plan.getInput(), plan.getAggregatorList(),
-        plan.getGroupByExprList());
+    AggregationOperator plan =
+        new AggregationOperator(
+            testScan(datetimeInputs),
+            Collections.singletonList(DSL.named("count", DSL.count(DSL.ref("second", TIMESTAMP)))),
+            Collections.singletonList(
+                DSL.named(
+                    "span", DSL.span(DSL.ref("second", TIMESTAMP), DSL.literal(6 * 1000), "ms"))));
+    AggregationOperator copy =
+        new AggregationOperator(
+            plan.getInput(), plan.getAggregatorList(), plan.getGroupByExprList());
 
     assertEquals(plan, copy);
   }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/CursorCloseOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/CursorCloseOperatorTest.java
new file mode 100644
index 0000000000..5ae30faa30
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/CursorCloseOperatorTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.physical;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+public class CursorCloseOperatorTest {
+
+  @Test
+  public void never_hasNext() {
+    var plan = new CursorCloseOperator(null);
+    assertFalse(plan.hasNext());
+    plan.open();
+    assertFalse(plan.hasNext());
+  }
+
+  @Test
+  public void open_is_not_propagated() {
+    var child = mock(PhysicalPlan.class);
+    var plan = new CursorCloseOperator(child);
+    plan.open();
+    verify(child, never()).open();
+  }
+
+  @Test
+  public void close_is_propagated() {
+    var child = mock(PhysicalPlan.class);
+    var plan = new CursorCloseOperator(child);
+    plan.close();
+    verify(child).close();
+  }
+
+  @Test
+  public void next_always_throws() {
+    var plan = new CursorCloseOperator(null);
+    assertThrows(Throwable.class, plan::next);
+    plan.open();
+    assertThrows(Throwable.class, plan::next);
+  }
+
+  @Test
+  public void produces_empty_schema() {
+    var child = mock(PhysicalPlan.class);
+    var plan = new CursorCloseOperator(child);
+    assertEquals(0, plan.schema().getColumns().size());
+    verify(child, never()).schema();
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/DedupeOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/DedupeOperatorTest.java
index 13f35f9843..f6308aed53 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/DedupeOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/DedupeOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -26,8 +25,7 @@
 
 @ExtendWith(MockitoExtension.class)
 class DedupeOperatorTest extends PhysicalPlanTestBase {
-  @Mock
-  private PhysicalPlan inputPlan;
+  @Mock private PhysicalPlan inputPlan;
 
   /**
    * construct the map which contain null value, because {@link ImmutableMap} doesn't support null
@@ -182,8 +180,7 @@ public void dedupe_one_field_with_missing_value() {
             tupleValue(ImmutableMap.of("region", "us-east-1", "action", "GET", "response", 200)))
         .thenReturn(
             tupleValue(ImmutableMap.of("region", "us-east-1", "action", "POST", "response", 200)))
-        .thenReturn(
-            tupleValue(ImmutableMap.of("action", "POST", "response", 200)))
+        .thenReturn(tupleValue(ImmutableMap.of("action", "POST", "response", 200)))
         .thenReturn(
             tupleValue(ImmutableMap.of("region", "us-east-1", "action", "GET", "response", 200)));
 
@@ -201,8 +198,7 @@ public void dedupe_one_field_with_missing_value_keep_empty() {
             tupleValue(ImmutableMap.of("region", "us-east-1", "action", "GET", "response", 200)))
         .thenReturn(
             tupleValue(ImmutableMap.of("region", "us-east-1", "action", "POST", "response", 200)))
-        .thenReturn(
-            tupleValue(ImmutableMap.of("action", "POST", "response", 200)))
+        .thenReturn(tupleValue(ImmutableMap.of("action", "POST", "response", 200)))
         .thenReturn(
             tupleValue(ImmutableMap.of("region", "us-east-1", "action", "GET", "response", 200)));
 
@@ -221,8 +217,7 @@ public void dedupe_one_field_with_null_value() {
             tupleValue(ImmutableMap.of("region", "us-east-1", "action", "GET", "response", 200)))
         .thenReturn(
             tupleValue(ImmutableMap.of("region", "us-east-1", "action", "POST", "response", 200)))
-        .thenReturn(
-            tupleValue(NULL_MAP))
+        .thenReturn(tupleValue(NULL_MAP))
         .thenReturn(
             tupleValue(ImmutableMap.of("region", "us-east-1", "action", "GET", "response", 200)));
 
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/EvalOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/EvalOperatorTest.java
index d32622834b..6f10cc435b 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/EvalOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/EvalOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -29,8 +28,7 @@
 
 @ExtendWith(MockitoExtension.class)
 class EvalOperatorTest extends PhysicalPlanTestBase {
-  @Mock
-  private PhysicalPlan inputPlan;
+  @Mock private PhysicalPlan inputPlan;
 
   @Test
   public void create_new_field_that_contain_the_result_of_a_calculation() {
@@ -63,8 +61,8 @@ public void create_multiple_field_using_field_defined_in_input_tuple() {
         eval(
             inputPlan,
             ImmutablePair.of(
-                DSL.ref("velocity", DOUBLE), DSL.divide(DSL.ref("distance", INTEGER), DSL.ref(
-                    "time", INTEGER))),
+                DSL.ref("velocity", DOUBLE),
+                DSL.divide(DSL.ref("distance", INTEGER), DSL.ref("time", INTEGER))),
             ImmutablePair.of(
                 DSL.ref("doubleDistance", INTEGER),
                 DSL.multiply(DSL.ref("distance", INTEGER), DSL.literal(2))));
@@ -88,8 +86,8 @@ public void create_multiple_filed_using_field_defined_in_eval_operator() {
         eval(
             inputPlan,
             ImmutablePair.of(
-                DSL.ref("velocity", INTEGER), DSL.divide(DSL.ref("distance", INTEGER), DSL.ref(
-                    "time", INTEGER))),
+                DSL.ref("velocity", INTEGER),
+                DSL.divide(DSL.ref("distance", INTEGER), DSL.ref("time", INTEGER))),
             ImmutablePair.of(
                 DSL.ref("doubleVelocity", INTEGER),
                 DSL.multiply(DSL.ref("velocity", INTEGER), DSL.literal(2))));
@@ -126,8 +124,8 @@ public void replace_existing_field() {
   public void do_nothing_with_none_tuple_value() {
     when(inputPlan.hasNext()).thenReturn(true, false);
     when(inputPlan.next()).thenReturn(ExprValueUtils.integerValue(1));
-    PhysicalPlan plan = eval(inputPlan, ImmutablePair.of(DSL.ref("response", INTEGER),
-        DSL.ref("referer", STRING)));
+    PhysicalPlan plan =
+        eval(inputPlan, ImmutablePair.of(DSL.ref("response", INTEGER), DSL.ref("referer", STRING)));
     List<ExprValue> result = execute(plan);
 
     assertThat(result, allOf(iterableWithSize(1), hasItems(ExprValueUtils.integerValue(1))));
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/FilterOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/FilterOperatorTest.java
index 288b4bf661..bfe3b323c4 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/FilterOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/FilterOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -17,6 +16,8 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -27,44 +28,57 @@
 import org.opensearch.sql.expression.DSL;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class FilterOperatorTest extends PhysicalPlanTestBase {
-  @Mock
-  private PhysicalPlan inputPlan;
+  @Mock private PhysicalPlan inputPlan;
 
   @Test
-  public void filterTest() {
-    FilterOperator plan = new FilterOperator(new TestScan(),
-        DSL.equal(DSL.ref("response", INTEGER), DSL.literal(404)));
+  public void filter_test() {
+    FilterOperator plan =
+        new FilterOperator(
+            new TestScan(),
+            DSL.and(
+                DSL.notequal(DSL.ref("response", INTEGER), DSL.literal(200)),
+                DSL.notequal(DSL.ref("response", INTEGER), DSL.literal(500))));
     List<ExprValue> result = execute(plan);
     assertEquals(1, result.size());
-    assertThat(result, containsInAnyOrder(ExprValueUtils
-        .tupleValue(ImmutableMap
-            .of("ip", "209.160.24.63", "action", "GET", "response", 404, "referer",
-                "www.amazon.com"))));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "ip",
+                    "209.160.24.63",
+                    "action",
+                    "GET",
+                    "response",
+                    404,
+                    "referer",
+                    "www.amazon.com"))));
   }
 
   @Test
-  public void nullValueShouldBeenIgnored() {
+  public void null_value_should_been_ignored() {
     LinkedHashMap<String, ExprValue> value = new LinkedHashMap<>();
     value.put("response", LITERAL_NULL);
     when(inputPlan.hasNext()).thenReturn(true, false);
     when(inputPlan.next()).thenReturn(new ExprTupleValue(value));
 
-    FilterOperator plan = new FilterOperator(inputPlan,
-        DSL.equal(DSL.ref("response", INTEGER), DSL.literal(404)));
+    FilterOperator plan =
+        new FilterOperator(inputPlan, DSL.equal(DSL.ref("response", INTEGER), DSL.literal(404)));
     List<ExprValue> result = execute(plan);
     assertEquals(0, result.size());
   }
 
   @Test
-  public void missingValueShouldBeenIgnored() {
+  public void missing_value_should_been_ignored() {
     LinkedHashMap<String, ExprValue> value = new LinkedHashMap<>();
     value.put("response", LITERAL_MISSING);
     when(inputPlan.hasNext()).thenReturn(true, false);
     when(inputPlan.next()).thenReturn(new ExprTupleValue(value));
 
-    FilterOperator plan = new FilterOperator(inputPlan,
-        DSL.equal(DSL.ref("response", INTEGER), DSL.literal(404)));
+    FilterOperator plan =
+        new FilterOperator(inputPlan, DSL.equal(DSL.ref("response", INTEGER), DSL.literal(404)));
     List<ExprValue> result = execute(plan);
     assertEquals(0, result.size());
   }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/LimitOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/LimitOperatorTest.java
index a9796bb11a..fa3788cc2d 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/LimitOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/LimitOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -23,10 +22,19 @@ public void limit() {
     PhysicalPlan plan = new LimitOperator(new TestScan(), 1, 0);
     List<ExprValue> result = execute(plan);
     assertEquals(1, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "ip", "209.160.24.63", "action", "GET", "response", 200, "referer", "www.amazon.com"))
-    ));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "ip",
+                    "209.160.24.63",
+                    "action",
+                    "GET",
+                    "response",
+                    200,
+                    "referer",
+                    "www.amazon.com"))));
   }
 
   @Test
@@ -34,15 +42,24 @@ public void limit_and_offset() {
     PhysicalPlan plan = new LimitOperator(new TestScan(), 1, 1);
     List<ExprValue> result = execute(plan);
     assertEquals(1, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of(
-            "ip", "209.160.24.63", "action", "GET", "response", 404, "referer", "www.amazon.com"))
-    ));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            ExprValueUtils.tupleValue(
+                ImmutableMap.of(
+                    "ip",
+                    "209.160.24.63",
+                    "action",
+                    "GET",
+                    "response",
+                    404,
+                    "referer",
+                    "www.amazon.com"))));
   }
 
   @Test
   public void offset_exceeds_row_number() {
-    PhysicalPlan plan = new LimitOperator(new TestScan(),1, 6);
+    PhysicalPlan plan = new LimitOperator(new TestScan(), 1, 6);
     List<ExprValue> result = execute(plan);
     assertEquals(0, result.size());
   }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/NestedOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/NestedOperatorTest.java
new file mode 100644
index 0000000000..cf98183eb3
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/NestedOperatorTest.java
@@ -0,0 +1,326 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.physical;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.data.model.ExprValueUtils.collectionValue;
+import static org.opensearch.sql.data.model.ExprValueUtils.tupleValue;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.ReferenceExpression;
+
+@ExtendWith(MockitoExtension.class)
+class NestedOperatorTest extends PhysicalPlanTestBase {
+  @Mock private PhysicalPlan inputPlan;
+
+  private final ExprValue testData =
+      tupleValue(
+          Map.of(
+              "message",
+              collectionValue(
+                  List.of(Map.of("info", "a"), Map.of("info", "b"), Map.of("info", "c"))),
+              "comment",
+              collectionValue(
+                  List.of(Map.of("data", "1"), Map.of("data", "2"), Map.of("data", "3")))));
+
+  private final ExprValue testDataWithSamePath =
+      tupleValue(
+          Map.of(
+              "message",
+              collectionValue(
+                  List.of(
+                      Map.of("info", "a", "id", "1"),
+                      Map.of("info", "b", "id", "2"),
+                      Map.of("info", "c", "id", "3")))));
+
+  private final ExprValue nonNestedTestData = tupleValue(Map.of("message", "val"));
+
+  private final ExprValue missingArrayData =
+      tupleValue(Map.of("missing", collectionValue(List.of("value"))));
+
+  @Test
+  public void nested_one_nested_field() {
+    when(inputPlan.hasNext()).thenReturn(true, false);
+    when(inputPlan.next()).thenReturn(testData);
+
+    Set<String> fields = Set.of("message.info");
+    Map<String, List<String>> groupedFieldsByPath = Map.of("message", List.of("message.info"));
+
+    var nested = new NestedOperator(inputPlan, fields, groupedFieldsByPath);
+
+    assertThat(
+        execute(nested),
+        contains(
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "a");
+                    put(
+                        "comment",
+                        collectionValue(
+                            new ArrayList<>() {
+                              {
+                                add(
+                                    new LinkedHashMap<>() {
+                                      {
+                                        put("data", "1");
+                                      }
+                                    });
+                                add(
+                                    new LinkedHashMap<>() {
+                                      {
+                                        put("data", "2");
+                                      }
+                                    });
+                                add(
+                                    new LinkedHashMap<>() {
+                                      {
+                                        put("data", "3");
+                                      }
+                                    });
+                              }
+                            }));
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "b");
+                    put(
+                        "comment",
+                        collectionValue(
+                            new ArrayList<>() {
+                              {
+                                add(
+                                    new LinkedHashMap<>() {
+                                      {
+                                        put("data", "1");
+                                      }
+                                    });
+                                add(
+                                    new LinkedHashMap<>() {
+                                      {
+                                        put("data", "2");
+                                      }
+                                    });
+                                add(
+                                    new LinkedHashMap<>() {
+                                      {
+                                        put("data", "3");
+                                      }
+                                    });
+                              }
+                            }));
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "c");
+                    put(
+                        "comment",
+                        collectionValue(
+                            new ArrayList<>() {
+                              {
+                                add(
+                                    new LinkedHashMap<>() {
+                                      {
+                                        put("data", "1");
+                                      }
+                                    });
+                                add(
+                                    new LinkedHashMap<>() {
+                                      {
+                                        put("data", "2");
+                                      }
+                                    });
+                                add(
+                                    new LinkedHashMap<>() {
+                                      {
+                                        put("data", "3");
+                                      }
+                                    });
+                              }
+                            }));
+                  }
+                })));
+  }
+
+  @Test
+  public void nested_two_nested_field() {
+    when(inputPlan.hasNext()).thenReturn(true, false);
+    when(inputPlan.next()).thenReturn(testData);
+
+    List<Map<String, ReferenceExpression>> fields =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)),
+            Map.of(
+                "field", new ReferenceExpression("comment.data", STRING),
+                "path", new ReferenceExpression("comment", STRING)));
+    var nested = new NestedOperator(inputPlan, fields);
+
+    assertThat(
+        execute(nested),
+        contains(
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "a");
+                    put("comment.data", "1");
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "a");
+                    put("comment.data", "2");
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "a");
+                    put("comment.data", "3");
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "b");
+                    put("comment.data", "1");
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "b");
+                    put("comment.data", "2");
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "b");
+                    put("comment.data", "3");
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "c");
+                    put("comment.data", "1");
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "c");
+                    put("comment.data", "2");
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "c");
+                    put("comment.data", "3");
+                  }
+                })));
+  }
+
+  @Test
+  public void nested_two_nested_fields_with_same_path() {
+    when(inputPlan.hasNext()).thenReturn(true, false);
+    when(inputPlan.next()).thenReturn(testDataWithSamePath);
+
+    List<Map<String, ReferenceExpression>> fields =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)),
+            Map.of(
+                "field", new ReferenceExpression("message.id", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+    var nested = new NestedOperator(inputPlan, fields);
+
+    assertThat(
+        execute(nested),
+        contains(
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "a");
+                    put("message.id", "1");
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "b");
+                    put("message.id", "2");
+                  }
+                }),
+            tupleValue(
+                new LinkedHashMap<>() {
+                  {
+                    put("message.info", "c");
+                    put("message.id", "3");
+                  }
+                })));
+  }
+
+  @Test
+  public void non_nested_field_tests() {
+    when(inputPlan.hasNext()).thenReturn(true, false);
+    when(inputPlan.next()).thenReturn(nonNestedTestData);
+
+    Set<String> fields = Set.of("message");
+    Map<String, List<String>> groupedFieldsByPath = Map.of("message", List.of("message.info"));
+
+    var nested = new NestedOperator(inputPlan, fields, groupedFieldsByPath);
+    assertThat(
+        execute(nested), contains(tupleValue(new LinkedHashMap<>(Map.of("message", "val")))));
+  }
+
+  @Test
+  public void nested_missing_tuple_field() {
+    when(inputPlan.hasNext()).thenReturn(true, false);
+    when(inputPlan.next()).thenReturn(tupleValue(Map.of()));
+    Set<String> fields = Set.of("message.val");
+    Map<String, List<String>> groupedFieldsByPath = Map.of("message", List.of("message.val"));
+
+    var nested = new NestedOperator(inputPlan, fields, groupedFieldsByPath);
+    assertThat(
+        execute(nested),
+        contains(tupleValue(new LinkedHashMap<>(Map.of("message.val", ExprNullValue.of())))));
+  }
+
+  @Test
+  public void nested_missing_array_field() {
+    when(inputPlan.hasNext()).thenReturn(true, false);
+    when(inputPlan.next()).thenReturn(missingArrayData);
+    Set<String> fields = Set.of("missing.data");
+    Map<String, List<String>> groupedFieldsByPath = Map.of("message", List.of("message.data"));
+
+    var nested = new NestedOperator(inputPlan, fields, groupedFieldsByPath);
+    assertEquals(0, execute(nested).get(0).tupleValue().size());
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitorTest.java
index 735b914d3e..17fb128ace 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitorTest.java
@@ -3,22 +3,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.mock;
 import static org.opensearch.sql.data.type.ExprCoreType.DOUBLE;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.expression.DSL.named;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.agg;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.dedupe;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.eval;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.filter;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.limit;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.project;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.rareTopN;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.remove;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.rename;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.sort;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.takeOrdered;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.values;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.window;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
 import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.ast.tree.RareTopN.CommandType;
@@ -27,35 +49,29 @@
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.window.WindowDefinition;
 
-/**
- * Todo, testing purpose, delete later.
- */
+/** Todo, testing purpose, delete later. */
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class PhysicalPlanNodeVisitorTest extends PhysicalPlanTestBase {
-  @Mock
-  PhysicalPlan plan;
-  @Mock
-  ReferenceExpression ref;
+  @Mock PhysicalPlan plan;
+  @Mock ReferenceExpression ref;
 
   @Test
   public void print_physical_plan() {
     PhysicalPlan plan =
-        PhysicalPlanDSL.remove(
-            PhysicalPlanDSL.project(
-                PhysicalPlanDSL.rename(
-                    PhysicalPlanDSL.agg(
-                        PhysicalPlanDSL.rareTopN(
-                            PhysicalPlanDSL.filter(
-                                PhysicalPlanDSL.limit(
-                                    new TestScan(),
-                                    1, 1
-                                ),
+        remove(
+            project(
+                rename(
+                    agg(
+                        rareTopN(
+                            filter(
+                                limit(new TestScan(), 1, 1),
                                 DSL.equal(DSL.ref("response", INTEGER), DSL.literal(10))),
                             CommandType.TOP,
                             ImmutableList.of(),
                             DSL.ref("response", INTEGER)),
-                        ImmutableList
-                            .of(DSL.named("avg(response)", DSL.avg(DSL.ref("response", INTEGER)))),
+                        ImmutableList.of(
+                            DSL.named("avg(response)", DSL.avg(DSL.ref("response", INTEGER)))),
                         ImmutableList.of()),
                     ImmutableMap.of(DSL.ref("ivalue", INTEGER), DSL.ref("avg(response)", DOUBLE))),
                 named("ref", ref)),
@@ -73,71 +89,79 @@ public void print_physical_plan() {
         printer.print(plan));
   }
 
-  @Test
-  public void test_PhysicalPlanVisitor_should_return_null() {
+  public static Stream<Arguments> getPhysicalPlanForTest() {
+    PhysicalPlan plan = mock(PhysicalPlan.class);
+    ReferenceExpression ref = mock(ReferenceExpression.class);
+
     PhysicalPlan filter =
-        PhysicalPlanDSL.filter(
-            new TestScan(), DSL.equal(DSL.ref("response", INTEGER), DSL.literal(10)));
-    assertNull(filter.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
+        filter(new TestScan(), DSL.equal(DSL.ref("response", INTEGER), DSL.literal(10)));
 
     PhysicalPlan aggregation =
-        PhysicalPlanDSL.agg(
-            filter, ImmutableList.of(DSL.named("avg(response)",
-                DSL.avg(DSL.ref("response", INTEGER)))), ImmutableList.of());
-    assertNull(aggregation.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
+        agg(
+            filter,
+            ImmutableList.of(DSL.named("avg(response)", DSL.avg(DSL.ref("response", INTEGER)))),
+            ImmutableList.of());
 
     PhysicalPlan rename =
-        PhysicalPlanDSL.rename(
-            aggregation, ImmutableMap.of(DSL.ref("ivalue", INTEGER), DSL.ref("avg(response)",
-                DOUBLE)));
-    assertNull(rename.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    PhysicalPlan project = PhysicalPlanDSL.project(plan, named("ref", ref));
-    assertNull(project.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    PhysicalPlan window = PhysicalPlanDSL.window(plan, named(DSL.rowNumber()),
-        new WindowDefinition(emptyList(), emptyList()));
-    assertNull(window.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    PhysicalPlan remove = PhysicalPlanDSL.remove(plan, ref);
-    assertNull(remove.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    PhysicalPlan eval = PhysicalPlanDSL.eval(plan, Pair.of(ref, ref));
-    assertNull(eval.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    PhysicalPlan sort = PhysicalPlanDSL.sort(plan, Pair.of(SortOption.DEFAULT_ASC, ref));
-    assertNull(sort.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    PhysicalPlan dedupe = PhysicalPlanDSL.dedupe(plan, ref);
-    assertNull(dedupe.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    PhysicalPlan values = PhysicalPlanDSL.values(emptyList());
-    assertNull(values.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    PhysicalPlan rareTopN =
-        PhysicalPlanDSL.rareTopN(plan, CommandType.TOP, 5, ImmutableList.of(), ref);
-    assertNull(rareTopN.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
-
-    PhysicalPlan limit = PhysicalPlanDSL.limit(plan, 1, 1);
-    assertNull(limit.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
-    }, null));
+        rename(
+            aggregation,
+            ImmutableMap.of(DSL.ref("ivalue", INTEGER), DSL.ref("avg(response)", DOUBLE)));
+
+    PhysicalPlan project = project(plan, named("ref", ref));
+
+    PhysicalPlan window =
+        window(plan, named(DSL.rowNumber()), new WindowDefinition(emptyList(), emptyList()));
+
+    PhysicalPlan remove = remove(plan, ref);
+
+    PhysicalPlan eval = eval(plan, Pair.of(ref, ref));
+
+    PhysicalPlan sort = sort(plan, Pair.of(SortOption.DEFAULT_ASC, ref));
+
+    PhysicalPlan takeOrdered = takeOrdered(plan, 1, 1, Pair.of(SortOption.DEFAULT_ASC, ref));
+
+    PhysicalPlan dedupe = dedupe(plan, ref);
+
+    PhysicalPlan values = values(emptyList());
+
+    PhysicalPlan rareTopN = rareTopN(plan, CommandType.TOP, 5, ImmutableList.of(), ref);
+
+    PhysicalPlan limit = limit(plan, 1, 1);
+
+    Set<String> nestedArgs = Set.of("nested.test");
+    Map<String, List<String>> groupedFieldsByPath = Map.of("nested", List.of("nested.test"));
+    PhysicalPlan nested = new NestedOperator(plan, nestedArgs, groupedFieldsByPath);
+
+    PhysicalPlan cursorClose = new CursorCloseOperator(plan);
+
+    return Stream.of(
+        Arguments.of(filter, "filter"),
+        Arguments.of(aggregation, "aggregation"),
+        Arguments.of(rename, "rename"),
+        Arguments.of(project, "project"),
+        Arguments.of(window, "window"),
+        Arguments.of(remove, "remove"),
+        Arguments.of(eval, "eval"),
+        Arguments.of(sort, "sort"),
+        Arguments.of(takeOrdered, "takeOrdered"),
+        Arguments.of(dedupe, "dedupe"),
+        Arguments.of(values, "values"),
+        Arguments.of(rareTopN, "rareTopN"),
+        Arguments.of(limit, "limit"),
+        Arguments.of(nested, "nested"),
+        Arguments.of(cursorClose, "cursorClose"));
+  }
+
+  @ParameterizedTest(name = "{1}")
+  @MethodSource("getPhysicalPlanForTest")
+  public void test_PhysicalPlanVisitor_should_return_null(PhysicalPlan plan, String name) {
+    assertNull(plan.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {}, null));
   }
 
   @Test
   public void test_visitMLCommons() {
     PhysicalPlanNodeVisitor physicalPlanNodeVisitor =
-            new PhysicalPlanNodeVisitor<Integer, Object>() {};
+        new PhysicalPlanNodeVisitor<Integer, Object>() {};
 
     assertNull(physicalPlanNodeVisitor.visitMLCommons(plan, null));
   }
@@ -145,7 +169,7 @@ public void test_visitMLCommons() {
   @Test
   public void test_visitAD() {
     PhysicalPlanNodeVisitor physicalPlanNodeVisitor =
-            new PhysicalPlanNodeVisitor<Integer, Object>() {};
+        new PhysicalPlanNodeVisitor<Integer, Object>() {};
 
     assertNull(physicalPlanNodeVisitor.visitAD(plan, null));
   }
@@ -153,7 +177,7 @@ public void test_visitAD() {
   @Test
   public void test_visitML() {
     PhysicalPlanNodeVisitor physicalPlanNodeVisitor =
-            new PhysicalPlanNodeVisitor<Integer, Object>() {};
+        new PhysicalPlanNodeVisitor<Integer, Object>() {};
 
     assertNull(physicalPlanNodeVisitor.visitML(plan, null));
   }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanTest.java
index 0a93c96bbb..d63ab35773 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanTest.java
@@ -8,6 +8,8 @@
 import static org.mockito.Mockito.verify;
 
 import java.util.List;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -16,37 +18,37 @@
 import org.opensearch.sql.storage.split.Split;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class PhysicalPlanTest {
-  @Mock
-  Split split;
-
-  @Mock
-  PhysicalPlan child;
-
-  private PhysicalPlan testPlan = new PhysicalPlan() {
-    @Override
-    public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasNext() {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ExprValue next() {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<PhysicalPlan> getChild() {
-      return List.of(child);
-    }
-  };
+  @Mock Split split;
+
+  @Mock PhysicalPlan child;
+
+  private PhysicalPlan testPlan =
+      new PhysicalPlan() {
+        @Override
+        public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
+          throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean hasNext() {
+          throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ExprValue next() {
+          throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public List<PhysicalPlan> getChild() {
+          return List.of(child);
+        }
+      };
 
   @Test
-  void addSplitToChildByDefault() {
+  void add_split_to_child_by_default() {
     testPlan.add(split);
     verify(child).add(split);
   }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanTestBase.java b/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanTestBase.java
index 97bf8ebb79..003e59959f 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanTestBase.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanTestBase.java
@@ -3,11 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -22,51 +24,75 @@
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.env.Environment;
-import org.springframework.context.annotation.Bean;
+import org.opensearch.sql.planner.SerializablePlan;
 
 public class PhysicalPlanTestBase {
 
-  protected static final List<ExprValue> countTestInputs = new ImmutableList.Builder<ExprValue>()
-          .add(ExprValueUtils.tupleValue(ImmutableMap
-                  .of("id", 1, "testString", "asdf")))
-          .add(ExprValueUtils.tupleValue(ImmutableMap
-                  .of("id", 2, "testString", "asdf")))
-          .add(ExprValueUtils.tupleValue(ImmutableMap
-                  .of("id", 3, "testString", "asdf")))
-          .add(ExprValueUtils.tupleValue(ImmutableMap
-                  .of("id", 4, "testString", "asdf")))
-          .add(ExprValueUtils.tupleValue(ImmutableMap
-                  .of("id", 5, "testString", "asdf")))
-          .add(ExprValueUtils.tupleValue(ImmutableMap
-                  .of("id", 6, "testString", "asdf")))
-          .add(ExprValueUtils.tupleValue(ImmutableMap
-                  .of("id", 7, "testString", "asdf")))
-          .add(ExprValueUtils.tupleValue(ImmutableMap
-                  .of("id", 8, "testString", "asdf")))
-          .add(ExprValueUtils.tupleValue(ImmutableMap
-                  .of("id", 9, "testString", "asdf")))
-          .add(ExprValueUtils.tupleValue(ImmutableMap
-                  .of("id", 10, "testString", "asdf")))
-          .add(ExprValueUtils.tupleValue(ImmutableMap
-                  .of("id", 11, "testString", "asdf")))
+  protected static final List<ExprValue> countTestInputs =
+      new ImmutableList.Builder<ExprValue>()
+          .add(ExprValueUtils.tupleValue(ImmutableMap.of("id", 1, "testString", "asdf")))
+          .add(ExprValueUtils.tupleValue(ImmutableMap.of("id", 2, "testString", "asdf")))
+          .add(ExprValueUtils.tupleValue(ImmutableMap.of("id", 3, "testString", "asdf")))
+          .add(ExprValueUtils.tupleValue(ImmutableMap.of("id", 4, "testString", "asdf")))
+          .add(ExprValueUtils.tupleValue(ImmutableMap.of("id", 5, "testString", "asdf")))
+          .add(ExprValueUtils.tupleValue(ImmutableMap.of("id", 6, "testString", "asdf")))
+          .add(ExprValueUtils.tupleValue(ImmutableMap.of("id", 7, "testString", "asdf")))
+          .add(ExprValueUtils.tupleValue(ImmutableMap.of("id", 8, "testString", "asdf")))
+          .add(ExprValueUtils.tupleValue(ImmutableMap.of("id", 9, "testString", "asdf")))
+          .add(ExprValueUtils.tupleValue(ImmutableMap.of("id", 10, "testString", "asdf")))
+          .add(ExprValueUtils.tupleValue(ImmutableMap.of("id", 11, "testString", "asdf")))
           .build();
 
-  protected static final List<ExprValue> inputs = new ImmutableList.Builder<ExprValue>()
-      .add(ExprValueUtils.tupleValue(ImmutableMap
-          .of("ip", "209.160.24.63", "action", "GET", "response", 200, "referer",
-              "www.amazon.com")))
-      .add(ExprValueUtils.tupleValue(ImmutableMap
-          .of("ip", "209.160.24.63", "action", "GET", "response", 404, "referer",
-              "www.amazon.com")))
-      .add(ExprValueUtils.tupleValue(ImmutableMap
-          .of("ip", "112.111.162.4", "action", "GET", "response", 200, "referer",
-              "www.amazon.com")))
-      .add(ExprValueUtils.tupleValue(ImmutableMap
-          .of("ip", "74.125.19.106", "action", "POST", "response", 200, "referer",
-              "www.google.com")))
-      .add(ExprValueUtils
-          .tupleValue(ImmutableMap.of("ip", "74.125.19.106", "action", "POST", "response", 500)))
-      .build();
+  protected static final List<ExprValue> inputs =
+      new ImmutableList.Builder<ExprValue>()
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "ip",
+                      "209.160.24.63",
+                      "action",
+                      "GET",
+                      "response",
+                      200,
+                      "referer",
+                      "www.amazon.com")))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "ip",
+                      "209.160.24.63",
+                      "action",
+                      "GET",
+                      "response",
+                      404,
+                      "referer",
+                      "www.amazon.com")))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "ip",
+                      "112.111.162.4",
+                      "action",
+                      "GET",
+                      "response",
+                      200,
+                      "referer",
+                      "www.amazon.com")))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "ip",
+                      "74.125.19.106",
+                      "action",
+                      "POST",
+                      "response",
+                      200,
+                      "referer",
+                      "www.google.com")))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of("ip", "74.125.19.106", "action", "POST", "response", 500)))
+          .build();
 
   private static Map<String, ExprCoreType> typeMapping =
       new ImmutableMap.Builder<String, ExprCoreType>()
@@ -76,114 +102,173 @@ public class PhysicalPlanTestBase {
           .put("referer", ExprCoreType.STRING)
           .build();
 
-  protected static final List<ExprValue> dateInputs = new ImmutableList.Builder<ExprValue>()
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-03"),
-          "month", new ExprDateValue("2021-02-04"),
-          "quarter", new ExprDatetimeValue("2021-01-01 12:25:02"),
-          "year", new ExprTimestampValue("2013-01-01 12:25:02"))))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-01"),
-          "month", new ExprDateValue("2021-03-17"),
-          "quarter", new ExprDatetimeValue("2021-05-17 12:25:01"),
-          "year", new ExprTimestampValue("2021-01-01 12:25:02"))))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-04"),
-          "month", new ExprDateValue("2021-02-08"),
-          "quarter", new ExprDatetimeValue("2021-06-08 12:25:02"),
-          "year", new ExprTimestampValue("2016-01-01 12:25:02"))))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-02"),
-          "month", new ExprDateValue("2020-12-12"),
-          "quarter", new ExprDatetimeValue("2020-12-12 12:25:03"),
-          "year", new ExprTimestampValue("1999-01-01 12:25:02"))))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-01"),
-          "month", new ExprDateValue("2021-02-28"),
-          "quarter", new ExprDatetimeValue("2020-09-28 12:25:01"),
-          "year", new ExprTimestampValue("2018-01-01 12:25:02"))))
-      .build();
-
-  protected static final List<ExprValue> datetimeInputs = new ImmutableList.Builder<ExprValue>()
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "hour", new ExprTimeValue("17:17:00"),
-          "minute", new ExprDatetimeValue("2020-12-31 23:54:12"),
-          "second", new ExprTimestampValue("2021-01-01 00:00:05"))))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "hour", new ExprTimeValue("18:17:00"),
-          "minute", new ExprDatetimeValue("2021-01-01 00:05:12"),
-          "second", new ExprTimestampValue("2021-01-01 00:00:12"))))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "hour", new ExprTimeValue("17:15:00"),
-          "minute", new ExprDatetimeValue("2021-01-01 00:03:12"),
-          "second", new ExprTimestampValue("2021-01-01 00:00:17"))))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "hour", new ExprTimeValue("19:01:00"),
-          "minute", new ExprDatetimeValue("2021-01-01 00:02:12"),
-          "second", new ExprTimestampValue("2021-01-01 00:00:03"))))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "hour", new ExprTimeValue("18:50:00"),
-          "minute", new ExprDatetimeValue("2021-01-01 00:00:12"),
-          "second", new ExprTimestampValue("2021-01-01 00:00:13"))))
-      .build();
-
-  protected static final List<ExprValue> numericInputs = new ImmutableList.Builder<ExprValue>()
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "integer", 2,
-          "long", 2L,
-          "float", 2F,
-          "double", 2D)))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "integer", 1,
-          "long", 1L,
-          "float", 1F,
-          "double", 1D)))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "integer", 5,
-          "long", 5L,
-          "float", 5F,
-          "double", 5D)))
-      .build();
-
-  protected static final List<ExprValue> compoundInputs = new ImmutableList.Builder<ExprValue>()
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-03"),
-          "region", "iad",
-          "host", "h1",
-          "errors", 2)))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-03"),
-          "region", "iad",
-          "host", "h2",
-          "errors", 3)))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-04"),
-          "region", "iad",
-          "host", "h1",
-          "errors", 1)))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-04"),
-          "region", "iad",
-          "host", "h2",
-          "errors", 10)))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-06"),
-          "region", "iad",
-          "host", "h1",
-          "errors", 1)))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-07"),
-          "region", "iad",
-          "host", "h1",
-          "errors", 6)))
-      .add(ExprValueUtils.tupleValue(ImmutableMap.of(
-          "day", new ExprDateValue("2021-01-07"),
-          "region", "iad",
-          "host", "h2",
-          "errors", 8)))
-      .build();
-
-  @Bean
+  protected static final List<ExprValue> dateInputs =
+      new ImmutableList.Builder<ExprValue>()
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day", new ExprDateValue("2021-01-03"),
+                      "month", new ExprDateValue("2021-02-04"),
+                      "quarter", new ExprDatetimeValue("2021-01-01 12:25:02"),
+                      "year", new ExprTimestampValue("2013-01-01 12:25:02"))))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day", new ExprDateValue("2021-01-01"),
+                      "month", new ExprDateValue("2021-03-17"),
+                      "quarter", new ExprDatetimeValue("2021-05-17 12:25:01"),
+                      "year", new ExprTimestampValue("2021-01-01 12:25:02"))))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day", new ExprDateValue("2021-01-04"),
+                      "month", new ExprDateValue("2021-02-08"),
+                      "quarter", new ExprDatetimeValue("2021-06-08 12:25:02"),
+                      "year", new ExprTimestampValue("2016-01-01 12:25:02"))))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day", new ExprDateValue("2021-01-02"),
+                      "month", new ExprDateValue("2020-12-12"),
+                      "quarter", new ExprDatetimeValue("2020-12-12 12:25:03"),
+                      "year", new ExprTimestampValue("1999-01-01 12:25:02"))))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day", new ExprDateValue("2021-01-01"),
+                      "month", new ExprDateValue("2021-02-28"),
+                      "quarter", new ExprDatetimeValue("2020-09-28 12:25:01"),
+                      "year", new ExprTimestampValue("2018-01-01 12:25:02"))))
+          .build();
+
+  protected static final List<ExprValue> datetimeInputs =
+      new ImmutableList.Builder<ExprValue>()
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "hour", new ExprTimeValue("17:17:00"),
+                      "minute", new ExprDatetimeValue("2020-12-31 23:54:12"),
+                      "second", new ExprTimestampValue("2021-01-01 00:00:05"))))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "hour", new ExprTimeValue("18:17:00"),
+                      "minute", new ExprDatetimeValue("2021-01-01 00:05:12"),
+                      "second", new ExprTimestampValue("2021-01-01 00:00:12"))))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "hour", new ExprTimeValue("17:15:00"),
+                      "minute", new ExprDatetimeValue("2021-01-01 00:03:12"),
+                      "second", new ExprTimestampValue("2021-01-01 00:00:17"))))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "hour", new ExprTimeValue("19:01:00"),
+                      "minute", new ExprDatetimeValue("2021-01-01 00:02:12"),
+                      "second", new ExprTimestampValue("2021-01-01 00:00:03"))))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "hour", new ExprTimeValue("18:50:00"),
+                      "minute", new ExprDatetimeValue("2021-01-01 00:00:12"),
+                      "second", new ExprTimestampValue("2021-01-01 00:00:13"))))
+          .build();
+
+  protected static final List<ExprValue> numericInputs =
+      new ImmutableList.Builder<ExprValue>()
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of("integer", 2, "long", 2L, "float", 2F, "double", 2D)))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of("integer", 1, "long", 1L, "float", 1F, "double", 1D)))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of("integer", 5, "long", 5L, "float", 5F, "double", 5D)))
+          .build();
+
+  protected static final List<ExprValue> compoundInputs =
+      new ImmutableList.Builder<ExprValue>()
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day",
+                      new ExprDateValue("2021-01-03"),
+                      "region",
+                      "iad",
+                      "host",
+                      "h1",
+                      "errors",
+                      2)))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day",
+                      new ExprDateValue("2021-01-03"),
+                      "region",
+                      "iad",
+                      "host",
+                      "h2",
+                      "errors",
+                      3)))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day",
+                      new ExprDateValue("2021-01-04"),
+                      "region",
+                      "iad",
+                      "host",
+                      "h1",
+                      "errors",
+                      1)))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day",
+                      new ExprDateValue("2021-01-04"),
+                      "region",
+                      "iad",
+                      "host",
+                      "h2",
+                      "errors",
+                      10)))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day",
+                      new ExprDateValue("2021-01-06"),
+                      "region",
+                      "iad",
+                      "host",
+                      "h1",
+                      "errors",
+                      1)))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day",
+                      new ExprDateValue("2021-01-07"),
+                      "region",
+                      "iad",
+                      "host",
+                      "h1",
+                      "errors",
+                      6)))
+          .add(
+              ExprValueUtils.tupleValue(
+                  ImmutableMap.of(
+                      "day",
+                      new ExprDateValue("2021-01-07"),
+                      "region",
+                      "iad",
+                      "host",
+                      "h2",
+                      "errors",
+                      8)))
+          .build();
+
   protected Environment<Expression, ExprCoreType> typeEnv() {
     return var -> {
       if (var instanceof ReferenceExpression) {
@@ -210,7 +295,7 @@ protected static PhysicalPlan testScan(List<ExprValue> inputs) {
     return new TestScan(inputs);
   }
 
-  protected static class TestScan extends PhysicalPlan {
+  protected static class TestScan extends PhysicalPlan implements SerializablePlan {
     private final Iterator<ExprValue> iterator;
 
     public TestScan() {
@@ -240,5 +325,19 @@ public boolean hasNext() {
     public ExprValue next() {
       return iterator.next();
     }
+
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {}
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {}
+
+    public boolean equals(final Object o) {
+      return o == this || o.hashCode() == hashCode();
+    }
+
+    public int hashCode() {
+      return 42;
+    }
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/ProjectOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/ProjectOperatorTest.java
index 24be5eb2b8..ded8605cf0 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/ProjectOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/ProjectOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -11,6 +10,7 @@
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.Matchers.iterableWithSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_MISSING;
 import static org.opensearch.sql.data.model.ExprValueUtils.stringValue;
@@ -20,7 +20,12 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.util.List;
+import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -30,11 +35,12 @@
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.utils.TestOperator;
 
 @ExtendWith(MockitoExtension.class)
 class ProjectOperatorTest extends PhysicalPlanTestBase {
 
-  @Mock
+  @Mock(serializable = true)
   private PhysicalPlan inputPlan;
 
   @Test
@@ -57,9 +63,11 @@ public void project_two_field_follow_the_project_order() {
     when(inputPlan.hasNext()).thenReturn(true, false);
     when(inputPlan.next())
         .thenReturn(ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "response", 200)));
-    PhysicalPlan plan = project(inputPlan,
-        DSL.named("response", DSL.ref("response", INTEGER)),
-        DSL.named("action", DSL.ref("action", STRING)));
+    PhysicalPlan plan =
+        project(
+            inputPlan,
+            DSL.named("response", DSL.ref("response", INTEGER)),
+            DSL.named("action", DSL.ref("action", STRING)));
     List<ExprValue> result = execute(plan);
 
     assertThat(
@@ -76,9 +84,11 @@ public void project_keep_missing_value() {
     when(inputPlan.next())
         .thenReturn(ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "response", 200)))
         .thenReturn(ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST")));
-    PhysicalPlan plan = project(inputPlan,
-        DSL.named("response", DSL.ref("response", INTEGER)),
-        DSL.named("action", DSL.ref("action", STRING)));
+    PhysicalPlan plan =
+        project(
+            inputPlan,
+            DSL.named("response", DSL.ref("response", INTEGER)),
+            DSL.named("action", DSL.ref("action", STRING)));
     List<ExprValue> result = execute(plan);
 
     assertThat(
@@ -87,21 +97,23 @@ public void project_keep_missing_value() {
             iterableWithSize(2),
             hasItems(
                 ExprValueUtils.tupleValue(ImmutableMap.of("response", 200, "action", "GET")),
-                ExprTupleValue.fromExprValueMap(ImmutableMap.of("response",
-                    LITERAL_MISSING,
-                    "action", stringValue("POST"))))));
+                ExprTupleValue.fromExprValueMap(
+                    ImmutableMap.of("response", LITERAL_MISSING, "action", stringValue("POST"))))));
   }
 
   @Test
   public void project_schema() {
-    PhysicalPlan project = project(inputPlan,
-        DSL.named("response", DSL.ref("response", INTEGER)),
-        DSL.named("action", DSL.ref("action", STRING), "act"));
-
-    assertThat(project.schema().getColumns(), contains(
-        new ExecutionEngine.Schema.Column("response", null, INTEGER),
-        new ExecutionEngine.Schema.Column("action", "act", STRING)
-    ));
+    PhysicalPlan project =
+        project(
+            inputPlan,
+            DSL.named("response", DSL.ref("response", INTEGER)),
+            DSL.named("action", DSL.ref("action", STRING), "act"));
+
+    assertThat(
+        project.schema().getColumns(),
+        contains(
+            new ExecutionEngine.Schema.Column("response", null, INTEGER),
+            new ExecutionEngine.Schema.Column("action", "act", STRING)));
   }
 
   @Test
@@ -110,16 +122,24 @@ public void project_fields_with_parse_expressions() {
     when(inputPlan.next())
         .thenReturn(ExprValueUtils.tupleValue(ImmutableMap.of("response", "GET 200")));
     PhysicalPlan plan =
-        project(inputPlan, ImmutableList.of(DSL.named("action", DSL.ref("action", STRING)),
+        project(
+            inputPlan,
+            ImmutableList.of(
+                DSL.named("action", DSL.ref("action", STRING)),
                 DSL.named("response", DSL.ref("response", STRING))),
-            ImmutableList.of(DSL.named("action",
-                DSL.regex(DSL.ref("response", STRING),
-                    DSL.literal("(?<action>\\w+) (?<response>\\d+)"),
-                    DSL.literal("action"))), DSL.named("response",
-                DSL.regex(DSL.ref("response", STRING),
-                    DSL.literal("(?<action>\\w+) (?<response>\\d+)"),
-                    DSL.literal("response"))))
-        );
+            ImmutableList.of(
+                DSL.named(
+                    "action",
+                    DSL.regex(
+                        DSL.ref("response", STRING),
+                        DSL.literal("(?<action>\\w+) (?<response>\\d+)"),
+                        DSL.literal("action"))),
+                DSL.named(
+                    "response",
+                    DSL.regex(
+                        DSL.ref("response", STRING),
+                        DSL.literal("(?<action>\\w+) (?<response>\\d+)"),
+                        DSL.literal("response")))));
     List<ExprValue> result = execute(plan);
 
     assertThat(
@@ -136,20 +156,23 @@ public void project_fields_with_unused_parse_expressions() {
     when(inputPlan.next())
         .thenReturn(ExprValueUtils.tupleValue(ImmutableMap.of("response", "GET 200")));
     PhysicalPlan plan =
-        project(inputPlan, ImmutableList.of(DSL.named("response", DSL.ref("response", STRING))),
-            ImmutableList.of(DSL.named("ignored",
-                DSL.regex(DSL.ref("response", STRING),
-                    DSL.literal("(?<action>\\w+) (?<ignored>\\d+)"),
-                    DSL.literal("ignored"))))
-        );
+        project(
+            inputPlan,
+            ImmutableList.of(DSL.named("response", DSL.ref("response", STRING))),
+            ImmutableList.of(
+                DSL.named(
+                    "ignored",
+                    DSL.regex(
+                        DSL.ref("response", STRING),
+                        DSL.literal("(?<action>\\w+) (?<ignored>\\d+)"),
+                        DSL.literal("ignored")))));
     List<ExprValue> result = execute(plan);
 
     assertThat(
         result,
         allOf(
             iterableWithSize(1),
-            hasItems(
-                ExprValueUtils.tupleValue(ImmutableMap.of("response", "GET 200")))));
+            hasItems(ExprValueUtils.tupleValue(ImmutableMap.of("response", "GET 200")))));
   }
 
   @Test
@@ -159,14 +182,19 @@ public void project_fields_with_parse_expressions_and_runtime_fields() {
         .thenReturn(
             ExprValueUtils.tupleValue(ImmutableMap.of("response", "GET 200", "eval_field", 1)));
     PhysicalPlan plan =
-        project(inputPlan, ImmutableList.of(DSL.named("response", DSL.ref("response", STRING)),
+        project(
+            inputPlan,
+            ImmutableList.of(
+                DSL.named("response", DSL.ref("response", STRING)),
                 DSL.named("action", DSL.ref("action", STRING)),
                 DSL.named("eval_field", DSL.ref("eval_field", INTEGER))),
-            ImmutableList.of(DSL.named("action",
-                DSL.regex(DSL.ref("response", STRING),
-                    DSL.literal("(?<action>\\w+) (?<response>\\d+)"),
-                    DSL.literal("action"))))
-        );
+            ImmutableList.of(
+                DSL.named(
+                    "action",
+                    DSL.regex(
+                        DSL.ref("response", STRING),
+                        DSL.literal("(?<action>\\w+) (?<response>\\d+)"),
+                        DSL.literal("action")))));
     List<ExprValue> result = execute(plan);
 
     assertThat(
@@ -186,16 +214,24 @@ public void project_parse_missing_will_fallback() {
             ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "response", "GET 200")))
         .thenReturn(ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST")));
     PhysicalPlan plan =
-        project(inputPlan, ImmutableList.of(DSL.named("action", DSL.ref("action", STRING)),
+        project(
+            inputPlan,
+            ImmutableList.of(
+                DSL.named("action", DSL.ref("action", STRING)),
                 DSL.named("response", DSL.ref("response", STRING))),
-            ImmutableList.of(DSL.named("action",
-                DSL.regex(DSL.ref("response", STRING),
-                    DSL.literal("(?<action>\\w+) (?<response>\\d+)"),
-                    DSL.literal("action"))), DSL.named("response",
-                DSL.regex(DSL.ref("response", STRING),
-                    DSL.literal("(?<action>\\w+) (?<response>\\d+)"),
-                    DSL.literal("response"))))
-        );
+            ImmutableList.of(
+                DSL.named(
+                    "action",
+                    DSL.regex(
+                        DSL.ref("response", STRING),
+                        DSL.literal("(?<action>\\w+) (?<response>\\d+)"),
+                        DSL.literal("action"))),
+                DSL.named(
+                    "response",
+                    DSL.regex(
+                        DSL.ref("response", STRING),
+                        DSL.literal("(?<action>\\w+) (?<response>\\d+)"),
+                        DSL.literal("response")))));
     List<ExprValue> result = execute(plan);
 
     assertThat(
@@ -206,4 +242,21 @@ public void project_parse_missing_will_fallback() {
                 ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "response", "200")),
                 ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST")))));
   }
+
+  @Test
+  @SneakyThrows
+  public void serializable() {
+    var projects = List.of(DSL.named("action", DSL.ref("action", STRING)));
+    var project = new ProjectOperator(new TestOperator(), projects, List.of());
+
+    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    ObjectOutputStream objectOutput = new ObjectOutputStream(output);
+    objectOutput.writeObject(project);
+    objectOutput.flush();
+
+    ObjectInputStream objectInput =
+        new ObjectInputStream(new ByteArrayInputStream(output.toByteArray()));
+    var roundTripPlan = (ProjectOperator) objectInput.readObject();
+    assertEquals(project, roundTripPlan);
+  }
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/RareTopNOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/RareTopNOperatorTest.java
index 5a77bf7f66..e252c41d1f 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/RareTopNOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/RareTopNOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -24,74 +23,87 @@ public class RareTopNOperatorTest extends PhysicalPlanTestBase {
 
   @Test
   public void rare_without_group() {
-    PhysicalPlan plan = new RareTopNOperator(new TestScan(),
-        CommandType.RARE,
-        Collections.singletonList(DSL.ref("action", ExprCoreType.STRING)),
-        Collections.emptyList());
+    PhysicalPlan plan =
+        new RareTopNOperator(
+            new TestScan(),
+            CommandType.RARE,
+            Collections.singletonList(DSL.ref("action", ExprCoreType.STRING)),
+            Collections.emptyList());
     List<ExprValue> result = execute(plan);
     assertEquals(2, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST")),
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET"))
-    ));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST")),
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET"))));
   }
 
   @Test
   public void rare_with_group() {
-    PhysicalPlan plan = new RareTopNOperator(new TestScan(),
-        CommandType.RARE,
-        Collections.singletonList(DSL.ref("response", ExprCoreType.INTEGER)),
-        Collections.singletonList(DSL.ref("action", ExprCoreType.STRING)));
+    PhysicalPlan plan =
+        new RareTopNOperator(
+            new TestScan(),
+            CommandType.RARE,
+            Collections.singletonList(DSL.ref("response", ExprCoreType.INTEGER)),
+            Collections.singletonList(DSL.ref("action", ExprCoreType.STRING)));
     List<ExprValue> result = execute(plan);
     assertEquals(4, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "response", 200)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "response", 500)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "response", 404)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "response", 200))
-    ));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "response", 200)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "response", 500)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "response", 404)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "response", 200))));
   }
 
   @Test
   public void top_without_group() {
-    PhysicalPlan plan = new RareTopNOperator(new TestScan(),
-        CommandType.TOP,
-        Collections.singletonList(DSL.ref("action", ExprCoreType.STRING)),
-        Collections.emptyList());
+    PhysicalPlan plan =
+        new RareTopNOperator(
+            new TestScan(),
+            CommandType.TOP,
+            Collections.singletonList(DSL.ref("action", ExprCoreType.STRING)),
+            Collections.emptyList());
     List<ExprValue> result = execute(plan);
     assertEquals(2, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET")),
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST"))
-    ));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET")),
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST"))));
   }
 
   @Test
   public void top_n_without_group() {
-    PhysicalPlan plan = new RareTopNOperator(new TestScan(),
-        CommandType.TOP,
-        1,
-        Collections.singletonList(DSL.ref("action", ExprCoreType.STRING)),
-        Collections.emptyList());
+    PhysicalPlan plan =
+        new RareTopNOperator(
+            new TestScan(),
+            CommandType.TOP,
+            1,
+            Collections.singletonList(DSL.ref("action", ExprCoreType.STRING)),
+            Collections.emptyList());
     List<ExprValue> result = execute(plan);
     assertEquals(1, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET"))
-    ));
+    assertThat(
+        result, containsInAnyOrder(ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET"))));
   }
 
   @Test
   public void top_n_with_group() {
-    PhysicalPlan plan = new RareTopNOperator(new TestScan(),
-        CommandType.TOP,
-        1,
-        Collections.singletonList(DSL.ref("response", ExprCoreType.INTEGER)),
-        Collections.singletonList(DSL.ref("action", ExprCoreType.STRING)));
+    PhysicalPlan plan =
+        new RareTopNOperator(
+            new TestScan(),
+            CommandType.TOP,
+            1,
+            Collections.singletonList(DSL.ref("response", ExprCoreType.INTEGER)),
+            Collections.singletonList(DSL.ref("action", ExprCoreType.STRING)));
     List<ExprValue> result = execute(plan);
     assertEquals(2, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "response", 200)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "response", 200))
-    ));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "response", 200)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "response", 200))));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/RemoveOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/RemoveOperatorTest.java
index bf046bf0a6..6ba5d3fba8 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/RemoveOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/RemoveOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -29,8 +28,7 @@
 
 @ExtendWith(MockitoExtension.class)
 class RemoveOperatorTest extends PhysicalPlanTestBase {
-  @Mock
-  private PhysicalPlan inputPlan;
+  @Mock private PhysicalPlan inputPlan;
 
   @Test
   public void remove_one_field() {
@@ -113,12 +111,11 @@ public void remove_nothing_with_none_tuple_value() {
 
   @Test
   public void invalid_to_retrieve_schema_from_remove() {
-    PhysicalPlan plan = remove(inputPlan, DSL.ref("response", STRING), DSL.ref("referer", STRING));
+    PhysicalPlan plan = remove(inputPlan);
     IllegalStateException exception =
         assertThrows(IllegalStateException.class, () -> plan.schema());
     assertEquals(
-        "[BUG] schema can been only applied to ProjectOperator, "
-            + "instead of RemoveOperator(input=inputPlan, removeList=[response, referer])",
+        "[BUG] schema can been only applied to ProjectOperator, instead of RemoveOperator",
         exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/RenameOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/RenameOperatorTest.java
index a0da659a38..807d8b8836 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/RenameOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/RenameOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -27,34 +26,34 @@
 
 @ExtendWith(MockitoExtension.class)
 public class RenameOperatorTest extends PhysicalPlanTestBase {
-  @Mock
-  private PhysicalPlan inputPlan;
+  @Mock private PhysicalPlan inputPlan;
 
   @Test
   public void avg_aggregation_rename() {
-    PhysicalPlan plan = new RenameOperator(
-        new AggregationOperator(new TestScan(),
-            Collections
-                .singletonList(DSL.named("avg(response)", DSL.avg(DSL.ref("response", INTEGER)))),
-            Collections.singletonList(DSL.named("action", DSL.ref("action", STRING)))),
-        ImmutableMap.of(DSL.ref("avg(response)", DOUBLE), DSL.ref("avg", DOUBLE))
-    );
+    PhysicalPlan plan =
+        new RenameOperator(
+            new AggregationOperator(
+                new TestScan(),
+                Collections.singletonList(
+                    DSL.named("avg(response)", DSL.avg(DSL.ref("response", INTEGER)))),
+                Collections.singletonList(DSL.named("action", DSL.ref("action", STRING)))),
+            ImmutableMap.of(DSL.ref("avg(response)", DOUBLE), DSL.ref("avg", DOUBLE)));
     List<ExprValue> result = execute(plan);
     assertEquals(2, result.size());
-    assertThat(result, containsInAnyOrder(
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "avg", 268d)),
-        ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "avg", 350d))
-    ));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "GET", "avg", 268d)),
+            ExprValueUtils.tupleValue(ImmutableMap.of("action", "POST", "avg", 350d))));
   }
 
   @Test
   public void rename_int_value() {
     when(inputPlan.hasNext()).thenReturn(true, false);
     when(inputPlan.next()).thenReturn(ExprValueUtils.integerValue(1));
-    PhysicalPlan plan = new RenameOperator(
-        inputPlan,
-        ImmutableMap.of(DSL.ref("avg(response)", DOUBLE), DSL.ref("avg", DOUBLE))
-    );
+    PhysicalPlan plan =
+        new RenameOperator(
+            inputPlan, ImmutableMap.of(DSL.ref("avg(response)", DOUBLE), DSL.ref("avg", DOUBLE)));
     List<ExprValue> result = execute(plan);
     assertEquals(1, result.size());
     assertThat(result, containsInAnyOrder(ExprValueUtils.integerValue(1)));
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/SortOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/SortOperatorTest.java
index ef9bdfbca4..f9a44be3ab 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/SortOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/SortOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -27,8 +26,7 @@
 
 @ExtendWith(MockitoExtension.class)
 class SortOperatorTest extends PhysicalPlanTestBase {
-  @Mock
-  private PhysicalPlan inputPlan;
+  @Mock private PhysicalPlan inputPlan;
 
   /**
    * construct the map which contain null value, because {@link ImmutableMap} doesn't support null
@@ -264,7 +262,6 @@ public void sort_one_field_without_input() {
 
     assertEquals(
         0,
-        execute(sort(inputPlan,
-            Pair.of(SortOption.DEFAULT_ASC, ref("response", INTEGER)))).size());
+        execute(sort(inputPlan, Pair.of(SortOption.DEFAULT_ASC, ref("response", INTEGER)))).size());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/TakeOrderedOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/TakeOrderedOperatorTest.java
new file mode 100644
index 0000000000..f2fcb84910
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/TakeOrderedOperatorTest.java
@@ -0,0 +1,607 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.planner.physical;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.data.model.ExprValueUtils.tupleValue;
+import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+import static org.opensearch.sql.expression.DSL.ref;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.limit;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.sort;
+import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.takeOrdered;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.ast.tree.Sort.SortOption;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.Expression;
+
+/**
+ * To make sure {@link TakeOrderedOperator} can replace {@link SortOperator} + {@link
+ * LimitOperator}, this UT will replica all tests in {@link SortOperatorTest} and add more test
+ * cases on different limit and offset.
+ */
+@ExtendWith(MockitoExtension.class)
+class TakeOrderedOperatorTest extends PhysicalPlanTestBase {
+  private static PhysicalPlan inputPlan;
+
+  @Getter
+  @Setter
+  private static class Wrapper {
+    Iterator<ExprValue> iterator = Collections.emptyIterator();
+  }
+
+  private static final Wrapper wrapper = new Wrapper();
+
+  @BeforeAll
+  public static void setUp() {
+    inputPlan = Mockito.mock(PhysicalPlan.class);
+    when(inputPlan.hasNext())
+        .thenAnswer((InvocationOnMock invocation) -> wrapper.iterator.hasNext());
+    when(inputPlan.next()).thenAnswer((InvocationOnMock invocation) -> wrapper.iterator.next());
+  }
+
+  /**
+   * construct the map which contain null value, because {@link ImmutableMap} doesn't support null
+   * value.
+   */
+  private static final Map<String, Object> NULL_MAP =
+      new HashMap<>() {
+        {
+          put("size", 399);
+          put("response", null);
+        }
+      };
+
+  @Test
+  public void sort_one_field_asc() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    List<Pair<SortOption, Expression>> sortList =
+        List.of(Pair.of(SortOption.DEFAULT_ASC, ref("response", INTEGER)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        3,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        2,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        2,
+        1,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(inputList, 0, 1, sortList);
+  }
+
+  @Test
+  public void sort_one_field_with_duplication() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    List<Pair<SortOption, Expression>> sortList =
+        List.of(Pair.of(SortOption.DEFAULT_ASC, ref("response", INTEGER)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        3,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 320, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        2,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 320, "response", 404)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        2,
+        1,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 320, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(inputList, 0, 1, sortList);
+  }
+
+  @Test
+  public void sort_one_field_asc_with_null_value() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+            tupleValue(NULL_MAP));
+
+    List<Pair<SortOption, Expression>> sortList =
+        List.of(Pair.of(SortOption.DEFAULT_ASC, ref("response", INTEGER)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        0,
+        sortList,
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        3,
+        0,
+        sortList,
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        3,
+        1,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(inputList, 0, 1, sortList);
+  }
+
+  @Test
+  public void sort_one_field_asc_with_missing_value() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+            tupleValue(ImmutableMap.of("size", 399)));
+
+    List<Pair<SortOption, Expression>> sortList =
+        List.of(Pair.of(SortOption.DEFAULT_ASC, ref("response", INTEGER)));
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 399)),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        3,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 399)),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        3,
+        1,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(inputList, 0, 1, sortList);
+  }
+
+  @Test
+  public void sort_one_field_desc() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    List<Pair<SortOption, Expression>> sortList =
+        List.of(Pair.of(SortOption.DEFAULT_DESC, ref("response", INTEGER)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        3,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        2,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        2,
+        1,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)));
+
+    test_takeOrdered_with_sort_limit(inputList, 0, 1, sortList);
+  }
+
+  @Test
+  public void sort_one_field_desc_with_null_value() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(NULL_MAP),
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    List<Pair<SortOption, Expression>> sortList =
+        List.of(Pair.of(SortOption.DEFAULT_DESC, ref("response", INTEGER)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(NULL_MAP));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        3,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        3,
+        1,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(NULL_MAP));
+
+    test_takeOrdered_with_sort_limit(inputList, 0, 1, sortList);
+  }
+
+  @Test
+  public void sort_one_field_with_duplicate_value() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    List<Pair<SortOption, Expression>> sortList =
+        List.of(Pair.of(SortOption.DEFAULT_ASC, ref("response", INTEGER)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        3,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        3,
+        1,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(inputList, 0, 1, sortList);
+  }
+
+  @Test
+  public void sort_two_fields_both_asc() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+            tupleValue(NULL_MAP));
+
+    List<Pair<SortOption, Expression>> sortList =
+        List.of(
+            Pair.of(SortOption.DEFAULT_ASC, ref("size", INTEGER)),
+            Pair.of(SortOption.DEFAULT_ASC, ref("response", INTEGER)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        5,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        1,
+        sortList,
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)));
+
+    test_takeOrdered_with_sort_limit(inputList, 0, 1, sortList);
+  }
+
+  @Test
+  public void sort_two_fields_both_desc() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+            tupleValue(NULL_MAP));
+
+    List<Pair<SortOption, Expression>> sortList =
+        List.of(
+            Pair.of(SortOption.DEFAULT_DESC, ref("size", INTEGER)),
+            Pair.of(SortOption.DEFAULT_DESC, ref("response", INTEGER)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        5,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(NULL_MAP));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        1,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)));
+
+    test_takeOrdered_with_sort_limit(inputList, 0, 1, sortList);
+  }
+
+  @Test
+  public void sort_two_fields_asc_and_desc() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+            tupleValue(NULL_MAP));
+
+    List<Pair<SortOption, Expression>> sortList =
+        List.of(
+            Pair.of(SortOption.DEFAULT_ASC, ref("size", INTEGER)),
+            Pair.of(SortOption.DEFAULT_DESC, ref("response", INTEGER)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        5,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(NULL_MAP));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        1,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)));
+
+    test_takeOrdered_with_sort_limit(inputList, 0, 1, sortList);
+  }
+
+  @Test
+  public void sort_two_fields_desc_and_asc() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+            tupleValue(NULL_MAP));
+
+    List<Pair<SortOption, Expression>> sortList =
+        List.of(
+            Pair.of(SortOption.DEFAULT_DESC, ref("size", INTEGER)),
+            Pair.of(SortOption.DEFAULT_ASC, ref("response", INTEGER)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        5,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        0,
+        sortList,
+        tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)));
+
+    test_takeOrdered_with_sort_limit(
+        inputList,
+        4,
+        1,
+        sortList,
+        tupleValue(NULL_MAP),
+        tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+        tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+        tupleValue(ImmutableMap.of("size", 320, "response", 200)));
+
+    test_takeOrdered_with_sort_limit(inputList, 0, 1, sortList);
+  }
+
+  @Test
+  public void sort_one_field_without_input() {
+    wrapper.setIterator(Collections.emptyIterator());
+    assertEquals(
+        0,
+        execute(
+                takeOrdered(
+                    inputPlan, 1, 0, Pair.of(SortOption.DEFAULT_ASC, ref("response", INTEGER))))
+            .size());
+  }
+
+  @Test
+  public void offset_exceeds_row_number() {
+    List<ExprValue> inputList =
+        Arrays.asList(
+            tupleValue(ImmutableMap.of("size", 499, "response", 404)),
+            tupleValue(ImmutableMap.of("size", 320, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 200)),
+            tupleValue(ImmutableMap.of("size", 399, "response", 503)),
+            tupleValue(NULL_MAP));
+
+    wrapper.setIterator(inputList.iterator());
+    PhysicalPlan plan =
+        takeOrdered(inputPlan, 1, 6, Pair.of(SortOption.DEFAULT_ASC, ref("response", INTEGER)));
+    List<ExprValue> result = execute(plan);
+    assertEquals(0, result.size());
+  }
+
+  private void test_takeOrdered_with_sort_limit(
+      List<ExprValue> inputList,
+      int limit,
+      int offset,
+      List<Pair<SortOption, Expression>> sortList,
+      ExprValue... expected) {
+    wrapper.setIterator(inputList.iterator());
+    List<ExprValue> compareResult =
+        execute(limit(sort(inputPlan, sortList.toArray(Pair[]::new)), limit, offset));
+    wrapper.setIterator(inputList.iterator());
+    List<ExprValue> testResult =
+        execute(takeOrdered(inputPlan, limit, offset, sortList.toArray(Pair[]::new)));
+    assertEquals(compareResult, testResult);
+    if (expected.length == 0) {
+      assertEquals(0, testResult.size());
+    } else {
+      assertThat(testResult, contains(expected));
+    }
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/ValuesOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/ValuesOperatorTest.java
index 9acab03d2b..ddf4014b7e 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/ValuesOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/ValuesOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -26,10 +25,7 @@ class ValuesOperatorTest {
   @Test
   public void shouldHaveNoChild() {
     ValuesOperator values = values(ImmutableList.of(literal(1)));
-    assertThat(
-        values.getChild(),
-        is(empty())
-    );
+    assertThat(values.getChild(), is(empty()));
   }
 
   @Test
@@ -40,10 +36,6 @@ public void iterateSingleRow() {
       results.add(values.next());
     }
 
-    assertThat(
-        results,
-        contains(collectionValue(Arrays.asList(1, "abc")))
-    );
+    assertThat(results, contains(collectionValue(Arrays.asList(1, "abc"))));
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/WindowOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/WindowOperatorTest.java
index 7f727d391b..3bd145ff91 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/WindowOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/WindowOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.planner.physical;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -43,21 +42,56 @@ void test_ranking_window_function() {
     window(DSL.rank())
         .partitionBy(ref("action", STRING))
         .sortBy(DEFAULT_ASC, ref("response", INTEGER))
-        .expectNext(ImmutableMap.of(
-            "ip", "209.160.24.63", "action", "GET", "response", 200, "referer", "www.amazon.com",
-            "rank()", 1))
-        .expectNext(ImmutableMap.of(
-            "ip", "112.111.162.4", "action", "GET", "response", 200, "referer", "www.amazon.com",
-            "rank()", 1))
-        .expectNext(ImmutableMap.of(
-            "ip", "209.160.24.63", "action", "GET", "response", 404, "referer", "www.amazon.com",
-            "rank()", 3))
-        .expectNext(ImmutableMap.of(
-            "ip", "74.125.19.106", "action", "POST", "response", 200, "referer", "www.google.com",
-            "rank()", 1))
-        .expectNext(ImmutableMap.of(
-            "ip", "74.125.19.106", "action", "POST", "response", 500,
-            "rank()", 2))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "209.160.24.63",
+                "action",
+                "GET",
+                "response",
+                200,
+                "referer",
+                "www.amazon.com",
+                "rank()",
+                1))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "112.111.162.4",
+                "action",
+                "GET",
+                "response",
+                200,
+                "referer",
+                "www.amazon.com",
+                "rank()",
+                1))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "209.160.24.63",
+                "action",
+                "GET",
+                "response",
+                404,
+                "referer",
+                "www.amazon.com",
+                "rank()",
+                3))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "74.125.19.106",
+                "action",
+                "POST",
+                "response",
+                200,
+                "referer",
+                "www.google.com",
+                "rank()",
+                1))
+        .expectNext(
+            ImmutableMap.of("ip", "74.125.19.106", "action", "POST", "response", 500, "rank()", 2))
         .done();
   }
 
@@ -67,21 +101,57 @@ void test_aggregate_window_function() {
     window(new AggregateWindowFunction(DSL.sum(ref("response", INTEGER))))
         .partitionBy(ref("action", STRING))
         .sortBy(DEFAULT_ASC, ref("response", INTEGER))
-        .expectNext(ImmutableMap.of(
-            "ip", "209.160.24.63", "action", "GET", "response", 200, "referer", "www.amazon.com",
-            "sum(response)", 400))
-        .expectNext(ImmutableMap.of(
-            "ip", "112.111.162.4", "action", "GET", "response", 200, "referer", "www.amazon.com",
-            "sum(response)", 400))
-        .expectNext(ImmutableMap.of(
-            "ip", "209.160.24.63", "action", "GET", "response", 404, "referer", "www.amazon.com",
-            "sum(response)", 804))
-        .expectNext(ImmutableMap.of(
-            "ip", "74.125.19.106", "action", "POST", "response", 200, "referer", "www.google.com",
-            "sum(response)", 200))
-        .expectNext(ImmutableMap.of(
-            "ip", "74.125.19.106", "action", "POST", "response", 500,
-            "sum(response)", 700))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "209.160.24.63",
+                "action",
+                "GET",
+                "response",
+                200,
+                "referer",
+                "www.amazon.com",
+                "sum(response)",
+                400))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "112.111.162.4",
+                "action",
+                "GET",
+                "response",
+                200,
+                "referer",
+                "www.amazon.com",
+                "sum(response)",
+                400))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "209.160.24.63",
+                "action",
+                "GET",
+                "response",
+                404,
+                "referer",
+                "www.amazon.com",
+                "sum(response)",
+                804))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "74.125.19.106",
+                "action",
+                "POST",
+                "response",
+                200,
+                "referer",
+                "www.google.com",
+                "sum(response)",
+                200))
+        .expectNext(
+            ImmutableMap.of(
+                "ip", "74.125.19.106", "action", "POST", "response", 500, "sum(response)", 700))
         .done();
   }
 
@@ -89,21 +159,57 @@ void test_aggregate_window_function() {
   @Test
   void test_aggregate_window_function_without_sort_key() {
     window(new AggregateWindowFunction(DSL.sum(ref("response", INTEGER))))
-        .expectNext(ImmutableMap.of(
-            "ip", "209.160.24.63", "action", "GET", "response", 200, "referer", "www.amazon.com",
-            "sum(response)", 1504))
-        .expectNext(ImmutableMap.of(
-            "ip", "74.125.19.106", "action", "POST", "response", 500,
-            "sum(response)", 1504))
-        .expectNext(ImmutableMap.of(
-            "ip", "74.125.19.106", "action", "POST", "response", 200, "referer", "www.google.com",
-            "sum(response)", 1504))
-        .expectNext(ImmutableMap.of(
-            "ip", "112.111.162.4", "action", "GET", "response", 200, "referer", "www.amazon.com",
-            "sum(response)", 1504))
-        .expectNext(ImmutableMap.of(
-            "ip", "209.160.24.63", "action", "GET", "response", 404, "referer", "www.amazon.com",
-            "sum(response)", 1504))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "209.160.24.63",
+                "action",
+                "GET",
+                "response",
+                200,
+                "referer",
+                "www.amazon.com",
+                "sum(response)",
+                1504))
+        .expectNext(
+            ImmutableMap.of(
+                "ip", "74.125.19.106", "action", "POST", "response", 500, "sum(response)", 1504))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "74.125.19.106",
+                "action",
+                "POST",
+                "response",
+                200,
+                "referer",
+                "www.google.com",
+                "sum(response)",
+                1504))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "112.111.162.4",
+                "action",
+                "GET",
+                "response",
+                200,
+                "referer",
+                "www.amazon.com",
+                "sum(response)",
+                1504))
+        .expectNext(
+            ImmutableMap.of(
+                "ip",
+                "209.160.24.63",
+                "action",
+                "GET",
+                "response",
+                404,
+                "referer",
+                "www.amazon.com",
+                "sum(response)",
+                1504))
         .done();
   }
 
@@ -136,10 +242,11 @@ WindowOperatorAssertion sortBy(SortOption option, Expression expr) {
     WindowOperatorAssertion expectNext(Map<String, Object> expected) {
       if (windowOperator == null) {
         WindowDefinition definition = new WindowDefinition(partitionByList, sortList);
-        windowOperator = new WindowOperator(
-            new SortOperator(new TestScan(), definition.getAllSortItems()),
-            windowFunction,
-            definition);
+        windowOperator =
+            new WindowOperator(
+                new SortOperator(new TestScan(), definition.getAllSortItems()),
+                windowFunction,
+                definition);
         windowOperator.open();
       }
 
@@ -153,7 +260,5 @@ void done() {
       assertFalse(windowOperator.hasNext());
       windowOperator.close();
     }
-
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/collector/RoundingTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/collector/RoundingTest.java
index f40e5c058b..3a2601a874 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/collector/RoundingTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/collector/RoundingTest.java
@@ -22,8 +22,8 @@ public class RoundingTest {
   void time_rounding_illegal_span() {
     SpanExpression span = DSL.span(DSL.ref("time", TIME), DSL.literal(1), "d");
     Rounding rounding = Rounding.createRounding(span);
-    assertThrows(ExpressionEvaluationException.class,
-        () -> rounding.round(new ExprTimeValue("23:30:00")));
+    assertThrows(
+        ExpressionEvaluationException.class, () -> rounding.round(new ExprTimeValue("23:30:00")));
   }
 
   @Test
@@ -36,7 +36,8 @@ void round_unknown_type() {
   @Test
   void resolve() {
     String illegalUnit = "illegal";
-    assertThrows(IllegalArgumentException.class,
+    assertThrows(
+        IllegalArgumentException.class,
         () -> Rounding.DateTimeUnit.resolve(illegalUnit),
         "Unable to resolve unit " + illegalUnit);
   }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScanTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScanTest.java
index 2f7188a248..53cbd15b8e 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScanTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableScanTest.java
@@ -16,31 +16,32 @@
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Set;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.data.model.ExprTupleValue;
+import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.datasource.model.DataSourceType;
 import org.opensearch.sql.storage.StorageEngine;
 
 @ExtendWith(MockitoExtension.class)
 public class DataSourceTableScanTest {
 
-  @Mock
-  private DataSourceService dataSourceService;
+  @Mock private DataSourceService dataSourceService;
 
-  @Mock
-  private StorageEngine storageEngine;
+  @Mock private StorageEngine storageEngine;
 
   private DataSourceTableScan dataSourceTableScan;
 
   @BeforeEach
-  private void setUp() {
+  public void setUp() {
     dataSourceTableScan = new DataSourceTableScan(dataSourceService);
   }
 
@@ -54,17 +55,36 @@ void testIterator() {
     Set<DataSource> dataSourceSet = new HashSet<>();
     dataSourceSet.add(new DataSource("prometheus", DataSourceType.PROMETHEUS, storageEngine));
     dataSourceSet.add(new DataSource("opensearch", DataSourceType.OPENSEARCH, storageEngine));
-    when(dataSourceService.getDataSources()).thenReturn(dataSourceSet);
+    Set<DataSourceMetadata> dataSourceMetadata =
+        dataSourceSet.stream()
+            .map(
+                dataSource ->
+                    new DataSourceMetadata.Builder()
+                        .setName(dataSource.getName())
+                        .setConnector(dataSource.getConnectorType())
+                        .setProperties(ImmutableMap.of("prometheus.uri", "localhost:9200"))
+                        .build())
+            .collect(Collectors.toSet());
+    when(dataSourceService.getDataSourceMetadata(false)).thenReturn(dataSourceMetadata);
 
     assertFalse(dataSourceTableScan.hasNext());
     dataSourceTableScan.open();
     assertTrue(dataSourceTableScan.hasNext());
+    Set<ExprValue> exprTupleValues = new HashSet<>();
+    while (dataSourceTableScan.hasNext()) {
+      exprTupleValues.add(dataSourceTableScan.next());
+    }
+
+    Set<ExprValue> expectedExprTupleValues = new HashSet<>();
     for (DataSource dataSource : dataSourceSet) {
-      assertEquals(new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-              "DATASOURCE_NAME", ExprValueUtils.stringValue(dataSource.getName()),
-              "CONNECTOR_TYPE", ExprValueUtils.stringValue(dataSource.getConnectorType().name())))),
-          dataSourceTableScan.next());
+      expectedExprTupleValues.add(
+          new ExprTupleValue(
+              new LinkedHashMap<>(
+                  ImmutableMap.of(
+                      "DATASOURCE_NAME", ExprValueUtils.stringValue(dataSource.getName()),
+                      "CONNECTOR_TYPE",
+                          ExprValueUtils.stringValue(dataSource.getConnectorType().name())))));
     }
+    assertEquals(expectedExprTupleValues, exprTupleValues);
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableTest.java
index c82a042770..75f21c3e52 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/datasource/DataSourceTableTest.java
@@ -27,13 +27,12 @@
 @ExtendWith(MockitoExtension.class)
 public class DataSourceTableTest {
 
-  @Mock
-  private DataSourceService dataSourceService;
+  @Mock private DataSourceService dataSourceService;
 
   @Test
   void testGetFieldTypes() {
     DataSourceTable dataSourceTable = new DataSourceTable(dataSourceService);
-    Map<String, ExprType> fieldTypes =  dataSourceTable.getFieldTypes();
+    Map<String, ExprType> fieldTypes = dataSourceTable.getFieldTypes();
     Map<String, ExprType> expectedTypes = new HashMap<>();
     expectedTypes.put("DATASOURCE_NAME", ExprCoreType.STRING);
     expectedTypes.put("CONNECTOR_TYPE", ExprCoreType.STRING);
@@ -43,9 +42,8 @@ void testGetFieldTypes() {
   @Test
   void testImplement() {
     DataSourceTable dataSourceTable = new DataSourceTable(dataSourceService);
-    PhysicalPlan physicalPlan
-        = dataSourceTable.implement(
-            LogicalPlanDSL.relation(DATASOURCES_TABLE_NAME, dataSourceTable));
+    PhysicalPlan physicalPlan =
+        dataSourceTable.implement(LogicalPlanDSL.relation(DATASOURCES_TABLE_NAME, dataSourceTable));
     assertTrue(physicalPlan instanceof DataSourceTableScan);
   }
 
@@ -53,7 +51,8 @@ void testImplement() {
   @Test
   void testExist() {
     UnsupportedOperationException exception =
-        assertThrows(UnsupportedOperationException.class,
+        assertThrows(
+            UnsupportedOperationException.class,
             () -> new DataSourceTable(dataSourceService).exists());
     assertEquals("Unsupported Operation", exception.getMessage());
   }
@@ -62,7 +61,8 @@ void testExist() {
   @Test
   void testCreateTable() {
     UnsupportedOperationException exception =
-        assertThrows(UnsupportedOperationException.class,
+        assertThrows(
+            UnsupportedOperationException.class,
             () -> new DataSourceTable(dataSourceService).create(new HashMap<>()));
     assertEquals("Unsupported Operation", exception.getMessage());
   }
diff --git a/core/src/test/java/org/opensearch/sql/planner/streaming/watermark/BoundedOutOfOrderWatermarkGeneratorTest.java b/core/src/test/java/org/opensearch/sql/planner/streaming/watermark/BoundedOutOfOrderWatermarkGeneratorTest.java
index 1d18a16f2a..9522c600b8 100644
--- a/core/src/test/java/org/opensearch/sql/planner/streaming/watermark/BoundedOutOfOrderWatermarkGeneratorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/streaming/watermark/BoundedOutOfOrderWatermarkGeneratorTest.java
@@ -58,4 +58,4 @@ public AssertionHelper shouldGenerateWatermark(long expected) {
       return this;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/WindowTest.java b/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/WindowTest.java
index 9b9aafa933..c8214f5771 100644
--- a/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/WindowTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/WindowTest.java
@@ -18,4 +18,4 @@ void test() {
     assertEquals(2000, window.getEndTime());
     assertEquals(1999, window.maxTimestamp());
   }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/assigner/SlidingWindowAssignerTest.java b/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/assigner/SlidingWindowAssignerTest.java
index fd69065742..0c63f594d9 100644
--- a/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/assigner/SlidingWindowAssignerTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/assigner/SlidingWindowAssignerTest.java
@@ -20,33 +20,21 @@ void testAssignWindows() {
     long slideSize = 500;
     SlidingWindowAssigner assigner = new SlidingWindowAssigner(windowSize, slideSize);
 
-    assertEquals(
-        List.of(
-            new Window(0, 1000),
-            new Window(500, 1500)),
-        assigner.assign(500));
-
-    assertEquals(
-        List.of(
-            new Window(0, 1000),
-            new Window(500, 1500)),
-        assigner.assign(999));
-
-    assertEquals(
-        List.of(
-            new Window(500, 1500),
-            new Window(1000, 2000)),
-        assigner.assign(1000));
+    assertEquals(List.of(new Window(0, 1000), new Window(500, 1500)), assigner.assign(500));
+
+    assertEquals(List.of(new Window(0, 1000), new Window(500, 1500)), assigner.assign(999));
+
+    assertEquals(List.of(new Window(500, 1500), new Window(1000, 2000)), assigner.assign(1000));
   }
 
   @Test
   void testConstructWithIllegalArguments() {
-    IllegalArgumentException error1 = assertThrows(IllegalArgumentException.class,
-        () -> new SlidingWindowAssigner(-1, 100));
+    IllegalArgumentException error1 =
+        assertThrows(IllegalArgumentException.class, () -> new SlidingWindowAssigner(-1, 100));
     assertEquals("Window size [-1] must be positive number", error1.getMessage());
 
-    IllegalArgumentException error2 = assertThrows(IllegalArgumentException.class,
-        () -> new SlidingWindowAssigner(1000, 0));
+    IllegalArgumentException error2 =
+        assertThrows(IllegalArgumentException.class, () -> new SlidingWindowAssigner(1000, 0));
     assertEquals("Slide size [0] must be positive number", error2.getMessage());
   }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/assigner/TumblingWindowAssignerTest.java b/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/assigner/TumblingWindowAssignerTest.java
index 4c98c40f7a..a8ab048701 100644
--- a/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/assigner/TumblingWindowAssignerTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/assigner/TumblingWindowAssignerTest.java
@@ -19,21 +19,15 @@ void testAssignWindow() {
     long windowSize = 1000;
     TumblingWindowAssigner assigner = new TumblingWindowAssigner(windowSize);
 
-    assertEquals(
-        Collections.singletonList(new Window(0, 1000)),
-        assigner.assign(500));
-    assertEquals(
-        Collections.singletonList(new Window(1000, 2000)),
-        assigner.assign(1999));
-    assertEquals(
-        Collections.singletonList(new Window(2000, 3000)),
-        assigner.assign(2000));
+    assertEquals(Collections.singletonList(new Window(0, 1000)), assigner.assign(500));
+    assertEquals(Collections.singletonList(new Window(1000, 2000)), assigner.assign(1999));
+    assertEquals(Collections.singletonList(new Window(2000, 3000)), assigner.assign(2000));
   }
 
   @Test
   void testConstructWithIllegalWindowSize() {
-    IllegalArgumentException error = assertThrows(IllegalArgumentException.class,
-        () -> new TumblingWindowAssigner(-1));
+    IllegalArgumentException error =
+        assertThrows(IllegalArgumentException.class, () -> new TumblingWindowAssigner(-1));
     assertEquals("Window size [-1] must be positive number", error.getMessage());
   }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/trigger/AfterWatermarkWindowTriggerTest.java b/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/trigger/AfterWatermarkWindowTriggerTest.java
index 3ef6907c38..d2854549ae 100644
--- a/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/trigger/AfterWatermarkWindowTriggerTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/streaming/windowing/trigger/AfterWatermarkWindowTriggerTest.java
@@ -31,4 +31,4 @@ void shouldFireWindowBelowWatermark() {
     assertEquals(TriggerResult.FIRE, trigger.trigger(new Window(500, 800)));
     assertEquals(TriggerResult.FIRE, trigger.trigger(new Window(500, 1000)));
   }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/opensearch/sql/storage/StorageEngineTest.java b/core/src/test/java/org/opensearch/sql/storage/StorageEngineTest.java
index 0e969c6dac..67014b76bd 100644
--- a/core/src/test/java/org/opensearch/sql/storage/StorageEngineTest.java
+++ b/core/src/test/java/org/opensearch/sql/storage/StorageEngineTest.java
@@ -13,11 +13,9 @@
 
 public class StorageEngineTest {
 
-
   @Test
   void testFunctionsMethod() {
     StorageEngine k = (dataSourceSchemaName, tableName) -> null;
     Assertions.assertEquals(Collections.emptyList(), k.getFunctions());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/storage/TableScanOperatorTest.java b/core/src/test/java/org/opensearch/sql/storage/TableScanOperatorTest.java
index f2f556a957..81680455cc 100644
--- a/core/src/test/java/org/opensearch/sql/storage/TableScanOperatorTest.java
+++ b/core/src/test/java/org/opensearch/sql/storage/TableScanOperatorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.storage;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -15,36 +14,40 @@
 
 class TableScanOperatorTest {
 
-  private final TableScanOperator tableScan = new TableScanOperator() {
-    @Override
-    public String explain() {
-      return "explain";
-    }
+  private final TableScanOperator tableScan =
+      new TableScanOperator() {
+        @Override
+        public String explain() {
+          return "explain";
+        }
 
-    @Override
-    public boolean hasNext() {
-      return false;
-    }
+        @Override
+        public boolean hasNext() {
+          return false;
+        }
 
-    @Override
-    public ExprValue next() {
-      return null;
-    }
-  };
+        @Override
+        public ExprValue next() {
+          return null;
+        }
+      };
 
   @Test
   public void accept() {
-    Boolean isVisited = tableScan.accept(new PhysicalPlanNodeVisitor<Boolean, Object>() {
-      @Override
-      protected Boolean visitNode(PhysicalPlan node, Object context) {
-        return (node instanceof TableScanOperator);
-      }
-
-      @Override
-      public Boolean visitTableScan(TableScanOperator node, Object context) {
-        return super.visitTableScan(node, context);
-      }
-    }, null);
+    Boolean isVisited =
+        tableScan.accept(
+            new PhysicalPlanNodeVisitor<Boolean, Object>() {
+              @Override
+              protected Boolean visitNode(PhysicalPlan node, Object context) {
+                return (node instanceof TableScanOperator);
+              }
+
+              @Override
+              public Boolean visitTableScan(TableScanOperator node, Object context) {
+                return super.visitTableScan(node, context);
+              }
+            },
+            null);
 
     assertTrue(isVisited);
   }
@@ -53,5 +56,4 @@ public Boolean visitTableScan(TableScanOperator node, Object context) {
   public void getChild() {
     assertTrue(tableScan.getChild().isEmpty());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/storage/bindingtuple/BindingTupleTest.java b/core/src/test/java/org/opensearch/sql/storage/bindingtuple/BindingTupleTest.java
index 780d1cd2dd..89d2372707 100644
--- a/core/src/test/java/org/opensearch/sql/storage/bindingtuple/BindingTupleTest.java
+++ b/core/src/test/java/org/opensearch/sql/storage/bindingtuple/BindingTupleTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.storage.bindingtuple;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -21,30 +20,31 @@ class BindingTupleTest {
   public void resolve_ref_expression() {
     BindingTuple bindingTuple =
         ExprValueUtils.tupleValue(ImmutableMap.of("ip", "209.160.24.63")).bindingTuples();
-    assertEquals(ExprValueUtils.stringValue("209.160.24.63"),
-        bindingTuple.resolve(DSL.ref("ip", STRING)));
+    assertEquals(
+        ExprValueUtils.stringValue("209.160.24.63"), bindingTuple.resolve(DSL.ref("ip", STRING)));
   }
 
   @Test
   public void resolve_missing_expression() {
     BindingTuple bindingTuple =
         ExprValueUtils.tupleValue(ImmutableMap.of("ip", "209.160.24.63")).bindingTuples();
-    assertEquals(ExprValueUtils.LITERAL_MISSING,
-        bindingTuple.resolve(DSL.ref("ip_missing", STRING)));
+    assertEquals(
+        ExprValueUtils.LITERAL_MISSING, bindingTuple.resolve(DSL.ref("ip_missing", STRING)));
   }
 
   @Test
   public void resolve_from_empty_tuple() {
-    assertEquals(ExprValueUtils.LITERAL_MISSING,
-        BindingTuple.EMPTY.resolve(DSL.ref("ip_missing", STRING)));
+    assertEquals(
+        ExprValueUtils.LITERAL_MISSING, BindingTuple.EMPTY.resolve(DSL.ref("ip_missing", STRING)));
   }
 
   @Test
   public void resolve_literal_expression_throw_exception() {
     BindingTuple bindingTuple =
         ExprValueUtils.tupleValue(ImmutableMap.of("ip", "209.160.24.63")).bindingTuples();
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> bindingTuple.resolve(DSL.literal(1)));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class, () -> bindingTuple.resolve(DSL.literal(1)));
     assertEquals("can resolve expression: 1", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/storage/write/TableWriteOperatorTest.java b/core/src/test/java/org/opensearch/sql/storage/write/TableWriteOperatorTest.java
new file mode 100644
index 0000000000..e5b2c9f61a
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/storage/write/TableWriteOperatorTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.storage.write;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Collections;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
+
+@ExtendWith(MockitoExtension.class)
+class TableWriteOperatorTest {
+
+  @Mock private PhysicalPlan child;
+
+  private TableWriteOperator tableWrite;
+
+  @BeforeEach
+  void setUp() {
+    tableWrite =
+        new TableWriteOperator(child) {
+          @Override
+          public String explain() {
+            return "explain";
+          }
+
+          @Override
+          public boolean hasNext() {
+            return false;
+          }
+
+          @Override
+          public ExprValue next() {
+            return null;
+          }
+        };
+  }
+
+  @Test
+  void testAccept() {
+    Boolean isVisited =
+        tableWrite.accept(
+            new PhysicalPlanNodeVisitor<>() {
+              @Override
+              protected Boolean visitNode(PhysicalPlan node, Object context) {
+                return (node instanceof TableWriteOperator);
+              }
+
+              @Override
+              public Boolean visitTableWrite(TableWriteOperator node, Object context) {
+                return super.visitTableWrite(node, context);
+              }
+            },
+            null);
+
+    assertTrue(isVisited);
+  }
+
+  @Test
+  void testGetChild() {
+    assertEquals(Collections.singletonList(child), tableWrite.getChild());
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/utils/ComparisonUtil.java b/core/src/test/java/org/opensearch/sql/utils/ComparisonUtil.java
index 9b2f8a0573..b25f4d1053 100644
--- a/core/src/test/java/org/opensearch/sql/utils/ComparisonUtil.java
+++ b/core/src/test/java/org/opensearch/sql/utils/ComparisonUtil.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.utils;
 
 import static org.opensearch.sql.data.model.ExprValueUtils.getDoubleValue;
@@ -11,46 +10,70 @@
 import static org.opensearch.sql.data.model.ExprValueUtils.getIntegerValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.getLongValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.getStringValue;
+import static org.opensearch.sql.utils.DateTimeUtils.extractDateTime;
 
-import org.opensearch.sql.data.model.ExprByteValue;
-import org.opensearch.sql.data.model.ExprDoubleValue;
-import org.opensearch.sql.data.model.ExprFloatValue;
-import org.opensearch.sql.data.model.ExprIntegerValue;
-import org.opensearch.sql.data.model.ExprLongValue;
-import org.opensearch.sql.data.model.ExprShortValue;
-import org.opensearch.sql.data.model.ExprStringValue;
 import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
+import org.opensearch.sql.expression.function.FunctionProperties;
 
 public class ComparisonUtil {
+
   /**
-   * Util to compare the object (integer, long, float, double, string) values.
-   * ExprValue A
+   * Util to compare the object (integer, long, float, double, string) values. Allows comparing
+   * different datetime types and requires `FunctionProperties` object for that.
    */
-  public static int compare(ExprValue v1, ExprValue v2) {
+  public static int compare(FunctionProperties functionProperties, ExprValue v1, ExprValue v2) {
     if (v1.isMissing() || v2.isMissing()) {
       throw new ExpressionEvaluationException("invalid to call compare operation on missing value");
     } else if (v1.isNull() || v2.isNull()) {
       throw new ExpressionEvaluationException("invalid to call compare operation on null value");
+    } else if (v1.type() != v2.type() && v1.isDateTime() && v2.isDateTime()) {
+      return extractDateTime(v1, functionProperties)
+          .compareTo(extractDateTime(v2, functionProperties));
     }
+    return compare(v1, v2);
+  }
 
-    if (v1 instanceof ExprByteValue) {
-      return v1.byteValue().compareTo(v2.byteValue());
-    } else if (v1 instanceof ExprShortValue) {
-      return v1.shortValue().compareTo(v2.shortValue());
-    } else if (v1 instanceof ExprIntegerValue) {
-      return getIntegerValue(v1).compareTo(getIntegerValue(v2));
-    } else if (v1 instanceof ExprLongValue) {
-      return getLongValue(v1).compareTo(getLongValue(v2));
-    } else if (v1 instanceof ExprFloatValue) {
-      return getFloatValue(v1).compareTo(getFloatValue(v2));
-    } else if (v1 instanceof ExprDoubleValue) {
-      return getDoubleValue(v1).compareTo(getDoubleValue(v2));
-    } else if (v1 instanceof ExprStringValue) {
-      return getStringValue(v1).compareTo(getStringValue(v2));
-    } else {
+  /** Util to compare the object (integer, long, float, double, string) values. */
+  public static int compare(ExprValue v1, ExprValue v2) {
+    if (v1.isMissing() || v2.isMissing()) {
+      throw new ExpressionEvaluationException("invalid to call compare operation on missing value");
+    } else if (v1.isNull() || v2.isNull()) {
+      throw new ExpressionEvaluationException("invalid to call compare operation on null value");
+    } else if (v1.type() != v2.type()) {
       throw new ExpressionEvaluationException(
-          String.format("%s instances are not comparable", v1.getClass().getSimpleName()));
+          "invalid to call compare operation on values of different types");
+    }
+
+    switch ((ExprCoreType) v1.type()) {
+      case BYTE:
+        return v1.byteValue().compareTo(v2.byteValue());
+      case SHORT:
+        return v1.shortValue().compareTo(v2.shortValue());
+      case INTEGER:
+        return getIntegerValue(v1).compareTo(getIntegerValue(v2));
+      case LONG:
+        return getLongValue(v1).compareTo(getLongValue(v2));
+      case FLOAT:
+        return getFloatValue(v1).compareTo(getFloatValue(v2));
+      case DOUBLE:
+        return getDoubleValue(v1).compareTo(getDoubleValue(v2));
+      case STRING:
+        return getStringValue(v1).compareTo(getStringValue(v2));
+      case BOOLEAN:
+        return v1.booleanValue().compareTo(v2.booleanValue());
+      case TIME:
+        return v1.timeValue().compareTo(v2.timeValue());
+      case DATE:
+        return v1.dateValue().compareTo(v2.dateValue());
+      case DATETIME:
+        return v1.datetimeValue().compareTo(v2.datetimeValue());
+      case TIMESTAMP:
+        return v1.timestampValue().compareTo(v2.timestampValue());
+      default:
+        throw new ExpressionEvaluationException(
+            String.format("%s instances are not comparable", v1.getClass().getSimpleName()));
     }
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/utils/DateTimeUtilsTest.java b/core/src/test/java/org/opensearch/sql/utils/DateTimeUtilsTest.java
index 9bf0a53ff6..989759681f 100644
--- a/core/src/test/java/org/opensearch/sql/utils/DateTimeUtilsTest.java
+++ b/core/src/test/java/org/opensearch/sql/utils/DateTimeUtilsTest.java
@@ -16,11 +16,16 @@
 public class DateTimeUtilsTest {
   @Test
   void round() {
-    long actual = LocalDateTime.parse("2021-09-28T23:40:00").atZone(ZoneId.systemDefault())
-        .toInstant().toEpochMilli();
+    long actual =
+        LocalDateTime.parse("2021-09-28T23:40:00")
+            .atZone(ZoneId.systemDefault())
+            .toInstant()
+            .toEpochMilli();
     long rounded = DateTimeUtils.roundFloor(actual, TimeUnit.HOURS.toMillis(1));
     assertEquals(
-        LocalDateTime.parse("2021-09-28T23:00:00").atZone(ZoneId.systemDefault()).toInstant()
+        LocalDateTime.parse("2021-09-28T23:00:00")
+            .atZone(ZoneId.systemDefault())
+            .toInstant()
             .toEpochMilli(),
         Instant.ofEpochMilli(rounded).toEpochMilli());
   }
diff --git a/core/src/test/java/org/opensearch/sql/utils/MatcherUtils.java b/core/src/test/java/org/opensearch/sql/utils/MatcherUtils.java
index 8b1a3dda2e..206f05a38a 100644
--- a/core/src/test/java/org/opensearch/sql/utils/MatcherUtils.java
+++ b/core/src/test/java/org/opensearch/sql/utils/MatcherUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.utils;
 
 import org.hamcrest.Description;
@@ -11,13 +10,9 @@
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.type.ExprCoreType;
 
-/**
- * Matcher Utils.
- */
+/** Matcher Utils. */
 public class MatcherUtils {
-  /**
-   * Check {@link ExprValue} type equal to {@link ExprCoreType}.
-   */
+  /** Check {@link ExprValue} type equal to {@link ExprCoreType}. */
   public static TypeSafeMatcher<ExprValue> hasType(ExprCoreType type) {
     return new TypeSafeMatcher<ExprValue>() {
       @Override
@@ -32,9 +27,7 @@ protected boolean matchesSafely(ExprValue value) {
     };
   }
 
-  /**
-   * Check {@link ExprValue} value equal to {@link Object}.
-   */
+  /** Check {@link ExprValue} value equal to {@link Object}. */
   public static TypeSafeMatcher<ExprValue> hasValue(Object object) {
     return new TypeSafeMatcher<ExprValue>() {
       @Override
diff --git a/core/src/test/java/org/opensearch/sql/utils/SerializeUtilsTest.java b/core/src/test/java/org/opensearch/sql/utils/SerializeUtilsTest.java
new file mode 100644
index 0000000000..c3d387328e
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/utils/SerializeUtilsTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.utils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gson.Gson;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceStatus;
+import org.opensearch.sql.datasource.model.DataSourceType;
+
+class SerializeUtilsTest {
+  @Test
+  public void buildGson_serializeDataSourceTypeAsString() {
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("DATASOURCE_NAME")
+            .setDescription("DESCRIPTION")
+            .setConnector(DataSourceType.S3GLUE)
+            .setAllowedRoles(ImmutableList.of("ROLE"))
+            .setResultIndex("query_execution_result_test")
+            .setDataSourceStatus(DataSourceStatus.ACTIVE)
+            .build();
+
+    Gson gson = SerializeUtils.buildGson();
+    String json = gson.toJson(dataSourceMetadata);
+
+    // connector should be serialized as string (not as object)
+    assertJsonAttribute(json, "connector", "S3GLUE");
+    // other attribute should be serialized as normal
+    assertJsonAttribute(json, "name", "DATASOURCE_NAME");
+    assertJsonAttribute(json, "description", "DESCRIPTION");
+    assertJsonAttribute(json, "resultIndex", "query_execution_result_test");
+    assertJsonAttribute(json, "status", "ACTIVE");
+    assertTrue(json.contains("\"allowedRoles\":[\"ROLE\"]"));
+  }
+
+  private void assertJsonAttribute(String json, String attribute, String value) {
+    assertTrue(json.contains("\"" + attribute + "\":\"" + value + "\""));
+  }
+
+  @Test
+  public void buildGson_deserializeDataSourceTypeFromString() {
+    String json =
+        "{\"name\":\"DATASOURCE_NAME\","
+            + "\"description\":\"DESCRIPTION\","
+            + "\"connector\":\"S3GLUE\","
+            + "\"allowedRoles\":[\"ROLE\"],"
+            + "\"properties\":{},"
+            + "\"resultIndex\":\"query_execution_result_test\","
+            + "\"status\":\"ACTIVE\""
+            + "}";
+
+    Gson gson = SerializeUtils.buildGson();
+    DataSourceMetadata metadata = gson.fromJson(json, DataSourceMetadata.class);
+
+    assertEquals(DataSourceType.S3GLUE, metadata.getConnector());
+  }
+}
diff --git a/core/src/test/java/org/opensearch/sql/utils/SystemIndexUtilsTest.java b/core/src/test/java/org/opensearch/sql/utils/SystemIndexUtilsTest.java
index 81d28f40db..903077ca29 100644
--- a/core/src/test/java/org/opensearch/sql/utils/SystemIndexUtilsTest.java
+++ b/core/src/test/java/org/opensearch/sql/utils/SystemIndexUtilsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -49,8 +48,8 @@ void test_mapping_info_table() {
 
   @Test
   void test_mapping_info_table_with_special_index_name() {
-    final SystemIndexUtils.SystemTable table
-        = systemTable("logs-2021.01.11.MAPPINGS_ODFE_SYS_TABLE");
+    final SystemIndexUtils.SystemTable table =
+        systemTable("logs-2021.01.11.MAPPINGS_ODFE_SYS_TABLE");
     assertTrue(table.isMetaInfoTable());
     assertFalse(table.isSystemInfoTable());
     assertEquals("logs-2021.01.11", table.getTableName());
diff --git a/core/src/test/java/org/opensearch/sql/utils/TestOperator.java b/core/src/test/java/org/opensearch/sql/utils/TestOperator.java
new file mode 100644
index 0000000000..d356f2f866
--- /dev/null
+++ b/core/src/test/java/org/opensearch/sql/utils/TestOperator.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.utils;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.List;
+import lombok.Setter;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.exception.NoCursorException;
+import org.opensearch.sql.planner.SerializablePlan;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
+
+public class TestOperator extends PhysicalPlan implements SerializablePlan {
+  private int field;
+  @Setter private boolean throwNoCursorOnWrite = false;
+  @Setter private boolean throwIoOnWrite = false;
+
+  public TestOperator() {}
+
+  public TestOperator(int value) {
+    field = value;
+  }
+
+  @Override
+  public void readExternal(ObjectInput in) throws IOException {
+    field = in.readInt();
+  }
+
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    if (throwNoCursorOnWrite) {
+      throw new NoCursorException();
+    }
+    if (throwIoOnWrite) {
+      throw new IOException();
+    }
+    out.writeInt(field);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return field == ((TestOperator) o).field;
+  }
+
+  @Override
+  public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
+    return null;
+  }
+
+  @Override
+  public boolean hasNext() {
+    return false;
+  }
+
+  @Override
+  public ExprValue next() {
+    return null;
+  }
+
+  @Override
+  public List<PhysicalPlan> getChild() {
+    return null;
+  }
+}
diff --git a/core/src/testFixtures/java/org/opensearch/sql/executor/DefaultExecutionEngine.java b/core/src/testFixtures/java/org/opensearch/sql/executor/DefaultExecutionEngine.java
index e4f9a185a3..61219d4637 100644
--- a/core/src/testFixtures/java/org/opensearch/sql/executor/DefaultExecutionEngine.java
+++ b/core/src/testFixtures/java/org/opensearch/sql/executor/DefaultExecutionEngine.java
@@ -9,11 +9,10 @@
 import java.util.List;
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.executor.pagination.Cursor;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 
-/**
- * Used for testing purpose.
- */
+/** Used for testing purpose. */
 public class DefaultExecutionEngine implements ExecutionEngine {
   @Override
   public void execute(PhysicalPlan plan, ResponseListener<QueryResponse> listener) {
@@ -32,7 +31,8 @@ public void execute(
       while (plan.hasNext()) {
         result.add(plan.next());
       }
-      QueryResponse response = new QueryResponse(new Schema(new ArrayList<>()), new ArrayList<>());
+      QueryResponse response =
+          new QueryResponse(new Schema(new ArrayList<>()), new ArrayList<>(), Cursor.None);
       listener.onResponse(response);
     } catch (Exception e) {
       listener.onFailure(e);
diff --git a/core/src/testFixtures/java/org/opensearch/sql/executor/DefaultQueryManager.java b/core/src/testFixtures/java/org/opensearch/sql/executor/DefaultQueryManager.java
index 41888a0581..3167d4843a 100644
--- a/core/src/testFixtures/java/org/opensearch/sql/executor/DefaultQueryManager.java
+++ b/core/src/testFixtures/java/org/opensearch/sql/executor/DefaultQueryManager.java
@@ -13,9 +13,7 @@
 import java.util.concurrent.TimeUnit;
 import org.opensearch.sql.executor.execution.AbstractPlan;
 
-/**
- * Default QueryManager implementation which execute {@link AbstractPlan} on caller thread.
- */
+/** Default QueryManager implementation which execute {@link AbstractPlan} on caller thread. */
 public class DefaultQueryManager implements QueryManager {
 
   private final ExecutorService executorService;
diff --git a/datasources/build.gradle b/datasources/build.gradle
new file mode 100644
index 0000000000..9456141e80
--- /dev/null
+++ b/datasources/build.gradle
@@ -0,0 +1,90 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+plugins {
+    id 'java-library'
+    id "io.freefair.lombok"
+    id 'jacoco'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation project(':core')
+    implementation project(':protocol')
+    implementation project(':opensearch')
+    implementation project(':legacy')
+    implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
+    implementation group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}"
+    implementation group: 'org.opensearch', name: 'common-utils', version: "${opensearch_build}"
+    implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
+    // FIXME. upgrade aws-encryption-sdk-java once the bouncycastle dependency update to 1.78.
+    implementation ('com.amazonaws:aws-encryption-sdk-java:2.4.1') {
+        exclude group: 'org.bouncycastle', module: 'bcprov-ext-jdk18on'
+    }
+    // Use OpenSearch bouncycastle version. https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties
+    implementation "org.bouncycastle:bcprov-jdk18on:${versions.bouncycastle}"
+    implementation group: 'commons-validator', name: 'commons-validator', version: '1.7'
+
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
+    testImplementation('org.junit.jupiter:junit-jupiter:5.9.3')
+    testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.14.9'
+    testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.7.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
+}
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "skipped", "failed"
+        exceptionFormat "full"
+    }
+}
+
+jacocoTestReport {
+    reports {
+        html.required = true
+        xml.required = true
+    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it)
+        }))
+    }
+}
+test.finalizedBy(project.tasks.jacocoTestReport)
+
+jacocoTestCoverageVerification {
+    violationRules {
+        rule {
+            element = 'CLASS'
+            excludes = [
+                'org.opensearch.sql.datasources.settings.DataSourceSettings',
+                'org.opensearch.sql.datasources.exceptions.*',
+                'org.opensearch.sql.datasources.model.*',
+                'org.opensearch.sql.datasources.rest.*'
+            ]
+            limit {
+                counter = 'LINE'
+                minimum = 1.0
+            }
+            limit {
+                counter = 'BRANCH'
+                minimum = 0.9
+            }
+        }
+    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it)
+        }))
+    }
+}
+check.dependsOn jacocoTestCoverageVerification
+jacocoTestCoverageVerification.dependsOn jacocoTestReport
diff --git a/datasources/lombok.config b/datasources/lombok.config
new file mode 100644
index 0000000000..aac13295bd
--- /dev/null
+++ b/datasources/lombok.config
@@ -0,0 +1,3 @@
+# This file is generated by the 'io.freefair.lombok' Gradle plugin
+config.stopBubbling = true
+lombok.addLombokGeneratedAnnotation = true
\ No newline at end of file
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/auth/AuthenticationType.java b/datasources/src/main/java/org/opensearch/sql/datasources/auth/AuthenticationType.java
new file mode 100644
index 0000000000..da789388f5
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/auth/AuthenticationType.java
@@ -0,0 +1,42 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.auth;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public enum AuthenticationType {
+  NOAUTH("noauth"),
+  BASICAUTH("basicauth"),
+  AWSSIGV4AUTH("awssigv4");
+
+  private String name;
+
+  private static final Map<String, AuthenticationType> ENUM_MAP;
+
+  AuthenticationType(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return this.name;
+  }
+
+  static {
+    Map<String, AuthenticationType> map = new HashMap<>();
+    for (AuthenticationType instance : AuthenticationType.values()) {
+      map.put(instance.getName().toLowerCase(), instance);
+    }
+    ENUM_MAP = Collections.unmodifiableMap(map);
+  }
+
+  public static AuthenticationType get(String name) {
+    return ENUM_MAP.get(name.toLowerCase());
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelper.java b/datasources/src/main/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelper.java
new file mode 100644
index 0000000000..75d0ec8539
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelper.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.auth;
+
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+
+/**
+ * Interface for datasource authorization helper. The implementation of this class helps in
+ * determining if authorization is required and the roles associated with the user.
+ */
+public interface DataSourceUserAuthorizationHelper {
+
+  /**
+   * Authorizes DataSource within the current context.
+   *
+   * @param dataSourceMetadata {@link DataSourceMetadata}
+   */
+  void authorizeDataSource(DataSourceMetadata dataSourceMetadata);
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImpl.java b/datasources/src/main/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImpl.java
new file mode 100644
index 0000000000..c8f6754710
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImpl.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.auth;
+
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
+
+import java.util.List;
+import lombok.AllArgsConstructor;
+import org.opensearch.OpenSearchSecurityException;
+import org.opensearch.client.Client;
+import org.opensearch.commons.ConfigConstants;
+import org.opensearch.commons.authuser.User;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+
+@AllArgsConstructor
+public class DataSourceUserAuthorizationHelperImpl implements DataSourceUserAuthorizationHelper {
+  private final Client client;
+
+  private Boolean isAuthorizationRequired() {
+    String userString =
+        client
+            .threadPool()
+            .getThreadContext()
+            .getTransient(ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT);
+    return userString != null;
+  }
+
+  private List<String> getUserRoles() {
+    String userString =
+        client
+            .threadPool()
+            .getThreadContext()
+            .getTransient(ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT);
+    User user = User.parse(userString);
+    return user.getRoles();
+  }
+
+  @Override
+  public void authorizeDataSource(DataSourceMetadata dataSourceMetadata) {
+    if (isAuthorizationRequired()
+        && !dataSourceMetadata.getName().equals(DEFAULT_DATASOURCE_NAME)) {
+      boolean isAuthorized = false;
+      for (String role : getUserRoles()) {
+        if (dataSourceMetadata.getAllowedRoles().contains(role) || role.equals("all_access")) {
+          isAuthorized = true;
+          break;
+        }
+      }
+      if (!isAuthorized) {
+        throw new OpenSearchSecurityException(
+            String.format(
+                "User is not authorized to access datasource %s. "
+                    + "User should be mapped to any of the roles in %s for access.",
+                dataSourceMetadata.getName(), dataSourceMetadata.getAllowedRoles().toString()),
+            RestStatus.UNAUTHORIZED);
+      }
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/encryptor/Encryptor.java b/datasources/src/main/java/org/opensearch/sql/datasources/encryptor/Encryptor.java
new file mode 100644
index 0000000000..4572b45f53
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/encryptor/Encryptor.java
@@ -0,0 +1,27 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.encryptor;
+
+public interface Encryptor {
+
+  /**
+   * Takes plaintext and returns encrypted text.
+   *
+   * @param plainText plainText.
+   * @return String encryptedText.
+   */
+  String encrypt(String plainText);
+
+  /**
+   * Takes encryptedText and returns plain text.
+   *
+   * @param encryptedText encryptedText.
+   * @return String plainText.
+   */
+  String decrypt(String encryptedText);
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/encryptor/EncryptorImpl.java b/datasources/src/main/java/org/opensearch/sql/datasources/encryptor/EncryptorImpl.java
new file mode 100644
index 0000000000..c6abe78394
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/encryptor/EncryptorImpl.java
@@ -0,0 +1,76 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.encryptor;
+
+import com.amazonaws.encryptionsdk.AwsCrypto;
+import com.amazonaws.encryptionsdk.CommitmentPolicy;
+import com.amazonaws.encryptionsdk.CryptoResult;
+import com.amazonaws.encryptionsdk.jce.JceMasterKey;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import javax.crypto.spec.SecretKeySpec;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+@RequiredArgsConstructor
+public class EncryptorImpl implements Encryptor {
+
+  private final String masterKey;
+
+  @Override
+  public String encrypt(String plainText) {
+    validate(masterKey);
+    final AwsCrypto crypto =
+        AwsCrypto.builder()
+            .withCommitmentPolicy(CommitmentPolicy.RequireEncryptRequireDecrypt)
+            .build();
+
+    JceMasterKey jceMasterKey =
+        JceMasterKey.getInstance(
+            new SecretKeySpec(masterKey.getBytes(), "AES"),
+            "Custom",
+            "opensearch.config.master.key",
+            "AES/GCM/NoPadding");
+
+    final CryptoResult<byte[], JceMasterKey> encryptResult =
+        crypto.encryptData(jceMasterKey, plainText.getBytes(StandardCharsets.UTF_8));
+    return Base64.getEncoder().encodeToString(encryptResult.getResult());
+  }
+
+  @Override
+  public String decrypt(String encryptedText) {
+    validate(masterKey);
+    final AwsCrypto crypto =
+        AwsCrypto.builder()
+            .withCommitmentPolicy(CommitmentPolicy.RequireEncryptRequireDecrypt)
+            .build();
+
+    JceMasterKey jceMasterKey =
+        JceMasterKey.getInstance(
+            new SecretKeySpec(masterKey.getBytes(), "AES"),
+            "Custom",
+            "opensearch.config.master.key",
+            "AES/GCM/NoPadding");
+
+    final CryptoResult<byte[], JceMasterKey> decryptedResult =
+        crypto.decryptData(jceMasterKey, Base64.getDecoder().decode(encryptedText));
+    return new String(decryptedResult.getResult());
+  }
+
+  private void validate(String masterKey) {
+    if (StringUtils.isEmpty(masterKey)) {
+      throw new IllegalStateException(
+          "Master key is a required config for using create and update datasource APIs."
+              + "Please set plugins.query.datasources.encryption.masterkey config "
+              + "in opensearch.yml in all the cluster nodes. "
+              + "More details can be found here: "
+              + "https://github.com/opensearch-project/sql/blob/main/docs/user/ppl/"
+              + "admin/datasources.rst#master-key-config-for-encrypting-credential-information");
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/DataSourceClientException.java b/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/DataSourceClientException.java
new file mode 100644
index 0000000000..a7a0218761
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/DataSourceClientException.java
@@ -0,0 +1,19 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.exceptions;
+
+/**
+ * This is the base class for all DataSource Client Exceptions. All datasource connector modules
+ * will extend this exception for their respective connection clients.
+ */
+public class DataSourceClientException extends RuntimeException {
+
+  public DataSourceClientException(String message) {
+    super(message);
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/DataSourceNotFoundException.java b/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/DataSourceNotFoundException.java
new file mode 100644
index 0000000000..7850543910
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/DataSourceNotFoundException.java
@@ -0,0 +1,15 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.exceptions;
+
+/** DataSourceNotFoundException. */
+public class DataSourceNotFoundException extends DataSourceClientException {
+  public DataSourceNotFoundException(String message) {
+    super(message);
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/DatasourceDisabledException.java b/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/DatasourceDisabledException.java
new file mode 100644
index 0000000000..181721a6cc
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/DatasourceDisabledException.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.exceptions;
+
+/** Exception for taking actions on a disabled datasource. */
+public class DatasourceDisabledException extends DataSourceClientException {
+  public DatasourceDisabledException(String message) {
+    super(message);
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/ErrorMessage.java b/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/ErrorMessage.java
new file mode 100644
index 0000000000..a0c0f5e24d
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/exceptions/ErrorMessage.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.exceptions;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import lombok.Getter;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.sql.utils.SerializeUtils;
+
+/** Error Message. */
+public class ErrorMessage {
+
+  protected Throwable exception;
+
+  private final int status;
+
+  @Getter private final String type;
+
+  @Getter private final String reason;
+
+  @Getter private final String details;
+
+  /** Error Message Constructor. */
+  public ErrorMessage(Throwable exception, int status) {
+    this.exception = exception;
+    this.status = status;
+
+    this.type = fetchType();
+    this.reason = fetchReason();
+    this.details = fetchDetails();
+  }
+
+  private String fetchType() {
+    return exception.getClass().getSimpleName();
+  }
+
+  protected String fetchReason() {
+    if (status == RestStatus.TOO_MANY_REQUESTS.getStatus()) {
+      return "Too Many Requests";
+    }
+    return status == RestStatus.BAD_REQUEST.getStatus()
+        ? "Invalid Request"
+        : "There was internal problem at backend";
+  }
+
+  protected String fetchDetails() {
+    // Some exception prints internal information (full class name) which is security concern
+    return emptyStringIfNull(exception.getLocalizedMessage());
+  }
+
+  private String emptyStringIfNull(String str) {
+    return str != null ? str : "";
+  }
+
+  @Override
+  public String toString() {
+    JsonObject jsonObject = new JsonObject();
+    jsonObject.addProperty("status", status);
+    jsonObject.add("error", getErrorAsJson());
+    Gson gson = SerializeUtils.getGsonBuilder().setPrettyPrinting().create();
+    return gson.toJson(jsonObject);
+  }
+
+  private JsonObject getErrorAsJson() {
+    JsonObject errorJson = new JsonObject();
+    errorJson.addProperty("type", type);
+    errorJson.addProperty("reason", reason);
+    errorJson.addProperty("details", details);
+    return errorJson;
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/glue/GlueDataSourceFactory.java b/datasources/src/main/java/org/opensearch/sql/datasources/glue/GlueDataSourceFactory.java
new file mode 100644
index 0000000000..11a33a2969
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/glue/GlueDataSourceFactory.java
@@ -0,0 +1,97 @@
+package org.opensearch.sql.datasources.glue;
+
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.util.Map;
+import java.util.Set;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.datasources.auth.AuthenticationType;
+import org.opensearch.sql.datasources.utils.DatasourceValidationUtils;
+import org.opensearch.sql.storage.DataSourceFactory;
+
+@RequiredArgsConstructor
+public class GlueDataSourceFactory implements DataSourceFactory {
+
+  private final Settings pluginSettings;
+
+  // Glue configuration properties
+  public static final String GLUE_AUTH_TYPE = "glue.auth.type";
+  public static final String GLUE_ROLE_ARN = "glue.auth.role_arn";
+  public static final String GLUE_INDEX_STORE_OPENSEARCH_URI = "glue.indexstore.opensearch.uri";
+  public static final String GLUE_INDEX_STORE_OPENSEARCH_AUTH = "glue.indexstore.opensearch.auth";
+  public static final String GLUE_INDEX_STORE_OPENSEARCH_AUTH_USERNAME =
+      "glue.indexstore.opensearch.auth.username";
+  public static final String GLUE_INDEX_STORE_OPENSEARCH_AUTH_PASSWORD =
+      "glue.indexstore.opensearch.auth.password";
+  public static final String GLUE_INDEX_STORE_OPENSEARCH_REGION =
+      "glue.indexstore.opensearch.region";
+  public static final String GLUE_ICEBERG_ENABLED = "glue.iceberg.enabled";
+  public static final String GLUE_LAKEFORMATION_ENABLED = "glue.lakeformation.enabled";
+  public static final String GLUE_LAKEFORMATION_SESSION_TAG = "glue.lakeformation.session_tag";
+
+  @Override
+  public DataSourceType getDataSourceType() {
+    return DataSourceType.S3GLUE;
+  }
+
+  @Override
+  public DataSource createDataSource(DataSourceMetadata metadata) {
+    try {
+      validateGlueDataSourceConfiguration(metadata.getProperties());
+      return new DataSource(
+          metadata.getName(),
+          metadata.getConnector(),
+          (dataSourceSchemaName, tableName) -> {
+            throw new UnsupportedOperationException("Glue storage engine is not supported.");
+          });
+    } catch (URISyntaxException | UnknownHostException e) {
+      throw new IllegalArgumentException("Invalid flint host in properties.");
+    }
+  }
+
+  private void validateGlueDataSourceConfiguration(Map<String, String> dataSourceMetadataConfig)
+      throws URISyntaxException, UnknownHostException {
+
+    DatasourceValidationUtils.validateLengthAndRequiredFields(
+        dataSourceMetadataConfig,
+        Set.of(
+            GLUE_AUTH_TYPE,
+            GLUE_ROLE_ARN,
+            GLUE_INDEX_STORE_OPENSEARCH_URI,
+            GLUE_INDEX_STORE_OPENSEARCH_AUTH));
+    AuthenticationType authenticationType =
+        AuthenticationType.get(dataSourceMetadataConfig.get(GLUE_INDEX_STORE_OPENSEARCH_AUTH));
+    if (AuthenticationType.BASICAUTH.equals(authenticationType)) {
+      DatasourceValidationUtils.validateLengthAndRequiredFields(
+          dataSourceMetadataConfig,
+          Set.of(
+              GLUE_INDEX_STORE_OPENSEARCH_AUTH_USERNAME,
+              GLUE_INDEX_STORE_OPENSEARCH_AUTH_PASSWORD));
+    } else if (AuthenticationType.AWSSIGV4AUTH.equals(authenticationType)) {
+      DatasourceValidationUtils.validateLengthAndRequiredFields(
+          dataSourceMetadataConfig, Set.of(GLUE_INDEX_STORE_OPENSEARCH_REGION));
+    }
+    DatasourceValidationUtils.validateHost(
+        dataSourceMetadataConfig.get(GLUE_INDEX_STORE_OPENSEARCH_URI),
+        pluginSettings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST));
+
+    // validate Lake Formation config
+    if (BooleanUtils.toBoolean(dataSourceMetadataConfig.get(GLUE_LAKEFORMATION_ENABLED))) {
+      if (!BooleanUtils.toBoolean(dataSourceMetadataConfig.get(GLUE_ICEBERG_ENABLED))) {
+        throw new IllegalArgumentException(
+            "Lake Formation can only be enabled when Iceberg is enabled.");
+      }
+
+      if (StringUtils.isBlank(dataSourceMetadataConfig.get(GLUE_LAKEFORMATION_SESSION_TAG))) {
+        throw new IllegalArgumentException(
+            "Lake Formation session tag must be specified when enabling Lake Formation");
+      }
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/glue/SecurityLakeDataSourceFactory.java b/datasources/src/main/java/org/opensearch/sql/datasources/glue/SecurityLakeDataSourceFactory.java
new file mode 100644
index 0000000000..0f336a08d1
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/glue/SecurityLakeDataSourceFactory.java
@@ -0,0 +1,57 @@
+package org.opensearch.sql.datasources.glue;
+
+import java.util.Map;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+
+public class SecurityLakeDataSourceFactory extends GlueDataSourceFactory {
+
+  private final Settings pluginSettings;
+
+  public static final String TRUE = "true";
+
+  public SecurityLakeDataSourceFactory(final Settings pluginSettings) {
+    super(pluginSettings);
+    this.pluginSettings = pluginSettings;
+  }
+
+  @Override
+  public DataSourceType getDataSourceType() {
+    return DataSourceType.SECURITY_LAKE;
+  }
+
+  @Override
+  public DataSource createDataSource(DataSourceMetadata metadata) {
+    validateProperties(metadata.getProperties());
+    metadata.getProperties().put(GlueDataSourceFactory.GLUE_ICEBERG_ENABLED, TRUE);
+    metadata.getProperties().put(GlueDataSourceFactory.GLUE_LAKEFORMATION_ENABLED, TRUE);
+    return super.createDataSource(metadata);
+  }
+
+  private void validateProperties(Map<String, String> properties) {
+    // validate Lake Formation config
+    if (properties.get(GlueDataSourceFactory.GLUE_ICEBERG_ENABLED) != null
+        && !BooleanUtils.toBoolean(properties.get(GlueDataSourceFactory.GLUE_ICEBERG_ENABLED))) {
+      throw new IllegalArgumentException(
+          GlueDataSourceFactory.GLUE_ICEBERG_ENABLED
+              + " cannot be false when using Security Lake data source.");
+    }
+
+    if (properties.get(GlueDataSourceFactory.GLUE_LAKEFORMATION_ENABLED) != null
+        && !BooleanUtils.toBoolean(
+            properties.get(GlueDataSourceFactory.GLUE_LAKEFORMATION_ENABLED))) {
+      throw new IllegalArgumentException(
+          GLUE_LAKEFORMATION_ENABLED + " cannot be false when using Security Lake data source.");
+    }
+
+    if (StringUtils.isBlank(properties.get(GLUE_LAKEFORMATION_SESSION_TAG))) {
+      throw new IllegalArgumentException(
+          GlueDataSourceFactory.GLUE_LAKEFORMATION_SESSION_TAG
+              + " must be specified when using Security Lake data source");
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/CreateDataSourceActionRequest.java b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/CreateDataSourceActionRequest.java
new file mode 100644
index 0000000000..b01d5b40dd
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/CreateDataSourceActionRequest.java
@@ -0,0 +1,43 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.model.transport;
+
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
+
+import java.io.IOException;
+import lombok.Getter;
+import org.opensearch.action.ActionRequest;
+import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+
+public class CreateDataSourceActionRequest extends ActionRequest {
+
+  @Getter private DataSourceMetadata dataSourceMetadata;
+
+  /** Constructor of CreateDataSourceActionRequest from StreamInput. */
+  public CreateDataSourceActionRequest(StreamInput in) throws IOException {
+    super(in);
+  }
+
+  public CreateDataSourceActionRequest(DataSourceMetadata dataSourceMetadata) {
+    this.dataSourceMetadata = dataSourceMetadata;
+  }
+
+  @Override
+  public ActionRequestValidationException validate() {
+    if (this.dataSourceMetadata.getName().equals(DEFAULT_DATASOURCE_NAME)) {
+      ActionRequestValidationException exception = new ActionRequestValidationException();
+      exception.addValidationError(
+          "Not allowed to create datasource with name : " + DEFAULT_DATASOURCE_NAME);
+      return exception;
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/CreateDataSourceActionResponse.java b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/CreateDataSourceActionResponse.java
new file mode 100644
index 0000000000..aeb1e2d3d9
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/CreateDataSourceActionResponse.java
@@ -0,0 +1,31 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.model.transport;
+
+import java.io.IOException;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+
+@RequiredArgsConstructor
+public class CreateDataSourceActionResponse extends ActionResponse {
+
+  @Getter private final String result;
+
+  public CreateDataSourceActionResponse(StreamInput in) throws IOException {
+    super(in);
+    result = in.readString();
+  }
+
+  @Override
+  public void writeTo(StreamOutput streamOutput) throws IOException {
+    streamOutput.writeString(result);
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/DeleteDataSourceActionRequest.java b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/DeleteDataSourceActionRequest.java
new file mode 100644
index 0000000000..d6e3bcb3f9
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/DeleteDataSourceActionRequest.java
@@ -0,0 +1,47 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.model.transport;
+
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
+
+import java.io.IOException;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+import org.opensearch.action.ActionRequest;
+import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.core.common.io.stream.StreamInput;
+
+public class DeleteDataSourceActionRequest extends ActionRequest {
+
+  @Getter private String dataSourceName;
+
+  /** Constructor of DeleteDataSourceActionRequest from StreamInput. */
+  public DeleteDataSourceActionRequest(StreamInput in) throws IOException {
+    super(in);
+  }
+
+  public DeleteDataSourceActionRequest(String dataSourceName) {
+    this.dataSourceName = dataSourceName;
+  }
+
+  @Override
+  public ActionRequestValidationException validate() {
+    if (StringUtils.isEmpty(this.dataSourceName)) {
+      ActionRequestValidationException exception = new ActionRequestValidationException();
+      exception.addValidationError("Datasource Name cannot be empty or null");
+      return exception;
+    } else if (this.dataSourceName.equals(DEFAULT_DATASOURCE_NAME)) {
+      ActionRequestValidationException exception = new ActionRequestValidationException();
+      exception.addValidationError(
+          "Not allowed to delete datasource with name : " + DEFAULT_DATASOURCE_NAME);
+      return exception;
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/DeleteDataSourceActionResponse.java b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/DeleteDataSourceActionResponse.java
new file mode 100644
index 0000000000..d8c29c2a67
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/DeleteDataSourceActionResponse.java
@@ -0,0 +1,31 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.model.transport;
+
+import java.io.IOException;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+
+@RequiredArgsConstructor
+public class DeleteDataSourceActionResponse extends ActionResponse {
+
+  @Getter private final String result;
+
+  public DeleteDataSourceActionResponse(StreamInput in) throws IOException {
+    super(in);
+    result = in.readString();
+  }
+
+  @Override
+  public void writeTo(StreamOutput streamOutput) throws IOException {
+    streamOutput.writeString(result);
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/GetDataSourceActionRequest.java b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/GetDataSourceActionRequest.java
new file mode 100644
index 0000000000..2d9a4de35a
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/GetDataSourceActionRequest.java
@@ -0,0 +1,44 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.model.transport;
+
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
+
+import java.io.IOException;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.opensearch.action.ActionRequest;
+import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.core.common.io.stream.StreamInput;
+
+@NoArgsConstructor
+public class GetDataSourceActionRequest extends ActionRequest {
+
+  @Getter private String dataSourceName;
+
+  /** Constructor of GetDataSourceActionRequest from StreamInput. */
+  public GetDataSourceActionRequest(StreamInput in) throws IOException {
+    super(in);
+  }
+
+  public GetDataSourceActionRequest(String dataSourceName) {
+    this.dataSourceName = dataSourceName;
+  }
+
+  @Override
+  public ActionRequestValidationException validate() {
+    if (this.dataSourceName != null && this.dataSourceName.equals(DEFAULT_DATASOURCE_NAME)) {
+      ActionRequestValidationException exception = new ActionRequestValidationException();
+      exception.addValidationError(
+          "Not allowed to fetch datasource with name : " + DEFAULT_DATASOURCE_NAME);
+      return exception;
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/GetDataSourceActionResponse.java b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/GetDataSourceActionResponse.java
new file mode 100644
index 0000000000..ac8d5d4c62
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/GetDataSourceActionResponse.java
@@ -0,0 +1,31 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.model.transport;
+
+import java.io.IOException;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+
+@RequiredArgsConstructor
+public class GetDataSourceActionResponse extends ActionResponse {
+
+  @Getter private final String result;
+
+  public GetDataSourceActionResponse(StreamInput in) throws IOException {
+    super(in);
+    result = in.readString();
+  }
+
+  @Override
+  public void writeTo(StreamOutput streamOutput) throws IOException {
+    streamOutput.writeString(result);
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/PatchDataSourceActionRequest.java b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/PatchDataSourceActionRequest.java
new file mode 100644
index 0000000000..9443ea561e
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/PatchDataSourceActionRequest.java
@@ -0,0 +1,49 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.model.transport;
+
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
+import static org.opensearch.sql.datasources.utils.XContentParserUtils.CONNECTOR_FIELD;
+import static org.opensearch.sql.datasources.utils.XContentParserUtils.NAME_FIELD;
+
+import java.io.IOException;
+import java.util.Map;
+import lombok.Getter;
+import org.opensearch.action.ActionRequest;
+import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.core.common.io.stream.StreamInput;
+
+public class PatchDataSourceActionRequest extends ActionRequest {
+
+  @Getter private Map<String, Object> dataSourceData;
+
+  /** Constructor of UpdateDataSourceActionRequest from StreamInput. */
+  public PatchDataSourceActionRequest(StreamInput in) throws IOException {
+    super(in);
+  }
+
+  public PatchDataSourceActionRequest(Map<String, Object> dataSourceData) {
+    this.dataSourceData = dataSourceData;
+  }
+
+  @Override
+  public ActionRequestValidationException validate() {
+    if (this.dataSourceData.get(NAME_FIELD).equals(DEFAULT_DATASOURCE_NAME)) {
+      ActionRequestValidationException exception = new ActionRequestValidationException();
+      exception.addValidationError(
+          "Not allowed to update datasource with name : " + DEFAULT_DATASOURCE_NAME);
+      return exception;
+    } else if (this.dataSourceData.get(CONNECTOR_FIELD) != null) {
+      ActionRequestValidationException exception = new ActionRequestValidationException();
+      exception.addValidationError("Not allowed to update connector for datasource");
+      return exception;
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/PatchDataSourceActionResponse.java b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/PatchDataSourceActionResponse.java
new file mode 100644
index 0000000000..18873a6731
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/PatchDataSourceActionResponse.java
@@ -0,0 +1,31 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.model.transport;
+
+import java.io.IOException;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+
+@RequiredArgsConstructor
+public class PatchDataSourceActionResponse extends ActionResponse {
+
+  @Getter private final String result;
+
+  public PatchDataSourceActionResponse(StreamInput in) throws IOException {
+    super(in);
+    result = in.readString();
+  }
+
+  @Override
+  public void writeTo(StreamOutput streamOutput) throws IOException {
+    streamOutput.writeString(result);
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/UpdateDataSourceActionRequest.java b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/UpdateDataSourceActionRequest.java
new file mode 100644
index 0000000000..b502f348e2
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/UpdateDataSourceActionRequest.java
@@ -0,0 +1,43 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.model.transport;
+
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
+
+import java.io.IOException;
+import lombok.Getter;
+import org.opensearch.action.ActionRequest;
+import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+
+public class UpdateDataSourceActionRequest extends ActionRequest {
+
+  @Getter private DataSourceMetadata dataSourceMetadata;
+
+  /** Constructor of UpdateDataSourceActionRequest from StreamInput. */
+  public UpdateDataSourceActionRequest(StreamInput in) throws IOException {
+    super(in);
+  }
+
+  public UpdateDataSourceActionRequest(DataSourceMetadata dataSourceMetadata) {
+    this.dataSourceMetadata = dataSourceMetadata;
+  }
+
+  @Override
+  public ActionRequestValidationException validate() {
+    if (this.dataSourceMetadata.getName().equals(DEFAULT_DATASOURCE_NAME)) {
+      ActionRequestValidationException exception = new ActionRequestValidationException();
+      exception.addValidationError(
+          "Not allowed to update datasource with name : " + DEFAULT_DATASOURCE_NAME);
+      return exception;
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/UpdateDataSourceActionResponse.java b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/UpdateDataSourceActionResponse.java
new file mode 100644
index 0000000000..0be992d067
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/model/transport/UpdateDataSourceActionResponse.java
@@ -0,0 +1,31 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.model.transport;
+
+import java.io.IOException;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+
+@RequiredArgsConstructor
+public class UpdateDataSourceActionResponse extends ActionResponse {
+
+  @Getter private final String result;
+
+  public UpdateDataSourceActionResponse(StreamInput in) throws IOException {
+    super(in);
+    result = in.readString();
+  }
+
+  @Override
+  public void writeTo(StreamOutput streamOutput) throws IOException {
+    streamOutput.writeString(result);
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryAction.java b/datasources/src/main/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryAction.java
new file mode 100644
index 0000000000..558a7fe4b2
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryAction.java
@@ -0,0 +1,346 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.rest;
+
+import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
+import static org.opensearch.core.rest.RestStatus.INTERNAL_SERVER_ERROR;
+import static org.opensearch.core.rest.RestStatus.NOT_FOUND;
+import static org.opensearch.rest.RestRequest.Method.*;
+
+import com.google.common.collect.ImmutableList;
+import java.io.IOException;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.OpenSearchException;
+import org.opensearch.OpenSearchSecurityException;
+import org.opensearch.OpenSearchStatusException;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.rest.BaseRestHandler;
+import org.opensearch.rest.BytesRestResponse;
+import org.opensearch.rest.RestChannel;
+import org.opensearch.rest.RestRequest;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasources.exceptions.DataSourceNotFoundException;
+import org.opensearch.sql.datasources.exceptions.ErrorMessage;
+import org.opensearch.sql.datasources.model.transport.*;
+import org.opensearch.sql.datasources.transport.*;
+import org.opensearch.sql.datasources.utils.Scheduler;
+import org.opensearch.sql.datasources.utils.XContentParserUtils;
+import org.opensearch.sql.legacy.metrics.MetricName;
+import org.opensearch.sql.legacy.utils.MetricUtils;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.sql.opensearch.util.RestRequestUtil;
+
+@RequiredArgsConstructor
+public class RestDataSourceQueryAction extends BaseRestHandler {
+
+  public static final String DATASOURCE_ACTIONS = "datasource_actions";
+  public static final String BASE_DATASOURCE_ACTION_URL = "/_plugins/_query/_datasources";
+
+  private static final Logger LOG = LogManager.getLogger(RestDataSourceQueryAction.class);
+
+  private final OpenSearchSettings settings;
+
+  @Override
+  public String getName() {
+    return DATASOURCE_ACTIONS;
+  }
+
+  @Override
+  public List<Route> routes() {
+    return ImmutableList.of(
+
+        /*
+         *
+         * Create a new datasource.
+         * Request URL: POST
+         * Request body:
+         * Ref [org.opensearch.sql.plugin.transport.datasource.model.CreateDataSourceActionRequest]
+         * Response body:
+         * Ref [org.opensearch.sql.plugin.transport.datasource.model.CreateDataSourceActionResponse]
+         */
+        new Route(POST, BASE_DATASOURCE_ACTION_URL),
+
+        /*
+         * GET datasources
+         * Request URL: GET
+         * Request body:
+         * Ref [org.opensearch.sql.plugin.transport.datasource.model.GetDataSourceActionRequest]
+         * Response body:
+         * Ref [org.opensearch.sql.plugin.transport.datasource.model.GetDataSourceActionResponse]
+         */
+        new Route(
+            GET,
+            String.format(Locale.ROOT, "%s/{%s}", BASE_DATASOURCE_ACTION_URL, "dataSourceName")),
+        new Route(GET, BASE_DATASOURCE_ACTION_URL),
+
+        /*
+         * PUT datasources
+         * Request body:
+         * Ref
+         * [org.opensearch.sql.plugin.transport.datasource.model.UpdateDataSourceActionRequest]
+         * Response body:
+         * Ref
+         * [org.opensearch.sql.plugin.transport.datasource.model.UpdateDataSourceActionResponse]
+         */
+        new Route(PUT, BASE_DATASOURCE_ACTION_URL),
+
+        /*
+         * PATCH datasources
+         * Request body:
+         * Ref
+         * [org.opensearch.sql.plugin.transport.datasource.model.PatchDataSourceActionRequest]
+         * Response body:
+         * Ref
+         * [org.opensearch.sql.plugin.transport.datasource.model.PatchDataSourceActionResponse]
+         */
+        new Route(PATCH, BASE_DATASOURCE_ACTION_URL),
+
+        /*
+         * DELETE datasources
+         * Request body: Ref
+         * [org.opensearch.sql.plugin.transport.datasource.model.DeleteDataSourceActionRequest]
+         * Response body: Ref
+         * [org.opensearch.sql.plugin.transport.datasource.model.DeleteDataSourceActionResponse]
+         */
+        new Route(
+            DELETE,
+            String.format(Locale.ROOT, "%s/{%s}", BASE_DATASOURCE_ACTION_URL, "dataSourceName")));
+  }
+
+  @Override
+  protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient nodeClient)
+      throws IOException {
+    if (!enabled()) {
+      return disabledError(restRequest);
+    }
+    switch (restRequest.method()) {
+      case POST:
+        return executePostRequest(restRequest, nodeClient);
+      case GET:
+        return executeGetRequest(restRequest, nodeClient);
+      case PUT:
+        return executeUpdateRequest(restRequest, nodeClient);
+      case DELETE:
+        return executeDeleteRequest(restRequest, nodeClient);
+      case PATCH:
+        return executePatchRequest(restRequest, nodeClient);
+      default:
+        return restChannel ->
+            restChannel.sendResponse(
+                new BytesRestResponse(
+                    RestStatus.METHOD_NOT_ALLOWED, String.valueOf(restRequest.method())));
+    }
+  }
+
+  private RestChannelConsumer executePostRequest(RestRequest restRequest, NodeClient nodeClient)
+      throws IOException {
+    MetricUtils.incrementNumericalMetric(MetricName.DATASOURCE_CREATION_REQ_COUNT);
+    DataSourceMetadata dataSourceMetadata =
+        XContentParserUtils.toDataSourceMetadata(restRequest.contentParser());
+    return restChannel ->
+        Scheduler.schedule(
+            nodeClient,
+            () ->
+                nodeClient.execute(
+                    TransportCreateDataSourceAction.ACTION_TYPE,
+                    new CreateDataSourceActionRequest(dataSourceMetadata),
+                    new ActionListener<>() {
+                      @Override
+                      public void onResponse(
+                          CreateDataSourceActionResponse createDataSourceActionResponse) {
+                        restChannel.sendResponse(
+                            new BytesRestResponse(
+                                RestStatus.CREATED,
+                                "application/json; charset=UTF-8",
+                                createDataSourceActionResponse.getResult()));
+                      }
+
+                      @Override
+                      public void onFailure(Exception e) {
+                        handleException(e, restChannel);
+                      }
+                    }));
+  }
+
+  private RestChannelConsumer executeGetRequest(RestRequest restRequest, NodeClient nodeClient) {
+    MetricUtils.incrementNumericalMetric(MetricName.DATASOURCE_GET_REQ_COUNT);
+    String dataSourceName = restRequest.param("dataSourceName");
+    return restChannel ->
+        Scheduler.schedule(
+            nodeClient,
+            () ->
+                nodeClient.execute(
+                    TransportGetDataSourceAction.ACTION_TYPE,
+                    new GetDataSourceActionRequest(dataSourceName),
+                    new ActionListener<>() {
+                      @Override
+                      public void onResponse(
+                          GetDataSourceActionResponse getDataSourceActionResponse) {
+                        restChannel.sendResponse(
+                            new BytesRestResponse(
+                                RestStatus.OK,
+                                "application/json; charset=UTF-8",
+                                getDataSourceActionResponse.getResult()));
+                      }
+
+                      @Override
+                      public void onFailure(Exception e) {
+                        handleException(e, restChannel);
+                      }
+                    }));
+  }
+
+  private RestChannelConsumer executeUpdateRequest(RestRequest restRequest, NodeClient nodeClient)
+      throws IOException {
+    MetricUtils.incrementNumericalMetric(MetricName.DATASOURCE_PUT_REQ_COUNT);
+    DataSourceMetadata dataSourceMetadata =
+        XContentParserUtils.toDataSourceMetadata(restRequest.contentParser());
+    return restChannel ->
+        Scheduler.schedule(
+            nodeClient,
+            () ->
+                nodeClient.execute(
+                    TransportUpdateDataSourceAction.ACTION_TYPE,
+                    new UpdateDataSourceActionRequest(dataSourceMetadata),
+                    new ActionListener<>() {
+                      @Override
+                      public void onResponse(
+                          UpdateDataSourceActionResponse updateDataSourceActionResponse) {
+                        restChannel.sendResponse(
+                            new BytesRestResponse(
+                                RestStatus.OK,
+                                "application/json; charset=UTF-8",
+                                updateDataSourceActionResponse.getResult()));
+                      }
+
+                      @Override
+                      public void onFailure(Exception e) {
+                        handleException(e, restChannel);
+                      }
+                    }));
+  }
+
+  private RestChannelConsumer executePatchRequest(RestRequest restRequest, NodeClient nodeClient)
+      throws IOException {
+    MetricUtils.incrementNumericalMetric(MetricName.DATASOURCE_PATCH_REQ_COUNT);
+    Map<String, Object> dataSourceData = XContentParserUtils.toMap(restRequest.contentParser());
+    return restChannel ->
+        Scheduler.schedule(
+            nodeClient,
+            () ->
+                nodeClient.execute(
+                    TransportPatchDataSourceAction.ACTION_TYPE,
+                    new PatchDataSourceActionRequest(dataSourceData),
+                    new ActionListener<>() {
+                      @Override
+                      public void onResponse(
+                          PatchDataSourceActionResponse patchDataSourceActionResponse) {
+                        restChannel.sendResponse(
+                            new BytesRestResponse(
+                                RestStatus.OK,
+                                "application/json; charset=UTF-8",
+                                patchDataSourceActionResponse.getResult()));
+                      }
+
+                      @Override
+                      public void onFailure(Exception e) {
+                        handleException(e, restChannel);
+                      }
+                    }));
+  }
+
+  private RestChannelConsumer executeDeleteRequest(RestRequest restRequest, NodeClient nodeClient) {
+    MetricUtils.incrementNumericalMetric(MetricName.DATASOURCE_DELETE_REQ_COUNT);
+    String dataSourceName = restRequest.param("dataSourceName");
+    return restChannel ->
+        Scheduler.schedule(
+            nodeClient,
+            () ->
+                nodeClient.execute(
+                    TransportDeleteDataSourceAction.ACTION_TYPE,
+                    new DeleteDataSourceActionRequest(dataSourceName),
+                    new ActionListener<>() {
+                      @Override
+                      public void onResponse(
+                          DeleteDataSourceActionResponse deleteDataSourceActionResponse) {
+                        restChannel.sendResponse(
+                            new BytesRestResponse(
+                                RestStatus.NO_CONTENT,
+                                "application/json; charset=UTF-8",
+                                deleteDataSourceActionResponse.getResult()));
+                      }
+
+                      @Override
+                      public void onFailure(Exception e) {
+                        handleException(e, restChannel);
+                      }
+                    }));
+  }
+
+  private void handleException(Exception e, RestChannel restChannel) {
+    if (e instanceof DataSourceNotFoundException) {
+      MetricUtils.incrementNumericalMetric(MetricName.DATASOURCE_FAILED_REQ_COUNT_CUS);
+      reportError(restChannel, e, NOT_FOUND);
+    } else if (e instanceof OpenSearchSecurityException) {
+      MetricUtils.incrementNumericalMetric(MetricName.DATASOURCE_FAILED_REQ_COUNT_CUS);
+      OpenSearchSecurityException exception = (OpenSearchSecurityException) e;
+      reportError(restChannel, exception, exception.status());
+    } else if (e instanceof OpenSearchException) {
+      MetricUtils.incrementNumericalMetric(MetricName.DATASOURCE_FAILED_REQ_COUNT_SYS);
+      OpenSearchException exception = (OpenSearchException) e;
+      reportError(restChannel, exception, exception.status());
+    } else {
+      LOG.error("Error happened during request handling", e);
+      if (isClientError(e)) {
+        MetricUtils.incrementNumericalMetric(MetricName.DATASOURCE_FAILED_REQ_COUNT_CUS);
+        reportError(restChannel, e, BAD_REQUEST);
+      } else {
+        MetricUtils.incrementNumericalMetric(MetricName.DATASOURCE_FAILED_REQ_COUNT_SYS);
+        reportError(restChannel, e, INTERNAL_SERVER_ERROR);
+      }
+    }
+  }
+
+  private void reportError(final RestChannel channel, final Exception e, final RestStatus status) {
+    channel.sendResponse(
+        new BytesRestResponse(status, new ErrorMessage(e, status.getStatus()).toString()));
+  }
+
+  private static boolean isClientError(Exception e) {
+    return e instanceof NullPointerException
+        // NPE is hard to differentiate but more likely caused by bad query
+        || e instanceof IllegalArgumentException
+        || e instanceof IllegalStateException;
+  }
+
+  private boolean enabled() {
+    return settings.getSettingValue(Settings.Key.DATASOURCES_ENABLED);
+  }
+
+  private RestChannelConsumer disabledError(RestRequest request) {
+
+    RestRequestUtil.consumeAllRequestParameters(request);
+
+    return channel -> {
+      reportError(
+          channel,
+          new OpenSearchStatusException(
+              String.format("%s setting is false", Settings.Key.DATASOURCES_ENABLED.getKeyValue()),
+              BAD_REQUEST),
+          BAD_REQUEST);
+    };
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceLoaderCache.java b/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceLoaderCache.java
new file mode 100644
index 0000000000..dbcc321b3f
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceLoaderCache.java
@@ -0,0 +1,19 @@
+package org.opensearch.sql.datasources.service;
+
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+
+/**
+ * Interface for DataSourceLoaderCache which provides methods for fetch, loading and invalidating
+ * DataSource cache.
+ */
+public interface DataSourceLoaderCache {
+
+  /**
+   * Returns cached datasource object or loads a new one if not present.
+   *
+   * @param dataSourceMetadata {@link DataSourceMetadata}.
+   * @return {@link DataSource}
+   */
+  DataSource getOrLoadDataSource(DataSourceMetadata dataSourceMetadata);
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceLoaderCacheImpl.java b/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceLoaderCacheImpl.java
new file mode 100644
index 0000000000..44454dbd38
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceLoaderCacheImpl.java
@@ -0,0 +1,49 @@
+package org.opensearch.sql.datasources.service;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.storage.DataSourceFactory;
+
+/**
+ * Default implementation of DataSourceLoaderCache. This implementation utilizes Google Guava Cache
+ * {@link Cache} for caching DataSource objects against {@link DataSourceMetadata}. Expires the
+ * cache objects every 24 hrs after the last access.
+ */
+public class DataSourceLoaderCacheImpl implements DataSourceLoaderCache {
+  private final Map<DataSourceType, DataSourceFactory> dataSourceFactoryMap;
+  private final Cache<DataSourceMetadata, DataSource> dataSourceCache;
+
+  /**
+   * DataSourceLoaderCacheImpl constructor.
+   *
+   * @param dataSourceFactorySet set of {@link DataSourceFactory}.
+   */
+  public DataSourceLoaderCacheImpl(Set<DataSourceFactory> dataSourceFactorySet) {
+    this.dataSourceFactoryMap =
+        dataSourceFactorySet.stream()
+            .collect(Collectors.toMap(DataSourceFactory::getDataSourceType, f -> f));
+    this.dataSourceCache =
+        CacheBuilder.newBuilder().maximumSize(1000).expireAfterAccess(24, TimeUnit.HOURS).build();
+  }
+
+  @Override
+  public DataSource getOrLoadDataSource(DataSourceMetadata dataSourceMetadata) {
+    DataSource dataSource = this.dataSourceCache.getIfPresent(dataSourceMetadata);
+    if (dataSource == null) {
+      dataSource =
+          this.dataSourceFactoryMap
+              .get(dataSourceMetadata.getConnector())
+              .createDataSource(dataSourceMetadata);
+      this.dataSourceCache.put(dataSourceMetadata, dataSource);
+      return dataSource;
+    }
+    return dataSource;
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceMetadataStorage.java b/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceMetadataStorage.java
new file mode 100644
index 0000000000..4d59c68fa0
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceMetadataStorage.java
@@ -0,0 +1,56 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.service;
+
+import java.util.List;
+import java.util.Optional;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+
+/**
+ * Interface for DataSourceMetadata Storage which will be only used by DataSourceService for
+ * Storage.
+ */
+public interface DataSourceMetadataStorage {
+
+  /**
+   * Returns all dataSource Metadata objects. The returned objects won't contain any of the
+   * credential info.
+   *
+   * @return list of {@link DataSourceMetadata}.
+   */
+  List<DataSourceMetadata> getDataSourceMetadata();
+
+  /**
+   * Gets {@link DataSourceMetadata} corresponding to the datasourceName from underlying storage.
+   *
+   * @param datasourceName name of the {@link DataSource}.
+   */
+  Optional<DataSourceMetadata> getDataSourceMetadata(String datasourceName);
+
+  /**
+   * Stores {@link DataSourceMetadata} in underlying storage.
+   *
+   * @param dataSourceMetadata {@link DataSourceMetadata}.
+   */
+  void createDataSourceMetadata(DataSourceMetadata dataSourceMetadata);
+
+  /**
+   * Updates {@link DataSourceMetadata} in underlying storage.
+   *
+   * @param dataSourceMetadata {@link DataSourceMetadata}.
+   */
+  void updateDataSourceMetadata(DataSourceMetadata dataSourceMetadata);
+
+  /**
+   * Deletes {@link DataSourceMetadata} corresponding to the datasourceName from underlying storage.
+   *
+   * @param datasourceName name of the {@link DataSource}.
+   */
+  void deleteDataSourceMetadata(String datasourceName);
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceServiceImpl.java b/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceServiceImpl.java
new file mode 100644
index 0000000000..81b6432891
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceServiceImpl.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.service;
+
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
+import static org.opensearch.sql.datasources.utils.XContentParserUtils.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.RequestContext;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceStatus;
+import org.opensearch.sql.datasources.auth.DataSourceUserAuthorizationHelper;
+import org.opensearch.sql.datasources.exceptions.DataSourceNotFoundException;
+import org.opensearch.sql.datasources.exceptions.DatasourceDisabledException;
+import org.opensearch.sql.storage.DataSourceFactory;
+
+/**
+ * Default implementation of {@link DataSourceService}. It is per-jvm single instance.
+ *
+ * <p>{@link DataSourceService} is constructed by the list of {@link DataSourceFactory} at service
+ * bootstrap time. The set of {@link DataSourceFactory} is immutable. Client could add {@link
+ * DataSource} defined by {@link DataSourceMetadata} at any time. {@link DataSourceService} use
+ * {@link DataSourceFactory} to create {@link DataSource}.
+ */
+public class DataSourceServiceImpl implements DataSourceService {
+
+  public static final Set<String> CONFIDENTIAL_AUTH_KEYS =
+      Set.of("auth.username", "auth.password", "auth.access_key", "auth.secret_key");
+
+  private final DataSourceLoaderCache dataSourceLoaderCache;
+
+  private final DataSourceMetadataStorage dataSourceMetadataStorage;
+
+  private final DataSourceUserAuthorizationHelper dataSourceUserAuthorizationHelper;
+
+  /** Construct from the set of {@link DataSourceFactory} at bootstrap time. */
+  public DataSourceServiceImpl(
+      Set<DataSourceFactory> dataSourceFactories,
+      DataSourceMetadataStorage dataSourceMetadataStorage,
+      DataSourceUserAuthorizationHelper dataSourceUserAuthorizationHelper) {
+    this.dataSourceMetadataStorage = dataSourceMetadataStorage;
+    this.dataSourceUserAuthorizationHelper = dataSourceUserAuthorizationHelper;
+    this.dataSourceLoaderCache = new DataSourceLoaderCacheImpl(dataSourceFactories);
+  }
+
+  @Override
+  public Set<DataSourceMetadata> getDataSourceMetadata(boolean isDefaultDataSourceRequired) {
+    List<DataSourceMetadata> dataSourceMetadataList =
+        this.dataSourceMetadataStorage.getDataSourceMetadata();
+    Set<DataSourceMetadata> dataSourceMetadataSet = new HashSet<>(dataSourceMetadataList);
+    if (isDefaultDataSourceRequired) {
+      dataSourceMetadataSet.add(DataSourceMetadata.defaultOpenSearchDataSourceMetadata());
+    }
+    return removeAuthInfo(dataSourceMetadataSet);
+  }
+
+  @Override
+  public DataSourceMetadata getDataSourceMetadata(String dataSourceName) {
+    DataSourceMetadata dataSourceMetadata = getRawDataSourceMetadata(dataSourceName);
+    return removeAuthInfo(dataSourceMetadata);
+  }
+
+  @Override
+  public DataSource getDataSource(String dataSourceName) {
+    DataSourceMetadata dataSourceMetadata = getRawDataSourceMetadata(dataSourceName);
+    verifyDataSourceAccess(dataSourceMetadata);
+    return dataSourceLoaderCache.getOrLoadDataSource(dataSourceMetadata);
+  }
+
+  @Override
+  public void createDataSource(DataSourceMetadata metadata) {
+    if (!metadata.getName().equals(DEFAULT_DATASOURCE_NAME)) {
+      this.dataSourceLoaderCache.getOrLoadDataSource(metadata);
+      this.dataSourceMetadataStorage.createDataSourceMetadata(metadata);
+    }
+  }
+
+  @Override
+  public void updateDataSource(DataSourceMetadata dataSourceMetadata) {
+    if (!dataSourceMetadata.getName().equals(DEFAULT_DATASOURCE_NAME)) {
+      this.dataSourceLoaderCache.getOrLoadDataSource(dataSourceMetadata);
+      this.dataSourceMetadataStorage.updateDataSourceMetadata(dataSourceMetadata);
+    } else {
+      throw new UnsupportedOperationException(
+          "Not allowed to update default datasource :" + DEFAULT_DATASOURCE_NAME);
+    }
+  }
+
+  @Override
+  public void patchDataSource(Map<String, Object> dataSourceData) {
+    if (!dataSourceData.get(NAME_FIELD).equals(DEFAULT_DATASOURCE_NAME)) {
+      DataSourceMetadata dataSourceMetadata =
+          getRawDataSourceMetadata((String) dataSourceData.get(NAME_FIELD));
+      DataSourceMetadata updatedMetadata =
+          constructUpdatedDatasourceMetadata(dataSourceData, dataSourceMetadata);
+      updateDataSource(updatedMetadata);
+    } else {
+      throw new UnsupportedOperationException(
+          "Not allowed to update default datasource :" + DEFAULT_DATASOURCE_NAME);
+    }
+  }
+
+  @Override
+  public void deleteDataSource(String dataSourceName) {
+    if (dataSourceName.equals(DEFAULT_DATASOURCE_NAME)) {
+      throw new UnsupportedOperationException(
+          "Not allowed to delete default datasource :" + DEFAULT_DATASOURCE_NAME);
+    } else {
+      this.dataSourceMetadataStorage.deleteDataSourceMetadata(dataSourceName);
+    }
+  }
+
+  @Override
+  public Boolean dataSourceExists(String dataSourceName) {
+    return DEFAULT_DATASOURCE_NAME.equals(dataSourceName)
+        || this.dataSourceMetadataStorage.getDataSourceMetadata(dataSourceName).isPresent();
+  }
+
+  @Override
+  public DataSourceMetadata verifyDataSourceAccessAndGetRawMetadata(
+      String dataSourceName, RequestContext requestContext) {
+    DataSourceMetadata dataSourceMetadata = getRawDataSourceMetadata(dataSourceName);
+    verifyDataSourceAccess(dataSourceMetadata);
+    return dataSourceMetadata;
+  }
+
+  private void verifyDataSourceAccess(DataSourceMetadata dataSourceMetadata) {
+    if (dataSourceMetadata.getStatus().equals(DataSourceStatus.DISABLED)) {
+      throw new DatasourceDisabledException(
+          String.format("Datasource %s is disabled.", dataSourceMetadata.getName()));
+    }
+    this.dataSourceUserAuthorizationHelper.authorizeDataSource(dataSourceMetadata);
+  }
+
+  /**
+   * Replaces the fields in the map of the given metadata.
+   *
+   * @param dataSourceData
+   * @param metadata {@link DataSourceMetadata}.
+   */
+  private DataSourceMetadata constructUpdatedDatasourceMetadata(
+      Map<String, Object> dataSourceData, DataSourceMetadata metadata) {
+    DataSourceMetadata.Builder metadataBuilder = new DataSourceMetadata.Builder(metadata);
+    for (String key : dataSourceData.keySet()) {
+      switch (key) {
+          // Name and connector should not be modified
+        case DESCRIPTION_FIELD:
+          metadataBuilder.setDescription((String) dataSourceData.get(DESCRIPTION_FIELD));
+          break;
+        case ALLOWED_ROLES_FIELD:
+          metadataBuilder.setAllowedRoles((List<String>) dataSourceData.get(ALLOWED_ROLES_FIELD));
+          break;
+        case PROPERTIES_FIELD:
+          Map<String, String> properties = new HashMap<>(metadata.getProperties());
+          properties.putAll(((Map<String, String>) dataSourceData.get(PROPERTIES_FIELD)));
+          metadataBuilder.setProperties(properties);
+          break;
+        case RESULT_INDEX_FIELD:
+          metadataBuilder.setResultIndex((String) dataSourceData.get(RESULT_INDEX_FIELD));
+        case STATUS_FIELD:
+          metadataBuilder.setDataSourceStatus((DataSourceStatus) dataSourceData.get(STATUS_FIELD));
+        default:
+          break;
+      }
+    }
+    return metadataBuilder.validateAndBuild();
+  }
+
+  private DataSourceMetadata getRawDataSourceMetadata(String dataSourceName) {
+    if (dataSourceName.equals(DEFAULT_DATASOURCE_NAME)) {
+      return DataSourceMetadata.defaultOpenSearchDataSourceMetadata();
+    } else {
+      Optional<DataSourceMetadata> dataSourceMetadataOptional =
+          this.dataSourceMetadataStorage.getDataSourceMetadata(dataSourceName);
+      if (dataSourceMetadataOptional.isEmpty()) {
+        throw new DataSourceNotFoundException(
+            String.format("DataSource with name %s doesn't exist.", dataSourceName));
+      } else {
+        return dataSourceMetadataOptional.get();
+      }
+    }
+  }
+
+  // It is advised to avoid sending any kind credential
+  // info in api response from security point of view.
+  private Set<DataSourceMetadata> removeAuthInfo(Set<DataSourceMetadata> dataSourceMetadataSet) {
+    return dataSourceMetadataSet.stream().map(this::removeAuthInfo).collect(Collectors.toSet());
+  }
+
+  private DataSourceMetadata removeAuthInfo(DataSourceMetadata dataSourceMetadata) {
+    HashMap<String, String> safeProperties = new HashMap<>(dataSourceMetadata.getProperties());
+    safeProperties
+        .entrySet()
+        .removeIf(
+            entry ->
+                CONFIDENTIAL_AUTH_KEYS.stream()
+                    .anyMatch(confidentialKey -> entry.getKey().endsWith(confidentialKey)));
+    return new DataSourceMetadata.Builder(dataSourceMetadata)
+        .setProperties(safeProperties)
+        .validateAndBuild();
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java b/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java
new file mode 100644
index 0000000000..682d79c972
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java
@@ -0,0 +1,331 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.storage;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.action.DocWriteRequest;
+import org.opensearch.action.DocWriteResponse;
+import org.opensearch.action.admin.indices.create.CreateIndexRequest;
+import org.opensearch.action.admin.indices.create.CreateIndexResponse;
+import org.opensearch.action.delete.DeleteRequest;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.index.IndexRequest;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.support.WriteRequest;
+import org.opensearch.action.update.UpdateRequest;
+import org.opensearch.action.update.UpdateResponse;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.index.engine.DocumentMissingException;
+import org.opensearch.index.engine.VersionConflictEngineException;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasources.encryptor.Encryptor;
+import org.opensearch.sql.datasources.exceptions.DataSourceNotFoundException;
+import org.opensearch.sql.datasources.service.DataSourceMetadataStorage;
+import org.opensearch.sql.datasources.utils.XContentParserUtils;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+
+public class OpenSearchDataSourceMetadataStorage implements DataSourceMetadataStorage {
+
+  public static final String DATASOURCE_INDEX_NAME = ".ql-datasources";
+  private static final String DATASOURCE_INDEX_MAPPING_FILE_NAME = "datasources-index-mapping.yml";
+
+  private static final Integer DATASOURCE_QUERY_RESULT_SIZE = 10000;
+  private static final String DATASOURCE_INDEX_SETTINGS_FILE_NAME =
+      "datasources-index-settings.yml";
+  private static final Logger LOG = LogManager.getLogger();
+  private final Client client;
+  private final ClusterService clusterService;
+
+  private final Encryptor encryptor;
+  private final OpenSearchSettings settings;
+
+  /**
+   * This class implements DataSourceMetadataStorage interface using OpenSearch as underlying
+   * storage.
+   *
+   * @param client opensearch NodeClient.
+   * @param clusterService ClusterService.
+   * @param encryptor Encryptor.
+   */
+  public OpenSearchDataSourceMetadataStorage(
+      Client client,
+      ClusterService clusterService,
+      Encryptor encryptor,
+      OpenSearchSettings settings) {
+    this.client = client;
+    this.clusterService = clusterService;
+    this.encryptor = encryptor;
+    this.settings = settings;
+  }
+
+  @Override
+  public List<DataSourceMetadata> getDataSourceMetadata() {
+    if (!isEnabled()) {
+      return Collections.emptyList();
+    }
+    if (!this.clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME)) {
+      createDataSourcesIndex();
+      return Collections.emptyList();
+    }
+    return searchInDataSourcesIndex(QueryBuilders.matchAllQuery());
+  }
+
+  @Override
+  public Optional<DataSourceMetadata> getDataSourceMetadata(String datasourceName) {
+    if (!isEnabled()) {
+      return Optional.empty();
+    }
+    if (!this.clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME)) {
+      createDataSourcesIndex();
+      return Optional.empty();
+    }
+    // todo, in case docId == datasourceName, could read doc directly.
+    return searchInDataSourcesIndex(QueryBuilders.termQuery("name.keyword", datasourceName))
+        .stream()
+        .findFirst()
+        .map(x -> this.encryptDecryptAuthenticationData(x, false));
+  }
+
+  @Override
+  public void createDataSourceMetadata(DataSourceMetadata dataSourceMetadata) {
+    if (!isEnabled()) {
+      throw new IllegalStateException("Data source management is disabled");
+    }
+    encryptDecryptAuthenticationData(dataSourceMetadata, true);
+    if (!this.clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME)) {
+      createDataSourcesIndex();
+    }
+    IndexRequest indexRequest = new IndexRequest(DATASOURCE_INDEX_NAME);
+    indexRequest.id(dataSourceMetadata.getName());
+    indexRequest.opType(DocWriteRequest.OpType.CREATE);
+    indexRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
+    ActionFuture<IndexResponse> indexResponseActionFuture;
+    IndexResponse indexResponse;
+    try (ThreadContext.StoredContext storedContext =
+        client.threadPool().getThreadContext().stashContext()) {
+      indexRequest.source(XContentParserUtils.convertToXContent(dataSourceMetadata));
+      indexResponseActionFuture = client.index(indexRequest);
+      indexResponse = indexResponseActionFuture.actionGet();
+    } catch (VersionConflictEngineException exception) {
+      throw new IllegalArgumentException(
+          "A datasource already exists with name: " + dataSourceMetadata.getName());
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+
+    if (indexResponse.getResult().equals(DocWriteResponse.Result.CREATED)) {
+      LOG.debug("DatasourceMetadata : {}  successfully created", dataSourceMetadata.getName());
+    } else {
+      throw new RuntimeException(
+          "Saving dataSource metadata information failed with result : "
+              + indexResponse.getResult().getLowercase());
+    }
+  }
+
+  @Override
+  public void updateDataSourceMetadata(DataSourceMetadata dataSourceMetadata) {
+    if (!isEnabled()) {
+      throw new IllegalStateException("Data source management is disabled");
+    }
+    encryptDecryptAuthenticationData(dataSourceMetadata, true);
+    UpdateRequest updateRequest =
+        new UpdateRequest(DATASOURCE_INDEX_NAME, dataSourceMetadata.getName());
+    UpdateResponse updateResponse;
+    try (ThreadContext.StoredContext storedContext =
+        client.threadPool().getThreadContext().stashContext()) {
+      updateRequest.doc(XContentParserUtils.convertToXContent(dataSourceMetadata));
+      updateRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
+      ActionFuture<UpdateResponse> updateResponseActionFuture = client.update(updateRequest);
+      updateResponse = updateResponseActionFuture.actionGet();
+    } catch (DocumentMissingException exception) {
+      throw new DataSourceNotFoundException(
+          "Datasource with name: " + dataSourceMetadata.getName() + " doesn't exist");
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+
+    if (updateResponse.getResult().equals(DocWriteResponse.Result.UPDATED)
+        || updateResponse.getResult().equals(DocWriteResponse.Result.NOOP)) {
+      LOG.debug("DatasourceMetadata : {}  successfully updated", dataSourceMetadata.getName());
+    } else {
+      throw new RuntimeException(
+          "Saving dataSource metadata information failed with result : "
+              + updateResponse.getResult().getLowercase());
+    }
+  }
+
+  @Override
+  public void deleteDataSourceMetadata(String datasourceName) {
+    if (!isEnabled()) {
+      throw new IllegalStateException("Data source management is disabled");
+    }
+    DeleteRequest deleteRequest = new DeleteRequest(DATASOURCE_INDEX_NAME);
+    deleteRequest.id(datasourceName);
+    deleteRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
+    ActionFuture<DeleteResponse> deleteResponseActionFuture;
+    try (ThreadContext.StoredContext storedContext =
+        client.threadPool().getThreadContext().stashContext()) {
+      deleteResponseActionFuture = client.delete(deleteRequest);
+    }
+    DeleteResponse deleteResponse = deleteResponseActionFuture.actionGet();
+    if (deleteResponse.getResult().equals(DocWriteResponse.Result.DELETED)) {
+      LOG.debug("DatasourceMetadata : {}  successfully deleted", datasourceName);
+    } else if (deleteResponse.getResult().equals(DocWriteResponse.Result.NOT_FOUND)) {
+      throw new DataSourceNotFoundException(
+          "Datasource with name: " + datasourceName + " doesn't exist");
+    } else {
+      throw new RuntimeException(
+          "Deleting dataSource metadata information failed with result : "
+              + deleteResponse.getResult().getLowercase());
+    }
+  }
+
+  private void createDataSourcesIndex() {
+    try {
+      InputStream mappingFileStream =
+          OpenSearchDataSourceMetadataStorage.class
+              .getClassLoader()
+              .getResourceAsStream(DATASOURCE_INDEX_MAPPING_FILE_NAME);
+      InputStream settingsFileStream =
+          OpenSearchDataSourceMetadataStorage.class
+              .getClassLoader()
+              .getResourceAsStream(DATASOURCE_INDEX_SETTINGS_FILE_NAME);
+      CreateIndexRequest createIndexRequest = new CreateIndexRequest(DATASOURCE_INDEX_NAME);
+      createIndexRequest
+          .mapping(IOUtils.toString(mappingFileStream, StandardCharsets.UTF_8), XContentType.YAML)
+          .settings(
+              IOUtils.toString(settingsFileStream, StandardCharsets.UTF_8), XContentType.YAML);
+      ActionFuture<CreateIndexResponse> createIndexResponseActionFuture;
+      try (ThreadContext.StoredContext ignored =
+          client.threadPool().getThreadContext().stashContext()) {
+        createIndexResponseActionFuture = client.admin().indices().create(createIndexRequest);
+      }
+      CreateIndexResponse createIndexResponse = createIndexResponseActionFuture.actionGet();
+      if (createIndexResponse.isAcknowledged()) {
+        LOG.info("Index: {} creation Acknowledged", DATASOURCE_INDEX_NAME);
+      } else {
+        throw new RuntimeException("Index creation is not acknowledged.");
+      }
+    } catch (Throwable e) {
+      throw new RuntimeException(
+          "Internal server error while creating"
+              + DATASOURCE_INDEX_NAME
+              + " index:: "
+              + e.getMessage());
+    }
+  }
+
+  private List<DataSourceMetadata> searchInDataSourcesIndex(QueryBuilder query) {
+    SearchRequest searchRequest = new SearchRequest();
+    searchRequest.indices(DATASOURCE_INDEX_NAME);
+    SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+    searchSourceBuilder.query(query);
+    searchSourceBuilder.size(DATASOURCE_QUERY_RESULT_SIZE);
+    searchRequest.source(searchSourceBuilder);
+    // https://github.com/opensearch-project/sql/issues/1801.
+    searchRequest.preference("_primary_first");
+    ActionFuture<SearchResponse> searchResponseActionFuture;
+    try (ThreadContext.StoredContext ignored =
+        client.threadPool().getThreadContext().stashContext()) {
+      searchResponseActionFuture = client.search(searchRequest);
+    }
+    SearchResponse searchResponse = searchResponseActionFuture.actionGet();
+    if (searchResponse.status().getStatus() != 200) {
+      throw new RuntimeException(
+          "Fetching dataSource metadata information failed with status : "
+              + searchResponse.status());
+    } else {
+      List<DataSourceMetadata> list = new ArrayList<>();
+      for (SearchHit searchHit : searchResponse.getHits().getHits()) {
+        String sourceAsString = searchHit.getSourceAsString();
+        DataSourceMetadata dataSourceMetadata;
+        try {
+          dataSourceMetadata = XContentParserUtils.toDataSourceMetadata(sourceAsString);
+        } catch (IOException e) {
+          throw new RuntimeException(e);
+        }
+        list.add(dataSourceMetadata);
+      }
+      return list;
+    }
+  }
+
+  // Encrypt and Decrypt irrespective of auth type.If properties name ends in username, password,
+  // secret_key and access_key.
+  private DataSourceMetadata encryptDecryptAuthenticationData(
+      DataSourceMetadata dataSourceMetadata, Boolean isEncryption) {
+    Map<String, String> propertiesMap = dataSourceMetadata.getProperties();
+    handleBasicAuthPropertiesEncryptionDecryption(propertiesMap, isEncryption);
+    handleSigV4PropertiesEncryptionDecryption(propertiesMap, isEncryption);
+    return dataSourceMetadata;
+  }
+
+  private void handleBasicAuthPropertiesEncryptionDecryption(
+      Map<String, String> propertiesMap, Boolean isEncryption) {
+    ArrayList<String> list = new ArrayList<>();
+    propertiesMap.keySet().stream()
+        .filter(s -> s.endsWith("auth.username"))
+        .findFirst()
+        .ifPresent(list::add);
+    propertiesMap.keySet().stream()
+        .filter(s -> s.endsWith("auth.password"))
+        .findFirst()
+        .ifPresent(list::add);
+    encryptOrDecrypt(propertiesMap, isEncryption, list);
+  }
+
+  private void encryptOrDecrypt(
+      Map<String, String> propertiesMap, Boolean isEncryption, List<String> keyIdentifiers) {
+    for (String key : keyIdentifiers) {
+      if (isEncryption) {
+        propertiesMap.put(key, this.encryptor.encrypt(propertiesMap.get(key)));
+      } else {
+        propertiesMap.put(key, this.encryptor.decrypt(propertiesMap.get(key)));
+      }
+    }
+  }
+
+  private void handleSigV4PropertiesEncryptionDecryption(
+      Map<String, String> propertiesMap, Boolean isEncryption) {
+    ArrayList<String> list = new ArrayList<>();
+    propertiesMap.keySet().stream()
+        .filter(s -> s.endsWith("auth.access_key"))
+        .findFirst()
+        .ifPresent(list::add);
+    propertiesMap.keySet().stream()
+        .filter(s -> s.endsWith("auth.secret_key"))
+        .findFirst()
+        .ifPresent(list::add);
+    encryptOrDecrypt(propertiesMap, isEncryption, list);
+  }
+
+  private boolean isEnabled() {
+    return settings.getSettingValue(Settings.Key.DATASOURCES_ENABLED);
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceAction.java b/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceAction.java
new file mode 100644
index 0000000000..95e6493e05
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceAction.java
@@ -0,0 +1,87 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.transport;
+
+import static org.opensearch.sql.common.setting.Settings.Key.DATASOURCES_LIMIT;
+import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.Style.PRETTY;
+
+import org.opensearch.action.ActionType;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasources.model.transport.CreateDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.CreateDataSourceActionResponse;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.protocol.response.format.JsonResponseFormatter;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+public class TransportCreateDataSourceAction
+    extends HandledTransportAction<CreateDataSourceActionRequest, CreateDataSourceActionResponse> {
+  public static final String NAME = "cluster:admin/opensearch/ql/datasources/create";
+  public static final ActionType<CreateDataSourceActionResponse> ACTION_TYPE =
+      new ActionType<>(NAME, CreateDataSourceActionResponse::new);
+
+  private DataSourceService dataSourceService;
+  private org.opensearch.sql.opensearch.setting.OpenSearchSettings settings;
+
+  /**
+   * TransportCreateDataSourceAction action for creating datasource.
+   *
+   * @param transportService transportService.
+   * @param actionFilters actionFilters.
+   * @param dataSourceService dataSourceService.
+   */
+  @Inject
+  public TransportCreateDataSourceAction(
+      TransportService transportService,
+      ActionFilters actionFilters,
+      DataSourceServiceImpl dataSourceService,
+      org.opensearch.sql.opensearch.setting.OpenSearchSettings settings) {
+    super(
+        TransportCreateDataSourceAction.NAME,
+        transportService,
+        actionFilters,
+        CreateDataSourceActionRequest::new);
+    this.dataSourceService = dataSourceService;
+    this.settings = settings;
+  }
+
+  @Override
+  protected void doExecute(
+      Task task,
+      CreateDataSourceActionRequest request,
+      ActionListener<CreateDataSourceActionResponse> actionListener) {
+    int dataSourceLimit = settings.getSettingValue(DATASOURCES_LIMIT);
+    if (dataSourceService.getDataSourceMetadata(false).size() >= dataSourceLimit) {
+      actionListener.onFailure(
+          new IllegalStateException(
+              String.format(
+                  "domain concurrent datasources can not" + " exceed %d", dataSourceLimit)));
+    } else {
+      try {
+
+        DataSourceMetadata dataSourceMetadata = request.getDataSourceMetadata();
+        dataSourceService.createDataSource(dataSourceMetadata);
+        String responseContent =
+            new JsonResponseFormatter<String>(PRETTY) {
+              @Override
+              protected Object buildJsonObject(String response) {
+                return response;
+              }
+            }.format("Created DataSource with name " + dataSourceMetadata.getName());
+        actionListener.onResponse(new CreateDataSourceActionResponse(responseContent));
+      } catch (Exception e) {
+        actionListener.onFailure(e);
+      }
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportDeleteDataSourceAction.java b/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportDeleteDataSourceAction.java
new file mode 100644
index 0000000000..5578d40651
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportDeleteDataSourceAction.java
@@ -0,0 +1,65 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.transport;
+
+import org.opensearch.action.ActionType;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasources.model.transport.DeleteDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.DeleteDataSourceActionResponse;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+public class TransportDeleteDataSourceAction
+    extends HandledTransportAction<DeleteDataSourceActionRequest, DeleteDataSourceActionResponse> {
+
+  public static final String NAME = "cluster:admin/opensearch/ql/datasources/delete";
+  public static final ActionType<DeleteDataSourceActionResponse> ACTION_TYPE =
+      new ActionType<>(NAME, DeleteDataSourceActionResponse::new);
+
+  private DataSourceService dataSourceService;
+
+  /**
+   * TransportDeleteDataSourceAction action for deleting datasource.
+   *
+   * @param transportService transportService.
+   * @param actionFilters actionFilters.
+   * @param dataSourceService dataSourceService.
+   */
+  @Inject
+  public TransportDeleteDataSourceAction(
+      TransportService transportService,
+      ActionFilters actionFilters,
+      DataSourceServiceImpl dataSourceService) {
+    super(
+        TransportDeleteDataSourceAction.NAME,
+        transportService,
+        actionFilters,
+        DeleteDataSourceActionRequest::new);
+    this.dataSourceService = dataSourceService;
+  }
+
+  @Override
+  protected void doExecute(
+      Task task,
+      DeleteDataSourceActionRequest request,
+      ActionListener<DeleteDataSourceActionResponse> actionListener) {
+    try {
+      dataSourceService.deleteDataSource(request.getDataSourceName());
+      actionListener.onResponse(
+          new DeleteDataSourceActionResponse(
+              "Deleted DataSource with name " + request.getDataSourceName()));
+    } catch (Exception e) {
+      actionListener.onFailure(e);
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportGetDataSourceAction.java b/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportGetDataSourceAction.java
new file mode 100644
index 0000000000..34ad59c80f
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportGetDataSourceAction.java
@@ -0,0 +1,98 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.transport;
+
+import java.util.Set;
+import org.opensearch.action.ActionType;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasources.model.transport.GetDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.GetDataSourceActionResponse;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.protocol.response.format.JsonResponseFormatter;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+public class TransportGetDataSourceAction
+    extends HandledTransportAction<GetDataSourceActionRequest, GetDataSourceActionResponse> {
+
+  public static final String NAME = "cluster:admin/opensearch/ql/datasources/read";
+  public static final ActionType<GetDataSourceActionResponse> ACTION_TYPE =
+      new ActionType<>(NAME, GetDataSourceActionResponse::new);
+
+  private DataSourceService dataSourceService;
+
+  /**
+   * TransportGetDataSourceAction action for getting datasource.
+   *
+   * @param transportService transportService.
+   * @param actionFilters actionFilters.
+   * @param dataSourceService dataSourceService.
+   */
+  @Inject
+  public TransportGetDataSourceAction(
+      TransportService transportService,
+      ActionFilters actionFilters,
+      DataSourceServiceImpl dataSourceService) {
+    super(
+        TransportGetDataSourceAction.NAME,
+        transportService,
+        actionFilters,
+        GetDataSourceActionRequest::new);
+    this.dataSourceService = dataSourceService;
+  }
+
+  @Override
+  protected void doExecute(
+      Task task,
+      GetDataSourceActionRequest request,
+      ActionListener<GetDataSourceActionResponse> actionListener) {
+    try {
+      String responseContent;
+      if (request.getDataSourceName() == null) {
+        responseContent = handleGetAllDataSourcesRequest();
+
+      } else {
+        responseContent = handleSingleDataSourceRequest(request.getDataSourceName());
+      }
+      actionListener.onResponse(new GetDataSourceActionResponse(responseContent));
+    } catch (Exception e) {
+      actionListener.onFailure(e);
+    }
+  }
+
+  private String handleGetAllDataSourcesRequest() {
+    String responseContent;
+    Set<DataSourceMetadata> dataSourceMetadataSet = dataSourceService.getDataSourceMetadata(false);
+    responseContent =
+        new JsonResponseFormatter<Set<DataSourceMetadata>>(JsonResponseFormatter.Style.PRETTY) {
+          @Override
+          protected Object buildJsonObject(Set<DataSourceMetadata> response) {
+            return response;
+          }
+        }.format(dataSourceMetadataSet);
+    return responseContent;
+  }
+
+  private String handleSingleDataSourceRequest(String datasourceName) {
+    String responseContent;
+    DataSourceMetadata dataSourceMetadata = dataSourceService.getDataSourceMetadata(datasourceName);
+    responseContent =
+        new JsonResponseFormatter<DataSourceMetadata>(JsonResponseFormatter.Style.PRETTY) {
+          @Override
+          protected Object buildJsonObject(DataSourceMetadata response) {
+            return response;
+          }
+        }.format(dataSourceMetadata);
+    return responseContent;
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportPatchDataSourceAction.java b/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportPatchDataSourceAction.java
new file mode 100644
index 0000000000..303e905cec
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportPatchDataSourceAction.java
@@ -0,0 +1,74 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.transport;
+
+import static org.opensearch.sql.datasources.utils.XContentParserUtils.NAME_FIELD;
+import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.Style.PRETTY;
+
+import org.opensearch.action.ActionType;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasources.model.transport.PatchDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.PatchDataSourceActionResponse;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.protocol.response.format.JsonResponseFormatter;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+public class TransportPatchDataSourceAction
+    extends HandledTransportAction<PatchDataSourceActionRequest, PatchDataSourceActionResponse> {
+
+  public static final String NAME = "cluster:admin/opensearch/ql/datasources/patch";
+  public static final ActionType<PatchDataSourceActionResponse> ACTION_TYPE =
+      new ActionType<>(NAME, PatchDataSourceActionResponse::new);
+
+  private DataSourceService dataSourceService;
+
+  /**
+   * TransportPatchDataSourceAction action for updating datasource.
+   *
+   * @param transportService transportService.
+   * @param actionFilters actionFilters.
+   * @param dataSourceService dataSourceService.
+   */
+  @Inject
+  public TransportPatchDataSourceAction(
+      TransportService transportService,
+      ActionFilters actionFilters,
+      DataSourceServiceImpl dataSourceService) {
+    super(
+        TransportPatchDataSourceAction.NAME,
+        transportService,
+        actionFilters,
+        PatchDataSourceActionRequest::new);
+    this.dataSourceService = dataSourceService;
+  }
+
+  @Override
+  protected void doExecute(
+      Task task,
+      PatchDataSourceActionRequest request,
+      ActionListener<PatchDataSourceActionResponse> actionListener) {
+    try {
+      dataSourceService.patchDataSource(request.getDataSourceData());
+      String responseContent =
+          new JsonResponseFormatter<String>(PRETTY) {
+            @Override
+            protected Object buildJsonObject(String response) {
+              return response;
+            }
+          }.format("Updated DataSource with name " + request.getDataSourceData().get(NAME_FIELD));
+      actionListener.onResponse(new PatchDataSourceActionResponse(responseContent));
+    } catch (Exception e) {
+      actionListener.onFailure(e);
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportUpdateDataSourceAction.java b/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportUpdateDataSourceAction.java
new file mode 100644
index 0000000000..fefd0f3a01
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/transport/TransportUpdateDataSourceAction.java
@@ -0,0 +1,73 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.transport;
+
+import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.Style.PRETTY;
+
+import org.opensearch.action.ActionType;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasources.model.transport.UpdateDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.UpdateDataSourceActionResponse;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.protocol.response.format.JsonResponseFormatter;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+public class TransportUpdateDataSourceAction
+    extends HandledTransportAction<UpdateDataSourceActionRequest, UpdateDataSourceActionResponse> {
+
+  public static final String NAME = "cluster:admin/opensearch/ql/datasources/update";
+  public static final ActionType<UpdateDataSourceActionResponse> ACTION_TYPE =
+      new ActionType<>(NAME, UpdateDataSourceActionResponse::new);
+
+  private DataSourceService dataSourceService;
+
+  /**
+   * TransportUpdateDataSourceAction action for updating datasource.
+   *
+   * @param transportService transportService.
+   * @param actionFilters actionFilters.
+   * @param dataSourceService dataSourceService.
+   */
+  @Inject
+  public TransportUpdateDataSourceAction(
+      TransportService transportService,
+      ActionFilters actionFilters,
+      DataSourceServiceImpl dataSourceService) {
+    super(
+        TransportUpdateDataSourceAction.NAME,
+        transportService,
+        actionFilters,
+        UpdateDataSourceActionRequest::new);
+    this.dataSourceService = dataSourceService;
+  }
+
+  @Override
+  protected void doExecute(
+      Task task,
+      UpdateDataSourceActionRequest request,
+      ActionListener<UpdateDataSourceActionResponse> actionListener) {
+    try {
+      dataSourceService.updateDataSource(request.getDataSourceMetadata());
+      String responseContent =
+          new JsonResponseFormatter<String>(PRETTY) {
+            @Override
+            protected Object buildJsonObject(String response) {
+              return response;
+            }
+          }.format("Updated DataSource with name " + request.getDataSourceMetadata().getName());
+      actionListener.onResponse(new UpdateDataSourceActionResponse(responseContent));
+    } catch (Exception e) {
+      actionListener.onFailure(e);
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/utils/DatasourceValidationUtils.java b/datasources/src/main/java/org/opensearch/sql/datasources/utils/DatasourceValidationUtils.java
new file mode 100644
index 0000000000..6f03ffb9a4
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/utils/DatasourceValidationUtils.java
@@ -0,0 +1,54 @@
+package org.opensearch.sql.datasources.utils;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import lombok.experimental.UtilityClass;
+import org.opensearch.sql.common.utils.URIValidationUtils;
+
+/** Common Validation methods for all datasource connectors. */
+@UtilityClass
+public class DatasourceValidationUtils {
+
+  public static final int MAX_LENGTH_FOR_CONFIG_PROPERTY = 1000;
+
+  public static void validateHost(String uriString, List<String> denyHostList)
+      throws URISyntaxException, UnknownHostException {
+    if (!URIValidationUtils.validateURIHost(new URI(uriString).getHost(), denyHostList)) {
+      throw new IllegalArgumentException(
+          "Disallowed hostname in the uri. "
+              + "Validate with plugins.query.datasources.uri.hosts.denylist config");
+    }
+    ;
+  }
+
+  public static void validateLengthAndRequiredFields(
+      Map<String, String> config, Set<String> fields) {
+    Set<String> missingFields = new HashSet<>();
+    Set<String> invalidLengthFields = new HashSet<>();
+    for (String field : fields) {
+      if (!config.containsKey(field)) {
+        missingFields.add(field);
+      } else if (config.get(field).length() > MAX_LENGTH_FOR_CONFIG_PROPERTY) {
+        invalidLengthFields.add(field);
+      }
+    }
+    StringBuilder errorStringBuilder = new StringBuilder();
+    if (missingFields.size() > 0) {
+      errorStringBuilder.append(
+          String.format("Missing %s fields in the connector properties.", missingFields));
+    }
+
+    if (invalidLengthFields.size() > 0) {
+      errorStringBuilder.append(
+          String.format("Fields %s exceeds more than 1000 characters.", invalidLengthFields));
+    }
+    if (errorStringBuilder.length() > 0) {
+      throw new IllegalArgumentException(errorStringBuilder.toString());
+    }
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/utils/Scheduler.java b/datasources/src/main/java/org/opensearch/sql/datasources/utils/Scheduler.java
new file mode 100644
index 0000000000..eaac8a7fa3
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/utils/Scheduler.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.utils;
+
+import java.util.Map;
+import lombok.experimental.UtilityClass;
+import org.apache.logging.log4j.ThreadContext;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.threadpool.ThreadPool;
+
+/** The scheduler which schedule the task run in sql-worker thread pool. */
+@UtilityClass
+public class Scheduler {
+
+  public static final String SQL_WORKER_THREAD_POOL_NAME = "sql-worker";
+
+  public static void schedule(NodeClient client, Runnable task) {
+    ThreadPool threadPool = client.threadPool();
+    threadPool.schedule(withCurrentContext(task), new TimeValue(0), SQL_WORKER_THREAD_POOL_NAME);
+  }
+
+  private static Runnable withCurrentContext(final Runnable task) {
+    final Map<String, String> currentContext = ThreadContext.getImmutableContext();
+    return () -> {
+      ThreadContext.putAll(currentContext);
+      task.run();
+    };
+  }
+}
diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/utils/XContentParserUtils.java b/datasources/src/main/java/org/opensearch/sql/datasources/utils/XContentParserUtils.java
new file mode 100644
index 0000000000..4c98b133a8
--- /dev/null
+++ b/datasources/src/main/java/org/opensearch/sql/datasources/utils/XContentParserUtils.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.utils;
+
+import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import lombok.experimental.UtilityClass;
+import org.apache.commons.lang3.StringUtils;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceStatus;
+import org.opensearch.sql.datasource.model.DataSourceType;
+
+/** Utitlity class to serialize and deserialize objects in XContent. */
+@UtilityClass
+public class XContentParserUtils {
+  public static final String NAME_FIELD = "name";
+  public static final String DESCRIPTION_FIELD = "description";
+  public static final String CONNECTOR_FIELD = "connector";
+  public static final String PROPERTIES_FIELD = "properties";
+  public static final String ALLOWED_ROLES_FIELD = "allowedRoles";
+
+  public static final String RESULT_INDEX_FIELD = "resultIndex";
+  public static final String STATUS_FIELD = "status";
+
+  /**
+   * Convert xcontent parser to DataSourceMetadata.
+   *
+   * @param parser parser.
+   * @return DataSourceMetadata {@link DataSourceMetadata}
+   * @throws IOException IOException.
+   */
+  public static DataSourceMetadata toDataSourceMetadata(XContentParser parser) throws IOException {
+    String name = null;
+    String description = StringUtils.EMPTY;
+    DataSourceType connector = null;
+    List<String> allowedRoles = new ArrayList<>();
+    Map<String, String> properties = new HashMap<>();
+    String resultIndex = null;
+    DataSourceStatus status = null;
+    ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser);
+    while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
+      String fieldName = parser.currentName();
+      parser.nextToken();
+      switch (fieldName) {
+        case NAME_FIELD:
+          name = parser.textOrNull();
+          break;
+        case DESCRIPTION_FIELD:
+          description = parser.textOrNull();
+          break;
+        case CONNECTOR_FIELD:
+          connector = DataSourceType.fromString(parser.textOrNull());
+          break;
+        case ALLOWED_ROLES_FIELD:
+          while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
+            allowedRoles.add(parser.text());
+          }
+          break;
+        case PROPERTIES_FIELD:
+          ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser);
+          while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
+            String key = parser.currentName();
+            parser.nextToken();
+            String value = parser.textOrNull();
+            properties.put(key, value);
+          }
+          break;
+        case RESULT_INDEX_FIELD:
+          resultIndex = parser.textOrNull();
+          break;
+        case STATUS_FIELD:
+          status = DataSourceStatus.fromString(parser.textOrNull());
+          break;
+        default:
+          throw new IllegalArgumentException("Unknown field: " + fieldName);
+      }
+    }
+    return new DataSourceMetadata.Builder()
+        .setName(name)
+        .setDescription(description)
+        .setConnector(connector)
+        .setProperties(properties)
+        .setAllowedRoles(allowedRoles)
+        .setResultIndex(resultIndex)
+        .setDataSourceStatus(status)
+        .validateAndBuild();
+  }
+
+  public static Map<String, Object> toMap(XContentParser parser) throws IOException {
+    Map<String, Object> resultMap = new HashMap<>();
+    String name;
+    String description;
+    List<String> allowedRoles = new ArrayList<>();
+    Map<String, String> properties = new HashMap<>();
+    String resultIndex;
+    DataSourceStatus status;
+    ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser);
+    while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
+      String fieldName = parser.currentName();
+      parser.nextToken();
+      switch (fieldName) {
+        case NAME_FIELD:
+          name = parser.textOrNull();
+          resultMap.put(NAME_FIELD, name);
+          break;
+        case DESCRIPTION_FIELD:
+          description = parser.textOrNull();
+          resultMap.put(DESCRIPTION_FIELD, description);
+          break;
+        case CONNECTOR_FIELD:
+          // no-op - datasource connector should not be modified
+          break;
+        case ALLOWED_ROLES_FIELD:
+          while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
+            allowedRoles.add(parser.text());
+          }
+          resultMap.put(ALLOWED_ROLES_FIELD, allowedRoles);
+          break;
+        case PROPERTIES_FIELD:
+          ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser);
+          while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
+            String key = parser.currentName();
+            parser.nextToken();
+            String value = parser.textOrNull();
+            properties.put(key, value);
+          }
+          resultMap.put(PROPERTIES_FIELD, properties);
+          break;
+        case RESULT_INDEX_FIELD:
+          resultIndex = parser.textOrNull();
+          resultMap.put(RESULT_INDEX_FIELD, resultIndex);
+          break;
+        case STATUS_FIELD:
+          status = DataSourceStatus.fromString(parser.textOrNull());
+          resultMap.put(STATUS_FIELD, status);
+          break;
+        default:
+          throw new IllegalArgumentException("Unknown field: " + fieldName);
+      }
+    }
+    if (resultMap.get(NAME_FIELD) == null || resultMap.get(NAME_FIELD) == "") {
+      throw new IllegalArgumentException("Name is a required field.");
+    }
+    return resultMap;
+  }
+
+  /**
+   * Converts json string to DataSourceMetadata.
+   *
+   * @param json jsonstring.
+   * @return DataSourceMetadata {@link DataSourceMetadata}
+   * @throws IOException IOException.
+   */
+  public static DataSourceMetadata toDataSourceMetadata(String json) throws IOException {
+    try (XContentParser parser =
+        XContentType.JSON
+            .xContent()
+            .createParser(
+                NamedXContentRegistry.EMPTY,
+                DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
+                json)) {
+      return toDataSourceMetadata(parser);
+    }
+  }
+
+  /**
+   * Converts json string to Map.
+   *
+   * @param json jsonstring.
+   * @return DataSourceData
+   * @throws IOException IOException.
+   */
+  public static Map<String, Object> toMap(String json) throws IOException {
+    try (XContentParser parser =
+        XContentType.JSON
+            .xContent()
+            .createParser(
+                NamedXContentRegistry.EMPTY,
+                DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
+                json)) {
+      return toMap(parser);
+    }
+  }
+
+  /**
+   * Converts DataSourceMetadata to XContentBuilder.
+   *
+   * @param metadata metadata.
+   * @return XContentBuilder {@link XContentBuilder}
+   * @throws Exception Exception.
+   */
+  public static XContentBuilder convertToXContent(DataSourceMetadata metadata) throws Exception {
+
+    XContentBuilder builder = XContentFactory.jsonBuilder();
+    builder.startObject();
+    builder.field(NAME_FIELD, metadata.getName());
+    builder.field(DESCRIPTION_FIELD, metadata.getDescription());
+    builder.field(CONNECTOR_FIELD, metadata.getConnector().name());
+    builder.field(ALLOWED_ROLES_FIELD, metadata.getAllowedRoles().toArray());
+    builder.startObject(PROPERTIES_FIELD);
+    for (Map.Entry<String, String> entry : metadata.getProperties().entrySet()) {
+      builder.field(entry.getKey(), entry.getValue());
+    }
+    builder.endObject();
+    builder.field(RESULT_INDEX_FIELD, metadata.getResultIndex());
+    builder.field(STATUS_FIELD, metadata.getStatus());
+    builder.endObject();
+    return builder;
+  }
+}
diff --git a/datasources/src/main/resources/datasources-index-mapping.yml b/datasources/src/main/resources/datasources-index-mapping.yml
new file mode 100644
index 0000000000..589630d790
--- /dev/null
+++ b/datasources/src/main/resources/datasources-index-mapping.yml
@@ -0,0 +1,21 @@
+---
+##
+# Copyright OpenSearch Contributors
+# SPDX-License-Identifier: Apache-2.0
+##
+
+# Schema file for the .ql-datasources index
+# Also "dynamic" is set to "false" so that other fields can be added.
+dynamic: false
+properties:
+  name:
+    type: text
+    fields:
+      keyword:
+        type: keyword
+  connector:
+    type: keyword
+  resultIndex:
+    type: keyword
+  status:
+    type: keyword
\ No newline at end of file
diff --git a/datasources/src/main/resources/datasources-index-settings.yml b/datasources/src/main/resources/datasources-index-settings.yml
new file mode 100644
index 0000000000..7977bb4f61
--- /dev/null
+++ b/datasources/src/main/resources/datasources-index-settings.yml
@@ -0,0 +1,11 @@
+---
+##
+# Copyright OpenSearch Contributors
+# SPDX-License-Identifier: Apache-2.0
+##
+
+# Settings file for the .ql-datasources index
+index:
+  number_of_shards: "1"
+  auto_expand_replicas: "0-2"
+  number_of_replicas: "0"
\ No newline at end of file
diff --git a/core/src/test/java/org/opensearch/sql/datasource/model/auth/AuthenticationTypeTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/auth/AuthenticationTypeTest.java
similarity index 92%
rename from core/src/test/java/org/opensearch/sql/datasource/model/auth/AuthenticationTypeTest.java
rename to datasources/src/test/java/org/opensearch/sql/datasources/auth/AuthenticationTypeTest.java
index f9e4f3ce59..4bc4800093 100644
--- a/core/src/test/java/org/opensearch/sql/datasource/model/auth/AuthenticationTypeTest.java
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/auth/AuthenticationTypeTest.java
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.datasource.model.auth;
-
+package org.opensearch.sql.datasources.auth;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImplTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImplTest.java
new file mode 100644
index 0000000000..761115b7af
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImplTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.auth;
+
+import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT;
+
+import java.util.List;
+import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.OpenSearchSecurityException;
+import org.opensearch.client.Client;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+
+@ExtendWith(MockitoExtension.class)
+public class DataSourceUserAuthorizationHelperImplTest {
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private Client client;
+
+  @InjectMocks private DataSourceUserAuthorizationHelperImpl dataSourceUserAuthorizationHelper;
+
+  @Test
+  public void testAuthorizeDataSourceWithAllowedRoles() {
+    String userString = "myuser|bckrole1,bckrol2|prometheus_access|myTenant";
+    Mockito.when(
+            client
+                .threadPool()
+                .getThreadContext()
+                .getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT))
+        .thenReturn(userString);
+    DataSourceMetadata dataSourceMetadata = dataSourceMetadata();
+    this.dataSourceUserAuthorizationHelper.authorizeDataSource(dataSourceMetadata);
+  }
+
+  @Test
+  public void testAuthorizeDataSourceWithAdminRole() {
+    String userString = "myuser|bckrole1,bckrol2|all_access|myTenant";
+    Mockito.when(
+            client
+                .threadPool()
+                .getThreadContext()
+                .getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT))
+        .thenReturn(userString);
+    DataSourceMetadata dataSourceMetadata = dataSourceMetadata();
+    this.dataSourceUserAuthorizationHelper.authorizeDataSource(dataSourceMetadata);
+  }
+
+  @Test
+  public void testAuthorizeDataSourceWithNullUserString() {
+    Mockito.when(
+            client
+                .threadPool()
+                .getThreadContext()
+                .getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT))
+        .thenReturn(null);
+    DataSourceMetadata dataSourceMetadata = dataSourceMetadata();
+    this.dataSourceUserAuthorizationHelper.authorizeDataSource(dataSourceMetadata);
+  }
+
+  @Test
+  public void testAuthorizeDataSourceWithDefaultDataSource() {
+    String userString = "myuser|bckrole1,bckrol2|role1|myTenant";
+    Mockito.when(
+            client
+                .threadPool()
+                .getThreadContext()
+                .getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT))
+        .thenReturn(userString);
+    DataSourceMetadata dataSourceMetadata =
+        DataSourceMetadata.defaultOpenSearchDataSourceMetadata();
+    this.dataSourceUserAuthorizationHelper.authorizeDataSource(dataSourceMetadata);
+  }
+
+  @Test
+  public void testAuthorizeDataSourceWithException() {
+    String userString = "myuser|bckrole1,bckrol2|role1|myTenant";
+    Mockito.when(
+            client
+                .threadPool()
+                .getThreadContext()
+                .getTransient(OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT))
+        .thenReturn(userString);
+    DataSourceMetadata dataSourceMetadata = dataSourceMetadata();
+    OpenSearchSecurityException openSearchSecurityException =
+        Assert.assertThrows(
+            OpenSearchSecurityException.class,
+            () -> this.dataSourceUserAuthorizationHelper.authorizeDataSource(dataSourceMetadata));
+    Assertions.assertEquals(
+        "User is not authorized to access datasource test. "
+            + "User should be mapped to any of the roles in [prometheus_access] for access.",
+        openSearchSecurityException.getMessage());
+    Assertions.assertEquals(RestStatus.UNAUTHORIZED, openSearchSecurityException.status());
+  }
+
+  private DataSourceMetadata dataSourceMetadata() {
+    return new DataSourceMetadata.Builder()
+        .setName("test")
+        .setAllowedRoles(List.of("prometheus_access"))
+        .setConnector(DataSourceType.PROMETHEUS)
+        .build();
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/encryptor/EncryptorImplTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/encryptor/EncryptorImplTest.java
new file mode 100644
index 0000000000..26432b139b
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/encryptor/EncryptorImplTest.java
@@ -0,0 +1,151 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.datasources.encryptor;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import com.amazonaws.encryptionsdk.exception.AwsCryptoException;
+import com.amazonaws.encryptionsdk.exception.BadCiphertextException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class EncryptorImplTest {
+
+  @Test
+  public void testEncryptAndDecrypt() {
+    String masterKey = "1234567890123456";
+    String input = "This is a test input";
+    Encryptor encryptor = new EncryptorImpl(masterKey);
+
+    String encrypted = encryptor.encrypt(input);
+    String decrypted = encryptor.decrypt(encrypted);
+
+    assertEquals(input, decrypted);
+  }
+
+  @Test
+  public void testMasterKeySize() {
+    String input = "This is a test input";
+    String masterKey8 = "12345678";
+    Encryptor encryptor8 = new EncryptorImpl(masterKey8);
+    assertThrows(
+        AwsCryptoException.class,
+        () -> {
+          encryptor8.encrypt(input);
+        });
+
+    String masterKey16 = "1234567812345678";
+    Encryptor encryptor16 = new EncryptorImpl(masterKey16);
+    String encrypted = encryptor16.encrypt(input);
+    Assertions.assertEquals(input, encryptor16.decrypt(encrypted));
+
+    String masterKey24 = "123456781234567812345678";
+    Encryptor encryptor24 = new EncryptorImpl(masterKey24);
+    encrypted = encryptor24.encrypt(input);
+    Assertions.assertEquals(input, encryptor24.decrypt(encrypted));
+
+    String masterKey17 = "12345678123456781";
+    Encryptor encryptor17 = new EncryptorImpl(masterKey17);
+    assertThrows(
+        AwsCryptoException.class,
+        () -> {
+          encryptor17.encrypt(input);
+        });
+  }
+
+  @Test
+  public void testInvalidBase64String() {
+    String encrypted = "invalidBase64String";
+    Encryptor encryptor = new EncryptorImpl("randomMasterKey");
+
+    assertThrows(
+        BadCiphertextException.class,
+        () -> {
+          encryptor.decrypt(encrypted);
+        });
+  }
+
+  @Test
+  public void testDecryptWithDifferentKey() {
+
+    String masterKeyOne = "1234567890123456";
+    String masterKeyTwo = "1234567890123455";
+    String input = "This is a test input";
+    Encryptor encryptor1 = new EncryptorImpl(masterKeyOne);
+    Encryptor encryptor2 = new EncryptorImpl(masterKeyTwo);
+
+    String encrypted = encryptor1.encrypt(input);
+
+    assertThrows(
+        Exception.class,
+        () -> {
+          encryptor2.decrypt(encrypted);
+        });
+  }
+
+  @Test
+  public void testEncryptionAndDecryptionWithNullMasterKey() {
+    String input = "This is a test input";
+    Encryptor encryptor = new EncryptorImpl(null);
+    IllegalStateException illegalStateException =
+        Assertions.assertThrows(IllegalStateException.class, () -> encryptor.encrypt(input));
+    Assertions.assertEquals(
+        "Master key is a required config for using create and"
+            + " update datasource APIs."
+            + "Please set plugins.query.datasources.encryption.masterkey config "
+            + "in opensearch.yml in all the cluster nodes. "
+            + "More details can be found here: "
+            + "https://github.com/opensearch-project/sql/blob/main/docs/user/ppl/"
+            + "admin/datasources.rst#master-key-config-for-encrypting-credential-information",
+        illegalStateException.getMessage());
+    illegalStateException =
+        Assertions.assertThrows(IllegalStateException.class, () -> encryptor.decrypt(input));
+    Assertions.assertEquals(
+        "Master key is a required config for using create and"
+            + " update datasource APIs."
+            + "Please set plugins.query.datasources.encryption.masterkey config "
+            + "in opensearch.yml in all the cluster nodes. "
+            + "More details can be found here: "
+            + "https://github.com/opensearch-project/sql/blob/main/docs/user/ppl/"
+            + "admin/datasources.rst#master-key-config-for-encrypting-credential-information",
+        illegalStateException.getMessage());
+  }
+
+  @Test
+  public void testEncryptionAndDecryptionWithEmptyMasterKey() {
+    String masterKey = "";
+    String input = "This is a test input";
+    Encryptor encryptor = new EncryptorImpl(masterKey);
+    IllegalStateException illegalStateException =
+        Assertions.assertThrows(IllegalStateException.class, () -> encryptor.encrypt(input));
+    Assertions.assertEquals(
+        "Master key is a required config for using create and"
+            + " update datasource APIs."
+            + "Please set plugins.query.datasources.encryption.masterkey config "
+            + "in opensearch.yml in all the cluster nodes. "
+            + "More details can be found here: "
+            + "https://github.com/opensearch-project/sql/blob/main/docs/user/ppl/"
+            + "admin/datasources.rst#master-key-config-for-encrypting-credential-information",
+        illegalStateException.getMessage());
+    illegalStateException =
+        Assertions.assertThrows(IllegalStateException.class, () -> encryptor.decrypt(input));
+    Assertions.assertEquals(
+        "Master key is a required config for using create and"
+            + " update datasource APIs."
+            + "Please set plugins.query.datasources.encryption.masterkey config "
+            + "in opensearch.yml in all the cluster nodes. "
+            + "More details can be found here: "
+            + "https://github.com/opensearch-project/sql/blob/main/docs/user/ppl/"
+            + "admin/datasources.rst#master-key-config-for-encrypting-credential-information",
+        illegalStateException.getMessage());
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/exceptions/ErrorMessageTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/exceptions/ErrorMessageTest.java
new file mode 100644
index 0000000000..eb4d575f8c
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/exceptions/ErrorMessageTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.exceptions;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+import org.opensearch.core.rest.RestStatus;
+
+class ErrorMessageTest {
+
+  @Test
+  void toString_returnPrettyPrintedJson() {
+    ErrorMessage errorMessage =
+        new ErrorMessage(new RuntimeException(), RestStatus.TOO_MANY_REQUESTS.getStatus());
+
+    assertEquals(
+        "{\n"
+            + "  \"status\": 429,\n"
+            + "  \"error\": {\n"
+            + "    \"type\": \"RuntimeException\",\n"
+            + "    \"reason\": \"Too Many Requests\",\n"
+            + "    \"details\": \"\"\n"
+            + "  }\n"
+            + "}",
+        errorMessage.toString());
+  }
+
+  @Test
+  void getReason() {
+    testGetReason(RestStatus.TOO_MANY_REQUESTS, "Too Many Requests");
+    testGetReason(RestStatus.BAD_REQUEST, "Invalid Request");
+    // other status
+    testGetReason(RestStatus.BAD_GATEWAY, "There was internal problem at backend");
+  }
+
+  void testGetReason(RestStatus status, String expectedReason) {
+    ErrorMessage errorMessage = new ErrorMessage(new RuntimeException(), status.getStatus());
+
+    assertEquals(expectedReason, errorMessage.getReason());
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/glue/GlueDataSourceFactoryTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/glue/GlueDataSourceFactoryTest.java
new file mode 100644
index 0000000000..2833717265
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/glue/GlueDataSourceFactoryTest.java
@@ -0,0 +1,276 @@
+package org.opensearch.sql.datasources.glue;
+
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.DataSourceSchemaName;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+
+@ExtendWith(MockitoExtension.class)
+public class GlueDataSourceFactoryTest {
+
+  @Mock private Settings settings;
+
+  @Test
+  void testGetConnectorType() {
+    GlueDataSourceFactory glueDatasourceFactory = new GlueDataSourceFactory(settings);
+    Assertions.assertEquals(DataSourceType.S3GLUE, glueDatasourceFactory.getDataSourceType());
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateGLueDatSource() {
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
+    GlueDataSourceFactory glueDatasourceFactory = new GlueDataSourceFactory(settings);
+
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "noauth");
+    properties.put("glue.indexstore.opensearch.region", "us-west-2");
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_glue")
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(properties)
+            .build();
+    DataSource dataSource = glueDatasourceFactory.createDataSource(metadata);
+    Assertions.assertEquals(DataSourceType.S3GLUE, dataSource.getConnectorType());
+    UnsupportedOperationException unsupportedOperationException =
+        Assertions.assertThrows(
+            UnsupportedOperationException.class,
+            () ->
+                dataSource
+                    .getStorageEngine()
+                    .getTable(new DataSourceSchemaName("my_glue", "default"), "alb_logs"));
+    Assertions.assertEquals(
+        "Glue storage engine is not supported.", unsupportedOperationException.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateGLueDatSourceWithBasicAuthForIndexStore() {
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
+    GlueDataSourceFactory glueDatasourceFactory = new GlueDataSourceFactory(settings);
+
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "basicauth");
+    properties.put("glue.indexstore.opensearch.auth.username", "username");
+    properties.put("glue.indexstore.opensearch.auth.password", "password");
+    properties.put("glue.indexstore.opensearch.region", "us-west-2");
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_glue")
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(properties)
+            .build();
+    DataSource dataSource = glueDatasourceFactory.createDataSource(metadata);
+    Assertions.assertEquals(DataSourceType.S3GLUE, dataSource.getConnectorType());
+    UnsupportedOperationException unsupportedOperationException =
+        Assertions.assertThrows(
+            UnsupportedOperationException.class,
+            () ->
+                dataSource
+                    .getStorageEngine()
+                    .getTable(new DataSourceSchemaName("my_glue", "default"), "alb_logs"));
+    Assertions.assertEquals(
+        "Glue storage engine is not supported.", unsupportedOperationException.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateGLueDatSourceWithAwsSigV4AuthForIndexStore() {
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
+    GlueDataSourceFactory glueDatasourceFactory = new GlueDataSourceFactory(settings);
+
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "awssigv4");
+    properties.put("glue.indexstore.opensearch.region", "us-west-2");
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_glue")
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(properties)
+            .build();
+    DataSource dataSource = glueDatasourceFactory.createDataSource(metadata);
+    Assertions.assertEquals(DataSourceType.S3GLUE, dataSource.getConnectorType());
+    UnsupportedOperationException unsupportedOperationException =
+        Assertions.assertThrows(
+            UnsupportedOperationException.class,
+            () ->
+                dataSource
+                    .getStorageEngine()
+                    .getTable(new DataSourceSchemaName("my_glue", "default"), "alb_logs"));
+    Assertions.assertEquals(
+        "Glue storage engine is not supported.", unsupportedOperationException.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateGLueDatSourceWithBasicAuthForIndexStoreAndMissingFields() {
+    GlueDataSourceFactory glueDatasourceFactory = new GlueDataSourceFactory(settings);
+
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "basicauth");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_glue")
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(properties)
+            .build();
+
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> glueDatasourceFactory.createDataSource(metadata));
+    Assertions.assertEquals(
+        "Missing [glue.indexstore.opensearch.auth.password,"
+            + " glue.indexstore.opensearch.auth.username] fields in the connector properties.",
+        illegalArgumentException.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateGLueDatSourceWithInvalidFlintHost() {
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(List.of("127.0.0.0/8"));
+    GlueDataSourceFactory glueDatasourceFactory = new GlueDataSourceFactory(settings);
+
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "noauth");
+    properties.put("glue.indexstore.opensearch.region", "us-west-2");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_glue")
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(properties)
+            .build();
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> glueDatasourceFactory.createDataSource(metadata));
+    Assertions.assertEquals(
+        "Disallowed hostname in the uri. "
+            + "Validate with plugins.query.datasources.uri.hosts.denylist config",
+        illegalArgumentException.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateGLueDatSourceWithInvalidFlintHostSyntax() {
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(List.of("127.0.0.0/8"));
+    GlueDataSourceFactory glueDatasourceFactory = new GlueDataSourceFactory(settings);
+
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put(
+        "glue.indexstore.opensearch.uri",
+        "http://dummyprometheus.com:9090? paramt::localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "noauth");
+    properties.put("glue.indexstore.opensearch.region", "us-west-2");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_glue")
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(properties)
+            .build();
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> glueDatasourceFactory.createDataSource(metadata));
+    Assertions.assertEquals(
+        "Invalid flint host in properties.", illegalArgumentException.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateGlueDataSourceWithLakeFormationNoIceberg() {
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
+    GlueDataSourceFactory glueDatasourceFactory = new GlueDataSourceFactory(settings);
+
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "noauth");
+    properties.put("glue.indexstore.opensearch.region", "us-west-2");
+    properties.put("glue.lakeformation.enabled", "true");
+    properties.put("glue.iceberg.enabled", "false");
+    properties.put("glue.lakeformation.session_tag", "session_tag");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_glue")
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(properties)
+            .build();
+
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> glueDatasourceFactory.createDataSource(metadata));
+    Assertions.assertEquals(
+        "Lake Formation can only be enabled when Iceberg is enabled.",
+        illegalArgumentException.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateGlueDataSourceWithLakeFormationNoSessionTags() {
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
+    GlueDataSourceFactory glueDatasourceFactory = new GlueDataSourceFactory(settings);
+
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "noauth");
+    properties.put("glue.indexstore.opensearch.region", "us-west-2");
+    properties.put("glue.lakeformation.enabled", "true");
+    properties.put("glue.iceberg.enabled", "true");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_glue")
+            .setConnector(DataSourceType.S3GLUE)
+            .setProperties(properties)
+            .build();
+
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> glueDatasourceFactory.createDataSource(metadata));
+    Assertions.assertEquals(
+        "Lake Formation session tag must be specified when enabling Lake Formation",
+        illegalArgumentException.getMessage());
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/glue/SecurityLakeSourceFactoryTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/glue/SecurityLakeSourceFactoryTest.java
new file mode 100644
index 0000000000..561d549826
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/glue/SecurityLakeSourceFactoryTest.java
@@ -0,0 +1,141 @@
+package org.opensearch.sql.datasources.glue;
+
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+
+@ExtendWith(MockitoExtension.class)
+public class SecurityLakeSourceFactoryTest {
+
+  @Mock private Settings settings;
+
+  @Test
+  void testGetConnectorType() {
+    SecurityLakeDataSourceFactory securityLakeDataSourceFactory =
+        new SecurityLakeDataSourceFactory(settings);
+    Assertions.assertEquals(
+        DataSourceType.SECURITY_LAKE, securityLakeDataSourceFactory.getDataSourceType());
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateSecurityLakeDataSource() {
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
+    SecurityLakeDataSourceFactory securityLakeDataSourceFactory =
+        new SecurityLakeDataSourceFactory(settings);
+
+    Map<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "noauth");
+    properties.put("glue.indexstore.opensearch.region", "us-west-2");
+    properties.put("glue.lakeformation.session_tag", "session_tag");
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_sl")
+            .setConnector(DataSourceType.SECURITY_LAKE)
+            .setProperties(properties)
+            .build();
+    DataSource dataSource = securityLakeDataSourceFactory.createDataSource(metadata);
+    Assertions.assertEquals(DataSourceType.SECURITY_LAKE, dataSource.getConnectorType());
+
+    Assertions.assertEquals(
+        properties.get(GlueDataSourceFactory.GLUE_ICEBERG_ENABLED),
+        SecurityLakeDataSourceFactory.TRUE);
+    Assertions.assertEquals(
+        properties.get(GlueDataSourceFactory.GLUE_LAKEFORMATION_ENABLED),
+        SecurityLakeDataSourceFactory.TRUE);
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateSecurityLakeDataSourceIcebergCannotBeDisabled() {
+    SecurityLakeDataSourceFactory securityLakeDataSourceFactory =
+        new SecurityLakeDataSourceFactory(settings);
+
+    Map<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "noauth");
+    properties.put("glue.indexstore.opensearch.region", "us-west-2");
+    properties.put("glue.iceberg.enabled", "false");
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_sl")
+            .setConnector(DataSourceType.SECURITY_LAKE)
+            .setProperties(properties)
+            .build();
+
+    Assertions.assertThrows(
+        IllegalArgumentException.class,
+        () -> securityLakeDataSourceFactory.createDataSource(metadata));
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateSecurityLakeDataSourceLakeFormationCannotBeDisabled() {
+    SecurityLakeDataSourceFactory securityLakeDataSourceFactory =
+        new SecurityLakeDataSourceFactory(settings);
+
+    Map<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "noauth");
+    properties.put("glue.indexstore.opensearch.region", "us-west-2");
+    properties.put("glue.iceberg.enabled", "true");
+    properties.put("glue.lakeformation.enabled", "false");
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_sl")
+            .setConnector(DataSourceType.SECURITY_LAKE)
+            .setProperties(properties)
+            .build();
+
+    Assertions.assertThrows(
+        IllegalArgumentException.class,
+        () -> securityLakeDataSourceFactory.createDataSource(metadata));
+  }
+
+  @Test
+  @SneakyThrows
+  void testCreateGlueDataSourceWithLakeFormationNoSessionTags() {
+    SecurityLakeDataSourceFactory securityLakeDataSourceFactory =
+        new SecurityLakeDataSourceFactory(settings);
+
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "noauth");
+    properties.put("glue.indexstore.opensearch.region", "us-west-2");
+    properties.put("glue.iceberg.enabled", "true");
+    properties.put("glue.lakeformation.enabled", "true");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("my_sl")
+            .setConnector(DataSourceType.SECURITY_LAKE)
+            .setProperties(properties)
+            .build();
+
+    Assertions.assertThrows(
+        IllegalArgumentException.class,
+        () -> securityLakeDataSourceFactory.createDataSource(metadata));
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryActionTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryActionTest.java
new file mode 100644
index 0000000000..fbe1b3bee5
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryActionTest.java
@@ -0,0 +1,83 @@
+package org.opensearch.sql.datasources.rest;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.rest.RestChannel;
+import org.opensearch.rest.RestRequest;
+import org.opensearch.rest.RestResponse;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.threadpool.ThreadPool;
+
+public class RestDataSourceQueryActionTest {
+
+  private OpenSearchSettings settings;
+  private RestRequest request;
+  private RestChannel channel;
+  private NodeClient nodeClient;
+  private ThreadPool threadPool;
+  private RestDataSourceQueryAction unit;
+
+  @BeforeEach
+  public void setup() {
+    settings = Mockito.mock(OpenSearchSettings.class);
+    request = Mockito.mock(RestRequest.class);
+    channel = Mockito.mock(RestChannel.class);
+    nodeClient = Mockito.mock(NodeClient.class);
+    threadPool = Mockito.mock(ThreadPool.class);
+
+    Mockito.when(nodeClient.threadPool()).thenReturn(threadPool);
+
+    unit = new RestDataSourceQueryAction(settings);
+  }
+
+  @Test
+  @SneakyThrows
+  public void testWhenDataSourcesAreDisabled() {
+    setDataSourcesEnabled(false);
+    unit.handleRequest(request, channel, nodeClient);
+    Mockito.verifyNoInteractions(nodeClient);
+    ArgumentCaptor<RestResponse> response = ArgumentCaptor.forClass(RestResponse.class);
+    Mockito.verify(channel, Mockito.times(1)).sendResponse(response.capture());
+    Assertions.assertEquals(400, response.getValue().status().getStatus());
+    JsonObject actualResponseJson =
+        new Gson().fromJson(response.getValue().content().utf8ToString(), JsonObject.class);
+    JsonObject expectedResponseJson = new JsonObject();
+    expectedResponseJson.addProperty("status", 400);
+    expectedResponseJson.add("error", new JsonObject());
+    expectedResponseJson.getAsJsonObject("error").addProperty("type", "OpenSearchStatusException");
+    expectedResponseJson.getAsJsonObject("error").addProperty("reason", "Invalid Request");
+    expectedResponseJson
+        .getAsJsonObject("error")
+        .addProperty("details", "plugins.query.datasources.enabled setting is false");
+    Assertions.assertEquals(expectedResponseJson, actualResponseJson);
+  }
+
+  @Test
+  @SneakyThrows
+  public void testWhenDataSourcesAreEnabled() {
+    setDataSourcesEnabled(true);
+    Mockito.when(request.method()).thenReturn(RestRequest.Method.GET);
+    unit.handleRequest(request, channel, nodeClient);
+    Mockito.verify(threadPool, Mockito.times(1))
+        .schedule(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any());
+    Mockito.verifyNoInteractions(channel);
+  }
+
+  @Test
+  public void testGetName() {
+    Assertions.assertEquals("datasource_actions", unit.getName());
+  }
+
+  private void setDataSourcesEnabled(boolean value) {
+    Mockito.when(settings.getSettingValue(Settings.Key.DATASOURCES_ENABLED)).thenReturn(value);
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/service/DataSourceLoaderCacheImplTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/service/DataSourceLoaderCacheImplTest.java
new file mode 100644
index 0000000000..6238355238
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/service/DataSourceLoaderCacheImplTest.java
@@ -0,0 +1,78 @@
+package org.opensearch.sql.datasources.service;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.List;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.storage.DataSourceFactory;
+import org.opensearch.sql.storage.StorageEngine;
+
+@ExtendWith(MockitoExtension.class)
+class DataSourceLoaderCacheImplTest {
+
+  @Mock private DataSourceFactory dataSourceFactory;
+
+  @Mock private StorageEngine storageEngine;
+
+  @BeforeEach
+  public void setup() {
+    lenient()
+        .doAnswer(
+            invocation -> {
+              DataSourceMetadata metadata = invocation.getArgument(0);
+              return new DataSource(metadata.getName(), metadata.getConnector(), storageEngine);
+            })
+        .when(dataSourceFactory)
+        .createDataSource(any());
+    when(dataSourceFactory.getDataSourceType()).thenReturn(DataSourceType.OPENSEARCH);
+  }
+
+  @Test
+  void testGetOrLoadDataSource() {
+    DataSourceLoaderCache dataSourceLoaderCache =
+        new DataSourceLoaderCacheImpl(Collections.singleton(dataSourceFactory));
+    DataSourceMetadata dataSourceMetadata = getMetadata();
+    DataSource dataSource = dataSourceLoaderCache.getOrLoadDataSource(dataSourceMetadata);
+    verify(dataSourceFactory, times(1)).createDataSource(dataSourceMetadata);
+    Assertions.assertEquals(
+        dataSource, dataSourceLoaderCache.getOrLoadDataSource(dataSourceMetadata));
+    verifyNoMoreInteractions(dataSourceFactory);
+  }
+
+  @Test
+  void testGetOrLoadDataSourceWithMetadataUpdate() {
+    DataSourceLoaderCache dataSourceLoaderCache =
+        new DataSourceLoaderCacheImpl(Collections.singleton(dataSourceFactory));
+    DataSourceMetadata dataSourceMetadata = getMetadata();
+    dataSourceLoaderCache.getOrLoadDataSource(dataSourceMetadata);
+    dataSourceLoaderCache.getOrLoadDataSource(dataSourceMetadata);
+    dataSourceMetadata =
+        new DataSourceMetadata.Builder(dataSourceMetadata)
+            .setAllowedRoles(List.of("testDS_access"))
+            .build();
+    dataSourceLoaderCache.getOrLoadDataSource(dataSourceMetadata);
+    dataSourceLoaderCache.getOrLoadDataSource(dataSourceMetadata);
+    verify(dataSourceFactory, times(2)).createDataSource(any());
+  }
+
+  private DataSourceMetadata getMetadata() {
+    return new DataSourceMetadata.Builder()
+        .setName("testDS")
+        .setConnector(DataSourceType.OPENSEARCH)
+        .build();
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/service/DataSourceServiceImplTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/service/DataSourceServiceImplTest.java
new file mode 100644
index 0000000000..9a1022706f
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/service/DataSourceServiceImplTest.java
@@ -0,0 +1,497 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.service;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
+import static org.opensearch.sql.datasources.utils.XContentParserUtils.*;
+
+import com.google.common.collect.ImmutableMap;
+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.Optional;
+import java.util.Set;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasource.RequestContext;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceStatus;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.datasources.auth.DataSourceUserAuthorizationHelper;
+import org.opensearch.sql.datasources.exceptions.DataSourceNotFoundException;
+import org.opensearch.sql.datasources.exceptions.DatasourceDisabledException;
+import org.opensearch.sql.storage.DataSourceFactory;
+import org.opensearch.sql.storage.StorageEngine;
+
+@ExtendWith(MockitoExtension.class)
+class DataSourceServiceImplTest {
+
+  @Mock private DataSourceFactory dataSourceFactory;
+  @Mock private StorageEngine storageEngine;
+  @Mock private DataSourceMetadataStorage dataSourceMetadataStorage;
+  @Mock private RequestContext requestContext;
+
+  @Mock private DataSourceUserAuthorizationHelper dataSourceUserAuthorizationHelper;
+
+  private DataSourceService dataSourceService;
+
+  @BeforeEach
+  public void setup() {
+    lenient()
+        .doAnswer(
+            invocation -> {
+              DataSourceMetadata metadata = invocation.getArgument(0);
+              return new DataSource(metadata.getName(), metadata.getConnector(), storageEngine);
+            })
+        .when(dataSourceFactory)
+        .createDataSource(any());
+    when(dataSourceFactory.getDataSourceType()).thenReturn(DataSourceType.OPENSEARCH);
+    dataSourceService =
+        new DataSourceServiceImpl(
+            new HashSet<>() {
+              {
+                add(dataSourceFactory);
+              }
+            },
+            dataSourceMetadataStorage,
+            dataSourceUserAuthorizationHelper);
+  }
+
+  @Test
+  void testGetDataSourceForDefaultOpenSearchDataSource() {
+    doNothing().when(dataSourceUserAuthorizationHelper).authorizeDataSource(any());
+    dataSourceService.createDataSource(DataSourceMetadata.defaultOpenSearchDataSourceMetadata());
+    assertEquals(
+        new DataSource(DEFAULT_DATASOURCE_NAME, DataSourceType.OPENSEARCH, storageEngine),
+        dataSourceService.getDataSource(DEFAULT_DATASOURCE_NAME));
+    verifyNoInteractions(dataSourceMetadataStorage);
+  }
+
+  @Test
+  void testGetDataSourceForNonExistingDataSource() {
+    when(dataSourceMetadataStorage.getDataSourceMetadata("test")).thenReturn(Optional.empty());
+    DataSourceNotFoundException exception =
+        assertThrows(
+            DataSourceNotFoundException.class, () -> dataSourceService.getDataSource("test"));
+    assertEquals("DataSource with name test doesn't exist.", exception.getMessage());
+    verify(dataSourceMetadataStorage, times(1)).getDataSourceMetadata("test");
+  }
+
+  @Test
+  void testGetDataSourceSuccessCase() {
+    DataSourceMetadata dataSourceMetadata =
+        metadata("test", DataSourceType.OPENSEARCH, Collections.emptyList(), ImmutableMap.of());
+    doNothing().when(dataSourceUserAuthorizationHelper).authorizeDataSource(dataSourceMetadata);
+    when(dataSourceMetadataStorage.getDataSourceMetadata("test"))
+        .thenReturn(Optional.of(dataSourceMetadata));
+    DataSource dataSource = dataSourceService.getDataSource("test");
+    assertEquals("test", dataSource.getName());
+    assertEquals(DataSourceType.OPENSEARCH, dataSource.getConnectorType());
+    verify(dataSourceMetadataStorage, times(1)).getDataSourceMetadata("test");
+    verify(dataSourceFactory, times(1)).createDataSource(dataSourceMetadata);
+  }
+
+  @Test
+  void testGetDataSourceWithAuthorizationFailure() {
+    DataSourceMetadata dataSourceMetadata =
+        metadata(
+            "test",
+            DataSourceType.OPENSEARCH,
+            Collections.singletonList("prometheus_access"),
+            ImmutableMap.of());
+    doThrow(
+            new SecurityException(
+                "User is not authorized to access datasource test. User should be mapped to any of"
+                    + " the roles in [prometheus_access] for access."))
+        .when(dataSourceUserAuthorizationHelper)
+        .authorizeDataSource(dataSourceMetadata);
+    when(dataSourceMetadataStorage.getDataSourceMetadata("test"))
+        .thenReturn(Optional.of(dataSourceMetadata));
+
+    SecurityException securityException =
+        Assertions.assertThrows(
+            SecurityException.class, () -> dataSourceService.getDataSource("test"));
+    Assertions.assertEquals(
+        "User is not authorized to access datasource test. "
+            + "User should be mapped to any of the roles in [prometheus_access] for access.",
+        securityException.getMessage());
+
+    verify(dataSourceMetadataStorage, times(1)).getDataSourceMetadata("test");
+    verify(dataSourceFactory, times(0)).createDataSource(dataSourceMetadata);
+  }
+
+  @Test
+  void testCreateDataSourceSuccessCase() {
+
+    DataSourceMetadata dataSourceMetadata =
+        metadata("testDS", DataSourceType.OPENSEARCH, Collections.emptyList(), ImmutableMap.of());
+    dataSourceService.createDataSource(dataSourceMetadata);
+    verify(dataSourceMetadataStorage, times(1)).createDataSourceMetadata(dataSourceMetadata);
+    verify(dataSourceFactory, times(1)).createDataSource(dataSourceMetadata);
+
+    when(dataSourceMetadataStorage.getDataSourceMetadata("testDS"))
+        .thenReturn(
+            Optional.ofNullable(
+                metadata(
+                    "testDS",
+                    DataSourceType.OPENSEARCH,
+                    Collections.emptyList(),
+                    ImmutableMap.of())));
+    DataSource dataSource = dataSourceService.getDataSource("testDS");
+    assertEquals("testDS", dataSource.getName());
+    assertEquals(storageEngine, dataSource.getStorageEngine());
+    assertEquals(DataSourceType.OPENSEARCH, dataSource.getConnectorType());
+  }
+
+  @Test
+  void testGetDataSourceMetadataSet() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("prometheus.uri", "http://localhost:9200");
+    properties.put("prometheus.auth.type", "basicauth");
+    properties.put("prometheus.auth.username", "username");
+    properties.put("prometheus.auth.password", "password");
+    when(dataSourceMetadataStorage.getDataSourceMetadata())
+        .thenReturn(
+            new ArrayList<>() {
+              {
+                add(
+                    metadata(
+                        "testDS", DataSourceType.PROMETHEUS, Collections.emptyList(), properties));
+              }
+            });
+    Set<DataSourceMetadata> dataSourceMetadataSet = dataSourceService.getDataSourceMetadata(false);
+    assertEquals(1, dataSourceMetadataSet.size());
+    DataSourceMetadata dataSourceMetadata = dataSourceMetadataSet.iterator().next();
+    assertTrue(dataSourceMetadata.getProperties().containsKey("prometheus.uri"));
+    assertTrue(dataSourceMetadata.getProperties().containsKey("prometheus.auth.type"));
+    assertFalse(dataSourceMetadata.getProperties().containsKey("prometheus.auth.username"));
+    assertFalse(dataSourceMetadata.getProperties().containsKey("prometheus.auth.password"));
+    assertFalse(
+        dataSourceMetadataSet.contains(DataSourceMetadata.defaultOpenSearchDataSourceMetadata()));
+    verify(dataSourceMetadataStorage, times(1)).getDataSourceMetadata();
+  }
+
+  @Test
+  void testGetDataSourceMetadataSetWithDefaultDatasource() {
+    when(dataSourceMetadataStorage.getDataSourceMetadata())
+        .thenReturn(
+            new ArrayList<>() {
+              {
+                add(
+                    metadata(
+                        "testDS",
+                        DataSourceType.PROMETHEUS,
+                        Collections.emptyList(),
+                        ImmutableMap.of()));
+              }
+            });
+    Set<DataSourceMetadata> dataSourceMetadataSet = dataSourceService.getDataSourceMetadata(true);
+    assertEquals(2, dataSourceMetadataSet.size());
+    assertTrue(
+        dataSourceMetadataSet.contains(DataSourceMetadata.defaultOpenSearchDataSourceMetadata()));
+    verify(dataSourceMetadataStorage, times(1)).getDataSourceMetadata();
+  }
+
+  @Test
+  void testUpdateDataSourceSuccessCase() {
+    DataSourceMetadata dataSourceMetadata =
+        metadata("testDS", DataSourceType.OPENSEARCH, Collections.emptyList(), ImmutableMap.of());
+    dataSourceService.updateDataSource(dataSourceMetadata);
+    verify(dataSourceMetadataStorage, times(1)).updateDataSourceMetadata(dataSourceMetadata);
+    verify(dataSourceFactory, times(1)).createDataSource(dataSourceMetadata);
+  }
+
+  @Test
+  void testUpdateDefaultDataSource() {
+    DataSourceMetadata dataSourceMetadata =
+        metadata(
+            DEFAULT_DATASOURCE_NAME,
+            DataSourceType.OPENSEARCH,
+            Collections.emptyList(),
+            ImmutableMap.of());
+    UnsupportedOperationException unsupportedOperationException =
+        assertThrows(
+            UnsupportedOperationException.class,
+            () -> dataSourceService.updateDataSource(dataSourceMetadata));
+    assertEquals(
+        "Not allowed to update default datasource :" + DEFAULT_DATASOURCE_NAME,
+        unsupportedOperationException.getMessage());
+  }
+
+  @Test
+  void testPatchDefaultDataSource() {
+    Map<String, Object> dataSourceData =
+        Map.of(NAME_FIELD, DEFAULT_DATASOURCE_NAME, DESCRIPTION_FIELD, "test");
+    UnsupportedOperationException unsupportedOperationException =
+        assertThrows(
+            UnsupportedOperationException.class,
+            () -> dataSourceService.patchDataSource(dataSourceData));
+    assertEquals(
+        "Not allowed to update default datasource :" + DEFAULT_DATASOURCE_NAME,
+        unsupportedOperationException.getMessage());
+  }
+
+  @Test
+  void testPatchDataSourceSuccessCase() {
+    // Tests that patch underlying implementation is to call update
+    Map<String, Object> dataSourceData =
+        new HashMap<>(
+            Map.of(
+                NAME_FIELD,
+                "testDS",
+                DESCRIPTION_FIELD,
+                "test",
+                CONNECTOR_FIELD,
+                "PROMETHEUS",
+                ALLOWED_ROLES_FIELD,
+                new ArrayList<>(),
+                PROPERTIES_FIELD,
+                Map.of("prometehus.uri", "random"),
+                RESULT_INDEX_FIELD,
+                "query_execution_result_testds",
+                STATUS_FIELD,
+                DataSourceStatus.DISABLED));
+    DataSourceMetadata getData =
+        metadata("testDS", DataSourceType.OPENSEARCH, Collections.emptyList(), ImmutableMap.of());
+    when(dataSourceMetadataStorage.getDataSourceMetadata("testDS"))
+        .thenReturn(Optional.ofNullable(getData));
+
+    dataSourceService.patchDataSource(dataSourceData);
+    verify(dataSourceMetadataStorage, times(1)).updateDataSourceMetadata(any());
+  }
+
+  @Test
+  void testDeleteDatasource() {
+    dataSourceService.deleteDataSource("testDS");
+    verify(dataSourceMetadataStorage, times(1)).deleteDataSourceMetadata("testDS");
+  }
+
+  @Test
+  void testDeleteDefaultDatasource() {
+    UnsupportedOperationException unsupportedOperationException =
+        assertThrows(
+            UnsupportedOperationException.class,
+            () -> dataSourceService.deleteDataSource(DEFAULT_DATASOURCE_NAME));
+    assertEquals(
+        "Not allowed to delete default datasource :" + DEFAULT_DATASOURCE_NAME,
+        unsupportedOperationException.getMessage());
+  }
+
+  @Test
+  void testDataSourceExists() {
+    when(dataSourceMetadataStorage.getDataSourceMetadata("test")).thenReturn(Optional.empty());
+    Assertions.assertFalse(dataSourceService.dataSourceExists("test"));
+    when(dataSourceMetadataStorage.getDataSourceMetadata("test"))
+        .thenReturn(
+            Optional.of(metadata("test", DataSourceType.PROMETHEUS, List.of(), ImmutableMap.of())));
+    Assertions.assertTrue(dataSourceService.dataSourceExists("test"));
+  }
+
+  @Test
+  void testDataSourceExistsForDefaultDataSource() {
+    Assertions.assertTrue(dataSourceService.dataSourceExists(DEFAULT_DATASOURCE_NAME));
+    verifyNoInteractions(dataSourceMetadataStorage);
+  }
+
+  DataSourceMetadata metadata(
+      String name, DataSourceType type, List<String> allowedRoles, Map<String, String> properties) {
+    return new DataSourceMetadata.Builder()
+        .setName(name)
+        .setConnector(type)
+        .setAllowedRoles(allowedRoles)
+        .setProperties(properties)
+        .build();
+  }
+
+  @Test
+  void testRemovalOfAuthorizationInfo() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("prometheus.uri", "https://localhost:9090");
+    properties.put("prometheus.auth.type", "basicauth");
+    properties.put("prometheus.auth.username", "username");
+    properties.put("prometheus.auth.password", "password");
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("testDS")
+            .setProperties(properties)
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setAllowedRoles(Collections.singletonList("prometheus_access"))
+            .build();
+    when(dataSourceMetadataStorage.getDataSourceMetadata("testDS"))
+        .thenReturn(Optional.of(dataSourceMetadata));
+
+    DataSourceMetadata dataSourceMetadata1 = dataSourceService.getDataSourceMetadata("testDS");
+    assertEquals("testDS", dataSourceMetadata1.getName());
+    assertEquals(DataSourceType.PROMETHEUS, dataSourceMetadata1.getConnector());
+    assertTrue(dataSourceMetadata1.getProperties().containsKey("prometheus.auth.type"));
+    assertFalse(dataSourceMetadata1.getProperties().containsKey("prometheus.auth.username"));
+    assertFalse(dataSourceMetadata1.getProperties().containsKey("prometheus.auth.password"));
+  }
+
+  @Test
+  void testRemovalOfAuthorizationInfoForAccessKeyAndSecretKye() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("prometheus.uri", "https://localhost:9090");
+    properties.put("prometheus.auth.type", "awssigv4");
+    properties.put("prometheus.auth.access_key", "access_key");
+    properties.put("prometheus.auth.secret_key", "secret_key");
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("testDS")
+            .setProperties(properties)
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setAllowedRoles(Collections.singletonList("prometheus_access"))
+            .build();
+    when(dataSourceMetadataStorage.getDataSourceMetadata("testDS"))
+        .thenReturn(Optional.of(dataSourceMetadata));
+
+    DataSourceMetadata dataSourceMetadata1 = dataSourceService.getDataSourceMetadata("testDS");
+    assertEquals("testDS", dataSourceMetadata1.getName());
+    assertEquals(DataSourceType.PROMETHEUS, dataSourceMetadata1.getConnector());
+    assertTrue(dataSourceMetadata1.getProperties().containsKey("prometheus.auth.type"));
+    assertFalse(dataSourceMetadata1.getProperties().containsKey("prometheus.auth.access_key"));
+    assertFalse(dataSourceMetadata1.getProperties().containsKey("prometheus.auth.secret_key"));
+  }
+
+  @Test
+  void testRemovalOfAuthorizationInfoForGlueWithRoleARN() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("glue.auth.type", "iam_role");
+    properties.put("glue.auth.role_arn", "role_arn");
+    properties.put("glue.indexstore.opensearch.uri", "http://localhost:9200");
+    properties.put("glue.indexstore.opensearch.auth", "basicauth");
+    properties.put("glue.indexstore.opensearch.auth.username", "username");
+    properties.put("glue.indexstore.opensearch.auth.password", "password");
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("testGlue")
+            .setProperties(properties)
+            .setConnector(DataSourceType.S3GLUE)
+            .setAllowedRoles(Collections.singletonList("glue_access"))
+            .build();
+    when(dataSourceMetadataStorage.getDataSourceMetadata("testGlue"))
+        .thenReturn(Optional.of(dataSourceMetadata));
+
+    DataSourceMetadata dataSourceMetadata1 = dataSourceService.getDataSourceMetadata("testGlue");
+    assertEquals("testGlue", dataSourceMetadata1.getName());
+    assertEquals(DataSourceType.S3GLUE, dataSourceMetadata1.getConnector());
+    assertTrue(dataSourceMetadata1.getProperties().containsKey("glue.auth.type"));
+    assertTrue(dataSourceMetadata1.getProperties().containsKey("glue.auth.role_arn"));
+    assertTrue(dataSourceMetadata1.getProperties().containsKey("glue.indexstore.opensearch.uri"));
+    assertTrue(dataSourceMetadata1.getProperties().containsKey("glue.indexstore.opensearch.auth"));
+    assertFalse(
+        dataSourceMetadata1
+            .getProperties()
+            .containsKey("glue.indexstore.opensearch.auth.username"));
+    assertFalse(
+        dataSourceMetadata1
+            .getProperties()
+            .containsKey("glue.indexstore.opensearch.auth.password"));
+  }
+
+  @Test
+  void testGetDataSourceMetadataForNonExistingDataSource() {
+    when(dataSourceMetadataStorage.getDataSourceMetadata("testDS")).thenReturn(Optional.empty());
+    DataSourceNotFoundException exception =
+        assertThrows(
+            DataSourceNotFoundException.class,
+            () -> dataSourceService.getDataSourceMetadata("testDS"));
+    assertEquals("DataSource with name testDS doesn't exist.", exception.getMessage());
+  }
+
+  @Test
+  void testGetDataSourceMetadataForSpecificDataSourceName() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("prometheus.uri", "http://localhost:9200");
+    properties.put("prometheus.auth.type", "basicauth");
+    properties.put("prometheus.auth.username", "username");
+    properties.put("prometheus.auth.password", "password");
+    when(dataSourceMetadataStorage.getDataSourceMetadata("testDS"))
+        .thenReturn(
+            Optional.ofNullable(
+                metadata(
+                    "testDS", DataSourceType.PROMETHEUS, Collections.emptyList(), properties)));
+    DataSourceMetadata dataSourceMetadata = this.dataSourceService.getDataSourceMetadata("testDS");
+    assertTrue(dataSourceMetadata.getProperties().containsKey("prometheus.uri"));
+    assertTrue(dataSourceMetadata.getProperties().containsKey("prometheus.auth.type"));
+    assertFalse(dataSourceMetadata.getProperties().containsKey("prometheus.auth.username"));
+    assertFalse(dataSourceMetadata.getProperties().containsKey("prometheus.auth.password"));
+    verify(dataSourceMetadataStorage, times(1)).getDataSourceMetadata("testDS");
+  }
+
+  @Test
+  void testVerifyDataSourceAccessAndGetRawDataSourceMetadataWithDisabledData() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("prometheus.uri", "https://localhost:9090");
+    properties.put("prometheus.auth.type", "basicauth");
+    properties.put("prometheus.auth.username", "username");
+    properties.put("prometheus.auth.password", "password");
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("testDS")
+            .setProperties(properties)
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setAllowedRoles(Collections.singletonList("prometheus_access"))
+            .setDataSourceStatus(DataSourceStatus.DISABLED)
+            .build();
+    when(dataSourceMetadataStorage.getDataSourceMetadata("testDS"))
+        .thenReturn(Optional.of(dataSourceMetadata));
+    DatasourceDisabledException datasourceDisabledException =
+        Assertions.assertThrows(
+            DatasourceDisabledException.class,
+            () ->
+                dataSourceService.verifyDataSourceAccessAndGetRawMetadata(
+                    "testDS", requestContext));
+    Assertions.assertEquals(
+        "Datasource testDS is disabled.", datasourceDisabledException.getMessage());
+  }
+
+  @Test
+  void testVerifyDataSourceAccessAndGetRawDataSourceMetadata() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("prometheus.uri", "https://localhost:9090");
+    properties.put("prometheus.auth.type", "basicauth");
+    properties.put("prometheus.auth.username", "username");
+    properties.put("prometheus.auth.password", "password");
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("testDS")
+            .setProperties(properties)
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setAllowedRoles(Collections.singletonList("prometheus_access"))
+            .setDataSourceStatus(DataSourceStatus.ACTIVE)
+            .build();
+    when(dataSourceMetadataStorage.getDataSourceMetadata("testDS"))
+        .thenReturn(Optional.of(dataSourceMetadata));
+    DataSourceMetadata dataSourceMetadata1 =
+        dataSourceService.verifyDataSourceAccessAndGetRawMetadata("testDS", requestContext);
+    assertTrue(dataSourceMetadata1.getProperties().containsKey("prometheus.uri"));
+    assertTrue(dataSourceMetadata1.getProperties().containsKey("prometheus.auth.type"));
+    assertTrue(dataSourceMetadata1.getProperties().containsKey("prometheus.auth.username"));
+    assertTrue(dataSourceMetadata1.getProperties().containsKey("prometheus.auth.password"));
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java
new file mode 100644
index 0000000000..03abe73763
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java
@@ -0,0 +1,818 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.storage;
+
+import static org.opensearch.sql.datasource.model.DataSourceStatus.ACTIVE;
+import static org.opensearch.sql.datasources.storage.OpenSearchDataSourceMetadataStorage.DATASOURCE_INDEX_NAME;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.apache.lucene.search.TotalHits;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentMatchers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.DocWriteResponse;
+import org.opensearch.action.admin.indices.create.CreateIndexResponse;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.update.UpdateResponse;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.core.index.shard.ShardId;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.index.engine.DocumentMissingException;
+import org.opensearch.index.engine.VersionConflictEngineException;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.datasources.encryptor.Encryptor;
+import org.opensearch.sql.datasources.exceptions.DataSourceNotFoundException;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+
+@ExtendWith(MockitoExtension.class)
+public class OpenSearchDataSourceMetadataStorageTest {
+
+  private static final String TEST_DATASOURCE_INDEX_NAME = "testDS";
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private Client client;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private ClusterService clusterService;
+
+  @Mock private Encryptor encryptor;
+
+  @Mock private OpenSearchSettings openSearchSettings;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private SearchResponse searchResponse;
+
+  @Mock private ActionFuture<SearchResponse> searchResponseActionFuture;
+  @Mock private ActionFuture<CreateIndexResponse> createIndexResponseActionFuture;
+  @Mock private ActionFuture<IndexResponse> indexResponseActionFuture;
+  @Mock private IndexResponse indexResponse;
+  @Mock private ActionFuture<UpdateResponse> updateResponseActionFuture;
+  @Mock private UpdateResponse updateResponse;
+  @Mock private ActionFuture<DeleteResponse> deleteResponseActionFuture;
+  @Mock private DeleteResponse deleteResponse;
+  @Mock private SearchHit searchHit;
+  @InjectMocks private OpenSearchDataSourceMetadataStorage openSearchDataSourceMetadataStorage;
+
+  @SneakyThrows
+  @Test
+  public void testGetDataSourceMetadata() {
+    setDataSourcesEnabled(true);
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(true);
+    Mockito.when(client.search(ArgumentMatchers.any())).thenReturn(searchResponseActionFuture);
+    Mockito.when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    Mockito.when(searchResponse.status()).thenReturn(RestStatus.OK);
+    Mockito.when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit}, new TotalHits(21, TotalHits.Relation.EQUAL_TO), 1.0F));
+    Mockito.when(searchHit.getSourceAsString()).thenReturn(getBasicDataSourceMetadataString());
+    Mockito.when(encryptor.decrypt("password")).thenReturn("password");
+    Mockito.when(encryptor.decrypt("username")).thenReturn("username");
+
+    Optional<DataSourceMetadata> dataSourceMetadataOptional =
+        openSearchDataSourceMetadataStorage.getDataSourceMetadata(TEST_DATASOURCE_INDEX_NAME);
+
+    Assertions.assertFalse(dataSourceMetadataOptional.isEmpty());
+    DataSourceMetadata dataSourceMetadata = dataSourceMetadataOptional.get();
+    Assertions.assertEquals(TEST_DATASOURCE_INDEX_NAME, dataSourceMetadata.getName());
+    Assertions.assertEquals(DataSourceType.PROMETHEUS, dataSourceMetadata.getConnector());
+    Assertions.assertEquals(
+        "password", dataSourceMetadata.getProperties().get("prometheus.auth.password"));
+    Assertions.assertEquals(
+        "username", dataSourceMetadata.getProperties().get("prometheus.auth.username"));
+    Assertions.assertEquals(
+        "basicauth", dataSourceMetadata.getProperties().get("prometheus.auth.type"));
+  }
+
+  @SneakyThrows
+  @Test
+  public void testGetOldDataSourceMetadata() {
+    setDataSourcesEnabled(true);
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(true);
+    Mockito.when(client.search(ArgumentMatchers.any())).thenReturn(searchResponseActionFuture);
+    Mockito.when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    Mockito.when(searchResponse.status()).thenReturn(RestStatus.OK);
+    Mockito.when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit}, new TotalHits(21, TotalHits.Relation.EQUAL_TO), 1.0F));
+    Mockito.when(searchHit.getSourceAsString())
+        .thenReturn(getOldDataSourceMetadataStringWithOutStatusEnum());
+    Mockito.when(encryptor.decrypt("password")).thenReturn("password");
+    Mockito.when(encryptor.decrypt("username")).thenReturn("username");
+
+    Optional<DataSourceMetadata> dataSourceMetadataOptional =
+        openSearchDataSourceMetadataStorage.getDataSourceMetadata(TEST_DATASOURCE_INDEX_NAME);
+
+    Assertions.assertFalse(dataSourceMetadataOptional.isEmpty());
+    DataSourceMetadata dataSourceMetadata = dataSourceMetadataOptional.get();
+    Assertions.assertEquals(TEST_DATASOURCE_INDEX_NAME, dataSourceMetadata.getName());
+    Assertions.assertEquals(DataSourceType.PROMETHEUS, dataSourceMetadata.getConnector());
+    Assertions.assertEquals(
+        "password", dataSourceMetadata.getProperties().get("prometheus.auth.password"));
+    Assertions.assertEquals(
+        "username", dataSourceMetadata.getProperties().get("prometheus.auth.username"));
+    Assertions.assertEquals(
+        "basicauth", dataSourceMetadata.getProperties().get("prometheus.auth.type"));
+    Assertions.assertEquals(ACTIVE, dataSourceMetadata.getStatus());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testGetDataSourceMetadataWith404SearchResponse() {
+    setDataSourcesEnabled(true);
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(true);
+    Mockito.when(client.search(ArgumentMatchers.any())).thenReturn(searchResponseActionFuture);
+    Mockito.when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    Mockito.when(searchResponse.status()).thenReturn(RestStatus.NOT_FOUND);
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class,
+            () ->
+                openSearchDataSourceMetadataStorage.getDataSourceMetadata(
+                    TEST_DATASOURCE_INDEX_NAME));
+    Assertions.assertEquals(
+        "Fetching dataSource metadata information failed with status : NOT_FOUND",
+        runtimeException.getMessage());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testGetDataSourceMetadataWithParsingFailed() {
+    setDataSourcesEnabled(true);
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(true);
+    Mockito.when(client.search(ArgumentMatchers.any())).thenReturn(searchResponseActionFuture);
+    Mockito.when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    Mockito.when(searchResponse.status()).thenReturn(RestStatus.OK);
+    Mockito.when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit}, new TotalHits(21, TotalHits.Relation.EQUAL_TO), 1.0F));
+    Mockito.when(searchHit.getSourceAsString()).thenReturn("..testDs");
+
+    Assertions.assertThrows(
+        RuntimeException.class,
+        () ->
+            openSearchDataSourceMetadataStorage.getDataSourceMetadata(TEST_DATASOURCE_INDEX_NAME));
+  }
+
+  @SneakyThrows
+  @Test
+  public void testGetDataSourceMetadataWithAWSSigV4() {
+    setDataSourcesEnabled(true);
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(true);
+    Mockito.when(client.search(ArgumentMatchers.any())).thenReturn(searchResponseActionFuture);
+    Mockito.when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    Mockito.when(searchResponse.status()).thenReturn(RestStatus.OK);
+    Mockito.when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit}, new TotalHits(21, TotalHits.Relation.EQUAL_TO), 1.0F));
+    Mockito.when(searchHit.getSourceAsString()).thenReturn(getAWSSigv4DataSourceMetadataString());
+    Mockito.when(encryptor.decrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.decrypt("access_key")).thenReturn("access_key");
+
+    Optional<DataSourceMetadata> dataSourceMetadataOptional =
+        openSearchDataSourceMetadataStorage.getDataSourceMetadata(TEST_DATASOURCE_INDEX_NAME);
+
+    Assertions.assertFalse(dataSourceMetadataOptional.isEmpty());
+    DataSourceMetadata dataSourceMetadata = dataSourceMetadataOptional.get();
+    Assertions.assertEquals(TEST_DATASOURCE_INDEX_NAME, dataSourceMetadata.getName());
+    Assertions.assertEquals(DataSourceType.PROMETHEUS, dataSourceMetadata.getConnector());
+    Assertions.assertEquals(
+        "secret_key", dataSourceMetadata.getProperties().get("prometheus.auth.secret_key"));
+    Assertions.assertEquals(
+        "access_key", dataSourceMetadata.getProperties().get("prometheus.auth.access_key"));
+    Assertions.assertEquals(
+        "awssigv4", dataSourceMetadata.getProperties().get("prometheus.auth.type"));
+  }
+
+  @SneakyThrows
+  @Test
+  public void testGetDataSourceMetadataWithBasicAuth() {
+    setDataSourcesEnabled(true);
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(true);
+    Mockito.when(client.search(ArgumentMatchers.any())).thenReturn(searchResponseActionFuture);
+    Mockito.when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    Mockito.when(searchResponse.status()).thenReturn(RestStatus.OK);
+    Mockito.when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit}, new TotalHits(21, TotalHits.Relation.EQUAL_TO), 1.0F));
+    Mockito.when(searchHit.getSourceAsString())
+        .thenReturn(getDataSourceMetadataStringWithBasicAuthentication());
+    Mockito.when(encryptor.decrypt("username")).thenReturn("username");
+    Mockito.when(encryptor.decrypt("password")).thenReturn("password");
+
+    Optional<DataSourceMetadata> dataSourceMetadataOptional =
+        openSearchDataSourceMetadataStorage.getDataSourceMetadata(TEST_DATASOURCE_INDEX_NAME);
+
+    Assertions.assertFalse(dataSourceMetadataOptional.isEmpty());
+    DataSourceMetadata dataSourceMetadata = dataSourceMetadataOptional.get();
+    Assertions.assertEquals(TEST_DATASOURCE_INDEX_NAME, dataSourceMetadata.getName());
+    Assertions.assertEquals(DataSourceType.PROMETHEUS, dataSourceMetadata.getConnector());
+    Assertions.assertEquals(
+        "username", dataSourceMetadata.getProperties().get("prometheus.auth.username"));
+    Assertions.assertEquals(
+        "password", dataSourceMetadata.getProperties().get("prometheus.auth.password"));
+    Assertions.assertEquals(
+        "basicauth", dataSourceMetadata.getProperties().get("prometheus.auth.type"));
+  }
+
+  @SneakyThrows
+  @Test
+  public void testGetDataSourceMetadataList() {
+    setDataSourcesEnabled(true);
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(true);
+    Mockito.when(client.search(ArgumentMatchers.any())).thenReturn(searchResponseActionFuture);
+    Mockito.when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    Mockito.when(searchResponse.status()).thenReturn(RestStatus.OK);
+    Mockito.when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit}, new TotalHits(21, TotalHits.Relation.EQUAL_TO), 1.0F));
+    Mockito.when(searchHit.getSourceAsString())
+        .thenReturn(getDataSourceMetadataStringWithNoAuthentication());
+
+    List<DataSourceMetadata> dataSourceMetadataList =
+        openSearchDataSourceMetadataStorage.getDataSourceMetadata();
+
+    Assertions.assertEquals(1, dataSourceMetadataList.size());
+    DataSourceMetadata dataSourceMetadata = dataSourceMetadataList.get(0);
+    Assertions.assertEquals(TEST_DATASOURCE_INDEX_NAME, dataSourceMetadata.getName());
+    Assertions.assertEquals(DataSourceType.PROMETHEUS, dataSourceMetadata.getConnector());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testGetDataSourceMetadataListWithNoIndex() {
+    setDataSourcesEnabled(true);
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(Boolean.FALSE);
+    Mockito.when(client.admin().indices().create(ArgumentMatchers.any()))
+        .thenReturn(createIndexResponseActionFuture);
+    Mockito.when(createIndexResponseActionFuture.actionGet())
+        .thenReturn(new CreateIndexResponse(true, true, DATASOURCE_INDEX_NAME));
+    Mockito.when(client.index(ArgumentMatchers.any())).thenReturn(indexResponseActionFuture);
+
+    List<DataSourceMetadata> dataSourceMetadataList =
+        openSearchDataSourceMetadataStorage.getDataSourceMetadata();
+
+    Assertions.assertEquals(0, dataSourceMetadataList.size());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testGetDataSourceMetadataWithNoIndex() {
+    setDataSourcesEnabled(true);
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(Boolean.FALSE);
+    Mockito.when(client.admin().indices().create(ArgumentMatchers.any()))
+        .thenReturn(createIndexResponseActionFuture);
+    Mockito.when(createIndexResponseActionFuture.actionGet())
+        .thenReturn(new CreateIndexResponse(true, true, DATASOURCE_INDEX_NAME));
+    Mockito.when(client.index(ArgumentMatchers.any())).thenReturn(indexResponseActionFuture);
+
+    Optional<DataSourceMetadata> dataSourceMetadataOptional =
+        openSearchDataSourceMetadataStorage.getDataSourceMetadata(TEST_DATASOURCE_INDEX_NAME);
+
+    Assertions.assertFalse(dataSourceMetadataOptional.isPresent());
+  }
+
+  @Test
+  public void testCreateDataSourceMetadata() {
+    setDataSourcesEnabled(true);
+
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(Boolean.FALSE);
+    Mockito.when(encryptor.encrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.encrypt("access_key")).thenReturn("access_key");
+    Mockito.when(client.admin().indices().create(ArgumentMatchers.any()))
+        .thenReturn(createIndexResponseActionFuture);
+    Mockito.when(createIndexResponseActionFuture.actionGet())
+        .thenReturn(new CreateIndexResponse(true, true, DATASOURCE_INDEX_NAME));
+    Mockito.when(client.index(ArgumentMatchers.any())).thenReturn(indexResponseActionFuture);
+    Mockito.when(indexResponseActionFuture.actionGet()).thenReturn(indexResponse);
+    Mockito.when(indexResponse.getResult()).thenReturn(DocWriteResponse.Result.CREATED);
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata();
+
+    this.openSearchDataSourceMetadataStorage.createDataSourceMetadata(dataSourceMetadata);
+
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("secret_key");
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("access_key");
+    Mockito.verify(client.admin().indices(), Mockito.times(1)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).index(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(2)).stashContext();
+  }
+
+  @Test
+  public void testCreateDataSourceMetadataWithOutCreatingIndex() {
+    setDataSourcesEnabled(true);
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(Boolean.TRUE);
+    Mockito.when(encryptor.encrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.encrypt("access_key")).thenReturn("access_key");
+    Mockito.when(client.index(ArgumentMatchers.any())).thenReturn(indexResponseActionFuture);
+    Mockito.when(indexResponseActionFuture.actionGet()).thenReturn(indexResponse);
+    Mockito.when(indexResponse.getResult()).thenReturn(DocWriteResponse.Result.CREATED);
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata();
+
+    this.openSearchDataSourceMetadataStorage.createDataSourceMetadata(dataSourceMetadata);
+
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("secret_key");
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("access_key");
+    Mockito.verify(client.admin().indices(), Mockito.times(0)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).index(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(1)).stashContext();
+  }
+
+  @Test
+  public void testCreateDataSourceMetadataFailedWithNotFoundResponse() {
+    setDataSourcesEnabled(true);
+
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(Boolean.FALSE);
+    Mockito.when(encryptor.encrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.encrypt("access_key")).thenReturn("access_key");
+    Mockito.when(client.admin().indices().create(ArgumentMatchers.any()))
+        .thenReturn(createIndexResponseActionFuture);
+    Mockito.when(createIndexResponseActionFuture.actionGet())
+        .thenReturn(new CreateIndexResponse(true, true, DATASOURCE_INDEX_NAME));
+    Mockito.when(client.index(ArgumentMatchers.any())).thenReturn(indexResponseActionFuture);
+    Mockito.when(indexResponseActionFuture.actionGet()).thenReturn(indexResponse);
+    Mockito.when(indexResponse.getResult()).thenReturn(DocWriteResponse.Result.NOT_FOUND);
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata();
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class,
+            () ->
+                this.openSearchDataSourceMetadataStorage.createDataSourceMetadata(
+                    dataSourceMetadata));
+    Assertions.assertEquals(
+        "Saving dataSource metadata information failed with result : not_found",
+        runtimeException.getMessage());
+
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("secret_key");
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("access_key");
+    Mockito.verify(client.admin().indices(), Mockito.times(1)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).index(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(2)).stashContext();
+  }
+
+  @Test
+  public void testCreateDataSourceMetadataWithVersionConflict() {
+    setDataSourcesEnabled(true);
+
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(Boolean.FALSE);
+    Mockito.when(encryptor.encrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.encrypt("access_key")).thenReturn("access_key");
+    Mockito.when(client.admin().indices().create(ArgumentMatchers.any()))
+        .thenReturn(createIndexResponseActionFuture);
+    Mockito.when(createIndexResponseActionFuture.actionGet())
+        .thenReturn(new CreateIndexResponse(true, true, DATASOURCE_INDEX_NAME));
+    Mockito.when(client.index(ArgumentMatchers.any()))
+        .thenThrow(VersionConflictEngineException.class);
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata();
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                this.openSearchDataSourceMetadataStorage.createDataSourceMetadata(
+                    dataSourceMetadata));
+    Assertions.assertEquals(
+        "A datasource already exists with name: testDS", illegalArgumentException.getMessage());
+
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("secret_key");
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("access_key");
+    Mockito.verify(client.admin().indices(), Mockito.times(1)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).index(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(2)).stashContext();
+  }
+
+  @Test
+  public void testCreateDataSourceMetadataWithException() {
+    setDataSourcesEnabled(true);
+
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(Boolean.FALSE);
+    Mockito.when(encryptor.encrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.encrypt("access_key")).thenReturn("access_key");
+    Mockito.when(client.admin().indices().create(ArgumentMatchers.any()))
+        .thenReturn(createIndexResponseActionFuture);
+    Mockito.when(createIndexResponseActionFuture.actionGet())
+        .thenReturn(new CreateIndexResponse(true, true, DATASOURCE_INDEX_NAME));
+    Mockito.when(client.index(ArgumentMatchers.any()))
+        .thenThrow(new RuntimeException("error while indexing"));
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata();
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class,
+            () ->
+                this.openSearchDataSourceMetadataStorage.createDataSourceMetadata(
+                    dataSourceMetadata));
+    Assertions.assertEquals(
+        "java.lang.RuntimeException: error while indexing", runtimeException.getMessage());
+
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("secret_key");
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("access_key");
+    Mockito.verify(client.admin().indices(), Mockito.times(1)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).index(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(2)).stashContext();
+  }
+
+  @Test
+  public void testCreateDataSourceMetadataWithIndexCreationFailed() {
+    setDataSourcesEnabled(true);
+
+    Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME))
+        .thenReturn(Boolean.FALSE);
+    Mockito.when(encryptor.encrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.encrypt("access_key")).thenReturn("access_key");
+    Mockito.when(client.admin().indices().create(ArgumentMatchers.any()))
+        .thenReturn(createIndexResponseActionFuture);
+    Mockito.when(createIndexResponseActionFuture.actionGet())
+        .thenReturn(new CreateIndexResponse(false, false, DATASOURCE_INDEX_NAME));
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata();
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class,
+            () ->
+                this.openSearchDataSourceMetadataStorage.createDataSourceMetadata(
+                    dataSourceMetadata));
+    Assertions.assertEquals(
+        "Internal server error while creating.ql-datasources index:: "
+            + "Index creation is not acknowledged.",
+        runtimeException.getMessage());
+
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("secret_key");
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("access_key");
+    Mockito.verify(client.admin().indices(), Mockito.times(1)).create(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(1)).stashContext();
+  }
+
+  @Test
+  public void testUpdateDataSourceMetadata() {
+    setDataSourcesEnabled(true);
+    Mockito.when(encryptor.encrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.encrypt("access_key")).thenReturn("access_key");
+    Mockito.when(client.update(ArgumentMatchers.any())).thenReturn(updateResponseActionFuture);
+    Mockito.when(updateResponseActionFuture.actionGet()).thenReturn(updateResponse);
+    Mockito.when(updateResponse.getResult()).thenReturn(DocWriteResponse.Result.UPDATED);
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata();
+
+    this.openSearchDataSourceMetadataStorage.updateDataSourceMetadata(dataSourceMetadata);
+
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("secret_key");
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("access_key");
+    Mockito.verify(client.admin().indices(), Mockito.times(0)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).update(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(1)).stashContext();
+  }
+
+  @Test
+  public void testUpdateDataSourceMetadataWithNOOP() {
+    setDataSourcesEnabled(true);
+    Mockito.when(encryptor.encrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.encrypt("access_key")).thenReturn("access_key");
+    Mockito.when(client.update(ArgumentMatchers.any())).thenReturn(updateResponseActionFuture);
+    Mockito.when(updateResponseActionFuture.actionGet()).thenReturn(updateResponse);
+    Mockito.when(updateResponse.getResult()).thenReturn(DocWriteResponse.Result.NOOP);
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata();
+
+    this.openSearchDataSourceMetadataStorage.updateDataSourceMetadata(dataSourceMetadata);
+
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("secret_key");
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("access_key");
+    Mockito.verify(client.admin().indices(), Mockito.times(0)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).update(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(1)).stashContext();
+  }
+
+  @Test
+  public void testUpdateDataSourceMetadataWithNotFoundResult() {
+    setDataSourcesEnabled(true);
+    Mockito.when(encryptor.encrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.encrypt("access_key")).thenReturn("access_key");
+    Mockito.when(client.update(ArgumentMatchers.any())).thenReturn(updateResponseActionFuture);
+    Mockito.when(updateResponseActionFuture.actionGet()).thenReturn(updateResponse);
+    Mockito.when(updateResponse.getResult()).thenReturn(DocWriteResponse.Result.NOT_FOUND);
+    DataSourceMetadata dataSourceMetadata = getDataSourceMetadata();
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class,
+            () ->
+                this.openSearchDataSourceMetadataStorage.updateDataSourceMetadata(
+                    dataSourceMetadata));
+    Assertions.assertEquals(
+        "Saving dataSource metadata information failed with result : not_found",
+        runtimeException.getMessage());
+
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("secret_key");
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("access_key");
+    Mockito.verify(client.admin().indices(), Mockito.times(0)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).update(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(1)).stashContext();
+  }
+
+  @Test
+  public void testUpdateDataSourceMetadataWithDocumentMissingException() {
+    setDataSourcesEnabled(true);
+    Mockito.when(encryptor.encrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.encrypt("access_key")).thenReturn("access_key");
+    Mockito.when(client.update(ArgumentMatchers.any()))
+        .thenThrow(new DocumentMissingException(ShardId.fromString("[2][2]"), "testDS"));
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder(getDataSourceMetadata()).setName("testDS").build();
+
+    DataSourceNotFoundException dataSourceNotFoundException =
+        Assertions.assertThrows(
+            DataSourceNotFoundException.class,
+            () ->
+                this.openSearchDataSourceMetadataStorage.updateDataSourceMetadata(
+                    dataSourceMetadata));
+    Assertions.assertEquals(
+        "Datasource with name: testDS doesn't exist", dataSourceNotFoundException.getMessage());
+
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("secret_key");
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("access_key");
+    Mockito.verify(client.admin().indices(), Mockito.times(0)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).update(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(1)).stashContext();
+  }
+
+  @Test
+  public void testUpdateDataSourceMetadataWithRuntimeException() {
+    setDataSourcesEnabled(true);
+    Mockito.when(encryptor.encrypt("secret_key")).thenReturn("secret_key");
+    Mockito.when(encryptor.encrypt("access_key")).thenReturn("access_key");
+    Mockito.when(client.update(ArgumentMatchers.any()))
+        .thenThrow(new RuntimeException("error message"));
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder(getDataSourceMetadata()).setName("testDS").build();
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class,
+            () ->
+                this.openSearchDataSourceMetadataStorage.updateDataSourceMetadata(
+                    dataSourceMetadata));
+    Assertions.assertEquals(
+        "java.lang.RuntimeException: error message", runtimeException.getMessage());
+
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("secret_key");
+    Mockito.verify(encryptor, Mockito.times(1)).encrypt("access_key");
+    Mockito.verify(client.admin().indices(), Mockito.times(0)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).update(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(1)).stashContext();
+  }
+
+  @Test
+  public void testDeleteDataSourceMetadata() {
+    setDataSourcesEnabled(true);
+    Mockito.when(client.delete(ArgumentMatchers.any())).thenReturn(deleteResponseActionFuture);
+    Mockito.when(deleteResponseActionFuture.actionGet()).thenReturn(deleteResponse);
+    Mockito.when(deleteResponse.getResult()).thenReturn(DocWriteResponse.Result.DELETED);
+
+    this.openSearchDataSourceMetadataStorage.deleteDataSourceMetadata("testDS");
+
+    Mockito.verifyNoInteractions(encryptor);
+    Mockito.verify(client.admin().indices(), Mockito.times(0)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).delete(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(1)).stashContext();
+  }
+
+  @Test
+  public void testDeleteDataSourceMetadataWhichisAlreadyDeleted() {
+    setDataSourcesEnabled(true);
+    Mockito.when(client.delete(ArgumentMatchers.any())).thenReturn(deleteResponseActionFuture);
+    Mockito.when(deleteResponseActionFuture.actionGet()).thenReturn(deleteResponse);
+    Mockito.when(deleteResponse.getResult()).thenReturn(DocWriteResponse.Result.NOT_FOUND);
+
+    DataSourceNotFoundException dataSourceNotFoundException =
+        Assertions.assertThrows(
+            DataSourceNotFoundException.class,
+            () -> this.openSearchDataSourceMetadataStorage.deleteDataSourceMetadata("testDS"));
+    Assertions.assertEquals(
+        "Datasource with name: testDS doesn't exist", dataSourceNotFoundException.getMessage());
+
+    Mockito.verifyNoInteractions(encryptor);
+    Mockito.verify(client.admin().indices(), Mockito.times(0)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).delete(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(1)).stashContext();
+  }
+
+  @Test
+  public void testDeleteDataSourceMetadataWithUnexpectedResult() {
+    setDataSourcesEnabled(true);
+    Mockito.when(client.delete(ArgumentMatchers.any())).thenReturn(deleteResponseActionFuture);
+    Mockito.when(deleteResponseActionFuture.actionGet()).thenReturn(deleteResponse);
+    Mockito.when(deleteResponse.getResult()).thenReturn(DocWriteResponse.Result.NOOP);
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class,
+            () -> this.openSearchDataSourceMetadataStorage.deleteDataSourceMetadata("testDS"));
+    Assertions.assertEquals(
+        "Deleting dataSource metadata information failed with result : noop",
+        runtimeException.getMessage());
+
+    Mockito.verifyNoInteractions(encryptor);
+    Mockito.verify(client.admin().indices(), Mockito.times(0)).create(ArgumentMatchers.any());
+    Mockito.verify(client, Mockito.times(1)).delete(ArgumentMatchers.any());
+    Mockito.verify(client.threadPool().getThreadContext(), Mockito.times(1)).stashContext();
+  }
+
+  @Test
+  public void testWhenDataSourcesAreDisabled() {
+    setDataSourcesEnabled(false);
+
+    Assertions.assertEquals(
+        Optional.empty(), this.openSearchDataSourceMetadataStorage.getDataSourceMetadata("dummy"));
+
+    Assertions.assertEquals(
+        Collections.emptyList(), this.openSearchDataSourceMetadataStorage.getDataSourceMetadata());
+
+    Assertions.assertThrows(
+        IllegalStateException.class,
+        () -> {
+          this.openSearchDataSourceMetadataStorage.createDataSourceMetadata(
+              getDataSourceMetadata());
+        },
+        "Data source management is disabled");
+
+    Assertions.assertThrows(
+        IllegalStateException.class,
+        () -> {
+          this.openSearchDataSourceMetadataStorage.updateDataSourceMetadata(
+              getDataSourceMetadata());
+        },
+        "Data source management is disabled");
+
+    Assertions.assertThrows(
+        IllegalStateException.class,
+        () -> {
+          this.openSearchDataSourceMetadataStorage.deleteDataSourceMetadata("dummy");
+        },
+        "Data source management is disabled");
+
+    Mockito.verify(clusterService.state().routingTable(), Mockito.times(0))
+        .hasIndex(DATASOURCE_INDEX_NAME);
+  }
+
+  private String getBasicDataSourceMetadataString() throws JsonProcessingException {
+    Map<String, String> properties = new HashMap<>();
+    properties.put("prometheus.auth.type", "basicauth");
+    properties.put("prometheus.auth.username", "username");
+    properties.put("prometheus.auth.uri", "https://localhost:9090");
+    properties.put("prometheus.auth.password", "password");
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("testDS")
+            .setProperties(properties)
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setAllowedRoles(Collections.singletonList("prometheus_access"))
+            .build();
+    return serialize(dataSourceMetadata);
+  }
+
+  private String getOldDataSourceMetadataStringWithOutStatusEnum() {
+    return "{\"name\":\"testDS\",\"description\":\"\",\"connector\":\"PROMETHEUS\",\"allowedRoles\":[\"prometheus_access\"],\"properties\":{\"prometheus.auth.password\":\"password\",\"prometheus.auth.username\":\"username\",\"prometheus.auth.uri\":\"https://localhost:9090\",\"prometheus.auth.type\":\"basicauth\"},\"resultIndex\":\"query_execution_result_testds\"}";
+  }
+
+  private String getAWSSigv4DataSourceMetadataString() throws JsonProcessingException {
+    Map<String, String> properties = new HashMap<>();
+    properties.put("prometheus.auth.type", "awssigv4");
+    properties.put("prometheus.auth.secret_key", "secret_key");
+    properties.put("prometheus.auth.uri", "https://localhost:9090");
+    properties.put("prometheus.auth.access_key", "access_key");
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("testDS")
+            .setProperties(properties)
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setAllowedRoles(Collections.singletonList("prometheus_access"))
+            .build();
+    return serialize(dataSourceMetadata);
+  }
+
+  private String getDataSourceMetadataStringWithBasicAuthentication()
+      throws JsonProcessingException {
+    Map<String, String> properties = new HashMap<>();
+    properties.put("prometheus.auth.uri", "https://localhost:9090");
+    properties.put("prometheus.auth.type", "basicauth");
+    properties.put("prometheus.auth.username", "username");
+    properties.put("prometheus.auth.password", "password");
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("testDS")
+            .setProperties(properties)
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setAllowedRoles(Collections.singletonList("prometheus_access"))
+            .build();
+    return serialize(dataSourceMetadata);
+  }
+
+  private String getDataSourceMetadataStringWithNoAuthentication() throws JsonProcessingException {
+    Map<String, String> properties = new HashMap<>();
+    properties.put("prometheus.auth.uri", "https://localhost:9090");
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("testDS")
+            .setProperties(properties)
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setAllowedRoles(Collections.singletonList("prometheus_access"))
+            .build();
+    return serialize(dataSourceMetadata);
+  }
+
+  private DataSourceMetadata getDataSourceMetadata() {
+    Map<String, String> properties = new HashMap<>();
+    properties.put("prometheus.auth.type", "awssigv4");
+    properties.put("prometheus.auth.secret_key", "secret_key");
+    properties.put("prometheus.auth.uri", "https://localhost:9090");
+    properties.put("prometheus.auth.access_key", "access_key");
+    return new DataSourceMetadata.Builder()
+        .setName("testDS")
+        .setProperties(properties)
+        .setConnector(DataSourceType.PROMETHEUS)
+        .setAllowedRoles(Collections.singletonList("prometheus_access"))
+        .build();
+  }
+
+  private String serialize(DataSourceMetadata dataSourceMetadata) throws JsonProcessingException {
+    return getObjectMapper().writeValueAsString(dataSourceMetadata);
+  }
+
+  private ObjectMapper getObjectMapper() {
+    ObjectMapper mapper = new ObjectMapper();
+    addSerializerForDataSourceType(mapper);
+    return mapper;
+  }
+
+  /** It is needed to serialize DataSourceType as string. */
+  private void addSerializerForDataSourceType(ObjectMapper mapper) {
+    SimpleModule module = new SimpleModule();
+    module.addSerializer(DataSourceType.class, getDataSourceTypeSerializer());
+    mapper.registerModule(module);
+  }
+
+  private StdSerializer<DataSourceType> getDataSourceTypeSerializer() {
+    return new StdSerializer<>(DataSourceType.class) {
+      @Override
+      public void serialize(
+          DataSourceType dsType, JsonGenerator jsonGen, SerializerProvider provider)
+          throws IOException {
+        jsonGen.writeString(dsType.name());
+      }
+    };
+  }
+
+  private void setDataSourcesEnabled(boolean enabled) {
+    Mockito.when(
+            openSearchSettings.getSettingValue(
+                ArgumentMatchers.eq(Settings.Key.DATASOURCES_ENABLED)))
+        .thenReturn(enabled);
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceActionTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceActionTest.java
new file mode 100644
index 0000000000..ba93890883
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceActionTest.java
@@ -0,0 +1,137 @@
+package org.opensearch.sql.datasources.transport;
+
+import static java.util.Collections.emptyList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.common.setting.Settings.Key.DATASOURCES_LIMIT;
+
+import java.util.HashSet;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.datasources.model.transport.CreateDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.CreateDataSourceActionResponse;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.legacy.esdomain.LocalClusterState;
+import org.opensearch.sql.legacy.metrics.Metrics;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+@ExtendWith(MockitoExtension.class)
+public class TransportCreateDataSourceActionTest {
+
+  @Mock private TransportService transportService;
+  @Mock private TransportCreateDataSourceAction action;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private DataSourceServiceImpl dataSourceService;
+
+  @Mock private Task task;
+  @Mock private ActionListener<CreateDataSourceActionResponse> actionListener;
+  @Mock private OpenSearchSettings settings;
+
+  @Captor
+  private ArgumentCaptor<CreateDataSourceActionResponse>
+      createDataSourceActionResponseArgumentCaptor;
+
+  @Captor private ArgumentCaptor<Exception> exceptionArgumentCaptor;
+
+  @BeforeEach
+  public void setUp() {
+    action =
+        new TransportCreateDataSourceAction(
+            transportService, new ActionFilters(new HashSet<>()), dataSourceService, settings);
+    when(dataSourceService.getDataSourceMetadata(false).size()).thenReturn(1);
+    when(settings.getSettingValue(DATASOURCES_LIMIT)).thenReturn(20);
+    // Required for metrics initialization
+    doReturn(emptyList()).when(settings).getSettings();
+    when(settings.getSettingValue(Settings.Key.METRICS_ROLLING_INTERVAL)).thenReturn(3600L);
+    when(settings.getSettingValue(Settings.Key.METRICS_ROLLING_WINDOW)).thenReturn(600L);
+    LocalClusterState.state().setPluginSettings(settings);
+    Metrics.getInstance().registerDefaultMetrics();
+  }
+
+  @Test
+  public void testDoExecute() {
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("test_datasource")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .build();
+    CreateDataSourceActionRequest request = new CreateDataSourceActionRequest(dataSourceMetadata);
+
+    action.doExecute(task, request, actionListener);
+    verify(dataSourceService, times(1)).createDataSource(dataSourceMetadata);
+    Mockito.verify(actionListener)
+        .onResponse(createDataSourceActionResponseArgumentCaptor.capture());
+    CreateDataSourceActionResponse createDataSourceActionResponse =
+        createDataSourceActionResponseArgumentCaptor.getValue();
+    String responseAsJson = "\"Created DataSource with name test_datasource\"";
+    Assertions.assertEquals(responseAsJson, createDataSourceActionResponse.getResult());
+  }
+
+  @Test
+  public void testDoExecuteWithException() {
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("test_datasource")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .build();
+    doThrow(new RuntimeException("Error"))
+        .when(dataSourceService)
+        .createDataSource(dataSourceMetadata);
+    CreateDataSourceActionRequest request = new CreateDataSourceActionRequest(dataSourceMetadata);
+    action.doExecute(task, request, actionListener);
+    verify(dataSourceService, times(1)).createDataSource(dataSourceMetadata);
+    Mockito.verify(actionListener).onFailure(exceptionArgumentCaptor.capture());
+    Exception exception = exceptionArgumentCaptor.getValue();
+    Assertions.assertTrue(exception instanceof RuntimeException);
+    Assertions.assertEquals("Error", exception.getMessage());
+  }
+
+  @Test
+  public void testDataSourcesLimit() {
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("test_datasource")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .build();
+    CreateDataSourceActionRequest request = new CreateDataSourceActionRequest(dataSourceMetadata);
+    when(dataSourceService.getDataSourceMetadata(false).size()).thenReturn(1);
+    when(settings.getSettingValue(DATASOURCES_LIMIT)).thenReturn(1);
+
+    action.doExecute(
+        task,
+        request,
+        new ActionListener<CreateDataSourceActionResponse>() {
+          @Override
+          public void onResponse(CreateDataSourceActionResponse createDataSourceActionResponse) {
+            fail();
+          }
+
+          @Override
+          public void onFailure(Exception e) {
+            assertEquals("domain concurrent datasources can not exceed 1", e.getMessage());
+          }
+        });
+    verify(dataSourceService, times(0)).createDataSource(dataSourceMetadata);
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportDeleteDataSourceActionTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportDeleteDataSourceActionTest.java
new file mode 100644
index 0000000000..df066654c6
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportDeleteDataSourceActionTest.java
@@ -0,0 +1,87 @@
+package org.opensearch.sql.datasources.transport;
+
+import static java.util.Collections.emptyList;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.HashSet;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasources.model.transport.DeleteDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.DeleteDataSourceActionResponse;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.legacy.esdomain.LocalClusterState;
+import org.opensearch.sql.legacy.metrics.Metrics;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+@ExtendWith(MockitoExtension.class)
+public class TransportDeleteDataSourceActionTest {
+
+  @Mock private TransportService transportService;
+  @Mock private TransportDeleteDataSourceAction action;
+  @Mock private DataSourceServiceImpl dataSourceService;
+  @Mock private Task task;
+  @Mock private ActionListener<DeleteDataSourceActionResponse> actionListener;
+
+  @Mock private OpenSearchSettings settings;
+
+  @Captor
+  private ArgumentCaptor<DeleteDataSourceActionResponse>
+      deleteDataSourceActionResponseArgumentCaptor;
+
+  @Captor private ArgumentCaptor<Exception> exceptionArgumentCaptor;
+
+  @BeforeEach
+  public void setUp() {
+    action =
+        new TransportDeleteDataSourceAction(
+            transportService, new ActionFilters(new HashSet<>()), dataSourceService);
+    // Required for metrics initialization
+    doReturn(emptyList()).when(settings).getSettings();
+    when(settings.getSettingValue(Settings.Key.METRICS_ROLLING_INTERVAL)).thenReturn(3600L);
+    when(settings.getSettingValue(Settings.Key.METRICS_ROLLING_WINDOW)).thenReturn(600L);
+    LocalClusterState.state().setPluginSettings(settings);
+    Metrics.getInstance().registerDefaultMetrics();
+  }
+
+  @Test
+  public void testDoExecute() {
+    DeleteDataSourceActionRequest request = new DeleteDataSourceActionRequest("test_datasource");
+
+    action.doExecute(task, request, actionListener);
+    verify(dataSourceService, times(1)).deleteDataSource("test_datasource");
+    Mockito.verify(actionListener)
+        .onResponse(deleteDataSourceActionResponseArgumentCaptor.capture());
+    DeleteDataSourceActionResponse deleteDataSourceActionResponse =
+        deleteDataSourceActionResponseArgumentCaptor.getValue();
+    Assertions.assertEquals(
+        "Deleted DataSource with name test_datasource", deleteDataSourceActionResponse.getResult());
+  }
+
+  @Test
+  public void testDoExecuteWithException() {
+    doThrow(new RuntimeException("Error")).when(dataSourceService).deleteDataSource("testDS");
+    DeleteDataSourceActionRequest request = new DeleteDataSourceActionRequest("testDS");
+    action.doExecute(task, request, actionListener);
+    verify(dataSourceService, times(1)).deleteDataSource("testDS");
+    Mockito.verify(actionListener).onFailure(exceptionArgumentCaptor.capture());
+    Exception exception = exceptionArgumentCaptor.getValue();
+    Assertions.assertTrue(exception instanceof RuntimeException);
+    Assertions.assertEquals("Error", exception.getMessage());
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportGetDataSourceActionTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportGetDataSourceActionTest.java
new file mode 100644
index 0000000000..22118a676e
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportGetDataSourceActionTest.java
@@ -0,0 +1,150 @@
+package org.opensearch.sql.datasources.transport;
+
+import static java.util.Collections.emptyList;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.datasources.model.transport.GetDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.GetDataSourceActionResponse;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.legacy.esdomain.LocalClusterState;
+import org.opensearch.sql.legacy.metrics.Metrics;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.sql.protocol.response.format.JsonResponseFormatter;
+import org.opensearch.sql.utils.SerializeUtils;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+@ExtendWith(MockitoExtension.class)
+public class TransportGetDataSourceActionTest {
+
+  @Mock private TransportService transportService;
+  @Mock private TransportGetDataSourceAction action;
+  @Mock private DataSourceServiceImpl dataSourceService;
+  @Mock private Task task;
+  @Mock private ActionListener<GetDataSourceActionResponse> actionListener;
+
+  @Captor
+  private ArgumentCaptor<GetDataSourceActionResponse> getDataSourceActionResponseArgumentCaptor;
+
+  @Captor private ArgumentCaptor<Exception> exceptionArgumentCaptor;
+
+  @Mock private OpenSearchSettings settings;
+
+  @BeforeEach
+  public void setUp() {
+    action =
+        new TransportGetDataSourceAction(
+            transportService, new ActionFilters(new HashSet<>()), dataSourceService);
+    // Required for metrics initialization
+    doReturn(emptyList()).when(settings).getSettings();
+    when(settings.getSettingValue(Settings.Key.METRICS_ROLLING_INTERVAL)).thenReturn(3600L);
+    when(settings.getSettingValue(Settings.Key.METRICS_ROLLING_WINDOW)).thenReturn(600L);
+    LocalClusterState.state().setPluginSettings(settings);
+    Metrics.getInstance().registerDefaultMetrics();
+  }
+
+  @Test
+  public void testDoExecute() {
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("test_datasource")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .build();
+    GetDataSourceActionRequest request = new GetDataSourceActionRequest("test_datasource");
+    when(dataSourceService.getDataSourceMetadata("test_datasource")).thenReturn(dataSourceMetadata);
+
+    action.doExecute(task, request, actionListener);
+
+    verify(dataSourceService, times(1)).getDataSourceMetadata("test_datasource");
+    Mockito.verify(actionListener).onResponse(getDataSourceActionResponseArgumentCaptor.capture());
+    GetDataSourceActionResponse getDataSourceActionResponse =
+        getDataSourceActionResponseArgumentCaptor.getValue();
+    JsonResponseFormatter<DataSourceMetadata> dataSourceMetadataJsonResponseFormatter =
+        new JsonResponseFormatter<>(JsonResponseFormatter.Style.PRETTY) {
+          @Override
+          protected Object buildJsonObject(DataSourceMetadata response) {
+            return response;
+          }
+        };
+    Assertions.assertEquals(
+        dataSourceMetadataJsonResponseFormatter.format(dataSourceMetadata),
+        getDataSourceActionResponse.getResult());
+    DataSourceMetadata result =
+        SerializeUtils.buildGson()
+            .fromJson(getDataSourceActionResponse.getResult(), DataSourceMetadata.class);
+    Assertions.assertEquals("test_datasource", result.getName());
+    Assertions.assertEquals(DataSourceType.PROMETHEUS, result.getConnector());
+  }
+
+  @Test
+  public void testDoExecuteForGetAllDataSources() {
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("test_datasource")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .build();
+    GetDataSourceActionRequest request = new GetDataSourceActionRequest();
+    when(dataSourceService.getDataSourceMetadata(false))
+        .thenReturn(Collections.singleton(dataSourceMetadata));
+
+    action.doExecute(task, request, actionListener);
+
+    verify(dataSourceService, times(1)).getDataSourceMetadata(false);
+    Mockito.verify(actionListener).onResponse(getDataSourceActionResponseArgumentCaptor.capture());
+    GetDataSourceActionResponse getDataSourceActionResponse =
+        getDataSourceActionResponseArgumentCaptor.getValue();
+    JsonResponseFormatter<Set<DataSourceMetadata>> dataSourceMetadataJsonResponseFormatter =
+        new JsonResponseFormatter<>(JsonResponseFormatter.Style.PRETTY) {
+          @Override
+          protected Object buildJsonObject(Set<DataSourceMetadata> response) {
+            return response;
+          }
+        };
+    Type setType = new TypeToken<Set<DataSourceMetadata>>() {}.getType();
+    Assertions.assertEquals(
+        dataSourceMetadataJsonResponseFormatter.format(Collections.singleton(dataSourceMetadata)),
+        getDataSourceActionResponse.getResult());
+    Set<DataSourceMetadata> result =
+        SerializeUtils.buildGson().fromJson(getDataSourceActionResponse.getResult(), setType);
+    DataSourceMetadata resultDataSource = result.iterator().next();
+    Assertions.assertEquals("test_datasource", resultDataSource.getName());
+    Assertions.assertEquals(DataSourceType.PROMETHEUS, resultDataSource.getConnector());
+  }
+
+  @Test
+  public void testDoExecuteWithException() {
+    doThrow(new RuntimeException("Error")).when(dataSourceService).getDataSourceMetadata("testDS");
+    GetDataSourceActionRequest request = new GetDataSourceActionRequest("testDS");
+
+    action.doExecute(task, request, actionListener);
+
+    verify(dataSourceService, times(1)).getDataSourceMetadata("testDS");
+    Mockito.verify(actionListener).onFailure(exceptionArgumentCaptor.capture());
+    Exception exception = exceptionArgumentCaptor.getValue();
+    Assertions.assertTrue(exception instanceof RuntimeException);
+    Assertions.assertEquals("Error", exception.getMessage());
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportPatchDataSourceActionTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportPatchDataSourceActionTest.java
new file mode 100644
index 0000000000..a0f159bfd0
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportPatchDataSourceActionTest.java
@@ -0,0 +1,91 @@
+package org.opensearch.sql.datasources.transport;
+
+import static java.util.Collections.emptyList;
+import static org.mockito.Mockito.*;
+import static org.opensearch.sql.datasources.utils.XContentParserUtils.*;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasources.model.transport.PatchDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.PatchDataSourceActionResponse;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.legacy.esdomain.LocalClusterState;
+import org.opensearch.sql.legacy.metrics.Metrics;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+@ExtendWith(MockitoExtension.class)
+public class TransportPatchDataSourceActionTest {
+
+  @Mock private TransportService transportService;
+  @Mock private TransportPatchDataSourceAction action;
+  @Mock private DataSourceServiceImpl dataSourceService;
+  @Mock private Task task;
+  @Mock private ActionListener<PatchDataSourceActionResponse> actionListener;
+
+  @Captor
+  private ArgumentCaptor<PatchDataSourceActionResponse> patchDataSourceActionResponseArgumentCaptor;
+
+  @Captor private ArgumentCaptor<Exception> exceptionArgumentCaptor;
+  @Mock private OpenSearchSettings settings;
+
+  @BeforeEach
+  public void setUp() {
+    action =
+        new TransportPatchDataSourceAction(
+            transportService, new ActionFilters(new HashSet<>()), dataSourceService);
+    // Required for metrics initialization
+    doReturn(emptyList()).when(settings).getSettings();
+    when(settings.getSettingValue(Settings.Key.METRICS_ROLLING_INTERVAL)).thenReturn(3600L);
+    when(settings.getSettingValue(Settings.Key.METRICS_ROLLING_WINDOW)).thenReturn(600L);
+    LocalClusterState.state().setPluginSettings(settings);
+    Metrics.getInstance().registerDefaultMetrics();
+  }
+
+  @Test
+  public void testDoExecute() {
+    Map<String, Object> dataSourceData = new HashMap<>();
+    dataSourceData.put(NAME_FIELD, "test_datasource");
+    dataSourceData.put(DESCRIPTION_FIELD, "test");
+
+    PatchDataSourceActionRequest request = new PatchDataSourceActionRequest(dataSourceData);
+
+    action.doExecute(task, request, actionListener);
+    verify(dataSourceService, times(1)).patchDataSource(dataSourceData);
+    Mockito.verify(actionListener)
+        .onResponse(patchDataSourceActionResponseArgumentCaptor.capture());
+    PatchDataSourceActionResponse patchDataSourceActionResponse =
+        patchDataSourceActionResponseArgumentCaptor.getValue();
+    String responseAsJson = "\"Updated DataSource with name test_datasource\"";
+    Assertions.assertEquals(responseAsJson, patchDataSourceActionResponse.getResult());
+  }
+
+  @Test
+  public void testDoExecuteWithException() {
+    Map<String, Object> dataSourceData = new HashMap<>();
+    dataSourceData.put(NAME_FIELD, "test_datasource");
+    dataSourceData.put(DESCRIPTION_FIELD, "test");
+    doThrow(new RuntimeException("Error")).when(dataSourceService).patchDataSource(dataSourceData);
+    PatchDataSourceActionRequest request = new PatchDataSourceActionRequest(dataSourceData);
+    action.doExecute(task, request, actionListener);
+    verify(dataSourceService, times(1)).patchDataSource(dataSourceData);
+    Mockito.verify(actionListener).onFailure(exceptionArgumentCaptor.capture());
+    Exception exception = exceptionArgumentCaptor.getValue();
+    Assertions.assertTrue(exception instanceof RuntimeException);
+    Assertions.assertEquals("Error", exception.getMessage());
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportUpdateDataSourceActionTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportUpdateDataSourceActionTest.java
new file mode 100644
index 0000000000..e086813938
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/transport/TransportUpdateDataSourceActionTest.java
@@ -0,0 +1,102 @@
+package org.opensearch.sql.datasources.transport;
+
+import static java.util.Collections.emptyList;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.HashSet;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.datasources.model.transport.UpdateDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.UpdateDataSourceActionResponse;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.legacy.esdomain.LocalClusterState;
+import org.opensearch.sql.legacy.metrics.Metrics;
+import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.tasks.Task;
+import org.opensearch.transport.TransportService;
+
+@ExtendWith(MockitoExtension.class)
+public class TransportUpdateDataSourceActionTest {
+
+  @Mock private TransportService transportService;
+  @Mock private TransportUpdateDataSourceAction action;
+  @Mock private DataSourceServiceImpl dataSourceService;
+  @Mock private Task task;
+  @Mock private ActionListener<UpdateDataSourceActionResponse> actionListener;
+  @Mock private OpenSearchSettings settings;
+
+  @Captor
+  private ArgumentCaptor<UpdateDataSourceActionResponse>
+      updateDataSourceActionResponseArgumentCaptor;
+
+  @Captor private ArgumentCaptor<Exception> exceptionArgumentCaptor;
+
+  @BeforeEach
+  public void setUp() {
+    action =
+        new TransportUpdateDataSourceAction(
+            transportService, new ActionFilters(new HashSet<>()), dataSourceService);
+    // Required for metrics initialization
+    doReturn(emptyList()).when(settings).getSettings();
+    when(settings.getSettingValue(Settings.Key.METRICS_ROLLING_INTERVAL)).thenReturn(3600L);
+    when(settings.getSettingValue(Settings.Key.METRICS_ROLLING_WINDOW)).thenReturn(600L);
+    LocalClusterState.state().setPluginSettings(settings);
+    Metrics.getInstance().registerDefaultMetrics();
+  }
+
+  @Test
+  public void testDoExecute() {
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("test_datasource")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .build();
+    UpdateDataSourceActionRequest request = new UpdateDataSourceActionRequest(dataSourceMetadata);
+
+    action.doExecute(task, request, actionListener);
+    verify(dataSourceService, times(1)).updateDataSource(dataSourceMetadata);
+    Mockito.verify(actionListener)
+        .onResponse(updateDataSourceActionResponseArgumentCaptor.capture());
+    UpdateDataSourceActionResponse updateDataSourceActionResponse =
+        updateDataSourceActionResponseArgumentCaptor.getValue();
+    String responseAsJson = "\"Updated DataSource with name test_datasource\"";
+
+    Assertions.assertEquals(responseAsJson, updateDataSourceActionResponse.getResult());
+  }
+
+  @Test
+  public void testDoExecuteWithException() {
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("test_datasource")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .build();
+
+    doThrow(new RuntimeException("Error"))
+        .when(dataSourceService)
+        .updateDataSource(dataSourceMetadata);
+    UpdateDataSourceActionRequest request = new UpdateDataSourceActionRequest(dataSourceMetadata);
+    action.doExecute(task, request, actionListener);
+    verify(dataSourceService, times(1)).updateDataSource(dataSourceMetadata);
+    Mockito.verify(actionListener).onFailure(exceptionArgumentCaptor.capture());
+    Exception exception = exceptionArgumentCaptor.getValue();
+    Assertions.assertTrue(exception instanceof RuntimeException);
+    Assertions.assertEquals("Error", exception.getMessage());
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/utils/DatasourceValidationUtilsTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/utils/DatasourceValidationUtilsTest.java
new file mode 100644
index 0000000000..2b77c1938a
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/utils/DatasourceValidationUtilsTest.java
@@ -0,0 +1,80 @@
+package org.opensearch.sql.datasources.utils;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Set;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class DatasourceValidationUtilsTest {
+
+  @SneakyThrows
+  @Test
+  public void testValidateHost() {
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                DatasourceValidationUtils.validateHost(
+                    "http://localhost:9090", Collections.singletonList("127.0.0.0/8")));
+    Assertions.assertEquals(
+        "Disallowed hostname in the uri. Validate with plugins.query.datasources.uri.hosts.denylist"
+            + " config",
+        illegalArgumentException.getMessage());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testValidateHostWithSuccess() {
+    Assertions.assertDoesNotThrow(
+        () ->
+            DatasourceValidationUtils.validateHost(
+                "http://localhost:9090", Collections.singletonList("192.168.0.0/8")));
+  }
+
+  @Test
+  public void testValidateLengthAndRequiredFieldsWithAbsentField() {
+    HashMap<String, String> config = new HashMap<>();
+    config.put("s3.uri", "test");
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                DatasourceValidationUtils.validateLengthAndRequiredFields(
+                    config, Set.of("s3.uri", "s3.auth.type")));
+    Assertions.assertEquals(
+        "Missing [s3.auth.type] fields in the connector properties.",
+        illegalArgumentException.getMessage());
+  }
+
+  @Test
+  public void testValidateLengthAndRequiredFieldsWithInvalidLength() {
+    HashMap<String, String> config = new HashMap<>();
+    config.put("s3.uri", RandomStringUtils.random(1001));
+    IllegalArgumentException illegalArgumentException =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                DatasourceValidationUtils.validateLengthAndRequiredFields(
+                    config, Set.of("s3.uri", "s3.auth.type")));
+    Assertions.assertEquals(
+        "Missing [s3.auth.type] fields in the connector properties.Fields "
+            + "[s3.uri] exceeds more than 1000 characters.",
+        illegalArgumentException.getMessage());
+  }
+
+  @Test
+  public void testValidateLengthAndRequiredFieldsWithSuccess() {
+    HashMap<String, String> config = new HashMap<>();
+    config.put("s3.uri", "test");
+    Assertions.assertDoesNotThrow(
+        () ->
+            DatasourceValidationUtils.validateLengthAndRequiredFields(
+                config, Collections.emptySet()));
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/utils/SchedulerTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/utils/SchedulerTest.java
new file mode 100644
index 0000000000..ff23cdcabb
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/utils/SchedulerTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasources.utils;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.threadpool.ThreadPool;
+
+@ExtendWith(MockitoExtension.class)
+public class SchedulerTest {
+
+  @Mock private NodeClient nodeClient;
+
+  @Mock private ThreadPool threadPool;
+
+  @Test
+  public void testSchedule() {
+    Mockito.when(nodeClient.threadPool()).thenReturn(threadPool);
+
+    Mockito.doAnswer(
+            invocation -> {
+              Runnable task = invocation.getArgument(0);
+              task.run();
+              return null;
+            })
+        .when(threadPool)
+        .schedule(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any());
+    AtomicBoolean isRun = new AtomicBoolean(false);
+    Scheduler.schedule(nodeClient, () -> isRun.set(true));
+    Assert.assertTrue(isRun.get());
+  }
+}
diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/utils/XContentParserUtilsTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/utils/XContentParserUtilsTest.java
new file mode 100644
index 0000000000..c1b1cfc70c
--- /dev/null
+++ b/datasources/src/test/java/org/opensearch/sql/datasources/utils/XContentParserUtilsTest.java
@@ -0,0 +1,167 @@
+package org.opensearch.sql.datasources.utils;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opensearch.sql.datasource.model.DataSourceStatus.ACTIVE;
+import static org.opensearch.sql.datasources.utils.XContentParserUtils.*;
+
+import com.google.gson.Gson;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.utils.SerializeUtils;
+
+@ExtendWith(MockitoExtension.class)
+public class XContentParserUtilsTest {
+
+  @SneakyThrows
+  @Test
+  public void testConvertToXContent() {
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("testDS")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setAllowedRoles(List.of("prometheus_access"))
+            .setProperties(Map.of("prometheus.uri", "https://localhost:9090"))
+            .build();
+
+    XContentBuilder contentBuilder = XContentParserUtils.convertToXContent(dataSourceMetadata);
+    String contentString = BytesReference.bytes(contentBuilder).utf8ToString();
+    Assertions.assertEquals(
+        "{\"name\":\"testDS\",\"description\":\"\",\"connector\":\"PROMETHEUS\",\"allowedRoles\":[\"prometheus_access\"],\"properties\":{\"prometheus.uri\":\"https://localhost:9090\"},\"resultIndex\":\"query_execution_result_testds\",\"status\":\"ACTIVE\"}",
+        contentString);
+  }
+
+  @SneakyThrows
+  @Test
+  public void testToDataSourceMetadataFromJson() {
+    DataSourceMetadata dataSourceMetadata =
+        new DataSourceMetadata.Builder()
+            .setName("testDS")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setAllowedRoles(List.of("prometheus_access"))
+            .setProperties(Map.of("prometheus.uri", "https://localhost:9090"))
+            .setResultIndex("query_execution_result2")
+            .build();
+    Gson gson = SerializeUtils.buildGson();
+    String json = gson.toJson(dataSourceMetadata);
+
+    DataSourceMetadata retrievedMetadata = XContentParserUtils.toDataSourceMetadata(json);
+
+    Assertions.assertEquals(retrievedMetadata, dataSourceMetadata);
+    Assertions.assertEquals("prometheus_access", retrievedMetadata.getAllowedRoles().get(0));
+  }
+
+  @SneakyThrows
+  @Test
+  public void testToMapFromJson() {
+    Map<String, Object> dataSourceData =
+        Map.of(
+            NAME_FIELD,
+            "test_DS",
+            DESCRIPTION_FIELD,
+            "test",
+            ALLOWED_ROLES_FIELD,
+            List.of("all_access"),
+            PROPERTIES_FIELD,
+            Map.of("prometheus.uri", "localhost:9090"),
+            CONNECTOR_FIELD,
+            "PROMETHEUS",
+            RESULT_INDEX_FIELD,
+            "",
+            STATUS_FIELD,
+            ACTIVE);
+
+    Map<String, Object> dataSourceDataConnectorRemoved =
+        Map.of(
+            NAME_FIELD,
+            "test_DS",
+            DESCRIPTION_FIELD,
+            "test",
+            ALLOWED_ROLES_FIELD,
+            List.of("all_access"),
+            PROPERTIES_FIELD,
+            Map.of("prometheus.uri", "localhost:9090"),
+            RESULT_INDEX_FIELD,
+            "",
+            STATUS_FIELD,
+            ACTIVE);
+
+    String json = SerializeUtils.buildGson().toJson(dataSourceData);
+
+    Map<String, Object> parsedData = XContentParserUtils.toMap(json);
+
+    Assertions.assertEquals(parsedData, dataSourceDataConnectorRemoved);
+    Assertions.assertEquals("test", parsedData.get(DESCRIPTION_FIELD));
+  }
+
+  @SneakyThrows
+  @Test
+  public void testToDataSourceMetadataFromJsonWithoutNameAndConnector() {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              XContentParserUtils.toDataSourceMetadata(
+                  "{\"description\":\"\",\"allowedRoles\":[\"prometheus_access\"],\"resultIndex\":\"query_execution_result_testds\",\"status\":\"ACTIVE\"}");
+            });
+    Assertions.assertEquals(
+        "Datasource configuration error: name, connector cannot be null or empty.",
+        exception.getMessage());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testToMapFromJsonWithoutName() {
+    Map<String, Object> dataSourceData = new HashMap<>(Map.of(DESCRIPTION_FIELD, "test"));
+    String json = SerializeUtils.buildGson().toJson(dataSourceData);
+
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              XContentParserUtils.toMap(json);
+            });
+    Assertions.assertEquals("Name is a required field.", exception.getMessage());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testToDataSourceMetadataFromJsonUsingUnknownObject() {
+    HashMap<String, String> hashMap = new HashMap<>();
+    hashMap.put("test", "test");
+    String json = SerializeUtils.buildGson().toJson(hashMap);
+
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              XContentParserUtils.toDataSourceMetadata(json);
+            });
+    Assertions.assertEquals("Unknown field: test", exception.getMessage());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testToMapFromJsonUsingUnknownObject() {
+    HashMap<String, String> hashMap = new HashMap<>();
+    hashMap.put("test", "test");
+    String json = SerializeUtils.buildGson().toJson(hashMap);
+
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              XContentParserUtils.toMap(json);
+            });
+    Assertions.assertEquals("Unknown field: test", exception.getMessage());
+  }
+}
diff --git a/docs/dev/Pagination-v2.md b/docs/dev/Pagination-v2.md
new file mode 100644
index 0000000000..1c3510b116
--- /dev/null
+++ b/docs/dev/Pagination-v2.md
@@ -0,0 +1,774 @@
+# Pagination in v2 Engine
+
+Pagination allows a SQL plugin client to retrieve arbitrarily large results sets one subset at a time.
+
+A cursor is a SQL abstraction for pagination. A client can open a cursor, retrieve a subset of data given a cursor and close a cursor.
+
+Currently, SQL plugin does not provide SQL cursor syntax. However, the SQL REST endpoint can return result a page at a time. This feature is used by JDBC and ODBC drivers.
+
+# Scope
+This document describes pagination in V2 sql engine for non-aggregate queries -- queries 
+without `GROUP BY` clause or use of window functions.
+
+# Demo
+https://user-images.githubusercontent.com/88679692/224208630-8d38d833-abf8-4035-8d15-d5fb4382deca.mp4
+
+# REST API
+## Initial Query Request
+
+Initial query request contains the search request and page size. Search query to OpenSearch is built during processing of this request. Neither the query nor page size can be changed while scrolling through pages based on this request.
+The only difference between paged and non-paged requests is `fetch_size` parameter supplied in paged request.
+
+```json
+POST /_plugins/_sql
+{
+    "query" : "...",
+    "fetch_size": N
+}
+```
+
+Response:
+```json
+{
+  "cursor": "<cursor_id>",
+  "datarows": [
+    ...
+  ],
+  "schema" : [
+    ...
+  ]
+}
+```
+`query` is a DQL statement. `fetch_size` is a positive integer, indicating number of rows to return in each page.
+
+If `query` is a DML statement then pagination does not apply, the `fetch_size` parameter is ignored and a cursor is not created. This is existing behaviour in v1 engine.
+
+The client receives an [error response](#error-response) if:
+- `fetch_size` is not a positive integer
+-  evaluating `query` results in a server-side error
+-  `fetch_size` is bigger than `max_window_size` cluster-wide parameter.
+
+## Subsequent Query Request
+
+Subsequent query request contains a cursor only.
+
+```json
+POST /_plugins/_sql
+{
+  "cursor": "<cursor_id>"
+}
+```
+Similarly to v1 engine, the response object is the same as initial response if this is not the last page.
+
+`cursor_id` will be different with each request.
+
+## End of scrolling/paging
+The last page in a response will not have a cursor id property.
+
+## Cursor Keep Alive Timeout
+
+Each cursor has a keep alive timer associated with it. When the timer runs out, the cursor is automatically closed by OpenSearch.
+
+This timer is reset every time a page is retrieved.
+
+The client will receive an [error response](#error-response) if it sends a cursor request for an expired cursor.
+
+Keep alive timeout is [configurable](../user/admin/settings.rst#plugins.sql.cursor.keep_alive) by setting `plugins.sql.cursor.keep_alive` and has default value of 1 minute.
+
+## Error Response
+
+The client will receive an error response if any of the above REST calls result in a server-side error.
+
+The response object has the following format:
+```json
+{
+    "error": {
+        "details": "<string>",
+        "reason": "<string>",
+        "type": "<string>"
+    },
+    "status": <integer>
+}
+```
+
+`details`, `reason`, and `type` properties are string values. The exact values will depend on the error state encountered.
+`status` is an HTTP status code
+
+## OpenSearch Data Retrieval Strategy
+
+OpenSearch provides several data retrieval APIs that are optimized for different use cases.
+
+At this time, SQL plugin uses simple search API and scroll API.
+
+Simple retrieval API returns at most `max_result_window` number of documents.  `max_result_window` is an index setting.
+
+Scroll API requests returns all documents but can incur high memory costs on OpenSearch coordination node.
+
+Efficient implementation of pagination needs to be aware of retrieval API used. Each retrieval strategy will be considered separately.
+
+The discussion below uses *under max_result_window* to refer to scenarios that can be implemented with simple retrieval API and *over max_result_window* for scenarios that require scroll API to implement.
+
+## SQL Node Load Balancing
+
+V2 SQL engine supports *sql node load balancing* &mdash; a cursor request can be routed to any SQL node in a cluster. This is achieved by encoding all data necessary to retrieve the next page in the `cursor_id` property in the response.
+
+## Feature Design
+To support pagination, v2 SQL engine needs to:
+1. in REST front-end:
+    1. Route supported paginated query to v2 engine for
+        1. Initial requests,
+        2. Next page requests.
+    2. Fallback to v1 engine for queries not supported by v2 engine.
+    3. Create correct JSON response from execution of paginated physical plan by v2 engine.
+2. during query planning:
+    1. Differentiate between paginated and normal query plans.
+    2. Push down pagination to table scan.
+    3. Create a physical query plan from a cursor id.
+3. during query execution:
+   1. Serialize an executing query and generate a cursor id after returning `fetch_size` number of elements.
+4. in OpenSearch data source: 
+    1. Support pagination push down.
+    2. Support other push down optimizations with pagination.
+
+### Query Plan Changes
+
+All three kinds of query requests &mdash; non-paged, initial page, or subsequent page  &mdash; are processed in the same way. Simplified workflow of query plan processing is shown below for reference.
+
+```mermaid
+stateDiagram-v2
+  state "Request" as NonPaged {
+    direction LR
+    state "Parse Tree" as Parse
+    state "Unresolved Query Plan" as Unresolved
+    state "Abstract Query Plan" as Abstract
+    state "Logical Query Plan" as Logical
+    state "Optimized Query Plan" as Optimized
+    state "Physical Query Plan" as Physical
+
+    [*] --> Parse : ANTLR
+    Parse --> Unresolved : AstBuilder
+    Unresolved --> Abstract : QueryPlanner
+    Abstract --> Logical : Planner
+    Logical --> Optimized : Optimizer
+    Optimized --> Physical : Implementor
+  }
+```
+
+
+#### Unresolved Query Plan
+
+Unresolved Query Plan for non-paged requests remains unchanged. 
+
+To support initial query requests, the `QueryPlan` class has a new optional field `pageSize`.
+
+```mermaid
+classDiagram
+  direction LR
+  class QueryPlan {
+    <<AbstractPlan>>
+    -Optional~int~ pageSize
+    -UnresolvedPlan plan
+    -QueryService queryService
+  }
+  class UnresolvedQueryPlan {
+    <<UnresolvedPlan>>
+  }
+  QueryPlan --* UnresolvedQueryPlan
+```
+
+When `QueryPlanFactory.create` is passed initial query request, it:
+1. Adds an instance of `Paginate` unresolved plan as the root of the unresolved query plan.
+2. Sets `pageSize` parameter in `QueryPlan`.
+
+```mermaid
+classDiagram
+  direction LR
+  class QueryPlan {
+    <<AbstractPlan>>
+    -Optional~int~ pageSize
+    -UnresolvedPlan plan
+    -QueryService queryService
+  }
+  class Paginate {
+    <<UnresolvedPlan>>
+    -int pageSize
+    -UnresolvedPlan child
+  }
+  class UnresolvedQueryPlan {
+    <<UnresolvedPlan>>
+  }
+  QueryPlan --* Paginate
+  Paginate --* UnresolvedQueryPlan
+```
+
+When `QueryPlanFactory.create` is passed a subsequent query request, it:
+1. Creates an instance of `FetchCursor` unresolved plan as the sole node in the unresolved query plan.
+
+```mermaid
+classDiagram
+    direction LR
+    class QueryPlan {
+        <<AbstractPlan>>
+        -Optional~int~ pageSize
+        -UnresolvedPlan plan
+        -QueryService queryService
+    }
+    class FetchCursor {
+        <<UnresolvedPlan>>
+        -String cursorId
+    }
+    QueryPlan --* FetchCursor
+```
+
+The examples below show Abstract Query Plan for the same query in different request types:
+
+```mermaid
+stateDiagram-v2
+  state "Non Paged Request" as NonPaged {
+    state "QueryPlan" as QueryPlanNP
+    state "Project" as ProjectNP
+    state "Limit" as LimitNP
+    state "Filter" as FilterNP
+    state "Aggregation" as AggregationNP
+    state "Relation" as RelationNP
+
+    QueryPlanNP --> ProjectNP
+    ProjectNP --> LimitNP
+    LimitNP --> FilterNP
+    FilterNP --> AggregationNP
+    AggregationNP --> RelationNP
+  }
+
+  state "Initial Query Request" as Paged {
+    state "QueryPlan" as QueryPlanIP
+    state "Project" as ProjectIP
+    state "Limit" as LimitIP
+    state "Filter" as FilterIP
+    state "Aggregation" as AggregationIP
+    state "Relation" as RelationIP
+
+    Paginate --> QueryPlanIP
+    QueryPlanIP --> ProjectIP
+    ProjectIP --> LimitIP
+    LimitIP --> FilterIP
+    FilterIP --> AggregationIP
+    AggregationIP --> RelationIP
+  }
+
+  state "Subsequent Query Request" As Sub {
+    FetchCursor
+  }
+```
+
+#### Logical Query Plan
+
+There are no changes for non-paging requests.
+
+Changes to logical query plan to support Initial Query Request:
+1. `LogicalPaginate` is added to the top of the tree. It stores information about paging should be done in a private field `pageSize` being pushed down in the `Optimizer`.
+
+```mermaid
+classDiagram
+  direction LR
+  class LogicalPaginate {
+    <<LogicalPlan>>
+    int pageSize
+  }
+  class LogicalQueryPlan {
+    <<LogicalPlan>>
+  }
+  class LogicalRelation {
+    <<LogicalPlan>>
+  }
+  LogicalPaginate --* LogicalQueryPlan
+  LogicalQueryPlan --* LogicalRelation
+```
+
+For subsequent page requests, `FetchCursor` unresolved plan is mapped to `LogicalFetchCursor` logical plan.
+
+```mermaid
+classDiagram
+  direction LR
+  class LogicalQueryPlan {
+    <<LogicalPlan>>
+  }
+  class LogicalFetchCursor {
+    <<LogicalPlan>>
+    -String cursorId
+  }
+  LogicalQueryPlan --* LogicalFetchCursor
+```
+
+The examples below show logical query plan for the same query in different request types:
+
+```mermaid
+stateDiagram-v2
+  state "Non Paged Request" as NonPaged {
+    state "LogicalProject" as ProjectNP
+    state "LogicalLimit" as LimitNP
+    state "LogicalFilter" as FilterNP
+    state "LogicalAggregation" as AggregationNP
+    state "LogicalRelation" as RelationNP
+
+    ProjectNP --> LimitNP
+    LimitNP --> FilterNP
+    FilterNP --> AggregationNP
+    AggregationNP --> RelationNP
+  }
+
+  state "Initial Query Request" as Paged {
+    state "LogicalProject" as ProjectIP
+    state "LogicalLimit" as LimitIP
+    state "LogicalFilter" as FilterIP
+    state "LogicalAggregation" as AggregationIP
+    state "LogicalRelation" as RelationIP
+
+    LogicalPaginate --> ProjectIP
+    ProjectIP --> LimitIP
+    LimitIP --> FilterIP
+    FilterIP --> AggregationIP
+    AggregationIP --> RelationIP
+  }
+
+  state "Subsequent Query Request" As Sub {
+    FetchCursor
+  }
+```
+
+
+#### Optimized Logical Query Plan
+
+Pagination is implemented by push down to OpenSearch. The following is only relevant for
+initial paged requests. Non-paged request optimization was not changed and there is no optimization
+to be done for subsequent page query plans.
+
+Push down logical is implemented in  `OpenSearchIndexScanQueryBuilder.pushDownPageSize` method.
+This method is called by `PushDownPageSize` rule during plan optimization.  `LogicalPaginate` is removed from the query plan during push down operation in `Optimizer`.
+
+See [article about `TableScanBuilder`](query-optimizer-improvement.md#TableScanBuilder) for more details.
+
+The examples below show optimized Logical Query Plan for the same query in different request types:
+
+```mermaid
+stateDiagram-v2
+  state "Non Paged Request" as NonPaged {
+    state "LogicalProject" as ProjectNP
+    state "LogicalLimit" as LimitNP
+    state "LogicalSort" as SortNP
+    state "OpenSearchIndexScanQueryBuilder" as RelationNP
+
+    ProjectNP --> LimitNP
+    LimitNP --> SortNP
+    SortNP --> RelationNP
+  }
+
+```
+
+#### Physical Query Plan and Execution
+
+Changes:
+1. `OpenSearchIndexScanBuilder` is converted to `OpenSearchIndexScan` by `Implementor`.
+2. `LogicalPlan.pageSize` is mapped to `OpenSearchIndexScan.maxResponseSize`. This is the limit to  the number of elements in a response.
+2. Entire Physical Query Plan is created by `PlanSerializer` for Subsequent Query requests. The deserialized plan has the same structure as the Initial Query Request.
+3. Implemented serialization and deserialization for `OpenSearchScrollRequest`.
+
+
+The examples below show physical query plan for the same query in different request types:
+
+```mermaid
+stateDiagram-v2
+  state "Non Paged Request" as NonPaged {
+    state "ProjectOperator" as ProjectNP
+    state "LimitOperator" as LimitNP
+    state "SortOperator" as SortNP
+    state "OpenSearchIndexScan" as RelationNP
+    state "OpenSearchQueryRequest" as QRequestNP
+
+    ProjectNP --> LimitNP
+    LimitNP --> SortNP
+    SortNP --> RelationNP
+    RelationNP --> QRequestNP
+  }
+
+  state "Initial Query Request" as Paged {
+    state "ProjectOperator" as ProjectIP
+    state "LimitOperator" as LimitIP
+    state "SortOperator" as SortIP
+    state "OpenSearchIndexScan" as RelationIP
+    state "OpenSearchQueryRequest" as QRequestIP
+
+    ProjectIP --> LimitIP
+    LimitIP --> SortIP
+    SortIP --> RelationIP
+    RelationIP --> QRequestIP
+  }
+
+  state "Subsequent Query Request" As Sub {
+    state "ProjectOperator" as ProjectSP
+    state "LimitOperator" as LimitSP
+    state "SortOperator" as SortSP
+    state "OpenSearchIndexScan" as RelationSP
+    state "OpenSearchScrollRequest" as RequestSP
+
+    ProjectSP --> LimitSP
+    LimitSP --> SortSP
+    SortSP --> RelationSP
+    RelationSP --> RequestSP
+  }
+```
+
+### Architecture Diagrams
+
+New code workflows which added by Pagination feature are highlighted.
+
+#### Non Paging Query Request
+
+A non-paging request sequence diagram is shown below for comparison: 
+
+```mermaid
+sequenceDiagram
+    participant SQLService
+    participant QueryPlanFactory
+    participant QueryService
+    participant Planner
+    participant CreateTableScanBuilder
+    participant OpenSearchExecutionEngine
+
+SQLService ->>+ QueryPlanFactory: execute
+  QueryPlanFactory ->>+ QueryService: execute
+    QueryService ->>+ Planner: optimize
+      Planner ->>+ CreateTableScanBuilder: apply
+        CreateTableScanBuilder -->>- Planner: index scan
+      Planner -->>- QueryService: Logical Query Plan
+    QueryService ->>+ OpenSearchExecutionEngine: execute
+      OpenSearchExecutionEngine -->>- QueryService: execution completed
+    QueryService -->>- QueryPlanFactory: execution completed
+  QueryPlanFactory -->>- SQLService: execution completed
+```
+
+#### Initial Query Request
+
+Processing of an Initial Query Request has few extra steps comparing versus processing a regular Query Request:
+1. Query validation with `CanPaginateVisitor`. This is required to validate whether incoming query can be paged. This also activate legacy engine fallback mechanism.
+2. `Serialization` is performed by `PlanSerializer` - it converts Physical Plan Tree into a cursor, which could be used query a next page.
+
+```mermaid
+sequenceDiagram
+    participant SQLService
+    participant QueryPlanFactory
+    participant CanPaginateVisitor
+    participant QueryService
+    participant Planner
+    participant CreatePagingScanBuilder
+    participant OpenSearchExecutionEngine
+    participant PlanSerializer
+
+SQLService ->>+ QueryPlanFactory : execute
+  rect rgb(91, 123, 155)
+  QueryPlanFactory ->>+ CanPaginateVisitor : canConvertToCursor
+    CanPaginateVisitor -->>- QueryPlanFactory : true
+  end
+  QueryPlanFactory ->>+ QueryService : execute
+    QueryService ->>+ Planner : optimize
+      rect rgb(91, 123, 155)
+      Planner ->>+ CreateTableScanBuilder : apply
+        CreateTableScanBuilder -->>- Planner : paged index scan
+      end
+      Planner -->>- QueryService : Logical Query Plan
+    QueryService ->>+ OpenSearchExecutionEngine : execute
+      rect rgb(91, 123, 155)
+      Note over OpenSearchExecutionEngine, PlanSerializer : Serialization
+      OpenSearchExecutionEngine ->>+ PlanSerializer : convertToCursor
+        PlanSerializer -->>- OpenSearchExecutionEngine : cursor
+      end
+      OpenSearchExecutionEngine -->>- QueryService : execution completed
+    QueryService -->>- QueryPlanFactory : execution completed
+  QueryPlanFactory -->>- SQLService : execution completed
+```
+
+#### Subsequent Query Request
+
+Subsequent pages are processed by a new workflow. The key point there:
+1. `Deserialization` is performed by `PlanSerializer` to restore entire Physical Plan Tree encoded into the cursor.
+2. Since query already contains the Physical Plan Tree, all tree processing steps are skipped.
+3. `Serialization` is performed by `PlanSerializer` - it converts Physical Plan Tree into a cursor, which could be used query a next page.
+
+```mermaid
+sequenceDiagram
+    participant QueryPlanFactory
+    participant QueryService
+    participant Analyzer
+    participant Planner
+    participant DefaultImplementor
+    participant PlanSerializer
+    participant OpenSearchExecutionEngine
+
+QueryPlanFactory ->>+ QueryService : execute
+  QueryService ->>+ Analyzer : analyze
+    Analyzer -->>- QueryService : new LogicalFetchCursor
+  QueryService ->>+ Planner : plan
+    Planner ->>+ DefaultImplementor : implement
+      rect rgb(91, 123, 155)
+      DefaultImplementor ->>+ PlanSerializer : deserialize
+        PlanSerializer -->>- DefaultImplementor: physical query plan
+      end
+      DefaultImplementor -->>- Planner : physical query plan
+    Planner -->>- QueryService : physical query plan
+  QueryService ->>+ OpenSearchExecutionEngine : execute
+    OpenSearchExecutionEngine -->>- QueryService: execution completed
+  QueryService -->>- QueryPlanFactory : execution completed
+```
+
+#### Legacy Engine Fallback
+
+Since pagination in V2 engine supports fewer SQL commands than pagination in legacy engine, a fallback mechanism is created to keep V1 engine features still available for the end user. Pagination fallback is backed by a new exception type which allows legacy engine to intersect execution of a request.
+
+```mermaid
+sequenceDiagram
+    participant RestSQLQueryAction
+    participant Legacy Engine
+    participant SQLService
+    participant QueryPlanFactory
+    participant CanPaginateVisitor
+
+RestSQLQueryAction ->>+ SQLService : prepareRequest
+  SQLService ->>+ QueryPlanFactory : execute
+    rect rgb(91, 123, 155)
+    note over SQLService, CanPaginateVisitor : V2 support check
+    QueryPlanFactory ->>+ CanPaginateVisitor : canConvertToCursor
+      CanPaginateVisitor -->>- QueryPlanFactory : false
+    QueryPlanFactory -->>- RestSQLQueryAction : UnsupportedCursorRequestException
+    deactivate SQLService
+    end
+      RestSQLQueryAction ->> Legacy Engine: accept
+      Note over Legacy Engine : Processing in Legacy engine
+        Legacy Engine -->> RestSQLQueryAction : complete
+```
+
+#### Serialization and Deserialization round trip
+
+The SQL engine should be able to completely recover the Physical Query Plan to continue its execution to get the next page. Serialization mechanism is responsible for recovering the query plan. note: `ResourceMonitorPlan` isn't serialized, because a new object of this type would be created for the restored query plan before execution. 
+Serialization and Deserialization are performed by Java object serialization API.
+
+```mermaid
+stateDiagram-v2
+    direction LR
+    state "Initial Query Request Query Plan" as FirstPage
+    state FirstPage {
+        state "ProjectOperator" as logState1_1
+        state "..." as logState1_2
+        state "ResourceMonitorPlan" as logState1_3
+        state "OpenSearchIndexScan" as logState1_4
+        state "OpenSearchScrollRequest" as logState1_5
+        logState1_1 --> logState1_2
+        logState1_2 --> logState1_3
+        logState1_3 --> logState1_4
+        logState1_4 --> logState1_5
+    }
+
+    state "Deserialized Query Plan" as SecondPageTree
+    state SecondPageTree {
+        state "ProjectOperator" as logState2_1
+        state "..." as logState2_2
+        state "OpenSearchIndexScan" as logState2_3
+        state "OpenSearchScrollRequest" as logState2_4
+        logState2_1 --> logState2_2
+        logState2_2 --> logState2_3
+        logState2_3 --> logState2_4
+    }
+
+    state "Subsequent Query Request Query Plan" as SecondPage
+    state SecondPage {
+        state "ProjectOperator" as logState3_1
+        state "..." as logState3_2
+        state "ResourceMonitorPlan" as logState3_3
+        state "OpenSearchIndexScan" as logState3_4
+        state "OpenSearchScrollRequest" as logState3_5
+        logState3_1 --> logState3_2
+        logState3_2 --> logState3_3
+        logState3_3 --> logState3_4
+        logState3_4 --> logState3_5
+    }
+
+  FirstPage --> SecondPageTree : Serialization and\nDeserialization
+  SecondPageTree --> SecondPage : Execution\nPreparation
+```
+
+#### Serialization
+
+All query plan nodes which are supported by pagination should implement [`SerializablePlan`](https://github.com/opensearch-project/sql/blob/f40bb6d68241e76728737d88026e4c8b1e6b3b8b/core/src/main/java/org/opensearch/sql/planner/SerializablePlan.java) interface. `getPlanForSerialization` method of this interface allows serialization mechanism to skip a tree node from serialization. OpenSearch search request objects are not serialized, but search context provided by the OpenSearch cluster is extracted from them.
+
+```mermaid
+sequenceDiagram
+    participant PlanSerializer
+    participant ProjectOperator
+    participant ResourceMonitorPlan
+    participant OpenSearchIndexScan
+    participant OpenSearchScrollRequest
+
+PlanSerializer ->>+ ProjectOperator : getPlanForSerialization
+  ProjectOperator -->>- PlanSerializer : this
+PlanSerializer ->>+ ProjectOperator : serialize
+  Note over ProjectOperator : dump private fields
+  ProjectOperator ->>+ ResourceMonitorPlan : getPlanForSerialization
+    ResourceMonitorPlan -->>- ProjectOperator : delegate
+  Note over ResourceMonitorPlan : ResourceMonitorPlan<br />is not serialized
+  ProjectOperator ->>+ OpenSearchIndexScan : writeExternal
+    OpenSearchIndexScan ->>+ OpenSearchScrollRequest : writeTo
+      Note over OpenSearchScrollRequest : dump private fields
+      OpenSearchScrollRequest -->>- OpenSearchIndexScan : serialized request
+    Note over OpenSearchIndexScan : dump private fields
+    OpenSearchIndexScan -->>- ProjectOperator : serialized
+  ProjectOperator -->>- PlanSerializer : serialized
+Note over PlanSerializer : Zip to reduce size
+```
+
+#### Deserialization
+
+Deserialization restores previously serialized Physical Query Plan. The recovered plan is ready to execute and returns the next page of the search response. To complete the query plan restoration, SQL engine will build a new request to the OpenSearch node. This request doesn't contain a search query, but it contains a search context reference &mdash; `scrollID`. To create a new `OpenSearchScrollRequest` object it requires access to the instance of `OpenSearchStorageEngine`. Note: `OpenSearchStorageEngine` can't be serialized, and it exists as a singleton in the SQL plugin engine. `PlanSerializer` creates a customized deserialization binary object stream &mdash; `CursorDeserializationStream`. This stream provides an interface to access the `OpenSearchStorageEngine` object.
+
+```mermaid
+sequenceDiagram
+    participant PlanSerializer
+    participant CursorDeserializationStream
+    participant ProjectOperator
+    participant OpenSearchIndexScan
+    participant OpenSearchScrollRequest
+
+Note over PlanSerializer : Unzip
+Note over PlanSerializer : Validate cursor integrity
+PlanSerializer ->>+ CursorDeserializationStream : deserialize
+  CursorDeserializationStream ->>+ ProjectOperator : create new
+    Note over ProjectOperator: load private fields
+    ProjectOperator -->> CursorDeserializationStream : deserialize input
+  activate CursorDeserializationStream
+  CursorDeserializationStream ->>+ OpenSearchIndexScan : create new
+  deactivate CursorDeserializationStream
+    OpenSearchIndexScan -->>+ CursorDeserializationStream : resolve engine
+  CursorDeserializationStream ->>- OpenSearchIndexScan : OpenSearchStorageEngine
+    Note over OpenSearchIndexScan : load private fields
+    OpenSearchIndexScan ->>+ OpenSearchScrollRequest : create new
+      OpenSearchScrollRequest -->>- OpenSearchIndexScan : created
+    OpenSearchIndexScan -->>- ProjectOperator : deserialized
+  ProjectOperator -->>- PlanSerializer : deserialized
+  deactivate CursorDeserializationStream
+```
+
+#### Close Cursor
+
+A user can forcibly close a cursor (scroll) at any moment of paging. Automatic close occurs when paging is complete and no more results left.
+Close cursor protocol defined by following:
+1. REST endpoint: `/_plugins/_sql/close`
+2. Request type: `POST`
+3. Request format:
+```json
+{
+    "cursor" : "<cursor>"
+}
+```
+4. Response format:
+```json
+{
+    "succeeded": true
+}
+```
+5. Failure or error: [error response](#error-response)
+6. Use or sequential close of already closed cursor produces the same error as use of expired/auto-closed/non-existing cursor.
+
+```mermaid
+sequenceDiagram
+SQLService ->>+ QueryPlanFactory : execute
+  QueryPlanFactory ->>+ QueryService : execute
+  QueryService ->>+ Analyzer : analyze
+  Analyzer -->>- QueryService : new LogicalCloseCursor
+  QueryService ->>+ Planner : plan
+  Planner ->>+ DefaultImplementor : implement
+  DefaultImplementor ->>+ PlanSerializer : deserialize
+  PlanSerializer -->>- DefaultImplementor: physical query plan
+  DefaultImplementor -->>- Planner : new CloseOperator
+  Planner -->>- QueryService : CloseOperator
+  QueryService ->>+ OpenSearchExecutionEngine : execute
+  Note over OpenSearchExecutionEngine : Open is no-op, no request issued,<br />no results received and processed
+  Note over OpenSearchExecutionEngine : Clean-up (clear scroll) on auto-close
+  OpenSearchExecutionEngine -->>- QueryService: execution completed
+  QueryService -->>- QueryPlanFactory : execution completed
+  QueryPlanFactory -->>- SQLService : execution completed
+```
+
+```mermaid
+stateDiagram-v2
+    direction LR
+    state "Abstract Query Plan" as Abstract {
+      state "CommandPlan" as CommandPlan {
+        state "Unresolved Query Plan" as Unresolved {
+          state "CloseCursor" as CloseCursor
+          state "FetchCursor" as FetchCursor
+
+          CloseCursor --> FetchCursor
+        }
+      }
+    }
+    state "Logical Query Plan" as Logical {
+      state "LogicalCloseCursor" as LogicalCloseCursor
+      state "LogicalFetchCursor" as LogicalFetchCursor
+
+      LogicalCloseCursor --> LogicalFetchCursor
+    }
+    state "Optimized Query Plan" as Optimized {
+      state "LogicalCloseCursor" as LogicalCloseCursorO
+      state "LogicalFetchCursor" as LogicalFetchCursorO
+
+      LogicalCloseCursorO --> LogicalFetchCursorO
+    }
+    state "Physical Query Plan" as Physical {
+      state "CursorCloseOperator" as CursorCloseOperator
+      state "ProjectOperator" as ProjectOperator
+      state "..." as ...
+      state "OpenSearchIndexScan" as OpenSearchIndexScan
+
+      CursorCloseOperator --> ProjectOperator
+      ProjectOperator --> ...
+      ... --> OpenSearchIndexScan
+    }
+
+    [*] --> Unresolved : QueryPlanner
+    Unresolved --> Logical : Planner
+    Logical --> Optimized : Optimizer
+    Optimized --> Physical : Implementor
+```
+
+`CursorCloseOperator` provides a dummy (empty, since not used) `Schema`, does not perform `open` and always returns `false` by `hasNext`. Such behavior makes it a no-op operator which blocks underlying Physical Plan Tree from issuing any search request, but does not block auto-close provided by `AutoCloseable`. Default close action clears scroll context.
+Regular paging doesn't execute scroll clear, because it checks whether paging is finished or not and raises a flag to prevent clear. This check performed when search response recevied, what never happen due to `CursorCloseOperator`.
+
+```py
+class OpenSearchScrollRequest:
+  bool needClean = true
+
+  def search:
+    ...
+    needClean = response.isEmpty()
+
+  def clean:
+    if needClean:
+      clearScroll()
+```
+
+```py
+class CursorCloseOperator(PhysicalPlan):
+  PhysicalPlan tree
+  def open:
+    pass
+    # no-op, don't propagate `open` of underlying plan tree
+
+  def hasNext:
+    return false
+```
+
+```py
+class PhysicalPlan:
+  def open:
+    innerPlan.open()
+
+  def close:
+    innerPlan.close()
+```
diff --git a/docs/dev/index.md b/docs/dev/index.md
new file mode 100644
index 0000000000..4b8745e2df
--- /dev/null
+++ b/docs/dev/index.md
@@ -0,0 +1,74 @@
+
+# OpenSearch SQL/PPL Engine Development Manual
+
+## Introduction
+
++ [Architecture](intro-architecture.md): a quick overview of architecture
++ [V2 Engine](intro-v2-engine.md): introduces why we developed new V2 engine
++ Concepts
++ Quickstart
+
+---
+## Clients
+
++ **CLI**
++ **JDBC Driver**
++ **ODBC Driver**
++ **Query Workbench**
+
+---
+## Deployment
+
++ **Standalone Mode**
++ **OpenSearch Cluster**
+
+---
+## Programming Guides
+
++ **API**
++ **JavaDoc**
+
+---
+## Development Guides
+
+### Language Processing
+
++ **SQL**
+  + [Aggregate Window Function](sql-aggregate-window-function.md): aggregate window function support
+  + [Nested Function In Select Clause](sql-nested-function-select-clause.md): Nested function support in sql select clause
+  + [Nested Function In Where Clause](sql-nested-function-where-clause.md): Nested function support in sql where clause
++ **Piped Processing Language**
+
+### Query Processing
+
++ **Query Analyzing**
+  + [Semantic Analysis](query-semantic-analysis.md): performs semantic analysis to ensure semantic correctness
+  + [Type Conversion](query-type-conversion.md): implement implicit data type conversion
++ **Query Planning**
+  + [Logical Optimization](query-optimizer-improvement.md): improvement on logical optimizer and physical implementer
++ **Query Execution**
+  + [Query Manager](query-manager.md): query management
++ **Query Acceleration**
+  + [Automatic Acceleration](query-automatic-acceleration.md): workload based automatic query acceleration proposal
+
+### Data Sources
+
++ **OpenSearch**
+  + [Relevancy Search](opensearch-relevancy-search.md): OpenSearch relevancy search functions
+  + [Sub Queries](opensearch-nested-field-subquery.md): support sub queries on OpenSearch nested field
+  + [Pagination](opensearch-pagination.md): pagination implementation by OpenSearch scroll API
+  + [Pagination in V2](Pagination-v2.md): pagination implementation in V2 engine
+  + [Nested Function](sql-nested-function.md): Nested function in sql plugin
++ [Prometheus](datasource-prometheus.md): Prometheus query federation
++ **File System**
+  + [Querying S3](datasource-query-s3.md): S3 query federation proposal
+
+---
+## Other Documents
+
++ **Test Framework**
+  + [Doc Test](testing-doctest.md): makes our doc live and runnable to ensure documentation correctness
+  + [Comparison Test](testing-comparison-test.md): compares with other databases to ensure functional correctness
++ **Benchmark**
+  + [Hash Join Benchmark](testing-hash-join-benchmark.md): performance test on hash join implementation
++ **Operation Tools**
\ No newline at end of file
diff --git a/docs/dev/query-optimizer-improvement.md b/docs/dev/query-optimizer-improvement.md
new file mode 100644
index 0000000000..720649b280
--- /dev/null
+++ b/docs/dev/query-optimizer-improvement.md
@@ -0,0 +1,208 @@
+### Background
+
+This section introduces the current architecture of logical optimizer and physical transformation.
+
+#### Logical-to-Logical Optimization
+
+Currently each storage engine adds its own logical operator as concrete implementation for `TableScanOperator` abstraction. Typically each data source needs to add 2 logical operators for table scan with without aggregation. Take OpenSearch for example, there are `OpenSearchLogicalIndexScan` and `OpenSearchLogicalIndexAgg` and a bunch of pushdown optimization rules for each accordingly.
+
+```py
+class LogicalPlanOptimizer:
+  /*
+   * OpenSearch rules include:
+   *   MergeFilterAndRelation
+   *   MergeAggAndIndexScan
+   *   MergeAggAndRelation
+   *   MergeSortAndRelation
+   *   MergeSortAndIndexScan
+   *   MergeSortAndIndexAgg
+   *   MergeSortAndIndexScan
+   *   MergeLimitAndRelation
+   *   MergeLimitAndIndexScan
+   *   PushProjectAndRelation
+   *   PushProjectAndIndexScan
+   *
+   * that return *OpenSearchLogicalIndexAgg*
+   *  or *OpenSearchLogicalIndexScan* finally
+   */
+  val rules: List<Rule>
+
+  def optimize(plan: LogicalPlan):
+    for rule in rules:
+      if rule.match(plan):
+        plan = rules.apply(plan)
+    return plan.children().forEach(this::optimize)
+```
+
+#### Logical-to-Physical Transformation
+
+After logical transformation, planner will let the `Table` in `LogicalRelation` (identified before logical transformation above) transform the logical plan to physical plan.
+
+```py
+class OpenSearchIndex:
+
+  def implement(plan: LogicalPlan):
+    return plan.accept(
+      DefaultImplementor():
+        def visitNode(node):
+          if node is OpenSearchLogicalIndexScan:
+            return OpenSearchIndexScan(...)
+          else if node is OpenSearchLogicalIndexAgg:
+            return OpenSearchIndexScan(...)
+```
+
+### Problem Statement
+
+The current planning architecture causes 2 serious problems:
+
+1. Each data source adds special logical operator and explode the optimizer rule space. For example, Prometheus also has `PrometheusLogicalMetricAgg` and `PrometheusLogicalMetricScan` accordingly. They have the exactly same pattern to match query plan tree as OpenSearch.
+2. A bigger problem is the difficulty of transforming from logical to physical when there are 2 `Table`s in query plan. Because only 1 of them has the chance to do the `implement()`. This is a blocker for supporting `INSERT ... SELECT ...` statement or JOIN query. See code below.
+
+```java
+  public PhysicalPlan plan(LogicalPlan plan) {
+    Table table = findTable(plan);
+    if (table == null) {
+      return plan.accept(new DefaultImplementor<>(), null);
+    }
+    return table.implement(
+        table.optimize(optimize(plan)));
+  }
+```
+
+### Solution
+
+#### TableScanBuilder
+
+A new abstraction `TableScanBuilder` is added as a transition operator during logical planning and optimization. Each data source provides its implementation class by `Table` interface. The push down difference in non-aggregate and aggregate query is hidden inside specific scan builder, for example `OpenSearchIndexScanBuilder` rather than exposed to core module.
+
+```mermaid
+classDiagram
+%% Mermaid fails to render `LogicalPlanNodeVisitor~R, C~` https://github.com/mermaid-js/mermaid/issues/3188, using `&lt;R, C>` as a workaround
+  class LogicalPlan {
+    -List~LogicalPlan~ childPlans
+    +LogicalPlan(List~LogicalPlan~)
+    +accept(LogicalPlanNodeVisitor&lt;R, C>, C)* R
+    +replaceChildPlans(List~LogicalPlan~ childPlans) LogicalPlan
+  }
+  class TableScanBuilder {
+    +TableScanBuilder()
+    +build()* TableScanOperator
+    +pushDownFilter(LogicalFilter) boolean
+    +pushDownAggregation(LogicalAggregation) boolean
+    +pushDownSort(LogicalSort) boolean
+    +pushDownLimit(LogicalLimit) boolean
+    +pushDownPageSize(LogicalPaginate) boolean
+    +pushDownProject(LogicalProject) boolean
+    +pushDownHighlight(LogicalHighlight) boolean
+    +pushDownNested(LogicalNested) boolean
+    +accept(LogicalPlanNodeVisitor&lt;R, C>, C) R
+  }
+  class OpenSearchIndexScanQueryBuilder {
+    OpenSearchIndexScanQueryBuilder(OpenSearchIndexScan)
+    +build() TableScanOperator
+    +pushDownFilter(LogicalFilter) boolean
+    +pushDownAggregation(LogicalAggregation) boolean
+    +pushDownSort(LogicalSort) boolean
+    +pushDownLimit(LogicalLimit) boolean
+    +pushDownPageSize(LogicalPaginate) boolean
+    +pushDownProject(LogicalProject) boolean
+    +pushDownHighlight(LogicalHighlight) boolean
+    +pushDownNested(LogicalNested) boolean
+    +findReferenceExpression(NamedExpression)$ List~ReferenceExpression~
+    +findReferenceExpressions(List~NamedExpression~)$ Set~ReferenceExpression~
+  }
+  class OpenSearchIndexScanBuilder {
+    -TableScanBuilder delegate
+    -boolean isLimitPushedDown
+    +OpenSearchIndexScanBuilder(OpenSearchIndexScan)
+    OpenSearchIndexScanBuilder(TableScanBuilder)
+    +build() TableScanOperator
+    +pushDownFilter(LogicalFilter) boolean
+    +pushDownAggregation(LogicalAggregation) boolean
+    +pushDownSort(LogicalSort) boolean
+    +pushDownLimit(LogicalLimit) boolean
+    +pushDownProject(LogicalProject) boolean
+    +pushDownHighlight(LogicalHighlight) boolean
+    +pushDownNested(LogicalNested) boolean
+    -sortByFieldsOnly(LogicalSort) boolean
+  }
+
+  LogicalPlan <|-- TableScanBuilder
+  TableScanBuilder <|-- OpenSearchIndexScanQueryBuilder
+  TableScanBuilder <|-- OpenSearchIndexScanBuilder
+  OpenSearchIndexScanBuilder *-- "1" TableScanBuilder : delegate
+  OpenSearchIndexScanBuilder <.. OpenSearchIndexScanQueryBuilder : creates
+```
+
+#### Table Push Down Rules
+
+In this way, `LogicalPlanOptimizer` in core module always have the same set of rule for all push down optimization.
+
+```mermaid
+classDiagram
+  class LogicalPlanOptimizer {
+    +create()$ LogicalPlanOptimizer
+    +optimize(LogicalPlan) LogicalPlan
+    -internalOptimize(LogicalPlan) LogicalPlan
+  }
+  class CreateTableScanBuilder {
+    +apply(LogicalRelation, Captures) LogicalPlan
+    -pattern() Pattern~LogicalRelation~
+  }
+  class CreatePagingTableScanBuilder {
+    +apply(LogicalPaginate, Captures) LogicalPlan
+    -pattern() Pattern~LogicalRelation~
+    -findLogicalRelation(LogicalPaginate) boolean
+  }
+  class Table {
+    +TableScanBuilder createScanBuilder()
+  }
+  class TableScanPushDown~T~ {
+    +Rule~T~ PUSH_DOWN_FILTER$
+    +Rule~T~ PUSH_DOWN_AGGREGATION$
+    +Rule~T~ PUSH_DOWN_SORT$
+    +Rule~T~ PUSH_DOWN_LIMIT$
+    +Rule~T~ PUSH_DOWN_PROJECT$
+    +Rule~T~ PUSH_DOWN_HIGHLIGHT$
+    +Rule~T~ PUSH_DOWN_NESTED$
+    +apply(T, Captures) LogicalPlan
+    +pattern() Pattern~T~
+  }
+  class TableScanBuilder {
+    +pushDownFilter(LogicalFilter) boolean
+    +pushDownAggregation(LogicalAggregation) boolean
+    +pushDownSort(LogicalSort) boolean
+    +pushDownLimit(LogicalLimit) boolean
+    +pushDownProject(LogicalProject) boolean
+    +pushDownHighlight(LogicalHighlight) boolean
+    +pushDownNested(LogicalNested) boolean
+  }
+  TableScanPushDown~T~ -- TableScanBuilder
+  LogicalPlanOptimizer ..> CreateTableScanBuilder : creates
+  LogicalPlanOptimizer ..> CreatePagingTableScanBuilder : creates
+  CreateTableScanBuilder ..> Table
+  CreatePagingTableScanBuilder ..> Table
+  LogicalPlanOptimizer ..* TableScanPushDown~T~
+  Table ..> TableScanBuilder : creates
+```
+
+### Examples
+
+The following diagram illustrates how `TableScanBuilder` along with `TablePushDownRule` solve the problem aforementioned.
+
+![optimizer-Page-1](https://user-images.githubusercontent.com/46505291/203645359-3f2fff73-a210-4bc0-a582-951a27de684d.jpg)
+
+
+Similarly, `TableWriteBuilder` will be added and work in the same way in separate PR: https://github.com/opensearch-project/sql/pull/1094
+
+![optimizer-Page-2](https://user-images.githubusercontent.com/46505291/203645380-5155fd22-71b4-49ca-8ed7-9652b005f761.jpg)
+
+### TODO
+
+1. Refactor Prometheus optimize rule and enforce table scan builder
+2. Figure out how to implement AD commands
+4. Deprecate `optimize()` and `implement()` if item 1 and 2 complete
+5. Introduce fixed point or maximum iteration limit for iterative optimization
+6. Investigate if CBO should be part of current optimizer or distributed planner in future
+7. Remove `pushdownHighlight` once it's moved to OpenSearch storage
+8. Move `TableScanOperator` to the new `read` package (leave it in this PR to avoid even more file changed)
diff --git a/docs/dev/sql-nested-function-select-clause.md b/docs/dev/sql-nested-function-select-clause.md
new file mode 100644
index 0000000000..cbbe82bc9d
--- /dev/null
+++ b/docs/dev/sql-nested-function-select-clause.md
@@ -0,0 +1,403 @@
+## Description
+
+The `nested` function when used in the `SELECT` clause of an SQL statement specifies the output columns from inner fields of a nested object type in OpenSearch. After a `SELECT` clause is pushed down to OpenSearch the response objects are flattened as illustrated in [Section 2.3](#24-select-clause-nested-query-class-diagram). If multiple `nested` function calls are used in a `SELECT` clause on multiple nested fields with differing paths, a cross-join is returned of the rows in both nested fields.
+
+## Table of Contents
+1. [Overview](#1-overview)
+2. [Syntax](#11-syntax)
+3. [Changes To Core](#12-changes-to-core)
+4. [Example Queries](#13-example-queries)
+5. [Architecture Diagrams](#2-architecture-diagrams)
+6. [Composite States for Nested Query](#21-composite-states-for-nested-query-execution)
+7. [Sequence Diagram for Nested Select Clause Query Push Down](#22-sequence-diagram-for-nested-select-clause-query-push-down)
+8. [Sequence Diagram for Nested Select Clause Post-processing](#23-sequence-diagram-for-nested-select-clause-post-processing)
+9. [Select Clause Nested Query Class Diagram](#24-select-clause-nested-query-class-diagram)
+10. [Additional Info](#additional-info)
+11. [Demo Video](#demo-video)
+12. [Release Schedule](#release-schedule)
+
+## 1 Overview
+### 1.1 Syntax
+
+Dot notation is used to show nesting level for fields and paths. For example `nestedObj.innerFieldName` denotes a field nested one level. If the user does not provide the `path` parameter it will be generated dynamically. For example the `field` `user.office.cubicle` would dynamically generate the path `user.office`.
+- `nested(field | field, path)`
+
+### 1.2 Changes To Core
+- **NestedOperator:** Responsible for post-processing and flattening of OpenSearch response.
+- **LogicalNested:** Stores data required for OpenSearch DSL push down.
+- **NestedAnalyzer:** Identifies nested functions used in `SELECT` clause for `LogicalNested` creation.
+- **Analyzer:** Added ownership of NestedAnalyzer.
+
+
+### 1.3 Example Queries
+
+Most basic example from mapping to response from SQL plugin.
+
+**Mapping:**
+```json
+{
+  "mappings": {
+    "properties": {
+      "message": {
+        "type": "nested",
+        "properties": {
+          "info": {
+            "type": "keyword",
+            "index": "true"
+          }
+        }
+      }
+    }
+  }
+}
+```
+
+**Dataset:**
+```json
+{"index":{"_id":"1"}}
+{"message":{"info":"a"}}
+```
+
+**Query:**
+`SELECT nested(message.info) FROM nested_objects;`
+
+**Response:**
+```json
+{
+    "schema": [
+        {
+            "name": "nested(message.info)",
+            "type": "keyword"
+        }
+    ],
+    "datarows": [
+        [
+            "a"
+        ]
+    ],
+    "total": 1,
+    "size": 1,
+    "status": 200
+}
+```
+
+A basic nested function in the SELECT clause and output DSL pushed to OpenSearch. This example queries the `nested` object `message` and the inner field `info` to return all matching inner fields values.
+- `SELECT nested(message.info, message) FROM nested_objects;`
+```json
+{
+    "query": {
+        "bool": {
+            "filter": [
+                {
+                    "bool": {
+                        "must": [
+                            {
+                                "nested": {
+                                    "query": {
+                                        "match_all": {
+                                            "boost": 1.0
+                                        }
+                                    },
+                                    "path": "message",
+                                    ...
+                                    "boost": 1.0,
+                                    "inner_hits": {
+                                        ...
+                                        "_source": {
+                                            "includes": [
+                                                "message.info"
+                                            ],
+                                            "excludes": []
+                                        }
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    ...
+}
+```
+
+Example with multiple SELECT clause function calls sharing same path. These two queries share the same path and will be added to the same inner hits query for pushing DSL to OpenSearch.
+- `SELECT nested(message.info, message), nested(message.author, message) FROM nested_objects;`
+```json
+{
+    "query": {
+        "bool": {
+            "filter": [
+                {
+                    "bool": {
+                        "must": [
+                            {
+                                "nested": {
+                                    "query": {
+                                        "match_all": {
+                                            "boost": 1.0
+                                        }
+                                    },
+                                    "path": "message",
+                                    ...
+                                    "inner_hits": {
+                                        ...
+                                        "_source": {
+                                            "includes": [
+                                                "message.info",
+                                                "message.author"
+                                            ],
+                                            "excludes": []
+                                        }
+                                    }
+                                }
+                            }
+                        ],
+                    }
+                }
+            ],
+        }
+    },
+    ...
+}
+```
+
+An example with multiple nested function calls in the SELECT clause having differing path values. This shows the separate nested query being created for each path used within the SQL query.
+- `SELECT nested(message.info, message), nested(comment.data, comment) FROM nested_objects;`
+```json
+{
+    "query": {
+        "bool": {
+            "filter": [
+                {
+                    "bool": {
+                        "must": [
+                            {
+                                "nested": {
+                                    "query": {
+                                        "match_all": {
+                                            "boost": 1.0
+                                        }
+                                    },
+                                    "path": "comment",
+                                    ...
+                                    "inner_hits": {
+                                        ...
+                                        "_source": {
+                                            "includes": [
+                                                "comment.data"
+                                            ],
+                                            "excludes": []
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "nested": {
+                                    "query": {
+                                        "match_all": {
+                                            "boost": 1.0
+                                        }
+                                    },
+                                    "path": "message",
+                                    ...
+                                    "inner_hits": {
+                                        ...
+                                        "_source": {
+                                            "includes": [
+                                                "message.info"
+                                            ],
+                                            "excludes": []
+                                        }
+                                    }
+                                }
+                            }
+                        ],
+                    }
+                }
+            ],
+        }
+    },
+    ...
+}
+```
+
+## 2 Architecture Diagrams
+### 2.1 Composite States for Nested Query Execution
+
+Nested function state diagram illustrating states in SQL plugin for push down execution. The nested operator stays in the `Physical Plan Tree` after push down for flattening operation in post-processing. See section [2.3](#24-select-clause-nested-query-class-diagram) for flattening sequence and description.
+
+```mermaid
+stateDiagram-v2
+direction LR
+    LogicalPlan --> OptimizedLogicalPlan: Optimize
+    OptimizedLogicalPlan --> PhysicalPlan:push down
+
+    state "Logical Plan Tree" as LogicalPlan
+    state LogicalPlan {
+        logState1: LogicalProject
+        logState2: LogicalNested
+        logState3: ...
+
+        logState1 --> logState2
+        logState2 --> logState3
+        logState3 --> LogicalRelation
+    }
+
+    state "Optimized Logical Plan Tree" as OptimizedLogicalPlan
+    state OptimizedLogicalPlan {
+        optState1: LogicalProject
+        optState2: LogicalNested
+
+        optState1 --> optState2
+        optState2 --> OpenSearchIndexScanBuilder
+    }
+
+    state "Physical Plan Tree" as PhysicalPlan
+    state PhysicalPlan {
+        phyState1: ProjectOperator
+        phyState2: NestedOperator
+
+        phyState1 --> phyState2
+        phyState2 --> OpenSearchIndexScan
+    }
+```
+
+### 2.2 Sequence Diagram for Nested SELECT Clause Query Push Down
+Nested function sequence diagram illustrating query execution from parsing to OpenSearch DSL push down.
+
+```mermaid
+sequenceDiagram
+    participant SQLService
+    participant ParserBaseRoot
+    participant AstExpressionBuilder
+
+    participant QueryService
+    participant Analyzer
+    participant NestedAnalyzer
+    participant Planner
+    participant TableScanPushDown
+    participant OpenSearchRequestBuilder
+    participant DefaultImplementor
+
+%% Parsing
+SQLService->>+ParserBaseRoot:visitRoot
+  ParserBaseRoot->>+AstExpressionBuilder:visitScalarFunction
+  AstExpressionBuilder-->>-ParserBaseRoot:Function
+ParserBaseRoot-->>-SQLService:UnresolvedPlan
+%% Analysis
+SQLService->>+QueryService:analyze
+  QueryService->>+Analyzer:visitProject
+    Analyzer->>+NestedAnalyzer:visitFunction
+    NestedAnalyzer-->>-Analyzer:LogicalNested
+  Analyzer-->>-QueryService:UnresolvedPlan
+    
+  %% planner optimization
+  QueryService->>+Planner:plan
+    Planner->>+TableScanPushDown:apply
+      TableScanPushDown->>+OpenSearchRequestBuilder:pushDownNested
+
+      Note over TableScanPushDown, OpenSearchRequestBuilder: returns false keeping<br>LogicalNested in plan tree
+
+      OpenSearchRequestBuilder-->>-TableScanPushDown:boolean
+    TableScanPushDown-->>-Planner:LogicalPlan
+    %% planner implementation
+    Planner->>+DefaultImplementor:visitNested
+    DefaultImplementor-->>-Planner:NestedOperator
+  Planner-->>-QueryService:PhysicalPlan
+QueryService-->>-SQLService:PhysicalPlan
+```
+
+### 2.3 Sequence Diagram for Nested SELECT Clause Post-processing
+Nested function sequence diagram illustrating the flattening of the OpenSearch response. Flattening the response from OpenSearch changes the nested types structure by making the full path of an object the key, and the object it refers to the value. As well when a user selects multiple nested fields with differing path values, a cross join is done on the result. These examples show the flattening output keys and cross join.
+
+**Sample input:**
+```json
+{
+  "comments": {
+    "data": "abc"
+  },
+  "message": [
+    { "info": "letter1" },
+    { "info": "letter2" }
+  ]
+}
+```
+**Sample Output:**
+```json
+[
+  [
+    { "comment.data": "abc" },
+    { "message.info": "letter1" }
+  ],
+  [
+    { "comment.data": "abc" },
+    { "message.info": "letter2" }
+  ]
+]
+```
+
+```mermaid
+sequenceDiagram
+
+%% Flattening
+OpenSearchExecutionEngine->>+ProjectOperator:next
+  ProjectOperator->>+ResourceMonitorPlan:next
+    ResourceMonitorPlan->>+NestedOperator:next
+      loop unnesting
+        NestedOperator->>NestedOperator:flatten
+      end
+    NestedOperator-->>-ResourceMonitorPlan:ExprValue
+  ResourceMonitorPlan-->>-ProjectOperator:ExprValue
+ProjectOperator-->>-OpenSearchExecutionEngine:ExprValue
+```
+
+### 2.4 Select Clause Nested Query Class Diagram
+Nested function class diagram for additional classes required for query execution. The `NestedAnalyzer` is a visitor for nested functions used in the SELECT clause to fulfill the `LogicalNested` LogicalPlan. After push down is successful the `NestedOperator` PhysicalPlan is used for object flattening of the OpenSearch response.
+
+```mermaid
+---
+title: Nested Select Clause Class Diagram
+---
+classDiagram
+direction BT
+
+    NestedAnalyzer~AbstractNodeVisitor~-->LogicalNested~LogicalPlan~ : «create»
+    DefaultImplementor~C~-->NestedOperator~PhysicalPlan~ : «create»
+
+    class NestedAnalyzer{
+        -ExpressionAnalyzer expressionAnalyzer
+    
+        +analyze(UnresolvedExpression projectItem, AnalysisContext context) LogicalPlan
+        +visitAlias(Alias node, AnalysisContext context) LogicalPlan
+        +visitFunction(Function node, AnalysisContext context) LogicalPlan
+        -validateArgs(List~UnresolvedExpression~ args)
+    }
+    class LogicalNested{
+        -List~Map~String_ReferenceExpression~~ fields
+        +accept(LogicalPlanNodeVisitor~R_C~ visitor, C context) ~R_C~ R
+    }
+    
+    class DefaultImplementor {
+        +visitNested(LogicalNested, C) PhysicalPlan
+    }
+
+    class NestedOperator{
+        -PhysicalPlan input
+
+        +hasNext() boolean
+        +next() ExprValue
+        -flatten(String nestedField, ExprValue row, List~Map~String_ExprValue~~ prevList) List~Map~String_ExprValue~~
+    }
+```
+
+## Additional Info
+
+### Demo Video
+
+[SELECT Clause Demo](https://user-images.githubusercontent.com/36905077/234634885-d28b3a9a-fc5f-41fb-938a-764b60a775a6.mp4)
+
+### Release Schedule
+See Issues Tracked under [Issue 1111](https://github.com/opensearch-project/sql/issues/1111) for related PR's and information.
+
diff --git a/docs/dev/sql-nested-function-where-clause.md b/docs/dev/sql-nested-function-where-clause.md
new file mode 100644
index 0000000000..7c9ba0f470
--- /dev/null
+++ b/docs/dev/sql-nested-function-where-clause.md
@@ -0,0 +1,392 @@
+## Description
+
+The `nested` function when used in the `WHERE` clause of an SQL statement filters documents of `nested` object type based on field properties. Two syntax options are available to users, see section [1.1 Syntax](#11-syntax). Both syntax options achieve the goal of filtering a `nested` field with an `Operator` and a `Literal` value. Although semantically the syntax options can produce the same query, they will produce different DSL to push to OpenSearch. This difference is based on the `AND/OR/NOT` boolean queries residing inside a `nested` query or vice versa. See section [2.1](#21-syntax-option-1-object-tree-to-dsl) and [2.2](#22-syntax-option-2-object-tree-to-dsl) for examples depicting this alternate DSL creation. Testing large groups of push down execution times for identical queries using the different syntax options showed a nominal difference of approximately 3% for Syntax option 2.
+
+## Table of Contents
+1. [Overview](#1-overview)
+2. [Syntax](#11-syntax)
+3. [Changes To Core](#12-changes-to-core)
+4. [Example Data And Usage](#13-example-data-and-usage)
+5. [Example Queries](#14-example-queries)
+6. [Architecture Diagrams](#2-architecture-diagrams)
+8. [Syntax Option 1 Object Tree to DSL](#21-syntax-option-1-object-tree-to-dsl)
+9. [Syntax Option 2 Object Tree to DSL](#22-syntax-option-2-object-tree-to-dsl)
+10. [Additional Info](#additional-info)
+11. [Release Schedule](#release-schedule)
+
+## 1 Overview
+### 1.1 Syntax
+
+The nested function has two syntax options when used in the `WHERE` clause of an SQL statement. Both syntax options can produce the same OpenSearch response, but will form different DSL used in the query.
+1. `nested(path, condition)`
+2. `nested(field | field, path) OPERATOR LITERAL`
+
+
+### 1.2 Changes To Core
+- **FilterQueryBuilder:** Added logic to handle `nested` functions in `WHERE` clause as predicate expression and `FunctionExpression`.
+- **LuceneQuery:** Added logic to handle `nested` functions and `FunctionExpression`'s on both sides of `OPERATOR` in `WHERE` clause.
+
+
+### 1.3 Example Data and Usage
+
+A basic example from data mapping to response from SQL plugin.
+
+**Mapping:**
+```json
+{
+  "mappings": {
+    "properties": {
+      "message": {
+        "type": "nested",
+        "properties": {
+          "info": {
+            "type": "keyword",
+            "index": "true"
+          }
+        }
+      }
+    }
+  }
+}
+```
+
+**Dataset:**
+```json
+{"index":{"_id":"1"}}
+{"message":{"info":"a"}}
+{"index":{"_id":"2"}}
+{"message":{"info":"c"}}
+```
+
+**Query:**
+- `SELECT * FROM nested_objects WHERE nested(message, message.info = 'a');`
+- `SELECT * FROM nested_objects WHERE nested(message.info) = 'a';`
+
+Both queries produce same response from OpenSearch.
+
+**Response:**
+```json
+{
+  "schema": [
+    {
+      "name": "message",
+      "type": "nested"
+    }
+  ],
+  "datarows": [
+    [
+      [
+        {
+          "info": "a"
+        }
+      ]
+    ]
+  ],
+  "total": 1,
+  "size": 1,
+  "status": 200
+}
+```
+
+
+### 1.4 Example Queries
+
+A basic nested function in the `SELECT` clause. This example filters the `nested` object `message` and the inner field `info` with the value of `a`.
+- `SELECT * FROM nested_objects WHERE nested(message.info) = 'a' OR nested(message.author) = 'elm';`
+
+Using the same query as above but with syntax option 1, the response from OpenSearch will be the same, but the DSL used in the query will differ.
+- `SELECT * FROM nested_objects WHERE nested(message, message.info = 'a' OR messate.author = 'elm');`
+
+This example has a nested function in the `SELECT` clause and the `WHERE` clause of the query. Using the `nested` function in the `SELECT` clause will flatten the response nested objects from OpenSearch. See [Nested In Select](sql-nested-function-select-clause.md) for more details on flattening.
+- `SELECT nested(message.info) FROM nested_objects WHERE nested(message.info) = 'a';`
+
+When using syntax option 1 we need separate function calls when the `path` is not identical. This query exemplifies how a user can use multiple queries with differing `path` values. 
+- `SELECT * FROM nested_objects WHERE nested(message, message.info = 'a') OR nested(comment, comment.data = '123');`
+
+
+## 2 Architecture Diagrams
+### 2.1 Syntax Option 1 Object Tree to DSL
+The following example illustrates the object tree that is built from the example query. This query's object tree will impact the structure of the DSL to be pushed to OpenSearch.
+
+Example Query: `SELECT *  FROM nested_objects WHERE nested(message, message.info = 'a' OR message.info = 'b' AND message.dayOfWeek > 4);`
+
+```mermaid
+graph TB;
+    A[Function: NESTED\n<hr>arguments]-->B1[ReferenceExpression:\nmessage]
+    A-->B2[Function: OR\n<hr>arguments]
+    B2-->C1[Function: =\n<hr>arguments]
+    B2-->C2[Function: AND\n<hr>arguments]
+    
+    C1-->D1[ReferenceExpression:\nmessage.info]
+    C1-->D2[LiteralExpression:\na]
+    
+    C2-->D3[Function: =\n<hr>arguments]
+    C2-->D4[Function: >\n<hr>arguments]
+    
+    D3-->E1[ReferenceExpression:\nmessage.info]
+    D3-->E2[LiteralExpression:\nb]
+    D4-->E3[ReferenceExpression:\nmessage.dayOfWeek]
+    D4-->E4[LiteralExpression:\n4]
+```
+
+
+#### Syntax Option 1 Filter Push Down Sequence
+This diagram illustrates the steps the SQL plugin does to translate the object tree to DSL for execution in OpenSearch. Notice that the `nested` function forms the outer portion of the DSL query.
+
+```mermaid
+stateDiagram-v2
+  direction LR
+
+  NestedNode --> OrFuncNode
+  OrFuncNode --> OrFuncNode1
+  OrFuncNode --> OrFuncNode2
+  OrFuncNode2 --> AndFuncNode1
+  OrFuncNode2 --> AndFuncNode2
+
+  state "Function: NESTED" as NestedNode {
+    state "visitFunction(NESTED)" as NestedNodeVisitFunc
+    state "'nested': {\n&nbsp'query': {\n...\n}}" as NestedNodeDSL
+    state "visitFunction(condition)" as NestedNodeVisitCondition
+
+    NestedNodeVisitFunc --> NestedNodeDSL
+    NestedNodeVisitFunc --> NestedNodeVisitCondition
+  }
+
+  state "Function: OR" as OrFuncNode {
+    state "visitFunction(OR)" as OrFuncNodeVisitFunc
+    state "'bool': {\n&nbsp'should': {\n...\n}}" as OrFuncNodeDSL
+    state "arguments.accept()" as OrFuncNodeArgs
+
+    OrFuncNodeVisitFunc --> OrFuncNodeDSL
+    OrFuncNodeDSL --> OrFuncNodeArgs
+  }
+
+  state "Function: =" as OrFuncNode1 {
+    state "visitFunction(=)" as OrFuncNode1VisitFunc
+    state "'term': {\n&nbsp'message.info': {\n&nbsp&nbsp'value':'a'\n}}" as OrFuncNode1DSL
+
+    OrFuncNode1VisitFunc --> OrFuncNode1DSL
+  }
+
+  state "Function: AND" as OrFuncNode2 {
+    state "visitFunction(AND)" as OrFuncNode2VisitFunc
+    state "'bool': {\n&nbsp'filter': {\n...\n}}" as OrFuncNode2DSL
+    state "arguments.accept()" as OrFuncNode2Args
+
+    OrFuncNode2VisitFunc --> OrFuncNode2DSL
+    OrFuncNode2DSL --> OrFuncNode2Args
+  }
+
+  state "Function: =" as AndFuncNode1 {
+    state "visitFunction(=)" as AndFuncNode1VisitFunc
+    state "'term': {\n&nbsp'message.info': {\n&nbsp&nbsp'value':'b'\n}}" as AndFuncNode1DSL
+
+    AndFuncNode1VisitFunc --> AndFuncNode1DSL
+  }
+
+  state "Function: >" as AndFuncNode2 {
+    state "visitFunction(>)" as AndFuncNode2VisitFunc
+    state "'range': {\n&nbsp'message.dayOfWeek': {\n&nbsp&nbsp'from':4\n}}" as AndFuncNode2DSL
+
+    AndFuncNode2VisitFunc --> AndFuncNode2DSL
+  }
+```
+
+
+#### Syntax Option 1 Output Query
+After pushing down the filter object tree we have a DSL query to push to OpenSearch. This query forms the boolean logic inside the `nested` query. This mirrors the syntax option chosen which has the condition specified inside the `nested` function.
+
+```json
+{
+  "nested" : {
+    "query" : {
+      "bool" : {
+        "should" : [
+          {
+            "term" : {
+              "message.info" : {
+                "value" : "a",
+                "boost" : 1.0
+              }
+            }
+          },
+          {
+            "bool" : {
+              "filter" : [
+                {
+                  "term" : {
+                    "message.info" : {
+                      "value" : "b",
+                      "boost" : 1.0
+                    }
+                  }
+                },
+                {
+                  "range" : {
+                    "message.dayOfWeek" : {
+                      "from" : 4,
+                      ...
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
+```
+
+
+### 2.2 Syntax option 2 Object Tree to DSL
+The following example illustrates the object tree that is built from the example query. Rather than have the boolean logic specified within the `nested` function, we have the `nested` function used in a predicate expression.
+
+Example Query: `SELECT * FROM nested_objects WHERE nested(message.info) = 'a' OR nested(message.info) = 'b' AND nested(message.dayOfWeek) > 4;`
+
+```mermaid
+graph TB;
+    A[Function: OR\n<hr>arguments]-->B1[Function: =\n<hr>arguments]
+    A-->B2[Function: AND\n<hr>arguments]
+    
+    B1-->C1[Function: NESTED\n<hr>arguments]
+    B1-->C2[LiteralExpression:\na]
+    
+    B2-->C3[Function: =\n<hr>arguments]
+    B2-->C4[Function: >\n<hr>arguments]
+    
+    C1-->D1[ReferenceExpression:\nmessage.info]
+    C3-->D2[Function: NESTED\n<hr>arguments]
+    C3-->D3[LiteralExpression:\nb]
+    C4-->D4[Function: NESTED\n<hr>arguments]
+    C4-->D5[LiteralExpression:\n4]
+    
+    D2-->E1[ReferenceExpression:\nmessage.info]
+    D4-->E2[ReferenceExpression:\nmessage.dayOfWeek]
+```
+
+
+#### Syntax Option 2 Filter Push Down Sequence
+This diagram illustrates the steps the SQL plugin goes through to translate the object tree to DSL for execution in OpenSearch. Notice that the boolean operations(`should/filter`) form the outer potion of the DSL query. 
+
+```mermaid
+stateDiagram-v2
+  direction LR
+
+  OrFuncNode --> OrFuncNode1
+  OrFuncNode --> OrFuncNode2
+  OrFuncNode2 --> AndFuncNode1
+  OrFuncNode2 --> AndFuncNode2
+
+  state "Function: OR" as OrFuncNode {
+    state "visitFunction(OR)" as NestedNodeVisitFunc
+    state "'bool': {\n&nbsp'should': {\n...\n}}" as NestedNodeDSL
+    state "arguments.accept()" as NestedNodeVisitCondition
+
+    NestedNodeVisitFunc --> NestedNodeDSL
+    NestedNodeVisitFunc --> NestedNodeVisitCondition
+  }
+
+
+  state "Function: =" as OrFuncNode1 {
+    state "visitFunction(=)" as OrFuncNode1VisitFunc
+    state "'nested': {\n&nbsp'query': {\n&nbsp&nbsp&nbsp'term'\n&nbsp&nbsp&nbsp&nbsp'message.info': {\n&nbsp&nbsp&nbsp&nbsp&nbsp'value': 'a',\n&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp}}}" as OrFuncNode1DSL
+
+
+    OrFuncNode1VisitFunc --> OrFuncNode1DSL
+  }
+
+
+  state "Function: AND" as OrFuncNode2 {
+    state "visitFunction(AND)" as OrFuncNode2VisitFunc
+    state "'bool': {\n&nbsp'filter': {\n...\n}}" as OrFuncNode2DSL
+    state "arguments.accept()" as OrFuncNode2Args
+
+    OrFuncNode2VisitFunc --> OrFuncNode2DSL
+    OrFuncNode2DSL --> OrFuncNode2Args
+  }
+
+  state "Function: =" as AndFuncNode1 {
+    state "visitFunction(=)" as AndFuncNode1VisitFunc
+    state "'nested': {\n&nbsp'query': {\n&nbsp&nbsp&nbsp'term'\n&nbsp&nbsp&nbsp&nbsp'message.info': {\n&nbsp&nbsp&nbsp&nbsp&nbsp'value': 'b',\n&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp}}}" as AndFuncNode1DSL
+
+    AndFuncNode1VisitFunc --> AndFuncNode1DSL
+  }
+
+  state "Function: >" as AndFuncNode2 {
+    state "visitFunction(>)" as AndFuncNode2VisitFunc
+    state "'nested': {\n&nbsp'query': {\n&nbsp&nbsp&nbsp'range'\n&nbsp&nbsp&nbsp&nbsp'message.dayOfWeek': {\n&nbsp&nbsp&nbsp&nbsp&nbsp'from': 4,\n&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp}}}" as AndFuncNode2DSL
+
+    AndFuncNode2VisitFunc --> AndFuncNode2DSL
+  }
+```
+
+
+#### Syntax Option 2 Output Query
+After pushing down the filter object tree we have a DSL query to push to OpenSearch. This query forms the boolean logic as the outer portion of the query and has nested queries used inside. This mirrors the syntax option chosen which has the boolean operators forming a predicate expression with the `nested` functions in the SQL query.
+
+```json
+{
+  "bool" : {
+    "should" : [
+      {
+        "nested" : {
+          "query" : {
+            "term" : {
+              "message.info" : {
+                "value" : "a",
+                "boost" : 1.0
+              }
+            }
+          },
+          ...
+        }
+      },
+      {
+        "bool" : {
+          "filter" : [
+            {
+              "nested" : {
+                "query" : {
+                  "term" : {
+                    "message.info" : {
+                      "value" : "b",
+                      "boost" : 1.0
+                    }
+                  }
+                },
+                ...
+              }
+            },
+            {
+              "nested" : {
+                "query" : {
+                  "range" : {
+                    "message.dayOfWeek" : {
+                      "from" : 4,
+                      ...
+                    }
+                  }
+                },
+                ...
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
+```
+
+
+## Additional Info
+### Demo Video
+TBD
+
+### Normalizing Strategy
+A normalization strategy could produce identical DSL independent on the syntax option used in the query. Testing so far hasn't highlighted any major improvements with query execution that necessitate identical DSL. Additional benchmarking and planning will be done to determine a viable normalization strategy and if implementation is required.
+
+### Release Schedule
+See Issues Tracked under [Issue 1111](https://github.com/opensearch-project/sql/issues/1111) for related PR's and information.
diff --git a/docs/dev/sql-nested-function.md b/docs/dev/sql-nested-function.md
new file mode 100644
index 0000000000..14b7c72bfa
--- /dev/null
+++ b/docs/dev/sql-nested-function.md
@@ -0,0 +1,81 @@
+## Description
+
+The nested function in SQL and PPL maps to the nested query DSL in the OpenSearch query engine. A nested query is used to search nested object field types in an index. If an object matches the search, the nested query returns the root parent document. Nested inner objects are returned as inner hits in the query result. Using the nested function with data stored as `nested` object field type allows users to query inner objects with isolation. Please refer to the documentation page for `nested` object field types for a more in-depth view of how this type works in OpenSearch.
+[2.7 OpenSearch Nested Field Types](https://opensearch.org/docs/2.7/field-types/nested/)
+
+## Table Of Contents
+1. [Overview](#1-overview)
+2. [Problem Statement](#11-problem-statement)
+3. [Use Cases](#12-use-cases)
+4. [Requirements](#2-requirements)
+5. [Functional Requirements](#21-functional-requirements)
+6. [Non-functional Requirements](#22-non-functional-requirements)
+7. [Tenets](#23-tenets)
+8. [Scope](#24-scope)
+9. [Out-of-scope](#25-out-of-scope)
+10. [Additional Info](#additional-info)
+11. [Release Schedule](#release-schedule)
+
+## 1 Overview
+### 1.1 Problem Statement
+
+**1. The V2 engine lacks functionality to query nested object types in OpenSearch** -
+The `nested` function is not present in the V2 engine and is one option for user to query nested object field types in the OpenSearch SQL plugin.
+
+**2. SQL provides a better user experience to query data than DSL** - 
+The SQL plugin gives users the ability to interact with their data using SQL and PPL query languages rather than the OpenSearch DSL. To query `nested` object type data in SQL and PPL we need an interface that maps to the DSL `nested` queries in OpenSearch.
+
+**3. The V2 engine has no support for the nested function in PPL** - 
+The PPL query language is new to the V2 engine in the SQL plugin. Implementation for the nested function in SQL needs to be ported to the PPL query language for users to query their nested object field type data.
+
+### 1.2 Use Cases
+
+**Use case 1:** **OpenSearch Dashboards** - 
+Users using OpenSearch Dashboards to query `nested` object field data in SQL and PPL.
+
+- **Non-aggregation query:** The `nested` function can be used to select `nested` object fields or filter nested documents based on field values.
+- **Aggregation query:** Users can do bucket aggregation on `nested` fields inside a `nested` object treating inner fields as separate documents.
+
+## 2 Requirements
+
+### 2.1 Functional Requirements
+- Support nested function in SQL and PPL query languages.
+  - Search query must be pushed down to OpenSearch.
+- In SQL the nested function is supported in SELECT, WHERE, GROUP BY, ORDER BY, and HAVING clauses.
+- Support JDBC format for nested aggregation queries(Not supported in legacy engine).
+- Add support for nested function used as argument to other functions(Not supported in legacy engine).
+- Nested function support in PPL.
+- Nested function support in JDBC connector.
+- Nested function support in ODBC connector.
+
+### 2.2 Non-functional Requirements
+
+### A. Reliability
+After a `nested` query is pushed down to OpenSearch, post-processing is done with the response to flatten returned `nested` objects. When multiple array values are returned from `nested` object field types with differing path values, a cross join is executed on the returned rows. Post-processing Operator should be safe-guarded from out of memory error during result flattening. Efficiency should match or improve upon legacy implementation for response flattening.
+
+### B. Extensibility
+- The work of the `nested` function aims to be a building block for future work in PartiQL. Users can unnest `nested` collections using PartiQL syntax that follows the underlying logic of the `nested` function with only grammar changes.
+- The nested function will require porting over to the PPL query language and a re-usable implementation in SQL should ease this porting.
+- Post-processing for nested fields in SQL plugin should be generic to allow any struct or array fields passed in by additional data sources to follow implementation logic.
+
+### 2.3 Tenets
+- The `nested` function maps to the OpenSearch nested query in DSL. After extracting inner hits from OpenSearch response the plugin is responsible for in-memory flattening of returned documents.
+- If the SQL plugin fails to form a valid `nested` DSL query to push down to OpenSearch the query execution cannot be completed.
+
+### 2.4 Scope
+The `nested` function in the legacy engine is supported in multiple clauses in SQL.  A user can use the nested function with the legacy engine in the SELECT, WHERE, GROUP BY, ORDER BY, and HAVING clauses of an SQL statement. The V2 engine has the additional query language PPL to support the nested function. The V2 engine implementation of the nested function may not include all syntax options as the legacy engine to save development time. For example when the `nested` function is used in the WHERE clause, a user can use both of the following syntax options:
+
+- **nested(field | field, path) OPERATOR LITERAL**
+- **nested(path, expression)**
+
+Both options serve the same functionality in querying an expression of a `nested` field with a literal. The goal of supporting the nested function in the SQL plugin is to reach functional parity with the legacy engine, port over implementation to the PPL query language, add support in the JDBC and ODBC Connectors, and create a base for future PartiQL development. Any remaining bugs from legacy engine should be resolved and any lack of implementations such as JDBC format for nested aggregation should be implemented.
+
+### 2.5 Out of Scope
+- TBD.
+
+## Additional Info
+
+### Release Schedule
+See Issues Tracked under [Issue 1111](https://github.com/opensearch-project/sql/issues/1111) for related PR's and information.
+
+
diff --git a/docs/user/admin/settings.rst b/docs/user/admin/settings.rst
index b5da4e28e2..0e644dc910 100644
--- a/docs/user/admin/settings.rst
+++ b/docs/user/admin/settings.rst
@@ -202,7 +202,7 @@ plugins.query.size_limit
 Description
 -----------
 
-The new engine fetches a default size of index from OpenSearch set by this setting, the default value is 200. You can change the value to any value not greater than the max result window value in index level (10000 by default), here is an example::
+The new engine fetches a default size of index from OpenSearch set by this setting, the default value equals to max result window in index level (10000 by default). You can change the value to any value not greater than the max result window value in index level (`index.max_result_window`), here is an example::
 
 	>> curl -H 'Content-Type: application/json' -X PUT localhost:9200/_plugins/_query/settings -d '{
 	  "transient" : {
@@ -311,3 +311,472 @@ SQL query::
       "status": 400
     }
 
+
+plugins.query.executionengine.spark.session.limit
+==================================================
+
+Description
+-----------
+
+Each cluster can have maximum 10 sessions running in parallel by default. You can increase limit by this setting.
+
+1. The default value is 10.
+2. This setting is node scope.
+3. This setting can be updated dynamically.
+
+You can update the setting with a new value like this.
+
+SQL query::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_cluster/settings \
+    ... -d '{"transient":{"plugins.query.executionengine.spark.session.limit":200}}'
+    {
+      "acknowledged": true,
+      "persistent": {},
+      "transient": {
+        "plugins": {
+          "query": {
+            "executionengine": {
+              "spark": {
+                "session": {
+                  "limit": "200"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+
+plugins.query.executionengine.spark.refresh_job.limit
+=====================================================
+
+Description
+-----------
+
+Each cluster can have maximum 5 refresh job running concurrently. You can increase limit by this setting.
+
+1. The default value is 5.
+2. This setting is node scope.
+3. This setting can be updated dynamically.
+
+You can update the setting with a new value like this.
+
+SQL query::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_cluster/settings \
+    ... -d '{"transient":{"plugins.query.executionengine.spark.refresh_job.limit":200}}'
+    {
+      "acknowledged": true,
+      "persistent": {},
+      "transient": {
+        "plugins": {
+          "query": {
+            "executionengine": {
+              "spark": {
+                "refresh_job": {
+                  "limit": "200"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+
+plugins.query.datasources.limit
+===============================
+
+Description
+-----------
+
+Each cluster can have maximum 20 datasources. You can increase limit by this setting.
+
+1. The default value is 20.
+2. This setting is node scope.
+3. This setting can be updated dynamically.
+
+You can update the setting with a new value like this.
+
+SQL query::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_cluster/settings \
+    ... -d '{"transient":{"plugins.query.datasources.limit":25}}'
+    {
+      "acknowledged": true,
+      "persistent": {},
+      "transient": {
+        "plugins": {
+          "query": {
+            "datasources": {
+              "limit": "25"
+            }
+          }
+        }
+      }
+    }
+
+
+plugins.query.executionengine.spark.session_inactivity_timeout_millis
+=====================================================================
+
+Description
+-----------
+
+This setting determines the duration after which a session is considered stale if there has been no update. The default
+timeout is 3 minutes (180,000 milliseconds).
+
+1. Default Value: 180000 (milliseconds)
+2. Scope: Node-level
+3. Dynamic Update: Yes, this setting can be updated dynamically.
+
+To change the session inactivity timeout to 10 minutes for example, use the following command:
+
+SQL query::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_cluster/settings \
+    ... -d '{"transient":{"plugins.query.executionengine.spark.session_inactivity_timeout_millis":600000}}'
+    {
+        "acknowledged": true,
+        "persistent": {},
+        "transient": {
+            "plugins": {
+                "query": {
+                    "executionengine": {
+                        "spark": {
+                            "session_inactivity_timeout_millis": "600000"
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+plugins.query.executionengine.spark.auto_index_management.enabled
+=================================================================
+
+Description
+-----------
+This setting controls the automatic management of request and result indices for each data source. When enabled, it
+deletes outdated index documents.
+
+* Default State: Enabled (true)
+* Purpose: Manages auto index management for request and result indices.
+
+To disable auto index management, use the following command:
+
+SQL query::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_cluster/settings \
+    ... -d '{"transient":{"plugins.query.executionengine.spark.auto_index_management.enabled":false}}'
+    {
+        "acknowledged": true,
+        "persistent": {},
+        "transient": {
+            "plugins": {
+                "query": {
+                    "executionengine": {
+                        "spark": {
+                            "auto_index_management": {
+                                "enabled": "false"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+plugins.query.executionengine.spark.session.index.ttl
+=====================================================
+
+Description
+-----------
+This setting defines the time-to-live (TTL) for request indices when plugins.query.executionengine.spark.auto_index_management.enabled
+is true. By default, request indices older than 14 days are deleted.
+
+* Default Value: 30 days
+
+To change the TTL to 60 days for example, execute the following command:
+
+SQL query::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_cluster/settings \
+    ... -d '{"transient":{"plugins.query.executionengine.spark.session.index.ttl":"60d"}}'
+    {
+        "acknowledged": true,
+        "persistent": {},
+        "transient": {
+            "plugins": {
+                "query": {
+                    "executionengine": {
+                        "spark": {
+                            "session": {
+                                "index": {
+                                    "ttl": "60d"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+plugins.query.executionengine.spark.result.index.ttl
+====================================================
+
+Description
+-----------
+This setting specifies the TTL for result indices when plugins.query.executionengine.spark.auto_index_management.enabled
+is set to true. The default setting is to delete result indices older than 60 days.
+
+* Default Value: 60 days
+
+To modify the TTL to 30 days for example, use this command:
+
+SQL query::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_cluster/settings \
+    ... -d '{"transient":{"plugins.query.executionengine.spark.result.index.ttl":"30d"}}'
+    {
+        "acknowledged": true,
+        "persistent": {},
+        "transient": {
+            "plugins": {
+                "query": {
+                    "executionengine": {
+                        "spark": {
+                            "result": {
+                                "index": {
+                                    "ttl": "30d"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+plugins.query.executionengine.async_query.enabled
+=================================================
+
+Description
+-----------
+You can disable submit async query to reject all coming requests.
+
+1. The default value is true.
+2. This setting is node scope.
+3. This setting can be updated dynamically.
+
+Request::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_cluster/settings \
+    ... -d '{"transient":{"plugins.query.executionengine.async_query.enabled":"false"}}'
+    {
+        "acknowledged": true,
+        "persistent": {},
+        "transient": {
+            "plugins": {
+                "query": {
+                    "executionengine": {
+                        "async_query": {
+                            "enabled": "false"
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+plugins.query.executionengine.async_query.external_scheduler.enabled
+=====================================================================
+
+Description
+-----------
+This setting controls whether the external scheduler is enabled for async queries.
+
+* Default Value: true
+* Scope: Node-level
+* Dynamic Update: Yes, this setting can be updated dynamically. 
+
+To disable the external scheduler, use the following command:
+
+Request ::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_cluster/settings \
+    ... -d '{"transient":{"plugins.query.executionengine.async_query.external_scheduler.enabled":"false"}}'
+    {
+        "acknowledged": true,
+        "persistent": {},
+        "transient": {
+            "plugins": {
+                "query": {
+                    "executionengine": {
+                        "async_query": {
+                            "external_scheduler": {
+                                "enabled": "false"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+plugins.query.executionengine.async_query.external_scheduler.interval
+=====================================================================
+
+Description
+-----------
+This setting defines the interval at which the external scheduler applies for auto refresh queries. It optimizes Spark applications by allowing them to automatically decide whether to use the Spark scheduler or the external scheduler.
+
+* Default Value: None (must be explicitly set)
+* Format: A string representing a time duration follows Spark `CalendarInterval <https://spark.apache.org/docs/latest/api/java/org/apache/spark/unsafe/types/CalendarInterval.html>`__ format (e.g., ``10 minutes`` for 10 minutes, ``1 hour`` for 1 hour).
+
+To modify the interval to 10 minutes for example, use this command:
+
+Request ::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_cluster/settings \
+    ... -d '{"transient":{"plugins.query.executionengine.async_query.external_scheduler.interval":"10 minutes"}}'
+    {
+        "acknowledged": true,
+        "persistent": {},
+        "transient": {
+            "plugins": {
+                "query": {
+                    "executionengine": {
+                        "async_query": {
+                            "external_scheduler": {
+                                "interval": "10 minutes"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+plugins.query.executionengine.spark.streamingjobs.housekeeper.interval
+======================================================================
+
+Description
+-----------
+This setting specifies the interval at which the streaming job housekeeper runs to clean up streaming jobs associated with deleted and disabled data sources.
+The default configuration executes this cleanup every 15 minutes.
+
+* Default Value: 15 minutes
+
+To modify the TTL to 30 minutes for example, use this command:
+
+Request ::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT localhost:9200/_cluster/settings \
+    ... -d '{"transient":{"plugins.query.executionengine.spark.streamingjobs.housekeeper.interval":"30m"}}'
+    {
+    "acknowledged": true,
+    "persistent": {},
+    "transient": {
+        "plugins": {
+            "query": {
+                "executionengine": {
+                    "spark": {
+                        "streamingjobs": {
+                            "housekeeper": {
+                                "interval": "30m"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+      }
+    }
+
+plugins.query.datasources.enabled
+=================================
+
+Description
+-----------
+
+This setting controls whether datasources are enabled.
+
+1. The default value is true
+2. This setting is node scope
+3. This setting can be updated dynamically
+
+Update Settings Request::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT 'localhost:9200/_cluster/settings?pretty' \
+    ... -d '{"transient":{"plugins.query.datasources.enabled":"false"}}'
+    {
+      "acknowledged": true,
+      "persistent": {},
+      "transient": {
+        "plugins": {
+          "query": {
+            "datasources": {
+              "enabled": "false"
+            }
+          }
+        }
+      }
+    }
+
+When Attempting to Call Data Source APIs::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X GET 'localhost:9200/_plugins/_query/_datasources'
+    {
+      "status": 400,
+      "error": {
+        "type": "OpenSearchStatusException",
+        "reason": "Invalid Request",
+        "details": "plugins.query.datasources.enabled setting is false"
+      }
+    }
+
+When Attempting to List Data Source::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X POST 'localhost:9200/_plugins/_ppl' \
+    ... -d '{"query":"show datasources"}'
+    {
+      "schema": [
+        {
+          "name": "DATASOURCE_NAME",
+          "type": "string"
+        },
+        {
+          "name": "CONNECTOR_TYPE",
+          "type": "string"
+        }
+      ],
+      "datarows": [],
+      "total": 0,
+      "size": 0
+    }
+
+To Re-enable Data Sources:::
+
+    sh$ curl -sS -H 'Content-Type: application/json' -X PUT 'localhost:9200/_cluster/settings?pretty' \
+    ... -d '{"transient":{"plugins.query.datasources.enabled":"true"}}'
+    {
+      "acknowledged": true,
+      "persistent": {},
+      "transient": {
+        "plugins": {
+          "query": {
+            "datasources": {
+              "enabled": "true"
+            }
+          }
+        }
+      }
+    }
+
diff --git a/docs/user/beyond/partiql.rst b/docs/user/beyond/partiql.rst
index 6ad93ddeaf..6a93a55c94 100644
--- a/docs/user/beyond/partiql.rst
+++ b/docs/user/beyond/partiql.rst
@@ -202,11 +202,11 @@ Selecting top level for object fields, object fields of array value and nested f
 
     os> SELECT city, accounts, projects FROM people;
     fetched rows / total rows = 1/1
-    +-----------------------------------------------------+-----------------------+----------------------------------------------------------------------------------------------------------------+
-    | city                                                | accounts              | projects                                                                                                       |
-    |-----------------------------------------------------+-----------------------+----------------------------------------------------------------------------------------------------------------|
-    | {'name': 'Seattle', 'location': {'latitude': 10.5}} | [{'id': 1},{'id': 2}] | [{'name': 'AWS Redshift Spectrum querying'},{'name': 'AWS Redshift security'},{'name': 'AWS Aurora security'}] |
-    +-----------------------------------------------------+-----------------------+----------------------------------------------------------------------------------------------------------------+
+    +-----------------------------------------------------+-----------+----------------------------------------------------------------------------------------------------------------+
+    | city                                                | accounts  | projects                                                                                                       |
+    |-----------------------------------------------------+-----------+----------------------------------------------------------------------------------------------------------------|
+    | {'name': 'Seattle', 'location': {'latitude': 10.5}} | {'id': 1} | [{'name': 'AWS Redshift Spectrum querying'},{'name': 'AWS Redshift security'},{'name': 'AWS Aurora security'}] |
+    +-----------------------------------------------------+-----------+----------------------------------------------------------------------------------------------------------------+
 
 Example 2: Selecting Deeper Levels
 ----------------------------------
@@ -215,11 +215,11 @@ Selecting at deeper levels for object fields of regular value returns inner fiel
 
     os> SELECT city.location, city.location.latitude FROM people;
     fetched rows / total rows = 1/1
-    +--------------------+--------------------------+
-    | city.location      | city.location.latitude   |
-    |--------------------+--------------------------|
-    | {'latitude': 10.5} | 10.5                     |
-    +--------------------+--------------------------+
+    +--------------------+------------------------+
+    | city.location      | city.location.latitude |
+    |--------------------+------------------------|
+    | {'latitude': 10.5} | 10.5                   |
+    +--------------------+------------------------+
 
 
 For selecting second level for nested fields, please read on and find more details in the following sections.
diff --git a/docs/user/dql/aggregations.rst b/docs/user/dql/aggregations.rst
index 275666e7ba..adf933c09c 100644
--- a/docs/user/dql/aggregations.rst
+++ b/docs/user/dql/aggregations.rst
@@ -34,12 +34,12 @@ The group by expression could be identifier::
 
     os> SELECT gender, sum(age) FROM accounts GROUP BY gender;
     fetched rows / total rows = 2/2
-    +----------+------------+
-    | gender   | sum(age)   |
-    |----------+------------|
-    | F        | 28         |
-    | M        | 101        |
-    +----------+------------+
+    +--------+----------+
+    | gender | sum(age) |
+    |--------+----------|
+    | F      | 28       |
+    | M      | 101      |
+    +--------+----------+
 
 
 Ordinal
@@ -49,12 +49,12 @@ The group by expression could be ordinal::
 
     os> SELECT gender, sum(age) FROM accounts GROUP BY 1;
     fetched rows / total rows = 2/2
-    +----------+------------+
-    | gender   | sum(age)   |
-    |----------+------------|
-    | F        | 28         |
-    | M        | 101        |
-    +----------+------------+
+    +--------+----------+
+    | gender | sum(age) |
+    |--------+----------|
+    | F      | 28       |
+    | M      | 101      |
+    +--------+----------+
 
 
 Expression
@@ -64,14 +64,14 @@ The group by expression could be expression::
 
     os> SELECT abs(account_number), sum(age) FROM accounts GROUP BY abs(account_number);
     fetched rows / total rows = 4/4
-    +-----------------------+------------+
-    | abs(account_number)   | sum(age)   |
-    |-----------------------+------------|
-    | 1                     | 32         |
-    | 13                    | 28         |
-    | 18                    | 33         |
-    | 6                     | 36         |
-    +-----------------------+------------+
+    +---------------------+----------+
+    | abs(account_number) | sum(age) |
+    |---------------------+----------|
+    | 1                   | 32       |
+    | 13                  | 28       |
+    | 18                  | 33       |
+    | 6                   | 36       |
+    +---------------------+----------+
 
 
 Aggregation
@@ -91,12 +91,12 @@ The aggregation could be used select::
 
     os> SELECT gender, sum(age) FROM accounts GROUP BY gender;
     fetched rows / total rows = 2/2
-    +----------+------------+
-    | gender   | sum(age)   |
-    |----------+------------|
-    | F        | 28         |
-    | M        | 101        |
-    +----------+------------+
+    +--------+----------+
+    | gender | sum(age) |
+    |--------+----------|
+    | F      | 28       |
+    | M      | 101      |
+    +--------+----------+
 
 Expression over Aggregation
 ---------------------------
@@ -105,12 +105,12 @@ The aggregation could be used as arguments of expression::
 
     os> SELECT gender, sum(age) * 2 as sum2 FROM accounts GROUP BY gender;
     fetched rows / total rows = 2/2
-    +----------+--------+
-    | gender   | sum2   |
-    |----------+--------|
-    | F        | 56     |
-    | M        | 202    |
-    +----------+--------+
+    +--------+------+
+    | gender | sum2 |
+    |--------+------|
+    | F      | 56   |
+    | M      | 202  |
+    +--------+------+
 
 Expression as argument of Aggregation
 -------------------------------------
@@ -119,12 +119,12 @@ The aggregation could has expression as arguments::
 
     os> SELECT gender, sum(age * 2) as sum2 FROM accounts GROUP BY gender;
     fetched rows / total rows = 2/2
-    +----------+--------+
-    | gender   | sum2   |
-    |----------+--------|
-    | F        | 56     |
-    | M        | 202    |
-    +----------+--------+
+    +--------+------+
+    | gender | sum2 |
+    |--------+------|
+    | F      | 56   |
+    | M      | 202  |
+    +--------+------+
 
 COUNT Aggregations
 ------------------
@@ -150,12 +150,12 @@ Example::
 
     os> SELECT gender, count(*) as countV FROM accounts GROUP BY gender;
     fetched rows / total rows = 2/2
-    +----------+----------+
-    | gender   | countV   |
-    |----------+----------|
-    | F        | 1        |
-    | M        | 3        |
-    +----------+----------+
+    +--------+--------+
+    | gender | countV |
+    |--------+--------|
+    | F      | 1      |
+    | M      | 3      |
+    +--------+--------+
 
 SUM
 ---
@@ -163,18 +163,18 @@ SUM
 Description
 >>>>>>>>>>>
 
-Usage: SUM(expr). Returns the sum of expr.
+Usage: SUM(expr). Returns the sum of `expr`. `expr` could be of any of the numeric data types.
 
 Example::
 
     os> SELECT gender, sum(age) as sumV FROM accounts GROUP BY gender;
     fetched rows / total rows = 2/2
-    +----------+--------+
-    | gender   | sumV   |
-    |----------+--------|
-    | F        | 28     |
-    | M        | 101    |
-    +----------+--------+
+    +--------+------+
+    | gender | sumV |
+    |--------+------|
+    | F      | 28   |
+    | M      | 101  |
+    +--------+------+
 
 AVG
 ---
@@ -182,18 +182,18 @@ AVG
 Description
 >>>>>>>>>>>
 
-Usage: AVG(expr). Returns the average value of expr.
+Usage: AVG(expr). Returns the average value of `expr`. `expr` can be any numeric or datetime data type. Datetime aggregation is performed with milliseconds precision.
 
 Example::
 
     os> SELECT gender, avg(age) as avgV FROM accounts GROUP BY gender;
     fetched rows / total rows = 2/2
-    +----------+--------------------+
-    | gender   | avgV               |
-    |----------+--------------------|
-    | F        | 28.0               |
-    | M        | 33.666666666666664 |
-    +----------+--------------------+
+    +--------+--------------------+
+    | gender | avgV               |
+    |--------+--------------------|
+    | F      | 28.0               |
+    | M      | 33.666666666666664 |
+    +--------+--------------------+
 
 MAX
 ---
@@ -201,17 +201,17 @@ MAX
 Description
 >>>>>>>>>>>
 
-Usage: MAX(expr). Returns the maximum value of expr.
+Usage: MAX(expr). Returns the maximum value of `expr`. `expr` can be any numeric or datetime data type. Datetime aggregation is performed with milliseconds precision.
 
 Example::
 
     os> SELECT max(age) as maxV FROM accounts;
     fetched rows / total rows = 1/1
-    +--------+
-    | maxV   |
-    |--------|
-    | 36     |
-    +--------+
+    +------+
+    | maxV |
+    |------|
+    | 36   |
+    +------+
 
 MIN
 ---
@@ -219,17 +219,17 @@ MIN
 Description
 >>>>>>>>>>>
 
-Usage: MIN(expr). Returns the minimum value of expr.
+Usage: MIN(expr). Returns the minimum value of `expr`. `expr` can be any numeric or datetime data type. Datetime aggregation is performed with milliseconds precision.
 
 Example::
 
     os> SELECT min(age) as minV FROM accounts;
     fetched rows / total rows = 1/1
-    +--------+
-    | minV   |
-    |--------|
-    | 28     |
-    +--------+
+    +------+
+    | minV |
+    |------|
+    | 28   |
+    +------+
 
 VAR_POP
 -------
@@ -364,11 +364,30 @@ To get the count of distinct values of a field, you can add a keyword ``DISTINCT
 
     os> SELECT COUNT(DISTINCT gender), COUNT(gender) FROM accounts;
     fetched rows / total rows = 1/1
-    +--------------------------+-----------------+
-    | COUNT(DISTINCT gender)   | COUNT(gender)   |
-    |--------------------------+-----------------|
-    | 2                        | 4               |
-    +--------------------------+-----------------+
+    +------------------------+---------------+
+    | COUNT(DISTINCT gender) | COUNT(gender) |
+    |------------------------+---------------|
+    | 2                      | 4             |
+    +------------------------+---------------+
+
+PERCENTILE or PERCENTILE_APPROX
+-------------------------------
+
+Description
+>>>>>>>>>>>
+
+Usage: PERCENTILE(expr, percent) or PERCENTILE_APPROX(expr, percent). Returns the approximate percentile value of `expr` at the specified percentage. `percent` must be a constant between 0 and 100.
+
+Example::
+
+    os> SELECT gender, percentile(age, 90) as p90 FROM accounts GROUP BY gender;
+    fetched rows / total rows = 2/2
+    +--------+-----+
+    | gender | p90 |
+    |--------+-----|
+    | F      | 28  |
+    | M      | 36  |
+    +--------+-----+
 
 HAVING Clause
 =============
@@ -394,11 +413,11 @@ Here is an example for typical use of ``HAVING`` clause::
     ... GROUP BY gender
     ... HAVING sum(age) > 100;
     fetched rows / total rows = 1/1
-    +----------+------------+
-    | gender   | sum(age)   |
-    |----------+------------|
-    | M        | 101        |
-    +----------+------------+
+    +--------+----------+
+    | gender | sum(age) |
+    |--------+----------|
+    | M      | 101      |
+    +--------+----------+
 
 Here is another example for using alias in ``HAVING`` condition. Note that if an identifier is ambiguous, for example present both as a select alias and an index field, preference is alias. This means the identifier will be replaced by expression aliased in ``SELECT`` clause::
 
@@ -408,11 +427,11 @@ Here is another example for using alias in ``HAVING`` condition. Note that if an
     ... GROUP BY gender
     ... HAVING s > 100;
     fetched rows / total rows = 1/1
-    +----------+-----+
-    | gender   | s   |
-    |----------+-----|
-    | M        | 101 |
-    +----------+-----+
+    +--------+-----+
+    | gender | s   |
+    |--------+-----|
+    | M      | 101 |
+    +--------+-----+
 
 HAVING without GROUP BY
 -----------------------
@@ -424,11 +443,11 @@ Additionally, a ``HAVING`` clause can work without ``GROUP BY`` clause. This is
     ... FROM accounts
     ... HAVING sum(age) > 100;
     fetched rows / total rows = 1/1
-    +------------------------+
-    | 'Total of age > 100'   |
-    |------------------------|
-    | Total of age > 100     |
-    +------------------------+
+    +----------------------+
+    | 'Total of age > 100' |
+    |----------------------|
+    | Total of age > 100   |
+    +----------------------+
 
 
 FILTER Clause
@@ -446,12 +465,12 @@ The group by aggregation with ``FILTER`` clause can set different conditions for
 
     os> SELECT avg(age) FILTER(WHERE balance > 10000) AS filtered, gender FROM accounts GROUP BY gender
     fetched rows / total rows = 2/2
-    +------------+----------+
-    | filtered   | gender   |
-    |------------+----------|
-    | 28.0       | F        |
-    | 32.0       | M        |
-    +------------+----------+
+    +----------+--------+
+    | filtered | gender |
+    |----------+--------|
+    | 28.0     | F      |
+    | 32.0     | M      |
+    +----------+--------+
 
 FILTER without GROUP BY
 -----------------------
@@ -463,11 +482,11 @@ The ``FILTER`` clause can be used in aggregation functions without GROUP BY as w
     ...   count(*) FILTER(WHERE age > 34) AS filtered
     ... FROM accounts
     fetched rows / total rows = 1/1
-    +--------------+------------+
-    | unfiltered   | filtered   |
-    |--------------+------------|
-    | 4            | 1          |
-    +--------------+------------+
+    +------------+----------+
+    | unfiltered | filtered |
+    |------------+----------|
+    | 4          | 1        |
+    +------------+----------+
 
 Distinct count aggregate with FILTER
 ------------------------------------
@@ -476,9 +495,9 @@ The ``FILTER`` clause is also used in distinct count to do the filtering before
 
     os> SELECT COUNT(DISTINCT firstname) FILTER(WHERE age > 30) AS distinct_count FROM accounts
     fetched rows / total rows = 1/1
-    +------------------+
-    | distinct_count   |
-    |------------------|
-    | 3                |
-    +------------------+
+    +----------------+
+    | distinct_count |
+    |----------------|
+    | 3              |
+    +----------------+
 
diff --git a/docs/user/dql/basics.rst b/docs/user/dql/basics.rst
index 9762f23988..a59f193086 100644
--- a/docs/user/dql/basics.rst
+++ b/docs/user/dql/basics.rst
@@ -155,6 +155,50 @@ Result set:
 |  Nanette|   Bates|
 +---------+--------+
 
+One can also provide meta-field name(s) to retrieve reserved-fields (beginning with underscore) from OpenSearch documents.  They may also be used
+in the query `WHERE` or `ORDER BY` clauses. Meta-fields are not output from wildcard calls (`SELECT *`) and must be explicitly included to be returned.
+
+Note: `_routing` is used differently in the `SELECT` and `WHERE` clauses.  In `WHERE`, it contains the routing hash id. In `SELECT`,
+it returns the shard used for the query (unless shards aren't active, in which case it returns the routing hash id).
+
+SQL query::
+
+	POST /_plugins/_sql
+	{
+	  "query" : "SELECT firstname, lastname, _id, _index, _sort, _routing FROM accounts WHERE _index = 'accounts'"
+	}
+
+Explain::
+
+	{
+	  "from" : 0,
+	  "size" : 200,
+	  "_source" : {
+	    "includes" : [
+	      "firstname",
+	      "_id",
+	      "_index",
+	      "_routing",
+	      "_sort",
+	      "lastname"
+	    ],
+	    "excludes" : [ ]
+	  }
+	}
+
+
+This produces results like this for example::
+
+    os> SELECT firstname, lastname, _index, _sort FROM accounts;
+    fetched rows / total rows = 4/4
+    +-----------+----------+----------+-------+
+    | firstname | lastname | _index   | _sort |
+    |-----------+----------+----------+-------|
+    | Amber     | Duke     | accounts | -2    |
+    | Hattie    | Bond     | accounts | -2    |
+    | Nanette   | Bates    | accounts | -2    |
+    | Dale      | Adams    | accounts | -2    |
+    +-----------+----------+----------+-------+
 
 Example 3: Using Field Alias
 ----------------------------
@@ -259,13 +303,13 @@ In fact your can use any expression in a ``DISTINCT`` clause as follows::
 
     os> SELECT DISTINCT SUBSTRING(lastname, 1, 1) FROM accounts;
     fetched rows / total rows = 3/3
-    +-----------------------------+
-    | SUBSTRING(lastname, 1, 1)   |
-    |-----------------------------|
-    | A                           |
-    | B                           |
-    | D                           |
-    +-----------------------------+
+    +---------------------------+
+    | SUBSTRING(lastname, 1, 1) |
+    |---------------------------|
+    | A                         |
+    | B                         |
+    | D                         |
+    +---------------------------+
 
 FROM
 ====
@@ -944,14 +988,14 @@ Note that the example above is essentially sorting on a predicate expression. In
 
     os> SELECT employer FROM accounts ORDER BY employer ASC NULLS LAST;
     fetched rows / total rows = 4/4
-    +------------+
-    | employer   |
-    |------------|
-    | Netagy     |
-    | Pyrami     |
-    | Quility    |
-    | null       |
-    +------------+
+    +----------+
+    | employer |
+    |----------|
+    | Netagy   |
+    | Pyrami   |
+    | Quility  |
+    | null     |
+    +----------+
 
 The sorting rule can be summarized as follows:
 
@@ -966,14 +1010,14 @@ Here is another example for sort in descending order without ``NULLS`` clause::
 
     os> SELECT employer FROM accounts ORDER BY employer DESC;
     fetched rows / total rows = 4/4
-    +------------+
-    | employer   |
-    |------------|
-    | Quility    |
-    | Pyrami     |
-    | Netagy     |
-    | null       |
-    +------------+
+    +----------+
+    | employer |
+    |----------|
+    | Quility  |
+    | Pyrami   |
+    | Netagy   |
+    | null     |
+    +----------+
 
 
 Example 3: Ordering by Aggregate Functions
@@ -983,23 +1027,23 @@ Aggregate functions are allowed to be used in ``ORDER BY`` clause. You can refer
 
     os> SELECT gender, MAX(age) FROM accounts GROUP BY gender ORDER BY MAX(age) DESC;
     fetched rows / total rows = 2/2
-    +----------+------------+
-    | gender   | MAX(age)   |
-    |----------+------------|
-    | M        | 36         |
-    | F        | 28         |
-    +----------+------------+
+    +--------+----------+
+    | gender | MAX(age) |
+    |--------+----------|
+    | M      | 36       |
+    | F      | 28       |
+    +--------+----------+
 
 Even if it's not present in ``SELECT`` clause, it can be also used as follows::
 
     os> SELECT gender, MIN(age) FROM accounts GROUP BY gender ORDER BY MAX(age) DESC;
     fetched rows / total rows = 2/2
-    +----------+------------+
-    | gender   | MIN(age)   |
-    |----------+------------|
-    | M        | 32         |
-    | F        | 28         |
-    +----------+------------+
+    +--------+----------+
+    | gender | MIN(age) |
+    |--------+----------|
+    | M      | 32       |
+    | F      | 28       |
+    +--------+----------+
 
 LIMIT
 =====
@@ -1103,12 +1147,12 @@ Offset position can be given following the OFFSET keyword as well, here is an ex
 
     >od SELECT age FROM accounts ORDER BY age LIMIT 2 OFFSET 1
     fetched rows / total rows = 2/2
-    +-------+
-    | age   |
-    |-------|
-    | 32    |
-    | 33    |
-    +-------+
+    +-----+
+    | age |
+    |-----|
+    | 32  |
+    | 33  |
+    +-----+
 
 
 Limitation
diff --git a/docs/user/dql/complex.rst b/docs/user/dql/complex.rst
index 17009d712b..906ea21904 100644
--- a/docs/user/dql/complex.rst
+++ b/docs/user/dql/complex.rst
@@ -247,14 +247,14 @@ Here is another example with aggregation function and GROUP BY in subquery::
     ...   SELECT AVG(balance) AS avg_balance FROM accounts GROUP BY gender, age
     ... ) AS a;
     fetched rows / total rows = 4/4
-    +---------------+
-    | avg_balance   |
-    |---------------|
-    | 32838.0       |
-    | 39225.0       |
-    | 4180.0        |
-    | 5686.0        |
-    +---------------+
+    +-------------+
+    | avg_balance |
+    |-------------|
+    | 32838.0     |
+    | 39225.0     |
+    | 4180.0      |
+    | 5686.0      |
+    +-------------+
 
 
 Query with multiple layers of subquery is supported as well, here follows a example::
@@ -265,12 +265,12 @@ Query with multiple layers of subquery is supported as well, here follows a exam
     ...   ) AS accounts WHERE age < 35
     ... ) AS accounts
     fetched rows / total rows = 2/2
-    +--------+
-    | name   |
-    |--------|
-    | Duke   |
-    | Adams  |
-    +--------+
+    +-------+
+    | name  |
+    |-------|
+    | Duke  |
+    | Adams |
+    +-------+
 
 
 JOINs
diff --git a/docs/user/dql/expressions.rst b/docs/user/dql/expressions.rst
index 89fcd7f0af..a78f034dfe 100644
--- a/docs/user/dql/expressions.rst
+++ b/docs/user/dql/expressions.rst
@@ -25,7 +25,7 @@ A literal is a symbol that represents a value. The most common literal values in
 1. Numeric literals: specify numeric values such as integer and floating-point numbers.
 2. String literals: specify a string enclosed by single or double quotes.
 3. Boolean literals: ``true`` or ``false``.
-4. Date and Time literals: DATE 'YYYY-MM-DD' represent the date, TIME 'hh:mm:ss' represent the time, TIMESTAMP 'YYYY-MM-DD hh:mm:ss' represent the timestamp.
+4. Date and Time literals: DATE 'YYYY-MM-DD' represent the date, TIME 'hh:mm:ss' represent the time, TIMESTAMP 'YYYY-MM-DD hh:mm:ss' represent the timestamp. You can also surround the literals with curly brackets, if you do, you can replace date with d, time with t, and timestamp with ts.
 
 Examples
 --------
@@ -34,11 +34,29 @@ Here is an example for different type of literals::
 
     os> SELECT 123, 'hello', false, -4.567, DATE '2020-07-07', TIME '01:01:01', TIMESTAMP '2020-07-07 01:01:01';
     fetched rows / total rows = 1/1
-    +-------+-----------+---------+----------+---------------------+-------------------+-----------------------------------+
-    | 123   | 'hello'   | false   | -4.567   | DATE '2020-07-07'   | TIME '01:01:01'   | TIMESTAMP '2020-07-07 01:01:01'   |
-    |-------+-----------+---------+----------+---------------------+-------------------+-----------------------------------|
-    | 123   | hello     | False   | -4.567   | 2020-07-07          | 01:01:01          | 2020-07-07 01:01:01               |
-    +-------+-----------+---------+----------+---------------------+-------------------+-----------------------------------+
+    +-----+---------+-------+--------+-------------------+-----------------+---------------------------------+
+    | 123 | 'hello' | false | -4.567 | DATE '2020-07-07' | TIME '01:01:01' | TIMESTAMP '2020-07-07 01:01:01' |
+    |-----+---------+-------+--------+-------------------+-----------------+---------------------------------|
+    | 123 | hello   | False | -4.567 | 2020-07-07        | 01:01:01        | 2020-07-07 01:01:01             |
+    +-----+---------+-------+--------+-------------------+-----------------+---------------------------------+
+
+
+    os> SELECT "Hello", 'Hello', "It""s", 'It''s', "It's", '"Its"', 'It\'s', 'It\\\'s', "\I\t\s"
+    fetched rows / total rows = 1/1
+    +---------+---------+---------+---------+--------+---------+---------+-----------+----------+
+    | "Hello" | 'Hello' | "It""s" | 'It''s' | "It's" | '"Its"' | 'It\'s' | 'It\\\'s' | "\I\t\s" |
+    |---------+---------+---------+---------+--------+---------+---------+-----------+----------|
+    | Hello   | Hello   | It"s    | It's    | It's   | "Its"   | It's    | It\'s     | \I\t\s   |
+    +---------+---------+---------+---------+--------+---------+---------+-----------+----------+
+
+
+    os> SELECT {DATE '2020-07-07'}, {D '2020-07-07'}, {TIME '01:01:01'}, {T '01:01:01'}, {TIMESTAMP '2020-07-07 01:01:01'}, {TS '2020-07-07 01:01:01'}
+    fetched rows / total rows = 1/1
+    +---------------------+------------------+-------------------+----------------+-----------------------------------+----------------------------+
+    | {DATE '2020-07-07'} | {D '2020-07-07'} | {TIME '01:01:01'} | {T '01:01:01'} | {TIMESTAMP '2020-07-07 01:01:01'} | {TS '2020-07-07 01:01:01'} |
+    |---------------------+------------------+-------------------+----------------+-----------------------------------+----------------------------|
+    | 2020-07-07          | 2020-07-07       | 01:01:01          | 01:01:01       | 2020-07-07 01:01:01               | 2020-07-07 01:01:01        |
+    +---------------------+------------------+-------------------+----------------+-----------------------------------+----------------------------+
 
 Limitations
 -----------
@@ -84,11 +102,11 @@ Here is an example for different type of arithmetic expressions::
 
     os> SELECT 1 + 2, (9 - 1) % 3, 2 * 4 / 3;
     fetched rows / total rows = 1/1
-    +---------+---------------+-------------+
-    | 1 + 2   | (9 - 1) % 3   | 2 * 4 / 3   |
-    |---------+---------------+-------------|
-    | 3       | 2             | 2           |
-    +---------+---------------+-------------+
+    +-------+-------------+-----------+
+    | 1 + 2 | (9 - 1) % 3 | 2 * 4 / 3 |
+    |-------+-------------+-----------|
+    | 3     | 2           | 2         |
+    +-------+-------------+-----------+
 
 Comparison Operators
 ==================================
@@ -132,6 +150,10 @@ Operators
 +----------------+----------------------------------------+
 | NOT IN         | NOT IN value list test                 |
 +----------------+----------------------------------------+
+| BETWEEN        | Between a range (endpoint inclusive)   |
++----------------+----------------------------------------+
+| NOT BETWEEN    | Not between a range (BETWEEN negation) |
++----------------+----------------------------------------+
 
 Basic Comparison Operator
 -------------------------
@@ -140,11 +162,39 @@ Here is an example for different type of comparison operators::
 
     os> SELECT 2 > 1, 2 >= 1, 2 < 1, 2 != 1, 2 <= 1, 2 = 1;
     fetched rows / total rows = 1/1
-    +---------+----------+---------+----------+----------+---------+
-    | 2 > 1   | 2 >= 1   | 2 < 1   | 2 != 1   | 2 <= 1   | 2 = 1   |
-    |---------+----------+---------+----------+----------+---------|
-    | True    | True     | False   | True     | False    | False   |
-    +---------+----------+---------+----------+----------+---------+
+    +-------+--------+-------+--------+--------+-------+
+    | 2 > 1 | 2 >= 1 | 2 < 1 | 2 != 1 | 2 <= 1 | 2 = 1 |
+    |-------+--------+-------+--------+--------+-------|
+    | True  | True   | False | True   | False  | False |
+    +-------+--------+-------+--------+--------+-------+
+
+It is possible to compare datetimes. When comparing different datetime types, for example `DATE` and `TIME`, both converted to `DATETIME`.
+The following rule is applied on coversion: a `TIME` applied to today's date; `DATE` is interpreted at midnight. See example below::
+
+    os> SELECT current_time() > current_date() AS `now.time > today`, typeof(current_time()) AS `now.time.type`, typeof(current_date()) AS `now.date.type`;
+    fetched rows / total rows = 1/1
+    +------------------+---------------+---------------+
+    | now.time > today | now.time.type | now.date.type |
+    |------------------+---------------+---------------|
+    | True             | TIME          | DATE          |
+    +------------------+---------------+---------------+
+
+    os> SELECT current_time() = now() AS `now.time = now`, typeof(current_time()) AS `now.time.type`, typeof(now()) AS `now.type`;
+    fetched rows / total rows = 1/1
+    +----------------+---------------+-----------+
+    | now.time = now | now.time.type | now.type  |
+    |----------------+---------------+-----------|
+    | True           | TIME          | TIMESTAMP |
+    +----------------+---------------+-----------+
+
+    os> SELECT subtime(now(), current_time()) = current_date() AS `midnight = now.date`, typeof(subtime(now(), current_time())) AS `midnight.type`, typeof(current_date()) AS `now.date.type`;
+    fetched rows / total rows = 1/1
+    +---------------------+---------------+---------------+
+    | midnight = now.date | midnight.type | now.date.type |
+    |---------------------+---------------+---------------|
+    | True                | TIMESTAMP     | DATE          |
+    +---------------------+---------------+---------------+
+
 
 LIKE
 ----
@@ -153,11 +203,11 @@ expr LIKE pattern. The expr is string value, pattern is supports literal text, a
 
     os> SELECT 'axyzb' LIKE 'a%b', 'acb' LIKE 'A_B', 'axyzb' NOT LIKE 'a%b', 'acb' NOT LIKE 'a_b';
     fetched rows / total rows = 1/1
-    +----------------------+--------------------+--------------------------+------------------------+
-    | 'axyzb' LIKE 'a%b'   | 'acb' LIKE 'A_B'   | 'axyzb' NOT LIKE 'a%b'   | 'acb' NOT LIKE 'a_b'   |
-    |----------------------+--------------------+--------------------------+------------------------|
-    | True                 | True               | False                    | False                  |
-    +----------------------+--------------------+--------------------------+------------------------+
+    +--------------------+------------------+------------------------+----------------------+
+    | 'axyzb' LIKE 'a%b' | 'acb' LIKE 'A_B' | 'axyzb' NOT LIKE 'a%b' | 'acb' NOT LIKE 'a_b' |
+    |--------------------+------------------+------------------------+----------------------|
+    | True               | True             | False                  | False                |
+    +--------------------+------------------+------------------------+----------------------+
 
 NULL value test
 ---------------
@@ -166,11 +216,11 @@ Here is an example for null value test::
 
     os> SELECT 0 IS NULL, 0 IS NOT NULL, NULL IS NULL, NULL IS NOT NULL;
     fetched rows / total rows = 1/1
-    +-------------+-----------------+----------------+--------------------+
-    | 0 IS NULL   | 0 IS NOT NULL   | NULL IS NULL   | NULL IS NOT NULL   |
-    |-------------+-----------------+----------------+--------------------|
-    | False       | True            | True           | False              |
-    +-------------+-----------------+----------------+--------------------+
+    +-----------+---------------+--------------+------------------+
+    | 0 IS NULL | 0 IS NOT NULL | NULL IS NULL | NULL IS NOT NULL |
+    |-----------+---------------+--------------+------------------|
+    | False     | True          | True         | False            |
+    +-----------+---------------+--------------+------------------+
 
 
 REGEXP value test
@@ -180,11 +230,11 @@ expr REGEXP pattern. The expr is string value, pattern is supports regular expre
 
     os> SELECT 'Hello!' REGEXP '.*', 'a' REGEXP 'b';
     fetched rows / total rows = 1/1
-    +------------------------+------------------+
-    | 'Hello!' REGEXP '.*'   | 'a' REGEXP 'b'   |
-    |------------------------+------------------|
-    | 1                      | 0                |
-    +------------------------+------------------+
+    +----------------------+----------------+
+    | 'Hello!' REGEXP '.*' | 'a' REGEXP 'b' |
+    |----------------------+----------------|
+    | 1                    | 0              |
+    +----------------------+----------------+
 
 IN value list test
 ------------------
@@ -193,11 +243,28 @@ Here is an example for IN value test::
 
     os> SELECT 1 in (1, 2), 3 not in (1, 2);
     fetched rows / total rows = 1/1
-    +---------------+-------------------+
-    | 1 in (1, 2)   | 3 not in (1, 2)   |
-    |---------------+-------------------|
-    | True          | True              |
-    +---------------+-------------------+
+    +-------------+-----------------+
+    | 1 in (1, 2) | 3 not in (1, 2) |
+    |-------------+-----------------|
+    | True        | True            |
+    +-------------+-----------------+
+
+BETWEEN range test
+------------------
+
+Here is an example for range test by BETWEEN expression::
+
+    os> SELECT
+    ...  1 BETWEEN 1 AND 3,
+    ...  4 BETWEEN 1 AND 3,
+    ...  4 NOT BETWEEN 1 AND 3;
+    fetched rows / total rows = 1/1
+    +-------------------+-------------------+-----------------------+
+    | 1 BETWEEN 1 AND 3 | 4 BETWEEN 1 AND 3 | 4 NOT BETWEEN 1 AND 3 |
+    |-------------------+-------------------+-----------------------|
+    | True              | False             | True                  |
+    +-------------------+-------------------+-----------------------+
+
 
 Function Call
 =============
@@ -226,11 +293,11 @@ Here is an example for different type of arithmetic expressions::
 
     os> SELECT abs(-1.234), abs(-1 * abs(-5));
     fetched rows / total rows = 1/1
-    +---------------+---------------------+
-    | abs(-1.234)   | abs(-1 * abs(-5))   |
-    |---------------+---------------------|
-    | 1.234         | 5                   |
-    +---------------+---------------------+
+    +-------------+-------------------+
+    | abs(-1.234) | abs(-1 * abs(-5)) |
+    |-------------+-------------------|
+    | 1.234       | 5                 |
+    +-------------+-------------------+
 
 Date function examples
 ----------------------
@@ -239,11 +306,11 @@ Here is an example for different type of arithmetic expressions::
 
     os> SELECT dayofmonth(DATE '2020-07-07');
     fetched rows / total rows = 1/1
-    +---------------------------------+
-    | dayofmonth(DATE '2020-07-07')   |
-    |---------------------------------|
-    | 7                               |
-    +---------------------------------+
+    +-------------------------------+
+    | dayofmonth(DATE '2020-07-07') |
+    |-------------------------------|
+    | 7                             |
+    +-------------------------------+
 
 Limitations
 -----------
diff --git a/docs/user/dql/functions.rst b/docs/user/dql/functions.rst
index 843d6c7e45..687f0d7a70 100644
--- a/docs/user/dql/functions.rst
+++ b/docs/user/dql/functions.rst
@@ -49,21 +49,21 @@ Cast to string example::
 
     os> SELECT cast(true as string) as cbool, cast(1 as string) as cint, cast(DATE '2012-08-07' as string) as cdate
     fetched rows / total rows = 1/1
-    +---------+--------+------------+
-    | cbool   | cint   | cdate      |
-    |---------+--------+------------|
-    | true    | 1      | 2012-08-07 |
-    +---------+--------+------------+
+    +-------+------+------------+
+    | cbool | cint | cdate      |
+    |-------+------+------------|
+    | true  | 1    | 2012-08-07 |
+    +-------+------+------------+
 
 Cast to number example::
 
     os> SELECT cast(true as int) as cbool, cast('1' as integer) as cstring
     fetched rows / total rows = 1/1
-    +---------+-----------+
-    | cbool   | cstring   |
-    |---------+-----------|
-    | 1       | 1         |
-    +---------+-----------+
+    +-------+---------+
+    | cbool | cstring |
+    |-------+---------|
+    | 1     | 1       |
+    +-------+---------+
 
 Cast to date example::
 
@@ -79,11 +79,11 @@ Cast function can be chained::
 
     os> SELECT cast(cast(true as string) as boolean) as cbool
     fetched rows / total rows = 1/1
-    +---------+
-    | cbool   |
-    |---------|
-    | True    |
-    +---------+
+    +-------+
+    | cbool |
+    |-------|
+    | True  |
+    +-------+
 
 
 Mathematical Functions
@@ -95,9 +95,19 @@ ABS
 Description
 >>>>>>>>>>>
 
-Specifications:
+Argument type: INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: same as argument type.
+
+Example::
 
-1. ABS(NUMBER T) -> T
+    os> SELECT ABS(0), ABS(10), ABS(-10), ABS(12.34567), ABS(-12.34567)
+    fetched rows / total rows = 1/1
+    +--------+---------+----------+---------------+----------------+
+    | ABS(0) | ABS(10) | ABS(-10) | ABS(12.34567) | ABS(-12.34567) |
+    |--------+---------+----------+---------------+----------------|
+    | 0      | 10      | 10       | 12.34567      | 12.34567       |
+    +--------+---------+----------+---------------+----------------+
 
 
 ACOS
@@ -129,10 +139,23 @@ ADD
 Description
 >>>>>>>>>>>
 
-Specifications:
+Usage: add(x, y) calculates x plus y.
+
+Argument type: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: Wider number between x and y
 
-1. ADD(NUMBER T, NUMBER) -> T
+Synonyms: Addition Symbol (+)
 
+Example::
+
+    os> SELECT ADD(2, 1), ADD(2.5, 3);
+    fetched rows / total rows = 1/1
+    +-----------+-------------+
+    | ADD(2, 1) | ADD(2.5, 3) |
+    |-----------+-------------|
+    | 3         | 5.5         |
+    +-----------+-------------+
 
 ASIN
 ----
@@ -150,11 +173,11 @@ Example::
 
     os> SELECT ASIN(0)
     fetched rows / total rows = 1/1
-    +-----------+
-    | ASIN(0)   |
-    |-----------|
-    | 0.0       |
-    +-----------+
+    +---------+
+    | ASIN(0) |
+    |---------|
+    | 0.0     |
+    +---------+
 
 
 ATAN
@@ -219,24 +242,68 @@ INTEGER/LONG/FLOAT/DOUBLE -> DOUBLE
 
 Example::
 
-    opensearchsql> SELECT CBRT(8), CBRT(9.261), CBRT(-27);
+    os> SELECT CBRT(8), CBRT(9.261), CBRT(-27);
     fetched rows / total rows = 1/1
-    +-----------+---------------+-------------+
-    | CBRT(8)   | CBRT(9.261)   | CBRT(-27)   |
-    |-----------+---------------+-------------|
-    | 2.0       | 2.1           | -3.0        |
-    +-----------+---------------+-------------+
+    +---------+-------------+-----------+
+    | CBRT(8) | CBRT(9.261) | CBRT(-27) |
+    |---------+-------------+-----------|
+    | 2.0     | 2.1         | -3.0      |
+    +---------+-------------+-----------+
 
 
 CEIL
 ----
 
+An alias for `CEILING`_ function.
+
+
+CEILING
+-------
+
 Description
 >>>>>>>>>>>
 
+Argument type: INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: INTEGER
+
 Specifications:
 
-1. CEIL(NUMBER T) -> T
+Note: `CEIL`_ and CEILING functions have the same implementation & functionality
+
+Limitation: CEILING only works as expected when IEEE 754 double type displays decimal when stored.
+
+Argument type: INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: LONG
+
+Example::
+
+   os> SELECT CEILING(0), CEILING(50.00005), CEILING(-50.00005);
+    fetched rows / total rows = 1/1
+    +------------+-------------------+--------------------+
+    | CEILING(0) | CEILING(50.00005) | CEILING(-50.00005) |
+    |------------+-------------------+--------------------|
+    | 0          | 51                | -50                |
+    +------------+-------------------+--------------------+
+
+   os> SELECT CEILING(3147483647.12345), CEILING(113147483647.12345), CEILING(3147483647.00001);
+    fetched rows / total rows = 1/1
+    +---------------------------+-----------------------------+---------------------------+
+    | CEILING(3147483647.12345) | CEILING(113147483647.12345) | CEILING(3147483647.00001) |
+    |---------------------------+-----------------------------+---------------------------|
+    | 3147483648                | 113147483648                | 3147483648                |
+    +---------------------------+-----------------------------+---------------------------+
+
+Example::
+
+    os> SELECT CEIL(0), CEIL(12.34567), CEIL(-12.34567)
+    fetched rows / total rows = 1/1
+    +---------+----------------+-----------------+
+    | CEIL(0) | CEIL(12.34567) | CEIL(-12.34567) |
+    |---------+----------------+-----------------|
+    | 0       | 13             | -12             |
+    +---------+----------------+-----------------+
 
 
 CONV
@@ -255,11 +322,12 @@ Example::
 
     os> SELECT CONV('12', 10, 16), CONV('2C', 16, 10), CONV(12, 10, 2), CONV(1111, 2, 10)
     fetched rows / total rows = 1/1
-    +----------------------+----------------------+-------------------+---------------------+
-    | CONV('12', 10, 16)   | CONV('2C', 16, 10)   | CONV(12, 10, 2)   | CONV(1111, 2, 10)   |
-    |----------------------+----------------------+-------------------+---------------------|
-    | c                    | 44                   | 1100              | 15                  |
-    +----------------------+----------------------+-------------------+---------------------+
+    +--------------------+--------------------+-----------------+-------------------+
+    | CONV('12', 10, 16) | CONV('2C', 16, 10) | CONV(12, 10, 2) | CONV(1111, 2, 10) |
+    |--------------------+--------------------+-----------------+-------------------|
+    | c                  | 44                 | 1100            | 15                |
+    +--------------------+--------------------+-----------------+-------------------+
+
 
 COS
 ---
@@ -277,11 +345,11 @@ Example::
 
     os> SELECT COS(0)
     fetched rows / total rows = 1/1
-    +----------+
-    | COS(0)   |
-    |----------|
-    | 1.0      |
-    +----------+
+    +--------+
+    | COS(0) |
+    |--------|
+    | 1.0    |
+    +--------+
 
 
 COSH
@@ -290,9 +358,21 @@ COSH
 Description
 >>>>>>>>>>>
 
-Specifications:
+Usage: cosh(x) calculates the hyperbolic cosine of x, defined as (((e^x) + (e^(-x))) / 2)
+
+Argument type: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE
+
+Return Type: DOUBLE
+
+Example::
 
-1. COSH(NUMBER T) -> DOUBLE
+    os> SELECT COSH(2), COSH(1.5)
+    fetched rows / total rows = 1/1
+    +--------------------+-------------------+
+    | COSH(2)            | COSH(1.5)         |
+    |--------------------+-------------------|
+    | 3.7621956910836314 | 2.352409615243247 |
+    +--------------------+-------------------+
 
 
 COT
@@ -334,11 +414,11 @@ Example::
 
     os> SELECT CRC32('MySQL')
     fetched rows / total rows = 1/1
-    +------------------+
-    | CRC32('MySQL')   |
-    |------------------|
-    | 3259397556       |
-    +------------------+
+    +----------------+
+    | CRC32('MySQL') |
+    |----------------|
+    | 3259397556     |
+    +----------------+
 
 
 DEGREES
@@ -370,9 +450,23 @@ DIVIDE
 Description
 >>>>>>>>>>>
 
-Specifications:
+Usage: divide(x, y) calculates x divided by y.
+
+Argument type: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: Wider number between x and y
 
-1. DIVIDE(NUMBER T, NUMBER) -> T
+Synonyms: Division Symbol (/)
+
+Example::
+
+    os> SELECT DIVIDE(10, 2), DIVIDE(7.5, 3);
+    fetched rows / total rows = 1/1
+    +---------------+----------------+
+    | DIVIDE(10, 2) | DIVIDE(7.5, 3) |
+    |---------------+----------------|
+    | 5             | 2.5            |
+    +---------------+----------------+
 
 
 E
@@ -402,9 +496,21 @@ EXP
 Description
 >>>>>>>>>>>
 
-Specifications:
+Usage: EXP() returns Euler's number raised to the specified number.
+
+Argument type: INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: DOUBLE
+
+Example::
 
-1. EXP(NUMBER T) -> T
+    os> SELECT EXP(2)
+    fetched rows / total rows = 1/1
+    +------------------+
+    | EXP(2)           |
+    |------------------|
+    | 7.38905609893065 |
+    +------------------+
 
 
 EXPM1
@@ -413,9 +519,25 @@ EXPM1
 Description
 >>>>>>>>>>>
 
-Specifications:
+Usage: EXPM1(NUMBER T) returns the exponential of T, minus 1.
+
+.. math:: e^{X} - 1
+
+See also `EXP`_.
+
+Argument type: INTEGER/LONG/FLOAT/DOUBLE
 
-1. EXPM1(NUMBER T) -> T
+Return type: DOUBLE
+
+Example::
+
+    os> SELECT EXPM1(-1), EXPM1(0), EXPM1(1), EXPM1(1.5)
+    fetched rows / total rows = 1/1
+    +---------------------+----------+-------------------+-------------------+
+    | EXPM1(-1)           | EXPM1(0) | EXPM1(1)          | EXPM1(1.5)        |
+    |---------------------+----------+-------------------+-------------------|
+    | -0.6321205588285577 | 0.0      | 1.718281828459045 | 3.481689070338065 |
+    +---------------------+----------+-------------------+-------------------+
 
 
 FLOOR
@@ -424,9 +546,39 @@ FLOOR
 Description
 >>>>>>>>>>>
 
-Specifications:
+Usage: FLOOR(T) takes the floor of value T.
+
+Limitation: FLOOR only works as expected when IEEE 754 double type displays decimal when stored.
+
+Argument type: INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: LONG
+
+Example::
+
+   os> SELECT FLOOR(0), FLOOR(50.00005), FLOOR(-50.00005);
+    fetched rows / total rows = 1/1
+    +----------+-----------------+------------------+
+    | FLOOR(0) | FLOOR(50.00005) | FLOOR(-50.00005) |
+    |----------+-----------------+------------------|
+    | 0        | 50              | -51              |
+    +----------+-----------------+------------------+
+
+   os> SELECT FLOOR(3147483647.12345), FLOOR(113147483647.12345), FLOOR(3147483647.00001);
+    fetched rows / total rows = 1/1
+    +-------------------------+---------------------------+-------------------------+
+    | FLOOR(3147483647.12345) | FLOOR(113147483647.12345) | FLOOR(3147483647.00001) |
+    |-------------------------+---------------------------+-------------------------|
+    | 3147483647              | 113147483647              | 3147483647              |
+    +-------------------------+---------------------------+-------------------------+
 
-1. FLOOR(NUMBER T) -> T
+    os> SELECT FLOOR(282474973688888.022), FLOOR(9223372036854775807.022), FLOOR(9223372036854775807.0000001);
+    fetched rows / total rows = 1/1
+    +----------------------------+--------------------------------+------------------------------------+
+    | FLOOR(282474973688888.022) | FLOOR(9223372036854775807.022) | FLOOR(9223372036854775807.0000001) |
+    |----------------------------+--------------------------------+------------------------------------|
+    | 282474973688888            | 9223372036854775807            | 9223372036854775807                |
+    +----------------------------+--------------------------------+------------------------------------+
 
 
 LN
@@ -435,9 +587,21 @@ LN
 Description
 >>>>>>>>>>>
 
-Specifications:
+Returns the natural logarithm of X; that is, the base-e logarithm of X. If X is NULL or less than or equal to 0, the function returns NULL.
+
+Argument type: INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: DOUBLE
+
+Example::
 
-1. LN(NUMBER T) -> DOUBLE
+    os> select LN(1), LN(e()), LN(10), LN(12.34567);
+    fetched rows / total rows = 1/1
+    +-------+---------+-------------------+--------------------+
+    | LN(1) | LN(e()) | LN(10)            | LN(12.34567)       |
+    |-------+---------+-------------------+--------------------|
+    | 0.0   | 1.0     | 2.302585092994046 | 2.5133053943094317 |
+    +-------+---------+-------------------+--------------------+
 
 
 LOG
@@ -446,10 +610,24 @@ LOG
 Description
 >>>>>>>>>>>
 
-Specifications:
+If called with one parameter, this function returns the natural logarithm of X (see `LN`_). If called with two parameters, this function returns the logarithm of X to the base B.
+The inverse of this function (when called with a single argument) is the `EXP`_ function.
+If X is NULL or less than or equal to 0, or if B is NULL or less than or equal to 1, then NULL is returned.
+
+Argument 1 type: INTEGER/LONG/FLOAT/DOUBLE
+Argument 2 type (optional): INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: DOUBLE
+
+Example::
 
-1. LOG(NUMBER T) -> DOUBLE
-2. LOG(NUMBER T, NUMBER) -> DOUBLE
+    os> select LOG(1), LOG(e()), LOG(2, 65536), LOG(10, 10000);
+    fetched rows / total rows = 1/1
+    +--------+----------+---------------+----------------+
+    | LOG(1) | LOG(e()) | LOG(2, 65536) | LOG(10, 10000) |
+    |--------+----------+---------------+----------------|
+    | 0.0    | 1.0      | 16.0          | 4.0            |
+    +--------+----------+---------------+----------------+
 
 
 LOG2
@@ -458,9 +636,21 @@ LOG2
 Description
 >>>>>>>>>>>
 
-Specifications:
+Returns the base-2 logarithm of X. If X is NULL or less than or equal to 0, the function returns NULL. LOG2(X) is useful for finding out how many bits a number requires for storage and equal to LOG(2, X).
+
+Argument type: INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: DOUBLE
+
+Example::
 
-1. LOG2(NUMBER T) -> DOUBLE
+    os> select LOG2(1), LOG2(8), LOG2(65536), LOG2(8.8245);
+    fetched rows / total rows = 1/1
+    +---------+---------+-------------+--------------------+
+    | LOG2(1) | LOG2(8) | LOG2(65536) | LOG2(8.8245)       |
+    |---------+---------+-------------+--------------------|
+    | 0.0     | 3.0     | 16.0        | 3.1415145369723745 |
+    +---------+---------+-------------+--------------------+
 
 
 LOG10
@@ -469,9 +659,21 @@ LOG10
 Description
 >>>>>>>>>>>
 
-Specifications:
+Returns the base-10 logarithm of X. If X is NULL or less than or equal to 0, the function returns NULL. LOG10(X) is equal to LOG(10, X).
+
+Argument type: INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: DOUBLE
+
+Example::
 
-1. LOG10(NUMBER T) -> DOUBLE
+    os> select LOG10(1), LOG10(8), LOG10(1000), LOG10(8.8245);
+    fetched rows / total rows = 1/1
+    +----------+--------------------+-------------+--------------------+
+    | LOG10(1) | LOG10(8)           | LOG10(1000) | LOG10(8.8245)      |
+    |----------+--------------------+-------------+--------------------|
+    | 0.0      | 0.9030899869919435 | 3.0         | 0.9456901074431278 |
+    +----------+--------------------+-------------+--------------------+
 
 
 MOD
@@ -480,21 +682,47 @@ MOD
 Description
 >>>>>>>>>>>
 
-Usage: MOD(n, m) calculates the remainder of the number n divided by m.
+Usage: MOD(x, y) calculates the remainder of the number x divided by y.
 
-Argument type: INTEGER/LONG/FLOAT/DOUBLE
+Argument type: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE
 
-Return type: Wider type between types of n and m if m is nonzero value. If m equals to 0, then returns NULL.
+Return type: Wider number between x and y. If y equals to 0, then returns NULL.
+
+Synonyms: Modulus Symbol (%), `MODULUS`_
 
 Example::
 
     os> SELECT MOD(3, 2), MOD(3.1, 2)
     fetched rows / total rows = 1/1
-    +-------------+---------------+
-    | MOD(3, 2)   | MOD(3.1, 2)   |
-    |-------------+---------------|
-    | 1           | 1.1           |
-    +-------------+---------------+
+    +-----------+-------------+
+    | MOD(3, 2) | MOD(3.1, 2) |
+    |-----------+-------------|
+    | 1         | 1.1         |
+    +-----------+-------------+
+
+MODULUS
+-------
+
+Description
+>>>>>>>>>>>
+
+Usage: MODULUS(x, y) calculates the remainder of the number x divided by y.
+
+Argument type: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: Wider number between x and y. If y equals to 0, then returns NULL.
+
+Synonyms: Modulus Symbol (%), `MOD`_
+
+Example::
+
+    os> SELECT MODULUS(3, 2), MODULUS(3.1, 2)
+    fetched rows / total rows = 1/1
+    +---------------+-----------------+
+    | MODULUS(3, 2) | MODULUS(3.1, 2) |
+    |---------------+-----------------|
+    | 1             | 1.1             |
+    +---------------+-----------------+
 
 
 MULTIPLY
@@ -503,9 +731,24 @@ MULTIPLY
 Description
 >>>>>>>>>>>
 
-Specifications:
+Usage: MULTIPLY(x, y) calculates the multiplication of x and y.
+
+Argument type: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: Wider number between x and y. If y equals to 0, then returns NULL.
+
+Synonyms: Multiplication Symbol (\*)
+
+Example::
+
+    os> SELECT MULTIPLY(1, 2), MULTIPLY(-2, 1), MULTIPLY(1.5, 2);
+    fetched rows / total rows = 1/1
+    +----------------+-----------------+------------------+
+    | MULTIPLY(1, 2) | MULTIPLY(-2, 1) | MULTIPLY(1.5, 2) |
+    |----------------+-----------------+------------------|
+    | 2              | -2              | 3.0              |
+    +----------------+-----------------+------------------+
 
-1. MULTIPLY(NUMBER T, NUMBER) -> NUMBER
 
 PI
 --
@@ -546,11 +789,11 @@ Example::
 
     os> SELECT POW(3, 2), POW(-3, 2), POW(3, -2)
     fetched rows / total rows = 1/1
-    +-------------+--------------+--------------------+
-    | POW(3, 2)   | POW(-3, 2)   | POW(3, -2)         |
-    |-------------+--------------+--------------------|
-    | 9.0         | 9.0          | 0.1111111111111111 |
-    +-------------+--------------+--------------------+
+    +-----------+------------+--------------------+
+    | POW(3, 2) | POW(-3, 2) | POW(3, -2)         |
+    |-----------+------------+--------------------|
+    | 9.0       | 9.0        | 0.1111111111111111 |
+    +-----------+------------+--------------------+
 
 
 POWER
@@ -571,11 +814,11 @@ Example::
 
     os> SELECT POWER(3, 2), POWER(-3, 2), POWER(3, -2)
     fetched rows / total rows = 1/1
-    +---------------+----------------+--------------------+
-    | POWER(3, 2)   | POWER(-3, 2)   | POWER(3, -2)       |
-    |---------------+----------------+--------------------|
-    | 9.0           | 9.0            | 0.1111111111111111 |
-    +---------------+----------------+--------------------+
+    +-------------+--------------+--------------------+
+    | POWER(3, 2) | POWER(-3, 2) | POWER(3, -2)       |
+    |-------------+--------------+--------------------|
+    | 9.0         | 9.0          | 0.1111111111111111 |
+    +-------------+--------------+--------------------+
 
 
 RADIANS
@@ -630,9 +873,21 @@ RINT
 Description
 >>>>>>>>>>>
 
-Specifications:
+Usage: RINT(NUMBER T) returns T rounded to the closest whole integer number
+
+Argument type: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: DOUBLE
 
-1. RINT(NUMBER T) -> T
+Example::
+
+    os> SELECT RINT(1.7);
+    fetched rows / total rows = 1/1
+    +-----------+
+    | RINT(1.7) |
+    |-----------|
+    | 2.0       |
+    +-----------+
 
 
 ROUND
@@ -641,24 +896,25 @@ ROUND
 Description
 >>>>>>>>>>>
 
-Usage: ROUND(x, d) rounds the argument x to d decimal places, d defaults to 0 if not specified
+Usage: ROUND(x, d) rounds the argument x to d decimal places, d defaults to 0 if not specified.
 
-Argument type: INTEGER/LONG/FLOAT/DOUBLE
+Argument 1 type: INTEGER/LONG/FLOAT/DOUBLE
+Argument 2 type (optional): INTEGER
 
 Return type map:
 
-(INTEGER/LONG [,INTEGER]) -> LONG
-(FLOAT/DOUBLE [,INTEGER]) -> LONG
+(INTEGER/LONG[, INTEGER]) -> LONG
+(FLOAT/DOUBLE[, INTEGER]) -> DOUBLE
 
 Example::
 
     os> SELECT ROUND(12.34), ROUND(12.34, 1), ROUND(12.34, -1), ROUND(12, 1)
     fetched rows / total rows = 1/1
-    +----------------+-------------------+--------------------+----------------+
-    | ROUND(12.34)   | ROUND(12.34, 1)   | ROUND(12.34, -1)   | ROUND(12, 1)   |
-    |----------------+-------------------+--------------------+----------------|
-    | 12.0           | 12.3              | 10.0               | 12             |
-    +----------------+-------------------+--------------------+----------------+
+    +--------------+-----------------+------------------+--------------+
+    | ROUND(12.34) | ROUND(12.34, 1) | ROUND(12.34, -1) | ROUND(12, 1) |
+    |--------------+-----------------+------------------+--------------|
+    | 12.0         | 12.3            | 10.0             | 12           |
+    +--------------+-----------------+------------------+--------------+
 
 
 SIGN
@@ -677,11 +933,11 @@ Example::
 
     os> SELECT SIGN(1), SIGN(0), SIGN(-1.1)
     fetched rows / total rows = 1/1
-    +-----------+-----------+--------------+
-    | SIGN(1)   | SIGN(0)   | SIGN(-1.1)   |
-    |-----------+-----------+--------------|
-    | 1         | 0         | -1           |
-    +-----------+-----------+--------------+
+    +---------+---------+------------+
+    | SIGN(1) | SIGN(0) | SIGN(-1.1) |
+    |---------+---------+------------|
+    | 1       | 0       | -1         |
+    +---------+---------+------------+
 
 
 SIGNUM
@@ -690,9 +946,23 @@ SIGNUM
 Description
 >>>>>>>>>>>
 
-Specifications:
+Usage: Returns the sign of the argument as -1, 0, or 1, depending on whether the number is negative, zero, or positive
+
+Argument type: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: INTEGER
 
-1. SIGNUM(NUMBER T) -> T
+Synonyms: `SIGN`_
+
+Example::
+
+    os> SELECT SIGNUM(1), SIGNUM(0), SIGNUM(-1.1)
+    fetched rows / total rows = 1/1
+    +-----------+-----------+--------------+
+    | SIGNUM(1) | SIGNUM(0) | SIGNUM(-1.1) |
+    |-----------+-----------+--------------|
+    | 1         | 0         | -1           |
+    +-----------+-----------+--------------+
 
 
 SIN
@@ -709,13 +979,13 @@ Return type: DOUBLE
 
 Example::
 
-    os> SELECT SIN(0)
+    os> select sin(0), sin(1), sin(pi()), abs(sin(pi())) < 0.0001;
     fetched rows / total rows = 1/1
-    +----------+
-    | SIN(0)   |
-    |----------|
-    | 0.0      |
-    +----------+
+    +--------+--------------------+------------------------+-------------------------+
+    | sin(0) | sin(1)             | sin(pi())              | abs(sin(pi())) < 0.0001 |
+    |--------+--------------------+------------------------+-------------------------|
+    | 0.0    | 0.8414709848078965 | 1.2246467991473532e-16 | True                    |
+    +--------+--------------------+------------------------+-------------------------+
 
 
 SINH
@@ -724,9 +994,21 @@ SINH
 Description
 >>>>>>>>>>>
 
-Specifications:
+Usage: sinh(x) calculate the hyperbolic sine of x, defined as (((e^x) - (e^(-x))) / 2)
 
-1. SINH(NUMBER T) -> DOUBLE
+Argument type: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: DOUBLE
+
+Example::
+
+    os> SELECT SINH(2), SINH(1.5)
+    fetched rows / total rows = 1/1
+    +-------------------+--------------------+
+    | SINH(2)           | SINH(1.5)          |
+    |-------------------+--------------------|
+    | 3.626860407847019 | 2.1292794550948173 |
+    +-------------------+--------------------+
 
 
 SQRT
@@ -748,11 +1030,11 @@ Example::
 
     os> SELECT SQRT(4), SQRT(4.41)
     fetched rows / total rows = 1/1
-    +-----------+--------------+
-    | SQRT(4)   | SQRT(4.41)   |
-    |-----------+--------------|
-    | 2.0       | 2.1          |
-    +-----------+--------------+
+    +---------+------------+
+    | SQRT(4) | SQRT(4.41) |
+    |---------+------------|
+    | 2.0     | 2.1        |
+    +---------+------------+
 
 
 STRCMP
@@ -771,12 +1053,11 @@ Example::
 
     os> SELECT STRCMP('hello', 'world'), STRCMP('hello', 'hello')
     fetched rows / total rows = 1/1
-    +----------------------------+----------------------------+
-    | STRCMP('hello', 'world')   | STRCMP('hello', 'hello')   |
-    |----------------------------+----------------------------|
-    | -1                         | 0                          |
-    +----------------------------+----------------------------+
-
+    +--------------------------+--------------------------+
+    | STRCMP('hello', 'world') | STRCMP('hello', 'hello') |
+    |--------------------------+--------------------------|
+    | -1                       | 0                        |
+    +--------------------------+--------------------------+
 
 
 SUBTRACT
@@ -785,9 +1066,23 @@ SUBTRACT
 Description
 >>>>>>>>>>>
 
-Specifications:
+Usage: subtract(x, y) calculates x minus y.
+
+Argument type: BYTE/SHORT/INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: Wider number between x and y
+
+Synonyms: Subtraction Symbol (-)
+
+Example::
 
-1. SUBTRACT(NUMBER T, NUMBER) -> T
+    os> SELECT SUBTRACT(2, 1), SUBTRACT(2.5, 3);
+    fetched rows / total rows = 1/1
+    +----------------+------------------+
+    | SUBTRACT(2, 1) | SUBTRACT(2.5, 3) |
+    |----------------+------------------|
+    | 1              | -0.5             |
+    +----------------+------------------+
 
 
 TAN
@@ -806,11 +1101,11 @@ Example::
 
     os> SELECT TAN(0)
     fetched rows / total rows = 1/1
-    +----------+
-    | TAN(0)   |
-    |----------|
-    | 0.0      |
-    +----------+
+    +--------+
+    | TAN(0) |
+    |--------|
+    | 0.0    |
+    +--------+
 
 
 TRUNCATE
@@ -831,12 +1126,11 @@ FLOAT/DOUBLE -> DOUBLE
 Example::
 
     fetched rows / total rows = 1/1
-    +----------------------+-----------------------+-------------------+
-    | TRUNCATE(56.78, 1)   | TRUNCATE(56.78, -1)   | TRUNCATE(56, 1)   |
-    |----------------------+-----------------------+-------------------|
-    | 56.7                 | 50                    | 56                |
-    +----------------------+-----------------------+-------------------+
-
+    +--------------------+---------------------+-----------------+
+    | TRUNCATE(56.78, 1) | TRUNCATE(56.78, -1) | TRUNCATE(56, 1) |
+    |--------------------+---------------------+-----------------|
+    | 56.7               | 50                  | 56              |
+    +--------------------+---------------------+-----------------+
 
 
 Date and Time Functions
@@ -849,28 +1143,92 @@ Description
 >>>>>>>>>>>
 
 Usage: adddate(date, INTERVAL expr unit)/ adddate(date, expr) adds the time interval of second argument to date; adddate(date, days) adds the second argument as integer number of days to date.
+If first argument is TIME, today's date is used; if first argument is DATE, time at midnight is used.
 
-Argument type: DATE/DATETIME/TIMESTAMP/STRING, INTERVAL/LONG
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, INTERVAL/LONG
 
 Return type map:
 
-(DATE/DATETIME/TIMESTAMP/STRING, INTERVAL) -> DATETIME
+(DATE/DATETIME/TIMESTAMP/TIME, INTERVAL) -> DATETIME
 
 (DATE, LONG) -> DATE
 
-(DATETIME/TIMESTAMP/STRING, LONG) -> DATETIME
+(DATETIME/TIMESTAMP/TIME, LONG) -> DATETIME
+
+Synonyms: `DATE_ADD`_ when invoked with the INTERVAL form of the second argument.
+
+Antonyms: `SUBDATE`_
+
+Example::
+
+    os> SELECT ADDDATE(DATE('2020-08-26'), INTERVAL 1 HOUR) AS `'2020-08-26' + 1h`, ADDDATE(DATE('2020-08-26'), 1) AS `'2020-08-26' + 1`, ADDDATE(TIMESTAMP('2020-08-26 01:01:01'), 1) AS `ts '2020-08-26 01:01:01' + 1`
+    fetched rows / total rows = 1/1
+    +---------------------+------------------+------------------------------+
+    | '2020-08-26' + 1h   | '2020-08-26' + 1 | ts '2020-08-26 01:01:01' + 1 |
+    |---------------------+------------------+------------------------------|
+    | 2020-08-26 01:00:00 | 2020-08-27       | 2020-08-27 01:01:01          |
+    +---------------------+------------------+------------------------------+
+
+
+ADDTIME
+-------
+
+Description
+>>>>>>>>>>>
+
+Usage: addtime(expr1, expr2) adds expr2 to expr1 and returns the result. If argument is TIME, today's date is used; if argument is DATE, time at midnight is used.
+
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, DATE/DATETIME/TIMESTAMP/TIME
+
+Return type map:
+
+(DATE/DATETIME/TIMESTAMP, DATE/DATETIME/TIMESTAMP/TIME) -> DATETIME
 
-Synonyms: `DATE_ADD`_
+(TIME, DATE/DATETIME/TIMESTAMP/TIME) -> TIME
+
+Antonyms: `SUBTIME`_
 
 Example::
 
-    os> SELECT ADDDATE(DATE('2020-08-26'), INTERVAL 1 HOUR), ADDDATE(DATE('2020-08-26'), 1), ADDDATE(TIMESTAMP('2020-08-26 01:01:01'), 1)
+    os> SELECT ADDTIME(DATE('2008-12-12'), DATE('2008-11-15')) AS `'2008-12-12' + 0 `
+    fetched rows / total rows = 1/1
+    +---------------------+
+    | '2008-12-12' + 0    |
+    |---------------------|
+    | 2008-12-12 00:00:00 |
+    +---------------------+
+
+    os> SELECT ADDTIME(TIME('23:59:59'), DATE('2004-01-01')) AS `'23:59:59' + 0`
+    fetched rows / total rows = 1/1
+    +----------------+
+    | '23:59:59' + 0 |
+    |----------------|
+    | 23:59:59       |
+    +----------------+
+
+    os> SELECT ADDTIME(DATE('2004-01-01'), TIME('23:59:59')) AS `'2004-01-01' + '23:59:59'`
+    fetched rows / total rows = 1/1
+    +---------------------------+
+    | '2004-01-01' + '23:59:59' |
+    |---------------------------|
+    | 2004-01-01 23:59:59       |
+    +---------------------------+
+
+    os> SELECT ADDTIME(TIME('10:20:30'), TIME('00:05:42')) AS `'10:20:30' + '00:05:42'`
+    fetched rows / total rows = 1/1
+    +-------------------------+
+    | '10:20:30' + '00:05:42' |
+    |-------------------------|
+    | 10:26:12                |
+    +-------------------------+
+
+    os> SELECT ADDTIME(TIMESTAMP('2007-02-28 10:20:30'), DATETIME('2002-03-04 20:40:50')) AS `'2007-02-28 10:20:30' + '20:40:50'`
     fetched rows / total rows = 1/1
-    +------------------------------------------------+----------------------------------+------------------------------------------------+
-    | ADDDATE(DATE('2020-08-26'), INTERVAL 1 HOUR)   | ADDDATE(DATE('2020-08-26'), 1)   | ADDDATE(TIMESTAMP('2020-08-26 01:01:01'), 1)   |
-    |------------------------------------------------+----------------------------------+------------------------------------------------|
-    | 2020-08-26 01:00:00                            | 2020-08-27                       | 2020-08-27 01:01:01                            |
-    +------------------------------------------------+----------------------------------+------------------------------------------------+
+    +------------------------------------+
+    | '2007-02-28 10:20:30' + '20:40:50' |
+    |------------------------------------|
+    | 2007-03-01 07:01:20                |
+    +------------------------------------+
 
 
 CONVERT_TZ
@@ -889,86 +1247,86 @@ Example::
 
   os> SELECT CONVERT_TZ('2008-12-25 05:30:00', '+00:00', 'America/Los_Angeles')
     fetched rows / total rows = 1/1
-    +----------------------------------------------------------------------+
-    | CONVERT_TZ('2008-12-25 05:30:00', '+00:00', 'America/Los_Angeles')   |
-    |----------------------------------------------------------------------|
-    | 2008-12-24 21:30:00                                                  |
-    +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | CONVERT_TZ('2008-12-25 05:30:00', '+00:00', 'America/Los_Angeles') |
+    |--------------------------------------------------------------------|
+    | 2008-12-24 21:30:00                                                |
+    +--------------------------------------------------------------------+
 
 
   os> SELECT CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "-10:00")
     fetched rows / total rows = 1/1
-    +---------------------------------------------------------+
-    | CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "-10:00")   |
-    |---------------------------------------------------------|
-    | 2010-10-09 23:10:10                                     |
-    +---------------------------------------------------------+
+    +-------------------------------------------------------+
+    | CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "-10:00") |
+    |-------------------------------------------------------|
+    | 2010-10-09 23:10:10                                   |
+    +-------------------------------------------------------+
 
 When the datedate, or either of the two time zone fields are invalid format, then the result is null. In this example any datetime that is not <yyyy-MM-dd HH:mm:ss> will result in null.
 Example::
 
   os> SELECT CONVERT_TZ("test", "+01:00", "-10:00")
       fetched rows / total rows = 1/1
-      +------------------------------------------+
-      | CONVERT_TZ("test", "+01:00", "-10:00")   |
-      |------------------------------------------|
-      | null                                     |
-      +------------------------------------------+
+      +----------------------------------------+
+      | CONVERT_TZ("test", "+01:00", "-10:00") |
+      |----------------------------------------|
+      | null                                   |
+      +----------------------------------------+
 
 When the datetime, or either of the two time zone fields are invalid format, then the result is null. In this example any timezone that is not <+HH:mm> or <-HH:mm> will result in null.
 Example::
 
   os> SELECT CONVERT_TZ("2010-10-10 10:10:10", "test", "-10:00")
       fetched rows / total rows = 1/1
-      +-------------------------------------------------------+
-      | CONVERT_TZ("2010-10-10 10:10:10", "test", "-10:00")   |
-      |-------------------------------------------------------|
-      | null                                                  |
-      +-------------------------------------------------------+
+      +-----------------------------------------------------+
+      | CONVERT_TZ("2010-10-10 10:10:10", "test", "-10:00") |
+      |-----------------------------------------------------|
+      | null                                                |
+      +-----------------------------------------------------+
 
 The valid timezone range for convert_tz is (-13:59, +14:00) inclusive. Timezones outside of the range will result in null.
 Example::
 
   os> SELECT CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "+14:00")
     fetched rows / total rows = 1/1
-    +---------------------------------------------------------+
-    | CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "+14:00")   |
-    |---------------------------------------------------------|
-    | 2010-10-10 23:10:10                                     |
-    +---------------------------------------------------------+
+    +-------------------------------------------------------+
+    | CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "+14:00") |
+    |-------------------------------------------------------|
+    | 2010-10-10 23:10:10                                   |
+    +-------------------------------------------------------+
 
 The valid timezone range for convert_tz is (-13:59, +14:00) inclusive. Timezones outside of the range will result in null.
 Example::
 
   os> SELECT CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "+14:01")
     fetched rows / total rows = 1/1
-    +---------------------------------------------------------+
-    | CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "+14:01")   |
-    |---------------------------------------------------------|
-    | null                                                    | 
-    +---------------------------------------------------------+
+    +-------------------------------------------------------+
+    | CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "+14:01") |
+    |-------------------------------------------------------|
+    | null                                                  | 
+    +-------------------------------------------------------+
 
 The valid timezone range for convert_tz is (-13:59, +14:00) inclusive. Timezones outside of the range will result in null.
 Example::
 
   os> SELECT CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "-13:59")
     fetched rows / total rows = 1/1
-    +---------------------------------------------------------+
-    | CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "-13:59")   |
-    |---------------------------------------------------------|
-    | 2010-10-09 19:11:10                                     |
-    +---------------------------------------------------------+
+    +-------------------------------------------------------+
+    | CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "-13:59") |
+    |-------------------------------------------------------|
+    | 2010-10-09 19:11:10                                   |
+    +-------------------------------------------------------+
 
 The valid timezone range for convert_tz is (-13:59, +14:00) inclusive. Timezones outside of the range will result in null.
 Example::
 
   os> SELECT CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "-14:00")
     fetched rows / total rows = 1/1
-    +---------------------------------------------------------+
-    | CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "-14:00")   |
-    |---------------------------------------------------------|
-    | null                                                    | 
-    +---------------------------------------------------------+
+    +-------------------------------------------------------+
+    | CONVERT_TZ("2010-10-10 10:10:10", "+01:00", "-14:00") |
+    |-------------------------------------------------------|
+    | null                                                  | 
+    +-------------------------------------------------------+
 
 
 CURDATE
@@ -988,11 +1346,11 @@ Example::
 
     > SELECT CURDATE();
     fetched rows / total rows = 1/1
-    +-------------+
-    | CURDATE()   |
-    |-------------|
-    | 2022-08-02  |
-    +-------------+
+    +------------+
+    | CURDATE()  |
+    |------------|
+    | 2022-08-02 |
+    +------------+
 
 
 CURRENT_DATE
@@ -1007,11 +1365,11 @@ Example::
 
     > SELECT CURRENT_DATE();
     fetched rows / total rows = 1/1
-    +------------------+
-    | CURRENT_DATE()   |
-    |------------------+
-    | 2022-08-02       |
-    +------------------+
+    +----------------+
+    | CURRENT_DATE() |
+    |----------------+
+    | 2022-08-02     |
+    +----------------+
 
 
 CURRENT_TIME
@@ -1026,11 +1384,11 @@ Example::
 
     > SELECT CURRENT_TIME();
     fetched rows / total rows = 1/1
-    +-----------------+
-    | CURRENT_TIME()  |
-    |-----------------+
-    | 15:39:05        |
-    +-----------------+
+    +----------------+
+    | CURRENT_TIME() |
+    |----------------+
+    | 15:39:05       |
+    +----------------+
 
 
 CURRENT_TIMESTAMP
@@ -1045,12 +1403,12 @@ Example::
 
     > SELECT CURRENT_TIMESTAMP();
     fetched rows / total rows = 1/1
-    +-----------------------+
-    | CURRENT_TIMESTAMP()   |
-    |-----------------------+
-    | 2022-08-02 15:54:19   |
-    +-----------------------+
-
+    +---------------------+
+    | CURRENT_TIMESTAMP() |
+    |---------------------+
+    | 2022-08-02 15:54:19 |
+    +---------------------+
+
 
 CURTIME
 -------
@@ -1069,11 +1427,11 @@ Example::
 
     > SELECT CURTIME() as value_1, CURTIME()  as value_2;
     fetched rows / total rows = 1/1
-    +-----------+-----------+
-    | value_1   | value_2   |
-    |-----------+-----------|
-    | 15:39:05  | 15:39:05  |
-    +-----------+-----------+
+    +----------+----------+
+    | value_1  | value_2  |
+    |----------+----------|
+    | 15:39:05 | 15:39:05 |
+    +----------+----------+
 
 
 DATE
@@ -1092,11 +1450,11 @@ Example::
 
     os> SELECT DATE('2020-08-26'), DATE(TIMESTAMP('2020-08-26 13:49:00')), DATE('2020-08-26 13:49:00'), DATE('2020-08-26 13:49')
     fetched rows / total rows = 1/1
-    +----------------------+------------------------------------------+-------------------------------+----------------------------+
-    | DATE('2020-08-26')   | DATE(TIMESTAMP('2020-08-26 13:49:00'))   | DATE('2020-08-26 13:49:00')   | DATE('2020-08-26 13:49')   |
-    |----------------------+------------------------------------------+-------------------------------+----------------------------|
-    | 2020-08-26           | 2020-08-26                               | 2020-08-26                    | 2020-08-26                 |
-    +----------------------+------------------------------------------+-------------------------------+----------------------------+
+    +--------------------+----------------------------------------+-----------------------------+--------------------------+
+    | DATE('2020-08-26') | DATE(TIMESTAMP('2020-08-26 13:49:00')) | DATE('2020-08-26 13:49:00') | DATE('2020-08-26 13:49') |
+    |--------------------+----------------------------------------+-----------------------------+--------------------------|
+    | 2020-08-26         | 2020-08-26                             | 2020-08-26                  | 2020-08-26               |
+    +--------------------+----------------------------------------+-----------------------------+--------------------------+
 
 
 DATETIME
@@ -1111,52 +1469,52 @@ Argument type: DATETIME/STRING
 
 Return type map:
 
-DATETIME, STRING -> DATETIME
+(DATETIME, STRING) -> DATETIME
 
-DATETIME -> DATETIME
+(DATETIME) -> DATETIME
 
 Example::
 
     os> SELECT DATETIME('2008-12-25 05:30:00+00:00', 'America/Los_Angeles')
     fetched rows / total rows = 1/1
-    +----------------------------------------------------------------+
-    | DATETIME('2008-12-25 05:30:00+00:00', 'America/Los_Angeles')   |
-    |----------------------------------------------------------------|
-    | 2008-12-24 21:30:00                                            |
-    +----------------------------------------------------------------+
+    +--------------------------------------------------------------+
+    | DATETIME('2008-12-25 05:30:00+00:00', 'America/Los_Angeles') |
+    |--------------------------------------------------------------|
+    | 2008-12-24 21:30:00                                          |
+    +--------------------------------------------------------------+
 
 This example converts from -10:00 timezone to +10:00 timezone.
 Example::
 
     os> SELECT DATETIME('2004-02-28 23:00:00-10:00', '+10:00')
     fetched rows / total rows = 1/1
-    +---------------------------------------------------+
-    | DATETIME('2004-02-28 23:00:00-10:00', '+10:00')   |
-    |---------------------------------------------------|
-    | 2004-02-29 19:00:00                               |
-    +---------------------------------------------------+
+    +-------------------------------------------------+
+    | DATETIME('2004-02-28 23:00:00-10:00', '+10:00') |
+    |-------------------------------------------------|
+    | 2004-02-29 19:00:00                             |
+    +-------------------------------------------------+
 
 This example uses the timezone -14:00, which is outside of the range -13:59 and +14:00. This results in a null value.
 Example::
 
     os> SELECT DATETIME('2008-01-01 02:00:00', '-14:00')
     fetched rows / total rows = 1/1
-    +---------------------------------------------+
-    | DATETIME('2008-01-01 02:00:00', '-14:00')   |
-    |---------------------------------------------|
-    | null                                        |
-    +---------------------------------------------+
+    +-------------------------------------------+
+    | DATETIME('2008-01-01 02:00:00', '-14:00') |
+    |-------------------------------------------|
+    | null                                      |
+    +-------------------------------------------+
 
 February 30th is not a day, so it returns null.
 Example::
 
     os> SELECT DATETIME('2008-02-30 02:00:00', '-00:00')
     fetched rows / total rows = 1/1
-    +---------------------------------------------+
-    | DATETIME('2008-02-30 02:00:00', '-00:00')   |
-    |---------------------------------------------|
-    | null                                        |
-    +---------------------------------------------+
+    +-------------------------------------------+
+    | DATETIME('2008-02-30 02:00:00', '-00:00') |
+    |-------------------------------------------|
+    | null                                      |
+    +-------------------------------------------+
 
 DATETIME(datetime) examples
 
@@ -1165,33 +1523,34 @@ Example::
 
     os> SELECT DATETIME('2008-02-10 02:00:00')
     fetched rows / total rows = 1/1
-    +-----------------------------------+
-    | DATETIME('2008-02-10 02:00:00')   |
-    |-----------------------------------|
-    | 2008-02-10 02:00:00               |
-    +-----------------------------------+
+    +---------------------------------+
+    | DATETIME('2008-02-10 02:00:00') |
+    |---------------------------------|
+    | 2008-02-10 02:00:00             |
+    +---------------------------------+
 
 February 30th is not a day, so it returns null.
 Example::
 
     os> SELECT DATETIME('2008-02-30 02:00:00')
     fetched rows / total rows = 1/1
-    +-----------------------------------+
-    | DATETIME('2008-02-30 02:00:00')   |
-    |-----------------------------------|
-    | null                              |
-    +-----------------------------------+
+    +---------------------------------+
+    | DATETIME('2008-02-30 02:00:00') |
+    |---------------------------------|
+    | null                            |
+    +---------------------------------+
 
 DATETIME with a datetime and no seperate timezone to convert to returns the datetime object without a timezone.
 Example::
 
     os> SELECT DATETIME('2008-02-10 02:00:00+04:00')
     fetched rows / total rows = 1/1
-    +-----------------------------------------+
-    | DATETIME('2008-02-10 02:00:00+04:00')   |
-    |-----------------------------------------|
-    | 2008-02-10 02:00:00                     |
-    +-----------------------------------------+
+    +---------------------------------------+
+    | DATETIME('2008-02-10 02:00:00+04:00') |
+    |---------------------------------------|
+    | 2008-02-10 02:00:00                   |
+    +---------------------------------------+
+
 
 DATE_ADD
 --------
@@ -1199,29 +1558,25 @@ DATE_ADD
 Description
 >>>>>>>>>>>
 
-Usage: date_add(date, INTERVAL expr unit)/ date_add(date, expr) adds the time interval expr to date
-
-Argument type: DATE/DATETIME/TIMESTAMP/STRING, INTERVAL/LONG
-
-Return type map:
-
-DATE/DATETIME/TIMESTAMP/STRING, INTERVAL -> DATETIME
+Usage: date_add(date, INTERVAL expr unit) adds the interval expr to date. If first argument is TIME, today's date is used; if first argument is DATE, time at midnight is used.
 
-DATE, LONG -> DATE
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, INTERVAL
 
-DATETIME/TIMESTAMP/STRING, LONG -> DATETIME
+Return type: DATETIME
 
 Synonyms: `ADDDATE`_
 
+Antonyms: `DATE_SUB`_
+
 Example::
 
-    os> SELECT DATE_ADD(DATE('2020-08-26'), INTERVAL 1 HOUR), DATE_ADD(DATE('2020-08-26'), 1), DATE_ADD(TIMESTAMP('2020-08-26 01:01:01'), 1)
+    os> SELECT DATE_ADD(DATE('2020-08-26'), INTERVAL 1 HOUR) AS `'2020-08-26' + 1h`, DATE_ADD(TIMESTAMP('2020-08-26 01:01:01'), INTERVAL 1 DAY) as `ts '2020-08-26 01:01:01' + 1d`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------+-----------------------------------+-------------------------------------------------+
-    | DATE_ADD(DATE('2020-08-26'), INTERVAL 1 HOUR)   | DATE_ADD(DATE('2020-08-26'), 1)   | DATE_ADD(TIMESTAMP('2020-08-26 01:01:01'), 1)   |
-    |-------------------------------------------------+-----------------------------------+-------------------------------------------------|
-    | 2020-08-26 01:00:00                             | 2020-08-27                        | 2020-08-27 01:01:01                             |
-    +-------------------------------------------------+-----------------------------------+-------------------------------------------------+
+    +---------------------+-------------------------------+
+    | '2020-08-26' + 1h   | ts '2020-08-26 01:01:01' + 1d |
+    |---------------------+-------------------------------|
+    | 2020-08-26 01:00:00 | 2020-08-27 01:01:01           |
+    +---------------------+-------------------------------+
 
 
 DATE_FORMAT
@@ -1231,6 +1586,7 @@ Description
 >>>>>>>>>>>
 
 Usage: date_format(date, format) formats the date argument using the specifiers in the format argument.
+If an argument of type TIME is provided, the local date is used.
 
 .. list-table:: The following table describes the available specifier arguments.
    :widths: 20 80
@@ -1245,7 +1601,7 @@ Usage: date_format(date, format) formats the date argument using the specifiers
    * - %c
      - Month, numeric (0..12)
    * - %D
-     - Day of the month with English suffix (0th, 1st, 2nd, 3rd, …)
+     - Day of the month with English suffix (0th, 1st, 2nd, 3rd, ...)
    * - %d
      - Day of the month, numeric (00..31)
    * - %e
@@ -1307,19 +1663,19 @@ Usage: date_format(date, format) formats the date argument using the specifiers
    * - x
      - x, for any smallcase/uppercase alphabet except [aydmshiHIMYDSEL]
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP, STRING
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP, STRING
 
 Return type: STRING
 
 Example::
 
-    >od SELECT DATE_FORMAT('1998-01-31 13:14:15.012345', '%T.%f'), DATE_FORMAT(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r')
+    os> SELECT DATE_FORMAT('1998-01-31 13:14:15.012345', '%T.%f'), DATE_FORMAT(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r')
     fetched rows / total rows = 1/1
-    +-----------------------------------------------+----------------------------------------------------------------+
-    | DATE('1998-01-31 13:14:15.012345', '%T.%f')   | DATE(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r')   |
-    |-----------------------------------------------+----------------------------------------------------------------|
-    | '13:14:15.012345'                             | '1998-Jan-31st 01:14:15 PM'                                    |
-    +-----------------------------------------------+----------------------------------------------------------------+
+    +----------------------------------------------------+---------------------------------------------------------------------+
+    | DATE_FORMAT('1998-01-31 13:14:15.012345', '%T.%f') | DATE_FORMAT(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r') |
+    |----------------------------------------------------+---------------------------------------------------------------------|
+    | 13:14:15.012345                                    | 1998-Jan-31st 01:14:15 PM                                           |
+    +----------------------------------------------------+---------------------------------------------------------------------+
 
 
 DATE_SUB
@@ -1328,29 +1684,45 @@ DATE_SUB
 Description
 >>>>>>>>>>>
 
-Usage: date_sub(date, INTERVAL expr unit)/ date_sub(date, expr) subtracts the time interval expr from date
+Usage: date_sub(date, INTERVAL expr unit) subtracts the interval expr from date. If first argument is TIME, today's date is used; if first argument is DATE, time at midnight is used.
 
-Argument type: DATE/DATETIME/TIMESTAMP/STRING, INTERVAL/LONG
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, INTERVAL
 
-Return type map:
+Return type: DATETIME
 
-DATE/DATETIME/TIMESTAMP/STRING, INTERVAL -> DATETIME
+Synonyms: `SUBDATE`_
 
-DATE, LONG -> DATE
+Antonyms: `DATE_ADD`_
 
-DATETIME/TIMESTAMP/STRING, LONG -> DATETIME
+Example::
 
-Synonyms: `SUBDATE`_
+    os> SELECT DATE_SUB(DATE('2008-01-02'), INTERVAL 31 DAY) AS `'2008-01-02' - 31d`, DATE_SUB(TIMESTAMP('2020-08-26 01:01:01'), INTERVAL 1 HOUR) AS `ts '2020-08-26 01:01:01' + 1h`
+    fetched rows / total rows = 1/1
+    +---------------------+-------------------------------+
+    | '2008-01-02' - 31d  | ts '2020-08-26 01:01:01' + 1h |
+    |---------------------+-------------------------------|
+    | 2007-12-02 00:00:00 | 2020-08-26 00:01:01           |
+    +---------------------+-------------------------------+
+
+
+DATEDIFF
+--------
+
+Usage: Calculates the difference of date parts of the given values. If the first argument is time, today's date is used.
+
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, DATE/DATETIME/TIMESTAMP/TIME
+
+Return type: LONG
 
 Example::
 
-    os> SELECT DATE_SUB(DATE('2008-01-02'), INTERVAL 31 DAY), DATE_SUB(DATE('2020-08-26'), 1), DATE_SUB(TIMESTAMP('2020-08-26 01:01:01'), 1)
+    os> SELECT DATEDIFF(TIMESTAMP('2000-01-02 00:00:00'), TIMESTAMP('2000-01-01 23:59:59')) AS `'2000-01-02' - '2000-01-01'`, DATEDIFF(DATE('2001-02-01'), TIMESTAMP('2004-01-01 00:00:00')) AS `'2001-02-01' - '2004-01-01'`, DATEDIFF(TIME('23:59:59'), TIME('00:00:00')) AS `today - today`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------+-----------------------------------+-------------------------------------------------+
-    | DATE_SUB(DATE('2008-01-02'), INTERVAL 31 DAY)   | DATE_SUB(DATE('2020-08-26'), 1)   | DATE_SUB(TIMESTAMP('2020-08-26 01:01:01'), 1)   |
-    |-------------------------------------------------+-----------------------------------+-------------------------------------------------|
-    | 2007-12-02                                      | 2020-08-25                        | 2020-08-25 01:01:01                             |
-    +-------------------------------------------------+-----------------------------------+-------------------------------------------------+
+    +-----------------------------+-----------------------------+---------------+
+    | '2000-01-02' - '2000-01-01' | '2001-02-01' - '2004-01-01' | today - today |
+    |-----------------------------+-----------------------------+---------------|
+    | 1                           | -1064                       | 0             |
+    +-----------------------------+-----------------------------+---------------+
 
 
 DAY
@@ -1359,23 +1731,23 @@ DAY
 Description
 >>>>>>>>>>>
 
-Usage: day(date) extracts the day of the month for date, in the range 1 to 31. The dates with value 0 such as '0000-00-00' or '2008-00-00' are invalid.
+Usage: day(date) extracts the day of the month for date, in the range 1 to 31.
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP
 
 Return type: INTEGER
 
-Synonyms: DAYOFMONTH
+Synonyms: `DAYOFMONTH`_, `DAY_OF_MONTH`_
 
 Example::
 
     os> SELECT DAY(DATE('2020-08-26'))
     fetched rows / total rows = 1/1
-    +---------------------------+
-    | DAY(DATE('2020-08-26'))   |
-    |---------------------------|
-    | 26                        |
-    +---------------------------+
+    +-------------------------+
+    | DAY(DATE('2020-08-26')) |
+    |-------------------------|
+    | 26                      |
+    +-------------------------+
 
 
 DAYNAME
@@ -1394,11 +1766,11 @@ Example::
 
     os> SELECT DAYNAME(DATE('2020-08-26'))
     fetched rows / total rows = 1/1
-    +-------------------------------+
-    | DAYNAME(DATE('2020-08-26'))   |
-    |-------------------------------|
-    | Wednesday                     |
-    +-------------------------------+
+    +-----------------------------+
+    | DAYNAME(DATE('2020-08-26')) |
+    |-----------------------------|
+    | Wednesday                   |
+    +-----------------------------+
 
 
 DAYOFMONTH
@@ -1407,23 +1779,48 @@ DAYOFMONTH
 Description
 >>>>>>>>>>>
 
-Usage: dayofmonth(date) extracts the day of the month for date, in the range 1 to 31. The dates with value 0 such as '0000-00-00' or '2008-00-00' are invalid.
+Usage: dayofmonth(date) extracts the day of the month for date, in the range 1 to 31.
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP
 
 Return type: INTEGER
 
-Synonyms: DAY
+Synonyms: `DAY`_, `DAY_OF_MONTH`_
 
 Example::
 
     os> SELECT DAYOFMONTH(DATE('2020-08-26'))
     fetched rows / total rows = 1/1
-    +----------------------------------+
-    | DAYOFMONTH(DATE('2020-08-26'))   |
-    |----------------------------------|
-    | 26                               |
-    +----------------------------------+
+    +--------------------------------+
+    | DAYOFMONTH(DATE('2020-08-26')) |
+    |--------------------------------|
+    | 26                             |
+    +--------------------------------+
+
+
+DAY_OF_MONTH
+------------
+
+Description
+>>>>>>>>>>>
+
+Usage: day_of_month(date) extracts the day of the month for date, in the range 1 to 31.
+
+Argument type: STRING/DATE/TIME/DATETIME/TIMESTAMP
+
+Return type: INTEGER
+
+Synonyms: `DAY`_, `DAYOFMONTH`_
+
+Example::
+
+    os> SELECT DAY_OF_MONTH('2020-08-26')
+    fetched rows / total rows = 1/1
+    +----------------------------+
+    | DAY_OF_MONTH('2020-08-26') |
+    |----------------------------|
+    | 26                         |
+    +----------------------------+
 
 
 DAYOFWEEK
@@ -1432,7 +1829,9 @@ DAYOFWEEK
 Description
 >>>>>>>>>>>
 
-Usage: dayofweek(date) returns the weekday index for date (1 = Sunday, 2 = Monday, …, 7 = Saturday).
+Usage: dayofweek(date) returns the weekday index for date (1 = Sunday, 2 = Monday, ..., 7 = Saturday).
+
+The `day_of_week` function is also provided as an alias.
 
 Argument type: STRING/DATE/DATETIME/TIMESTAMP
 
@@ -1440,14 +1839,13 @@ Return type: INTEGER
 
 Example::
 
-    os> SELECT DAYOFWEEK(DATE('2020-08-26'))
+    os> SELECT DAYOFWEEK('2020-08-26'), DAY_OF_WEEK('2020-08-26')
     fetched rows / total rows = 1/1
-    +---------------------------------+
-    | DAYOFWEEK(DATE('2020-08-26'))   |
-    |---------------------------------|
-    | 4                               |
-    +---------------------------------+
-
+    +-------------------------+---------------------------+
+    | DAYOFWEEK('2020-08-26') | DAY_OF_WEEK('2020-08-26') |
+    |-------------------------+---------------------------|
+    | 4                       | 4                         |
+    +-------------------------+---------------------------+
 
 
 DAYOFYEAR
@@ -1457,9 +1855,10 @@ Description
 >>>>>>>>>>>
 
 Usage:  dayofyear(date) returns the day of the year for date, in the range 1 to 366.
+If an argument of type `TIME` is given, the function will use the current date.
 The function `day_of_year`_ is also provided as an alias.
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP
 
 Return type: INTEGER
 
@@ -1467,11 +1866,11 @@ Example::
 
     os> SELECT DAYOFYEAR(DATE('2020-08-26'))
     fetched rows / total rows = 1/1
-    +---------------------------------+
-    | DAYOFYEAR(DATE('2020-08-26'))   |
-    |---------------------------------|
-    | 239                             |
-    +---------------------------------+
+    +-------------------------------+
+    | DAYOFYEAR(DATE('2020-08-26')) |
+    |-------------------------------|
+    | 239                           |
+    +-------------------------------+
 
     os> SELECT DAYOFYEAR(DATETIME('2020-08-26 00:00:00'))
     fetched rows / total rows = 1/1
@@ -1483,22 +1882,23 @@ Example::
 
     os> SELECT DAYOFYEAR(TIMESTAMP('2020-08-26 00:00:00'))
     fetched rows / total rows = 1/1
-    +-----------------------------------------------+
-    | DAYOFYEAR(TIMESTAMP('2020-08-26 00:00:00'))   |
-    |-----------------------------------------------|
-    | 239                                           |
-    +-----------------------------------------------+
+    +---------------------------------------------+
+    | DAYOFYEAR(TIMESTAMP('2020-08-26 00:00:00')) |
+    |---------------------------------------------|
+    | 239                                         |
+    +---------------------------------------------+
 
 
 DAY_OF_YEAR
----------
+-----------
 
 Description
 >>>>>>>>>>>
 
+If an argument of type `TIME` is given, the function will use the current date.
 This function is an alias to the `dayofyear`_ function
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP
 
 Return type: INTEGER
 
@@ -1506,11 +1906,11 @@ Example::
 
     os> SELECT DAY_OF_YEAR(DATE('2020-08-26'))
     fetched rows / total rows = 1/1
-    +-----------------------------------+
-    | DAY_OF_YEAR(DATE('2020-08-26'))   |
-    |-----------------------------------|
-    | 239                               |
-    +-----------------------------------+
+    +---------------------------------+
+    | DAY_OF_YEAR(DATE('2020-08-26')) |
+    |---------------------------------|
+    | 239                             |
+    +---------------------------------+
 
     os> SELECT DAY_OF_YEAR(DATETIME('2020-08-26 00:00:00'))
     fetched rows / total rows = 1/1
@@ -1522,12 +1922,83 @@ Example::
 
     os> SELECT DAY_OF_YEAR(TIMESTAMP('2020-08-26 00:00:00'))
     fetched rows / total rows = 1/1
-    +-------------------------------------------------+
-    | DAY_OF_YEAR(TIMESTAMP('2020-08-26 00:00:00'))   |
-    |-------------------------------------------------|
-    | 239                                             |
-    +-------------------------------------------------+
+    +-----------------------------------------------+
+    | DAY_OF_YEAR(TIMESTAMP('2020-08-26 00:00:00')) |
+    |-----------------------------------------------|
+    | 239                                           |
+    +-----------------------------------------------+
+
+
+EXTRACT
+-------
+
+Description
+>>>>>>>>>>>
+
+Usage: extract(part FROM date) returns a LONG with digits in order according to the given 'part' arguments.
+The specific format of the returned long is determined by the table below.
+
+Argument type: PART
+PART must be one of the following tokens in the table below.
+
+The format specifiers found in this table are the same as those found in the `DATE_FORMAT`_ function.
+
+.. list-table:: The following table describes the mapping of a 'part' to a particular format.
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Part
+     - Format
+   * - MICROSECOND
+     - %f
+   * - SECOND
+     - %s
+   * - MINUTE
+     - %i
+   * - HOUR
+     - %H
+   * - DAY
+     - %d
+   * - WEEK
+     - %X
+   * - MONTH
+     - %m
+   * - YEAR
+     - %V
+   * - SECOND_MICROSECOND
+     - %s%f
+   * - MINUTE_MICROSECOND
+     - %i%s%f
+   * - MINUTE_SECOND
+     - %i%s
+   * - HOUR_MICROSECOND
+     - %H%i%s%f
+   * - HOUR_SECOND
+     - %H%i%s
+   * - HOUR_MINUTE
+     - %H%i
+   * - DAY_MICROSECOND
+     - %d%H%i%s%f
+   * - DAY_SECOND
+     - %d%H%i%s
+   * - DAY_MINUTE
+     - %d%H%i
+   * - DAY_HOUR
+     - %d%H%
+   * - YEAR_MONTH
+     - %V%m
 
+Return type: LONG
+
+Example::
+
+    os> SELECT extract(YEAR_MONTH FROM "2023-02-07 10:11:12");
+    fetched rows / total rows = 1/1
+    +------------------------------------------------+
+    | extract(YEAR_MONTH FROM "2023-02-07 10:11:12") |
+    |------------------------------------------------|
+    | 202302                                         |
+    +------------------------------------------------+
 
 
 FROM_DAYS
@@ -1546,11 +2017,11 @@ Example::
 
     os> SELECT FROM_DAYS(733687)
     fetched rows / total rows = 1/1
-    +---------------------+
-    | FROM_DAYS(733687)   |
-    |---------------------|
-    | 2008-10-07          |
-    +---------------------+
+    +-------------------+
+    | FROM_DAYS(733687) |
+    |-------------------|
+    | 2008-10-07        |
+    +-------------------+
 
 
 FROM_UNIXTIME
@@ -1575,19 +2046,42 @@ Examples::
 
     os> select FROM_UNIXTIME(1220249547)
     fetched rows / total rows = 1/1
-    +-----------------------------+
-    | FROM_UNIXTIME(1220249547)   |
-    |-----------------------------|
-    | 2008-09-01 06:12:27         |
-    +-----------------------------+
+    +---------------------------+
+    | FROM_UNIXTIME(1220249547) |
+    |---------------------------|
+    | 2008-09-01 06:12:27       |
+    +---------------------------+
 
     os> select FROM_UNIXTIME(1220249547, '%T')
     fetched rows / total rows = 1/1
-    +-----------------------------------+
-    | FROM_UNIXTIME(1220249547, '%T')   |
-    |-----------------------------------|
-    | 06:12:27                          |
-    +-----------------------------------+
+    +---------------------------------+
+    | FROM_UNIXTIME(1220249547, '%T') |
+    |---------------------------------|
+    | 06:12:27                        |
+    +---------------------------------+
+
+
+GET_FORMAT
+----------
+
+Description
+>>>>>>>>>>>
+
+Usage: Returns a string value containing string format specifiers based on the input arguments.
+
+Argument type: TYPE, STRING
+TYPE must be one of the following tokens: [DATE, TIME, DATETIME, TIMESTAMP].
+STRING must be one of the following tokens: ["USA", "JIS", "ISO", "EUR", "INTERNAL"] (" can be replaced by ').
+
+Examples::
+
+    os> select GET_FORMAT(DATE, 'USA');
+    fetched rows / total rows = 1/1
+    +-------------------------+
+    | GET_FORMAT(DATE, 'USA') |
+    |-------------------------|
+    | %m.%d.%Y                |
+    +-------------------------+
 
 
 HOUR
@@ -1597,6 +2091,7 @@ Description
 >>>>>>>>>>>
 
 Usage: hour(time) extracts the hour value for time. Different from the time of day value, the time value has a large range and can be greater than 23, so the return value of hour(time) can be also greater than 23.
+The function `hour_of_day` is also provided as an alias.
 
 Argument type: STRING/TIME/DATETIME/TIMESTAMP
 
@@ -1604,13 +2099,33 @@ Return type: INTEGER
 
 Example::
 
-    os> SELECT HOUR((TIME '01:02:03'))
+    os> SELECT HOUR('01:02:03'), HOUR_OF_DAY('01:02:03')
     fetched rows / total rows = 1/1
-    +---------------------------+
-    | HOUR((TIME '01:02:03'))   |
-    |---------------------------|
-    | 1                         |
-    +---------------------------+
+    +------------------+-------------------------+
+    | HOUR('01:02:03') | HOUR_OF_DAY('01:02:03') |
+    |------------------+-------------------------|
+    | 1                | 1                       |
+    +------------------+-------------------------+
+
+
+LAST_DAY
+--------
+
+Usage: Returns the last day of the month as a DATE for a valid argument.
+
+Argument type: DATE/DATETIME/STRING/TIMESTAMP/TIME
+
+Return type: DATE
+
+Example::
+
+    os> SELECT last_day('2023-02-06');
+    fetched rows / total rows = 1/1
+    +------------------------+
+    | last_day('2023-02-06') |
+    |------------------------|
+    | 2023-02-28             |
+    +------------------------+
 
 
 LOCALTIMESTAMP
@@ -1678,11 +2193,11 @@ Example::
 
     os> select MAKEDATE(1945, 5.9), MAKEDATE(1984, 1984)
     fetched rows / total rows = 1/1
-    +-----------------------+------------------------+
-    | MAKEDATE(1945, 5.9)   | MAKEDATE(1984, 1984)   |
-    |-----------------------+------------------------|
-    | 1945-01-06            | 1989-06-06             |
-    +-----------------------+------------------------+
+    +---------------------+----------------------+
+    | MAKEDATE(1945, 5.9) | MAKEDATE(1984, 1984) |
+    |---------------------+----------------------|
+    | 1945-01-06          | 1989-06-06           |
+    +---------------------+----------------------+
 
 
 MAKETIME
@@ -1710,11 +2225,11 @@ Example::
 
     os> select MAKETIME(20, 30, 40), MAKETIME(20.2, 49.5, 42.100502)
     fetched rows / total rows = 1/1
-    +------------------------+-----------------------------------+
-    | MAKETIME(20, 30, 40)   | MAKETIME(20.2, 49.5, 42.100502)   |
-    |------------------------+-----------------------------------|
-    | 20:30:40               | 20:50:42.100502                   |
-    +------------------------+-----------------------------------+
+    +----------------------+---------------------------------+
+    | MAKETIME(20, 30, 40) | MAKETIME(20.2, 49.5, 42.100502) |
+    |----------------------+---------------------------------|
+    | 20:30:40             | 20:50:42.100502                 |
+    +----------------------+---------------------------------+
 
 
 MICROSECOND
@@ -1733,11 +2248,11 @@ Example::
 
     os> SELECT MICROSECOND((TIME '01:02:03.123456'))
     fetched rows / total rows = 1/1
-    +-----------------------------------------+
-    | MICROSECOND((TIME '01:02:03.123456'))   |
-    |-----------------------------------------|
-    | 123456                                  |
-    +-----------------------------------------+
+    +---------------------------------------+
+    | MICROSECOND((TIME '01:02:03.123456')) |
+    |---------------------------------------|
+    | 123456                                |
+    +---------------------------------------+
 
 
 MINUTE
@@ -1747,6 +2262,7 @@ Description
 >>>>>>>>>>>
 
 Usage: minute(time) returns the minute for time, in the range 0 to 59.
+The `minute_of_hour` function is provided as an alias.
 
 Argument type: STRING/TIME/DATETIME/TIMESTAMP
 
@@ -1754,13 +2270,36 @@ Return type: INTEGER
 
 Example::
 
-    os> SELECT MINUTE((TIME '01:02:03'))
+    os> SELECT MINUTE(time('01:02:03')), MINUTE_OF_HOUR(time('01:02:03'))
     fetched rows / total rows = 1/1
-    +-----------------------------+
-    | MINUTE((TIME '01:02:03'))   |
-    |-----------------------------|
-    | 2                           |
-    +-----------------------------+
+    +--------------------------+----------------------------------+
+    | MINUTE(time('01:02:03')) | MINUTE_OF_HOUR(time('01:02:03')) |
+    |--------------------------+----------------------------------|
+    | 2                        | 2                                |
+    +--------------------------+----------------------------------+
+
+
+MINUTE_OF_DAY
+-------------
+
+Description
+>>>>>>>>>>>
+
+Usage: minute_of_day(time) returns the minute value for time within a 24 hour day, in the range 0 to 1439.
+
+Argument type: STRING/TIME/DATETIME/TIMESTAMP
+
+Return type: INTEGER
+
+Example::
+
+    os> SELECT MINUTE_OF_DAY((TIME '01:02:03'))
+    fetched rows / total rows = 1/1
+    +----------------------------------+
+    | MINUTE_OF_DAY((TIME '01:02:03')) |
+    |----------------------------------|
+    | 62                               |
+    +----------------------------------+
 
 
 MONTH
@@ -1770,9 +2309,10 @@ Description
 >>>>>>>>>>>
 
 Usage: month(date) returns the month for date, in the range 1 to 12 for January to December. The dates with value 0 such as '0000-00-00' or '2008-00-00' are invalid.
-The function month_of_year is also provided as an alias
+If an argument of type `TIME` is given, the function will use the current date.
+The function `month_of_year` is also provided as an alias.
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP
 
 Return type: INTEGER
 
@@ -1780,20 +2320,20 @@ Example::
 
     os> SELECT MONTH(DATE('2020-08-26'))
     fetched rows / total rows = 1/1
-    +-----------------------------+
-    | MONTH(DATE('2020-08-26'))   |
-    |-----------------------------|
-    | 8                           |
-    +-----------------------------+
+    +---------------------------+
+    | MONTH(DATE('2020-08-26')) |
+    |---------------------------|
+    | 8                         |
+    +---------------------------+
 
 
     os> SELECT MONTH_OF_YEAR(DATE('2020-08-26'))
     fetched rows / total rows = 1/1
-    +-------------------------------------+
-    | MONTH_OF_YEAR(DATE('2020-08-26'))   |
-    |-------------------------------------|
-    | 8                                   |
-    +-------------------------------------+
+    +-----------------------------------+
+    | MONTH_OF_YEAR(DATE('2020-08-26')) |
+    |-----------------------------------|
+    | 8                                 |
+    +-----------------------------------+
 
 
 MONTHNAME
@@ -1812,11 +2352,11 @@ Example::
 
     os> SELECT MONTHNAME(DATE('2020-08-26'))
     fetched rows / total rows = 1/1
-    +---------------------------------+
-    | MONTHNAME(DATE('2020-08-26'))   |
-    |---------------------------------|
-    | August                          |
-    +---------------------------------+
+    +-------------------------------+
+    | MONTHNAME(DATE('2020-08-26')) |
+    |-------------------------------|
+    | August                        |
+    +-------------------------------+
 
 
 NOW
@@ -1859,11 +2399,11 @@ Example::
 
     os> SELECT PERIOD_ADD(200801, 2), PERIOD_ADD(200801, -12)
     fetched rows / total rows = 1/1
-    +-------------------------+---------------------------+
-    | PERIOD_ADD(200801, 2)   | PERIOD_ADD(200801, -12)   |
-    |-------------------------+---------------------------|
-    | 200803                  | 200701                    |
-    +-------------------------+---------------------------+
+    +-----------------------+-------------------------+
+    | PERIOD_ADD(200801, 2) | PERIOD_ADD(200801, -12) |
+    |-----------------------+-------------------------|
+    | 200803                | 200701                  |
+    +-----------------------+-------------------------+
 
 
 PERIOD_DIFF
@@ -1882,11 +2422,11 @@ Example::
 
     os> SELECT PERIOD_DIFF(200802, 200703), PERIOD_DIFF(200802, 201003)
     fetched rows / total rows = 1/1
-    +-------------------------------+-------------------------------+
-    | PERIOD_DIFF(200802, 200703)   | PERIOD_DIFF(200802, 201003)   |
-    |-------------------------------+-------------------------------|
-    | 11                            | -25                           |
-    +-------------------------------+-------------------------------+
+    +-----------------------------+-----------------------------+
+    | PERIOD_DIFF(200802, 200703) | PERIOD_DIFF(200802, 201003) |
+    |-----------------------------+-----------------------------|
+    | 11                          | -25                         |
+    +-----------------------------+-----------------------------+
 
 
 QUARTER
@@ -1905,34 +2445,111 @@ Example::
 
     os> SELECT QUARTER(DATE('2020-08-26'))
     fetched rows / total rows = 1/1
-    +-------------------------------+
-    | QUARTER(DATE('2020-08-26'))   |
-    |-------------------------------|
-    | 3                             |
-    +-------------------------------+
+    +-----------------------------+
+    | QUARTER(DATE('2020-08-26')) |
+    |-----------------------------|
+    | 3                           |
+    +-----------------------------+
 
 
-SECOND
-------
+SEC_TO_TIME
+-----------
 
 Description
 >>>>>>>>>>>
 
-Usage: second(time) returns the second for time, in the range 0 to 59.
+Usage: sec_to_time(number) returns the time in HH:mm:ssss[.nnnnnn] format.
+Note that the function returns a time between 00:00:00 and 23:59:59.
+If an input value is too large (greater than 86399), the function will wrap around and begin returning outputs starting from 00:00:00.
+If an input value is too small (less than 0), the function will wrap around and begin returning outputs counting down from 23:59:59.
 
-Argument type: STRING/TIME/DATETIME/TIMESTAMP
+Argument type: INTEGER, LONG, DOUBLE, FLOAT
 
-Return type: INTEGER
+Return type: TIME
 
 Example::
 
-    os> SELECT SECOND((TIME '01:02:03'))
+    os> SELECT SEC_TO_TIME(3601)
     fetched rows / total rows = 1/1
-    +-----------------------------+
-    | SECOND((TIME '01:02:03'))   |
-    |-----------------------------|
-    | 3                           |
-    +-----------------------------+
+    +-------------------+
+    | SEC_TO_TIME(3601) |
+    |-------------------|
+    | 01:00:01          |
+    +-------------------+
+
+    os> SELECT sec_to_time(1234.123);
+    fetched rows / total rows = 1/1
+    +-----------------------+
+    | sec_to_time(1234.123) |
+    |-----------------------|
+    | 00:20:34.123          |
+    +-----------------------+
+
+    os> SELECT sec_to_time(NULL);
+    fetched rows / total rows = 1/1
+    +-------------------+
+    | sec_to_time(NULL) |
+    |-------------------|
+    | null              |
+    +-------------------+
+
+
+SECOND
+------
+
+Description
+>>>>>>>>>>>
+
+Usage: second(time) returns the second for time, in the range 0 to 59.
+The function `second_of_minute` is provided as an alias
+
+Argument type: STRING/TIME/DATETIME/TIMESTAMP
+
+Return type: INTEGER
+
+Example::
+
+    os> SELECT SECOND((TIME '01:02:03'))
+    fetched rows / total rows = 1/1
+    +---------------------------+
+    | SECOND((TIME '01:02:03')) |
+    |---------------------------|
+    | 3                         |
+    +---------------------------+
+
+    os> SELECT SECOND_OF_MINUTE(time('01:02:03'))
+    fetched rows / total rows = 1/1
+    +------------------------------------+
+    | SECOND_OF_MINUTE(time('01:02:03')) |
+    |------------------------------------|
+    | 3                                  |
+    +------------------------------------+
+
+
+STR_TO_DATE
+-----------
+
+Description
+>>>>>>>>>>>
+
+Usage: str_to_date(string, string) is used to extract a DATETIME from the first argument string using the formats specified in the second argument string.
+The input argument must have enough information to be parsed as a DATE, DATETIME, or TIME.
+Acceptable string format specifiers are the same as those used in the `DATE_FORMAT`_ function.
+It returns NULL when a statement cannot be parsed due to an invalid pair of arguments, and when 0 is provided for any DATE field. Otherwise, it will return a DATETIME with the parsed values (as well as default values for any field that was not parsed).
+
+Argument type: STRING, STRING
+
+Return type: DATETIME
+
+Example::
+
+    OS> SELECT str_to_date("01,5,2013", "%d,%m,%Y")
+    fetched rows / total rows = 1/1
+    +--------------------------------------+
+    | str_to_date("01,5,2013", "%d,%m,%Y") |
+    |--------------------------------------|
+    | 2013-05-01 00:00:00                  |
+    +--------------------------------------+
 
 
 SUBDATE
@@ -1941,29 +2558,93 @@ SUBDATE
 Description
 >>>>>>>>>>>
 
-Usage: subdate(date, INTERVAL expr unit)/ subdate(date, expr) subtracts the time interval expr from date
+Usage: subdate(date, INTERVAL expr unit) / subdate(date, days) subtracts the time interval expr from date; subdate(date, days) subtracts the second argument as integer number of days from date.
+If first argument is TIME, today's date is used; if first argument is DATE, time at midnight is used.
 
-Argument type: DATE/DATETIME/TIMESTAMP/STRING, INTERVAL/LONG
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, INTERVAL/LONG
 
 Return type map:
 
-DATE/DATETIME/TIMESTAMP/STRING, INTERVAL -> DATETIME
+(DATE/DATETIME/TIMESTAMP/TIME, INTERVAL) -> DATETIME
+
+(DATE, LONG) -> DATE
 
-DATE, LONG -> DATE
+(DATETIME/TIMESTAMP/TIME, LONG) -> DATETIME
 
-DATETIME/TIMESTAMP/STRING, LONG -> DATETIME
+Synonyms: `DATE_SUB`_ when invoked with the INTERVAL form of the second argument.
 
-Synonyms: `DATE_SUB`_
+Antonyms: `ADDDATE`_
 
 Example::
 
-    os> SELECT SUBDATE(DATE('2008-01-02'), INTERVAL 31 DAY), SUBDATE(DATE('2020-08-26'), 1), SUBDATE(TIMESTAMP('2020-08-26 01:01:01'), 1)
+    os> SELECT SUBDATE(DATE('2008-01-02'), INTERVAL 31 DAY) AS `'2008-01-02' - 31d`, SUBDATE(DATE('2020-08-26'), 1) AS `'2020-08-26' - 1`, SUBDATE(TIMESTAMP('2020-08-26 01:01:01'), 1) AS `ts '2020-08-26 01:01:01' - 1`
     fetched rows / total rows = 1/1
-    +------------------------------------------------+----------------------------------+------------------------------------------------+
-    | SUBDATE(DATE('2008-01-02'), INTERVAL 31 DAY)   | SUBDATE(DATE('2020-08-26'), 1)   | SUBDATE(TIMESTAMP('2020-08-26 01:01:01'), 1)   |
-    |------------------------------------------------+----------------------------------+------------------------------------------------|
-    | 2007-12-02                                     | 2020-08-25                       | 2020-08-25 01:01:01                            |
-    +------------------------------------------------+----------------------------------+------------------------------------------------+
+    +---------------------+------------------+------------------------------+
+    | '2008-01-02' - 31d  | '2020-08-26' - 1 | ts '2020-08-26 01:01:01' - 1 |
+    |---------------------+------------------+------------------------------|
+    | 2007-12-02 00:00:00 | 2020-08-25       | 2020-08-25 01:01:01          |
+    +---------------------+------------------+------------------------------+
+
+
+SUBTIME
+-------
+
+Description
+>>>>>>>>>>>
+
+Usage: subtime(expr1, expr2) subtracts expr2 from expr1 and returns the result. If argument is TIME, today's date is used; if argument is DATE, time at midnight is used.
+
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, DATE/DATETIME/TIMESTAMP/TIME
+
+Return type map:
+
+(DATE/DATETIME/TIMESTAMP, DATE/DATETIME/TIMESTAMP/TIME) -> DATETIME
+
+(TIME, DATE/DATETIME/TIMESTAMP/TIME) -> TIME
+
+Antonyms: `ADDTIME`_
+
+Example::
+
+    os> SELECT SUBTIME(DATE('2008-12-12'), DATE('2008-11-15')) AS `'2008-12-12' - 0`
+    fetched rows / total rows = 1/1
+    +---------------------+
+    | '2008-12-12' - 0    |
+    |---------------------|
+    | 2008-12-12 00:00:00 |
+    +---------------------+
+
+    os> SELECT SUBTIME(TIME('23:59:59'), DATE('2004-01-01')) AS `'23:59:59' - 0`
+    fetched rows / total rows = 1/1
+    +----------------+
+    | '23:59:59' - 0 |
+    |----------------|
+    | 23:59:59       |
+    +----------------+
+
+    os> SELECT SUBTIME(DATE('2004-01-01'), TIME('23:59:59')) AS `'2004-01-01' - '23:59:59'`
+    fetched rows / total rows = 1/1
+    +---------------------------+
+    | '2004-01-01' - '23:59:59' |
+    |---------------------------|
+    | 2003-12-31 00:00:01       |
+    +---------------------------+
+
+    os> SELECT SUBTIME(TIME('10:20:30'), TIME('00:05:42')) AS `'10:20:30' - '00:05:42'`
+    fetched rows / total rows = 1/1
+    +-------------------------+
+    | '10:20:30' - '00:05:42' |
+    |-------------------------|
+    | 10:14:48                |
+    +-------------------------+
+
+    os> SELECT SUBTIME(TIMESTAMP('2007-03-01 10:20:30'), DATETIME('2002-03-04 20:40:50')) AS `'2007-03-01 10:20:30' - '20:40:50'`
+    fetched rows / total rows = 1/1
+    +------------------------------------+
+    | '2007-03-01 10:20:30' - '20:40:50' |
+    |------------------------------------|
+    | 2007-02-28 13:39:40                |
+    +------------------------------------+
 
 
 SYSDATE
@@ -2009,11 +2690,65 @@ Example::
 
     os> SELECT TIME('13:49:00'), TIME('13:49'), TIME(TIMESTAMP('2020-08-26 13:49:00')), TIME('2020-08-26 13:49:00')
     fetched rows / total rows = 1/1
-    +--------------------+-----------------+------------------------------------------+-------------------------------+
-    | TIME('13:49:00')   | TIME('13:49')   | TIME(TIMESTAMP('2020-08-26 13:49:00'))   | TIME('2020-08-26 13:49:00')   |
-    |--------------------+-----------------+------------------------------------------+-------------------------------|
-    | 13:49:00           | 13:49:00        | 13:49:00                                 | 13:49:00                      |
-    +--------------------+-----------------+------------------------------------------+-------------------------------+
+    +------------------+---------------+----------------------------------------+-----------------------------+
+    | TIME('13:49:00') | TIME('13:49') | TIME(TIMESTAMP('2020-08-26 13:49:00')) | TIME('2020-08-26 13:49:00') |
+    |------------------+---------------+----------------------------------------+-----------------------------|
+    | 13:49:00         | 13:49:00      | 13:49:00                               | 13:49:00                    |
+    +------------------+---------------+----------------------------------------+-----------------------------+
+
+TIME_FORMAT
+-----------
+
+Description
+>>>>>>>>>>>
+
+Usage: time_format(time, format) formats the time argument using the specifiers in the format argument.
+This supports a subset of the time format specifiers available for the `date_format`_ function.
+Using date format specifiers supported by `date_format`_ will return 0 or null.
+Acceptable format specifiers are listed in the table below.
+If an argument of type DATE is passed in, it is treated as a DATETIME at midnight (i.e., 00:00:00).
+
+.. list-table:: The following table describes the available specifier arguments.
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Specifier
+     - Description
+   * - %f
+     - Microseconds (000000..999999)
+   * - %H
+     - Hour (00..23)
+   * - %h
+     - Hour (01..12)
+   * - %I
+     - Hour (01..12)
+   * - %i
+     - Minutes, numeric (00..59)
+   * - %p
+     - AM or PM
+   * - %r
+     - Time, 12-hour (hh:mm:ss followed by AM or PM)
+   * - %S
+     - Seconds (00..59)
+   * - %s
+     - Seconds (00..59)
+   * - %T
+     - Time, 24-hour (hh:mm:ss)
+
+
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP, STRING
+
+Return type: STRING
+
+Example::
+
+    os> SELECT TIME_FORMAT('1998-01-31 13:14:15.012345', '%f %H %h %I %i %p %r %S %s %T')
+    fetched rows / total rows = 1/1
+    +----------------------------------------------------------------------------+
+    | TIME_FORMAT('1998-01-31 13:14:15.012345', '%f %H %h %I %i %p %r %S %s %T') |
+    |----------------------------------------------------------------------------|
+    | 012345 13 01 01 14 PM 01:14:15 PM 15 15 13:14:15                           |
+    +----------------------------------------------------------------------------+
 
 
 TIME_TO_SEC
@@ -2032,11 +2767,34 @@ Example::
 
     os> SELECT TIME_TO_SEC(TIME '22:23:00')
     fetched rows / total rows = 1/1
-    +--------------------------------+
-    | TIME_TO_SEC(TIME '22:23:00')   |
-    |--------------------------------|
-    | 80580                          |
-    +--------------------------------+
+    +------------------------------+
+    | TIME_TO_SEC(TIME '22:23:00') |
+    |------------------------------|
+    | 80580                        |
+    +------------------------------+
+
+
+TIMEDIFF
+--------
+
+Description
+>>>>>>>>>>>
+
+Usage: returns the difference between two time expressions as a time.
+
+Argument type: TIME, TIME
+
+Return type: TIME
+
+Example::
+
+    os> SELECT TIMEDIFF('23:59:59', '13:00:00')
+    fetched rows / total rows = 1/1
+    +----------------------------------+
+    | TIMEDIFF('23:59:59', '13:00:00') |
+    |----------------------------------|
+    | 10:59:59                         |
+    +----------------------------------+
 
 
 TIMESTAMP
@@ -2045,21 +2803,75 @@ TIMESTAMP
 Description
 >>>>>>>>>>>
 
-Usage: timestamp(expr) construct a timestamp type with the input string expr as an timestamp. If the argument is of date/datetime/timestamp type, cast expr to timestamp type with default timezone UTC.
+Usage: timestamp(expr) constructs a timestamp type with the input string `expr` as an timestamp. If the argument is not a string, it casts `expr` to timestamp type with default timezone UTC. If argument is a time, it applies today's date before cast.
+With two arguments `timestamp(expr1, expr2)` adds the time expression `expr2` to the date or datetime expression `expr1` and returns the result as a timestamp value.
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP
+Argument type: STRING/DATE/TIME/DATETIME/TIMESTAMP
 
-Return type: TIMESTAMP
+Return type map:
+
+(STRING/DATE/TIME/DATETIME/TIMESTAMP) -> TIMESTAMP
+
+(STRING/DATE/TIME/DATETIME/TIMESTAMP, STRING/DATE/TIME/DATETIME/TIMESTAMP) -> TIMESTAMP
 
 Example::
 
-    >od SELECT TIMESTAMP('2020-08-26 13:49:00')
+    os> SELECT TIMESTAMP('2020-08-26 13:49:00'), TIMESTAMP('2020-08-26 13:49:00', TIME('12:15:42'))
     fetched rows / total rows = 1/1
-    +------------------------------------+
-    | TIMESTAMP('2020-08-26 13:49:00')   |
-    |------------------------------------|
-    | TIMESTAMP '2020-08-26 13:49:00     |
-    +------------------------------------+
+    +----------------------------------+----------------------------------------------------+
+    | TIMESTAMP('2020-08-26 13:49:00') | TIMESTAMP('2020-08-26 13:49:00', TIME('12:15:42')) |
+    |----------------------------------+----------------------------------------------------|
+    | 2020-08-26 13:49:00              | 2020-08-27 02:04:42                                |
+    +----------------------------------+----------------------------------------------------+
+
+
+TIMESTAMPADD
+------------
+
+Description
+>>>>>>>>>>>
+
+Usage: Returns a DATETIME value based on a passed in DATE/DATETIME/TIME/TIMESTAMP/STRING argument and an INTERVAL and INTEGER argument which determine the amount of time to be added.
+If the third argument is a STRING, it must be formatted as a valid DATETIME. If only a TIME is provided, a DATETIME is still returned with the DATE portion filled in using the current date.
+If the third argument is a DATE, it will be automatically converted to a DATETIME.
+
+Argument type: INTERVAL, INTEGER, DATE/DATETIME/TIME/TIMESTAMP/STRING
+INTERVAL must be one of the following tokens: [MICROSECOND, SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER, YEAR]
+
+Examples::
+
+    os> SELECT TIMESTAMPADD(DAY, 17, '2000-01-01 00:00:00'), TIMESTAMPADD(QUARTER, -1, '2000-01-01 00:00:00')
+    fetched rows / total rows = 1/1
+    +----------------------------------------------+--------------------------------------------------+
+    | TIMESTAMPADD(DAY, 17, '2000-01-01 00:00:00') | TIMESTAMPADD(QUARTER, -1, '2000-01-01 00:00:00') |
+    |----------------------------------------------+--------------------------------------------------|
+    | 2000-01-18 00:00:00                          | 1999-10-01 00:00:00                              |
+    +----------------------------------------------+--------------------------------------------------+
+
+
+TIMESTAMPDIFF
+-------------
+
+Description
+>>>>>>>>>>>
+
+Usage: TIMESTAMPDIFF(interval, start, end) returns the difference between the start and end date/times in interval units.
+If a TIME is provided as an argument, it will be converted to a DATETIME with the DATE portion filled in using the current date.
+Arguments will be automatically converted to a DATETIME/TIME/TIMESTAMP when appropriate.
+Any argument that is a STRING must be formatted as a valid DATETIME.
+
+Argument type: INTERVAL, DATE/DATETIME/TIME/TIMESTAMP/STRING, DATE/DATETIME/TIME/TIMESTAMP/STRING
+INTERVAL must be one of the following tokens: [MICROSECOND, SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER, YEAR]
+
+Examples::
+
+    os> SELECT TIMESTAMPDIFF(YEAR, '1997-01-01 00:00:00', '2001-03-06 00:00:00'), TIMESTAMPDIFF(SECOND, time('00:00:23'), time('00:00:00'))
+    fetched rows / total rows = 1/1
+    +-------------------------------------------------------------------+-----------------------------------------------------------+
+    | TIMESTAMPDIFF(YEAR, '1997-01-01 00:00:00', '2001-03-06 00:00:00') | TIMESTAMPDIFF(SECOND, time('00:00:23'), time('00:00:00')) |
+    |-------------------------------------------------------------------+-----------------------------------------------------------|
+    | 4                                                                 | -23                                                       |
+    +-------------------------------------------------------------------+-----------------------------------------------------------+
 
 
 TO_DAYS
@@ -2078,11 +2890,35 @@ Example::
 
     os> SELECT TO_DAYS(DATE '2008-10-07')
     fetched rows / total rows = 1/1
-    +------------------------------+
-    | TO_DAYS(DATE '2008-10-07')   |
-    |------------------------------|
-    | 733687                       |
-    +------------------------------+
+    +----------------------------+
+    | TO_DAYS(DATE '2008-10-07') |
+    |----------------------------|
+    | 733687                     |
+    +----------------------------+
+
+
+TO_SECONDS
+----------
+
+Description
+>>>>>>>>>>>
+
+Usage: to_seconds(date) returns the number of seconds since the year 0 of the given value. Returns NULL if value is invalid.
+An argument of a LONG type can be used. It must be formatted as YMMDD, YYMMDD, YYYMMDD or YYYYMMDD. Note that a LONG type argument cannot have leading 0s as it will be parsed using an octal numbering system.
+
+Argument type: STRING/LONG/DATE/DATETIME/TIME/TIMESTAMP
+
+Return type: LONG
+
+Example::
+
+    os> SELECT TO_SECONDS(DATE '2008-10-07'), TO_SECONDS(950228)
+    fetched rows / total rows = 1/1
+    +-------------------------------+--------------------+
+    | TO_SECONDS(DATE '2008-10-07') | TO_SECONDS(950228) |
+    |-------------------------------+--------------------|
+    | 63390556800                   | 62961148800        |
+    +-------------------------------+--------------------+
 
 
 UNIX_TIMESTAMP
@@ -2104,19 +2940,88 @@ Examples::
 
     os> select UNIX_TIMESTAMP(20771122143845)
     fetched rows / total rows = 1/1
-    +----------------------------------+
-    | UNIX_TIMESTAMP(20771122143845)   |
-    |----------------------------------|
-    | 3404817525.0                     |
-    +----------------------------------+
+    +--------------------------------+
+    | UNIX_TIMESTAMP(20771122143845) |
+    |--------------------------------|
+    | 3404817525.0                   |
+    +--------------------------------+
 
     os> select UNIX_TIMESTAMP(TIMESTAMP('1996-11-15 17:05:42'))
     fetched rows / total rows = 1/1
-    +----------------------------------------------------+
-    | UNIX_TIMESTAMP(TIMESTAMP('1996-11-15 17:05:42'))   |
-    |----------------------------------------------------|
-    | 848077542.0                                        |
-    +----------------------------------------------------+
+    +--------------------------------------------------+
+    | UNIX_TIMESTAMP(TIMESTAMP('1996-11-15 17:05:42')) |
+    |--------------------------------------------------|
+    | 848077542.0                                      |
+    +--------------------------------------------------+
+
+
+UTC_DATE
+--------
+
+Description
+>>>>>>>>>>>
+
+Returns the current UTC date as a value in 'YYYY-MM-DD'.
+
+Return type: DATE
+
+Specification: UTC_DATE() -> DATE
+
+Example::
+
+    > SELECT UTC_DATE();
+    fetched rows / total rows = 1/1
+    +------------+
+    | utc_date() |
+    |------------|
+    | 2022-10-03 |
+    +------------+
+
+
+UTC_TIME
+--------
+
+Description
+>>>>>>>>>>>
+
+Returns the current UTC time as a value in 'hh:mm:ss'.
+
+Return type: TIME
+
+Specification: UTC_TIME() -> TIME
+
+Example::
+
+    > SELECT UTC_TIME();
+    fetched rows / total rows = 1/1
+    +------------+
+    | utc_time() |
+    |------------|
+    | 17:54:27   |
+    +------------+
+
+
+UTC_TIMESTAMP
+-------------
+
+Description
+>>>>>>>>>>>
+
+Returns the current UTC timestamp as a value in 'YYYY-MM-DD hh:mm:ss'.
+
+Return type: DATETIME
+
+Specification: UTC_TIMESTAMP() -> DATETIME
+
+Example::
+
+    > SELECT UTC_TIMESTAMP();
+    fetched rows / total rows = 1/1
+    +---------------------+
+    | utc_timestamp()     |
+    |---------------------|
+    | 2022-10-03 17:54:28 |
+    +---------------------+
 
 
 WEEK
@@ -2126,7 +3031,8 @@ Description
 >>>>>>>>>>>
 
 Usage: week(date[, mode]) returns the week number for date. If the mode argument is omitted, the default mode 0 is used.
-The function `week_of_year` is also provided as an alias.
+If an argument of type `TIME` is given, the function will use the current date.
+The functions `weekofyear` and `week_of_year` is also provided as an alias.
 
 .. list-table:: The following table describes how the mode argument works.
    :widths: 25 50 25 75
@@ -2135,7 +3041,7 @@ The function `week_of_year` is also provided as an alias.
    * - Mode
      - First day of week
      - Range
-     - Week 1 is the first week …
+     - Week 1 is the first week ...
    * - 0
      - Sunday
      - 0-53
@@ -2169,64 +3075,138 @@ The function `week_of_year` is also provided as an alias.
      - 1-53
      - with a Monday in this year
 
-Argument type: DATE/DATETIME/TIMESTAMP/STRING
+Argument type: DATE/DATETIME/TIME/TIMESTAMP/STRING
+
+Return type: INTEGER
+
+Example::
+
+    os> SELECT WEEK(DATE('2008-02-20')), WEEK(DATE('2008-02-20'), 1)
+    fetched rows / total rows = 1/1
+    +--------------------------+-----------------------------+
+    | WEEK(DATE('2008-02-20')) | WEEK(DATE('2008-02-20'), 1) |
+    |--------------------------+-----------------------------|
+    | 7                        | 8                           |
+    +--------------------------+-----------------------------+
+
+
+WEEKDAY
+-------
+
+Description
+>>>>>>>>>>>
+
+Usage: weekday(date) returns the weekday index for date (0 = Monday, 1 = Tuesday, ..., 6 = Sunday).
+
+It is similar to the `dayofweek`_ function, but returns different indexes for each day.
+
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP
+
+Return type: INTEGER
+
+Example::
+
+    os> SELECT weekday('2020-08-26'), weekday('2020-08-27')
+    fetched rows / total rows = 1/1
+    +-----------------------+-----------------------+
+    | weekday('2020-08-26') | weekday('2020-08-27') |
+    |-----------------------+-----------------------|
+    | 2                     | 3                     |
+    +-----------------------+-----------------------+
+
+
+WEEK_OF_YEAR
+------------
+
+Description
+>>>>>>>>>>>
+
+The week_of_year function is a synonym for the `week`_ function.
+If an argument of type `TIME` is given, the function will use the current date.
+
+Argument type: DATE/DATETIME/TIME/TIMESTAMP/STRING
+
+Return type: INTEGER
+
+Example::
+
+    os> SELECT WEEK_OF_YEAR(DATE('2008-02-20')), WEEK_OF_YEAR(DATE('2008-02-20'), 1)
+    fetched rows / total rows = 1/1
+    +----------------------------------+-------------------------------------+
+    | WEEK_OF_YEAR(DATE('2008-02-20')) | WEEK_OF_YEAR(DATE('2008-02-20'), 1) |
+    |----------------------------------+-------------------------------------|
+    | 7                                | 8                                   |
+    +----------------------------------+-------------------------------------+
+
+
+WEEKOFYEAR
+----------
+
+Description
+>>>>>>>>>>>
+
+The weekofyear function is a synonym for the `week`_ function.
+If an argument of type `TIME` is given, the function will use the current date.
+
+Argument type: DATE/DATETIME/TIME/TIMESTAMP/STRING
 
 Return type: INTEGER
 
 Example::
 
-    os> SELECT WEEK(DATE('2008-02-20')), WEEK(DATE('2008-02-20'), 1)
+    os> SELECT WEEKOFYEAR(DATE('2008-02-20')), WEEKOFYEAR(DATE('2008-02-20'), 1)
     fetched rows / total rows = 1/1
-    +----------------------------+-------------------------------+
-    | WEEK(DATE('2008-02-20'))   | WEEK(DATE('2008-02-20'), 1)   |
-    |----------------------------+-------------------------------|
-    | 7                          | 8                             |
-    +----------------------------+-------------------------------+
+    +--------------------------------+-----------------------------------+
+    | WEEKOFYEAR(DATE('2008-02-20')) | WEEKOFYEAR(DATE('2008-02-20'), 1) |
+    |--------------------------------+-----------------------------------|
+    | 7                              | 8                                 |
+    +--------------------------------+-----------------------------------+
 
-WEEK_OF_YEAR
+
+YEAR
 ----
 
 Description
 >>>>>>>>>>>
 
-The week_of_year function is a synonym for the `week`_ function.
+Usage: year(date) returns the year for date, in the range 1000 to 9999, or 0 for the “zero” date.
 
-Argument type: DATE/DATETIME/TIMESTAMP/STRING
+Argument type: STRING/DATE/DATETIME/TIMESTAMP
 
 Return type: INTEGER
 
 Example::
 
-    os> SELECT WEEK_OF_YEAR(DATE('2008-02-20')), WEEK_OF_YEAR(DATE('2008-02-20'), 1)
+    os> SELECT YEAR(DATE('2020-08-26'))
     fetched rows / total rows = 1/1
-    +------------------------------------+---------------------------------------+
-    | WEEK_OF_YEAR(DATE('2008-02-20'))   | WEEK_OF_YEAR(DATE('2008-02-20'), 1)   |
-    |------------------------------------+---------------------------------------|
-    | 7                                  | 8                                     |
-    +------------------------------------+---------------------------------------+
+    +--------------------------+
+    | YEAR(DATE('2020-08-26')) |
+    |--------------------------|
+    | 2020                     |
+    +--------------------------+
 
 
-YEAR
-----
+YEARWEEK
+--------
 
 Description
 >>>>>>>>>>>
 
-Usage: year(date) returns the year for date, in the range 1000 to 9999, or 0 for the “zero” date.
+Usage: yearweek(date) returns the year and week for date as an integer. It accepts and optional mode arguments aligned with those available for the `WEEK`_ function.
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP
 
 Return type: INTEGER
 
 Example::
 
-    os> SELECT YEAR(DATE('2020-08-26'))
+    os> SELECT YEARWEEK('2020-08-26'), YEARWEEK('2019-01-05', 0)
     fetched rows / total rows = 1/1
-    +----------------------------+
-    | YEAR(DATE('2020-08-26'))   |
-    |----------------------------|
-    | 2020                       |
-    +----------------------------+
+    +------------------------+---------------------------+
+    | YEARWEEK('2020-08-26') | YEARWEEK('2019-01-05', 0) |
+    |------------------------+---------------------------|
+    | 202034                 | 201852                    |
+    +------------------------+---------------------------+
 
 
 String Functions
@@ -2248,11 +3228,11 @@ Example::
 
     os> SELECT ASCII('hello')
     fetched rows / total rows = 1/1
-    +------------------+
-    | ASCII('hello')   |
-    |------------------|
-    | 104              |
-    +------------------+
+    +----------------+
+    | ASCII('hello') |
+    |----------------|
+    | 104            |
+    +----------------+
 
 
 CONCAT
@@ -2261,21 +3241,21 @@ CONCAT
 Description
 >>>>>>>>>>>
 
-Usage: CONCAT(str1, str2) returns str1 and str strings concatenated together.
+Usage: CONCAT(str1, str2, ...., str_9) adds up to 9 strings together. If any of the expressions is a NULL value, it returns NULL.
 
-Argument type: STRING, STRING
+Argument type: STRING, STRING, ...., STRING
 
 Return type: STRING
 
 Example::
 
-    os> SELECT CONCAT('hello', 'world')
+    os> SELECT CONCAT('hello ', 'whole ', 'world', '!'), CONCAT('hello', 'world'), CONCAT('hello', null)
     fetched rows / total rows = 1/1
-    +----------------------------+
-    | CONCAT('hello', 'world')   |
-    |----------------------------|
-    | helloworld                 |
-    +----------------------------+
+    +------------------------------------------+--------------------------+-----------------------+
+    | CONCAT('hello ', 'whole ', 'world', '!') | CONCAT('hello', 'world') | CONCAT('hello', null) |
+    |------------------------------------------+--------------------------+-----------------------|
+    | hello whole world!                       | helloworld               | null                  |
+    +------------------------------------------+--------------------------+-----------------------+
 
 
 CONCAT_WS
@@ -2294,11 +3274,11 @@ Example::
 
     os> SELECT CONCAT_WS(',', 'hello', 'world')
     fetched rows / total rows = 1/1
-    +------------------------------------+
-    | CONCAT_WS(',', 'hello', 'world')   |
-    |------------------------------------|
-    | hello,world                        |
-    +------------------------------------+
+    +----------------------------------+
+    | CONCAT_WS(',', 'hello', 'world') |
+    |----------------------------------|
+    | hello,world                      |
+    +----------------------------------+
 
 
 LEFT
@@ -2314,11 +3294,11 @@ Example::
 
     os> SELECT LEFT('helloworld', 5), LEFT('HELLOWORLD', 0)
     fetched rows / total rows = 1/1
-    +-------------------------+-------------------------+
-    | LEFT('helloworld', 5)   | LEFT('HELLOWORLD', 0)   |
-    |-------------------------+-------------------------|
-    | hello                   |                         |
-    +-------------------------+-------------------------+
+    +-----------------------+-----------------------+
+    | LEFT('helloworld', 5) | LEFT('HELLOWORLD', 0) |
+    |-----------------------+-----------------------|
+    | hello                 |                       |
+    +-----------------------+-----------------------+
 
 
 LENGTH
@@ -2327,10 +3307,6 @@ LENGTH
 Description
 >>>>>>>>>>>
 
-Specifications:
-
-1. LENGTH(STRING) -> INTEGER
-
 Usage: length(str) returns length of string measured in bytes.
 
 Argument type: STRING
@@ -2341,11 +3317,11 @@ Example::
 
     os> SELECT LENGTH('helloworld')
     fetched rows / total rows = 1/1
-    +------------------------+
-    | LENGTH('helloworld')   |
-    |------------------------|
-    | 10                     |
-    +------------------------+
+    +----------------------+
+    | LENGTH('helloworld') |
+    |----------------------|
+    | 10                   |
+    +----------------------+
 
 
 LOCATE
@@ -2367,11 +3343,11 @@ Example::
 
     os> SELECT LOCATE('world', 'helloworld'), LOCATE('world', 'helloworldworld', 7)
     fetched rows / total rows = 1/1
-    +---------------------------------+-----------------------------------------+
-    | LOCATE('world', 'helloworld')   | LOCATE('world', 'helloworldworld', 7)   |
-    |---------------------------------+-----------------------------------------|
-    | 6                               | 11                                      |
-    +---------------------------------+-----------------------------------------+
+    +-------------------------------+---------------------------------------+
+    | LOCATE('world', 'helloworld') | LOCATE('world', 'helloworldworld', 7) |
+    |-------------------------------+---------------------------------------|
+    | 6                             | 11                                    |
+    +-------------------------------+---------------------------------------+
 
 
 LOWER
@@ -2390,11 +3366,11 @@ Example::
 
     os> SELECT LOWER('helloworld'), LOWER('HELLOWORLD')
     fetched rows / total rows = 1/1
-    +-----------------------+-----------------------+
-    | LOWER('helloworld')   | LOWER('HELLOWORLD')   |
-    |-----------------------+-----------------------|
-    | helloworld            | helloworld            |
-    +-----------------------+-----------------------+
+    +---------------------+---------------------+
+    | LOWER('helloworld') | LOWER('HELLOWORLD') |
+    |---------------------+---------------------|
+    | helloworld          | helloworld          |
+    +---------------------+---------------------+
 
 
 LTRIM
@@ -2413,15 +3389,15 @@ Example::
 
     os> SELECT LTRIM('   hello'), LTRIM('hello   ')
     fetched rows / total rows = 1/1
-    +---------------------+---------------------+
-    | LTRIM('   hello')   | LTRIM('hello   ')   |
-    |---------------------+---------------------|
-    | hello               | hello               |
-    +---------------------+---------------------+
+    +-------------------+-------------------+
+    | LTRIM('   hello') | LTRIM('hello   ') |
+    |-------------------+-------------------|
+    | hello             | hello             |
+    +-------------------+-------------------+
 
 
 POSITION
-------
+--------
 
 Description
 >>>>>>>>>>>
@@ -2438,11 +3414,11 @@ Example::
 
     os> SELECT POSITION('world' IN 'helloworld'), POSITION('invalid' IN 'helloworld');
     fetched rows / total rows = 1/1
-    +-------------------------------------+---------------------------------------+
-    | POSITION('world' IN 'helloworld')   | POSITION('invalid' IN 'helloworld')   |
-    |-------------------------------------+---------------------------------------|
-    | 6                                   | 0                                     |
-    +-------------------------------------+---------------------------------------+
+    +-----------------------------------+-------------------------------------+
+    | POSITION('world' IN 'helloworld') | POSITION('invalid' IN 'helloworld') |
+    |-----------------------------------+-------------------------------------|
+    | 6                                 | 0                                   |
+    +-----------------------------------+-------------------------------------+
 
 
 REPLACE
@@ -2461,11 +3437,11 @@ Example::
 
     os> SELECT REPLACE('Hello World!', 'World', 'OpenSearch')
     fetched rows / total rows = 1/1
-    +--------------------------------------------------+
-    | REPLACE('Hello World!', 'World', 'OpenSearch')   |
-    |--------------------------------------------------|
-    | Hello OpenSearch!                                |
-    +--------------------------------------------------+
+    +------------------------------------------------+
+    | REPLACE('Hello World!', 'World', 'OpenSearch') |
+    |------------------------------------------------|
+    | Hello OpenSearch!                              |
+    +------------------------------------------------+
 
 
 REVERSE
@@ -2484,11 +3460,11 @@ Example::
 
     os> SELECT REVERSE('abcde'), REVERSE(null)
     fetched rows / total rows = 1/1
-    +--------------------+-----------------+
-    | REVERSE('abcde')   | REVERSE(null)   |
-    |--------------------+-----------------|
-    | edcba              | null            |
-    +--------------------+-----------------+
+    +------------------+---------------+
+    | REVERSE('abcde') | REVERSE(null) |
+    |------------------+---------------|
+    | edcba            | null          |
+    +------------------+---------------+
 
 
 RIGHT
@@ -2507,11 +3483,11 @@ Example::
 
     os> SELECT RIGHT('helloworld', 5), RIGHT('HELLOWORLD', 0)
     fetched rows / total rows = 1/1
-    +--------------------------+--------------------------+
-    | RIGHT('helloworld', 5)   | RIGHT('HELLOWORLD', 0)   |
-    |--------------------------+--------------------------|
-    | world                    |                          |
-    +--------------------------+--------------------------+
+    +------------------------+------------------------+
+    | RIGHT('helloworld', 5) | RIGHT('HELLOWORLD', 0) |
+    |------------------------+------------------------|
+    | world                  |                        |
+    +------------------------+------------------------+
 
 
 RTRIM
@@ -2530,11 +3506,11 @@ Example::
 
     os> SELECT RTRIM('   hello'), RTRIM('hello   ')
     fetched rows / total rows = 1/1
-    +---------------------+---------------------+
-    | RTRIM('   hello')   | RTRIM('hello   ')   |
-    |---------------------+---------------------|
-    |    hello            | hello               |
-    +---------------------+---------------------+
+    +-------------------+-------------------+
+    | RTRIM('   hello') | RTRIM('hello   ') |
+    |-------------------+-------------------|
+    | hello             | hello             |
+    +-------------------+-------------------+
 
 
 SUBSTRING
@@ -2555,11 +3531,11 @@ Example::
 
     os> SELECT SUBSTRING('helloworld', 5), SUBSTRING('helloworld', 5, 3)
     fetched rows / total rows = 1/1
-    +------------------------------+---------------------------------+
-    | SUBSTRING('helloworld', 5)   | SUBSTRING('helloworld', 5, 3)   |
-    |------------------------------+---------------------------------|
-    | oworld                       | owo                             |
-    +------------------------------+---------------------------------+
+    +----------------------------+-------------------------------+
+    | SUBSTRING('helloworld', 5) | SUBSTRING('helloworld', 5, 3) |
+    |----------------------------+-------------------------------|
+    | oworld                     | owo                           |
+    +----------------------------+-------------------------------+
 
 
 TRIM
@@ -2576,11 +3552,11 @@ Example::
 
     os> SELECT TRIM('   hello'), TRIM('hello   ')
     fetched rows / total rows = 1/1
-    +--------------------+--------------------+
-    | TRIM('   hello')   | TRIM('hello   ')   |
-    |--------------------+--------------------|
-    | hello              | hello              |
-    +--------------------+--------------------+
+    +------------------+------------------+
+    | TRIM('   hello') | TRIM('hello   ') |
+    |------------------+------------------|
+    | hello            | hello            |
+    +------------------+------------------+
 
 
 UPPER
@@ -2599,25 +3575,16 @@ Example::
 
     os> SELECT UPPER('helloworld'), UPPER('HELLOWORLD')
     fetched rows / total rows = 1/1
-    +-----------------------+-----------------------+
-    | UPPER('helloworld')   | UPPER('HELLOWORLD')   |
-    |-----------------------+-----------------------|
-    | HELLOWORLD            | HELLOWORLD            |
-    +-----------------------+-----------------------+
-
-Conditional Functions
-=====================
-
-IF
---
-
-Description
->>>>>>>>>>>
+    +---------------------+---------------------+
+    | UPPER('helloworld') | UPPER('HELLOWORLD') |
+    |---------------------+---------------------|
+    | HELLOWORLD          | HELLOWORLD          |
+    +---------------------+---------------------+
 
-Specifications:
 
-1. IF(BOOLEAN, ES_TYPE, ES_TYPE) -> ES_TYPE
 
+Conditional Functions
+=====================
 
 IFNULL
 ------
@@ -2625,10 +3592,6 @@ IFNULL
 Description
 >>>>>>>>>>>
 
-Specifications:
-
-1. IFNULL(ES_TYPE, ES_TYPE) -> ES_TYPE
-
 Usage: return parameter2 if parameter1 is null, otherwise return parameter1
 
 Argument type: Any
@@ -2639,31 +3602,31 @@ Example One::
 
     os> SELECT IFNULL(123, 321), IFNULL(321, 123)
     fetched rows / total rows = 1/1
-    +--------------------+--------------------+
-    | IFNULL(123, 321)   | IFNULL(321, 123)   |
-    |--------------------+--------------------|
-    | 123                | 321                |
-    +--------------------+--------------------+
+    +------------------+------------------+
+    | IFNULL(123, 321) | IFNULL(321, 123) |
+    |------------------+------------------|
+    | 123              | 321              |
+    +------------------+------------------+
 
 Example Two::
 
     os> SELECT IFNULL(321, 1/0), IFNULL(1/0, 123)
     fetched rows / total rows = 1/1
-    +--------------------+--------------------+
-    | IFNULL(321, 1/0)   | IFNULL(1/0, 123)   |
-    |--------------------+--------------------|
-    | 321                | 123                |
-    +--------------------+--------------------+
+    +------------------+------------------+
+    | IFNULL(321, 1/0) | IFNULL(1/0, 123) |
+    |------------------+------------------|
+    | 321              | 123              |
+    +------------------+------------------+
 
 Example Three::
 
     os> SELECT IFNULL(1/0, 1/0)
     fetched rows / total rows = 1/1
-    +--------------------+
-    | IFNULL(1/0, 1/0)   |
-    |--------------------|
-    | null               |
-    +--------------------+
+    +------------------+
+    | IFNULL(1/0, 1/0) |
+    |------------------|
+    | null             |
+    +------------------+
 
 
 NULLIF
@@ -2672,10 +3635,6 @@ NULLIF
 Description
 >>>>>>>>>>>
 
-Specifications:
-
-1. NULLIF(ES_TYPE, ES_TYPE) -> ES_TYPE
-
 Usage: return null if two parameters are same, otherwise return parameer1
 
 Argument type: Any
@@ -2686,11 +3645,11 @@ Example::
 
     os> SELECT NULLIF(123, 123), NULLIF(321, 123), NULLIF(1/0, 321), NULLIF(321, 1/0), NULLIF(1/0, 1/0)
     fetched rows / total rows = 1/1
-    +--------------------+--------------------+--------------------+--------------------+--------------------+
-    | NULLIF(123, 123)   | NULLIF(321, 123)   | NULLIF(1/0, 321)   | NULLIF(321, 1/0)   | NULLIF(1/0, 1/0)   |
-    |--------------------+--------------------+--------------------+--------------------+--------------------|
-    | null               | 321                | null               | 321                | null               |
-    +--------------------+--------------------+--------------------+--------------------+--------------------+
+    +------------------+------------------+------------------+------------------+------------------+
+    | NULLIF(123, 123) | NULLIF(321, 123) | NULLIF(1/0, 321) | NULLIF(321, 1/0) | NULLIF(1/0, 1/0) |
+    |------------------+------------------+------------------+------------------+------------------|
+    | null             | 321              | null             | 321              | null             |
+    +------------------+------------------+------------------+------------------+------------------+
 
 
 ISNULL
@@ -2699,10 +3658,6 @@ ISNULL
 Description
 >>>>>>>>>>>
 
-Specifications:
-
-1. ISNULL(ES_TYPE) -> INTEGER
-
 Usage: return true if parameter is null, otherwise return false
 
 Argument type: Any
@@ -2713,45 +3668,45 @@ Example::
 
     os> SELECT ISNULL(1/0), ISNULL(123)
     fetched rows / total rows = 1/1
-    +---------------+---------------+
-    | ISNULL(1/0)   | ISNULL(123)   |
-    |---------------+---------------|
-    | True          | False         |
-    +---------------+---------------+
+    +-------------+-------------+
+    | ISNULL(1/0) | ISNULL(123) |
+    |-------------+-------------|
+    | True        | False       |
+    +-------------+-------------+
+
 
 IF
-------
+--
 
 Description
 >>>>>>>>>>>
 
-Specifications:
-
-1. IF(condition, ES_TYPE1, ES_TYPE2) -> ES_TYPE1 or ES_TYPE2
-
 Usage: if first parameter is true, return second parameter, otherwise return third one.
 
 Argument type: condition as BOOLEAN, second and third can by any type
 
-Return type: Any (NOTE : if parameters #2 and #3 has different type, you will fail semantic check"
+Return type: Any
+
+NOTE : if parameters #2 and #3 has different type, you will fail semantic check
 
 Example::
 
     os> SELECT IF(100 > 200, '100', '200')
     fetched rows / total rows = 1/1
-    +-------------------------------+
-    | IF(100 > 200, '100', '200')   |
-    |-------------------------------|
-    | 200                           |
-    +-------------------------------+
+    +-----------------------------+
+    | IF(100 > 200, '100', '200') |
+    |-----------------------------|
+    | 200                         |
+    +-----------------------------+
 
     os> SELECT IF(200 > 100, '100', '200')
     fetched rows / total rows = 1/1
-    +-------------------------------+
-    | IF(200 > 100, '100', '200')   |
-    |-------------------------------|
-    | 100                           |
-    +-------------------------------+
+    +-----------------------------+
+    | IF(200 > 100, '100', '200') |
+    |-----------------------------|
+    | 100                         |
+    +-----------------------------+
+
 
 CASE
 ----
@@ -2805,11 +3760,11 @@ Here are examples for simple case syntax::
     ...     ELSE TRIM(' Absolute three ')
     ...   END AS func_result;
     fetched rows / total rows = 1/1
-    +---------------+-------------------+----------------+
-    | simple_case   | func_case_value   | func_result    |
-    |---------------+-------------------+----------------|
-    | One           | Absolute two      | Absolute three |
-    +---------------+-------------------+----------------+
+    +-------------+-----------------+----------------+
+    | simple_case | func_case_value | func_result    |
+    |-------------+-----------------+----------------|
+    | One         | Absolute two    | Absolute three |
+    +-------------+-----------------+----------------+
 
 Here are examples for searched case syntax::
 
@@ -2825,11 +3780,11 @@ Here are examples for searched case syntax::
     ...     WHEN 'hello' = 'world' THEN 'Hello'
     ...   END AS no_else;
     fetched rows / total rows = 1/1
-    +-----------------+------------------+-----------+
-    | single_search   | multi_searches   | no_else   |
-    |-----------------+------------------+-----------|
-    | One             | Hello            | null      |
-    +-----------------+------------------+-----------+
+    +---------------+----------------+---------+
+    | single_search | multi_searches | no_else |
+    |---------------+----------------+---------|
+    | One           | Hello          | null    |
+    +---------------+----------------+---------+
 
 
 RELEVANCE
@@ -2864,26 +3819,26 @@ Example with only ``field`` and ``query`` expressions, and all other parameters
 
     os> SELECT lastname, address FROM accounts WHERE match(address, 'Street');
     fetched rows / total rows = 2/2
-    +------------+--------------------+
-    | lastname   | address            |
-    |------------+--------------------|
-    | Bond       | 671 Bristol Street |
-    | Bates      | 789 Madison Street |
-    +------------+--------------------+
+    +----------+--------------------+
+    | lastname | address            |
+    |----------+--------------------|
+    | Bond     | 671 Bristol Street |
+    | Bates    | 789 Madison Street |
+    +----------+--------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
     os> SELECT lastname FROM accounts WHERE match(firstname, 'Hattie', operator='AND', boost=2.0);
     fetched rows / total rows = 1/1
-    +------------+
-    | lastname   |
-    |------------|
-    | Bond       |
-    +------------+
+    +----------+
+    | lastname |
+    |----------|
+    | Bond     |
+    +----------+
 
 
 MATCHQUERY
------
+----------
 
 Description
 >>>>>>>>>>>
@@ -2894,25 +3849,36 @@ Example with only ``field`` and ``query`` expressions, and all other parameters
 
     os> SELECT lastname, address FROM accounts WHERE matchquery(address, 'Street');
     fetched rows / total rows = 2/2
-    +------------+--------------------+
-    | lastname   | address            |
-    |------------+--------------------|
-    | Bond       | 671 Bristol Street |
-    | Bates      | 789 Madison Street |
-    +------------+--------------------+
+    +----------+--------------------+
+    | lastname | address            |
+    |----------+--------------------|
+    | Bond     | 671 Bristol Street |
+    | Bates    | 789 Madison Street |
+    +----------+--------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
     os> SELECT lastname FROM accounts WHERE matchquery(firstname, 'Hattie', operator='AND', boost=2.0);
     fetched rows / total rows = 1/1
-    +------------+
-    | lastname   |
-    |------------|
-    | Bond       |
-    +------------+
+    +----------+
+    | lastname |
+    |----------|
+    | Bond     |
+    +----------+
+
+    The matchquery function also supports an alternative syntax::
+
+    os> SELECT firstname FROM accounts WHERE firstname = matchquery('Hattie');
+    fetched rows / total rows = 1/1
+    +-----------+
+    | firstname |
+    |-----------|
+    | Hattie    |
+    +-----------+
+
 
 MATCH_QUERY
------
+-----------
 
 Description
 >>>>>>>>>>>
@@ -2923,22 +3889,32 @@ Example with only ``field`` and ``query`` expressions, and all other parameters
 
     os> SELECT lastname, address FROM accounts WHERE match_query(address, 'Street');
     fetched rows / total rows = 2/2
-    +------------+--------------------+
-    | lastname   | address            |
-    |------------+--------------------|
-    | Bond       | 671 Bristol Street |
-    | Bates      | 789 Madison Street |
-    +------------+--------------------+
+    +----------+--------------------+
+    | lastname | address            |
+    |----------+--------------------|
+    | Bond     | 671 Bristol Street |
+    | Bates    | 789 Madison Street |
+    +----------+--------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
     os> SELECT lastname FROM accounts WHERE match_query(firstname, 'Hattie', operator='AND', boost=2.0);
     fetched rows / total rows = 1/1
-    +------------+
-    | lastname   |
-    |------------|
-    | Bond       |
-    +------------+
+    +----------+
+    | lastname |
+    |----------|
+    | Bond     |
+    +----------+
+
+The match_query function also supports an alternative syntax::
+
+    os> SELECT firstname FROM accounts WHERE firstname = match_query('Hattie');
+    fetched rows / total rows = 1/1
+    +-----------+
+    | firstname |
+    |-----------|
+    | Hattie    |
+    +-----------+
 
 
 MATCH_PHRASE
@@ -2979,9 +3955,27 @@ Another example to show how to set custom values for the optional parameters::
     | Alan Alexander Milne | Winnie-the-Pooh          |
     +----------------------+--------------------------+
 
+The match_phrase function also supports an alternative syntax::
+
+    os> SELECT firstname FROM accounts WHERE firstname = match_phrase('Hattie');
+    fetched rows / total rows = 1/1
+    +-----------+
+    | firstname |
+    |-----------|
+    | Hattie    |
+    +-----------+
+
+    os> SELECT firstname FROM accounts WHERE firstname = matchphrase('Hattie');
+    fetched rows / total rows = 1/1
+    +-----------+
+    | firstname |
+    |-----------|
+    | Hattie    |
+    +-----------+
+
 
 MATCH_BOOL_PREFIX
------
+-----------------
 
 Description
 >>>>>>>>>>>
@@ -3004,25 +3998,26 @@ Example with only ``field`` and ``query`` expressions, and all other parameters
 
     os> SELECT firstname, address FROM accounts WHERE match_bool_prefix(address, 'Bristol Stre');
     fetched rows / total rows = 2/2
-    +-------------+--------------------+
-    | firstname   | address            |
-    |-------------+--------------------|
-    | Hattie      | 671 Bristol Street |
-    | Nanette     | 789 Madison Street |
-    +-------------+--------------------+
+    +-----------+--------------------+
+    | firstname | address            |
+    |-----------+--------------------|
+    | Hattie    | 671 Bristol Street |
+    | Nanette   | 789 Madison Street |
+    +-----------+--------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
     os> SELECT firstname, address FROM accounts WHERE match_bool_prefix(address, 'Bristol Street', minimum_should_match=2);
     fetched rows / total rows = 1/1
-    +-------------+--------------------+
-    | firstname   | address            |
-    |-------------+--------------------|
-    | Hattie      | 671 Bristol Street |
-    +-------------+--------------------+
+    +-----------+--------------------+
+    | firstname | address            |
+    |-----------+--------------------|
+    | Hattie    | 671 Bristol Street |
+    +-----------+--------------------+
+
 
 MATCH_PHRASE_PREFIX
-------------
+-------------------
 
 Description
 >>>>>>>>>>>
@@ -3103,24 +4098,43 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> select * from books where multi_match(['title'], 'Pooh House');
+    os> select id, title, author from books where multi_match(['title'], 'Pooh House');
     fetched rows / total rows = 2/2
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    | 2    | Winnie-the-Pooh          | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    | 2  | Winnie-the-Pooh          | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> select * from books where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default);
+    os> select id, title, author from books where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default);
+    fetched rows / total rows = 1/1
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
+
+The multi_match function also supports an alternative syntax::
+
+    os> SELECT firstname FROM accounts WHERE firstname = multi_match('Hattie');
+    fetched rows / total rows = 1/1
+    +-----------+
+    | firstname |
+    |-----------|
+    | Hattie    |
+    +-----------+
+
+    os> SELECT firstname FROM accounts WHERE firstname = multimatch('Hattie');
     fetched rows / total rows = 1/1
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +-----------+
+    | firstname |
+    |-----------|
+    | Hattie    |
+    +-----------+
+
 
 SIMPLE_QUERY_STRING
 -------------------
@@ -3154,24 +4168,24 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> select * from books where simple_query_string(['title'], 'Pooh House');
+    os> select id, title, author from books where simple_query_string(['title'], 'Pooh House');
     fetched rows / total rows = 2/2
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    | 2    | Winnie-the-Pooh          | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    | 2  | Winnie-the-Pooh          | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> select * from books where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND');
+    os> select id, title, author from books where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND');
     fetched rows / total rows = 1/1
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
 
 
 QUERY_STRING
@@ -3216,24 +4230,24 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> select * from books where query_string(['title'], 'Pooh House');
+    os> select id, title, author from books where query_string(['title'], 'Pooh House');
     fetched rows / total rows = 2/2
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    | 2    | Winnie-the-Pooh          | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    | 2  | Winnie-the-Pooh          | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> select * from books where query_string(['title'], 'Pooh House', default_operator='AND');
+    os> select id, title, author from books where query_string(['title'], 'Pooh House', default_operator='AND');
     fetched rows / total rows = 1/1
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
 
 
 QUERY
@@ -3278,27 +4292,71 @@ Available parameters include:
 
 Example with only ``query_expressions``, and all other parameters are set default values::
 
-    os> select * from books where query('title:Pooh House');
+    os> select id, title, author from books where query('title:Pooh House');
     fetched rows / total rows = 2/2
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    | 2    | Winnie-the-Pooh          | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    | 2  | Winnie-the-Pooh          | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> select * from books where query('title:Pooh House', default_operator='AND');
+    os> select id, title, author from books where query('title:Pooh House', default_operator='AND');
+    fetched rows / total rows = 1/1
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
+
+
+SCORE
+-----
+
+Description
+>>>>>>>>>>>
+
+``score(relevance_expression[, boost])``
+``score_query(relevance_expression[, boost])``
+``scorequery(relevance_expression[, boost])``
+
+The `SCORE()` function calculates the `_score` of any documents matching the enclosed relevance-based expression. The `SCORE()`
+function expects one argument with an optional second argument. The first argument is the relevance-based search expression.
+The second argument is an optional floating-point boost to the score (the default value is 1.0).
+
+The `SCORE()` function sets `track_scores=true` for OpenSearch requests.  Without it, `_score` fields may return `null` for some
+relevance-based search expressions.
+
+Please refer to examples below:
+
+| ``score(query('Tags:taste OR Body:taste', ...), 2.0)``
+
+The `score_query` and `scorequery` functions are alternative names for the `score` function.
+
+Example boosting score::
+
+    os> select id, title, author, _score from books where score(query('title:Pooh House', default_operator='AND'), 2.0);
     fetched rows / total rows = 1/1
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+-----------+
+    | id | title                    | author               | _score    |
+    |----+--------------------------+----------------------+-----------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne | 1.5884793 |
+    +----+--------------------------+----------------------+-----------+
+
+    os> select id, title, author, _score from books where score(query('title:Pooh House', default_operator='AND'), 5.0) OR score(query('title:Winnie', default_operator='AND'), 1.5);
+    fetched rows / total rows = 2/2
+    +----+--------------------------+----------------------+-----------+
+    | id | title                    | author               | _score    |
+    |----+--------------------------+----------------------+-----------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne | 3.9711983 |
+    | 2  | Winnie-the-Pooh          | Alan Alexander Milne | 1.1581701 |
+    +----+--------------------------+----------------------+-----------+
+
 
 HIGHLIGHT
-------------
+---------
 
 Description
 >>>>>>>>>>>
@@ -3322,8 +4380,9 @@ Example searching for field Tags::
     | [Winnie-the-<em>Pooh</em>]                   |
     +----------------------------------------------+
 
+
 WILDCARD_QUERY
-------------
+--------------
 
 Description
 >>>>>>>>>>>
@@ -3375,6 +4434,64 @@ Another example to show how to set custom values for the optional parameters::
     | tEsT wIlDcArD sensitive cases             |
     +-------------------------------------------+
 
+
+NESTED
+------
+
+Description
+>>>>>>>>>>>
+
+``nested(field | [field, path])``
+
+The ``nested`` function maps to the ``nested`` query used in search engine. It returns nested field types in documents that match the provided specified field(s).
+If the user does not provide the ``path`` parameter it will be generated dynamically. For example the ``field`` ``user.office.cubicle`` would dynamically generate the path
+``user.office``.
+
+Example with ``field`` and ``path`` parameters::
+
+    os> SELECT nested(message.info, message) FROM nested;
+    fetched rows / total rows = 2/2
+    +-------------------------------+
+    | nested(message.info, message) |
+    |-------------------------------|
+    | a                             |
+    | b                             |
+    +-------------------------------+
+
+Example with ``field.*`` used in SELECT clause::
+
+    os> SELECT nested(message.*) FROM nested;
+    fetched rows / total rows = 2/2
+    +------------------------+---------------------------+----------------------+
+    | nested(message.author) | nested(message.dayOfWeek) | nested(message.info) |
+    |------------------------+---------------------------+----------------------|
+    | e                      | 1                         | a                    |
+    | f                      | 2                         | b                    |
+    +------------------------+---------------------------+----------------------+
+
+
+Example with ``field`` and ``path`` parameters in the SELECT and WHERE clause::
+
+    os> SELECT nested(message.info, message) FROM nested WHERE nested(message.info, message) = 'b';
+    fetched rows / total rows = 1/1
+    +-------------------------------+
+    | nested(message.info, message) |
+    |-------------------------------|
+    | b                             |
+    +-------------------------------+
+
+Example with ``field`` and ``path`` parameters in the SELECT and ORDER BY clause::
+
+    os> SELECT nested(message.info, message) FROM nested ORDER BY nested(message.info, message) DESC;
+    fetched rows / total rows = 2/2
+    +-------------------------------+
+    | nested(message.info, message) |
+    |-------------------------------|
+    | b                             |
+    | a                             |
+    +-------------------------------+
+
+
 System Functions
 ================
 
@@ -3394,10 +4511,9 @@ Example::
 
     os> select typeof(DATE('2008-04-14')) as `typeof(date)`, typeof(1) as `typeof(int)`, typeof(now()) as `typeof(now())`, typeof(accounts) as `typeof(column)` from people
     fetched rows / total rows = 1/1
-    +----------------+---------------+-----------------+------------------+
-    | typeof(date)   | typeof(int)   | typeof(now())   | typeof(column)   |
-    |----------------+---------------+-----------------+------------------|
-    | DATE           | INTEGER       | DATETIME        | STRUCT           |
-    +----------------+---------------+-----------------+------------------+
-
+    +--------------+-------------+---------------+----------------+
+    | typeof(date) | typeof(int) | typeof(now()) | typeof(column) |
+    |--------------+-------------+---------------+----------------|
+    | DATE         | INTEGER     | TIMESTAMP     | OBJECT         |
+    +--------------+-------------+---------------+----------------+
 
diff --git a/docs/user/dql/metadata.rst b/docs/user/dql/metadata.rst
index 7ffc2ffe38..2b8e6e52b1 100644
--- a/docs/user/dql/metadata.rst
+++ b/docs/user/dql/metadata.rst
@@ -36,21 +36,21 @@ Example 1: Show All Indices Information
 
 SQL query::
 
-	POST /_plugins/_sql
-	{
-	  "query" : "SHOW TABLES LIKE %"
-	}
-
-Result set:
-
-+---------+-----------+----------------+----------+-------+--------+----------+---------+-------------------------+--------------+
-|TABLE_CAT|TABLE_SCHEM|      TABLE_NAME|TABLE_TYPE|REMARKS|TYPE_CAT|TYPE_SCHEM|TYPE_NAME|SELF_REFERENCING_COL_NAME|REF_GENERATION|
-+=========+===========+================+==========+=======+========+==========+=========+=========================+==============+
-|integTest|       null|        accounts|BASE TABLE|   null|    null|      null|     null|                     null|          null|
-+---------+-----------+----------------+----------+-------+--------+----------+---------+-------------------------+--------------+
-|integTest|       null|employees_nested|BASE TABLE|   null|    null|      null|     null|                     null|          null|
-+---------+-----------+----------------+----------+-------+--------+----------+---------+-------------------------+--------------+
-
+    os> SHOW TABLES LIKE '%'
+    fetched rows / total rows = 9/9
+    +----------------+-------------+-----------------+------------+---------+----------+------------+-----------+---------------------------+----------------+
+    | TABLE_CAT      | TABLE_SCHEM | TABLE_NAME      | TABLE_TYPE | REMARKS | TYPE_CAT | TYPE_SCHEM | TYPE_NAME | SELF_REFERENCING_COL_NAME | REF_GENERATION |
+    |----------------+-------------+-----------------+------------+---------+----------+------------+-----------+---------------------------+----------------|
+    | docTestCluster | null        | .ql-datasources | BASE TABLE | null    | null     | null       | null      | null                      | null           |
+    | docTestCluster | null        | account2        | BASE TABLE | null    | null     | null       | null      | null                      | null           |
+    | docTestCluster | null        | accounts        | BASE TABLE | null    | null     | null       | null      | null                      | null           |
+    | docTestCluster | null        | apache          | BASE TABLE | null    | null     | null       | null      | null                      | null           |
+    | docTestCluster | null        | books           | BASE TABLE | null    | null     | null       | null      | null                      | null           |
+    | docTestCluster | null        | nested          | BASE TABLE | null    | null     | null       | null      | null                      | null           |
+    | docTestCluster | null        | nyc_taxi        | BASE TABLE | null    | null     | null       | null      | null                      | null           |
+    | docTestCluster | null        | people          | BASE TABLE | null    | null     | null       | null      | null                      | null           |
+    | docTestCluster | null        | wildcard        | BASE TABLE | null    | null     | null       | null      | null                      | null           |
+    +----------------+-------------+-----------------+------------+---------+----------+------------+-----------+---------------------------+----------------+
 
 Example 2: Show Specific Index Information
 ------------------------------------------
@@ -59,19 +59,14 @@ Here is an example that searches metadata for index name prefixed by 'acc'. Besi
 
 SQL query::
 
-	POST /_plugins/_sql
-	{
-	  "query" : "SHOW TABLES LIKE acc%"
-	}
-
-Result set:
-
-+---------+-----------+----------+----------+-------+--------+----------+---------+-------------------------+--------------+
-|TABLE_CAT|TABLE_SCHEM|TABLE_NAME|TABLE_TYPE|REMARKS|TYPE_CAT|TYPE_SCHEM|TYPE_NAME|SELF_REFERENCING_COL_NAME|REF_GENERATION|
-+=========+===========+==========+==========+=======+========+==========+=========+=========================+==============+
-|integTest|       null|  accounts|BASE TABLE|   null|    null|      null|     null|                     null|          null|
-+---------+-----------+----------+----------+-------+--------+----------+---------+-------------------------+--------------+
-
+    os> SHOW TABLES LIKE "acc%"
+    fetched rows / total rows = 2/2
+    +----------------+-------------+------------+------------+---------+----------+------------+-----------+---------------------------+----------------+
+    | TABLE_CAT      | TABLE_SCHEM | TABLE_NAME | TABLE_TYPE | REMARKS | TYPE_CAT | TYPE_SCHEM | TYPE_NAME | SELF_REFERENCING_COL_NAME | REF_GENERATION |
+    |----------------+-------------+------------+------------+---------+----------+------------+-----------+---------------------------+----------------|
+    | docTestCluster | null        | account2   | BASE TABLE | null    | null     | null       | null      | null                      | null           |
+    | docTestCluster | null        | accounts   | BASE TABLE | null    | null     | null       | null      | null                      | null           |
+    +----------------+-------------+------------+------------+---------+----------+------------+-----------+---------------------------+----------------+
 
 Example 3: Describe Index Fields Information
 --------------------------------------------
@@ -80,10 +75,23 @@ Example 3: Describe Index Fields Information
 
 SQL query::
 
-	POST /_plugins/_sql
-	{
-	  "query" : "DESCRIBE TABLES LIKE accounts"
-	}
+    os> DESCRIBE TABLES LIKE 'accounts'
+    fetched rows / total rows = 11/11
+    +----------------+-------------+------------+----------------+-----------+-----------+-------------+---------------+----------------+----------------+----------+---------+------------+---------------+------------------+-------------------+------------------+-------------+---------------+--------------+-------------+------------------+------------------+--------------------+
+    | TABLE_CAT      | TABLE_SCHEM | TABLE_NAME | COLUMN_NAME    | DATA_TYPE | TYPE_NAME | COLUMN_SIZE | BUFFER_LENGTH | DECIMAL_DIGITS | NUM_PREC_RADIX | NULLABLE | REMARKS | COLUMN_DEF | SQL_DATA_TYPE | SQL_DATETIME_SUB | CHAR_OCTET_LENGTH | ORDINAL_POSITION | IS_NULLABLE | SCOPE_CATALOG | SCOPE_SCHEMA | SCOPE_TABLE | SOURCE_DATA_TYPE | IS_AUTOINCREMENT | IS_GENERATEDCOLUMN |
+    |----------------+-------------+------------+----------------+-----------+-----------+-------------+---------------+----------------+----------------+----------+---------+------------+---------------+------------------+-------------------+------------------+-------------+---------------+--------------+-------------+------------------+------------------+--------------------|
+    | docTestCluster | null        | accounts   | account_number | null      | long      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 0                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | firstname      | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 1                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | address        | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 2                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | balance        | null      | long      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 3                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | gender         | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 4                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | city           | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 5                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | employer       | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 6                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | state          | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 7                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | age            | null      | long      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 8                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | email          | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 9                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | lastname       | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 10               |             | null          | null         | null        | null             | NO               |                    |
+    +----------------+-------------+------------+----------------+-----------+-----------+-------------+---------------+----------------+----------------+----------+---------+------------+---------------+------------------+-------------------+------------------+-------------+---------------+--------------+-------------+------------------+------------------+--------------------+
 
 Result set:
 
@@ -114,3 +122,11 @@ Result set:
 +---------+-----------+----------+--------------+---------+---------+-----------+-------------+--------------+--------------+--------+-------+----------+-------------+----------------+-----------------+----------------+-----------+-------------+------------+-----------+----------------+----------------+------------------+
 
 
+    os> DESCRIBE TABLES LIKE "accounts" COLUMNS LIKE "%name"
+    fetched rows / total rows = 2/2
+    +----------------+-------------+------------+-------------+-----------+-----------+-------------+---------------+----------------+----------------+----------+---------+------------+---------------+------------------+-------------------+------------------+-------------+---------------+--------------+-------------+------------------+------------------+--------------------+
+    | TABLE_CAT      | TABLE_SCHEM | TABLE_NAME | COLUMN_NAME | DATA_TYPE | TYPE_NAME | COLUMN_SIZE | BUFFER_LENGTH | DECIMAL_DIGITS | NUM_PREC_RADIX | NULLABLE | REMARKS | COLUMN_DEF | SQL_DATA_TYPE | SQL_DATETIME_SUB | CHAR_OCTET_LENGTH | ORDINAL_POSITION | IS_NULLABLE | SCOPE_CATALOG | SCOPE_SCHEMA | SCOPE_TABLE | SOURCE_DATA_TYPE | IS_AUTOINCREMENT | IS_GENERATEDCOLUMN |
+    |----------------+-------------+------------+-------------+-----------+-----------+-------------+---------------+----------------+----------------+----------+---------+------------+---------------+------------------+-------------------+------------------+-------------+---------------+--------------+-------------+------------------+------------------+--------------------|
+    | docTestCluster | null        | accounts   | firstname   | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 1                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | lastname    | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 10               |             | null          | null         | null        | null             | NO               |                    |
+    +----------------+-------------+------------+-------------+-----------+-----------+-------------+---------------+----------------+----------------+----------+---------+------------+---------------+------------------+-------------------+------------------+-------------+---------------+--------------+-------------+------------------+------------------+--------------------+
diff --git a/docs/user/dql/window.rst b/docs/user/dql/window.rst
index feb2aaa44e..f0c53da055 100644
--- a/docs/user/dql/window.rst
+++ b/docs/user/dql/window.rst
@@ -53,14 +53,14 @@ Here is an example for ``COUNT`` function::
     ... ) AS cnt
     ... FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-----------+-------+
-    | gender   | balance   | cnt   |
-    |----------+-----------+-------|
-    | F        | 32838     | 1     |
-    | M        | 4180      | 1     |
-    | M        | 5686      | 2     |
-    | M        | 39225     | 3     |
-    +----------+-----------+-------+
+    +--------+---------+-----+
+    | gender | balance | cnt |
+    |--------+---------+-----|
+    | F      | 32838   | 1   |
+    | M      | 4180    | 1   |
+    | M      | 5686    | 2   |
+    | M      | 39225   | 3   |
+    +--------+---------+-----+
 
 MIN
 ---
@@ -74,14 +74,14 @@ Here is an example for ``MIN`` function::
     ... ) AS cnt
     ... FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-----------+-------+
-    | gender   | balance   | cnt   |
-    |----------+-----------+-------|
-    | F        | 32838     | 32838 |
-    | M        | 4180      | 4180  |
-    | M        | 5686      | 4180  |
-    | M        | 39225     | 4180  |
-    +----------+-----------+-------+
+    +--------+---------+-------+
+    | gender | balance | cnt   |
+    |--------+---------+-------|
+    | F      | 32838   | 32838 |
+    | M      | 4180    | 4180  |
+    | M      | 5686    | 4180  |
+    | M      | 39225   | 4180  |
+    +--------+---------+-------+
 
 MAX
 ---
@@ -95,14 +95,14 @@ Here is an example for ``MAX`` function::
     ... ) AS cnt
     ... FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-----------+-------+
-    | gender   | balance   | cnt   |
-    |----------+-----------+-------|
-    | F        | 32838     | 32838 |
-    | M        | 4180      | 4180  |
-    | M        | 5686      | 5686  |
-    | M        | 39225     | 39225 |
-    +----------+-----------+-------+
+    +--------+---------+-------+
+    | gender | balance | cnt   |
+    |--------+---------+-------|
+    | F      | 32838   | 32838 |
+    | M      | 4180    | 4180  |
+    | M      | 5686    | 5686  |
+    | M      | 39225   | 39225 |
+    +--------+---------+-------+
 
 AVG
 ---
@@ -116,14 +116,14 @@ Here is an example for ``AVG`` function::
     ... ) AS cnt
     ... FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-----------+--------------------+
-    | gender   | balance   | cnt                |
-    |----------+-----------+--------------------|
-    | F        | 32838     | 32838.0            |
-    | M        | 4180      | 4180.0             |
-    | M        | 5686      | 4933.0             |
-    | M        | 39225     | 16363.666666666666 |
-    +----------+-----------+--------------------+
+    +--------+---------+--------------------+
+    | gender | balance | cnt                |
+    |--------+---------+--------------------|
+    | F      | 32838   | 32838.0            |
+    | M      | 4180    | 4180.0             |
+    | M      | 5686    | 4933.0             |
+    | M      | 39225   | 16363.666666666666 |
+    +--------+---------+--------------------+
 
 SUM
 ---
@@ -137,14 +137,14 @@ Here is an example for ``SUM`` function::
     ... ) AS cnt
     ... FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-----------+-------+
-    | gender   | balance   | cnt   |
-    |----------+-----------+-------|
-    | F        | 32838     | 32838 |
-    | M        | 4180      | 4180  |
-    | M        | 5686      | 9866  |
-    | M        | 39225     | 49091 |
-    +----------+-----------+-------+
+    +--------+---------+-------+
+    | gender | balance | cnt   |
+    |--------+---------+-------|
+    | F      | 32838   | 32838 |
+    | M      | 4180    | 4180  |
+    | M      | 5686    | 9866  |
+    | M      | 39225   | 49091 |
+    +--------+---------+-------+
 
 STDDEV_POP
 ----------
@@ -158,14 +158,14 @@ Here is an example for ``STDDEV_POP`` function::
     ... ) AS val
     ... FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-----------+--------------------+
-    | gender   | balance   | val                |
-    |----------+-----------+--------------------|
-    | F        | 32838     | 0.0                |
-    | M        | 4180      | 0.0                |
-    | M        | 5686      | 753.0              |
-    | M        | 39225     | 16177.091422406222 |
-    +----------+-----------+--------------------+
+    +--------+---------+--------------------+
+    | gender | balance | val                |
+    |--------+---------+--------------------|
+    | F      | 32838   | 0.0                |
+    | M      | 4180    | 0.0                |
+    | M      | 5686    | 753.0              |
+    | M      | 39225   | 16177.091422406222 |
+    +--------+---------+--------------------+
 
 STDDEV_SAMP
 -----------
@@ -179,14 +179,14 @@ Here is an example for ``STDDEV_SAMP`` function::
     ... ) AS val
     ... FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-----------+--------------------+
-    | gender   | balance   | val                |
-    |----------+-----------+--------------------|
-    | F        | 32838     | 0.0                |
-    | M        | 4180      | 0.0                |
-    | M        | 5686      | 1064.9028124669405 |
-    | M        | 39225     | 19812.809753624886 |
-    +----------+-----------+--------------------+
+    +--------+---------+--------------------+
+    | gender | balance | val                |
+    |--------+---------+--------------------|
+    | F      | 32838   | 0.0                |
+    | M      | 4180    | 0.0                |
+    | M      | 5686    | 1064.9028124669405 |
+    | M      | 39225   | 19812.809753624886 |
+    +--------+---------+--------------------+
 
 VAR_POP
 -------
@@ -200,14 +200,14 @@ Here is an example for ``SUM`` function::
     ... ) AS val
     ... FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-----------+--------------------+
-    | gender   | balance   | val                |
-    |----------+-----------+--------------------|
-    | F        | 32838     | 0.0                |
-    | M        | 4180      | 0.0                |
-    | M        | 5686      | 567009.0           |
-    | M        | 39225     | 261698286.88888893 |
-    +----------+-----------+--------------------+
+    +--------+---------+--------------------+
+    | gender | balance | val                |
+    |--------+---------+--------------------|
+    | F      | 32838   | 0.0                |
+    | M      | 4180    | 0.0                |
+    | M      | 5686    | 567009.0           |
+    | M      | 39225   | 261698286.88888893 |
+    +--------+---------+--------------------+
 
 VAR_SAMP
 --------
@@ -221,14 +221,14 @@ Here is an example for ``SUM`` function::
     ... ) AS val
     ... FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-----------+-------------------+
-    | gender   | balance   | val               |
-    |----------+-----------+-------------------|
-    | F        | 32838     | 0.0               |
-    | M        | 4180      | 0.0               |
-    | M        | 5686      | 1134018.0         |
-    | M        | 39225     | 392547430.3333334 |
-    +----------+-----------+-------------------+
+    +--------+---------+-------------------+
+    | gender | balance | val               |
+    |--------+---------+-------------------|
+    | F      | 32838   | 0.0               |
+    | M      | 4180    | 0.0               |
+    | M      | 5686    | 1134018.0         |
+    | M      | 39225   | 392547430.3333334 |
+    +--------+---------+-------------------+
 
 
 Ranking Functions
@@ -248,14 +248,14 @@ ROW_NUMBER
 
     os> SELECT gender, balance, ROW_NUMBER() OVER(PARTITION BY gender ORDER BY balance) AS num FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-----------+-------+
-    | gender   | balance   | num   |
-    |----------+-----------+-------|
-    | F        | 32838     | 1     |
-    | M        | 4180      | 1     |
-    | M        | 5686      | 2     |
-    | M        | 39225     | 3     |
-    +----------+-----------+-------+
+    +--------+---------+-----+
+    | gender | balance | num |
+    |--------+---------+-----|
+    | F      | 32838   | 1   |
+    | M      | 4180    | 1   |
+    | M      | 5686    | 2   |
+    | M      | 39225   | 3   |
+    +--------+---------+-----+
 
 Similarly as regular ``ORDER BY`` clause, you can specify null ordering by ``NULLS FIRST`` or ``NULLS LAST`` which has exactly same behavior::
 
@@ -267,14 +267,14 @@ Similarly as regular ``ORDER BY`` clause, you can specify null ordering by ``NUL
     ... FROM accounts
     ... ORDER BY employer NULLS LAST;
     fetched rows / total rows = 4/4
-    +------------+-------+
-    | employer   | num   |
-    |------------+-------|
-    | Netagy     | 1     |
-    | Pyrami     | 2     |
-    | Quility    | 3     |
-    | null       | 4     |
-    +------------+-------+
+    +----------+-----+
+    | employer | num |
+    |----------+-----|
+    | Netagy   | 1   |
+    | Pyrami   | 2   |
+    | Quility  | 3   |
+    | null     | 4   |
+    +----------+-----+
 
 RANK
 ----
@@ -283,14 +283,14 @@ RANK
 
     os> SELECT gender, RANK() OVER(ORDER BY gender DESC) AS rnk FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-------+
-    | gender   | rnk   |
-    |----------+-------|
-    | M        | 1     |
-    | M        | 1     |
-    | M        | 1     |
-    | F        | 4     |
-    +----------+-------+
+    +--------+-----+
+    | gender | rnk |
+    |--------+-----|
+    | M      | 1   |
+    | M      | 1   |
+    | M      | 1   |
+    | F      | 4   |
+    +--------+-----+
 
 
 DENSE_RANK
@@ -300,12 +300,12 @@ Similarly as ``RANK``, ``DENSE_RANK`` function also assigns a rank to each row.
 
     os> SELECT gender, DENSE_RANK() OVER(ORDER BY gender DESC) AS rnk FROM accounts;
     fetched rows / total rows = 4/4
-    +----------+-------+
-    | gender   | rnk   |
-    |----------+-------|
-    | M        | 1     |
-    | M        | 1     |
-    | M        | 1     |
-    | F        | 2     |
-    +----------+-------+
+    +--------+-----+
+    | gender | rnk |
+    |--------+-----|
+    | M      | 1   |
+    | M      | 1   |
+    | M      | 1   |
+    | F      | 2   |
+    +--------+-----+
 
diff --git a/docs/user/general/comments.rst b/docs/user/general/comments.rst
index ab959da342..536843695e 100644
--- a/docs/user/general/comments.rst
+++ b/docs/user/general/comments.rst
@@ -26,11 +26,11 @@ A single-line comment starts with either ``#`` or ``--``. All characters in the
     ... -- comments
     ... 123; -- comments
     fetched rows / total rows = 1/1
-    +-------+
-    | 123   |
-    |-------|
-    | 123   |
-    +-------+
+    +-----+
+    | 123 |
+    |-----|
+    | 123 |
+    +-----+
 
 Note that double-dash style requires at least one whitespace followed.
 
@@ -48,10 +48,10 @@ A block comment is enclosed within ``/*`` and ``*/`` across one or multiple line
     ... /* comments */
     ... 123;
     fetched rows / total rows = 1/1
-    +-------+
-    | 123   |
-    |-------|
-    | 123   |
-    +-------+
+    +-----+
+    | 123 |
+    |-----|
+    | 123 |
+    +-----+
 
 Additionally, ``/*! ... */`` is supported though ignored for now. This may be used to support optimization hints in future.
diff --git a/docs/user/general/datatypes.rst b/docs/user/general/datatypes.rst
index 63b57f87e8..cc6176ae84 100644
--- a/docs/user/general/datatypes.rst
+++ b/docs/user/general/datatypes.rst
@@ -34,7 +34,7 @@ The OpenSearch SQL Engine support the following data types.
 +---------------------+
 | double              |
 +---------------------+
-| string              |
+| keyword             |
 +---------------------+
 | text                |
 +---------------------+
@@ -87,11 +87,11 @@ The table below list the mapping between OpenSearch Data Type, OpenSearch SQL Da
 +-----------------+---------------------+-----------+
 | double          | double              | DOUBLE    |
 +-----------------+---------------------+-----------+
-| keyword         | string              | VARCHAR   |
+| keyword         | keyword             | VARCHAR   |
 +-----------------+---------------------+-----------+
 | text            | text                | VARCHAR   |
 +-----------------+---------------------+-----------+
-| date            | timestamp           | TIMESTAMP |
+| date*           | timestamp           | TIMESTAMP |
 +-----------------+---------------------+-----------+
 | date_nanos      | timestamp           | TIMESTAMP |
 +-----------------+---------------------+-----------+
@@ -104,7 +104,11 @@ The table below list the mapping between OpenSearch Data Type, OpenSearch SQL Da
 | nested          | array               | STRUCT    |
 +-----------------+---------------------+-----------+
 
-Notes: Not all the OpenSearch SQL Type has correspond OpenSearch Type. e.g. data and time. To use function which required such data type, user should explicitly convert the data type.
+Notes:
+* Not all the OpenSearch SQL Type has correspond OpenSearch Type. e.g. data and time. To use function which required such data type, user should explicitly convert the data type.
+* date*: Maps to `timestamp` by default. Based on the "format" property `date` can map to `date` or `time`. See list of supported named formats `here <https://opensearch.org/docs/latest/field-types/supported-field-types/date/>`_.
+For example, `basic_date` will map to a `date` type, and `basic_time` will map to a `time` type.
+
 
 Data Type Conversion
 ====================
@@ -151,15 +155,15 @@ The following matrix illustrates the conversions allowed by our query engine for
 +--------------+------+-------+---------+------+-------+--------+---------+--------------+------+--------+-----------+------+------+----------+----------+-----------+-----+--------+-----------+---------+
 |    STRING    |   E  |   E   |    E    |   E  |   E   |    E   |    IE   |       X      |   X  |   N/A  |     IE    |   IE |   IE |     IE   |     X    |     X     |  X  |    X   |     X     |    X    |
 +--------------+------+-------+---------+------+-------+--------+---------+--------------+------+--------+-----------+------+------+----------+----------+-----------+-----+--------+-----------+---------+
-|   TIMESTAMP  |   X  |   X   |    X    |   X  |   X   |    X   |    X    |       X      |   X  |    E   |    N/A    |      |      |     X    |     X    |     X     |  X  |    X   |     X     |    X    |
+|   TIMESTAMP  |   X  |   X   |    X    |   X  |   X   |    X   |    X    |       X      |   X  |    E   |    N/A    |   IE |   IE |     IE   |     X    |     X     |  X  |    X   |     X     |    X    |
 +--------------+------+-------+---------+------+-------+--------+---------+--------------+------+--------+-----------+------+------+----------+----------+-----------+-----+--------+-----------+---------+
-|     DATE     |   X  |   X   |    X    |   X  |   X   |    X   |    X    |       X      |   X  |    E   |           |  N/A |      |     X    |     X    |     X     |  X  |    X   |     X     |    X    |
+|     DATE     |   X  |   X   |    X    |   X  |   X   |    X   |    X    |       X      |   X  |    E   |     E     |  N/A |   IE |     E    |     X    |     X     |  X  |    X   |     X     |    X    |
 +--------------+------+-------+---------+------+-------+--------+---------+--------------+------+--------+-----------+------+------+----------+----------+-----------+-----+--------+-----------+---------+
-|     TIME     |   X  |   X   |    X    |   X  |   X   |    X   |    X    |       X      |   X  |    E   |           |      |  N/A |     X    |     X    |     X     |  X  |    X   |     X     |    X    |
+|     TIME     |   X  |   X   |    X    |   X  |   X   |    X   |    X    |       X      |   X  |    E   |     E     |   E  |  N/A |     E    |     X    |     X     |  X  |    X   |     X     |    X    |
 +--------------+------+-------+---------+------+-------+--------+---------+--------------+------+--------+-----------+------+------+----------+----------+-----------+-----+--------+-----------+---------+
-|   DATETIME   |   X  |   X   |    X    |   X  |   X   |    X   |    X    |       X      |   X  |    E   |           |      |      |    N/A   |     X    |     X     |  X  |    X   |     X     |    X    |
+|   DATETIME   |   X  |   X   |    X    |   X  |   X   |    X   |    X    |       X      |   X  |    E   |     E     |   E  |   E  |    N/A   |     X    |     X     |  X  |    X   |     X     |    X    |
 +--------------+------+-------+---------+------+-------+--------+---------+--------------+------+--------+-----------+------+------+----------+----------+-----------+-----+--------+-----------+---------+
-|   INTERVAL   |   X  |   X   |    X    |   X  |   X   |    X   |    X    |       X      |   X  |    E   |           |      |      |     X    |    N/A   |     X     |  X  |    X   |     X     |    X    |
+|   INTERVAL   |   X  |   X   |    X    |   X  |   X   |    X   |    X    |       X      |   X  |    E   |     X     |   X  |   X  |     X    |    N/A   |     X     |  X  |    X   |     X     |    X    |
 +--------------+------+-------+---------+------+-------+--------+---------+--------------+------+--------+-----------+------+------+----------+----------+-----------+-----+--------+-----------+---------+
 |   GEO_POINT  |   X  |   X   |    X    |   X  |   X   |    X   |    X    |       X      |   X  |        |     X     |   X  |   X  |     X    |     X    |    N/A    |  X  |    X   |     X     |    X    |
 +--------------+------+-------+---------+------+-------+--------+---------+--------------+------+--------+-----------+------+------+----------+----------+-----------+-----+--------+-----------+---------+
@@ -188,11 +192,11 @@ Here are a few examples for implicit type conversion::
     ...  'True' = true,
     ...  DATE('2021-06-10') < '2021-06-11';
     fetched rows / total rows = 1/1
-    +-----------+-----------------+-------------------------------------+
-    | 1 = 1.0   | 'True' = true   | DATE('2021-06-10') < '2021-06-11'   |
-    |-----------+-----------------+-------------------------------------|
-    | True      | True            | True                                |
-    +-----------+-----------------+-------------------------------------+
+    +---------+---------------+-----------------------------------+
+    | 1 = 1.0 | 'True' = true | DATE('2021-06-10') < '2021-06-11' |
+    |---------+---------------+-----------------------------------|
+    | True    | True          | True                              |
+    +---------+---------------+-----------------------------------+
 
 Here are a few examples for explicit type conversion::
 
@@ -201,11 +205,11 @@ Here are a few examples for explicit type conversion::
     ...  CAST(1.2 AS STRING),
     ...  CAST('2021-06-10 00:00:00' AS TIMESTAMP);
     fetched rows / total rows = 1/1
-    +---------------------+-----------------------+--------------------------------------------+
-    | CAST(true AS INT)   | CAST(1.2 AS STRING)   | CAST('2021-06-10 00:00:00' AS TIMESTAMP)   |
-    |---------------------+-----------------------+--------------------------------------------|
-    | 1                   | 1.2                   | 2021-06-10 00:00:00                        |
-    +---------------------+-----------------------+--------------------------------------------+
+    +-------------------+---------------------+------------------------------------------+
+    | CAST(true AS INT) | CAST(1.2 AS STRING) | CAST('2021-06-10 00:00:00' AS TIMESTAMP) |
+    |-------------------+---------------------+------------------------------------------|
+    | 1                 | 1.2                 | 2021-06-10 00:00:00                      |
+    +-------------------+---------------------+------------------------------------------+
 
 Undefined Data Type
 ===================
@@ -216,11 +220,11 @@ Here are examples for NULL literal and expressions with NULL literal involved::
 
     os> SELECT NULL, NULL = NULL, 1 + NULL, LENGTH(NULL);
     fetched rows / total rows = 1/1
-    +--------+---------------+------------+----------------+
-    | NULL   | NULL = NULL   | 1 + NULL   | LENGTH(NULL)   |
-    |--------+---------------+------------+----------------|
-    | null   | null          | null       | null           |
-    +--------+---------------+------------+----------------+
+    +------+-------------+----------+--------------+
+    | NULL | NULL = NULL | 1 + NULL | LENGTH(NULL) |
+    |------+-------------+----------+--------------|
+    | null | null        | null     | null         |
+    +------+-------------+----------+--------------+
 
 
 Numeric Data Types
@@ -232,8 +236,7 @@ Numeric values ranged from -2147483648 to +2147483647 are recognized as integer
 Date and Time Data Types
 ========================
 
-The date and time data types are the types that represent temporal values and SQL plugin supports types including DATE, TIME, DATETIME, TIMESTAMP and INTERVAL. By default, the OpenSearch DSL uses date type as the only date and time related type, which has contained all information about an absolute time point. To integrate with SQL language, each of the types other than timestamp is holding part of temporal or timezone information, and the usage to explicitly clarify the date and time types is reflected in the datetime functions (see `Functions <functions.rst>`_ for details), where some functions might have restrictions in the input argument type.
-
+The datetime types supported by the SQL plugin are ``DATE``, ``TIME``, ``DATETIME``, ``TIMESTAMP``, and ``INTERVAL``, with date and time being used to represent temporal values. By default, the OpenSearch DSL uses ``date`` type as the only date and time related type as it contains all information about an absolute time point. To integrate with SQL language each of the types other than timestamp hold part of the temporal or timezone information. This information can be used to explicitly clarify the date and time types reflected in the datetime functions (see `Functions <functions.rst>`_ for details), where some functions might have restrictions in the input argument type.
 
 Date
 ----
@@ -295,7 +298,7 @@ Interval data type represents a temporal duration or a period. The syntax is as
 | Interval | INTERVAL expr unit |
 +----------+--------------------+
 
-The expr is any expression that can be iterated to a quantity value eventually, see `Expressions <expressions.rst>`_ for details. The unit represents the unit for interpreting the quantity, including MICROSECOND, SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER and YEAR.The INTERVAL keyword and the unit specifier are not case sensitive. Note that there are two classes of intervals. Year-week intervals can store years, quarters, months and weeks. Day-time intervals can store days, hours, minutes, seconds and microseconds. Year-week intervals are comparable only with another year-week intervals. These two types of intervals can only comparable with the same type of themselves.
+The expr is any expression that can be iterated to a quantity value eventually, see `Expressions <expressions.rst>`_ for details. The unit represents the unit for interpreting the quantity, including ``MICROSECOND``, ``SECOND``, ``MINUTE``, ``HOUR``, ``DAY``, ``WEEK``, ``MONTH``, ``QUARTER`` and ``YEAR``. The ``INTERVAL`` keyword and the unit specifier are not case sensitive. Note that there are two classes of intervals. Year-week intervals can store years, quarters, months and weeks. Day-time intervals can store days, hours, minutes, seconds and microseconds. Year-week intervals are comparable only with another year-week intervals. These two types of intervals can only comparable with the same type of themselves.
 
 
 Conversion between date and time types
@@ -316,7 +319,7 @@ Conversion from DATE
 Conversion from TIME
 >>>>>>>>>>>>>>>>>>>>
 
-- Time value cannot be converted to any other date and time types since it does not contain any date information, so it is not meaningful to give no date info to a date/datetime/timestamp instance.
+- When time value is converted to any other datetime types, the date part of the new value is filled up with today's date, like with the `CURDATE` function. For example, a time value X converted to a timestamp would produce today's date at time X.
 
 
 Conversion from DATETIME
@@ -344,11 +347,129 @@ A string can also represent and be converted to date and time types (except to i
     ...  '2021-06-18' < DATE('2021-06-17'),
     ...  '10:20:00' <= TIME('11:00:00');
     fetched rows / total rows = 1/1
-    +------------------------------------------------------------+-------------------------------------+----------------------------------+
-    | TIMESTAMP('2021-06-17 00:00:00') = '2021-06-17 00:00:00'   | '2021-06-18' < DATE('2021-06-17')   | '10:20:00' <= TIME('11:00:00')   |
-    |------------------------------------------------------------+-------------------------------------+----------------------------------|
-    | True                                                       | False                               | True                             |
-    +------------------------------------------------------------+-------------------------------------+----------------------------------+
+    +----------------------------------------------------------+-----------------------------------+--------------------------------+
+    | TIMESTAMP('2021-06-17 00:00:00') = '2021-06-17 00:00:00' | '2021-06-18' < DATE('2021-06-17') | '10:20:00' <= TIME('11:00:00') |
+    |----------------------------------------------------------+-----------------------------------+--------------------------------|
+    | True                                                     | False                             | True                           |
+    +----------------------------------------------------------+-----------------------------------+--------------------------------+
+
+Please, see `more examples here <../dql/expressions.rst#toc-entry-15>`_.
+
+Date formats
+------------
+
+SQL plugin supports all named formats for OpenSearch ``date`` data type, custom formats and their combination. Please, refer to `OpenSearch docs <https://opensearch.org/docs/latest/field-types/supported-field-types/date/>`_ for format description.
+Plugin detects which type of data is stored in ``date`` field according to formats given and returns results in the corresponding SQL types.
+Given an index with the following mapping.
+
+.. code-block:: json
+
+    {
+        "mappings" : {
+            "properties" : {
+                "date1" : {
+                    "type" : "date",
+                    "format": "yyyy-MM-dd"
+                },
+                "date2" : {
+                    "type" : "date",
+                    "format": "date_time_no_millis"
+                },
+                "date3" : {
+                    "type" : "date",
+                    "format": "hour_minute_second"
+                },
+                "date4" : {
+                    "type" : "date"
+                },
+                "date5" : {
+                    "type" : "date",
+                    "format": "yyyy-MM-dd || time"
+                }
+            }
+        }
+    }
+
+Querying such index will provide a response with ``schema`` block as shown below.
+
+.. code-block:: json
+
+    {
+        "query" : "SELECT * from date_formats LIMIT 0;"
+    }
+
+.. code-block:: json
+
+    {
+        "schema": [
+            {
+                "name": "date5",
+                "type": "timestamp"
+            },
+            {
+                "name": "date4",
+                "type": "timestamp"
+            },
+            {
+                "name": "date3",
+                "type": "time"
+            },
+            {
+                "name": "date2",
+                "type": "timestamp"
+            },
+            {
+                "name": "date1",
+                "type": "date"
+            },
+        ],
+        "datarows": [],
+        "total": 0,
+        "size": 0,
+        "status": 200
+    }
+
+If the sql query contains an `IndexDateField` and a literal value with an operator (such as a term query or a range query), then the literal value can be in the `IndexDateField` format.
+
+.. code-block:: json
+
+    {
+        "mappings" : {
+            "properties" : {
+                "release_date" : {
+                    "type" : "date",
+                    "format": "dd-MMM-yy"
+                }
+            }
+        }
+    }
+
+Querying such an `IndexDateField` (``release_date``) will provide a response with ``schema`` and ``datarows`` blocks as shown below.
+
+.. code-block:: json
+
+    {
+        "query" : "SELECT release_date FROM test_index WHERE release_date = \"03-Jan-21\""
+    }
+
+.. code-block:: json
+
+    {
+      "schema": [
+        {
+          "name": "release_date",
+          "type": "date"
+        }
+      ],
+      "datarows": [
+        [
+          "2021-01-03"
+        ]
+      ],
+      "total": 1,
+      "size": 1,
+      "status": 200
+    }
 
 String Data Types
 =================
@@ -357,11 +478,11 @@ A string is a sequence of characters enclosed in either single or double quotes.
 
     os> SELECT 'hello', "world", '"hello"', "'world'", '''hello''', """world"""
     fetched rows / total rows = 1/1
-    +-----------+-----------+-------------+-------------+---------------+---------------+
-    | 'hello'   | "world"   | '"hello"'   | "'world'"   | '''hello'''   | """world"""   |
-    |-----------+-----------+-------------+-------------+---------------+---------------|
-    | hello     | world     | "hello"     | 'world'     | 'hello'       | "world"       |
-    +-----------+-----------+-------------+-------------+---------------+---------------+
+    +---------+---------+-----------+-----------+-------------+-------------+--------+--------+--------+
+    | 'hello' | "world" | '"hello"' | "'world'" | '''hello''' | """world""" | 'I\'m' | 'I''m' | "I\"m" |
+    |---------+---------+-----------+-----------+-------------+-------------+--------+--------+--------|
+    | hello   | world   | "hello"   | 'world'   | 'hello'     | "world"     | I'm    | I'm    | I"m    |
+    +---------+---------+-----------+-----------+-------------+-------------+--------+--------+--------+
 
 Boolean Data Types
 ==================
@@ -372,8 +493,8 @@ A boolean can be represented by constant value ``TRUE`` or ``FALSE``. Besides, c
     ...  true, FALSE,
     ...  CAST('TRUE' AS boolean), CAST('false' AS boolean);
     fetched rows / total rows = 1/1
-    +--------+---------+---------------------------+----------------------------+
-    | true   | FALSE   | CAST('TRUE' AS boolean)   | CAST('false' AS boolean)   |
-    |--------+---------+---------------------------+----------------------------|
-    | True   | False   | True                      | False                      |
-    +--------+---------+---------------------------+----------------------------+
+    +------+-------+-------------------------+--------------------------+
+    | true | FALSE | CAST('TRUE' AS boolean) | CAST('false' AS boolean) |
+    |------+-------+-------------------------+--------------------------|
+    | True | False | True                    | False                    |
+    +------+-------+-------------------------+--------------------------+
diff --git a/docs/user/general/identifiers.rst b/docs/user/general/identifiers.rst
index fad2fa4b23..562bf38526 100644
--- a/docs/user/general/identifiers.rst
+++ b/docs/user/general/identifiers.rst
@@ -40,14 +40,14 @@ Here are examples for using index pattern directly without quotes::
 
     os> SELECT * FROM *cc*nts;
     fetched rows / total rows = 4/4
-    +------------------+-------------+----------------------+-----------+----------+--------+------------+---------+-------+-----------------------+------------+
-    | account_number   | firstname   | address              | balance   | gender   | city   | employer   | state   | age   | email                 | lastname   |
-    |------------------+-------------+----------------------+-----------+----------+--------+------------+---------+-------+-----------------------+------------|
-    | 1                | Amber       | 880 Holmes Lane      | 39225     | M        | Brogan | Pyrami     | IL      | 32    | amberduke@pyrami.com  | Duke       |
-    | 6                | Hattie      | 671 Bristol Street   | 5686      | M        | Dante  | Netagy     | TN      | 36    | hattiebond@netagy.com | Bond       |
-    | 13               | Nanette     | 789 Madison Street   | 32838     | F        | Nogal  | Quility    | VA      | 28    | null                  | Bates      |
-    | 18               | Dale        | 467 Hutchinson Court | 4180      | M        | Orick  | null       | MD      | 33    | daleadams@boink.com   | Adams      |
-    +------------------+-------------+----------------------+-----------+----------+--------+------------+---------+-------+-----------------------+------------+
+    +----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------+
+    | account_number | firstname | address              | balance | gender | city   | employer | state | age | email                 | lastname |
+    |----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------|
+    | 1              | Amber     | 880 Holmes Lane      | 39225   | M      | Brogan | Pyrami   | IL    | 32  | amberduke@pyrami.com  | Duke     |
+    | 6              | Hattie    | 671 Bristol Street   | 5686    | M      | Dante  | Netagy   | TN    | 36  | hattiebond@netagy.com | Bond     |
+    | 13             | Nanette   | 789 Madison Street   | 32838   | F      | Nogal  | Quility  | VA    | 28  | null                  | Bates    |
+    | 18             | Dale      | 467 Hutchinson Court | 4180    | M      | Orick  | null     | MD    | 33  | daleadams@boink.com   | Adams    |
+    +----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------+
 
 
 Delimited Identifiers
@@ -76,14 +76,14 @@ Here are examples for quoting an index name by back ticks::
 
     os> SELECT * FROM `accounts`;
     fetched rows / total rows = 4/4
-    +------------------+-------------+----------------------+-----------+----------+--------+------------+---------+-------+-----------------------+------------+
-    | account_number   | firstname   | address              | balance   | gender   | city   | employer   | state   | age   | email                 | lastname   |
-    |------------------+-------------+----------------------+-----------+----------+--------+------------+---------+-------+-----------------------+------------|
-    | 1                | Amber       | 880 Holmes Lane      | 39225     | M        | Brogan | Pyrami     | IL      | 32    | amberduke@pyrami.com  | Duke       |
-    | 6                | Hattie      | 671 Bristol Street   | 5686      | M        | Dante  | Netagy     | TN      | 36    | hattiebond@netagy.com | Bond       |
-    | 13               | Nanette     | 789 Madison Street   | 32838     | F        | Nogal  | Quility    | VA      | 28    | null                  | Bates      |
-    | 18               | Dale        | 467 Hutchinson Court | 4180      | M        | Orick  | null       | MD      | 33    | daleadams@boink.com   | Adams      |
-    +------------------+-------------+----------------------+-----------+----------+--------+------------+---------+-------+-----------------------+------------+
+    +----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------+
+    | account_number | firstname | address              | balance | gender | city   | employer | state | age | email                 | lastname |
+    |----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------|
+    | 1              | Amber     | 880 Holmes Lane      | 39225   | M      | Brogan | Pyrami   | IL    | 32  | amberduke@pyrami.com  | Duke     |
+    | 6              | Hattie    | 671 Bristol Street   | 5686    | M      | Dante  | Netagy   | TN    | 36  | hattiebond@netagy.com | Bond     |
+    | 13             | Nanette   | 789 Madison Street   | 32838   | F      | Nogal  | Quility  | VA    | 28  | null                  | Bates    |
+    | 18             | Dale      | 467 Hutchinson Court | 4180    | M      | Orick  | null     | MD    | 33  | daleadams@boink.com   | Adams    |
+    +----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------+
 
 
 Case Sensitivity
@@ -121,23 +121,23 @@ The first example is to show a column name qualified by full table name original
 
     os> SELECT city, accounts.age, ABS(accounts.balance) FROM accounts WHERE accounts.age < 30;
     fetched rows / total rows = 1/1
-    +--------+-------+-------------------------+
-    | city   | age   | ABS(accounts.balance)   |
-    |--------+-------+-------------------------|
-    | Nogal  | 28    | 32838                   |
-    +--------+-------+-------------------------+
+    +-------+-----+-----------------------+
+    | city  | age | ABS(accounts.balance) |
+    |-------+-----+-----------------------|
+    | Nogal | 28  | 32838                 |
+    +-------+-----+-----------------------+
 
 The second example is to show a field name qualified by index alias specified. Similarly, the alias qualifier is optional in this case::
 
     os> SELECT city, acc.age, ABS(acc.balance) FROM accounts AS acc WHERE acc.age > 30;
     fetched rows / total rows = 3/3
-    +--------+-------+--------------------+
-    | city   | age   | ABS(acc.balance)   |
-    |--------+-------+--------------------|
-    | Brogan | 32    | 39225              |
-    | Dante  | 36    | 5686               |
-    | Orick  | 33    | 4180               |
-    +--------+-------+--------------------+
+    +--------+-----+------------------+
+    | city   | age | ABS(acc.balance) |
+    |--------+-----+------------------|
+    | Brogan | 32  | 39225            |
+    | Dante  | 36  | 5686             |
+    | Orick  | 33  | 4180             |
+    +--------+-----+------------------+
 
 Note that in both examples above, the qualifier is removed in response. This happens only when identifiers selected is a simple field name. In other cases, expressions rather than an atom field, the column name in response is exactly the same as the text in ``SELECT``clause.
 
@@ -160,22 +160,22 @@ Query wildcard indices::
 
     os> SELECT count(*) as cnt FROM acc*;
     fetched rows / total rows = 1/1
-    +-------+
-    | cnt   |
-    |-------|
-    | 5     |
-    +-------+
+    +-----+
+    | cnt |
+    |-----|
+    | 5   |
+    +-----+
 
 
 Query delimited multiple indices seperated by ``,``::
 
     os> SELECT count(*) as cnt FROM `accounts,account2`;
     fetched rows / total rows = 1/1
-    +-------+
-    | cnt   |
-    |-------|
-    | 5     |
-    +-------+
+    +-----+
+    | cnt |
+    |-----|
+    | 5   |
+    +-----+
 
 
 
diff --git a/docs/user/general/values.rst b/docs/user/general/values.rst
index 178609f175..f675b42e75 100644
--- a/docs/user/general/values.rst
+++ b/docs/user/general/values.rst
@@ -19,14 +19,14 @@ Here is an example, Nanette doesn't have email field and Dail has employer filed
 
     os> SELECT firstname, employer, email FROM accounts;
     fetched rows / total rows = 4/4
-    +-------------+------------+-----------------------+
-    | firstname   | employer   | email                 |
-    |-------------+------------+-----------------------|
-    | Amber       | Pyrami     | amberduke@pyrami.com  |
-    | Hattie      | Netagy     | hattiebond@netagy.com |
-    | Nanette     | Quility    | null                  |
-    | Dale        | null       | daleadams@boink.com   |
-    +-------------+------------+-----------------------+
+    +-----------+----------+-----------------------+
+    | firstname | employer | email                 |
+    |-----------+----------+-----------------------|
+    | Amber     | Pyrami   | amberduke@pyrami.com  |
+    | Hattie    | Netagy   | hattiebond@netagy.com |
+    | Nanette   | Quility  | null                  |
+    | Dale      | null     | daleadams@boink.com   |
+    +-----------+----------+-----------------------+
 
 
 General NULL and MISSING Values Handling
@@ -37,14 +37,14 @@ Here is an example::
 
     os> SELECT firstname, employer LIKE 'Quility', email LIKE '%com' FROM accounts;
     fetched rows / total rows = 4/4
-    +-------------+---------------------------+---------------------+
-    | firstname   | employer LIKE 'Quility'   | email LIKE '%com'   |
-    |-------------+---------------------------+---------------------|
-    | Amber       | False                     | True                |
-    | Hattie      | False                     | True                |
-    | Nanette     | True                      | null                |
-    | Dale        | null                      | True                |
-    +-------------+---------------------------+---------------------+
+    +-----------+-------------------------+-------------------+
+    | firstname | employer LIKE 'Quility' | email LIKE '%com' |
+    |-----------+-------------------------+-------------------|
+    | Amber     | False                   | True              |
+    | Hattie    | False                   | True              |
+    | Nanette   | True                    | null              |
+    | Dale      | null                    | True              |
+    +-----------+-------------------------+-------------------+
 
 Special NULL and MISSING Values Handling
 ----------------------------------------
diff --git a/docs/user/interfaces/asyncqueryinterface.rst b/docs/user/interfaces/asyncqueryinterface.rst
new file mode 100644
index 0000000000..9b889f7f97
--- /dev/null
+++ b/docs/user/interfaces/asyncqueryinterface.rst
@@ -0,0 +1,201 @@
+.. highlight:: sh
+
+=======================
+Async Query Interface Endpoints
+=======================
+
+.. rubric:: Table of contents
+
+.. contents::
+   :local:
+   :depth: 1
+
+
+Introduction
+============
+
+For supporting `S3Glue <../ppl/admin/connectors/s3glue_connector.rst>`_  datasource connector, we have introduced a new execution engine on top of Spark.
+All the queries to be executed on spark execution engine can only be submitted via Async Query APIs. Below sections will list all the new APIs introduced.
+
+
+Required Spark Execution Engine Config for Async Query APIs
+===========================================================
+Currently, the system supports only AWS EMRServerless as the SPARK execution engine. Configuration details for the execution engine should be specified under ``plugins.query.executionengine.spark.config`` in the opensearch.yml or cluster settings. The configuration value is expected to be a JSON string that includes ``applicationId``, ``executionRoleARN``, ``region``, and ``sparkSubmitParameter``.
+
+Sample Setting Value in opensearch.yml
+--------------------
+
+.. code-block:: yaml
+
+    "plugins.query.executionengine.spark.config: '{\"applicationId\":\"xxxxx\",\"executionRoleARN\":\"arn:aws:iam::xxxxx:role/emr-job-execution-role\",\"region\":\"us-west-2\", \"sparkSubmitParameters\": \"--conf spark.dynamicAllocation.enabled=false\"}'"
+
+Caution
+-------
+
+Users must exercise caution when transitioning to a new application or region, as changes to these parameters may lead to failures in retrieving results from previous asynchronous query jobs.
+
+The system utilizes the default AWS credentials chain for calls to the EMR serverless application. It is critical to ensure that the default credentials have the necessary permissions to assume the role required for EMR job execution, as delineated in the engine configuration.
+
+Requirements
+-------------
+
+- **Required Parameters**: ``applicationId``, ``executionRoleARN``, and ``region`` must be provided.
+- **Optional Parameter**: ``sparkSubmitParameter`` is optional and can be formatted as ``--conf A=1 --conf B=2 ...``.
+
+AWS CloudWatch metrics configuration
+-------------
+
+Starting with Flint 0.1.1, users can utilize AWS CloudWatch as an external metrics sink while configuring their own metric sources. Below is an example of a console request for setting this up:
+
+.. code-block:: json
+
+    PUT _cluster/settings
+    {
+      "persistent": {
+        "plugins.query.executionengine.spark.config": "{\"applicationId\":\"xxxxx\",\"executionRoleARN\":\"arn:aws:iam::xxxxx:role/emr-job-execution-role\",\"region\":\"us-east-1\",\"sparkSubmitParameters\":\"--conf spark.dynamicAllocation.enabled=false --conf spark.metrics.conf.*.sink.cloudwatch.class=org.apache.spark.metrics.sink.CloudWatchSink --conf spark.metrics.conf.*.sink.cloudwatch.namespace=OpenSearchSQLSpark --conf spark.metrics.conf.*.sink.cloudwatch.regex=(opensearch|numberAllExecutors).* --conf spark.metrics.conf.*.source.cloudwatch.class=org.apache.spark.metrics.source.FlintMetricSource \"}"
+      }
+    }
+
+For a comprehensive list of Spark configuration options related to metrics, please refer to the Spark documentation on monitoring:
+
+- Spark Monitoring Documentation: https://spark.apache.org/docs/latest/monitoring.html#metrics
+
+Additionally, for details on setting up CloudWatch metric sink and Flint metric source, consult the OpenSearch Spark project:
+
+- OpenSearch Spark GitHub Repository: https://github.com/opensearch-project/opensearch-spark
+
+Async Query Creation API
+======================================
+If security plugin is enabled, this API can only be invoked by users with permission ``cluster:admin/opensearch/ql/async_query/create``.
+
+Limitation: Spark SQL queries that create User-Defined Functions (UDFs) are not allowed.
+
+HTTP URI: ``_plugins/_async_query``
+
+HTTP VERB: ``POST``
+
+Sample Request::
+
+    curl --location 'http://localhost:9200/_plugins/_async_query' \
+    --header 'Content-Type: application/json' \
+    --data '{
+        "datasource" : "my_glue",
+        "lang" : "sql",
+        "query" : "select * from my_glue.default.http_logs limit 10"
+    }'
+
+Sample Response::
+
+    {
+      "queryId": "00fd796ut1a7eg0q"
+    }
+
+Execute query in session
+------------------------
+
+if plugins.query.executionengine.spark.session.enabled is set to true, session based execution is enabled. Under the hood, all queries submitted to the same session will be executed in the same SparkContext. Session is auto closed if not query submission in 10 minutes.
+
+Async query response include ``sessionId`` indicate the query is executed in session.
+
+Sample Request::
+
+    curl --location 'http://localhost:9200/_plugins/_async_query' \
+    --header 'Content-Type: application/json' \
+    --data '{
+        "datasource" : "my_glue",
+        "lang" : "sql",
+        "query" : "select * from my_glue.default.http_logs limit 10"
+    }'
+
+Sample Response::
+
+    {
+      "queryId": "HlbM61kX6MDkAktO",
+      "sessionId": "1Giy65ZnzNlmsPAm"
+    }
+
+User could reuse the session by using ``sessionId`` query parameters.
+
+Sample Request::
+
+    curl --location 'http://localhost:9200/_plugins/_async_query' \
+    --header 'Content-Type: application/json' \
+    --data '{
+        "datasource" : "my_glue",
+        "lang" : "sql",
+        "query" : "select * from my_glue.default.http_logs limit 10",
+        "sessionId" : "1Giy65ZnzNlmsPAm"
+    }'
+
+Sample Response::
+
+    {
+      "queryId": "7GC4mHhftiTejvxN",
+      "sessionId": "1Giy65ZnzNlmsPAm"
+    }
+
+
+Async Query Result API
+======================================
+If security plugin is enabled, this API can only be invoked by users with permission ``cluster:admin/opensearch/ql/async_query/result``.
+Async Query Creation and Result Query permissions are orthogonal, so any user with result api permissions and queryId can query the corresponding query results irrespective of the user who created the async query.
+
+HTTP URI: ``_plugins/_async_query/{queryId}``
+
+HTTP VERB: ``GET``
+
+Sample Request BODY::
+
+    curl --location --request GET 'http://localhost:9200/_plugins/_async_query/00fd796ut1a7eg0q' \
+    --header 'Content-Type: application/json' \
+
+Sample Response if the Query is in Progress ::
+
+    {"status":"RUNNING"}
+
+Sample Response If the Query is successful ::
+
+    {
+        "status": "SUCCESS",
+        "schema": [
+            {
+                "name": "indexed_col_name",
+                "type": "string"
+            },
+            {
+                "name": "data_type",
+                "type": "string"
+            },
+            {
+                "name": "skip_type",
+                "type": "string"
+            }
+        ],
+        "datarows": [
+            [
+                "status",
+                "int",
+                "VALUE_SET"
+            ]
+        ],
+        "total": 1,
+        "size": 1
+    }
+
+
+Async Query Cancellation API
+======================================
+If security plugin is enabled, this API can only be invoked by users with permission ``cluster:admin/opensearch/ql/jobs/delete``.
+
+Limitation: Flint index creation statement with auto_refresh = true can not be cancelled. User could submit ALTER statement to stop auto refresh query.
+- flint index creation statement include, CREATE SKIPPING INDEX / CREATE INDEX / CREATE MATERIALIZED VIEW
+
+HTTP URI: ``_plugins/_async_query/{queryId}``
+
+HTTP VERB: ``DELETE``
+
+Sample Request Body ::
+
+    curl --location --request DELETE 'http://localhost:9200/_plugins/_async_query/00fdalrvgkbh2g0q' \
+    --header 'Content-Type: application/json' \
+
diff --git a/docs/user/limitations/limitations.rst b/docs/user/limitations/limitations.rst
index d6e763a73d..8ce75a0e25 100644
--- a/docs/user/limitations/limitations.rst
+++ b/docs/user/limitations/limitations.rst
@@ -34,23 +34,6 @@ Aggregation over expression is not supported for now. You can only apply aggrega
 Here's a link to the Github issue - [Issue #288](https://github.com/opendistro-for-elasticsearch/sql/issues/288).
 
 
-Limitations on Subqueries
-=========================
-
-Subqueries in the FROM clause
------------------------------
-
-Subquery in the `FROM` clause in this format: `SELECT outer FROM (SELECT inner)` is supported only when the query is merged into one query. For example, the following query is supported::
-
-    SELECT t.f, t.d
-    FROM (
-        SELECT FlightNum as f, DestCountry as d
-        FROM opensearch_dashboards_sample_data_flights
-        WHERE OriginCountry = 'US') t
-
-But, if the outer query has `GROUP BY` or `ORDER BY`, then it's not supported.
-
-
 Limitations on JOINs
 ====================
 
diff --git a/docs/user/optimization/optimization.rst b/docs/user/optimization/optimization.rst
index e0fe943560..454c9ec066 100644
--- a/docs/user/optimization/optimization.rst
+++ b/docs/user/optimization/optimization.rst
@@ -44,7 +44,7 @@ The consecutive Filter operator will be merged as one Filter operator::
           {
             "name": "OpenSearchIndexScan",
             "description": {
-              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":200,\"timeout\":\"1m\",\"query\":{\"bool\":{\"filter\":[{\"range\":{\"age\":{\"from\":null,\"to\":20,\"include_lower\":true,\"include_upper\":false,\"boost\":1.0}}},{\"range\":{\"age\":{\"from\":10,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"_source\":{\"includes\":[\"age\"],\"excludes\":[]},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}]}, searchDone=false)"
+              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"bool\":{\"filter\":[{\"range\":{\"age\":{\"from\":null,\"to\":20,\"include_lower\":true,\"include_upper\":false,\"boost\":1.0}}},{\"range\":{\"age\":{\"from\":10,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"_source\":{\"includes\":[\"age\"],\"excludes\":[]},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}]}, searchDone=false)"
             },
             "children": []
           }
@@ -71,7 +71,7 @@ The Filter operator should be push down under Sort operator::
           {
             "name": "OpenSearchIndexScan",
             "description": {
-              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":200,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":null,\"to\":20,\"include_lower\":true,\"include_upper\":false,\"boost\":1.0}}},\"_source\":{\"includes\":[\"age\"],\"excludes\":[]},\"sort\":[{\"age\":{\"order\":\"asc\",\"missing\":\"_first\"}}]}, searchDone=false)"
+              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":null,\"to\":20,\"include_lower\":true,\"include_upper\":false,\"boost\":1.0}}},\"_source\":{\"includes\":[\"age\"],\"excludes\":[]},\"sort\":[{\"age\":{\"order\":\"asc\",\"missing\":\"_first\"}}]}, searchDone=false)"
             },
             "children": []
           }
@@ -102,7 +102,7 @@ The Project list will push down to Query DSL to `filter the source <https://www.
           {
             "name": "OpenSearchIndexScan",
             "description": {
-              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":200,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"age\"],\"excludes\":[]}}, searchDone=false)"
+              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"age\"],\"excludes\":[]}}, searchDone=false)"
             },
             "children": []
           }
@@ -128,7 +128,7 @@ The Filter operator will merge into OpenSearch Query DSL::
           {
             "name": "OpenSearchIndexScan",
             "description": {
-              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":200,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":30,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},\"_source\":{\"includes\":[\"age\"],\"excludes\":[]},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}]}, searchDone=false)"
+              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":30,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},\"_source\":{\"includes\":[\"age\"],\"excludes\":[]},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}]}, searchDone=false)"
             },
             "children": []
           }
@@ -154,7 +154,7 @@ The Sort operator will merge into OpenSearch Query DSL::
           {
             "name": "OpenSearchIndexScan",
             "description": {
-              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":200,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"age\"],\"excludes\":[]},\"sort\":[{\"age\":{\"order\":\"asc\",\"missing\":\"_first\"}}]}, searchDone=false)"
+              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"age\"],\"excludes\":[]},\"sort\":[{\"age\":{\"order\":\"asc\",\"missing\":\"_first\"}}]}, searchDone=false)"
             },
             "children": []
           }
@@ -188,7 +188,7 @@ Because the OpenSearch Script Based Sorting can't handle NULL/MISSING value, the
               {
                 "name": "OpenSearchIndexScan",
                 "description": {
-                  "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":200,\"timeout\":\"1m\"}, searchDone=false)"
+                  "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\"}, searchDone=false)"
                 },
                 "children": []
               }
@@ -237,31 +237,24 @@ If sort that includes expression, which cannot be merged into query DSL, also ex
             },
             "children": [
               {
-                "name": "LimitOperator",
+                "name": "TakeOrderedOperator",
                 "description": {
                   "limit": 10,
-                  "offset": 0
+                  "offset": 0,
+                  "sortList": {
+                    "abs(age)": {
+                      "sortOrder": "ASC",
+                      "nullOrder": "NULL_FIRST"
+                    }
+                  }
                 },
                 "children": [
                   {
-                    "name": "SortOperator",
+                    "name": "OpenSearchIndexScan",
                     "description": {
-                      "sortList": {
-                        "abs(age)": {
-                          "sortOrder": "ASC",
-                          "nullOrder": "NULL_FIRST"
-                        }
-                      }
+                      "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\"}, searchDone=false)"
                     },
-                    "children": [
-                      {
-                        "name": "OpenSearchIndexScan",
-                        "description": {
-                          "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":200,\"timeout\":\"1m\"}, searchDone=false)"
-                        },
-                        "children": []
-                      }
-                    ]
+                    "children": []
                   }
                 ]
               }
@@ -287,7 +280,7 @@ The Aggregation operator will merge into OpenSearch Aggregation::
           {
             "name": "OpenSearchIndexScan",
             "description": {
-              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":0,\"timeout\":\"1m\",\"aggregations\":{\"composite_buckets\":{\"composite\":{\"size\":1000,\"sources\":[{\"gender\":{\"terms\":{\"field\":\"gender.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}}]},\"aggregations\":{\"avg(age)\":{\"avg\":{\"field\":\"age\"}}}}}}, searchDone=false)"
+              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"aggregations\":{\"composite_buckets\":{\"composite\":{\"size\":1000,\"sources\":[{\"gender\":{\"terms\":{\"field\":\"gender.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}}]},\"aggregations\":{\"avg(age)\":{\"avg\":{\"field\":\"age\"}}}}}}, searchDone=false)"
             },
             "children": []
           }
@@ -313,7 +306,7 @@ The Sort operator will merge into OpenSearch Aggregation.::
           {
             "name": "OpenSearchIndexScan",
             "description": {
-              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":0,\"timeout\":\"1m\",\"aggregations\":{\"composite_buckets\":{\"composite\":{\"size\":1000,\"sources\":[{\"gender\":{\"terms\":{\"field\":\"gender.keyword\",\"missing_bucket\":true,\"missing_order\":\"last\",\"order\":\"desc\"}}}]},\"aggregations\":{\"avg(age)\":{\"avg\":{\"field\":\"age\"}}}}}}, searchDone=false)"
+              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"aggregations\":{\"composite_buckets\":{\"composite\":{\"size\":1000,\"sources\":[{\"gender\":{\"terms\":{\"field\":\"gender.keyword\",\"missing_bucket\":true,\"missing_order\":\"last\",\"order\":\"desc\"}}}]},\"aggregations\":{\"avg(age)\":{\"avg\":{\"field\":\"age\"}}}}}}, searchDone=false)"
             },
             "children": []
           }
@@ -348,7 +341,7 @@ Because the OpenSearch Composite Aggregation doesn't support order by metrics fi
               {
                 "name": "OpenSearchIndexScan",
                 "description": {
-                  "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":0,\"timeout\":\"1m\",\"aggregations\":{\"composite_buckets\":{\"composite\":{\"size\":1000,\"sources\":[{\"gender\":{\"terms\":{\"field\":\"gender.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}}]},\"aggregations\":{\"avg(age)\":{\"avg\":{\"field\":\"age\"}}}}}}, searchDone=false)"
+                  "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"aggregations\":{\"composite_buckets\":{\"composite\":{\"size\":1000,\"sources\":[{\"gender\":{\"terms\":{\"field\":\"gender.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}}]},\"aggregations\":{\"avg(age)\":{\"avg\":{\"field\":\"age\"}}}}}}, searchDone=false)"
                 },
                 "children": []
               }
@@ -373,4 +366,4 @@ At the moment there is no optimization to merge similar sort operators to avoid
 
 Sort Push Down
 --------------
-Without sort push down optimization, the sort operator will sort the result from child operator. By default, only 200 docs will extracted from the source index, `you can change this value by using size_limit setting <../admin/settings.rst#opensearch-query-size-limit>`_.
+Without sort push down optimization, the sort operator will sort the result from child operator. By default, only 10000 docs will extracted from the source index, `you can change this value by using size_limit setting <../admin/settings.rst#opensearch-query-size-limit>`_.
diff --git a/docs/user/ppl/admin/connectors/prometheus_connector.rst b/docs/user/ppl/admin/connectors/prometheus_connector.rst
new file mode 100644
index 0000000000..812df4f894
--- /dev/null
+++ b/docs/user/ppl/admin/connectors/prometheus_connector.rst
@@ -0,0 +1,279 @@
+.. highlight:: sh
+
+====================
+Prometheus Connector
+====================
+
+.. rubric:: Table of contents
+
+.. contents::
+   :local:
+   :depth: 1
+
+
+Introduction
+============
+
+This page covers prometheus connector properties for dataSource configuration
+and the nuances associated with prometheus connector.
+
+
+Prometheus Connector Properties in DataSource Configuration
+========================================================
+Prometheus Connector Properties.
+
+* ``prometheus.uri`` [Required].
+    * This parameters provides the URI information to connect to a prometheus instance.
+* ``prometheus.auth.type`` [Optional]
+    * This parameters provides the authentication type information.
+    * Prometheus connector currently supports ``basicauth`` and ``awssigv4`` authentication mechanisms.
+    * If prometheus.auth.type is basicauth, following are required parameters.
+        * ``prometheus.auth.username`` and ``prometheus.auth.password``.
+    * If prometheus.auth.type is awssigv4, following are required parameters.
+        * ``prometheus.auth.region``, ``prometheus.auth.access_key`` and ``prometheus.auth.secret_key``
+
+Example prometheus dataSource configuration with different authentications
+=======================================================================
+
+No Auth ::
+
+    [{
+        "name" : "my_prometheus",
+        "connector": "prometheus",
+        "properties" : {
+            "prometheus.uri" : "http://localhost:9090"
+        }
+    }]
+
+Basic Auth ::
+
+    [{
+        "name" : "my_prometheus",
+        "connector": "prometheus",
+        "properties" : {
+            "prometheus.uri" : "http://localhost:9090",
+            "prometheus.auth.type" : "basicauth",
+            "prometheus.auth.username" : "admin",
+            "prometheus.auth.password" : "admin"
+        }
+    }]
+
+AWSSigV4 Auth::
+
+    [{
+        "name" : "my_prometheus",
+        "connector": "prometheus",
+        "properties" : {
+            "prometheus.uri" : "http://localhost:8080",
+            "prometheus.auth.type" : "awssigv4",
+            "prometheus.auth.region" : "us-east-1",
+            "prometheus.auth.access_key" : "{{accessKey}}"
+            "prometheus.auth.secret_key" : "{{secretKey}}"
+        }
+    }]
+
+PPL Query support for prometheus connector
+==========================================
+
+Metric as a Table
+---------------------------
+Each connector has to abstract the underlying datasource constructs into a table as part of the interface contract with the PPL query engine.
+Prometheus connector abstracts each metric as a table and the columns of this table are ``@value``, ``@timestamp``, ``label1``, ``label2``---.
+``@value`` represents metric measurement and ``@timestamp`` represents the timestamp at which the metric is collected. labels are tags associated with metric queried.
+For eg: ``handler``, ``code``, ``instance``, ``code`` are the labels associated with ``prometheus_http_requests_total`` metric. With this abstraction, we can query prometheus
+data using PPL syntax similar to opensearch indices.
+
+Sample Example::
+
+    > source = my_prometheus.prometheus_http_requests_total;
+
+    +--------+-----------------------+--------------+------+------------+------------+
+    | @value | @timestamp            | handler      | code | instance   | job        |
+    |--------+-----------------------+--------------+------+------------+------------|
+    | 5      | "2022-11-03 07:18:14" | "/-/ready"   | 200  | 192.15.1.1 | prometheus |
+    | 3      | "2022-11-03 07:18:24" | "/-/ready"   | 200  | 192.15.1.1 | prometheus |
+    | 7      | "2022-11-03 07:18:34" | "/-/ready"   | 200  | 192.15.1.1 | prometheus |
+    | 2      | "2022-11-03 07:18:44" | "/-/ready"   | 400  | 192.15.2.1 | prometheus |
+    | 9      | "2022-11-03 07:18:54" | "/-/promql"  | 400  | 192.15.2.1 | prometheus |
+    | 11     | "2022-11-03 07:18:64" | "/-/metrics" | 500  | 192.15.2.1 | prometheus |
+    +--------+-----------------------+--------------+------+------------+------------+
+
+
+
+Default time range and resolution
+---------------------------------
+Since time range and resolution are required parameters for query apis and these parameters are determined in the following  manner from the PPL commands.
+* Time range is determined through filter clause on ``@timestamp``. If there is no such filter clause, time range will be set to 1h with endtime set to now().
+* In case of stats, resolution is determined by ``span(@timestamp,15s)`` expression. For normal select queries, resolution is auto determined from the time range set.
+
+Prometheus Connector Limitations
+--------------------------------
+* Only one aggregation is supported in stats command.
+* Span Expression is compulsory in stats command.
+* AVG, MAX, MIN, SUM, COUNT are the only aggregations supported in prometheus connector.
+* Where clause only supports EQUALS(=) operation on metric dimensions and Comparative(> , < , >= , <=) Operations on @timestamp attribute.
+
+Example queries
+---------------
+
+1. Metric Selection Query::
+
+    > source = my_prometheus.prometheus_http_requests_total
+    +--------+-----------------------+--------------+------+------------+------------+
+    | @value | @timestamp            | handler      | code | instance   | job        |
+    |--------+-----------------------+--------------+------+------------+------------|
+    | 5      | "2022-11-03 07:18:14" | "/-/ready"   | 200  | 192.15.1.1 | prometheus |
+    | 3      | "2022-11-03 07:18:24" | "/-/ready"   | 200  | 192.15.1.1 | prometheus |
+    | 7      | "2022-11-03 07:18:34" | "/-/ready"   | 200  | 192.15.1.1 | prometheus |
+    | 2      | "2022-11-03 07:18:44" | "/-/ready"   | 400  | 192.15.2.1 | prometheus |
+    | 9      | "2022-11-03 07:18:54" | "/-/promql"  | 400  | 192.15.2.1 | prometheus |
+    | 11     | "2022-11-03 07:18:64" | "/-/metrics" | 500  | 192.15.2.1 | prometheus |
+    +--------+-----------------------+--------------+------+------------+------------+
+
+2. Metric Selecting Query with specific dimensions::
+
+    > source = my_prometheus.prometheus_http_requests_total | where handler='/-/ready' and code='200'
+    +--------+-----------------------+------------+------+------------+------------+
+    | @value | @timestamp            | handler    | code | instance   | job        |
+    |--------+-----------------------+------------+------+------------+------------|
+    | 5      | "2022-11-03 07:18:14" | "/-/ready" | 200  | 192.15.1.1 | prometheus |
+    | 3      | "2022-11-03 07:18:24" | "/-/ready" | 200  | 192.15.1.1 | prometheus |
+    | 7      | "2022-11-03 07:18:34" | "/-/ready" | 200  | 192.15.1.1 | prometheus |
+    | 2      | "2022-11-03 07:18:44" | "/-/ready" | 200  | 192.15.2.1 | prometheus |
+    | 9      | "2022-11-03 07:18:54" | "/-/ready" | 200  | 192.15.2.1 | prometheus |
+    | 11     | "2022-11-03 07:18:64" | "/-/ready" | 200  | 192.15.2.1 | prometheus |
+    +--------+-----------------------+------------+------+------------+------------+
+
+3. Average aggregation on a metric::
+
+    > source = my_prometheus.prometheus_http_requests_total | stats avg(@value) by span(@timestamp,15s)
+    +------------+------------------------+
+    | avg(@value)| span(@timestamp,15s)   |
+    |------------+------------------------+
+    | 5          | "2022-11-03 07:18:14"  |
+    | 3          | "2022-11-03 07:18:24"  |
+    | 7          | "2022-11-03 07:18:34"  |
+    | 2          | "2022-11-03 07:18:44"  |
+    | 9          | "2022-11-03 07:18:54"  |
+    | 11         | "2022-11-03 07:18:64"  |
+    +------------+------------------------+
+
+4. Average aggregation grouped by dimensions::
+
+    > source = my_prometheus.prometheus_http_requests_total | stats avg(@value) by span(@timestamp,15s), handler, code
+    +------------+------------------------+--------------------------------+---------------+
+    | avg(@value)| span(@timestamp,15s)   |   handler                      | code          |
+    |------------+------------------------+--------------------------------+---------------+
+    | 5          | "2022-11-03 07:18:14"  | "/-/ready"                     | 200           |
+    | 3          | "2022-11-03 07:18:24"  | "/-/ready"                     | 200           |
+    | 7          | "2022-11-03 07:18:34"  | "/-/ready"                     | 200           |
+    | 2          | "2022-11-03 07:18:44"  | "/-/ready"                     | 400           |
+    | 9          | "2022-11-03 07:18:54"  | "/-/promql"                    | 400           |
+    | 11         | "2022-11-03 07:18:64"  | "/-/metrics"                   | 500           |
+    +------------+------------------------+--------------------------------+---------------+
+
+5. Count aggregation query::
+
+    > source = my_prometheus.prometheus_http_requests_total | stats count() by span(@timestamp,15s), handler, code
+    +------------+------------------------+--------------------------------+---------------+
+    | count()    | span(@timestamp,15s)   |   handler                      | code          |
+    |------------+------------------------+--------------------------------+---------------+
+    | 5          | "2022-11-03 07:18:14"  | "/-/ready"                     | 200           |
+    | 3          | "2022-11-03 07:18:24"  | "/-/ready"                     | 200           |
+    | 7          | "2022-11-03 07:18:34"  | "/-/ready"                     | 200           |
+    | 2          | "2022-11-03 07:18:44"  | "/-/ready"                     | 400           |
+    | 9          | "2022-11-03 07:18:54"  | "/-/promql"                    | 400           |
+    | 11         | "2022-11-03 07:18:64"  | "/-/metrics"                   | 500           |
+    +------------+------------------------+--------------------------------+---------------+
+
+PromQL Support for prometheus Connector
+==========================================
+
+`query_range` Table Function
+----------------------------
+* Prometheus connector offers `query_range` table function. This table function can be used to query metrics in a specific time range using promQL.
+* The function takes inputs similar to parameters mentioned for query range api mentioned here: https://prometheus.io/docs/prometheus/latest/querying/api/
+* Arguments should be either passed by name or positionArguments should be either passed by name or position.
+    - `source=my_prometheus.query_range('prometheus_http_requests_total', 1686694425, 1686700130, 14)`
+    - `source=my_prometheus.query_range(query='prometheus_http_requests_total', starttime=1686694425, endtime=1686700130, step=14)`
+Example::
+
+    > source=my_prometheus.query_range('prometheus_http_requests_total', 1686694425, 1686700130, 14)
+    +--------+-----------------------+--------------+------+------------+------------+
+    | @value | @timestamp            | handler      | code | instance   | job        |
+    |--------+-----------------------+--------------+------+------------+------------|
+    | 5      | "2022-11-03 07:18:14" | "/-/ready"   | 200  | 192.15.1.1 | prometheus |
+    | 3      | "2022-11-03 07:18:24" | "/-/ready"   | 200  | 192.15.1.1 | prometheus |
+    | 7      | "2022-11-03 07:18:34" | "/-/ready"   | 200  | 192.15.1.1 | prometheus |
+    | 2      | "2022-11-03 07:18:44" | "/-/ready"   | 400  | 192.15.2.1 | prometheus |
+    | 9      | "2022-11-03 07:18:54" | "/-/promql"  | 400  | 192.15.2.1 | prometheus |
+    | 11     | "2022-11-03 07:18:64" | "/-/metrics" | 500  | 192.15.2.1 | prometheus |
+    +--------+-----------------------+--------------+------+------------+------------+
+
+
+Prometheus Connector Table Functions
+==========================================
+
+`query_exemplars` Table Function
+----------------------------
+* This table function can be used to fetch exemplars of a query in a specific time range.
+* The function takes inputs similar to parameters mentioned for query exemplars api mentioned here: https://prometheus.io/docs/prometheus/latest/querying/api/
+* Arguments should be either passed by name or positionArguments should be either passed by name or position.
+    - `source=my_prometheus.query_exemplars('prometheus_http_requests_total', 1686694425, 1686700130)`
+    - `source=my_prometheus.query_exemplars(query='prometheus_http_requests_total', starttime=1686694425, endtime=1686700130)`
+Example::
+
+    > source=my_prometheus.query_exemplars('prometheus_http_requests_total', 1686694425, 1686700130)
+      "schema": [
+        {
+          "name": "seriesLabels",
+          "type": "struct"
+        },
+        {
+          "name": "exemplars",
+          "type": "array"
+        }
+      ],
+      "datarows": [
+        [
+          {
+            "instance": "localhost:8090",
+            "__name__": "test_exemplar_metric_total",
+            "service": "bar",
+            "job": "prometheus"
+          },
+          [
+            {
+              "labels": {
+                "traceID": "EpTxMJ40fUus7aGY"
+              },
+              "timestamp": "2020-09-14 15:22:25.479",
+              "value": 6.0
+            }
+          ]
+        ],
+        [
+          {
+            "instance": "localhost:8090",
+            "__name__": "test_exemplar_metric_total",
+            "service": "foo",
+            "job": "prometheus"
+          },
+          [
+            {
+              "labels": {
+                "traceID": "Olp9XHlq763ccsfa"
+              },
+              "timestamp": "2020-09-14 15:22:35.479",
+              "value": 19.0
+            },
+            {
+              "labels": {
+                "traceID": "hCtjygkIHwAN9vs4"
+              },
+              "timestamp": "2020-09-14 15:22:45.489",
+              "value": 20.0
+            }
+          ]
+        ]
+      ]
diff --git a/docs/user/ppl/admin/connectors/s3glue_connector.rst b/docs/user/ppl/admin/connectors/s3glue_connector.rst
new file mode 100644
index 0000000000..48f19a9d1e
--- /dev/null
+++ b/docs/user/ppl/admin/connectors/s3glue_connector.rst
@@ -0,0 +1,92 @@
+.. highlight:: sh
+
+====================
+S3Glue Connector
+====================
+
+.. rubric:: Table of contents
+
+.. contents::
+   :local:
+   :depth: 1
+
+
+Introduction
+============
+
+s3Glue connector provides a way to query s3 files using glue as metadata store and spark as execution engine.
+This page covers s3Glue datasource configuration and also how to query and s3Glue datasource.
+
+Required resources for s3 Glue Connector
+========================================
+* ``EMRServerless Spark Execution Engine Config Setting``:  Since we execute s3Glue queries on top of spark execution engine, we require this configuration.
+  More details: `ExecutionEngine Config <../../../interfaces/asyncqueryinterface.rst#id2>`_
+* ``S3``: This is where the data lies.
+* ``Glue`` Metadata store: Glue takes care of table metadata.
+* ``Opensearch IndexStore``: Index for s3 data lies in opensearch and also acts as temporary buffer for query results.
+
+We currently only support emr-serverless as spark execution engine and Glue as metadata store. we will add more support in future.
+
+Glue Connector Properties.
+
+* ``resultIndex`` is a new parameter specific to glue connector. Stores the results of queries executed on the data source. If unavailable, it defaults to .query_execution_result.
+* ``glue.auth.type`` [Required]
+    * This parameters provides the authentication type information required for execution engine to connect to glue.
+    * S3 Glue connector currently only supports ``iam_role`` authentication and the below parameters is required.
+        * ``glue.auth.role_arn``
+* ``glue.indexstore.opensearch.*`` [Required]
+    * This parameters provides the Opensearch domain host information for glue connector. This opensearch instance is used for writing index data back and also
+    * ``glue.indexstore.opensearch.uri`` [Required]
+    * ``glue.indexstore.opensearch.auth`` [Required]
+        * Accepted values include ["noauth", "basicauth", "awssigv4"]
+        * Basic Auth required ``glue.indexstore.opensearch.auth.username`` and ``glue.indexstore.opensearch.auth.password``
+        * AWSSigV4 Auth requires ``glue.indexstore.opensearch.auth.region``  and ``glue.auth.role_arn``
+    * ``glue.indexstore.opensearch.region`` [Required for awssigv4 auth]
+* ``glue.iceberg.enabled`` determines whether to enable Iceberg for the session. Default value is ``"false"`` if not specified.
+* ``glue.lakeformation.enabled`` determines whether to enable Lake Formation for queries when Iceberg is also enabled. If Iceberg is not enabled, then this property has no effect. Default value is ``"false"`` if not specified.
+* ``glue.lakeformation.session_tag`` what session tag to use when assuming the data source role. This property is required when both Iceberg and Lake Formation are enabled.
+
+Sample Glue dataSource configuration
+========================================
+
+Glue datasource configuration::
+
+    [{
+        "name" : "my_glue",
+        "connector": "s3glue",
+        "properties" : {
+                "glue.auth.type": "iam_role",
+                "glue.auth.role_arn": "role_arn",
+                "glue.indexstore.opensearch.uri": "http://localhost:9200",
+                "glue.indexstore.opensearch.auth" :"basicauth",
+                "glue.indexstore.opensearch.auth.username" :"username",
+                "glue.indexstore.opensearch.auth.password" :"password"
+        },
+        "resultIndex": "query_execution_result"
+    }]
+
+    [{
+        "name" : "my_glue",
+        "connector": "s3glue",
+        "properties" : {
+                "glue.auth.type": "iam_role",
+                "glue.auth.role_arn": "role_arn",
+                "glue.indexstore.opensearch.uri": "http://adsasdf.amazonopensearch.com:9200",
+                "glue.indexstore.opensearch.auth" :"awssigv4",
+                "glue.indexstore.opensearch.auth.region" :"us-east-1"
+        },
+        "resultIndex": "query_execution_result"
+    }]
+
+Sample s3Glue datasource queries APIS
+=====================================
+
+Sample Queries
+
+* Select Query : ``select * from mys3.default.http_logs limit 1"``
+* Create Covering Index Query: ``create index clientip_year on my_glue.default.http_logs (clientip, year) WITH (auto_refresh=true)``
+* Create Skipping Index: ``create skipping index on mys3.default.http_logs (status VALUE_SET)``
+
+These queries would work only top of async queries. Documentation: `Async Query APIs <../../../interfaces/asyncqueryinterface.rst>`_
+
+Documentation for Index Queries: https://github.com/opensearch-project/opensearch-spark/blob/main/docs/index.md
diff --git a/docs/user/ppl/admin/connectors/security_lake_connector.rst b/docs/user/ppl/admin/connectors/security_lake_connector.rst
new file mode 100644
index 0000000000..6afddca131
--- /dev/null
+++ b/docs/user/ppl/admin/connectors/security_lake_connector.rst
@@ -0,0 +1,78 @@
+.. highlight:: sh
+
+====================
+Security Lake Connector
+====================
+
+.. rubric:: Table of contents
+
+.. contents::
+   :local:
+   :depth: 1
+
+
+Introduction
+============
+
+Security Lake connector provides a way to query Security Lake tables.
+
+Required resources for Security Lake Connector
+========================================
+* ``EMRServerless Spark Execution Engine Config Setting``:  Since we execute s3Glue queries on top of spark execution engine, we require this configuration.
+  More details: `ExecutionEngine Config <../../../interfaces/asyncqueryinterface.rst#id2>`_
+* ``S3``: This is where the data lies.
+* ``Glue``: Metadata store: Glue takes care of table metadata.
+* ``Lake Formation``: AWS service that performs authorization on Security Lake tables
+* ``Security Lake``: AWS service that orchestrates creation of S3 files, Glue tables, and Lake Formation permissions.
+* ``Opensearch IndexStore``: Index for s3 data lies in opensearch and also acts as temporary buffer for query results.
+
+We currently only support emr-serverless as spark execution engine and Glue as metadata store. we will add more support in future.
+
+Glue Connector Properties.
+
+* ``resultIndex`` is a new parameter specific to glue connector. Stores the results of queries executed on the data source. If unavailable, it defaults to .query_execution_result.
+* ``glue.auth.type`` [Required]
+    * This parameters provides the authentication type information required for execution engine to connect to glue.
+    * S3 Glue connector currently only supports ``iam_role`` authentication and the below parameters is required.
+        * ``glue.auth.role_arn``
+* ``glue.indexstore.opensearch.*`` [Required]
+    * This parameters provides the Opensearch domain host information for glue connector. This opensearch instance is used for writing index data back and also
+    * ``glue.indexstore.opensearch.uri`` [Required]
+    * ``glue.indexstore.opensearch.auth`` [Required]
+        * Accepted values include ["noauth", "basicauth", "awssigv4"]
+        * Basic Auth required ``glue.indexstore.opensearch.auth.username`` and ``glue.indexstore.opensearch.auth.password``
+        * AWSSigV4 Auth requires ``glue.indexstore.opensearch.auth.region``  and ``glue.auth.role_arn``
+    * ``glue.indexstore.opensearch.region`` [Required for awssigv4 auth]
+* ``glue.lakeformation.session_tag`` [Required]
+    * What session tag to use when assuming the data source role.
+
+Sample Glue dataSource configuration
+========================================
+
+Glue datasource configuration::
+
+    [{
+        "name" : "my_sl",
+        "connector": "security_lake",
+        "properties" : {
+                "glue.auth.type": "iam_role",
+                "glue.auth.role_arn": "role_arn",
+                "glue.indexstore.opensearch.uri": "http://adsasdf.amazonopensearch.com:9200",
+                "glue.indexstore.opensearch.auth" :"awssigv4",
+                "glue.indexstore.opensearch.auth.region" :"us-east-1",
+                "glue.lakeformation.session_tag": "sesson_tag"
+        },
+        "resultIndex": "query_execution_result"
+    }]
+
+Sample Security Lake datasource queries APIS
+=====================================
+
+Sample Queries
+
+* Select Query : ``select * from mysl.amazon_security_lake_glue_db_eu_west_1.amazon_security_lake_table_eu_west_1_vpc_flow_2_0 limit 1``
+* Create Covering Index Query: ``create index srcip_time on mysl.amazon_security_lake_glue_db_eu_west_1.amazon_security_lake_table_eu_west_1_vpc_flow_2_0 (src_endpoint.ip, time) WITH (auto_refresh=true)``
+
+These queries would work only top of async queries. Documentation: `Async Query APIs <../../../interfaces/asyncqueryinterface.rst>`_
+
+Documentation for Index Queries: https://github.com/opensearch-project/opensearch-spark/blob/main/docs/index.md
diff --git a/docs/user/ppl/admin/connectors/spark_connector.rst b/docs/user/ppl/admin/connectors/spark_connector.rst
new file mode 100644
index 0000000000..59a52998bc
--- /dev/null
+++ b/docs/user/ppl/admin/connectors/spark_connector.rst
@@ -0,0 +1,92 @@
+.. highlight:: sh
+
+====================
+Spark Connector
+====================
+
+.. rubric:: Table of contents
+
+.. contents::
+   :local:
+   :depth: 1
+
+
+Introduction
+============
+
+This page covers spark connector properties for dataSource configuration
+and the nuances associated with spark connector.
+
+
+Spark Connector Properties in DataSource Configuration
+========================================================
+Spark Connector Properties.
+
+* ``spark.connector`` [Required].
+    * This parameters provides the spark client information for connection.
+* ``spark.sql.application`` [Optional].
+    * This parameters provides the spark sql application jar. Default value is ``s3://spark-datasource/sql-job.jar``.
+* ``emr.cluster`` [Required].
+    * This parameters provides the emr cluster id information.
+* ``emr.auth.type`` [Required]
+    * This parameters provides the authentication type information.
+    * Spark emr connector currently supports ``awssigv4`` authentication mechanism and following parameters are required.
+        * ``emr.auth.region``, ``emr.auth.access_key`` and ``emr.auth.secret_key``
+* ``spark.datasource.flint.*`` [Optional]
+    * This parameters provides the Opensearch domain host information for flint integration.
+    * ``spark.datasource.flint.integration`` [Optional]
+        * Default value for integration jar is ``s3://spark-datasource/flint-spark-integration-assembly-0.3.0-SNAPSHOT.jar``.
+    * ``spark.datasource.flint.host`` [Optional]
+        * Default value for host is ``localhost``.
+    * ``spark.datasource.flint.port`` [Optional]
+        * Default value for port is ``9200``.
+    * ``spark.datasource.flint.scheme`` [Optional]
+        * Default value for scheme is ``http``.
+    * ``spark.datasource.flint.auth`` [Optional]
+        * Default value for auth is ``false``.
+    * ``spark.datasource.flint.region`` [Optional]
+        * Default value for auth is ``us-west-2``.
+
+Example spark dataSource configuration
+========================================
+
+AWSSigV4 Auth::
+
+    [{
+        "name" : "my_spark",
+        "connector": "spark",
+        "properties" : {
+            "spark.connector": "emr",
+            "emr.cluster" : "{{clusterId}}",
+            "emr.auth.type" : "awssigv4",
+            "emr.auth.region" : "us-east-1",
+            "emr.auth.access_key" : "{{accessKey}}"
+            "emr.auth.secret_key" : "{{secretKey}}"
+            "spark.datasource.flint.host" : "{{opensearchHost}}",
+            "spark.datasource.flint.port" : "{{opensearchPort}}",
+            "spark.datasource.flint.scheme" : "{{opensearchScheme}}",
+            "spark.datasource.flint.auth" : "{{opensearchAuth}}",
+            "spark.datasource.flint.region" : "{{opensearchRegion}}",
+        }
+    }]
+
+
+Spark SQL Support
+==================
+
+`sql` Function
+----------------------------
+Spark connector offers `sql` function. This function can be used to run spark sql query.
+The function takes spark sql query as input. Argument should be either passed by name or positionArguments should be either passed by name or position.
+`source=my_spark.sql('select 1')`
+or
+`source=my_spark.sql(query='select 1')`
+Example::
+
+    > source=my_spark.sql('select 1')
+    +---+
+    | 1 |
+    |---+
+    | 1 |
+    +---+
+
diff --git a/docs/user/ppl/admin/cross_cluster_search.rst b/docs/user/ppl/admin/cross_cluster_search.rst
new file mode 100644
index 0000000000..4b267a9340
--- /dev/null
+++ b/docs/user/ppl/admin/cross_cluster_search.rst
@@ -0,0 +1,96 @@
+.. highlight:: sh
+
+====================
+Cross-Cluster Search
+====================
+
+.. rubric:: Table of contents
+
+.. contents::
+   :local:
+   :depth: 1
+
+Introduction
+============
+Cross-cluster search lets any node in a cluster execute search requests against other clusters.
+It makes searching easy across all connected clusters, allowing users to use multiple smaller clusters instead of a single large one.
+
+
+Configuration
+=============
+On the local cluster, add the remote cluster name and the IP address with port 9300 for each seed node. ::
+
+    PUT _cluster/settings
+    {
+      "persistent": {
+        "cluster.remote": {
+          "<remote-cluster-name>": {
+            "seeds": ["<remote-cluster-IP-address>:9300"]
+          }
+        }
+      }
+    }
+
+
+Using Cross-Cluster Search in PPL
+=================================
+Perform cross-cluster search by using "<cluster-name>:<index-name>" as the index identifier.
+
+Example PPL query::
+
+    os> source=my_remote_cluster:accounts;
+    fetched rows / total rows = 4/4
+    +----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------+
+    | account_number | firstname | address              | balance | gender | city   | employer | state | age | email                 | lastname |
+    |----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------|
+    | 1              | Amber     | 880 Holmes Lane      | 39225   | M      | Brogan | Pyrami   | IL    | 32  | amberduke@pyrami.com  | Duke     |
+    | 6              | Hattie    | 671 Bristol Street   | 5686    | M      | Dante  | Netagy   | TN    | 36  | hattiebond@netagy.com | Bond     |
+    | 13             | Nanette   | 789 Madison Street   | 32838   | F      | Nogal  | Quility  | VA    | 28  | null                  | Bates    |
+    | 18             | Dale      | 467 Hutchinson Court | 4180    | M      | Orick  | null     | MD    | 33  | daleadams@boink.com   | Adams    |
+    +----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------+
+
+
+Limitation
+==========
+Since OpenSearch does not support cross cluster index metadata retrieval, field mapping of a remote cluster index is not available to the local cluster.
+(`[Feature] Cross cluster field mappings query #6573 <https://github.com/opensearch-project/OpenSearch/issues/6573>`_)
+Therefore, the query engine requires that for any remote cluster index that the users need to search,
+the local cluster keep a field mapping system index with the same index name.
+This can be done by creating an index on the local cluster with the same name and schema as the remote cluster index.
+
+
+Authentication and Permission
+=============================
+
+1. The security plugin authenticates the user on the local cluster.
+2. The security plugin fetches the user’s backend roles on the local cluster.
+3. The call, including the authenticated user, is forwarded to the remote cluster.
+4. The user’s permissions are evaluated on the remote cluster.
+
+Check `Cross-cluster search access control <https://opensearch.org/docs/latest/security/access-control/cross-cluster-search/>`_ for more details.
+
+Example: Create the ppl_role for test_user on local cluster and the ccs_role for test_user on remote cluster. Then test_user could use PPL to query ``ppl-security-demo`` index on remote cluster.
+
+1. On the local cluster, refer to `Security Settings <security.rst>`_ to create role and user for PPL plugin and index access permission.
+
+2. On the remote cluster, create a new role and grant permission to access index. Create a user with the same name and credentials as the local cluster, and map the user to this role::
+
+    PUT _plugins/_security/api/roles/ccs_role
+    {
+      "index_permissions":[
+        {
+          "index_patterns":["ppl-security-demo"],
+          "allowed_actions":[
+            "indices:admin/shards/search_shards",
+            "indices:data/read/search"
+          ]
+        }
+      ]
+    }
+
+    PUT _plugins/_security/api/rolesmapping/ccs_role
+    {
+      "backend_roles" : [],
+      "hosts" : [],
+      "users" : ["test_user"]
+    }
diff --git a/docs/user/ppl/admin/datasources.rst b/docs/user/ppl/admin/datasources.rst
index 2974ac20ce..0c519fb8c1 100644
--- a/docs/user/ppl/admin/datasources.rst
+++ b/docs/user/ppl/admin/datasources.rst
@@ -17,6 +17,11 @@ The concept of ``datasource`` is introduced to support the federation of SQL/PPL
 This helps PPL users to leverage data from multiple data stores and derive correlation and insights.
 Datasource definition provides the information to connect to a data store and also gives a name to them to refer in PPL commands.
 
+Refer below sections for quick setup.
+
+* `Datasource configuration APIs`_
+* `Master Key config for encrypting credential information`_
+
 
 Definitions of datasource and connector
 ====================================
@@ -25,7 +30,7 @@ Definitions of datasource and connector
 
 Example Prometheus Datasource Definition ::
 
-    [{
+    {
         "name" : "my_prometheus",
         "connector": "prometheus",
         "properties" : {
@@ -33,35 +38,130 @@ Example Prometheus Datasource Definition ::
             "prometheus.auth.type" : "basicauth",
             "prometheus.auth.username" : "admin",
             "prometheus.auth.password" : "admin"
-        }
-    }]
+        },
+        "allowedRoles" : ["prometheus_access"],
+        "status" : "ACTIVE|DISABLED"
+    }
 Datasource configuration Restrictions.
 
 * ``name``, ``connector``, ``properties`` are required fields in the datasource configuration.
+* In case of secure domains, ``allowedRoles`` can be used to specify the opensearch roles allowed to access the datasource via PPL/SQL.
+* If ``allowedRoles`` are not specified for a datasource, only users with ``all_access`` could access the datasource in case of secure domains.
+* In case of security disabled domains, authorization is disbaled.
 * All the datasource names should be unique and match the following regex[``[@*A-Za-z]+?[*a-zA-Z_\-0-9]*``].
 * Allowed Connectors.
-    * ``prometheus`` [More details: `Prometheus Connector <prometheus_connector.rst>`_]
+    * ``prometheus`` [More details: `Prometheus Connector <connectors/prometheus_connector.rst>`_]
 * All the allowed config parameters in ``properties`` are defined in individual connector pages mentioned above.
+* From version 2.13, we have introduced a new optional field ``status`` which can be used to enable and disable a datasource.When a datasource is disabled, it blocks new queries, resulting in 400 errors for any attempts made on it. By default when a datasource is created, status is ACTIVE.
 
-Configuring a datasource in OpenSearch
+
+Datasource configuration APIs
 ======================================
+Datasource configuration can be managed using below REST APIs. All the examples below are for OpenSearch domains enabled with secure domain.
+we can remove authorization and other details in case of security disabled domains.
+
+* Datasource Creation POST API ("_plugins/_query/_datasources") ::
+
+    POST https://localhost:9200/_plugins/_query/_datasources
+    content-type: application/json
+    Authorization: Basic {{username}} {{password}}
+
+    {
+        "name" : "my_prometheus",
+        "connector": "prometheus",
+        "properties" : {
+            "prometheus.uri" : "http://localhost:8080",
+            "prometheus.auth.type" : "basicauth",
+            "prometheus.auth.username" : "admin",
+            "prometheus.auth.password" : "admin"
+        },
+        "allowedRoles" : ["prometheus_access"]
+    }
+
+* Datasource modification PUT API ("_plugins/_query/_datasources") ::
+
+    PUT https://localhost:9200/_plugins/_query/_datasources
+    content-type: application/json
+    Authorization: Basic {{username}} {{password}}
+
+    {
+        "name" : "my_prometheus",
+        "connector": "prometheus",
+        "properties" : {
+            "prometheus.uri" : "http://localhost:8080",
+            "prometheus.auth.type" : "basicauth",
+            "prometheus.auth.username" : "admin",
+            "prometheus.auth.password" : "admin"
+        },
+        "allowedRoles" : ["prometheus_access"]
+    }
+
+* Datasource modification PATCH API ("_plugins/_query/_datasources") ::
+
+    PATCH https://localhost:9200/_plugins/_query/_datasources
+    content-type: application/json
+    Authorization: Basic {{username}} {{password}}
 
-* Datasources are configured in opensearch keystore as secure settings under ``plugins.query.federation.datasources.config`` key as they contain credential info.
-* A json file containing array of datasource configurations should be injected into keystore with the above mentioned key. sample json file can be seen in the above section.
+    {
+        "name" : "my_prometheus",
+        "allowedRoles" : ["all_access"]
+    }
+
+  **Name is required and must exist. Connector cannot be modified and will be ignored.**
+
+* Datasource Read GET API("_plugins/_query/_datasources/{{dataSourceName}}" ::
+
+    GET https://localhost:9200/_plugins/_query/_datasources/my_prometheus
+    content-type: application/json
+    Authorization: Basic {{username}} {{password}}
+
+  **Authentication Information won't be vended out in GET API's response.**
+
+* Datasource Deletion DELETE API("_plugins/_query/_datasources/{{dataSourceName}}") ::
+
+    DELETE https://localhost:9200/_plugins/_query/_datasources/my_prometheus
+    content-type: application/json
+    Authorization: Basic {{username}} {{password}}
 
+Authorization of datasource configuration APIs
+==============================================
+Each of the datasource configuration management apis are controlled by following actions respectively.
 
-[**To be run on all the nodes in the cluster**] Command to add datasources.json file to OpenSearch Keystore ::
+* cluster:admin/opensearch/datasources/create [Create POST API]
+* cluster:admin/opensearch/datasources/read   [Get GET API]
+* cluster:admin/opensearch/datasources/update [Update PUT API]
+* cluster:admin/opensearch/datasources/patch [Update PATCH API]
+* cluster:admin/opensearch/datasources/delete [Delete DELETE API]
 
-    >> bin/opensearch-keystore add-file plugins.query.federation.datasource.config datasources.json
+Only users mapped with roles having above actions are authorized to execute datasource management apis.
 
-Datasources can be configured during opensearch start up or can be updated while the opensearch is running.
-If we update a datasource configuration during runtime, the following api should be triggered to update the query engine with the latest changes.
+Master Key config for encrypting credential information
+========================================================
+* When users provide credentials for a data source, the system encrypts and securely stores them in the metadata index. System uses "AES/GCM/NoPadding" symmetric encryption algorithm.
+* Master key is a required config and users can set this up by configuring the `plugins.query.datasources.encryption.masterkey` setting in the opensearch.yml file.
+* The master key must be 16, 24, or 32 characters long.
+* Sample Bash Script to generate a 24 character master key ::
 
-[**Required only if we update keystore settings during runtime**] Secure Settings refresh api::
+    #!/bin/bash
+    # Generate a 24-character key
+    master_key=$(openssl rand -hex 12)
+    echo "Master Key: $master_key"
+* Sample python script to generate a 24 character master key ::
 
-    >> curl --request POST \
-      --url http://{{opensearch-domain}}:9200/_nodes/reload_secure_settings \
-      --data '{"secure_settings_password":"{{keystore-password}}"}'
+    import random
+    import string
+
+    # Generate a 24-character random master key
+    master_key = ''.join(random.choices(string.ascii_letters + string.digits, k=24))
+
+    # Print the master key
+    print("Generated master key:", master_key)
+
+Datasource URI Hosts Deny Lists Config
+========================================================
+* In the OpenSearch configuration file (opensearch.yml), the parameter "plugins.query.datasources.uri.hosts.denylist" can be utilized to control the permitted host ips within the datasource URI configuration.
+* By default, the value is set to empty list, which allows any domain to be accepted.
+* For instance, if you set the value to `127.0.0.0/8`, ppl plugins will deny all the query requests where the datasource URI resolves to the ip range from `127.0.0.0` to `127.255.255.255`
 
 
 Using a datasource in PPL command
@@ -77,7 +177,38 @@ Example source command with prometheus datasource ::
     >> source = my_prometheus.prometheus_http_requests_total | stats avg(@value) by job;
 
 
-Limitations of datasource
-====================================
-Datasource settings are global and users with PPL access are allowed to fetch data from all the defined datasources.
-PPL access can be controlled using roles.(More details: `Security Settings <security.rst>`_)
\ No newline at end of file
+Authorization of PPL commands on datasources
+============================================
+In case of secure opensearch domains, only admins and users with roles mentioned in datasource configuration are allowed to make queries.
+For example: with below datasource configuration, only admins and users with prometheus_access role can run queries on my_prometheus datasource. ::
+
+    {
+        "name" : "my_prometheus",
+        "connector": "prometheus",
+        "properties" : {
+            "prometheus.uri" : "http://localhost:8080",
+            "prometheus.auth.type" : "basicauth",
+            "prometheus.auth.username" : "admin",
+            "prometheus.auth.password" : "admin"
+        },
+        "allowedRoles" : ["prometheus_access"]
+    }
+
+
+Moving from keystore datasource configuration
+=============================================
+* In versions prior to 2.7, the plugins.query.federation.datasources.config key store setting was used to configure datasources, but it has been deprecated and will be removed in version 3.0.
+* To port previously configured datasources from the keystore, users can use the `create datasource` REST API mentioned in the above section.
+
+Disabling a datasource to block new queries
+=============================================
+* We can disable a datasource using PATCH or PUT API. Below is the example request for disabling a datasource named "my_prometheus" using PATCH API. ::
+
+    PATCH https://localhost:9200/_plugins/_query/_datasources
+    content-type: application/json
+    Authorization: Basic {{username}} {{password}}
+
+    {
+        "name" : "my_prometheus",
+        "status" : "disabled"
+    }
diff --git a/docs/user/ppl/admin/prometheus_connector.rst b/docs/user/ppl/admin/prometheus_connector.rst
deleted file mode 100644
index fd84f8114c..0000000000
--- a/docs/user/ppl/admin/prometheus_connector.rst
+++ /dev/null
@@ -1,187 +0,0 @@
-.. highlight:: sh
-
-====================
-Prometheus Connector
-====================
-
-.. rubric:: Table of contents
-
-.. contents::
-   :local:
-   :depth: 1
-
-
-Introduction
-============
-
-This page covers prometheus connector properties for dataSource configuration
-and the nuances associated with prometheus connector.
-
-
-Prometheus Connector Properties in DataSource Configuration
-========================================================
-Prometheus Connector Properties.
-
-* ``prometheus.uri`` [Required].
-    * This parameters provides the URI information to connect to a prometheus instance.
-* ``prometheus.auth.type`` [Optional]
-    * This parameters provides the authentication type information.
-    * Prometheus connector currently supports ``basicauth`` and ``awssigv4`` authentication mechanisms.
-    * If prometheus.auth.type is basicauth, following are required parameters.
-        * ``prometheus.auth.username`` and ``prometheus.auth.password``.
-    * If prometheus.auth.type is awssigv4, following are required parameters.
-        * ``prometheus.auth.region``, ``prometheus.auth.access_key`` and ``prometheus.auth.secret_key``
-
-Example prometheus dataSource configuration with different authentications
-=======================================================================
-
-No Auth ::
-
-    [{
-        "name" : "my_prometheus",
-        "connector": "prometheus",
-        "properties" : {
-            "prometheus.uri" : "http://localhost:9090"
-        }
-    }]
-
-Basic Auth ::
-
-    [{
-        "name" : "my_prometheus",
-        "connector": "prometheus",
-        "properties" : {
-            "prometheus.uri" : "http://localhost:9090",
-            "prometheus.auth.type" : "basicauth",
-            "prometheus.auth.username" : "admin",
-            "prometheus.auth.password" : "admin"
-        }
-    }]
-
-AWSSigV4 Auth::
-
-    [{
-        "name" : "my_prometheus",
-        "connector": "prometheus",
-        "properties" : {
-            "prometheus.uri" : "http://localhost:8080",
-            "prometheus.auth.type" : "awssigv4",
-            "prometheus.auth.region" : "us-east-1",
-            "prometheus.auth.access_key" : "{{accessKey}}"
-            "prometheus.auth.secret_key" : "{{secretKey}}"
-        }
-    }]
-
-PPL Query support for prometheus connector
-==========================================
-
-Metric as a Table
----------------------------
-Each connector has to abstract the underlying datasource constructs into a table as part of the interface contract with the PPL query engine.
-Prometheus connector abstracts each metric as a table and the columns of this table are ``@value``, ``@timestamp``, ``label1``, ``label2``---.
-``@value`` represents metric measurement and ``@timestamp`` represents the timestamp at which the metric is collected. labels are tags associated with metric queried.
-For eg: ``handler``, ``code``, ``instance``, ``code`` are the labels associated with ``prometheus_http_requests_total`` metric. With this abstraction, we can query prometheus
-data using PPL syntax similar to opensearch indices.
-
-Sample Example::
-
-    > source = my_prometheus.prometheus_http_requests_total;
-
-    +------------+------------------------+--------------------------------+---------------+-------------+-------------+
-    | @value     | @timestamp             |   handler                      | code          | instance    | job         |
-    |------------+------------------------+--------------------------------+---------------+-------------+-------------|
-    | 5          | "2022-11-03 07:18:14"  | "/-/ready"                     | 200           | 192.15.1.1  | prometheus  |
-    | 3          | "2022-11-03 07:18:24"  | "/-/ready"                     | 200           | 192.15.1.1  | prometheus  |
-    | 7          | "2022-11-03 07:18:34"  | "/-/ready"                     | 200           | 192.15.1.1  | prometheus  |
-    | 2          | "2022-11-03 07:18:44"  | "/-/ready"                     | 400           | 192.15.2.1  | prometheus  |
-    | 9          | "2022-11-03 07:18:54"  | "/-/promql"                    | 400           | 192.15.2.1  | prometheus  |
-    | 11         | "2022-11-03 07:18:64"  |"/-/metrics"                    | 500           | 192.15.2.1  | prometheus  |
-    +------------+------------------------+--------------------------------+---------------+-------------+-------------+
-
-
-
-Default time range and resolution
----------------------------------
-Since time range and resolution are required parameters for query apis and these parameters are determined in the following  manner from the PPL commands.
-* Time range is determined through filter clause on ``@timestamp``. If there is no such filter clause, time range will be set to 1h with endtime set to now().
-* In case of stats, resolution is determined by ``span(@timestamp,15s)`` expression. For normal select queries, resolution is auto determined from the time range set.
-
-Prometheus Connector Limitations
---------------------------------
-* Only one aggregation is supported in stats command.
-* Span Expression is compulsory in stats command.
-* AVG, MAX, MIN, SUM, COUNT are the only aggregations supported in prometheus connector.
-
-Example queries
----------------
-
-1. Metric Selection Query::
-
-    > source = my_prometheus.prometheus_http_requests_total
-     +------------+------------------------+--------------------------------+---------------+-------------+-------------+
-    | @value     | @timestamp             |   handler                      | code          | instance    | job         |
-    |------------+------------------------+--------------------------------+---------------+-------------+-------------|
-    | 5          | "2022-11-03 07:18:14"  | "/-/ready"                     | 200           | 192.15.1.1  | prometheus  |
-    | 3          | "2022-11-03 07:18:24"  | "/-/ready"                     | 200           | 192.15.1.1  | prometheus  |
-    | 7          | "2022-11-03 07:18:34"  | "/-/ready"                     | 200           | 192.15.1.1  | prometheus  |
-    | 2          | "2022-11-03 07:18:44"  | "/-/ready"                     | 400           | 192.15.2.1  | prometheus  |
-    | 9          | "2022-11-03 07:18:54"  | "/-/promql"                    | 400           | 192.15.2.1  | prometheus  |
-    | 11         | "2022-11-03 07:18:64"  |"/-/metrics"                    | 500           | 192.15.2.1  | prometheus  |
-    +------------+------------------------+--------------------------------+---------------+-------------+-------------+
-
-2. Metric Selecting Query with specific dimensions::
-
-    > source = my_prometheus.prometheus_http_requests_total | where handler='/-/ready' and code='200'
-    +------------+------------------------+--------------------------------+---------------+-------------+-------------+
-    | @value     | @timestamp             |   handler                      | code          | instance    | job         |
-    |------------+------------------------+--------------------------------+---------------+-------------+-------------|
-    | 5          | "2022-11-03 07:18:14"  | "/-/ready"                     | 200           | 192.15.1.1  | prometheus  |
-    | 3          | "2022-11-03 07:18:24"  | "/-/ready"                     | 200           | 192.15.1.1  | prometheus  |
-    | 7          | "2022-11-03 07:18:34"  | "/-/ready"                     | 200           | 192.15.1.1  | prometheus  |
-    | 2          | "2022-11-03 07:18:44"  | "/-/ready"                     | 200           | 192.15.2.1  | prometheus  |
-    | 9          | "2022-11-03 07:18:54"  | "/-/ready"                     | 200           | 192.15.2.1  | prometheus  |
-    | 11         | "2022-11-03 07:18:64"  | "/-/ready"                     | 200           | 192.15.2.1  | prometheus  |
-    +------------+------------------------+--------------------------------+---------------+-------------+-------------+
-
-3. Average aggregation on a metric::
-
-    > source = my_prometheus.prometheus_http_requests_total | stats avg(@value) by span(@timestamp,15s)
-    +------------+------------------------+
-    | avg(@value)| span(@timestamp,15s)   |
-    |------------+------------------------+
-    | 5          | "2022-11-03 07:18:14"  |
-    | 3          | "2022-11-03 07:18:24"  |
-    | 7          | "2022-11-03 07:18:34"  |
-    | 2          | "2022-11-03 07:18:44"  |
-    | 9          | "2022-11-03 07:18:54"  |
-    | 11         | "2022-11-03 07:18:64"  |
-    +------------+------------------------+
-
-4. Average aggregation grouped by dimensions::
-
-    > source = my_prometheus.prometheus_http_requests_total | stats avg(@value) by span(@timestamp,15s), handler, code
-    +------------+------------------------+--------------------------------+---------------+
-    | avg(@value)| span(@timestamp,15s)   |   handler                      | code          |
-    |------------+------------------------+--------------------------------+---------------+
-    | 5          | "2022-11-03 07:18:14"  | "/-/ready"                     | 200           |
-    | 3          | "2022-11-03 07:18:24"  | "/-/ready"                     | 200           |
-    | 7          | "2022-11-03 07:18:34"  | "/-/ready"                     | 200           |
-    | 2          | "2022-11-03 07:18:44"  | "/-/ready"                     | 400           |
-    | 9          | "2022-11-03 07:18:54"  | "/-/promql"                    | 400           |
-    | 11         | "2022-11-03 07:18:64"  | "/-/metrics"                   | 500           |
-    +------------+------------------------+--------------------------------+---------------+
-
-5. Count aggregation query::
-
-    > source = my_prometheus.prometheus_http_requests_total | stats count() by span(@timestamp,15s), handler, code
-    +------------+------------------------+--------------------------------+---------------+
-    | count()    | span(@timestamp,15s)   |   handler                      | code          |
-    |------------+------------------------+--------------------------------+---------------+
-    | 5          | "2022-11-03 07:18:14"  | "/-/ready"                     | 200           |
-    | 3          | "2022-11-03 07:18:24"  | "/-/ready"                     | 200           |
-    | 7          | "2022-11-03 07:18:34"  | "/-/ready"                     | 200           |
-    | 2          | "2022-11-03 07:18:44"  | "/-/ready"                     | 400           |
-    | 9          | "2022-11-03 07:18:54"  | "/-/promql"                    | 400           |
-    | 11         | "2022-11-03 07:18:64"  | "/-/metrics"                   | 500           |
-    +------------+------------------------+--------------------------------+---------------+
-
diff --git a/docs/user/ppl/admin/security.rst b/docs/user/ppl/admin/security.rst
index 529704574b..e512cc259c 100644
--- a/docs/user/ppl/admin/security.rst
+++ b/docs/user/ppl/admin/security.rst
@@ -13,7 +13,7 @@ Security Settings
 Introduction
 ============
 
-User needs ``cluster:admin/opensearch/ppl`` permission to use PPL plugin. User also needs indices level permission ``indices:admin/mappings/get`` to get field mappings and ``indices:data/read/search*`` to search index.
+User needs ``cluster:admin/opensearch/ppl`` permission to use PPL plugin. User also needs indices level permission ``indices:admin/mappings/get`` to get field mappings, ``indices:monitor/settings/get`` to get cluster settings, and ``indices:data/read/search*`` to search index.
 
 Using Rest API
 ==============
@@ -34,7 +34,8 @@ Example: Create the ppl_role for test_user. then test_user could use PPL to quer
         ],
         "allowed_actions": [
           "indices:data/read/search*",
-          "indices:admin/mappings/get"
+          "indices:admin/mappings/get",
+          "indices:monitor/settings/get"
         ]
       }]
     }
diff --git a/docs/user/ppl/admin/settings.rst b/docs/user/ppl/admin/settings.rst
index 1a13d66d4f..28e6897d3d 100644
--- a/docs/user/ppl/admin/settings.rst
+++ b/docs/user/ppl/admin/settings.rst
@@ -63,6 +63,7 @@ PPL query::
 
     sh$ curl -sS -H 'Content-Type: application/json' \
     ... -X POST localhost:9200/_plugins/_ppl \
+    ... -d '{"query": "source=my_prometheus"}'
     {
       "error": {
         "reason": "Invalid Query",
@@ -124,9 +125,9 @@ plugins.query.size_limit
 Description
 -----------
 
-The size configure the maximum amount of documents to be pull from OpenSearch. The default value is: 200
+The size configure the maximum amount of documents to be pull from OpenSearch. The default value is: 10000
 
-Notes: This setting will impact the correctness of the aggregation operation, for example, there are 1000 docs in the index, by default, only 200 docs will be extract from index and do aggregation.
+Notes: This setting will impact the correctness of the aggregation operation, for example, there are 1000 docs in the index, if you change the value to 200, only 200 docs will be extract from index and do aggregation.
 
 Example
 -------
diff --git a/docs/user/ppl/cmd/ad.rst b/docs/user/ppl/cmd/ad.rst
index 103c7f7483..5d7a572c96 100644
--- a/docs/user/ppl/cmd/ad.rst
+++ b/docs/user/ppl/cmd/ad.rst
@@ -50,11 +50,11 @@ PPL query::
 
     > source=nyc_taxi | fields value, timestamp | AD time_field='timestamp' | where value=10844.0
     fetched rows / total rows = 1/1
-    +---------+---------------------+---------+-----------------+
-    | value   | timestamp           | score   | anomaly_grade   |
-    |---------+---------------------+---------+-----------------|
-    | 10844.0 | 2014-07-01 00:00:00 | 0.0     | 0.0             |
-    +---------+---------------------+---------+-----------------+
+    +---------+---------------------+-------+---------------+
+    | value   | timestamp           | score | anomaly_grade |
+    |---------+---------------------+-------+---------------|
+    | 10844.0 | 2014-07-01 00:00:00 | 0.0   | 0.0           |
+    +---------+---------------------+-------+---------------+
 
 Example 2: Detecting events in New York City from taxi ridership data with time-series data independently with each category
 ============================================================================================================================
@@ -65,12 +65,12 @@ PPL query::
 
     > source=nyc_taxi | fields category, value, timestamp | AD time_field='timestamp' category_field='category' | where value=10844.0 or value=6526.0
     fetched rows / total rows = 2/2
-    +------------+---------+---------------------+---------+-----------------+
-    | category   | value   | timestamp           | score   | anomaly_grade   |
-    |------------+---------+---------------------+---------+-----------------|
-    | night      | 10844.0 | 2014-07-01 00:00:00 | 0.0     | 0.0             |
-    | day        | 6526.0  | 2014-07-01 06:00:00 | 0.0     | 0.0             |
-    +------------+---------+---------------------+---------+-----------------+
+    +----------+---------+---------------------+-------+---------------+
+    | category | value   | timestamp           | score | anomaly_grade |
+    |----------+---------+---------------------+-------+---------------|
+    | night    | 10844.0 | 2014-07-01 00:00:00 | 0.0   | 0.0           |
+    | day      | 6526.0  | 2014-07-01 06:00:00 | 0.0   | 0.0           |
+    +----------+---------+---------------------+-------+---------------+
 
 
 Example 3: Detecting events in New York City from taxi ridership data with non-time-series data
@@ -82,11 +82,11 @@ PPL query::
 
     > source=nyc_taxi | fields value | AD | where value=10844.0
     fetched rows / total rows = 1/1
-    +---------+---------+-------------+
-    | value   | score   | anomalous   |
-    |---------+---------+-------------|
-    | 10844.0 | 0.0     | False       |
-    +---------+---------+-------------+
+    +---------+-------+-----------+
+    | value   | score | anomalous |
+    |---------+-------+-----------|
+    | 10844.0 | 0.0   | False     |
+    +---------+-------+-----------+
 
 Example 4: Detecting events in New York City from taxi ridership data with non-time-series data independently with each category
 ================================================================================================================================
@@ -97,9 +97,9 @@ PPL query::
 
     > source=nyc_taxi | fields category, value | AD category_field='category' | where value=10844.0 or value=6526.0
     fetched rows / total rows = 2/2
-    +------------+---------+---------+-------------+
-    | category   | value   | score   | anomalous   |
-    |------------+---------+---------+-------------|
-    | night      | 10844.0 | 0.0     | False       |
-    | day        | 6526.0  | 0.0     | False       |
-    +------------+---------+---------+-------------+
+    +----------+---------+-------+-----------+
+    | category | value   | score | anomalous |
+    |----------+---------+-------+-----------|
+    | night    | 10844.0 | 0.0   | False     |
+    | day      | 6526.0  | 0.0   | False     |
+    +----------+---------+-------+-----------+
diff --git a/docs/user/ppl/cmd/dedup.rst b/docs/user/ppl/cmd/dedup.rst
index ebceb9e0bd..362d1637f7 100644
--- a/docs/user/ppl/cmd/dedup.rst
+++ b/docs/user/ppl/cmd/dedup.rst
@@ -34,12 +34,12 @@ PPL query::
 
     os> source=accounts | dedup gender | fields account_number, gender;
     fetched rows / total rows = 2/2
-    +------------------+----------+
-    | account_number   | gender   |
-    |------------------+----------|
-    | 1                | M        |
-    | 13               | F        |
-    +------------------+----------+
+    +----------------+--------+
+    | account_number | gender |
+    |----------------+--------|
+    | 1              | M      |
+    | 13             | F      |
+    +----------------+--------+
 
 Example 2: Keep 2 duplicates documents
 ======================================
@@ -50,13 +50,13 @@ PPL query::
 
     os> source=accounts | dedup 2 gender | fields account_number, gender;
     fetched rows / total rows = 3/3
-    +------------------+----------+
-    | account_number   | gender   |
-    |------------------+----------|
-    | 1                | M        |
-    | 6                | M        |
-    | 13               | F        |
-    +------------------+----------+
+    +----------------+--------+
+    | account_number | gender |
+    |----------------+--------|
+    | 1              | M      |
+    | 6              | M      |
+    | 13             | F      |
+    +----------------+--------+
 
 Example 3: Keep or Ignore the empty field by default
 ============================================
@@ -67,14 +67,14 @@ PPL query::
 
     os> source=accounts | dedup email keepempty=true | fields account_number, email;
     fetched rows / total rows = 4/4
-    +------------------+-----------------------+
-    | account_number   | email                 |
-    |------------------+-----------------------|
-    | 1                | amberduke@pyrami.com  |
-    | 6                | hattiebond@netagy.com |
-    | 13               | null                  |
-    | 18               | daleadams@boink.com   |
-    +------------------+-----------------------+
+    +----------------+-----------------------+
+    | account_number | email                 |
+    |----------------+-----------------------|
+    | 1              | amberduke@pyrami.com  |
+    | 6              | hattiebond@netagy.com |
+    | 13             | null                  |
+    | 18             | daleadams@boink.com   |
+    +----------------+-----------------------+
 
 
 The example show dedup the document by ignore the empty value field.
@@ -83,13 +83,13 @@ PPL query::
 
     os> source=accounts | dedup email | fields account_number, email;
     fetched rows / total rows = 3/3
-    +------------------+-----------------------+
-    | account_number   | email                 |
-    |------------------+-----------------------|
-    | 1                | amberduke@pyrami.com  |
-    | 6                | hattiebond@netagy.com |
-    | 18               | daleadams@boink.com   |
-    +------------------+-----------------------+
+    +----------------+-----------------------+
+    | account_number | email                 |
+    |----------------+-----------------------|
+    | 1              | amberduke@pyrami.com  |
+    | 6              | hattiebond@netagy.com |
+    | 18             | daleadams@boink.com   |
+    +----------------+-----------------------+
 
 
 Example 4: Dedup in consecutive document
@@ -101,13 +101,13 @@ PPL query::
 
     os> source=accounts | dedup gender consecutive=true | fields account_number, gender;
     fetched rows / total rows = 3/3
-    +------------------+----------+
-    | account_number   | gender   |
-    |------------------+----------|
-    | 1                | M        |
-    | 13               | F        |
-    | 18               | M        |
-    +------------------+----------+
+    +----------------+--------+
+    | account_number | gender |
+    |----------------+--------|
+    | 1              | M      |
+    | 13             | F      |
+    | 18             | M      |
+    +----------------+--------+
 
 Limitation
 ==========
diff --git a/docs/user/ppl/cmd/describe.rst b/docs/user/ppl/cmd/describe.rst
index a0ecbd3169..2b03ceda57 100644
--- a/docs/user/ppl/cmd/describe.rst
+++ b/docs/user/ppl/cmd/describe.rst
@@ -33,21 +33,21 @@ PPL query::
 
     os> describe accounts;
     fetched rows / total rows = 11/11
-    +----------------+---------------+--------------+----------------+-------------+-------------+---------------+-----------------+------------------+------------------+------------+-----------+--------------+-----------------+--------------------+---------------------+--------------------+---------------+-----------------+----------------+---------------+--------------------+--------------------+----------------------+
-    | TABLE_CAT      | TABLE_SCHEM   | TABLE_NAME   | COLUMN_NAME    | DATA_TYPE   | TYPE_NAME   | COLUMN_SIZE   | BUFFER_LENGTH   | DECIMAL_DIGITS   | NUM_PREC_RADIX   | NULLABLE   | REMARKS   | COLUMN_DEF   | SQL_DATA_TYPE   | SQL_DATETIME_SUB   | CHAR_OCTET_LENGTH   | ORDINAL_POSITION   | IS_NULLABLE   | SCOPE_CATALOG   | SCOPE_SCHEMA   | SCOPE_TABLE   | SOURCE_DATA_TYPE   | IS_AUTOINCREMENT   | IS_GENERATEDCOLUMN   |
-    |----------------+---------------+--------------+----------------+-------------+-------------+---------------+-----------------+------------------+------------------+------------+-----------+--------------+-----------------+--------------------+---------------------+--------------------+---------------+-----------------+----------------+---------------+--------------------+--------------------+----------------------|
-    | docTestCluster | null          | accounts     | account_number | null        | long        | null          | null            | null             | 10               | 2          | null      | null         | null            | null               | null                | 0                  |               | null            | null           | null          | null               | NO                 |                      |
-    | docTestCluster | null          | accounts     | firstname      | null        | text        | null          | null            | null             | 10               | 2          | null      | null         | null            | null               | null                | 1                  |               | null            | null           | null          | null               | NO                 |                      |
-    | docTestCluster | null          | accounts     | address        | null        | text        | null          | null            | null             | 10               | 2          | null      | null         | null            | null               | null                | 2                  |               | null            | null           | null          | null               | NO                 |                      |
-    | docTestCluster | null          | accounts     | balance        | null        | long        | null          | null            | null             | 10               | 2          | null      | null         | null            | null               | null                | 3                  |               | null            | null           | null          | null               | NO                 |                      |
-    | docTestCluster | null          | accounts     | gender         | null        | text        | null          | null            | null             | 10               | 2          | null      | null         | null            | null               | null                | 4                  |               | null            | null           | null          | null               | NO                 |                      |
-    | docTestCluster | null          | accounts     | city           | null        | text        | null          | null            | null             | 10               | 2          | null      | null         | null            | null               | null                | 5                  |               | null            | null           | null          | null               | NO                 |                      |
-    | docTestCluster | null          | accounts     | employer       | null        | text        | null          | null            | null             | 10               | 2          | null      | null         | null            | null               | null                | 6                  |               | null            | null           | null          | null               | NO                 |                      |
-    | docTestCluster | null          | accounts     | state          | null        | text        | null          | null            | null             | 10               | 2          | null      | null         | null            | null               | null                | 7                  |               | null            | null           | null          | null               | NO                 |                      |
-    | docTestCluster | null          | accounts     | age            | null        | long        | null          | null            | null             | 10               | 2          | null      | null         | null            | null               | null                | 8                  |               | null            | null           | null          | null               | NO                 |                      |
-    | docTestCluster | null          | accounts     | email          | null        | text        | null          | null            | null             | 10               | 2          | null      | null         | null            | null               | null                | 9                  |               | null            | null           | null          | null               | NO                 |                      |
-    | docTestCluster | null          | accounts     | lastname       | null        | text        | null          | null            | null             | 10               | 2          | null      | null         | null            | null               | null                | 10                 |               | null            | null           | null          | null               | NO                 |                      |
-    +----------------+---------------+--------------+----------------+-------------+-------------+---------------+-----------------+------------------+------------------+------------+-----------+--------------+-----------------+--------------------+---------------------+--------------------+---------------+-----------------+----------------+---------------+--------------------+--------------------+----------------------+
+    +----------------+-------------+------------+----------------+-----------+-----------+-------------+---------------+----------------+----------------+----------+---------+------------+---------------+------------------+-------------------+------------------+-------------+---------------+--------------+-------------+------------------+------------------+--------------------+
+    | TABLE_CAT      | TABLE_SCHEM | TABLE_NAME | COLUMN_NAME    | DATA_TYPE | TYPE_NAME | COLUMN_SIZE | BUFFER_LENGTH | DECIMAL_DIGITS | NUM_PREC_RADIX | NULLABLE | REMARKS | COLUMN_DEF | SQL_DATA_TYPE | SQL_DATETIME_SUB | CHAR_OCTET_LENGTH | ORDINAL_POSITION | IS_NULLABLE | SCOPE_CATALOG | SCOPE_SCHEMA | SCOPE_TABLE | SOURCE_DATA_TYPE | IS_AUTOINCREMENT | IS_GENERATEDCOLUMN |
+    |----------------+-------------+------------+----------------+-----------+-----------+-------------+---------------+----------------+----------------+----------+---------+------------+---------------+------------------+-------------------+------------------+-------------+---------------+--------------+-------------+------------------+------------------+--------------------|
+    | docTestCluster | null        | accounts   | account_number | null      | long      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 0                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | firstname      | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 1                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | address        | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 2                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | balance        | null      | long      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 3                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | gender         | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 4                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | city           | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 5                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | employer       | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 6                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | state          | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 7                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | age            | null      | long      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 8                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | email          | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 9                |             | null          | null         | null        | null             | NO               |                    |
+    | docTestCluster | null        | accounts   | lastname       | null      | text      | null        | null          | null           | 10             | 2        | null    | null       | null          | null             | null              | 10               |             | null          | null         | null        | null             | NO               |                    |
+    +----------------+-------------+------------+----------------+-----------+-----------+-------------+---------------+----------------+----------------+----------+---------+------------+---------------+------------------+-------------------+------------------+-------------+---------------+--------------+-------------+------------------+------------------+--------------------+
 
 Example 2: Fetch metadata with condition and filter
 ===================================================
@@ -76,13 +76,13 @@ PPL query::
 
     os> describe my_prometheus.prometheus_http_requests_total;
     fetched rows / total rows = 6/6
-    +-----------------+----------------+--------------------------------+---------------+-------------+
-    | TABLE_CATALOG   | TABLE_SCHEMA   | TABLE_NAME                     | COLUMN_NAME   | DATA_TYPE   |
-    |-----------------+----------------+--------------------------------+---------------+-------------|
-    | my_prometheus   | default        | prometheus_http_requests_total | handler       | keyword     |
-    | my_prometheus   | default        | prometheus_http_requests_total | code          | keyword     |
-    | my_prometheus   | default        | prometheus_http_requests_total | instance      | keyword     |
-    | my_prometheus   | default        | prometheus_http_requests_total | @timestamp    | timestamp   |
-    | my_prometheus   | default        | prometheus_http_requests_total | @value        | double      |
-    | my_prometheus   | default        | prometheus_http_requests_total | job           | keyword     |
-    +-----------------+----------------+--------------------------------+---------------+-------------+
+    +---------------+--------------+--------------------------------+-------------+-----------+
+    | TABLE_CATALOG | TABLE_SCHEMA | TABLE_NAME                     | COLUMN_NAME | DATA_TYPE |
+    |---------------+--------------+--------------------------------+-------------+-----------|
+    | my_prometheus | default      | prometheus_http_requests_total | handler     | keyword   |
+    | my_prometheus | default      | prometheus_http_requests_total | code        | keyword   |
+    | my_prometheus | default      | prometheus_http_requests_total | instance    | keyword   |
+    | my_prometheus | default      | prometheus_http_requests_total | @timestamp  | timestamp |
+    | my_prometheus | default      | prometheus_http_requests_total | @value      | double    |
+    | my_prometheus | default      | prometheus_http_requests_total | job         | keyword   |
+    +---------------+--------------+--------------------------------+-------------+-----------+
diff --git a/docs/user/ppl/cmd/eval.rst b/docs/user/ppl/cmd/eval.rst
index 48a14ae0a8..c950028674 100644
--- a/docs/user/ppl/cmd/eval.rst
+++ b/docs/user/ppl/cmd/eval.rst
@@ -30,14 +30,14 @@ PPL query::
 
     os> source=accounts | eval doubleAge = age * 2 | fields age, doubleAge ;
     fetched rows / total rows = 4/4
-    +-------+-------------+
-    | age   | doubleAge   |
-    |-------+-------------|
-    | 32    | 64          |
-    | 36    | 72          |
-    | 28    | 56          |
-    | 33    | 66          |
-    +-------+-------------+
+    +-----+-----------+
+    | age | doubleAge |
+    |-----+-----------|
+    | 32  | 64        |
+    | 36  | 72        |
+    | 28  | 56        |
+    | 33  | 66        |
+    +-----+-----------+
 
 
 Example 2: Override the existing field
@@ -49,14 +49,14 @@ PPL query::
 
     os> source=accounts | eval age = age + 1 | fields age ;
     fetched rows / total rows = 4/4
-    +-------+
-    | age   |
-    |-------|
-    | 33    |
-    | 37    |
-    | 29    |
-    | 34    |
-    +-------+
+    +-----+
+    | age |
+    |-----|
+    | 33  |
+    | 37  |
+    | 29  |
+    | 34  |
+    +-----+
 
 Example 3: Create the new field with field defined in eval
 ==========================================================
@@ -67,14 +67,14 @@ PPL query::
 
     os> source=accounts | eval doubleAge = age * 2, ddAge = doubleAge * 2 | fields age, doubleAge, ddAge ;
     fetched rows / total rows = 4/4
-    +-------+-------------+---------+
-    | age   | doubleAge   | ddAge   |
-    |-------+-------------+---------|
-    | 32    | 64          | 128     |
-    | 36    | 72          | 144     |
-    | 28    | 56          | 112     |
-    | 33    | 66          | 132     |
-    +-------+-------------+---------+
+    +-----+-----------+-------+
+    | age | doubleAge | ddAge |
+    |-----+-----------+-------|
+    | 32  | 64        | 128   |
+    | 36  | 72        | 144   |
+    | 28  | 56        | 112   |
+    | 33  | 66        | 132   |
+    +-----+-----------+-------+
 
 Limitation
 ==========
diff --git a/docs/user/ppl/cmd/fields.rst b/docs/user/ppl/cmd/fields.rst
index dbae5b20a4..32c3a665d7 100644
--- a/docs/user/ppl/cmd/fields.rst
+++ b/docs/user/ppl/cmd/fields.rst
@@ -31,14 +31,14 @@ PPL query::
 
     os> source=accounts | fields account_number, firstname, lastname;
     fetched rows / total rows = 4/4
-    +------------------+-------------+------------+
-    | account_number   | firstname   | lastname   |
-    |------------------+-------------+------------|
-    | 1                | Amber       | Duke       |
-    | 6                | Hattie      | Bond       |
-    | 13               | Nanette     | Bates      |
-    | 18               | Dale        | Adams      |
-    +------------------+-------------+------------+
+    +----------------+-----------+----------+
+    | account_number | firstname | lastname |
+    |----------------+-----------+----------|
+    | 1              | Amber     | Duke     |
+    | 6              | Hattie    | Bond     |
+    | 13             | Nanette   | Bates    |
+    | 18             | Dale      | Adams    |
+    +----------------+-----------+----------+
 
 Example 2: Remove specified fields from result
 ==============================================
@@ -49,12 +49,12 @@ PPL query::
 
     os> source=accounts | fields account_number, firstname, lastname | fields - account_number ;
     fetched rows / total rows = 4/4
-    +-------------+------------+
-    | firstname   | lastname   |
-    |-------------+------------|
-    | Amber       | Duke       |
-    | Hattie      | Bond       |
-    | Nanette     | Bates      |
-    | Dale        | Adams      |
-    +-------------+------------+
+    +-----------+----------+
+    | firstname | lastname |
+    |-----------+----------|
+    | Amber     | Duke     |
+    | Hattie    | Bond     |
+    | Nanette   | Bates    |
+    | Dale      | Adams    |
+    +-----------+----------+
 
diff --git a/docs/user/ppl/cmd/grok.rst b/docs/user/ppl/cmd/grok.rst
index 6a121c7431..35f3b0c846 100644
--- a/docs/user/ppl/cmd/grok.rst
+++ b/docs/user/ppl/cmd/grok.rst
@@ -72,14 +72,14 @@ PPL query::
 
     os> source=apache | grok message '%{COMMONAPACHELOG}' | fields COMMONAPACHELOG, timestamp, response, bytes ;
     fetched rows / total rows = 4/4
-    +-----------------------------------------------------------------------------------------------------------------------------+----------------------------+------------+---------+
-    | COMMONAPACHELOG                                                                                                             | timestamp                  | response   | bytes   |
-    |-----------------------------------------------------------------------------------------------------------------------------+----------------------------+------------+---------|
-    | 177.95.8.74 - upton5450 [28/Sep/2022:10:15:57 -0700] "HEAD /e-business/mindshare HTTP/1.0" 404 19927                        | 28/Sep/2022:10:15:57 -0700 | 404        | 19927   |
-    | 127.45.152.6 - pouros8756 [28/Sep/2022:10:15:57 -0700] "GET /architectures/convergence/niches/mindshare HTTP/1.0" 100 28722 | 28/Sep/2022:10:15:57 -0700 | 100        | 28722   |
-    | 118.223.210.105 - - [28/Sep/2022:10:15:57 -0700] "PATCH /strategize/out-of-the-box HTTP/1.0" 401 27439                      | 28/Sep/2022:10:15:57 -0700 | 401        | 27439   |
-    | 210.204.15.104 - - [28/Sep/2022:10:15:57 -0700] "POST /users HTTP/1.1" 301 9481                                             | 28/Sep/2022:10:15:57 -0700 | 301        | 9481    |
-    +-----------------------------------------------------------------------------------------------------------------------------+----------------------------+------------+---------+
+    +-----------------------------------------------------------------------------------------------------------------------------+----------------------------+----------+-------+
+    | COMMONAPACHELOG                                                                                                             | timestamp                  | response | bytes |
+    |-----------------------------------------------------------------------------------------------------------------------------+----------------------------+----------+-------|
+    | 177.95.8.74 - upton5450 [28/Sep/2022:10:15:57 -0700] "HEAD /e-business/mindshare HTTP/1.0" 404 19927                        | 28/Sep/2022:10:15:57 -0700 | 404      | 19927 |
+    | 127.45.152.6 - pouros8756 [28/Sep/2022:10:15:57 -0700] "GET /architectures/convergence/niches/mindshare HTTP/1.0" 100 28722 | 28/Sep/2022:10:15:57 -0700 | 100      | 28722 |
+    | 118.223.210.105 - - [28/Sep/2022:10:15:57 -0700] "PATCH /strategize/out-of-the-box HTTP/1.0" 401 27439                      | 28/Sep/2022:10:15:57 -0700 | 401      | 27439 |
+    | 210.204.15.104 - - [28/Sep/2022:10:15:57 -0700] "POST /users HTTP/1.1" 301 9481                                             | 28/Sep/2022:10:15:57 -0700 | 301      | 9481  |
+    +-----------------------------------------------------------------------------------------------------------------------------+----------------------------+----------+-------+
 
 Limitations
 ===========
diff --git a/docs/user/ppl/cmd/head.rst b/docs/user/ppl/cmd/head.rst
index 1b4599f5de..cd4aed5a54 100644
--- a/docs/user/ppl/cmd/head.rst
+++ b/docs/user/ppl/cmd/head.rst
@@ -30,14 +30,14 @@ PPL query::
 
     os> source=accounts | fields firstname, age | head;
     fetched rows / total rows = 4/4
-    +-------------+-------+
-    | firstname   | age   |
-    |-------------+-------|
-    | Amber       | 32    |
-    | Hattie      | 36    |
-    | Nanette     | 28    |
-    | Dale        | 33    |
-    +-------------+-------+
+    +-----------+-----+
+    | firstname | age |
+    |-----------+-----|
+    | Amber     | 32  |
+    | Hattie    | 36  |
+    | Nanette   | 28  |
+    | Dale      | 33  |
+    +-----------+-----+
 
 Example 2: Get first N results
 ===========================================
@@ -48,13 +48,13 @@ PPL query::
 
     os> source=accounts | fields firstname, age | head 3;
     fetched rows / total rows = 3/3
-    +-------------+-------+
-    | firstname   | age   |
-    |-------------+-------|
-    | Amber       | 32    |
-    | Hattie      | 36    |
-    | Nanette     | 28    |
-    +-------------+-------+
+    +-----------+-----+
+    | firstname | age |
+    |-----------+-----|
+    | Amber     | 32  |
+    | Hattie    | 36  |
+    | Nanette   | 28  |
+    +-----------+-----+
 
 Example 3: Get first N results after offset M
 =============================================
@@ -65,13 +65,13 @@ PPL query::
 
     os> source=accounts | fields firstname, age | head 3 from 1;
     fetched rows / total rows = 3/3
-    +-------------+-------+
-    | firstname   | age   |
-    |-------------+-------|
-    | Hattie      | 36    |
-    | Nanette     | 28    |
-    | Dale        | 33    |
-    +-------------+-------+
+    +-----------+-----+
+    | firstname | age |
+    |-----------+-----|
+    | Hattie    | 36  |
+    | Nanette   | 28  |
+    | Dale      | 33  |
+    +-----------+-----+
 
 Limitation
 ==========
diff --git a/docs/user/ppl/cmd/information_schema.rst b/docs/user/ppl/cmd/information_schema.rst
index 26341d6972..4210502eda 100644
--- a/docs/user/ppl/cmd/information_schema.rst
+++ b/docs/user/ppl/cmd/information_schema.rst
@@ -29,11 +29,11 @@ PPL query for fetching PROMETHEUS TABLES with where clause::
 
     os> source = my_prometheus.information_schema.tables | where TABLE_NAME='prometheus_http_requests_total'
     fetched rows / total rows = 1/1
-    +-----------------+----------------+--------------------------------+--------------+--------+---------------------------+
-    | TABLE_CATALOG   | TABLE_SCHEMA   | TABLE_NAME                     | TABLE_TYPE   | UNIT   | REMARKS                   |
-    |-----------------+----------------+--------------------------------+--------------+--------+---------------------------|
-    | my_prometheus   | default        | prometheus_http_requests_total | counter      |        | Counter of HTTP requests. |
-    +-----------------+----------------+--------------------------------+--------------+--------+---------------------------+
+    +---------------+--------------+--------------------------------+------------+------+---------------------------+
+    | TABLE_CATALOG | TABLE_SCHEMA | TABLE_NAME                     | TABLE_TYPE | UNIT | REMARKS                   |
+    |---------------+--------------+--------------------------------+------------+------+---------------------------|
+    | my_prometheus | default      | prometheus_http_requests_total | counter    |      | Counter of HTTP requests. |
+    +---------------+--------------+--------------------------------+------------+------+---------------------------+
 
 
 Example 2: Search tables in prometheus datasource.
@@ -45,13 +45,13 @@ PPL query for searching PROMETHEUS TABLES::
 
     os> source = my_prometheus.information_schema.tables | where LIKE(TABLE_NAME, "%http%");
     fetched rows / total rows = 6/6
-     +-----------------+----------------+--------------------------------------------+--------------+--------+----------------------------------------------------+
-    | TABLE_CATALOG   | TABLE_SCHEMA   | TABLE_NAME                                 | TABLE_TYPE   | UNIT   | REMARKS                                            |
-    |-----------------+----------------+--------------------------------------------+--------------+--------+----------------------------------------------------|
-    | my_prometheus   | default        | prometheus_http_requests_total             | counter      |        | Counter of HTTP requests.                          |
-    | my_prometheus   | default        | promhttp_metric_handler_requests_in_flight | gauge        |        | Current number of scrapes being served.            |
-    | my_prometheus   | default        | prometheus_http_request_duration_seconds   | histogram    |        | Histogram of latencies for HTTP requests.          |
-    | my_prometheus   | default        | prometheus_sd_http_failures_total          | counter      |        | Number of HTTP service discovery refresh failures. |
-    | my_prometheus   | default        | promhttp_metric_handler_requests_total     | counter      |        | Total number of scrapes by HTTP status code.       |
-    | my_prometheus   | default        | prometheus_http_response_size_bytes        | histogram    |        | Histogram of response size for HTTP requests.      |
-    +-----------------+----------------+--------------------------------------------+--------------+--------+----------------------------------------------------+
+     +---------------+--------------+--------------------------------------------+------------+------+----------------------------------------------------+
+    | TABLE_CATALOG | TABLE_SCHEMA | TABLE_NAME                                 | TABLE_TYPE | UNIT | REMARKS                                            |
+    |---------------+--------------+--------------------------------------------+------------+------+----------------------------------------------------|
+    | my_prometheus | default      | prometheus_http_requests_total             | counter    |      | Counter of HTTP requests.                          |
+    | my_prometheus | default      | promhttp_metric_handler_requests_in_flight | gauge      |      | Current number of scrapes being served.            |
+    | my_prometheus | default      | prometheus_http_request_duration_seconds   | histogram  |      | Histogram of latencies for HTTP requests.          |
+    | my_prometheus | default      | prometheus_sd_http_failures_total          | counter    |      | Number of HTTP service discovery refresh failures. |
+    | my_prometheus | default      | promhttp_metric_handler_requests_total     | counter    |      | Total number of scrapes by HTTP status code.       |
+    | my_prometheus | default      | prometheus_http_response_size_bytes        | histogram  |      | Histogram of response size for HTTP requests.      |
+    +---------------+--------------+--------------------------------------------+------------+------+----------------------------------------------------+
diff --git a/docs/user/ppl/cmd/ml.rst b/docs/user/ppl/cmd/ml.rst
index 2e04674c1e..a48c1ec589 100644
--- a/docs/user/ppl/cmd/ml.rst
+++ b/docs/user/ppl/cmd/ml.rst
@@ -56,11 +56,11 @@ PPL query::
 
     os> source=nyc_taxi | fields value, timestamp | ml action='train' algorithm='rcf' time_field='timestamp' | where value=10844.0
     fetched rows / total rows = 1/1
-    +---------+---------------------+---------+-----------------+
-    | value   | timestamp           | score   | anomaly_grade   |
-    |---------+---------------------+---------+-----------------|
-    | 10844.0 | 2014-07-01 00:00:00 | 0.0     | 0.0             |
-    +---------+---------------------+---------+-----------------+
+    +---------+---------------------+-------+---------------+
+    | value   | timestamp           | score | anomaly_grade |
+    |---------+---------------------+-------+---------------|
+    | 10844.0 | 2014-07-01 00:00:00 | 0.0   | 0.0           |
+    +---------+---------------------+-------+---------------+
 
 Example 2: Detecting events in New York City from taxi ridership data with time-series data independently with each category
 ============================================================================================================================
@@ -71,12 +71,12 @@ PPL query::
 
     os> source=nyc_taxi | fields category, value, timestamp | ml action='train' algorithm='rcf' time_field='timestamp' category_field='category' | where value=10844.0 or value=6526.0
     fetched rows / total rows = 2/2
-    +------------+---------+---------------------+---------+-----------------+
-    | category   | value   | timestamp           | score   | anomaly_grade   |
-    |------------+---------+---------------------+---------+-----------------|
-    | night      | 10844.0 | 2014-07-01 00:00:00 | 0.0     | 0.0             |
-    | day        | 6526.0  | 2014-07-01 06:00:00 | 0.0     | 0.0             |
-    +------------+---------+---------------------+---------+-----------------+
+    +----------+---------+---------------------+-------+---------------+
+    | category | value   | timestamp           | score | anomaly_grade |
+    |----------+---------+---------------------+-------+---------------|
+    | night    | 10844.0 | 2014-07-01 00:00:00 | 0.0   | 0.0           |
+    | day      | 6526.0  | 2014-07-01 06:00:00 | 0.0   | 0.0           |
+    +----------+---------+---------------------+-------+---------------+
 
 
 Example 3: Detecting events in New York City from taxi ridership data with non-time-series data
@@ -88,11 +88,11 @@ PPL query::
 
     os> source=nyc_taxi | fields value | ml action='train' algorithm='rcf' | where value=10844.0
     fetched rows / total rows = 1/1
-    +---------+---------+-------------+
-    | value   | score   | anomalous   |
-    |---------+---------+-------------|
-    | 10844.0 | 0.0     | False       |
-    +---------+---------+-------------+
+    +---------+-------+-----------+
+    | value   | score | anomalous |
+    |---------+-------+-----------|
+    | 10844.0 | 0.0   | False     |
+    +---------+-------+-----------+
 
 Example 4: Detecting events in New York City from taxi ridership data with non-time-series data independently with each category
 ================================================================================================================================
@@ -103,12 +103,12 @@ PPL query::
 
     os> source=nyc_taxi | fields category, value | ml action='train' algorithm='rcf' category_field='category' | where value=10844.0 or value=6526.0
     fetched rows / total rows = 2/2
-    +------------+---------+---------+-------------+
-    | category   | value   | score   | anomalous   |
-    |------------+---------+---------+-------------|
-    | night      | 10844.0 | 0.0     | False       |
-    | day        | 6526.0  | 0.0     | False       |
-    +------------+---------+---------+-------------+
+    +----------+---------+-------+-----------+
+    | category | value   | score | anomalous |
+    |----------+---------+-------+-----------|
+    | night    | 10844.0 | 0.0   | False     |
+    | day      | 6526.0  | 0.0   | False     |
+    +----------+---------+-------+-----------+
 
 KMEANS
 ======
diff --git a/docs/user/ppl/cmd/parse.rst b/docs/user/ppl/cmd/parse.rst
index 82eff8ee85..d1015cccb9 100644
--- a/docs/user/ppl/cmd/parse.rst
+++ b/docs/user/ppl/cmd/parse.rst
@@ -72,13 +72,13 @@ PPL query::
 
     os> source=accounts | parse address '(?<streetNumber>\d+) (?<street>.+)' | where cast(streetNumber as int) > 500 | sort num(streetNumber) | fields streetNumber, street ;
     fetched rows / total rows = 3/3
-    +----------------+----------------+
-    | streetNumber   | street         |
-    |----------------+----------------|
-    | 671            | Bristol Street |
-    | 789            | Madison Street |
-    | 880            | Holmes Lane    |
-    +----------------+----------------+
+    +--------------+----------------+
+    | streetNumber | street         |
+    |--------------+----------------|
+    | 671          | Bristol Street |
+    | 789          | Madison Street |
+    | 880          | Holmes Lane    |
+    +--------------+----------------+
 
 Limitations
 ===========
diff --git a/docs/user/ppl/cmd/patterns.rst b/docs/user/ppl/cmd/patterns.rst
index 370404ecb6..13f08d0aa6 100644
--- a/docs/user/ppl/cmd/patterns.rst
+++ b/docs/user/ppl/cmd/patterns.rst
@@ -31,14 +31,14 @@ PPL query::
 
     os> source=accounts | patterns email | fields email, patterns_field ;
     fetched rows / total rows = 4/4
-    +-----------------------+------------------+
-    | email                 | patterns_field   |
-    |-----------------------+------------------|
-    | amberduke@pyrami.com  | @.               |
-    | hattiebond@netagy.com | @.               |
-    | null                  |                  |
-    | daleadams@boink.com   | @.               |
-    +-----------------------+------------------+
+    +-----------------------+----------------+
+    | email                 | patterns_field |
+    |-----------------------+----------------|
+    | amberduke@pyrami.com  | @.             |
+    | hattiebond@netagy.com | @.             |
+    | null                  |                |
+    | daleadams@boink.com   | @.             |
+    +-----------------------+----------------+
 
 Example 2: Extract log patterns
 ===============================
diff --git a/docs/user/ppl/cmd/rare.rst b/docs/user/ppl/cmd/rare.rst
index 35b660daa7..f6013711ae 100644
--- a/docs/user/ppl/cmd/rare.rst
+++ b/docs/user/ppl/cmd/rare.rst
@@ -32,12 +32,12 @@ PPL query::
 
     os> source=accounts | rare gender;
     fetched rows / total rows = 2/2
-    +----------+
-    | gender   |
-    |----------|
-    | F        |
-    | M        |
-    +----------+
+    +--------+
+    | gender |
+    |--------|
+    | F      |
+    | M      |
+    +--------+
 
 
 Example 2: Find the least common values organized by gender
@@ -49,14 +49,14 @@ PPL query::
 
     os> source=accounts | rare age by gender;
     fetched rows / total rows = 4/4
-    +----------+-------+
-    | gender   | age   |
-    |----------+-------|
-    | F        | 28    |
-    | M        | 32    |
-    | M        | 33    |
-    | M        | 36    |
-    +----------+-------+
+    +--------+-----+
+    | gender | age |
+    |--------+-----|
+    | F      | 28  |
+    | M      | 32  |
+    | M      | 33  |
+    | M      | 36  |
+    +--------+-----+
 
 Limitation
 ==========
diff --git a/docs/user/ppl/cmd/rename.rst b/docs/user/ppl/cmd/rename.rst
index a4383a9f5f..c942884248 100644
--- a/docs/user/ppl/cmd/rename.rst
+++ b/docs/user/ppl/cmd/rename.rst
@@ -31,14 +31,14 @@ PPL query::
 
     os> source=accounts | rename account_number as an | fields an;
     fetched rows / total rows = 4/4
-    +------+
-    | an   |
-    |------|
-    | 1    |
-    | 6    |
-    | 13   |
-    | 18   |
-    +------+
+    +----+
+    | an |
+    |----|
+    | 1  |
+    | 6  |
+    | 13 |
+    | 18 |
+    +----+
 
 
 Example 2: Rename multiple fields
@@ -50,14 +50,14 @@ PPL query::
 
     os> source=accounts | rename account_number as an, employer as emp | fields an, emp;
     fetched rows / total rows = 4/4
-    +------+---------+
-    | an   | emp     |
-    |------+---------|
-    | 1    | Pyrami  |
-    | 6    | Netagy  |
-    | 13   | Quility |
-    | 18   | null    |
-    +------+---------+
+    +----+---------+
+    | an | emp     |
+    |----+---------|
+    | 1  | Pyrami  |
+    | 6  | Netagy  |
+    | 13 | Quility |
+    | 18 | null    |
+    +----+---------+
 
 Limitation
 ==========
diff --git a/docs/user/ppl/cmd/search.rst b/docs/user/ppl/cmd/search.rst
index 120ce34d40..9e55daddeb 100644
--- a/docs/user/ppl/cmd/search.rst
+++ b/docs/user/ppl/cmd/search.rst
@@ -16,13 +16,18 @@ Description
 
 Syntax
 ============
-search source=<index> [boolean-expression]
+search source=[<remote-cluster>:]<index> [boolean-expression]
 
 * search: search keywords, which could be ignore.
-* index: mandatory. search command must specify which index to query from.
+* index: mandatory. search command must specify which index to query from. The index name can be prefixed by "<cluster name>:" for cross-cluster search.
 * bool-expression: optional. any expression which could be evaluated to boolean value.
 
 
+Cross-Cluster Search
+====================
+Cross-cluster search lets any node in a cluster execute search requests against other clusters. Refer to `Cross-Cluster Search <admin/cross_cluster_search.rst>`_ for configuration.
+
+
 Example 1: Fetch all the data
 =============================
 
@@ -32,14 +37,14 @@ PPL query::
 
     os> source=accounts;
     fetched rows / total rows = 4/4
-    +------------------+-------------+----------------------+-----------+----------+--------+------------+---------+-------+-----------------------+------------+
-    | account_number   | firstname   | address              | balance   | gender   | city   | employer   | state   | age   | email                 | lastname   |
-    |------------------+-------------+----------------------+-----------+----------+--------+------------+---------+-------+-----------------------+------------|
-    | 1                | Amber       | 880 Holmes Lane      | 39225     | M        | Brogan | Pyrami     | IL      | 32    | amberduke@pyrami.com  | Duke       |
-    | 6                | Hattie      | 671 Bristol Street   | 5686      | M        | Dante  | Netagy     | TN      | 36    | hattiebond@netagy.com | Bond       |
-    | 13               | Nanette     | 789 Madison Street   | 32838     | F        | Nogal  | Quility    | VA      | 28    | null                  | Bates      |
-    | 18               | Dale        | 467 Hutchinson Court | 4180      | M        | Orick  | null       | MD      | 33    | daleadams@boink.com   | Adams      |
-    +------------------+-------------+----------------------+-----------+----------+--------+------------+---------+-------+-----------------------+------------+
+    +----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------+
+    | account_number | firstname | address              | balance | gender | city   | employer | state | age | email                 | lastname |
+    |----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------|
+    | 1              | Amber     | 880 Holmes Lane      | 39225   | M      | Brogan | Pyrami   | IL    | 32  | amberduke@pyrami.com  | Duke     |
+    | 6              | Hattie    | 671 Bristol Street   | 5686    | M      | Dante  | Netagy   | TN    | 36  | hattiebond@netagy.com | Bond     |
+    | 13             | Nanette   | 789 Madison Street   | 32838   | F      | Nogal  | Quility  | VA    | 28  | null                  | Bates    |
+    | 18             | Dale      | 467 Hutchinson Court | 4180    | M      | Orick  | null     | MD    | 33  | daleadams@boink.com   | Adams    |
+    +----------------+-----------+----------------------+---------+--------+--------+----------+-------+-----+-----------------------+----------+
 
 Example 2: Fetch data with condition
 ====================================
@@ -50,10 +55,10 @@ PPL query::
 
     os> source=accounts account_number=1 or gender="F";
     fetched rows / total rows = 2/2
-    +------------------+-------------+--------------------+-----------+----------+--------+------------+---------+-------+----------------------+------------+
-    | account_number   | firstname   | address            | balance   | gender   | city   | employer   | state   | age   | email                | lastname   |
-    |------------------+-------------+--------------------+-----------+----------+--------+------------+---------+-------+----------------------+------------|
-    | 1                | Amber       | 880 Holmes Lane    | 39225     | M        | Brogan | Pyrami     | IL      | 32    | amberduke@pyrami.com | Duke       |
-    | 13               | Nanette     | 789 Madison Street | 32838     | F        | Nogal  | Quility    | VA      | 28    | null                 | Bates      |
-    +------------------+-------------+--------------------+-----------+----------+--------+------------+---------+-------+----------------------+------------+
+    +----------------+-----------+--------------------+---------+--------+--------+----------+-------+-----+----------------------+----------+
+    | account_number | firstname | address            | balance | gender | city   | employer | state | age | email                | lastname |
+    |----------------+-----------+--------------------+---------+--------+--------+----------+-------+-----+----------------------+----------|
+    | 1              | Amber     | 880 Holmes Lane    | 39225   | M      | Brogan | Pyrami   | IL    | 32  | amberduke@pyrami.com | Duke     |
+    | 13             | Nanette   | 789 Madison Street | 32838   | F      | Nogal  | Quility  | VA    | 28  | null                 | Bates    |
+    +----------------+-----------+--------------------+---------+--------+--------+----------+-------+-----+----------------------+----------+
 
diff --git a/docs/user/ppl/cmd/showdatasources.rst b/docs/user/ppl/cmd/showdatasources.rst
index f7c6beb82f..d954ef0c04 100644
--- a/docs/user/ppl/cmd/showdatasources.rst
+++ b/docs/user/ppl/cmd/showdatasources.rst
@@ -28,9 +28,9 @@ PPL query for all PROMETHEUS DATASOURCES::
 
     os> show datasources | where CONNECTOR_TYPE='PROMETHEUS';
     fetched rows / total rows = 1/1
-    +-------------------+------------------+
-    | DATASOURCE_NAME   | CONNECTOR_TYPE   |
-    |-------------------+------------------|
-    | my_prometheus     | PROMETHEUS       |
-    +-------------------+------------------+
+    +-----------------+----------------+
+    | DATASOURCE_NAME | CONNECTOR_TYPE |
+    |-----------------+----------------|
+    | my_prometheus   | PROMETHEUS     |
+    +-----------------+----------------+
 
diff --git a/docs/user/ppl/cmd/sort.rst b/docs/user/ppl/cmd/sort.rst
index 6a00ebc24c..377f0a5e01 100644
--- a/docs/user/ppl/cmd/sort.rst
+++ b/docs/user/ppl/cmd/sort.rst
@@ -32,14 +32,14 @@ PPL query::
 
     os> source=accounts | sort age | fields account_number, age;
     fetched rows / total rows = 4/4
-    +------------------+-------+
-    | account_number   | age   |
-    |------------------+-------|
-    | 13               | 28    |
-    | 1                | 32    |
-    | 18               | 33    |
-    | 6                | 36    |
-    +------------------+-------+
+    +----------------+-----+
+    | account_number | age |
+    |----------------+-----|
+    | 13             | 28  |
+    | 1              | 32  |
+    | 18             | 33  |
+    | 6              | 36  |
+    +----------------+-----+
 
 
 Example 2: Sort by one field return all the result
@@ -51,14 +51,14 @@ PPL query::
 
     os> source=accounts | sort age | fields account_number, age;
     fetched rows / total rows = 4/4
-    +------------------+-------+
-    | account_number   | age   |
-    |------------------+-------|
-    | 13               | 28    |
-    | 1                | 32    |
-    | 18               | 33    |
-    | 6                | 36    |
-    +------------------+-------+
+    +----------------+-----+
+    | account_number | age |
+    |----------------+-----|
+    | 13             | 28  |
+    | 1              | 32  |
+    | 18             | 33  |
+    | 6              | 36  |
+    +----------------+-----+
 
 
 Example 3: Sort by one field in descending order
@@ -70,14 +70,14 @@ PPL query::
 
     os> source=accounts | sort - age | fields account_number, age;
     fetched rows / total rows = 4/4
-    +------------------+-------+
-    | account_number   | age   |
-    |------------------+-------|
-    | 6                | 36    |
-    | 18               | 33    |
-    | 1                | 32    |
-    | 13               | 28    |
-    +------------------+-------+
+    +----------------+-----+
+    | account_number | age |
+    |----------------+-----|
+    | 6              | 36  |
+    | 18             | 33  |
+    | 1              | 32  |
+    | 13             | 28  |
+    +----------------+-----+
 
 Example 4: Sort by multiple field
 =============================
@@ -88,14 +88,14 @@ PPL query::
 
     os> source=accounts | sort + gender, - age | fields account_number, gender, age;
     fetched rows / total rows = 4/4
-    +------------------+----------+-------+
-    | account_number   | gender   | age   |
-    |------------------+----------+-------|
-    | 13               | F        | 28    |
-    | 6                | M        | 36    |
-    | 18               | M        | 33    |
-    | 1                | M        | 32    |
-    +------------------+----------+-------+
+    +----------------+--------+-----+
+    | account_number | gender | age |
+    |----------------+--------+-----|
+    | 13             | F      | 28  |
+    | 6              | M      | 36  |
+    | 18             | M      | 33  |
+    | 1              | M      | 32  |
+    +----------------+--------+-----+
 
 Example 4: Sort by field include null value
 ===========================================
@@ -106,11 +106,11 @@ PPL query::
 
     os> source=accounts | sort employer | fields employer;
     fetched rows / total rows = 4/4
-    +------------+
-    | employer   |
-    |------------|
-    | null       |
-    | Netagy     |
-    | Pyrami     |
-    | Quility    |
-    +------------+
+    +----------+
+    | employer |
+    |----------|
+    | null     |
+    | Netagy   |
+    | Pyrami   |
+    | Quility  |
+    +----------+
diff --git a/docs/user/ppl/cmd/stats.rst b/docs/user/ppl/cmd/stats.rst
index d9cca9e314..7d5da804ce 100644
--- a/docs/user/ppl/cmd/stats.rst
+++ b/docs/user/ppl/cmd/stats.rst
@@ -43,7 +43,7 @@ stats <aggregation>... [by-clause]
  * Description: The by clause could be the fields and expressions like scalar functions and aggregation functions. Besides, the span clause can be used to split specific field into buckets in the same interval, the stats then does the aggregation by these span buckets.
  * Default: If no <by-clause> is specified, the stats command returns only one row, which is the aggregation over the entire result set.
 
-* span-expression: optional.
+* span-expression: optional, at most one.
 
  * Syntax: span(field_expr, interval_expr)
  * Description: The unit of the interval expression is the natural unit by default. If the field is a date and time type field, and the interval is in date/time units, you will need to specify the unit in the interval expression. For example, to split the field ``age`` into buckets by 10 years, it looks like ``span(age, 10)``. And here is another example of time span, the span to split a ``timestamp`` field into hourly intervals, it looks like ``span(timestamp, 1h)``.
@@ -86,11 +86,11 @@ Example::
 
     os> source=accounts | stats count();
     fetched rows / total rows = 1/1
-    +-----------+
-    | count()   |
-    |-----------|
-    | 4         |
-    +-----------+
+    +---------+
+    | count() |
+    |---------|
+    | 4       |
+    +---------+
 
 SUM
 ---
@@ -104,12 +104,12 @@ Example::
 
     os> source=accounts | stats sum(age) by gender;
     fetched rows / total rows = 2/2
-    +------------+----------+
-    | sum(age)   | gender   |
-    |------------+----------|
-    | 28         | F        |
-    | 101        | M        |
-    +------------+----------+
+    +----------+--------+
+    | sum(age) | gender |
+    |----------+--------|
+    | 28       | F      |
+    | 101      | M      |
+    +----------+--------+
 
 AVG
 ---
@@ -123,12 +123,12 @@ Example::
 
     os> source=accounts | stats avg(age) by gender;
     fetched rows / total rows = 2/2
-    +--------------------+----------+
-    | avg(age)           | gender   |
-    |--------------------+----------|
-    | 28.0               | F        |
-    | 33.666666666666664 | M        |
-    +--------------------+----------+
+    +--------------------+--------+
+    | avg(age)           | gender |
+    |--------------------+--------|
+    | 28.0               | F      |
+    | 33.666666666666664 | M      |
+    +--------------------+--------+
 
 MAX
 ---
@@ -142,11 +142,11 @@ Example::
 
     os> source=accounts | stats max(age);
     fetched rows / total rows = 1/1
-    +------------+
-    | max(age)   |
-    |------------|
-    | 36         |
-    +------------+
+    +----------+
+    | max(age) |
+    |----------|
+    | 36       |
+    +----------+
 
 MIN
 ---
@@ -160,11 +160,11 @@ Example::
 
     os> source=accounts | stats min(age);
     fetched rows / total rows = 1/1
-    +------------+
-    | min(age)   |
-    |------------|
-    | 28         |
-    +------------+
+    +----------+
+    | min(age) |
+    |----------|
+    | 28       |
+    +----------+
 
 VAR_SAMP
 --------
@@ -196,11 +196,11 @@ Example::
 
     os> source=accounts | stats var_pop(age);
     fetched rows / total rows = 1/1
-    +----------------+
-    | var_pop(age)   |
-    |----------------|
-    | 8.1875         |
-    +----------------+
+    +--------------+
+    | var_pop(age) |
+    |--------------|
+    | 8.1875       |
+    +--------------+
 
 STDDEV_SAMP
 -----------
@@ -214,11 +214,11 @@ Example::
 
     os> source=accounts | stats stddev_samp(age);
     fetched rows / total rows = 1/1
-    +--------------------+
-    | stddev_samp(age)   |
-    |--------------------|
-    | 3.304037933599835  |
-    +--------------------+
+    +-------------------+
+    | stddev_samp(age)  |
+    |-------------------|
+    | 3.304037933599835 |
+    +-------------------+
 
 STDDEV_POP
 ----------
@@ -259,6 +259,27 @@ Example::
     | [Amber,Hattie,Nanette,Dale] |
     +-----------------------------+
 
+PERCENTILE or PERCENTILE_APPROX
+-------------------------------
+
+Description
+>>>>>>>>>>>
+
+Usage: PERCENTILE(expr, percent) or PERCENTILE_APPROX(expr, percent). Return the approximate percentile value of expr at the specified percentage.
+
+* percent: The number must be a constant between 0 and 100.
+
+Example::
+
+    os> source=accounts | stats percentile(age, 90) by gender;
+    fetched rows / total rows = 2/2
+    +---------------------+--------+
+    | percentile(age, 90) | gender |
+    |---------------------+--------|
+    | 28                  | F      |
+    | 36                  | M      |
+    +---------------------+--------+
+
 Example 1: Calculate the count of events
 ========================================
 
@@ -268,11 +289,11 @@ PPL query::
 
     os> source=accounts | stats count();
     fetched rows / total rows = 1/1
-    +-----------+
-    | count()   |
-    |-----------|
-    | 4         |
-    +-----------+
+    +---------+
+    | count() |
+    |---------|
+    | 4       |
+    +---------+
 
 
 Example 2: Calculate the average of a field
@@ -284,11 +305,11 @@ PPL query::
 
     os> source=accounts | stats avg(age);
     fetched rows / total rows = 1/1
-    +------------+
-    | avg(age)   |
-    |------------|
-    | 32.25      |
-    +------------+
+    +----------+
+    | avg(age) |
+    |----------|
+    | 32.25    |
+    +----------+
 
 
 Example 3: Calculate the average of a field by group
@@ -300,12 +321,12 @@ PPL query::
 
     os> source=accounts | stats avg(age) by gender;
     fetched rows / total rows = 2/2
-    +--------------------+----------+
-    | avg(age)           | gender   |
-    |--------------------+----------|
-    | 28.0               | F        |
-    | 33.666666666666664 | M        |
-    +--------------------+----------+
+    +--------------------+--------+
+    | avg(age)           | gender |
+    |--------------------+--------|
+    | 28.0               | F      |
+    | 33.666666666666664 | M      |
+    +--------------------+--------+
 
 
 Example 4: Calculate the average, sum and count of a field by group
@@ -317,12 +338,12 @@ PPL query::
 
     os> source=accounts | stats avg(age), sum(age), count() by gender;
     fetched rows / total rows = 2/2
-    +--------------------+------------+-----------+----------+
-    | avg(age)           | sum(age)   | count()   | gender   |
-    |--------------------+------------+-----------+----------|
-    | 28.0               | 28         | 1         | F        |
-    | 33.666666666666664 | 101        | 3         | M        |
-    +--------------------+------------+-----------+----------+
+    +--------------------+----------+---------+--------+
+    | avg(age)           | sum(age) | count() | gender |
+    |--------------------+----------+---------+--------|
+    | 28.0               | 28       | 1       | F      |
+    | 33.666666666666664 | 101      | 3       | M      |
+    +--------------------+----------+---------+--------+
 
 Example 5: Calculate the maximum of a field
 ===========================================
@@ -333,11 +354,11 @@ PPL query::
 
     os> source=accounts | stats max(age);
     fetched rows / total rows = 1/1
-    +------------+
-    | max(age)   |
-    |------------|
-    | 36         |
-    +------------+
+    +----------+
+    | max(age) |
+    |----------|
+    | 36       |
+    +----------+
 
 Example 6: Calculate the maximum and minimum of a field by group
 ================================================================
@@ -348,12 +369,12 @@ PPL query::
 
     os> source=accounts | stats max(age), min(age) by gender;
     fetched rows / total rows = 2/2
-    +------------+------------+----------+
-    | max(age)   | min(age)   | gender   |
-    |------------+------------+----------|
-    | 28         | 28         | F        |
-    | 36         | 32         | M        |
-    +------------+------------+----------+
+    +----------+----------+--------+
+    | max(age) | min(age) | gender |
+    |----------+----------+--------|
+    | 28       | 28       | F      |
+    | 36       | 32       | M      |
+    +----------+----------+--------+
 
 Example 7: Calculate the distinct count of a field
 ==================================================
@@ -364,11 +385,11 @@ PPL query::
 
     os> source=accounts | stats count(gender), distinct_count(gender);
     fetched rows / total rows = 1/1
-    +-----------------+--------------------------+
-    | count(gender)   | distinct_count(gender)   |
-    |-----------------+--------------------------|
-    | 4               | 2                        |
-    +-----------------+--------------------------+
+    +---------------+------------------------+
+    | count(gender) | distinct_count(gender) |
+    |---------------+------------------------|
+    | 4             | 2                      |
+    +---------------+------------------------+
 
 Example 8: Calculate the count by a span
 ========================================
@@ -379,12 +400,12 @@ PPL query::
 
     os> source=accounts | stats count(age) by span(age, 10) as age_span
     fetched rows / total rows = 2/2
-    +--------------+------------+
-    | count(age)   | age_span   |
-    |--------------+------------|
-    | 1            | 20         |
-    | 3            | 30         |
-    +--------------+------------+
+    +------------+----------+
+    | count(age) | age_span |
+    |------------+----------|
+    | 1          | 20       |
+    | 3          | 30       |
+    +------------+----------+
 
 Example 9: Calculate the count by a gender and span
 ===================================================
@@ -395,13 +416,27 @@ PPL query::
 
     os> source=accounts | stats count() as cnt by span(age, 5) as age_span, gender
     fetched rows / total rows = 3/3
-    +-------+------------+----------+
-    | cnt   | age_span   | gender   |
-    |-------+------------+----------|
-    | 1     | 25         | F        |
-    | 2     | 30         | M        |
-    | 1     | 35         | M        |
-    +-------+------------+----------+
+    +-----+----------+--------+
+    | cnt | age_span | gender |
+    |-----+----------+--------|
+    | 1   | 25       | F      |
+    | 2   | 30       | M      |
+    | 1   | 35       | M      |
+    +-----+----------+--------+
+
+Span will always be the first grouping key whatever order you specify.
+
+PPL query::
+
+    os> source=accounts | stats count() as cnt by gender, span(age, 5) as age_span
+    fetched rows / total rows = 3/3
+    +-----+----------+--------+
+    | cnt | age_span | gender |
+    |-----+----------+--------|
+    | 1   | 25       | F      |
+    | 2   | 30       | M      |
+    | 1   | 35       | M      |
+    +-----+----------+--------+
 
 Example 10: Calculate the count and get email list by a gender and span
 =======================================================================
@@ -412,10 +447,59 @@ PPL query::
 
     os> source=accounts | stats count() as cnt, take(email, 5) by span(age, 5) as age_span, gender
     fetched rows / total rows = 3/3
-    +-------+--------------------------------------------+------------+----------+
-    | cnt   | take(email, 5)                             | age_span   | gender   |
-    |-------+--------------------------------------------+------------+----------|
-    | 1     | []                                         | 25         | F        |
-    | 2     | [amberduke@pyrami.com,daleadams@boink.com] | 30         | M        |
-    | 1     | [hattiebond@netagy.com]                    | 35         | M        |
-    +-------+--------------------------------------------+------------+----------+
+    +-----+--------------------------------------------+----------+--------+
+    | cnt | take(email, 5)                             | age_span | gender |
+    |-----+--------------------------------------------+----------+--------|
+    | 1   | []                                         | 25       | F      |
+    | 2   | [amberduke@pyrami.com,daleadams@boink.com] | 30       | M      |
+    | 1   | [hattiebond@netagy.com]                    | 35       | M      |
+    +-----+--------------------------------------------+----------+--------+
+
+Example 11: Calculate the percentile of a field
+===============================================
+
+The example show calculate the percentile 90th age of all the accounts.
+
+PPL query::
+
+    os> source=accounts | stats percentile(age, 90);
+    fetched rows / total rows = 1/1
+    +---------------------+
+    | percentile(age, 90) |
+    |---------------------|
+    | 36                  |
+    +---------------------+
+
+
+Example 12: Calculate the percentile of a field by group
+========================================================
+
+The example show calculate the percentile 90th age of all the accounts group by gender.
+
+PPL query::
+
+    os> source=accounts | stats percentile(age, 90) by gender;
+    fetched rows / total rows = 2/2
+    +---------------------+--------+
+    | percentile(age, 90) | gender |
+    |---------------------+--------|
+    | 28                  | F      |
+    | 36                  | M      |
+    +---------------------+--------+
+
+Example 13: Calculate the percentile by a gender and span
+=========================================================
+
+The example gets the percentile 90th age by the interval of 10 years and group by gender.
+
+PPL query::
+
+    os> source=accounts | stats percentile(age, 90) as p90 by span(age, 10) as age_span, gender
+    fetched rows / total rows = 2/2
+    +-----+----------+--------+
+    | p90 | age_span | gender |
+    |-----+----------+--------|
+    | 28  | 20       | F      |
+    | 36  | 30       | M      |
+    +-----+----------+--------+
+
diff --git a/docs/user/ppl/cmd/top.rst b/docs/user/ppl/cmd/top.rst
index cbab675d09..6fa4d9cdb0 100644
--- a/docs/user/ppl/cmd/top.rst
+++ b/docs/user/ppl/cmd/top.rst
@@ -32,12 +32,12 @@ PPL query::
 
     os> source=accounts | top gender;
     fetched rows / total rows = 2/2
-    +----------+
-    | gender   |
-    |----------|
-    | M        |
-    | F        |
-    +----------+
+    +--------+
+    | gender |
+    |--------|
+    | M      |
+    | F      |
+    +--------+
 
 Example 2: Find the most common values in a field
 ===========================================
@@ -48,11 +48,11 @@ PPL query::
 
     os> source=accounts | top 1 gender;
     fetched rows / total rows = 1/1
-    +----------+
-    | gender   |
-    |----------|
-    | M        |
-    +----------+
+    +--------+
+    | gender |
+    |--------|
+    | M      |
+    +--------+
 
 Example 2: Find the most common values organized by gender
 ====================================================
@@ -63,12 +63,12 @@ PPL query::
 
     os> source=accounts | top 1 age by gender;
     fetched rows / total rows = 2/2
-    +----------+-------+
-    | gender   | age   |
-    |----------+-------|
-    | F        | 28    |
-    | M        | 32    |
-    +----------+-------+
+    +--------+-----+
+    | gender | age |
+    |--------+-----|
+    | F      | 28  |
+    | M      | 32  |
+    +--------+-----+
 
 Limitation
 ==========
diff --git a/docs/user/ppl/cmd/where.rst b/docs/user/ppl/cmd/where.rst
index 4d8718d69f..115bffe7de 100644
--- a/docs/user/ppl/cmd/where.rst
+++ b/docs/user/ppl/cmd/where.rst
@@ -29,10 +29,10 @@ PPL query::
 
     os> source=accounts | where account_number=1 or gender="F" | fields account_number, gender;
     fetched rows / total rows = 2/2
-    +------------------+----------+
-    | account_number   | gender   |
-    |------------------+----------|
-    | 1                | M        |
-    | 13               | F        |
-    +------------------+----------+
+    +----------------+--------+
+    | account_number | gender |
+    |----------------+--------|
+    | 1              | M      |
+    | 13             | F      |
+    +----------------+--------+
 
diff --git a/docs/user/ppl/functions/condition.rst b/docs/user/ppl/functions/condition.rst
index fea76bedda..96c3e64e72 100644
--- a/docs/user/ppl/functions/condition.rst
+++ b/docs/user/ppl/functions/condition.rst
@@ -24,14 +24,14 @@ Example::
 
     os> source=accounts | eval result = isnull(employer) | fields result, employer, firstname
     fetched rows / total rows = 4/4
-    +----------+------------+-------------+
-    | result   | employer   | firstname   |
-    |----------+------------+-------------|
-    | False    | Pyrami     | Amber       |
-    | False    | Netagy     | Hattie      |
-    | False    | Quility    | Nanette     |
-    | True     | null       | Dale        |
-    +----------+------------+-------------+
+    +--------+----------+-----------+
+    | result | employer | firstname |
+    |--------+----------+-----------|
+    | False  | Pyrami   | Amber     |
+    | False  | Netagy   | Hattie    |
+    | False  | Quility  | Nanette   |
+    | True   | null     | Dale      |
+    +--------+----------+-----------+
 
 ISNOTNULL
 ---------
@@ -49,11 +49,11 @@ Example::
 
     os> source=accounts | where not isnotnull(employer) | fields account_number, employer
     fetched rows / total rows = 1/1
-    +------------------+------------+
-    | account_number   | employer   |
-    |------------------+------------|
-    | 18               | null       |
-    +------------------+------------+
+    +----------------+----------+
+    | account_number | employer |
+    |----------------+----------|
+    | 18             | null     |
+    +----------------+----------+
 
 EXISTS
 ------
@@ -64,11 +64,11 @@ Example, the account 13 doesn't have email field::
 
     os> source=accounts | where isnull(email) | fields account_number, email
     fetched rows / total rows = 1/1
-    +------------------+---------+
-    | account_number   | email   |
-    |------------------+---------|
-    | 13               | null    |
-    +------------------+---------+
+    +----------------+-------+
+    | account_number | email |
+    |----------------+-------|
+    | 13             | null  |
+    +----------------+-------+
 
 IFNULL
 ------
@@ -86,14 +86,14 @@ Example::
 
     os> source=accounts | eval result = ifnull(employer, 'default') | fields result, employer, firstname
     fetched rows / total rows = 4/4
-    +----------+------------+-------------+
-    | result   | employer   | firstname   |
-    |----------+------------+-------------|
-    | Pyrami   | Pyrami     | Amber       |
-    | Netagy   | Netagy     | Hattie      |
-    | Quility  | Quility    | Nanette     |
-    | default  | null       | Dale        |
-    +----------+------------+-------------+
+    +---------+----------+-----------+
+    | result  | employer | firstname |
+    |---------+----------+-----------|
+    | Pyrami  | Pyrami   | Amber     |
+    | Netagy  | Netagy   | Hattie    |
+    | Quility | Quility  | Nanette   |
+    | default | null     | Dale      |
+    +---------+----------+-----------+
 
 NULLIF
 ------
@@ -111,14 +111,14 @@ Example::
 
     os> source=accounts | eval result = nullif(employer, 'Pyrami') | fields result, employer, firstname
     fetched rows / total rows = 4/4
-    +----------+------------+-------------+
-    | result   | employer   | firstname   |
-    |----------+------------+-------------|
-    | null     | Pyrami     | Amber       |
-    | Netagy   | Netagy     | Hattie      |
-    | Quility  | Quility    | Nanette     |
-    | null     | null       | Dale        |
-    +----------+------------+-------------+
+    +---------+----------+-----------+
+    | result  | employer | firstname |
+    |---------+----------+-----------|
+    | null    | Pyrami   | Amber     |
+    | Netagy  | Netagy   | Hattie    |
+    | Quility | Quility  | Nanette   |
+    | null    | null     | Dale      |
+    +---------+----------+-----------+
 
 
 ISNULL
@@ -137,14 +137,14 @@ Example::
 
     os> source=accounts | eval result = isnull(employer) | fields result, employer, firstname
     fetched rows / total rows = 4/4
-    +----------+------------+-------------+
-    | result   | employer   | firstname   |
-    |----------+------------+-------------|
-    | False    | Pyrami     | Amber       |
-    | False    | Netagy     | Hattie      |
-    | False    | Quility    | Nanette     |
-    | True     | null       | Dale        |
-    +----------+------------+-------------+
+    +--------+----------+-----------+
+    | result | employer | firstname |
+    |--------+----------+-----------|
+    | False  | Pyrami   | Amber     |
+    | False  | Netagy   | Hattie    |
+    | False  | Quility  | Nanette   |
+    | True   | null     | Dale      |
+    +--------+----------+-----------+
 
 IF
 ------
@@ -162,22 +162,33 @@ Example::
 
     os> source=accounts | eval result = if(true, firstname, lastname) | fields result, firstname, lastname
     fetched rows / total rows = 4/4
-    +----------+-------------+------------+
-    | result   | firstname   | lastname   |
-    |----------+-------------+------------|
-    | Amber    | Amber       | Duke       |
-    | Hattie   | Hattie      | Bond       |
-    | Nanette  | Nanette     | Bates      |
-    | Dale     | Dale        | Adams      |
-    +----------+-------------+------------+
+    +---------+-----------+----------+
+    | result  | firstname | lastname |
+    |---------+-----------+----------|
+    | Amber   | Amber     | Duke     |
+    | Hattie  | Hattie    | Bond     |
+    | Nanette | Nanette   | Bates    |
+    | Dale    | Dale      | Adams    |
+    +---------+-----------+----------+
 
     os> source=accounts | eval result = if(false, firstname, lastname) | fields result, firstname, lastname
     fetched rows / total rows = 4/4
-    +----------+-------------+------------+
-    | result   | firstname   | lastname   |
-    |----------+-------------+------------|
-    | Duke     | Amber       | Duke       |
-    | Bond     | Hattie      | Bond       |
-    | Bates    | Nanette     | Bates      |
-    | Adams    | Dale        | Adams      |
-    +----------+-------------+------------+
+    +--------+-----------+----------+
+    | result | firstname | lastname |
+    |--------+-----------+----------|
+    | Duke   | Amber     | Duke     |
+    | Bond   | Hattie    | Bond     |
+    | Bates  | Nanette   | Bates    |
+    | Adams  | Dale      | Adams    |
+    +--------+-----------+----------+
+
+    os> source=accounts | eval is_vip = if(age > 30 AND isnotnull(employer), true, false) | fields is_vip, firstname, lastname
+    fetched rows / total rows = 4/4
+    +--------+-----------+----------+
+    | is_vip | firstname | lastname |
+    |--------+-----------+----------|
+    | True   | Amber     | Duke     |
+    | True   | Hattie    | Bond     |
+    | False  | Nanette   | Bates    |
+    | False  | Dale      | Adams    |
+    +--------+-----------+----------+
diff --git a/docs/user/ppl/functions/conversion.rst b/docs/user/ppl/functions/conversion.rst
index a4a59a6cd1..31fb3e3cdf 100644
--- a/docs/user/ppl/functions/conversion.rst
+++ b/docs/user/ppl/functions/conversion.rst
@@ -38,21 +38,21 @@ Cast to string example::
 
     os> source=people | eval `cbool` = CAST(true as string), `cint` = CAST(1 as string), `cdate` = CAST(CAST('2012-08-07' as date) as string) | fields `cbool`, `cint`, `cdate`
     fetched rows / total rows = 1/1
-    +---------+--------+------------+
-    | cbool   | cint   | cdate      |
-    |---------+--------+------------|
-    | true    | 1      | 2012-08-07 |
-    +---------+--------+------------+
+    +-------+------+------------+
+    | cbool | cint | cdate      |
+    |-------+------+------------|
+    | true  | 1    | 2012-08-07 |
+    +-------+------+------------+
 
 Cast to number example::
 
     os> source=people | eval `cbool` = CAST(true as int), `cstring` = CAST('1' as int) | fields `cbool`, `cstring`
     fetched rows / total rows = 1/1
-    +---------+-----------+
-    | cbool   | cstring   |
-    |---------+-----------|
-    | 1       | 1         |
-    +---------+-----------+
+    +-------+---------+
+    | cbool | cstring |
+    |-------+---------|
+    | 1     | 1       |
+    +-------+---------+
 
 Cast to date example::
 
@@ -68,8 +68,8 @@ Cast function can be chained::
 
     os> source=people | eval `cbool` = CAST(CAST(true as string) as boolean) | fields `cbool`
     fetched rows / total rows = 1/1
-    +---------+
-    | cbool   |
-    |---------|
-    | True    |
-    +---------+
+    +-------+
+    | cbool |
+    |-------|
+    | True  |
+    +-------+
diff --git a/docs/user/ppl/functions/datetime.rst b/docs/user/ppl/functions/datetime.rst
index ca191e2426..3f190b4e76 100644
--- a/docs/user/ppl/functions/datetime.rst
+++ b/docs/user/ppl/functions/datetime.rst
@@ -14,32 +14,98 @@ ADDDATE
 Description
 >>>>>>>>>>>
 
-Usage: adddate(date, INTERVAL expr unit)/ adddate(date, expr) adds the time interval of second argument to date; adddate(date, days) adds the second argument as integer number of days to date.
+Usage: adddate(date, INTERVAL expr unit) / adddate(date, days) adds the interval of second argument to date; adddate(date, days) adds the second argument as integer number of days to date.
+If first argument is TIME, today's date is used; if first argument is DATE, time at midnight is used.
 
-Argument type: DATE/DATETIME/TIMESTAMP/STRING, INTERVAL/LONG
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, INTERVAL/LONG
 
 Return type map:
 
-(DATE/DATETIME/TIMESTAMP/STRING, INTERVAL) -> DATETIME
+(DATE/DATETIME/TIMESTAMP/TIME, INTERVAL) -> DATETIME
 
 (DATE, LONG) -> DATE
 
-(DATETIME/TIMESTAMP/STRING, LONG) -> DATETIME
+(DATETIME/TIMESTAMP/TIME, LONG) -> DATETIME
 
-Synonyms: `DATE_ADD`_
+Synonyms: `DATE_ADD`_ when invoked with the INTERVAL form of the second argument.
+
+Antonyms: `SUBDATE`_
+
+Example::
+
+    os> source=people | eval `'2020-08-26' + 1h` = ADDDATE(DATE('2020-08-26'), INTERVAL 1 HOUR), `'2020-08-26' + 1` = ADDDATE(DATE('2020-08-26'), 1), `ts '2020-08-26 01:01:01' + 1` = ADDDATE(TIMESTAMP('2020-08-26 01:01:01'), 1) | fields `'2020-08-26' + 1h`, `'2020-08-26' + 1`, `ts '2020-08-26 01:01:01' + 1`
+    fetched rows / total rows = 1/1
+    +---------------------+------------------+------------------------------+
+    | '2020-08-26' + 1h   | '2020-08-26' + 1 | ts '2020-08-26 01:01:01' + 1 |
+    |---------------------+------------------+------------------------------|
+    | 2020-08-26 01:00:00 | 2020-08-27       | 2020-08-27 01:01:01          |
+    +---------------------+------------------+------------------------------+
+
+
+
+ADDTIME
+-------
+
+Description
+>>>>>>>>>>>
+
+Usage: addtime(expr1, expr2) adds expr2 to expr1 and returns the result. If argument is TIME, today's date is used; if argument is DATE, time at midnight is used.
+
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, DATE/DATETIME/TIMESTAMP/TIME
+
+Return type map:
+
+(DATE/DATETIME/TIMESTAMP, DATE/DATETIME/TIMESTAMP/TIME) -> DATETIME
+
+(TIME, DATE/DATETIME/TIMESTAMP/TIME) -> TIME
+
+Antonyms: `SUBTIME`_
 
 Example::
 
-    os> source=people | eval `ADDDATE(DATE('2020-08-26'), INTERVAL 1 HOUR)` = ADDDATE(DATE('2020-08-26'), INTERVAL 1 HOUR), `ADDDATE(DATE('2020-08-26'), 1)` = ADDDATE(DATE('2020-08-26'), 1), `ADDDATE(TIMESTAMP('2020-08-26 01:01:01'), 1)` = ADDDATE(TIMESTAMP('2020-08-26 01:01:01'), 1) | fields `ADDDATE(DATE('2020-08-26'), INTERVAL 1 HOUR)`, `ADDDATE(DATE('2020-08-26'), 1)`, `ADDDATE(TIMESTAMP('2020-08-26 01:01:01'), 1)`
+    os> source=people | eval `'2008-12-12' + 0` = ADDTIME(DATE('2008-12-12'), DATE('2008-11-15')) | fields `'2008-12-12' + 0`
+    fetched rows / total rows = 1/1
+    +---------------------+
+    | '2008-12-12' + 0    |
+    |---------------------|
+    | 2008-12-12 00:00:00 |
+    +---------------------+
+
+    os> source=people | eval `'23:59:59' + 0` = ADDTIME(TIME('23:59:59'), DATE('2004-01-01')) | fields `'23:59:59' + 0`
+    fetched rows / total rows = 1/1
+    +----------------+
+    | '23:59:59' + 0 |
+    |----------------|
+    | 23:59:59       |
+    +----------------+
+
+    os> source=people | eval `'2004-01-01' + '23:59:59'` = ADDTIME(DATE('2004-01-01'), TIME('23:59:59')) | fields `'2004-01-01' + '23:59:59'`
+    fetched rows / total rows = 1/1
+    +---------------------------+
+    | '2004-01-01' + '23:59:59' |
+    |---------------------------|
+    | 2004-01-01 23:59:59       |
+    +---------------------------+
+
+    os> source=people | eval `'10:20:30' + '00:05:42'` = ADDTIME(TIME('10:20:30'), TIME('00:05:42')) | fields `'10:20:30' + '00:05:42'`
+    fetched rows / total rows = 1/1
+    +-------------------------+
+    | '10:20:30' + '00:05:42' |
+    |-------------------------|
+    | 10:26:12                |
+    +-------------------------+
+
+    os> source=people | eval `'2007-02-28 10:20:30' + '20:40:50'` = ADDTIME(TIMESTAMP('2007-02-28 10:20:30'), DATETIME('2002-03-04 20:40:50')) | fields `'2007-02-28 10:20:30' + '20:40:50'`
     fetched rows / total rows = 1/1
-    +------------------------------------------------+----------------------------------+------------------------------------------------+
-    | ADDDATE(DATE('2020-08-26'), INTERVAL 1 HOUR)   | ADDDATE(DATE('2020-08-26'), 1)   | ADDDATE(TIMESTAMP('2020-08-26 01:01:01'), 1)   |
-    |------------------------------------------------+----------------------------------+------------------------------------------------|
-    | 2020-08-26 01:00:00                            | 2020-08-27                       | 2020-08-27 01:01:01                            |
-    +------------------------------------------------+----------------------------------+------------------------------------------------+
+    +------------------------------------+
+    | '2007-02-28 10:20:30' + '20:40:50' |
+    |------------------------------------|
+    | 2007-03-01 07:01:20                |
+    +------------------------------------+
+
 
 CONVERT_TZ
-----
+----------
 
 Description
 >>>>>>>>>>>
@@ -55,121 +121,121 @@ Example::
 
     os> source=people | eval `convert_tz('2008-05-15 12:00:00','+00:00','+10:00')` = convert_tz('2008-05-15 12:00:00','+00:00','+10:00') | fields `convert_tz('2008-05-15 12:00:00','+00:00','+10:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------------+
-    | convert_tz('2008-05-15 12:00:00','+00:00','+10:00')   |
-    |-------------------------------------------------------|
-    | 2008-05-15 22:00:00                                   |
-    +-------------------------------------------------------+
+    +-----------------------------------------------------+
+    | convert_tz('2008-05-15 12:00:00','+00:00','+10:00') |
+    |-----------------------------------------------------|
+    | 2008-05-15 22:00:00                                 |
+    +-----------------------------------------------------+
 
 The valid timezone range for convert_tz is (-13:59, +14:00) inclusive. Timezones outside of the range, such as +15:00 in this example will return null.
 Example::
 
     os> source=people | eval `convert_tz('2008-05-15 12:00:00','+00:00','+15:00')` = convert_tz('2008-05-15 12:00:00','+00:00','+15:00')| fields `convert_tz('2008-05-15 12:00:00','+00:00','+15:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------------+
-    | convert_tz('2008-05-15 12:00:00','+00:00','+15:00')   |
-    |-------------------------------------------------------|
-    | null                                                  |
-    +-------------------------------------------------------+
+    +-----------------------------------------------------+
+    | convert_tz('2008-05-15 12:00:00','+00:00','+15:00') |
+    |-----------------------------------------------------|
+    | null                                                |
+    +-----------------------------------------------------+
 
 Conversion from a positive timezone to a negative timezone that goes over date line.
 Example::
 
     os> source=people | eval `convert_tz('2008-05-15 12:00:00','+03:30','-10:00')` = convert_tz('2008-05-15 12:00:00','+03:30','-10:00') | fields `convert_tz('2008-05-15 12:00:00','+03:30','-10:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------------+
-    | convert_tz('2008-05-15 12:00:00','+03:30','-10:00')   |
-    |-------------------------------------------------------|
-    | 2008-05-14 22:30:00                                   |
-    +-------------------------------------------------------+
+    +-----------------------------------------------------+
+    | convert_tz('2008-05-15 12:00:00','+03:30','-10:00') |
+    |-----------------------------------------------------|
+    | 2008-05-14 22:30:00                                 |
+    +-----------------------------------------------------+
 
 Valid dates are required in convert_tz, invalid dates such as April 31st (not a date in the Gregorian calendar) will result in null.
 Example::
 
     os> source=people | eval `convert_tz('2008-04-31 12:00:00','+03:30','-10:00')` = convert_tz('2008-04-31 12:00:00','+03:30','-10:00') | fields `convert_tz('2008-04-31 12:00:00','+03:30','-10:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------------+
-    | convert_tz('2008-04-31 12:00:00','+03:30','-10:00')   |
-    |-------------------------------------------------------|
-    | null                                                  |
-    +-------------------------------------------------------+
+    +-----------------------------------------------------+
+    | convert_tz('2008-04-31 12:00:00','+03:30','-10:00') |
+    |-----------------------------------------------------|
+    | null                                                |
+    +-----------------------------------------------------+
 
 Valid dates are required in convert_tz, invalid dates such as February 30th (not a date in the Gregorian calendar) will result in null.
 Example::
 
     os> source=people | eval `convert_tz('2008-02-30 12:00:00','+03:30','-10:00')` = convert_tz('2008-02-30 12:00:00','+03:30','-10:00') | fields `convert_tz('2008-02-30 12:00:00','+03:30','-10:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------------+
-    | convert_tz('2008-02-30 12:00:00','+03:30','-10:00')   |
-    |-------------------------------------------------------|
-    | null                                                  |
-    +-------------------------------------------------------+
+    +-----------------------------------------------------+
+    | convert_tz('2008-02-30 12:00:00','+03:30','-10:00') |
+    |-----------------------------------------------------|
+    | null                                                |
+    +-----------------------------------------------------+
 
 February 29th 2008 is a valid date because it is a leap year.
 Example::
 
     os> source=people | eval `convert_tz('2008-02-29 12:00:00','+03:30','-10:00')` = convert_tz('2008-02-29 12:00:00','+03:30','-10:00') | fields `convert_tz('2008-02-29 12:00:00','+03:30','-10:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------------+
-    | convert_tz('2008-02-29 12:00:00','+03:30','-10:00')   |
-    |-------------------------------------------------------|
-    | 2008-02-28 22:30:00                                   |
-    +-------------------------------------------------------+
+    +-----------------------------------------------------+
+    | convert_tz('2008-02-29 12:00:00','+03:30','-10:00') |
+    |-----------------------------------------------------|
+    | 2008-02-28 22:30:00                                 |
+    +-----------------------------------------------------+
 
 Valid dates are required in convert_tz, invalid dates such as February 29th 2007 (2007 is not a leap year) will result in null.
 Example::
 
     os> source=people | eval `convert_tz('2007-02-29 12:00:00','+03:30','-10:00')` = convert_tz('2007-02-29 12:00:00','+03:30','-10:00') | fields `convert_tz('2007-02-29 12:00:00','+03:30','-10:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------------+
-    | convert_tz('2007-02-29 12:00:00','+03:30','-10:00')   |
-    |-------------------------------------------------------|
-    | null                                                  |
-    +-------------------------------------------------------+
+    +-----------------------------------------------------+
+    | convert_tz('2007-02-29 12:00:00','+03:30','-10:00') |
+    |-----------------------------------------------------|
+    | null                                                |
+    +-----------------------------------------------------+
 
 The valid timezone range for convert_tz is (-13:59, +14:00) inclusive. Timezones outside of the range, such as +14:01 in this example will return null.
 Example::
 
     os> source=people | eval `convert_tz('2008-02-01 12:00:00','+14:01','+00:00')` = convert_tz('2008-02-01 12:00:00','+14:01','+00:00') | fields `convert_tz('2008-02-01 12:00:00','+14:01','+00:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------------+
-    | convert_tz('2008-02-01 12:00:00','+14:01','+00:00')   |
-    |-------------------------------------------------------|
-    | null                                                  |
-    +-------------------------------------------------------+
+    +-----------------------------------------------------+
+    | convert_tz('2008-02-01 12:00:00','+14:01','+00:00') |
+    |-----------------------------------------------------|
+    | null                                                |
+    +-----------------------------------------------------+
 
 The valid timezone range for convert_tz is (-13:59, +14:00) inclusive. Timezones outside of the range, such as +14:00 in this example will return a correctly converted date time object.
 Example::
 
     os> source=people | eval `convert_tz('2008-02-01 12:00:00','+14:00','+00:00')` = convert_tz('2008-02-01 12:00:00','+14:00','+00:00') | fields `convert_tz('2008-02-01 12:00:00','+14:00','+00:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------------+
-    | convert_tz('2008-02-01 12:00:00','+14:00','+00:00')   |
-    |-------------------------------------------------------|
-    | 2008-01-31 22:00:00                                   |
-    +-------------------------------------------------------+
+    +-----------------------------------------------------+
+    | convert_tz('2008-02-01 12:00:00','+14:00','+00:00') |
+    |-----------------------------------------------------|
+    | 2008-01-31 22:00:00                                 |
+    +-----------------------------------------------------+
 
 The valid timezone range for convert_tz is (-13:59, +14:00) inclusive. Timezones outside of the range, such as -14:00 will result in null
 Example::
 
     os> source=people | eval `convert_tz('2008-02-01 12:00:00','-14:00','+00:00')` = convert_tz('2008-02-01 12:00:00','-14:00','+00:00') | fields `convert_tz('2008-02-01 12:00:00','-14:00','+00:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------------+
-    | convert_tz('2008-02-01 12:00:00','-14:00','+00:00')   |
-    |-------------------------------------------------------|
-    | null                                                  |
-    +-------------------------------------------------------+
+    +-----------------------------------------------------+
+    | convert_tz('2008-02-01 12:00:00','-14:00','+00:00') |
+    |-----------------------------------------------------|
+    | null                                                |
+    +-----------------------------------------------------+
 
 The valid timezone range for convert_tz is (-13:59, +14:00) inclusive. This timezone is within range so it is valid and will convert the time.
 Example::
 
     os> source=people | eval `convert_tz('2008-02-01 12:00:00','-13:59','+00:00')` = convert_tz('2008-02-01 12:00:00','-13:59','+00:00') | fields `convert_tz('2008-02-01 12:00:00','-13:59','+00:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------------+
-    | convert_tz('2008-02-01 12:00:00','-13:59','+00:00')   |
-    |-------------------------------------------------------|
-    | 2008-02-02 01:59:00                                   |
-    +-------------------------------------------------------+
+    +-----------------------------------------------------+
+    | convert_tz('2008-02-01 12:00:00','-13:59','+00:00') |
+    |-----------------------------------------------------|
+    | 2008-02-02 01:59:00                                 |
+    +-----------------------------------------------------+
 
 
 CURDATE
@@ -189,11 +255,11 @@ Example::
 
     > source=people | eval `CURDATE()` = CURDATE() | fields `CURDATE()`
     fetched rows / total rows = 1/1
-    +-------------+
-    | CURDATE()   |
-    |-------------|
-    | 2022-08-02  |
-    +-------------+
+    +------------+
+    | CURDATE()  |
+    |------------|
+    | 2022-08-02 |
+    +------------+
 
 
 CURRENT_DATE
@@ -270,11 +336,11 @@ Example::
 
     > source=people | eval `value_1` = CURTIME(), `value_2` = CURTIME() | fields `value_1`, `value_2`
     fetched rows / total rows = 1/1
-    +-----------+-----------+
-    | value_1   | value_2   |
-    |-----------+-----------|
-    | 15:39:05  | 15:39:05  |
-    +-----------+-----------+
+    +----------+----------+
+    | value_1  | value_2  |
+    |----------+----------|
+    | 15:39:05 | 15:39:05 |
+    +----------+----------+
 
 
 DATE
@@ -293,36 +359,35 @@ Example::
 
     os> source=people | eval `DATE('2020-08-26')` = DATE('2020-08-26') | fields `DATE('2020-08-26')`
     fetched rows / total rows = 1/1
-    +----------------------+
-    | DATE('2020-08-26')   |
-    |----------------------|
-    | 2020-08-26           |
-    +----------------------+
+    +--------------------+
+    | DATE('2020-08-26') |
+    |--------------------|
+    | 2020-08-26         |
+    +--------------------+
 
     os> source=people | eval `DATE(TIMESTAMP('2020-08-26 13:49:00'))` = DATE(TIMESTAMP('2020-08-26 13:49:00')) | fields `DATE(TIMESTAMP('2020-08-26 13:49:00'))`
     fetched rows / total rows = 1/1
-    +------------------------------------------+
-    | DATE(TIMESTAMP('2020-08-26 13:49:00'))   |
-    |------------------------------------------|
-    | 2020-08-26                               |
-    +------------------------------------------+
+    +----------------------------------------+
+    | DATE(TIMESTAMP('2020-08-26 13:49:00')) |
+    |----------------------------------------|
+    | 2020-08-26                             |
+    +----------------------------------------+
 
     os> source=people | eval `DATE('2020-08-26 13:49')` = DATE('2020-08-26 13:49') | fields `DATE('2020-08-26 13:49')`
     fetched rows / total rows = 1/1
-    +----------------------------+
-    | DATE('2020-08-26 13:49')   |
-    |----------------------------|
-    | 2020-08-26                 |
-    +----------------------------+
+    +--------------------------+
+    | DATE('2020-08-26 13:49') |
+    |--------------------------|
+    | 2020-08-26               |
+    +--------------------------+
 
     os> source=people | eval `DATE('2020-08-26 13:49')` = DATE('2020-08-26 13:49') | fields `DATE('2020-08-26 13:49')`
     fetched rows / total rows = 1/1
-    +----------------------------+
-    | DATE('2020-08-26 13:49')   |
-    |----------------------------|
-    | 2020-08-26                 |
-    +----------------------------+
-
+    +--------------------------+
+    | DATE('2020-08-26 13:49') |
+    |--------------------------|
+    | 2020-08-26               |
+    +--------------------------+
 
 
 DATE_ADD
@@ -331,29 +396,25 @@ DATE_ADD
 Description
 >>>>>>>>>>>
 
-Usage: date_add(date, INTERVAL expr unit)/ date_add(date, expr) adds the time interval expr to date
-
-Argument type: DATE/DATETIME/TIMESTAMP/STRING, INTERVAL/LONG
-
-Return type map:
-
-DATE/DATETIME/TIMESTAMP/STRING, INTERVAL -> DATETIME
+Usage: date_add(date, INTERVAL expr unit) adds the interval expr to date. If first argument is TIME, today's date is used; if first argument is DATE, time at midnight is used.
 
-DATE, LONG -> DATE
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, INTERVAL
 
-DATETIME/TIMESTAMP/STRING, LONG -> DATETIME
+Return type: DATETIME
 
 Synonyms: `ADDDATE`_
 
+Antonyms: `DATE_SUB`_
+
 Example::
 
-    os> source=people | eval `DATE_ADD(DATE('2020-08-26'), INTERVAL 1 HOUR)` = DATE_ADD(DATE('2020-08-26'), INTERVAL 1 HOUR), `DATE_ADD(DATE('2020-08-26'), 1)` = DATE_ADD(DATE('2020-08-26'), 1), `DATE_ADD(TIMESTAMP('2020-08-26 01:01:01'), 1)` = DATE_ADD(TIMESTAMP('2020-08-26 01:01:01'), 1) | fields `DATE_ADD(DATE('2020-08-26'), INTERVAL 1 HOUR)`, `DATE_ADD(DATE('2020-08-26'), 1)`, `DATE_ADD(TIMESTAMP('2020-08-26 01:01:01'), 1)`
+    os> source=people | eval `'2020-08-26' + 1h` = DATE_ADD(DATE('2020-08-26'), INTERVAL 1 HOUR), `ts '2020-08-26 01:01:01' + 1d` = DATE_ADD(TIMESTAMP('2020-08-26 01:01:01'), INTERVAL 1 DAY) | fields `'2020-08-26' + 1h`, `ts '2020-08-26 01:01:01' + 1d`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------+-----------------------------------+-------------------------------------------------+
-    | DATE_ADD(DATE('2020-08-26'), INTERVAL 1 HOUR)   | DATE_ADD(DATE('2020-08-26'), 1)   | DATE_ADD(TIMESTAMP('2020-08-26 01:01:01'), 1)   |
-    |-------------------------------------------------+-----------------------------------+-------------------------------------------------|
-    | 2020-08-26 01:00:00                             | 2020-08-27                        | 2020-08-27 01:01:01                             |
-    +-------------------------------------------------+-----------------------------------+-------------------------------------------------+
+    +---------------------+-------------------------------+
+    | '2020-08-26' + 1h   | ts '2020-08-26 01:01:01' + 1d |
+    |---------------------+-------------------------------|
+    | 2020-08-26 01:00:00 | 2020-08-27 01:01:01           |
+    +---------------------+-------------------------------+
 
 
 DATE_FORMAT
@@ -363,6 +424,7 @@ Description
 >>>>>>>>>>>
 
 Usage: date_format(date, format) formats the date argument using the specifiers in the format argument.
+If an argument of type TIME is provided, the local date is used.
 
 .. list-table:: The following table describes the available specifier arguments.
    :widths: 20 80
@@ -377,7 +439,7 @@ Usage: date_format(date, format) formats the date argument using the specifiers
    * - %c
      - Month, numeric (0..12)
    * - %D
-     - Day of the month with English suffix (0th, 1st, 2nd, 3rd, …)
+     - Day of the month with English suffix (0th, 1st, 2nd, 3rd, ...)
    * - %d
      - Day of the month, numeric (00..31)
    * - %e
@@ -439,20 +501,19 @@ Usage: date_format(date, format) formats the date argument using the specifiers
    * - x
      - x, for any smallcase/uppercase alphabet except [aydmshiHIMYDSEL]
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP, STRING
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP, STRING
 
 Return type: STRING
 
 Example::
 
-    >od source=people | eval `DATE_FORMAT('1998-01-31 13:14:15.012345', '%T.%f')` = DATE_FORMAT('1998-01-31 13:14:15.012345', '%T.%f'), `DATE_FORMAT(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r')` = DATE_FORMAT(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r') | fields `DATE_FORMAT('1998-01-31 13:14:15.012345', '%T.%f')`, `DATE_FORMAT(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r')`
+    os> source=people | eval `DATE_FORMAT('1998-01-31 13:14:15.012345', '%T.%f')` = DATE_FORMAT('1998-01-31 13:14:15.012345', '%T.%f'), `DATE_FORMAT(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r')` = DATE_FORMAT(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r') | fields `DATE_FORMAT('1998-01-31 13:14:15.012345', '%T.%f')`, `DATE_FORMAT(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r')`
     fetched rows / total rows = 1/1
-    +-----------------------------------------------+----------------------------------------------------------------+
-    | DATE('1998-01-31 13:14:15.012345', '%T.%f')   | DATE(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r')   |
-    |-----------------------------------------------+----------------------------------------------------------------|
-    | '13:14:15.012345'                             | '1998-Jan-31st 01:14:15 PM'                                    |
-    +-----------------------------------------------+----------------------------------------------------------------+
-
+    +----------------------------------------------------+---------------------------------------------------------------------+
+    | DATE_FORMAT('1998-01-31 13:14:15.012345', '%T.%f') | DATE_FORMAT(TIMESTAMP('1998-01-31 13:14:15.012345'), '%Y-%b-%D %r') |
+    |----------------------------------------------------+---------------------------------------------------------------------|
+    | 13:14:15.012345                                    | 1998-Jan-31st 01:14:15 PM                                           |
+    +----------------------------------------------------+---------------------------------------------------------------------+
 
 
 DATETIME
@@ -467,9 +528,9 @@ Argument type: DATETIME/STRING
 
 Return type map:
 
-DATETIME, STRING -> DATETIME
+(DATETIME, STRING) -> DATETIME
 
-DATETIME -> DATETIME
+(DATETIME) -> DATETIME
 
 
 Converting datetime with timezone to the second argument timezone.
@@ -477,11 +538,11 @@ Example::
 
     os> source=people | eval `DATETIME('2004-02-28 23:00:00-10:00', '+10:00')` = DATETIME('2004-02-28 23:00:00-10:00', '+10:00') | fields `DATETIME('2004-02-28 23:00:00-10:00', '+10:00')`
     fetched rows / total rows = 1/1
-    +---------------------------------------------------+
-    | DATETIME('2004-02-28 23:00:00-10:00', '+10:00')   |
-    |---------------------------------------------------|
-    | 2004-02-29 19:00:00                               |
-    +---------------------------------------------------+
+    +-------------------------------------------------+
+    | DATETIME('2004-02-28 23:00:00-10:00', '+10:00') |
+    |-------------------------------------------------|
+    | 2004-02-29 19:00:00                             |
+    +-------------------------------------------------+
 
 
  The valid timezone range for convert_tz is (-13:59, +14:00) inclusive. Timezones outside of the range will result in null.
@@ -489,11 +550,11 @@ Example::
 
     os> source=people | eval  `DATETIME('2008-01-01 02:00:00', '-14:00')` = DATETIME('2008-01-01 02:00:00', '-14:00') | fields `DATETIME('2008-01-01 02:00:00', '-14:00')`
     fetched rows / total rows = 1/1
-    +---------------------------------------------+
-    | DATETIME('2008-01-01 02:00:00', '-14:00')   |
-    |---------------------------------------------|
-    | null                                        |
-    +---------------------------------------------+
+    +-------------------------------------------+
+    | DATETIME('2008-01-01 02:00:00', '-14:00') |
+    |-------------------------------------------|
+    | null                                      |
+    +-------------------------------------------+
 
 The valid timezone range for convert_tz is (-13:59, +14:00) inclusive. Timezones outside of the range will result in null.
 Example::
@@ -506,35 +567,52 @@ Example::
     | null                                        |
     +---------------------------------------------+
 
+
 DATE_SUB
 --------
 
 Description
 >>>>>>>>>>>
 
-Usage: date_sub(date, INTERVAL expr unit)/ date_sub(date, expr) subtracts the time interval expr from date
+Usage: date_sub(date, INTERVAL expr unit) subtracts the interval expr from date. If first argument is TIME, today's date is used; if first argument is DATE, time at midnight is used.
 
-Argument type: DATE/DATETIME/TIMESTAMP/STRING, INTERVAL/LONG
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, INTERVAL
 
-Return type map:
+Return type: DATETIME
+
+Synonyms: `SUBDATE`_
 
-DATE/DATETIME/TIMESTAMP/STRING, INTERVAL -> DATETIME
+Antonyms: `DATE_ADD`_
 
-DATE, LONG -> DATE
+Example::
+
+    os> source=people | eval `'2008-01-02' - 31d` = DATE_SUB(DATE('2008-01-02'), INTERVAL 31 DAY), `ts '2020-08-26 01:01:01' + 1h` = DATE_SUB(TIMESTAMP('2020-08-26 01:01:01'), INTERVAL 1 HOUR) | fields `'2008-01-02' - 31d`, `ts '2020-08-26 01:01:01' + 1h`
+    fetched rows / total rows = 1/1
+    +---------------------+-------------------------------+
+    | '2008-01-02' - 31d  | ts '2020-08-26 01:01:01' + 1h |
+    |---------------------+-------------------------------|
+    | 2007-12-02 00:00:00 | 2020-08-26 00:01:01           |
+    +---------------------+-------------------------------+
 
-DATETIME/TIMESTAMP/STRING, LONG -> DATETIME
 
-Synonyms: `SUBDATE`_
+DATEDIFF
+--------
+
+Usage: Calculates the difference of date parts of given values. If the first argument is time, today's date is used.
+
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, DATE/DATETIME/TIMESTAMP/TIME
+
+Return type: LONG
 
 Example::
 
-    os> source=people | eval `DATE_SUB(DATE('2008-01-02'), INTERVAL 31 DAY)` = DATE_SUB(DATE('2008-01-02'), INTERVAL 31 DAY), `DATE_SUB(DATE('2020-08-26'), 1)` = DATE_SUB(DATE('2020-08-26'), 1), `DATE_SUB(TIMESTAMP('2020-08-26 01:01:01'), 1)` = DATE_SUB(TIMESTAMP('2020-08-26 01:01:01'), 1) | fields `DATE_SUB(DATE('2008-01-02'), INTERVAL 31 DAY)`, `DATE_SUB(DATE('2020-08-26'), 1)`, `DATE_SUB(TIMESTAMP('2020-08-26 01:01:01'), 1)`
+    os> source=people | eval `'2000-01-02' - '2000-01-01'` = DATEDIFF(TIMESTAMP('2000-01-02 00:00:00'), TIMESTAMP('2000-01-01 23:59:59')), `'2001-02-01' - '2004-01-01'` = DATEDIFF(DATE('2001-02-01'), TIMESTAMP('2004-01-01 00:00:00')), `today - today` = DATEDIFF(TIME('23:59:59'), TIME('00:00:00')) | fields `'2000-01-02' - '2000-01-01'`, `'2001-02-01' - '2004-01-01'`, `today - today`
     fetched rows / total rows = 1/1
-    +-------------------------------------------------+-----------------------------------+-------------------------------------------------+
-    | DATE_SUB(DATE('2008-01-02'), INTERVAL 31 DAY)   | DATE_SUB(DATE('2020-08-26'), 1)   | DATE_SUB(TIMESTAMP('2020-08-26 01:01:01'), 1)   |
-    |-------------------------------------------------+-----------------------------------+-------------------------------------------------|
-    | 2007-12-02                                      | 2020-08-25                        | 2020-08-25 01:01:01                             |
-    +-------------------------------------------------+-----------------------------------+-------------------------------------------------+
+    +-----------------------------+-----------------------------+---------------+
+    | '2000-01-02' - '2000-01-01' | '2001-02-01' - '2004-01-01' | today - today |
+    |-----------------------------+-----------------------------+---------------|
+    | 1                           | -1064                       | 0             |
+    +-----------------------------+-----------------------------+---------------+
 
 
 DAY
@@ -543,23 +621,23 @@ DAY
 Description
 >>>>>>>>>>>
 
-Usage: day(date) extracts the day of the month for date, in the range 1 to 31. The dates with value 0 such as '0000-00-00' or '2008-00-00' are invalid.
+Usage: day(date) extracts the day of the month for date, in the range 1 to 31.
 
 Argument type: STRING/DATE/DATETIME/TIMESTAMP
 
 Return type: INTEGER
 
-Synonyms: DAYOFMONTH
+Synonyms: `DAYOFMONTH`_, `DAY_OF_MONTH`_
 
 Example::
 
     os> source=people | eval `DAY(DATE('2020-08-26'))` = DAY(DATE('2020-08-26')) | fields `DAY(DATE('2020-08-26'))`
     fetched rows / total rows = 1/1
-    +---------------------------+
-    | DAY(DATE('2020-08-26'))   |
-    |---------------------------|
-    | 26                        |
-    +---------------------------+
+    +-------------------------+
+    | DAY(DATE('2020-08-26')) |
+    |-------------------------|
+    | 26                      |
+    +-------------------------+
 
 
 DAYNAME
@@ -578,11 +656,11 @@ Example::
 
     os> source=people | eval `DAYNAME(DATE('2020-08-26'))` = DAYNAME(DATE('2020-08-26')) | fields `DAYNAME(DATE('2020-08-26'))`
     fetched rows / total rows = 1/1
-    +-------------------------------+
-    | DAYNAME(DATE('2020-08-26'))   |
-    |-------------------------------|
-    | Wednesday                     |
-    +-------------------------------+
+    +-----------------------------+
+    | DAYNAME(DATE('2020-08-26')) |
+    |-----------------------------|
+    | Wednesday                   |
+    +-----------------------------+
 
 
 DAYOFMONTH
@@ -591,20 +669,45 @@ DAYOFMONTH
 Description
 >>>>>>>>>>>
 
-Usage: dayofmonth(date) extracts the day of the month for date, in the range 1 to 31. The dates with value 0 such as '0000-00-00' or '2008-00-00' are invalid.
+Usage: dayofmonth(date) extracts the day of the month for date, in the range 1 to 31.
 
 Argument type: STRING/DATE/DATETIME/TIMESTAMP
 
 Return type: INTEGER
 
-Synonyms: DAY
+Synonyms: `DAY`_, `DAY_OF_MONTH`_
 
 Example::
 
     os> source=people | eval `DAYOFMONTH(DATE('2020-08-26'))` = DAYOFMONTH(DATE('2020-08-26')) | fields `DAYOFMONTH(DATE('2020-08-26'))`
     fetched rows / total rows = 1/1
+    +--------------------------------+
+    | DAYOFMONTH(DATE('2020-08-26')) |
+    |--------------------------------|
+    | 26                             |
+    +--------------------------------+
+
+
+DAY_OF_MONTH
+------------
+
+Description
+>>>>>>>>>>>
+
+Usage: day_of_month(date) extracts the day of the month for date, in the range 1 to 31.
+
+Argument type: STRING/DATE/DATETIME/TIMESTAMP
+
+Return type: INTEGER
+
+Synonyms: `DAY`_, `DAYOFMONTH`_
+
+Example::
+
+    os> source=people | eval `DAY_OF_MONTH(DATE('2020-08-26'))` = DAY_OF_MONTH(DATE('2020-08-26')) | fields `DAY_OF_MONTH(DATE('2020-08-26'))`
+    fetched rows / total rows = 1/1
     +----------------------------------+
-    | DAYOFMONTH(DATE('2020-08-26'))   |
+    | DAY_OF_MONTH(DATE('2020-08-26')) |
     |----------------------------------|
     | 26                               |
     +----------------------------------+
@@ -616,24 +719,50 @@ DAYOFWEEK
 Description
 >>>>>>>>>>>
 
-Usage: dayofweek(date) returns the weekday index for date (1 = Sunday, 2 = Monday, …, 7 = Saturday).
+Usage: dayofweek(date) returns the weekday index for date (1 = Sunday, 2 = Monday, ..., 7 = Saturday).
 
 Argument type: STRING/DATE/DATETIME/TIMESTAMP
 
 Return type: INTEGER
 
+Synonyms: `DAY_OF_WEEK`_
+
 Example::
 
     os> source=people | eval `DAYOFWEEK(DATE('2020-08-26'))` = DAYOFWEEK(DATE('2020-08-26')) | fields `DAYOFWEEK(DATE('2020-08-26'))`
     fetched rows / total rows = 1/1
+    +-------------------------------+
+    | DAYOFWEEK(DATE('2020-08-26')) |
+    |-------------------------------|
+    | 4                             |
+    +-------------------------------+
+
+
+DAY_OF_WEEK
+-----------
+
+Description
+>>>>>>>>>>>
+
+Usage: day_of_week(date) returns the weekday index for date (1 = Sunday, 2 = Monday, ..., 7 = Saturday).
+
+Argument type: STRING/DATE/DATETIME/TIMESTAMP
+
+Return type: INTEGER
+
+Synonyms: `DAYOFWEEK`_
+
+Example::
+
+    os> source=people | eval `DAY_OF_WEEK(DATE('2020-08-26'))` = DAY_OF_WEEK(DATE('2020-08-26')) | fields `DAY_OF_WEEK(DATE('2020-08-26'))`
+    fetched rows / total rows = 1/1
     +---------------------------------+
-    | DAYOFWEEK(DATE('2020-08-26'))   |
+    | DAY_OF_WEEK(DATE('2020-08-26')) |
     |---------------------------------|
     | 4                               |
     +---------------------------------+
 
 
-
 DAYOFYEAR
 ---------
 
@@ -646,17 +775,115 @@ Argument type: STRING/DATE/DATETIME/TIMESTAMP
 
 Return type: INTEGER
 
+Synonyms: `DAY_OF_YEAR`_
+
 Example::
 
     os> source=people | eval `DAYOFYEAR(DATE('2020-08-26'))` = DAYOFYEAR(DATE('2020-08-26')) | fields `DAYOFYEAR(DATE('2020-08-26'))`
     fetched rows / total rows = 1/1
+    +-------------------------------+
+    | DAYOFYEAR(DATE('2020-08-26')) |
+    |-------------------------------|
+    | 239                           |
+    +-------------------------------+
+
+
+DAY_OF_YEAR
+-----------
+
+Description
+>>>>>>>>>>>
+
+Usage:  day_of_year(date) returns the day of the year for date, in the range 1 to 366.
+
+Argument type: STRING/DATE/DATETIME/TIMESTAMP
+
+Return type: INTEGER
+
+Synonyms: `DAYOFYEAR`_
+
+Example::
+
+    os> source=people | eval `DAY_OF_YEAR(DATE('2020-08-26'))` = DAY_OF_YEAR(DATE('2020-08-26')) | fields `DAY_OF_YEAR(DATE('2020-08-26'))`
+    fetched rows / total rows = 1/1
     +---------------------------------+
-    | DAYOFYEAR(DATE('2020-08-26'))   |
+    | DAY_OF_YEAR(DATE('2020-08-26')) |
     |---------------------------------|
     | 239                             |
     +---------------------------------+
 
 
+EXTRACT
+-------
+
+Description
+>>>>>>>>>>>
+
+Usage: extract(part FROM date) returns a LONG with digits in order according to the given 'part' arguments.
+The specific format of the returned long is determined by the table below.
+
+Argument type: PART, where PART is one of the following tokens in the table below.
+
+The format specifiers found in this table are the same as those found in the `DATE_FORMAT`_ function.
+
+.. list-table:: The following table describes the mapping of a 'part' to a particular format.
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Part
+     - Format
+   * - MICROSECOND
+     - %f
+   * - SECOND
+     - %s
+   * - MINUTE
+     - %i
+   * - HOUR
+     - %H
+   * - DAY
+     - %d
+   * - WEEK
+     - %X
+   * - MONTH
+     - %m
+   * - YEAR
+     - %V
+   * - SECOND_MICROSECOND
+     - %s%f
+   * - MINUTE_MICROSECOND
+     - %i%s%f
+   * - MINUTE_SECOND
+     - %i%s
+   * - HOUR_MICROSECOND
+     - %H%i%s%f
+   * - HOUR_SECOND
+     - %H%i%s
+   * - HOUR_MINUTE
+     - %H%i
+   * - DAY_MICROSECOND
+     - %d%H%i%s%f
+   * - DAY_SECOND
+     - %d%H%i%s
+   * - DAY_MINUTE
+     - %d%H%i
+   * - DAY_HOUR
+     - %d%H%
+   * - YEAR_MONTH
+     - %V%m
+
+Return type: LONG
+
+Example::
+
+    os> source=people | eval `extract(YEAR_MONTH FROM "2023-02-07 10:11:12")` = extract(YEAR_MONTH FROM "2023-02-07 10:11:12") | fields `extract(YEAR_MONTH FROM "2023-02-07 10:11:12")`
+    fetched rows / total rows = 1/1
+    +------------------------------------------------+
+    | extract(YEAR_MONTH FROM "2023-02-07 10:11:12") |
+    |------------------------------------------------|
+    | 202302                                         |
+    +------------------------------------------------+
+
+
 FROM_DAYS
 ---------
 
@@ -673,11 +900,11 @@ Example::
 
     os> source=people | eval `FROM_DAYS(733687)` = FROM_DAYS(733687) | fields `FROM_DAYS(733687)`
     fetched rows / total rows = 1/1
-    +---------------------+
-    | FROM_DAYS(733687)   |
-    |---------------------|
-    | 2008-10-07          |
-    +---------------------+
+    +-------------------+
+    | FROM_DAYS(733687) |
+    |-------------------|
+    | 2008-10-07        |
+    +-------------------+
 
 
 FROM_UNIXTIME
@@ -701,19 +928,41 @@ Examples::
 
     os> source=people | eval `FROM_UNIXTIME(1220249547)` = FROM_UNIXTIME(1220249547) | fields `FROM_UNIXTIME(1220249547)`
     fetched rows / total rows = 1/1
-    +-----------------------------+
-    | FROM_UNIXTIME(1220249547)   |
-    |-----------------------------|
-    | 2008-09-01 06:12:27         |
-    +-----------------------------+
+    +---------------------------+
+    | FROM_UNIXTIME(1220249547) |
+    |---------------------------|
+    | 2008-09-01 06:12:27       |
+    +---------------------------+
 
     os> source=people | eval `FROM_UNIXTIME(1220249547, '%T')` = FROM_UNIXTIME(1220249547, '%T') | fields `FROM_UNIXTIME(1220249547, '%T')`
     fetched rows / total rows = 1/1
-    +-----------------------------------+
-    | FROM_UNIXTIME(1220249547, '%T')   |
-    |-----------------------------------|
-    | 06:12:27                          |
-    +-----------------------------------+
+    +---------------------------------+
+    | FROM_UNIXTIME(1220249547, '%T') |
+    |---------------------------------|
+    | 06:12:27                        |
+    +---------------------------------+
+
+
+GET_FORMAT
+----------
+
+Description
+>>>>>>>>>>>
+
+Usage: Returns a string value containing string format specifiers based on the input arguments.
+
+Argument type: TYPE, STRING, where TYPE must be one of the following tokens: [DATE, TIME, DATETIME, TIMESTAMP], and
+STRING must be one of the following tokens: ["USA", "JIS", "ISO", "EUR", "INTERNAL"] (" can be replaced by ').
+
+Examples::
+
+    os> source=people | eval `GET_FORMAT(DATE, 'USA')` = GET_FORMAT(DATE, 'USA') | fields `GET_FORMAT(DATE, 'USA')`
+    fetched rows / total rows = 1/1
+    +-------------------------+
+    | GET_FORMAT(DATE, 'USA') |
+    |-------------------------|
+    | %m.%d.%Y                |
+    +-------------------------+
 
 
 HOUR
@@ -728,15 +977,62 @@ Argument type: STRING/TIME/DATETIME/TIMESTAMP
 
 Return type: INTEGER
 
+Synonyms: `HOUR_OF_DAY`_
+
 Example::
 
     os> source=people | eval `HOUR(TIME('01:02:03'))` = HOUR(TIME('01:02:03')) | fields `HOUR(TIME('01:02:03'))`
     fetched rows / total rows = 1/1
-    +--------------------------+
-    | HOUR(TIME('01:02:03'))   |
-    |--------------------------|
-    | 1                        |
-    +--------------------------+
+    +------------------------+
+    | HOUR(TIME('01:02:03')) |
+    |------------------------|
+    | 1                      |
+    +------------------------+
+
+
+HOUR_OF_DAY
+-----------
+
+Description
+>>>>>>>>>>>
+
+Usage: hour_of_day(time) extracts the hour value for time. Different from the time of day value, the time value has a large range and can be greater than 23, so the return value of hour_of_day(time) can be also greater than 23.
+
+Argument type: STRING/TIME/DATETIME/TIMESTAMP
+
+Return type: INTEGER
+
+Synonyms: `HOUR`_
+
+Example::
+
+    os> source=people | eval `HOUR_OF_DAY(TIME('01:02:03'))` = HOUR_OF_DAY(TIME('01:02:03')) | fields `HOUR_OF_DAY(TIME('01:02:03'))`
+    fetched rows / total rows = 1/1
+    +-------------------------------+
+    | HOUR_OF_DAY(TIME('01:02:03')) |
+    |-------------------------------|
+    | 1                             |
+    +-------------------------------+
+
+
+LAST_DAY
+--------
+
+Usage: Returns the last day of the month as a DATE for a valid argument.
+
+Argument type: DATE/DATETIME/STRING/TIMESTAMP/TIME
+
+Return type: DATE
+
+Example::
+
+    os> source=people | eval `last_day('2023-02-06')` = last_day('2023-02-06') | fields `last_day('2023-02-06')`
+    fetched rows / total rows = 1/1
+    +------------------------+
+    | last_day('2023-02-06') |
+    |------------------------|
+    | 2023-02-28             |
+    +------------------------+
 
 
 LOCALTIMESTAMP
@@ -804,11 +1100,11 @@ Example::
 
     os> source=people | eval `MAKEDATE(1945, 5.9)` = MAKEDATE(1945, 5.9), `MAKEDATE(1984, 1984)` = MAKEDATE(1984, 1984) | fields `MAKEDATE(1945, 5.9)`, `MAKEDATE(1984, 1984)`
     fetched rows / total rows = 1/1
-    +-----------------------+------------------------+
-    | MAKEDATE(1945, 5.9)   | MAKEDATE(1984, 1984)   |
-    |-----------------------+------------------------|
-    | 1945-01-06            | 1989-06-06             |
-    +-----------------------+------------------------+
+    +---------------------+----------------------+
+    | MAKEDATE(1945, 5.9) | MAKEDATE(1984, 1984) |
+    |---------------------+----------------------|
+    | 1945-01-06          | 1989-06-06           |
+    +---------------------+----------------------+
 
 
 MAKETIME
@@ -836,11 +1132,11 @@ Example::
 
     os> source=people | eval `MAKETIME(20, 30, 40)` = MAKETIME(20, 30, 40), `MAKETIME(20.2, 49.5, 42.100502)` = MAKETIME(20.2, 49.5, 42.100502) | fields `MAKETIME(20, 30, 40)`, `MAKETIME(20.2, 49.5, 42.100502)`
     fetched rows / total rows = 1/1
-    +------------------------+-----------------------------------+
-    | MAKETIME(20, 30, 40)   | MAKETIME(20.2, 49.5, 42.100502)   |
-    |------------------------+-----------------------------------|
-    | 20:30:40               | 20:50:42.100502                   |
-    +------------------------+-----------------------------------+
+    +----------------------+---------------------------------+
+    | MAKETIME(20, 30, 40) | MAKETIME(20.2, 49.5, 42.100502) |
+    |----------------------+---------------------------------|
+    | 20:30:40             | 20:50:42.100502                 |
+    +----------------------+---------------------------------+
 
 
 MICROSECOND
@@ -859,11 +1155,11 @@ Example::
 
     os> source=people | eval `MICROSECOND(TIME('01:02:03.123456'))` = MICROSECOND(TIME('01:02:03.123456')) | fields `MICROSECOND(TIME('01:02:03.123456'))`
     fetched rows / total rows = 1/1
-    +----------------------------------------+
-    | MICROSECOND(TIME('01:02:03.123456'))   |
-    |----------------------------------------|
-    | 123456                                 |
-    +----------------------------------------+
+    +--------------------------------------+
+    | MICROSECOND(TIME('01:02:03.123456')) |
+    |--------------------------------------|
+    | 123456                               |
+    +--------------------------------------+
 
 
 MINUTE
@@ -878,61 +1174,138 @@ Argument type: STRING/TIME/DATETIME/TIMESTAMP
 
 Return type: INTEGER
 
+Synonyms: `MINUTE_OF_HOUR`_
+
 Example::
 
     os> source=people | eval `MINUTE(TIME('01:02:03'))` =  MINUTE(TIME('01:02:03')) | fields `MINUTE(TIME('01:02:03'))`
     fetched rows / total rows = 1/1
-    +----------------------------+
-    | MINUTE(TIME('01:02:03'))   |
-    |----------------------------|
-    | 2                          |
-    +----------------------------+
+    +--------------------------+
+    | MINUTE(TIME('01:02:03')) |
+    |--------------------------|
+    | 2                        |
+    +--------------------------+
 
 
-MONTH
------
+MINUTE_OF_DAY
+------
 
 Description
 >>>>>>>>>>>
 
-Usage: month(date) returns the month for date, in the range 1 to 12 for January to December. The dates with value 0 such as '0000-00-00' or '2008-00-00' are invalid.
+Usage: minute(time) returns the amount of minutes in the day, in the range of 0 to 1439.
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP
+Argument type: STRING/TIME/DATETIME/TIMESTAMP
 
 Return type: INTEGER
 
 Example::
 
-    os> source=people | eval `MONTH(DATE('2020-08-26'))` =  MONTH(DATE('2020-08-26')) | fields `MONTH(DATE('2020-08-26'))`
+    os> source=people | eval `MINUTE_OF_DAY(TIME('01:02:03'))` = MINUTE_OF_DAY(TIME('01:02:03')) | fields `MINUTE_OF_DAY(TIME('01:02:03'))`
     fetched rows / total rows = 1/1
-    +-----------------------------+
-    | MONTH(DATE('2020-08-26'))   |
-    |-----------------------------|
-    | 8                           |
-    +-----------------------------+
+    +---------------------------------+
+    | MINUTE_OF_DAY(TIME('01:02:03')) |
+    |---------------------------------|
+    | 62                              |
+    +---------------------------------+
 
 
-MONTHNAME
----------
+MINUTE_OF_HOUR
+--------------
 
 Description
 >>>>>>>>>>>
 
-Usage: monthname(date) returns the full name of the month for date.
+Usage: minute(time) returns the minute for time, in the range 0 to 59.
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP
+Argument type: STRING/TIME/DATETIME/TIMESTAMP
 
-Return type: STRING
+Return type: INTEGER
+
+Synonyms: `MINUTE`_
 
 Example::
 
-    os> source=people | eval `MONTHNAME(DATE('2020-08-26'))` = MONTHNAME(DATE('2020-08-26')) | fields `MONTHNAME(DATE('2020-08-26'))`
+    os> source=people | eval `MINUTE_OF_HOUR(TIME('01:02:03'))` =  MINUTE_OF_HOUR(TIME('01:02:03')) | fields `MINUTE_OF_HOUR(TIME('01:02:03'))`
     fetched rows / total rows = 1/1
-    +---------------------------------+
-    | MONTHNAME(DATE('2020-08-26'))   |
-    |---------------------------------|
-    | August                          |
-    +---------------------------------+
+    +----------------------------------+
+    | MINUTE_OF_HOUR(TIME('01:02:03')) |
+    |----------------------------------|
+    | 2                                |
+    +----------------------------------+
+
+
+MONTH
+-----
+
+Description
+>>>>>>>>>>>
+
+Usage: month(date) returns the month for date, in the range 1 to 12 for January to December.
+
+Argument type: STRING/DATE/DATETIME/TIMESTAMP
+
+Return type: INTEGER
+
+Synonyms: `MONTH_OF_YEAR`_
+
+Example::
+
+    os> source=people | eval `MONTH(DATE('2020-08-26'))` =  MONTH(DATE('2020-08-26')) | fields `MONTH(DATE('2020-08-26'))`
+    fetched rows / total rows = 1/1
+    +---------------------------+
+    | MONTH(DATE('2020-08-26')) |
+    |---------------------------|
+    | 8                         |
+    +---------------------------+
+
+
+MONTH_OF_YEAR
+-------------
+
+Description
+>>>>>>>>>>>
+
+Usage: month_of_year(date) returns the month for date, in the range 1 to 12 for January to December.
+
+Argument type: STRING/DATE/DATETIME/TIMESTAMP
+
+Return type: INTEGER
+
+Synonyms: `MONTH`_
+
+Example::
+
+    os> source=people | eval `MONTH_OF_YEAR(DATE('2020-08-26'))` =  MONTH_OF_YEAR(DATE('2020-08-26')) | fields `MONTH_OF_YEAR(DATE('2020-08-26'))`
+    fetched rows / total rows = 1/1
+    +-----------------------------------+
+    | MONTH_OF_YEAR(DATE('2020-08-26')) |
+    |-----------------------------------|
+    | 8                                 |
+    +-----------------------------------+
+
+
+MONTHNAME
+---------
+
+Description
+>>>>>>>>>>>
+
+Usage: monthname(date) returns the full name of the month for date.
+
+Argument type: STRING/DATE/DATETIME/TIMESTAMP
+
+Return type: STRING
+
+Example::
+
+    os> source=people | eval `MONTHNAME(DATE('2020-08-26'))` = MONTHNAME(DATE('2020-08-26')) | fields `MONTHNAME(DATE('2020-08-26'))`
+    fetched rows / total rows = 1/1
+    +-------------------------------+
+    | MONTHNAME(DATE('2020-08-26')) |
+    |-------------------------------|
+    | August                        |
+    +-------------------------------+
 
 
 NOW
@@ -975,11 +1348,11 @@ Example::
 
     os> source=people | eval `PERIOD_ADD(200801, 2)` = PERIOD_ADD(200801, 2), `PERIOD_ADD(200801, -12)` = PERIOD_ADD(200801, -12) | fields `PERIOD_ADD(200801, 2)`, `PERIOD_ADD(200801, -12)`
     fetched rows / total rows = 1/1
-    +-------------------------+---------------------------+
-    | PERIOD_ADD(200801, 2)   | PERIOD_ADD(200801, -12)   |
-    |-------------------------+---------------------------|
-    | 200803                  | 200701                    |
-    +-------------------------+---------------------------+
+    +-----------------------+-------------------------+
+    | PERIOD_ADD(200801, 2) | PERIOD_ADD(200801, -12) |
+    |-----------------------+-------------------------|
+    | 200803                | 200701                  |
+    +-----------------------+-------------------------+
 
 
 PERIOD_DIFF
@@ -998,11 +1371,11 @@ Example::
 
     os> source=people | eval `PERIOD_DIFF(200802, 200703)` = PERIOD_DIFF(200802, 200703), `PERIOD_DIFF(200802, 201003)` = PERIOD_DIFF(200802, 201003) | fields `PERIOD_DIFF(200802, 200703)`, `PERIOD_DIFF(200802, 201003)`
     fetched rows / total rows = 1/1
-    +-------------------------------+-------------------------------+
-    | PERIOD_DIFF(200802, 200703)   | PERIOD_DIFF(200802, 201003)   |
-    |-------------------------------+-------------------------------|
-    | 11                            | -25                           |
-    +-------------------------------+-------------------------------+
+    +-----------------------------+-----------------------------+
+    | PERIOD_DIFF(200802, 200703) | PERIOD_DIFF(200802, 201003) |
+    |-----------------------------+-----------------------------|
+    | 11                          | -25                         |
+    +-----------------------------+-----------------------------+
 
 
 QUARTER
@@ -1021,11 +1394,37 @@ Example::
 
     os> source=people | eval `QUARTER(DATE('2020-08-26'))` = QUARTER(DATE('2020-08-26')) | fields `QUARTER(DATE('2020-08-26'))`
     fetched rows / total rows = 1/1
-    +-------------------------------+
-    | QUARTER(DATE('2020-08-26'))   |
-    |-------------------------------|
-    | 3                             |
-    +-------------------------------+
+    +-----------------------------+
+    | QUARTER(DATE('2020-08-26')) |
+    |-----------------------------|
+    | 3                           |
+    +-----------------------------+
+
+
+SEC_TO_TIME
+-----------
+
+Description
+>>>>>>>>>>>
+
+Usage: sec_to_time(number) returns the time in HH:mm:ssss[.nnnnnn] format.
+Note that the function returns a time between 00:00:00 and 23:59:59.
+If an input value is too large (greater than 86399), the function will wrap around and begin returning outputs starting from 00:00:00.
+If an input value is too small (less than 0), the function will wrap around and begin returning outputs counting down from 23:59:59.
+
+Argument type: INTEGER, LONG, DOUBLE, FLOAT
+
+Return type: TIME
+
+Example::
+
+    os> source=people | eval `SEC_TO_TIME(3601)` = SEC_TO_TIME(3601) | eval `SEC_TO_TIME(1234.123)` = SEC_TO_TIME(1234.123) | fields `SEC_TO_TIME(3601)`, `SEC_TO_TIME(1234.123)`
+    fetched rows / total rows = 1/1
+    +-------------------+-----------------------+
+    | SEC_TO_TIME(3601) | SEC_TO_TIME(1234.123) |
+    |-------------------+-----------------------|
+    | 01:00:01          | 00:20:34.123          |
+    +-------------------+-----------------------+
 
 
 SECOND
@@ -1040,15 +1439,68 @@ Argument type: STRING/TIME/DATETIME/TIMESTAMP
 
 Return type: INTEGER
 
+Synonyms: `SECOND_OF_MINUTE`_
+
 Example::
 
     os> source=people | eval `SECOND(TIME('01:02:03'))` = SECOND(TIME('01:02:03')) | fields `SECOND(TIME('01:02:03'))`
     fetched rows / total rows = 1/1
-    +----------------------------+
-    | SECOND(TIME('01:02:03'))   |
-    |----------------------------|
-    | 3                          |
-    +----------------------------+
+    +--------------------------+
+    | SECOND(TIME('01:02:03')) |
+    |--------------------------|
+    | 3                        |
+    +--------------------------+
+
+
+SECOND_OF_MINUTE
+----------------
+
+Description
+>>>>>>>>>>>
+
+Usage: second_of_minute(time) returns the second for time, in the range 0 to 59.
+
+Argument type: STRING/TIME/DATETIME/TIMESTAMP
+
+Return type: INTEGER
+
+Synonyms: `SECOND`_
+
+Example::
+
+    os> source=people | eval `SECOND_OF_MINUTE(TIME('01:02:03'))` = SECOND_OF_MINUTE(TIME('01:02:03')) | fields `SECOND_OF_MINUTE(TIME('01:02:03'))`
+    fetched rows / total rows = 1/1
+    +------------------------------------+
+    | SECOND_OF_MINUTE(TIME('01:02:03')) |
+    |------------------------------------|
+    | 3                                  |
+    +------------------------------------+
+
+
+STR_TO_DATE
+-----------
+
+Description
+>>>>>>>>>>>
+
+Usage: str_to_date(string, string) is used to extract a DATETIME from the first argument string using the formats specified in the second argument string.
+The input argument must have enough information to be parsed as a DATE, DATETIME, or TIME.
+Acceptable string format specifiers are the same as those used in the `DATE_FORMAT`_ function.
+It returns NULL when a statement cannot be parsed due to an invalid pair of arguments, and when 0 is provided for any DATE field. Otherwise, it will return a DATETIME with the parsed values (as well as default values for any field that was not parsed).
+
+Argument type: STRING, STRING
+
+Return type: DATETIME
+
+Example::
+
+    OS> source=people | eval `str_to_date("01,5,2013", "%d,%m,%Y")` = str_to_date("01,5,2013", "%d,%m,%Y") | fields = `str_to_date("01,5,2013", "%d,%m,%Y")`
+    fetched rows / total rows = 1/1
+    +--------------------------------------+
+    | str_to_date("01,5,2013", "%d,%m,%Y") |
+    |--------------------------------------|
+    | 2013-05-01 00:00:00                  |
+    +--------------------------------------+
 
 
 SUBDATE
@@ -1057,29 +1509,93 @@ SUBDATE
 Description
 >>>>>>>>>>>
 
-Usage: subdate(date, INTERVAL expr unit)/ subdate(date, expr) subtracts the time interval expr from date
+Usage: subdate(date, INTERVAL expr unit) / subdate(date, days) subtracts the interval expr from date; subdate(date, days) subtracts the second argument as integer number of days from date.
+If first argument is TIME, today's date is used; if first argument is DATE, time at midnight is used.
 
-Argument type: DATE/DATETIME/TIMESTAMP/STRING, INTERVAL/LONG
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, INTERVAL/LONG
 
 Return type map:
 
-DATE/DATETIME/TIMESTAMP/STRING, INTERVAL -> DATETIME
+(DATE/DATETIME/TIMESTAMP/TIME, INTERVAL) -> DATETIME
+
+(DATE, LONG) -> DATE
+
+(DATETIME/TIMESTAMP/TIME, LONG) -> DATETIME
+
+Synonyms: `DATE_SUB`_ when invoked with the INTERVAL form of the second argument.
+
+Antonyms: `ADDDATE`_
+
+Example::
+
+    os> source=people | eval `'2008-01-02' - 31d` = SUBDATE(DATE('2008-01-02'), INTERVAL 31 DAY), `'2020-08-26' - 1` = SUBDATE(DATE('2020-08-26'), 1), `ts '2020-08-26 01:01:01' - 1` = SUBDATE(TIMESTAMP('2020-08-26 01:01:01'), 1) | fields `'2008-01-02' - 31d`, `'2020-08-26' - 1`, `ts '2020-08-26 01:01:01' - 1`
+    fetched rows / total rows = 1/1
+    +---------------------+------------------+------------------------------+
+    | '2008-01-02' - 31d  | '2020-08-26' - 1 | ts '2020-08-26 01:01:01' - 1 |
+    |---------------------+------------------+------------------------------|
+    | 2007-12-02 00:00:00 | 2020-08-25       | 2020-08-25 01:01:01          |
+    +---------------------+------------------+------------------------------+
+
+
+SUBTIME
+-------
+
+Description
+>>>>>>>>>>>
+
+Usage: subtime(expr1, expr2) subtracts expr2 from expr1 and returns the result. If argument is TIME, today's date is used; if argument is DATE, time at midnight is used.
+
+Argument type: DATE/DATETIME/TIMESTAMP/TIME, DATE/DATETIME/TIMESTAMP/TIME
+
+Return type map:
 
-DATE, LONG -> DATE
+(DATE/DATETIME/TIMESTAMP, DATE/DATETIME/TIMESTAMP/TIME) -> DATETIME
 
-DATETIME/TIMESTAMP/STRING, LONG -> DATETIME
+(TIME, DATE/DATETIME/TIMESTAMP/TIME) -> TIME
 
-Synonyms: `DATE_SUB`_
+Antonyms: `ADDTIME`_
 
 Example::
 
-    os> source=people | eval `SUBDATE(DATE('2008-01-02'), INTERVAL 31 DAY)` = SUBDATE(DATE('2008-01-02'), INTERVAL 31 DAY), `SUBDATE(DATE('2020-08-26'), 1)` = SUBDATE(DATE('2020-08-26'), 1), `SUBDATE(TIMESTAMP('2020-08-26 01:01:01'), 1)` = SUBDATE(TIMESTAMP('2020-08-26 01:01:01'), 1) | fields `SUBDATE(DATE('2008-01-02'), INTERVAL 31 DAY)`, `SUBDATE(DATE('2020-08-26'), 1)`, `SUBDATE(TIMESTAMP('2020-08-26 01:01:01'), 1)`
+    os> source=people | eval `'2008-12-12' - 0` = SUBTIME(DATE('2008-12-12'), DATE('2008-11-15')) | fields `'2008-12-12' - 0`
+    fetched rows / total rows = 1/1
+    +---------------------+
+    | '2008-12-12' - 0    |
+    |---------------------|
+    | 2008-12-12 00:00:00 |
+    +---------------------+
+
+    os> source=people | eval `'23:59:59' - 0` = SUBTIME(TIME('23:59:59'), DATE('2004-01-01')) | fields `'23:59:59' - 0`
     fetched rows / total rows = 1/1
-    +------------------------------------------------+----------------------------------+------------------------------------------------+
-    | SUBDATE(DATE('2008-01-02'), INTERVAL 31 DAY)   | SUBDATE(DATE('2020-08-26'), 1)   | SUBDATE(TIMESTAMP('2020-08-26 01:01:01'), 1)   |
-    |------------------------------------------------+----------------------------------+------------------------------------------------|
-    | 2007-12-02                                     | 2020-08-25                       | 2020-08-25 01:01:01                            |
-    +------------------------------------------------+----------------------------------+------------------------------------------------+
+    +----------------+
+    | '23:59:59' - 0 |
+    |----------------|
+    | 23:59:59       |
+    +----------------+
+
+    os> source=people | eval `'2004-01-01' - '23:59:59'` = SUBTIME(DATE('2004-01-01'), TIME('23:59:59')) | fields `'2004-01-01' - '23:59:59'`
+    fetched rows / total rows = 1/1
+    +---------------------------+
+    | '2004-01-01' - '23:59:59' |
+    |---------------------------|
+    | 2003-12-31 00:00:01       |
+    +---------------------------+
+
+    os> source=people | eval `'10:20:30' - '00:05:42'` = SUBTIME(TIME('10:20:30'), TIME('00:05:42')) | fields `'10:20:30' - '00:05:42'`
+    fetched rows / total rows = 1/1
+    +-------------------------+
+    | '10:20:30' - '00:05:42' |
+    |-------------------------|
+    | 10:14:48                |
+    +-------------------------+
+
+    os> source=people | eval `'2007-03-01 10:20:30' - '20:40:50'` = SUBTIME(TIMESTAMP('2007-03-01 10:20:30'), DATETIME('2002-03-04 20:40:50')) | fields `'2007-03-01 10:20:30' - '20:40:50'`
+    fetched rows / total rows = 1/1
+    +------------------------------------+
+    | '2007-03-01 10:20:30' - '20:40:50' |
+    |------------------------------------|
+    | 2007-02-28 13:39:40                |
+    +------------------------------------+
 
 
 SYSDATE
@@ -1125,35 +1641,90 @@ Example::
 
     os> source=people | eval `TIME('13:49:00')` = TIME('13:49:00') | fields `TIME('13:49:00')`
     fetched rows / total rows = 1/1
-    +--------------------+
-    | TIME('13:49:00')   |
-    |--------------------|
-    | 13:49:00           |
-    +--------------------+
+    +------------------+
+    | TIME('13:49:00') |
+    |------------------|
+    | 13:49:00         |
+    +------------------+
 
     os> source=people | eval `TIME('13:49')` = TIME('13:49') | fields `TIME('13:49')`
     fetched rows / total rows = 1/1
-    +-----------------+
-    | TIME('13:49')   |
-    |-----------------|
-    | 13:49:00        |
-    +-----------------+
+    +---------------+
+    | TIME('13:49') |
+    |---------------|
+    | 13:49:00      |
+    +---------------+
 
     os> source=people | eval `TIME('2020-08-26 13:49:00')` = TIME('2020-08-26 13:49:00') | fields `TIME('2020-08-26 13:49:00')`
     fetched rows / total rows = 1/1
-    +-------------------------------+
-    | TIME('2020-08-26 13:49:00')   |
-    |-------------------------------|
-    | 13:49:00                      |
-    +-------------------------------+
+    +-----------------------------+
+    | TIME('2020-08-26 13:49:00') |
+    |-----------------------------|
+    | 13:49:00                    |
+    +-----------------------------+
 
     os> source=people | eval `TIME('2020-08-26 13:49')` = TIME('2020-08-26 13:49') | fields `TIME('2020-08-26 13:49')`
     fetched rows / total rows = 1/1
-    +----------------------------+
-    | TIME('2020-08-26 13:49')   |
-    |----------------------------|
-    | 13:49:00                   |
-    +----------------------------+
+    +--------------------------+
+    | TIME('2020-08-26 13:49') |
+    |--------------------------|
+    | 13:49:00                 |
+    +--------------------------+
+
+
+TIME_FORMAT
+-----------
+
+Description
+>>>>>>>>>>>
+
+Usage: time_format(time, format) formats the time argument using the specifiers in the format argument.
+This supports a subset of the time format specifiers available for the `date_format`_ function.
+Using date format specifiers supported by `date_format`_ will return 0 or null.
+Acceptable format specifiers are listed in the table below.
+If an argument of type DATE is passed in, it is treated as a DATETIME at midnight (i.e., 00:00:00).
+
+.. list-table:: The following table describes the available specifier arguments.
+   :widths: 20 80
+   :header-rows: 1
+
+   * - Specifier
+     - Description
+   * - %f
+     - Microseconds (000000..999999)
+   * - %H
+     - Hour (00..23)
+   * - %h
+     - Hour (01..12)
+   * - %I
+     - Hour (01..12)
+   * - %i
+     - Minutes, numeric (00..59)
+   * - %p
+     - AM or PM
+   * - %r
+     - Time, 12-hour (hh:mm:ss followed by AM or PM)
+   * - %S
+     - Seconds (00..59)
+   * - %s
+     - Seconds (00..59)
+   * - %T
+     - Time, 24-hour (hh:mm:ss)
+
+
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP, STRING
+
+Return type: STRING
+
+Example::
+
+    os> source=people | eval `TIME_FORMAT('1998-01-31 13:14:15.012345', '%f %H %h %I %i %p %r %S %s %T')` = TIME_FORMAT('1998-01-31 13:14:15.012345', '%f %H %h %I %i %p %r %S %s %T') | fields `TIME_FORMAT('1998-01-31 13:14:15.012345', '%f %H %h %I %i %p %r %S %s %T')`
+    fetched rows / total rows = 1/1
+    +----------------------------------------------------------------------------+
+    | TIME_FORMAT('1998-01-31 13:14:15.012345', '%f %H %h %I %i %p %r %S %s %T') |
+    |----------------------------------------------------------------------------|
+    | 012345 13 01 01 14 PM 01:14:15 PM 15 15 13:14:15                           |
+    +----------------------------------------------------------------------------+
 
 
 TIME_TO_SEC
@@ -1172,11 +1743,34 @@ Example::
 
     os> source=people | eval `TIME_TO_SEC(TIME('22:23:00'))` = TIME_TO_SEC(TIME('22:23:00')) | fields `TIME_TO_SEC(TIME('22:23:00'))`
     fetched rows / total rows = 1/1
-    +---------------------------------+
-    | TIME_TO_SEC(TIME('22:23:00'))   |
-    |---------------------------------|
-    | 80580                           |
-    +---------------------------------+
+    +-------------------------------+
+    | TIME_TO_SEC(TIME('22:23:00')) |
+    |-------------------------------|
+    | 80580                         |
+    +-------------------------------+
+
+
+TIMEDIFF
+--------
+
+Description
+>>>>>>>>>>>
+
+Usage: returns the difference between two time expressions as a time.
+
+Argument type: TIME, TIME
+
+Return type: TIME
+
+Example::
+
+    os> source=people | eval `TIMEDIFF('23:59:59', '13:00:00')` = TIMEDIFF('23:59:59', '13:00:00') | fields `TIMEDIFF('23:59:59', '13:00:00')`
+    fetched rows / total rows = 1/1
+    +----------------------------------+
+    | TIMEDIFF('23:59:59', '13:00:00') |
+    |----------------------------------|
+    | 10:59:59                         |
+    +----------------------------------+
 
 
 TIMESTAMP
@@ -1185,21 +1779,77 @@ TIMESTAMP
 Description
 >>>>>>>>>>>
 
-Usage: timestamp(expr) construct a timestamp type with the input string expr as an timestamp. If the argument is of date/datetime/timestamp type, cast expr to timestamp type with default timezone UTC.
+Usage: timestamp(expr) constructs a timestamp type with the input string `expr` as an timestamp. If the argument is not a string, it casts `expr` to timestamp type with default timezone UTC. If argument is a time, it applies today's date before cast.
+With two arguments `timestamp(expr1, expr2)` adds the time expression `expr2` to the date or datetime expression `expr1` and returns the result as a timestamp value.
 
-Argument type: STRING/DATE/DATETIME/TIMESTAMP
+Argument type: STRING/DATE/TIME/DATETIME/TIMESTAMP
 
-Return type: TIMESTAMP
+Return type map:
+
+(STRING/DATE/TIME/DATETIME/TIMESTAMP) -> TIMESTAMP
+
+(STRING/DATE/TIME/DATETIME/TIMESTAMP, STRING/DATE/TIME/DATETIME/TIMESTAMP) -> TIMESTAMP
 
 Example::
 
-    >od source=people | eval `TIMESTAMP('2020-08-26 13:49:00')` = TIMESTAMP('2020-08-26 13:49:00') | fields `TIMESTAMP('2020-08-26 13:49:00')`
+    os> source=people | eval `TIMESTAMP('2020-08-26 13:49:00')` = TIMESTAMP('2020-08-26 13:49:00'), `TIMESTAMP('2020-08-26 13:49:00', TIME('12:15:42'))` = TIMESTAMP('2020-08-26 13:49:00', TIME('12:15:42')) | fields `TIMESTAMP('2020-08-26 13:49:00')`, `TIMESTAMP('2020-08-26 13:49:00', TIME('12:15:42'))`
     fetched rows / total rows = 1/1
-    +------------------------------------+
-    | TIMESTAMP('2020-08-26 13:49:00')   |
-    |------------------------------------|
-    | TIMESTAMP '2020-08-26 13:49:00     |
-    +------------------------------------+
+    +----------------------------------+----------------------------------------------------+
+    | TIMESTAMP('2020-08-26 13:49:00') | TIMESTAMP('2020-08-26 13:49:00', TIME('12:15:42')) |
+    |----------------------------------+----------------------------------------------------|
+    | 2020-08-26 13:49:00              | 2020-08-27 02:04:42                                |
+    +----------------------------------+----------------------------------------------------+
+
+
+TIMESTAMPADD
+------------
+
+Description
+>>>>>>>>>>>
+
+Usage: Returns a DATETIME value based on a passed in DATE/DATETIME/TIME/TIMESTAMP/STRING argument and an INTERVAL and INTEGER argument which determine the amount of time to be added.
+If the third argument is a STRING, it must be formatted as a valid DATETIME. If only a TIME is provided, a DATETIME is still returned with the DATE portion filled in using the current date.
+If the third argument is a DATE, it will be automatically converted to a DATETIME.
+
+Argument type: INTERVAL, INTEGER, DATE/DATETIME/TIME/TIMESTAMP/STRING
+
+INTERVAL must be one of the following tokens: [MICROSECOND, SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER, YEAR]
+
+Examples::
+
+    os> source=people | eval `TIMESTAMPADD(DAY, 17, '2000-01-01 00:00:00')` = TIMESTAMPADD(DAY, 17, '2000-01-01 00:00:00') | eval `TIMESTAMPADD(QUARTER, -1, '2000-01-01 00:00:00')` = TIMESTAMPADD(QUARTER, -1, '2000-01-01 00:00:00') | fields `TIMESTAMPADD(DAY, 17, '2000-01-01 00:00:00')`, `TIMESTAMPADD(QUARTER, -1, '2000-01-01 00:00:00')`
+    fetched rows / total rows = 1/1
+    +----------------------------------------------+--------------------------------------------------+
+    | TIMESTAMPADD(DAY, 17, '2000-01-01 00:00:00') | TIMESTAMPADD(QUARTER, -1, '2000-01-01 00:00:00') |
+    |----------------------------------------------+--------------------------------------------------|
+    | 2000-01-18 00:00:00                          | 1999-10-01 00:00:00                              |
+    +----------------------------------------------+--------------------------------------------------+
+
+
+TIMESTAMPDIFF
+-------------
+
+Description
+>>>>>>>>>>>
+
+Usage: TIMESTAMPDIFF(interval, start, end) returns the difference between the start and end date/times in interval units.
+If a TIME is provided as an argument, it will be converted to a DATETIME with the DATE portion filled in using the current date.
+Arguments will be automatically converted to a DATETIME/TIME/TIMESTAMP when appropriate.
+Any argument that is a STRING must be formatted as a valid DATETIME.
+
+Argument type: INTERVAL, DATE/DATETIME/TIME/TIMESTAMP/STRING, DATE/DATETIME/TIME/TIMESTAMP/STRING
+
+INTERVAL must be one of the following tokens: [MICROSECOND, SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER, YEAR]
+
+Examples::
+
+    os> source=people | eval `TIMESTAMPDIFF(YEAR, '1997-01-01 00:00:00', '2001-03-06 00:00:00')` = TIMESTAMPDIFF(YEAR, '1997-01-01 00:00:00', '2001-03-06 00:00:00') | eval `TIMESTAMPDIFF(SECOND, time('00:00:23'), time('00:00:00'))` = TIMESTAMPDIFF(SECOND, time('00:00:23'), time('00:00:00')) | fields `TIMESTAMPDIFF(YEAR, '1997-01-01 00:00:00', '2001-03-06 00:00:00')`, `TIMESTAMPDIFF(SECOND, time('00:00:23'), time('00:00:00'))`
+    fetched rows / total rows = 1/1
+    +-------------------------------------------------------------------+-----------------------------------------------------------+
+    | TIMESTAMPDIFF(YEAR, '1997-01-01 00:00:00', '2001-03-06 00:00:00') | TIMESTAMPDIFF(SECOND, time('00:00:23'), time('00:00:00')) |
+    |-------------------------------------------------------------------+-----------------------------------------------------------|
+    | 4                                                                 | -23                                                       |
+    +-------------------------------------------------------------------+-----------------------------------------------------------+
 
 
 TO_DAYS
@@ -1218,11 +1868,35 @@ Example::
 
     os> source=people | eval `TO_DAYS(DATE('2008-10-07'))` = TO_DAYS(DATE('2008-10-07')) | fields `TO_DAYS(DATE('2008-10-07'))`
     fetched rows / total rows = 1/1
-    +-------------------------------+
-    | TO_DAYS(DATE('2008-10-07'))   |
-    |-------------------------------|
-    | 733687                        |
-    +-------------------------------+
+    +-----------------------------+
+    | TO_DAYS(DATE('2008-10-07')) |
+    |-----------------------------|
+    | 733687                      |
+    +-----------------------------+
+
+
+TO_SECONDS
+----------
+
+Description
+>>>>>>>>>>>
+
+Usage: to_seconds(date) returns the number of seconds since the year 0 of the given value. Returns NULL if value is invalid.
+An argument of a LONG type can be used. It must be formatted as YMMDD, YYMMDD, YYYMMDD or YYYYMMDD. Note that a LONG type argument cannot have leading 0s as it will be parsed using an octal numbering system.
+
+Argument type: STRING/LONG/DATE/DATETIME/TIME/TIMESTAMP
+
+Return type: LONG
+
+Example::
+
+    os> source=people | eval `TO_SECONDS(DATE('2008-10-07'))` = TO_SECONDS(DATE('2008-10-07')) | eval `TO_SECONDS(950228)` = TO_SECONDS(950228) | fields `TO_SECONDS(DATE('2008-10-07'))`, `TO_SECONDS(950228)`
+    fetched rows / total rows = 1/1
+    +--------------------------------+--------------------+
+    | TO_SECONDS(DATE('2008-10-07')) | TO_SECONDS(950228) |
+    |--------------------------------+--------------------|
+    | 63390556800                    | 62961148800        |
+    +--------------------------------+--------------------+
 
 
 UNIX_TIMESTAMP
@@ -1244,11 +1918,80 @@ Example::
 
     os> source=people | eval `UNIX_TIMESTAMP(double)` = UNIX_TIMESTAMP(20771122143845), `UNIX_TIMESTAMP(timestamp)` = UNIX_TIMESTAMP(TIMESTAMP('1996-11-15 17:05:42')) | fields `UNIX_TIMESTAMP(double)`, `UNIX_TIMESTAMP(timestamp)`
     fetched rows / total rows = 1/1
-    +--------------------------+-----------------------------+
-    | UNIX_TIMESTAMP(double)   | UNIX_TIMESTAMP(timestamp)   |
-    |--------------------------+-----------------------------|
-    | 3404817525.0             | 848077542.0                 |
-    +--------------------------+-----------------------------+
+    +------------------------+---------------------------+
+    | UNIX_TIMESTAMP(double) | UNIX_TIMESTAMP(timestamp) |
+    |------------------------+---------------------------|
+    | 3404817525.0           | 848077542.0               |
+    +------------------------+---------------------------+
+
+
+UTC_DATE
+--------
+
+Description
+>>>>>>>>>>>
+
+Returns the current UTC date as a value in 'YYYY-MM-DD'.
+
+Return type: DATE
+
+Specification: UTC_DATE() -> DATE
+
+Example::
+
+    > source=people | eval `UTC_DATE()` = UTC_DATE() | fields `UTC_DATE()`
+    fetched rows / total rows = 1/1
+    +------------+
+    | UTC_DATE() |
+    |------------|
+    | 2022-10-03 |
+    +------------+
+
+
+UTC_TIME
+--------
+
+Description
+>>>>>>>>>>>
+
+Returns the current UTC time as a value in 'hh:mm:ss'.
+
+Return type: TIME
+
+Specification: UTC_TIME() -> TIME
+
+Example::
+
+    > source=people | eval `UTC_TIME()` = UTC_TIME() | fields `UTC_TIME()`
+    fetched rows / total rows = 1/1
+    +------------+
+    | UTC_TIME() |
+    |------------|
+    | 17:54:27   |
+    +------------+
+
+
+UTC_TIMESTAMP
+-------------
+
+Description
+>>>>>>>>>>>
+
+Returns the current UTC timestamp as a value in 'YYYY-MM-DD hh:mm:ss'.
+
+Return type: DATETIME
+
+Specification: UTC_TIMESTAMP() -> DATETIME
+
+Example::
+
+    > source=people | eval `UTC_TIMESTAMP()` = UTC_TIMESTAMP() | fields `UTC_TIMESTAMP()`
+    fetched rows / total rows = 1/1
+    +---------------------+
+    | UTC_TIMESTAMP()     |
+    |---------------------|
+    | 2022-10-03 17:54:28 |
+    +---------------------+
 
 
 WEEK
@@ -1266,7 +2009,7 @@ Usage: week(date[, mode]) returns the week number for date. If the mode argument
    * - Mode
      - First day of week
      - Range
-     - Week 1 is the first week …
+     - Week 1 is the first week ...
    * - 0
      - Sunday
      - 0-53
@@ -1304,15 +2047,108 @@ Argument type: DATE/DATETIME/TIMESTAMP/STRING
 
 Return type: INTEGER
 
+Synonyms: `WEEK_OF_YEAR`_
+
+Example::
+
+    os> source=people | eval `WEEK(DATE('2008-02-20'))` = WEEK(DATE('2008-02-20')), `WEEK(DATE('2008-02-20'), 1)` = WEEK(DATE('2008-02-20'), 1) | fields `WEEK(DATE('2008-02-20'))`, `WEEK(DATE('2008-02-20'), 1)`
+    fetched rows / total rows = 1/1
+    +--------------------------+-----------------------------+
+    | WEEK(DATE('2008-02-20')) | WEEK(DATE('2008-02-20'), 1) |
+    |--------------------------+-----------------------------|
+    | 7                        | 8                           |
+    +--------------------------+-----------------------------+
+
+
+WEEKDAY
+-------
+
+Description
+>>>>>>>>>>>
+
+Usage: weekday(date) returns the weekday index for date (0 = Monday, 1 = Tuesday, ..., 6 = Sunday).
+
+It is similar to the `dayofweek`_ function, but returns different indexes for each day.
+
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP
+
+Return type: INTEGER
+
 Example::
 
-    >od source=people | eval `WEEK(DATE('2008-02-20'))` = WEEK(DATE('2008-02-20')), `WEEK(DATE('2008-02-20'), 1)` = WEEK(DATE('2008-02-20'), 1) | fields `WEEK(DATE('2008-02-20'))`, `WEEK(DATE('2008-02-20'), 1)`
+    os> source=people | eval `weekday(DATE('2020-08-26'))` = weekday(DATE('2020-08-26')) | eval `weekday(DATE('2020-08-27'))` = weekday(DATE('2020-08-27')) | fields `weekday(DATE('2020-08-26'))`, `weekday(DATE('2020-08-27'))`
     fetched rows / total rows = 1/1
-    +----------------------------+-------------------------------+
-    | WEEK(DATE('2008-02-20'))   | WEEK(DATE('2008-02-20'), 1)   |
-    |----------------------------|-------------------------------|
-    | 7                          | 8                             |
-    +----------------------------+-------------------------------+
+    +-----------------------------+-----------------------------+
+    | weekday(DATE('2020-08-26')) | weekday(DATE('2020-08-27')) |
+    |-----------------------------+-----------------------------|
+    | 2                           | 3                           |
+    +-----------------------------+-----------------------------+
+
+
+WEEK_OF_YEAR
+------------
+
+Description
+>>>>>>>>>>>
+
+Usage: week_of_year(date[, mode]) returns the week number for date. If the mode argument is omitted, the default mode 0 is used.
+
+.. list-table:: The following table describes how the mode argument works.
+   :widths: 25 50 25 75
+   :header-rows: 1
+
+   * - Mode
+     - First day of week
+     - Range
+     - Week 1 is the first week ...
+   * - 0
+     - Sunday
+     - 0-53
+     - with a Sunday in this year
+   * - 1
+     - Monday
+     - 0-53
+     - with 4 or more days this year
+   * - 2
+     - Sunday
+     - 1-53
+     - with a Sunday in this year
+   * - 3
+     - Monday
+     - 1-53
+     - with 4 or more days this year
+   * - 4
+     - Sunday
+     - 0-53
+     - with 4 or more days this year
+   * - 5
+     - Monday
+     - 0-53
+     - with a Monday in this year
+   * - 6
+     - Sunday
+     - 1-53
+     - with 4 or more days this year
+   * - 7
+     - Monday
+     - 1-53
+     - with a Monday in this year
+
+Argument type: DATE/DATETIME/TIMESTAMP/STRING
+
+Return type: INTEGER
+
+Synonyms: `WEEK`_
+
+Example::
+
+    os> source=people | eval `WEEK_OF_YEAR(DATE('2008-02-20'))` = WEEK(DATE('2008-02-20')), `WEEK_OF_YEAR(DATE('2008-02-20'), 1)` = WEEK_OF_YEAR(DATE('2008-02-20'), 1) | fields `WEEK_OF_YEAR(DATE('2008-02-20'))`, `WEEK_OF_YEAR(DATE('2008-02-20'), 1)`
+    fetched rows / total rows = 1/1
+    +----------------------------------+-------------------------------------+
+    | WEEK_OF_YEAR(DATE('2008-02-20')) | WEEK_OF_YEAR(DATE('2008-02-20'), 1) |
+    |----------------------------------+-------------------------------------|
+    | 7                                | 8                                   |
+    +----------------------------------+-------------------------------------+
 
 
 YEAR
@@ -1331,10 +2167,33 @@ Example::
 
     os> source=people | eval `YEAR(DATE('2020-08-26'))` = YEAR(DATE('2020-08-26')) | fields `YEAR(DATE('2020-08-26'))`
     fetched rows / total rows = 1/1
-    +----------------------------+
-    | YEAR(DATE('2020-08-26'))   |
-    |----------------------------|
-    | 2020                       |
-    +----------------------------+
+    +--------------------------+
+    | YEAR(DATE('2020-08-26')) |
+    |--------------------------|
+    | 2020                     |
+    +--------------------------+
+
+
+YEARWEEK
+--------
+
+Description
+>>>>>>>>>>>
+
+Usage: yearweek(date) returns the year and week for date as an integer. It accepts and optional mode arguments aligned with those available for the `WEEK`_ function.
+
+Argument type: STRING/DATE/DATETIME/TIME/TIMESTAMP
+
+Return type: INTEGER
+
+Example::
+
+    os> source=people | eval `YEARWEEK('2020-08-26')` = YEARWEEK('2020-08-26') | eval `YEARWEEK('2019-01-05', 1)` = YEARWEEK('2019-01-05', 1) | fields `YEARWEEK('2020-08-26')`, `YEARWEEK('2019-01-05', 1)`
+    fetched rows / total rows = 1/1
+    +------------------------+---------------------------+
+    | YEARWEEK('2020-08-26') | YEARWEEK('2019-01-05', 1) |
+    |------------------------+---------------------------|
+    | 202034                 | 201901                    |
+    +------------------------+---------------------------+
 
 
diff --git a/docs/user/ppl/functions/expressions.rst b/docs/user/ppl/functions/expressions.rst
index c69252bc94..d25063d559 100644
--- a/docs/user/ppl/functions/expressions.rst
+++ b/docs/user/ppl/functions/expressions.rst
@@ -48,13 +48,13 @@ Here is an example for different type of arithmetic expressions::
 
     os> source=accounts | where age > (25 + 5) | fields age ;
     fetched rows / total rows = 3/3
-    +-------+
-    | age   |
-    |-------|
-    | 32    |
-    | 36    |
-    | 33    |
-    +-------+
+    +-----+
+    | age |
+    |-----|
+    | 32  |
+    | 36  |
+    | 33  |
+    +-----+
 
 Predicate Operators
 ===================
@@ -95,6 +95,9 @@ Operators
 | NOT            | NOT NULL value test                    |
 +----------------+----------------------------------------+
 
+It is possible to compare datetimes. When comparing different datetime types, for example `DATE` and `TIME`, both converted to `DATETIME`.
+The following rule is applied on coversion: a `TIME` applied to today's date; `DATE` is interpreted at midnight.
+
 Examples
 --------
 
@@ -105,11 +108,11 @@ Here is an example for comparison operators::
 
     os> source=accounts | where age > 33 | fields age ;
     fetched rows / total rows = 1/1
-    +-------+
-    | age   |
-    |-------|
-    | 36    |
-    +-------+
+    +-----+
+    | age |
+    |-----|
+    | 36  |
+    +-----+
 
 
 IN
@@ -119,12 +122,12 @@ IN operator test field in value lists::
 
     os> source=accounts | where age in (32, 33) | fields age ;
     fetched rows / total rows = 2/2
-    +-------+
-    | age   |
-    |-------|
-    | 32    |
-    | 33    |
-    +-------+
+    +-----+
+    | age |
+    |-----|
+    | 32  |
+    | 33  |
+    +-----+
 
 
 OR
@@ -134,12 +137,12 @@ OR operator ::
 
     os> source=accounts | where age = 32 OR age = 33 | fields age ;
     fetched rows / total rows = 2/2
-    +-------+
-    | age   |
-    |-------|
-    | 32    |
-    | 33    |
-    +-------+
+    +-----+
+    | age |
+    |-----|
+    | 32  |
+    | 33  |
+    +-----+
 
 
 NOT
@@ -149,10 +152,10 @@ NOT operator ::
 
     os> source=accounts | where not age in (32, 33) | fields age ;
     fetched rows / total rows = 2/2
-    +-------+
-    | age   |
-    |-------|
-    | 36    |
-    | 28    |
-    +-------+
+    +-----+
+    | age |
+    |-----|
+    | 36  |
+    | 28  |
+    +-----+
 
diff --git a/docs/user/ppl/functions/math.rst b/docs/user/ppl/functions/math.rst
index 69f94091e7..65f544461b 100644
--- a/docs/user/ppl/functions/math.rst
+++ b/docs/user/ppl/functions/math.rst
@@ -25,11 +25,11 @@ Example::
 
     os> source=people | eval `ABS(-1)` = ABS(-1) | fields `ABS(-1)`
     fetched rows / total rows = 1/1
-    +-----------+
-    | ABS(-1)   |
-    |-----------|
-    | 1         |
-    +-----------+
+    +---------+
+    | ABS(-1) |
+    |---------|
+    | 1       |
+    +---------+
 
 
 ACOS
@@ -71,11 +71,11 @@ Example::
 
     os> source=people | eval `ASIN(0)` = ASIN(0) | fields `ASIN(0)`
     fetched rows / total rows = 1/1
-    +-----------+
-    | ASIN(0)   |
-    |-----------|
-    | 0.0       |
-    +-----------+
+    +---------+
+    | ASIN(0) |
+    |---------|
+    | 0.0     |
+    +---------+
 
 
 ATAN
@@ -127,24 +127,42 @@ Example::
 CEIL
 ----
 
+An alias for `CEILING`_ function.
+
+
+CEILING
+-------
+
 Description
 >>>>>>>>>>>
 
-Usage: ceil(x) return the smallest integer value this is greater or equal to x.
+Usage: CEILING(T) takes the ceiling of value T.
+
+Note: `CEIL`_ and CEILING functions have the same implementation & functionality
+
+Limitation: CEILING only works as expected when IEEE 754 double type displays decimal when stored.
 
 Argument type: INTEGER/LONG/FLOAT/DOUBLE
 
-Return type: INTEGER
+Return type: LONG
 
 Example::
 
-    os> source=people | eval `CEIL(2.75)` = CEIL(2.75) | fields `CEIL(2.75)`
+    os> source=people | eval `CEILING(0)` = CEILING(0), `CEILING(50.00005)` = CEILING(50.00005), `CEILING(-50.00005)` = CEILING(-50.00005) | fields `CEILING(0)`, `CEILING(50.00005)`, `CEILING(-50.00005)`
+    fetched rows / total rows = 1/1
+    +------------+-------------------+--------------------+
+    | CEILING(0) | CEILING(50.00005) | CEILING(-50.00005) |
+    |------------+-------------------+--------------------|
+    | 0          | 51                | -50                |
+    +------------+-------------------+--------------------+
+
+    os> source=people | eval `CEILING(3147483647.12345)` = CEILING(3147483647.12345), `CEILING(113147483647.12345)` = CEILING(113147483647.12345), `CEILING(3147483647.00001)` = CEILING(3147483647.00001) | fields `CEILING(3147483647.12345)`, `CEILING(113147483647.12345)`, `CEILING(3147483647.00001)`
     fetched rows / total rows = 1/1
-    +--------------+
-    | CEIL(2.75)   |
-    |--------------|
-    | 3            |
-    +--------------+
+    +---------------------------+-----------------------------+---------------------------+
+    | CEILING(3147483647.12345) | CEILING(113147483647.12345) | CEILING(3147483647.00001) |
+    |---------------------------+-----------------------------+---------------------------|
+    | 3147483648                | 113147483648                | 3147483648                |
+    +---------------------------+-----------------------------+---------------------------+
 
 
 CONV
@@ -163,11 +181,12 @@ Example::
 
     os> source=people | eval `CONV('12', 10, 16)` = CONV('12', 10, 16), `CONV('2C', 16, 10)` = CONV('2C', 16, 10), `CONV(12, 10, 2)` = CONV(12, 10, 2), `CONV(1111, 2, 10)` = CONV(1111, 2, 10) | fields `CONV('12', 10, 16)`, `CONV('2C', 16, 10)`, `CONV(12, 10, 2)`, `CONV(1111, 2, 10)`
     fetched rows / total rows = 1/1
-    +----------------------+----------------------+-------------------+---------------------+
-    | CONV('12', 10, 16)   | CONV('2C', 16, 10)   | CONV(12, 10, 2)   | CONV(1111, 2, 10)   |
-    |----------------------+----------------------+-------------------+---------------------|
-    | c                    | 44                   | 1100              | 15                  |
-    +----------------------+----------------------+-------------------+---------------------+
+    +--------------------+--------------------+-----------------+-------------------+
+    | CONV('12', 10, 16) | CONV('2C', 16, 10) | CONV(12, 10, 2) | CONV(1111, 2, 10) |
+    |--------------------+--------------------+-----------------+-------------------|
+    | c                  | 44                 | 1100            | 15                |
+    +--------------------+--------------------+-----------------+-------------------+
+
 
 COS
 ---
@@ -185,11 +204,11 @@ Example::
 
     os> source=people | eval `COS(0)` = COS(0) | fields `COS(0)`
     fetched rows / total rows = 1/1
-    +----------+
-    | COS(0)   |
-    |----------|
-    | 1.0      |
-    +----------+
+    +--------+
+    | COS(0) |
+    |--------|
+    | 1.0    |
+    +--------+
 
 
 COT
@@ -231,11 +250,11 @@ Example::
 
     os> source=people | eval `CRC32('MySQL')` = CRC32('MySQL') | fields `CRC32('MySQL')`
     fetched rows / total rows = 1/1
-    +------------------+
-    | CRC32('MySQL')   |
-    |------------------|
-    | 3259397556       |
-    +------------------+
+    +----------------+
+    | CRC32('MySQL') |
+    |----------------|
+    | 3259397556     |
+    +----------------+
 
 
 DEGREES
@@ -260,6 +279,7 @@ Example::
     | 89.95437383553924 |
     +-------------------+
 
+
 E
 -
 
@@ -291,7 +311,7 @@ Usage: exp(x) return e raised to the power of x.
 
 Argument type: INTEGER/LONG/FLOAT/DOUBLE
 
-Return type: INTEGER
+Return type: DOUBLE
 
 Example::
 
@@ -310,21 +330,39 @@ FLOOR
 Description
 >>>>>>>>>>>
 
-Usage: floor(x) return the largest integer value this is smaller or equal to x.
+Usage: FLOOR(T) takes the floor of value T.
 
-Argument type: INTEGER/LONG/FLOAT/DOUBLE
+Limitation: FLOOR only works as expected when IEEE 754 double type displays decimal when stored.
 
-Return type: INTEGER
+Argument type: a: INTEGER/LONG/FLOAT/DOUBLE
+
+Return type: LONG
 
 Example::
 
-    os> source=people | eval `FLOOR(2.75)` = FLOOR(2.75) | fields `FLOOR(2.75)`
+    os> source=people | eval `FLOOR(0)` = FLOOR(0), `FLOOR(50.00005)` = FLOOR(50.00005), `FLOOR(-50.00005)` = FLOOR(-50.00005) | fields `FLOOR(0)`, `FLOOR(50.00005)`, `FLOOR(-50.00005)`
     fetched rows / total rows = 1/1
-    +---------------+
-    | FLOOR(2.75)   |
-    |---------------|
-    | 2             |
-    +---------------+
+    +----------+-----------------+------------------+
+    | FLOOR(0) | FLOOR(50.00005) | FLOOR(-50.00005) |
+    |----------+-----------------+------------------|
+    | 0        | 50              | -51              |
+    +----------+-----------------+------------------+
+
+    os> source=people | eval `FLOOR(3147483647.12345)` = FLOOR(3147483647.12345), `FLOOR(113147483647.12345)` = FLOOR(113147483647.12345), `FLOOR(3147483647.00001)` = FLOOR(3147483647.00001) | fields `FLOOR(3147483647.12345)`, `FLOOR(113147483647.12345)`, `FLOOR(3147483647.00001)`
+    fetched rows / total rows = 1/1
+    +-------------------------+---------------------------+-------------------------+
+    | FLOOR(3147483647.12345) | FLOOR(113147483647.12345) | FLOOR(3147483647.00001) |
+    |-------------------------+---------------------------+-------------------------|
+    | 3147483647              | 113147483647              | 3147483647              |
+    +-------------------------+---------------------------+-------------------------+
+
+    os> source=people | eval `FLOOR(282474973688888.022)` = FLOOR(282474973688888.022), `FLOOR(9223372036854775807.022)` = FLOOR(9223372036854775807.022), `FLOOR(9223372036854775807.0000001)` = FLOOR(9223372036854775807.0000001) | fields `FLOOR(282474973688888.022)`, `FLOOR(9223372036854775807.022)`, `FLOOR(9223372036854775807.0000001)`
+    fetched rows / total rows = 1/1
+    +----------------------------+--------------------------------+------------------------------------+
+    | FLOOR(282474973688888.022) | FLOOR(9223372036854775807.022) | FLOOR(9223372036854775807.0000001) |
+    |----------------------------+--------------------------------+------------------------------------|
+    | 282474973688888            | 9223372036854775807            | 9223372036854775807                |
+    +----------------------------+--------------------------------+------------------------------------+
 
 
 LN
@@ -368,11 +406,11 @@ Example::
 
     os> source=people | eval `LOG(2)` = LOG(2), `LOG(2, 8)` = LOG(2, 8) | fields `LOG(2)`, `LOG(2, 8)`
     fetched rows / total rows = 1/1
-    +--------------------+-------------+
-    | LOG(2)             | LOG(2, 8)   |
-    |--------------------+-------------|
-    | 0.6931471805599453 | 3.0         |
-    +--------------------+-------------+
+    +--------------------+-----------+
+    | LOG(2)             | LOG(2, 8) |
+    |--------------------+-----------|
+    | 0.6931471805599453 | 3.0       |
+    +--------------------+-----------+
 
 
 LOG2
@@ -393,11 +431,11 @@ Example::
 
     os> source=people | eval `LOG2(8)` = LOG2(8) | fields `LOG2(8)`
     fetched rows / total rows = 1/1
-    +-----------+
-    | LOG2(8)   |
-    |-----------|
-    | 3.0       |
-    +-----------+
+    +---------+
+    | LOG2(8) |
+    |---------|
+    | 3.0     |
+    +---------+
 
 
 LOG10
@@ -418,11 +456,11 @@ Example::
 
     os> source=people | eval `LOG10(100)` = LOG10(100) | fields `LOG10(100)`
     fetched rows / total rows = 1/1
-    +--------------+
-    | LOG10(100)   |
-    |--------------|
-    | 2.0          |
-    +--------------+
+    +------------+
+    | LOG10(100) |
+    |------------|
+    | 2.0        |
+    +------------+
 
 
 MOD
@@ -441,11 +479,11 @@ Example::
 
     os> source=people | eval `MOD(3, 2)` = MOD(3, 2), `MOD(3.1, 2)` = MOD(3.1, 2) | fields `MOD(3, 2)`, `MOD(3.1, 2)`
     fetched rows / total rows = 1/1
-    +-------------+---------------+
-    | MOD(3, 2)   | MOD(3.1, 2)   |
-    |-------------+---------------|
-    | 1           | 1.1           |
-    +-------------+---------------+
+    +-----------+-------------+
+    | MOD(3, 2) | MOD(3.1, 2) |
+    |-----------+-------------|
+    | 1         | 1.1         |
+    +-----------+-------------+
 
 
 PI
@@ -487,11 +525,11 @@ Example::
 
     os> source=people | eval `POW(3, 2)` = POW(3, 2), `POW(-3, 2)` = POW(-3, 2), `POW(3, -2)` = POW(3, -2) | fields `POW(3, 2)`, `POW(-3, 2)`, `POW(3, -2)`
     fetched rows / total rows = 1/1
-    +-------------+--------------+--------------------+
-    | POW(3, 2)   | POW(-3, 2)   | POW(3, -2)         |
-    |-------------+--------------+--------------------|
-    | 9.0         | 9.0          | 0.1111111111111111 |
-    +-------------+--------------+--------------------+
+    +-----------+------------+--------------------+
+    | POW(3, 2) | POW(-3, 2) | POW(3, -2)         |
+    |-----------+------------+--------------------|
+    | 9.0       | 9.0        | 0.1111111111111111 |
+    +-----------+------------+--------------------+
 
 
 POWER
@@ -512,11 +550,11 @@ Example::
 
     os> source=people | eval `POWER(3, 2)` = POWER(3, 2), `POWER(-3, 2)` = POWER(-3, 2), `POWER(3, -2)` = POWER(3, -2) | fields `POWER(3, 2)`, `POWER(-3, 2)`, `POWER(3, -2)`
     fetched rows / total rows = 1/1
-    +---------------+----------------+--------------------+
-    | POWER(3, 2)   | POWER(-3, 2)   | POWER(3, -2)       |
-    |---------------+----------------+--------------------|
-    | 9.0           | 9.0            | 0.1111111111111111 |
-    +---------------+----------------+--------------------+
+    +-------------+--------------+--------------------+
+    | POWER(3, 2) | POWER(-3, 2) | POWER(3, -2)       |
+    |-------------+--------------+--------------------|
+    | 9.0         | 9.0          | 0.1111111111111111 |
+    +-------------+--------------+--------------------+
 
 
 RADIANS
@@ -584,11 +622,11 @@ Example::
 
     os> source=people | eval `ROUND(12.34)` = ROUND(12.34), `ROUND(12.34, 1)` = ROUND(12.34, 1), `ROUND(12.34, -1)` = ROUND(12.34, -1), `ROUND(12, 1)` = ROUND(12, 1) | fields `ROUND(12.34)`, `ROUND(12.34, 1)`, `ROUND(12.34, -1)`, `ROUND(12, 1)`
     fetched rows / total rows = 1/1
-    +----------------+-------------------+--------------------+----------------+
-    | ROUND(12.34)   | ROUND(12.34, 1)   | ROUND(12.34, -1)   | ROUND(12, 1)   |
-    |----------------+-------------------+--------------------+----------------|
-    | 12.0           | 12.3              | 10.0               | 12             |
-    +----------------+-------------------+--------------------+----------------+
+    +--------------+-----------------+------------------+--------------+
+    | ROUND(12.34) | ROUND(12.34, 1) | ROUND(12.34, -1) | ROUND(12, 1) |
+    |--------------+-----------------+------------------+--------------|
+    | 12.0         | 12.3            | 10.0             | 12           |
+    +--------------+-----------------+------------------+--------------+
 
 
 SIGN
@@ -607,11 +645,11 @@ Example::
 
     os> source=people | eval `SIGN(1)` = SIGN(1), `SIGN(0)` = SIGN(0), `SIGN(-1.1)` = SIGN(-1.1) | fields `SIGN(1)`, `SIGN(0)`, `SIGN(-1.1)`
     fetched rows / total rows = 1/1
-    +-----------+-----------+--------------+
-    | SIGN(1)   | SIGN(0)   | SIGN(-1.1)   |
-    |-----------+-----------+--------------|
-    | 1         | 0         | -1           |
-    +-----------+-----------+--------------+
+    +---------+---------+------------+
+    | SIGN(1) | SIGN(0) | SIGN(-1.1) |
+    |---------+---------+------------|
+    | 1       | 0       | -1         |
+    +---------+---------+------------+
 
 
 SIN
@@ -630,11 +668,11 @@ Example::
 
     os> source=people | eval `SIN(0)` = SIN(0) | fields `SIN(0)`
     fetched rows / total rows = 1/1
-    +----------+
-    | SIN(0)   |
-    |----------|
-    | 0.0      |
-    +----------+
+    +--------+
+    | SIN(0) |
+    |--------|
+    | 0.0    |
+    +--------+
 
 
 SQRT
@@ -656,11 +694,12 @@ Example::
 
     os> source=people | eval `SQRT(4)` = SQRT(4), `SQRT(4.41)` = SQRT(4.41) | fields `SQRT(4)`, `SQRT(4.41)`
     fetched rows / total rows = 1/1
-    +-----------+--------------+
-    | SQRT(4)   | SQRT(4.41)   |
-    |-----------+--------------|
-    | 2.0       | 2.1          |
-    +-----------+--------------+
+    +---------+------------+
+    | SQRT(4) | SQRT(4.41) |
+    |---------+------------|
+    | 2.0     | 2.1        |
+    +---------+------------+
+
 
 CBRT
 ----
@@ -680,9 +719,9 @@ Example::
 
     opensearchsql> source=location | eval `CBRT(8)` = CBRT(8), `CBRT(9.261)` = CBRT(9.261), `CBRT(-27)` = CBRT(-27) | fields `CBRT(8)`, `CBRT(9.261)`, `CBRT(-27)`;
     fetched rows / total rows = 2/2
-    +-----------+---------------+-------------+
-    | CBRT(8)   | CBRT(9.261)   | CBRT(-27)   |
-    |-----------+---------------+-------------|
-    | 2.0       | 2.1           | -3.0        |
-    | 2.0       | 2.1           | -3.0        |
-    +-----------+---------------+-------------+
+    +---------+-------------+-----------+
+    | CBRT(8) | CBRT(9.261) | CBRT(-27) |
+    |---------+-------------+-----------|
+    | 2.0     | 2.1         | -3.0      |
+    | 2.0     | 2.1         | -3.0      |
+    +---------+-------------+-----------+
diff --git a/docs/user/ppl/functions/relevance.rst b/docs/user/ppl/functions/relevance.rst
index 7f7cf50964..a1f240ee05 100644
--- a/docs/user/ppl/functions/relevance.rst
+++ b/docs/user/ppl/functions/relevance.rst
@@ -37,12 +37,12 @@ Example with only ``field`` and ``query`` expressions, and all other parameters
 
     os> source=accounts | where match(address, 'Street') | fields lastname, address;
     fetched rows / total rows = 2/2
-    +------------+--------------------+
-    | lastname   | address            |
-    |------------+--------------------|
-    | Bond       | 671 Bristol Street |
-    | Bates      | 789 Madison Street |
-    +------------+--------------------+
+    +----------+--------------------+
+    | lastname | address            |
+    |----------+--------------------|
+    | Bond     | 671 Bristol Street |
+    | Bates    | 789 Madison Street |
+    +----------+--------------------+
 
 
 
@@ -50,11 +50,11 @@ Another example to show how to set custom values for the optional parameters::
 
     os> source=accounts | where match(firstname, 'Hattie', operator='AND', boost=2.0) | fields lastname;
     fetched rows / total rows = 1/1
-    +------------+
-    | lastname   |
-    |------------|
-    | Bond       |
-    +------------+
+    +----------+
+    | lastname |
+    |----------|
+    | Bond     |
+    +----------+
 
 
 MATCH_PHRASE
@@ -98,9 +98,8 @@ Another example to show how to set custom values for the optional parameters::
     +----------------------+--------------------------+
 
 
-
 MATCH_PHRASE_PREFIX
-------------
+-------------------
 
 Description
 >>>>>>>>>>>
@@ -140,7 +139,6 @@ Another example to show how to set custom values for the optional parameters::
     +----------------------+--------------------------+
 
 
-
 MULTI_MATCH
 -----------
 
@@ -175,24 +173,24 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> source=books | where multi_match(['title'], 'Pooh House');
+    os> source=books | where multi_match(['title'], 'Pooh House') | fields id, title, author;
     fetched rows / total rows = 2/2
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    | 2    | Winnie-the-Pooh          | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    | 2  | Winnie-the-Pooh          | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> source=books | where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default);
+    os> source=books | where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default) | fields id, title, author;
     fetched rows / total rows = 1/1
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
 
 
 SIMPLE_QUERY_STRING
@@ -228,24 +226,25 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> source=books | where simple_query_string(['title'], 'Pooh House');
+    os> source=books | where simple_query_string(['title'], 'Pooh House') | fields id, title, author;
     fetched rows / total rows = 2/2
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    | 2    | Winnie-the-Pooh          | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    | 2  | Winnie-the-Pooh          | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> source=books | where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND');
+    os> source=books | where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND') | fields id, title, author;
     fetched rows / total rows = 1/1
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
+
 
 MATCH_BOOL_PREFIX
 -----------------
@@ -271,22 +270,23 @@ Example with only ``field`` and ``query`` expressions, and all other parameters
 
     os> source=accounts | where match_bool_prefix(address, 'Bristol Stre') | fields firstname, address
     fetched rows / total rows = 2/2
-    +-------------+--------------------+
-    | firstname   | address            |
-    |-------------+--------------------|
-    | Hattie      | 671 Bristol Street |
-    | Nanette     | 789 Madison Street |
-    +-------------+--------------------+
+    +-----------+--------------------+
+    | firstname | address            |
+    |-----------+--------------------|
+    | Hattie    | 671 Bristol Street |
+    | Nanette   | 789 Madison Street |
+    +-----------+--------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
     os> source=accounts | where match_bool_prefix(address, 'Bristol Stre', minimum_should_match = 2) | fields firstname, address
     fetched rows / total rows = 1/1
-    +-------------+--------------------+
-    | firstname   | address            |
-    |-------------+--------------------|
-    | Hattie      | 671 Bristol Street |
-    +-------------+--------------------+
+    +-----------+--------------------+
+    | firstname | address            |
+    |-----------+--------------------|
+    | Hattie    | 671 Bristol Street |
+    +-----------+--------------------+
+
 
 QUERY_STRING
 ------------
@@ -333,27 +333,26 @@ Available parameters include:
 
 Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::
 
-    os> source=books | where query_string(['title'], 'Pooh House');
+    os> source=books | where query_string(['title'], 'Pooh House') | fields id, title, author;
     fetched rows / total rows = 2/2
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    | 2    | Winnie-the-Pooh          | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    | 2  | Winnie-the-Pooh          | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
 
 Another example to show how to set custom values for the optional parameters::
 
-    os> source=books | where query_string(['title'], 'Pooh House', default_operator='AND');
+    os> source=books | where query_string(['title'], 'Pooh House', default_operator='AND') | fields id, title, author;
     fetched rows / total rows = 1/1
-    +------+--------------------------+----------------------+
-    | id   | title                    | author               |
-    |------+--------------------------+----------------------|
-    | 1    | The House at Pooh Corner | Alan Alexander Milne |
-    +------+--------------------------+----------------------+
+    +----+--------------------------+----------------------+
+    | id | title                    | author               |
+    |----+--------------------------+----------------------|
+    | 1  | The House at Pooh Corner | Alan Alexander Milne |
+    +----+--------------------------+----------------------+
 
 Limitations
 >>>>>>>>>>>
 
 The relevance functions are available to execute only in OpenSearch DSL but not in memory as of now, so the relevance search might fail for queries that are too complex to translate into DSL if the relevance function is following after a complex PPL query. To make your queries always work-able, it is recommended to place the relevance commands as close to the search command as possible, to ensure the relevance functions are eligible to push down. For example, a complex query like ``search source = people | rename firstname as name | dedup account_number | fields name, account_number, balance, employer | where match(employer, 'Open Search') | stats count() by city`` could fail because it is difficult to translate to DSL, but it would be better if we rewrite it to an equivalent query as ``search source = people | where match(employer, 'Open Search') | rename firstname as name | dedup account_number | fields name, account_number, balance, employer | stats count() by city`` by moving the where command with relevance function to the second command right after the search command, and the relevance would be optimized and executed smoothly in OpenSearch DSL. See `Optimization <../../optimization/optimization.rst>`_ to get more details about the query engine optimization.
-
diff --git a/docs/user/ppl/functions/string.rst b/docs/user/ppl/functions/string.rst
index 0503759cbd..0dbb09cbb8 100644
--- a/docs/user/ppl/functions/string.rst
+++ b/docs/user/ppl/functions/string.rst
@@ -14,21 +14,21 @@ CONCAT
 Description
 >>>>>>>>>>>
 
-Usage: CONCAT(str1, str2) returns str1 and str strings concatenated together.
+Usage: CONCAT(str1, str2, ...., str_9) adds up to 9 strings together.
 
-Argument type: STRING, STRING
+Argument type: STRING, STRING, ...., STRING
 
 Return type: STRING
 
 Example::
 
-    os> source=people | eval `CONCAT('hello', 'world')` = CONCAT('hello', 'world') | fields `CONCAT('hello', 'world')`
+    os> source=people | eval `CONCAT('hello', 'world')` = CONCAT('hello', 'world'), `CONCAT('hello ', 'whole ', 'world', '!')` = CONCAT('hello ', 'whole ', 'world', '!') | fields `CONCAT('hello', 'world')`, `CONCAT('hello ', 'whole ', 'world', '!')`
     fetched rows / total rows = 1/1
-    +----------------------------+
-    | CONCAT('hello', 'world')   |
-    |----------------------------|
-    | helloworld                 |
-    +----------------------------+
+    +--------------------------+------------------------------------------+
+    | CONCAT('hello', 'world') | CONCAT('hello ', 'whole ', 'world', '!') |
+    |--------------------------+------------------------------------------|
+    | helloworld               | hello whole world!                       |
+    +--------------------------+------------------------------------------+
 
 
 CONCAT_WS
@@ -47,11 +47,11 @@ Example::
 
     os> source=people | eval `CONCAT_WS(',', 'hello', 'world')` = CONCAT_WS(',', 'hello', 'world') | fields `CONCAT_WS(',', 'hello', 'world')`
     fetched rows / total rows = 1/1
-    +------------------------------------+
-    | CONCAT_WS(',', 'hello', 'world')   |
-    |------------------------------------|
-    | hello,world                        |
-    +------------------------------------+
+    +----------------------------------+
+    | CONCAT_WS(',', 'hello', 'world') |
+    |----------------------------------|
+    | hello,world                      |
+    +----------------------------------+
 
 
 LENGTH
@@ -74,15 +74,15 @@ Example::
 
     os> source=people | eval `LENGTH('helloworld')` = LENGTH('helloworld') | fields `LENGTH('helloworld')`
     fetched rows / total rows = 1/1
-    +------------------------+
-    | LENGTH('helloworld')   |
-    |------------------------|
-    | 10                     |
-    +------------------------+
+    +----------------------+
+    | LENGTH('helloworld') |
+    |----------------------|
+    | 10                   |
+    +----------------------+
 
 
 LIKE
-------
+----
 
 Description
 >>>>>>>>>>>
@@ -98,11 +98,12 @@ Example::
 
     os> source=people | eval `LIKE('hello world', '_ello%')` = LIKE('hello world', '_ELLO%') | fields `LIKE('hello world', '_ello%')`
     fetched rows / total rows = 1/1
-    +---------------------------------+
-    | LIKE('hello world', '_ello%')   |
-    |---------------------------------|
-    | True                            |
-    +---------------------------------+
+    +-------------------------------+
+    | LIKE('hello world', '_ello%') |
+    |-------------------------------|
+    | True                          |
+    +-------------------------------+
+
 
 LOWER
 -----
@@ -120,11 +121,11 @@ Example::
 
     os> source=people | eval `LOWER('helloworld')` = LOWER('helloworld'), `LOWER('HELLOWORLD')` = LOWER('HELLOWORLD') | fields `LOWER('helloworld')`, `LOWER('HELLOWORLD')`
     fetched rows / total rows = 1/1
-    +-----------------------+-----------------------+
-    | LOWER('helloworld')   | LOWER('HELLOWORLD')   |
-    |-----------------------+-----------------------|
-    | helloworld            | helloworld            |
-    +-----------------------+-----------------------+
+    +---------------------+---------------------+
+    | LOWER('helloworld') | LOWER('HELLOWORLD') |
+    |---------------------+---------------------|
+    | helloworld          | helloworld          |
+    +---------------------+---------------------+
 
 
 LTRIM
@@ -143,15 +144,15 @@ Example::
 
     os> source=people | eval `LTRIM('   hello')` = LTRIM('   hello'), `LTRIM('hello   ')` = LTRIM('hello   ') | fields `LTRIM('   hello')`, `LTRIM('hello   ')`
     fetched rows / total rows = 1/1
-    +---------------------+---------------------+
-    | LTRIM('   hello')   | LTRIM('hello   ')   |
-    |---------------------+---------------------|
-    | hello               | hello               |
-    +---------------------+---------------------+
+    +-------------------+-------------------+
+    | LTRIM('   hello') | LTRIM('hello   ') |
+    |-------------------+-------------------|
+    | hello             | hello             |
+    +-------------------+-------------------+
 
 
 POSITION
-------
+--------
 
 Description
 >>>>>>>>>>>
@@ -168,15 +169,15 @@ Example::
 
     os> source=people | eval `POSITION('world' IN 'helloworld')` = POSITION('world' IN 'helloworld'), `POSITION('invalid' IN 'helloworld')`= POSITION('invalid' IN 'helloworld')  | fields `POSITION('world' IN 'helloworld')`, `POSITION('invalid' IN 'helloworld')`
     fetched rows / total rows = 1/1
-    +-------------------------------------+---------------------------------------+
-    | POSITION('world' IN 'helloworld')   | POSITION('invalid' IN 'helloworld')   |
-    |-------------------------------------+---------------------------------------|
-    | 6                                   | 0                                     |
-    +-------------------------------------+---------------------------------------+
+    +-----------------------------------+-------------------------------------+
+    | POSITION('world' IN 'helloworld') | POSITION('invalid' IN 'helloworld') |
+    |-----------------------------------+-------------------------------------|
+    | 6                                 | 0                                   |
+    +-----------------------------------+-------------------------------------+
 
 
 REVERSE
------
+-------
 
 Description
 >>>>>>>>>>>
@@ -191,11 +192,11 @@ Example::
 
     os> source=people | eval `REVERSE('abcde')` = REVERSE('abcde') | fields `REVERSE('abcde')`
     fetched rows / total rows = 1/1
-    +--------------------+
-    | REVERSE('abcde')   |
-    |--------------------|
-    | edcba              |
-    +--------------------+
+    +------------------+
+    | REVERSE('abcde') |
+    |------------------|
+    | edcba            |
+    +------------------+
 
 
 RIGHT
@@ -214,11 +215,11 @@ Example::
 
     os> source=people | eval `RIGHT('helloworld', 5)` = RIGHT('helloworld', 5), `RIGHT('HELLOWORLD', 0)` = RIGHT('HELLOWORLD', 0) | fields `RIGHT('helloworld', 5)`, `RIGHT('HELLOWORLD', 0)`
     fetched rows / total rows = 1/1
-    +--------------------------+--------------------------+
-    | RIGHT('helloworld', 5)   | RIGHT('HELLOWORLD', 0)   |
-    |--------------------------+--------------------------|
-    | world                    |                          |
-    +--------------------------+--------------------------+
+    +------------------------+------------------------+
+    | RIGHT('helloworld', 5) | RIGHT('HELLOWORLD', 0) |
+    |------------------------+------------------------|
+    | world                  |                        |
+    +------------------------+------------------------+
 
 
 RTRIM
@@ -237,11 +238,11 @@ Example::
 
     os> source=people | eval `RTRIM('   hello')` = RTRIM('   hello'), `RTRIM('hello   ')` = RTRIM('hello   ') | fields `RTRIM('   hello')`, `RTRIM('hello   ')`
     fetched rows / total rows = 1/1
-    +---------------------+---------------------+
-    | RTRIM('   hello')   | RTRIM('hello   ')   |
-    |---------------------+---------------------|
-    |    hello            | hello               |
-    +---------------------+---------------------+
+    +-------------------+-------------------+
+    | RTRIM('   hello') | RTRIM('hello   ') |
+    |-------------------+-------------------|
+    | hello             | hello             |
+    +-------------------+-------------------+
 
 
 SUBSTRING
@@ -262,11 +263,11 @@ Example::
 
     os> source=people | eval `SUBSTRING('helloworld', 5)` = SUBSTRING('helloworld', 5), `SUBSTRING('helloworld', 5, 3)` = SUBSTRING('helloworld', 5, 3) | fields `SUBSTRING('helloworld', 5)`, `SUBSTRING('helloworld', 5, 3)`
     fetched rows / total rows = 1/1
-    +------------------------------+---------------------------------+
-    | SUBSTRING('helloworld', 5)   | SUBSTRING('helloworld', 5, 3)   |
-    |------------------------------+---------------------------------|
-    | oworld                       | owo                             |
-    +------------------------------+---------------------------------+
+    +----------------------------+-------------------------------+
+    | SUBSTRING('helloworld', 5) | SUBSTRING('helloworld', 5, 3) |
+    |----------------------------+-------------------------------|
+    | oworld                     | owo                           |
+    +----------------------------+-------------------------------+
 
 
 TRIM
@@ -283,11 +284,11 @@ Example::
 
     os> source=people | eval `TRIM('   hello')` = TRIM('   hello'), `TRIM('hello   ')` = TRIM('hello   ') | fields `TRIM('   hello')`, `TRIM('hello   ')`
     fetched rows / total rows = 1/1
-    +--------------------+--------------------+
-    | TRIM('   hello')   | TRIM('hello   ')   |
-    |--------------------+--------------------|
-    | hello              | hello              |
-    +--------------------+--------------------+
+    +------------------+------------------+
+    | TRIM('   hello') | TRIM('hello   ') |
+    |------------------+------------------|
+    | hello            | hello            |
+    +------------------+------------------+
 
 
 UPPER
@@ -306,8 +307,8 @@ Example::
 
     os> source=people | eval `UPPER('helloworld')` = UPPER('helloworld'), `UPPER('HELLOWORLD')` = UPPER('HELLOWORLD') | fields `UPPER('helloworld')`, `UPPER('HELLOWORLD')`
     fetched rows / total rows = 1/1
-    +-----------------------+-----------------------+
-    | UPPER('helloworld')   | UPPER('HELLOWORLD')   |
-    |-----------------------+-----------------------|
-    | HELLOWORLD            | HELLOWORLD            |
-    +-----------------------+-----------------------+
+    +---------------------+---------------------+
+    | UPPER('helloworld') | UPPER('HELLOWORLD') |
+    |---------------------+---------------------|
+    | HELLOWORLD          | HELLOWORLD          |
+    +---------------------+---------------------+
diff --git a/docs/user/ppl/functions/system.rst b/docs/user/ppl/functions/system.rst
index 65585c740a..698933a3c4 100644
--- a/docs/user/ppl/functions/system.rst
+++ b/docs/user/ppl/functions/system.rst
@@ -24,8 +24,8 @@ Example::
 
     os> source=people | eval `typeof(date)` = typeof(DATE('2008-04-14')), `typeof(int)` = typeof(1), `typeof(now())` = typeof(now()), `typeof(column)` = typeof(accounts) | fields `typeof(date)`, `typeof(int)`, `typeof(now())`, `typeof(column)`
     fetched rows / total rows = 1/1
-    +----------------+---------------+-----------------+------------------+
-    | typeof(date)   | typeof(int)   | typeof(now())   | typeof(column)   |
-    |----------------+---------------+-----------------+------------------|
-    | DATE           | INTEGER       | DATETIME        | STRUCT           |
-    +----------------+---------------+-----------------+------------------+
+    +--------------+-------------+---------------+----------------+
+    | typeof(date) | typeof(int) | typeof(now()) | typeof(column) |
+    |--------------+-------------+---------------+----------------|
+    | DATE         | INTEGER     | TIMESTAMP     | OBJECT         |
+    +--------------+-------------+---------------+----------------+
diff --git a/docs/user/ppl/general/datatypes.rst b/docs/user/ppl/general/datatypes.rst
index c7478ae62d..cd2e6d35e3 100644
--- a/docs/user/ppl/general/datatypes.rst
+++ b/docs/user/ppl/general/datatypes.rst
@@ -37,8 +37,6 @@ The PPL support the following data types.
 +---------------+
 | string        |
 +---------------+
-| text          |
-+---------------+
 | timestamp     |
 +---------------+
 | datetime      |
@@ -88,7 +86,7 @@ The table below list the mapping between OpenSearch Data Type, PPL Data Type and
 +-----------------+---------------+-----------+
 | keyword         | string        | VARCHAR   |
 +-----------------+---------------+-----------+
-| text            | text          | VARCHAR   |
+| text            | string        | VARCHAR   |
 +-----------------+---------------+-----------+
 | date            | timestamp     | TIMESTAMP |
 +-----------------+---------------+-----------+
@@ -385,11 +383,11 @@ PPL query::
 
     os> source=people | fields city, city.name, city.location.latitude;
     fetched rows / total rows = 1/1
-    +-----------------------------------------------------+-------------+--------------------------+
-    | city                                                | city.name   | city.location.latitude   |
-    |-----------------------------------------------------+-------------+--------------------------|
-    | {'name': 'Seattle', 'location': {'latitude': 10.5}} | Seattle     | 10.5                     |
-    +-----------------------------------------------------+-------------+--------------------------+
+    +-----------------------------------------------------+-----------+------------------------+
+    | city                                                | city.name | city.location.latitude |
+    |-----------------------------------------------------+-----------+------------------------|
+    | {'name': 'Seattle', 'location': {'latitude': 10.5}} | Seattle   | 10.5                   |
+    +-----------------------------------------------------+-----------+------------------------+
 
 
 Example 2: Group by struct inner attribute
@@ -401,11 +399,11 @@ PPL query::
 
     os> source=people | stats count() by city.name;
     fetched rows / total rows = 1/1
-    +-----------+-------------+
-    | count()   | city.name   |
-    |-----------+-------------|
-    | 1         | Seattle     |
-    +-----------+-------------+
+    +---------+-----------+
+    | count() | city.name |
+    |---------+-----------|
+    | 1       | Seattle   |
+    +---------+-----------+
 
 Example 3: Selecting Field of Array Value
 -----------------------------------------
@@ -414,8 +412,8 @@ Select deeper level for object fields of array value which returns the first ele
 
     os> source = people | fields accounts, accounts.id;
     fetched rows / total rows = 1/1
-    +------------+---------------+
-    | accounts   | accounts.id   |
-    |------------+---------------|
-    | {'id': 1}  | 1             |
-    +------------+---------------+
\ No newline at end of file
+    +-----------+-------------+
+    | accounts  | accounts.id |
+    |-----------+-------------|
+    | {'id': 1} | 1           |
+    +-----------+-------------+
\ No newline at end of file
diff --git a/docs/user/ppl/general/identifiers.rst b/docs/user/ppl/general/identifiers.rst
index b15f621af8..bab540ffdd 100644
--- a/docs/user/ppl/general/identifiers.rst
+++ b/docs/user/ppl/general/identifiers.rst
@@ -39,14 +39,14 @@ Here are examples for using index pattern directly without quotes::
 
     os> source=accounts | fields account_number, firstname, lastname;
     fetched rows / total rows = 4/4
-    +------------------+-------------+------------+
-    | account_number   | firstname   | lastname   |
-    |------------------+-------------+------------|
-    | 1                | Amber       | Duke       |
-    | 6                | Hattie      | Bond       |
-    | 13               | Nanette     | Bates      |
-    | 18               | Dale        | Adams      |
-    +------------------+-------------+------------+
+    +----------------+-----------+----------+
+    | account_number | firstname | lastname |
+    |----------------+-----------+----------|
+    | 1              | Amber     | Duke     |
+    | 6              | Hattie    | Bond     |
+    | 13             | Nanette   | Bates    |
+    | 18             | Dale      | Adams    |
+    +----------------+-----------+----------+
 
 
 Delimited Identifiers
@@ -73,14 +73,33 @@ Here are examples for quoting an index name by back ticks::
 
     os> source=`accounts` | fields `account_number`;
     fetched rows / total rows = 4/4
-    +------------------+
-    | account_number   |
-    |------------------|
-    | 1                |
-    | 6                |
-    | 13               |
-    | 18               |
-    +------------------+
+    +----------------+
+    | account_number |
+    |----------------|
+    | 1              |
+    | 6              |
+    | 13             |
+    | 18             |
+    +----------------+
+
+
+Cross-Cluster Index Identifiers
+===================
+
+Description
+-----------
+
+A cross-cluster index identifier is an index identifier with a prefix ``<cluster identifier>:``. The cluster identifier could contain star ``*``. This is mostly an cluster pattern for wildcard match.
+
+Use Cases
+---------
+
+It is used to identify an index on a remote cluster for cross-cluster search.
+
+Examples
+--------
+
+For example, if you setup a connection between the local cluster and a remote cluster ``my_cluster``, then you can run ``source=my_cluster:accounts`` to query the ``accounts`` index at ``my_cluster``.
 
 
 Case Sensitivity
@@ -116,29 +135,29 @@ Query wildcard indices::
 
     os> source=acc* | stats count();
     fetched rows / total rows = 1/1
-    +-----------+
-    | count()   |
-    |-----------|
-    | 5         |
-    +-----------+
+    +---------+
+    | count() |
+    |---------|
+    | 5       |
+    +---------+
 
 Query multiple indices seperated by ``,``::
 
     os> source=accounts, account2 | stats count();
     fetched rows / total rows = 1/1
-    +-----------+
-    | count()   |
-    |-----------|
-    | 5         |
-    +-----------+
+    +---------+
+    | count() |
+    |---------|
+    | 5       |
+    +---------+
 
 Query delimited multiple indices seperated by ``,``::
 
     os> source=`accounts,account2` | stats count();
     fetched rows / total rows = 1/1
-    +-----------+
-    | count()   |
-    |-----------|
-    | 5         |
-    +-----------+
+    +---------+
+    | count() |
+    |---------|
+    | 5       |
+    +---------+
 
diff --git a/docs/user/ppl/index.rst b/docs/user/ppl/index.rst
index a69136bb19..1fa981b1b7 100644
--- a/docs/user/ppl/index.rst
+++ b/docs/user/ppl/index.rst
@@ -36,7 +36,9 @@ The query start with search command and then flowing a set of command delimited
 
   - `Datasource Settings <admin/datasources.rst>`_
 
-  - `Prometheus Connector <admin/prometheus_connector.rst>`_
+  - `Prometheus Connector <admin/connectors/prometheus_connector.rst>`_
+
+  - `Cross-Cluster Search <admin/cross_cluster_search.rst>`_
 
 * **Commands**
 
diff --git a/docs/user/ppl/interfaces/endpoint.rst b/docs/user/ppl/interfaces/endpoint.rst
index fb64eff688..fb931fb0ba 100644
--- a/docs/user/ppl/interfaces/endpoint.rst
+++ b/docs/user/ppl/interfaces/endpoint.rst
@@ -91,7 +91,7 @@ The following PPL query demonstrated that where and stats command were pushed do
           {
             "name": "OpenSearchIndexScan",
             "description": {
-              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":0,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":10,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}],\"aggregations\":{\"avg(age)\":{\"avg\":{\"field\":\"age\"}}}}, searchDone=false)"
+              "request": "OpenSearchQueryRequest(indexName=accounts, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":10,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}],\"aggregations\":{\"avg(age)\":{\"avg\":{\"field\":\"age\"}}}}, searchDone=false)"
             },
             "children": []
           }
diff --git a/docs/user/ppl/interfaces/protocol.rst b/docs/user/ppl/interfaces/protocol.rst
index d3706e7f20..a76dba301b 100644
--- a/docs/user/ppl/interfaces/protocol.rst
+++ b/docs/user/ppl/interfaces/protocol.rst
@@ -129,7 +129,7 @@ PPL query::
     {
       "error": {
         "reason": "Error occurred in OpenSearch engine: no such index [unknown]",
-        "details": "org.opensearch.index.IndexNotFoundException: no such index [unknown]\nFor more details, please send request for Json format to see the raw response from OpenSearch engine.",
+        "details": "[unknown] IndexNotFoundException[no such index [unknown]]\nFor more details, please send request for Json format to see the raw response from OpenSearch engine.",
         "type": "IndexNotFoundException"
       },
       "status": 404
diff --git a/doctest/bootstrap.sh b/doctest/bootstrap.sh
index 29f6105386..d239a358d0 100755
--- a/doctest/bootstrap.sh
+++ b/doctest/bootstrap.sh
@@ -2,13 +2,13 @@
 
 DIR=$(dirname "$0")
 
-if hash python3.7 2> /dev/null; then
-    PYTHON=python3.7
+if hash python3.8 2> /dev/null; then
+    PYTHON=python3.8
 elif hash python3 2> /dev/null; then
-    # fallback to python3 in case there is no python3.7 alias; should be 3.7
+    # fallback to python3 in case there is no python3.8 alias; should be 3.8
     PYTHON=python3
 else
-    echo 'python3.7 required'
+    echo 'python3.8 required'
     exit 1
 fi
 
@@ -21,4 +21,4 @@ fi
 
 $DIR/.venv/bin/pip install -U pip setuptools wheel
 $DIR/.venv/bin/pip install -r $DIR/requirements.txt
-$DIR/.venv/bin/pip install -e ../sql-cli
+$DIR/.venv/bin/pip install -e ./sql-cli
diff --git a/doctest/build.gradle b/doctest/build.gradle
index a13375d469..4fe20ba212 100644
--- a/doctest/build.gradle
+++ b/doctest/build.gradle
@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import java.util.concurrent.Callable
 import org.opensearch.gradle.testclusters.RunTask
 
+import java.util.concurrent.Callable
+
 plugins {
     id 'base'
     id 'com.wiredforcode.spawn'
@@ -19,7 +20,20 @@ def path = project(':').projectDir
 // plugin module, and will only build ppl in it.
 def plugin_path = project(':doctest').projectDir
 
-task bootstrap(type: Exec) {
+task cloneSqlCli(type: Exec) {
+    def repoDir = new File("${project.projectDir}/sql-cli")
+    
+    if (repoDir.exists()) {
+        // Repository already exists, fetch and checkout latest
+        commandLine 'git', '-C', repoDir.absolutePath, 'fetch', 'origin', 'main'
+        commandLine 'git', '-C', repoDir.absolutePath, 'checkout', 'origin/main'
+    } else {
+        // Repository doesn't exist, clone it
+        commandLine 'git', 'clone', 'https://github.com/opensearch-project/sql-cli.git', repoDir.absolutePath
+    }
+}
+
+task bootstrap(type: Exec, dependsOn: ['cloneSqlCli']) {
     inputs.file "$projectDir/bootstrap.sh"
     outputs.dir "$projectDir/.venv"
 
@@ -45,13 +59,18 @@ task startPrometheus(type: SpawnProcessTask) {
     }
     command "$projectDir/bin/prometheus/prometheus --storage.tsdb.path=$projectDir/bin/prometheus/data --config.file=$projectDir/bin/prometheus/prometheus.yml"
     ready 'TSDB started'
-    pidLockFileName '.prom.pid.lock'
+    pidLockFileName ".prom.pid.lock"
 }
 
 
 //evaluationDependsOn(':')
 task startOpenSearch(type: SpawnProcessTask) {
-    command "${path}/gradlew -p ${plugin_path} runRestTestCluster"
+    if( getOSFamilyType() == "windows") {
+        command "${path}\\gradlew.bat -p ${plugin_path} runRestTestCluster"
+    }
+    else {
+        command "${path}/gradlew -p ${plugin_path} runRestTestCluster"
+    }
     ready 'started'
 }
 
@@ -60,41 +79,34 @@ task doctest(type: Exec, dependsOn: ['bootstrap']) {
     commandLine "$projectDir/bin/test-docs"
 
     doLast {
+        // remove the cloned sql-cli folder
+        file("$projectDir/sql-cli").deleteDir()
         println("Doctest Done")
     }
 }
 
 task stopOpenSearch(type: KillProcessTask)
 
-task stopPrometheus() {
-
+task stopPrometheus(type: KillProcessTask) {
+    pidLockFileName ".prom.pid.lock"
     doLast {
-        def pidFile = new File(path, ".prom.pid.lock")
-        if(!pidFile.exists()) {
-            logger.quiet "No Prometheus server running!"
-            return
-        }
-
-        def pid = pidFile.text
-        def process = "kill $pid".execute()
-
-        try {
-            process.waitFor()
-        } finally {
-            pidFile.delete()
-            file("$projectDir/bin/prometheus").deleteDir()
-            file("$projectDir/bin/prometheus.tar.gz").delete()
-        }
+        file("$projectDir/bin/prometheus").deleteDir()
+        file("$projectDir/bin/prometheus.tar.gz").delete()
     }
 }
 
-stopPrometheus.mustRunAfter startPrometheus
+// Stop Prom AFTER Start Prom...
+if(getOSFamilyType() != "windows") {
+    stopPrometheus.mustRunAfter startPrometheus
+    startOpenSearch.dependsOn startPrometheus
+    stopOpenSearch.finalizedBy stopPrometheus
+    startOpenSearch.finalizedBy stopPrometheus
+}
 doctest.dependsOn startOpenSearch
-startOpenSearch.dependsOn startPrometheus
 doctest.finalizedBy stopOpenSearch
-stopOpenSearch.finalizedBy stopPrometheus
 check.dependsOn doctest
 clean.dependsOn(cleanBootstrap)
+clean.dependsOn(stopPrometheus)
 
 // 2.0.0-alpha1-SNAPSHOT -> 2.0.0.0-alpha1-SNAPSHOT
 String opensearch_no_snapshot = opensearch_version.replace('-SNAPSHOT', '')
@@ -106,9 +118,12 @@ if (version_tokens.length > 1) {
 String mlCommonsRemoteFile = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + opensearch_no_snapshot + '/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-ml-' + opensearch_build + '.zip'
 String mlCommonsPlugin = 'opensearch-ml'
 
+String bwcOpenSearchJSDownload = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + opensearch_no_snapshot + '/latest/linux/x64/tar/builds/' +
+        'opensearch/plugins/opensearch-job-scheduler-' + opensearch_build + '.zip'
+String jsPlugin = 'opensearch-job-scheduler'
+
 testClusters {
     docTestCluster {
-        keystore 'plugins.query.federation.datasources.config', new File("$projectDir/datasource", 'datasources.json')
         // Disable loading of `ML-commons` plugin, because it might be unavailable (not released yet).
         /*
         plugin(provider(new Callable<RegularFile>(){
@@ -131,11 +146,58 @@ testClusters {
             }
         }))
         */
+        plugin(getJobSchedulerPlugin(jsPlugin, bwcOpenSearchJSDownload))
         plugin ':opensearch-sql-plugin'
-        testDistribution = 'integ_test'
+        testDistribution = 'archive'
     }
 }
 tasks.register("runRestTestCluster", RunTask) {
     description = 'Runs OpenSearch SQL plugin'
     useCluster testClusters.docTestCluster;
 }
+
+def getJobSchedulerPlugin(String jsPlugin, String bwcOpenSearchJSDownload) {
+    return provider(new Callable<RegularFile>() {
+        @Override
+        RegularFile call() throws Exception {
+            return new RegularFile() {
+                @Override
+                File getAsFile() {
+                    // Use absolute paths
+                    String basePath = new File('.').getCanonicalPath()
+                    File dir = new File(basePath + File.separator + 'doctest' + File.separator + jsPlugin)
+
+                    // Log the directory path for debugging
+                    println("Creating directory: " + dir.getAbsolutePath())
+
+                    // Create directory if it doesn't exist
+                    if (!dir.exists()) {
+                        if (!dir.mkdirs()) {
+                            throw new IOException("Failed to create directory: " + dir.getAbsolutePath())
+                        }
+                    }
+
+                    // Define the file path
+                    File f = new File(dir, jsPlugin + '-' + opensearch_build + '.zip')
+
+                    // Download file if it doesn't exist
+                    if (!f.exists()) {
+                        println("Downloading file from: " + bwcOpenSearchJSDownload)
+                        println("Saving to file: " + f.getAbsolutePath())
+
+                        new URL(bwcOpenSearchJSDownload).withInputStream { ins ->
+                            f.withOutputStream { it << ins }
+                        }
+                    }
+
+                    // Check if the file was created successfully
+                    if (!f.exists()) {
+                        throw new FileNotFoundException("File was not created: " + f.getAbsolutePath())
+                    }
+
+                    return fileTree(f.getParent()).matching { include f.getName() }.singleFile
+                }
+            }
+        }
+    })
+}
diff --git a/doctest/test_data/datasources.json b/doctest/test_data/datasources.json
new file mode 100644
index 0000000000..a75a7a68d3
--- /dev/null
+++ b/doctest/test_data/datasources.json
@@ -0,0 +1 @@
+{ "name" : "my_prometheus", "connector": "prometheus", "properties" : { "prometheus.uri" : "http://localhost:9090"}}
\ No newline at end of file
diff --git a/doctest/test_data/nested_objects.json b/doctest/test_data/nested_objects.json
new file mode 100644
index 0000000000..bee976806e
--- /dev/null
+++ b/doctest/test_data/nested_objects.json
@@ -0,0 +1,2 @@
+{"message":{"info":"a","author":"e","dayOfWeek":1},"comment":{"data":"ab","likes":3},"myNum":1,"someField":"b"}
+{"message":{"info":"b","author":"f","dayOfWeek":2},"comment":{"data":"aa","likes":2},"myNum":2,"someField":"a"}
diff --git a/doctest/test_data/wildcard.json b/doctest/test_data/wildcard.json
index c91778d8ab..21256ed8dc 100644
--- a/doctest/test_data/wildcard.json
+++ b/doctest/test_data/wildcard.json
@@ -1,22 +1,11 @@
-{"index":{"_id":"0"}}
 {"Body":"test wildcard"}
-{"index":{"_id":"1"}}
 {"Body":"test wildcard in the end of the text%"}
-{"index":{"_id":"2"}}
 {"Body":"%test wildcard in the beginning of the text"}
-{"index":{"_id":"3"}}
 {"Body":"test wildcard in % the middle of the text"}
-{"index":{"_id":"4"}}
 {"Body":"test wildcard %% beside each other"}
-{"index":{"_id":"5"}}
 {"Body":"test wildcard in the end of the text_"}
-{"index":{"_id":"6"}}
 {"Body":"_test wildcard in the beginning of the text"}
-{"index":{"_id":"7"}}
 {"Body":"test wildcard in _ the middle of the text"}
-{"index":{"_id":"8"}}
 {"Body":"test wildcard __ beside each other"}
-{"index":{"_id":"9"}}
 {"Body":"test backslash wildcard \\_"}
-{"index":{"_id":"10"}}
 {"Body":"tEsT wIlDcArD sensitive cases"}
diff --git a/doctest/test_docs.py b/doctest/test_docs.py
index b5edf46de9..881078a9bd 100644
--- a/doctest/test_docs.py
+++ b/doctest/test_docs.py
@@ -27,6 +27,8 @@
 BOOKS = "books"
 APACHE = "apache"
 WILDCARD = "wildcard"
+NESTED = "nested"
+DATASOURCES = ".ql-datasources"
 
 
 class DocTestConnection(OpenSearchConnection):
@@ -46,10 +48,34 @@ def process(self, statement):
         click.echo(output)
 
 
+"""
+For _explain requests, there are several additional request fields that will inconsistently
+appear/change depending on underlying cluster state. This method normalizes these responses in-place
+to make _explain doctests more consistent.
+
+If the passed response is not an _explain response, the input is left unmodified.
+"""
+def normalize_explain_response(data):
+    if "root" in data:
+        data = data["root"]
+
+    if (request := data.get("description", {}).get("request", None)) and request.startswith("OpenSearchQueryRequest("):
+        for filter_field in ["needClean", "pitId", "cursorKeepAlive", "searchAfter", "searchResponse"]:
+            request = re.sub(f", {filter_field}=\\w+", "", request)
+        data["description"]["request"] = request
+
+    for child in data.get("children", []):
+        normalize_explain_response(child)
+
+    return data
+
+
 def pretty_print(s):
     try:
-        d = json.loads(s)
-        print(json.dumps(d, indent=2))
+        data = json.loads(s)
+        normalize_explain_response(data)
+
+        print(json.dumps(data, indent=2))
     except json.decoder.JSONDecodeError:
         print(s)
 
@@ -94,6 +120,8 @@ def set_up_test_indices(test):
     load_file("books.json", index_name=BOOKS)
     load_file("apache.json", index_name=APACHE)
     load_file("wildcard.json", index_name=WILDCARD)
+    load_file("nested_objects.json", index_name=NESTED)
+    load_file("datasources.json", index_name=DATASOURCES)
 
 
 def load_file(filename, index_name):
@@ -122,7 +150,7 @@ def set_up(test):
 
 def tear_down(test):
     # drop leftover tables after each test
-    test_data_client.indices.delete(index=[ACCOUNTS, EMPLOYEES, PEOPLE, ACCOUNT2, NYC_TAXI, BOOKS, APACHE, WILDCARD], ignore_unavailable=True)
+    test_data_client.indices.delete(index=[ACCOUNTS, EMPLOYEES, PEOPLE, ACCOUNT2, NYC_TAXI, BOOKS, APACHE, WILDCARD, NESTED], ignore_unavailable=True)
 
 
 docsuite = partial(doctest.DocFileSuite,
diff --git a/doctest/test_mapping/nested_objects.json b/doctest/test_mapping/nested_objects.json
new file mode 100644
index 0000000000..4f0ed97433
--- /dev/null
+++ b/doctest/test_mapping/nested_objects.json
@@ -0,0 +1,47 @@
+{
+  "mappings": {
+    "properties": {
+      "message": {
+        "type": "nested",
+        "properties": {
+          "info": {
+            "type": "keyword",
+            "index": "true"
+          },
+          "author": {
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "ignore_above": 256
+              }
+            },
+            "index": "true"
+          },
+          "dayOfWeek": {
+            "type": "long"
+          }
+        }
+      },
+      "comment": {
+        "type": "nested",
+        "properties": {
+          "data": {
+            "type": "keyword",
+            "index": "true"
+          },
+          "likes": {
+            "type": "long"
+          }
+        }
+      },
+      "myNum": {
+        "type": "long"
+      },
+      "someField": {
+        "type": "keyword",
+        "index": "true"
+      }
+    }
+  }
+}
diff --git a/filesystem/build.gradle b/filesystem/build.gradle
deleted file mode 100644
index b76c0d517c..0000000000
--- a/filesystem/build.gradle
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-plugins {
-    id 'java-library'
-    id "io.freefair.lombok"
-    id 'jacoco'
-    id 'java-test-fixtures'
-}
-
-ext {
-    hadoop = "3.3.4"
-    aws = "1.12.330"
-}
-
-configurations.all {
-    resolutionStrategy.force "commons-io:commons-io:2.8.0"
-}
-
-dependencies {
-    implementation project(':core')
-    // required by hadoop filesystem https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-common/filesystem/index.html.
-    implementation("org.apache.hadoop:hadoop-common:${hadoop}") {
-        exclude group: 'org.apache.zookeeper'
-        exclude group: 'org.eclipse.jetty'
-        exclude group: 'com.sun.jersey'
-        exclude group: 'javax.servlet.jsp'
-        exclude group: 'javax.servlet'
-        exclude group: 'org.apache.kerby'
-        exclude group: 'org.apache.curator'
-        exclude group: 'com.google.protobuf', module: 'protobuf-java'
-        exclude group: 'org.apache.avro', module: 'avro'
-        exclude group: 'com.nimbusds', module: 'nimbus-jose-jwt'
-        // enforce version.
-        exclude group: 'com.fasterxml.woodstox', module: 'woodstox-core'
-        exclude group: 'commons-io', module: 'commons-io'
-        exclude group: 'ch.qos.reload4j', module: 'reload4j'
-        exclude group: 'org.apache.httpcomponents', module: 'httpcore'
-    }
-    implementation('com.fasterxml.woodstox:woodstox-core')
-    constraints {
-        implementation('com.fasterxml.woodstox:woodstox-core:6.4.0') {
-            because 'https://www.mend.io/vulnerability-database/CVE-2022-40156'
-        }
-    }
-    implementation('commons-io:commons-io')
-    constraints {
-        implementation('commons-io:commons-io:2.8.0') {
-            because 'between versions 2.8.0 and 2.5'
-        }
-    }
-    implementation('ch.qos.reload4j:reload4j')
-    constraints {
-        implementation('ch.qos.reload4j:reload4j:1.2.22') {
-            because 'between versions 1.2.22 and 1.2.19'
-        }
-    }
-    implementation('org.apache.httpcomponents:httpcore')
-    constraints {
-        implementation('org.apache.httpcomponents:httpcore:4.4.15') {
-            because 'between versions 4.4.15 and 4.4.13'
-        }
-    }
-
-    testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
-    testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
-    testFixturesImplementation(project(":core"))
-    testFixturesImplementation("org.apache.hadoop:hadoop-common:${hadoop}") {
-        exclude group: 'org.apache.zookeeper'
-        exclude group: 'org.eclipse.jetty'
-        exclude group: 'com.sun.jersey'
-        exclude group: 'javax.servlet.jsp'
-        exclude group: 'javax.servlet'
-        exclude group: 'org.apache.kerby'
-        exclude group: 'org.apache.curator'
-        exclude group: 'com.google.protobuf', module: 'protobuf-java'
-        exclude group: 'org.apache.avro', module: 'avro'
-        exclude group: 'com.nimbusds', module: 'nimbus-jose-jwt'
-        // enforce version.
-        exclude group: 'com.fasterxml.woodstox', module: 'woodstox-core'
-        exclude group: 'commons-io', module: 'commons-io'
-        exclude group: 'ch.qos.reload4j', module: 'reload4j'
-        exclude group: 'org.apache.httpcomponents', module: 'httpcore'
-    }
-}
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
-        exceptionFormat "full"
-    }
-
-    // hadoop-fs depend on native library which is missing on windows.
-    // https://hadoop.apache.org/docs/r3.3.4/hadoop-project-dist/hadoop-common/NativeLibraries.html#Native_Hadoop_Library
-    if ('windows' == project.getProperties().getOrDefault('buildPlatform', 'linux')) {
-        excludes = [
-                '**/FileSystemStreamSourceTest.class'
-        ]
-    }
-}
-
-jacocoTestReport {
-    reports {
-        html.enabled true
-        xml.enabled true
-    }
-    afterEvaluate {
-        classDirectories.setFrom(files(classDirectories.files.collect {
-            fileTree(dir: it)
-        }))
-    }
-}
-test.finalizedBy(project.tasks.jacocoTestReport)
-
-jacocoTestCoverageVerification {
-    violationRules {
-        rule {
-            // hadoop-fs depend on native library which is missing on windows.
-            // https://hadoop.apache.org/docs/r3.3.4/hadoop-project-dist/hadoop-common/NativeLibraries.html#Native_Hadoop_Library
-            if ('windows' == project.getProperties().getOrDefault('buildPlatform', 'linux')) {
-                excludes = [
-                        'org.opensearch.sql.filesystem.streaming.FileSystemStreamSource'
-                ]
-            }
-            element = 'CLASS'
-            limit {
-                counter = 'LINE'
-                minimum = 1.0
-            }
-            limit {
-                counter = 'BRANCH'
-                minimum = 1.0
-            }
-        }
-    }
-    afterEvaluate {
-        classDirectories.setFrom(files(classDirectories.files.collect {
-            fileTree(dir: it)
-        }))
-    }
-}
-check.dependsOn jacocoTestCoverageVerification
-jacocoTestCoverageVerification.dependsOn jacocoTestReport
diff --git a/filesystem/src/main/java/org/opensearch/sql/filesystem/storage/split/FileSystemSplit.java b/filesystem/src/main/java/org/opensearch/sql/filesystem/storage/split/FileSystemSplit.java
deleted file mode 100644
index 7fefb11a85..0000000000
--- a/filesystem/src/main/java/org/opensearch/sql/filesystem/storage/split/FileSystemSplit.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.filesystem.storage.split;
-
-import java.util.Set;
-import java.util.UUID;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.apache.hadoop.fs.Path;
-import org.opensearch.sql.storage.split.Split;
-
-@Data
-public class FileSystemSplit implements Split {
-
-  @Getter
-  @EqualsAndHashCode.Exclude
-  private final String splitId = UUID.randomUUID().toString();
-
-  private final Set<Path> paths;
-}
diff --git a/filesystem/src/main/java/org/opensearch/sql/filesystem/streaming/FileMetaData.java b/filesystem/src/main/java/org/opensearch/sql/filesystem/streaming/FileMetaData.java
deleted file mode 100644
index 6a8c90ee80..0000000000
--- a/filesystem/src/main/java/org/opensearch/sql/filesystem/streaming/FileMetaData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.filesystem.streaming;
-
-import java.util.Set;
-import lombok.Data;
-import org.apache.hadoop.fs.Path;
-
-/**
- * File metadata. Batch id associate with the set of {@link Path}.
- */
-@Data
-public class FileMetaData {
-
-  private final Long batchId;
-
-  private final Set<Path> paths;
-}
diff --git a/filesystem/src/main/java/org/opensearch/sql/filesystem/streaming/FileSystemStreamSource.java b/filesystem/src/main/java/org/opensearch/sql/filesystem/streaming/FileSystemStreamSource.java
deleted file mode 100644
index 6a9639bdcb..0000000000
--- a/filesystem/src/main/java/org/opensearch/sql/filesystem/streaming/FileSystemStreamSource.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.filesystem.streaming;
-
-import com.google.common.collect.Sets;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.SneakyThrows;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.opensearch.sql.executor.streaming.Batch;
-import org.opensearch.sql.executor.streaming.DefaultMetadataLog;
-import org.opensearch.sql.executor.streaming.MetadataLog;
-import org.opensearch.sql.executor.streaming.Offset;
-import org.opensearch.sql.executor.streaming.StreamingSource;
-import org.opensearch.sql.filesystem.storage.split.FileSystemSplit;
-
-/**
- * FileSystem Streaming Source use Hadoop FileSystem.
- */
-public class FileSystemStreamSource implements StreamingSource {
-
-  private static final Logger log = LogManager.getLogger(FileSystemStreamSource.class);
-
-  private final MetadataLog<FileMetaData> fileMetaDataLog;
-
-  private Set<Path> seenFiles;
-
-  private final FileSystem fs;
-
-  private final Path basePath;
-
-  /**
-   * Constructor of FileSystemStreamSource.
-   */
-  public FileSystemStreamSource(FileSystem fs, Path basePath) {
-    this.fs = fs;
-    this.basePath = basePath;
-    // todo, need to add state recovery
-    this.fileMetaDataLog = new DefaultMetadataLog<>();
-    // todo, need to add state recovery
-    this.seenFiles = new HashSet<>();
-  }
-
-  @SneakyThrows(value = IOException.class)
-  @Override
-  public Optional<Offset> getLatestOffset() {
-    // list all files. todo. improvement list performance.
-    Set<Path> allFiles =
-        Arrays.stream(fs.listStatus(basePath))
-            .filter(status -> !status.isDirectory())
-            .map(FileStatus::getPath)
-            .collect(Collectors.toSet());
-
-    // find unread files.
-    log.debug("all files {}", allFiles);
-    Set<Path> unread = Sets.difference(allFiles, seenFiles);
-
-    // update seenFiles.
-    seenFiles = allFiles;
-    log.debug("seen files {}", seenFiles);
-
-    Optional<Long> latestBatchIdOptional = fileMetaDataLog.getLatest().map(Pair::getKey);
-    if (!unread.isEmpty()) {
-      long latestBatchId = latestBatchIdOptional.map(id -> id + 1).orElse(0L);
-      fileMetaDataLog.add(latestBatchId, new FileMetaData(latestBatchId, unread));
-      log.debug("latestBatchId {}", latestBatchId);
-      return Optional.of(new Offset(latestBatchId));
-    } else {
-      log.debug("no unread data");
-      Optional<Offset> offset =
-          latestBatchIdOptional.isEmpty()
-              ? Optional.empty()
-              : Optional.of(new Offset(latestBatchIdOptional.get()));
-      log.debug("return empty offset {}", offset);
-      return offset;
-    }
-  }
-
-  @Override
-  public Batch getBatch(Optional<Offset> start, Offset end) {
-    Long startBatchId = start.map(Offset::getOffset).map(id -> id + 1).orElse(0L);
-    Long endBatchId = end.getOffset();
-
-    Set<Path> paths =
-        fileMetaDataLog.get(Optional.of(startBatchId), Optional.of(endBatchId)).stream()
-            .map(FileMetaData::getPaths)
-            .flatMap(Set::stream)
-            .collect(Collectors.toSet());
-
-    log.debug("fetch files {} with id from: {} to: {}.", paths, start, end);
-    return new Batch(new FileSystemSplit(paths));
-  }
-}
diff --git a/filesystem/src/test/java/org/opensearch/sql/filesystem/streaming/FileSystemStreamSourceTest.java b/filesystem/src/test/java/org/opensearch/sql/filesystem/streaming/FileSystemStreamSourceTest.java
deleted file mode 100644
index fba038f6a3..0000000000
--- a/filesystem/src/test/java/org/opensearch/sql/filesystem/streaming/FileSystemStreamSourceTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.filesystem.streaming;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doThrow;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Optional;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.io.TempDir;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.sql.executor.streaming.Offset;
-import org.opensearch.sql.filesystem.storage.split.FileSystemSplit;
-import org.opensearch.sql.storage.split.Split;
-
-@ExtendWith(MockitoExtension.class)
-class FileSystemStreamSourceTest {
-
-  @TempDir Path perTestTempDir;
-
-  FileSystemStreamSource streamSource;
-
-  /**
-   * use hadoop default filesystem. it only works on unix-like system. for running on windows, it
-   * require native library. Reference.
-   * https://hadoop.apache.org/docs/r3.3.4/hadoop-project-dist/hadoop-common/NativeLibraries.html
-   */
-  @BeforeEach
-  void setup() throws IOException {
-    streamSource =
-        new FileSystemStreamSource(
-            FileSystem.get(new Configuration()),
-            new org.apache.hadoop.fs.Path(perTestTempDir.toUri()));
-  }
-
-  @Test
-  void addOneFileToSource() throws IOException {
-    emptySource().addFile("log1").latestOffsetShouldBe(0L).batchFromStart("log1");
-  }
-
-  @Test
-  void addMultipleFileInSequence() throws IOException {
-    emptySource()
-        .addFile("log1")
-        .latestOffsetShouldBe(0L)
-        .batchFromStart("log1")
-        .addFile("log2")
-        .latestOffsetShouldBe(1L)
-        .batchFromStart("log1", "log2")
-        .batchInBetween(0L, 1L, "log2");
-  }
-
-  @Test
-  void latestOffsetShouldSameIfNoNewFileAdded() throws IOException {
-    emptySource()
-        .addFile("log1")
-        .latestOffsetShouldBe(0L)
-        .batchFromStart("log1")
-        .latestOffsetShouldBe(0L)
-        .batchFromStart("log1");
-  }
-
-  @Test
-  void latestOffsetIsEmptyIfNoFilesInSource() {
-    emptySource().noOffset();
-  }
-
-  @Test
-  void dirIsFiltered() throws IOException {
-    emptySource()
-        .addFile("log1")
-        .latestOffsetShouldBe(0L)
-        .addDir("dir1")
-        .latestOffsetShouldBe(0L)
-        .batchFromStart("log1");
-  }
-
-  @Test
-  void sneakThrowException() throws IOException {
-    FileSystem fs = Mockito.mock(FileSystem.class);
-    doThrow(IOException.class).when(fs).listStatus(any(org.apache.hadoop.fs.Path.class));
-
-    streamSource =
-        new FileSystemStreamSource(fs,
-            new org.apache.hadoop.fs.Path(perTestTempDir.toUri()));
-    assertThrows(IOException.class, () -> streamSource.getLatestOffset());
-  }
-
-  StreamSource emptySource() {
-    return new StreamSource();
-  }
-
-  private class StreamSource {
-
-    StreamSource addFile(String filename) throws IOException {
-      Path file = Files.createFile(perTestTempDir.resolve(filename));
-      assertTrue(file.toFile().exists());
-
-      return this;
-    }
-
-    StreamSource addDir(String dirname) throws IOException {
-      Path dir = Files.createDirectory(perTestTempDir.resolve(dirname));
-      assertTrue(dir.toFile().isDirectory());
-
-      return this;
-    }
-
-    StreamSource noOffset() {
-      assertFalse(streamSource.getLatestOffset().isPresent());
-
-      return this;
-    }
-
-    StreamSource latestOffsetShouldBe(Long offset) {
-      Optional<Offset> latestOffset = streamSource.getLatestOffset();
-      assertTrue(latestOffset.isPresent());
-      assertEquals(new Offset(offset), latestOffset.get());
-
-      return this;
-    }
-
-    StreamSource batchFromStart(String... uris) {
-      assertTrue(streamSource.getLatestOffset().isPresent());
-      internalBatchInBetween(Optional.empty(), streamSource.getLatestOffset().get(), uris);
-
-      return this;
-    }
-
-    StreamSource batchInBetween(Long start, Long end, String... uris) {
-      internalBatchInBetween(Optional.of(new Offset(start)), new Offset(end), uris);
-
-      return this;
-    }
-
-    private StreamSource internalBatchInBetween(
-        Optional<Offset> start, Offset end, String... uris) {
-      Split split = streamSource.getBatch(start, end).getSplit();
-      assertThat(
-          ((FileSystemSplit) split).getPaths(),
-          containsInAnyOrder(
-              Arrays.stream(uris)
-                  .map(name -> new org.apache.hadoop.fs.Path(perTestTempDir.resolve(name).toUri()))
-                  .toArray()));
-      return this;
-    }
-  }
-}
diff --git a/filesystem/src/testFixtures/java/org/opensearch/sql/filesystem/storage/FSDataSourceFactory.java b/filesystem/src/testFixtures/java/org/opensearch/sql/filesystem/storage/FSDataSourceFactory.java
deleted file mode 100644
index 6b700aa6d4..0000000000
--- a/filesystem/src/testFixtures/java/org/opensearch/sql/filesystem/storage/FSDataSourceFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.filesystem.storage;
-
-import java.net.URI;
-import java.util.concurrent.atomic.AtomicInteger;
-import lombok.RequiredArgsConstructor;
-import org.opensearch.sql.datasource.model.DataSource;
-import org.opensearch.sql.datasource.model.DataSourceMetadata;
-import org.opensearch.sql.datasource.model.DataSourceType;
-import org.opensearch.sql.storage.DataSourceFactory;
-
-@RequiredArgsConstructor
-public class FSDataSourceFactory implements DataSourceFactory {
-
-  private final URI basePath;
-
-  private final AtomicInteger result;
-
-  @Override
-  public DataSourceType getDataSourceType() {
-    return DataSourceType.FILESYSTEM;
-  }
-
-  @Override
-  public DataSource createDataSource(DataSourceMetadata metadata) {
-    return new DataSource(
-        metadata.getName(), DataSourceType.FILESYSTEM, new FSStorageEngine(basePath, result));
-  }
-}
diff --git a/filesystem/src/testFixtures/java/org/opensearch/sql/filesystem/storage/FSStorageEngine.java b/filesystem/src/testFixtures/java/org/opensearch/sql/filesystem/storage/FSStorageEngine.java
deleted file mode 100644
index 0826b4c12f..0000000000
--- a/filesystem/src/testFixtures/java/org/opensearch/sql/filesystem/storage/FSStorageEngine.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.filesystem.storage;
-
-import java.net.URI;
-import java.util.concurrent.atomic.AtomicInteger;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.opensearch.sql.DataSourceSchemaName;
-import org.opensearch.sql.storage.StorageEngine;
-import org.opensearch.sql.storage.Table;
-
-/** FileSystem StorageEngine. Used for testing purpose. */
-@RequiredArgsConstructor
-public class FSStorageEngine implements StorageEngine {
-
-  private final FileSystem fs;
-
-  private final Path basePath;
-
-  private final AtomicInteger result;
-
-  /**
-   * constructor.
-   */
-  @SneakyThrows
-  public FSStorageEngine(URI basePath, AtomicInteger result) {
-    this.fs = FileSystem.get(new Configuration());
-    this.basePath = new Path(basePath);
-    this.result = result;
-  }
-
-  @Override
-  public Table getTable(DataSourceSchemaName dataSourceSchemaName, String tableName) {
-    return new FSTable(fs, basePath, result);
-  }
-
-  @SneakyThrows
-  public void close() {
-    fs.close();
-  }
-}
diff --git a/filesystem/src/testFixtures/java/org/opensearch/sql/filesystem/storage/FSTable.java b/filesystem/src/testFixtures/java/org/opensearch/sql/filesystem/storage/FSTable.java
deleted file mode 100644
index 45f8fc1104..0000000000
--- a/filesystem/src/testFixtures/java/org/opensearch/sql/filesystem/storage/FSTable.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.filesystem.storage;
-
-import com.google.common.collect.ImmutableMap;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.model.ExprValueUtils;
-import org.opensearch.sql.data.type.ExprCoreType;
-import org.opensearch.sql.data.type.ExprType;
-import org.opensearch.sql.executor.streaming.StreamingSource;
-import org.opensearch.sql.filesystem.storage.split.FileSystemSplit;
-import org.opensearch.sql.filesystem.streaming.FileSystemStreamSource;
-import org.opensearch.sql.planner.logical.LogicalPlan;
-import org.opensearch.sql.planner.physical.PhysicalPlan;
-import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
-import org.opensearch.sql.storage.Table;
-import org.opensearch.sql.storage.TableScanOperator;
-import org.opensearch.sql.storage.split.Split;
-
-/**
- * FileSystem Table. Used for testing purpose.
- */
-@RequiredArgsConstructor
-public class FSTable implements Table {
-  private final FileSystem fs;
-
-  private final Path basePath;
-
-  private final AtomicInteger result;
-
-  @Override
-  public Map<String, ExprType> getFieldTypes() {
-    return ImmutableMap.of("value", ExprCoreType.INTEGER);
-  }
-
-  @Override
-  public PhysicalPlan implement(LogicalPlan plan) {
-    return new Output(new FSScan(fs));
-  }
-
-  @Override
-  public StreamingSource asStreamingSource() {
-    return new FileSystemStreamSource(fs, basePath);
-  }
-
-  @RequiredArgsConstructor
-  class Output extends PhysicalPlan {
-    private final PhysicalPlan input;
-
-    @Override
-    public void open() {
-      while (input.hasNext()) {
-        result.addAndGet(input.next().integerValue());
-      }
-    }
-
-    @Override
-    public boolean hasNext() {
-      return false;
-    }
-
-    @Override
-    public ExprValue next() {
-      throw new UnsupportedOperationException();
-    }
-
-    // todo, need to refactor physical plan interface.
-    @Override
-    public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<PhysicalPlan> getChild() {
-      return Collections.singletonList(input);
-    }
-  }
-
-  @RequiredArgsConstructor
-  class FSScan extends TableScanOperator {
-
-    private final FileSystem fs;
-
-    private Iterator<Path> paths;
-
-    @Override
-    public String explain() {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasNext() {
-      return paths.hasNext();
-    }
-
-    @SneakyThrows(IOException.class)
-    @Override
-    public ExprValue next() {
-      BufferedReader reader = new BufferedReader(new InputStreamReader(fs.open(paths.next())));
-      // every file only contain one line.
-      ExprValue result = ExprValueUtils.integerValue(Integer.valueOf(reader.readLine()));
-
-      reader.close();
-      return result;
-    }
-
-    @Override
-    public void add(Split split) {
-      paths = ((FileSystemSplit) split).getPaths().iterator();
-    }
-  }
-}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..7f93135c49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1bc47ca826..a1f138116b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
diff --git a/gradlew b/gradlew
index 025c045cb5..1aa94a4269 100755
--- a/gradlew
+++ b/gradlew
@@ -1,16 +1,7 @@
-#!/usr/bin/env sh
-#
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-#
-# The OpenSearch Contributors require contributions made to
-# this file be licensed under the Apache-2.0 license or a
-# compatible open source license.
-#
-# Modifications Copyright OpenSearch Contributors. See
-# GitHub history for details.
+#!/bin/sh
+
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,67 +17,99 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -96,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -107,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index fc8457a4e9..6689b85bee 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,13 +1,3 @@
-rem
-@rem Copyright OpenSearch Contributors
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-@rem The OpenSearch Contributors require contributions made to
-@rem this file be licensed under the Apache-2.0 license or a
-@rem compatible open source license.
-@rem
-@rem Modifications Copyright OpenSearch Contributors. See
-@rem GitHub history for details.
 @rem
 @rem Copyright 2015 the original author or authors.
 @rem
@@ -24,7 +14,7 @@ rem
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -35,7 +25,8 @@ rem
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -50,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -85,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/integ-test/build.gradle b/integ-test/build.gradle
index 8adfd84b40..4a43e78ddd 100644
--- a/integ-test/build.gradle
+++ b/integ-test/build.gradle
@@ -22,14 +22,20 @@
  * under the License.
  */
 
-import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import org.opensearch.gradle.test.RestIntegTestTask
 import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
+import org.opensearch.gradle.testclusters.OpenSearchCluster
+import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter
+import org.gradle.api.internal.tasks.testing.junitplatform.JUnitPlatformTestFramework
 
+import groovy.xml.XmlParser
+import java.nio.file.Paths
 import java.util.concurrent.Callable
+import java.util.stream.Collectors
 
 plugins {
     id "de.undercouch.download" version "5.3.0"
+    id 'com.diffplug.spotless' version '6.22.0'
 }
 
 apply plugin: 'opensearch.build'
@@ -44,12 +50,94 @@ apply plugin: 'com.wiredforcode.spawn'
 repositories {
     mavenCentral()
     maven { url 'https://jitpack.io' }
+
+    // Add extra repository for the JDBC driver if given by user
+    if (System.getProperty("jdbcRepo") != null && new File(System.getProperty("jdbcRepo")).isDirectory()) {
+        maven { url new File(System.getProperty("jdbcRepo")) }
+    }
 }
 
 ext {
     projectSubstitutions = [:]
     licenseFile = rootProject.file('LICENSE.TXT')
     noticeFile = rootProject.file('NOTICE')
+
+    getSecurityPluginDownloadLink = { ->
+        var repo = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/" +
+                   "opensearch-security/$opensearch_build_snapshot/"
+        var metadataFile = Paths.get(projectDir.toString(), "build", "maven-metadata.xml").toAbsolutePath().toFile()
+        download.run {
+            src repo + "maven-metadata.xml"
+            dest metadataFile
+        }
+        def metadata = new XmlParser().parse(metadataFile)
+        def securitySnapshotVersion = metadata.versioning.snapshotVersions[0].snapshotVersion[0].value[0].text()
+
+        return repo + "opensearch-security-${securitySnapshotVersion}.zip"
+    }
+
+    var projectAbsPath = projectDir.getAbsolutePath()
+    File downloadedSecurityPlugin = Paths.get(projectAbsPath, 'bin', 'opensearch-security-snapshot.zip').toFile()
+    configureSecurityPlugin = { OpenSearchCluster cluster ->
+
+        cluster.getNodes().forEach { node ->
+            var creds = node.getCredentials()
+            if (creds.isEmpty()) {
+                creds.add(Map.of('useradd', 'admin', '-p', 'admin'))
+            } else {
+                creds.get(0).putAll(Map.of('useradd', 'admin', '-p', 'admin'))
+            }
+        }
+
+        // add a check to avoid re-downloading multiple times during single test run
+        if (!downloadedSecurityPlugin.exists()) {
+            download.run {
+                src getSecurityPluginDownloadLink()
+                dest downloadedSecurityPlugin
+            }
+        } else {
+            println "Security Plugin File Already Exists"
+        }
+
+        // Config below including files are copied from security demo configuration
+        ['esnode.pem', 'esnode-key.pem', 'root-ca.pem'].forEach { file ->
+            File local = Paths.get(projectAbsPath, 'bin', file).toFile()
+            download.run {
+                src "https://raw.githubusercontent.com/opensearch-project/security/main/bwc-test/src/test/resources/security/" + file
+                dest local
+                overwrite false
+            }
+            cluster.extraConfigFile file, local
+        }
+        [
+            // config copied from security plugin demo configuration
+            'plugins.security.ssl.transport.pemcert_filepath' : 'esnode.pem',
+            'plugins.security.ssl.transport.pemkey_filepath' : 'esnode-key.pem',
+            'plugins.security.ssl.transport.pemtrustedcas_filepath' : 'root-ca.pem',
+            'plugins.security.ssl.transport.enforce_hostname_verification' : 'false',
+            // https is disabled to simplify test debugging
+            'plugins.security.ssl.http.enabled' : 'false',
+            'plugins.security.ssl.http.pemcert_filepath' : 'esnode.pem',
+            'plugins.security.ssl.http.pemkey_filepath' : 'esnode-key.pem',
+            'plugins.security.ssl.http.pemtrustedcas_filepath' : 'root-ca.pem',
+            'plugins.security.allow_unsafe_democertificates' : 'true',
+
+            'plugins.security.allow_default_init_securityindex' : 'true',
+            'plugins.security.authcz.admin_dn' : 'CN=kirk,OU=client,O=client,L=test,C=de',
+            'plugins.security.audit.type' : 'internal_opensearch',
+            'plugins.security.enable_snapshot_restore_privilege' : 'true',
+            'plugins.security.check_snapshot_restore_write_privileges' : 'true',
+            'plugins.security.restapi.roles_enabled' : '["all_access", "security_rest_api_access"]',
+            'plugins.security.system_indices.enabled' : 'true'
+        ].forEach { name, value ->
+            cluster.setting name, value
+        }
+
+        cluster.plugin provider((Callable<RegularFile>) (() -> (RegularFile) (() -> downloadedSecurityPlugin)))
+    }
+
+    bwcFilePath = "src/test/resources/bwc/"
+    bwcJSPluginPath = bwcFilePath + "job-scheduler/"
 }
 
 tasks.withType(licenseHeaders.class) {
@@ -59,52 +147,52 @@ tasks.withType(licenseHeaders.class) {
 validateNebulaPom.enabled = false
 loggerUsageCheck.enabled = false
 
+configurations {
+    zipArchive
+}
+
 configurations.all {
     resolutionStrategy.force 'junit:junit:4.13.2'
-    exclude group: "commons-logging", module: "commons-logging"
+    resolutionStrategy.force "commons-logging:commons-logging:1.2"
     // enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
     resolutionStrategy.force 'commons-codec:commons-codec:1.13'
-    resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
-    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
-    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jackson_version}"
-    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson_version}"
-    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
-    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
-    resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
-    resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
-    resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.9.3"
-    resolutionStrategy.force "org.apache.commons:commons-math3:3.6.1"
-    resolutionStrategy.force "org.apache.commons:commons-lang3:3.12.0"
+    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
+    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
+    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
+    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
+    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+    resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.10.0"
+    resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.13"
+    resolutionStrategy.force "org.apache.httpcomponents:httpclient:4.5.14"
     resolutionStrategy.force "joda-time:joda-time:2.10.12"
     resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36"
+    resolutionStrategy.force "com.amazonaws:aws-java-sdk-core:${aws_java_sdk_version}"
+    resolutionStrategy.force "com.google.guava:guava:${guava_version}"
 }
 
 dependencies {
     testImplementation group: 'org.opensearch.test', name: 'framework', version: "${opensearch_version}"
     testImplementation group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
     testImplementation group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "${opensearch_version}"
+    testImplementation group: 'org.opensearch.driver', name: 'opensearch-sql-jdbc', version: System.getProperty("jdbcDriverVersion", '1.2.0.0')
     testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version:"${versions.log4j}"
     testImplementation project(':opensearch-sql-plugin')
     testImplementation project(':legacy')
-    testImplementation('org.junit.jupiter:junit-jupiter-api:5.6.2')
-    testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.6.2')
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.9.3')
+    testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.9.3')
+    testRuntimeOnly('org.junit.platform:junit-platform-launcher:1.9.3')
 
-    // JDBC drivers for comparison test. Somehow Apache Derby throws security permission exception.
-    testImplementation fileTree('../sql-jdbc/build/libs') {
-        include '*.jar'
-        builtBy 'compileJdbc'
-    }
-    testImplementation group: 'com.h2database', name: 'h2', version: '2.1.214'
-    testImplementation group: 'org.xerial', name: 'sqlite-jdbc', version: '3.28.0'
+    testImplementation group: 'com.h2database', name: 'h2', version: '2.2.220'
+    testImplementation group: 'org.xerial', name: 'sqlite-jdbc', version: '3.41.2.2'
     testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
-    testImplementation(testFixtures(project(":core")))
-    testImplementation(testFixtures(project(":filesystem")))
+    testCompileOnly 'org.apiguardian:apiguardian-api:1.1.2'
+
+    zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}"
 }
 
 dependencyLicenses.enabled = false
 testingConventions.enabled = false
-checkstyleTest.ignoreFailures = true
 forbiddenApisTest.enabled = false
 thirdPartyAudit.enabled = false
 
@@ -117,12 +205,50 @@ compileTestJava {
 }
 
 testClusters.all {
-    testDistribution = 'archive'
+    // debug with command, ./gradlew opensearch-sql:run -DdebugJVM. --debug-jvm does not work with keystore.
+    if (System.getProperty("debugJVM") != null) {
+        jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005'
+    }
 }
 
-testClusters.integTest {
-    plugin ":opensearch-sql-plugin"
-    keystore 'plugins.query.federation.datasources.config', new File("$projectDir/src/test/resources/datasource/", 'datasources.json')
+def getJobSchedulerPlugin() {
+    provider(new Callable<RegularFile>() {
+        @Override
+        RegularFile call() throws Exception {
+            return new RegularFile() {
+                @Override
+                File getAsFile() {
+                    return configurations.zipArchive.asFileTree.matching {
+                        include '**/opensearch-job-scheduler*'
+                    }.singleFile
+                }
+            }
+        }
+    })
+}
+
+testClusters {
+    integTest {
+        testDistribution = 'archive'
+        plugin(getJobSchedulerPlugin())
+        plugin ":opensearch-sql-plugin"
+        setting "plugins.query.datasources.encryption.masterkey", "1234567812345678"
+    }
+    remoteCluster {
+        testDistribution = 'archive'
+        plugin(getJobSchedulerPlugin())
+        plugin ":opensearch-sql-plugin"
+    }
+    integTestWithSecurity {
+        testDistribution = 'archive'
+        plugin(getJobSchedulerPlugin())
+        plugin ":opensearch-sql-plugin"
+    }
+    remoteIntegTestWithSecurity {
+        testDistribution = 'archive'
+        plugin(getJobSchedulerPlugin())
+        plugin ":opensearch-sql-plugin"
+    }
 }
 
 task startPrometheus(type: SpawnProcessTask) {
@@ -157,11 +283,26 @@ task stopPrometheus(type: KillProcessTask) {
 
 stopPrometheus.mustRunAfter startPrometheus
 
-// Run PPL ITs and new, legacy and comparison SQL ITs with new SQL engine enabled
-integTest {
+task integJdbcTest(type: RestIntegTestTask) {
+    testClusters.findAll {c -> c.clusterName == "integJdbcTest"}.first().
+        plugin ":opensearch-sql-plugin"
+
+    useJUnitPlatform()
     dependsOn ':opensearch-sql-plugin:bundlePlugin'
-    dependsOn startPrometheus
-    finalizedBy stopPrometheus
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+    afterTest { desc, result ->
+        logger.quiet "${desc.className}.${desc.name}: ${result.resultType} ${(result.getEndTime() - result.getStartTime())/1000}s"
+    }
+
+    if (System.getProperty("jdbcDriverVersion") != null) {
+        systemProperty "jdbcDriverVersion", System.getProperty("jdbcDriverVersion")
+    }
+
+    if (System.getProperty("jdbcFile") != null) {
+        systemProperty "jdbcFile", System.getProperty("jdbcFile")
+    }
 
     systemProperty 'tests.security.manager', 'false'
     systemProperty('project.root', project.projectDir.absolutePath)
@@ -181,12 +322,134 @@ integTest {
         jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
     }
 
+    filter {
+        includeTestsMatching 'org.opensearch.sql.jdbc.*'
+    }
+}
+
+task integTestWithSecurity(type: RestIntegTestTask) {
+    useCluster testClusters.integTestWithSecurity
+    useCluster testClusters.remoteIntegTestWithSecurity
+
+    systemProperty "cluster.names",
+        getClusters().stream().map(cluster -> cluster.getName()).collect(Collectors.joining(","))
+
+    getClusters().forEach { cluster ->
+        configureSecurityPlugin(cluster)
+    }
+
+    useJUnitPlatform()
+    dependsOn ':opensearch-sql-plugin:bundlePlugin'
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+    afterTest { desc, result ->
+        logger.quiet "${desc.className}.${desc.name}: ${result.resultType} ${(result.getEndTime() - result.getStartTime())/1000}s"
+    }
+
+    systemProperty 'tests.security.manager', 'false'
+    systemProperty 'project.root', project.projectDir.absolutePath
+
+    // Set default query size limit
+    systemProperty 'defaultQuerySizeLimit', '10000'
+
+    // Tell the test JVM if the cluster JVM is running under a debugger so that tests can use longer timeouts for
+    // requests. The 'doFirst' delays reading the debug setting on the cluster till execution time.
+    doFirst {
+        systemProperty 'cluster.debug', getDebug()
+        getClusters().forEach { cluster ->
+
+            String allTransportSocketURI = cluster.nodes.stream().flatMap { node ->
+                node.getAllTransportPortURI().stream()
+            }.collect(Collectors.joining(","))
+            String allHttpSocketURI = cluster.nodes.stream().flatMap { node ->
+                node.getAllHttpSocketURI().stream()
+            }.collect(Collectors.joining(","))
+
+            systemProperty "tests.rest.${cluster.name}.http_hosts", "${-> allHttpSocketURI}"
+            systemProperty "tests.rest.${cluster.name}.transport_hosts", "${-> allTransportSocketURI}"
+        }
+
+        systemProperty "https", "false"
+        systemProperty "user", "admin"
+        systemProperty "password", "admin"
+    }
+
+    if (System.getProperty("test.debug") != null) {
+        jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
+    }
+
+    // NOTE: this IT config discovers only junit5 (jupiter) tests.
+    // https://github.com/opensearch-project/sql/issues/1974
+    filter {
+        includeTestsMatching 'org.opensearch.sql.security.CrossClusterSearchIT'
+    }
+}
+
+// Run PPL ITs and new, legacy and comparison SQL ITs with new SQL engine enabled
+integTest {
+    useCluster testClusters.remoteCluster
+
+    // Set properties for connection to clusters and between clusters
+    doFirst {
+        getClusters().forEach { cluster ->
+            String allTransportSocketURI = cluster.nodes.stream().flatMap { node ->
+                node.getAllTransportPortURI().stream()
+            }.collect(Collectors.joining(","))
+            String allHttpSocketURI = cluster.nodes.stream().flatMap { node ->
+                node.getAllHttpSocketURI().stream()
+            }.collect(Collectors.joining(","))
+
+            systemProperty "tests.rest.${cluster.name}.http_hosts", "${-> allHttpSocketURI}"
+            systemProperty "tests.rest.${cluster.name}.transport_hosts", "${-> allTransportSocketURI}"
+        }
+    }
+
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+
+    dependsOn ':opensearch-sql-plugin:bundlePlugin'
+    if(getOSFamilyType() != "windows") {
+        dependsOn startPrometheus
+        finalizedBy stopPrometheus
+    }
+    systemProperty 'tests.security.manager', 'false'
+    systemProperty('project.root', project.projectDir.absolutePath)
+
+    systemProperty "https", System.getProperty("https")
+    systemProperty "user", System.getProperty("user")
+    systemProperty "password", System.getProperty("password")
+
+    // Set default query size limit
+    systemProperty 'defaultQuerySizeLimit', '10000'
+
+    // Tell the test JVM if the cluster JVM is running under a debugger so that tests can use longer timeouts for
+    // requests. The 'doFirst' delays reading the debug setting on the cluster till execution time.
+    doFirst {
+        if (System.getProperty("debug-jvm") != null) {
+            setDebug(true);
+        }
+        systemProperty 'cluster.debug', getDebug()
+    }
+
+
+    if (System.getProperty("test.debug") != null) {
+        jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5006'
+    }
+
     if (System.getProperty("tests.rest.bwcsuite") == null) {
         filter {
             excludeTestsMatching "org.opensearch.sql.bwc.*IT"
         }
     }
 
+    if(getOSFamilyType() == "windows") {
+        exclude 'org/opensearch/sql/ppl/PrometheusDataSourceCommandsIT.class'
+        exclude 'org/opensearch/sql/ppl/ShowDataSourcesCommandIT.class'
+        exclude 'org/opensearch/sql/ppl/InformationSchemaCommandIT.class'
+    }
+
     exclude 'org/opensearch/sql/doctest/**/*IT.class'
     exclude 'org/opensearch/sql/correctness/**'
 
@@ -201,10 +464,19 @@ integTest {
 
     // Skip this IT because all assertions are against explain output
     exclude 'org/opensearch/sql/legacy/OrderIT.class'
+
+    // Exclude JDBC related tests
+    exclude 'org/opensearch/sql/jdbc/**'
+
+    // Exclude this IT, because they executed in another task (:integTestWithSecurity)
+    exclude 'org/opensearch/sql/security/**'
 }
 
 
 task comparisonTest(type: RestIntegTestTask) {
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
     dependsOn ':opensearch-sql-plugin:bundlePlugin'
 
     systemProperty 'tests.security.manager', 'false'
@@ -223,6 +495,9 @@ task comparisonTest(type: RestIntegTestTask) {
     exclude 'org/opensearch/sql/ppl/**/*IT.class'
     exclude 'org/opensearch/sql/legacy/**/*IT.class'
 
+    // Exclude JDBC related tests
+    exclude 'org/opensearch/sql/jdbc/**'
+
     // Enable logging output to console
     testLogging.showStandardStreams true
 
@@ -233,49 +508,90 @@ task comparisonTest(type: RestIntegTestTask) {
     systemProperty "queries", System.getProperty("queries")
 }
 
-task compileJdbc(type: Exec) {
-    workingDir '../sql-jdbc/'
-
-    if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
-        commandLine './gradlew.bat', 'build'
-        commandLine './gradlew.bat', 'shadowJar'
-    } else {
-        commandLine './gradlew', 'build'
-        commandLine './gradlew', 'shadowJar'
-    }
-}
-
-String bwcVersion = "1.1.0.0";
+String bwcMinVersion = "1.1.0.0"
+String bwcBundleVersion = "1.3.2.0"
+Boolean bwcBundleTest = (project.findProperty('customDistributionDownloadType') != null &&
+        project.properties['customDistributionDownloadType'] == "bundle");
+String bwcVersion = bwcBundleTest ? bwcBundleVersion : bwcMinVersion
+String currentVersion = opensearch_version.replace("-SNAPSHOT","")
 String baseName = "sqlBwcCluster"
-String bwcFilePath = "src/test/resources/bwc/"
 String bwcSqlPlugin = "opensearch-sql-" + bwcVersion + ".zip"
-String bwcRemoteFile = "https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930/linux/x64/builds/opensearch/plugins/" + bwcSqlPlugin
+String bwcJSPlugin = "opensearch-job-scheduler-" + bwcVersion + ".zip"
+String bwcRemoteFileRoot = "https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930/linux/x64/builds/opensearch/plugins/"
+String bwcRemoteFileSqlPlugin = bwcRemoteFileRoot + bwcSqlPlugin
+String bwcRemoteFileJSPlugin = bwcRemoteFileRoot + bwcJSPlugin
 
 2.times { i ->
     testClusters {
         "${baseName}$i" {
             testDistribution = "ARCHIVE"
-            versions = ["1.1.0", opensearch_version]
             numberOfNodes = 3
-            plugin(provider(new Callable<RegularFile>() {
-                @Override
-                RegularFile call() throws Exception {
-                    return new RegularFile() {
-                        @Override
-                        File getAsFile() {
-                            File dir = new File('./integ-test/' + bwcFilePath + bwcVersion)
-                            if (!dir.exists()) {
-                                dir.mkdirs()
+            if (bwcBundleTest) {
+                versions = ["1.3.2", currentVersion]
+                nodes.each { node ->
+                    node.extraConfigFile("kirk.pem", file("src/test/resources/security/kirk.pem"))
+                    node.extraConfigFile("kirk-key.pem", file("src/test/resources/security/kirk-key.pem"))
+                    node.extraConfigFile("esnode.pem", file("src/test/resources/security/esnode.pem"))
+                    node.extraConfigFile("esnode-key.pem", file("src/test/resources/security/esnode-key.pem"))
+                    node.extraConfigFile("root-ca.pem", file("src/test/resources/security/root-ca.pem"))
+                    node.setting("plugins.security.disabled", "true")
+                    node.setting("plugins.security.ssl.transport.pemcert_filepath", "esnode.pem")
+                    node.setting("plugins.security.ssl.transport.pemkey_filepath", "esnode-key.pem")
+                    node.setting("plugins.security.ssl.transport.pemtrustedcas_filepath", "root-ca.pem")
+                    node.setting("plugins.security.ssl.transport.enforce_hostname_verification", "false")
+                    node.setting("plugins.security.ssl.http.enabled", "true")
+                    node.setting("plugins.security.ssl.http.pemcert_filepath", "esnode.pem")
+                    node.setting("plugins.security.ssl.http.pemkey_filepath", "esnode-key.pem")
+                    node.setting("plugins.security.ssl.http.pemtrustedcas_filepath", "root-ca.pem")
+                    node.setting("plugins.security.allow_unsafe_democertificates", "true")
+                    node.setting("plugins.security.allow_default_init_securityindex", "true")
+                    node.setting("plugins.security.authcz.admin_dn", "CN=kirk,OU=client,O=client,L=test,C=de")
+                    node.setting("plugins.security.audit.type", "internal_elasticsearch")
+                    node.setting("plugins.security.enable_snapshot_restore_privilege", "true")
+                    node.setting("plugins.security.check_snapshot_restore_write_privileges", "true")
+                    node.setting("plugins.security.restapi.roles_enabled", "[\"all_access\", \"security_rest_api_access\"]")
+                    node.setting("plugins.security.system_indices.enabled", "true")
+                }
+            } else {
+                versions = ["1.1.0", opensearch_version]
+                plugin(provider(new Callable<RegularFile>(){
+                    @Override
+                    RegularFile call() throws Exception {
+                        return new RegularFile() {
+                            @Override
+                            File getAsFile() {
+                                if (new File("$project.rootDir/$bwcFilePath/job-scheduler/$bwcVersion").exists()) {
+                                    project.delete(files("$project.rootDir/$bwcFilePath/job-scheduler/$bwcVersion"))
+                                }
+                                project.mkdir bwcJSPluginPath + bwcVersion
+                                ant.get(src: bwcRemoteFileJSPlugin,
+                                        dest: bwcJSPluginPath + bwcVersion,
+                                        httpusecaches: false)
+                                return fileTree(bwcJSPluginPath + bwcVersion).getSingleFile()
                             }
-                            File f = new File(dir, bwcSqlPlugin)
-                            if (!f.exists()) {
-                                new URL(bwcRemoteFile).withInputStream{ ins -> f.withOutputStream{ it << ins }}
+                        }
+                    }
+                }))
+                plugin(provider(new Callable<RegularFile>() {
+                    @Override
+                    RegularFile call() throws Exception {
+                        return new RegularFile() {
+                            @Override
+                            File getAsFile() {
+                                File dir = new File('./integ-test/' + bwcFilePath + bwcVersion)
+                                if (!dir.exists()) {
+                                    dir.mkdirs()
+                                }
+                                File f = new File(dir, bwcSqlPlugin)
+                                if (!f.exists()) {
+                                    new URL(bwcRemoteFileSqlPlugin).withInputStream{ ins -> f.withOutputStream{ it << ins }}
+                                }
+                                return fileTree(bwcFilePath + bwcVersion).getSingleFile()
                             }
-                            return fileTree(bwcFilePath + bwcVersion).getSingleFile()
                         }
                     }
-                }
-            }))
+                }))
+            }
             setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
             setting 'http.content_type.required', 'true'
         }
@@ -283,17 +599,28 @@ String bwcRemoteFile = "https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/2021
 }
 
 List<Provider<RegularFile>> plugins = [
-    provider(new Callable<RegularFile>() {
-        @Override
-        RegularFile call() throws Exception {
-            return new RegularFile() {
-                @Override
-                File getAsFile() {
-                    return fileTree(bwcFilePath + project.version).getSingleFile()
+        provider(new Callable<RegularFile>(){
+            @Override
+            RegularFile call() throws Exception {
+                return new RegularFile() {
+                    @Override
+                    File getAsFile() {
+                        return configurations.zipArchive.asFileTree.getSingleFile()
+                    }
                 }
             }
-        }
-    })
+        }),
+        provider(new Callable<RegularFile>() {
+            @Override
+            RegularFile call() throws Exception {
+                return new RegularFile() {
+                    @Override
+                    File getAsFile() {
+                        return fileTree(bwcFilePath + project.version).getSingleFile()
+                    }
+                }
+            }
+        })
 ]
 
 // Creates 2 test clusters with 3 nodes of the old version.
@@ -317,8 +644,14 @@ List<Provider<RegularFile>> plugins = [
 task "${baseName}#mixedClusterTask"(type: StandaloneRestIntegTestTask) {
     useCluster testClusters."${baseName}0"
     dependsOn "${baseName}#oldVersionClusterTask0"
-    doFirst {
-        testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
+    if (bwcBundleTest){
+        doFirst {
+            testClusters."${baseName}0".nextNodeToNextVersion()
+        }
+    } else {
+        doFirst {
+            testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
+        }
     }
     filter {
         includeTestsMatching "org.opensearch.sql.bwc.*IT"
@@ -336,8 +669,14 @@ task "${baseName}#mixedClusterTask"(type: StandaloneRestIntegTestTask) {
 task "${baseName}#twoThirdsUpgradedClusterTask"(type: StandaloneRestIntegTestTask) {
     dependsOn "${baseName}#mixedClusterTask"
     useCluster testClusters."${baseName}0"
-    doFirst {
-        testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
+    if (bwcBundleTest){
+        doFirst {
+            testClusters."${baseName}0".nextNodeToNextVersion()
+        }
+    } else {
+        doFirst {
+            testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
+        }
     }
     filter {
         includeTestsMatching "org.opensearch.sql.bwc.*IT"
@@ -355,8 +694,14 @@ task "${baseName}#twoThirdsUpgradedClusterTask"(type: StandaloneRestIntegTestTas
 task "${baseName}#rollingUpgradeClusterTask"(type: StandaloneRestIntegTestTask) {
     dependsOn "${baseName}#twoThirdsUpgradedClusterTask"
     useCluster testClusters."${baseName}0"
-    doFirst {
-        testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
+    if (bwcBundleTest){
+        doFirst {
+            testClusters."${baseName}0".nextNodeToNextVersion()
+        }
+    } else {
+        doFirst {
+            testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
+        }
     }
     filter {
         includeTestsMatching "org.opensearch.sql.bwc.*IT"
@@ -374,8 +719,14 @@ task "${baseName}#rollingUpgradeClusterTask"(type: StandaloneRestIntegTestTask)
 task "${baseName}#fullRestartClusterTask"(type: StandaloneRestIntegTestTask) {
     dependsOn "${baseName}#oldVersionClusterTask1"
     useCluster testClusters."${baseName}1"
-    doFirst {
-        testClusters."${baseName}1".upgradeAllNodesAndPluginsToNextVersion(plugins)
+    if (bwcBundleTest){
+        doFirst {
+            testClusters."${baseName}1".goToNextVersion()
+        }
+    } else {
+        doFirst {
+            testClusters."${baseName}1".upgradeAllNodesAndPluginsToNextVersion(plugins)
+        }
     }
     filter {
         includeTestsMatching "org.opensearch.sql.bwc.*IT"
@@ -388,6 +739,9 @@ task "${baseName}#fullRestartClusterTask"(type: StandaloneRestIntegTestTask) {
 
 // A bwc test suite which runs all the bwc tasks combined
 task bwcTestSuite(type: StandaloneRestIntegTestTask) {
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
     exclude '**/*Test*'
     exclude '**/*IT*'
     dependsOn tasks.named("${baseName}#mixedClusterTask")
@@ -399,6 +753,9 @@ def opensearch_tmp_dir = rootProject.file('build/private/es_tmp').absoluteFile
 opensearch_tmp_dir.mkdirs()
 
 task integTestRemote(type: RestIntegTestTask) {
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
     testClassesDirs = sourceSets.test.output.classesDirs
     classpath = sourceSets.test.runtimeClasspath
     systemProperty 'tests.security.manager', 'false'
@@ -426,4 +783,5 @@ task integTestRemote(type: RestIntegTestTask) {
     exclude 'org/opensearch/sql/legacy/TermQueryExplainIT.class'
     exclude 'org/opensearch/sql/legacy/QueryAnalysisIT.class'
     exclude 'org/opensearch/sql/legacy/OrderIT.class'
+    exclude 'org/opensearch/sql/jdbc/**'
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/asyncquery/AsyncQueryIT.java b/integ-test/src/test/java/org/opensearch/sql/asyncquery/AsyncQueryIT.java
new file mode 100644
index 0000000000..c41a52b6fd
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/asyncquery/AsyncQueryIT.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.asyncquery;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.opensearch.sql.legacy.TestUtils.getResponseBody;
+
+import java.io.IOException;
+import java.util.Locale;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.client.Response;
+import org.opensearch.client.ResponseException;
+import org.opensearch.sql.ppl.PPLIntegTestCase;
+import org.opensearch.sql.util.TestUtils;
+
+public class AsyncQueryIT extends PPLIntegTestCase {
+
+  public static final String ASYNC_QUERY_ACTION_URL = "/_plugins/_async_query";
+
+  @Test
+  public void asyncQueryEnabledSettingsTest() throws IOException {
+    String setting = "plugins.query.executionengine.async_query.enabled";
+    // disable
+    updateClusterSettings(new ClusterSetting(PERSISTENT, setting, "false"));
+
+    String query = "select 1";
+    Response response = null;
+    try {
+      executeAsyncQueryToString(query);
+    } catch (ResponseException ex) {
+      response = ex.getResponse();
+    }
+
+    JSONObject result = new JSONObject(TestUtils.getResponseBody(response));
+    assertThat(result.getInt("status"), equalTo(400));
+    JSONObject error = result.getJSONObject("error");
+    assertThat(error.getString("reason"), equalTo("Invalid Request"));
+    assertThat(
+        error.getString("details"),
+        equalTo("plugins.query.executionengine.async_query.enabled setting is false"));
+    assertThat(error.getString("type"), equalTo("IllegalAccessException"));
+
+    // reset the setting
+    updateClusterSettings(new ClusterSetting(PERSISTENT, setting, null));
+  }
+
+  @Test
+  public void dataSourceDisabledSettingsTest() throws IOException {
+    String setting = "plugins.query.datasources.enabled";
+    // disable
+    updateClusterSettings(new ClusterSetting(PERSISTENT, setting, "false"));
+
+    String query = "select 1";
+    Response response = null;
+    try {
+      executeAsyncQueryToString(query);
+    } catch (ResponseException ex) {
+      response = ex.getResponse();
+    }
+
+    JSONObject result = new JSONObject(TestUtils.getResponseBody(response));
+    assertThat(result.getInt("status"), equalTo(400));
+    JSONObject error = result.getJSONObject("error");
+    assertThat(error.getString("reason"), equalTo("Invalid Request"));
+    assertThat(
+        error.getString("details"), equalTo("plugins.query.datasources.enabled setting is false"));
+    assertThat(error.getString("type"), equalTo("IllegalAccessException"));
+
+    // reset the setting
+    updateClusterSettings(new ClusterSetting(PERSISTENT, setting, null));
+  }
+
+  protected String executeAsyncQueryToString(String query) throws IOException {
+    Response response = client().performRequest(buildAsyncRequest(query, ASYNC_QUERY_ACTION_URL));
+    Assert.assertEquals(200, response.getStatusLine().getStatusCode());
+    return getResponseBody(response, true);
+  }
+
+  protected Request buildAsyncRequest(String query, String endpoint) {
+    Request request = new Request("POST", endpoint);
+    request.setJsonEntity(String.format(Locale.ROOT, "{\n" + "  \"query\": \"%s\"\n" + "}", query));
+    request.setJsonEntity(
+        String.format(
+            Locale.ROOT,
+            "{\n"
+                + "  \"datasource\": \"mys3\",\n"
+                + "  \"lang\": \"sql\",\n"
+                + "  \"query\": \"%s\"\n"
+                + "}",
+            query));
+
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+    return request;
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/bwc/SQLBackwardsCompatibilityIT.java b/integ-test/src/test/java/org/opensearch/sql/bwc/SQLBackwardsCompatibilityIT.java
index c32a3336c0..dff9aa262e 100644
--- a/integ-test/src/test/java/org/opensearch/sql/bwc/SQLBackwardsCompatibilityIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/bwc/SQLBackwardsCompatibilityIT.java
@@ -3,27 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.bwc;
 
-
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.opensearch.client.Request;
-import org.opensearch.client.RequestOptions;
-import org.opensearch.client.Response;
-import org.opensearch.common.settings.Settings;
-import org.opensearch.sql.legacy.SQLIntegTestCase;
-import org.opensearch.sql.legacy.TestsConstants;
-import org.opensearch.test.rest.OpenSearchRestTestCase;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import static org.opensearch.sql.legacy.TestUtils.createIndexByRestClient;
 import static org.opensearch.sql.legacy.TestUtils.isIndexExist;
 import static org.opensearch.sql.legacy.TestUtils.loadDataByRestClient;
@@ -36,179 +17,207 @@
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 import static org.opensearch.sql.util.TestUtils.getResponseBody;
 
-public class SQLBackwardsCompatibilityIT extends SQLIntegTestCase {
-
-    private static final ClusterType CLUSTER_TYPE = ClusterType.parse(System.getProperty("tests.rest.bwcsuite"));
-    private static final String CLUSTER_NAME = System.getProperty("tests.clustername");
-
-    @Override
-    protected final boolean preserveIndicesUponCompletion() {
-        return true;
-    }
-
-    @Override
-    protected final boolean preserveReposUponCompletion() {
-        return true;
-    }
-
-    @Override
-    protected boolean preserveTemplatesUponCompletion() {
-        return true;
-    }
+import java.io.IOException;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.opensearch.client.Request;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.client.Response;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+import org.opensearch.sql.legacy.TestsConstants;
+import org.opensearch.test.rest.OpenSearchRestTestCase;
 
-    @Override
-    protected final Settings restClientSettings() {
-        return Settings
-                .builder()
-                .put(super.restClientSettings())
-                // increase the timeout here to 90 seconds to handle long waits for a green
-                // cluster health. the waits for green need to be longer than a minute to
-                // account for delayed shards
-                .put(OpenSearchRestTestCase.CLIENT_SOCKET_TIMEOUT, "90s")
-                .build();
-    }
+public class SQLBackwardsCompatibilityIT extends SQLIntegTestCase {
 
-    private enum ClusterType {
-        OLD,
-        MIXED,
-        UPGRADED;
-
-        public static ClusterType parse(String value) {
-            switch (value) {
-                case "old_cluster":
-                    return OLD;
-                case "mixed_cluster":
-                    return MIXED;
-                case "upgraded_cluster":
-                    return UPGRADED;
-                default:
-                    throw new AssertionError("unknown cluster type: " + value);
-            }
-        }
+  private static final ClusterType CLUSTER_TYPE =
+      ClusterType.parse(System.getProperty("tests.rest.bwcsuite"));
+  private static final String CLUSTER_NAME = System.getProperty("tests.clustername");
+
+  @Override
+  protected final boolean preserveIndicesUponCompletion() {
+    return true;
+  }
+
+  @Override
+  protected final boolean preserveReposUponCompletion() {
+    return true;
+  }
+
+  @Override
+  protected boolean preserveTemplatesUponCompletion() {
+    return true;
+  }
+
+  @Override
+  protected final Settings restClientSettings() {
+    return Settings.builder()
+        .put(super.restClientSettings())
+        // increase the timeout here to 90 seconds to handle long waits for a green
+        // cluster health. the waits for green need to be longer than a minute to
+        // account for delayed shards
+        .put(OpenSearchRestTestCase.CLIENT_SOCKET_TIMEOUT, "90s")
+        .build();
+  }
+
+  private enum ClusterType {
+    OLD,
+    MIXED,
+    UPGRADED;
+
+    public static ClusterType parse(String value) {
+      switch (value) {
+        case "old_cluster":
+          return OLD;
+        case "mixed_cluster":
+          return MIXED;
+        case "upgraded_cluster":
+          return UPGRADED;
+        default:
+          throw new AssertionError("unknown cluster type: " + value);
+      }
     }
-
-    @SuppressWarnings("unchecked")
-    public void testBackwardsCompatibility() throws Exception {
-        String uri = getUri();
-        Map<String, Map<String, Object>> responseMap = (Map<String, Map<String, Object>>) getAsMap(uri).get("nodes");
-        for (Map<String, Object> response : responseMap.values()) {
-            List<Map<String, Object>> plugins = (List<Map<String, Object>>) response.get("plugins");
-            Set<Object> pluginNames = plugins.stream().map(map -> map.get("name")).collect(Collectors.toSet());
-            switch (CLUSTER_TYPE) {
-                case OLD:
-                    Assert.assertTrue(pluginNames.contains("opensearch-sql"));
-                    updateLegacySQLSettings();
-                    loadIndex(Index.ACCOUNT);
-                    verifySQLQueries(LEGACY_QUERY_API_ENDPOINT);
-                    break;
-                case MIXED:
-                    Assert.assertTrue(pluginNames.contains("opensearch-sql"));
-                    verifySQLSettings();
-                    verifySQLQueries(LEGACY_QUERY_API_ENDPOINT);
-                    break;
-                case UPGRADED:
-                    Assert.assertTrue(pluginNames.contains("opensearch-sql"));
-                    verifySQLSettings();
-                    verifySQLQueries(QUERY_API_ENDPOINT);
-                    break;
-            }
-            break;
-        }
+  }
+
+  @SuppressWarnings("unchecked")
+  public void testBackwardsCompatibility() throws Exception {
+    String uri = getUri();
+    Map<String, Map<String, Object>> responseMap =
+        (Map<String, Map<String, Object>>) getAsMap(uri).get("nodes");
+    for (Map<String, Object> response : responseMap.values()) {
+      List<Map<String, Object>> plugins = (List<Map<String, Object>>) response.get("plugins");
+      Set<Object> pluginNames =
+          plugins.stream().map(map -> map.get("name")).collect(Collectors.toSet());
+      switch (CLUSTER_TYPE) {
+        case OLD:
+          Assert.assertTrue(pluginNames.contains("opensearch-sql"));
+          updateLegacySQLSettings();
+          loadIndex(Index.ACCOUNT);
+          verifySQLQueries(LEGACY_QUERY_API_ENDPOINT);
+          break;
+        case MIXED:
+          Assert.assertTrue(pluginNames.contains("opensearch-sql"));
+          verifySQLSettings();
+          verifySQLQueries(LEGACY_QUERY_API_ENDPOINT);
+          break;
+        case UPGRADED:
+          Assert.assertTrue(pluginNames.contains("opensearch-sql"));
+          verifySQLSettings();
+          verifySQLQueries(QUERY_API_ENDPOINT);
+          break;
+      }
+      break;
     }
-
-    private String getUri() {
-        switch (CLUSTER_TYPE) {
-            case OLD:
-                return "_nodes/" + CLUSTER_NAME + "-0/plugins";
-            case MIXED:
-                String round = System.getProperty("tests.rest.bwcsuite_round");
-                if (round.equals("second")) {
-                    return "_nodes/" + CLUSTER_NAME + "-1/plugins";
-                } else if (round.equals("third")) {
-                    return "_nodes/" + CLUSTER_NAME + "-2/plugins";
-                } else {
-                    return "_nodes/" + CLUSTER_NAME + "-0/plugins";
-                }
-            case UPGRADED:
-                return "_nodes/plugins";
-            default:
-                throw new AssertionError("unknown cluster type: " + CLUSTER_TYPE);
+  }
+
+  private String getUri() {
+    switch (CLUSTER_TYPE) {
+      case OLD:
+        return "_nodes/" + CLUSTER_NAME + "-0/plugins";
+      case MIXED:
+        String round = System.getProperty("tests.rest.bwcsuite_round");
+        if (round.equals("second")) {
+          return "_nodes/" + CLUSTER_NAME + "-1/plugins";
+        } else if (round.equals("third")) {
+          return "_nodes/" + CLUSTER_NAME + "-2/plugins";
+        } else {
+          return "_nodes/" + CLUSTER_NAME + "-0/plugins";
         }
+      case UPGRADED:
+        return "_nodes/plugins";
+      default:
+        throw new AssertionError("unknown cluster type: " + CLUSTER_TYPE);
     }
-
-    private void updateLegacySQLSettings() throws IOException {
-        Request request = new Request("PUT", LEGACY_SQL_SETTINGS_API_ENDPOINT);
-        request.setJsonEntity(String.format(Locale.ROOT, "{\n" +
-                "  \"persistent\" : {\n" +
-                "    \"%s\" : \"%s\"\n" +
-                "  }\n" +
-                "}", "opendistro.sql.cursor.keep_alive", "7m"));
-
-        RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
-        restOptionsBuilder.addHeader("Content-Type", "application/json");
-        request.setOptions(restOptionsBuilder);
-
-        Response response = client().performRequest(request);
-        JSONObject jsonObject = new JSONObject(getResponseBody(response));
-        Assert.assertTrue((boolean) jsonObject.get("acknowledged"));
-    }
-
-    private void verifySQLSettings() throws IOException {
-        Request request = new Request("GET", "_cluster/settings?flat_settings");
-
-        RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
-        restOptionsBuilder.addHeader("Content-Type", "application/json");
-        request.setOptions(restOptionsBuilder);
-
-        Response response = client().performRequest(request);
-        JSONObject jsonObject = new JSONObject(getResponseBody(response));
-        Assert.assertEquals("{\"transient\":{},\"persistent\":{\"opendistro.sql.cursor.keep_alive\":\"7m\"}}", jsonObject.toString());
-    }
-
-    private void verifySQLQueries(String endpoint) throws IOException {
-        JSONObject filterResponse = executeSQLQuery(endpoint, "SELECT COUNT(*) FILTER(WHERE age > 35) FROM " + TestsConstants.TEST_INDEX_ACCOUNT);
-        verifySchema(filterResponse, schema("COUNT(*) FILTER(WHERE age > 35)", null, "integer"));
-        verifyDataRows(filterResponse, rows(238));
-
-        JSONObject aggResponse = executeSQLQuery(endpoint, "SELECT COUNT(DISTINCT age) FROM " + TestsConstants.TEST_INDEX_ACCOUNT);
-        verifySchema(aggResponse, schema("COUNT(DISTINCT age)", null, "integer"));
-        verifyDataRows(aggResponse, rows(21));
-
-        JSONObject groupByResponse = executeSQLQuery(endpoint, "select a.gender from " + TestsConstants.TEST_INDEX_ACCOUNT + " a group by a.gender having count(*) > 0");
-        verifySchema(groupByResponse, schema("gender", null, "text"));
-        Assert.assertEquals("[[\"F\"],[\"M\"]]", groupByResponse.getJSONArray("datarows").toString());
+  }
+
+  private void updateLegacySQLSettings() throws IOException {
+    Request request = new Request("PUT", LEGACY_SQL_SETTINGS_API_ENDPOINT);
+    request.setJsonEntity(
+        String.format(
+            Locale.ROOT,
+            "{\n" + "  \"persistent\" : {\n" + "    \"%s\" : \"%s\"\n" + "  }\n" + "}",
+            "opendistro.sql.cursor.keep_alive",
+            "7m"));
+
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+
+    Response response = client().performRequest(request);
+    JSONObject jsonObject = new JSONObject(getResponseBody(response));
+    Assert.assertTrue((boolean) jsonObject.get("acknowledged"));
+  }
+
+  private void verifySQLSettings() throws IOException {
+    Request request = new Request("GET", "_cluster/settings?flat_settings");
+
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+
+    Response response = client().performRequest(request);
+    JSONObject jsonObject = new JSONObject(getResponseBody(response));
+    Assert.assertEquals(
+        "{\"transient\":{},\"persistent\":{\"opendistro.sql.cursor.keep_alive\":\"7m\"}}",
+        jsonObject.toString());
+  }
+
+  private void verifySQLQueries(String endpoint) throws IOException {
+    JSONObject filterResponse =
+        executeSQLQuery(
+            endpoint,
+            "SELECT COUNT(*) FILTER(WHERE age > 35) FROM " + TestsConstants.TEST_INDEX_ACCOUNT);
+    verifySchema(filterResponse, schema("COUNT(*) FILTER(WHERE age > 35)", null, "integer"));
+    verifyDataRows(filterResponse, rows(238));
+
+    JSONObject aggResponse =
+        executeSQLQuery(
+            endpoint, "SELECT COUNT(DISTINCT age) FROM " + TestsConstants.TEST_INDEX_ACCOUNT);
+    verifySchema(aggResponse, schema("COUNT(DISTINCT age)", null, "integer"));
+    verifyDataRows(aggResponse, rows(21));
+
+    JSONObject groupByResponse =
+        executeSQLQuery(
+            endpoint,
+            "select a.gender from "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " a group by a.gender having count(*) > 0");
+    verifySchema(groupByResponse, schema("gender", null, "text"));
+    Assert.assertEquals("[[\"F\"],[\"M\"]]", groupByResponse.getJSONArray("datarows").toString());
+  }
+
+  private JSONObject executeSQLQuery(String endpoint, String query) throws IOException {
+    Request request = new Request("POST", endpoint);
+    request.setJsonEntity(String.format(Locale.ROOT, "{" + "  \"query\" : \"%s\"" + "}", query));
+
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+
+    Response response = client().performRequest(request);
+    return new JSONObject(getResponseBody(response));
+  }
+
+  @Override
+  public boolean shouldResetQuerySizeLimit() {
+    return false;
+  }
+
+  @Override
+  protected synchronized void loadIndex(Index index) throws IOException {
+    String indexName = index.getName();
+    String mapping = index.getMapping();
+    // current directory becomes 'integ-test/build/testrun/sqlBwcCluster#<task>' during bwc
+    String dataSet = "../../../" + index.getDataSet();
+
+    if (!isIndexExist(client(), indexName)) {
+      createIndexByRestClient(client(), indexName, mapping);
+      loadDataByRestClient(client(), indexName, dataSet);
     }
-
-    private JSONObject executeSQLQuery(String endpoint, String query) throws IOException {
-        Request request = new Request("POST", endpoint);
-        request.setJsonEntity(String.format(Locale.ROOT, "{" +
-                "  \"query\" : \"%s\"" +
-                "}", query));
-
-        RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
-        restOptionsBuilder.addHeader("Content-Type", "application/json");
-        request.setOptions(restOptionsBuilder);
-
-        Response response = client().performRequest(request);
-        return new JSONObject(getResponseBody(response));
-    }
-
-    @Override
-    public boolean shouldResetQuerySizeLimit() {
-        return false;
-    }
-
-    @Override
-    protected synchronized void loadIndex(Index index) throws IOException {
-        String indexName = index.getName();
-        String mapping = index.getMapping();
-        // current directory becomes 'integ-test/build/testrun/sqlBwcCluster#<task>' during bwc
-        String dataSet = "../../../" + index.getDataSet();
-
-        if (!isIndexExist(client(), indexName)) {
-            createIndexByRestClient(client(), indexName, mapping);
-            loadDataByRestClient(client(), indexName, dataSet);
-        }
-    }
-
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/CorrectnessIT.java b/integ-test/src/test/java/org/opensearch/sql/correctness/CorrectnessIT.java
index a6f3e561b3..bd4c603362 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/CorrectnessIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/CorrectnessIT.java
@@ -3,14 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness;
 
 import static org.opensearch.sql.util.TestUtils.getResourceFilePath;
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import com.google.common.collect.Maps;
-
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -32,11 +30,12 @@
 import org.opensearch.sql.correctness.testset.TestDataSet;
 import org.opensearch.test.OpenSearchIntegTestCase;
 
-/**
- * Correctness integration test by performing comparison test with other databases.
- */
+/** Correctness integration test by performing comparison test with other databases. */
 @OpenSearchIntegTestCase.SuiteScopeTestCase
-@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE, numDataNodes = 3, supportsDedicatedMasters = false)
+@OpenSearchIntegTestCase.ClusterScope(
+    scope = OpenSearchIntegTestCase.Scope.SUITE,
+    numDataNodes = 3,
+    supportsDedicatedMasters = false)
 @ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class CorrectnessIT extends OpenSearchIntegTestCase {
 
@@ -47,8 +46,8 @@ public void performComparisonTest() {
     TestConfig config = new TestConfig(getCmdLineArgs());
     LOG.info("Starting comparison test {}", config);
 
-    try (ComparisonTest test = new ComparisonTest(getThisDBConnection(config),
-        getOtherDBConnections(config))) {
+    try (ComparisonTest test =
+        new ComparisonTest(getThisDBConnection(config), getOtherDBConnections(config))) {
       LOG.info("Loading test data set...");
       test.connect();
       for (TestDataSet dataSet : config.getTestDataSets()) {
@@ -81,9 +80,7 @@ private DBConnection getThisDBConnection(TestConfig config) {
     return new JDBCConnection("DB Tested", dbUrl);
   }
 
-  /**
-   * Use OpenSearch cluster given on CLI arg or internal embedded in SQLIntegTestCase
-   */
+  /** Use OpenSearch cluster given on CLI arg or internal embedded in SQLIntegTestCase */
   private DBConnection getOpenSearchConnection(TestConfig config) {
     RestClient client;
     String openSearchHost = config.getOpenSearchHostUrl();
@@ -96,14 +93,11 @@ private DBConnection getOpenSearchConnection(TestConfig config) {
     return new OpenSearchConnection("jdbc:opensearch://" + openSearchHost, client);
   }
 
-  /**
-   * Create database connection with database name and connect URL
-   */
+  /** Create database connection with database name and connect URL */
   private DBConnection[] getOtherDBConnections(TestConfig config) {
-    return config.getOtherDbConnectionNameAndUrls().
-        entrySet().stream().
-        map(e -> new JDBCConnection(e.getKey(), e.getValue())).
-        toArray(DBConnection[]::new);
+    return config.getOtherDbConnectionNameAndUrls().entrySet().stream()
+        .map(e -> new JDBCConnection(e.getKey(), e.getValue()))
+        .toArray(DBConnection[]::new);
   }
 
   private void store(TestReport report) {
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/TestConfig.java b/integ-test/src/test/java/org/opensearch/sql/correctness/TestConfig.java
index d344c29e20..0dd96c8678 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/TestConfig.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/TestConfig.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness;
 
 import static java.util.stream.Collectors.joining;
@@ -19,11 +18,8 @@
 import org.opensearch.sql.legacy.utils.StringUtils;
 
 /**
- * Test configuration parse the following information from command line arguments:
- * 1) Test schema and data
- * 2) Test queries
- * 3) OpenSearch connection URL
- * 4) Other database connection URLs
+ * Test configuration parse the following information from command line arguments: 1) Test schema
+ * and data 2) Test queries 3) OpenSearch connection URL 4) Other database connection URLs
  */
 public class TestConfig {
 
@@ -37,9 +33,7 @@ public class TestConfig {
 
   private final String openSearchHostUrl;
 
-  /**
-   * Test against some database rather than OpenSearch via our JDBC driver
-   */
+  /** Test against some database rather than OpenSearch via our JDBC driver */
   private final String dbConnectionUrl;
 
   private final Map<String, String> otherDbConnectionNameAndUrls = new HashMap<>();
@@ -75,12 +69,14 @@ public Map<String, String> getOtherDbConnectionNameAndUrls() {
 
   private TestDataSet[] buildDefaultTestDataSet() {
     return new TestDataSet[] {
-        new TestDataSet("opensearch_dashboards_sample_data_flights",
-            readFile("opensearch_dashboards_sample_data_flights.json"),
-            readFile("opensearch_dashboards_sample_data_flights.csv")),
-        new TestDataSet("opensearch_dashboards_sample_data_ecommerce",
-            readFile("opensearch_dashboards_sample_data_ecommerce.json"),
-            readFile("opensearch_dashboards_sample_data_ecommerce.csv")),
+      new TestDataSet(
+          "opensearch_dashboards_sample_data_flights",
+          readFile("opensearch_dashboards_sample_data_flights.json"),
+          readFile("opensearch_dashboards_sample_data_flights.csv")),
+      new TestDataSet(
+          "opensearch_dashboards_sample_data_ecommerce",
+          readFile("opensearch_dashboards_sample_data_ecommerce.json"),
+          readFile("opensearch_dashboards_sample_data_ecommerce.csv")),
     };
   }
 
@@ -118,31 +114,37 @@ private static String readFile(String relativePath) {
   @Override
   public String toString() {
     return "\n=================================\n"
-        + "Tested Database  : " + openSearchHostUrlToString() + '\n'
-        + "Other Databases  :\n" + otherDbConnectionInfoToString() + '\n'
-        + "Test data set(s) :\n" + testDataSetsToString() + '\n'
-        + "Test query set   : " + testQuerySet + '\n'
+        + "Tested Database  : "
+        + openSearchHostUrlToString()
+        + '\n'
+        + "Other Databases  :\n"
+        + otherDbConnectionInfoToString()
+        + '\n'
+        + "Test data set(s) :\n"
+        + testDataSetsToString()
+        + '\n'
+        + "Test query set   : "
+        + testQuerySet
+        + '\n'
         + "=================================\n";
   }
 
   private String testDataSetsToString() {
-    return Arrays.stream(testDataSets).
-        map(TestDataSet::toString).
-        collect(joining("\n"));
+    return Arrays.stream(testDataSets).map(TestDataSet::toString).collect(joining("\n"));
   }
 
   private String openSearchHostUrlToString() {
     if (!dbConnectionUrl.isEmpty()) {
       return dbConnectionUrl;
     }
-    return openSearchHostUrl.isEmpty() ? "(Use internal OpenSearch in workspace)" :
-        openSearchHostUrl;
+    return openSearchHostUrl.isEmpty()
+        ? "(Use internal OpenSearch in workspace)"
+        : openSearchHostUrl;
   }
 
   private String otherDbConnectionInfoToString() {
-    return otherDbConnectionNameAndUrls.entrySet().stream().
-        map(e -> StringUtils.format(" %s = %s", e.getKey(), e.getValue())).
-        collect(joining("\n"));
+    return otherDbConnectionNameAndUrls.entrySet().stream()
+        .map(e -> StringUtils.format(" %s = %s", e.getKey(), e.getValue()))
+        .collect(joining("\n"));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/report/ErrorTestCase.java b/integ-test/src/test/java/org/opensearch/sql/correctness/report/ErrorTestCase.java
index cb13a01f98..1d69ff10ee 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/report/ErrorTestCase.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/report/ErrorTestCase.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.report;
 
 import static org.opensearch.sql.correctness.report.TestCaseReport.TestResult.FAILURE;
@@ -12,22 +11,17 @@
 import lombok.Getter;
 import lombok.ToString;
 
-/**
- * Report for test case that ends with an error.
- */
+/** Report for test case that ends with an error. */
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Getter
 public class ErrorTestCase extends TestCaseReport {
 
-  /**
-   * Root cause of the error
-   */
+  /** Root cause of the error */
   private final String reason;
 
   public ErrorTestCase(int id, String sql, String reason) {
     super(id, sql, FAILURE);
     this.reason = reason;
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/report/FailedTestCase.java b/integ-test/src/test/java/org/opensearch/sql/correctness/report/FailedTestCase.java
index 86693b98e9..2b5ab431e4 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/report/FailedTestCase.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/report/FailedTestCase.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.report;
 
 import static org.opensearch.sql.correctness.report.TestCaseReport.TestResult.FAILURE;
@@ -16,30 +15,21 @@
 import lombok.ToString;
 import org.opensearch.sql.correctness.runner.resultset.DBResult;
 
-/**
- * Report for test case that fails due to inconsistent result set.
- */
+/** Report for test case that fails due to inconsistent result set. */
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Getter
 public class FailedTestCase extends TestCaseReport {
 
-  /**
-   * Inconsistent result sets for reporting
-   */
+  /** Inconsistent result sets for reporting */
   private final List<DBResult> resultSets;
 
-  /**
-   * Explain where the difference is caused the test failure.
-   */
+  /** Explain where the difference is caused the test failure. */
   private final String explain;
 
-  /**
-   * Errors occurred for partial other databases.
-   */
+  /** Errors occurred for partial other databases. */
   private final String errors;
 
-
   public FailedTestCase(int id, String sql, List<DBResult> resultSets, String errors) {
     super(id, sql, FAILURE);
     this.resultSets = resultSets;
@@ -47,10 +37,9 @@ public FailedTestCase(int id, String sql, List<DBResult> resultSets, String erro
     this.errors = errors;
 
     // Generate explanation by diff the first result with remaining
-    this.explain = resultSets.subList(1, resultSets.size())
-                             .stream()
-                             .map(result -> resultSets.get(0).diff(result))
-                             .collect(Collectors.joining(", "));
+    this.explain =
+        resultSets.subList(1, resultSets.size()).stream()
+            .map(result -> resultSets.get(0).diff(result))
+            .collect(Collectors.joining(", "));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/report/SuccessTestCase.java b/integ-test/src/test/java/org/opensearch/sql/correctness/report/SuccessTestCase.java
index 62cd9b3fbe..8ec996e660 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/report/SuccessTestCase.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/report/SuccessTestCase.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.report;
 
 import static org.opensearch.sql.correctness.report.TestCaseReport.TestResult.SUCCESS;
@@ -12,9 +11,7 @@
 import lombok.Getter;
 import lombok.ToString;
 
-/**
- * Report for successful test case result.
- */
+/** Report for successful test case result. */
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Getter
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestCaseReport.java b/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestCaseReport.java
index 1a6285c52e..7567e9cd6a 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestCaseReport.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestCaseReport.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.report;
 
 import static org.opensearch.sql.correctness.report.TestCaseReport.TestResult.SUCCESS;
@@ -12,22 +11,19 @@
 import lombok.Getter;
 import lombok.ToString;
 
-/**
- * Base class for different test result.
- */
+/** Base class for different test result. */
 @EqualsAndHashCode
 @ToString
 public abstract class TestCaseReport {
 
   public enum TestResult {
-    SUCCESS, FAILURE;
+    SUCCESS,
+    FAILURE;
   }
 
-  @Getter
-  private final int id;
+  @Getter private final int id;
 
-  @Getter
-  private final String sql;
+  @Getter private final String sql;
 
   private final TestResult result;
 
@@ -40,5 +36,4 @@ public TestCaseReport(int id, String sql, TestResult result) {
   public String getResult() {
     return result == SUCCESS ? "Success" : "Failed";
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestReport.java b/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestReport.java
index 88b23ccd5b..9b9b3b7a23 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestReport.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestReport.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.report;
 
 import java.util.ArrayList;
@@ -12,9 +11,7 @@
 import lombok.Getter;
 import lombok.ToString;
 
-/**
- * Test report class to generate JSON report.
- */
+/** Test report class to generate JSON report. */
 @EqualsAndHashCode
 @ToString
 @Getter
@@ -37,5 +34,4 @@ public void addTestCase(TestCaseReport testCase) {
       summary.addFailure();
     }
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestSummary.java b/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestSummary.java
index 90767582b5..bbd4385460 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestSummary.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestSummary.java
@@ -3,16 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.report;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 
-/**
- * Test summary section.
- */
+/** Test summary section. */
 @EqualsAndHashCode
 @ToString
 @Getter
@@ -33,5 +30,4 @@ public void addFailure() {
     failure++;
     total++;
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/ComparisonTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/ComparisonTest.java
index 129bc70426..1fee41f1fe 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/ComparisonTest.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/ComparisonTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.runner;
 
 import static com.google.common.collect.ObjectArrays.concat;
@@ -25,24 +24,16 @@
 import org.opensearch.sql.correctness.testset.TestQuerySet;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-/**
- * Comparison test runner for query result correctness.
- */
+/** Comparison test runner for query result correctness. */
 public class ComparisonTest implements AutoCloseable {
 
-  /**
-   * Next id for test case
-   */
+  /** Next id for test case */
   private int testCaseId = 1;
 
-  /**
-   * Connection for database being tested
-   */
+  /** Connection for database being tested */
   private final DBConnection thisConnection;
 
-  /**
-   * Database connections for reference databases
-   */
+  /** Database connections for reference databases */
   private final DBConnection[] otherDbConnections;
 
   public ComparisonTest(DBConnection thisConnection, DBConnection[] otherDbConnections) {
@@ -53,9 +44,7 @@ public ComparisonTest(DBConnection thisConnection, DBConnection[] otherDbConnect
     Arrays.sort(this.otherDbConnections, Comparator.comparing(DBConnection::getDatabaseName));
   }
 
-  /**
-   * Open database connection.
-   */
+  /** Open database connection. */
   public void connect() {
     for (DBConnection conn : concat(thisConnection, otherDbConnections)) {
       conn.connect();
@@ -87,8 +76,11 @@ public TestReport verify(TestQuerySet querySet) {
         DBResult openSearchResult = thisConnection.select(sql);
         report.addTestCase(compareWithOtherDb(sql, openSearchResult));
       } catch (Exception e) {
-        report.addTestCase(new ErrorTestCase(nextId(), sql,
-            StringUtils.format("%s: %s", e.getClass().getSimpleName(), extractRootCause(e))));
+        report.addTestCase(
+            new ErrorTestCase(
+                nextId(),
+                sql,
+                StringUtils.format("%s: %s", e.getClass().getSimpleName(), extractRootCause(e))));
       }
     }
     return report;
@@ -116,9 +108,7 @@ public void close() {
     }
   }
 
-  /**
-   * Execute the query and compare with current result
-   */
+  /** Execute the query and compare with current result */
   private TestCaseReport compareWithOtherDb(String sql, DBResult openSearchResult) {
     List<DBResult> mismatchResults = Lists.newArrayList(openSearchResult);
     StringBuilder reasons = new StringBuilder();
@@ -137,7 +127,8 @@ private TestCaseReport compareWithOtherDb(String sql, DBResult openSearchResult)
       }
     }
 
-    if (mismatchResults.size() == 1) { // Only OpenSearch result on list. Cannot find other database support this query
+    if (mismatchResults.size()
+        == 1) { // Only OpenSearch result on list. Cannot find other database support this query
       return new ErrorTestCase(nextId(), sql, "No other databases support this query: " + reasons);
     }
     return new FailedTestCase(nextId(), sql, mismatchResults, reasons.toString());
@@ -150,8 +141,8 @@ private int nextId() {
   private void insertTestDataInBatch(DBConnection conn, String tableName, List<Object[]> testData) {
     Iterator<Object[]> iterator = testData.iterator();
     String[] fieldNames = (String[]) iterator.next(); // first row is header of column names
-    Iterators.partition(iterator, 100).
-        forEachRemaining(batch -> conn.insert(tableName, fieldNames, batch));
+    Iterators.partition(iterator, 100)
+        .forEachRemaining(batch -> conn.insert(tableName, fieldNames, batch));
   }
 
   private String extractRootCause(Throwable e) {
@@ -167,5 +158,4 @@ private String extractRootCause(Throwable e) {
     }
     return e.toString();
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/DBConnection.java b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/DBConnection.java
index a475428735..b01762fd21 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/DBConnection.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/DBConnection.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.runner.connection;
 
 import java.util.List;
 import org.opensearch.sql.correctness.runner.resultset.DBResult;
 
-/**
- * Abstraction for different databases.
- */
+/** Abstraction for different databases. */
 public interface DBConnection {
 
   /**
@@ -19,25 +16,23 @@ public interface DBConnection {
    */
   String getDatabaseName();
 
-  /**
-   * Connect to database by opening a connection.
-   */
+  /** Connect to database by opening a connection. */
   void connect();
 
   /**
    * Create table with the schema.
    *
    * @param tableName table name
-   * @param schema    schema json in OpenSearch mapping format
+   * @param schema schema json in OpenSearch mapping format
    */
   void create(String tableName, String schema);
 
   /**
    * Insert batch of data to database.
    *
-   * @param tableName   table name
+   * @param tableName table name
    * @param columnNames column names
-   * @param batch       batch of rows
+   * @param batch batch of rows
    */
   void insert(String tableName, String[] columnNames, List<Object[]> batch);
 
@@ -56,9 +51,6 @@ public interface DBConnection {
    */
   void drop(String tableName);
 
-  /**
-   * Close the database connection.
-   */
+  /** Close the database connection. */
   void close();
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/JDBCConnection.java b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/JDBCConnection.java
index d2d7d2aee6..7a67022117 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/JDBCConnection.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/JDBCConnection.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.runner.connection;
 
 import static java.util.stream.Collectors.joining;
@@ -23,33 +22,23 @@
 import org.opensearch.sql.correctness.runner.resultset.Row;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-/**
- * Database connection by JDBC driver.
- */
+/** Database connection by JDBC driver. */
 public class JDBCConnection implements DBConnection {
 
   private static final String SINGLE_QUOTE = "'";
   private static final String DOUBLE_QUOTE = "''";
   private static final String BACKTICK = "`";
 
-  /**
-   * Database name for display
-   */
+  /** Database name for display */
   private final String databaseName;
 
-  /**
-   * Database connection URL
-   */
+  /** Database connection URL */
   private final String connectionUrl;
 
-  /**
-   * JDBC driver config properties.
-   */
+  /** JDBC driver config properties. */
   private final Properties properties;
 
-  /**
-   * Current live connection
-   */
+  /** Current live connection */
   private Connection connection;
 
   public JDBCConnection(String databaseName, String connectionUrl) {
@@ -58,9 +47,10 @@ public JDBCConnection(String databaseName, String connectionUrl) {
 
   /**
    * Create a JDBC connection with parameters given (but not connect to database at the moment).
-   * @param databaseName    database name
-   * @param connectionUrl   connection URL
-   * @param properties      config properties
+   *
+   * @param databaseName database name
+   * @param connectionUrl connection URL
+   * @param properties config properties
    */
   public JDBCConnection(String databaseName, String connectionUrl, Properties properties) {
     this.databaseName = databaseName;
@@ -104,11 +94,11 @@ public void drop(String tableName) {
   @Override
   public void insert(String tableName, String[] columnNames, List<Object[]> batch) {
     try (Statement stmt = connection.createStatement()) {
-      String names =
-          Arrays.stream(columnNames).map(this::delimited).collect(joining(","));
+      String names = Arrays.stream(columnNames).map(this::delimited).collect(joining(","));
       for (Object[] fieldValues : batch) {
-        stmt.addBatch(StringUtils.format(
-            "INSERT INTO %s(%s) VALUES (%s)", tableName, names, getValueList(fieldValues)));
+        stmt.addBatch(
+            StringUtils.format(
+                "INSERT INTO %s(%s) VALUES (%s)", tableName, names, getValueList(fieldValues)));
       }
       stmt.executeBatch();
     } catch (SQLException e) {
@@ -120,8 +110,10 @@ public void insert(String tableName, String[] columnNames, List<Object[]> batch)
   public DBResult select(String query) {
     try (Statement stmt = connection.createStatement()) {
       ResultSet resultSet = stmt.executeQuery(query);
-      DBResult result = isOrderByQuery(query)
-          ? DBResult.resultInOrder(databaseName) : DBResult.result(databaseName);
+      DBResult result =
+          isOrderByQuery(query)
+              ? DBResult.resultInOrder(databaseName)
+              : DBResult.result(databaseName);
       populateMetaData(resultSet, result);
       populateData(resultSet, result);
       return result;
@@ -140,20 +132,22 @@ public void close() {
   }
 
   /**
-   * Parse out type in schema json and convert to field name and type pairs for CREATE TABLE statement.
+   * Parse out type in schema json and convert to field name and type pairs for CREATE TABLE
+   * statement.
    */
   private String parseColumnNameAndTypesInSchemaJson(String schema) {
     JSONObject json = (JSONObject) new JSONObject(schema).query("/mappings/properties");
-    return json.keySet().stream().
-        map(colName -> delimited(colName) + " " + mapToJDBCType(json.getJSONObject(colName)
-            .getString("type")))
+    return json.keySet().stream()
+        .map(
+            colName ->
+                delimited(colName)
+                    + " "
+                    + mapToJDBCType(json.getJSONObject(colName).getString("type")))
         .collect(joining(","));
   }
 
   private String getValueList(Object[] fieldValues) {
-    return Arrays.stream(fieldValues).
-        map(this::convertValueObjectToString).
-        collect(joining(","));
+    return Arrays.stream(fieldValues).map(this::convertValueObjectToString).collect(joining(","));
   }
 
   private String convertValueObjectToString(Object value) {
@@ -209,9 +203,7 @@ private boolean isOrderByQuery(String query) {
     return query.trim().toUpperCase().contains("ORDER BY");
   }
 
-  /**
-   * Setter for unit test mock
-   */
+  /** Setter for unit test mock */
   public void setConnection(Connection connection) {
     this.connection = connection;
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/OpenSearchConnection.java b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/OpenSearchConnection.java
index 258c031b76..8a2240855f 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/OpenSearchConnection.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/connection/OpenSearchConnection.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.runner.connection;
 
 import java.io.IOException;
@@ -16,18 +15,15 @@
 import org.opensearch.sql.correctness.runner.resultset.DBResult;
 
 /**
- * OpenSearch database connection for insertion. This class wraps JDBCConnection to delegate query method.
+ * OpenSearch database connection for insertion. This class wraps JDBCConnection to delegate query
+ * method.
  */
 public class OpenSearchConnection implements DBConnection {
 
-  /**
-   * Connection via our OpenSearch JDBC driver
-   */
+  /** Connection via our OpenSearch JDBC driver */
   private final DBConnection connection;
 
-  /**
-   * Native OpenSearch REST client for operation unsupported by driver such as CREATE/INSERT
-   */
+  /** Native OpenSearch REST client for operation unsupported by driver such as CREATE/INSERT */
   private final RestClient client;
 
   public OpenSearchConnection(String connectionUrl, RestClient client) {
@@ -112,10 +108,8 @@ private String buildBulkBody(String[] columnNames, List<Object[]> batch) {
         }
       }
 
-      body.append("{\"index\":{}}\n").
-          append(json).append("\n");
+      body.append("{\"index\":{}}\n").append(json).append("\n");
     }
     return body.toString();
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/DBResult.java b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/DBResult.java
index 0899a6e2c4..e3940bc539 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/DBResult.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/DBResult.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.runner.resultset;
 
 import com.google.common.collect.HashMultiset;
@@ -13,61 +12,45 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import lombok.EqualsAndHashCode;
+import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.ToString;
 import org.json.JSONPropertyName;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
 /**
- * Query result for equality comparison. Based on different type of query, such as query with/without ORDER BY and
- * query with SELECT columns or just *, order of column and row may matter or not. So the internal data structure of this
- * class is passed in from outside either list or set, hash map or linked hash map etc.
+ * Query result for equality comparison. Based on different type of query, such as query
+ * with/without ORDER BY and query with SELECT columns or just *, order of column and row may matter
+ * or not. So the internal data structure of this class is passed in from outside either list or
+ * set, hash map or linked hash map etc.
  */
-@EqualsAndHashCode(exclude = "databaseName")
 @ToString
 public class DBResult {
 
-  /**
-   * Possible types for floating point number
-   * H2 2.x use DOUBLE PRECISION instead of DOUBLE.
-   */
+  /** Possible types for floating point number H2 2.x use DOUBLE PRECISION instead of DOUBLE. */
   private static final Set<String> FLOAT_TYPES =
       ImmutableSet.of("FLOAT", "DOUBLE", "REAL", "DOUBLE PRECISION", "DECFLOAT");
 
-  /**
-   * Possible types for varchar.
-   * H2 2.x use CHARACTER VARYING instead of VARCHAR.
-   */
+  /** Possible types for varchar. H2 2.x use CHARACTER VARYING instead of VARCHAR. */
   private static final Set<String> VARCHAR = ImmutableSet.of("CHARACTER VARYING", "VARCHAR");
 
-  /**
-   * Database name for display
-   */
+  /** Database name for display */
   private final String databaseName;
 
-  /**
-   * Column name and types from result set meta data
-   */
-  @Getter
-  private final Collection<Type> schema;
+  /** Column name and types from result set meta data */
+  @Getter private final Collection<Type> schema;
 
-  /**
-   * Data rows from result set
-   */
+  /** Data rows from result set */
   private final Collection<Row> dataRows;
 
-  /**
-   * In theory, a result set is a multi-set (bag) that allows duplicate and doesn't
-   * have order.
-   */
+  /** In theory, a result set is a multi-set (bag) that allows duplicate and doesn't have order. */
   public static DBResult result(String databaseName) {
     return new DBResult(databaseName, new ArrayList<>(), HashMultiset.create());
   }
 
   /**
-   * But for queries with ORDER BY clause, we want to preserve the original order of data rows
-   * so we can check if the order is correct.
+   * But for queries with ORDER BY clause, we want to preserve the original order of data rows so we
+   * can check if the order is correct.
    */
   public static DBResult resultInOrder(String databaseName) {
     return new DBResult(databaseName, new ArrayList<>(), new ArrayList<>());
@@ -104,21 +87,20 @@ public String getDatabaseName() {
     return databaseName;
   }
 
-  /**
-   * Flatten for simplifying json generated.
-   */
+  /** Flatten for simplifying json generated. */
   public Collection<Collection<Object>> getDataRows() {
-    Collection<Collection<Object>> values = isDataRowOrdered()
-        ? new ArrayList<>() : HashMultiset.create();
+    Collection<Collection<Object>> values =
+        isDataRowOrdered() ? new ArrayList<>() : HashMultiset.create();
     dataRows.stream().map(Row::getValues).forEach(values::add);
     return values;
   }
 
   /**
-   * Explain the difference between this and other DB result which is helpful for
-   * troubleshooting in final test report.
-   * @param other   other DB result
-   * @return        explain the difference
+   * Explain the difference between this and other DB result which is helpful for troubleshooting in
+   * final test report.
+   *
+   * @param other other DB result
+   * @return explain the difference
    */
   public String diff(DBResult other) {
     String result = diffSchema(other);
@@ -144,26 +126,27 @@ private String diffDataRows(DBResult other) {
   }
 
   /**
-   * Check if two lists are same otherwise explain if size or any element
-   * is different at some position.
+   * Check if two lists are same otherwise explain if size or any element is different at some
+   * position.
    */
   private String diff(String name, List<?> thisList, List<?> otherList) {
     if (thisList.size() != otherList.size()) {
-      return StringUtils.format("%s size is different: this=[%d], other=[%d]",
-          name, thisList.size(), otherList.size());
+      return StringUtils.format(
+          "%s size is different: this=[%d], other=[%d]", name, thisList.size(), otherList.size());
     }
 
     int diff = findFirstDifference(thisList, otherList);
     if (diff >= 0) {
-      return StringUtils.format("%s at [%d] is different: this=[%s], other=[%s]",
+      return StringUtils.format(
+          "%s at [%d] is different: this=[%s], other=[%s]",
           name, diff, thisList.get(diff), otherList.get(diff));
     }
     return "";
   }
 
   /**
-   * Find first different element with assumption that the lists given have same size
-   * and there is no NULL element inside.
+   * Find first different element with assumption that the lists given have same size and there is
+   * no NULL element inside.
    */
   private static int findFirstDifference(List<?> list1, List<?> list2) {
     for (int i = 0; i < list1.size(); i++) {
@@ -175,20 +158,42 @@ private static int findFirstDifference(List<?> list1, List<?> list2) {
   }
 
   /**
-   * Is data row a list that represent original order of data set
-   * which doesn't/shouldn't sort again.
+   * Is data row a list that represent original order of data set which doesn't/shouldn't sort
+   * again.
    */
   private boolean isDataRowOrdered() {
     return (dataRows instanceof List);
   }
 
-  /**
-   * Convert a collection to list and sort and return this new list.
-   */
+  /** Convert a collection to list and sort and return this new list. */
   private static <T extends Comparable<T>> List<T> sort(Collection<T> collection) {
     ArrayList<T> list = new ArrayList<>(collection);
     Collections.sort(list);
     return list;
   }
 
+  public boolean equals(final Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (!(o instanceof DBResult)) {
+      return false;
+    }
+    final DBResult other = (DBResult) o;
+    // H2 calculates the value before setting column name
+    // for example, for query "select 1 + 1" it returns a column named "2" instead of "1 + 1"
+    boolean skipColumnNameCheck =
+        databaseName.equalsIgnoreCase("h2") || other.databaseName.equalsIgnoreCase("h2");
+    if (!skipColumnNameCheck && !schema.equals(other.schema)) {
+      return false;
+    }
+    if (skipColumnNameCheck
+        && !schema.stream()
+            .map(Type::getType)
+            .collect(Collectors.toList())
+            .equals(other.schema.stream().map(Type::getType).collect(Collectors.toList()))) {
+      return false;
+    }
+    return dataRows.equals(other.dataRows);
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/Row.java b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/Row.java
index da08487a10..973ea76e71 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/Row.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/Row.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.runner.resultset;
 
 import java.math.BigDecimal;
@@ -15,9 +14,7 @@
 import lombok.Getter;
 import lombok.ToString;
 
-/**
- * Row in result set.
- */
+/** Row in result set. */
 @EqualsAndHashCode
 @ToString
 @Getter
@@ -77,5 +74,4 @@ public int compareTo(Row other) {
     }
     return 0;
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/Type.java b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/Type.java
index 23cc0e3347..d626f75ccb 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/Type.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/Type.java
@@ -3,25 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.runner.resultset;
 
 import lombok.Data;
 
-/**
- * Column type in schema
- */
+/** Column type in schema */
 @Data
 public class Type {
 
-  /**
-   * Column name
-   */
+  /** Column name */
   private final String name;
 
-  /**
-   * Column type
-   */
+  /** Column type */
   private final String type;
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/ComparisonTestTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/ComparisonTestTest.java
index 03c3967544..5cab5b3175 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/ComparisonTestTest.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/ComparisonTestTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
 import static java.util.Arrays.asList;
@@ -29,37 +28,37 @@
 import org.opensearch.sql.correctness.runner.resultset.Type;
 import org.opensearch.sql.correctness.testset.TestQuerySet;
 
-/**
- * Tests for {@link ComparisonTest}
- */
+/** Tests for {@link ComparisonTest} */
 @RunWith(MockitoJUnitRunner.class)
 public class ComparisonTestTest {
 
-  @Mock
-  private DBConnection openSearchConnection;
+  @Mock private DBConnection openSearchConnection;
 
-  @Mock
-  private DBConnection otherDbConnection;
+  @Mock private DBConnection otherDbConnection;
 
   private ComparisonTest correctnessTest;
 
   @Before
   public void setUp() {
     when(otherDbConnection.getDatabaseName()).thenReturn("Other");
-    correctnessTest = new ComparisonTest(
-        openSearchConnection, new DBConnection[] {otherDbConnection}
-    );
+    correctnessTest =
+        new ComparisonTest(openSearchConnection, new DBConnection[] {otherDbConnection});
   }
 
   @Test
   public void testSuccess() {
-    when(openSearchConnection.select(anyString())).thenReturn(
-        new DBResult("OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))))
-    );
-    when(otherDbConnection.select(anyString())).thenReturn(
-        new DBResult("Other DB", asList(new Type("firstname", "text")),
-            asList(new Row(asList("John"))))
-    );
+    when(openSearchConnection.select(anyString()))
+        .thenReturn(
+            new DBResult(
+                "OpenSearch",
+                asList(new Type("firstname", "text")),
+                asList(new Row(asList("John")))));
+    when(otherDbConnection.select(anyString()))
+        .thenReturn(
+            new DBResult(
+                "Other DB",
+                asList(new Type("firstname", "text")),
+                asList(new Row(asList("John")))));
 
     TestReport expected = new TestReport();
     expected.addTestCase(new SuccessTestCase(1, "SELECT * FROM accounts"));
@@ -70,15 +69,18 @@ public void testSuccess() {
   @Test
   public void testFailureDueToInconsistency() {
     DBResult openSearchResult =
-        new DBResult("OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))));
-    DBResult otherDbResult = new DBResult("Other DB", asList(new Type("firstname", "text")),
-        asList(new Row(asList("JOHN"))));
+        new DBResult(
+            "OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))));
+    DBResult otherDbResult =
+        new DBResult(
+            "Other DB", asList(new Type("firstname", "text")), asList(new Row(asList("JOHN"))));
     when(openSearchConnection.select(anyString())).thenReturn(openSearchResult);
     when(otherDbConnection.select(anyString())).thenReturn(otherDbResult);
 
     TestReport expected = new TestReport();
     expected.addTestCase(
-        new FailedTestCase(1, "SELECT * FROM accounts", asList(openSearchResult, otherDbResult), ""));
+        new FailedTestCase(
+            1, "SELECT * FROM accounts", asList(openSearchResult, otherDbResult), ""));
     TestReport actual = correctnessTest.verify(querySet("SELECT * FROM accounts"));
     assertEquals(expected, actual);
   }
@@ -87,16 +89,19 @@ public void testFailureDueToInconsistency() {
   public void testSuccessFinally() {
     DBConnection anotherDbConnection = mock(DBConnection.class);
     when(anotherDbConnection.getDatabaseName()).thenReturn("Another");
-    correctnessTest = new ComparisonTest(
-        openSearchConnection, new DBConnection[] {otherDbConnection, anotherDbConnection}
-    );
+    correctnessTest =
+        new ComparisonTest(
+            openSearchConnection, new DBConnection[] {otherDbConnection, anotherDbConnection});
 
     DBResult openSearchResult =
-        new DBResult("OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))));
-    DBResult otherDbResult = new DBResult("Other DB", asList(new Type("firstname", "text")),
-        asList(new Row(asList("JOHN"))));
-    DBResult anotherDbResult = new DBResult("Another DB", asList(new Type("firstname", "text")),
-        asList(new Row(asList("John"))));
+        new DBResult(
+            "OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))));
+    DBResult otherDbResult =
+        new DBResult(
+            "Other DB", asList(new Type("firstname", "text")), asList(new Row(asList("JOHN"))));
+    DBResult anotherDbResult =
+        new DBResult(
+            "Another DB", asList(new Type("firstname", "text")), asList(new Row(asList("John"))));
     when(openSearchConnection.select(anyString())).thenReturn(openSearchResult);
     when(anotherDbConnection.select(anyString())).thenReturn(anotherDbResult);
 
@@ -111,30 +116,38 @@ public void testFailureDueToEventualInconsistency() {
     DBConnection anotherDbConnection = mock(DBConnection.class);
     when(anotherDbConnection.getDatabaseName())
         .thenReturn("ZZZ DB"); // Make sure this will be called after Other DB
-    correctnessTest = new ComparisonTest(
-        openSearchConnection, new DBConnection[] {otherDbConnection, anotherDbConnection}
-    );
+    correctnessTest =
+        new ComparisonTest(
+            openSearchConnection, new DBConnection[] {otherDbConnection, anotherDbConnection});
 
     DBResult openSearchResult =
-        new DBResult("OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))));
-    DBResult otherDbResult = new DBResult("Other DB", asList(new Type("firstname", "text")),
-        asList(new Row(asList("JOHN"))));
-    DBResult anotherDbResult = new DBResult("ZZZ DB", asList(new Type("firstname", "text")),
-        asList(new Row(asList("Hank"))));
+        new DBResult(
+            "OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))));
+    DBResult otherDbResult =
+        new DBResult(
+            "Other DB", asList(new Type("firstname", "text")), asList(new Row(asList("JOHN"))));
+    DBResult anotherDbResult =
+        new DBResult(
+            "ZZZ DB", asList(new Type("firstname", "text")), asList(new Row(asList("Hank"))));
     when(openSearchConnection.select(anyString())).thenReturn(openSearchResult);
     when(otherDbConnection.select(anyString())).thenReturn(otherDbResult);
     when(anotherDbConnection.select(anyString())).thenReturn(anotherDbResult);
 
     TestReport expected = new TestReport();
-    expected.addTestCase(new FailedTestCase(1, "SELECT * FROM accounts",
-        asList(openSearchResult, otherDbResult, anotherDbResult), ""));
+    expected.addTestCase(
+        new FailedTestCase(
+            1,
+            "SELECT * FROM accounts",
+            asList(openSearchResult, otherDbResult, anotherDbResult),
+            ""));
     TestReport actual = correctnessTest.verify(querySet("SELECT * FROM accounts"));
     assertEquals(expected, actual);
   }
 
   @Test
   public void testErrorDueToESException() {
-    when(openSearchConnection.select(anyString())).thenThrow(new RuntimeException("All shards failure"));
+    when(openSearchConnection.select(anyString()))
+        .thenThrow(new RuntimeException("All shards failure"));
 
     TestReport expected = new TestReport();
     expected.addTestCase(
@@ -145,15 +158,21 @@ public void testErrorDueToESException() {
 
   @Test
   public void testErrorDueToNoOtherDBSupportThisQuery() {
-    when(openSearchConnection.select(anyString())).thenReturn(
-        new DBResult("OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))))
-    );
+    when(openSearchConnection.select(anyString()))
+        .thenReturn(
+            new DBResult(
+                "OpenSearch",
+                asList(new Type("firstname", "text")),
+                asList(new Row(asList("John")))));
     when(otherDbConnection.select(anyString()))
         .thenThrow(new RuntimeException("Unsupported feature"));
 
     TestReport expected = new TestReport();
-    expected.addTestCase(new ErrorTestCase(1, "SELECT * FROM accounts",
-        "No other databases support this query: Unsupported feature;"));
+    expected.addTestCase(
+        new ErrorTestCase(
+            1,
+            "SELECT * FROM accounts",
+            "No other databases support this query: Unsupported feature;"));
     TestReport actual = correctnessTest.verify(querySet("SELECT * FROM accounts"));
     assertEquals(expected, actual);
   }
@@ -162,17 +181,22 @@ public void testErrorDueToNoOtherDBSupportThisQuery() {
   public void testSuccessWhenOneDBSupportThisQuery() {
     DBConnection anotherDbConnection = mock(DBConnection.class);
     when(anotherDbConnection.getDatabaseName()).thenReturn("Another");
-    correctnessTest = new ComparisonTest(
-        openSearchConnection, new DBConnection[] {otherDbConnection, anotherDbConnection}
-    );
-
-    when(openSearchConnection.select(anyString())).thenReturn(
-        new DBResult("OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))))
-    );
-    when(anotherDbConnection.select(anyString())).thenReturn(
-        new DBResult("Another DB", asList(new Type("firstname", "text")),
-            asList(new Row(asList("John"))))
-    );
+    correctnessTest =
+        new ComparisonTest(
+            openSearchConnection, new DBConnection[] {otherDbConnection, anotherDbConnection});
+
+    when(openSearchConnection.select(anyString()))
+        .thenReturn(
+            new DBResult(
+                "OpenSearch",
+                asList(new Type("firstname", "text")),
+                asList(new Row(asList("John")))));
+    when(anotherDbConnection.select(anyString()))
+        .thenReturn(
+            new DBResult(
+                "Another DB",
+                asList(new Type("firstname", "text")),
+                asList(new Row(asList("John")))));
 
     TestReport expected = new TestReport();
     expected.addTestCase(new SuccessTestCase(1, "SELECT * FROM accounts"));
@@ -184,12 +208,13 @@ public void testSuccessWhenOneDBSupportThisQuery() {
   public void testFailureDueToInconsistencyAndExceptionMixed() {
     DBConnection otherDBConnection2 = mock(DBConnection.class);
     when(otherDBConnection2.getDatabaseName()).thenReturn("ZZZ DB");
-    correctnessTest = new ComparisonTest(
-        openSearchConnection, new DBConnection[] {otherDbConnection, otherDBConnection2}
-    );
+    correctnessTest =
+        new ComparisonTest(
+            openSearchConnection, new DBConnection[] {otherDbConnection, otherDBConnection2});
 
     DBResult openSearchResult =
-        new DBResult("OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))));
+        new DBResult(
+            "OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))));
     DBResult otherResult =
         new DBResult("Other", asList(new Type("firstname", "text")), Collections.emptyList());
 
@@ -199,8 +224,12 @@ public void testFailureDueToInconsistencyAndExceptionMixed() {
         .thenThrow(new RuntimeException("Unsupported feature"));
 
     TestReport expected = new TestReport();
-    expected.addTestCase(new FailedTestCase(1, "SELECT * FROM accounts",
-        asList(openSearchResult, otherResult), "Unsupported feature;"));
+    expected.addTestCase(
+        new FailedTestCase(
+            1,
+            "SELECT * FROM accounts",
+            asList(openSearchResult, otherResult),
+            "Unsupported feature;"));
     TestReport actual = correctnessTest.verify(querySet("SELECT * FROM accounts"));
     assertEquals(expected, actual);
   }
@@ -208,5 +237,4 @@ public void testFailureDueToInconsistencyAndExceptionMixed() {
   private TestQuerySet querySet(String query) {
     return new TestQuerySet(new String[] {query});
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/DBResultTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/DBResultTest.java
index 3f6da0c39d..793728a9e9 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/DBResultTest.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/DBResultTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
 import static java.util.Collections.emptyList;
@@ -19,9 +18,7 @@
 import org.opensearch.sql.correctness.runner.resultset.Row;
 import org.opensearch.sql.correctness.runner.resultset.Type;
 
-/**
- * Unit tests for {@link DBResult}
- */
+/** Unit tests for {@link DBResult} */
 public class DBResultTest {
 
   @Test
@@ -80,35 +77,45 @@ public void dbResultWithDifferentColumnTypeShouldNotEqual() {
 
   @Test
   public void shouldExplainColumnTypeDifference() {
-    DBResult result1 = new DBResult("DB 1",
-        Arrays.asList(new Type("name", "VARCHAR"), new Type("age", "FLOAT")), emptyList());
-    DBResult result2 = new DBResult("DB 2",
-        Arrays.asList(new Type("name", "VARCHAR"), new Type("age", "INT")), emptyList());
+    DBResult result1 =
+        new DBResult(
+            "DB 1",
+            Arrays.asList(new Type("name", "VARCHAR"), new Type("age", "FLOAT")),
+            emptyList());
+    DBResult result2 =
+        new DBResult(
+            "DB 2",
+            Arrays.asList(new Type("name", "VARCHAR"), new Type("age", "INT")),
+            emptyList());
 
     assertEquals(
         "Schema type at [1] is different: "
             + "this=[Type(name=age, type=FLOAT)], other=[Type(name=age, type=INT)]",
-        result1.diff(result2)
-    );
+        result1.diff(result2));
   }
 
   @Test
   public void shouldExplainDataRowsDifference() {
-    DBResult result1 = new DBResult("DB 1", Arrays.asList(new Type("name", "VARCHAR")),
-        Sets.newHashSet(
-            new Row(Arrays.asList("hello")),
-            new Row(Arrays.asList("world")),
-            new Row(Lists.newArrayList((Object) null))));
-    DBResult result2 = new DBResult("DB 2",Arrays.asList(new Type("name", "VARCHAR")),
-        Sets.newHashSet(
-            new Row(Lists.newArrayList((Object) null)),
-            new Row(Arrays.asList("hello")),
-            new Row(Arrays.asList("world123"))));
+    DBResult result1 =
+        new DBResult(
+            "DB 1",
+            Arrays.asList(new Type("name", "VARCHAR")),
+            Sets.newHashSet(
+                new Row(Arrays.asList("hello")),
+                new Row(Arrays.asList("world")),
+                new Row(Lists.newArrayList((Object) null))));
+    DBResult result2 =
+        new DBResult(
+            "DB 2",
+            Arrays.asList(new Type("name", "VARCHAR")),
+            Sets.newHashSet(
+                new Row(Lists.newArrayList((Object) null)),
+                new Row(Arrays.asList("hello")),
+                new Row(Arrays.asList("world123"))));
 
     assertEquals(
         "Data row at [1] is different: this=[Row(values=[world])], other=[Row(values=[world123])]",
-        result1.diff(result2)
-    );
+        result1.diff(result2));
   }
 
   @Test
@@ -125,8 +132,6 @@ public void shouldExplainDataRowsOrderDifference() {
 
     assertEquals(
         "Data row at [0] is different: this=[Row(values=[hello])], other=[Row(values=[world])]",
-        result1.diff(result2)
-    );
+        result1.diff(result2));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/JDBCConnectionTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/JDBCConnectionTest.java
index 0e70066136..a8e01145e7 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/JDBCConnectionTest.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/JDBCConnectionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
 import static org.junit.Assert.assertEquals;
@@ -36,17 +35,13 @@
 import org.opensearch.sql.correctness.runner.resultset.DBResult;
 import org.opensearch.sql.correctness.runner.resultset.Type;
 
-/**
- * Tests for {@link JDBCConnection}
- */
+/** Tests for {@link JDBCConnection} */
 @RunWith(MockitoJUnitRunner.class)
 public class JDBCConnectionTest {
 
-  @Mock
-  private Connection connection;
+  @Mock private Connection connection;
 
-  @Mock
-  private Statement statement;
+  @Mock private Statement statement;
 
   private JDBCConnection conn;
 
@@ -60,7 +55,8 @@ public void setUp() throws SQLException {
 
   @Test
   public void testCreateTable() throws SQLException {
-    conn.create("test",
+    conn.create(
+        "test",
         "{\"mappings\":{\"properties\":{\"name\":{\"type\":\"keyword\"},\"age\":{\"type\":\"INT\"}}}}");
 
     ArgumentCaptor<String> argCap = ArgumentCaptor.forClass(String.class);
@@ -83,7 +79,9 @@ public void testDropTable() throws SQLException {
 
   @Test
   public void testInsertData() throws SQLException {
-    conn.insert("test", new String[] {"name", "age"},
+    conn.insert(
+        "test",
+        new String[] {"name", "age"},
         Arrays.asList(new String[] {"John", "25"}, new String[] {"Hank", "30"}));
 
     ArgumentCaptor<String> argCap = ArgumentCaptor.forClass(String.class);
@@ -93,18 +91,17 @@ public void testInsertData() throws SQLException {
     assertEquals(
         Arrays.asList(
             "INSERT INTO test(`name`,`age`) VALUES ('John','25')",
-            "INSERT INTO test(`name`,`age`) VALUES ('Hank','30')"
-        ), actual
-    );
+            "INSERT INTO test(`name`,`age`) VALUES ('Hank','30')"),
+        actual);
   }
 
   @Test
   public void testInsertNullData() throws SQLException {
-    conn.insert("test", new String[] {"name", "age"},
+    conn.insert(
+        "test",
+        new String[] {"name", "age"},
         Arrays.asList(
-            new Object[] {"John", null},
-            new Object[] {null, 25},
-            new Object[] {"Hank", 30}));
+            new Object[] {"John", null}, new Object[] {null, 25}, new Object[] {"Hank", 30}));
 
     ArgumentCaptor<String> argCap = ArgumentCaptor.forClass(String.class);
     verify(statement, times(3)).addBatch(argCap.capture());
@@ -114,9 +111,8 @@ public void testInsertNullData() throws SQLException {
         Arrays.asList(
             "INSERT INTO test(`name`,`age`) VALUES ('John',NULL)",
             "INSERT INTO test(`name`,`age`) VALUES (NULL,'25')",
-            "INSERT INTO test(`name`,`age`) VALUES ('Hank','30')"
-        ), actual
-    );
+            "INSERT INTO test(`name`,`age`) VALUES ('Hank','30')"),
+        actual);
   }
 
   @Test
@@ -129,19 +125,10 @@ public void testSelectQuery() throws SQLException {
     DBResult result = conn.select("SELECT * FROM test");
     assertEquals("Test DB", result.getDatabaseName());
     assertEquals(
-        Arrays.asList(
-            new Type("NAME", "VARCHAR"),
-            new Type("AGE", "INT")
-        ),
-        result.getSchema()
-    );
+        Arrays.asList(new Type("NAME", "VARCHAR"), new Type("AGE", "INT")), result.getSchema());
     assertEquals(
-        HashMultiset.create(ImmutableList.of(
-            Arrays.asList("John", 25),
-            Arrays.asList("Hank", 30)
-        )),
-        result.getDataRows()
-    );
+        HashMultiset.create(ImmutableList.of(Arrays.asList("John", 25), Arrays.asList("Hank", 30))),
+        result.getDataRows());
   }
 
   @Test
@@ -153,24 +140,18 @@ public void testSelectQueryWithAlias() throws SQLException {
     when(resultSet.getMetaData()).thenReturn(metaData);
 
     DBResult result = conn.select("SELECT * FROM test");
-    assertEquals(
-        Arrays.asList(
-            new Type("N", "VARCHAR"),
-            new Type("A", "INT")
-        ),
-        result.getSchema()
-    );
+    assertEquals(Arrays.asList(new Type("N", "VARCHAR"), new Type("A", "INT")), result.getSchema());
   }
 
   @Test
   public void testSelectQueryWithFloatInResultSet() throws SQLException {
     ResultSetMetaData metaData =
         mockMetaData(ImmutableMap.of("name", "VARCHAR", "balance", "FLOAT"));
-    ResultSet resultSet = mockResultSet(
-        new Object[] {"John", 25.123},
-        new Object[] {"Hank", 30.456},
-        new Object[] {"Allen", 15.1}
-    );
+    ResultSet resultSet =
+        mockResultSet(
+            new Object[] {"John", 25.123},
+            new Object[] {"Hank", 30.456},
+            new Object[] {"Allen", 15.1});
     when(statement.executeQuery(anyString())).thenReturn(resultSet);
     when(resultSet.getMetaData()).thenReturn(metaData);
 
@@ -178,18 +159,15 @@ public void testSelectQueryWithFloatInResultSet() throws SQLException {
     assertEquals(
         Arrays.asList(
             new Type("NAME", "VARCHAR"),
-            new Type("BALANCE", "[FLOAT, DOUBLE, REAL, DOUBLE PRECISION, DECFLOAT]")
-        ),
-        result.getSchema()
-    );
+            new Type("BALANCE", "[FLOAT, DOUBLE, REAL, DOUBLE PRECISION, DECFLOAT]")),
+        result.getSchema());
     assertEquals(
-        HashMultiset.create(ImmutableList.of(
-            Arrays.asList("John", 25.13),
-            Arrays.asList("Hank", 30.46),
-            Arrays.asList("Allen", 15.1)
-        )),
-        result.getDataRows()
-    );
+        HashMultiset.create(
+            ImmutableList.of(
+                Arrays.asList("John", 25.13),
+                Arrays.asList("Hank", 30.46),
+                Arrays.asList("Allen", 15.1))),
+        result.getDataRows());
   }
 
   private ResultSet mockResultSet(Object[]... rows) throws SQLException {
@@ -233,5 +211,4 @@ private ResultSetMetaData mockMetaData(Map<String, String> nameAndTypes, String.
     when(metaData.getColumnCount()).thenReturn(nameAndTypes.size());
     return metaData;
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/OpenSearchConnectionTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/OpenSearchConnectionTest.java
index 73659525f2..2a7880d0c4 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/OpenSearchConnectionTest.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/OpenSearchConnectionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
 import static org.junit.Assert.assertEquals;
@@ -30,14 +29,11 @@
 import org.opensearch.client.RestClient;
 import org.opensearch.sql.correctness.runner.connection.OpenSearchConnection;
 
-/**
- * Tests for {@link OpenSearchConnection}
- */
+/** Tests for {@link OpenSearchConnection} */
 @RunWith(MockitoJUnitRunner.class)
 public class OpenSearchConnectionTest {
 
-  @Mock
-  private RestClient client;
+  @Mock private RestClient client;
 
   private OpenSearchConnection conn;
 
@@ -63,36 +59,30 @@ public void testCreateTable() throws IOException {
 
   @Test
   public void testInsertData() throws IOException {
-    conn.insert("test", new String[] {"name"},
-        Arrays.asList(new String[] {"John"}, new String[] {"Hank"}));
+    conn.insert(
+        "test", new String[] {"name"}, Arrays.asList(new String[] {"John"}, new String[] {"Hank"}));
 
     Request actual = captureActualArg();
     assertEquals("POST", actual.getMethod());
     assertEquals("/test/_bulk?refresh=true", actual.getEndpoint());
     assertEquals(
-        "{\"index\":{}}\n"
-            + "{\"name\":\"John\"}\n"
-            + "{\"index\":{}}\n"
-            + "{\"name\":\"Hank\"}\n",
-        getBody(actual)
-    );
+        "{\"index\":{}}\n" + "{\"name\":\"John\"}\n" + "{\"index\":{}}\n" + "{\"name\":\"Hank\"}\n",
+        getBody(actual));
   }
 
   @Test
   public void testInsertNullData() throws IOException {
-    conn.insert("test", new String[] {"name", "age"},
+    conn.insert(
+        "test",
+        new String[] {"name", "age"},
         Arrays.asList(new Object[] {null, 30}, new Object[] {"Hank", null}));
 
     Request actual = captureActualArg();
     assertEquals("POST", actual.getMethod());
     assertEquals("/test/_bulk?refresh=true", actual.getEndpoint());
     assertEquals(
-        "{\"index\":{}}\n"
-            + "{\"age\":30}\n"
-            + "{\"index\":{}}\n"
-            + "{\"name\":\"Hank\"}\n",
-        getBody(actual)
-    );
+        "{\"index\":{}}\n" + "{\"age\":30}\n" + "{\"index\":{}}\n" + "{\"name\":\"Hank\"}\n",
+        getBody(actual));
   }
 
   @Test
@@ -114,5 +104,4 @@ private String getBody(Request request) throws IOException {
     InputStream inputStream = request.getEntity().getContent();
     return CharStreams.toString(new InputStreamReader(inputStream));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/RowTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/RowTest.java
index 66cc1a0500..79e134fe7b 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/RowTest.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/RowTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
 import static org.junit.Assert.assertEquals;
@@ -12,9 +11,7 @@
 import org.junit.Test;
 import org.opensearch.sql.correctness.runner.resultset.Row;
 
-/**
- * Unit test {@link Row}
- */
+/** Unit test {@link Row} */
 public class RowTest {
 
   @Test
@@ -47,5 +44,4 @@ public void shouldConsiderNullGreater() {
     row2.add("world");
     assertEquals(1, row1.compareTo(row2));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestConfigTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestConfigTest.java
index c75bca15b1..42e75a7c36 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestConfigTest.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestConfigTest.java
@@ -3,24 +3,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
 import static java.util.Collections.emptyMap;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.junit.Test;
 import org.opensearch.sql.correctness.TestConfig;
 
-/**
- * Tests for {@link TestConfig}
- */
+/** Tests for {@link TestConfig} */
 public class TestConfigTest {
 
   @Test
@@ -31,9 +28,7 @@ public void testDefaultConfig() {
         config.getOtherDbConnectionNameAndUrls(),
         allOf(
             hasEntry("H2", "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"),
-            hasEntry("SQLite", "jdbc:sqlite::memory:")
-        )
-    );
+            hasEntry("SQLite", "jdbc:sqlite::memory:")));
   }
 
   @Test
@@ -45,18 +40,16 @@ public void testCustomESUrls() {
 
   @Test
   public void testCustomDbUrls() {
-    Map<String, String> args = ImmutableMap.of("otherDbUrls",
-        "H2=jdbc:h2:mem:test;DB_CLOSE_DELAY=-1,"
-            + "Derby=jdbc:derby:memory:myDb;create=true");
+    Map<String, String> args =
+        ImmutableMap.of(
+            "otherDbUrls",
+            "H2=jdbc:h2:mem:test;DB_CLOSE_DELAY=-1," + "Derby=jdbc:derby:memory:myDb;create=true");
 
     TestConfig config = new TestConfig(args);
     assertThat(
         config.getOtherDbConnectionNameAndUrls(),
         allOf(
             hasEntry("H2", "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"),
-            hasEntry("Derby", "jdbc:derby:memory:myDb;create=true")
-        )
-    );
+            hasEntry("Derby", "jdbc:derby:memory:myDb;create=true")));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestDataSetTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestDataSetTest.java
index 284e167d6b..7411df6a54 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestDataSetTest.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestDataSetTest.java
@@ -3,19 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Test;
 import org.opensearch.sql.correctness.testset.TestDataSet;
 
-/**
- * Tests for {@link TestDataSet}
- */
+/** Tests for {@link TestDataSet} */
 public class TestDataSetTest {
 
   @Test
@@ -40,9 +37,7 @@ public void testDataSetWithSingleColumnData() {
             new Object[] {"field"},
             new Object[] {"hello"},
             new Object[] {"world"},
-            new Object[] {"123"}
-        )
-    );
+            new Object[] {"123"}));
   }
 
   @Test
@@ -61,16 +56,13 @@ public void testDataSetWithMultiColumnsData() {
             + "  }\n"
             + "}";
 
-    TestDataSet dataSet = new TestDataSet("test", mappings,
-        "field1,field2\nhello,123\nworld,456");
+    TestDataSet dataSet = new TestDataSet("test", mappings, "field1,field2\nhello,123\nworld,456");
     assertThat(
         dataSet.getDataRows(),
         contains(
             new Object[] {"field1", "field2"},
             new Object[] {"hello", 123},
-            new Object[] {"world", 456}
-        )
-    );
+            new Object[] {"world", 456}));
   }
 
   @Test
@@ -86,17 +78,15 @@ public void testDataSetWithEscapedComma() {
             + "  }\n"
             + "}";
 
-    TestDataSet dataSet = new TestDataSet("test", mappings,
-        "field\n\"hello,world,123\"\n123\n\"[abc,def,ghi]\"");
+    TestDataSet dataSet =
+        new TestDataSet("test", mappings, "field\n\"hello,world,123\"\n123\n\"[abc,def,ghi]\"");
     assertThat(
         dataSet.getDataRows(),
         contains(
             new Object[] {"field"},
             new Object[] {"hello,world,123"},
             new Object[] {"123"},
-            new Object[] {"[abc,def,ghi]"}
-        )
-    );
+            new Object[] {"[abc,def,ghi]"}));
   }
 
   @Test
@@ -115,17 +105,13 @@ public void testDataSetWithNullData() {
             + "  }\n"
             + "}";
 
-    TestDataSet dataSet = new TestDataSet("test", mappings,
-        "field1,field2\n,123\nworld,\n,");
+    TestDataSet dataSet = new TestDataSet("test", mappings, "field1,field2\n,123\nworld,\n,");
     assertThat(
         dataSet.getDataRows(),
         contains(
             new Object[] {"field1", "field2"},
             new Object[] {null, 123},
             new Object[] {"world", null},
-            new Object[] {null, null}
-        )
-    );
+            new Object[] {null, null}));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestQuerySetTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestQuerySetTest.java
index 8ad9e6b921..08d360dfc7 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestQuerySetTest.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestQuerySetTest.java
@@ -3,31 +3,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
 
 import org.junit.Test;
 import org.opensearch.sql.correctness.testset.TestQuerySet;
 
-/**
- * Tests for {@link TestQuerySet}
- */
+/** Tests for {@link TestQuerySet} */
 public class TestQuerySetTest {
 
   @Test
   public void testQuerySet() {
     TestQuerySet querySet =
         new TestQuerySet("SELECT * FROM accounts\nSELECT * FROM accounts LIMIT 5");
-    assertThat(
-        querySet,
-        contains(
-            "SELECT * FROM accounts",
-            "SELECT * FROM accounts LIMIT 5"
-        )
-    );
+    assertThat(querySet, contains("SELECT * FROM accounts", "SELECT * FROM accounts LIMIT 5"));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestReportTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestReportTest.java
index 35b64fd5d6..515394c705 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestReportTest.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestReportTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
 import static java.util.Arrays.asList;
@@ -20,9 +19,7 @@
 import org.opensearch.sql.correctness.runner.resultset.Row;
 import org.opensearch.sql.correctness.runner.resultset.Type;
 
-/**
- * Test for {@link TestReport}
- */
+/** Test for {@link TestReport} */
 public class TestReportTest {
 
   private TestReport report = new TestReport();
@@ -31,22 +28,22 @@ public class TestReportTest {
   public void testSuccessReport() {
     report.addTestCase(new SuccessTestCase(1, "SELECT * FROM accounts"));
     JSONObject actual = new JSONObject(report);
-    JSONObject expected = new JSONObject(
-        "{" +
-            "  \"summary\": {" +
-            "    \"total\": 1," +
-            "    \"success\": 1," +
-            "    \"failure\": 0" +
-            "  }," +
-            "  \"tests\": [" +
-            "    {" +
-            "      \"id\": 1," +
-            "      \"result\": 'Success'," +
-            "      \"sql\": \"SELECT * FROM accounts\"," +
-            "    }" +
-            "  ]" +
-            "}"
-    );
+    JSONObject expected =
+        new JSONObject(
+            "{"
+                + "  \"summary\": {"
+                + "    \"total\": 1,"
+                + "    \"success\": 1,"
+                + "    \"failure\": 0"
+                + "  },"
+                + "  \"tests\": ["
+                + "    {"
+                + "      \"id\": 1,"
+                + "      \"result\": 'Success',"
+                + "      \"sql\": \"SELECT * FROM accounts\","
+                + "    }"
+                + "  ]"
+                + "}");
 
     if (!actual.similar(expected)) {
       fail("Actual JSON is different from expected: " + actual.toString(2));
@@ -55,54 +52,34 @@ public void testSuccessReport() {
 
   @Test
   public void testFailedReport() {
-    report.addTestCase(new FailedTestCase(1, "SELECT * FROM accounts", asList(
-        new DBResult("OpenSearch", singleton(new Type("firstName", "text")),
-            singleton(new Row(asList("hello")))),
-        new DBResult("H2", singleton(new Type("firstName", "text")),
-            singleton(new Row(asList("world"))))),
-        "[SQLITE_ERROR] SQL error or missing database;"
-    ));
+    report.addTestCase(
+        new FailedTestCase(
+            1,
+            "SELECT * FROM accounts",
+            asList(
+                new DBResult(
+                    "OpenSearch",
+                    singleton(new Type("firstName", "text")),
+                    singleton(new Row(asList("hello")))),
+                new DBResult(
+                    "H2",
+                    singleton(new Type("firstName", "text")),
+                    singleton(new Row(asList("world"))))),
+            "[SQLITE_ERROR] SQL error or missing database;"));
     JSONObject actual = new JSONObject(report);
-    JSONObject expected = new JSONObject(
-        "{" +
-            "  \"summary\": {" +
-            "    \"total\": 1," +
-            "    \"success\": 0," +
-            "    \"failure\": 1" +
-            "  }," +
-            "  \"tests\": [" +
-            "    {" +
-            "      \"id\": 1," +
-            "      \"result\": 'Failed'," +
-            "      \"sql\": \"SELECT * FROM accounts\"," +
-            "      \"explain\": \"Data row at [0] is different: this=[Row(values=[world])], other=[Row(values=[hello])]\"," +
-            "      \"errors\": \"[SQLITE_ERROR] SQL error or missing database;\"," +
-            "      \"resultSets\": [" +
-            "        {" +
-            "          \"database\": \"H2\"," +
-            "          \"schema\": [" +
-            "            {" +
-            "              \"name\": \"firstName\"," +
-            "              \"type\": \"text\"" +
-            "            }" +
-            "          ]," +
-            "          \"dataRows\": [[\"world\"]]" +
-            "        }," +
-            "        {" +
-            "          \"database\": \"OpenSearch\"," +
-            "          \"schema\": [" +
-            "            {" +
-            "              \"name\": \"firstName\"," +
-            "              \"type\": \"text\"" +
-            "            }" +
-            "          ]," +
-            "          \"dataRows\": [[\"hello\"]]" +
-            "        }" +
-            "      ]" +
-            "    }" +
-            "  ]" +
-            "}"
-    );
+    JSONObject expected =
+        new JSONObject(
+            "{  \"summary\": {    \"total\": 1,    \"success\": 0,    \"failure\": 1  }, "
+                + " \"tests\": [    {      \"id\": 1,      \"result\": 'Failed',      \"sql\":"
+                + " \"SELECT * FROM accounts\",      \"explain\": \"Data row at [0] is different:"
+                + " this=[Row(values=[world])], other=[Row(values=[hello])]\",      \"errors\":"
+                + " \"[SQLITE_ERROR] SQL error or missing database;\",      \"resultSets\": [      "
+                + "  {          \"database\": \"H2\",          \"schema\": [            {          "
+                + "    \"name\": \"firstName\",              \"type\": \"text\"            }       "
+                + "   ],          \"dataRows\": [[\"world\"]]        },        {         "
+                + " \"database\": \"OpenSearch\",          \"schema\": [            {             "
+                + " \"name\": \"firstName\",              \"type\": \"text\"            }         "
+                + " ],          \"dataRows\": [[\"hello\"]]        }      ]    }  ]}");
 
     if (!actual.similar(expected)) {
       fail("Actual JSON is different from expected: " + actual.toString(2));
@@ -113,27 +90,26 @@ public void testFailedReport() {
   public void testErrorReport() {
     report.addTestCase(new ErrorTestCase(1, "SELECT * FROM", "Missing table name in query"));
     JSONObject actual = new JSONObject(report);
-    JSONObject expected = new JSONObject(
-        "{" +
-            "  \"summary\": {" +
-            "    \"total\": 1," +
-            "    \"success\": 0," +
-            "    \"failure\": 1" +
-            "  }," +
-            "  \"tests\": [" +
-            "    {" +
-            "      \"id\": 1," +
-            "      \"result\": 'Failed'," +
-            "      \"sql\": \"SELECT * FROM\"," +
-            "      \"reason\": \"Missing table name in query\"," +
-            "    }" +
-            "  ]" +
-            "}"
-    );
+    JSONObject expected =
+        new JSONObject(
+            "{"
+                + "  \"summary\": {"
+                + "    \"total\": 1,"
+                + "    \"success\": 0,"
+                + "    \"failure\": 1"
+                + "  },"
+                + "  \"tests\": ["
+                + "    {"
+                + "      \"id\": 1,"
+                + "      \"result\": 'Failed',"
+                + "      \"sql\": \"SELECT * FROM\","
+                + "      \"reason\": \"Missing table name in query\","
+                + "    }"
+                + "  ]"
+                + "}");
 
     if (!actual.similar(expected)) {
       fail("Actual JSON is different from expected: " + actual.toString(2));
     }
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/UnitTests.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/UnitTests.java
index 0bc5456069..367e2e10bf 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/UnitTests.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/UnitTests.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
 import org.junit.runner.RunWith;
@@ -11,15 +10,14 @@
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-    ComparisonTestTest.class,
-    TestConfigTest.class,
-    TestDataSetTest.class,
-    TestQuerySetTest.class,
-    TestReportTest.class,
-    OpenSearchConnectionTest.class,
-    JDBCConnectionTest.class,
-    DBResultTest.class,
-    RowTest.class,
+  ComparisonTestTest.class,
+  TestConfigTest.class,
+  TestDataSetTest.class,
+  TestQuerySetTest.class,
+  TestReportTest.class,
+  OpenSearchConnectionTest.class,
+  JDBCConnectionTest.class,
+  DBResultTest.class,
+  RowTest.class,
 })
-public class UnitTests {
-}
+public class UnitTests {}
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/testset/TestDataSet.java b/integ-test/src/test/java/org/opensearch/sql/correctness/testset/TestDataSet.java
index 66fc7c88af..3031260d0a 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/testset/TestDataSet.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/testset/TestDataSet.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.testset;
 
 import static java.util.stream.Collectors.joining;
@@ -15,9 +14,7 @@
 import org.json.JSONObject;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-/**
- * Test data set
- */
+/** Test data set */
 public class TestDataSet {
 
   private final String tableName;
@@ -42,9 +39,7 @@ public List<Object[]> getDataRows() {
     return dataRows;
   }
 
-  /**
-   * Split columns in each line by separator and ignore escaped separator(s) in quoted string.
-   */
+  /** Split columns in each line by separator and ignore escaped separator(s) in quoted string. */
   private List<String[]> splitColumns(String content, char separator) {
     List<String[]> result = new ArrayList<>();
     for (String line : content.split("\\r?\\n")) {
@@ -76,8 +71,8 @@ private List<String[]> splitColumns(String content, char separator) {
   }
 
   /**
-   * Convert column string values (read from CSV file) to objects of its real type
-   * based on the type information in index mapping file.
+   * Convert column string values (read from CSV file) to objects of its real type based on the type
+   * information in index mapping file.
    */
   private List<Object[]> convertStringDataToActualType(List<String[]> rows) {
     JSONObject types = new JSONObject(schema);
@@ -93,7 +88,8 @@ private List<Object[]> convertStringDataToActualType(List<String[]> rows) {
     return result;
   }
 
-  private Object[] convertStringArrayToObjectArray(JSONObject types, String[] columnNames, String[] row) {
+  private Object[] convertStringArrayToObjectArray(
+      JSONObject types, String[] columnNames, String[] row) {
     Object[] result = new Object[row.length];
     for (int i = 0; i < row.length; i++) {
       String colName = columnNames[i];
@@ -126,8 +122,8 @@ private Object convertStringToObject(String type, String str) {
       case "boolean":
         return Boolean.valueOf(str);
       default:
-        throw new IllegalStateException(StringUtils.format(
-            "Data type %s is not supported yet for value: %s", type, str));
+        throw new IllegalStateException(
+            StringUtils.format("Data type %s is not supported yet for value: %s", type, str));
     }
   }
 
@@ -135,13 +131,15 @@ private Object convertStringToObject(String type, String str) {
   public String toString() {
     int total = dataRows.size();
     return "Test data set :\n"
-        + " Table name: " + tableName + '\n'
-        + " Schema: " + schema + '\n'
-        + " Data rows (first 5 in " + total + "):"
-        + dataRows.stream().
-        limit(5).
-        map(Arrays::toString).
-        collect(joining("\n ", "\n ", "\n"));
+        + " Table name: "
+        + tableName
+        + '\n'
+        + " Schema: "
+        + schema
+        + '\n'
+        + " Data rows (first 5 in "
+        + total
+        + "):"
+        + dataRows.stream().limit(5).map(Arrays::toString).collect(joining("\n ", "\n ", "\n"));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/testset/TestQuerySet.java b/integ-test/src/test/java/org/opensearch/sql/correctness/testset/TestQuerySet.java
index 7eee2cde9f..161d314c1d 100644
--- a/integ-test/src/test/java/org/opensearch/sql/correctness/testset/TestQuerySet.java
+++ b/integ-test/src/test/java/org/opensearch/sql/correctness/testset/TestQuerySet.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.testset;
 
 import static java.util.stream.Collectors.joining;
@@ -12,9 +11,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-/**
- * Test query set including SQL queries for comparison testing.
- */
+/** Test query set including SQL queries for comparison testing. */
 public class TestQuerySet implements Iterable<String> {
 
   private List<String> queries;
@@ -49,10 +46,9 @@ private List<String> lines(String content) {
   @Override
   public String toString() {
     int total = queries.size();
-    return "SQL queries (first 5 in " + total + "):"
-        + queries.stream().
-        limit(5).
-        collect(joining("\n ", "\n ", "\n"));
+    return "SQL queries (first 5 in "
+        + total
+        + "):"
+        + queries.stream().limit(5).collect(joining("\n ", "\n ", "\n"));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/datasource/DataSourceAPIsIT.java b/integ-test/src/test/java/org/opensearch/sql/datasource/DataSourceAPIsIT.java
new file mode 100644
index 0000000000..31fd781c51
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/datasource/DataSourceAPIsIT.java
@@ -0,0 +1,541 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasource;
+
+import static org.opensearch.sql.datasource.model.DataSourceStatus.ACTIVE;
+import static org.opensearch.sql.datasource.model.DataSourceStatus.DISABLED;
+import static org.opensearch.sql.datasources.utils.XContentParserUtils.ALLOWED_ROLES_FIELD;
+import static org.opensearch.sql.datasources.utils.XContentParserUtils.DESCRIPTION_FIELD;
+import static org.opensearch.sql.datasources.utils.XContentParserUtils.NAME_FIELD;
+import static org.opensearch.sql.datasources.utils.XContentParserUtils.STATUS_FIELD;
+import static org.opensearch.sql.legacy.TestUtils.getResponseBody;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import lombok.SneakyThrows;
+import lombok.Value;
+import org.json.JSONObject;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.Response;
+import org.opensearch.client.ResponseException;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.ppl.PPLIntegTestCase;
+import org.opensearch.sql.utils.SerializeUtils;
+
+public class DataSourceAPIsIT extends PPLIntegTestCase {
+
+  @After
+  public void cleanUp() throws IOException {
+    wipeAllClusterSettings();
+  }
+
+  @AfterClass
+  protected static void deleteDataSourcesCreated() throws IOException {
+    Request deleteRequest = getDeleteDataSourceRequest("create_prometheus");
+    Response deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+
+    deleteRequest = getDeleteDataSourceRequest("update_prometheus");
+    deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+
+    deleteRequest = getDeleteDataSourceRequest("get_all_prometheus");
+    deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+
+    deleteRequest = getDeleteDataSourceRequest("Create_Prometheus");
+    deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+
+    deleteRequest = getDeleteDataSourceRequest("duplicate_prometheus");
+    deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+
+    deleteRequest = getDeleteDataSourceRequest("patch_prometheus");
+    deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+  }
+
+  @SneakyThrows
+  @Test
+  public void createDataSourceAPITest() {
+    // create datasource
+    DataSourceMetadata createDSM =
+        new DataSourceMetadata.Builder()
+            .setName("create_prometheus")
+            .setDescription("Prometheus Creation for Integ test")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(
+                ImmutableMap.of(
+                    "prometheus.uri",
+                    "https://localhost:9090",
+                    "prometheus.auth.type",
+                    "basicauth",
+                    "prometheus.auth.username",
+                    "username",
+                    "prometheus.auth.password",
+                    "password"))
+            .build();
+    Request createRequest = getCreateDataSourceRequest(createDSM);
+    Response response = client().performRequest(createRequest);
+    Assert.assertEquals(201, response.getStatusLine().getStatusCode());
+    String createResponseString = getResponseBody(response);
+    Assert.assertEquals("\"Created DataSource with name create_prometheus\"", createResponseString);
+    // Datasource is not immediately created. so introducing a sleep of 2s.
+    Thread.sleep(2000);
+
+    // get datasource to validate the creation.
+    Request getRequest = getFetchDataSourceRequest("create_prometheus");
+    Response getResponse = client().performRequest(getRequest);
+    Assert.assertEquals(200, getResponse.getStatusLine().getStatusCode());
+    String getResponseString = getResponseBody(getResponse);
+    DataSourceMetadata dataSourceMetadata =
+        SerializeUtils.buildGson().fromJson(getResponseString, DataSourceMetadata.class);
+    Assert.assertEquals(
+        "https://localhost:9090", dataSourceMetadata.getProperties().get("prometheus.uri"));
+    Assert.assertEquals(
+        "basicauth", dataSourceMetadata.getProperties().get("prometheus.auth.type"));
+    Assert.assertNull(dataSourceMetadata.getProperties().get("prometheus.auth.username"));
+    Assert.assertNull(dataSourceMetadata.getProperties().get("prometheus.auth.password"));
+    Assert.assertEquals(ACTIVE, dataSourceMetadata.getStatus());
+    Assert.assertEquals("Prometheus Creation for Integ test", dataSourceMetadata.getDescription());
+  }
+
+  @SneakyThrows
+  @Test
+  public void updateDataSourceAPITest() {
+    // create datasource
+    DataSourceMetadata createDSM =
+        new DataSourceMetadata.Builder()
+            .setName("update_prometheus")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(ImmutableMap.of("prometheus.uri", "https://localhost:9090"))
+            .build();
+    Request createRequest = getCreateDataSourceRequest(createDSM);
+    client().performRequest(createRequest);
+    // Datasource is not immediately created. so introducing a sleep of 2s.
+    Thread.sleep(2000);
+
+    // update datasource
+    DataSourceMetadata updateDSM =
+        new DataSourceMetadata.Builder()
+            .setName("update_prometheus")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(ImmutableMap.of("prometheus.uri", "https://randomtest.com:9090"))
+            .build();
+    Request updateRequest = getUpdateDataSourceRequest(updateDSM);
+    Response updateResponse = client().performRequest(updateRequest);
+    Assert.assertEquals(200, updateResponse.getStatusLine().getStatusCode());
+    String updateResponseString = getResponseBody(updateResponse);
+    Assert.assertEquals("\"Updated DataSource with name update_prometheus\"", updateResponseString);
+
+    // Datasource is not immediately updated. so introducing a sleep of 2s.
+    Thread.sleep(2000);
+
+    // get datasource to validate the modification.
+    // get datasource
+    Request getRequest = getFetchDataSourceRequest("update_prometheus");
+    Response getResponse = client().performRequest(getRequest);
+    Assert.assertEquals(200, getResponse.getStatusLine().getStatusCode());
+    String getResponseString = getResponseBody(getResponse);
+    DataSourceMetadata dataSourceMetadata =
+        SerializeUtils.buildGson().fromJson(getResponseString, DataSourceMetadata.class);
+    Assert.assertEquals(
+        "https://randomtest.com:9090", dataSourceMetadata.getProperties().get("prometheus.uri"));
+    Assert.assertEquals("", dataSourceMetadata.getDescription());
+
+    // patch datasource
+    Map<String, Object> updateDS =
+        new HashMap<>(Map.of(NAME_FIELD, "update_prometheus", DESCRIPTION_FIELD, "test"));
+    Request patchRequest = getPatchDataSourceRequest(updateDS);
+    Response patchResponse = client().performRequest(patchRequest);
+    Assert.assertEquals(200, patchResponse.getStatusLine().getStatusCode());
+    String patchResponseString = getResponseBody(patchResponse);
+    Assert.assertEquals("\"Updated DataSource with name update_prometheus\"", patchResponseString);
+
+    // Datasource is not immediately updated. so introducing a sleep of 2s.
+    Thread.sleep(2000);
+
+    // get datasource to validate the modification.
+    // get datasource
+    Request getRequestAfterPatch = getFetchDataSourceRequest("update_prometheus");
+    Response getResponseAfterPatch = client().performRequest(getRequestAfterPatch);
+    Assert.assertEquals(200, getResponseAfterPatch.getStatusLine().getStatusCode());
+    String getResponseStringAfterPatch = getResponseBody(getResponseAfterPatch);
+    DataSourceMetadata dataSourceMetadataAfterPatch =
+        SerializeUtils.buildGson().fromJson(getResponseStringAfterPatch, DataSourceMetadata.class);
+    Assert.assertEquals(
+        "https://randomtest.com:9090",
+        dataSourceMetadataAfterPatch.getProperties().get("prometheus.uri"));
+    Assert.assertEquals("test", dataSourceMetadataAfterPatch.getDescription());
+  }
+
+  @SneakyThrows
+  @Test
+  public void deleteDataSourceTest() {
+
+    // create datasource for deletion
+    DataSourceMetadata createDSM =
+        new DataSourceMetadata.Builder()
+            .setName("delete_prometheus")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(ImmutableMap.of("prometheus.uri", "https://localhost:9090"))
+            .build();
+    Request createRequest = getCreateDataSourceRequest(createDSM);
+    client().performRequest(createRequest);
+    // Datasource is not immediately created. so introducing a sleep of 2s.
+    Thread.sleep(2000);
+
+    // delete datasource
+    Request deleteRequest = getDeleteDataSourceRequest("delete_prometheus");
+    Response deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+
+    // Datasource is not immediately deleted. so introducing a sleep of 2s.
+    Thread.sleep(2000);
+
+    // get datasources to verify the deletion
+    final Request prometheusGetRequest = getFetchDataSourceRequest("delete_prometheus");
+    ResponseException prometheusGetResponseException =
+        Assert.assertThrows(
+            ResponseException.class, () -> client().performRequest(prometheusGetRequest));
+    Assert.assertEquals(
+        404, prometheusGetResponseException.getResponse().getStatusLine().getStatusCode());
+    String prometheusGetResponseString =
+        getResponseBody(prometheusGetResponseException.getResponse());
+    JsonObject errorMessage =
+        SerializeUtils.buildGson().fromJson(prometheusGetResponseString, JsonObject.class);
+    Assert.assertEquals(
+        "DataSource with name delete_prometheus doesn't exist.",
+        errorMessage.get("error").getAsJsonObject().get("details").getAsString());
+  }
+
+  @SneakyThrows
+  @Test
+  public void getAllDataSourceTest() {
+    // create datasource for deletion
+    DataSourceMetadata createDSM =
+        new DataSourceMetadata.Builder()
+            .setName("get_all_prometheus")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(ImmutableMap.of("prometheus.uri", "https://localhost:9090"))
+            .build();
+    Request createRequest = getCreateDataSourceRequest(createDSM);
+    client().performRequest(createRequest);
+    // Datasource is not immediately created. so introducing a sleep of 2s.
+    Thread.sleep(2000);
+
+    Request getRequest = getFetchDataSourceRequest(null);
+    Response getResponse = client().performRequest(getRequest);
+    Assert.assertEquals(200, getResponse.getStatusLine().getStatusCode());
+    String getResponseString = getResponseBody(getResponse);
+    Type listType = new TypeToken<ArrayList<DataSourceMetadata>>() {}.getType();
+    List<DataSourceMetadata> dataSourceMetadataList =
+        SerializeUtils.buildGson().fromJson(getResponseString, listType);
+    Assert.assertTrue(
+        dataSourceMetadataList.stream().anyMatch(ds -> ds.getName().equals("get_all_prometheus")));
+  }
+
+  /** https://github.com/opensearch-project/sql/issues/2196 */
+  @SneakyThrows
+  @Test
+  public void issue2196() {
+    // create datasource
+    DataSourceMetadata createDSM =
+        new DataSourceMetadata.Builder()
+            .setName("Create_Prometheus")
+            .setDescription("Prometheus Creation for Integ test")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(
+                ImmutableMap.of(
+                    "prometheus.uri",
+                    "https://localhost:9090",
+                    "prometheus.auth.type",
+                    "basicauth",
+                    "prometheus.auth.username",
+                    "username",
+                    "prometheus.auth.password",
+                    "password"))
+            .build();
+    Request createRequest = getCreateDataSourceRequest(createDSM);
+    Response response = client().performRequest(createRequest);
+    Assert.assertEquals(201, response.getStatusLine().getStatusCode());
+    String createResponseString = getResponseBody(response);
+    Assert.assertEquals("\"Created DataSource with name Create_Prometheus\"", createResponseString);
+    // Datasource is not immediately created. so introducing a sleep of 2s.
+    Thread.sleep(2000);
+
+    // get datasource to validate the creation.
+    Request getRequest = getFetchDataSourceRequest("Create_Prometheus");
+    Response getResponse = client().performRequest(getRequest);
+    Assert.assertEquals(200, getResponse.getStatusLine().getStatusCode());
+    String getResponseString = getResponseBody(getResponse);
+    DataSourceMetadata dataSourceMetadata =
+        SerializeUtils.buildGson().fromJson(getResponseString, DataSourceMetadata.class);
+    Assert.assertEquals(
+        "https://localhost:9090", dataSourceMetadata.getProperties().get("prometheus.uri"));
+    Assert.assertEquals(
+        "basicauth", dataSourceMetadata.getProperties().get("prometheus.auth.type"));
+    Assert.assertNull(dataSourceMetadata.getProperties().get("prometheus.auth.username"));
+    Assert.assertNull(dataSourceMetadata.getProperties().get("prometheus.auth.password"));
+    Assert.assertEquals("Prometheus Creation for Integ test", dataSourceMetadata.getDescription());
+  }
+
+  @Test
+  public void datasourceLimitTest() throws InterruptedException, IOException {
+    DataSourceMetadata d1 = mockDataSourceMetadata("duplicate_prometheus");
+    Request createRequest = getCreateDataSourceRequest(d1);
+    Response response = client().performRequest(createRequest);
+    Assert.assertEquals(201, response.getStatusLine().getStatusCode());
+    // Datasource is not immediately created. so introducing a sleep of 2s.
+    Thread.sleep(2000);
+
+    updateClusterSettings(new ClusterSetting(TRANSIENT, "plugins.query.datasources.limit", "1"));
+
+    DataSourceMetadata d2 = mockDataSourceMetadata("d2");
+    ResponseException exception =
+        Assert.assertThrows(
+            ResponseException.class, () -> client().performRequest(getCreateDataSourceRequest(d2)));
+    Assert.assertEquals(400, exception.getResponse().getStatusLine().getStatusCode());
+    String prometheusGetResponseString = getResponseBody(exception.getResponse());
+    JsonObject errorMessage =
+        SerializeUtils.buildGson().fromJson(prometheusGetResponseString, JsonObject.class);
+    Assert.assertEquals(
+        "domain concurrent datasources can not exceed 1",
+        errorMessage.get("error").getAsJsonObject().get("details").getAsString());
+  }
+
+  @SneakyThrows
+  @Test
+  public void patchDataSourceAPITest() {
+    // create datasource
+    DataSourceMetadata createDSM =
+        new DataSourceMetadata.Builder()
+            .setName("patch_prometheus")
+            .setDescription("Prometheus Creation for Integ test")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(
+                ImmutableMap.of(
+                    "prometheus.uri",
+                    "https://localhost:9090",
+                    "prometheus.auth.type",
+                    "basicauth",
+                    "prometheus.auth.username",
+                    "username",
+                    "prometheus.auth.password",
+                    "password"))
+            .setAllowedRoles(List.of("role1", "role2"))
+            .build();
+    Request createRequest = getCreateDataSourceRequest(createDSM);
+    Response response = client().performRequest(createRequest);
+    Assert.assertEquals(201, response.getStatusLine().getStatusCode());
+    String createResponseString = getResponseBody(response);
+    Assert.assertEquals("\"Created DataSource with name patch_prometheus\"", createResponseString);
+    // Datasource is not immediately created. so introducing a sleep of 2s.
+    Thread.sleep(2000);
+
+    // patch datasource
+    Map<String, Object> updateDS =
+        new HashMap<>(
+            Map.of(
+                NAME_FIELD,
+                "patch_prometheus",
+                DESCRIPTION_FIELD,
+                "test",
+                STATUS_FIELD,
+                "disabled",
+                ALLOWED_ROLES_FIELD,
+                List.of("role3", "role4")));
+
+    Request patchRequest = getPatchDataSourceRequest(updateDS);
+    Response patchResponse = client().performRequest(patchRequest);
+    Assert.assertEquals(200, patchResponse.getStatusLine().getStatusCode());
+    String patchResponseString = getResponseBody(patchResponse);
+    Assert.assertEquals("\"Updated DataSource with name patch_prometheus\"", patchResponseString);
+
+    // Datasource is not immediately updated. so introducing a sleep of 2s.
+    Thread.sleep(2000);
+
+    // get datasource to validate the creation.
+    Request getRequest = getFetchDataSourceRequest("patch_prometheus");
+    Response getResponse = client().performRequest(getRequest);
+    Assert.assertEquals(200, getResponse.getStatusLine().getStatusCode());
+    String getResponseString = getResponseBody(getResponse);
+    DataSourceMetadata dataSourceMetadata =
+        SerializeUtils.buildGson().fromJson(getResponseString, DataSourceMetadata.class);
+    Assert.assertEquals(
+        "https://localhost:9090", dataSourceMetadata.getProperties().get("prometheus.uri"));
+    Assert.assertEquals(
+        "basicauth", dataSourceMetadata.getProperties().get("prometheus.auth.type"));
+    Assert.assertNull(dataSourceMetadata.getProperties().get("prometheus.auth.username"));
+    Assert.assertNull(dataSourceMetadata.getProperties().get("prometheus.auth.password"));
+    Assert.assertEquals(DISABLED, dataSourceMetadata.getStatus());
+    Assert.assertEquals(List.of("role3", "role4"), dataSourceMetadata.getAllowedRoles());
+    Assert.assertEquals("test", dataSourceMetadata.getDescription());
+  }
+
+  @Test
+  public void testDataSourcesEnabledSettingIsTrueByDefault() {
+    Assert.assertTrue(getDataSourceEnabledSetting("defaults"));
+  }
+
+  @Test
+  public void testDataSourcesEnabledSettingCanBeSetToTransientFalse() {
+    setDataSourcesEnabled("transient", false);
+    Assert.assertFalse(getDataSourceEnabledSetting("transient"));
+  }
+
+  @Test
+  public void testDataSourcesEnabledSettingCanBeSetToTransientTrue() {
+    setDataSourcesEnabled("transient", true);
+    Assert.assertTrue(getDataSourceEnabledSetting("transient"));
+  }
+
+  @Test
+  public void testDataSourcesEnabledSettingCanBeSetToPersistentFalse() {
+    setDataSourcesEnabled("persistent", false);
+    Assert.assertFalse(getDataSourceEnabledSetting("persistent"));
+  }
+
+  @Test
+  public void testDataSourcesEnabledSettingCanBeSetToPersistentTrue() {
+    setDataSourcesEnabled("persistent", true);
+    Assert.assertTrue(getDataSourceEnabledSetting("persistent"));
+  }
+
+  @Test
+  public void testDataSourcesEnabledSetToFalseRejectsApiOperations() {
+    setDataSourcesEnabled("transient", false);
+    validateAllDataSourceApisWithEnabledSetting(false);
+  }
+
+  @Test
+  public void testDataSourcesEnabledSetToTrueAllowsApiOperations() {
+    setDataSourcesEnabled("transient", true);
+    validateAllDataSourceApisWithEnabledSetting(true);
+  }
+
+  @SneakyThrows
+  private void validateAllDataSourceApisWithEnabledSetting(boolean dataSourcesEnabled) {
+
+    @Value
+    class TestCase {
+      Request request;
+      int expectedResponseCodeOnSuccess;
+      String expectResponseToContainOnSuccess;
+    }
+
+    TestCase[] testCases =
+        new TestCase[] {
+          // create
+          new TestCase(
+              getCreateDataSourceRequest(mockDataSourceMetadata("dummy")),
+              201,
+              "Created DataSource"),
+          // read
+          new TestCase(getFetchDataSourceRequest("dummy"), 200, "dummy"),
+          // update
+          new TestCase(
+              getUpdateDataSourceRequest(mockDataSourceMetadata("dummy")),
+              200,
+              "Updated DataSource"),
+          // list
+          new TestCase(getFetchDataSourceRequest(null), 200, "dummy"),
+          // delete
+          new TestCase(getDeleteDataSourceRequest("dummy"), 204, null)
+        };
+
+    for (TestCase testCase : testCases) {
+
+      // data source APIs are eventually consistent. sleep delay is added for consistency
+      // see createDataSourceAPITest above.
+      Thread.sleep(2_000);
+
+      final int expectedResponseCode =
+          dataSourcesEnabled ? testCase.getExpectedResponseCodeOnSuccess() : 400;
+
+      final String expectedResponseBodyToContain =
+          dataSourcesEnabled
+              ? testCase.getExpectResponseToContainOnSuccess()
+              : "plugins.query.datasources.enabled setting is false";
+
+      Response response;
+
+      try {
+        response = client().performRequest(testCase.getRequest());
+      } catch (ResponseException e) {
+        response = e.getResponse();
+      }
+
+      Assert.assertEquals(
+          String.format(
+              "Test for " + testCase + " failed. Expected response code of %s, but got %s",
+              expectedResponseCode,
+              response.getStatusLine().getStatusCode()),
+          expectedResponseCode,
+          response.getStatusLine().getStatusCode());
+
+      if (expectedResponseBodyToContain != null) {
+
+        String responseBody = getResponseBody(response);
+
+        Assert.assertTrue(
+            String.format(
+                "Test for " + testCase + " failed. '%s' failed to contain '%s'",
+                responseBody,
+                expectedResponseBodyToContain),
+            responseBody.contains(expectedResponseBodyToContain));
+      }
+    }
+  }
+
+  @SneakyThrows
+  private boolean getDataSourceEnabledSetting(String... clusterSettingsTypeKeys) {
+
+    final String settingKey = Settings.Key.DATASOURCES_ENABLED.getKeyValue();
+
+    JSONObject settings = getAllClusterSettings();
+
+    return Arrays.stream(clusterSettingsTypeKeys)
+        .map(settings::getJSONObject)
+        .filter(obj -> obj.has(settingKey))
+        .map(obj -> obj.getBoolean(settingKey))
+        .findFirst()
+        .orElseThrow();
+  }
+
+  public DataSourceMetadata mockDataSourceMetadata(String name) {
+    return new DataSourceMetadata.Builder()
+        .setName(name)
+        .setDescription("Prometheus Creation for Integ test")
+        .setConnector(DataSourceType.PROMETHEUS)
+        .setProperties(
+            ImmutableMap.of(
+                "prometheus.uri",
+                "https://localhost:9090",
+                "prometheus.auth.type",
+                "basicauth",
+                "prometheus.auth.username",
+                "username",
+                "prometheus.auth.password",
+                "password"))
+        .build();
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/datasource/DataSourceEnabledIT.java b/integ-test/src/test/java/org/opensearch/sql/datasource/DataSourceEnabledIT.java
new file mode 100644
index 0000000000..a53c04d871
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/datasource/DataSourceEnabledIT.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasource;
+
+import static org.opensearch.sql.legacy.TestUtils.getResponseBody;
+
+import java.io.IOException;
+import lombok.SneakyThrows;
+import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.Response;
+import org.opensearch.client.ResponseException;
+import org.opensearch.sql.ppl.PPLIntegTestCase;
+
+public class DataSourceEnabledIT extends PPLIntegTestCase {
+
+  @After
+  public void cleanUp() throws IOException {
+    wipeAllClusterSettings();
+  }
+
+  @Test
+  public void testAsyncQueryAPIFailureIfSettingIsDisabled() {
+    setDataSourcesEnabled("transient", false);
+    assertDataSourceCount(0);
+    assertSelectFromDataSourceReturnsDoesNotExist();
+    assertAsyncQueryApiDisabled();
+  }
+
+  @Test
+  public void testDataSourceCreationWithDefaultSettings() {
+    createOpenSearchDataSource();
+    createIndex();
+    assertDataSourceCount(1);
+    assertSelectFromDataSourceReturnsSuccess();
+    assertSelectFromDummyIndexInValidDataSourceDataSourceReturnsDoesNotExist();
+    deleteSelfDataSourceCreated();
+    deleteIndex();
+  }
+
+  @Test
+  public void testAfterPreviousEnable() {
+    setDataSourcesEnabled("transient", true);
+    createOpenSearchDataSource();
+    createIndex();
+    assertDataSourceCount(1);
+    assertSelectFromDataSourceReturnsSuccess();
+    assertSelectFromDummyIndexInValidDataSourceDataSourceReturnsDoesNotExist();
+    setDataSourcesEnabled("transient", false);
+    assertDataSourceCount(0);
+    assertSelectFromDataSourceReturnsDoesNotExist();
+    assertAsyncQueryApiDisabled();
+    setDataSourcesEnabled("transient", true);
+    deleteSelfDataSourceCreated();
+    deleteIndex();
+  }
+
+  @SneakyThrows
+  private void assertSelectFromDataSourceReturnsDoesNotExist() {
+    Request request = new Request("POST", "/_plugins/_sql");
+    request.setJsonEntity(new JSONObject().put("query", "select * from self.myindex").toString());
+    Response response = performRequest(request);
+    Assert.assertEquals(404, response.getStatusLine().getStatusCode());
+    String result = getResponseBody(response);
+    Assert.assertTrue(result.contains("IndexNotFoundException[no such index [self.myindex]]"));
+  }
+
+  @SneakyThrows
+  private void assertSelectFromDummyIndexInValidDataSourceDataSourceReturnsDoesNotExist() {
+    Request request = new Request("POST", "/_plugins/_sql");
+    request.setJsonEntity(new JSONObject().put("query", "select * from self.dummy").toString());
+    Response response = performRequest(request);
+    Assert.assertEquals(404, response.getStatusLine().getStatusCode());
+    String result = getResponseBody(response);
+    // subtle difference in error messaging shows that it resolved self to a data source
+    Assert.assertTrue(result.contains("IndexNotFoundException[no such index [dummy]]"));
+  }
+
+  @SneakyThrows
+  private void assertSelectFromDataSourceReturnsSuccess() {
+    Request request = new Request("POST", "/_plugins/_sql");
+    request.setJsonEntity(new JSONObject().put("query", "select * from self.myindex").toString());
+    Response response = performRequest(request);
+    Assert.assertEquals(200, response.getStatusLine().getStatusCode());
+    JSONObject result = new JSONObject(getResponseBody(response));
+    Assert.assertTrue(result.has("datarows"));
+    Assert.assertTrue(result.has("schema"));
+    Assert.assertTrue(result.has("total"));
+    Assert.assertTrue(result.has("size"));
+    Assert.assertEquals(200, result.getNumber("status"));
+  }
+
+  private void createIndex() {
+    Request request = new Request("PUT", "/myindex");
+    Response response = performRequest(request);
+    Assert.assertEquals(200, response.getStatusLine().getStatusCode());
+  }
+
+  private void deleteIndex() {
+    Request request = new Request("DELETE", "/myindex");
+    Response response = performRequest(request);
+    Assert.assertEquals(200, response.getStatusLine().getStatusCode());
+  }
+
+  private void createOpenSearchDataSource() {
+    Request request = new Request("POST", "/_plugins/_query/_datasources");
+    request.setJsonEntity(
+        new JSONObject().put("connector", "OPENSEARCH").put("name", "self").toString());
+    Response response = performRequest(request);
+    Assert.assertEquals(201, response.getStatusLine().getStatusCode());
+  }
+
+  @SneakyThrows
+  private void assertAsyncQueryApiDisabled() {
+
+    Request request = new Request("POST", "/_plugins/_async_query");
+
+    request.setJsonEntity(
+        new JSONObject()
+            .put("query", "select * from self.myindex")
+            .put("datasource", "self")
+            .put("lang", "sql")
+            .toString());
+
+    Response response = performRequest(request);
+    Assert.assertEquals(400, response.getStatusLine().getStatusCode());
+
+    String expectBodyToContain = "plugins.query.datasources.enabled setting is false";
+    Assert.assertTrue(getResponseBody(response).contains(expectBodyToContain));
+  }
+
+  @SneakyThrows
+  private void assertDataSourceCount(int expected) {
+    Request request = new Request("POST", "/_plugins/_ppl");
+    request.setJsonEntity(new JSONObject().put("query", "show datasources").toString());
+    Response response = performRequest(request);
+    Assert.assertEquals(200, response.getStatusLine().getStatusCode());
+    JSONObject jsonBody = new JSONObject(getResponseBody(response));
+    Assert.assertEquals(expected, jsonBody.getNumber("size"));
+    Assert.assertEquals(expected, jsonBody.getNumber("total"));
+    Assert.assertEquals(expected, jsonBody.getJSONArray("datarows").length());
+  }
+
+  @SneakyThrows
+  private Response performRequest(Request request) {
+    try {
+      return client().performRequest(request);
+    } catch (ResponseException e) {
+      return e.getResponse();
+    }
+  }
+
+  @SneakyThrows
+  private void deleteSelfDataSourceCreated() {
+    Request deleteRequest = getDeleteDataSourceRequest("self");
+    Response deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/datasource/DatasourceClusterSettingsIT.java b/integ-test/src/test/java/org/opensearch/sql/datasource/DatasourceClusterSettingsIT.java
new file mode 100644
index 0000000000..01e3509e12
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/datasource/DatasourceClusterSettingsIT.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.datasource;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import java.io.IOException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.opensearch.client.ResponseException;
+import org.opensearch.sql.legacy.TestUtils;
+import org.opensearch.sql.ppl.PPLIntegTestCase;
+
+public class DatasourceClusterSettingsIT extends PPLIntegTestCase {
+
+  private static final Logger LOG = LogManager.getLogger();
+
+  @Test
+  public void testGetDatasourceClusterSettings() throws IOException {
+    JSONObject clusterSettings = getAllClusterSettings();
+    assertThat(
+        clusterSettings.query("/defaults/plugins.query.datasources.encryption.masterkey"),
+        equalTo(null));
+  }
+
+  @Test
+  public void testPutDatasourceClusterSettings() throws IOException {
+    final ResponseException exception =
+        expectThrows(
+            ResponseException.class,
+            () ->
+                updateClusterSettings(
+                    new ClusterSetting(
+                        PERSISTENT,
+                        "plugins.query.datasources.encryption.masterkey",
+                        "masterkey")));
+    JSONObject resp = new JSONObject(TestUtils.getResponseBody(exception.getResponse()));
+    assertThat(resp.getInt("status"), equalTo(400));
+    assertThat(
+        resp.query("/error/root_cause/0/reason"),
+        equalTo(
+            "final persistent setting [plugins.query.datasources.encryption.masterkey], not"
+                + " updateable"));
+    assertThat(resp.query("/error/type"), equalTo("illegal_argument_exception"));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/jdbc/CursorIT.java b/integ-test/src/test/java/org/opensearch/sql/jdbc/CursorIT.java
new file mode 100644
index 0000000000..b3f2c1f0ca
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/jdbc/CursorIT.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.jdbc;
+
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_CALCS;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ONLINE;
+import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
+import static org.opensearch.sql.util.TestUtils.getResponseBody;
+
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.List;
+import javax.annotation.Nullable;
+import lombok.SneakyThrows;
+import org.json.JSONObject;
+import org.junit.AfterClass;
+import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.client.Response;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@ThreadLeakScope(ThreadLeakScope.Scope.NONE)
+public class CursorIT extends SQLIntegTestCase {
+
+  private static Connection connection;
+  private boolean initialized = false;
+
+  @BeforeEach
+  @SneakyThrows
+  public void init() {
+    if (!initialized) {
+      initClient();
+      resetQuerySizeLimit();
+      loadIndex(Index.BANK);
+      loadIndex(Index.CALCS);
+      loadIndex(Index.ONLINE);
+      loadIndex(Index.ACCOUNT);
+      initialized = true;
+    }
+  }
+
+  @BeforeAll
+  @BeforeClass
+  @SneakyThrows
+  public static void initConnection() {
+    var driverFile = System.getProperty("jdbcFile");
+    if (driverFile != null) {
+      URLClassLoader loader =
+          new URLClassLoader(
+              new URL[] {new File(driverFile).toURI().toURL()}, ClassLoader.getSystemClassLoader());
+      Driver driver =
+          (Driver)
+              Class.forName("org.opensearch.jdbc.Driver", true, loader)
+                  .getDeclaredConstructor()
+                  .newInstance();
+      connection = driver.connect(getConnectionString(), null);
+    } else {
+      connection = DriverManager.getConnection(getConnectionString());
+    }
+  }
+
+  @AfterAll
+  @AfterClass
+  @SneakyThrows
+  public static void closeConnection() {
+    // TODO should we close Statement and ResultSet?
+    if (connection != null) {
+      connection.close();
+      connection = null;
+    }
+  }
+
+  @Test
+  @SneakyThrows
+  public void check_driver_version() {
+    var version = System.getProperty("jdbcDriverVersion");
+    Assume.assumeTrue(
+        "Parameter `jdbcDriverVersion` is not given, test platform uses default driver version",
+        version != null);
+    assertEquals(version, connection.getMetaData().getDriverVersion());
+  }
+
+  @Test
+  @SneakyThrows
+  public void select_all_no_cursor() {
+    Statement stmt = connection.createStatement();
+
+    for (var table :
+        List.of(TEST_INDEX_CALCS, TEST_INDEX_ONLINE, TEST_INDEX_BANK, TEST_INDEX_ACCOUNT)) {
+      var query = String.format("SELECT * FROM %s", table);
+      ResultSet rs = stmt.executeQuery(query);
+      int rows = 0;
+      for (; rs.next(); rows++)
+        ;
+
+      var restResponse = executeRestQuery(query, null);
+      assertEquals(rows, restResponse.getInt("total"));
+    }
+  }
+
+  @Test
+  @SneakyThrows
+  public void select_count_all_no_cursor() {
+    Statement stmt = connection.createStatement();
+
+    for (var table :
+        List.of(TEST_INDEX_CALCS, TEST_INDEX_ONLINE, TEST_INDEX_BANK, TEST_INDEX_ACCOUNT)) {
+      var query = String.format("SELECT COUNT(*) FROM %s", table);
+      ResultSet rs = stmt.executeQuery(query);
+      int rows = 0;
+      for (; rs.next(); rows++)
+        ;
+
+      var restResponse = executeRestQuery(query, null);
+      assertEquals(rows, restResponse.getInt("total"));
+    }
+  }
+
+  @Test
+  @SneakyThrows
+  public void select_all_small_table_big_cursor() {
+    Statement stmt = connection.createStatement();
+
+    for (var table : List.of(TEST_INDEX_CALCS, TEST_INDEX_BANK)) {
+      var query = String.format("SELECT COUNT(*) FROM %s", table);
+      stmt.setFetchSize(200);
+      ResultSet rs = stmt.executeQuery(query);
+      int rows = 0;
+      for (; rs.next(); rows++)
+        ;
+
+      var restResponse = executeRestQuery(query, null);
+      assertEquals(rows, restResponse.getInt("total"));
+    }
+  }
+
+  @Test
+  @SneakyThrows
+  public void select_all_small_table_small_cursor() {
+    Statement stmt = connection.createStatement();
+
+    for (var table : List.of(TEST_INDEX_CALCS, TEST_INDEX_BANK)) {
+      var query = String.format("SELECT * FROM %s", table);
+      stmt.setFetchSize(3);
+      ResultSet rs = stmt.executeQuery(query);
+      int rows = 0;
+      for (; rs.next(); rows++)
+        ;
+
+      var restResponse = executeRestQuery(query, null);
+      assertEquals(rows, restResponse.getInt("total"));
+    }
+  }
+
+  @Test
+  @SneakyThrows
+  public void select_all_big_table_small_cursor() {
+    Statement stmt = connection.createStatement();
+
+    for (var table : List.of(TEST_INDEX_ONLINE, TEST_INDEX_ACCOUNT)) {
+      var query = String.format("SELECT * FROM %s", table);
+      stmt.setFetchSize(10);
+      ResultSet rs = stmt.executeQuery(query);
+      int rows = 0;
+      for (; rs.next(); rows++)
+        ;
+
+      var restResponse = executeRestQuery(query, null);
+      assertEquals(rows, restResponse.getInt("total"));
+    }
+  }
+
+  @Test
+  @SneakyThrows
+  public void select_all_big_table_big_cursor() {
+    Statement stmt = connection.createStatement();
+
+    for (var table : List.of(TEST_INDEX_ONLINE, TEST_INDEX_ACCOUNT)) {
+      var query = String.format("SELECT * FROM %s", table);
+      stmt.setFetchSize(500);
+      ResultSet rs = stmt.executeQuery(query);
+      int rows = 0;
+      for (; rs.next(); rows++)
+        ;
+
+      var restResponse = executeRestQuery(query, null);
+      assertEquals(rows, restResponse.getInt("total"));
+    }
+  }
+
+  /** Use OpenSearch cluster initialized by OpenSearch Gradle task. */
+  private static String getConnectionString() {
+    // string like "[::1]:46751,127.0.0.1:34403"
+    var clusterUrls = System.getProperty("tests.rest.cluster").split(",");
+    return String.format("jdbc:opensearch://%s", clusterUrls[clusterUrls.length - 1]);
+  }
+
+  @SneakyThrows
+  protected JSONObject executeRestQuery(String query, @Nullable Integer fetch_size) {
+    Request request = new Request("POST", QUERY_API_ENDPOINT);
+    if (fetch_size != null) {
+      request.setJsonEntity(
+          String.format("{ \"query\": \"%s\", \"fetch_size\": %d }", query, fetch_size));
+    } else {
+      request.setJsonEntity(String.format("{ \"query\": \"%s\" }", query));
+    }
+
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+
+    Response response = client().performRequest(request);
+    return new JSONObject(getResponseBody(response));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/AggregationExpressionIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/AggregationExpressionIT.java
index d4374dcbaf..37398220ff 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/AggregationExpressionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/AggregationExpressionIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.opensearch.sql.util.MatcherUtils.rows;
@@ -12,8 +11,6 @@
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
 import org.json.JSONObject;
-import org.junit.Assume;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class AggregationExpressionIT extends SQLIntegTestCase {
@@ -26,10 +23,9 @@ protected void init() throws Exception {
 
   @Test
   public void noGroupKeySingleFuncOverAggWithoutAliasShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT abs(MAX(age)) " +
-            "FROM %s",
-        Index.ACCOUNT.getName()));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format("SELECT abs(MAX(age)) " + "FROM %s", Index.ACCOUNT.getName()));
 
     verifySchema(response, schema("abs(MAX(age))", null, "long"));
     verifyDataRows(response, rows(40));
@@ -37,222 +33,216 @@ public void noGroupKeySingleFuncOverAggWithoutAliasShouldPass() {
 
   @Test
   public void noGroupKeyMaxAddMinShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT MAX(age) + MIN(age) as addValue " +
-            "FROM %s",
-        Index.ACCOUNT.getName()));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT MAX(age) + MIN(age) as addValue " + "FROM %s", Index.ACCOUNT.getName()));
 
     verifySchema(response, schema("MAX(age) + MIN(age)", "addValue", "long"));
     verifyDataRows(response, rows(60));
   }
 
-  // todo age field should has long type instead of integer type.
-  @Ignore
   @Test
   public void noGroupKeyMaxAddLiteralShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT MAX(age) + 1 as add " +
-            "FROM %s",
-        Index.ACCOUNT.getName()));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format("SELECT MAX(age) + 1 as `add` " + "FROM %s", Index.ACCOUNT.getName()));
 
-    verifySchema(response, schema("add", "add", "long"));
+    verifySchema(response, schema("MAX(age) + 1", "add", "long"));
     verifyDataRows(response, rows(41));
   }
 
-  @Ignore("skip this test because the old engine returns an integer instead of a double type")
   @Test
   public void noGroupKeyAvgOnIntegerShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT AVG(age) as avg " +
-            "FROM %s",
-        Index.BANK.getName()));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format("SELECT AVG(age) as `avg` " + "FROM %s", Index.BANK.getName()));
 
-    verifySchema(response, schema("avg", "avg", "double"));
-    verifyDataRows(response, rows(34));
+    verifySchema(response, schema("AVG(age)", "avg", "double"));
+    verifyDataRows(response, rows(34D));
   }
 
   @Test
   public void hasGroupKeyAvgOnIntegerShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT gender, AVG(age) as avg " +
-            "FROM %s " +
-            "GROUP BY gender",
-        Index.BANK.getName()));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT gender, AVG(age) as `avg` " + "FROM %s " + "GROUP BY gender",
+                Index.BANK.getName()));
 
-    verifySchema(response,
-        schema("gender", null, "text"),
-        schema("AVG(age)", "avg", "double"));
-    verifyDataRows(response,
-        rows("m", 34.25),
-        rows("f", 33.666666666666664d));
+    verifySchema(response, schema("gender", null, "text"), schema("AVG(age)", "avg", "double"));
+    verifyDataRows(response, rows("m", 34.25), rows("f", 33.666666666666664d));
   }
 
   @Test
   public void hasGroupKeyMaxAddMinShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT gender, MAX(age) + MIN(age) as addValue " +
-            "FROM %s " +
-            "GROUP BY gender",
-        Index.ACCOUNT.getName()));
-
-    verifySchema(response,
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT gender, MAX(age) + MIN(age) as addValue " + "FROM %s " + "GROUP BY gender",
+                Index.ACCOUNT.getName()));
+
+    verifySchema(
+        response,
         schema("gender", null, "text"),
         schema("MAX(age) + MIN(age)", "addValue", "long"));
-    verifyDataRows(response,
-        rows("m", 60),
-        rows("f", 60));
+    verifyDataRows(response, rows("m", 60), rows("f", 60));
   }
 
-  // todo age field should has long type instead of integer type.
-  @Ignore
   @Test
   public void hasGroupKeyMaxAddLiteralShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT gender, MAX(age) + 1 as add " +
-            "FROM %s " +
-            "GROUP BY gender",
-        Index.ACCOUNT.getName()));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT gender, MAX(age) + 1 as `add` " + "FROM %s " + "GROUP BY gender",
+                Index.ACCOUNT.getName()));
 
-    verifySchema(response,
-        schema("gender", null, "text"),
-        schema("add", "add", "long"));
-    verifyDataRows(response,
-        rows("m", 1),
-        rows("f", 1));
+    verifySchema(response, schema("gender", null, "text"), schema("MAX(age) + 1", "add", "long"));
+    verifyDataRows(response, rows("m", 41), rows("f", 41));
   }
 
   @Test
   public void noGroupKeyLogMaxAddMinShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT Log(MAX(age) + MIN(age)) as log " +
-            "FROM %s",
-        Index.ACCOUNT.getName()));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT Log(MAX(age) + MIN(age)) as `log` " + "FROM %s", Index.ACCOUNT.getName()));
 
-    verifySchema(response, schema("log", "log", "double"));
+    verifySchema(response, schema("Log(MAX(age) + MIN(age))", "log", "double"));
     verifyDataRows(response, rows(4.0943445622221d));
   }
 
   @Test
   public void hasGroupKeyLogMaxAddMinShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT gender, Log(MAX(age) + MIN(age)) as logValue " +
-            "FROM %s " +
-            "GROUP BY gender",
-        Index.ACCOUNT.getName()));
-
-    verifySchema(response,
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT gender, Log(MAX(age) + MIN(age)) as logValue "
+                    + "FROM %s "
+                    + "GROUP BY gender",
+                Index.ACCOUNT.getName()));
+
+    verifySchema(
+        response,
         schema("gender", null, "text"),
         schema("Log(MAX(age) + MIN(age))", "logValue", "double"));
-    verifyDataRows(response,
-        rows("m", 4.0943445622221d),
-        rows("f", 4.0943445622221d));
+    verifyDataRows(response, rows("m", 4.0943445622221d), rows("f", 4.0943445622221d));
   }
 
-  // todo age field should has long type instead of integer type.
-  @Ignore
   @Test
   public void AddLiteralOnGroupKeyShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT gender, age+10, max(balance) as max " +
-            "FROM %s " +
-            "WHERE gender = 'm' and age < 22 " +
-            "GROUP BY gender, age " +
-            "ORDER BY age",
-        Index.ACCOUNT.getName()));
-
-    verifySchema(response,
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT gender, age+10, max(balance) as `max` "
+                    + "FROM %s "
+                    + "WHERE gender = 'm' and age < 22 "
+                    + "GROUP BY gender, age "
+                    + "ORDER BY age",
+                Index.ACCOUNT.getName()));
+
+    verifySchema(
+        response,
         schema("gender", null, "text"),
-        schema("age", "age", "long"),
-        schema("max", "max", "long"));
-    verifyDataRows(response,
-        rows("m", 30, 49568),
-        rows("m", 31, 49433));
+        schema("age+10", null, "long"),
+        schema("max(balance)", "max", "long"));
+    verifyDataRows(response, rows("m", 30, 49568), rows("m", 31, 49433));
   }
 
   @Test
   public void logWithAddLiteralOnGroupKeyShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT gender, Log(age+10) as logAge, max(balance) as max " +
-            "FROM %s " +
-            "WHERE gender = 'm' and age < 22 " +
-            "GROUP BY gender, age " +
-            "ORDER BY age",
-        Index.ACCOUNT.getName()));
-
-    verifySchema(response,
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT gender, Log(age+10) as logAge, max(balance) as max "
+                    + "FROM %s "
+                    + "WHERE gender = 'm' and age < 22 "
+                    + "GROUP BY gender, age "
+                    + "ORDER BY age",
+                Index.ACCOUNT.getName()));
+
+    verifySchema(
+        response,
         schema("gender", null, "text"),
         schema("Log(age+10)", "logAge", "double"),
         schema("max(balance)", "max", "long"));
-    verifyDataRows(response,
-        rows("m", 3.4011973816621555d, 49568),
-        rows("m", 3.4339872044851463d, 49433));
+    verifyDataRows(
+        response, rows("m", 3.4011973816621555d, 49568), rows("m", 3.4339872044851463d, 49433));
   }
 
-  // todo max field should has long as type instead of integer type.
-  @Ignore
   @Test
   public void logWithAddLiteralOnGroupKeyAndMaxSubtractLiteralShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT gender, Log(age+10) as logAge, max(balance) - 100 as max " +
-            "FROM %s " +
-            "WHERE gender = 'm' and age < 22 " +
-            "GROUP BY gender, age " +
-            "ORDER BY age",
-        Index.ACCOUNT.getName()));
-
-    verifySchema(response,
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT gender, Log(age+10) as logAge, max(balance) - 100 as max "
+                    + "FROM %s "
+                    + "WHERE gender = 'm' and age < 22 "
+                    + "GROUP BY gender, age "
+                    + "ORDER BY age",
+                Index.ACCOUNT.getName()));
+
+    verifySchema(
+        response,
         schema("gender", null, "text"),
-        schema("logAge", "logAge", "double"),
-        schema("max", "max", "long"));
-    verifyDataRows(response,
-        rows("m", 3.4011973816621555d, 49468),
-        rows("m", 3.4339872044851463d, 49333));
+        schema("Log(age+10)", "logAge", "double"),
+        schema("max(balance) - 100", "max", "long"));
+    verifyDataRows(
+        response, rows("m", 3.4011973816621555d, 49468), rows("m", 3.4339872044851463d, 49333));
   }
 
-  /**
-   * The date is in JDBC format.
-   */
-  @Ignore("skip this test due to inconsistency in type in new engine")
+  /** The date is in JDBC format. */
   @Test
   public void groupByDateShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT birthdate, count(*) as count " +
-            "FROM %s " +
-            "WHERE age < 30 " +
-            "GROUP BY birthdate ",
-        Index.BANK.getName()));
-
-    verifySchema(response,
-        schema("birthdate", null, "date"),
-        schema("count", "count", "integer"));
-    verifyDataRows(response,
-        rows("2018-06-23 00:00:00.000", 1));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT birthdate, count(*) as `count` "
+                    + "FROM %s "
+                    + "WHERE age < 30 "
+                    + "GROUP BY birthdate ",
+                Index.BANK.getName()));
+
+    verifySchema(
+        response, schema("birthdate", null, "timestamp"), schema("count(*)", "count", "integer"));
+    verifyDataRows(response, rows("2018-06-23 00:00:00", 1));
   }
 
-  @Ignore("skip this test due to inconsistency in type in new engine")
   @Test
   public void groupByDateWithAliasShouldPass() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT birthdate as birth, count(*) as count " +
-            "FROM %s " +
-            "WHERE age < 30 " +
-            "GROUP BY birthdate ",
-        Index.BANK.getName()));
-
-    verifySchema(response,
-        schema("birth", "birth", "date"),
-        schema("count", "count", "integer"));
-    verifyDataRows(response,
-        rows("2018-06-23 00:00:00.000", 1));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT birthdate as birth, count(*) as `count` "
+                    + "FROM %s "
+                    + "WHERE age < 30 "
+                    + "GROUP BY birthdate ",
+                Index.BANK.getName()));
+
+    verifySchema(
+        response,
+        schema("birthdate", "birth", "timestamp"),
+        schema("count(*)", "count", "integer"));
+    verifyDataRows(response, rows("2018-06-23 00:00:00", 1));
   }
 
   @Test
   public void aggregateCastStatementShouldNotReturnZero() {
-    JSONObject response = executeJdbcRequest(String.format(
-        "SELECT SUM(CAST(male AS INT)) AS male_sum FROM %s",
-        Index.BANK.getName()));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT SUM(CAST(male AS INT)) AS male_sum FROM %s", Index.BANK.getName()));
 
     verifySchema(response, schema("SUM(CAST(male AS INT))", "male_sum", "integer"));
     verifyDataRows(response, rows(4));
   }
+
+  @Test
+  public void groupByConstantShouldPass() {
+    JSONObject response =
+        executeJdbcRequest(String.format("select 1 from %s GROUP BY 1", Index.BANK.getName()));
+
+    verifySchema(response, schema("1", null, "integer"));
+    verifyDataRows(response, rows(1));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/AggregationIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/AggregationIT.java
index ba007f43f9..38fefe0fe1 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/AggregationIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/AggregationIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.containsString;
@@ -22,6 +21,7 @@
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -59,8 +59,9 @@ public void countTest() throws IOException {
 
   @Ignore("The distinct is not supported in new engine")
   public void countDistinctTest() {
-    JSONObject response = executeJdbcRequest(
-        String.format("SELECT COUNT(distinct gender) FROM %s", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format("SELECT COUNT(distinct gender) FROM %s", TEST_INDEX_ACCOUNT));
 
     verifySchema(response, schema("COUNT(DISTINCT gender)", null, "integer"));
     verifyDataRows(response, rows(2));
@@ -70,8 +71,9 @@ public void countDistinctTest() {
   public void countWithDocsHintTest() throws Exception {
 
     JSONObject result =
-        executeQuery(String.format("SELECT /*! DOCS_WITH_AGGREGATION(10) */ count(*) from %s",
-            TEST_INDEX_ACCOUNT));
+        executeQuery(
+            String.format(
+                "SELECT /*! DOCS_WITH_AGGREGATION(10) */ count(*) from %s", TEST_INDEX_ACCOUNT));
     JSONArray hits = (JSONArray) result.query("/hits/hits");
     Assert.assertThat(hits.length(), equalTo(10));
   }
@@ -82,8 +84,8 @@ public void sumTest() throws IOException {
     JSONObject result =
         executeQuery(String.format("SELECT SUM(balance) FROM %s", TEST_INDEX_ACCOUNT));
     Assert.assertThat(getTotalHits(result), equalTo(1000));
-    Assert.assertThat(getDoubleAggregationValue(result, "SUM(balance)", "value"),
-        equalTo(25714837.0));
+    Assert.assertThat(
+        getDoubleAggregationValue(result, "SUM(balance)", "value"), equalTo(25714837.0));
   }
 
   @Test
@@ -126,23 +128,28 @@ public void statsTest() throws IOException {
   @Test
   public void extendedStatsTest() throws IOException {
 
-    JSONObject result = executeQuery(String.format("SELECT EXTENDED_STATS(age) FROM %s",
-        TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(String.format("SELECT EXTENDED_STATS(age) FROM %s", TEST_INDEX_ACCOUNT));
     Assert.assertThat(getTotalHits(result), equalTo(1000));
-    Assert
-        .assertThat(getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "min"), equalTo(20.0));
-    Assert
-        .assertThat(getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "max"), equalTo(40.0));
-    Assert.assertThat(getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "avg"),
-        equalTo(30.171));
-    Assert.assertThat(getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "sum"),
-        equalTo(30171.0));
-    Assert.assertThat(getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "sum_of_squares"),
+    Assert.assertThat(
+        getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "min"), equalTo(20.0));
+    Assert.assertThat(
+        getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "max"), equalTo(40.0));
+    Assert.assertThat(
+        getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "avg"), equalTo(30.171));
+    Assert.assertThat(
+        getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "sum"), equalTo(30171.0));
+    Assert.assertThat(
+        getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "sum_of_squares"),
         equalTo(946393.0));
-    Assert.assertEquals(6.008640362012022,
-        getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "std_deviation"), 0.0001);
-    Assert.assertEquals(36.10375899999996,
-        getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "variance"), 0.0001);
+    Assert.assertEquals(
+        6.008640362012022,
+        getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "std_deviation"),
+        0.0001);
+    Assert.assertEquals(
+        36.10375899999996,
+        getDoubleAggregationValue(result, "EXTENDED_STATS(age)", "variance"),
+        0.0001);
   }
 
   @Test
@@ -151,72 +158,73 @@ public void percentileTest() throws IOException {
     JSONObject result =
         executeQuery(String.format("SELECT PERCENTILES(age) FROM %s", TEST_INDEX_ACCOUNT));
     Assert.assertThat(getTotalHits(result), equalTo(1000));
-    Assert
-        .assertEquals(20.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "1.0"),
-            0.001);
-    Assert
-        .assertEquals(21.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "5.0"),
-            0.001);
-    Assert
-        .assertEquals(25.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "25.0"),
-            0.001);
-    // All percentiles are approximations calculated by t-digest, however, P50 has the widest distribution (not sure why)
-    Assert
-        .assertEquals(30.5, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "50.0"),
-            0.6);
-    Assert
-        .assertEquals(35.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "75.0"),
-            0.001);
-    Assert
-        .assertEquals(39.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "95.0"),
-            0.001);
-    Assert
-        .assertEquals(40.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "99.0"),
-            0.001);
+    Assert.assertEquals(
+        20.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "1.0"), 0.001);
+    Assert.assertEquals(
+        21.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "5.0"), 0.001);
+    Assert.assertEquals(
+        25.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "25.0"), 0.001);
+    // All percentiles are approximations calculated by t-digest, however, P50 has the widest
+    // distribution (not sure why)
+    Assert.assertEquals(
+        30.5, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "50.0"), 0.6);
+    Assert.assertEquals(
+        35.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "75.0"), 0.001);
+    Assert.assertEquals(
+        39.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "95.0"), 0.001);
+    Assert.assertEquals(
+        40.0, getDoubleAggregationValue(result, "PERCENTILES(age)", "values", "99.0"), 0.001);
   }
 
   @Test
   public void percentileTestSpecific() throws IOException {
 
-    JSONObject result = executeQuery(String.format("SELECT PERCENTILES(age,25.0,75.0) FROM %s",
-        TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format("SELECT PERCENTILES(age,25.0,75.0) FROM %s", TEST_INDEX_ACCOUNT));
 
     Assert.assertThat(getTotalHits(result), equalTo(1000));
-    Assert.assertEquals(25.0,
-        getDoubleAggregationValue(result, "PERCENTILES(age,25.0,75.0)", "values", "25.0"), 0.001);
-    Assert.assertEquals(35.0,
-        getDoubleAggregationValue(result, "PERCENTILES(age,25.0,75.0)", "values", "75.0"), 0.001);
+    Assert.assertEquals(
+        25.0,
+        getDoubleAggregationValue(result, "PERCENTILES(age,25.0,75.0)", "values", "25.0"),
+        0.001);
+    Assert.assertEquals(
+        35.0,
+        getDoubleAggregationValue(result, "PERCENTILES(age,25.0,75.0)", "values", "75.0"),
+        0.001);
   }
 
   @Test
   public void aliasTest() throws IOException {
 
-    JSONObject result = executeQuery(String.format("SELECT COUNT(*) AS mycount FROM %s",
-        TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(String.format("SELECT COUNT(*) AS mycount FROM %s", TEST_INDEX_ACCOUNT));
     Assert.assertThat(getTotalHits(result), equalTo(1000));
     Assert.assertThat(getIntAggregationValue(result, "mycount", "value"), equalTo(1000));
   }
 
   @Test
   public void groupByTest() throws Exception {
-    JSONObject result = executeQuery(String.format("SELECT COUNT(*) FROM %s GROUP BY gender",
-        TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(String.format("SELECT COUNT(*) FROM %s GROUP BY gender", TEST_INDEX_ACCOUNT));
     assertResultForGroupByTest(result);
   }
 
   @Test
   public void groupByUsingTableAliasTest() throws Exception {
-    JSONObject result = executeQuery(String.format("SELECT COUNT(*) FROM %s a GROUP BY a.gender",
-        TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format("SELECT COUNT(*) FROM %s a GROUP BY a.gender", TEST_INDEX_ACCOUNT));
     assertResultForGroupByTest(result);
   }
 
   @Test
   public void groupByUsingTableNamePrefixTest() throws Exception {
-    JSONObject result = executeQuery(String.format(
-        "SELECT COUNT(*) FROM %s GROUP BY opensearch-sql_test_index_account.gender",
-        TEST_INDEX_ACCOUNT
-    ));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT COUNT(*) FROM %s GROUP BY opensearch-sql_test_index_account.gender",
+                TEST_INDEX_ACCOUNT));
     assertResultForGroupByTest(result);
   }
 
@@ -240,31 +248,34 @@ private void assertResultForGroupByTest(JSONObject result) {
 
   @Test
   public void groupByHavingTest() throws Exception {
-    JSONObject result = executeQuery(String.format(
-        "SELECT gender " +
-            "FROM %s " +
-            "GROUP BY gender " +
-            "HAVING COUNT(*) > 0", TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT gender " + "FROM %s " + "GROUP BY gender " + "HAVING COUNT(*) > 0",
+                TEST_INDEX_ACCOUNT));
     assertResultForGroupByHavingTest(result);
   }
 
   @Test
   public void groupByHavingUsingTableAliasTest() throws Exception {
-    JSONObject result = executeQuery(String.format(
-        "SELECT a.gender " +
-            "FROM %s a " +
-            "GROUP BY a.gender " +
-            "HAVING COUNT(*) > 0", TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT a.gender " + "FROM %s a " + "GROUP BY a.gender " + "HAVING COUNT(*) > 0",
+                TEST_INDEX_ACCOUNT));
     assertResultForGroupByHavingTest(result);
   }
 
   @Test
   public void groupByHavingUsingTableNamePrefixTest() throws Exception {
-    JSONObject result = executeQuery(String.format(
-        "SELECT opensearch-sql_test_index_account.gender " +
-            "FROM %s " +
-            "GROUP BY opensearch-sql_test_index_account.gender " +
-            "HAVING COUNT(*) > 0", TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT opensearch-sql_test_index_account.gender "
+                    + "FROM %s "
+                    + "GROUP BY opensearch-sql_test_index_account.gender "
+                    + "HAVING COUNT(*) > 0",
+                TEST_INDEX_ACCOUNT));
     assertResultForGroupByHavingTest(result);
   }
 
@@ -286,15 +297,17 @@ private void assertResultForGroupByHavingTest(JSONObject result) {
     Assert.assertThat(gender.query(femaleBucketPrefix + "/count_0/value"), equalTo(493));
   }
 
-  @Ignore //todo VerificationException: table alias or field name missing
+  @Ignore // todo VerificationException: table alias or field name missing
   @Test
   public void groupBySubqueryTest() throws Exception {
 
-    JSONObject result = executeQuery(String.format(
-        "SELECT COUNT(*) FROM %s " +
-            "WHERE firstname IN (SELECT firstname FROM %s) " +
-            "GROUP BY gender",
-        TEST_INDEX_ACCOUNT, TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT COUNT(*) FROM %s "
+                    + "WHERE firstname IN (SELECT firstname FROM %s) "
+                    + "GROUP BY gender",
+                TEST_INDEX_ACCOUNT, TEST_INDEX_ACCOUNT));
     Assert.assertThat(getTotalHits(result), equalTo(1000));
     JSONObject gender = getAggregation(result, "gender");
     Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
@@ -315,9 +328,12 @@ public void groupBySubqueryTest() throws Exception {
   @Test
   public void postFilterTest() throws Exception {
 
-    JSONObject result = executeQuery(String.format("SELECT /*! POST_FILTER({\\\"term\\\":" +
-            "{\\\"gender\\\":\\\"m\\\"}}) */ COUNT(*) FROM %s GROUP BY gender",
-        TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT /*! POST_FILTER({\\\"term\\\":"
+                    + "{\\\"gender\\\":\\\"m\\\"}}) */ COUNT(*) FROM %s GROUP BY gender",
+                TEST_INDEX_ACCOUNT));
     Assert.assertThat(getTotalHits(result), equalTo(507));
     JSONObject gender = getAggregation(result, "gender");
     Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
@@ -338,9 +354,12 @@ public void postFilterTest() throws Exception {
   @Test
   public void multipleGroupByTest() throws Exception {
 
-    JSONObject result = executeQuery(String.format("SELECT COUNT(*) FROM %s GROUP BY gender," +
-            " terms('field'='age','size'=200,'alias'='age')",
-        TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT COUNT(*) FROM %s GROUP BY gender,"
+                    + " terms('field'='age','size'=200,'alias'='age')",
+                TEST_INDEX_ACCOUNT));
     Assert.assertThat(getTotalHits(result), equalTo(1000));
     JSONObject gender = getAggregation(result, "gender");
     Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
@@ -363,9 +382,11 @@ public void multipleGroupByTest() throws Exception {
 
     final Set<Integer> actualAgesM = new HashSet<>(expectedAges.size());
     final Set<Integer> actualAgesF = new HashSet<>(expectedAges.size());
-    mAgeBuckets.iterator()
+    mAgeBuckets
+        .iterator()
         .forEachRemaining(json -> actualAgesM.add(((JSONObject) json).getInt("key")));
-    fAgeBuckets.iterator()
+    fAgeBuckets
+        .iterator()
         .forEachRemaining(json -> actualAgesF.add(((JSONObject) json).getInt("key")));
 
     Assert.assertThat(actualAgesM, equalTo(expectedAges));
@@ -375,9 +396,12 @@ public void multipleGroupByTest() throws Exception {
   @Test
   public void multipleGroupBysWithSize() throws Exception {
 
-    JSONObject result = executeQuery(String.format("SELECT COUNT(*) FROM %s GROUP BY gender," +
-            " terms('alias'='ageAgg','field'='age','size'=3)",
-        TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT COUNT(*) FROM %s GROUP BY gender,"
+                    + " terms('alias'='ageAgg','field'='age','size'=3)",
+                TEST_INDEX_ACCOUNT));
     Assert.assertThat(getTotalHits(result), equalTo(1000));
     JSONObject gender = getAggregation(result, "gender");
     Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
@@ -392,9 +416,12 @@ public void multipleGroupBysWithSize() throws Exception {
   @Test
   public void termsWithSize() throws Exception {
 
-    JSONObject result = executeQuery(String.format("SELECT COUNT(*) FROM %s GROUP BY terms" +
-            "('alias'='ageAgg','field'='age','size'=3)",
-        TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT COUNT(*) FROM %s GROUP BY terms"
+                    + "('alias'='ageAgg','field'='age','size'=3)",
+                TEST_INDEX_ACCOUNT));
     Assert.assertThat(getTotalHits(result), equalTo(1000));
     JSONObject gender = getAggregation(result, "ageAgg");
     Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(3));
@@ -403,9 +430,12 @@ public void termsWithSize() throws Exception {
   @Test
   public void termsWithMissing() throws Exception {
 
-    JSONObject result = executeQuery(String.format("SELECT count(*) FROM %s GROUP BY terms" +
-            "('alias'='nick','field'='nickname','missing'='no_nickname')",
-        TEST_INDEX_GAME_OF_THRONES));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT count(*) FROM %s GROUP BY terms"
+                    + "('alias'='nick','field'='nickname','missing'='no_nickname')",
+                TEST_INDEX_GAME_OF_THRONES));
     JSONObject nick = getAggregation(result, "nick");
 
     Optional<JSONObject> noNicknameBucket = Optional.empty();
@@ -426,9 +456,12 @@ public void termsWithOrder() throws Exception {
     final String dog1 = "snoopy";
     final String dog2 = "rex";
 
-    JSONObject result = executeQuery(String.format("SELECT count(*) FROM %s GROUP BY terms" +
-            "('field'='dog_name', 'alias'='dog_name', 'order'='desc')",
-        TEST_INDEX_DOG));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT count(*) FROM %s GROUP BY terms"
+                    + "('field'='dog_name', 'alias'='dog_name', 'order'='desc')",
+                TEST_INDEX_DOG));
     JSONObject dogName = getAggregation(result, "dog_name");
 
     String firstDog = (String) (dogName.optQuery("/buckets/0/key"));
@@ -436,8 +469,12 @@ public void termsWithOrder() throws Exception {
     Assert.assertThat(firstDog, equalTo(dog1));
     Assert.assertThat(secondDog, equalTo(dog2));
 
-    result = executeQuery(String.format("SELECT count(*) FROM %s GROUP BY terms" +
-        "('field'='dog_name', 'alias'='dog_name', 'order'='asc')", TEST_INDEX_DOG));
+    result =
+        executeQuery(
+            String.format(
+                "SELECT count(*) FROM %s GROUP BY terms"
+                    + "('field'='dog_name', 'alias'='dog_name', 'order'='asc')",
+                TEST_INDEX_DOG));
 
     dogName = getAggregation(result, "dog_name");
 
@@ -449,92 +486,96 @@ public void termsWithOrder() throws Exception {
 
   @Test
   public void orderByAscTest() {
-    JSONObject response = executeJdbcRequest(String.format("SELECT COUNT(*) FROM %s " +
-        "GROUP BY gender ORDER BY COUNT(*)", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT COUNT(*) FROM %s " + "GROUP BY gender ORDER BY COUNT(*)",
+                TEST_INDEX_ACCOUNT));
 
     verifySchema(response, schema("COUNT(*)", null, "integer"));
-    verifyDataRows(response,
-        rows(493),
-        rows(507));
+    verifyDataRows(response, rows(493), rows(507));
   }
 
   @Test
   public void orderByAliasAscTest() {
-    JSONObject response = executeJdbcRequest(String.format("SELECT COUNT(*) as count FROM %s " +
-        "GROUP BY gender ORDER BY count", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT COUNT(*) as count FROM %s " + "GROUP BY gender ORDER BY count",
+                TEST_INDEX_ACCOUNT));
 
     verifySchema(response, schema("COUNT(*)", "count", "integer"));
-    verifyDataRowsInOrder(response,
-        rows(493),
-        rows(507));
+    verifyDataRowsInOrder(response, rows(493), rows(507));
   }
 
   @Test
   public void orderByDescTest() throws IOException {
-    JSONObject response = executeJdbcRequest(String.format("SELECT COUNT(*) FROM %s " +
-        "GROUP BY gender ORDER BY COUNT(*) DESC", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT COUNT(*) FROM %s " + "GROUP BY gender ORDER BY COUNT(*) DESC",
+                TEST_INDEX_ACCOUNT));
 
     verifySchema(response, schema("COUNT(*)", null, "integer"));
-    verifyDataRowsInOrder(response,
-        rows(507),
-        rows(493));
+    verifyDataRowsInOrder(response, rows(507), rows(493));
   }
 
   @Test
   public void orderByAliasDescTest() throws IOException {
-    JSONObject response = executeJdbcRequest(String.format("SELECT COUNT(*) as count FROM %s " +
-        "GROUP BY gender ORDER BY count DESC", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT COUNT(*) as count FROM %s " + "GROUP BY gender ORDER BY count DESC",
+                TEST_INDEX_ACCOUNT));
 
     verifySchema(response, schema("COUNT(*)", "count", "integer"));
-    verifyDataRowsInOrder(response,
-        rows(507),
-        rows(493));
+    verifyDataRowsInOrder(response, rows(507), rows(493));
   }
 
   @Test
   public void orderByGroupFieldWithAlias() throws IOException {
     // ORDER BY field name
-    JSONObject response = executeJdbcRequest(String.format("SELECT gender as g, COUNT(*) as count "
-        + "FROM %s GROUP BY gender ORDER BY gender", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT gender as g, COUNT(*) as count "
+                    + "FROM %s GROUP BY gender ORDER BY gender",
+                TEST_INDEX_ACCOUNT));
 
-    verifySchema(response,
-        schema("gender", "g", "text"),
-        schema("COUNT(*)", "count", "integer"));
-    verifyDataRowsInOrder(response,
-        rows("f", 493),
-        rows("m", 507));
+    verifySchema(response, schema("gender", "g", "text"), schema("COUNT(*)", "count", "integer"));
+    verifyDataRowsInOrder(response, rows("f", 493), rows("m", 507));
 
     // ORDER BY field alias
-    response = executeJdbcRequest(String.format("SELECT gender as g, COUNT(*) as count "
-        + "FROM %s GROUP BY gender ORDER BY g", TEST_INDEX_ACCOUNT));
-
-    verifySchema(response,
-        schema("gender", "g", "text"),
-        schema("COUNT(*)", "count", "integer"));
-    verifyDataRowsInOrder(response,
-        rows("f", 493),
-        rows("m", 507));
+    response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT gender as g, COUNT(*) as count " + "FROM %s GROUP BY gender ORDER BY g",
+                TEST_INDEX_ACCOUNT));
+
+    verifySchema(response, schema("gender", "g", "text"), schema("COUNT(*)", "count", "integer"));
+    verifyDataRowsInOrder(response, rows("f", 493), rows("m", 507));
   }
 
   @Test
   public void limitTest() throws IOException {
-    JSONObject response = executeJdbcRequest(String.format("SELECT COUNT(*) FROM %s " +
-        "GROUP BY age ORDER BY COUNT(*) LIMIT 5", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT COUNT(*) FROM %s " + "GROUP BY age ORDER BY COUNT(*) LIMIT 5",
+                TEST_INDEX_ACCOUNT));
 
     verifySchema(response, schema("COUNT(*)", null, "integer"));
-    verifyDataRowsInOrder(response,
-        rows(35),
-        rows(39),
-        rows(39),
-        rows(42),
-        rows(42));
+    verifyDataRowsInOrder(response, rows(35), rows(39), rows(39), rows(42), rows(42));
   }
 
   @Test
   public void countGroupByRange() throws IOException {
 
-    JSONObject result = executeQuery(String.format("SELECT COUNT(age) FROM %s" +
-        " GROUP BY range(age, 20,25,30,35,40)", TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT COUNT(age) FROM %s" + " GROUP BY range(age, 20,25,30,35,40)",
+                TEST_INDEX_ACCOUNT));
     JSONObject ageAgg = getAggregation(result, "range(age,20,25,30,35,40)");
     JSONArray buckets = ageAgg.getJSONArray("buckets");
     Assert.assertThat(buckets.length(), equalTo(4));
@@ -543,7 +584,8 @@ public void countGroupByRange() throws IOException {
 
     for (int i = 0; i < expectedResults.length; ++i) {
 
-      Assert.assertThat(buckets.query(String.format(Locale.ROOT, "/%d/COUNT(age)/value", i)),
+      Assert.assertThat(
+          buckets.query(String.format(Locale.ROOT, "/%d/COUNT(age)/value", i)),
           equalTo(expectedResults[i]));
     }
   }
@@ -555,42 +597,56 @@ public void countGroupByRange() throws IOException {
   public void countGroupByDateTest() throws IOException {
 
     String result =
-        explainQuery(String.format("select insert_time from %s group by date_histogram" +
-                "('field'='insert_time','fixed_interval'='1h','format'='yyyy-MM','min_doc_count'=5) ",
-            TEST_INDEX_ONLINE));
-    Assert.assertThat(result.replaceAll("\\s+", ""),
-        containsString("{\"date_histogram\":{\"field\":\"insert_time\",\"format\":\"yyyy-MM\"," +
-            "\"fixed_interval\":\"1h\",\"offset\":0,\"order\":{\"_key\":\"asc\"},\"keyed\":false," +
-            "\"min_doc_count\":5}"));
+        explainQuery(
+            String.format(
+                "select insert_time from %s group by"
+                    + " date_histogram('field'='insert_time','fixed_interval'='1h','format'='yyyy-MM','min_doc_count'=5)"
+                    + " ",
+                TEST_INDEX_ONLINE));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""),
+        containsString(
+            "{\"date_histogram\":{\"field\":\"insert_time\",\"format\":\"yyyy-MM\","
+                + "\"fixed_interval\":\"1h\",\"offset\":0,\"order\":{\"_key\":\"asc\"},\"keyed\":false,"
+                + "\"min_doc_count\":5}"));
   }
 
   @Test
   public void countGroupByDateTestWithAlias() throws IOException {
     String result =
-        explainQuery(String.format("select insert_time from %s group by date_histogram" +
-                "('field'='insert_time','fixed_interval'='1h','format'='yyyy-MM','alias'='myAlias')",
-            TEST_INDEX_ONLINE));
-    Assert.assertThat(result.replaceAll("\\s+", ""),
-        containsString("myAlias\":{\"date_histogram\":{\"field\":\"insert_time\"," +
-            "\"format\":\"yyyy-MM\",\"fixed_interval\":\"1h\""));
+        explainQuery(
+            String.format(
+                "select insert_time from %s group by date_histogram"
+                    + "('field'='insert_time','fixed_interval'='1h','format'='yyyy-MM','alias'='myAlias')",
+                TEST_INDEX_ONLINE));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""),
+        containsString(
+            "myAlias\":{\"date_histogram\":{\"field\":\"insert_time\","
+                + "\"format\":\"yyyy-MM\",\"fixed_interval\":\"1h\""));
   }
 
-//    /**
-//     * <a>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-bucket-daterange-aggregation.html</a>
-//     */
-//    @Test
-//    public void countDateRangeTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
-//        String result = explainQuery(String.format("select online from %s group by date_range(field='insert_time'," +
-//                "'format'='yyyy-MM-dd' ,'2014-08-18','2014-08-17','now-8d','now-7d','now-6d','now')",
-//                TEST_INDEX_ONLINE));
-//        // TODO: fix the query or fix the code for the query to work
-//    }
+  //    /**
+  //     *
+  // <a>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-bucket-daterange-aggregation.html</a>
+  //     */
+  //    @Test
+  //    public void countDateRangeTest() throws IOException, SqlParseException,
+  // SQLFeatureNotSupportedException {
+  //        String result = explainQuery(String.format("select online from %s group by
+  // date_range(field='insert_time'," +
+  //                "'format'='yyyy-MM-dd'
+  // ,'2014-08-18','2014-08-17','now-8d','now-7d','now-6d','now')",
+  //                TEST_INDEX_ONLINE));
+  //        // TODO: fix the query or fix the code for the query to work
+  //    }
 
   @Test
   public void topHitTest() throws IOException {
 
-    String query = String
-        .format("select topHits('size'=3,age='desc') from %s group by gender", TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            "select topHits('size'=3,age='desc') from %s group by gender", TEST_INDEX_ACCOUNT);
     JSONObject result = executeQuery(query);
     JSONObject gender = getAggregation(result, "gender");
     Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
@@ -603,7 +659,8 @@ public void topHitTest() throws IOException {
     final String femaleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", femaleBucketId);
 
     Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("m"));
-    Assert.assertThat(gender.query(maleBucketPrefix + "/topHits(size=3,age=desc)/hits/total/value"),
+    Assert.assertThat(
+        gender.query(maleBucketPrefix + "/topHits(size=3,age=desc)/hits/total/value"),
         equalTo(507));
     Assert.assertThat(
         gender.query(maleBucketPrefix + "/topHits(size=3,age=desc)/hits/total/relation"),
@@ -613,9 +670,9 @@ public void topHitTest() throws IOException {
             .length(),
         equalTo(3));
     Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("f"));
-    Assert
-        .assertThat(gender.query(femaleBucketPrefix + "/topHits(size=3,age=desc)/hits/total/value"),
-            equalTo(493));
+    Assert.assertThat(
+        gender.query(femaleBucketPrefix + "/topHits(size=3,age=desc)/hits/total/value"),
+        equalTo(493));
     Assert.assertThat(
         gender.query(femaleBucketPrefix + "/topHits(size=3,age=desc)/hits/total/relation"),
         equalTo("eq"));
@@ -629,7 +686,8 @@ public void topHitTest() throws IOException {
   public void topHitTest_WithInclude() throws IOException {
 
     String query =
-        String.format("select topHits('size'=3,age='desc','include'=age) from %s group by gender",
+        String.format(
+            "select topHits('size'=3,age='desc','include'=age) from %s group by gender",
             TEST_INDEX_ACCOUNT);
     JSONObject result = executeQuery(query);
     JSONObject gender = getAggregation(result, "gender");
@@ -646,28 +704,41 @@ public void topHitTest_WithInclude() throws IOException {
     Assert.assertThat(
         gender.query(maleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/total/value"),
         equalTo(507));
-    Assert.assertThat(gender
-            .query(maleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/total/relation"),
+    Assert.assertThat(
+        gender.query(
+            maleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/total/relation"),
         equalTo("eq"));
-    Assert.assertThat(((JSONArray) gender.query(
-        maleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/hits")).length(),
+    Assert.assertThat(
+        ((JSONArray)
+                gender.query(maleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/hits"))
+            .length(),
         equalTo(3));
 
     Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("f"));
     Assert.assertThat(
         gender.query(femaleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/total/value"),
         equalTo(493));
-    Assert.assertThat(gender
-            .query(femaleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/total/relation"),
+    Assert.assertThat(
+        gender.query(
+            femaleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/total/relation"),
         equalTo("eq"));
-    Assert.assertThat(((JSONArray) gender.query(
-        femaleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/hits")).length(),
+    Assert.assertThat(
+        ((JSONArray)
+                gender.query(
+                    femaleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/hits"))
+            .length(),
         equalTo(3));
 
     for (int i = 0; i < 2; ++i) {
       for (int j = 0; j < 3; ++j) {
-        JSONObject source = (JSONObject) gender.query(String.format(Locale.ROOT,
-            "/buckets/%d/topHits(size=3,age=desc,include=age)/hits/hits/%d/_source", i, j));
+        JSONObject source =
+            (JSONObject)
+                gender.query(
+                    String.format(
+                        Locale.ROOT,
+                        "/buckets/%d/topHits(size=3,age=desc,include=age)/hits/hits/%d/_source",
+                        i,
+                        j));
         Assert.assertThat(source.length(), equalTo(1));
         Assert.assertTrue(source.has("age"));
         Assert.assertThat(source.getInt("age"), equalTo(40));
@@ -679,17 +750,24 @@ public void topHitTest_WithInclude() throws IOException {
   public void topHitTest_WithIncludeTwoFields() throws IOException {
 
     String query =
-        String.format("select topHits('size'=3,'include'='age,firstname',age='desc') from %s " +
-            "group by gender", TEST_INDEX_ACCOUNT);
+        String.format(
+            "select topHits('size'=3,'include'='age,firstname',age='desc') from %s "
+                + "group by gender",
+            TEST_INDEX_ACCOUNT);
     JSONObject result = executeQuery(query);
     JSONObject gender = getAggregation(result, "gender");
     Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
 
     for (int i = 0; i < 2; ++i) {
       for (int j = 0; j < 3; ++j) {
-        JSONObject source = (JSONObject) gender.query(String.format(Locale.ROOT,
-            "/buckets/%d/topHits(size=3,include=age,firstname,age=desc)/hits/hits/%d/_source", i,
-            j));
+        JSONObject source =
+            (JSONObject)
+                gender.query(
+                    String.format(
+                        Locale.ROOT,
+                        "/buckets/%d/topHits(size=3,include=age,firstname,age=desc)/hits/hits/%d/_source",
+                        i,
+                        j));
         Assert.assertThat(source.length(), equalTo(2));
         Assert.assertTrue(source.has("age"));
         Assert.assertThat(source.getInt("age"), equalTo(40));
@@ -703,8 +781,10 @@ public void topHitTest_WithIncludeTwoFields() throws IOException {
   @Test
   public void topHitTest_WithExclude() throws IOException {
 
-    String query = String.format("select topHits('size'=3,'exclude'='lastname',age='desc') from " +
-        "%s group by gender", TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            "select topHits('size'=3,'exclude'='lastname',age='desc') from " + "%s group by gender",
+            TEST_INDEX_ACCOUNT);
     JSONObject result = executeQuery(query);
     JSONObject gender = getAggregation(result, "gender");
     Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
@@ -717,44 +797,61 @@ public void topHitTest_WithExclude() throws IOException {
     final String femaleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", femaleBucketId);
 
     Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("m"));
-    Assert.assertThat(gender
-            .query(maleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/total/value"),
+    Assert.assertThat(
+        gender.query(
+            maleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/total/value"),
         equalTo(507));
-    Assert.assertThat(gender
-            .query(maleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/total/relation"),
+    Assert.assertThat(
+        gender.query(
+            maleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/total/relation"),
         equalTo("eq"));
-    Assert.assertThat(((JSONArray) gender.query(
-        maleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/hits")).length(),
+    Assert.assertThat(
+        ((JSONArray)
+                gender.query(
+                    maleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/hits"))
+            .length(),
         equalTo(3));
 
     Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("f"));
-    Assert.assertThat(gender
-            .query(femaleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/total/value"),
+    Assert.assertThat(
+        gender.query(
+            femaleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/total/value"),
         equalTo(493));
-    Assert.assertThat(gender.query(
-        femaleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/total/relation"),
+    Assert.assertThat(
+        gender.query(
+            femaleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/total/relation"),
         equalTo("eq"));
-    Assert.assertThat(((JSONArray) gender.query(
-        femaleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/hits")).length(),
+    Assert.assertThat(
+        ((JSONArray)
+                gender.query(
+                    femaleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/hits"))
+            .length(),
         equalTo(3));
 
-    final Set<String> expectedFields = new HashSet<>(Arrays.asList(
-        "account_number",
-        "firstname",
-        "address",
-        "balance",
-        "gender",
-        "city",
-        "employer",
-        "state",
-        "age",
-        "email"
-    ));
+    final Set<String> expectedFields =
+        new HashSet<>(
+            Arrays.asList(
+                "account_number",
+                "firstname",
+                "address",
+                "balance",
+                "gender",
+                "city",
+                "employer",
+                "state",
+                "age",
+                "email"));
 
     for (int i = 0; i < 2; ++i) {
       for (int j = 0; j < 3; ++j) {
-        JSONObject source = (JSONObject) gender.query(String.format(Locale.ROOT,
-            "/buckets/%d/topHits(size=3,exclude=lastname,age=desc)/hits/hits/%d/_source", i, j));
+        JSONObject source =
+            (JSONObject)
+                gender.query(
+                    String.format(
+                        Locale.ROOT,
+                        "/buckets/%d/topHits(size=3,exclude=lastname,age=desc)/hits/hits/%d/_source",
+                        i,
+                        j));
         Assert.assertThat(source.length(), equalTo(expectedFields.size()));
         Assert.assertFalse(source.has("lastname"));
         Assert.assertThat(source.keySet().containsAll(expectedFields), equalTo(true));
@@ -762,254 +859,300 @@ public void topHitTest_WithExclude() throws IOException {
     }
   }
 
-  //region not migrated
-
-  // script on metric aggregation tests. uncomment if your elastic has scripts enable (disabled by default)
-//    @Test
-//    public void sumWithScriptTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
-//        Aggregations result = query(String.format("SELECT SUM(script('','doc[\\'balance\\'].value + doc[\\'balance\\'].value')) as doubleSum FROM %s", TEST_INDEX));
-//        Sum sum = result.get("doubleSum");
-//        assertThat(sum.getValue(), equalTo(25714837.0*2));
-//    }
-//
-//    @Test
-//    public void sumWithImplicitScriptTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
-//        Aggregations result = query(String.format("SELECT SUM(balance + balance) as doubleSum FROM %s", TEST_INDEX));
-//        Sum sum = result.get("doubleSum");
-//        assertThat(sum.getValue(), equalTo(25714837.0*2));
-//    }
-//
-//    @Test
-//    public void sumWithScriptTestNoAlias() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
-//        Aggregations result = query(String.format("SELECT SUM(balance + balance) FROM %s", TEST_INDEX));
-//        Sum sum = result.get("SUM(script=script(balance + balance,doc('balance').value + doc('balance').value))");
-//        assertThat(sum.getValue(), equalTo(25714837.0*2));
-//    }
-//
-//    @Test
-//    public void scriptedMetricAggregation() throws SQLFeatureNotSupportedException, SqlParseException {
-//        Aggregations result = query ("select scripted_metric('map_script'='if(doc[\\'balance\\'].value > 49670){ if(!_agg.containsKey(\\'ages\\')) { _agg.put(\\'ages\\',doc[\\'age\\'].value); } " +
-//                "else { _agg.put(\\'ages\\',_agg.get(\\'ages\\')+doc[\\'age\\'].value); }}'," +
-//                "'reduce_script'='sumThem = 0; for (a in _aggs) { if(a.containsKey(\\'ages\\')){ sumThem += a.get(\\'ages\\');} }; return sumThem;') as wierdSum from " + TEST_INDEX + "");
-//        ScriptedMetric metric = result.get("wierdSum");
-//        Assert.assertEquals(136L,metric.aggregation());
-//    }
-//
-//    @Test
-//    public void scriptedMetricConcatWithStringParamAndReduceParamAggregation() throws SQLFeatureNotSupportedException, SqlParseException {
-//        String query = "select scripted_metric(\n" +
-//                "  'init_script' = '_agg[\"concat\"]=[] ',\n" +
-//                "  'map_script'='_agg.concat.add(doc[field].value)' ,\n" +
-//                "  'combine_script'='return _agg.concat.join(delim);',\t\t\t\t\n" +
-//                "  'reduce_script'='_aggs.removeAll(\"\"); return _aggs.join(delim)'," +
-//                "'@field' = 'name.firstname' , '@delim'=';',@reduce_delim =';' ) as all_characters \n" +
-//                "from "+TEST_INDEX+"";
-//        Aggregations result = query (query);
-//        ScriptedMetric metric = result.get("all_characters");
-//        List<String> names = Arrays.asList(metric.aggregation().toString().split(";"));
-//
-//
-//        Assert.assertEquals(4,names.size());
-//        String[] expectedNames = new String[]{"brandon","daenerys","eddard","jaime"};
-//        for(String name : expectedNames){
-//            Assert.assertTrue("not contains:" + name,names.contains(name));
-//        }
-//    }
-//
-//    @Test
-//    public void scriptedMetricAggregationWithNumberParams() throws SQLFeatureNotSupportedException, SqlParseException {
-//        Aggregations result = query ("select scripted_metric('map_script'='if(doc[\\'balance\\'].value > 49670){ if(!_agg.containsKey(\\'ages\\')) { _agg.put(\\'ages\\',doc[\\'age\\'].value+x); } " +
-//                "else { _agg.put(\\'ages\\',_agg.get(\\'ages\\')+doc[\\'age\\'].value+x); }}'," +
-//                "'reduce_script'='sumThem = 0; for (a in _aggs) { if(a.containsKey(\\'ages\\')){ sumThem += a.get(\\'ages\\');} }; return sumThem;'" +
-//                ",'@x'=3) as wierdSum from " + TEST_INDEX + "");
-//        ScriptedMetric metric = result.get("wierdSum");
-//        Assert.assertEquals(148L,metric.aggregation());
-//    }
-//
-
-//    @Test
-//    public void topHitTest_WithIncludeAndExclude() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
-//        Aggregations result = query(String.format("select topHits('size'=3,'exclude'='lastname','include'='firstname,lastname',age='desc') from %s group by gender ", TEST_INDEX_ACCOUNT));
-//        List<? extends Terms.Bucket> buckets = ((Terms) (result.asList().get(0))).getBuckets();
-//        for (Terms.Bucket bucket : buckets) {
-//            SearchHits hits = ((InternalTopHits) bucket.getAggregations().asList().get(0)).getHits();
-//            for (SearchHit hit : hits) {
-//                Set<String> fields = hit.getSourceAsMap().keySet();
-//                Assert.assertEquals(1, fields.size());
-//                Assert.assertTrue(fields.contains("firstname"));
-//            }
-//        }
-//    }
-//
-//    private Aggregations query(String query) throws SqlParseException, SQLFeatureNotSupportedException {
-//        SqlElasticSearchRequestBuilder select = getSearchRequestBuilder(query);
-//        return ((SearchResponse)select.get()).getAggregations();
-//    }
-//
-//    private SqlElasticSearchRequestBuilder getSearchRequestBuilder(String query) throws SqlParseException, SQLFeatureNotSupportedException {
-//        SearchDao searchDao = MainTestSuite.getSearchDao();
-//        return (SqlElasticSearchRequestBuilder) searchDao.explain(query).explain();
-//    }
-//
-//    @Test
-//    public void testFromSizeWithAggregations() throws Exception {
-//        final String query1 = String.format("SELECT /*! DOCS_WITH_AGGREGATION(0,1) */" +
-//                " account_number FROM %s GROUP BY gender", TEST_INDEX_ACCOUNT);
-//        SearchResponse response1 = (SearchResponse) getSearchRequestBuilder(query1).get();
-//
-//        Assert.assertEquals(1, response1.getHits().getHits().length);
-//        Terms gender1 = response1.getAggregations().get("gender");
-//        Assert.assertEquals(2, gender1.getBuckets().size());
-//        Object account1 = response1.getHits().getHits()[0].getSourceAsMap().get("account_number");
-//
-//        final String query2 = String.format("SELECT /*! DOCS_WITH_AGGREGATION(1,1) */" +
-//                " account_number FROM %s GROUP BY gender", TEST_INDEX_ACCOUNT);
-//        SearchResponse response2 = (SearchResponse) getSearchRequestBuilder(query2).get();
-//
-//        Assert.assertEquals(1, response2.getHits().getHits().length);
-//        Terms gender2 = response2.getAggregations().get("gender");
-//        Assert.assertEquals(2, gender2.getBuckets().size());
-//        Object account2 = response2.getHits().getHits()[0].getSourceAsMap().get("account_number");
-//
-//        Assert.assertEquals(response1.getHits().getTotalHits(), response2.getHits().getTotalHits());
-//        Assert.assertNotEquals(account1, account2);
-//    }
-//
-//    @Test
-//    public void testSubAggregations() throws  Exception {
-//        Set expectedAges = new HashSet<>(ContiguousSet.create(Range.closed(20, 40), DiscreteDomain.integers()));
-//        final String query = String.format("SELECT /*! DOCS_WITH_AGGREGATION(10) */" +
-//                " * FROM %s GROUP BY (gender, terms('field'='age','size'=200,'alias'='age')), (state) LIMIT 200,200", TEST_INDEX_ACCOUNT);
-//
-//        Map<String, Set<Integer>> buckets = new HashMap<>();
-//
-//        SqlElasticSearchRequestBuilder select = getSearchRequestBuilder(query);
-//        SearchResponse response = (SearchResponse) select.get();
-//        Aggregations result = response.getAggregations();
-//
-//        Terms gender = result.get("gender");
-//        for(Terms.Bucket genderBucket : gender.getBuckets()) {
-//            String genderKey = genderBucket.getKey().toString();
-//            buckets.put(genderKey, new HashSet<Integer>());
-//            Terms ageBuckets = (Terms) genderBucket.getAggregations().get("age");
-//            for(Terms.Bucket ageBucket : ageBuckets.getBuckets()) {
-//                buckets.get(genderKey).add(Integer.parseInt(ageBucket.getKey().toString()));
-//            }
-//        }
-//
-//        Assert.assertEquals(2, buckets.keySet().size());
-//        Assert.assertEquals(expectedAges, buckets.get("m"));
-//        Assert.assertEquals(expectedAges, buckets.get("f"));
-//
-//        Terms state = result.get("state.keyword");
-//        for(Terms.Bucket stateBucket : state.getBuckets()) {
-//            if(stateBucket.getKey().toString().equalsIgnoreCase("ak")) {
-//                Assert.assertTrue("There are 22 entries for state ak", stateBucket.getDocCount() == 22);
-//            }
-//        }
-//
-//        Assert.assertEquals(response.getHits().getTotalHits(), 1000);
-//        Assert.assertEquals(response.getHits().getHits().length, 10);
-//    }
-//
-//    @Test
-//    public void testSimpleSubAggregations() throws  Exception {
-//        final String query = String.format("SELECT /*! DOCS_WITH_AGGREGATION(10) */ * FROM %s GROUP BY (gender), (state) ", TEST_INDEX_ACCOUNT);
-//
-//        SqlElasticSearchRequestBuilder select = getSearchRequestBuilder(query);
-//        SearchResponse response = (SearchResponse) select.get();
-//        Aggregations result = response.getAggregations();
-//
-//        Terms gender = result.get("gender");
-//        for(Terms.Bucket genderBucket : gender.getBuckets()) {
-//            String genderKey = genderBucket.getKey().toString();
-//            Assert.assertTrue("Gender should be m or f", genderKey.equals("m") || genderKey.equals("f"));
-//        }
-//
-//        Assert.assertEquals(2, gender.getBuckets().size());
-//
-//        Terms state = result.get("state.keyword");
-//        for(Terms.Bucket stateBucket : state.getBuckets()) {
-//            if(stateBucket.getKey().toString().equalsIgnoreCase("ak")) {
-//                Assert.assertTrue("There are 22 entries for state ak", stateBucket.getDocCount() == 22);
-//            }
-//        }
-//
-//        Assert.assertEquals(response.getHits().getTotalHits(), 1000);
-//        Assert.assertEquals(response.getHits().getHits().length, 10);
-//    }
-//
-//    @Test
-//    public void geoHashGrid() throws SQLFeatureNotSupportedException, SqlParseException {
-//        Aggregations result = query(String.format("SELECT COUNT(*) FROM %s/location GROUP BY geohash_grid(field='center',precision=5) ", TEST_INDEX_LOCATION));
-//        InternalGeoHashGrid grid = result.get("geohash_grid(field=center,precision=5)");
-//        Collection<? extends InternalMultiBucketAggregation.InternalBucket> buckets = grid.getBuckets();
-//        for (InternalMultiBucketAggregation.InternalBucket bucket : buckets) {
-//            Assert.assertTrue(bucket.getKeyAsString().equals("w2fsm") || bucket.getKeyAsString().equals("w0p6y") );
-//            Assert.assertEquals(1,bucket.getDocCount());
-//        }
-//    }
-//
-//    @Test
-//    public void geoBounds() throws SQLFeatureNotSupportedException, SqlParseException {
-//        Aggregations result = query(String.format("SELECT * FROM %s/location GROUP BY geo_bounds(field='center',alias='bounds') ", TEST_INDEX_LOCATION));
-//        InternalGeoBounds bounds = result.get("bounds");
-//        Assert.assertEquals(0.5,bounds.bottomRight().getLat(),0.001);
-//        Assert.assertEquals(105.0,bounds.bottomRight().getLon(),0.001);
-//        Assert.assertEquals(5.0,bounds.topLeft().getLat(),0.001);
-//        Assert.assertEquals(100.5,bounds.topLeft().getLon(),0.001);
-//    }
-//
-//    @Test
-//    public void groupByOnNestedFieldTest() throws Exception {
-//        Aggregations result = query(String.format("SELECT COUNT(*) FROM %s GROUP BY nested(message.info)", TEST_INDEX_NESTED_TYPE));
-//        InternalNested nested = result.get("message.info@NESTED");
-//        Terms infos = nested.getAggregations().get("message.info");
-//        Assert.assertEquals(3,infos.getBuckets().size());
-//        for(Terms.Bucket bucket : infos.getBuckets()) {
-//            String key = bucket.getKey().toString();
-//            long count = ((ValueCount) bucket.getAggregations().get("COUNT(*)")).getValue();
-//            if(key.equalsIgnoreCase("a")) {
-//                Assert.assertEquals(2, count);
-//            }
-//            else if(key.equalsIgnoreCase("c")) {
-//                Assert.assertEquals(2, count);
-//            }
-//            else if(key.equalsIgnoreCase("b")) {
-//                Assert.assertEquals(1, count);
-//            }
-//            else {
-//                throw new Exception(String.format("Unexpected key. expected: a OR b OR c . found: %s", key));
-//            }
-//        }
-//    }
-//
-//    @Test
-//    public void groupByTestWithFilter() throws Exception {
-//        Aggregations result = query(String.format("SELECT COUNT(*) FROM %s GROUP BY filter(gender='m'),gender", TEST_INDEX_ACCOUNT));
-//        InternalFilter filter = result.get("filter(gender = 'm')@FILTER");
-//        Terms gender = filter.getAggregations().get("gender");
-//
-//        for(Terms.Bucket bucket : gender.getBuckets()) {
-//            String key = bucket.getKey().toString();
-//            long count = ((ValueCount) bucket.getAggregations().get("COUNT(*)")).getValue();
-//            if(key.equalsIgnoreCase("m")) {
-//                Assert.assertEquals(507, count);
-//            }
-//            else {
-//                throw new Exception(String.format("Unexpected key. expected: only m. found: %s", key));
-//            }
-//        }
-//    }
-//
-//
-  //endregion not migrated
+  // region not migrated
+
+  // script on metric aggregation tests. uncomment if your elastic has scripts enable (disabled by
+  // default)
+  //    @Test
+  //    public void sumWithScriptTest() throws IOException, SqlParseException,
+  // SQLFeatureNotSupportedException {
+  //        Aggregations result = query(String.format("SELECT
+  // SUM(script('','doc[\\'balance\\'].value + doc[\\'balance\\'].value')) as doubleSum FROM %s",
+  // TEST_INDEX));
+  //        Sum sum = result.get("doubleSum");
+  //        assertThat(sum.getValue(), equalTo(25714837.0*2));
+  //    }
+  //
+  //    @Test
+  //    public void sumWithImplicitScriptTest() throws IOException, SqlParseException,
+  // SQLFeatureNotSupportedException {
+  //        Aggregations result = query(String.format("SELECT SUM(balance + balance) as doubleSum
+  // FROM %s", TEST_INDEX));
+  //        Sum sum = result.get("doubleSum");
+  //        assertThat(sum.getValue(), equalTo(25714837.0*2));
+  //    }
+  //
+  //    @Test
+  //    public void sumWithScriptTestNoAlias() throws IOException, SqlParseException,
+  // SQLFeatureNotSupportedException {
+  //        Aggregations result = query(String.format("SELECT SUM(balance + balance) FROM %s",
+  // TEST_INDEX));
+  //        Sum sum = result.get("SUM(script=script(balance + balance,doc('balance').value +
+  // doc('balance').value))");
+  //        assertThat(sum.getValue(), equalTo(25714837.0*2));
+  //    }
+  //
+  //    @Test
+  //    public void scriptedMetricAggregation() throws SQLFeatureNotSupportedException,
+  // SqlParseException {
+  //        Aggregations result = query ("select
+  // scripted_metric('map_script'='if(doc[\\'balance\\'].value > 49670){
+  // if(!_agg.containsKey(\\'ages\\')) { _agg.put(\\'ages\\',doc[\\'age\\'].value); } " +
+  //                "else { _agg.put(\\'ages\\',_agg.get(\\'ages\\')+doc[\\'age\\'].value); }}'," +
+  //                "'reduce_script'='sumThem = 0; for (a in _aggs) { if(a.containsKey(\\'ages\\')){
+  // sumThem += a.get(\\'ages\\');} }; return sumThem;') as wierdSum from " + TEST_INDEX + "");
+  //        ScriptedMetric metric = result.get("wierdSum");
+  //        Assert.assertEquals(136L,metric.aggregation());
+  //    }
+  //
+  //    @Test
+  //    public void scriptedMetricConcatWithStringParamAndReduceParamAggregation() throws
+  // SQLFeatureNotSupportedException, SqlParseException {
+  //        String query = "select scripted_metric(\n" +
+  //                "  'init_script' = '_agg[\"concat\"]=[] ',\n" +
+  //                "  'map_script'='_agg.concat.add(doc[field].value)' ,\n" +
+  //                "  'combine_script'='return _agg.concat.join(delim);',\t\t\t\t\n" +
+  //                "  'reduce_script'='_aggs.removeAll(\"\"); return _aggs.join(delim)'," +
+  //                "'@field' = 'name.firstname' , '@delim'=';',@reduce_delim =';' ) as
+  // all_characters \n" +
+  //                "from "+TEST_INDEX+"";
+  //        Aggregations result = query (query);
+  //        ScriptedMetric metric = result.get("all_characters");
+  //        List<String> names = Arrays.asList(metric.aggregation().toString().split(";"));
+  //
+  //
+  //        Assert.assertEquals(4,names.size());
+  //        String[] expectedNames = new String[]{"brandon","daenerys","eddard","jaime"};
+  //        for(String name : expectedNames){
+  //            Assert.assertTrue("not contains:" + name,names.contains(name));
+  //        }
+  //    }
+  //
+  //    @Test
+  //    public void scriptedMetricAggregationWithNumberParams() throws
+  // SQLFeatureNotSupportedException, SqlParseException {
+  //        Aggregations result = query ("select
+  // scripted_metric('map_script'='if(doc[\\'balance\\'].value > 49670){
+  // if(!_agg.containsKey(\\'ages\\')) { _agg.put(\\'ages\\',doc[\\'age\\'].value+x); } " +
+  //                "else { _agg.put(\\'ages\\',_agg.get(\\'ages\\')+doc[\\'age\\'].value+x); }}',"
+  // +
+  //                "'reduce_script'='sumThem = 0; for (a in _aggs) { if(a.containsKey(\\'ages\\')){
+  // sumThem += a.get(\\'ages\\');} }; return sumThem;'" +
+  //                ",'@x'=3) as wierdSum from " + TEST_INDEX + "");
+  //        ScriptedMetric metric = result.get("wierdSum");
+  //        Assert.assertEquals(148L,metric.aggregation());
+  //    }
+  //
+
+  //    @Test
+  //    public void topHitTest_WithIncludeAndExclude() throws IOException, SqlParseException,
+  // SQLFeatureNotSupportedException {
+  //        Aggregations result = query(String.format("select
+  // topHits('size'=3,'exclude'='lastname','include'='firstname,lastname',age='desc') from %s group
+  // by gender ", TEST_INDEX_ACCOUNT));
+  //        List<? extends Terms.Bucket> buckets = ((Terms) (result.asList().get(0))).getBuckets();
+  //        for (Terms.Bucket bucket : buckets) {
+  //            SearchHits hits = ((InternalTopHits)
+  // bucket.getAggregations().asList().get(0)).getHits();
+  //            for (SearchHit hit : hits) {
+  //                Set<String> fields = hit.getSourceAsMap().keySet();
+  //                Assert.assertEquals(1, fields.size());
+  //                Assert.assertTrue(fields.contains("firstname"));
+  //            }
+  //        }
+  //    }
+  //
+  //    private Aggregations query(String query) throws SqlParseException,
+  // SQLFeatureNotSupportedException {
+  //        SqlElasticSearchRequestBuilder select = getSearchRequestBuilder(query);
+  //        return ((SearchResponse)select.get()).getAggregations();
+  //    }
+  //
+  //    private SqlElasticSearchRequestBuilder getSearchRequestBuilder(String query) throws
+  // SqlParseException, SQLFeatureNotSupportedException {
+  //        SearchDao searchDao = MainTestSuite.getSearchDao();
+  //        return (SqlElasticSearchRequestBuilder) searchDao.explain(query).explain();
+  //    }
+  //
+  //    @Test
+  //    public void testFromSizeWithAggregations() throws Exception {
+  //        final String query1 = String.format("SELECT /*! DOCS_WITH_AGGREGATION(0,1) */" +
+  //                " account_number FROM %s GROUP BY gender", TEST_INDEX_ACCOUNT);
+  //        SearchResponse response1 = (SearchResponse) getSearchRequestBuilder(query1).get();
+  //
+  //        Assert.assertEquals(1, response1.getHits().getHits().length);
+  //        Terms gender1 = response1.getAggregations().get("gender");
+  //        Assert.assertEquals(2, gender1.getBuckets().size());
+  //        Object account1 =
+  // response1.getHits().getHits()[0].getSourceAsMap().get("account_number");
+  //
+  //        final String query2 = String.format("SELECT /*! DOCS_WITH_AGGREGATION(1,1) */" +
+  //                " account_number FROM %s GROUP BY gender", TEST_INDEX_ACCOUNT);
+  //        SearchResponse response2 = (SearchResponse) getSearchRequestBuilder(query2).get();
+  //
+  //        Assert.assertEquals(1, response2.getHits().getHits().length);
+  //        Terms gender2 = response2.getAggregations().get("gender");
+  //        Assert.assertEquals(2, gender2.getBuckets().size());
+  //        Object account2 =
+  // response2.getHits().getHits()[0].getSourceAsMap().get("account_number");
+  //
+  //        Assert.assertEquals(response1.getHits().getTotalHits(),
+  // response2.getHits().getTotalHits());
+  //        Assert.assertNotEquals(account1, account2);
+  //    }
+  //
+  //    @Test
+  //    public void testSubAggregations() throws  Exception {
+  //        Set expectedAges = new HashSet<>(ContiguousSet.create(Range.closed(20, 40),
+  // DiscreteDomain.integers()));
+  //        final String query = String.format("SELECT /*! DOCS_WITH_AGGREGATION(10) */" +
+  //                " * FROM %s GROUP BY (gender, terms('field'='age','size'=200,'alias'='age')),
+  // (state) LIMIT 200,200", TEST_INDEX_ACCOUNT);
+  //
+  //        Map<String, Set<Integer>> buckets = new HashMap<>();
+  //
+  //        SqlElasticSearchRequestBuilder select = getSearchRequestBuilder(query);
+  //        SearchResponse response = (SearchResponse) select.get();
+  //        Aggregations result = response.getAggregations();
+  //
+  //        Terms gender = result.get("gender");
+  //        for(Terms.Bucket genderBucket : gender.getBuckets()) {
+  //            String genderKey = genderBucket.getKey().toString();
+  //            buckets.put(genderKey, new HashSet<Integer>());
+  //            Terms ageBuckets = (Terms) genderBucket.getAggregations().get("age");
+  //            for(Terms.Bucket ageBucket : ageBuckets.getBuckets()) {
+  //                buckets.get(genderKey).add(Integer.parseInt(ageBucket.getKey().toString()));
+  //            }
+  //        }
+  //
+  //        Assert.assertEquals(2, buckets.keySet().size());
+  //        Assert.assertEquals(expectedAges, buckets.get("m"));
+  //        Assert.assertEquals(expectedAges, buckets.get("f"));
+  //
+  //        Terms state = result.get("state.keyword");
+  //        for(Terms.Bucket stateBucket : state.getBuckets()) {
+  //            if(stateBucket.getKey().toString().equalsIgnoreCase("ak")) {
+  //                Assert.assertTrue("There are 22 entries for state ak", stateBucket.getDocCount()
+  // == 22);
+  //            }
+  //        }
+  //
+  //        Assert.assertEquals(response.getHits().getTotalHits(), 1000);
+  //        Assert.assertEquals(response.getHits().getHits().length, 10);
+  //    }
+  //
+  //    @Test
+  //    public void testSimpleSubAggregations() throws  Exception {
+  //        final String query = String.format("SELECT /*! DOCS_WITH_AGGREGATION(10) */ * FROM %s
+  // GROUP BY (gender), (state) ", TEST_INDEX_ACCOUNT);
+  //
+  //        SqlElasticSearchRequestBuilder select = getSearchRequestBuilder(query);
+  //        SearchResponse response = (SearchResponse) select.get();
+  //        Aggregations result = response.getAggregations();
+  //
+  //        Terms gender = result.get("gender");
+  //        for(Terms.Bucket genderBucket : gender.getBuckets()) {
+  //            String genderKey = genderBucket.getKey().toString();
+  //            Assert.assertTrue("Gender should be m or f", genderKey.equals("m") ||
+  // genderKey.equals("f"));
+  //        }
+  //
+  //        Assert.assertEquals(2, gender.getBuckets().size());
+  //
+  //        Terms state = result.get("state.keyword");
+  //        for(Terms.Bucket stateBucket : state.getBuckets()) {
+  //            if(stateBucket.getKey().toString().equalsIgnoreCase("ak")) {
+  //                Assert.assertTrue("There are 22 entries for state ak", stateBucket.getDocCount()
+  // == 22);
+  //            }
+  //        }
+  //
+  //        Assert.assertEquals(response.getHits().getTotalHits(), 1000);
+  //        Assert.assertEquals(response.getHits().getHits().length, 10);
+  //    }
+  //
+  //    @Test
+  //    public void geoHashGrid() throws SQLFeatureNotSupportedException, SqlParseException {
+  //        Aggregations result = query(String.format("SELECT COUNT(*) FROM %s/location GROUP BY
+  // geohash_grid(field='center',precision=5) ", TEST_INDEX_LOCATION));
+  //        InternalGeoHashGrid grid = result.get("geohash_grid(field=center,precision=5)");
+  //        Collection<? extends InternalMultiBucketAggregation.InternalBucket> buckets =
+  // grid.getBuckets();
+  //        for (InternalMultiBucketAggregation.InternalBucket bucket : buckets) {
+  //            Assert.assertTrue(bucket.getKeyAsString().equals("w2fsm") ||
+  // bucket.getKeyAsString().equals("w0p6y") );
+  //            Assert.assertEquals(1,bucket.getDocCount());
+  //        }
+  //    }
+  //
+  //    @Test
+  //    public void geoBounds() throws SQLFeatureNotSupportedException, SqlParseException {
+  //        Aggregations result = query(String.format("SELECT * FROM %s/location GROUP BY
+  // geo_bounds(field='center',alias='bounds') ", TEST_INDEX_LOCATION));
+  //        InternalGeoBounds bounds = result.get("bounds");
+  //        Assert.assertEquals(0.5,bounds.bottomRight().getLat(),0.001);
+  //        Assert.assertEquals(105.0,bounds.bottomRight().getLon(),0.001);
+  //        Assert.assertEquals(5.0,bounds.topLeft().getLat(),0.001);
+  //        Assert.assertEquals(100.5,bounds.topLeft().getLon(),0.001);
+  //    }
+  //
+  //    @Test
+  //    public void groupByOnNestedFieldTest() throws Exception {
+  //        Aggregations result = query(String.format("SELECT COUNT(*) FROM %s GROUP BY
+  // nested(message.info)", TEST_INDEX_NESTED_TYPE));
+  //        InternalNested nested = result.get("message.info@NESTED");
+  //        Terms infos = nested.getAggregations().get("message.info");
+  //        Assert.assertEquals(3,infos.getBuckets().size());
+  //        for(Terms.Bucket bucket : infos.getBuckets()) {
+  //            String key = bucket.getKey().toString();
+  //            long count = ((ValueCount) bucket.getAggregations().get("COUNT(*)")).getValue();
+  //            if(key.equalsIgnoreCase("a")) {
+  //                Assert.assertEquals(2, count);
+  //            }
+  //            else if(key.equalsIgnoreCase("c")) {
+  //                Assert.assertEquals(2, count);
+  //            }
+  //            else if(key.equalsIgnoreCase("b")) {
+  //                Assert.assertEquals(1, count);
+  //            }
+  //            else {
+  //                throw new Exception(String.format("Unexpected key. expected: a OR b OR c .
+  // found: %s", key));
+  //            }
+  //        }
+  //    }
+  //
+  //    @Test
+  //    public void groupByTestWithFilter() throws Exception {
+  //        Aggregations result = query(String.format("SELECT COUNT(*) FROM %s GROUP BY
+  // filter(gender='m'),gender", TEST_INDEX_ACCOUNT));
+  //        InternalFilter filter = result.get("filter(gender = 'm')@FILTER");
+  //        Terms gender = filter.getAggregations().get("gender");
+  //
+  //        for(Terms.Bucket bucket : gender.getBuckets()) {
+  //            String key = bucket.getKey().toString();
+  //            long count = ((ValueCount) bucket.getAggregations().get("COUNT(*)")).getValue();
+  //            if(key.equalsIgnoreCase("m")) {
+  //                Assert.assertEquals(507, count);
+  //            }
+  //            else {
+  //                throw new Exception(String.format("Unexpected key. expected: only m. found: %s",
+  // key));
+  //            }
+  //        }
+  //    }
+  //
+  //
+  // endregion not migrated
 
   @Test
   public void groupByOnNestedFieldWithFilterTest() throws Exception {
 
-    String query = String.format("SELECT COUNT(*) FROM %s GROUP BY  nested(message.info)," +
-        "filter('myFilter',message.info = 'a')", TEST_INDEX_NESTED_TYPE);
+    String query =
+        String.format(
+            "SELECT COUNT(*) FROM %s GROUP BY  nested(message.info),"
+                + "filter('myFilter',message.info = 'a')",
+            TEST_INDEX_NESTED_TYPE);
     JSONObject result = executeQuery(query);
 
     JSONObject aggregation = getAggregation(result, "message.info@NESTED");
@@ -1025,29 +1168,36 @@ public void groupByOnNestedFieldWithFilterTest() throws Exception {
   @Test
   public void minOnNestedField() throws Exception {
 
-    String query = String.format("SELECT min(nested(message.dayOfWeek)) as minDays FROM %s",
-        TEST_INDEX_NESTED_TYPE);
+    String query =
+        String.format(
+            "SELECT min(nested(message.dayOfWeek)) as minDays FROM %s", TEST_INDEX_NESTED_TYPE);
     JSONObject result = executeQuery(query);
     JSONObject aggregation = getAggregation(result, "message.dayOfWeek@NESTED");
-    Assert.assertEquals(1.0, (double) aggregation.query("/minDays/value"), 0.0001);
+    Assert.assertEquals(
+        1.0, ((BigDecimal) aggregation.query("/minDays/value")).doubleValue(), 0.0001);
   }
 
   @Test
   public void sumOnNestedField() throws Exception {
 
-    String query = String.format("SELECT sum(nested(message.dayOfWeek)) as sumDays FROM %s",
-        TEST_INDEX_NESTED_TYPE);
+    String query =
+        String.format(
+            "SELECT sum(nested(message.dayOfWeek)) as sumDays FROM %s", TEST_INDEX_NESTED_TYPE);
     JSONObject result = executeQuery(query);
     JSONObject aggregation = getAggregation(result, "message.dayOfWeek@NESTED");
-    Assert.assertEquals(19.0, (double) aggregation.query("/sumDays/value"), 0.0001);
+    Assert.assertEquals(
+        19.0, ((BigDecimal) aggregation.query("/sumDays/value")).doubleValue(), 0.0001);
   }
 
   @Test
   public void histogramOnNestedField() throws Exception {
 
-    String query = String.format("select count(*) from %s group by histogram" +
-            "('field'='message.dayOfWeek','nested'='message','interval'='2' , 'alias' = 'someAlias' )",
-        TEST_INDEX_NESTED_TYPE);
+    String query =
+        String.format(
+            "select count(*) from %s group by"
+                + " histogram('field'='message.dayOfWeek','nested'='message','interval'='2' ,"
+                + " 'alias' = 'someAlias' )",
+            TEST_INDEX_NESTED_TYPE);
     JSONObject result = executeQuery(query);
     JSONObject aggregation = getAggregation(result, "message@NESTED");
 
@@ -1060,22 +1210,26 @@ public void histogramOnNestedField() throws Exception {
     JSONArray buckets = (JSONArray) aggregation.query("/someAlias/buckets");
     Assert.assertThat(buckets.length(), equalTo(4));
 
-    buckets.forEach(obj -> {
-      JSONObject bucket = (JSONObject) obj;
-      final double key = bucket.getDouble("key");
-      Assert.assertTrue(expectedCountsByKey.containsKey(key));
-      Assert.assertThat(bucket.getJSONObject("COUNT(*)").getInt("value"),
-          equalTo(expectedCountsByKey.get(key)));
-    });
+    buckets.forEach(
+        obj -> {
+          JSONObject bucket = (JSONObject) obj;
+          final double key = bucket.getDouble("key");
+          Assert.assertTrue(expectedCountsByKey.containsKey(key));
+          Assert.assertThat(
+              bucket.getJSONObject("COUNT(*)").getInt("value"),
+              equalTo(expectedCountsByKey.get(key)));
+        });
   }
 
   @Test
   public void reverseToRootGroupByOnNestedFieldWithFilterTestWithReverseNestedAndEmptyPath()
       throws Exception {
 
-    String query = String.format("SELECT COUNT(*) FROM %s GROUP BY  nested(message.info)," +
-            "filter('myFilter',message.info = 'a'),reverse_nested(someField,'')",
-        TEST_INDEX_NESTED_TYPE);
+    String query =
+        String.format(
+            "SELECT COUNT(*) FROM %s GROUP BY  nested(message.info),"
+                + "filter('myFilter',message.info = 'a'),reverse_nested(someField,'')",
+            TEST_INDEX_NESTED_TYPE);
     JSONObject result = executeQuery(query);
     JSONObject aggregation = getAggregation(result, "message.info@NESTED");
 
@@ -1096,8 +1250,11 @@ public void reverseToRootGroupByOnNestedFieldWithFilterTestWithReverseNestedAndE
   public void reverseToRootGroupByOnNestedFieldWithFilterTestWithReverseNestedNoPath()
       throws Exception {
 
-    String query = String.format("SELECT COUNT(*) FROM %s GROUP BY  nested(message.info),filter" +
-        "('myFilter',message.info = 'a'),reverse_nested(someField)", TEST_INDEX_NESTED_TYPE);
+    String query =
+        String.format(
+            "SELECT COUNT(*) FROM %s GROUP BY  nested(message.info),filter"
+                + "('myFilter',message.info = 'a'),reverse_nested(someField)",
+            TEST_INDEX_NESTED_TYPE);
     JSONObject result = executeQuery(query);
     JSONObject aggregation = getAggregation(result, "message.info@NESTED");
 
@@ -1118,9 +1275,12 @@ public void reverseToRootGroupByOnNestedFieldWithFilterTestWithReverseNestedNoPa
   public void reverseToRootGroupByOnNestedFieldWithFilterTestWithReverseNestedOnHistogram()
       throws Exception {
 
-    String query = String.format("SELECT COUNT(*) FROM %s GROUP BY  nested(message.info)," +
-        "filter('myFilter',message.info = 'a'),histogram('field'='myNum','reverse_nested'='','interval'='2', " +
-        "'alias' = 'someAlias' )", TEST_INDEX_NESTED_TYPE);
+    String query =
+        String.format(
+            "SELECT COUNT(*) FROM %s GROUP BY  nested(message.info),filter('myFilter',message.info"
+                + " = 'a'),histogram('field'='myNum','reverse_nested'='','interval'='2', 'alias' ="
+                + " 'someAlias' )",
+            TEST_INDEX_NESTED_TYPE);
     JSONObject result = executeQuery(query);
     JSONObject aggregation = getAggregation(result, "message.info@NESTED");
 
@@ -1139,21 +1299,26 @@ public void reverseToRootGroupByOnNestedFieldWithFilterTestWithReverseNestedOnHi
     expectedCountsByKey.put(2.0, 0);
     expectedCountsByKey.put(4.0, 1);
 
-    someAliasBuckets.forEach(obj -> {
-      JSONObject bucket = (JSONObject) obj;
-      final double key = bucket.getDouble("key");
-      Assert.assertTrue(expectedCountsByKey.containsKey(key));
-      Assert.assertThat(bucket.getJSONObject("COUNT(*)").getInt("value"),
-          equalTo(expectedCountsByKey.get(key)));
-    });
+    someAliasBuckets.forEach(
+        obj -> {
+          JSONObject bucket = (JSONObject) obj;
+          final double key = bucket.getDouble("key");
+          Assert.assertTrue(expectedCountsByKey.containsKey(key));
+          Assert.assertThat(
+              bucket.getJSONObject("COUNT(*)").getInt("value"),
+              equalTo(expectedCountsByKey.get(key)));
+        });
   }
 
   @Test
   public void reverseToRootGroupByOnNestedFieldWithFilterAndSumOnReverseNestedField()
       throws Exception {
 
-    String query = String.format("SELECT sum(reverse_nested(myNum)) bla FROM %s GROUP BY " +
-        "nested(message.info),filter('myFilter',message.info = 'a')", TEST_INDEX_NESTED_TYPE);
+    String query =
+        String.format(
+            "SELECT sum(reverse_nested(myNum)) bla FROM %s GROUP BY "
+                + "nested(message.info),filter('myFilter',message.info = 'a')",
+            TEST_INDEX_NESTED_TYPE);
     JSONObject result = executeQuery(query);
     JSONObject aggregation = getAggregation(result, "message.info@NESTED");
 
@@ -1171,9 +1336,11 @@ public void reverseToRootGroupByOnNestedFieldWithFilterAndSumOnReverseNestedFiel
   public void reverseAnotherNestedGroupByOnNestedFieldWithFilterTestWithReverseNestedNoPath()
       throws Exception {
 
-    String query = String.format("SELECT COUNT(*) FROM %s GROUP BY  nested(message.info)," +
-            "filter('myFilter',message.info = 'a'),reverse_nested(comment.data,'~comment')",
-        TEST_INDEX_NESTED_TYPE);
+    String query =
+        String.format(
+            "SELECT COUNT(*) FROM %s GROUP BY  nested(message.info),"
+                + "filter('myFilter',message.info = 'a'),reverse_nested(comment.data,'~comment')",
+            TEST_INDEX_NESTED_TYPE);
     JSONObject result = executeQuery(query);
     JSONObject aggregation = getAggregation(result, "message.info@NESTED");
 
@@ -1183,8 +1350,9 @@ public void reverseAnotherNestedGroupByOnNestedFieldWithFilterTestWithReverseNes
     Assert.assertThat(msgInfoBuckets.length(), equalTo(1));
 
     JSONArray commentDataBuckets =
-        (JSONArray) msgInfoBuckets.optQuery("/0/comment.data@NESTED_REVERSED" +
-            "/comment.data@NESTED/comment.data/buckets");
+        (JSONArray)
+            msgInfoBuckets.optQuery(
+                "/0/comment.data@NESTED_REVERSED" + "/comment.data@NESTED/comment.data/buckets");
     Assert.assertNotNull(commentDataBuckets);
     Assert.assertThat(commentDataBuckets.length(), equalTo(1));
     Assert.assertThat(commentDataBuckets.query("/0/key"), equalTo("ab"));
@@ -1195,9 +1363,12 @@ public void reverseAnotherNestedGroupByOnNestedFieldWithFilterTestWithReverseNes
   public void reverseAnotherNestedGroupByOnNestedFieldWithFilterTestWithReverseNestedOnHistogram()
       throws Exception {
 
-    String query = String.format("SELECT COUNT(*) FROM %s GROUP BY  nested(message.info),filter" +
-        "('myFilter',message.info = 'a'),histogram('field'='comment.likes','reverse_nested'='~comment'," +
-        "'interval'='2' , 'alias' = 'someAlias' )", TEST_INDEX_NESTED_TYPE);
+    String query =
+        String.format(
+            "SELECT COUNT(*) FROM %s GROUP BY  nested(message.info),filter('myFilter',message.info"
+                + " = 'a'),histogram('field'='comment.likes','reverse_nested'='~comment','interval'='2'"
+                + " , 'alias' = 'someAlias' )",
+            TEST_INDEX_NESTED_TYPE);
     JSONObject result = executeQuery(query);
     JSONObject aggregation = getAggregation(result, "message.info@NESTED");
 
@@ -1206,8 +1377,10 @@ public void reverseAnotherNestedGroupByOnNestedFieldWithFilterTestWithReverseNes
     Assert.assertNotNull(msgInfoBuckets);
     Assert.assertThat(msgInfoBuckets.length(), equalTo(1));
 
-    JSONArray someAliasBuckets = (JSONArray) msgInfoBuckets.optQuery(
-        "/0/~comment@NESTED_REVERSED/~comment@NESTED/someAlias/buckets");
+    JSONArray someAliasBuckets =
+        (JSONArray)
+            msgInfoBuckets.optQuery(
+                "/0/~comment@NESTED_REVERSED/~comment@NESTED/someAlias/buckets");
     Assert.assertNotNull(msgInfoBuckets);
     Assert.assertThat(someAliasBuckets.length(), equalTo(2));
 
@@ -1215,13 +1388,15 @@ public void reverseAnotherNestedGroupByOnNestedFieldWithFilterTestWithReverseNes
     expectedCountsByKey.put(0.0, 1);
     expectedCountsByKey.put(2.0, 1);
 
-    someAliasBuckets.forEach(obj -> {
-      JSONObject bucket = (JSONObject) obj;
-      final double key = bucket.getDouble("key");
-      Assert.assertTrue(expectedCountsByKey.containsKey(key));
-      Assert.assertThat(bucket.getJSONObject("COUNT(*)").getInt("value"),
-          equalTo(expectedCountsByKey.get(key)));
-    });
+    someAliasBuckets.forEach(
+        obj -> {
+          JSONObject bucket = (JSONObject) obj;
+          final double key = bucket.getDouble("key");
+          Assert.assertTrue(expectedCountsByKey.containsKey(key));
+          Assert.assertThat(
+              bucket.getJSONObject("COUNT(*)").getInt("value"),
+              equalTo(expectedCountsByKey.get(key)));
+        });
   }
 
   @Test
@@ -1229,8 +1404,9 @@ public void reverseAnotherNestedGroupByOnNestedFieldWithFilterAndSumOnReverseNes
       throws Exception {
 
     String query =
-        String.format("SELECT sum(reverse_nested(comment.likes,'~comment')) bla FROM %s " +
-                "GROUP BY  nested(message.info),filter('myFilter',message.info = 'a')",
+        String.format(
+            "SELECT sum(reverse_nested(comment.likes,'~comment')) bla FROM %s "
+                + "GROUP BY  nested(message.info),filter('myFilter',message.info = 'a')",
             TEST_INDEX_NESTED_TYPE);
     JSONObject result = executeQuery(query);
     JSONObject aggregation = getAggregation(result, "message.info@NESTED");
@@ -1240,10 +1416,11 @@ public void reverseAnotherNestedGroupByOnNestedFieldWithFilterAndSumOnReverseNes
     Assert.assertNotNull(msgInfoBuckets);
     Assert.assertThat(msgInfoBuckets.length(), equalTo(1));
 
-    Assert.assertNotNull(msgInfoBuckets.optQuery(
-        "/0/comment.likes@NESTED_REVERSED/comment.likes@NESTED/bla/value"));
-    JSONObject bla = (JSONObject) msgInfoBuckets
-        .query("/0/comment.likes@NESTED_REVERSED/comment.likes@NESTED/bla");
+    Assert.assertNotNull(
+        msgInfoBuckets.optQuery("/0/comment.likes@NESTED_REVERSED/comment.likes@NESTED/bla/value"));
+    JSONObject bla =
+        (JSONObject)
+            msgInfoBuckets.query("/0/comment.likes@NESTED_REVERSED/comment.likes@NESTED/bla");
     Assert.assertEquals(4.0, bla.getDouble("value"), 0.000001);
   }
 
@@ -1256,8 +1433,9 @@ public void docsReturnedTestWithoutDocsHint() throws Exception {
 
   @Test
   public void docsReturnedTestWithDocsHint() throws Exception {
-    String query = String.format("SELECT /*! DOCS_WITH_AGGREGATION(10) */ count(*) from %s",
-        TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            "SELECT /*! DOCS_WITH_AGGREGATION(10) */ count(*) from %s", TEST_INDEX_ACCOUNT);
     JSONObject result = executeQuery(query);
     Assert.assertThat(getHits(result).length(), equalTo(10));
   }
@@ -1266,9 +1444,11 @@ public void docsReturnedTestWithDocsHint() throws Exception {
   @Test
   public void termsWithScript() throws Exception {
     String query =
-        String.format("select count(*), avg(all_client) from %s group by terms('alias'='asdf'," +
-            " substring(field, 0, 1)), date_histogram('alias'='time', 'field'='timestamp', " +
-            "'interval'='20d ', 'format'='yyyy-MM-dd') limit 1000", TEST_INDEX_ONLINE);
+        String.format(
+            "select count(*), avg(all_client) from %s group by terms('alias'='asdf',"
+                + " substring(field, 0, 1)), date_histogram('alias'='time', 'field'='timestamp', "
+                + "'interval'='20d ', 'format'='yyyy-MM-dd') limit 1000",
+            TEST_INDEX_ONLINE);
     String result = explainQuery(query);
 
     Assert.assertThat(result, containsString("\"script\":{\"source\""));
@@ -1277,9 +1457,10 @@ public void termsWithScript() throws Exception {
 
   @Test
   public void groupByScriptedDateHistogram() throws Exception {
-    String query = String
-        .format("select count(*), avg(all_client) from %s group by date_histogram('alias'='time'," +
-                " ceil(all_client), 'fixed_interval'='20d ', 'format'='yyyy-MM-dd') limit 1000",
+    String query =
+        String.format(
+            "select count(*), avg(all_client) from %s group by date_histogram('alias'='time',"
+                + " ceil(all_client), 'fixed_interval'='20d ', 'format'='yyyy-MM-dd') limit 1000",
             TEST_INDEX_ONLINE);
     String result = explainQuery(query);
 
@@ -1289,9 +1470,10 @@ public void groupByScriptedDateHistogram() throws Exception {
 
   @Test
   public void groupByScriptedHistogram() throws Exception {
-    String query = String.format(
-        "select count(*) from %s group by histogram('alias'='all_field', pow(all_client,1))",
-        TEST_INDEX_ONLINE);
+    String query =
+        String.format(
+            "select count(*) from %s group by histogram('alias'='all_field', pow(all_client,1))",
+            TEST_INDEX_ONLINE);
     String result = explainQuery(query);
 
     Assert.assertThat(result, containsString("Math.pow(doc['all_client'].value, 1)"));
@@ -1302,18 +1484,17 @@ public void groupByScriptedHistogram() throws Exception {
   public void distinctWithOneField() {
     Assert.assertEquals(
         executeQuery("SELECT DISTINCT name.lastname FROM " + TEST_INDEX_GAME_OF_THRONES, "jdbc"),
-        executeQuery("SELECT name.lastname FROM " + TEST_INDEX_GAME_OF_THRONES
-            + " GROUP BY name.lastname", "jdbc")
-    );
+        executeQuery(
+            "SELECT name.lastname FROM " + TEST_INDEX_GAME_OF_THRONES + " GROUP BY name.lastname",
+            "jdbc"));
   }
 
   @Test
   public void distinctWithMultipleFields() {
     Assert.assertEquals(
         executeQuery("SELECT DISTINCT age, gender FROM " + TEST_INDEX_ACCOUNT, "jdbc"),
-        executeQuery("SELECT age, gender FROM " + TEST_INDEX_ACCOUNT
-            + " GROUP BY age, gender", "jdbc")
-    );
+        executeQuery(
+            "SELECT age, gender FROM " + TEST_INDEX_ACCOUNT + " GROUP BY age, gender", "jdbc"));
   }
 
   private JSONObject getAggregation(final JSONObject queryResult, final String aggregationName) {
@@ -1325,26 +1506,27 @@ private JSONObject getAggregation(final JSONObject queryResult, final String agg
     return aggregations.getJSONObject(aggregationName);
   }
 
-  private int getIntAggregationValue(final JSONObject queryResult, final String aggregationName,
-                                     final String fieldName) {
+  private int getIntAggregationValue(
+      final JSONObject queryResult, final String aggregationName, final String fieldName) {
 
     final JSONObject targetAggregation = getAggregation(queryResult, aggregationName);
     Assert.assertTrue(targetAggregation.has(fieldName));
     return targetAggregation.getInt(fieldName);
   }
 
-  private double getDoubleAggregationValue(final JSONObject queryResult,
-                                           final String aggregationName,
-                                           final String fieldName) {
+  private double getDoubleAggregationValue(
+      final JSONObject queryResult, final String aggregationName, final String fieldName) {
 
     final JSONObject targetAggregation = getAggregation(queryResult, aggregationName);
     Assert.assertTrue(targetAggregation.has(fieldName));
     return targetAggregation.getDouble(fieldName);
   }
 
-  private double getDoubleAggregationValue(final JSONObject queryResult,
-                                           final String aggregationName,
-                                           final String fieldName, final String subFieldName) {
+  private double getDoubleAggregationValue(
+      final JSONObject queryResult,
+      final String aggregationName,
+      final String fieldName,
+      final String subFieldName) {
 
     final JSONObject targetAggregation = getAggregation(queryResult, aggregationName);
     Assert.assertTrue(targetAggregation.has(fieldName));
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/CsvFormatResponseIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/CsvFormatResponseIT.java
index 9a08302577..508cd1555e 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/CsvFormatResponseIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/CsvFormatResponseIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.anyOf;
@@ -33,18 +32,14 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.core.AnyOf;
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.jupiter.api.Disabled;
 import org.opensearch.client.Request;
 import org.opensearch.client.RequestOptions;
 import org.opensearch.client.Response;
 import org.opensearch.sql.legacy.executor.csv.CSVResult;
 
-/**
- * Tests to cover requests with "?format=csv" parameter
- */
+/** Tests to cover requests with "?format=csv" parameter */
 public class CsvFormatResponseIT extends SQLIntegTestCase {
 
   private boolean flatOption = false;
@@ -77,16 +72,16 @@ public void allPercentilesByDefault() throws IOException {
     final String result = executeQueryWithStringOutput(query);
 
     final String expectedHeaders =
-        "PERCENTILES(age).1.0,PERCENTILES(age).5.0,PERCENTILES(age).25.0," +
-            "PERCENTILES(age).50.0,PERCENTILES(age).75.0,PERCENTILES(age).95.0,PERCENTILES(age).99.0";
+        "PERCENTILES(age).1.0,PERCENTILES(age).5.0,PERCENTILES(age).25.0,"
+            + "PERCENTILES(age).50.0,PERCENTILES(age).75.0,PERCENTILES(age).95.0,PERCENTILES(age).99.0";
     Assert.assertThat(result, containsString(expectedHeaders));
   }
 
   @Test
   public void specificPercentilesIntAndDouble() throws IOException {
 
-    final String query = String.format(Locale.ROOT, "SELECT PERCENTILES(age,10,49.0) FROM %s",
-        TEST_INDEX_ACCOUNT);
+    final String query =
+        String.format(Locale.ROOT, "SELECT PERCENTILES(age,10,49.0) FROM %s", TEST_INDEX_ACCOUNT);
     final String result = executeQueryWithStringOutput(query);
 
     final String[] unexpectedPercentiles = {"1.0", "5.0", "25.0", "50.0", "75.0", "95.0", "99.0"};
@@ -94,15 +89,14 @@ public void specificPercentilesIntAndDouble() throws IOException {
         "\"PERCENTILES(age,10,49.0).10.0\",\"PERCENTILES(age,10,49.0).49.0\"";
     Assert.assertThat(result, containsString(expectedHeaders));
     for (final String unexpectedPercentile : unexpectedPercentiles) {
-      Assert.assertThat(result,
-          not(containsString("PERCENTILES(age,10,49.0)." + unexpectedPercentile)));
+      Assert.assertThat(
+          result, not(containsString("PERCENTILES(age,10,49.0)." + unexpectedPercentile)));
     }
   }
 
-  @Ignore("only work for legacy engine")
   public void nestedObjectsAndArraysAreQuoted() throws IOException {
-    final String query = String.format(Locale.ROOT, "SELECT * FROM %s WHERE _id = 5",
-        TEST_INDEX_NESTED_TYPE);
+    final String query =
+        String.format(Locale.ROOT, "SELECT * FROM %s WHERE _id = 5", TEST_INDEX_NESTED_TYPE);
     final String result = executeQueryWithStringOutput(query);
 
     final String expectedMyNum = "\"[3, 4]\"";
@@ -114,12 +108,11 @@ public void nestedObjectsAndArraysAreQuoted() throws IOException {
     Assert.assertThat(result, containsString(expectedMessage));
   }
 
-  @Ignore("only work for legacy engine")
   public void arraysAreQuotedInFlatMode() throws IOException {
     setFlatOption(true);
 
-    final String query = String.format(Locale.ROOT, "SELECT * FROM %s WHERE _id = 5",
-        TEST_INDEX_NESTED_TYPE);
+    final String query =
+        String.format(Locale.ROOT, "SELECT * FROM %s WHERE _id = 5", TEST_INDEX_NESTED_TYPE);
     final String result = executeQueryWithStringOutput(query);
 
     final String expectedMyNum = "\"[3, 4]\"";
@@ -170,15 +163,19 @@ public void fieldOrderOther() throws IOException {
   public void fieldOrderWithScriptFields() throws IOException {
 
     final String[] expectedFields = {"email", "script1", "script2", "gender", "address"};
-    final String query = String.format(Locale.ROOT, "SELECT email, " +
-        "script(script1, \"doc['balance'].value * 2\"), " +
-        "script(script2, painless, \"doc['balance'].value + 10\"), gender, address " +
-        "FROM %s WHERE email='amberduke@pyrami.com'", TEST_INDEX_ACCOUNT);
+    final String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT email, "
+                + "script(script1, \"doc['balance'].value * 2\"), "
+                + "script(script2, painless, \"doc['balance'].value + 10\"), gender, address "
+                + "FROM %s WHERE email='amberduke@pyrami.com'",
+            TEST_INDEX_ACCOUNT);
 
     verifyFieldOrder(expectedFields, query);
   }
 
-  //region Tests migrated from CSVResultsExtractorTests
+  // region Tests migrated from CSVResultsExtractorTests
 
   @Test
   public void simpleSearchResultNotNestedNotFlatNoAggs() throws Exception {
@@ -199,8 +196,8 @@ public void simpleSearchResultNotNestedNotFlatNoAggs() throws Exception {
 
   @Test
   public void simpleSearchResultWithNestedNotFlatNoAggs() throws Exception {
-    String query = String.format(Locale.ROOT, "select name,house from %s",
-        TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(Locale.ROOT, "select name,house from %s", TEST_INDEX_GAME_OF_THRONES);
     CSVResult csvResult = executeCsvRequest(query, false);
 
     List<String> headers = csvResult.getHeaders();
@@ -211,21 +208,42 @@ public void simpleSearchResultWithNestedNotFlatNoAggs() throws Exception {
     List<String> lines = csvResult.getLines();
     Assert.assertEquals(7, lines.size());
 
-    Assert.assertThat(lines, hasRow(null, "Targaryen",
-        Arrays.asList("firstname=Daenerys", "lastname=Targaryen", "ofHerName=1"), true));
-    Assert.assertThat(lines, hasRow(null, "Stark",
-        Arrays.asList("firstname=Eddard", "lastname=Stark", "ofHisName=1"), true));
-    Assert.assertThat(lines, hasRow(null, "Stark",
-        Arrays.asList("firstname=Brandon", "lastname=Stark", "ofHisName=4"), true));
-    Assert.assertThat(lines, hasRow(null, "Lannister",
-        Arrays.asList("firstname=Jaime", "lastname=Lannister", "ofHisName=1"), true));
+    Assert.assertThat(
+        lines,
+        hasRow(
+            null,
+            "Targaryen",
+            Arrays.asList("firstname=Daenerys", "lastname=Targaryen", "ofHerName=1"),
+            true));
+    Assert.assertThat(
+        lines,
+        hasRow(
+            null,
+            "Stark",
+            Arrays.asList("firstname=Eddard", "lastname=Stark", "ofHisName=1"),
+            true));
+    Assert.assertThat(
+        lines,
+        hasRow(
+            null,
+            "Stark",
+            Arrays.asList("firstname=Brandon", "lastname=Stark", "ofHisName=4"),
+            true));
+    Assert.assertThat(
+        lines,
+        hasRow(
+            null,
+            "Lannister",
+            Arrays.asList("firstname=Jaime", "lastname=Lannister", "ofHisName=1"),
+            true));
   }
 
   @Ignore("headers incorrect in case of nested fields")
   @Test
   public void simpleSearchResultWithNestedOneFieldNotFlatNoAggs() throws Exception {
-    String query = String.format(Locale.ROOT, "select name.firstname,house from %s",
-        TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT, "select name.firstname,house from %s", TEST_INDEX_GAME_OF_THRONES);
     CSVResult csvResult = executeCsvRequest(query, false);
 
     List<String> headers = csvResult.getHeaders();
@@ -239,14 +257,16 @@ public void simpleSearchResultWithNestedOneFieldNotFlatNoAggs() throws Exception
     Assert.assertThat(lines, hasItem("{firstname=Eddard},Stark"));
     Assert.assertThat(lines, hasItem("{firstname=Brandon},Stark"));
     Assert.assertThat(lines, hasItem("{firstname=Jaime},Lannister"));
-
   }
 
   @Ignore("headers incorrect in case of nested fields")
   @Test
   public void simpleSearchResultWithNestedTwoFieldsFromSameNestedNotFlatNoAggs() throws Exception {
-    String query = String.format(Locale.ROOT, "select name.firstname,name.lastname,house from %s",
-        TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select name.firstname,name.lastname,house from %s",
+            TEST_INDEX_GAME_OF_THRONES);
     CSVResult csvResult = executeCsvRequest(query, false);
 
     List<String> headers = csvResult.getHeaders();
@@ -257,20 +277,23 @@ public void simpleSearchResultWithNestedTwoFieldsFromSameNestedNotFlatNoAggs() t
     List<String> lines = csvResult.getLines();
     Assert.assertEquals(7, lines.size());
 
-    Assert.assertThat(lines, hasRow(null, "Targaryen",
-        Arrays.asList("firstname=Daenerys", "lastname=Targaryen"), true));
-    Assert.assertThat(lines, hasRow(null, "Stark",
-        Arrays.asList("firstname=Eddard", "lastname=Stark"), true));
-    Assert.assertThat(lines, hasRow(null, "Stark",
-        Arrays.asList("firstname=Brandon", "lastname=Stark"), true));
-    Assert.assertThat(lines, hasRow(null, "Lannister",
-        Arrays.asList("firstname=Jaime", "lastname=Lannister"), true));
+    Assert.assertThat(
+        lines,
+        hasRow(null, "Targaryen", Arrays.asList("firstname=Daenerys", "lastname=Targaryen"), true));
+    Assert.assertThat(
+        lines, hasRow(null, "Stark", Arrays.asList("firstname=Eddard", "lastname=Stark"), true));
+    Assert.assertThat(
+        lines, hasRow(null, "Stark", Arrays.asList("firstname=Brandon", "lastname=Stark"), true));
+    Assert.assertThat(
+        lines,
+        hasRow(null, "Lannister", Arrays.asList("firstname=Jaime", "lastname=Lannister"), true));
   }
 
   @Test
   public void simpleSearchResultWithNestedWithFlatNoAggs() throws Exception {
-    String query = String.format(Locale.ROOT, "select name.firstname,house from %s",
-        TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT, "select name.firstname,house from %s", TEST_INDEX_GAME_OF_THRONES);
     CSVResult csvResult = executeCsvRequest(query, true);
 
     List<String> headers = csvResult.getHeaders();
@@ -288,9 +311,12 @@ public void simpleSearchResultWithNestedWithFlatNoAggs() throws Exception {
 
   @Test
   public void joinSearchResultNotNestedNotFlatNoAggs() throws Exception {
-    String query = String.format(Locale.ROOT, "select c.gender , h.hname,h.words from %s c " +
-        "JOIN %s h " +
-        "on h.hname = c.house ", TEST_INDEX_GAME_OF_THRONES, TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select c.gender , h.hname,h.words from %s c " + "JOIN %s h " + "on h.hname = c.house ",
+            TEST_INDEX_GAME_OF_THRONES,
+            TEST_INDEX_GAME_OF_THRONES);
     CSVResult csvResult = executeCsvRequest(query, false);
 
     List<String> headers = csvResult.getHeaders();
@@ -302,8 +328,8 @@ public void joinSearchResultNotNestedNotFlatNoAggs() throws Exception {
     List<String> lines = csvResult.getLines();
     Assert.assertEquals(4, lines.size());
 
-    Assert.assertThat(lines,
-        hasRow(null, null, Arrays.asList("F", "fireAndBlood", "Targaryen"), false));
+    Assert.assertThat(
+        lines, hasRow(null, null, Arrays.asList("F", "fireAndBlood", "Targaryen"), false));
   }
 
   @Test
@@ -315,7 +341,6 @@ public void simpleNumericValueAgg() throws Exception {
     Assert.assertEquals(1, headers.size());
     Assert.assertEquals("count(*)", headers.get(0));
 
-
     List<String> lines = csvResult.getLines();
     Assert.assertEquals(1, lines.size());
     Assert.assertEquals("2", lines.get(0));
@@ -331,18 +356,16 @@ public void simpleNumericValueAggWithAlias() throws Exception {
     Assert.assertEquals(1, headers.size());
     Assert.assertEquals("myAlias", headers.get(0));
 
-
     List<String> lines = csvResult.getLines();
     Assert.assertEquals(1, lines.size());
     Assert.assertEquals("3.0", lines.get(0));
-
   }
 
   @Ignore("only work for legacy engine")
   public void twoNumericAggWithAlias() throws Exception {
     String query =
-        String.format(Locale.ROOT, "select count(*) as count, avg(age) as myAlias from %s ",
-            TEST_INDEX_DOG);
+        String.format(
+            Locale.ROOT, "select count(*) as count, avg(age) as myAlias from %s ", TEST_INDEX_DOG);
     CSVResult csvResult = executeCsvRequest(query, false);
 
     List<String> headers = csvResult.getHeaders();
@@ -351,7 +374,6 @@ public void twoNumericAggWithAlias() throws Exception {
     Assert.assertTrue(headers.contains("count"));
     Assert.assertTrue(headers.contains("myAlias"));
 
-
     List<String> lines = csvResult.getLines();
     Assert.assertEquals(1, lines.size());
     Assert.assertEquals("2,3.0", lines.get(0));
@@ -359,8 +381,8 @@ public void twoNumericAggWithAlias() throws Exception {
 
   @Test
   public void aggAfterTermsGroupBy() throws Exception {
-    String query = String.format(Locale.ROOT, "SELECT COUNT(*) FROM %s GROUP BY gender",
-        TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(Locale.ROOT, "SELECT COUNT(*) FROM %s GROUP BY gender", TEST_INDEX_ACCOUNT);
     CSVResult csvResult = executeCsvRequest(query, false);
     List<String> headers = csvResult.getHeaders();
     Assert.assertEquals(1, headers.size());
@@ -373,9 +395,11 @@ public void aggAfterTermsGroupBy() throws Exception {
 
   @Test
   public void aggAfterTwoTermsGroupBy() throws Exception {
-    String query = String.format(Locale.ROOT,
-        "SELECT COUNT(*) FROM %s where age in (35,36) GROUP BY gender,age",
-        TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT COUNT(*) FROM %s where age in (35,36) GROUP BY gender,age",
+            TEST_INDEX_ACCOUNT);
     CSVResult csvResult = executeCsvRequest(query, false);
     List<String> headers = csvResult.getHeaders();
     Assert.assertEquals(1, headers.size());
@@ -383,18 +407,17 @@ public void aggAfterTwoTermsGroupBy() throws Exception {
 
     List<String> lines = csvResult.getLines();
     Assert.assertEquals(4, lines.size());
-    assertThat(lines, containsInAnyOrder(
-        equalTo("31"),
-        equalTo("28"),
-        equalTo("21"),
-        equalTo("24")));
+    assertThat(
+        lines, containsInAnyOrder(equalTo("31"), equalTo("28"), equalTo("21"), equalTo("24")));
   }
 
   @Test
   public void multipleAggAfterTwoTermsGroupBy() throws Exception {
-    String query = String.format(Locale.ROOT,
-        "SELECT COUNT(*) , sum(balance) FROM %s where age in (35,36) GROUP BY gender,age",
-        TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT COUNT(*) , sum(balance) FROM %s where age in (35,36) GROUP BY gender,age",
+            TEST_INDEX_ACCOUNT);
     CSVResult csvResult = executeCsvRequest(query, false);
     List<String> headers = csvResult.getHeaders();
     Assert.assertEquals(2, headers.size());
@@ -402,18 +425,23 @@ public void multipleAggAfterTwoTermsGroupBy() throws Exception {
 
     List<String> lines = csvResult.getLines();
     Assert.assertEquals(4, lines.size());
-    assertThat(lines, containsInAnyOrder(
-        equalTo("31,647425"),
-        equalTo("28,678337"),
-        equalTo("21,505660"),
-        equalTo("24,472771")));
+    assertThat(
+        lines,
+        containsInAnyOrder(
+            equalTo("31,647425"),
+            equalTo("28,678337"),
+            equalTo("21,505660"),
+            equalTo("24,472771")));
   }
 
   @Test
   public void dateHistogramTest() throws Exception {
-    String query = String.format(Locale.ROOT, "select count(*) from %s" +
-            " group by date_histogram('field'='insert_time','fixed_interval'='4d','alias'='days')",
-        TEST_INDEX_ONLINE);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select count(*) from %s group by"
+                + " date_histogram('field'='insert_time','fixed_interval'='4d','alias'='days')",
+            TEST_INDEX_ONLINE);
     CSVResult csvResult = executeCsvRequest(query, false);
     List<String> headers = csvResult.getHeaders();
     Assert.assertEquals(1, headers.size());
@@ -421,10 +449,7 @@ public void dateHistogramTest() throws Exception {
 
     List<String> lines = csvResult.getLines();
     Assert.assertEquals(3, lines.size());
-    assertThat(lines, containsInAnyOrder(
-        equalTo("477.0"),
-        equalTo("5664.0"),
-        equalTo("3795.0")));
+    assertThat(lines, containsInAnyOrder(equalTo("477.0"), equalTo("5664.0"), equalTo("3795.0")));
   }
 
   @Test
@@ -451,10 +476,16 @@ public void extendedStatsAggregationTest() throws Exception {
     CSVResult csvResult = executeCsvRequest(query, false);
     List<String> headers = csvResult.getHeaders();
 
-    final String[] expectedHeaders = {"EXTENDED_STATS(age).count", "EXTENDED_STATS(age).sum",
-        "EXTENDED_STATS(age).avg", "EXTENDED_STATS(age).min", "EXTENDED_STATS(age).max",
-        "EXTENDED_STATS(age).sumOfSquares", "EXTENDED_STATS(age).variance",
-        "EXTENDED_STATS(age).stdDeviation"};
+    final String[] expectedHeaders = {
+      "EXTENDED_STATS(age).count",
+      "EXTENDED_STATS(age).sum",
+      "EXTENDED_STATS(age).avg",
+      "EXTENDED_STATS(age).min",
+      "EXTENDED_STATS(age).max",
+      "EXTENDED_STATS(age).sumOfSquares",
+      "EXTENDED_STATS(age).variance",
+      "EXTENDED_STATS(age).stdDeviation"
+    };
 
     Assert.assertEquals(expectedHeaders.length, headers.size());
     Assert.assertThat(headers, contains(expectedHeaders));
@@ -470,7 +501,9 @@ public void extendedStatsAggregationTest() throws Exception {
   @Test
   public void percentileAggregationTest() throws Exception {
     String query =
-        String.format(Locale.ROOT, "select percentiles(age) as per from %s where age > 31",
+        String.format(
+            Locale.ROOT,
+            "select percentiles(age) as per from %s where age > 31",
             TEST_INDEX_ACCOUNT);
     CSVResult csvResult = executeCsvRequest(query, false);
     List<String> headers = csvResult.getHeaders();
@@ -483,7 +516,6 @@ public void percentileAggregationTest() throws Exception {
     Assert.assertEquals("per.95.0", headers.get(5));
     Assert.assertEquals("per.99.0", headers.get(6));
 
-
     List<String> lines = csvResult.getLines();
     Assert.assertEquals(1, lines.size());
     Assert.assertEquals("32.0,32.0,34.0,36.0,38.0,40.0,40.0", lines.get(0));
@@ -491,9 +523,11 @@ public void percentileAggregationTest() throws Exception {
 
   @Test
   public void includeScore() throws Exception {
-    String query = String.format(Locale.ROOT,
-        "select age , firstname from %s where age > 31 order by _score desc limit 2 ",
-        TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select age, firstname, _score from %s where age > 31 order by _score desc limit 2 ",
+            TEST_INDEX_ACCOUNT);
     CSVResult csvResult = executeCsvRequest(query, false, true, false);
     List<String> headers = csvResult.getHeaders();
     Assert.assertEquals(3, headers.size());
@@ -513,9 +547,11 @@ public void includeScore() throws Exception {
 
   @Test
   public void scriptedField() throws Exception {
-    String query = String.format(Locale.ROOT,
-        "select age+1 as agePlusOne ,age , firstname from %s where age =  31 limit 1",
-        TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select age+1 as agePlusOne ,age , firstname from %s where age =  31 limit 1",
+            TEST_INDEX_ACCOUNT);
     CSVResult csvResult = executeCsvRequest(query, false);
     List<String> headers = csvResult.getHeaders();
     Assert.assertEquals(3, headers.size());
@@ -523,8 +559,11 @@ public void scriptedField() throws Exception {
     Assert.assertTrue(headers.contains("age"));
     Assert.assertTrue(headers.contains("firstname"));
     List<String> lines = csvResult.getLines();
-    Assert.assertTrue(lines.get(0).contains("32,31") || lines.get(0).contains("32.0,31.0") ||
-        lines.get(0).contains("31,32") || lines.get(0).contains("31.0,32.0"));
+    Assert.assertTrue(
+        lines.get(0).contains("32,31")
+            || lines.get(0).contains("32.0,31.0")
+            || lines.get(0).contains("31,32")
+            || lines.get(0).contains("31.0,32.0"));
   }
 
   @Ignore("separator not exposed")
@@ -543,13 +582,15 @@ public void twoCharsSeperator() throws Exception {
     Assert.assertEquals(2, lines.size());
     Assert.assertTrue("rex||2".equals(lines.get(0)) || "2||rex".equals(lines.get(0)));
     Assert.assertTrue("snoopy||4".equals(lines.get(1)) || "4||snoopy".equals(lines.get(1)));
-
   }
 
-  @Ignore("only work for legacy engine")
+  @Ignore("tested in @see: org.opensearch.sql.sql.IdentifierIT.testMetafieldIdentifierTest")
   public void includeIdAndNotTypeOrScore() throws Exception {
-    String query = String.format(Locale.ROOT,
-        "select age , firstname from %s where lastname = 'Marquez' ", TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select age, firstname, _id from %s where lastname = 'Marquez' ",
+            TEST_INDEX_ACCOUNT);
     CSVResult csvResult = executeCsvRequest(query, false, false, true);
     List<String> headers = csvResult.getHeaders();
     Assert.assertEquals(3, headers.size());
@@ -559,15 +600,16 @@ public void includeIdAndNotTypeOrScore() throws Exception {
     List<String> lines = csvResult.getLines();
     Assert.assertTrue(lines.get(0).contains(",437") || lines.get(0).contains("437,"));
   }
-  //endregion Tests migrated from CSVResultsExtractorTests
+
+  // endregion Tests migrated from CSVResultsExtractorTests
 
   @Ignore("only work for legacy engine")
   public void sensitiveCharacterSanitizeTest() throws IOException {
     String requestBody =
-        "{" +
-            "  \"=cmd|' /C notepad'!_xlbgnm.A1\": \"+cmd|' /C notepad'!_xlbgnm.A1\",\n" +
-            "  \"-cmd|' /C notepad'!_xlbgnm.A1\": \"@cmd|' /C notepad'!_xlbgnm.A1\"\n" +
-            "}";
+        "{"
+            + "  \"=cmd|' /C notepad'!_xlbgnm.A1\": \"+cmd|' /C notepad'!_xlbgnm.A1\",\n"
+            + "  \"-cmd|' /C notepad'!_xlbgnm.A1\": \"@cmd|' /C notepad'!_xlbgnm.A1\"\n"
+            + "}";
 
     Request request = new Request("PUT", "/userdata/_doc/1?refresh=true");
     request.setJsonEntity(requestBody);
@@ -588,11 +630,11 @@ public void sensitiveCharacterSanitizeTest() throws IOException {
   @Ignore("only work for legacy engine")
   public void sensitiveCharacterSanitizeAndQuotedTest() throws IOException {
     String requestBody =
-        "{" +
-            "  \"=cmd|' /C notepad'!_xlbgnm.A1,,\": \",+cmd|' /C notepad'!_xlbgnm.A1\",\n" +
-            "  \",@cmd|' /C notepad'!_xlbgnm.A1\": \"+cmd|' /C notepad,,'!_xlbgnm.A1\",\n" +
-            "  \"-cmd|' /C notepad,,'!_xlbgnm.A1\": \",,,@cmd|' /C notepad'!_xlbgnm.A1\"\n" +
-            "}";
+        "{"
+            + "  \"=cmd|' /C notepad'!_xlbgnm.A1,,\": \",+cmd|' /C notepad'!_xlbgnm.A1\",\n"
+            + "  \",@cmd|' /C notepad'!_xlbgnm.A1\": \"+cmd|' /C notepad,,'!_xlbgnm.A1\",\n"
+            + "  \"-cmd|' /C notepad,,'!_xlbgnm.A1\": \",,,@cmd|' /C notepad'!_xlbgnm.A1\"\n"
+            + "}";
 
     Request request = new Request("PUT", "/userdata2/_doc/1?refresh=true");
     request.setJsonEntity(requestBody);
@@ -613,8 +655,11 @@ public void sensitiveCharacterSanitizeAndQuotedTest() throws IOException {
 
   @Test
   public void sanitizeTest() throws IOException {
-    CSVResult csvResult = executeCsvRequest(
-        String.format(Locale.ROOT, "SELECT firstname, lastname FROM %s", TEST_INDEX_BANK_CSV_SANITIZE), false);
+    CSVResult csvResult =
+        executeCsvRequest(
+            String.format(
+                Locale.ROOT, "SELECT firstname, lastname FROM %s", TEST_INDEX_BANK_CSV_SANITIZE),
+            false);
     List<String> lines = csvResult.getLines();
     assertEquals(5, lines.size());
     assertEquals(lines.get(0), "'+Amber JOHnny,Duke Willmington+");
@@ -635,8 +680,12 @@ public void selectFunctionAsFieldTest() throws IOException {
   private void verifyFieldOrder(final String[] expectedFields) throws IOException {
 
     final String fields = String.join(", ", expectedFields);
-    final String query = String.format(Locale.ROOT, "SELECT %s FROM %s " +
-        "WHERE email='amberduke@pyrami.com'", fields, TEST_INDEX_ACCOUNT);
+    final String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT %s FROM %s " + "WHERE email='amberduke@pyrami.com'",
+            fields,
+            TEST_INDEX_ACCOUNT);
 
     verifyFieldOrder(expectedFields, query);
   }
@@ -660,13 +709,18 @@ private CSVResult executeCsvRequest(final String query, boolean flat) throws IOE
     return executeCsvRequest(query, flat, false, false);
   }
 
-  private CSVResult executeCsvRequest(final String query, boolean flat, boolean includeScore,
-                                      boolean includeId) throws IOException {
+  private CSVResult executeCsvRequest(
+      final String query, boolean flat, boolean includeScore, boolean includeId)
+      throws IOException {
 
     final String requestBody = super.makeRequest(query);
-    final String endpoint = String.format(Locale.ROOT,
-        "/_plugins/_sql?format=csv&flat=%b&_id=%b&_score=%b",
-        flat, includeId, includeScore);
+    final String endpoint =
+        String.format(
+            Locale.ROOT,
+            "/_plugins/_sql?format=csv&flat=%b&_id=%b&_score=%b",
+            flat,
+            includeId,
+            includeScore);
     final Request sqlRequest = new Request("POST", endpoint);
     sqlRequest.setJsonEntity(requestBody);
     RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
@@ -704,22 +758,32 @@ private CSVResult csvResultFromStringResponse(final String response) {
     return new CSVResult(headers, rows);
   }
 
-  private static AnyOf<List<String>> hasRow(final String prefix, final String suffix,
-                                            final List<String> items,
-                                            final boolean areItemsNested) {
+  private static AnyOf<List<String>> hasRow(
+      final String prefix,
+      final String suffix,
+      final List<String> items,
+      final boolean areItemsNested) {
 
     final Collection<List<String>> permutations = TestUtils.getPermutations(items);
 
-    final List<Matcher<? super List<String>>> matchers = permutations.stream().map(permutation -> {
-
-      final String delimiter = areItemsNested ? ", " : ",";
-      final String objectField = String.join(delimiter, permutation);
-      final String row = String.format(Locale.ROOT, "%s%s%s%s%s",
-          printablePrefix(prefix), areItemsNested ? "\"{" : "",
-          objectField, areItemsNested ? "}\"" : "", printableSuffix(suffix));
-      return hasItem(row);
-
-    }).collect(Collectors.toCollection(LinkedList::new));
+    final List<Matcher<? super List<String>>> matchers =
+        permutations.stream()
+            .map(
+                permutation -> {
+                  final String delimiter = areItemsNested ? ", " : ",";
+                  final String objectField = String.join(delimiter, permutation);
+                  final String row =
+                      String.format(
+                          Locale.ROOT,
+                          "%s%s%s%s%s",
+                          printablePrefix(prefix),
+                          areItemsNested ? "\"{" : "",
+                          objectField,
+                          areItemsNested ? "}\"" : "",
+                          printableSuffix(suffix));
+                  return hasItem(row);
+                })
+            .collect(Collectors.toCollection(LinkedList::new));
 
     return anyOf(matchers);
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/CursorIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/CursorIT.java
index 113a19885a..b6a18d6de9 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/CursorIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/CursorIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.containsString;
@@ -13,6 +12,7 @@
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATE_TIME;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_NESTED_SIMPLE;
 import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
+import static org.opensearch.sql.util.TestUtils.verifyIsV2Cursor;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -42,9 +42,8 @@ protected void init() throws Exception {
   }
 
   /**
-   * Acceptable fetch_size are positive numbers.
-   * For example 0, 24, 53.0, "110" (parsable string) , "786.23"
-   * Negative values should throw 400
+   * Acceptable fetch_size are positive numbers. For example 0, 24, 53.0, "110" (parsable string) ,
+   * "786.23" Negative values should throw 400
    */
   @Test
   public void invalidNegativeFetchSize() throws IOException {
@@ -64,9 +63,7 @@ public void invalidNegativeFetchSize() throws IOException {
     assertThat(resp.query("/error/type"), equalTo("IllegalArgumentException"));
   }
 
-  /**
-   * Non-numeric fetch_size value should throw 400
-   */
+  /** Non-numeric fetch_size value should throw 400 */
   @Test
   public void invalidNonNumericFetchSize() throws IOException {
     String query =
@@ -104,125 +101,137 @@ public void testExceptionOnCursorExplain() throws IOException {
   }
 
   /**
-   * For fetch_size = 0, default to non-pagination behaviour for simple queries
-   * This can be verified by checking that cursor is not present, and old default limit applies
+   * For fetch_size = 0, default to non-pagination behaviour for simple queries This can be verified
+   * by checking that cursor is not present, and old default limit applies
    */
   @Test
   public void noPaginationWhenFetchSizeZero() throws IOException {
     String selectQuery = StringUtils.format("SELECT firstname, state FROM %s", TEST_INDEX_ACCOUNT);
     JSONObject response = new JSONObject(executeFetchQuery(selectQuery, 0, JDBC));
     assertFalse(response.has(CURSOR));
-    assertThat(response.getJSONArray(DATAROWS).length(), equalTo(1000)); // Default limit is 1000 in new engine
+    assertThat(
+        response.getJSONArray(DATAROWS).length(),
+        equalTo(1000)); // Default limit is 1000 in new engine
   }
 
   /**
-   * The index has 1000 records, with fetch size of 50 we should get 20 pages with no cursor on last page
+   * The index has 1000 records, with fetch size of 50 we should get 20 pages with no cursor on last
+   * page
    */
   @Test
   public void validNumberOfPages() throws IOException {
     String selectQuery = StringUtils.format("SELECT firstname, state FROM %s", TEST_INDEX_ACCOUNT);
     JSONObject response = new JSONObject(executeFetchQuery(selectQuery, 50, JDBC));
     String cursor = response.getString(CURSOR);
+    verifyIsV2Cursor(response);
+
     int pageCount = 1;
 
-    while (!cursor.isEmpty()) { //this condition also checks that there is no cursor on last page
+    while (!cursor.isEmpty()) { // this condition also checks that there is no cursor on last page
       response = executeCursorQuery(cursor);
       cursor = response.optString(CURSOR);
+      if (!cursor.isEmpty()) {
+        verifyIsV2Cursor(response);
+      }
       pageCount++;
     }
 
+    // As of phase 1 of pagination feature implementation in V2, plugin returns an empty page at the
+    // end of scrolling
+    pageCount--;
+
     assertThat(pageCount, equalTo(20));
 
     // using random value here, with fetch size of 28 we should get 36 pages (ceil of 1000/28)
     response = new JSONObject(executeFetchQuery(selectQuery, 28, JDBC));
     cursor = response.getString(CURSOR);
+    verifyIsV2Cursor(response);
     System.out.println(response);
     pageCount = 1;
 
     while (!cursor.isEmpty()) {
       response = executeCursorQuery(cursor);
       cursor = response.optString(CURSOR);
+      if (!cursor.isEmpty()) {
+        verifyIsV2Cursor(response);
+      }
       pageCount++;
     }
+
     assertThat(pageCount, equalTo(36));
   }
 
-
   @Test
   public void validTotalResultWithAndWithoutPagination() throws IOException {
     // simple query - accounts index has 1000 docs, using higher limit to get all docs
     String selectQuery = StringUtils.format("SELECT firstname, state FROM %s ", TEST_INDEX_ACCOUNT);
-    verifyWithAndWithoutPaginationResponse(selectQuery + " LIMIT 2000", selectQuery, 80);
+    verifyWithAndWithoutPaginationResponse(selectQuery + " LIMIT 2000", selectQuery, 80, false);
   }
 
   @Test
   public void validTotalResultWithAndWithoutPaginationWhereClause() throws IOException {
-    String selectQuery = StringUtils.format(
-        "SELECT firstname, state FROM %s WHERE balance < 25000 AND age > 32", TEST_INDEX_ACCOUNT
-    );
-    verifyWithAndWithoutPaginationResponse(selectQuery + " LIMIT 2000", selectQuery, 17);
+    String selectQuery =
+        StringUtils.format(
+            "SELECT firstname, state FROM %s WHERE balance < 25000 AND age > 32",
+            TEST_INDEX_ACCOUNT);
+    verifyWithAndWithoutPaginationResponse(selectQuery + " LIMIT 2000", selectQuery, 17, false);
   }
 
   @Test
   public void validTotalResultWithAndWithoutPaginationOrderBy() throws IOException {
-    String selectQuery = StringUtils.format(
-        "SELECT firstname, state FROM %s ORDER BY balance DESC ", TEST_INDEX_ACCOUNT
-    );
-    verifyWithAndWithoutPaginationResponse(selectQuery + " LIMIT 2000", selectQuery, 26);
+    String selectQuery =
+        StringUtils.format(
+            "SELECT firstname, state FROM %s ORDER BY balance DESC ", TEST_INDEX_ACCOUNT);
+    verifyWithAndWithoutPaginationResponse(selectQuery + " LIMIT 2000", selectQuery, 26, false);
   }
 
   @Test
   public void validTotalResultWithAndWithoutPaginationWhereAndOrderBy() throws IOException {
-    String selectQuery = StringUtils.format(
-        "SELECT firstname, state FROM %s WHERE balance < 25000 ORDER BY balance ASC ",
-        TEST_INDEX_ACCOUNT
-    );
-    verifyWithAndWithoutPaginationResponse(selectQuery + " LIMIT 2000", selectQuery, 80);
-
+    String selectQuery =
+        StringUtils.format(
+            "SELECT firstname, state FROM %s WHERE balance < 25000 ORDER BY balance ASC ",
+            TEST_INDEX_ACCOUNT);
+    verifyWithAndWithoutPaginationResponse(selectQuery + " LIMIT 2000", selectQuery, 80, false);
   }
 
   @Test
   public void validTotalResultWithAndWithoutPaginationNested() throws IOException {
     loadIndex(Index.NESTED_SIMPLE);
-    String selectQuery = StringUtils.format(
-        "SELECT name, a.city, a.state FROM %s m , m.address as a ", TEST_INDEX_NESTED_SIMPLE
-    );
-    verifyWithAndWithoutPaginationResponse(selectQuery + " LIMIT 2000", selectQuery, 1);
+    String selectQuery =
+        StringUtils.format(
+            "SELECT name, a.city, a.state FROM %s m , m.address as a ", TEST_INDEX_NESTED_SIMPLE);
+    verifyWithAndWithoutPaginationResponse(selectQuery + " LIMIT 2000", selectQuery, 1, true);
   }
 
   @Test
   public void noCursorWhenResultsLessThanFetchSize() throws IOException {
     // fetch_size is 100, but actual number of rows returned from OpenSearch is 97
-    // a scroll context will be opened but will be closed after first page as all records are fetched
-    String selectQuery = StringUtils.format(
-        "SELECT * FROM %s WHERE balance < 25000 AND age > 36 LIMIT 2000", TEST_INDEX_ACCOUNT
-    );
+    // a scroll context will be opened but will be closed after first page as all records are
+    // fetched
+    String selectQuery =
+        StringUtils.format(
+            "SELECT * FROM %s WHERE balance < 25000 AND age > 36 LIMIT 2000", TEST_INDEX_ACCOUNT);
     JSONObject response = new JSONObject(executeFetchQuery(selectQuery, 100, JDBC));
     assertFalse(response.has(CURSOR));
   }
 
+  @Ignore("Temporary deactivate the test until parameter substitution implemented in V2")
+  // Test was passing before, because such paging query was executed in V1, but now it is executed
+  // in V2
   @Test
   public void testCursorWithPreparedStatement() throws IOException {
-    JSONObject response = executeJDBCRequest(String.format("{" +
-        "  \"fetch_size\": 200," +
-        "  \"query\": \" SELECT age, state FROM %s WHERE age > ? OR state IN (?, ?)\"," +
-        "  \"parameters\": [" +
-        "    {" +
-        "      \"type\": \"integer\"," +
-        "      \"value\": 25" +
-        "    }," +
-        "        {" +
-        "      \"type\": \"string\"," +
-        "      \"value\": \"WA\"" +
-        "    }," +
-        "            {" +
-        "      \"type\": \"string\"," +
-        "      \"value\": \"UT\"" +
-        "    }" +
-        "  ]" +
-        "}", TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeJDBCRequest(
+            String.format(
+                "{  \"fetch_size\": 200,  \"query\": \" SELECT age, state FROM %s WHERE age > ? OR"
+                    + " state IN (?, ?)\",  \"parameters\": [    {      \"type\": \"integer\",     "
+                    + " \"value\": 25    },        {      \"type\": \"string\",      \"value\":"
+                    + " \"WA\"    },            {      \"type\": \"string\",      \"value\": \"UT\""
+                    + "    }  ]}",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     assertTrue(response.has(CURSOR));
+    verifyIsV1Cursor(response.getString(CURSOR));
   }
 
   @Test
@@ -230,38 +239,36 @@ public void testRegressionOnDateFormatChange() throws IOException {
     loadIndex(Index.DATETIME);
     /**
      * With pagination, the field should be date formatted to MySQL format as in
-     * @see <a href="https://github.com/opendistro-for-elasticsearch/sql/pull/367">PR #367</a
      *
-     * TEST_INDEX_DATE_TIME has three docs with login_time as date field with following values
-     * 1.2015-01-01
-     * 2.2015-01-01T12:10:30Z
-     * 3.1585882955
-     * 4.2020-04-08T11:10:30+05:00
+     * @see <a href="https://github.com/opendistro-for-elasticsearch/sql/pull/367">PR #367</a
+     *     <p>TEST_INDEX_DATE_TIME has three docs with login_time as date field with following
+     *     values 1.2015-01-01 2.2015-01-01T12:10:30Z 3.1585882955 4.2020-04-08T11:10:30+05:00
      */
-
     List<String> actualDateList = new ArrayList<>();
     String selectQuery =
         StringUtils.format("SELECT login_time FROM %s LIMIT 500", TEST_INDEX_DATE_TIME);
     JSONObject response = new JSONObject(executeFetchQuery(selectQuery, 1, JDBC));
     String cursor = response.getString(CURSOR);
+    verifyIsV1Cursor(cursor);
     actualDateList.add(response.getJSONArray(DATAROWS).getJSONArray(0).getString(0));
 
     while (!cursor.isEmpty()) {
       response = executeCursorQuery(cursor);
       cursor = response.optString(CURSOR);
+      verifyIsV1Cursor(cursor);
       actualDateList.add(response.getJSONArray(DATAROWS).getJSONArray(0).getString(0));
     }
 
-    List<String> expectedDateList = Arrays.asList(
-        "2015-01-01 00:00:00.000",
-        "2015-01-01 12:10:30.000",
-        "1585882955", // by existing design, this is not formatted in MySQL standard format
-        "2020-04-08 06:10:30.000");
+    List<String> expectedDateList =
+        Arrays.asList(
+            "2015-01-01 00:00:00.000",
+            "2015-01-01 12:10:30.000",
+            "1585882955", // by existing design, this is not formatted in MySQL standard format
+            "2020-04-08 06:10:30.000");
 
     assertThat(actualDateList, equalTo(expectedDateList));
   }
 
-
   @Ignore("Breaking change for OpenSearch: deprecate and enable cursor always")
   @Test
   public void defaultBehaviorWhenCursorSettingIsDisabled() throws IOException {
@@ -274,11 +281,9 @@ public void defaultBehaviorWhenCursorSettingIsDisabled() throws IOException {
     query = StringUtils.format("SELECT firstname, email, state FROM %s", TEST_INDEX_ACCOUNT);
     response = new JSONObject(executeFetchQuery(query, 100, JDBC));
     assertTrue(response.has(CURSOR));
-
     wipeAllClusterSettings();
   }
 
-
   @Test
   public void testCursorSettings() throws IOException {
     // Assert default cursor settings
@@ -289,13 +294,11 @@ public void testCursorSettings() throws IOException {
         new ClusterSetting(PERSISTENT, Settings.Key.SQL_CURSOR_KEEP_ALIVE.getKeyValue(), "200s"));
 
     clusterSettings = getAllClusterSettings();
-    assertThat(clusterSettings.query("/persistent/plugins.sql.cursor.keep_alive"),
-        equalTo("200s"));
+    assertThat(clusterSettings.query("/persistent/plugins.sql.cursor.keep_alive"), equalTo("200s"));
 
     wipeAllClusterSettings();
   }
 
-
   @Ignore("Breaking change for OpenSearch: no pagination if fetch_size field absent in request")
   @Test
   public void testDefaultFetchSizeFromClusterSettings() throws IOException {
@@ -305,12 +308,14 @@ public void testDefaultFetchSizeFromClusterSettings() throws IOException {
     JSONObject response = new JSONObject(executeFetchLessQuery(query, JDBC));
     JSONArray datawRows = response.optJSONArray(DATAROWS);
     assertThat(datawRows.length(), equalTo(1000));
+    verifyIsV1Cursor(response.getString(CURSOR));
 
     updateClusterSettings(new ClusterSetting(TRANSIENT, "opensearch.sql.cursor.fetch_size", "786"));
     response = new JSONObject(executeFetchLessQuery(query, JDBC));
     datawRows = response.optJSONArray(DATAROWS);
     assertThat(datawRows.length(), equalTo(786));
     assertTrue(response.has(CURSOR));
+    verifyIsV1Cursor(response.getString(CURSOR));
 
     wipeAllClusterSettings();
   }
@@ -319,21 +324,23 @@ public void testDefaultFetchSizeFromClusterSettings() throws IOException {
   public void testCursorCloseAPI() throws IOException {
     // multiple invocation of closing cursor should return success
     // fetch page using old cursor should throw error
-    String selectQuery = StringUtils.format(
-        "SELECT firstname, state FROM %s WHERE balance > 100 and age < 40", TEST_INDEX_ACCOUNT);
+    String selectQuery =
+        StringUtils.format(
+            "SELECT firstname, state FROM %s WHERE balance > 100 and age < 40", TEST_INDEX_ACCOUNT);
     JSONObject result = new JSONObject(executeFetchQuery(selectQuery, 50, JDBC));
     String cursor = result.getString(CURSOR);
-
+    verifyIsV2Cursor(result);
     // Retrieving next 10 pages out of remaining 19 pages
     for (int i = 0; i < 10; i++) {
       result = executeCursorQuery(cursor);
       cursor = result.optString(CURSOR);
+      verifyIsV2Cursor(result);
     }
-    //Closing the cursor
+    // Closing the cursor
     JSONObject closeResp = executeCursorCloseQuery(cursor);
     assertThat(closeResp.getBoolean("succeeded"), equalTo(true));
 
-    //Closing the cursor multiple times is idempotent
+    // Closing the cursor multiple times is idempotent
     for (int i = 0; i < 5; i++) {
       closeResp = executeCursorCloseQuery(cursor);
       assertThat(closeResp.getBoolean("succeeded"), equalTo(true));
@@ -349,13 +356,11 @@ public void testCursorCloseAPI() throws IOException {
 
     JSONObject resp = new JSONObject(TestUtils.getResponseBody(response));
     assertThat(resp.getInt("status"), equalTo(404));
-    assertThat(resp.query("/error/reason"), equalTo("all shards failed"));
-    assertThat(resp.query("/error/caused_by/reason").toString(),
-        containsString("No search context found"));
-    assertThat(resp.query("/error/type"), equalTo("search_phase_execution_exception"));
+    assertThat(resp.query("/error/reason").toString(), containsString("all shards failed"));
+    assertThat(resp.query("/error/details").toString(), containsString("No search context found"));
+    assertThat(resp.query("/error/type"), equalTo("SearchPhaseExecutionException"));
   }
 
-
   @Test
   public void invalidCursorIdNotDecodable() throws IOException {
     // could be either not decode-able
@@ -375,9 +380,9 @@ public void invalidCursorIdNotDecodable() throws IOException {
   }
 
   /**
-   * The index has 1000 records, with fetch size of 50 and LIMIT in place
-   * we should get Math.ceil(limit/fetchSize) pages and LIMIT number of rows.
-   * Basically it should not retrieve all records in presence of a smaller LIMIT value.
+   * The index has 1000 records, with fetch size of 50 and LIMIT in place we should get
+   * Math.ceil(limit/fetchSize) pages and LIMIT number of rows. Basically it should not retrieve all
+   * records in presence of a smaller LIMIT value.
    */
   @Test
   public void respectLimitPassedInSelectClause() throws IOException {
@@ -386,12 +391,14 @@ public void respectLimitPassedInSelectClause() throws IOException {
         StringUtils.format("SELECT age, balance FROM %s LIMIT %s", TEST_INDEX_ACCOUNT, limit);
     JSONObject response = new JSONObject(executeFetchQuery(selectQuery, 50, JDBC));
     String cursor = response.getString(CURSOR);
+    verifyIsV1Cursor(cursor);
     int actualDataRowCount = response.getJSONArray(DATAROWS).length();
     int pageCount = 1;
 
     while (!cursor.isEmpty()) {
       response = executeCursorQuery(cursor);
       cursor = response.optString(CURSOR);
+      verifyIsV1Cursor(cursor);
       actualDataRowCount += response.getJSONArray(DATAROWS).length();
       pageCount++;
     }
@@ -400,7 +407,6 @@ public void respectLimitPassedInSelectClause() throws IOException {
     assertThat(actualDataRowCount, equalTo(limit));
   }
 
-
   @Test
   public void noPaginationWithNonJDBCFormat() throws IOException {
     // checking for CSV, RAW format
@@ -417,9 +423,9 @@ public void noPaginationWithNonJDBCFormat() throws IOException {
     assertThat(rows.length, equalTo(1000));
   }
 
-
-  public void verifyWithAndWithoutPaginationResponse(String sqlQuery, String cursorQuery,
-                                                     int fetch_size) throws IOException {
+  public void verifyWithAndWithoutPaginationResponse(
+      String sqlQuery, String cursorQuery, int fetch_size, boolean shouldFallBackToV1)
+      throws IOException {
     // we are only checking here for schema and datarows
     JSONObject withoutCursorResponse = new JSONObject(executeFetchQuery(sqlQuery, 0, JDBC));
 
@@ -432,16 +438,28 @@ public void verifyWithAndWithoutPaginationResponse(String sqlQuery, String curso
     response.optJSONArray(DATAROWS).forEach(dataRows::put);
 
     String cursor = response.getString(CURSOR);
+    if (shouldFallBackToV1) {
+      verifyIsV1Cursor(cursor);
+    } else {
+      verifyIsV2Cursor(response);
+    }
     while (!cursor.isEmpty()) {
       response = executeCursorQuery(cursor);
       response.optJSONArray(DATAROWS).forEach(dataRows::put);
       cursor = response.optString(CURSOR);
+      if (shouldFallBackToV1) {
+        verifyIsV1Cursor(cursor);
+      } else {
+        if (response.has("cursor")) {
+          verifyIsV2Cursor(response);
+        }
+      }
     }
 
-    verifySchema(withoutCursorResponse.optJSONArray(SCHEMA),
-        withCursorResponse.optJSONArray(SCHEMA));
-    verifyDataRows(withoutCursorResponse.optJSONArray(DATAROWS),
-        withCursorResponse.optJSONArray(DATAROWS));
+    verifySchema(
+        withoutCursorResponse.optJSONArray(SCHEMA), withCursorResponse.optJSONArray(SCHEMA));
+    verifyDataRows(
+        withoutCursorResponse.optJSONArray(DATAROWS), withCursorResponse.optJSONArray(DATAROWS));
   }
 
   public void verifySchema(JSONArray schemaOne, JSONArray schemaTwo) {
@@ -465,11 +483,18 @@ public String executeFetchAsStringQuery(String query, String fetchSize, String r
     return responseString;
   }
 
+  private void verifyIsV1Cursor(String cursor) {
+    if (cursor.isEmpty()) {
+      return;
+    }
+    assertTrue(
+        "The cursor '" + cursor.substring(0, 50) + "...' is not from v1 engine.",
+        cursor.startsWith("d:"));
+  }
+
   private String makeRequest(String query, String fetch_size) {
-    return String.format("{" +
-        "  \"fetch_size\": \"%s\"," +
-        "  \"query\": \"%s\"" +
-        "}", fetch_size, query);
+    return String.format(
+        "{" + "  \"fetch_size\": \"%s\"," + "  \"query\": \"%s\"" + "}", fetch_size, query);
   }
 
   private JSONObject executeJDBCRequest(String requestBody) throws IOException {
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/DateFormatIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/DateFormatIT.java
index a0b4b19898..7739bcd74b 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/DateFormatIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/DateFormatIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.contains;
@@ -33,8 +32,7 @@
 public class DateFormatIT extends SQLIntegTestCase {
 
   private static final String SELECT_FROM =
-      "SELECT insert_time " +
-          "FROM " + TestsConstants.TEST_INDEX_ONLINE + " ";
+      "SELECT insert_time " + "FROM " + TestsConstants.TEST_INDEX_ONLINE + " ";
 
   @Override
   protected void init() throws Exception {
@@ -42,21 +40,20 @@ protected void init() throws Exception {
   }
 
   /**
-   * All of the following tests use UTC as their date_format timezone as this is the same timezone of the data
-   * being queried. This is to prevent discrepancies in the OpenSearch query and the actual field data that is
-   * being checked for the integration tests.
-   * <p>
-   * Large LIMIT values were given for some of these queries since the default result size of the query is 200 and
-   * this ends up excluding some of the expected values causing the assertion to fail. LIMIT overrides this.
+   * All of the following tests use UTC as their date_format timezone as this is the same timezone
+   * of the data being queried. This is to prevent discrepancies in the OpenSearch query and the
+   * actual field data that is being checked for the integration tests.
+   *
+   * <p>Large LIMIT values were given for some of these queries since the default result size of the
+   * query is 200 and this ends up excluding some of the expected values causing the assertion to
+   * fail. LIMIT overrides this.
    */
-
   @Test
   public void equalTo() throws SqlParseException {
     assertThat(
         dateQuery(
             SELECT_FROM + "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') = '2014-08-17'"),
-        contains("2014-08-17")
-    );
+        contains("2014-08-17"));
   }
 
   @Test
@@ -64,19 +61,18 @@ public void lessThan() throws SqlParseException {
     assertThat(
         dateQuery(
             SELECT_FROM + "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') < '2014-08-18'"),
-        contains("2014-08-17")
-    );
+        contains("2014-08-17"));
   }
 
   @Test
   public void lessThanOrEqualTo() throws SqlParseException {
     assertThat(
         dateQuery(
-            SELECT_FROM + "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') <= '2014-08-18' " +
-                "ORDER BY insert_time " +
-                "LIMIT 1000"),
-        contains("2014-08-17", "2014-08-18")
-    );
+            SELECT_FROM
+                + "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') <= '2014-08-18' "
+                + "ORDER BY insert_time "
+                + "LIMIT 1000"),
+        contains("2014-08-17", "2014-08-18"));
   }
 
   @Test
@@ -84,92 +80,101 @@ public void greaterThan() throws SqlParseException {
     assertThat(
         dateQuery(
             SELECT_FROM + "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') > '2014-08-23'"),
-        contains("2014-08-24")
-    );
+        contains("2014-08-24"));
   }
 
   @Test
   public void greaterThanOrEqualTo() throws SqlParseException {
     assertThat(
         dateQuery(
-            SELECT_FROM + "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') >= '2014-08-23' " +
-                "ORDER BY insert_time " +
-                "LIMIT 2000"),
-        contains("2014-08-23", "2014-08-24")
-    );
+            SELECT_FROM
+                + "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') >= '2014-08-23' "
+                + "ORDER BY insert_time "
+                + "LIMIT 2000"),
+        contains("2014-08-23", "2014-08-24"));
   }
 
   @Test
   public void and() throws SqlParseException {
     assertThat(
-        dateQuery(SELECT_FROM +
-            "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') >= '2014-08-21' " +
-            "AND date_format(insert_time, 'yyyy-MM-dd', 'UTC') <= '2014-08-23' " +
-            "ORDER BY insert_time " +
-            "LIMIT 3000"),
-        contains("2014-08-21", "2014-08-22", "2014-08-23")
-    );
+        dateQuery(
+            SELECT_FROM
+                + "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') >= '2014-08-21' "
+                + "AND date_format(insert_time, 'yyyy-MM-dd', 'UTC') <= '2014-08-23' "
+                + "ORDER BY insert_time "
+                + "LIMIT 3000"),
+        contains("2014-08-21", "2014-08-22", "2014-08-23"));
   }
 
   @Test
   public void andWithDefaultTimeZone() throws SqlParseException {
     assertThat(
-        dateQuery(SELECT_FROM +
-                "WHERE date_format(insert_time, 'yyyy-MM-dd HH:mm:ss') >= '2014-08-17 16:13:12' " +
-                "AND date_format(insert_time, 'yyyy-MM-dd HH:mm:ss') <= '2014-08-17 16:13:13'",
+        dateQuery(
+            SELECT_FROM
+                + "WHERE date_format(insert_time, 'yyyy-MM-dd HH:mm:ss') >= '2014-08-17 16:13:12' "
+                + "AND date_format(insert_time, 'yyyy-MM-dd HH:mm:ss') <= '2014-08-17 16:13:13'",
             "yyyy-MM-dd HH:mm:ss"),
-        contains("2014-08-17 16:13:12")
-    );
+        contains("2014-08-17 16:13:12"));
   }
 
   @Test
   public void or() throws SqlParseException {
     assertThat(
-        dateQuery(SELECT_FROM +
-            "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') < '2014-08-18' " +
-            "OR date_format(insert_time, 'yyyy-MM-dd', 'UTC') > '2014-08-23' " +
-            "ORDER BY insert_time " +
-            "LIMIT 1000"),
-        contains("2014-08-17", "2014-08-24")
-    );
+        dateQuery(
+            SELECT_FROM
+                + "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') < '2014-08-18' "
+                + "OR date_format(insert_time, 'yyyy-MM-dd', 'UTC') > '2014-08-23' "
+                + "ORDER BY insert_time "
+                + "LIMIT 1000"),
+        contains("2014-08-17", "2014-08-24"));
   }
 
-
   @Test
   public void sortByDateFormat() throws IOException {
-    // Sort by expression in descending order, but sort inside in ascending order, so we increase our confidence
+    // Sort by expression in descending order, but sort inside in ascending order, so we increase
+    // our confidence
     // that successful test isn't just random chance.
 
     JSONArray hits =
-        getHits(executeQuery("SELECT all_client, insert_time " +
-            " FROM " + TestsConstants.TEST_INDEX_ONLINE +
-            " ORDER BY date_format(insert_time, 'dd-MM-YYYY', 'UTC') DESC, insert_time " +
-            " LIMIT 10"));
+        getHits(
+            executeQuery(
+                "SELECT all_client, insert_time "
+                    + " FROM "
+                    + TestsConstants.TEST_INDEX_ONLINE
+                    + " ORDER BY date_format(insert_time, 'dd-MM-YYYY', 'UTC') DESC, insert_time "
+                    + " LIMIT 10"));
 
-    assertThat(new DateTime(getSource(hits.getJSONObject(0)).get("insert_time"), DateTimeZone.UTC),
+    assertThat(
+        new DateTime(getSource(hits.getJSONObject(0)).get("insert_time"), DateTimeZone.UTC),
         is(new DateTime("2014-08-24T00:00:41.221Z", DateTimeZone.UTC)));
   }
 
   @Test
   public void sortByAliasedDateFormat() throws IOException {
     JSONArray hits =
-        getHits(executeQuery(
-            "SELECT all_client, insert_time,  date_format(insert_time, 'dd-MM-YYYY', 'UTC') date" +
-                " FROM " + TestsConstants.TEST_INDEX_ONLINE +
-                " ORDER BY date DESC, insert_time " +
-                " LIMIT 10"));
+        getHits(
+            executeQuery(
+                "SELECT all_client, insert_time,  date_format(insert_time, 'dd-MM-YYYY', 'UTC')"
+                    + " date FROM "
+                    + TestsConstants.TEST_INDEX_ONLINE
+                    + " ORDER BY date DESC, insert_time "
+                    + " LIMIT 10"));
 
-    assertThat(new DateTime(getSource(hits.getJSONObject(0)).get("insert_time"), DateTimeZone.UTC),
+    assertThat(
+        new DateTime(getSource(hits.getJSONObject(0)).get("insert_time"), DateTimeZone.UTC),
         is(new DateTime("2014-08-24T00:00:41.221Z", DateTimeZone.UTC)));
   }
 
   @Ignore("skip this test due to inconsistency in type in new engine")
   @Test
   public void selectDateTimeWithDefaultTimeZone() throws SqlParseException {
-    JSONObject response = executeJdbcRequest("SELECT date_format(insert_time, 'yyyy-MM-dd') as date " +
-            " FROM " + TestsConstants.TEST_INDEX_ONLINE +
-            " WHERE date_format(insert_time, 'yyyy-MM-dd HH:mm:ss') >= '2014-08-17 16:13:12' " +
-            " AND date_format(insert_time, 'yyyy-MM-dd HH:mm:ss') <= '2014-08-17 16:13:13'");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT date_format(insert_time, 'yyyy-MM-dd') as date "
+                + " FROM "
+                + TestsConstants.TEST_INDEX_ONLINE
+                + " WHERE date_format(insert_time, 'yyyy-MM-dd HH:mm:ss') >= '2014-08-17 16:13:12' "
+                + " AND date_format(insert_time, 'yyyy-MM-dd HH:mm:ss') <= '2014-08-17 16:13:13'");
 
     verifySchema(response, schema("date", "", "text"));
     verifyDataRows(response, rows("2014-08-17"));
@@ -177,52 +182,57 @@ public void selectDateTimeWithDefaultTimeZone() throws SqlParseException {
 
   @Test
   public void groupByAndSort() throws IOException {
-    JSONObject aggregations = executeQuery(
-        "SELECT date_format(insert_time, 'dd-MM-YYYY') " +
-            "FROM opensearch-sql_test_index_online " +
-            "GROUP BY date_format(insert_time, 'dd-MM-YYYY') " +
-            "ORDER BY date_format(insert_time, 'dd-MM-YYYY') DESC")
-        .getJSONObject("aggregations");
+    JSONObject aggregations =
+        executeQuery(
+                "SELECT date_format(insert_time, 'dd-MM-YYYY') "
+                    + "FROM opensearch-sql_test_index_online "
+                    + "GROUP BY date_format(insert_time, 'dd-MM-YYYY') "
+                    + "ORDER BY date_format(insert_time, 'dd-MM-YYYY') DESC")
+            .getJSONObject("aggregations");
 
     checkAggregations(aggregations, "date_format", Ordering.natural().reverse());
   }
 
   @Test
   public void groupByAndSortAliasedReversed() throws IOException {
-    JSONObject aggregations = executeQuery(
-        "SELECT date_format(insert_time, 'dd-MM-YYYY') date " +
-            "FROM opensearch-sql_test_index_online " +
-            "GROUP BY date " +
-            "ORDER BY date DESC")
-        .getJSONObject("aggregations");
+    JSONObject aggregations =
+        executeQuery(
+                "SELECT date_format(insert_time, 'dd-MM-YYYY') date "
+                    + "FROM opensearch-sql_test_index_online "
+                    + "GROUP BY date "
+                    + "ORDER BY date DESC")
+            .getJSONObject("aggregations");
 
     checkAggregations(aggregations, "date", Ordering.natural().reverse());
   }
 
   @Test
   public void groupByAndSortAliased() throws IOException {
-    JSONObject aggregations = executeQuery(
-        "SELECT date_format(insert_time, 'dd-MM-YYYY') date " +
-            "FROM opensearch-sql_test_index_online " +
-            "GROUP BY date " +
-            "ORDER BY date ")
-        .getJSONObject("aggregations");
+    JSONObject aggregations =
+        executeQuery(
+                "SELECT date_format(insert_time, 'dd-MM-YYYY') date "
+                    + "FROM opensearch-sql_test_index_online "
+                    + "GROUP BY date "
+                    + "ORDER BY date ")
+            .getJSONObject("aggregations");
 
     checkAggregations(aggregations, "date", Ordering.natural());
   }
 
-  private void checkAggregations(JSONObject aggregations, String key,
-                                 Ordering<Comparable> ordering) {
+  private void checkAggregations(
+      JSONObject aggregations, String key, Ordering<Comparable> ordering) {
     String date = getScriptAggregationKey(aggregations, key);
     JSONArray buckets = aggregations.getJSONObject(date).getJSONArray("buckets");
 
     assertThat(buckets.length(), is(8));
 
-    List<String> aggregationSortKeys = IntStream.range(0, 8)
-        .mapToObj(index -> buckets.getJSONObject(index).getString("key"))
-        .collect(Collectors.toList());
+    List<String> aggregationSortKeys =
+        IntStream.range(0, 8)
+            .mapToObj(index -> buckets.getJSONObject(index).getString("key"))
+            .collect(Collectors.toList());
 
-    assertTrue("The query result must be sorted by date in descending order",
+    assertTrue(
+        "The query result must be sorted by date in descending order",
         ordering.isOrdered(aggregationSortKeys));
   }
 
@@ -239,7 +249,8 @@ private Set<Object> dateQuery(String sql, String format) throws SqlParseExceptio
     }
   }
 
-  private Set<Object> getResult(JSONObject response, String fieldName, DateTimeFormatter formatter) {
+  private Set<Object> getResult(
+      JSONObject response, String fieldName, DateTimeFormatter formatter) {
     JSONArray hits = getHits(response);
     Set<Object> result = new TreeSet<>(); // Using TreeSet so order is maintained
     for (int i = 0; i < hits.length(); i++) {
@@ -255,11 +266,11 @@ private Set<Object> getResult(JSONObject response, String fieldName, DateTimeFor
   }
 
   public static String getScriptAggregationKey(JSONObject aggregation, String prefix) {
-    return aggregation.keySet()
-        .stream()
+    return aggregation.keySet().stream()
         .filter(x -> x.startsWith(prefix))
         .findFirst()
-        .orElseThrow(() -> new RuntimeException(
-            "Can't find key" + prefix + " in aggregation " + aggregation));
+        .orElseThrow(
+            () ->
+                new RuntimeException("Can't find key" + prefix + " in aggregation " + aggregation));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/DateFunctionsIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/DateFunctionsIT.java
index fe5b392c3d..d9a6849fc8 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/DateFunctionsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/DateFunctionsIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -11,6 +10,7 @@
 import static org.hamcrest.Matchers.lessThan;
 import static org.hamcrest.Matchers.matchesPattern;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import java.io.IOException;
 import java.time.Month;
 import org.joda.time.DateTime;
@@ -20,10 +20,9 @@
 import org.junit.Test;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.SearchHit;
 
 public class DateFunctionsIT extends SQLIntegTestCase {
@@ -31,13 +30,13 @@ public class DateFunctionsIT extends SQLIntegTestCase {
   private static final String FROM = "FROM " + TestsConstants.TEST_INDEX_ONLINE;
 
   /**
-   * Some of the first few SQL functions are tested in both SELECT and WHERE cases for flexibility and the remainder
-   * are merely tested in SELECT for simplicity.
-   * <p>
-   * There is a limitation in all date SQL functions in that they expect a date field as input. In the future this
-   * can be expanded on by supporting CAST and casting dates given as Strings to TIMESTAMP (SQL's date type).
+   * Some of the first few SQL functions are tested in both SELECT and WHERE cases for flexibility
+   * and the remainder are merely tested in SELECT for simplicity.
+   *
+   * <p>There is a limitation in all date SQL functions in that they expect a date field as input.
+   * In the future this can be expanded on by supporting CAST and casting dates given as Strings to
+   * TIMESTAMP (SQL's date type).
    */
-
   @Override
   protected void init() throws Exception {
     loadIndex(Index.ONLINE);
@@ -45,9 +44,7 @@ protected void init() throws Exception {
 
   @Test
   public void year() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT YEAR(insert_time) as year"
-    );
+    SearchHit[] hits = query("SELECT YEAR(insert_time) as year");
     for (SearchHit hit : hits) {
       int year = (int) getField(hit, "year");
       DateTime insertTime = getDateFromSource(hit, "insert_time");
@@ -57,9 +54,7 @@ public void year() throws IOException {
 
   @Test
   public void monthOfYear() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT MONTH_OF_YEAR(insert_time) as month_of_year"
-    );
+    SearchHit[] hits = query("SELECT MONTH_OF_YEAR(insert_time) as month_of_year");
     for (SearchHit hit : hits) {
       int monthOfYear = (int) getField(hit, "month_of_year");
       DateTime insertTime = getDateFromSource(hit, "insert_time");
@@ -69,9 +64,7 @@ public void monthOfYear() throws IOException {
 
   @Test
   public void weekOfYearInSelect() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT WEEK_OF_YEAR(insert_time) as week_of_year"
-    );
+    SearchHit[] hits = query("SELECT WEEK_OF_YEAR(insert_time) as week_of_year");
     for (SearchHit hit : hits) {
       int weekOfYear = (int) getField(hit, "week_of_year");
       DateTime insertTime = getDateFromSource(hit, "insert_time");
@@ -81,12 +74,12 @@ public void weekOfYearInSelect() throws IOException {
 
   @Test
   public void weekOfYearInWhere() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT insert_time",
-        "WHERE DATE_FORMAT(insert_time, 'YYYY-MM-dd') < '2014-08-19' AND " +
-            "WEEK_OF_YEAR(insert_time) > 33",
-        "LIMIT 2000"
-    );
+    SearchHit[] hits =
+        query(
+            "SELECT insert_time",
+            "WHERE DATE_FORMAT(insert_time, 'YYYY-MM-dd') < '2014-08-19' AND "
+                + "WEEK_OF_YEAR(insert_time) > 33",
+            "LIMIT 2000");
     for (SearchHit hit : hits) {
       DateTime insertTime = getDateFromSource(hit, "insert_time");
       assertThat(insertTime.weekOfWeekyear().get(), greaterThan(33));
@@ -95,9 +88,7 @@ public void weekOfYearInWhere() throws IOException {
 
   @Test
   public void dayOfYearInSelect() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT DAY_OF_YEAR(insert_time) as day_of_year", "LIMIT 2000"
-    );
+    SearchHit[] hits = query("SELECT DAY_OF_YEAR(insert_time) as day_of_year", "LIMIT 2000");
     for (SearchHit hit : hits) {
       int dayOfYear = (int) getField(hit, "day_of_year");
       DateTime insertTime = getDateFromSource(hit, "insert_time");
@@ -107,9 +98,8 @@ public void dayOfYearInSelect() throws IOException {
 
   @Test
   public void dayOfYearInWhere() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT insert_time", "WHERE DAY_OF_YEAR(insert_time) < 233", "LIMIT 10000"
-    );
+    SearchHit[] hits =
+        query("SELECT insert_time", "WHERE DAY_OF_YEAR(insert_time) < 233", "LIMIT 10000");
     for (SearchHit hit : hits) {
       DateTime insertTime = getDateFromSource(hit, "insert_time");
       assertThat(insertTime.dayOfYear().get(), lessThan(233));
@@ -118,9 +108,7 @@ public void dayOfYearInWhere() throws IOException {
 
   @Test
   public void dayOfMonthInSelect() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT DAY_OF_MONTH(insert_time) as day_of_month", "LIMIT 2000"
-    );
+    SearchHit[] hits = query("SELECT DAY_OF_MONTH(insert_time) as day_of_month", "LIMIT 2000");
     for (SearchHit hit : hits) {
       int dayOfMonth = (int) getField(hit, "day_of_month");
       DateTime insertTime = getDateFromSource(hit, "insert_time");
@@ -130,9 +118,8 @@ public void dayOfMonthInSelect() throws IOException {
 
   @Test
   public void dayOfMonthInWhere() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT insert_time", "WHERE DAY_OF_MONTH(insert_time) < 21", "LIMIT 10000"
-    );
+    SearchHit[] hits =
+        query("SELECT insert_time", "WHERE DAY_OF_MONTH(insert_time) < 21", "LIMIT 10000");
     for (SearchHit hit : hits) {
       DateTime insertTime = getDateFromSource(hit, "insert_time");
       assertThat(insertTime.dayOfMonth().get(), lessThan(21));
@@ -141,9 +128,7 @@ public void dayOfMonthInWhere() throws IOException {
 
   @Test
   public void dayOfWeek() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT DAY_OF_WEEK(insert_time) as day_of_week", "LIMIT 2000"
-    );
+    SearchHit[] hits = query("SELECT DAY_OF_WEEK(insert_time) as day_of_week", "LIMIT 2000");
     for (SearchHit hit : hits) {
       int dayOfWeek = (int) getField(hit, "day_of_week");
       DateTime insertTime = getDateFromSource(hit, "insert_time");
@@ -153,9 +138,7 @@ public void dayOfWeek() throws IOException {
 
   @Test
   public void hourOfDay() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT HOUR_OF_DAY(insert_time) as hour_of_day", "LIMIT 1000"
-    );
+    SearchHit[] hits = query("SELECT HOUR_OF_DAY(insert_time) as hour_of_day", "LIMIT 1000");
     for (SearchHit hit : hits) {
       int hourOfDay = (int) getField(hit, "hour_of_day");
       DateTime insertTime = getDateFromSource(hit, "insert_time");
@@ -165,9 +148,7 @@ public void hourOfDay() throws IOException {
 
   @Test
   public void minuteOfDay() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT MINUTE_OF_DAY(insert_time) as minute_of_day", "LIMIT 500"
-    );
+    SearchHit[] hits = query("SELECT MINUTE_OF_DAY(insert_time) as minute_of_day", "LIMIT 500");
     for (SearchHit hit : hits) {
       int minuteOfDay = (int) getField(hit, "minute_of_day");
       DateTime insertTime = getDateFromSource(hit, "insert_time");
@@ -177,9 +158,7 @@ public void minuteOfDay() throws IOException {
 
   @Test
   public void minuteOfHour() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT MINUTE_OF_HOUR(insert_time) as minute_of_hour", "LIMIT 500"
-    );
+    SearchHit[] hits = query("SELECT MINUTE_OF_HOUR(insert_time) as minute_of_hour", "LIMIT 500");
     for (SearchHit hit : hits) {
       int minuteOfHour = (int) getField(hit, "minute_of_hour");
       DateTime insertTime = getDateFromSource(hit, "insert_time");
@@ -189,9 +168,8 @@ public void minuteOfHour() throws IOException {
 
   @Test
   public void secondOfMinute() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT SECOND_OF_MINUTE(insert_time) as second_of_minute", "LIMIT 500"
-    );
+    SearchHit[] hits =
+        query("SELECT SECOND_OF_MINUTE(insert_time) as second_of_minute", "LIMIT 500");
     for (SearchHit hit : hits) {
       int secondOfMinute = (int) getField(hit, "second_of_minute");
       DateTime insertTime = getDateFromSource(hit, "insert_time");
@@ -201,9 +179,7 @@ public void secondOfMinute() throws IOException {
 
   @Test
   public void month() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT MONTH(insert_time) AS month", "LIMIT 500"
-    );
+    SearchHit[] hits = query("SELECT MONTH(insert_time) AS month", "LIMIT 500");
     for (SearchHit hit : hits) {
       int month = (int) getField(hit, "month");
       DateTime dateTime = getDateFromSource(hit, "insert_time");
@@ -213,9 +189,7 @@ public void month() throws IOException {
 
   @Test
   public void dayofmonth() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT DAYOFMONTH(insert_time) AS dayofmonth", "LIMIT 500"
-    );
+    SearchHit[] hits = query("SELECT DAYOFMONTH(insert_time) AS dayofmonth", "LIMIT 500");
     for (SearchHit hit : hits) {
       int dayofmonth = (int) getField(hit, "dayofmonth");
       DateTime dateTime = getDateFromSource(hit, "insert_time");
@@ -225,9 +199,7 @@ public void dayofmonth() throws IOException {
 
   @Test
   public void date() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT DATE(insert_time) AS date", "LIMIT 500"
-    );
+    SearchHit[] hits = query("SELECT DATE(insert_time) AS date", "LIMIT 500");
     for (SearchHit hit : hits) {
       String date = (String) getField(hit, "date");
       DateTime dateTime = getDateFromSource(hit, "insert_time");
@@ -237,9 +209,7 @@ public void date() throws IOException {
 
   @Test
   public void monthname() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT MONTHNAME(insert_time) AS monthname", "LIMIT 500"
-    );
+    SearchHit[] hits = query("SELECT MONTHNAME(insert_time) AS monthname", "LIMIT 500");
     for (SearchHit hit : hits) {
       String monthname = (String) getField(hit, "monthname");
       DateTime dateTime = getDateFromSource(hit, "insert_time");
@@ -249,9 +219,7 @@ public void monthname() throws IOException {
 
   @Test
   public void timestamp() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT TIMESTAMP(insert_time) AS timestamp", "LIMIT 500"
-    );
+    SearchHit[] hits = query("SELECT TIMESTAMP(insert_time) AS timestamp", "LIMIT 500");
     for (SearchHit hit : hits) {
       String timastamp = (String) getField(hit, "timestamp");
       DateTime dateTime = getDateFromSource(hit, "insert_time");
@@ -284,14 +252,16 @@ private SearchHit[] query(String select, String... statements) throws IOExceptio
     return execute(select + " " + FROM + " " + String.join(" ", statements));
   }
 
-  // TODO: I think this code is now re-used in multiple classes, would be good to move to the base class.
+  // TODO: I think this code is now re-used in multiple classes, would be good to move to the base
+  // class.
   private SearchHit[] execute(String sqlRequest) throws IOException {
     final JSONObject jsonObject = executeRequest(makeRequest(sqlRequest));
 
-    final XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(
-        NamedXContentRegistry.EMPTY,
-        LoggingDeprecationHandler.INSTANCE,
-        jsonObject.toString());
+    final XContentParser parser =
+        new JsonXContentParser(
+            NamedXContentRegistry.EMPTY,
+            LoggingDeprecationHandler.INSTANCE,
+            new JsonFactory().createParser(jsonObject.toString()));
     return SearchResponse.fromXContent(parser).getHits().getHits();
   }
 
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/DeleteIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/DeleteIT.java
index 4fad5a23b7..24895b5b69 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/DeleteIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/DeleteIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.core.IsEqual.equalTo;
@@ -20,8 +19,8 @@ public class DeleteIT extends SQLIntegTestCase {
   protected void init() throws Exception {
     loadIndex(Index.ACCOUNT);
     loadIndex(Index.PHRASE);
-    updateClusterSettings(new ClusterSetting(PERSISTENT,
-        Settings.Key.SQL_DELETE_ENABLED.getKeyValue(), "true"));
+    updateClusterSettings(
+        new ClusterSetting(PERSISTENT, Settings.Key.SQL_DELETE_ENABLED.getKeyValue(), "true"));
   }
 
   @Test
@@ -34,7 +33,8 @@ public void deleteAllTest() throws IOException, InterruptedException {
     response = executeRequest(makeRequest(deleteQuery));
     assertThat(response.getInt("deleted"), equalTo(totalHits));
 
-    // The documents are not deleted immediately, causing the next search call to return all results.
+    // The documents are not deleted immediately, causing the next search call to return all
+    // results.
     // To prevent flakiness, the minimum value of 2000 msec works fine.
     Thread.sleep(2000);
 
@@ -44,20 +44,21 @@ public void deleteAllTest() throws IOException, InterruptedException {
 
   @Test
   public void deleteWithConditionTest() throws IOException, InterruptedException {
-    String selectQuery = StringUtils.format(
-        "SELECT * FROM %s WHERE match_phrase(phrase, 'quick fox here')",
-        TestsConstants.TEST_INDEX_PHRASE
-    );
+    String selectQuery =
+        StringUtils.format(
+            "SELECT * FROM %s WHERE match_phrase(phrase, 'quick fox here')",
+            TestsConstants.TEST_INDEX_PHRASE);
     JSONObject response = executeRequest(makeRequest(selectQuery));
     int totalHits = getTotalHits(response);
 
-    String deleteQuery = StringUtils.format(
-        "DELETE FROM %s WHERE match_phrase(phrase, 'quick fox here')",
-        TestsConstants.TEST_INDEX_PHRASE
-    );
+    String deleteQuery =
+        StringUtils.format(
+            "DELETE FROM %s WHERE match_phrase(phrase, 'quick fox here')",
+            TestsConstants.TEST_INDEX_PHRASE);
     response = executeRequest(makeRequest(deleteQuery));
     assertThat(response.getInt("deleted"), equalTo(totalHits));
-    // The documents are not deleted immediately, causing the next search call to return all results.
+    // The documents are not deleted immediately, causing the next search call to return all
+    // results.
     // To prevent flakiness, the minimum value of 2000 msec works fine.
     Thread.sleep(2000);
 
@@ -84,7 +85,8 @@ public void deleteAllWithJdbcFormat() throws IOException, InterruptedException {
     assertThat(response.query("/status"), equalTo(200));
     assertThat(response.query("/size"), equalTo(1));
 
-    // The documents are not deleted immediately, causing the next search call to return all results.
+    // The documents are not deleted immediately, causing the next search call to return all
+    // results.
     // To prevent flakiness, the minimum value of 2000 msec works fine.
     Thread.sleep(2000);
 
@@ -98,18 +100,18 @@ public void deleteAllWithJdbcFormat() throws IOException, InterruptedException {
 
   @Test
   public void deleteWithConditionTestJdbcFormat() throws IOException, InterruptedException {
-    String selectQuery = StringUtils.format(
-        "SELECT * FROM %s WHERE match_phrase(phrase, 'quick fox here')",
-        TestsConstants.TEST_INDEX_PHRASE
-    );
+    String selectQuery =
+        StringUtils.format(
+            "SELECT * FROM %s WHERE match_phrase(phrase, 'quick fox here')",
+            TestsConstants.TEST_INDEX_PHRASE);
 
     JSONObject response = executeRequest(makeRequest(selectQuery));
     int totalHits = getTotalHits(response);
 
-    String deleteQuery = StringUtils.format(
-        "DELETE FROM %s WHERE match_phrase(phrase, 'quick fox here')",
-        TestsConstants.TEST_INDEX_PHRASE
-    );
+    String deleteQuery =
+        StringUtils.format(
+            "DELETE FROM %s WHERE match_phrase(phrase, 'quick fox here')",
+            TestsConstants.TEST_INDEX_PHRASE);
 
     response = new JSONObject(executeQuery(deleteQuery, "jdbc"));
     System.out.println(response);
@@ -120,7 +122,8 @@ public void deleteWithConditionTestJdbcFormat() throws IOException, InterruptedE
     assertThat(response.query("/status"), equalTo(200));
     assertThat(response.query("/size"), equalTo(1));
 
-    // The documents are not deleted immediately, causing the next search call to return all results.
+    // The documents are not deleted immediately, causing the next search call to return all
+    // results.
     // To prevent flakiness, the minimum value of 2000 msec works fine.
     Thread.sleep(2000);
 
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/ExplainIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/ExplainIT.java
index 4ecabdbf01..27f8eca3ef 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/ExplainIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/ExplainIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.containsString;
@@ -40,16 +39,20 @@ protected void init() throws Exception {
   @Test
   public void searchSanity() throws IOException {
 
-    String expectedOutputFilePath = TestUtils.getResourceFilePath(
-        "src/test/resources/expectedOutput/search_explain.json");
-    String expectedOutput = Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
-        .replaceAll("\r", "");
+    String expectedOutputFilePath =
+        TestUtils.getResourceFilePath("src/test/resources/expectedOutput/search_explain.json");
+    String expectedOutput =
+        Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
 
     String result =
-        explainQuery(String.format("SELECT * FROM %s WHERE firstname LIKE 'A%%' AND age > 20 " +
-            "GROUP BY gender order by _score", TEST_INDEX_ACCOUNT));
-    Assert
-        .assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
+        explainQuery(
+            String.format(
+                "SELECT * FROM %s WHERE firstname LIKE 'A%%' AND age > 20 "
+                    + "GROUP BY gender order by _score",
+                TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
   }
 
   // This test was ignored because group by case function is not supported
@@ -57,118 +60,153 @@ public void searchSanity() throws IOException {
   @Test
   public void aggregationQuery() throws IOException {
 
-    String expectedOutputFilePath = TestUtils.getResourceFilePath(
-        "src/test/resources/expectedOutput/aggregation_query_explain.json");
-    String expectedOutput = Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
-        .replaceAll("\r", "");
-
-    String result = explainQuery(
-        String.format("SELECT address, CASE WHEN gender='0' then 'aaa' else 'bbb'end a2345," +
-                "count(age) FROM %s GROUP BY terms('field'='address','execution_hint'='global_ordinals'),a2345",
-            TEST_INDEX_ACCOUNT));
-    Assert
-        .assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
+    String expectedOutputFilePath =
+        TestUtils.getResourceFilePath(
+            "src/test/resources/expectedOutput/aggregation_query_explain.json");
+    String expectedOutput =
+        Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
+
+    String result =
+        explainQuery(
+            String.format(
+                "SELECT address, CASE WHEN gender='0' then 'aaa' else 'bbb'end a2345,count(age)"
+                    + " FROM %s GROUP BY"
+                    + " terms('field'='address','execution_hint'='global_ordinals'),a2345",
+                TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
   }
 
   @Test
   public void explainScriptValue() throws IOException {
 
-    String expectedOutputFilePath = TestUtils.getResourceFilePath(
-        "src/test/resources/expectedOutput/script_value.json");
-    String expectedOutput = Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
-        .replaceAll("\r", "");
+    String expectedOutputFilePath =
+        TestUtils.getResourceFilePath("src/test/resources/expectedOutput/script_value.json");
+    String expectedOutput =
+        Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
 
-    String result = explainQuery(String.format("SELECT case when gender is null then 'aaa' " +
-        "else gender  end  test , account_number FROM %s", TEST_INDEX_ACCOUNT));
-    Assert
-        .assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
+    String result =
+        explainQuery(
+            String.format(
+                "SELECT case when gender is null then 'aaa' "
+                    + "else gender  end  test , account_number FROM %s",
+                TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
   }
 
   @Test
   public void betweenScriptValue() throws IOException {
 
-    String expectedOutputFilePath = TestUtils.getResourceFilePath(
-        "src/test/resources/expectedOutput/between_query.json");
-    String expectedOutput = Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
-        .replaceAll("\r", "");
+    String expectedOutputFilePath =
+        TestUtils.getResourceFilePath("src/test/resources/expectedOutput/between_query.json");
+    String expectedOutput =
+        Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
 
     String result =
-        explainQuery(String.format("SELECT  case when balance between 100 and 200 then 'aaa' " +
-            "else balance  end  test, account_number FROM %s", TEST_INDEX_ACCOUNT));
-    Assert
-        .assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
+        explainQuery(
+            String.format(
+                "SELECT  case when balance between 100 and 200 then 'aaa' "
+                    + "else balance  end  test, account_number FROM %s",
+                TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
   }
 
   @Test
   public void searchSanityFilter() throws IOException {
 
-    String expectedOutputFilePath = TestUtils.getResourceFilePath(
-        "src/test/resources/expectedOutput/search_explain_filter.json");
-    String expectedOutput = Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
-        .replaceAll("\r", "");
+    String expectedOutputFilePath =
+        TestUtils.getResourceFilePath(
+            "src/test/resources/expectedOutput/search_explain_filter.json");
+    String expectedOutput =
+        Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
 
-    String result = explainQuery(String.format("SELECT * FROM %s WHERE firstname LIKE 'A%%' " +
-        "AND age > 20 GROUP BY gender", TEST_INDEX_ACCOUNT));
-    Assert
-        .assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
+    String result =
+        explainQuery(
+            String.format(
+                "SELECT * FROM %s WHERE firstname LIKE 'A%%' " + "AND age > 20 GROUP BY gender",
+                TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
   }
 
   @Test
   public void deleteSanity() throws IOException {
 
-    String expectedOutputFilePath = TestUtils.getResourceFilePath(
-        "src/test/resources/expectedOutput/delete_explain.json");
-    String expectedOutput = Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
-        .replaceAll("\r", "");
+    String expectedOutputFilePath =
+        TestUtils.getResourceFilePath("src/test/resources/expectedOutput/delete_explain.json");
+    String expectedOutput =
+        Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
     ;
 
     String result =
-        explainQuery(String.format("DELETE FROM %s WHERE firstname LIKE 'A%%' AND age > 20",
-            TEST_INDEX_ACCOUNT));
-    Assert
-        .assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
+        explainQuery(
+            String.format(
+                "DELETE FROM %s WHERE firstname LIKE 'A%%' AND age > 20", TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
   }
 
   @Test
   public void spatialFilterExplainTest() throws IOException {
 
-    String expectedOutputFilePath = TestUtils.getResourceFilePath(
-        "src/test/resources/expectedOutput/search_spatial_explain.json");
-    String expectedOutput = Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
-        .replaceAll("\r", "");
+    String expectedOutputFilePath =
+        TestUtils.getResourceFilePath(
+            "src/test/resources/expectedOutput/search_spatial_explain.json");
+    String expectedOutput =
+        Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
     ;
 
-    String result = explainQuery(String.format("SELECT * FROM %s WHERE GEO_INTERSECTS" +
-        "(place,'POLYGON ((102 2, 103 2, 103 3, 102 3, 102 2))')", TEST_INDEX_LOCATION));
-    Assert
-        .assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
+    String result =
+        explainQuery(
+            String.format(
+                "SELECT * FROM %s WHERE GEO_INTERSECTS"
+                    + "(place,'POLYGON ((102 2, 103 2, 103 3, 102 3, 102 2))')",
+                TEST_INDEX_LOCATION));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
   }
 
   @Test
   public void orderByOnNestedFieldTest() throws Exception {
 
     String result =
-        explainQuery(String.format("SELECT * FROM %s ORDER BY NESTED('message.info','message')",
-            TEST_INDEX_NESTED_TYPE));
-    Assert.assertThat(result.replaceAll("\\s+", ""),
-        equalTo("{\"from\":0,\"size\":200,\"sort\":[{\"message.info\":" +
-            "{\"order\":\"asc\",\"nested\":{\"path\":\"message\"}}}]}"));
+        explainQuery(
+            String.format(
+                "SELECT * FROM %s ORDER BY NESTED('message.info','message')",
+                TEST_INDEX_NESTED_TYPE));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""),
+        equalTo(
+            "{\"from\":0,\"size\":10000,\"sort\":[{\"message.info\":"
+                + "{\"order\":\"asc\",\"nested\":{\"path\":\"message\"}}}]}"));
   }
 
   @Test
   public void multiMatchQuery() throws IOException {
 
-    String expectedOutputFilePath = TestUtils.getResourceFilePath(
-        "src/test/resources/expectedOutput/multi_match_query.json");
-    String expectedOutput = Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
-        .replaceAll("\r", "");
+    String expectedOutputFilePath =
+        TestUtils.getResourceFilePath("src/test/resources/expectedOutput/multi_match_query.json");
+    String expectedOutput =
+        Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
 
     String result =
-        explainQuery(String.format("SELECT * FROM %s WHERE multimatch('query'='this is a test'," +
-            "'fields'='subject^3,message','analyzer'='standard','type'='best_fields','boost'=1.0," +
-            "'slop'=0,'tie_breaker'=0.3,'operator'='and')", TEST_INDEX_ACCOUNT));
-    Assert
-        .assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
+        explainQuery(
+            String.format(
+                "SELECT * FROM %s WHERE multimatch('query'='this is a test',"
+                    + "'fields'='subject^3,message','analyzer'='standard','type'='best_fields','boost'=1.0,"
+                    + "'slop'=0,'tie_breaker'=0.3,'operator'='and')",
+                TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
   }
 
   @Test
@@ -180,36 +218,49 @@ public void termsIncludeExcludeExplainTest() throws IOException {
     final String expected3 = "\"include\":{\"partition\":0,\"num_partitions\":20}";
 
     String result =
-        explainQuery(queryPrefix + " terms('field'='correspond_brand_name','size'='10'," +
-            "'alias'='correspond_brand_name','include'='\\\".*sport.*\\\"','exclude'='\\\"water_.*\\\"')");
+        explainQuery(
+            queryPrefix
+                + " terms('field'='correspond_brand_name','size'='10',"
+                + "'alias'='correspond_brand_name','include'='\\\".*sport.*\\\"','exclude'='\\\"water_.*\\\"')");
     Assert.assertThat(result, containsString(expected1));
 
-    result = explainQuery(queryPrefix + "terms('field'='correspond_brand_name','size'='10'," +
-        "'alias'='correspond_brand_name','include'='[\\\"mazda\\\", \\\"honda\\\"]'," +
-        "'exclude'='[\\\"rover\\\", \\\"jensen\\\"]')");
+    result =
+        explainQuery(
+            queryPrefix
+                + "terms('field'='correspond_brand_name','size'='10',"
+                + "'alias'='correspond_brand_name','include'='[\\\"mazda\\\", \\\"honda\\\"]',"
+                + "'exclude'='[\\\"rover\\\", \\\"jensen\\\"]')");
     Assert.assertThat(result, containsString(expected2));
 
-    result = explainQuery(queryPrefix + "terms('field'='correspond_brand_name','size'='10'," +
-        "'alias'='correspond_brand_name','include'='{\\\"partition\\\":0,\\\"num_partitions\\\":20}')");
+    result =
+        explainQuery(
+            queryPrefix
+                + "terms('field'='correspond_brand_name','size'='10',"
+                + "'alias'='correspond_brand_name','include'='{\\\"partition\\\":0,\\\"num_partitions\\\":20}')");
     Assert.assertThat(result, containsString(expected3));
   }
 
   @Test
   public void explainNLJoin() throws IOException {
 
-    String expectedOutputFilePath = TestUtils.getResourceFilePath(
-        "src/test/resources/expectedOutput/nested_loop_join_explain.json");
-    String expectedOutput = Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
-        .replaceAll("\r", "");
-
-    String query = "SELECT /*! USE_NL*/ a.firstname ,a.lastname , a.gender ,d.dog_name  FROM " +
-        TEST_INDEX_PEOPLE + "/people a JOIN " + TEST_INDEX_DOG +
-        "/dog d on d.holdersName = a.firstname" +
-        " WHERE (a.age > 10 OR a.balance > 2000) AND d.age > 1";
+    String expectedOutputFilePath =
+        TestUtils.getResourceFilePath(
+            "src/test/resources/expectedOutput/nested_loop_join_explain.json");
+    String expectedOutput =
+        Files.toString(new File(expectedOutputFilePath), StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
+
+    String query =
+        "SELECT /*! USE_NL*/ a.firstname ,a.lastname , a.gender ,d.dog_name  FROM "
+            + TEST_INDEX_PEOPLE
+            + "/people a JOIN "
+            + TEST_INDEX_DOG
+            + "/dog d on d.holdersName = a.firstname"
+            + " WHERE (a.age > 10 OR a.balance > 2000) AND d.age > 1";
     String result = explainQuery(query);
 
-    Assert
-        .assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
+    Assert.assertThat(
+        result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
   }
 
   public void testContentTypeOfExplainRequestShouldBeJson() throws IOException {
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/GetEndpointQueryIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/GetEndpointQueryIT.java
index e23753bbd2..81edb54556 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/GetEndpointQueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/GetEndpointQueryIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
@@ -14,13 +13,10 @@
 import org.junit.rules.ExpectedException;
 import org.opensearch.client.ResponseException;
 
-/**
- * Tests to cover requests with "?format=csv" parameter
- */
+/** Tests to cover requests with "?format=csv" parameter */
 public class GetEndpointQueryIT extends SQLIntegTestCase {
 
-  @Rule
-  public ExpectedException rule = ExpectedException.none();
+  @Rule public ExpectedException rule = ExpectedException.none();
 
   @Override
   protected void init() throws Exception {
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/HashJoinIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/HashJoinIT.java
index 284d034cd8..02c55d8eb8 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/HashJoinIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/HashJoinIT.java
@@ -3,12 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_GAME_OF_THRONES;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_UNEXPANDED_OBJECT;
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -19,35 +21,23 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- * Test new hash join algorithm by comparison with old implementation.
- */
+/** Test new hash join algorithm by comparison with old implementation. */
 public class HashJoinIT extends SQLIntegTestCase {
 
-  /**
-   * Hint to use old join algorithm
-   */
+  /** Hint to use old join algorithm */
   private static final String USE_OLD_JOIN_ALGORITHM = "/*! USE_NL*/";
 
-  /**
-   * Set limit to 100% to bypass circuit break check
-   */
+  /** Set limit to 100% to bypass circuit break check */
   private static final String BYPASS_CIRCUIT_BREAK = "/*! JOIN_CIRCUIT_BREAK_LIMIT(100)*/";
 
-  /**
-   * Enable term filter optimization
-   */
+  /** Enable term filter optimization */
   private static final String ENABLE_TERMS_FILTER = "/*! HASH_WITH_TERMS_FILTER*/";
 
-  /**
-   * Default page size is greater than block size
-   */
+  /** Default page size is greater than block size */
   private static final String PAGE_SIZE_GREATER_THAN_BLOCK_SIZE =
       "/*! JOIN_ALGORITHM_BLOCK_SIZE(5)*/";
 
-  /**
-   * Page size is smaller than block size
-   */
+  /** Page size is smaller than block size */
   private static final String PAGE_SIZE_LESS_THAN_BLOCK_SIZE =
       "/*! JOIN_ALGORITHM_BLOCK_SIZE(5)*/ /*! JOIN_SCROLL_PAGE_SIZE(2)*/";
 
@@ -55,6 +45,7 @@ public class HashJoinIT extends SQLIntegTestCase {
   protected void init() throws Exception {
     loadIndex(Index.ACCOUNT);
     loadIndex(Index.GAME_OF_THRONES);
+    loadIndex(Index.UNEXPANDED_OBJECT);
   }
 
   @Test
@@ -69,6 +60,23 @@ public void leftJoin() throws IOException {
     testJoin("LEFT JOIN");
   }
 
+  @Test
+  public void innerJoinUnexpandedObjectField() {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT "
+                + "a.id.serial, b.id.serial "
+                + "FROM %1$s AS a "
+                + "JOIN %1$s AS b "
+                + "ON a.id.serial = b.attributes.hardware.correlate_id "
+                + "WHERE b.attributes.hardware.platform = 'Linux' ",
+            TEST_INDEX_UNEXPANDED_OBJECT);
+
+    JSONObject response = executeJdbcRequest(query);
+    verifyDataRows(response, rows(3, 1), rows(3, 3));
+  }
+
   @Test
   public void innerJoinWithObjectField() throws IOException {
     testJoinWithObjectField("INNER JOIN", "");
@@ -116,8 +124,8 @@ private void testJoin(final String join) throws IOException {
     // TODO: reduce the balance threshold to 10000 when the memory circuit breaker issue
     //  (https://github.com/opendistro-for-elasticsearch/sql/issues/73) is fixed.
     final String querySuffixTemplate =
-        "a.firstname, a.lastname, b.city, b.state FROM %1$s a %2$s %1$s b " +
-            "ON b.age = a.age WHERE a.balance > 45000 AND b.age > 25 LIMIT 1000000";
+        "a.firstname, a.lastname, b.city, b.state FROM %1$s a %2$s %1$s b "
+            + "ON b.age = a.age WHERE a.balance > 45000 AND b.age > 25 LIMIT 1000000";
     final String querySuffix =
         String.format(Locale.ROOT, querySuffixTemplate, TEST_INDEX_ACCOUNT, join);
 
@@ -133,10 +141,11 @@ private void testJoinWithObjectField(final String join, final String hint) throw
 
     // TODO: reduce the balance threshold to 10000 when the memory circuit breaker issue
     //  (https://github.com/opendistro-for-elasticsearch/sql/issues/73) is fixed.
-    final String querySuffixTemplate = "c.name.firstname, c.name.lastname, f.hname, f.seat " +
-        "FROM %1$s c %2$s %1$s f ON f.gender.keyword = c.gender.keyword " +
-        "AND f.house.keyword = c.house.keyword " +
-        "WHERE c.gender = 'M' LIMIT 1000000";
+    final String querySuffixTemplate =
+        "c.name.firstname, c.name.lastname, f.hname, f.seat "
+            + "FROM %1$s c %2$s %1$s f ON f.gender.keyword = c.gender.keyword "
+            + "AND f.house.keyword = c.house.keyword "
+            + "WHERE c.gender = 'M' LIMIT 1000000";
     final String querySuffix =
         String.format(Locale.ROOT, querySuffixTemplate, TEST_INDEX_GAME_OF_THRONES, join);
 
@@ -161,14 +170,16 @@ private void executeAndCompareOldAndNewJoins(final String oldQuery, final String
 
     Set<String> idsOld = new HashSet<>();
 
-    hitsOld.forEach(hitObj -> {
-      JSONObject hit = (JSONObject) hitObj;
-      idsOld.add(hit.getString("_id"));
-    });
-
-    hitsNew.forEach(hitObj -> {
-      JSONObject hit = (JSONObject) hitObj;
-      Assert.assertTrue(idsOld.contains(hit.getString("_id")));
-    });
+    hitsOld.forEach(
+        hitObj -> {
+          JSONObject hit = (JSONObject) hitObj;
+          idsOld.add(hit.getString("_id"));
+        });
+
+    hitsNew.forEach(
+        hitObj -> {
+          JSONObject hit = (JSONObject) hitObj;
+          Assert.assertTrue(idsOld.contains(hit.getString("_id")));
+        });
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/HavingIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/HavingIT.java
index 34e6af02b4..3bd2195a89 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/HavingIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/HavingIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.arrayContaining;
@@ -26,15 +25,19 @@
 public class HavingIT extends SQLIntegTestCase {
 
   private static final String SELECT_FROM_WHERE_GROUP_BY =
-      "SELECT state, COUNT(*) cnt " +
-          "FROM " + TestsConstants.TEST_INDEX_ACCOUNT + " " +
-          "WHERE age = 30 " +
-          "GROUP BY state ";
-
-  private static final Set<Matcher<Object[]>> states1 = rowSet(1, Arrays.asList(
-      "AK", "AR", "CT", "DE", "HI", "IA", "IL", "IN", "LA", "MA", "MD", "MN",
-      "MO", "MT", "NC", "ND", "NE", "NH", "NJ", "NV", "SD", "VT", "WV", "WY"
-  ));
+      "SELECT state, COUNT(*) cnt "
+          + "FROM "
+          + TestsConstants.TEST_INDEX_ACCOUNT
+          + " "
+          + "WHERE age = 30 "
+          + "GROUP BY state ";
+
+  private static final Set<Matcher<Object[]>> states1 =
+      rowSet(
+          1,
+          Arrays.asList(
+              "AK", "AR", "CT", "DE", "HI", "IA", "IL", "IN", "LA", "MA", "MD", "MN", "MO", "MT",
+              "NC", "ND", "NE", "NH", "NJ", "NV", "SD", "VT", "WV", "WY"));
   private static final Set<Matcher<Object[]>> states2 =
       rowSet(2, Arrays.asList("AZ", "DC", "KS", "ME"));
   private static final Set<Matcher<Object[]>> states3 =
@@ -47,118 +50,67 @@ protected void init() throws Exception {
 
   @Test
   public void equalsTo() throws IOException {
-    assertThat(
-        query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt = 2"),
-        resultSet(
-            states2
-        )
-    );
+    assertThat(query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt = 2"), resultSet(states2));
   }
 
   @Test
   public void lessThanOrEqual() throws IOException {
-    assertThat(
-        query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt <= 2"),
-        resultSet(
-            states1,
-            states2
-        )
-    );
+    assertThat(query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt <= 2"), resultSet(states1, states2));
   }
 
   @Test
   public void notEqualsTo() throws IOException {
-    assertThat(
-        query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt <> 2"),
-        resultSet(
-            states1,
-            states3
-        )
-    );
+    assertThat(query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt <> 2"), resultSet(states1, states3));
   }
 
   @Test
   public void between() throws IOException {
     assertThat(
         query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt BETWEEN 1 AND 2"),
-        resultSet(
-            states1,
-            states2
-        )
-    );
+        resultSet(states1, states2));
   }
 
   @Test
   public void notBetween() throws IOException {
     assertThat(
-        query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt NOT BETWEEN 1 AND 2"),
-        resultSet(
-            states3
-        )
-    );
+        query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt NOT BETWEEN 1 AND 2"), resultSet(states3));
   }
 
   @Test
   public void in() throws IOException {
     assertThat(
-        query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt IN (2, 3)"),
-        resultSet(
-            states2,
-            states3
-        )
-    );
+        query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt IN (2, 3)"), resultSet(states2, states3));
   }
 
   @Test
   public void notIn() throws IOException {
-    assertThat(
-        query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt NOT IN (2, 3)"),
-        resultSet(
-            states1
-        )
-    );
+    assertThat(query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt NOT IN (2, 3)"), resultSet(states1));
   }
 
   @Test
   public void and() throws IOException {
     assertThat(
         query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt >= 1 AND cnt < 3"),
-        resultSet(
-            states1,
-            states2
-        )
-    );
+        resultSet(states1, states2));
   }
 
   @Test
   public void or() throws IOException {
     assertThat(
         query(SELECT_FROM_WHERE_GROUP_BY + "HAVING cnt = 1 OR cnt = 3"),
-        resultSet(
-            states1,
-            states3
-        )
-    );
+        resultSet(states1, states3));
   }
 
   @Test
   public void not() throws IOException {
-    assertThat(
-        query(SELECT_FROM_WHERE_GROUP_BY + "HAVING NOT cnt >= 2"),
-        resultSet(
-            states1
-        )
-    );
+    assertThat(query(SELECT_FROM_WHERE_GROUP_BY + "HAVING NOT cnt >= 2"), resultSet(states1));
   }
 
   @Test
   public void notAndOr() throws IOException {
     assertThat(
         query(SELECT_FROM_WHERE_GROUP_BY + "HAVING NOT (cnt > 0 AND cnt <= 2)"),
-        resultSet(
-            states3
-        )
-    );
+        resultSet(states3));
   }
 
   private Set<Object[]> query(String query) throws IOException {
@@ -174,10 +126,8 @@ private Set<Object[]> getResult(JSONObject response, String aggName, String aggF
     Set<Object[]> result = new HashSet<>();
     for (int i = 0; i < buckets.length(); i++) {
       JSONObject bucket = buckets.getJSONObject(i);
-      result.add(new Object[] {
-          bucket.get("key"),
-          ((JSONObject) bucket.get(aggFunc)).getLong("value")
-      });
+      result.add(
+          new Object[] {bucket.get("key"), ((JSONObject) bucket.get(aggFunc)).getLong("value")});
     }
 
     return result;
@@ -185,15 +135,12 @@ private Set<Object[]> getResult(JSONObject response, String aggName, String aggF
 
   @SafeVarargs
   private final Matcher<Iterable<? extends Object[]>> resultSet(Set<Matcher<Object[]>>... rowSets) {
-    return containsInAnyOrder(Arrays.stream(rowSets)
-        .flatMap(Collection::stream)
-        .collect(Collectors.toList()));
+    return containsInAnyOrder(
+        Arrays.stream(rowSets).flatMap(Collection::stream).collect(Collectors.toList()));
   }
 
   private static Set<Matcher<Object[]>> rowSet(long count, List<String> states) {
-    return states.stream()
-        .map(state -> row(state, count))
-        .collect(Collectors.toSet());
+    return states.stream().map(state -> row(state, count)).collect(Collectors.toSet());
   }
 
   private static Matcher<Object[]> row(String state, long count) {
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/JSONRequestIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/JSONRequestIT.java
index 5b7f9202bf..62508576e8 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/JSONRequestIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/JSONRequestIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.CoreMatchers.anyOf;
@@ -11,16 +10,16 @@
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.lessThan;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import java.io.IOException;
 import java.util.Map;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 
@@ -35,11 +34,11 @@ protected void init() throws Exception {
   @Test
   public void search() throws IOException {
     int ageToCompare = 25;
-    SearchHits response = query(String.format("{\"query\":\"" +
-        "SELECT * " +
-        "FROM %s " +
-        "WHERE age > %s " +
-        "LIMIT 1000\"}", TestsConstants.TEST_INDEX_ACCOUNT, ageToCompare));
+    SearchHits response =
+        query(
+            String.format(
+                "{\"query\":\"" + "SELECT * " + "FROM %s " + "WHERE age > %s " + "LIMIT 1000\"}",
+                TestsConstants.TEST_INDEX_ACCOUNT, ageToCompare));
     SearchHit[] hits = response.getHits();
     for (SearchHit hit : hits) {
       int age = (int) hit.getSourceAsMap().get("age");
@@ -63,11 +62,14 @@ public void searchWithFilterAndNoWhere() throws IOException {
      * }
      */
     int ageToCompare = 25;
-    SearchHits response = query(String.format("{\"query\":\"" +
-            "SELECT * " +
-            "FROM %s " +
-            "LIMIT 1000\",\"filter\":{\"range\":{\"age\":{\"gt\":%s}}}}",
-        TestsConstants.TEST_INDEX_ACCOUNT, ageToCompare));
+    SearchHits response =
+        query(
+            String.format(
+                "{\"query\":\""
+                    + "SELECT * "
+                    + "FROM %s "
+                    + "LIMIT 1000\",\"filter\":{\"range\":{\"age\":{\"gt\":%s}}}}",
+                TestsConstants.TEST_INDEX_ACCOUNT, ageToCompare));
     SearchHit[] hits = response.getHits();
     for (SearchHit hit : hits) {
       int age = (int) hit.getSourceAsMap().get("age");
@@ -92,12 +94,15 @@ public void searchWithRangeFilter() throws IOException {
      */
     int ageToCompare = 25;
     int balanceToCompare = 35000;
-    SearchHits response = query(String.format("{\"query\":\"" +
-            "SELECT * " +
-            "FROM %s " +
-            "WHERE age > %s " +
-            "LIMIT 1000\",\"filter\":{\"range\":{\"balance\":{\"lt\":%s}}}}",
-        TestsConstants.TEST_INDEX_ACCOUNT, ageToCompare, balanceToCompare));
+    SearchHits response =
+        query(
+            String.format(
+                "{\"query\":\""
+                    + "SELECT * "
+                    + "FROM %s "
+                    + "WHERE age > %s "
+                    + "LIMIT 1000\",\"filter\":{\"range\":{\"balance\":{\"lt\":%s}}}}",
+                TestsConstants.TEST_INDEX_ACCOUNT, ageToCompare, balanceToCompare));
     SearchHit[] hits = response.getHits();
     for (SearchHit hit : hits) {
       int age = (int) hit.getSourceAsMap().get("age");
@@ -109,8 +114,8 @@ public void searchWithRangeFilter() throws IOException {
 
   @Test
   /**
-   * Using TEST_INDEX_NESTED_TYPE here since term filter does not work properly on analyzed fields like text.
-   * The field 'someField' in TEST_INDEX_NESTED_TYPE is of type keyword.
+   * Using TEST_INDEX_NESTED_TYPE here since term filter does not work properly on analyzed fields
+   * like text. The field 'someField' in TEST_INDEX_NESTED_TYPE is of type keyword.
    */
   public void searchWithTermFilter() throws IOException {
     /*
@@ -126,12 +131,15 @@ public void searchWithTermFilter() throws IOException {
      */
     int likesToCompare = 3;
     String fieldToCompare = "a";
-    SearchHits response = query(String.format("{\"query\":\"" +
-            "SELECT * " +
-            "FROM %s " +
-            "WHERE nested(comment.likes) < %s\"," +
-            "\"filter\":{\"term\":{\"someField\":\"%s\"}}}",
-        TestsConstants.TEST_INDEX_NESTED_TYPE, likesToCompare, fieldToCompare));
+    SearchHits response =
+        query(
+            String.format(
+                "{\"query\":\""
+                    + "SELECT * "
+                    + "FROM %s "
+                    + "WHERE nested(comment.likes) < %s\","
+                    + "\"filter\":{\"term\":{\"someField\":\"%s\"}}}",
+                TestsConstants.TEST_INDEX_NESTED_TYPE, likesToCompare, fieldToCompare));
     SearchHit[] hits = response.getHits();
     for (SearchHit hit : hits) {
       int likes = (int) ((Map) hit.getSourceAsMap().get("comment")).get("likes");
@@ -165,13 +173,16 @@ public void searchWithNestedFilter() throws IOException {
      */
     int likesToCompare = 1;
     String dataToCompare = "aa";
-    SearchHits response = query(String.format("{\"query\":\"" +
-            "SELECT * " +
-            "FROM %s " +
-            "WHERE nested(comment.likes) > %s\"," +
-            "\"filter\":{\"nested\":{\"path\":\"comment\"," +
-            "\"query\":{\"bool\":{\"must\":{\"term\":{\"comment.data\":\"%s\"}}}}}}}",
-        TestsConstants.TEST_INDEX_NESTED_TYPE, likesToCompare, dataToCompare));
+    SearchHits response =
+        query(
+            String.format(
+                "{\"query\":\""
+                    + "SELECT * "
+                    + "FROM %s "
+                    + "WHERE nested(comment.likes) > %s\","
+                    + "\"filter\":{\"nested\":{\"path\":\"comment\","
+                    + "\"query\":{\"bool\":{\"must\":{\"term\":{\"comment.data\":\"%s\"}}}}}}}",
+                TestsConstants.TEST_INDEX_NESTED_TYPE, likesToCompare, dataToCompare));
     SearchHit[] hits = response.getHits();
     for (SearchHit hit : hits) {
       int likes = (int) ((Map) hit.getSourceAsMap().get("comment")).get("likes");
@@ -184,10 +195,11 @@ public void searchWithNestedFilter() throws IOException {
   private SearchHits query(String request) throws IOException {
     final JSONObject jsonObject = executeRequest(request);
 
-    final XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(
-        NamedXContentRegistry.EMPTY,
-        LoggingDeprecationHandler.INSTANCE,
-        jsonObject.toString());
+    final XContentParser parser =
+        new JsonXContentParser(
+            NamedXContentRegistry.EMPTY,
+            LoggingDeprecationHandler.INSTANCE,
+            new JsonFactory().createParser(jsonObject.toString()));
     return SearchResponse.fromXContent(parser).getHits();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/JdbcTestIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/JdbcTestIT.java
index 74f999f368..d86fad3600 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/JdbcTestIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/JdbcTestIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.containsString;
@@ -27,9 +26,10 @@ protected void init() throws Exception {
   }
 
   public void testPercentilesQuery() {
-    JSONObject response = executeJdbcRequest(
-        "SELECT percentiles(age, 25.0, 50.0, 75.0, 99.9) age_percentiles " +
-            "FROM opensearch-sql_test_index_people");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT percentiles(age, 25.0, 50.0, 75.0, 99.9) age_percentiles "
+                + "FROM opensearch-sql_test_index_people");
 
     assertThat(response.getJSONArray("datarows").length(), equalTo(1));
 
@@ -47,9 +47,10 @@ public void testSlowQuery() throws IOException {
     // set slow log threshold = 0s
     updateClusterSettings(new ClusterSetting(PERSISTENT, "plugins.sql.slowlog", "0"));
 
-    JSONObject response = executeJdbcRequest(
-        "SELECT percentiles(age, 25.0, 50.0, 75.0, 99.9) age_percentiles " +
-            "FROM opensearch-sql_test_index_people");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT percentiles(age, 25.0, 50.0, 75.0, 99.9) age_percentiles "
+                + "FROM opensearch-sql_test_index_people");
 
     assertThat(response.getJSONArray("datarows").length(), equalTo(1));
     JSONObject percentileRow = (JSONObject) response.query("/datarows/0/0");
@@ -61,42 +62,39 @@ public void testSlowQuery() throws IOException {
     wipeAllClusterSettings();
   }
 
-  @Ignore("flaky test, trigger resource not enough exception. "
-      + "ORDER BY date_format(insert_time, 'dd-MM-YYYY') can't be pushed down ")
+  @Ignore(
+      "flaky test, trigger resource not enough exception. "
+          + "ORDER BY date_format(insert_time, 'dd-MM-YYYY') can't be pushed down ")
   public void testDateTimeInQuery() {
-    JSONObject response = executeJdbcRequest(
-        "SELECT date_format(insert_time, 'dd-MM-YYYY') " +
-            "FROM opensearch-sql_test_index_online " +
-            "ORDER BY date_format(insert_time, 'dd-MM-YYYY') " +
-            "LIMIT 1"
-    );
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT date_format(insert_time, 'dd-MM-YYYY') "
+                + "FROM opensearch-sql_test_index_online "
+                + "ORDER BY date_format(insert_time, 'dd-MM-YYYY') "
+                + "LIMIT 1");
 
     assertThat(
-        response.getJSONArray("datarows")
-            .getJSONArray(0)
-            .getString(0),
-        equalTo("17-08-2014"));
+        response.getJSONArray("datarows").getJSONArray(0).getString(0), equalTo("17-08-2014"));
   }
 
-  @Ignore("flaky test, trigger resource not enough exception. "
-      + "ORDER BY all_client/10 can't be pushed down ")
+  @Ignore(
+      "flaky test, trigger resource not enough exception. "
+          + "ORDER BY all_client/10 can't be pushed down ")
   public void testDivisionInQuery() {
-    JSONObject response = executeJdbcRequest(
-        "SELECT all_client/10 from opensearch-sql_test_index_online ORDER BY all_client/10 desc limit 1");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT all_client/10 from opensearch-sql_test_index_online ORDER BY all_client/10 desc"
+                + " limit 1");
 
-    assertThat(
-        response.getJSONArray("datarows")
-            .getJSONArray(0)
-            .getDouble(0),
-        equalTo(16827.0));
+    assertThat(response.getJSONArray("datarows").getJSONArray(0).getDouble(0), equalTo(16827.0));
   }
 
   public void testGroupByInQuery() {
-    JSONObject response = executeJdbcRequest(
-        "SELECT date_format(insert_time, 'YYYY-MM-dd'), COUNT(*) " +
-            "FROM opensearch-sql_test_index_online " +
-            "GROUP BY date_format(insert_time, 'YYYY-MM-dd')"
-    );
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT date_format(insert_time, 'YYYY-MM-dd'), COUNT(*) "
+                + "FROM opensearch-sql_test_index_online "
+                + "GROUP BY date_format(insert_time, 'YYYY-MM-dd')");
 
     assertThat(response.getJSONArray("schema").length(), equalTo(2));
     assertThat(response.getJSONArray("datarows").length(), equalTo(8));
@@ -105,28 +103,31 @@ public void testGroupByInQuery() {
   @Test
   public void numberOperatorNameCaseInsensitiveTest() {
     assertSchemaContains(
-        executeQuery("SELECT ABS(age) FROM opensearch-sql_test_index_account " +
-            "WHERE age IS NOT NULL ORDER BY age LIMIT 5", "jdbc"),
-        "ABS(age)"
-    );
+        executeQuery(
+            "SELECT ABS(age) FROM opensearch-sql_test_index_account "
+                + "WHERE age IS NOT NULL ORDER BY age LIMIT 5",
+            "jdbc"),
+        "ABS(age)");
   }
 
   @Test
   public void trigFunctionNameCaseInsensitiveTest() {
     assertSchemaContains(
-        executeQuery("SELECT Cos(age) FROM opensearch-sql_test_index_account " +
-            "WHERE age is NOT NULL ORDER BY age LIMIT 5", "jdbc"),
-        "Cos(age)"
-    );
+        executeQuery(
+            "SELECT Cos(age) FROM opensearch-sql_test_index_account "
+                + "WHERE age is NOT NULL ORDER BY age LIMIT 5",
+            "jdbc"),
+        "Cos(age)");
   }
 
   @Test
   public void stringOperatorNameCaseInsensitiveTest() {
     assertSchemaContains(
-        executeQuery("SELECT SubStrinG(lastname, 0, 2) FROM opensearch-sql_test_index_account " +
-            "ORDER BY age LIMIT 5", "jdbc"),
-        "SubStrinG(lastname, 0, 2)"
-    );
+        executeQuery(
+            "SELECT SubStrinG(lastname, 0, 2) FROM opensearch-sql_test_index_account "
+                + "ORDER BY age LIMIT 5",
+            "jdbc"),
+        "SubStrinG(lastname, 0, 2)");
   }
 
   @Ignore("DATE_FORMAT function signature changed in new engine")
@@ -134,44 +135,52 @@ public void stringOperatorNameCaseInsensitiveTest() {
   public void dateFunctionNameCaseInsensitiveTest() {
     assertTrue(
         executeQuery(
-            "SELECT DATE_FORMAT(insert_time, 'yyyy-MM-dd', 'UTC') FROM opensearch-sql_test_index_online " +
-                "WHERE date_FORMAT(insert_time, 'yyyy-MM-dd', 'UTC') > '2014-01-01' " +
-                "GROUP BY DAte_format(insert_time, 'yyyy-MM-dd', 'UTC') " +
-                "ORDER BY date_forMAT(insert_time, 'yyyy-MM-dd', 'UTC')", "jdbc").equalsIgnoreCase(
-            executeQuery(
-                "SELECT date_format(insert_time, 'yyyy-MM-dd', 'UTC') FROM opensearch-sql_test_index_online " +
-                    "WHERE date_format(insert_time, 'yyyy-MM-dd', 'UTC') > '2014-01-01' " +
-                    "GROUP BY date_format(insert_time, 'yyyy-MM-dd', 'UTC') " +
-                    "ORDER BY date_format(insert_time, 'yyyy-MM-dd', 'UTC')", "jdbc")
-        )
-    );
+                "SELECT DATE_FORMAT(insert_time, 'yyyy-MM-dd', 'UTC') FROM"
+                    + " opensearch-sql_test_index_online WHERE date_FORMAT(insert_time,"
+                    + " 'yyyy-MM-dd', 'UTC') > '2014-01-01' GROUP BY DAte_format(insert_time,"
+                    + " 'yyyy-MM-dd', 'UTC') ORDER BY date_forMAT(insert_time, 'yyyy-MM-dd',"
+                    + " 'UTC')",
+                "jdbc")
+            .equalsIgnoreCase(
+                executeQuery(
+                    "SELECT date_format(insert_time, 'yyyy-MM-dd', 'UTC') FROM"
+                        + " opensearch-sql_test_index_online WHERE date_format(insert_time,"
+                        + " 'yyyy-MM-dd', 'UTC') > '2014-01-01' GROUP BY date_format(insert_time,"
+                        + " 'yyyy-MM-dd', 'UTC') ORDER BY date_format(insert_time, 'yyyy-MM-dd',"
+                        + " 'UTC')",
+                    "jdbc")));
   }
 
   @Test
   public void ipTypeShouldPassJdbcFormatter() {
     assertThat(
-        executeQuery("SELECT host AS hostIP FROM " + TestsConstants.TEST_INDEX_WEBLOG
-            + " ORDER BY hostIP", "jdbc"),
-        containsString("\"type\": \"ip\"")
-    );
+        executeQuery(
+            "SELECT host AS hostIP FROM " + TestsConstants.TEST_INDEX_WEBLOG + " ORDER BY hostIP",
+            "jdbc"),
+        containsString("\"type\": \"ip\""));
   }
 
   @Test
   public void functionWithoutAliasShouldHaveEntireFunctionAsNameInSchema() {
     assertThat(
-        executeQuery("SELECT substring(lastname, 1, 2) FROM " + TestsConstants.TEST_INDEX_ACCOUNT
-            + " ORDER BY substring(lastname, 1, 2)", "jdbc"),
-        containsString("\"name\": \"substring(lastname, 1, 2)\"")
-    );
+        executeQuery(
+            "SELECT substring(lastname, 1, 2) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY substring(lastname, 1, 2)",
+            "jdbc"),
+        containsString("\"name\": \"substring(lastname, 1, 2)\""));
   }
 
+  @Ignore("Handled by v2 engine which returns 'name': 'substring(lastname, 1, 2)' instead")
   @Test
   public void functionWithAliasShouldHaveAliasAsNameInSchema() {
     assertThat(
-        executeQuery("SELECT substring(lastname, 1, 2) AS substring FROM "
-            + TestsConstants.TEST_INDEX_ACCOUNT + " ORDER BY substring", "jdbc"),
-        containsString("\"name\": \"substring\"")
-    );
+        executeQuery(
+            "SELECT substring(lastname, 1, 2) AS substring FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY substring",
+            "jdbc"),
+        containsString("\"name\": \"substring\""));
   }
 
   private void assertSchemaContains(String actualResponse, String expected) {
@@ -182,7 +191,10 @@ private void assertSchemaContains(String actualResponse, String expected) {
         return;
       }
     }
-    Assert.fail("Expected field name [" + expected + "] is not found in response schema: " +
-        actualResponse);
+    Assert.fail(
+        "Expected field name ["
+            + expected
+            + "] is not found in response schema: "
+            + actualResponse);
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/JoinAliasWriterRuleIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/JoinAliasWriterRuleIT.java
index 31c77fa7c0..75b2b45df6 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/JoinAliasWriterRuleIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/JoinAliasWriterRuleIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -15,18 +14,15 @@
 import org.junit.rules.ExpectedException;
 import org.opensearch.client.ResponseException;
 
-/**
- * Test cases for writing missing join table aliases.
- */
+/** Test cases for writing missing join table aliases. */
 public class JoinAliasWriterRuleIT extends SQLIntegTestCase {
 
-  @Rule
-  public ExpectedException exception = ExpectedException.none();
+  @Rule public ExpectedException exception = ExpectedException.none();
 
   protected void init() throws Exception {
-    loadIndex(Index.ORDER);     // opensearch-sql_test_index_order
-    loadIndex(Index.BANK);      // opensearch-sql_test_index_bank
-    loadIndex(Index.BANK_TWO);  // opensearch-sql_test_index_bank_two
+    loadIndex(Index.ORDER); // opensearch-sql_test_index_order
+    loadIndex(Index.BANK); // opensearch-sql_test_index_bank
+    loadIndex(Index.BANK_TWO); // opensearch-sql_test_index_bank_two
   }
 
   @Test
@@ -38,12 +34,14 @@ public void noTableAliasNoCommonColumns() throws IOException {
             "INNER JOIN opensearch-sql_test_index_bank ",
             "ON name = firstname WHERE state = 'WA' OR id < 7"),
         query(
-            "SELECT opensearch-sql_test_index_order_0.id, opensearch-sql_test_index_bank_1.firstname ",
+            "SELECT opensearch-sql_test_index_order_0.id,"
+                + " opensearch-sql_test_index_bank_1.firstname ",
             "FROM opensearch-sql_test_index_order opensearch-sql_test_index_order_0 ",
             "INNER JOIN opensearch-sql_test_index_bank opensearch-sql_test_index_bank_1 ",
-            "ON opensearch-sql_test_index_order_0.name = opensearch-sql_test_index_bank_1.firstname ",
-            "WHERE opensearch-sql_test_index_bank_1.state = 'WA' OR opensearch-sql_test_index_order_0.id < 7")
-    );
+            "ON opensearch-sql_test_index_order_0.name = opensearch-sql_test_index_bank_1.firstname"
+                + " ",
+            "WHERE opensearch-sql_test_index_bank_1.state = 'WA' OR"
+                + " opensearch-sql_test_index_order_0.id < 7"));
   }
 
   @Test
@@ -59,8 +57,7 @@ public void oneTableAliasNoCommonColumns() throws IOException {
             "FROM opensearch-sql_test_index_order a ",
             "INNER JOIN opensearch-sql_test_index_bank opensearch-sql_test_index_bank_0 ",
             "ON a.name = opensearch-sql_test_index_bank_0.firstname ",
-            "WHERE opensearch-sql_test_index_bank_0.state = 'WA' OR a.id < 7")
-    );
+            "WHERE opensearch-sql_test_index_bank_0.state = 'WA' OR a.id < 7"));
   }
 
   @Test
@@ -76,8 +73,7 @@ public void bothTableAliasNoCommonColumns() throws IOException {
             "FROM opensearch-sql_test_index_order a ",
             "INNER JOIN opensearch-sql_test_index_bank b ",
             "ON a.name = b.firstname ",
-            "WHERE b.state = 'WA' OR a.id < 7 ")
-    );
+            "WHERE b.state = 'WA' OR a.id < 7 "));
   }
 
   @Test
@@ -90,12 +86,14 @@ public void tableNamesWithTypeName() throws IOException {
             "INNER JOIN opensearch-sql_test_index_bank/account ",
             "ON name = firstname WHERE state = 'WA' OR id < 7"),
         query(
-            "SELECT opensearch-sql_test_index_order_0.id, opensearch-sql_test_index_bank_1.firstname ",
+            "SELECT opensearch-sql_test_index_order_0.id,"
+                + " opensearch-sql_test_index_bank_1.firstname ",
             "FROM opensearch-sql_test_index_order/_doc opensearch-sql_test_index_order_0 ",
             "INNER JOIN opensearch-sql_test_index_bank/_account opensearch-sql_test_index_bank_1 ",
-            "ON opensearch-sql_test_index_order_0.name = opensearch-sql_test_index_bank_1.firstname ",
-            "WHERE opensearch-sql_test_index_bank_1.state = 'WA' OR opensearch-sql_test_index_order_0.id < 7")
-    );
+            "ON opensearch-sql_test_index_order_0.name = opensearch-sql_test_index_bank_1.firstname"
+                + " ",
+            "WHERE opensearch-sql_test_index_bank_1.state = 'WA' OR"
+                + " opensearch-sql_test_index_order_0.id < 7"));
   }
 
   @Ignore
@@ -112,8 +110,7 @@ public void tableNamesWithTypeNameExplicitTableAlias() throws IOException {
             "FROM opensearch-sql_test_index_order a ",
             "INNER JOIN opensearch-sql_test_index_bank b ",
             "ON a.name = b.firstname ",
-            "WHERE b.state = 'WA' OR a.id < 7")
-    );
+            "WHERE b.state = 'WA' OR a.id < 7"));
   }
 
   @Test
@@ -129,8 +126,7 @@ public void actualTableNameAsAliasOnColumnFields() throws IOException {
             "FROM opensearch-sql_test_index_order  opensearch-sql_test_index_order_0 ",
             "INNER JOIN opensearch-sql_test_index_bank b ",
             "ON opensearch-sql_test_index_order_0.name = b.firstname ",
-            "WHERE b.state = 'WA' OR opensearch-sql_test_index_order_0.id < 7")
-    );
+            "WHERE b.state = 'WA' OR opensearch-sql_test_index_order_0.id < 7"));
   }
 
   @Test
@@ -143,12 +139,14 @@ public void actualTableNameAsAliasOnColumnFieldsTwo() throws IOException {
             "ON opensearch-sql_test_index_order.name = firstname ",
             "WHERE opensearch-sql_test_index_bank.state = 'WA' OR id < 7"),
         query(
-            "SELECT opensearch-sql_test_index_order_0.id, opensearch-sql_test_index_bank_1.firstname ",
+            "SELECT opensearch-sql_test_index_order_0.id,"
+                + " opensearch-sql_test_index_bank_1.firstname ",
             "FROM opensearch-sql_test_index_order  opensearch-sql_test_index_order_0 ",
             "INNER JOIN opensearch-sql_test_index_bank opensearch-sql_test_index_bank_1",
-            "ON opensearch-sql_test_index_order_0.name = opensearch-sql_test_index_bank_1.firstname ",
-            "WHERE opensearch-sql_test_index_bank_1.state = 'WA' OR opensearch-sql_test_index_order_0.id < 7")
-    );
+            "ON opensearch-sql_test_index_order_0.name = opensearch-sql_test_index_bank_1.firstname"
+                + " ",
+            "WHERE opensearch-sql_test_index_bank_1.state = 'WA' OR"
+                + " opensearch-sql_test_index_order_0.id < 7"));
   }
 
   @Test
@@ -164,44 +162,47 @@ public void columnsWithTableAliasNotAffected() throws IOException {
             "FROM opensearch-sql_test_index_order a ",
             "INNER JOIN opensearch-sql_test_index_bank b ",
             "ON a.name = b.firstname ",
-            "WHERE b.state = 'WA' OR a.id < 7")
-    );
+            "WHERE b.state = 'WA' OR a.id < 7"));
   }
 
   @Test
   public void commonColumnWithoutTableAliasDifferentTables() throws IOException {
     exception.expect(ResponseException.class);
     exception.expectMessage("Field name [firstname] is ambiguous");
-    String explain = explainQuery(query(
-        "SELECT firstname, lastname ",
-        "FROM opensearch-sql_test_index_bank ",
-        "LEFT JOIN opensearch-sql_test_index_bank_two ",
-        "ON firstname = lastname WHERE state = 'VA' "
-    ));
+    String explain =
+        explainQuery(
+            query(
+                "SELECT firstname, lastname ",
+                "FROM opensearch-sql_test_index_bank ",
+                "LEFT JOIN opensearch-sql_test_index_bank_two ",
+                "ON firstname = lastname WHERE state = 'VA' "));
   }
 
   @Test
   public void sameTablesNoAliasAndNoAliasOnColumns() throws IOException {
     exception.expect(ResponseException.class);
     exception.expectMessage("Not unique table/alias: [opensearch-sql_test_index_bank]");
-    String explain = explainQuery(query(
-        "SELECT firstname, lastname ",
-        "FROM opensearch-sql_test_index_bank ",
-        "LEFT JOIN opensearch-sql_test_index_bank ",
-        "ON firstname = lastname WHERE state = 'VA' "
-    ));
+    String explain =
+        explainQuery(
+            query(
+                "SELECT firstname, lastname ",
+                "FROM opensearch-sql_test_index_bank ",
+                "LEFT JOIN opensearch-sql_test_index_bank ",
+                "ON firstname = lastname WHERE state = 'VA' "));
   }
 
   @Test
   public void sameTablesNoAliasWithTableNameAsAliasOnColumns() throws IOException {
     exception.expect(ResponseException.class);
     exception.expectMessage("Not unique table/alias: [opensearch-sql_test_index_bank]");
-    String explain = explainQuery(query(
-        "SELECT opensearch-sql_test_index_bank.firstname",
-        "FROM opensearch-sql_test_index_bank ",
-        "JOIN opensearch-sql_test_index_bank ",
-        "ON opensearch-sql_test_index_bank.firstname = opensearch-sql_test_index_bank.lastname"
-    ));
+    String explain =
+        explainQuery(
+            query(
+                "SELECT opensearch-sql_test_index_bank.firstname",
+                "FROM opensearch-sql_test_index_bank ",
+                "JOIN opensearch-sql_test_index_bank ",
+                "ON opensearch-sql_test_index_bank.firstname ="
+                    + " opensearch-sql_test_index_bank.lastname"));
   }
 
   @Test
@@ -211,16 +212,12 @@ public void sameTablesWithExplicitAliasOnFirst() throws IOException {
             "SELECT opensearch-sql_test_index_bank.firstname, a.lastname ",
             "FROM opensearch-sql_test_index_bank a",
             "JOIN opensearch-sql_test_index_bank ",
-            "ON opensearch-sql_test_index_bank.firstname = a.lastname "
-        ),
+            "ON opensearch-sql_test_index_bank.firstname = a.lastname "),
         query(
             "SELECT opensearch-sql_test_index_bank_0.firstname, a.lastname ",
             "FROM opensearch-sql_test_index_bank a",
             "JOIN  opensearch-sql_test_index_bank opensearch-sql_test_index_bank_0",
-            "ON opensearch-sql_test_index_bank_0.firstname = a.lastname "
-        )
-
-    );
+            "ON opensearch-sql_test_index_bank_0.firstname = a.lastname "));
   }
 
   @Test
@@ -230,16 +227,12 @@ public void sameTablesWithExplicitAliasOnSecond() throws IOException {
             "SELECT opensearch-sql_test_index_bank.firstname, a.lastname ",
             "FROM opensearch-sql_test_index_bank ",
             "JOIN opensearch-sql_test_index_bank a",
-            "ON opensearch-sql_test_index_bank.firstname = a.lastname "
-        ),
+            "ON opensearch-sql_test_index_bank.firstname = a.lastname "),
         query(
             "SELECT opensearch-sql_test_index_bank_0.firstname, a.lastname ",
             "FROM opensearch-sql_test_index_bank opensearch-sql_test_index_bank_0",
             "JOIN  opensearch-sql_test_index_bank a",
-            "ON opensearch-sql_test_index_bank_0.firstname = a.lastname "
-        )
-
-    );
+            "ON opensearch-sql_test_index_bank_0.firstname = a.lastname "));
   }
 
   private void sameExplain(String actualQuery, String expectedQuery) throws IOException {
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/JoinIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/JoinIT.java
index 46515be134..8019454b77 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/JoinIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/JoinIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.anyOf;
@@ -62,10 +61,14 @@ public void joinParseCheckSelectedFieldsSplitNL() throws IOException {
   @Test
   public void joinParseWithHintsCheckSelectedFieldsSplitHASH() throws IOException {
 
-    String query = String.format(Locale.ROOT, "SELECT /*! HASH_WITH_TERMS_FILTER*/ " +
-            "a.firstname ,a.lastname, a.gender ,d.dog_name FROM %s a JOIN %s d " +
-            "ON d.holdersName = a.firstname WHERE (a.age > 10 OR a.balance > 2000) AND d.age > 1",
-        TEST_INDEX_PEOPLE, TEST_INDEX_DOG);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT /*! HASH_WITH_TERMS_FILTER*/ a.firstname ,a.lastname, a.gender ,d.dog_name FROM"
+                + " %s a JOIN %s d ON d.holdersName = a.firstname WHERE (a.age > 10 OR a.balance >"
+                + " 2000) AND d.age > 1",
+            TEST_INDEX_PEOPLE,
+            TEST_INDEX_DOG);
 
     JSONObject result = executeQuery(query);
     verifyJoinParseCheckSelectedFieldsSplitResult(result, false);
@@ -75,9 +78,9 @@ public void joinParseWithHintsCheckSelectedFieldsSplitHASH() throws IOException
 
     // TODO: figure out why explain does not show results from first query in term filter and
     //       fix either the test or the code.
-    //Arrays.asList("daenerys","nanette","virginia","aurelia","mcgee","hattie","elinor","burton").forEach(name -> {
+    // Arrays.asList("daenerys","nanette","virginia","aurelia","mcgee","hattie","elinor","burton").forEach(name -> {
     //    Assert.assertThat(explanation, containsString(name));
-    //});
+    // });
   }
 
   @Test
@@ -95,8 +98,11 @@ public void joinWithNoWhereButWithConditionNL() throws IOException {
   @Test
   public void joinWithStarHASH() throws IOException {
 
-    String query = String.format(Locale.ROOT, "SELECT * FROM %1$s c " +
-        "JOIN %1$s h ON h.hname = c.house ", TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT * FROM %1$s c " + "JOIN %1$s h ON h.hname = c.house ",
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -269,9 +275,13 @@ public void testLeftJoinWithLimitNL() throws IOException {
   @Test
   public void hintMultiSearchCanRunFewTimesNL() throws IOException {
 
-    String query = String.format(Locale.ROOT, "SELECT /*! USE_NL*/ /*! NL_MULTISEARCH_SIZE(2)*/ " +
-        "c.name.firstname,c.parents.father,h.hname,h.words FROM %1$s c " +
-        "JOIN %1$s h", TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT /*! USE_NL*/ /*! NL_MULTISEARCH_SIZE(2)*/ "
+                + "c.name.firstname,c.parents.father,h.hname,h.words FROM %1$s c "
+                + "JOIN %1$s h",
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -281,9 +291,13 @@ public void hintMultiSearchCanRunFewTimesNL() throws IOException {
   @Test
   public void joinWithGeoIntersectNL() throws IOException {
 
-    String query = String.format(Locale.ROOT, "SELECT p1.description,p2.description " +
-            "FROM %s p1 JOIN %s p2 ON GEO_INTERSECTS(p2.place,p1.place)",
-        TEST_INDEX_LOCATION, TEST_INDEX_LOCATION2);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT p1.description,p2.description "
+                + "FROM %s p1 JOIN %s p2 ON GEO_INTERSECTS(p2.place,p1.place)",
+            TEST_INDEX_LOCATION,
+            TEST_INDEX_LOCATION2);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -299,11 +313,15 @@ public void joinWithGeoIntersectNL() throws IOException {
   @Test
   public void joinWithInQuery() throws IOException {
 
-    //TODO: Either change the ON condition field to keyword or create a different subquery
-    String query = String.format(Locale.ROOT, "SELECT c.gender,c.name.firstname,h.hname,h.words " +
-            "FROM %1$s c JOIN %1$s h ON h.hname = c.house " +
-            "WHERE c.name.firstname IN (SELECT holdersName FROM %2$s)",
-        TEST_INDEX_GAME_OF_THRONES, TEST_INDEX_DOG);
+    // TODO: Either change the ON condition field to keyword or create a different subquery
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT c.gender,c.name.firstname,h.hname,h.words "
+                + "FROM %1$s c JOIN %1$s h ON h.hname = c.house "
+                + "WHERE c.name.firstname IN (SELECT holdersName FROM %2$s)",
+            TEST_INDEX_GAME_OF_THRONES,
+            TEST_INDEX_DOG);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -327,10 +345,14 @@ public void joinWithOrNL() throws IOException {
   @Test
   public void joinWithOrWithTermsFilterOpt() throws IOException {
 
-    String query = String.format(Locale.ROOT, "SELECT /*! HASH_WITH_TERMS_FILTER*/ " +
-            "d.dog_name,c.name.firstname FROM %s c " +
-            "JOIN %s d ON d.holdersName = c.name.firstname OR d.age = c.name.ofHisName",
-        TEST_INDEX_GAME_OF_THRONES, TEST_INDEX_DOG);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT /*! HASH_WITH_TERMS_FILTER*/ "
+                + "d.dog_name,c.name.firstname FROM %s c "
+                + "JOIN %s d ON d.holdersName = c.name.firstname OR d.age = c.name.ofHisName",
+            TEST_INDEX_GAME_OF_THRONES,
+            TEST_INDEX_DOG);
 
     executeQuery(query);
     String explanation = explainQuery(query);
@@ -338,9 +360,8 @@ public void joinWithOrWithTermsFilterOpt() throws IOException {
     Assert.assertTrue(containsTerm(explanation, "holdersName"));
     Assert.assertTrue(containsTerm(explanation, "age"));
 
-    Arrays.asList("daenerys", "brandon", "eddard", "jaime").forEach(
-        name -> Assert.assertTrue(explanation.contains(name))
-    );
+    Arrays.asList("daenerys", "brandon", "eddard", "jaime")
+        .forEach(name -> Assert.assertTrue(explanation.contains(name)));
   }
 
   @Test
@@ -394,26 +415,32 @@ public void leftJoinWithAllFromSecondTableNL() throws IOException {
   @Test
   public void joinParseCheckSelectedFieldsSplitNLConditionOrderEQ() throws IOException {
 
-    final String query = String.format(Locale.ROOT, "SELECT /*! USE_NL*/ " +
-            "a.firstname, a.lastname, a.gender, d.dog_name FROM %s a JOIN %s d " +
-            "ON a.firstname = d.holdersName WHERE (a.age > 10 OR a.balance > 2000) AND d.age > 1",
-        TEST_INDEX_PEOPLE2, TEST_INDEX_DOG2);
+    final String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT /*! USE_NL*/ a.firstname, a.lastname, a.gender, d.dog_name FROM %s a JOIN %s d"
+                + " ON a.firstname = d.holdersName WHERE (a.age > 10 OR a.balance > 2000) AND d.age"
+                + " > 1",
+            TEST_INDEX_PEOPLE2,
+            TEST_INDEX_DOG2);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
 
     Assert.assertThat(hits.length(), equalTo(2));
 
-    Map<String, String> match1 = ImmutableMap.of(
-        "a.firstname", "Daenerys",
-        "a.lastname", "Targaryen",
-        "a.gender", "M",
-        "d.dog_name", "rex");
-    Map<String, String> match2 = ImmutableMap.of(
-        "a.firstname", "Hattie",
-        "a.lastname", "Bond",
-        "a.gender", "M",
-        "d.dog_name", "snoopy");
+    Map<String, String> match1 =
+        ImmutableMap.of(
+            "a.firstname", "Daenerys",
+            "a.lastname", "Targaryen",
+            "a.gender", "M",
+            "d.dog_name", "rex");
+    Map<String, String> match2 =
+        ImmutableMap.of(
+            "a.firstname", "Hattie",
+            "a.lastname", "Bond",
+            "a.gender", "M",
+            "d.dog_name", "snoopy");
 
     Assert.assertTrue(hitsInclude(hits, match1));
     Assert.assertTrue(hitsInclude(hits, match2));
@@ -422,21 +449,44 @@ public void joinParseCheckSelectedFieldsSplitNLConditionOrderEQ() throws IOExcep
   @Test
   public void joinParseCheckSelectedFieldsSplitNLConditionOrderGT() throws IOException {
 
-    final String query = String.format(Locale.ROOT, "SELECT /*! USE_NL*/ " +
-            "a.firstname, a.lastname, a.gender, d.firstname, d.age  FROM " +
-            "%s a JOIN %s d on a.age < d.age " +
-            "WHERE (d.firstname = 'Lynn' OR d.firstname = 'Obrien') AND a.firstname = 'Mcgee'",
-        TEST_INDEX_PEOPLE, TEST_INDEX_ACCOUNT);
+    final String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT /*! USE_NL*/ a.firstname, a.lastname, a.gender, d.firstname, d.age  FROM %s a"
+                + " JOIN %s d on a.age < d.age WHERE (d.firstname = 'Lynn' OR d.firstname ="
+                + " 'Obrien') AND a.firstname = 'Mcgee'",
+            TEST_INDEX_PEOPLE,
+            TEST_INDEX_ACCOUNT);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
 
     Assert.assertThat(hits.length(), equalTo(2));
 
-    Map<String, ?> oneMatch = ImmutableMap.of("a.firstname", "Mcgee", "a.lastname", "Mooney",
-        "a.gender", "M", "d.firstname", "Obrien", "d.age", 40);
-    Map<String, ?> secondMatch = ImmutableMap.of("a.firstname", "Mcgee", "a.lastname", "Mooney",
-        "a.gender", "M", "d.firstname", "Lynn", "d.age", 40);
+    Map<String, ?> oneMatch =
+        ImmutableMap.of(
+            "a.firstname",
+            "Mcgee",
+            "a.lastname",
+            "Mooney",
+            "a.gender",
+            "M",
+            "d.firstname",
+            "Obrien",
+            "d.age",
+            40);
+    Map<String, ?> secondMatch =
+        ImmutableMap.of(
+            "a.firstname",
+            "Mcgee",
+            "a.lastname",
+            "Mooney",
+            "a.gender",
+            "M",
+            "d.firstname",
+            "Lynn",
+            "d.age",
+            40);
 
     Assert.assertTrue(hitsInclude(hits, oneMatch));
     Assert.assertTrue(hitsInclude(hits, secondMatch));
@@ -445,21 +495,44 @@ public void joinParseCheckSelectedFieldsSplitNLConditionOrderGT() throws IOExcep
   @Test
   public void joinParseCheckSelectedFieldsSplitNLConditionOrderLT() throws IOException {
 
-    final String query = String.format(Locale.ROOT, "SELECT /*! USE_NL*/ " +
-            "a.firstname, a.lastname, a.gender, d.firstname, d.age  FROM " +
-            "%s a JOIN %s d on a.age > d.age " +
-            "WHERE (d.firstname = 'Sandoval' OR d.firstname = 'Hewitt') AND a.firstname = 'Fulton'",
-        TEST_INDEX_PEOPLE, TEST_INDEX_ACCOUNT);
+    final String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT /*! USE_NL*/ a.firstname, a.lastname, a.gender, d.firstname, d.age  FROM %s a"
+                + " JOIN %s d on a.age > d.age WHERE (d.firstname = 'Sandoval' OR d.firstname ="
+                + " 'Hewitt') AND a.firstname = 'Fulton'",
+            TEST_INDEX_PEOPLE,
+            TEST_INDEX_ACCOUNT);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
 
     Assert.assertThat(hits.length(), equalTo(2));
 
-    Map<String, ?> oneMatch = ImmutableMap.of("a.firstname", "Fulton", "a.lastname", "Holt",
-        "a.gender", "F", "d.firstname", "Sandoval", "d.age", 22);
-    Map<String, ?> secondMatch = ImmutableMap.of("a.firstname", "Fulton", "a.lastname", "Holt",
-        "a.gender", "F", "d.firstname", "Hewitt", "d.age", 22);
+    Map<String, ?> oneMatch =
+        ImmutableMap.of(
+            "a.firstname",
+            "Fulton",
+            "a.lastname",
+            "Holt",
+            "a.gender",
+            "F",
+            "d.firstname",
+            "Sandoval",
+            "d.age",
+            22);
+    Map<String, ?> secondMatch =
+        ImmutableMap.of(
+            "a.firstname",
+            "Fulton",
+            "a.lastname",
+            "Holt",
+            "a.gender",
+            "F",
+            "d.firstname",
+            "Hewitt",
+            "d.age",
+            22);
 
     Assert.assertTrue(hitsInclude(hits, oneMatch));
     Assert.assertTrue(hitsInclude(hits, secondMatch));
@@ -516,9 +589,12 @@ public void innerJoinNLWithNullInCondition3() throws IOException {
   private void joinWithAllFromSecondTable(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    final String query = String.format(Locale.ROOT, "SELECT%1$s c.name.firstname, d.* " +
-            "FROM %2$s c JOIN %2$s d ON d.hname = c.house",
-        hint, TEST_INDEX_GAME_OF_THRONES);
+    final String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%1$s c.name.firstname, d.* " + "FROM %2$s c JOIN %2$s d ON d.hname = c.house",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -534,9 +610,12 @@ private void joinWithAllFromSecondTable(boolean useNestedLoops) throws IOExcepti
   private void joinWithAllFromFirstTable(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    final String query = String.format(Locale.ROOT, "SELECT%1$s c.name.firstname " +
-            "FROM %2$s d JOIN %2$s c ON c.house = d.hname",
-        hint, TEST_INDEX_GAME_OF_THRONES);
+    final String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%1$s c.name.firstname " + "FROM %2$s d JOIN %2$s c ON c.house = d.hname",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -552,30 +631,40 @@ private void joinWithAllFromFirstTable(boolean useNestedLoops) throws IOExceptio
   private void leftJoinWithAllFromSecondTable(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    final String query = String.format(Locale.ROOT, "SELECT%1$s c.name.firstname, d.* " +
-            "FROM %2$s c LEFT JOIN %2$s d ON d.hname = c.house",
-        hint, TEST_INDEX_GAME_OF_THRONES);
+    final String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%1$s c.name.firstname, d.* "
+                + "FROM %2$s c LEFT JOIN %2$s d ON d.hname = c.house",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
 
     Assert.assertThat(hits.length(), equalTo(7));
 
-    hits.forEach(hitObj -> {
-      JSONObject hit = (JSONObject) hitObj;
+    hits.forEach(
+        hitObj -> {
+          JSONObject hit = (JSONObject) hitObj;
 
-      Assert.assertThat(hit.getJSONObject("_source").length(),
-          equalTo(hit.getString("_id").endsWith("0") ? 1 : 5));
-    });
+          Assert.assertThat(
+              hit.getJSONObject("_source").length(),
+              equalTo(hit.getString("_id").endsWith("0") ? 1 : 5));
+        });
   }
 
   private void joinParseCheckSelectedFieldsSplit(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
     String query =
-        String.format(Locale.ROOT, "SELECT%s a.firstname ,a.lastname,a.gender,d.dog_name " +
-                "FROM %s a JOIN %s d ON d.holdersName = a.firstname " +
-                "WHERE (a.age > 10 OR a.balance > 2000) AND d.age > 1", hint, TEST_INDEX_PEOPLE,
+        String.format(
+            Locale.ROOT,
+            "SELECT%s a.firstname ,a.lastname,a.gender,d.dog_name "
+                + "FROM %s a JOIN %s d ON d.holdersName = a.firstname "
+                + "WHERE (a.age > 10 OR a.balance > 2000) AND d.age > 1",
+            hint,
+            TEST_INDEX_PEOPLE,
             TEST_INDEX_DOG);
 
     JSONObject result = executeQuery(query);
@@ -585,9 +674,13 @@ private void joinParseCheckSelectedFieldsSplit(boolean useNestedLoops) throws IO
   private void joinNoConditionButWithWhere(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    String query = String.format(Locale.ROOT, "SELECT%s c.gender,h.hname,h.words FROM %2$s c " +
-            "JOIN %2$s h WHERE match_phrase(c.name.firstname, 'Daenerys')",
-        hint, TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%s c.gender,h.hname,h.words FROM %2$s c "
+                + "JOIN %2$s h WHERE match_phrase(c.name.firstname, 'Daenerys')",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -598,9 +691,12 @@ private void joinNoConditionAndNoWhere(boolean useNestedLoops) throws IOExceptio
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
     String query =
-        String.format(Locale.ROOT, "SELECT%s c.name.firstname,c.parents.father,h.hname,h.words " +
-                "FROM %2$s c JOIN %2$s h",
-            hint, TEST_INDEX_GAME_OF_THRONES);
+        String.format(
+            Locale.ROOT,
+            "SELECT%s c.name.firstname,c.parents.father,h.hname,h.words "
+                + "FROM %2$s c JOIN %2$s h",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -610,17 +706,21 @@ private void joinNoConditionAndNoWhere(boolean useNestedLoops) throws IOExceptio
   private void joinWithNoWhereButWithCondition(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    String query = String.format(Locale.ROOT, "SELECT%s c.gender,h.hname,h.words " +
-            "FROM %2$s c JOIN %2$s h ON h.hname = c.house",
-        hint, TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%s c.gender,h.hname,h.words " + "FROM %2$s c JOIN %2$s h ON h.hname = c.house",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
 
-    Map<String, Object> someMatch = ImmutableMap.of(
-        "c.gender", "F",
-        "h.hname", "Targaryen",
-        "h.words", "fireAndBlood");
+    Map<String, Object> someMatch =
+        ImmutableMap.of(
+            "c.gender", "F",
+            "h.hname", "Targaryen",
+            "h.words", "fireAndBlood");
 
     if (useNestedLoops) {
       // TODO: should the NL result be different?
@@ -631,24 +731,26 @@ private void joinWithNoWhereButWithCondition(boolean useNestedLoops) throws IOEx
     }
   }
 
-  private void verifyJoinParseCheckSelectedFieldsSplitResult(JSONObject result,
-                                                             boolean useNestedLoops) {
+  private void verifyJoinParseCheckSelectedFieldsSplitResult(
+      JSONObject result, boolean useNestedLoops) {
 
-    Map<String, String> match1 = ImmutableMap.of(
-        "a.firstname", "Daenerys",
-        "a.lastname", "Targaryen",
-        "a.gender", "M",
-        "d.dog_name", "rex");
-    Map<String, String> match2 = ImmutableMap.of(
-        "a.firstname", "Hattie",
-        "a.lastname", "Bond",
-        "a.gender", "M",
-        "d.dog_name", "snoopy");
+    Map<String, String> match1 =
+        ImmutableMap.of(
+            "a.firstname", "Daenerys",
+            "a.lastname", "Targaryen",
+            "a.gender", "M",
+            "d.dog_name", "rex");
+    Map<String, String> match2 =
+        ImmutableMap.of(
+            "a.firstname", "Hattie",
+            "a.lastname", "Bond",
+            "a.gender", "M",
+            "d.dog_name", "snoopy");
 
     JSONArray hits = getHits(result);
 
     if (useNestedLoops) {
-      //TODO: change field mapping in ON condition to keyword or change query to get result
+      // TODO: change field mapping in ON condition to keyword or change query to get result
       // TODO: why does NL query return no results?
       Assert.assertThat(hits.length(), equalTo(0));
     } else {
@@ -662,9 +764,12 @@ private void joinNoConditionAndNoWhereWithTotalLimit(boolean useNestedLoops) thr
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
     String query =
-        String.format(Locale.ROOT, "SELECT%s c.name.firstname,c.parents.father,h.hname,h.words" +
-                " FROM %2$s c JOIN %2$s h LIMIT 9",
-            hint, TEST_INDEX_GAME_OF_THRONES);
+        String.format(
+            Locale.ROOT,
+            "SELECT%s c.name.firstname,c.parents.father,h.hname,h.words"
+                + " FROM %2$s c JOIN %2$s h LIMIT 9",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -675,18 +780,22 @@ private void joinWithNestedFieldsOnReturn(boolean useNestedLoops) throws IOExcep
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
     String query =
-        String.format(Locale.ROOT, "SELECT%s c.name.firstname,c.parents.father,h.hname,h.words " +
-                "FROM %2$s c JOIN %2$s h ON h.hname = c.house " +
-                "WHERE match_phrase(c.name.firstname, 'Daenerys')",
-            hint, TEST_INDEX_GAME_OF_THRONES);
+        String.format(
+            Locale.ROOT,
+            "SELECT%s c.name.firstname,c.parents.father,h.hname,h.words "
+                + "FROM %2$s c JOIN %2$s h ON h.hname = c.house "
+                + "WHERE match_phrase(c.name.firstname, 'Daenerys')",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
-    final Map<String, String> expectedMatch = ImmutableMap.of(
-        "c.name.firstname", "Daenerys",
-        "c.parents.father", "Aerys",
-        "h.hname", "Targaryen",
-        "h.words", "fireAndBlood");
+    final Map<String, String> expectedMatch =
+        ImmutableMap.of(
+            "c.name.firstname", "Daenerys",
+            "c.parents.father", "Aerys",
+            "h.hname", "Targaryen",
+            "h.words", "fireAndBlood");
     if (useNestedLoops) {
       Assert.assertThat(hits.length(), equalTo(0));
     } else {
@@ -699,17 +808,21 @@ private void joinWithAllAliasOnReturn(boolean useNestedLoops) throws IOException
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
     String query =
-        String.format(Locale.ROOT, "SELECT%s c.name.firstname name,c.parents.father father," +
-                "h.hname house FROM %2$s c JOIN %2$s h ON h.hname = c.house " +
-                "WHERE match_phrase(c.name.firstname, 'Daenerys')",
-            hint, TEST_INDEX_GAME_OF_THRONES);
+        String.format(
+            Locale.ROOT,
+            "SELECT%s c.name.firstname name,c.parents.father father,"
+                + "h.hname house FROM %2$s c JOIN %2$s h ON h.hname = c.house "
+                + "WHERE match_phrase(c.name.firstname, 'Daenerys')",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
-    final Map<String, String> expectedMatch = ImmutableMap.of(
-        "name", "Daenerys",
-        "father", "Aerys",
-        "house", "Targaryen");
+    final Map<String, String> expectedMatch =
+        ImmutableMap.of(
+            "name", "Daenerys",
+            "father", "Aerys",
+            "house", "Targaryen");
 
     if (useNestedLoops) {
       Assert.assertThat(hits.length(), equalTo(0));
@@ -723,20 +836,24 @@ private void joinWithSomeAliasOnReturn(boolean useNestedLoops) throws IOExceptio
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
     String query =
-        String.format(Locale.ROOT, "SELECT%s c.name.firstname ,c.parents.father father, " +
-                "h.hname house FROM %2$s c JOIN %2$s h ON h.hname = c.house " +
-                "WHERE match_phrase(c.name.firstname, 'Daenerys')",
-            hint, TEST_INDEX_GAME_OF_THRONES);
+        String.format(
+            Locale.ROOT,
+            "SELECT%s c.name.firstname ,c.parents.father father, "
+                + "h.hname house FROM %2$s c JOIN %2$s h ON h.hname = c.house "
+                + "WHERE match_phrase(c.name.firstname, 'Daenerys')",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
-    final Map<String, String> expectedMatch = ImmutableMap.of(
-        "c.name.firstname", "Daenerys",
-        "father", "Aerys",
-        "house", "Targaryen");
+    final Map<String, String> expectedMatch =
+        ImmutableMap.of(
+            "c.name.firstname", "Daenerys",
+            "father", "Aerys",
+            "house", "Targaryen");
 
     if (useNestedLoops) {
-      //TODO: Either change the ON condition field to keyword or create a different subquery
+      // TODO: Either change the ON condition field to keyword or create a different subquery
       Assert.assertThat(hits.length(), equalTo(0));
     } else {
       Assert.assertThat(hits.length(), equalTo(1));
@@ -749,18 +866,22 @@ private void joinWithNestedFieldsOnComparisonAndOnReturn(boolean useNestedLoops)
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
     String query =
-        String.format(Locale.ROOT, "SELECT%s c.name.firstname,c.parents.father, h.hname,h.words " +
-                " FROM %2$s c JOIN %2$s h ON h.hname = c.name.lastname " +
-                "WHERE match_phrase(c.name.firstname, 'Daenerys')",
-            hint, TEST_INDEX_GAME_OF_THRONES);
+        String.format(
+            Locale.ROOT,
+            "SELECT%s c.name.firstname,c.parents.father, h.hname,h.words "
+                + " FROM %2$s c JOIN %2$s h ON h.hname = c.name.lastname "
+                + "WHERE match_phrase(c.name.firstname, 'Daenerys')",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
-    final Map<String, String> expectedMatch = ImmutableMap.of(
-        "c.name.firstname", "Daenerys",
-        "c.parents.father", "Aerys",
-        "h.hname", "Targaryen",
-        "h.words", "fireAndBlood");
+    final Map<String, String> expectedMatch =
+        ImmutableMap.of(
+            "c.name.firstname", "Daenerys",
+            "c.parents.father", "Aerys",
+            "h.hname", "Targaryen",
+            "h.words", "fireAndBlood");
 
     if (useNestedLoops) {
       Assert.assertThat(hits.length(), equalTo(0));
@@ -773,10 +894,12 @@ private void joinWithNestedFieldsOnComparisonAndOnReturn(boolean useNestedLoops)
   private void testLeftJoin(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    String query = String.format("SELECT%s c.name.firstname, f.name.firstname,f.name.lastname " +
-            "FROM %2$s c LEFT JOIN %2$s f " +
-            "ON f.name.firstname = c.parents.father",
-        hint, TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            "SELECT%s c.name.firstname, f.name.firstname,f.name.lastname "
+                + "FROM %2$s c LEFT JOIN %2$s f "
+                + "ON f.name.firstname = c.parents.father",
+            hint, TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -805,10 +928,14 @@ private void testLeftJoin(boolean useNestedLoops) throws IOException {
   private void hintLimits_firstLimitSecondNull(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    String query = String.format(Locale.ROOT, "SELECT%s /*! JOIN_TABLES_LIMIT(2,null) */ " +
-            "c.name.firstname,c.parents.father, h.hname,h.words " +
-            "FROM %2$s c JOIN %2$s h",
-        hint, TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%s /*! JOIN_TABLES_LIMIT(2,null) */ "
+                + "c.name.firstname,c.parents.father, h.hname,h.words "
+                + "FROM %2$s c JOIN %2$s h",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -818,9 +945,14 @@ private void hintLimits_firstLimitSecondNull(boolean useNestedLoops) throws IOEx
   private void hintLimits_firstLimitSecondLimit(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    String query = String.format(Locale.ROOT, "SELECT%s /*! JOIN_TABLES_LIMIT(2,2) */ " +
-        "c.name.firstname,c.parents.father, h.hname,h.words FROM %2$s c " +
-        "JOIN %2$s h", hint, TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%s /*! JOIN_TABLES_LIMIT(2,2) */ "
+                + "c.name.firstname,c.parents.father, h.hname,h.words FROM %2$s c "
+                + "JOIN %2$s h",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -830,10 +962,14 @@ private void hintLimits_firstLimitSecondLimit(boolean useNestedLoops) throws IOE
   private void hintLimits_firstLimitSecondLimitOnlyOne(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    String query = String.format(Locale.ROOT, "SELECT%s /*! JOIN_TABLES_LIMIT(3,1) */ " +
-            "c.name.firstname,c.parents.father , h.hname,h.words FROM %2$s h " +
-            "JOIN  %2$s c  ON c.name.lastname = h.hname",
-        hint, TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%s /*! JOIN_TABLES_LIMIT(3,1) */ "
+                + "c.name.firstname,c.parents.father , h.hname,h.words FROM %2$s h "
+                + "JOIN  %2$s c  ON c.name.lastname = h.hname",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -843,9 +979,14 @@ private void hintLimits_firstLimitSecondLimitOnlyOne(boolean useNestedLoops) thr
   private void hintLimits_firstNullSecondLimit(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    String query = String.format(Locale.ROOT, "SELECT%s /*! JOIN_TABLES_LIMIT(null,2) */ " +
-        "c.name.firstname,c.parents.father , h.hname,h.words FROM %2$s c " +
-        "JOIN %2$s h", hint, TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%s /*! JOIN_TABLES_LIMIT(null,2) */ "
+                + "c.name.firstname,c.parents.father , h.hname,h.words FROM %2$s c "
+                + "JOIN %2$s h",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -855,10 +996,14 @@ private void hintLimits_firstNullSecondLimit(boolean useNestedLoops) throws IOEx
   private void testLeftJoinWithLimit(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    String query = String.format(Locale.ROOT, "SELECT%s /*! JOIN_TABLES_LIMIT(3,null) */ " +
-            "c.name.firstname, f.name.firstname,f.name.lastname FROM %2$s c " +
-            "LEFT JOIN %2$s f ON f.name.firstname = c.parents.father",
-        hint, TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%s /*! JOIN_TABLES_LIMIT(3,null) */ "
+                + "c.name.firstname, f.name.firstname,f.name.lastname FROM %2$s c "
+                + "LEFT JOIN %2$s f ON f.name.firstname = c.parents.father",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -868,20 +1013,27 @@ private void testLeftJoinWithLimit(boolean useNestedLoops) throws IOException {
   private void joinWithOr(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    String query = String.format(Locale.ROOT, "SELECT%s d.dog_name,c.name.firstname " +
-            "FROM %s c JOIN %s d " +
-            "ON d.holdersName = c.name.firstname OR d.age = c.name.ofHisName",
-        hint, TEST_INDEX_GAME_OF_THRONES, TEST_INDEX_DOG);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%s d.dog_name,c.name.firstname "
+                + "FROM %s c JOIN %s d "
+                + "ON d.holdersName = c.name.firstname OR d.age = c.name.ofHisName",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES,
+            TEST_INDEX_DOG);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
 
-    final Map<String, String> firstMatch = ImmutableMap.of(
-        "c.name.firstname", "Daenerys",
-        "d.dog_name", "rex");
-    final Map<String, String> secondMatch = ImmutableMap.of(
-        "c.name.firstname", "Brandon",
-        "d.dog_name", "snoopy");
+    final Map<String, String> firstMatch =
+        ImmutableMap.of(
+            "c.name.firstname", "Daenerys",
+            "d.dog_name", "rex");
+    final Map<String, String> secondMatch =
+        ImmutableMap.of(
+            "c.name.firstname", "Brandon",
+            "d.dog_name", "snoopy");
 
     if (useNestedLoops) {
       Assert.assertThat(hits.length(), equalTo(1));
@@ -896,10 +1048,14 @@ private void joinWithOr(boolean useNestedLoops) throws IOException {
   private void joinWithOrderFirstTable(boolean useNestedLoops) throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
-    String query = String.format(Locale.ROOT, "SELECT%s c.name.firstname,d.words " +
-            "FROM %2$s c JOIN %2$s d ON d.hname = c.house " +
-            "ORDER BY c.name.firstname",
-        hint, TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT%s c.name.firstname,d.words "
+                + "FROM %2$s c JOIN %2$s d ON d.hname = c.house "
+                + "ORDER BY c.name.firstname",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -912,35 +1068,42 @@ private void joinWithOrderFirstTable(boolean useNestedLoops) throws IOException
 
       String[] expectedNames = {"Brandon", "Daenerys", "Eddard", "Jaime"};
 
-      IntStream.rangeClosed(0, 3).forEach(i -> {
-        String firstnamePath = String.format(Locale.ROOT, "/%d/_source/c.name.firstname", i);
-        Assert.assertThat(hits.query(firstnamePath), equalTo(expectedNames[i]));
-      });
+      IntStream.rangeClosed(0, 3)
+          .forEach(
+              i -> {
+                String firstnamePath =
+                    String.format(Locale.ROOT, "/%d/_source/c.name.firstname", i);
+                Assert.assertThat(hits.query(firstnamePath), equalTo(expectedNames[i]));
+              });
     }
   }
 
   private boolean containsTerm(final String explainedQuery, final String termName) {
 
     return Pattern.compile(
-        Pattern.quote("\"terms\":{")
-            + ".*"
-            + Pattern.quote("\"" + termName + "\":[")
-    )
+            Pattern.quote("\"terms\":{") + ".*" + Pattern.quote("\"" + termName + "\":["))
         .matcher(explainedQuery.replaceAll("\\s+", ""))
         .find();
   }
 
-  private void joinWithNullInCondition(boolean useNestedLoops, String left,
-                                       String oper1, String oper2, int expectedNum)
+  private void joinWithNullInCondition(
+      boolean useNestedLoops, String left, String oper1, String oper2, int expectedNum)
       throws IOException {
 
     final String hint = useNestedLoops ? USE_NL_HINT : "";
     String query =
-        String.format(Locale.ROOT, "SELECT%s c.name.firstname,c.parents.father,c.hname," +
-                "f.name.firstname,f.house,f.hname FROM %s c " +
-                "%s JOIN %s f ON f.name.firstname = c.parents.father " +
-                "%s f.house = c.hname %s f.house = c.name.firstname",
-            hint, TEST_INDEX_GAME_OF_THRONES, left, TEST_INDEX_GAME_OF_THRONES, oper1, oper2);
+        String.format(
+            Locale.ROOT,
+            "SELECT%s c.name.firstname,c.parents.father,c.hname,"
+                + "f.name.firstname,f.house,f.hname FROM %s c "
+                + "%s JOIN %s f ON f.name.firstname = c.parents.father "
+                + "%s f.house = c.hname %s f.house = c.name.firstname",
+            hint,
+            TEST_INDEX_GAME_OF_THRONES,
+            left,
+            TEST_INDEX_GAME_OF_THRONES,
+            oper1,
+            oper2);
 
     JSONObject result = executeQuery(query);
     JSONArray hits = getHits(result);
@@ -968,20 +1131,22 @@ private boolean hitsInclude(final JSONArray actualHits, Map<String, ?> expectedS
     return false;
   }
 
-  private void assertHitMatches(final JSONObject actualHit,
-                                final Map<String, ?> expectedSourceValues) {
+  private void assertHitMatches(
+      final JSONObject actualHit, final Map<String, ?> expectedSourceValues) {
 
     final JSONObject src = actualHit.getJSONObject("_source");
     Assert.assertThat(src.length(), equalTo(expectedSourceValues.size()));
-    src.keySet().forEach(key -> {
-      Assert.assertTrue(expectedSourceValues.containsKey(key));
-      Object value = src.get(key);
-      Assert.assertThat(value, equalTo(expectedSourceValues.get(key)));
-    });
+    src.keySet()
+        .forEach(
+            key -> {
+              Assert.assertTrue(expectedSourceValues.containsKey(key));
+              Object value = src.get(key);
+              Assert.assertThat(value, equalTo(expectedSourceValues.get(key)));
+            });
   }
 
-  private boolean hitMatches(final Map<String, ?> actualHit,
-                             final Map<String, ?> expectedSourceValues) {
+  private boolean hitMatches(
+      final Map<String, ?> actualHit, final Map<String, ?> expectedSourceValues) {
 
     final Map<String, ?> src = uncheckedGetMap(actualHit.get("_source"));
 
@@ -997,8 +1162,8 @@ private boolean hitMatches(final Map<String, ?> actualHit,
 
       Object actualValue = src.get(key);
       Object expectedValue = expectedSourceValues.get(key);
-      if ((actualValue == null && expectedValue != null) ||
-          (actualValue != null && expectedValue == null)) {
+      if ((actualValue == null && expectedValue != null)
+          || (actualValue != null && expectedValue == null)) {
         return false;
       } else if (actualValue != null && !actualValue.equals(expectedValue)) {
         return false;
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/MathFunctionsIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/MathFunctionsIT.java
index df9c467c0e..fcf1edf3e0 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/MathFunctionsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/MathFunctionsIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.closeTo;
@@ -11,14 +10,14 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import java.io.IOException;
 import org.junit.Test;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.SearchHit;
 
 public class MathFunctionsIT extends SQLIntegTestCase {
@@ -32,9 +31,7 @@ protected void init() throws Exception {
 
   @Test
   public void lowerCaseFunctionCall() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT abs(age - 100) AS abs"
-    );
+    SearchHit[] hits = query("SELECT abs(age - 100) AS abs");
     for (SearchHit hit : hits) {
       double abs = (double) getField(hit, "abs");
       assertThat(abs, greaterThanOrEqualTo(0.0));
@@ -43,9 +40,7 @@ public void lowerCaseFunctionCall() throws IOException {
 
   @Test
   public void upperCaseFunctionCall() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT ABS(age - 100) AS abs"
-    );
+    SearchHit[] hits = query("SELECT ABS(age - 100) AS abs");
     for (SearchHit hit : hits) {
       double abs = (double) getField(hit, "abs");
       assertThat(abs, greaterThanOrEqualTo(0.0));
@@ -54,36 +49,28 @@ public void upperCaseFunctionCall() throws IOException {
 
   @Test
   public void eulersNumber() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT E() AS e"
-    );
+    SearchHit[] hits = query("SELECT E() AS e");
     double e = (double) getField(hits[0], "e");
     assertThat(e, equalTo(Math.E));
   }
 
   @Test
   public void pi() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT PI() AS pi"
-    );
+    SearchHit[] hits = query("SELECT PI() AS pi");
     double pi = (double) getField(hits[0], "pi");
     assertThat(pi, equalTo(Math.PI));
   }
 
   @Test
   public void expm1Function() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT EXPM1(2) AS expm1"
-    );
+    SearchHit[] hits = query("SELECT EXPM1(2) AS expm1");
     double expm1 = (double) getField(hits[0], "expm1");
     assertThat(expm1, equalTo(Math.expm1(2)));
   }
 
   @Test
   public void degreesFunction() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT age, DEGREES(age) AS degrees"
-    );
+    SearchHit[] hits = query("SELECT age, DEGREES(age) AS degrees");
     for (SearchHit hit : hits) {
       int age = (int) getFieldFromSource(hit, "age");
       double degrees = (double) getField(hit, "degrees");
@@ -93,9 +80,7 @@ public void degreesFunction() throws IOException {
 
   @Test
   public void radiansFunction() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT age, RADIANS(age) as radians"
-    );
+    SearchHit[] hits = query("SELECT age, RADIANS(age) as radians");
     for (SearchHit hit : hits) {
       int age = (int) getFieldFromSource(hit, "age");
       double radians = (double) getField(hit, "radians");
@@ -105,65 +90,54 @@ public void radiansFunction() throws IOException {
 
   @Test
   public void sin() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT SIN(PI()) as sin"
-    );
+    SearchHit[] hits = query("SELECT SIN(PI()) as sin");
     double sin = (double) getField(hits[0], "sin");
     assertThat(sin, equalTo(Math.sin(Math.PI)));
   }
 
   @Test
   public void asin() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT ASIN(PI()) as asin"
-    );
+    SearchHit[] hits = query("SELECT ASIN(PI()) as asin");
     double asin = Double.valueOf((String) getField(hits[0], "asin"));
     assertThat(asin, equalTo(Math.asin(Math.PI)));
   }
 
   @Test
   public void sinh() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT SINH(PI()) as sinh"
-    );
+    SearchHit[] hits = query("SELECT SINH(PI()) as sinh");
     double sinh = (double) getField(hits[0], "sinh");
     assertThat(sinh, equalTo(Math.sinh(Math.PI)));
   }
 
   @Test
   public void power() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT POWER(age, 2) AS power",
-        "WHERE (age IS NOT NULL) AND (balance IS NOT NULL) and (POWER(balance, 3) > 0)"
-    );
+    SearchHit[] hits =
+        query(
+            "SELECT POWER(age, 2) AS power",
+            "WHERE (age IS NOT NULL) AND (balance IS NOT NULL) and (POWER(balance, 3) > 0)");
     double power = (double) getField(hits[0], "power");
     assertTrue(power >= 0);
   }
 
   @Test
   public void atan2() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT ATAN2(age, age) AS atan2",
-        "WHERE (age IS NOT NULL) AND (ATAN2(age, age) > 0)"
-    );
+    SearchHit[] hits =
+        query(
+            "SELECT ATAN2(age, age) AS atan2", "WHERE (age IS NOT NULL) AND (ATAN2(age, age) > 0)");
     double atan2 = (double) getField(hits[0], "atan2");
     assertThat(atan2, equalTo(Math.atan2(1, 1)));
   }
 
   @Test
   public void cot() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT COT(PI()) AS cot"
-    );
+    SearchHit[] hits = query("SELECT COT(PI()) AS cot");
     double cot = (double) getField(hits[0], "cot");
     assertThat(cot, closeTo(1 / Math.tan(Math.PI), 0.001));
   }
 
   @Test
   public void sign() throws IOException {
-    SearchHit[] hits = query(
-        "SELECT SIGN(E()) AS sign"
-    );
+    SearchHit[] hits = query("SELECT SIGN(E()) AS sign");
     double sign = (double) getField(hits[0], "sign");
     assertThat(sign, equalTo(Math.signum(Math.E)));
   }
@@ -186,18 +160,18 @@ public void logWithTwoParams() throws IOException {
   public void logInAggregationShouldPass() {
     assertThat(
         executeQuery(
-            "SELECT LOG(age) FROM " + TestsConstants.TEST_INDEX_ACCOUNT
-                + " WHERE age IS NOT NULL GROUP BY LOG(age) ORDER BY LOG(age)", "jdbc"
-        ),
-        containsString("\"type\": \"double\"")
-    );
+            "SELECT LOG(age) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " WHERE age IS NOT NULL GROUP BY LOG(age) ORDER BY LOG(age)",
+            "jdbc"),
+        containsString("\"type\": \"double\""));
     assertThat(
         executeQuery(
-            "SELECT LOG(2, age) FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-                " WHERE age IS NOT NULL GROUP BY LOG(2, age) ORDER BY LOG(2, age)", "jdbc"
-        ),
-        containsString("\"type\": \"double\"")
-    );
+            "SELECT LOG(2, age) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " WHERE age IS NOT NULL GROUP BY LOG(2, age) ORDER BY LOG(2, age)",
+            "jdbc"),
+        containsString("\"type\": \"double\""));
   }
 
   @Test
@@ -218,11 +192,11 @@ public void ln() throws IOException {
   public void lnInAggregationShouldPass() {
     assertThat(
         executeQuery(
-            "SELECT LN(age) FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-                " WHERE age IS NOT NULL GROUP BY LN(age) ORDER BY LN(age)", "jdbc"
-        ),
-        containsString("\"type\": \"double\"")
-    );
+            "SELECT LN(age) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " WHERE age IS NOT NULL GROUP BY LN(age) ORDER BY LN(age)",
+            "jdbc"),
+        containsString("\"type\": \"double\""));
   }
 
   @Test
@@ -238,10 +212,11 @@ private SearchHit[] query(String select, String... statements) throws IOExceptio
     final String response =
         executeQueryWithStringOutput(select + " " + FROM + " " + String.join(" ", statements));
 
-    final XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(
-        NamedXContentRegistry.EMPTY,
-        LoggingDeprecationHandler.INSTANCE,
-        response);
+    final XContentParser parser =
+        new JsonXContentParser(
+            NamedXContentRegistry.EMPTY,
+            LoggingDeprecationHandler.INSTANCE,
+            new JsonFactory().createParser(response));
     return SearchResponse.fromXContent(parser).getHits().getHits();
   }
 
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/MetaDataQueriesIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/MetaDataQueriesIT.java
index 9f0fca68d5..287e0b5cca 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/MetaDataQueriesIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/MetaDataQueriesIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -26,162 +25,44 @@
 import org.opensearch.client.Request;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-
 /**
- * The following are tests for SHOW/DESCRIBE query support under Pretty Format Response protocol using JDBC format.
- * <p>
- * Unlike SELECT queries, the JDBC format response of SHOW and DESCRIBE queries has determined "schema" fields.
- * <p>
- * Since these integration tests are receiving the JSON response as output, "datarows" values can't be validated by
- * key since it is a JSONArray, so the expected length of "schema" will be used instead as well as the expected
- * position of the field data in "datarows".
- * <p>
- * These are the outputs of "schema" for SHOW and DESCRIBE, the position of the value in "datarows" will match the
- * position of the field in "schema":
- * <p>
- * 1) SHOW query (based on the getTables() method listed here https://docs.oracle.com/javase/8/docs/api/java/sql/DatabaseMetaData.html)
- * "schema": [
- * {
- * "name": "TABLE_CAT",
- * "type": "keyword"
- * },
- * {
- * "name": "TABLE_SCHEM",
- * "type": "keyword"
- * },
- * {
- * "name": "TABLE_NAME",
- * "type": "keyword"
- * },
- * {
- * "name": "TABLE_TYPE",
- * "type": "keyword"
- * },
- * {
- * "name": "REMARKS",
- * "type": "keyword"
- * },
- * {
- * "name": "TYPE_CAT",
- * "type": "keyword"
- * },
- * {
- * "name": "TYPE_SCHEM",
- * "type": "keyword"
- * },
- * {
- * "name": "TYPE_NAME",
- * "type": "keyword"
- * },
- * {
- * "name": "SELF_REFERENCING_COL_NAME",
- * "type": "keyword"
- * },
- * {
- * "name": "REF_GENERATION",
- * "type": "keyword"
- * }
- * ]
- * <p>
- * 2) DESCRIBE query (based on the getColumns() method listed here https://docs.oracle.com/javase/8/docs/api/java/sql/DatabaseMetaData.html)
- * "schema": [
- * {
- * "name": "TABLE_CAT",
- * "type": "keyword"
- * },
- * {
- * "name": "TABLE_SCHEM",
- * "type": "keyword"
- * },
- * {
- * "name": "TABLE_NAME",
- * "type": "keyword"
- * },
- * {
- * "name": "COLUMN_NAME",
- * "type": "keyword"
- * },
- * {
- * "name": "DATA_TYPE",
- * "type": "integer"
- * },
- * {
- * "name": "TYPE_NAME",
- * "type": "keyword"
- * },
- * {
- * "name": "COLUMN_SIZE",
- * "type": "integer"
- * },
- * {
- * "name": "BUFFER_LENGTH",
- * "type": "integer"
- * },
- * {
- * "name": "DECIMAL_DIGITS",
- * "type": "integer"
- * },
- * {
- * "name": "NUM_PREC_RADIX",
- * "type": "integer"
- * },
- * {
- * "name": "NULLABLE",
- * "type": "integer"
- * },
- * {
- * "name": "REMARKS",
- * "type": "keyword"
- * },
- * {
- * "name": "COLUMN_DEF",
- * "type": "keyword"
- * },
- * {
- * "name": "SQL_DATA_TYPE",
- * "type": "integer"
- * },
- * {
- * "name": "SQL_DATETIME_SUB",
- * "type": "integer"
- * },
- * {
- * "name": "CHAR_OCTET_LENGTH",
- * "type": "integer"
- * },
- * {
- * "name": "ORDINAL_POSITION",
- * "type": "integer"
- * },
- * {
- * "name": "IS_NULLABLE",
- * "type": "keyword"
- * },
- * {
- * "name": "SCOPE_CATALOG",
- * "type": "keyword"
- * },
- * {
- * "name": "SCOPE_SCHEMA",
- * "type": "keyword"
- * },
- * {
- * "name": "SCOPE_TABLE",
- * "type": "keyword"
- * },
- * {
- * "name": "SOURCE_DATA_TYPE",
- * "type": "short"
- * },
- * {
- * "name": "IS_AUTOINCREMENT",
- * "type": "keyword"
- * },
- * {
- * "name": "IS_GENERATEDCOLUMN",
- * "type": "keyword"
- * }
+ * The following are tests for SHOW/DESCRIBE query support under Pretty Format Response protocol
+ * using JDBC format.
+ *
+ * <p>Unlike SELECT queries, the JDBC format response of SHOW and DESCRIBE queries has determined
+ * "schema" fields.
+ *
+ * <p>Since these integration tests are receiving the JSON response as output, "datarows" values
+ * can't be validated by key since it is a JSONArray, so the expected length of "schema" will be
+ * used instead as well as the expected position of the field data in "datarows".
+ *
+ * <p>These are the outputs of "schema" for SHOW and DESCRIBE, the position of the value in
+ * "datarows" will match the position of the field in "schema":
+ *
+ * <p>1) SHOW query (based on the getTables() method listed here
+ * https://docs.oracle.com/javase/8/docs/api/java/sql/DatabaseMetaData.html) "schema": [ { "name":
+ * "TABLE_CAT", "type": "keyword" }, { "name": "TABLE_SCHEM", "type": "keyword" }, { "name":
+ * "TABLE_NAME", "type": "keyword" }, { "name": "TABLE_TYPE", "type": "keyword" }, { "name":
+ * "REMARKS", "type": "keyword" }, { "name": "TYPE_CAT", "type": "keyword" }, { "name":
+ * "TYPE_SCHEM", "type": "keyword" }, { "name": "TYPE_NAME", "type": "keyword" }, { "name":
+ * "SELF_REFERENCING_COL_NAME", "type": "keyword" }, { "name": "REF_GENERATION", "type": "keyword" }
  * ]
+ *
+ * <p>2) DESCRIBE query (based on the getColumns() method listed here
+ * https://docs.oracle.com/javase/8/docs/api/java/sql/DatabaseMetaData.html) "schema": [ { "name":
+ * "TABLE_CAT", "type": "keyword" }, { "name": "TABLE_SCHEM", "type": "keyword" }, { "name":
+ * "TABLE_NAME", "type": "keyword" }, { "name": "COLUMN_NAME", "type": "keyword" }, { "name":
+ * "DATA_TYPE", "type": "integer" }, { "name": "TYPE_NAME", "type": "keyword" }, { "name":
+ * "COLUMN_SIZE", "type": "integer" }, { "name": "BUFFER_LENGTH", "type": "integer" }, { "name":
+ * "DECIMAL_DIGITS", "type": "integer" }, { "name": "NUM_PREC_RADIX", "type": "integer" }, { "name":
+ * "NULLABLE", "type": "integer" }, { "name": "REMARKS", "type": "keyword" }, { "name":
+ * "COLUMN_DEF", "type": "keyword" }, { "name": "SQL_DATA_TYPE", "type": "integer" }, { "name":
+ * "SQL_DATETIME_SUB", "type": "integer" }, { "name": "CHAR_OCTET_LENGTH", "type": "integer" }, {
+ * "name": "ORDINAL_POSITION", "type": "integer" }, { "name": "IS_NULLABLE", "type": "keyword" }, {
+ * "name": "SCOPE_CATALOG", "type": "keyword" }, { "name": "SCOPE_SCHEMA", "type": "keyword" }, {
+ * "name": "SCOPE_TABLE", "type": "keyword" }, { "name": "SOURCE_DATA_TYPE", "type": "short" }, {
+ * "name": "IS_AUTOINCREMENT", "type": "keyword" }, { "name": "IS_GENERATEDCOLUMN", "type":
+ * "keyword" } ]
  */
 public class MetaDataQueriesIT extends SQLIntegTestCase {
 
@@ -294,29 +175,27 @@ public void describeSingleIndex() throws IOException {
   @Ignore("Breaking change, the new engine will return alias instead of index name")
   @Test
   public void showSingleIndexAlias() throws IOException {
-    client().performRequest(new Request("PUT",
-        TestsConstants.TEST_INDEX_ACCOUNT + "/_alias/acc"));
+    client().performRequest(new Request("PUT", TestsConstants.TEST_INDEX_ACCOUNT + "/_alias/acc"));
 
     JSONObject expected = executeQuery("SHOW TABLES LIKE " + TestsConstants.TEST_INDEX_ACCOUNT);
     JSONObject actual = executeQuery("SHOW TABLES LIKE acc");
 
     assertThat(getDataRows(actual).length(), equalTo(1));
-    assertTrue(StringUtils.format("Expected: %s, actual: %s", expected, actual),
-        expected.similar(actual));
+    assertTrue(
+        StringUtils.format("Expected: %s, actual: %s", expected, actual), expected.similar(actual));
   }
 
   @Ignore("Breaking change, the new engine will return alias instead of index name")
   @Test
   public void describeSingleIndexAlias() throws IOException {
-    client().performRequest(new Request("PUT",
-        TestsConstants.TEST_INDEX_ACCOUNT + "/_alias/acc"));
+    client().performRequest(new Request("PUT", TestsConstants.TEST_INDEX_ACCOUNT + "/_alias/acc"));
 
     JSONObject expected = executeQuery("DESCRIBE TABLES LIKE " + TestsConstants.TEST_INDEX_ACCOUNT);
     JSONObject actual = executeQuery("DESCRIBE TABLES LIKE acc");
 
     assertThat(getDataRows(actual).length(), greaterThan(0));
-    assertTrue(StringUtils.format("Expected: %s, actual: %s", expected, actual),
-        expected.similar(actual));
+    assertTrue(
+        StringUtils.format("Expected: %s, actual: %s", expected, actual), expected.similar(actual));
   }
 
   @Test
@@ -355,7 +234,8 @@ public void describeSingleIndexWithObjectFieldShouldPass() throws IOException {
     assertThat(dataRows.length(), greaterThan(0));
     assertThat(dataRows.getJSONArray(0).length(), equalTo(DESCRIBE_FIELD_LENGTH));
 
-    verifySome(dataRows,
+    verifySome(
+        dataRows,
         describeRow(TEST_INDEX_GAME_OF_THRONES, "nickname", "text"),
         describeRow(TEST_INDEX_GAME_OF_THRONES, "name", "object"),
         describeRow(TEST_INDEX_GAME_OF_THRONES, "name.firstname", "text"),
@@ -402,8 +282,10 @@ public void describeWildcardIndex() throws IOException {
 
   @Test
   public void describeWildcardColumn() throws IOException {
-    JSONObject response = executeQuery(String.format("DESCRIBE TABLES LIKE %s COLUMNS LIKE %%name",
-        TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                "DESCRIBE TABLES LIKE %s COLUMNS LIKE %%name", TestsConstants.TEST_INDEX_ACCOUNT));
 
     String pattern = ".*name";
     JSONArray dataRows = getDataRows(response);
@@ -418,8 +300,10 @@ public void describeWildcardColumn() throws IOException {
 
   @Test
   public void describeSingleCharacterWildcard() throws IOException {
-    JSONObject response = executeQuery(String.format("DESCRIBE TABLES LIKE %s COLUMNS LIKE %%na_e",
-        TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                "DESCRIBE TABLES LIKE %s COLUMNS LIKE %%na_e", TestsConstants.TEST_INDEX_ACCOUNT));
 
     String pattern = ".*na.e";
     JSONArray dataRows = getDataRows(response);
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/MethodQueryIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/MethodQueryIT.java
index b1b6b24ada..0db2e921bf 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/MethodQueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/MethodQueryIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.both;
@@ -12,6 +11,7 @@
 import java.io.IOException;
 import java.util.Locale;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -27,111 +27,136 @@ protected void init() throws Exception {
   }
 
   /**
-   * query 搜索就是　，　lucene 原生的搜素方式 注意这个例子中ｖａｌｕｅ可以随便命名 "query" :
-   * {query_string" : {"query" : "address:880 Holmes Lane"}
+   * query "query" : { query_string" : { "query" : "address:880 Holmes Lane" } }
    *
    * @throws IOException
    */
   @Test
   public void queryTest() throws IOException {
-    final String result = explainQuery(String.format(Locale.ROOT,
-        "select address from %s where query('address:880 Holmes Lane') limit 3",
-        TestsConstants.TEST_INDEX_ACCOUNT));
-    Assert.assertThat(result,
-        containsString("query_string\\\":{\\\"query\\\":\\\"address:880 Holmes Lane"));
-
+    final String result =
+        explainQuery(
+            String.format(
+                Locale.ROOT,
+                "select address from %s where query('address:880 Holmes Lane') limit 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result, containsString("query_string\\\":{\\\"query\\\":\\\"address:880 Holmes Lane"));
   }
 
   /**
-   * matchQuery 是利用分词结果进行单个字段的搜索． "query" : { "match" : { "address" :
-   * {"query":"880 Holmes Lane", "type" : "boolean" } } }
+   * matchQuery "query" : { "match" : { "address" : { "query" : "880 Holmes Lane", "type" :
+   * "boolean" } } }
    *
    * @throws IOException
    */
   @Test
   public void matchQueryTest() throws IOException {
-    final String result = explainQuery(String.format(Locale.ROOT,
-        "select address from %s where address= matchQuery('880 Holmes Lane') limit 3",
-        TestsConstants.TEST_INDEX_ACCOUNT));
-    Assert.assertThat(result,
-        containsString("{\"match\":{\"address\":{\"query\":\"880 Holmes Lane\""));
+    final String result =
+        explainQuery(
+            String.format(
+                Locale.ROOT,
+                "select address from %s where address= matchQuery('880 Holmes Lane') limit 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result,
+        containsString("{\\\"match\\\":{\\\"address\\\":{\\\"query\\\":\\\"880 Holmes Lane\\\""));
   }
 
   /**
-   * matchQuery 是利用分词结果进行单个字段的搜索． "query" : { "bool" : { "must" : { "bool" : {
-   * "should" : [ { "constant_score" : { "query" : { "match" : { "address" : {
-   * "query" : "Lane", "type" : "boolean" } } }, "boost" : 100.0 } }, {
-   * "constant_score" : { "query" : { "match" : { "address" : { "query" :
-   * "Street", "type" : "boolean" } } }, "boost" : 0.5 } } ] } } } }
+   * matchQuery { "query": { "bool": { "must": { "bool": { "should": [ { "constant_score": {
+   * "query": { "match": { "address": { "query": "Lane", "type": "boolean" } } }, "boost": 100 } },
+   * { "constant_score": { "query": { "match": { "address": { "query": "Street", "type": "boolean" }
+   * } }, "boost": 0.5 } } ] } } } } }
    *
    * @throws IOException
    */
-  // todo
   @Test
+  @Ignore(
+      "score query no longer maps to constant_score in the V2 engine - @see"
+          + " org.opensearch.sql.sql.ScoreQueryIT")
   public void scoreQueryTest() throws IOException {
-    final String result = explainQuery(String.format(Locale.ROOT,
-        "select address from %s " +
-            "where score(matchQuery(address, 'Lane'),100) " +
-            "or score(matchQuery(address,'Street'),0.5)  order by _score desc limit 3",
-        TestsConstants.TEST_INDEX_ACCOUNT));
-    Assert.assertThat(result,
-        both(containsString("{\"constant_score\":" +
-            "{\"filter\":{\"match\":{\"address\":{\"query\":\"Lane\"")).and(
-            containsString("{\"constant_score\":" +
-                "{\"filter\":{\"match\":{\"address\":{\"query\":\"Street\"")));
+    final String result =
+        explainQuery(
+            String.format(
+                Locale.ROOT,
+                "select address from %s "
+                    + "where score(matchQuery(address, 'Lane'),100) "
+                    + "or score(matchQuery(address,'Street'),0.5) order by _score desc limit 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result,
+        both(containsString(
+                "{\"constant_score\":" + "{\"filter\":{\"match\":{\"address\":{\"query\":\"Lane\""))
+            .and(
+                containsString(
+                    "{\"constant_score\":"
+                        + "{\"filter\":{\"match\":{\"address\":{\"query\":\"Street\"")));
   }
 
   @Test
   public void regexpQueryTest() throws IOException {
-    final String result = explainQuery(String.format(Locale.ROOT,
-        "SELECT * FROM %s WHERE address=REGEXP_QUERY('.*')",
-        TestsConstants.TEST_INDEX_ACCOUNT));
-    Assert.assertThat(result,
-        containsString("{\"bool\":{\"must\":[{\"regexp\":"
-            + "{\"address\":{\"value\":\".*\",\"flags_value\":255,\"max_determinized_states\":10000,\"boost\":1.0}}}"));
+    final String result =
+        explainQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE address=REGEXP_QUERY('.*')",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result,
+        containsString(
+            "{\"bool\":{\"must\":[{\"regexp\":"
+                + "{\"address\":{\"value\":\".*\",\"flags_value\":255,\"max_determinized_states\":10000,\"boost\":1.0}}}"));
   }
 
   @Test
   public void negativeRegexpQueryTest() throws IOException {
-    final String result = explainQuery(String.format(Locale.ROOT,
-        "SELECT * FROM %s WHERE NOT(address=REGEXP_QUERY('.*'))",
-        TestsConstants.TEST_INDEX_ACCOUNT));
-    Assert.assertThat(result,
-        containsString("{\"bool\":{\"must_not\":[{\"regexp\":"
-            + "{\"address\":{\"value\":\".*\",\"flags_value\":255,\"max_determinized_states\":10000,\"boost\":1.0}}}"));
+    final String result =
+        explainQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE NOT(address=REGEXP_QUERY('.*'))",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result,
+        containsString(
+            "{\"bool\":{\"must_not\":[{\"regexp\":"
+                + "{\"address\":{\"value\":\".*\",\"flags_value\":255,\"max_determinized_states\":10000,\"boost\":1.0}}}"));
   }
 
   /**
-   * wildcardQuery 是用通配符的方式查找某个term 　比如例子中 l*e means leae ltae ....
-   * "wildcard": { "address" : { "wildcard" : "l*e" } }
+   * wildcardQuery l*e means leae ltae ... "wildcard": { "address" : { "wildcard" : "l*e" } }
    *
    * @throws IOException
    */
   @Test
   public void wildcardQueryTest() throws IOException {
-    final String result = explainQuery(String.format(Locale.ROOT,
-        "select address from %s where address= wildcardQuery('l*e')  order by _score desc limit 3",
-        TestsConstants.TEST_INDEX_ACCOUNT));
-    Assert.assertThat(result,
-        containsString("{\"wildcard\":{\"address\":{\"wildcard\":\"l*e\""));
+    final String result =
+        explainQuery(
+            String.format(
+                Locale.ROOT,
+                "select address from %s where address= wildcardQuery('l*e')  order by _score desc"
+                    + " limit 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    Assert.assertThat(result, containsString("{\"wildcard\":{\"address\":{\"wildcard\":\"l*e\""));
   }
 
   /**
-   * matchPhraseQueryTest 短语查询完全匹配．
-   * "address" : {
-   * "query" : "671 Bristol Street",
-   * "type" : "phrase"
-   * }
+   * matchPhraseQuery "address" : { "query" : "671 Bristol Street", "type" : "phrase" }
    *
    * @throws IOException
    */
   @Test
+  @Ignore(
+      "score query no longer handled by legacy engine - @see org.opensearch.sql.sql.ScoreQueryIT")
   public void matchPhraseQueryTest() throws IOException {
-    final String result = explainQuery(String.format(Locale.ROOT,
-        "select address from %s " +
-            "where address= matchPhrase('671 Bristol Street')  order by _score desc limit 3",
-        TestsConstants.TEST_INDEX_ACCOUNT));
-    Assert.assertThat(result,
-        containsString("{\"match_phrase\":{\"address\":{\"query\":\"671 Bristol Street\""));
+    final String result =
+        explainQuery(
+            String.format(
+                Locale.ROOT,
+                "select address from %s where address= matchPhrase('671 Bristol Street')  order by"
+                    + " _score desc limit 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result, containsString("{\"match_phrase\":{\"address\":{\"query\":\"671 Bristol Street\""));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/MetricsIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/MetricsIT.java
index 3eeac66b97..238d3aeaff 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/MetricsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/MetricsIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -47,9 +46,7 @@ private void multiQueries(int n) throws IOException {
   }
 
   private Request makeStatRequest() {
-    return new Request(
-        "GET", STATS_API_ENDPOINT
-    );
+    return new Request("GET", STATS_API_ENDPOINT);
   }
 
   private String executeStatRequest(final Request request) throws IOException {
@@ -69,5 +66,4 @@ private String executeStatRequest(final Request request) throws IOException {
 
     return sb.toString();
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/MultiQueryIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/MultiQueryIT.java
index d8d2b8875a..84750f8a27 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/MultiQueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/MultiQueryIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -34,15 +33,17 @@ protected void init() throws Exception {
 
   @Test
   public void unionAllSameRequestOnlyOneRecordTwice() throws IOException {
-    String query = String.format("SELECT firstname " +
-            "FROM %s " +
-            "WHERE firstname = 'Amber' " +
-            "LIMIT 1 " +
-            "UNION ALL " +
-            "SELECT firstname " +
-            "FROM %s " +
-            "WHERE firstname = 'Amber'",
-        TestsConstants.TEST_INDEX_ACCOUNT, TestsConstants.TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            "SELECT firstname "
+                + "FROM %s "
+                + "WHERE firstname = 'Amber' "
+                + "LIMIT 1 "
+                + "UNION ALL "
+                + "SELECT firstname "
+                + "FROM %s "
+                + "WHERE firstname = 'Amber'",
+            TestsConstants.TEST_INDEX_ACCOUNT, TestsConstants.TEST_INDEX_ACCOUNT);
 
     JSONObject response = executeQuery(query);
     JSONArray hits = getHits(response);
@@ -58,10 +59,12 @@ public void unionAllSameRequestOnlyOneRecordTwice() throws IOException {
 
   @Test
   public void unionAllOnlyOneRecordEachWithAlias() throws IOException {
-    String query = String.format("SELECT firstname FROM %s WHERE firstname = 'Amber' " +
-            "UNION ALL " +
-            "SELECT dog_name as firstname FROM %s WHERE dog_name = 'rex'",
-        TestsConstants.TEST_INDEX_ACCOUNT, TestsConstants.TEST_INDEX_DOG);
+    String query =
+        String.format(
+            "SELECT firstname FROM %s WHERE firstname = 'Amber' "
+                + "UNION ALL "
+                + "SELECT dog_name as firstname FROM %s WHERE dog_name = 'rex'",
+            TestsConstants.TEST_INDEX_ACCOUNT, TestsConstants.TEST_INDEX_DOG);
 
     JSONObject response = executeQuery(query);
     assertThat(getHits(response).length(), equalTo(2));
@@ -80,12 +83,14 @@ public void unionAllOnlyOneRecordEachWithAlias() throws IOException {
 
   @Test
   public void unionAllOnlyOneRecordEachWithComplexAlias() throws IOException {
-    String query = String.format("SELECT firstname FROM %s WHERE firstname = 'Amber' " +
-            "UNION ALL " +
-            "SELECT name.firstname as firstname " +
-            "FROM %s " +
-            "WHERE name.firstname = 'daenerys'",
-        TestsConstants.TEST_INDEX_ACCOUNT, TestsConstants.TEST_INDEX_GAME_OF_THRONES);
+    String query =
+        String.format(
+            "SELECT firstname FROM %s WHERE firstname = 'Amber' "
+                + "UNION ALL "
+                + "SELECT name.firstname as firstname "
+                + "FROM %s "
+                + "WHERE name.firstname = 'daenerys'",
+            TestsConstants.TEST_INDEX_ACCOUNT, TestsConstants.TEST_INDEX_GAME_OF_THRONES);
 
     JSONObject response = executeQuery(query);
     assertThat(getHits(response).length(), equalTo(2));
@@ -144,10 +149,12 @@ public void minusCMinusDTwoFieldsNoAliasWithScrolling() throws IOException {
 
   @Test
   public void minusCMinusDTwoFieldsAliasOnBothSecondTableFields() throws IOException {
-    String query = String.format("SELECT pk, letter FROM %s WHERE system_name = 'C' " +
-            "MINUS " +
-            "SELECT myId as pk, myLetter as letter FROM %s WHERE system_name = 'E'",
-        TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
+    String query =
+        String.format(
+            "SELECT pk, letter FROM %s WHERE system_name = 'C' "
+                + "MINUS "
+                + "SELECT myId as pk, myLetter as letter FROM %s WHERE system_name = 'E'",
+            TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
 
     JSONObject response = executeQuery(query);
     assertThat(getHits(response).length(), equalTo(1));
@@ -174,10 +181,12 @@ public void minusCMinusDTwoFieldsAliasOnBothTablesWithScrolling() throws IOExcep
 
   @Test
   public void minusCMinusCTwoFieldsOneAlias() throws IOException {
-    String query = String.format("SELECT pk as myId, letter FROM %s WHERE system_name = 'C' " +
-            "MINUS " +
-            "SELECT pk as myId, letter FROM %s WHERE system_name = 'C'",
-        TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
+    String query =
+        String.format(
+            "SELECT pk as myId, letter FROM %s WHERE system_name = 'C' "
+                + "MINUS "
+                + "SELECT pk as myId, letter FROM %s WHERE system_name = 'C'",
+            TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
 
     JSONObject response = executeQuery(query);
     assertThat(getHits(response).length(), equalTo(0));
@@ -185,10 +194,12 @@ public void minusCMinusCTwoFieldsOneAlias() throws IOException {
 
   @Test
   public void minusCMinusTNonExistentFieldTwoFields() throws IOException {
-    String query = String.format("SELECT pk, letter FROM %s WHERE system_name = 'C' " +
-            "MINUS " +
-            "SELECT pk, letter FROM %s WHERE system_name = 'T' ",
-        TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
+    String query =
+        String.format(
+            "SELECT pk, letter FROM %s WHERE system_name = 'C' "
+                + "MINUS "
+                + "SELECT pk, letter FROM %s WHERE system_name = 'T' ",
+            TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
 
     JSONObject response = executeQuery(query);
     assertThat(getHits(response).length(), equalTo(3));
@@ -229,20 +240,24 @@ public void minusTMinusCNonExistentFieldFirstQueryWithScrollingAndOptimization()
   }
 
   private void innerMinusAMinusANoAlias(String hint) throws IOException {
-    String query = String.format("SELECT %s pk FROM %s WHERE system_name = 'A' " +
-            "MINUS " +
-            "SELECT pk FROM %s WHERE system_name = 'A'",
-        hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
+    String query =
+        String.format(
+            "SELECT %s pk FROM %s WHERE system_name = 'A' "
+                + "MINUS "
+                + "SELECT pk FROM %s WHERE system_name = 'A'",
+            hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
 
     JSONObject response = executeQuery(query);
     assertThat(getHits(response).length(), equalTo(0));
   }
 
   private void innerMinusAMinusBNoAlias(String hint) throws IOException {
-    String query = String.format("SELECT %s pk FROM %s WHERE system_name = 'A' " +
-            "MINUS " +
-            "SELECT pk FROM %s WHERE system_name = 'B'",
-        hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
+    String query =
+        String.format(
+            "SELECT %s pk FROM %s WHERE system_name = 'A' "
+                + "MINUS "
+                + "SELECT pk FROM %s WHERE system_name = 'B'",
+            hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
 
     JSONObject response = executeQuery(query);
     assertThat(getHits(response).length(), equalTo(1));
@@ -255,10 +270,12 @@ private void innerMinusAMinusBNoAlias(String hint) throws IOException {
   }
 
   private void innerMinusCMinusDTwoFieldsNoAlias(String hint) throws IOException {
-    String query = String.format("SELECT %s pk, letter FROM %s WHERE system_name = 'C' " +
-            "MINUS " +
-            "SELECT pk, letter FROM %s WHERE system_name = 'D'",
-        hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
+    String query =
+        String.format(
+            "SELECT %s pk, letter FROM %s WHERE system_name = 'C' "
+                + "MINUS "
+                + "SELECT pk, letter FROM %s WHERE system_name = 'D'",
+            hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
 
     JSONObject response = executeQuery(query);
     assertThat(getHits(response).length(), equalTo(1));
@@ -274,10 +291,12 @@ private void innerMinusCMinusDTwoFieldsNoAlias(String hint) throws IOException {
   }
 
   private void innerMinusCMinusDTwoFieldsAliasOnBothTables(String hint) throws IOException {
-    String query = String.format("SELECT %s pk as myId, letter FROM %s WHERE system_name = 'C' " +
-            "MINUS " +
-            "SELECT myId, myLetter as letter FROM %s WHERE system_name = 'E'",
-        hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
+    String query =
+        String.format(
+            "SELECT %s pk as myId, letter FROM %s WHERE system_name = 'C' "
+                + "MINUS "
+                + "SELECT myId, myLetter as letter FROM %s WHERE system_name = 'E'",
+            hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
 
     JSONObject response = executeQuery(query);
     assertThat(getHits(response).length(), equalTo(1));
@@ -293,20 +312,24 @@ private void innerMinusCMinusDTwoFieldsAliasOnBothTables(String hint) throws IOE
   }
 
   private void innerMinusCMinusTNonExistentFieldOneField(String hint) throws IOException {
-    String query = String.format("SELECT %s letter FROM %s WHERE system_name = 'C' " +
-            "MINUS " +
-            "SELECT letter FROM %s WHERE system_name = 'T'",
-        hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
+    String query =
+        String.format(
+            "SELECT %s letter FROM %s WHERE system_name = 'C' "
+                + "MINUS "
+                + "SELECT letter FROM %s WHERE system_name = 'T'",
+            hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
 
     JSONObject response = executeQuery(query);
     assertThat(getHits(response).length(), equalTo(3));
   }
 
   private void innerMinusTMinusCNonExistentFieldFirstQuery(String hint) throws IOException {
-    String query = String.format("SELECT %s letter FROM %s WHERE system_name = 'T' " +
-            "MINUS " +
-            "SELECT letter FROM %s WHERE system_name = 'C'",
-        hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
+    String query =
+        String.format(
+            "SELECT %s letter FROM %s WHERE system_name = 'T' "
+                + "MINUS "
+                + "SELECT letter FROM %s WHERE system_name = 'C'",
+            hint, TestsConstants.TEST_INDEX_SYSTEM, TestsConstants.TEST_INDEX_SYSTEM);
 
     JSONObject response = executeQuery(query);
     assertThat(getHits(response).length(), equalTo(0));
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/NestedFieldQueryIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/NestedFieldQueryIT.java
index cd83a09a03..6e73a9366e 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/NestedFieldQueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/NestedFieldQueryIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.allOf;
@@ -15,7 +14,9 @@
 import static org.opensearch.sql.util.MatcherUtils.hitAll;
 import static org.opensearch.sql.util.MatcherUtils.kvString;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.function.Function;
 import org.hamcrest.BaseMatcher;
@@ -31,37 +32,29 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.ResponseException;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.SearchHit;
 
 /**
  * Integration test cases for both rewriting and projection logic.
- * <p>
- * Test result:
- * 1) SELECT * or any field or aggregate function on any field
- * 2) WHERE single or multiple conditions on nested type
- * 3) GROUP BY regular field and aggregate on any field
- * 4) GROUP BY nested field and COUNT(*)
- * 5) UNION/MINUS but only SELECT nested field
- * <p>
- * Does NOT support:
- * 1) GROUP BY nested field and aggregate other than COUNT
- * 2) UNION/MINUS and SELECT nested field (need to flatten during set computation)
- * 3) JOIN (doesn't work if put alias before nested field name and may have similar problem as UNION/MINUS during computation)
- * 4) Subquery
- * 5) HAVING
- * 6) Verification for conditions mixed with regular and nested fields
+ *
+ * <p>Test result: 1) SELECT * or any field or aggregate function on any field 2) WHERE single or
+ * multiple conditions on nested type 3) GROUP BY regular field and aggregate on any field 4) GROUP
+ * BY nested field and COUNT(*) 5) UNION/MINUS but only SELECT nested field
+ *
+ * <p>Does NOT support: 1) GROUP BY nested field and aggregate other than COUNT 2) UNION/MINUS and
+ * SELECT nested field (need to flatten during set computation) 3) JOIN (doesn't work if put alias
+ * before nested field name and may have similar problem as UNION/MINUS during computation) 4)
+ * Subquery 5) HAVING 6) Verification for conditions mixed with regular and nested fields
  */
 public class NestedFieldQueryIT extends SQLIntegTestCase {
 
   private static final String FROM =
       "FROM " + TestsConstants.TEST_INDEX_NESTED_TYPE + " n, n.message m";
 
-
   @Override
   protected void init() throws Exception {
     loadIndex(Index.NESTED);
@@ -82,188 +75,71 @@ private void queryAll(String sql) throws IOException {
     assertThat(
         query(sql),
         hits(
-            hit(
-                myNum(1),
-                someField("b"),
-                innerHits("message",
-                    hit(
-                        author("e"),
-                        info("a")
-                    )
-                )
-            ),
-            hit(
-                myNum(2),
-                someField("a"),
-                innerHits("message",
-                    hit(
-                        author("f"),
-                        info("b")
-                    )
-                )
-            ),
-            hit(
-                myNum(3),
-                someField("a"),
-                innerHits("message",
-                    hit(
-                        author("g"),
-                        info("c")
-                    )
-                )
-            ),
+            hit(myNum(1), someField("b"), innerHits("message", hit(author("e"), info("a")))),
+            hit(myNum(2), someField("a"), innerHits("message", hit(author("f"), info("b")))),
+            hit(myNum(3), someField("a"), innerHits("message", hit(author("g"), info("c")))),
             hit(
                 myNum(4),
                 someField("b"),
-                innerHits("message",
-                    hit(
-                        author("h"),
-                        info("c")
-                    ),
-                    hit(
-                        author("i"),
-                        info("a")
-                    )
-                )
-            ),
+                innerHits("message", hit(author("h"), info("c")), hit(author("i"), info("a")))),
             hit(
                 myNum(new int[] {3, 4}),
                 someField("a"),
-                innerHits("message",
-                    hit(
-                        author("zz"),
-                        info("zz")
-                    )
-                )
-            )
-        )
-    );
+                innerHits("message", hit(author("zz"), info("zz"))))));
   }
 
   @Test
   public void singleCondition() throws IOException {
     assertThat(
-        query(
-            "SELECT myNum, m.author, m.info",
-            "WHERE m.info = 'c'"
-        ),
+        query("SELECT myNum, m.author, m.info", "WHERE m.info = 'c'"),
         hits(
-            hit(
-                myNum(3),
-                innerHits("message",
-                    hit(
-                        author("g"),
-                        info("c")
-                    )
-                )
-            ),
-            hit(
-                myNum(4),
-                innerHits("message",
-                    hit(
-                        author("h"),
-                        info("c")
-                    )
-                )
-            )
-        )
-    );
+            hit(myNum(3), innerHits("message", hit(author("g"), info("c")))),
+            hit(myNum(4), innerHits("message", hit(author("h"), info("c"))))));
   }
 
   @Test
   public void multipleConditionsOfNestedField() throws IOException {
     assertThat(
-        query(
-            "SELECT someField, m.author, m.info",
-            "WHERE m.info = 'c' AND m.author = 'h'"
-        ),
-        hits(
-            hit(
-                someField("b"),
-                innerHits("message",
-                    hit(
-                        author("h"),
-                        info("c")
-                    )
-                )
-            )
-        )
-    );
+        query("SELECT someField, m.author, m.info", "WHERE m.info = 'c' AND m.author = 'h'"),
+        hits(hit(someField("b"), innerHits("message", hit(author("h"), info("c"))))));
   }
 
   @Test
   public void multipleConditionsOfNestedFieldNoMatch() throws IOException {
     assertThat(
-        query(
-            "SELECT someField, m.author, m.info",
-            "WHERE m.info = 'c' AND m.author = 'i'"
-        ),
-        hits()
-    );
+        query("SELECT someField, m.author, m.info", "WHERE m.info = 'c' AND m.author = 'i'"),
+        hits());
   }
 
   @Test
   public void multipleConditionsOfRegularAndNestedField() throws IOException {
     assertThat(
-        query(
-            "SELECT myNum, m.author, m.info",
-            "WHERE myNum = 3 AND m.info = 'c'"
-        ),
-        hits(
-            hit(
-                myNum(3),
-                innerHits("message",
-                    hit(
-                        author("g"),
-                        info("c")
-                    )
-                )
-            )
-        )
-    );
+        query("SELECT myNum, m.author, m.info", "WHERE myNum = 3 AND m.info = 'c'"),
+        hits(hit(myNum(3), innerHits("message", hit(author("g"), info("c"))))));
   }
 
   @Test
   public void multipleConditionsOfRegularOrNestedField() throws IOException {
     assertThat(
-        query(
-            "SELECT myNum, m.author, m.info",
-            "WHERE myNum = 2 OR m.info = 'c'"
-        ),
+        query("SELECT myNum, m.author, m.info", "WHERE myNum = 2 OR m.info = 'c'"),
         hits(
-            hit(
-                myNum(2)
-            ), // Note: no inner hit here because of no match in nested field
-            hit(
-                myNum(3),
-                innerHits("message",
-                    hit(
-                        author("g"),
-                        info("c")
-                    )
-                )
-            ),
-            hit(
-                myNum(4),
-                innerHits("message",
-                    hit(
-                        author("h"),
-                        info("c")
-                    )
-                )
-            )
-        )
-    );
+            hit(myNum(2)), // Note: no inner hit here because of no match in nested field
+            hit(myNum(3), innerHits("message", hit(author("g"), info("c")))),
+            hit(myNum(4), innerHits("message", hit(author("h"), info("c"))))));
   }
 
   @Test
   public void leftJoinSelectAll() throws IOException {
-    String sql = "SELECT * " +
-        "FROM opensearch-sql_test_index_employee_nested e " +
-        "LEFT JOIN e.projects p";
+    String sql =
+        "SELECT * "
+            + "FROM opensearch-sql_test_index_employee_nested e "
+            + "LEFT JOIN e.projects p";
     String explain = explainQuery(sql);
-    assertThat(explain, containsString("{\"bool\":{\"must_not\":[{\"nested\":{\"query\":" +
-        "{\"exists\":{\"field\":\"projects\",\"boost\":1.0}},\"path\":\"projects\""));
+    assertThat(
+        explain,
+        containsString(
+            "{\"bool\":{\"must_not\":[{\"nested\":{\"query\":"
+                + "{\"exists\":{\"field\":\"projects\",\"boost\":1.0}},\"path\":\"projects\""));
 
     assertThat(explain, containsString("\"_source\":{\"includes\":[\"projects.*\""));
 
@@ -273,42 +149,50 @@ public void leftJoinSelectAll() throws IOException {
 
   @Test
   public void leftJoinSpecificFields() throws IOException {
-    String sql = "SELECT e.name, p.name, p.started_year " +
-        "FROM opensearch-sql_test_index_employee_nested e " +
-        "LEFT JOIN e.projects p";
+    String sql =
+        "SELECT e.name, p.name, p.started_year "
+            + "FROM opensearch-sql_test_index_employee_nested e "
+            + "LEFT JOIN e.projects p";
     String explain = explainQuery(sql);
-    assertThat(explain, containsString("{\"bool\":{\"must_not\":[{\"nested\":{\"query\":" +
-        "{\"exists\":{\"field\":\"projects\",\"boost\":1.0}},\"path\":\"projects\""));
+    assertThat(
+        explain,
+        containsString(
+            "{\"bool\":{\"must_not\":[{\"nested\":{\"query\":"
+                + "{\"exists\":{\"field\":\"projects\",\"boost\":1.0}},\"path\":\"projects\""));
     assertThat(explain, containsString("\"_source\":{\"includes\":[\"name\"],"));
-    assertThat(explain,
+    assertThat(
+        explain,
         containsString("\"_source\":{\"includes\":[\"projects.name\",\"projects.started_year\"]"));
 
     JSONObject results = executeQuery(sql);
     Assert.assertThat(getTotalHits(results), equalTo(4));
   }
 
-  @Ignore("Comma join in left join won't pass syntax check in new ANTLR parser. "
-      + "Ignore for now and require to change grammar too when we want to support this case.")
+  @Ignore(
+      "Comma join in left join won't pass syntax check in new ANTLR parser. "
+          + "Ignore for now and require to change grammar too when we want to support this case.")
   @Test
   public void leftJoinExceptionOnExtraNestedFields() throws IOException {
-    String sql = "SELECT * " +
-        "FROM opensearch-sql_test_index_employee_nested e " +
-        "LEFT JOIN e.projects p, e.comments c";
+    String sql =
+        "SELECT * "
+            + "FROM opensearch-sql_test_index_employee_nested e "
+            + "LEFT JOIN e.projects p, e.comments c";
 
     try {
       String explain = explainQuery(sql);
       Assert.fail("Expected ResponseException, but none was thrown");
     } catch (ResponseException e) {
-      assertThat(e.getResponse().getStatusLine().getStatusCode(),
+      assertThat(
+          e.getResponse().getStatusLine().getStatusCode(),
           equalTo(RestStatus.BAD_REQUEST.getStatus()));
       final String entity = TestUtils.getResponseBody(e.getResponse());
-      assertThat(entity,
+      assertThat(
+          entity,
           containsString("only single nested field is allowed as right table for LEFT JOIN"));
       assertThat(entity, containsString("\"type\":\"verification_exception\""));
     }
   }
 
-
   @Test
   public void aggregationWithoutGroupBy() throws IOException {
     String sql = "SELECT AVG(m.dayOfWeek) AS avgDay " + FROM;
@@ -316,7 +200,9 @@ public void aggregationWithoutGroupBy() throws IOException {
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "message.dayOfWeek@NESTED");
 
-    Assert.assertThat((Double) aggregation.query("/avgDay/value"), closeTo(3.166666666, 0.01));
+    Assert.assertThat(
+        ((BigDecimal) aggregation.query("/avgDay/value")).doubleValue(),
+        closeTo(3.166666666, 0.01));
   }
 
   @Test
@@ -350,39 +236,36 @@ public void groupByRegularFieldAndSum() throws IOException {
     Assert.assertNotNull(msgInfoBuckets);
     Assert.assertThat(msgInfoBuckets.length(), equalTo(2));
     Assert.assertThat(msgInfoBuckets.query("/0/key"), equalTo("a"));
-    Assert.assertThat((Double) msgInfoBuckets.query("/0/message.dayOfWeek@NESTED/sumDay/value"),
+    Assert.assertThat(
+        ((BigDecimal) msgInfoBuckets.query("/0/message.dayOfWeek@NESTED/sumDay/value"))
+            .doubleValue(),
         closeTo(9.0, 0.01));
     Assert.assertThat(msgInfoBuckets.query("/1/key"), equalTo("b"));
-    Assert.assertThat((Double) msgInfoBuckets.query("/1/message.dayOfWeek@NESTED/sumDay/value"),
+    Assert.assertThat(
+        ((BigDecimal) msgInfoBuckets.query("/1/message.dayOfWeek@NESTED/sumDay/value"))
+            .doubleValue(),
         closeTo(10.0, 0.01));
   }
 
   @Test
   public void nestedFiledIsNotNull() throws IOException {
-    String sql = "SELECT e.name " +
-        "FROM opensearch-sql_test_index_employee_nested as e, e.projects as p " +
-        "WHERE p IS NOT NULL";
+    String sql =
+        "SELECT e.name "
+            + "FROM opensearch-sql_test_index_employee_nested as e, e.projects as p "
+            + "WHERE p IS NOT NULL";
 
     assertThat(
         executeQuery(sql),
         hitAll(
             kvString("/_source/name", Is.is("Bob Smith")),
-            kvString("/_source/name", Is.is("Jane Smith"))
-        )
-    );
+            kvString("/_source/name", Is.is("Jane Smith"))));
   }
 
   // Doesn't support: aggregate function other than COUNT()
   @SuppressWarnings("unused")
   public void groupByNestedFieldAndAvg() throws IOException {
-    query(
-        "SELECT m.info, AVG(m.dayOfWeek)",
-        "GROUP BY m.info"
-    );
-    query(
-        "SELECT m.info, AVG(myNum)",
-        "GROUP BY m.info"
-    );
+    query("SELECT m.info, AVG(m.dayOfWeek)", "GROUP BY m.info");
+    query("SELECT m.info, AVG(myNum)", "GROUP BY m.info");
   }
 
   @Test
@@ -417,10 +300,11 @@ public void groupByNestedAndRegularField() throws IOException {
 
   @Test
   public void countAggWithoutWhere() throws IOException {
-    String sql = "SELECT e.name, COUNT(p) as c " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "GROUP BY e.name " +
-        "HAVING c > 1";
+    String sql =
+        "SELECT e.name, COUNT(p) as c "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "GROUP BY e.name "
+            + "HAVING c > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -436,11 +320,12 @@ public void countAggWithoutWhere() throws IOException {
 
   @Test
   public void countAggWithWhereOnParent() throws IOException {
-    String sql = "SELECT e.name, COUNT(p) as c " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE e.name like '%smith%' " +
-        "GROUP BY e.name " +
-        "HAVING c > 1";
+    String sql =
+        "SELECT e.name, COUNT(p) as c "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE e.name like '%smith%' "
+            + "GROUP BY e.name "
+            + "HAVING c > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -456,11 +341,12 @@ public void countAggWithWhereOnParent() throws IOException {
 
   @Test
   public void countAggWithWhereOnNested() throws IOException {
-    String sql = "SELECT e.name, COUNT(p) as c " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING c > 1";
+    String sql =
+        "SELECT e.name, COUNT(p) as c "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING c > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -476,11 +362,12 @@ public void countAggWithWhereOnNested() throws IOException {
 
   @Test
   public void countAggWithWhereOnParentOrNested() throws IOException {
-    String sql = "SELECT e.name, COUNT(p) as c " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE e.name like '%smith%' or p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING c > 1";
+    String sql =
+        "SELECT e.name, COUNT(p) as c "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE e.name like '%smith%' or p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING c > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -496,11 +383,12 @@ public void countAggWithWhereOnParentOrNested() throws IOException {
 
   @Test
   public void countAggWithWhereOnParentAndNested() throws IOException {
-    String sql = "SELECT e.name, COUNT(p) as c " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE e.name like '%smith%' AND p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING c > 1";
+    String sql =
+        "SELECT e.name, COUNT(p) as c "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE e.name like '%smith%' AND p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING c > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -516,11 +404,12 @@ public void countAggWithWhereOnParentAndNested() throws IOException {
 
   @Test
   public void countAggWithWhereOnNestedAndNested() throws IOException {
-    String sql = "SELECT e.name, COUNT(p) as c " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE p.started_year > 2000 AND p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING c > 0";
+    String sql =
+        "SELECT e.name, COUNT(p) as c "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE p.started_year > 2000 AND p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING c > 0";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -536,11 +425,12 @@ public void countAggWithWhereOnNestedAndNested() throws IOException {
 
   @Test
   public void countAggWithWhereOnNestedOrNested() throws IOException {
-    String sql = "SELECT e.name, COUNT(p) as c " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE p.started_year > 2000 OR p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING c > 1";
+    String sql =
+        "SELECT e.name, COUNT(p) as c "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE p.started_year > 2000 OR p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING c > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -556,11 +446,12 @@ public void countAggWithWhereOnNestedOrNested() throws IOException {
 
   @Test
   public void countAggOnNestedInnerFieldWithoutWhere() throws IOException {
-    String sql = "SELECT e.name, COUNT(p.started_year) as count " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING count > 0";
+    String sql =
+        "SELECT e.name, COUNT(p.started_year) as count "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING count > 0";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -580,10 +471,11 @@ public void countAggOnNestedInnerFieldWithoutWhere() throws IOException {
 
   @Test
   public void maxAggOnNestedInnerFieldWithoutWhere() throws IOException {
-    String sql = "SELECT e.name, MAX(p.started_year) as max " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE p.name LIKE '%security%' " +
-        "GROUP BY e.name";
+    String sql =
+        "SELECT e.name, MAX(p.started_year) as max "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE p.name LIKE '%security%' "
+            + "GROUP BY e.name";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -593,20 +485,27 @@ public void maxAggOnNestedInnerFieldWithoutWhere() throws IOException {
     Assert.assertThat(bucket.length(), equalTo(2));
     Assert.assertThat(bucket.query("/0/key"), equalTo("Bob Smith"));
     Assert.assertThat(
-        bucket.query("/0/projects.started_year@NESTED/projects.started_year@FILTER/max/value"),
-        equalTo(2015.0));
+        ((BigDecimal)
+                bucket.query(
+                    "/0/projects.started_year@NESTED/projects.started_year@FILTER/max/value"))
+            .doubleValue(),
+        closeTo(2015.0, 0.01));
     Assert.assertThat(bucket.query("/1/key"), equalTo("Jane Smith"));
     Assert.assertThat(
-        bucket.query("/1/projects.started_year@NESTED/projects.started_year@FILTER/max/value"),
-        equalTo(2015.0));
+        ((BigDecimal)
+                bucket.query(
+                    "/1/projects.started_year@NESTED/projects.started_year@FILTER/max/value"))
+            .doubleValue(),
+        closeTo(2015.0, 0.01));
   }
 
   @Test
   public void havingCountAggWithoutWhere() throws IOException {
-    String sql = "SELECT e.name " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "GROUP BY e.name " +
-        "HAVING COUNT(p) > 1";
+    String sql =
+        "SELECT e.name "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "GROUP BY e.name "
+            + "HAVING COUNT(p) > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -622,11 +521,12 @@ public void havingCountAggWithoutWhere() throws IOException {
 
   @Test
   public void havingCountAggWithWhereOnParent() throws IOException {
-    String sql = "SELECT e.name " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE e.name like '%smith%' " +
-        "GROUP BY e.name " +
-        "HAVING COUNT(p) > 1";
+    String sql =
+        "SELECT e.name "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE e.name like '%smith%' "
+            + "GROUP BY e.name "
+            + "HAVING COUNT(p) > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -642,11 +542,12 @@ public void havingCountAggWithWhereOnParent() throws IOException {
 
   @Test
   public void havingCountAggWithWhereOnNested() throws IOException {
-    String sql = "SELECT e.name " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING COUNT(p) > 1";
+    String sql =
+        "SELECT e.name "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING COUNT(p) > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -662,11 +563,12 @@ public void havingCountAggWithWhereOnNested() throws IOException {
 
   @Test
   public void havingCountAggWithWhereOnParentOrNested() throws IOException {
-    String sql = "SELECT e.name " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE e.name like '%smith%' or p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING COUNT(p) > 1";
+    String sql =
+        "SELECT e.name "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE e.name like '%smith%' or p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING COUNT(p) > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -682,11 +584,12 @@ public void havingCountAggWithWhereOnParentOrNested() throws IOException {
 
   @Test
   public void havingCountAggWithWhereOnParentAndNested() throws IOException {
-    String sql = "SELECT e.name " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE e.name like '%smith%' AND p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING COUNT(p) > 1";
+    String sql =
+        "SELECT e.name "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE e.name like '%smith%' AND p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING COUNT(p) > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -702,11 +605,12 @@ public void havingCountAggWithWhereOnParentAndNested() throws IOException {
 
   @Test
   public void havingCountAggWithWhereOnNestedAndNested() throws IOException {
-    String sql = "SELECT e.name " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE p.started_year > 2000 AND p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING COUNT(p) > 0";
+    String sql =
+        "SELECT e.name "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE p.started_year > 2000 AND p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING COUNT(p) > 0";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -722,11 +626,12 @@ public void havingCountAggWithWhereOnNestedAndNested() throws IOException {
 
   @Test
   public void havingCountAggWithWhereOnNestedOrNested() throws IOException {
-    String sql = "SELECT e.name " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE p.started_year > 2000 OR p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING COUNT(p) > 1";
+    String sql =
+        "SELECT e.name "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE p.started_year > 2000 OR p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING COUNT(p) > 1";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -742,11 +647,12 @@ public void havingCountAggWithWhereOnNestedOrNested() throws IOException {
 
   @Test
   public void havingCountAggOnNestedInnerFieldWithoutWhere() throws IOException {
-    String sql = "SELECT e.name " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING COUNT(p.started_year) > 0";
+    String sql =
+        "SELECT e.name "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING COUNT(p.started_year) > 0";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -766,11 +672,12 @@ public void havingCountAggOnNestedInnerFieldWithoutWhere() throws IOException {
 
   @Test
   public void havingMaxAggOnNestedInnerFieldWithoutWhere() throws IOException {
-    String sql = "SELECT e.name " +
-        "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p " +
-        "WHERE p.name LIKE '%security%' " +
-        "GROUP BY e.name " +
-        "HAVING MAX(p.started_year) > 1990";
+    String sql =
+        "SELECT e.name "
+            + "FROM opensearch-sql_test_index_employee_nested AS e, e.projects AS p "
+            + "WHERE p.name LIKE '%security%' "
+            + "GROUP BY e.name "
+            + "HAVING MAX(p.started_year) > 1990";
 
     JSONObject result = executeQuery(sql);
     JSONObject aggregation = getAggregation(result, "name.keyword");
@@ -780,22 +687,28 @@ public void havingMaxAggOnNestedInnerFieldWithoutWhere() throws IOException {
     Assert.assertThat(bucket.length(), equalTo(2));
     Assert.assertThat(bucket.query("/0/key"), equalTo("Bob Smith"));
     Assert.assertThat(
-        bucket.query("/0/projects.started_year@NESTED/projects.started_year@FILTER/max_0/value"),
-        equalTo(2015.0));
+        ((BigDecimal)
+                bucket.query(
+                    "/0/projects.started_year@NESTED/projects.started_year@FILTER/max_0/value"))
+            .doubleValue(),
+        closeTo(2015.0, 0.01));
     Assert.assertThat(bucket.query("/1/key"), equalTo("Jane Smith"));
     Assert.assertThat(
-        bucket.query("/1/projects.started_year@NESTED/projects.started_year@FILTER/max_0/value"),
-        equalTo(2015.0));
+        ((BigDecimal)
+                bucket.query(
+                    "/1/projects.started_year@NESTED/projects.started_year@FILTER/max_0/value"))
+            .doubleValue(),
+        closeTo(2015.0, 0.01));
   }
 
   /***********************************************************
-   Matchers for Non-Aggregation Testing
+   * Matchers for Non-Aggregation Testing
    ***********************************************************/
 
   @SafeVarargs
   private final Matcher<SearchResponse> hits(Matcher<SearchHit>... subMatchers) {
-    return featureValueOf("hits", arrayContainingInAnyOrder(subMatchers),
-        resp -> resp.getHits().getHits());
+    return featureValueOf(
+        "hits", arrayContainingInAnyOrder(subMatchers), resp -> resp.getHits().getHits());
   }
 
   @SafeVarargs
@@ -833,8 +746,7 @@ public boolean matches(Object item) {
       }
 
       @Override
-      public void describeTo(Description description) {
-      }
+      public void describeTo(Description description) {}
     };
   }
 
@@ -859,16 +771,15 @@ private final Matcher<SearchHit> innerHits(String path, Matcher<SearchHit>... in
     return featureValueOf(
         "innerHits",
         arrayContainingInAnyOrder(innerHitMatchers),
-        hit -> hit.getInnerHits().get(path).getHits()
-    );
+        hit -> hit.getInnerHits().get(path).getHits());
   }
 
   /***********************************************************
-   Matchers for Aggregation Testing
+   * Matchers for Aggregation Testing
    ***********************************************************/
 
-  private <T, U> FeatureMatcher<T, U> featureValueOf(String name, Matcher<U> subMatcher,
-                                                     Function<T, U> getter) {
+  private <T, U> FeatureMatcher<T, U> featureValueOf(
+      String name, Matcher<U> subMatcher, Function<T, U> getter) {
     return new FeatureMatcher<T, U>(subMatcher, name, name) {
       @Override
       protected U featureValueOf(T actual) {
@@ -878,7 +789,7 @@ protected U featureValueOf(T actual) {
   }
 
   /***********************************************************
-   Query Utility to Fetch Response for SQL
+   * Query Utility to Fetch Response for SQL
    ***********************************************************/
 
   private SearchResponse query(String select, String... statements) throws IOException {
@@ -888,10 +799,11 @@ private SearchResponse query(String select, String... statements) throws IOExcep
   private SearchResponse execute(String sql) throws IOException {
     final JSONObject jsonObject = executeQuery(sql);
 
-    final XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(
-        NamedXContentRegistry.EMPTY,
-        LoggingDeprecationHandler.INSTANCE,
-        jsonObject.toString());
+    final XContentParser parser =
+        new JsonXContentParser(
+            NamedXContentRegistry.EMPTY,
+            LoggingDeprecationHandler.INSTANCE,
+            new JsonFactory().createParser(jsonObject.toString()));
     return SearchResponse.fromXContent(parser);
   }
 
@@ -903,5 +815,4 @@ private JSONObject getAggregation(final JSONObject queryResult, final String agg
     Assert.assertTrue(aggregations.has(aggregationName));
     return aggregations.getJSONObject(aggregationName);
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/ObjectFieldSelectIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/ObjectFieldSelectIT.java
index bddaa22772..3a2f48d497 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/ObjectFieldSelectIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/ObjectFieldSelectIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DEEP_NESTED;
@@ -14,14 +13,12 @@
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Assume;
 import org.junit.Test;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
 /**
- * Integration test for OpenSearch object field (and nested field).
- * This class is focused on simple SELECT-FROM query to ensure right column
- * number and value is returned.
+ * Integration test for OpenSearch object field (and nested field). This class is focused on simple
+ * SELECT-FROM query to ensure right column number and value is returned.
  */
 public class ObjectFieldSelectIT extends SQLIntegTestCase {
 
@@ -37,52 +34,46 @@ public void testSelectObjectFieldItself() {
     verifySchema(response, schema("city", null, "object"));
 
     // Expect object field itself is returned in a single cell
-    verifyDataRows(response,
-        rows(new JSONObject(
-            "{\n"
-                + "  \"name\": \"Seattle\",\n"
-                + "  \"location\": {\"latitude\": 10.5}\n"
-                + "}")
-        )
-    );
+    verifyDataRows(
+        response,
+        rows(
+            new JSONObject(
+                "{\n"
+                    + "  \"name\": \"Seattle\",\n"
+                    + "  \"location\": {\"latitude\": 10.5}\n"
+                    + "}")));
   }
 
   @Test
   public void testSelectObjectInnerFields() {
-    JSONObject response = new JSONObject(query(
-        "SELECT city.location, city.location.latitude FROM %s"));
+    JSONObject response =
+        new JSONObject(query("SELECT city.location, city.location.latitude FROM %s"));
 
-    verifySchema(response,
+    verifySchema(
+        response,
         schema("city.location", null, "object"),
-        schema("city.location.latitude", null, "double")
-    );
+        schema("city.location.latitude", null, "double"));
 
     // Expect inner regular or object field returned in its single cell
-    verifyDataRows(response,
-        rows(
-            new JSONObject("{\"latitude\": 10.5}"),
-            10.5
-        )
-    );
+    verifyDataRows(response, rows(new JSONObject("{\"latitude\": 10.5}"), 10.5));
   }
 
   @Test
   public void testSelectNestedFieldItself() {
     JSONObject response = new JSONObject(query("SELECT projects FROM %s"));
 
-    // Nested field is absent in OpenSearch Get Field Mapping response either hence "object" used
-    verifySchema(response, schema("projects", null, "object"));
+    verifySchema(response, schema("projects", null, "nested"));
 
     // Expect nested field itself is returned in a single cell
-    verifyDataRows(response,
-        rows(new JSONArray(
-            "[\n"
-                + "  {\"name\": \"AWS Redshift Spectrum querying\"},\n"
-                + "  {\"name\": \"AWS Redshift security\"},\n"
-                + "  {\"name\": \"AWS Aurora security\"}\n"
-                + "]")
-        )
-    );
+    verifyDataRows(
+        response,
+        rows(
+            new JSONArray(
+                "[\n"
+                    + "  {\"name\": \"AWS Redshift Spectrum querying\"},\n"
+                    + "  {\"name\": \"AWS Redshift security\"},\n"
+                    + "  {\"name\": \"AWS Aurora security\"}\n"
+                    + "]")));
   }
 
   @Test
@@ -102,10 +93,6 @@ public void testSelectObjectFieldOfArrayValuesInnerFields() {
   }
 
   private String query(String sql) {
-    return executeQuery(
-        StringUtils.format(sql, TEST_INDEX_DEEP_NESTED),
-        "jdbc"
-    );
+    return executeQuery(StringUtils.format(sql, TEST_INDEX_DEEP_NESTED), "jdbc");
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/OpenSearchSQLRestTestCase.java b/integ-test/src/test/java/org/opensearch/sql/legacy/OpenSearchSQLRestTestCase.java
index 0369ee715a..ce118031e1 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/OpenSearchSQLRestTestCase.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/OpenSearchSQLRestTestCase.java
@@ -3,10 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import org.apache.http.Header;
@@ -19,8 +20,11 @@
 import org.apache.http.message.BasicHeader;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.util.EntityUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.junit.AfterClass;
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;
 import org.opensearch.client.RestClient;
@@ -28,18 +32,49 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.test.rest.OpenSearchRestTestCase;
 
 /**
- * OpenSearch SQL integration test base class to support both security disabled and enabled OpenSearch cluster.
+ * OpenSearch SQL integration test base class to support both security disabled and enabled
+ * OpenSearch cluster. Allows interaction with multiple external test clusters using OpenSearch's
+ * {@link RestClient}.
  */
 public abstract class OpenSearchSQLRestTestCase extends OpenSearchRestTestCase {
 
+  private static final Logger LOG = LogManager.getLogger();
+  public static final String MATCH_ALL_REMOTE_CLUSTER = "*";
+  // Requires to insert cluster name and cluster transport address (host:port)
+  public static final String REMOTE_CLUSTER_SETTING =
+      "{"
+          + "\"persistent\": {"
+          + "  \"cluster\": {"
+          + "    \"remote\": {"
+          + "      \"%s\": {"
+          + "        \"seeds\": ["
+          + "          \"%s\""
+          + "        ]"
+          + "      }"
+          + "    }"
+          + "  }"
+          + "}"
+          + "}";
+
+  private static RestClient remoteClient;
+
+  /**
+   * A client for the running remote OpenSearch cluster configured to take test administrative
+   * actions like remove all indexes after the test completes
+   */
+  private static RestClient remoteAdminClient;
+
   protected boolean isHttps() {
-    boolean isHttps = Optional.ofNullable(System.getProperty("https"))
-        .map("true"::equalsIgnoreCase).orElse(false);
+    boolean isHttps =
+        Optional.ofNullable(System.getProperty("https"))
+            .map("true"::equalsIgnoreCase)
+            .orElse(false);
     if (isHttps) {
-      //currently only external cluster is supported for security enabled testing
+      // currently only external cluster is supported for security enabled testing
       if (!Optional.ofNullable(System.getProperty("tests.rest.cluster")).isPresent()) {
         throw new RuntimeException(
             "external cluster url should be provided for security enabled testing");
@@ -53,6 +88,19 @@ protected String getProtocol() {
     return isHttps() ? "https" : "http";
   }
 
+  /** Get the client to remote cluster used for ordinary api calls while writing a test. */
+  protected static RestClient remoteClient() {
+    return remoteClient;
+  }
+
+  /**
+   * Get the client to remote cluster used for test administrative actions. Do not use this while
+   * writing a test. Only use it for cleaning up after tests.
+   */
+  protected static RestClient remoteAdminClient() {
+    return remoteAdminClient;
+  }
+
   protected RestClient buildClient(Settings settings, HttpHost[] hosts) throws IOException {
     RestClientBuilder builder = RestClient.builder(hosts);
     if (isHttps()) {
@@ -65,21 +113,114 @@ protected RestClient buildClient(Settings settings, HttpHost[] hosts) throws IOE
     return builder.build();
   }
 
+  // Modified from initClient in OpenSearchRestTestCase
+  public void initRemoteClient(String clusterName) throws IOException {
+    remoteClient = remoteAdminClient = initClient(clusterName);
+  }
+
+  /** Configure http client for the given <b>cluster</b>. */
+  public RestClient initClient(String clusterName) throws IOException {
+    String[] stringUrls = getTestRestCluster(clusterName).split(",");
+    List<HttpHost> hosts = new ArrayList<>(stringUrls.length);
+    for (String stringUrl : stringUrls) {
+      int portSeparator = stringUrl.lastIndexOf(':');
+      if (portSeparator < 0) {
+        throw new IllegalArgumentException("Illegal cluster url [" + stringUrl + "]");
+      }
+      String host = stringUrl.substring(0, portSeparator);
+      int port = Integer.parseInt(stringUrl.substring(portSeparator + 1));
+      hosts.add(buildHttpHost(host, port));
+    }
+    return buildClient(restClientSettings(), hosts.toArray(new HttpHost[0]));
+  }
+
+  /** Get a comma delimited list of [host:port] to which to send REST requests. */
+  protected String getTestRestCluster(String clusterName) {
+    String cluster = System.getProperty("tests.rest." + clusterName + ".http_hosts");
+    if (cluster == null) {
+      throw new RuntimeException(
+          "Must specify [tests.rest."
+              + clusterName
+              + ".http_hosts] system property with a comma delimited list of [host:port] "
+              + "to which to send REST requests");
+    }
+    return cluster;
+  }
+
+  /** Get a comma delimited list of [host:port] for connections between clusters. */
+  protected String getTestTransportCluster(String clusterName) {
+    String cluster = System.getProperty("tests.rest." + clusterName + ".transport_hosts");
+    if (cluster == null) {
+      throw new RuntimeException(
+          "Must specify [tests.rest."
+              + clusterName
+              + ".transport_hosts] system property with a comma delimited list of [host:port] "
+              + "for connections between clusters");
+    }
+    return cluster;
+  }
+
+  @AfterClass
+  public static void closeRemoteClients() throws IOException {
+    try {
+      IOUtils.close(remoteClient, remoteAdminClient);
+    } finally {
+      remoteClient = null;
+      remoteAdminClient = null;
+    }
+  }
+
   protected static void wipeAllOpenSearchIndices() throws IOException {
+    wipeAllOpenSearchIndices(client());
+    if (remoteClient() != null) {
+      wipeAllOpenSearchIndices(remoteClient());
+    }
+  }
+
+  protected static void wipeAllOpenSearchIndices(RestClient client) throws IOException {
     // include all the indices, included hidden indices.
     // https://www.elastic.co/guide/en/elasticsearch/reference/current/cat-indices.html#cat-indices-api-query-params
-    Response response = client().performRequest(new Request("GET", "/_cat/indices?format=json&expand_wildcards=all"));
+    Response response =
+        client.performRequest(new Request("GET", "/_cat/indices?format=json&expand_wildcards=all"));
     JSONArray jsonArray = new JSONArray(EntityUtils.toString(response.getEntity(), "UTF-8"));
     for (Object object : jsonArray) {
       JSONObject jsonObject = (JSONObject) object;
       String indexName = jsonObject.getString("index");
-      //.opendistro_security isn't allowed to delete from cluster
-      if (!indexName.startsWith(".opensearch_dashboards") && !indexName.startsWith(".opendistro")) {
-        client().performRequest(new Request("DELETE", "/" + indexName));
+      try {
+        // System index, mostly named .opensearch-xxx or .opendistro-xxx, are not allowed to delete
+        if (!indexName.startsWith(".opensearch")
+            && !indexName.startsWith(".opendistro")
+            && !indexName.startsWith(".ql")) {
+          client.performRequest(new Request("DELETE", "/" + indexName));
+        }
+      } catch (Exception e) {
+        // TODO: Ignore index delete error for now. Remove this if strict check on system index
+        // added above.
+        LOG.warn("Failed to delete index: " + indexName, e);
       }
     }
   }
 
+  /**
+   * Configure authentication and pass <b>builder</b> to superclass to configure other stuff.<br>
+   * By default, auth is configure when <b>https</b> is set only.
+   */
+  protected static void configureClient(RestClientBuilder builder, Settings settings)
+      throws IOException {
+    String userName = System.getProperty("user");
+    String password = System.getProperty("password");
+    if (userName != null && password != null) {
+      builder.setHttpClientConfigCallback(
+          httpClientBuilder -> {
+            BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(
+                new AuthScope(null, -1), new UsernamePasswordCredentials(userName, password));
+            return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+          });
+    }
+    OpenSearchRestTestCase.configureClient(builder, settings);
+  }
+
   protected static void configureHttpsClient(RestClientBuilder builder, Settings settings)
       throws IOException {
     Map<String, String> headers = ThreadContext.buildDefaultHeaders(settings);
@@ -89,34 +230,55 @@ protected static void configureHttpsClient(RestClientBuilder builder, Settings s
       defaultHeaders[i++] = new BasicHeader(entry.getKey(), entry.getValue());
     }
     builder.setDefaultHeaders(defaultHeaders);
-    builder.setHttpClientConfigCallback(httpClientBuilder -> {
-      String userName = Optional.ofNullable(System.getProperty("user"))
-          .orElseThrow(() -> new RuntimeException("user name is missing"));
-      String password = Optional.ofNullable(System.getProperty("password"))
-          .orElseThrow(() -> new RuntimeException("password is missing"));
-      CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-      credentialsProvider
-          .setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(userName, password));
-      try {
-        return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider)
-            //disable the certificate since our testing cluster just uses the default security configuration
-            .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE)
-            .setSSLContext(SSLContextBuilder.create()
-                .loadTrustMaterial(null, (chains, authType) -> true)
-                .build());
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    });
+    builder.setHttpClientConfigCallback(
+        httpClientBuilder -> {
+          String userName =
+              Optional.ofNullable(System.getProperty("user"))
+                  .orElseThrow(() -> new RuntimeException("user name is missing"));
+          String password =
+              Optional.ofNullable(System.getProperty("password"))
+                  .orElseThrow(() -> new RuntimeException("password is missing"));
+          CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+          credentialsProvider.setCredentials(
+              AuthScope.ANY, new UsernamePasswordCredentials(userName, password));
+          try {
+            return httpClientBuilder
+                .setDefaultCredentialsProvider(credentialsProvider)
+                // disable the certificate since our testing cluster just uses the default security
+                // configuration
+                .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE)
+                .setSSLContext(
+                    SSLContextBuilder.create()
+                        .loadTrustMaterial(null, (chains, authType) -> true)
+                        .build());
+          } catch (Exception e) {
+            throw new RuntimeException(e);
+          }
+        });
 
     final String socketTimeoutString = settings.get(CLIENT_SOCKET_TIMEOUT);
     final TimeValue socketTimeout =
-        TimeValue.parseTimeValue(socketTimeoutString == null ? "60s" : socketTimeoutString,
-            CLIENT_SOCKET_TIMEOUT);
+        TimeValue.parseTimeValue(
+            socketTimeoutString == null ? "60s" : socketTimeoutString, CLIENT_SOCKET_TIMEOUT);
     builder.setRequestConfigCallback(
         conf -> conf.setSocketTimeout(Math.toIntExact(socketTimeout.getMillis())));
     if (settings.hasValue(CLIENT_PATH_PREFIX)) {
       builder.setPathPrefix(settings.get(CLIENT_PATH_PREFIX));
     }
   }
+
+  /**
+   * Initialize rest client to remote cluster, and create a connection to it from the coordinating
+   * cluster.
+   */
+  public void configureMultiClusters(String remote) throws IOException {
+    initRemoteClient(remote);
+
+    Request connectionRequest = new Request("PUT", "_cluster/settings");
+    String connectionSetting =
+        String.format(
+            REMOTE_CLUSTER_SETTING, remote, getTestTransportCluster(remote).split(",")[0]);
+    connectionRequest.setJsonEntity(connectionSetting);
+    adminClient().performRequest(connectionRequest);
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/OrderIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/OrderIT.java
index c8b4b87f69..3e0191c009 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/OrderIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/OrderIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -76,17 +75,17 @@ public void orderByIsNull() throws IOException {
     assertThat(query(hits, "/0/_source/id"), equalTo("5"));
 
     // Another equivalent syntax
-    assertThat(explainQuery("SELECT * FROM opensearch-sql_test_index_order " +
-            "ORDER BY id IS NULL, id DESC"),
-        equalTo(explainQuery("SELECT * FROM opensearch-sql_test_index_order " +
-            "ORDER BY id IS NULL DESC"))
-    );
+    assertThat(
+        explainQuery(
+            "SELECT * FROM opensearch-sql_test_index_order " + "ORDER BY id IS NULL, id DESC"),
+        equalTo(
+            explainQuery(
+                "SELECT * FROM opensearch-sql_test_index_order " + "ORDER BY id IS NULL DESC")));
   }
 
   @Test
   public void orderByIsNotNull() throws IOException {
-    String query =
-        "SELECT id, name FROM opensearch-sql_test_index_order ORDER BY name IS NOT NULL";
+    String query = "SELECT id, name FROM opensearch-sql_test_index_order ORDER BY name IS NOT NULL";
     JSONArray result = getSortExplain(query);
     assertThat(1, equalTo(result.length()));
     assertThat(query(result, "/0/name.keyword/order"), equalTo("asc"));
@@ -95,21 +94,24 @@ public void orderByIsNotNull() throws IOException {
     JSONObject response = executeQuery(query);
     JSONArray hits = getHits(response);
     assertFalse(hits.getJSONObject(0).getJSONObject("_source").has("name"));
-    assertThat(hits.getJSONObject(hits.length() - 1).query("/_source/name").toString(),
-        equalTo("f"));
+    assertThat(
+        hits.getJSONObject(hits.length() - 1).query("/_source/name").toString(), equalTo("f"));
 
     // Another equivalent syntax
-    assertThat(explainQuery("SELECT id, name FROM opensearch-sql_test_index_order " +
-            "ORDER BY name IS NOT NULL"),
-        equalTo(explainQuery("SELECT id, name FROM opensearch-sql_test_index_order " +
-            "ORDER BY name IS NOT NULL ASC"))
-    );
+    assertThat(
+        explainQuery(
+            "SELECT id, name FROM opensearch-sql_test_index_order " + "ORDER BY name IS NOT NULL"),
+        equalTo(
+            explainQuery(
+                "SELECT id, name FROM opensearch-sql_test_index_order "
+                    + "ORDER BY name IS NOT NULL ASC")));
   }
 
   @Test
   public void multipleOrderByWithNulls() throws IOException {
     String query =
-        "SELECT id, name FROM opensearch-sql_test_index_order ORDER BY id IS NULL, name IS NOT NULL";
+        "SELECT id, name FROM opensearch-sql_test_index_order ORDER BY id IS NULL, name IS NOT"
+            + " NULL";
     JSONArray result = getSortExplain(query);
     assertThat(result.length(), equalTo(2));
     assertThat(query(result, "/0/id/missing"), equalTo("_last"));
@@ -118,8 +120,9 @@ public void multipleOrderByWithNulls() throws IOException {
 
   @Test
   public void testOrderByMergeForSameField() throws IOException {
-    String query = "SELECT * FROM opensearch-sql_test_index_order " +
-        "ORDER BY id IS NULL, name DESC, id DESC, id IS NOT NULL, name IS NULL";
+    String query =
+        "SELECT * FROM opensearch-sql_test_index_order "
+            + "ORDER BY id IS NULL, name DESC, id DESC, id IS NOT NULL, name IS NULL";
     JSONArray result = getSortExplain(query);
     assertThat(2, equalTo(result.length()));
     assertThat(query(result, "/0/id/order"), equalTo("asc"));
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/OrdinalAliasRewriterIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/OrdinalAliasRewriterIT.java
index ecec5844be..caea2aa7c6 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/OrdinalAliasRewriterIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/OrdinalAliasRewriterIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -23,125 +22,191 @@ protected void init() throws Exception {
   // tests query results with jdbc output
   @Test
   public void simpleGroupByOrdinal() {
-    String expected = executeQuery(StringUtils.format(
-        "SELECT lastname FROM %s AS b GROUP BY lastname LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
-    String actual = executeQuery(StringUtils.format(
-        "SELECT lastname FROM %s AS b GROUP BY 1 LIMIT 3", TestsConstants.TEST_INDEX_ACCOUNT),
-        "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT lastname FROM %s AS b GROUP BY lastname LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
+    String actual =
+        executeQuery(
+            StringUtils.format(
+                "SELECT lastname FROM %s AS b GROUP BY 1 LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
     assertThat(actual, equalTo(expected));
   }
 
   @Test
   public void multipleGroupByOrdinal() {
-    String expected = executeQuery(StringUtils.format(
-        "SELECT lastname, firstname, age FROM %s AS b GROUP BY firstname, age, lastname LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
-    String actual = executeQuery(StringUtils.format(
-        "SELECT lastname, firstname, age FROM %s AS b GROUP BY 2, 3, 1 LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT lastname, firstname, age FROM %s AS b GROUP BY firstname, age, lastname"
+                    + " LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
+    String actual =
+        executeQuery(
+            StringUtils.format(
+                "SELECT lastname, firstname, age FROM %s AS b GROUP BY 2, 3, 1 LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
     assertThat(actual, equalTo(expected));
   }
 
   @Test
   public void selectFieldiWithBacticksGroupByOrdinal() {
-    String expected = executeQuery(StringUtils.format(
-        "SELECT `lastname` FROM %s AS b GROUP BY `lastname` LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
-    String actual = executeQuery(StringUtils.format(
-        "SELECT `lastname` FROM %s AS b GROUP BY 1 LIMIT 3", TestsConstants.TEST_INDEX_ACCOUNT),
-        "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT `lastname` FROM %s AS b GROUP BY `lastname` LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
+    String actual =
+        executeQuery(
+            StringUtils.format(
+                "SELECT `lastname` FROM %s AS b GROUP BY 1 LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
     assertThat(actual, equalTo(expected));
   }
 
   @Test
   public void selectFieldiWithBacticksAndTableAliasGroupByOrdinal() {
-    String expected = executeQuery(StringUtils.format(
-        "SELECT `b`.`lastname`, `age`, firstname FROM %s AS b GROUP BY `age`, `b`.`lastname` , firstname LIMIT 10",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
-    String actual = executeQuery(StringUtils.format(
-        "SELECT `b`.`lastname`, `age`, firstname  FROM %s AS b GROUP BY 2, 1, 3 LIMIT 10",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname`, `age`, firstname FROM %s AS b GROUP BY `age`,"
+                    + " `b`.`lastname` , firstname LIMIT 10",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
+    String actual =
+        executeQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname`, `age`, firstname  FROM %s AS b GROUP BY 2, 1, 3 LIMIT 10",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
     assertThat(actual, equalTo(expected));
   }
 
   @Test
   public void simpleOrderByOrdinal() {
-    String expected = executeQuery(StringUtils.format(
-        "SELECT lastname FROM %s AS b ORDER BY lastname LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
-    String actual = executeQuery(StringUtils.format(
-        "SELECT lastname FROM %s AS b ORDER BY 1 LIMIT 3", TestsConstants.TEST_INDEX_ACCOUNT),
-        "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT lastname FROM %s AS b ORDER BY lastname LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
+    String actual =
+        executeQuery(
+            StringUtils.format(
+                "SELECT lastname FROM %s AS b ORDER BY 1 LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
     assertThat(actual, equalTo(expected));
   }
 
   @Test
   public void multipleOrderByOrdinal() {
-    String expected = executeQuery(StringUtils.format(
-        "SELECT lastname, firstname, age FROM %s AS b ORDER BY firstname, age, lastname LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
-    String actual = executeQuery(StringUtils.format(
-        "SELECT lastname, firstname, age FROM %s AS b ORDER BY 2, 3, 1 LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT lastname, firstname, age FROM %s AS b ORDER BY firstname, age, lastname"
+                    + " LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
+    String actual =
+        executeQuery(
+            StringUtils.format(
+                "SELECT lastname, firstname, age FROM %s AS b ORDER BY 2, 3, 1 LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
     assertThat(actual, equalTo(expected));
   }
 
   @Test
   public void selectFieldiWithBacticksOrderByOrdinal() {
-    String expected = executeQuery(StringUtils.format(
-        "SELECT `lastname` FROM %s AS b ORDER BY `lastname` LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
-    String actual = executeQuery(StringUtils.format(
-        "SELECT `lastname` FROM %s AS b ORDER BY 1 LIMIT 3", TestsConstants.TEST_INDEX_ACCOUNT),
-        "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT `lastname` FROM %s AS b ORDER BY `lastname` LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
+    String actual =
+        executeQuery(
+            StringUtils.format(
+                "SELECT `lastname` FROM %s AS b ORDER BY 1 LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
     assertThat(actual, equalTo(expected));
   }
 
   @Test
   public void selectFieldiWithBacticksAndTableAliasOrderByOrdinal() {
-    String expected = executeQuery(StringUtils.format(
-        "SELECT `b`.`lastname` FROM %s AS b ORDER BY `b`.`lastname` LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
-    String actual = executeQuery(StringUtils.format(
-        "SELECT `b`.`lastname` FROM %s AS b ORDER BY 1 LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname` FROM %s AS b ORDER BY `b`.`lastname` LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
+    String actual =
+        executeQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname` FROM %s AS b ORDER BY 1 LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
     assertThat(actual, equalTo(expected));
   }
 
   // ORDER BY IS NULL/NOT NULL
   @Test
   public void selectFieldiWithBacticksAndTableAliasOrderByOrdinalAndNull() {
-    String expected = executeQuery(StringUtils.format(
-        "SELECT `b`.`lastname`, age FROM %s AS b ORDER BY `b`.`lastname` IS NOT NULL DESC, age is NULL LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
-    String actual = executeQuery(StringUtils.format(
-        "SELECT `b`.`lastname`, age FROM %s AS b ORDER BY 1 IS NOT NULL DESC, 2 IS NULL LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT), "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname`, age FROM %s AS b ORDER BY `b`.`lastname` IS NOT NULL DESC,"
+                    + " age is NULL LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
+    String actual =
+        executeQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname`, age FROM %s AS b ORDER BY 1 IS NOT NULL DESC, 2 IS NULL"
+                    + " LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT),
+            "jdbc");
     assertThat(actual, equalTo(expected));
   }
 
-
   // explain
   @Test
   public void explainSelectFieldiWithBacticksAndTableAliasGroupByOrdinal() throws IOException {
-    String expected = explainQuery(StringUtils.format(
-        "SELECT `b`.`lastname` FROM %s AS b GROUP BY `b`.`lastname` LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT));
-    String actual = explainQuery(StringUtils.format(
-        "SELECT `b`.`lastname` FROM %s AS b GROUP BY 1 LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT));
+    String expected =
+        explainQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname` FROM %s AS b GROUP BY `b`.`lastname` LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    String actual =
+        explainQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname` FROM %s AS b GROUP BY 1 LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
     assertThat(actual, equalTo(expected));
   }
 
   @Test
   public void explainSelectFieldiWithBacticksAndTableAliasOrderByOrdinal() throws IOException {
-    String expected = explainQuery(StringUtils.format(
-        "SELECT `b`.`lastname` FROM %s AS b ORDER BY `b`.`lastname` LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT));
-    String actual = explainQuery(StringUtils.format(
-        "SELECT `b`.`lastname` FROM %s AS b ORDER BY 1 LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT));
+    String expected =
+        explainQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname` FROM %s AS b ORDER BY `b`.`lastname` LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    String actual =
+        explainQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname` FROM %s AS b ORDER BY 1 LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
     assertThat(actual, equalTo(expected));
   }
 
@@ -149,12 +214,18 @@ public void explainSelectFieldiWithBacticksAndTableAliasOrderByOrdinal() throws
   @Ignore("only work for legacy engine")
   public void explainSelectFieldiWithBacticksAndTableAliasOrderByOrdinalAndNull()
       throws IOException {
-    String expected = explainQuery(StringUtils.format(
-        "SELECT `b`.`lastname`, age FROM %s AS b ORDER BY `b`.`lastname` IS NOT NULL DESC, age is NULL LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT));
-    String actual = explainQuery(StringUtils.format(
-        "SELECT `b`.`lastname`, age FROM %s AS b ORDER BY 1 IS NOT NULL DESC, 2 IS NULL LIMIT 3",
-        TestsConstants.TEST_INDEX_ACCOUNT));
+    String expected =
+        explainQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname`, age FROM %s AS b ORDER BY `b`.`lastname` IS NOT NULL DESC,"
+                    + " age is NULL LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    String actual =
+        explainQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname`, age FROM %s AS b ORDER BY 1 IS NOT NULL DESC, 2 IS NULL"
+                    + " LIMIT 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
     assertThat(actual, equalTo(expected));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/PluginIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/PluginIT.java
index a0032e7e6a..0ea749a5bb 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/PluginIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/PluginIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -33,8 +32,9 @@ protected void init() throws Exception {
   public void sqlEnableSettingsTest() throws IOException {
     loadIndex(Index.ACCOUNT);
     updateClusterSettings(new ClusterSetting(PERSISTENT, "plugins.sql.enabled", "true"));
-    String query = String
-        .format(Locale.ROOT, "SELECT firstname FROM %s WHERE account_number=1", TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT, "SELECT firstname FROM %s WHERE account_number=1", TEST_INDEX_ACCOUNT);
     JSONObject queryResult = executeQuery(query);
     assertThat(getHits(queryResult).length(), equalTo(1));
 
@@ -50,16 +50,19 @@ public void sqlEnableSettingsTest() throws IOException {
     assertThat(queryResult.getInt("status"), equalTo(400));
     JSONObject error = queryResult.getJSONObject("error");
     assertThat(error.getString("reason"), equalTo("Invalid SQL query"));
-    assertThat(error.getString("details"), equalTo(
-        "Either plugins.sql.enabled or rest.action.multi.allow_explicit_index setting is false"));
+    assertThat(
+        error.getString("details"),
+        equalTo(
+            "Either plugins.sql.enabled or rest.action.multi.allow_explicit_index setting is"
+                + " false"));
     assertThat(error.getString("type"), equalTo("SQLFeatureDisabledException"));
     wipeAllClusterSettings();
   }
 
   @Test
   public void sqlDeleteSettingsTest() throws IOException {
-    updateClusterSettings(new ClusterSetting(PERSISTENT,
-        Settings.Key.SQL_DELETE_ENABLED.getKeyValue(), "false"));
+    updateClusterSettings(
+        new ClusterSetting(PERSISTENT, Settings.Key.SQL_DELETE_ENABLED.getKeyValue(), "false"));
 
     String deleteQuery = StringUtils.format("DELETE FROM %s", TestsConstants.TEST_INDEX_ACCOUNT);
     final ResponseException exception =
@@ -70,8 +73,8 @@ public void sqlDeleteSettingsTest() throws IOException {
             "{\n"
                 + "  \"error\": {\n"
                 + "    \"reason\": \"Invalid SQL query\",\n"
-                + "    \"details\": \"DELETE clause is disabled by default and will be deprecated. Using "
-                + "the plugins.sql.delete.enabled setting to enable it\",\n"
+                + "    \"details\": \"DELETE clause is disabled by default and will be deprecated."
+                + " Using the plugins.sql.delete.enabled setting to enable it\",\n"
                 + "    \"type\": \"SQLFeatureDisabledException\"\n"
                 + "  },\n"
                 + "  \"status\": 400\n"
@@ -84,329 +87,355 @@ public void sqlDeleteSettingsTest() throws IOException {
   @Test
   public void sqlTransientOnlySettingTest() throws IOException {
     // (1) compact form
-    String settings = "{" +
-        "  \"transient\": {" +
-        "    \"plugins.query.metrics.rolling_interval\": \"80\"" +
-        "  }" +
-        "}";
+    String settings =
+        "{"
+            + "  \"transient\": {"
+            + "    \"plugins.query.metrics.rolling_interval\": \"80\""
+            + "  }"
+            + "}";
     JSONObject actual = updateViaSQLSettingsAPI(settings);
-    JSONObject expected = new JSONObject("{" +
-        "  \"acknowledged\" : true," +
-        "  \"persistent\" : { }," +
-        "  \"transient\" : {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\" : {" +
-        "          \"rolling_interval\" : \"80\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}");
+    JSONObject expected =
+        new JSONObject(
+            "{"
+                + "  \"acknowledged\" : true,"
+                + "  \"persistent\" : { },"
+                + "  \"transient\" : {"
+                + "    \"plugins\" : {"
+                + "      \"query\" : {"
+                + "        \"metrics\" : {"
+                + "          \"rolling_interval\" : \"80\""
+                + "        }"
+                + "      }"
+                + "    }"
+                + "  }"
+                + "}");
     assertTrue(actual.similar(expected));
 
     // (2) partial expanded form
-    settings = "{" +
-        "  \"transient\": {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics.rolling_interval\": \"75\"" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}";
+    settings =
+        "{"
+            + "  \"transient\": {"
+            + "    \"plugins\" : {"
+            + "      \"query\" : {"
+            + "        \"metrics.rolling_interval\": \"75\""
+            + "      }"
+            + "    }"
+            + "  }"
+            + "}";
     actual = updateViaSQLSettingsAPI(settings);
-    expected = new JSONObject("{" +
-        "  \"acknowledged\" : true," +
-        "  \"persistent\" : { }," +
-        "  \"transient\" : {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\" : {" +
-        "          \"rolling_interval\" : \"75\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}");
+    expected =
+        new JSONObject(
+            "{"
+                + "  \"acknowledged\" : true,"
+                + "  \"persistent\" : { },"
+                + "  \"transient\" : {"
+                + "    \"plugins\" : {"
+                + "      \"query\" : {"
+                + "        \"metrics\" : {"
+                + "          \"rolling_interval\" : \"75\""
+                + "        }"
+                + "      }"
+                + "    }"
+                + "  }"
+                + "}");
     assertTrue(actual.similar(expected));
 
-
     // (3) full expanded form
-    settings = "{" +
-        "  \"transient\": {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\": {" +
-        "          \"rolling_interval\": \"65\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}";
+    settings =
+        "{"
+            + "  \"transient\": {"
+            + "    \"plugins\" : {"
+            + "      \"query\" : {"
+            + "        \"metrics\": {"
+            + "          \"rolling_interval\": \"65\""
+            + "        }"
+            + "      }"
+            + "    }"
+            + "  }"
+            + "}";
     actual = updateViaSQLSettingsAPI(settings);
-    expected = new JSONObject("{" +
-        "  \"acknowledged\" : true," +
-        "  \"persistent\" : { }," +
-        "  \"transient\" : {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\" : {" +
-        "          \"rolling_interval\" : \"65\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}");
+    expected =
+        new JSONObject(
+            "{"
+                + "  \"acknowledged\" : true,"
+                + "  \"persistent\" : { },"
+                + "  \"transient\" : {"
+                + "    \"plugins\" : {"
+                + "      \"query\" : {"
+                + "        \"metrics\" : {"
+                + "          \"rolling_interval\" : \"65\""
+                + "        }"
+                + "      }"
+                + "    }"
+                + "  }"
+                + "}");
     assertTrue(actual.similar(expected));
   }
 
   @Test
   public void sqlPersistentOnlySettingTest() throws IOException {
     // (1) compact form
-    String settings = "{" +
-        "  \"persistent\": {" +
-        "    \"plugins.query.metrics.rolling_interval\": \"80\"" +
-        "  }" +
-        "}";
+    String settings =
+        "{"
+            + "  \"persistent\": {"
+            + "    \"plugins.query.metrics.rolling_interval\": \"80\""
+            + "  }"
+            + "}";
     JSONObject actual = updateViaSQLSettingsAPI(settings);
-    JSONObject expected = new JSONObject("{" +
-        "  \"acknowledged\" : true," +
-        "  \"transient\" : { }," +
-        "  \"persistent\" : {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\" : {" +
-        "          \"rolling_interval\" : \"80\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}");
+    JSONObject expected =
+        new JSONObject(
+            "{"
+                + "  \"acknowledged\" : true,"
+                + "  \"transient\" : { },"
+                + "  \"persistent\" : {"
+                + "    \"plugins\" : {"
+                + "      \"query\" : {"
+                + "        \"metrics\" : {"
+                + "          \"rolling_interval\" : \"80\""
+                + "        }"
+                + "      }"
+                + "    }"
+                + "  }"
+                + "}");
     assertTrue(actual.similar(expected));
 
     // (2) partial expanded form
-    settings = "{" +
-        "  \"persistent\": {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics.rolling_interval\": \"75\"" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}";
+    settings =
+        "{"
+            + "  \"persistent\": {"
+            + "    \"plugins\" : {"
+            + "      \"query\" : {"
+            + "        \"metrics.rolling_interval\": \"75\""
+            + "      }"
+            + "    }"
+            + "  }"
+            + "}";
     actual = updateViaSQLSettingsAPI(settings);
-    expected = new JSONObject("{" +
-        "  \"acknowledged\" : true," +
-        "  \"transient\" : { }," +
-        "  \"persistent\" : {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\" : {" +
-        "          \"rolling_interval\" : \"75\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}");
+    expected =
+        new JSONObject(
+            "{"
+                + "  \"acknowledged\" : true,"
+                + "  \"transient\" : { },"
+                + "  \"persistent\" : {"
+                + "    \"plugins\" : {"
+                + "      \"query\" : {"
+                + "        \"metrics\" : {"
+                + "          \"rolling_interval\" : \"75\""
+                + "        }"
+                + "      }"
+                + "    }"
+                + "  }"
+                + "}");
     assertTrue(actual.similar(expected));
 
-
     // (3) full expanded form
-    settings = "{" +
-        "  \"persistent\": {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\": {" +
-        "          \"rolling_interval\": \"65\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}";
+    settings =
+        "{"
+            + "  \"persistent\": {"
+            + "    \"plugins\" : {"
+            + "      \"query\" : {"
+            + "        \"metrics\": {"
+            + "          \"rolling_interval\": \"65\""
+            + "        }"
+            + "      }"
+            + "    }"
+            + "  }"
+            + "}";
     actual = updateViaSQLSettingsAPI(settings);
-    expected = new JSONObject("{" +
-        "  \"acknowledged\" : true," +
-        "  \"transient\" : { }," +
-        "  \"persistent\" : {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\" : {" +
-        "          \"rolling_interval\" : \"65\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}");
+    expected =
+        new JSONObject(
+            "{"
+                + "  \"acknowledged\" : true,"
+                + "  \"transient\" : { },"
+                + "  \"persistent\" : {"
+                + "    \"plugins\" : {"
+                + "      \"query\" : {"
+                + "        \"metrics\" : {"
+                + "          \"rolling_interval\" : \"65\""
+                + "        }"
+                + "      }"
+                + "    }"
+                + "  }"
+                + "}");
     assertTrue(actual.similar(expected));
   }
 
   /**
-   * Both transient and persistent settings are applied for same settings.
-   * This is similar to _cluster/settings behavior
+   * Both transient and persistent settings are applied for same settings. This is similar to
+   * _cluster/settings behavior
    */
   @Test
   public void sqlCombinedSettingTest() throws IOException {
-    String settings = "{" +
-        "  \"transient\": {" +
-        "    \"plugins.query.metrics.rolling_window\": \"3700\"" +
-        "  }," +
-        "  \"persistent\": {" +
-        "    \"plugins.sql.slowlog\" : \"2\"" +
-        "  }" +
-        "}";
+    String settings =
+        "{"
+            + "  \"transient\": {"
+            + "    \"plugins.query.metrics.rolling_window\": \"3700\""
+            + "  },"
+            + "  \"persistent\": {"
+            + "    \"plugins.sql.slowlog\" : \"2\""
+            + "  }"
+            + "}";
     JSONObject actual = updateViaSQLSettingsAPI(settings);
-    JSONObject expected = new JSONObject("{" +
-        "  \"acknowledged\" : true," +
-        "  \"persistent\" : {" +
-        "    \"plugins\" : {" +
-        "      \"sql\" : {" +
-        "        \"slowlog\" : \"2\"" +
-        "      }" +
-        "    }" +
-        "  }," +
-        "  \"transient\" : {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\" : {" +
-        "          \"rolling_window\" : \"3700\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}");
+    JSONObject expected =
+        new JSONObject(
+            "{"
+                + "  \"acknowledged\" : true,"
+                + "  \"persistent\" : {"
+                + "    \"plugins\" : {"
+                + "      \"sql\" : {"
+                + "        \"slowlog\" : \"2\""
+                + "      }"
+                + "    }"
+                + "  },"
+                + "  \"transient\" : {"
+                + "    \"plugins\" : {"
+                + "      \"query\" : {"
+                + "        \"metrics\" : {"
+                + "          \"rolling_window\" : \"3700\""
+                + "        }"
+                + "      }"
+                + "    }"
+                + "  }"
+                + "}");
     assertTrue(actual.similar(expected));
   }
 
-  /**
-   * Ignore all non plugins.sql settings.
-   * Only settings starting with plugins.sql. are affected
-   */
+  /** Ignore all non plugins.sql settings. Only settings starting with plugins.sql. are affected */
   @Test
   public void ignoreNonSQLSettingsTest() throws IOException {
-    String settings = "{" +
-        "  \"transient\": {" +
-        "    \"plugins.query.metrics.rolling_window\": \"3700\"," +
-        "    \"plugins.alerting.metrics.rolling_window\": \"3700\"," +
-        "    \"search.max_buckets\": \"10000\"," +
-        "    \"search.max_keep_alive\": \"24h\"" +
-        "  }," +
-        "  \"persistent\": {" +
-        "    \"plugins.sql.slowlog\": \"2\"," +
-        "    \"plugins.alerting.metrics.rolling_window\": \"3700\"," +
-        "    \"thread_pool.analyze.queue_size\": \"16\"" +
-        "  }" +
-        "}";
+    String settings =
+        "{"
+            + "  \"transient\": {"
+            + "    \"plugins.query.metrics.rolling_window\": \"3700\","
+            + "    \"plugins.alerting.metrics.rolling_window\": \"3700\","
+            + "    \"search.max_buckets\": \"10000\","
+            + "    \"search.max_keep_alive\": \"24h\""
+            + "  },"
+            + "  \"persistent\": {"
+            + "    \"plugins.sql.slowlog\": \"2\","
+            + "    \"plugins.alerting.metrics.rolling_window\": \"3700\","
+            + "    \"thread_pool.analyze.queue_size\": \"16\""
+            + "  }"
+            + "}";
     JSONObject actual = updateViaSQLSettingsAPI(settings);
-    JSONObject expected = new JSONObject("{" +
-        "  \"acknowledged\" : true," +
-        "  \"persistent\" : {" +
-        "    \"plugins\" : {" +
-        "      \"sql\" : {" +
-        "        \"slowlog\" : \"2\"" +
-        "      }" +
-        "    }" +
-        "  }," +
-        "  \"transient\" : {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\" : {" +
-        "          \"rolling_window\" : \"3700\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}");
+    JSONObject expected =
+        new JSONObject(
+            "{"
+                + "  \"acknowledged\" : true,"
+                + "  \"persistent\" : {"
+                + "    \"plugins\" : {"
+                + "      \"sql\" : {"
+                + "        \"slowlog\" : \"2\""
+                + "      }"
+                + "    }"
+                + "  },"
+                + "  \"transient\" : {"
+                + "    \"plugins\" : {"
+                + "      \"query\" : {"
+                + "        \"metrics\" : {"
+                + "          \"rolling_window\" : \"3700\""
+                + "        }"
+                + "      }"
+                + "    }"
+                + "  }"
+                + "}");
     assertTrue(actual.similar(expected));
   }
 
   @Test
   public void ignoreNonTransientNonPersistentSettingsTest() throws IOException {
-    String settings = "{" +
-        "  \"transient\": {" +
-        "    \"plugins.query.metrics.rolling_window\": \"3700\"" +
-        "  }," +
-        "  \"persistent\": {" +
-        "    \"plugins.sql.slowlog\": \"2\"" +
-        "  }," +
-        "  \"hello\": {" +
-        "    \"world\" : {" +
-        "      \"name\" : \"John Doe\"" +
-        "    }" +
-        "  }" +
-        "}";
+    String settings =
+        "{"
+            + "  \"transient\": {"
+            + "    \"plugins.query.metrics.rolling_window\": \"3700\""
+            + "  },"
+            + "  \"persistent\": {"
+            + "    \"plugins.sql.slowlog\": \"2\""
+            + "  },"
+            + "  \"hello\": {"
+            + "    \"world\" : {"
+            + "      \"name\" : \"John Doe\""
+            + "    }"
+            + "  }"
+            + "}";
     JSONObject actual = updateViaSQLSettingsAPI(settings);
-    JSONObject expected = new JSONObject("{" +
-        "  \"acknowledged\" : true," +
-        "  \"persistent\" : {" +
-        "    \"plugins\" : {" +
-        "      \"sql\" : {" +
-        "        \"slowlog\" : \"2\"" +
-        "      }" +
-        "    }" +
-        "  }," +
-        "  \"transient\" : {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\" : {" +
-        "          \"rolling_window\" : \"3700\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}");
+    JSONObject expected =
+        new JSONObject(
+            "{"
+                + "  \"acknowledged\" : true,"
+                + "  \"persistent\" : {"
+                + "    \"plugins\" : {"
+                + "      \"sql\" : {"
+                + "        \"slowlog\" : \"2\""
+                + "      }"
+                + "    }"
+                + "  },"
+                + "  \"transient\" : {"
+                + "    \"plugins\" : {"
+                + "      \"query\" : {"
+                + "        \"metrics\" : {"
+                + "          \"rolling_window\" : \"3700\""
+                + "        }"
+                + "      }"
+                + "    }"
+                + "  }"
+                + "}");
     assertTrue(actual.similar(expected));
   }
 
   @Test
   public void sqlCombinedMixedSettingTest() throws IOException {
-    String settings = "{" +
-        "  \"transient\": {" +
-        "    \"plugins.query.metrics.rolling_window\": \"3700\"" +
-        "  }," +
-        "  \"persistent\": {" +
-        "    \"plugins\": {" +
-        "      \"sql\": {" +
-        "        \"slowlog\": \"1\"" +
-        "      }" +
-        "    }" +
-        "  }," +
-        "  \"hello\": {" +
-        "    \"world\": {" +
-        "      \"city\": \"Seattle\"" +
-        "    }" +
-        "  }" +
-        "}";
+    String settings =
+        "{"
+            + "  \"transient\": {"
+            + "    \"plugins.query.metrics.rolling_window\": \"3700\""
+            + "  },"
+            + "  \"persistent\": {"
+            + "    \"plugins\": {"
+            + "      \"sql\": {"
+            + "        \"slowlog\": \"1\""
+            + "      }"
+            + "    }"
+            + "  },"
+            + "  \"hello\": {"
+            + "    \"world\": {"
+            + "      \"city\": \"Seattle\""
+            + "    }"
+            + "  }"
+            + "}";
     JSONObject actual = updateViaSQLSettingsAPI(settings);
-    JSONObject expected = new JSONObject("{" +
-        "  \"acknowledged\" : true," +
-        "  \"persistent\" : {" +
-        "    \"plugins\" : {" +
-        "      \"sql\" : {" +
-        "        \"slowlog\" : \"1\"" +
-        "      }" +
-        "    }" +
-        "  }," +
-        "  \"transient\" : {" +
-        "    \"plugins\" : {" +
-        "      \"query\" : {" +
-        "        \"metrics\" : {" +
-        "          \"rolling_window\" : \"3700\"" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}");
+    JSONObject expected =
+        new JSONObject(
+            "{"
+                + "  \"acknowledged\" : true,"
+                + "  \"persistent\" : {"
+                + "    \"plugins\" : {"
+                + "      \"sql\" : {"
+                + "        \"slowlog\" : \"1\""
+                + "      }"
+                + "    }"
+                + "  },"
+                + "  \"transient\" : {"
+                + "    \"plugins\" : {"
+                + "      \"query\" : {"
+                + "        \"metrics\" : {"
+                + "          \"rolling_window\" : \"3700\""
+                + "        }"
+                + "      }"
+                + "    }"
+                + "  }"
+                + "}");
     assertTrue(actual.similar(expected));
   }
 
   @Test
   public void nonRegisteredSQLSettingsThrowException() throws IOException {
-    String settings = "{" +
-        "  \"transient\": {" +
-        "    \"plugins.sql.query.state.city\": \"Seattle\"" +
-        "  }" +
-        "}";
+    String settings =
+        "{"
+            + "  \"transient\": {"
+            + "    \"plugins.sql.query.state.city\": \"Seattle\""
+            + "  }"
+            + "}";
 
     JSONObject actual;
     Response response = null;
@@ -421,8 +450,7 @@ public void nonRegisteredSQLSettingsThrowException() throws IOException {
     assertThat(actual.query("/error/type"), equalTo("illegal_argument_exception"));
     assertThat(
         actual.query("/error/reason"),
-        equalTo("transient setting [plugins.sql.query.state.city], not recognized")
-    );
+        equalTo("transient setting [plugins.sql.query.state.city], not recognized"));
   }
 
   protected static JSONObject updateViaSQLSettingsAPI(String body) throws IOException {
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/PreparedStatementIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/PreparedStatementIT.java
index 88f72d1907..dd177ec1f1 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/PreparedStatementIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/PreparedStatementIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import java.io.IOException;
@@ -25,27 +24,34 @@ protected void init() throws Exception {
   public void testPreparedStatement() throws IOException {
     int ageToCompare = 35;
 
-    JSONObject response = executeRequest(String.format("{\n" +
-        "  \"query\": \"SELECT * FROM %s WHERE age > ? AND state in (?, ?) LIMIT ?\",\n" +
-        "  \"parameters\": [\n" +
-        "    {\n" +
-        "      \"type\": \"integer\",\n" +
-        "      \"value\": \"" + ageToCompare + "\"\n" +
-        "    },\n" +
-        "    {\n" +
-        "      \"type\": \"string\",\n" +
-        "      \"value\": \"TN\"\n" +
-        "    },\n" +
-        "    {\n" +
-        "      \"type\": \"string\",\n" +
-        "      \"value\": \"UT\"\n" +
-        "    },\n" +
-        "    {\n" +
-        "      \"type\": \"integer\",\n" +
-        "      \"value\": \"20\"\n" +
-        "    }\n" +
-        "  ]\n" +
-        "}", TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeRequest(
+            String.format(
+                "{\n"
+                    + "  \"query\": \"SELECT * FROM %s WHERE age > ? AND state in (?, ?) LIMIT"
+                    + " ?\",\n"
+                    + "  \"parameters\": [\n"
+                    + "    {\n"
+                    + "      \"type\": \"integer\",\n"
+                    + "      \"value\": \""
+                    + ageToCompare
+                    + "\"\n"
+                    + "    },\n"
+                    + "    {\n"
+                    + "      \"type\": \"string\",\n"
+                    + "      \"value\": \"TN\"\n"
+                    + "    },\n"
+                    + "    {\n"
+                    + "      \"type\": \"string\",\n"
+                    + "      \"value\": \"UT\"\n"
+                    + "    },\n"
+                    + "    {\n"
+                    + "      \"type\": \"integer\",\n"
+                    + "      \"value\": \"20\"\n"
+                    + "    }\n"
+                    + "  ]\n"
+                    + "}",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     Assert.assertTrue(response.has("hits"));
     Assert.assertTrue(response.getJSONObject("hits").has("hits"));
@@ -58,23 +64,23 @@ public void testPreparedStatement() throws IOException {
     }
   }
 
-    /* currently the integ test case will fail if run using Intellj, have to run using gradle command
-     * because the integ test cluster created by IntellJ has http diabled, need to spend some time later to
-     * figure out how to configure the integ test cluster properly. Related online resources:
-     *     https://discuss.elastic.co/t/http-enabled-with-OpenSearchIntegTestCase/102032
-     *     https://discuss.elastic.co/t/help-with-OpenSearchIntegTestCase/105245
-    @Override
-    protected Collection<Class<? extends Plugin>> nodePlugins() {
-        return Arrays.asList(MockTcpTransportPlugin.class);
-    }
+  /* currently the integ test case will fail if run using Intellj, have to run using gradle command
+   * because the integ test cluster created by IntellJ has http diabled, need to spend some time later to
+   * figure out how to configure the integ test cluster properly. Related online resources:
+   *     https://discuss.elastic.co/t/http-enabled-with-OpenSearchIntegTestCase/102032
+   *     https://discuss.elastic.co/t/help-with-OpenSearchIntegTestCase/105245
+  @Override
+  protected Collection<Class<? extends Plugin>> nodePlugins() {
+      return Arrays.asList(MockTcpTransportPlugin.class);
+  }
 
-    @Override
-    protected Settings nodeSettings(int nodeOrdinal) {
-        return Settings.builder().put(super.nodeSettings(nodeOrdinal))
-                // .put("node.mode", "network")
-                .put("http.enabled", true)
-                //.put("http.type", "netty4")
-                .build();
-    }
-    */
+  @Override
+  protected Settings nodeSettings(int nodeOrdinal) {
+      return Settings.builder().put(super.nodeSettings(nodeOrdinal))
+              // .put("node.mode", "network")
+              .put("http.enabled", true)
+              //.put("http.type", "netty4")
+              .build();
+  }
+  */
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/PrettyFormatResponseIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/PrettyFormatResponseIT.java
index 226645ce85..3247975a67 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/PrettyFormatResponseIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/PrettyFormatResponseIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static java.util.stream.Collectors.toSet;
@@ -30,28 +29,39 @@
 import org.opensearch.client.Request;
 
 /**
- * PrettyFormatResponseIT will likely be excluding some of the tests written in PrettyFormatResponseTest since
- * those tests were asserting on class objects directly. These updated tests will only be making assertions based
- * on the REST response.
- * <p>
- * Any integ tests from PrettyFormatResponseTest that were excluded can perhaps later be changed and moved over
- * to be unit tests.
- * <p>
- * Tests from original integ tests excluded:
- * - noIndexType()
- * - withIndexType()
+ * PrettyFormatResponseIT will likely be excluding some of the tests written in
+ * PrettyFormatResponseTest since those tests were asserting on class objects directly. These
+ * updated tests will only be making assertions based on the REST response.
+ *
+ * <p>Any integ tests from PrettyFormatResponseTest that were excluded can perhaps later be changed
+ * and moved over to be unit tests.
+ *
+ * <p>Tests from original integ tests excluded: - noIndexType() - withIndexType()
  */
 public class PrettyFormatResponseIT extends SQLIntegTestCase {
 
-  private static final Set<String> allAccountFields = Sets.newHashSet(
-      "account_number", "balance", "firstname", "lastname", "age", "gender", "address", "employer",
-      "email", "city", "state"
-  );
+  private static final Set<String> allAccountFields =
+      Sets.newHashSet(
+          "account_number",
+          "balance",
+          "firstname",
+          "lastname",
+          "age",
+          "gender",
+          "address",
+          "employer",
+          "email",
+          "city",
+          "state");
 
   private static final Set<String> regularFields = Sets.newHashSet("someField", "myNum");
 
-  private static final Set<String> messageFields = Sets.newHashSet(
-      "message.dayOfWeek", "message.info", "message.author");
+  private static final Set<String> messageFields =
+      Sets.newHashSet("message.dayOfWeek", "message.info", "message.author");
+
+  private static final Set<String> messageFieldsWithNestedFunction =
+      Sets.newHashSet(
+          "nested(message.dayOfWeek)", "nested(message.info)", "nested(message.author)");
 
   private static final Set<String> commentFields = Sets.newHashSet("comment.data", "comment.likes");
 
@@ -80,19 +90,20 @@ protected Request getSqlRequest(String request, boolean explain) {
   public void wrongIndexType() throws IOException {
     String type = "wrongType";
     try {
-      executeQuery(String.format(Locale.ROOT, "SELECT * FROM %s/%s",
-          TestsConstants.TEST_INDEX_ACCOUNT, type));
+      executeQuery(
+          String.format(
+              Locale.ROOT, "SELECT * FROM %s/%s", TestsConstants.TEST_INDEX_ACCOUNT, type));
     } catch (IllegalArgumentException e) {
-      assertThat(e.getMessage(),
-          is(String.format(Locale.ROOT, "Index type %s does not exist", type)));
+      assertThat(
+          e.getMessage(), is(String.format(Locale.ROOT, "Index type %s does not exist", type)));
     }
   }
 
   @Test
   public void selectAll() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(Locale.ROOT, "SELECT * FROM %s", TestsConstants.TEST_INDEX_ACCOUNT));
 
     // This also tests that .keyword fields are ignored when SELECT * is called
     assertContainsColumnsInAnyOrder(getSchema(response), allAccountFields);
@@ -101,9 +112,12 @@ public void selectAll() throws IOException {
 
   @Test
   public void selectNames() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT firstname, lastname FROM %s",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT firstname, lastname FROM %s",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     assertContainsColumns(getSchema(response), nameFields);
     assertContainsData(getDataRows(response), nameFields);
@@ -112,13 +126,15 @@ public void selectNames() throws IOException {
   @Ignore("Semantic analysis takes care of this")
   @Test
   public void selectWrongField() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT wrongField FROM %s",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT, "SELECT wrongField FROM %s", TestsConstants.TEST_INDEX_ACCOUNT));
 
     assertThat(getSchema(response).length(), equalTo(0));
 
-    // DataRows object will still get populated with SearchHits but since wrongField is not available in the Map
+    // DataRows object will still get populated with SearchHits but since wrongField is not
+    // available in the Map
     // each row in the response will be empty
     // TODO Perhaps a code change should be made to format logic to ensure a
     //  'datarows' length of 0 in response for this case
@@ -126,10 +142,14 @@ public void selectWrongField() throws IOException {
   }
 
   @Test
+  @Ignore("_score tested in V2 engine - @see org.opensearch.sql.sql.ScoreQueryIT")
   public void selectScore() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT _score FROM %s WHERE balance > 30000",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT _score FROM %s WHERE SCORE(match_phrase(phrase, 'brown fox'))",
+                TestsConstants.TEST_INDEX_PHRASE));
 
     List<String> fields = Collections.singletonList("_score");
     assertContainsColumns(getSchema(response), fields);
@@ -138,14 +158,14 @@ public void selectScore() throws IOException {
 
   @Test
   public void selectAllFromNestedWithoutFieldInFrom() throws IOException {
-    assertNestedFieldQueryResultContainsColumnsAndData("SELECT * FROM %s",
-        regularFields, fields("message", "comment"));
+    assertNestedFieldQueryResultContainsColumnsAndData(
+        "SELECT * FROM %s", regularFields, fields("message", "comment"));
   }
 
   @Test
   public void selectAllFromNestedWithFieldInFrom() throws IOException {
-    assertNestedFieldQueryResultContainsColumnsAndData("SELECT * FROM %s e, e.message m",
-        regularFields, messageFields);
+    assertNestedFieldQueryResultContainsColumnsAndData(
+        "SELECT * FROM %s e, e.message m", regularFields, messageFields);
   }
 
   @Test
@@ -157,29 +177,27 @@ public void selectAllFromNestedWithMultipleFieldsInFrom() throws IOException {
 
   @Test
   public void selectAllNestedFromNestedWithFieldInFrom() throws IOException {
-    assertNestedFieldQueryResultContainsColumnsAndData("SELECT m.* FROM %s e, e.message m",
-        messageFields);
+    assertNestedFieldQueryResultContainsColumnsAndData(
+        "SELECT m.* FROM %s e, e.message m", messageFields);
   }
 
   @Test
   public void selectSpecificRegularFieldAndAllFromNestedWithFieldInFrom() throws IOException {
     assertNestedFieldQueryResultContainsColumnsAndData(
-        "SELECT e.someField, m.* FROM %s e, e.message m",
-        fields("someField"), messageFields);
+        "SELECT e.someField, m.* FROM %s e, e.message m", fields("someField"), messageFields);
   }
 
   /**
-   * Execute the query against index with nested fields and assert result contains columns and data as expected.
+   * Execute the query against index with nested fields and assert result contains columns and data
+   * as expected.
    */
   @SafeVarargs
-  private final void assertNestedFieldQueryResultContainsColumnsAndData(String query,
-                                                                        Set<String>... expectedFieldNames)
-      throws IOException {
+  private final void assertNestedFieldQueryResultContainsColumnsAndData(
+      String query, Set<String>... expectedFieldNames) throws IOException {
     JSONObject response =
         executeQuery(String.format(Locale.ROOT, query, TestsConstants.TEST_INDEX_NESTED_TYPE));
-    Set<String> allExpectedFieldNames = Stream.of(expectedFieldNames).
-        flatMap(Set::stream).
-        collect(toSet());
+    Set<String> allExpectedFieldNames =
+        Stream.of(expectedFieldNames).flatMap(Set::stream).collect(toSet());
 
     assertContainsColumnsInAnyOrder(getSchema(response), allExpectedFieldNames);
     assertContainsData(getDataRows(response), allExpectedFieldNames);
@@ -191,37 +209,46 @@ private Set<String> fields(String... fieldNames) {
 
   @Test
   public void selectNestedFields() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT nested(message.info), someField FROM %s",
-            TestsConstants.TEST_INDEX_NESTED_TYPE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT nested(message.info), someField FROM %s",
+                TestsConstants.TEST_INDEX_NESTED_TYPE));
 
-    List<String> fields = Arrays.asList("message.info", "someField");
+    List<String> fields = Arrays.asList("nested(message.info)", "someField");
     assertContainsColumns(getSchema(response), fields);
     assertContainsData(getDataRows(response), fields);
 
-    // The nested test index being used contains 5 entries but one of them has an array of 2 message objects, so
+    // The nested test index being used contains 5 entries but one of them has an array of 2 message
+    // objects, so
     // we check to see if the amount of data rows is 6 since that is the result after flattening
     assertThat(getDataRows(response).length(), equalTo(6));
   }
 
   @Test
   public void selectNestedFieldWithWildcard() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT nested(message.*) FROM %s",
-            TestsConstants.TEST_INDEX_NESTED_TYPE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT nested(message.*) FROM %s",
+                TestsConstants.TEST_INDEX_NESTED_TYPE));
 
-    assertContainsColumnsInAnyOrder(getSchema(response), messageFields);
+    assertContainsColumnsInAnyOrder(getSchema(response), messageFieldsWithNestedFunction);
     assertContainsData(getDataRows(response), messageFields);
   }
 
   @Test
   public void selectWithWhere() throws IOException {
     int balanceToCompare = 30000;
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT balance " +
-                "FROM %s " +
-                "WHERE balance > %d",
-            TestsConstants.TEST_INDEX_ACCOUNT, balanceToCompare));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT balance " + "FROM %s " + "WHERE balance > %d",
+                TestsConstants.TEST_INDEX_ACCOUNT,
+                balanceToCompare));
 
     /*
      * Previously the DataRows map was used to check specific fields but the JDBC response for "datarows" is a
@@ -239,9 +266,10 @@ public void selectWithWhere() throws IOException {
 
   @Test
   public void groupBySingleField() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s GROUP BY age",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT, "SELECT * FROM %s GROUP BY age", TestsConstants.TEST_INDEX_ACCOUNT));
 
     List<String> fields = Collections.singletonList("age");
     assertContainsColumns(getSchema(response), fields);
@@ -250,9 +278,12 @@ public void groupBySingleField() throws IOException {
 
   @Test
   public void groupByMultipleFields() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s GROUP BY age, balance",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s GROUP BY age, balance",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     List<String> fields = Arrays.asList("age", "balance");
     assertContainsColumns(getSchema(response), fields);
@@ -261,35 +292,42 @@ public void groupByMultipleFields() throws IOException {
 
   @Ignore("only work for legacy engine")
   public void testSizeAndTotal() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE balance > 30000 " +
-                "LIMIT 5",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * " + "FROM %s " + "WHERE balance > 30000 " + "LIMIT 5",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     JSONArray dataRows = getDataRows(response);
     assertThat(dataRows.length(), equalTo(5));
 
-    // The value to compare to here was obtained by running the query in the plugin and looking at the SearchHits
+    // The value to compare to here was obtained by running the query in the plugin and looking at
+    // the SearchHits
     int totalHits = response.getInt("total");
     assertThat(totalHits, equalTo(402));
   }
 
   @Test
   public void testSizeWithGroupBy() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s GROUP BY age LIMIT 5",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s GROUP BY age LIMIT 5",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     assertThat(getDataRows(response).length(), equalTo(5));
   }
 
   @Test
   public void aggregationFunctionInSelect() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT COUNT(*) FROM %s GROUP BY age",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT COUNT(*) FROM %s GROUP BY age",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     List<String> fields = Arrays.asList("COUNT(*)");
     assertContainsColumns(getSchema(response), fields);
@@ -306,9 +344,12 @@ public void aggregationFunctionInSelect() throws IOException {
   @Ignore("In MySQL and our new engine, the original text in SELECT is used as final column name")
   @Test
   public void aggregationFunctionInSelectCaseCheck() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT count(*) FROM %s GROUP BY age",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT count(*) FROM %s GROUP BY age",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     List<String> fields = Arrays.asList("COUNT(*)");
     assertContainsColumns(getSchema(response), fields);
@@ -324,9 +365,12 @@ public void aggregationFunctionInSelectCaseCheck() throws IOException {
 
   @Ignore("only work for legacy engine")
   public void aggregationFunctionInSelectWithAlias() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT COUNT(*) AS total FROM %s GROUP BY age",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT COUNT(*) AS total FROM %s GROUP BY age",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     List<String> fields = Arrays.asList("total");
     assertContainsColumns(getSchema(response), fields);
@@ -342,8 +386,10 @@ public void aggregationFunctionInSelectWithAlias() throws IOException {
 
   @Test
   public void aggregationFunctionInSelectNoGroupBy() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT, "SELECT SUM(age) FROM %s",
-        TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT, "SELECT SUM(age) FROM %s", TestsConstants.TEST_INDEX_ACCOUNT));
 
     String ageSum = "SUM(age)";
     assertContainsColumns(getSchema(response), Collections.singletonList(ageSum));
@@ -359,9 +405,12 @@ public void aggregationFunctionInSelectNoGroupBy() throws IOException {
 
   @Test
   public void multipleAggregationFunctionsInSelect() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT COUNT(*), AVG(age) FROM %s GROUP BY age",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT COUNT(*), AVG(age) FROM %s GROUP BY age",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     List<String> fields = Arrays.asList("COUNT(*)", "AVG(age)");
     assertContainsColumns(getSchema(response), fields);
@@ -370,12 +419,12 @@ public void multipleAggregationFunctionsInSelect() throws IOException {
 
   @Test
   public void aggregationFunctionInHaving() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT,
-        "SELECT gender " +
-            "FROM %s " +
-            "GROUP BY gender " +
-            "HAVING count(*) > 500",
-        TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT gender " + "FROM %s " + "GROUP BY gender " + "HAVING count(*) > 500",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     String ageSum = "gender";
     assertContainsColumns(getSchema(response), Collections.singletonList(ageSum));
@@ -386,20 +435,24 @@ public void aggregationFunctionInHaving() throws IOException {
   }
 
   /**
-   * This case doesn't seem to be supported by the plugin at the moment.
-   * Looks like the painless script of the inner function is put inside the aggregation function but
-   * this syntax may not be correct since it returns 0 which is the default value (since 0 is returned in
-   * cases like COUNT(wrongField) as well).
+   * This case doesn't seem to be supported by the plugin at the moment. Looks like the painless
+   * script of the inner function is put inside the aggregation function but this syntax may not be
+   * correct since it returns 0 which is the default value (since 0 is returned in cases like
+   * COUNT(wrongField) as well).
    */
-//    @Test
-//    public void nestedAggregationFunctionInSelect() {
-//        String query = String.format(Locale.ROOT, "SELECT SUM(SQRT(age)) FROM age GROUP BY age", TEST_INDEX_ACCOUNT);
-//    }
+  //    @Test
+  //    public void nestedAggregationFunctionInSelect() {
+  //        String query = String.format(Locale.ROOT, "SELECT SUM(SQRT(age)) FROM age GROUP BY age",
+  // TEST_INDEX_ACCOUNT);
+  //    }
   @Test
   public void fieldsWithAlias() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT firstname AS first, age AS a FROM %s",
-            TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT firstname AS first, age AS a FROM %s",
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     Map<String, String> aliases = new HashMap<>();
     aliases.put("firstname", "first");
@@ -410,25 +463,32 @@ public void fieldsWithAlias() throws IOException {
 
   @Test
   public void indexWithMissingFields() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT phrase, insert_time2 " +
-                "FROM %s " +
-                "WHERE match_phrase(phrase, 'brown fox')",
-            TestsConstants.TEST_INDEX_PHRASE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT phrase, insert_time2 "
+                    + "FROM %s "
+                    + "WHERE match_phrase(phrase, 'brown fox')",
+                TestsConstants.TEST_INDEX_PHRASE));
 
     JSONArray dataRowEntry = getDataRows(response).getJSONArray(0);
     assertThat(dataRowEntry.length(), equalTo(2));
     assertThat(dataRowEntry.get(0), equalTo("brown fox"));
-    assertThat(dataRowEntry.get(1),
-        equalTo(JSONObject.NULL)); // TODO See if this null check is failing
+    assertThat(
+        dataRowEntry.get(1), equalTo(JSONObject.NULL)); // TODO See if this null check is failing
   }
 
   @Test
   public void joinQuery() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT b1.balance, b1.age, b2.firstname " +
-                "FROM %s b1 JOIN %s b2 ON b1.age = b2.age",
-            TestsConstants.TEST_INDEX_ACCOUNT, TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT b1.balance, b1.age, b2.firstname "
+                    + "FROM %s b1 JOIN %s b2 ON b1.age = b2.age",
+                TestsConstants.TEST_INDEX_ACCOUNT,
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     List<String> fields = Arrays.asList("b1.balance", "b1.age", "b2.firstname");
     assertContainsColumns(getSchema(response), fields);
@@ -437,9 +497,14 @@ public void joinQuery() throws IOException {
 
   @Test
   public void joinQueryWithAlias() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT, "SELECT b1.balance AS bal, " +
-            " b1.age AS age, b2.firstname AS name FROM %s b1 JOIN %s b2 ON b1.age = b2.age",
-        TestsConstants.TEST_INDEX_ACCOUNT, TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT b1.balance AS bal,  b1.age AS age, b2.firstname AS name FROM %s b1 JOIN %s"
+                    + " b2 ON b1.age = b2.age",
+                TestsConstants.TEST_INDEX_ACCOUNT,
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     Map<String, String> aliases = new HashMap<>();
     aliases.put("b1.balance", "bal");
@@ -452,16 +517,20 @@ public void joinQueryWithAlias() throws IOException {
 
   @Test
   public void joinQueryWithObjectFieldInSelect() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT c.name.firstname, d.name.lastname " +
-                "FROM %s c JOIN %s d ON d.hname = c.house",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES,
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT c.name.firstname, d.name.lastname "
+                    + "FROM %s c JOIN %s d ON d.hname = c.house",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES,
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     List<String> fields = Arrays.asList("c.name.firstname", "d.name.lastname");
     assertContainsColumns(getSchema(response), fields);
 
-    // d.name.lastname is null here since entries with hname don't have a name.lastname entry, so only length is
+    // d.name.lastname is null here since entries with hname don't have a name.lastname entry, so
+    // only length is
     // checked
     JSONArray dataRows = getDataRows(response);
     assertThat(dataRows.length(), greaterThan(0));
@@ -472,10 +541,13 @@ public void joinQueryWithObjectFieldInSelect() throws IOException {
 
   @Test
   public void joinQuerySelectOnlyOnOneTable() throws Exception {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT b1.age " +
-                "FROM %s b1 JOIN %s b2 ON b1.firstname = b2.firstname",
-            TestsConstants.TEST_INDEX_ACCOUNT, TestsConstants.TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT b1.age " + "FROM %s b1 JOIN %s b2 ON b1.firstname = b2.firstname",
+                TestsConstants.TEST_INDEX_ACCOUNT,
+                TestsConstants.TEST_INDEX_ACCOUNT));
 
     List<String> fields = Collections.singletonList("b1.age");
     assertContainsColumns(getSchema(response), fields);
@@ -504,8 +576,12 @@ private void testFieldOrder(final String[] expectedFields, final Object[] expect
       throws IOException {
 
     final String fields = String.join(", ", expectedFields);
-    final String query = String.format(Locale.ROOT, "SELECT %s FROM %s " +
-        "WHERE email='amberduke@pyrami.com'", fields, TestsConstants.TEST_INDEX_ACCOUNT);
+    final String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT %s FROM %s " + "WHERE email='amberduke@pyrami.com'",
+            fields,
+            TestsConstants.TEST_INDEX_ACCOUNT);
     final JSONObject result = executeQuery(query);
 
     for (int i = 0; i < expectedFields.length; ++i) {
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/PrettyFormatterIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/PrettyFormatterIT.java
index 463a0bc6db..c81839a6e5 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/PrettyFormatterIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/PrettyFormatterIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -29,16 +28,18 @@ protected void init() throws Exception {
   public void assertExplainPrettyFormatted() throws IOException {
     String query = StringUtils.format("SELECT firstname FROM %s", TEST_INDEX_ACCOUNT);
 
-    String notPrettyExplainOutputFilePath = TestUtils.getResourceFilePath(
-        "src/test/resources/expectedOutput/explainIT_format_not_pretty.json");
+    String notPrettyExplainOutputFilePath =
+        TestUtils.getResourceFilePath(
+            "src/test/resources/expectedOutput/explainIT_format_not_pretty.json");
     String notPrettyExplainOutput =
         Files.toString(new File(notPrettyExplainOutputFilePath), StandardCharsets.UTF_8);
 
     assertThat(executeExplainRequest(query, ""), equalTo(notPrettyExplainOutput));
     assertThat(executeExplainRequest(query, "pretty=false"), equalTo(notPrettyExplainOutput));
 
-    String prettyExplainOutputFilePath = TestUtils.getResourceFilePath(
-        "src/test/resources/expectedOutput/explainIT_format_pretty.json");
+    String prettyExplainOutputFilePath =
+        TestUtils.getResourceFilePath(
+            "src/test/resources/expectedOutput/explainIT_format_pretty.json");
     String prettyExplainOutput =
         Files.toString(new File(prettyExplainOutputFilePath), StandardCharsets.UTF_8);
 
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/QueryAnalysisIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/QueryAnalysisIT.java
index b18ce1c7f9..62a87d3bff 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/QueryAnalysisIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/QueryAnalysisIT.java
@@ -3,14 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.opensearch.rest.RestStatus.BAD_REQUEST;
-import static org.opensearch.rest.RestStatus.OK;
-import static org.opensearch.rest.RestStatus.SERVICE_UNAVAILABLE;
+import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
+import static org.opensearch.core.rest.RestStatus.OK;
+import static org.opensearch.core.rest.RestStatus.SERVICE_UNAVAILABLE;
 
 import java.io.IOException;
 import org.junit.Assert;
@@ -18,15 +17,13 @@
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;
 import org.opensearch.client.ResponseException;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.sql.legacy.antlr.semantic.SemanticAnalysisException;
 import org.opensearch.sql.legacy.antlr.syntax.SyntaxAnalysisException;
 import org.opensearch.sql.legacy.exception.SqlFeatureNotImplementedException;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-/**
- * Integration test for syntax and semantic analysis against query by new ANTLR parser.
- */
+/** Integration test for syntax and semantic analysis against query by new ANTLR parser. */
 public class QueryAnalysisIT extends SQLIntegTestCase {
 
   @Override
@@ -41,9 +38,7 @@ public void missingFromClauseShouldThrowSyntaxException() {
 
   @Test
   public void unsupportedOperatorShouldThrowSyntaxException() {
-    queryShouldThrowSyntaxException(
-        "SELECT * FROM opensearch-sql_test_index_bank WHERE age <=> 1"
-    );
+    queryShouldThrowSyntaxException("SELECT * FROM opensearch-sql_test_index_bank WHERE age <=> 1");
   }
 
   @Test
@@ -51,8 +46,8 @@ public void nonExistingFieldNameShouldThrowSemanticException() {
     queryShouldThrowSemanticException(
         "SELECT * FROM opensearch-sql_test_index_bank WHERE balance1 = 1000",
         "Field [balance1] cannot be found or used here."
-        //"Did you mean [balance]?"
-    );
+        // "Did you mean [balance]?"
+        );
   }
 
   @Test
@@ -60,16 +55,15 @@ public void nonExistingIndexAliasShouldThrowSemanticException() {
     queryShouldThrowSemanticException(
         "SELECT * FROM opensearch-sql_test_index_bank b WHERE a.balance = 1000",
         "Field [a.balance] cannot be found or used here."
-        //"Did you mean [b.balance]?"
-    );
+        // "Did you mean [b.balance]?"
+        );
   }
 
   @Test
   public void indexJoinNonNestedFieldShouldThrowSemanticException() {
     queryShouldThrowSemanticException(
         "SELECT * FROM opensearch-sql_test_index_bank b1, b1.firstname f1",
-        "Operator [JOIN] cannot work with [INDEX, KEYWORD]."
-    );
+        "Operator [JOIN] cannot work with [INDEX, KEYWORD].");
   }
 
   @Test
@@ -77,8 +71,7 @@ public void scalarFunctionCallWithTypoInNameShouldThrowSemanticException() {
     queryShouldThrowSemanticException(
         "SELECT * FROM opensearch-sql_test_index_bank WHERE ABSa(age) = 1",
         "Function [ABSA] cannot be found or used here.",
-        "Did you mean [ABS]?"
-    );
+        "Did you mean [ABS]?");
   }
 
   @Test
@@ -86,17 +79,16 @@ public void scalarFunctionCallWithWrongTypeArgumentShouldThrowSemanticException(
     queryShouldThrowSemanticException(
         "SELECT * FROM opensearch-sql_test_index_bank WHERE LOG(lastname) = 1",
         "Function [LOG] cannot work with [KEYWORD].",
-        "Usage: LOG(NUMBER T) -> DOUBLE or LOG(NUMBER T, NUMBER) -> DOUBLE"
-    );
+        "Usage: LOG(NUMBER T) -> DOUBLE or LOG(NUMBER T, NUMBER) -> DOUBLE");
   }
 
   @Test
   public void aggregateFunctionCallWithWrongNumberOfArgumentShouldThrowSemanticException() {
     queryShouldThrowSemanticException(
-        "SELECT city FROM opensearch-sql_test_index_bank GROUP BY city HAVING MAX(age, birthdate) > 1",
+        "SELECT city FROM opensearch-sql_test_index_bank GROUP BY city HAVING MAX(age, birthdate) >"
+            + " 1",
         "Function [MAX] cannot work with [INTEGER, DATE].",
-        "Usage: MAX(NUMBER T) -> T"
-    );
+        "Usage: MAX(NUMBER T) -> T");
   }
 
   @Test
@@ -104,8 +96,7 @@ public void compareIntegerFieldWithBooleanShouldThrowSemanticException() {
     queryShouldThrowSemanticException(
         "SELECT * FROM opensearch-sql_test_index_bank b WHERE b.age IS FALSE",
         "Operator [IS] cannot work with [INTEGER, BOOLEAN].",
-        "Usage: Please use compatible types from each side."
-    );
+        "Usage: Please use compatible types from each side.");
   }
 
   @Test
@@ -113,8 +104,7 @@ public void compareNumberFieldWithStringShouldThrowSemanticException() {
     queryShouldThrowSemanticException(
         "SELECT * FROM opensearch-sql_test_index_bank b WHERE b.age >= 'test'",
         "Operator [>=] cannot work with [INTEGER, STRING].",
-        "Usage: Please use compatible types from each side."
-    );
+        "Usage: Please use compatible types from each side.");
   }
 
   @Test
@@ -122,43 +112,38 @@ public void compareLogFunctionCallWithNumberFieldWithStringShouldThrowSemanticEx
     queryShouldThrowSemanticException(
         "SELECT * FROM opensearch-sql_test_index_bank b WHERE LOG(b.balance) != 'test'",
         "Operator [!=] cannot work with [DOUBLE, STRING].",
-        "Usage: Please use compatible types from each side."
-    );
+        "Usage: Please use compatible types from each side.");
   }
 
   @Test
   public void unionNumberFieldWithStringShouldThrowSemanticException() {
     queryShouldThrowSemanticException(
-        "SELECT age FROM opensearch-sql_test_index_bank" +
-            " UNION SELECT address FROM opensearch-sql_test_index_bank",
-        "Operator [UNION] cannot work with [INTEGER, TEXT]."
-    );
+        "SELECT age FROM opensearch-sql_test_index_bank"
+            + " UNION SELECT address FROM opensearch-sql_test_index_bank",
+        "Operator [UNION] cannot work with [INTEGER, TEXT].");
   }
 
   @Test
   public void minusBooleanFieldWithDateShouldThrowSemanticException() {
     queryShouldThrowSemanticException(
-        "SELECT male FROM opensearch-sql_test_index_bank" +
-            " MINUS SELECT birthdate FROM opensearch-sql_test_index_bank",
-        "Operator [MINUS] cannot work with [BOOLEAN, DATE]."
-    );
+        "SELECT male FROM opensearch-sql_test_index_bank"
+            + " MINUS SELECT birthdate FROM opensearch-sql_test_index_bank",
+        "Operator [MINUS] cannot work with [BOOLEAN, DATE].");
   }
 
   @Test
   public void useInClauseWithIncompatibleFieldTypesShouldFail() {
     queryShouldThrowSemanticException(
-        "SELECT * FROM opensearch-sql_test_index_bank WHERE male " +
-            " IN (SELECT 1 FROM opensearch-sql_test_index_bank)",
-        "Operator [IN] cannot work with [BOOLEAN, INTEGER]."
-    );
+        "SELECT * FROM opensearch-sql_test_index_bank WHERE male "
+            + " IN (SELECT 1 FROM opensearch-sql_test_index_bank)",
+        "Operator [IN] cannot work with [BOOLEAN, INTEGER].");
   }
 
   @Test
   public void queryWithNestedFunctionShouldFail() {
     queryShouldThrowFeatureNotImplementedException(
         "SELECT abs(log(balance)) FROM opensearch-sql_test_index_bank",
-        "Nested function calls like [abs(log(balance))] are not supported yet"
-    );
+        "Nested function calls like [abs(log(balance))] are not supported yet");
   }
 
   @Test
@@ -170,29 +155,24 @@ public void nestedFunctionWithMathConstantAsInnerFunctionShouldPass() {
   public void aggregateWithFunctionAggregatorShouldFail() {
     queryShouldThrowFeatureNotImplementedException(
         "SELECT max(log(age)) FROM opensearch-sql_test_index_bank",
-        "Aggregation calls with function aggregator like [max(log(age))] are not supported yet"
-    );
+        "Aggregation calls with function aggregator like [max(log(age))] are not supported yet");
   }
 
   @Test
   public void queryWithUnsupportedFunctionShouldFail() {
     queryShouldThrowFeatureNotImplementedException(
         "SELECT balance DIV age FROM opensearch-sql_test_index_bank",
-        "Operator [DIV] is not supported yet"
-    );
+        "Operator [DIV] is not supported yet");
   }
 
   @Test
   public void useNegativeNumberConstantShouldPass() {
     queryShouldPassAnalysis(
-        "SELECT * FROM opensearch-sql_test_index_bank " +
-            "WHERE age > -1 AND balance < -123.456789"
-    );
+        "SELECT * FROM opensearch-sql_test_index_bank "
+            + "WHERE age > -1 AND balance < -123.456789");
   }
 
-  /**
-   * Run the query with cluster setting changed and cleaned after complete
-   */
+  /** Run the query with cluster setting changed and cleaned after complete */
   private void runWithClusterSetting(ClusterSetting setting, Runnable query) {
     try {
       updateClusterSettings(setting);
@@ -201,7 +181,8 @@ private void runWithClusterSetting(ClusterSetting setting, Runnable query) {
       throw new IllegalStateException(
           StringUtils.format("Exception raised when running with cluster setting [%s]", setting));
     } finally {
-      // Clean up or OpenSearch will throw java.lang.AssertionError: test leaves persistent cluster metadata behind
+      // Clean up or OpenSearch will throw java.lang.AssertionError: test leaves persistent cluster
+      // metadata behind
       try {
         updateClusterSettings(setting.nullify());
       } catch (IOException e) {
@@ -218,20 +199,19 @@ private void queryShouldThrowSemanticException(String query, String... expectedM
     queryShouldThrowException(query, SemanticAnalysisException.class, expectedMsgs);
   }
 
-  private void queryShouldThrowFeatureNotImplementedException(String query,
-                                                              String... expectedMsgs) {
-    queryShouldThrowExceptionWithRestStatus(query, SqlFeatureNotImplementedException.class,
-        SERVICE_UNAVAILABLE, expectedMsgs);
+  private void queryShouldThrowFeatureNotImplementedException(
+      String query, String... expectedMsgs) {
+    queryShouldThrowExceptionWithRestStatus(
+        query, SqlFeatureNotImplementedException.class, SERVICE_UNAVAILABLE, expectedMsgs);
   }
 
-  private <T> void queryShouldThrowException(String query, Class<T> exceptionType,
-                                             String... expectedMsgs) {
+  private <T> void queryShouldThrowException(
+      String query, Class<T> exceptionType, String... expectedMsgs) {
     queryShouldThrowExceptionWithRestStatus(query, exceptionType, BAD_REQUEST, expectedMsgs);
   }
 
-  private <T> void queryShouldThrowExceptionWithRestStatus(String query, Class<T> exceptionType,
-                                                           RestStatus status,
-                                                           String... expectedMsgs) {
+  private <T> void queryShouldThrowExceptionWithRestStatus(
+      String query, Class<T> exceptionType, RestStatus status, String... expectedMsgs) {
     try {
       executeQuery(query);
       Assert.fail("Expected ResponseException, but none was thrown for query: " + query);
@@ -244,8 +224,8 @@ private <T> void queryShouldThrowExceptionWithRestStatus(String query, Class<T>
       }
     } catch (IOException e) {
       throw new IllegalStateException(
-          "Unexpected IOException raised rather than expected AnalysisException for query: " +
-              query);
+          "Unexpected IOException raised rather than expected AnalysisException for query: "
+              + query);
     }
   }
 
@@ -285,5 +265,4 @@ void assertBodyContains(String content) {
       assertThat(body, containsString(content));
     }
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/QueryFunctionsIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/QueryFunctionsIT.java
index 82972059a1..0a22fbc988 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/QueryFunctionsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/QueryFunctionsIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.anyOf;
@@ -14,6 +13,7 @@
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_NESTED_TYPE;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_PHRASE;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -29,10 +29,9 @@
 import org.junit.Test;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.SearchHit;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
@@ -44,10 +43,10 @@ public class QueryFunctionsIT extends SQLIntegTestCase {
   private static final String FROM_PHRASE = "FROM " + TEST_INDEX_PHRASE;
 
   /**
-   * TODO Looks like Math/Date Functions test all use the same query() and execute() functions
-   * TODO execute/featureValueOf/hits functions are the same as used in NestedFieldQueryIT, should refactor into util
+   * TODO Looks like Math/Date Functions test all use the same query() and execute() functions TODO
+   * execute/featureValueOf/hits functions are the same as used in NestedFieldQueryIT, should
+   * refactor into util
    */
-
   @Override
   protected void init() throws Exception {
     loadIndex(Index.ACCOUNT);
@@ -58,63 +57,39 @@ protected void init() throws Exception {
   @Test
   public void query() throws IOException {
     assertThat(
-        query(
-            "SELECT state",
-            FROM_ACCOUNTS,
-            "WHERE QUERY('CA')"
-        ),
-        hits(
-            hasValueForFields("CA", "state")
-        )
-    );
+        query("SELECT state", FROM_ACCOUNTS, "WHERE QUERY('CA')"),
+        hits(hasValueForFields("CA", "state")));
   }
 
   @Test
   public void matchQueryRegularField() throws IOException {
     assertThat(
-        query(
-            "SELECT firstname",
-            FROM_ACCOUNTS,
-            "WHERE MATCH_QUERY(firstname, 'Ayers')"
-        ),
-        hits(
-            hasValueForFields("Ayers", "firstname")
-        )
-    );
+        query("SELECT firstname", FROM_ACCOUNTS, "WHERE MATCH_QUERY(firstname, 'Ayers')"),
+        hits(hasValueForFields("Ayers", "firstname")));
   }
 
   @Test
   public void matchQueryNestedField() throws IOException {
     SearchHit[] hits =
         query("SELECT comment.data", FROM_NESTED, "WHERE MATCH_QUERY(NESTED(comment.data), 'aa')")
-            .getHits().getHits();
+            .getHits()
+            .getHits();
     Map<String, Object> source = hits[0].getSourceAsMap();
     // SearchHits innerHits = hits[0].getInnerHits().get("comment");
     assertThat(
-        query(
-            "SELECT comment.data",
-            FROM_NESTED,
-            "WHERE MATCH_QUERY(NESTED(comment.data), 'aa')"
-        ),
+        query("SELECT comment.data", FROM_NESTED, "WHERE MATCH_QUERY(NESTED(comment.data), 'aa')"),
         hits(
-            anyOf(hasNestedField("comment", "data", "aa"),
-                hasNestedArrayField("comment", "data", "aa"))
-        )
-    );
+            anyOf(
+                hasNestedField("comment", "data", "aa"),
+                hasNestedArrayField("comment", "data", "aa"))));
   }
 
   @Test
   public void scoreQuery() throws IOException {
     assertThat(
         query(
-            "SELECT firstname",
-            FROM_ACCOUNTS,
-            "WHERE SCORE(MATCH_QUERY(firstname, 'Ayers'), 10)"
-        ),
-        hits(
-            hasValueForFields("Ayers", "firstname")
-        )
-    );
+            "SELECT firstname", FROM_ACCOUNTS, "WHERE SCORE(MATCH_QUERY(firstname, 'Ayers'), 10)"),
+        hits(hasValueForFields("Ayers", "firstname")));
   }
 
   @Test
@@ -123,42 +98,24 @@ public void scoreQueryWithNestedField() throws IOException {
         query(
             "SELECT comment.data",
             FROM_NESTED,
-            "WHERE SCORE(MATCH_QUERY(NESTED(comment.data), 'ab'), 10)"
-        ),
+            "WHERE SCORE(MATCH_QUERY(NESTED(comment.data), 'ab'), 10)"),
         hits(
-            //hasValueForFields("ab", "comment.data")
-            hasNestedField("comment",
-                "data", "ab")
-        )
-    );
+            // hasValueForFields("ab", "comment.data")
+            hasNestedField("comment", "data", "ab")));
   }
 
   @Test
   public void wildcardQuery() throws IOException {
     assertThat(
-        query(
-            "SELECT city",
-            FROM_ACCOUNTS,
-            "WHERE WILDCARD_QUERY(city.keyword, 'B*')"
-        ),
-        hits(
-            hasFieldWithPrefix("city", "B")
-        )
-    );
+        query("SELECT city", FROM_ACCOUNTS, "WHERE WILDCARD_QUERY(city.keyword, 'B*')"),
+        hits(hasFieldWithPrefix("city", "B")));
   }
 
   @Test
   public void matchPhraseQuery() throws IOException {
     assertThat(
-        query(
-            "SELECT phrase",
-            FROM_PHRASE,
-            "WHERE MATCH_PHRASE(phrase, 'brown fox')"
-        ),
-        hits(
-            hasValueForFields("brown fox", "phrase")
-        )
-    );
+        query("SELECT phrase", FROM_PHRASE, "WHERE MATCH_PHRASE(phrase, 'brown fox')"),
+        hits(hasValueForFields("brown fox", "phrase")));
   }
 
   @Test
@@ -167,12 +124,8 @@ public void multiMatchQuerySingleField() throws IOException {
         query(
             "SELECT firstname",
             FROM_ACCOUNTS,
-            "WHERE MULTI_MATCH('query'='Ayers', 'fields'='firstname')"
-        ),
-        hits(
-            hasValueForFields("Ayers", "firstname")
-        )
-    );
+            "WHERE MULTI_MATCH('query'='Ayers', 'fields'='firstname')"),
+        hits(hasValueForFields("Ayers", "firstname")));
   }
 
   @Test
@@ -181,36 +134,30 @@ public void multiMatchQueryWildcardField() throws IOException {
         query(
             "SELECT firstname, lastname",
             FROM_ACCOUNTS,
-            "WHERE MULTI_MATCH('query'='Bradshaw', 'fields'='*name')"
-        ),
-        hits(
-            hasValueForFields("Bradshaw", "firstname", "lastname")
-        )
-    );
+            "WHERE MULTI_MATCH('query'='Bradshaw', 'fields'='*name')"),
+        hits(hasValueForFields("Bradshaw", "firstname", "lastname")));
   }
 
   @Test
   public void numberLiteralInSelectField() {
     assertTrue(
-        executeQuery(StringUtils.format("SELECT 234234 AS number from %s", TEST_INDEX_ACCOUNT),
-            "jdbc")
-            .contains("234234")
-    );
+        executeQuery(
+                StringUtils.format("SELECT 234234 AS number from %s", TEST_INDEX_ACCOUNT), "jdbc")
+            .contains("234234"));
 
     assertTrue(
-        executeQuery(StringUtils.format("SELECT 2.34234 AS number FROM %s", TEST_INDEX_ACCOUNT),
-            "jdbc")
-            .contains("2.34234")
-    );
+        executeQuery(
+                StringUtils.format("SELECT 2.34234 AS number FROM %s", TEST_INDEX_ACCOUNT), "jdbc")
+            .contains("2.34234"));
   }
 
   private final Matcher<SearchResponse> hits(Matcher<SearchHit> subMatcher) {
-    return featureValueOf("hits", everyItem(subMatcher),
-        resp -> Arrays.asList(resp.getHits().getHits()));
+    return featureValueOf(
+        "hits", everyItem(subMatcher), resp -> Arrays.asList(resp.getHits().getHits()));
   }
 
-  private <T, U> FeatureMatcher<T, U> featureValueOf(String name, Matcher<U> subMatcher,
-                                                     Function<T, U> getter) {
+  private <T, U> FeatureMatcher<T, U> featureValueOf(
+      String name, Matcher<U> subMatcher, Function<T, U> getter) {
     return new FeatureMatcher<T, U>(subMatcher, name, name) {
       @Override
       protected U featureValueOf(T actual) {
@@ -220,44 +167,39 @@ protected U featureValueOf(T actual) {
   }
 
   /**
-   * Create Matchers for each field and its value
-   * Only one of the Matchers need to match (per hit)
-   * <p>
-   * Ex. If a query with wildcard field is made:
-   * multi_match(query="Ayers", fields="*name")
-   * <p>
-   * Then the value "Ayers" can be found in either the firstname or lastname field. Only one of these fields
-   * need to satisfy the query value to be evaluated as correct expected output.
+   * Create Matchers for each field and its value Only one of the Matchers need to match (per hit)
+   *
+   * <p>Ex. If a query with wildcard field is made: multi_match(query="Ayers", fields="*name")
    *
-   * @param value  The value to match for a field in the sourceMap
+   * <p>Then the value "Ayers" can be found in either the firstname or lastname field. Only one of
+   * these fields need to satisfy the query value to be evaluated as correct expected output.
+   *
+   * @param value The value to match for a field in the sourceMap
    * @param fields A list of fields to match
    */
   @SafeVarargs
   private final Matcher<SearchHit> hasValueForFields(String value, String... fields) {
     return anyOf(
-        Arrays.asList(fields).
-            stream().
-            map(field -> kv(field, is(value))).
-            collect(Collectors.toList()));
+        Arrays.asList(fields).stream()
+            .map(field -> kv(field, is(value)))
+            .collect(Collectors.toList()));
   }
 
   private final Matcher<SearchHit> hasFieldWithPrefix(String field, String prefix) {
-    return featureValueOf(field, startsWith(prefix),
-        hit -> (String) hit.getSourceAsMap().get(field));
+    return featureValueOf(
+        field, startsWith(prefix), hit -> (String) hit.getSourceAsMap().get(field));
   }
 
   private final Matcher<SearchHit> hasNestedField(String path, String field, String value) {
-    return featureValueOf(field, is(value),
-        hit -> ((HashMap) hit.getSourceAsMap().get(path)).get(field));
+    return featureValueOf(
+        field, is(value), hit -> ((HashMap) hit.getSourceAsMap().get(path)).get(field));
   }
 
   private final Matcher<SearchHit> hasNestedArrayField(String path, String field, String value) {
 
     return new BaseMatcher<SearchHit>() {
       @Override
-      public void describeTo(Description description) {
-
-      }
+      public void describeTo(Description description) {}
 
       @Override
       public boolean matches(Object item) {
@@ -275,7 +217,7 @@ private Matcher<SearchHit> kv(String key, Matcher<Object> valMatcher) {
   }
 
   /***********************************************************
-   Query Utility to Fetch Response for SQL
+   * Query Utility to Fetch Response for SQL
    ***********************************************************/
 
   private SearchResponse query(String select, String from, String... statements)
@@ -286,10 +228,11 @@ private SearchResponse query(String select, String from, String... statements)
   private SearchResponse execute(String sql) throws IOException {
     final JSONObject jsonObject = executeQuery(sql);
 
-    final XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(
-        NamedXContentRegistry.EMPTY,
-        LoggingDeprecationHandler.INSTANCE,
-        jsonObject.toString());
+    final XContentParser parser =
+        new JsonXContentParser(
+            NamedXContentRegistry.EMPTY,
+            LoggingDeprecationHandler.INSTANCE,
+            new JsonFactory().createParser(jsonObject.toString()));
     return SearchResponse.fromXContent(parser);
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/QueryIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/QueryIT.java
index eeff107f15..f94b80686e 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/QueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/QueryIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.allOf;
@@ -38,29 +37,24 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.opensearch.client.ResponseException;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
 public class QueryIT extends SQLIntegTestCase {
 
   /**
    * Currently commenting out tests related to JoinType index since there is an issue with mapping.
-   * <p>
-   * Also ignoring the following tests as they are failing, will require investigation:
-   * - idsQuerySubQueryIds
-   * - escapedCharactersCheck
-   * - fieldCollapsingTest
-   * - idsQueryOneId
-   * - idsQueryMultipleId
-   * - multipleIndicesOneNotExistWithoutHint
-   * <p>
-   * The following tests are being ignored because subquery is still running in OpenSearch transport thread:
-   * - twoSubQueriesTest()
-   * - inTermsSubQueryTest()
+   *
+   * <p>Also ignoring the following tests as they are failing, will require investigation: -
+   * idsQuerySubQueryIds - escapedCharactersCheck - fieldCollapsingTest - idsQueryOneId -
+   * idsQueryMultipleId - multipleIndicesOneNotExistWithoutHint
+   *
+   * <p>The following tests are being ignored because subquery is still running in OpenSearch
+   * transport thread: - twoSubQueriesTest() - inTermsSubQueryTest()
    */
+  static final int BANK_INDEX_MALE_TRUE = 4;
 
-  final static int BANK_INDEX_MALE_TRUE = 4;
-  final static int BANK_INDEX_MALE_FALSE = 3;
+  static final int BANK_INDEX_MALE_FALSE = 3;
 
   @Override
   protected void init() throws Exception {
@@ -87,92 +81,87 @@ public void queryEndWithSemiColonTest() {
 
   @Test
   public void searchTypeTest() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT, "SELECT * FROM %s LIMIT 1000",
-        TestsConstants.TEST_INDEX_PHRASE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT, "SELECT * FROM %s LIMIT 1000", TestsConstants.TEST_INDEX_PHRASE));
     Assert.assertTrue(response.has("hits"));
     Assert.assertEquals(6, getTotalHits(response));
   }
 
   @Test
   public void multipleFromTest() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT,
-        "SELECT * FROM %s, %s LIMIT 2000",
-        TestsConstants.TEST_INDEX_BANK, TestsConstants.TEST_INDEX_BANK_TWO));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s, %s LIMIT 2000",
+                TestsConstants.TEST_INDEX_BANK,
+                TestsConstants.TEST_INDEX_BANK_TWO));
     Assert.assertTrue(response.has("hits"));
     Assert.assertEquals(14, getTotalHits(response));
   }
 
   @Test
   public void selectAllWithFieldReturnsAll() throws IOException {
-    JSONObject response = executeQuery(StringUtils.format(
-        "SELECT *, age " +
-            "FROM %s " +
-            "LIMIT 5",
-        TestsConstants.TEST_INDEX_BANK
-    ));
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT *, age " + "FROM %s " + "LIMIT 5", TestsConstants.TEST_INDEX_BANK));
 
     checkSelectAllAndFieldResponseSize(response);
   }
 
   @Test
   public void selectAllWithFieldReverseOrder() throws IOException {
-    JSONObject response = executeQuery(StringUtils.format(
-        "SELECT *, age " +
-            "FROM %s " +
-            "LIMIT 5",
-        TestsConstants.TEST_INDEX_BANK
-    ));
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT *, age " + "FROM %s " + "LIMIT 5", TestsConstants.TEST_INDEX_BANK));
 
     checkSelectAllAndFieldResponseSize(response);
   }
 
   @Test
   public void selectAllWithMultipleFields() throws IOException {
-    JSONObject response = executeQuery(StringUtils.format(
-        "SELECT *, age, address " +
-            "FROM %s " +
-            "LIMIT 5",
-        TestsConstants.TEST_INDEX_BANK
-    ));
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT *, age, address " + "FROM %s " + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkSelectAllAndFieldResponseSize(response);
   }
 
   @Test
   public void selectAllWithFieldAndOrderBy() throws IOException {
-    JSONObject response = executeQuery(StringUtils.format(
-        "SELECT *, age " +
-            "FROM %s " +
-            "ORDER BY age " +
-            "LIMIT 5",
-        TestsConstants.TEST_INDEX_BANK
-    ));
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT *, age " + "FROM %s " + "ORDER BY age " + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkSelectAllAndFieldResponseSize(response);
   }
 
   @Test
   public void selectAllWithFieldAndGroupBy() throws IOException {
-    JSONObject response = executeQuery(StringUtils.format(
-        "SELECT *, age " +
-            "FROM %s " +
-            "GROUP BY age " +
-            "LIMIT 10",
-        TestsConstants.TEST_INDEX_BANK
-    ));
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT *, age " + "FROM %s " + "GROUP BY age " + "LIMIT 10",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkSelectAllAndFieldAggregationResponseSize(response, "age");
   }
 
   @Test
   public void selectAllWithFieldAndGroupByReverseOrder() throws IOException {
-    JSONObject response = executeQuery(StringUtils.format(
-        "SELECT *, age " +
-            "FROM %s " +
-            "GROUP BY age " +
-            "LIMIT 10",
-        TestsConstants.TEST_INDEX_BANK
-    ));
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT *, age " + "FROM %s " + "GROUP BY age " + "LIMIT 10",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkSelectAllAndFieldAggregationResponseSize(response, "age");
   }
@@ -180,14 +169,16 @@ public void selectAllWithFieldAndGroupByReverseOrder() throws IOException {
   @Test
   public void selectFieldWithAliasAndGroupBy() {
     String response =
-        executeQuery("SELECT lastname AS name FROM " + TEST_INDEX_ACCOUNT + " GROUP BY name",
-            "jdbc");
+        executeQuery(
+            "SELECT lastname AS name FROM " + TEST_INDEX_ACCOUNT + " GROUP BY name", "jdbc");
     assertThat(response, containsString("\"alias\": \"name\""));
   }
 
   public void indexWithWildcardTest() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT, "SELECT * FROM %s* LIMIT 1000",
-        TestsConstants.TEST_INDEX_BANK));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT, "SELECT * FROM %s* LIMIT 1000", TestsConstants.TEST_INDEX_BANK));
     Assert.assertTrue(response.has("hits"));
     assertThat(getTotalHits(response), greaterThan(0));
   }
@@ -198,8 +189,8 @@ public void selectSpecificFields() throws IOException {
     Set<String> expectedSource = new HashSet<>(Arrays.asList(arr));
 
     JSONObject response =
-        executeQuery(String.format(Locale.ROOT, "SELECT age, account_number FROM %s",
-            TEST_INDEX_ACCOUNT));
+        executeQuery(
+            String.format(Locale.ROOT, "SELECT age, account_number FROM %s", TEST_INDEX_ACCOUNT));
     assertResponseForSelectSpecificFields(response, expectedSource);
   }
 
@@ -209,8 +200,9 @@ public void selectSpecificFieldsUsingTableAlias() throws IOException {
     Set<String> expectedSource = new HashSet<>(Arrays.asList(arr));
 
     JSONObject response =
-        executeQuery(String.format(Locale.ROOT, "SELECT a.age, a.account_number FROM %s a",
-            TEST_INDEX_ACCOUNT));
+        executeQuery(
+            String.format(
+                Locale.ROOT, "SELECT a.age, a.account_number FROM %s a", TEST_INDEX_ACCOUNT));
     assertResponseForSelectSpecificFields(response, expectedSource);
   }
 
@@ -219,15 +211,18 @@ public void selectSpecificFieldsUsingTableNamePrefix() throws IOException {
     String[] arr = new String[] {"age", "account_number"};
     Set<String> expectedSource = new HashSet<>(Arrays.asList(arr));
 
-    JSONObject response = executeQuery(String.format(Locale.ROOT,
-        "SELECT opensearch-sql_test_index_account.age, opensearch-sql_test_index_account.account_number" +
-            " FROM %s",
-        TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT opensearch-sql_test_index_account.age,"
+                    + " opensearch-sql_test_index_account.account_number FROM %s",
+                TEST_INDEX_ACCOUNT));
     assertResponseForSelectSpecificFields(response, expectedSource);
   }
 
-  private void assertResponseForSelectSpecificFields(JSONObject response,
-                                                     Set<String> expectedSource) {
+  private void assertResponseForSelectSpecificFields(
+      JSONObject response, Set<String> expectedSource) {
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
       JSONObject hit = hits.getJSONObject(i);
@@ -240,9 +235,12 @@ public void selectFieldWithSpace() throws IOException {
     String[] arr = new String[] {"test field"};
     Set<String> expectedSource = new HashSet<>(Arrays.asList(arr));
 
-    JSONObject response = executeQuery(String.format(Locale.ROOT, "SELECT ['test field'] FROM %s " +
-            "WHERE ['test field'] IS NOT null",
-        TestsConstants.TEST_INDEX_PHRASE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT ['test field'] FROM %s " + "WHERE ['test field'] IS NOT null",
+                TestsConstants.TEST_INDEX_PHRASE));
 
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
@@ -259,19 +257,28 @@ public void selectAliases() throws IOException {
     String[] arr = new String[] {"myage", "myaccount_number"};
     Set<String> expectedSource = new HashSet<>(Arrays.asList(arr));
 
-    JSONObject result = executeQuery(String.format(Locale.ROOT,
-        "SELECT age AS myage, account_number AS myaccount_number FROM %s", TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT age AS myage, account_number AS myaccount_number FROM %s",
+                TEST_INDEX_ACCOUNT));
     JSONArray hits = getHits(result);
-    hits.forEach(hitObj -> {
-      JSONObject hit = (JSONObject) hitObj;
-      Assert.assertEquals(expectedSource, hit.getJSONObject("_source").keySet());
-    });
+    hits.forEach(
+        hitObj -> {
+          JSONObject hit = (JSONObject) hitObj;
+          Assert.assertEquals(expectedSource, hit.getJSONObject("_source").keySet());
+        });
   }
 
   @Test
   public void useTableAliasInWhereClauseTest() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT,
-        "SELECT * FROM %s a WHERE a.city = 'Nogal' LIMIT 1000", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s a WHERE a.city = 'Nogal' LIMIT 1000",
+                TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -280,8 +287,12 @@ public void useTableAliasInWhereClauseTest() throws IOException {
 
   @Test
   public void notUseTableAliasInWhereClauseTest() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT,
-        "SELECT * FROM %s a WHERE city = 'Nogal' LIMIT 1000", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s a WHERE city = 'Nogal' LIMIT 1000",
+                TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -290,10 +301,13 @@ public void notUseTableAliasInWhereClauseTest() throws IOException {
 
   @Test
   public void useTableNamePrefixInWhereClauseTest() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT,
-        "SELECT * FROM %s WHERE opensearch-sql_test_index_account.city = 'Nogal' LIMIT 1000",
-        TEST_INDEX_ACCOUNT
-    ));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE opensearch-sql_test_index_account.city = 'Nogal' LIMIT"
+                    + " 1000",
+                TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -302,8 +316,12 @@ public void useTableNamePrefixInWhereClauseTest() throws IOException {
 
   @Test
   public void equalityTest() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT,
-        "SELECT * FROM %s WHERE city = 'Nogal' LIMIT 1000", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE city = 'Nogal' LIMIT 1000",
+                TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -312,9 +330,12 @@ public void equalityTest() throws IOException {
 
   @Test
   public void equalityTestPhrase() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT, "SELECT * FROM %s WHERE " +
-            "match_phrase(phrase, 'quick fox here') LIMIT 1000",
-        TestsConstants.TEST_INDEX_PHRASE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE " + "match_phrase(phrase, 'quick fox here') LIMIT 1000",
+                TestsConstants.TEST_INDEX_PHRASE));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -324,10 +345,13 @@ public void equalityTestPhrase() throws IOException {
   @Test
   public void greaterThanTest() throws IOException {
     int someAge = 25;
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE age > %s LIMIT 1000",
-            TestsConstants.TEST_INDEX_PEOPLE,
-            someAge));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE age > %s LIMIT 1000",
+                TestsConstants.TEST_INDEX_PEOPLE,
+                someAge));
 
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
@@ -340,10 +364,13 @@ public void greaterThanTest() throws IOException {
   @Test
   public void greaterThanOrEqualTest() throws IOException {
     int someAge = 25;
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE age >= %s LIMIT 1000",
-            TEST_INDEX_ACCOUNT,
-            someAge));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE age >= %s LIMIT 1000",
+                TEST_INDEX_ACCOUNT,
+                someAge));
 
     boolean isEqualFound = false;
     JSONArray hits = getHits(response);
@@ -352,24 +379,27 @@ public void greaterThanOrEqualTest() throws IOException {
       int age = getSource(hit).getInt("age");
       assertThat(age, greaterThanOrEqualTo(someAge));
 
-        if (age == someAge) {
-            isEqualFound = true;
-        }
+      if (age == someAge) {
+        isEqualFound = true;
+      }
     }
 
     Assert.assertTrue(
-        String.format(Locale.ROOT, "At least one of the documents need to contains age equal to %s",
-            someAge),
+        String.format(
+            Locale.ROOT, "At least one of the documents need to contains age equal to %s", someAge),
         isEqualFound);
   }
 
   @Test
   public void lessThanTest() throws IOException {
     int someAge = 25;
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE age < %s LIMIT 1000",
-            TestsConstants.TEST_INDEX_PEOPLE,
-            someAge));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE age < %s LIMIT 1000",
+                TestsConstants.TEST_INDEX_PEOPLE,
+                someAge));
 
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
@@ -382,10 +412,13 @@ public void lessThanTest() throws IOException {
   @Test
   public void lessThanOrEqualTest() throws IOException {
     int someAge = 25;
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE age <= %s LIMIT 1000",
-            TEST_INDEX_ACCOUNT,
-            someAge));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE age <= %s LIMIT 1000",
+                TEST_INDEX_ACCOUNT,
+                someAge));
 
     boolean isEqualFound = false;
     JSONArray hits = getHits(response);
@@ -394,32 +427,39 @@ public void lessThanOrEqualTest() throws IOException {
       int age = getSource(hit).getInt("age");
       assertThat(age, lessThanOrEqualTo(someAge));
 
-        if (age == someAge) {
-            isEqualFound = true;
-        }
+      if (age == someAge) {
+        isEqualFound = true;
+      }
     }
 
     Assert.assertTrue(
-        String.format(Locale.ROOT, "At least one of the documents need to contains age equal to %s",
-            someAge),
+        String.format(
+            Locale.ROOT, "At least one of the documents need to contains age equal to %s", someAge),
         isEqualFound);
   }
 
   @Test
   public void orTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-            "FROM %s " +
-            "WHERE match_phrase(gender, 'F') OR match_phrase(gender, 'M') " +
-            "LIMIT 1000", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE match_phrase(gender, 'F') OR match_phrase(gender, 'M') "
+                    + "LIMIT 1000",
+                TEST_INDEX_ACCOUNT));
     Assert.assertEquals(1000, getTotalHits(response));
   }
 
   @Test
   public void andTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE age=32 AND gender='M' LIMIT 1000",
-            TestsConstants.TEST_INDEX_PEOPLE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE age=32 AND gender='M' LIMIT 1000",
+                TestsConstants.TEST_INDEX_PEOPLE));
 
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
@@ -431,9 +471,12 @@ public void andTest() throws IOException {
 
   @Test
   public void likeTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE firstname LIKE 'amb%%' LIMIT 1000",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE firstname LIKE 'amb%%' LIMIT 1000",
+                TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -442,9 +485,12 @@ public void likeTest() throws IOException {
 
   @Test
   public void notLikeTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE firstname NOT LIKE 'amb%%'",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE firstname NOT LIKE 'amb%%'",
+                TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     Assert.assertNotEquals(0, getTotalHits(response));
@@ -456,11 +502,13 @@ public void notLikeTest() throws IOException {
 
   @Test
   public void regexQueryTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE dog_name = REGEXP_QUERY('sn.*', 'INTERSECTION|COMPLEMENT|EMPTY', 10000)",
-            TestsConstants.TEST_INDEX_DOG));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE dog_name = REGEXP_QUERY('sn.*',"
+                    + " 'INTERSECTION|COMPLEMENT|EMPTY', 10000)",
+                TestsConstants.TEST_INDEX_DOG));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, hits.length());
@@ -473,11 +521,13 @@ public void regexQueryTest() throws IOException {
 
   @Test
   public void negativeRegexQueryTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE NOT(dog_name = REGEXP_QUERY('sn.*', 'INTERSECTION|COMPLEMENT|EMPTY', 10000))",
-            TestsConstants.TEST_INDEX_DOG));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE NOT(dog_name = REGEXP_QUERY('sn.*',"
+                    + " 'INTERSECTION|COMPLEMENT|EMPTY', 10000))",
+                TestsConstants.TEST_INDEX_DOG));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, hits.length());
@@ -489,28 +539,36 @@ public void negativeRegexQueryTest() throws IOException {
 
   @Test
   public void doubleNotTest() throws IOException {
-    JSONObject response1 = executeQuery(
-        String.format(Locale.ROOT,
-            "SELECT * FROM %s WHERE NOT gender LIKE 'm' AND NOT gender LIKE 'f'",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response1 =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE NOT gender LIKE 'm' AND NOT gender LIKE 'f'",
+                TEST_INDEX_ACCOUNT));
     Assert.assertEquals(0, getTotalHits(response1));
 
-    JSONObject response2 = executeQuery(
-        String.format(Locale.ROOT,
-            "SELECT * FROM %s WHERE NOT gender LIKE 'm' AND gender NOT LIKE 'f'",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response2 =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE NOT gender LIKE 'm' AND gender NOT LIKE 'f'",
+                TEST_INDEX_ACCOUNT));
     Assert.assertEquals(0, getTotalHits(response2));
 
-    JSONObject response3 = executeQuery(
-        String.format(Locale.ROOT,
-            "SELECT * FROM %s WHERE gender NOT LIKE 'm' AND gender NOT LIKE 'f'",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response3 =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE gender NOT LIKE 'm' AND gender NOT LIKE 'f'",
+                TEST_INDEX_ACCOUNT));
     Assert.assertEquals(0, getTotalHits(response3));
 
-    JSONObject response4 = executeQuery(
-        String.format(Locale.ROOT,
-            "SELECT * FROM %s WHERE gender LIKE 'm' AND NOT gender LIKE 'f'",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response4 =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE gender LIKE 'm' AND NOT gender LIKE 'f'",
+                TEST_INDEX_ACCOUNT));
     // Assert there are results and they all have gender 'm'
     Assert.assertNotEquals(0, getTotalHits(response4));
     JSONArray hits = getHits(response4);
@@ -519,16 +577,19 @@ public void doubleNotTest() throws IOException {
       Assert.assertEquals("m", getSource(hit).getString("gender").toLowerCase());
     }
 
-    JSONObject response5 = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE NOT (gender = 'm' OR gender = 'f')",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response5 =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE NOT (gender = 'm' OR gender = 'f')",
+                TEST_INDEX_ACCOUNT));
     Assert.assertEquals(0, getTotalHits(response5));
   }
 
   @Test
   public void limitTest() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT, "SELECT * FROM %s LIMIT 30",
-        TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(String.format(Locale.ROOT, "SELECT * FROM %s LIMIT 30", TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(30, hits.length());
@@ -538,9 +599,14 @@ public void limitTest() throws IOException {
   public void betweenTest() throws IOException {
     int min = 27;
     int max = 30;
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE age BETWEEN %s AND %s LIMIT 1000",
-            TestsConstants.TEST_INDEX_PEOPLE, min, max));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE age BETWEEN %s AND %s LIMIT 1000",
+                TestsConstants.TEST_INDEX_PEOPLE,
+                min,
+                max));
 
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
@@ -556,9 +622,14 @@ public void betweenTest() throws IOException {
   public void notBetweenTest() throws IOException {
     int min = 20;
     int max = 37;
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE age NOT BETWEEN %s AND %s LIMIT 1000",
-            TestsConstants.TEST_INDEX_PEOPLE, min, max));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE age NOT BETWEEN %s AND %s LIMIT 1000",
+                TestsConstants.TEST_INDEX_PEOPLE,
+                min,
+                max));
 
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
@@ -575,9 +646,12 @@ public void notBetweenTest() throws IOException {
 
   @Test
   public void inTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT age FROM %s WHERE age IN (20, 22) LIMIT 1000",
-            TestsConstants.TEST_INDEX_PHRASE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT age FROM %s WHERE age IN (20, 22) LIMIT 1000",
+                TestsConstants.TEST_INDEX_PHRASE));
 
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
@@ -589,10 +663,12 @@ public void inTest() throws IOException {
 
   @Test
   public void inTestWithStrings() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT,
-            "SELECT phrase FROM %s WHERE phrase IN ('quick', 'fox') LIMIT 1000",
-            TestsConstants.TEST_INDEX_PHRASE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT phrase FROM %s WHERE phrase IN ('quick', 'fox') LIMIT 1000",
+                TestsConstants.TEST_INDEX_PHRASE));
 
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
@@ -604,12 +680,15 @@ public void inTestWithStrings() throws IOException {
 
   @Test
   public void inTermsTestWithIdentifiersTreatedLikeStrings() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT name " +
-                "FROM %s " +
-                "WHERE name.firstname = IN_TERMS('daenerys','eddard') " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT name "
+                    + "FROM %s "
+                    + "WHERE name.firstname = IN_TERMS('daenerys','eddard') "
+                    + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(2, getTotalHits(response));
@@ -622,12 +701,15 @@ public void inTermsTestWithIdentifiersTreatedLikeStrings() throws IOException {
 
   @Test
   public void inTermsTestWithStrings() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT name " +
-                "FROM %s " +
-                "WHERE name.firstname = IN_TERMS('daenerys','eddard') " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT name "
+                    + "FROM %s "
+                    + "WHERE name.firstname = IN_TERMS('daenerys','eddard') "
+                    + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(2, getTotalHits(response));
@@ -640,12 +722,15 @@ public void inTermsTestWithStrings() throws IOException {
 
   @Test
   public void inTermsWithNumbers() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT name " +
-                "FROM %s " +
-                "WHERE name.ofHisName = IN_TERMS(4,2) " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT name "
+                    + "FROM %s "
+                    + "WHERE name.ofHisName = IN_TERMS(4,2) "
+                    + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -657,10 +742,12 @@ public void inTermsWithNumbers() throws IOException {
 
   @Test
   public void termQueryWithNumber() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT,
-            "SELECT name FROM %s WHERE name.ofHisName = term(4) LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT name FROM %s WHERE name.ofHisName = term(4) LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -672,12 +759,15 @@ public void termQueryWithNumber() throws IOException {
 
   @Test
   public void termQueryWithStringIdentifier() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT name " +
-                "FROM %s " +
-                "WHERE name.firstname = term('brandon') " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT name "
+                    + "FROM %s "
+                    + "WHERE name.firstname = term('brandon') "
+                    + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -689,12 +779,15 @@ public void termQueryWithStringIdentifier() throws IOException {
 
   @Test
   public void termQueryWithStringLiteral() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT name " +
-                "FROM %s " +
-                "WHERE name.firstname = term('brandon') " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT name "
+                    + "FROM %s "
+                    + "WHERE name.firstname = term('brandon') "
+                    + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -708,9 +801,12 @@ public void termQueryWithStringLiteral() throws IOException {
   //  are returned as well. This may be incorrect behavior.
   @Test
   public void notInTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT age FROM %s WHERE age NOT IN (20, 22) LIMIT 1000",
-            TestsConstants.TEST_INDEX_PEOPLE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT age FROM %s WHERE age NOT IN (20, 22) LIMIT 1000",
+                TestsConstants.TEST_INDEX_PEOPLE));
 
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
@@ -730,9 +826,12 @@ public void dateSearch() throws IOException {
     DateTimeFormatter formatter = DateTimeFormat.forPattern(TestsConstants.DATE_FORMAT);
     DateTime dateToCompare = new DateTime(2014, 8, 18, 0, 0, 0);
 
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT insert_time FROM %s WHERE insert_time < '2014-08-18'",
-            TestsConstants.TEST_INDEX_ONLINE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT insert_time FROM %s WHERE insert_time < '2014-08-18'",
+                TestsConstants.TEST_INDEX_ONLINE));
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
       JSONObject hit = hits.getJSONObject(i);
@@ -740,8 +839,8 @@ public void dateSearch() throws IOException {
       DateTime insertTime = formatter.parseDateTime(source.getString("insert_time"));
 
       String errorMessage =
-          String.format(Locale.ROOT, "insert_time must be before 2014-08-18. Found: %s",
-              insertTime);
+          String.format(
+              Locale.ROOT, "insert_time must be before 2014-08-18. Found: %s", insertTime);
       Assert.assertTrue(errorMessage, insertTime.isBefore(dateToCompare));
     }
   }
@@ -751,10 +850,12 @@ public void dateSearchBraces() throws IOException {
     DateTimeFormatter formatter = DateTimeFormat.forPattern(TestsConstants.TS_DATE_FORMAT);
     DateTime dateToCompare = new DateTime(2015, 3, 15, 0, 0, 0);
 
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT,
-            "SELECT odbc_time FROM %s WHERE odbc_time < {ts '2015-03-15 00:00:00.000'}",
-            TestsConstants.TEST_INDEX_ODBC));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT odbc_time FROM %s WHERE odbc_time < {ts '2015-03-15 00:00:00.000'}",
+                TestsConstants.TEST_INDEX_ODBC));
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
       JSONObject hit = hits.getJSONObject(i);
@@ -764,8 +865,8 @@ public void dateSearchBraces() throws IOException {
 
       DateTime insertTime = formatter.parseDateTime(insertTimeStr);
       String errorMessage =
-          String.format(Locale.ROOT, "insert_time must be before 2015-03-15. Found: %s",
-              insertTime);
+          String.format(
+              Locale.ROOT, "insert_time must be before 2015-03-15. Found: %s", insertTime);
       Assert.assertTrue(errorMessage, insertTime.isBefore(dateToCompare));
     }
   }
@@ -777,20 +878,24 @@ public void dateBetweenSearch() throws IOException {
     DateTime dateLimit1 = new DateTime(2014, 8, 18, 0, 0, 0);
     DateTime dateLimit2 = new DateTime(2014, 8, 21, 0, 0, 0);
 
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT insert_time " +
-                "FROM %s " +
-                "WHERE insert_time BETWEEN '2014-08-18' AND '2014-08-21' " +
-                "LIMIT 3",
-            TestsConstants.TEST_INDEX_ONLINE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT insert_time "
+                    + "FROM %s "
+                    + "WHERE insert_time BETWEEN '2014-08-18' AND '2014-08-21' "
+                    + "LIMIT 3",
+                TestsConstants.TEST_INDEX_ONLINE));
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
       JSONObject hit = hits.getJSONObject(i);
       JSONObject source = getSource(hit);
       DateTime insertTime = formatter.parseDateTime(source.getString("insert_time"));
 
-      boolean isBetween = (insertTime.isAfter(dateLimit1) || insertTime.isEqual(dateLimit1)) &&
-          (insertTime.isBefore(dateLimit2) || insertTime.isEqual(dateLimit2));
+      boolean isBetween =
+          (insertTime.isAfter(dateLimit1) || insertTime.isEqual(dateLimit1))
+              && (insertTime.isBefore(dateLimit2) || insertTime.isEqual(dateLimit2));
 
       Assert.assertTrue("insert_time must be between 2014-08-18 and 2014-08-21", isBetween);
     }
@@ -798,9 +903,12 @@ public void dateBetweenSearch() throws IOException {
 
   @Test
   public void missFilterSearch() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE insert_time2 IS missing",
-            TestsConstants.TEST_INDEX_PHRASE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE insert_time2 IS missing",
+                TestsConstants.TEST_INDEX_PHRASE));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(4, getTotalHits(response));
@@ -814,9 +922,12 @@ public void missFilterSearch() throws IOException {
 
   @Test
   public void notMissFilterSearch() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE insert_time2 IS NOT missing",
-            TestsConstants.TEST_INDEX_PHRASE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE insert_time2 IS NOT missing",
+                TestsConstants.TEST_INDEX_PHRASE));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(2, getTotalHits(response));
@@ -830,15 +941,19 @@ public void notMissFilterSearch() throws IOException {
 
   @Test
   public void complexConditionQuery() throws IOException {
-    String errorMessage = "Result does not exist to the condition " +
-        "(gender='m' AND (age> 25 OR account_number>5)) OR (gender='f' AND (age>30 OR account_number < 8)";
+    String errorMessage =
+        "Result does not exist to the condition (gender='m' AND (age> 25 OR account_number>5)) OR"
+            + " (gender='f' AND (age>30 OR account_number < 8)";
 
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE (gender='m' AND (age> 25 OR account_number>5)) " +
-                "OR (gender='f' AND (age>30 OR account_number < 8))",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE (gender='m' AND (age> 25 OR account_number>5)) "
+                    + "OR (gender='f' AND (age>30 OR account_number < 8))",
+                TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
@@ -849,7 +964,8 @@ public void complexConditionQuery() throws IOException {
       int age = source.getInt("age");
       int accountNumber = source.getInt("account_number");
 
-      Assert.assertTrue(errorMessage,
+      Assert.assertTrue(
+          errorMessage,
           (gender.equals("m") && (age > 25 || accountNumber > 5))
               || (gender.equals("f") && (age > 30 || accountNumber < 8)));
     }
@@ -857,16 +973,20 @@ public void complexConditionQuery() throws IOException {
 
   @Test
   public void complexNotConditionQuery() throws IOException {
-    String errorMessage = "Result does not exist to the condition " +
-        "NOT (gender='m' AND NOT (age > 25 OR account_number > 5)) " +
-        "OR (NOT gender='f' AND NOT (age > 30 OR account_number < 8))";
+    String errorMessage =
+        "Result does not exist to the condition "
+            + "NOT (gender='m' AND NOT (age > 25 OR account_number > 5)) "
+            + "OR (NOT gender='f' AND NOT (age > 30 OR account_number < 8))";
 
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE NOT (gender='m' AND NOT (age > 25 OR account_number > 5)) " +
-                "OR (NOT gender='f' AND NOT (age > 30 OR account_number < 8))",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE NOT (gender='m' AND NOT (age > 25 OR account_number > 5)) "
+                    + "OR (NOT gender='f' AND NOT (age > 30 OR account_number < 8))",
+                TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     Assert.assertNotEquals(0, hits.length());
@@ -878,7 +998,8 @@ public void complexNotConditionQuery() throws IOException {
       int age = source.getInt("age");
       int accountNumber = source.getInt("account_number");
 
-      Assert.assertTrue(errorMessage,
+      Assert.assertTrue(
+          errorMessage,
           !(gender.equals("m") && !(age > 25 || accountNumber > 5))
               || (!gender.equals("f") && !(age > 30 || accountNumber < 8)));
     }
@@ -887,9 +1008,10 @@ public void complexNotConditionQuery() throws IOException {
   @Test
   @SuppressWarnings("unchecked")
   public void orderByAscTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT age FROM %s ORDER BY age ASC LIMIT 1000",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT, "SELECT age FROM %s ORDER BY age ASC LIMIT 1000", TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     ArrayList<Integer> ages = new ArrayList<>();
@@ -907,17 +1029,23 @@ public void orderByAscTest() throws IOException {
 
   @Test
   public void orderByDescTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT age FROM %s ORDER BY age DESC LIMIT 1000",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT age FROM %s ORDER BY age DESC LIMIT 1000",
+                TEST_INDEX_ACCOUNT));
     assertResponseForOrderByTest(response);
   }
 
   @Test
   public void orderByDescUsingTableAliasTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT a.age FROM %s a ORDER BY a.age DESC LIMIT 1000",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT a.age FROM %s a ORDER BY a.age DESC LIMIT 1000",
+                TEST_INDEX_ACCOUNT));
     assertResponseForOrderByTest(response);
   }
 
@@ -940,13 +1068,16 @@ private void assertResponseForOrderByTest(JSONObject response) {
   @Test
   @SuppressWarnings("unchecked")
   public void orderByAscFieldWithSpaceTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE `test field` IS NOT null " +
-                "ORDER BY `test field` ASC " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_PHRASE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE `test field` IS NOT null "
+                    + "ORDER BY `test field` ASC "
+                    + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_PHRASE));
 
     JSONArray hits = getHits(response);
     ArrayList<Integer> testFields = new ArrayList<>();
@@ -964,195 +1095,177 @@ public void orderByAscFieldWithSpaceTest() throws IOException {
 
   @Test
   public void testWhereWithBoolEqualsTrue() throws IOException {
-    JSONObject response = executeQuery(
-        StringUtils.format(
-            "SELECT * " +
-                "FROM %s " +
-                "WHERE male = true " +
-                "LIMIT 5",
-            TestsConstants.TEST_INDEX_BANK)
-    );
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT * " + "FROM %s " + "WHERE male = true " + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkResponseSize(response, BANK_INDEX_MALE_TRUE);
   }
 
   @Test
   public void testWhereWithBoolEqualsTrueAndGroupBy() throws IOException {
-    JSONObject response = executeQuery(
-        StringUtils.format(
-            "SELECT * " +
-                "FROM %s " +
-                "WHERE male = true " +
-                "GROUP BY balance " +
-                "LIMIT 5",
-            TestsConstants.TEST_INDEX_BANK)
-    );
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT * " + "FROM %s " + "WHERE male = true " + "GROUP BY balance " + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkAggregationResponseSize(response, BANK_INDEX_MALE_TRUE);
   }
 
   @Test
   public void testWhereWithBoolEqualsTrueAndOrderBy() throws IOException {
-    JSONObject response = executeQuery(
-        StringUtils.format(
-            "SELECT * " +
-                "FROM %s " +
-                "WHERE male = true " +
-                "ORDER BY age " +
-                "LIMIT 5",
-            TestsConstants.TEST_INDEX_BANK)
-    );
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT * " + "FROM %s " + "WHERE male = true " + "ORDER BY age " + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkResponseSize(response, BANK_INDEX_MALE_TRUE);
   }
 
   @Test
   public void testWhereWithBoolIsTrue() throws IOException {
-    JSONObject response = executeQuery(
-        StringUtils.format(
-            "SELECT * " +
-                "FROM %s " +
-                "WHERE male IS true " +
-                "GROUP BY balance " +
-                "LIMIT 5",
-            TestsConstants.TEST_INDEX_BANK)
-    );
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT * " + "FROM %s " + "WHERE male IS true " + "GROUP BY balance " + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkAggregationResponseSize(response, BANK_INDEX_MALE_TRUE);
   }
 
   @Test
   public void testWhereWithBoolIsNotTrue() throws IOException {
-    JSONObject response = executeQuery(
-        StringUtils.format(
-            "SELECT * " +
-                "FROM %s " +
-                "WHERE male IS NOT true " +
-                "GROUP BY balance " +
-                "LIMIT 5",
-            TestsConstants.TEST_INDEX_BANK)
-    );
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE male IS NOT true "
+                    + "GROUP BY balance "
+                    + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkAggregationResponseSize(response, BANK_INDEX_MALE_FALSE);
   }
 
   @Test
   public void testWhereWithBoolEqualsFalse() throws IOException {
-    JSONObject response = executeQuery(
-        StringUtils.format(
-            "SELECT * " +
-                "FROM %s " +
-                "WHERE male = false " +
-                "LIMIT 5",
-            TestsConstants.TEST_INDEX_BANK)
-    );
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT * " + "FROM %s " + "WHERE male = false " + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkResponseSize(response, BANK_INDEX_MALE_FALSE);
   }
 
   @Test
   public void testWhereWithBoolEqualsFalseAndGroupBy() throws IOException {
-    JSONObject response = executeQuery(
-        StringUtils.format(
-            "SELECT * " +
-                "FROM %s " +
-                "WHERE male = false " +
-                "GROUP BY balance " +
-                "LIMIT 5",
-            TestsConstants.TEST_INDEX_BANK)
-    );
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT * " + "FROM %s " + "WHERE male = false " + "GROUP BY balance " + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkAggregationResponseSize(response, BANK_INDEX_MALE_FALSE);
   }
 
   @Test
   public void testWhereWithBoolEqualsFalseAndOrderBy() throws IOException {
-    JSONObject response = executeQuery(
-        StringUtils.format(
-            "SELECT * " +
-                "FROM %s " +
-                "WHERE male = false " +
-                "ORDER BY age " +
-                "LIMIT 5",
-            TestsConstants.TEST_INDEX_BANK)
-    );
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT * " + "FROM %s " + "WHERE male = false " + "ORDER BY age " + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkResponseSize(response, BANK_INDEX_MALE_FALSE);
   }
 
   @Test
   public void testWhereWithBoolIsFalse() throws IOException {
-    JSONObject response = executeQuery(
-        StringUtils.format(
-            "SELECT * " +
-                "FROM %s " +
-                "WHERE male IS false " +
-                "GROUP BY balance " +
-                "LIMIT 5",
-            TestsConstants.TEST_INDEX_BANK)
-    );
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT * " + "FROM %s " + "WHERE male IS false " + "GROUP BY balance " + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkAggregationResponseSize(response, BANK_INDEX_MALE_FALSE);
   }
 
   @Test
   public void testWhereWithBoolIsNotFalse() throws IOException {
-    JSONObject response = executeQuery(
-        StringUtils.format(
-            "SELECT * " +
-                "FROM %s " +
-                "WHERE male IS NOT false " +
-                "GROUP BY balance " +
-                "LIMIT 5",
-            TestsConstants.TEST_INDEX_BANK)
-    );
+    JSONObject response =
+        executeQuery(
+            StringUtils.format(
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE male IS NOT false "
+                    + "GROUP BY balance "
+                    + "LIMIT 5",
+                TestsConstants.TEST_INDEX_BANK));
 
     checkAggregationResponseSize(response, BANK_INDEX_MALE_TRUE);
   }
 
   @Test
   public void testMultiPartWhere() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE (firstname LIKE 'opal' OR firstname LIKE 'rodriquez') " +
-                "AND (state like 'oh' OR state like 'hi')",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE (firstname LIKE 'opal' OR firstname LIKE 'rodriquez') "
+                    + "AND (state like 'oh' OR state like 'hi')",
+                TEST_INDEX_ACCOUNT));
 
     Assert.assertEquals(2, getTotalHits(response));
   }
 
   @Test
   public void testMultiPartWhere2() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE ((account_number > 200 AND account_number < 300) OR gender LIKE 'm') " +
-                "AND (state LIKE 'hi' OR address LIKE 'avenue')",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE ((account_number > 200 AND account_number < 300) OR gender LIKE 'm') "
+                    + "AND (state LIKE 'hi' OR address LIKE 'avenue')",
+                TEST_INDEX_ACCOUNT));
 
     Assert.assertEquals(127, getTotalHits(response));
   }
 
   @Test
   public void testMultiPartWhere3() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE ((account_number > 25 AND account_number < 75) AND age >35 ) " +
-                "AND (state LIKE 'md' OR (address LIKE 'avenue' OR address LIKE 'street'))",
-            TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE ((account_number > 25 AND account_number < 75) AND age >35 ) "
+                    + "AND (state LIKE 'md' OR (address LIKE 'avenue' OR address LIKE 'street'))",
+                TEST_INDEX_ACCOUNT));
 
     Assert.assertEquals(7, getTotalHits(response));
   }
 
   @Test
   public void filterPolygonTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE GEO_INTERSECTS(place,'POLYGON ((102 2, 103 2, 103 3, 102 3, 102 2))')",
-            TestsConstants.TEST_INDEX_LOCATION));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE GEO_INTERSECTS(place,'POLYGON ((102 2, 103 2, 103 3, 102 3, 102 2))')",
+                TestsConstants.TEST_INDEX_LOCATION));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -1163,10 +1276,12 @@ public void filterPolygonTest() throws IOException {
 
   @Test
   public void boundingBox() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT,
-            "SELECT * FROM %s WHERE GEO_BOUNDING_BOX(center, 100.0, 1.0, 101, 0.0)",
-            TestsConstants.TEST_INDEX_LOCATION));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE GEO_BOUNDING_BOX(center, 100.0, 1.0, 101, 0.0)",
+                TestsConstants.TEST_INDEX_LOCATION));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -1177,10 +1292,12 @@ public void boundingBox() throws IOException {
 
   @Test
   public void geoDistance() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT,
-            "SELECT * FROM %s WHERE GEO_DISTANCE(center, '1km', 100.5, 0.500001)",
-            TestsConstants.TEST_INDEX_LOCATION));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE GEO_DISTANCE(center, '1km', 100.5, 0.500001)",
+                TestsConstants.TEST_INDEX_LOCATION));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -1191,10 +1308,12 @@ public void geoDistance() throws IOException {
 
   @Test
   public void geoPolygon() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT,
-            "SELECT * FROM %s WHERE GEO_POLYGON(center, 100,0, 100.5, 2, 101.0,0)",
-            TestsConstants.TEST_INDEX_LOCATION));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE GEO_POLYGON(center, 100,0, 100.5, 2, 101.0,0)",
+                TestsConstants.TEST_INDEX_LOCATION));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -1206,36 +1325,45 @@ public void geoPolygon() throws IOException {
   @Ignore
   @Test
   public void escapedCharactersCheck() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE MATCH_PHRASE(nickname, 'Daenerys \"Stormborn\"') " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE MATCH_PHRASE(nickname, 'Daenerys \"Stormborn\"') "
+                    + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     Assert.assertEquals(1, getTotalHits(response));
   }
 
   @Test
   public void complexObjectSearch() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE MATCH_PHRASE(name.firstname, 'Jaime') " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE MATCH_PHRASE(name.firstname, 'Jaime') "
+                    + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     Assert.assertEquals(1, getTotalHits(response));
   }
 
   @Test
   public void complexObjectReturnField() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT parents.father " +
-                "FROM %s " +
-                "WHERE MATCH_PHRASE(name.firstname, 'Brandon') " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT parents.father "
+                    + "FROM %s "
+                    + "WHERE MATCH_PHRASE(name.firstname, 'Brandon') "
+                    + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, getTotalHits(response));
@@ -1246,14 +1374,18 @@ public void complexObjectReturnField() throws IOException {
 
   /**
    * TODO: Fields prefixed with @ gets converted to SQLVariantRefExpr instead of SQLIdentifierExpr
-   * Either change SQLVariantRefExpr to SQLIdentifierExpr
-   * Or handle the special case for SQLVariantRefExpr
+   * Either change SQLVariantRefExpr to SQLIdentifierExpr Or handle the special case for
+   * SQLVariantRefExpr
    */
   @Ignore
   @Test
   public void queryWithAtFieldOnWhere() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT,
-        "SELECT * FROM %s where @wolf = 'Summer' LIMIT 1000", TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s where @wolf = 'Summer' LIMIT 1000",
+                TEST_INDEX_GAME_OF_THRONES));
     Assert.assertEquals(1, getTotalHits(response));
     JSONObject hit = getHits(response).getJSONObject(0);
     Assert.assertEquals("Summer", hit.get("@wolf"));
@@ -1265,19 +1397,22 @@ public void queryWithDotAtStartOfIndexName() throws Exception {
     TestUtils.createHiddenIndexByRestClient(client(), ".bank", null);
     TestUtils.loadDataByRestClient(client(), ".bank", "/src/test/resources/.bank.json");
 
-    String response = executeQuery("SELECT education FROM .bank WHERE account_number = 12345",
-        "jdbc");
+    String response =
+        executeQuery("SELECT education FROM .bank WHERE account_number = 12345", "jdbc");
     Assert.assertTrue(response.contains("PhD"));
   }
 
   @Test
   public void notLikeTests() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT name " +
-                "FROM %s " +
-                "WHERE name.firstname NOT LIKE 'd%%' AND name IS NOT NULL " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT name "
+                    + "FROM %s "
+                    + "WHERE name.firstname NOT LIKE 'd%%' AND name IS NOT NULL "
+                    + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(3, getTotalHits(response));
@@ -1286,45 +1421,49 @@ public void notLikeTests() throws IOException {
       JSONObject source = getSource(hit);
 
       String name = source.getJSONObject("name").getString("firstname");
-      Assert
-          .assertFalse(String.format(Locale.ROOT, "Name [%s] should not match pattern [d%%]", name),
-              name.startsWith("d"));
+      Assert.assertFalse(
+          String.format(Locale.ROOT, "Name [%s] should not match pattern [d%%]", name),
+          name.startsWith("d"));
     }
   }
 
   @Test
   public void isNullTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT name " +
-                "FROM %s " +
-                "WHERE nickname IS NULL " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT name " + "FROM %s " + "WHERE nickname IS NULL " + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     Assert.assertEquals(6, getTotalHits(response));
   }
 
   @Test
   public void isNotNullTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT name " +
-                "FROM %s " +
-                "WHERE nickname IS NOT NULL " +
-                "LIMIT 1000",
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT name " + "FROM %s " + "WHERE nickname IS NOT NULL " + "LIMIT 1000",
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     Assert.assertEquals(1, getTotalHits(response));
   }
 
   @Test
   public void innerQueryTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s D " +
-                "WHERE holdersName IN (SELECT firstname " +
-                "FROM %s " +
-                "WHERE firstname = 'Hattie')",
-            TestsConstants.TEST_INDEX_DOG, TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s D "
+                    + "WHERE holdersName IN (SELECT firstname "
+                    + "FROM %s "
+                    + "WHERE firstname = 'Hattie')",
+                TestsConstants.TEST_INDEX_DOG,
+                TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, hits.length());
@@ -1339,19 +1478,22 @@ public void innerQueryTest() throws IOException {
   @Ignore
   @Test
   public void twoSubQueriesTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE holdersName IN (SELECT firstname " +
-                "FROM %s " +
-                "WHERE firstname = 'Hattie') " +
-                "AND age IN (SELECT name.ofHisName " +
-                "FROM %s " +
-                "WHERE name.firstname <> 'Daenerys' " +
-                "AND name.ofHisName IS NOT NULL) ",
-            TestsConstants.TEST_INDEX_DOG,
-            TEST_INDEX_ACCOUNT,
-            TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE holdersName IN (SELECT firstname "
+                    + "FROM %s "
+                    + "WHERE firstname = 'Hattie') "
+                    + "AND age IN (SELECT name.ofHisName "
+                    + "FROM %s "
+                    + "WHERE name.firstname <> 'Daenerys' "
+                    + "AND name.ofHisName IS NOT NULL) ",
+                TestsConstants.TEST_INDEX_DOG,
+                TEST_INDEX_ACCOUNT,
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, hits.length());
@@ -1366,14 +1508,18 @@ public void twoSubQueriesTest() throws IOException {
   @Ignore
   @Test
   public void inTermsSubQueryTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE age = IN_TERMS (SELECT name.ofHisName " +
-                "FROM %s " +
-                "WHERE name.firstname <> 'Daenerys' " +
-                "AND name.ofHisName IS NOT NULL)",
-            TestsConstants.TEST_INDEX_DOG, TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE age = IN_TERMS (SELECT name.ofHisName "
+                    + "FROM %s "
+                    + "WHERE name.firstname <> 'Daenerys' "
+                    + "AND name.ofHisName IS NOT NULL)",
+                TestsConstants.TEST_INDEX_DOG,
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, hits.length());
@@ -1388,9 +1534,12 @@ public void inTermsSubQueryTest() throws IOException {
   @Ignore
   @Test
   public void idsQueryOneId() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE _id = IDS_QUERY(dog, 1)",
-            TestsConstants.TEST_INDEX_DOG));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE _id = IDS_QUERY(dog, 1)",
+                TestsConstants.TEST_INDEX_DOG));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, hits.length());
@@ -1405,9 +1554,12 @@ public void idsQueryOneId() throws IOException {
   @Ignore
   @Test
   public void idsQueryMultipleId() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE _id = IDS_QUERY(dog, 1, 2, 3)",
-            TestsConstants.TEST_INDEX_DOG));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE _id = IDS_QUERY(dog, 1, 2, 3)",
+                TestsConstants.TEST_INDEX_DOG));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, hits.length());
@@ -1422,14 +1574,18 @@ public void idsQueryMultipleId() throws IOException {
   @Ignore
   @Test
   public void idsQuerySubQueryIds() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE _id = IDS_QUERY(dog, (SELECT name.ofHisName " +
-                "FROM %s " +
-                "WHERE name.firstname <> 'Daenerys' " +
-                "AND name.ofHisName IS NOT NULL))",
-            TestsConstants.TEST_INDEX_DOG, TestsConstants.TEST_INDEX_GAME_OF_THRONES));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE _id = IDS_QUERY(dog, (SELECT name.ofHisName "
+                    + "FROM %s "
+                    + "WHERE name.firstname <> 'Daenerys' "
+                    + "AND name.ofHisName IS NOT NULL))",
+                TestsConstants.TEST_INDEX_DOG,
+                TestsConstants.TEST_INDEX_GAME_OF_THRONES));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(1, hits.length());
@@ -1443,18 +1599,24 @@ public void idsQuerySubQueryIds() throws IOException {
 
   @Test
   public void nestedEqualsTestFieldNormalField() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE nested(message.info)='b'",
-            TestsConstants.TEST_INDEX_NESTED_TYPE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE nested(message.info)='b'",
+                TestsConstants.TEST_INDEX_NESTED_TYPE));
 
     Assert.assertEquals(1, getTotalHits(response));
   }
 
   @Test
   public void nestedEqualsTestFieldInsideArrays() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * FROM %s WHERE nested(message.info) = 'a'",
-            TestsConstants.TEST_INDEX_NESTED_TYPE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s WHERE nested(message.info) = 'a'",
+                TestsConstants.TEST_INDEX_NESTED_TYPE));
 
     Assert.assertEquals(2, getTotalHits(response));
   }
@@ -1462,106 +1624,124 @@ public void nestedEqualsTestFieldInsideArrays() throws IOException {
   @Ignore // Seems like we don't support nested with IN, throwing IllegalArgumentException
   @Test
   public void nestedOnInQuery() throws IOException {
-    JSONObject response = executeQuery(String.format(Locale.ROOT,
-        "SELECT * FROM %s where nested(message.info) IN ('a','b')", TEST_INDEX_NESTED_TYPE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * FROM %s where nested(message.info) IN ('a','b')",
+                TEST_INDEX_NESTED_TYPE));
     Assert.assertEquals(3, getTotalHits(response));
   }
 
   @Test
   public void complexNestedQueryBothOnSameObject() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE nested('message', message.info = 'a' AND message.author ='i')",
-            TestsConstants.TEST_INDEX_NESTED_TYPE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE nested('message', message.info = 'a' AND message.author ='i')",
+                TestsConstants.TEST_INDEX_NESTED_TYPE));
 
     Assert.assertEquals(1, getTotalHits(response));
   }
 
   @Test
   public void complexNestedQueryNotBothOnSameObject() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE nested('message', message.info = 'a' AND message.author ='h')",
-            TestsConstants.TEST_INDEX_NESTED_TYPE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * "
+                    + "FROM %s "
+                    + "WHERE nested('message', message.info = 'a' AND message.author ='h')",
+                TestsConstants.TEST_INDEX_NESTED_TYPE));
 
     Assert.assertEquals(0, getTotalHits(response));
   }
 
   @Test
   public void nestedOnInTermsQuery() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT * " +
-                "FROM %s " +
-                "WHERE nested(message.info) = IN_TERMS('a', 'b')",
-            TestsConstants.TEST_INDEX_NESTED_TYPE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT * " + "FROM %s " + "WHERE nested(message.info) = IN_TERMS('a', 'b')",
+                TestsConstants.TEST_INDEX_NESTED_TYPE));
 
     Assert.assertEquals(3, getTotalHits(response));
   }
 
   // TODO Uncomment these after problem with loading join index is resolved
-//    @Test
-//    public void childrenEqualsTestFieldNormalField() throws IOException {
-//        JSONObject response = executeQuery(
-//                        String.format(Locale.ROOT, "SELECT * " +
-//                                      "FROM %s/joinType " +
-//                                      "WHERE children(childrenType, info) = 'b'", TestsConstants.TEST_INDEX_JOIN_TYPE));
-//
-//        Assert.assertEquals(1, getTotalHits(response));
-//    }
-//
-//    @Test
-//    public void childrenOnInQuery() throws IOException {
-//        JSONObject response = executeQuery(
-//                        String.format(Locale.ROOT, "SELECT * " +
-//                                      "FROM %s/joinType " +
-//                                      "WHERE children(childrenType, info) IN ('a', 'b')",
-//                                TestsConstants.TEST_INDEX_JOIN_TYPE));
-//
-//        Assert.assertEquals(2, getTotalHits(response));
-//    }
-//
-//    @Test
-//    public void complexChildrenQueryBothOnSameObject() throws IOException {
-//        JSONObject response = executeQuery(
-//                        String.format(Locale.ROOT, "SELECT * " +
-//                                      "FROM %s/joinType " +
-//                                      "WHERE children(childrenType, info = 'a' AND author ='e')",
-//                                TestsConstants.TEST_INDEX_JOIN_TYPE));
-//
-//        Assert.assertEquals(1, getTotalHits(response));
-//    }
-//
-//    @Test
-//    public void complexChildrenQueryNotOnSameObject() throws IOException {
-//        JSONObject response = executeQuery(
-//                        String.format(Locale.ROOT, "SELECT * " +
-//                                      "FROM %s/joinType " +
-//                                      "WHERE children(childrenType, info = 'a' AND author ='j')",
-//                                TestsConstants.TEST_INDEX_JOIN_TYPE));
-//
-//        Assert.assertEquals(0, getTotalHits(response));
-//    }
-//
-//    @Test
-//    public void childrenOnInTermsQuery() throws IOException {
-//        JSONObject response = executeQuery(
-//                        String.format(Locale.ROOT, "SELECT * " +
-//                                      "FROM %s/joinType " +
-//                                      "WHERE children(childrenType, info) = IN_TERMS(a, b)",
-//                                TestsConstants.TEST_INDEX_JOIN_TYPE));
-//
-//        Assert.assertEquals(2, getTotalHits(response));
-//    }
+  //    @Test
+  //    public void childrenEqualsTestFieldNormalField() throws IOException {
+  //        JSONObject response = executeQuery(
+  //                        String.format(Locale.ROOT, "SELECT * " +
+  //                                      "FROM %s/joinType " +
+  //                                      "WHERE children(childrenType, info) = 'b'",
+  // TestsConstants.TEST_INDEX_JOIN_TYPE));
+  //
+  //        Assert.assertEquals(1, getTotalHits(response));
+  //    }
+  //
+  //    @Test
+  //    public void childrenOnInQuery() throws IOException {
+  //        JSONObject response = executeQuery(
+  //                        String.format(Locale.ROOT, "SELECT * " +
+  //                                      "FROM %s/joinType " +
+  //                                      "WHERE children(childrenType, info) IN ('a', 'b')",
+  //                                TestsConstants.TEST_INDEX_JOIN_TYPE));
+  //
+  //        Assert.assertEquals(2, getTotalHits(response));
+  //    }
+  //
+  //    @Test
+  //    public void complexChildrenQueryBothOnSameObject() throws IOException {
+  //        JSONObject response = executeQuery(
+  //                        String.format(Locale.ROOT, "SELECT * " +
+  //                                      "FROM %s/joinType " +
+  //                                      "WHERE children(childrenType, info = 'a' AND author
+  // ='e')",
+  //                                TestsConstants.TEST_INDEX_JOIN_TYPE));
+  //
+  //        Assert.assertEquals(1, getTotalHits(response));
+  //    }
+  //
+  //    @Test
+  //    public void complexChildrenQueryNotOnSameObject() throws IOException {
+  //        JSONObject response = executeQuery(
+  //                        String.format(Locale.ROOT, "SELECT * " +
+  //                                      "FROM %s/joinType " +
+  //                                      "WHERE children(childrenType, info = 'a' AND author
+  // ='j')",
+  //                                TestsConstants.TEST_INDEX_JOIN_TYPE));
+  //
+  //        Assert.assertEquals(0, getTotalHits(response));
+  //    }
+  //
+  //    @Test
+  //    public void childrenOnInTermsQuery() throws IOException {
+  //        JSONObject response = executeQuery(
+  //                        String.format(Locale.ROOT, "SELECT * " +
+  //                                      "FROM %s/joinType " +
+  //                                      "WHERE children(childrenType, info) = IN_TERMS(a, b)",
+  //                                TestsConstants.TEST_INDEX_JOIN_TYPE));
+  //
+  //        Assert.assertEquals(2, getTotalHits(response));
+  //    }
 
   @Ignore // the hint does not really work, NoSuchIndexException is thrown
   @Test
   public void multipleIndicesOneNotExistWithHint() throws IOException {
 
-    JSONObject response = executeQuery(String
-        .format(Locale.ROOT, "SELECT /*! IGNORE_UNAVAILABLE */ * FROM %s,%s ", TEST_INDEX_ACCOUNT,
-            "badindex"));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT /*! IGNORE_UNAVAILABLE */ * FROM %s,%s ",
+                TEST_INDEX_ACCOUNT,
+                "badindex"));
 
     Assert.assertTrue(getTotalHits(response) > 0);
   }
@@ -1573,8 +1753,8 @@ public void multipleIndicesOneNotExistWithoutHint() throws IOException {
           String.format(Locale.ROOT, "SELECT * FROM %s, %s", TEST_INDEX_ACCOUNT, "badindex"));
       Assert.fail("Expected exception, but call succeeded");
     } catch (ResponseException e) {
-      Assert.assertEquals(RestStatus.BAD_REQUEST.getStatus(),
-          e.getResponse().getStatusLine().getStatusCode());
+      Assert.assertEquals(
+          RestStatus.NOT_FOUND.getStatus(), e.getResponse().getStatusLine().getStatusCode());
       final String entity = TestUtils.getResponseBody(e.getResponse());
       Assert.assertThat(entity, containsString("\"type\": \"IndexNotFoundException\""));
     }
@@ -1582,29 +1762,36 @@ public void multipleIndicesOneNotExistWithoutHint() throws IOException {
 
   // TODO Find way to check routing() without SearchRequestBuilder
   //  to properly update these tests to OpenSearchIntegTestCase format
-//    @Test
-//    public void routingRequestOneRounting() throws IOException {
-//        SqlElasticSearchRequestBuilder request = getRequestBuilder(String.format(Locale.ROOT,
-//                                  "SELECT /*! ROUTINGS(hey) */ * FROM %s ", TEST_INDEX_ACCOUNT));
-//        SearchRequestBuilder searchRequestBuilder = (SearchRequestBuilder) request.getBuilder();
-//        Assert.assertEquals("hey",searchRequestBuilder.request().routing());
-//    }
-//
-//    @Test
-//    public void routingRequestMultipleRountings() throws IOException {
-//        SqlElasticSearchRequestBuilder request = getRequestBuilder(String.format(Locale.ROOT,
-//                                  "SELECT /*! ROUTINGS(hey,bye) */ * FROM %s ", TEST_INDEX_ACCOUNT));
-//        SearchRequestBuilder searchRequestBuilder = (SearchRequestBuilder) request.getBuilder();
-//        Assert.assertEquals("hey,bye",searchRequestBuilder.request().routing());
-//    }
+  //    @Test
+  //    public void routingRequestOneRounting() throws IOException {
+  //        SqlElasticSearchRequestBuilder request = getRequestBuilder(String.format(Locale.ROOT,
+  //                                  "SELECT /*! ROUTINGS(hey) */ * FROM %s ",
+  // TEST_INDEX_ACCOUNT));
+  //        SearchRequestBuilder searchRequestBuilder = (SearchRequestBuilder) request.getBuilder();
+  //        Assert.assertEquals("hey",searchRequestBuilder.request().routing());
+  //    }
+  //
+  //    @Test
+  //    public void routingRequestMultipleRountings() throws IOException {
+  //        SqlElasticSearchRequestBuilder request = getRequestBuilder(String.format(Locale.ROOT,
+  //                                  "SELECT /*! ROUTINGS(hey,bye) */ * FROM %s ",
+  // TEST_INDEX_ACCOUNT));
+  //        SearchRequestBuilder searchRequestBuilder = (SearchRequestBuilder) request.getBuilder();
+  //        Assert.assertEquals("hey,bye",searchRequestBuilder.request().routing());
+  //    }
 
   @Ignore // Getting parser error: syntax error, expect RPAREN, actual IDENTIFIER insert_time
   @Test
   public void scriptFilterNoParams() throws IOException {
 
-    JSONObject result = executeQuery(String.format(Locale.ROOT,
-        "SELECT insert_time FROM %s where script('doc[\\'insert_time\''].date.hourOfDay==16') " +
-            "and insert_time <'2014-08-21T00:00:00.000Z'", TEST_INDEX_ONLINE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT insert_time FROM %s where"
+                    + " script('doc[\\'insert_time\''].date.hourOfDay==16') and insert_time"
+                    + " <'2014-08-21T00:00:00.000Z'",
+                TEST_INDEX_ONLINE));
     Assert.assertEquals(237, getTotalHits(result));
   }
 
@@ -1612,20 +1799,28 @@ public void scriptFilterNoParams() throws IOException {
   @Test
   public void scriptFilterWithParams() throws IOException {
 
-    JSONObject result = executeQuery(String.format(Locale.ROOT,
-        "SELECT insert_time FROM %s where script('doc[\\'insert_time\''].date.hourOfDay==x','x'=16) " +
-            "and insert_time <'2014-08-21T00:00:00.000Z'", TEST_INDEX_ONLINE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT insert_time FROM %s where"
+                    + " script('doc[\\'insert_time\''].date.hourOfDay==x','x'=16) and insert_time"
+                    + " <'2014-08-21T00:00:00.000Z'",
+                TEST_INDEX_ONLINE));
     Assert.assertEquals(237, getTotalHits(result));
   }
 
   @Test
   public void highlightPreTagsAndPostTags() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT,
-            "SELECT /*! HIGHLIGHT(phrase, pre_tags : ['<b>'], post_tags : ['</b>']) */ " +
-                "* FROM %s " +
-                "WHERE phrase LIKE 'fox' " +
-                "ORDER BY _score", TestsConstants.TEST_INDEX_PHRASE));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT /*! HIGHLIGHT(phrase, pre_tags : ['<b>'], post_tags : ['</b>']) */ "
+                    + "* FROM %s "
+                    + "WHERE phrase LIKE 'fox' "
+                    + "ORDER BY _score",
+                TestsConstants.TEST_INDEX_PHRASE));
 
     JSONArray hits = getHits(response);
     for (int i = 0; i < hits.length(); i++) {
@@ -1640,13 +1835,17 @@ public void highlightPreTagsAndPostTags() throws IOException {
   @Ignore
   @Test
   public void fieldCollapsingTest() throws IOException {
-    JSONObject response = executeQuery(
-        String.format(Locale.ROOT, "SELECT /*! COLLAPSE({\"field\":\"age\"," +
-            "\"inner_hits\":{\"name\": \"account\"," +
-            "\"size\":1," +
-            "\"sort\":[{\"age\":\"asc\"}]}," +
-            "\"max_concurrent_group_searches\": 4}) */ " +
-            "* FROM %s", TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                Locale.ROOT,
+                "SELECT /*! COLLAPSE({\"field\":\"age\","
+                    + "\"inner_hits\":{\"name\": \"account\","
+                    + "\"size\":1,"
+                    + "\"sort\":[{\"age\":\"asc\"}]},"
+                    + "\"max_concurrent_group_searches\": 4}) */ "
+                    + "* FROM %s",
+                TEST_INDEX_ACCOUNT));
 
     JSONArray hits = getHits(response);
     Assert.assertEquals(21, hits.length());
@@ -1656,8 +1855,8 @@ public void fieldCollapsingTest() throws IOException {
   @Test
   public void backticksQuotedIndexNameTest() throws Exception {
     TestUtils.createIndexByRestClient(client(), "bank_unquote", null);
-    TestUtils
-        .loadDataByRestClient(client(), "bank", "/src/test/resources/bank_for_unquote_test.json");
+    TestUtils.loadDataByRestClient(
+        client(), "bank", "/src/test/resources/bank_for_unquote_test.json");
 
     JSONArray hits = getHits(executeQuery("SELECT lastname FROM `bank`"));
     Object responseIndex = ((JSONObject) hits.get(0)).query("/_index");
@@ -1665,39 +1864,57 @@ public void backticksQuotedIndexNameTest() throws Exception {
 
     assertEquals(
         executeQuery("SELECT lastname FROM bank", "jdbc"),
-        executeQuery("SELECT `bank`.`lastname` FROM `bank`", "jdbc")
-    );
+        executeQuery("SELECT `bank`.`lastname` FROM `bank`", "jdbc"));
 
     assertEquals(
         executeQuery(
-            "SELECT `b`.`age` AS `AGE`, AVG(`b`.`balance`) FROM `bank` AS `b` " +
-                "WHERE ABS(`b`.`age`) > 20 GROUP BY `b`.`age` ORDER BY `b`.`age`",
+            "SELECT `b`.`age` AS `AGE`, AVG(`b`.`balance`) FROM `bank` AS `b` "
+                + "WHERE ABS(`b`.`age`) > 20 GROUP BY `b`.`age` ORDER BY `b`.`age`",
             "jdbc"),
-        executeQuery("SELECT b.age AS AGE, AVG(balance) FROM bank AS b " +
-                "WHERE ABS(age) > 20 GROUP BY b.age ORDER BY b.age",
-            "jdbc")
-    );
+        executeQuery(
+            "SELECT b.age AS AGE, AVG(balance) FROM bank AS b "
+                + "WHERE ABS(age) > 20 GROUP BY b.age ORDER BY b.age",
+            "jdbc"));
   }
 
   @Test
   public void backticksQuotedFieldNamesTest() {
-    String expected = executeQuery(StringUtils.format("SELECT b.lastname FROM %s " +
-        "AS b ORDER BY age LIMIT 3", TestsConstants.TEST_INDEX_BANK), "jdbc");
-    String quotedFieldResult = executeQuery(StringUtils.format("SELECT b.`lastname` FROM %s " +
-        "AS b ORDER BY age LIMIT 3", TestsConstants.TEST_INDEX_BANK), "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT b.lastname FROM %s " + "AS b ORDER BY age LIMIT 3",
+                TestsConstants.TEST_INDEX_BANK),
+            "jdbc");
+    String quotedFieldResult =
+        executeQuery(
+            StringUtils.format(
+                "SELECT b.`lastname` FROM %s " + "AS b ORDER BY age LIMIT 3",
+                TestsConstants.TEST_INDEX_BANK),
+            "jdbc");
 
     assertEquals(expected, quotedFieldResult);
   }
 
   @Test
   public void backticksQuotedAliasTest() {
-    String expected = executeQuery(StringUtils.format("SELECT b.lastname FROM %s " +
-        "AS b ORDER BY age LIMIT 3", TestsConstants.TEST_INDEX_BANK), "jdbc");
-    String quotedAliasResult = executeQuery(StringUtils.format("SELECT `b`.lastname FROM %s" +
-        " AS `b` ORDER BY age LIMIT 3", TestsConstants.TEST_INDEX_BANK), "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT b.lastname FROM %s " + "AS b ORDER BY age LIMIT 3",
+                TestsConstants.TEST_INDEX_BANK),
+            "jdbc");
+    String quotedAliasResult =
+        executeQuery(
+            StringUtils.format(
+                "SELECT `b`.lastname FROM %s" + " AS `b` ORDER BY age LIMIT 3",
+                TestsConstants.TEST_INDEX_BANK),
+            "jdbc");
     String quotedAliasAndFieldResult =
-        executeQuery(StringUtils.format("SELECT `b`.`lastname` FROM %s " +
-            "AS `b` ORDER BY age LIMIT 3", TestsConstants.TEST_INDEX_BANK), "jdbc");
+        executeQuery(
+            StringUtils.format(
+                "SELECT `b`.`lastname` FROM %s " + "AS `b` ORDER BY age LIMIT 3",
+                TestsConstants.TEST_INDEX_BANK),
+            "jdbc");
 
     assertEquals(expected, quotedAliasResult);
     assertEquals(expected, quotedAliasAndFieldResult);
@@ -1705,19 +1922,28 @@ public void backticksQuotedAliasTest() {
 
   @Test
   public void backticksQuotedAliasWithSpecialCharactersTest() {
-    String expected = executeQuery(StringUtils.format("SELECT b.lastname FROM %s " +
-        "AS b ORDER BY age LIMIT 3", TestsConstants.TEST_INDEX_BANK), "jdbc");
+    String expected =
+        executeQuery(
+            StringUtils.format(
+                "SELECT b.lastname FROM %s " + "AS b ORDER BY age LIMIT 3",
+                TestsConstants.TEST_INDEX_BANK),
+            "jdbc");
     String specialCharAliasResult =
-        executeQuery(StringUtils.format("SELECT `b k`.lastname FROM %s " +
-            "AS `b k` ORDER BY age LIMIT 3", TestsConstants.TEST_INDEX_BANK), "jdbc");
+        executeQuery(
+            StringUtils.format(
+                "SELECT `b k`.lastname FROM %s " + "AS `b k` ORDER BY age LIMIT 3",
+                TestsConstants.TEST_INDEX_BANK),
+            "jdbc");
 
     assertEquals(expected, specialCharAliasResult);
   }
 
   @Test
   public void backticksQuotedAliasInJDBCResponseTest() {
-    String query = StringUtils.format("SELECT `b`.`lastname` AS `name` FROM %s AS `b` " +
-        "ORDER BY age LIMIT 3", TestsConstants.TEST_INDEX_BANK);
+    String query =
+        StringUtils.format(
+            "SELECT `b`.`lastname` AS `name` FROM %s AS `b` " + "ORDER BY age LIMIT 3",
+            TestsConstants.TEST_INDEX_BANK);
     String response = executeQuery(query, "jdbc");
 
     assertTrue(response.contains("\"alias\": \"name\""));
@@ -1725,10 +1951,14 @@ public void backticksQuotedAliasInJDBCResponseTest() {
 
   @Test
   public void caseWhenSwitchTest() throws IOException {
-    JSONObject response = executeQuery("SELECT CASE age " +
-        "WHEN 30 THEN '1' " +
-        "WHEN 40 THEN '2' " +
-        "ELSE '0' END AS cases FROM " + TEST_INDEX_ACCOUNT + " WHERE age IS NOT NULL");
+    JSONObject response =
+        executeQuery(
+            "SELECT CASE age "
+                + "WHEN 30 THEN '1' "
+                + "WHEN 40 THEN '2' "
+                + "ELSE '0' END AS cases FROM "
+                + TEST_INDEX_ACCOUNT
+                + " WHERE age IS NOT NULL");
     JSONObject hit = getHits(response).getJSONObject(0);
     String age = hit.query("/_source/age").toString();
     String cases = age.equals("30") ? "1" : age.equals("40") ? "2" : "0";
@@ -1738,49 +1968,61 @@ public void caseWhenSwitchTest() throws IOException {
 
   @Test
   public void caseWhenJdbcResponseTest() {
-    String response = executeQuery("SELECT CASE age " +
-        "WHEN 30 THEN 'age is 30' " +
-        "WHEN 40 THEN 'age is 40' " +
-        "ELSE 'NA' END AS cases FROM " + TEST_INDEX_ACCOUNT + " WHERE age is not null", "jdbc");
+    String response =
+        executeQuery(
+            "SELECT CASE age "
+                + "WHEN 30 THEN 'age is 30' "
+                + "WHEN 40 THEN 'age is 40' "
+                + "ELSE 'NA' END AS cases FROM "
+                + TEST_INDEX_ACCOUNT
+                + " WHERE age is not null",
+            "jdbc");
     assertTrue(
-        response.contains("age is 30") ||
-            response.contains("age is 40") ||
-            response.contains("NA")
-    );
+        response.contains("age is 30")
+            || response.contains("age is 40")
+            || response.contains("NA"));
   }
 
   @Ignore("This is already supported in new SQL engine")
   @Test
   public void functionInCaseFieldShouldThrowESExceptionDueToIllegalScriptInJdbc() {
-    String response = executeQuery(
-        "select case lower(firstname) when 'amber' then '1' else '2' end as cases from " +
-            TEST_INDEX_ACCOUNT,
-        "jdbc");
-    queryInJdbcResponseShouldIndicateESException(response, "SearchPhaseExecutionException",
+    String response =
+        executeQuery(
+            "select case lower(firstname) when 'amber' then '1' else '2' end as cases from "
+                + TEST_INDEX_ACCOUNT,
+            "jdbc");
+    queryInJdbcResponseShouldIndicateESException(
+        response,
+        "SearchPhaseExecutionException",
         "For more details, please send request for Json format");
   }
 
   @Ignore("This is already supported in our new query engine")
   @Test
   public void functionCallWithIllegalScriptShouldThrowESExceptionInJdbc() {
-    String response = executeQuery("select log(balance + 2) from " + TEST_INDEX_BANK,
-        "jdbc");
-    queryInJdbcResponseShouldIndicateESException(response, "SearchPhaseExecutionException",
+    String response = executeQuery("select log(balance + 2) from " + TEST_INDEX_BANK, "jdbc");
+    queryInJdbcResponseShouldIndicateESException(
+        response,
+        "SearchPhaseExecutionException",
         "please send request for Json format to see the raw response from OpenSearch engine.");
   }
 
-  @Ignore("Goes in different route, does not call PrettyFormatRestExecutor.execute methods." +
-      "The performRequest method in RestClient doesn't throw any exceptions for null value fields in script")
+  @Ignore(
+      "Goes in different route, does not call PrettyFormatRestExecutor.execute methods.The"
+          + " performRequest method in RestClient doesn't throw any exceptions for null value"
+          + " fields in script")
   @Test
   public void functionArgWithNullValueFieldShouldThrowESExceptionInJdbc() {
-    String response = executeQuery(
-        "select log(balance) from " + TEST_INDEX_BANK_WITH_NULL_VALUES, "jdbc");
-    queryInJdbcResponseShouldIndicateESException(response, "SearchPhaseExecutionException",
+    String response =
+        executeQuery("select log(balance) from " + TEST_INDEX_BANK_WITH_NULL_VALUES, "jdbc");
+    queryInJdbcResponseShouldIndicateESException(
+        response,
+        "SearchPhaseExecutionException",
         "For more details, please send request for Json format");
   }
 
-  private void queryInJdbcResponseShouldIndicateESException(String response, String exceptionType,
-                                                            String... errMsgs) {
+  private void queryInJdbcResponseShouldIndicateESException(
+      String response, String exceptionType, String... errMsgs) {
     Assert.assertThat(response, containsString(exceptionType));
     for (String errMsg : errMsgs) {
       Assert.assertThat(response, containsString(errMsg));
@@ -1803,9 +2045,21 @@ private void checkAggregationResponseSize(JSONObject response, int sizeCheck) {
 
   private void checkSelectAllAndFieldResponseSize(JSONObject response) {
     String[] arr =
-        new String[] {"account_number", "firstname", "address", "birthdate", "gender", "city",
-            "lastname",
-            "balance", "employer", "state", "age", "email", "male"};
+        new String[] {
+          "account_number",
+          "firstname",
+          "address",
+          "birthdate",
+          "gender",
+          "city",
+          "lastname",
+          "balance",
+          "employer",
+          "state",
+          "age",
+          "email",
+          "male"
+        };
     Set<String> expectedSource = new HashSet<>(Arrays.asList(arr));
 
     JSONArray hits = getHits(response);
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/RestIntegTestCase.java b/integ-test/src/test/java/org/opensearch/sql/legacy/RestIntegTestCase.java
index f06adf7aa9..fc9112afdf 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/RestIntegTestCase.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/RestIntegTestCase.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
+import static org.opensearch.core.common.Strings.isNullOrEmpty;
 import static org.opensearch.sql.legacy.TestUtils.createIndexByRestClient;
 import static org.opensearch.sql.legacy.TestUtils.getAccountIndexMapping;
 import static org.opensearch.sql.legacy.TestUtils.getBankIndexMapping;
@@ -43,23 +43,20 @@
 import org.junit.Before;
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;
-import org.opensearch.common.Strings;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 /**
  * SQL plugin integration test base class (migrated from SQLIntegTestCase)
- * <p>
- * The execution of order is as follows:
- * <p>
- * OpenSearchRestTestCase:   1) initClient()                                       N+1) closeClient()
- * \                                                     /
- * SQLIntegTestCase:     2) setUpIndices() -&gt; 4) setUpIndices() ... -&gt; N) cleanUpIndices()
- * \                      \
- * XXXTIT:                  3) init()             5) init()
- * <p>
- * TODO: this base class should extends ODFERestTestCase
+ *
+ * <p>The execution of order is as follows:
+ *
+ * <p>OpenSearchRestTestCase: 1) initClient() N+1) closeClient() \ / SQLIntegTestCase: 2)
+ * setUpIndices() -&gt; 4) setUpIndices() ... -&gt; N) cleanUpIndices() \ \ XXXTIT: 3) init() 5)
+ * init()
+ *
+ * <p>TODO: this base class should extends ODFERestTestCase
  */
 public abstract class RestIntegTestCase extends OpenSearchSQLRestTestCase {
 
@@ -78,12 +75,12 @@ protected boolean preserveClusterUponCompletion() {
   }
 
   /**
-   * We need to be able to dump the jacoco coverage before cluster is shut down.
-   * The new internal testing framework removed some of the gradle tasks we were listening to
-   * to choose a good time to do it. This will dump the executionData to file after each test.
-   * TODO: This is also currently just overwriting integTest.exec with the updated execData without
-   * resetting after writing each time. This can be improved to either write an exec file per test
-   * or by letting jacoco append to the file
+   * We need to be able to dump the jacoco coverage before cluster is shut down. The new internal
+   * testing framework removed some of the gradle tasks we were listening to to choose a good time
+   * to do it. This will dump the executionData to file after each test. TODO: This is also
+   * currently just overwriting integTest.exec with the updated execData without resetting after
+   * writing each time. This can be improved to either write an exec file per test or by letting
+   * jacoco append to the file
    */
   public interface IProxy {
     byte[] getExecutionData(boolean reset);
@@ -98,16 +95,18 @@ public static void dumpCoverage() {
     // jacoco.dir is set in sqlplugin-coverage.gradle, if it doesn't exist we don't
     // want to collect coverage so we can return early
     String jacocoBuildPath = System.getProperty("jacoco.dir");
-    if (Strings.isNullOrEmpty(jacocoBuildPath)) {
+    if (isNullOrEmpty(jacocoBuildPath)) {
       return;
     }
 
     String serverUrl = "service:jmx:rmi:///jndi/rmi://127.0.0.1:7777/jmxrmi";
     try (JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(serverUrl))) {
-      IProxy proxy = MBeanServerInvocationHandler.newProxyInstance(
-          connector.getMBeanServerConnection(), new ObjectName("org.jacoco:type=Runtime"),
-          IProxy.class,
-          false);
+      IProxy proxy =
+          MBeanServerInvocationHandler.newProxyInstance(
+              connector.getMBeanServerConnection(),
+              new ObjectName("org.jacoco:type=Runtime"),
+              IProxy.class,
+              false);
 
       Path path = Paths.get(jacocoBuildPath + "/integTest.exec");
       Files.write(path, proxy.getExecutionData(false));
@@ -117,9 +116,9 @@ public static void dumpCoverage() {
   }
 
   /**
-   * As JUnit JavaDoc says:
-   * "The @AfterClass methods declared in superclasses will be run after those of the current class."
-   * So this method is supposed to run before closeClients() in parent class.
+   * As JUnit JavaDoc says: "The @AfterClass methods declared in superclasses will be run after
+   * those of the current class." So this method is supposed to run before closeClients() in parent
+   * class.
    */
   @AfterClass
   public static void cleanUpIndices() throws IOException {
@@ -128,8 +127,8 @@ public static void cleanUpIndices() throws IOException {
   }
 
   /**
-   * Make it thread-safe in case tests are running in parallel but does not guarantee
-   * if test like DeleteIT that mutates cluster running in parallel.
+   * Make it thread-safe in case tests are running in parallel but does not guarantee if test like
+   * DeleteIT that mutates cluster running in parallel.
    */
   protected synchronized void loadIndex(Index index) throws IOException {
     String indexName = index.getName();
@@ -142,11 +141,8 @@ protected synchronized void loadIndex(Index index) throws IOException {
     }
   }
 
-  /**
-   * Provide for each test to load test index, data and other setup work
-   */
-  protected void init() throws Exception {
-  }
+  /** Provide for each test to load test index, data and other setup work */
+  protected void init() throws Exception {}
 
   protected static void updateClusterSetting(String settingKey, Object value) throws IOException {
     updateClusterSetting(settingKey, value, true);
@@ -155,18 +151,18 @@ protected static void updateClusterSetting(String settingKey, Object value) thro
   protected static void updateClusterSetting(String settingKey, Object value, boolean persistent)
       throws IOException {
     String property = persistent ? PERSISTENT : TRANSIENT;
-    XContentBuilder builder = XContentFactory
-        .jsonBuilder()
-        .startObject()
-        .startObject(property)
-        .field(settingKey, value)
-        .endObject()
-        .endObject();
+    XContentBuilder builder =
+        XContentFactory.jsonBuilder()
+            .startObject()
+            .startObject(property)
+            .field(settingKey, value)
+            .endObject()
+            .endObject();
     Request request = new Request("PUT", "_cluster/settings");
-    request.setJsonEntity(Strings.toString(builder));
+    request.setJsonEntity(builder.toString());
     Response response = client().performRequest(request);
-    Assert
-        .assertEquals(RestStatus.OK, RestStatus.fromCode(response.getStatusLine().getStatusCode()));
+    Assert.assertEquals(
+        RestStatus.OK, RestStatus.fromCode(response.getStatusLine().getStatusCode()));
   }
 
   protected static void wipeAllClusterSettings() throws IOException {
@@ -174,103 +170,109 @@ protected static void wipeAllClusterSettings() throws IOException {
     updateClusterSetting("*", null, false);
   }
 
-  /**
-   * Enum for associating test index with relevant mapping and data.
-   */
+  /** Enum for associating test index with relevant mapping and data. */
   public enum Index {
-    ONLINE(TestsConstants.TEST_INDEX_ONLINE,
-        "online",
-        null,
-        "src/test/resources/online.json"),
-    ACCOUNT(TestsConstants.TEST_INDEX_ACCOUNT,
+    ONLINE(TestsConstants.TEST_INDEX_ONLINE, "online", null, "src/test/resources/online.json"),
+    ACCOUNT(
+        TestsConstants.TEST_INDEX_ACCOUNT,
         "account",
         getAccountIndexMapping(),
         "src/test/resources/accounts.json"),
-    PHRASE(TestsConstants.TEST_INDEX_PHRASE,
+    PHRASE(
+        TestsConstants.TEST_INDEX_PHRASE,
         "phrase",
         getPhraseIndexMapping(),
         "src/test/resources/phrases.json"),
-    DOG(TestsConstants.TEST_INDEX_DOG,
-        "dog",
-        getDogIndexMapping(),
-        "src/test/resources/dogs.json"),
-    DOGS2(TestsConstants.TEST_INDEX_DOG2,
+    DOG(TestsConstants.TEST_INDEX_DOG, "dog", getDogIndexMapping(), "src/test/resources/dogs.json"),
+    DOGS2(
+        TestsConstants.TEST_INDEX_DOG2,
         "dog",
         getDogs2IndexMapping(),
         "src/test/resources/dogs2.json"),
-    DOGS3(TestsConstants.TEST_INDEX_DOG3,
+    DOGS3(
+        TestsConstants.TEST_INDEX_DOG3,
         "dog",
         getDogs3IndexMapping(),
         "src/test/resources/dogs3.json"),
-    DOGSSUBQUERY(TestsConstants.TEST_INDEX_DOGSUBQUERY,
+    DOGSSUBQUERY(
+        TestsConstants.TEST_INDEX_DOGSUBQUERY,
         "dog",
         getDogIndexMapping(),
         "src/test/resources/dogsubquery.json"),
-    PEOPLE(TestsConstants.TEST_INDEX_PEOPLE,
-        "people",
-        null,
-        "src/test/resources/peoples.json"),
-    PEOPLE2(TestsConstants.TEST_INDEX_PEOPLE2,
+    PEOPLE(TestsConstants.TEST_INDEX_PEOPLE, "people", null, "src/test/resources/peoples.json"),
+    PEOPLE2(
+        TestsConstants.TEST_INDEX_PEOPLE2,
         "people",
         getPeople2IndexMapping(),
         "src/test/resources/people2.json"),
-    GAME_OF_THRONES(TestsConstants.TEST_INDEX_GAME_OF_THRONES,
+    GAME_OF_THRONES(
+        TestsConstants.TEST_INDEX_GAME_OF_THRONES,
         "gotCharacters",
         getGameOfThronesIndexMapping(),
         "src/test/resources/game_of_thrones_complex.json"),
-    SYSTEM(TestsConstants.TEST_INDEX_SYSTEM,
-        "systems",
-        null,
-        "src/test/resources/systems.json"),
-    ODBC(TestsConstants.TEST_INDEX_ODBC,
+    SYSTEM(TestsConstants.TEST_INDEX_SYSTEM, "systems", null, "src/test/resources/systems.json"),
+    ODBC(
+        TestsConstants.TEST_INDEX_ODBC,
         "odbc",
         getOdbcIndexMapping(),
         "src/test/resources/odbc-date-formats.json"),
-    LOCATION(TestsConstants.TEST_INDEX_LOCATION,
+    LOCATION(
+        TestsConstants.TEST_INDEX_LOCATION,
         "location",
         getLocationIndexMapping(),
         "src/test/resources/locations.json"),
-    LOCATION_TWO(TestsConstants.TEST_INDEX_LOCATION2,
+    LOCATION_TWO(
+        TestsConstants.TEST_INDEX_LOCATION2,
         "location2",
         getLocationIndexMapping(),
         "src/test/resources/locations2.json"),
-    NESTED(TestsConstants.TEST_INDEX_NESTED_TYPE,
+    NESTED(
+        TestsConstants.TEST_INDEX_NESTED_TYPE,
         "nestedType",
         getNestedTypeIndexMapping(),
         "src/test/resources/nested_objects.json"),
-    NESTED_WITH_QUOTES(TestsConstants.TEST_INDEX_NESTED_WITH_QUOTES,
+    NESTED_WITH_QUOTES(
+        TestsConstants.TEST_INDEX_NESTED_WITH_QUOTES,
         "nestedType",
         getNestedTypeIndexMapping(),
         "src/test/resources/nested_objects_quotes_in_values.json"),
-    EMPLOYEE_NESTED(TestsConstants.TEST_INDEX_EMPLOYEE_NESTED,
+    EMPLOYEE_NESTED(
+        TestsConstants.TEST_INDEX_EMPLOYEE_NESTED,
         "_doc",
         getEmployeeNestedTypeIndexMapping(),
         "src/test/resources/employee_nested.json"),
-    JOIN(TestsConstants.TEST_INDEX_JOIN_TYPE,
+    JOIN(
+        TestsConstants.TEST_INDEX_JOIN_TYPE,
         "joinType",
         getJoinTypeIndexMapping(),
         "src/test/resources/join_objects.json"),
-    BANK(TestsConstants.TEST_INDEX_BANK,
+    BANK(
+        TestsConstants.TEST_INDEX_BANK,
         "account",
         getBankIndexMapping(),
         "src/test/resources/bank.json"),
-    BANK_TWO(TestsConstants.TEST_INDEX_BANK_TWO,
+    BANK_TWO(
+        TestsConstants.TEST_INDEX_BANK_TWO,
         "account_two",
         getBankIndexMapping(),
         "src/test/resources/bank_two.json"),
-    BANK_WITH_NULL_VALUES(TestsConstants.TEST_INDEX_BANK_WITH_NULL_VALUES,
+    BANK_WITH_NULL_VALUES(
+        TestsConstants.TEST_INDEX_BANK_WITH_NULL_VALUES,
         "account_null",
         getBankWithNullValuesIndexMapping(),
         "src/test/resources/bank_with_null_values.json"),
-    ORDER(TestsConstants.TEST_INDEX_ORDER,
+    ORDER(
+        TestsConstants.TEST_INDEX_ORDER,
         "_doc",
         getOrderIndexMapping(),
         "src/test/resources/order.json"),
-    WEBLOG(TestsConstants.TEST_INDEX_WEBLOG,
+    WEBLOG(
+        TestsConstants.TEST_INDEX_WEBLOG,
         "weblog",
         getWeblogsIndexMapping(),
         "src/test/resources/weblogs.json"),
-    DATE(TestsConstants.TEST_INDEX_DATE,
+    DATE(
+        TestsConstants.TEST_INDEX_DATE,
         "dates",
         getDateIndexMapping(),
         "src/test/resources/dates.json");
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/SQLFunctionsIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/SQLFunctionsIT.java
index a19ed4db21..877f803189 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/SQLFunctionsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/SQLFunctionsIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.allOf;
@@ -28,28 +27,24 @@
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import java.io.IOException;
 import java.util.Date;
 import java.util.stream.IntStream;
 import org.hamcrest.collection.IsMapContaining;
 import org.json.JSONObject;
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 
-
-/**
- * Created by allwefantasy on 8/25/16.
- */
+/** Created by allwefantasy on 8/25/16. */
 public class SQLFunctionsIT extends SQLIntegTestCase {
 
   @Override
@@ -62,70 +57,75 @@ protected void init() throws Exception {
 
   @Test
   public void functionFieldAliasAndGroupByAlias() throws Exception {
-    String query = "SELECT " +
-        "floor(substring(address,0,3)*20) as key," +
-        "sum(age) cvalue FROM " + TEST_INDEX_ACCOUNT + " where address is not null " +
-        "group by key order by cvalue desc limit 10  ";
+    String query =
+        "SELECT "
+            + "floor(substring(address,0,3)*20) as key,"
+            + "sum(age) cvalue FROM "
+            + TEST_INDEX_ACCOUNT
+            + " where address is not null "
+            + "group by key order by cvalue desc limit 10  ";
     final JSONObject result = executeQuery(query);
 
-
-    IntStream.rangeClosed(0, 9).forEach(i -> {
-          Assert.assertNotNull(result.query(String.format("/aggregations/key/buckets/%d/key", i)));
-          Assert.assertNotNull(
-              result.query(String.format("/aggregations/key/buckets/%d/cvalue/value", i)));
-        }
-    );
+    IntStream.rangeClosed(0, 9)
+        .forEach(
+            i -> {
+              Assert.assertNotNull(
+                  result.query(String.format("/aggregations/key/buckets/%d/key", i)));
+              Assert.assertNotNull(
+                  result.query(String.format("/aggregations/key/buckets/%d/cvalue/value", i)));
+            });
   }
 
   /**
    * todo fix the issue.
    *
-   * @see <a href="https://github.com/opendistro-for-elasticsearch/sql/issues/59">https://github.com/opendistro-for-elasticsearch/sql/issues/59</a>
+   * @see <a
+   *     href="https://github.com/opendistro-for-elasticsearch/sql/issues/59">https://github.com/opendistro-for-elasticsearch/sql/issues/59</a>
    */
   @Ignore
   public void normalFieldAlias() throws Exception {
 
-    //here is a bug,csv field with spa
-    String query = "SELECT " +
-        "address as key,age from " +
-        TEST_INDEX_ACCOUNT + " where address is not null " +
-        "limit 10  ";
+    // here is a bug,csv field with spa
+    String query =
+        "SELECT "
+            + "address as key,age from "
+            + TEST_INDEX_ACCOUNT
+            + " where address is not null "
+            + "limit 10  ";
 
-    assertThat(
-        executeQuery(query),
-        hitAny(kvString("/_source/key", not(isEmptyOrNullString())))
-    );
+    assertThat(executeQuery(query), hitAny(kvString("/_source/key", not(isEmptyOrNullString()))));
   }
 
   @Test
   public void functionAlias() throws Exception {
-    //here is a bug,if only script fields are included,then all fields will return; fix later
-    String query = "SELECT " +
-        "substring(address,0,3) as key,address from " +
-        TEST_INDEX_ACCOUNT + " where address is not null " +
-        "order by address desc limit 10  ";
+    // here is a bug,if only script fields are included,then all fields will return; fix later
+    String query =
+        "SELECT "
+            + "substring(address,0,3) as key,address from "
+            + TEST_INDEX_ACCOUNT
+            + " where address is not null "
+            + "order by address desc limit 10  ";
 
     assertThat(
         executeQuery(query),
-        hitAny(both(kvString("/_source/address", equalTo("863 Wythe Place")))
-            .and(kvString("/fields/key/0",
-                equalTo("863"))))
-    );
+        hitAny(
+            both(kvString("/_source/address", equalTo("863 Wythe Place")))
+                .and(kvString("/fields/key/0", equalTo("863")))));
   }
 
   @Test
   public void caseChangeTest() throws IOException {
-    String query = "SELECT LOWER(firstname) " +
-        "FROM opensearch-sql_test_index_account " +
-        "WHERE UPPER(lastname)='DUKE' " +
-        "ORDER BY upper(lastname) ";
+    String query =
+        "SELECT LOWER(firstname) "
+            + "FROM opensearch-sql_test_index_account "
+            + "WHERE UPPER(lastname)='DUKE' "
+            + "ORDER BY upper(lastname) ";
 
     assertThat(
         executeQuery(query),
         hitAny(
             kvString("/_source/address", equalTo("880 Holmes Lane")),
-            kvString("/fields/LOWER(firstname)/0", equalTo("amber")))
-    );
+            kvString("/fields/LOWER(firstname)/0", equalTo("amber"))));
   }
 
   @Test
@@ -134,23 +134,23 @@ public void caseChangeTestWithLocale() throws IOException {
     // "IL".toLowerCase() in a Turkish locale returns "ıl"
     // https://stackoverflow.com/questions/11063102/using-locales-with-javas-tolowercase-and-touppercase
 
-    String query = "SELECT LOWER(state.keyword, 'tr') " +
-        "FROM opensearch-sql_test_index_account " +
-        "WHERE account_number=1";
+    String query =
+        "SELECT LOWER(state.keyword, 'tr') "
+            + "FROM opensearch-sql_test_index_account "
+            + "WHERE account_number=1";
 
     assertThat(
         executeQuery(query),
-        hitAny(
-            kvString("/fields/LOWER(state.keyword, 'tr')/0", equalTo("ıl")))
-    );
+        hitAny(kvString("/fields/LOWER(state.keyword, 'tr')/0", equalTo("ıl"))));
   }
 
   @Test
   public void caseChangeWithAggregationTest() throws IOException {
-    String query = "SELECT UPPER(e.firstname) AS upper, COUNT(*)" +
-        "FROM opensearch-sql_test_index_account e " +
-        "WHERE LOWER(e.lastname)='duke' " +
-        "GROUP BY upper";
+    String query =
+        "SELECT UPPER(e.firstname) AS upper, COUNT(*)"
+            + "FROM opensearch-sql_test_index_account e "
+            + "WHERE LOWER(e.lastname)='duke' "
+            + "GROUP BY upper";
 
     assertThat(
         executeQuery(query),
@@ -159,8 +159,10 @@ public void caseChangeWithAggregationTest() throws IOException {
 
   @Test
   public void castIntFieldToDoubleWithoutAliasTest() throws IOException {
-    String query = "SELECT CAST(age AS DOUBLE) FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-        " ORDER BY age DESC LIMIT 5";
+    String query =
+        "SELECT CAST(age AS DOUBLE) FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + " ORDER BY age DESC LIMIT 5";
 
     SearchHit[] hits = query(query).getHits();
     checkSuccessfulFieldCast(hits, "cast_age", "DOUBLE");
@@ -172,8 +174,9 @@ public void castIntFieldToDoubleWithoutAliasTest() throws IOException {
   @Test
   public void castIntFieldToDoubleWithAliasTest() throws IOException {
     String query =
-        "SELECT CAST(age AS DOUBLE) AS test_alias FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-            " ORDER BY age LIMIT 5";
+        "SELECT CAST(age AS DOUBLE) AS test_alias FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + " ORDER BY age LIMIT 5";
 
     SearchHit[] hits = query(query).getHits();
     checkSuccessfulFieldCast(hits, "test_alias", "DOUBLE");
@@ -184,8 +187,10 @@ public void castIntFieldToDoubleWithAliasTest() throws IOException {
 
   @Test
   public void castIntFieldToStringWithoutAliasTest() throws IOException {
-    String query = "SELECT CAST(balance AS STRING) FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-        " ORDER BY balance LIMIT 1";
+    String query =
+        "SELECT CAST(balance AS STRING) FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + " ORDER BY balance LIMIT 1";
 
     SearchHit[] hits = query(query).getHits();
     checkSuccessfulFieldCast(hits, "cast_balance", "STRING");
@@ -196,48 +201,51 @@ public void castIntFieldToStringWithoutAliasTest() throws IOException {
 
   @Test
   public void castIntFieldToStringWithAliasTest() throws IOException {
-    String query = "SELECT CAST(balance AS STRING) AS cast_string_alias FROM " +
-        TestsConstants.TEST_INDEX_ACCOUNT +
-        " ORDER BY cast_string_alias DESC LIMIT 1";
+    String query =
+        "SELECT CAST(balance AS STRING) AS cast_string_alias FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + " ORDER BY cast_string_alias DESC LIMIT 1";
 
     SearchHit[] hits = query(query).getHits();
     checkSuccessfulFieldCast(hits, "cast_string_alias", "STRING");
     for (int i = 0; i < hits.length; ++i) {
       Assert.assertThat(hits[i].getFields().get("cast_string_alias").getValue(), is("9838"));
     }
-
   }
 
   @Test
   public void castIntFieldToFloatWithoutAliasJdbcFormatTest() {
-    JSONObject response = executeJdbcRequest(
-        "SELECT CAST(balance AS FLOAT) AS cast_balance FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-            " ORDER BY balance DESC LIMIT 1");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT CAST(balance AS FLOAT) AS cast_balance FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY balance DESC LIMIT 1");
 
-    verifySchema(response,
-        schema("CAST(balance AS FLOAT)", "cast_balance", "float"));
+    verifySchema(response, schema("CAST(balance AS FLOAT)", "cast_balance", "float"));
 
-    verifyDataRows(response,
-        rows(49989.0));
+    verifyDataRows(response, rows(49989.0));
   }
 
   @Test
   public void castIntFieldToFloatWithAliasJdbcFormatTest() {
-    JSONObject response = executeJdbcRequest(
-        "SELECT CAST(balance AS FLOAT) AS jdbc_float_alias " +
-            "FROM " + TestsConstants.TEST_INDEX_ACCOUNT + " ORDER BY jdbc_float_alias LIMIT 1");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT CAST(balance AS FLOAT) AS jdbc_float_alias "
+                + "FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY jdbc_float_alias LIMIT 1");
 
-    verifySchema(response,
-        schema("CAST(balance AS FLOAT)", "jdbc_float_alias", "float"));
+    verifySchema(response, schema("CAST(balance AS FLOAT)", "jdbc_float_alias", "float"));
 
-    verifyDataRows(response,
-        rows(1011.0));
+    verifyDataRows(response, rows(1011.0));
   }
 
   @Test
   public void castIntFieldToDoubleWithoutAliasOrderByTest() throws IOException {
-    String query = "SELECT CAST(age AS DOUBLE) FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-        " ORDER BY age LIMIT 1";
+    String query =
+        "SELECT CAST(age AS DOUBLE) FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + " ORDER BY age LIMIT 1";
 
     SearchHit[] hits = query(query).getHits();
     checkSuccessfulFieldCast(hits, "cast_age", "DOUBLE");
@@ -248,148 +256,138 @@ public void castIntFieldToDoubleWithoutAliasOrderByTest() throws IOException {
 
   @Test
   public void castIntFieldToDoubleWithAliasOrderByTest() throws IOException {
-    String query = "SELECT CAST(age AS DOUBLE) AS alias FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-        " ORDER BY alias DESC LIMIT 1";
+    String query =
+        "SELECT CAST(age AS DOUBLE) AS alias FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + " ORDER BY alias DESC LIMIT 1";
 
     SearchHit[] hits = query(query).getHits();
     checkSuccessfulFieldCast(hits, "alias", "DOUBLE");
     for (int i = 0; i < hits.length; ++i) {
       Assert.assertThat(hits[i].getFields().get("alias").getValue(), is(40.0));
     }
-
   }
 
   @Test
   public void castIntFieldToFloatWithoutAliasJdbcFormatGroupByTest() {
-    JSONObject response = executeJdbcRequest(
-        "SELECT CAST(balance AS FLOAT) FROM " +
-            TestsConstants.TEST_INDEX_ACCOUNT + " GROUP BY balance ORDER BY balance DESC LIMIT 5");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT CAST(balance AS FLOAT) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " GROUP BY balance ORDER BY balance DESC LIMIT 5");
 
-    verifySchema(response,
-        schema("CAST(balance AS FLOAT)", null, "float"));
+    verifySchema(response, schema("CAST(balance AS FLOAT)", null, "float"));
 
-    verifyDataRows(response,
-        rows(49989.0),
-        rows(49795.0),
-        rows(49741.0),
-        rows(49671.0),
-        rows(49587.0));
+    verifyDataRows(
+        response, rows(49989.0), rows(49795.0), rows(49741.0), rows(49671.0), rows(49587.0));
   }
 
   @Test
   public void castIntFieldToFloatWithAliasJdbcFormatGroupByTest() {
-    JSONObject response = executeJdbcRequest(
-        "SELECT CAST(balance AS FLOAT) AS jdbc_float_alias "
-            + " FROM " + TestsConstants.TEST_INDEX_ACCOUNT
-            + " GROUP BY jdbc_float_alias "
-            + " ORDER BY jdbc_float_alias ASC "
-            + " LIMIT 5");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT CAST(balance AS FLOAT) AS jdbc_float_alias "
+                + " FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " GROUP BY jdbc_float_alias "
+                + " ORDER BY jdbc_float_alias ASC "
+                + " LIMIT 5");
 
-    verifySchema(response,
-        schema("CAST(balance AS FLOAT)", "jdbc_float_alias", "float"));
+    verifySchema(response, schema("CAST(balance AS FLOAT)", "jdbc_float_alias", "float"));
 
-    verifyDataRows(response,
-        rows(1011.0),
-        rows(10116.0),
-        rows(10138.0),
-        rows(10147.0),
-        rows(10178.0));
+    verifyDataRows(
+        response, rows(1011.0), rows(10116.0), rows(10138.0), rows(10147.0), rows(10178.0));
   }
 
   @Test
   public void castIntFieldToDoubleWithAliasJdbcFormatGroupByTest() {
-    JSONObject response = executeJdbcRequest(
-        "SELECT CAST(age AS DOUBLE) AS jdbc_double_alias " +
-            "FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-            " GROUP BY jdbc_double_alias DESC LIMIT 5");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT CAST(age AS DOUBLE) AS jdbc_double_alias "
+                + "FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " GROUP BY jdbc_double_alias DESC LIMIT 5");
 
-    verifySchema(response,
-        schema("jdbc_double_alias", "jdbc_double_alias", "double"));
+    verifySchema(response, schema("jdbc_double_alias", "jdbc_double_alias", "double"));
 
-    verifyDataRows(response,
-        rows("31.0"),
-        rows("39.0"),
-        rows("26.0"),
-        rows("32.0"),
-        rows("35.0"));
+    verifyDataRows(response, rows("31.0"), rows("39.0"), rows("26.0"), rows("32.0"), rows("35.0"));
   }
 
   @Test
   public void castKeywordFieldToDatetimeWithoutAliasJdbcFormatTest() {
-    JSONObject response = executeJdbcRequest("SELECT CAST(date_keyword AS DATETIME) FROM "
-        + TestsConstants.TEST_INDEX_DATE + " ORDER BY date_keyword");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT CAST(date_keyword AS DATETIME) FROM "
+                + TestsConstants.TEST_INDEX_DATE
+                + " ORDER BY date_keyword");
 
     verifySchema(response, schema("cast_date_keyword", null, "date"));
 
-    verifyDataRows(response,
-        rows("2014-08-19 07:09:13.434"),
-        rows("2019-09-25 02:04:13.469"));
+    verifyDataRows(response, rows("2014-08-19 07:09:13.434"), rows("2019-09-25 02:04:13.469"));
   }
 
   @Test
   public void castKeywordFieldToDatetimeWithAliasJdbcFormatTest() {
     JSONObject response =
-        executeJdbcRequest("SELECT CAST(date_keyword AS DATETIME) AS test_alias FROM "
-            + TestsConstants.TEST_INDEX_DATE + " ORDER BY date_keyword");
+        executeJdbcRequest(
+            "SELECT CAST(date_keyword AS DATETIME) AS test_alias FROM "
+                + TestsConstants.TEST_INDEX_DATE
+                + " ORDER BY date_keyword");
 
     verifySchema(response, schema("test_alias", null, "date"));
 
-    verifyDataRows(response,
-        rows("2014-08-19 07:09:13.434"),
-        rows("2019-09-25 02:04:13.469"));
+    verifyDataRows(response, rows("2014-08-19 07:09:13.434"), rows("2019-09-25 02:04:13.469"));
   }
 
   @Test
   public void castFieldToDatetimeWithWhereClauseJdbcFormatTest() {
-    JSONObject response = executeJdbcRequest("SELECT CAST(date_keyword AS DATETIME) FROM "
-        + TestsConstants.TEST_INDEX_DATE + " WHERE date_keyword IS NOT NULL ORDER BY date_keyword");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT CAST(date_keyword AS DATETIME) FROM "
+                + TestsConstants.TEST_INDEX_DATE
+                + " WHERE date_keyword IS NOT NULL ORDER BY date_keyword");
 
     verifySchema(response, schema("cast_date_keyword", null, "date"));
 
-    verifyDataRows(response,
-        rows("2014-08-19 07:09:13.434"),
-        rows("2019-09-25 02:04:13.469"));
+    verifyDataRows(response, rows("2014-08-19 07:09:13.434"), rows("2019-09-25 02:04:13.469"));
   }
 
   @Test
   public void castFieldToDatetimeWithGroupByJdbcFormatTest() {
     JSONObject response =
-        executeJdbcRequest("SELECT CAST(date_keyword AS DATETIME) AS test_alias FROM "
-            + TestsConstants.TEST_INDEX_DATE + " GROUP BY test_alias DESC");
+        executeJdbcRequest(
+            "SELECT CAST(date_keyword AS DATETIME) AS test_alias FROM "
+                + TestsConstants.TEST_INDEX_DATE
+                + " GROUP BY test_alias DESC");
 
     verifySchema(response, schema("test_alias", "test_alias", "double"));
 
-    verifyDataRows(response,
-        rows("2014-08-19T07:09:13.434Z"),
-        rows("2019-09-25T02:04:13.469Z"));
+    verifyDataRows(response, rows("2014-08-19T07:09:13.434Z"), rows("2019-09-25T02:04:13.469Z"));
   }
 
-
   @Test
   public void castBoolFieldToNumericValueInSelectClause() {
     JSONObject response =
         executeJdbcRequest(
             "SELECT "
-            + " male, "
-            + " CAST(male AS INT) AS cast_int, "
-            + " CAST(male AS LONG) AS cast_long, "
-            + " CAST(male AS FLOAT) AS cast_float, "
-            + " CAST(male AS DOUBLE) AS cast_double "
-            + "FROM " + TestsConstants.TEST_INDEX_BANK + " "
-            + "WHERE account_number = 1 OR account_number = 13"
-        );
-
-    verifySchema(response,
+                + " male, "
+                + " CAST(male AS INT) AS cast_int, "
+                + " CAST(male AS LONG) AS cast_long, "
+                + " CAST(male AS FLOAT) AS cast_float, "
+                + " CAST(male AS DOUBLE) AS cast_double "
+                + "FROM "
+                + TestsConstants.TEST_INDEX_BANK
+                + " "
+                + "WHERE account_number = 1 OR account_number = 13");
+
+    verifySchema(
+        response,
         schema("male", "boolean"),
         schema("CAST(male AS INT)", "cast_int", "integer"),
         schema("CAST(male AS LONG)", "cast_long", "long"),
         schema("CAST(male AS FLOAT)", "cast_float", "float"),
-        schema("CAST(male AS DOUBLE)", "cast_double", "double")
-    );
-    verifyDataRows(response,
-        rows(true, 1, 1, 1.0, 1.0),
-        rows(false, 0, 0, 0.0, 0.0)
-    );
+        schema("CAST(male AS DOUBLE)", "cast_double", "double"));
+    verifyDataRows(response, rows(true, 1, 1, 1.0, 1.0), rows(false, 0, 0, 0.0, 0.0));
   }
 
   @Test
@@ -397,90 +395,82 @@ public void castBoolFieldToNumericValueWithGroupByAlias() {
     JSONObject response =
         executeJdbcRequest(
             "SELECT "
-            + "CAST(male AS INT) AS cast_int, "
-            + "COUNT(*) "
-            + "FROM " + TestsConstants.TEST_INDEX_BANK + " "
-            + "GROUP BY cast_int"
-        );
-
-    verifySchema(response,
+                + "CAST(male AS INT) AS cast_int, "
+                + "COUNT(*) "
+                + "FROM "
+                + TestsConstants.TEST_INDEX_BANK
+                + " "
+                + "GROUP BY cast_int");
+
+    verifySchema(
+        response,
         schema("CAST(male AS INT)", "cast_int", "integer"),
-        schema("COUNT(*)", "integer")
-    );
-    verifyDataRows(response,
-        rows(0, 3),
-        rows(1, 4)
-    );
+        schema("COUNT(*)", "integer"));
+    verifyDataRows(response, rows(0, 3), rows(1, 4));
   }
 
   @Test
   public void castStatementInWhereClauseGreaterThanTest() {
-    JSONObject response = executeJdbcRequest("SELECT balance FROM " + TEST_INDEX_ACCOUNT
-        + " WHERE (account_number < CAST(age AS DOUBLE)) ORDER BY balance LIMIT 5");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT balance FROM "
+                + TEST_INDEX_ACCOUNT
+                + " WHERE (account_number < CAST(age AS DOUBLE)) ORDER BY balance LIMIT 5");
 
     verifySchema(response, schema("balance", null, "long"));
 
-    verifyDataRows(response,
-        rows(4180),
-        rows(5686),
-        rows(7004),
-        rows(7831),
-        rows(14127));
+    verifyDataRows(response, rows(4180), rows(5686), rows(7004), rows(7831), rows(14127));
   }
 
   @Test
   public void castStatementInWhereClauseLessThanTest() {
-    JSONObject response = executeJdbcRequest("SELECT balance FROM " + TEST_INDEX_ACCOUNT
-        + " WHERE (account_number > CAST(age AS DOUBLE)) ORDER BY balance LIMIT 5");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT balance FROM "
+                + TEST_INDEX_ACCOUNT
+                + " WHERE (account_number > CAST(age AS DOUBLE)) ORDER BY balance LIMIT 5");
 
     verifySchema(response, schema("balance", null, "long"));
 
-    verifyDataRows(response,
-        rows(1011),
-        rows(1031),
-        rows(1110),
-        rows(1133),
-        rows(1172));
+    verifyDataRows(response, rows(1011), rows(1031), rows(1110), rows(1133), rows(1172));
   }
 
   @Test
   public void castStatementInWhereClauseEqualToConstantTest() {
-    JSONObject response = executeJdbcRequest("SELECT balance FROM " + TEST_INDEX_ACCOUNT
-        + " WHERE (CAST(age AS DOUBLE) = 36.0) ORDER BY balance LIMIT 5");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT balance FROM "
+                + TEST_INDEX_ACCOUNT
+                + " WHERE (CAST(age AS DOUBLE) = 36.0) ORDER BY balance LIMIT 5");
 
     verifySchema(response, schema("balance", null, "long"));
-    verifyDataRows(response,
-        rows(1249),
-        rows(1463),
-        rows(3960),
-        rows(5686),
-        rows(6025));
+    verifyDataRows(response, rows(1249), rows(1463), rows(3960), rows(5686), rows(6025));
   }
 
   @Test
   public void castStatementInWhereClauseLessThanConstantTest() {
-    JSONObject response = executeJdbcRequest("SELECT balance FROM " + TEST_INDEX_ACCOUNT
-        + " WHERE (CAST(age AS DOUBLE) < 36.0) ORDER BY balance LIMIT 5");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT balance FROM "
+                + TEST_INDEX_ACCOUNT
+                + " WHERE (CAST(age AS DOUBLE) < 36.0) ORDER BY balance LIMIT 5");
 
     verifySchema(response, schema("balance", null, "long"));
 
-    verifyDataRows(response,
-        rows(1011),
-        rows(1031),
-        rows(1110),
-        rows(1133),
-        rows(1172));
+    verifyDataRows(response, rows(1011), rows(1031), rows(1110), rows(1133), rows(1172));
   }
 
   /**
-   * Testing compilation
-   * Result comparison is empty then comparing different types (Date and keyword)
+   * Testing compilation Result comparison is empty then comparing different types (Date and
+   * keyword)
    */
   @Test
   public void castStatementInWhereClauseDatetimeCastTest() {
-    JSONObject response = executeJdbcRequest("SELECT date_keyword FROM "
-        + TestsConstants.TEST_INDEX_DATE
-        + " WHERE (CAST(date_keyword AS DATETIME) = '2014-08-19T07:09:13.434Z')");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT date_keyword FROM "
+                + TestsConstants.TEST_INDEX_DATE
+                + " WHERE (CAST(date_keyword AS DATETIME) = '2014-08-19T07:09:13.434Z')");
 
     String schema_result = "{\"name\":\"date_keyword\",\"type\":\"keyword\"}";
     assertEquals(response.getJSONArray("schema").get(0).toString(), schema_result);
@@ -488,30 +478,32 @@ public void castStatementInWhereClauseDatetimeCastTest() {
 
   @Test
   public void concat_ws_field_and_string() throws Exception {
-    //here is a bug,csv field with spa
-    String query = "SELECT " +
-        " concat_ws('-',age,'-') as age,address from " +
-        TEST_INDEX_ACCOUNT + " " +
-        " limit 10  ";
+    // here is a bug,csv field with spa
+    String query =
+        "SELECT "
+            + " concat_ws('-',age,'-') as age,address from "
+            + TEST_INDEX_ACCOUNT
+            + " "
+            + " limit 10  ";
 
-    assertThat(
-        executeQuery(query),
-        hitAny(kvString("/fields/age/0", endsWith("--")))
-    );
+    assertThat(executeQuery(query), hitAny(kvString("/fields/age/0", endsWith("--"))));
   }
 
   /**
    * Ignore this test case because painless doesn't allowlist String.split function.
    *
-   * @see <a href="https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html">https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html</a>
+   * @see <a
+   *     href="https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html">https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html</a>
    */
   @Ignore
   public void whereConditionLeftFunctionRightVariableEqualTest() throws Exception {
 
-    String query = "SELECT " +
-        " * from " +
-        TestsConstants.TEST_INDEX + " " +
-        " where split(address,' ')[0]='806' limit 1000  ";
+    String query =
+        "SELECT "
+            + " * from "
+            + TestsConstants.TEST_INDEX
+            + " "
+            + " where split(address,' ')[0]='806' limit 1000  ";
 
     assertThat(executeQuery(query).query("/hits/total"), equalTo(4));
   }
@@ -519,15 +511,18 @@ public void whereConditionLeftFunctionRightVariableEqualTest() throws Exception
   /**
    * Ignore this test case because painless doesn't allowlist String.split function.
    *
-   * @see <a href="https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html">https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html</a>
+   * @see <a
+   *     href="https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html">https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html</a>
    */
   @Ignore
   public void whereConditionLeftFunctionRightVariableGreatTest() throws Exception {
 
-    String query = "SELECT " +
-        " * from " +
-        TestsConstants.TEST_INDEX + " " +
-        " where floor(split(address,' ')[0]+0) > 805 limit 1000  ";
+    String query =
+        "SELECT "
+            + " * from "
+            + TestsConstants.TEST_INDEX
+            + " "
+            + " where floor(split(address,' ')[0]+0) > 805 limit 1000  ";
 
     assertThat(executeQuery(query).query("/hits/total"), equalTo(223));
   }
@@ -535,42 +530,45 @@ public void whereConditionLeftFunctionRightVariableGreatTest() throws Exception
   @Test
   public void concat_ws_fields() throws Exception {
 
-    //here is a bug,csv field with spa
-    String query = "SELECT " +
-        " concat_ws('-',age,address) as combine,address from " +
-        TEST_INDEX_ACCOUNT + " " +
-        " limit 10  ";
-    assertThat(
-        executeQuery(query),
-        hitAny(kvString("/fields/combine/0", containsString("-")))
-    );
+    // here is a bug,csv field with spa
+    String query =
+        "SELECT "
+            + " concat_ws('-',age,address) as combine,address from "
+            + TEST_INDEX_ACCOUNT
+            + " "
+            + " limit 10  ";
+    assertThat(executeQuery(query), hitAny(kvString("/fields/combine/0", containsString("-"))));
   }
 
   @Test
   public void functionLogs() throws Exception {
-    String query = "SELECT log10(100) as a, log(1) as b, log(2, 4) as c, log2(8) as d from "
-        + TEST_INDEX_ACCOUNT + " limit 1";
+    String query =
+        "SELECT log10(100) as a, log(1) as b, log(2, 4) as c, log2(8) as d from "
+            + TEST_INDEX_ACCOUNT
+            + " limit 1";
 
     assertThat(
         executeQuery(query),
-        hitAny(both(kvDouble("/fields/a/0", equalTo(Math.log10(100))))
-            .and(kvDouble("/fields/b/0", equalTo(Math.log(1))))
-            .and(kvDouble("/fields/c/0", closeTo(Math.log(4) / Math.log(2), 0.0001)))
-            .and(kvDouble("/fields/d/0", closeTo(Math.log(8) / Math.log(2), 0.0001))))
-    );
+        hitAny(
+            both(kvDouble("/fields/a/0", equalTo(Math.log10(100))))
+                .and(kvDouble("/fields/b/0", equalTo(Math.log(1))))
+                .and(kvDouble("/fields/c/0", closeTo(Math.log(4) / Math.log(2), 0.0001)))
+                .and(kvDouble("/fields/d/0", closeTo(Math.log(8) / Math.log(2), 0.0001)))));
   }
 
   @Test
   public void functionPow() throws Exception {
-    String query = "SELECT pow(account_number, 2) as key," +
-        "abs(age - 60) as new_age from " + TEST_INDEX_ACCOUNT +
-        " WHERE firstname = 'Virginia' and lastname='Ayala' limit 1";
+    String query =
+        "SELECT pow(account_number, 2) as key,"
+            + "abs(age - 60) as new_age from "
+            + TEST_INDEX_ACCOUNT
+            + " WHERE firstname = 'Virginia' and lastname='Ayala' limit 1";
 
     assertThat(
         executeQuery(query),
-        hitAny(both(kvDouble("/fields/new_age/0", equalTo(21.0)))
-            .and(kvDouble("/fields/key/0", equalTo(625.0))))
-    );
+        hitAny(
+            both(kvDouble("/fields/new_age/0", equalTo(21.0)))
+                .and(kvDouble("/fields/key/0", equalTo(625.0)))));
   }
 
   @Test
@@ -578,96 +576,88 @@ public void operatorSubstring() throws IOException {
     assertThat(
         executeQuery(
             "SELECT substring('sampleName', 1, 4) AS substring FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvString("/fields/substring/0", equalTo("samp")))
-    );
+        hitAny(kvString("/fields/substring/0", equalTo("samp"))));
 
     assertThat(
         executeQuery(
             "SELECT substring('sampleName', 0, 20) AS substring FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvString("/fields/substring/0", equalTo("sampleName")))
-    );
+        hitAny(kvString("/fields/substring/0", equalTo("sampleName"))));
   }
 
   @Test
   public void operatorLength() throws IOException {
     assertThat(
-        executeQuery("SELECT LENGTH(lastname) FROM " + TEST_INDEX_ACCOUNT
+        executeQuery(
+            "SELECT LENGTH(lastname) FROM "
+                + TEST_INDEX_ACCOUNT
                 + " WHERE lastname IS NOT NULL GROUP BY LENGTH(lastname) ORDER BY LENGTH(lastname)",
             "jdbc"),
-        containsString("\"type\": \"integer\"")
-    );
+        containsString("\"type\": \"integer\""));
 
     assertThat(
         executeQuery("SELECT LENGTH('sampleName') AS length FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/length/0", equalTo(10)))
-    );
-
+        hitAny(kvInt("/fields/length/0", equalTo(10))));
   }
 
   @Test
   public void operatorReplace() {
     String query = "SELECT REPLACE('elastic', 'el', 'fant') FROM " + TEST_INDEX_ACCOUNT;
-    assertThat(
-        executeQuery(query, "jdbc"),
-        containsString("fantastic")
-    );
+    assertThat(executeQuery(query, "jdbc"), containsString("fantastic"));
   }
 
-  @Ignore("The LOCATE function is not implemented in new SQL engine. https://github"
-      + ".com/opensearch-project/sql/issues/74")
+  @Ignore(
+      "The LOCATE function is not implemented in new SQL engine. https://github"
+          + ".com/opensearch-project/sql/issues/74")
   public void operatorLocate() throws IOException {
-    String query = "SELECT LOCATE('a', lastname, 0) FROM " + TEST_INDEX_ACCOUNT
-        +
-        " WHERE lastname IS NOT NULL GROUP BY LOCATE('a', lastname, 0) ORDER BY LOCATE('a', lastname, 0)";
-    assertThat(
-        executeQuery(query, "jdbc"), containsString("\"type\": \"integer\"")
-    );
+    String query =
+        "SELECT LOCATE('a', lastname, 0) FROM "
+            + TEST_INDEX_ACCOUNT
+            + " WHERE lastname IS NOT NULL GROUP BY LOCATE('a', lastname, 0) ORDER BY LOCATE('a',"
+            + " lastname, 0)";
+    assertThat(executeQuery(query, "jdbc"), containsString("\"type\": \"integer\""));
 
     assertThat(
         executeQuery("SELECT LOCATE('a', 'sampleName', 3) AS locate FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/locate/0", equalTo(8)))
-    );
+        hitAny(kvInt("/fields/locate/0", equalTo(8))));
     assertThat(
         executeQuery("SELECT LOCATE('a', 'sampleName') AS locate FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/locate/0", equalTo(2)))
-    );
+        hitAny(kvInt("/fields/locate/0", equalTo(2))));
   }
 
   @Test
   public void rtrim() throws IOException {
     assertThat(
         executeQuery("SELECT RTRIM(' sampleName  ') AS rtrim FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvString("/fields/rtrim/0", equalTo(" sampleName")))
-    );
+        hitAny(kvString("/fields/rtrim/0", equalTo(" sampleName"))));
   }
 
   @Test
   public void ltrim() throws IOException {
     assertThat(
         executeQuery("SELECT LTRIM(' sampleName  ') AS ltrim FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvString("/fields/ltrim/0", equalTo("sampleName  ")))
-    );
+        hitAny(kvString("/fields/ltrim/0", equalTo("sampleName  "))));
   }
 
-  @Ignore("The ASCII function is not implemented in new SQL engine. https://github"
-      + ".com/opensearch-project/sql/issues/73")
+  @Ignore(
+      "The ASCII function is not implemented in new SQL engine. https://github"
+          + ".com/opensearch-project/sql/issues/73")
   public void ascii() throws IOException {
     assertThat(
-        executeQuery("SELECT ASCII(lastname) FROM " + TEST_INDEX_ACCOUNT
-                +
-                " WHERE lastname IS NOT NULL GROUP BY ASCII(lastname) ORDER BY ASCII(lastname) LIMIT 5",
+        executeQuery(
+            "SELECT ASCII(lastname) FROM "
+                + TEST_INDEX_ACCOUNT
+                + " WHERE lastname IS NOT NULL GROUP BY ASCII(lastname) ORDER BY ASCII(lastname)"
+                + " LIMIT 5",
             "jdbc"),
-        containsString("\"type\": \"integer\"")
-    );
+        containsString("\"type\": \"integer\""));
     assertThat(
         executeQuery("SELECT ASCII('sampleName') AS ascii FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/ascii/0", equalTo(115)))
-    );
+        hitAny(kvInt("/fields/ascii/0", equalTo(115))));
   }
 
   /**
-   * The following tests for LEFT and RIGHT are ignored because the OpenSearch client fails to parse "LEFT"/"RIGHT" in
-   * the integTest
+   * The following tests for LEFT and RIGHT are ignored because the OpenSearch client fails to parse
+   * "LEFT"/"RIGHT" in the integTest
    */
   @Ignore
   @Test
@@ -675,13 +665,11 @@ public void left() throws IOException {
     assertThat(
         executeQuery(
             "SELECT LEFT('sample', 2) AS left FROM " + TEST_INDEX_ACCOUNT + " ORDER BY left"),
-        hitAny(kvString("/fields/left/0", equalTo("sa")))
-    );
+        hitAny(kvString("/fields/left/0", equalTo("sa"))));
     assertThat(
         executeQuery(
             "SELECT LEFT('sample', 20) AS left FROM " + TEST_INDEX_ACCOUNT + " ORDER BY left"),
-        hitAny(kvString("/fields/left/0", equalTo("sample")))
-    );
+        hitAny(kvString("/fields/left/0", equalTo("sample"))));
   }
 
   @Ignore
@@ -690,20 +678,20 @@ public void right() throws IOException {
     assertThat(
         executeQuery(
             "SELECT RIGHT('elastic', 3) AS right FROM " + TEST_INDEX_ACCOUNT + " ORDER BY right"),
-        hitAny(kvString("/fields/right/0", equalTo("tic")))
-    );
+        hitAny(kvString("/fields/right/0", equalTo("tic"))));
     assertThat(
         executeQuery(
             "SELECT RIGHT('elastic', 20) AS right FROM " + TEST_INDEX_ACCOUNT + " ORDER BY right"),
-        hitAny(kvString("/fields/right/0", equalTo("elastic")))
-    );
+        hitAny(kvString("/fields/right/0", equalTo("elastic"))));
   }
 
   @Test
   public void ifFuncShouldPassJDBC() {
-    JSONObject response = executeJdbcRequest(
-        "SELECT IF(age > 30, 'True', 'False') AS Ages FROM " + TEST_INDEX_ACCOUNT
-            + " WHERE age IS NOT NULL GROUP BY Ages");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT IF(age > 30, 'True', 'False') AS Ages FROM "
+                + TEST_INDEX_ACCOUNT
+                + " WHERE age IS NOT NULL GROUP BY Ages");
     assertEquals("IF(age > 30, 'True', 'False')", response.query("/schema/0/name"));
     assertEquals("Ages", response.query("/schema/0/alias"));
     assertEquals("keyword", response.query("/schema/0/type"));
@@ -713,35 +701,33 @@ public void ifFuncShouldPassJDBC() {
   public void ifFuncWithBinaryComparisonAsConditionTest() throws IOException {
     assertThat(
         executeQuery("SELECT IF(2 > 0, 'hello', 'world') AS ifTrue FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvString("/fields/ifTrue/0", equalTo("hello")))
-    );
+        hitAny(kvString("/fields/ifTrue/0", equalTo("hello"))));
     assertThat(
         executeQuery("SELECT IF(2 = 0, 'hello', 'world') AS ifFalse FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvString("/fields/ifFalse/0", equalTo("world")))
-    );
+        hitAny(kvString("/fields/ifFalse/0", equalTo("world"))));
   }
 
   @Test
   public void ifFuncWithBooleanExprInputAsConditionTest() throws IOException {
     assertThat(
         executeQuery("SELECT IF(true, 1, 0) AS ifBoolean FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/ifBoolean/0", equalTo(1)))
-    );
+        hitAny(kvInt("/fields/ifBoolean/0", equalTo(1))));
   }
 
   @Test
   public void ifFuncWithNullInputAsConditionTest() throws IOException {
     assertThat(
         executeQuery("SELECT IF(null, 1, 0) AS ifNull FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/ifNull/0", equalTo(0)))
-    );
+        hitAny(kvInt("/fields/ifNull/0", equalTo(0))));
   }
 
   @Test
   public void ifnullShouldPassJDBC() throws IOException {
-    JSONObject response = executeJdbcRequest(
-        "SELECT IFNULL(lastname, 'unknown') AS name FROM " + TEST_INDEX_ACCOUNT
-            + " GROUP BY name");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT IFNULL(lastname, 'unknown') AS name FROM "
+                + TEST_INDEX_ACCOUNT
+                + " GROUP BY name");
     assertEquals("IFNULL(lastname, 'unknown')", response.query("/schema/0/name"));
     assertEquals("name", response.query("/schema/0/alias"));
     assertEquals("keyword", response.query("/schema/0/type"));
@@ -751,27 +737,23 @@ public void ifnullShouldPassJDBC() throws IOException {
   public void ifnullWithNotNullInputTest() throws IOException {
     assertThat(
         executeQuery("SELECT IFNULL('sample', 'IsNull') AS ifnull FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvString("/fields/ifnull/0", equalTo("sample")))
-    );
+        hitAny(kvString("/fields/ifnull/0", equalTo("sample"))));
   }
 
   @Test
   public void ifnullWithNullInputTest() throws IOException {
     assertThat(
         executeQuery("SELECT IFNULL(null, 10) AS ifnull FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/ifnull/0", equalTo(10)))
-    );
+        hitAny(kvInt("/fields/ifnull/0", equalTo(10))));
     assertThat(
         executeQuery("SELECT IFNULL('', 10) AS ifnull FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvString("/fields/ifnull/0", equalTo("")))
-    );
+        hitAny(kvString("/fields/ifnull/0", equalTo(""))));
   }
 
   @Test
   public void isnullShouldPassJDBC() {
     JSONObject response =
-        executeJdbcRequest(
-            "SELECT ISNULL(lastname) AS name FROM " + TEST_INDEX_ACCOUNT);
+        executeJdbcRequest("SELECT ISNULL(lastname) AS name FROM " + TEST_INDEX_ACCOUNT);
     assertEquals("ISNULL(lastname)", response.query("/schema/0/name"));
     assertEquals("name", response.query("/schema/0/alias"));
     assertEquals("boolean", response.query("/schema/0/type"));
@@ -781,61 +763,57 @@ public void isnullShouldPassJDBC() {
   public void isnullWithNotNullInputTest() throws IOException {
     assertThat(
         executeQuery("SELECT ISNULL('elastic') AS isnull FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/isnull/0", equalTo(0)))
-    );
+        hitAny(kvInt("/fields/isnull/0", equalTo(0))));
     assertThat(
         executeQuery("SELECT ISNULL('') AS isnull FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/isnull/0", equalTo(0)))
-    );
+        hitAny(kvInt("/fields/isnull/0", equalTo(0))));
   }
 
   @Test
   public void isnullWithNullInputTest() throws IOException {
     assertThat(
         executeQuery("SELECT ISNULL(null) AS isnull FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/isnull/0", equalTo(1)))
-    );
+        hitAny(kvInt("/fields/isnull/0", equalTo(1))));
   }
 
   @Test
   public void isnullWithMathExpr() throws IOException {
     assertThat(
         executeQuery("SELECT ISNULL(1+1) AS isnull FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/isnull/0", equalTo(0)))
-    );
+        hitAny(kvInt("/fields/isnull/0", equalTo(0))));
     assertThat(
         executeQuery("SELECT ISNULL(1+1*1/0) AS isnull FROM " + TEST_INDEX_ACCOUNT),
-        hitAny(kvInt("/fields/isnull/0", equalTo(1)))
-    );
+        hitAny(kvInt("/fields/isnull/0", equalTo(1))));
   }
 
   /**
    * Ignore this test case because painless doesn't allowlist String.split function.
    *
-   * @see <a href="https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html">https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html</a>
+   * @see <a
+   *     href="https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html">https://www.elastic.co/guide/en/elasticsearch/painless/7.0/painless-api-reference.html</a>
    */
   @Ignore
   public void split_field() throws Exception {
 
-    //here is a bug,csv field with spa
-    String query = "SELECT " +
-        " split(address,' ')[0],age from " +
-        TestsConstants.TEST_INDEX + " where address is not null " +
-        " limit 10  ";
+    // here is a bug,csv field with spa
+    String query =
+        "SELECT "
+            + " split(address,' ')[0],age from "
+            + TestsConstants.TEST_INDEX
+            + " where address is not null "
+            + " limit 10  ";
   }
 
   @Test
   public void literal() throws Exception {
-    String query = "SELECT 10 " +
-        "from " + TEST_INDEX_ACCOUNT + " limit 1";
+    String query = "SELECT 10 " + "from " + TEST_INDEX_ACCOUNT + " limit 1";
     final SearchHit[] hits = query(query).getHits();
     assertThat(hits[0].getFields(), hasValue(contains(10)));
   }
 
   @Test
   public void literalWithDoubleValue() throws Exception {
-    String query = "SELECT 10.0 " +
-        "from " + TEST_INDEX_ACCOUNT + " limit 1";
+    String query = "SELECT 10.0 " + "from " + TEST_INDEX_ACCOUNT + " limit 1";
 
     final SearchHit[] hits = query(query).getHits();
     assertThat(hits[0].getFields(), hasValue(contains(10.0)));
@@ -843,8 +821,7 @@ public void literalWithDoubleValue() throws Exception {
 
   @Test
   public void literalWithAlias() throws Exception {
-    String query = "SELECT 10 as key " +
-        "from " + TEST_INDEX_ACCOUNT + " limit 1";
+    String query = "SELECT 10 as key " + "from " + TEST_INDEX_ACCOUNT + " limit 1";
     final SearchHit[] hits = query(query).getHits();
 
     assertThat(hits.length, is(1));
@@ -853,8 +830,7 @@ public void literalWithAlias() throws Exception {
 
   @Test
   public void literalMultiField() throws Exception {
-    String query = "SELECT 1, 2 " +
-        "from " + TEST_INDEX_ACCOUNT + " limit 1";
+    String query = "SELECT 1, 2 " + "from " + TEST_INDEX_ACCOUNT + " limit 1";
     final SearchHit[] hits = query(query).getHits();
 
     assertThat(hits.length, is(1));
@@ -864,10 +840,11 @@ public void literalMultiField() throws Exception {
   private SearchHits query(String query) throws IOException {
     final String rsp = executeQueryWithStringOutput(query);
 
-    final XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(
-        NamedXContentRegistry.EMPTY,
-        LoggingDeprecationHandler.INSTANCE,
-        rsp);
+    final XContentParser parser =
+        new JsonXContentParser(
+            NamedXContentRegistry.EMPTY,
+            LoggingDeprecationHandler.INSTANCE,
+            new JsonFactory().createParser(rsp));
     return SearchResponse.fromXContent(parser).getHits();
   }
 
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/SQLIntegTestCase.java b/integ-test/src/test/java/org/opensearch/sql/legacy/SQLIntegTestCase.java
index 80348b2a8b..f30864d4b1 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/SQLIntegTestCase.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/SQLIntegTestCase.java
@@ -3,34 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
-import com.google.common.base.Strings;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.opensearch.client.Request;
-import org.opensearch.client.RequestOptions;
-import org.opensearch.client.Response;
-import org.opensearch.sql.common.setting.Settings;
-
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Locale;
-
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static org.opensearch.sql.legacy.TestUtils.createIndexByRestClient;
 import static org.opensearch.sql.legacy.TestUtils.getAccountIndexMapping;
@@ -46,6 +20,7 @@
 import static org.opensearch.sql.legacy.TestUtils.getDogs3IndexMapping;
 import static org.opensearch.sql.legacy.TestUtils.getEmployeeNestedTypeIndexMapping;
 import static org.opensearch.sql.legacy.TestUtils.getGameOfThronesIndexMapping;
+import static org.opensearch.sql.legacy.TestUtils.getGeopointIndexMapping;
 import static org.opensearch.sql.legacy.TestUtils.getJoinTypeIndexMapping;
 import static org.opensearch.sql.legacy.TestUtils.getLocationIndexMapping;
 import static org.opensearch.sql.legacy.TestUtils.getMappingFile;
@@ -57,6 +32,7 @@
 import static org.opensearch.sql.legacy.TestUtils.getPhraseIndexMapping;
 import static org.opensearch.sql.legacy.TestUtils.getResponseBody;
 import static org.opensearch.sql.legacy.TestUtils.getStringIndexMapping;
+import static org.opensearch.sql.legacy.TestUtils.getUnexpandedObjectIndexMapping;
 import static org.opensearch.sql.legacy.TestUtils.getWeblogsIndexMapping;
 import static org.opensearch.sql.legacy.TestUtils.isIndexExist;
 import static org.opensearch.sql.legacy.TestUtils.loadDataByRestClient;
@@ -64,9 +40,37 @@
 import static org.opensearch.sql.legacy.plugin.RestSqlAction.EXPLAIN_API_ENDPOINT;
 import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
 
-/**
- * OpenSearch Rest integration test base for SQL testing
- */
+import com.google.common.base.Strings;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Locale;
+import java.util.Map;
+import javax.management.MBeanServerInvocationHandler;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.opensearch.client.Request;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.client.Response;
+import org.opensearch.client.RestClient;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.utils.SerializeUtils;
+
+/** OpenSearch Rest integration test base for SQL testing */
 public abstract class SQLIntegTestCase extends OpenSearchSQLRestTestCase {
 
   public static final String PERSISTENT = "persistent";
@@ -98,12 +102,12 @@ protected boolean preserveClusterUponCompletion() {
   }
 
   /**
-   * We need to be able to dump the jacoco coverage before cluster is shut down.
-   * The new internal testing framework removed some of the gradle tasks we were listening to
-   * to choose a good time to do it. This will dump the executionData to file after each test.
-   * TODO: This is also currently just overwriting integTest.exec with the updated execData without
-   * resetting after writing each time. This can be improved to either write an exec file per test
-   * or by letting jacoco append to the file
+   * We need to be able to dump the jacoco coverage before cluster is shut down. The new internal
+   * testing framework removed some of the gradle tasks we were listening to to choose a good time
+   * to do it. This will dump the executionData to file after each test. TODO: This is also
+   * currently just overwriting integTest.exec with the updated execData without resetting after
+   * writing each time. This can be improved to either write an exec file per test or by letting
+   * jacoco append to the file
    */
   public interface IProxy {
     byte[] getExecutionData(boolean reset);
@@ -124,10 +128,12 @@ public static void dumpCoverage() {
 
     String serverUrl = "service:jmx:rmi:///jndi/rmi://127.0.0.1:7777/jmxrmi";
     try (JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(serverUrl))) {
-      IProxy proxy = MBeanServerInvocationHandler.newProxyInstance(
-          connector.getMBeanServerConnection(), new ObjectName("org.jacoco:type=Runtime"),
-          IProxy.class,
-          false);
+      IProxy proxy =
+          MBeanServerInvocationHandler.newProxyInstance(
+              connector.getMBeanServerConnection(),
+              new ObjectName("org.jacoco:type=Runtime"),
+              IProxy.class,
+              false);
 
       Path path = Paths.get(jacocoBuildPath + "/integTest.exec");
       Files.write(path, proxy.getExecutionData(false));
@@ -137,9 +143,9 @@ public static void dumpCoverage() {
   }
 
   /**
-   * As JUnit JavaDoc says:
-   * "The @AfterClass methods declared in superclasses will be run after those of the current class."
-   * So this method is supposed to run before closeClients() in parent class.
+   * As JUnit JavaDoc says: "The @AfterClass methods declared in superclasses will be run after
+   * those of the current class." So this method is supposed to run before closeClients() in parent
+   * class.
    */
   @AfterClass
   public static void cleanUpIndices() throws IOException {
@@ -151,18 +157,34 @@ public static void cleanUpIndices() throws IOException {
 
   protected void setQuerySizeLimit(Integer limit) throws IOException {
     updateClusterSettings(
-        new ClusterSetting("transient", Settings.Key.QUERY_SIZE_LIMIT.getKeyValue(), limit.toString()));
+        new ClusterSetting(
+            "transient", Settings.Key.QUERY_SIZE_LIMIT.getKeyValue(), limit.toString()));
   }
 
   protected void resetQuerySizeLimit() throws IOException {
     updateClusterSettings(
-        new ClusterSetting("transient", Settings.Key.QUERY_SIZE_LIMIT.getKeyValue(), DEFAULT_QUERY_SIZE_LIMIT
-            .toString()));
+        new ClusterSetting(
+            "transient",
+            Settings.Key.QUERY_SIZE_LIMIT.getKeyValue(),
+            DEFAULT_QUERY_SIZE_LIMIT.toString()));
+  }
+
+  @SneakyThrows
+  protected void setDataSourcesEnabled(String clusterSettingType, boolean value) {
+    updateClusterSettings(
+        new ClusterSetting(
+            clusterSettingType,
+            Settings.Key.DATASOURCES_ENABLED.getKeyValue(),
+            Boolean.toString(value)));
   }
 
   protected static void wipeAllClusterSettings() throws IOException {
     updateClusterSettings(new ClusterSetting("persistent", "*", null));
     updateClusterSettings(new ClusterSetting("transient", "*", null));
+    if (remoteClient() != null) {
+      updateClusterSettings(new ClusterSetting("persistent", "*", null), remoteClient());
+      updateClusterSettings(new ClusterSetting("transient", "*", null), remoteClient());
+    }
   }
 
   protected void setMaxResultWindow(String indexName, Integer window) throws IOException {
@@ -170,31 +192,32 @@ protected void setMaxResultWindow(String indexName, Integer window) throws IOExc
   }
 
   protected void resetMaxResultWindow(String indexName) throws IOException {
-    updateIndexSettings(indexName,
-        "{ \"index\": { \"max_result_window\": " + DEFAULT_MAX_RESULT_WINDOW + " } }");
+    updateIndexSettings(
+        indexName, "{ \"index\": { \"max_result_window\": " + DEFAULT_MAX_RESULT_WINDOW + " } }");
   }
 
-  /**
-   * Provide for each test to load test index, data and other setup work
-   */
-  protected void init() throws Exception {
-  }
+  /** Provide for each test to load test index, data and other setup work */
+  protected void init() throws Exception {}
 
   /**
-   * Make it thread-safe in case tests are running in parallel but does not guarantee
-   * if test like DeleteIT that mutates cluster running in parallel.
+   * Make it thread-safe in case tests are running in parallel but does not guarantee if test like
+   * DeleteIT that mutates cluster running in parallel.
    */
-  protected synchronized void loadIndex(Index index) throws IOException {
+  protected synchronized void loadIndex(Index index, RestClient client) throws IOException {
     String indexName = index.getName();
     String mapping = index.getMapping();
     String dataSet = index.getDataSet();
 
-    if (!isIndexExist(client(), indexName)) {
-      createIndexByRestClient(client(), indexName, mapping);
-      loadDataByRestClient(client(), indexName, dataSet);
+    if (!isIndexExist(client, indexName)) {
+      createIndexByRestClient(client, indexName, mapping);
+      loadDataByRestClient(client, indexName, dataSet);
     }
   }
 
+  protected synchronized void loadIndex(Index index) throws IOException {
+    loadIndex(index, client());
+  }
+
   protected Request getSqlRequest(String request, boolean explain) {
     return getSqlRequest(request, explain, "json");
   }
@@ -222,12 +245,17 @@ protected Request getSqlCursorCloseRequest(String cursorRequest) {
   }
 
   protected String executeQuery(String query, String requestType) {
+    return executeQuery(query, requestType, Map.of());
+  }
+
+  protected String executeQuery(String query, String requestType, Map<String, String> params) {
     try {
       String endpoint = "/_plugins/_sql?format=" + requestType;
       String requestBody = makeRequest(query);
 
       Request sqlRequest = new Request("POST", endpoint);
       sqlRequest.setJsonEntity(requestBody);
+      sqlRequest.addParameters(params);
 
       Response response = client().performRequest(sqlRequest);
       Assert.assertEquals(200, response.getStatusLine().getStatusCode());
@@ -256,6 +284,17 @@ protected String executeFetchQuery(String query, int fetchSize, String requestTy
     return responseString;
   }
 
+  protected JSONObject executeQueryTemplate(String queryTemplate, String index, int fetchSize)
+      throws IOException {
+    var query = String.format(queryTemplate, index);
+    return new JSONObject(executeFetchQuery(query, fetchSize, "jdbc"));
+  }
+
+  protected JSONObject executeQueryTemplate(String queryTemplate, String index) throws IOException {
+    var query = String.format(queryTemplate, index);
+    return executeQueryTemplate(queryTemplate, index, 4);
+  }
+
   protected String executeFetchLessQuery(String query, String requestType) throws IOException {
 
     String endpoint = "/_plugins/_sql?format=" + requestType;
@@ -281,8 +320,9 @@ protected Request buildGetEndpointRequest(final String sqlQuery) {
       Assert.fail(utf8CharsetName + " not available");
     }
 
-    final String requestUrl = String.format(Locale.ROOT, "%s?sql=%s&format=%s", QUERY_API_ENDPOINT,
-        urlEncodedQuery, "json");
+    final String requestUrl =
+        String.format(
+            Locale.ROOT, "%s?sql=%s&format=%s", QUERY_API_ENDPOINT, urlEncodedQuery, "json");
     return new Request("GET", requestUrl);
   }
 
@@ -321,13 +361,17 @@ private String executeRequest(final String requestBody, final boolean isExplainQ
     return executeRequest(sqlRequest);
   }
 
-  protected static String executeRequest(final Request request) throws IOException {
-
-    Response response = client().performRequest(request);
+  protected static String executeRequest(final Request request, RestClient client)
+      throws IOException {
+    Response response = client.performRequest(request);
     Assert.assertEquals(200, response.getStatusLine().getStatusCode());
     return getResponseBody(response);
   }
 
+  protected static String executeRequest(final Request request) throws IOException {
+    return executeRequest(request, client());
+  }
+
   protected JSONObject executeQueryWithGetRequest(final String sqlQuery) throws IOException {
 
     final Request request = buildGetEndpointRequest(sqlQuery);
@@ -347,15 +391,21 @@ protected JSONObject executeCursorCloseQuery(final String cursor) throws IOExcep
     return new JSONObject(executeRequest(sqlRequest));
   }
 
-  protected static JSONObject updateClusterSettings(ClusterSetting setting) throws IOException {
+  protected static JSONObject updateClusterSettings(ClusterSetting setting, RestClient client)
+      throws IOException {
     Request request = new Request("PUT", "/_cluster/settings");
-    String persistentSetting = String.format(Locale.ROOT,
-        "{\"%s\": {\"%s\": %s}}", setting.type, setting.name, setting.value);
+    String persistentSetting =
+        String.format(
+            Locale.ROOT, "{\"%s\": {\"%s\": %s}}", setting.type, setting.name, setting.value);
     request.setJsonEntity(persistentSetting);
     RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
     restOptionsBuilder.addHeader("Content-Type", "application/json");
     request.setOptions(restOptionsBuilder);
-    return new JSONObject(executeRequest(request));
+    return new JSONObject(executeRequest(request, client));
+  }
+
+  protected static JSONObject updateClusterSettings(ClusterSetting setting) throws IOException {
+    return updateClusterSettings(setting, client());
   }
 
   protected static JSONObject getAllClusterSettings() throws IOException {
@@ -383,11 +433,17 @@ ClusterSetting nullify() {
 
     @Override
     public String toString() {
-      return "ClusterSetting{" +
-          "type='" + type + '\'' +
-          ", path='" + name + '\'' +
-          ", value='" + value + '\'' +
-          '}';
+      return "ClusterSetting{"
+          + "type='"
+          + type
+          + '\''
+          + ", path='"
+          + name
+          + '\''
+          + ", value='"
+          + value
+          + '\''
+          + '}';
     }
   }
 
@@ -408,16 +464,12 @@ protected String makeRequest(String query) {
   }
 
   protected String makeRequest(String query, int fetch_size) {
-    return String.format("{\n" +
-        "  \"fetch_size\": \"%s\",\n" +
-        "  \"query\": \"%s\"\n" +
-        "}", fetch_size, query);
+    return String.format(
+        "{\n" + "  \"fetch_size\": \"%s\",\n" + "  \"query\": \"%s\"\n" + "}", fetch_size, query);
   }
 
   protected String makeFetchLessRequest(String query) {
-    return String.format("{\n" +
-        "  \"query\": \"%s\"\n" +
-        "}", query);
+    return String.format("{\n" + "  \"query\": \"%s\"\n" + "}", query);
   }
 
   protected String makeCursorRequest(String cursor) {
@@ -441,154 +493,250 @@ protected JSONObject getSource(JSONObject hit) {
     return hit.getJSONObject("_source");
   }
 
-  /**
-   * Enum for associating test index with relevant mapping and data.
-   */
+  protected static Request getCreateDataSourceRequest(DataSourceMetadata dataSourceMetadata) {
+    Request request = new Request("POST", "/_plugins/_query/_datasources");
+    request.setJsonEntity(SerializeUtils.buildGson().toJson(dataSourceMetadata));
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+    return request;
+  }
+
+  protected static Request getUpdateDataSourceRequest(DataSourceMetadata dataSourceMetadata) {
+    Request request = new Request("PUT", "/_plugins/_query/_datasources");
+    request.setJsonEntity(SerializeUtils.buildGson().toJson(dataSourceMetadata));
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+    return request;
+  }
+
+  protected static Request getPatchDataSourceRequest(Map<String, Object> dataSourceData) {
+    Request request = new Request("PATCH", "/_plugins/_query/_datasources");
+    request.setJsonEntity(SerializeUtils.buildGson().toJson(dataSourceData));
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+    return request;
+  }
+
+  protected static Request getFetchDataSourceRequest(String name) {
+    Request request = new Request("GET", "/_plugins/_query/_datasources" + "/" + name);
+    if (StringUtils.isEmpty(name)) {
+      request = new Request("GET", "/_plugins/_query/_datasources");
+    }
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+    return request;
+  }
+
+  protected static Request getDeleteDataSourceRequest(String name) {
+    Request request = new Request("DELETE", "/_plugins/_query/_datasources" + "/" + name);
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+    return request;
+  }
+
+  /** Enum for associating test index with relevant mapping and data. */
   public enum Index {
-    ONLINE(TestsConstants.TEST_INDEX_ONLINE,
-        "online",
-        null,
-        "src/test/resources/online.json"),
-    ACCOUNT(TestsConstants.TEST_INDEX_ACCOUNT,
+    ONLINE(TestsConstants.TEST_INDEX_ONLINE, "online", null, "src/test/resources/online.json"),
+    ACCOUNT(
+        TestsConstants.TEST_INDEX_ACCOUNT,
         "account",
         getAccountIndexMapping(),
         "src/test/resources/accounts.json"),
-    PHRASE(TestsConstants.TEST_INDEX_PHRASE,
+    PHRASE(
+        TestsConstants.TEST_INDEX_PHRASE,
         "phrase",
         getPhraseIndexMapping(),
         "src/test/resources/phrases.json"),
-    DOG(TestsConstants.TEST_INDEX_DOG,
-        "dog",
-        getDogIndexMapping(),
-        "src/test/resources/dogs.json"),
-    DOGS2(TestsConstants.TEST_INDEX_DOG2,
+    DOG(TestsConstants.TEST_INDEX_DOG, "dog", getDogIndexMapping(), "src/test/resources/dogs.json"),
+    DOGS2(
+        TestsConstants.TEST_INDEX_DOG2,
         "dog",
         getDogs2IndexMapping(),
         "src/test/resources/dogs2.json"),
-    DOGS3(TestsConstants.TEST_INDEX_DOG3,
+    DOGS3(
+        TestsConstants.TEST_INDEX_DOG3,
         "dog",
         getDogs3IndexMapping(),
         "src/test/resources/dogs3.json"),
-    DOGSSUBQUERY(TestsConstants.TEST_INDEX_DOGSUBQUERY,
+    DOGSSUBQUERY(
+        TestsConstants.TEST_INDEX_DOGSUBQUERY,
         "dog",
         getDogIndexMapping(),
         "src/test/resources/dogsubquery.json"),
-    PEOPLE(TestsConstants.TEST_INDEX_PEOPLE,
-        "people",
-        null,
-        "src/test/resources/peoples.json"),
-    PEOPLE2(TestsConstants.TEST_INDEX_PEOPLE2,
+    PEOPLE(TestsConstants.TEST_INDEX_PEOPLE, "people", null, "src/test/resources/peoples.json"),
+    PEOPLE2(
+        TestsConstants.TEST_INDEX_PEOPLE2,
         "people",
         getPeople2IndexMapping(),
         "src/test/resources/people2.json"),
-    GAME_OF_THRONES(TestsConstants.TEST_INDEX_GAME_OF_THRONES,
+    GAME_OF_THRONES(
+        TestsConstants.TEST_INDEX_GAME_OF_THRONES,
         "gotCharacters",
         getGameOfThronesIndexMapping(),
         "src/test/resources/game_of_thrones_complex.json"),
-    SYSTEM(TestsConstants.TEST_INDEX_SYSTEM,
-        "systems",
-        null,
-        "src/test/resources/systems.json"),
-    ODBC(TestsConstants.TEST_INDEX_ODBC,
+    SYSTEM(TestsConstants.TEST_INDEX_SYSTEM, "systems", null, "src/test/resources/systems.json"),
+    ODBC(
+        TestsConstants.TEST_INDEX_ODBC,
         "odbc",
         getOdbcIndexMapping(),
         "src/test/resources/odbc-date-formats.json"),
-    LOCATION(TestsConstants.TEST_INDEX_LOCATION,
+    LOCATION(
+        TestsConstants.TEST_INDEX_LOCATION,
         "location",
         getLocationIndexMapping(),
         "src/test/resources/locations.json"),
-    LOCATION_TWO(TestsConstants.TEST_INDEX_LOCATION2,
+    LOCATION_TWO(
+        TestsConstants.TEST_INDEX_LOCATION2,
         "location2",
         getLocationIndexMapping(),
         "src/test/resources/locations2.json"),
-    NESTED(TestsConstants.TEST_INDEX_NESTED_TYPE,
+    NESTED(
+        TestsConstants.TEST_INDEX_NESTED_TYPE,
         "nestedType",
         getNestedTypeIndexMapping(),
         "src/test/resources/nested_objects.json"),
-    NESTED_WITH_QUOTES(TestsConstants.TEST_INDEX_NESTED_WITH_QUOTES,
+    NESTED_WITHOUT_ARRAYS(
+        TestsConstants.TEST_INDEX_NESTED_TYPE_WITHOUT_ARRAYS,
+        "nestedTypeWithoutArrays",
+        getNestedTypeIndexMapping(),
+        "src/test/resources/nested_objects_without_arrays.json"),
+    NESTED_WITH_QUOTES(
+        TestsConstants.TEST_INDEX_NESTED_WITH_QUOTES,
         "nestedType",
         getNestedTypeIndexMapping(),
         "src/test/resources/nested_objects_quotes_in_values.json"),
-    EMPLOYEE_NESTED(TestsConstants.TEST_INDEX_EMPLOYEE_NESTED,
+    EMPLOYEE_NESTED(
+        TestsConstants.TEST_INDEX_EMPLOYEE_NESTED,
         "_doc",
         getEmployeeNestedTypeIndexMapping(),
         "src/test/resources/employee_nested.json"),
-    JOIN(TestsConstants.TEST_INDEX_JOIN_TYPE,
+    JOIN(
+        TestsConstants.TEST_INDEX_JOIN_TYPE,
         "joinType",
         getJoinTypeIndexMapping(),
         "src/test/resources/join_objects.json"),
-    BANK(TestsConstants.TEST_INDEX_BANK,
+    UNEXPANDED_OBJECT(
+        TestsConstants.TEST_INDEX_UNEXPANDED_OBJECT,
+        "unexpandedObject",
+        getUnexpandedObjectIndexMapping(),
+        "src/test/resources/unexpanded_objects.json"),
+    BANK(
+        TestsConstants.TEST_INDEX_BANK,
         "account",
         getBankIndexMapping(),
         "src/test/resources/bank.json"),
-    BANK_TWO(TestsConstants.TEST_INDEX_BANK_TWO,
+    BANK_TWO(
+        TestsConstants.TEST_INDEX_BANK_TWO,
         "account_two",
         getBankIndexMapping(),
         "src/test/resources/bank_two.json"),
-    BANK_WITH_NULL_VALUES(TestsConstants.TEST_INDEX_BANK_WITH_NULL_VALUES,
+    BANK_WITH_NULL_VALUES(
+        TestsConstants.TEST_INDEX_BANK_WITH_NULL_VALUES,
         "account_null",
         getBankWithNullValuesIndexMapping(),
         "src/test/resources/bank_with_null_values.json"),
-    BANK_WITH_STRING_VALUES(TestsConstants.TEST_INDEX_STRINGS,
+    BANK_WITH_STRING_VALUES(
+        TestsConstants.TEST_INDEX_STRINGS,
         "strings",
         getStringIndexMapping(),
         "src/test/resources/strings.json"),
-    BANK_CSV_SANITIZE(TestsConstants.TEST_INDEX_BANK_CSV_SANITIZE,
+    BANK_CSV_SANITIZE(
+        TestsConstants.TEST_INDEX_BANK_CSV_SANITIZE,
         "account",
         getBankIndexMapping(),
         "src/test/resources/bank_csv_sanitize.json"),
-    BANK_RAW_SANITIZE(TestsConstants.TEST_INDEX_BANK_RAW_SANITIZE,
-            "account",
-            getBankIndexMapping(),
-            "src/test/resources/bank_raw_sanitize.json"),
-    ORDER(TestsConstants.TEST_INDEX_ORDER,
+    BANK_RAW_SANITIZE(
+        TestsConstants.TEST_INDEX_BANK_RAW_SANITIZE,
+        "account",
+        getBankIndexMapping(),
+        "src/test/resources/bank_raw_sanitize.json"),
+    ORDER(
+        TestsConstants.TEST_INDEX_ORDER,
         "_doc",
         getOrderIndexMapping(),
         "src/test/resources/order.json"),
-    WEBLOG(TestsConstants.TEST_INDEX_WEBLOG,
+    WEBLOG(
+        TestsConstants.TEST_INDEX_WEBLOG,
         "weblog",
         getWeblogsIndexMapping(),
         "src/test/resources/weblogs.json"),
-    DATE(TestsConstants.TEST_INDEX_DATE,
+    DATE(
+        TestsConstants.TEST_INDEX_DATE,
         "dates",
         getDateIndexMapping(),
         "src/test/resources/dates.json"),
-    DATETIME(TestsConstants.TEST_INDEX_DATE_TIME,
+    DATETIME(
+        TestsConstants.TEST_INDEX_DATE_TIME,
         "_doc",
         getDateTimeIndexMapping(),
         "src/test/resources/datetime.json"),
-    NESTED_SIMPLE(TestsConstants.TEST_INDEX_NESTED_SIMPLE,
+    NESTED_SIMPLE(
+        TestsConstants.TEST_INDEX_NESTED_SIMPLE,
         "_doc",
         getNestedSimpleIndexMapping(),
         "src/test/resources/nested_simple.json"),
-    DEEP_NESTED(TestsConstants.TEST_INDEX_DEEP_NESTED,
+    DEEP_NESTED(
+        TestsConstants.TEST_INDEX_DEEP_NESTED,
         "_doc",
         getDeepNestedIndexMapping(),
         "src/test/resources/deep_nested_index_data.json"),
-    DATA_TYPE_NUMERIC(TestsConstants.TEST_INDEX_DATATYPE_NUMERIC,
+    DATA_TYPE_NUMERIC(
+        TestsConstants.TEST_INDEX_DATATYPE_NUMERIC,
         "_doc",
         getDataTypeNumericIndexMapping(),
         "src/test/resources/datatypes_numeric.json"),
-    DATA_TYPE_NONNUMERIC(TestsConstants.TEST_INDEX_DATATYPE_NONNUMERIC,
+    DATA_TYPE_NONNUMERIC(
+        TestsConstants.TEST_INDEX_DATATYPE_NONNUMERIC,
         "_doc",
         getDataTypeNonnumericIndexMapping(),
         "src/test/resources/datatypes.json"),
-    BEER(TestsConstants.TEST_INDEX_BEER,
-        "beer",
-        null,
-        "src/test/resources/beer.stackexchange.json"),
-    NULL_MISSING(TestsConstants.TEST_INDEX_NULL_MISSING,
+    BEER(
+        TestsConstants.TEST_INDEX_BEER, "beer", null, "src/test/resources/beer.stackexchange.json"),
+    NULL_MISSING(
+        TestsConstants.TEST_INDEX_NULL_MISSING,
         "null_missing",
         getMappingFile("null_missing_index_mapping.json"),
         "src/test/resources/null_missing.json"),
-    CALCS(TestsConstants.TEST_INDEX_CALCS,
+    CALCS(
+        TestsConstants.TEST_INDEX_CALCS,
         "calcs",
         getMappingFile("calcs_index_mappings.json"),
         "src/test/resources/calcs.json"),
-    WILDCARD(TestsConstants.TEST_INDEX_WILDCARD,
+    DATE_FORMATS(
+        TestsConstants.TEST_INDEX_DATE_FORMATS,
+        "date_formats",
+        getMappingFile("date_formats_index_mapping.json"),
+        "src/test/resources/date_formats.json"),
+    WILDCARD(
+        TestsConstants.TEST_INDEX_WILDCARD,
         "wildcard",
         getMappingFile("wildcard_index_mappings.json"),
-        "src/test/resources/wildcard.json"),;
+        "src/test/resources/wildcard.json"),
+    DATASOURCES(
+        TestsConstants.DATASOURCES,
+        "datasource",
+        getMappingFile("datasources_index_mappings.json"),
+        "src/test/resources/datasources.json"),
+    MULTI_NESTED(
+        TestsConstants.TEST_INDEX_MULTI_NESTED_TYPE,
+        "multi_nested",
+        getMappingFile("multi_nested.json"),
+        "src/test/resources/multi_nested_objects.json"),
+    NESTED_WITH_NULLS(
+        TestsConstants.TEST_INDEX_NESTED_WITH_NULLS,
+        "multi_nested",
+        getNestedTypeIndexMapping(),
+        "src/test/resources/nested_with_nulls.json"),
+    GEOPOINTS(
+        TestsConstants.TEST_INDEX_GEOPOINT,
+        "dates",
+        getGeopointIndexMapping(),
+        "src/test/resources/geopoints.json");
 
     private final String name;
     private final String type;
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/ShowIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/ShowIT.java
index b28336c482..fa86bbbc22 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/ShowIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/ShowIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -20,7 +19,8 @@ public class ShowIT extends SQLIntegTestCase {
 
   @Override
   protected void init() {
-    // Note: not using the existing TEST_INDEX_* indices, since underscore in the names causes issues
+    // Note: not using the existing TEST_INDEX_* indices, since underscore in the names causes
+    // issues
     createEmptyIndexIfNotExist("abcdefg");
     createEmptyIndexIfNotExist("abcdefghijk");
     createEmptyIndexIfNotExist("abcdijk");
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/SourceFieldIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/SourceFieldIT.java
index 91c8321c95..bf288262b6 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/SourceFieldIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/SourceFieldIT.java
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import java.io.IOException;
 import java.util.Set;
 import org.json.JSONObject;
@@ -15,10 +15,9 @@
 import org.junit.Test;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 
@@ -31,32 +30,44 @@ protected void init() throws Exception {
 
   @Test
   public void includeTest() throws IOException {
-    SearchHits response = query(String.format(
-        "SELECT include('*name','*ge'),include('b*'),include('*ddre*'),include('gender') FROM %s LIMIT 1000",
-        TEST_INDEX_ACCOUNT));
+    SearchHits response =
+        query(
+            String.format(
+                "SELECT include('*name','*ge'),include('b*'),include('*ddre*'),include('gender')"
+                    + " FROM %s LIMIT 1000",
+                TEST_INDEX_ACCOUNT));
     for (SearchHit hit : response.getHits()) {
       Set<String> keySet = hit.getSourceAsMap().keySet();
       for (String field : keySet) {
-        Assert.assertTrue(field.endsWith("name") || field.endsWith("ge") || field.startsWith("b") ||
-            field.contains("ddre") || field.equals("gender"));
+        Assert.assertTrue(
+            field.endsWith("name")
+                || field.endsWith("ge")
+                || field.startsWith("b")
+                || field.contains("ddre")
+                || field.equals("gender"));
       }
     }
-
   }
 
   @Test
   public void excludeTest() throws IOException {
 
-    SearchHits response = query(String.format(
-        "SELECT exclude('*name','*ge'),exclude('b*'),exclude('*ddre*'),exclude('gender') FROM %s LIMIT 1000",
-        TEST_INDEX_ACCOUNT));
+    SearchHits response =
+        query(
+            String.format(
+                "SELECT exclude('*name','*ge'),exclude('b*'),exclude('*ddre*'),exclude('gender')"
+                    + " FROM %s LIMIT 1000",
+                TEST_INDEX_ACCOUNT));
 
     for (SearchHit hit : response.getHits()) {
       Set<String> keySet = hit.getSourceAsMap().keySet();
       for (String field : keySet) {
         Assert.assertFalse(
-            field.endsWith("name") || field.endsWith("ge") || field.startsWith("b") ||
-                field.contains("ddre") || field.equals("gender"));
+            field.endsWith("name")
+                || field.endsWith("ge")
+                || field.startsWith("b")
+                || field.contains("ddre")
+                || field.equals("gender"));
       }
     }
   }
@@ -64,15 +75,18 @@ public void excludeTest() throws IOException {
   @Test
   public void allTest() throws IOException {
 
-    SearchHits response = query(String.format(
-        "SELECT exclude('*name','*ge'),include('b*'),exclude('*ddre*'),include('gender') FROM %s LIMIT 1000",
-        TEST_INDEX_ACCOUNT));
+    SearchHits response =
+        query(
+            String.format(
+                "SELECT exclude('*name','*ge'),include('b*'),exclude('*ddre*'),include('gender')"
+                    + " FROM %s LIMIT 1000",
+                TEST_INDEX_ACCOUNT));
 
     for (SearchHit hit : response.getHits()) {
       Set<String> keySet = hit.getSourceAsMap().keySet();
       for (String field : keySet) {
-        Assert
-            .assertFalse(field.endsWith("name") || field.endsWith("ge") || field.contains("ddre"));
+        Assert.assertFalse(
+            field.endsWith("name") || field.endsWith("ge") || field.contains("ddre"));
         Assert.assertTrue(field.startsWith("b") || field.equals("gender"));
       }
     }
@@ -81,11 +95,11 @@ public void allTest() throws IOException {
   private SearchHits query(String query) throws IOException {
     final JSONObject jsonObject = executeQuery(query);
 
-    final XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(
-        NamedXContentRegistry.EMPTY,
-        LoggingDeprecationHandler.INSTANCE,
-        jsonObject.toString());
+    final XContentParser parser =
+        new JsonXContentParser(
+            NamedXContentRegistry.EMPTY,
+            LoggingDeprecationHandler.INSTANCE,
+            new JsonFactory().createParser(jsonObject.toString()));
     return SearchResponse.fromXContent(parser).getHits();
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/SubqueryIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/SubqueryIT.java
index 7fbfb1ef1c..16614bfd2a 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/SubqueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/SubqueryIT.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.both;
+import static org.hamcrest.Matchers.closeTo;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.core.Is.is;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
@@ -22,6 +22,7 @@
 
 import com.google.common.collect.Ordering;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -36,9 +37,7 @@
 
 public class SubqueryIT extends SQLIntegTestCase {
 
-  @Rule
-  public ExpectedException exceptionRule = ExpectedException.none();
-
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
   @Override
   protected void init() throws Exception {
@@ -49,50 +48,55 @@ protected void init() throws Exception {
 
   @Test
   public void testIN() throws IOException {
-    String query = String.format(Locale.ROOT,
-        "SELECT dog_name " +
-            "FROM %s A " +
-            "WHERE holdersName IN (SELECT firstname FROM %s B) " +
-            "AND dog_name <> 'babala'",
-        TEST_INDEX_DOGSUBQUERY, TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT dog_name "
+                + "FROM %s A "
+                + "WHERE holdersName IN (SELECT firstname FROM %s B) "
+                + "AND dog_name <> 'babala'",
+            TEST_INDEX_DOGSUBQUERY,
+            TEST_INDEX_ACCOUNT);
 
     JSONObject response = executeQuery(query);
     assertThat(
         response,
         hitAll(
             kvString("/_source/A.dog_name", is("snoopy")),
-            kvString("/_source/A.dog_name", is("gogo"))
-        )
-    );
+            kvString("/_source/A.dog_name", is("gogo"))));
   }
 
   @Test
   public void testINWithAlias() throws IOException {
-    String query = String.format(Locale.ROOT,
-        "SELECT A.dog_name " +
-            "FROM %s A " +
-            "WHERE A.holdersName IN (SELECT B.firstname FROM %s B) " +
-            "AND A.dog_name <> 'babala'",
-        TEST_INDEX_DOGSUBQUERY, TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT A.dog_name "
+                + "FROM %s A "
+                + "WHERE A.holdersName IN (SELECT B.firstname FROM %s B) "
+                + "AND A.dog_name <> 'babala'",
+            TEST_INDEX_DOGSUBQUERY,
+            TEST_INDEX_ACCOUNT);
 
     JSONObject response = executeQuery(query);
     assertThat(
         response,
         hitAll(
             kvString("/_source/A.dog_name", is("snoopy")),
-            kvString("/_source/A.dog_name", is("gogo"))
-        )
-    );
+            kvString("/_source/A.dog_name", is("gogo"))));
   }
 
   @Test
   public void testINSelectAll() throws IOException {
-    String query = String.format(Locale.ROOT,
-        "SELECT * " +
-            "FROM %s A " +
-            "WHERE holdersName IN (SELECT firstname FROM %s B) " +
-            "AND dog_name <> 'babala'",
-        TEST_INDEX_DOGSUBQUERY, TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT * "
+                + "FROM %s A "
+                + "WHERE holdersName IN (SELECT firstname FROM %s B) "
+                + "AND dog_name <> 'babala'",
+            TEST_INDEX_DOGSUBQUERY,
+            TEST_INDEX_ACCOUNT);
 
     JSONObject response = executeQuery(query);
     assertThat(
@@ -103,39 +107,38 @@ public void testINSelectAll() throws IOException {
                 .and(kvInt("/_source/A.age", is(4))),
             both(kvString("/_source/A.dog_name", is("gogo")))
                 .and(kvString("/_source/A.holdersName", is("Gabrielle")))
-                .and(kvInt("/_source/A.age", is(6)))
-        )
-    );
+                .and(kvInt("/_source/A.age", is(6)))));
   }
 
   @Test
   public void testINWithInnerWhere() throws IOException {
-    String query = String.format(Locale.ROOT,
-        "SELECT dog_name " +
-            "FROM %s A " +
-            "WHERE holdersName IN (SELECT firstname FROM %s B WHERE age <> 36) " +
-            "AND dog_name <> 'babala'",
-        TEST_INDEX_DOGSUBQUERY, TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT dog_name "
+                + "FROM %s A "
+                + "WHERE holdersName IN (SELECT firstname FROM %s B WHERE age <> 36) "
+                + "AND dog_name <> 'babala'",
+            TEST_INDEX_DOGSUBQUERY,
+            TEST_INDEX_ACCOUNT);
 
     JSONObject response = executeQuery(query);
-    assertThat(
-        response,
-        hitAll(
-            kvString("/_source/A.dog_name", is("gogo"))
-        )
-    );
+    assertThat(response, hitAll(kvString("/_source/A.dog_name", is("gogo"))));
   }
 
   @Test
   public void testNotSupportedQuery() throws IOException {
     exceptionRule.expect(ResponseException.class);
     exceptionRule.expectMessage("Unsupported subquery");
-    String query = String.format(Locale.ROOT,
-        "SELECT dog_name " +
-            "FROM %s A " +
-            "WHERE holdersName NOT IN (SELECT firstname FROM %s B WHERE age <> 36) " +
-            "AND dog_name <> 'babala'",
-        TEST_INDEX_DOGSUBQUERY, TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT dog_name "
+                + "FROM %s A "
+                + "WHERE holdersName NOT IN (SELECT firstname FROM %s B WHERE age <> 36) "
+                + "AND dog_name <> 'babala'",
+            TEST_INDEX_DOGSUBQUERY,
+            TEST_INDEX_ACCOUNT);
     executeQuery(query);
   }
 
@@ -143,100 +146,91 @@ public void testNotSupportedQuery() throws IOException {
   @Ignore
   @Test
   public void testINWithDuplicate() throws IOException {
-    String query = String.format(Locale.ROOT,
-        "SELECT dog_name " +
-            "FROM %s A " +
-            "WHERE holdersName IN (SELECT firstname FROM %s B)",
-        TEST_INDEX_DOGSUBQUERY, TEST_INDEX_ACCOUNT);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT dog_name " + "FROM %s A " + "WHERE holdersName IN (SELECT firstname FROM %s B)",
+            TEST_INDEX_DOGSUBQUERY,
+            TEST_INDEX_ACCOUNT);
 
     JSONObject response = executeQuery(query);
     assertThat(
         response,
         hitAll(
             kvString("/_source/A.dog_name", is("snoopy")),
-            kvString("/_source/A.dog_name", is("babala"))
-        )
-    );
+            kvString("/_source/A.dog_name", is("babala"))));
   }
 
   @Test
   public void nonCorrelatedExists() throws IOException {
-    String query = String.format(Locale.ROOT,
-        "SELECT e.name " +
-            "FROM %s as e " +
-            "WHERE EXISTS (SELECT * FROM e.projects as p)",
-        TEST_INDEX_EMPLOYEE_NESTED);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT e.name " + "FROM %s as e " + "WHERE EXISTS (SELECT * FROM e.projects as p)",
+            TEST_INDEX_EMPLOYEE_NESTED);
 
     JSONObject response = executeQuery(query);
     assertThat(
         response,
         hitAll(
             kvString("/_source/name", is("Bob Smith")),
-            kvString("/_source/name", is("Jane Smith"))
-        )
-    );
+            kvString("/_source/name", is("Jane Smith"))));
   }
 
   @Test
   public void nonCorrelatedExistsWhere() throws IOException {
-    String query = String.format(Locale.ROOT,
-        "SELECT e.name " +
-            "FROM %s as e " +
-            "WHERE EXISTS (SELECT * FROM e.projects as p WHERE p.name LIKE 'aurora')",
-        TEST_INDEX_EMPLOYEE_NESTED);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT e.name "
+                + "FROM %s as e "
+                + "WHERE EXISTS (SELECT * FROM e.projects as p WHERE p.name LIKE 'aurora')",
+            TEST_INDEX_EMPLOYEE_NESTED);
 
     JSONObject response = executeQuery(query);
-    assertThat(
-        response,
-        hitAll(
-            kvString("/_source/name", is("Bob Smith"))
-        )
-    );
+    assertThat(response, hitAll(kvString("/_source/name", is("Bob Smith"))));
   }
 
   @Test
   public void nonCorrelatedExistsParentWhere() throws IOException {
-    String query = String.format(Locale.ROOT,
-        "SELECT e.name " +
-            "FROM %s as e " +
-            "WHERE EXISTS (SELECT * FROM e.projects as p WHERE p.name LIKE 'security') " +
-            "AND e.name LIKE 'jane'",
-        TEST_INDEX_EMPLOYEE_NESTED);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT e.name "
+                + "FROM %s as e "
+                + "WHERE EXISTS (SELECT * FROM e.projects as p WHERE p.name LIKE 'security') "
+                + "AND e.name LIKE 'jane'",
+            TEST_INDEX_EMPLOYEE_NESTED);
 
     JSONObject response = executeQuery(query);
-    assertThat(
-        response,
-        hitAll(
-            kvString("/_source/name", is("Jane Smith"))
-        )
-    );
+    assertThat(response, hitAll(kvString("/_source/name", is("Jane Smith"))));
   }
 
   @Test
   public void nonCorrelatedNotExists() throws IOException {
-    String query = String.format(Locale.ROOT,
-        "SELECT e.name " +
-            "FROM %s as e " +
-            "WHERE NOT EXISTS (SELECT * FROM e.projects as p)",
-        TEST_INDEX_EMPLOYEE_NESTED);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT e.name " + "FROM %s as e " + "WHERE NOT EXISTS (SELECT * FROM e.projects as p)",
+            TEST_INDEX_EMPLOYEE_NESTED);
 
     JSONObject response = executeQuery(query);
     assertThat(
         response,
         hitAll(
             kvString("/_source/name", is("Susan Smith")),
-            kvString("/_source/name", is("John Doe"))
-        )
-    );
+            kvString("/_source/name", is("John Doe"))));
   }
 
   @Test
   public void nonCorrelatedNotExistsWhere() throws IOException {
-    String query = String.format(Locale.ROOT,
-        "SELECT e.name " +
-            "FROM %s as e " +
-            "WHERE NOT EXISTS (SELECT * FROM e.projects as p WHERE p.name LIKE 'aurora')",
-        TEST_INDEX_EMPLOYEE_NESTED);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT e.name "
+                + "FROM %s as e "
+                + "WHERE NOT EXISTS (SELECT * FROM e.projects as p WHERE p.name LIKE 'aurora')",
+            TEST_INDEX_EMPLOYEE_NESTED);
 
     JSONObject response = executeQuery(query);
     assertThat(
@@ -244,52 +238,55 @@ public void nonCorrelatedNotExistsWhere() throws IOException {
         hitAll(
             kvString("/_source/name", is("Susan Smith")),
             kvString("/_source/name", is("Jane Smith")),
-            kvString("/_source/name", is("John Doe"))
-        )
-    );
+            kvString("/_source/name", is("John Doe"))));
   }
 
   @Test
   public void nonCorrelatedNotExistsParentWhere() throws IOException {
-    String query = String.format(Locale.ROOT,
-        "SELECT e.name " +
-            "FROM %s as e " +
-            "WHERE NOT EXISTS (SELECT * FROM e.projects as p WHERE p.name LIKE 'security') " +
-            "AND e.name LIKE 'smith'",
-        TEST_INDEX_EMPLOYEE_NESTED);
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT e.name "
+                + "FROM %s as e "
+                + "WHERE NOT EXISTS (SELECT * FROM e.projects as p WHERE p.name LIKE 'security') "
+                + "AND e.name LIKE 'smith'",
+            TEST_INDEX_EMPLOYEE_NESTED);
 
     JSONObject response = executeQuery(query);
-    assertThat(
-        response,
-        hitAll(
-            kvString("/_source/name", is("Susan Smith"))
-        )
-    );
+    assertThat(response, hitAll(kvString("/_source/name", is("Susan Smith"))));
   }
 
   @Test
   public void selectFromSubqueryWithCountShouldPass() throws IOException {
-    JSONObject result = executeQuery(
-        StringUtils.format("SELECT t.TEMP as count " +
-            "FROM (SELECT COUNT(*) as TEMP FROM %s) t", TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            StringUtils.format(
+                "SELECT t.TEMP as count " + "FROM (SELECT COUNT(*) as TEMP FROM %s) t",
+                TEST_INDEX_ACCOUNT));
 
     assertThat(result.query("/aggregations/count/value"), equalTo(1000));
   }
 
   @Test
   public void selectFromSubqueryWithWhereAndCountShouldPass() throws IOException {
-    JSONObject result = executeQuery(
-        StringUtils.format("SELECT t.TEMP as count " +
-            "FROM (SELECT COUNT(*) as TEMP FROM %s WHERE age > 30) t", TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            StringUtils.format(
+                "SELECT t.TEMP as count "
+                    + "FROM (SELECT COUNT(*) as TEMP FROM %s WHERE age > 30) t",
+                TEST_INDEX_ACCOUNT));
 
     assertThat(result.query("/aggregations/count/value"), equalTo(502));
   }
 
   @Test
   public void selectFromSubqueryWithCountAndGroupByShouldPass() throws Exception {
-    JSONObject result = executeQuery(
-        StringUtils.format("SELECT t.TEMP as count " +
-            "FROM (SELECT COUNT(*) as TEMP FROM %s GROUP BY gender) t", TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            StringUtils.format(
+                "SELECT t.TEMP as count "
+                    + "FROM (SELECT COUNT(*) as TEMP FROM %s GROUP BY gender) t",
+                TEST_INDEX_ACCOUNT));
 
     assertThat(getTotalHits(result), equalTo(1000));
     JSONObject gender = (JSONObject) result.query("/aggregations/gender");
@@ -310,11 +307,12 @@ public void selectFromSubqueryWithCountAndGroupByShouldPass() throws Exception {
 
   @Test
   public void selectFromSubqueryWithCountAndGroupByAndOrderByShouldPass() throws IOException {
-    JSONObject result = executeQuery(
-        StringUtils.format(
-            "SELECT t.TEMP as count " +
-                "FROM (SELECT COUNT(*) as TEMP FROM %s GROUP BY age ORDER BY TEMP) t",
-            TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            StringUtils.format(
+                "SELECT t.TEMP as count "
+                    + "FROM (SELECT COUNT(*) as TEMP FROM %s GROUP BY age ORDER BY TEMP) t",
+                TEST_INDEX_ACCOUNT));
     JSONArray buckets = (JSONArray) result.query("/aggregations/age/buckets");
     List<Integer> countList = new ArrayList<>();
     for (int i = 0; i < buckets.length(); ++i) {
@@ -326,43 +324,50 @@ public void selectFromSubqueryWithCountAndGroupByAndOrderByShouldPass() throws I
 
   @Test
   public void selectFromSubqueryWithCountAndGroupByAndHavingShouldPass() throws Exception {
-    JSONObject result = executeQuery(
-        StringUtils.format("SELECT t.T1 as g, t.T2 as c " +
-            "FROM (SELECT gender as T1, COUNT(*) as T2 " +
-            "      FROM %s " +
-            "      GROUP BY gender " +
-            "      HAVING T2 > 500) t", TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            StringUtils.format(
+                "SELECT t.T1 as g, t.T2 as c "
+                    + "FROM (SELECT gender as T1, COUNT(*) as T2 "
+                    + "      FROM %s "
+                    + "      GROUP BY gender "
+                    + "      HAVING T2 > 500) t",
+                TEST_INDEX_ACCOUNT));
     assertThat(result.query("/aggregations/g/buckets/0/c/value"), equalTo(507));
   }
 
   @Test
   public void selectFromSubqueryCountAndSum() throws IOException {
-    JSONObject result = executeQuery(
-        StringUtils.format(
-            "SELECT t.TEMP1 as count, t.TEMP2 as balance " +
-                "FROM (SELECT COUNT(*) as TEMP1, SUM(balance) as TEMP2 " +
-                "      FROM %s) t",
-            TEST_INDEX_ACCOUNT));
+    JSONObject result =
+        executeQuery(
+            StringUtils.format(
+                "SELECT t.TEMP1 as count, t.TEMP2 as balance "
+                    + "FROM (SELECT COUNT(*) as TEMP1, SUM(balance) as TEMP2 "
+                    + "      FROM %s) t",
+                TEST_INDEX_ACCOUNT));
 
     assertThat(result.query("/aggregations/count/value"), equalTo(1000));
-    assertThat(result.query("/aggregations/balance/value"), equalTo(25714837.0));
+    assertThat(
+        ((BigDecimal) result.query("/aggregations/balance/value")).doubleValue(),
+        closeTo(25714837.0, 0.01));
   }
 
   @Test
   public void selectFromSubqueryWithoutAliasShouldPass() throws IOException {
-    JSONObject response = executeJdbcRequest(
-        StringUtils.format(
-            "SELECT a.firstname AS my_first, a.lastname AS my_last, a.age AS my_age " +
-                "FROM (SELECT firstname, lastname, age " +
-                "FROM %s " +
-                "WHERE age = 40 and account_number = 291) AS a",
-            TEST_INDEX_ACCOUNT));
-
-    verifySchema(response,
+    JSONObject response =
+        executeJdbcRequest(
+            StringUtils.format(
+                "SELECT a.firstname AS my_first, a.lastname AS my_last, a.age AS my_age "
+                    + "FROM (SELECT firstname, lastname, age "
+                    + "FROM %s "
+                    + "WHERE age = 40 and account_number = 291) AS a",
+                TEST_INDEX_ACCOUNT));
+
+    verifySchema(
+        response,
         schema("firstname", "my_first", "text"),
         schema("lastname", "my_last", "text"),
         schema("age", "my_age", "long"));
-    verifyDataRows(response,
-        rows("Lynn", "Pollard", 40));
+    verifyDataRows(response, rows("Lynn", "Pollard", 40));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/TermQueryExplainIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/TermQueryExplainIT.java
index 5dc0f0901b..9d03e70825 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/TermQueryExplainIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/TermQueryExplainIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.hamcrest.Matchers.containsString;
@@ -15,8 +14,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.opensearch.client.ResponseException;
-import org.opensearch.rest.RestStatus;
-
+import org.opensearch.core.rest.RestStatus;
 
 public class TermQueryExplainIT extends SQLIntegTestCase {
 
@@ -35,13 +33,15 @@ protected void init() throws Exception {
   @Test
   public void testNonExistingIndex() throws IOException {
     try {
-      explainQuery("SELECT firstname, lastname " +
-          "FROM opensearch_sql_test_fake_index " +
-          "WHERE firstname = 'Leo'");
+      explainQuery(
+          "SELECT firstname, lastname "
+              + "FROM opensearch_sql_test_fake_index "
+              + "WHERE firstname = 'Leo'");
       Assert.fail("Expected ResponseException, but none was thrown");
 
     } catch (ResponseException e) {
-      assertThat(e.getResponse().getStatusLine().getStatusCode(),
+      assertThat(
+          e.getResponse().getStatusLine().getStatusCode(),
           equalTo(RestStatus.BAD_REQUEST.getStatus()));
       final String entity = TestUtils.getResponseBody(e.getResponse());
       assertThat(entity, containsString("no such index"));
@@ -52,13 +52,13 @@ public void testNonExistingIndex() throws IOException {
   @Test
   public void testNonResolvingIndexPattern() throws IOException {
     try {
-      explainQuery("SELECT * " +
-          "FROM opensearch_sql_test_blah_blah* " +
-          "WHERE firstname = 'Leo'");
+      explainQuery(
+          "SELECT * " + "FROM opensearch_sql_test_blah_blah* " + "WHERE firstname = 'Leo'");
       Assert.fail("Expected ResponseException, but none was thrown");
 
     } catch (ResponseException e) {
-      assertThat(e.getResponse().getStatusLine().getStatusCode(),
+      assertThat(
+          e.getResponse().getStatusLine().getStatusCode(),
           equalTo(RestStatus.BAD_REQUEST.getStatus()));
       final String entity = TestUtils.getResponseBody(e.getResponse());
       assertThat(entity, containsString("Field [firstname] cannot be found or used here."));
@@ -68,10 +68,11 @@ public void testNonResolvingIndexPattern() throws IOException {
 
   @Test
   public void testNonResolvingIndexPatternWithExistingIndex() throws IOException {
-    String result = explainQuery(
-        "SELECT * " +
-            "FROM opensearch_sql_test_blah_blah*, opensearch-sql_test_index_bank " +
-            "WHERE state = 'DC'");
+    String result =
+        explainQuery(
+            "SELECT * "
+                + "FROM opensearch_sql_test_blah_blah*, opensearch-sql_test_index_bank "
+                + "WHERE state = 'DC'");
     assertThat(result, containsString("\"term\":{\"state.keyword\""));
   }
 
@@ -79,12 +80,13 @@ public void testNonResolvingIndexPatternWithExistingIndex() throws IOException {
   public void testNonResolvingIndexPatternWithNonExistingIndex() throws IOException {
     try {
       explainQuery(
-          "SELECT firstname, lastname " +
-              "FROM opensearch_sql_test_blah_blah*, another_fake_index " +
-              "WHERE firstname = 'Leo'");
+          "SELECT firstname, lastname "
+              + "FROM opensearch_sql_test_blah_blah*, another_fake_index "
+              + "WHERE firstname = 'Leo'");
       Assert.fail("Expected ResponseException, but none was thrown");
     } catch (ResponseException e) {
-      assertThat(e.getResponse().getStatusLine().getStatusCode(),
+      assertThat(
+          e.getResponse().getStatusLine().getStatusCode(),
           equalTo(RestStatus.BAD_REQUEST.getStatus()));
       final String entity = TestUtils.getResponseBody(e.getResponse());
       assertThat(entity, containsString("no such index"));
@@ -95,11 +97,11 @@ public void testNonResolvingIndexPatternWithNonExistingIndex() throws IOExceptio
   @Test
   public void testNonCompatibleMappings() throws IOException {
     try {
-      explainQuery(
-          "SELECT * FROM opensearch-sql_test_index_dog, opensearch-sql_test_index_dog2");
+      explainQuery("SELECT * FROM opensearch-sql_test_index_dog, opensearch-sql_test_index_dog2");
       Assert.fail("Expected ResponseException, but none was thrown");
     } catch (ResponseException e) {
-      assertThat(e.getResponse().getStatusLine().getStatusCode(),
+      assertThat(
+          e.getResponse().getStatusLine().getStatusCode(),
           equalTo(RestStatus.BAD_REQUEST.getStatus()));
       final String entity = TestUtils.getResponseBody(e.getResponse());
       assertThat(entity, containsString("Field [holdersName] have conflict type"));
@@ -108,14 +110,15 @@ public void testNonCompatibleMappings() throws IOException {
   }
 
   /**
-   * The dog_name field has same type in dog and dog2 index.
-   * But, the holdersName field has different type.
+   * The dog_name field has same type in dog and dog2 index. But, the holdersName field has
+   * different type.
    */
   @Test
   public void testNonCompatibleMappingsButTheFieldIsNotUsed() throws IOException {
-    String result = explainQuery(
-        "SELECT dog_name " +
-            "FROM opensearch-sql_test_index_dog, opensearch-sql_test_index_dog2 WHERE dog_name = 'dog'");
+    String result =
+        explainQuery(
+            "SELECT dog_name FROM opensearch-sql_test_index_dog, opensearch-sql_test_index_dog2"
+                + " WHERE dog_name = 'dog'");
     System.out.println(result);
     assertThat(result, containsString("dog_name"));
     assertThat(result, containsString("_source"));
@@ -123,20 +126,21 @@ public void testNonCompatibleMappingsButTheFieldIsNotUsed() throws IOException {
 
   @Test
   public void testEqualFieldMappings() throws IOException {
-    String result = explainQuery(
-        "SELECT color " +
-            "FROM opensearch-sql_test_index_dog2, opensearch-sql_test_index_dog3");
+    String result =
+        explainQuery(
+            "SELECT color "
+                + "FROM opensearch-sql_test_index_dog2, opensearch-sql_test_index_dog3");
     assertThat(result, containsString("color"));
     assertThat(result, containsString("_source"));
   }
 
   @Test
   public void testIdenticalMappings() throws IOException {
-    String result = explainQuery(
-        "SELECT firstname, birthdate, state " +
-            "FROM opensearch-sql_test_index_bank, opensearch-sql_test_index_bank_two " +
-            "WHERE state = 'WA' OR male = true"
-    );
+    String result =
+        explainQuery(
+            "SELECT firstname, birthdate, state "
+                + "FROM opensearch-sql_test_index_bank, opensearch-sql_test_index_bank_two "
+                + "WHERE state = 'WA' OR male = true");
     assertThat(result, containsString("term"));
     assertThat(result, containsString("state.keyword"));
     assertThat(result, containsString("_source"));
@@ -144,24 +148,23 @@ public void testIdenticalMappings() throws IOException {
 
   @Test
   public void testIdenticalMappingsWithTypes() throws IOException {
-    String result = explainQuery(
-        "SELECT firstname, birthdate, state " +
-            "FROM opensearch-sql_test_index_bank/account, opensearch-sql_test_index_bank_two/account_two " +
-            "WHERE state = 'WA' OR male = true"
-    );
+    String result =
+        explainQuery(
+            "SELECT firstname, birthdate, state FROM opensearch-sql_test_index_bank/account,"
+                + " opensearch-sql_test_index_bank_two/account_two WHERE state = 'WA' OR male ="
+                + " true");
     assertThat(result, containsString("term"));
     assertThat(result, containsString("state.keyword"));
     assertThat(result, containsString("_source"));
   }
 
-
   @Test
   public void testIdenticalMappingsWithPartialType() throws IOException {
-    String result = explainQuery(
-        "SELECT firstname, birthdate, state " +
-            "FROM opensearch-sql_test_index_bank/account, opensearch-sql_test_index_bank_two " +
-            "WHERE state = 'WA' OR male = true"
-    );
+    String result =
+        explainQuery(
+            "SELECT firstname, birthdate, state "
+                + "FROM opensearch-sql_test_index_bank/account, opensearch-sql_test_index_bank_two "
+                + "WHERE state = 'WA' OR male = true");
     assertThat(result, containsString("term"));
     assertThat(result, containsString("state.keyword"));
     assertThat(result, containsString("_source"));
@@ -170,22 +173,22 @@ public void testIdenticalMappingsWithPartialType() throws IOException {
   @Test
   public void testTextFieldOnly() throws IOException {
 
-    String result = explainQuery(
-        "SELECT firstname, birthdate, state " +
-            "FROM opensearch-sql_test_index_bank " +
-            "WHERE firstname = 'Abbas'"
-    );
+    String result =
+        explainQuery(
+            "SELECT firstname, birthdate, state "
+                + "FROM opensearch-sql_test_index_bank "
+                + "WHERE firstname = 'Abbas'");
     assertThat(result, containsString("term"));
     assertThat(result, not(containsString("firstname.")));
   }
 
   @Test
   public void testTextAndKeywordAppendsKeywordAlias() throws IOException {
-    String result = explainQuery(
-        "SELECT firstname, birthdate, state " +
-            "FROM opensearch-sql_test_index_bank " +
-            "WHERE state = 'WA' OR lastname = 'Chen'"
-    );
+    String result =
+        explainQuery(
+            "SELECT firstname, birthdate, state "
+                + "FROM opensearch-sql_test_index_bank "
+                + "WHERE state = 'WA' OR lastname = 'Chen'");
     assertThat(result, containsString("term"));
     assertThat(result, containsString("state.keyword"));
     assertThat(result, not(containsString("lastname.")));
@@ -194,8 +197,7 @@ public void testTextAndKeywordAppendsKeywordAlias() throws IOException {
   @Test
   public void testBooleanFieldNoKeywordAlias() throws IOException {
 
-    String result =
-        explainQuery("SELECT * FROM opensearch-sql_test_index_bank WHERE male = false");
+    String result = explainQuery("SELECT * FROM opensearch-sql_test_index_bank WHERE male = false");
     assertThat(result, containsString("term"));
     assertThat(result, not(containsString("male.")));
   }
@@ -203,8 +205,8 @@ public void testBooleanFieldNoKeywordAlias() throws IOException {
   @Test
   public void testDateFieldNoKeywordAlias() throws IOException {
 
-    String result = explainQuery(
-        "SELECT * FROM opensearch-sql_test_index_bank WHERE birthdate = '2018-08-19'");
+    String result =
+        explainQuery("SELECT * FROM opensearch-sql_test_index_bank WHERE birthdate = '2018-08-19'");
     assertThat(result, containsString("term"));
     assertThat(result, not(containsString("birthdate.")));
   }
@@ -218,11 +220,11 @@ public void testNumberNoKeywordAlias() throws IOException {
 
   @Test
   public void inTestInWhere() throws IOException {
-    String result = explainQuery(
-        "SELECT * " +
-            "FROM opensearch-sql_test_index_bank " +
-            "WHERE state IN ('WA' , 'PA' , 'TN')"
-    );
+    String result =
+        explainQuery(
+            "SELECT * "
+                + "FROM opensearch-sql_test_index_bank "
+                + "WHERE state IN ('WA' , 'PA' , 'TN')");
     assertThat(result, containsString("term"));
     assertThat(result, containsString("state.keyword"));
   }
@@ -230,53 +232,52 @@ public void inTestInWhere() throws IOException {
   @Test
   @Ignore // TODO: enable when subqueries are fixed
   public void inTestInWhereSubquery() throws IOException {
-    String result = explainQuery(
-        "SELECT * " +
-            "FROM opensearch-sql_test_index_bank/account WHERE " +
-            "state IN (SELECT state FROM opensearch-sql_test_index_bank WHERE city = 'Nicholson')"
-    );
+    String result =
+        explainQuery(
+            "SELECT * FROM opensearch-sql_test_index_bank/account WHERE state IN (SELECT state FROM"
+                + " opensearch-sql_test_index_bank WHERE city = 'Nicholson')");
     assertThat(result, containsString("term"));
     assertThat(result, containsString("state.keyword"));
   }
 
   @Test
   public void testKeywordAliasGroupBy() throws IOException {
-    String result = explainQuery(
-        "SELECT firstname, state " +
-            "FROM opensearch-sql_test_index_bank/account " +
-            "GROUP BY firstname, state");
+    String result =
+        explainQuery(
+            "SELECT firstname, state "
+                + "FROM opensearch-sql_test_index_bank/account "
+                + "GROUP BY firstname, state");
     assertThat(result, containsString("term"));
     assertThat(result, containsString("state.keyword"));
   }
 
   @Test
   public void testKeywordAliasGroupByUsingTableAlias() throws IOException {
-    String result = explainQuery(
-        "SELECT a.firstname, a.state " +
-            "FROM opensearch-sql_test_index_bank/account a " +
-            "GROUP BY a.firstname, a.state");
+    String result =
+        explainQuery(
+            "SELECT a.firstname, a.state "
+                + "FROM opensearch-sql_test_index_bank/account a "
+                + "GROUP BY a.firstname, a.state");
     assertThat(result, containsString("term"));
     assertThat(result, containsString("state.keyword"));
   }
 
   @Test
   public void testKeywordAliasOrderBy() throws IOException {
-    String result = explainQuery(
-        "SELECT * " +
-            "FROM opensearch-sql_test_index_bank " +
-            "ORDER BY state, lastname "
-    );
+    String result =
+        explainQuery(
+            "SELECT * " + "FROM opensearch-sql_test_index_bank " + "ORDER BY state, lastname ");
     assertThat(result, containsString("\"state.keyword\":{\"order\":\"asc\""));
     assertThat(result, containsString("\"lastname\":{\"order\":\"asc\"}"));
   }
 
   @Test
   public void testKeywordAliasOrderByUsingTableAlias() throws IOException {
-    String result = explainQuery(
-        "SELECT * " +
-            "FROM opensearch-sql_test_index_bank b " +
-            "ORDER BY b.state, b.lastname "
-    );
+    String result =
+        explainQuery(
+            "SELECT * "
+                + "FROM opensearch-sql_test_index_bank b "
+                + "ORDER BY b.state, b.lastname ");
     assertThat(result, containsString("\"state.keyword\":{\"order\":\"asc\""));
     assertThat(result, containsString("\"lastname\":{\"order\":\"asc\"}"));
   }
@@ -286,13 +287,13 @@ public void testKeywordAliasOrderByUsingTableAlias() throws IOException {
   public void testJoinWhere() throws IOException {
     String expectedOutput =
         TestUtils.fileToString("src/test/resources/expectedOutput/term_join_where", true);
-    String result = explainQuery(
-        "SELECT a.firstname, a.lastname , b.city " +
-            "FROM opensearch-sql_test_index_account a " +
-            "JOIN opensearch-sql_test_index_account b " +
-            "ON a.city = b.city " +
-            "WHERE a.city IN ('Nicholson', 'Yardville')"
-    );
+    String result =
+        explainQuery(
+            "SELECT a.firstname, a.lastname , b.city "
+                + "FROM opensearch-sql_test_index_account a "
+                + "JOIN opensearch-sql_test_index_account b "
+                + "ON a.city = b.city "
+                + "WHERE a.city IN ('Nicholson', 'Yardville')");
 
     assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
   }
@@ -301,57 +302,56 @@ public void testJoinWhere() throws IOException {
   public void testJoinAliasMissing() throws IOException {
     try {
       explainQuery(
-          "SELECT a.firstname, a.lastname , b.city " +
-              "FROM opensearch-sql_test_index_account a " +
-              "JOIN opensearch-sql_test_index_account b " +
-              "ON a.city = b.city " +
-              "WHERE city IN ('Nicholson', 'Yardville')"
-      );
+          "SELECT a.firstname, a.lastname , b.city "
+              + "FROM opensearch-sql_test_index_account a "
+              + "JOIN opensearch-sql_test_index_account b "
+              + "ON a.city = b.city "
+              + "WHERE city IN ('Nicholson', 'Yardville')");
       Assert.fail("Expected ResponseException, but none was thrown");
     } catch (ResponseException e) {
-      assertThat(e.getResponse().getStatusLine().getStatusCode(),
+      assertThat(
+          e.getResponse().getStatusLine().getStatusCode(),
           equalTo(RestStatus.BAD_REQUEST.getStatus()));
       final String entity = TestUtils.getResponseBody(e.getResponse());
       assertThat(entity, containsString("Field name [city] is ambiguous"));
       assertThat(entity, containsString("\"type\": \"VerificationException\""));
     }
-
   }
 
   @Test
   public void testNestedSingleConditionAllFields() throws IOException {
-    String result = explainQuery(
-        "SELECT * " +
-            "FROM opensearch-sql_test_index_employee_nested e, e.projects p " +
-            "WHERE p.name = 'something' "
-    );
-    assertThat(result,
-        containsString("\"term\":{\"projects.name.keyword\":{\"value\":\"something\""));
+    String result =
+        explainQuery(
+            "SELECT * "
+                + "FROM opensearch-sql_test_index_employee_nested e, e.projects p "
+                + "WHERE p.name = 'something' ");
+    assertThat(
+        result, containsString("\"term\":{\"projects.name.keyword\":{\"value\":\"something\""));
     assertThat(result, containsString("\"path\":\"projects\""));
   }
 
   @Test
   public void testNestedMultipleCondition() throws IOException {
-    String result = explainQuery(
-        "SELECT e.id, p.name " +
-            "FROM opensearch-sql_test_index_employee_nested e, e.projects p " +
-            "WHERE p.name = 'something' and p.started_year = 1990 "
-    );
-    assertThat(result,
-        containsString("\"term\":{\"projects.name.keyword\":{\"value\":\"something\""));
+    String result =
+        explainQuery(
+            "SELECT e.id, p.name "
+                + "FROM opensearch-sql_test_index_employee_nested e, e.projects p "
+                + "WHERE p.name = 'something' and p.started_year = 1990 ");
+    assertThat(
+        result, containsString("\"term\":{\"projects.name.keyword\":{\"value\":\"something\""));
     assertThat(result, containsString("\"term\":{\"projects.started_year\":{\"value\":1990"));
     assertThat(result, containsString("\"path\":\"projects\""));
   }
 
   @Test
   public void testConditionsOnDifferentNestedDocs() throws IOException {
-    String result = explainQuery(
-        "SELECT p.name, c.likes  " +
-            "FROM opensearch-sql_test_index_employee_nested e, e.projects p, e.comments c " +
-            "WHERE p.name = 'something' or c.likes = 56 "
-    );
-    assertThat(result,
-        containsString("\"term\":{\"projects.name.keyword\":{\"value\":\"something\""));
+    String result =
+        explainQuery(
+            "SELECT p.name, c.likes  "
+                + "FROM opensearch-sql_test_index_employee_nested e, e.projects p, e.comments c "
+                + "WHERE p.name = 'something' or c.likes = 56 ");
+    assertThat(
+        result, containsString("\"term\":{\"projects.name.keyword\":{\"value\":\"something\""));
     assertThat(result, containsString("\"term\":{\"comments.likes\":{\"value\":56"));
     assertThat(result, containsString("\"path\":\"projects\""));
     assertThat(result, containsString("\"path\":\"comments\""));
@@ -359,11 +359,11 @@ public void testConditionsOnDifferentNestedDocs() throws IOException {
 
   @Test
   public void testNestedSingleConditionSpecificFields() throws IOException {
-    String result = explainQuery(
-        "SELECT e.id, p.name " +
-            "FROM opensearch-sql_test_index_employee_nested e, e.projects p " +
-            "WHERE p.name = 'hello' or p.name = 'world' "
-    );
+    String result =
+        explainQuery(
+            "SELECT e.id, p.name "
+                + "FROM opensearch-sql_test_index_employee_nested e, e.projects p "
+                + "WHERE p.name = 'hello' or p.name = 'world' ");
     assertThat(result, containsString("\"term\":{\"projects.name.keyword\":{\"value\":\"hello\""));
     assertThat(result, containsString("\"term\":{\"projects.name.keyword\":{\"value\":\"world\""));
     assertThat(result, containsString("\"path\":\"projects\""));
@@ -371,32 +371,33 @@ public void testNestedSingleConditionSpecificFields() throws IOException {
 
   @Test
   public void testNestedSingleGroupBy() throws IOException {
-    String result = explainQuery(
-        "SELECT e.id, p.name " +
-            "FROM opensearch-sql_test_index_employee_nested e, e.projects p " +
-            "GROUP BY  p.name ");
+    String result =
+        explainQuery(
+            "SELECT e.id, p.name "
+                + "FROM opensearch-sql_test_index_employee_nested e, e.projects p "
+                + "GROUP BY  p.name ");
     assertThat(result, containsString("\"terms\":{\"field\":\"projects.name.keyword\""));
     assertThat(result, containsString("\"nested\":{\"path\":\"projects\""));
   }
 
   @Test
   public void testNestedSingleOrderBy() throws IOException {
-    String result = explainQuery(
-        "SELECT e.id, p.name " +
-            "FROM opensearch-sql_test_index_employee_nested e, e.projects p " +
-            "ORDER BY p.name "
-    );
+    String result =
+        explainQuery(
+            "SELECT e.id, p.name "
+                + "FROM opensearch-sql_test_index_employee_nested e, e.projects p "
+                + "ORDER BY p.name ");
     assertThat(result, containsString("\"sort\":[{\"projects.name.keyword\""));
     assertThat(result, containsString("\"nested\":{\"path\":\"projects\""));
   }
 
   @Test
   public void testNestedIsNotNullExplain() throws IOException {
-    String explain = explainQuery(
-        "SELECT e.name " +
-            "FROM opensearch-sql_test_index_employee_nested as e, e.projects as p " +
-            "WHERE p IS NOT NULL"
-    );
+    String explain =
+        explainQuery(
+            "SELECT e.name "
+                + "FROM opensearch-sql_test_index_employee_nested as e, e.projects as p "
+                + "WHERE p IS NOT NULL");
 
     assertThat(explain, containsString("\"exists\":{\"field\":\"projects\""));
     assertThat(explain, containsString("\"path\":\"projects\""));
@@ -407,14 +408,15 @@ public void testNestedIsNotNullExplain() throws IOException {
   public void testMultiQuery() throws IOException {
     String expectedOutput =
         TestUtils.fileToString("src/test/resources/expectedOutput/term_union_where", true);
-    String result = explainQuery(
-        "SELECT firstname " +
-            "FROM opensearch-sql_test_index_account/account " +
-            "WHERE firstname = 'Amber' " +
-            "UNION ALL " +
-            "SELECT dog_name as firstname " +
-            "FROM opensearch-sql_test_index_dog/dog " +
-            "WHERE holdersName = 'Hattie' OR dog_name = 'rex'");
+    String result =
+        explainQuery(
+            "SELECT firstname "
+                + "FROM opensearch-sql_test_index_account/account "
+                + "WHERE firstname = 'Amber' "
+                + "UNION ALL "
+                + "SELECT dog_name as firstname "
+                + "FROM opensearch-sql_test_index_dog/dog "
+                + "WHERE holdersName = 'Hattie' OR dog_name = 'rex'");
     assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/TestUtils.java b/integ-test/src/test/java/org/opensearch/sql/legacy/TestUtils.java
index 8f8ee4a70f..a0f2bab716 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/TestUtils.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/TestUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
@@ -36,14 +35,14 @@
 
 public class TestUtils {
 
-  private final static String MAPPING_FILE_PATH = "src/test/resources/indexDefinitions/";
+  private static final String MAPPING_FILE_PATH = "src/test/resources/indexDefinitions/";
 
   /**
    * Create test index by REST client.
    *
-   * @param client    client connection
+   * @param client client connection
    * @param indexName test index name
-   * @param mapping   test index mapping or null if no predefined mapping
+   * @param mapping test index mapping or null if no predefined mapping
    */
   public static void createIndexByRestClient(RestClient client, String indexName, String mapping) {
     Request request = new Request("PUT", "/" + indexName);
@@ -54,16 +53,15 @@ public static void createIndexByRestClient(RestClient client, String indexName,
   }
 
   /**
-   * https://github.com/elastic/elasticsearch/pull/49959
-   * Deprecate creation of dot-prefixed index names except for hidden and system indices.
-   * Create hidden index by REST client.
+   * https://github.com/elastic/elasticsearch/pull/49959 Deprecate creation of dot-prefixed index
+   * names except for hidden and system indices. Create hidden index by REST client.
    *
-   * @param client    client connection
+   * @param client client connection
    * @param indexName test index name
-   * @param mapping   test index mapping or null if no predefined mapping
+   * @param mapping test index mapping or null if no predefined mapping
    */
-  public static void createHiddenIndexByRestClient(RestClient client, String indexName,
-                                                   String mapping) {
+  public static void createHiddenIndexByRestClient(
+      RestClient client, String indexName, String mapping) {
     Request request = new Request("PUT", "/" + indexName);
     JSONObject jsonObject = isNullOrEmpty(mapping) ? new JSONObject() : new JSONObject(mapping);
     jsonObject.put("settings", new JSONObject("{\"index\":{\"hidden\":true}}"));
@@ -73,11 +71,10 @@ public static void createHiddenIndexByRestClient(RestClient client, String index
   }
 
   /**
-   * Check if index already exists by OpenSearch index exists API which returns:
-   * 200 - specified indices or aliases exist
-   * 404 - one or more indices specified or aliases do not exist
+   * Check if index already exists by OpenSearch index exists API which returns: 200 - specified
+   * indices or aliases exist 404 - one or more indices specified or aliases do not exist
    *
-   * @param client    client connection
+   * @param client client connection
    * @param indexName index name
    * @return true for index exist
    */
@@ -93,13 +90,13 @@ public static boolean isIndexExist(RestClient client, String indexName) {
   /**
    * Load test data set by REST client.
    *
-   * @param client          client connection
-   * @param indexName       index name
+   * @param client client connection
+   * @param indexName index name
    * @param dataSetFilePath file path of test data set
    * @throws IOException
    */
-  public static void loadDataByRestClient(RestClient client, String indexName,
-                                          String dataSetFilePath) throws IOException {
+  public static void loadDataByRestClient(
+      RestClient client, String indexName, String dataSetFilePath) throws IOException {
     Path path = Paths.get(getResourceFilePath(dataSetFilePath));
     Request request = new Request("POST", "/" + indexName + "/_bulk?refresh=true");
     request.setJsonEntity(new String(Files.readAllBytes(path)));
@@ -109,7 +106,7 @@ public static void loadDataByRestClient(RestClient client, String indexName,
   /**
    * Perform a request by REST client.
    *
-   * @param client  client connection
+   * @param client client connection
    * @param request request object
    */
   public static Response performRequest(RestClient client, Request request) {
@@ -177,7 +174,6 @@ public static String getEmployeeNestedTypeIndexMapping() {
     return getMappingFile(mappingFile);
   }
 
-
   public static String getNestedTypeIndexMapping() {
     String mappingFile = "nested_type_index_mapping.json";
     return getMappingFile(mappingFile);
@@ -188,6 +184,11 @@ public static String getJoinTypeIndexMapping() {
     return getMappingFile(mappingFile);
   }
 
+  public static String getUnexpandedObjectIndexMapping() {
+    String mappingFile = "unexpanded_object_index_mapping.json";
+    return getMappingFile(mappingFile);
+  }
+
   public static String getBankIndexMapping() {
     String mappingFile = "bank_index_mapping.json";
     return getMappingFile(mappingFile);
@@ -243,6 +244,11 @@ public static String getDataTypeNonnumericIndexMapping() {
     return getMappingFile(mappingFile);
   }
 
+  public static String getGeopointIndexMapping() {
+    String mappingFile = "geopoint_index_mapping.json";
+    return getMappingFile(mappingFile);
+  }
+
   public static void loadBulk(Client client, String jsonPath, String defaultIndex)
       throws Exception {
     System.out.println(String.format("Loading file %s into opensearch cluster", jsonPath));
@@ -250,8 +256,8 @@ public static void loadBulk(Client client, String jsonPath, String defaultIndex)
 
     BulkRequest bulkRequest = new BulkRequest();
     try (final InputStream stream = new FileInputStream(absJsonPath);
-         final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
-         final BufferedReader br = new BufferedReader(streamReader)) {
+        final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
+        final BufferedReader br = new BufferedReader(streamReader)) {
 
       while (true) {
 
@@ -280,8 +286,11 @@ public static void loadBulk(Client client, String jsonPath, String defaultIndex)
     BulkResponse bulkResponse = client.bulk(bulkRequest).actionGet();
 
     if (bulkResponse.hasFailures()) {
-      throw new Exception("Failed to load test data into index " + defaultIndex + ", " +
-          bulkResponse.buildFailureMessage());
+      throw new Exception(
+          "Failed to load test data into index "
+              + defaultIndex
+              + ", "
+              + bulkResponse.buildFailureMessage());
     }
     System.out.println(bulkResponse.getItems().length + " documents loaded.");
     // ensure the documents are searchable
@@ -307,8 +316,8 @@ public static String getResponseBody(Response response, boolean retainNewLines)
     final StringBuilder sb = new StringBuilder();
 
     try (final InputStream is = response.getEntity().getContent();
-         final BufferedReader br = new BufferedReader(
-             new InputStreamReader(is, StandardCharsets.UTF_8))) {
+        final BufferedReader br =
+            new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
 
       String line;
       while ((line = br.readLine()) != null) {
@@ -321,15 +330,14 @@ public static String getResponseBody(Response response, boolean retainNewLines)
     return sb.toString();
   }
 
-  public static String fileToString(final String filePathFromProjectRoot,
-                                    final boolean removeNewLines)
-      throws IOException {
+  public static String fileToString(
+      final String filePathFromProjectRoot, final boolean removeNewLines) throws IOException {
 
     final String absolutePath = getResourceFilePath(filePathFromProjectRoot);
 
     try (final InputStream stream = new FileInputStream(absolutePath);
-         final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
-         final BufferedReader br = new BufferedReader(streamReader)) {
+        final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
+        final BufferedReader br = new BufferedReader(streamReader)) {
 
       final StringBuilder stringBuilder = new StringBuilder();
       String line = br.readLine();
@@ -383,12 +391,16 @@ public static List<List<String>> getPermutations(final List<String> items) {
       }
 
       final String currentItem = items.get(i);
-      result.addAll(getPermutations(smallerSet).stream().map(smallerSetPermutation -> {
-        final List<String> permutation = new ArrayList<>();
-        permutation.add(currentItem);
-        permutation.addAll(smallerSetPermutation);
-        return permutation;
-      }).collect(Collectors.toCollection(LinkedList::new)));
+      result.addAll(
+          getPermutations(smallerSet).stream()
+              .map(
+                  smallerSetPermutation -> {
+                    final List<String> permutation = new ArrayList<>();
+                    permutation.add(currentItem);
+                    permutation.addAll(smallerSetPermutation);
+                    return permutation;
+                  })
+              .collect(Collectors.toCollection(LinkedList::new)));
     }
 
     return result;
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/TestsConstants.java b/integ-test/src/test/java/org/opensearch/sql/legacy/TestsConstants.java
index aff269fcce..73838feb4f 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/TestsConstants.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/TestsConstants.java
@@ -3,59 +3,64 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
-/**
- * Created by omershelef on 18/12/14.
- */
+/** Created by omershelef on 18/12/14. */
 public class TestsConstants {
 
-  public final static String PERSISTENT = "persistent";
-  public final static String TRANSIENT = "transient";
+  public static final String PERSISTENT = "persistent";
+  public static final String TRANSIENT = "transient";
 
-  public final static String TEST_INDEX = "opensearch-sql_test_index";
+  public static final String TEST_INDEX = "opensearch-sql_test_index";
 
-  public final static String TEST_INDEX_ONLINE = TEST_INDEX + "_online";
-  public final static String TEST_INDEX_ACCOUNT = TEST_INDEX + "_account";
-  public final static String TEST_INDEX_PHRASE = TEST_INDEX + "_phrase";
-  public final static String TEST_INDEX_DOG = TEST_INDEX + "_dog";
-  public final static String TEST_INDEX_DOG2 = TEST_INDEX + "_dog2";
-  public final static String TEST_INDEX_DOG3 = TEST_INDEX + "_dog3";
-  public final static String TEST_INDEX_DOGSUBQUERY = TEST_INDEX + "_subquery";
-  public final static String TEST_INDEX_PEOPLE = TEST_INDEX + "_people";
-  public final static String TEST_INDEX_PEOPLE2 = TEST_INDEX + "_people2";
-  public final static String TEST_INDEX_GAME_OF_THRONES = TEST_INDEX + "_game_of_thrones";
-  public final static String TEST_INDEX_SYSTEM = TEST_INDEX + "_system";
-  public final static String TEST_INDEX_ODBC = TEST_INDEX + "_odbc";
-  public final static String TEST_INDEX_LOCATION = TEST_INDEX + "_location";
-  public final static String TEST_INDEX_LOCATION2 = TEST_INDEX + "_location2";
-  public final static String TEST_INDEX_NESTED_TYPE = TEST_INDEX + "_nested_type";
-  public final static String TEST_INDEX_NESTED_SIMPLE = TEST_INDEX + "_nested_simple";
-  public final static String TEST_INDEX_NESTED_WITH_QUOTES =
+  public static final String TEST_INDEX_ONLINE = TEST_INDEX + "_online";
+  public static final String TEST_INDEX_ACCOUNT = TEST_INDEX + "_account";
+  public static final String TEST_INDEX_PHRASE = TEST_INDEX + "_phrase";
+  public static final String TEST_INDEX_DOG = TEST_INDEX + "_dog";
+  public static final String TEST_INDEX_DOG2 = TEST_INDEX + "_dog2";
+  public static final String TEST_INDEX_DOG3 = TEST_INDEX + "_dog3";
+  public static final String TEST_INDEX_DOGSUBQUERY = TEST_INDEX + "_subquery";
+  public static final String TEST_INDEX_PEOPLE = TEST_INDEX + "_people";
+  public static final String TEST_INDEX_PEOPLE2 = TEST_INDEX + "_people2";
+  public static final String TEST_INDEX_GAME_OF_THRONES = TEST_INDEX + "_game_of_thrones";
+  public static final String TEST_INDEX_SYSTEM = TEST_INDEX + "_system";
+  public static final String TEST_INDEX_ODBC = TEST_INDEX + "_odbc";
+  public static final String TEST_INDEX_LOCATION = TEST_INDEX + "_location";
+  public static final String TEST_INDEX_LOCATION2 = TEST_INDEX + "_location2";
+  public static final String TEST_INDEX_NESTED_TYPE = TEST_INDEX + "_nested_type";
+  public static final String TEST_INDEX_NESTED_TYPE_WITHOUT_ARRAYS =
+      TEST_INDEX + "_nested_type_without_arrays";
+  public static final String TEST_INDEX_NESTED_SIMPLE = TEST_INDEX + "_nested_simple";
+  public static final String TEST_INDEX_NESTED_WITH_QUOTES =
       TEST_INDEX + "_nested_type_with_quotes";
-  public final static String TEST_INDEX_EMPLOYEE_NESTED = TEST_INDEX + "_employee_nested";
-  public final static String TEST_INDEX_JOIN_TYPE = TEST_INDEX + "_join_type";
-  public final static String TEST_INDEX_BANK = TEST_INDEX + "_bank";
-  public final static String TEST_INDEX_BANK_TWO = TEST_INDEX_BANK + "_two";
-  public final static String TEST_INDEX_BANK_WITH_NULL_VALUES =
+  public static final String TEST_INDEX_EMPLOYEE_NESTED = TEST_INDEX + "_employee_nested";
+  public static final String TEST_INDEX_JOIN_TYPE = TEST_INDEX + "_join_type";
+  public static final String TEST_INDEX_UNEXPANDED_OBJECT = TEST_INDEX + "_unexpanded_object";
+  public static final String TEST_INDEX_BANK = TEST_INDEX + "_bank";
+  public static final String TEST_INDEX_BANK_TWO = TEST_INDEX_BANK + "_two";
+  public static final String TEST_INDEX_BANK_WITH_NULL_VALUES =
       TEST_INDEX_BANK + "_with_null_values";
-  public final static String TEST_INDEX_BANK_CSV_SANITIZE = TEST_INDEX_BANK + "_csv_sanitize";
-  public final static String TEST_INDEX_BANK_RAW_SANITIZE = TEST_INDEX_BANK + "_raw_sanitize";
-  public final static String TEST_INDEX_ORDER = TEST_INDEX + "_order";
-  public final static String TEST_INDEX_WEBLOG = TEST_INDEX + "_weblog";
-  public final static String TEST_INDEX_DATE = TEST_INDEX + "_date";
-  public final static String TEST_INDEX_DATE_TIME = TEST_INDEX + "_datetime";
-  public final static String TEST_INDEX_DEEP_NESTED = TEST_INDEX + "_deep_nested";
-  public final static String TEST_INDEX_STRINGS = TEST_INDEX + "_strings";
-  public final static String TEST_INDEX_DATATYPE_NUMERIC = TEST_INDEX + "_datatypes_numeric";
-  public final static String TEST_INDEX_DATATYPE_NONNUMERIC = TEST_INDEX + "_datatypes_nonnumeric";
-  public final static String TEST_INDEX_BEER = TEST_INDEX + "_beer";
-  public final static String TEST_INDEX_NULL_MISSING = TEST_INDEX + "_null_missing";
-  public final static String TEST_INDEX_CALCS = TEST_INDEX + "_calcs";
-  public final static String TEST_INDEX_WILDCARD = TEST_INDEX + "_wildcard";
+  public static final String TEST_INDEX_BANK_CSV_SANITIZE = TEST_INDEX_BANK + "_csv_sanitize";
+  public static final String TEST_INDEX_BANK_RAW_SANITIZE = TEST_INDEX_BANK + "_raw_sanitize";
+  public static final String TEST_INDEX_ORDER = TEST_INDEX + "_order";
+  public static final String TEST_INDEX_WEBLOG = TEST_INDEX + "_weblog";
+  public static final String TEST_INDEX_DATE = TEST_INDEX + "_date";
+  public static final String TEST_INDEX_DATE_TIME = TEST_INDEX + "_datetime";
+  public static final String TEST_INDEX_DEEP_NESTED = TEST_INDEX + "_deep_nested";
+  public static final String TEST_INDEX_STRINGS = TEST_INDEX + "_strings";
+  public static final String TEST_INDEX_DATATYPE_NUMERIC = TEST_INDEX + "_datatypes_numeric";
+  public static final String TEST_INDEX_DATATYPE_NONNUMERIC = TEST_INDEX + "_datatypes_nonnumeric";
+  public static final String TEST_INDEX_BEER = TEST_INDEX + "_beer";
+  public static final String TEST_INDEX_NULL_MISSING = TEST_INDEX + "_null_missing";
+  public static final String TEST_INDEX_CALCS = TEST_INDEX + "_calcs";
+  public static final String TEST_INDEX_DATE_FORMATS = TEST_INDEX + "_date_formats";
+  public static final String TEST_INDEX_WILDCARD = TEST_INDEX + "_wildcard";
+  public static final String TEST_INDEX_MULTI_NESTED_TYPE = TEST_INDEX + "_multi_nested";
+  public static final String TEST_INDEX_NESTED_WITH_NULLS = TEST_INDEX + "_nested_with_nulls";
+  public static final String TEST_INDEX_GEOPOINT = TEST_INDEX + "_geopoint";
+  public static final String DATASOURCES = ".ql-datasources";
 
-  public final static String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-  public final static String TS_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
-  public final static String SIMPLE_DATE_FORMAT = "yyyy-MM-dd";
+  public static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+  public static final String TS_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
+  public static final String SIMPLE_DATE_FORMAT = "yyyy-MM-dd";
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/TypeInformationIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/TypeInformationIT.java
index 01c8d33467..421aae9622 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/TypeInformationIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/TypeInformationIT.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy;
 
 import static org.opensearch.sql.util.MatcherUtils.schema;
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
 import org.json.JSONObject;
-
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class TypeInformationIT extends SQLIntegTestCase {
@@ -28,8 +25,8 @@ protected void init() throws Exception {
   @Test
   public void testAbsWithIntFieldReturnsInt() {
     JSONObject response =
-        executeJdbcRequest("SELECT ABS(age) FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-            " ORDER BY age LIMIT 5");
+        executeJdbcRequest(
+            "SELECT ABS(age) FROM " + TestsConstants.TEST_INDEX_ACCOUNT + " ORDER BY age LIMIT 5");
 
     verifySchema(response, schema("ABS(age)", null, "long"));
   }
@@ -37,10 +34,12 @@ public void testAbsWithIntFieldReturnsInt() {
   @Test
   public void testCeilWithLongFieldReturnsLong() {
     JSONObject response =
-        executeJdbcRequest("SELECT CEIL(balance) FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-            " ORDER BY balance LIMIT 5");
+        executeJdbcRequest(
+            "SELECT CEIL(balance) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY balance LIMIT 5");
 
-    verifySchema(response, schema("CEIL(balance)", null, "integer"));
+    verifySchema(response, schema("CEIL(balance)", null, "long"));
   }
 
   /*
@@ -48,8 +47,8 @@ public void testCeilWithLongFieldReturnsLong() {
    */
   @Test
   public void testPiReturnsDouble() {
-    JSONObject response = executeJdbcRequest("SELECT PI() FROM " + TestsConstants.TEST_INDEX_ACCOUNT
-        + " LIMIT 1");
+    JSONObject response =
+        executeJdbcRequest("SELECT PI() FROM " + TestsConstants.TEST_INDEX_ACCOUNT + " LIMIT 1");
 
     verifySchema(response, schema("PI()", null, "double"));
   }
@@ -59,16 +58,22 @@ public void testPiReturnsDouble() {
    */
   @Test
   public void testUpperWithStringFieldReturnsString() {
-    JSONObject response = executeJdbcRequest("SELECT UPPER(firstname) AS firstname_alias FROM " +
-        TestsConstants.TEST_INDEX_ACCOUNT + " ORDER BY firstname_alias LIMIT 2");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT UPPER(firstname) AS firstname_alias FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY firstname_alias LIMIT 2");
 
     verifySchema(response, schema("UPPER(firstname)", "firstname_alias", "keyword"));
   }
 
   @Test
   public void testLowerWithTextFieldReturnsText() {
-    JSONObject response = executeJdbcRequest("SELECT LOWER(firstname) FROM " +
-        TestsConstants.TEST_INDEX_ACCOUNT + " ORDER BY firstname LIMIT 2");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT LOWER(firstname) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY firstname LIMIT 2");
 
     verifySchema(response, schema("LOWER(firstname)", null, "keyword"));
   }
@@ -78,8 +83,11 @@ public void testLowerWithTextFieldReturnsText() {
    */
   @Test
   public void testLengthWithTextFieldReturnsInt() {
-    JSONObject response = executeJdbcRequest("SELECT length(firstname) FROM " +
-        TestsConstants.TEST_INDEX_ACCOUNT + " ORDER BY firstname LIMIT 2");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT length(firstname) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY firstname LIMIT 2");
 
     verifySchema(response, schema("length(firstname)", null, "integer"));
   }
@@ -87,8 +95,10 @@ public void testLengthWithTextFieldReturnsInt() {
   @Test
   public void testLengthWithGroupByExpr() {
     JSONObject response =
-        executeJdbcRequest("SELECT Length(firstname) FROM " + TestsConstants.TEST_INDEX_ACCOUNT +
-            " GROUP BY LENGTH(firstname) LIMIT 5");
+        executeJdbcRequest(
+            "SELECT Length(firstname) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " GROUP BY LENGTH(firstname) LIMIT 5");
 
     verifySchema(response, schema("Length(firstname)", null, "integer"));
   }
@@ -98,16 +108,22 @@ public void testLengthWithGroupByExpr() {
    */
   @Test
   public void testSinWithLongFieldReturnsDouble() {
-    JSONObject response = executeJdbcRequest("SELECT sin(balance) FROM " +
-        TestsConstants.TEST_INDEX_ACCOUNT + " ORDER BY firstname LIMIT 2");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT sin(balance) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY firstname LIMIT 2");
 
     verifySchema(response, schema("sin(balance)", null, "double"));
   }
 
   @Test
   public void testRadiansWithLongFieldReturnsDouble() {
-    JSONObject response = executeJdbcRequest("SELECT radians(balance) FROM " +
-        TestsConstants.TEST_INDEX_ACCOUNT + " ORDER BY firstname LIMIT 2");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT radians(balance) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY firstname LIMIT 2");
 
     verifySchema(response, schema("radians(balance)", null, "double"));
   }
@@ -117,16 +133,22 @@ public void testRadiansWithLongFieldReturnsDouble() {
    */
   @Test
   public void testAddWithIntReturnsInt() {
-    JSONObject response = executeJdbcRequest("SELECT (balance + 5) AS balance_add_five FROM " +
-        TestsConstants.TEST_INDEX_ACCOUNT + " ORDER BY firstname LIMIT 2");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT (balance + 5) AS balance_add_five FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY firstname LIMIT 2");
 
     verifySchema(response, schema("(balance + 5)", "balance_add_five", "long"));
   }
 
   @Test
   public void testSubtractLongWithLongReturnsLong() {
-    JSONObject response = executeJdbcRequest("SELECT (balance - balance) FROM " +
-        TestsConstants.TEST_INDEX_ACCOUNT + " ORDER BY firstname LIMIT 2");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT (balance - balance) FROM "
+                + TestsConstants.TEST_INDEX_ACCOUNT
+                + " ORDER BY firstname LIMIT 2");
 
     verifySchema(response, schema("(balance - balance)", null, "long"));
   }
@@ -136,17 +158,18 @@ public void testSubtractLongWithLongReturnsLong() {
    */
   @Test
   public void testDayOfWeekWithKeywordReturnsText() {
-    JSONObject response = executeJdbcRequest("SELECT DAYOFWEEK(insert_time) FROM "
-        + TestsConstants.TEST_INDEX_ONLINE + " LIMIT 2");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT DAYOFWEEK(insert_time) FROM " + TestsConstants.TEST_INDEX_ONLINE + " LIMIT 2");
 
-    verifySchema(response,
-        schema("DAYOFWEEK(insert_time)", null, "integer"));
+    verifySchema(response, schema("DAYOFWEEK(insert_time)", null, "integer"));
   }
 
   @Test
   public void testYearWithKeywordReturnsText() {
-    JSONObject response = executeJdbcRequest("SELECT YEAR(insert_time) FROM "
-        + TestsConstants.TEST_INDEX_ONLINE + " LIMIT 2");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT YEAR(insert_time) FROM " + TestsConstants.TEST_INDEX_ONLINE + " LIMIT 2");
 
     verifySchema(response, schema("YEAR(insert_time)", null, "integer"));
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/ConvertTZFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/ConvertTZFunctionIT.java
index 48cdb9684f..105669c7ca 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/ConvertTZFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/ConvertTZFunctionIT.java
@@ -1,184 +1,190 @@
-  /*
-   * Copyright OpenSearch Contributors
-   * SPDX-License-Identifier: Apache-2.0
-   */
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 package org.opensearch.sql.ppl;
 
-  import org.json.JSONObject;
-  import org.junit.Test;
-  import org.opensearch.sql.legacy.SQLIntegTestCase;
-
-  import java.io.IOException;
-
-  import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATE;
-  import static org.opensearch.sql.util.MatcherUtils.rows;
-  import static org.opensearch.sql.util.MatcherUtils.schema;
-  import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
-  import static org.opensearch.sql.util.MatcherUtils.verifySchema;
-  import static org.opensearch.sql.util.MatcherUtils.verifySome;
-
-  public class ConvertTZFunctionIT extends PPLIntegTestCase {
-
-
-    @Override
-    public void init() throws IOException {
-      loadIndex(Index.DATE);
-    }
-
-
-    @Test
-    public void inRangeZeroToPositive() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2008-05-15 12:00:00','+00:00','+10:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows("2008-05-15 22:00:00"));
-    }
-
-    @Test
-    public void inRangeZeroToZero() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-05-12 00:00:00','-00:00','+00:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows("2021-05-12 00:00:00"));
-    }
-
-    @Test
-    public void inRangePositiveToPositive() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-05-12 00:00:00','+10:00','+11:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows("2021-05-12 01:00:00"));
-    }
-
-    @Test
-    public void inRangeNegativeToPositive() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-08:00','+09:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows("2021-05-13 04:34:50"));
-    }
-
-    @Test
-    public void inRangeNoTZChange() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-05-12 11:34:50','+09:00','+09:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows("2021-05-12 11:34:50"));
-    }
-
-    @Test
-    public void inRangeTwentyFourHourChange() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-12:00','+12:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows("2021-05-13 11:34:50"));
-    }
-
-    @Test
-    public void inRangeFifteenMinuteTZ() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-05-12 13:00:00','+09:30','+05:45') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows("2021-05-12 09:15:00"));
-    }
-
-    @Test
-    public void nullFromFieldUnder() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-05-30 11:34:50','-17:00','+08:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
-    }
-
-    @Test
-    public void nullToFieldOver() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-12:00','+15:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
-    }
-
-    @Test
-    public void nullFromGarbageInput1() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-12:00','test') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
-    }
-
-    @Test
-    public void nullFromGarbageInput2() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021test','-12:00','+00:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
-    }
-
-    @Test
-    public void nullDateTimeInvalidDateValueFebruary() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-02-30 10:00:00','+00:00','+00:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
-    }
-
-    @Test
-    public void nullDateTimeInvalidDateValueApril() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-04-31 10:00:00','+00:00','+00:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
-    }
-
-    @Test
-    public void nullDateTimeInvalidDateValueMonth() throws IOException {
-      JSONObject result =
-          executeQuery(String.format(
-              "source=%s | eval f = convert_tz('2021-13-03 10:00:00','+00:00','+00:00') | fields f",
-              TEST_INDEX_DATE));
-      verifySchema(result,
-          schema("f", null, "datetime"));
-      verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
-    }
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATE;
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.schema;
+import static org.opensearch.sql.util.MatcherUtils.verifySchema;
+import static org.opensearch.sql.util.MatcherUtils.verifySome;
 
+import java.io.IOException;
+import org.json.JSONObject;
+import org.junit.Test;
+
+public class ConvertTZFunctionIT extends PPLIntegTestCase {
+
+  @Override
+  public void init() throws IOException {
+    loadIndex(Index.DATE);
+  }
+
+  @Test
+  public void inRangeZeroToPositive() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2008-05-15 12:00:00','+00:00','+10:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2008-05-15 22:00:00"));
+  }
+
+  @Test
+  public void inRangeZeroToZero() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 00:00:00','-00:00','+00:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2021-05-12 00:00:00"));
+  }
+
+  @Test
+  public void inRangePositiveToPositive() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 00:00:00','+10:00','+11:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2021-05-12 01:00:00"));
+  }
+
+  @Test
+  public void inRangeNegativeToPositive() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-08:00','+09:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2021-05-13 04:34:50"));
+  }
+
+  @Test
+  public void inRangeNoTZChange() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 11:34:50','+09:00','+09:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2021-05-12 11:34:50"));
+  }
+
+  @Test
+  public void inRangeTwentyFourHourChange() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-12:00','+12:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2021-05-13 11:34:50"));
+  }
+
+  @Test
+  public void inRangeFifteenMinuteTZ() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 13:00:00','+09:30','+05:45') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2021-05-12 09:15:00"));
+  }
+
+  @Test
+  public void nullFromFieldUnder() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-30 11:34:50','-17:00','+08:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
+  }
+
+  @Test
+  public void nullToFieldOver() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-12:00','+15:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
+  }
+
+  @Test
+  public void nullFromGarbageInput1() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-12:00','test') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
+  }
+
+  @Test
+  public void nullFromGarbageInput2() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021test','-12:00','+00:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
+  }
+
+  @Test
+  public void nullDateTimeInvalidDateValueFebruary() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-02-30 10:00:00','+00:00','+00:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
+  }
+
+  @Test
+  public void nullDateTimeInvalidDateValueApril() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-04-31 10:00:00','+00:00','+00:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
+  }
+
+  @Test
+  public void nullDateTimeInvalidDateValueMonth() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-13-03 10:00:00','+00:00','+00:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
   }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/CsvFormatIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/CsvFormatIT.java
index 37c08742ab..a9eb18c2a1 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/CsvFormatIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/CsvFormatIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK_CSV_SANITIZE;
@@ -11,6 +10,7 @@
 import java.io.IOException;
 import java.util.Locale;
 import org.junit.Test;
+import org.opensearch.sql.common.utils.StringUtils;
 
 public class CsvFormatIT extends PPLIntegTestCase {
 
@@ -21,29 +21,40 @@ public void init() throws IOException {
 
   @Test
   public void sanitizeTest() throws IOException {
-    String result = executeCsvQuery(
-        String.format(Locale.ROOT, "source=%s | fields firstname, lastname", TEST_INDEX_BANK_CSV_SANITIZE));
+    String result =
+        executeCsvQuery(
+            String.format(
+                Locale.ROOT,
+                "source=%s | fields firstname, lastname",
+                TEST_INDEX_BANK_CSV_SANITIZE));
     assertEquals(
-        "firstname,lastname\n"
-            + "'+Amber JOHnny,Duke Willmington+\n"
-            + "'-Hattie,Bond-\n"
-            + "'=Nanette,Bates=\n"
-            + "'@Dale,Adams@\n"
-            + "\",Elinor\",\"Ratliff,,,\"\n",
+        StringUtils.format(
+            "firstname,lastname%n"
+                + "'+Amber JOHnny,Duke Willmington+%n"
+                + "'-Hattie,Bond-%n"
+                + "'=Nanette,Bates=%n"
+                + "'@Dale,Adams@%n"
+                + "\",Elinor\",\"Ratliff,,,\"%n"),
         result);
   }
 
   @Test
   public void escapeSanitizeTest() throws IOException {
-    String result = executeCsvQuery(
-        String.format(Locale.ROOT, "source=%s | fields firstname, lastname", TEST_INDEX_BANK_CSV_SANITIZE), false);
+    String result =
+        executeCsvQuery(
+            String.format(
+                Locale.ROOT,
+                "source=%s | fields firstname, lastname",
+                TEST_INDEX_BANK_CSV_SANITIZE),
+            false);
     assertEquals(
-        "firstname,lastname\n"
-            + "+Amber JOHnny,Duke Willmington+\n"
-            + "-Hattie,Bond-\n"
-            + "=Nanette,Bates=\n"
-            + "@Dale,Adams@\n"
-            + "\",Elinor\",\"Ratliff,,,\"\n",
+        StringUtils.format(
+            "firstname,lastname%n"
+                + "+Amber JOHnny,Duke Willmington+%n"
+                + "-Hattie,Bond-%n"
+                + "=Nanette,Bates=%n"
+                + "@Dale,Adams@%n"
+                + "\",Elinor\",\"Ratliff,,,\"%n"),
         result);
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/DataTypeIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/DataTypeIT.java
index 9911c35d8f..fe5c2ff270 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/DataTypeIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/DataTypeIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.SQLIntegTestCase.Index.DATA_TYPE_NONNUMERIC;
@@ -27,9 +26,9 @@ public void init() throws IOException {
 
   @Test
   public void test_numeric_data_types() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s", TEST_INDEX_DATATYPE_NUMERIC));
-    verifySchema(result,
+    JSONObject result = executeQuery(String.format("source=%s", TEST_INDEX_DATATYPE_NUMERIC));
+    verifySchema(
+        result,
         schema("long_number", "long"),
         schema("integer_number", "integer"),
         schema("short_number", "short"),
@@ -42,14 +41,15 @@ public void test_numeric_data_types() throws IOException {
 
   @Test
   public void test_nonnumeric_data_types() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s", TEST_INDEX_DATATYPE_NONNUMERIC));
-    verifySchema(result,
+    JSONObject result = executeQuery(String.format("source=%s", TEST_INDEX_DATATYPE_NONNUMERIC));
+    verifySchema(
+        result,
         schema("boolean_value", "boolean"),
         schema("keyword_value", "string"),
         schema("text_value", "string"),
         schema("binary_value", "binary"),
         schema("date_value", "timestamp"),
+        schema("date_nanos_value", "timestamp"),
         schema("ip_value", "ip"),
         schema("object_value", "struct"),
         schema("nested_value", "array"),
@@ -58,15 +58,18 @@ public void test_nonnumeric_data_types() throws IOException {
 
   @Test
   public void test_long_integer_data_type() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval "
-                + " int1 = 2147483647,"
-                + " int2 = -2147483648,"
-                + " long1 = 2147483648,"
-                + " long2 = -2147483649 | "
-                + "fields int1, int2, long1, long2 ",
-            TEST_INDEX_DATATYPE_NUMERIC));
-    verifySchema(result,
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " int1 = 2147483647,"
+                    + " int2 = -2147483648,"
+                    + " long1 = 2147483648,"
+                    + " long2 = -2147483649 | "
+                    + "fields int1, int2, long1, long2 ",
+                TEST_INDEX_DATATYPE_NUMERIC));
+    verifySchema(
+        result,
         schema("int1", "integer"),
         schema("int2", "integer"),
         schema("long1", "long"),
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeComparisonIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeComparisonIT.java
new file mode 100644
index 0000000000..6f6b5cc297
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeComparisonIT.java
@@ -0,0 +1,765 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.ppl;
+
+import static com.carrotsearch.randomizedtesting.RandomizedTest.$;
+import static com.carrotsearch.randomizedtesting.RandomizedTest.$$;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATATYPE_NONNUMERIC;
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.schema;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
+import static org.opensearch.sql.util.MatcherUtils.verifySchema;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.TimeZone;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.jupiter.api.Test;
+
+public class DateTimeComparisonIT extends PPLIntegTestCase {
+
+  @Override
+  public void init() throws IOException {
+    loadIndex(Index.DATA_TYPE_NONNUMERIC);
+  }
+
+  private final TimeZone testTz = TimeZone.getDefault();
+  private final TimeZone systemTz = TimeZone.getTimeZone(System.getProperty("user.timezone"));
+
+  @Before
+  public void setTimeZone() {
+    TimeZone.setDefault(systemTz);
+  }
+
+  @After
+  public void resetTimeZone() {
+    TimeZone.setDefault(testTz);
+  }
+
+  private String functionCall;
+  private String name;
+  private Boolean expectedResult;
+
+  public DateTimeComparisonIT(
+      @Name("functionCall") String functionCall,
+      @Name("name") String name,
+      @Name("expectedResult") Boolean expectedResult) {
+    this.functionCall = functionCall;
+    this.name = name;
+    this.expectedResult = expectedResult;
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareTwoDates() {
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') = DATE('2020-09-16')", "eq1", true),
+            $("DATE('2020-09-16') = DATE('1961-04-12')", "eq2", false),
+            $("DATE('2020-09-16') != DATE('1984-12-15')", "neq1", true),
+            $("DATE('1961-04-12') != DATE('1984-12-15')", "neq2", true),
+            $("DATE('1961-04-12') != DATE('1961-04-12')", "neq3", false),
+            $("DATE('1984-12-15') > DATE('1961-04-12')", "gt1", true),
+            $("DATE('1984-12-15') > DATE('2020-09-16')", "gt2", false),
+            $("DATE('1961-04-12') < DATE('1984-12-15')", "lt1", true),
+            $("DATE('1984-12-15') < DATE('1961-04-12')", "lt2", false),
+            $("DATE('1984-12-15') >= DATE('1961-04-12')", "gte1", true),
+            $("DATE('1984-12-15') >= DATE('1984-12-15')", "gte2", true),
+            $("DATE('1984-12-15') >= DATE('2020-09-16')", "gte3", false),
+            $("DATE('1961-04-12') <= DATE('1984-12-15')", "lte1", true),
+            $("DATE('1961-04-12') <= DATE('1961-04-12')", "lte2", true),
+            $("DATE('2020-09-16') <= DATE('1961-04-12')", "lte3", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareTwoTimes() {
+    return Arrays.asList(
+        $$(
+            $("TIME('09:16:37') = TIME('09:16:37')", "eq1", true),
+            $("TIME('09:16:37') = TIME('04:12:42')", "eq2", false),
+            $("TIME('09:16:37') != TIME('12:15:22')", "neq1", true),
+            $("TIME('04:12:42') != TIME('12:15:22')", "neq2", true),
+            $("TIME('04:12:42') != TIME('04:12:42')", "neq3", false),
+            $("TIME('12:15:22') > TIME('04:12:42')", "gt1", true),
+            $("TIME('12:15:22') > TIME('19:16:03')", "gt2", false),
+            $("TIME('04:12:42') < TIME('12:15:22')", "lt1", true),
+            $("TIME('14:12:38') < TIME('12:15:22')", "lt2", false),
+            $("TIME('12:15:22') >= TIME('04:12:42')", "gte1", true),
+            $("TIME('12:15:22') >= TIME('12:15:22')", "gte2", true),
+            $("TIME('12:15:22') >= TIME('19:16:03')", "gte3", false),
+            $("TIME('04:12:42') <= TIME('12:15:22')", "lte1", true),
+            $("TIME('04:12:42') <= TIME('04:12:42')", "lte2", true),
+            $("TIME('19:16:03') <= TIME('04:12:42')", "lte3", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareTwoDateTimes() {
+    return Arrays.asList(
+        $$(
+            $("DATETIME('2020-09-16 10:20:30') = DATETIME('2020-09-16 10:20:30')", "eq1", true),
+            $("DATETIME('2020-09-16 10:20:30') = DATETIME('1961-04-12 09:07:00')", "eq2", false),
+            $("DATETIME('2020-09-16 10:20:30') != DATETIME('1984-12-15 22:15:07')", "neq1", true),
+            $("DATETIME('1984-12-15 22:15:08') != DATETIME('1984-12-15 22:15:07')", "neq2", true),
+            $("DATETIME('1961-04-12 09:07:00') != DATETIME('1961-04-12 09:07:00')", "neq3", false),
+            $("DATETIME('1984-12-15 22:15:07') > DATETIME('1961-04-12 22:15:07')", "gt1", true),
+            $("DATETIME('1984-12-15 22:15:07') > DATETIME('1984-12-15 22:15:06')", "gt2", true),
+            $("DATETIME('1984-12-15 22:15:07') > DATETIME('2020-09-16 10:20:30')", "gt3", false),
+            $("DATETIME('1961-04-12 09:07:00') < DATETIME('1984-12-15 09:07:00')", "lt1", true),
+            $("DATETIME('1984-12-15 22:15:07') < DATETIME('1984-12-15 22:15:08')", "lt2", true),
+            $("DATETIME('1984-12-15 22:15:07') < DATETIME('1961-04-12 09:07:00')", "lt3", false),
+            $("DATETIME('1984-12-15 22:15:07') >= DATETIME('1961-04-12 09:07:00')", "gte1", true),
+            $("DATETIME('1984-12-15 22:15:07') >= DATETIME('1984-12-15 22:15:07')", "gte2", true),
+            $("DATETIME('1984-12-15 22:15:07') >= DATETIME('2020-09-16 10:20:30')", "gte3", false),
+            $("DATETIME('1961-04-12 09:07:00') <= DATETIME('1984-12-15 22:15:07')", "lte1", true),
+            $("DATETIME('1961-04-12 09:07:00') <= DATETIME('1961-04-12 09:07:00')", "lte2", true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') <= DATETIME('1961-04-12 09:07:00')",
+                "lte3",
+                false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareTwoTimestamps() {
+    return Arrays.asList(
+        $$(
+            $("TIMESTAMP('2020-09-16 10:20:30') = TIMESTAMP('2020-09-16 10:20:30')", "eq1", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') = TIMESTAMP('1961-04-12 09:07:00')", "eq2", false),
+            $("TIMESTAMP('2020-09-16 10:20:30') != TIMESTAMP('1984-12-15 22:15:07')", "neq1", true),
+            $("TIMESTAMP('1984-12-15 22:15:08') != TIMESTAMP('1984-12-15 22:15:07')", "neq2", true),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') != TIMESTAMP('1961-04-12 09:07:00')",
+                "neq3",
+                false),
+            $("TIMESTAMP('1984-12-15 22:15:07') > TIMESTAMP('1961-04-12 22:15:07')", "gt1", true),
+            $("TIMESTAMP('1984-12-15 22:15:07') > TIMESTAMP('1984-12-15 22:15:06')", "gt2", true),
+            $("TIMESTAMP('1984-12-15 22:15:07') > TIMESTAMP('2020-09-16 10:20:30')", "gt3", false),
+            $("TIMESTAMP('1961-04-12 09:07:00') < TIMESTAMP('1984-12-15 09:07:00')", "lt1", true),
+            $("TIMESTAMP('1984-12-15 22:15:07') < TIMESTAMP('1984-12-15 22:15:08')", "lt2", true),
+            $("TIMESTAMP('1984-12-15 22:15:07') < TIMESTAMP('1961-04-12 09:07:00')", "lt3", false),
+            $("TIMESTAMP('1984-12-15 22:15:07') >= TIMESTAMP('1961-04-12 09:07:00')", "gte1", true),
+            $("TIMESTAMP('1984-12-15 22:15:07') >= TIMESTAMP('1984-12-15 22:15:07')", "gte2", true),
+            $(
+                "TIMESTAMP('1984-12-15 22:15:07') >= TIMESTAMP('2020-09-16 10:20:30')",
+                "gte3",
+                false),
+            $("TIMESTAMP('1961-04-12 09:07:00') <= TIMESTAMP('1984-12-15 22:15:07')", "lte1", true),
+            $("TIMESTAMP('1961-04-12 09:07:00') <= TIMESTAMP('1961-04-12 09:07:00')", "lte2", true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') <= TIMESTAMP('1961-04-12 09:07:00')",
+                "lte3",
+                false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareEqTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') = DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') = TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') = DATETIME('1961-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('1961-04-12 09:07:00') = TIMESTAMP('1984-12-15 22:15:07')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 00:00:00') = DATE('2020-09-16')", "ts_d_t", true),
+            $("DATE('2020-09-16') = TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') = DATE('1961-04-12')", "ts_d_f", false),
+            $("DATE('1961-04-12') = TIMESTAMP('1984-12-15 22:15:07')", "d_ts_f", false),
+            $("TIMESTAMP('" + today + " 10:20:30') = TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('10:20:30') = TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') = TIME('09:07:00')", "ts_t_f", false),
+            $("TIME('09:07:00') = TIMESTAMP('1984-12-15 22:15:07')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareEqDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:30') = TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') = DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') = TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') = DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('2020-09-16 00:00:00') = DATE('2020-09-16')", "dt_d_t", true),
+            $("DATE('2020-09-16') = DATETIME('2020-09-16 00:00:00')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 10:20:30') = DATE('1961-04-12')", "dt_d_f", false),
+            $("DATE('1961-04-12') = DATETIME('1984-12-15 22:15:07')", "d_dt_f", false),
+            $("DATETIME('" + today + " 10:20:30') = TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('10:20:30') = DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('2020-09-16 10:20:30') = TIME('09:07:00')", "dt_t_f", false),
+            $("TIME('09:07:00') = DATETIME('1984-12-15 22:15:07')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareEqDateWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') = TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 00:00:00') = DATE('2020-09-16')", "ts_d_t", true),
+            $("DATE('2020-09-16') = TIMESTAMP('1961-04-12 09:07:00')", "d_ts_f", false),
+            $("TIMESTAMP('1984-12-15 09:07:00') = DATE('1984-12-15')", "ts_d_f", false),
+            $("DATE('2020-09-16') = DATETIME('2020-09-16 00:00:00')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') = DATE('2020-09-16')", "dt_d_t", true),
+            $("DATE('1961-04-12') = DATETIME('1984-12-15 22:15:07')", "d_dt_f", false),
+            $("DATETIME('1961-04-12 10:20:30') = DATE('1961-04-12')", "dt_d_f", false),
+            $("DATE('" + today + "') = TIME('00:00:00')", "d_t_t", true),
+            $("TIME('00:00:00') = DATE('" + today + "')", "t_d_t", true),
+            $("DATE('2020-09-16') = TIME('09:07:00')", "d_t_f", false),
+            $("TIME('09:07:00') = DATE('" + today + "')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareEqTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('10:20:30') = DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('" + today + " 10:20:30') = TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('09:07:00') = DATETIME('1961-04-12 09:07:00')", "t_dt_f", false),
+            $("DATETIME('" + today + " 09:07:00') = TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('10:20:30') = TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 10:20:30') = TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('22:15:07') = TIMESTAMP('1984-12-15 22:15:07')", "t_ts_f", false),
+            $("TIMESTAMP('1984-12-15 10:20:30') = TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('00:00:00') = DATE('" + today + "')", "t_d_t", true),
+            $("DATE('" + today + "') = TIME('00:00:00')", "d_t_t", true),
+            $("TIME('09:07:00') = DATE('" + today + "')", "t_d_f", false),
+            $("DATE('2020-09-16') = TIME('09:07:00')", "d_t_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareNeqTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') != DATETIME('1961-04-12 09:07:00')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('1961-04-12 09:07:00') != TIMESTAMP('1984-12-15 22:15:07')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') != DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('2020-09-16 10:20:30') != TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 10:20:30') != DATE('1961-04-12')", "ts_d_t", true),
+            $("DATE('1961-04-12') != TIMESTAMP('1984-12-15 22:15:07')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 00:00:00') != DATE('2020-09-16')", "ts_d_f", false),
+            $("DATE('2020-09-16') != TIMESTAMP('2020-09-16 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('2020-09-16 10:20:30') != TIME('09:07:00')", "ts_t_t", true),
+            $("TIME('09:07:00') != TIMESTAMP('1984-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 10:20:30') != TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('10:20:30') != TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareNeqDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:30') != TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') != DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') != TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') != DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('2020-09-16 10:20:30') != DATE('1961-04-12')", "dt_d_t", true),
+            $("DATE('1961-04-12') != DATETIME('1984-12-15 22:15:07')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') != DATE('2020-09-16')", "dt_d_f", false),
+            $("DATE('2020-09-16') != DATETIME('2020-09-16 00:00:00')", "d_dt_f", false),
+            $("DATETIME('2020-09-16 10:20:30') != TIME('09:07:00')", "dt_t_t", true),
+            $("TIME('09:07:00') != DATETIME('1984-12-15 22:15:07')", "t_dt_t", true),
+            $("DATETIME('" + today + " 10:20:30') != TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('10:20:30') != DATETIME('" + today + " 10:20:30')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareNeqDateWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') != TIMESTAMP('1961-04-12 09:07:00')", "d_ts_t", true),
+            $("TIMESTAMP('1984-12-15 09:07:00') != DATE('1984-12-15')", "ts_d_t", true),
+            $("DATE('2020-09-16') != TIMESTAMP('2020-09-16 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('2020-09-16 00:00:00') != DATE('2020-09-16')", "ts_d_f", false),
+            $("DATE('1961-04-12') != DATETIME('1984-12-15 22:15:07')", "d_dt_t", true),
+            $("DATETIME('1961-04-12 10:20:30') != DATE('1961-04-12')", "dt_d_t", true),
+            $("DATE('2020-09-16') != DATETIME('2020-09-16 00:00:00')", "d_dt_f", false),
+            $("DATETIME('2020-09-16 00:00:00') != DATE('2020-09-16')", "dt_d_f", false),
+            $("DATE('2020-09-16') != TIME('09:07:00')", "d_t_t", true),
+            $("TIME('09:07:00') != DATE('" + today + "')", "t_d_t", true),
+            $("DATE('" + today + "') != TIME('00:00:00')", "d_t_f", false),
+            $("TIME('00:00:00') != DATE('" + today + "')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareNeqTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('09:07:00') != DATETIME('1961-04-12 09:07:00')", "t_dt_t", true),
+            $("DATETIME('" + today + " 09:07:00') != TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('10:20:30') != DATETIME('" + today + " 10:20:30')", "t_dt_f", false),
+            $("DATETIME('" + today + " 10:20:30') != TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('22:15:07') != TIMESTAMP('1984-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('1984-12-15 10:20:30') != TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('10:20:30') != TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false),
+            $("TIMESTAMP('" + today + " 10:20:30') != TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('09:07:00') != DATE('" + today + "')", "t_d_t", true),
+            $("DATE('2020-09-16') != TIME('09:07:00')", "d_t_t", true),
+            $("TIME('00:00:00') != DATE('" + today + "')", "t_d_f", false),
+            $("DATE('" + today + "') != TIME('00:00:00')", "d_t_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLtTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') < DATETIME('2061-04-12 09:07:00')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('1961-04-12 09:07:00') < TIMESTAMP('1984-12-15 22:15:07')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') < DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('2020-09-16 10:20:30') < TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 10:20:30') < DATE('2077-04-12')", "ts_d_t", true),
+            $("DATE('1961-04-12') < TIMESTAMP('1984-12-15 22:15:07')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') < DATE('1961-04-12')", "ts_d_f", false),
+            $("DATE('2020-09-16') < TIMESTAMP('2020-09-16 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('2020-09-16 10:20:30') < TIME('09:07:00')", "ts_t_t", true),
+            $("TIME('09:07:00') < TIMESTAMP('3077-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 10:20:30') < TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('20:50:40') < TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLtDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:30') < TIMESTAMP('2077-04-12 09:07:00')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') < DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') < TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') < DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('2020-09-16 10:20:30') < DATE('3077-04-12')", "dt_d_t", true),
+            $("DATE('1961-04-12') < DATETIME('1984-12-15 22:15:07')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') < DATE('2020-09-16')", "dt_d_f", false),
+            $("DATE('2020-09-16') < DATETIME('1961-04-12 09:07:00')", "d_dt_f", false),
+            $("DATETIME('2020-09-16 10:20:30') < TIME('09:07:00')", "dt_t_t", true),
+            $("TIME('09:07:00') < DATETIME('3077-12-15 22:15:07')", "t_dt_t", true),
+            $("DATETIME('" + today + " 10:20:30') < TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('20:40:50') < DATETIME('" + today + " 10:20:30')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLtDateWithOtherTypes() {
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') < TIMESTAMP('3077-04-12 09:07:00')", "d_ts_t", true),
+            $("TIMESTAMP('1961-04-12 09:07:00') < DATE('1984-12-15')", "ts_d_t", true),
+            $("DATE('2020-09-16') < TIMESTAMP('2020-09-16 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('2077-04-12 09:07:00') < DATE('2020-09-16')", "ts_d_f", false),
+            $("DATE('1961-04-12') < DATETIME('1984-12-15 22:15:07')", "d_dt_t", true),
+            $("DATETIME('1961-04-12 10:20:30') < DATE('1984-11-15')", "dt_d_t", true),
+            $("DATE('2020-09-16') < DATETIME('2020-09-16 00:00:00')", "d_dt_f", false),
+            $("DATETIME('2020-09-16 00:00:00') < DATE('1984-03-22')", "dt_d_f", false),
+            $("DATE('2020-09-16') < TIME('09:07:00')", "d_t_t", true),
+            $("TIME('09:07:00') < DATE('3077-04-12')", "t_d_t", true),
+            $("DATE('3077-04-12') < TIME('00:00:00')", "d_t_f", false),
+            $("TIME('00:00:00') < DATE('2020-09-16')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLtTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('09:07:00') < DATETIME('3077-04-12 09:07:00')", "t_dt_t", true),
+            $("DATETIME('" + today + " 09:07:00') < TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('10:20:30') < DATETIME('" + today + " 10:20:30')", "t_dt_f", false),
+            $("DATETIME('" + today + " 20:40:50') < TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('22:15:07') < TIMESTAMP('3077-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('1984-12-15 10:20:30') < TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('10:20:30') < TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false),
+            $("TIMESTAMP('" + today + " 20:50:42') < TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('09:07:00') < DATE('3077-04-12')", "t_d_t", true),
+            $("DATE('2020-09-16') < TIME('09:07:00')", "d_t_t", true),
+            $("TIME('00:00:00') < DATE('1961-04-12')", "t_d_f", false),
+            $("DATE('3077-04-12') < TIME('10:20:30')", "d_t_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGtTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') > DATETIME('2020-09-16 10:20:25')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') > TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') > DATETIME('2061-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('1961-04-12 09:07:00') > TIMESTAMP('1984-12-15 09:07:00')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 10:20:30') > DATE('1961-04-12')", "ts_d_t", true),
+            $("DATE('2020-09-16') > TIMESTAMP('2020-09-15 22:15:07')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') > DATE('2077-04-12')", "ts_d_f", false),
+            $("DATE('1961-04-12') > TIMESTAMP('1961-04-12 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('3077-07-08 20:20:30') > TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('20:50:40') > TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 10:20:30') > TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('09:07:00') > TIMESTAMP('3077-12-15 22:15:07')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGtDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:31') > TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') > DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') > TIMESTAMP('2077-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') > DATETIME('1961-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('3077-04-12 10:20:30') > DATE('2020-09-16')", "dt_d_t", true),
+            $("DATE('2020-09-16') > DATETIME('1961-04-12 09:07:00')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') > DATE('2020-09-16')", "dt_d_f", false),
+            $("DATE('1961-04-12') > DATETIME('1984-12-15 22:15:07')", "d_dt_f", false),
+            $("DATETIME('3077-04-12 10:20:30') > TIME('09:07:00')", "dt_t_t", true),
+            $("TIME('20:40:50') > DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('" + today + " 10:20:30') > TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('09:07:00') > DATETIME('3077-12-15 22:15:07')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGtDateWithOtherTypes() {
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') > TIMESTAMP('1961-04-12 09:07:00')", "d_ts_t", true),
+            $("TIMESTAMP('2077-04-12 09:07:00') > DATE('2020-09-16')", "ts_d_t", true),
+            $("DATE('2020-09-16') > TIMESTAMP('2020-09-16 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('1961-04-12 09:07:00') > DATE('1984-12-15')", "ts_d_f", false),
+            $("DATE('1984-12-15') > DATETIME('1961-04-12 09:07:00')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') > DATE('1984-03-22')", "dt_d_t", true),
+            $("DATE('2020-09-16') > DATETIME('2020-09-16 00:00:00')", "d_dt_f", false),
+            $("DATETIME('1961-04-12 10:20:30') > DATE('1984-11-15')", "dt_d_f", false),
+            $("DATE('3077-04-12') > TIME('00:00:00')", "d_t_t", true),
+            $("TIME('00:00:00') > DATE('2020-09-16')", "t_d_t", true),
+            $("DATE('2020-09-16') > TIME('09:07:00')", "d_t_f", false),
+            $("TIME('09:07:00') > DATE('3077-04-12')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGtTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('09:07:00') > DATETIME('1961-04-12 09:07:00')", "t_dt_t", true),
+            $("DATETIME('" + today + " 20:40:50') > TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('10:20:30') > DATETIME('" + today + " 10:20:30')", "t_dt_f", false),
+            $("DATETIME('" + today + " 09:07:00') > TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('22:15:07') > TIMESTAMP('1984-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 20:50:42') > TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('10:20:30') > TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false),
+            $("TIMESTAMP('1984-12-15 10:20:30') > TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('00:00:00') > DATE('1961-04-12')", "t_d_t", true),
+            $("DATE('3077-04-12') > TIME('10:20:30')", "d_t_t", true),
+            $("TIME('09:07:00') > DATE('3077-04-12')", "t_d_f", false),
+            $("DATE('2020-09-16') > TIME('09:07:00')", "d_t_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLteTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') <= DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('1961-04-12 09:07:00') <= TIMESTAMP('1984-12-15 22:15:07')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') <= DATETIME('1961-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('2020-09-16 10:20:30') <= TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 10:20:30') <= DATE('2077-04-12')", "ts_d_t", true),
+            $("DATE('2020-09-16') <= TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') <= DATE('1961-04-12')", "ts_d_f", false),
+            $("DATE('2077-04-12') <= TIMESTAMP('1984-12-15 22:15:07')", "d_ts_f", false),
+            $("TIMESTAMP('" + today + " 10:20:30') <= TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('09:07:00') <= TIMESTAMP('3077-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('3077-09-16 10:20:30') <= TIME('09:07:00')", "ts_t_f", false),
+            $("TIME('20:50:40') <= TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLteDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:30') <= TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') <= DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('3077-09-16 10:20:30') <= TIMESTAMP('2077-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') <= DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('2020-09-16 00:00:00') <= DATE('2020-09-16')", "dt_d_t", true),
+            $("DATE('1961-04-12') <= DATETIME('1984-12-15 22:15:07')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 10:20:30') <= DATE('1984-04-12')", "dt_d_f", false),
+            $("DATE('2020-09-16') <= DATETIME('1961-04-12 09:07:00')", "d_dt_f", false),
+            $("DATETIME('" + today + " 10:20:30') <= TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('09:07:00') <= DATETIME('3077-12-15 22:15:07')", "t_dt_t", true),
+            $("DATETIME('3077-09-16 10:20:30') <= TIME('19:07:00')", "dt_t_f", false),
+            $("TIME('20:40:50') <= DATETIME('" + today + " 10:20:30')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLteDateWithOtherTypes() {
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') <= TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('1961-04-12 09:07:00') <= DATE('1984-12-15')", "ts_d_t", true),
+            $("DATE('2020-09-16') <= TIMESTAMP('1961-04-12 09:07:00')", "d_ts_f", false),
+            $("TIMESTAMP('2077-04-12 09:07:00') <= DATE('2020-09-16')", "ts_d_f", false),
+            $("DATE('2020-09-16') <= DATETIME('2020-09-16 00:00:00')", "d_dt_t", true),
+            $("DATETIME('1961-04-12 10:20:30') <= DATE('1984-11-15')", "dt_d_t", true),
+            $("DATE('2077-04-12') <= DATETIME('1984-12-15 22:15:07')", "d_dt_f", false),
+            $("DATETIME('2020-09-16 00:00:00') <= DATE('1984-03-22')", "dt_d_f", false),
+            $("DATE('2020-09-16') <= TIME('09:07:00')", "d_t_t", true),
+            $("TIME('09:07:00') <= DATE('3077-04-12')", "t_d_t", true),
+            $("DATE('3077-04-12') <= TIME('00:00:00')", "d_t_f", false),
+            $("TIME('00:00:00') <= DATE('2020-09-16')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLteTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('10:20:30') <= DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('" + today + " 09:07:00') <= TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('09:07:00') <= DATETIME('1961-04-12 09:07:00')", "t_dt_f", false),
+            $("DATETIME('" + today + " 20:40:50') <= TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('10:20:30') <= TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('1984-12-15 10:20:30') <= TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('22:15:07') <= TIMESTAMP('1984-12-15 22:15:07')", "t_ts_f", false),
+            $("TIMESTAMP('" + today + " 20:50:42') <= TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('09:07:00') <= DATE('3077-04-12')", "t_d_t", true),
+            $("DATE('2020-09-16') <= TIME('09:07:00')", "d_t_t", true),
+            $("TIME('00:00:00') <= DATE('1961-04-12')", "t_d_f", false),
+            $("DATE('3077-04-12') <= TIME('10:20:30')", "d_t_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGteTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') >= DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') >= TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') >= DATETIME('2061-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('1961-04-12 09:07:00') >= TIMESTAMP('1984-12-15 09:07:00')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 10:20:30') >= DATE('1961-04-12')", "ts_d_t", true),
+            $("DATE('2020-09-16') >= TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') >= DATE('2077-04-12')", "ts_d_f", false),
+            $("DATE('1961-04-11') >= TIMESTAMP('1961-04-12 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('" + today + " 10:20:30') >= TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('20:50:40') >= TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('1977-07-08 10:20:30') >= TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('09:07:00') >= TIMESTAMP('3077-12-15 22:15:07')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGteDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:30') >= TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') >= DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') >= TIMESTAMP('2077-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('1961-04-12 00:00:00') >= DATETIME('1961-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('2020-09-16 00:00:00') >= DATE('2020-09-16')", "dt_d_t", true),
+            $("DATE('2020-09-16') >= DATETIME('1961-04-12 09:07:00')", "d_dt_t", true),
+            $("DATETIME('1961-04-12 09:07:00') >= DATE('2020-09-16')", "dt_d_f", false),
+            $("DATE('1961-04-12') >= DATETIME('1984-12-15 22:15:07')", "d_dt_f", false),
+            $("DATETIME('" + today + " 10:20:30') >= TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('20:40:50') >= DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('1961-04-12 09:07:00') >= TIME('09:07:00')", "dt_t_f", false),
+            $("TIME('09:07:00') >= DATETIME('3077-12-15 22:15:07')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGteDateWithOtherTypes() {
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') >= TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('2077-04-12 09:07:00') >= DATE('2020-09-16')", "ts_d_t", true),
+            $("DATE('1961-04-12') >= TIMESTAMP('1961-04-12 09:07:00')", "d_ts_f", false),
+            $("TIMESTAMP('1961-04-12 09:07:00') >= DATE('1984-12-15')", "ts_d_f", false),
+            $("DATE('2020-09-16') >= DATETIME('2020-09-16 00:00:00')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') >= DATE('1984-03-22')", "dt_d_t", true),
+            $("DATE('1960-12-15') >= DATETIME('1961-04-12 09:07:00')", "d_dt_f", false),
+            $("DATETIME('1961-04-12 10:20:30') >= DATE('1984-11-15')", "dt_d_f", false),
+            $("DATE('3077-04-12') >= TIME('00:00:00')", "d_t_t", true),
+            $("TIME('00:00:00') >= DATE('2020-09-16')", "t_d_t", true),
+            $("DATE('2020-09-16') >= TIME('09:07:00')", "d_t_f", false),
+            $("TIME('09:07:00') >= DATE('3077-04-12')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGteTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('10:20:30') >= DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('" + today + " 20:40:50') >= TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('09:07:00') >= DATETIME('3077-04-12 09:07:00')", "t_dt_f", false),
+            $("DATETIME('" + today + " 09:07:00') >= TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('10:20:30') >= TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 20:50:42') >= TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('22:15:07') >= TIMESTAMP('3077-12-15 22:15:07')", "t_ts_f", false),
+            $("TIMESTAMP('1984-12-15 10:20:30') >= TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('00:00:00') >= DATE('1961-04-12')", "t_d_t", true),
+            $("DATE('3077-04-12') >= TIME('10:20:30')", "d_t_t", true),
+            $("TIME('09:07:00') >= DATE('3077-04-12')", "t_d_f", false),
+            $("DATE('2020-09-16') >= TIME('09:07:00')", "d_t_f", false)));
+  }
+
+  @Test
+  public void testCompare() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval `%s` = %s | fields `%s`",
+                TEST_INDEX_DATATYPE_NONNUMERIC, name, functionCall, name));
+    verifySchema(result, schema(name, null, "boolean"));
+    verifyDataRows(result, rows(expectedResult));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeFunctionIT.java
index afabc241fe..1df87a87b3 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeFunctionIT.java
@@ -3,35 +3,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATE;
-import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_PEOPLE2;
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.schema;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 import static org.opensearch.sql.util.MatcherUtils.verifySome;
 
-import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.Period;
 import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.temporal.ChronoField;
-import java.time.temporal.Temporal;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.TimeZone;
-import java.util.function.BiFunction;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import org.json.JSONArray;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.common.utils.StringUtils;
 
@@ -42,555 +31,1172 @@ public class DateTimeFunctionIT extends PPLIntegTestCase {
   public void init() throws IOException {
     loadIndex(Index.DATE);
     loadIndex(Index.PEOPLE2);
+    loadIndex(Index.BANK);
   }
 
-  @Test
-  public void testAddDate() throws IOException {
-    JSONObject result =
-        executeQuery(String.format(
-            "source=%s | eval f = adddate(timestamp('2020-09-16 17:30:00'), interval 1 day) | fields f", TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows("2020-09-17 17:30:00"));
+  // Integration test framework sets for OpenSearch instance a random timezone.
+  // If server's TZ doesn't match localhost's TZ, time measurements for some tests would differ.
+  // We should set localhost's TZ now and recover the value back in the end of the test.
+  private final TimeZone testTz = TimeZone.getDefault();
+  private final TimeZone systemTz = TimeZone.getTimeZone(System.getProperty("user.timezone"));
+
+  @Before
+  public void setTimeZone() {
+    TimeZone.setDefault(systemTz);
+  }
 
-    result = executeQuery(String.format(
-        "source=%s | eval f = adddate(date('2020-09-16'), 1) | fields f", TEST_INDEX_DATE));
+  @After
+  public void resetTimeZone() {
+    TimeZone.setDefault(testTz);
+  }
+
+  @Test
+  public void testAddDateWithDays() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval " + " f = adddate(date('2020-09-16'), 1)" + " | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "date"));
     verifySome(result.getJSONArray("datarows"), rows("2020-09-17"));
 
-    result = executeQuery(String.format(
-        "source=%s | eval f = adddate('2020-09-16', 1) | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = adddate(timestamp('2020-09-16 17:30:00'), 1)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows("2020-09-17"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-17 17:30:00"));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = adddate(DATETIME('2020-09-16 07:40:00'), 1)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-17 07:40:00"));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval " + " f = adddate(TIME('07:40:00'), 0)" + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(LocalDate.now() + " 07:40:00"));
+  }
+
+  @Test
+  public void testAddDateWithInterval() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = adddate(timestamp('2020-09-16 17:30:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-17 17:30:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = adddate('2020-09-16 17:30:00', interval 1 day) | fields f", TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = adddate(DATETIME('2020-09-16 17:30:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2020-09-17 17:30:00"));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = adddate(date('2020-09-16'), interval 1 day) "
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-17 00:00:00"));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = adddate(date('2020-09-16'), interval 1 hour)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-16 01:00:00"));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = adddate(TIME('07:40:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(
+        result.getJSONArray("datarows"),
+        rows(
+            LocalDate.now()
+                .plusDays(1)
+                .atTime(LocalTime.of(7, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = adddate(TIME('07:40:00'), interval 1 hour)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(
+        result.getJSONArray("datarows"),
+        rows(
+            LocalDate.now()
+                .atTime(LocalTime.of(8, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
   }
 
   @Test
   public void testConvertTZ() throws IOException {
     JSONObject result =
-        executeQuery(String.format(
-            "source=%s | eval f = convert_tz('2008-05-15 12:00:00','+00:00','+10:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2008-05-15 12:00:00','+00:00','+10:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-05-15 22:00:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = convert_tz('2021-05-12 00:00:00','-00:00','+00:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 00:00:00','-00:00','+00:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2021-05-12 00:00:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = convert_tz('2021-05-12 00:00:00','+10:00','+11:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 00:00:00','+10:00','+11:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2021-05-12 01:00:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-08:00','+09:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-08:00','+09:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2021-05-13 04:34:50"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = convert_tz('2021-05-12 11:34:50','+09:00','+09:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 11:34:50','+09:00','+09:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2021-05-12 11:34:50"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-12:00','+12:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-12:00','+12:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2021-05-13 11:34:50"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = convert_tz('2021-05-12 13:00:00','+09:30','+05:45') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 13:00:00','+09:30','+05:45') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2021-05-12 09:15:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = convert_tz('2021-05-30 11:34:50','-17:00','+08:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-30 11:34:50','-17:00','+08:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-12:00','+15:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = convert_tz('2021-05-12 11:34:50','-12:00','+15:00') | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
   }
 
   @Test
   public void testDateAdd() throws IOException {
     JSONObject result =
-        executeQuery(String.format(
-            "source=%s | eval f = date_add(timestamp('2020-09-16 17:30:00'), interval 1 day) | fields f", TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_add(timestamp('2020-09-16 17:30:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2020-09-17 17:30:00"));
 
-    result = executeQuery(String.format(
-        "source=%s | eval f = date_add(date('2020-09-16'), 1) | fields f", TEST_INDEX_DATE));
-    verifySchema(result, schema("f", null, "date"));
-    verifySome(result.getJSONArray("datarows"), rows("2020-09-17"));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_add(DATETIME('2020-09-16 17:30:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-17 17:30:00"));
 
-    result = executeQuery(String.format(
-        "source=%s | eval f = date_add('2020-09-16', 1) | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_add(date('2020-09-16'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows("2020-09-17"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-17 00:00:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = date_add('2020-09-16 17:30:00', interval 1 day) | fields f", TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows("2020-09-17 17:30:00"));
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_add(date('2020-09-16'), interval 1 hour)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-16 01:00:00"));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_add(TIME('07:40:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(
+        result.getJSONArray("datarows"),
+        rows(
+            LocalDate.now()
+                .plusDays(1)
+                .atTime(LocalTime.of(7, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_add(TIME('07:40:00'), interval 1 hour)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(
+        result.getJSONArray("datarows"),
+        rows(
+            LocalDate.now()
+                .atTime(LocalTime.of(8, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval " + " f = DATE_ADD(birthdate, INTERVAL 1 YEAR)" + " | fields f",
+                TEST_INDEX_BANK));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifyDataRows(
+        result,
+        rows("2018-10-23 00:00:00"),
+        rows("2018-11-20 00:00:00"),
+        rows("2019-06-23 00:00:00"),
+        rows("2019-11-13 23:33:20"),
+        rows("2019-06-27 00:00:00"),
+        rows("2019-08-19 00:00:00"),
+        rows("2019-08-11 00:00:00"));
   }
 
   @Test
   public void testDateTime() throws IOException {
     JSONObject result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', 'America/Los_Angeles') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', 'America/Los_Angeles')"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-12-24 21:30:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', '+01:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', '+01:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-12-25 06:30:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2008-12-25 05:30:00-05:00', '+05:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-12-25 05:30:00-05:00', '+05:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-12-25 15:30:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2004-02-28 23:00:00-10:00', '+10:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2004-02-28 23:00:00-10:00', '+10:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2004-02-29 19:00:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2003-02-28 23:00:00-10:00', '+10:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2003-02-28 23:00:00-10:00', '+10:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2003-03-01 19:00:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', '+14:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', '+14:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-12-25 19:30:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00', '-10:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00', '-10:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2007-12-31 06:00:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-01-01 02:00:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2008-01-01 02:00:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-01-01 02:00:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2008-01-01 02:00:00+15:00', '-12:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00+15:00', '-12:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00', '-14:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00', '-14:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f = DATETIME('2008-01-01 02:00:00', '-14:00') | fields f",
-            TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00', '-14:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
   }
 
   @Test
   public void testDateSub() throws IOException {
     JSONObject result =
-        executeQuery(String.format(
-            "source=%s | eval f =  date_sub(timestamp('2020-09-16 17:30:00'), interval 1 day) | fields f", TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_sub(timestamp('2020-09-16 17:30:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2020-09-15 17:30:00"));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  date_sub(date('2020-09-16'), 1) | fields f", TEST_INDEX_DATE));
-    verifySchema(result, schema("f", null, "date"));
-    verifySome(result.getJSONArray("datarows"), rows("2020-09-15"));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_sub(DATETIME('2020-09-16 17:30:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-15 17:30:00"));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  date_sub('2020-09-16', 1) | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_sub(date('2020-09-16'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows("2020-09-15"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-15 00:00:00"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f =  date_sub('2020-09-16 17:30:00', interval 1 day) | fields f", TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows("2020-09-15 17:30:00"));
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_sub(date('2020-09-16'), interval 1 hour)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-15 23:00:00"));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_sub(TIME('07:40:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(
+        result.getJSONArray("datarows"),
+        rows(
+            LocalDate.now()
+                .plusDays(-1)
+                .atTime(LocalTime.of(7, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = date_sub(TIME('07:40:00'), interval 1 hour)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(
+        result.getJSONArray("datarows"),
+        rows(
+            LocalDate.now()
+                .atTime(LocalTime.of(6, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
   }
 
   @Test
   public void testDay() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  day(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  day(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(16));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  day('2020-09-16') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format("source=%s | eval f =  day('2020-09-16') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(16));
   }
 
+  @Test
+  public void testDay_of_week() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  day_of_week(date('2020-09-16')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(4));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  day_of_week('2020-09-16') | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(4));
+  }
+
+  @Test
+  public void testDay_of_month() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  day_of_month(date('2020-09-16')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(16));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  day_of_month('2020-09-16') | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(16));
+  }
+
+  @Test
+  public void testDay_of_year() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  day_of_year(date('2020-09-16')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(260));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  day_of_year('2020-09-16') | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(260));
+  }
+
   @Test
   public void testDayName() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  dayname(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  dayname(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "string"));
     verifySome(result.getJSONArray("datarows"), rows("Wednesday"));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  dayname('2020-09-16') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  dayname('2020-09-16') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "string"));
     verifySome(result.getJSONArray("datarows"), rows("Wednesday"));
   }
 
   @Test
   public void testDayOfMonth() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  dayofmonth(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  dayofmonth(date('2020-09-16')) | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(16));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  dayofmonth('2020-09-16') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  dayofmonth('2020-09-16') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(16));
   }
 
   @Test
   public void testDayOfWeek() throws IOException {
-    JSONObject result = executeQuery(String.format(
-        "source=%s | eval f =  dayofweek(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  dayofweek(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(4));
 
-    result = executeQuery(String.format(
-        "source=%s | eval f =  dayofweek('2020-09-16') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  dayofweek('2020-09-16') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(4));
   }
 
   @Test
   public void testDayOfYear() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  dayofyear(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  dayofyear(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(260));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  dayofyear('2020-09-16') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  dayofyear('2020-09-16') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(260));
   }
 
   @Test
   public void testFromDays() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  from_days(738049) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format("source=%s | eval f =  from_days(738049) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "date"));
     verifySome(result.getJSONArray("datarows"), rows("2020-09-16"));
   }
 
   @Test
   public void testHour() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  hour(timestamp('2020-09-16 17:30:00')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  hour(timestamp('2020-09-16 17:30:00')) | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(17));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  hour(time('17:30:00')) | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  hour(time('17:30:00')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(17));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  hour('2020-09-16 17:30:00') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  hour('2020-09-16 17:30:00') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(17));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  hour('17:30:00') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format("source=%s | eval f =  hour('17:30:00') | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(17));
+  }
+
+  @Test
+  public void testHour_of_day() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  hour_of_day(timestamp('2020-09-16 17:30:00')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(17));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  hour_of_day(time('17:30:00')) | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(17));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  hour_of_day('2020-09-16 17:30:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(17));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  hour_of_day('17:30:00') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(17));
   }
 
   @Test
   public void testMicrosecond() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  microsecond(timestamp('2020-09-16 17:30:00.123456')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  microsecond(timestamp('2020-09-16 17:30:00.123456')) |"
+                    + " fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(123456));
 
     // Explicit timestamp value with less than 6 microsecond digits
-    result = executeQuery(String.format(
-            "source=%s | eval f =  microsecond(timestamp('2020-09-16 17:30:00.1234')) | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  microsecond(timestamp('2020-09-16 17:30:00.1234')) | fields"
+                    + " f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(123400));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  microsecond(time('17:30:00.000010')) | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  microsecond(time('17:30:00.000010')) | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(10));
 
     // Explicit time value with less than 6 microsecond digits
-    result = executeQuery(String.format(
-        "source=%s | eval f =  microsecond(time('17:30:00.1234')) | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  microsecond(time('17:30:00.1234')) | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(123400));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  microsecond('2020-09-16 17:30:00.123456') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  microsecond('2020-09-16 17:30:00.123456') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(123456));
 
     // Implicit timestamp value with less than 6 microsecond digits
-    result = executeQuery(String.format(
-        "source=%s | eval f =  microsecond('2020-09-16 17:30:00.1234') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  microsecond('2020-09-16 17:30:00.1234') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(123400));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  microsecond('17:30:00.000010') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  microsecond('17:30:00.000010') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(10));
 
     // Implicit time value with less than 6 microsecond digits
-    result = executeQuery(String.format(
-            "source=%s | eval f =  microsecond('17:30:00.1234') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  microsecond('17:30:00.1234') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(123400));
   }
 
   @Test
   public void testMinute() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  minute(timestamp('2020-09-16 17:30:00')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  minute(timestamp('2020-09-16 17:30:00')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(30));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  minute(time('17:30:00')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(30));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  minute(time('17:30:00')) | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  minute('2020-09-16 17:30:00') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(30));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  minute('2020-09-16 17:30:00') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format("source=%s | eval f =  minute('17:30:00') | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(30));
+  }
+
+  @Test
+  public void testMinute_of_hour() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  minute_of_hour(timestamp('2020-09-16 17:30:00')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(30));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  minute_of_hour(time('17:30:00')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(30));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  minute_of_hour('2020-09-16 17:30:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(30));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  minute('17:30:00') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  minute_of_hour('17:30:00') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(30));
   }
 
+  @Test
+  public void testMinute_of_day() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  minute_of_day(timestamp('2020-09-16 17:30:00')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(1050));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  minute_of_day(time('17:30:00')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(1050));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  minute_of_day('2020-09-16 17:30:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(1050));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  minute_of_day('17:30:00') | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(1050));
+  }
+
   @Test
   public void testMonth() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  month(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  month(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(9));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  month('2020-09-16') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format("source=%s | eval f =  month('2020-09-16') | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(9));
+  }
+
+  @Test
+  public void testMonth_of_year() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  month_of_year(date('2020-09-16')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(9));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  month_of_year('2020-09-16') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(9));
   }
 
   @Test
   public void testMonthName() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  monthname(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  monthname(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "string"));
     verifySome(result.getJSONArray("datarows"), rows("September"));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  monthname('2020-09-16') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  monthname('2020-09-16') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "string"));
     verifySome(result.getJSONArray("datarows"), rows("September"));
   }
 
   @Test
   public void testQuarter() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  quarter(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  quarter(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(3));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  quarter('2020-09-16') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  quarter('2020-09-16') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(3));
   }
 
   @Test
   public void testSecond() throws IOException {
-    JSONObject result = executeQuery(String.format(
-            "source=%s | eval f =  second(timestamp('2020-09-16 17:30:00')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  second(timestamp('2020-09-16 17:30:00')) | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(0));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  second(time('17:30:00')) | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  second(time('17:30:00')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(0));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  second('2020-09-16 17:30:00') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  second('2020-09-16 17:30:00') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(0));
 
-    result = executeQuery(String.format(
-            "source=%s | eval f =  second('17:30:00') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format("source=%s | eval f =  second('17:30:00') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(0));
   }
 
   @Test
-  public void testSubDate() throws IOException {
+  public void testSecond_of_minute() throws IOException {
     JSONObject result =
-        executeQuery(String.format(
-            "source=%s | eval f =  subdate(timestamp('2020-09-16 17:30:00'), interval 1 day) | fields f", TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  second_of_minute(timestamp('2020-09-16 17:30:00')) | fields"
+                    + " f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(0));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  second_of_minute(time('17:30:00')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(0));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  second_of_minute('2020-09-16 17:30:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(0));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  second_of_minute('17:30:00') | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(0));
+  }
+
+  @Test
+  public void testSubDateDays() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval " + " f = subdate(date('2020-09-16'), 1)" + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "date"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-15"));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = subdate(timestamp('2020-09-16 17:30:00'), 1)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2020-09-15 17:30:00"));
 
-    result = executeQuery(String.format(
-        "source=%s | eval f =  subdate(date('2020-09-16'), 1) | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval " + " f = subdate(date('2020-09-16'), 1)" + " | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "date"));
     verifySome(result.getJSONArray("datarows"), rows("2020-09-15"));
 
     result =
-        executeQuery(String.format(
-            "source=%s | eval f =  subdate('2020-09-16 17:30:00', interval 1 day) | fields f", TEST_INDEX_DATE));
-    verifySchema(result,
-        schema("f", null, "datetime"));
+        executeQuery(
+            String.format(
+                "source=%s | eval " + " f = subdate(TIME('07:40:00'), 0)" + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(LocalDate.now() + " 07:40:00"));
+  }
+
+  @Test
+  public void testSubDateInterval() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = subdate(timestamp('2020-09-16 17:30:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2020-09-15 17:30:00"));
 
-    result = executeQuery(String.format(
-        "source=%s | eval f =  subdate('2020-09-16', 1) | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = subdate(DATETIME('2020-09-16 17:30:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows("2020-09-15"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-15 17:30:00"));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = subdate(date('2020-09-16'), interval 1 day) "
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-15 00:00:00"));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = subdate(date('2020-09-16'), interval 1 hour)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2020-09-15 23:00:00"));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = subdate(TIME('07:40:00'), interval 1 day)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(
+        result.getJSONArray("datarows"),
+        rows(
+            LocalDate.now()
+                .plusDays(-1)
+                .atTime(LocalTime.of(7, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + " f = subdate(TIME('07:40:00'), interval 1 hour)"
+                    + " | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(
+        result.getJSONArray("datarows"),
+        rows(
+            LocalDate.now()
+                .atTime(LocalTime.of(6, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
   }
 
   @Test
   public void testTimeToSec() throws IOException {
-    JSONObject result = executeQuery(String.format(
-        "source=%s | eval f =  time_to_sec(time('17:30:00')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  time_to_sec(time('17:30:00')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "long"));
     verifySome(result.getJSONArray("datarows"), rows(63000));
 
-    result = executeQuery(String.format(
-        "source=%s | eval f =  time_to_sec('17:30:00') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  time_to_sec('17:30:00') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "long"));
     verifySome(result.getJSONArray("datarows"), rows(63000));
   }
 
   @Test
   public void testToDays() throws IOException {
-    JSONObject result = executeQuery(String.format(
-        "source=%s | eval f =  to_days(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  to_days(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "long"));
     verifySome(result.getJSONArray("datarows"), rows(738049));
 
-    result = executeQuery(String.format(
-        "source=%s | eval f =  to_days('2020-09-16') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  to_days('2020-09-16') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "long"));
     verifySome(result.getJSONArray("datarows"), rows(738049));
   }
 
   private void week(String date, int mode, int expectedResult) throws IOException {
-    JSONObject result = executeQuery(StringUtils.format(
-        "source=%s | eval f = week(date('%s'), %d) | fields f", TEST_INDEX_DATE, date, mode));
+    JSONObject result =
+        executeQuery(
+            StringUtils.format(
+                "source=%s | eval f = week(date('%s'), %d) | fields f",
+                TEST_INDEX_DATE, date, mode));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(expectedResult));
   }
 
   @Test
   public void testWeek() throws IOException {
-    JSONObject result = executeQuery(String.format(
-        "source=%s | eval f = week(date('2008-02-20')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = week(date('2008-02-20')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(7));
 
@@ -601,29 +1207,48 @@ public void testWeek() throws IOException {
     week("2000-01-01", 2, 52);
   }
 
+  @Test
+  public void testWeek_of_year() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = week_of_year(date('2008-02-20')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(7));
+  }
+
   @Test
   public void testYear() throws IOException {
-    JSONObject result = executeQuery(String.format(
-        "source=%s | eval f =  year(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f =  year(date('2020-09-16')) | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(2020));
 
-    result = executeQuery(String.format(
-        "source=%s | eval f =  year('2020-09-16') | fields f", TEST_INDEX_DATE));
+    result =
+        executeQuery(
+            String.format("source=%s | eval f =  year('2020-09-16') | fields f", TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(2020));
   }
 
-  void verifyDateFormat(String date, String type, String format, String formatted) throws IOException {
-    JSONObject result = executeQuery(String.format(
-        "source=%s | eval f =  date_format(%s('%s'), '%s') | fields f",
-        TEST_INDEX_DATE, type, date, format));
+  void verifyDateFormat(String date, String type, String format, String formatted)
+      throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = date_format(%s('%s'), '%s') | fields f",
+                TEST_INDEX_DATE, type, date, format));
     verifySchema(result, schema("f", null, "string"));
     verifySome(result.getJSONArray("datarows"), rows(formatted));
 
-    result = executeQuery(String.format(
-        "source=%s | eval f =  date_format('%s', '%s') | fields f",
-        TEST_INDEX_DATE, date, format));
+    result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = date_format('%s', '%s') | fields f",
+                TEST_INDEX_DATE, date, format));
     verifySchema(result, schema("f", null, "string"));
     verifySome(result.getJSONArray("datarows"), rows(formatted));
   }
@@ -631,10 +1256,11 @@ void verifyDateFormat(String date, String type, String format, String formatted)
   @Test
   public void testDateFormat() throws IOException {
     String timestamp = "1998-01-31 13:14:15.012345";
-    String timestampFormat = "%a %b %c %D %d %e %f %H %h %I %i %j %k %l %M "
-        + "%m %p %r %S %s %T %% %P";
-    String timestampFormatted = "Sat Jan 01 31st 31 31 12345 13 01 01 14 031 13 1 "
-        + "January 01 PM 01:14:15 PM 15 15 13:14:15 % P";
+    String timestampFormat =
+        "%a %b %c %D %d %e %f %H %h %I %i %j %k %l %M " + "%m %p %r %S %s %T %% %P";
+    String timestampFormatted =
+        "Sat Jan 01 31st 31 31 012345 13 01 01 14 031 13 1 "
+            + "January 01 PM 01:14:15 PM 15 15 13:14:15 % P";
     verifyDateFormat(timestamp, "timestamp", timestampFormat, timestampFormatted);
 
     String date = "1998-01-31";
@@ -658,203 +1284,119 @@ public void testDateFormatISO8601() throws IOException {
 
   @Test
   public void testMakeTime() throws IOException {
-    var result = executeQuery(String.format(
-        "source=%s | eval f1 = MAKETIME(20, 30, 40), f2 = MAKETIME(20.2, 49.5, 42.100502) | fields f1, f2", TEST_INDEX_DATE));
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f1 = MAKETIME(20, 30, 40), f2 = MAKETIME(20.2, 49.5, 42.100502) |"
+                    + " fields f1, f2",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f1", null, "time"), schema("f2", null, "time"));
     verifySome(result.getJSONArray("datarows"), rows("20:30:40", "20:50:42.100502"));
   }
 
   @Test
   public void testMakeDate() throws IOException {
-    var result = executeQuery(String.format(
-        "source=%s | eval f1 = MAKEDATE(1945, 5.9), f2 = MAKEDATE(1984, 1984) | fields f1, f2", TEST_INDEX_DATE));
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f1 = MAKEDATE(1945, 5.9), f2 = MAKEDATE(1984, 1984) | fields f1,"
+                    + " f2",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f1", null, "date"), schema("f2", null, "date"));
     verifySome(result.getJSONArray("datarows"), rows("1945-01-06", "1989-06-06"));
   }
 
-  private List<ImmutableMap<Object, Object>> nowLikeFunctionsData() {
-    return List.of(
-      ImmutableMap.builder()
-              .put("name", "now")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", true)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDateTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse)
-              .put("serializationPattern", "uuuu-MM-dd HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "current_timestamp")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", true)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDateTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse)
-              .put("serializationPattern", "uuuu-MM-dd HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "localtimestamp")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", true)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDateTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse)
-              .put("serializationPattern", "uuuu-MM-dd HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "localtime")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", true)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDateTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse)
-              .put("serializationPattern", "uuuu-MM-dd HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "sysdate")
-              .put("hasFsp", true)
-              .put("hasShortcut", false)
-              .put("constValue", false)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDateTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse)
-              .put("serializationPattern", "uuuu-MM-dd HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "curtime")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", false)
-              .put("referenceGetter", (Supplier<Temporal>) LocalTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalTime::parse)
-              .put("serializationPattern", "HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "current_time")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", false)
-              .put("referenceGetter", (Supplier<Temporal>) LocalTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalTime::parse)
-              .put("serializationPattern", "HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "curdate")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", false)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDate::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDate::parse)
-              .put("serializationPattern", "uuuu-MM-dd")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "current_date")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", false)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDate::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDate::parse)
-              .put("serializationPattern", "uuuu-MM-dd")
-              .build()
-    );
-  }
-
-  private long getDiff(Temporal sample, Temporal reference) {
-    if (sample instanceof LocalDate) {
-      return Period.between((LocalDate) sample, (LocalDate) reference).getDays();
-    }
-    return Duration.between(sample, reference).toSeconds();
-  }
-
-  @Test
-  public void testNowLikeFunctions() throws IOException {
-    // Integration test framework sets for OpenSearch instance a random timezone.
-    // If server's TZ doesn't match localhost's TZ, time measurements for `now` would differ.
-    // We should set localhost's TZ now and recover the value back in the end of the test.
-    var testTz = TimeZone.getDefault();
-    TimeZone.setDefault(TimeZone.getTimeZone(System.getProperty("user.timezone")));
-
-    for (var funcData : nowLikeFunctionsData()) {
-      String name = (String) funcData.get("name");
-      Boolean hasFsp = (Boolean) funcData.get("hasFsp");
-      Boolean hasShortcut = (Boolean) funcData.get("hasShortcut");
-      Boolean constValue = (Boolean) funcData.get("constValue");
-      Supplier<Temporal> referenceGetter = (Supplier<Temporal>) funcData.get("referenceGetter");
-      BiFunction<CharSequence, DateTimeFormatter, Temporal> parser =
-              (BiFunction<CharSequence, DateTimeFormatter, Temporal>) funcData.get("parser");
-      String serializationPatternStr = (String) funcData.get("serializationPattern");
-
-      var serializationPattern = new DateTimeFormatterBuilder()
-              .appendPattern(serializationPatternStr)
-              .optionalStart()
-              .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true)
-              .toFormatter();
-
-      Temporal reference = referenceGetter.get();
-      double delta = 2d; // acceptable time diff, secs
-      if (reference instanceof LocalDate)
-        delta = 1d; // Max date delta could be 1 if test runs on the very edge of two days
-                    // We ignore probability of a test run on edge of month or year to simplify the checks
-
-      var calls = new ArrayList<String>() {{
-        add(name + "()");
-      }};
-      if (hasShortcut)
-        calls.add(name);
-      if (hasFsp)
-        calls.add(name + "(0)");
-
-      // Column order is: func(), func, func(0)
-      //                   shortcut ^    fsp ^
-      // Query looks like:
-      //    source=people2 | eval `now()`=now() | fields `now()`;
-      JSONObject result = executeQuery("source=" + TEST_INDEX_PEOPLE2
-          + " | eval " + calls.stream().map(c -> String.format("`%s`=%s", c, c)).collect(Collectors.joining(","))
-          + " | fields " + calls.stream().map(c -> String.format("`%s`", c)).collect(Collectors.joining(",")));
-
-      var rows = result.getJSONArray("datarows");
-      JSONArray firstRow = rows.getJSONArray(0);
-      for (int i = 0; i < rows.length(); i++) {
-        var row = rows.getJSONArray(i);
-        if (constValue)
-          assertTrue(firstRow.similar(row));
-
-        int column = 0;
-        assertEquals(0,
-            getDiff(reference, parser.apply(row.getString(column++), serializationPattern)), delta);
-
-        if (hasShortcut) {
-          assertEquals(0,
-              getDiff(reference, parser.apply(row.getString(column++), serializationPattern)), delta);
-        }
-        if (hasFsp) {
-          assertEquals(0,
-              getDiff(reference, parser.apply(row.getString(column), serializationPattern)), delta);
-        }
-      }
-    }
-    TimeZone.setDefault(testTz);
+  @Test
+  public void testAddTime() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval `'2008-12-12' + 0` = ADDTIME(DATE('2008-12-12'),"
+                    + " DATE('2008-11-15')), `'23:59:59' + 0` = ADDTIME(TIME('23:59:59'),"
+                    + " DATE('2004-01-01')), `'2004-01-01' + '23:59:59'` ="
+                    + " ADDTIME(DATE('2004-01-01'), TIME('23:59:59')), `'10:20:30' + '00:05:42'` ="
+                    + " ADDTIME(TIME('10:20:30'), TIME('00:05:42')), `'15:42:13' + '09:07:00'` ="
+                    + " ADDTIME(TIMESTAMP('1999-12-31 15:42:13'), DATETIME('1961-04-12 09:07:00'))"
+                    + " | fields `'2008-12-12' + 0`, `'23:59:59' + 0`, `'2004-01-01' + '23:59:59'`,"
+                    + " `'10:20:30' + '00:05:42'`, `'15:42:13' + '09:07:00'`",
+                TEST_INDEX_DATE));
+    verifySchema(
+        result,
+        schema("'2008-12-12' + 0", null, "datetime"),
+        schema("'23:59:59' + 0", null, "time"),
+        schema("'2004-01-01' + '23:59:59'", null, "datetime"),
+        schema("'10:20:30' + '00:05:42'", null, "time"),
+        schema("'15:42:13' + '09:07:00'", null, "datetime"));
+    verifySome(
+        result.getJSONArray("datarows"),
+        rows(
+            "2008-12-12 00:00:00",
+            "23:59:59",
+            "2004-01-01 23:59:59",
+            "10:26:12",
+            "2000-01-01 00:49:13"));
+  }
+
+  @Test
+  public void testSubTime() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval `'2008-12-12' - 0` = SUBTIME(DATE('2008-12-12'),"
+                    + " DATE('2008-11-15')), `'23:59:59' - 0` = SUBTIME(TIME('23:59:59'),"
+                    + " DATE('2004-01-01')), `'2004-01-01' - '23:59:59'` ="
+                    + " SUBTIME(DATE('2004-01-01'), TIME('23:59:59')), `'10:20:30' - '00:05:42'` ="
+                    + " SUBTIME(TIME('10:20:30'), TIME('00:05:42')), `'15:42:13' - '09:07:00'` ="
+                    + " SUBTIME(TIMESTAMP('1999-12-31 15:42:13'), DATETIME('1961-04-12 09:07:00'))"
+                    + " | fields `'2008-12-12' - 0`, `'23:59:59' - 0`, `'2004-01-01' - '23:59:59'`,"
+                    + " `'10:20:30' - '00:05:42'`, `'15:42:13' - '09:07:00'`",
+                TEST_INDEX_DATE));
+    verifySchema(
+        result,
+        schema("'2008-12-12' - 0", null, "datetime"),
+        schema("'23:59:59' - 0", null, "time"),
+        schema("'2004-01-01' - '23:59:59'", null, "datetime"),
+        schema("'10:20:30' - '00:05:42'", null, "time"),
+        schema("'15:42:13' - '09:07:00'", null, "datetime"));
+    verifySome(
+        result.getJSONArray("datarows"),
+        rows(
+            "2008-12-12 00:00:00",
+            "23:59:59",
+            "2003-12-31 00:00:01",
+            "10:14:48",
+            "1999-12-31 06:35:13"));
   }
 
   @Test
   public void testFromUnixTime() throws IOException {
-    var result = executeQuery(String.format(
-        "source=%s | eval f1 = FROM_UNIXTIME(200300400), f2 = FROM_UNIXTIME(12224.12), "
-        + "f3 = FROM_UNIXTIME(1662601316, '%%T') | fields f1, f2, f3", TEST_INDEX_DATE));
-    verifySchema(result,
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f1 = FROM_UNIXTIME(200300400), f2 = FROM_UNIXTIME(12224.12), "
+                    + "f3 = FROM_UNIXTIME(1662601316, '%%T') | fields f1, f2, f3",
+                TEST_INDEX_DATE));
+    verifySchema(
+        result,
         schema("f1", null, "datetime"),
         schema("f2", null, "datetime"),
         schema("f3", null, "string"));
-    verifySome(result.getJSONArray("datarows"),
+    verifySome(
+        result.getJSONArray("datarows"),
         rows("1976-05-07 07:00:00", "1970-01-01 03:23:44.12", "01:41:56"));
   }
 
   @Test
   public void testUnixTimeStamp() throws IOException {
-    var result = executeQuery(String.format(
-        "source=%s | eval f1 = UNIX_TIMESTAMP(MAKEDATE(1984, 1984)), "
-        + "f2 = UNIX_TIMESTAMP(TIMESTAMP('2003-12-31 12:00:00')), "
-        + "f3 = UNIX_TIMESTAMP(20771122143845) | fields f1, f2, f3", TEST_INDEX_DATE));
-    verifySchema(result,
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f1 = UNIX_TIMESTAMP(MAKEDATE(1984, 1984)), "
+                    + "f2 = UNIX_TIMESTAMP(TIMESTAMP('2003-12-31 12:00:00')), "
+                    + "f3 = UNIX_TIMESTAMP(20771122143845) | fields f1, f2, f3",
+                TEST_INDEX_DATE));
+    verifySchema(
+        result,
         schema("f1", null, "double"),
         schema("f2", null, "double"),
         schema("f3", null, "double"));
@@ -863,17 +1405,170 @@ public void testUnixTimeStamp() throws IOException {
 
   @Test
   public void testPeriodAdd() throws IOException {
-    var result = executeQuery(String.format(
-        "source=%s | eval f1 = PERIOD_ADD(200801, 2), f2 = PERIOD_ADD(200801, -12) | fields f1, f2", TEST_INDEX_DATE));
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f1 = PERIOD_ADD(200801, 2), f2 = PERIOD_ADD(200801, -12) | fields"
+                    + " f1, f2",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f1", null, "integer"), schema("f2", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(200803, 200701));
   }
 
   @Test
   public void testPeriodDiff() throws IOException {
-    var result = executeQuery(String.format(
-        "source=%s | eval f1 = PERIOD_DIFF(200802, 200703), f2 = PERIOD_DIFF(200802, 201003) | fields f1, f2", TEST_INDEX_DATE));
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f1 = PERIOD_DIFF(200802, 200703), f2 = PERIOD_DIFF(200802,"
+                    + " 201003) | fields f1, f2",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f1", null, "integer"), schema("f2", null, "integer"));
     verifySome(result.getJSONArray("datarows"), rows(11, -25));
   }
+
+  public void testDateDiff() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval `'2000-01-02' - '2000-01-01'` = DATEDIFF(TIMESTAMP('2000-01-02"
+                    + " 00:00:00'), TIMESTAMP('2000-01-01 23:59:59')), `'2001-02-01' -"
+                    + " '2004-01-01'` = DATEDIFF(DATE('2001-02-01'), TIMESTAMP('2004-01-01"
+                    + " 00:00:00')), `'2004-01-01' - '2002-02-01'` = DATEDIFF(TIMESTAMP('2004-01-01"
+                    + " 00:00:00'), DATETIME('2002-02-01 14:25:30')), `today - today` ="
+                    + " DATEDIFF(TIME('23:59:59'), TIME('00:00:00')) | fields `'2000-01-02' -"
+                    + " '2000-01-01'`, `'2001-02-01' - '2004-01-01'`, `'2004-01-01' -"
+                    + " '2002-02-01'`, `today - today`",
+                TEST_INDEX_DATE));
+    verifySchema(
+        result,
+        schema("'2000-01-02' - '2000-01-01'", null, "long"),
+        schema("'2001-02-01' - '2004-01-01'", null, "long"),
+        schema("'2004-01-01' - '2002-02-01'", null, "long"),
+        schema("today - today", null, "long"));
+    verifySome(result.getJSONArray("datarows"), rows(1, -1064, 699, 0));
+  }
+
+  @Test
+  public void testTimeDiff() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = TIMEDIFF('23:59:59', '13:00:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "time"));
+    verifySome(result.getJSONArray("datarows"), rows("10:59:59"));
+  }
+
+  @Test
+  public void testGetFormat() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = date_format('2003-10-03', get_format(DATE,'USA')) | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "string"));
+    verifySome(result.getJSONArray("datarows"), rows("10.03.2003"));
+  }
+
+  @Test
+  public void testLastDay() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = last_day('2003-10-03') | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "date"));
+    verifySome(result.getJSONArray("datarows"), rows("2003-10-31"));
+  }
+
+  @Test
+  public void testSecToTime() throws IOException {
+    var result =
+        executeQuery(
+            String.format("source=%s | eval f = sec_to_time(123456) | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "time"));
+    verifySome(result.getJSONArray("datarows"), rows("10:17:36"));
+  }
+
+  @Test
+  public void testYearWeek() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f1 = yearweek('2003-10-03') | eval f2 = yearweek('2003-10-03', 3)"
+                    + " | fields f1, f2",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f1", null, "integer"), schema("f2", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(200339, 200340));
+  }
+
+  @Test
+  public void testWeekDay() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = weekday('2003-10-03') | fields f", TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "integer"));
+    verifySome(result.getJSONArray("datarows"), rows(4));
+  }
+
+  @Test
+  public void testToSeconds() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f1 = to_seconds(date('2008-10-07')) | "
+                    + "eval f2 = to_seconds('2020-09-16 07:40:00') | "
+                    + "eval f3 = to_seconds(DATETIME('2020-09-16 07:40:00')) | fields f1, f2, f3",
+                TEST_INDEX_DATE));
+    verifySchema(
+        result, schema("f1", null, "long"), schema("f2", null, "long"), schema("f3", null, "long"));
+    verifySome(result.getJSONArray("datarows"), rows(63390556800L, 63767461200L, 63767461200L));
+  }
+
+  @Test
+  public void testStrToDate() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = str_to_date('01,5,2013', '%s') | fields f",
+                TEST_INDEX_DATE, "%d,%m,%Y"));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2013-05-01 00:00:00"));
+  }
+
+  @Test
+  public void testTimeStampAdd() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = timestampadd(YEAR, 15, '2001-03-06 00:00:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows("2016-03-06 00:00:00"));
+  }
+
+  @Test
+  public void testTimestampDiff() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = timestampdiff(YEAR, '1997-01-01 00:00:00', '2001-03-06"
+                    + " 00:00:00') | fields f",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f", null, "datetime"));
+    verifySome(result.getJSONArray("datarows"), rows(4));
+  }
+
+  @Test
+  public void testExtract() throws IOException {
+    var result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f1 = extract(YEAR FROM '1997-01-01 00:00:00') | eval f2 ="
+                    + " extract(MINUTE FROM time('10:17:36')) | fields f1, f2",
+                TEST_INDEX_DATE));
+    verifySchema(result, schema("f1", null, "long"), schema("f2", null, "long"));
+    verifySome(result.getJSONArray("datarows"), rows(1997L, 17L));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeImplementationIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeImplementationIT.java
index 158f25aadf..dd86470a39 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeImplementationIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeImplementationIT.java
@@ -5,145 +5,175 @@
 
 package org.opensearch.sql.ppl;
 
-import org.json.JSONObject;
-import org.junit.Test;
-
-import java.io.IOException;
-
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATE;
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.schema;
-import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 import static org.opensearch.sql.util.MatcherUtils.verifySome;
 
-public class DateTimeImplementationIT extends PPLIntegTestCase {
+import java.io.IOException;
+import org.json.JSONObject;
+import org.junit.Test;
 
+public class DateTimeImplementationIT extends PPLIntegTestCase {
 
   @Override
   public void init() throws IOException {
     loadIndex(Index.DATE);
   }
 
-
   @Test
   public void inRangeZeroToStringTZ() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', 'America/Los_Angeles') | fields f",
-            TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', 'America/Los_Angeles')"
+                    + " | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-12-24 21:30:00"));
   }
 
   @Test
   public void inRangeZeroToPositive() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', '+01:00') | fields f",
-            TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', '+01:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-12-25 06:30:00"));
   }
 
   @Test
   public void inRangeNegativeToPositive() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2008-12-25 05:30:00-05:00', '+05:00') | fields f",
-            TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-12-25 05:30:00-05:00', '+05:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-12-25 15:30:00"));
   }
 
   @Test
   public void inRangeTwentyHourOffset() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2004-02-28 23:00:00-10:00', '+10:00') | fields f",
-            TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2004-02-28 23:00:00-10:00', '+10:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2004-02-29 19:00:00"));
   }
 
-
   @Test
   public void inRangeYearChange() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00', '-10:00') | fields f",
-            TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00', '-10:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2007-12-31 06:00:00"));
   }
 
   @Test
   public void inRangeZeroToMax() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', '+14:00') | fields f",
-            TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-12-25 05:30:00+00:00', '+14:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-12-25 19:30:00"));
   }
 
   @Test
   public void inRangeNoToTZ() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00') | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-01-01 02:00:00"));
   }
 
   @Test
   public void inRangeNoTZ() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2008-01-01 02:00:00') | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
     verifySome(result.getJSONArray("datarows"), rows("2008-01-01 02:00:00"));
   }
 
   @Test
   public void nullField3Over() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2008-01-01 02:00:00+15:00', '-12:00') | fields f",
-            TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00+15:00', '-12:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
   }
 
   @Test
   public void nullField2Under() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00', '-14:00') | fields f",
-            TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00+10:00', '-14:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
   }
 
   @Test
   public void nullTField3Over() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2008-01-01 02:00:00', '+15:00') | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2008-01-01 02:00:00', '+15:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
   }
 
   @Test
   public void nullDateTimeInvalidDateValueFebruary() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2021-02-30 10:00:00') | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2021-02-30 10:00:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
   }
 
   @Test
   public void nullDateTimeInvalidDateValueApril() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2021-04-31 10:00:00') | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2021-04-31 10:00:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
   }
 
   @Test
   public void nullDateTimeInvalidDateValueMonth() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | eval f = DATETIME('2021-13-03 10:00:00') | fields f", TEST_INDEX_DATE));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | eval f = DATETIME('2021-13-03 10:00:00') | fields f",
+                TEST_INDEX_DATE));
     verifySchema(result, schema("f", null, "datetime"));
-    verifySome(result.getJSONArray("datarows"), rows(new Object[]{null}));
+    verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/DedupCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/DedupCommandIT.java
index bd4fadb57f..7a6cf16bb4 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/DedupCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/DedupCommandIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/DescribeCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/DescribeCommandIT.java
index 77fd910f35..aee32e08d1 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/DescribeCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/DescribeCommandIT.java
@@ -3,22 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
-import org.json.JSONObject;
-import org.junit.jupiter.api.Test;
-import org.opensearch.client.Request;
-import org.opensearch.client.ResponseException;
-
-import java.io.IOException;
-
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DOG;
 import static org.opensearch.sql.util.MatcherUtils.columnName;
-import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.verifyColumn;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 
+import java.io.IOException;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.ResponseException;
+
 public class DescribeCommandIT extends PPLIntegTestCase {
 
   @Override
@@ -54,19 +51,17 @@ public void testDescribeAllFields() throws IOException {
         columnName("SCOPE_TABLE"),
         columnName("SOURCE_DATA_TYPE"),
         columnName("IS_AUTOINCREMENT"),
-        columnName("IS_GENERATEDCOLUMN")
-    );
+        columnName("IS_GENERATEDCOLUMN"));
   }
 
   @Test
   public void testDescribeFilterFields() throws IOException {
-    JSONObject result = executeQuery(String.format("describe %s | fields TABLE_NAME, COLUMN_NAME, TYPE_NAME", TEST_INDEX_DOG));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "describe %s | fields TABLE_NAME, COLUMN_NAME, TYPE_NAME", TEST_INDEX_DOG));
     verifyColumn(
-        result,
-        columnName("TABLE_NAME"),
-        columnName("COLUMN_NAME"),
-        columnName("TYPE_NAME")
-    );
+        result, columnName("TABLE_NAME"), columnName("COLUMN_NAME"), columnName("TYPE_NAME"));
   }
 
   @Test
@@ -88,25 +83,4 @@ public void describeCommandWithoutIndexShouldFailToParse() throws IOException {
       assertTrue(e.getMessage().contains("Failed to parse query due to offending symbol"));
     }
   }
-
-  @Test
-  public void testDescribeCommandWithPrometheusCatalog() throws IOException {
-    JSONObject result = executeQuery("describe  my_prometheus.prometheus_http_requests_total");
-    verifyColumn(
-        result,
-        columnName("TABLE_CATALOG"),
-        columnName("TABLE_SCHEMA"),
-        columnName("TABLE_NAME"),
-        columnName("COLUMN_NAME"),
-        columnName("DATA_TYPE")
-    );
-    verifyDataRows(result,
-        rows("my_prometheus", "default", "prometheus_http_requests_total", "handler", "keyword"),
-        rows("my_prometheus", "default", "prometheus_http_requests_total", "code", "keyword"),
-        rows("my_prometheus", "default", "prometheus_http_requests_total", "instance", "keyword"),
-        rows("my_prometheus", "default", "prometheus_http_requests_total", "@value", "double"),
-        rows("my_prometheus", "default", "prometheus_http_requests_total", "@timestamp",
-            "timestamp"),
-        rows("my_prometheus", "default", "prometheus_http_requests_total", "job", "keyword"));
-  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/ExplainIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/ExplainIT.java
index 1a785e9074..fce975ef92 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/ExplainIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/ExplainIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.util.MatcherUtils.assertJsonEquals;
@@ -35,8 +34,7 @@ public void testExplain() throws Exception {
                 + "| fields - city "
                 + "| eval age2 = avg_age + 2 "
                 + "| dedup age2 "
-                + "| fields age2")
-    );
+                + "| fields age2"));
   }
 
   @Test
@@ -50,8 +48,7 @@ public void testFilterPushDownExplain() throws Exception {
                 + "| where age > 30 "
                 + "| where age < 40 "
                 + "| where balance > 10000 "
-                + "| fields age")
-    );
+                + "| fields age"));
   }
 
   @Test
@@ -63,8 +60,7 @@ public void testFilterAndAggPushDownExplain() throws Exception {
         explainQueryToString(
             "source=opensearch-sql_test_index_account"
                 + "| where age > 30 "
-                + "| stats avg(age) AS avg_age by state, city")
-    );
+                + "| stats avg(age) AS avg_age by state, city"));
   }
 
   @Test
@@ -77,8 +73,7 @@ public void testSortPushDownExplain() throws Exception {
             "source=opensearch-sql_test_index_account"
                 + "| sort age "
                 + "| where age > 30"
-                + "| fields age")
-    );
+                + "| fields age"));
   }
 
   String loadFromFile(String filename) throws Exception {
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/FieldsCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/FieldsCommandIT.java
index 4eb99e8b04..e8a287c80e 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/FieldsCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/FieldsCommandIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
@@ -43,7 +42,9 @@ public void testFieldsWithMultiFields() throws IOException {
     verifyColumn(result, columnName("firstname"), columnName("lastname"));
   }
 
-  @Ignore("Cannot resolve wildcard yet. Enable once https://github.com/opensearch-project/sql/issues/787 is resolved.")
+  @Ignore(
+      "Cannot resolve wildcard yet. Enable once"
+          + " https://github.com/opensearch-project/sql/issues/787 is resolved.")
   @Test
   public void testFieldsWildCard() throws IOException {
     JSONObject result =
@@ -57,14 +58,14 @@ public void testSelectDateTypeField() throws IOException {
         executeQuery(String.format("source=%s | fields birthdate", TEST_INDEX_BANK));
     verifySchema(result, schema("birthdate", null, "timestamp"));
 
-    verifyDataRows(result,
+    verifyDataRows(
+        result,
         rows("2017-10-23 00:00:00"),
         rows("2017-11-20 00:00:00"),
         rows("2018-06-23 00:00:00"),
         rows("2018-11-13 23:33:20"),
         rows("2018-06-27 00:00:00"),
         rows("2018-08-19 00:00:00"),
-        rows("2018-08-11 00:00:00")
-    );
+        rows("2018-08-11 00:00:00"));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/HeadCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/HeadCommandIT.java
index 48c489ce10..8a96620fe0 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/HeadCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/HeadCommandIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
@@ -39,7 +38,8 @@ public void init() throws IOException {
   public void testHead() throws IOException {
     JSONObject result =
         executeQuery(String.format("source=%s | fields firstname, age | head", TEST_INDEX_ACCOUNT));
-    verifyDataRows(result,
+    verifyDataRows(
+        result,
         rows("Amber", 32),
         rows("Hattie", 36),
         rows("Nanette", 28),
@@ -55,11 +55,9 @@ public void testHead() throws IOException {
   @Test
   public void testHeadWithNumber() throws IOException {
     JSONObject result =
-        executeQuery(String.format("source=%s | fields firstname, age | head 3", TEST_INDEX_ACCOUNT));
-    verifyDataRows(result,
-        rows("Amber", 32),
-        rows("Hattie", 36),
-        rows("Nanette", 28));
+        executeQuery(
+            String.format("source=%s | fields firstname, age | head 3", TEST_INDEX_ACCOUNT));
+    verifyDataRows(result, rows("Amber", 32), rows("Hattie", 36), rows("Nanette", 28));
   }
 
   @Ignore("Fix https://github.com/opensearch-project/sql/issues/703#issuecomment-1211422130")
@@ -67,9 +65,10 @@ public void testHeadWithNumber() throws IOException {
   public void testHeadWithNumberLargerThanQuerySizeLimit() throws IOException {
     setQuerySizeLimit(5);
     JSONObject result =
-        executeQuery(String.format(
-            "source=%s | fields firstname, age | head 10", TEST_INDEX_ACCOUNT));
-    verifyDataRows(result,
+        executeQuery(
+            String.format("source=%s | fields firstname, age | head 10", TEST_INDEX_ACCOUNT));
+    verifyDataRows(
+        result,
         rows("Amber", 32),
         rows("Hattie", 36),
         rows("Nanette", 28),
@@ -86,9 +85,10 @@ public void testHeadWithNumberLargerThanQuerySizeLimit() throws IOException {
   public void testHeadWithNumberLargerThanMaxResultWindow() throws IOException {
     setMaxResultWindow(TEST_INDEX_ACCOUNT, 10);
     JSONObject result =
-        executeQuery(String.format(
-            "source=%s | fields firstname, age | head 15", TEST_INDEX_ACCOUNT));
-    verifyDataRows(result,
+        executeQuery(
+            String.format("source=%s | fields firstname, age | head 15", TEST_INDEX_ACCOUNT));
+    verifyDataRows(
+        result,
         rows("Amber", 32),
         rows("Hattie", 36),
         rows("Nanette", 28),
@@ -112,9 +112,10 @@ public void testHeadWithLargeNumber() throws IOException {
     setQuerySizeLimit(5);
     setMaxResultWindow(TEST_INDEX_ACCOUNT, 10);
     JSONObject result =
-        executeQuery(String.format(
-            "source=%s | fields firstname, age | head 15", TEST_INDEX_ACCOUNT));
-    verifyDataRows(result,
+        executeQuery(
+            String.format("source=%s | fields firstname, age | head 15", TEST_INDEX_ACCOUNT));
+    verifyDataRows(
+        result,
         rows("Amber", 32),
         rows("Hattie", 36),
         rows("Nanette", 28),
@@ -135,10 +136,8 @@ public void testHeadWithLargeNumber() throws IOException {
   @Test
   public void testHeadWithNumberAndFrom() throws IOException {
     JSONObject result =
-        executeQuery(String.format("source=%s | fields firstname, age | head 3 from 4", TEST_INDEX_ACCOUNT));
-    verifyDataRows(result,
-        rows("Elinor", 36),
-        rows("Virginia", 39),
-        rows("Dillard", 34));
+        executeQuery(
+            String.format("source=%s | fields firstname, age | head 3 from 4", TEST_INDEX_ACCOUNT));
+    verifyDataRows(result, rows("Elinor", 36), rows("Virginia", 39), rows("Dillard", 34));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/InformationSchemaCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/InformationSchemaCommandIT.java
index 3f9191c9c9..71222cbd6e 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/InformationSchemaCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/InformationSchemaCommandIT.java
@@ -12,17 +12,58 @@
 import static org.opensearch.sql.util.MatcherUtils.verifyColumn;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 
+import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.BeforeClass;
 import org.junit.jupiter.api.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.Response;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
 
 public class InformationSchemaCommandIT extends PPLIntegTestCase {
 
+  /**
+   * Integ tests are dependent on self generated metrics in prometheus instance. When running
+   * individual integ tests there is no time for generation of metrics in the test prometheus
+   * instance. This method gives prometheus time to generate metrics on itself.
+   *
+   * @throws InterruptedException
+   */
+  @BeforeClass
+  protected static void metricGenerationWait() throws InterruptedException {
+    Thread.sleep(10000);
+  }
+
+  @Override
+  protected void init() throws InterruptedException, IOException {
+    DataSourceMetadata createDSM =
+        new DataSourceMetadata.Builder()
+            .setName("my_prometheus")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(ImmutableMap.of("prometheus.uri", "http://localhost:9090"))
+            .build();
+    Request createRequest = getCreateDataSourceRequest(createDSM);
+    Response response = client().performRequest(createRequest);
+    Assert.assertEquals(201, response.getStatusLine().getStatusCode());
+  }
+
+  @After
+  protected void deleteDataSourceMetadata() throws IOException {
+    Request deleteRequest = getDeleteDataSourceRequest("my_prometheus");
+    Response deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+  }
+
   @Test
   public void testSearchTablesFromPrometheusCatalog() throws IOException {
     JSONObject result =
-        executeQuery("source=my_prometheus.information_schema.tables "
-            + "| where LIKE(TABLE_NAME, '%http%')");
+        executeQuery(
+            "source=my_prometheus.information_schema.tables "
+                + "| where LIKE(TABLE_NAME, '%http%')");
     this.logger.error(result.toString());
     verifyColumn(
         result,
@@ -31,24 +72,53 @@ public void testSearchTablesFromPrometheusCatalog() throws IOException {
         columnName("TABLE_NAME"),
         columnName("TABLE_TYPE"),
         columnName("UNIT"),
-        columnName("REMARKS")
-    );
-    verifyDataRows(result,
-        rows("my_prometheus", "default", "promhttp_metric_handler_requests_in_flight",
-            "gauge", "", "Current number of scrapes being served."),
-        rows("my_prometheus", "default", "prometheus_sd_http_failures_total",
-            "counter", "", "Number of HTTP service discovery refresh failures."),
-        rows("my_prometheus", "default", "promhttp_metric_handler_requests_total",
-            "counter", "", "Total number of scrapes by HTTP status code."),
-        rows("my_prometheus", "default", "prometheus_http_request_duration_seconds",
-            "histogram", "", "Histogram of latencies for HTTP requests."),
-        rows("my_prometheus", "default", "prometheus_http_requests_total",
-            "counter", "", "Counter of HTTP requests."),
-        rows("my_prometheus", "default", "prometheus_http_response_size_bytes",
-            "histogram", "", "Histogram of response size for HTTP requests."));
+        columnName("REMARKS"));
+    verifyDataRows(
+        result,
+        rows(
+            "my_prometheus",
+            "default",
+            "promhttp_metric_handler_requests_in_flight",
+            "gauge",
+            "",
+            "Current number of scrapes being served."),
+        rows(
+            "my_prometheus",
+            "default",
+            "prometheus_sd_http_failures_total",
+            "counter",
+            "",
+            "Number of HTTP service discovery refresh failures."),
+        rows(
+            "my_prometheus",
+            "default",
+            "promhttp_metric_handler_requests_total",
+            "counter",
+            "",
+            "Total number of scrapes by HTTP status code."),
+        rows(
+            "my_prometheus",
+            "default",
+            "prometheus_http_request_duration_seconds",
+            "histogram",
+            "",
+            "Histogram of latencies for HTTP requests."),
+        rows(
+            "my_prometheus",
+            "default",
+            "prometheus_http_requests_total",
+            "counter",
+            "",
+            "Counter of HTTP requests."),
+        rows(
+            "my_prometheus",
+            "default",
+            "prometheus_http_response_size_bytes",
+            "histogram",
+            "",
+            "Histogram of response size for HTTP requests."));
   }
 
-
   @Test
   public void testTablesFromPrometheusCatalog() throws IOException {
     JSONObject result =
@@ -63,12 +133,41 @@ public void testTablesFromPrometheusCatalog() throws IOException {
         columnName("TABLE_NAME"),
         columnName("TABLE_TYPE"),
         columnName("UNIT"),
-        columnName("REMARKS")
-    );
-    verifyDataRows(result,
-        rows("my_prometheus",
-            "default", "prometheus_http_requests_total",
-            "counter", "", "Counter of HTTP requests."));
+        columnName("REMARKS"));
+    verifyDataRows(
+        result,
+        rows(
+            "my_prometheus",
+            "default",
+            "prometheus_http_requests_total",
+            "counter",
+            "",
+            "Counter of HTTP requests."));
   }
 
+  // Moved this IT from DescribeCommandIT to segregate Datasource Integ Tests.
+  @Test
+  public void testDescribeCommandWithPrometheusCatalog() throws IOException {
+    JSONObject result = executeQuery("describe  my_prometheus.prometheus_http_requests_total");
+    verifyColumn(
+        result,
+        columnName("TABLE_CATALOG"),
+        columnName("TABLE_SCHEMA"),
+        columnName("TABLE_NAME"),
+        columnName("COLUMN_NAME"),
+        columnName("DATA_TYPE"));
+    verifyDataRows(
+        result,
+        rows("my_prometheus", "default", "prometheus_http_requests_total", "handler", "keyword"),
+        rows("my_prometheus", "default", "prometheus_http_requests_total", "code", "keyword"),
+        rows("my_prometheus", "default", "prometheus_http_requests_total", "instance", "keyword"),
+        rows("my_prometheus", "default", "prometheus_http_requests_total", "@value", "double"),
+        rows(
+            "my_prometheus",
+            "default",
+            "prometheus_http_requests_total",
+            "@timestamp",
+            "timestamp"),
+        rows("my_prometheus", "default", "prometheus_http_requests_total", "job", "keyword"));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/LegacyAPICompatibilityIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/LegacyAPICompatibilityIT.java
index 4bf9a37a9f..c14b9baa35 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/LegacyAPICompatibilityIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/LegacyAPICompatibilityIT.java
@@ -16,9 +16,7 @@
 import org.opensearch.client.RequestOptions;
 import org.opensearch.client.Response;
 
-/**
- * For backward compatibility, check if legacy API endpoints are accessible.
- */
+/** For backward compatibility, check if legacy API endpoints are accessible. */
 public class LegacyAPICompatibilityIT extends PPLIntegTestCase {
 
   @Override
@@ -51,22 +49,20 @@ public void stats() throws IOException {
 
   @Test
   public void legacySettingNewEndpoint() throws IOException {
-    String requestBody = "{"
-        + "  \"persistent\": {"
-        + "    \"opendistro.ppl.query.memory_limit\": \"80%\""
-        + "  }"
-        + "}";
+    String requestBody =
+        "{"
+            + "  \"persistent\": {"
+            + "    \"opendistro.ppl.query.memory_limit\": \"80%\""
+            + "  }"
+            + "}";
     Response response = updateSetting(SETTINGS_API_ENDPOINT, requestBody);
     Assert.assertEquals(200, response.getStatusLine().getStatusCode());
   }
 
   @Test
   public void newSettingNewEndpoint() throws IOException {
-    String requestBody = "{"
-        + "  \"persistent\": {"
-        + "    \"plugins.query.size_limit\": \"100\""
-        + "  }"
-        + "}";
+    String requestBody =
+        "{" + "  \"persistent\": {" + "    \"plugins.query.size_limit\": \"100\"" + "  }" + "}";
     Response response = updateSetting(SETTINGS_API_ENDPOINT, requestBody);
     Assert.assertEquals(200, response.getStatusLine().getStatusCode());
   }
@@ -83,5 +79,4 @@ private RequestOptions.Builder buildJsonOption() {
     restOptionsBuilder.addHeader("Content-Type", "application/json");
     return restOptionsBuilder;
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/LikeQueryIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/LikeQueryIT.java
index 67ad553689..75dd6aa268 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/LikeQueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/LikeQueryIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_WILDCARD;
@@ -23,9 +22,13 @@ public void init() throws IOException {
 
   @Test
   public void test_like_with_percent() throws IOException {
-    String query = "source=" + TEST_INDEX_WILDCARD + " | WHERE Like(KeywordBody, 'test wildcard%') | fields KeywordBody";
+    String query =
+        "source="
+            + TEST_INDEX_WILDCARD
+            + " | WHERE Like(KeywordBody, 'test wildcard%') | fields KeywordBody";
     JSONObject result = executeQuery(query);
-    verifyDataRows(result,
+    verifyDataRows(
+        result,
         rows("test wildcard"),
         rows("test wildcard in the end of the text%"),
         rows("test wildcard in % the middle of the text"),
@@ -37,51 +40,66 @@ public void test_like_with_percent() throws IOException {
 
   @Test
   public void test_like_with_escaped_percent() throws IOException {
-    String query = "source=" + TEST_INDEX_WILDCARD + " | WHERE Like(KeywordBody, '\\\\%test wildcard%') | fields KeywordBody";
+    String query =
+        "source="
+            + TEST_INDEX_WILDCARD
+            + " | WHERE Like(KeywordBody, '\\\\%test wildcard%') | fields KeywordBody";
     JSONObject result = executeQuery(query);
-    verifyDataRows(result,
-        rows("%test wildcard in the beginning of the text"));
+    verifyDataRows(result, rows("%test wildcard in the beginning of the text"));
   }
 
   @Test
   public void test_like_in_where_with_escaped_underscore() throws IOException {
-    String query = "source=" + TEST_INDEX_WILDCARD + " | WHERE Like(KeywordBody, '\\\\_test wildcard%') | fields KeywordBody";
+    String query =
+        "source="
+            + TEST_INDEX_WILDCARD
+            + " | WHERE Like(KeywordBody, '\\\\_test wildcard%') | fields KeywordBody";
     JSONObject result = executeQuery(query);
-    verifyDataRows(result,
-        rows("_test wildcard in the beginning of the text"));
+    verifyDataRows(result, rows("_test wildcard in the beginning of the text"));
   }
 
   @Test
   public void test_like_on_text_field_with_one_word() throws IOException {
-    String query = "source=" + TEST_INDEX_WILDCARD + " | WHERE Like(TextBody, 'test*') | fields TextBody";
+    String query =
+        "source=" + TEST_INDEX_WILDCARD + " | WHERE Like(TextBody, 'test*') | fields TextBody";
     JSONObject result = executeQuery(query);
     assertEquals(9, result.getInt("total"));
   }
 
   @Test
   public void test_like_on_text_keyword_field_with_one_word() throws IOException {
-    String query = "source=" + TEST_INDEX_WILDCARD + " | WHERE Like(TextKeywordBody, 'test*') | fields TextKeywordBody";
+    String query =
+        "source="
+            + TEST_INDEX_WILDCARD
+            + " | WHERE Like(TextKeywordBody, 'test*') | fields TextKeywordBody";
     JSONObject result = executeQuery(query);
     assertEquals(8, result.getInt("total"));
   }
 
   @Test
   public void test_like_on_text_keyword_field_with_greater_than_one_word() throws IOException {
-    String query = "source=" + TEST_INDEX_WILDCARD + " | WHERE Like(TextKeywordBody, 'test wild*') | fields TextKeywordBody";
+    String query =
+        "source="
+            + TEST_INDEX_WILDCARD
+            + " | WHERE Like(TextKeywordBody, 'test wild*') | fields TextKeywordBody";
     JSONObject result = executeQuery(query);
     assertEquals(7, result.getInt("total"));
   }
 
   @Test
   public void test_like_on_text_field_with_greater_than_one_word() throws IOException {
-    String query = "source=" + TEST_INDEX_WILDCARD + " | WHERE Like(TextBody, 'test wild*') | fields TextBody";
+    String query =
+        "source=" + TEST_INDEX_WILDCARD + " | WHERE Like(TextBody, 'test wild*') | fields TextBody";
     JSONObject result = executeQuery(query);
     assertEquals(0, result.getInt("total"));
   }
 
   @Test
   public void test_convert_field_text_to_keyword() throws IOException {
-    String query = "source=" + TEST_INDEX_WILDCARD + " | WHERE Like(TextKeywordBody, '*') | fields TextKeywordBody";
+    String query =
+        "source="
+            + TEST_INDEX_WILDCARD
+            + " | WHERE Like(TextKeywordBody, '*') | fields TextKeywordBody";
     String result = explainQueryToString(query);
     assertTrue(result.contains("TextKeywordBody.keyword"));
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/MatchBoolPrefixIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/MatchBoolPrefixIT.java
index 42ba8bea53..67e6fac04d 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/MatchBoolPrefixIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/MatchBoolPrefixIT.java
@@ -28,9 +28,7 @@ public void valid_query_match_test() throws IOException {
                 "source=%s | where match_bool_prefix(phrase, 'qui') | fields phrase",
                 TEST_INDEX_PHRASE));
 
-    verifyDataRows(result,
-        rows("quick fox"),
-        rows("quick fox here"));
+    verifyDataRows(result, rows("quick fox"), rows("quick fox here"));
   }
 
   @Test
@@ -38,12 +36,11 @@ public void optional_parameter_match_test() throws IOException {
     JSONObject result =
         executeQuery(
             String.format(
-                "source=%s | where match_bool_prefix(phrase, '2 tes', minimum_should_match=1, fuzziness=2) | fields phrase",
+                "source=%s | where match_bool_prefix(phrase, '2 tes', minimum_should_match=1,"
+                    + " fuzziness=2) | fields phrase",
                 TEST_INDEX_PHRASE));
 
-    verifyDataRows(result,
-        rows("my test"),
-        rows("my test 2"));
+    verifyDataRows(result, rows("my test"), rows("my test 2"));
   }
 
   @Test
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/MatchIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/MatchIT.java
index 808be2334d..908f7a621c 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/MatchIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/MatchIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/MatchPhraseIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/MatchPhraseIT.java
index 5b9fd07e31..5efc2108b9 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/MatchPhraseIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/MatchPhraseIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_PHRASE;
@@ -12,8 +11,6 @@
 
 import java.io.IOException;
 import org.json.JSONObject;
-import org.junit.Ignore;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class MatchPhraseIT extends PPLIntegTestCase {
@@ -26,18 +23,20 @@ public void init() throws IOException {
   @Test
   public void test_match_phrase_function() throws IOException {
     JSONObject result =
-            executeQuery(
-                    String.format(
-                            "source=%s | where match_phrase(phrase, 'quick fox') | fields phrase", TEST_INDEX_PHRASE));
+        executeQuery(
+            String.format(
+                "source=%s | where match_phrase(phrase, 'quick fox') | fields phrase",
+                TEST_INDEX_PHRASE));
     verifyDataRows(result, rows("quick fox"), rows("quick fox here"));
   }
 
   @Test
   public void test_match_phrase_with_slop() throws IOException {
     JSONObject result =
-            executeQuery(
-                    String.format(
-                            "source=%s | where match_phrase(phrase, 'brown fox', slop = 2) | fields phrase", TEST_INDEX_PHRASE));
+        executeQuery(
+            String.format(
+                "source=%s | where match_phrase(phrase, 'brown fox', slop = 2) | fields phrase",
+                TEST_INDEX_PHRASE));
     verifyDataRows(result, rows("brown fox"), rows("fox brown"));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/MatchPhrasePrefixIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/MatchPhrasePrefixIT.java
index 0f827692a5..e9e9aa5cae 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/MatchPhrasePrefixIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/MatchPhrasePrefixIT.java
@@ -24,46 +24,48 @@ public void init() throws IOException {
   public void required_parameters() throws IOException {
     String query = "source = %s | WHERE match_phrase_prefix(Title, 'champagne be') | fields Title";
     JSONObject result = executeQuery(String.format(query, TEST_INDEX_BEER));
-    verifyDataRows(result,
+    verifyDataRows(
+        result,
         rows("Can old flat champagne be used for vinegar?"),
         rows("Elder flower champagne best to use natural yeast or add a wine yeast?"));
   }
 
-
   @Test
   public void all_optional_parameters() throws IOException {
     // The values for optional parameters are valid but arbitrary.
-    String query = "source = %s " +
-        "| WHERE match_phrase_prefix(Title, 'flat champ', boost = 1.0, " +
-        "zero_terms_query='ALL', max_expansions = 2, analyzer=standard, slop=0) " +
-        "| fields Title";
+    String query =
+        "source = %s "
+            + "| WHERE match_phrase_prefix(Title, 'flat champ', boost = 1.0, "
+            + "zero_terms_query='ALL', max_expansions = 2, analyzer=standard, slop=0) "
+            + "| fields Title";
     JSONObject result = executeQuery(String.format(query, TEST_INDEX_BEER));
     verifyDataRows(result, rows("Can old flat champagne be used for vinegar?"));
   }
 
-
   @Test
   public void max_expansions_is_3() throws IOException {
     // max_expansions applies to the last term in the query -- 'bottl'
     // It tells OpenSearch to consider only the first 3 terms that start with 'bottl'
     // In this dataset these are 'bottle-conditioning', 'bottling', 'bottles'.
 
-    String query = "source = %s " +
-        "| WHERE match_phrase_prefix(Tags, 'draught bottl', max_expansions=3) | fields Tags";
+    String query =
+        "source = %s "
+            + "| WHERE match_phrase_prefix(Tags, 'draught bottl', max_expansions=3) | fields Tags";
     JSONObject result = executeQuery(String.format(query, TEST_INDEX_BEER));
-    verifyDataRows(result, rows("brewing draught bottling"),
-        rows("draught bottles"));
+    verifyDataRows(result, rows("brewing draught bottling"), rows("draught bottles"));
   }
 
   @Test
   public void analyzer_english() throws IOException {
     // English analyzer removes 'in' and 'to' as they are common words.
     // This results in an empty query.
-    String query = "source = %s " +
-        "| WHERE match_phrase_prefix(Title, 'in to', analyzer=english)" +
-        "| fields Title";
+    String query =
+        "source = %s "
+            + "| WHERE match_phrase_prefix(Title, 'in to', analyzer=english)"
+            + "| fields Title";
     JSONObject result = executeQuery(String.format(query, TEST_INDEX_BEER));
-    assertTrue("Expect English analyzer to filter out common words 'in' and 'to'",
+    assertTrue(
+        "Expect English analyzer to filter out common words 'in' and 'to'",
         result.getInt("total") == 0);
   }
 
@@ -71,9 +73,10 @@ public void analyzer_english() throws IOException {
   public void analyzer_standard() throws IOException {
     // Standard analyzer does not treat 'in' and 'to' as special terms.
     // This results in 'to' being used as a phrase prefix given us 'Tokyo'.
-    String query = "source = %s " +
-        "| WHERE match_phrase_prefix(Title, 'in to', analyzer=standard)" +
-        "| fields Title";
+    String query =
+        "source = %s "
+            + "| WHERE match_phrase_prefix(Title, 'in to', analyzer=standard)"
+            + "| fields Title";
     JSONObject result = executeQuery(String.format(query, TEST_INDEX_BEER));
     verifyDataRows(result, rows("Local microbreweries and craft beer in Tokyo"));
   }
@@ -83,21 +86,19 @@ public void zero_term_query_all() throws IOException {
     // English analyzer removes 'in' and 'to' as they are common words.
     // zero_terms_query of 'ALL' causes all rows to be returned.
     // ORDER BY ... LIMIT helps make the test understandable.
-    String query = "source = %s" +
-        "| WHERE match_phrase_prefix(Title, 'in to', analyzer=english, zero_terms_query='ALL') " +
-        "| sort -Title | head 1 | fields Title";
+    String query =
+        "source = %s| WHERE match_phrase_prefix(Title, 'in to', analyzer=english,"
+            + " zero_terms_query='ALL') | sort -Title | head 1 | fields Title";
     JSONObject result = executeQuery(String.format(query, TEST_INDEX_BEER));
     verifyDataRows(result, rows("was working great, now all foam"));
   }
 
-
   @Test
   public void slop_is_2() throws IOException {
     // When slop is 2, the terms are matched exactly in the order specified.
     // 'open' is used to match prefix of the next term.
-    String query = "source = %s" +
-        "| where match_phrase_prefix(Tags, 'gas ta', slop=2) " +
-        "| fields Tags";
+    String query =
+        "source = %s" + "| where match_phrase_prefix(Tags, 'gas ta', slop=2) " + "| fields Tags";
     JSONObject result = executeQuery(String.format(query, TEST_INDEX_BEER));
     verifyDataRows(result, rows("taste gas"));
   }
@@ -105,12 +106,9 @@ public void slop_is_2() throws IOException {
   @Test
   public void slop_is_3() throws IOException {
     // When slop is 3, results will include phrases where the query terms are transposed.
-    String query = "source = %s" +
-        "| where match_phrase_prefix(Tags, 'gas ta', slop=3)" +
-        "| fields Tags";
+    String query =
+        "source = %s" + "| where match_phrase_prefix(Tags, 'gas ta', slop=3)" + "| fields Tags";
     JSONObject result = executeQuery(String.format(query, TEST_INDEX_BEER));
-    verifyDataRows(result,
-        rows("taste draught gas"),
-        rows("taste gas"));
+    verifyDataRows(result, rows("taste draught gas"), rows("taste gas"));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/MathematicalFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/MathematicalFunctionIT.java
index f6fe93dc5f..2d6a52c12b 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/MathematicalFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/MathematicalFunctionIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
@@ -31,138 +30,146 @@ public void init() throws IOException {
   @Test
   public void testAbs() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = abs(age) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = abs(age) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "integer"));
-    verifyDataRows(
-        result,
-        rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
+    verifyDataRows(result, rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
   }
 
   @Test
   public void testCeil() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = ceil(age) | fields f", TEST_INDEX_BANK));
-    verifySchema(result, schema("f", null, "integer"));
-    verifyDataRows(
-        result,
-        rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
+        executeQuery(String.format("source=%s | eval f = ceil(age) | fields f", TEST_INDEX_BANK));
+    verifySchema(result, schema("f", null, "long"));
+    verifyDataRows(result, rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
   }
 
   @Test
   public void testCeiling() throws IOException {
     JSONObject result =
         executeQuery(
-            String.format(
-                "source=%s | eval f = ceiling(age) | fields f", TEST_INDEX_BANK));
-    verifySchema(result, schema("f", null, "integer"));
-    verifyDataRows(
-        result,
-        rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
+            String.format("source=%s | eval f = ceiling(age) | fields f", TEST_INDEX_BANK));
+    verifySchema(result, schema("f", null, "long"));
+    verifyDataRows(result, rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
   }
 
   @Test
   public void testE() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = e() | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = e() | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifyDataRows(
-        result, rows(Math.E), rows(Math.E), rows(Math.E), rows(Math.E),
-        rows(Math.E), rows(Math.E), rows(Math.E));
+        result,
+        rows(Math.E),
+        rows(Math.E),
+        rows(Math.E),
+        rows(Math.E),
+        rows(Math.E),
+        rows(Math.E),
+        rows(Math.E));
   }
 
   @Test
   public void testExp() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = exp(age) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = exp(age) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifyDataRows(
-        result, rows(Math.exp(32)), rows(Math.exp(36)), rows(Math.exp(28)), rows(Math.exp(33)),
-        rows(Math.exp(36)), rows(Math.exp(39)), rows(Math.exp(34)));
+        result,
+        rows(Math.exp(32)),
+        rows(Math.exp(36)),
+        rows(Math.exp(28)),
+        rows(Math.exp(33)),
+        rows(Math.exp(36)),
+        rows(Math.exp(39)),
+        rows(Math.exp(34)));
   }
 
   @Test
   public void testFloor() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = floor(age) | fields f", TEST_INDEX_BANK));
-    verifySchema(result, schema("f", null, "integer"));
-    verifyDataRows(
-        result,
-        rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
+        executeQuery(String.format("source=%s | eval f = floor(age) | fields f", TEST_INDEX_BANK));
+    verifySchema(result, schema("f", null, "long"));
+    verifyDataRows(result, rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
   }
 
   @Test
   public void testLn() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = ln(age) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = ln(age) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifyDataRows(
-        result, rows(Math.log(32)), rows(Math.log(36)), rows(Math.log(28)), rows(Math.log(33)),
-        rows(Math.log(36)), rows(Math.log(39)), rows(Math.log(34)));
+        result,
+        rows(Math.log(32)),
+        rows(Math.log(36)),
+        rows(Math.log(28)),
+        rows(Math.log(33)),
+        rows(Math.log(36)),
+        rows(Math.log(39)),
+        rows(Math.log(34)));
   }
 
   @Test
   public void testLogOneArg() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = log(age) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = log(age) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
-    verifyDataRows(result,
-        rows(Math.log(28)), rows(Math.log(32)), rows(Math.log(33)), rows(Math.log(34)),
-        rows(Math.log(36)), rows(Math.log(36)), rows(Math.log(39))
-    );
+    verifyDataRows(
+        result,
+        rows(Math.log(28)),
+        rows(Math.log(32)),
+        rows(Math.log(33)),
+        rows(Math.log(34)),
+        rows(Math.log(36)),
+        rows(Math.log(36)),
+        rows(Math.log(39)));
   }
 
   @Test
   public void testLogTwoArgs() throws IOException {
     JSONObject result =
         executeQuery(
-            String.format(
-                "source=%s | eval f = log(age, balance) | fields f", TEST_INDEX_BANK));
+            String.format("source=%s | eval f = log(age, balance) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifyDataRows(
-        result, closeTo(Math.log(39225) / Math.log(32)), closeTo(Math.log(5686) / Math.log(36)),
-        closeTo(Math.log(32838) / Math.log(28)), closeTo(Math.log(4180) / Math.log(33)),
-        closeTo(Math.log(16418) / Math.log(36)), closeTo(Math.log(40540) / Math.log(39)),
+        result,
+        closeTo(Math.log(39225) / Math.log(32)),
+        closeTo(Math.log(5686) / Math.log(36)),
+        closeTo(Math.log(32838) / Math.log(28)),
+        closeTo(Math.log(4180) / Math.log(33)),
+        closeTo(Math.log(16418) / Math.log(36)),
+        closeTo(Math.log(40540) / Math.log(39)),
         closeTo(Math.log(48086) / Math.log(34)));
   }
 
   @Test
   public void testLog10() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = log10(age) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = log10(age) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifyDataRows(
-        result, rows(Math.log10(32)), rows(Math.log10(36)), rows(Math.log10(28)),
-        rows(Math.log10(33)), rows(Math.log10(36)), rows(Math.log10(39)), rows(Math.log10(34)));
+        result,
+        rows(Math.log10(32)),
+        rows(Math.log10(36)),
+        rows(Math.log10(28)),
+        rows(Math.log10(33)),
+        rows(Math.log10(36)),
+        rows(Math.log10(39)),
+        rows(Math.log10(34)));
   }
 
   @Test
   public void testLog2() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = log2(age) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = log2(age) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifyDataRows(
         result,
-        closeTo(Math.log(32) / Math.log(2)), closeTo(Math.log(36) / Math.log(2)),
-        closeTo(Math.log(28) / Math.log(2)), closeTo(Math.log(33) / Math.log(2)),
-        closeTo(Math.log(36) / Math.log(2)), closeTo(Math.log(39) / Math.log(2)),
+        closeTo(Math.log(32) / Math.log(2)),
+        closeTo(Math.log(36) / Math.log(2)),
+        closeTo(Math.log(28) / Math.log(2)),
+        closeTo(Math.log(33) / Math.log(2)),
+        closeTo(Math.log(36) / Math.log(2)),
+        closeTo(Math.log(39) / Math.log(2)),
         closeTo(Math.log(34) / Math.log(2)));
   }
 
@@ -170,168 +177,178 @@ public void testLog2() throws IOException {
   public void testConv() throws IOException {
     JSONObject result =
         executeQuery(
-            String.format(
-                "source=%s | eval f = conv(age, 10, 16) | fields f", TEST_INDEX_BANK));
+            String.format("source=%s | eval f = conv(age, 10, 16) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "string"));
     verifyDataRows(
-        result, rows("20"), rows("24"), rows("1c"), rows("21"),
-        rows("24"), rows("27"), rows("22"));
+        result, rows("20"), rows("24"), rows("1c"), rows("21"), rows("24"), rows("27"), rows("22"));
   }
 
   @Test
   public void testCrc32() throws IOException {
     JSONObject result =
         executeQuery(
-            String.format(
-                "source=%s | eval f = crc32(firstname) | fields f", TEST_INDEX_BANK));
+            String.format("source=%s | eval f = crc32(firstname) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "long"));
     verifyDataRows(
-        result, rows(324249283), rows(3369714977L), rows(1165568529), rows(2293694493L),
-        rows(3936131563L), rows(256963594), rows(824319315));
+        result,
+        rows(324249283),
+        rows(3369714977L),
+        rows(1165568529),
+        rows(2293694493L),
+        rows(3936131563L),
+        rows(256963594),
+        rows(824319315));
   }
 
   @Test
   public void testMod() throws IOException {
     JSONObject result =
         executeQuery(
-            String.format(
-                "source=%s | eval f = mod(age, 10) | fields f", TEST_INDEX_BANK));
+            String.format("source=%s | eval f = mod(age, 10) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "integer"));
-    verifyDataRows(
-        result, rows(2), rows(6), rows(8), rows(3), rows(6), rows(9), rows(4));
+    verifyDataRows(result, rows(2), rows(6), rows(8), rows(3), rows(6), rows(9), rows(4));
   }
 
   @Test
   public void testPow() throws IOException {
     JSONObject pow =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = pow(age, 2) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = pow(age, 2) | fields f", TEST_INDEX_BANK));
     verifySchema(pow, schema("f", null, "double"));
     verifyDataRows(
-        pow, rows(1024.0), rows(1296.0), rows(784.0), rows(1089.0), rows(1296.0), rows(1521.0), rows(1156.0));
+        pow,
+        rows(1024.0),
+        rows(1296.0),
+        rows(784.0),
+        rows(1089.0),
+        rows(1296.0),
+        rows(1521.0),
+        rows(1156.0));
 
     JSONObject power =
         executeQuery(
-            String.format(
-                "source=%s | eval f = power(age, 2) | fields f", TEST_INDEX_BANK));
+            String.format("source=%s | eval f = power(age, 2) | fields f", TEST_INDEX_BANK));
     verifySchema(power, schema("f", null, "double"));
     verifyDataRows(
-        power, rows(1024.0), rows(1296.0), rows(784.0), rows(1089.0), rows(1296.0), rows(1521.0), rows(1156.0));
-
+        power,
+        rows(1024.0),
+        rows(1296.0),
+        rows(784.0),
+        rows(1089.0),
+        rows(1296.0),
+        rows(1521.0),
+        rows(1156.0));
   }
 
   @Test
   public void testRound() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = round(age) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = round(age) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "long"));
-    verifyDataRows(result,
-        rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
+    verifyDataRows(result, rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
 
     result =
         executeQuery(
-            String.format(
-                "source=%s | eval f = round(age, -1) | fields f", TEST_INDEX_BANK));
+            String.format("source=%s | eval f = round(age, -1) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "long"));
-    verifyDataRows(result,
-        rows(30), rows(40), rows(30), rows(30), rows(40), rows(40), rows(30));
+    verifyDataRows(result, rows(30), rows(40), rows(30), rows(30), rows(40), rows(40), rows(30));
   }
 
   @Test
   public void testSign() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = sign(age) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = sign(age) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "integer"));
-    verifyDataRows(
-        result, rows(1), rows(1), rows(1), rows(1), rows(1), rows(1), rows(1));
+    verifyDataRows(result, rows(1), rows(1), rows(1), rows(1), rows(1), rows(1), rows(1));
   }
 
   @Test
   public void testSqrt() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = sqrt(age) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = sqrt(age) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
-    verifyDataRows(result,
-        rows(5.656854249492381), rows(6.0), rows(5.291502622129181),
-        rows(5.744562646538029), rows(6.0), rows(6.244997998398398),
+    verifyDataRows(
+        result,
+        rows(5.656854249492381),
+        rows(6.0),
+        rows(5.291502622129181),
+        rows(5.744562646538029),
+        rows(6.0),
+        rows(6.244997998398398),
         rows(5.830951894845301));
   }
 
   @Test
   public void testCbrt() throws IOException {
     JSONObject result =
-        executeQuery(
-                String.format(
-                        "source=%s | eval f = cbrt(num3) | fields f", TEST_INDEX_CALCS));
+        executeQuery(String.format("source=%s | eval f = cbrt(num3) | fields f", TEST_INDEX_CALCS));
     verifySchema(result, schema("f", null, "double"));
-    verifyDataRows(result,
-            closeTo(Math.cbrt(-11.52)), closeTo(Math.cbrt(-9.31)), closeTo(Math.cbrt(-12.17)),
-            closeTo(Math.cbrt(-7.25)), closeTo(Math.cbrt(12.93)), closeTo(Math.cbrt(-19.96)),
-            closeTo(Math.cbrt(10.93)), closeTo(Math.cbrt(3.64)), closeTo(Math.cbrt(-13.38)),
-            closeTo(Math.cbrt(-10.56)), closeTo(Math.cbrt(-4.79)), closeTo(Math.cbrt(-10.81)),
-            closeTo(Math.cbrt(-6.62)), closeTo(Math.cbrt(-18.43)), closeTo(Math.cbrt(6.84)),
-            closeTo(Math.cbrt(-10.98)), closeTo(Math.cbrt(-2.6)));
+    verifyDataRows(
+        result,
+        closeTo(Math.cbrt(-11.52)),
+        closeTo(Math.cbrt(-9.31)),
+        closeTo(Math.cbrt(-12.17)),
+        closeTo(Math.cbrt(-7.25)),
+        closeTo(Math.cbrt(12.93)),
+        closeTo(Math.cbrt(-19.96)),
+        closeTo(Math.cbrt(10.93)),
+        closeTo(Math.cbrt(3.64)),
+        closeTo(Math.cbrt(-13.38)),
+        closeTo(Math.cbrt(-10.56)),
+        closeTo(Math.cbrt(-4.79)),
+        closeTo(Math.cbrt(-10.81)),
+        closeTo(Math.cbrt(-6.62)),
+        closeTo(Math.cbrt(-18.43)),
+        closeTo(Math.cbrt(6.84)),
+        closeTo(Math.cbrt(-10.98)),
+        closeTo(Math.cbrt(-2.6)));
   }
 
   @Test
   public void testTruncate() throws IOException {
     JSONObject result =
         executeQuery(
-            String.format(
-                "source=%s | eval f = truncate(age, 1) | fields f", TEST_INDEX_BANK));
+            String.format("source=%s | eval f = truncate(age, 1) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "long"));
-    verifyDataRows(result,
-        rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
+    verifyDataRows(result, rows(32), rows(36), rows(28), rows(33), rows(36), rows(39), rows(34));
 
     result =
         executeQuery(
-            String.format(
-                "source=%s | eval f = truncate(age, -1) | fields f", TEST_INDEX_BANK));
+            String.format("source=%s | eval f = truncate(age, -1) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "long"));
-    verifyDataRows(result,
-        rows(30), rows(30), rows(20), rows(30), rows(30), rows(30), rows(30));
+    verifyDataRows(result, rows(30), rows(30), rows(20), rows(30), rows(30), rows(30), rows(30));
   }
 
   @Test
   public void testPi() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = pi() | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = pi() | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifyDataRows(
-        result, rows(Math.PI), rows(Math.PI), rows(Math.PI), rows(Math.PI),
-        rows(Math.PI), rows(Math.PI), rows(Math.PI));
+        result,
+        rows(Math.PI),
+        rows(Math.PI),
+        rows(Math.PI),
+        rows(Math.PI),
+        rows(Math.PI),
+        rows(Math.PI),
+        rows(Math.PI));
   }
 
   @Test
   public void testRand() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = rand() | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = rand() | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "float"));
 
     result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = rand(5) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = rand(5) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "float"));
   }
 
   @Test
   public void testAcos() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = acos(0) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = acos(0) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifySome(result.getJSONArray("datarows"), rows(Math.acos(0)));
   }
@@ -339,9 +356,7 @@ public void testAcos() throws IOException {
   @Test
   public void testAsin() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = asin(1) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = asin(1) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifySome(result.getJSONArray("datarows"), rows(Math.asin(1)));
   }
@@ -349,16 +364,12 @@ public void testAsin() throws IOException {
   @Test
   public void testAtan() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = atan(2) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = atan(2) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifySome(result.getJSONArray("datarows"), rows(Math.atan(2)));
 
     result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = atan(2, 3) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = atan(2, 3) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifySome(result.getJSONArray("datarows"), rows(Math.atan2(2, 3)));
   }
@@ -366,9 +377,7 @@ public void testAtan() throws IOException {
   @Test
   public void testAtan2() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = atan2(2, 3) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = atan2(2, 3) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifySome(result.getJSONArray("datarows"), rows(Math.atan2(2, 3)));
   }
@@ -376,9 +385,7 @@ public void testAtan2() throws IOException {
   @Test
   public void testCos() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = cos(1.57) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = cos(1.57) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifySome(result.getJSONArray("datarows"), rows(Math.cos(1.57)));
   }
@@ -386,9 +393,7 @@ public void testCos() throws IOException {
   @Test
   public void testCot() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = cot(2) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = cot(2) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifySome(result.getJSONArray("datarows"), closeTo(1 / Math.tan(2)));
   }
@@ -397,8 +402,7 @@ public void testCot() throws IOException {
   public void testDegrees() throws IOException {
     JSONObject result =
         executeQuery(
-            String.format(
-                "source=%s | eval f = degrees(1.57) | fields f", TEST_INDEX_BANK));
+            String.format("source=%s | eval f = degrees(1.57) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifySome(result.getJSONArray("datarows"), rows(Math.toDegrees(1.57)));
   }
@@ -406,9 +410,7 @@ public void testDegrees() throws IOException {
   @Test
   public void testRadians() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = radians(90) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = radians(90) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifySome(result.getJSONArray("datarows"), rows(Math.toRadians(90)));
   }
@@ -416,9 +418,7 @@ public void testRadians() throws IOException {
   @Test
   public void testSin() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | eval f = sin(1.57) | fields f", TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | eval f = sin(1.57) | fields f", TEST_INDEX_BANK));
     verifySchema(result, schema("f", null, "double"));
     verifySome(result.getJSONArray("datarows"), rows(Math.sin(1.57)));
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/MetricsIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/MetricsIT.java
index 41373afdc6..73882a4036 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/MetricsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/MetricsIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -44,9 +43,7 @@ private void multiQueries(int n) throws IOException {
   }
 
   private Request makeStatRequest() {
-    return new Request(
-        "GET", "/_plugins/_ppl/stats"
-    );
+    return new Request("GET", "/_plugins/_ppl/stats");
   }
 
   private int pplRequestTotal() throws IOException {
@@ -70,5 +67,4 @@ private String executeStatRequest(final Request request) throws IOException {
 
     return sb.toString();
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/MultiMatchIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/MultiMatchIT.java
index 5bfd34e984..d760a8fe39 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/MultiMatchIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/MultiMatchIT.java
@@ -3,13 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BEER;
 
 import java.io.IOException;
-
 import org.json.JSONObject;
 import org.junit.Test;
 
@@ -22,36 +20,41 @@ public void init() throws IOException {
 
   @Test
   public void test_multi_match() throws IOException {
-    String query = "SOURCE=" + TEST_INDEX_BEER
-        + " | WHERE multi_match([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste') | fields Id";
+    String query =
+        "SOURCE="
+            + TEST_INDEX_BEER
+            + " | WHERE multi_match([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste') | fields Id";
     var result = executeQuery(query);
     assertEquals(16, result.getInt("total"));
   }
 
   @Test
   public void test_multi_match_all_params() throws IOException {
-    String query = "SOURCE=" + TEST_INDEX_BEER
-        + " | WHERE multi_match(['Body', Tags], 'taste beer', operator='and', analyzer=english,"
-        + "auto_generate_synonyms_phrase_query=true, boost = 0.77, cutoff_frequency=0.33,"
-        + "fuzziness = 'AUTO:1,5', fuzzy_transpositions = false, lenient = true, max_expansions = 25,"
-        + "minimum_should_match = '2<-25% 9<-3', prefix_length = 7, tie_breaker = 0.3,"
-        + "type = most_fields, slop = 2, zero_terms_query = 'ALL') | fields Id";
+    String query =
+        "SOURCE="
+            + TEST_INDEX_BEER
+            + " | WHERE multi_match(['Body', Tags], 'taste beer', operator='and',"
+            + " analyzer=english,auto_generate_synonyms_phrase_query=true, boost = 0.77,"
+            + " cutoff_frequency=0.33,fuzziness = 'AUTO:1,5', fuzzy_transpositions = false, lenient"
+            + " = true, max_expansions = 25,minimum_should_match = '2<-25% 9<-3', prefix_length ="
+            + " 7, tie_breaker = 0.3,type = most_fields, slop = 2, zero_terms_query = 'ALL') |"
+            + " fields Id";
     var result = executeQuery(query);
     assertEquals(10, result.getInt("total"));
   }
 
   @Test
   public void test_wildcard_multi_match() throws IOException {
-    String query1 = "SOURCE=" + TEST_INDEX_BEER
-        + " | WHERE multi_match(['Tags'], 'taste') | fields Id";
+    String query1 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE multi_match(['Tags'], 'taste') | fields Id";
     var result1 = executeQuery(query1);
-    String query2 = "SOURCE=" + TEST_INDEX_BEER
-        + " | WHERE multi_match(['T*'], 'taste') | fields Id";
+    String query2 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE multi_match(['T*'], 'taste') | fields Id";
     var result2 = executeQuery(query2);
     assertNotEquals(result2.getInt("total"), result1.getInt("total"));
 
-    String query3 = "source=" + TEST_INDEX_BEER
-        + " | where simple_query_string(['*Date'], '2014-01-22')";
+    String query3 =
+        "source=" + TEST_INDEX_BEER + " | where simple_query_string(['*Date'], '2014-01-22')";
     JSONObject result3 = executeQuery(query3);
     assertEquals(10, result3.getInt("total"));
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/NowLikeFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/NowLikeFunctionIT.java
new file mode 100644
index 0000000000..2d94dc6a3b
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/NowLikeFunctionIT.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.ppl;
+
+import static com.carrotsearch.randomizedtesting.RandomizedTest.$;
+import static com.carrotsearch.randomizedtesting.RandomizedTest.$$;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_PEOPLE2;
+import static org.opensearch.sql.sql.NowLikeFunctionIT.utcDateTimeNow;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+import java.io.IOException;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Period;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
+import java.time.temporal.Temporal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.TimeZone;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.jupiter.api.Test;
+
+public class NowLikeFunctionIT extends PPLIntegTestCase {
+  @Override
+  public void init() throws Exception {
+    super.init();
+    loadIndex(Index.PEOPLE2);
+  }
+
+  // Integration test framework sets for OpenSearch instance a random timezone.
+  // If server's TZ doesn't match localhost's TZ, time measurements for `now` would differ.
+  // We should set localhost's TZ now and recover the value back in the end of the test.
+  private final TimeZone testTz = TimeZone.getDefault();
+  private final TimeZone systemTz = TimeZone.getTimeZone(System.getProperty("user.timezone"));
+
+  @Before
+  public void setTimeZone() {
+    TimeZone.setDefault(systemTz);
+  }
+
+  @After
+  public void resetTimeZone() {
+    TimeZone.setDefault(testTz);
+  }
+
+  private final String name;
+  private final Boolean hasFsp;
+  private final Boolean hasShortcut;
+  private final Boolean constValue;
+  private final Supplier<Temporal> referenceGetter;
+  private final BiFunction<CharSequence, DateTimeFormatter, Temporal> parser;
+  private final String serializationPatternStr;
+
+  public NowLikeFunctionIT(
+      @Name("name") String name,
+      @Name("hasFsp") Boolean hasFsp,
+      @Name("hasShortcut") Boolean hasShortcut,
+      @Name("constValue") Boolean constValue,
+      @Name("referenceGetter") Supplier<Temporal> referenceGetter,
+      @Name("parser") BiFunction<CharSequence, DateTimeFormatter, Temporal> parser,
+      @Name("serializationPatternStr") String serializationPatternStr) {
+    this.name = name;
+    this.hasFsp = hasFsp;
+    this.hasShortcut = hasShortcut;
+    this.constValue = constValue;
+    this.referenceGetter = referenceGetter;
+    this.parser = parser;
+    this.serializationPatternStr = serializationPatternStr;
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s")
+  public static Iterable<Object[]> compareTwoDates() {
+    return Arrays.asList(
+        $$(
+            $(
+                "now",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) LocalDateTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss"),
+            $(
+                "current_timestamp",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) LocalDateTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss"),
+            $(
+                "localtimestamp",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) LocalDateTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss"),
+            $(
+                "localtime",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) LocalDateTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss"),
+            $(
+                "sysdate",
+                true,
+                false,
+                false,
+                (Supplier<Temporal>) LocalDateTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss"),
+            $(
+                "curtime",
+                false,
+                false,
+                false,
+                (Supplier<Temporal>) LocalTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalTime::parse,
+                "HH:mm:ss"),
+            $(
+                "current_time",
+                false,
+                false,
+                false,
+                (Supplier<Temporal>) LocalTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalTime::parse,
+                "HH:mm:ss"),
+            $(
+                "curdate",
+                false,
+                false,
+                false,
+                (Supplier<Temporal>) LocalDate::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDate::parse,
+                "uuuu-MM-dd"),
+            $(
+                "current_date",
+                false,
+                false,
+                false,
+                (Supplier<Temporal>) LocalDate::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDate::parse,
+                "uuuu-MM-dd"),
+            $(
+                "utc_date",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) (() -> utcDateTimeNow().toLocalDate()),
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDate::parse,
+                "uuuu-MM-dd"),
+            $(
+                "utc_time",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) (() -> utcDateTimeNow().toLocalTime()),
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalTime::parse,
+                "HH:mm:ss"),
+            $(
+                "utc_timestamp",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) (org.opensearch.sql.sql.NowLikeFunctionIT::utcDateTimeNow),
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss")));
+  }
+
+  private long getDiff(Temporal sample, Temporal reference) {
+    if (sample instanceof LocalDate) {
+      return Period.between((LocalDate) sample, (LocalDate) reference).getDays();
+    }
+    return Duration.between(sample, reference).toSeconds();
+  }
+
+  @Test
+  public void testNowLikeFunctions() throws IOException {
+    var serializationPattern =
+        new DateTimeFormatterBuilder()
+            .appendPattern(serializationPatternStr)
+            .optionalStart()
+            .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true)
+            .toFormatter();
+
+    Temporal reference = referenceGetter.get();
+    double delta = 2d; // acceptable time diff, secs
+    if (reference instanceof LocalDate)
+      delta = 1d; // Max date delta could be 1 if test runs on the very edge of two days
+    // We ignore probability of a test run on edge of month or year to simplify the checks
+
+    var calls =
+        new ArrayList<String>() {
+          {
+            add(name + "()");
+          }
+        };
+    if (hasShortcut) calls.add(name);
+    if (hasFsp) calls.add(name + "(0)");
+
+    // Column order is: func(), func, func(0)
+    //                   shortcut ^    fsp ^
+    // Query looks like:
+    //    source=people2 | eval `now()`=now() | fields `now()`;
+    JSONObject result =
+        executeQuery(
+            "source="
+                + TEST_INDEX_PEOPLE2
+                + " | eval "
+                + calls.stream()
+                    .map(c -> String.format("`%s`=%s", c, c))
+                    .collect(Collectors.joining(","))
+                + " | fields "
+                + calls.stream()
+                    .map(c -> String.format("`%s`", c))
+                    .collect(Collectors.joining(",")));
+
+    var rows = result.getJSONArray("datarows");
+    JSONArray firstRow = rows.getJSONArray(0);
+    for (int i = 0; i < rows.length(); i++) {
+      var row = rows.getJSONArray(i);
+      if (constValue) assertTrue(firstRow.similar(row));
+
+      int column = 0;
+      assertEquals(
+          0,
+          getDiff(reference, parser.apply(row.getString(column++), serializationPattern)),
+          delta);
+
+      if (hasShortcut) {
+        assertEquals(
+            0,
+            getDiff(reference, parser.apply(row.getString(column++), serializationPattern)),
+            delta);
+      }
+      if (hasFsp) {
+        assertEquals(
+            0,
+            getDiff(reference, parser.apply(row.getString(column), serializationPattern)),
+            delta);
+      }
+    }
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/ObjectFieldOperateIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/ObjectFieldOperateIT.java
index 6178552728..cc836b1896 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/ObjectFieldOperateIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/ObjectFieldOperateIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.SQLIntegTestCase.Index.DEEP_NESTED;
@@ -26,55 +25,45 @@ public void init() throws IOException {
 
   @Test
   public void select_object_field() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | "
-                + "fields city.name, city.location.latitude",
-            TEST_INDEX_DEEP_NESTED));
-    verifySchema(result,
-        schema("city.name", "string"),
-        schema("city.location.latitude", "double"));
-    verifyDataRows(result,
-        rows("Seattle", 10.5));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | " + "fields city.name, city.location.latitude",
+                TEST_INDEX_DEEP_NESTED));
+    verifySchema(result, schema("city.name", "string"), schema("city.location.latitude", "double"));
+    verifyDataRows(result, rows("Seattle", 10.5));
   }
 
   @Test
   public void compare_object_field_in_where() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s "
-                + "| where city.name = 'Seattle' "
-                + "| fields city.name, city.location.latitude",
-            TEST_INDEX_DEEP_NESTED));
-    verifySchema(result,
-        schema("city.name", "string"),
-        schema("city.location.latitude", "double"));
-    verifyDataRows(result,
-        rows("Seattle", 10.5));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s "
+                    + "| where city.name = 'Seattle' "
+                    + "| fields city.name, city.location.latitude",
+                TEST_INDEX_DEEP_NESTED));
+    verifySchema(result, schema("city.name", "string"), schema("city.location.latitude", "double"));
+    verifyDataRows(result, rows("Seattle", 10.5));
   }
 
   @Test
   public void group_object_field_in_stats() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s "
-                + "| stats count() by city.name",
-            TEST_INDEX_DEEP_NESTED));
-    verifySchema(result,
-        schema("count()", "integer"),
-        schema("city.name", "string"));
-    verifyDataRows(result,
-        rows(1, "Seattle"));
+    JSONObject result =
+        executeQuery(
+            String.format("source=%s " + "| stats count() by city.name", TEST_INDEX_DEEP_NESTED));
+    verifySchema(result, schema("count()", "integer"), schema("city.name", "string"));
+    verifyDataRows(result, rows(1, "Seattle"));
   }
 
   @Test
   public void sort_by_object_field() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s "
-                + "| sort city.name"
-                + "| fields city.name, city.location.latitude",
-            TEST_INDEX_DEEP_NESTED));
-    verifySchema(result,
-        schema("city.name", "string"),
-        schema("city.location.latitude", "double"));
-    verifyDataRows(result,
-        rows("Seattle", 10.5));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s " + "| sort city.name" + "| fields city.name, city.location.latitude",
+                TEST_INDEX_DEEP_NESTED));
+    verifySchema(result, schema("city.name", "string"), schema("city.location.latitude", "double"));
+    verifyDataRows(result, rows("Seattle", 10.5));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/OperatorIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/OperatorIT.java
index e6ca958991..42ed08b00c 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/OperatorIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/OperatorIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
@@ -26,40 +25,28 @@ public void init() throws IOException {
   @Test
   public void testAddOperator() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | where age = 31 + 1 | fields age",
-                TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | where age = 31 + 1 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(32));
   }
 
   @Test
   public void testSubtractOperator() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | where age = 33 - 1 | fields age",
-                TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | where age = 33 - 1 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(32));
   }
 
   @Test
   public void testMultiplyOperator() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | where age = 16 * 2 | fields age",
-                TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | where age = 16 * 2 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(32));
   }
 
   @Test
   public void testDivideOperator() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s | where age / 2 = 16 | fields age",
-                TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s | where age / 2 = 16 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(32), rows(33));
   }
 
@@ -67,9 +54,7 @@ public void testDivideOperator() throws IOException {
   public void testModuleOperator() throws IOException {
     JSONObject result =
         executeQuery(
-            String.format(
-                "source=%s | where age %s 32 = 0 | fields age",
-                TEST_INDEX_BANK, "%"));
+            String.format("source=%s | where age %s 32 = 0 | fields age", TEST_INDEX_BANK, "%"));
     verifyDataRows(result, rows(32));
   }
 
@@ -78,11 +63,9 @@ public void testArithmeticOperatorWithNullValue() throws IOException {
     JSONObject result =
         executeQuery(
             String.format(
-                "source=%s | eval f = age + 0 | fields f",
-                TEST_INDEX_BANK_WITH_NULL_VALUES));
+                "source=%s | eval f = age + 0 | fields f", TEST_INDEX_BANK_WITH_NULL_VALUES));
     verifyDataRows(
-        result, rows(32), rows(36), rows(28), rows(33), rows(36), rows(JSONObject.NULL),
-        rows(34));
+        result, rows(32), rows(36), rows(28), rows(33), rows(36), rows(JSONObject.NULL), rows(34));
   }
 
   @Test
@@ -92,8 +75,14 @@ public void testArithmeticOperatorWithMissingValue() throws IOException {
             String.format(
                 "source=%s | eval f = balance * 1 | fields f", TEST_INDEX_BANK_WITH_NULL_VALUES));
     verifyDataRows(
-        result, rows(39225), rows(32838), rows(4180), rows(48086), rows(JSONObject.NULL),
-        rows(JSONObject.NULL), rows(JSONObject.NULL));
+        result,
+        rows(39225),
+        rows(32838),
+        rows(4180),
+        rows(48086),
+        rows(JSONObject.NULL),
+        rows(JSONObject.NULL),
+        rows(JSONObject.NULL));
   }
 
   @Test
@@ -101,8 +90,7 @@ public void testMultipleArithmeticOperators() throws IOException {
     JSONObject result =
         executeQuery(
             String.format(
-                "source=%s | where (age+2) * 3 / 2 - 1 = 50 | fields age",
-                TEST_INDEX_BANK));
+                "source=%s | where (age+2) * 3 / 2 - 1 = 50 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(32));
   }
 
@@ -127,14 +115,12 @@ public void testAndOperator() throws IOException {
   public void testOrOperator() throws IOException {
     JSONObject result =
         executeQuery(
-            String.format(
-                "source=%s | where age=32 or age=34 | fields age", TEST_INDEX_BANK));
+            String.format("source=%s | where age=32 or age=34 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(32), rows(34));
 
     result =
         executeQuery(
-            String.format(
-                "source=%s | where age=34 or age=32| fields age", TEST_INDEX_BANK));
+            String.format("source=%s | where age=34 or age=32| fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(32), rows(34));
   }
 
@@ -158,92 +144,64 @@ public void testXorOperator() throws IOException {
   @Test
   public void testNotOperator() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s not age > 32 | fields age",
-                TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s not age > 32 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(28), rows(32));
   }
 
   @Test
   public void testEqualOperator() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s age = 32 | fields age",
-                TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s age = 32 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(32));
 
-    result =
-        executeQuery(
-            String.format(
-                "source=%s 32 = age | fields age",
-                TEST_INDEX_BANK));
+    result = executeQuery(String.format("source=%s 32 = age | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(32));
   }
 
   @Test
   public void testNotEqualOperator() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s age != 32 | fields age",
-                TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s age != 32 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(28), rows(33), rows(34), rows(36), rows(36), rows(39));
 
-    result =
-        executeQuery(
-            String.format(
-                "source=%s 32 != age | fields age",
-                TEST_INDEX_BANK));
+    result = executeQuery(String.format("source=%s 32 != age | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(28), rows(33), rows(34), rows(36), rows(36), rows(39));
   }
 
   @Test
   public void testLessOperator() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s age < 32 | fields age",
-                TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s age < 32 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(28));
   }
 
   @Test
   public void testLteOperator() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s age <= 32 | fields age",
-                TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s age <= 32 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(28), rows(32));
   }
 
   @Test
   public void testGreaterOperator() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s age > 36 | fields age",
-                TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s age > 36 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(39));
   }
 
   @Test
   public void testGteOperator() throws IOException {
     JSONObject result =
-        executeQuery(
-            String.format(
-                "source=%s age >= 36 | fields age",
-                TEST_INDEX_BANK));
+        executeQuery(String.format("source=%s age >= 36 | fields age", TEST_INDEX_BANK));
     verifyDataRows(result, rows(36), rows(36), rows(39));
   }
 
   @Test
   public void testLikeFunction() throws IOException {
     JSONObject result =
-        executeQuery(String.format("source=%s like(firstname, 'Hatti_') | fields firstname",
-            TEST_INDEX_BANK));
+        executeQuery(
+            String.format(
+                "source=%s like(firstname, 'Hatti_') | fields firstname", TEST_INDEX_BANK));
     verifyDataRows(result, rows("Hattie"));
   }
 
@@ -251,8 +209,8 @@ public void testLikeFunction() throws IOException {
   public void testBinaryPredicateWithNullValue() throws IOException {
     JSONObject result =
         executeQuery(
-            String.format("source=%s | where age >= 36 | fields age",
-                TEST_INDEX_BANK_WITH_NULL_VALUES));
+            String.format(
+                "source=%s | where age >= 36 | fields age", TEST_INDEX_BANK_WITH_NULL_VALUES));
     verifyDataRows(result, rows(36), rows(36));
   }
 
@@ -260,7 +218,8 @@ public void testBinaryPredicateWithNullValue() throws IOException {
   public void testBinaryPredicateWithMissingValue() throws IOException {
     JSONObject result =
         executeQuery(
-            String.format("source=%s | where balance > 40000 | fields balance",
+            String.format(
+                "source=%s | where balance > 40000 | fields balance",
                 TEST_INDEX_BANK_WITH_NULL_VALUES));
     verifyDataRows(result, rows(48086));
   }
@@ -269,12 +228,13 @@ private void queryExecutionShouldThrowExceptionDueToNullOrMissingValue(
       String query, String... errorMsgs) {
     try {
       executeQuery(query);
-      fail("Expected to throw ExpressionEvaluationException, but none was thrown for query: "
-          + query);
+      fail(
+          "Expected to throw ExpressionEvaluationException, but none was thrown for query: "
+              + query);
     } catch (ResponseException e) {
       String errorMsg = e.getMessage();
       assertTrue(errorMsg.contains("ExpressionEvaluationException"));
-      for (String msg: errorMsgs) {
+      for (String msg : errorMsgs) {
         assertTrue(errorMsg.contains(msg));
       }
     } catch (IOException e) {
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/PPLIntegTestCase.java b/integ-test/src/test/java/org/opensearch/sql/ppl/PPLIntegTestCase.java
index bcf183e9c6..5f82af9bce 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/PPLIntegTestCase.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/PPLIntegTestCase.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestUtils.getResponseBody;
@@ -20,9 +19,7 @@
 import org.opensearch.client.Response;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 
-/**
- * OpenSearch Rest integration test base for PPL testing.
- */
+/** OpenSearch Rest integration test base for PPL testing. */
 public abstract class PPLIntegTestCase extends SQLIntegTestCase {
 
   protected JSONObject executeQuery(String query) throws IOException {
@@ -42,8 +39,10 @@ protected String explainQueryToString(String query) throws IOException {
   }
 
   protected String executeCsvQuery(String query, boolean sanitize) throws IOException {
-    Request request = buildRequest(query,
-        QUERY_API_ENDPOINT + String.format(Locale.ROOT, "?format=csv&sanitize=%b", sanitize));
+    Request request =
+        buildRequest(
+            query,
+            QUERY_API_ENDPOINT + String.format(Locale.ROOT, "?format=csv&sanitize=%b", sanitize));
     Response response = client().performRequest(request);
     Assert.assertEquals(200, response.getStatusLine().getStatusCode());
     return getResponseBody(response, true);
@@ -65,8 +64,9 @@ protected Request buildRequest(String query, String endpoint) {
 
   protected static JSONObject updateClusterSettings(ClusterSetting setting) throws IOException {
     Request request = new Request("PUT", "/_cluster/settings");
-    String persistentSetting = String.format(Locale.ROOT,
-        "{\"%s\": {\"%s\": %s}}", setting.type, setting.name, setting.value);
+    String persistentSetting =
+        String.format(
+            Locale.ROOT, "{\"%s\": {\"%s\": %s}}", setting.type, setting.name, setting.value);
     request.setJsonEntity(persistentSetting);
     RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
     restOptionsBuilder.addHeader("Content-Type", "application/json");
@@ -92,9 +92,15 @@ SQLIntegTestCase.ClusterSetting nullify() {
     @Override
     public String toString() {
       return "ClusterSetting{"
-          + "type='" + type + '\''
-          + ", path='" + name + '\''
-          + ", value='" + value + '\''
+          + "type='"
+          + type
+          + '\''
+          + ", path='"
+          + name
+          + '\''
+          + ", value='"
+          + value
+          + '\''
           + '}';
     }
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/PPLPluginIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/PPLPluginIT.java
index e2a341fb9a..44f79a8944 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/PPLPluginIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/PPLPluginIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -28,8 +27,7 @@
 import org.opensearch.sql.util.TestUtils;
 
 public class PPLPluginIT extends PPLIntegTestCase {
-  @Rule
-  public ExpectedException exceptionRule = ExpectedException.none();
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
   private static final String PERSISTENT = "persistent";
 
@@ -57,6 +55,14 @@ public void testQueryEndpointShouldFail() throws IOException {
     client().performRequest(makePPLRequest("search invalid"));
   }
 
+  @Test
+  public void testQueryEndpointShouldFailWithNonExistIndex() throws IOException {
+    exceptionRule.expect(ResponseException.class);
+    exceptionRule.expect(hasProperty("response", statusCode(404)));
+
+    client().performRequest(makePPLRequest("search source=non_exist_index"));
+  }
+
   @Test
   public void sqlEnableSettingsTest() throws IOException {
     String query =
@@ -78,9 +84,11 @@ public void sqlEnableSettingsTest() throws IOException {
     assertThat(result.getInt("status"), equalTo(400));
     JSONObject error = result.getJSONObject("error");
     assertThat(error.getString("reason"), equalTo("Invalid Query"));
-    assertThat(error.getString("details"), equalTo(
-        "Either plugins.ppl.enabled or rest.action.multi.allow_explicit_index setting is "
-            + "false"));
+    assertThat(
+        error.getString("details"),
+        equalTo(
+            "Either plugins.ppl.enabled or rest.action.multi.allow_explicit_index setting is "
+                + "false"));
     assertThat(error.getString("type"), equalTo("IllegalAccessException"));
 
     // reset the setting
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/ParseCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/ParseCommandIT.java
index 36fcb4bf3b..7f25f6f160 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/ParseCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/ParseCommandIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
@@ -23,9 +22,10 @@ public void init() throws IOException {
 
   @Test
   public void testParseCommand() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | parse email '.+@(?<host>.+)' | fields email, host",
-            TEST_INDEX_BANK));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | parse email '.+@(?<host>.+)' | fields email, host", TEST_INDEX_BANK));
     verifyOrder(
         result,
         rows("amberduke@pyrami.com", "pyrami.com"),
@@ -39,8 +39,10 @@ public void testParseCommand() throws IOException {
 
   @Test
   public void testParseCommandReplaceOriginalField() throws IOException {
-    JSONObject result = executeQuery(
-        String.format("source=%s | parse email '.+@(?<email>.+)' | fields email", TEST_INDEX_BANK));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | parse email '.+@(?<email>.+)' | fields email", TEST_INDEX_BANK));
     verifyOrder(
         result,
         rows("pyrami.com"),
@@ -54,8 +56,12 @@ public void testParseCommandReplaceOriginalField() throws IOException {
 
   @Test
   public void testParseCommandWithOtherRunTimeFields() throws IOException {
-    JSONObject result = executeQuery(String.format("source=%s | parse email '.+@(?<host>.+)' | "
-        + "eval eval_result=1 | fields host, eval_result", TEST_INDEX_BANK));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | parse email '.+@(?<host>.+)' | "
+                    + "eval eval_result=1 | fields host, eval_result",
+                TEST_INDEX_BANK));
     verifyOrder(
         result,
         rows("pyrami.com", 1),
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/PositionFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/PositionFunctionIT.java
index 24319a0cb8..a7f638b3dd 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/PositionFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/PositionFunctionIT.java
@@ -5,96 +5,91 @@
 
 package org.opensearch.sql.ppl;
 
-import org.junit.Test;
-
-import java.io.IOException;
-
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_CALCS;
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 
+import java.io.IOException;
+import org.junit.Test;
+
 public class PositionFunctionIT extends PPLIntegTestCase {
-    @Override
-    public void init() throws IOException {
-        loadIndex(Index.CALCS);
-    }
-
-    @Test
-    public void test_position_function() throws IOException {
-        String query = "source=" + TEST_INDEX_CALCS
-                + " | eval f=position('ON', str1) | fields f";
-
-        var result = executeQuery(query);
-
-        assertEquals(17, result.getInt("total"));
-        verifyDataRows(result,
-                rows(7), rows(7),
-                rows(2), rows(0),
-                rows(0), rows(0),
-                rows(0), rows(0),
-                rows(0), rows(0),
-                rows(0), rows(0),
-                rows(0), rows(0),
-                rows(0), rows(0),
-                rows(0));
-    }
-
-    @Test
-    public void test_position_function_with_fields_only() throws IOException {
-        String query = "source=" + TEST_INDEX_CALCS
-                + " | eval f=position(str3 IN str2) | where str2 IN ('one', 'two', 'three')| fields f";
-
-        var result = executeQuery(query);
-
-        assertEquals(3, result.getInt("total"));
-        verifyDataRows(result, rows(3), rows(0), rows(4));
-    }
-
-    @Test
-    public void test_position_function_with_string_literals() throws IOException {
-        String query = "source=" + TEST_INDEX_CALCS
-                + " | eval f=position('world' IN 'hello world') | where str2='one' | fields f";
-
-        var result = executeQuery(query);
-
-        assertEquals(1, result.getInt("total"));
-        verifyDataRows(result, rows(7));
-    }
-
-    @Test
-    public void test_position_function_with_nulls() throws IOException {
-        String query = "source=" + TEST_INDEX_CALCS
-                + " | eval f=position('ee' IN str2) | where isnull(str2) | fields str2,f";
-
-        var result = executeQuery(query);
-
-        assertEquals(4, result.getInt("total"));
-        verifyDataRows(result,
-                rows(null, null),
-                rows(null, null),
-                rows(null, null),
-                rows(null, null));
-    }
-
-    @Test
-    public void test_position_function_with_function_as_arg() throws IOException {
-        String query = "source=" + TEST_INDEX_CALCS
-                + " | eval f=position(upper(str3) IN str1) | where like(str1, 'BINDING SUPPLIES') | fields f";
-
-        var result = executeQuery(query);
-
-        assertEquals(1, result.getInt("total"));
-        verifyDataRows(result, rows(15));
-    }
-
-    @Test
-    public void test_position_function_with_function_in_where_clause() throws IOException {
-        String query = "source=" + TEST_INDEX_CALCS
-                + " | where position(str3 IN str2)=1 | fields str2";
-
-        var result = executeQuery(query);
-
-        assertEquals(2, result.getInt("total"));
-        verifyDataRows(result, rows("eight"), rows("eleven"));
-    }
+  @Override
+  public void init() throws IOException {
+    loadIndex(Index.CALCS);
+  }
+
+  @Test
+  public void test_position_function() throws IOException {
+    String query = "source=" + TEST_INDEX_CALCS + " | eval f=position('ON', str1) | fields f";
+
+    var result = executeQuery(query);
+
+    assertEquals(17, result.getInt("total"));
+    verifyDataRows(
+        result, rows(7), rows(7), rows(2), rows(0), rows(0), rows(0), rows(0), rows(0), rows(0),
+        rows(0), rows(0), rows(0), rows(0), rows(0), rows(0), rows(0), rows(0));
+  }
+
+  @Test
+  public void test_position_function_with_fields_only() throws IOException {
+    String query =
+        "source="
+            + TEST_INDEX_CALCS
+            + " | eval f=position(str3 IN str2) | where str2 IN ('one', 'two', 'three')| fields f";
+
+    var result = executeQuery(query);
+
+    assertEquals(3, result.getInt("total"));
+    verifyDataRows(result, rows(3), rows(0), rows(4));
+  }
+
+  @Test
+  public void test_position_function_with_string_literals() throws IOException {
+    String query =
+        "source="
+            + TEST_INDEX_CALCS
+            + " | eval f=position('world' IN 'hello world') | where str2='one' | fields f";
+
+    var result = executeQuery(query);
+
+    assertEquals(1, result.getInt("total"));
+    verifyDataRows(result, rows(7));
+  }
+
+  @Test
+  public void test_position_function_with_nulls() throws IOException {
+    String query =
+        "source="
+            + TEST_INDEX_CALCS
+            + " | eval f=position('ee' IN str2) | where isnull(str2) | fields str2,f";
+
+    var result = executeQuery(query);
+
+    assertEquals(4, result.getInt("total"));
+    verifyDataRows(result, rows(null, null), rows(null, null), rows(null, null), rows(null, null));
+  }
+
+  @Test
+  public void test_position_function_with_function_as_arg() throws IOException {
+    String query =
+        "source="
+            + TEST_INDEX_CALCS
+            + " | eval f=position(upper(str3) IN str1) | where like(str1, 'BINDING SUPPLIES') |"
+            + " fields f";
+
+    var result = executeQuery(query);
+
+    assertEquals(1, result.getInt("total"));
+    verifyDataRows(result, rows(15));
+  }
+
+  @Test
+  public void test_position_function_with_function_in_where_clause() throws IOException {
+    String query = "source=" + TEST_INDEX_CALCS + " | where position(str3 IN str2)=1 | fields str2";
+
+    var result = executeQuery(query);
+
+    assertEquals(2, result.getInt("total"));
+    verifyDataRows(result, rows("eight"), rows("eleven"));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/PrometheusDataSourceCommandsIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/PrometheusDataSourceCommandsIT.java
index 292ea26fc1..f4ae9b5536 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/PrometheusDataSourceCommandsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/PrometheusDataSourceCommandsIT.java
@@ -7,32 +7,86 @@
 
 package org.opensearch.sql.ppl;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.LABELS;
 import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.TIMESTAMP;
 import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.VALUE;
+import static org.opensearch.sql.util.MatcherUtils.assertJsonEquals;
 import static org.opensearch.sql.util.MatcherUtils.schema;
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.BeforeClass;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.Response;
+import org.opensearch.client.ResponseException;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceStatus;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.util.TestUtils;
 
 public class PrometheusDataSourceCommandsIT extends PPLIntegTestCase {
 
+  /**
+   * Integ tests are dependent on self generated metrics in prometheus instance. When running
+   * individual integ tests there is no time for generation of metrics in the test prometheus
+   * instance. This method gives prometheus time to generate metrics on itself.
+   *
+   * @throws InterruptedException
+   */
+  @BeforeClass
+  protected static void metricGenerationWait() throws InterruptedException {
+    Thread.sleep(10000);
+  }
+
+  @Override
+  protected void init() throws InterruptedException, IOException {
+    DataSourceMetadata createDSM =
+        new DataSourceMetadata.Builder()
+            .setName("my_prometheus")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(ImmutableMap.of("prometheus.uri", "http://localhost:9090"))
+            .build();
+    Request createRequest = getCreateDataSourceRequest(createDSM);
+    Response response = client().performRequest(createRequest);
+    Assert.assertEquals(201, response.getStatusLine().getStatusCode());
+  }
+
+  @After
+  protected void deleteDataSourceMetadata() throws IOException {
+    Request deleteRequest = getDeleteDataSourceRequest("my_prometheus");
+    Response deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+  }
+
   @Test
   @SneakyThrows
   public void testSourceMetricCommand() {
-    JSONObject response =
-        executeQuery("source=my_prometheus.prometheus_http_requests_total");
-    verifySchema(response,
+    JSONObject response = executeQuery("source=my_prometheus.prometheus_http_requests_total");
+    verifySchema(
+        response,
         schema(VALUE, "double"),
-        schema(TIMESTAMP,  "timestamp"),
-        schema("handler",  "string"),
-        schema("code",  "string"),
-        schema("instance",  "string"),
-        schema("job",  "string"));
+        schema(TIMESTAMP, "timestamp"),
+        schema("handler", "string"),
+        schema("code", "string"),
+        schema("instance", "string"),
+        schema("job", "string"));
     Assertions.assertTrue(response.getInt("size") > 0);
     Assertions.assertEquals(6, response.getJSONArray("datarows").getJSONArray(0).length());
     JSONArray firstRow = response.getJSONArray("datarows").getJSONArray(0);
@@ -42,16 +96,43 @@ public void testSourceMetricCommand() {
     }
   }
 
+  @Test
+  @SneakyThrows
+  public void testSourceMetricCommandWithTimestamp() {
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    // Generate timestamp string for one hour less than the current time
+    String timestamp = LocalDateTime.now().minusHours(1).format(formatter);
+    String query =
+        "source=my_prometheus.prometheus_http_requests_total | where @timestamp > '"
+            + timestamp
+            + "'  | sort + @timestamp | head 5";
+
+    JSONObject response = executeQuery(query);
+    verifySchema(
+        response,
+        schema(VALUE, "double"),
+        schema(TIMESTAMP, "timestamp"),
+        schema("handler", "string"),
+        schema("code", "string"),
+        schema("instance", "string"),
+        schema("job", "string"));
+    // <TODO>Currently, data is not injected into prometheus,
+    // so asserting on result is not possible. Verifying only schema.
+  }
+
   @Test
   @SneakyThrows
   public void testMetricAvgAggregationCommand() {
     JSONObject response =
-        executeQuery("source=`my_prometheus`.`prometheus_http_requests_total` | stats avg(@value) as `agg` by span(@timestamp, 15s), `handler`, `job`");
-    verifySchema(response,
-        schema("agg",  "double"),
+        executeQuery(
+            "source=`my_prometheus`.`prometheus_http_requests_total` | stats avg(@value) as `agg`"
+                + " by span(@timestamp, 15s), `handler`, `job`");
+    verifySchema(
+        response,
+        schema("agg", "double"),
         schema("span(@timestamp,15s)", "timestamp"),
-        schema("`handler`", "string"),
-        schema("`job`", "string"));
+        schema("handler", "string"),
+        schema("job", "string"));
     Assertions.assertTrue(response.getInt("size") > 0);
     Assertions.assertEquals(4, response.getJSONArray("datarows").getJSONArray(0).length());
     JSONArray firstRow = response.getJSONArray("datarows").getJSONArray(0);
@@ -65,11 +146,14 @@ public void testMetricAvgAggregationCommand() {
   @SneakyThrows
   public void testMetricAvgAggregationCommandWithAlias() {
     JSONObject response =
-        executeQuery("source=my_prometheus.prometheus_http_requests_total | stats avg(@value) as agg by span(@timestamp, 15s), `handler`, job");
-    verifySchema(response,
-        schema("agg",  "double"),
+        executeQuery(
+            "source=my_prometheus.prometheus_http_requests_total | stats avg(@value) as agg by"
+                + " span(@timestamp, 15s), `handler`, job");
+    verifySchema(
+        response,
+        schema("agg", "double"),
         schema("span(@timestamp,15s)", "timestamp"),
-        schema("`handler`", "string"),
+        schema("handler", "string"),
         schema("job", "string"));
     Assertions.assertTrue(response.getInt("size") > 0);
     Assertions.assertEquals(4, response.getJSONArray("datarows").getJSONArray(0).length());
@@ -80,15 +164,15 @@ public void testMetricAvgAggregationCommandWithAlias() {
     }
   }
 
-
   @Test
   @SneakyThrows
   public void testMetricMaxAggregationCommand() {
     JSONObject response =
-        executeQuery("source=my_prometheus.prometheus_http_requests_total | stats max(@value) by span(@timestamp, 15s)");
-    verifySchema(response,
-        schema("max(@value)",  "double"),
-        schema("span(@timestamp,15s)", "timestamp"));
+        executeQuery(
+            "source=my_prometheus.prometheus_http_requests_total | stats max(@value) by"
+                + " span(@timestamp, 15s)");
+    verifySchema(
+        response, schema("max(@value)", "double"), schema("span(@timestamp,15s)", "timestamp"));
     Assertions.assertTrue(response.getInt("size") > 0);
     Assertions.assertEquals(2, response.getJSONArray("datarows").getJSONArray(0).length());
     JSONArray firstRow = response.getJSONArray("datarows").getJSONArray(0);
@@ -98,14 +182,16 @@ public void testMetricMaxAggregationCommand() {
     }
   }
 
-
   @Test
   @SneakyThrows
   public void testMetricMinAggregationCommand() {
     JSONObject response =
-        executeQuery("source=my_prometheus.prometheus_http_requests_total | stats min(@value) by span(@timestamp, 15s), handler");
-    verifySchema(response,
-        schema("min(@value)",  "double"),
+        executeQuery(
+            "source=my_prometheus.prometheus_http_requests_total | stats min(@value) by"
+                + " span(@timestamp, 15s), handler");
+    verifySchema(
+        response,
+        schema("min(@value)", "double"),
         schema("span(@timestamp,15s)", "timestamp"),
         schema("handler", "string"));
     Assertions.assertTrue(response.getInt("size") > 0);
@@ -121,9 +207,12 @@ public void testMetricMinAggregationCommand() {
   @SneakyThrows
   public void testMetricCountAggregationCommand() {
     JSONObject response =
-        executeQuery("source=my_prometheus.prometheus_http_requests_total | stats count() by span(@timestamp, 15s), handler, job");
-    verifySchema(response,
-        schema("count()",  "integer"),
+        executeQuery(
+            "source=my_prometheus.prometheus_http_requests_total | stats count() by"
+                + " span(@timestamp, 15s), handler, job");
+    verifySchema(
+        response,
+        schema("count()", "integer"),
         schema("span(@timestamp,15s)", "timestamp"),
         schema("handler", "string"),
         schema("job", "string"));
@@ -140,9 +229,12 @@ public void testMetricCountAggregationCommand() {
   @SneakyThrows
   public void testMetricSumAggregationCommand() {
     JSONObject response =
-        executeQuery("source=my_prometheus.prometheus_http_requests_total | stats sum(@value) by span(@timestamp, 15s), handler, job");
-    verifySchema(response,
-        schema("sum(@value)",  "double"),
+        executeQuery(
+            "source=my_prometheus.prometheus_http_requests_total | stats sum(@value) by"
+                + " span(@timestamp, 15s), handler, job");
+    verifySchema(
+        response,
+        schema("sum(@value)", "double"),
         schema("span(@timestamp,15s)", "timestamp"),
         schema("handler", "string"),
         schema("job", "string"));
@@ -155,4 +247,78 @@ public void testMetricSumAggregationCommand() {
     }
   }
 
+  @Test
+  @SneakyThrows
+  public void testQueryRange() {
+    long currentTimestamp = new Date().getTime();
+    JSONObject response =
+        executeQuery(
+            "source=my_prometheus.query_range('prometheus_http_requests_total',"
+                + ((currentTimestamp / 1000) - 3600)
+                + ","
+                + currentTimestamp / 1000
+                + ", "
+                + "'14'"
+                + ")");
+    verifySchema(
+        response, schema(LABELS, "struct"), schema(VALUE, "array"), schema(TIMESTAMP, "array"));
+    Assertions.assertTrue(response.getInt("size") > 0);
+  }
+
+  @Test
+  public void explainQueryRange() throws Exception {
+    String expected = loadFromFile("expectedOutput/ppl/explain_query_range.json");
+    assertJsonEquals(
+        expected,
+        explainQueryToString(
+            "source = my_prometheus"
+                + ".query_range('prometheus_http_requests_total',1689281439,1689291439,14)"));
+  }
+
+  @Test
+  public void testExplainForQueryExemplars() throws Exception {
+    String expected = loadFromFile("expectedOutput/ppl/explain_query_exemplars.json");
+    assertJsonEquals(
+        expected,
+        explainQueryToString(
+            "source = my_prometheus."
+                + "query_exemplars('app_ads_ad_requests_total',1689228292,1689232299)"));
+  }
+
+  @Test
+  public void testQueryOnDisabledDataSource() throws IOException {
+    DataSourceMetadata deletedDSM =
+        new DataSourceMetadata.Builder()
+            .setName("disabled_prometheus")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(ImmutableMap.of("prometheus.uri", "http://localhost:9090"))
+            .setDataSourceStatus(DataSourceStatus.DISABLED)
+            .build();
+    Request createRequest = getCreateDataSourceRequest(deletedDSM);
+    Response response = client().performRequest(createRequest);
+    Assert.assertEquals(201, response.getStatusLine().getStatusCode());
+
+    try {
+      executeQuery(
+          "source=disabled_prometheus.prometheus_http_requests_total | stats sum(@value) by"
+              + " span(@timestamp, 15s), handler, job");
+    } catch (ResponseException ex) {
+      response = ex.getResponse();
+    }
+    JSONObject result = new JSONObject(TestUtils.getResponseBody(response));
+    assertThat(result.getInt("status"), equalTo(400));
+    JSONObject error = result.getJSONObject("error");
+    assertThat(error.getString("reason"), equalTo("Invalid Query"));
+    assertThat(error.getString("details"), equalTo("Datasource disabled_prometheus is disabled."));
+    assertThat(error.getString("type"), equalTo("DatasourceDisabledException"));
+
+    Request deleteRequest = getDeleteDataSourceRequest("disabled_prometheus");
+    Response deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+  }
+
+  String loadFromFile(String filename) throws Exception {
+    URI uri = Resources.getResource(filename).toURI();
+    return new String(Files.readAllBytes(Paths.get(uri)));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/QueryAnalysisIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/QueryAnalysisIT.java
index dd2fcb84c8..aaefbbe395 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/QueryAnalysisIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/QueryAnalysisIT.java
@@ -3,13 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
 
 import java.io.IOException;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.opensearch.client.ResponseException;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
@@ -80,10 +78,7 @@ public void queryShouldBeCaseInsensitiveInKeywords() {
     queryShouldPassSyntaxAndSemanticCheck(query);
   }
 
-  /**
-   * Commands that fail syntax analysis should throw
-   * {@link SyntaxCheckException}.
-   */
+  /** Commands that fail syntax analysis should throw {@link SyntaxCheckException}. */
   @Test
   public void queryNotStartingWithSearchCommandShouldFailSyntaxCheck() {
     String query = "fields firstname";
@@ -108,14 +103,12 @@ public void unsupportedAggregationFunctionShouldFailSyntaxCheck() {
     queryShouldThrowSyntaxException(query, "Failed to parse query due to offending symbol");
   }
 
-  /**
-   * Commands that fail semantic analysis should throw {@link SemanticCheckException}.
-   */
+  /** Commands that fail semantic analysis should throw {@link SemanticCheckException}. */
   @Test
   public void nonexistentFieldShouldFailSemanticCheck() {
     String query = String.format("search source=%s | fields name", TEST_INDEX_ACCOUNT);
-    queryShouldThrowSemanticException(query, "can't resolve Symbol(namespace=FIELD_NAME, "
-        + "name=name) in type env");
+    queryShouldThrowSemanticException(
+        query, "can't resolve Symbol(namespace=FIELD_NAME, " + "name=name) in type env");
   }
 
   private void queryShouldPassSyntaxAndSemanticCheck(String query) {
@@ -135,7 +128,7 @@ private void queryShouldThrowSyntaxException(String query, String... messages) {
     } catch (ResponseException e) {
       String errorMsg = e.getMessage();
       assertTrue(errorMsg.contains("SyntaxCheckException"));
-      for (String msg: messages) {
+      for (String msg : messages) {
         assertTrue(errorMsg.contains(msg));
       }
     } catch (IOException e) {
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/QueryStringIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/QueryStringIT.java
index d178910825..fc797983d2 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/QueryStringIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/QueryStringIT.java
@@ -27,22 +27,29 @@ public void all_fields_test() throws IOException {
 
   @Test
   public void mandatory_params_test() throws IOException {
-    String query = "source=" + TEST_INDEX_BEER + " | where query_string([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste')";
+    String query =
+        "source="
+            + TEST_INDEX_BEER
+            + " | where query_string([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste')";
     JSONObject result = executeQuery(query);
     assertEquals(16, result.getInt("total"));
   }
 
   @Test
   public void all_params_test() throws IOException {
-    String query = "source=" + TEST_INDEX_BEER + " | where query_string(['Body', Tags, Title], 'taste beer',"
-        + "allow_leading_wildcard=true, enable_position_increments=true, escape=false,"
-        + "fuzziness= 1, fuzzy_rewrite='constant_score', max_determinized_states = 10000,"
-        + "analyzer='english', analyze_wildcard = false, quote_field_suffix = '.exact',"
-        + "auto_generate_synonyms_phrase_query=true, boost = 0.77,"
-        + "quote_analyzer='standard', phrase_slop=0, rewrite='constant_score', type='best_fields',"
-        + "tie_breaker=0.3, time_zone='Canada/Pacific', default_operator='or',"
-        + "fuzzy_transpositions = false, lenient = true, fuzzy_max_expansions = 25,"
-        + "minimum_should_match = '2<-25% 9<-3', fuzzy_prefix_length = 7)";
+    String query =
+        "source="
+            + TEST_INDEX_BEER
+            + " | where query_string(['Body', Tags, Title], 'taste"
+            + " beer',allow_leading_wildcard=true, enable_position_increments=true,"
+            + " escape=false,fuzziness= 1, fuzzy_rewrite='constant_score', max_determinized_states"
+            + " = 10000,analyzer='english', analyze_wildcard = false, quote_field_suffix ="
+            + " '.exact',auto_generate_synonyms_phrase_query=true, boost ="
+            + " 0.77,quote_analyzer='standard', phrase_slop=0, rewrite='constant_score',"
+            + " type='best_fields',tie_breaker=0.3, time_zone='Canada/Pacific',"
+            + " default_operator='or',fuzzy_transpositions = false, lenient = true,"
+            + " fuzzy_max_expansions = 25,minimum_should_match = '2<-25% 9<-3', fuzzy_prefix_length"
+            + " = 7)";
     JSONObject result = executeQuery(query);
     assertEquals(49, result.getInt("total"));
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/RareCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/RareCommandIT.java
index f65941b8f7..e3ed1661cd 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/RareCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/RareCommandIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
@@ -30,12 +29,8 @@ public void afterTest() throws IOException {
 
   @Test
   public void testRareWithoutGroup() throws IOException {
-    JSONObject result =
-        executeQuery(String.format("source=%s | rare gender", TEST_INDEX_ACCOUNT));
-    verifyDataRows(
-        result,
-        rows("F"),
-        rows("M"));
+    JSONObject result = executeQuery(String.format("source=%s | rare gender", TEST_INDEX_ACCOUNT));
+    verifyDataRows(result, rows("F"), rows("M"));
   }
 
   @Test
@@ -65,6 +60,4 @@ public void testRareWithGroup() throws IOException {
         rows("M", "KY"),
         rows("M", "IN"));
   }
-
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/RelevanceFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/RelevanceFunctionIT.java
index b72dc5230f..8e6614dfed 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/RelevanceFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/RelevanceFunctionIT.java
@@ -6,15 +6,8 @@
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BEER;
-import static org.opensearch.sql.util.MatcherUtils.rows;
-import static org.opensearch.sql.util.MatcherUtils.schema;
-import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
-import static org.opensearch.sql.util.MatcherUtils.verifySchema;
-import static org.opensearch.sql.util.MatcherUtils.verifySome;
 
 import java.io.IOException;
-
-import org.json.JSONObject;
 import org.junit.Test;
 
 public class RelevanceFunctionIT extends PPLIntegTestCase {
@@ -25,11 +18,11 @@ public void init() throws IOException {
 
   @Test
   public void test_wildcard_simple_query_string() throws IOException {
-    String query1 = "SOURCE=" + TEST_INDEX_BEER
-        + " | WHERE simple_query_string(['Tags'], 'taste') | fields Id";
+    String query1 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE simple_query_string(['Tags'], 'taste') | fields Id";
     var result1 = executeQuery(query1);
-    String query2 = "SOURCE=" + TEST_INDEX_BEER
-        + " | WHERE simple_query_string(['T*'], 'taste') | fields Id";
+    String query2 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE simple_query_string(['T*'], 'taste') | fields Id";
     var result2 = executeQuery(query2);
     assertNotEquals(result2.getInt("total"), result1.getInt("total"));
   }
@@ -40,11 +33,15 @@ public void test_wildcard_simple_query_string() throws IOException {
    */
   @Test
   public void verify_flags_in_simple_query_string() throws IOException {
-    String query1 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE simple_query_string(['Body'], '-free', flags='NONE|PREFIX|ESCAPE')";
+    String query1 =
+        "SOURCE="
+            + TEST_INDEX_BEER
+            + " | WHERE simple_query_string(['Body'], '-free', flags='NONE|PREFIX|ESCAPE')";
     var result1 = executeQuery(query1);
-    String query2 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE simple_query_string([Body], '-free', flags='NOT|AND|OR')";
+    String query2 =
+        "SOURCE="
+            + TEST_INDEX_BEER
+            + " | WHERE simple_query_string([Body], '-free', flags='NOT|AND|OR')";
     var result2 = executeQuery(query2);
     assertNotEquals(result2.getInt("total"), result1.getInt("total"));
 
@@ -60,11 +57,11 @@ public void verify_flags_in_simple_query_string() throws IOException {
    */
   @Test
   public void verify_escape_in_query_string() throws IOException {
-    String query1 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE query_string([Title], '?', escape=true);";
+    String query1 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE query_string([Title], '?', escape=true);";
     var result1 = executeQuery(query1);
-    String query2 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE query_string([Title], '?', escape=false);";
+    String query2 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE query_string([Title], '?', escape=false);";
     var result2 = executeQuery(query2);
     assertEquals(0, result1.getInt("total"));
     assertEquals(8, result2.getInt("total"));
@@ -77,11 +74,15 @@ public void verify_escape_in_query_string() throws IOException {
    */
   @Test
   public void verify_default_operator_in_query_string() throws IOException {
-    String query1 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE query_string([Title], 'beer taste', default_operator='OR')";
+    String query1 =
+        "SOURCE="
+            + TEST_INDEX_BEER
+            + " | WHERE query_string([Title], 'beer taste', default_operator='OR')";
     var result1 = executeQuery(query1);
-    String query2 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE query_string([Title], 'beer taste', default_operator='AND')";
+    String query2 =
+        "SOURCE="
+            + TEST_INDEX_BEER
+            + " | WHERE query_string([Title], 'beer taste', default_operator='AND')";
     var result2 = executeQuery(query2);
     assertEquals(16, result1.getInt("total"));
     assertEquals(4, result2.getInt("total"));
@@ -89,11 +90,15 @@ public void verify_default_operator_in_query_string() throws IOException {
 
   @Test
   public void verify_default_operator_in_simple_query_string() throws IOException {
-    String query1 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE simple_query_string([Title], 'beer taste', default_operator='OR')";
+    String query1 =
+        "SOURCE="
+            + TEST_INDEX_BEER
+            + " | WHERE simple_query_string([Title], 'beer taste', default_operator='OR')";
     var result1 = executeQuery(query1);
-    String query2 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE simple_query_string([Title], 'beer taste', default_operator='AND')";
+    String query2 =
+        "SOURCE="
+            + TEST_INDEX_BEER
+            + " | WHERE simple_query_string([Title], 'beer taste', default_operator='AND')";
     var result2 = executeQuery(query2);
     assertEquals(16, result1.getInt("total"));
     assertEquals(4, result2.getInt("total"));
@@ -101,11 +106,11 @@ public void verify_default_operator_in_simple_query_string() throws IOException
 
   @Test
   public void verify_default_operator_in_multi_match() throws IOException {
-    String query1 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE multi_match([Title], 'beer taste', operator='OR')";
+    String query1 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE multi_match([Title], 'beer taste', operator='OR')";
     var result1 = executeQuery(query1);
-    String query2 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE multi_match([Title], 'beer taste', operator='AND')";
+    String query2 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE multi_match([Title], 'beer taste', operator='AND')";
     var result2 = executeQuery(query2);
     assertEquals(16, result1.getInt("total"));
     assertEquals(4, result2.getInt("total"));
@@ -113,11 +118,11 @@ public void verify_default_operator_in_multi_match() throws IOException {
 
   @Test
   public void verify_operator_in_match() throws IOException {
-    String query1 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE match(Title, 'beer taste', operator='OR')";
+    String query1 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE match(Title, 'beer taste', operator='OR')";
     var result1 = executeQuery(query1);
-    String query2 = "SOURCE="
-        + TEST_INDEX_BEER + " | WHERE match(Title, 'beer taste', operator='AND')";
+    String query2 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE match(Title, 'beer taste', operator='AND')";
     var result2 = executeQuery(query2);
     assertEquals(16, result1.getInt("total"));
     assertEquals(4, result2.getInt("total"));
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/RenameCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/RenameCommandIT.java
index ad1add4e12..ae06e75a06 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/RenameCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/RenameCommandIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
@@ -43,7 +42,9 @@ public void testRenameMultiField() throws IOException {
     verifyColumn(result, columnName("FIRSTNAME"), columnName("AGE"));
   }
 
-  @Ignore("Wildcard is unsupported yet. Enable once https://github.com/opensearch-project/sql/issues/787 is resolved.")
+  @Ignore(
+      "Wildcard is unsupported yet. Enable once"
+          + " https://github.com/opensearch-project/sql/issues/787 is resolved.")
   @Test
   public void testRenameWildcardFields() throws IOException {
     JSONObject result = executeQuery("source=" + TEST_INDEX_ACCOUNT + " | rename %name as %NAME");
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/ResourceMonitorIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/ResourceMonitorIT.java
index e608e94512..eed2369590 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/ResourceMonitorIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/ResourceMonitorIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DOG;
@@ -31,11 +30,11 @@ public void queryExceedResourceLimitShouldFail() throws IOException {
         new ClusterSetting("persistent", Settings.Key.QUERY_MEMORY_LIMIT.getKeyValue(), "1%"));
     String query = String.format("search source=%s age=20", TEST_INDEX_DOG);
 
-    ResponseException exception =
-        expectThrows(ResponseException.class, () -> executeQuery(query));
-    assertEquals(503, exception.getResponse().getStatusLine().getStatusCode());
-    assertThat(exception.getMessage(), Matchers.containsString("resource is not enough to run the"
-        + " query, quit."));
+    ResponseException exception = expectThrows(ResponseException.class, () -> executeQuery(query));
+    assertEquals(500, exception.getResponse().getStatusLine().getStatusCode());
+    assertThat(
+        exception.getMessage(),
+        Matchers.containsString("resource is not enough to run the" + " query, quit."));
 
     // update plugins.ppl.query.memory_limit to default value 85%
     updateClusterSettings(
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/SearchCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/SearchCommandIT.java
index 2e62b464bb..5d1b0203d7 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/SearchCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/SearchCommandIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/SettingsIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/SettingsIT.java
index d012cce9e8..224afde4c5 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/SettingsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/SettingsIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
@@ -26,17 +25,13 @@ public void init() throws IOException {
   public void testQuerySizeLimit() throws IOException {
     // Default setting, fetch 200 rows from source
     JSONObject result =
-        executeQuery(
-            String.format(
-                "search source=%s age>35 | fields firstname", TEST_INDEX_BANK));
+        executeQuery(String.format("search source=%s age>35 | fields firstname", TEST_INDEX_BANK));
     verifyDataRows(result, rows("Hattie"), rows("Elinor"), rows("Virginia"));
 
     // Fetch 1 rows from source
     setQuerySizeLimit(1);
     result =
-        executeQuery(
-            String.format(
-                "search source=%s age>35 | fields firstname", TEST_INDEX_BANK));
+        executeQuery(String.format("search source=%s age>35 | fields firstname", TEST_INDEX_BANK));
     verifyDataRows(result, rows("Hattie"));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/ShowDataSourcesCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/ShowDataSourcesCommandIT.java
index 3614168ab8..cf5df01993 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/ShowDataSourcesCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/ShowDataSourcesCommandIT.java
@@ -12,35 +12,63 @@
 import static org.opensearch.sql.util.MatcherUtils.verifyColumn;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 
+import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.BeforeClass;
 import org.junit.jupiter.api.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.Response;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
 
 public class ShowDataSourcesCommandIT extends PPLIntegTestCase {
 
+  /**
+   * Integ tests are dependent on self generated metrics in prometheus instance. When running
+   * individual integ tests there is no time for generation of metrics in the test prometheus
+   * instance. This method gives prometheus time to generate metrics on itself.
+   *
+   * @throws InterruptedException
+   */
+  @BeforeClass
+  protected static void metricGenerationWait() throws InterruptedException {
+    Thread.sleep(10000);
+  }
+
+  @Override
+  protected void init() throws InterruptedException, IOException {
+    DataSourceMetadata createDSM =
+        new DataSourceMetadata.Builder()
+            .setName("my_prometheus")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(ImmutableMap.of("prometheus.uri", "http://localhost:9090"))
+            .build();
+    Request createRequest = getCreateDataSourceRequest(createDSM);
+    Response response = client().performRequest(createRequest);
+    Assert.assertEquals(201, response.getStatusLine().getStatusCode());
+  }
+
+  @After
+  protected void deleteDataSourceMetadata() throws IOException {
+    Request deleteRequest = getDeleteDataSourceRequest("my_prometheus");
+    Response deleteResponse = client().performRequest(deleteRequest);
+    Assert.assertEquals(204, deleteResponse.getStatusLine().getStatusCode());
+  }
+
   @Test
   public void testShowDataSourcesCommands() throws IOException {
     JSONObject result = executeQuery("show datasources");
-    verifyDataRows(result,
-        rows("my_prometheus", "PROMETHEUS"),
-        rows("@opensearch", "OPENSEARCH"));
-    verifyColumn(
-        result,
-        columnName("DATASOURCE_NAME"),
-        columnName("CONNECTOR_TYPE")
-    );
+    verifyDataRows(result, rows("my_prometheus", "PROMETHEUS"));
+    verifyColumn(result, columnName("DATASOURCE_NAME"), columnName("CONNECTOR_TYPE"));
   }
 
   @Test
   public void testShowDataSourcesCommandsWithWhereClause() throws IOException {
     JSONObject result = executeQuery("show datasources | where CONNECTOR_TYPE='PROMETHEUS'");
-    verifyDataRows(result,
-        rows("my_prometheus", "PROMETHEUS"));
-    verifyColumn(
-        result,
-        columnName("DATASOURCE_NAME"),
-        columnName("CONNECTOR_TYPE")
-    );
+    verifyDataRows(result, rows("my_prometheus", "PROMETHEUS"));
+    verifyColumn(result, columnName("DATASOURCE_NAME"), columnName("CONNECTOR_TYPE"));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/SimpleQueryStringIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/SimpleQueryStringIT.java
index f13aaadc08..1ad4834d80 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/SimpleQueryStringIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/SimpleQueryStringIT.java
@@ -6,14 +6,8 @@
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BEER;
-import static org.opensearch.sql.util.MatcherUtils.rows;
-import static org.opensearch.sql.util.MatcherUtils.schema;
-import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
-import static org.opensearch.sql.util.MatcherUtils.verifySchema;
-import static org.opensearch.sql.util.MatcherUtils.verifySome;
 
 import java.io.IOException;
-
 import org.json.JSONObject;
 import org.junit.Test;
 
@@ -25,36 +19,42 @@ public void init() throws IOException {
 
   @Test
   public void test_simple_query_string() throws IOException {
-    String query = "SOURCE=" + TEST_INDEX_BEER
-        + " | WHERE simple_query_string([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste') | fields Id";
+    String query =
+        "SOURCE="
+            + TEST_INDEX_BEER
+            + " | WHERE simple_query_string([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste') |"
+            + " fields Id";
     var result = executeQuery(query);
     assertEquals(16, result.getInt("total"));
   }
 
   @Test
   public void test_simple_query_string_all_params() throws IOException {
-    String query = "SOURCE=" + TEST_INDEX_BEER
-        + " | WHERE simple_query_string(['Body', Tags, Title], 'taste beer', default_operator='or',"
-        + "analyzer=english, analyze_wildcard = false, quote_field_suffix = '.exact',"
-        + "auto_generate_synonyms_phrase_query=true, boost = 0.77, flags='PREFIX',"
-        + "fuzzy_transpositions = false, lenient = true, fuzzy_max_expansions = 25,"
-        + "minimum_should_match = '2<-25% 9<-3', fuzzy_prefix_length = 7) | fields Id";
+    String query =
+        "SOURCE="
+            + TEST_INDEX_BEER
+            + " | WHERE simple_query_string(['Body', Tags, Title], 'taste beer',"
+            + " default_operator='or',analyzer=english, analyze_wildcard = false,"
+            + " quote_field_suffix = '.exact',auto_generate_synonyms_phrase_query=true, boost ="
+            + " 0.77, flags='PREFIX',fuzzy_transpositions = false, lenient = true,"
+            + " fuzzy_max_expansions = 25,minimum_should_match = '2<-25% 9<-3', fuzzy_prefix_length"
+            + " = 7) | fields Id";
     var result = executeQuery(query);
     assertEquals(49, result.getInt("total"));
   }
 
   @Test
   public void test_wildcard_simple_query_string() throws IOException {
-    String query1 = "SOURCE=" + TEST_INDEX_BEER
-        + " | WHERE simple_query_string(['Tags'], 'taste') | fields Id";
+    String query1 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE simple_query_string(['Tags'], 'taste') | fields Id";
     var result1 = executeQuery(query1);
-    String query2 = "SOURCE=" + TEST_INDEX_BEER
-        + " | WHERE simple_query_string(['T*'], 'taste') | fields Id";
+    String query2 =
+        "SOURCE=" + TEST_INDEX_BEER + " | WHERE simple_query_string(['T*'], 'taste') | fields Id";
     var result2 = executeQuery(query2);
     assertNotEquals(result2.getInt("total"), result1.getInt("total"));
 
-    String query3 = "source=" + TEST_INDEX_BEER
-        + " | where simple_query_string(['*Date'], '2014-01-22')";
+    String query3 =
+        "source=" + TEST_INDEX_BEER + " | where simple_query_string(['*Date'], '2014-01-22')";
     JSONObject result3 = executeQuery(query3);
     assertEquals(10, result3.getInt("total"));
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/SortCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/SortCommandIT.java
index 0fd4e9ec86..c90a506252 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/SortCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/SortCommandIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
@@ -14,7 +13,6 @@
 
 import java.io.IOException;
 import org.json.JSONObject;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class SortCommandIT extends PPLIntegTestCase {
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/StandaloneIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/StandaloneIT.java
index 33050e7200..f81e1b6615 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/StandaloneIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/StandaloneIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.datasource.model.DataSourceMetadata.defaultOpenSearchDataSourceMetadata;
@@ -15,44 +14,55 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
+import lombok.RequiredArgsConstructor;
 import org.junit.jupiter.api.Test;
 import org.opensearch.client.Request;
 import org.opensearch.client.RestClient;
 import org.opensearch.client.RestHighLevelClient;
+import org.opensearch.common.inject.AbstractModule;
+import org.opensearch.common.inject.Injector;
+import org.opensearch.common.inject.ModulesBuilder;
+import org.opensearch.common.inject.Provides;
+import org.opensearch.common.inject.Singleton;
 import org.opensearch.sql.analysis.Analyzer;
 import org.opensearch.sql.analysis.ExpressionAnalyzer;
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.datasource.DataSourceService;
-import org.opensearch.sql.datasource.DataSourceServiceImpl;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasources.auth.DataSourceUserAuthorizationHelper;
+import org.opensearch.sql.datasources.service.DataSourceMetadataStorage;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.ExecutionEngine.QueryResponse;
 import org.opensearch.sql.executor.QueryManager;
 import org.opensearch.sql.executor.QueryService;
 import org.opensearch.sql.executor.execution.QueryPlanFactory;
+import org.opensearch.sql.executor.pagination.PlanSerializer;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
-import org.opensearch.sql.expression.function.FunctionProperties;
 import org.opensearch.sql.monitor.AlwaysHealthyMonitor;
+import org.opensearch.sql.monitor.ResourceMonitor;
 import org.opensearch.sql.opensearch.client.OpenSearchClient;
 import org.opensearch.sql.opensearch.client.OpenSearchRestClient;
 import org.opensearch.sql.opensearch.executor.OpenSearchExecutionEngine;
+import org.opensearch.sql.opensearch.executor.protector.ExecutionProtector;
 import org.opensearch.sql.opensearch.executor.protector.OpenSearchExecutionProtector;
+import org.opensearch.sql.opensearch.security.SecurityAccess;
 import org.opensearch.sql.opensearch.storage.OpenSearchDataSourceFactory;
+import org.opensearch.sql.opensearch.storage.OpenSearchStorageEngine;
 import org.opensearch.sql.planner.Planner;
 import org.opensearch.sql.planner.optimizer.LogicalPlanOptimizer;
-import org.opensearch.sql.ppl.config.PPLServiceConfig;
+import org.opensearch.sql.ppl.antlr.PPLSyntaxParser;
 import org.opensearch.sql.ppl.domain.PPLQueryRequest;
 import org.opensearch.sql.protocol.response.QueryResult;
 import org.opensearch.sql.protocol.response.format.SimpleJsonResponseFormatter;
+import org.opensearch.sql.sql.SQLService;
+import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
 import org.opensearch.sql.storage.DataSourceFactory;
+import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.util.ExecuteOnCallerThreadQueryManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
 
 /**
  * Run PPL with query engine outside OpenSearch cluster. This IT doesn't require our plugin
@@ -61,33 +71,27 @@
  */
 public class StandaloneIT extends PPLIntegTestCase {
 
-  private RestHighLevelClient restClient;
-
   private PPLService pplService;
 
   @Override
   public void init() {
-    // Using client() defined in ODFERestTestCase.
-    restClient = new InternalRestHighLevelClient(client());
-
+    RestHighLevelClient restClient = new InternalRestHighLevelClient(client());
     OpenSearchClient client = new OpenSearchRestClient(restClient);
-    AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-    context.registerBean(ExecutionEngine.class, () -> new OpenSearchExecutionEngine(client,
-        new OpenSearchExecutionProtector(new AlwaysHealthyMonitor())));
-    context.registerBean(OpenSearchClient.class, () -> client);
-    context.registerBean(Settings.class, () -> defaultSettings());
-    context.registerBean(FunctionProperties.class, FunctionProperties::new);
-    DataSourceService dataSourceService = new DataSourceServiceImpl(
-        new ImmutableSet.Builder<DataSourceFactory>()
-            .add(new OpenSearchDataSourceFactory(client, defaultSettings()))
-            .build());
-    dataSourceService.addDataSource(defaultOpenSearchDataSourceMetadata());
-    context.registerBean(DataSourceService.class, () -> dataSourceService);
-    context.register(StandaloneConfig.class);
-    context.register(PPLServiceConfig.class);
-    context.refresh();
-
-    pplService = context.getBean(PPLService.class);
+    DataSourceService dataSourceService =
+        new DataSourceServiceImpl(
+            new ImmutableSet.Builder<DataSourceFactory>()
+                .add(new OpenSearchDataSourceFactory(client, defaultSettings()))
+                .build(),
+            getDataSourceMetadataStorage(),
+            getDataSourceUserRoleHelper());
+    dataSourceService.createDataSource(defaultOpenSearchDataSourceMetadata());
+
+    ModulesBuilder modules = new ModulesBuilder();
+    modules.add(
+        new StandaloneModule(
+            new InternalRestHighLevelClient(client()), defaultSettings(), dataSourceService));
+    Injector injector = modules.createInjector();
+    pplService = SecurityAccess.doPrivileged(() -> injector.getInstance(PPLService.class));
   }
 
   @Test
@@ -145,9 +149,8 @@ public void onFailure(Exception e) {
 
   private Settings defaultSettings() {
     return new Settings() {
-      private final Map<Key, Integer> defaultSettings = new ImmutableMap.Builder<Key, Integer>()
-          .put(Key.QUERY_SIZE_LIMIT, 200)
-          .build();
+      private final Map<Key, Integer> defaultSettings =
+          new ImmutableMap.Builder<Key, Integer>().put(Key.QUERY_SIZE_LIMIT, 200).build();
 
       @Override
       public <T> T getSettingValue(Key key) {
@@ -161,37 +164,113 @@ public List<?> getSettings() {
     };
   }
 
-  /**
-   * Internal RestHighLevelClient only for testing purpose.
-   */
+  /** Internal RestHighLevelClient only for testing purpose. */
   static class InternalRestHighLevelClient extends RestHighLevelClient {
     public InternalRestHighLevelClient(RestClient restClient) {
       super(restClient, RestClient::close, Collections.emptyList());
     }
   }
 
-  @Configuration
-  static class StandaloneConfig {
-    @Autowired
-    private DataSourceService dataSourceService;
+  @RequiredArgsConstructor
+  public class StandaloneModule extends AbstractModule {
+
+    private final RestHighLevelClient client;
+
+    private final Settings settings;
 
-    @Autowired
-    private ExecutionEngine executionEngine;
+    private final DataSourceService dataSourceService;
 
-    @Bean
-    QueryManager queryManager() {
+    private final BuiltinFunctionRepository functionRepository =
+        BuiltinFunctionRepository.getInstance();
+
+    @Override
+    protected void configure() {}
+
+    @Provides
+    public OpenSearchClient openSearchClient() {
+      return new OpenSearchRestClient(client);
+    }
+
+    @Provides
+    public StorageEngine storageEngine(OpenSearchClient client) {
+      return new OpenSearchStorageEngine(client, settings);
+    }
+
+    @Provides
+    public ExecutionEngine executionEngine(
+        OpenSearchClient client, ExecutionProtector protector, PlanSerializer planSerializer) {
+      return new OpenSearchExecutionEngine(client, protector, planSerializer);
+    }
+
+    @Provides
+    public ResourceMonitor resourceMonitor() {
+      return new AlwaysHealthyMonitor();
+    }
+
+    @Provides
+    public ExecutionProtector protector(ResourceMonitor resourceMonitor) {
+      return new OpenSearchExecutionProtector(resourceMonitor);
+    }
+
+    @Provides
+    @Singleton
+    public QueryManager queryManager() {
       return new ExecuteOnCallerThreadQueryManager();
     }
 
-    @Bean
-    @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    QueryPlanFactory queryExecutionFactory() {
-      BuiltinFunctionRepository functionRepository = BuiltinFunctionRepository.getInstance();
-      Analyzer analyzer = new Analyzer(new ExpressionAnalyzer(functionRepository),
-          dataSourceService, functionRepository);
-      Planner planner =
-          new Planner(LogicalPlanOptimizer.create());
-      return new QueryPlanFactory(new QueryService(analyzer, executionEngine, planner));
+    @Provides
+    public PPLService pplService(QueryManager queryManager, QueryPlanFactory queryPlanFactory) {
+      return new PPLService(new PPLSyntaxParser(), queryManager, queryPlanFactory);
+    }
+
+    @Provides
+    public SQLService sqlService(QueryManager queryManager, QueryPlanFactory queryPlanFactory) {
+      return new SQLService(new SQLSyntaxParser(), queryManager, queryPlanFactory);
+    }
+
+    @Provides
+    public PlanSerializer planSerializer(StorageEngine storageEngine) {
+      return new PlanSerializer(storageEngine);
+    }
+
+    @Provides
+    public QueryPlanFactory queryPlanFactory(ExecutionEngine executionEngine) {
+      Analyzer analyzer =
+          new Analyzer(
+              new ExpressionAnalyzer(functionRepository), dataSourceService, functionRepository);
+      Planner planner = new Planner(LogicalPlanOptimizer.create());
+      QueryService queryService = new QueryService(analyzer, executionEngine, planner);
+      return new QueryPlanFactory(queryService);
     }
   }
+
+  public static DataSourceMetadataStorage getDataSourceMetadataStorage() {
+    return new DataSourceMetadataStorage() {
+      @Override
+      public List<DataSourceMetadata> getDataSourceMetadata() {
+        return Collections.emptyList();
+      }
+
+      @Override
+      public Optional<DataSourceMetadata> getDataSourceMetadata(String datasourceName) {
+        return Optional.empty();
+      }
+
+      @Override
+      public void createDataSourceMetadata(DataSourceMetadata dataSourceMetadata) {}
+
+      @Override
+      public void updateDataSourceMetadata(DataSourceMetadata dataSourceMetadata) {}
+
+      @Override
+      public void deleteDataSourceMetadata(String datasourceName) {}
+    };
+  }
+
+  public static DataSourceUserAuthorizationHelper getDataSourceUserRoleHelper() {
+    return new DataSourceUserAuthorizationHelper() {
+      @Override
+      public void authorizeDataSource(DataSourceMetadata dataSourceMetadata) {}
+    };
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/StatsCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/StatsCommandIT.java
index cf560c129c..9218041e33 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/StatsCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/StatsCommandIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
@@ -12,13 +11,11 @@
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.schema;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRowsInOrder;
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
+import static org.opensearch.sql.util.MatcherUtils.verifySchemaInOrder;
 
 import java.io.IOException;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
 
@@ -70,26 +67,23 @@ public void testStatsDistinctCount() throws IOException {
     verifySchema(response, schema("distinct_count(gender)", null, "integer"));
     verifyDataRows(response, rows(2));
 
-    response =
-        executeQuery(String.format("source=%s | stats dc(age)", TEST_INDEX_ACCOUNT));
+    response = executeQuery(String.format("source=%s | stats dc(age)", TEST_INDEX_ACCOUNT));
     verifySchema(response, schema("dc(age)", null, "integer"));
     verifyDataRows(response, rows(21));
   }
 
   @Test
   public void testStatsMin() throws IOException {
-    JSONObject response = executeQuery(String.format(
-        "source=%s | stats min(age)",
-        TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(String.format("source=%s | stats min(age)", TEST_INDEX_ACCOUNT));
     verifySchema(response, schema("min(age)", null, "long"));
     verifyDataRows(response, rows(20));
   }
 
   @Test
   public void testStatsMax() throws IOException {
-    JSONObject response = executeQuery(String.format(
-        "source=%s | stats max(age)",
-        TEST_INDEX_ACCOUNT));
+    JSONObject response =
+        executeQuery(String.format("source=%s | stats max(age)", TEST_INDEX_ACCOUNT));
     verifySchema(response, schema("max(age)", null, "long"));
     verifyDataRows(response, rows(40));
   }
@@ -97,8 +91,8 @@ public void testStatsMax() throws IOException {
   @Test
   public void testStatsNested() throws IOException {
     JSONObject response =
-        executeQuery(String.format("source=%s | stats avg(abs(age) * 2) as AGE",
-            TEST_INDEX_ACCOUNT));
+        executeQuery(
+            String.format("source=%s | stats avg(abs(age) * 2) as AGE", TEST_INDEX_ACCOUNT));
     verifySchema(response, schema("AGE", null, "double"));
     verifyDataRows(response, rows(60.342));
   }
@@ -106,8 +100,7 @@ public void testStatsNested() throws IOException {
   @Test
   public void testStatsNestedDoubleValue() throws IOException {
     JSONObject response =
-        executeQuery(String.format("source=%s | stats avg(abs(age) * 2.0)",
-            TEST_INDEX_ACCOUNT));
+        executeQuery(String.format("source=%s | stats avg(abs(age) * 2.0)", TEST_INDEX_ACCOUNT));
     verifySchema(response, schema("avg(abs(age) * 2.0)", null, "double"));
     verifyDataRows(response, rows(60.342));
   }
@@ -115,88 +108,202 @@ public void testStatsNestedDoubleValue() throws IOException {
   @Test
   public void testStatsWhere() throws IOException {
     JSONObject response =
-        executeQuery(String.format(
-            "source=%s | stats sum(balance) as a by state | where a > 780000",
-            TEST_INDEX_ACCOUNT));
-    verifySchema(response, schema("a", null, "long"),
-        schema("state", null, "string"));
+        executeQuery(
+            String.format(
+                "source=%s | stats sum(balance) as a by state | where a > 780000",
+                TEST_INDEX_ACCOUNT));
+    verifySchema(response, schema("a", null, "long"), schema("state", null, "string"));
     verifyDataRows(response, rows(782199, "TX"));
   }
 
   @Test
   public void testGroupByNullValue() throws IOException {
     JSONObject response =
-        executeQuery(String.format(
-            "source=%s | stats avg(balance) as a by age",
-            TEST_INDEX_BANK_WITH_NULL_VALUES));
-    verifySchema(response, schema("a", null, "double"),
-        schema("age", null, "integer"));
-    verifyDataRows(response,
+        executeQuery(
+            String.format(
+                "source=%s | stats avg(balance) as a by age", TEST_INDEX_BANK_WITH_NULL_VALUES));
+    verifySchema(response, schema("a", null, "double"), schema("age", null, "integer"));
+    verifyDataRows(
+        response,
         rows(null, null),
         rows(32838D, 28),
         rows(39225D, 32),
         rows(4180D, 33),
         rows(48086D, 34),
-        rows(null, 36)
-    );
+        rows(null, 36));
   }
 
-  //Todo. The column of agg function is in random order. This is because we create the project
+  // Todo. The column of agg function is in random order. This is because we create the project
   // all operator from the symbol table which can't maintain the original column order.
   @Test
   public void testMultipleAggregationFunction() throws IOException {
-    JSONObject response = executeQuery(String.format(
-        "source=%s | stats min(age), max(age)",
-        TEST_INDEX_ACCOUNT));
-    verifySchema(response, schema("min(age)", null, "long"),
-        schema("max(age)", null, "long"));
+    JSONObject response =
+        executeQuery(String.format("source=%s | stats min(age), max(age)", TEST_INDEX_ACCOUNT));
+    verifySchema(response, schema("min(age)", null, "long"), schema("max(age)", null, "long"));
     verifyDataRows(response, rows(20, 40));
   }
 
   @Test
   public void testStatsWithNull() throws IOException {
     JSONObject response =
-        executeQuery(String.format(
-            "source=%s | stats avg(age)",
-            TEST_INDEX_BANK_WITH_NULL_VALUES));
+        executeQuery(String.format("source=%s | stats avg(age)", TEST_INDEX_BANK_WITH_NULL_VALUES));
     verifySchema(response, schema("avg(age)", null, "double"));
     verifyDataRows(response, rows(33.166666666666664));
   }
 
   @Test
   public void testStatsWithMissing() throws IOException {
-    JSONObject response = executeQuery(String.format(
-        "source=%s | stats avg(balance)",
-        TEST_INDEX_BANK_WITH_NULL_VALUES));
+    JSONObject response =
+        executeQuery(
+            String.format("source=%s | stats avg(balance)", TEST_INDEX_BANK_WITH_NULL_VALUES));
     verifySchema(response, schema("avg(balance)", null, "double"));
     verifyDataRows(response, rows(31082.25));
   }
 
   @Test
   public void testStatsBySpan() throws IOException {
-    JSONObject response = executeQuery(String.format(
-        "source=%s | stats count() by span(age,10)",
-        TEST_INDEX_BANK));
-    verifySchema(response, schema("count()", null, "integer"), schema("span(age,10)", null, "integer"));
+    JSONObject response =
+        executeQuery(String.format("source=%s | stats count() by span(age,10)", TEST_INDEX_BANK));
+    verifySchema(
+        response, schema("count()", null, "integer"), schema("span(age,10)", null, "integer"));
     verifyDataRows(response, rows(1, 20), rows(6, 30));
   }
 
   @Test
   public void testStatsTimeSpan() throws IOException {
-    JSONObject response = executeQuery(String.format(
-        "source=%s | stats count() by span(birthdate,1y)",
-        TEST_INDEX_BANK));
-    verifySchema(response, schema("count()", null, "integer"), schema(
-        "span(birthdate,1y)", null, "timestamp"));
+    JSONObject response =
+        executeQuery(
+            String.format("source=%s | stats count() by span(birthdate,1y)", TEST_INDEX_BANK));
+    verifySchema(
+        response,
+        schema("count()", null, "integer"),
+        schema("span(birthdate,1y)", null, "timestamp"));
     verifyDataRows(response, rows(2, "2017-01-01 00:00:00"), rows(5, "2018-01-01 00:00:00"));
   }
 
   @Test
   public void testStatsAliasedSpan() throws IOException {
-    JSONObject response = executeQuery(String.format(
-        "source=%s | stats count() by span(age,10) as age_bucket",
-        TEST_INDEX_BANK));
-    verifySchema(response, schema("count()", null, "integer"), schema("age_bucket", null, "integer"));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                "source=%s | stats count() by span(age,10) as age_bucket", TEST_INDEX_BANK));
+    verifySchema(
+        response, schema("count()", null, "integer"), schema("age_bucket", null, "integer"));
     verifyDataRows(response, rows(1, 20), rows(6, 30));
   }
+
+  @Test
+  public void testStatsBySpanAndMultipleFields() throws IOException {
+    JSONObject response =
+        executeQuery(
+            String.format(
+                "source=%s | stats count() by span(age,10), gender, state", TEST_INDEX_BANK));
+    verifySchemaInOrder(
+        response,
+        schema("count()", null, "integer"),
+        schema("span(age,10)", null, "integer"),
+        schema("gender", null, "string"),
+        schema("state", null, "string"));
+    verifyDataRowsInOrder(
+        response,
+        rows(1, 20, "f", "VA"),
+        rows(1, 30, "f", "IN"),
+        rows(1, 30, "f", "PA"),
+        rows(1, 30, "m", "IL"),
+        rows(1, 30, "m", "MD"),
+        rows(1, 30, "m", "TN"),
+        rows(1, 30, "m", "WA"));
+  }
+
+  @Test
+  public void testStatsByMultipleFieldsAndSpan() throws IOException {
+    // Use verifySchemaInOrder() and verifyDataRowsInOrder() to check that the span column is always
+    // the first column in result whatever the order of span in query is first or last one
+    JSONObject response =
+        executeQuery(
+            String.format(
+                "source=%s | stats count() by gender, state, span(age,10)", TEST_INDEX_BANK));
+    verifySchemaInOrder(
+        response,
+        schema("count()", null, "integer"),
+        schema("span(age,10)", null, "integer"),
+        schema("gender", null, "string"),
+        schema("state", null, "string"));
+    verifyDataRowsInOrder(
+        response,
+        rows(1, 20, "f", "VA"),
+        rows(1, 30, "f", "IN"),
+        rows(1, 30, "f", "PA"),
+        rows(1, 30, "m", "IL"),
+        rows(1, 30, "m", "MD"),
+        rows(1, 30, "m", "TN"),
+        rows(1, 30, "m", "WA"));
+  }
+
+  @Test
+  public void testStatsPercentile() throws IOException {
+    JSONObject response =
+        executeQuery(String.format("source=%s | stats percentile(balance, 50)", TEST_INDEX_BANK));
+    verifySchema(response, schema("percentile(balance, 50)", null, "long"));
+    verifyDataRows(response, rows(32838));
+  }
+
+  @Test
+  public void testStatsPercentileWithNull() throws IOException {
+    JSONObject response =
+        executeQuery(
+            String.format(
+                "source=%s | stats percentile(balance, 50)", TEST_INDEX_BANK_WITH_NULL_VALUES));
+    verifySchema(response, schema("percentile(balance, 50)", null, "long"));
+    verifyDataRows(response, rows(36031));
+  }
+
+  @Test
+  public void testStatsPercentileWithCompression() throws IOException {
+    JSONObject response =
+        executeQuery(
+            String.format("source=%s | stats percentile(balance, 50, 1)", TEST_INDEX_BANK));
+    verifySchema(response, schema("percentile(balance, 50, 1)", null, "long"));
+    verifyDataRows(response, rows(32838));
+  }
+
+  @Test
+  public void testStatsPercentileWhere() throws IOException {
+    JSONObject response =
+        executeQuery(
+            String.format(
+                "source=%s | stats percentile(balance, 50) as p50 by state | where p50 > 40000",
+                TEST_INDEX_BANK));
+    verifySchema(response, schema("p50", null, "long"), schema("state", null, "string"));
+    verifyDataRows(response, rows(48086, "IN"), rows(40540, "PA"));
+  }
+
+  @Test
+  public void testStatsPercentileByNullValue() throws IOException {
+    JSONObject response =
+        executeQuery(
+            String.format(
+                "source=%s | stats percentile(balance, 50) as p50 by age",
+                TEST_INDEX_BANK_WITH_NULL_VALUES));
+    verifySchema(response, schema("p50", null, "long"), schema("age", null, "integer"));
+    verifyDataRows(
+        response,
+        rows(0, null),
+        rows(32838, 28),
+        rows(39225, 32),
+        rows(4180, 33),
+        rows(48086, 34),
+        rows(0, 36));
+  }
+
+  @Test
+  public void testStatsPercentileBySpan() throws IOException {
+    JSONObject response =
+        executeQuery(
+            String.format(
+                "source=%s | stats percentile(balance, 50) as p50 by span(age, 10) as age_bucket",
+                TEST_INDEX_BANK));
+    verifySchema(response, schema("p50", null, "long"), schema("age_bucket", null, "integer"));
+    verifyDataRows(response, rows(32838, 20), rows(27821, 30));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/StreamingQueryIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/StreamingQueryIT.java
deleted file mode 100644
index 2a00e14d34..0000000000
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/StreamingQueryIT.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.ppl;
-
-import com.carrotsearch.randomizedtesting.ThreadFilter;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.Comparator;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import lombok.Getter;
-import org.junit.After;
-import org.junit.Test;
-import org.opensearch.sql.analysis.Analyzer;
-import org.opensearch.sql.analysis.ExpressionAnalyzer;
-import org.opensearch.sql.ast.dsl.AstDSL;
-import org.opensearch.sql.common.response.ResponseListener;
-import org.opensearch.sql.datasource.DataSourceService;
-import org.opensearch.sql.datasource.DataSourceServiceImpl;
-import org.opensearch.sql.datasource.model.DataSourceMetadata;
-import org.opensearch.sql.datasource.model.DataSourceType;
-import org.opensearch.sql.executor.DefaultExecutionEngine;
-import org.opensearch.sql.executor.DefaultQueryManager;
-import org.opensearch.sql.executor.ExecutionEngine;
-import org.opensearch.sql.executor.QueryId;
-import org.opensearch.sql.executor.QueryService;
-import org.opensearch.sql.executor.execution.StreamingQueryPlan;
-import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
-import org.opensearch.sql.filesystem.storage.FSDataSourceFactory;
-import org.opensearch.sql.filesystem.storage.FSStorageEngine;
-import org.opensearch.sql.planner.Planner;
-import org.opensearch.sql.planner.optimizer.LogicalPlanOptimizer;
-import org.opensearch.sql.storage.DataSourceFactory;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-
-@ThreadLeakFilters(filters = {StreamingQueryIT.HadoopFSThreadsFilter.class})
-public class StreamingQueryIT extends PPLIntegTestCase {
-
-  private static final int INTERVAL_IN_SECONDS = 1;
-
-  private static final String DATASOURCE_NAME = "fs";
-
-  private static final String TABLE_NAME = "mock";
-
-  private final AtomicInteger result = new AtomicInteger(0);
-
-  private Source source;
-
-  private StreamingQuery query;
-
-  @Test
-  public void testStreamingQuery() throws IOException, InterruptedException {
-    source = new Source();
-    query = fromFile(source.tempDir);
-    query.run();
-
-    source.add(0);
-    source.add(1);
-    query.sumShouldBe(1);
-
-    // no source update.
-    query.sumShouldBe(1);
-
-    source.add(1);
-    query.sumShouldBe(2);
-  }
-
-  @After
-  public void clean() throws InterruptedException, IOException {
-    query.close();
-    source.close();
-  }
-
-  StreamingQuery fromFile(java.nio.file.Path path) {
-    return new StreamingQuery(path);
-  }
-
-  class Source {
-    @Getter private final java.nio.file.Path tempDir;
-
-    public Source() throws IOException {
-      tempDir = Files.createTempDirectory("tempDir");
-    }
-
-    Source add(int v) throws IOException {
-      java.nio.file.Path path = Files.createFile(tempDir.resolve(UUID.randomUUID().toString()));
-      String buf = String.valueOf(v);
-      FileOutputStream outputStream = new FileOutputStream(path.toFile());
-      outputStream.write(buf.getBytes(StandardCharsets.UTF_8));
-      outputStream.close();
-      return this;
-    }
-
-    void close() throws IOException {
-      Files.walk(tempDir)
-          .sorted(Comparator.reverseOrder())
-          .map(java.nio.file.Path::toFile)
-          .forEach(File::delete);
-      assertFalse("temp dir still exist", Files.exists(tempDir));
-    }
-  }
-
-  class StreamingQuery {
-
-    final AnnotationConfigApplicationContext context;
-
-    final DefaultQueryManager queryManager;
-
-    final QueryService queryService;
-
-    final QueryId queryId = QueryId.queryId();
-
-    final FSStorageEngine storageEngine;
-
-    public StreamingQuery(java.nio.file.Path tempDir) {
-      result.set(0);
-      context = new AnnotationConfigApplicationContext();
-      context.refresh();
-      DataSourceService dataSourceService =
-          new DataSourceServiceImpl(
-              new ImmutableSet.Builder<DataSourceFactory>()
-                  .add(new FSDataSourceFactory(tempDir.toUri(), result))
-                  .build());
-      dataSourceService.addDataSource(fsDataSourceMetadata());
-      context.registerBean(DataSourceService.class, () -> dataSourceService);
-      storageEngine =
-          (FSStorageEngine) dataSourceService.getDataSource(DATASOURCE_NAME).getStorageEngine();
-      final BuiltinFunctionRepository functionRepository = BuiltinFunctionRepository.getInstance();
-      Analyzer analyzer =
-          new Analyzer(
-              new ExpressionAnalyzer(functionRepository), dataSourceService, functionRepository);
-      Planner planner = new Planner(LogicalPlanOptimizer.create());
-
-      queryManager = DefaultQueryManager.defaultQueryManager();
-      queryService = new QueryService(analyzer, new DefaultExecutionEngine(), planner);
-    }
-
-    public StreamingQuery run() {
-      queryManager.submit(
-          new StreamingQueryPlan(
-              queryId,
-              AstDSL.relation(AstDSL.qualifiedName(DATASOURCE_NAME, "default", TABLE_NAME)),
-              queryService,
-              new ResponseListener<>() {
-                @Override
-                public void onResponse(ExecutionEngine.QueryResponse response) {
-                  fail();
-                }
-
-                @Override
-                public void onFailure(Exception e) {
-                  fail();
-                }
-              },
-              new StreamingQueryPlan.IntervalTriggerExecution(1)));
-      return this;
-    }
-
-    void sumShouldBe(int expected) throws InterruptedException {
-      TimeUnit.SECONDS.sleep(INTERVAL_IN_SECONDS);
-      assertEquals(expected, result.get());
-    }
-
-    void close() throws InterruptedException, IOException {
-      assertTrue(queryManager.cancel(queryId));
-
-      storageEngine.close();
-      context.close();
-      queryManager.awaitTermination(5, TimeUnit.SECONDS);
-    }
-  }
-
-  /**
-   * org.apache.hadoop.fs.FileSystem$Statistics$StatisticsDataReferenceCleaner could not close.
-   * https://www.mail-archive.com/common-issues@hadoop.apache.org/msg232722.html
-   */
-  public static class HadoopFSThreadsFilter implements ThreadFilter {
-    @Override
-    public boolean reject(Thread t) {
-      return t.getName().contains("StatisticsDataReferenceCleaner");
-    }
-  }
-
-  private DataSourceMetadata fsDataSourceMetadata() {
-    DataSourceMetadata dataSourceMetadata = new DataSourceMetadata();
-    dataSourceMetadata.setName(DATASOURCE_NAME);
-    dataSourceMetadata.setConnector(DataSourceType.FILESYSTEM);
-    dataSourceMetadata.setProperties(ImmutableMap.of());
-    return dataSourceMetadata;
-  }
-}
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/SystemFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/SystemFunctionIT.java
index 7e8383baa4..9ef4c09181 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/SystemFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/SystemFunctionIT.java
@@ -26,49 +26,69 @@ public void init() throws IOException {
 
   @Test
   public void typeof_sql_types() throws IOException {
-    JSONObject response = executeQuery(String.format("source=%s | eval "
-        + "`str` = typeof('pewpew'), `double` = typeof(1.0),"
-        + "`int` = typeof(12345), `long` = typeof(1234567891011), `interval` = typeof(INTERVAL 2 DAY)"
-        + " | fields `str`, `double`, `int`, `long`, `interval`",
-            TEST_INDEX_DATATYPE_NUMERIC));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                "source=%s | eval `str` = typeof('pewpew'), `double` = typeof(1.0),`int` ="
+                    + " typeof(12345), `long` = typeof(1234567891011), `interval` = typeof(INTERVAL"
+                    + " 2 DAY) | fields `str`, `double`, `int`, `long`, `interval`",
+                TEST_INDEX_DATATYPE_NUMERIC));
     // TODO: test null in PPL
-    verifyDataRows(response,
-        rows("STRING", "DOUBLE", "INTEGER", "LONG", "INTERVAL"));
+    verifyDataRows(response, rows("KEYWORD", "DOUBLE", "INTEGER", "LONG", "INTERVAL"));
 
-    response = executeQuery(String.format("source=%s | eval "
-        + "`timestamp` = typeof(CAST('1961-04-12 09:07:00' AS TIMESTAMP)),"
-        + "`time` = typeof(CAST('09:07:00' AS TIME)),"
-        + "`date` = typeof(CAST('1961-04-12' AS DATE)),"
-        + "`datetime` = typeof(DATETIME('1961-04-12 09:07:00'))"
-        + " | fields `timestamp`, `time`, `date`, `datetime`",
-            TEST_INDEX_DATATYPE_NUMERIC));
-    verifyDataRows(response,
-        rows("TIMESTAMP", "TIME", "DATE", "DATETIME"));
+    response =
+        executeQuery(
+            String.format(
+                "source=%s | eval "
+                    + "`timestamp` = typeof(CAST('1961-04-12 09:07:00' AS TIMESTAMP)),"
+                    + "`time` = typeof(CAST('09:07:00' AS TIME)),"
+                    + "`date` = typeof(CAST('1961-04-12' AS DATE)),"
+                    + "`datetime` = typeof(DATETIME('1961-04-12 09:07:00'))"
+                    + " | fields `timestamp`, `time`, `date`, `datetime`",
+                TEST_INDEX_DATATYPE_NUMERIC));
+    verifyDataRows(response, rows("TIMESTAMP", "TIME", "DATE", "DATETIME"));
   }
 
   @Test
   public void typeof_opensearch_types() throws IOException {
-    JSONObject response = executeQuery(String.format("source=%s | eval "
-        + "`double` = typeof(double_number), `long` = typeof(long_number),"
-        + "`integer` = typeof(integer_number), `byte` = typeof(byte_number),"
-        + "`short` = typeof(short_number), `float` = typeof(float_number),"
-        + "`half_float` = typeof(half_float_number), `scaled_float` = typeof(scaled_float_number)"
-        + " | fields `double`, `long`, `integer`, `byte`, `short`, `float`, `half_float`, `scaled_float`",
-            TEST_INDEX_DATATYPE_NUMERIC));
-    verifyDataRows(response,
-        rows("DOUBLE", "LONG", "INTEGER", "BYTE", "SHORT", "FLOAT", "FLOAT", "DOUBLE"));
+    JSONObject response =
+        executeQuery(
+            String.format(
+                "source=%s | eval `double` = typeof(double_number), `long` ="
+                    + " typeof(long_number),`integer` = typeof(integer_number), `byte` ="
+                    + " typeof(byte_number),`short` = typeof(short_number), `float` ="
+                    + " typeof(float_number),`half_float` = typeof(half_float_number),"
+                    + " `scaled_float` = typeof(scaled_float_number) | fields `double`, `long`,"
+                    + " `integer`, `byte`, `short`, `float`, `half_float`, `scaled_float`",
+                TEST_INDEX_DATATYPE_NUMERIC));
+    verifyDataRows(
+        response, rows("DOUBLE", "LONG", "INTEGER", "BYTE", "SHORT", "FLOAT", "FLOAT", "DOUBLE"));
 
-    response = executeQuery(String.format("source=%s | eval "
-        + "`text` = typeof(text_value), `date` = typeof(date_value),"
-        + "`boolean` = typeof(boolean_value), `object` = typeof(object_value),"
-        + "`keyword` = typeof(keyword_value), `ip` = typeof(ip_value),"
-        + "`binary` = typeof(binary_value), `geo_point` = typeof(geo_point_value)"
-        // TODO activate this test once `ARRAY` type supported, see ExpressionAnalyzer::isTypeNotSupported
-        //+ ", `nested` = typeof(nested_value)"
-        + " | fields `text`, `date`, `boolean`, `object`, `keyword`, `ip`, `binary`, `geo_point`",
-            TEST_INDEX_DATATYPE_NONNUMERIC));
-    verifyDataRows(response,
-        rows("OPENSEARCH_TEXT", "TIMESTAMP", "BOOLEAN", "STRUCT", "STRING",
-                "OPENSEARCH_IP", "OPENSEARCH_BINARY", "OPENSEARCH_GEO_POINT"));
+    response =
+        executeQuery(
+            String.format(
+                "source=%s | eval `text` = typeof(text_value), `date` = typeof(date_value),"
+                    + " `date_nanos` = typeof(date_nanos_value),`boolean` = typeof(boolean_value),"
+                    + " `object` = typeof(object_value),`keyword` = typeof(keyword_value), `ip` ="
+                    + " typeof(ip_value),`binary` = typeof(binary_value), `geo_point` ="
+                    + " typeof(geo_point_value)"
+                    // TODO activate this test once `ARRAY` type supported, see
+                    // ExpressionAnalyzer::isTypeNotSupported
+                    // + ", `nested` = typeof(nested_value)"
+                    + " | fields `text`, `date`, `date_nanos`, `boolean`, `object`, `keyword`,"
+                    + " `ip`, `binary`, `geo_point`",
+                TEST_INDEX_DATATYPE_NONNUMERIC));
+    verifyDataRows(
+        response,
+        rows(
+            "TEXT",
+            "TIMESTAMP",
+            "TIMESTAMP",
+            "BOOLEAN",
+            "OBJECT",
+            "KEYWORD",
+            "IP",
+            "BINARY",
+            "GEO_POINT"));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/TextFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/TextFunctionIT.java
index 7c48bceab0..dc9f1d98d2 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/TextFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/TextFunctionIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_STRINGS;
@@ -23,27 +22,45 @@ public void init() throws IOException {
     loadIndex(Index.BANK_WITH_STRING_VALUES);
   }
 
-  void verifyQuery(String command, String initialArgs, String additionalArgs,
-                   String outputRow1, String outputRow2, String outputRow3) throws IOException {
-    String query = String.format(
-        "source=%s | eval f=%s(%sname%s) | fields f", TEST_INDEX_STRINGS, command, initialArgs, additionalArgs);
+  void verifyQuery(
+      String command,
+      String initialArgs,
+      String additionalArgs,
+      String outputRow1,
+      String outputRow2,
+      String outputRow3)
+      throws IOException {
+    String query =
+        String.format(
+            "source=%s | eval f=%s(%sname%s) | fields f",
+            TEST_INDEX_STRINGS, command, initialArgs, additionalArgs);
     JSONObject result = executeQuery(query);
     verifySchema(result, schema("f", null, "string"));
     verifyDataRows(result, rows(outputRow1), rows(outputRow2), rows(outputRow3));
   }
 
-  void verifyQuery(String command, String initialArgs, String additionalArgs,
-                   Integer outputRow1, Integer outputRow2, Integer outputRow3) throws IOException {
-    String query = String.format(
-        "source=%s | eval f=%s(%sname%s) | fields f", TEST_INDEX_STRINGS, command, initialArgs, additionalArgs);
+  void verifyQuery(
+      String command,
+      String initialArgs,
+      String additionalArgs,
+      Integer outputRow1,
+      Integer outputRow2,
+      Integer outputRow3)
+      throws IOException {
+    String query =
+        String.format(
+            "source=%s | eval f=%s(%sname%s) | fields f",
+            TEST_INDEX_STRINGS, command, initialArgs, additionalArgs);
     JSONObject result = executeQuery(query);
     verifySchema(result, schema("f", null, "integer"));
     verifyDataRows(result, rows(outputRow1), rows(outputRow2), rows(outputRow3));
   }
 
-  void verifyRegexQuery(String pattern, Integer outputRow1, Integer outputRow2, Integer outputRow3) throws IOException {
-    String query = String.format(
-        "source=%s | eval f=name regexp '%s' | fields f", TEST_INDEX_STRINGS, pattern);
+  void verifyRegexQuery(String pattern, Integer outputRow1, Integer outputRow2, Integer outputRow3)
+      throws IOException {
+    String query =
+        String.format(
+            "source=%s | eval f=name regexp '%s' | fields f", TEST_INDEX_STRINGS, pattern);
     JSONObject result = executeQuery(query);
     verifySchema(result, schema("f", null, "integer"));
     verifyDataRows(result, rows(outputRow1), rows(outputRow2), rows(outputRow3));
@@ -55,7 +72,7 @@ public void testRegexp() throws IOException {
     verifyRegexQuery(".*", 1, 1, 1);
   }
 
- @Test
+  @Test
   public void testSubstr() throws IOException {
     verifyQuery("substr", "", ", 2", "ello", "orld", "elloworld");
     verifyQuery("substr", "", ", 2, 2", "el", "or", "el");
@@ -99,14 +116,19 @@ public void testLtrim() throws IOException {
 
   @Test
   public void testConcat() throws IOException {
-    verifyQuery("concat", "", ", 'there'",
-        "hellothere", "worldthere", "helloworldthere");
+    verifyQuery(
+        "concat",
+        "",
+        ", 'there', 'all', '!'",
+        "hellothereall!",
+        "worldthereall!",
+        "helloworldthereall!");
   }
 
   @Test
   public void testConcat_ws() throws IOException {
-    verifyQuery("concat_ws", "',', ", ", 'there'",
-        "hello,there", "world,there", "helloworld,there");
+    verifyQuery(
+        "concat_ws", "',', ", ", 'there'", "hello,there", "world,there", "helloworld,there");
   }
 
   @Test
@@ -137,7 +159,8 @@ public void testLocate() throws IOException {
 
   @Test
   public void testReplace() throws IOException {
-    verifyQuery("replace", "", ", 'world', ' opensearch'", "hello", " opensearch", "hello opensearch");
+    verifyQuery(
+        "replace", "", ", 'world', ' opensearch'", "hello", " opensearch", "hello opensearch");
   }
 
   @Test
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/TopCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/TopCommandIT.java
index 054ff303a1..f9587e4b63 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/TopCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/TopCommandIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
@@ -14,7 +13,7 @@
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
 
-public class TopCommandIT  extends PPLIntegTestCase{
+public class TopCommandIT extends PPLIntegTestCase {
 
   @Override
   public void init() throws IOException {
@@ -24,30 +23,20 @@ public void init() throws IOException {
 
   @Test
   public void testTopWithoutGroup() throws IOException {
-    JSONObject result =
-        executeQuery(String.format("source=%s | top gender", TEST_INDEX_ACCOUNT));
-    verifyDataRows(
-        result,
-        rows("M"),
-        rows("F"));
+    JSONObject result = executeQuery(String.format("source=%s | top gender", TEST_INDEX_ACCOUNT));
+    verifyDataRows(result, rows("M"), rows("F"));
   }
 
   @Test
-  public void testTopNWithoutGroup() throws IOException{
-    JSONObject result =
-        executeQuery(String.format("source=%s | top 1 gender", TEST_INDEX_ACCOUNT));
-    verifyDataRows(
-        result,
-        rows("M"));
+  public void testTopNWithoutGroup() throws IOException {
+    JSONObject result = executeQuery(String.format("source=%s | top 1 gender", TEST_INDEX_ACCOUNT));
+    verifyDataRows(result, rows("M"));
   }
 
   @Test
   public void testTopNWithGroup() throws IOException {
     JSONObject result =
         executeQuery(String.format("source=%s | top 1 state by gender", TEST_INDEX_ACCOUNT));
-    verifyDataRows(
-        result,
-        rows("F", "TX"),
-        rows("M", "MD"));
+    verifyDataRows(result, rows("F", "TX"), rows("M", "MD"));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/VisualizationFormatIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/VisualizationFormatIT.java
index d530b4140d..263ed502ed 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/VisualizationFormatIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/VisualizationFormatIT.java
@@ -24,8 +24,9 @@ public void init() throws IOException {
 
   @Test
   void format() throws IOException {
-    String result = executeVizQuery(
-        String.format(Locale.ROOT, "source=%s | fields firstname, age", TEST_INDEX_BANK), true);
+    String result =
+        executeVizQuery(
+            String.format(Locale.ROOT, "source=%s | fields firstname, age", TEST_INDEX_BANK), true);
     assertEquals(
         "{\n"
             + "  \"data\": {\n"
@@ -67,8 +68,10 @@ void format() throws IOException {
   }
 
   private String executeVizQuery(String query, boolean pretty) throws IOException {
-    Request request = buildRequest(query,
-        QUERY_API_ENDPOINT + String.format(Locale.ROOT, "?format=csv&pretty=%b", pretty));
+    Request request =
+        buildRequest(
+            query,
+            QUERY_API_ENDPOINT + String.format(Locale.ROOT, "?format=csv&pretty=%b", pretty));
     Response response = client().performRequest(request);
     Assert.assertEquals(200, response.getStatusLine().getStatusCode());
     return getResponseBody(response, true);
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/WhereCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/WhereCommandIT.java
index ba870732fd..d56f9ffe32 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/WhereCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/WhereCommandIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
diff --git a/integ-test/src/test/java/org/opensearch/sql/security/CrossClusterSearchIT.java b/integ-test/src/test/java/org/opensearch/sql/security/CrossClusterSearchIT.java
new file mode 100644
index 0000000000..cdf467706c
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/security/CrossClusterSearchIT.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.security;
+
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DOG;
+import static org.opensearch.sql.util.MatcherUtils.columnName;
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.verifyColumn;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
+
+import java.io.IOException;
+import lombok.SneakyThrows;
+import org.json.JSONObject;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.opensearch.client.ResponseException;
+import org.opensearch.sql.ppl.PPLIntegTestCase;
+
+/** Cross Cluster Search tests to be executed with security plugin. */
+public class CrossClusterSearchIT extends PPLIntegTestCase {
+
+  static {
+    // find a remote cluster
+    String[] clusterNames = System.getProperty("cluster.names").split(",");
+    var remote = "remoteCluster";
+    for (var cluster : clusterNames) {
+      if (cluster.startsWith("remote")) {
+        remote = cluster;
+        break;
+      }
+    }
+    REMOTE_CLUSTER = remote;
+  }
+
+  public static final String REMOTE_CLUSTER;
+
+  private static final String TEST_INDEX_BANK_REMOTE = REMOTE_CLUSTER + ":" + TEST_INDEX_BANK;
+  private static final String TEST_INDEX_DOG_REMOTE = REMOTE_CLUSTER + ":" + TEST_INDEX_DOG;
+  private static final String TEST_INDEX_DOG_MATCH_ALL_REMOTE =
+      MATCH_ALL_REMOTE_CLUSTER + ":" + TEST_INDEX_DOG;
+  private static final String TEST_INDEX_ACCOUNT_REMOTE = REMOTE_CLUSTER + ":" + TEST_INDEX_ACCOUNT;
+
+  private static boolean initialized = false;
+
+  @SneakyThrows
+  @BeforeEach
+  public void initialize() {
+    if (!initialized) {
+      setUpIndices();
+      initialized = true;
+    }
+  }
+
+  @Override
+  protected void init() throws Exception {
+    configureMultiClusters(REMOTE_CLUSTER);
+    loadIndex(Index.BANK);
+    loadIndex(Index.BANK, remoteClient());
+    loadIndex(Index.DOG);
+    loadIndex(Index.DOG, remoteClient());
+    loadIndex(Index.ACCOUNT);
+  }
+
+  @Test
+  public void testCrossClusterSearchAllFields() throws IOException {
+    JSONObject result = executeQuery(String.format("search source=%s", TEST_INDEX_DOG_REMOTE));
+    verifyColumn(result, columnName("dog_name"), columnName("holdersName"), columnName("age"));
+  }
+
+  @Test
+  public void testMatchAllCrossClusterSearchAllFields() throws IOException {
+    JSONObject result =
+        executeQuery(String.format("search source=%s", TEST_INDEX_DOG_MATCH_ALL_REMOTE));
+    verifyColumn(result, columnName("dog_name"), columnName("holdersName"), columnName("age"));
+  }
+
+  @Test
+  public void testCrossClusterSearchWithoutLocalFieldMappingShouldFail() throws IOException {
+    var exception =
+        assertThrows(
+            ResponseException.class,
+            () -> executeQuery(String.format("search source=%s", TEST_INDEX_ACCOUNT_REMOTE)));
+    assertTrue(
+        exception.getMessage().contains("IndexNotFoundException")
+            && exception.getMessage().contains("404 Not Found"));
+  }
+
+  @Test
+  public void testCrossClusterSearchCommandWithLogicalExpression() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "search source=%s firstname='Hattie' | fields firstname", TEST_INDEX_BANK_REMOTE));
+    verifyDataRows(result, rows("Hattie"));
+  }
+
+  @Test
+  public void testCrossClusterSearchMultiClusters() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "search source=%s,%s firstname='Hattie' | fields firstname",
+                TEST_INDEX_BANK_REMOTE, TEST_INDEX_BANK));
+    verifyDataRows(result, rows("Hattie"), rows("Hattie"));
+  }
+
+  @Test
+  public void testCrossClusterDescribeAllFields() throws IOException {
+    JSONObject result = executeQuery(String.format("describe %s", TEST_INDEX_DOG_REMOTE));
+    verifyColumn(
+        result,
+        columnName("TABLE_CAT"),
+        columnName("TABLE_SCHEM"),
+        columnName("TABLE_NAME"),
+        columnName("COLUMN_NAME"),
+        columnName("DATA_TYPE"),
+        columnName("TYPE_NAME"),
+        columnName("COLUMN_SIZE"),
+        columnName("BUFFER_LENGTH"),
+        columnName("DECIMAL_DIGITS"),
+        columnName("NUM_PREC_RADIX"),
+        columnName("NULLABLE"),
+        columnName("REMARKS"),
+        columnName("COLUMN_DEF"),
+        columnName("SQL_DATA_TYPE"),
+        columnName("SQL_DATETIME_SUB"),
+        columnName("CHAR_OCTET_LENGTH"),
+        columnName("ORDINAL_POSITION"),
+        columnName("IS_NULLABLE"),
+        columnName("SCOPE_CATALOG"),
+        columnName("SCOPE_SCHEMA"),
+        columnName("SCOPE_TABLE"),
+        columnName("SOURCE_DATA_TYPE"),
+        columnName("IS_AUTOINCREMENT"),
+        columnName("IS_GENERATEDCOLUMN"));
+  }
+
+  @Test
+  public void testMatchAllCrossClusterDescribeAllFields() throws IOException {
+    JSONObject result = executeQuery(String.format("describe %s", TEST_INDEX_DOG_MATCH_ALL_REMOTE));
+    verifyColumn(
+        result,
+        columnName("TABLE_CAT"),
+        columnName("TABLE_SCHEM"),
+        columnName("TABLE_NAME"),
+        columnName("COLUMN_NAME"),
+        columnName("DATA_TYPE"),
+        columnName("TYPE_NAME"),
+        columnName("COLUMN_SIZE"),
+        columnName("BUFFER_LENGTH"),
+        columnName("DECIMAL_DIGITS"),
+        columnName("NUM_PREC_RADIX"),
+        columnName("NULLABLE"),
+        columnName("REMARKS"),
+        columnName("COLUMN_DEF"),
+        columnName("SQL_DATA_TYPE"),
+        columnName("SQL_DATETIME_SUB"),
+        columnName("CHAR_OCTET_LENGTH"),
+        columnName("ORDINAL_POSITION"),
+        columnName("IS_NULLABLE"),
+        columnName("SCOPE_CATALOG"),
+        columnName("SCOPE_SCHEMA"),
+        columnName("SCOPE_TABLE"),
+        columnName("SOURCE_DATA_TYPE"),
+        columnName("IS_AUTOINCREMENT"),
+        columnName("IS_GENERATEDCOLUMN"));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/AdminIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/AdminIT.java
index ed7ec600a3..04a8dd9c08 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/AdminIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/AdminIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -63,10 +62,7 @@ public void explainShow() throws Exception {
     String expected = loadFromFile("expectedOutput/sql/explain_show.json");
 
     final String actual = explainQuery("SHOW TABLES LIKE %");
-    assertJsonEquals(
-        expected,
-        explainQuery("SHOW TABLES LIKE %")
-    );
+    assertJsonEquals(expected, explainQuery("SHOW TABLES LIKE %"));
   }
 
   private void addAlias(String index, String alias) throws IOException {
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/AggregationIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/AggregationIT.java
index 95f5b5e3e4..1118dd4cd6 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/AggregationIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/AggregationIT.java
@@ -5,9 +5,7 @@
 
 package org.opensearch.sql.sql;
 
-import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
-import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_CALCS;
-import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_NULL_MISSING;
+import static org.opensearch.sql.legacy.TestsConstants.*;
 import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.schema;
@@ -37,17 +35,19 @@ protected void init() throws Exception {
 
   @Test
   public void testFilteredAggregatePushDown() throws IOException {
-    JSONObject response = executeQuery(
-        "SELECT COUNT(*) FILTER(WHERE age > 35) FROM " + TEST_INDEX_BANK);
+    JSONObject response =
+        executeQuery("SELECT COUNT(*) FILTER(WHERE age > 35) FROM " + TEST_INDEX_BANK);
     verifySchema(response, schema("COUNT(*) FILTER(WHERE age > 35)", null, "integer"));
     verifyDataRows(response, rows(3));
   }
 
   @Test
   public void testFilteredAggregateNotPushDown() throws IOException {
-    JSONObject response = executeQuery(
-        "SELECT COUNT(*) FILTER(WHERE age > 35) FROM (SELECT * FROM " + TEST_INDEX_BANK
-            + ") AS a");
+    JSONObject response =
+        executeQuery(
+            "SELECT COUNT(*) FILTER(WHERE age > 35) FROM (SELECT * FROM "
+                + TEST_INDEX_BANK
+                + ") AS a");
     verifySchema(response, schema("COUNT(*) FILTER(WHERE age > 35)", null, "integer"));
     verifyDataRows(response, rows(3));
   }
@@ -55,45 +55,65 @@ public void testFilteredAggregateNotPushDown() throws IOException {
   @Test
   public void testPushDownAggregationOnNullValues() throws IOException {
     // OpenSearch aggregation query (MetricAggregation)
-    var response = executeQuery(String.format(
-        "SELECT min(`int`), max(`int`), avg(`int`), min(`dbl`), max(`dbl`), avg(`dbl`) " +
-        "FROM %s WHERE `key` = 'null'", TEST_INDEX_NULL_MISSING));
-    verifySchema(response,
-        schema("min(`int`)", null, "integer"), schema("max(`int`)", null, "integer"),
-        schema("avg(`int`)", null, "double"), schema("min(`dbl`)", null, "double"),
-        schema("max(`dbl`)", null, "double"), schema("avg(`dbl`)", null, "double"));
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT min(`int`), max(`int`), avg(`int`), min(`dbl`), max(`dbl`), avg(`dbl`) "
+                    + "FROM %s WHERE `key` = 'null'",
+                TEST_INDEX_NULL_MISSING));
+    verifySchema(
+        response,
+        schema("min(`int`)", null, "integer"),
+        schema("max(`int`)", null, "integer"),
+        schema("avg(`int`)", null, "double"),
+        schema("min(`dbl`)", null, "double"),
+        schema("max(`dbl`)", null, "double"),
+        schema("avg(`dbl`)", null, "double"));
     verifyDataRows(response, rows(null, null, null, null, null, null));
   }
 
   @Test
   public void testPushDownAggregationOnMissingValues() throws IOException {
     // OpenSearch aggregation query (MetricAggregation)
-    var response = executeQuery(String.format(
-        "SELECT min(`int`), max(`int`), avg(`int`), min(`dbl`), max(`dbl`), avg(`dbl`) " +
-        "FROM %s WHERE `key` = 'null'", TEST_INDEX_NULL_MISSING));
-    verifySchema(response,
-        schema("min(`int`)", null, "integer"), schema("max(`int`)", null, "integer"),
-        schema("avg(`int`)", null, "double"), schema("min(`dbl`)", null, "double"),
-        schema("max(`dbl`)", null, "double"), schema("avg(`dbl`)", null, "double"));
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT min(`int`), max(`int`), avg(`int`), min(`dbl`), max(`dbl`), avg(`dbl`) "
+                    + "FROM %s WHERE `key` = 'null'",
+                TEST_INDEX_NULL_MISSING));
+    verifySchema(
+        response,
+        schema("min(`int`)", null, "integer"),
+        schema("max(`int`)", null, "integer"),
+        schema("avg(`int`)", null, "double"),
+        schema("min(`dbl`)", null, "double"),
+        schema("max(`dbl`)", null, "double"),
+        schema("avg(`dbl`)", null, "double"));
     verifyDataRows(response, rows(null, null, null, null, null, null));
   }
 
   @Test
   public void testInMemoryAggregationOnNullValues() throws IOException {
     // In-memory aggregation performed by the plugin
-    var response = executeQuery(String.format("SELECT"
-        + " min(`int`) over (PARTITION BY `key`), max(`int`) over (PARTITION BY `key`),"
-        + " avg(`int`) over (PARTITION BY `key`), min(`dbl`) over (PARTITION BY `key`),"
-        + " max(`dbl`) over (PARTITION BY `key`), avg(`dbl`) over (PARTITION BY `key`)"
-        + " FROM %s WHERE `key` = 'null'", TEST_INDEX_NULL_MISSING));
-    verifySchema(response,
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT"
+                    + " min(`int`) over (PARTITION BY `key`), max(`int`) over (PARTITION BY `key`),"
+                    + " avg(`int`) over (PARTITION BY `key`), min(`dbl`) over (PARTITION BY `key`),"
+                    + " max(`dbl`) over (PARTITION BY `key`), avg(`dbl`) over (PARTITION BY `key`)"
+                    + " FROM %s WHERE `key` = 'null'",
+                TEST_INDEX_NULL_MISSING));
+    verifySchema(
+        response,
         schema("min(`int`) over (PARTITION BY `key`)", null, "integer"),
         schema("max(`int`) over (PARTITION BY `key`)", null, "integer"),
         schema("avg(`int`) over (PARTITION BY `key`)", null, "double"),
         schema("min(`dbl`) over (PARTITION BY `key`)", null, "double"),
         schema("max(`dbl`) over (PARTITION BY `key`)", null, "double"),
         schema("avg(`dbl`) over (PARTITION BY `key`)", null, "double"));
-    verifyDataRows(response, // 4 rows with null values
+    verifyDataRows(
+        response, // 4 rows with null values
         rows(null, null, null, null, null, null),
         rows(null, null, null, null, null, null),
         rows(null, null, null, null, null, null),
@@ -103,19 +123,25 @@ public void testInMemoryAggregationOnNullValues() throws IOException {
   @Test
   public void testInMemoryAggregationOnMissingValues() throws IOException {
     // In-memory aggregation performed by the plugin
-    var response = executeQuery(String.format("SELECT"
-        + " min(`int`) over (PARTITION BY `key`), max(`int`) over (PARTITION BY `key`),"
-        + " avg(`int`) over (PARTITION BY `key`), min(`dbl`) over (PARTITION BY `key`),"
-        + " max(`dbl`) over (PARTITION BY `key`), avg(`dbl`) over (PARTITION BY `key`)"
-        + " FROM %s WHERE `key` = 'missing'", TEST_INDEX_NULL_MISSING));
-    verifySchema(response,
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT"
+                    + " min(`int`) over (PARTITION BY `key`), max(`int`) over (PARTITION BY `key`),"
+                    + " avg(`int`) over (PARTITION BY `key`), min(`dbl`) over (PARTITION BY `key`),"
+                    + " max(`dbl`) over (PARTITION BY `key`), avg(`dbl`) over (PARTITION BY `key`)"
+                    + " FROM %s WHERE `key` = 'missing'",
+                TEST_INDEX_NULL_MISSING));
+    verifySchema(
+        response,
         schema("min(`int`) over (PARTITION BY `key`)", null, "integer"),
         schema("max(`int`) over (PARTITION BY `key`)", null, "integer"),
         schema("avg(`int`) over (PARTITION BY `key`)", null, "double"),
         schema("min(`dbl`) over (PARTITION BY `key`)", null, "double"),
         schema("max(`dbl`) over (PARTITION BY `key`)", null, "double"),
         schema("avg(`dbl`) over (PARTITION BY `key`)", null, "double"));
-    verifyDataRows(response, // 4 rows with null values
+    verifyDataRows(
+        response, // 4 rows with null values
         rows(null, null, null, null, null, null),
         rows(null, null, null, null, null, null),
         rows(null, null, null, null, null, null),
@@ -124,12 +150,17 @@ public void testInMemoryAggregationOnMissingValues() throws IOException {
 
   @Test
   public void testInMemoryAggregationOnNullValuesReturnsNull() throws IOException {
-    var response = executeQuery(String.format("SELECT "
-        + " max(int0) over (PARTITION BY `datetime1`),"
-        + " min(int0) over (PARTITION BY `datetime1`),"
-        + " avg(int0) over (PARTITION BY `datetime1`)"
-        + "from %s where int0 IS NULL;", TEST_INDEX_CALCS));
-    verifySchema(response,
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT "
+                    + " max(int0) over (PARTITION BY `datetime1`),"
+                    + " min(int0) over (PARTITION BY `datetime1`),"
+                    + " avg(int0) over (PARTITION BY `datetime1`)"
+                    + "from %s where int0 IS NULL;",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
         schema("max(int0) over (PARTITION BY `datetime1`)", null, "integer"),
         schema("min(int0) over (PARTITION BY `datetime1`)", null, "integer"),
         schema("avg(int0) over (PARTITION BY `datetime1`)", null, "double"));
@@ -138,21 +169,31 @@ public void testInMemoryAggregationOnNullValuesReturnsNull() throws IOException
 
   @Test
   public void testInMemoryAggregationOnAllValuesAndOnNotNullReturnsSameResult() throws IOException {
-    var responseNotNulls = executeQuery(String.format("SELECT "
-        + " max(int0) over (PARTITION BY `datetime1`),"
-        + " min(int0) over (PARTITION BY `datetime1`),"
-        + " avg(int0) over (PARTITION BY `datetime1`)"
-        + "from %s where int0 IS NOT NULL;", TEST_INDEX_CALCS));
-    var responseAllValues = executeQuery(String.format("SELECT "
-        + " max(int0) over (PARTITION BY `datetime1`),"
-        + " min(int0) over (PARTITION BY `datetime1`),"
-        + " avg(int0) over (PARTITION BY `datetime1`)"
-        + "from %s;", TEST_INDEX_CALCS));
-    verifySchema(responseNotNulls,
+    var responseNotNulls =
+        executeQuery(
+            String.format(
+                "SELECT "
+                    + " max(int0) over (PARTITION BY `datetime1`),"
+                    + " min(int0) over (PARTITION BY `datetime1`),"
+                    + " avg(int0) over (PARTITION BY `datetime1`)"
+                    + "from %s where int0 IS NOT NULL;",
+                TEST_INDEX_CALCS));
+    var responseAllValues =
+        executeQuery(
+            String.format(
+                "SELECT "
+                    + " max(int0) over (PARTITION BY `datetime1`),"
+                    + " min(int0) over (PARTITION BY `datetime1`),"
+                    + " avg(int0) over (PARTITION BY `datetime1`)"
+                    + "from %s;",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        responseNotNulls,
         schema("max(int0) over (PARTITION BY `datetime1`)", null, "integer"),
         schema("min(int0) over (PARTITION BY `datetime1`)", null, "integer"),
         schema("avg(int0) over (PARTITION BY `datetime1`)", null, "double"));
-    verifySchema(responseAllValues,
+    verifySchema(
+        responseAllValues,
         schema("max(int0) over (PARTITION BY `datetime1`)", null, "integer"),
         schema("min(int0) over (PARTITION BY `datetime1`)", null, "integer"),
         schema("avg(int0) over (PARTITION BY `datetime1`)", null, "double"));
@@ -162,27 +203,116 @@ public void testInMemoryAggregationOnAllValuesAndOnNotNullReturnsSameResult() th
   }
 
   @Test
-  public void testPushDownAggregationOnNullValuesReturnsNull() throws IOException {
-    var response = executeQuery(String.format("SELECT "
-        + "max(int0), min(int0), avg(int0) from %s where int0 IS NULL;", TEST_INDEX_CALCS));
-    verifySchema(response,
+  public void testPushDownAggregationOnNullNumericValuesReturnsNull() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT " + "max(int0), min(int0), avg(int0) from %s where int0 IS NULL;",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
         schema("max(int0)", null, "integer"),
         schema("min(int0)", null, "integer"),
         schema("avg(int0)", null, "double"));
     verifyDataRows(response, rows(null, null, null));
   }
 
+  @Test
+  public void testPushDownAggregationOnNullDateTimeValuesFromTableReturnsNull() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT " + "max(datetime1), min(datetime1), avg(datetime1) from %s",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
+        schema("max(datetime1)", null, "timestamp"),
+        schema("min(datetime1)", null, "timestamp"),
+        schema("avg(datetime1)", null, "timestamp"));
+    verifyDataRows(response, rows(null, null, null));
+  }
+
+  @Test
+  public void testPushDownAggregationOnNullDateValuesReturnsNull() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT max(CAST(NULL AS date)), min(CAST(NULL AS date)), avg(CAST(NULL AS date))"
+                    + " from %s",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
+        schema("max(CAST(NULL AS date))", null, "date"),
+        schema("min(CAST(NULL AS date))", null, "date"),
+        schema("avg(CAST(NULL AS date))", null, "date"));
+    verifyDataRows(response, rows(null, null, null));
+  }
+
+  @Test
+  public void testPushDownAggregationOnNullTimeValuesReturnsNull() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT max(CAST(NULL AS time)), min(CAST(NULL AS time)), avg(CAST(NULL AS time))"
+                    + " from %s",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
+        schema("max(CAST(NULL AS time))", null, "time"),
+        schema("min(CAST(NULL AS time))", null, "time"),
+        schema("avg(CAST(NULL AS time))", null, "time"));
+    verifyDataRows(response, rows(null, null, null));
+  }
+
+  @Test
+  public void testPushDownAggregationOnNullTimeStampValuesReturnsNull() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT max(CAST(NULL AS timestamp)), min(CAST(NULL AS timestamp)), avg(CAST(NULL"
+                    + " AS timestamp)) from %s",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
+        schema("max(CAST(NULL AS timestamp))", null, "timestamp"),
+        schema("min(CAST(NULL AS timestamp))", null, "timestamp"),
+        schema("avg(CAST(NULL AS timestamp))", null, "timestamp"));
+    verifyDataRows(response, rows(null, null, null));
+  }
+
+  @Test
+  public void testPushDownAggregationOnNullDateTimeValuesReturnsNull() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT " + "max(datetime(NULL)), min(datetime(NULL)), avg(datetime(NULL)) from %s",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
+        schema("max(datetime(NULL))", null, "datetime"),
+        schema("min(datetime(NULL))", null, "datetime"),
+        schema("avg(datetime(NULL))", null, "datetime"));
+    verifyDataRows(response, rows(null, null, null));
+  }
+
   @Test
   public void testPushDownAggregationOnAllValuesAndOnNotNullReturnsSameResult() throws IOException {
-    var responseNotNulls = executeQuery(String.format("SELECT "
-        + "max(int0), min(int0), avg(int0) from %s where int0 IS NOT NULL;", TEST_INDEX_CALCS));
-    var responseAllValues = executeQuery(String.format("SELECT "
-        + "max(int0), min(int0), avg(int0) from %s;", TEST_INDEX_CALCS));
-    verifySchema(responseNotNulls,
+    var responseNotNulls =
+        executeQuery(
+            String.format(
+                "SELECT " + "max(int0), min(int0), avg(int0) from %s where int0 IS NOT NULL;",
+                TEST_INDEX_CALCS));
+    var responseAllValues =
+        executeQuery(
+            String.format(
+                "SELECT " + "max(int0), min(int0), avg(int0) from %s;", TEST_INDEX_CALCS));
+    verifySchema(
+        responseNotNulls,
         schema("max(int0)", null, "integer"),
         schema("min(int0)", null, "integer"),
         schema("avg(int0)", null, "double"));
-    verifySchema(responseAllValues,
+    verifySchema(
+        responseAllValues,
         schema("max(int0)", null, "integer"),
         schema("min(int0)", null, "integer"),
         schema("avg(int0)", null, "double"));
@@ -193,18 +323,21 @@ public void testPushDownAggregationOnAllValuesAndOnNotNullReturnsSameResult() th
 
   @Test
   public void testPushDownAndInMemoryAggregationReturnTheSameResult() throws IOException {
-    // Playing with 'over (PARTITION BY `datetime1`)' - `datetime1` column has the same value for all rows
+    // Playing with 'over (PARTITION BY `datetime1`)' - `datetime1` column has the same value for
+    // all rows
     // so partitioning by this column has no sense and doesn't (shouldn't) affect the results
     // Aggregations with `OVER` clause are executed in memory (in SQL plugin memory),
     // Aggregations without it are performed the OpenSearch node itself (pushed down to opensearch)
-    // Going to compare results of `min`, `max` and `avg` aggregation on all numeric columns in `calcs`
+    // Going to compare results of `min`, `max` and `avg` aggregation on all numeric columns in
+    // `calcs`
     var columns = List.of("int0", "int1", "int2", "int3", "num0", "num1", "num2", "num3", "num4");
     var aggregations = List.of("min", "max", "avg");
     var inMemoryAggregQuery = new StringBuilder("SELECT ");
     var pushDownAggregQuery = new StringBuilder("SELECT ");
     for (var col : columns) {
       for (var aggreg : aggregations) {
-        inMemoryAggregQuery.append(String.format(" %s(%s) over (PARTITION BY `datetime1`),", aggreg, col));
+        inMemoryAggregQuery.append(
+            String.format(" %s(%s) over (PARTITION BY `datetime1`),", aggreg, col));
         pushDownAggregQuery.append(String.format(" %s(%s),", aggreg, col));
       }
     }
@@ -212,19 +345,401 @@ public void testPushDownAndInMemoryAggregationReturnTheSameResult() throws IOExc
     inMemoryAggregQuery.deleteCharAt(inMemoryAggregQuery.length() - 1);
     pushDownAggregQuery.deleteCharAt(pushDownAggregQuery.length() - 1);
 
-    var responseInMemory = executeQuery(
-        inMemoryAggregQuery.append("from " + TEST_INDEX_CALCS).toString());
-    var responsePushDown = executeQuery(
-        pushDownAggregQuery.append("from " + TEST_INDEX_CALCS).toString());
+    var responseInMemory =
+        executeQuery(inMemoryAggregQuery.append("from " + TEST_INDEX_CALCS).toString());
+    var responsePushDown =
+        executeQuery(pushDownAggregQuery.append("from " + TEST_INDEX_CALCS).toString());
 
     for (int i = 0; i < columns.size() * aggregations.size(); i++) {
       assertEquals(
-          ((Number)responseInMemory.query("/datarows/0/" + i)).doubleValue(),
-          ((Number)responsePushDown.query("/datarows/0/" + i)).doubleValue(),
+          ((Number) responseInMemory.query("/datarows/0/" + i)).doubleValue(),
+          ((Number) responsePushDown.query("/datarows/0/" + i)).doubleValue(),
           0.0000001); // a minor delta is affordable
     }
   }
 
+  public void testMinIntegerPushedDown() throws IOException {
+    var response = executeQuery(String.format("SELECT min(int2)" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("min(int2)", null, "integer"));
+    verifyDataRows(response, rows(-9));
+  }
+
+  @Test
+  public void testMaxIntegerPushedDown() throws IOException {
+    var response = executeQuery(String.format("SELECT max(int2)" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("max(int2)", null, "integer"));
+    verifyDataRows(response, rows(9));
+  }
+
+  @Test
+  public void testAvgIntegerPushedDown() throws IOException {
+    var response = executeQuery(String.format("SELECT avg(int2)" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("avg(int2)", null, "double"));
+    verifyDataRows(response, rows(-0.8235294117647058D));
+  }
+
+  @Test
+  public void testMinDoublePushedDown() throws IOException {
+    var response = executeQuery(String.format("SELECT min(num3)" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("min(num3)", null, "double"));
+    verifyDataRows(response, rows(-19.96D));
+  }
+
+  @Test
+  public void testMaxDoublePushedDown() throws IOException {
+    var response = executeQuery(String.format("SELECT max(num3)" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("max(num3)", null, "double"));
+    verifyDataRows(response, rows(12.93D));
+  }
+
+  @Test
+  public void testAvgDoublePushedDown() throws IOException {
+    var response = executeQuery(String.format("SELECT avg(num3)" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("avg(num3)", null, "double"));
+    verifyDataRows(response, rows(-6.12D));
+  }
+
+  @Test
+  public void testMinIntegerInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT min(int2)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("min(int2) OVER(PARTITION BY datetime1)", null, "integer"));
+    verifySome(response.getJSONArray("datarows"), rows(-9));
+  }
+
+  @Test
+  public void testMaxIntegerInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT max(int2)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("max(int2) OVER(PARTITION BY datetime1)", null, "integer"));
+    verifySome(response.getJSONArray("datarows"), rows(9));
+  }
+
+  @Test
+  public void testAvgIntegerInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT avg(int2)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("avg(int2) OVER(PARTITION BY datetime1)", null, "double"));
+    verifySome(response.getJSONArray("datarows"), rows(-0.8235294117647058D));
+  }
+
+  @Test
+  public void testMinDoubleInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT min(num3)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("min(num3) OVER(PARTITION BY datetime1)", null, "double"));
+    verifySome(response.getJSONArray("datarows"), rows(-19.96D));
+  }
+
+  @Test
+  public void testMaxDoubleInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT max(num3)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("max(num3) OVER(PARTITION BY datetime1)", null, "double"));
+    verifySome(response.getJSONArray("datarows"), rows(12.93D));
+  }
+
+  @Test
+  public void testAvgDoubleInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT avg(num3)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("avg(num3) OVER(PARTITION BY datetime1)", null, "double"));
+    verifySome(response.getJSONArray("datarows"), rows(-6.12D));
+  }
+
+  @Test
+  public void testMaxDatePushedDown() throws IOException {
+    var response = executeQuery(String.format("SELECT max(date0)" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("max(date0)", null, "date"));
+    verifyDataRows(response, rows("2004-06-19"));
+  }
+
+  @Test
+  public void testAvgDatePushedDown() throws IOException {
+    var response = executeQuery(String.format("SELECT avg(date0)" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("avg(date0)", null, "date"));
+    verifyDataRows(response, rows("1992-04-23"));
+  }
+
+  @Test
+  public void testMinDateTimePushedDown() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT min(datetime(CAST(time0 AS STRING)))" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("min(datetime(CAST(time0 AS STRING)))", null, "datetime"));
+    verifyDataRows(response, rows("1899-12-30 21:07:32"));
+  }
+
+  @Test
+  public void testMaxDateTimePushedDown() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT max(datetime(CAST(time0 AS STRING)))" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("max(datetime(CAST(time0 AS STRING)))", null, "datetime"));
+    verifyDataRows(response, rows("1900-01-01 20:36:00"));
+  }
+
+  @Test
+  public void testAvgDateTimePushedDown() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT avg(datetime(CAST(time0 AS STRING)))" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("avg(datetime(CAST(time0 AS STRING)))", null, "datetime"));
+    verifyDataRows(response, rows("1900-01-01 03:35:00.236"));
+  }
+
+  @Test
+  public void testMinTimePushedDown() throws IOException {
+    var response = executeQuery(String.format("SELECT min(time1)" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("min(time1)", null, "time"));
+    verifyDataRows(response, rows("00:05:57"));
+  }
+
+  @Test
+  public void testMaxTimePushedDown() throws IOException {
+    var response = executeQuery(String.format("SELECT max(time1)" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("max(time1)", null, "time"));
+    verifyDataRows(response, rows("22:50:16"));
+  }
+
+  @Test
+  public void testAvgTimePushedDown() throws IOException {
+    var response = executeQuery(String.format("SELECT avg(time1)" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("avg(time1)", null, "time"));
+    verifyDataRows(response, rows("13:06:36.25"));
+  }
+
+  @Test
+  public void testMinTimeStampPushedDown() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT min(CAST(datetime0 AS timestamp))" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("min(CAST(datetime0 AS timestamp))", null, "timestamp"));
+    verifyDataRows(response, rows("2004-07-04 22:49:28"));
+  }
+
+  @Test
+  public void testMaxTimeStampPushedDown() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT max(CAST(datetime0 AS timestamp))" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("max(CAST(datetime0 AS timestamp))", null, "timestamp"));
+    verifyDataRows(response, rows("2004-08-02 07:59:23"));
+  }
+
+  @Test
+  public void testAvgTimeStampPushedDown() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT avg(CAST(datetime0 AS timestamp))" + " from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("avg(CAST(datetime0 AS timestamp))", null, "timestamp"));
+    verifyDataRows(response, rows("2004-07-20 10:38:09.705"));
+  }
+
+  @Test
+  public void testMinDateInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT min(date0)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("min(date0) OVER(PARTITION BY datetime1)", null, "date"));
+    verifySome(response.getJSONArray("datarows"), rows("1972-07-04"));
+  }
+
+  @Test
+  public void testMaxDateInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT max(date0)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("max(date0) OVER(PARTITION BY datetime1)", null, "date"));
+    verifySome(response.getJSONArray("datarows"), rows("2004-06-19"));
+  }
+
+  @Test
+  public void testAvgDateInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT avg(date0)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("avg(date0) OVER(PARTITION BY datetime1)", null, "date"));
+    verifySome(response.getJSONArray("datarows"), rows("1992-04-23"));
+  }
+
+  @Test
+  public void testMinDateTimeInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT min(datetime(CAST(time0 AS STRING)))"
+                    + " OVER(PARTITION BY datetime1) from %s",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
+        schema(
+            "min(datetime(CAST(time0 AS STRING))) OVER(PARTITION BY datetime1)", null, "datetime"));
+    verifySome(response.getJSONArray("datarows"), rows("1899-12-30 21:07:32"));
+  }
+
+  @Test
+  public void testMaxDateTimeInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT max(datetime(CAST(time0 AS STRING)))"
+                    + " OVER(PARTITION BY datetime1) from %s",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
+        schema(
+            "max(datetime(CAST(time0 AS STRING))) OVER(PARTITION BY datetime1)", null, "datetime"));
+    verifySome(response.getJSONArray("datarows"), rows("1900-01-01 20:36:00"));
+  }
+
+  @Test
+  public void testAvgDateTimeInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT avg(datetime(CAST(time0 AS STRING)))"
+                    + " OVER(PARTITION BY datetime1) from %s",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
+        schema(
+            "avg(datetime(CAST(time0 AS STRING))) OVER(PARTITION BY datetime1)", null, "datetime"));
+    verifySome(response.getJSONArray("datarows"), rows("1900-01-01 03:35:00.236"));
+  }
+
+  @Test
+  public void testMinTimeInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT min(time1)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("min(time1) OVER(PARTITION BY datetime1)", null, "time"));
+    verifySome(response.getJSONArray("datarows"), rows("00:05:57"));
+  }
+
+  @Test
+  public void testMaxTimeInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT max(time1)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("max(time1) OVER(PARTITION BY datetime1)", null, "time"));
+    verifySome(response.getJSONArray("datarows"), rows("22:50:16"));
+  }
+
+  @Test
+  public void testAvgTimeInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT avg(time1)" + " OVER(PARTITION BY datetime1) from %s", TEST_INDEX_CALCS));
+    verifySchema(response, schema("avg(time1) OVER(PARTITION BY datetime1)", null, "time"));
+    verifySome(response.getJSONArray("datarows"), rows("13:06:36.25"));
+  }
+
+  @Test
+  public void testMinTimeStampInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT min(CAST(datetime0 AS timestamp))"
+                    + " OVER(PARTITION BY datetime1) from %s",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
+        schema(
+            "min(CAST(datetime0 AS timestamp)) OVER(PARTITION BY datetime1)", null, "timestamp"));
+    verifySome(response.getJSONArray("datarows"), rows("2004-07-04 22:49:28"));
+  }
+
+  @Test
+  public void testMaxTimeStampInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT max(CAST(datetime0 AS timestamp))"
+                    + " OVER(PARTITION BY datetime1) from %s",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
+        schema(
+            "max(CAST(datetime0 AS timestamp)) OVER(PARTITION BY datetime1)", null, "timestamp"));
+    verifySome(response.getJSONArray("datarows"), rows("2004-08-02 07:59:23"));
+  }
+
+  @Test
+  public void testAvgTimeStampInMemory() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT avg(CAST(datetime0 AS timestamp))"
+                    + " OVER(PARTITION BY datetime1) from %s",
+                TEST_INDEX_CALCS));
+    verifySchema(
+        response,
+        schema(
+            "avg(CAST(datetime0 AS timestamp)) OVER(PARTITION BY datetime1)", null, "timestamp"));
+    verifySome(response.getJSONArray("datarows"), rows("2004-07-20 10:38:09.705"));
+  }
+
+  @Test
+  public void testPercentilePushedDown() throws IOException {
+    var response =
+        executeQuery(String.format("SELECT percentile(balance, 50)" + " FROM %s", TEST_INDEX_BANK));
+    verifySchema(response, schema("percentile(balance, 50)", null, "long"));
+    verifyDataRows(response, rows(32838));
+  }
+
+  @Test
+  public void testFilteredPercentilePushDown() throws IOException {
+    JSONObject response =
+        executeQuery(
+            "SELECT percentile(balance, 50) FILTER(WHERE balance > 40000) FROM " + TEST_INDEX_BANK);
+    verifySchema(
+        response, schema("percentile(balance, 50) FILTER(WHERE balance > 40000)", null, "long"));
+    verifyDataRows(response, rows(44313));
+  }
+
+  @Test
+  public void testPercentileGroupByPushDown() throws IOException {
+    var response =
+        executeQuery(
+            String.format(
+                "SELECT percentile(balance, 50), age" + " FROM %s GROUP BY age", TEST_INDEX_BANK));
+    verifySchema(
+        response, schema("percentile(balance, 50)", null, "long"), schema("age", null, "integer"));
+    verifyDataRows(
+        response,
+        rows(32838, 28),
+        rows(39225, 32),
+        rows(4180, 33),
+        rows(48086, 34),
+        rows(11052, 36),
+        rows(40540, 39));
+  }
+
   protected JSONObject executeQuery(String query) throws IOException {
     Request request = new Request("POST", QUERY_API_ENDPOINT);
     request.setJsonEntity(String.format(Locale.ROOT, "{\n" + "  \"query\": \"%s\"\n" + "}", query));
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/ArithmeticFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/ArithmeticFunctionIT.java
new file mode 100644
index 0000000000..7c91c42197
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/ArithmeticFunctionIT.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.schema;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
+import static org.opensearch.sql.util.MatcherUtils.verifySchema;
+import static org.opensearch.sql.util.TestUtils.getResponseBody;
+
+import java.io.IOException;
+import java.util.Locale;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.client.Response;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+
+public class ArithmeticFunctionIT extends SQLIntegTestCase {
+
+  @Override
+  public void init() throws Exception {
+    super.init();
+    loadIndex(Index.BANK);
+  }
+
+  public void testAdd() throws IOException {
+    JSONObject result = executeQuery("select 3 + 2");
+    verifySchema(result, schema("3 + 2", null, "integer"));
+    verifyDataRows(result, rows(3 + 2));
+
+    result = executeQuery("select 2.5 + 2");
+    verifySchema(result, schema("2.5 + 2", null, "double"));
+    verifyDataRows(result, rows(2.5D + 2));
+
+    result = executeQuery("select 3000000000 + 2");
+    verifySchema(result, schema("3000000000 + 2", null, "long"));
+    verifyDataRows(result, rows(3000000000L + 2));
+
+    result = executeQuery("select CAST(6.666666 AS FLOAT) + 2");
+    verifySchema(result, schema("CAST(6.666666 AS FLOAT) + 2", null, "float"));
+    verifyDataRows(result, rows(6.666666 + 2));
+  }
+
+  @Test
+  public void testAddFunction() throws IOException {
+    JSONObject result = executeQuery("select add(3, 2)");
+    verifySchema(result, schema("add(3, 2)", null, "integer"));
+    verifyDataRows(result, rows(3 + 2));
+
+    result = executeQuery("select add(2.5, 2)");
+    verifySchema(result, schema("add(2.5, 2)", null, "double"));
+    verifyDataRows(result, rows(2.5D + 2));
+
+    result = executeQuery("select add(3000000000, 2)");
+    verifySchema(result, schema("add(3000000000, 2)", null, "long"));
+    verifyDataRows(result, rows(3000000000L + 2));
+
+    result = executeQuery("select add(CAST(6.666666 AS FLOAT), 2)");
+    verifySchema(result, schema("add(CAST(6.666666 AS FLOAT), 2)", null, "float"));
+    verifyDataRows(result, rows(6.666666 + 2));
+  }
+
+  public void testDivide() throws IOException {
+    JSONObject result = executeQuery("select 3 / 2");
+    verifySchema(result, schema("3 / 2", null, "integer"));
+    verifyDataRows(result, rows(3 / 2));
+
+    result = executeQuery("select 2.5 / 2");
+    verifySchema(result, schema("2.5 / 2", null, "double"));
+    verifyDataRows(result, rows(2.5D / 2));
+
+    result = executeQuery("select 6000000000 / 2");
+    verifySchema(result, schema("6000000000 / 2", null, "long"));
+    verifyDataRows(result, rows(6000000000L / 2));
+
+    result = executeQuery("select cast(1.6 AS float) / 2");
+    verifySchema(result, schema("cast(1.6 AS float) / 2", null, "float"));
+    verifyDataRows(result, rows(1.6 / 2));
+  }
+
+  public void testDivideFunction() throws IOException {
+    JSONObject result = executeQuery("select divide(3, 2)");
+    verifySchema(result, schema("divide(3, 2)", null, "integer"));
+    verifyDataRows(result, rows(3 / 2));
+
+    result = executeQuery("select divide(2.5, 2)");
+    verifySchema(result, schema("divide(2.5, 2)", null, "double"));
+    verifyDataRows(result, rows(2.5D / 2));
+
+    result = executeQuery("select divide(6000000000, 2)");
+    verifySchema(result, schema("divide(6000000000, 2)", null, "long"));
+    verifyDataRows(result, rows(6000000000L / 2));
+
+    result = executeQuery("select divide(cast(1.6 AS float), 2)");
+    verifySchema(result, schema("divide(cast(1.6 AS float), 2)", null, "float"));
+    verifyDataRows(result, rows(1.6 / 2));
+  }
+
+  public void testMod() throws IOException {
+    JSONObject result = executeQuery("select mod(3, 2)");
+    verifySchema(result, schema("mod(3, 2)", null, "integer"));
+    verifyDataRows(result, rows(3 % 2));
+
+    result = executeQuery("select mod(2.5, 2)");
+    verifySchema(result, schema("mod(2.5, 2)", null, "double"));
+    verifyDataRows(result, rows(2.5D % 2));
+
+    result = executeQuery("select mod(cast(300001 as long), 2)");
+    verifySchema(result, schema("mod(cast(300001 as long), 2)", null, "long"));
+    verifyDataRows(result, rows(3000001 % 2));
+
+    result = executeQuery("select mod(cast(1.6 AS float), 2)");
+    verifySchema(result, schema("mod(cast(1.6 AS float), 2)", null, "float"));
+    verifyDataRows(result, rows(1.6 % 2));
+  }
+
+  public void testModulus() throws IOException {
+    JSONObject result = executeQuery("select 3 % 2");
+    verifySchema(result, schema("3 % 2", null, "integer"));
+    verifyDataRows(result, rows(3 % 2));
+
+    result = executeQuery("select 2.5 % 2");
+    verifySchema(result, schema("2.5 % 2", null, "double"));
+    verifyDataRows(result, rows(2.5D % 2));
+
+    result = executeQuery("select cast(300001 as long) % 2");
+    verifySchema(result, schema("cast(300001 as long) % 2", null, "long"));
+    verifyDataRows(result, rows(300001 % 2));
+
+    result = executeQuery("select cast(1.6 AS float) % 2");
+    verifySchema(result, schema("cast(1.6 AS float) % 2", null, "float"));
+    verifyDataRows(result, rows(1.6 % 2));
+  }
+
+  public void testModulusFunction() throws IOException {
+    JSONObject result = executeQuery("select modulus(3, 2)");
+    verifySchema(result, schema("modulus(3, 2)", null, "integer"));
+    verifyDataRows(result, rows(3 % 2));
+
+    result = executeQuery("select modulus(2.5, 2)");
+    verifySchema(result, schema("modulus(2.5, 2)", null, "double"));
+    verifyDataRows(result, rows(2.5D % 2));
+
+    result = executeQuery("select modulus(cast(300001 as long), 2)");
+    verifySchema(result, schema("modulus(cast(300001 as long), 2)", null, "long"));
+    verifyDataRows(result, rows(300001 % 2));
+
+    result = executeQuery("select modulus(cast(1.6 AS float), 2)");
+    verifySchema(result, schema("modulus(cast(1.6 AS float), 2)", null, "float"));
+    verifyDataRows(result, rows(1.6 % 2));
+  }
+
+  public void testMultiply() throws IOException {
+    JSONObject result = executeQuery("select 3 * 2");
+    verifySchema(result, schema("3 * 2", null, "integer"));
+    verifyDataRows(result, rows(3 * 2));
+
+    result = executeQuery("select 2.5 * 2");
+    verifySchema(result, schema("2.5 * 2", null, "double"));
+    verifyDataRows(result, rows(2.5D * 2));
+
+    result = executeQuery("select 3000000000 * 2");
+    verifySchema(result, schema("3000000000 * 2", null, "long"));
+    verifyDataRows(result, rows(3000000000L * 2));
+
+    result = executeQuery("select CAST(1.6 AS FLOAT) * 2");
+    verifySchema(result, schema("CAST(1.6 AS FLOAT) * 2", null, "float"));
+    verifyDataRows(result, rows(1.6 * 2));
+  }
+
+  @Test
+  public void testMultiplyFunction() throws IOException {
+    JSONObject result = executeQuery("select multiply(3, 2)");
+    verifySchema(result, schema("multiply(3, 2)", null, "integer"));
+    verifyDataRows(result, rows(3 * 2));
+
+    result = executeQuery("select multiply(2.5, 2)");
+    verifySchema(result, schema("multiply(2.5, 2)", null, "double"));
+    verifyDataRows(result, rows(2.5D * 2));
+
+    result = executeQuery("select multiply(3000000000, 2)");
+    verifySchema(result, schema("multiply(3000000000, 2)", null, "long"));
+    verifyDataRows(result, rows(3000000000L * 2));
+
+    result = executeQuery("select multiply(CAST(1.6 AS FLOAT), 2)");
+    verifySchema(result, schema("multiply(CAST(1.6 AS FLOAT), 2)", null, "float"));
+    verifyDataRows(result, rows(1.6 * 2));
+  }
+
+  public void testSubtract() throws IOException {
+    JSONObject result = executeQuery("select 3 - 2");
+    verifySchema(result, schema("3 - 2", null, "integer"));
+    verifyDataRows(result, rows(3 - 2));
+
+    result = executeQuery("select 2.5 - 2");
+    verifySchema(result, schema("2.5 - 2", null, "double"));
+    verifyDataRows(result, rows(2.5D - 2));
+
+    result = executeQuery("select 3000000000 - 2");
+    verifySchema(result, schema("3000000000 - 2", null, "long"));
+    verifyDataRows(result, rows(3000000000L - 2));
+
+    result = executeQuery("select CAST(6.666666 AS FLOAT) - 2");
+    verifySchema(result, schema("CAST(6.666666 AS FLOAT) - 2", null, "float"));
+    verifyDataRows(result, rows(6.666666 - 2));
+  }
+
+  @Test
+  public void testSubtractFunction() throws IOException {
+    JSONObject result = executeQuery("select subtract(3, 2)");
+    verifySchema(result, schema("subtract(3, 2)", null, "integer"));
+    verifyDataRows(result, rows(3 - 2));
+
+    result = executeQuery("select subtract(2.5, 2)");
+    verifySchema(result, schema("subtract(2.5, 2)", null, "double"));
+    verifyDataRows(result, rows(2.5D - 2));
+
+    result = executeQuery("select subtract(3000000000, 2)");
+    verifySchema(result, schema("subtract(3000000000, 2)", null, "long"));
+    verifyDataRows(result, rows(3000000000L - 2));
+
+    result = executeQuery("select cast(subtract(cast(6.666666 as float), 2) as float)");
+    verifySchema(
+        result, schema("cast(subtract(cast(6.666666 as float), 2) as float)", null, "float"));
+    verifyDataRows(result, rows(6.666666 - 2));
+  }
+
+  protected JSONObject executeQuery(String query) throws IOException {
+    Request request = new Request("POST", QUERY_API_ENDPOINT);
+    request.setJsonEntity(String.format(Locale.ROOT, "{\n" + "  \"query\": \"%s\"\n" + "}", query));
+
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+
+    Response response = client().performRequest(request);
+    return new JSONObject(getResponseBody(response));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/ConditionalIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/ConditionalIT.java
index 8b41e16551..deb41653e2 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/ConditionalIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/ConditionalIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -19,15 +18,15 @@
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import java.io.IOException;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.SearchHits;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 
@@ -42,9 +41,11 @@ public void init() throws Exception {
 
   @Test
   public void ifnullShouldPassJDBC() throws IOException {
-    JSONObject response = executeJdbcRequest(
-        "SELECT IFNULL(lastname, 'unknown') AS name FROM " + TEST_INDEX_ACCOUNT
-            + " GROUP BY name");
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT IFNULL(lastname, 'unknown') AS name FROM "
+                + TEST_INDEX_ACCOUNT
+                + " GROUP BY name");
     assertEquals("IFNULL(lastname, 'unknown')", response.query("/schema/0/name"));
     assertEquals("name", response.query("/schema/0/alias"));
     assertEquals("keyword", response.query("/schema/0/type"));
@@ -52,87 +53,95 @@ public void ifnullShouldPassJDBC() throws IOException {
 
   @Test
   public void ifnullWithNullInputTest() {
-    JSONObject response = new JSONObject(executeQuery(
-            "SELECT IFNULL(null, firstname) as IFNULL1 ,"
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT IFNULL(null, firstname) as IFNULL1 ,"
                     + " IFNULL(firstname, null) as IFNULL2 ,"
                     + " IFNULL(null, null) as IFNULL3 "
-                    + " FROM " + TEST_INDEX_BANK_WITH_NULL_VALUES
-                    + " WHERE balance is null limit 2", "jdbc"));
-
-    verifySchema(response,
-            schema("IFNULL(null, firstname)", "IFNULL1", "keyword"),
-            schema("IFNULL(firstname, null)", "IFNULL2", "keyword"),
-            schema("IFNULL(null, null)", "IFNULL3", "byte"));
-    verifyDataRows(response,
-            rows("Hattie", "Hattie", LITERAL_NULL.value()),
-            rows( "Elinor", "Elinor", LITERAL_NULL.value())
-    );
+                    + " FROM "
+                    + TEST_INDEX_BANK_WITH_NULL_VALUES
+                    + " WHERE balance is null limit 2",
+                "jdbc"));
+
+    verifySchema(
+        response,
+        schema("IFNULL(null, firstname)", "IFNULL1", "keyword"),
+        schema("IFNULL(firstname, null)", "IFNULL2", "keyword"),
+        schema("IFNULL(null, null)", "IFNULL3", "byte"));
+    verifyDataRows(
+        response,
+        rows("Hattie", "Hattie", LITERAL_NULL.value()),
+        rows("Elinor", "Elinor", LITERAL_NULL.value()));
   }
 
   @Test
   public void ifnullWithMissingInputTest() {
-    JSONObject response = new JSONObject(executeQuery(
-            "SELECT IFNULL(balance, 100) as IFNULL1, "
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT IFNULL(balance, 100) as IFNULL1, "
                     + " IFNULL(200, balance) as IFNULL2, "
                     + " IFNULL(balance, balance) as IFNULL3 "
-                    + " FROM " + TEST_INDEX_BANK_WITH_NULL_VALUES
-                    + " WHERE balance is null limit 3", "jdbc"));
-    verifySchema(response,
-            schema("IFNULL(balance, 100)", "IFNULL1", "long"),
-            schema("IFNULL(200, balance)", "IFNULL2", "long"),
-            schema("IFNULL(balance, balance)", "IFNULL3", "long"));
-    verifyDataRows(response,
-            rows(100, 200, null),
-            rows(100, 200, null),
-            rows(100, 200, null)
-    );
+                    + " FROM "
+                    + TEST_INDEX_BANK_WITH_NULL_VALUES
+                    + " WHERE balance is null limit 3",
+                "jdbc"));
+    verifySchema(
+        response,
+        schema("IFNULL(balance, 100)", "IFNULL1", "long"),
+        schema("IFNULL(200, balance)", "IFNULL2", "long"),
+        schema("IFNULL(balance, balance)", "IFNULL3", "long"));
+    verifyDataRows(response, rows(100, 200, null), rows(100, 200, null), rows(100, 200, null));
   }
 
   @Test
   public void nullifShouldPassJDBC() throws IOException {
-    JSONObject response = executeJdbcRequest(
-            "SELECT NULLIF(lastname, 'unknown') AS name FROM " + TEST_INDEX_ACCOUNT);
+    JSONObject response =
+        executeJdbcRequest("SELECT NULLIF(lastname, 'unknown') AS name FROM " + TEST_INDEX_ACCOUNT);
     assertEquals("NULLIF(lastname, 'unknown')", response.query("/schema/0/name"));
     assertEquals("name", response.query("/schema/0/alias"));
     assertEquals("keyword", response.query("/schema/0/type"));
   }
 
   @Test
-  public void nullifWithNotNullInputTestOne(){
-    JSONObject response = new JSONObject(executeQuery(
-            "SELECT NULLIF(firstname, 'Amber JOHnny') as testnullif "
-                  + "FROM " + TEST_INDEX_BANK_WITH_NULL_VALUES
-                  + " limit 2 ", "jdbc"));
-    verifySchema(response,
-            schema("NULLIF(firstname, 'Amber JOHnny')", "testnullif", "keyword"));
-    verifyDataRows(response,
-            rows(LITERAL_NULL.value()),
-            rows("Hattie")
-            );
+  public void nullifWithNotNullInputTestOne() {
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT NULLIF(firstname, 'Amber JOHnny') as testnullif "
+                    + "FROM "
+                    + TEST_INDEX_BANK_WITH_NULL_VALUES
+                    + " limit 2 ",
+                "jdbc"));
+    verifySchema(response, schema("NULLIF(firstname, 'Amber JOHnny')", "testnullif", "keyword"));
+    verifyDataRows(response, rows(LITERAL_NULL.value()), rows("Hattie"));
   }
 
   @Test
   public void nullifWithNullInputTest() {
-    JSONObject response = new JSONObject(executeQuery(
-            "SELECT NULLIF(1/0, 123) as nullif1 ,"
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT NULLIF(1/0, 123) as nullif1 ,"
                     + " NULLIF(123, 1/0) as nullif2 ,"
                     + " NULLIF(1/0, 1/0) as nullif3 "
-                    + " FROM " + TEST_INDEX_BANK_WITH_NULL_VALUES
-                    + " WHERE balance is null limit 1", "jdbc"));
-    verifySchema(response,
-            schema("NULLIF(1/0, 123)", "nullif1", "integer"),
-            schema("NULLIF(123, 1/0)", "nullif2", "integer"),
-            schema("NULLIF(1/0, 1/0)", "nullif3", "integer"));
-    verifyDataRows(response,
-            rows(LITERAL_NULL.value(), 123, LITERAL_NULL.value()
-            )
-    );
+                    + " FROM "
+                    + TEST_INDEX_BANK_WITH_NULL_VALUES
+                    + " WHERE balance is null limit 1",
+                "jdbc"));
+    verifySchema(
+        response,
+        schema("NULLIF(1/0, 123)", "nullif1", "integer"),
+        schema("NULLIF(123, 1/0)", "nullif2", "integer"),
+        schema("NULLIF(1/0, 1/0)", "nullif3", "integer"));
+    verifyDataRows(response, rows(LITERAL_NULL.value(), 123, LITERAL_NULL.value()));
   }
 
   @Test
   public void isnullShouldPassJDBC() throws IOException {
-    JSONObject response = executeJdbcRequest(
-            "SELECT ISNULL(lastname) AS name FROM " + TEST_INDEX_ACCOUNT);
+    JSONObject response =
+        executeJdbcRequest("SELECT ISNULL(lastname) AS name FROM " + TEST_INDEX_ACCOUNT);
     assertEquals("ISNULL(lastname)", response.query("/schema/0/name"));
     assertEquals("name", response.query("/schema/0/alias"));
     assertEquals("boolean", response.query("/schema/0/type"));
@@ -141,47 +150,48 @@ public void isnullShouldPassJDBC() throws IOException {
   @Test
   public void isnullWithNotNullInputTest() throws IOException {
     assertThat(
-            executeQuery("SELECT ISNULL('elastic') AS isnull FROM " + TEST_INDEX_ACCOUNT),
-            hitAny(kvInt("/fields/isnull/0", equalTo(0)))
-    );
+        executeQuery("SELECT ISNULL('elastic') AS isnull FROM " + TEST_INDEX_ACCOUNT),
+        hitAny(kvInt("/fields/isnull/0", equalTo(0))));
     assertThat(
-            executeQuery("SELECT ISNULL('') AS isnull FROM " + TEST_INDEX_ACCOUNT),
-            hitAny(kvInt("/fields/isnull/0", equalTo(0)))
-    );
+        executeQuery("SELECT ISNULL('') AS isnull FROM " + TEST_INDEX_ACCOUNT),
+        hitAny(kvInt("/fields/isnull/0", equalTo(0))));
   }
 
   @Test
   public void isnullWithNullInputTest() {
-    JSONObject response = new JSONObject(executeQuery(
-            "SELECT ISNULL(1/0) as ISNULL1 ,"
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT ISNULL(1/0) as ISNULL1 ,"
                     + " ISNULL(firstname) as ISNULL2 "
-                    + " FROM " + TEST_INDEX_BANK_WITH_NULL_VALUES
-                    + " WHERE balance is null limit 2", "jdbc"));
-    verifySchema(response,
-            schema("ISNULL(1/0)", "ISNULL1", "boolean"),
-            schema("ISNULL(firstname)", "ISNULL2", "boolean"));
-    verifyDataRows(response,
-            rows(LITERAL_TRUE.value(), LITERAL_FALSE.value()),
-            rows(LITERAL_TRUE.value(), LITERAL_FALSE.value())
-    );
+                    + " FROM "
+                    + TEST_INDEX_BANK_WITH_NULL_VALUES
+                    + " WHERE balance is null limit 2",
+                "jdbc"));
+    verifySchema(
+        response,
+        schema("ISNULL(1/0)", "ISNULL1", "boolean"),
+        schema("ISNULL(firstname)", "ISNULL2", "boolean"));
+    verifyDataRows(
+        response,
+        rows(LITERAL_TRUE.value(), LITERAL_FALSE.value()),
+        rows(LITERAL_TRUE.value(), LITERAL_FALSE.value()));
   }
 
   @Test
-  public void isnullWithMathExpr() throws IOException{
+  public void isnullWithMathExpr() throws IOException {
     assertThat(
-            executeQuery("SELECT ISNULL(1+1) AS isnull FROM " + TEST_INDEX_ACCOUNT),
-            hitAny(kvInt("/fields/isnull/0", equalTo(0)))
-    );
+        executeQuery("SELECT ISNULL(1+1) AS isnull FROM " + TEST_INDEX_ACCOUNT),
+        hitAny(kvInt("/fields/isnull/0", equalTo(0))));
     assertThat(
-            executeQuery("SELECT ISNULL(1+1*1/0) AS isnull FROM " + TEST_INDEX_ACCOUNT),
-            hitAny(kvInt("/fields/isnull/0", equalTo(1)))
-    );
+        executeQuery("SELECT ISNULL(1+1*1/0) AS isnull FROM " + TEST_INDEX_ACCOUNT),
+        hitAny(kvInt("/fields/isnull/0", equalTo(1))));
   }
 
   @Test
   public void ifShouldPassJDBC() throws IOException {
-    JSONObject response = executeJdbcRequest(
-        "SELECT IF(2 > 0, 'hello', 'world') AS name FROM " + TEST_INDEX_ACCOUNT);
+    JSONObject response =
+        executeJdbcRequest("SELECT IF(2 > 0, 'hello', 'world') AS name FROM " + TEST_INDEX_ACCOUNT);
     assertEquals("IF(2 > 0, 'hello', 'world')", response.query("/schema/0/name"));
     assertEquals("name", response.query("/schema/0/alias"));
     assertEquals("keyword", response.query("/schema/0/type"));
@@ -189,33 +199,37 @@ public void ifShouldPassJDBC() throws IOException {
 
   @Test
   public void ifWithTrueAndFalseCondition() throws IOException {
-    JSONObject response = new JSONObject(executeQuery(
-            "SELECT IF(2 < 0, firstname, lastname) as IF0, "
-            + " IF(2 > 0, firstname, lastname) as IF1, "
-            + " firstname as IF2, "
-            + " lastname as IF3 "
-            + " FROM " + TEST_INDEX_BANK_WITH_NULL_VALUES
-            + " limit 2 ", "jdbc" ));
-    verifySchema(response,
-            schema("IF(2 < 0, firstname, lastname)", "IF0", "keyword"),
-            schema("IF(2 > 0, firstname, lastname)", "IF1", "keyword"),
-            schema("firstname", "IF2", "text"),
-            schema("lastname", "IF3", "keyword")
-            );
-    verifyDataRows(response,
-            rows("Duke Willmington", "Amber JOHnny", "Amber JOHnny", "Duke Willmington"),
-            rows("Bond", "Hattie", "Hattie", "Bond")
-    );
-
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT IF(2 < 0, firstname, lastname) as IF0, "
+                    + " IF(2 > 0, firstname, lastname) as IF1, "
+                    + " firstname as IF2, "
+                    + " lastname as IF3 "
+                    + " FROM "
+                    + TEST_INDEX_BANK_WITH_NULL_VALUES
+                    + " limit 2 ",
+                "jdbc"));
+    verifySchema(
+        response,
+        schema("IF(2 < 0, firstname, lastname)", "IF0", "keyword"),
+        schema("IF(2 > 0, firstname, lastname)", "IF1", "keyword"),
+        schema("firstname", "IF2", "text"),
+        schema("lastname", "IF3", "keyword"));
+    verifyDataRows(
+        response,
+        rows("Duke Willmington", "Amber JOHnny", "Amber JOHnny", "Duke Willmington"),
+        rows("Bond", "Hattie", "Hattie", "Bond"));
   }
 
   private SearchHits query(String query) throws IOException {
     final String rsp = executeQueryWithStringOutput(query);
 
-    final XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(
-        NamedXContentRegistry.EMPTY,
-        LoggingDeprecationHandler.INSTANCE,
-        rsp);
+    final XContentParser parser =
+        new JsonXContentParser(
+            NamedXContentRegistry.EMPTY,
+            LoggingDeprecationHandler.INSTANCE,
+            new JsonFactory().createParser(rsp));
     return SearchResponse.fromXContent(parser).getHits();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/ConvertTZFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/ConvertTZFunctionIT.java
index 308fe7cdcd..76600b6561 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/ConvertTZFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/ConvertTZFunctionIT.java
@@ -1,20 +1,20 @@
-  /*
-   * Copyright OpenSearch Contributors
-   * SPDX-License-Identifier: Apache-2.0
-   */
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 package org.opensearch.sql.sql;
 
-import org.junit.Test;
-import org.opensearch.sql.legacy.SQLIntegTestCase;
-import java.io.IOException;
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.schema;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
-public class ConvertTZFunctionIT extends SQLIntegTestCase {
+import java.io.IOException;
+import org.junit.Test;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
 
+public class ConvertTZFunctionIT extends SQLIntegTestCase {
 
   @Override
   public void init() throws Exception {
@@ -22,103 +22,91 @@ public void init() throws Exception {
     loadIndex(Index.BANK);
   }
 
-
   @Test
   public void inRangeZeroToPositive() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2008-05-15 12:00:00','+00:00','+10:00')");
-    verifySchema(result,
-        schema("convert_tz('2008-05-15 12:00:00','+00:00','+10:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT convert_tz('2008-05-15 12:00:00','+00:00','+10:00')");
+    verifySchema(
+        result, schema("convert_tz('2008-05-15 12:00:00','+00:00','+10:00')", null, "datetime"));
     verifyDataRows(result, rows("2008-05-15 22:00:00"));
   }
 
   @Test
   public void inRangeNegativeZeroToPositiveZero() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-12 00:00:00','-00:00','+00:00')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-12 00:00:00','-00:00','+00:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-12 00:00:00','-00:00','+00:00')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-12 00:00:00','-00:00','+00:00')", null, "datetime"));
     verifyDataRows(result, rows("2021-05-12 00:00:00"));
   }
 
   @Test
   public void inRangePositiveToPositive() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-12 00:00:00','+10:00','+11:00')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-12 00:00:00','+10:00','+11:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-12 00:00:00','+10:00','+11:00')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-12 00:00:00','+10:00','+11:00')", null, "datetime"));
     verifyDataRows(result, rows("2021-05-12 01:00:00"));
   }
 
   @Test
   public void inRangeNegativeToPositive() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-12 11:34:50','-08:00','+09:00')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-12 11:34:50','-08:00','+09:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-12 11:34:50','-08:00','+09:00')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-12 11:34:50','-08:00','+09:00')", null, "datetime"));
     verifyDataRows(result, rows("2021-05-13 04:34:50"));
   }
 
   @Test
   public void inRangeSameTimeZone() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-12 11:34:50','+09:00','+09:00')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-12 11:34:50','+09:00','+09:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-12 11:34:50','+09:00','+09:00')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-12 11:34:50','+09:00','+09:00')", null, "datetime"));
     verifyDataRows(result, rows("2021-05-12 11:34:50"));
   }
 
   @Test
   public void inRangeTwentyFourHourTimeOffset() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-12 11:34:50','-12:00','+12:00')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-12 11:34:50','-12:00','+12:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-12 11:34:50','-12:00','+12:00')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-12 11:34:50','-12:00','+12:00')", null, "datetime"));
     verifyDataRows(result, rows("2021-05-13 11:34:50"));
   }
 
   @Test
   public void inRangeFifteenMinuteTimeZones() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-12 13:00:00','+09:30','+05:45')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-12 13:00:00','+09:30','+05:45')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-12 13:00:00','+09:30','+05:45')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-12 13:00:00','+09:30','+05:45')", null, "datetime"));
     verifyDataRows(result, rows("2021-05-12 09:15:00"));
   }
 
   @Test
   public void inRangeRandomTimes() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-12 13:00:00','+09:31','+05:11')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-12 13:00:00','+09:31','+05:11')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-12 13:00:00','+09:31','+05:11')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-12 13:00:00','+09:31','+05:11')", null, "datetime"));
     verifyDataRows(result, rows("2021-05-12 08:40:00"));
   }
 
   @Test
   public void nullField2Under() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-30 11:34:50','-14:00','+08:00')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-30 11:34:50','-14:00','+08:00')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-30 11:34:50','-14:00','+08:00')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-30 11:34:50','-14:00','+08:00')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 
   @Test
   public void nullField3Over() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-12 11:34:50','-12:00','+14:01')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-12 11:34:50','-12:00','+14:01')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-12 11:34:50','-12:00','+14:01')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-12 11:34:50','-12:00','+14:01')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 
   @Test
   public void inRangeMinOnPoint() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-12 15:00:00','-13:59','-13:59')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-12 15:00:00','-13:59','-13:59')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-12 15:00:00','-13:59','-13:59')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-12 15:00:00','-13:59','-13:59')", null, "datetime"));
     verifyDataRows(result, rows("2021-05-12 15:00:00"));
   }
 
@@ -128,57 +116,50 @@ public void inRangeMinOnPoint() throws IOException {
   // Invalid input returns null.
   @Test
   public void nullField3InvalidInput() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-12 11:34:50','+10:0','+14:01')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-12 11:34:50','+10:0','+14:01')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-12 11:34:50','+10:0','+14:01')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-12 11:34:50','+10:0','+14:01')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 
   @Test
   public void nullField2InvalidInput() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-05-12 11:34:50','+14:01','****')");
-    verifySchema(result,
-        schema("convert_tz('2021-05-12 11:34:50','+14:01','****')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-05-12 11:34:50','+14:01','****')");
+    verifySchema(
+        result, schema("convert_tz('2021-05-12 11:34:50','+14:01','****')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 
   // Invalid input in the datetime field of CONVERT_TZ results in a null field. It is any input
   // which is not of the format `yyyy-MM-dd HH:mm:ss`
   @Test
   public void nullDateTimeInvalidInput() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021----','+00:00','+00:00')");
-    verifySchema(result,
-        schema("convert_tz('2021----','+00:00','+00:00')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT convert_tz('2021----','+00:00','+00:00')");
+    verifySchema(result, schema("convert_tz('2021----','+00:00','+00:00')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 
   @Test
   public void nullDateTimeInvalidDateValueFebruary() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-02-30 10:00:00','+00:00','+00:00')");
-    verifySchema(result,
-        schema("convert_tz('2021-02-30 10:00:00','+00:00','+00:00')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-02-30 10:00:00','+00:00','+00:00')");
+    verifySchema(
+        result, schema("convert_tz('2021-02-30 10:00:00','+00:00','+00:00')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 
   @Test
   public void nullDateTimeInvalidDateValueApril() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-04-31 10:00:00','+00:00','+00:00')");
-    verifySchema(result,
-        schema("convert_tz('2021-04-31 10:00:00','+00:00','+00:00')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-04-31 10:00:00','+00:00','+00:00')");
+    verifySchema(
+        result, schema("convert_tz('2021-04-31 10:00:00','+00:00','+00:00')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 
   @Test
   public void nullDateTimeInvalidDateValueMonth() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT convert_tz('2021-13-03 10:00:00','+00:00','+00:00')");
-    verifySchema(result,
-        schema("convert_tz('2021-13-03 10:00:00','+00:00','+00:00')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT convert_tz('2021-13-03 10:00:00','+00:00','+00:00')");
+    verifySchema(
+        result, schema("convert_tz('2021-13-03 10:00:00','+00:00','+00:00')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/CorrectnessTestBase.java b/integ-test/src/test/java/org/opensearch/sql/sql/CorrectnessTestBase.java
index cd5765e0ce..33c9c0687f 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/CorrectnessTestBase.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/CorrectnessTestBase.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static java.util.Collections.emptyMap;
@@ -25,15 +24,13 @@
 import org.opensearch.sql.legacy.utils.StringUtils;
 
 /**
- * SQL integration test base class. This is very similar to CorrectnessIT though
- * enforce the success of all tests rather than report failures only.
+ * SQL integration test base class. This is very similar to CorrectnessIT though enforce the success
+ * of all tests rather than report failures only.
  */
 @ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public abstract class CorrectnessTestBase extends RestIntegTestCase {
 
-  /**
-   * Comparison test runner shared by all methods in this IT class.
-   */
+  /** Comparison test runner shared by all methods in this IT class. */
   private static ComparisonTest runner;
 
   @Override
@@ -43,8 +40,7 @@ protected void init() throws Exception {
     }
 
     TestConfig config = new TestConfig(emptyMap());
-    runner = new ComparisonTest(getOpenSearchConnection(),
-                                getOtherDBConnections(config));
+    runner = new ComparisonTest(getOpenSearchConnection(), getOtherDBConnections(config));
 
     runner.connect();
     for (TestDataSet dataSet : config.getTestDataSets()) {
@@ -52,9 +48,7 @@ protected void init() throws Exception {
     }
   }
 
-  /**
-   * Clean up test data and close other database connection.
-   */
+  /** Clean up test data and close other database connection. */
   @AfterClass
   public static void cleanUp() {
     if (runner == null) {
@@ -74,33 +68,29 @@ public static void cleanUp() {
   }
 
   /**
-   * Execute the given queries and compare result with other database.
-   * The queries will be considered as one test batch.
+   * Execute the given queries and compare result with other database. The queries will be
+   * considered as one test batch.
    */
   protected void verify(String... queries) {
     TestReport result = runner.verify(new TestQuerySet(queries));
     TestSummary summary = result.getSummary();
-    Assert.assertEquals(StringUtils.format(
-        "Comparison test failed on queries: %s", new JSONObject(result).toString(2)),
-        0, summary.getFailure());
+    Assert.assertEquals(
+        StringUtils.format(
+            "Comparison test failed on queries: %s", new JSONObject(result).toString(2)),
+        0,
+        summary.getFailure());
   }
 
-  /**
-   * Use OpenSearch cluster initialized by OpenSearch Gradle task.
-   */
+  /** Use OpenSearch cluster initialized by OpenSearch Gradle task. */
   private DBConnection getOpenSearchConnection() {
     String openSearchHost = client().getNodes().get(0).getHost().toString();
     return new OpenSearchConnection("jdbc:opensearch://" + openSearchHost, client());
   }
 
-  /**
-   * Create database connection with database name and connect URL.
-   */
+  /** Create database connection with database name and connect URL. */
   private DBConnection[] getOtherDBConnections(TestConfig config) {
-    return config.getOtherDbConnectionNameAndUrls()
-                 .entrySet().stream()
-                 .map(e -> new JDBCConnection(e.getKey(), e.getValue()))
-                 .toArray(DBConnection[]::new);
+    return config.getOtherDbConnectionNameAndUrls().entrySet().stream()
+        .map(e -> new JDBCConnection(e.getKey(), e.getValue()))
+        .toArray(DBConnection[]::new);
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/CsvFormatIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/CsvFormatIT.java
index 2c5005413e..33429331f9 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/CsvFormatIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/CsvFormatIT.java
@@ -3,14 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK_CSV_SANITIZE;
+import static org.opensearch.sql.protocol.response.format.CsvResponseFormatter.CONTENT_TYPE;
 
 import java.io.IOException;
 import java.util.Locale;
 import org.junit.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.Response;
+import org.opensearch.sql.common.utils.StringUtils;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 
 public class CsvFormatIT extends SQLIntegTestCase {
@@ -22,30 +25,52 @@ public void init() throws IOException {
 
   @Test
   public void sanitizeTest() {
-    String result = executeQuery(
-        String.format(Locale.ROOT, "SELECT firstname, lastname FROM %s", TEST_INDEX_BANK_CSV_SANITIZE), "csv");
+    String result =
+        executeQuery(
+            String.format(
+                Locale.ROOT, "SELECT firstname, lastname FROM %s", TEST_INDEX_BANK_CSV_SANITIZE),
+            "csv");
     assertEquals(
-        "firstname,lastname\n"
-            + "'+Amber JOHnny,Duke Willmington+\n"
-            + "'-Hattie,Bond-\n"
-            + "'=Nanette,Bates=\n"
-            + "'@Dale,Adams@\n"
-            + "\",Elinor\",\"Ratliff,,,\"\n",
+        StringUtils.format(
+            "firstname,lastname%n"
+                + "'+Amber JOHnny,Duke Willmington+%n"
+                + "'-Hattie,Bond-%n"
+                + "'=Nanette,Bates=%n"
+                + "'@Dale,Adams@%n"
+                + "\",Elinor\",\"Ratliff,,,\"%n"),
         result);
   }
 
   @Test
   public void escapeSanitizeTest() {
-    String result = executeQuery(
-        String.format(Locale.ROOT, "SELECT firstname, lastname FROM %s", TEST_INDEX_BANK_CSV_SANITIZE),
-        "csv&sanitize=false");
+    String result =
+        executeQuery(
+            String.format(
+                Locale.ROOT, "SELECT firstname, lastname FROM %s", TEST_INDEX_BANK_CSV_SANITIZE),
+            "csv&sanitize=false");
     assertEquals(
-        "firstname,lastname\n"
-            + "+Amber JOHnny,Duke Willmington+\n"
-            + "-Hattie,Bond-\n"
-            + "=Nanette,Bates=\n"
-            + "@Dale,Adams@\n"
-            + "\",Elinor\",\"Ratliff,,,\"\n",
+        StringUtils.format(
+            "firstname,lastname%n"
+                + "+Amber JOHnny,Duke Willmington+%n"
+                + "-Hattie,Bond-%n"
+                + "=Nanette,Bates=%n"
+                + "@Dale,Adams@%n"
+                + "\",Elinor\",\"Ratliff,,,\"%n"),
         result);
   }
+
+  @Test
+  public void contentHeaderTest() throws IOException {
+    String query =
+        String.format(
+            Locale.ROOT, "SELECT firstname, lastname FROM %s", TEST_INDEX_BANK_CSV_SANITIZE);
+    String requestBody = makeRequest(query);
+
+    Request sqlRequest = new Request("POST", "/_plugins/_sql?format=csv");
+    sqlRequest.setJsonEntity(requestBody);
+
+    Response response = client().performRequest(sqlRequest);
+
+    assertEquals(response.getEntity().getContentType().getValue(), CONTENT_TYPE);
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeComparisonIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeComparisonIT.java
new file mode 100644
index 0000000000..432daef82f
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeComparisonIT.java
@@ -0,0 +1,780 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import static com.carrotsearch.randomizedtesting.RandomizedTest.$;
+import static com.carrotsearch.randomizedtesting.RandomizedTest.$$;
+import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.schema;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
+import static org.opensearch.sql.util.MatcherUtils.verifySchema;
+import static org.opensearch.sql.util.TestUtils.getResponseBody;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.TimeZone;
+import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.jupiter.api.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.client.Response;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+
+public class DateTimeComparisonIT extends SQLIntegTestCase {
+
+  @Override
+  public void init() throws Exception {
+    super.init();
+  }
+
+  private final TimeZone testTz = TimeZone.getDefault();
+  private final TimeZone systemTz = TimeZone.getTimeZone(System.getProperty("user.timezone"));
+
+  @Before
+  public void setTimeZone() {
+    TimeZone.setDefault(systemTz);
+  }
+
+  @After
+  public void resetTimeZone() {
+    TimeZone.setDefault(testTz);
+  }
+
+  private String functionCall;
+  private String name;
+  private Boolean expectedResult;
+
+  public DateTimeComparisonIT(
+      @Name("functionCall") String functionCall,
+      @Name("name") String name,
+      @Name("expectedResult") Boolean expectedResult) {
+    this.functionCall = functionCall;
+    this.name = name;
+    this.expectedResult = expectedResult;
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareTwoDates() {
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') = DATE('2020-09-16')", "eq1", true),
+            $("DATE('2020-09-16') = DATE('1961-04-12')", "eq2", false),
+            $("DATE('2020-09-16') != DATE('1984-12-15')", "neq1", true),
+            $("DATE('1961-04-12') != DATE('1984-12-15')", "neq2", true),
+            $("DATE('1961-04-12') != DATE('1961-04-12')", "neq3", false),
+            $("DATE('1984-12-15') > DATE('1961-04-12')", "gt1", true),
+            $("DATE('1984-12-15') > DATE('2020-09-16')", "gt2", false),
+            $("DATE('1961-04-12') < DATE('1984-12-15')", "lt1", true),
+            $("DATE('1984-12-15') < DATE('1961-04-12')", "lt2", false),
+            $("DATE('1984-12-15') >= DATE('1961-04-12')", "gte1", true),
+            $("DATE('1984-12-15') >= DATE('1984-12-15')", "gte2", true),
+            $("DATE('1984-12-15') >= DATE('2020-09-16')", "gte3", false),
+            $("DATE('1961-04-12') <= DATE('1984-12-15')", "lte1", true),
+            $("DATE('1961-04-12') <= DATE('1961-04-12')", "lte2", true),
+            $("DATE('2020-09-16') <= DATE('1961-04-12')", "lte3", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareTwoTimes() {
+    return Arrays.asList(
+        $$(
+            $("TIME('09:16:37') = TIME('09:16:37')", "eq1", true),
+            $("TIME('09:16:37') = TIME('04:12:42')", "eq2", false),
+            $("TIME('09:16:37') != TIME('12:15:22')", "neq1", true),
+            $("TIME('04:12:42') != TIME('12:15:22')", "neq2", true),
+            $("TIME('04:12:42') != TIME('04:12:42')", "neq3", false),
+            $("TIME('12:15:22') > TIME('04:12:42')", "gt1", true),
+            $("TIME('12:15:22') > TIME('19:16:03')", "gt2", false),
+            $("TIME('04:12:42') < TIME('12:15:22')", "lt1", true),
+            $("TIME('14:12:38') < TIME('12:15:22')", "lt2", false),
+            $("TIME('12:15:22') >= TIME('04:12:42')", "gte1", true),
+            $("TIME('12:15:22') >= TIME('12:15:22')", "gte2", true),
+            $("TIME('12:15:22') >= TIME('19:16:03')", "gte3", false),
+            $("TIME('04:12:42') <= TIME('12:15:22')", "lte1", true),
+            $("TIME('04:12:42') <= TIME('04:12:42')", "lte2", true),
+            $("TIME('19:16:03') <= TIME('04:12:42')", "lte3", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareTwoDateTimes() {
+    return Arrays.asList(
+        $$(
+            $("DATETIME('2020-09-16 10:20:30') = DATETIME('2020-09-16 10:20:30')", "eq1", true),
+            $("DATETIME('2020-09-16 10:20:30') = DATETIME('1961-04-12 09:07:00')", "eq2", false),
+            $("DATETIME('2020-09-16 10:20:30') != DATETIME('1984-12-15 22:15:07')", "neq1", true),
+            $("DATETIME('1984-12-15 22:15:08') != DATETIME('1984-12-15 22:15:07')", "neq2", true),
+            $("DATETIME('1961-04-12 09:07:00') != DATETIME('1961-04-12 09:07:00')", "neq3", false),
+            $("DATETIME('1984-12-15 22:15:07') > DATETIME('1961-04-12 22:15:07')", "gt1", true),
+            $("DATETIME('1984-12-15 22:15:07') > DATETIME('1984-12-15 22:15:06')", "gt2", true),
+            $("DATETIME('1984-12-15 22:15:07') > DATETIME('2020-09-16 10:20:30')", "gt3", false),
+            $("DATETIME('1961-04-12 09:07:00') < DATETIME('1984-12-15 09:07:00')", "lt1", true),
+            $("DATETIME('1984-12-15 22:15:07') < DATETIME('1984-12-15 22:15:08')", "lt2", true),
+            $("DATETIME('1984-12-15 22:15:07') < DATETIME('1961-04-12 09:07:00')", "lt3", false),
+            $("DATETIME('1984-12-15 22:15:07') >= DATETIME('1961-04-12 09:07:00')", "gte1", true),
+            $("DATETIME('1984-12-15 22:15:07') >= DATETIME('1984-12-15 22:15:07')", "gte2", true),
+            $("DATETIME('1984-12-15 22:15:07') >= DATETIME('2020-09-16 10:20:30')", "gte3", false),
+            $("DATETIME('1961-04-12 09:07:00') <= DATETIME('1984-12-15 22:15:07')", "lte1", true),
+            $("DATETIME('1961-04-12 09:07:00') <= DATETIME('1961-04-12 09:07:00')", "lte2", true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') <= DATETIME('1961-04-12 09:07:00')",
+                "lte3",
+                false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareTwoTimestamps() {
+    return Arrays.asList(
+        $$(
+            $("TIMESTAMP('2020-09-16 10:20:30') = TIMESTAMP('2020-09-16 10:20:30')", "eq1", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') = TIMESTAMP('1961-04-12 09:07:00')", "eq2", false),
+            $("TIMESTAMP('2020-09-16 10:20:30') != TIMESTAMP('1984-12-15 22:15:07')", "neq1", true),
+            $("TIMESTAMP('1984-12-15 22:15:08') != TIMESTAMP('1984-12-15 22:15:07')", "neq2", true),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') != TIMESTAMP('1961-04-12 09:07:00')",
+                "neq3",
+                false),
+            $("TIMESTAMP('1984-12-15 22:15:07') > TIMESTAMP('1961-04-12 22:15:07')", "gt1", true),
+            $("TIMESTAMP('1984-12-15 22:15:07') > TIMESTAMP('1984-12-15 22:15:06')", "gt2", true),
+            $("TIMESTAMP('1984-12-15 22:15:07') > TIMESTAMP('2020-09-16 10:20:30')", "gt3", false),
+            $("TIMESTAMP('1961-04-12 09:07:00') < TIMESTAMP('1984-12-15 09:07:00')", "lt1", true),
+            $("TIMESTAMP('1984-12-15 22:15:07') < TIMESTAMP('1984-12-15 22:15:08')", "lt2", true),
+            $("TIMESTAMP('1984-12-15 22:15:07') < TIMESTAMP('1961-04-12 09:07:00')", "lt3", false),
+            $("TIMESTAMP('1984-12-15 22:15:07') >= TIMESTAMP('1961-04-12 09:07:00')", "gte1", true),
+            $("TIMESTAMP('1984-12-15 22:15:07') >= TIMESTAMP('1984-12-15 22:15:07')", "gte2", true),
+            $(
+                "TIMESTAMP('1984-12-15 22:15:07') >= TIMESTAMP('2020-09-16 10:20:30')",
+                "gte3",
+                false),
+            $("TIMESTAMP('1961-04-12 09:07:00') <= TIMESTAMP('1984-12-15 22:15:07')", "lte1", true),
+            $("TIMESTAMP('1961-04-12 09:07:00') <= TIMESTAMP('1961-04-12 09:07:00')", "lte2", true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') <= TIMESTAMP('1961-04-12 09:07:00')",
+                "lte3",
+                false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareEqTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') = DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') = TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') = DATETIME('1961-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('1961-04-12 09:07:00') = TIMESTAMP('1984-12-15 22:15:07')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 00:00:00') = DATE('2020-09-16')", "ts_d_t", true),
+            $("DATE('2020-09-16') = TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') = DATE('1961-04-12')", "ts_d_f", false),
+            $("DATE('1961-04-12') = TIMESTAMP('1984-12-15 22:15:07')", "d_ts_f", false),
+            $("TIMESTAMP('" + today + " 10:20:30') = TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('10:20:30') = TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') = TIME('09:07:00')", "ts_t_f", false),
+            $("TIME('09:07:00') = TIMESTAMP('1984-12-15 22:15:07')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareEqDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:30') = TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') = DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') = TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') = DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('2020-09-16 00:00:00') = DATE('2020-09-16')", "dt_d_t", true),
+            $("DATE('2020-09-16') = DATETIME('2020-09-16 00:00:00')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 10:20:30') = DATE('1961-04-12')", "dt_d_f", false),
+            $("DATE('1961-04-12') = DATETIME('1984-12-15 22:15:07')", "d_dt_f", false),
+            $("DATETIME('" + today + " 10:20:30') = TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('10:20:30') = DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('2020-09-16 10:20:30') = TIME('09:07:00')", "dt_t_f", false),
+            $("TIME('09:07:00') = DATETIME('1984-12-15 22:15:07')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareEqDateWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') = TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 00:00:00') = DATE('2020-09-16')", "ts_d_t", true),
+            $("DATE('2020-09-16') = TIMESTAMP('1961-04-12 09:07:00')", "d_ts_f", false),
+            $("TIMESTAMP('1984-12-15 09:07:00') = DATE('1984-12-15')", "ts_d_f", false),
+            $("DATE('2020-09-16') = DATETIME('2020-09-16 00:00:00')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') = DATE('2020-09-16')", "dt_d_t", true),
+            $("DATE('1961-04-12') = DATETIME('1984-12-15 22:15:07')", "d_dt_f", false),
+            $("DATETIME('1961-04-12 10:20:30') = DATE('1961-04-12')", "dt_d_f", false),
+            $("DATE('" + today + "') = TIME('00:00:00')", "d_t_t", true),
+            $("TIME('00:00:00') = DATE('" + today + "')", "t_d_t", true),
+            $("DATE('2020-09-16') = TIME('09:07:00')", "d_t_f", false),
+            $("TIME('09:07:00') = DATE('" + today + "')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareEqTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('10:20:30') = DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('" + today + " 10:20:30') = TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('09:07:00') = DATETIME('1961-04-12 09:07:00')", "t_dt_f", false),
+            $("DATETIME('" + today + " 09:07:00') = TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('10:20:30') = TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 10:20:30') = TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('22:15:07') = TIMESTAMP('1984-12-15 22:15:07')", "t_ts_f", false),
+            $("TIMESTAMP('1984-12-15 10:20:30') = TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('00:00:00') = DATE('" + today + "')", "t_d_t", true),
+            $("DATE('" + today + "') = TIME('00:00:00')", "d_t_t", true),
+            $("TIME('09:07:00') = DATE('" + today + "')", "t_d_f", false),
+            $("DATE('2020-09-16') = TIME('09:07:00')", "d_t_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareNeqTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') != DATETIME('1961-04-12 09:07:00')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('1961-04-12 09:07:00') != TIMESTAMP('1984-12-15 22:15:07')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') != DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('2020-09-16 10:20:30') != TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 10:20:30') != DATE('1961-04-12')", "ts_d_t", true),
+            $("DATE('1961-04-12') != TIMESTAMP('1984-12-15 22:15:07')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 00:00:00') != DATE('2020-09-16')", "ts_d_f", false),
+            $("DATE('2020-09-16') != TIMESTAMP('2020-09-16 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('2020-09-16 10:20:30') != TIME('09:07:00')", "ts_t_t", true),
+            $("TIME('09:07:00') != TIMESTAMP('1984-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 10:20:30') != TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('10:20:30') != TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareNeqDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:30') != TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') != DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') != TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') != DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('2020-09-16 10:20:30') != DATE('1961-04-12')", "dt_d_t", true),
+            $("DATE('1961-04-12') != DATETIME('1984-12-15 22:15:07')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') != DATE('2020-09-16')", "dt_d_f", false),
+            $("DATE('2020-09-16') != DATETIME('2020-09-16 00:00:00')", "d_dt_f", false),
+            $("DATETIME('2020-09-16 10:20:30') != TIME('09:07:00')", "dt_t_t", true),
+            $("TIME('09:07:00') != DATETIME('1984-12-15 22:15:07')", "t_dt_t", true),
+            $("DATETIME('" + today + " 10:20:30') != TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('10:20:30') != DATETIME('" + today + " 10:20:30')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareNeqDateWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') != TIMESTAMP('1961-04-12 09:07:00')", "d_ts_t", true),
+            $("TIMESTAMP('1984-12-15 09:07:00') != DATE('1984-12-15')", "ts_d_t", true),
+            $("DATE('2020-09-16') != TIMESTAMP('2020-09-16 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('2020-09-16 00:00:00') != DATE('2020-09-16')", "ts_d_f", false),
+            $("DATE('1961-04-12') != DATETIME('1984-12-15 22:15:07')", "d_dt_t", true),
+            $("DATETIME('1961-04-12 10:20:30') != DATE('1961-04-12')", "dt_d_t", true),
+            $("DATE('2020-09-16') != DATETIME('2020-09-16 00:00:00')", "d_dt_f", false),
+            $("DATETIME('2020-09-16 00:00:00') != DATE('2020-09-16')", "dt_d_f", false),
+            $("DATE('2020-09-16') != TIME('09:07:00')", "d_t_t", true),
+            $("TIME('09:07:00') != DATE('" + today + "')", "t_d_t", true),
+            $("DATE('" + today + "') != TIME('00:00:00')", "d_t_f", false),
+            $("TIME('00:00:00') != DATE('" + today + "')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareNeqTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('09:07:00') != DATETIME('1961-04-12 09:07:00')", "t_dt_t", true),
+            $("DATETIME('" + today + " 09:07:00') != TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('10:20:30') != DATETIME('" + today + " 10:20:30')", "t_dt_f", false),
+            $("DATETIME('" + today + " 10:20:30') != TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('22:15:07') != TIMESTAMP('1984-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('1984-12-15 10:20:30') != TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('10:20:30') != TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false),
+            $("TIMESTAMP('" + today + " 10:20:30') != TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('09:07:00') != DATE('" + today + "')", "t_d_t", true),
+            $("DATE('2020-09-16') != TIME('09:07:00')", "d_t_t", true),
+            $("TIME('00:00:00') != DATE('" + today + "')", "t_d_f", false),
+            $("DATE('" + today + "') != TIME('00:00:00')", "d_t_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLtTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') < DATETIME('2061-04-12 09:07:00')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('1961-04-12 09:07:00') < TIMESTAMP('1984-12-15 22:15:07')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') < DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('2020-09-16 10:20:30') < TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 10:20:30') < DATE('2077-04-12')", "ts_d_t", true),
+            $("DATE('1961-04-12') < TIMESTAMP('1984-12-15 22:15:07')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') < DATE('1961-04-12')", "ts_d_f", false),
+            $("DATE('2020-09-16') < TIMESTAMP('2020-09-16 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('2020-09-16 10:20:30') < TIME('09:07:00')", "ts_t_t", true),
+            $("TIME('09:07:00') < TIMESTAMP('3077-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 10:20:30') < TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('20:50:40') < TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLtDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:30') < TIMESTAMP('2077-04-12 09:07:00')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') < DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') < TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') < DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('2020-09-16 10:20:30') < DATE('3077-04-12')", "dt_d_t", true),
+            $("DATE('1961-04-12') < DATETIME('1984-12-15 22:15:07')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') < DATE('2020-09-16')", "dt_d_f", false),
+            $("DATE('2020-09-16') < DATETIME('1961-04-12 09:07:00')", "d_dt_f", false),
+            $("DATETIME('2020-09-16 10:20:30') < TIME('09:07:00')", "dt_t_t", true),
+            $("TIME('09:07:00') < DATETIME('3077-12-15 22:15:07')", "t_dt_t", true),
+            $("DATETIME('" + today + " 10:20:30') < TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('20:40:50') < DATETIME('" + today + " 10:20:30')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLtDateWithOtherTypes() {
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') < TIMESTAMP('3077-04-12 09:07:00')", "d_ts_t", true),
+            $("TIMESTAMP('1961-04-12 09:07:00') < DATE('1984-12-15')", "ts_d_t", true),
+            $("DATE('2020-09-16') < TIMESTAMP('2020-09-16 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('2077-04-12 09:07:00') < DATE('2020-09-16')", "ts_d_f", false),
+            $("DATE('1961-04-12') < DATETIME('1984-12-15 22:15:07')", "d_dt_t", true),
+            $("DATETIME('1961-04-12 10:20:30') < DATE('1984-11-15')", "dt_d_t", true),
+            $("DATE('2020-09-16') < DATETIME('2020-09-16 00:00:00')", "d_dt_f", false),
+            $("DATETIME('2020-09-16 00:00:00') < DATE('1984-03-22')", "dt_d_f", false),
+            $("DATE('2020-09-16') < TIME('09:07:00')", "d_t_t", true),
+            $("TIME('09:07:00') < DATE('3077-04-12')", "t_d_t", true),
+            $("DATE('3077-04-12') < TIME('00:00:00')", "d_t_f", false),
+            $("TIME('00:00:00') < DATE('2020-09-16')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLtTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('09:07:00') < DATETIME('3077-04-12 09:07:00')", "t_dt_t", true),
+            $("DATETIME('" + today + " 09:07:00') < TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('10:20:30') < DATETIME('" + today + " 10:20:30')", "t_dt_f", false),
+            $("DATETIME('" + today + " 20:40:50') < TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('22:15:07') < TIMESTAMP('3077-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('1984-12-15 10:20:30') < TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('10:20:30') < TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false),
+            $("TIMESTAMP('" + today + " 20:50:42') < TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('09:07:00') < DATE('3077-04-12')", "t_d_t", true),
+            $("DATE('2020-09-16') < TIME('09:07:00')", "d_t_t", true),
+            $("TIME('00:00:00') < DATE('1961-04-12')", "t_d_f", false),
+            $("DATE('3077-04-12') < TIME('10:20:30')", "d_t_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGtTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') > DATETIME('2020-09-16 10:20:25')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') > TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') > DATETIME('2061-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('1961-04-12 09:07:00') > TIMESTAMP('1984-12-15 09:07:00')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 10:20:30') > DATE('1961-04-12')", "ts_d_t", true),
+            $("DATE('2020-09-16') > TIMESTAMP('2020-09-15 22:15:07')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') > DATE('2077-04-12')", "ts_d_f", false),
+            $("DATE('1961-04-12') > TIMESTAMP('1961-04-12 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('3077-07-08 20:20:30') > TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('20:50:40') > TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 10:20:30') > TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('09:07:00') > TIMESTAMP('3077-12-15 22:15:07')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGtDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:31') > TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') > DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') > TIMESTAMP('2077-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') > DATETIME('1961-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('3077-04-12 10:20:30') > DATE('2020-09-16')", "dt_d_t", true),
+            $("DATE('2020-09-16') > DATETIME('1961-04-12 09:07:00')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') > DATE('2020-09-16')", "dt_d_f", false),
+            $("DATE('1961-04-12') > DATETIME('1984-12-15 22:15:07')", "d_dt_f", false),
+            $("DATETIME('3077-04-12 10:20:30') > TIME('09:07:00')", "dt_t_t", true),
+            $("TIME('20:40:50') > DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('" + today + " 10:20:30') > TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('09:07:00') > DATETIME('3077-12-15 22:15:07')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGtDateWithOtherTypes() {
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') > TIMESTAMP('1961-04-12 09:07:00')", "d_ts_t", true),
+            $("TIMESTAMP('2077-04-12 09:07:00') > DATE('2020-09-16')", "ts_d_t", true),
+            $("DATE('2020-09-16') > TIMESTAMP('2020-09-16 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('1961-04-12 09:07:00') > DATE('1984-12-15')", "ts_d_f", false),
+            $("DATE('1984-12-15') > DATETIME('1961-04-12 09:07:00')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') > DATE('1984-03-22')", "dt_d_t", true),
+            $("DATE('2020-09-16') > DATETIME('2020-09-16 00:00:00')", "d_dt_f", false),
+            $("DATETIME('1961-04-12 10:20:30') > DATE('1984-11-15')", "dt_d_f", false),
+            $("DATE('3077-04-12') > TIME('00:00:00')", "d_t_t", true),
+            $("TIME('00:00:00') > DATE('2020-09-16')", "t_d_t", true),
+            $("DATE('2020-09-16') > TIME('09:07:00')", "d_t_f", false),
+            $("TIME('09:07:00') > DATE('3077-04-12')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGtTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('09:07:00') > DATETIME('1961-04-12 09:07:00')", "t_dt_t", true),
+            $("DATETIME('" + today + " 20:40:50') > TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('10:20:30') > DATETIME('" + today + " 10:20:30')", "t_dt_f", false),
+            $("DATETIME('" + today + " 09:07:00') > TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('22:15:07') > TIMESTAMP('1984-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 20:50:42') > TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('10:20:30') > TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false),
+            $("TIMESTAMP('1984-12-15 10:20:30') > TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('00:00:00') > DATE('1961-04-12')", "t_d_t", true),
+            $("DATE('3077-04-12') > TIME('10:20:30')", "d_t_t", true),
+            $("TIME('09:07:00') > DATE('3077-04-12')", "t_d_f", false),
+            $("DATE('2020-09-16') > TIME('09:07:00')", "d_t_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLteTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') <= DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('1961-04-12 09:07:00') <= TIMESTAMP('1984-12-15 22:15:07')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') <= DATETIME('1961-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('2020-09-16 10:20:30') <= TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 10:20:30') <= DATE('2077-04-12')", "ts_d_t", true),
+            $("DATE('2020-09-16') <= TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') <= DATE('1961-04-12')", "ts_d_f", false),
+            $("DATE('2077-04-12') <= TIMESTAMP('1984-12-15 22:15:07')", "d_ts_f", false),
+            $("TIMESTAMP('" + today + " 10:20:30') <= TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('09:07:00') <= TIMESTAMP('3077-12-15 22:15:07')", "t_ts_t", true),
+            $("TIMESTAMP('3077-09-16 10:20:30') <= TIME('09:07:00')", "ts_t_f", false),
+            $("TIME('20:50:40') <= TIMESTAMP('" + today + " 10:20:30')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLteDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:30') <= TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('1961-04-12 09:07:00') <= DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('3077-09-16 10:20:30') <= TIMESTAMP('2077-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') <= DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('2020-09-16 00:00:00') <= DATE('2020-09-16')", "dt_d_t", true),
+            $("DATE('1961-04-12') <= DATETIME('1984-12-15 22:15:07')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 10:20:30') <= DATE('1984-04-12')", "dt_d_f", false),
+            $("DATE('2020-09-16') <= DATETIME('1961-04-12 09:07:00')", "d_dt_f", false),
+            $("DATETIME('" + today + " 10:20:30') <= TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('09:07:00') <= DATETIME('3077-12-15 22:15:07')", "t_dt_t", true),
+            $("DATETIME('3077-09-16 10:20:30') <= TIME('19:07:00')", "dt_t_f", false),
+            $("TIME('20:40:50') <= DATETIME('" + today + " 10:20:30')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLteDateWithOtherTypes() {
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') <= TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('1961-04-12 09:07:00') <= DATE('1984-12-15')", "ts_d_t", true),
+            $("DATE('2020-09-16') <= TIMESTAMP('1961-04-12 09:07:00')", "d_ts_f", false),
+            $("TIMESTAMP('2077-04-12 09:07:00') <= DATE('2020-09-16')", "ts_d_f", false),
+            $("DATE('2020-09-16') <= DATETIME('2020-09-16 00:00:00')", "d_dt_t", true),
+            $("DATETIME('1961-04-12 10:20:30') <= DATE('1984-11-15')", "dt_d_t", true),
+            $("DATE('2077-04-12') <= DATETIME('1984-12-15 22:15:07')", "d_dt_f", false),
+            $("DATETIME('2020-09-16 00:00:00') <= DATE('1984-03-22')", "dt_d_f", false),
+            $("DATE('2020-09-16') <= TIME('09:07:00')", "d_t_t", true),
+            $("TIME('09:07:00') <= DATE('3077-04-12')", "t_d_t", true),
+            $("DATE('3077-04-12') <= TIME('00:00:00')", "d_t_f", false),
+            $("TIME('00:00:00') <= DATE('2020-09-16')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareLteTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('10:20:30') <= DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('" + today + " 09:07:00') <= TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('09:07:00') <= DATETIME('1961-04-12 09:07:00')", "t_dt_f", false),
+            $("DATETIME('" + today + " 20:40:50') <= TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('10:20:30') <= TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('1984-12-15 10:20:30') <= TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('22:15:07') <= TIMESTAMP('1984-12-15 22:15:07')", "t_ts_f", false),
+            $("TIMESTAMP('" + today + " 20:50:42') <= TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('09:07:00') <= DATE('3077-04-12')", "t_d_t", true),
+            $("DATE('2020-09-16') <= TIME('09:07:00')", "d_t_t", true),
+            $("TIME('00:00:00') <= DATE('1961-04-12')", "t_d_f", false),
+            $("DATE('3077-04-12') <= TIME('10:20:30')", "d_t_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGteTimestampWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') >= DATETIME('2020-09-16 10:20:30')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') >= TIMESTAMP('1961-04-12 09:07:00')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') >= DATETIME('2061-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $(
+                "DATETIME('1961-04-12 09:07:00') >= TIMESTAMP('1984-12-15 09:07:00')",
+                "dt_ts_f",
+                false),
+            $("TIMESTAMP('2020-09-16 10:20:30') >= DATE('1961-04-12')", "ts_d_t", true),
+            $("DATE('2020-09-16') >= TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('2020-09-16 10:20:30') >= DATE('2077-04-12')", "ts_d_f", false),
+            $("DATE('1961-04-11') >= TIMESTAMP('1961-04-12 00:00:00')", "d_ts_f", false),
+            $("TIMESTAMP('" + today + " 10:20:30') >= TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('20:50:40') >= TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('1977-07-08 10:20:30') >= TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('09:07:00') >= TIMESTAMP('3077-12-15 22:15:07')", "t_ts_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGteDateTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $(
+                "DATETIME('2020-09-16 10:20:30') >= TIMESTAMP('2020-09-16 10:20:30')",
+                "dt_ts_t",
+                true),
+            $(
+                "TIMESTAMP('2020-09-16 10:20:30') >= DATETIME('1984-12-15 22:15:07')",
+                "ts_dt_t",
+                true),
+            $(
+                "DATETIME('2020-09-16 10:20:30') >= TIMESTAMP('2077-04-12 09:07:00')",
+                "dt_ts_f",
+                false),
+            $(
+                "TIMESTAMP('1961-04-12 00:00:00') >= DATETIME('1961-04-12 09:07:00')",
+                "ts_dt_f",
+                false),
+            $("DATETIME('2020-09-16 00:00:00') >= DATE('2020-09-16')", "dt_d_t", true),
+            $("DATE('2020-09-16') >= DATETIME('1961-04-12 09:07:00')", "d_dt_t", true),
+            $("DATETIME('1961-04-12 09:07:00') >= DATE('2020-09-16')", "dt_d_f", false),
+            $("DATE('1961-04-12') >= DATETIME('1984-12-15 22:15:07')", "d_dt_f", false),
+            $("DATETIME('" + today + " 10:20:30') >= TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('20:40:50') >= DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('1961-04-12 09:07:00') >= TIME('09:07:00')", "dt_t_f", false),
+            $("TIME('09:07:00') >= DATETIME('3077-12-15 22:15:07')", "t_dt_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGteDateWithOtherTypes() {
+    return Arrays.asList(
+        $$(
+            $("DATE('2020-09-16') >= TIMESTAMP('2020-09-16 00:00:00')", "d_ts_t", true),
+            $("TIMESTAMP('2077-04-12 09:07:00') >= DATE('2020-09-16')", "ts_d_t", true),
+            $("DATE('1961-04-12') >= TIMESTAMP('1961-04-12 09:07:00')", "d_ts_f", false),
+            $("TIMESTAMP('1961-04-12 09:07:00') >= DATE('1984-12-15')", "ts_d_f", false),
+            $("DATE('2020-09-16') >= DATETIME('2020-09-16 00:00:00')", "d_dt_t", true),
+            $("DATETIME('2020-09-16 00:00:00') >= DATE('1984-03-22')", "dt_d_t", true),
+            $("DATE('1960-12-15') >= DATETIME('1961-04-12 09:07:00')", "d_dt_f", false),
+            $("DATETIME('1961-04-12 10:20:30') >= DATE('1984-11-15')", "dt_d_f", false),
+            $("DATE('3077-04-12') >= TIME('00:00:00')", "d_t_t", true),
+            $("TIME('00:00:00') >= DATE('2020-09-16')", "t_d_t", true),
+            $("DATE('2020-09-16') >= TIME('09:07:00')", "d_t_f", false),
+            $("TIME('09:07:00') >= DATE('3077-04-12')", "t_d_f", false)));
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s => %3$s")
+  public static Iterable<Object[]> compareGteTimeWithOtherTypes() {
+    var today = LocalDate.now().toString();
+    return Arrays.asList(
+        $$(
+            $("TIME('10:20:30') >= DATETIME('" + today + " 10:20:30')", "t_dt_t", true),
+            $("DATETIME('" + today + " 20:40:50') >= TIME('10:20:30')", "dt_t_t", true),
+            $("TIME('09:07:00') >= DATETIME('3077-04-12 09:07:00')", "t_dt_f", false),
+            $("DATETIME('" + today + " 09:07:00') >= TIME('10:20:30')", "dt_t_f", false),
+            $("TIME('10:20:30') >= TIMESTAMP('" + today + " 10:20:30')", "t_ts_t", true),
+            $("TIMESTAMP('" + today + " 20:50:42') >= TIME('10:20:30')", "ts_t_t", true),
+            $("TIME('22:15:07') >= TIMESTAMP('3077-12-15 22:15:07')", "t_ts_f", false),
+            $("TIMESTAMP('1984-12-15 10:20:30') >= TIME('10:20:30')", "ts_t_f", false),
+            $("TIME('00:00:00') >= DATE('1961-04-12')", "t_d_t", true),
+            $("DATE('3077-04-12') >= TIME('10:20:30')", "d_t_t", true),
+            $("TIME('09:07:00') >= DATE('3077-04-12')", "t_d_f", false),
+            $("DATE('2020-09-16') >= TIME('09:07:00')", "d_t_f", false)));
+  }
+
+  @Test
+  public void testCompare() throws IOException {
+    var result = executeQuery(String.format("select %s AS `%s`", functionCall, name));
+    verifySchema(result, schema(functionCall, name, "boolean"));
+    verifyDataRows(result, rows(expectedResult));
+  }
+
+  protected JSONObject executeQuery(String query) throws IOException {
+    Request request = new Request("POST", QUERY_API_ENDPOINT);
+    request.setJsonEntity(String.format(Locale.ROOT, "{\n" + "  \"query\": \"%s\"\n" + "}", query));
+
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+
+    Response response = client().performRequest(request);
+    return new JSONObject(getResponseBody(response));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFormatsIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFormatsIT.java
new file mode 100644
index 0000000000..13c2eecd56
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFormatsIT.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATATYPE_NONNUMERIC;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATE_FORMATS;
+import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.schema;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
+import static org.opensearch.sql.util.MatcherUtils.verifySchema;
+import static org.opensearch.sql.util.TestUtils.getResponseBody;
+
+import java.io.IOException;
+import java.util.Locale;
+import lombok.SneakyThrows;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.client.Response;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+
+public class DateTimeFormatsIT extends SQLIntegTestCase {
+
+  @Override
+  public void init() throws Exception {
+    super.init();
+    loadIndex(Index.DATE_FORMATS);
+    loadIndex(Index.DATA_TYPE_NONNUMERIC);
+  }
+
+  @Test
+  public void testReadingDateFormats() throws IOException {
+    String query =
+        String.format(
+            "SELECT weekyear_week_day, hour_minute_second_millis,"
+                + " strict_ordinal_date_time FROM %s LIMIT 1",
+            TEST_INDEX_DATE_FORMATS);
+    JSONObject result = executeQuery(query);
+    verifySchema(
+        result,
+        schema("weekyear_week_day", null, "date"),
+        schema("hour_minute_second_millis", null, "time"),
+        schema("strict_ordinal_date_time", null, "timestamp"));
+    verifyDataRows(result, rows("1984-04-12", "09:07:42", "1984-04-12 09:07:42.000123456"));
+  }
+
+  @Test
+  public void testDateFormatsWithOr() throws IOException {
+    String query =
+        String.format("SELECT yyyy-MM-dd_OR_epoch_millis FROM %s", TEST_INDEX_DATE_FORMATS);
+    JSONObject result = executeQuery(query);
+    verifyDataRows(result, rows("1984-04-12 00:00:00"), rows("1984-04-12 09:07:42.000123456"));
+  }
+
+  @Test
+  @SneakyThrows
+  public void testCustomFormats() {
+    String query =
+        String.format(
+            "SELECT custom_time, custom_timestamp, custom_date_or_date,"
+                + "custom_date_or_custom_time, custom_time_parser_check FROM %s",
+            TEST_INDEX_DATE_FORMATS);
+    JSONObject result = executeQuery(query);
+    verifySchema(
+        result,
+        schema("custom_time", null, "time"),
+        schema("custom_timestamp", null, "timestamp"),
+        schema("custom_date_or_date", null, "date"),
+        schema("custom_date_or_custom_time", null, "timestamp"),
+        schema("custom_time_parser_check", null, "time"));
+    verifyDataRows(
+        result,
+        rows(
+            "09:07:42", "1984-04-12 09:07:42", "1984-04-12", "1961-04-12 00:00:00", "23:44:36.321"),
+        rows(
+            "21:07:42",
+            "1984-04-12 22:07:42",
+            "1984-04-12",
+            "1970-01-01 09:07:00",
+            "09:01:16.542"));
+  }
+
+  @Test
+  @SneakyThrows
+  public void testCustomFormats2() {
+    String query =
+        String.format(
+            "SELECT custom_no_delimiter_date, custom_no_delimiter_time,"
+                + "custom_no_delimiter_ts FROM %s",
+            TEST_INDEX_DATE_FORMATS);
+    JSONObject result = executeQuery(query);
+    verifySchema(
+        result,
+        schema("custom_no_delimiter_date", null, "date"),
+        schema("custom_no_delimiter_time", null, "time"),
+        schema("custom_no_delimiter_ts", null, "timestamp"));
+    verifyDataRows(
+        result,
+        rows("1984-10-20", "10:20:30", "1984-10-20 15:35:48"),
+        rows("1961-04-12", "09:07:00", "1961-04-12 09:07:00"));
+  }
+
+  @Test
+  @SneakyThrows
+  public void testIncompleteFormats() {
+    String query =
+        String.format(
+            "SELECT incomplete_1, incomplete_2, incorrect,"
+                + "incomplete_custom_time, incomplete_custom_date FROM %s",
+            TEST_INDEX_DATE_FORMATS);
+    JSONObject result = executeQuery(query);
+    verifySchema(
+        result,
+        schema("incomplete_1", null, "timestamp"),
+        schema("incomplete_2", null, "date"),
+        schema("incorrect", null, "timestamp"),
+        schema("incomplete_custom_time", null, "time"),
+        schema("incomplete_custom_date", null, "date"));
+    verifyDataRows(
+        result,
+        rows("1984-01-01 00:00:00", null, null, "10:00:00", "1999-01-01"),
+        rows("2012-01-01 00:00:00", null, null, "20:00:00", "3021-01-01"));
+  }
+
+  @Test
+  @SneakyThrows
+  public void testNumericFormats() {
+    String query =
+        String.format("SELECT epoch_sec, epoch_milli" + " FROM %s", TEST_INDEX_DATE_FORMATS);
+    JSONObject result = executeQuery(query);
+    verifySchema(
+        result, schema("epoch_sec", null, "timestamp"), schema("epoch_milli", null, "timestamp"));
+    verifyDataRows(
+        result,
+        rows("1970-01-01 00:00:42", "1970-01-01 00:00:00.042"),
+        rows("1970-01-02 03:55:00", "1970-01-01 00:01:40.5"));
+  }
+
+  @Test
+  @SneakyThrows
+  public void testDateNanosWithFormats() {
+    String query =
+        String.format("SELECT hour_minute_second_OR_t_time" + " FROM %s", TEST_INDEX_DATE_FORMATS);
+    JSONObject result = executeQuery(query);
+    verifySchema(result, schema("hour_minute_second_OR_t_time", null, "time"));
+    verifyDataRows(result, rows("09:07:42"), rows("07:07:42.123456789"));
+  }
+
+  @Test
+  @SneakyThrows
+  public void testDateNanosWithFunctions() {
+    // in memory funcs
+    String query =
+        String.format(
+            "SELECT"
+                + " hour_minute_second_OR_t_time > TIME '08:07:00',"
+                + " hour_minute_second_OR_t_time < TIME '08:07:00',"
+                + " hour_minute_second_OR_t_time = t_time_no_millis,"
+                + " hour_minute_second_OR_t_time <> strict_t_time,"
+                + " hour_minute_second_OR_t_time >= t_time"
+                + " FROM %s",
+            TEST_INDEX_DATE_FORMATS);
+    JSONObject result = executeQuery(query);
+    verifySchema(
+        result,
+        schema("hour_minute_second_OR_t_time > TIME '08:07:00'", null, "boolean"),
+        schema("hour_minute_second_OR_t_time < TIME '08:07:00'", null, "boolean"),
+        schema("hour_minute_second_OR_t_time = t_time_no_millis", null, "boolean"),
+        schema("hour_minute_second_OR_t_time <> strict_t_time", null, "boolean"),
+        schema("hour_minute_second_OR_t_time >= t_time", null, "boolean"));
+    verifyDataRows(
+        result, rows(true, false, true, false, true), rows(false, true, false, true, false));
+    // push down
+    query =
+        String.format(
+            "SELECT hour_minute_second_OR_t_time"
+                + " FROM %s WHERE hour_minute_second_OR_t_time > TIME '08:07:00'",
+            TEST_INDEX_DATE_FORMATS);
+    result = executeQuery(query);
+    verifySchema(result, schema("hour_minute_second_OR_t_time", null, "time"));
+    verifyDataRows(result, rows("09:07:42"));
+    query =
+        String.format(
+            "SELECT hour_minute_second_OR_t_time"
+                + " FROM %s WHERE hour_minute_second_OR_t_time < TIME '08:07:00'",
+            TEST_INDEX_DATE_FORMATS);
+    result = executeQuery(query);
+    verifySchema(result, schema("hour_minute_second_OR_t_time", null, "time"));
+    verifyDataRows(result, rows("07:07:42.123456789"));
+  }
+
+  @Test
+  @SneakyThrows
+  public void testDateNanosOrderBy() {
+    String query =
+        String.format(
+            "SELECT hour_minute_second_OR_t_time"
+                + " FROM %s ORDER BY hour_minute_second_OR_t_time ASC",
+            TEST_INDEX_DATE_FORMATS);
+    JSONObject result = executeQuery(query);
+    verifySchema(result, schema("hour_minute_second_OR_t_time", null, "time"));
+    verifyDataRows(result, rows("07:07:42.123456789"), rows("09:07:42"));
+  }
+
+  @Test
+  @SneakyThrows
+  public void testDateNanosGroupBy() {
+    String query =
+        String.format(
+            "SELECT count(*)" + " FROM %s GROUP BY hour_minute_second_OR_t_time",
+            TEST_INDEX_DATE_FORMATS);
+    JSONObject result = executeQuery(query);
+    verifySchema(result, schema("count(*)", null, "integer"));
+    verifyDataRows(result, rows(1), rows(1));
+  }
+
+  @Test
+  @SneakyThrows
+  public void testDateNanosWithNanos() {
+    String query =
+        String.format("SELECT date_nanos_value" + " FROM %s", TEST_INDEX_DATATYPE_NONNUMERIC);
+    JSONObject result = executeQuery(query);
+    verifySchema(result, schema("date_nanos_value", null, "timestamp"));
+    verifyDataRows(result, rows("2019-03-24 01:34:46.123456789"));
+  }
+
+  protected JSONObject executeQuery(String query) throws IOException {
+    Request request = new Request("POST", QUERY_API_ENDPOINT);
+    request.setJsonEntity(String.format(Locale.ROOT, "{\n" + "  \"query\": \"%s\"\n" + "}", query));
+
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+
+    Response response = client().performRequest(request);
+    return new JSONObject(getResponseBody(response));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java
index 3503877d64..33eb8b693f 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java
@@ -3,12 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_CALCS;
-import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_PEOPLE2;
 import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.schema;
@@ -17,29 +15,20 @@
 import static org.opensearch.sql.util.MatcherUtils.verifySome;
 import static org.opensearch.sql.util.TestUtils.getResponseBody;
 
-import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
-import java.time.Duration;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.Period;
 import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.temporal.ChronoField;
-import java.time.temporal.Temporal;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
-import java.util.function.BiFunction;
-import java.util.function.Supplier;
-import org.json.JSONArray;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.jupiter.api.Test;
 import org.opensearch.client.Request;
 import org.opensearch.client.RequestOptions;
 import org.opensearch.client.Response;
+import org.opensearch.client.ResponseException;
 import org.opensearch.sql.common.utils.StringUtils;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 
@@ -51,16 +40,33 @@ public void init() throws Exception {
     loadIndex(Index.BANK);
     loadIndex(Index.CALCS);
     loadIndex(Index.PEOPLE2);
-    loadIndex(Index.CALCS);
+  }
+
+  // Integration test framework sets for OpenSearch instance a random timezone.
+  // If server's TZ doesn't match localhost's TZ, time measurements for some tests would differ.
+  // We should set localhost's TZ now and recover the value back in the end of the test.
+  private final TimeZone testTz = TimeZone.getDefault();
+  private final TimeZone systemTz = TimeZone.getTimeZone(System.getProperty("user.timezone"));
+
+  @Before
+  public void setTimeZone() {
+    TimeZone.setDefault(systemTz);
+  }
+
+  @After
+  public void resetTimeZone() {
+    TimeZone.setDefault(testTz);
   }
 
   @Test
-  public void testDateInGroupBy() throws IOException{
+  public void testDateInGroupBy() throws IOException {
     JSONObject result =
-        executeQuery(String.format("SELECT DATE(birthdate) FROM %s GROUP BY DATE(birthdate)",TEST_INDEX_BANK) );
-    verifySchema(result,
-        schema("DATE(birthdate)", null, "date"));
-    verifyDataRows(result,
+        executeQuery(
+            String.format(
+                "SELECT DATE(birthdate) FROM %s GROUP BY DATE(birthdate)", TEST_INDEX_BANK));
+    verifySchema(result, schema("DATE(birthdate)", null, "date"));
+    verifyDataRows(
+        result,
         rows("2017-10-23"),
         rows("2017-11-20"),
         rows("2018-06-23"),
@@ -73,70 +79,129 @@ public void testDateInGroupBy() throws IOException{
   @Test
   public void testDateWithHavingClauseOnly() throws IOException {
     JSONObject result =
-        executeQuery(String.format("SELECT (TO_DAYS(DATE('2050-01-01')) - 693961) FROM %s HAVING (COUNT(1) > 0)",TEST_INDEX_BANK) );
-    verifySchema(result,
-        schema("(TO_DAYS(DATE('2050-01-01')) - 693961)", null, "long"));
+        executeQuery(
+            String.format(
+                "SELECT (TO_DAYS(DATE('2050-01-01')) - 693961) FROM %s HAVING (COUNT(1) > 0)",
+                TEST_INDEX_BANK));
+    verifySchema(result, schema("(TO_DAYS(DATE('2050-01-01')) - 693961)", null, "long"));
     verifyDataRows(result, rows(54787));
   }
 
   @Test
-  public void testAddDate() throws IOException {
+  public void testAddDateWithDays() throws IOException {
+    var result = executeQuery("select adddate(date('2020-09-16'), 1)");
+    verifySchema(result, schema("adddate(date('2020-09-16'), 1)", null, "date"));
+    verifyDataRows(result, rows("2020-09-17"));
+
+    result = executeQuery("select adddate(timestamp('2020-09-16 17:30:00'), 1)");
+    verifySchema(result, schema("adddate(timestamp('2020-09-16 17:30:00'), 1)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-17 17:30:00"));
+
+    result = executeQuery("select adddate(DATETIME('2020-09-16 07:40:00'), 1)");
+    verifySchema(result, schema("adddate(DATETIME('2020-09-16 07:40:00'), 1)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-17 07:40:00"));
+
+    result = executeQuery("select adddate(TIME('07:40:00'), 0)");
+    verifySchema(result, schema("adddate(TIME('07:40:00'), 0)", null, "datetime"));
+    verifyDataRows(result, rows(LocalDate.now() + " 07:40:00"));
+  }
+
+  @Test
+  public void testAddDateWithInterval() throws IOException {
     JSONObject result =
         executeQuery("select adddate(timestamp('2020-09-16 17:30:00'), interval 1 day)");
-    verifySchema(result,
+    verifySchema(
+        result,
         schema("adddate(timestamp('2020-09-16 17:30:00'), interval 1 day)", null, "datetime"));
     verifyDataRows(result, rows("2020-09-17 17:30:00"));
 
-    result = executeQuery("select adddate(date('2020-09-16'), 1)");
-    verifySchema(result, schema("adddate(date('2020-09-16'), 1)", null, "date"));
-    verifyDataRows(result, rows("2020-09-17"));
-
-    result = executeQuery("select adddate('2020-09-16', 1)");
-    verifySchema(result, schema("adddate('2020-09-16', 1)", null, "datetime"));
-    verifyDataRows(result, rows("2020-09-17"));
-
-    result = executeQuery("select adddate('2020-09-16 17:30:00', interval 1 day)");
-    verifySchema(result,
-        schema("adddate('2020-09-16 17:30:00', interval 1 day)", null, "datetime"));
+    result = executeQuery("select adddate(DATETIME('2020-09-16 17:30:00'), interval 1 day)");
+    verifySchema(
+        result,
+        schema("adddate(DATETIME('2020-09-16 17:30:00'), interval 1 day)", null, "datetime"));
     verifyDataRows(result, rows("2020-09-17 17:30:00"));
 
-    result = executeQuery("select adddate('2020-09-16', interval 1 day)");
-    verifySchema(result,
-        schema("adddate('2020-09-16', interval 1 day)", null, "datetime"));
-    verifyDataRows(result, rows("2020-09-17"));
+    result = executeQuery("select adddate(date('2020-09-16'), interval 1 day)");
+    verifySchema(result, schema("adddate(date('2020-09-16'), interval 1 day)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-17 00:00:00"));
+
+    result = executeQuery("select adddate(date('2020-09-16'), interval 1 hour)");
+    verifySchema(result, schema("adddate(date('2020-09-16'), interval 1 hour)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-16 01:00:00"));
+
+    result = executeQuery("select adddate(TIME('07:40:00'), interval 1 day)");
+    verifySchema(result, schema("adddate(TIME('07:40:00'), interval 1 day)", null, "datetime"));
+    verifyDataRows(
+        result,
+        rows(
+            LocalDate.now()
+                .plusDays(1)
+                .atTime(LocalTime.of(7, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+
+    result = executeQuery("select adddate(TIME('07:40:00'), interval 1 hour)");
+    verifySchema(result, schema("adddate(TIME('07:40:00'), interval 1 hour)", null, "datetime"));
+    verifyDataRows(
+        result,
+        rows(
+            LocalDate.now()
+                .atTime(LocalTime.of(8, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
   }
 
   @Test
   public void testDateAdd() throws IOException {
     JSONObject result =
         executeQuery("select date_add(timestamp('2020-09-16 17:30:00'), interval 1 day)");
-    verifySchema(result,
+    verifySchema(
+        result,
         schema("date_add(timestamp('2020-09-16 17:30:00'), interval 1 day)", null, "datetime"));
     verifyDataRows(result, rows("2020-09-17 17:30:00"));
 
-    result = executeQuery("select date_add(date('2020-09-16'), 1)");
-    verifySchema(result, schema("date_add(date('2020-09-16'), 1)", null, "date"));
-    verifyDataRows(result, rows("2020-09-17"));
-
-    result = executeQuery("select date_add('2020-09-16', 1)");
-    verifySchema(result, schema("date_add('2020-09-16', 1)", null, "datetime"));
-    verifyDataRows(result, rows("2020-09-17"));
-
-    result = executeQuery("select date_add('2020-09-16 17:30:00', interval 1 day)");
-    verifySchema(result,
-        schema("date_add('2020-09-16 17:30:00', interval 1 day)", null, "datetime"));
+    result = executeQuery("select date_add(DATETIME('2020-09-16 17:30:00'), interval 1 day)");
+    verifySchema(
+        result,
+        schema("date_add(DATETIME('2020-09-16 17:30:00'), interval 1 day)", null, "datetime"));
     verifyDataRows(result, rows("2020-09-17 17:30:00"));
 
-    result = executeQuery("select date_add('2020-09-16', interval 1 day)");
-    verifySchema(result,
-        schema("date_add('2020-09-16', interval 1 day)", null, "datetime"));
-    verifyDataRows(result, rows("2020-09-17"));
+    result = executeQuery("select date_add(date('2020-09-16'), interval 1 day)");
+    verifySchema(result, schema("date_add(date('2020-09-16'), interval 1 day)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-17 00:00:00"));
+
+    result = executeQuery("select date_add(date('2020-09-16'), interval 1 hour)");
+    verifySchema(result, schema("date_add(date('2020-09-16'), interval 1 hour)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-16 01:00:00"));
+
+    result = executeQuery("select date_add(TIME('07:40:00'), interval 1 day)");
+    verifySchema(result, schema("date_add(TIME('07:40:00'), interval 1 day)", null, "datetime"));
+    verifyDataRows(
+        result,
+        rows(
+            LocalDate.now()
+                .plusDays(1)
+                .atTime(LocalTime.of(7, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+
+    result = executeQuery("select date_add(TIME('07:40:00'), interval 1 hour)");
+    verifySchema(result, schema("date_add(TIME('07:40:00'), interval 1 hour)", null, "datetime"));
+    verifyDataRows(
+        result,
+        rows(
+            LocalDate.now()
+                .atTime(LocalTime.of(8, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
 
     result =
-        executeQuery(String.format("SELECT DATE_ADD(birthdate, INTERVAL 1 YEAR) FROM %s GROUP BY 1",TEST_INDEX_BANK) );
-    verifySchema(result,
-        schema("DATE_ADD(birthdate, INTERVAL 1 YEAR)", null, "datetime"));
-    verifyDataRows(result,
+        executeQuery(
+            String.format("SELECT DATE_ADD(birthdate, INTERVAL 1 YEAR) FROM %s", TEST_INDEX_BANK));
+
+    verifySchema(result, schema("DATE_ADD(birthdate, INTERVAL 1 YEAR)", null, "datetime"));
+    verifyDataRows(
+        result,
         rows("2018-10-23 00:00:00"),
         rows("2018-11-20 00:00:00"),
         rows("2019-06-23 00:00:00"),
@@ -150,27 +215,45 @@ public void testDateAdd() throws IOException {
   public void testDateSub() throws IOException {
     JSONObject result =
         executeQuery("select date_sub(timestamp('2020-09-16 17:30:00'), interval 1 day)");
-    verifySchema(result,
+    verifySchema(
+        result,
         schema("date_sub(timestamp('2020-09-16 17:30:00'), interval 1 day)", null, "datetime"));
     verifyDataRows(result, rows("2020-09-15 17:30:00"));
 
-    result = executeQuery("select date_sub(date('2020-09-16'), 1)");
-    verifySchema(result, schema("date_sub(date('2020-09-16'), 1)", null, "date"));
-    verifyDataRows(result, rows("2020-09-15"));
-
-    result = executeQuery("select date_sub('2020-09-16', 1)");
-    verifySchema(result, schema("date_sub('2020-09-16', 1)", null, "datetime"));
-    verifyDataRows(result, rows("2020-09-15"));
-
-    result = executeQuery("select date_sub('2020-09-16 17:30:00', interval 1 day)");
-    verifySchema(result,
-        schema("date_sub('2020-09-16 17:30:00', interval 1 day)", null, "datetime"));
+    result = executeQuery("select date_sub(DATETIME('2020-09-16 17:30:00'), interval 1 day)");
+    verifySchema(
+        result,
+        schema("date_sub(DATETIME('2020-09-16 17:30:00'), interval 1 day)", null, "datetime"));
     verifyDataRows(result, rows("2020-09-15 17:30:00"));
 
-    result = executeQuery("select date_sub('2020-09-16', interval 1 day)");
-    verifySchema(result,
-        schema("date_sub('2020-09-16', interval 1 day)", null, "datetime"));
-    verifyDataRows(result, rows("2020-09-15"));
+    result = executeQuery("select date_sub(date('2020-09-16'), interval 1 day)");
+    verifySchema(result, schema("date_sub(date('2020-09-16'), interval 1 day)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-15 00:00:00"));
+
+    result = executeQuery("select date_sub(date('2020-09-16'), interval 1 hour)");
+    verifySchema(result, schema("date_sub(date('2020-09-16'), interval 1 hour)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-15 23:00:00"));
+
+    result = executeQuery("select date_sub(TIME('07:40:00'), interval 1 day)");
+    verifySchema(result, schema("date_sub(TIME('07:40:00'), interval 1 day)", null, "datetime"));
+    verifyDataRows(
+        result,
+        rows(
+            LocalDate.now()
+                .plusDays(-1)
+                .atTime(LocalTime.of(7, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+
+    result = executeQuery("select date_sub(TIME('07:40:00'), interval 1 hour)");
+    verifySchema(result, schema("date_sub(TIME('07:40:00'), interval 1 hour)", null, "datetime"));
+    verifyDataRows(
+        result,
+        rows(
+            LocalDate.now()
+                .atTime(LocalTime.of(6, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
   }
 
   @Test
@@ -206,6 +289,52 @@ public void testDayOfMonth() throws IOException {
     verifyDataRows(result, rows(16));
   }
 
+  @Test
+  public void testDayOfMonthWithUnderscores() throws IOException {
+    JSONObject result = executeQuery("select day_of_month(date('2020-09-16'))");
+    verifySchema(result, schema("day_of_month(date('2020-09-16'))", null, "integer"));
+    verifyDataRows(result, rows(16));
+
+    result = executeQuery("select day_of_month('2020-09-16')");
+    verifySchema(result, schema("day_of_month('2020-09-16')", null, "integer"));
+    verifyDataRows(result, rows(16));
+  }
+
+  @Test
+  public void testDayOfMonthAliasesReturnTheSameResults() throws IOException {
+    JSONObject result1 = executeQuery("SELECT dayofmonth(date('2022-11-22'))");
+    JSONObject result2 = executeQuery("SELECT day_of_month(date('2022-11-22'))");
+    verifyDataRows(result1, rows(22));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 = executeQuery(String.format("SELECT dayofmonth(date0) FROM %s", TEST_INDEX_CALCS));
+    result2 = executeQuery(String.format("SELECT day_of_month(date0) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 =
+        executeQuery(
+            String.format(
+                "SELECT dayofmonth(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format(
+                "SELECT day_of_month(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 =
+        executeQuery(
+            String.format("SELECT dayofmonth(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format("SELECT day_of_month(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 = executeQuery(String.format("SELECT dayofmonth(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(String.format("SELECT day_of_month(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+  }
+
   @Test
   public void testDayOfWeek() throws IOException {
     JSONObject result = executeQuery("select dayofweek(date('2020-09-16'))");
@@ -217,6 +346,52 @@ public void testDayOfWeek() throws IOException {
     verifyDataRows(result, rows(4));
   }
 
+  @Test
+  public void testDayOfWeekWithUnderscores() throws IOException {
+    JSONObject result = executeQuery("select day_of_week(date('2020-09-16'))");
+    verifySchema(result, schema("day_of_week(date('2020-09-16'))", null, "integer"));
+    verifyDataRows(result, rows(4));
+
+    result = executeQuery("select day_of_week('2020-09-16')");
+    verifySchema(result, schema("day_of_week('2020-09-16')", null, "integer"));
+    verifyDataRows(result, rows(4));
+  }
+
+  @Test
+  public void testDayOfWeekAliasesReturnTheSameResults() throws IOException {
+    JSONObject result1 = executeQuery("SELECT dayofweek(date('2022-11-22'))");
+    JSONObject result2 = executeQuery("SELECT day_of_week(date('2022-11-22'))");
+    verifyDataRows(result1, rows(3));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 = executeQuery(String.format("SELECT dayofweek(date0) FROM %s", TEST_INDEX_CALCS));
+    result2 = executeQuery(String.format("SELECT day_of_week(date0) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 =
+        executeQuery(
+            String.format(
+                "SELECT dayofweek(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format(
+                "SELECT day_of_week(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 =
+        executeQuery(
+            String.format("SELECT dayofweek(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format("SELECT day_of_week(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 = executeQuery(String.format("SELECT dayofweek(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(String.format("SELECT day_of_week(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+  }
+
   @Test
   public void testDayOfYear() throws IOException {
     JSONObject result = executeQuery("select dayofyear(date('2020-09-16'))");
@@ -254,30 +429,34 @@ public void testDayOfYearAlternateSyntaxesReturnTheSameResults() throws IOExcept
     verifyDataRows(result1, rows(326));
     result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
 
-    result1 = executeQuery(String.format(
-        "SELECT dayofyear(CAST(date0 AS date)) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT day_of_year(CAST(date0 AS date)) FROM %s", TEST_INDEX_CALCS));
+    result1 = executeQuery(String.format("SELECT dayofyear(date0) FROM %s", TEST_INDEX_CALCS));
+    result2 = executeQuery(String.format("SELECT day_of_year(date0) FROM %s", TEST_INDEX_CALCS));
     result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
 
-    result1 = executeQuery(String.format(
-        "SELECT dayofyear(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT day_of_year(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result1 =
+        executeQuery(
+            String.format(
+                "SELECT dayofyear(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format(
+                "SELECT day_of_year(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
     result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
 
-    result1 = executeQuery(String.format(
-        "SELECT dayofyear(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT day_of_year(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result1 =
+        executeQuery(
+            String.format("SELECT dayofyear(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format("SELECT day_of_year(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
     result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
 
-    result1 = executeQuery(String.format(
-        "SELECT dayofyear(CAST(datetime0 AS timestamp)) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT day_of_year(CAST(datetime0 AS timestamp)) FROM %s", TEST_INDEX_CALCS));
+    result1 = executeQuery(String.format("SELECT dayofyear(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(String.format("SELECT day_of_year(datetime0) FROM %s", TEST_INDEX_CALCS));
     result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
   }
+
   @Test
   public void testFromDays() throws IOException {
     JSONObject result = executeQuery("select from_days(738049)");
@@ -304,17 +483,130 @@ public void testHour() throws IOException {
     verifyDataRows(result, rows(17));
   }
 
+  @Test
+  public void testHourOfDayWithUnderscores() throws IOException {
+    JSONObject result = executeQuery("select hour_of_day(timestamp('2020-09-16 17:30:00'))");
+    verifySchema(result, schema("hour_of_day(timestamp('2020-09-16 17:30:00'))", null, "integer"));
+    verifyDataRows(result, rows(17));
+
+    result = executeQuery("select hour_of_day(datetime('2020-09-16 17:30:00'))");
+    verifySchema(result, schema("hour_of_day(datetime('2020-09-16 17:30:00'))", null, "integer"));
+    verifyDataRows(result, rows(17));
+
+    result = executeQuery("select hour_of_day(time('17:30:00'))");
+    verifySchema(result, schema("hour_of_day(time('17:30:00'))", null, "integer"));
+    verifyDataRows(result, rows(17));
+
+    result = executeQuery("select hour_of_day('2020-09-16 17:30:00')");
+    verifySchema(result, schema("hour_of_day('2020-09-16 17:30:00')", null, "integer"));
+    verifyDataRows(result, rows(17));
+
+    result = executeQuery("select hour_of_day('17:30:00')");
+    verifySchema(result, schema("hour_of_day('17:30:00')", null, "integer"));
+    verifyDataRows(result, rows(17));
+  }
+
+  @Test
+  public void testExtractWithDatetime() throws IOException {
+    JSONObject datetimeResult =
+        executeQuery(
+            String.format(
+                "SELECT extract(DAY_SECOND FROM datetime(cast(datetime0 AS STRING))) FROM %s LIMIT"
+                    + " 1",
+                TEST_INDEX_CALCS));
+    verifyDataRows(datetimeResult, rows(9101735));
+  }
+
+  @Test
+  public void testExtractWithTime() throws IOException {
+    JSONObject timeResult =
+        executeQuery(
+            String.format(
+                "SELECT extract(HOUR_SECOND FROM time0) FROM %s LIMIT 1", TEST_INDEX_CALCS));
+    verifyDataRows(timeResult, rows(210732));
+  }
+
+  @Test
+  public void testExtractWithDate() throws IOException {
+    JSONObject dateResult =
+        executeQuery(
+            String.format(
+                "SELECT extract(YEAR_MONTH FROM date0) FROM %s LIMIT 1", TEST_INDEX_CALCS));
+    verifyDataRows(dateResult, rows(200404));
+  }
+
+  @Test
+  public void testExtractWithDifferentTypesReturnSameResult() throws IOException {
+    JSONObject dateResult =
+        executeQuery(
+            String.format(
+                "SELECT extract(YEAR_MONTH FROM datetime0) FROM %s LIMIT 1", TEST_INDEX_CALCS));
+
+    JSONObject datetimeResult =
+        executeQuery(
+            String.format(
+                "SELECT extract(YEAR_MONTH FROM date(datetime0)) FROM %s LIMIT 1",
+                TEST_INDEX_CALCS));
+
+    dateResult.getJSONArray("datarows").similar(datetimeResult.getJSONArray("datarows"));
+  }
+
+  @Test
+  public void testHourFunctionAliasesReturnTheSameResults() throws IOException {
+    JSONObject result1 = executeQuery("SELECT hour('11:30:00')");
+    JSONObject result2 = executeQuery("SELECT hour_of_day('11:30:00')");
+    verifyDataRows(result1, rows(11));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 =
+        executeQuery(
+            String.format(
+                "SELECT hour(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format(
+                "SELECT hour_of_day(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 =
+        executeQuery(String.format("SELECT hour(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format("SELECT hour_of_day(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 = executeQuery(String.format("SELECT hour(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(String.format("SELECT hour_of_day(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+  }
+
+  @Test
+  public void testLastDay() throws IOException {
+    JSONObject result =
+        executeQuery(String.format("SELECT last_day(date0) FROM %s LIMIT 3", TEST_INDEX_CALCS));
+    verifyDataRows(result, rows("2004-04-30"), rows("1972-07-31"), rows("1975-11-30"));
+
+    result =
+        executeQuery(String.format("SELECT last_day(date0) FROM %s LIMIT 3", TEST_INDEX_CALCS));
+    verifyDataRows(result, rows("2004-04-30"), rows("1972-07-31"), rows("1975-11-30"));
+
+    result =
+        executeQuery(String.format("SELECT last_day(date0) FROM %s LIMIT 3", TEST_INDEX_CALCS));
+    verifyDataRows(result, rows("2004-04-30"), rows("1972-07-31"), rows("1975-11-30"));
+  }
+
   @Test
   public void testMicrosecond() throws IOException {
     JSONObject result = executeQuery("select microsecond(timestamp('2020-09-16 17:30:00.123456'))");
-    verifySchema(result,
-        schema("microsecond(timestamp('2020-09-16 17:30:00.123456'))", null, "integer"));
+    verifySchema(
+        result, schema("microsecond(timestamp('2020-09-16 17:30:00.123456'))", null, "integer"));
     verifyDataRows(result, rows(123456));
 
     // Explicit timestamp value with less than 6 microsecond digits
     result = executeQuery("select microsecond(timestamp('2020-09-16 17:30:00.1234'))");
-    verifySchema(result,
-        schema("microsecond(timestamp('2020-09-16 17:30:00.1234'))", null, "integer"));
+    verifySchema(
+        result, schema("microsecond(timestamp('2020-09-16 17:30:00.1234'))", null, "integer"));
     verifyDataRows(result, rows(123400));
 
     result = executeQuery("select microsecond(time('17:30:00.000010'))");
@@ -364,6 +656,83 @@ public void testMinute() throws IOException {
     verifyDataRows(result, rows(30));
   }
 
+  @Test
+  public void testMinuteOfDay() throws IOException {
+    JSONObject result = executeQuery("select minute_of_day(timestamp('2020-09-16 17:30:00'))");
+    verifySchema(
+        result, schema("minute_of_day(timestamp('2020-09-16 17:30:00'))", null, "integer"));
+    verifyDataRows(result, rows(1050));
+
+    result = executeQuery("select minute_of_day(datetime('2020-09-16 17:30:00'))");
+    verifySchema(result, schema("minute_of_day(datetime('2020-09-16 17:30:00'))", null, "integer"));
+    verifyDataRows(result, rows(1050));
+
+    result = executeQuery("select minute_of_day(time('17:30:00'))");
+    verifySchema(result, schema("minute_of_day(time('17:30:00'))", null, "integer"));
+    verifyDataRows(result, rows(1050));
+
+    result = executeQuery("select minute_of_day('2020-09-16 17:30:00')");
+    verifySchema(result, schema("minute_of_day('2020-09-16 17:30:00')", null, "integer"));
+    verifyDataRows(result, rows(1050));
+
+    result = executeQuery("select minute_of_day('17:30:00')");
+    verifySchema(result, schema("minute_of_day('17:30:00')", null, "integer"));
+    verifyDataRows(result, rows(1050));
+  }
+
+  @Test
+  public void testMinuteOfHour() throws IOException {
+    JSONObject result = executeQuery("select minute_of_hour(timestamp('2020-09-16 17:30:00'))");
+    verifySchema(
+        result, schema("minute_of_hour(timestamp('2020-09-16 17:30:00'))", null, "integer"));
+    verifyDataRows(result, rows(30));
+
+    result = executeQuery("select minute_of_hour(time('17:30:00'))");
+    verifySchema(result, schema("minute_of_hour(time('17:30:00'))", null, "integer"));
+    verifyDataRows(result, rows(30));
+
+    result = executeQuery("select minute_of_hour('2020-09-16 17:30:00')");
+    verifySchema(result, schema("minute_of_hour('2020-09-16 17:30:00')", null, "integer"));
+    verifyDataRows(result, rows(30));
+
+    result = executeQuery("select minute_of_hour('17:30:00')");
+    verifySchema(result, schema("minute_of_hour('17:30:00')", null, "integer"));
+    verifyDataRows(result, rows(30));
+  }
+
+  @Test
+  public void testMinuteFunctionAliasesReturnTheSameResults() throws IOException {
+    JSONObject result1 = executeQuery("SELECT minute('11:30:00')");
+    JSONObject result2 = executeQuery("SELECT minute_of_hour('11:30:00')");
+    verifyDataRows(result1, rows(30));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 =
+        executeQuery(
+            String.format(
+                "SELECT minute(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format(
+                "SELECT minute_of_hour(datetime(CAST(time0 AS STRING))) FROM %s",
+                TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 =
+        executeQuery(
+            String.format("SELECT minute(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format(
+                "SELECT minute_of_hour(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 = executeQuery(String.format("SELECT minute(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(String.format("SELECT minute_of_hour(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+  }
+
   @Test
   public void testMonth() throws IOException {
     JSONObject result = executeQuery("select month(date('2020-09-16'))");
@@ -386,7 +755,8 @@ public void testMonthOfYearTypes() throws IOException {
     verifyDataRows(result, rows(9));
 
     result = executeQuery("select month_of_year(timestamp('2020-09-16 00:00:00'))");
-    verifySchema(result, schema("month_of_year(timestamp('2020-09-16 00:00:00'))", null, "integer"));
+    verifySchema(
+        result, schema("month_of_year(timestamp('2020-09-16 00:00:00'))", null, "integer"));
     verifyDataRows(result, rows(9));
 
     result = executeQuery("select month_of_year('2020-09-16')");
@@ -401,28 +771,31 @@ public void testMonthAlternateSyntaxesReturnTheSameResults() throws IOException
     verifyDataRows(result1, rows(11));
     result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
 
-    result1 = executeQuery(String.format(
-        "SELECT month(CAST(date0 AS date)) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT month_of_year(CAST(date0 AS date)) FROM %s", TEST_INDEX_CALCS));
+    result1 = executeQuery(String.format("SELECT month(date0) FROM %s", TEST_INDEX_CALCS));
+    result2 = executeQuery(String.format("SELECT month_of_year(date0) FROM %s", TEST_INDEX_CALCS));
     result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
 
-    result1 = executeQuery(String.format(
-        "SELECT month(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT month_of_year(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result1 =
+        executeQuery(
+            String.format(
+                "SELECT month(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format(
+                "SELECT month_of_year(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
     result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
 
-    result1 = executeQuery(String.format(
-        "SELECT month(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT month_of_year(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result1 =
+        executeQuery(
+            String.format("SELECT month(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format("SELECT month_of_year(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
     result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
 
-    result1 = executeQuery(String.format(
-        "SELECT month(CAST(datetime0 AS timestamp)) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT month_of_year(CAST(datetime0 AS timestamp)) FROM %s", TEST_INDEX_CALCS));
+    result1 = executeQuery(String.format("SELECT month(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(String.format("SELECT month_of_year(datetime0) FROM %s", TEST_INDEX_CALCS));
     result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
   }
 
@@ -448,6 +821,13 @@ public void testQuarter() throws IOException {
     verifyDataRows(result, rows(3));
   }
 
+  @Test
+  public void testSecToTime() throws IOException {
+    JSONObject result =
+        executeQuery(String.format("SELECT sec_to_time(balance) FROM %s LIMIT 3", TEST_INDEX_BANK));
+    verifyDataRows(result, rows("10:53:45"), rows("01:34:46"), rows("09:07:18"));
+  }
+
   @Test
   public void testSecond() throws IOException {
     JSONObject result = executeQuery("select second(timestamp('2020-09-16 17:30:00'))");
@@ -467,31 +847,171 @@ public void testSecond() throws IOException {
     verifyDataRows(result, rows(0));
   }
 
+  public void testSecondOfMinute() throws IOException {
+    JSONObject result = executeQuery("select second_of_minute(timestamp('2020-09-16 17:30:00'))");
+    verifySchema(
+        result, schema("second_of_minute(timestamp('2020-09-16 17:30:00'))", null, "integer"));
+    verifyDataRows(result, rows(0));
+
+    result = executeQuery("select second_of_minute(time('17:30:00'))");
+    verifySchema(result, schema("second_of_minute(time('17:30:00'))", null, "integer"));
+    verifyDataRows(result, rows(0));
+
+    result = executeQuery("select second_of_minute('2020-09-16 17:30:00')");
+    verifySchema(result, schema("second_of_minute('2020-09-16 17:30:00')", null, "integer"));
+    verifyDataRows(result, rows(0));
+
+    result = executeQuery("select second_of_minute('17:30:00')");
+    verifySchema(result, schema("second_of_minute('17:30:00')", null, "integer"));
+    verifyDataRows(result, rows(0));
+  }
+
+  @Test
+  public void testSecondFunctionAliasesReturnTheSameResults() throws IOException {
+    JSONObject result1 = executeQuery("SELECT second('2022-11-22 12:23:34')");
+    JSONObject result2 = executeQuery("SELECT second_of_minute('2022-11-22 12:23:34')");
+    verifyDataRows(result1, rows(34));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 =
+        executeQuery(
+            String.format(
+                "SELECT second(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format(
+                "SELECT second_of_minute(datetime(CAST(time0 AS STRING))) FROM %s",
+                TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 =
+        executeQuery(
+            String.format("SELECT second(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(
+            String.format(
+                "SELECT second_of_minute(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+
+    result1 = executeQuery(String.format("SELECT second(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result2 =
+        executeQuery(String.format("SELECT second_of_minute(datetime0) FROM %s", TEST_INDEX_CALCS));
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+  }
+
   @Test
-  public void testSubDate() throws IOException {
+  public void testStrToDate() throws IOException {
+    // Ideal case
     JSONObject result =
-        executeQuery("select subdate(timestamp('2020-09-16 17:30:00'), interval 1 day)");
-    verifySchema(result,
-        schema("subdate(timestamp('2020-09-16 17:30:00'), interval 1 day)", null, "datetime"));
-    verifyDataRows(result, rows("2020-09-15 17:30:00"));
+        executeQuery(
+            String.format(
+                "SELECT str_to_date(CAST(birthdate AS STRING),"
+                    + " '%%Y-%%m-%%d %%h:%%i:%%s') FROM %s LIMIT 2",
+                TEST_INDEX_BANK));
+    verifyDataRows(result, rows("2017-10-23 00:00:00"), rows("2017-11-20 00:00:00"));
+
+    // Bad string format case
+    result =
+        executeQuery(
+            String.format(
+                "SELECT str_to_date(CAST(birthdate AS STRING)," + " '%%Y %%s') FROM %s LIMIT 2",
+                TEST_INDEX_BANK));
+    verifyDataRows(result, rows((Object) null), rows((Object) null));
+
+    // bad date format case
+    result =
+        executeQuery(
+            String.format(
+                "SELECT str_to_date(firstname," + " '%%Y-%%m-%%d %%h:%%i:%%s') FROM %s LIMIT 2",
+                TEST_INDEX_BANK));
+    verifyDataRows(result, rows((Object) null), rows((Object) null));
+  }
 
-    result = executeQuery("select subdate(date('2020-09-16'), 1)");
+  @Test
+  public void testSubDateWithDays() throws IOException {
+    var result = executeQuery("select subdate(date('2020-09-16'), 1)");
     verifySchema(result, schema("subdate(date('2020-09-16'), 1)", null, "date"));
     verifyDataRows(result, rows("2020-09-15"));
 
-    result = executeQuery("select subdate('2020-09-16 17:30:00', interval 1 day)");
-    verifySchema(result,
-        schema("subdate('2020-09-16 17:30:00', interval 1 day)", null, "datetime"));
+    result = executeQuery("select subdate(timestamp('2020-09-16 17:30:00'), 1)");
+    verifySchema(result, schema("subdate(timestamp('2020-09-16 17:30:00'), 1)", null, "datetime"));
     verifyDataRows(result, rows("2020-09-15 17:30:00"));
 
-    result = executeQuery("select subdate('2020-09-16', 1)");
-    verifySchema(result, schema("subdate('2020-09-16', 1)", null, "datetime"));
-    verifyDataRows(result, rows("2020-09-15"));
+    result = executeQuery("select subdate(DATETIME('2020-09-16 07:40:00'), 1)");
+    verifySchema(result, schema("subdate(DATETIME('2020-09-16 07:40:00'), 1)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-15 07:40:00"));
 
-    result = executeQuery("select subdate('2020-09-16', interval 1 day)");
-    verifySchema(result,
-        schema("subdate('2020-09-16', interval 1 day)", null, "datetime"));
-    verifyDataRows(result, rows("2020-09-15"));
+    result = executeQuery("select subdate(TIME('07:40:00'), 0)");
+    verifySchema(result, schema("subdate(TIME('07:40:00'), 0)", null, "datetime"));
+    verifyDataRows(result, rows(LocalDate.now() + " 07:40:00"));
+  }
+
+  @Test
+  public void testSubDateWithInterval() throws IOException {
+    JSONObject result =
+        executeQuery("select subdate(timestamp('2020-09-16 17:30:00'), interval 1 day)");
+    verifySchema(
+        result,
+        schema("subdate(timestamp('2020-09-16 17:30:00'), interval 1 day)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-15 17:30:00"));
+
+    result = executeQuery("select subdate(DATETIME('2020-09-16 17:30:00'), interval 1 day)");
+    verifySchema(
+        result,
+        schema("subdate(DATETIME('2020-09-16 17:30:00'), interval 1 day)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-15 17:30:00"));
+
+    result = executeQuery("select subdate(date('2020-09-16'), interval 1 day)");
+    verifySchema(result, schema("subdate(date('2020-09-16'), interval 1 day)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-15 00:00:00"));
+
+    result = executeQuery("select subdate(date('2020-09-16'), interval 1 hour)");
+    verifySchema(result, schema("subdate(date('2020-09-16'), interval 1 hour)", null, "datetime"));
+    verifyDataRows(result, rows("2020-09-15 23:00:00"));
+
+    result = executeQuery("select subdate(TIME('07:40:00'), interval 1 day)");
+    verifySchema(result, schema("subdate(TIME('07:40:00'), interval 1 day)", null, "datetime"));
+    verifyDataRows(
+        result,
+        rows(
+            LocalDate.now()
+                .plusDays(-1)
+                .atTime(LocalTime.of(7, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+
+    result = executeQuery("select subdate(TIME('07:40:00'), interval 1 hour)");
+    verifySchema(result, schema("subdate(TIME('07:40:00'), interval 1 hour)", null, "datetime"));
+    verifyDataRows(
+        result,
+        rows(
+            LocalDate.now()
+                .atTime(LocalTime.of(6, 40))
+                .atZone(systemTz.toZoneId())
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+  }
+
+  @Test
+  public void testTimstampadd() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format("SELECT timestampadd(WEEK, 2, time0) FROM %s LIMIT 3", TEST_INDEX_CALCS));
+
+    verifyDataRows(
+        result,
+        rows("1900-01-13 21:07:32"),
+        rows("1900-01-15 13:48:48"),
+        rows("1900-01-15 18:21:08"));
+  }
+
+  @Test
+  public void testTimstampdiff() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT timestampdiff(DAY, time0, datetime0) FROM %s LIMIT 3", TEST_INDEX_CALCS));
+
+    verifyDataRows(result, rows(38176), rows(38191), rows(38198));
   }
 
   @Test
@@ -516,6 +1036,25 @@ public void testToDays() throws IOException {
     verifyDataRows(result, rows(738049));
   }
 
+  @Test
+  public void testToSeconds() throws IOException {
+    JSONObject result =
+        executeQuery(String.format("select to_seconds(date0) FROM %s LIMIT 2", TEST_INDEX_CALCS));
+    verifyDataRows(result, rows(63249206400L), rows(62246275200L));
+
+    result =
+        executeQuery(
+            String.format(
+                "SELECT to_seconds(datetime(cast(datetime0 AS string))) FROM %s LIMIT 2",
+                TEST_INDEX_CALCS));
+    verifyDataRows(result, rows(63256587455L), rows(63258064234L));
+
+    result =
+        executeQuery(
+            String.format("select to_seconds(datetime0) FROM %s LIMIT 2", TEST_INDEX_CALCS));
+    verifyDataRows(result, rows(63256587455L), rows(63258064234L));
+  }
+
   @Test
   public void testYear() throws IOException {
     JSONObject result = executeQuery("select year(date('2020-09-16'))");
@@ -527,11 +1066,14 @@ public void testYear() throws IOException {
     verifyDataRows(result, rows(2020));
   }
 
-  private void week(String date, int mode, int expectedResult, String functionName) throws IOException {
-    JSONObject result = executeQuery(StringUtils.format("select %s(date('%s'), %d)", functionName, date,
-        mode));
-    verifySchema(result,
-        schema(StringUtils.format("%s(date('%s'), %d)", functionName, date, mode), null, "integer"));
+  private void week(String date, int mode, int expectedResult, String functionName)
+      throws IOException {
+    JSONObject result =
+        executeQuery(StringUtils.format("select %s(date('%s'), %d)", functionName, date, mode));
+    verifySchema(
+        result,
+        schema(
+            StringUtils.format("%s(date('%s'), %d)", functionName, date, mode), null, "integer"));
     verifyDataRows(result, rows(expectedResult));
   }
 
@@ -549,7 +1091,14 @@ public void testWeek() throws IOException {
   }
 
   @Test
-  public void testWeekOfYear() throws IOException {
+  public void testWeekday() throws IOException {
+    JSONObject result =
+        executeQuery(String.format("SELECT weekday(date0) FROM %s LIMIT 3", TEST_INDEX_CALCS));
+    verifyDataRows(result, rows(3), rows(1), rows(2));
+  }
+
+  @Test
+  public void testWeekOfYearUnderscores() throws IOException {
     JSONObject result = executeQuery("select week_of_year(date('2008-02-20'))");
     verifySchema(result, schema("week_of_year(date('2008-02-20'))", null, "integer"));
     verifyDataRows(result, rows(7));
@@ -561,39 +1110,55 @@ public void testWeekOfYear() throws IOException {
     week("2000-01-01", 2, 52, "week_of_year");
   }
 
+  @Test
+  public void testWeekOfYear() throws IOException {
+    JSONObject result = executeQuery("select weekofyear(date('2008-02-20'))");
+    verifySchema(result, schema("weekofyear(date('2008-02-20'))", null, "integer"));
+    verifyDataRows(result, rows(7));
+
+    week("2008-02-20", 0, 7, "weekofyear");
+    week("2008-02-20", 1, 8, "weekofyear");
+    week("2008-12-31", 1, 53, "weekofyear");
+    week("2000-01-01", 0, 0, "weekofyear");
+    week("2000-01-01", 2, 52, "week_of_year");
+  }
+
+  private void compareWeekResults(String arg, String table) throws IOException {
+    JSONObject result1 = executeQuery(String.format("SELECT week(%s) FROM %s", arg, table));
+    JSONObject result2 = executeQuery(String.format("SELECT week_of_year(%s) FROM %s", arg, table));
+    JSONObject result3 = executeQuery(String.format("SELECT weekofyear(%s) FROM %s", arg, table));
+
+    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+    result1.getJSONArray("datarows").similar(result3.getJSONArray("datarows"));
+  }
+
   @Test
   public void testWeekAlternateSyntaxesReturnTheSameResults() throws IOException {
     JSONObject result1 = executeQuery("SELECT week(date('2022-11-22'))");
     JSONObject result2 = executeQuery("SELECT week_of_year(date('2022-11-22'))");
+    JSONObject result3 = executeQuery("SELECT weekofyear(date('2022-11-22'))");
     verifyDataRows(result1, rows(47));
     result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+    result1.getJSONArray("datarows").similar(result3.getJSONArray("datarows"));
 
-    result1 = executeQuery(String.format(
-        "SELECT week(CAST(date0 AS date)) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT week_of_year(CAST(date0 AS date)) FROM %s", TEST_INDEX_CALCS));
-    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
-
-    result1 = executeQuery(String.format(
-        "SELECT week(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT week_of_year(datetime(CAST(time0 AS STRING))) FROM %s", TEST_INDEX_CALCS));
-    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+    compareWeekResults("date0", TEST_INDEX_CALCS);
+    compareWeekResults("datetime(CAST(time0 AS STRING))", TEST_INDEX_CALCS);
+    compareWeekResults("CAST(time0 AS STRING)", TEST_INDEX_CALCS);
+    compareWeekResults("datetime0", TEST_INDEX_CALCS);
+  }
 
-    result1 = executeQuery(String.format(
-        "SELECT week(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT week_of_year(CAST(time0 AS STRING)) FROM %s", TEST_INDEX_CALCS));
-    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+  @Test
+  public void testYearweek() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT yearweek(time0), yearweek(time0, 4) FROM %s LIMIT 2", TEST_INDEX_CALCS));
 
-    result1 = executeQuery(String.format(
-        "SELECT week(CAST(datetime0 AS timestamp)) FROM %s", TEST_INDEX_CALCS));
-    result2 = executeQuery(String.format(
-        "SELECT week_of_year(CAST(datetime0 AS timestamp)) FROM %s", TEST_INDEX_CALCS));
-    result1.getJSONArray("datarows").similar(result2.getJSONArray("datarows"));
+    verifyDataRows(result, rows(189952, 189952), rows(189953, 190001));
   }
 
-  void verifyDateFormat(String date, String type, String format, String formatted) throws IOException {
+  void verifyDateFormat(String date, String type, String format, String formatted)
+      throws IOException {
     String query = String.format("date_format(%s('%s'), '%s')", type, date, format);
     JSONObject result = executeQuery("select " + query);
     verifySchema(result, schema(query, null, "keyword"));
@@ -608,10 +1173,11 @@ void verifyDateFormat(String date, String type, String format, String formatted)
   @Test
   public void testDateFormat() throws IOException {
     String timestamp = "1998-01-31 13:14:15.012345";
-    String timestampFormat = "%a %b %c %D %d %e %f %H %h %I %i %j %k %l %M "
-        + "%m %p %r %S %s %T %% %P";
-    String timestampFormatted = "Sat Jan 01 31st 31 31 12345 13 01 01 14 031 13 1 "
-        + "January 01 PM 01:14:15 PM 15 15 13:14:15 % P";
+    String timestampFormat =
+        "%a %b %c %D %d %e %f %H %h %I %i %j %k %l %M " + "%m %p %r %S %s %T %% %P";
+    String timestampFormatted =
+        "Sat Jan 01 31st 31 31 012345 13 01 01 14 031 13 1 "
+            + "January 01 PM 01:14:15 PM 15 15 13:14:15 % P";
     verifyDateFormat(timestamp, "timestamp", timestampFormat, timestampFormatted);
 
     String date = "1998-01-31";
@@ -622,9 +1188,10 @@ public void testDateFormat() throws IOException {
 
   @Test
   public void testMakeTime() throws IOException {
-    var result = executeQuery(
-        "select MAKETIME(20, 30, 40) as f1, MAKETIME(20.2, 49.5, 42.100502) as f2");
-    verifySchema(result,
+    var result =
+        executeQuery("select MAKETIME(20, 30, 40) as f1, MAKETIME(20.2, 49.5, 42.100502) as f2");
+    verifySchema(
+        result,
         schema("MAKETIME(20, 30, 40)", "f1", "time"),
         schema("MAKETIME(20.2, 49.5, 42.100502)", "f2", "time"));
     verifyDataRows(result, rows("20:30:40", "20:50:42.100502"));
@@ -632,193 +1199,45 @@ public void testMakeTime() throws IOException {
 
   @Test
   public void testMakeDate() throws IOException {
-    var result = executeQuery(
-        "select MAKEDATE(1945, 5.9) as f1, MAKEDATE(1984, 1984) as f2");
-    verifySchema(result,
+    var result = executeQuery("select MAKEDATE(1945, 5.9) as f1, MAKEDATE(1984, 1984) as f2");
+    verifySchema(
+        result,
         schema("MAKEDATE(1945, 5.9)", "f1", "date"),
         schema("MAKEDATE(1984, 1984)", "f2", "date"));
     verifyDataRows(result, rows("1945-01-06", "1989-06-06"));
   }
 
-  private List<ImmutableMap<Object, Object>> nowLikeFunctionsData() {
-    return List.of(
-      ImmutableMap.builder()
-              .put("name", "now")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", true)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDateTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse)
-              .put("serializationPattern", "uuuu-MM-dd HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "current_timestamp")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", true)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDateTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse)
-              .put("serializationPattern", "uuuu-MM-dd HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "localtimestamp")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", true)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDateTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse)
-              .put("serializationPattern", "uuuu-MM-dd HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "localtime")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", true)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDateTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse)
-              .put("serializationPattern", "uuuu-MM-dd HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "sysdate")
-              .put("hasFsp", true)
-              .put("hasShortcut", false)
-              .put("constValue", false)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDateTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse)
-              .put("serializationPattern", "uuuu-MM-dd HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "curtime")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", false)
-              .put("referenceGetter", (Supplier<Temporal>) LocalTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalTime::parse)
-              .put("serializationPattern", "HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "current_time")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", false)
-              .put("referenceGetter", (Supplier<Temporal>) LocalTime::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalTime::parse)
-              .put("serializationPattern", "HH:mm:ss")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "curdate")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", false)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDate::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDate::parse)
-              .put("serializationPattern", "uuuu-MM-dd")
-              .build(),
-      ImmutableMap.builder()
-              .put("name", "current_date")
-              .put("hasFsp", false)
-              .put("hasShortcut", false)
-              .put("constValue", false)
-              .put("referenceGetter", (Supplier<Temporal>) LocalDate::now)
-              .put("parser", (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDate::parse)
-              .put("serializationPattern", "uuuu-MM-dd")
-              .build()
-    );
-  }
-
-  private long getDiff(Temporal sample, Temporal reference) {
-    if (sample instanceof LocalDate) {
-      return Period.between((LocalDate) sample, (LocalDate) reference).getDays();
-    }
-    return Duration.between(sample, reference).toSeconds();
-  }
-
-  @Test
-  public void testNowLikeFunctions() throws IOException {
-    // Integration test framework sets for OpenSearch instance a random timezone.
-    // If server's TZ doesn't match localhost's TZ, time measurements for `now` would differ.
-    // We should set localhost's TZ now and recover the value back in the end of the test.
-    var testTz = TimeZone.getDefault();
-    TimeZone.setDefault(TimeZone.getTimeZone(System.getProperty("user.timezone")));
-
-    for (var funcData : nowLikeFunctionsData()) {
-      String name = (String) funcData.get("name");
-      Boolean hasFsp = (Boolean) funcData.get("hasFsp");
-      Boolean hasShortcut = (Boolean) funcData.get("hasShortcut");
-      Boolean constValue = (Boolean) funcData.get("constValue");
-      Supplier<Temporal> referenceGetter = (Supplier<Temporal>) funcData.get("referenceGetter");
-      BiFunction<CharSequence, DateTimeFormatter, Temporal> parser =
-              (BiFunction<CharSequence, DateTimeFormatter, Temporal>) funcData.get("parser");
-      String serializationPatternStr = (String) funcData.get("serializationPattern");
-
-      var serializationPattern = new DateTimeFormatterBuilder()
-              .appendPattern(serializationPatternStr)
-              .optionalStart()
-              .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true)
-              .toFormatter();
-
-      Temporal reference = referenceGetter.get();
-      double delta = 2d; // acceptable time diff, secs
-      if (reference instanceof LocalDate)
-        delta = 1d; // Max date delta could be 1 if test runs on the very edge of two days
-                    // We ignore probability of a test run on edge of month or year to simplify the checks
-
-      var calls = new ArrayList<String>() {{
-        add(name + "()");
-      }};
-      if (hasShortcut)
-        calls.add(name);
-      if (hasFsp)
-        calls.add(name + "(0)");
-
-      // Column order is: func(), func, func(0)
-      //                   shortcut ^    fsp ^
-      JSONObject result = executeQuery("select " + String.join(", ", calls) + " from " + TEST_INDEX_PEOPLE2);
-
-      var rows = result.getJSONArray("datarows");
-      JSONArray firstRow = rows.getJSONArray(0);
-      for (int i = 0; i < rows.length(); i++) {
-        var row = rows.getJSONArray(i);
-        if (constValue)
-          assertTrue(firstRow.similar(row));
-
-        int column = 0;
-        assertEquals(0,
-            getDiff(reference, parser.apply(row.getString(column++), serializationPattern)), delta);
-
-        if (hasShortcut) {
-          assertEquals(0,
-              getDiff(reference, parser.apply(row.getString(column++), serializationPattern)), delta);
-        }
-        if (hasFsp) {
-          assertEquals(0,
-              getDiff(reference, parser.apply(row.getString(column), serializationPattern)), delta);
-        }
-      }
-    }
-    TimeZone.setDefault(testTz);
-  }
-
   @Test
   public void testFromUnixTime() throws IOException {
-    var result = executeQuery(
-        "select FROM_UNIXTIME(200300400) f1, FROM_UNIXTIME(12224.12) f2, "
-        + "FROM_UNIXTIME(1662601316, '%T') f3");
-    verifySchema(result,
-        schema("FROM_UNIXTIME(200300400)", "f1",  "datetime"),
+    var result =
+        executeQuery(
+            "select FROM_UNIXTIME(200300400) f1, FROM_UNIXTIME(12224.12) f2, "
+                + "FROM_UNIXTIME(1662601316, '%T') f3");
+    verifySchema(
+        result,
+        schema("FROM_UNIXTIME(200300400)", "f1", "datetime"),
         schema("FROM_UNIXTIME(12224.12)", "f2", "datetime"),
         schema("FROM_UNIXTIME(1662601316, '%T')", "f3", "keyword"));
-    verifySome(result.getJSONArray("datarows"),
+    verifySome(
+        result.getJSONArray("datarows"),
         rows("1976-05-07 07:00:00", "1970-01-01 03:23:44.12", "01:41:56"));
   }
 
+  @Test
+  public void testGetFormatAsArgument() throws IOException {
+    var result = executeQuery("SELECT DATE_FORMAT('2003-10-03',GET_FORMAT(DATE,'USA'))");
+    verifyDataRows(result, rows("10.03.2003"));
+  }
+
   @Test
   public void testUnixTimeStamp() throws IOException {
-    var result = executeQuery(
-        "select UNIX_TIMESTAMP(MAKEDATE(1984, 1984)) f1, "
-        + "UNIX_TIMESTAMP(TIMESTAMP('2003-12-31 12:00:00')) f2, "
-        + "UNIX_TIMESTAMP(20771122143845) f3");
-    verifySchema(result,
+    var result =
+        executeQuery(
+            "select UNIX_TIMESTAMP(MAKEDATE(1984, 1984)) f1, "
+                + "UNIX_TIMESTAMP(TIMESTAMP('2003-12-31 12:00:00')) f2, "
+                + "UNIX_TIMESTAMP(20771122143845) f3");
+    verifySchema(
+        result,
         schema("UNIX_TIMESTAMP(MAKEDATE(1984, 1984))", "f1", "double"),
         schema("UNIX_TIMESTAMP(TIMESTAMP('2003-12-31 12:00:00'))", "f2", "double"),
         schema("UNIX_TIMESTAMP(20771122143845)", "f3", "double"));
@@ -827,9 +1246,9 @@ public void testUnixTimeStamp() throws IOException {
 
   @Test
   public void testPeriodAdd() throws IOException {
-    var result = executeQuery(
-        "select PERIOD_ADD(200801, 2) as f1, PERIOD_ADD(200801, -12) as f2");
-    verifySchema(result,
+    var result = executeQuery("select PERIOD_ADD(200801, 2) as f1, PERIOD_ADD(200801, -12) as f2");
+    verifySchema(
+        result,
         schema("PERIOD_ADD(200801, 2)", "f1", "integer"),
         schema("PERIOD_ADD(200801, -12)", "f2", "integer"));
     verifyDataRows(result, rows(200803, 200701));
@@ -837,14 +1256,135 @@ public void testPeriodAdd() throws IOException {
 
   @Test
   public void testPeriodDiff() throws IOException {
-    var result = executeQuery(
-        "select PERIOD_DIFF(200802, 200703) as f1, PERIOD_DIFF(200802, 201003) as f2");
-    verifySchema(result,
+    var result =
+        executeQuery("select PERIOD_DIFF(200802, 200703) as f1, PERIOD_DIFF(200802, 201003) as f2");
+    verifySchema(
+        result,
         schema("PERIOD_DIFF(200802, 200703)", "f1", "integer"),
         schema("PERIOD_DIFF(200802, 201003)", "f2", "integer"));
     verifyDataRows(result, rows(11, -25));
   }
 
+  public void testAddTime() throws IOException {
+    var result =
+        executeQuery(
+            "SELECT ADDTIME(DATE('2008-12-12'), DATE('2008-11-15')) AS `'2008-12-12' + 0`,"
+                + " ADDTIME(TIME('23:59:59'), DATE('2004-01-01')) AS `'23:59:59' + 0`,"
+                + " ADDTIME(DATE('2004-01-01'), TIME('23:59:59')) AS `'2004-01-01' + '23:59:59'`,"
+                + " ADDTIME(TIME('10:20:30'), TIME('00:05:42')) AS `'10:20:30' + '00:05:42'`,"
+                + " ADDTIME(TIMESTAMP('1999-12-31 15:42:13'), DATETIME('1961-04-12 09:07:00')) AS"
+                + " `'15:42:13' + '09:07:00'`");
+    verifySchema(
+        result,
+        schema("ADDTIME(DATE('2008-12-12'), DATE('2008-11-15'))", "'2008-12-12' + 0", "datetime"),
+        schema("ADDTIME(TIME('23:59:59'), DATE('2004-01-01'))", "'23:59:59' + 0", "time"),
+        schema(
+            "ADDTIME(DATE('2004-01-01'), TIME('23:59:59'))",
+            "'2004-01-01' + '23:59:59'",
+            "datetime"),
+        schema("ADDTIME(TIME('10:20:30'), TIME('00:05:42'))", "'10:20:30' + '00:05:42'", "time"),
+        schema(
+            "ADDTIME(TIMESTAMP('1999-12-31 15:42:13'), DATETIME('1961-04-12 09:07:00'))",
+            "'15:42:13' + '09:07:00'",
+            "datetime"));
+    verifyDataRows(
+        result,
+        rows(
+            "2008-12-12 00:00:00",
+            "23:59:59",
+            "2004-01-01 23:59:59",
+            "10:26:12",
+            "2000-01-01 00:49:13"));
+  }
+
+  @Test
+  public void testSubTime() throws IOException {
+    var result =
+        executeQuery(
+            "SELECT SUBTIME(DATE('2008-12-12'), DATE('2008-11-15')) AS `'2008-12-12' - 0`,"
+                + " SUBTIME(TIME('23:59:59'), DATE('2004-01-01')) AS `'23:59:59' - 0`,"
+                + " SUBTIME(DATE('2004-01-01'), TIME('23:59:59')) AS `'2004-01-01' - '23:59:59'`,"
+                + " SUBTIME(TIME('10:20:30'), TIME('00:05:42')) AS `'10:20:30' - '00:05:42'`,"
+                + " SUBTIME(TIMESTAMP('1999-12-31 15:42:13'), DATETIME('1961-04-12 09:07:00')) AS"
+                + " `'15:42:13' - '09:07:00'`");
+    verifySchema(
+        result,
+        schema("SUBTIME(DATE('2008-12-12'), DATE('2008-11-15'))", "'2008-12-12' - 0", "datetime"),
+        schema("SUBTIME(TIME('23:59:59'), DATE('2004-01-01'))", "'23:59:59' - 0", "time"),
+        schema(
+            "SUBTIME(DATE('2004-01-01'), TIME('23:59:59'))",
+            "'2004-01-01' - '23:59:59'",
+            "datetime"),
+        schema("SUBTIME(TIME('10:20:30'), TIME('00:05:42'))", "'10:20:30' - '00:05:42'", "time"),
+        schema(
+            "SUBTIME(TIMESTAMP('1999-12-31 15:42:13'), DATETIME('1961-04-12 09:07:00'))",
+            "'15:42:13' - '09:07:00'",
+            "datetime"));
+    verifyDataRows(
+        result,
+        rows(
+            "2008-12-12 00:00:00",
+            "23:59:59",
+            "2003-12-31 00:00:01",
+            "10:14:48",
+            "1999-12-31 06:35:13"));
+  }
+
+  public void testDateDiff() throws IOException {
+    var result =
+        executeQuery(
+            "SELECT DATEDIFF(TIMESTAMP('2000-01-02 00:00:00'), TIMESTAMP('2000-01-01 23:59:59')) AS"
+                + " `'2000-01-02' - '2000-01-01'`, DATEDIFF(DATE('2001-02-01'),"
+                + " TIMESTAMP('2004-01-01 00:00:00')) AS `'2001-02-01' - '2004-01-01'`,"
+                + " DATEDIFF(TIMESTAMP('2004-01-01 00:00:00'), DATETIME('2002-02-01 14:25:30')) AS"
+                + " `'2004-01-01' - '2002-02-01'`, DATEDIFF(TIME('23:59:59'), TIME('00:00:00')) AS"
+                + " `today - today`");
+    verifySchema(
+        result,
+        schema(
+            "DATEDIFF(TIMESTAMP('2000-01-02 00:00:00'), TIMESTAMP('2000-01-01 23:59:59'))",
+            "'2000-01-02' - '2000-01-01'",
+            "long"),
+        schema(
+            "DATEDIFF(DATE('2001-02-01'), TIMESTAMP('2004-01-01 00:00:00'))",
+            "'2001-02-01' - '2004-01-01'",
+            "long"),
+        schema(
+            "DATEDIFF(TIMESTAMP('2004-01-01 00:00:00'), DATETIME('2002-02-01 14:25:30'))",
+            "'2004-01-01' - '2002-02-01'",
+            "long"),
+        schema("DATEDIFF(TIME('23:59:59'), TIME('00:00:00'))", "today - today", "long"));
+    verifyDataRows(result, rows(1, -1064, 699, 0));
+  }
+
+  @Test
+  public void testTimeDiff() throws IOException {
+    var result = executeQuery("select TIMEDIFF('23:59:59', '13:00:00') as f");
+    verifySchema(result, schema("TIMEDIFF('23:59:59', '13:00:00')", "f", "time"));
+    verifyDataRows(result, rows("10:59:59"));
+  }
+
+  void verifyTimeFormat(String time, String type, String format, String formatted)
+      throws IOException {
+    String query = String.format("time_format(%s('%s'), '%s')", type, time, format);
+    JSONObject result = executeQuery("select " + query);
+    verifySchema(result, schema(query, null, "keyword"));
+    verifyDataRows(result, rows(formatted));
+
+    query = String.format("time_format('%s', '%s')", time, format);
+    result = executeQuery("select " + query);
+    verifySchema(result, schema(query, null, "keyword"));
+    verifyDataRows(result, rows(formatted));
+  }
+
+  @Test
+  public void testTimeFormat() throws IOException {
+    String timestamp = "1998-01-31 13:14:15.012345";
+    String timestampFormat = "%f %H %h %I %i %p %r %S %s %T";
+    String timestampFormatted = "012345 13 01 01 14 PM 01:14:15 PM 15 15 13:14:15";
+    verifyTimeFormat(timestamp, "timestamp", timestampFormat, timestampFormatted);
+  }
+
   protected JSONObject executeQuery(String query) throws IOException {
     Request request = new Request("POST", QUERY_API_ENDPOINT);
     request.setJsonEntity(String.format(Locale.ROOT, "{\n" + "  \"query\": \"%s\"\n" + "}", query));
@@ -856,4 +1396,85 @@ protected JSONObject executeQuery(String query) throws IOException {
     Response response = client().performRequest(request);
     return new JSONObject(getResponseBody(response));
   }
+
+  @Test
+  public void testTimestampBracket() throws IOException {
+    JSONObject result = executeQuery("select {timestamp '2020-09-16 17:30:00'}");
+    verifySchema(result, schema("{timestamp '2020-09-16 17:30:00'}", null, "timestamp"));
+    verifyDataRows(result, rows("2020-09-16 17:30:00"));
+
+    result = executeQuery("select {ts '2020-09-16 17:30:00'}");
+    verifySchema(result, schema("{ts '2020-09-16 17:30:00'}", null, "timestamp"));
+    verifyDataRows(result, rows("2020-09-16 17:30:00"));
+
+    result = executeQuery("select {timestamp '2020-09-16 17:30:00.123'}");
+    verifySchema(result, schema("{timestamp '2020-09-16 17:30:00.123'}", null, "timestamp"));
+    verifyDataRows(result, rows("2020-09-16 17:30:00.123"));
+
+    result = executeQuery("select {ts '2020-09-16 17:30:00.123'}");
+    verifySchema(result, schema("{ts '2020-09-16 17:30:00.123'}", null, "timestamp"));
+    verifyDataRows(result, rows("2020-09-16 17:30:00.123"));
+  }
+
+  @Test
+  public void testTimeBracket() throws IOException {
+    JSONObject result = executeQuery("select {time '17:30:00'}");
+    verifySchema(result, schema("{time '17:30:00'}", null, "time"));
+    verifyDataRows(result, rows("17:30:00"));
+
+    result = executeQuery("select {t '17:30:00'}");
+    verifySchema(result, schema("{t '17:30:00'}", null, "time"));
+    verifyDataRows(result, rows("17:30:00"));
+
+    result = executeQuery("select {time '17:30:00.123'}");
+    verifySchema(result, schema("{time '17:30:00.123'}", null, "time"));
+    verifyDataRows(result, rows("17:30:00.123"));
+
+    result = executeQuery("select {t '17:30:00.123'}");
+    verifySchema(result, schema("{t '17:30:00.123'}", null, "time"));
+    verifyDataRows(result, rows("17:30:00.123"));
+  }
+
+  @Test
+  public void testDateBracket() throws IOException {
+    JSONObject result = executeQuery("select {date '2020-09-16'}");
+    verifySchema(result, schema("{date '2020-09-16'}", null, "date"));
+    verifyDataRows(result, rows("2020-09-16"));
+
+    result = executeQuery("select {d '2020-09-16'}");
+    verifySchema(result, schema("{d '2020-09-16'}", null, "date"));
+    verifyDataRows(result, rows("2020-09-16"));
+  }
+
+  private void compareBrackets(String query1, String query2, String datetime) throws IOException {
+    JSONObject result1 = executeQuery("select " + query1 + " '" + datetime + "'");
+    JSONObject result2 = executeQuery("select {" + query2 + " '" + datetime + "'}");
+
+    verifyDataRows(result1, rows(datetime));
+    verifyDataRows(result2, rows(datetime));
+  }
+
+  @Test
+  public void testBracketedEquivalent() throws IOException {
+    compareBrackets("timestamp", "timestamp", "2020-09-16 17:30:00");
+    compareBrackets("timestamp", "ts", "2020-09-16 17:30:00");
+    compareBrackets("timestamp", "timestamp", "2020-09-16 17:30:00.123");
+    compareBrackets("timestamp", "ts", "2020-09-16 17:30:00.123");
+    compareBrackets("date", "date", "2020-09-16");
+    compareBrackets("date", "d", "2020-09-16");
+    compareBrackets("time", "time", "17:30:00");
+    compareBrackets("time", "t", "17:30:00");
+  }
+
+  @Test
+  public void testBracketFails() {
+    assertThrows(ResponseException.class, () -> executeQuery("select {time '2020-09-16'}"));
+    assertThrows(ResponseException.class, () -> executeQuery("select {t '2020-09-16'}"));
+    assertThrows(ResponseException.class, () -> executeQuery("select {date '17:30:00'}"));
+    assertThrows(ResponseException.class, () -> executeQuery("select {d '17:30:00'}"));
+    assertThrows(ResponseException.class, () -> executeQuery("select {timestamp '2020-09-16'}"));
+    assertThrows(ResponseException.class, () -> executeQuery("select {ts '2020-09-16'}"));
+    assertThrows(ResponseException.class, () -> executeQuery("select {timestamp '17:30:00'}"));
+    assertThrows(ResponseException.class, () -> executeQuery("select {ts '17:30:00'}"));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeImplementationIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeImplementationIT.java
index ff2c4c07a6..8ffa1df8f3 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeImplementationIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeImplementationIT.java
@@ -5,18 +5,16 @@
 
 package org.opensearch.sql.sql;
 
-import org.junit.Test;
-import org.opensearch.sql.legacy.SQLIntegTestCase;
-
-import java.io.IOException;
-
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.schema;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
-public class DateTimeImplementationIT extends SQLIntegTestCase {
+import java.io.IOException;
+import org.junit.Test;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
 
+public class DateTimeImplementationIT extends SQLIntegTestCase {
 
   @Override
   public void init() throws Exception {
@@ -26,136 +24,118 @@ public void init() throws Exception {
 
   @Test
   public void inRangeZeroToStringTZ() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2008-12-25 05:30:00+00:00', 'America/Los_Angeles')");
-    verifySchema(result,
+    var result =
+        executeJdbcRequest("SELECT DATETIME('2008-12-25 05:30:00+00:00', 'America/Los_Angeles')");
+    verifySchema(
+        result,
         schema("DATETIME('2008-12-25 05:30:00+00:00', 'America/Los_Angeles')", null, "datetime"));
     verifyDataRows(result, rows("2008-12-24 21:30:00"));
   }
 
   @Test
   public void inRangeZeroToPositive() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2008-12-25 05:30:00+00:00', '+01:00')");
-    verifySchema(result,
-        schema("DATETIME('2008-12-25 05:30:00+00:00', '+01:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT DATETIME('2008-12-25 05:30:00+00:00', '+01:00')");
+    verifySchema(
+        result, schema("DATETIME('2008-12-25 05:30:00+00:00', '+01:00')", null, "datetime"));
     verifyDataRows(result, rows("2008-12-25 06:30:00"));
   }
 
   @Test
   public void inRangeNegativeToPositive() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2008-12-25 05:30:00-05:00', '+05:00')");
-    verifySchema(result,
-        schema("DATETIME('2008-12-25 05:30:00-05:00', '+05:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT DATETIME('2008-12-25 05:30:00-05:00', '+05:00')");
+    verifySchema(
+        result, schema("DATETIME('2008-12-25 05:30:00-05:00', '+05:00')", null, "datetime"));
     verifyDataRows(result, rows("2008-12-25 15:30:00"));
   }
 
   @Test
   public void inRangeTwentyHourOffset() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2004-02-28 23:00:00-10:00', '+10:00')");
-    verifySchema(result,
-        schema("DATETIME('2004-02-28 23:00:00-10:00', '+10:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT DATETIME('2004-02-28 23:00:00-10:00', '+10:00')");
+    verifySchema(
+        result, schema("DATETIME('2004-02-28 23:00:00-10:00', '+10:00')", null, "datetime"));
     verifyDataRows(result, rows("2004-02-29 19:00:00"));
   }
 
   @Test
   public void inRangeYearChange() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2008-01-01 02:00:00+10:00', '-10:00')");
-    verifySchema(result,
-        schema("DATETIME('2008-01-01 02:00:00+10:00', '-10:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT DATETIME('2008-01-01 02:00:00+10:00', '-10:00')");
+    verifySchema(
+        result, schema("DATETIME('2008-01-01 02:00:00+10:00', '-10:00')", null, "datetime"));
     verifyDataRows(result, rows("2007-12-31 06:00:00"));
   }
 
   @Test
   public void inRangeZeroNoToTZ() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2008-01-01 02:00:00+10:00')");
-    verifySchema(result,
-        schema("DATETIME('2008-01-01 02:00:00+10:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT DATETIME('2008-01-01 02:00:00+10:00')");
+    verifySchema(result, schema("DATETIME('2008-01-01 02:00:00+10:00')", null, "datetime"));
     verifyDataRows(result, rows("2008-01-01 02:00:00"));
   }
 
   @Test
   public void inRangeZeroNoTZ() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2008-01-01 02:00:00')");
-    verifySchema(result,
-        schema("DATETIME('2008-01-01 02:00:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT DATETIME('2008-01-01 02:00:00')");
+    verifySchema(result, schema("DATETIME('2008-01-01 02:00:00')", null, "datetime"));
     verifyDataRows(result, rows("2008-01-01 02:00:00"));
   }
 
   @Test
   public void inRangeZeroDayConvert() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2008-01-01 02:00:00+12:00', '-12:00')");
-    verifySchema(result,
-        schema("DATETIME('2008-01-01 02:00:00+12:00', '-12:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT DATETIME('2008-01-01 02:00:00+12:00', '-12:00')");
+    verifySchema(
+        result, schema("DATETIME('2008-01-01 02:00:00+12:00', '-12:00')", null, "datetime"));
     verifyDataRows(result, rows("2007-12-31 02:00:00"));
   }
 
   @Test
   public void inRangeJustInRangeNegative() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2008-01-01 02:00:00+10:00', '-13:59')");
-    verifySchema(result,
-        schema("DATETIME('2008-01-01 02:00:00+10:00', '-13:59')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT DATETIME('2008-01-01 02:00:00+10:00', '-13:59')");
+    verifySchema(
+        result, schema("DATETIME('2008-01-01 02:00:00+10:00', '-13:59')", null, "datetime"));
     verifyDataRows(result, rows("2007-12-31 02:01:00"));
   }
 
   @Test
   public void inRangeJustInRangePositive() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2008-01-01 02:00:00+14:00', '-10:00')");
-    verifySchema(result,
-        schema("DATETIME('2008-01-01 02:00:00+14:00', '-10:00')", null, "datetime"));
+    var result = executeJdbcRequest("SELECT DATETIME('2008-01-01 02:00:00+14:00', '-10:00')");
+    verifySchema(
+        result, schema("DATETIME('2008-01-01 02:00:00+14:00', '-10:00')", null, "datetime"));
     verifyDataRows(result, rows("2007-12-31 02:00:00"));
   }
 
   @Test
   public void nullField3Under() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2008-01-01 02:00:00+10:00', '-14:01')");
-    verifySchema(result,
-        schema("DATETIME('2008-01-01 02:00:00+10:00', '-14:01')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT DATETIME('2008-01-01 02:00:00+10:00', '-14:01')");
+    verifySchema(
+        result, schema("DATETIME('2008-01-01 02:00:00+10:00', '-14:01')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 
   @Test
   public void nullField1Over() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2008-01-01 02:00:00+14:01', '-10:00')");
-    verifySchema(result,
-        schema("DATETIME('2008-01-01 02:00:00+14:01', '-10:00')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT DATETIME('2008-01-01 02:00:00+14:01', '-10:00')");
+    verifySchema(
+        result, schema("DATETIME('2008-01-01 02:00:00+14:01', '-10:00')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 
   @Test
   public void nullDateTimeInvalidDateValueFebruary() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2021-02-30 10:00:00')");
-    verifySchema(result,
-        schema("DATETIME('2021-02-30 10:00:00')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT DATETIME('2021-02-30 10:00:00')");
+    verifySchema(result, schema("DATETIME('2021-02-30 10:00:00')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 
   @Test
   public void nullDateTimeInvalidDateValueApril() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2021-04-31 10:00:00')");
-    verifySchema(result,
-        schema("DATETIME('2021-04-31 10:00:00')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT DATETIME('2021-04-31 10:00:00')");
+    verifySchema(result, schema("DATETIME('2021-04-31 10:00:00')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 
   @Test
   public void nullDateTimeInvalidDateValueMonth() throws IOException {
-    var result = executeJdbcRequest(
-        "SELECT DATETIME('2021-13-03 10:00:00')");
-    verifySchema(result,
-        schema("DATETIME('2021-13-03 10:00:00')", null, "datetime"));
-    verifyDataRows(result, rows(new Object[]{null}));
+    var result = executeJdbcRequest("SELECT DATETIME('2021-13-03 10:00:00')");
+    verifySchema(result, schema("DATETIME('2021-13-03 10:00:00')", null, "datetime"));
+    verifyDataRows(result, rows(new Object[] {null}));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/ExpressionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/ExpressionIT.java
index 30211366b1..be1471641e 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/ExpressionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/ExpressionIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.hamcrest.Matchers.is;
@@ -23,15 +22,14 @@
 import org.opensearch.sql.legacy.RestIntegTestCase;
 
 /**
- * Integration test for different type of expressions such as literals, arithmetic, predicate
- * and function expression. Since comparison test in {@link SQLCorrectnessIT} is enforced,
- * this kind of manual written IT class will be focused on anomaly case test.
+ * Integration test for different type of expressions such as literals, arithmetic, predicate and
+ * function expression. Since comparison test in {@link SQLCorrectnessIT} is enforced, this kind of
+ * manual written IT class will be focused on anomaly case test.
  */
 @Ignore
 public class ExpressionIT extends RestIntegTestCase {
 
-  @Rule
-  public ExpectedException exceptionRule = ExpectedException.none();
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
   @Override
   protected void init() throws Exception {
@@ -44,8 +42,7 @@ public ResponseExceptionAssertion expectResponseException() {
 
   /**
    * Response exception assertion helper to assert property value in OpenSearch ResponseException
-   * and Response inside. This serves as syntax sugar to improve the readability of test
-   * code.
+   * and Response inside. This serves as syntax sugar to improve the readability of test code.
    */
   private static class ResponseExceptionAssertion {
     private final ExpectedException exceptionRule;
@@ -57,9 +54,12 @@ private ResponseExceptionAssertion(ExpectedException exceptionRule) {
     }
 
     ResponseExceptionAssertion hasStatusCode(int expected) {
-      exceptionRule.expect(featureValueOf("statusCode", is(expected),
-          (Function<ResponseException, Integer>) e ->
-              e.getResponse().getStatusLine().getStatusCode()));
+      exceptionRule.expect(
+          featureValueOf(
+              "statusCode",
+              is(expected),
+              (Function<ResponseException, Integer>)
+                  e -> e.getResponse().getStatusLine().getStatusCode()));
       return this;
     }
 
@@ -83,5 +83,4 @@ private static Response executeQuery(String query) throws IOException {
 
     return client().performRequest(request);
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/GeopointFormatsIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/GeopointFormatsIT.java
new file mode 100644
index 0000000000..f25eeec241
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/GeopointFormatsIT.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.schema;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
+import static org.opensearch.sql.util.MatcherUtils.verifySchema;
+
+import java.io.IOException;
+import java.util.Map;
+import org.apache.commons.lang3.tuple.Pair;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+
+public class GeopointFormatsIT extends SQLIntegTestCase {
+
+  @Override
+  public void init() throws Exception {
+    loadIndex(Index.GEOPOINTS);
+  }
+
+  @Test
+  public void testReadingGeopoints() throws IOException {
+    String query = String.format("SELECT point FROM %s LIMIT 5", Index.GEOPOINTS.getName());
+    JSONObject result = executeJdbcRequest(query);
+    verifySchema(result, schema("point", null, "geo_point"));
+    verifyDataRows(
+        result,
+        rows(Map.of("lon", 74, "lat", 40.71)),
+        rows(Map.of("lon", 74, "lat", 40.71)),
+        rows(Map.of("lon", 74, "lat", 40.71)),
+        rows(Map.of("lon", 74, "lat", 40.71)),
+        rows(Map.of("lon", 74, "lat", 40.71)));
+  }
+
+  private static final double TOLERANCE = 1E-5;
+
+  public void testReadingGeoHash() throws IOException {
+    String query = String.format("SELECT point FROM %s WHERE _id='6'", Index.GEOPOINTS.getName());
+    JSONObject result = executeJdbcRequest(query);
+    verifySchema(result, schema("point", null, "geo_point"));
+    Pair<Double, Double> point = getGeoValue(result);
+    assertEquals(40.71, point.getLeft(), TOLERANCE);
+    assertEquals(74, point.getRight(), TOLERANCE);
+  }
+
+  private Pair<Double, Double> getGeoValue(JSONObject result) {
+    JSONObject geoRaw =
+        (JSONObject) ((JSONArray) ((JSONArray) result.get("datarows")).get(0)).get(0);
+    double lat = geoRaw.getDouble("lat");
+    double lon = geoRaw.getDouble("lon");
+    return Pair.of(lat, lon);
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/HighlightFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/HighlightFunctionIT.java
index 809e2dc7c5..d0f890526b 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/HighlightFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/HighlightFunctionIT.java
@@ -11,12 +11,12 @@
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
 import com.google.common.collect.ImmutableMap;
+import java.util.List;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 import org.opensearch.sql.legacy.TestsConstants;
-import java.util.List;
 
 public class HighlightFunctionIT extends SQLIntegTestCase {
 
@@ -30,90 +30,126 @@ public void single_highlight_test() {
     String query = "SELECT Tags, highlight('Tags') FROM %s WHERE match(Tags, 'yeast') LIMIT 1";
     JSONObject response = executeJdbcRequest(String.format(query, TestsConstants.TEST_INDEX_BEER));
 
-    verifySchema(response, schema("Tags", null, "text"),
-        schema("highlight('Tags')", null, "nested"));
+    verifySchema(
+        response, schema("Tags", null, "text"), schema("highlight('Tags')", null, "nested"));
     assertEquals(1, response.getInt("total"));
 
-    verifyDataRows(response,
-        rows("alcohol-level yeast home-brew champagne",
+    verifyDataRows(
+        response,
+        rows(
+            "alcohol-level yeast home-brew champagne",
             new JSONArray(List.of("alcohol-level <em>yeast</em> home-brew champagne"))));
   }
 
   @Test
   public void highlight_optional_arguments_test() {
-    String query = "SELECT highlight('Tags', pre_tags='<mark>', post_tags='</mark>') " +
-        "FROM %s WHERE match(Tags, 'yeast') LIMIT 1";
+    String query =
+        "SELECT highlight('Tags', pre_tags='<mark>', post_tags='</mark>') "
+            + "FROM %s WHERE match(Tags, 'yeast') LIMIT 1";
     JSONObject response = executeJdbcRequest(String.format(query, TestsConstants.TEST_INDEX_BEER));
 
-    verifySchema(response, schema("highlight('Tags', pre_tags='<mark>', post_tags='</mark>')",
-            null, "nested"));
+    verifySchema(
+        response,
+        schema("highlight('Tags', pre_tags='<mark>', post_tags='</mark>')", null, "nested"));
 
     assertEquals(1, response.getInt("total"));
 
-    verifyDataRows(response,
+    verifyDataRows(
+        response,
         rows(new JSONArray(List.of("alcohol-level <mark>yeast</mark> home-brew champagne"))));
   }
 
   @Test
   public void highlight_multiple_optional_arguments_test() {
-    String query = "SELECT highlight(Title), highlight(Body, pre_tags='<mark style=\\\"background-color: " +
-        "green;\\\">', post_tags='</mark>') FROM %s WHERE multi_match([Title, Body], 'IPA') LIMIT 1";
+    String query =
+        "SELECT highlight(Title), highlight(Body, pre_tags='<mark style=\\\"background-color:"
+            + " green;\\\">', post_tags='</mark>') FROM %s WHERE multi_match([Title, Body], 'IPA')"
+            + " LIMIT 1";
     JSONObject response = executeJdbcRequest(String.format(query, TestsConstants.TEST_INDEX_BEER));
 
-    verifySchema(response, schema("highlight(Title)", null, "nested"),
-        schema("highlight(Body, pre_tags='<mark style=\"background-color: green;\">', " +
-                "post_tags='</mark>')", null, "nested"));
-
-    assertEquals(1, response.getInt("total"));
-
-    verifyDataRows(response, rows(new JSONArray(List.of("What are the differences between an <em>IPA</em>" +
-            " and its variants?")),
-        new JSONArray(List.of("<p>I know what makes an <mark style=\"background-color: green;\">IPA</mark>" +
-                " an <mark style=" +
-            "\"background-color: green;\">IPA</mark>, but what are the unique characteristics of it's" +
-                " common variants?",
-            "To be specific, the ones I'm interested in are Double <mark style=\"background-color:" +
-                " green;\">IPA</mark> " +
-                "and Black <mark style=\"background-color: green;\">IPA</mark>, but general differences" +
-                " between"))));
+    verifySchema(
+        response,
+        schema("highlight(Title)", null, "nested"),
+        schema(
+            "highlight(Body, pre_tags='<mark style=\"background-color: green;\">', "
+                + "post_tags='</mark>')",
+            null,
+            "nested"));
+
+    assertEquals(1, response.getInt("size"));
+
+    verifyDataRows(
+        response,
+        rows(
+            new JSONArray(
+                List.of("What are the differences between an <em>IPA</em>" + " and its variants?")),
+            new JSONArray(
+                List.of(
+                    "<p>I know what makes an <mark style=\"background-color: green;\">IPA</mark> an"
+                        + " <mark style=\"background-color: green;\">IPA</mark>, but what are the"
+                        + " unique characteristics of it's common variants?",
+                    "To be specific, the ones I'm interested in are Double <mark"
+                        + " style=\"background-color: green;\">IPA</mark> and Black <mark"
+                        + " style=\"background-color: green;\">IPA</mark>, but general differences"
+                        + " between"))));
   }
 
   @Test
   public void multiple_highlight_test() {
-    String query = "SELECT highlight(Title), highlight(Tags) FROM %s WHERE MULTI_MATCH([Title, Tags], 'hops') LIMIT 1";
+    String query =
+        "SELECT highlight(Title), highlight(Tags) FROM %s WHERE MULTI_MATCH([Title, Tags], 'hops')"
+            + " LIMIT 1";
     JSONObject response = executeJdbcRequest(String.format(query, TestsConstants.TEST_INDEX_BEER));
-    verifySchema(response, schema("highlight(Title)", null, "nested"),
+    verifySchema(
+        response,
+        schema("highlight(Title)", null, "nested"),
         schema("highlight(Tags)", null, "nested"));
     assertEquals(1, response.getInt("total"));
 
-    verifyDataRows(response,
-        rows( new JSONArray(List.of("What uses do <em>hops</em> have outside of brewing?")),
+    verifyDataRows(
+        response,
+        rows(
+            new JSONArray(List.of("What uses do <em>hops</em> have outside of brewing?")),
             new JSONArray(List.of("<em>hops</em> history"))));
   }
 
   @Test
   public void wildcard_highlight_test() {
-    String query = "SELECT highlight('*itle') FROM %s WHERE MULTI_MATCH([Title, Tags], 'hops') LIMIT 1";
+    String query =
+        "SELECT highlight('*itle') FROM %s WHERE MULTI_MATCH([Title, Tags], 'hops') LIMIT 1";
     JSONObject response = executeJdbcRequest(String.format(query, TestsConstants.TEST_INDEX_BEER));
 
     verifySchema(response, schema("highlight('*itle')", null, "object"));
     assertEquals(1, response.getInt("total"));
 
-    verifyDataRows(response, rows(new JSONObject(ImmutableMap.of(
-        "Title", new JSONArray(List.of("What uses do <em>hops</em> have outside of brewing?"))))));
+    verifyDataRows(
+        response,
+        rows(
+            new JSONObject(
+                ImmutableMap.of(
+                    "Title",
+                    new JSONArray(
+                        List.of("What uses do <em>hops</em> have outside of brewing?"))))));
   }
 
   @Test
   public void wildcard_multi_field_highlight_test() {
-    String query = "SELECT highlight('T*') FROM %s WHERE MULTI_MATCH([Title, Tags], 'hops') LIMIT 1";
+    String query =
+        "SELECT highlight('T*') FROM %s WHERE MULTI_MATCH([Title, Tags], 'hops') LIMIT 1";
     JSONObject response = executeJdbcRequest(String.format(query, TestsConstants.TEST_INDEX_BEER));
 
     verifySchema(response, schema("highlight('T*')", null, "object"));
     assertEquals(1, response.getInt("total"));
 
-    verifyDataRows(response, rows(new JSONObject(ImmutableMap.of(
-        "Title", new JSONArray(List.of("What uses do <em>hops</em> have outside of brewing?")),
-        "Tags", new JSONArray(List.of("<em>hops</em> history"))))));
+    verifyDataRows(
+        response,
+        rows(
+            new JSONObject(
+                ImmutableMap.of(
+                    "Title",
+                        new JSONArray(
+                            List.of("What uses do <em>hops</em> have outside of brewing?")),
+                    "Tags", new JSONArray(List.of("<em>hops</em> history"))))));
   }
 
   @Test
@@ -124,9 +160,15 @@ public void highlight_all_test() {
     verifySchema(response, schema("highlight('*')", null, "object"));
     assertEquals(1, response.getInt("total"));
 
-    verifyDataRows(response, rows(new JSONObject(ImmutableMap.of(
-        "Title", new JSONArray(List.of("What uses do <em>hops</em> have outside of brewing?")),
-        "Tags", new JSONArray(List.of("<em>hops</em> history"))))));
+    verifyDataRows(
+        response,
+        rows(
+            new JSONObject(
+                ImmutableMap.of(
+                    "Title",
+                        new JSONArray(
+                            List.of("What uses do <em>hops</em> have outside of brewing?")),
+                    "Tags", new JSONArray(List.of("<em>hops</em> history"))))));
   }
 
   @Test
@@ -136,14 +178,23 @@ public void highlight_no_limit_test() {
     verifySchema(response, schema("highlight(Body)", null, "nested"));
     assertEquals(2, response.getInt("total"));
 
-    verifyDataRows(response, rows(new JSONArray(List.of("Boiling affects <em>hops</em>, by boiling" +
-            " off the aroma and extracting more of the organic acids that provide"))),
-
-        rows(new JSONArray(List.of("<p>Do <em>hops</em> have (or had in the past) any use outside of brewing beer?",
-            "when-was-the-first-beer-ever-brewed\">dating first modern beers</a> we have the first record" +
-                " of cultivating <em>hops</em>",
-            "predating the first record of use of <em>hops</em> in beer by nearly a century.",
-            "Could the <em>hops</em> have been cultivated for any other purpose than brewing, " +
-                "or can we safely assume if they"))));
+    verifyDataRows(
+        response,
+        rows(
+            new JSONArray(
+                List.of(
+                    "Boiling affects <em>hops</em>, by boiling"
+                        + " off the aroma and extracting more of the organic acids that provide"))),
+        rows(
+            new JSONArray(
+                List.of(
+                    "<p>Do <em>hops</em> have (or had in the past) any use outside of brewing"
+                        + " beer?",
+                    "when-was-the-first-beer-ever-brewed\">dating first modern beers</a> we have"
+                        + " the first record of cultivating <em>hops</em>",
+                    "predating the first record of use of <em>hops</em> in beer by nearly a"
+                        + " century.",
+                    "Could the <em>hops</em> have been cultivated for any other purpose than"
+                        + " brewing, or can we safely assume if they"))));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/IdentifierIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/IdentifierIT.java
index 591364ea19..2c1796f0c3 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/IdentifierIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/IdentifierIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.util.MatcherUtils.rows;
@@ -19,9 +18,7 @@
 import org.opensearch.client.Request;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 
-/**
- * Integration tests for identifiers including index and field name symbol.
- */
+/** Integration tests for identifiers including index and field name symbol. */
 public class IdentifierIT extends SQLIntegTestCase {
 
   @Test
@@ -46,12 +43,13 @@ public void testQuotedIndexNames() throws IOException {
 
   @Test
   public void testSpecialFieldName() throws IOException {
-    new Index("test")
-        .addDoc("{\"@timestamp\": 10, \"dimensions:major_version\": 30}");
-    final JSONObject result = new JSONObject(executeQuery("SELECT @timestamp, "
-        + "`dimensions:major_version` FROM test", "jdbc"));
+    new Index("test").addDoc("{\"@timestamp\": 10, \"dimensions:major_version\": 30}");
+    final JSONObject result =
+        new JSONObject(
+            executeQuery("SELECT @timestamp, " + "`dimensions:major_version` FROM test", "jdbc"));
 
-    verifySchema(result,
+    verifySchema(
+        result,
         schema("@timestamp", null, "long"),
         schema("dimensions:major_version", null, "long"));
     verifyDataRows(result, rows(10, 30));
@@ -64,6 +62,150 @@ public void testMultipleQueriesWithSpecialIndexNames() throws IOException {
     queryAndAssertTheDoc("SELECT * FROM test.two");
   }
 
+  @Test
+  public void testDoubleUnderscoreIdentifierTest() throws IOException {
+    new Index("test.twounderscores").addDoc("{\"__age\": 30}");
+    final JSONObject result =
+        new JSONObject(executeQuery("SELECT __age FROM test.twounderscores", "jdbc"));
+
+    verifySchema(result, schema("__age", null, "long"));
+    verifyDataRows(result, rows(30));
+  }
+
+  @Test
+  public void testMetafieldIdentifierTest() throws IOException {
+    // create an index, but the contents doesn't matter
+    String id = "12345";
+    String index = "test.metafields";
+    new Index(index).addDoc("{\"age\": 30}", id);
+
+    // Execute using field metadata values
+    final JSONObject result =
+        new JSONObject(
+            executeQuery(
+                "SELECT *, _id, _index, _score, _maxscore, _sort " + "FROM " + index, "jdbc"));
+
+    // Verify that the metadata values are returned when requested
+    verifySchema(
+        result,
+        schema("age", null, "long"),
+        schema("_id", null, "keyword"),
+        schema("_index", null, "keyword"),
+        schema("_score", null, "float"),
+        schema("_maxscore", null, "float"),
+        schema("_sort", null, "long"));
+    verifyDataRows(result, rows(30, id, index, 1.0, 1.0, -2));
+  }
+
+  @Test
+  public void testMetafieldIdentifierRoutingSelectTest() throws IOException {
+    // create an index, but the contents doesn't really matter
+    String index = "test.routing_select";
+    String mapping = "{\"_routing\": {\"required\": true }}";
+    new Index(index, mapping)
+        .addDocWithShardId("{\"age\": 31}", "test0", "test0")
+        .addDocWithShardId("{\"age\": 31}", "test1", "test1")
+        .addDocWithShardId("{\"age\": 32}", "test2", "test2")
+        .addDocWithShardId("{\"age\": 33}", "test3", "test3")
+        .addDocWithShardId("{\"age\": 34}", "test4", "test4")
+        .addDocWithShardId("{\"age\": 35}", "test5", "test5");
+
+    // Execute using field metadata values filtering on the routing shard hash id
+    final JSONObject result =
+        new JSONObject(
+            executeQuery("SELECT age, _id, _index, _routing " + "FROM " + index, "jdbc"));
+
+    // Verify that the metadata values are returned when requested
+    verifySchema(
+        result,
+        schema("age", null, "long"),
+        schema("_id", null, "keyword"),
+        schema("_index", null, "keyword"),
+        schema("_routing", null, "keyword"));
+    assertTrue(result.getJSONArray("schema").length() == 4);
+
+    var datarows = result.getJSONArray("datarows");
+    assertEquals(6, datarows.length());
+
+    // note that _routing in the SELECT clause returns the shard
+    for (int i = 0; i < 6; i++) {
+      assertEquals("test" + i, datarows.getJSONArray(i).getString(1));
+      assertEquals(index, datarows.getJSONArray(i).getString(2));
+      assertTrue(datarows.getJSONArray(i).getString(3).contains("[" + index + "]"));
+    }
+  }
+
+  @Test
+  public void testMetafieldIdentifierRoutingFilterTest() throws IOException {
+    // create an index, but the contents doesn't really matter
+    String index = "test.routing_filter";
+    String mapping = "{\"_routing\": {\"required\": true }}";
+    new Index(index, mapping)
+        .addDocWithShardId("{\"age\": 31}", "test1", "test1")
+        .addDocWithShardId("{\"age\": 32}", "test2", "test2")
+        .addDocWithShardId("{\"age\": 33}", "test3", "test3")
+        .addDocWithShardId("{\"age\": 34}", "test4", "test4")
+        .addDocWithShardId("{\"age\": 35}", "test5", "test5")
+        .addDocWithShardId("{\"age\": 36}", "test6", "test6");
+
+    // Execute using field metadata values filtering on the routing shard hash id
+    final JSONObject result =
+        new JSONObject(
+            executeQuery(
+                "SELECT _id, _index, _routing "
+                    + "FROM "
+                    + index
+                    + " "
+                    + "WHERE _routing = \\\"test4\\\"",
+                "jdbc"));
+
+    // Verify that the metadata values are returned when requested
+    verifySchema(
+        result,
+        schema("_id", null, "keyword"),
+        schema("_index", null, "keyword"),
+        schema("_routing", null, "keyword"));
+    assertTrue(result.getJSONArray("schema").length() == 3);
+
+    var datarows = result.getJSONArray("datarows");
+    assertEquals(1, datarows.length());
+
+    assertEquals("test4", datarows.getJSONArray(0).getString(0));
+    // note that _routing in the SELECT clause returns the shard, not the routing hash id
+    assertTrue(datarows.getJSONArray(0).getString(2).contains("[" + index + "]"));
+  }
+
+  @Test
+  public void testMetafieldIdentifierWithAliasTest() throws IOException {
+    // create an index, but the contents doesn't matter
+    String id = "99999";
+    String index = "test.aliasmetafields";
+    new Index(index).addDoc("{\"age\": 30}", id);
+
+    // Execute using field metadata values
+    final JSONObject result =
+        new JSONObject(
+            executeQuery(
+                "SELECT _id AS A, _index AS B, _score AS C, _maxscore AS D, _sort AS E "
+                    + "FROM "
+                    + index
+                    + " "
+                    + "WHERE _id = \\\""
+                    + id
+                    + "\\\"",
+                "jdbc"));
+
+    // Verify that the metadata values are returned when requested
+    verifySchema(
+        result,
+        schema("_id", "A", "keyword"),
+        schema("_index", "B", "keyword"),
+        schema("_score", "C", "float"),
+        schema("_maxscore", "D", "float"),
+        schema("_sort", "E", "long"));
+    verifyDataRows(result, rows(id, index, null, null, -2));
+  }
+
   private void createIndexWithOneDoc(String... indexNames) throws IOException {
     for (String indexName : indexNames) {
       new Index(indexName).addDoc("{\"age\": 30}");
@@ -76,9 +218,7 @@ private void queryAndAssertTheDoc(String sql) {
     verifyDataRows(result, rows(30));
   }
 
-  /**
-   * Index abstraction for test code readability.
-   */
+  /** Index abstraction for test code readability. */
   private static class Index {
 
     private final String indexName;
@@ -93,11 +233,35 @@ private static class Index {
       }
     }
 
+    Index(String indexName, String mapping) throws IOException {
+      this.indexName = indexName;
+
+      Request createIndex = new Request("PUT", "/" + indexName);
+      createIndex.setJsonEntity(mapping);
+      executeRequest(new Request("PUT", "/" + indexName));
+    }
+
     void addDoc(String doc) {
       Request indexDoc = new Request("POST", String.format("/%s/_doc?refresh=true", indexName));
       indexDoc.setJsonEntity(doc);
       performRequest(client(), indexDoc);
     }
-  }
 
+    public Index addDoc(String doc, String id) {
+      Request indexDoc =
+          new Request("POST", String.format("/%s/_doc/%s?refresh=true", indexName, id));
+      indexDoc.setJsonEntity(doc);
+      performRequest(client(), indexDoc);
+      return this;
+    }
+
+    public Index addDocWithShardId(String doc, String id, String routing) {
+      Request indexDoc =
+          new Request(
+              "POST", String.format("/%s/_doc/%s?refresh=true&routing=%s", indexName, id, routing));
+      indexDoc.setJsonEntity(doc);
+      performRequest(client(), indexDoc);
+      return this;
+    }
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/JdbcFormatIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/JdbcFormatIT.java
index 4b158d73df..f36992b1d0 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/JdbcFormatIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/JdbcFormatIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
@@ -23,11 +22,16 @@ protected void init() throws Exception {
 
   @Test
   public void testSimpleDataTypesInSchema() {
-    JSONObject response = new JSONObject(executeQuery(
-        "SELECT account_number, address, age, birthdate, city, male, state "
-            + "FROM " + TEST_INDEX_BANK, "jdbc"));
-
-    verifySchema(response,
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT account_number, address, age, birthdate, city, male, state "
+                    + "FROM "
+                    + TEST_INDEX_BANK,
+                "jdbc"));
+
+    verifySchema(
+        response,
         schema("account_number", "long"),
         schema("address", "text"),
         schema("age", "integer"),
@@ -39,10 +43,10 @@ public void testSimpleDataTypesInSchema() {
 
   @Test
   public void testAliasInSchema() {
-    JSONObject response = new JSONObject(executeQuery(
-        "SELECT account_number AS acc FROM " + TEST_INDEX_BANK, "jdbc"));
+    JSONObject response =
+        new JSONObject(
+            executeQuery("SELECT account_number AS acc FROM " + TEST_INDEX_BANK, "jdbc"));
 
     verifySchema(response, schema("account_number", "acc", "long"));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/LegacyAPICompatibilityIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/LegacyAPICompatibilityIT.java
index 1f85b2857f..e9c0fd2c55 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/LegacyAPICompatibilityIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/LegacyAPICompatibilityIT.java
@@ -24,9 +24,7 @@
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-/**
- * For backward compatibility, check if legacy API endpoints are accessible.
- */
+/** For backward compatibility, check if legacy API endpoints are accessible. */
 public class LegacyAPICompatibilityIT extends SQLIntegTestCase {
 
   @Override
@@ -56,8 +54,8 @@ public void explain() throws IOException {
 
   @Test
   public void closeCursor() throws IOException {
-    String sql = StringUtils.format(
-        "SELECT firstname FROM %s WHERE balance > 100", TEST_INDEX_ACCOUNT);
+    String sql =
+        StringUtils.format("SELECT firstname FROM %s WHERE balance > 100", TEST_INDEX_ACCOUNT);
     JSONObject result = new JSONObject(executeFetchQuery(sql, 50, "jdbc"));
 
     Request request = new Request("POST", LEGACY_CURSOR_CLOSE_ENDPOINT);
@@ -76,44 +74,36 @@ public void stats() throws IOException {
 
   @Test
   public void legacySettingsLegacyEndpoint() throws IOException {
-    String requestBody = "{"
-        + "  \"persistent\": {"
-        + "    \"opendistro.sql.query.slowlog\": \"10\""
-        + "  }"
-        + "}";
+    String requestBody =
+        "{" + "  \"persistent\": {" + "    \"opendistro.sql.query.slowlog\": \"10\"" + "  }" + "}";
     Response response = updateSetting(LEGACY_SQL_SETTINGS_API_ENDPOINT, requestBody);
     Assert.assertEquals(200, response.getStatusLine().getStatusCode());
   }
 
   @Test
   public void legacySettingNewEndpoint() throws IOException {
-    String requestBody = "{"
-        + "  \"persistent\": {"
-        + "    \"opendistro.query.size_limit\": \"100\""
-        + "  }"
-        + "}";
+    String requestBody =
+        "{" + "  \"persistent\": {" + "    \"opendistro.query.size_limit\": \"100\"" + "  }" + "}";
     Response response = updateSetting(SETTINGS_API_ENDPOINT, requestBody);
     Assert.assertEquals(200, response.getStatusLine().getStatusCode());
   }
 
   @Test
   public void newSettingsLegacyEndpoint() throws IOException {
-    String requestBody = "{"
-        + "  \"persistent\": {"
-        + "    \"plugins.sql.slowlog\": \"10\""
-        + "  }"
-        + "}";
+    String requestBody =
+        "{" + "  \"persistent\": {" + "    \"plugins.sql.slowlog\": \"10\"" + "  }" + "}";
     Response response = updateSetting(LEGACY_SQL_SETTINGS_API_ENDPOINT, requestBody);
     Assert.assertEquals(200, response.getStatusLine().getStatusCode());
   }
 
   @Test
   public void newSettingNewEndpoint() throws IOException {
-    String requestBody = "{"
-        + "  \"persistent\": {"
-        + "    \"plugins.query.metrics.rolling_interval\": \"80\""
-        + "  }"
-        + "}";
+    String requestBody =
+        "{"
+            + "  \"persistent\": {"
+            + "    \"plugins.query.metrics.rolling_interval\": \"80\""
+            + "  }"
+            + "}";
     Response response = updateSetting(SETTINGS_API_ENDPOINT, requestBody);
     Assert.assertEquals(200, response.getStatusLine().getStatusCode());
   }
@@ -130,5 +120,4 @@ private RequestOptions.Builder buildJsonOption() {
     restOptionsBuilder.addHeader("Content-Type", "application/json");
     return restOptionsBuilder;
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/LikeQueryIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/LikeQueryIT.java
index f0e82adb6f..c5ff50898a 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/LikeQueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/LikeQueryIT.java
@@ -3,19 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
-import org.json.JSONObject;
-import org.junit.Test;
-import org.opensearch.sql.legacy.SQLIntegTestCase;
-
-import java.io.IOException;
-
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_WILDCARD;
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 
+import java.io.IOException;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+
 public class LikeQueryIT extends SQLIntegTestCase {
   @Override
   protected void init() throws Exception {
@@ -24,9 +22,11 @@ protected void init() throws Exception {
 
   @Test
   public void test_like_in_select() throws IOException {
-    String query = "SELECT KeywordBody, KeywordBody LIKE 'test wildcard%' FROM " + TEST_INDEX_WILDCARD;
+    String query =
+        "SELECT KeywordBody, KeywordBody LIKE 'test wildcard%' FROM " + TEST_INDEX_WILDCARD;
     JSONObject result = executeJdbcRequest(query);
-    verifyDataRows(result,
+    verifyDataRows(
+        result,
         rows("test wildcard", true),
         rows("test wildcard in the end of the text%", true),
         rows("%test wildcard in the beginning of the text", false),
@@ -41,9 +41,11 @@ public void test_like_in_select() throws IOException {
 
   @Test
   public void test_like_in_select_with_escaped_percent() throws IOException {
-    String query = "SELECT KeywordBody, KeywordBody LIKE '\\\\%test wildcard%' FROM " + TEST_INDEX_WILDCARD;
+    String query =
+        "SELECT KeywordBody, KeywordBody LIKE '\\\\%test wildcard%' FROM " + TEST_INDEX_WILDCARD;
     JSONObject result = executeJdbcRequest(query);
-    verifyDataRows(result,
+    verifyDataRows(
+        result,
         rows("test wildcard", false),
         rows("test wildcard in the end of the text%", false),
         rows("%test wildcard in the beginning of the text", true),
@@ -58,9 +60,11 @@ public void test_like_in_select_with_escaped_percent() throws IOException {
 
   @Test
   public void test_like_in_select_with_escaped_underscore() throws IOException {
-    String query = "SELECT KeywordBody, KeywordBody LIKE '\\\\_test wildcard%' FROM " + TEST_INDEX_WILDCARD;
+    String query =
+        "SELECT KeywordBody, KeywordBody LIKE '\\\\_test wildcard%' FROM " + TEST_INDEX_WILDCARD;
     JSONObject result = executeJdbcRequest(query);
-    verifyDataRows(result,
+    verifyDataRows(
+        result,
         rows("test wildcard", false),
         rows("test wildcard in the end of the text%", false),
         rows("%test wildcard in the beginning of the text", false),
@@ -75,9 +79,13 @@ public void test_like_in_select_with_escaped_underscore() throws IOException {
 
   @Test
   public void test_like_in_where() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE KeywordBody LIKE 'test wildcard%'";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE KeywordBody LIKE 'test wildcard%'";
     JSONObject result = executeJdbcRequest(query);
-    verifyDataRows(result,
+    verifyDataRows(
+        result,
         rows("test wildcard"),
         rows("test wildcard in the end of the text%"),
         rows("test wildcard in % the middle of the text"),
@@ -89,18 +97,22 @@ public void test_like_in_where() throws IOException {
 
   @Test
   public void test_like_in_where_with_escaped_percent() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE KeywordBody LIKE '\\\\%test wildcard%'";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE KeywordBody LIKE '\\\\%test wildcard%'";
     JSONObject result = executeJdbcRequest(query);
-    verifyDataRows(result,
-        rows("%test wildcard in the beginning of the text"));
+    verifyDataRows(result, rows("%test wildcard in the beginning of the text"));
   }
 
   @Test
   public void test_like_in_where_with_escaped_underscore() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE KeywordBody LIKE '\\\\_test wildcard%'";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE KeywordBody LIKE '\\\\_test wildcard%'";
     JSONObject result = executeJdbcRequest(query);
-    verifyDataRows(result,
-        rows("_test wildcard in the beginning of the text"));
+    verifyDataRows(result, rows("_test wildcard in the beginning of the text"));
   }
 
   @Test
@@ -119,7 +131,8 @@ public void test_like_on_text_keyword_field_with_one_word() throws IOException {
 
   @Test
   public void test_like_on_text_keyword_field_with_greater_than_one_word() throws IOException {
-    String query = "SELECT * FROM " + TEST_INDEX_WILDCARD + " WHERE TextKeywordBody LIKE 'test wild*'";
+    String query =
+        "SELECT * FROM " + TEST_INDEX_WILDCARD + " WHERE TextKeywordBody LIKE 'test wild*'";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(7, result.getInt("total"));
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/MatchBoolPrefixIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/MatchBoolPrefixIT.java
index 1c959c5460..c81cc8e4f5 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/MatchBoolPrefixIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/MatchBoolPrefixIT.java
@@ -23,32 +23,30 @@ public void init() throws IOException {
 
   @Test
   public void query_matches_test() throws IOException {
-    String query = "SELECT phrase FROM "
-        + TEST_INDEX_PHRASE + " WHERE match_bool_prefix(phrase, 'quick')";
+    String query =
+        "SELECT phrase FROM " + TEST_INDEX_PHRASE + " WHERE match_bool_prefix(phrase, 'quick')";
     var result = new JSONObject(executeQuery(query, "jdbc"));
     verifySchema(result, schema("phrase", "text"));
 
-    verifyDataRows(result,
-        rows("quick fox"),
-        rows("quick fox here"));
+    verifyDataRows(result, rows("quick fox"), rows("quick fox here"));
   }
 
   @Test
   public void additional_parameters_test() throws IOException {
-    String query = "SELECT phrase FROM "
-        + TEST_INDEX_PHRASE + " WHERE match_bool_prefix(phrase, '2 test', minimum_should_match=1, fuzziness=2)";
+    String query =
+        "SELECT phrase FROM "
+            + TEST_INDEX_PHRASE
+            + " WHERE match_bool_prefix(phrase, '2 test', minimum_should_match=1, fuzziness=2)";
     var result = new JSONObject(executeQuery(query, "jdbc"));
     verifySchema(result, schema("phrase", "text"));
 
-    verifyDataRows(result,
-        rows("my test"),
-        rows("my test 2"));
+    verifyDataRows(result, rows("my test"), rows("my test 2"));
   }
 
   @Test
   public void no_matches_test() throws IOException {
-    String query = "SELECT * FROM "
-        + TEST_INDEX_PHRASE + " WHERE match_bool_prefix(phrase, 'rice')";
+    String query =
+        "SELECT * FROM " + TEST_INDEX_PHRASE + " WHERE match_bool_prefix(phrase, 'rice')";
     var result = new JSONObject(executeQuery(query, "jdbc"));
     assertEquals(0, result.getInt("total"));
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/MatchIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/MatchIT.java
index 09e3504e4a..5bde838e19 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/MatchIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/MatchIT.java
@@ -5,6 +5,7 @@
 
 package org.opensearch.sql.sql;
 
+import static org.hamcrest.Matchers.containsString;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.schema;
@@ -12,9 +13,13 @@
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
 import java.io.IOException;
+import java.util.Locale;
 import org.json.JSONObject;
+import org.junit.Assert;
 import org.junit.Test;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
+import org.opensearch.sql.legacy.TestsConstants;
+import org.opensearch.sql.legacy.utils.StringUtils;
 
 public class MatchIT extends SQLIntegTestCase {
   @Override
@@ -24,59 +29,170 @@ public void init() throws IOException {
 
   @Test
   public void match_in_where() throws IOException {
-    JSONObject result = executeJdbcRequest("SELECT firstname FROM " + TEST_INDEX_ACCOUNT + " WHERE match(lastname, 'Bates')");
+    JSONObject result =
+        executeJdbcRequest(
+            "SELECT firstname FROM " + TEST_INDEX_ACCOUNT + " WHERE match(lastname, 'Bates')");
     verifySchema(result, schema("firstname", "text"));
     verifyDataRows(result, rows("Nanette"));
   }
 
   @Test
   public void match_in_having() throws IOException {
-    JSONObject result = executeJdbcRequest("SELECT lastname FROM " + TEST_INDEX_ACCOUNT + " HAVING match(firstname, 'Nanette')");
+    JSONObject result =
+        executeJdbcRequest(
+            "SELECT lastname FROM " + TEST_INDEX_ACCOUNT + " HAVING match(firstname, 'Nanette')");
     verifySchema(result, schema("lastname", "text"));
     verifyDataRows(result, rows("Bates"));
   }
 
+  @Test
+  public void missing_field_test() {
+    String query =
+        StringUtils.format("SELECT * FROM %s WHERE match(invalid, 'Bates')", TEST_INDEX_ACCOUNT);
+    final RuntimeException exception =
+        expectThrows(RuntimeException.class, () -> executeJdbcRequest(query));
+
+    assertTrue(
+        exception
+            .getMessage()
+            .contains("can't resolve Symbol(namespace=FIELD_NAME, name=invalid) in type env"));
+
+    assertTrue(exception.getMessage().contains("SemanticCheckException"));
+  }
+
+  @Test
+  public void missing_quoted_field_test() {
+    String query =
+        StringUtils.format("SELECT * FROM %s WHERE match('invalid', 'Bates')", TEST_INDEX_ACCOUNT);
+    final RuntimeException exception =
+        expectThrows(RuntimeException.class, () -> executeJdbcRequest(query));
+
+    assertTrue(
+        exception
+            .getMessage()
+            .contains("can't resolve Symbol(namespace=FIELD_NAME, name=invalid) in type env"));
+
+    assertTrue(exception.getMessage().contains("SemanticCheckException"));
+  }
+
+  @Test
+  public void missing_backtick_field_test() {
+    String query =
+        StringUtils.format("SELECT * FROM %s WHERE match(`invalid`, 'Bates')", TEST_INDEX_ACCOUNT);
+    final RuntimeException exception =
+        expectThrows(RuntimeException.class, () -> executeJdbcRequest(query));
+
+    assertTrue(
+        exception
+            .getMessage()
+            .contains("can't resolve Symbol(namespace=FIELD_NAME, name=invalid) in type env"));
+
+    assertTrue(exception.getMessage().contains("SemanticCheckException"));
+  }
+
   @Test
   public void matchquery_in_where() throws IOException {
-    JSONObject result = executeJdbcRequest("SELECT firstname FROM " + TEST_INDEX_ACCOUNT + " WHERE matchquery(lastname, 'Bates')");
+    JSONObject result =
+        executeJdbcRequest(
+            "SELECT firstname FROM " + TEST_INDEX_ACCOUNT + " WHERE matchquery(lastname, 'Bates')");
     verifySchema(result, schema("firstname", "text"));
     verifyDataRows(result, rows("Nanette"));
   }
 
   @Test
   public void matchquery_in_having() throws IOException {
-    JSONObject result = executeJdbcRequest("SELECT lastname FROM " + TEST_INDEX_ACCOUNT + " HAVING matchquery(firstname, 'Nanette')");
+    JSONObject result =
+        executeJdbcRequest(
+            "SELECT lastname FROM "
+                + TEST_INDEX_ACCOUNT
+                + " HAVING matchquery(firstname, 'Nanette')");
     verifySchema(result, schema("lastname", "text"));
     verifyDataRows(result, rows("Bates"));
   }
 
   @Test
   public void match_query_in_where() throws IOException {
-    JSONObject result = executeJdbcRequest("SELECT firstname FROM " + TEST_INDEX_ACCOUNT + " WHERE match_query(lastname, 'Bates')");
+    JSONObject result =
+        executeJdbcRequest(
+            "SELECT firstname FROM "
+                + TEST_INDEX_ACCOUNT
+                + " WHERE match_query(lastname, 'Bates')");
     verifySchema(result, schema("firstname", "text"));
     verifyDataRows(result, rows("Nanette"));
   }
 
   @Test
   public void match_query_in_having() throws IOException {
-    JSONObject result = executeJdbcRequest(
-        "SELECT lastname FROM " + TEST_INDEX_ACCOUNT + " HAVING match_query(firstname, 'Nanette')");
+    JSONObject result =
+        executeJdbcRequest(
+            "SELECT lastname FROM "
+                + TEST_INDEX_ACCOUNT
+                + " HAVING match_query(firstname, 'Nanette')");
+    verifySchema(result, schema("lastname", "text"));
+    verifyDataRows(result, rows("Bates"));
+  }
+
+  @Test
+  public void match_aliases_return_the_same_results() throws IOException {
+    String query1 =
+        "SELECT lastname FROM " + TEST_INDEX_ACCOUNT + " HAVING match(firstname, 'Nanette')";
+    JSONObject result1 = executeJdbcRequest(query1);
+    String query2 =
+        "SELECT lastname FROM " + TEST_INDEX_ACCOUNT + " HAVING matchquery(firstname, 'Nanette')";
+    JSONObject result2 = executeJdbcRequest(query2);
+    String query3 =
+        "SELECT lastname FROM " + TEST_INDEX_ACCOUNT + " HAVING match_query(firstname, 'Nanette')";
+    JSONObject result3 = executeJdbcRequest(query3);
+    assertEquals(result1.getInt("total"), result2.getInt("total"));
+    assertEquals(result1.getInt("total"), result3.getInt("total"));
+  }
+
+  @Test
+  public void match_query_alternate_syntax() throws IOException {
+    JSONObject result =
+        executeJdbcRequest(
+            "SELECT lastname FROM "
+                + TEST_INDEX_ACCOUNT
+                + " WHERE lastname = match_query('Bates')");
     verifySchema(result, schema("lastname", "text"));
     verifyDataRows(result, rows("Bates"));
   }
 
   @Test
-  public void alternate_syntaxes_return_the_same_results() throws IOException {
-    String query1 = "SELECT lastname FROM "
-        + TEST_INDEX_ACCOUNT + " HAVING match(firstname, 'Nanette')";
+  public void matchquery_alternate_syntax() throws IOException {
+    JSONObject result =
+        executeJdbcRequest(
+            "SELECT lastname FROM " + TEST_INDEX_ACCOUNT + " WHERE lastname = matchquery('Bates')");
+    verifySchema(result, schema("lastname", "text"));
+    verifyDataRows(result, rows("Bates"));
+  }
+
+  @Test
+  public void match_alternate_syntaxes_return_the_same_results() throws IOException {
+    String query1 = "SELECT * FROM " + TEST_INDEX_ACCOUNT + " WHERE match(firstname, 'Nanette')";
     JSONObject result1 = executeJdbcRequest(query1);
-    String query2 = "SELECT lastname FROM "
-        + TEST_INDEX_ACCOUNT + " HAVING matchquery(firstname, 'Nanette')";
+    String query2 =
+        "SELECT * FROM " + TEST_INDEX_ACCOUNT + " WHERE firstname = match_query('Nanette')";
     JSONObject result2 = executeJdbcRequest(query2);
-    String query3 = "SELECT lastname FROM "
-        + TEST_INDEX_ACCOUNT + " HAVING match_query(firstname, 'Nanette')";
+    String query3 =
+        "SELECT * FROM " + TEST_INDEX_ACCOUNT + " WHERE firstname = matchquery('Nanette')";
     JSONObject result3 = executeJdbcRequest(query3);
     assertEquals(result1.getInt("total"), result2.getInt("total"));
     assertEquals(result1.getInt("total"), result3.getInt("total"));
   }
+
+  @Test
+  public void matchPhraseQueryTest() throws IOException {
+    final String result =
+        explainQuery(
+            String.format(
+                Locale.ROOT,
+                "select address from %s where address= matchPhrase('671 Bristol Street')  order by"
+                    + " _score desc limit 3",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result,
+        containsString(
+            "{\\\"match_phrase\\\":{\\\"address\\\":{\\\"query\\\":\\\"671 Bristol Street\\\""));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/MatchPhraseIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/MatchPhraseIT.java
index b870a60604..d08149aa96 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/MatchPhraseIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/MatchPhraseIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_PHRASE;
@@ -51,7 +50,7 @@ public void test_match_phrase_with_slop() throws IOException {
   }
 
   @Test
-  public void test_alternate_syntax_for_match_phrase_returns_same_result() throws IOException {
+  public void test_aliases_for_match_phrase_returns_same_result() throws IOException {
     String query1 = "SELECT phrase FROM %s WHERE matchphrase(phrase, 'quick fox')";
     String query2 = "SELECT phrase FROM %s WHERE match_phrase(phrase, 'quick fox')";
     String query3 = "SELECT phrase FROM %s WHERE matchphrasequery(phrase, 'quick fox')";
@@ -61,4 +60,30 @@ public void test_alternate_syntax_for_match_phrase_returns_same_result() throws
     assertTrue(result1.similar(result2));
     assertTrue(result1.similar(result3));
   }
+
+  @Test
+  public void match_phrase_alternate_syntax() throws IOException {
+    String query = "SELECT phrase FROM %s WHERE phrase = match_phrase('quick fox')";
+    JSONObject result = executeJdbcRequest(String.format(query, TEST_INDEX_PHRASE));
+    verifyDataRows(result, rows("quick fox"), rows("quick fox here"));
+  }
+
+  @Test
+  public void matchphrase_alternate_syntax() throws IOException {
+    String query = "SELECT phrase FROM %s WHERE phrase = matchphrase('quick fox')";
+    JSONObject result = executeJdbcRequest(String.format(query, TEST_INDEX_PHRASE));
+    verifyDataRows(result, rows("quick fox"), rows("quick fox here"));
+  }
+
+  @Test
+  public void match_phrase_alternate_syntaxes_return_the_same_results() throws IOException {
+    String query1 = "SELECT phrase FROM %s WHERE matchphrase(phrase, 'quick fox')";
+    String query2 = "SELECT phrase FROM %s WHERE phrase = matchphrase('quick fox')";
+    String query3 = "SELECT phrase FROM %s WHERE phrase = match_phrase('quick fox')";
+    JSONObject result1 = executeJdbcRequest(String.format(query1, TEST_INDEX_PHRASE));
+    JSONObject result2 = executeJdbcRequest(String.format(query2, TEST_INDEX_PHRASE));
+    JSONObject result3 = executeJdbcRequest(String.format(query3, TEST_INDEX_PHRASE));
+    assertTrue(result1.similar(result2));
+    assertTrue(result1.similar(result3));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/MatchPhrasePrefixIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/MatchPhrasePrefixIT.java
index dd2a8384d6..f181a18689 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/MatchPhrasePrefixIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/MatchPhrasePrefixIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BEER;
@@ -26,7 +25,8 @@ protected void init() throws Exception {
   public void required_parameters() throws IOException {
     String query = "SELECT Title FROM %s WHERE match_phrase_prefix(Title, 'champagne be')";
     JSONObject result = executeJdbcRequest(String.format(query, TEST_INDEX_BEER));
-    verifyDataRows(result,
+    verifyDataRows(
+        result,
         rows("Can old flat champagne be used for vinegar?"),
         rows("Elder flower champagne best to use natural yeast or add a wine yeast?"));
   }
@@ -34,9 +34,10 @@ public void required_parameters() throws IOException {
   @Test
   public void all_optional_parameters() throws IOException {
     // The values for optional parameters are valid but arbitrary.
-    String query = "SELECT Title FROM %s " +
-        "WHERE match_phrase_prefix(Title, 'flat champ', boost = 1.0, zero_terms_query='ALL', " +
-        "max_expansions = 2, analyzer=standard, slop=0)";
+    String query =
+        "SELECT Title FROM %s "
+            + "WHERE match_phrase_prefix(Title, 'flat champ', boost = 1.0, zero_terms_query='ALL', "
+            + "max_expansions = 2, analyzer=standard, slop=0)";
     JSONObject result = executeJdbcRequest(String.format(query, TEST_INDEX_BEER));
     verifyDataRows(result, rows("Can old flat champagne be used for vinegar?"));
   }
@@ -47,21 +48,22 @@ public void max_expansions_is_3() throws IOException {
     // It tells OpenSearch to consider only the first 3 terms that start with 'bottl'
     // In this dataset these are 'bottle-conditioning', 'bottling', 'bottles'.
 
-    String query = "SELECT Tags FROM %s " +
-        "WHERE match_phrase_prefix(Tags, 'draught bottl', max_expansions=3)";
+    String query =
+        "SELECT Tags FROM %s "
+            + "WHERE match_phrase_prefix(Tags, 'draught bottl', max_expansions=3)";
     JSONObject result = executeJdbcRequest(String.format(query, TEST_INDEX_BEER));
-    verifyDataRows(result, rows("brewing draught bottling"),
-        rows("draught bottles"));
+    verifyDataRows(result, rows("brewing draught bottling"), rows("draught bottles"));
   }
 
   @Test
   public void analyzer_english() throws IOException {
     // English analyzer removes 'in' and 'to' as they are common words.
     // This results in an empty query.
-    String query = "SELECT Title FROM %s " +
-        "WHERE match_phrase_prefix(Title, 'in to', analyzer=english)";
+    String query =
+        "SELECT Title FROM %s " + "WHERE match_phrase_prefix(Title, 'in to', analyzer=english)";
     JSONObject result = executeJdbcRequest(String.format(query, TEST_INDEX_BEER));
-    assertTrue("Expect English analyzer to filter out common words 'in' and 'to'",
+    assertTrue(
+        "Expect English analyzer to filter out common words 'in' and 'to'",
         result.getInt("total") == 0);
   }
 
@@ -69,8 +71,8 @@ public void analyzer_english() throws IOException {
   public void analyzer_standard() throws IOException {
     // Standard analyzer does not treat 'in' and 'to' as special terms.
     // This results in 'to' being used as a phrase prefix given us 'Tokyo'.
-    String query = "SELECT Title FROM %s " +
-        "WHERE match_phrase_prefix(Title, 'in to', analyzer=standard)";
+    String query =
+        "SELECT Title FROM %s " + "WHERE match_phrase_prefix(Title, 'in to', analyzer=standard)";
     JSONObject result = executeJdbcRequest(String.format(query, TEST_INDEX_BEER));
     verifyDataRows(result, rows("Local microbreweries and craft beer in Tokyo"));
   }
@@ -80,15 +82,15 @@ public void zero_term_query_all() throws IOException {
     // English analyzer removes 'in' and 'to' as they are common words.
     // zero_terms_query of 'ALL' causes all rows to be returned.
     // ORDER BY ... LIMIT helps make the test understandable.
-    String query = "SELECT Title FROM %s" +
-        " WHERE match_phrase_prefix(Title, 'in to', analyzer=english, zero_terms_query='ALL')" +
-        " ORDER BY Title DESC" +
-        " LIMIT 1";
+    String query =
+        "SELECT Title FROM %s"
+            + " WHERE match_phrase_prefix(Title, 'in to', analyzer=english, zero_terms_query='ALL')"
+            + " ORDER BY Title DESC"
+            + " LIMIT 1";
     JSONObject result = executeJdbcRequest(String.format(query, TEST_INDEX_BEER));
     verifyDataRows(result, rows("was working great, now all foam"));
   }
 
-
   @Test
   public void slop_is_2() throws IOException {
     // When slop is 2, the terms are matched exactly in the order specified.
@@ -103,8 +105,6 @@ public void slop_is_3() throws IOException {
     // When slop is 3, results will include phrases where the query terms are transposed.
     String query = "SELECT Tags from %s where match_phrase_prefix(Tags, 'gas ta', slop=3)";
     JSONObject result = executeJdbcRequest(String.format(query, TEST_INDEX_BEER));
-    verifyDataRows(result,
-        rows("taste draught gas"),
-        rows("taste gas"));
+    verifyDataRows(result, rows("taste draught gas"), rows("taste gas"));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/MathematicalFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/MathematicalFunctionIT.java
index efa16ba9d7..60b7632ad0 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/MathematicalFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/MathematicalFunctionIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
@@ -34,12 +33,26 @@ public void init() throws Exception {
   @Test
   public void testPI() throws IOException {
     JSONObject result =
-            executeQuery(String.format("SELECT PI() FROM %s HAVING (COUNT(1) > 0)",TEST_INDEX_BANK) );
-    verifySchema(result,
-            schema("PI()", null, "double"));
+        executeQuery(String.format("SELECT PI() FROM %s HAVING (COUNT(1) > 0)", TEST_INDEX_BANK));
+    verifySchema(result, schema("PI()", null, "double"));
     verifyDataRows(result, rows(3.141592653589793));
   }
 
+  @Test
+  public void testCeil() throws IOException {
+    JSONObject result = executeQuery("select ceil(0)");
+    verifySchema(result, schema("ceil(0)", null, "long"));
+    verifyDataRows(result, rows(0));
+
+    result = executeQuery("select ceil(2147483646.9)");
+    verifySchema(result, schema("ceil(2147483646.9)", null, "long"));
+    verifyDataRows(result, rows(2147483647));
+
+    result = executeQuery("select ceil(92233720368547807.9)");
+    verifySchema(result, schema("ceil(92233720368547807.9)", null, "long"));
+    verifyDataRows(result, rows(92233720368547808L));
+  }
+
   @Test
   public void testConv() throws IOException {
     JSONObject result = executeQuery("select conv(11, 10, 16)");
@@ -51,6 +64,21 @@ public void testConv() throws IOException {
     verifyDataRows(result, rows("17"));
   }
 
+  @Test
+  public void testCosh() throws IOException {
+    JSONObject result = executeQuery("select cosh(1)");
+    verifySchema(result, schema("cosh(1)", null, "double"));
+    verifyDataRows(result, rows(1.543080634815244));
+
+    result = executeQuery("select cosh(-1)");
+    verifySchema(result, schema("cosh(-1)", null, "double"));
+    verifyDataRows(result, rows(1.543080634815244));
+
+    result = executeQuery("select cosh(1.5)");
+    verifySchema(result, schema("cosh(1.5)", null, "double"));
+    verifyDataRows(result, rows(2.352409615243247));
+  }
+
   @Test
   public void testCrc32() throws IOException {
     JSONObject result = executeQuery("select crc32('MySQL')");
@@ -65,6 +93,14 @@ public void testE() throws IOException {
     verifyDataRows(result, rows(Math.E));
   }
 
+  @Test
+  public void testExpm1() throws IOException {
+    JSONObject result =
+        executeQuery("select expm1(account_number) FROM " + TEST_INDEX_BANK + " LIMIT 2");
+    verifySchema(result, schema("expm1(account_number)", null, "double"));
+    verifyDataRows(result, rows(Math.expm1(1)), rows(Math.expm1(6)));
+  }
+
   @Test
   public void testMod() throws IOException {
     JSONObject result = executeQuery("select mod(3, 2)");
@@ -76,6 +112,87 @@ public void testMod() throws IOException {
     verifyDataRows(result, rows(1.1));
   }
 
+  @Test
+  public void testPow() throws IOException {
+    JSONObject result = executeQuery("select pow(3, 2)");
+    verifySchema(result, schema("pow(3, 2)", null, "double"));
+    verifyDataRows(result, rows(9.0));
+
+    result = executeQuery("select pow(0, 2)");
+    verifySchema(result, schema("pow(0, 2)", null, "double"));
+    verifyDataRows(result, rows(0.0));
+
+    result = executeQuery("select pow(3, 0)");
+    verifySchema(result, schema("pow(3, 0)", null, "double"));
+    verifyDataRows(result, rows(1.0));
+
+    result = executeQuery("select pow(-2, 3)");
+    verifySchema(result, schema("pow(-2, 3)", null, "double"));
+    verifyDataRows(result, rows(-8.0));
+
+    result = executeQuery("select pow(2, -2)");
+    verifySchema(result, schema("pow(2, -2)", null, "double"));
+    verifyDataRows(result, rows(0.25));
+
+    result = executeQuery("select pow(-2, -3)");
+    verifySchema(result, schema("pow(-2, -3)", null, "double"));
+    verifyDataRows(result, rows(-0.125));
+
+    result = executeQuery("select pow(-1, 0.5)");
+    verifySchema(result, schema("pow(-1, 0.5)", null, "double"));
+    verifyDataRows(result, rows((Object) null));
+  }
+
+  @Test
+  public void testPower() throws IOException {
+    JSONObject result = executeQuery("select power(3, 2)");
+    verifySchema(result, schema("power(3, 2)", null, "double"));
+    verifyDataRows(result, rows(9.0));
+
+    result = executeQuery("select power(0, 2)");
+    verifySchema(result, schema("power(0, 2)", null, "double"));
+    verifyDataRows(result, rows(0.0));
+
+    result = executeQuery("select power(3, 0)");
+    verifySchema(result, schema("power(3, 0)", null, "double"));
+    verifyDataRows(result, rows(1.0));
+
+    result = executeQuery("select power(-2, 3)");
+    verifySchema(result, schema("power(-2, 3)", null, "double"));
+    verifyDataRows(result, rows(-8.0));
+
+    result = executeQuery("select power(2, -2)");
+    verifySchema(result, schema("power(2, -2)", null, "double"));
+    verifyDataRows(result, rows(0.25));
+
+    result = executeQuery("select power(2, -2)");
+    verifySchema(result, schema("power(2, -2)", null, "double"));
+    verifyDataRows(result, rows(0.25));
+
+    result = executeQuery("select power(-2, -3)");
+    verifySchema(result, schema("power(-2, -3)", null, "double"));
+    verifyDataRows(result, rows(-0.125));
+  }
+
+  @Test
+  public void testRint() throws IOException {
+    JSONObject result = executeQuery("select rint(56.78)");
+    verifySchema(result, schema("rint(56.78)", null, "double"));
+    verifyDataRows(result, rows(57.0));
+
+    result = executeQuery("select rint(-56)");
+    verifySchema(result, schema("rint(-56)", null, "double"));
+    verifyDataRows(result, rows(-56.0));
+
+    result = executeQuery("select rint(3.5)");
+    verifySchema(result, schema("rint(3.5)", null, "double"));
+    verifyDataRows(result, rows(4.0));
+
+    result = executeQuery("select rint(-3.5)");
+    verifySchema(result, schema("rint(-3.5)", null, "double"));
+    verifyDataRows(result, rows(-4.0));
+  }
+
   @Test
   public void testRound() throws IOException {
     JSONObject result = executeQuery("select round(56.78)");
@@ -111,9 +228,6 @@ public void testRound() throws IOException {
     verifyDataRows(result, rows(-4.0));
   }
 
-  /**
-   * Test sign function with double value.
-   */
   @Test
   public void testSign() throws IOException {
     JSONObject result = executeQuery("select sign(1.1)");
@@ -125,6 +239,31 @@ public void testSign() throws IOException {
     verifyDataRows(result, rows(-1));
   }
 
+  @Test
+  public void testSignum() throws IOException {
+    JSONObject result = executeQuery("select signum(1.1)");
+    verifySchema(result, schema("signum(1.1)", null, "integer"));
+    verifyDataRows(result, rows(1));
+
+    result = executeQuery("select signum(-1.1)");
+    verifySchema(result, schema("signum(-1.1)", null, "integer"));
+    verifyDataRows(result, rows(-1));
+  }
+
+  public void testSinh() throws IOException {
+    JSONObject result = executeQuery("select sinh(1)");
+    verifySchema(result, schema("sinh(1)", null, "double"));
+    verifyDataRows(result, rows(1.1752011936438014));
+
+    result = executeQuery("select sinh(-1)");
+    verifySchema(result, schema("sinh(-1)", null, "double"));
+    verifyDataRows(result, rows(-1.1752011936438014));
+
+    result = executeQuery("select sinh(1.5)");
+    verifySchema(result, schema("sinh(1.5)", null, "double"));
+    verifyDataRows(result, rows(2.1292794550948173));
+  }
+
   @Test
   public void testTruncate() throws IOException {
     JSONObject result = executeQuery("select truncate(56.78, 1)");
@@ -142,6 +281,30 @@ public void testTruncate() throws IOException {
     result = executeQuery("select truncate(-56, -1)");
     verifySchema(result, schema("truncate(-56, -1)", null, "long"));
     verifyDataRows(result, rows(-50));
+
+    result = executeQuery("select truncate(33.33344, -1)");
+    verifySchema(result, schema("truncate(33.33344, -1)", null, "double"));
+    verifyDataRows(result, rows(30.0));
+
+    result = executeQuery("select truncate(33.33344, 2)");
+    verifySchema(result, schema("truncate(33.33344, 2)", null, "double"));
+    verifyDataRows(result, rows(33.33));
+
+    result = executeQuery("select truncate(33.33344, 100)");
+    verifySchema(result, schema("truncate(33.33344, 100)", null, "double"));
+    verifyDataRows(result, rows(33.33344));
+
+    result = executeQuery("select truncate(33.33344, 0)");
+    verifySchema(result, schema("truncate(33.33344, 0)", null, "double"));
+    verifyDataRows(result, rows(33.0));
+
+    result = executeQuery("select truncate(33.33344, 4)");
+    verifySchema(result, schema("truncate(33.33344, 4)", null, "double"));
+    verifyDataRows(result, rows(33.3334));
+
+    result = executeQuery(String.format("select truncate(%s, 6)", Math.PI));
+    verifySchema(result, schema(String.format("truncate(%s, 6)", Math.PI), null, "double"));
+    verifyDataRows(result, rows(3.141592));
   }
 
   @Test
@@ -151,19 +314,6 @@ public void testAtan() throws IOException {
     verifyDataRows(result, rows(Math.atan2(2, 3)));
   }
 
-  protected JSONObject executeQuery(String query) throws IOException {
-    Request request = new Request("POST", QUERY_API_ENDPOINT);
-    request.setJsonEntity(String.format(Locale.ROOT, "{\n" + "  \"query\": \"%s\"\n" + "}", query));
-
-    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
-    restOptionsBuilder.addHeader("Content-Type", "application/json");
-    request.setOptions(restOptionsBuilder);
-
-    Response response = client().performRequest(request);
-    return new JSONObject(getResponseBody(response));
-  }
-
-
   @Test
   public void testCbrt() throws IOException {
     JSONObject result = executeQuery("select cbrt(8)");
@@ -178,4 +328,44 @@ public void testCbrt() throws IOException {
     verifySchema(result, schema("cbrt(-27)", "double"));
     verifyDataRows(result, rows(-3.0));
   }
+
+  @Test
+  public void testLnReturnsNull() throws IOException {
+    JSONObject result = executeQuery("select ln(0), ln(-2)");
+    verifySchema(result, schema("ln(0)", "double"), schema("ln(-2)", "double"));
+    verifyDataRows(result, rows(null, null));
+  }
+
+  @Test
+  public void testLogReturnsNull() throws IOException {
+    JSONObject result = executeQuery("select log(0), log(-2)");
+    verifySchema(result, schema("log(0)", "double"), schema("log(-2)", "double"));
+    verifyDataRows(result, rows(null, null));
+  }
+
+  @Test
+  public void testLog10ReturnsNull() throws IOException {
+    JSONObject result = executeQuery("select log10(0), log10(-2)");
+    verifySchema(result, schema("log10(0)", "double"), schema("log10(-2)", "double"));
+    verifyDataRows(result, rows(null, null));
+  }
+
+  @Test
+  public void testLog2ReturnsNull() throws IOException {
+    JSONObject result = executeQuery("select log2(0), log2(-2)");
+    verifySchema(result, schema("log2(0)", "double"), schema("log2(-2)", "double"));
+    verifyDataRows(result, rows(null, null));
+  }
+
+  protected JSONObject executeQuery(String query) throws IOException {
+    Request request = new Request("POST", QUERY_API_ENDPOINT);
+    request.setJsonEntity(String.format(Locale.ROOT, "{\n" + "  \"query\": \"%s\"\n" + "}", query));
+
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+
+    Response response = client().performRequest(request);
+    return new JSONObject(getResponseBody(response));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/MetricsIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/MetricsIT.java
index 2a26eb19fe..4bbab4f167 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/MetricsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/MetricsIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
@@ -40,9 +39,7 @@ public void requestCount() throws IOException, InterruptedException {
   }
 
   private Request makeStatRequest() {
-    return new Request(
-        "GET", STATS_API_ENDPOINT
-    );
+    return new Request("GET", STATS_API_ENDPOINT);
   }
 
   private int requestTotal() throws IOException {
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/MultiMatchIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/MultiMatchIT.java
index 24ce45fd20..97763b2c8a 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/MultiMatchIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/MultiMatchIT.java
@@ -30,98 +30,144 @@ public void init() throws IOException {
 
   @Test
   public void test_mandatory_params() {
-    String query = "SELECT Id FROM " + TEST_INDEX_BEER
-        + " WHERE multi_match([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste')";
+    String query =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE multi_match([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(16, result.getInt("total"));
   }
 
   @Test
   public void test_all_params() {
-    String query = "SELECT Id FROM " + TEST_INDEX_BEER
-        + " WHERE multi_match(['Body', Tags], 'taste beer', operator='and', analyzer=english,"
-        + "auto_generate_synonyms_phrase_query=true, boost = 0.77, cutoff_frequency=0.33,"
-        + "fuzziness = 'AUTO:1,5', fuzzy_transpositions = false, lenient = true, max_expansions = 25,"
-        + "minimum_should_match = '2<-25% 9<-3', prefix_length = 7, tie_breaker = 0.3,"
-        + "type = most_fields, slop = 2, zero_terms_query = 'ALL');";
+    String query =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE multi_match(['Body', Tags], 'taste beer', operator='and',"
+            + " analyzer=english,auto_generate_synonyms_phrase_query=true, boost = 0.77,"
+            + " cutoff_frequency=0.33,fuzziness = 'AUTO:1,5', fuzzy_transpositions = false, lenient"
+            + " = true, max_expansions = 25,minimum_should_match = '2<-25% 9<-3', prefix_length ="
+            + " 7, tie_breaker = 0.3,type = most_fields, slop = 2, zero_terms_query = 'ALL');";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(10, result.getInt("total"));
   }
 
   @Test
   public void verify_wildcard_test() {
-    String query1 = "SELECT Id FROM " + TEST_INDEX_BEER
-        + " WHERE multi_match(['Tags'], 'taste')";
+    String query1 = "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE multi_match(['Tags'], 'taste')";
     JSONObject result1 = executeJdbcRequest(query1);
-    String query2 = "SELECT Id FROM " + TEST_INDEX_BEER
-        + " WHERE multi_match(['T*'], 'taste')";
+    String query2 = "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE multi_match(['T*'], 'taste')";
     JSONObject result2 = executeJdbcRequest(query2);
     assertNotEquals(result2.getInt("total"), result1.getInt("total"));
 
-    String query = "SELECT Id FROM " + TEST_INDEX_BEER
-        + " WHERE multi_match(['*Date'], '2014-01-22');";
+    String query =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE multi_match(['*Date'], '2014-01-22');";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(10, result.getInt("total"));
   }
 
   @Test
   public void test_multimatch_alternate_parameter_syntax() {
-    String query = "SELECT Tags FROM " + TEST_INDEX_BEER
-        + " WHERE multimatch('query'='taste', 'fields'='Tags')";
+    String query =
+        "SELECT Tags FROM "
+            + TEST_INDEX_BEER
+            + " WHERE multimatch('query'='taste', 'fields'='Tags')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(8, result.getInt("total"));
   }
 
   @Test
   public void test_multimatchquery_alternate_parameter_syntax() {
-    String query = "SELECT Tags FROM " + TEST_INDEX_BEER
-        + " WHERE multimatchquery(query='cicerone', fields='Tags')";
+    String query =
+        "SELECT Tags FROM "
+            + TEST_INDEX_BEER
+            + " WHERE multimatchquery(query='cicerone', fields='Tags')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(2, result.getInt("total"));
-    verifyDataRows(result, rows("serving cicerone restaurants"),
-        rows("taste cicerone"));
+    verifyDataRows(result, rows("serving cicerone restaurants"), rows("taste cicerone"));
   }
 
   @Test
   public void test_quoted_multi_match_alternate_parameter_syntax() {
-    String query = "SELECT Tags FROM " + TEST_INDEX_BEER
-        + " WHERE multi_match('query'='cicerone', 'fields'='Tags')";
+    String query =
+        "SELECT Tags FROM "
+            + TEST_INDEX_BEER
+            + " WHERE multi_match('query'='cicerone', 'fields'='Tags')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(2, result.getInt("total"));
-    verifyDataRows(result, rows("serving cicerone restaurants"),
-        rows("taste cicerone"));
+    verifyDataRows(result, rows("serving cicerone restaurants"), rows("taste cicerone"));
   }
 
   @Test
   public void test_multi_match_alternate_parameter_syntax() {
-    String query = "SELECT Tags FROM " + TEST_INDEX_BEER
-        + " WHERE multi_match(query='cicerone', fields='Tags')";
+    String query =
+        "SELECT Tags FROM "
+            + TEST_INDEX_BEER
+            + " WHERE multi_match(query='cicerone', fields='Tags')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(2, result.getInt("total"));
-    verifyDataRows(result, rows("serving cicerone restaurants"),
-        rows("taste cicerone"));
+    verifyDataRows(result, rows("serving cicerone restaurants"), rows("taste cicerone"));
   }
 
   @Test
   public void test_wildcard_multi_match_alternate_parameter_syntax() {
-    String query = "SELECT Body FROM " + TEST_INDEX_BEER
-        + " WHERE multi_match(query='IPA', fields='B*') LIMIT 1";
+    String query =
+        "SELECT Body FROM "
+            + TEST_INDEX_BEER
+            + " WHERE multi_match(query='IPA', fields='B*') LIMIT 1";
     JSONObject result = executeJdbcRequest(query);
-    verifyDataRows(result, rows("<p>I know what makes an IPA an IPA, but what are the unique" +
-        " characteristics of it's common variants? To be specific, the ones I'm interested in are Double IPA" +
-        " and Black IPA, but general differences between any other styles would be welcome too. </p>\n"));
+    verifyDataRows(
+        result,
+        rows(
+            "<p>I know what makes an IPA an IPA, but what are the unique characteristics of it's"
+                + " common variants? To be specific, the ones I'm interested in are Double IPA and"
+                + " Black IPA, but general differences between any other styles would be welcome"
+                + " too. </p>\n"));
   }
 
   @Test
   public void test_all_params_multimatchquery_alternate_parameter_syntax() {
-    String query = "SELECT Id FROM " + TEST_INDEX_BEER
-        + " WHERE multimatchquery(query='cicerone', fields='Tags', 'operator'='or', analyzer=english,"
-        + "auto_generate_synonyms_phrase_query=true, boost = 0.77, cutoff_frequency=0.33,"
-        + "fuzziness = 'AUTO:1,5', fuzzy_transpositions = false, lenient = true, max_expansions = 25,"
-        + "minimum_should_match = '2<-25% 9<-3', prefix_length = 7, tie_breaker = 0.3,"
-        + "type = most_fields, slop = 2, zero_terms_query = 'ALL');";
+    String query =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE multimatchquery(query='cicerone', fields='Tags', 'operator'='or',"
+            + " analyzer=english,auto_generate_synonyms_phrase_query=true, boost = 0.77,"
+            + " cutoff_frequency=0.33,fuzziness = 'AUTO:1,5', fuzzy_transpositions = false, lenient"
+            + " = true, max_expansions = 25,minimum_should_match = '2<-25% 9<-3', prefix_length ="
+            + " 7, tie_breaker = 0.3,type = most_fields, slop = 2, zero_terms_query = 'ALL');";
 
     JSONObject result = executeJdbcRequest(query);
     assertEquals(2, result.getInt("total"));
   }
+
+  @Test
+  public void multi_match_alternate_syntax() throws IOException {
+    String query =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE CreationDate = multi_match('2014-01-22');";
+    var result = new JSONObject(executeQuery(query, "jdbc"));
+    assertEquals(8, result.getInt("total"));
+  }
+
+  @Test
+  public void multimatch_alternate_syntax() throws IOException {
+    String query =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE CreationDate = multimatch('2014-01-22');";
+    var result = new JSONObject(executeQuery(query, "jdbc"));
+    assertEquals(8, result.getInt("total"));
+  }
+
+  @Test
+  public void multi_match_alternate_syntaxes_return_the_same_results() throws IOException {
+    String query1 =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE multi_match(['CreationDate'], '2014-01-22');";
+    String query2 =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE CreationDate = multi_match('2014-01-22');";
+    String query3 =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE CreationDate = multimatch('2014-01-22');";
+    var result1 = new JSONObject(executeQuery(query1, "jdbc"));
+    var result2 = new JSONObject(executeQuery(query2, "jdbc"));
+    var result3 = new JSONObject(executeQuery(query3, "jdbc"));
+    assertEquals(result1.getInt("total"), result2.getInt("total"));
+    assertEquals(result1.getInt("total"), result3.getInt("total"));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/NestedIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/NestedIT.java
new file mode 100644
index 0000000000..96bbae94e5
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/NestedIT.java
@@ -0,0 +1,594 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_MULTI_NESTED_TYPE;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_NESTED_SIMPLE;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_NESTED_TYPE;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_NESTED_TYPE_WITHOUT_ARRAYS;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_NESTED_WITH_NULLS;
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.schema;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
+import static org.opensearch.sql.util.MatcherUtils.verifySchema;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+
+public class NestedIT extends SQLIntegTestCase {
+  @Override
+  public void init() throws IOException {
+    loadIndex(Index.MULTI_NESTED);
+    loadIndex(Index.NESTED);
+    loadIndex(Index.NESTED_WITHOUT_ARRAYS);
+    loadIndex(Index.EMPLOYEE_NESTED);
+    loadIndex(Index.NESTED_WITH_NULLS);
+    loadIndex(Index.NESTED_SIMPLE);
+  }
+
+  @Test
+  public void nested_function_with_array_of_nested_field_test() {
+    String query =
+        "SELECT nested(message.info), nested(comment.data) FROM " + TEST_INDEX_NESTED_TYPE;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifyDataRows(
+        result,
+        rows("c", "ab"),
+        rows("a", "ab"),
+        rows("b", "aa"),
+        rows("c", "aa"),
+        rows("a", "ab"),
+        rows("zz", new JSONArray(List.of("aa", "bb"))));
+  }
+
+  @Test
+  public void nested_function_in_select_test() {
+    String query =
+        "SELECT nested(message.info), nested(comment.data), "
+            + "nested(message.dayOfWeek) FROM "
+            + TEST_INDEX_NESTED_TYPE_WITHOUT_ARRAYS;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(5, result.getInt("total"));
+    verifySchema(
+        result,
+        schema("nested(message.info)", null, "keyword"),
+        schema("nested(comment.data)", null, "keyword"),
+        schema("nested(message.dayOfWeek)", null, "long"));
+    verifyDataRows(
+        result,
+        rows("a", "ab", 1),
+        rows("b", "aa", 2),
+        rows("c", "aa", 1),
+        rows("c", "ab", 4),
+        rows("zz", "bb", 6));
+  }
+
+  // Has to be tested with JSON format when https://github.com/opensearch-project/sql/issues/1317
+  // gets resolved
+  @Disabled // TODO fix me when aggregation is supported
+  public void nested_function_in_an_aggregate_function_in_select_test() {
+    String query =
+        "SELECT sum(nested(message.dayOfWeek)) FROM " + TEST_INDEX_NESTED_TYPE_WITHOUT_ARRAYS;
+    JSONObject result = executeJdbcRequest(query);
+    verifyDataRows(result, rows(14));
+  }
+
+  // TODO Enable me when nested aggregation is supported
+  @Disabled
+  public void nested_function_with_arrays_in_an_aggregate_function_in_select_test() {
+    String query = "SELECT sum(nested(message.dayOfWeek)) FROM " + TEST_INDEX_NESTED_TYPE;
+    JSONObject result = executeJdbcRequest(query);
+    verifyDataRows(result, rows(19));
+  }
+
+  @Test
+  public void nested_function_in_a_function_in_select_test() {
+    String query =
+        "SELECT upper(nested(message.info)) FROM " + TEST_INDEX_NESTED_TYPE_WITHOUT_ARRAYS;
+    JSONObject result = executeJdbcRequest(query);
+
+    verifyDataRows(result, rows("A"), rows("B"), rows("C"), rows("C"), rows("ZZ"));
+  }
+
+  @Test
+  public void nested_all_function_in_a_function_in_select_test() {
+    String query =
+        "SELECT nested(message.*) FROM "
+            + TEST_INDEX_NESTED_TYPE_WITHOUT_ARRAYS
+            + " WHERE nested(message.info) = 'a'";
+    JSONObject result = executeJdbcRequest(query);
+    verifyDataRows(result, rows("e", 1, "a"));
+  }
+
+  @Test
+  public void invalid_multiple_nested_all_function_in_a_function_in_select_test() {
+    String query =
+        "SELECT nested(message.*), nested(message.info) FROM "
+            + TEST_INDEX_NESTED_TYPE_WITHOUT_ARRAYS;
+    RuntimeException result = assertThrows(RuntimeException.class, () -> executeJdbcRequest(query));
+    assertTrue(
+        result.getMessage().contains("IllegalArgumentException")
+            && result.getMessage().contains("Multiple entries with same key"));
+  }
+
+  @Test
+  public void nested_all_function_with_limit_test() {
+    String query =
+        "SELECT nested(message.*) FROM " + TEST_INDEX_NESTED_TYPE_WITHOUT_ARRAYS + " LIMIT 3";
+    JSONObject result = executeJdbcRequest(query);
+    verifyDataRows(result, rows("e", 1, "a"), rows("f", 2, "b"), rows("g", 1, "c"));
+  }
+
+  @Test
+  public void nested_function_with_array_of_multi_nested_field_test() {
+    String query = "SELECT nested(message.author.name) FROM " + TEST_INDEX_MULTI_NESTED_TYPE;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifyDataRows(result, rows("e"), rows("f"), rows("g"), rows("h"), rows("p"), rows("yy"));
+  }
+
+  @Test
+  public void nested_function_with_null_and_missing_fields_test() {
+    String query =
+        "SELECT nested(message.info), nested(comment.data) FROM " + TEST_INDEX_NESTED_WITH_NULLS;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(10, result.getInt("total"));
+    verifyDataRows(
+        result,
+        rows(null, "hh"),
+        rows("b", "aa"),
+        rows("c", "aa"),
+        rows("c", "ab"),
+        rows("a", "ab"),
+        rows("zz", new JSONArray(List.of("aa", "bb"))),
+        rows("zz", new JSONArray(List.of("aa", "bb"))),
+        rows(null, "ee"),
+        rows("a", "ab"),
+        rows("rr", new JSONArray(List.of("asdf", "sdfg"))));
+  }
+
+  @Test
+  public void nested_function_multiple_fields_with_matched_and_mismatched_paths_test() {
+    String query =
+        "SELECT nested(message.author), nested(message.dayOfWeek), nested(message.info),"
+            + " nested(comment.data), nested(comment.likes) FROM "
+            + TEST_INDEX_NESTED_TYPE;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifyDataRows(
+        result,
+        rows("e", 1, "a", "ab", 3),
+        rows("f", 2, "b", "aa", 2),
+        rows("g", 1, "c", "aa", 3),
+        rows("h", 4, "c", "ab", 1),
+        rows("i", 5, "a", "ab", 1),
+        rows("zz", 6, "zz", new JSONArray(List.of("aa", "bb")), 10));
+  }
+
+  @Test
+  public void nested_function_mixed_with_non_nested_type_test() {
+    String query = "SELECT nested(message.info), someField FROM " + TEST_INDEX_NESTED_TYPE;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifyDataRows(
+        result,
+        rows("a", "b"),
+        rows("b", "a"),
+        rows("c", "a"),
+        rows("c", "b"),
+        rows("a", "b"),
+        rows("zz", "a"));
+  }
+
+  @Test
+  public void nested_function_with_order_by_clause() {
+    String query =
+        "SELECT nested(message.info) FROM "
+            + TEST_INDEX_NESTED_TYPE
+            + " ORDER BY nested(message.info)";
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifyDataRows(result, rows("a"), rows("c"), rows("a"), rows("b"), rows("c"), rows("zz"));
+  }
+
+  @Test
+  public void nested_function_with_order_by_clause_desc() {
+    String query =
+        "SELECT nested(message.info) FROM "
+            + TEST_INDEX_NESTED_TYPE
+            + " ORDER BY nested(message.info, message) DESC";
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifyDataRows(result, rows("zz"), rows("c"), rows("c"), rows("a"), rows("b"), rows("a"));
+  }
+
+  @Test
+  public void nested_function_and_field_with_order_by_clause() {
+    String query =
+        "SELECT nested(message.info), myNum FROM "
+            + TEST_INDEX_NESTED_TYPE
+            + " ORDER BY nested(message.info, message), myNum";
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifyDataRows(
+        result,
+        rows("a", 1),
+        rows("c", 4),
+        rows("a", 4),
+        rows("b", 2),
+        rows("c", 3),
+        rows("zz", new JSONArray(List.of(3, 4))));
+  }
+
+  // Nested function in GROUP BY clause is not yet implemented for JDBC format. This test ensures
+  // that the V2 engine falls back to legacy implementation.
+  // TODO Fix the test when NESTED is supported in GROUP BY in the V2 engine.
+  @Test
+  public void nested_function_with_group_by_clause() {
+    String query =
+        "SELECT count(*) FROM " + TEST_INDEX_NESTED_TYPE + " GROUP BY nested(message.info)";
+    JSONObject result = executeJdbcRequest(query);
+
+    assertTrue(
+        result
+            .getJSONObject("error")
+            .get("details")
+            .toString()
+            .contains("Aggregation type nested is not yet implemented"));
+  }
+
+  // Nested function in HAVING clause is not yet implemented for JDBC format. This test ensures
+  // that the V2 engine falls back to legacy implementation.
+  // TODO Fix the test when NESTED is supported in HAVING in the V2 engine.
+  @Test
+  public void nested_function_with_having_clause() {
+    String query =
+        "SELECT count(*) FROM "
+            + TEST_INDEX_NESTED_TYPE
+            + " GROUP BY myNum HAVING nested(comment.likes) > 7";
+    JSONObject result = executeJdbcRequest(query);
+
+    assertTrue(
+        result
+            .getJSONObject("error")
+            .get("details")
+            .toString()
+            .contains(
+                "For more details, please send request for Json format to see the raw response from"
+                    + " OpenSearch engine."));
+  }
+
+  @Test
+  public void nested_function_mixed_with_non_nested_types_test() {
+    String query =
+        "SELECT nested(message.info), office, office.west FROM " + TEST_INDEX_MULTI_NESTED_TYPE;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifyDataRows(
+        result,
+        rows("a", new JSONObject(Map.of("south", 3, "west", "ab")), "ab"),
+        rows("b", new JSONObject(Map.of("south", 5, "west", "ff")), "ff"),
+        rows("c", new JSONObject(Map.of("south", 3, "west", "ll")), "ll"),
+        rows("d", null, null),
+        rows("i", null, null),
+        rows("zz", null, null));
+  }
+
+  @Test
+  public void nested_function_with_relevance_query() {
+    String query =
+        "SELECT nested(message.info), highlight(someField) FROM "
+            + TEST_INDEX_NESTED_TYPE
+            + " WHERE match(someField, 'b')";
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(3, result.getInt("total"));
+    verifyDataRows(
+        result,
+        rows("a", new JSONArray(List.of("<em>b</em>"))),
+        rows("c", new JSONArray(List.of("<em>b</em>"))),
+        rows("a", new JSONArray(List.of("<em>b</em>"))));
+  }
+
+  @Test
+  public void nested_with_non_nested_type_test() {
+    String query = "SELECT nested(someField) FROM " + TEST_INDEX_NESTED_TYPE;
+
+    Exception exception = assertThrows(RuntimeException.class, () -> executeJdbcRequest(query));
+    assertTrue(
+        exception
+            .getMessage()
+            .contains(
+                "{\n"
+                    + "  \"error\": {\n"
+                    + "    \"reason\": \"Invalid SQL query\",\n"
+                    + "    \"details\": \"Illegal nested field name: someField\",\n"
+                    + "    \"type\": \"IllegalArgumentException\"\n"
+                    + "  },\n"
+                    + "  \"status\": 400\n"
+                    + "}"));
+  }
+
+  @Test
+  public void nested_missing_path() {
+    String query = "SELECT nested(message.invalid) FROM " + TEST_INDEX_MULTI_NESTED_TYPE;
+
+    Exception exception = assertThrows(RuntimeException.class, () -> executeJdbcRequest(query));
+    assertTrue(
+        exception
+            .getMessage()
+            .contains(
+                "{\n"
+                    + "  \"error\": {\n"
+                    + "    \"reason\": \"Invalid SQL query\",\n"
+                    + "    \"details\": \"can't resolve Symbol(namespace=FIELD_NAME,"
+                    + " name=message.invalid) in type env\",\n"
+                    + "    \"type\": \"SemanticCheckException\"\n"
+                    + "  },\n"
+                    + "  \"status\": 400\n"
+                    + "}"));
+  }
+
+  @Test
+  public void nested_missing_path_argument() {
+    String query =
+        "SELECT nested(message.author.name, invalid) FROM " + TEST_INDEX_MULTI_NESTED_TYPE;
+
+    Exception exception = assertThrows(RuntimeException.class, () -> executeJdbcRequest(query));
+    assertTrue(
+        exception
+            .getMessage()
+            .contains(
+                "{\n"
+                    + "  \"error\": {\n"
+                    + "    \"reason\": \"Invalid SQL query\",\n"
+                    + "    \"details\": \"can't resolve Symbol(namespace=FIELD_NAME, name=invalid)"
+                    + " in type env\",\n"
+                    + "    \"type\": \"SemanticCheckException\"\n"
+                    + "  },\n"
+                    + "  \"status\": 400\n"
+                    + "}"));
+  }
+
+  @Test
+  public void test_nested_where_with_and_conditional() {
+    String query =
+        "SELECT nested(message.info), nested(message.author) FROM "
+            + TEST_INDEX_NESTED_TYPE
+            + " WHERE nested(message, message.info = 'a' AND message.author = 'e')";
+    JSONObject result = executeJdbcRequest(query);
+    assertEquals(1, result.getInt("total"));
+    verifyDataRows(result, rows("a", "e"));
+  }
+
+  @Test
+  public void test_nested_in_select_and_where_as_predicate_expression() {
+    String query =
+        "SELECT nested(message.info) FROM "
+            + TEST_INDEX_NESTED_TYPE
+            + " WHERE nested(message.info) = 'a'";
+    JSONObject result = executeJdbcRequest(query);
+    assertEquals(3, result.getInt("total"));
+    verifyDataRows(result, rows("a"), rows("c"), rows("a"));
+  }
+
+  @Test
+  public void test_nested_in_where_as_predicate_expression() {
+    String query =
+        "SELECT message.info FROM " + TEST_INDEX_NESTED_TYPE + " WHERE nested(message.info) = 'a'";
+    JSONObject result = executeJdbcRequest(query);
+    assertEquals(2, result.getInt("total"));
+    // Only first index of array is returned. Second index has 'a'
+    verifyDataRows(result, rows("a"), rows("c"));
+  }
+
+  @Test
+  public void test_nested_in_where_as_predicate_expression_with_like() {
+    String query =
+        "SELECT message.info FROM "
+            + TEST_INDEX_NESTED_TYPE
+            + " WHERE nested(message.info) LIKE 'a'";
+    JSONObject result = executeJdbcRequest(query);
+    assertEquals(2, result.getInt("total"));
+    // Only first index of array is returned. Second index has 'a'
+    verifyDataRows(result, rows("a"), rows("c"));
+  }
+
+  @Test
+  public void test_nested_in_where_as_predicate_expression_with_multiple_conditions() {
+    String query =
+        "SELECT message.info, comment.data, message.dayOfWeek FROM "
+            + TEST_INDEX_NESTED_TYPE
+            + " WHERE nested(message.info) = 'zz' OR nested(comment.data) = 'ab' AND"
+            + " nested(message.dayOfWeek) >= 4";
+    JSONObject result = executeJdbcRequest(query);
+    assertEquals(2, result.getInt("total"));
+    verifyDataRows(result, rows("c", "ab", 4), rows("zz", "aa", 6));
+  }
+
+  @Test
+  public void test_nested_in_where_as_predicate_expression_with_relevance_query() {
+    String query =
+        "SELECT comment.likes, someField FROM "
+            + TEST_INDEX_NESTED_TYPE
+            + " WHERE nested(comment.likes) = 10 AND match(someField, 'a')";
+    JSONObject result = executeJdbcRequest(query);
+    assertEquals(1, result.getInt("total"));
+    verifyDataRows(result, rows(10, "a"));
+  }
+
+  @Test
+  public void nested_function_all_subfields() {
+    String query = "SELECT nested(message.*) FROM " + TEST_INDEX_NESTED_TYPE;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifySchema(
+        result,
+        schema("nested(message.author)", null, "keyword"),
+        schema("nested(message.dayOfWeek)", null, "long"),
+        schema("nested(message.info)", null, "keyword"));
+    verifyDataRows(
+        result,
+        rows("e", 1, "a"),
+        rows("f", 2, "b"),
+        rows("g", 1, "c"),
+        rows("h", 4, "c"),
+        rows("i", 5, "a"),
+        rows("zz", 6, "zz"));
+  }
+
+  @Test
+  public void nested_function_all_subfields_and_specified_subfield() {
+    String query = "SELECT nested(message.*), nested(comment.data) FROM " + TEST_INDEX_NESTED_TYPE;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifySchema(
+        result,
+        schema("nested(message.author)", null, "keyword"),
+        schema("nested(message.dayOfWeek)", null, "long"),
+        schema("nested(message.info)", null, "keyword"),
+        schema("nested(comment.data)", null, "keyword"));
+    verifyDataRows(
+        result,
+        rows("e", 1, "a", "ab"),
+        rows("f", 2, "b", "aa"),
+        rows("g", 1, "c", "aa"),
+        rows("h", 4, "c", "ab"),
+        rows("i", 5, "a", "ab"),
+        rows("zz", 6, "zz", new JSONArray(List.of("aa", "bb"))));
+  }
+
+  @Test
+  public void nested_function_all_deep_nested_subfields() {
+    String query = "SELECT nested(message.author.address.*) FROM " + TEST_INDEX_MULTI_NESTED_TYPE;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifySchema(
+        result,
+        schema("nested(message.author.address.number)", null, "integer"),
+        schema("nested(message.author.address.street)", null, "keyword"));
+    verifyDataRows(
+        result,
+        rows(1, "bc"),
+        rows(2, "ab"),
+        rows(3, "sk"),
+        rows(4, "mb"),
+        rows(5, "on"),
+        rows(6, "qc"));
+  }
+
+  @Test
+  public void nested_function_all_subfields_for_two_nested_fields() {
+    String query = "SELECT nested(message.*), nested(comment.*) FROM " + TEST_INDEX_NESTED_TYPE;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifySchema(
+        result,
+        schema("nested(message.author)", null, "keyword"),
+        schema("nested(message.dayOfWeek)", null, "long"),
+        schema("nested(message.info)", null, "keyword"),
+        schema("nested(comment.data)", null, "keyword"),
+        schema("nested(comment.likes)", null, "long"));
+    verifyDataRows(
+        result,
+        rows("e", 1, "a", "ab", 3),
+        rows("f", 2, "b", "aa", 2),
+        rows("g", 1, "c", "aa", 3),
+        rows("h", 4, "c", "ab", 1),
+        rows("i", 5, "a", "ab", 1),
+        rows("zz", 6, "zz", new JSONArray(List.of("aa", "bb")), 10));
+  }
+
+  @Test
+  public void nested_function_all_subfields_and_non_nested_field() {
+    String query = "SELECT nested(message.*), myNum FROM " + TEST_INDEX_NESTED_TYPE;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(6, result.getInt("total"));
+    verifySchema(
+        result,
+        schema("nested(message.author)", null, "keyword"),
+        schema("nested(message.dayOfWeek)", null, "long"),
+        schema("nested(message.info)", null, "keyword"),
+        schema("myNum", null, "long"));
+    verifyDataRows(
+        result,
+        rows("e", 1, "a", 1),
+        rows("f", 2, "b", 2),
+        rows("g", 1, "c", 3),
+        rows("h", 4, "c", 4),
+        rows("i", 5, "a", 4),
+        rows("zz", 6, "zz", new JSONArray(List.of(3, 4))));
+  }
+
+  @Test
+  public void nested_function_with_date_types_as_object_arrays_within_arrays_test() {
+    String query = "SELECT nested(address.moveInDate) FROM " + TEST_INDEX_NESTED_SIMPLE;
+    JSONObject result = executeJdbcRequest(query);
+
+    assertEquals(11, result.getInt("total"));
+    verifySchema(result, schema("nested(address.moveInDate)", null, "object"));
+    verifyDataRows(
+        result,
+        rows(new JSONObject(Map.of("dateAndTime", "1984-04-12 09:07:42"))),
+        rows(
+            new JSONArray(
+                List.of(
+                    Map.of("dateAndTime", "2023-05-03 08:07:42"),
+                    Map.of("dateAndTime", "2001-11-11 04:07:44")))),
+        rows(new JSONObject(Map.of("dateAndTime", "1966-03-19 03:04:55"))),
+        rows(new JSONObject(Map.of("dateAndTime", "2011-06-01 01:01:42"))),
+        rows(new JSONObject(Map.of("dateAndTime", "1901-08-11 04:03:33"))),
+        rows(new JSONObject(Map.of("dateAndTime", "2023-05-03 08:07:42"))),
+        rows(new JSONObject(Map.of("dateAndTime", "2001-11-11 04:07:44"))),
+        rows(new JSONObject(Map.of("dateAndTime", "1977-07-13 09:04:41"))),
+        rows(new JSONObject(Map.of("dateAndTime", "1933-12-12 05:05:45"))),
+        rows(new JSONObject(Map.of("dateAndTime", "1909-06-17 01:04:21"))),
+        rows(new JSONArray(List.of(Map.of("dateAndTime", "2001-11-11 04:07:44")))));
+  }
+
+  @Test
+  public void nested_function_all_subfields_in_wrong_clause() {
+    String query = "SELECT * FROM " + TEST_INDEX_NESTED_TYPE + " ORDER BY nested(message.*)";
+
+    Exception exception = assertThrows(RuntimeException.class, () -> executeJdbcRequest(query));
+
+    assertTrue(
+        exception
+            .getMessage()
+            .contains(
+                ""
+                    + "{\n"
+                    + "  \"error\": {\n"
+                    + "    \"reason\": \"There was internal problem at backend\",\n"
+                    + "    \"details\": \"Invalid use of expression nested(message.*)\",\n"
+                    + "    \"type\": \"UnsupportedOperationException\"\n"
+                    + "  },\n"
+                    + "  \"status\": 500\n"
+                    + "}"));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/NowLikeFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/NowLikeFunctionIT.java
new file mode 100644
index 0000000000..547c88859e
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/NowLikeFunctionIT.java
@@ -0,0 +1,270 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import static com.carrotsearch.randomizedtesting.RandomizedTest.$;
+import static com.carrotsearch.randomizedtesting.RandomizedTest.$$;
+import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
+import static org.opensearch.sql.util.TestUtils.getResponseBody;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+import java.io.IOException;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Period;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
+import java.time.temporal.Temporal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.TimeZone;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.jupiter.api.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.client.Response;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+
+public class NowLikeFunctionIT extends SQLIntegTestCase {
+  @Override
+  public void init() throws Exception {
+    super.init();
+  }
+
+  // Integration test framework sets for OpenSearch instance a random timezone.
+  // If server's TZ doesn't match localhost's TZ, time measurements for `now` would differ.
+  // We should set localhost's TZ now and recover the value back in the end of the test.
+  private final TimeZone testTz = TimeZone.getDefault();
+  private final TimeZone systemTz = TimeZone.getTimeZone(System.getProperty("user.timezone"));
+
+  @Before
+  public void setTimeZone() {
+    TimeZone.setDefault(systemTz);
+  }
+
+  @After
+  public void resetTimeZone() {
+    TimeZone.setDefault(testTz);
+  }
+
+  private final String name;
+  private final Boolean hasFsp;
+  private final Boolean hasShortcut;
+  private final Boolean constValue;
+  private final Supplier<Temporal> referenceGetter;
+  private final BiFunction<CharSequence, DateTimeFormatter, Temporal> parser;
+  private final String serializationPatternStr;
+
+  public NowLikeFunctionIT(
+      @Name("name") String name,
+      @Name("hasFsp") Boolean hasFsp,
+      @Name("hasShortcut") Boolean hasShortcut,
+      @Name("constValue") Boolean constValue,
+      @Name("referenceGetter") Supplier<Temporal> referenceGetter,
+      @Name("parser") BiFunction<CharSequence, DateTimeFormatter, Temporal> parser,
+      @Name("serializationPatternStr") String serializationPatternStr) {
+    this.name = name;
+    this.hasFsp = hasFsp;
+    this.hasShortcut = hasShortcut;
+    this.constValue = constValue;
+    this.referenceGetter = referenceGetter;
+    this.parser = parser;
+    this.serializationPatternStr = serializationPatternStr;
+  }
+
+  @ParametersFactory(argumentFormatting = "%1$s")
+  public static Iterable<Object[]> compareTwoDates() {
+    return Arrays.asList(
+        $$(
+            $(
+                "now",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) LocalDateTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss"),
+            $(
+                "current_timestamp",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) LocalDateTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss"),
+            $(
+                "localtimestamp",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) LocalDateTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss"),
+            $(
+                "localtime",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) LocalDateTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss"),
+            $(
+                "sysdate",
+                true,
+                false,
+                false,
+                (Supplier<Temporal>) LocalDateTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss"),
+            $(
+                "curtime",
+                false,
+                false,
+                false,
+                (Supplier<Temporal>) LocalTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalTime::parse,
+                "HH:mm:ss"),
+            $(
+                "current_time",
+                false,
+                false,
+                false,
+                (Supplier<Temporal>) LocalTime::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalTime::parse,
+                "HH:mm:ss"),
+            $(
+                "curdate",
+                false,
+                false,
+                false,
+                (Supplier<Temporal>) LocalDate::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDate::parse,
+                "uuuu-MM-dd"),
+            $(
+                "current_date",
+                false,
+                false,
+                false,
+                (Supplier<Temporal>) LocalDate::now,
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDate::parse,
+                "uuuu-MM-dd"),
+            $(
+                "utc_date",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) (() -> utcDateTimeNow().toLocalDate()),
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDate::parse,
+                "uuuu-MM-dd"),
+            $(
+                "utc_time",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) (() -> utcDateTimeNow().toLocalTime()),
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalTime::parse,
+                "HH:mm:ss"),
+            $(
+                "utc_timestamp",
+                false,
+                false,
+                true,
+                (Supplier<Temporal>) (NowLikeFunctionIT::utcDateTimeNow),
+                (BiFunction<CharSequence, DateTimeFormatter, Temporal>) LocalDateTime::parse,
+                "uuuu-MM-dd HH:mm:ss")));
+  }
+
+  private long getDiff(Temporal sample, Temporal reference) {
+    if (sample instanceof LocalDate) {
+      return Period.between((LocalDate) sample, (LocalDate) reference).getDays();
+    }
+    return Duration.between(sample, reference).toSeconds();
+  }
+
+  public static LocalDateTime utcDateTimeNow() {
+    ZonedDateTime zonedDateTime = LocalDateTime.now().atZone(TimeZone.getDefault().toZoneId());
+    return zonedDateTime.withZoneSameInstant(ZoneId.of("UTC")).toLocalDateTime();
+  }
+
+  @Test
+  public void testNowLikeFunctions() throws IOException {
+    var serializationPattern =
+        new DateTimeFormatterBuilder()
+            .appendPattern(serializationPatternStr)
+            .optionalStart()
+            .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true)
+            .toFormatter();
+
+    Temporal reference = referenceGetter.get();
+    double delta = 2d; // acceptable time diff, secs
+    if (reference instanceof LocalDate)
+      delta = 1d; // Max date delta could be 1 if test runs on the very edge of two days
+    // We ignore probability of a test run on edge of month or year to simplify the checks
+
+    var calls =
+        new ArrayList<String>() {
+          {
+            add(name + "()");
+          }
+        };
+    if (hasShortcut) calls.add(name);
+    if (hasFsp) calls.add(name + "(0)");
+
+    // Column order is: func(), func, func(0)
+    //                   shortcut ^    fsp ^
+    JSONObject result = executeQuery("select " + String.join(", ", calls));
+
+    var rows = result.getJSONArray("datarows");
+    JSONArray firstRow = rows.getJSONArray(0);
+    for (int i = 0; i < rows.length(); i++) {
+      var row = rows.getJSONArray(i);
+      if (constValue) assertTrue(firstRow.similar(row));
+
+      int column = 0;
+      assertEquals(
+          0,
+          getDiff(reference, parser.apply(row.getString(column++), serializationPattern)),
+          delta);
+
+      if (hasShortcut) {
+        assertEquals(
+            0,
+            getDiff(reference, parser.apply(row.getString(column++), serializationPattern)),
+            delta);
+      }
+      if (hasFsp) {
+        assertEquals(
+            0,
+            getDiff(reference, parser.apply(row.getString(column), serializationPattern)),
+            delta);
+      }
+    }
+  }
+
+  protected JSONObject executeQuery(String query) throws IOException {
+    Request request = new Request("POST", QUERY_API_ENDPOINT);
+    request.setJsonEntity(String.format(Locale.ROOT, "{\n" + "  \"query\": \"%s\"\n" + "}", query));
+
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    request.setOptions(restOptionsBuilder);
+
+    Response response = client().performRequest(request);
+    return new JSONObject(getResponseBody(response));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/NullLiteralIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/NullLiteralIT.java
index b8bf0963b5..f885b6d4e0 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/NullLiteralIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/NullLiteralIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.util.MatcherUtils.rows;
@@ -34,28 +33,22 @@ public void testNullLiteralSchema() {
 
   @Test
   public void testNullLiteralInOperator() {
-    verifyDataRows(
-        query("SELECT NULL = NULL, NULL AND TRUE"),
-        rows(null, null));
+    verifyDataRows(query("SELECT NULL = NULL, NULL AND TRUE"), rows(null, null));
   }
 
   @Test
   public void testNullLiteralInFunction() {
-    verifyDataRows(
-        query("SELECT ABS(NULL), POW(2, FLOOR(NULL))"),
-        rows(null, null));
+    verifyDataRows(query("SELECT ABS(NULL), POW(2, FLOOR(NULL))"), rows(null, null));
   }
 
   @Test
   public void testNullLiteralInInterval() {
     verifyDataRows(
         query("SELECT INTERVAL NULL DAY, INTERVAL 60 * 60 * 24 * (NULL - FLOOR(NULL)) SECOND"),
-        rows(null, null)
-    );
+        rows(null, null));
   }
 
   private JSONObject query(String sql) {
     return new JSONObject(executeQuery(sql, "jdbc"));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/PaginationBlackboxIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationBlackboxIT.java
new file mode 100644
index 0000000000..84289d8f57
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationBlackboxIT.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.SneakyThrows;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+import org.opensearch.sql.util.TestUtils;
+
+// This class has only one test case, because it is parametrized and takes significant time
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+public class PaginationBlackboxIT extends SQLIntegTestCase {
+
+  private final Index index;
+  private final Integer pageSize;
+
+  public PaginationBlackboxIT(@Name("index") Index index, @Name("pageSize") Integer pageSize) {
+    this.index = index;
+    this.pageSize = pageSize;
+  }
+
+  @Override
+  protected void init() throws IOException {
+    loadIndex(index);
+  }
+
+  @ParametersFactory(argumentFormatting = "index = %1$s, page_size = %2$d")
+  public static Iterable<Object[]> compareTwoDates() {
+    var indices = List.of(Index.ACCOUNT, Index.BEER, Index.BANK);
+    var pageSizes = List.of(5, 10, 100, 1000);
+    var testData = new ArrayList<Object[]>();
+    for (var index : indices) {
+      for (var pageSize : pageSizes) {
+        testData.add(new Object[] {index, pageSize});
+      }
+    }
+    return testData;
+  }
+
+  @Test
+  @SneakyThrows
+  public void test_pagination_blackbox() {
+    var response = executeJdbcRequest(String.format("select * from %s", index.getName()));
+    var indexSize = response.getInt("total");
+    var rows = response.getJSONArray("datarows");
+    var schema = response.getJSONArray("schema");
+    var testReportPrefix = String.format("index: %s, page size: %d || ", index.getName(), pageSize);
+    var rowsPaged = new JSONArray();
+    var rowsReturned = 0;
+
+    var responseCounter = 1;
+    this.logger.info(testReportPrefix + "first response");
+    response =
+        new JSONObject(
+            executeFetchQuery(
+                String.format("select * from %s", index.getName()), pageSize, "jdbc"));
+
+    var cursor = response.has("cursor") ? response.getString("cursor") : "";
+    do {
+      this.logger.info(
+          testReportPrefix
+              + String.format(
+                  "subsequent response %d/%d", responseCounter++, (indexSize / pageSize) + 1));
+      assertTrue(
+          "Paged response schema doesn't match to non-paged",
+          schema.similar(response.getJSONArray("schema")));
+
+      rowsReturned += response.getInt("size");
+      var datarows = response.getJSONArray("datarows");
+      for (int i = 0; i < datarows.length(); i++) {
+        rowsPaged.put(datarows.get(i));
+      }
+
+      if (response.has("cursor")) {
+        TestUtils.verifyIsV2Cursor(response);
+        cursor = response.getString("cursor");
+        response = executeCursorQuery(cursor);
+      } else {
+        cursor = "";
+      }
+
+    } while (!cursor.isEmpty());
+    assertTrue(
+        "Paged response schema doesn't match to non-paged",
+        schema.similar(response.getJSONArray("schema")));
+
+    assertEquals(
+        testReportPrefix + "Paged responses return another row count that non-paged",
+        indexSize,
+        rowsReturned);
+    assertTrue(
+        testReportPrefix + "Paged accumulated result has other rows than non-paged",
+        rows.similar(rowsPaged));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/PaginationFallbackIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationFallbackIT.java
new file mode 100644
index 0000000000..dfb0bb2080
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationFallbackIT.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ONLINE;
+import static org.opensearch.sql.util.TestUtils.verifyIsV1Cursor;
+import static org.opensearch.sql.util.TestUtils.verifyIsV2Cursor;
+
+import java.io.IOException;
+import org.junit.Test;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+import org.opensearch.sql.util.TestUtils;
+
+public class PaginationFallbackIT extends SQLIntegTestCase {
+  @Override
+  public void init() throws IOException {
+    loadIndex(Index.PHRASE);
+    loadIndex(Index.ONLINE);
+  }
+
+  @Test
+  public void testWhereClause() throws IOException {
+    var response = executeQueryTemplate("SELECT * FROM %s WHERE 1 = 1", TEST_INDEX_ONLINE);
+    verifyIsV2Cursor(response);
+  }
+
+  @Test
+  public void testSelectAll() throws IOException {
+    var response = executeQueryTemplate("SELECT * FROM %s", TEST_INDEX_ONLINE);
+    verifyIsV2Cursor(response);
+  }
+
+  @Test
+  public void testSelectWithOpenSearchFuncInFilter() throws IOException {
+    var response =
+        executeQueryTemplate("SELECT * FROM %s WHERE `11` = match_phrase('96')", TEST_INDEX_ONLINE);
+    verifyIsV2Cursor(response);
+  }
+
+  @Test
+  public void testSelectWithHighlight() throws IOException {
+    var response =
+        executeQueryTemplate(
+            "SELECT highlight(`11`) FROM %s WHERE match_query(`11`, '96')", TEST_INDEX_ONLINE);
+
+    verifyIsV2Cursor(response);
+  }
+
+  @Test
+  public void testSelectWithFullTextSearch() throws IOException {
+    var response =
+        executeQueryTemplate("SELECT * FROM %s WHERE match_phrase(`11`, '96')", TEST_INDEX_ONLINE);
+    verifyIsV2Cursor(response);
+  }
+
+  @Test
+  public void testSelectFromIndexWildcard() throws IOException {
+    var response = executeQueryTemplate("SELECT * FROM %s*", TEST_INDEX);
+    verifyIsV2Cursor(response);
+  }
+
+  @Test
+  public void testSelectFromDataSource() throws IOException {
+    var response = executeQueryTemplate("SELECT * FROM @opensearch.%s", TEST_INDEX_ONLINE);
+    verifyIsV2Cursor(response);
+  }
+
+  @Test
+  public void testSelectColumnReference() throws IOException {
+    var response = executeQueryTemplate("SELECT `107` from %s", TEST_INDEX_ONLINE);
+    verifyIsV2Cursor(response);
+  }
+
+  @Test
+  public void testSubquery() throws IOException {
+    var response = executeQueryTemplate("SELECT `107` from (SELECT * FROM %s)", TEST_INDEX_ONLINE);
+    verifyIsV1Cursor(response);
+  }
+
+  @Test
+  public void testSelectExpression() throws IOException {
+    var response = executeQueryTemplate("SELECT 1 + 1 - `107` from %s", TEST_INDEX_ONLINE);
+    verifyIsV2Cursor(response);
+  }
+
+  @Test
+  public void testGroupBy() throws IOException {
+    // GROUP BY is not paged by either engine.
+    var response = executeQueryTemplate("SELECT * FROM %s GROUP BY `107`", TEST_INDEX_ONLINE);
+    TestUtils.verifyNoCursor(response);
+  }
+
+  @Test
+  public void testGroupByHaving() throws IOException {
+    // GROUP BY is not paged by either engine.
+    var response =
+        executeQueryTemplate(
+            "SELECT * FROM %s GROUP BY `107` HAVING `107` > 400", TEST_INDEX_ONLINE);
+    TestUtils.verifyNoCursor(response);
+  }
+
+  @Test
+  public void testLimit() throws IOException {
+    var response = executeQueryTemplate("SELECT * FROM %s LIMIT 8", TEST_INDEX_ONLINE);
+    verifyIsV1Cursor(response);
+  }
+
+  @Test
+  public void testLimitOffset() throws IOException {
+    var response = executeQueryTemplate("SELECT * FROM %s LIMIT 8 OFFSET 4", TEST_INDEX_ONLINE);
+    verifyIsV1Cursor(response);
+  }
+
+  @Test
+  public void testOrderBy() throws IOException {
+    var response = executeQueryTemplate("SELECT * FROM %s ORDER By `107`", TEST_INDEX_ONLINE);
+    verifyIsV2Cursor(response);
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/PaginationFilterIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationFilterIT.java
new file mode 100644
index 0000000000..038596cf57
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationFilterIT.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import lombok.SneakyThrows;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+import org.opensearch.sql.legacy.TestsConstants;
+
+/**
+ * Test pagination with `WHERE` clause using a parametrized test. See constructor {@link
+ * #PaginationFilterIT} for list of parameters and {@link #generateParameters} and {@link
+ * #STATEMENT_TO_NUM_OF_PAGES} to see how these parameters are generated.
+ */
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+public class PaginationFilterIT extends SQLIntegTestCase {
+
+  /**
+   * Map of the OS-SQL statement sent to SQL-plugin, and the total number of expected hits (on all
+   * pages) from the filtered result
+   */
+  private static final Map<String, Integer> STATEMENT_TO_NUM_OF_PAGES =
+      Map.of(
+          "SELECT * FROM " + TestsConstants.TEST_INDEX_ACCOUNT, 1000,
+          "SELECT * FROM " + TestsConstants.TEST_INDEX_ACCOUNT + " WHERE match(address, 'street')",
+              385,
+          "SELECT * FROM "
+                  + TestsConstants.TEST_INDEX_ACCOUNT
+                  + " WHERE match(address, 'street') AND match(city, 'Ola')",
+              1,
+          "SELECT firstname, lastname, highlight(address) FROM "
+                  + TestsConstants.TEST_INDEX_ACCOUNT
+                  + " WHERE match(address, 'street') AND match(state, 'OH')",
+              5,
+          "SELECT firstname, lastname, highlight('*') FROM "
+                  + TestsConstants.TEST_INDEX_ACCOUNT
+                  + " WHERE match(address, 'street') AND match(state, 'OH')",
+              5,
+          "SELECT * FROM " + TestsConstants.TEST_INDEX_BEER + " WHERE true", 60,
+          "SELECT * FROM " + TestsConstants.TEST_INDEX_BEER + " WHERE Id=10", 1,
+          "SELECT * FROM " + TestsConstants.TEST_INDEX_BEER + " WHERE Id + 5=15", 1,
+          "SELECT * FROM " + TestsConstants.TEST_INDEX_BANK, 7);
+
+  private final String sqlStatement;
+
+  private final Integer totalHits;
+  private final Integer pageSize;
+
+  public PaginationFilterIT(
+      @Name("statement") String sqlStatement,
+      @Name("total_hits") Integer totalHits,
+      @Name("page_size") Integer pageSize) {
+    this.sqlStatement = sqlStatement;
+    this.totalHits = totalHits;
+    this.pageSize = pageSize;
+  }
+
+  @Override
+  public void init() throws IOException {
+    initClient();
+    loadIndex(Index.ACCOUNT);
+    loadIndex(Index.BEER);
+    loadIndex(Index.BANK);
+  }
+
+  @ParametersFactory(argumentFormatting = "query = %1$s, total_hits = %2$d, page_size = %3$d")
+  public static Iterable<Object[]> generateParameters() {
+    List<Integer> pageSizes = List.of(5, 1000);
+    List<Object[]> testData = new ArrayList<Object[]>();
+
+    STATEMENT_TO_NUM_OF_PAGES.forEach(
+        (statement, totalHits) -> {
+          for (var pageSize : pageSizes) {
+            testData.add(new Object[] {statement, totalHits, pageSize});
+          }
+        });
+    return testData;
+  }
+
+  /**
+   * Test compares non-paginated results with paginated results To ensure that the pushdowns return
+   * the same number of hits even with filter WHERE pushed down
+   */
+  @Test
+  @SneakyThrows
+  public void test_pagination_with_where() {
+    // get non-paginated result for comparison
+    JSONObject nonPaginatedResponse = executeJdbcRequest(sqlStatement);
+    int totalResultsCount = nonPaginatedResponse.getInt("total");
+    JSONArray rows = nonPaginatedResponse.getJSONArray("datarows");
+    JSONArray schema = nonPaginatedResponse.getJSONArray("schema");
+    var testReportPrefix =
+        String.format(
+            "query: %s; total hits: %d; page size: %d || ",
+            sqlStatement, totalResultsCount, pageSize);
+    assertEquals(totalHits.intValue(), totalResultsCount);
+
+    var rowsPaged = new JSONArray();
+    var pagedSize = 0;
+    var responseCounter = 1;
+
+    // make first request - with a cursor
+    JSONObject paginatedResponse =
+        new JSONObject(executeFetchQuery(sqlStatement, pageSize, "jdbc"));
+    this.logger.info(testReportPrefix + "<first response>");
+    do {
+      var cursor = paginatedResponse.has("cursor") ? paginatedResponse.getString("cursor") : null;
+      pagedSize += paginatedResponse.getInt("size");
+      var datarows = paginatedResponse.getJSONArray("datarows");
+      for (int i = 0; i < datarows.length(); i++) {
+        rowsPaged.put(datarows.get(i));
+      }
+
+      assertTrue(
+          "Paged response schema doesn't match to non-paged",
+          schema.similar(paginatedResponse.getJSONArray("schema")));
+
+      if (cursor != null) {
+        assertTrue(
+            testReportPrefix + "Cursor returned from legacy engine", cursor.startsWith("n:"));
+
+        paginatedResponse = executeCursorQuery(cursor);
+
+        this.logger.info(
+            testReportPrefix
+                + String.format(
+                    "response %d/%d", responseCounter++, (totalResultsCount / pageSize) + 1));
+      } else {
+        break;
+      }
+    } while (true);
+    // last page expected results:
+    assertEquals(
+        testReportPrefix + "Last page", totalHits % pageSize, paginatedResponse.getInt("size"));
+    assertEquals(
+        testReportPrefix + "Last page",
+        totalHits % pageSize,
+        paginatedResponse.getJSONArray("datarows").length());
+
+    // compare paginated and non-paginated counts
+    assertEquals(
+        testReportPrefix + "Paged responses returned an unexpected total",
+        totalResultsCount,
+        pagedSize);
+    assertEquals(
+        testReportPrefix + "Paged responses returned an unexpected rows count",
+        rows.length(),
+        rowsPaged.length());
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/PaginationIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationIT.java
new file mode 100644
index 0000000000..49ef7c583e
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationIT.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_CALCS;
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ONLINE;
+
+import java.io.IOException;
+import lombok.SneakyThrows;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.client.ResponseException;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+import org.opensearch.sql.util.TestUtils;
+
+public class PaginationIT extends SQLIntegTestCase {
+  @Override
+  public void init() throws IOException {
+    loadIndex(Index.CALCS);
+    loadIndex(Index.ONLINE);
+  }
+
+  @Test
+  public void testSmallDataSet() throws IOException {
+    var query = "SELECT * from " + TEST_INDEX_CALCS;
+    var response = new JSONObject(executeFetchQuery(query, 4, "jdbc"));
+    assertTrue(response.has("cursor"));
+    assertEquals(4, response.getInt("size"));
+    TestUtils.verifyIsV2Cursor(response);
+  }
+
+  @Test
+  public void testLargeDataSetV2WithWhere() throws IOException {
+    var query = "SELECT * from " + TEST_INDEX_ONLINE + " WHERE 1 = 1";
+    var response = new JSONObject(executeFetchQuery(query, 4, "jdbc"));
+    assertEquals(4, response.getInt("size"));
+    TestUtils.verifyIsV2Cursor(response);
+  }
+
+  @Test
+  public void testLargeDataSetV2() throws IOException {
+    var query = "SELECT * from " + TEST_INDEX_ONLINE;
+    var response = new JSONObject(executeFetchQuery(query, 4, "jdbc"));
+    assertEquals(4, response.getInt("size"));
+    TestUtils.verifyIsV2Cursor(response);
+  }
+
+  @Ignore("Scroll may not expire after timeout")
+  // Scroll keep alive parameter guarantees that scroll context would be kept for that time,
+  // but doesn't define how fast it will be expired after time out.
+  // With KA = 1s scroll may be kept up to 30 sec or more. We can't test exact expiration.
+  // I disable the test to prevent it waiting for a minute and delay all CI.
+  public void testCursorTimeout() throws IOException, InterruptedException {
+    updateClusterSettings(
+        new ClusterSetting(PERSISTENT, Settings.Key.SQL_CURSOR_KEEP_ALIVE.getKeyValue(), "1s"));
+
+    var query = "SELECT * from " + TEST_INDEX_CALCS;
+    var response = new JSONObject(executeFetchQuery(query, 4, "jdbc"));
+    assertTrue(response.has("cursor"));
+    var cursor = response.getString("cursor");
+    Thread.sleep(2222L); // > 1s
+
+    ResponseException exception =
+        expectThrows(ResponseException.class, () -> executeCursorQuery(cursor));
+    response = new JSONObject(TestUtils.getResponseBody(exception.getResponse()));
+    assertEquals(
+        response.getJSONObject("error").getString("reason"),
+        "Error occurred in OpenSearch engine: all shards failed");
+    assertTrue(
+        response
+            .getJSONObject("error")
+            .getString("details")
+            .contains("SearchContextMissingException[No search context found for id"));
+    assertEquals(
+        response.getJSONObject("error").getString("type"), "SearchPhaseExecutionException");
+
+    wipeAllClusterSettings();
+  }
+
+  @Test
+  @SneakyThrows
+  public void testCloseCursor() {
+    // Initial page request to get cursor
+    var query = "SELECT * from " + TEST_INDEX_CALCS;
+    var response = new JSONObject(executeFetchQuery(query, 4, "jdbc"));
+    assertTrue(response.has("cursor"));
+    var cursor = response.getString("cursor");
+
+    // Close the cursor
+    Request closeCursorRequest = new Request("POST", "_plugins/_sql/close");
+    closeCursorRequest.setJsonEntity(String.format("{ \"cursor\" : \"%s\" } ", cursor));
+    RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder();
+    restOptionsBuilder.addHeader("Content-Type", "application/json");
+    closeCursorRequest.setOptions(restOptionsBuilder);
+    response = new JSONObject(executeRequest(closeCursorRequest));
+    assertTrue(response.has("succeeded"));
+    assertTrue(response.getBoolean("succeeded"));
+
+    // Test that cursor is no longer available
+    ResponseException exception =
+        expectThrows(ResponseException.class, () -> executeCursorQuery(cursor));
+    response = new JSONObject(TestUtils.getResponseBody(exception.getResponse()));
+    assertEquals(
+        response.getJSONObject("error").getString("reason"),
+        "Error occurred in OpenSearch engine: all shards failed");
+    assertTrue(
+        response
+            .getJSONObject("error")
+            .getString("details")
+            .contains("SearchContextMissingException[No search context found for id"));
+    assertEquals(
+        response.getJSONObject("error").getString("type"), "SearchPhaseExecutionException");
+  }
+
+  @Test
+  @SneakyThrows
+  public void testQueryWithOrderBy() {
+    var response = executeJdbcRequest(String.format("select * from %s", TEST_INDEX_CALCS));
+    var indexSize = response.getInt("total");
+    var rows = response.getJSONArray("datarows");
+    var schema = response.getJSONArray("schema");
+
+    var rowsPagedAsc = new JSONArray();
+    var rowsReturnedAsc = 0;
+    var rowsPagedDesc = new JSONArray();
+    var rowsReturnedDesc = 0;
+
+    var query = String.format("SELECT * from %s ORDER BY num1 ASC", TEST_INDEX_CALCS);
+    response = new JSONObject(executeFetchQuery(query, 4, "jdbc"));
+    assertTrue(response.has("cursor"));
+    TestUtils.verifyIsV2Cursor(response);
+    var cursor = response.getString("cursor");
+    do {
+      assertTrue(cursor.isEmpty() || cursor.startsWith("n:"));
+      assertTrue(
+          "Paged response schema doesn't match to non-paged",
+          schema.similar(response.getJSONArray("schema")));
+
+      rowsReturnedAsc += response.getInt("size");
+      var datarows = response.getJSONArray("datarows");
+      for (int i = 0; i < datarows.length(); i++) {
+        rowsPagedAsc.put(datarows.get(i));
+      }
+
+      if (response.has("cursor")) {
+        TestUtils.verifyIsV2Cursor(response);
+        cursor = response.getString("cursor");
+        response = executeCursorQuery(cursor);
+      } else {
+        cursor = "";
+      }
+
+    } while (!cursor.isEmpty());
+
+    query = String.format("SELECT * from %s ORDER BY num1 DESC", TEST_INDEX_CALCS);
+    response = new JSONObject(executeFetchQuery(query, 7, "jdbc"));
+    assertTrue(response.has("cursor"));
+    TestUtils.verifyIsV2Cursor(response);
+    cursor = response.getString("cursor");
+    do {
+      assertTrue(cursor.isEmpty() || cursor.startsWith("n:"));
+      assertTrue(
+          "Paged response schema doesn't match to non-paged",
+          schema.similar(response.getJSONArray("schema")));
+
+      rowsReturnedDesc += response.getInt("size");
+      var datarows = response.getJSONArray("datarows");
+      for (int i = 0; i < datarows.length(); i++) {
+        rowsPagedDesc.put(datarows.get(i));
+      }
+
+      if (response.has("cursor")) {
+        TestUtils.verifyIsV2Cursor(response);
+        cursor = response.getString("cursor");
+        response = executeCursorQuery(cursor);
+      } else {
+        cursor = "";
+      }
+
+    } while (!cursor.isEmpty());
+
+    assertEquals(
+        "Paged responses return another row count that non-paged", indexSize, rowsReturnedAsc);
+    assertEquals(
+        "Paged responses return another row count that non-paged", indexSize, rowsReturnedDesc);
+    assertTrue(
+        "Paged accumulated result has other rows than non-paged",
+        rows.toList().containsAll(rowsPagedAsc.toList()));
+    assertTrue(
+        "Paged accumulated result has other rows than non-paged",
+        rows.toList().containsAll(rowsPagedDesc.toList()));
+
+    for (int row = 0; row < indexSize; row++) {
+      assertTrue(
+          String.format("Row %d: row order is incorrect", row),
+          rowsPagedAsc.getJSONArray(row).similar(rowsPagedDesc.getJSONArray(indexSize - row - 1)));
+    }
+  }
+
+  @Test
+  @SneakyThrows
+  public void testQueryWithoutFrom() {
+    var response = new JSONObject(executeFetchQuery("SELECT 1", 4, "jdbc"));
+    assertFalse(response.has("cursor"));
+    assertEquals(1, response.getInt("total"));
+    assertEquals(1, response.getJSONArray("datarows").getJSONArray(0).getInt(0));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/PaginationWindowIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationWindowIT.java
new file mode 100644
index 0000000000..246cbfc4a0
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationWindowIT.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_PHRASE;
+
+import java.io.IOException;
+import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Test;
+import org.opensearch.client.ResponseException;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+
+public class PaginationWindowIT extends SQLIntegTestCase {
+  @Override
+  public void init() throws IOException {
+    loadIndex(Index.PHRASE);
+  }
+
+  @After
+  public void resetParams() throws IOException {
+    resetMaxResultWindow(TEST_INDEX_PHRASE);
+    resetQuerySizeLimit();
+  }
+
+  @Test
+  public void testFetchSizeLessThanMaxResultWindow() throws IOException {
+    setMaxResultWindow(TEST_INDEX_PHRASE, 6);
+    JSONObject response = executeQueryTemplate("SELECT * FROM %s", TEST_INDEX_PHRASE, 5);
+
+    int numRows = 0;
+    do {
+      // Process response
+      String cursor = response.getString("cursor");
+      numRows += response.getJSONArray("datarows").length();
+      response = executeCursorQuery(cursor);
+    } while (response.has("cursor"));
+    numRows += response.getJSONArray("datarows").length();
+
+    var countRows =
+        executeJdbcRequest("SELECT COUNT(*) FROM " + TEST_INDEX_PHRASE)
+            .getJSONArray("datarows")
+            .getJSONArray(0)
+            .get(0);
+    assertEquals(countRows, numRows);
+  }
+
+  @Test
+  public void testQuerySizeLimitDoesNotEffectTotalRowsReturned() throws IOException {
+    int querySizeLimit = 4;
+    setQuerySizeLimit(querySizeLimit);
+    JSONObject response = executeQueryTemplate("SELECT * FROM %s", TEST_INDEX_PHRASE, 5);
+    assertTrue(response.getInt("size") > querySizeLimit);
+
+    int numRows = 0;
+    do {
+      // Process response
+      String cursor = response.getString("cursor");
+      numRows += response.getJSONArray("datarows").length();
+      response = executeCursorQuery(cursor);
+    } while (response.has("cursor"));
+    numRows += response.getJSONArray("datarows").length();
+    var countRows =
+        executeJdbcRequest("SELECT COUNT(*) FROM " + TEST_INDEX_PHRASE)
+            .getJSONArray("datarows")
+            .getJSONArray(0)
+            .get(0);
+    assertEquals(countRows, numRows);
+    assertTrue(numRows > querySizeLimit);
+  }
+
+  @Test
+  public void testQuerySizeLimitDoesNotEffectPageSize() throws IOException {
+    setQuerySizeLimit(3);
+    setMaxResultWindow(TEST_INDEX_PHRASE, 4);
+    var response = executeQueryTemplate("SELECT * FROM %s", TEST_INDEX_PHRASE, 4);
+    assertEquals(4, response.getInt("size"));
+
+    var response2 = executeQueryTemplate("SELECT * FROM %s", TEST_INDEX_PHRASE, 2);
+    assertEquals(2, response2.getInt("size"));
+  }
+
+  @Test
+  public void testFetchSizeLargerThanResultWindowFails() throws IOException {
+    final int window = 2;
+    setMaxResultWindow(TEST_INDEX_PHRASE, 2);
+    assertThrows(
+        ResponseException.class,
+        () -> executeQueryTemplate("SELECT * FROM %s", TEST_INDEX_PHRASE, window + 1));
+    resetMaxResultWindow(TEST_INDEX_PHRASE);
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/PositionFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/PositionFunctionIT.java
index f51a3a0977..6a9d40e7c3 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/PositionFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/PositionFunctionIT.java
@@ -5,16 +5,16 @@
 
 package org.opensearch.sql.sql;
 
-import org.json.JSONObject;
-import org.junit.Test;
-import org.opensearch.sql.legacy.SQLIntegTestCase;
-import org.opensearch.sql.legacy.TestsConstants;
-
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.schema;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
+import org.json.JSONObject;
+import org.junit.Test;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+import org.opensearch.sql.legacy.TestsConstants;
+
 public class PositionFunctionIT extends SQLIntegTestCase {
 
   @Override
@@ -26,19 +26,29 @@ protected void init() throws Exception {
   @Test
   public void position_function_test() {
     String query = "SELECT firstname, position('a' IN firstname) FROM %s";
-    JSONObject response = executeJdbcRequest(String.format(query, TestsConstants.TEST_INDEX_PEOPLE2));
+    JSONObject response =
+        executeJdbcRequest(String.format(query, TestsConstants.TEST_INDEX_PEOPLE2));
 
-    verifySchema(response, schema("firstname", null, "keyword"),
-            schema("position('a' IN firstname)", null, "integer"));
+    verifySchema(
+        response,
+        schema("firstname", null, "keyword"),
+        schema("position('a' IN firstname)", null, "integer"));
     assertEquals(12, response.getInt("total"));
 
-    verifyDataRows(response,
-            rows("Daenerys", 2), rows("Hattie", 2),
-            rows("Nanette", 2), rows("Dale", 2),
-            rows("Elinor", 0), rows("Virginia", 8),
-            rows("Dillard", 5), rows("Mcgee", 0),
-            rows("Aurelia", 7), rows("Fulton", 0),
-            rows("Burton", 0), rows("Josie", 0));
+    verifyDataRows(
+        response,
+        rows("Daenerys", 2),
+        rows("Hattie", 2),
+        rows("Nanette", 2),
+        rows("Dale", 2),
+        rows("Elinor", 0),
+        rows("Virginia", 8),
+        rows("Dillard", 5),
+        rows("Mcgee", 0),
+        rows("Aurelia", 7),
+        rows("Fulton", 0),
+        rows("Burton", 0),
+        rows("Josie", 0));
   }
 
   @Test
@@ -46,20 +56,31 @@ public void position_function_with_nulls_test() {
     String query = "SELECT str2, position('ee' IN str2) FROM %s";
     JSONObject response = executeJdbcRequest(String.format(query, TestsConstants.TEST_INDEX_CALCS));
 
-    verifySchema(response, schema("str2", null, "keyword"),
-            schema("position('ee' IN str2)", null, "integer"));
+    verifySchema(
+        response,
+        schema("str2", null, "keyword"),
+        schema("position('ee' IN str2)", null, "integer"));
     assertEquals(17, response.getInt("total"));
 
-    verifyDataRows(response,
-            rows("one", 0), rows("two", 0),
-            rows("three", 4), rows(null, null),
-            rows("five", 0), rows("six", 0),
-            rows(null, null), rows("eight", 0),
-            rows("nine", 0), rows("ten", 0),
-            rows("eleven", 0), rows("twelve", 0),
-            rows(null, null), rows("fourteen", 6),
-            rows("fifteen", 5), rows("sixteen", 5),
-            rows(null, null));
+    verifyDataRows(
+        response,
+        rows("one", 0),
+        rows("two", 0),
+        rows("three", 4),
+        rows(null, null),
+        rows("five", 0),
+        rows("six", 0),
+        rows(null, null),
+        rows("eight", 0),
+        rows("nine", 0),
+        rows("ten", 0),
+        rows("eleven", 0),
+        rows("twelve", 0),
+        rows(null, null),
+        rows("fourteen", 6),
+        rows("fifteen", 5),
+        rows("sixteen", 5),
+        rows(null, null));
   }
 
   @Test
@@ -86,7 +107,8 @@ public void position_function_with_only_fields_as_args_test() {
 
   @Test
   public void position_function_with_function_as_arg_test() {
-    String query = "SELECT position(upper(str3) IN str1) FROM %s WHERE str1 LIKE 'BINDING SUPPLIES'";
+    String query =
+        "SELECT position(upper(str3) IN str1) FROM %s WHERE str1 LIKE 'BINDING SUPPLIES'";
     JSONObject response = executeJdbcRequest(String.format(query, TestsConstants.TEST_INDEX_CALCS));
 
     verifySchema(response, schema("position(upper(str3) IN str1)", null, "integer"));
@@ -110,17 +132,21 @@ public void position_function_in_where_clause_test() {
   public void position_function_with_null_args_test() {
     String query1 = "SELECT str2, position(null IN str2) FROM %s WHERE str2 IN ('one')";
     String query2 = "SELECT str2, position(str2 IN null) FROM %s WHERE str2 IN ('one')";
-    JSONObject response1 = executeJdbcRequest(String.format(query1, TestsConstants.TEST_INDEX_CALCS));
-    JSONObject response2 = executeJdbcRequest(String.format(query2, TestsConstants.TEST_INDEX_CALCS));
-
-    verifySchema(response1,
-            schema("str2", null, "keyword"),
-            schema("position(null IN str2)", null, "integer"));
+    JSONObject response1 =
+        executeJdbcRequest(String.format(query1, TestsConstants.TEST_INDEX_CALCS));
+    JSONObject response2 =
+        executeJdbcRequest(String.format(query2, TestsConstants.TEST_INDEX_CALCS));
+
+    verifySchema(
+        response1,
+        schema("str2", null, "keyword"),
+        schema("position(null IN str2)", null, "integer"));
     assertEquals(1, response1.getInt("total"));
 
-    verifySchema(response2,
-            schema("str2", null, "keyword"),
-            schema("position(str2 IN null)", null, "integer"));
+    verifySchema(
+        response2,
+        schema("str2", null, "keyword"),
+        schema("position(str2 IN null)", null, "integer"));
     assertEquals(1, response2.getInt("total"));
 
     verifyDataRows(response1, rows("one", null));
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/PreparedStatementIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/PreparedStatementIT.java
index 38ff32b0d7..8200f64b66 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/PreparedStatementIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/PreparedStatementIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import org.json.JSONObject;
@@ -20,16 +19,21 @@ protected void init() throws Exception {
 
   @Test
   public void testPreparedStatement() {
-    JSONObject response = new JSONObject(
-        executeQuery(String.format("{\n"
-            + "  \"query\": \"SELECT state FROM %s WHERE state = ? GROUP BY state\",\n"
-            + "  \"parameters\": [\n"
-            + "    {\n"
-            + "      \"type\": \"string\",\n"
-            + "      \"value\": \"WA\"\n"
-            + "    }\n"
-            + " ]\n"
-            + "}", TestsConstants.TEST_INDEX_ACCOUNT), "jdbc"));
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                String.format(
+                    "{\n"
+                        + "  \"query\": \"SELECT state FROM %s WHERE state = ? GROUP BY state\",\n"
+                        + "  \"parameters\": [\n"
+                        + "    {\n"
+                        + "      \"type\": \"string\",\n"
+                        + "      \"value\": \"WA\"\n"
+                        + "    }\n"
+                        + " ]\n"
+                        + "}",
+                    TestsConstants.TEST_INDEX_ACCOUNT),
+                "jdbc"));
 
     assertFalse(response.getJSONArray("datarows").isEmpty());
   }
@@ -39,5 +43,4 @@ protected String makeRequest(String query) {
     // Avoid wrap with "query" again
     return query;
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/QueryIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/QueryIT.java
index e61593eb21..b2991138c4 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/QueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/QueryIT.java
@@ -13,72 +13,66 @@
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 
 public class QueryIT extends SQLIntegTestCase {
-    @Override
-    public void init() throws IOException {
-        loadIndex(Index.BEER);
-    }
+  @Override
+  public void init() throws IOException {
+    loadIndex(Index.BEER);
+  }
 
-    @Test
-    public void all_fields_test() throws IOException {
-        String query = "SELECT * FROM "
-                + TEST_INDEX_BEER + " WHERE query('*:taste')";
-        JSONObject result = executeJdbcRequest(query);
-        assertEquals(16, result.getInt("total"));
-    }
+  @Test
+  public void all_fields_test() throws IOException {
+    String query = "SELECT * FROM " + TEST_INDEX_BEER + " WHERE query('*:taste')";
+    JSONObject result = executeJdbcRequest(query);
+    assertEquals(16, result.getInt("total"));
+  }
 
-    @Test
-    public void mandatory_params_test() throws IOException {
-        String query = "SELECT Id FROM "
-                + TEST_INDEX_BEER + " WHERE query('Tags:taste OR Body:taste')";
-        JSONObject result = executeJdbcRequest(query);
-        assertEquals(16, result.getInt("total"));
-    }
+  @Test
+  public void mandatory_params_test() throws IOException {
+    String query = "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query('Tags:taste OR Body:taste')";
+    JSONObject result = executeJdbcRequest(query);
+    assertEquals(16, result.getInt("total"));
+  }
 
-    @Test
-    public void all_params_test() throws IOException {
-        String query = "SELECT Id FROM " + TEST_INDEX_BEER
-                + " WHERE query('Tags:taste', escape=false,"
-                + "allow_leading_wildcard=true, enable_position_increments=true,"
-                + "fuzziness= 1, fuzzy_rewrite='constant_score', max_determinized_states = 10000,"
-                + "analyzer='standard', analyze_wildcard = false, quote_field_suffix = '.exact',"
-                + "auto_generate_synonyms_phrase_query=true, boost = 0.77,"
-                + "quote_analyzer='standard', phrase_slop=0, rewrite='constant_score', type='best_fields',"
-                + "tie_breaker=0.3, time_zone='Canada/Pacific', default_operator='or',"
-                + "fuzzy_transpositions = false, lenient = true, fuzzy_max_expansions = 25,"
-                + "minimum_should_match = '2<-25% 9<-3', fuzzy_prefix_length = 7);";
-        JSONObject result = executeJdbcRequest(query);
-        assertEquals(8, result.getInt("total"));
-    }
+  @Test
+  public void all_params_test() throws IOException {
+    String query =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE query('Tags:taste', escape=false,allow_leading_wildcard=true,"
+            + " enable_position_increments=true,fuzziness= 1, fuzzy_rewrite='constant_score',"
+            + " max_determinized_states = 10000,analyzer='standard', analyze_wildcard = false,"
+            + " quote_field_suffix = '.exact',auto_generate_synonyms_phrase_query=true, boost ="
+            + " 0.77,quote_analyzer='standard', phrase_slop=0, rewrite='constant_score',"
+            + " type='best_fields',tie_breaker=0.3, time_zone='Canada/Pacific',"
+            + " default_operator='or',fuzzy_transpositions = false, lenient = true,"
+            + " fuzzy_max_expansions = 25,minimum_should_match = '2<-25% 9<-3', fuzzy_prefix_length"
+            + " = 7);";
+    JSONObject result = executeJdbcRequest(query);
+    assertEquals(8, result.getInt("total"));
+  }
 
-    @Test
-    public void wildcard_test() throws IOException {
-        String query1 = "SELECT Id FROM "
-                + TEST_INDEX_BEER + " WHERE query('Tags:taste')";
-        JSONObject result1 = executeJdbcRequest(query1);
-        String query2 = "SELECT Id FROM "
-                + TEST_INDEX_BEER + " WHERE query('*:taste')";
-        JSONObject result2 = executeJdbcRequest(query2);
-        assertNotEquals(result2.getInt("total"), result1.getInt("total"));
+  @Test
+  public void wildcard_test() throws IOException {
+    String query1 = "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query('Tags:taste')";
+    JSONObject result1 = executeJdbcRequest(query1);
+    String query2 = "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query('*:taste')";
+    JSONObject result2 = executeJdbcRequest(query2);
+    assertNotEquals(result2.getInt("total"), result1.getInt("total"));
 
-        String query3 = "SELECT Id FROM " + TEST_INDEX_BEER
-                + " WHERE query('Tags:tas*');";
-        JSONObject result3 = executeJdbcRequest(query3);
-        assertEquals(8, result3.getInt("total"));
+    String query3 = "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query('Tags:tas*');";
+    JSONObject result3 = executeJdbcRequest(query3);
+    assertEquals(8, result3.getInt("total"));
 
-        String query4 = "SELECT Id FROM " + TEST_INDEX_BEER
-                + " WHERE query('Tags:tas?e');";
-        JSONObject result4 = executeJdbcRequest(query3);
-        assertEquals(8, result4.getInt("total"));
-    }
+    String query4 = "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query('Tags:tas?e');";
+    JSONObject result4 = executeJdbcRequest(query3);
+    assertEquals(8, result4.getInt("total"));
+  }
 
-    @Test
-    public void query_string_and_query_return_the_same_results_test() throws IOException {
-        String query1 = "SELECT Id FROM "
-                + TEST_INDEX_BEER + " WHERE query('Tags:taste')";
-        JSONObject result1 = executeJdbcRequest(query1);
-        String query2 = "SELECT Id FROM "
-                + TEST_INDEX_BEER + " WHERE query_string(['Tags'],'taste')";
-        JSONObject result2 = executeJdbcRequest(query2);
-        assertEquals(result2.getInt("total"), result1.getInt("total"));
-    }
+  @Test
+  public void query_string_and_query_return_the_same_results_test() throws IOException {
+    String query1 = "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query('Tags:taste')";
+    JSONObject result1 = executeJdbcRequest(query1);
+    String query2 = "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query_string(['Tags'],'taste')";
+    JSONObject result2 = executeJdbcRequest(query2);
+    assertEquals(result2.getInt("total"), result1.getInt("total"));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/QueryStringIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/QueryStringIT.java
index 398a7a9d94..40ea1dfc98 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/QueryStringIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/QueryStringIT.java
@@ -20,48 +20,50 @@ public void init() throws IOException {
 
   @Test
   public void all_fields_test() throws IOException {
-    String query = "SELECT * FROM "
-        + TEST_INDEX_BEER + " WHERE query_string([`*`], 'taste')";
+    String query = "SELECT * FROM " + TEST_INDEX_BEER + " WHERE query_string([`*`], 'taste')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(16, result.getInt("total"));
   }
 
   @Test
   public void mandatory_params_test() throws IOException {
-    String query = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE query_string([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste')";
+    String query =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE query_string([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(16, result.getInt("total"));
   }
 
   @Test
   public void all_params_test() throws IOException {
-    String query = "SELECT Id FROM " + TEST_INDEX_BEER
-        + " WHERE query_string(['Body', Tags, Title], 'taste beer', escape=false,"
-        + "allow_leading_wildcard=true, enable_position_increments=true,"
-        + "fuzziness= 1, fuzzy_rewrite='constant_score', max_determinized_states = 10000,"
-        + "analyzer='english', analyze_wildcard = false, quote_field_suffix = '.exact',"
-        + "auto_generate_synonyms_phrase_query=true, boost = 0.77,"
-        + "quote_analyzer='standard', phrase_slop=0, rewrite='constant_score', type='best_fields',"
-        + "tie_breaker=0.3, time_zone='Canada/Pacific', default_operator='or',"
-        + "fuzzy_transpositions = false, lenient = true, fuzzy_max_expansions = 25,"
-        + "minimum_should_match = '2<-25% 9<-3', fuzzy_prefix_length = 7);";
+    String query =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE query_string(['Body', Tags, Title], 'taste beer',"
+            + " escape=false,allow_leading_wildcard=true,"
+            + " enable_position_increments=true,fuzziness= 1, fuzzy_rewrite='constant_score',"
+            + " max_determinized_states = 10000,analyzer='english', analyze_wildcard = false,"
+            + " quote_field_suffix = '.exact',auto_generate_synonyms_phrase_query=true, boost ="
+            + " 0.77,quote_analyzer='standard', phrase_slop=0, rewrite='constant_score',"
+            + " type='best_fields',tie_breaker=0.3, time_zone='Canada/Pacific',"
+            + " default_operator='or',fuzzy_transpositions = false, lenient = true,"
+            + " fuzzy_max_expansions = 25,minimum_should_match = '2<-25% 9<-3', fuzzy_prefix_length"
+            + " = 7);";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(49, result.getInt("total"));
   }
 
   @Test
   public void wildcard_test() throws IOException {
-    String query1 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE query_string(['Tags'], 'taste')";
+    String query1 = "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query_string(['Tags'], 'taste')";
     JSONObject result1 = executeJdbcRequest(query1);
-    String query2 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE query_string(['T*'], 'taste')";
+    String query2 = "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query_string(['T*'], 'taste')";
     JSONObject result2 = executeJdbcRequest(query2);
     assertNotEquals(result2.getInt("total"), result1.getInt("total"));
 
-    String query3 = "SELECT Id FROM " + TEST_INDEX_BEER
-        + " WHERE query_string(['*Date'], '2014-01-22');";
+    String query3 =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query_string(['*Date'], '2014-01-22');";
     JSONObject result3 = executeJdbcRequest(query3);
     assertEquals(10, result3.getInt("total"));
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/QueryValidationIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/QueryValidationIT.java
index 62869be168..e42b68631f 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/QueryValidationIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/QueryValidationIT.java
@@ -3,11 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.hamcrest.Matchers.is;
-import static org.opensearch.rest.RestStatus.BAD_REQUEST;
+import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
 import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
 import static org.opensearch.sql.util.MatcherUtils.featureValueOf;
 
@@ -21,32 +20,33 @@
 import org.opensearch.client.Request;
 import org.opensearch.client.RequestOptions;
 import org.opensearch.client.ResponseException;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 
 /**
- * The query validation IT only covers test for error cases that not doable in comparison test.
- * For all other tests, comparison test should be favored over manual written test like this.
+ * The query validation IT only covers test for error cases that not doable in comparison test. For
+ * all other tests, comparison test should be favored over manual written test like this.
  */
 public class QueryValidationIT extends SQLIntegTestCase {
 
-  @Rule
-  public ExpectedException exceptionRule = ExpectedException.none();
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
   @Override
   protected void init() throws Exception {
     loadIndex(Index.ACCOUNT);
   }
 
-  @Ignore("Will add this validation in analyzer later. This test should be enabled once " +
-          "https://github.com/opensearch-project/sql/issues/910 has been resolved")
+  @Ignore(
+      "Will add this validation in analyzer later. This test should be enabled once "
+          + "https://github.com/opensearch-project/sql/issues/910 has been resolved")
   @Test
   public void testNonAggregatedSelectColumnMissingInGroupByClause() throws IOException {
     expectResponseException()
         .hasStatusCode(BAD_REQUEST)
         .hasErrorType("SemanticCheckException")
-        .containsMessage("Expression [state] that contains non-aggregated column "
-                       + "is not present in group by clause")
+        .containsMessage(
+            "Expression [state] that contains non-aggregated column "
+                + "is not present in group by clause")
         .whenExecute("SELECT state FROM opensearch-sql_test_index_account GROUP BY age");
   }
 
@@ -55,8 +55,9 @@ public void testNonAggregatedSelectColumnPresentWithoutGroupByClause() throws IO
     expectResponseException()
         .hasStatusCode(BAD_REQUEST)
         .hasErrorType("SemanticCheckException")
-        .containsMessage("Explicit GROUP BY clause is required because expression [state] "
-            + "contains non-aggregated column")
+        .containsMessage(
+            "Explicit GROUP BY clause is required because expression [state] "
+                + "contains non-aggregated column")
         .whenExecute("SELECT state, AVG(age) FROM opensearch-sql_test_index_account");
   }
 
@@ -87,8 +88,7 @@ public ResponseExceptionAssertion expectResponseException() {
 
   /**
    * Response exception assertion helper to assert property value in OpenSearch ResponseException
-   * and Response inside. This serves as syntax sugar to improve the readability of test
-   * code.
+   * and Response inside. This serves as syntax sugar to improve the readability of test code.
    */
   private static class ResponseExceptionAssertion {
     private final ExpectedException exceptionRule;
@@ -100,9 +100,12 @@ private ResponseExceptionAssertion(ExpectedException exceptionRule) {
     }
 
     ResponseExceptionAssertion hasStatusCode(RestStatus code) {
-      exceptionRule.expect(featureValueOf("statusCode", is(code),
-          (Function<ResponseException, RestStatus>) e ->
-              RestStatus.fromCode(e.getResponse().getStatusLine().getStatusCode())));
+      exceptionRule.expect(
+          featureValueOf(
+              "statusCode",
+              is(code),
+              (Function<ResponseException, RestStatus>)
+                  e -> RestStatus.fromCode(e.getResponse().getStatusLine().getStatusCode())));
       return this;
     }
 
@@ -133,5 +136,4 @@ private static void execute(String query) throws IOException {
 
     client().performRequest(request);
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/RawFormatIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/RawFormatIT.java
index 43af66185e..c04bee0325 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/RawFormatIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/RawFormatIT.java
@@ -3,14 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK_RAW_SANITIZE;
+import static org.opensearch.sql.protocol.response.format.RawResponseFormatter.CONTENT_TYPE;
 
 import java.io.IOException;
 import java.util.Locale;
+import java.util.Map;
 import org.junit.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.Response;
+import org.opensearch.sql.common.utils.StringUtils;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 
 public class RawFormatIT extends SQLIntegTestCase {
@@ -22,16 +26,53 @@ public void init() throws IOException {
 
   @Test
   public void rawFormatWithPipeFieldTest() {
-    String result = executeQuery(
-        String.format(Locale.ROOT, "SELECT firstname, lastname FROM %s", TEST_INDEX_BANK_RAW_SANITIZE), "raw");
+    String result =
+        executeQuery(
+            String.format(
+                Locale.ROOT, "SELECT firstname, lastname FROM %s", TEST_INDEX_BANK_RAW_SANITIZE),
+            "raw");
+    assertEquals(
+        StringUtils.format(
+            "firstname|lastname%n"
+                + "+Amber JOHnny|Duke Willmington+%n"
+                + "-Hattie|Bond-%n"
+                + "=Nanette|Bates=%n"
+                + "@Dale|Adams@%n"
+                + "@Elinor|\"Ratliff|||\"%n"),
+        result);
+  }
+
+  @Test
+  public void rawFormatPrettyWithPipeFieldTest() {
+    String result =
+        executeQuery(
+            String.format(
+                Locale.ROOT, "SELECT firstname, lastname FROM %s", TEST_INDEX_BANK_RAW_SANITIZE),
+            "raw",
+            Map.of("pretty", "true"));
     assertEquals(
-        "firstname|lastname\n"
-            + "+Amber JOHnny|Duke Willmington+\n"
-            + "-Hattie|Bond-\n"
-            + "=Nanette|Bates=\n"
-            + "@Dale|Adams@\n"
-            + "@Elinor|\"Ratliff|||\"\n",
+        StringUtils.format(
+            "firstname    |lastname         %n"
+                + "+Amber JOHnny|Duke Willmington+%n"
+                + "-Hattie      |Bond-            %n"
+                + "=Nanette     |Bates=           %n"
+                + "@Dale        |Adams@           %n"
+                + "@Elinor      |\"Ratliff|||\"     %n"),
         result);
   }
 
+  @Test
+  public void contentHeaderTest() throws IOException {
+    String query =
+        String.format(
+            Locale.ROOT, "SELECT firstname, lastname FROM %s", TEST_INDEX_BANK_RAW_SANITIZE);
+    String requestBody = makeRequest(query);
+
+    Request sqlRequest = new Request("POST", "/_plugins/_sql?format=raw");
+    sqlRequest.setJsonEntity(requestBody);
+
+    Response response = client().performRequest(sqlRequest);
+
+    assertEquals(response.getEntity().getContentType().getValue(), CONTENT_TYPE);
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/RelevanceFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/RelevanceFunctionIT.java
index 26fe735f12..755493c167 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/RelevanceFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/RelevanceFunctionIT.java
@@ -24,11 +24,15 @@ public void init() throws IOException {
    */
   @Test
   public void verify_flags_in_simple_query_string() throws IOException {
-    String query1 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE simple_query_string(['Body'], '-free', flags='NONE|PREFIX|ESCAPE')";
+    String query1 =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE simple_query_string(['Body'], '-free', flags='NONE|PREFIX|ESCAPE')";
     var result1 = new JSONObject(executeQuery(query1, "jdbc"));
-    String query2 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE simple_query_string([Body], '-free', flags='NOT|AND|OR')";
+    String query2 =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE simple_query_string([Body], '-free', flags='NOT|AND|OR')";
     var result2 = new JSONObject(executeQuery(query2, "jdbc"));
     assertNotEquals(result2.getInt("total"), result1.getInt("total"));
 
@@ -44,11 +48,11 @@ public void verify_flags_in_simple_query_string() throws IOException {
    */
   @Test
   public void verify_escape_in_query_string() throws IOException {
-    String query1 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE query_string([Title], '?', escape=true);";
+    String query1 =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query_string([Title], '?', escape=true);";
     var result1 = new JSONObject(executeQuery(query1, "jdbc"));
-    String query2 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE query_string([Title], '?', escape=false);";
+    String query2 =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE query_string([Title], '?', escape=false);";
     var result2 = new JSONObject(executeQuery(query2, "jdbc"));
     assertEquals(0, result1.getInt("total"));
     assertEquals(8, result2.getInt("total"));
@@ -61,11 +65,15 @@ public void verify_escape_in_query_string() throws IOException {
    */
   @Test
   public void verify_default_operator_in_query_string() throws IOException {
-    String query1 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE query_string([Title], 'beer taste', default_operator='OR')";
+    String query1 =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE query_string([Title], 'beer taste', default_operator='OR')";
     var result1 = new JSONObject(executeQuery(query1, "jdbc"));
-    String query2 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE query_string([Title], 'beer taste', default_operator='AND')";
+    String query2 =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE query_string([Title], 'beer taste', default_operator='AND')";
     var result2 = new JSONObject(executeQuery(query2, "jdbc"));
     assertEquals(16, result1.getInt("total"));
     assertEquals(4, result2.getInt("total"));
@@ -73,11 +81,15 @@ public void verify_default_operator_in_query_string() throws IOException {
 
   @Test
   public void verify_default_operator_in_simple_query_string() throws IOException {
-    String query1 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE simple_query_string([Title], 'beer taste', default_operator='OR')";
+    String query1 =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE simple_query_string([Title], 'beer taste', default_operator='OR')";
     var result1 = new JSONObject(executeQuery(query1, "jdbc"));
-    String query2 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE simple_query_string([Title], 'beer taste', default_operator='AND')";
+    String query2 =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE simple_query_string([Title], 'beer taste', default_operator='AND')";
     var result2 = new JSONObject(executeQuery(query2, "jdbc"));
     assertEquals(16, result1.getInt("total"));
     assertEquals(4, result2.getInt("total"));
@@ -85,11 +97,15 @@ public void verify_default_operator_in_simple_query_string() throws IOException
 
   @Test
   public void verify_default_operator_in_multi_match() throws IOException {
-    String query1 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE multi_match([Title], 'beer taste', operator='OR')";
+    String query1 =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE multi_match([Title], 'beer taste', operator='OR')";
     var result1 = new JSONObject(executeQuery(query1, "jdbc"));
-    String query2 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE multi_match([Title], 'beer taste', operator='AND')";
+    String query2 =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE multi_match([Title], 'beer taste', operator='AND')";
     var result2 = new JSONObject(executeQuery(query2, "jdbc"));
     assertEquals(16, result1.getInt("total"));
     assertEquals(4, result2.getInt("total"));
@@ -97,11 +113,11 @@ public void verify_default_operator_in_multi_match() throws IOException {
 
   @Test
   public void verify_operator_in_match() throws IOException {
-    String query1 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE match(Title, 'beer taste', operator='OR')";
+    String query1 =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE match(Title, 'beer taste', operator='OR')";
     var result1 = new JSONObject(executeQuery(query1, "jdbc"));
-    String query2 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE match(Title, 'beer taste', operator='AND')";
+    String query2 =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE match(Title, 'beer taste', operator='AND')";
     var result2 = new JSONObject(executeQuery(query2, "jdbc"));
     assertEquals(16, result1.getInt("total"));
     assertEquals(4, result2.getInt("total"));
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/SQLCorrectnessIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/SQLCorrectnessIT.java
index 30f23547ec..6056a1c416 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/SQLCorrectnessIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/SQLCorrectnessIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import com.google.common.io.Resources;
@@ -14,14 +13,12 @@
 import java.util.function.Function;
 import org.junit.Test;
 
-/**
- * SQL integration test automated by comparison test framework.
- */
+/** SQL integration test automated by comparison test framework. */
 public class SQLCorrectnessIT extends CorrectnessTestBase {
 
   private static final String ROOT_DIR = "correctness/";
-  private static final String[] EXPR_TEST_DIR = { "expressions" };
-  private static final String[] QUERY_TEST_DIR = { "queries", "bugfixes" };
+  private static final String[] EXPR_TEST_DIR = {"expressions"};
+  private static final String[] QUERY_TEST_DIR = {"queries", "bugfixes"};
 
   @Override
   protected void init() throws Exception {
@@ -35,32 +32,30 @@ public void runAllTests() throws Exception {
   }
 
   /**
-   * Verify queries in files in directories with a converter to preprocess query.
-   * For example, for expressions it is converted to a SELECT clause before testing.
+   * Verify queries in files in directories with a converter to preprocess query. For example, for
+   * expressions it is converted to a SELECT clause before testing.
    */
   @SuppressWarnings("UnstableApiUsage")
   private void verifyQueries(String[] dirs, Function<String, String> converter) throws Exception {
     for (String dir : dirs) {
       Path dirPath = Paths.get(Resources.getResource(ROOT_DIR + dir).toURI());
       Files.walk(dirPath)
-           .filter(Files::isRegularFile)
-           .forEach(file -> verifyQueries(file, converter));
+          .filter(Files::isRegularFile)
+          .forEach(file -> verifyQueries(file, converter));
     }
   }
 
-  /**
-   * Comment start with #
-   */
+  /** Comment start with # */
   private void verifyQueries(Path file, Function<String, String> converter) {
     try {
-      String[] queries = Files.lines(file)
-                              .filter(line -> !line.startsWith("#"))
-                              .map(converter)
-                              .toArray(String[]::new);
+      String[] queries =
+          Files.lines(file)
+              .filter(line -> !line.startsWith("#"))
+              .map(converter)
+              .toArray(String[]::new);
       verify(queries);
     } catch (IOException e) {
       throw new IllegalStateException("Failed to read file: " + file, e);
     }
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/ScoreQueryIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/ScoreQueryIT.java
new file mode 100644
index 0000000000..783fa2db2c
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/ScoreQueryIT.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.schema;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
+import static org.opensearch.sql.util.MatcherUtils.verifySchema;
+
+import java.io.IOException;
+import java.util.Locale;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+import org.opensearch.sql.legacy.TestsConstants;
+
+public class ScoreQueryIT extends SQLIntegTestCase {
+  @Override
+  protected void init() throws Exception {
+    loadIndex(Index.ACCOUNT);
+  }
+
+  /**
+   * "query" : { "from": 0, "size": 3, "timeout": "1m", "query": { "bool": { "should": [ { "match":
+   * { "address": { "query": "Lane", "operator": "OR", "prefix_length": 0, "max_expansions": 50,
+   * "fuzzy_transpositions": true, "lenient": false, "zero_terms_query": "NONE",
+   * "auto_generate_synonyms_phrase_query": true, "boost": 100.0 } } }, { "match": { "address": {
+   * "query": "Street", "operator": "OR", "prefix_length": 0, "max_expansions": 50,
+   * "fuzzy_transpositions": true, "lenient": false, "zero_terms_query": "NONE",
+   * "auto_generate_synonyms_phrase_query": true, "boost": 0.5 } } } ], "adjust_pure_negative":
+   * true, "boost": 1.0 } }, "_source": { "includes": [ "address" ], "excludes": [] }, "sort": [ {
+   * "_score": { "order": "desc" } } ], "track_scores": true }
+   *
+   * @throws IOException
+   */
+  @Test
+  public void scoreQueryExplainTest() throws IOException {
+    final String result =
+        explainQuery(
+            String.format(
+                Locale.ROOT,
+                "select address from %s "
+                    + "where score(matchQuery(address, 'Douglass'), 100) "
+                    + "or score(matchQuery(address, 'Hall'), 0.5) order by _score desc limit 2",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result, containsString("\\\"match\\\":{\\\"address\\\":{\\\"query\\\":\\\"Douglass\\\""));
+    Assert.assertThat(result, containsString("\\\"boost\\\":100.0"));
+    Assert.assertThat(
+        result, containsString("\\\"match\\\":{\\\"address\\\":{\\\"query\\\":\\\"Hall\\\""));
+    Assert.assertThat(result, containsString("\\\"boost\\\":0.5"));
+    Assert.assertThat(result, containsString("\\\"sort\\\":[{\\\"_score\\\""));
+    Assert.assertThat(result, containsString("\\\"track_scores\\\":true"));
+  }
+
+  @Test
+  public void scoreQueryTest() throws IOException {
+    final JSONObject result =
+        new JSONObject(
+            executeQuery(
+                String.format(
+                    Locale.ROOT,
+                    "select address, _score from %s "
+                        + "where score(matchQuery(address, 'Douglass'), 100) "
+                        + "or score(matchQuery(address, 'Hall'), 0.5) order by _score desc limit 2",
+                    TestsConstants.TEST_INDEX_ACCOUNT),
+                "jdbc"));
+    verifySchema(result, schema("address", null, "text"), schema("_score", null, "float"));
+    verifyDataRows(
+        result, rows("154 Douglass Street", 650.1515), rows("565 Hall Street", 3.2507575));
+  }
+
+  @Test
+  public void scoreQueryDefaultBoostExplainTest() throws IOException {
+    final String result =
+        explainQuery(
+            String.format(
+                Locale.ROOT,
+                "select address from %s "
+                    + "where score(matchQuery(address, 'Lane')) order by _score desc limit 2",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    Assert.assertThat(
+        result, containsString("\\\"match\\\":{\\\"address\\\":{\\\"query\\\":\\\"Lane\\\""));
+    Assert.assertThat(result, containsString("\\\"boost\\\":1.0"));
+    Assert.assertThat(result, containsString("\\\"sort\\\":[{\\\"_score\\\""));
+    Assert.assertThat(result, containsString("\\\"track_scores\\\":true"));
+  }
+
+  @Test
+  public void scoreQueryDefaultBoostQueryTest() throws IOException {
+    final JSONObject result =
+        new JSONObject(
+            executeQuery(
+                String.format(
+                    Locale.ROOT,
+                    "select address, _score from %s "
+                        + "where score(matchQuery(address, 'Powell')) order by _score desc limit 2",
+                    TestsConstants.TEST_INDEX_ACCOUNT),
+                "jdbc"));
+    verifySchema(result, schema("address", null, "text"), schema("_score", null, "float"));
+    verifyDataRows(result, rows("305 Powell Street", 6.501515));
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/SimpleQueryStringIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/SimpleQueryStringIT.java
index a9e600121f..54d2fb7e03 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/SimpleQueryStringIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/SimpleQueryStringIT.java
@@ -6,10 +6,13 @@
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BEER;
+import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.CONTENT_TYPE;
 
 import java.io.IOException;
 import org.json.JSONObject;
 import org.junit.Test;
+import org.opensearch.client.Request;
+import org.opensearch.client.Response;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 
 public class SimpleQueryStringIT extends SQLIntegTestCase {
@@ -28,37 +31,60 @@ public void init() throws IOException {
 
   @Test
   public void test_mandatory_params() throws IOException {
-    String query = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE simple_query_string([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste')";
+    String query =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE simple_query_string([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste')";
     var result = new JSONObject(executeQuery(query, "jdbc"));
     assertEquals(16, result.getInt("total"));
   }
 
   @Test
   public void test_all_params() throws IOException {
-    String query = "SELECT Id FROM " + TEST_INDEX_BEER
-        + " WHERE simple_query_string(['Body', Tags, Title], 'taste beer', default_operator='or',"
-        + "analyzer=english, analyze_wildcard = false, quote_field_suffix = '.exact',"
-        + "auto_generate_synonyms_phrase_query=true, boost = 0.77, flags='PREFIX',"
-        + "fuzzy_transpositions = false, lenient = true, fuzzy_max_expansions = 25,"
-        + "minimum_should_match = '2<-25% 9<-3', fuzzy_prefix_length = 7);";
+    String query =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE simple_query_string(['Body', Tags, Title], 'taste beer',"
+            + " default_operator='or',analyzer=english, analyze_wildcard = false,"
+            + " quote_field_suffix = '.exact',auto_generate_synonyms_phrase_query=true, boost ="
+            + " 0.77, flags='PREFIX',fuzzy_transpositions = false, lenient = true,"
+            + " fuzzy_max_expansions = 25,minimum_should_match = '2<-25% 9<-3', fuzzy_prefix_length"
+            + " = 7);";
     var result = new JSONObject(executeQuery(query, "jdbc"));
     assertEquals(49, result.getInt("total"));
   }
 
   @Test
   public void verify_wildcard_test() throws IOException {
-    String query1 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE simple_query_string(['Tags'], 'taste')";
+    String query1 =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE simple_query_string(['Tags'], 'taste')";
     var result1 = new JSONObject(executeQuery(query1, "jdbc"));
-    String query2 = "SELECT Id FROM "
-        + TEST_INDEX_BEER + " WHERE simple_query_string(['T*'], 'taste')";
+    String query2 =
+        "SELECT Id FROM " + TEST_INDEX_BEER + " WHERE simple_query_string(['T*'], 'taste')";
     var result2 = new JSONObject(executeQuery(query2, "jdbc"));
     assertNotEquals(result2.getInt("total"), result1.getInt("total"));
 
-    String query = "SELECT Id FROM " + TEST_INDEX_BEER
-        + " WHERE simple_query_string(['*Date'], '2014-01-22');";
+    String query =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE simple_query_string(['*Date'], '2014-01-22');";
     var result = new JSONObject(executeQuery(query, "jdbc"));
     assertEquals(10, result.getInt("total"));
   }
+
+  @Test
+  public void contentHeaderTest() throws IOException {
+    String query =
+        "SELECT Id FROM "
+            + TEST_INDEX_BEER
+            + " WHERE simple_query_string([\\\"Tags\\\" ^ 1.5, Title, 'Body' 4.2], 'taste')";
+    String requestBody = makeRequest(query);
+
+    Request sqlRequest = new Request("POST", "/_plugins/_sql");
+    sqlRequest.setJsonEntity(requestBody);
+
+    Response response = client().performRequest(sqlRequest);
+
+    assertEquals(response.getEntity().getContentType().getValue(), CONTENT_TYPE);
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/StandalonePaginationIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/StandalonePaginationIT.java
new file mode 100644
index 0000000000..e884734c96
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/StandalonePaginationIT.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql;
+
+import static org.opensearch.sql.datasource.model.DataSourceMetadata.defaultOpenSearchDataSourceMetadata;
+import static org.opensearch.sql.ppl.StandaloneIT.getDataSourceMetadataStorage;
+import static org.opensearch.sql.ppl.StandaloneIT.getDataSourceUserRoleHelper;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import lombok.Getter;
+import lombok.SneakyThrows;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.opensearch.client.Request;
+import org.opensearch.client.ResponseException;
+import org.opensearch.client.RestHighLevelClient;
+import org.opensearch.common.inject.Injector;
+import org.opensearch.common.inject.ModulesBuilder;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.sql.ast.tree.FetchCursor;
+import org.opensearch.sql.common.response.ResponseListener;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.executor.QueryService;
+import org.opensearch.sql.executor.pagination.Cursor;
+import org.opensearch.sql.executor.pagination.PlanSerializer;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.legacy.SQLIntegTestCase;
+import org.opensearch.sql.opensearch.client.OpenSearchClient;
+import org.opensearch.sql.opensearch.client.OpenSearchRestClient;
+import org.opensearch.sql.opensearch.storage.OpenSearchDataSourceFactory;
+import org.opensearch.sql.opensearch.storage.OpenSearchIndex;
+import org.opensearch.sql.planner.PlanContext;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
+import org.opensearch.sql.planner.logical.LogicalPlan;
+import org.opensearch.sql.planner.logical.LogicalProject;
+import org.opensearch.sql.planner.logical.LogicalRelation;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+import org.opensearch.sql.storage.DataSourceFactory;
+import org.opensearch.sql.util.InternalRestHighLevelClient;
+import org.opensearch.sql.util.StandaloneModule;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+public class StandalonePaginationIT extends SQLIntegTestCase {
+
+  private QueryService queryService;
+
+  private PlanSerializer planSerializer;
+
+  private OpenSearchClient client;
+
+  @Override
+  @SneakyThrows
+  public void init() {
+    RestHighLevelClient restClient = new InternalRestHighLevelClient(client());
+    client = new OpenSearchRestClient(restClient);
+    DataSourceService dataSourceService =
+        new DataSourceServiceImpl(
+            new ImmutableSet.Builder<DataSourceFactory>()
+                .add(new OpenSearchDataSourceFactory(client, defaultSettings()))
+                .build(),
+            getDataSourceMetadataStorage(),
+            getDataSourceUserRoleHelper());
+    dataSourceService.createDataSource(defaultOpenSearchDataSourceMetadata());
+
+    ModulesBuilder modules = new ModulesBuilder();
+    modules.add(
+        new StandaloneModule(
+            new InternalRestHighLevelClient(client()), defaultSettings(), dataSourceService));
+    Injector injector = modules.createInjector();
+
+    queryService = injector.getInstance(QueryService.class);
+    planSerializer = injector.getInstance(PlanSerializer.class);
+  }
+
+  @Test
+  public void test_pagination_whitebox() throws IOException {
+    class TestResponder implements ResponseListener<ExecutionEngine.QueryResponse> {
+      @Getter Cursor cursor = Cursor.None;
+
+      @Override
+      public void onResponse(ExecutionEngine.QueryResponse response) {
+        cursor = response.getCursor();
+      }
+
+      @Override
+      public void onFailure(Exception e) {
+        e.printStackTrace();
+        fail(e.getMessage());
+      }
+    }
+
+    // arrange
+    {
+      Request request1 = new Request("PUT", "/test/_doc/1?refresh=true");
+      request1.setJsonEntity("{\"name\": \"hello\", \"age\": 20}");
+      client().performRequest(request1);
+      Request request2 = new Request("PUT", "/test/_doc/2?refresh=true");
+      request2.setJsonEntity("{\"name\": \"world\", \"age\": 30}");
+      client().performRequest(request2);
+    }
+
+    // act 1, asserts in firstResponder
+    var t = new OpenSearchIndex(client, defaultSettings(), "test");
+    LogicalPlan p =
+        new LogicalPaginate(
+            1,
+            List.of(
+                new LogicalProject(
+                    new LogicalRelation("test", t),
+                    List.of(
+                        DSL.named("name", DSL.ref("name", ExprCoreType.STRING)),
+                        DSL.named("age", DSL.ref("age", ExprCoreType.LONG))),
+                    List.of())));
+    var firstResponder = new TestResponder();
+    queryService.executePlan(p, PlanContext.emptyPlanContext(), firstResponder);
+
+    // act 2, asserts in secondResponder
+
+    PhysicalPlan plan = planSerializer.convertToPlan(firstResponder.getCursor().toString());
+    var secondResponder = new TestResponder();
+    queryService.execute(new FetchCursor(firstResponder.getCursor().toString()), secondResponder);
+
+    // act 3: confirm that there's no cursor.
+  }
+
+  @Test
+  @SneakyThrows
+  public void test_explain_not_supported() {
+    var request = new Request("POST", "_plugins/_sql/_explain");
+    // Request should be rejected before index names are resolved
+    request.setJsonEntity("{ \"query\": \"select * from something\", \"fetch_size\": 10 }");
+    var exception = assertThrows(ResponseException.class, () -> client().performRequest(request));
+    var response =
+        new JSONObject(new String(exception.getResponse().getEntity().getContent().readAllBytes()));
+    assertEquals(
+        "`explain` feature for paginated requests is not implemented yet.",
+        response.getJSONObject("error").getString("details"));
+
+    // Request should be rejected before cursor parsed
+    request.setJsonEntity("{ \"cursor\" : \"n:0000\" }");
+    exception = assertThrows(ResponseException.class, () -> client().performRequest(request));
+    response =
+        new JSONObject(new String(exception.getResponse().getEntity().getContent().readAllBytes()));
+    assertEquals(
+        "Explain of a paged query continuation is not supported. Use `explain` for the initial"
+            + " query request.",
+        response.getJSONObject("error").getString("details"));
+  }
+
+  private Settings defaultSettings() {
+    return new Settings() {
+      private final Map<Key, Object> defaultSettings =
+          new ImmutableMap.Builder<Key, Object>()
+              .put(Key.QUERY_SIZE_LIMIT, 200)
+              .put(Key.SQL_CURSOR_KEEP_ALIVE, TimeValue.timeValueMinutes(1))
+              .build();
+
+      @Override
+      public <T> T getSettingValue(Key key) {
+        return (T) defaultSettings.get(key);
+      }
+
+      @Override
+      public List<?> getSettings() {
+        return (List<?>) defaultSettings;
+      }
+    };
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/SystemFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/SystemFunctionIT.java
index 0b43ec0479..d2798728a1 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/SystemFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/SystemFunctionIT.java
@@ -24,37 +24,57 @@ protected void init() throws Exception {
 
   @Test
   public void typeof_sql_types() {
-    JSONObject response = executeJdbcRequest("SELECT typeof('pewpew'), typeof(NULL), typeof(1.0),"
-        + "typeof(12345), typeof(1234567891011), typeof(INTERVAL 2 DAY);");
-    verifyDataRows(response,
-        rows("STRING", "UNDEFINED", "DOUBLE", "INTEGER", "LONG", "INTERVAL"));
-
-    response = executeJdbcRequest("SELECT"
-        + " typeof(CAST('1961-04-12 09:07:00' AS TIMESTAMP)),"
-        + " typeof(CAST('09:07:00' AS TIME)),"
-        + " typeof(CAST('1961-04-12' AS DATE)),"
-        + " typeof(DATETIME('1961-04-12 09:07:00'))");
-    verifyDataRows(response,
-        rows("TIMESTAMP", "TIME", "DATE", "DATETIME"));
+    JSONObject response =
+        executeJdbcRequest(
+            "SELECT typeof('pewpew'), typeof(NULL), typeof(1.0),"
+                + "typeof(12345), typeof(1234567891011), typeof(INTERVAL 2 DAY);");
+    verifyDataRows(response, rows("KEYWORD", "UNDEFINED", "DOUBLE", "INTEGER", "LONG", "INTERVAL"));
+
+    response =
+        executeJdbcRequest(
+            "SELECT"
+                + " typeof(CAST('1961-04-12 09:07:00' AS TIMESTAMP)),"
+                + " typeof(CAST('09:07:00' AS TIME)),"
+                + " typeof(CAST('1961-04-12' AS DATE)),"
+                + " typeof(DATETIME('1961-04-12 09:07:00'))");
+    verifyDataRows(response, rows("TIMESTAMP", "TIME", "DATE", "DATETIME"));
   }
 
   @Test
   public void typeof_opensearch_types() {
-    JSONObject response = executeJdbcRequest(String.format("SELECT typeof(double_number),"
-        + "typeof(long_number), typeof(integer_number), typeof(byte_number), typeof(short_number),"
-        + "typeof(float_number), typeof(half_float_number), typeof(scaled_float_number)"
-        + " from %s;", TEST_INDEX_DATATYPE_NUMERIC));
-    verifyDataRows(response,
-        rows("DOUBLE", "LONG", "INTEGER", "BYTE", "SHORT", "FLOAT", "FLOAT", "DOUBLE"));
-
-    response = executeJdbcRequest(String.format("SELECT typeof(text_value),"
-        + "typeof(date_value), typeof(boolean_value), typeof(object_value), typeof(keyword_value),"
-        + "typeof(ip_value), typeof(binary_value), typeof(geo_point_value)"
-        // TODO activate this test once `ARRAY` type supported, see ExpressionAnalyzer::isTypeNotSupported
-        //+ ", typeof(nested_value)"
-        + " from %s;", TEST_INDEX_DATATYPE_NONNUMERIC));
-    verifyDataRows(response,
-        rows("OPENSEARCH_TEXT", "TIMESTAMP", "BOOLEAN", "STRUCT", "STRING",
-                "OPENSEARCH_IP", "OPENSEARCH_BINARY", "OPENSEARCH_GEO_POINT"));
+    JSONObject response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT typeof(double_number),typeof(long_number), typeof(integer_number),"
+                    + " typeof(byte_number), typeof(short_number),typeof(float_number),"
+                    + " typeof(half_float_number), typeof(scaled_float_number) from %s;",
+                TEST_INDEX_DATATYPE_NUMERIC));
+    verifyDataRows(
+        response, rows("DOUBLE", "LONG", "INTEGER", "BYTE", "SHORT", "FLOAT", "FLOAT", "DOUBLE"));
+
+    response =
+        executeJdbcRequest(
+            String.format(
+                "SELECT typeof(text_value),typeof(date_value), typeof(date_nanos_value),"
+                    + " typeof(boolean_value), typeof(object_value),"
+                    + " typeof(keyword_value),typeof(ip_value), typeof(binary_value),"
+                    + " typeof(geo_point_value)"
+                    // TODO activate this test once `ARRAY` type supported, see
+                    // ExpressionAnalyzer::isTypeNotSupported
+                    // + ", typeof(nested_value)"
+                    + " from %s;",
+                TEST_INDEX_DATATYPE_NONNUMERIC));
+    verifyDataRows(
+        response,
+        rows(
+            "TEXT",
+            "TIMESTAMP",
+            "TIMESTAMP",
+            "BOOLEAN",
+            "OBJECT",
+            "KEYWORD",
+            "IP",
+            "BINARY",
+            "GEO_POINT"));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/TextFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/TextFunctionIT.java
index 175cafd31e..314132fed0 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/TextFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/TextFunctionIT.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
@@ -43,8 +42,7 @@ void verifyQuery(String query, String type, Integer output) throws IOException {
 
   void verifyQueryWithNullOutput(String query, String type) throws IOException {
     JSONObject result = executeQuery("select 'test null'," + query);
-    verifySchema(result, schema(query, null, type),
-            schema("'test null'", null, type));
+    verifySchema(result, schema(query, null, type), schema("'test null'", null, type));
     verifyDataRows(result, rows("test null", null));
   }
 
@@ -108,6 +106,7 @@ public void testLtrim() throws IOException {
 
   @Test
   public void testConcat() throws IOException {
+    verifyQuery("concat('hello', 'whole', 'world', '!', '!')", "keyword", "hellowholeworld!!");
     verifyQuery("concat('hello', 'world')", "keyword", "helloworld");
     verifyQuery("concat('', 'hello')", "keyword", "hello");
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/WildcardQueryIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/WildcardQueryIT.java
index ee636ed5ce..c6e43010d9 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/WildcardQueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/WildcardQueryIT.java
@@ -3,19 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_WILDCARD;
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 
 import java.io.IOException;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 
-import static org.opensearch.sql.util.MatcherUtils.rows;
-import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
-
 public class WildcardQueryIT extends SQLIntegTestCase {
   @Override
   protected void init() throws Exception {
@@ -26,11 +24,17 @@ protected void init() throws Exception {
   public void test_wildcard_query_asterisk_function() throws IOException {
     String expected = "test wildcard";
 
-    String query1 = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, 't*') LIMIT 1";
+    String query1 =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, 't*') LIMIT 1";
     JSONObject result1 = executeJdbcRequest(query1);
     verifyDataRows(result1, rows(expected));
 
-    String query2 = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcardquery(KeywordBody, 't*') LIMIT 1";
+    String query2 =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcardquery(KeywordBody, 't*') LIMIT 1";
     JSONObject result2 = executeJdbcRequest(query2);
     verifyDataRows(result2, rows(expected));
   }
@@ -39,11 +43,17 @@ public void test_wildcard_query_asterisk_function() throws IOException {
   public void test_wildcard_query_question_mark_function() throws IOException {
     String expected = "test wildcard";
 
-    String query1 = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, 'test wild??rd')";
+    String query1 =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, 'test wild??rd')";
     JSONObject result1 = executeJdbcRequest(query1);
     verifyDataRows(result1, rows(expected));
 
-    String query2 = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcardquery(KeywordBody, 'test wild??rd')";
+    String query2 =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcardquery(KeywordBody, 'test wild??rd')";
     JSONObject result2 = executeJdbcRequest(query2);
     verifyDataRows(result2, rows(expected));
   }
@@ -51,11 +61,17 @@ public void test_wildcard_query_question_mark_function() throws IOException {
   //  SQL uses ? as a wildcard which is converted to * in WildcardQuery.java
   @Test
   public void test_wildcard_query_sql_wildcard_percent_conversion() throws IOException {
-    String query1 = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, 'test%')";
+    String query1 =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, 'test%')";
     JSONObject result1 = executeJdbcRequest(query1);
     assertEquals(8, result1.getInt("total"));
 
-    String query2 = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, 'test*')";
+    String query2 =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, 'test*')";
     JSONObject result2 = executeJdbcRequest(query2);
     assertEquals(result1.getInt("total"), result2.getInt("total"));
   }
@@ -63,27 +79,41 @@ public void test_wildcard_query_sql_wildcard_percent_conversion() throws IOExcep
   //  SQL uses _ as a wildcard which is converted to ? in WildcardQuery.java
   @Test
   public void test_wildcard_query_sql_wildcard_underscore_conversion() throws IOException {
-    String query1 = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, 'test wild_ard*')";
+    String query1 =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, 'test wild_ard*')";
     JSONObject result1 = executeJdbcRequest(query1);
     assertEquals(7, result1.getInt("total"));
 
-    String query2 = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, 'test wild?ard*')";
+    String query2 =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, 'test wild?ard*')";
     JSONObject result2 = executeJdbcRequest(query2);
     assertEquals(result1.getInt("total"), result2.getInt("total"));
   }
 
   @Test
   public void test_escaping_wildcard_percent_in_the_beginning_of_text() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, '\\\\%*')";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, '\\\\%*')";
     JSONObject result = executeJdbcRequest(query);
     verifyDataRows(result, rows("%test wildcard in the beginning of the text"));
   }
 
   @Test
   public void test_escaping_wildcard_percent_in_text() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, '*\\\\%%')";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, '*\\\\%%')";
     JSONObject result = executeJdbcRequest(query);
-    verifyDataRows(result, rows("test wildcard in % the middle of the text"),
+    verifyDataRows(
+        result,
+        rows("test wildcard in % the middle of the text"),
         rows("test wildcard %% beside each other"),
         rows("test wildcard in the end of the text%"),
         rows("%test wildcard in the beginning of the text"));
@@ -91,30 +121,44 @@ public void test_escaping_wildcard_percent_in_text() throws IOException {
 
   @Test
   public void test_escaping_wildcard_percent_in_the_end_of_text() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, '*\\\\%')";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, '*\\\\%')";
     JSONObject result = executeJdbcRequest(query);
     verifyDataRows(result, rows("test wildcard in the end of the text%"));
   }
 
   @Test
   public void test_double_escaped_wildcard_percent() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, '*\\\\%\\\\%*')";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, '*\\\\%\\\\%*')";
     JSONObject result = executeJdbcRequest(query);
     verifyDataRows(result, rows("test wildcard %% beside each other"));
   }
 
   @Test
   public void test_escaping_wildcard_underscore_in_the_beginning_of_text() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, '\\\\_*')";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, '\\\\_*')";
     JSONObject result = executeJdbcRequest(query);
     verifyDataRows(result, rows("_test wildcard in the beginning of the text"));
   }
 
   @Test
   public void test_escaping_wildcard_underscore_in_text() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, '*\\\\_*')";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, '*\\\\_*')";
     JSONObject result = executeJdbcRequest(query);
-    verifyDataRows(result, rows("test wildcard in _ the middle of the text"),
+    verifyDataRows(
+        result,
+        rows("test wildcard in _ the middle of the text"),
         rows("test wildcard __ beside each other"),
         rows("test wildcard in the end of the text_"),
         rows("_test wildcard in the beginning of the text"),
@@ -123,60 +167,77 @@ public void test_escaping_wildcard_underscore_in_text() throws IOException {
 
   @Test
   public void test_escaping_wildcard_underscore_in_the_end_of_text() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, '*\\\\_')";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, '*\\\\_')";
     JSONObject result = executeJdbcRequest(query);
-    verifyDataRows(result,
-        rows("test wildcard in the end of the text_"),
-        rows("test backslash wildcard \\_"));
+    verifyDataRows(
+        result, rows("test wildcard in the end of the text_"), rows("test backslash wildcard \\_"));
   }
 
   @Test
   public void test_double_escaped_wildcard_underscore() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, '*\\\\_\\\\_*')";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, '*\\\\_\\\\_*')";
     JSONObject result = executeJdbcRequest(query);
     verifyDataRows(result, rows("test wildcard __ beside each other"));
   }
 
   @Test
   public void test_backslash_wildcard() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(KeywordBody, '*\\\\\\\\\\\\_')";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, '*\\\\\\\\\\\\_')";
     JSONObject result = executeJdbcRequest(query);
     verifyDataRows(result, rows("test backslash wildcard \\_"));
   }
 
   @Test
   public void all_params_test() throws IOException {
-    String query = "SELECT KeywordBody FROM " + TEST_INDEX_WILDCARD
-        + " WHERE wildcard_query(KeywordBody, 'test*', boost = 0.9,"
-        + " case_insensitive=true, rewrite='constant_score')";
+    String query =
+        "SELECT KeywordBody FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(KeywordBody, 'test*', boost = 0.9,"
+            + " case_insensitive=true, rewrite='constant_score')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(8, result.getInt("total"));
   }
 
   @Test
   public void test_wildcard_query_on_text_field_with_one_word() throws IOException {
-    String query = "SELECT * FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(TextBody, 'test*')";
+    String query =
+        "SELECT * FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(TextBody, 'test*')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(9, result.getInt("total"));
   }
 
   @Test
   public void test_wildcard_query_on_text_keyword_field_with_one_word() throws IOException {
-    String query = "SELECT * FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(TextKeywordBody, 'test*')";
+    String query =
+        "SELECT * FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(TextKeywordBody, 'test*')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(9, result.getInt("total"));
   }
 
   @Test
   public void test_wildcard_query_on_text_field_with_greater_than_one_word() throws IOException {
-    String query = "SELECT * FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(TextBody, 'test wild*')";
+    String query =
+        "SELECT * FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(TextBody, 'test wild*')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(0, result.getInt("total"));
   }
 
   @Test
-  public void test_wildcard_query_on_text_keyword_field_with_greater_than_one_word() throws IOException {
-    String query = "SELECT * FROM " + TEST_INDEX_WILDCARD + " WHERE wildcard_query(TextKeywordBody, 'test wild*')";
+  public void test_wildcard_query_on_text_keyword_field_with_greater_than_one_word()
+      throws IOException {
+    String query =
+        "SELECT * FROM "
+            + TEST_INDEX_WILDCARD
+            + " WHERE wildcard_query(TextKeywordBody, 'test wild*')";
     JSONObject result = executeJdbcRequest(query);
     assertEquals(0, result.getInt("total"));
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/WindowFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/WindowFunctionIT.java
index ac042b4a47..82c8d8eeb8 100644
--- a/integ-test/src/test/java/org/opensearch/sql/sql/WindowFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/sql/WindowFunctionIT.java
@@ -3,14 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRowsInOrder;
 
-
 import org.json.JSONObject;
 import org.junit.Test;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
@@ -26,11 +24,16 @@ protected void init() throws Exception {
 
   @Test
   public void testOrderByNullFirst() {
-    JSONObject response = new JSONObject(
-        executeQuery("SELECT age, ROW_NUMBER() OVER(ORDER BY age DESC NULLS FIRST) "
-            + "FROM " + TestsConstants.TEST_INDEX_BANK_WITH_NULL_VALUES, "jdbc"));
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT age, ROW_NUMBER() OVER(ORDER BY age DESC NULLS FIRST) "
+                    + "FROM "
+                    + TestsConstants.TEST_INDEX_BANK_WITH_NULL_VALUES,
+                "jdbc"));
 
-    verifyDataRows(response,
+    verifyDataRows(
+        response,
         rows(null, 1),
         rows(36, 2),
         rows(36, 3),
@@ -42,11 +45,16 @@ public void testOrderByNullFirst() {
 
   @Test
   public void testOrderByNullLast() {
-    JSONObject response = new JSONObject(
-        executeQuery("SELECT age, ROW_NUMBER() OVER(ORDER BY age NULLS LAST) "
-            + "FROM " + TestsConstants.TEST_INDEX_BANK_WITH_NULL_VALUES, "jdbc"));
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT age, ROW_NUMBER() OVER(ORDER BY age NULLS LAST) "
+                    + "FROM "
+                    + TestsConstants.TEST_INDEX_BANK_WITH_NULL_VALUES,
+                "jdbc"));
 
-    verifyDataRows(response,
+    verifyDataRows(
+        response,
         rows(28, 1),
         rows(32, 2),
         rows(33, 3),
@@ -58,10 +66,15 @@ public void testOrderByNullLast() {
 
   @Test
   public void testDistinctCountOverNull() {
-    JSONObject response = new JSONObject(executeQuery(
-        "SELECT lastname, COUNT(DISTINCT gender) OVER() "
-            + "FROM " + TestsConstants.TEST_INDEX_BANK, "jdbc"));
-    verifyDataRows(response,
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT lastname, COUNT(DISTINCT gender) OVER() "
+                    + "FROM "
+                    + TestsConstants.TEST_INDEX_BANK,
+                "jdbc"));
+    verifyDataRows(
+        response,
         rows("Duke Willmington", 2),
         rows("Bond", 2),
         rows("Bates", 2),
@@ -73,10 +86,15 @@ public void testDistinctCountOverNull() {
 
   @Test
   public void testDistinctCountOver() {
-    JSONObject response = new JSONObject(executeQuery(
-        "SELECT lastname, COUNT(DISTINCT gender) OVER(ORDER BY lastname) "
-            + "FROM " + TestsConstants.TEST_INDEX_BANK, "jdbc"));
-    verifyDataRowsInOrder(response,
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT lastname, COUNT(DISTINCT gender) OVER(ORDER BY lastname) "
+                    + "FROM "
+                    + TestsConstants.TEST_INDEX_BANK,
+                "jdbc"));
+    verifyDataRowsInOrder(
+        response,
         rows("Adams", 1),
         rows("Ayala", 2),
         rows("Bates", 2),
@@ -88,10 +106,15 @@ public void testDistinctCountOver() {
 
   @Test
   public void testDistinctCountPartition() {
-    JSONObject response = new JSONObject(executeQuery(
-        "SELECT lastname, COUNT(DISTINCT gender) OVER(PARTITION BY gender ORDER BY lastname) "
-            + "FROM " + TestsConstants.TEST_INDEX_BANK, "jdbc"));
-    verifyDataRowsInOrder(response,
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT lastname, COUNT(DISTINCT gender) OVER(PARTITION BY gender ORDER BY"
+                    + " lastname) FROM "
+                    + TestsConstants.TEST_INDEX_BANK,
+                "jdbc"));
+    verifyDataRowsInOrder(
+        response,
         rows("Ayala", 1),
         rows("Bates", 1),
         rows("Mcpherson", 1),
@@ -101,4 +124,63 @@ public void testDistinctCountPartition() {
         rows("Ratliff", 1));
   }
 
+  @Test
+  public void testPercentileOverNull() {
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT lastname, percentile(balance, 50) OVER() "
+                    + "FROM "
+                    + TestsConstants.TEST_INDEX_BANK,
+                "jdbc"));
+    verifyDataRows(
+        response,
+        rows("Duke Willmington", 32838),
+        rows("Bond", 32838),
+        rows("Bates", 32838),
+        rows("Adams", 32838),
+        rows("Ratliff", 32838),
+        rows("Ayala", 32838),
+        rows("Mcpherson", 32838));
+  }
+
+  @Test
+  public void testPercentileOver() {
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT lastname, percentile(balance, 50) OVER(ORDER BY lastname) "
+                    + "FROM "
+                    + TestsConstants.TEST_INDEX_BANK,
+                "jdbc"));
+    verifyDataRowsInOrder(
+        response,
+        rows("Adams", 4180),
+        rows("Ayala", 22360),
+        rows("Bates", 32838),
+        rows("Bond", 19262),
+        rows("Duke Willmington", 32838),
+        rows("Mcpherson", 36031.5),
+        rows("Ratliff", 32838));
+  }
+
+  @Test
+  public void testPercentilePartition() {
+    JSONObject response =
+        new JSONObject(
+            executeQuery(
+                "SELECT lastname, percentile(balance, 50) OVER(PARTITION BY gender ORDER BY"
+                    + " lastname) FROM "
+                    + TestsConstants.TEST_INDEX_BANK,
+                "jdbc"));
+    verifyDataRowsInOrder(
+        response,
+        rows("Ayala", 40540),
+        rows("Bates", 36689),
+        rows("Mcpherson", 40540),
+        rows("Adams", 4180),
+        rows("Bond", 4933),
+        rows("Duke Willmington", 5686),
+        rows("Ratliff", 11052));
+  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/util/ExecuteOnCallerThreadQueryManager.java b/integ-test/src/test/java/org/opensearch/sql/util/ExecuteOnCallerThreadQueryManager.java
index 0a42dc83e3..39437ffc5f 100644
--- a/integ-test/src/test/java/org/opensearch/sql/util/ExecuteOnCallerThreadQueryManager.java
+++ b/integ-test/src/test/java/org/opensearch/sql/util/ExecuteOnCallerThreadQueryManager.java
@@ -12,7 +12,7 @@
 /**
  * ONLY USED FOR TEST PURPOSE.
  *
- * Execute {@link AbstractPlan} on caller thread.
+ * <p>Execute {@link AbstractPlan} on caller thread.
  */
 public class ExecuteOnCallerThreadQueryManager implements QueryManager {
   @Override
diff --git a/integ-test/src/test/java/org/opensearch/sql/util/InternalRestHighLevelClient.java b/integ-test/src/test/java/org/opensearch/sql/util/InternalRestHighLevelClient.java
new file mode 100644
index 0000000000..0897a508e3
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/util/InternalRestHighLevelClient.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.util;
+
+import java.util.Collections;
+import org.opensearch.client.RestClient;
+import org.opensearch.client.RestHighLevelClient;
+
+/** Internal RestHighLevelClient only for testing purpose. */
+public class InternalRestHighLevelClient extends RestHighLevelClient {
+  public InternalRestHighLevelClient(RestClient restClient) {
+    super(restClient, RestClient::close, Collections.emptyList());
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/util/MatcherUtils.java b/integ-test/src/test/java/org/opensearch/sql/util/MatcherUtils.java
index cfacefc2c6..26a60cb4e5 100644
--- a/integ-test/src/test/java/org/opensearch/sql/util/MatcherUtils.java
+++ b/integ-test/src/test/java/org/opensearch/sql/util/MatcherUtils.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.util;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
@@ -17,10 +17,10 @@
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasItems;
 import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.common.base.Strings;
 import com.google.gson.JsonParser;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -44,16 +44,15 @@ public class MatcherUtils {
   /**
    * Assert field value in object by a custom matcher and getter to access the field.
    *
-   * @param name       description
+   * @param name description
    * @param subMatcher sub-matcher for field
-   * @param getter     getter function to access the field
-   * @param <T>        type of outer object
-   * @param <U>        type of inner field
+   * @param getter getter function to access the field
+   * @param <T> type of outer object
+   * @param <U> type of inner field
    * @return matcher
    */
-  public static <T, U> FeatureMatcher<T, U> featureValueOf(String name,
-                                                           Matcher<U> subMatcher,
-                                                           Function<T, U> getter) {
+  public static <T, U> FeatureMatcher<T, U> featureValueOf(
+      String name, Matcher<U> subMatcher, Function<T, U> getter) {
     return new FeatureMatcher<T, U>(subMatcher, name, name) {
       @Override
       protected U featureValueOf(T actual) {
@@ -67,8 +66,8 @@ public static Matcher<SearchHits> hits(Matcher<SearchHit>... hitMatchers) {
     if (hitMatchers.length == 0) {
       return featureValueOf("SearchHits", emptyArray(), SearchHits::getHits);
     }
-    return featureValueOf("SearchHits", arrayContainingInAnyOrder(hitMatchers),
-        SearchHits::getHits);
+    return featureValueOf(
+        "SearchHits", arrayContainingInAnyOrder(hitMatchers), SearchHits::getHits);
   }
 
   @SafeVarargs
@@ -91,14 +90,17 @@ public static Matcher<Map<String, Object>> kv(String key, Object value) {
   }
 
   public static Matcher<JSONObject> hitAny(String query, Matcher<JSONObject>... matcher) {
-    return featureValueOf("SearchHits", hasItems(matcher), actual -> {
-      JSONArray array = (JSONArray) (actual.query(query));
-      List<JSONObject> results = new ArrayList<>(array.length());
-      for (Object element : array) {
-        results.add((JSONObject) element);
-      }
-      return results;
-    });
+    return featureValueOf(
+        "SearchHits",
+        hasItems(matcher),
+        actual -> {
+          JSONArray array = (JSONArray) (actual.query(query));
+          List<JSONObject> results = new ArrayList<>(array.length());
+          for (Object element : array) {
+            results.add((JSONObject) element);
+          }
+          return results;
+        });
   }
 
   public static Matcher<JSONObject> hitAny(Matcher<JSONObject>... matcher) {
@@ -106,14 +108,17 @@ public static Matcher<JSONObject> hitAny(Matcher<JSONObject>... matcher) {
   }
 
   public static Matcher<JSONObject> hitAll(Matcher<JSONObject>... matcher) {
-    return featureValueOf("SearchHits", containsInAnyOrder(matcher), actual -> {
-      JSONArray array = (JSONArray) (actual.query("/hits/hits"));
-      List<JSONObject> results = new ArrayList<>(array.length());
-      for (Object element : array) {
-        results.add((JSONObject) element);
-      }
-      return results;
-    });
+    return featureValueOf(
+        "SearchHits",
+        containsInAnyOrder(matcher),
+        actual -> {
+          JSONArray array = (JSONArray) (actual.query("/hits/hits"));
+          List<JSONObject> results = new ArrayList<>(array.length());
+          for (Object element : array) {
+            results.add((JSONObject) element);
+          }
+          return results;
+        });
   }
 
   public static Matcher<JSONObject> kvString(String key, Matcher<String> matcher) {
@@ -121,7 +126,8 @@ public static Matcher<JSONObject> kvString(String key, Matcher<String> matcher)
   }
 
   public static Matcher<JSONObject> kvDouble(String key, Matcher<Double> matcher) {
-    return featureValueOf("Json Match", matcher, actual -> (Double) actual.query(key));
+    return featureValueOf(
+        "Json Match", matcher, actual -> ((BigDecimal) actual.query(key)).doubleValue());
   }
 
   public static Matcher<JSONObject> kvInt(String key, Matcher<Integer> matcher) {
@@ -138,6 +144,16 @@ public static void verifySchema(JSONObject response, Matcher<JSONObject>... matc
     }
   }
 
+  @SafeVarargs
+  public static void verifySchemaInOrder(JSONObject response, Matcher<JSONObject>... matchers) {
+    try {
+      verifyInOrder(response.getJSONArray("schema"), matchers);
+    } catch (Exception e) {
+      LOG.error(String.format("verify schema failed, response: %s", response.toString()), e);
+      throw e;
+    }
+  }
+
   @SafeVarargs
   public static void verifyDataRows(JSONObject response, Matcher<JSONArray>... matchers) {
     verify(response.getJSONArray("datarows"), matchers);
@@ -195,19 +211,18 @@ public static <T> void verifyOrder(JSONArray array, Matcher<T>... matchers) {
     assertThat(objects, containsInRelativeOrder(matchers));
   }
 
-  public static TypeSafeMatcher<JSONObject> schema(String expectedName,
-                                                   String expectedType) {
+  public static TypeSafeMatcher<JSONObject> schema(String expectedName, String expectedType) {
     return schema(expectedName, null, expectedType);
   }
 
-  public static TypeSafeMatcher<JSONObject> schema(String expectedName, String expectedAlias,
-                                                   String expectedType) {
+  public static TypeSafeMatcher<JSONObject> schema(
+      String expectedName, String expectedAlias, String expectedType) {
     return new TypeSafeMatcher<JSONObject>() {
       @Override
       public void describeTo(Description description) {
         description.appendText(
-            String
-                .format("(name=%s, alias=%s, type=%s)", expectedName, expectedAlias, expectedType));
+            String.format(
+                "(name=%s, alias=%s, type=%s)", expectedName, expectedAlias, expectedType));
       }
 
       @Override
@@ -215,9 +230,9 @@ protected boolean matchesSafely(JSONObject jsonObject) {
         String actualName = (String) jsonObject.query("/name");
         String actualAlias = (String) jsonObject.query("/alias");
         String actualType = (String) jsonObject.query("/type");
-        return expectedName.equals(actualName) &&
-            (Strings.isNullOrEmpty(expectedAlias) || expectedAlias.equals(actualAlias)) &&
-            expectedType.equals(actualType);
+        return expectedName.equals(actualName)
+            && (Strings.isNullOrEmpty(expectedAlias) || expectedAlias.equals(actualAlias))
+            && expectedType.equals(actualType);
       }
     };
   }
@@ -231,30 +246,7 @@ public void describeTo(Description description) {
 
       @Override
       protected boolean matchesSafely(JSONArray array) {
-        if (array.length() != expectedObjects.length) {
-          return false;
-        }
-
-        for (int i = 0; i < expectedObjects.length; i++) {
-          Object expected = expectedObjects[i];
-          boolean isEqual;
-
-          // Use similar() because JSONObject/JSONArray.equals() only check if same reference
-          if (expected instanceof JSONObject) {
-            isEqual = ((JSONObject) expected).similar(array.get(i));
-          } else if (expected instanceof JSONArray) {
-            isEqual = ((JSONArray) expected).similar(array.get(i));
-          } else if (null == expected) {
-            isEqual = JSONObject.NULL == array.get(i);
-          } else {
-            isEqual = expected.equals(array.get(i));
-          }
-
-          if (!isEqual) {
-            return false;
-          }
-        }
-        return true;
+        return array.similar(new JSONArray(expectedObjects));
       }
     };
   }
@@ -310,10 +302,7 @@ public void describeTo(Description description) {
     };
   }
 
-
-  /**
-   * Tests if a string is equal to another string, ignore the case and whitespace.
-   */
+  /** Tests if a string is equal to another string, ignore the case and whitespace. */
   public static class IsEqualIgnoreCaseAndWhiteSpace extends TypeSafeMatcher<String> {
     private final String string;
 
@@ -336,7 +325,8 @@ public void describeMismatchSafely(String item, Description mismatchDescription)
 
     @Override
     public void describeTo(Description description) {
-      description.appendText("a string equal to ")
+      description
+          .appendText("a string equal to ")
           .appendValue(string)
           .appendText(" ignore case and white space");
     }
@@ -356,13 +346,11 @@ public static Matcher<String> equalToIgnoreCaseAndWhiteSpace(String expectedStri
 
   /**
    * Compare two JSON string are equals.
+   *
    * @param expected expected JSON string.
    * @param actual actual JSON string.
    */
   public static void assertJsonEquals(String expected, String actual) {
-    assertEquals(
-        JsonParser.parseString(expected),
-        JsonParser.parseString(actual)
-    );
+    assertEquals(JsonParser.parseString(expected), JsonParser.parseString(actual));
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/util/StandaloneModule.java b/integ-test/src/test/java/org/opensearch/sql/util/StandaloneModule.java
new file mode 100644
index 0000000000..5d6f0b5a55
--- /dev/null
+++ b/integ-test/src/test/java/org/opensearch/sql/util/StandaloneModule.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.util;
+
+import lombok.RequiredArgsConstructor;
+import org.opensearch.client.RestHighLevelClient;
+import org.opensearch.common.inject.AbstractModule;
+import org.opensearch.common.inject.Provides;
+import org.opensearch.common.inject.Singleton;
+import org.opensearch.sql.analysis.Analyzer;
+import org.opensearch.sql.analysis.ExpressionAnalyzer;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.executor.QueryManager;
+import org.opensearch.sql.executor.QueryService;
+import org.opensearch.sql.executor.execution.QueryPlanFactory;
+import org.opensearch.sql.executor.pagination.PlanSerializer;
+import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
+import org.opensearch.sql.monitor.AlwaysHealthyMonitor;
+import org.opensearch.sql.monitor.ResourceMonitor;
+import org.opensearch.sql.opensearch.client.OpenSearchClient;
+import org.opensearch.sql.opensearch.client.OpenSearchRestClient;
+import org.opensearch.sql.opensearch.executor.OpenSearchExecutionEngine;
+import org.opensearch.sql.opensearch.executor.protector.ExecutionProtector;
+import org.opensearch.sql.opensearch.executor.protector.OpenSearchExecutionProtector;
+import org.opensearch.sql.opensearch.storage.OpenSearchStorageEngine;
+import org.opensearch.sql.planner.Planner;
+import org.opensearch.sql.planner.optimizer.LogicalPlanOptimizer;
+import org.opensearch.sql.ppl.PPLService;
+import org.opensearch.sql.ppl.antlr.PPLSyntaxParser;
+import org.opensearch.sql.sql.SQLService;
+import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
+import org.opensearch.sql.storage.StorageEngine;
+
+/**
+ * A utility class which registers SQL engine singletons as `OpenSearchPluginModule` does. It is
+ * needed to get access to those instances in test and validate their behavior.
+ */
+@RequiredArgsConstructor
+public class StandaloneModule extends AbstractModule {
+
+  private final RestHighLevelClient client;
+
+  private final Settings settings;
+
+  private final DataSourceService dataSourceService;
+
+  private final BuiltinFunctionRepository functionRepository =
+      BuiltinFunctionRepository.getInstance();
+
+  @Override
+  protected void configure() {}
+
+  @Provides
+  public OpenSearchClient openSearchClient() {
+    return new OpenSearchRestClient(client);
+  }
+
+  @Provides
+  public StorageEngine storageEngine(OpenSearchClient client) {
+    return new OpenSearchStorageEngine(client, settings);
+  }
+
+  @Provides
+  public ExecutionEngine executionEngine(
+      OpenSearchClient client, ExecutionProtector protector, PlanSerializer planSerializer) {
+    return new OpenSearchExecutionEngine(client, protector, planSerializer);
+  }
+
+  @Provides
+  public ResourceMonitor resourceMonitor() {
+    return new AlwaysHealthyMonitor();
+  }
+
+  @Provides
+  public ExecutionProtector protector(ResourceMonitor resourceMonitor) {
+    return new OpenSearchExecutionProtector(resourceMonitor);
+  }
+
+  @Provides
+  @Singleton
+  public QueryManager queryManager() {
+    return new ExecuteOnCallerThreadQueryManager();
+  }
+
+  @Provides
+  public PPLService pplService(QueryManager queryManager, QueryPlanFactory queryPlanFactory) {
+    return new PPLService(new PPLSyntaxParser(), queryManager, queryPlanFactory);
+  }
+
+  @Provides
+  public SQLService sqlService(QueryManager queryManager, QueryPlanFactory queryPlanFactory) {
+    return new SQLService(new SQLSyntaxParser(), queryManager, queryPlanFactory);
+  }
+
+  @Provides
+  public PlanSerializer planSerializer(StorageEngine storageEngine) {
+    return new PlanSerializer(storageEngine);
+  }
+
+  @Provides
+  public QueryPlanFactory queryPlanFactory(QueryService qs) {
+
+    return new QueryPlanFactory(qs);
+  }
+
+  @Provides
+  public QueryService queryService(ExecutionEngine executionEngine) {
+    Analyzer analyzer =
+        new Analyzer(
+            new ExpressionAnalyzer(functionRepository), dataSourceService, functionRepository);
+    Planner planner = new Planner(LogicalPlanOptimizer.create());
+    return new QueryService(analyzer, executionEngine, planner);
+  }
+}
diff --git a/integ-test/src/test/java/org/opensearch/sql/util/TestUtils.java b/integ-test/src/test/java/org/opensearch/sql/util/TestUtils.java
index bd75ead43b..a2f4021c1d 100644
--- a/integ-test/src/test/java/org/opensearch/sql/util/TestUtils.java
+++ b/integ-test/src/test/java/org/opensearch/sql/util/TestUtils.java
@@ -3,10 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.util;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.opensearch.sql.executor.pagination.PlanSerializer.CURSOR_PREFIX;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -20,31 +22,30 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
 import org.json.JSONObject;
-import org.junit.Assert;
 import org.opensearch.action.bulk.BulkRequest;
 import org.opensearch.action.bulk.BulkResponse;
 import org.opensearch.action.index.IndexRequest;
 import org.opensearch.client.Client;
 import org.opensearch.client.Request;
-import org.opensearch.client.RequestOptions;
 import org.opensearch.client.Response;
 import org.opensearch.client.RestClient;
 import org.opensearch.common.xcontent.XContentType;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.sql.legacy.cursor.CursorType;
 
 public class TestUtils {
 
   /**
    * Create test index by REST client.
    *
-   * @param client    client connection
+   * @param client client connection
    * @param indexName test index name
-   * @param mapping   test index mapping or null if no predefined mapping
+   * @param mapping test index mapping or null if no predefined mapping
    */
   public static void createIndexByRestClient(RestClient client, String indexName, String mapping) {
     Request request = new Request("PUT", "/" + indexName);
@@ -55,16 +56,15 @@ public static void createIndexByRestClient(RestClient client, String indexName,
   }
 
   /**
-   * https://github.com/elastic/elasticsearch/pull/49959
-   * Deprecate creation of dot-prefixed index names except for hidden and system indices.
-   * Create hidden index by REST client.
+   * https://github.com/elastic/elasticsearch/pull/49959 Deprecate creation of dot-prefixed index
+   * names except for hidden and system indices. Create hidden index by REST client.
    *
-   * @param client    client connection
+   * @param client client connection
    * @param indexName test index name
-   * @param mapping   test index mapping or null if no predefined mapping
+   * @param mapping test index mapping or null if no predefined mapping
    */
-  public static void createHiddenIndexByRestClient(RestClient client, String indexName,
-                                                   String mapping) {
+  public static void createHiddenIndexByRestClient(
+      RestClient client, String indexName, String mapping) {
     Request request = new Request("PUT", "/" + indexName);
     JSONObject jsonObject = isNullOrEmpty(mapping) ? new JSONObject() : new JSONObject(mapping);
     jsonObject.put("settings", new JSONObject("{\"index\":{\"hidden\":true}}"));
@@ -74,11 +74,10 @@ public static void createHiddenIndexByRestClient(RestClient client, String index
   }
 
   /**
-   * Check if index already exists by OpenSearch index exists API which returns:
-   * 200 - specified indices or aliases exist
-   * 404 - one or more indices specified or aliases do not exist
+   * Check if index already exists by OpenSearch index exists API which returns: 200 - specified
+   * indices or aliases exist 404 - one or more indices specified or aliases do not exist
    *
-   * @param client    client connection
+   * @param client client connection
    * @param indexName index name
    * @return true for index exist
    */
@@ -94,13 +93,13 @@ public static boolean isIndexExist(RestClient client, String indexName) {
   /**
    * Load test data set by REST client.
    *
-   * @param client          client connection
-   * @param indexName       index name
+   * @param client client connection
+   * @param indexName index name
    * @param dataSetFilePath file path of test data set
    * @throws IOException
    */
-  public static void loadDataByRestClient(RestClient client, String indexName,
-                                          String dataSetFilePath) throws IOException {
+  public static void loadDataByRestClient(
+      RestClient client, String indexName, String dataSetFilePath) throws IOException {
     Path path = Paths.get(getResourceFilePath(dataSetFilePath));
     Request request = new Request("POST", "/" + indexName + "/_bulk?refresh=true");
     request.setJsonEntity(new String(Files.readAllBytes(path)));
@@ -110,7 +109,7 @@ public static void loadDataByRestClient(RestClient client, String indexName,
   /**
    * Perform a request by REST client.
    *
-   * @param client  client connection
+   * @param client client connection
    * @param request request object
    */
   public static Response performRequest(RestClient client, Request request) {
@@ -127,566 +126,567 @@ public static Response performRequest(RestClient client, Request request) {
   }
 
   public static String getAccountIndexMapping() {
-    return "{  \"mappings\": {" +
-        " \"properties\": {\n" +
-        "          \"gender\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fielddata\": true\n" +
-        "          }," +
-        "          \"address\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fielddata\": true\n" +
-        "          }," +
-        "          \"firstname\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fielddata\": true,\n" +
-        "            \"fields\": {\n" +
-        "              \"keyword\": {\n" +
-        "                \"type\": \"keyword\",\n" +
-        "                \"ignore_above\": 256\n" +
-        "              }" +
-        "            }" +
-        "          }," +
-        "          \"lastname\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fielddata\": true,\n" +
-        "            \"fields\": {\n" +
-        "              \"keyword\": {\n" +
-        "                \"type\": \"keyword\",\n" +
-        "                \"ignore_above\": 256\n" +
-        "              }" +
-        "            }" +
-        "          }," +
-        "          \"state\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fielddata\": true,\n" +
-        "            \"fields\": {\n" +
-        "              \"keyword\": {\n" +
-        "                \"type\": \"keyword\",\n" +
-        "                \"ignore_above\": 256\n" +
-        "              }" +
-        "            }" +
-        "          }" +
-        "       }" +
-        "   }" +
-        "}";
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"gender\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          },"
+        + "          \"address\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          },"
+        + "          \"firstname\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true,\n"
+        + "            \"fields\": {\n"
+        + "              \"keyword\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"ignore_above\": 256\n"
+        + "              }"
+        + "            }"
+        + "          },"
+        + "          \"lastname\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true,\n"
+        + "            \"fields\": {\n"
+        + "              \"keyword\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"ignore_above\": 256\n"
+        + "              }"
+        + "            }"
+        + "          },"
+        + "          \"state\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true,\n"
+        + "            \"fields\": {\n"
+        + "              \"keyword\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"ignore_above\": 256\n"
+        + "              }"
+        + "            }"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
   }
 
   public static String getPhraseIndexMapping() {
-    return "{  \"mappings\": {" +
-        " \"properties\": {\n" +
-        "          \"phrase\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"store\": true\n" +
-        "          }" +
-        "       }" +
-        "   }" +
-        "}";
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"phrase\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"store\": true\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
   }
 
   public static String getDogIndexMapping() {
-    return "{  \"mappings\": {" +
-        " \"properties\": {\n" +
-        "          \"dog_name\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fielddata\": true\n" +
-        "          }" +
-        "       }" +
-        "   }" +
-        "}";
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"dog_name\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
   }
 
   public static String getDogs2IndexMapping() {
-    return "{  \"mappings\": {" +
-        " \"properties\": {\n" +
-        "          \"dog_name\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fielddata\": true\n" +
-        "          },\n" +
-        "          \"holdersName\": {\n" +
-        "            \"type\": \"keyword\"\n" +
-        "          }" +
-        "       }" +
-        "   }" +
-        "}";
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"dog_name\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          },\n"
+        + "          \"holdersName\": {\n"
+        + "            \"type\": \"keyword\"\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
   }
 
   public static String getDogs3IndexMapping() {
-    return "{  \"mappings\": {" +
-        " \"properties\": {\n" +
-        "          \"holdersName\": {\n" +
-        "            \"type\": \"keyword\"\n" +
-        "          },\n" +
-        "          \"color\": {\n" +
-        "            \"type\": \"text\"\n" +
-        "          }" +
-        "       }" +
-        "   }" +
-        "}";
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"holdersName\": {\n"
+        + "            \"type\": \"keyword\"\n"
+        + "          },\n"
+        + "          \"color\": {\n"
+        + "            \"type\": \"text\"\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
   }
 
   public static String getPeople2IndexMapping() {
-    return "{  \"mappings\": {" +
-        " \"properties\": {\n" +
-        "          \"firstname\": {\n" +
-        "            \"type\": \"keyword\"\n" +
-        "          }" +
-        "       }" +
-        "   }" +
-        "}";
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"firstname\": {\n"
+        + "            \"type\": \"keyword\"\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
   }
 
   public static String getGameOfThronesIndexMapping() {
-    return "{  \"mappings\": { " +
-        "    \"properties\": {\n" +
-        "      \"nickname\": {\n" +
-        "        \"type\":\"text\", " +
-        "        \"fielddata\":true" +
-        "      },\n" +
-        "      \"name\": {\n" +
-        "        \"properties\": {\n" +
-        "          \"firstname\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fielddata\": true\n" +
-        "          },\n" +
-        "          \"lastname\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fielddata\": true\n" +
-        "          },\n" +
-        "          \"ofHerName\": {\n" +
-        "            \"type\": \"integer\"\n" +
-        "          },\n" +
-        "          \"ofHisName\": {\n" +
-        "            \"type\": \"integer\"\n" +
-        "          }\n" +
-        "        }\n" +
-        "      },\n" +
-        "      \"house\": {\n" +
-        "        \"type\": \"text\",\n" +
-        "        \"fields\": {\n" +
-        "          \"keyword\": {\n" +
-        "            \"type\": \"keyword\"\n" +
-        "          }\n" +
-        "        }\n" +
-        "      },\n" +
-        "      \"gender\": {\n" +
-        "        \"type\": \"text\",\n" +
-        "        \"fields\": {\n" +
-        "          \"keyword\": {\n" +
-        "            \"type\": \"keyword\"\n" +
-        "          }\n" +
-        "        }\n" +
-        "      }" +
-        "} } }";
+    return "{  \"mappings\": { "
+        + "    \"properties\": {\n"
+        + "      \"nickname\": {\n"
+        + "        \"type\":\"text\", "
+        + "        \"fielddata\":true"
+        + "      },\n"
+        + "      \"name\": {\n"
+        + "        \"properties\": {\n"
+        + "          \"firstname\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          },\n"
+        + "          \"lastname\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          },\n"
+        + "          \"ofHerName\": {\n"
+        + "            \"type\": \"integer\"\n"
+        + "          },\n"
+        + "          \"ofHisName\": {\n"
+        + "            \"type\": \"integer\"\n"
+        + "          }\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"house\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\"\n"
+        + "          }\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"gender\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\"\n"
+        + "          }\n"
+        + "        }\n"
+        + "      }"
+        + "} } }";
   }
 
   // System
 
   public static String getOdbcIndexMapping() {
-    return "{\n" +
-        "\t\"mappings\" :{\n" +
-        "\t\t\"properties\":{\n" +
-        "\t\t\t\"odbc_time\":{\n" +
-        "\t\t\t\t\"type\":\"date\",\n" +
-        "\t\t\t\t\"format\": \"'{ts' ''yyyy-MM-dd HH:mm:ss.SSS'''}'\"\n" +
-        "\t\t\t},\n" +
-        "\t\t\t\"docCount\":{\n" +
-        "\t\t\t\t\"type\":\"text\"\n" +
-        "\t\t\t}\n" +
-        "\t\t}\n" +
-        "\t}\n" +
-        "}";
+    return "{\n"
+        + "\t\"mappings\" :{\n"
+        + "\t\t\"properties\":{\n"
+        + "\t\t\t\"odbc_time\":{\n"
+        + "\t\t\t\t\"type\":\"date\",\n"
+        + "\t\t\t\t\"format\": \"'{ts' ''yyyy-MM-dd HH:mm:ss.SSS'''}'\"\n"
+        + "\t\t\t},\n"
+        + "\t\t\t\"docCount\":{\n"
+        + "\t\t\t\t\"type\":\"text\"\n"
+        + "\t\t\t}\n"
+        + "\t\t}\n"
+        + "\t}\n"
+        + "}";
   }
 
   public static String getLocationIndexMapping() {
-    return "{\n" +
-        "\t\"mappings\" :{\n" +
-        "\t\t\"properties\":{\n" +
-        "\t\t\t\"place\":{\n" +
-        "\t\t\t\t\"type\":\"geo_shape\"\n" +
-        //"\t\t\t\t\"tree\": \"quadtree\",\n" + // Field tree and precision are deprecated in OpenSearch
-        //"\t\t\t\t\"precision\": \"10km\"\n" +
-        "\t\t\t},\n" +
-        "\t\t\t\"center\":{\n" +
-        "\t\t\t\t\"type\":\"geo_point\"\n" +
-        "\t\t\t},\n" +
-        "\t\t\t\"description\":{\n" +
-        "\t\t\t\t\"type\":\"text\"\n" +
-        "\t\t\t}\n" +
-        "\t\t}\n" +
-        "\t}\n" +
-        "}";
+    return "{\n"
+        + "\t\"mappings\" :{\n"
+        + "\t\t\"properties\":{\n"
+        + "\t\t\t\"place\":{\n"
+        + "\t\t\t\t\"type\":\"geo_shape\"\n"
+        +
+        // "\t\t\t\t\"tree\": \"quadtree\",\n" + // Field tree and precision are deprecated in
+        // OpenSearch
+        // "\t\t\t\t\"precision\": \"10km\"\n" +
+        "\t\t\t},\n"
+        + "\t\t\t\"center\":{\n"
+        + "\t\t\t\t\"type\":\"geo_point\"\n"
+        + "\t\t\t},\n"
+        + "\t\t\t\"description\":{\n"
+        + "\t\t\t\t\"type\":\"text\"\n"
+        + "\t\t\t}\n"
+        + "\t\t}\n"
+        + "\t}\n"
+        + "}";
   }
 
   public static String getEmployeeNestedTypeIndexMapping() {
-    return "{\n" +
-        "  \"mappings\": {\n" +
-        "    \"properties\": {\n" +
-        "      \"comments\": {\n" +
-        "        \"type\": \"nested\",\n" +
-        "        \"properties\": {\n" +
-        "          \"date\": {\n" +
-        "            \"type\": \"date\"\n" +
-        "          },\n" +
-        "          \"likes\": {\n" +
-        "            \"type\": \"long\"\n" +
-        "          },\n" +
-        "          \"message\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fields\": {\n" +
-        "              \"keyword\": {\n" +
-        "                \"type\": \"keyword\",\n" +
-        "                \"ignore_above\": 256\n" +
-        "              }\n" +
-        "            }\n" +
-        "          }\n" +
-        "        }\n" +
-        "      },\n" +
-        "      \"id\": {\n" +
-        "        \"type\": \"long\"\n" +
-        "      },\n" +
-        "      \"name\": {\n" +
-        "        \"type\": \"text\",\n" +
-        "        \"fields\": {\n" +
-        "          \"keyword\": {\n" +
-        "            \"type\": \"keyword\",\n" +
-        "            \"ignore_above\": 256\n" +
-        "          }\n" +
-        "        }\n" +
-        "      },\n" +
-        "      \"projects\": {\n" +
-        "        \"type\": \"nested\",\n" +
-        "        \"properties\": {\n" +
-        "          \"address\": {\n" +
-        "            \"type\": \"nested\",\n" +
-        "            \"properties\": {\n" +
-        "              \"city\": {\n" +
-        "                \"type\": \"text\",\n" +
-        "                \"fields\": {\n" +
-        "                  \"keyword\": {\n" +
-        "                    \"type\": \"keyword\",\n" +
-        "                    \"ignore_above\": 256\n" +
-        "                  }\n" +
-        "                }\n" +
-        "              },\n" +
-        "              \"state\": {\n" +
-        "                \"type\": \"text\",\n" +
-        "                \"fields\": {\n" +
-        "                  \"keyword\": {\n" +
-        "                    \"type\": \"keyword\",\n" +
-        "                    \"ignore_above\": 256\n" +
-        "                  }\n" +
-        "                }\n" +
-        "              }\n" +
-        "            }\n" +
-        "          },\n" +
-        "          \"name\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fields\": {\n" +
-        "              \"keyword\": {\n" +
-        "                \"type\": \"keyword\"\n" +
-        "              }\n" +
-        "            },\n" +
-        "            \"fielddata\": true\n" +
-        "          },\n" +
-        "          \"started_year\": {\n" +
-        "            \"type\": \"long\"\n" +
-        "          }\n" +
-        "        }\n" +
-        "      },\n" +
-        "      \"title\": {\n" +
-        "        \"type\": \"text\",\n" +
-        "        \"fields\": {\n" +
-        "          \"keyword\": {\n" +
-        "            \"type\": \"keyword\",\n" +
-        "            \"ignore_above\": 256\n" +
-        "          }\n" +
-        "        }\n" +
-        "      }\n" +
-        "    }\n" +
-        "  }\n" +
-        "}\n";
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"comments\": {\n"
+        + "        \"type\": \"nested\",\n"
+        + "        \"properties\": {\n"
+        + "          \"date\": {\n"
+        + "            \"type\": \"date\"\n"
+        + "          },\n"
+        + "          \"likes\": {\n"
+        + "            \"type\": \"long\"\n"
+        + "          },\n"
+        + "          \"message\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fields\": {\n"
+        + "              \"keyword\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"ignore_above\": 256\n"
+        + "              }\n"
+        + "            }\n"
+        + "          }\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"id\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"name\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\",\n"
+        + "            \"ignore_above\": 256\n"
+        + "          }\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"projects\": {\n"
+        + "        \"type\": \"nested\",\n"
+        + "        \"properties\": {\n"
+        + "          \"address\": {\n"
+        + "            \"type\": \"nested\",\n"
+        + "            \"properties\": {\n"
+        + "              \"city\": {\n"
+        + "                \"type\": \"text\",\n"
+        + "                \"fields\": {\n"
+        + "                  \"keyword\": {\n"
+        + "                    \"type\": \"keyword\",\n"
+        + "                    \"ignore_above\": 256\n"
+        + "                  }\n"
+        + "                }\n"
+        + "              },\n"
+        + "              \"state\": {\n"
+        + "                \"type\": \"text\",\n"
+        + "                \"fields\": {\n"
+        + "                  \"keyword\": {\n"
+        + "                    \"type\": \"keyword\",\n"
+        + "                    \"ignore_above\": 256\n"
+        + "                  }\n"
+        + "                }\n"
+        + "              }\n"
+        + "            }\n"
+        + "          },\n"
+        + "          \"name\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fields\": {\n"
+        + "              \"keyword\": {\n"
+        + "                \"type\": \"keyword\"\n"
+        + "              }\n"
+        + "            },\n"
+        + "            \"fielddata\": true\n"
+        + "          },\n"
+        + "          \"started_year\": {\n"
+        + "            \"type\": \"long\"\n"
+        + "          }\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"title\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\",\n"
+        + "            \"ignore_above\": 256\n"
+        + "          }\n"
+        + "        }\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}\n";
   }
 
-
   public static String getNestedTypeIndexMapping() {
-    return "{ \"mappings\": {\n" +
-        "        \"properties\": {\n" +
-        "          \"message\": {\n" +
-        "            \"type\": \"nested\",\n" +
-        "            \"properties\": {\n" +
-        "              \"info\": {\n" +
-        "                \"type\": \"keyword\",\n" +
-        "                \"index\": \"true\"\n" +
-        "              },\n" +
-        "              \"author\": {\n" +
-        "                \"type\": \"keyword\",\n" +
-        "                \"fields\": {\n" +
-        "                  \"keyword\": {\n" +
-        "                    \"type\": \"keyword\",\n" +
-        "                    \"ignore_above\" : 256\n" +
-        "                  }\n" +
-        "                },\n" +
-        "                \"index\": \"true\"\n" +
-        "              },\n" +
-        "              \"dayOfWeek\": {\n" +
-        "                \"type\": \"long\"\n" +
-        "              }\n" +
-        "            }\n" +
-        "          },\n" +
-        "          \"comment\": {\n" +
-        "            \"type\": \"nested\",\n" +
-        "            \"properties\": {\n" +
-        "              \"data\": {\n" +
-        "                \"type\": \"keyword\",\n" +
-        "                \"index\": \"true\"\n" +
-        "              },\n" +
-        "              \"likes\": {\n" +
-        "                \"type\": \"long\"\n" +
-        "              }\n" +
-        "            }\n" +
-        "          },\n" +
-        "          \"myNum\": {\n" +
-        "            \"type\": \"long\"\n" +
-        "          },\n" +
-        "          \"someField\": {\n" +
-        "                \"type\": \"keyword\",\n" +
-        "                \"index\": \"true\"\n" +
-        "          }\n" +
-        "        }\n" +
-        "      }\n" +
-        "    }}";
+    return "{ \"mappings\": {\n"
+        + "        \"properties\": {\n"
+        + "          \"message\": {\n"
+        + "            \"type\": \"nested\",\n"
+        + "            \"properties\": {\n"
+        + "              \"info\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"index\": \"true\"\n"
+        + "              },\n"
+        + "              \"author\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"fields\": {\n"
+        + "                  \"keyword\": {\n"
+        + "                    \"type\": \"keyword\",\n"
+        + "                    \"ignore_above\" : 256\n"
+        + "                  }\n"
+        + "                },\n"
+        + "                \"index\": \"true\"\n"
+        + "              },\n"
+        + "              \"dayOfWeek\": {\n"
+        + "                \"type\": \"long\"\n"
+        + "              }\n"
+        + "            }\n"
+        + "          },\n"
+        + "          \"comment\": {\n"
+        + "            \"type\": \"nested\",\n"
+        + "            \"properties\": {\n"
+        + "              \"data\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"index\": \"true\"\n"
+        + "              },\n"
+        + "              \"likes\": {\n"
+        + "                \"type\": \"long\"\n"
+        + "              }\n"
+        + "            }\n"
+        + "          },\n"
+        + "          \"myNum\": {\n"
+        + "            \"type\": \"long\"\n"
+        + "          },\n"
+        + "          \"someField\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"index\": \"true\"\n"
+        + "          }\n"
+        + "        }\n"
+        + "      }\n"
+        + "    }}";
   }
 
   public static String getJoinTypeIndexMapping() {
-    return "{\n" +
-        "  \"mappings\": {\n" +
-        "    \"properties\": {\n" +
-        "      \"join_field\": {\n" +
-        "        \"type\": \"join\",\n" +
-        "        \"relations\": {\n" +
-        "          \"parentType\": \"childrenType\"\n" +
-        "        }\n" +
-        "      },\n" +
-        "      \"parentTile\": {\n" +
-        "        \"index\": \"true\",\n" +
-        "        \"type\": \"keyword\"\n" +
-        "      },\n" +
-        "      \"dayOfWeek\": {\n" +
-        "        \"type\": \"long\"\n" +
-        "      },\n" +
-        "      \"author\": {\n" +
-        "        \"index\": \"true\",\n" +
-        "        \"type\": \"keyword\"\n" +
-        "      },\n" +
-        "      \"info\": {\n" +
-        "        \"index\": \"true\",\n" +
-        "        \"type\": \"keyword\"\n" +
-        "      }\n" +
-        "    }\n" +
-        "  }\n" +
-        "}";
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"join_field\": {\n"
+        + "        \"type\": \"join\",\n"
+        + "        \"relations\": {\n"
+        + "          \"parentType\": \"childrenType\"\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"parentTile\": {\n"
+        + "        \"index\": \"true\",\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      },\n"
+        + "      \"dayOfWeek\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"author\": {\n"
+        + "        \"index\": \"true\",\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      },\n"
+        + "      \"info\": {\n"
+        + "        \"index\": \"true\",\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}";
   }
 
   public static String getBankIndexMapping() {
-    return "{\n" +
-        "  \"mappings\": {\n" +
-        "    \"properties\": {\n" +
-        "      \"account_number\": {\n" +
-        "        \"type\": \"long\"\n" +
-        "      },\n" +
-        "      \"address\": {\n" +
-        "        \"type\": \"text\"\n" +
-        "      },\n" +
-        "      \"age\": {\n" +
-        "        \"type\": \"integer\"\n" +
-        "      },\n" +
-        "      \"balance\": {\n" +
-        "        \"type\": \"long\"\n" +
-        "      },\n" +
-        "      \"birthdate\": {\n" +
-        "        \"type\": \"date\"\n" +
-        "      },\n" +
-        "      \"city\": {\n" +
-        "        \"type\": \"keyword\"\n" +
-        "      },\n" +
-        "      \"email\": {\n" +
-        "        \"type\": \"text\"\n" +
-        "      },\n" +
-        "      \"employer\": {\n" +
-        "        \"type\": \"text\"\n" +
-        "      },\n" +
-        "      \"firstname\": {\n" +
-        "        \"type\": \"text\"\n" +
-        "      },\n" +
-        "      \"gender\": {\n" +
-        "        \"type\": \"text\",\n" +
-        "        \"fielddata\": true\n" +
-        "      }," +
-        "      \"lastname\": {\n" +
-        "        \"type\": \"keyword\"\n" +
-        "      },\n" +
-        "      \"male\": {\n" +
-        "        \"type\": \"boolean\"\n" +
-        "      },\n" +
-        "      \"state\": {\n" +
-        "        \"type\": \"text\",\n" +
-        "        \"fields\": {\n" +
-        "          \"keyword\": {\n" +
-        "            \"type\": \"keyword\",\n" +
-        "            \"ignore_above\": 256\n" +
-        "          }\n" +
-        "        }\n" +
-        "      }\n" +
-        "    }\n" +
-        "  }\n" +
-        "}";
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"account_number\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"address\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"age\": {\n"
+        + "        \"type\": \"integer\"\n"
+        + "      },\n"
+        + "      \"balance\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"birthdate\": {\n"
+        + "        \"type\": \"date\"\n"
+        + "      },\n"
+        + "      \"city\": {\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      },\n"
+        + "      \"email\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"employer\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"firstname\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"gender\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fielddata\": true\n"
+        + "      },"
+        + "      \"lastname\": {\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      },\n"
+        + "      \"male\": {\n"
+        + "        \"type\": \"boolean\"\n"
+        + "      },\n"
+        + "      \"state\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\",\n"
+        + "            \"ignore_above\": 256\n"
+        + "          }\n"
+        + "        }\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}";
   }
 
   public static String getBankWithNullValuesIndexMapping() {
-    return "{\n" +
-        "  \"mappings\": {\n" +
-        "    \"properties\": {\n" +
-        "      \"account_number\": {\n" +
-        "        \"type\": \"long\"\n" +
-        "      },\n" +
-        "      \"address\": {\n" +
-        "        \"type\": \"text\"\n" +
-        "      },\n" +
-        "      \"age\": {\n" +
-        "        \"type\": \"integer\"\n" +
-        "      },\n" +
-        "      \"balance\": {\n" +
-        "        \"type\": \"long\"\n" +
-        "      },\n" +
-        "      \"gender\": {\n" +
-        "        \"type\": \"text\"\n" +
-        "      },\n" +
-        "      \"firstname\": {\n" +
-        "        \"type\": \"text\"\n" +
-        "      },\n" +
-        "      \"lastname\": {\n" +
-        "        \"type\": \"keyword\"\n" +
-        "      }\n" +
-        "    }\n" +
-        "  }\n" +
-        "}";
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"account_number\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"address\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"age\": {\n"
+        + "        \"type\": \"integer\"\n"
+        + "      },\n"
+        + "      \"balance\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"gender\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"firstname\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"lastname\": {\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}";
   }
 
   public static String getOrderIndexMapping() {
-    return "{\n" +
-        "  \"mappings\": {\n" +
-        "    \"properties\": {\n" +
-        "      \"id\": {\n" +
-        "        \"type\": \"long\"\n" +
-        "      },\n" +
-        "      \"name\": {\n" +
-        "        \"type\": \"text\",\n" +
-        "        \"fields\": {\n" +
-        "          \"keyword\": {\n" +
-        "            \"type\": \"keyword\",\n" +
-        "            \"ignore_above\": 256\n" +
-        "          }\n" +
-        "        }\n" +
-        "      }\n" +
-        "    }\n" +
-        "  }\n" +
-        "}";
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"id\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"name\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\",\n"
+        + "            \"ignore_above\": 256\n"
+        + "          }\n"
+        + "        }\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}";
   }
 
   public static String getWeblogsIndexMapping() {
-    return "{\n" +
-        "  \"mappings\": {\n" +
-        "    \"properties\": {\n" +
-        "      \"host\": {\n" +
-        "        \"type\": \"ip\"\n" +
-        "      },\n" +
-        "      \"method\": {\n" +
-        "        \"type\": \"text\"\n" +
-        "      },\n" +
-        "      \"url\": {\n" +
-        "        \"type\": \"text\"\n" +
-        "      },\n" +
-        "      \"response\": {\n" +
-        "        \"type\": \"text\"\n" +
-        "      },\n" +
-        "      \"bytes\": {\n" +
-        "        \"type\": \"text\"\n" +
-        "      }\n" +
-        "    }\n" +
-        "  }\n" +
-        "}";
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"host\": {\n"
+        + "        \"type\": \"ip\"\n"
+        + "      },\n"
+        + "      \"method\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"url\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"response\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"bytes\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}";
   }
 
   public static String getDateIndexMapping() {
-    return "{  \"mappings\": {" +
-        " \"properties\": {\n" +
-        "          \"date_keyword\": {\n" +
-        "            \"type\": \"keyword\",\n" +
-        "            \"ignore_above\": 256\n" +
-        "          }" +
-        "       }" +
-        "   }" +
-        "}";
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"date_keyword\": {\n"
+        + "            \"type\": \"keyword\",\n"
+        + "            \"ignore_above\": 256\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
   }
 
   public static String getDateTimeIndexMapping() {
-    return "{" +
-        "  \"mappings\": {" +
-        "    \"properties\": {" +
-        "      \"birthday\": {" +
-        "        \"type\": \"date\"" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}";
+    return "{"
+        + "  \"mappings\": {"
+        + "    \"properties\": {"
+        + "      \"birthday\": {"
+        + "        \"type\": \"date\""
+        + "      }"
+        + "    }"
+        + "  }"
+        + "}";
   }
 
   public static String getNestedSimpleIndexMapping() {
-    return "{" +
-        "  \"mappings\": {" +
-        "    \"properties\": {" +
-        "      \"address\": {" +
-        "        \"type\": \"nested\"," +
-        "        \"properties\": {" +
-        "          \"city\": {" +
-        "            \"type\": \"text\"," +
-        "            \"fields\": {" +
-        "              \"keyword\": {" +
-        "                \"type\": \"keyword\"," +
-        "                \"ignore_above\": 256" +
-        "              }" +
-        "            }" +
-        "          }," +
-        "          \"state\": {" +
-        "            \"type\": \"text\"," +
-        "            \"fields\": {" +
-        "              \"keyword\": {" +
-        "                \"type\": \"keyword\"," +
-        "                \"ignore_above\": 256" +
-        "              }" +
-        "            }" +
-        "          }" +
-        "        }" +
-        "      }," +
-        "      \"age\": {" +
-        "        \"type\": \"long\"" +
-        "      }," +
-        "      \"id\": {" +
-        "        \"type\": \"long\"" +
-        "      }," +
-        "      \"name\": {" +
-        "        \"type\": \"text\"," +
-        "        \"fields\": {" +
-        "          \"keyword\": {" +
-        "            \"type\": \"keyword\"," +
-        "            \"ignore_above\": 256" +
-        "          }" +
-        "        }" +
-        "      }" +
-        "    }" +
-        "  }" +
-        "}";
+    return "{"
+        + "  \"mappings\": {"
+        + "    \"properties\": {"
+        + "      \"address\": {"
+        + "        \"type\": \"nested\","
+        + "        \"properties\": {"
+        + "          \"city\": {"
+        + "            \"type\": \"text\","
+        + "            \"fields\": {"
+        + "              \"keyword\": {"
+        + "                \"type\": \"keyword\","
+        + "                \"ignore_above\": 256"
+        + "              }"
+        + "            }"
+        + "          },"
+        + "          \"state\": {"
+        + "            \"type\": \"text\","
+        + "            \"fields\": {"
+        + "              \"keyword\": {"
+        + "                \"type\": \"keyword\","
+        + "                \"ignore_above\": 256"
+        + "              }"
+        + "            }"
+        + "          }"
+        + "        }"
+        + "      },"
+        + "      \"age\": {"
+        + "        \"type\": \"long\""
+        + "      },"
+        + "      \"id\": {"
+        + "        \"type\": \"long\""
+        + "      },"
+        + "      \"name\": {"
+        + "        \"type\": \"text\","
+        + "        \"fields\": {"
+        + "          \"keyword\": {"
+        + "            \"type\": \"keyword\","
+        + "            \"ignore_above\": 256"
+        + "          }"
+        + "        }"
+        + "      }"
+        + "    }"
+        + "  }"
+        + "}";
   }
 
   public static void loadBulk(Client client, String jsonPath, String defaultIndex)
@@ -696,8 +696,8 @@ public static void loadBulk(Client client, String jsonPath, String defaultIndex)
 
     BulkRequest bulkRequest = new BulkRequest();
     try (final InputStream stream = new FileInputStream(absJsonPath);
-         final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
-         final BufferedReader br = new BufferedReader(streamReader)) {
+        final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
+        final BufferedReader br = new BufferedReader(streamReader)) {
 
       while (true) {
 
@@ -726,8 +726,11 @@ public static void loadBulk(Client client, String jsonPath, String defaultIndex)
     BulkResponse bulkResponse = client.bulk(bulkRequest).actionGet();
 
     if (bulkResponse.hasFailures()) {
-      throw new Exception("Failed to load test data into index " + defaultIndex + ", " +
-          bulkResponse.buildFailureMessage());
+      throw new Exception(
+          "Failed to load test data into index "
+              + defaultIndex
+              + ", "
+              + bulkResponse.buildFailureMessage());
     }
     System.out.println(bulkResponse.getItems().length + " documents loaded.");
     // ensure the documents are searchable
@@ -753,8 +756,8 @@ public static String getResponseBody(Response response, boolean retainNewLines)
     final StringBuilder sb = new StringBuilder();
 
     try (final InputStream is = response.getEntity().getContent();
-         final BufferedReader br = new BufferedReader(
-             new InputStreamReader(is, StandardCharsets.UTF_8))) {
+        final BufferedReader br =
+            new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
 
       String line;
       while ((line = br.readLine()) != null) {
@@ -767,15 +770,14 @@ public static String getResponseBody(Response response, boolean retainNewLines)
     return sb.toString();
   }
 
-  public static String fileToString(final String filePathFromProjectRoot,
-                                    final boolean removeNewLines)
-      throws IOException {
+  public static String fileToString(
+      final String filePathFromProjectRoot, final boolean removeNewLines) throws IOException {
 
     final String absolutePath = getResourceFilePath(filePathFromProjectRoot);
 
     try (final InputStream stream = new FileInputStream(absolutePath);
-         final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
-         final BufferedReader br = new BufferedReader(streamReader)) {
+        final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
+        final BufferedReader br = new BufferedReader(streamReader)) {
 
       final StringBuilder stringBuilder = new StringBuilder();
       String line = br.readLine();
@@ -829,14 +831,43 @@ public static List<List<String>> getPermutations(final List<String> items) {
       }
 
       final String currentItem = items.get(i);
-      result.addAll(getPermutations(smallerSet).stream().map(smallerSetPermutation -> {
-        final List<String> permutation = new ArrayList<>();
-        permutation.add(currentItem);
-        permutation.addAll(smallerSetPermutation);
-        return permutation;
-      }).collect(Collectors.toCollection(LinkedList::new)));
+      result.addAll(
+          getPermutations(smallerSet).stream()
+              .map(
+                  smallerSetPermutation -> {
+                    final List<String> permutation = new ArrayList<>();
+                    permutation.add(currentItem);
+                    permutation.addAll(smallerSetPermutation);
+                    return permutation;
+                  })
+              .collect(Collectors.toCollection(LinkedList::new)));
     }
 
     return result;
   }
+
+  public static void verifyIsV1Cursor(JSONObject response) {
+    var legacyCursorPrefixes =
+        Arrays.stream(CursorType.values()).map(c -> c.getId() + ":").collect(Collectors.toList());
+    verifyCursor(response, legacyCursorPrefixes, "v1");
+  }
+
+  public static void verifyIsV2Cursor(JSONObject response) {
+    verifyCursor(response, List.of(CURSOR_PREFIX), "v2");
+  }
+
+  private static void verifyCursor(
+      JSONObject response, List<String> validCursorPrefix, String engineName) {
+    assertTrue("'cursor' property does not exist", response.has("cursor"));
+
+    var cursor = response.getString("cursor");
+    assertFalse("'cursor' property is empty", cursor.isEmpty());
+    assertTrue(
+        "The cursor '" + cursor.substring(0, 50) + "...' is not from " + engineName + " engine.",
+        validCursorPrefix.stream().anyMatch(cursor::startsWith));
+  }
+
+  public static void verifyNoCursor(JSONObject response) {
+    assertTrue(!response.has("cursor"));
+  }
 }
diff --git a/integ-test/src/test/resources/correctness/bugfixes/550.txt b/integ-test/src/test/resources/correctness/bugfixes/550.txt
new file mode 100644
index 0000000000..902e3b0d20
--- /dev/null
+++ b/integ-test/src/test/resources/correctness/bugfixes/550.txt
@@ -0,0 +1,2 @@
+SELECT ABS(`flights`.`AvgTicketPrice`) FROM (SELECT `AvgTicketPrice` FROM `opensearch_dashboards_sample_data_flights`) AS `flights` GROUP BY ABS(`flights`.`AvgTicketPrice`)
+SELECT `b`.`Origin`, `b`.`avgPrice` FROM (SELECT `a`.`Origin` AS `Origin`, AVG(`AvgTicketPrice`) AS `avgPrice` FROM (SELECT `Origin`, `AvgTicketPrice` FROM `opensearch_dashboards_sample_data_flights` WHERE `FlightDelay` = True) AS `a` GROUP BY `a`.`Origin`) AS `b` ORDER BY `b`.`avgPrice` DESC
diff --git a/integ-test/src/test/resources/correctness/expressions/date_and_time_functions.txt b/integ-test/src/test/resources/correctness/expressions/date_and_time_functions.txt
index e69de29bb2..a19c25f4b1 100644
--- a/integ-test/src/test/resources/correctness/expressions/date_and_time_functions.txt
+++ b/integ-test/src/test/resources/correctness/expressions/date_and_time_functions.txt
@@ -0,0 +1,13 @@
+DATE '2001-05-07'
+TIME '12:30:00'
+TIMESTAMP '2001-05-07 12:30:00'
+SECOND(timestamp) AS COLUMN FROM opensearch_dashboards_sample_data_flights
+MINUTE(timestamp) AS COLUMN FROM opensearch_dashboards_sample_data_flights
+HOUR(timestamp) AS COLUMN FROM opensearch_dashboards_sample_data_flights
+DAY_OF_MONTH(timestamp) AS COLUMN FROM opensearch_dashboards_sample_data_flights
+DAY_OF_YEAR(timestamp) AS COLUMN FROM opensearch_dashboards_sample_data_flights
+MONTH(timestamp) AS COLUMN FROM opensearch_dashboards_sample_data_flights
+QUARTER(timestamp) AS COLUMN FROM opensearch_dashboards_sample_data_flights
+YEAR(timestamp) AS COLUMN FROM opensearch_dashboards_sample_data_flights
+DAYNAME(timestamp) AS COLUMN FROM opensearch_dashboards_sample_data_flights
+MONTHNAME(timestamp) AS COLUMN FROM opensearch_dashboards_sample_data_flights
\ No newline at end of file
diff --git a/integ-test/src/test/resources/correctness/expressions/mathematical_functions.txt b/integ-test/src/test/resources/correctness/expressions/mathematical_functions.txt
index c99ca6c7a9..cb479e2eba 100644
--- a/integ-test/src/test/resources/correctness/expressions/mathematical_functions.txt
+++ b/integ-test/src/test/resources/correctness/expressions/mathematical_functions.txt
@@ -5,20 +5,22 @@ abs(-1.234)
 abs(0.0)
 abs(4.321)
 abs(abs(-1.2) * -1)
-ceil(1)
-ceil(-1)
-ceil(0.0)
-ceil(0.4999)
-ceil(abs(1))
+# During comparison with H2 and SQLite it expects ceil and floor to be stored as INT values. This casts to resolve.
+CAST(ceil(1) AS INT)
+CAST(ceil(-1) AS INT)
+CAST(ceil(0.0) AS INT)
+CAST(ceil(0.4999) AS INT)
+CAST(ceil(abs(1)) AS INT)
+# CAST(CEIL(2147483647 + 0.6) AS INT) will fail because the cast limits the return to be INT_MAX (21474883647) which is not an H2 or SQLite limitation
 exp(0)
 exp(1)
 exp(-1)
 exp(exp(1) + ceil(-1))
-floor(1)
-floor(-1)
-floor(0.0)
-floor(0.4999)
-floor(abs(-1))
+CAST(floor(1) AS INT)
+CAST(floor(-1) AS INT)
+CAST(floor(0.0) AS INT)
+CAST(floor(0.4999) AS INT)
+CAST(floor(abs(-1)) AS INT)
 log(2)
 log(2.1)
 log(log(2))
diff --git a/integ-test/src/test/resources/correctness/expressions/text_functions.txt b/integ-test/src/test/resources/correctness/expressions/text_functions.txt
index c2fd57c330..077cc82084 100644
--- a/integ-test/src/test/resources/correctness/expressions/text_functions.txt
+++ b/integ-test/src/test/resources/correctness/expressions/text_functions.txt
@@ -11,4 +11,6 @@ LOCATE('world', 'helloworld') as column
 LOCATE('world', 'hello') as column
 LOCATE('world', 'helloworld', 7) as column
 REPLACE('helloworld', 'world', 'opensearch') as column
-REPLACE('hello', 'world', 'opensearch') as column
\ No newline at end of file
+REPLACE('hello', 'world', 'opensearch') as column
+CONCAT('hello', 'world') as column
+CONCAT('hello ', 'whole ', 'world', '!') as column
\ No newline at end of file
diff --git a/integ-test/src/test/resources/correctness/queries/aggregation.txt b/integ-test/src/test/resources/correctness/queries/aggregation.txt
index 0c0648a937..9b610cb885 100644
--- a/integ-test/src/test/resources/correctness/queries/aggregation.txt
+++ b/integ-test/src/test/resources/correctness/queries/aggregation.txt
@@ -11,4 +11,5 @@ SELECT VAR_SAMP(AvgTicketPrice) FROM opensearch_dashboards_sample_data_flights
 SELECT STDDEV_POP(AvgTicketPrice) FROM opensearch_dashboards_sample_data_flights
 SELECT STDDEV_SAMP(AvgTicketPrice) FROM opensearch_dashboards_sample_data_flights
 SELECT COUNT(DISTINCT Origin), COUNT(DISTINCT Dest) FROM opensearch_dashboards_sample_data_flights
-SELECT COUNT(DISTINCT Origin) FROM (SELECT * FROM opensearch_dashboards_sample_data_flights) AS flights
\ No newline at end of file
+SELECT COUNT(DISTINCT Origin) FROM (SELECT * FROM opensearch_dashboards_sample_data_flights) AS flights
+SELECT LOG(MAX(AvgTicketPrice) + MIN(AvgTicketPrice)) FROM opensearch_dashboards_sample_data_flights
\ No newline at end of file
diff --git a/integ-test/src/test/resources/datasources.json b/integ-test/src/test/resources/datasources.json
new file mode 100644
index 0000000000..77d6a26148
--- /dev/null
+++ b/integ-test/src/test/resources/datasources.json
@@ -0,0 +1,2 @@
+{"index":{"_id":"old_prometheus"}}
+{ "name" : "old_prometheus", "connector": "prometheus", "properties" : { "prometheus.uri" : "http://localhost:9090"}}
diff --git a/integ-test/src/test/resources/datatypes.json b/integ-test/src/test/resources/datatypes.json
index ea3290ee64..70ddd28763 100644
--- a/integ-test/src/test/resources/datatypes.json
+++ b/integ-test/src/test/resources/datatypes.json
@@ -1,2 +1,2 @@
 {"index":{"_id":"1"}}
-{"boolean_value": true, "keyword_value": "keyword", "text_value": "text", "binary_value": "U29tZSBiaW5hcnkgYmxvYg==", "date_value": "2020-10-13 13:00:00", "ip_value": "127.0.0.1", "object_value": {"first": "Dale", "last": "Dale"}, "nested_value": [{"first" : "John", "last" :  "Smith"}, {"first" : "Alice", "last" :  "White"}], "geo_point_value": { "lat": 40.71, "lon": 74.00 }}
+{"boolean_value": true, "keyword_value": "keyword", "text_value": "text", "binary_value": "U29tZSBiaW5hcnkgYmxvYg==", "date_value": "2020-10-13 13:00:00", "date_nanos_value": "2019-03-23T21:34:46.123456789-04:00", "ip_value": "127.0.0.1", "object_value": {"first": "Dale", "last": "Dale"}, "nested_value": [{"first" : "John", "last" :  "Smith"}, {"first" : "Alice", "last" :  "White"}], "geo_point_value": { "lat": 40.71, "lon": 74.00 }}
diff --git a/integ-test/src/test/resources/date_formats.json b/integ-test/src/test/resources/date_formats.json
new file mode 100644
index 0000000000..2ff0c867a3
--- /dev/null
+++ b/integ-test/src/test/resources/date_formats.json
@@ -0,0 +1,4 @@
+{"index": {}}
+{"epoch_millis": "450608862000.123456", "epoch_second": "450608862.000123456", "date_optional_time": "1984-04-12T09:07:42.000Z", "strict_date_optional_time": "1984-04-12T09:07:42.000Z", "strict_date_optional_time_nanos": "1984-04-12T09:07:42.000123456Z", "basic_date": "19840412", "basic_date_time": "19840412T090742.000Z", "basic_date_time_no_millis": "19840412T090742Z", "basic_ordinal_date": "1984103", "basic_ordinal_date_time": "1984103T090742.000Z", "basic_ordinal_date_time_no_millis": "1984103T090742Z", "basic_time": "090742.000Z", "basic_time_no_millis": "090742Z", "basic_t_time": "T090742.000Z", "basic_t_time_no_millis": "T090742Z", "basic_week_date": "1984W154", "strict_basic_week_date": "1984W154", "basic_week_date_time": "1984W154T090742.000Z", "strict_basic_week_date_time": "1984W154T090742.000Z", "basic_week_date_time_no_millis": "1984W154T090742Z", "strict_basic_week_date_time_no_millis": "1984W154T090742Z", "date": "1984-04-12", "strict_date": "1984-04-12", "date_hour": "1984-04-12T09", "strict_date_hour": "1984-04-12T09", "date_hour_minute": "1984-04-12T09:07", "strict_date_hour_minute": "1984-04-12T09:07", "date_hour_minute_second": "1984-04-12T09:07:42", "strict_date_hour_minute_second": "1984-04-12T09:07:42", "date_hour_minute_second_fraction": "1984-04-12T09:07:42.000", "strict_date_hour_minute_second_fraction": "1984-04-12T09:07:42.000", "date_hour_minute_second_millis": "1984-04-12T09:07:42.000", "strict_date_hour_minute_second_millis": "1984-04-12T09:07:42.000", "date_time": "1984-04-12T09:07:42.000Z", "strict_date_time": "1984-04-12T09:07:42.000123456Z", "date_time_no_millis": "1984-04-12T09:07:42Z", "strict_date_time_no_millis": "1984-04-12T09:07:42Z", "hour": "09", "strict_hour": "09", "hour_minute": "09:07", "strict_hour_minute": "09:07", "hour_minute_second": "09:07:42", "strict_hour_minute_second": "09:07:42", "hour_minute_second_fraction": "09:07:42.000", "strict_hour_minute_second_fraction": "09:07:42.000", "hour_minute_second_millis": "09:07:42.000", "strict_hour_minute_second_millis": "09:07:42.000", "ordinal_date": "1984-103", "strict_ordinal_date": "1984-103", "ordinal_date_time": "1984-103T09:07:42.000123456Z", "strict_ordinal_date_time": "1984-103T09:07:42.000123456Z", "ordinal_date_time_no_millis": "1984-103T09:07:42Z", "strict_ordinal_date_time_no_millis": "1984-103T09:07:42Z", "time": "09:07:42.000Z", "strict_time": "09:07:42.000Z", "time_no_millis": "09:07:42Z", "strict_time_no_millis": "09:07:42Z", "t_time": "T09:07:42.000Z", "strict_t_time": "T09:07:42.000Z", "t_time_no_millis": "T09:07:42Z", "strict_t_time_no_millis": "T09:07:42Z", "week_date": "1984-W15-4", "strict_week_date": "1984-W15-4", "week_date_time": "1984-W15-4T09:07:42.000Z", "strict_week_date_time": "1984-W15-4T09:07:42.000Z", "week_date_time_no_millis": "1984-W15-4T09:07:42Z", "strict_week_date_time_no_millis": "1984-W15-4T09:07:42Z", "weekyear_week_day": "1984-W15-4", "strict_weekyear_week_day": "1984-W15-4", "year_month_day": "1984-04-12", "strict_year_month_day": "1984-04-12", "yyyy-MM-dd": "1984-04-12", "custom_time": "09:07:42 AM", "yyyy-MM-dd_OR_epoch_millis": "1984-04-12", "hour_minute_second_OR_t_time": "09:07:42", "custom_timestamp": "1984-04-12 09:07:42 ---- AM", "custom_date_or_date": "1984-04-12", "custom_date_or_custom_time":  "1961-04-12", "custom_time_parser_check":  "85476321", "incomplete_1" : 1984, "incomplete_2": null, "incomplete_custom_date": 1999, "incomplete_custom_time" : 10, "incorrect" : null, "epoch_sec" : 42, "epoch_milli" : 42, "custom_no_delimiter_date" : "19841020", "custom_no_delimiter_time" : "102030", "custom_no_delimiter_ts" : "19841020153548"}
+{"index": {}}
+{"epoch_millis": "450608862000.123456", "epoch_second": "450608862.000123456", "date_optional_time": "1984-04-12T09:07:42.000Z", "strict_date_optional_time": "1984-04-12T09:07:42.000Z", "strict_date_optional_time_nanos": "1984-04-12T09:07:42.000123456Z", "basic_date": "19840412", "basic_date_time": "19840412T090742.000Z", "basic_date_time_no_millis": "19840412T090742Z", "basic_ordinal_date": "1984103", "basic_ordinal_date_time": "1984103T090742.000Z", "basic_ordinal_date_time_no_millis": "1984103T090742Z", "basic_time": "090742.000Z", "basic_time_no_millis": "090742Z", "basic_t_time": "T090742.000Z", "basic_t_time_no_millis": "T090742Z", "basic_week_date": "1984W154", "strict_basic_week_date": "1984W154", "basic_week_date_time": "1984W154T090742.000Z", "strict_basic_week_date_time": "1984W154T090742.000Z", "basic_week_date_time_no_millis": "1984W154T090742Z", "strict_basic_week_date_time_no_millis": "1984W154T090742Z", "date": "1984-04-12", "strict_date": "1984-04-12", "date_hour": "1984-04-12T09", "strict_date_hour": "1984-04-12T09", "date_hour_minute": "1984-04-12T09:07", "strict_date_hour_minute": "1984-04-12T09:07", "date_hour_minute_second": "1984-04-12T09:07:42", "strict_date_hour_minute_second": "1984-04-12T09:07:42", "date_hour_minute_second_fraction": "1984-04-12T09:07:42.000", "strict_date_hour_minute_second_fraction": "1984-04-12T09:07:42.000", "date_hour_minute_second_millis": "1984-04-12T09:07:42.000", "strict_date_hour_minute_second_millis": "1984-04-12T09:07:42.000", "date_time": "1984-04-12T09:07:42.000Z", "strict_date_time": "1984-04-12T09:07:42.000123456Z", "date_time_no_millis": "1984-04-12T09:07:42Z", "strict_date_time_no_millis": "1984-04-12T09:07:42Z", "hour": "09", "strict_hour": "09", "hour_minute": "09:07", "strict_hour_minute": "09:07", "hour_minute_second": "09:07:42", "strict_hour_minute_second": "09:07:42", "hour_minute_second_fraction": "09:07:42.000", "strict_hour_minute_second_fraction": "09:07:42.000", "hour_minute_second_millis": "09:07:42.000", "strict_hour_minute_second_millis": "09:07:42.000", "ordinal_date": "1984-103", "strict_ordinal_date": "1984-103", "ordinal_date_time": "1984-103T09:07:42.000123456Z", "strict_ordinal_date_time": "1984-103T09:07:42.000123456Z", "ordinal_date_time_no_millis": "1984-103T09:07:42Z", "strict_ordinal_date_time_no_millis": "1984-103T09:07:42Z", "time": "09:07:42.000Z", "strict_time": "09:07:42.000Z", "time_no_millis": "09:07:42Z", "strict_time_no_millis": "09:07:42Z", "t_time": "T09:07:42.000Z", "strict_t_time": "T09:07:42.000Z", "t_time_no_millis": "T09:07:42Z", "strict_t_time_no_millis": "T09:07:42Z", "week_date": "1984-W15-4", "strict_week_date": "1984-W15-4", "week_date_time": "1984-W15-4T09:07:42.000Z", "strict_week_date_time": "1984-W15-4T09:07:42.000Z", "week_date_time_no_millis": "1984-W15-4T09:07:42Z", "strict_week_date_time_no_millis": "1984-W15-4T09:07:42Z", "weekyear_week_day": "1984-W15-4", "strict_weekyear_week_day": "1984-W15-4", "year_month_day": "1984-04-12", "strict_year_month_day": "1984-04-12", "yyyy-MM-dd": "1984-04-12", "custom_time": "09:07:42 PM", "yyyy-MM-dd_OR_epoch_millis": "450608862000.123456", "hour_minute_second_OR_t_time": "T07:07:42.123456789Z", "custom_timestamp": "1984-04-12 10:07:42 ---- PM", "custom_date_or_date": "1984-04-12", "custom_date_or_custom_time":  "09:07:00", "custom_time_parser_check":  "::: 9-32476542", "incomplete_1" : 2012, "incomplete_2": null, "incomplete_custom_date": 3021, "incomplete_custom_time" : 20, "incorrect" : null, "epoch_sec" : 100500, "epoch_milli" : 100500, "custom_no_delimiter_date" : "19610412", "custom_no_delimiter_time" : "090700", "custom_no_delimiter_ts" : "19610412090700"}
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/explain_filter_agg_push.json b/integ-test/src/test/resources/expectedOutput/ppl/explain_filter_agg_push.json
index 2d7f5f8c08..568b397f07 100644
--- a/integ-test/src/test/resources/expectedOutput/ppl/explain_filter_agg_push.json
+++ b/integ-test/src/test/resources/expectedOutput/ppl/explain_filter_agg_push.json
@@ -8,7 +8,7 @@
       {
         "name": "OpenSearchIndexScan",
         "description": {
-          "request": "OpenSearchQueryRequest(indexName\u003dopensearch-sql_test_index_account, sourceBuilder\u003d{\"from\":0,\"size\":0,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":30,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}],\"aggregations\":{\"composite_buckets\":{\"composite\":{\"size\":1000,\"sources\":[{\"state\":{\"terms\":{\"field\":\"state.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}},{\"city\":{\"terms\":{\"field\":\"city.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}}]},\"aggregations\":{\"avg_age\":{\"avg\":{\"field\":\"age\"}}}}}}, searchDone\u003dfalse)"
+          "request": "OpenSearchQueryRequest(indexName\u003dopensearch-sql_test_index_account, sourceBuilder\u003d{\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":30,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}],\"aggregations\":{\"composite_buckets\":{\"composite\":{\"size\":1000,\"sources\":[{\"state\":{\"terms\":{\"field\":\"state.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}},{\"city\":{\"terms\":{\"field\":\"city.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}}]},\"aggregations\":{\"avg_age\":{\"avg\":{\"field\":\"age\"}}}}}}, searchDone\u003dfalse)"
         },
         "children": []
       }
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/explain_output.json b/integ-test/src/test/resources/expectedOutput/ppl/explain_output.json
index 45988e35c7..8d45714283 100644
--- a/integ-test/src/test/resources/expectedOutput/ppl/explain_output.json
+++ b/integ-test/src/test/resources/expectedOutput/ppl/explain_output.json
@@ -31,7 +31,7 @@
                   {
                     "name": "OpenSearchIndexScan",
                     "description": {
-                      "request": "OpenSearchQueryRequest(indexName\u003dopensearch-sql_test_index_account, sourceBuilder\u003d{\"from\":0,\"size\":0,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":30,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}],\"aggregations\":{\"composite_buckets\":{\"composite\":{\"size\":1000,\"sources\":[{\"state\":{\"terms\":{\"field\":\"state.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}},{\"city\":{\"terms\":{\"field\":\"city.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}}]},\"aggregations\":{\"avg_age\":{\"avg\":{\"field\":\"age\"}}}}}}, searchDone\u003dfalse)"
+                      "request": "OpenSearchQueryRequest(indexName\u003dopensearch-sql_test_index_account, sourceBuilder\u003d{\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":30,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}],\"aggregations\":{\"composite_buckets\":{\"composite\":{\"size\":1000,\"sources\":[{\"state\":{\"terms\":{\"field\":\"state.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}},{\"city\":{\"terms\":{\"field\":\"city.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}}]},\"aggregations\":{\"avg_age\":{\"avg\":{\"field\":\"age\"}}}}}}, searchDone\u003dfalse)"
                     },
                     "children": []
                   }
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/explain_query_exemplars.json b/integ-test/src/test/resources/expectedOutput/ppl/explain_query_exemplars.json
new file mode 100644
index 0000000000..b7af2e79b0
--- /dev/null
+++ b/integ-test/src/test/resources/expectedOutput/ppl/explain_query_exemplars.json
@@ -0,0 +1,9 @@
+{
+  "root": {
+    "name": "QueryExemplarsFunctionTableScanOperator",
+    "description": {
+      "request": "query_exemplars(app_ads_ad_requests_total, 1689228292, 1689232299)"
+    },
+    "children": []
+  }
+}
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/explain_query_range.json b/integ-test/src/test/resources/expectedOutput/ppl/explain_query_range.json
new file mode 100644
index 0000000000..bbc00e0c43
--- /dev/null
+++ b/integ-test/src/test/resources/expectedOutput/ppl/explain_query_range.json
@@ -0,0 +1,9 @@
+{
+    "root": {
+        "name": "QueryRangeFunctionTableScanOperator",
+        "description": {
+            "request": "query_range(prometheus_http_requests_total, 1689281439, 1689291439, 14)"
+        },
+        "children": []
+    }
+}
\ No newline at end of file
diff --git a/integ-test/src/test/resources/geopoints.json b/integ-test/src/test/resources/geopoints.json
new file mode 100644
index 0000000000..95900fe811
--- /dev/null
+++ b/integ-test/src/test/resources/geopoints.json
@@ -0,0 +1,12 @@
+{"index": {"_id": "1"}}
+{"point": {"lat": 40.71, "lon": 74.00}}
+{"index": {"_id": "2"}}
+{"point": "40.71,74.00"}
+{"index": {"_id": "3"}}
+{"point": [74.00, 40.71]}
+{"index": {"_id": "4"}}
+{"point": "POINT (74.00 40.71)"}
+{"index": {"_id": "5"}}
+{"point": {"type": "Point", "coordinates": [74.00, 40.71]}}
+{"index": {"_id": "6"}}
+{"point": "txhxegj0uyp3"}
diff --git a/integ-test/src/test/resources/indexDefinitions/calcs_index_mappings.json b/integ-test/src/test/resources/indexDefinitions/calcs_index_mappings.json
index 08a88a9d32..bc1cd79a90 100644
--- a/integ-test/src/test/resources/indexDefinitions/calcs_index_mappings.json
+++ b/integ-test/src/test/resources/indexDefinitions/calcs_index_mappings.json
@@ -57,19 +57,19 @@
             },
             "date0" : {
                 "type" : "date",
-                "format": "yyyy-MM-dd"
+                "format": "year_month_day"
             },
             "date1" : {
                 "type" : "date",
-                "format": "yyyy-MM-dd"
+                "format": "year_month_day"
             },
             "date2" : {
                 "type" : "date",
-                "format": "yyyy-MM-dd"
+                "format": "year_month_day"
             },
             "date3" : {
                 "type" : "date",
-                "format": "yyyy-MM-dd"
+                "format": "year_month_day"
             },
             "time0" : {
                 "type" : "date",
diff --git a/integ-test/src/test/resources/indexDefinitions/datasources_index_mappings.json b/integ-test/src/test/resources/indexDefinitions/datasources_index_mappings.json
new file mode 100644
index 0000000000..cb45610e6f
--- /dev/null
+++ b/integ-test/src/test/resources/indexDefinitions/datasources_index_mappings.json
@@ -0,0 +1,17 @@
+{
+  "mappings": {
+    "properties": {
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "connectorType": {
+        "type": "keyword"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/integ-test/src/test/resources/indexDefinitions/datatypes_index_mapping.json b/integ-test/src/test/resources/indexDefinitions/datatypes_index_mapping.json
index 8c1759b369..5908114201 100644
--- a/integ-test/src/test/resources/indexDefinitions/datatypes_index_mapping.json
+++ b/integ-test/src/test/resources/indexDefinitions/datatypes_index_mapping.json
@@ -13,10 +13,13 @@
       "binary_value": {
         "type": "binary"
       },
-      "date_value":  {
+      "date_value": {
         "type" : "date",
         "format": "yyyy-MM-dd HH:mm:ss"
       },
+      "date_nanos_value": {
+        "type" : "date_nanos"
+      },
       "ip_value": {
         "type": "ip"
       },
diff --git a/integ-test/src/test/resources/indexDefinitions/date_formats_index_mapping.json b/integ-test/src/test/resources/indexDefinitions/date_formats_index_mapping.json
new file mode 100644
index 0000000000..0b6daaacb4
--- /dev/null
+++ b/integ-test/src/test/resources/indexDefinitions/date_formats_index_mapping.json
@@ -0,0 +1,362 @@
+{
+  "mappings" : {
+    "properties" : {
+      "epoch_millis" : {
+        "type" : "date",
+        "format" : "epoch_millis"
+      },
+      "epoch_second" : {
+        "type" : "date",
+        "format" : "epoch_second"
+      },
+      "date_optional_time" : {
+        "type" : "date",
+        "format" : "date_optional_time"
+      },
+      "strict_date_optional_time" : {
+        "type" : "date",
+        "format" : "strict_date_optional_time"
+      },
+      "strict_date_optional_time_nanos" : {
+        "type" : "date",
+        "format" : "strict_date_optional_time_nanos"
+      },
+      "basic_date" : {
+        "type" : "date",
+        "format" : "basic_date"
+      },
+      "basic_date_time" : {
+        "type" : "date",
+        "format" : "basic_date_time"
+      },
+      "basic_date_time_no_millis" : {
+        "type" : "date",
+        "format" : "basic_date_time_no_millis"
+      },
+      "basic_ordinal_date" : {
+        "type" : "date",
+        "format" : "basic_ordinal_date"
+      },
+      "basic_ordinal_date_time" : {
+        "type" : "date",
+        "format" : "basic_ordinal_date_time"
+      },
+      "basic_ordinal_date_time_no_millis" : {
+        "type" : "date",
+        "format" : "basic_ordinal_date_time_no_millis"
+      },
+      "basic_time" : {
+        "type" : "date",
+        "format" : "basic_time"
+      },
+      "basic_time_no_millis" : {
+        "type" : "date",
+        "format" : "basic_time_no_millis"
+      },
+      "basic_t_time" : {
+        "type" : "date",
+        "format" : "basic_t_time"
+      },
+      "basic_t_time_no_millis" : {
+        "type" : "date",
+        "format" : "basic_t_time_no_millis"
+      },
+      "basic_week_date" : {
+        "type" : "date",
+        "format" : "basic_week_date"
+      },
+      "strict_basic_week_date" : {
+        "type" : "date",
+        "format" : "strict_basic_week_date"
+      },
+      "basic_week_date_time" : {
+        "type" : "date",
+        "format" : "basic_week_date_time"
+      },
+      "strict_basic_week_date_time" : {
+        "type" : "date",
+        "format" : "strict_basic_week_date_time"
+      },
+      "basic_week_date_time_no_millis" : {
+        "type" : "date",
+        "format" : "basic_week_date_time_no_millis"
+      },
+      "strict_basic_week_date_time_no_millis" : {
+        "type" : "date",
+        "format" : "strict_basic_week_date_time_no_millis"
+      },
+      "date" : {
+        "type" : "date",
+        "format" : "date"
+      },
+      "strict_date" : {
+        "type" : "date",
+        "format" : "strict_date"
+      },
+      "date_hour" : {
+        "type" : "date",
+        "format" : "date_hour"
+      },
+      "strict_date_hour" : {
+        "type" : "date",
+        "format" : "strict_date_hour"
+      },
+      "date_hour_minute" : {
+        "type" : "date",
+        "format" : "date_hour_minute"
+      },
+      "strict_date_hour_minute" : {
+        "type" : "date",
+        "format" : "strict_date_hour_minute"
+      },
+      "date_hour_minute_second" : {
+        "type" : "date",
+        "format" : "date_hour_minute_second"
+      },
+      "strict_date_hour_minute_second" : {
+        "type" : "date",
+        "format" : "strict_date_hour_minute_second"
+      },
+      "date_hour_minute_second_fraction" : {
+        "type" : "date",
+        "format" : "date_hour_minute_second_fraction"
+      },
+      "strict_date_hour_minute_second_fraction" : {
+        "type" : "date",
+        "format" : "strict_date_hour_minute_second_fraction"
+      },
+      "date_hour_minute_second_millis" : {
+        "type" : "date",
+        "format" : "date_hour_minute_second_millis"
+      },
+      "strict_date_hour_minute_second_millis" : {
+        "type" : "date",
+        "format" : "strict_date_hour_minute_second_millis"
+      },
+      "date_time" : {
+        "type" : "date",
+        "format" : "date_time"
+      },
+      "strict_date_time" : {
+        "type" : "date",
+        "format" : "strict_date_time"
+      },
+      "date_time_no_millis" : {
+        "type" : "date",
+        "format" : "date_time_no_millis"
+      },
+      "strict_date_time_no_millis" : {
+        "type" : "date",
+        "format" : "strict_date_time_no_millis"
+      },
+      "hour" : {
+        "type" : "date",
+        "format" : "hour"
+      },
+      "strict_hour" : {
+        "type" : "date",
+        "format" : "strict_hour"
+      },
+      "hour_minute" : {
+        "type" : "date",
+        "format" : "hour_minute"
+      },
+      "strict_hour_minute" : {
+        "type" : "date",
+        "format" : "strict_hour_minute"
+      },
+      "hour_minute_second" : {
+        "type" : "date",
+        "format" : "hour_minute_second"
+      },
+      "strict_hour_minute_second" : {
+        "type" : "date",
+        "format" : "strict_hour_minute_second"
+      },
+      "hour_minute_second_fraction" : {
+        "type" : "date",
+        "format" : "hour_minute_second_fraction"
+      },
+      "strict_hour_minute_second_fraction" : {
+        "type" : "date",
+        "format" : "strict_hour_minute_second_fraction"
+      },
+      "hour_minute_second_millis" : {
+        "type" : "date",
+        "format" : "hour_minute_second_millis"
+      },
+      "strict_hour_minute_second_millis" : {
+        "type" : "date",
+        "format" : "strict_hour_minute_second_millis"
+      },
+      "ordinal_date" : {
+        "type" : "date",
+        "format" : "ordinal_date"
+      },
+      "strict_ordinal_date" : {
+        "type" : "date",
+        "format" : "strict_ordinal_date"
+      },
+      "ordinal_date_time" : {
+        "type" : "date",
+        "format" : "ordinal_date_time"
+      },
+      "strict_ordinal_date_time" : {
+        "type" : "date",
+        "format" : "strict_ordinal_date_time"
+      },
+      "ordinal_date_time_no_millis" : {
+        "type" : "date",
+        "format" : "ordinal_date_time_no_millis"
+      },
+      "strict_ordinal_date_time_no_millis" : {
+        "type" : "date",
+        "format" : "strict_ordinal_date_time_no_millis"
+      },
+      "time" : {
+        "type" : "date",
+        "format" : "time"
+      },
+      "strict_time" : {
+        "type" : "date",
+        "format" : "strict_time"
+      },
+      "time_no_millis" : {
+        "type" : "date",
+        "format" : "time_no_millis"
+      },
+      "strict_time_no_millis" : {
+        "type" : "date",
+        "format" : "strict_time_no_millis"
+      },
+      "t_time" : {
+        "type" : "date",
+        "format" : "t_time"
+      },
+      "strict_t_time" : {
+        "type" : "date",
+        "format" : "strict_t_time"
+      },
+      "t_time_no_millis" : {
+        "type" : "date",
+        "format" : "t_time_no_millis"
+      },
+      "strict_t_time_no_millis" : {
+        "type" : "date",
+        "format" : "strict_t_time_no_millis"
+      },
+      "week_date" : {
+        "type" : "date",
+        "format" : "week_date"
+      },
+      "strict_week_date" : {
+        "type" : "date",
+        "format" : "strict_week_date"
+      },
+      "week_date_time" : {
+        "type" : "date",
+        "format" : "week_date_time"
+      },
+      "strict_week_date_time" : {
+        "type" : "date",
+        "format" : "strict_week_date_time"
+      },
+      "week_date_time_no_millis" : {
+        "type" : "date",
+        "format" : "week_date_time_no_millis"
+      },
+      "strict_week_date_time_no_millis" : {
+        "type" : "date",
+        "format" : "strict_week_date_time_no_millis"
+      },
+      "weekyear_week_day" : {
+        "type" : "date",
+        "format" : "weekyear_week_day"
+      },
+      "strict_weekyear_week_day" : {
+        "type" : "date",
+        "format" : "strict_weekyear_week_day"
+      },
+      "year_month_day" : {
+        "type" : "date",
+        "format" : "year_month_day"
+      },
+      "strict_year_month_day" : {
+        "type" : "date",
+        "format" : "strict_year_month_day"
+      },
+      "yyyy-MM-dd" : {
+        "type" : "date",
+        "format": "yyyy-MM-dd"
+      },
+      "custom_time" : {
+        "type" : "date",
+        "format": "hh:mm:ss a"
+      },
+      "yyyy-MM-dd_OR_epoch_millis" : {
+        "type" : "date",
+        "format": "yyyy-MM-dd||epoch_millis"
+      },
+      "hour_minute_second_OR_t_time" : {
+        "type" : "date_nanos",
+        "format": "hour_minute_second||t_time"
+      },
+      "custom_timestamp" : {
+        "type" : "date",
+        "format": "yyyy-MM-dd hh:mm:ss ---- a"
+      },
+      "custom_date_or_date" : {
+        "type" : "date",
+        "format": "yyyy-MM-dd||date"
+      },
+      "custom_date_or_custom_time" : {
+        "type" : "date",
+        "format" : "yyyy-MM-dd || HH:mm:ss"
+      },
+      "custom_time_parser_check" : {
+        "type" : "date",
+        "format" : "::: k-A || A    "
+      },
+      "incomplete_1" : {
+          "type" : "date",
+          "format" : "year"
+      },
+      "incomplete_2" : {
+          "type" : "date",
+          "format" : "E-w"
+      },
+      "incomplete_custom_date" : {
+          "type" : "date",
+          "format" : "uuuu"
+      },
+      "incomplete_custom_time" : {
+          "type" : "date",
+          "format" : "HH"
+      },
+      "incorrect" : {
+          "type" : "date",
+          "format" : "'___'"
+      },
+      "epoch_sec" : {
+          "type" : "date",
+          "format" : "epoch_second"
+      },
+      "epoch_milli" : {
+          "type" : "date",
+          "format" : "epoch_millis"
+      },
+      "custom_no_delimiter_date" : {
+          "type" : "date",
+          "format" : "uuuuMMdd"
+      },
+      "custom_no_delimiter_time" : {
+          "type" : "date",
+          "format" : "HHmmss"
+      },
+      "custom_no_delimiter_ts" : {
+          "type" : "date",
+          "format" : "uuuuMMddHHmmss"
+      }
+    }
+  }
+}
diff --git a/integ-test/src/test/resources/indexDefinitions/geopoint_index_mapping.json b/integ-test/src/test/resources/indexDefinitions/geopoint_index_mapping.json
new file mode 100644
index 0000000000..61340530d8
--- /dev/null
+++ b/integ-test/src/test/resources/indexDefinitions/geopoint_index_mapping.json
@@ -0,0 +1,9 @@
+{
+  "mappings": {
+    "properties": {
+      "point": {
+        "type": "geo_point"
+      }
+    }
+  }
+}
diff --git a/integ-test/src/test/resources/indexDefinitions/multi_nested.json b/integ-test/src/test/resources/indexDefinitions/multi_nested.json
new file mode 100644
index 0000000000..d2da21d24c
--- /dev/null
+++ b/integ-test/src/test/resources/indexDefinitions/multi_nested.json
@@ -0,0 +1,42 @@
+{
+  "mappings": {
+    "properties": {
+      "message": {
+        "type": "nested",
+        "properties": {
+          "info": {
+            "type": "keyword"
+          },
+          "author": {
+            "type": "nested",
+            "properties": {
+              "name": {
+                "type": "keyword",
+                "fields": {
+                  "keyword": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "address": {
+                "type": "nested",
+                "properties": {
+                  "street": {
+                    "type": "keyword"
+                    },
+                  "number": {
+                    "type": "integer"
+                  }
+                }
+              }
+            }
+          },
+          "dayOfWeek": {
+            "type": "long"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/integ-test/src/test/resources/indexDefinitions/nested_simple_index_mapping.json b/integ-test/src/test/resources/indexDefinitions/nested_simple_index_mapping.json
index 2ebc8a50de..7e521cdd44 100644
--- a/integ-test/src/test/resources/indexDefinitions/nested_simple_index_mapping.json
+++ b/integ-test/src/test/resources/indexDefinitions/nested_simple_index_mapping.json
@@ -21,6 +21,14 @@
                 "ignore_above": 256
               }
             }
+          },
+          "moveInDate" : {
+            "properties": {
+              "dateAndTime": {
+                "type": "date",
+                "format": "basic_date_time"
+              }
+            }
           }
         }
       },
diff --git a/integ-test/src/test/resources/indexDefinitions/unexpanded_object_index_mapping.json b/integ-test/src/test/resources/indexDefinitions/unexpanded_object_index_mapping.json
new file mode 100644
index 0000000000..8275147375
--- /dev/null
+++ b/integ-test/src/test/resources/indexDefinitions/unexpanded_object_index_mapping.json
@@ -0,0 +1,27 @@
+{
+  "mappings": {
+    "properties": {
+      "id": {
+        "properties": {
+          "serial": {
+            "type": "integer"
+          }
+        }
+      },
+      "attributes": {
+        "properties": {
+          "hardware": {
+            "properties": {
+              "correlate_id": {
+                "type": "integer"
+              },
+              "platform": {
+                "type": "keyword"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/integ-test/src/test/resources/multi_nested_objects.json b/integ-test/src/test/resources/multi_nested_objects.json
new file mode 100644
index 0000000000..c8cf91162a
--- /dev/null
+++ b/integ-test/src/test/resources/multi_nested_objects.json
@@ -0,0 +1,10 @@
+{"index":{"_id":"1"}}
+{"message":{"info":"a","author":{"name": "e", "address": {"street": "bc", "number": 1}},"dayOfWeek":1},"office":{"west":"ab","south":3}}
+{"index":{"_id":"2"}}
+{"message":{"info":"b","author":{"name": "f", "address": {"street": "ab", "number": 2}},"dayOfWeek":2},"office":{"west":"ff","south":5}}
+{"index":{"_id":"3"}}
+{"message":{"info":"c","author":{"name": "g", "address": {"street": "sk", "number": 3}},"dayOfWeek":1},"office":{"west":"ll","south":3}}
+{"index":{"_id":"4"}}
+{"message":[{"info":"d","author":{"name": "h", "address": {"street": "mb", "number": 4}},"dayOfWeek":4},{"info":"i","author":{"name": "p", "address": {"street": "on", "number": 5}},"dayOfWeek":5}]}
+{"index":{"_id":"5"}}
+{"message": [{"info":"zz","author":{"name": "yy", "address": {"street": "qc", "number": 6}},"dayOfWeek":6}]}
diff --git a/integ-test/src/test/resources/nested_objects_without_arrays.json b/integ-test/src/test/resources/nested_objects_without_arrays.json
new file mode 100644
index 0000000000..626e63e079
--- /dev/null
+++ b/integ-test/src/test/resources/nested_objects_without_arrays.json
@@ -0,0 +1,10 @@
+{"index":{"_id":"1"}}
+{"message":{"info":"a","author":"e","dayOfWeek":1},"comment":{"data":"ab","likes":3},"myNum":1,"someField":"b"}
+{"index":{"_id":"2"}}
+{"message":{"info":"b","author":"f","dayOfWeek":2},"comment":{"data":"aa","likes":2},"myNum":2,"someField":"a"}
+{"index":{"_id":"3"}}
+{"message":{"info":"c","author":"g","dayOfWeek":1},"comment":{"data":"aa","likes":3},"myNum":3,"someField":"a"}
+{"index":{"_id":"4"}}
+{"message":{"info":"c","author":"h","dayOfWeek":4},"comment":{"data":"ab","likes":1},"myNum":4,"someField":"b"}
+{"index":{"_id":"5"}}
+{"message": {"info":"zz","author":"zz","dayOfWeek":6},"comment":{"data":"bb","likes":10},"myNum":3,"someField":"a"}
diff --git a/integ-test/src/test/resources/nested_simple.json b/integ-test/src/test/resources/nested_simple.json
index d42cc667df..f3cb1a5ebe 100644
--- a/integ-test/src/test/resources/nested_simple.json
+++ b/integ-test/src/test/resources/nested_simple.json
@@ -1,10 +1,10 @@
 {"index":{"_id":"1"}}
-{"name":"abbas","age":24,"address":[{"city":"New york city","state":"NY"},{"city":"bellevue","state":"WA"},{"city":"seattle","state":"WA"},{"city":"chicago","state":"IL"}]}
+{"name":"abbas","age":24,"address":[{"city":"New york city","state":"NY","moveInDate":{"dateAndTime":"19840412T090742.000Z"}},{"city":"bellevue","state":"WA","moveInDate":[{"dateAndTime":"20230503T080742.000Z"},{"dateAndTime":"20011111T040744.000Z"}]},{"city":"seattle","state":"WA","moveInDate":{"dateAndTime":"19660319T030455.000Z"}},{"city":"chicago","state":"IL","moveInDate":{"dateAndTime":"20110601T010142.000Z"}}]}
 {"index":{"_id":"2"}}
-{"name":"chen","age":32,"address":[{"city":"Miami","state":"Florida"},{"city":"los angeles","state":"CA"}]}
+{"name":"chen","age":32,"address":[{"city":"Miami","state":"Florida","moveInDate":{"dateAndTime":"19010811T040333.000Z"}},{"city":"los angeles","state":"CA","moveInDate":{"dateAndTime":"20230503T080742.000Z"}}]}
 {"index":{"_id":"3"}}
-{"name":"peng","age":26,"address":[{"city":"san diego","state":"CA"},{"city":"austin","state":"TX"}]}
+{"name":"peng","age":26,"address":[{"city":"san diego","state":"CA","moveInDate":{"dateAndTime":"20011111T040744.000Z"}},{"city":"austin","state":"TX","moveInDate":{"dateAndTime":"19770713T090441.000Z"}}]}
 {"index":{"_id":"4"}}
-{"name":"andy","age":19,"id":4,"address":[{"city":"houston","state":"TX"}]}
+{"name":"andy","age":19,"id":4,"address":[{"city":"houston","state":"TX","moveInDate":{"dateAndTime":"19331212T050545.000Z"}}]}
 {"index":{"_id":"5"}}
-{"name":"david","age":25,"address":[{"city":"raleigh","state":"NC"},{"city":"charlotte","state":"SC"}]}
+{"name":"david","age":25,"address":[{"city":"raleigh","state":"NC","moveInDate":{"dateAndTime":"19090617T010421.000Z"}},{"city":"charlotte","state":"SC","moveInDate":[{"dateAndTime":"20011111T040744.000Z"}]}]}
diff --git a/integ-test/src/test/resources/nested_with_nulls.json b/integ-test/src/test/resources/nested_with_nulls.json
new file mode 100644
index 0000000000..b02a8ab110
--- /dev/null
+++ b/integ-test/src/test/resources/nested_with_nulls.json
@@ -0,0 +1,24 @@
+{"index":{"_id":"1"}}
+{"message":{"author":"e","dayOfWeek":5},"comment":{"data":"hh","likes":5},"myNum":7,"someField":"a"}
+{"index":{"_id":"2"}}
+{"message":{"info":"b","author":"f","dayOfWeek":2},"comment":{"data":"aa","likes":2},"myNum":2,"someField":"a"}
+{"index":{"_id":"3"}}
+{"message":{"info":"c","author":"g","dayOfWeek":1},"comment":{"data":"aa","likes":3},"myNum":3,"someField":"a"}
+{"index":{"_id":"4"}}
+{"message":[{"info":"c","author":"h","dayOfWeek":4},{"info":"a","author":"i","dayOfWeek":5}],"comment":{"data":"ab","likes":1},"myNum":4,"someField":"b"}
+{"index":{"_id":"5"}}
+{"message": [{"info":"zz","author":"zz","dayOfWeek":6}],"comment":{"data":["aa","bb"],"likes":10},"myNum":[3,4],"someField":"a"}
+{"index":{"_id":"7"}}
+{"message":[{"info":"zz", "author":"z\"z", "dayOfWeek":6}], "comment":{"data":["aa","bb"], "likes":10}, "myNum":[3,4], "someField":"a"}
+{"index":{"_id":"8"}}
+{"message":{"info":null,"author":"e","dayOfWeek":7},"comment":{"data":"ee","likes":6},"myNum":6,"someField":"a"}
+{"index":{"_id":"9"}}
+{"message":{"info":"a","author":"e","dayOfWeek":1},"comment":{"data":"ab","likes":3},"myNum":1,"someField":"b"}
+{"index":{"_id":"10"}}
+{"message":[{"info":"rr", "author":"this \"value\" contains quotes", "dayOfWeek":3}], "comment":{"data":["asdf","sdfg"], "likes":56}, "myNum":[1,2,4], "someField":"ert"}
+{"index":{"_id":"11"}}
+{"comment":{"data":"jj","likes":1},"myNum":8,"someField":"a"}
+{"index":{"_id":"12"}}
+{"message":null,"comment":{"data":"kk","likes":0},"myNum":9,"someField":"a"}
+{"index":{"_id":"13"}}
+{}
diff --git a/integ-test/src/test/resources/security/esnode-key.pem b/integ-test/src/test/resources/security/esnode-key.pem
new file mode 100644
index 0000000000..4ac2cb57a7
--- /dev/null
+++ b/integ-test/src/test/resources/security/esnode-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCWvn+O+rywfgMC
+ud24mAclMDfuNA/IzCKLxl5usIE/PvUm7PPfXQ14LfQhNQXqOuaD9fiVM+HO1BzK
+wmN3j4g7eHInR1cxENoNGKFa0Fr9EXnUv8sfwyobPD8NTu9eaH7T+d6f9oow+Q4n
+xb9Xin5IRR/pcJ8v7zEjcXpZaZejcSU4iVZ0PR2Di4H9rfe9SEyR5wLrsVBePB3L
+jaL1uK4bZF3n/JGgDe3BNy1PgPU+O+FCzQipBBTyJWQCjd4iTRXVbMa01PglAR85
+O9w6NXApBLyWdGRY6dGd8vMC2P4KlhnxlcgPZdglKniGTX+eTzT7Rszq77zjYrou
+PLwSh9S7AgMBAAECggEABwiohxFoEIwws8XcdKqTWsbfNTw0qFfuHLuK2Htf7IWR
+htlzn66F3F+4jnwc5IsPCoVFriCXnsEC/usHHSMTZkL+gJqxlNaGdin6DXS/aiOQ
+nb69SaQfqNmsz4ApZyxVDqsQGkK0vAhDAtQVU45gyhp/nLLmmqP8lPzMirOEodmp
+U9bA8t/ttrzng7SVAER42f6IVpW0iTKTLyFii0WZbq+ObViyqib9hVFrI6NJuQS+
+IelcZB0KsSi6rqIjXg1XXyMiIUcSlhq+GfEa18AYgmsbPwMbExate7/8Ci7ZtCbh
+lx9bves2+eeqq5EMm3sMHyhdcg61yzd5UYXeZhwJkQKBgQDS9YqrAtztvLY2gMgv
+d+wOjb9awWxYbQTBjx33kf66W+pJ+2j8bI/XX2CpZ98w/oq8VhMqbr9j5b8MfsrF
+EoQvedA4joUo8sXd4j1mR2qKF4/KLmkgy6YYusNP2UrVSw7sh77bzce+YaVVoO/e
+0wIVTHuD/QZ6fG6MasOqcbl6hwKBgQC27cQruaHFEXR/16LrMVAX+HyEEv44KOCZ
+ij5OE4P7F0twb+okngG26+OJV3BtqXf0ULlXJ+YGwXCRf6zUZkld3NMy3bbKPgH6
+H/nf3BxqS2tudj7+DV52jKtisBghdvtlKs56oc9AAuwOs37DvhptBKUPdzDDqfys
+Qchv5JQdLQKBgERev+pcqy2Bk6xmYHrB6wdseS/4sByYeIoi0BuEfYH4eB4yFPx6
+UsQCbVl6CKPgWyZe3ydJbU37D8gE78KfFagtWoZ56j4zMF2RDUUwsB7BNCDamce/
+OL2bCeG/Erm98cBG3lxufOX+z47I8fTNfkdY2k8UmhzoZwurLm73HJ3RAoGBAKsp
+6yamuXF2FbYRhUXgjHsBbTD/vJO72/yO2CGiLRpi/5mjfkjo99269trp0C8sJSub
+5PBiSuADXFsoRgUv+HI1UAEGaCTwxFTQWrRWdtgW3d0sE2EQDVWL5kmfT9TwSeat
+mSoyAYR5t3tCBNkPJhbgA7pm4mASzHQ50VyxWs25AoGBAKPFx9X2oKhYQa+mW541
+bbqRuGFMoXIIcr/aeM3LayfLETi48o5NDr2NDP11j4yYuz26YLH0Dj8aKpWuehuH
+uB27n6j6qu0SVhQi6mMJBe1JrKbzhqMKQjYOoy8VsC2gdj5pCUP/kLQPW7zm9diX
+CiKTtKgPIeYdigor7V3AHcVT
+-----END PRIVATE KEY-----
diff --git a/integ-test/src/test/resources/security/esnode.pem b/integ-test/src/test/resources/security/esnode.pem
new file mode 100644
index 0000000000..7ba92534e4
--- /dev/null
+++ b/integ-test/src/test/resources/security/esnode.pem
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIEyTCCA7GgAwIBAgIGAWLrc1O2MA0GCSqGSIb3DQEBCwUAMIGPMRMwEQYKCZIm
+iZPyLGQBGRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEZMBcGA1UECgwQ
+RXhhbXBsZSBDb20gSW5jLjEhMB8GA1UECwwYRXhhbXBsZSBDb20gSW5jLiBSb290
+IENBMSEwHwYDVQQDDBhFeGFtcGxlIENvbSBJbmMuIFJvb3QgQ0EwHhcNMTgwNDIy
+MDM0MzQ3WhcNMjgwNDE5MDM0MzQ3WjBeMRIwEAYKCZImiZPyLGQBGRYCZGUxDTAL
+BgNVBAcMBHRlc3QxDTALBgNVBAoMBG5vZGUxDTALBgNVBAsMBG5vZGUxGzAZBgNV
+BAMMEm5vZGUtMC5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAJa+f476vLB+AwK53biYByUwN+40D8jMIovGXm6wgT8+9Sbs899dDXgt
+9CE1Beo65oP1+JUz4c7UHMrCY3ePiDt4cidHVzEQ2g0YoVrQWv0RedS/yx/DKhs8
+Pw1O715oftP53p/2ijD5DifFv1eKfkhFH+lwny/vMSNxellpl6NxJTiJVnQ9HYOL
+gf2t971ITJHnAuuxUF48HcuNovW4rhtkXef8kaAN7cE3LU+A9T474ULNCKkEFPIl
+ZAKN3iJNFdVsxrTU+CUBHzk73Do1cCkEvJZ0ZFjp0Z3y8wLY/gqWGfGVyA9l2CUq
+eIZNf55PNPtGzOrvvONiui48vBKH1LsCAwEAAaOCAVkwggFVMIG8BgNVHSMEgbQw
+gbGAFJI1DOAPHitF9k0583tfouYSl0BzoYGVpIGSMIGPMRMwEQYKCZImiZPyLGQB
+GRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEZMBcGA1UECgwQRXhhbXBs
+ZSBDb20gSW5jLjEhMB8GA1UECwwYRXhhbXBsZSBDb20gSW5jLiBSb290IENBMSEw
+HwYDVQQDDBhFeGFtcGxlIENvbSBJbmMuIFJvb3QgQ0GCAQEwHQYDVR0OBBYEFKyv
+78ZmFjVKM9g7pMConYH7FVBHMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgXg
+MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjA1BgNVHREELjAsiAUq
+AwQFBYISbm9kZS0wLmV4YW1wbGUuY29tgglsb2NhbGhvc3SHBH8AAAEwDQYJKoZI
+hvcNAQELBQADggEBAIOKuyXsFfGv1hI/Lkpd/73QNqjqJdxQclX57GOMWNbOM5H0
+5/9AOIZ5JQsWULNKN77aHjLRr4owq2jGbpc/Z6kAd+eiatkcpnbtbGrhKpOtoEZy
+8KuslwkeixpzLDNISSbkeLpXz4xJI1ETMN/VG8ZZP1bjzlHziHHDu0JNZ6TnNzKr
+XzCGMCohFfem8vnKNnKUneMQMvXd3rzUaAgvtf7Hc2LTBlf4fZzZF1EkwdSXhaMA
+1lkfHiqOBxtgeDLxCHESZ2fqgVqsWX+t3qHQfivcPW6txtDyrFPRdJOGhiMGzT/t
+e/9kkAtQRgpTb3skYdIOOUOV0WGQ60kJlFhAzIs=
+-----END CERTIFICATE-----
diff --git a/integ-test/src/test/resources/security/kirk-key.pem b/integ-test/src/test/resources/security/kirk-key.pem
new file mode 100644
index 0000000000..bacb22c215
--- /dev/null
+++ b/integ-test/src/test/resources/security/kirk-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCwgBOoO88uMM8
+dREJsk58Yt4Jn0zwQ2wUThbvy3ICDiEWhiAhUbg6dTggpS5vWWJto9bvaaqgMVoh
+ElfYHdTDncX3UQNBEP8tqzHON6BFEFSGgJRGLd6f5dri6rK32nCotYS61CFXBFxf
+WumXjSukjyrcTsdkR3C5QDo2oN7F883MOQqRENPzAtZi9s3jNX48u+/e3yvJzXsB
+GS9Qmsye6C71enbIujM4CVwDT/7a5jHuaUp6OuNCFbdRPnu/wLYwOS2/yOtzAqk7
+/PFnPCe7YOa10ShnV/jx2sAHhp7ZQBJgFkkgnIERz9Ws74Au+EbptWnsWuB+LqRL
+x5G02IzpAgMBAAECggEAEzwnMkeBbqqDgyRqFbO/PgMNvD7i0b/28V0dCtCPEVY6
+klzrg3RCERP5V9AN8VVkppYjPkCzZ2A4b0JpMUu7ncOmr7HCnoSCj2IfEyePSVg+
+4OHbbcBOAoDTHiI2myM/M9++8izNS34qGV4t6pfjaDyeQQ/5cBVWNBWnKjS34S5H
+rJWpAcDgxYk5/ah2Xs2aULZlXDMxbSikjrv+n4JIYTKFQo8ydzL8HQDBRmXAFLjC
+gNOSHf+5u1JdpY3uPIxK1ugVf8zPZ4/OEB23j56uu7c8+sZ+kZwfRWAQmMhFVG/y
+OXxoT5mOruBsAw29m2Ijtxg252/YzSTxiDqFziB/eQKBgQDjeVAdi55GW/bvhuqn
+xME/An8E3hI/FyaaITrMQJUBjiCUaStTEqUgQ6A7ZfY/VX6qafOX7sli1svihrXC
+uelmKrdve/CFEEqzX9JWWRiPiQ0VZD+EQRsJvX85Tw2UGvVUh6dO3UGPS0BhplMD
+jeVpyXgZ7Gy5we+DWjfwhYrCmwKBgQDbLmQhRy+IdVljObZmv3QtJ0cyxxZETWzU
+MKmgBFvcRw+KvNwO+Iy0CHEbDu06Uj63kzI2bK3QdINaSrjgr8iftXIQpBmcgMF+
+a1l5HtHlCp6RWd55nWQOEvn36IGN3cAaQkXuh4UYM7QfEJaAbzJhyJ+wXA3jWqUd
+8bDTIAZ0ywKBgFuZ44gyTAc7S2JDa0Up90O/ZpT4NFLRqMrSbNIJg7d/m2EIRNkM
+HhCzCthAg/wXGo3XYq+hCdnSc4ICCzmiEfoBY6LyPvXmjJ5VDOeWs0xBvVIK74T7
+jr7KX2wdiHNGs9pZUidw89CXVhK8nptEzcheyA1wZowbK68yamph7HHXAoGBAK3x
+7D9Iyl1mnDEWPT7f1Gh9UpDm1TIRrDvd/tBihTCVKK13YsFy2d+LD5Bk0TpGyUVR
+STlOGMdloFUJFh4jA3pUOpkgUr8Uo/sbYN+x6Ov3+I3sH5aupRhSURVA7YhUIz/z
+tqIt5R+m8Nzygi6dkQNvf+Qruk3jw0S3ahizwsvvAoGAL7do6dTLp832wFVxkEf4
+gg1M6DswfkgML5V/7GQ3MkIX/Hrmiu+qSuHhDGrp9inZdCDDYg5+uy1+2+RBMRZ3
+vDUUacvc4Fep05zp7NcjgU5y+/HWpuKVvLIlZAO1MBY4Xinqqii6RdxukIhxw7eT
+C6TPL5KAcV1R/XAihDhI18Y=
+-----END PRIVATE KEY-----
diff --git a/integ-test/src/test/resources/security/kirk.pem b/integ-test/src/test/resources/security/kirk.pem
new file mode 100644
index 0000000000..c32b21cd89
--- /dev/null
+++ b/integ-test/src/test/resources/security/kirk.pem
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEdzCCA1+gAwIBAgIGAWLrc1O4MA0GCSqGSIb3DQEBCwUAMIGPMRMwEQYKCZIm
+iZPyLGQBGRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEZMBcGA1UECgwQ
+RXhhbXBsZSBDb20gSW5jLjEhMB8GA1UECwwYRXhhbXBsZSBDb20gSW5jLiBSb290
+IENBMSEwHwYDVQQDDBhFeGFtcGxlIENvbSBJbmMuIFJvb3QgQ0EwHhcNMTgwNDIy
+MDM0MzQ3WhcNMjgwNDE5MDM0MzQ3WjBNMQswCQYDVQQGEwJkZTENMAsGA1UEBwwE
+dGVzdDEPMA0GA1UECgwGY2xpZW50MQ8wDQYDVQQLDAZjbGllbnQxDTALBgNVBAMM
+BGtpcmswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCwgBOoO88uMM8
+dREJsk58Yt4Jn0zwQ2wUThbvy3ICDiEWhiAhUbg6dTggpS5vWWJto9bvaaqgMVoh
+ElfYHdTDncX3UQNBEP8tqzHON6BFEFSGgJRGLd6f5dri6rK32nCotYS61CFXBFxf
+WumXjSukjyrcTsdkR3C5QDo2oN7F883MOQqRENPzAtZi9s3jNX48u+/e3yvJzXsB
+GS9Qmsye6C71enbIujM4CVwDT/7a5jHuaUp6OuNCFbdRPnu/wLYwOS2/yOtzAqk7
+/PFnPCe7YOa10ShnV/jx2sAHhp7ZQBJgFkkgnIERz9Ws74Au+EbptWnsWuB+LqRL
+x5G02IzpAgMBAAGjggEYMIIBFDCBvAYDVR0jBIG0MIGxgBSSNQzgDx4rRfZNOfN7
+X6LmEpdAc6GBlaSBkjCBjzETMBEGCgmSJomT8ixkARkWA2NvbTEXMBUGCgmSJomT
+8ixkARkWB2V4YW1wbGUxGTAXBgNVBAoMEEV4YW1wbGUgQ29tIEluYy4xITAfBgNV
+BAsMGEV4YW1wbGUgQ29tIEluYy4gUm9vdCBDQTEhMB8GA1UEAwwYRXhhbXBsZSBD
+b20gSW5jLiBSb290IENBggEBMB0GA1UdDgQWBBRsdhuHn3MGDvZxOe22+1wliCJB
+mDAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSUBAf8EDDAKBggr
+BgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAkPrUTKKn+/6g0CjhTPBFeX8mKXhG
+zw5z9Oq+xnwefZwxV82E/tgFsPcwXcJIBg0f43BaVSygPiV7bXqWhxASwn73i24z
+lveIR4+z56bKIhP6c3twb8WWR9yDcLu2Iroin7dYEm3dfVUrhz/A90WHr6ddwmLL
+3gcFF2kBu3S3xqM5OmN/tqRXFmo+EvwrdJRiTh4Fsf0tX1ZT07rrGvBFYktK7Kma
+lqDl4UDCF1UWkiiFubc0Xw+DR6vNAa99E0oaphzvCmITU1wITNnYZTKzVzQ7vUCq
+kLmXOFLTcxTQpptxSo5xDD3aTpzWGCvjExCKpXQtsITUOYtZc02AGjjPOQ==
+-----END CERTIFICATE-----
diff --git a/integ-test/src/test/resources/security/root-ca.pem b/integ-test/src/test/resources/security/root-ca.pem
new file mode 100644
index 0000000000..4015d866e1
--- /dev/null
+++ b/integ-test/src/test/resources/security/root-ca.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIBATANBgkqhkiG9w0BAQsFADCBjzETMBEGCgmSJomT8ixk
+ARkWA2NvbTEXMBUGCgmSJomT8ixkARkWB2V4YW1wbGUxGTAXBgNVBAoMEEV4YW1w
+bGUgQ29tIEluYy4xITAfBgNVBAsMGEV4YW1wbGUgQ29tIEluYy4gUm9vdCBDQTEh
+MB8GA1UEAwwYRXhhbXBsZSBDb20gSW5jLiBSb290IENBMB4XDTE4MDQyMjAzNDM0
+NloXDTI4MDQxOTAzNDM0NlowgY8xEzARBgoJkiaJk/IsZAEZFgNjb20xFzAVBgoJ
+kiaJk/IsZAEZFgdleGFtcGxlMRkwFwYDVQQKDBBFeGFtcGxlIENvbSBJbmMuMSEw
+HwYDVQQLDBhFeGFtcGxlIENvbSBJbmMuIFJvb3QgQ0ExITAfBgNVBAMMGEV4YW1w
+bGUgQ29tIEluYy4gUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAK/u+GARP5innhpXK0c0q7s1Su1VTEaIgmZr8VWI6S8amf5cU3ktV7WT9SuV
+TsAm2i2A5P+Ctw7iZkfnHWlsC3HhPUcd6mvzGZ4moxnamM7r+a9otRp3owYoGStX
+ylVTQusAjbq9do8CMV4hcBTepCd+0w0v4h6UlXU8xjhj1xeUIz4DKbRgf36q0rv4
+VIX46X72rMJSETKOSxuwLkov1ZOVbfSlPaygXIxqsHVlj1iMkYRbQmaTib6XWHKf
+MibDaqDejOhukkCjzpptGZOPFQ8002UtTTNv1TiaKxkjMQJNwz6jfZ53ws3fh1I0
+RWT6WfM4oeFRFnyFRmc4uYTUgAkCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAf
+BgNVHSMEGDAWgBSSNQzgDx4rRfZNOfN7X6LmEpdAczAdBgNVHQ4EFgQUkjUM4A8e
+K0X2TTnze1+i5hKXQHMwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4IB
+AQBoQHvwsR34hGO2m8qVR9nQ5Klo5HYPyd6ySKNcT36OZ4AQfaCGsk+SecTi35QF
+RHL3g2qffED4tKR0RBNGQSgiLavmHGCh3YpDupKq2xhhEeS9oBmQzxanFwWFod4T
+nnsG2cCejyR9WXoRzHisw0KJWeuNlwjUdJY0xnn16srm1zL/M/f0PvCyh9HU1mF1
+ivnOSqbDD2Z7JSGyckgKad1Omsg/rr5XYtCeyJeXUPcmpeX6erWJJNTUh6yWC/hY
+G/dFC4xrJhfXwz6Z0ytUygJO32bJG4Np2iGAwvvgI9EfxzEv/KP+FGrJOvQJAq4/
+BU36ZAa80W/8TBnqZTkNnqZV
+-----END CERTIFICATE-----
diff --git a/integ-test/src/test/resources/security/sample.pem b/integ-test/src/test/resources/security/sample.pem
new file mode 100644
index 0000000000..7ba92534e4
--- /dev/null
+++ b/integ-test/src/test/resources/security/sample.pem
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIEyTCCA7GgAwIBAgIGAWLrc1O2MA0GCSqGSIb3DQEBCwUAMIGPMRMwEQYKCZIm
+iZPyLGQBGRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEZMBcGA1UECgwQ
+RXhhbXBsZSBDb20gSW5jLjEhMB8GA1UECwwYRXhhbXBsZSBDb20gSW5jLiBSb290
+IENBMSEwHwYDVQQDDBhFeGFtcGxlIENvbSBJbmMuIFJvb3QgQ0EwHhcNMTgwNDIy
+MDM0MzQ3WhcNMjgwNDE5MDM0MzQ3WjBeMRIwEAYKCZImiZPyLGQBGRYCZGUxDTAL
+BgNVBAcMBHRlc3QxDTALBgNVBAoMBG5vZGUxDTALBgNVBAsMBG5vZGUxGzAZBgNV
+BAMMEm5vZGUtMC5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAJa+f476vLB+AwK53biYByUwN+40D8jMIovGXm6wgT8+9Sbs899dDXgt
+9CE1Beo65oP1+JUz4c7UHMrCY3ePiDt4cidHVzEQ2g0YoVrQWv0RedS/yx/DKhs8
+Pw1O715oftP53p/2ijD5DifFv1eKfkhFH+lwny/vMSNxellpl6NxJTiJVnQ9HYOL
+gf2t971ITJHnAuuxUF48HcuNovW4rhtkXef8kaAN7cE3LU+A9T474ULNCKkEFPIl
+ZAKN3iJNFdVsxrTU+CUBHzk73Do1cCkEvJZ0ZFjp0Z3y8wLY/gqWGfGVyA9l2CUq
+eIZNf55PNPtGzOrvvONiui48vBKH1LsCAwEAAaOCAVkwggFVMIG8BgNVHSMEgbQw
+gbGAFJI1DOAPHitF9k0583tfouYSl0BzoYGVpIGSMIGPMRMwEQYKCZImiZPyLGQB
+GRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEZMBcGA1UECgwQRXhhbXBs
+ZSBDb20gSW5jLjEhMB8GA1UECwwYRXhhbXBsZSBDb20gSW5jLiBSb290IENBMSEw
+HwYDVQQDDBhFeGFtcGxlIENvbSBJbmMuIFJvb3QgQ0GCAQEwHQYDVR0OBBYEFKyv
+78ZmFjVKM9g7pMConYH7FVBHMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgXg
+MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjA1BgNVHREELjAsiAUq
+AwQFBYISbm9kZS0wLmV4YW1wbGUuY29tgglsb2NhbGhvc3SHBH8AAAEwDQYJKoZI
+hvcNAQELBQADggEBAIOKuyXsFfGv1hI/Lkpd/73QNqjqJdxQclX57GOMWNbOM5H0
+5/9AOIZ5JQsWULNKN77aHjLRr4owq2jGbpc/Z6kAd+eiatkcpnbtbGrhKpOtoEZy
+8KuslwkeixpzLDNISSbkeLpXz4xJI1ETMN/VG8ZZP1bjzlHziHHDu0JNZ6TnNzKr
+XzCGMCohFfem8vnKNnKUneMQMvXd3rzUaAgvtf7Hc2LTBlf4fZzZF1EkwdSXhaMA
+1lkfHiqOBxtgeDLxCHESZ2fqgVqsWX+t3qHQfivcPW6txtDyrFPRdJOGhiMGzT/t
+e/9kkAtQRgpTb3skYdIOOUOV0WGQ60kJlFhAzIs=
+-----END CERTIFICATE-----
diff --git a/integ-test/src/test/resources/unexpanded_objects.json b/integ-test/src/test/resources/unexpanded_objects.json
new file mode 100644
index 0000000000..e1df2570cc
--- /dev/null
+++ b/integ-test/src/test/resources/unexpanded_objects.json
@@ -0,0 +1,8 @@
+{"index":{"_id":"1"}}
+{"id.serial" : 1 , "attributes.hardware.correlate_id": 3, "attributes.hardware.platform": "Linux"}
+{"index":{"_id":"2"}}
+{"id.serial" : 2 , "attributes.hardware.correlate_id": 3, "attributes.hardware.platform": "Windows"}
+{"index":{"_id":"3"}}
+{"id.serial" : 3 , "attributes.hardware.correlate_id": 3, "attributes.hardware.platform": "Linux"}
+{"index":{"_id":"4"}}
+{"id.serial" : 4 , "attributes.hardware.correlate_id": 100, "attributes.hardware.platform": "Linux"}
diff --git a/legacy/build.gradle b/legacy/build.gradle
index db9d6138f0..72829e1be7 100644
--- a/legacy/build.gradle
+++ b/legacy/build.gradle
@@ -26,6 +26,7 @@ plugins {
     id 'java'
     id 'io.freefair.lombok'
     id 'antlr'
+    id 'com.diffplug.spotless' version '6.22.0'
 }
 
 generateGrammarSource {
@@ -88,9 +89,10 @@ dependencies {
             because 'https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379'
         }
     }
-    implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
-    implementation group: 'org.json', name: 'json', version:'20180813'
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
+    implementation group: 'com.google.guava', name: 'guava', version: "${guava_version}"
+    implementation group: 'org.json', name: 'json', version:'20231013'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
     implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
     // add geo module as dependency. https://github.com/opensearch-project/OpenSearch/pull/4180/.
     implementation group: 'org.opensearch.plugin', name: 'geo', version: "${opensearch_version}"
@@ -104,7 +106,7 @@ dependencies {
     compileOnly group: 'javax.servlet', name: 'servlet-api', version:'2.5'
 
     testImplementation group: 'org.hamcrest', name: 'hamcrest-core', version:'2.2'
-    testImplementation group: 'org.mockito', name: 'mockito-inline', version:'3.12.4'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
 
 }
diff --git a/legacy/src/main/antlr/OpenSearchLegacySqlParser.g4 b/legacy/src/main/antlr/OpenSearchLegacySqlParser.g4
index 4b6d871faf..b64059ab7d 100644
--- a/legacy/src/main/antlr/OpenSearchLegacySqlParser.g4
+++ b/legacy/src/main/antlr/OpenSearchLegacySqlParser.g4
@@ -30,324 +30,280 @@ THE SOFTWARE.
 
 parser grammar OpenSearchLegacySqlParser;
 
-options { tokenVocab=OpenSearchLegacySqlLexer; }
-
 
+options { tokenVocab = OpenSearchLegacySqlLexer; }
 // Top Level Description
 
-//    Root rule
+// Root rule
 root
-    : sqlStatement? SEMI? EOF
-    ;
+   : sqlStatement? SEMI? EOF
+   ;
 
-//    Only SELECT, DELETE, SHOW and DSCRIBE are supported for now
+// Only SELECT, DELETE, SHOW and DSCRIBE are supported for now
 sqlStatement
-    : dmlStatement | administrationStatement | utilityStatement
-    ;
+   : dmlStatement
+   | administrationStatement
+   | utilityStatement
+   ;
 
 dmlStatement
-    : selectStatement | deleteStatement
-    ;
-
-
-// Data Manipulation Language
+   : selectStatement
+   | deleteStatement
+   ;
 
-//    Primary DML Statements
+   // Data Manipulation Language
 
+   // Primary DML Statements
 selectStatement
-    : querySpecification                                 #simpleSelect
-    | queryExpression                                    #parenthesisSelect
-    | querySpecification unionStatement+
-        orderByClause? limitClause?                      #unionSelect
-    | querySpecification minusStatement+
-        orderByClause? limitClause?                      #minusSelect
-    ;
+   : querySpecification                                                 # simpleSelect
+   | queryExpression                                                    # parenthesisSelect
+   | querySpecification unionStatement+ orderByClause? limitClause?     # unionSelect
+   | querySpecification minusStatement+ orderByClause? limitClause?     # minusSelect
+   ;
 
 deleteStatement
-    : singleDeleteStatement
-    ;
-
-//    Detailed DML Statements
+   : singleDeleteStatement
+   ;
 
+// Detailed DML Statements
 singleDeleteStatement
-    : DELETE FROM tableName
-      (WHERE expression)?
-      orderByClause? (LIMIT decimalLiteral)?
-    ;
+   : DELETE FROM tableName (WHERE expression)? orderByClause? (LIMIT decimalLiteral)?
+   ;
 
 orderByClause
-    : ORDER BY orderByExpression (',' orderByExpression)*
-    ;
+   : ORDER BY orderByExpression (',' orderByExpression)*
+   ;
 
 orderByExpression
-    : expression order=(ASC | DESC)?
-    ;
+   : expression order = (ASC | DESC)?
+   ;
 
 tableSources
-    : tableSource (',' tableSource)*
-    ;
+   : tableSource (',' tableSource)*
+   ;
 
 tableSource
-    : tableSourceItem joinPart*                                     #tableSourceBase
-    | '(' tableSourceItem joinPart* ')'                             #tableSourceNested
-    ;
+   : tableSourceItem joinPart*          # tableSourceBase
+   | '(' tableSourceItem joinPart* ')'  # tableSourceNested
+   ;
 
 tableSourceItem
-    : tableName (AS? alias=uid)?                                    #atomTableItem
-    | (
-      selectStatement
-      | '(' parenthesisSubquery=selectStatement ')'
-      )
-      AS? alias=uid                                                 #subqueryTableItem
-    | '(' tableSources ')'                                          #tableSourcesItem
-    ;
+   : tableName (AS? alias = uid)?                                                       # atomTableItem
+   | (selectStatement | '(' parenthesisSubquery = selectStatement ')') AS? alias = uid  # subqueryTableItem
+   | '(' tableSources ')'                                                               # tableSourcesItem
+   ;
 
 joinPart
-    : (INNER | CROSS)? JOIN tableSourceItem
-      (
-        ON expression
-        | USING '(' uidList ')'
-      )?                                                            #innerJoin
-    | (LEFT | RIGHT) OUTER? JOIN tableSourceItem
-        (
-          ON expression
-          | USING '(' uidList ')'
-        )?                                                          #outerJoin
-    | NATURAL ((LEFT | RIGHT) OUTER?)? JOIN tableSourceItem         #naturalJoin
-    ;
-
-//    Select Statement's Details
+   : (INNER | CROSS)? JOIN tableSourceItem (ON expression | USING '(' uidList ')')?         # innerJoin
+   | (LEFT | RIGHT) OUTER? JOIN tableSourceItem (ON expression | USING '(' uidList ')')?    # outerJoin
+   | NATURAL ((LEFT | RIGHT) OUTER?)? JOIN tableSourceItem                                  # naturalJoin
+   ;
 
+// Select Statement's Details
 queryExpression
-    : '(' querySpecification ')'
-    | '(' queryExpression ')'
-    ;
+   : '(' querySpecification ')'
+   | '(' queryExpression ')'
+   ;
 
 querySpecification
-    : SELECT selectSpec* selectElements
-      fromClause orderByClause? limitClause?
-    ;
+   : SELECT selectSpec* selectElements fromClause orderByClause? limitClause?
+   ;
 
 unionStatement
-    : UNION unionType=(ALL | DISTINCT)?
-      (querySpecification | queryExpression)
-    ;
+   : UNION unionType = (ALL | DISTINCT)? (querySpecification | queryExpression)
+   ;
 
 minusStatement
-    : EXCEPT (querySpecification | queryExpression)
-    ;
+   : EXCEPT (querySpecification | queryExpression)
+   ;
 
 selectSpec
-    : (ALL | DISTINCT)
-    ;
+   : (ALL | DISTINCT)
+   ;
 
 selectElements
-    : (star='*' | selectElement ) (',' selectElement)*
-    ;
+   : (star = '*' | selectElement) (',' selectElement)*
+   ;
 
 selectElement
-    : fullId '.' '*'                                                #selectStarElement
-    | fullColumnName (AS? uid)?                                     #selectColumnElement
-    | functionCall (AS? uid)?                                       #selectFunctionElement
-    | expression (AS? uid)?                                         #selectExpressionElement
-    | NESTED '(' fullId DOT STAR ')'                                #selectNestedStarElement
-    ;
+   : fullId '.' '*'                 # selectStarElement
+   | fullColumnName (AS? uid)?      # selectColumnElement
+   | functionCall (AS? uid)?        # selectFunctionElement
+   | expression (AS? uid)?          # selectExpressionElement
+   | NESTED '(' fullId DOT STAR ')' # selectNestedStarElement
+   ;
 
 fromClause
-    : FROM tableSources
-      (WHERE whereExpr=expression)?
-      (
-        GROUP BY
-        groupByItem (',' groupByItem)*
-      )?
-      (HAVING havingExpr=expression)?
-    ;
+   : FROM tableSources (WHERE whereExpr = expression)? (GROUP BY groupByItem (',' groupByItem)*)? (HAVING havingExpr = expression)?
+   ;
 
 groupByItem
-    : expression order=(ASC | DESC)?
-    ;
+   : expression order = (ASC | DESC)?
+   ;
 
 limitClause
-    : LIMIT
-    (
-      (offset=limitClauseAtom ',')? limit=limitClauseAtom
-      | limit=limitClauseAtom OFFSET offset=limitClauseAtom
-    )
-    ;
+   : LIMIT ((offset = limitClauseAtom ',')? limit = limitClauseAtom | limit = limitClauseAtom OFFSET offset = limitClauseAtom)
+   ;
 
 limitClauseAtom
-	: decimalLiteral
-	;
-
-
-//    SHOW/DESCIRBE statements
+   : decimalLiteral
+   ;
 
+// SHOW/DESCIRBE statements
 administrationStatement
-    : showStatement
-    ;
+   : showStatement
+   ;
 
 showStatement
-    : SHOW showSchemaEntity
-        (schemaFormat=(FROM | IN) uid)? showFilter?
-    ;
+   : SHOW showSchemaEntity (schemaFormat = (FROM | IN) uid)? showFilter?
+   ;
 
 utilityStatement
-    : simpleDescribeStatement
-    ;
+   : simpleDescribeStatement
+   ;
 
 simpleDescribeStatement
-    : command=DESCRIBE tableName
-      (column=uid | pattern=STRING_LITERAL)?
-    ;
+   : command = DESCRIBE tableName (column = uid | pattern = STRING_LITERAL)?
+   ;
 
 showFilter
-    : LIKE STRING_LITERAL
-    | WHERE expression
-    ;
+   : LIKE STRING_LITERAL
+   | WHERE expression
+   ;
 
 showSchemaEntity
-    : FULL? TABLES
-    ;
-
+   : FULL? TABLES
+   ;
 
 // Common Clauses
 
-//    DB Objects
-
+// DB Objects
 fullId
-    : uid (DOT_ID | '.' uid)?
-    ;
+   : uid (DOT_ID | '.' uid)?
+   ;
 
 tableName
-    : fullId                                #simpleTableName
-    | uid STAR                              #tableNamePattern
-    | uid DIVIDE uid                        #tableAndTypeName
-    ;
+   : fullId         # simpleTableName
+   | uid STAR       # tableNamePattern
+   | uid DIVIDE uid # tableAndTypeName
+   ;
 
 fullColumnName
-    : uid dottedId*
-    ;
+   : uid dottedId*
+   ;
 
 uid
-    : simpleId
-    | REVERSE_QUOTE_ID
-    ;
+   : simpleId
+   | REVERSE_QUOTE_ID
+   ;
 
 simpleId
-    : ID
-    | DOT_ID  // note: the current scope by adding DOT_ID to simpleId is large, move DOT_ID upwards tablename if needed
-    | DOUBLE_QUOTE_ID
-    | BACKTICK_QUOTE_ID
-    | keywordsCanBeId
-    | functionNameBase
-    ;
+   : ID
+   | DOT_ID // note: the current scope by adding DOT_ID to simpleId is large, move DOT_ID upwards tablename if needed
+   | DOUBLE_QUOTE_ID
+   | BACKTICK_QUOTE_ID
+   | keywordsCanBeId
+   | functionNameBase
+   ;
 
 dottedId
-    : DOT_ID
-    | '.' uid
-    ;
-
-//    Literals
+   : DOT_ID
+   | '.' uid
+   ;
 
+// Literals
 decimalLiteral
-    : DECIMAL_LITERAL | ZERO_DECIMAL | ONE_DECIMAL | TWO_DECIMAL
-    ;
+   : DECIMAL_LITERAL
+   | ZERO_DECIMAL
+   | ONE_DECIMAL
+   | TWO_DECIMAL
+   ;
 
 stringLiteral
-    : (
-        STRING_LITERAL
-        | START_NATIONAL_STRING_LITERAL
-      ) STRING_LITERAL+
-    | (
-        STRING_LITERAL
-        | START_NATIONAL_STRING_LITERAL
-      )
-    ;
+   : (STRING_LITERAL | START_NATIONAL_STRING_LITERAL) STRING_LITERAL+
+   | (STRING_LITERAL | START_NATIONAL_STRING_LITERAL)
+   ;
 
 booleanLiteral
-    : TRUE | FALSE;
+   : TRUE
+   | FALSE
+   ;
 
 nullNotnull
-    : NOT? (NULL_LITERAL | NULL_SPEC_LITERAL)
-    ;
+   : NOT? (NULL_LITERAL | NULL_SPEC_LITERAL)
+   ;
 
 constant
-    : stringLiteral | decimalLiteral
-    | '-' decimalLiteral
-    | booleanLiteral
-    | REAL_LITERAL | BIT_STRING
-    | NOT? nullLiteral=(NULL_LITERAL | NULL_SPEC_LITERAL)
-    | LEFT_BRACE dateType=(D | T | TS | DATE | TIME | TIMESTAMP) stringLiteral RIGHT_BRACE
-    ;
-
-
-//    Common Lists
-
+   : stringLiteral
+   | decimalLiteral
+   | '-' decimalLiteral
+   | booleanLiteral
+   | REAL_LITERAL
+   | BIT_STRING
+   | NOT? nullLiteral = (NULL_LITERAL | NULL_SPEC_LITERAL)
+   | LEFT_BRACE dateType = (D | T | TS | DATE | TIME | TIMESTAMP) stringLiteral RIGHT_BRACE
+   ;
+
+// Common Lists
 uidList
-    : uid (',' uid)*
-    ;
+   : uid (',' uid)*
+   ;
 
 expressions
-    : expression (',' expression)*
-    ;
+   : expression (',' expression)*
+   ;
 
 aggregateFunction
-    : functionAsAggregatorFunction                                  #functionAsAggregatorFunctionCall
-    | aggregateWindowedFunction                                     #aggregateWindowedFunctionCall
-    ;
+   : functionAsAggregatorFunction   # functionAsAggregatorFunctionCall
+   | aggregateWindowedFunction      # aggregateWindowedFunctionCall
+   ;
 
 scalarFunction
-    : scalarFunctionName '(' nestedFunctionArgs+ ')'                #nestedFunctionCall
-    | scalarFunctionName '(' functionArgs? ')'                      #scalarFunctionCall
-    ;
+   : scalarFunctionName '(' nestedFunctionArgs+ ')' # nestedFunctionCall
+   | scalarFunctionName '(' functionArgs? ')'       # scalarFunctionCall
+   ;
 
 functionCall
-    : aggregateFunction                                             #aggregateFunctionCall
-    | scalarFunctionName '(' aggregateWindowedFunction ')'          #aggregationAsArgFunctionCall
-    | scalarFunction                                                #scalarFunctionsCall
-    | specificFunction                                              #specificFunctionCall
-    | fullId '(' functionArgs? ')'                                  #udfFunctionCall
-    ;
+   : aggregateFunction                                      # aggregateFunctionCall
+   | scalarFunctionName '(' aggregateWindowedFunction ')'   # aggregationAsArgFunctionCall
+   | scalarFunction                                         # scalarFunctionsCall
+   | specificFunction                                       # specificFunctionCall
+   | fullId '(' functionArgs? ')'                           # udfFunctionCall
+   ;
 
 specificFunction
-    : CAST '(' expression AS convertedDataType ')'                  #dataTypeFunctionCall
-    | CASE expression caseFuncAlternative+
-      (ELSE elseArg=functionArg)? END                               #caseFunctionCall
-    | CASE caseFuncAlternative+
-      (ELSE elseArg=functionArg)? END                               #caseFunctionCall
-    ;
+   : CAST '(' expression AS convertedDataType ')'                               # dataTypeFunctionCall
+   | CASE expression caseFuncAlternative+ (ELSE elseArg = functionArg)? END     # caseFunctionCall
+   | CASE caseFuncAlternative+ (ELSE elseArg = functionArg)? END                # caseFunctionCall
+   ;
 
 caseFuncAlternative
-    : WHEN condition=functionArg
-      THEN consequent=functionArg
-    ;
+   : WHEN condition = functionArg THEN consequent = functionArg
+   ;
 
 convertedDataType
-    : typeName=DATETIME
-    | typeName=INT
-    | typeName=DOUBLE
-    | typeName=LONG
-    | typeName=FLOAT
-    | typeName=STRING
-    ;
+   : typeName = DATETIME
+   | typeName = INT
+   | typeName = DOUBLE
+   | typeName = LONG
+   | typeName = FLOAT
+   | typeName = STRING
+   ;
 
 aggregateWindowedFunction
-    : (AVG | MAX | MIN | SUM)
-      '(' aggregator=(ALL | DISTINCT)? functionArg ')'
-    | COUNT '(' (starArg='*' | aggregator=ALL? functionArg) ')'
-    | COUNT '(' aggregator=DISTINCT functionArgs ')'
-    ;
+   : (AVG | MAX | MIN | SUM) '(' aggregator = (ALL | DISTINCT)? functionArg ')'
+   | COUNT '(' (starArg = '*' | aggregator = ALL? functionArg) ')'
+   | COUNT '(' aggregator = DISTINCT functionArgs ')'
+   ;
 
 functionAsAggregatorFunction
-    : (AVG | MAX | MIN | SUM)
-      '(' aggregator=(ALL | DISTINCT)? functionCall ')'
-    | COUNT '(' aggregator=(ALL | DISTINCT)? functionCall ')'
-    ;
+   : (AVG | MAX | MIN | SUM) '(' aggregator = (ALL | DISTINCT)? functionCall ')'
+   | COUNT '(' aggregator = (ALL | DISTINCT)? functionCall ')'
+   ;
 
 scalarFunctionName
-    : functionNameBase
-    ;
-
+   : functionNameBase
+   ;
 /*
 Separated aggregate to function-aggregator and nonfunction-aggregator aggregations.
 
@@ -387,107 +343,226 @@ functionCall
     | fullId '(' functionArgs? ')'                                  #udfFunctionCall
     ;
 */
-
+   
+   
 functionArgs
-    : (constant | fullColumnName | expression)
-    (
-      ','
-      (constant | fullColumnName | expression)
-    )*
-    ;
+   : (constant | fullColumnName | expression) (',' (constant | fullColumnName | expression))*
+   ;
 
 functionArg
-    : constant | fullColumnName |  expression
-    ;
+   : constant
+   | fullColumnName
+   | expression
+   ;
 
 nestedFunctionArgs
-    : functionCall (',' functionArgs)?
-    ;
+   : functionCall (',' functionArgs)?
+   ;
 
-
-//    Expressions, predicates
+// Expressions, predicates
 
 // Simplified approach for expression
 expression
-    : notOperator=(NOT | '!') expression                            #notExpression
-    | expression logicalOperator expression                         #logicalExpression
-    | predicate IS NOT? testValue=(TRUE | FALSE | MISSING)          #isExpression
-    | predicate                                                     #predicateExpression
-    ;
+   : notOperator = (NOT | '!') expression                       # notExpression
+   | expression logicalOperator expression                      # logicalExpression
+   | predicate IS NOT? testValue = (TRUE | FALSE | MISSING)     # isExpression
+   | predicate                                                  # predicateExpression
+   ;
 
 predicate
-    : predicate NOT? IN '(' (selectStatement | expressions) ')'     #inPredicate
-    | predicate IS nullNotnull                                      #isNullPredicate
-    | left=predicate comparisonOperator right=predicate             #binaryComparisonPredicate
-    | predicate NOT? BETWEEN predicate AND predicate                #betweenPredicate
-    | predicate NOT? LIKE predicate                                 #likePredicate
-    | predicate NOT? regex=REGEXP predicate                         #regexpPredicate
-    | expressionAtom                                                #expressionAtomPredicate
-    ;
-
+   : predicate NOT? IN '(' (selectStatement | expressions) ')'  # inPredicate
+   | predicate IS nullNotnull                                   # isNullPredicate
+   | left = predicate comparisonOperator right = predicate      # binaryComparisonPredicate
+   | predicate NOT? BETWEEN predicate AND predicate             # betweenPredicate
+   | predicate NOT? LIKE predicate                              # likePredicate
+   | predicate NOT? regex = REGEXP predicate                    # regexpPredicate
+   | expressionAtom                                             # expressionAtomPredicate
+   ;
 
 // Add in ASTVisitor nullNotnull in constant
 expressionAtom
-    : constant                                                      #constantExpressionAtom
-    | fullColumnName                                                #fullColumnNameExpressionAtom
-    | functionCall                                                  #functionCallExpressionAtom
-    | unaryOperator expressionAtom                                  #unaryExpressionAtom
-    | '(' expression (',' expression)* ')'                          #nestedExpressionAtom
-    | EXISTS '(' selectStatement ')'                                #existsExpessionAtom
-    | '(' selectStatement ')'                                       #subqueryExpessionAtom
-    | left=expressionAtom bitOperator right=expressionAtom          #bitExpressionAtom
-    | left=expressionAtom mathOperator right=expressionAtom         #mathExpressionAtom
-    ;
+   : constant                                                   # constantExpressionAtom
+   | fullColumnName                                             # fullColumnNameExpressionAtom
+   | functionCall                                               # functionCallExpressionAtom
+   | unaryOperator expressionAtom                               # unaryExpressionAtom
+   | '(' expression (',' expression)* ')'                       # nestedExpressionAtom
+   | EXISTS '(' selectStatement ')'                             # existsExpessionAtom
+   | '(' selectStatement ')'                                    # subqueryExpessionAtom
+   | left = expressionAtom bitOperator right = expressionAtom   # bitExpressionAtom
+   | left = expressionAtom mathOperator right = expressionAtom  # mathExpressionAtom
+   ;
 
 unaryOperator
-    : '!' | '~' | '+' | '-' | NOT
-    ;
+   : '!'
+   | '~'
+   | '+'
+   | '-'
+   | NOT
+   ;
 
 comparisonOperator
-    : '=' | '>' | '<' | '<' '=' | '>' '='
-    | '<' '>' | '!' '='
-    ;
+   : '='
+   | '>'
+   | '<'
+   | '<' '='
+   | '>' '='
+   | '<' '>'
+   | '!' '='
+   ;
 
 logicalOperator
-    : AND | '&' '&' | OR | '|' '|'
-    ;
+   : AND
+   | '&' '&'
+   | OR
+   | '|' '|'
+   ;
 
 bitOperator
-    : '<' '<' | '>' '>' | '&' | '^' | '|'
-    ;
+   : '<' '<'
+   | '>' '>'
+   | '&'
+   | '^'
+   | '|'
+   ;
 
 mathOperator
-    : '*' | '/' | '%' | DIV | MOD | '+' | '-'
-    ;
-
-
-//    Simple id sets
-//     (that keyword, which can be id)
-
+   : '*'
+   | '/'
+   | '%'
+   | DIV
+   | MOD
+   | '+'
+   | '-'
+   ;
+
+// Simple id sets
+// (that keyword, which can be id)
 keywordsCanBeId
-    : FULL
-    | FIELD | D | T | TS // OD SQL and ODBC special
-    | COUNT | MIN | MAX | AVG | SUM
-    ;
+   : FULL
+   | FIELD
+   | D
+   | T
+   | TS // OD SQL and ODBC special
+   | COUNT
+   | MIN
+   | MAX
+   | AVG
+   | SUM
+   ;
 
 functionNameBase
-    : openSearchFunctionNameBase
-    | ABS | ACOS | ADD | ASCII | ASIN | ATAN | ATAN2 | CBRT | CEIL | CONCAT | CONCAT_WS
-    | COS | COSH | COT | CURDATE | DATE | DATE_FORMAT | DAYOFMONTH | DEGREES
-    | E | EXP | EXPM1 | FLOOR | IF | IFNULL | ISNULL | LEFT | LENGTH | LN | LOCATE | LOG
-    | LOG10 | LOG2 | LOWER | LTRIM | MAKETIME | MODULUS | MONTH | MONTHNAME | MULTIPLY
-    | NOW | PI | POW | POWER | RADIANS | RAND | REPLACE | RIGHT | RINT | ROUND | RTRIM
-    | SIGN | SIGNUM | SIN | SINH | SQRT | SUBSTRING | SUBTRACT | TAN | TIMESTAMP | TRIM
-    | UPPER | YEAR | ADDDATE | ADDTIME | GREATEST | LEAST | STRCMP
-    ;
+   : openSearchFunctionNameBase
+   | ABS
+   | ACOS
+   | ADD
+   | ASCII
+   | ASIN
+   | ATAN
+   | ATAN2
+   | CBRT
+   | CEIL
+   | CONCAT
+   | CONCAT_WS
+   | COS
+   | COSH
+   | COT
+   | CURDATE
+   | DATE
+   | DATE_FORMAT
+   | DAYOFMONTH
+   | DEGREES
+   | E
+   | EXP
+   | EXPM1
+   | FLOOR
+   | IF
+   | IFNULL
+   | ISNULL
+   | LEFT
+   | LENGTH
+   | LN
+   | LOCATE
+   | LOG
+   | LOG10
+   | LOG2
+   | LOWER
+   | LTRIM
+   | MAKETIME
+   | MODULUS
+   | MONTH
+   | MONTHNAME
+   | MULTIPLY
+   | NOW
+   | PI
+   | POW
+   | POWER
+   | RADIANS
+   | RAND
+   | REPLACE
+   | RIGHT
+   | RINT
+   | ROUND
+   | RTRIM
+   | SIGN
+   | SIGNUM
+   | SIN
+   | SINH
+   | SQRT
+   | SUBSTRING
+   | SUBTRACT
+   | TAN
+   | TIMESTAMP
+   | TRIM
+   | UPPER
+   | YEAR
+   | ADDDATE
+   | ADDTIME
+   | GREATEST
+   | LEAST
+   | STRCMP
+   ;
 
 openSearchFunctionNameBase
-    : DATE_HISTOGRAM | DAY_OF_MONTH | DAY_OF_YEAR | DAY_OF_WEEK | EXCLUDE
-    | EXTENDED_STATS | FILTER | GEO_BOUNDING_BOX | GEO_CELL | GEO_DISTANCE | GEO_DISTANCE_RANGE | GEO_INTERSECTS
-    | GEO_POLYGON | INCLUDE | IN_TERMS | HISTOGRAM | HOUR_OF_DAY
-    | MATCHPHRASE | MATCH_PHRASE | MATCHQUERY | MATCH_QUERY | MINUTE_OF_DAY
-    | MINUTE_OF_HOUR | MISSING | MONTH_OF_YEAR | MULTIMATCH | MULTI_MATCH | NESTED
-    | PERCENTILES | QUERY | RANGE | REGEXP_QUERY | REVERSE_NESTED | SCORE
-    | SECOND_OF_MINUTE | STATS | TERM | TERMS | TOPHITS
-    | WEEK_OF_YEAR | WILDCARDQUERY | WILDCARD_QUERY
-    ;
+   : DATE_HISTOGRAM
+   | DAY_OF_MONTH
+   | DAY_OF_YEAR
+   | DAY_OF_WEEK
+   | EXCLUDE
+   | EXTENDED_STATS
+   | FILTER
+   | GEO_BOUNDING_BOX
+   | GEO_CELL
+   | GEO_DISTANCE
+   | GEO_DISTANCE_RANGE
+   | GEO_INTERSECTS
+   | GEO_POLYGON
+   | INCLUDE
+   | IN_TERMS
+   | HISTOGRAM
+   | HOUR_OF_DAY
+   | MATCHPHRASE
+   | MATCH_PHRASE
+   | MATCHQUERY
+   | MATCH_QUERY
+   | MINUTE_OF_DAY
+   | MINUTE_OF_HOUR
+   | MISSING
+   | MONTH_OF_YEAR
+   | MULTIMATCH
+   | MULTI_MATCH
+   | NESTED
+   | PERCENTILES
+   | QUERY
+   | RANGE
+   | REGEXP_QUERY
+   | REVERSE_NESTED
+   | SCORE
+   | SECOND_OF_MINUTE
+   | STATS
+   | TERM
+   | TERMS
+   | TOPHITS
+   | WEEK_OF_YEAR
+   | WILDCARDQUERY
+   | WILDCARD_QUERY
+   ;
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/OpenSearchLegacySqlAnalyzer.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/OpenSearchLegacySqlAnalyzer.java
index b44e2bbb41..bb063f4df4 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/OpenSearchLegacySqlAnalyzer.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/OpenSearchLegacySqlAnalyzer.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr;
 
 import java.util.Optional;
@@ -25,84 +24,77 @@
 import org.opensearch.sql.legacy.antlr.visitor.EarlyExitAnalysisException;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
 
-/**
- * Entry point for ANTLR generated parser to perform strict syntax and semantic analysis.
- */
+/** Entry point for ANTLR generated parser to perform strict syntax and semantic analysis. */
 public class OpenSearchLegacySqlAnalyzer {
 
-    private static final Logger LOG = LogManager.getLogger();
-
-    /** Original sql query */
-    private final SqlAnalysisConfig config;
-
-    public OpenSearchLegacySqlAnalyzer(SqlAnalysisConfig config) {
-        this.config = config;
-    }
-
-    public Optional<Type> analyze(String sql, LocalClusterState clusterState) {
-        // Perform analysis for SELECT only for now because of extra code changes required for SHOW/DESCRIBE.
-        if (!isSelectStatement(sql) || !config.isAnalyzerEnabled()) {
-            return Optional.empty();
-        }
+  private static final Logger LOG = LogManager.getLogger();
 
-        try {
-            return Optional.of(analyzeSemantic(
-                    analyzeSyntax(sql),
-                    clusterState
-            ));
-        } catch (EarlyExitAnalysisException e) {
-            // Expected if configured so log on debug level to avoid always logging stack trace
-            LOG.debug("Analysis exits early and will skip remaining process", e);
-            return Optional.empty();
-        }
-    }
+  /** Original sql query */
+  private final SqlAnalysisConfig config;
 
-    /**
-     * Build lexer and parser to perform syntax analysis only.
-     * Runtime exception with clear message is thrown for any verification error.
-     *
-     * @return      parse tree
-     */
-    public ParseTree analyzeSyntax(String sql) {
-        OpenSearchLegacySqlParser parser = createParser(createLexer(sql));
-        parser.addErrorListener(new SyntaxAnalysisErrorListener());
-        return parser.root();
-    }
+  public OpenSearchLegacySqlAnalyzer(SqlAnalysisConfig config) {
+    this.config = config;
+  }
 
-    /**
-     * Perform semantic analysis based on syntax analysis output - parse tree.
-     *
-     * @param tree          parse tree
-     * @param clusterState  cluster state required for index mapping query
-     */
-    public Type analyzeSemantic(ParseTree tree, LocalClusterState clusterState) {
-        return tree.accept(new AntlrSqlParseTreeVisitor<>(createAnalyzer(clusterState)));
+  public Optional<Type> analyze(String sql, LocalClusterState clusterState) {
+    // Perform analysis for SELECT only for now because of extra code changes required for
+    // SHOW/DESCRIBE.
+    if (!isSelectStatement(sql) || !config.isAnalyzerEnabled()) {
+      return Optional.empty();
     }
 
-    /** Factory method for semantic analyzer to help assemble all required components together */
-    private SemanticAnalyzer createAnalyzer(LocalClusterState clusterState) {
-        SemanticContext context = new SemanticContext();
-        OpenSearchMappingLoader
-            mappingLoader = new OpenSearchMappingLoader(context, clusterState, config.getAnalysisThreshold());
-        TypeChecker typeChecker = new TypeChecker(context, config.isFieldSuggestionEnabled());
-        return new SemanticAnalyzer(mappingLoader, typeChecker);
+    try {
+      return Optional.of(analyzeSemantic(analyzeSyntax(sql), clusterState));
+    } catch (EarlyExitAnalysisException e) {
+      // Expected if configured so log on debug level to avoid always logging stack trace
+      LOG.debug("Analysis exits early and will skip remaining process", e);
+      return Optional.empty();
     }
-
-    private OpenSearchLegacySqlParser createParser(Lexer lexer) {
-        return new OpenSearchLegacySqlParser(
-                   new CommonTokenStream(lexer));
-    }
-
-    private OpenSearchLegacySqlLexer createLexer(String sql) {
-         return new OpenSearchLegacySqlLexer(
-                    new CaseInsensitiveCharStream(sql));
-    }
-
-    private boolean isSelectStatement(String sql) {
-        sql = sql.replaceAll("\\R", " ").trim();
-        int endOfFirstWord = sql.indexOf(' ');
-        String firstWord = sql.substring(0, endOfFirstWord > 0 ? endOfFirstWord : sql.length());
-        return "SELECT".equalsIgnoreCase(firstWord);
-    }
-
+  }
+
+  /**
+   * Build lexer and parser to perform syntax analysis only. Runtime exception with clear message is
+   * thrown for any verification error.
+   *
+   * @return parse tree
+   */
+  public ParseTree analyzeSyntax(String sql) {
+    OpenSearchLegacySqlParser parser = createParser(createLexer(sql));
+    parser.addErrorListener(new SyntaxAnalysisErrorListener());
+    return parser.root();
+  }
+
+  /**
+   * Perform semantic analysis based on syntax analysis output - parse tree.
+   *
+   * @param tree parse tree
+   * @param clusterState cluster state required for index mapping query
+   */
+  public Type analyzeSemantic(ParseTree tree, LocalClusterState clusterState) {
+    return tree.accept(new AntlrSqlParseTreeVisitor<>(createAnalyzer(clusterState)));
+  }
+
+  /** Factory method for semantic analyzer to help assemble all required components together */
+  private SemanticAnalyzer createAnalyzer(LocalClusterState clusterState) {
+    SemanticContext context = new SemanticContext();
+    OpenSearchMappingLoader mappingLoader =
+        new OpenSearchMappingLoader(context, clusterState, config.getAnalysisThreshold());
+    TypeChecker typeChecker = new TypeChecker(context, config.isFieldSuggestionEnabled());
+    return new SemanticAnalyzer(mappingLoader, typeChecker);
+  }
+
+  private OpenSearchLegacySqlParser createParser(Lexer lexer) {
+    return new OpenSearchLegacySqlParser(new CommonTokenStream(lexer));
+  }
+
+  private OpenSearchLegacySqlLexer createLexer(String sql) {
+    return new OpenSearchLegacySqlLexer(new CaseInsensitiveCharStream(sql));
+  }
+
+  private boolean isSelectStatement(String sql) {
+    sql = sql.replaceAll("\\R", " ").trim();
+    int endOfFirstWord = sql.indexOf(' ');
+    String firstWord = sql.substring(0, endOfFirstWord > 0 ? endOfFirstWord : sql.length());
+    return "SELECT".equalsIgnoreCase(firstWord);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SimilarSymbols.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SimilarSymbols.java
index 0f87b9eb05..7410e56e49 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SimilarSymbols.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SimilarSymbols.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr;
 
 import java.util.Collection;
@@ -13,50 +12,51 @@
 import org.apache.lucene.search.spell.LevenshteinDistance;
 import org.apache.lucene.search.spell.StringDistance;
 
-/**
- * String similarity for finding most similar string.
- */
+/** String similarity for finding most similar string. */
 public class SimilarSymbols {
 
-    /** LevenshteinDistance instance is basically a math util which is supposed to be thread safe */
-    private static final StringDistance ALGORITHM = new LevenshteinDistance();
-
-    /** Symbol candidate list from which to pick one as most similar symbol to a target */
-    private final Collection<String> candidates;
-
-    public SimilarSymbols(Collection<String> candidates) {
-        this.candidates = Collections.unmodifiableCollection(candidates);
+  /** LevenshteinDistance instance is basically a math util which is supposed to be thread safe */
+  private static final StringDistance ALGORITHM = new LevenshteinDistance();
+
+  /** Symbol candidate list from which to pick one as most similar symbol to a target */
+  private final Collection<String> candidates;
+
+  public SimilarSymbols(Collection<String> candidates) {
+    this.candidates = Collections.unmodifiableCollection(candidates);
+  }
+
+  /**
+   * Find most similar string in candidates by calculating similarity distance among target and
+   * candidate strings.
+   *
+   * @param target string to match
+   * @return most similar string to the target
+   */
+  public String mostSimilarTo(String target) {
+    Optional<SymbolDistance> closest =
+        candidates.stream()
+            .map(candidate -> new SymbolDistance(candidate, target))
+            .max(Comparator.comparing(SymbolDistance::similarity));
+    if (closest.isPresent()) {
+      return closest.get().candidate;
     }
-
-    /**
-     * Find most similar string in candidates by calculating similarity distance
-     * among target and candidate strings.
-     *
-     * @param target    string to match
-     * @return          most similar string to the target
-     */
-    public String mostSimilarTo(String target) {
-        Optional<SymbolDistance> closest = candidates.stream().
-                                                      map(candidate -> new SymbolDistance(candidate, target)).
-                                                      max(Comparator.comparing(SymbolDistance::similarity));
-        if (closest.isPresent()) {
-            return closest.get().candidate;
-        }
-        return target;
+    return target;
+  }
+
+  /**
+   * Distance (similarity) between 2 symbols. This class is mainly for Java 8 stream comparator API
+   */
+  private static class SymbolDistance {
+    private final String candidate;
+    private final String target;
+
+    private SymbolDistance(String candidate, String target) {
+      this.candidate = candidate;
+      this.target = target;
     }
 
-    /** Distance (similarity) between 2 symbols. This class is mainly for Java 8 stream comparator API */
-    private static class SymbolDistance {
-        private final String candidate;
-        private final String target;
-
-        private SymbolDistance(String candidate, String target) {
-            this.candidate = candidate;
-            this.target = target;
-        }
-
-        public float similarity() {
-            return ALGORITHM.getDistance(candidate, target);
-        }
+    public float similarity() {
+      return ALGORITHM.getDistance(candidate, target);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SqlAnalysisConfig.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SqlAnalysisConfig.java
index 56c69755a6..703c7d6586 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SqlAnalysisConfig.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SqlAnalysisConfig.java
@@ -3,49 +3,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr;
 
-/**
- * Configuration for SQL analysis.
- */
+/** Configuration for SQL analysis. */
 public class SqlAnalysisConfig {
 
-    /** Is entire analyzer enabled to perform the analysis */
-    private final boolean isAnalyzerEnabled;
-
-    /** Is suggestion enabled for field name typo */
-    private final boolean isFieldSuggestionEnabled;
-
-    /** Skip entire analysis for index mapping larger than this threhold */
-    private final int analysisThreshold;
-
-    public SqlAnalysisConfig(boolean isAnalyzerEnabled,
-                             boolean isFieldSuggestionEnabled,
-                             int analysisThreshold) {
-        this.isAnalyzerEnabled = isAnalyzerEnabled;
-        this.isFieldSuggestionEnabled = isFieldSuggestionEnabled;
-        this.analysisThreshold = analysisThreshold;
-    }
-
-    public boolean isAnalyzerEnabled() {
-        return isAnalyzerEnabled;
-    }
-
-    public boolean isFieldSuggestionEnabled() {
-        return isFieldSuggestionEnabled;
-    }
-
-    public int getAnalysisThreshold() {
-        return analysisThreshold;
-    }
-
-    @Override
-    public String toString() {
-        return "SqlAnalysisConfig{"
-            + "isAnalyzerEnabled=" + isAnalyzerEnabled
-            + ", isFieldSuggestionEnabled=" + isFieldSuggestionEnabled
-            + ", analysisThreshold=" + analysisThreshold
-            + '}';
-    }
+  /** Is entire analyzer enabled to perform the analysis */
+  private final boolean isAnalyzerEnabled;
+
+  /** Is suggestion enabled for field name typo */
+  private final boolean isFieldSuggestionEnabled;
+
+  /** Skip entire analysis for index mapping larger than this threhold */
+  private final int analysisThreshold;
+
+  public SqlAnalysisConfig(
+      boolean isAnalyzerEnabled, boolean isFieldSuggestionEnabled, int analysisThreshold) {
+    this.isAnalyzerEnabled = isAnalyzerEnabled;
+    this.isFieldSuggestionEnabled = isFieldSuggestionEnabled;
+    this.analysisThreshold = analysisThreshold;
+  }
+
+  public boolean isAnalyzerEnabled() {
+    return isAnalyzerEnabled;
+  }
+
+  public boolean isFieldSuggestionEnabled() {
+    return isFieldSuggestionEnabled;
+  }
+
+  public int getAnalysisThreshold() {
+    return analysisThreshold;
+  }
+
+  @Override
+  public String toString() {
+    return "SqlAnalysisConfig{"
+        + "isAnalyzerEnabled="
+        + isAnalyzerEnabled
+        + ", isFieldSuggestionEnabled="
+        + isFieldSuggestionEnabled
+        + ", analysisThreshold="
+        + analysisThreshold
+        + '}';
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SqlAnalysisException.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SqlAnalysisException.java
index 1856d568a2..b1d1204f21 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SqlAnalysisException.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/SqlAnalysisException.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr;
 
-/**
- * SQL query analysis abstract exception.
- */
+/** SQL query analysis abstract exception. */
 public class SqlAnalysisException extends RuntimeException {
 
-    public SqlAnalysisException(String message) {
-        super(message);
-    }
+  public SqlAnalysisException(String message) {
+    super(message);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalysisException.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalysisException.java
index 742642fb42..45c2dbc1dc 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalysisException.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalysisException.java
@@ -3,18 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import org.opensearch.sql.legacy.antlr.SqlAnalysisException;
 
-/**
- * Exception for semantic analysis
- */
+/** Exception for semantic analysis */
 public class SemanticAnalysisException extends SqlAnalysisException {
 
-    public SemanticAnalysisException(String message) {
-        super(message);
-    }
-
+  public SemanticAnalysisException(String message) {
+    super(message);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Environment.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Environment.java
index 11d25c3ce8..4f8a62d898 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Environment.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Environment.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.scope;
 
 import java.util.HashMap;
@@ -11,84 +10,85 @@
 import java.util.Optional;
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 
-/**
- * Environment for symbol and its attribute (type) in the current scope
- */
+/** Environment for symbol and its attribute (type) in the current scope */
 public class Environment {
 
-    private final Environment parent;
-
-    private final SymbolTable symbolTable;
+  private final Environment parent;
 
-    public Environment(Environment parent) {
-        this.parent = parent;
-        this.symbolTable = new SymbolTable();
-    }
+  private final SymbolTable symbolTable;
 
-    /**
-     * Define symbol with the type
-     * @param symbol    symbol to define
-     * @param type      type
-     */
-    public void define(Symbol symbol, Type type) {
-        symbolTable.store(symbol, type);
-    }
+  public Environment(Environment parent) {
+    this.parent = parent;
+    this.symbolTable = new SymbolTable();
+  }
 
-    /**
-     * Resolve symbol in the environment
-     * @param symbol    symbol to look up
-     * @return          type if exist
-     */
-    public Optional<Type> resolve(Symbol symbol) {
-        Optional<Type> type = Optional.empty();
-        for (Environment cur = this; cur != null; cur = cur.parent) {
-            type = cur.symbolTable.lookup(symbol);
-            if (type.isPresent()) {
-                break;
-            }
-        }
-        return type;
-    }
+  /**
+   * Define symbol with the type
+   *
+   * @param symbol symbol to define
+   * @param type type
+   */
+  public void define(Symbol symbol, Type type) {
+    symbolTable.store(symbol, type);
+  }
 
-    /**
-     * Resolve symbol definitions by a prefix.
-     * @param prefix    a prefix of symbol
-     * @return          all symbols with types that starts with the prefix
-     */
-    public Map<String, Type> resolveByPrefix(Symbol prefix) {
-        Map<String, Type> typeByName = new HashMap<>();
-        for (Environment cur = this; cur != null; cur = cur.parent) {
-            typeByName.putAll(cur.symbolTable.lookupByPrefix(prefix));
-        }
-        return typeByName;
+  /**
+   * Resolve symbol in the environment
+   *
+   * @param symbol symbol to look up
+   * @return type if exist
+   */
+  public Optional<Type> resolve(Symbol symbol) {
+    Optional<Type> type = Optional.empty();
+    for (Environment cur = this; cur != null; cur = cur.parent) {
+      type = cur.symbolTable.lookup(symbol);
+      if (type.isPresent()) {
+        break;
+      }
     }
+    return type;
+  }
 
-    /**
-     * Resolve all symbols in the namespace.
-     * @param namespace     a namespace
-     * @return              all symbols in the namespace
-     */
-    public Map<String, Type> resolveAll(Namespace namespace) {
-        Map<String, Type> result = new HashMap<>();
-        for (Environment cur = this; cur != null; cur = cur.parent) {
-            // putIfAbsent ensures inner most definition will be used (shadow outers)
-            cur.symbolTable.lookupAll(namespace).forEach(result::putIfAbsent);
-        }
-        return result;
+  /**
+   * Resolve symbol definitions by a prefix.
+   *
+   * @param prefix a prefix of symbol
+   * @return all symbols with types that starts with the prefix
+   */
+  public Map<String, Type> resolveByPrefix(Symbol prefix) {
+    Map<String, Type> typeByName = new HashMap<>();
+    for (Environment cur = this; cur != null; cur = cur.parent) {
+      typeByName.putAll(cur.symbolTable.lookupByPrefix(prefix));
     }
+    return typeByName;
+  }
 
-    /** Current environment is root and no any symbol defined */
-    public boolean isEmpty(Namespace namespace) {
-        for (Environment cur = this; cur != null; cur = cur.parent) {
-            if (!cur.symbolTable.isEmpty(namespace)) {
-                return false;
-            }
-        }
-        return true;
+  /**
+   * Resolve all symbols in the namespace.
+   *
+   * @param namespace a namespace
+   * @return all symbols in the namespace
+   */
+  public Map<String, Type> resolveAll(Namespace namespace) {
+    Map<String, Type> result = new HashMap<>();
+    for (Environment cur = this; cur != null; cur = cur.parent) {
+      // putIfAbsent ensures inner most definition will be used (shadow outers)
+      cur.symbolTable.lookupAll(namespace).forEach(result::putIfAbsent);
     }
+    return result;
+  }
 
-    public Environment getParent() {
-        return parent;
+  /** Current environment is root and no any symbol defined */
+  public boolean isEmpty(Namespace namespace) {
+    for (Environment cur = this; cur != null; cur = cur.parent) {
+      if (!cur.symbolTable.isEmpty(namespace)) {
+        return false;
+      }
     }
+    return true;
+  }
 
+  public Environment getParent() {
+    return parent;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Namespace.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Namespace.java
index b591de5783..c500809a70 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Namespace.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Namespace.java
@@ -3,27 +3,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.scope;
 
-/**
- * Namespace of symbol to avoid naming conflict
- */
+/** Namespace of symbol to avoid naming conflict */
 public enum Namespace {
+  FIELD_NAME("Field"),
+  FUNCTION_NAME("Function"),
+  OPERATOR_NAME("Operator");
 
-    FIELD_NAME("Field"),
-    FUNCTION_NAME("Function"),
-    OPERATOR_NAME("Operator");
-
-    private final String name;
-
-    Namespace(String name) {
-        this.name = name;
-    }
+  private final String name;
 
-    @Override
-    public String toString() {
-        return name;
-    }
+  Namespace(String name) {
+    this.name = name;
+  }
 
+  @Override
+  public String toString() {
+    return name;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/SemanticContext.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/SemanticContext.java
index 968aff0df2..73fa5d1655 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/SemanticContext.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/SemanticContext.java
@@ -3,46 +3,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.scope;
 
 import java.util.Objects;
 
 /**
- * Semantic context responsible for environment chain (stack) management and everything required for analysis.
- * This context should be shared by different stages in future, particularly
- * from semantic analysis to logical planning to physical planning.
+ * Semantic context responsible for environment chain (stack) management and everything required for
+ * analysis. This context should be shared by different stages in future, particularly from semantic
+ * analysis to logical planning to physical planning.
  */
 public class SemanticContext {
 
-    /** Environment stack for symbol scope management */
-    private Environment environment = new Environment(null);
-
-    /**
-     * Push a new environment
-     */
-    public void push() {
-        environment = new Environment(environment);
-    }
-
-    /**
-     * Return current environment
-     * @return  current environment
-     */
-    public Environment peek() {
-        return environment;
-    }
-
-    /**
-     * Pop up current environment from environment chain
-     * @return  current environment (before pop)
-     */
-    public Environment pop() {
-        Objects.requireNonNull(environment, "Fail to pop context due to no environment present");
-
-        Environment curEnv = environment;
-        environment = curEnv.getParent();
-        return curEnv;
-    }
-
+  /** Environment stack for symbol scope management */
+  private Environment environment = new Environment(null);
+
+  /** Push a new environment */
+  public void push() {
+    environment = new Environment(environment);
+  }
+
+  /**
+   * Return current environment
+   *
+   * @return current environment
+   */
+  public Environment peek() {
+    return environment;
+  }
+
+  /**
+   * Pop up current environment from environment chain
+   *
+   * @return current environment (before pop)
+   */
+  public Environment pop() {
+    Objects.requireNonNull(environment, "Fail to pop context due to no environment present");
+
+    Environment curEnv = environment;
+    environment = curEnv.getParent();
+    return curEnv;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Symbol.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Symbol.java
index e9b6892e68..837baf1c00 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Symbol.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/Symbol.java
@@ -3,34 +3,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.scope;
 
-/**
- * Symbol in the scope
- */
+/** Symbol in the scope */
 public class Symbol {
 
-    private final Namespace namespace;
-
-    private final String name;
+  private final Namespace namespace;
 
-    public Symbol(Namespace namespace, String name) {
-        this.namespace = namespace;
-        this.name = name;
-    }
+  private final String name;
 
-    public Namespace getNamespace() {
-        return namespace;
-    }
+  public Symbol(Namespace namespace, String name) {
+    this.namespace = namespace;
+    this.name = name;
+  }
 
-    public String getName() {
-        return name;
-    }
+  public Namespace getNamespace() {
+    return namespace;
+  }
 
-    @Override
-    public String toString() {
-        return namespace + " [" + name + "]";
-    }
+  public String getName() {
+    return name;
+  }
 
+  @Override
+  public String toString() {
+    return namespace + " [" + name + "]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/SymbolTable.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/SymbolTable.java
index a8f0174c25..ee9f4545a6 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/SymbolTable.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/SymbolTable.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.scope;
 
 import static java.util.Collections.emptyMap;
@@ -17,79 +16,79 @@
 import java.util.stream.Collectors;
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 
-/**
- * Symbol table for symbol definition and resolution.
- */
+/** Symbol table for symbol definition and resolution. */
 public class SymbolTable {
 
-    /**
-     * Two-dimension hash table to manage symbols with type in different namespace
-     */
-    private Map<Namespace, NavigableMap<String, TypeSupplier>> tableByNamespace = new EnumMap<>(Namespace.class);
+  /** Two-dimension hash table to manage symbols with type in different namespace */
+  private Map<Namespace, NavigableMap<String, TypeSupplier>> tableByNamespace =
+      new EnumMap<>(Namespace.class);
 
-    /**
-     * Store symbol with the type. Create new map for namespace for the first time.
-     * @param symbol    symbol to define
-     * @param type      symbol type
-     */
-    public void store(Symbol symbol, Type type) {
-        tableByNamespace.computeIfAbsent(
-                symbol.getNamespace(),
-                ns -> new TreeMap<>()
-        ).computeIfAbsent(
-                symbol.getName(),
-                symbolName -> new TypeSupplier(symbolName, type)
-        ).add(type);
-    }
+  /**
+   * Store symbol with the type. Create new map for namespace for the first time.
+   *
+   * @param symbol symbol to define
+   * @param type symbol type
+   */
+  public void store(Symbol symbol, Type type) {
+    tableByNamespace
+        .computeIfAbsent(symbol.getNamespace(), ns -> new TreeMap<>())
+        .computeIfAbsent(symbol.getName(), symbolName -> new TypeSupplier(symbolName, type))
+        .add(type);
+  }
 
-    /**
-     * Look up symbol in the namespace map.
-     * @param symbol    symbol to look up
-     * @return          symbol type which is optional
-     */
-    public Optional<Type> lookup(Symbol symbol) {
-        Map<String, TypeSupplier> table = tableByNamespace.get(symbol.getNamespace());
-        TypeSupplier typeSupplier = null;
-        if (table != null) {
-            typeSupplier = table.get(symbol.getName());
-        }
-        return Optional.ofNullable(typeSupplier).map(TypeSupplier::get);
+  /**
+   * Look up symbol in the namespace map.
+   *
+   * @param symbol symbol to look up
+   * @return symbol type which is optional
+   */
+  public Optional<Type> lookup(Symbol symbol) {
+    Map<String, TypeSupplier> table = tableByNamespace.get(symbol.getNamespace());
+    TypeSupplier typeSupplier = null;
+    if (table != null) {
+      typeSupplier = table.get(symbol.getName());
     }
+    return Optional.ofNullable(typeSupplier).map(TypeSupplier::get);
+  }
 
-    /**
-     * Look up symbols by a prefix.
-     * @param prefix    a symbol prefix
-     * @return          symbols starting with the prefix
-     */
-    public Map<String, Type> lookupByPrefix(Symbol prefix) {
-        NavigableMap<String, TypeSupplier> table = tableByNamespace.get(prefix.getNamespace());
-        if (table != null) {
-            return table.subMap(prefix.getName(), prefix.getName() + Character.MAX_VALUE)
-                    .entrySet().stream()
-                    .filter(entry -> null != entry.getValue().get())
-                    .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().get()));
-        }
-        return emptyMap();
+  /**
+   * Look up symbols by a prefix.
+   *
+   * @param prefix a symbol prefix
+   * @return symbols starting with the prefix
+   */
+  public Map<String, Type> lookupByPrefix(Symbol prefix) {
+    NavigableMap<String, TypeSupplier> table = tableByNamespace.get(prefix.getNamespace());
+    if (table != null) {
+      return table
+          .subMap(prefix.getName(), prefix.getName() + Character.MAX_VALUE)
+          .entrySet()
+          .stream()
+          .filter(entry -> null != entry.getValue().get())
+          .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().get()));
     }
+    return emptyMap();
+  }
 
-    /**
-     * Look up all symbols in the namespace.
-     * @param namespace     a namespace
-     * @return              all symbols in the namespace map
-     */
-    public Map<String, Type> lookupAll(Namespace namespace) {
-        return tableByNamespace.getOrDefault(namespace, emptyNavigableMap())
-                .entrySet().stream()
-                .filter(entry -> null != entry.getValue().get())
-                .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().get()));
-    }
+  /**
+   * Look up all symbols in the namespace.
+   *
+   * @param namespace a namespace
+   * @return all symbols in the namespace map
+   */
+  public Map<String, Type> lookupAll(Namespace namespace) {
+    return tableByNamespace.getOrDefault(namespace, emptyNavigableMap()).entrySet().stream()
+        .filter(entry -> null != entry.getValue().get())
+        .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().get()));
+  }
 
-    /**
-     * Check if namespace map in empty (none definition)
-     * @param namespace     a namespace
-     * @return              true for empty
-     */
-    public boolean isEmpty(Namespace namespace) {
-        return tableByNamespace.getOrDefault(namespace, emptyNavigableMap()).isEmpty();
-    }
+  /**
+   * Check if namespace map in empty (none definition)
+   *
+   * @param namespace a namespace
+   * @return true for empty
+   */
+  public boolean isEmpty(Namespace namespace) {
+    return tableByNamespace.getOrDefault(namespace, emptyNavigableMap()).isEmpty();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/TypeSupplier.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/TypeSupplier.java
index 355ae70249..7c2410cf76 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/TypeSupplier.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/scope/TypeSupplier.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.scope;
 
 import java.util.HashSet;
@@ -13,39 +12,38 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 
 /**
- * The TypeSupplier is construct by the symbolName and symbolType.
- * The TypeSupplier implement the {@link Supplier<Type>} interface to provide the {@link Type}.
- * The TypeSupplier maintain types to track different {@link Type} definition for the same symbolName.
+ * The TypeSupplier is construct by the symbolName and symbolType. The TypeSupplier implement the
+ * {@link Supplier<Type>} interface to provide the {@link Type}. The TypeSupplier maintain types to
+ * track different {@link Type} definition for the same symbolName.
  */
 public class TypeSupplier implements Supplier<Type> {
-    private final String symbolName;
-    private final Type symbolType;
-    private final Set<Type> types;
+  private final String symbolName;
+  private final Type symbolType;
+  private final Set<Type> types;
 
-    public TypeSupplier(String symbolName, Type symbolType) {
-        this.symbolName = symbolName;
-        this.symbolType = symbolType;
-        this.types = new HashSet<>();
-        this.types.add(symbolType);
-    }
+  public TypeSupplier(String symbolName, Type symbolType) {
+    this.symbolName = symbolName;
+    this.symbolType = symbolType;
+    this.types = new HashSet<>();
+    this.types.add(symbolType);
+  }
 
-    public TypeSupplier add(Type type) {
-        types.add(type);
-        return this;
-    }
+  public TypeSupplier add(Type type) {
+    types.add(type);
+    return this;
+  }
 
-    /**
-     * Get the {@link Type}
-     * Throw {@link SemanticAnalysisException} if conflict found.
-     * Currently, if the two types not equal, they are treated as conflicting.
-     */
-    @Override
-    public Type get() {
-        if (types.size() > 1) {
-            throw new SemanticAnalysisException(
-                    String.format("Field [%s] have conflict type [%s]", symbolName, types));
-        } else {
-            return symbolType;
-        }
+  /**
+   * Get the {@link Type} Throw {@link SemanticAnalysisException} if conflict found. Currently, if
+   * the two types not equal, they are treated as conflicting.
+   */
+  @Override
+  public Type get() {
+    if (types.size() > 1) {
+      throw new SemanticAnalysisException(
+          String.format("Field [%s] have conflict type [%s]", symbolName, types));
+    } else {
+      return symbolType;
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/Type.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/Type.java
index 0491c4e568..539e3478d2 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/Type.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/Type.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types;
 
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.TYPE_ERROR;
@@ -15,66 +14,64 @@
 import org.opensearch.sql.legacy.antlr.visitor.Reducible;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-/**
- * Type interface which represents any type of symbol in the SQL.
- */
+/** Type interface which represents any type of symbol in the SQL. */
 public interface Type extends Reducible {
 
-    /**
-     * Hide generic type ugliness and error check here in one place.
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    default <T extends Reducible> T reduce(List<T> others) {
-        List<Type> actualArgTypes = (List<Type>) others;
-        Type result = construct(actualArgTypes);
-        if (result != TYPE_ERROR) {
-            return (T) result;
-        }
-
-        // Generate error message by current type name, argument types and usage of current type
-        // For example, 'Function [LOG] cannot work with [TEXT, INTEGER]. Usage: LOG(NUMBER) -> NUMBER
-        String actualArgTypesStr;
-        if (actualArgTypes.isEmpty()) {
-            actualArgTypesStr = "<None>";
-        } else {
-            actualArgTypesStr = actualArgTypes.stream().
-                                               map(Type::usage).
-                                               collect(Collectors.joining(", "));
-        }
+  /** Hide generic type ugliness and error check here in one place. */
+  @SuppressWarnings("unchecked")
+  @Override
+  default <T extends Reducible> T reduce(List<T> others) {
+    List<Type> actualArgTypes = (List<Type>) others;
+    Type result = construct(actualArgTypes);
+    if (result != TYPE_ERROR) {
+      return (T) result;
+    }
 
-        throw new SemanticAnalysisException(
-            StringUtils.format("%s cannot work with [%s]. Usage: %s",
-                this, actualArgTypesStr, usage()));
+    // Generate error message by current type name, argument types and usage of current type
+    // For example, 'Function [LOG] cannot work with [TEXT, INTEGER]. Usage: LOG(NUMBER) -> NUMBER
+    String actualArgTypesStr;
+    if (actualArgTypes.isEmpty()) {
+      actualArgTypesStr = "<None>";
+    } else {
+      actualArgTypesStr =
+          actualArgTypes.stream().map(Type::usage).collect(Collectors.joining(", "));
     }
 
-    /**
-     * Type descriptive name
-     * @return  name
-     */
-    String getName();
+    throw new SemanticAnalysisException(
+        StringUtils.format(
+            "%s cannot work with [%s]. Usage: %s", this, actualArgTypesStr, usage()));
+  }
 
-    /**
-     * Check if current type is compatible with other of same type.
-     * @param other     other type
-     * @return          true if compatible
-     */
-    default boolean isCompatible(Type other) {
-        return other == UNKNOWN || this == other;
-    }
+  /**
+   * Type descriptive name
+   *
+   * @return name
+   */
+  String getName();
+
+  /**
+   * Check if current type is compatible with other of same type.
+   *
+   * @param other other type
+   * @return true if compatible
+   */
+  default boolean isCompatible(Type other) {
+    return other == UNKNOWN || this == other;
+  }
 
-    /**
-     * Construct a new type by applying current constructor on other types.
-     * Constructor is a generic conception that could be function, operator, join etc.
-     *
-     * @param others other types
-     * @return  a new type as result
-     */
-    Type construct(List<Type> others);
+  /**
+   * Construct a new type by applying current constructor on other types. Constructor is a generic
+   * conception that could be function, operator, join etc.
+   *
+   * @param others other types
+   * @return a new type as result
+   */
+  Type construct(List<Type> others);
 
-    /**
-     * Return typical usage of current type
-     * @return  usage string
-     */
-    String usage();
+  /**
+   * Return typical usage of current type
+   *
+   * @return usage string
+   */
+  String usage();
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/TypeExpression.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/TypeExpression.java
index eacca7b00d..5a9d4d7410 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/TypeExpression.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/TypeExpression.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types;
 
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.TYPE_ERROR;
@@ -17,105 +16,107 @@
 import org.opensearch.sql.legacy.utils.StringUtils;
 
 /**
- * Type expression representing specification(s) of constructor such as function, operator etc.
- * Type expression has to be an interface with default methods because most subclass needs to be Enum.
+ * Type expression representing specification(s) of constructor such as function, operator etc. Type
+ * expression has to be an interface with default methods because most subclass needs to be Enum.
  */
 public interface TypeExpression extends Type {
 
-    @Override
-    default Type construct(List<Type> actualArgs) {
-        TypeExpressionSpec[] specifications = specifications();
-        if (specifications.length == 0) {
-            // Empty spec means type check for this type expression is not implemented yet.
-            // Return this to be compatible with everything.
-            return UNKNOWN;
-        }
+  @Override
+  default Type construct(List<Type> actualArgs) {
+    TypeExpressionSpec[] specifications = specifications();
+    if (specifications.length == 0) {
+      // Empty spec means type check for this type expression is not implemented yet.
+      // Return this to be compatible with everything.
+      return UNKNOWN;
+    }
 
-        // Create a temp specification for compatibility check.
-        TypeExpressionSpec actualSpec = new TypeExpressionSpec();
-        actualSpec.argTypes = actualArgs.toArray(new Type[0]);
-
-        // Perform compatibility check between actual spec (argument types) and expected.
-        // If found any compatible spec, it means actual spec is legal and thus apply to get result type.
-        // Ex. Actual=[INTEGER], Specs=[NUMBER->NUMBER], [STRING->NUMBER]. So first spec matches and return NUMBER.
-        for (TypeExpressionSpec spec : specifications) {
-            if (spec.isCompatible(actualSpec)) {
-                return spec.constructFunc.apply(actualArgs.toArray(new Type[0]));
-            }
-        }
-        return TYPE_ERROR;
+    // Create a temp specification for compatibility check.
+    TypeExpressionSpec actualSpec = new TypeExpressionSpec();
+    actualSpec.argTypes = actualArgs.toArray(new Type[0]);
+
+    // Perform compatibility check between actual spec (argument types) and expected.
+    // If found any compatible spec, it means actual spec is legal and thus apply to get result
+    // type.
+    // Ex. Actual=[INTEGER], Specs=[NUMBER->NUMBER], [STRING->NUMBER]. So first spec matches and
+    // return NUMBER.
+    for (TypeExpressionSpec spec : specifications) {
+      if (spec.isCompatible(actualSpec)) {
+        return spec.constructFunc.apply(actualArgs.toArray(new Type[0]));
+      }
+    }
+    return TYPE_ERROR;
+  }
+
+  @Override
+  default String usage() {
+    return Arrays.stream(specifications())
+        .map(spec -> getName() + spec)
+        .collect(Collectors.joining(" or "));
+  }
+
+  /**
+   * Each type expression may be overloaded and include multiple specifications.
+   *
+   * @return all valid specifications or empty which means not implemented yet
+   */
+  TypeExpressionSpec[] specifications();
+
+  /**
+   * A specification is combination of a construct function and arg types for a type expression
+   * (represent a constructor)
+   */
+  class TypeExpressionSpec {
+    Type[] argTypes;
+    Function<Type[], Type> constructFunc;
+
+    public TypeExpressionSpec map(Type... args) {
+      this.argTypes = args;
+      return this;
     }
 
-    @Override
-    default String usage() {
-        return Arrays.stream(specifications()).
-                      map(spec -> getName() + spec).
-                      collect(Collectors.joining(" or "));
+    public TypeExpressionSpec to(Function<Type[], Type> constructFunc) {
+      // Required for generic type to replace placeholder ex.T with actual position in argument
+      // list.
+      // So construct function of generic type can return binding type finally.
+      this.constructFunc = Generic.specialize(constructFunc, argTypes);
+      return this;
     }
 
-    /**
-     * Each type expression may be overloaded and include multiple specifications.
-     * @return  all valid specifications or empty which means not implemented yet
-     */
-    TypeExpressionSpec[] specifications();
-
-    /**
-     * A specification is combination of a construct function and arg types
-     * for a type expression (represent a constructor)
-     */
-    class TypeExpressionSpec {
-        Type[] argTypes;
-        Function<Type[], Type> constructFunc;
-
-        public TypeExpressionSpec map(Type... args) {
-            this.argTypes = args;
-            return this;
-        }
+    /** Return a base type no matter what's the arg types Mostly this is used for empty arg types */
+    public TypeExpressionSpec to(Type returnType) {
+      this.constructFunc = x -> returnType;
+      return this;
+    }
 
-        public TypeExpressionSpec to(Function<Type[], Type> constructFunc) {
-            // Required for generic type to replace placeholder ex.T with actual position in argument list.
-            // So construct function of generic type can return binding type finally.
-            this.constructFunc = Generic.specialize(constructFunc, argTypes);
-            return this;
-        }
+    public boolean isCompatible(TypeExpressionSpec otherSpec) {
+      Type[] expectArgTypes = this.argTypes;
+      Type[] actualArgTypes = otherSpec.argTypes;
 
-        /** Return a base type no matter what's the arg types
-            Mostly this is used for empty arg types */
-        public TypeExpressionSpec to(Type returnType) {
-            this.constructFunc = x -> returnType;
-            return this;
-        }
+      // Check if arg numbers exactly match
+      if (expectArgTypes.length != actualArgTypes.length) {
+        return false;
+      }
 
-        public boolean isCompatible(TypeExpressionSpec otherSpec) {
-            Type[] expectArgTypes = this.argTypes;
-            Type[] actualArgTypes = otherSpec.argTypes;
-
-            // Check if arg numbers exactly match
-            if (expectArgTypes.length != actualArgTypes.length) {
-                return false;
-            }
-
-            // Check if all arg types are compatible
-            for (int i = 0; i < expectArgTypes.length; i++) {
-                if (!expectArgTypes[i].isCompatible(actualArgTypes[i])) {
-                    return false;
-                }
-            }
-            return true;
+      // Check if all arg types are compatible
+      for (int i = 0; i < expectArgTypes.length; i++) {
+        if (!expectArgTypes[i].isCompatible(actualArgTypes[i])) {
+          return false;
         }
+      }
+      return true;
+    }
 
-        @Override
-        public String toString() {
-            String argTypesStr = Arrays.stream(argTypes).
-                                        map(Type::usage).
-                                        collect(Collectors.joining(", "));
+    @Override
+    public String toString() {
+      String argTypesStr =
+          Arrays.stream(argTypes).map(Type::usage).collect(Collectors.joining(", "));
 
-            // Only show generic type name in return value for clarity
-            Type returnType = constructFunc.apply(argTypes);
-            String returnTypeStr = (returnType instanceof Generic) ? returnType.getName() : returnType.usage();
+      // Only show generic type name in return value for clarity
+      Type returnType = constructFunc.apply(argTypes);
+      String returnTypeStr =
+          (returnType instanceof Generic) ? returnType.getName() : returnType.usage();
 
-            return StringUtils.format("(%s) -> %s", argTypesStr, returnTypeStr);
-        }
+      return StringUtils.format("(%s) -> %s", argTypesStr, returnTypeStr);
     }
-
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/BaseType.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/BaseType.java
index 280b7b4c76..37e0c4d4b3 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/BaseType.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/BaseType.java
@@ -3,24 +3,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types.base;
 
 import java.util.List;
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 
-/**
- * Base type interface
- */
+/** Base type interface */
 public interface BaseType extends Type {
 
-    @Override
-    default Type construct(List<Type> others) {
-        return this;
-    }
+  @Override
+  default Type construct(List<Type> others) {
+    return this;
+  }
 
-    @Override
-    default String usage() {
-        return getName();
-    }
+  @Override
+  default String usage() {
+    return getName();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/OpenSearchDataType.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/OpenSearchDataType.java
index eab40c2dc7..00ef4afdf1 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/OpenSearchDataType.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/OpenSearchDataType.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types.base;
 
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchIndex.IndexType.NESTED_FIELD;
@@ -13,105 +12,102 @@
 import java.util.Map;
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 
-/**
- * Base type hierarchy based on OpenSearch data type
- */
+/** Base type hierarchy based on OpenSearch data type */
 public enum OpenSearchDataType implements BaseType {
-
-    TYPE_ERROR,
-    UNKNOWN,
-
-    SHORT, LONG,
-    INTEGER(SHORT, LONG),
-    FLOAT(INTEGER),
-    DOUBLE(FLOAT),
-    NUMBER(DOUBLE),
-
-    KEYWORD,
-    TEXT(KEYWORD),
-    STRING(TEXT),
-
-    DATE_NANOS,
-    DATE(DATE_NANOS, STRING),
-
-    BOOLEAN,
-
-    OBJECT, NESTED,
-    COMPLEX(OBJECT, NESTED),
-
-    GEO_POINT,
-
-    OPENSEARCH_TYPE(
-        NUMBER,
-        //STRING, move to under DATE because DATE is compatible
-        DATE,
-        BOOLEAN,
-        COMPLEX,
-        GEO_POINT
-    );
-
-
-    /**
-     * Java Enum's valueOf() may thrown "enum constant not found" exception.
-     * And Java doesn't provide a contains method.
-     * So this static map is necessary for check and efficiency.
-     */
-    private static final Map<String, OpenSearchDataType> ALL_BASE_TYPES;
-    static {
-        ImmutableMap.Builder<String, OpenSearchDataType> builder = new ImmutableMap.Builder<>();
-        for (OpenSearchDataType type : OpenSearchDataType.values()) {
-            builder.put(type.name(), type);
-        }
-        ALL_BASE_TYPES = builder.build();
+  TYPE_ERROR,
+  UNKNOWN,
+
+  SHORT,
+  LONG,
+  INTEGER(SHORT, LONG),
+  FLOAT(INTEGER),
+  DOUBLE(FLOAT),
+  NUMBER(DOUBLE),
+
+  KEYWORD,
+  TEXT(KEYWORD),
+  STRING(TEXT),
+
+  DATE_NANOS,
+  DATE(DATE_NANOS, STRING),
+
+  BOOLEAN,
+
+  OBJECT,
+  NESTED,
+  COMPLEX(OBJECT, NESTED),
+
+  GEO_POINT,
+
+  OPENSEARCH_TYPE(
+      NUMBER,
+      // STRING, move to under DATE because DATE is compatible
+      DATE,
+      BOOLEAN,
+      COMPLEX,
+      GEO_POINT);
+
+  /**
+   * Java Enum's valueOf() may thrown "enum constant not found" exception. And Java doesn't provide
+   * a contains method. So this static map is necessary for check and efficiency.
+   */
+  private static final Map<String, OpenSearchDataType> ALL_BASE_TYPES;
+
+  static {
+    ImmutableMap.Builder<String, OpenSearchDataType> builder = new ImmutableMap.Builder<>();
+    for (OpenSearchDataType type : OpenSearchDataType.values()) {
+      builder.put(type.name(), type);
     }
+    ALL_BASE_TYPES = builder.build();
+  }
 
-    public static OpenSearchDataType typeOf(String str) {
-        return ALL_BASE_TYPES.getOrDefault(toUpper(str), UNKNOWN);
-    }
+  public static OpenSearchDataType typeOf(String str) {
+    return ALL_BASE_TYPES.getOrDefault(toUpper(str), UNKNOWN);
+  }
 
-    /** Parent of current base type */
-    private OpenSearchDataType parent;
+  /** Parent of current base type */
+  private OpenSearchDataType parent;
 
-    OpenSearchDataType(OpenSearchDataType... compatibleTypes) {
-        for (OpenSearchDataType subType : compatibleTypes) {
-            subType.parent = this;
-        }
+  OpenSearchDataType(OpenSearchDataType... compatibleTypes) {
+    for (OpenSearchDataType subType : compatibleTypes) {
+      subType.parent = this;
     }
-
-    @Override
-    public String getName() {
-        return name();
+  }
+
+  @Override
+  public String getName() {
+    return name();
+  }
+
+  /**
+   * For base type, compatibility means this (current type) is ancestor of other in the base type
+   * hierarchy.
+   */
+  @Override
+  public boolean isCompatible(Type other) {
+    // Skip compatibility check if type is unknown
+    if (this == UNKNOWN || other == UNKNOWN) {
+      return true;
     }
 
-    /**
-     * For base type, compatibility means this (current type) is ancestor of other
-     * in the base type hierarchy.
-     */
-    @Override
-    public boolean isCompatible(Type other) {
-        // Skip compatibility check if type is unknown
-        if (this == UNKNOWN || other == UNKNOWN) {
-            return true;
-        }
-
-        if (!(other instanceof OpenSearchDataType)) {
-            // Nested data type is compatible with nested index type for type expression use
-            if (other instanceof OpenSearchIndex && ((OpenSearchIndex) other).type() == NESTED_FIELD) {
-                return isCompatible(NESTED);
-            }
-            return false;
-        }
-
-        // One way compatibility: parent base type is compatible with children
-        OpenSearchDataType cur = (OpenSearchDataType) other;
-        while (cur != null && cur != this) {
-            cur = cur.parent;
-        }
-        return cur != null;
+    if (!(other instanceof OpenSearchDataType)) {
+      // Nested data type is compatible with nested index type for type expression use
+      if (other instanceof OpenSearchIndex && ((OpenSearchIndex) other).type() == NESTED_FIELD) {
+        return isCompatible(NESTED);
+      }
+      return false;
     }
 
-    @Override
-    public String toString() {
-        return "OpenSearch Data Type [" + getName() + "]";
+    // One way compatibility: parent base type is compatible with children
+    OpenSearchDataType cur = (OpenSearchDataType) other;
+    while (cur != null && cur != this) {
+      cur = cur.parent;
     }
+    return cur != null;
+  }
+
+  @Override
+  public String toString() {
+    return "OpenSearch Data Type [" + getName() + "]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/OpenSearchIndex.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/OpenSearchIndex.java
index b3d971100b..2c790f15aa 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/OpenSearchIndex.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/base/OpenSearchIndex.java
@@ -3,68 +3,66 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types.base;
 
 import java.util.Objects;
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 
-/**
- * Index type is not Enum because essentially each index is a brand new type.
- */
+/** Index type is not Enum because essentially each index is a brand new type. */
 public class OpenSearchIndex implements BaseType {
 
-    public enum IndexType {
-        INDEX, NESTED_FIELD, INDEX_PATTERN
-    }
+  public enum IndexType {
+    INDEX,
+    NESTED_FIELD,
+    INDEX_PATTERN
+  }
 
-    private final String indexName;
-    private final IndexType indexType;
+  private final String indexName;
+  private final IndexType indexType;
 
-    public OpenSearchIndex(String indexName, IndexType indexType) {
-        this.indexName = indexName;
-        this.indexType = indexType;
-    }
+  public OpenSearchIndex(String indexName, IndexType indexType) {
+    this.indexName = indexName;
+    this.indexType = indexType;
+  }
 
-    public IndexType type() {
-        return indexType;
-    }
+  public IndexType type() {
+    return indexType;
+  }
 
-    @Override
-    public String getName() {
-        return indexName;
-    }
+  @Override
+  public String getName() {
+    return indexName;
+  }
 
-    @Override
-    public boolean isCompatible(Type other) {
-        return equals(other);
-    }
+  @Override
+  public boolean isCompatible(Type other) {
+    return equals(other);
+  }
 
-    @Override
-    public String usage() {
-        return indexType.name();
-    }
+  @Override
+  public String usage() {
+    return indexType.name();
+  }
 
-    @Override
-    public String toString() {
-        return indexType + " [" + indexName + "]";
-    }
+  @Override
+  public String toString() {
+    return indexType + " [" + indexName + "]";
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OpenSearchIndex index = (OpenSearchIndex) o;
-        return Objects.equals(indexName, index.indexName)
-            && indexType == index.indexType;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(indexName, indexType);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    OpenSearchIndex index = (OpenSearchIndex) o;
+    return Objects.equals(indexName, index.indexName) && indexType == index.indexType;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(indexName, indexType);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/AggregateFunction.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/AggregateFunction.java
index 37e4091b0a..9cebf3dda6 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/AggregateFunction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/AggregateFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types.function;
 
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.DOUBLE;
@@ -15,41 +14,38 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 import org.opensearch.sql.legacy.antlr.semantic.types.TypeExpression;
 
-/**
- * Aggregate function
- */
+/** Aggregate function */
 public enum AggregateFunction implements TypeExpression {
-    COUNT(
-        func().to(INTEGER), // COUNT(*)
-        func(OPENSEARCH_TYPE).to(INTEGER)
-    ),
-    MAX(func(T(NUMBER)).to(T)),
-    MIN(func(T(NUMBER)).to(T)),
-    AVG(func(T(NUMBER)).to(DOUBLE)),
-    SUM(func(T(NUMBER)).to(T));
-
-    private TypeExpressionSpec[] specifications;
-
-    AggregateFunction(TypeExpressionSpec... specifications) {
-        this.specifications = specifications;
-    }
-
-    @Override
-    public String getName() {
-        return name();
-    }
-
-    @Override
-    public TypeExpressionSpec[] specifications() {
-        return specifications;
-    }
-
-    private static TypeExpressionSpec func(Type... argTypes) {
-        return new TypeExpressionSpec().map(argTypes);
-    }
-
-    @Override
-    public String toString() {
-        return "Function [" + name() + "]";
-    }
+  COUNT(
+      func().to(INTEGER), // COUNT(*)
+      func(OPENSEARCH_TYPE).to(INTEGER)),
+  MAX(func(T(NUMBER)).to(T)),
+  MIN(func(T(NUMBER)).to(T)),
+  AVG(func(T(NUMBER)).to(DOUBLE)),
+  SUM(func(T(NUMBER)).to(T));
+
+  private TypeExpressionSpec[] specifications;
+
+  AggregateFunction(TypeExpressionSpec... specifications) {
+    this.specifications = specifications;
+  }
+
+  @Override
+  public String getName() {
+    return name();
+  }
+
+  @Override
+  public TypeExpressionSpec[] specifications() {
+    return specifications;
+  }
+
+  private static TypeExpressionSpec func(Type... argTypes) {
+    return new TypeExpressionSpec().map(argTypes);
+  }
+
+  @Override
+  public String toString() {
+    return "Function [" + name() + "]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/OpenSearchScalarFunction.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/OpenSearchScalarFunction.java
index 93e1950d50..435a5ca968 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/OpenSearchScalarFunction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/OpenSearchScalarFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types.function;
 
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.BOOLEAN;
@@ -16,87 +15,73 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 import org.opensearch.sql.legacy.antlr.semantic.types.TypeExpression;
 
-/**
- * OpenSearch special scalar functions
- */
+/** OpenSearch special scalar functions */
 public enum OpenSearchScalarFunction implements TypeExpression {
+  DATE_HISTOGRAM(), // this is aggregate function
+  DAY_OF_MONTH(func(DATE).to(INTEGER)),
+  DAY_OF_YEAR(func(DATE).to(INTEGER)),
+  DAY_OF_WEEK(func(DATE).to(INTEGER)),
+  EXCLUDE(), // can only be used in SELECT?
+  EXTENDED_STATS(), // need confirm
+  FIELD(), // couldn't find test cases related
+  FILTER(),
+  GEO_BOUNDING_BOX(func(GEO_POINT, NUMBER, NUMBER, NUMBER, NUMBER).to(BOOLEAN)),
+  GEO_CELL(), // optional arg or overloaded spec is required.
+  GEO_DISTANCE(func(GEO_POINT, STRING, NUMBER, NUMBER).to(BOOLEAN)),
+  GEO_DISTANCE_RANGE(func(GEO_POINT, STRING, NUMBER, NUMBER).to(BOOLEAN)),
+  GEO_INTERSECTS(), // ?
+  GEO_POLYGON(), // varargs is required for 2nd arg
+  HISTOGRAM(), // same as date_histogram
+  HOUR_OF_DAY(func(DATE).to(INTEGER)),
+  INCLUDE(), // same as exclude
+  IN_TERMS(), // varargs
+  MATCHPHRASE(func(STRING, STRING).to(BOOLEAN), func(STRING).to(STRING)), // slop arg is optional
+  MATCH_PHRASE(MATCHPHRASE.specifications()),
+  MATCHQUERY(func(STRING, STRING).to(BOOLEAN), func(STRING).to(STRING)),
+  MATCH_QUERY(MATCHQUERY.specifications()),
+  MINUTE_OF_DAY(func(DATE).to(INTEGER)), // or long?
+  MINUTE_OF_HOUR(func(DATE).to(INTEGER)),
+  MONTH_OF_YEAR(func(DATE).to(INTEGER)),
+  MULTIMATCH(), // kw arguments
+  MULTI_MATCH(MULTIMATCH.specifications()),
+  NESTED(), // overloaded
+  PERCENTILES(), // ?
+  REGEXP_QUERY(), // ?
+  REVERSE_NESTED(), // need overloaded
+  QUERY(func(STRING).to(BOOLEAN)),
+  RANGE(), // aggregate function
+  SCORE(), // semantic problem?
+  SECOND_OF_MINUTE(func(DATE).to(INTEGER)),
+  STATS(),
+  TERM(), // semantic problem
+  TERMS(), // semantic problem
+  TOPHITS(), // only available in SELECT
+  WEEK_OF_YEAR(func(DATE).to(INTEGER)),
+  WILDCARDQUERY(func(STRING, STRING).to(BOOLEAN), func(STRING).to(STRING)),
+  WILDCARD_QUERY(WILDCARDQUERY.specifications());
 
-    DATE_HISTOGRAM(), // this is aggregate function
-    DAY_OF_MONTH(func(DATE).to(INTEGER)),
-    DAY_OF_YEAR(func(DATE).to(INTEGER)),
-    DAY_OF_WEEK(func(DATE).to(INTEGER)),
-    EXCLUDE(),  // can only be used in SELECT?
-    EXTENDED_STATS(), // need confirm
-    FIELD(), // couldn't find test cases related
-    FILTER(),
-    GEO_BOUNDING_BOX(func(GEO_POINT, NUMBER, NUMBER, NUMBER, NUMBER).to(BOOLEAN)),
-    GEO_CELL(), // optional arg or overloaded spec is required.
-    GEO_DISTANCE(func(GEO_POINT, STRING, NUMBER, NUMBER).to(BOOLEAN)),
-    GEO_DISTANCE_RANGE(func(GEO_POINT, STRING, NUMBER, NUMBER).to(BOOLEAN)),
-    GEO_INTERSECTS(), //?
-    GEO_POLYGON(), // varargs is required for 2nd arg
-    HISTOGRAM(), // same as date_histogram
-    HOUR_OF_DAY(func(DATE).to(INTEGER)),
-    INCLUDE(), // same as exclude
-    IN_TERMS(), // varargs
-    MATCHPHRASE(
-        func(STRING, STRING).to(BOOLEAN),
-        func(STRING).to(STRING)
-    ), //slop arg is optional
-    MATCH_PHRASE(MATCHPHRASE.specifications()),
-    MATCHQUERY(
-        func(STRING, STRING).to(BOOLEAN),
-        func(STRING).to(STRING)
-    ),
-    MATCH_QUERY(MATCHQUERY.specifications()),
-    MINUTE_OF_DAY(func(DATE).to(INTEGER)), // or long?
-    MINUTE_OF_HOUR(func(DATE).to(INTEGER)),
-    MONTH_OF_YEAR(func(DATE).to(INTEGER)),
-    MULTIMATCH(), // kw arguments
-    MULTI_MATCH(MULTIMATCH.specifications()),
-    NESTED(), // overloaded
-    PERCENTILES(), //?
-    REGEXP_QUERY(), //?
-    REVERSE_NESTED(), // need overloaded
-    QUERY(func(STRING).to(BOOLEAN)),
-    RANGE(), // aggregate function
-    SCORE(), // semantic problem?
-    SECOND_OF_MINUTE(func(DATE).to(INTEGER)),
-    STATS(),
-    TERM(), // semantic problem
-    TERMS(), // semantic problem
-    TOPHITS(), // only available in SELECT
-    WEEK_OF_YEAR(func(DATE).to(INTEGER)),
-    WILDCARDQUERY(
-        func(STRING, STRING).to(BOOLEAN),
-        func(STRING).to(STRING)
-    ),
-    WILDCARD_QUERY(WILDCARDQUERY.specifications());
-
-
-    private final TypeExpressionSpec[] specifications;
-
-    OpenSearchScalarFunction(TypeExpressionSpec... specifications) {
-        this.specifications = specifications;
-    }
+  private final TypeExpressionSpec[] specifications;
 
-    @Override
-    public String getName() {
-        return name();
-    }
+  OpenSearchScalarFunction(TypeExpressionSpec... specifications) {
+    this.specifications = specifications;
+  }
 
-    @Override
-    public TypeExpressionSpec[] specifications() {
-        return specifications;
-    }
+  @Override
+  public String getName() {
+    return name();
+  }
 
-    private static TypeExpressionSpec func(Type... argTypes) {
-        return new TypeExpressionSpec().map(argTypes);
-    }
+  @Override
+  public TypeExpressionSpec[] specifications() {
+    return specifications;
+  }
 
-    @Override
-    public String toString() {
-        return "Function [" + name() + "]";
-    }
+  private static TypeExpressionSpec func(Type... argTypes) {
+    return new TypeExpressionSpec().map(argTypes);
+  }
 
+  @Override
+  public String toString() {
+    return "Function [" + name() + "]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/ScalarFunction.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/ScalarFunction.java
index e993562df8..5dfada7ca8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/ScalarFunction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/function/ScalarFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types.function;
 
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.BOOLEAN;
@@ -18,123 +17,98 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.TypeExpression;
 import org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType;
 
-/**
- * Scalar SQL function
- */
+/** Scalar SQL function */
 public enum ScalarFunction implements TypeExpression {
+  ABS(func(T(NUMBER)).to(T)), // translate to Java: <T extends Number> T ABS(T)
+  ACOS(func(T(NUMBER)).to(DOUBLE)),
+  ADD(func(T(NUMBER), NUMBER).to(T)),
+  ASCII(func(T(STRING)).to(INTEGER)),
+  ASIN(func(T(NUMBER)).to(DOUBLE)),
+  ATAN(func(T(NUMBER)).to(DOUBLE)),
+  ATAN2(func(T(NUMBER), NUMBER).to(DOUBLE)),
+  CAST(),
+  CBRT(func(T(NUMBER)).to(T)),
+  CEIL(func(T(NUMBER)).to(T)),
+  CONCAT(), // TODO: varargs support required
+  CONCAT_WS(),
+  COS(func(T(NUMBER)).to(DOUBLE)),
+  COSH(func(T(NUMBER)).to(DOUBLE)),
+  COT(func(T(NUMBER)).to(DOUBLE)),
+  CURDATE(func().to(OpenSearchDataType.DATE)),
+  DATE(func(OpenSearchDataType.DATE).to(OpenSearchDataType.DATE)),
+  DATE_FORMAT(
+      func(OpenSearchDataType.DATE, STRING).to(STRING),
+      func(OpenSearchDataType.DATE, STRING, STRING).to(STRING)),
+  DAYOFMONTH(func(OpenSearchDataType.DATE).to(INTEGER)),
+  DEGREES(func(T(NUMBER)).to(DOUBLE)),
+  DIVIDE(func(T(NUMBER), NUMBER).to(T)),
+  E(func().to(DOUBLE)),
+  EXP(func(T(NUMBER)).to(T)),
+  EXPM1(func(T(NUMBER)).to(T)),
+  FLOOR(func(T(NUMBER)).to(T)),
+  IF(func(BOOLEAN, OPENSEARCH_TYPE, OPENSEARCH_TYPE).to(OPENSEARCH_TYPE)),
+  IFNULL(func(OPENSEARCH_TYPE, OPENSEARCH_TYPE).to(OPENSEARCH_TYPE)),
+  ISNULL(func(OPENSEARCH_TYPE).to(INTEGER)),
+  LEFT(func(T(STRING), INTEGER).to(T)),
+  LENGTH(func(STRING).to(INTEGER)),
+  LN(func(T(NUMBER)).to(DOUBLE)),
+  LOCATE(func(STRING, STRING, INTEGER).to(INTEGER), func(STRING, STRING).to(INTEGER)),
+  LOG(func(T(NUMBER)).to(DOUBLE), func(T(NUMBER), NUMBER).to(DOUBLE)),
+  LOG2(func(T(NUMBER)).to(DOUBLE)),
+  LOG10(func(T(NUMBER)).to(DOUBLE)),
+  LOWER(func(T(STRING)).to(T), func(T(STRING), STRING).to(T)),
+  LTRIM(func(T(STRING)).to(T)),
+  MAKETIME(func(INTEGER, INTEGER, INTEGER).to(OpenSearchDataType.DATE)),
+  MODULUS(func(T(NUMBER), NUMBER).to(T)),
+  MONTH(func(OpenSearchDataType.DATE).to(INTEGER)),
+  MONTHNAME(func(OpenSearchDataType.DATE).to(STRING)),
+  MULTIPLY(func(T(NUMBER), NUMBER).to(NUMBER)),
+  NOW(func().to(OpenSearchDataType.DATE)),
+  PI(func().to(DOUBLE)),
+  POW(func(T(NUMBER)).to(T), func(T(NUMBER), NUMBER).to(T)),
+  POWER(func(T(NUMBER)).to(T), func(T(NUMBER), NUMBER).to(T)),
+  RADIANS(func(T(NUMBER)).to(DOUBLE)),
+  RAND(func().to(NUMBER), func(T(NUMBER)).to(T)),
+  REPLACE(func(T(STRING), STRING, STRING).to(T)),
+  RIGHT(func(T(STRING), INTEGER).to(T)),
+  RINT(func(T(NUMBER)).to(T)),
+  ROUND(func(T(NUMBER)).to(T)),
+  RTRIM(func(T(STRING)).to(T)),
+  SIGN(func(T(NUMBER)).to(T)),
+  SIGNUM(func(T(NUMBER)).to(T)),
+  SIN(func(T(NUMBER)).to(DOUBLE)),
+  SINH(func(T(NUMBER)).to(DOUBLE)),
+  SQRT(func(T(NUMBER)).to(T)),
+  SUBSTRING(func(T(STRING), INTEGER, INTEGER).to(T)),
+  SUBTRACT(func(T(NUMBER), NUMBER).to(T)),
+  TAN(func(T(NUMBER)).to(DOUBLE)),
+  TIMESTAMP(func(OpenSearchDataType.DATE).to(OpenSearchDataType.DATE)),
+  TRIM(func(T(STRING)).to(T)),
+  UPPER(func(T(STRING)).to(T), func(T(STRING), STRING).to(T)),
+  YEAR(func(OpenSearchDataType.DATE).to(INTEGER));
 
-    ABS(func(T(NUMBER)).to(T)), // translate to Java: <T extends Number> T ABS(T)
-    ACOS(func(T(NUMBER)).to(DOUBLE)),
-    ADD(func(T(NUMBER), NUMBER).to(T)),
-    ASCII(func(T(STRING)).to(INTEGER)),
-    ASIN(func(T(NUMBER)).to(DOUBLE)),
-    ATAN(func(T(NUMBER)).to(DOUBLE)),
-    ATAN2(func(T(NUMBER), NUMBER).to(DOUBLE)),
-    CAST(),
-    CBRT(func(T(NUMBER)).to(T)),
-    CEIL(func(T(NUMBER)).to(T)),
-    CONCAT(), // TODO: varargs support required
-    CONCAT_WS(),
-    COS(func(T(NUMBER)).to(DOUBLE)),
-    COSH(func(T(NUMBER)).to(DOUBLE)),
-    COT(func(T(NUMBER)).to(DOUBLE)),
-    CURDATE(func().to(OpenSearchDataType.DATE)),
-    DATE(func(OpenSearchDataType.DATE).to(OpenSearchDataType.DATE)),
-    DATE_FORMAT(
-        func(OpenSearchDataType.DATE, STRING).to(STRING),
-        func(OpenSearchDataType.DATE, STRING, STRING).to(STRING)
-    ),
-    DAYOFMONTH(func(OpenSearchDataType.DATE).to(INTEGER)),
-    DEGREES(func(T(NUMBER)).to(DOUBLE)),
-    DIVIDE(func(T(NUMBER), NUMBER).to(T)),
-    E(func().to(DOUBLE)),
-    EXP(func(T(NUMBER)).to(T)),
-    EXPM1(func(T(NUMBER)).to(T)),
-    FLOOR(func(T(NUMBER)).to(T)),
-    IF(func(BOOLEAN, OPENSEARCH_TYPE, OPENSEARCH_TYPE).to(OPENSEARCH_TYPE)),
-    IFNULL(func(OPENSEARCH_TYPE, OPENSEARCH_TYPE).to(OPENSEARCH_TYPE)),
-    ISNULL(func(OPENSEARCH_TYPE).to(INTEGER)),
-    LEFT(func(T(STRING), INTEGER).to(T)),
-    LENGTH(func(STRING).to(INTEGER)),
-    LN(func(T(NUMBER)).to(DOUBLE)),
-    LOCATE(
-            func(STRING, STRING, INTEGER).to(INTEGER),
-            func(STRING, STRING).to(INTEGER)
-    ),
-    LOG(
-        func(T(NUMBER)).to(DOUBLE),
-        func(T(NUMBER), NUMBER).to(DOUBLE)
-    ),
-    LOG2(func(T(NUMBER)).to(DOUBLE)),
-    LOG10(func(T(NUMBER)).to(DOUBLE)),
-    LOWER(
-        func(T(STRING)).to(T),
-        func(T(STRING), STRING).to(T)
-    ),
-    LTRIM(func(T(STRING)).to(T)),
-    MAKETIME(func(INTEGER, INTEGER, INTEGER).to(OpenSearchDataType.DATE)),
-    MODULUS(func(T(NUMBER), NUMBER).to(T)),
-    MONTH(func(OpenSearchDataType.DATE).to(INTEGER)),
-    MONTHNAME(func(OpenSearchDataType.DATE).to(STRING)),
-    MULTIPLY(func(T(NUMBER), NUMBER).to(NUMBER)),
-    NOW(func().to(OpenSearchDataType.DATE)),
-    PI(func().to(DOUBLE)),
-    POW(
-            func(T(NUMBER)).to(T),
-            func(T(NUMBER), NUMBER).to(T)
-    ),
-    POWER(
-        func(T(NUMBER)).to(T),
-        func(T(NUMBER), NUMBER).to(T)
-    ),
-    RADIANS(func(T(NUMBER)).to(DOUBLE)),
-    RAND(
-            func().to(NUMBER),
-            func(T(NUMBER)).to(T)
-    ),
-    REPLACE(func(T(STRING), STRING, STRING).to(T)),
-    RIGHT(func(T(STRING), INTEGER).to(T)),
-    RINT(func(T(NUMBER)).to(T)),
-    ROUND(func(T(NUMBER)).to(T)),
-    RTRIM(func(T(STRING)).to(T)),
-    SIGN(func(T(NUMBER)).to(T)),
-    SIGNUM(func(T(NUMBER)).to(T)),
-    SIN(func(T(NUMBER)).to(DOUBLE)),
-    SINH(func(T(NUMBER)).to(DOUBLE)),
-    SQRT(func(T(NUMBER)).to(T)),
-    SUBSTRING(func(T(STRING), INTEGER, INTEGER).to(T)),
-    SUBTRACT(func(T(NUMBER), NUMBER).to(T)),
-    TAN(func(T(NUMBER)).to(DOUBLE)),
-    TIMESTAMP(func(OpenSearchDataType.DATE).to(OpenSearchDataType.DATE)),
-    TRIM(func(T(STRING)).to(T)),
-    UPPER(
-        func(T(STRING)).to(T),
-        func(T(STRING), STRING).to(T)
-    ),
-    YEAR(func(OpenSearchDataType.DATE).to(INTEGER));
-
-    private final TypeExpressionSpec[] specifications;
+  private final TypeExpressionSpec[] specifications;
 
-    ScalarFunction(TypeExpressionSpec... specifications) {
-        this.specifications = specifications;
-    }
+  ScalarFunction(TypeExpressionSpec... specifications) {
+    this.specifications = specifications;
+  }
 
-    @Override
-    public String getName() {
-        return name();
-    }
+  @Override
+  public String getName() {
+    return name();
+  }
 
-    @Override
-    public TypeExpressionSpec[] specifications() {
-        return specifications;
-    }
+  @Override
+  public TypeExpressionSpec[] specifications() {
+    return specifications;
+  }
 
-    private static TypeExpressionSpec func(Type... argTypes) {
-        return new TypeExpressionSpec().map(argTypes);
-    }
+  private static TypeExpressionSpec func(Type... argTypes) {
+    return new TypeExpressionSpec().map(argTypes);
+  }
 
-    @Override
-    public String toString() {
-        return "Function [" + name() + "]";
-    }
+  @Override
+  public String toString() {
+    return "Function [" + name() + "]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/ComparisonOperator.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/ComparisonOperator.java
index 993d996df3..19e8f85aa3 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/ComparisonOperator.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/ComparisonOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types.operator;
 
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.BOOLEAN;
@@ -12,53 +11,50 @@
 import java.util.List;
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 
-/**
- * Type for comparison operator
- */
+/** Type for comparison operator */
 public enum ComparisonOperator implements Type {
-
-    EQUAL("="),
-    NOT_EQUAL("<>"),
-    NOT_EQUAL2("!="),
-    GREATER_THAN(">"),
-    GREATER_THAN_OR_EQUAL_TO(">="),
-    SMALLER_THAN("<"),
-    SMALLER_THAN_OR_EQUAL_TO("<="),
-    IS("IS");
-
-    /** Actual name representing the operator */
-    private final String name;
-
-    ComparisonOperator(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public Type construct(List<Type> actualArgs) {
-        if (actualArgs.size() != 2) {
-            return TYPE_ERROR;
-        }
-
-        Type leftType = actualArgs.get(0);
-        Type rightType = actualArgs.get(1);
-        if (leftType.isCompatible(rightType) || rightType.isCompatible(leftType)) {
-            return BOOLEAN;
-        }
-        return TYPE_ERROR;
-    }
-
-    @Override
-    public String usage() {
-        return "Please use compatible types from each side.";
+  EQUAL("="),
+  NOT_EQUAL("<>"),
+  NOT_EQUAL2("!="),
+  GREATER_THAN(">"),
+  GREATER_THAN_OR_EQUAL_TO(">="),
+  SMALLER_THAN("<"),
+  SMALLER_THAN_OR_EQUAL_TO("<="),
+  IS("IS");
+
+  /** Actual name representing the operator */
+  private final String name;
+
+  ComparisonOperator(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public Type construct(List<Type> actualArgs) {
+    if (actualArgs.size() != 2) {
+      return TYPE_ERROR;
     }
 
-    @Override
-    public String toString() {
-        return "Operator [" + getName() + "]";
+    Type leftType = actualArgs.get(0);
+    Type rightType = actualArgs.get(1);
+    if (leftType.isCompatible(rightType) || rightType.isCompatible(leftType)) {
+      return BOOLEAN;
     }
+    return TYPE_ERROR;
+  }
+
+  @Override
+  public String usage() {
+    return "Please use compatible types from each side.";
+  }
+
+  @Override
+  public String toString() {
+    return "Operator [" + getName() + "]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/JoinOperator.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/JoinOperator.java
index 75bc306cd9..02decab1ae 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/JoinOperator.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/JoinOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types.operator;
 
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.TYPE_ERROR;
@@ -13,35 +12,32 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 import org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchIndex;
 
-/**
- * Join operator
- */
+/** Join operator */
 public enum JoinOperator implements Type {
-    JOIN;
-
-    @Override
-    public String getName() {
-        return name();
-    }
-
-    @Override
-    public Type construct(List<Type> others) {
-        Optional<Type> isAnyNonIndexType = others.stream().
-                                                  filter(type -> !(type instanceof OpenSearchIndex)).
-                                                  findAny();
-        if (isAnyNonIndexType.isPresent()) {
-            return TYPE_ERROR;
-        }
-        return others.get(0);
-    }
-
-    @Override
-    public String usage() {
-        return "Please join index with other index or its nested field.";
-    }
-
-    @Override
-    public String toString() {
-        return "Operator [" + getName() + "]";
+  JOIN;
+
+  @Override
+  public String getName() {
+    return name();
+  }
+
+  @Override
+  public Type construct(List<Type> others) {
+    Optional<Type> isAnyNonIndexType =
+        others.stream().filter(type -> !(type instanceof OpenSearchIndex)).findAny();
+    if (isAnyNonIndexType.isPresent()) {
+      return TYPE_ERROR;
     }
+    return others.get(0);
+  }
+
+  @Override
+  public String usage() {
+    return "Please join index with other index or its nested field.";
+  }
+
+  @Override
+  public String toString() {
+    return "Operator [" + getName() + "]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/SetOperator.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/SetOperator.java
index 988c9856e3..e8a80cd821 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/SetOperator.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/operator/SetOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types.operator;
 
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.TYPE_ERROR;
@@ -11,45 +10,43 @@
 import java.util.List;
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 
-/**
- * Set operator between queries.
- */
+/** Set operator between queries. */
 public enum SetOperator implements Type {
-    UNION,
-    MINUS,
-    IN;
-
-    @Override
-    public String getName() {
-        return name();
+  UNION,
+  MINUS,
+  IN;
+
+  @Override
+  public String getName() {
+    return name();
+  }
+
+  @Override
+  public Type construct(List<Type> others) {
+    if (others.size() < 2) {
+      throw new IllegalStateException("");
     }
 
-    @Override
-    public Type construct(List<Type> others) {
-        if (others.size() < 2) {
-            throw new IllegalStateException("");
-        }
-
-        // Compare each type and return anyone for now if pass
-        for (int i = 0; i < others.size() - 1; i++) {
-            Type type1 = others.get(i);
-            Type type2 = others.get(i + 1);
-
-            // Do it again as in Product because single base type won't be wrapped in Product
-            if (!type1.isCompatible(type2) && !type2.isCompatible(type1)) {
-                return TYPE_ERROR;
-            }
-        }
-        return others.get(0);
-    }
-
-    @Override
-    public String usage() {
-        return "Please return field(s) of compatible type from each query.";
-    }
+    // Compare each type and return anyone for now if pass
+    for (int i = 0; i < others.size() - 1; i++) {
+      Type type1 = others.get(i);
+      Type type2 = others.get(i + 1);
 
-    @Override
-    public String toString() {
-        return "Operator [" + getName() + "]";
+      // Do it again as in Product because single base type won't be wrapped in Product
+      if (!type1.isCompatible(type2) && !type2.isCompatible(type1)) {
+        return TYPE_ERROR;
+      }
     }
+    return others.get(0);
+  }
+
+  @Override
+  public String usage() {
+    return "Please return field(s) of compatible type from each query.";
+  }
+
+  @Override
+  public String toString() {
+    return "Operator [" + getName() + "]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/special/Generic.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/special/Generic.java
index 7efdb55426..ad718a8256 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/special/Generic.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/special/Generic.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types.special;
 
 import java.util.Arrays;
@@ -12,79 +11,84 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-/**
- * Generic type for more precise type expression
- */
+/** Generic type for more precise type expression */
 public class Generic implements Type {
 
-    /** Generic type placeholder namespace */
-    private enum Name { T }
-
-    /** Construct function to find generic type in argument list with same name */
-    public static final Function<Type[], Type> T = types -> findSameGenericType(Name.T, types);
-
-    /** Generic type name */
-    private final Name name;
-
-    /** Actual type binding to current generic type */
-    private final Type binding;
-
-    public Generic(Name name, Type type) {
-        this.name = name;
-        this.binding = type;
-    }
-
-    public static Type T(Type type) {
-        return new Generic(Name.T, type);
-    }
-
-    /**
-     * Return a function for replacing generic type in argument list with binding type.
-     * Ex. after T instance found in argument list [T(NUMBER), STRING], create function to return actualTypes[0]
-     *
-     * @param func              function for finding generic type in argument list (namely, function T above)
-     * @param actualArgTypes    actual argument types
-     */
-    public static Function<Type[], Type> specialize(Function<Type[], Type> func,
-                                                    Type[] actualArgTypes) {
-        if (func != T) {
-            return func;
-        }
-
-        Type genericType = func.apply(actualArgTypes);
-        int genericTypeIndex = Arrays.asList(actualArgTypes).indexOf(genericType);
-        return actualTypes -> actualTypes[genericTypeIndex];
+  /** Generic type placeholder namespace */
+  private enum Name {
+    T
+  }
+
+  /** Construct function to find generic type in argument list with same name */
+  public static final Function<Type[], Type> T = types -> findSameGenericType(Name.T, types);
+
+  /** Generic type name */
+  private final Name name;
+
+  /** Actual type binding to current generic type */
+  private final Type binding;
+
+  public Generic(Name name, Type type) {
+    this.name = name;
+    this.binding = type;
+  }
+
+  public static Type T(Type type) {
+    return new Generic(Name.T, type);
+  }
+
+  /**
+   * Return a function for replacing generic type in argument list with binding type. Ex. after T
+   * instance found in argument list [T(NUMBER), STRING], create function to return actualTypes[0]
+   *
+   * @param func function for finding generic type in argument list (namely, function T above)
+   * @param actualArgTypes actual argument types
+   */
+  public static Function<Type[], Type> specialize(
+      Function<Type[], Type> func, Type[] actualArgTypes) {
+    if (func != T) {
+      return func;
     }
 
-    /** Find placeholder in argument list, ex. in [T(NUMBER), STRING] -> T, return instance at first T */
-    private static Type findSameGenericType(Name name, Type[] types) {
-        return Arrays.stream(types).
-                      filter(type -> type instanceof Generic).
-                      filter(type -> ((Generic) type).name == name).
-                      findFirst().
-                      orElseThrow(() -> new IllegalStateException(StringUtils.format(
-                          "Type definition is wrong. Could not unbind generic type [%s] in type list %s.",
-                            name, types))
-                      );
-    }
-
-    @Override
-    public String getName() {
-        return this.name.name();
-    }
-
-    @Override
-    public boolean isCompatible(Type other) {
-        return binding.isCompatible(other);
-    }
-
-    @Override
-    public Type construct(List<Type> others) {
-        return binding.construct(others);
-    }
-
-    @Override
-    public String usage() {
-        return binding.usage() + " " + name;
-    }
+    Type genericType = func.apply(actualArgTypes);
+    int genericTypeIndex = Arrays.asList(actualArgTypes).indexOf(genericType);
+    return actualTypes -> actualTypes[genericTypeIndex];
+  }
+
+  /**
+   * Find placeholder in argument list, ex. in [T(NUMBER), STRING] -> T, return instance at first T
+   */
+  private static Type findSameGenericType(Name name, Type[] types) {
+    return Arrays.stream(types)
+        .filter(type -> type instanceof Generic)
+        .filter(type -> ((Generic) type).name == name)
+        .findFirst()
+        .orElseThrow(
+            () ->
+                new IllegalStateException(
+                    StringUtils.format(
+                        "Type definition is wrong. Could not unbind generic type [%s] in type list"
+                            + " %s.",
+                        name, types)));
+  }
+
+  @Override
+  public String getName() {
+    return this.name.name();
+  }
+
+  @Override
+  public boolean isCompatible(Type other) {
+    return binding.isCompatible(other);
+  }
+
+  @Override
+  public Type construct(List<Type> others) {
+    return binding.construct(others);
+  }
+
+  @Override
+  public String usage() {
+    return binding.usage() + " " + name;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/special/Product.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/special/Product.java
index ad4d86895b..98f04dc629 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/special/Product.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/types/special/Product.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types.special;
 
 import java.util.Collections;
@@ -12,62 +11,56 @@
 import lombok.Getter;
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 
-/**
- * Combination of multiple types, ex. function arguments
- */
+/** Combination of multiple types, ex. function arguments */
 public class Product implements Type {
 
-    @Getter
-    private final List<Type> types;
+  @Getter private final List<Type> types;
 
-    public Product(List<Type> itemTypes) {
-        types = Collections.unmodifiableList(itemTypes);
-    }
+  public Product(List<Type> itemTypes) {
+    types = Collections.unmodifiableList(itemTypes);
+  }
 
-    @Override
-    public String getName() {
-        return "Product of types " + types;
-    }
+  @Override
+  public String getName() {
+    return "Product of types " + types;
+  }
 
-    @Override
-    public boolean isCompatible(Type other) {
-        if (!(other instanceof Product)) {
-            return false;
-        }
-
-        Product otherProd = (Product) other;
-        if (types.size() != otherProd.types.size()) {
-            return false;
-        }
-
-        for (int i = 0; i < types.size(); i++) {
-            Type type = types.get(i);
-            Type otherType = otherProd.types.get(i);
-            if (!isCompatibleEitherWay(type, otherType)) {
-                return false;
-            }
-        }
-        return true;
+  @Override
+  public boolean isCompatible(Type other) {
+    if (!(other instanceof Product)) {
+      return false;
     }
 
-    @Override
-    public Type construct(List<Type> others) {
-        return this;
+    Product otherProd = (Product) other;
+    if (types.size() != otherProd.types.size()) {
+      return false;
     }
 
-    @Override
-    public String usage() {
-        if (types.isEmpty()) {
-            return "(*)";
-        }
-        return types.stream().
-                     map(Type::usage).
-                     collect(Collectors.joining(", ", "(", ")"));
+    for (int i = 0; i < types.size(); i++) {
+      Type type = types.get(i);
+      Type otherType = otherProd.types.get(i);
+      if (!isCompatibleEitherWay(type, otherType)) {
+        return false;
+      }
     }
+    return true;
+  }
+
+  @Override
+  public Type construct(List<Type> others) {
+    return this;
+  }
 
-    /** Perform two-way compatibility check here which is different from normal type expression */
-    private boolean isCompatibleEitherWay(Type type1, Type type2) {
-        return type1.isCompatible(type2) || type2.isCompatible(type1);
+  @Override
+  public String usage() {
+    if (types.isEmpty()) {
+      return "(*)";
     }
+    return types.stream().map(Type::usage).collect(Collectors.joining(", ", "(", ")"));
+  }
 
+  /** Perform two-way compatibility check here which is different from normal type expression */
+  private boolean isCompatibleEitherWay(Type type1, Type type2) {
+    return type1.isCompatible(type2) || type2.isCompatible(type1);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/OpenSearchMappingLoader.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/OpenSearchMappingLoader.java
index 7bfca0a015..4d009dc438 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/OpenSearchMappingLoader.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/OpenSearchMappingLoader.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.visitor;
 
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchIndex.IndexType.INDEX;
@@ -12,7 +11,6 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 import org.opensearch.sql.legacy.antlr.semantic.scope.Environment;
 import org.opensearch.sql.legacy.antlr.semantic.scope.Namespace;
 import org.opensearch.sql.legacy.antlr.semantic.scope.SemanticContext;
@@ -27,178 +25,181 @@
 import org.opensearch.sql.legacy.esdomain.mapping.IndexMappings;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-/**
- * Load index and nested field mapping into semantic context
- */
+/** Load index and nested field mapping into semantic context */
 public class OpenSearchMappingLoader implements GenericSqlParseTreeVisitor<Type> {
 
-    /** Semantic context shared in the semantic analysis process */
-    private final SemanticContext context;
-
-    /** Local cluster state for mapping query */
-    private final LocalClusterState clusterState;
-
-    /** Threshold to decide if continue the analysis */
-    private final int threshold;
-
-    public OpenSearchMappingLoader(SemanticContext context, LocalClusterState clusterState, int threshold) {
-        this.context = context;
-        this.clusterState = clusterState;
-        this.threshold = threshold;
-    }
-
-    /*
-     * Suppose index 'accounts' includes 'name', 'age' and nested field 'projects'
-     *  which includes 'name' and 'active'.
-     *
-     *  1. Define itself:
-     *      ----- new definitions -----
-     *      accounts -> INDEX
-     *
-     *  2. Define without alias no matter if alias given:
-     *      'accounts' -> INDEX
-     *      ----- new definitions -----
-     *      'name' -> TEXT
-     *      'age' -> INTEGER
-     *      'projects' -> NESTED
-     *      'projects.name' -> KEYWORD
-     *      'projects.active' -> BOOLEAN
-     */
-    @Override
-    public Type visitIndexName(String indexName) {
-        if (isNotNested(indexName)) {
-            defineIndexType(indexName);
-            loadAllFieldsWithType(indexName);
-        }
-        return defaultValue();
-    }
-
-    @Override
-    public void visitAs(String alias, Type type) {
-        if (!(type instanceof OpenSearchIndex)) {
-            return;
-        }
-
-        OpenSearchIndex index = (OpenSearchIndex) type;
-        String indexName = type.getName();
-
-        if (index.type() == INDEX) {
-            String aliasName = alias.isEmpty() ? indexName : alias;
-            defineAllFieldNamesByAppendingAliasPrefix(indexName, aliasName);
-        } else if (index.type() == NESTED_FIELD) {
-            if (!alias.isEmpty()) {
-                defineNestedFieldNamesByReplacingWithAlias(indexName, alias);
-            }
-        } // else Do nothing for index pattern
-    }
-
-    private void defineIndexType(String indexName) {
-        environment().define(new Symbol(Namespace.FIELD_NAME, indexName), new OpenSearchIndex(indexName, INDEX));
-    }
-
-    private void loadAllFieldsWithType(String indexName) {
-        Set<FieldMappings> mappings = getFieldMappings(indexName);
-        mappings.forEach(mapping -> mapping.flat(this::defineFieldName));
-    }
-
-    /*
-     *  3.1 Define with alias if given: ex."SELECT * FROM accounts a".
-     *      'accounts' -> INDEX
-     *      'name' -> TEXT
-     *      'age' -> INTEGER
-     *      'projects' -> NESTED
-     *      'projects.name' -> KEYWORD
-     *      'projects.active' -> BOOLEAN
-     *      ----- new definitions -----
-     *      ['a' -> INDEX]  -- this is done in semantic analyzer
-     *      'a.name' -> TEXT
-     *      'a.age' -> INTEGER
-     *      'a.projects' -> NESTED
-     *      'a.projects.name' -> KEYWORD
-     *      'a.projects.active' -> BOOLEAN
-     *
-     *  3.2 Otherwise define by index full name: ex."SELECT * FROM account"
-     *      'accounts' -> INDEX
-     *      'name' -> TEXT
-     *      'age' -> INTEGER
-     *      'projects' -> NESTED
-     *      'projects.name' -> KEYWORD
-     *      'projects.active' -> BOOLEAN
-     *      ----- new definitions -----
-     *      'accounts.name' -> TEXT
-     *      'accounts.age' -> INTEGER
-     *      'accounts.projects' -> NESTED
-     *      'accounts.projects.name' -> KEYWORD
-     *      'accounts.projects.active' -> BOOLEAN
-     */
-    private void defineAllFieldNamesByAppendingAliasPrefix(String indexName, String alias) {
-        Set<FieldMappings> mappings = getFieldMappings(indexName);
-        mappings.stream().forEach(mapping -> mapping.flat((fieldName, type) ->
-                defineFieldName(alias + "." + fieldName, type)));
+  /** Semantic context shared in the semantic analysis process */
+  private final SemanticContext context;
+
+  /** Local cluster state for mapping query */
+  private final LocalClusterState clusterState;
+
+  /** Threshold to decide if continue the analysis */
+  private final int threshold;
+
+  public OpenSearchMappingLoader(
+      SemanticContext context, LocalClusterState clusterState, int threshold) {
+    this.context = context;
+    this.clusterState = clusterState;
+    this.threshold = threshold;
+  }
+
+  /*
+   * Suppose index 'accounts' includes 'name', 'age' and nested field 'projects'
+   *  which includes 'name' and 'active'.
+   *
+   *  1. Define itself:
+   *      ----- new definitions -----
+   *      accounts -> INDEX
+   *
+   *  2. Define without alias no matter if alias given:
+   *      'accounts' -> INDEX
+   *      ----- new definitions -----
+   *      'name' -> TEXT
+   *      'age' -> INTEGER
+   *      'projects' -> NESTED
+   *      'projects.name' -> KEYWORD
+   *      'projects.active' -> BOOLEAN
+   */
+  @Override
+  public Type visitIndexName(String indexName) {
+    if (isNotNested(indexName)) {
+      defineIndexType(indexName);
+      loadAllFieldsWithType(indexName);
     }
+    return defaultValue();
+  }
 
-    /*
-     *  3.3 Define with alias if given: ex."SELECT * FROM accounts a, a.project p"
-     *      'accounts' -> INDEX
-     *      'name' -> TEXT
-     *      'age' -> INTEGER
-     *      'projects' -> NESTED
-     *      'projects.name' -> KEYWORD
-     *      'projects.active' -> BOOLEAN
-     *      'a.name' -> TEXT
-     *      'a.age' -> INTEGER
-     *      'a.projects' -> NESTED
-     *      'a.projects.name' -> KEYWORD
-     *      'a.projects.active' -> BOOLEAN
-     *      ----- new definitions -----
-     *      ['p' -> NESTED] -- this is done in semantic analyzer
-     *      'p.name' -> KEYWORD
-     *      'p.active' -> BOOLEAN
-     */
-    private void defineNestedFieldNamesByReplacingWithAlias(String nestedFieldName, String alias) {
-        Map<String, Type> typeByFullName = environment().resolveByPrefix(
-            new Symbol(Namespace.FIELD_NAME, nestedFieldName));
-        typeByFullName.forEach(
-            (fieldName, fieldType) -> defineFieldName(fieldName.replace(nestedFieldName, alias), fieldType)
-        );
+  @Override
+  public void visitAs(String alias, Type type) {
+    if (!(type instanceof OpenSearchIndex)) {
+      return;
     }
 
-    /**
-     * Check if index name is NOT nested, for example. return true for index 'accounts' or '.opensearch_dashboards'
-     *  but return false for nested field name 'a.projects'.
-     */
-    private boolean isNotNested(String indexName) {
-        return indexName.indexOf('.', 1) == -1; // taking care of .opensearch_dashboards
+    OpenSearchIndex index = (OpenSearchIndex) type;
+    String indexName = type.getName();
+
+    if (index.type() == INDEX) {
+      String aliasName = alias.isEmpty() ? indexName : alias;
+      defineAllFieldNamesByAppendingAliasPrefix(indexName, aliasName);
+    } else if (index.type() == NESTED_FIELD) {
+      if (!alias.isEmpty()) {
+        defineNestedFieldNamesByReplacingWithAlias(indexName, alias);
+      }
+    } // else Do nothing for index pattern
+  }
+
+  private void defineIndexType(String indexName) {
+    environment()
+        .define(new Symbol(Namespace.FIELD_NAME, indexName), new OpenSearchIndex(indexName, INDEX));
+  }
+
+  private void loadAllFieldsWithType(String indexName) {
+    Set<FieldMappings> mappings = getFieldMappings(indexName);
+    mappings.forEach(mapping -> mapping.flat(this::defineFieldName));
+  }
+
+  /*
+   *  3.1 Define with alias if given: ex."SELECT * FROM accounts a".
+   *      'accounts' -> INDEX
+   *      'name' -> TEXT
+   *      'age' -> INTEGER
+   *      'projects' -> NESTED
+   *      'projects.name' -> KEYWORD
+   *      'projects.active' -> BOOLEAN
+   *      ----- new definitions -----
+   *      ['a' -> INDEX]  -- this is done in semantic analyzer
+   *      'a.name' -> TEXT
+   *      'a.age' -> INTEGER
+   *      'a.projects' -> NESTED
+   *      'a.projects.name' -> KEYWORD
+   *      'a.projects.active' -> BOOLEAN
+   *
+   *  3.2 Otherwise define by index full name: ex."SELECT * FROM account"
+   *      'accounts' -> INDEX
+   *      'name' -> TEXT
+   *      'age' -> INTEGER
+   *      'projects' -> NESTED
+   *      'projects.name' -> KEYWORD
+   *      'projects.active' -> BOOLEAN
+   *      ----- new definitions -----
+   *      'accounts.name' -> TEXT
+   *      'accounts.age' -> INTEGER
+   *      'accounts.projects' -> NESTED
+   *      'accounts.projects.name' -> KEYWORD
+   *      'accounts.projects.active' -> BOOLEAN
+   */
+  private void defineAllFieldNamesByAppendingAliasPrefix(String indexName, String alias) {
+    Set<FieldMappings> mappings = getFieldMappings(indexName);
+    mappings.stream()
+        .forEach(
+            mapping ->
+                mapping.flat((fieldName, type) -> defineFieldName(alias + "." + fieldName, type)));
+  }
+
+  /*
+   *  3.3 Define with alias if given: ex."SELECT * FROM accounts a, a.project p"
+   *      'accounts' -> INDEX
+   *      'name' -> TEXT
+   *      'age' -> INTEGER
+   *      'projects' -> NESTED
+   *      'projects.name' -> KEYWORD
+   *      'projects.active' -> BOOLEAN
+   *      'a.name' -> TEXT
+   *      'a.age' -> INTEGER
+   *      'a.projects' -> NESTED
+   *      'a.projects.name' -> KEYWORD
+   *      'a.projects.active' -> BOOLEAN
+   *      ----- new definitions -----
+   *      ['p' -> NESTED] -- this is done in semantic analyzer
+   *      'p.name' -> KEYWORD
+   *      'p.active' -> BOOLEAN
+   */
+  private void defineNestedFieldNamesByReplacingWithAlias(String nestedFieldName, String alias) {
+    Map<String, Type> typeByFullName =
+        environment().resolveByPrefix(new Symbol(Namespace.FIELD_NAME, nestedFieldName));
+    typeByFullName.forEach(
+        (fieldName, fieldType) ->
+            defineFieldName(fieldName.replace(nestedFieldName, alias), fieldType));
+  }
+
+  /**
+   * Check if index name is NOT nested, for example. return true for index 'accounts' or
+   * '.opensearch_dashboards' but return false for nested field name 'a.projects'.
+   */
+  private boolean isNotNested(String indexName) {
+    return indexName.indexOf('.', 1) == -1; // taking care of .opensearch_dashboards
+  }
+
+  private Set<FieldMappings> getFieldMappings(String indexName) {
+    IndexMappings indexMappings = clusterState.getFieldMappings(new String[] {indexName});
+    Set<FieldMappings> fieldMappingsSet = new HashSet<>(indexMappings.allMappings());
+
+    for (FieldMappings fieldMappings : fieldMappingsSet) {
+      int size = fieldMappings.data().size();
+      if (size > threshold) {
+        throw new EarlyExitAnalysisException(
+            StringUtils.format(
+                "Index [%s] has [%d] fields more than threshold [%d]", indexName, size, threshold));
+      }
     }
-
-    private Set<FieldMappings> getFieldMappings(String indexName) {
-        IndexMappings indexMappings = clusterState.getFieldMappings(new String[]{indexName});
-        Set<FieldMappings> fieldMappingsSet = new HashSet<>(indexMappings.allMappings());
-
-        for (FieldMappings fieldMappings : fieldMappingsSet) {
-            int size = fieldMappings.data().size();
-            if (size > threshold) {
-                throw new EarlyExitAnalysisException(StringUtils.format(
-                        "Index [%s] has [%d] fields more than threshold [%d]", indexName, size, threshold));
-            }
-        }
-        return fieldMappingsSet;
+    return fieldMappingsSet;
+  }
+
+  private void defineFieldName(String fieldName, String type) {
+    if ("NESTED".equalsIgnoreCase(type)) {
+      defineFieldName(fieldName, new OpenSearchIndex(fieldName, NESTED_FIELD));
+    } else {
+      defineFieldName(fieldName, OpenSearchDataType.typeOf(type));
     }
+  }
 
-    private void defineFieldName(String fieldName, String type) {
-        if ("NESTED".equalsIgnoreCase(type)) {
-            defineFieldName(fieldName, new OpenSearchIndex(fieldName, NESTED_FIELD));
-        } else {
-            defineFieldName(fieldName, OpenSearchDataType.typeOf(type));
-        }
-    }
+  private void defineFieldName(String fieldName, Type type) {
+    Symbol symbol = new Symbol(Namespace.FIELD_NAME, fieldName);
+    environment().define(symbol, type);
+  }
 
-    private void defineFieldName(String fieldName, Type type) {
-        Symbol symbol = new Symbol(Namespace.FIELD_NAME, fieldName);
-        environment().define(symbol, type);
-    }
-
-    private Environment environment() {
-        return context.peek();
-    }
+  private Environment environment() {
+    return context.peek();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/SemanticAnalyzer.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/SemanticAnalyzer.java
index 32bad91737..0655062be3 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/SemanticAnalyzer.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/SemanticAnalyzer.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.visitor;
 
 import static org.opensearch.sql.legacy.utils.StringUtils.unquoteFullColumn;
@@ -13,125 +12,123 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 import org.opensearch.sql.legacy.antlr.visitor.GenericSqlParseTreeVisitor;
 
-/**
- * Main visitor implementation to drive the entire semantic analysis.
- */
+/** Main visitor implementation to drive the entire semantic analysis. */
 public class SemanticAnalyzer implements GenericSqlParseTreeVisitor<Type> {
 
-    private final OpenSearchMappingLoader mappingLoader;
-
-    private final TypeChecker typeChecker;
-
-    public SemanticAnalyzer(OpenSearchMappingLoader mappingLoader, TypeChecker typeChecker) {
-        this.mappingLoader = mappingLoader;
-        this.typeChecker = typeChecker;
-    }
-
-    @Override
-    public void visitRoot() {
-        mappingLoader.visitRoot();
-        typeChecker.visitRoot();
-    }
-
-    @Override
-    public void visitQuery() {
-        mappingLoader.visitQuery();
-        typeChecker.visitQuery();
-    }
-
-    @Override
-    public void endVisitQuery() {
-        mappingLoader.endVisitQuery();
-        typeChecker.endVisitQuery();
-    }
-
-    @Override
-    public Type visitSelect(List<Type> itemTypes) {
-        mappingLoader.visitSelect(itemTypes);
-        return typeChecker.visitSelect(itemTypes);
-    }
-
-    @Override
-    public Type visitSelectAllColumn() {
-        mappingLoader.visitSelectAllColumn();
-        return typeChecker.visitSelectAllColumn();
-    }
-
-    @Override
-    public void visitAs(String alias, Type type) {
-        mappingLoader.visitAs(unquoteSingleField(alias), type);
-        typeChecker.visitAs(unquoteSingleField(alias), type);
-    }
-
-    @Override
-    public Type visitIndexName(String indexName) {
-        mappingLoader.visitIndexName(unquoteSingleField(indexName));
-        return typeChecker.visitIndexName(unquoteSingleField(indexName));
-    }
-
-    @Override
-    public Type visitFieldName(String fieldName) {
-        mappingLoader.visitFieldName(unquoteFullColumn(fieldName));
-        return typeChecker.visitFieldName(unquoteFullColumn(fieldName));
-    }
-
-    @Override
-    public Type visitFunctionName(String funcName) {
-        mappingLoader.visitFunctionName(funcName);
-        return typeChecker.visitFunctionName(funcName);
-    }
-
-    @Override
-    public Type visitOperator(String opName) {
-        mappingLoader.visitOperator(opName);
-        return typeChecker.visitOperator(opName);
-    }
-
-    @Override
-    public Type visitString(String text) {
-        mappingLoader.visitString(text);
-        return typeChecker.visitString(text);
-    }
-
-    @Override
-    public Type visitInteger(String text) {
-        mappingLoader.visitInteger(text);
-        return typeChecker.visitInteger(text);
-    }
-
-    @Override
-    public Type visitFloat(String text) {
-        mappingLoader.visitFloat(text);
-        return typeChecker.visitFloat(text);
-    }
-
-    @Override
-    public Type visitBoolean(String text) {
-        mappingLoader.visitBoolean(text);
-        return typeChecker.visitBoolean(text);
-    }
-
-    @Override
-    public Type visitDate(String text) {
-        mappingLoader.visitDate(text);
-        return typeChecker.visitDate(text);
-    }
-
-    @Override
-    public Type visitNull() {
-        mappingLoader.visitNull();
-        return typeChecker.visitNull();
-    }
-
-    @Override
-    public Type visitConvertedType(String text) {
-        mappingLoader.visitConvertedType(text);
-        return typeChecker.visitConvertedType(text);
-    }
-
-    @Override
-    public Type defaultValue() {
-        mappingLoader.defaultValue();
-        return typeChecker.defaultValue();
-    }
+  private final OpenSearchMappingLoader mappingLoader;
+
+  private final TypeChecker typeChecker;
+
+  public SemanticAnalyzer(OpenSearchMappingLoader mappingLoader, TypeChecker typeChecker) {
+    this.mappingLoader = mappingLoader;
+    this.typeChecker = typeChecker;
+  }
+
+  @Override
+  public void visitRoot() {
+    mappingLoader.visitRoot();
+    typeChecker.visitRoot();
+  }
+
+  @Override
+  public void visitQuery() {
+    mappingLoader.visitQuery();
+    typeChecker.visitQuery();
+  }
+
+  @Override
+  public void endVisitQuery() {
+    mappingLoader.endVisitQuery();
+    typeChecker.endVisitQuery();
+  }
+
+  @Override
+  public Type visitSelect(List<Type> itemTypes) {
+    mappingLoader.visitSelect(itemTypes);
+    return typeChecker.visitSelect(itemTypes);
+  }
+
+  @Override
+  public Type visitSelectAllColumn() {
+    mappingLoader.visitSelectAllColumn();
+    return typeChecker.visitSelectAllColumn();
+  }
+
+  @Override
+  public void visitAs(String alias, Type type) {
+    mappingLoader.visitAs(unquoteSingleField(alias), type);
+    typeChecker.visitAs(unquoteSingleField(alias), type);
+  }
+
+  @Override
+  public Type visitIndexName(String indexName) {
+    mappingLoader.visitIndexName(unquoteSingleField(indexName));
+    return typeChecker.visitIndexName(unquoteSingleField(indexName));
+  }
+
+  @Override
+  public Type visitFieldName(String fieldName) {
+    mappingLoader.visitFieldName(unquoteFullColumn(fieldName));
+    return typeChecker.visitFieldName(unquoteFullColumn(fieldName));
+  }
+
+  @Override
+  public Type visitFunctionName(String funcName) {
+    mappingLoader.visitFunctionName(funcName);
+    return typeChecker.visitFunctionName(funcName);
+  }
+
+  @Override
+  public Type visitOperator(String opName) {
+    mappingLoader.visitOperator(opName);
+    return typeChecker.visitOperator(opName);
+  }
+
+  @Override
+  public Type visitString(String text) {
+    mappingLoader.visitString(text);
+    return typeChecker.visitString(text);
+  }
+
+  @Override
+  public Type visitInteger(String text) {
+    mappingLoader.visitInteger(text);
+    return typeChecker.visitInteger(text);
+  }
+
+  @Override
+  public Type visitFloat(String text) {
+    mappingLoader.visitFloat(text);
+    return typeChecker.visitFloat(text);
+  }
+
+  @Override
+  public Type visitBoolean(String text) {
+    mappingLoader.visitBoolean(text);
+    return typeChecker.visitBoolean(text);
+  }
+
+  @Override
+  public Type visitDate(String text) {
+    mappingLoader.visitDate(text);
+    return typeChecker.visitDate(text);
+  }
+
+  @Override
+  public Type visitNull() {
+    mappingLoader.visitNull();
+    return typeChecker.visitNull();
+  }
+
+  @Override
+  public Type visitConvertedType(String text) {
+    mappingLoader.visitConvertedType(text);
+    return typeChecker.visitConvertedType(text);
+  }
+
+  @Override
+  public Type defaultValue() {
+    mappingLoader.defaultValue();
+    return typeChecker.defaultValue();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/TypeChecker.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/TypeChecker.java
index 59c0036575..19119c776c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/TypeChecker.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/semantic/visitor/TypeChecker.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.visitor;
 
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.UNKNOWN;
@@ -31,198 +30,196 @@
 import org.opensearch.sql.legacy.antlr.visitor.GenericSqlParseTreeVisitor;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-/**
- * SQL semantic analyzer that determines if a syntactical correct query is meaningful.
- */
+/** SQL semantic analyzer that determines if a syntactical correct query is meaningful. */
 public class TypeChecker implements GenericSqlParseTreeVisitor<Type> {
 
-    private static final Type NULL_TYPE = new Type() {
+  private static final Type NULL_TYPE =
+      new Type() {
         @Override
         public String getName() {
-            return "NULL";
+          return "NULL";
         }
 
         @Override
         public boolean isCompatible(Type other) {
-            throw new IllegalStateException("Compatibility check on NULL type with " + other);
+          throw new IllegalStateException("Compatibility check on NULL type with " + other);
         }
 
         @Override
         public Type construct(List<Type> others) {
-            throw new IllegalStateException("Construct operation on NULL type with " + others);
+          throw new IllegalStateException("Construct operation on NULL type with " + others);
         }
 
         @Override
         public String usage() {
-            throw new IllegalStateException("Usage print operation on NULL type");
-        }
-    };
-
-    /** Semantic context for symbol scope management */
-    private final SemanticContext context;
-
-    /** Should suggestion provided. Disabled by default for security concern. */
-    private final boolean isSuggestEnabled;
-
-    public TypeChecker(SemanticContext context) {
-        this.context = context;
-        this.isSuggestEnabled = false;
-    }
-
-    public TypeChecker(SemanticContext context, boolean isSuggestEnabled) {
-        this.context = context;
-        this.isSuggestEnabled = isSuggestEnabled;
-    }
-
-    @Override
-    public void visitRoot() {
-        defineFunctionNames(ScalarFunction.values());
-        defineFunctionNames(OpenSearchScalarFunction.values());
-        defineFunctionNames(AggregateFunction.values());
-        defineOperatorNames(ComparisonOperator.values());
-        defineOperatorNames(SetOperator.values());
-        defineOperatorNames(JoinOperator.values());
-    }
-
-    @Override
-    public void visitQuery() {
-        context.push();
-    }
-
-    @Override
-    public void endVisitQuery() {
-        context.pop();
-    }
-
-    @Override
-    public Type visitSelect(List<Type> itemTypes) {
-        if (itemTypes.size() == 1) {
-            return itemTypes.get(0);
-        } else if (itemTypes.size() == 0) {
-            return visitSelectAllColumn();
-        }
-        // Return product for empty (SELECT *) and #items > 1
-        return new Product(itemTypes);
-    }
-
-    @Override
-    public Type visitSelectAllColumn() {
-        return resolveAllColumn();
-    }
-
-    @Override
-    public void visitAs(String alias, Type type) {
-        defineFieldName(alias, type);
-    }
-
-    @Override
-    public Type visitIndexName(String indexName) {
-        return resolve(new Symbol(Namespace.FIELD_NAME, indexName));
-    }
-
-    @Override
-    public Type visitFieldName(String fieldName) {
-        // Bypass hidden fields which is not present in mapping, ex. _id, _type.
-        if (fieldName.startsWith("_")) {
-            return UNKNOWN;
-        }
-        // Ignore case for function/operator though field name is case sensitive
-        return resolve(new Symbol(Namespace.FIELD_NAME, fieldName));
-    }
-
-    @Override
-    public Type visitFunctionName(String funcName) {
-        return resolve(new Symbol(Namespace.FUNCTION_NAME, StringUtils.toUpper(funcName)));
-    }
-
-    @Override
-    public Type visitOperator(String opName) {
-        return resolve(new Symbol(Namespace.OPERATOR_NAME, StringUtils.toUpper(opName)));
-    }
-
-    @Override
-    public Type visitString(String text) {
-        return OpenSearchDataType.STRING;
-    }
-
-    @Override
-    public Type visitInteger(String text) {
-        return OpenSearchDataType.INTEGER;
-    }
-
-    @Override
-    public Type visitFloat(String text) {
-        return OpenSearchDataType.FLOAT;
-    }
-
-    @Override
-    public Type visitBoolean(String text) {
-        // "IS [NOT] MISSING" can be used on any data type
-        return "MISSING".equalsIgnoreCase(text) ? UNKNOWN : OpenSearchDataType.BOOLEAN;
-    }
-
-    @Override
-    public Type visitDate(String text) {
-        return OpenSearchDataType.DATE;
-    }
-
-    @Override
-    public Type visitNull() {
-        return UNKNOWN;
-    }
-
-    @Override
-    public Type visitConvertedType(String text) {
-        return OpenSearchDataType.typeOf(text);
-    }
-
-    @Override
-    public Type defaultValue() {
-        return NULL_TYPE;
-    }
-
-    private void defineFieldName(String fieldName, Type type) {
-        Symbol symbol = new Symbol(Namespace.FIELD_NAME, fieldName);
-        if (!environment().resolve(symbol).isPresent()) {
-            environment().define(symbol, type);
+          throw new IllegalStateException("Usage print operation on NULL type");
         }
-    }
-
-    private void defineFunctionNames(TypeExpression[] expressions) {
-        for (TypeExpression expr : expressions) {
-            environment().define(new Symbol(Namespace.FUNCTION_NAME, expr.getName()), expr);
-        }
-    }
-
-    private void defineOperatorNames(Type[] expressions) {
-        for (Type expr : expressions) {
-            environment().define(new Symbol(Namespace.OPERATOR_NAME, expr.getName()), expr);
-        }
-    }
-
-    private Type resolve(Symbol symbol) {
-        Optional<Type> type = environment().resolve(symbol);
-        if (type.isPresent()) {
-            return type.get();
-        }
-
-        String errorMsg = StringUtils.format("%s cannot be found or used here.", symbol);
-
-        if (isSuggestEnabled || symbol.getNamespace() != Namespace.FIELD_NAME) {
-            Set<String> allSymbolsInScope = environment().resolveAll(symbol.getNamespace()).keySet();
-            String suggestedWord = new SimilarSymbols(allSymbolsInScope).mostSimilarTo(symbol.getName());
-            errorMsg += StringUtils.format(" Did you mean [%s]?", suggestedWord);
-        }
-        throw new SemanticAnalysisException(errorMsg);
-    }
-
-    private Type resolveAllColumn() {
-        environment().resolveAll(Namespace.FIELD_NAME);
-        return new Product(ImmutableList.of());
-    }
-
-    private Environment environment() {
-        return context.peek();
-    }
-
+      };
+
+  /** Semantic context for symbol scope management */
+  private final SemanticContext context;
+
+  /** Should suggestion provided. Disabled by default for security concern. */
+  private final boolean isSuggestEnabled;
+
+  public TypeChecker(SemanticContext context) {
+    this.context = context;
+    this.isSuggestEnabled = false;
+  }
+
+  public TypeChecker(SemanticContext context, boolean isSuggestEnabled) {
+    this.context = context;
+    this.isSuggestEnabled = isSuggestEnabled;
+  }
+
+  @Override
+  public void visitRoot() {
+    defineFunctionNames(ScalarFunction.values());
+    defineFunctionNames(OpenSearchScalarFunction.values());
+    defineFunctionNames(AggregateFunction.values());
+    defineOperatorNames(ComparisonOperator.values());
+    defineOperatorNames(SetOperator.values());
+    defineOperatorNames(JoinOperator.values());
+  }
+
+  @Override
+  public void visitQuery() {
+    context.push();
+  }
+
+  @Override
+  public void endVisitQuery() {
+    context.pop();
+  }
+
+  @Override
+  public Type visitSelect(List<Type> itemTypes) {
+    if (itemTypes.size() == 1) {
+      return itemTypes.get(0);
+    } else if (itemTypes.size() == 0) {
+      return visitSelectAllColumn();
+    }
+    // Return product for empty (SELECT *) and #items > 1
+    return new Product(itemTypes);
+  }
+
+  @Override
+  public Type visitSelectAllColumn() {
+    return resolveAllColumn();
+  }
+
+  @Override
+  public void visitAs(String alias, Type type) {
+    defineFieldName(alias, type);
+  }
+
+  @Override
+  public Type visitIndexName(String indexName) {
+    return resolve(new Symbol(Namespace.FIELD_NAME, indexName));
+  }
+
+  @Override
+  public Type visitFieldName(String fieldName) {
+    // Bypass hidden fields which is not present in mapping, ex. _id, _type.
+    if (fieldName.startsWith("_")) {
+      return UNKNOWN;
+    }
+    // Ignore case for function/operator though field name is case sensitive
+    return resolve(new Symbol(Namespace.FIELD_NAME, fieldName));
+  }
+
+  @Override
+  public Type visitFunctionName(String funcName) {
+    return resolve(new Symbol(Namespace.FUNCTION_NAME, StringUtils.toUpper(funcName)));
+  }
+
+  @Override
+  public Type visitOperator(String opName) {
+    return resolve(new Symbol(Namespace.OPERATOR_NAME, StringUtils.toUpper(opName)));
+  }
+
+  @Override
+  public Type visitString(String text) {
+    return OpenSearchDataType.STRING;
+  }
+
+  @Override
+  public Type visitInteger(String text) {
+    return OpenSearchDataType.INTEGER;
+  }
+
+  @Override
+  public Type visitFloat(String text) {
+    return OpenSearchDataType.FLOAT;
+  }
+
+  @Override
+  public Type visitBoolean(String text) {
+    // "IS [NOT] MISSING" can be used on any data type
+    return "MISSING".equalsIgnoreCase(text) ? UNKNOWN : OpenSearchDataType.BOOLEAN;
+  }
+
+  @Override
+  public Type visitDate(String text) {
+    return OpenSearchDataType.DATE;
+  }
+
+  @Override
+  public Type visitNull() {
+    return UNKNOWN;
+  }
+
+  @Override
+  public Type visitConvertedType(String text) {
+    return OpenSearchDataType.typeOf(text);
+  }
+
+  @Override
+  public Type defaultValue() {
+    return NULL_TYPE;
+  }
+
+  private void defineFieldName(String fieldName, Type type) {
+    Symbol symbol = new Symbol(Namespace.FIELD_NAME, fieldName);
+    if (!environment().resolve(symbol).isPresent()) {
+      environment().define(symbol, type);
+    }
+  }
+
+  private void defineFunctionNames(TypeExpression[] expressions) {
+    for (TypeExpression expr : expressions) {
+      environment().define(new Symbol(Namespace.FUNCTION_NAME, expr.getName()), expr);
+    }
+  }
+
+  private void defineOperatorNames(Type[] expressions) {
+    for (Type expr : expressions) {
+      environment().define(new Symbol(Namespace.OPERATOR_NAME, expr.getName()), expr);
+    }
+  }
+
+  private Type resolve(Symbol symbol) {
+    Optional<Type> type = environment().resolve(symbol);
+    if (type.isPresent()) {
+      return type.get();
+    }
+
+    String errorMsg = StringUtils.format("%s cannot be found or used here.", symbol);
+
+    if (isSuggestEnabled || symbol.getNamespace() != Namespace.FIELD_NAME) {
+      Set<String> allSymbolsInScope = environment().resolveAll(symbol.getNamespace()).keySet();
+      String suggestedWord = new SimilarSymbols(allSymbolsInScope).mostSimilarTo(symbol.getName());
+      errorMsg += StringUtils.format(" Did you mean [%s]?", suggestedWord);
+    }
+    throw new SemanticAnalysisException(errorMsg);
+  }
+
+  private Type resolveAllColumn() {
+    environment().resolveAll(Namespace.FIELD_NAME);
+    return new Product(ImmutableList.of());
+  }
+
+  private Environment environment() {
+    return context.peek();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/CaseInsensitiveCharStream.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/CaseInsensitiveCharStream.java
index de7e60e9f3..c7cb212826 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/CaseInsensitiveCharStream.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/CaseInsensitiveCharStream.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.syntax;
 
 import org.antlr.v4.runtime.CharStream;
@@ -11,63 +10,64 @@
 import org.antlr.v4.runtime.misc.Interval;
 
 /**
- * Custom stream to convert character to upper case for case insensitive grammar before sending to lexer.
+ * Custom stream to convert character to upper case for case insensitive grammar before sending to
+ * lexer.
  */
 public class CaseInsensitiveCharStream implements CharStream {
 
-    /** Character stream */
-    private final CharStream charStream;
+  /** Character stream */
+  private final CharStream charStream;
 
-    public CaseInsensitiveCharStream(String sql) {
-        this.charStream = CharStreams.fromString(sql);
-    }
+  public CaseInsensitiveCharStream(String sql) {
+    this.charStream = CharStreams.fromString(sql);
+  }
 
-    @Override
-    public String getText(Interval interval) {
-        return charStream.getText(interval);
-    }
+  @Override
+  public String getText(Interval interval) {
+    return charStream.getText(interval);
+  }
 
-    @Override
-    public void consume() {
-        charStream.consume();
-    }
+  @Override
+  public void consume() {
+    charStream.consume();
+  }
 
-    @Override
-    public int LA(int i) {
-        int c = charStream.LA(i);
-        if (c <= 0) {
-            return c;
-        }
-        return Character.toUpperCase(c);
+  @Override
+  public int LA(int i) {
+    int c = charStream.LA(i);
+    if (c <= 0) {
+      return c;
     }
+    return Character.toUpperCase(c);
+  }
 
-    @Override
-    public int mark() {
-        return charStream.mark();
-    }
+  @Override
+  public int mark() {
+    return charStream.mark();
+  }
 
-    @Override
-    public void release(int marker) {
-        charStream.release(marker);
-    }
+  @Override
+  public void release(int marker) {
+    charStream.release(marker);
+  }
 
-    @Override
-    public int index() {
-        return charStream.index();
-    }
+  @Override
+  public int index() {
+    return charStream.index();
+  }
 
-    @Override
-    public void seek(int index) {
-        charStream.seek(index);
-    }
+  @Override
+  public void seek(int index) {
+    charStream.seek(index);
+  }
 
-    @Override
-    public int size() {
-        return charStream.size();
-    }
+  @Override
+  public int size() {
+    return charStream.size();
+  }
 
-    @Override
-    public String getSourceName() {
-        return charStream.getSourceName();
-    }
+  @Override
+  public String getSourceName() {
+    return charStream.getSourceName();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/SyntaxAnalysisErrorListener.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/SyntaxAnalysisErrorListener.java
index 185f2696b7..5f0c7e38d1 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/SyntaxAnalysisErrorListener.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/SyntaxAnalysisErrorListener.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.syntax;
 
 import org.antlr.v4.runtime.BaseErrorListener;
@@ -15,50 +14,53 @@
 import org.opensearch.sql.legacy.utils.StringUtils;
 
 /**
- * Syntax analysis error listener that handles any syntax error by throwing exception with useful information.
+ * Syntax analysis error listener that handles any syntax error by throwing exception with useful
+ * information.
  */
 public class SyntaxAnalysisErrorListener extends BaseErrorListener {
 
-    @Override
-    public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
-                            int line, int charPositionInLine, String msg,
-                            RecognitionException e) {
+  @Override
+  public void syntaxError(
+      Recognizer<?, ?> recognizer,
+      Object offendingSymbol,
+      int line,
+      int charPositionInLine,
+      String msg,
+      RecognitionException e) {
 
-        CommonTokenStream tokens = (CommonTokenStream) recognizer.getInputStream();
-        Token offendingToken = (Token) offendingSymbol;
-        String query = tokens.getText();
+    CommonTokenStream tokens = (CommonTokenStream) recognizer.getInputStream();
+    Token offendingToken = (Token) offendingSymbol;
+    String query = tokens.getText();
 
-        throw new SyntaxAnalysisException(
-            StringUtils.format(
-                "Failed to parse query due to offending symbol [%s] at: '%s' <--- HERE... More details: %s",
-                getOffendingText(offendingToken),
-                truncateQueryAtOffendingToken(query, offendingToken),
-                getDetails(recognizer, msg, e)
-            )
-        );
-    }
+    throw new SyntaxAnalysisException(
+        StringUtils.format(
+            "Failed to parse query due to offending symbol [%s] at: '%s' <--- HERE... More details:"
+                + " %s",
+            getOffendingText(offendingToken),
+            truncateQueryAtOffendingToken(query, offendingToken),
+            getDetails(recognizer, msg, e)));
+  }
 
-    private String getOffendingText(Token offendingToken) {
-        return offendingToken.getText();
-    }
+  private String getOffendingText(Token offendingToken) {
+    return offendingToken.getText();
+  }
 
-    private String truncateQueryAtOffendingToken(String query, Token offendingToken) {
-        return query.substring(0, offendingToken.getStopIndex() + 1);
-    }
+  private String truncateQueryAtOffendingToken(String query, Token offendingToken) {
+    return query.substring(0, offendingToken.getStopIndex() + 1);
+  }
 
-    /**
-     * As official JavaDoc says, e=null means parser was able to recover from the error.
-     * In other words, "msg" argument includes the information we want.
-     */
-    private String getDetails(Recognizer<?, ?> recognizer, String msg, RecognitionException e) {
-        String details;
-        if (e == null) {
-            details = msg;
-        } else {
-            IntervalSet followSet = e.getExpectedTokens();
-            details = "Expecting tokens in " + followSet.toString(recognizer.getVocabulary());
-        }
-        return details;
+  /**
+   * As official JavaDoc says, e=null means parser was able to recover from the error. In other
+   * words, "msg" argument includes the information we want.
+   */
+  private String getDetails(Recognizer<?, ?> recognizer, String msg, RecognitionException e) {
+    String details;
+    if (e == null) {
+      details = msg;
+    } else {
+      IntervalSet followSet = e.getExpectedTokens();
+      details = "Expecting tokens in " + followSet.toString(recognizer.getVocabulary());
     }
-
+    return details;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/SyntaxAnalysisException.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/SyntaxAnalysisException.java
index f79de62229..dce5437a19 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/SyntaxAnalysisException.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/syntax/SyntaxAnalysisException.java
@@ -3,17 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.syntax;
 
 import org.opensearch.sql.legacy.antlr.SqlAnalysisException;
 
-/**
- * Exception for syntax analysis
- */
+/** Exception for syntax analysis */
 public class SyntaxAnalysisException extends SqlAnalysisException {
 
-    public SyntaxAnalysisException(String message) {
-        super(message);
-    }
+  public SyntaxAnalysisException(String message) {
+    super(message);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/AntlrSqlParseTreeVisitor.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/AntlrSqlParseTreeVisitor.java
index 90a8274568..5a16ee3540 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/AntlrSqlParseTreeVisitor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/AntlrSqlParseTreeVisitor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.visitor;
 
 import static java.util.Collections.emptyList;
@@ -55,357 +54,342 @@
 import org.opensearch.sql.legacy.antlr.parser.OpenSearchLegacySqlParser.TableNamePatternContext;
 import org.opensearch.sql.legacy.antlr.parser.OpenSearchLegacySqlParserBaseVisitor;
 
-/**
- * ANTLR parse tree visitor to drive the analysis process.
- */
-public class AntlrSqlParseTreeVisitor<T extends Reducible> extends OpenSearchLegacySqlParserBaseVisitor<T> {
-
-    /** Generic visitor to perform the real action on parse tree */
-    private final GenericSqlParseTreeVisitor<T> visitor;
-
-    public AntlrSqlParseTreeVisitor(GenericSqlParseTreeVisitor<T> visitor) {
-        this.visitor = visitor;
-    }
-
-    @Override
-    public T visitRoot(RootContext ctx) {
-        visitor.visitRoot();
-        return super.visitRoot(ctx);
-    }
-
-    @Override
-    public T visitUnionSelect(UnionSelectContext ctx) {
-        T union = visitor.visitOperator("UNION");
-        return reduce(union,
-            asList(
-                ctx.querySpecification(),
-                ctx.unionStatement()
-            )
-        );
-    }
-
-    @Override
-    public T visitMinusSelect(MinusSelectContext ctx) {
-        T minus = visitor.visitOperator("MINUS");
-        return reduce(minus, asList(ctx.querySpecification(), ctx.minusStatement()));
-    }
-
-    @Override
-    public T visitInPredicate(InPredicateContext ctx) {
-        T in = visitor.visitOperator("IN");
-        PredicateContext field = ctx.predicate();
-        ParserRuleContext subquery = (ctx.selectStatement() != null) ? ctx.selectStatement() : ctx.expressions();
-        return reduce(in, Arrays.asList(field, subquery));
-    }
-
-    @Override
-    public T visitTableSources(TableSourcesContext ctx) {
-        if (ctx.tableSource().size() < 2) {
-            return super.visitTableSources(ctx);
-        }
-        T commaJoin = visitor.visitOperator("JOIN");
-        return reduce(commaJoin, ctx.tableSource());
-    }
-
-    @Override
-    public T visitTableSourceBase(TableSourceBaseContext ctx) {
-        if (ctx.joinPart().isEmpty()) {
-            return super.visitTableSourceBase(ctx);
-        }
-        T join = visitor.visitOperator("JOIN");
-        return reduce(join, asList(ctx.tableSourceItem(), ctx.joinPart()));
-    }
-
-    @Override
-    public T visitInnerJoin(InnerJoinContext ctx) {
-        return visitJoin(ctx.children, ctx.tableSourceItem());
-    }
-
-    @Override
-    public T visitOuterJoin(OuterJoinContext ctx) {
-        return visitJoin(ctx.children, ctx.tableSourceItem());
-    }
-
-    /**
-     * Enforce visit order because ANTLR is generic and unaware.
-     *
-     * Visiting order is:
-     *  FROM
-     *  => WHERE
-     *   => SELECT
-     *    => GROUP BY
-     *     => HAVING
-     *      => ORDER BY
-     *       => LIMIT
-     */
-     @Override
-    public T visitQuerySpecification(QuerySpecificationContext ctx) {
-        visitor.visitQuery();
-
-        // Always visit FROM clause first to define symbols
-        FromClauseContext fromClause = ctx.fromClause();
-        visit(fromClause.tableSources());
-
-        if (fromClause.whereExpr != null) {
-            visit(fromClause.whereExpr);
-        }
-
-        // Note visit GROUP BY and HAVING later than SELECT for alias definition
-        T result = visitSelectElements(ctx.selectElements());
-        fromClause.groupByItem().forEach(this::visit);
-        if (fromClause.havingExpr != null) {
-            visit(fromClause.havingExpr);
-        }
-
-        if (ctx.orderByClause() != null) {
-            visitOrderByClause(ctx.orderByClause());
-        }
-        if (ctx.limitClause() != null) {
-            visitLimitClause(ctx.limitClause());
-        }
-
-        visitor.endVisitQuery();
-        return result;
-    }
-
-    @Override
-    public T visitSubqueryTableItem(SubqueryTableItemContext ctx) {
-        throw new EarlyExitAnalysisException("Exit when meeting subquery in from");
-    }
-
-    /** Visit here instead of tableName because we need alias */
-    @Override
-    public T visitAtomTableItem(AtomTableItemContext ctx) {
-        String alias = (ctx.alias == null) ? "" : ctx.alias.getText();
-        T result = visit(ctx.tableName());
-        visitor.visitAs(alias, result);
-        return result;
-    }
-
-    @Override
-    public T visitSimpleTableName(SimpleTableNameContext ctx) {
-        return visitor.visitIndexName(ctx.getText());
-    }
-
-    @Override
-    public T visitTableNamePattern(TableNamePatternContext ctx) {
-        return visitor.visitIndexName(ctx.getText());
-    }
-
-    @Override
-    public T visitTableAndTypeName(TableAndTypeNameContext ctx) {
-        return visitor.visitIndexName(ctx.uid(0).getText());
-    }
-
-    @Override
-    public T visitFullColumnName(FullColumnNameContext ctx) {
-        return visitor.visitFieldName(ctx.getText());
-    }
-
-    @Override
-    public T visitUdfFunctionCall(UdfFunctionCallContext ctx) {
-        String funcName = ctx.fullId().getText();
-        T func = visitor.visitFunctionName(funcName);
-        return reduce(func, ctx.functionArgs());
-    }
-
-    @Override
-    public T visitScalarFunctionCall(ScalarFunctionCallContext ctx) {
-        UnsupportedSemanticVerifier.verify(ctx);
-        T func = visit(ctx.scalarFunctionName());
-        return reduce(func, ctx.functionArgs());
-    }
-
-    @Override
-    public T visitMathOperator(MathOperatorContext ctx) {
-        UnsupportedSemanticVerifier.verify(ctx);
-        return super.visitMathOperator(ctx);
-    }
-
-    @Override
-    public T visitRegexpPredicate(RegexpPredicateContext ctx) {
-        UnsupportedSemanticVerifier.verify(ctx);
-        return super.visitRegexpPredicate(ctx);
-    }
-
-    @Override
-    public T visitSelectElements(SelectElementsContext ctx) {
-        return visitor.visitSelect(ctx.selectElement().
-                                       stream().
-                                       map(this::visit).
-                                       collect(Collectors.toList()));
-    }
-
-    @Override
-    public T visitSelectStarElement(OpenSearchLegacySqlParser.SelectStarElementContext ctx) {
-        return visitor.visitSelectAllColumn();
-    }
-
-    @Override
-    public T visitSelectColumnElement(SelectColumnElementContext ctx) {
-        return visitSelectItem(ctx.fullColumnName(), ctx.uid());
-    }
-
-    @Override
-    public T visitSelectFunctionElement(SelectFunctionElementContext ctx) {
-        return visitSelectItem(ctx.functionCall(), ctx.uid());
-    }
-
-    @Override
-    public T visitSelectExpressionElement(SelectExpressionElementContext ctx) {
-        return visitSelectItem(ctx.expression(), ctx.uid());
-    }
-
-    @Override
-    public T visitAggregateWindowedFunction(AggregateWindowedFunctionContext ctx) {
-        String funcName = ctx.getChild(0).getText();
-        T func = visitor.visitFunctionName(funcName);
-        return reduce(func, ctx.functionArg());
-    }
-
-    @Override
-    public T visitFunctionNameBase(FunctionNameBaseContext ctx) {
-        return visitor.visitFunctionName(ctx.getText());
-    }
-
-    @Override
-    public T visitBinaryComparisonPredicate(BinaryComparisonPredicateContext ctx) {
-        if (isNamedArgument(ctx)) { // Essentially named argument is assign instead of comparison
-            return defaultResult();
-        }
-
-        T op = visit(ctx.comparisonOperator());
-        return reduce(op, Arrays.asList(ctx.left, ctx.right));
-    }
-
-    @Override
-    public T visitIsExpression(IsExpressionContext ctx) {
-        T op = visitor.visitOperator("IS");
-        return op.reduce(Arrays.asList(
-            visit(ctx.predicate()),
-            visitor.visitBoolean(ctx.testValue.getText()))
-        );
-    }
-
-    @Override
-    public T visitConvertedDataType(OpenSearchLegacySqlParser.ConvertedDataTypeContext ctx) {
-        if (ctx.getChild(0) != null && !Strings.isNullOrEmpty(ctx.getChild(0).getText())) {
-            return visitor.visitConvertedType(ctx.getChild(0).getText());
-        } else {
-            return super.visitConvertedDataType(ctx);
-        }
-    }
-
-    @Override
-    public T visitComparisonOperator(ComparisonOperatorContext ctx) {
-        return visitor.visitOperator(ctx.getText());
-    }
-
-    @Override
-    public T visitConstant(ConstantContext ctx) {
-        if (ctx.REAL_LITERAL() != null) {
-            return visitor.visitFloat(ctx.getText());
-        }
-        if (ctx.dateType != null) {
-            return visitor.visitDate(ctx.getText());
-        }
-        if (ctx.nullLiteral != null) {
-            return visitor.visitNull();
-        }
-        return super.visitConstant(ctx);
-    }
-
-    @Override
-    public T visitStringLiteral(StringLiteralContext ctx) {
-        return visitor.visitString(ctx.getText());
-    }
-
-    @Override
-    public T visitDecimalLiteral(DecimalLiteralContext ctx) {
-        return visitor.visitInteger(ctx.getText());
-    }
-
-    @Override
-    public T visitBooleanLiteral(BooleanLiteralContext ctx) {
-        return visitor.visitBoolean(ctx.getText());
-    }
-
-    @Override
-    protected T defaultResult() {
-        return visitor.defaultValue();
-    }
-
-    @Override
-    protected T aggregateResult(T aggregate, T nextResult) {
-        if (nextResult != defaultResult()) { // Simply return non-default value for now
-            return nextResult;
-        }
-        return aggregate;
-    }
-
-    /**
-     * Named argument, ex. TOPHITS('size'=3), is under FunctionArgs -> Predicate
-     * And the function name should be contained in openSearchFunctionNameBase
-     */
-    private boolean isNamedArgument(BinaryComparisonPredicateContext ctx) {
-        if (ctx.getParent() != null && ctx.getParent().getParent() != null
-                && ctx.getParent().getParent().getParent() != null
-                && ctx.getParent().getParent().getParent() instanceof ScalarFunctionCallContext) {
-
-            ScalarFunctionCallContext parent = (ScalarFunctionCallContext) ctx.getParent().getParent().getParent();
-            return parent.scalarFunctionName().functionNameBase().openSearchFunctionNameBase() != null;
-        }
-        return false;
-    }
-
-    /** Enforce visiting result of table instead of ON clause as result */
-    private T visitJoin(List<ParseTree> children, TableSourceItemContext tableCtx) {
-        T result = defaultResult();
-        for (ParseTree child : children) {
-            if (child == tableCtx) {
-                result = visit(tableCtx);
-            } else {
-                visit(child);
-            }
-        }
-        return result;
-    }
-
-    /** Visit select items for type check and alias definition */
-    private T visitSelectItem(ParserRuleContext item, UidContext uid) {
-        T result = visit(item);
-        if (uid != null) {
-            visitor.visitAs(uid.getText(), result);
-        }
-        return result;
-    }
-
-    private T reduce(T reducer, ParserRuleContext ctx) {
-        return reduce(reducer, (ctx == null) ? emptyList() : ctx.children);
-    }
-
-    /** Make constructor apply arguments and return result type */
-    private <Node extends ParseTree> T reduce(T reducer, List<Node> nodes) {
-        List<T> args;
-        if (nodes == null) {
-            args = emptyList();
-        } else {
-            args = nodes.stream().
-                         map(this::visit).
-                         filter(type -> type != defaultResult()).
-                         collect(Collectors.toList());
-        }
-        return reducer.reduce(args);
-    }
-
-    /** Combine an item and a list of items to a single list */
-    private <Node1 extends ParseTree,
-             Node2 extends ParseTree>
-             List<ParseTree> asList(Node1 first, List<Node2> rest) {
-
-        List<ParseTree> result = new ArrayList<>(singleton(first));
-        result.addAll(rest);
-        return result;
-    }
-
+/** ANTLR parse tree visitor to drive the analysis process. */
+public class AntlrSqlParseTreeVisitor<T extends Reducible>
+    extends OpenSearchLegacySqlParserBaseVisitor<T> {
+
+  /** Generic visitor to perform the real action on parse tree */
+  private final GenericSqlParseTreeVisitor<T> visitor;
+
+  public AntlrSqlParseTreeVisitor(GenericSqlParseTreeVisitor<T> visitor) {
+    this.visitor = visitor;
+  }
+
+  @Override
+  public T visitRoot(RootContext ctx) {
+    visitor.visitRoot();
+    return super.visitRoot(ctx);
+  }
+
+  @Override
+  public T visitUnionSelect(UnionSelectContext ctx) {
+    T union = visitor.visitOperator("UNION");
+    return reduce(union, asList(ctx.querySpecification(), ctx.unionStatement()));
+  }
+
+  @Override
+  public T visitMinusSelect(MinusSelectContext ctx) {
+    T minus = visitor.visitOperator("MINUS");
+    return reduce(minus, asList(ctx.querySpecification(), ctx.minusStatement()));
+  }
+
+  @Override
+  public T visitInPredicate(InPredicateContext ctx) {
+    T in = visitor.visitOperator("IN");
+    PredicateContext field = ctx.predicate();
+    ParserRuleContext subquery =
+        (ctx.selectStatement() != null) ? ctx.selectStatement() : ctx.expressions();
+    return reduce(in, Arrays.asList(field, subquery));
+  }
+
+  @Override
+  public T visitTableSources(TableSourcesContext ctx) {
+    if (ctx.tableSource().size() < 2) {
+      return super.visitTableSources(ctx);
+    }
+    T commaJoin = visitor.visitOperator("JOIN");
+    return reduce(commaJoin, ctx.tableSource());
+  }
+
+  @Override
+  public T visitTableSourceBase(TableSourceBaseContext ctx) {
+    if (ctx.joinPart().isEmpty()) {
+      return super.visitTableSourceBase(ctx);
+    }
+    T join = visitor.visitOperator("JOIN");
+    return reduce(join, asList(ctx.tableSourceItem(), ctx.joinPart()));
+  }
+
+  @Override
+  public T visitInnerJoin(InnerJoinContext ctx) {
+    return visitJoin(ctx.children, ctx.tableSourceItem());
+  }
+
+  @Override
+  public T visitOuterJoin(OuterJoinContext ctx) {
+    return visitJoin(ctx.children, ctx.tableSourceItem());
+  }
+
+  /**
+   * Enforce visit order because ANTLR is generic and unaware.
+   *
+   * <p>Visiting order is: FROM => WHERE => SELECT => GROUP BY => HAVING => ORDER BY => LIMIT
+   */
+  @Override
+  public T visitQuerySpecification(QuerySpecificationContext ctx) {
+    visitor.visitQuery();
+
+    // Always visit FROM clause first to define symbols
+    FromClauseContext fromClause = ctx.fromClause();
+    visit(fromClause.tableSources());
+
+    if (fromClause.whereExpr != null) {
+      visit(fromClause.whereExpr);
+    }
+
+    // Note visit GROUP BY and HAVING later than SELECT for alias definition
+    T result = visitSelectElements(ctx.selectElements());
+    fromClause.groupByItem().forEach(this::visit);
+    if (fromClause.havingExpr != null) {
+      visit(fromClause.havingExpr);
+    }
+
+    if (ctx.orderByClause() != null) {
+      visitOrderByClause(ctx.orderByClause());
+    }
+    if (ctx.limitClause() != null) {
+      visitLimitClause(ctx.limitClause());
+    }
+
+    visitor.endVisitQuery();
+    return result;
+  }
+
+  @Override
+  public T visitSubqueryTableItem(SubqueryTableItemContext ctx) {
+    throw new EarlyExitAnalysisException("Exit when meeting subquery in from");
+  }
+
+  /** Visit here instead of tableName because we need alias */
+  @Override
+  public T visitAtomTableItem(AtomTableItemContext ctx) {
+    String alias = (ctx.alias == null) ? "" : ctx.alias.getText();
+    T result = visit(ctx.tableName());
+    visitor.visitAs(alias, result);
+    return result;
+  }
+
+  @Override
+  public T visitSimpleTableName(SimpleTableNameContext ctx) {
+    return visitor.visitIndexName(ctx.getText());
+  }
+
+  @Override
+  public T visitTableNamePattern(TableNamePatternContext ctx) {
+    return visitor.visitIndexName(ctx.getText());
+  }
+
+  @Override
+  public T visitTableAndTypeName(TableAndTypeNameContext ctx) {
+    return visitor.visitIndexName(ctx.uid(0).getText());
+  }
+
+  @Override
+  public T visitFullColumnName(FullColumnNameContext ctx) {
+    return visitor.visitFieldName(ctx.getText());
+  }
+
+  @Override
+  public T visitUdfFunctionCall(UdfFunctionCallContext ctx) {
+    String funcName = ctx.fullId().getText();
+    T func = visitor.visitFunctionName(funcName);
+    return reduce(func, ctx.functionArgs());
+  }
+
+  @Override
+  public T visitScalarFunctionCall(ScalarFunctionCallContext ctx) {
+    UnsupportedSemanticVerifier.verify(ctx);
+    T func = visit(ctx.scalarFunctionName());
+    return reduce(func, ctx.functionArgs());
+  }
+
+  @Override
+  public T visitMathOperator(MathOperatorContext ctx) {
+    UnsupportedSemanticVerifier.verify(ctx);
+    return super.visitMathOperator(ctx);
+  }
+
+  @Override
+  public T visitRegexpPredicate(RegexpPredicateContext ctx) {
+    UnsupportedSemanticVerifier.verify(ctx);
+    return super.visitRegexpPredicate(ctx);
+  }
+
+  @Override
+  public T visitSelectElements(SelectElementsContext ctx) {
+    return visitor.visitSelect(
+        ctx.selectElement().stream().map(this::visit).collect(Collectors.toList()));
+  }
+
+  @Override
+  public T visitSelectStarElement(OpenSearchLegacySqlParser.SelectStarElementContext ctx) {
+    return visitor.visitSelectAllColumn();
+  }
+
+  @Override
+  public T visitSelectColumnElement(SelectColumnElementContext ctx) {
+    return visitSelectItem(ctx.fullColumnName(), ctx.uid());
+  }
+
+  @Override
+  public T visitSelectFunctionElement(SelectFunctionElementContext ctx) {
+    return visitSelectItem(ctx.functionCall(), ctx.uid());
+  }
+
+  @Override
+  public T visitSelectExpressionElement(SelectExpressionElementContext ctx) {
+    return visitSelectItem(ctx.expression(), ctx.uid());
+  }
+
+  @Override
+  public T visitAggregateWindowedFunction(AggregateWindowedFunctionContext ctx) {
+    String funcName = ctx.getChild(0).getText();
+    T func = visitor.visitFunctionName(funcName);
+    return reduce(func, ctx.functionArg());
+  }
+
+  @Override
+  public T visitFunctionNameBase(FunctionNameBaseContext ctx) {
+    return visitor.visitFunctionName(ctx.getText());
+  }
+
+  @Override
+  public T visitBinaryComparisonPredicate(BinaryComparisonPredicateContext ctx) {
+    if (isNamedArgument(ctx)) { // Essentially named argument is assign instead of comparison
+      return defaultResult();
+    }
+
+    T op = visit(ctx.comparisonOperator());
+    return reduce(op, Arrays.asList(ctx.left, ctx.right));
+  }
+
+  @Override
+  public T visitIsExpression(IsExpressionContext ctx) {
+    T op = visitor.visitOperator("IS");
+    return op.reduce(
+        Arrays.asList(visit(ctx.predicate()), visitor.visitBoolean(ctx.testValue.getText())));
+  }
+
+  @Override
+  public T visitConvertedDataType(OpenSearchLegacySqlParser.ConvertedDataTypeContext ctx) {
+    if (ctx.getChild(0) != null && !Strings.isNullOrEmpty(ctx.getChild(0).getText())) {
+      return visitor.visitConvertedType(ctx.getChild(0).getText());
+    } else {
+      return super.visitConvertedDataType(ctx);
+    }
+  }
+
+  @Override
+  public T visitComparisonOperator(ComparisonOperatorContext ctx) {
+    return visitor.visitOperator(ctx.getText());
+  }
+
+  @Override
+  public T visitConstant(ConstantContext ctx) {
+    if (ctx.REAL_LITERAL() != null) {
+      return visitor.visitFloat(ctx.getText());
+    }
+    if (ctx.dateType != null) {
+      return visitor.visitDate(ctx.getText());
+    }
+    if (ctx.nullLiteral != null) {
+      return visitor.visitNull();
+    }
+    return super.visitConstant(ctx);
+  }
+
+  @Override
+  public T visitStringLiteral(StringLiteralContext ctx) {
+    return visitor.visitString(ctx.getText());
+  }
+
+  @Override
+  public T visitDecimalLiteral(DecimalLiteralContext ctx) {
+    return visitor.visitInteger(ctx.getText());
+  }
+
+  @Override
+  public T visitBooleanLiteral(BooleanLiteralContext ctx) {
+    return visitor.visitBoolean(ctx.getText());
+  }
+
+  @Override
+  protected T defaultResult() {
+    return visitor.defaultValue();
+  }
+
+  @Override
+  protected T aggregateResult(T aggregate, T nextResult) {
+    if (nextResult != defaultResult()) { // Simply return non-default value for now
+      return nextResult;
+    }
+    return aggregate;
+  }
+
+  /**
+   * Named argument, ex. TOPHITS('size'=3), is under FunctionArgs -> Predicate And the function name
+   * should be contained in openSearchFunctionNameBase
+   */
+  private boolean isNamedArgument(BinaryComparisonPredicateContext ctx) {
+    if (ctx.getParent() != null
+        && ctx.getParent().getParent() != null
+        && ctx.getParent().getParent().getParent() != null
+        && ctx.getParent().getParent().getParent() instanceof ScalarFunctionCallContext) {
+
+      ScalarFunctionCallContext parent =
+          (ScalarFunctionCallContext) ctx.getParent().getParent().getParent();
+      return parent.scalarFunctionName().functionNameBase().openSearchFunctionNameBase() != null;
+    }
+    return false;
+  }
+
+  /** Enforce visiting result of table instead of ON clause as result */
+  private T visitJoin(List<ParseTree> children, TableSourceItemContext tableCtx) {
+    T result = defaultResult();
+    for (ParseTree child : children) {
+      if (child == tableCtx) {
+        result = visit(tableCtx);
+      } else {
+        visit(child);
+      }
+    }
+    return result;
+  }
+
+  /** Visit select items for type check and alias definition */
+  private T visitSelectItem(ParserRuleContext item, UidContext uid) {
+    T result = visit(item);
+    if (uid != null) {
+      visitor.visitAs(uid.getText(), result);
+    }
+    return result;
+  }
+
+  private T reduce(T reducer, ParserRuleContext ctx) {
+    return reduce(reducer, (ctx == null) ? emptyList() : ctx.children);
+  }
+
+  /** Make constructor apply arguments and return result type */
+  private <Node extends ParseTree> T reduce(T reducer, List<Node> nodes) {
+    List<T> args;
+    if (nodes == null) {
+      args = emptyList();
+    } else {
+      args =
+          nodes.stream()
+              .map(this::visit)
+              .filter(type -> type != defaultResult())
+              .collect(Collectors.toList());
+    }
+    return reducer.reduce(args);
+  }
+
+  /** Combine an item and a list of items to a single list */
+  private <Node1 extends ParseTree, Node2 extends ParseTree> List<ParseTree> asList(
+      Node1 first, List<Node2> rest) {
+
+    List<ParseTree> result = new ArrayList<>(singleton(first));
+    result.addAll(rest);
+    return result;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/EarlyExitAnalysisException.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/EarlyExitAnalysisException.java
index b0bd01a093..cf583aab40 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/EarlyExitAnalysisException.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/EarlyExitAnalysisException.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.visitor;
 
-/**
- * Exit visitor early due to some reason.
- */
+/** Exit visitor early due to some reason. */
 public class EarlyExitAnalysisException extends RuntimeException {
 
-    public EarlyExitAnalysisException(String message) {
-        super(message);
-    }
+  public EarlyExitAnalysisException(String message) {
+    super(message);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/GenericSqlParseTreeVisitor.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/GenericSqlParseTreeVisitor.java
index 511f932a0f..bd78c1b03f 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/GenericSqlParseTreeVisitor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/GenericSqlParseTreeVisitor.java
@@ -3,78 +3,74 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.visitor;
 
 import java.util.List;
 
-/**
- * Generic parse tree visitor without dependency on concrete parse tree class.
- */
+/** Generic parse tree visitor without dependency on concrete parse tree class. */
 public interface GenericSqlParseTreeVisitor<T> {
 
-    default void visitRoot() {}
-
-    default void visitQuery() {}
+  default void visitRoot() {}
 
-    default void endVisitQuery() {}
+  default void visitQuery() {}
 
-    default T visitSelect(List<T> items) {
-        return defaultValue();
-    }
+  default void endVisitQuery() {}
 
-    default T visitSelectAllColumn() {
-        return defaultValue();
-    }
+  default T visitSelect(List<T> items) {
+    return defaultValue();
+  }
 
-    default void visitAs(String alias, T type) {}
+  default T visitSelectAllColumn() {
+    return defaultValue();
+  }
 
-    default T visitIndexName(String indexName) {
-        return defaultValue();
-    }
+  default void visitAs(String alias, T type) {}
 
-    default T visitFieldName(String fieldName) {
-        return defaultValue();
-    }
+  default T visitIndexName(String indexName) {
+    return defaultValue();
+  }
 
-    default T visitFunctionName(String funcName) {
-        return defaultValue();
-    }
+  default T visitFieldName(String fieldName) {
+    return defaultValue();
+  }
 
-    default T visitOperator(String opName) {
-        return defaultValue();
-    }
+  default T visitFunctionName(String funcName) {
+    return defaultValue();
+  }
 
-    default T visitString(String text) {
-        return defaultValue();
-    }
+  default T visitOperator(String opName) {
+    return defaultValue();
+  }
 
-    default T visitInteger(String text) {
-        return defaultValue();
-    }
+  default T visitString(String text) {
+    return defaultValue();
+  }
 
-    default T visitFloat(String text) {
-        return defaultValue();
-    }
+  default T visitInteger(String text) {
+    return defaultValue();
+  }
 
-    default T visitBoolean(String text) {
-        return defaultValue();
-    }
+  default T visitFloat(String text) {
+    return defaultValue();
+  }
 
-    default T visitDate(String text) {
-        return defaultValue();
-    }
+  default T visitBoolean(String text) {
+    return defaultValue();
+  }
 
-    default T visitNull() {
-        return defaultValue();
-    }
+  default T visitDate(String text) {
+    return defaultValue();
+  }
 
-    default T visitConvertedType(String text) {
-        return defaultValue();
-    }
+  default T visitNull() {
+    return defaultValue();
+  }
 
-    default T defaultValue() {
-        return null;
-    }
+  default T visitConvertedType(String text) {
+    return defaultValue();
+  }
 
+  default T defaultValue() {
+    return null;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/Reducible.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/Reducible.java
index 510a76659e..edb4136d49 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/Reducible.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/Reducible.java
@@ -3,21 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.visitor;
 
 import java.util.List;
 
-/**
- * Abstraction for anything that can be reduced and used by {@link AntlrSqlParseTreeVisitor}.
- */
+/** Abstraction for anything that can be reduced and used by {@link AntlrSqlParseTreeVisitor}. */
 public interface Reducible {
 
-    /**
-     * Reduce current and others to generate a new one
-     * @param others  others
-     * @return      reduction
-     */
-    <T extends Reducible> T reduce(List<T> others);
-
+  /**
+   * Reduce current and others to generate a new one
+   *
+   * @param others others
+   * @return reduction
+   */
+  <T extends Reducible> T reduce(List<T> others);
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/UnsupportedSemanticVerifier.java b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/UnsupportedSemanticVerifier.java
index dc37425a62..919af8e6e2 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/UnsupportedSemanticVerifier.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/antlr/visitor/UnsupportedSemanticVerifier.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.visitor;
 
 import com.google.common.collect.Sets;
@@ -17,71 +16,68 @@
 
 public class UnsupportedSemanticVerifier {
 
-    private static final Set<String> mathConstants = Sets.newHashSet(
-            "e", "pi"
-    );
-
-    private static final Set<String> supportedNestedFunctions = Sets.newHashSet(
-            "nested", "reverse_nested", "score", "match_query", "matchquery"
-    );
+  private static final Set<String> mathConstants = Sets.newHashSet("e", "pi");
 
-    /**
-     * The following two sets include the functions and operators that have requested or issued by users
-     * but the plugin does not support yet.
-     */
-    private static final Set<String> unsupportedFunctions = Sets.newHashSet(
-            "adddate", "addtime", "datetime", "greatest", "least"
-    );
+  private static final Set<String> supportedNestedFunctions =
+      Sets.newHashSet("nested", "reverse_nested", "score", "match_query", "matchquery");
 
-    private static final Set<String> unsupportedOperators = Sets.newHashSet(
-            "div"
-    );
+  /**
+   * The following two sets include the functions and operators that have requested or issued by
+   * users but the plugin does not support yet.
+   */
+  private static final Set<String> unsupportedFunctions =
+      Sets.newHashSet("adddate", "addtime", "datetime", "greatest", "least");
 
+  private static final Set<String> unsupportedOperators = Sets.newHashSet("div");
 
-    /**
-     * The scalar function calls are separated into (a)typical function calls; (b)nested function calls with functions
-     * as arguments, like abs(log(...)); (c)aggregations with functions as aggregators, like max(abs(....)).
-     * Currently, we do not support nested functions or nested aggregations, aka (b) and (c).
-     * However, for the special EsFunctions included in the [supportedNestedFunctions] set, we have supported them in
-     * nested function calls and aggregations (b&c). Besides, the math constants included in the [mathConstants] set
-     * are regraded as scalar functions, but they are working well in the painless script.
-     *
-     * Thus, the types of functions to throw exceptions:
-     * (I)case (b) except that the arguments are from the [mathConstants] set;
-     * (II) case (b) except that the arguments are from the [supportedNestedFunctions] set;
-     * (III) case (c) except that the aggregators are from thet [supportedNestedFunctions] set.
-     */
-    public static void verify(ScalarFunctionCallContext ctx) {
-        String funcName = StringUtils.toLower(ctx.scalarFunctionName().getText());
+  /**
+   * The scalar function calls are separated into (a)typical function calls; (b)nested function
+   * calls with functions as arguments, like abs(log(...)); (c)aggregations with functions as
+   * aggregators, like max(abs(....)). Currently, we do not support nested functions or nested
+   * aggregations, aka (b) and (c). However, for the special EsFunctions included in the
+   * [supportedNestedFunctions] set, we have supported them in nested function calls and
+   * aggregations (b&c). Besides, the math constants included in the [mathConstants] set are
+   * regraded as scalar functions, but they are working well in the painless script.
+   *
+   * <p>Thus, the types of functions to throw exceptions: (I)case (b) except that the arguments are
+   * from the [mathConstants] set; (II) case (b) except that the arguments are from the
+   * [supportedNestedFunctions] set; (III) case (c) except that the aggregators are from thet
+   * [supportedNestedFunctions] set.
+   */
+  public static void verify(ScalarFunctionCallContext ctx) {
+    String funcName = StringUtils.toLower(ctx.scalarFunctionName().getText());
 
-        // type (III)
-        if (ctx.parent.parent instanceof OpenSearchLegacySqlParser.FunctionAsAggregatorFunctionContext
-                && !(supportedNestedFunctions.contains(StringUtils.toLower(funcName)))) {
-            throw new SqlFeatureNotImplementedException(StringUtils.format(
-                    "Aggregation calls with function aggregator like [%s] are not supported yet",
-                    ctx.parent.parent.getText()));
+    // type (III)
+    if (ctx.parent.parent instanceof OpenSearchLegacySqlParser.FunctionAsAggregatorFunctionContext
+        && !(supportedNestedFunctions.contains(StringUtils.toLower(funcName)))) {
+      throw new SqlFeatureNotImplementedException(
+          StringUtils.format(
+              "Aggregation calls with function aggregator like [%s] are not supported yet",
+              ctx.parent.parent.getText()));
 
-            // type (I) and (II)
-        } else if (ctx.parent.parent instanceof OpenSearchLegacySqlParser.NestedFunctionArgsContext
-                && !(mathConstants.contains(funcName) || supportedNestedFunctions.contains(funcName))) {
-            throw new SqlFeatureNotImplementedException(StringUtils.format(
-                    "Nested function calls like [%s] are not supported yet", ctx.parent.parent.parent.getText()));
+      // type (I) and (II)
+    } else if (ctx.parent.parent instanceof OpenSearchLegacySqlParser.NestedFunctionArgsContext
+        && !(mathConstants.contains(funcName) || supportedNestedFunctions.contains(funcName))) {
+      throw new SqlFeatureNotImplementedException(
+          StringUtils.format(
+              "Nested function calls like [%s] are not supported yet",
+              ctx.parent.parent.parent.getText()));
 
-            // unsupported functions
-        } else if (unsupportedFunctions.contains(funcName)) {
-            throw new SqlFeatureNotImplementedException(StringUtils.format("Function [%s] is not supported yet",
-                    funcName));
-        }
+      // unsupported functions
+    } else if (unsupportedFunctions.contains(funcName)) {
+      throw new SqlFeatureNotImplementedException(
+          StringUtils.format("Function [%s] is not supported yet", funcName));
     }
+  }
 
-    public static void verify(MathOperatorContext ctx) {
-        if (unsupportedOperators.contains(StringUtils.toLower(ctx.getText()))) {
-            throw new SqlFeatureNotImplementedException(StringUtils.format("Operator [%s] is not supported yet",
-                    ctx.getText()));
-        }
+  public static void verify(MathOperatorContext ctx) {
+    if (unsupportedOperators.contains(StringUtils.toLower(ctx.getText()))) {
+      throw new SqlFeatureNotImplementedException(
+          StringUtils.format("Operator [%s] is not supported yet", ctx.getText()));
     }
+  }
 
-    public static void verify(RegexpPredicateContext ctx) {
-        throw new SqlFeatureNotImplementedException("Regexp predicate is not supported yet");
-    }
+  public static void verify(RegexpPredicateContext ctx) {
+    throw new SqlFeatureNotImplementedException("Regexp predicate is not supported yet");
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/cursor/Cursor.java b/legacy/src/main/java/org/opensearch/sql/legacy/cursor/Cursor.java
index d3985259dd..1a38016f9a 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/cursor/Cursor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/cursor/Cursor.java
@@ -3,19 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.cursor;
 
-
 public interface Cursor {
 
-    NullCursor NULL_CURSOR = new NullCursor();
+  NullCursor NULL_CURSOR = new NullCursor();
 
-    /**
-     * All cursor's are of the form <cursorType>:<base64 encoded cursor>
-     * The serialized form before encoding is upto Cursor implementation
-     */
-    String generateCursorId();
+  /**
+   * All cursor's are of the form <cursorType>:<base64 encoded cursor> The serialized form before
+   * encoding is upto Cursor implementation
+   */
+  String generateCursorId();
 
-    CursorType getType();
+  CursorType getType();
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/cursor/CursorType.java b/legacy/src/main/java/org/opensearch/sql/legacy/cursor/CursorType.java
index 7c96cb8835..0ac3a25809 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/cursor/CursorType.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/cursor/CursorType.java
@@ -3,42 +3,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.cursor;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Different types queries for which cursor is supported.
- * The result execution, and cursor genreation/parsing will depend on the cursor type.
- * NullCursor is the placeholder implementation in case of non-cursor query.
+ * Different types queries for which cursor is supported. The result execution, and cursor
+ * genreation/parsing will depend on the cursor type. NullCursor is the placeholder implementation
+ * in case of non-cursor query.
  */
 public enum CursorType {
-    NULL(null),
-    DEFAULT("d"),
-    AGGREGATION("a"),
-    JOIN("j");
+  NULL(null),
+  DEFAULT("d"),
+  AGGREGATION("a"),
+  JOIN("j");
 
-    public String id;
+  public String id;
 
-    CursorType(String id) {
-        this.id = id;
-    }
+  CursorType(String id) {
+    this.id = id;
+  }
 
-    public String getId() {
-        return this.id;
-    }
+  public String getId() {
+    return this.id;
+  }
 
-    public static final Map<String, CursorType> LOOKUP = new HashMap<>();
+  public static final Map<String, CursorType> LOOKUP = new HashMap<>();
 
-    static {
-        for (CursorType type : CursorType.values()) {
-            LOOKUP.put(type.getId(), type);
-        }
+  static {
+    for (CursorType type : CursorType.values()) {
+      LOOKUP.put(type.getId(), type);
     }
+  }
 
-    public static CursorType getById(String id) {
-        return LOOKUP.getOrDefault(id, NULL);
-    }
+  public static CursorType getById(String id) {
+    return LOOKUP.getOrDefault(id, NULL);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/cursor/DefaultCursor.java b/legacy/src/main/java/org/opensearch/sql/legacy/cursor/DefaultCursor.java
index 856c1e5e2b..72addd6032 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/cursor/DefaultCursor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/cursor/DefaultCursor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.cursor;
 
 import com.google.common.base.Strings;
@@ -21,140 +20,144 @@
 import org.json.JSONObject;
 import org.opensearch.sql.legacy.executor.format.Schema;
 
-
 /**
- * Minimum metdata that will be serialized for generating cursorId for
- * SELECT .... FROM .. ORDER BY .... queries
+ * Minimum metdata that will be serialized for generating cursorId for SELECT .... FROM .. ORDER BY
+ * .... queries
  */
 @Getter
 @Setter
 @NoArgsConstructor
 public class DefaultCursor implements Cursor {
 
-    /** Make sure all keys are unique to prevent overriding
-     * and as small as possible to make cursor compact
-     */
-    private static final String FETCH_SIZE = "f";
-    private static final String ROWS_LEFT = "l";
-    private static final String INDEX_PATTERN = "i";
-    private static final String SCROLL_ID = "s";
-    private static final String SCHEMA_COLUMNS = "c";
-    private static final String FIELD_ALIAS_MAP = "a";
-
-    /** To get mappings for index to check if type is date needed for
-     * @see org.opensearch.sql.legacy.executor.format.DateFieldFormatter */
-    @NonNull
-    private String indexPattern;
-
-    /** List of Schema.Column for maintaining field order and generating null values of missing fields */
-    @NonNull
-    private List<Schema.Column> columns;
-
-    /** To delegate to correct cursor handler to get next page*/
-    private final CursorType type = CursorType.DEFAULT;
-
+  /**
+   * Make sure all keys are unique to prevent overriding and as small as possible to make cursor
+   * compact
+   */
+  private static final String FETCH_SIZE = "f";
+
+  private static final String ROWS_LEFT = "l";
+  private static final String INDEX_PATTERN = "i";
+  private static final String SCROLL_ID = "s";
+  private static final String SCHEMA_COLUMNS = "c";
+  private static final String FIELD_ALIAS_MAP = "a";
+
+  /**
+   * To get mappings for index to check if type is date needed for
+   *
+   * @see org.opensearch.sql.legacy.executor.format.DateFieldFormatter
+   */
+  @NonNull private String indexPattern;
+
+  /**
+   * List of Schema.Column for maintaining field order and generating null values of missing fields
+   */
+  @NonNull private List<Schema.Column> columns;
+
+  /** To delegate to correct cursor handler to get next page */
+  private final CursorType type = CursorType.DEFAULT;
+
+  /**
+   * Truncate the @see DataRows to respect LIMIT clause and/or to identify last page to close scroll
+   * context. docsLeft is decremented by fetch_size for call to get page of result.
+   */
+  private long rowsLeft;
+
+  /**
+   * @see org.opensearch.sql.legacy.executor.format.SelectResultSet
+   */
+  @NonNull private Map<String, String> fieldAliasMap;
+
+  /** To get next batch of result */
+  private String scrollId;
+
+  /** To reduce the number of rows left by fetchSize */
+  @NonNull private Integer fetchSize;
+
+  private Integer limit;
+
+  @Override
+  public CursorType getType() {
+    return type;
+  }
+
+  @Override
+  public String generateCursorId() {
+    if (rowsLeft <= 0 || Strings.isNullOrEmpty(scrollId)) {
+      return null;
+    }
+    JSONObject json = new JSONObject();
+    json.put(FETCH_SIZE, fetchSize);
+    json.put(ROWS_LEFT, rowsLeft);
+    json.put(INDEX_PATTERN, indexPattern);
+    json.put(SCROLL_ID, scrollId);
+    json.put(SCHEMA_COLUMNS, getSchemaAsJson());
+    json.put(FIELD_ALIAS_MAP, fieldAliasMap);
+    return String.format("%s:%s", type.getId(), encodeCursor(json));
+  }
+
+  public static DefaultCursor from(String cursorId) {
     /**
-     * Truncate the @see DataRows to respect LIMIT clause and/or to identify last page to close scroll context.
-     * docsLeft is decremented by fetch_size for call to get page of result.
+     * It is assumed that cursorId here is the second part of the original cursor passed by the
+     * client after removing first part which identifies cursor type
      */
-    private long rowsLeft;
-
-    /** @see org.opensearch.sql.legacy.executor.format.SelectResultSet */
-    @NonNull
-    private Map<String, String> fieldAliasMap;
-
-    /** To get next batch of result */
-    private String scrollId;
-
-    /** To reduce the number of rows left by fetchSize */
-    @NonNull
-    private Integer fetchSize;
-
-    private Integer limit;
-
-    @Override
-    public CursorType getType() {
-        return type;
-    }
-
-    @Override
-    public String generateCursorId() {
-        if (rowsLeft <=0 || Strings.isNullOrEmpty(scrollId)) {
-            return null;
-        }
-        JSONObject json = new JSONObject();
-        json.put(FETCH_SIZE, fetchSize);
-        json.put(ROWS_LEFT, rowsLeft);
-        json.put(INDEX_PATTERN, indexPattern);
-        json.put(SCROLL_ID, scrollId);
-        json.put(SCHEMA_COLUMNS, getSchemaAsJson());
-        json.put(FIELD_ALIAS_MAP, fieldAliasMap);
-        return String.format("%s:%s", type.getId(), encodeCursor(json));
-    }
-
-    public static DefaultCursor from(String cursorId) {
-        /**
-         * It is assumed that cursorId here is the second part of the original cursor passed
-         * by the client after removing first part which identifies cursor type
-         */
-         JSONObject json = decodeCursor(cursorId);
-         DefaultCursor cursor = new DefaultCursor();
-         cursor.setFetchSize(json.getInt(FETCH_SIZE));
-         cursor.setRowsLeft(json.getLong(ROWS_LEFT));
-         cursor.setIndexPattern(json.getString(INDEX_PATTERN));
-         cursor.setScrollId(json.getString(SCROLL_ID));
-         cursor.setColumns(getColumnsFromSchema(json.getJSONArray(SCHEMA_COLUMNS)));
-         cursor.setFieldAliasMap(fieldAliasMap(json.getJSONObject(FIELD_ALIAS_MAP)));
-
-         return cursor;
-    }
-
-    private JSONArray getSchemaAsJson() {
-        JSONArray schemaJson = new JSONArray();
-
-        for (Schema.Column column : columns) {
-            schemaJson.put(schemaEntry(column.getName(), column.getAlias(), column.getType()));
-        }
-
-        return schemaJson;
+    JSONObject json = decodeCursor(cursorId);
+    DefaultCursor cursor = new DefaultCursor();
+    cursor.setFetchSize(json.getInt(FETCH_SIZE));
+    cursor.setRowsLeft(json.getLong(ROWS_LEFT));
+    cursor.setIndexPattern(json.getString(INDEX_PATTERN));
+    cursor.setScrollId(json.getString(SCROLL_ID));
+    cursor.setColumns(getColumnsFromSchema(json.getJSONArray(SCHEMA_COLUMNS)));
+    cursor.setFieldAliasMap(fieldAliasMap(json.getJSONObject(FIELD_ALIAS_MAP)));
+
+    return cursor;
+  }
+
+  private JSONArray getSchemaAsJson() {
+    JSONArray schemaJson = new JSONArray();
+
+    for (Schema.Column column : columns) {
+      schemaJson.put(schemaEntry(column.getName(), column.getAlias(), column.getType()));
     }
 
-    private JSONObject schemaEntry(String name, String alias, String type) {
-        JSONObject entry = new JSONObject();
-        entry.put("name", name);
-        if (alias != null) {
-            entry.put("alias", alias);
-        }
-        entry.put("type", type);
-        return entry;
-    }
-
-    private static String encodeCursor(JSONObject cursorJson) {
-        return Base64.getEncoder().encodeToString(cursorJson.toString().getBytes());
-    }
-
-    private static JSONObject decodeCursor(String cursorId) {
-        return new JSONObject(new String(Base64.getDecoder().decode(cursorId)));
-    }
-
-    private static Map<String, String> fieldAliasMap(JSONObject json) {
-        Map<String, String> fieldToAliasMap = new HashMap<>();
-        json.keySet().forEach(key -> fieldToAliasMap.put(key, json.get(key).toString()));
-        return fieldToAliasMap;
-    }
+    return schemaJson;
+  }
 
-    private static List<Schema.Column> getColumnsFromSchema(JSONArray schema) {
-        List<Schema.Column> columns = IntStream.
-                range(0, schema.length()).
-                mapToObj(i -> {
-                            JSONObject jsonColumn = schema.getJSONObject(i);
-                            return new Schema.Column(
-                                    jsonColumn.getString("name"),
-                                    jsonColumn.optString("alias", null),
-                                    Schema.Type.valueOf(jsonColumn.getString("type").toUpperCase())
-                            );
-                        }
-                ).collect(Collectors.toList());
-        return columns;
+  private JSONObject schemaEntry(String name, String alias, String type) {
+    JSONObject entry = new JSONObject();
+    entry.put("name", name);
+    if (alias != null) {
+      entry.put("alias", alias);
     }
+    entry.put("type", type);
+    return entry;
+  }
+
+  private static String encodeCursor(JSONObject cursorJson) {
+    return Base64.getEncoder().encodeToString(cursorJson.toString().getBytes());
+  }
+
+  private static JSONObject decodeCursor(String cursorId) {
+    return new JSONObject(new String(Base64.getDecoder().decode(cursorId)));
+  }
+
+  private static Map<String, String> fieldAliasMap(JSONObject json) {
+    Map<String, String> fieldToAliasMap = new HashMap<>();
+    json.keySet().forEach(key -> fieldToAliasMap.put(key, json.get(key).toString()));
+    return fieldToAliasMap;
+  }
+
+  private static List<Schema.Column> getColumnsFromSchema(JSONArray schema) {
+    List<Schema.Column> columns =
+        IntStream.range(0, schema.length())
+            .mapToObj(
+                i -> {
+                  JSONObject jsonColumn = schema.getJSONObject(i);
+                  return new Schema.Column(
+                      jsonColumn.getString("name"),
+                      jsonColumn.optString("alias", null),
+                      Schema.Type.valueOf(jsonColumn.getString("type").toUpperCase()));
+                })
+            .collect(Collectors.toList());
+    return columns;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/cursor/NullCursor.java b/legacy/src/main/java/org/opensearch/sql/legacy/cursor/NullCursor.java
index fb6beca96d..5b99f49515 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/cursor/NullCursor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/cursor/NullCursor.java
@@ -3,27 +3,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.cursor;
 
-/**
- * A placeholder Cursor implementation to work with non-paginated queries.
- */
+/** A placeholder Cursor implementation to work with non-paginated queries. */
 public class NullCursor implements Cursor {
 
-    private final CursorType type = CursorType.NULL;
+  private final CursorType type = CursorType.NULL;
 
-    @Override
-    public String generateCursorId() {
-        return null;
-    }
+  @Override
+  public String generateCursorId() {
+    return null;
+  }
 
-    @Override
-    public CursorType getType() {
-        return type;
-    }
+  @Override
+  public CursorType getType() {
+    return type;
+  }
 
-    public NullCursor from(String cursorId) {
-        return NULL_CURSOR;
-    }
+  public NullCursor from(String cursorId) {
+    return NULL_CURSOR;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/ColumnTypeProvider.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/ColumnTypeProvider.java
index 3b2691186b..b7d90b66da 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/ColumnTypeProvider.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/ColumnTypeProvider.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import com.google.common.collect.ImmutableList;
@@ -17,66 +16,64 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.special.Product;
 import org.opensearch.sql.legacy.executor.format.Schema;
 
-/**
- * The definition of column type provider
- */
+/** The definition of column type provider */
 public class ColumnTypeProvider {
-    private final List<Schema.Type> typeList;
+  private final List<Schema.Type> typeList;
 
-    private static final Map<OpenSearchDataType, Schema.Type> TYPE_MAP =
-            new ImmutableMap.Builder<OpenSearchDataType, Schema.Type>()
-                    .put(OpenSearchDataType.SHORT, Schema.Type.SHORT)
-                    .put(OpenSearchDataType.LONG, Schema.Type.LONG)
-                    .put(OpenSearchDataType.INTEGER, Schema.Type.INTEGER)
-                    .put(OpenSearchDataType.FLOAT, Schema.Type.FLOAT)
-                    .put(OpenSearchDataType.DOUBLE, Schema.Type.DOUBLE)
-                    .put(OpenSearchDataType.KEYWORD, Schema.Type.KEYWORD)
-                    .put(OpenSearchDataType.TEXT, Schema.Type.TEXT)
-                    .put(OpenSearchDataType.STRING, Schema.Type.TEXT)
-                    .put(OpenSearchDataType.DATE, Schema.Type.DATE)
-                    .put(OpenSearchDataType.BOOLEAN, Schema.Type.BOOLEAN)
-                    .put(OpenSearchDataType.UNKNOWN, Schema.Type.DOUBLE)
-                    .build();
-    public static final Schema.Type COLUMN_DEFAULT_TYPE = Schema.Type.DOUBLE;
+  private static final Map<OpenSearchDataType, Schema.Type> TYPE_MAP =
+      new ImmutableMap.Builder<OpenSearchDataType, Schema.Type>()
+          .put(OpenSearchDataType.SHORT, Schema.Type.SHORT)
+          .put(OpenSearchDataType.LONG, Schema.Type.LONG)
+          .put(OpenSearchDataType.INTEGER, Schema.Type.INTEGER)
+          .put(OpenSearchDataType.FLOAT, Schema.Type.FLOAT)
+          .put(OpenSearchDataType.DOUBLE, Schema.Type.DOUBLE)
+          .put(OpenSearchDataType.KEYWORD, Schema.Type.KEYWORD)
+          .put(OpenSearchDataType.TEXT, Schema.Type.TEXT)
+          .put(OpenSearchDataType.STRING, Schema.Type.TEXT)
+          .put(OpenSearchDataType.DATE, Schema.Type.DATE)
+          .put(OpenSearchDataType.BOOLEAN, Schema.Type.BOOLEAN)
+          .put(OpenSearchDataType.UNKNOWN, Schema.Type.DOUBLE)
+          .build();
+  public static final Schema.Type COLUMN_DEFAULT_TYPE = Schema.Type.DOUBLE;
 
-    public ColumnTypeProvider(Type type) {
-        this.typeList = convertOutputColumnType(type);
-    }
+  public ColumnTypeProvider(Type type) {
+    this.typeList = convertOutputColumnType(type);
+  }
 
-    public ColumnTypeProvider() {
-        this.typeList = new ArrayList<>();
-    }
+  public ColumnTypeProvider() {
+    this.typeList = new ArrayList<>();
+  }
 
-    /**
-     * Get the type of column by index.
-     *
-     * @param index column index.
-     * @return column type.
-     */
-    public Schema.Type get(int index) {
-        if (typeList.isEmpty()) {
-            return COLUMN_DEFAULT_TYPE;
-        } else {
-            return typeList.get(index);
-        }
+  /**
+   * Get the type of column by index.
+   *
+   * @param index column index.
+   * @return column type.
+   */
+  public Schema.Type get(int index) {
+    if (typeList.isEmpty()) {
+      return COLUMN_DEFAULT_TYPE;
+    } else {
+      return typeList.get(index);
     }
+  }
 
-    private List<Schema.Type> convertOutputColumnType(Type type) {
-        if (type instanceof Product) {
-            List<Type> types = ((Product) type).getTypes();
-            return types.stream().map(t -> convertType(t)).collect(Collectors.toList());
-        } else if (type instanceof OpenSearchDataType) {
-            return ImmutableList.of(convertType(type));
-        } else {
-            return ImmutableList.of(COLUMN_DEFAULT_TYPE);
-        }
+  private List<Schema.Type> convertOutputColumnType(Type type) {
+    if (type instanceof Product) {
+      List<Type> types = ((Product) type).getTypes();
+      return types.stream().map(t -> convertType(t)).collect(Collectors.toList());
+    } else if (type instanceof OpenSearchDataType) {
+      return ImmutableList.of(convertType(type));
+    } else {
+      return ImmutableList.of(COLUMN_DEFAULT_TYPE);
     }
+  }
 
-    private Schema.Type convertType(Type type) {
-        try {
-            return TYPE_MAP.getOrDefault(type, COLUMN_DEFAULT_TYPE);
-        } catch (Exception e) {
-            return COLUMN_DEFAULT_TYPE;
-        }
+  private Schema.Type convertType(Type type) {
+    try {
+      return TYPE_MAP.getOrDefault(type, COLUMN_DEFAULT_TYPE);
+    } catch (Exception e) {
+      return COLUMN_DEFAULT_TYPE;
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Condition.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Condition.java
index 793fb271a6..8c6efd0819 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Condition.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Condition.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -18,404 +17,422 @@
 import org.opensearch.sql.legacy.utils.StringUtils;
 
 /**
- * 过滤条件
- *
  * @author ansj
  */
 public class Condition extends Where {
 
-    public enum OPERATOR {
-
-        EQ,
-        GT,
-        LT,
-        GTE,
-        LTE,
-        N,
-        LIKE,
-        NLIKE,
-        REGEXP,
-        IS,
-        ISN,
-        IN,
-        NIN,
-        BETWEEN,
-        NBETWEEN,
-        GEO_INTERSECTS,
-        GEO_BOUNDING_BOX,
-        GEO_DISTANCE,
-        GEO_POLYGON,
-        IN_TERMS,
-        TERM,
-        IDS_QUERY,
-        NESTED_COMPLEX,
-        NOT_EXISTS_NESTED_COMPLEX,
-        CHILDREN_COMPLEX,
-        SCRIPT,
-        NIN_TERMS,
-        NTERM,
-        NREGEXP;
-
-        public static Map<String, OPERATOR> methodNameToOpear;
-
-        public static Map<String, OPERATOR> operStringToOpear;
-
-        public static Map<String, OPERATOR> simpleOperStringToOpear;
-
-        private static BiMap<OPERATOR, OPERATOR> negatives;
-
-        private static BiMap<OPERATOR, OPERATOR> simpleReverses;
-
-        static {
-            methodNameToOpear = new HashMap<>();
-            methodNameToOpear.put("term", TERM);
-            methodNameToOpear.put("matchterm", TERM);
-            methodNameToOpear.put("match_term", TERM);
-            methodNameToOpear.put("terms", IN_TERMS);
-            methodNameToOpear.put("in_terms", IN_TERMS);
-            methodNameToOpear.put("ids", IDS_QUERY);
-            methodNameToOpear.put("ids_query", IDS_QUERY);
-            methodNameToOpear.put("regexp", REGEXP);
-            methodNameToOpear.put("regexp_query", REGEXP);
-        }
-
-        static {
-            operStringToOpear = new HashMap<>();
-            operStringToOpear.put("=", EQ);
-            operStringToOpear.put(">", GT);
-            operStringToOpear.put("<", LT);
-            operStringToOpear.put(">=", GTE);
-            operStringToOpear.put("<=", LTE);
-            operStringToOpear.put("<>", N);
-            operStringToOpear.put("LIKE", LIKE);
-            operStringToOpear.put("NOT", N);
-            operStringToOpear.put("NOT LIKE", NLIKE);
-            operStringToOpear.put("IS", IS);
-            operStringToOpear.put("IS NOT", ISN);
-            operStringToOpear.put("IN", IN);
-            operStringToOpear.put("NOT IN", NIN);
-            operStringToOpear.put("BETWEEN", BETWEEN);
-            operStringToOpear.put("NOT BETWEEN", NBETWEEN);
-            operStringToOpear.put("GEO_INTERSECTS", GEO_INTERSECTS);
-            operStringToOpear.put("GEO_BOUNDING_BOX", GEO_BOUNDING_BOX);
-            operStringToOpear.put("GEO_DISTANCE", GEO_DISTANCE);
-            operStringToOpear.put("GEO_POLYGON", GEO_POLYGON);
-            operStringToOpear.put("NESTED", NESTED_COMPLEX);
-            operStringToOpear.put("CHILDREN", CHILDREN_COMPLEX);
-            operStringToOpear.put("SCRIPT", SCRIPT);
-        }
-
-        static {
-            simpleOperStringToOpear = new HashMap<>();
-            simpleOperStringToOpear.put("=", EQ);
-            simpleOperStringToOpear.put(">", GT);
-            simpleOperStringToOpear.put("<", LT);
-            simpleOperStringToOpear.put(">=", GTE);
-            simpleOperStringToOpear.put("<=", LTE);
-            simpleOperStringToOpear.put("<>", N);
-        }
-
-        static {
-            negatives = HashBiMap.create(7);
-            negatives.put(EQ, N);
-            negatives.put(IN_TERMS, NIN_TERMS);
-            negatives.put(TERM, NTERM);
-            negatives.put(GT, LTE);
-            negatives.put(LT, GTE);
-            negatives.put(LIKE, NLIKE);
-            negatives.put(IS, ISN);
-            negatives.put(IN, NIN);
-            negatives.put(BETWEEN, NBETWEEN);
-            negatives.put(NESTED_COMPLEX, NOT_EXISTS_NESTED_COMPLEX);
-            negatives.put(REGEXP, NREGEXP);
-        }
-
-        static {
-            simpleReverses = HashBiMap.create(4);
-            simpleReverses.put(EQ, EQ);
-            simpleReverses.put(GT, LT);
-            simpleReverses.put(GTE, LTE);
-            simpleReverses.put(N, N);
-        }
-
-        public OPERATOR negative() throws SqlParseException {
-            OPERATOR negative = negatives.get(this);
-            negative = negative != null ? negative : negatives.inverse().get(this);
-            if (negative == null) {
-                throw new SqlParseException(StringUtils.format("Negative operator [%s] is not supported.",
-                        this.name()));
-            }
-            return negative;
-        }
-
-        public OPERATOR simpleReverse() throws SqlParseException {
-            OPERATOR reverse = simpleReverses.get(this);
-            reverse = reverse != null ? reverse : simpleReverses.inverse().get(this);
-            if (reverse == null) {
-                throw new SqlParseException(StringUtils.format("Simple reverse operator [%s] is not supported.",
-                        this.name()));
-            }
-            return reverse;
-        }
-
-        public Boolean isSimpleOperator() {
-            return simpleOperStringToOpear.containsValue(this);
-        }
-    }
-
-    private String name;
-
-    private SQLExpr nameExpr;
-
-    private Object value;
-
-    public SQLExpr getNameExpr() {
-        return nameExpr;
-    }
-
-    public SQLExpr getValueExpr() {
-        return valueExpr;
-    }
-
-    private SQLExpr valueExpr;
-
-    private OPERATOR OPERATOR;
-
-    private Object relationshipType;
-
-    private boolean isNested;
-    private String nestedPath;
-
-    private boolean isChildren;
-    private String childType;
-
-    public Condition(CONN conn, String field, SQLExpr nameExpr, String condition, Object obj, SQLExpr valueExpr)
-            throws SqlParseException {
-        this(conn, field, nameExpr, condition, obj, valueExpr, null);
+  public enum OPERATOR {
+    EQ,
+    GT,
+    LT,
+    GTE,
+    LTE,
+    N,
+    LIKE,
+    NLIKE,
+    REGEXP,
+    IS,
+    ISN,
+    IN,
+    NIN,
+    BETWEEN,
+    NBETWEEN,
+    GEO_INTERSECTS,
+    GEO_BOUNDING_BOX,
+    GEO_DISTANCE,
+    GEO_POLYGON,
+    IN_TERMS,
+    TERM,
+    IDS_QUERY,
+    NESTED_COMPLEX,
+    NOT_EXISTS_NESTED_COMPLEX,
+    CHILDREN_COMPLEX,
+    SCRIPT,
+    NIN_TERMS,
+    NTERM,
+    NREGEXP;
+
+    public static Map<String, OPERATOR> methodNameToOpear;
+
+    public static Map<String, OPERATOR> operStringToOpear;
+
+    public static Map<String, OPERATOR> simpleOperStringToOpear;
+
+    private static BiMap<OPERATOR, OPERATOR> negatives;
+
+    private static BiMap<OPERATOR, OPERATOR> simpleReverses;
+
+    static {
+      methodNameToOpear = new HashMap<>();
+      methodNameToOpear.put("term", TERM);
+      methodNameToOpear.put("matchterm", TERM);
+      methodNameToOpear.put("match_term", TERM);
+      methodNameToOpear.put("terms", IN_TERMS);
+      methodNameToOpear.put("in_terms", IN_TERMS);
+      methodNameToOpear.put("ids", IDS_QUERY);
+      methodNameToOpear.put("ids_query", IDS_QUERY);
+      methodNameToOpear.put("regexp", REGEXP);
+      methodNameToOpear.put("regexp_query", REGEXP);
     }
 
-    public Condition(CONN conn, String field, SQLExpr nameExpr, OPERATOR condition, Object obj, SQLExpr valueExpr)
-            throws SqlParseException {
-        this(conn, field, nameExpr, condition, obj, valueExpr, null);
+    static {
+      operStringToOpear = new HashMap<>();
+      operStringToOpear.put("=", EQ);
+      operStringToOpear.put(">", GT);
+      operStringToOpear.put("<", LT);
+      operStringToOpear.put(">=", GTE);
+      operStringToOpear.put("<=", LTE);
+      operStringToOpear.put("<>", N);
+      operStringToOpear.put("LIKE", LIKE);
+      operStringToOpear.put("NOT", N);
+      operStringToOpear.put("NOT LIKE", NLIKE);
+      operStringToOpear.put("IS", IS);
+      operStringToOpear.put("IS NOT", ISN);
+      operStringToOpear.put("IN", IN);
+      operStringToOpear.put("NOT IN", NIN);
+      operStringToOpear.put("BETWEEN", BETWEEN);
+      operStringToOpear.put("NOT BETWEEN", NBETWEEN);
+      operStringToOpear.put("GEO_INTERSECTS", GEO_INTERSECTS);
+      operStringToOpear.put("GEO_BOUNDING_BOX", GEO_BOUNDING_BOX);
+      operStringToOpear.put("GEO_DISTANCE", GEO_DISTANCE);
+      operStringToOpear.put("GEO_POLYGON", GEO_POLYGON);
+      operStringToOpear.put("NESTED", NESTED_COMPLEX);
+      operStringToOpear.put("CHILDREN", CHILDREN_COMPLEX);
+      operStringToOpear.put("SCRIPT", SCRIPT);
     }
 
-    public Condition(CONN conn, String name, SQLExpr nameExpr, String oper,
-                     Object value, SQLExpr valueExpr, Object relationshipType) throws SqlParseException {
-        super(conn);
-
-        this.OPERATOR = null;
-        this.name = name;
-        this.value = value;
-        this.nameExpr = nameExpr;
-        this.valueExpr = valueExpr;
-
-        this.relationshipType = relationshipType;
-
-        if (this.relationshipType != null) {
-            if (this.relationshipType instanceof NestedType) {
-                NestedType nestedType = (NestedType) relationshipType;
-
-                this.isNested = true;
-                this.nestedPath = nestedType.path;
-                this.isChildren = false;
-                this.childType = "";
-            } else if (relationshipType instanceof ChildrenType) {
-                ChildrenType childrenType = (ChildrenType) relationshipType;
-
-                this.isNested = false;
-                this.nestedPath = "";
-                this.isChildren = true;
-                this.childType = childrenType.childType;
-            }
-        } else {
-            this.isNested = false;
-            this.nestedPath = "";
-            this.isChildren = false;
-            this.childType = "";
-        }
-
-        if (OPERATOR.operStringToOpear.containsKey(oper)) {
-            this.OPERATOR = OPERATOR.operStringToOpear.get(oper);
-        } else {
-            throw new SqlParseException("Unsupported operation: " + oper);
-        }
+    static {
+      simpleOperStringToOpear = new HashMap<>();
+      simpleOperStringToOpear.put("=", EQ);
+      simpleOperStringToOpear.put(">", GT);
+      simpleOperStringToOpear.put("<", LT);
+      simpleOperStringToOpear.put(">=", GTE);
+      simpleOperStringToOpear.put("<=", LTE);
+      simpleOperStringToOpear.put("<>", N);
     }
 
-
-    public Condition(CONN conn,
-                     String name,
-                     SQLExpr nameExpr,
-                     OPERATOR oper,
-                     Object value,
-                     SQLExpr valueExpr,
-                     Object relationshipType
-    ) throws SqlParseException {
-        super(conn);
-
-        this.OPERATOR = null;
-        this.nameExpr = nameExpr;
-        this.valueExpr = valueExpr;
-        this.name = name;
-        this.value = value;
-        this.OPERATOR = oper;
-        this.relationshipType = relationshipType;
-
-        if (this.relationshipType != null) {
-            if (this.relationshipType instanceof NestedType) {
-                NestedType nestedType = (NestedType) relationshipType;
-
-                this.isNested = true;
-                this.nestedPath = nestedType.path;
-                this.isChildren = false;
-                this.childType = "";
-            } else if (relationshipType instanceof ChildrenType) {
-                ChildrenType childrenType = (ChildrenType) relationshipType;
-
-                this.isNested = false;
-                this.nestedPath = "";
-                this.isChildren = true;
-                this.childType = childrenType.childType;
-            }
-        } else {
-            this.isNested = false;
-            this.nestedPath = "";
-            this.isChildren = false;
-            this.childType = "";
-        }
+    static {
+      negatives = HashBiMap.create(7);
+      negatives.put(EQ, N);
+      negatives.put(IN_TERMS, NIN_TERMS);
+      negatives.put(TERM, NTERM);
+      negatives.put(GT, LTE);
+      negatives.put(LT, GTE);
+      negatives.put(LIKE, NLIKE);
+      negatives.put(IS, ISN);
+      negatives.put(IN, NIN);
+      negatives.put(BETWEEN, NBETWEEN);
+      negatives.put(NESTED_COMPLEX, NOT_EXISTS_NESTED_COMPLEX);
+      negatives.put(REGEXP, NREGEXP);
     }
 
-    public String getOpertatorSymbol() throws SqlParseException {
-        switch (OPERATOR) {
-            case EQ:
-                return "==";
-            case GT:
-                return ">";
-            case LT:
-                return "<";
-            case GTE:
-                return ">=";
-            case LTE:
-                return "<=";
-            case N:
-                return "<>";
-            case IS:
-                return "==";
-
-            case ISN:
-                return "!=";
-            default:
-                throw new SqlParseException(StringUtils.format("Failed to parse operator [%s]", OPERATOR));
-        }
+    static {
+      simpleReverses = HashBiMap.create(4);
+      simpleReverses.put(EQ, EQ);
+      simpleReverses.put(GT, LT);
+      simpleReverses.put(GTE, LTE);
+      simpleReverses.put(N, N);
     }
 
-
-    public String getName() {
-        return name;
+    public OPERATOR negative() throws SqlParseException {
+      OPERATOR negative = negatives.get(this);
+      negative = negative != null ? negative : negatives.inverse().get(this);
+      if (negative == null) {
+        throw new SqlParseException(
+            StringUtils.format("Negative operator [%s] is not supported.", this.name()));
+      }
+      return negative;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public OPERATOR simpleReverse() throws SqlParseException {
+      OPERATOR reverse = simpleReverses.get(this);
+      reverse = reverse != null ? reverse : simpleReverses.inverse().get(this);
+      if (reverse == null) {
+        throw new SqlParseException(
+            StringUtils.format("Simple reverse operator [%s] is not supported.", this.name()));
+      }
+      return reverse;
     }
 
-    public Object getValue() {
-        return value;
+    public Boolean isSimpleOperator() {
+      return simpleOperStringToOpear.containsValue(this);
     }
-
-    public void setValue(Object value) {
-        this.value = value;
+  }
+
+  private String name;
+
+  private SQLExpr nameExpr;
+
+  private Object value;
+
+  public SQLExpr getNameExpr() {
+    return nameExpr;
+  }
+
+  public SQLExpr getValueExpr() {
+    return valueExpr;
+  }
+
+  private SQLExpr valueExpr;
+
+  private OPERATOR OPERATOR;
+
+  private Object relationshipType;
+
+  private boolean isNested;
+  private String nestedPath;
+
+  private boolean isChildren;
+  private String childType;
+
+  public Condition(
+      CONN conn, String field, SQLExpr nameExpr, String condition, Object obj, SQLExpr valueExpr)
+      throws SqlParseException {
+    this(conn, field, nameExpr, condition, obj, valueExpr, null);
+  }
+
+  public Condition(
+      CONN conn, String field, SQLExpr nameExpr, OPERATOR condition, Object obj, SQLExpr valueExpr)
+      throws SqlParseException {
+    this(conn, field, nameExpr, condition, obj, valueExpr, null);
+  }
+
+  public Condition(
+      CONN conn,
+      String name,
+      SQLExpr nameExpr,
+      String oper,
+      Object value,
+      SQLExpr valueExpr,
+      Object relationshipType)
+      throws SqlParseException {
+    super(conn);
+
+    this.OPERATOR = null;
+    this.name = name;
+    this.value = value;
+    this.nameExpr = nameExpr;
+    this.valueExpr = valueExpr;
+
+    this.relationshipType = relationshipType;
+
+    if (this.relationshipType != null) {
+      if (this.relationshipType instanceof NestedType) {
+        NestedType nestedType = (NestedType) relationshipType;
+
+        this.isNested = true;
+        this.nestedPath = nestedType.path;
+        this.isChildren = false;
+        this.childType = "";
+      } else if (relationshipType instanceof ChildrenType) {
+        ChildrenType childrenType = (ChildrenType) relationshipType;
+
+        this.isNested = false;
+        this.nestedPath = "";
+        this.isChildren = true;
+        this.childType = childrenType.childType;
+      }
+    } else {
+      this.isNested = false;
+      this.nestedPath = "";
+      this.isChildren = false;
+      this.childType = "";
     }
 
-    public OPERATOR getOPERATOR() {
-        return OPERATOR;
+    if (OPERATOR.operStringToOpear.containsKey(oper)) {
+      this.OPERATOR = OPERATOR.operStringToOpear.get(oper);
+    } else {
+      throw new SqlParseException("Unsupported operation: " + oper);
     }
-
-    public void setOPERATOR(OPERATOR OPERATOR) {
-        this.OPERATOR = OPERATOR;
+  }
+
+  public Condition(
+      CONN conn,
+      String name,
+      SQLExpr nameExpr,
+      OPERATOR oper,
+      Object value,
+      SQLExpr valueExpr,
+      Object relationshipType)
+      throws SqlParseException {
+    super(conn);
+
+    this.OPERATOR = null;
+    this.nameExpr = nameExpr;
+    this.valueExpr = valueExpr;
+    this.name = name;
+    this.value = value;
+    this.OPERATOR = oper;
+    this.relationshipType = relationshipType;
+
+    if (this.relationshipType != null) {
+      if (this.relationshipType instanceof NestedType) {
+        NestedType nestedType = (NestedType) relationshipType;
+
+        this.isNested = true;
+        this.nestedPath = nestedType.path;
+        this.isChildren = false;
+        this.childType = "";
+      } else if (relationshipType instanceof ChildrenType) {
+        ChildrenType childrenType = (ChildrenType) relationshipType;
+
+        this.isNested = false;
+        this.nestedPath = "";
+        this.isChildren = true;
+        this.childType = childrenType.childType;
+      }
+    } else {
+      this.isNested = false;
+      this.nestedPath = "";
+      this.isChildren = false;
+      this.childType = "";
     }
-
-    public Object getRelationshipType() {
-        return relationshipType;
+  }
+
+  public String getOpertatorSymbol() throws SqlParseException {
+    switch (OPERATOR) {
+      case EQ:
+        return "==";
+      case GT:
+        return ">";
+      case LT:
+        return "<";
+      case GTE:
+        return ">=";
+      case LTE:
+        return "<=";
+      case N:
+        return "<>";
+      case IS:
+        return "==";
+
+      case ISN:
+        return "!=";
+      default:
+        throw new SqlParseException(StringUtils.format("Failed to parse operator [%s]", OPERATOR));
     }
-
-    public void setRelationshipType(Object relationshipType) {
-        this.relationshipType = relationshipType;
-    }
-
-    public boolean isNested() {
-        return isNested;
-    }
-
-    public void setNested(boolean isNested) {
-        this.isNested = isNested;
-    }
-
-    public String getNestedPath() {
-        return nestedPath;
-    }
-
-    public void setNestedPath(String nestedPath) {
-        this.nestedPath = nestedPath;
-    }
-
-    public boolean isChildren() {
-        return isChildren;
-    }
-
-    public void setChildren(boolean isChildren) {
-        this.isChildren = isChildren;
-    }
-
-    public String getChildType() {
-        return childType;
-    }
-
-    public void setChildType(String childType) {
-        this.childType = childType;
-    }
-
-    /**
-     * Return true if the opear is {@link OPERATOR#NESTED_COMPLEX}
-     * For example, the opear is {@link OPERATOR#NESTED_COMPLEX} when condition is
-     * nested('projects', projects.started_year > 2000 OR projects.name LIKE '%security%')
-     */
-    public boolean isNestedComplex() {
-        return OPERATOR.NESTED_COMPLEX == OPERATOR;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Object getValue() {
+    return value;
+  }
+
+  public void setValue(Object value) {
+    this.value = value;
+  }
+
+  public OPERATOR getOPERATOR() {
+    return OPERATOR;
+  }
+
+  public void setOPERATOR(OPERATOR OPERATOR) {
+    this.OPERATOR = OPERATOR;
+  }
+
+  public Object getRelationshipType() {
+    return relationshipType;
+  }
+
+  public void setRelationshipType(Object relationshipType) {
+    this.relationshipType = relationshipType;
+  }
+
+  public boolean isNested() {
+    return isNested;
+  }
+
+  public void setNested(boolean isNested) {
+    this.isNested = isNested;
+  }
+
+  public String getNestedPath() {
+    return nestedPath;
+  }
+
+  public void setNestedPath(String nestedPath) {
+    this.nestedPath = nestedPath;
+  }
+
+  public boolean isChildren() {
+    return isChildren;
+  }
+
+  public void setChildren(boolean isChildren) {
+    this.isChildren = isChildren;
+  }
+
+  public String getChildType() {
+    return childType;
+  }
+
+  public void setChildType(String childType) {
+    this.childType = childType;
+  }
+
+  /**
+   * Return true if the opear is {@link OPERATOR#NESTED_COMPLEX} For example, the opear is {@link
+   * OPERATOR#NESTED_COMPLEX} when condition is nested('projects', projects.started_year > 2000 OR
+   * projects.name LIKE '%security%')
+   */
+  public boolean isNestedComplex() {
+    return OPERATOR.NESTED_COMPLEX == OPERATOR;
+  }
+
+  @Override
+  public String toString() {
+    String result = "";
+
+    if (this.isNested()) {
+      result = "nested condition ";
+      if (this.getNestedPath() != null) {
+        result += "on path:" + this.getNestedPath() + " ";
+      }
+    } else if (this.isChildren()) {
+      result = "children condition ";
+
+      if (this.getChildType() != null) {
+        result += "on child: " + this.getChildType() + " ";
+      }
     }
 
-    @Override
-    public String toString() {
-        String result = "";
-
-        if (this.isNested()) {
-            result = "nested condition ";
-            if (this.getNestedPath() != null) {
-                result += "on path:" + this.getNestedPath() + " ";
-            }
-        } else if (this.isChildren()) {
-            result = "children condition ";
-
-            if (this.getChildType() != null) {
-                result += "on child: " + this.getChildType() + " ";
-            }
-        }
-
-        if (value instanceof Object[]) {
-            result += this.conn + " " + this.name + " " + this.OPERATOR + " " + Arrays.toString((Object[]) value);
-        } else {
-            result += this.conn + " " + this.name + " " + this.OPERATOR + " " + this.value;
-        }
-
-        return result;
+    if (value instanceof Object[]) {
+      result +=
+          this.conn
+              + " "
+              + this.name
+              + " "
+              + this.OPERATOR
+              + " "
+              + Arrays.toString((Object[]) value);
+    } else {
+      result += this.conn + " " + this.name + " " + this.OPERATOR + " " + this.value;
     }
 
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        try {
-            return new Condition(this.getConn(), this.getName(), this.getNameExpr(),
-                    this.getOPERATOR(), this.getValue(), this.getValueExpr(), this.getRelationshipType());
-        } catch (SqlParseException e) {
+    return result;
+  }
+
+  @Override
+  public Object clone() throws CloneNotSupportedException {
+    try {
+      return new Condition(
+          this.getConn(),
+          this.getName(),
+          this.getNameExpr(),
+          this.getOPERATOR(),
+          this.getValue(),
+          this.getValueExpr(),
+          this.getRelationshipType());
+    } catch (SqlParseException e) {
 
-        }
-        return null;
     }
+    return null;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Delete.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Delete.java
index 587a8b3ef9..efa77da0a5 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Delete.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Delete.java
@@ -3,12 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
-/**
- * SQL Delete statement.
- */
-public class Delete extends Query {
-
-}
+/** SQL Delete statement. */
+public class Delete extends Query {}
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Field.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Field.java
index 856f590510..09471fa2d7 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Field.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Field.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -13,143 +12,136 @@
 import org.opensearch.sql.legacy.parser.NestedType;
 
 /**
- * 搜索域
- *
  * @author ansj
  */
 public class Field implements Cloneable {
 
-    /**
-     * Constant for '*' field in SELECT
-     */
-    public static final Field STAR = new Field("*", "");
-
-    protected String name;
-    protected SQLAggregateOption option;
-    private String alias;
-    private NestedType nested;
-    private ChildrenType children;
-    private SQLExpr expression;
-
-    public Field(String name, String alias) {
-        this.name = name;
-        this.alias = alias;
-        this.nested = null;
-        this.children = null;
-        this.option = null;
-    }
-
-    public Field(String name, String alias, NestedType nested, ChildrenType children) {
-        this.name = name;
-        this.alias = alias;
-        this.nested = nested;
-        this.children = children;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getAlias() {
-        return alias;
-    }
-
-    public void setAlias(String alias) {
-        this.alias = alias;
-    }
-
-    public boolean isNested() {
-        return this.nested != null;
-    }
-
-    public boolean isReverseNested() {
-        return this.nested != null && this.nested.isReverse();
-    }
-
-    public void setNested(NestedType nested) {
-        this.nested = nested;
-    }
-
-    public String getNestedPath() {
-        if (this.nested == null) {
-            return null;
-        }
-
-        return this.nested.path;
-    }
-
-    public boolean isChildren() {
-        return this.children != null;
-    }
-
-    public void setChildren(ChildrenType children) {
-        this.children = children;
-    }
-
-    public String getChildType() {
-        if (this.children == null) {
-            return null;
-        }
-        return this.children.childType;
-    }
-
-    public void setAggregationOption(SQLAggregateOption option) {
-        this.option = option;
-    }
-
-    public SQLAggregateOption getOption() {
-        return option;
-    }
-
-    @Override
-    public String toString() {
-        return this.name;
-    }
+  /** Constant for '*' field in SELECT */
+  public static final Field STAR = new Field("*", "");
+
+  protected String name;
+  protected SQLAggregateOption option;
+  private String alias;
+  private NestedType nested;
+  private ChildrenType children;
+  private SQLExpr expression;
+
+  public Field(String name, String alias) {
+    this.name = name;
+    this.alias = alias;
+    this.nested = null;
+    this.children = null;
+    this.option = null;
+  }
+
+  public Field(String name, String alias, NestedType nested, ChildrenType children) {
+    this.name = name;
+    this.alias = alias;
+    this.nested = nested;
+    this.children = children;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getAlias() {
+    return alias;
+  }
+
+  public void setAlias(String alias) {
+    this.alias = alias;
+  }
+
+  public boolean isNested() {
+    return this.nested != null;
+  }
+
+  public boolean isReverseNested() {
+    return this.nested != null && this.nested.isReverse();
+  }
+
+  public void setNested(NestedType nested) {
+    this.nested = nested;
+  }
+
+  public String getNestedPath() {
+    if (this.nested == null) {
+      return null;
+    }
+
+    return this.nested.path;
+  }
+
+  public boolean isChildren() {
+    return this.children != null;
+  }
+
+  public void setChildren(ChildrenType children) {
+    this.children = children;
+  }
+
+  public String getChildType() {
+    if (this.children == null) {
+      return null;
+    }
+    return this.children.childType;
+  }
+
+  public void setAggregationOption(SQLAggregateOption option) {
+    this.option = option;
+  }
+
+  public SQLAggregateOption getOption() {
+    return option;
+  }
+
+  @Override
+  public String toString() {
+    return this.name;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (obj == null) {
+      return false;
+    }
+    if (obj.getClass() != this.getClass()) {
+      return false;
+    }
+    Field other = (Field) obj;
+    boolean namesAreEqual =
+        (other.getName() == null && this.name == null) || other.getName().equals(this.name);
+    if (!namesAreEqual) {
+      return false;
+    }
+    return (other.getAlias() == null && this.alias == null) || other.getAlias().equals(this.alias);
+  }
+
+  @Override
+  public int hashCode() { // Bug: equals() is present but hashCode was missing
+    return Objects.hash(name, alias);
+  }
+
+  @Override
+  protected Object clone() throws CloneNotSupportedException {
+    return new Field(new String(this.name), new String(this.alias));
+  }
+
+  /** Returns true if the field is script field. */
+  public boolean isScriptField() {
+    return false;
+  }
+
+  public void setExpression(SQLExpr expression) {
+    this.expression = expression;
+  }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (obj.getClass() != this.getClass()) {
-            return false;
-        }
-        Field other = (Field) obj;
-        boolean namesAreEqual = (other.getName() == null && this.name == null)
-                || other.getName().equals(this.name);
-        if (!namesAreEqual) {
-            return false;
-        }
-        return (other.getAlias() == null && this.alias == null)
-                || other.getAlias().equals(this.alias);
-    }
-
-    @Override
-    public int hashCode() { // Bug: equals() is present but hashCode was missing
-        return Objects.hash(name, alias);
-    }
-
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        return new Field(new String(this.name), new String(this.alias));
-    }
-
-    /**
-     * Returns true if the field is script field.
-     */
-    public boolean isScriptField() {
-        return false;
-    }
-
-    public void setExpression(SQLExpr expression) {
-        this.expression = expression;
-    }
-
-    public SQLExpr getExpression() {
-        return expression;
-    }
+  public SQLExpr getExpression() {
+    return expression;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/From.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/From.java
index 6455df727c..67ac7f0e3c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/From.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/From.java
@@ -3,55 +3,49 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
-
-/**
- * Represents the from clause.
- * Contains index and type which the
- * query refer to.
- */
+/** Represents the from clause. Contains index and type which the query refer to. */
 public class From {
-    private String index;
-    private String alias;
-
-    /**
-     * Extract index and type from the 'from' string
-     *
-     * @param from The part after the FROM keyword.
-     */
-    public From(String from) {
-        index = from;
-    }
-
-    public From(String from, String alias) {
-        this(from);
-        this.alias = alias;
-    }
-
-    public String getIndex() {
-        return index;
-    }
-
-    public void setIndex(String index) {
-        this.index = index;
-    }
-
-    public String getAlias() {
-        return alias;
-    }
-
-    public void setAlias(String alias) {
-        this.alias = alias;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder str = new StringBuilder(index);
-        if (alias != null) {
-            str.append(" AS ").append(alias);
-        }
-        return str.toString();
+  private String index;
+  private String alias;
+
+  /**
+   * Extract index and type from the 'from' string
+   *
+   * @param from The part after the FROM keyword.
+   */
+  public From(String from) {
+    index = from;
+  }
+
+  public From(String from, String alias) {
+    this(from);
+    this.alias = alias;
+  }
+
+  public String getIndex() {
+    return index;
+  }
+
+  public void setIndex(String index) {
+    this.index = index;
+  }
+
+  public String getAlias() {
+    return alias;
+  }
+
+  public void setAlias(String alias) {
+    this.alias = alias;
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder str = new StringBuilder(index);
+    if (alias != null) {
+      str.append(" AS ").append(alias);
     }
+    return str.toString();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Having.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Having.java
index 30cfba4c7a..393ee0aa6e 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Having.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Having.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import static java.util.stream.Collectors.joining;
@@ -27,196 +26,188 @@
 
 /**
  * Domain object for HAVING clause in SQL which covers both the parsing and explain logic.
- * <p>
- * Responsibilities:
- * 1. Parsing: parse conditions out during initialization
- * 2. Explain: translate conditions to OpenSearch query DSL (Bucket Selector Aggregation)
+ *
+ * <p>Responsibilities: 1. Parsing: parse conditions out during initialization 2. Explain: translate
+ * conditions to OpenSearch query DSL (Bucket Selector Aggregation)
  */
 public class Having {
 
-    private static final String BUCKET_SELECTOR_NAME = "bucket_filter";
-    private static final String PARAMS = "params.";
-    private static final String AND = " && ";
-    private static final String OR = " || ";
-
-    /**
-     * Conditions parsed out of HAVING clause
-     */
-    private final List<Where> conditions;
-
-    private HavingParser havingParser;
-
-    public List<Field> getHavingFields() {
-        return havingParser.getHavingFields();
+  private static final String BUCKET_SELECTOR_NAME = "bucket_filter";
+  private static final String PARAMS = "params.";
+  private static final String AND = " && ";
+  private static final String OR = " || ";
+
+  /** Conditions parsed out of HAVING clause */
+  private final List<Where> conditions;
+
+  private HavingParser havingParser;
+
+  public List<Field> getHavingFields() {
+    return havingParser.getHavingFields();
+  }
+
+  /**
+   * Construct by HAVING expression
+   *
+   * @param havingExpr having expression
+   * @param parser where parser
+   * @throws SqlParseException exception thrown by where parser
+   */
+  public Having(SQLExpr havingExpr, WhereParser parser) throws SqlParseException {
+    havingParser = new HavingParser(parser);
+    conditions = parseHavingExprToConditions(havingExpr, havingParser);
+  }
+
+  public List<Where> getConditions() {
+    return conditions;
+  }
+
+  /**
+   * Construct by GROUP BY expression with null check
+   *
+   * @param groupByExpr group by expression
+   * @param parser where parser
+   * @throws SqlParseException exception thrown by where parser
+   */
+  public Having(SQLSelectGroupByClause groupByExpr, WhereParser parser) throws SqlParseException {
+    this(groupByExpr == null ? null : groupByExpr.getHaving(), parser);
+  }
+
+  /**
+   * Add Bucket Selector Aggregation under group by aggregation with sibling of aggregation of
+   * fields in SELECT. OpenSearch makes sure that all sibling runs before bucket selector
+   * aggregation.
+   *
+   * @param groupByAgg aggregation builder for GROUP BY clause
+   * @param fields fields in SELECT clause
+   * @throws SqlParseException exception thrown for unknown expression
+   */
+  public void explain(AggregationBuilder groupByAgg, List<Field> fields) throws SqlParseException {
+    if (groupByAgg == null || conditions.isEmpty()) {
+      return;
     }
 
-    /**
-     * Construct by HAVING expression
-     *
-     * @param havingExpr having expression
-     * @param parser     where parser
-     * @throws SqlParseException exception thrown by where parser
-     */
-    public Having(SQLExpr havingExpr, WhereParser parser) throws SqlParseException {
-        havingParser = new HavingParser(parser);
-        conditions = parseHavingExprToConditions(havingExpr, havingParser);
+    // parsing the fields from SELECT and HAVING clause
+    groupByAgg.subAggregation(
+        bucketSelector(
+            BUCKET_SELECTOR_NAME,
+            contextForFieldsInSelect(Iterables.concat(fields, getHavingFields())),
+            explainConditions()));
+  }
+
+  private List<Where> parseHavingExprToConditions(SQLExpr havingExpr, HavingParser parser)
+      throws SqlParseException {
+    if (havingExpr == null) {
+      return Collections.emptyList();
     }
 
-    public List<Where> getConditions() {
-        return conditions;
+    Where where = Where.newInstance();
+    parser.parseWhere(havingExpr, where);
+    return where.getWheres();
+  }
+
+  private Map<String, String> contextForFieldsInSelect(Iterable<Field> fields) {
+    Map<String, String> context = new HashMap<>();
+    for (Field field : fields) {
+      if (field instanceof MethodField) {
+        // It's required to add to context even if alias in SELECT is exactly same name as that in
+        // script
+        context.put(
+            field.getAlias(), bucketsPath(field.getAlias(), ((MethodField) field).getParams()));
+      }
     }
-
-    /**
-     * Construct by GROUP BY expression with null check
-     *
-     * @param groupByExpr group by expression
-     * @param parser      where parser
-     * @throws SqlParseException exception thrown by where parser
-     */
-    public Having(SQLSelectGroupByClause groupByExpr, WhereParser parser) throws SqlParseException {
-        this(groupByExpr == null ? null : groupByExpr.getHaving(), parser);
+    return context;
+  }
+
+  private Script explainConditions() throws SqlParseException {
+    return new Script(doExplain(conditions));
+  }
+
+  /**
+   * Explain conditions recursively. Example: HAVING c >= 2 OR NOT (a > 20 AND c <= 10 OR a < 1) OR
+   * a < 5 Object: Where(?: [ Condition(?:c>=2), Where(or: [ Where(?:a<=20), Where(or:c>10),
+   * Where(and:a>=1)], ]), Condition(or:a<5) ])
+   *
+   * <p>Note: a) Where(connector : condition expression). b) Condition is a subclass of Where. c)
+   * connector=? means it doesn't matter for first condition in the list
+   *
+   * @param wheres conditions
+   * @return painless script string
+   * @throws SqlParseException unknown type of expression other than identifier and value
+   */
+  private String doExplain(List<Where> wheres) throws SqlParseException {
+    if (wheres == null || wheres.isEmpty()) {
+      return "";
     }
 
-    /**
-     * Add Bucket Selector Aggregation under group by aggregation with sibling of aggregation of fields in SELECT.
-     * OpenSearch makes sure that all sibling runs before bucket selector aggregation.
-     *
-     * @param groupByAgg aggregation builder for GROUP BY clause
-     * @param fields     fields in SELECT clause
-     * @throws SqlParseException exception thrown for unknown expression
-     */
-    public void explain(AggregationBuilder groupByAgg, List<Field> fields) throws SqlParseException {
-        if (groupByAgg == null || conditions.isEmpty()) {
-            return;
-        }
-
-        // parsing the fields from SELECT and HAVING clause
-        groupByAgg.subAggregation(bucketSelector(BUCKET_SELECTOR_NAME,
-                contextForFieldsInSelect(Iterables.concat(fields, getHavingFields())),
-                explainConditions()));
+    StringBuilder script = new StringBuilder();
+    for (Where cond : wheres) {
+      if (script.length() > 0) {
+        script.append(cond.getConn() == Where.CONN.AND ? AND : OR);
+      }
+
+      if (cond instanceof Condition) {
+        script.append(createScript((Condition) cond));
+      } else {
+        script.append('(').append(doExplain(cond.getWheres())).append(')');
+      }
     }
-
-    private List<Where> parseHavingExprToConditions(SQLExpr havingExpr, HavingParser parser)
-            throws SqlParseException {
-        if (havingExpr == null) {
-            return Collections.emptyList();
+    return script.toString();
+  }
+
+  private String createScript(Condition cond) throws SqlParseException {
+    String name = cond.getName();
+    Object value = cond.getValue();
+    switch (cond.getOPERATOR()) {
+      case EQ:
+      case GT:
+      case LT:
+      case GTE:
+      case LTE:
+      case IS:
+      case ISN:
+        return expr(name, cond.getOpertatorSymbol(), value);
+      case N:
+        return expr(name, "!=", value);
+      case BETWEEN:
+        {
+          Object[] values = (Object[]) value;
+          return expr(name, ">=", values[0]) + AND + expr(name, "<=", values[1]);
         }
-
-        Where where = Where.newInstance();
-        parser.parseWhere(havingExpr, where);
-        return where.getWheres();
-    }
-
-    private Map<String, String> contextForFieldsInSelect(Iterable<Field> fields) {
-        Map<String, String> context = new HashMap<>();
-        for (Field field : fields) {
-            if (field instanceof MethodField) {
-                // It's required to add to context even if alias in SELECT is exactly same name as that in script
-                context.put(field.getAlias(), bucketsPath(field.getAlias(), ((MethodField) field).getParams()));
-            }
+      case NBETWEEN:
+        {
+          Object[] values = (Object[]) value;
+          return expr(name, "<", values[0]) + OR + expr(name, ">", values[1]);
         }
-        return context;
-    }
-
-    private Script explainConditions() throws SqlParseException {
-        return new Script(doExplain(conditions));
+      case IN:
+        return Arrays.stream((Object[]) value)
+            .map(val -> expr(name, "==", val))
+            .collect(joining(OR));
+      case NIN:
+        return Arrays.stream((Object[]) value)
+            .map(val -> expr(name, "!=", val))
+            .collect(joining(AND));
+      default:
+        throw new SqlParseException(
+            "Unsupported operation in HAVING clause: " + cond.getOPERATOR());
     }
-
-    /**
-     * Explain conditions recursively.
-     * Example: HAVING c >= 2 OR NOT (a > 20 AND c <= 10 OR a < 1) OR a < 5
-     * Object: Where(?:
-     * [
-     * Condition(?:c>=2),
-     * Where(or:
-     * [
-     * Where(?:a<=20), Where(or:c>10), Where(and:a>=1)],
-     * ]),
-     * Condition(or:a<5)
-     * ])
-     * <p>
-     * Note: a) Where(connector : condition expression).
-     * b) Condition is a subclass of Where.
-     * c) connector=? means it doesn't matter for first condition in the list
-     *
-     * @param wheres conditions
-     * @return painless script string
-     * @throws SqlParseException unknown type of expression other than identifier and value
-     */
-    private String doExplain(List<Where> wheres) throws SqlParseException {
-        if (wheres == null || wheres.isEmpty()) {
-            return "";
-        }
-
-        StringBuilder script = new StringBuilder();
-        for (Where cond : wheres) {
-            if (script.length() > 0) {
-                script.append(cond.getConn() == Where.CONN.AND ? AND : OR);
-            }
-
-            if (cond instanceof Condition) {
-                script.append(createScript((Condition) cond));
-            } else {
-                script.append('(').
-                        append(doExplain(cond.getWheres())).
-                        append(')');
-            }
-        }
-        return script.toString();
-    }
-
-    private String createScript(Condition cond) throws SqlParseException {
-        String name = cond.getName();
-        Object value = cond.getValue();
-        switch (cond.getOPERATOR()) {
-            case EQ:
-            case GT:
-            case LT:
-            case GTE:
-            case LTE:
-            case IS:
-            case ISN:
-                return expr(name, cond.getOpertatorSymbol(), value);
-            case N:
-                return expr(name, "!=", value);
-            case BETWEEN: {
-                Object[] values = (Object[]) value;
-                return expr(name, ">=", values[0]) + AND + expr(name, "<=", values[1]);
-            }
-            case NBETWEEN: {
-                Object[] values = (Object[]) value;
-                return expr(name, "<", values[0]) + OR + expr(name, ">", values[1]);
-            }
-            case IN:
-                return Arrays.stream((Object[]) value).
-                        map(val -> expr(name, "==", val)).
-                        collect(joining(OR));
-            case NIN:
-                return Arrays.stream((Object[]) value).
-                        map(val -> expr(name, "!=", val)).
-                        collect(joining(AND));
-            default:
-                throw new SqlParseException("Unsupported operation in HAVING clause: " + cond.getOPERATOR());
-        }
-    }
-
-    private String expr(String name, String operator, Object value) {
-        return String.join(" ", PARAMS + name, operator, value.toString());
-    }
-
-    /**
-     * Build the buckets_path.
-     * If the field is nested field, using the bucket path.
-     * else using the alias.
-     */
-    private String bucketsPath(String alias, List<KVValue> kvValueList) {
-        if (kvValueList.size() == 1) {
-            KVValue kvValue = kvValueList.get(0);
-            if (StringUtils.equals(kvValue.key, "nested")
-                && kvValue.value instanceof NestedType) {
-                return ((NestedType) kvValue.value).getBucketPath();
-            }
-        }
-        return alias;
+  }
+
+  private String expr(String name, String operator, Object value) {
+    return String.join(" ", PARAMS + name, operator, value.toString());
+  }
+
+  /**
+   * Build the buckets_path. If the field is nested field, using the bucket path. else using the
+   * alias.
+   */
+  private String bucketsPath(String alias, List<KVValue> kvValueList) {
+    if (kvValueList.size() == 1) {
+      KVValue kvValue = kvValueList.get(0);
+      if (StringUtils.equals(kvValue.key, "nested") && kvValue.value instanceof NestedType) {
+        return ((NestedType) kvValue.value).getBucketPath();
+      }
     }
+    return alias;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/IndexStatement.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/IndexStatement.java
index e97a482b40..2a5be5728c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/IndexStatement.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/IndexStatement.java
@@ -3,89 +3,87 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
-/**
- * Class used to differentiate SHOW and DESCRIBE statements
- */
+/** Class used to differentiate SHOW and DESCRIBE statements */
 public class IndexStatement implements QueryStatement {
 
-    private StatementType statementType;
-    private String query;
-    private String indexPattern;
-    private String columnPattern;
-
-    public IndexStatement(StatementType statementType, String query) {
-        this.statementType = statementType;
-        this.query = query;
-
-        parseQuery();
-    }
-
-    private void parseQuery() {
-        String[] statement = query.split(" ");
-
-        int tokenLength = statement.length;
-        try {
-            for (int i = 1; i < tokenLength; i++) {
-                switch (statement[i].toUpperCase()) {
-                    case "TABLES":
-                        if (i + 1 < tokenLength && statement[i + 1].equalsIgnoreCase("LIKE")) {
-                            if (i + 2 < tokenLength) {
-                                indexPattern = replaceWildcard(statement[i + 2]);
-                                i += 2;
-                            }
-                        }
-                        break;
-                    case "COLUMNS":
-                        if (i + 1 < tokenLength && statement[i + 1].equalsIgnoreCase("LIKE")) {
-                            if (i + 2 < tokenLength) {
-                                columnPattern = replaceWildcard(statement[i + 2]);
-                                i += 2;
-                            }
-                        }
-                        break;
-                }
+  private StatementType statementType;
+  private String query;
+  private String indexPattern;
+  private String columnPattern;
+
+  public IndexStatement(StatementType statementType, String query) {
+    this.statementType = statementType;
+    this.query = query;
+
+    parseQuery();
+  }
+
+  private void parseQuery() {
+    String[] statement = query.split(" ");
+
+    int tokenLength = statement.length;
+    try {
+      for (int i = 1; i < tokenLength; i++) {
+        switch (statement[i].toUpperCase()) {
+          case "TABLES":
+            if (i + 1 < tokenLength && statement[i + 1].equalsIgnoreCase("LIKE")) {
+              if (i + 2 < tokenLength) {
+                indexPattern = replaceWildcard(statement[i + 2]);
+                i += 2;
+              }
             }
-
-            if (indexPattern == null) {
-                throw new IllegalArgumentException();
+            break;
+          case "COLUMNS":
+            if (i + 1 < tokenLength && statement[i + 1].equalsIgnoreCase("LIKE")) {
+              if (i + 2 < tokenLength) {
+                columnPattern = replaceWildcard(statement[i + 2]);
+                i += 2;
+              }
             }
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Expected syntax example: " + syntaxString(), e);
+            break;
         }
-    }
+      }
 
-    private String replaceWildcard(String str) {
-        return str.replace("%", ".*").replace("_", ".");
+      if (indexPattern == null) {
+        throw new IllegalArgumentException();
+      }
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Expected syntax example: " + syntaxString(), e);
     }
+  }
 
-    private String syntaxString() {
-        if (statementType.equals(StatementType.SHOW)) {
-            return "'SHOW TABLES LIKE <table pattern>'";
-        } else {
-            return "'DESCRIBE TABLES LIKE <table pattern> [COLUMNS LIKE <column pattern>]'";
-        }
-    }
+  private String replaceWildcard(String str) {
+    return str.replace("%", ".*").replace("_", ".");
+  }
 
-    public StatementType getStatementType() {
-        return statementType;
+  private String syntaxString() {
+    if (statementType.equals(StatementType.SHOW)) {
+      return "'SHOW TABLES LIKE <table pattern>'";
+    } else {
+      return "'DESCRIBE TABLES LIKE <table pattern> [COLUMNS LIKE <column pattern>]'";
     }
+  }
 
-    public String getQuery() {
-        return query;
-    }
+  public StatementType getStatementType() {
+    return statementType;
+  }
 
-    public String getIndexPattern() {
-        return indexPattern;
-    }
+  public String getQuery() {
+    return query;
+  }
 
-    public String getColumnPattern() {
-        return columnPattern;
-    }
+  public String getIndexPattern() {
+    return indexPattern;
+  }
 
-    public enum StatementType {
-        SHOW, DESCRIBE
-    }
+  public String getColumnPattern() {
+    return columnPattern;
+  }
+
+  public enum StatementType {
+    SHOW,
+    DESCRIBE
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/JoinSelect.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/JoinSelect.java
index c77df6e9ad..211b33c68a 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/JoinSelect.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/JoinSelect.java
@@ -3,85 +3,78 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
 import java.util.List;
 import org.opensearch.sql.legacy.domain.hints.Hint;
 
-/**
- * Created by Eliran on 20/8/2015.
- */
+/** Created by Eliran on 20/8/2015. */
 public class JoinSelect extends Query {
 
+  private TableOnJoinSelect firstTable;
+  private TableOnJoinSelect secondTable;
+  private Where connectedWhere;
+  private List<Hint> hints;
+  private List<Condition> connectedConditions;
+  private int totalLimit;
 
-    private TableOnJoinSelect firstTable;
-    private TableOnJoinSelect secondTable;
-    private Where connectedWhere;
-    private List<Hint> hints;
-    private List<Condition> connectedConditions;
-    private int totalLimit;
-
-    private final int DEAFULT_NUM_OF_RESULTS = 200;
-
-    private SQLJoinTableSource.JoinType joinType;
-
-
-    public JoinSelect() {
-        firstTable = new TableOnJoinSelect();
-        secondTable = new TableOnJoinSelect();
+  private final int DEAFULT_NUM_OF_RESULTS = 200;
 
-        totalLimit = DEAFULT_NUM_OF_RESULTS;
-    }
+  private SQLJoinTableSource.JoinType joinType;
 
+  public JoinSelect() {
+    firstTable = new TableOnJoinSelect();
+    secondTable = new TableOnJoinSelect();
 
-    public Where getConnectedWhere() {
-        return connectedWhere;
-    }
+    totalLimit = DEAFULT_NUM_OF_RESULTS;
+  }
 
-    public void setConnectedWhere(Where connectedWhere) {
-        this.connectedWhere = connectedWhere;
-    }
+  public Where getConnectedWhere() {
+    return connectedWhere;
+  }
 
-    public TableOnJoinSelect getFirstTable() {
-        return firstTable;
-    }
+  public void setConnectedWhere(Where connectedWhere) {
+    this.connectedWhere = connectedWhere;
+  }
 
-    public TableOnJoinSelect getSecondTable() {
-        return secondTable;
-    }
+  public TableOnJoinSelect getFirstTable() {
+    return firstTable;
+  }
 
+  public TableOnJoinSelect getSecondTable() {
+    return secondTable;
+  }
 
-    public SQLJoinTableSource.JoinType getJoinType() {
-        return joinType;
-    }
+  public SQLJoinTableSource.JoinType getJoinType() {
+    return joinType;
+  }
 
-    public void setJoinType(SQLJoinTableSource.JoinType joinType) {
-        this.joinType = joinType;
-    }
+  public void setJoinType(SQLJoinTableSource.JoinType joinType) {
+    this.joinType = joinType;
+  }
 
-    public List<Hint> getHints() {
-        return hints;
-    }
+  public List<Hint> getHints() {
+    return hints;
+  }
 
-    public void setHints(List<Hint> hints) {
-        this.hints = hints;
-    }
+  public void setHints(List<Hint> hints) {
+    this.hints = hints;
+  }
 
-    public int getTotalLimit() {
-        return totalLimit;
-    }
+  public int getTotalLimit() {
+    return totalLimit;
+  }
 
-    public List<Condition> getConnectedConditions() {
-        return connectedConditions;
-    }
+  public List<Condition> getConnectedConditions() {
+    return connectedConditions;
+  }
 
-    public void setConnectedConditions(List<Condition> connectedConditions) {
-        this.connectedConditions = connectedConditions;
-    }
+  public void setConnectedConditions(List<Condition> connectedConditions) {
+    this.connectedConditions = connectedConditions;
+  }
 
-    public void setTotalLimit(int totalLimit) {
-        this.totalLimit = totalLimit;
-    }
+  public void setTotalLimit(int totalLimit) {
+    this.totalLimit = totalLimit;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/KVValue.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/KVValue.java
index 10e2ad3d12..d864cbac12 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/KVValue.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/KVValue.java
@@ -3,30 +3,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 public class KVValue implements Cloneable {
-    public String key;
-    public Object value;
+  public String key;
+  public Object value;
 
-    public KVValue(Object value) {
-        this.value = value;
-    }
+  public KVValue(Object value) {
+    this.value = value;
+  }
 
-    public KVValue(String key, Object value) {
-        if (key != null) {
-            this.key = key.replace("'", "");
-        }
-        this.value = value;
+  public KVValue(String key, Object value) {
+    if (key != null) {
+      this.key = key.replace("'", "");
     }
+    this.value = value;
+  }
 
-    @Override
-    public String toString() {
-        if (key == null) {
-            return value.toString();
-        } else {
-            return key + "=" + value;
-        }
+  @Override
+  public String toString() {
+    if (key == null) {
+      return value.toString();
+    } else {
+      return key + "=" + value;
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/MethodField.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/MethodField.java
index 62eff626c4..45d6d1053e 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/MethodField.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/MethodField.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import com.alibaba.druid.sql.ast.expr.SQLAggregateOption;
@@ -14,96 +13,94 @@
 import org.opensearch.sql.legacy.utils.Util;
 
 /**
- * 搜索域
- *
  * @author ansj
  */
 public class MethodField extends Field {
-    private List<KVValue> params = null;
-
-    public MethodField(String name, List<KVValue> params, SQLAggregateOption option, String alias) {
-        super(name, alias);
-        this.params = params;
-        this.option = option;
-        if (alias == null || alias.trim().length() == 0) {
-            Map<String, Object> paramsAsMap = this.getParamsAsMap();
-            if (paramsAsMap.containsKey("alias")) {
-                this.setAlias(paramsAsMap.get("alias").toString());
-            } else {
-                this.setAlias(this.toString());
-            }
-        }
+  private List<KVValue> params = null;
+
+  public MethodField(String name, List<KVValue> params, SQLAggregateOption option, String alias) {
+    super(name, alias);
+    this.params = params;
+    this.option = option;
+    if (alias == null || alias.trim().length() == 0) {
+      Map<String, Object> paramsAsMap = this.getParamsAsMap();
+      if (paramsAsMap.containsKey("alias")) {
+        this.setAlias(paramsAsMap.get("alias").toString());
+      } else {
+        this.setAlias(this.toString());
+      }
     }
+  }
 
-    public List<KVValue> getParams() {
-        return params;
-    }
+  public List<KVValue> getParams() {
+    return params;
+  }
 
-    public Map<String, Object> getParamsAsMap() {
-        Map<String, Object> paramsAsMap = new HashMap<>();
-        if (this.params == null) {
-            return paramsAsMap;
-        }
-        for (KVValue kvValue : this.params) {
-            paramsAsMap.put(kvValue.key, kvValue.value);
-        }
-        return paramsAsMap;
+  public Map<String, Object> getParamsAsMap() {
+    Map<String, Object> paramsAsMap = new HashMap<>();
+    if (this.params == null) {
+      return paramsAsMap;
     }
-
-    @Override
-    public String toString() {
-        if (option != null) {
-            return this.name + "(" + option + " " + Util.joiner(params, ",") + ")";
-        }
-        return this.name + "(" + Util.joiner(params, ",") + ")";
+    for (KVValue kvValue : this.params) {
+      paramsAsMap.put(kvValue.key, kvValue.value);
     }
+    return paramsAsMap;
+  }
 
-    @Override
-    public boolean isNested() {
-        Map<String, Object> paramsAsMap = this.getParamsAsMap();
-        return paramsAsMap.containsKey("nested") || paramsAsMap.containsKey("reverse_nested");
+  @Override
+  public String toString() {
+    if (option != null) {
+      return this.name + "(" + option + " " + Util.joiner(params, ",") + ")";
     }
-
-    @Override
-    public boolean isReverseNested() {
-        return this.getParamsAsMap().containsKey("reverse_nested");
+    return this.name + "(" + Util.joiner(params, ",") + ")";
+  }
+
+  @Override
+  public boolean isNested() {
+    Map<String, Object> paramsAsMap = this.getParamsAsMap();
+    return paramsAsMap.containsKey("nested") || paramsAsMap.containsKey("reverse_nested");
+  }
+
+  @Override
+  public boolean isReverseNested() {
+    return this.getParamsAsMap().containsKey("reverse_nested");
+  }
+
+  @Override
+  public String getNestedPath() {
+    if (!this.isNested()) {
+      return null;
     }
-
-    @Override
-    public String getNestedPath() {
-        if (!this.isNested()) {
-            return null;
-        }
-        if (this.isReverseNested()) {
-            String reverseNestedPath = this.getParamsAsMap().get("reverse_nested").toString();
-            return reverseNestedPath.isEmpty() ? null : reverseNestedPath;
-        }
-
-        // Fix bug: NestedType.toString() isn't implemented which won't return desired nested path
-        Object nestedField = getParamsAsMap().get("nested");
-        if (nestedField instanceof NestedType) {
-            return ((NestedType) nestedField).path;
-        }
-        return nestedField.toString();
+    if (this.isReverseNested()) {
+      String reverseNestedPath = this.getParamsAsMap().get("reverse_nested").toString();
+      return reverseNestedPath.isEmpty() ? null : reverseNestedPath;
     }
 
-    @Override
-    public boolean isChildren() {
-        Map<String, Object> paramsAsMap = this.getParamsAsMap();
-        return paramsAsMap.containsKey("children");
+    // Fix bug: NestedType.toString() isn't implemented which won't return desired nested path
+    Object nestedField = getParamsAsMap().get("nested");
+    if (nestedField instanceof NestedType) {
+      return ((NestedType) nestedField).path;
     }
-
-    @Override
-    public String getChildType() {
-        if (!this.isChildren()) {
-            return null;
-        }
-
-        return this.getParamsAsMap().get("children").toString();
+    return nestedField.toString();
+  }
+
+  @Override
+  public boolean isChildren() {
+    Map<String, Object> paramsAsMap = this.getParamsAsMap();
+    return paramsAsMap.containsKey("children");
+  }
+
+  @Override
+  public String getChildType() {
+    if (!this.isChildren()) {
+      return null;
     }
 
-    @Override
-    public boolean isScriptField() {
-        return "script".equals(getName());
-    }
+    return this.getParamsAsMap().get("children").toString();
+  }
+
+  @Override
+  public boolean isScriptField() {
+    return "script".equals(getName());
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Order.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Order.java
index 2aee7cdabf..f593d6c428 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Order.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Order.java
@@ -3,56 +3,53 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 /**
- * 排序规则
- *
  * @author ansj
  */
 public class Order {
-    private String nestedPath;
-    private String name;
-    private String type;
-    private Field sortField;
-
-    public boolean isScript() {
-        return sortField != null && sortField.isScriptField();
-    }
-
-    public Order(String nestedPath, String name, String type, Field sortField) {
-        this.nestedPath = nestedPath;
-        this.name = name;
-        this.type = type;
-        this.sortField = sortField;
-    }
-
-    public String getNestedPath() {
-        return nestedPath;
-    }
-
-    public void setNestedPath(String nestedPath) {
-        this.nestedPath = nestedPath;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Field getSortField() {
-        return sortField;
-    }
+  private String nestedPath;
+  private String name;
+  private String type;
+  private Field sortField;
+
+  public boolean isScript() {
+    return sortField != null && sortField.isScriptField();
+  }
+
+  public Order(String nestedPath, String name, String type, Field sortField) {
+    this.nestedPath = nestedPath;
+    this.name = name;
+    this.type = type;
+    this.sortField = sortField;
+  }
+
+  public String getNestedPath() {
+    return nestedPath;
+  }
+
+  public void setNestedPath(String nestedPath) {
+    this.nestedPath = nestedPath;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  public Field getSortField() {
+    return sortField;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Paramer.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Paramer.java
index b35ddcb0ed..38ca556199 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Paramer.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Paramer.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -14,8 +13,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.opensearch.common.Strings;
-import org.opensearch.common.xcontent.ToXContent;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.index.query.MatchPhraseQueryBuilder;
 import org.opensearch.index.query.MatchQueryBuilder;
 import org.opensearch.index.query.MultiMatchQueryBuilder;
@@ -25,163 +24,164 @@
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.utils.Util;
 
-
 public class Paramer {
-    public String analysis;
-    public Float boost;
-    public String value;
-    public Integer slop;
-
-    public Map<String, Float> fieldsBoosts = new HashMap<>();
-    public String type;
-    public Float tieBreaker;
-    public Operator operator;
-
-    public String default_field;
-
-    public static Paramer parseParamer(SQLMethodInvokeExpr method) throws SqlParseException {
-        Paramer instance = new Paramer();
-        List<SQLExpr> parameters = method.getParameters();
-        for (SQLExpr expr : parameters) {
-            if (expr instanceof SQLCharExpr) {
-                if (instance.value == null) {
-                    instance.value = ((SQLCharExpr) expr).getText();
-                } else {
-                    instance.analysis = ((SQLCharExpr) expr).getText();
-                }
-            } else if (expr instanceof SQLNumericLiteralExpr) {
-                instance.boost = ((SQLNumericLiteralExpr) expr).getNumber().floatValue();
-            } else if (expr instanceof SQLBinaryOpExpr) {
-                SQLBinaryOpExpr sqlExpr = (SQLBinaryOpExpr) expr;
-                switch (Util.expr2Object(sqlExpr.getLeft()).toString()) {
-                    case "query":
-                        instance.value = Util.expr2Object(sqlExpr.getRight()).toString();
-                        break;
-                    case "analyzer":
-                        instance.analysis = Util.expr2Object(sqlExpr.getRight()).toString();
-                        break;
-                    case "boost":
-                        instance.boost = Float.parseFloat(Util.expr2Object(sqlExpr.getRight()).toString());
-                        break;
-                    case "slop":
-                        instance.slop = Integer.parseInt(Util.expr2Object(sqlExpr.getRight()).toString());
-                        break;
-
-                    case "fields":
-                        int index;
-                        for (String f : Strings.splitStringByCommaToArray(
-                                Util.expr2Object(sqlExpr.getRight()).toString())) {
-                            index = f.lastIndexOf('^');
-                            if (-1 < index) {
-                                instance.fieldsBoosts.put(f.substring(0, index),
-                                        Float.parseFloat(f.substring(index + 1)));
-                            } else {
-                                instance.fieldsBoosts.put(f, 1.0F);
-                            }
-                        }
-                        break;
-                    case "type":
-                        instance.type = Util.expr2Object(sqlExpr.getRight()).toString();
-                        break;
-                    case "tie_breaker":
-                        instance.tieBreaker = Float.parseFloat(Util.expr2Object(sqlExpr.getRight()).toString());
-                        break;
-                    case "operator":
-                        instance.operator = Operator.fromString(Util.expr2Object(sqlExpr.getRight()).toString());
-                        break;
-
-                    case "default_field":
-                        instance.default_field = Util.expr2Object(sqlExpr.getRight()).toString();
-                        break;
-
-                    default:
-                        break;
-                }
+  public String analysis;
+  public Float boost;
+  public String value;
+  public Integer slop;
+
+  public Map<String, Float> fieldsBoosts = new HashMap<>();
+  public String type;
+  public Float tieBreaker;
+  public Operator operator;
+
+  public String default_field;
+
+  public static Paramer parseParamer(SQLMethodInvokeExpr method) throws SqlParseException {
+    Paramer instance = new Paramer();
+    List<SQLExpr> parameters = method.getParameters();
+    for (SQLExpr expr : parameters) {
+      if (expr instanceof SQLCharExpr) {
+        if (instance.value == null) {
+          instance.value = ((SQLCharExpr) expr).getText();
+        } else {
+          instance.analysis = ((SQLCharExpr) expr).getText();
+        }
+      } else if (expr instanceof SQLNumericLiteralExpr) {
+        instance.boost = ((SQLNumericLiteralExpr) expr).getNumber().floatValue();
+      } else if (expr instanceof SQLBinaryOpExpr) {
+        SQLBinaryOpExpr sqlExpr = (SQLBinaryOpExpr) expr;
+        switch (Util.expr2Object(sqlExpr.getLeft()).toString()) {
+          case "query":
+            instance.value = Util.expr2Object(sqlExpr.getRight()).toString();
+            break;
+          case "analyzer":
+            instance.analysis = Util.expr2Object(sqlExpr.getRight()).toString();
+            break;
+          case "boost":
+            instance.boost = Float.parseFloat(Util.expr2Object(sqlExpr.getRight()).toString());
+            break;
+          case "slop":
+            instance.slop = Integer.parseInt(Util.expr2Object(sqlExpr.getRight()).toString());
+            break;
+
+          case "fields":
+            int index;
+            for (String f :
+                Strings.splitStringByCommaToArray(
+                    Util.expr2Object(sqlExpr.getRight()).toString())) {
+              index = f.lastIndexOf('^');
+              if (-1 < index) {
+                instance.fieldsBoosts.put(
+                    f.substring(0, index), Float.parseFloat(f.substring(index + 1)));
+              } else {
+                instance.fieldsBoosts.put(f, 1.0F);
+              }
             }
-        }
-
-        return instance;
+            break;
+          case "type":
+            instance.type = Util.expr2Object(sqlExpr.getRight()).toString();
+            break;
+          case "tie_breaker":
+            instance.tieBreaker = Float.parseFloat(Util.expr2Object(sqlExpr.getRight()).toString());
+            break;
+          case "operator":
+            instance.operator =
+                Operator.fromString(Util.expr2Object(sqlExpr.getRight()).toString());
+            break;
+
+          case "default_field":
+            instance.default_field = Util.expr2Object(sqlExpr.getRight()).toString();
+            break;
+
+          default:
+            break;
+        }
+      }
     }
 
-    public static ToXContent fullParamer(MatchPhraseQueryBuilder query, Paramer paramer) {
-        if (paramer.analysis != null) {
-            query.analyzer(paramer.analysis);
-        }
+    return instance;
+  }
 
-        if (paramer.boost != null) {
-            query.boost(paramer.boost);
-        }
+  public static ToXContent fullParamer(MatchPhraseQueryBuilder query, Paramer paramer) {
+    if (paramer.analysis != null) {
+      query.analyzer(paramer.analysis);
+    }
 
-        if (paramer.slop != null) {
-            query.slop(paramer.slop);
-        }
+    if (paramer.boost != null) {
+      query.boost(paramer.boost);
+    }
 
-        return query;
+    if (paramer.slop != null) {
+      query.slop(paramer.slop);
     }
 
-    public static ToXContent fullParamer(MatchQueryBuilder query, Paramer paramer) {
-        if (paramer.analysis != null) {
-            query.analyzer(paramer.analysis);
-        }
+    return query;
+  }
 
-        if (paramer.boost != null) {
-            query.boost(paramer.boost);
-        }
-        return query;
+  public static ToXContent fullParamer(MatchQueryBuilder query, Paramer paramer) {
+    if (paramer.analysis != null) {
+      query.analyzer(paramer.analysis);
     }
 
-    public static ToXContent fullParamer(WildcardQueryBuilder query, Paramer paramer) {
-        if (paramer.boost != null) {
-            query.boost(paramer.boost);
-        }
-        return query;
+    if (paramer.boost != null) {
+      query.boost(paramer.boost);
     }
+    return query;
+  }
 
-    public static ToXContent fullParamer(QueryStringQueryBuilder query, Paramer paramer) {
-        if (paramer.analysis != null) {
-            query.analyzer(paramer.analysis);
-        }
+  public static ToXContent fullParamer(WildcardQueryBuilder query, Paramer paramer) {
+    if (paramer.boost != null) {
+      query.boost(paramer.boost);
+    }
+    return query;
+  }
 
-        if (paramer.boost != null) {
-            query.boost(paramer.boost);
-        }
+  public static ToXContent fullParamer(QueryStringQueryBuilder query, Paramer paramer) {
+    if (paramer.analysis != null) {
+      query.analyzer(paramer.analysis);
+    }
 
-        if (paramer.slop != null) {
-            query.phraseSlop(paramer.slop);
-        }
+    if (paramer.boost != null) {
+      query.boost(paramer.boost);
+    }
 
-        if (paramer.default_field != null) {
-            query.defaultField(paramer.default_field);
-        }
+    if (paramer.slop != null) {
+      query.phraseSlop(paramer.slop);
+    }
 
-        return query;
+    if (paramer.default_field != null) {
+      query.defaultField(paramer.default_field);
     }
 
-    public static ToXContent fullParamer(MultiMatchQueryBuilder query, Paramer paramer) {
-        if (paramer.analysis != null) {
-            query.analyzer(paramer.analysis);
-        }
+    return query;
+  }
 
-        if (paramer.boost != null) {
-            query.boost(paramer.boost);
-        }
+  public static ToXContent fullParamer(MultiMatchQueryBuilder query, Paramer paramer) {
+    if (paramer.analysis != null) {
+      query.analyzer(paramer.analysis);
+    }
 
-        if (paramer.slop != null) {
-            query.slop(paramer.slop);
-        }
+    if (paramer.boost != null) {
+      query.boost(paramer.boost);
+    }
 
-        if (paramer.type != null) {
-            query.type(paramer.type);
-        }
+    if (paramer.slop != null) {
+      query.slop(paramer.slop);
+    }
 
-        if (paramer.tieBreaker != null) {
-            query.tieBreaker(paramer.tieBreaker);
-        }
+    if (paramer.type != null) {
+      query.type(paramer.type);
+    }
 
-        if (paramer.operator != null) {
-            query.operator(paramer.operator);
-        }
+    if (paramer.tieBreaker != null) {
+      query.tieBreaker(paramer.tieBreaker);
+    }
 
-        return query;
+    if (paramer.operator != null) {
+      query.operator(paramer.operator);
     }
+
+    return query;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Query.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Query.java
index b0538591b8..6f891e7fc5 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Query.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Query.java
@@ -3,45 +3,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Represents abstract query. every query
- * has indexes, types, and where clause.
- */
+/** Represents abstract query. every query has indexes, types, and where clause. */
 public abstract class Query implements QueryStatement {
 
-    private Where where = null;
-    private List<From> from = new ArrayList<>();
-
-
-    public Where getWhere() {
-        return this.where;
-    }
-
-    public void setWhere(Where where) {
-        this.where = where;
-    }
-
-    public List<From> getFrom() {
-        return from;
-    }
-
-
-    /**
-     * Get the indexes the query refer to.
-     *
-     * @return list of strings, the indexes names
-     */
-    public String[] getIndexArr() {
-        String[] indexArr = new String[this.from.size()];
-        for (int i = 0; i < indexArr.length; i++) {
-            indexArr[i] = this.from.get(i).getIndex();
-        }
-        return indexArr;
+  private Where where = null;
+  private List<From> from = new ArrayList<>();
+
+  public Where getWhere() {
+    return this.where;
+  }
+
+  public void setWhere(Where where) {
+    this.where = where;
+  }
+
+  public List<From> getFrom() {
+    return from;
+  }
+
+  /**
+   * Get the indexes the query refer to.
+   *
+   * @return list of strings, the indexes names
+   */
+  public String[] getIndexArr() {
+    String[] indexArr = new String[this.from.size()];
+    for (int i = 0; i < indexArr.length; i++) {
+      indexArr[i] = this.from.get(i).getIndex();
     }
+    return indexArr;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/QueryActionRequest.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/QueryActionRequest.java
index f13e053d92..f536e3ad6f 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/QueryActionRequest.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/QueryActionRequest.java
@@ -3,20 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.legacy.executor.Format;
 
-/**
- * The definition of QueryActionRequest.
- */
+/** The definition of QueryActionRequest. */
 @Getter
 @RequiredArgsConstructor
 public class QueryActionRequest {
-    private final String sql;
-    private final ColumnTypeProvider typeProvider;
-    private final Format format;
+  private final String sql;
+  private final ColumnTypeProvider typeProvider;
+  private final Format format;
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/QueryStatement.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/QueryStatement.java
index 26c0b07517..71fe64906a 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/QueryStatement.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/QueryStatement.java
@@ -3,11 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
-/**
- * Identifier interface used to encompass Query and IndexStatements
- */
-public interface QueryStatement {
-}
+/** Identifier interface used to encompass Query and IndexStatements */
+public interface QueryStatement {}
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/ScriptMethodField.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/ScriptMethodField.java
index bdc42b4ff3..bb4d17d897 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/ScriptMethodField.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/ScriptMethodField.java
@@ -3,29 +3,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import com.alibaba.druid.sql.ast.expr.SQLAggregateOption;
 import java.util.List;
 
-/**
- * Stores information about function name for script fields
- */
+/** Stores information about function name for script fields */
 public class ScriptMethodField extends MethodField {
-    private final String functionName;
+  private final String functionName;
 
-    public ScriptMethodField(String functionName, List<KVValue> params, SQLAggregateOption option, String alias) {
-        super("script", params, option, alias);
-        this.functionName = functionName;
-    }
+  public ScriptMethodField(
+      String functionName, List<KVValue> params, SQLAggregateOption option, String alias) {
+    super("script", params, option, alias);
+    this.functionName = functionName;
+  }
 
-    public String getFunctionName() {
-        return functionName;
-    }
+  public String getFunctionName() {
+    return functionName;
+  }
 
-    @Override
-    public boolean isScriptField() {
-        return true;
-    }
+  @Override
+  public boolean isScriptField() {
+    return true;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/SearchResult.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/SearchResult.java
index 655da9848c..e951c84961 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/SearchResult.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/SearchResult.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import java.util.ArrayList;
@@ -29,128 +28,120 @@
 import org.opensearch.sql.legacy.exception.SqlParseException;
 
 public class SearchResult {
-    /**
-     * 查询结果
-     */
-    private List<Map<String, Object>> results;
-
-    private long total;
-
-    double maxScore = 0;
-
-    public SearchResult(SearchResponse resp) {
-        SearchHits hits = resp.getHits();
-        this.total = Optional.ofNullable(hits.getTotalHits()).map(totalHits -> totalHits.value).orElse(0L);
-        results = new ArrayList<>(hits.getHits().length);
-        for (SearchHit searchHit : hits.getHits()) {
-            if (searchHit.getSourceAsMap() != null) {
-                results.add(searchHit.getSourceAsMap());
-            } else if (searchHit.getFields() != null) {
-                Map<String, DocumentField> fields = searchHit.getFields();
-                results.add(toFieldsMap(fields));
-            }
-
-        }
+  /** */
+  private List<Map<String, Object>> results;
+
+  private long total;
+
+  double maxScore = 0;
+
+  public SearchResult(SearchResponse resp) {
+    SearchHits hits = resp.getHits();
+    this.total =
+        Optional.ofNullable(hits.getTotalHits()).map(totalHits -> totalHits.value).orElse(0L);
+    results = new ArrayList<>(hits.getHits().length);
+    for (SearchHit searchHit : hits.getHits()) {
+      if (searchHit.getSourceAsMap() != null) {
+        results.add(searchHit.getSourceAsMap());
+      } else if (searchHit.getFields() != null) {
+        Map<String, DocumentField> fields = searchHit.getFields();
+        results.add(toFieldsMap(fields));
+      }
     }
+  }
 
-    public SearchResult(SearchResponse resp, Select select) throws SqlParseException {
-        Aggregations aggs = resp.getAggregations();
-        if (aggs.get("filter") != null) {
-            InternalFilter inf = aggs.get("filter");
-            aggs = inf.getAggregations();
-        }
-        if (aggs.get("group by") != null) {
-            InternalTerms terms = aggs.get("group by");
-            Collection<Bucket> buckets = terms.getBuckets();
-            this.total = buckets.size();
-            results = new ArrayList<>(buckets.size());
-            for (Bucket bucket : buckets) {
-                Map<String, Object> aggsMap = toAggsMap(bucket.getAggregations().getAsMap());
-                aggsMap.put("docCount", bucket.getDocCount());
-                results.add(aggsMap);
-            }
-        } else {
-            results = new ArrayList<>(1);
-            this.total = 1;
-            Map<String, Object> map = new HashMap<>();
-            for (Aggregation aggregation : aggs) {
-                map.put(aggregation.getName(), covenValue(aggregation));
-            }
-            results.add(map);
-        }
-
+  public SearchResult(SearchResponse resp, Select select) throws SqlParseException {
+    Aggregations aggs = resp.getAggregations();
+    if (aggs.get("filter") != null) {
+      InternalFilter inf = aggs.get("filter");
+      aggs = inf.getAggregations();
     }
-
-    /**
-     * 讲es的field域转换为你Object
-     *
-     * @param fields
-     * @return
-     */
-    private Map<String, Object> toFieldsMap(Map<String, DocumentField> fields) {
-        Map<String, Object> result = new HashMap<>();
-        for (Entry<String, DocumentField> entry : fields.entrySet()) {
-            if (entry.getValue().getValues().size() > 1) {
-                result.put(entry.getKey(), entry.getValue().getValues());
-            } else {
-                result.put(entry.getKey(), entry.getValue().getValue());
-            }
-
-        }
-        return result;
+    if (aggs.get("group by") != null) {
+      InternalTerms terms = aggs.get("group by");
+      Collection<Bucket> buckets = terms.getBuckets();
+      this.total = buckets.size();
+      results = new ArrayList<>(buckets.size());
+      for (Bucket bucket : buckets) {
+        Map<String, Object> aggsMap = toAggsMap(bucket.getAggregations().getAsMap());
+        aggsMap.put("docCount", bucket.getDocCount());
+        results.add(aggsMap);
+      }
+    } else {
+      results = new ArrayList<>(1);
+      this.total = 1;
+      Map<String, Object> map = new HashMap<>();
+      for (Aggregation aggregation : aggs) {
+        map.put(aggregation.getName(), covenValue(aggregation));
+      }
+      results.add(map);
     }
-
-    /**
-     * 讲es的field域转换为你Object
-     *
-     * @param fields
-     * @return
-     * @throws SqlParseException
-     */
-    private Map<String, Object> toAggsMap(Map<String, Aggregation> fields) throws SqlParseException {
-        Map<String, Object> result = new HashMap<>();
-        for (Entry<String, Aggregation> entry : fields.entrySet()) {
-            result.put(entry.getKey(), covenValue(entry.getValue()));
-        }
-        return result;
+  }
+
+  /**
+   * @param fields
+   * @return
+   */
+  private Map<String, Object> toFieldsMap(Map<String, DocumentField> fields) {
+    Map<String, Object> result = new HashMap<>();
+    for (Entry<String, DocumentField> entry : fields.entrySet()) {
+      if (entry.getValue().getValues().size() > 1) {
+        result.put(entry.getKey(), entry.getValue().getValues());
+      } else {
+        result.put(entry.getKey(), entry.getValue().getValue());
+      }
     }
-
-    private Object covenValue(Aggregation value) throws SqlParseException {
-        if (value instanceof InternalNumericMetricsAggregation.SingleValue) {
-            return ((InternalNumericMetricsAggregation.SingleValue) value).value();
-        } else if (value instanceof InternalValueCount) {
-            return ((InternalValueCount) value).getValue();
-        } else if (value instanceof InternalTopHits) {
-            return (value);
-        } else if (value instanceof LongTerms) {
-            return value;
-        } else {
-            throw new SqlParseException("Unknown aggregation value type: " + value.getClass().getSimpleName());
-        }
+    return result;
+  }
+
+  /**
+   * @param fields
+   * @return
+   * @throws SqlParseException
+   */
+  private Map<String, Object> toAggsMap(Map<String, Aggregation> fields) throws SqlParseException {
+    Map<String, Object> result = new HashMap<>();
+    for (Entry<String, Aggregation> entry : fields.entrySet()) {
+      result.put(entry.getKey(), covenValue(entry.getValue()));
     }
-
-    public List<Map<String, Object>> getResults() {
-        return results;
+    return result;
+  }
+
+  private Object covenValue(Aggregation value) throws SqlParseException {
+    if (value instanceof InternalNumericMetricsAggregation.SingleValue) {
+      return ((InternalNumericMetricsAggregation.SingleValue) value).value();
+    } else if (value instanceof InternalValueCount) {
+      return ((InternalValueCount) value).getValue();
+    } else if (value instanceof InternalTopHits) {
+      return (value);
+    } else if (value instanceof LongTerms) {
+      return value;
+    } else {
+      throw new SqlParseException(
+          "Unknown aggregation value type: " + value.getClass().getSimpleName());
     }
+  }
 
-    public void setResults(List<Map<String, Object>> results) {
-        this.results = results;
-    }
+  public List<Map<String, Object>> getResults() {
+    return results;
+  }
 
-    public long getTotal() {
-        return total;
-    }
+  public void setResults(List<Map<String, Object>> results) {
+    this.results = results;
+  }
 
-    public void setTotal(long total) {
-        this.total = total;
-    }
+  public long getTotal() {
+    return total;
+  }
 
-    public double getMaxScore() {
-        return maxScore;
-    }
+  public void setTotal(long total) {
+    this.total = total;
+  }
 
-    public void setMaxScore(double maxScore) {
-        this.maxScore = maxScore;
-    }
+  public double getMaxScore() {
+    return maxScore;
+  }
 
+  public void setMaxScore(double maxScore) {
+    this.maxScore = maxScore;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Select.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Select.java
index 485efc1a2b..2faa8cc6e5 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Select.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Select.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import static com.alibaba.druid.sql.ast.statement.SQLJoinTableSource.JoinType;
@@ -16,176 +15,176 @@
 import org.opensearch.sql.legacy.domain.hints.Hint;
 import org.opensearch.sql.legacy.parser.SubQueryExpression;
 
-
 /**
- * 将sql语句转换为select 对象
+ * sql select
  *
  * @author ansj
  */
 public class Select extends Query {
 
-    /**
-     * Using this functions will cause query to execute as aggregation.
-     */
-    private static final Set<String> AGGREGATE_FUNCTIONS =
-            ImmutableSet.of(
-                    "SUM", "MAX", "MIN", "AVG",
-                    "TOPHITS", "COUNT", "STATS", "EXTENDED_STATS",
-                    "PERCENTILES", "SCRIPTED_METRIC"
-            );
-
-    private List<Hint> hints = new ArrayList<>();
-    private List<Field> fields = new ArrayList<>();
-    private List<List<Field>> groupBys = new ArrayList<>();
-    private Having having;
-    private List<Order> orderBys = new ArrayList<>();
-    private int offset;
-    private Integer rowCount;
-    private boolean containsSubQueries;
-    private List<SubQueryExpression> subQueries;
-    private boolean selectAll = false;
-    private JoinType nestedJoinType = JoinType.COMMA;
-
-    public boolean isQuery = false;
-    public boolean isAggregate = false;
-
-    public static final int DEFAULT_LIMIT = 200;
-
-    public Select() {
-    }
-
-    public List<Field> getFields() {
-        return fields;
-    }
-
-    public void setOffset(int offset) {
-        this.offset = offset;
-    }
-
-    public void setRowCount(Integer rowCount) {
-        this.rowCount = rowCount;
-    }
-
-    public void addGroupBy(Field field) {
-        List<Field> wrapper = new ArrayList<>();
-        wrapper.add(field);
-        addGroupBy(wrapper);
-    }
-
-    public void addGroupBy(List<Field> fields) {
-        isAggregate = true;
-        selectAll = false;
-        this.groupBys.add(fields);
-    }
-
-    public List<List<Field>> getGroupBys() {
-        return groupBys;
-    }
-
-    public Having getHaving() {
-        return having;
-    }
-
-    public void setHaving(Having having) {
-        this.having = having;
-    }
-
-    public List<Order> getOrderBys() {
-        return orderBys;
-    }
-
-    public int getOffset() {
-        return offset;
-    }
-
-    public Integer getRowCount() {
-        return rowCount;
-    }
-
-    public void addOrderBy(String nestedPath, String name, String type, Field field) {
-        if ("_score".equals(name)) {
-            isQuery = true;
-        }
-        this.orderBys.add(new Order(nestedPath, name, type, field));
-    }
-
-    public void addField(Field field) {
-        if (field == null) {
-            return;
-        }
-        if (field == STAR && !isAggregate) {
-            // Ignore GROUP BY since columns present in result are decided by column list in GROUP BY
-            this.selectAll = true;
-            return;
-        }
-
-        if (field instanceof MethodField && AGGREGATE_FUNCTIONS.contains(field.getName().toUpperCase())) {
-            isAggregate = true;
-        }
-
-        fields.add(field);
-    }
-
-    public List<Hint> getHints() {
-        return hints;
-    }
-
+  /** Using this functions will cause query to execute as aggregation. */
+  private static final Set<String> AGGREGATE_FUNCTIONS =
+      ImmutableSet.of(
+          "SUM",
+          "MAX",
+          "MIN",
+          "AVG",
+          "TOPHITS",
+          "COUNT",
+          "STATS",
+          "EXTENDED_STATS",
+          "PERCENTILES",
+          "SCRIPTED_METRIC");
+
+  private List<Hint> hints = new ArrayList<>();
+  private List<Field> fields = new ArrayList<>();
+  private List<List<Field>> groupBys = new ArrayList<>();
+  private Having having;
+  private List<Order> orderBys = new ArrayList<>();
+  private int offset;
+  private Integer rowCount;
+  private boolean containsSubQueries;
+  private List<SubQueryExpression> subQueries;
+  private boolean selectAll = false;
+  private JoinType nestedJoinType = JoinType.COMMA;
+
+  public boolean isQuery = false;
+  public boolean isAggregate = false;
+
+  public static final int DEFAULT_LIMIT = 200;
+
+  public Select() {}
+
+  public List<Field> getFields() {
+    return fields;
+  }
+
+  public void setOffset(int offset) {
+    this.offset = offset;
+  }
+
+  public void setRowCount(Integer rowCount) {
+    this.rowCount = rowCount;
+  }
+
+  public void addGroupBy(Field field) {
+    List<Field> wrapper = new ArrayList<>();
+    wrapper.add(field);
+    addGroupBy(wrapper);
+  }
+
+  public void addGroupBy(List<Field> fields) {
+    isAggregate = true;
+    selectAll = false;
+    this.groupBys.add(fields);
+  }
+
+  public List<List<Field>> getGroupBys() {
+    return groupBys;
+  }
+
+  public Having getHaving() {
+    return having;
+  }
+
+  public void setHaving(Having having) {
+    this.having = having;
+  }
+
+  public List<Order> getOrderBys() {
+    return orderBys;
+  }
+
+  public int getOffset() {
+    return offset;
+  }
+
+  public Integer getRowCount() {
+    return rowCount;
+  }
+
+  public void addOrderBy(String nestedPath, String name, String type, Field field) {
+    if ("_score".equals(name)) {
+      isQuery = true;
+    }
+    this.orderBys.add(new Order(nestedPath, name, type, field));
+  }
+
+  public void addField(Field field) {
+    if (field == null) {
+      return;
+    }
+    if (field == STAR && !isAggregate) {
+      // Ignore GROUP BY since columns present in result are decided by column list in GROUP BY
+      this.selectAll = true;
+      return;
+    }
+
+    if (field instanceof MethodField
+        && AGGREGATE_FUNCTIONS.contains(field.getName().toUpperCase())) {
+      isAggregate = true;
+    }
+
+    fields.add(field);
+  }
+
+  public List<Hint> getHints() {
+    return hints;
+  }
+
+  public JoinType getNestedJoinType() {
+    return nestedJoinType;
+  }
+
+  public void setNestedJoinType(JoinType nestedJoinType) {
+    this.nestedJoinType = nestedJoinType;
+  }
+
+  public void fillSubQueries() {
+    subQueries = new ArrayList<>();
+    Where where = this.getWhere();
+    fillSubQueriesFromWhereRecursive(where);
+  }
 
-    public JoinType getNestedJoinType() {
-        return nestedJoinType;
+  private void fillSubQueriesFromWhereRecursive(Where where) {
+    if (where == null) {
+      return;
     }
-
-    public void setNestedJoinType(JoinType nestedJoinType) {
-        this.nestedJoinType = nestedJoinType;
-    }
-
-
-    public void fillSubQueries() {
-        subQueries = new ArrayList<>();
-        Where where = this.getWhere();
-        fillSubQueriesFromWhereRecursive(where);
-    }
-
-    private void fillSubQueriesFromWhereRecursive(Where where) {
-        if (where == null) {
-            return;
-        }
-        if (where instanceof Condition) {
-            Condition condition = (Condition) where;
-            if (condition.getValue() instanceof SubQueryExpression) {
-                this.subQueries.add((SubQueryExpression) condition.getValue());
-                this.containsSubQueries = true;
-            }
-            if (condition.getValue() instanceof Object[]) {
-
-                for (Object o : (Object[]) condition.getValue()) {
-                    if (o instanceof SubQueryExpression) {
-                        this.subQueries.add((SubQueryExpression) o);
-                        this.containsSubQueries = true;
-                    }
-                }
-            }
-        } else {
-            for (Where innerWhere : where.getWheres()) {
-                fillSubQueriesFromWhereRecursive(innerWhere);
-            }
+    if (where instanceof Condition) {
+      Condition condition = (Condition) where;
+      if (condition.getValue() instanceof SubQueryExpression) {
+        this.subQueries.add((SubQueryExpression) condition.getValue());
+        this.containsSubQueries = true;
+      }
+      if (condition.getValue() instanceof Object[]) {
+
+        for (Object o : (Object[]) condition.getValue()) {
+          if (o instanceof SubQueryExpression) {
+            this.subQueries.add((SubQueryExpression) o);
+            this.containsSubQueries = true;
+          }
         }
+      }
+    } else {
+      for (Where innerWhere : where.getWheres()) {
+        fillSubQueriesFromWhereRecursive(innerWhere);
+      }
     }
+  }
 
-    public boolean containsSubQueries() {
-        return containsSubQueries;
-    }
+  public boolean containsSubQueries() {
+    return containsSubQueries;
+  }
 
-    public List<SubQueryExpression> getSubQueries() {
-        return subQueries;
-    }
+  public List<SubQueryExpression> getSubQueries() {
+    return subQueries;
+  }
 
-    public boolean isOrderdSelect() {
-        return this.getOrderBys() != null && this.getOrderBys().size() > 0;
-    }
+  public boolean isOrderdSelect() {
+    return this.getOrderBys() != null && this.getOrderBys().size() > 0;
+  }
 
-    public boolean isSelectAll() {
-        return selectAll;
-    }
+  public boolean isSelectAll() {
+    return selectAll;
+  }
 }
-
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/TableOnJoinSelect.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/TableOnJoinSelect.java
index cf27cb51ee..e0dcb2899f 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/TableOnJoinSelect.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/TableOnJoinSelect.java
@@ -3,45 +3,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import java.util.List;
 
-/**
- * Created by Eliran on 28/8/2015.
- */
+/** Created by Eliran on 28/8/2015. */
 public class TableOnJoinSelect extends Select {
 
-    private List<Field> connectedFields;
-    private List<Field> selectedFields;
-    private String alias;
-
-    public TableOnJoinSelect() {
-    }
+  private List<Field> connectedFields;
+  private List<Field> selectedFields;
+  private String alias;
 
+  public TableOnJoinSelect() {}
 
-    public List<Field> getConnectedFields() {
-        return connectedFields;
-    }
+  public List<Field> getConnectedFields() {
+    return connectedFields;
+  }
 
-    public void setConnectedFields(List<Field> connectedFields) {
-        this.connectedFields = connectedFields;
-    }
+  public void setConnectedFields(List<Field> connectedFields) {
+    this.connectedFields = connectedFields;
+  }
 
-    public List<Field> getSelectedFields() {
-        return selectedFields;
-    }
+  public List<Field> getSelectedFields() {
+    return selectedFields;
+  }
 
-    public void setSelectedFields(List<Field> selectedFields) {
-        this.selectedFields = selectedFields;
-    }
+  public void setSelectedFields(List<Field> selectedFields) {
+    this.selectedFields = selectedFields;
+  }
 
-    public String getAlias() {
-        return alias;
-    }
+  public String getAlias() {
+    return alias;
+  }
 
-    public void setAlias(String alias) {
-        this.alias = alias;
-    }
+  public void setAlias(String alias) {
+    this.alias = alias;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Where.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Where.java
index ae05e33e51..d6f767203b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/Where.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/Where.java
@@ -3,70 +3,69 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain;
 
 import java.util.LinkedList;
 
 public class Where implements Cloneable {
 
-    public enum CONN {
-        AND, OR;
+  public enum CONN {
+    AND,
+    OR;
 
-        public CONN negative() {
-            return this == AND ? OR : AND;
-        }
+    public CONN negative() {
+      return this == AND ? OR : AND;
     }
+  }
 
-    public static Where newInstance() {
-        return new Where(CONN.AND);
-    }
+  public static Where newInstance() {
+    return new Where(CONN.AND);
+  }
 
-    private LinkedList<Where> wheres = new LinkedList<>();
+  private LinkedList<Where> wheres = new LinkedList<>();
 
-    protected CONN conn;
+  protected CONN conn;
 
-    public Where(String connStr) {
-        this.conn = CONN.valueOf(connStr.toUpperCase());
-    }
+  public Where(String connStr) {
+    this.conn = CONN.valueOf(connStr.toUpperCase());
+  }
 
-    public Where(CONN conn) {
-        this.conn = conn;
-    }
+  public Where(CONN conn) {
+    this.conn = conn;
+  }
 
-    public void addWhere(Where where) {
-        wheres.add(where);
-    }
+  public void addWhere(Where where) {
+    wheres.add(where);
+  }
 
-    public CONN getConn() {
-        return this.conn;
-    }
-
-    public void setConn(CONN conn) {
-        this.conn = conn;
-    }
+  public CONN getConn() {
+    return this.conn;
+  }
 
-    public LinkedList<Where> getWheres() {
-        return wheres;
-    }
+  public void setConn(CONN conn) {
+    this.conn = conn;
+  }
 
-    @Override
-    public String toString() {
-        if (wheres.size() > 0) {
-            String whereStr = wheres.toString();
-            return this.conn + " ( " + whereStr.substring(1, whereStr.length() - 1) + " ) ";
-        } else {
-            return "";
-        }
+  public LinkedList<Where> getWheres() {
+    return wheres;
+  }
 
+  @Override
+  public String toString() {
+    if (wheres.size() > 0) {
+      String whereStr = wheres.toString();
+      return this.conn + " ( " + whereStr.substring(1, whereStr.length() - 1) + " ) ";
+    } else {
+      return "";
     }
+  }
 
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        Where clonedWhere = new Where(this.getConn());
-        for (Where innerWhere : this.getWheres()) {
-            clonedWhere.addWhere((Where) innerWhere.clone());
-        }
-        return clonedWhere;
+  @Override
+  public Object clone() throws CloneNotSupportedException {
+    Where clonedWhere = new Where(this.getConn());
+    for (Where innerWhere : this.getWheres()) {
+      clonedWhere.addWhere((Where) innerWhere.clone());
     }
+    return clonedWhere;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/bucketpath/BucketPath.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/bucketpath/BucketPath.java
index 996caae5e2..ee19c08725 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/bucketpath/BucketPath.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/bucketpath/BucketPath.java
@@ -3,39 +3,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain.bucketpath;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 
 /**
- * The bucket path syntax
- * <AGG_NAME> [ <AGG_SEPARATOR>, <AGG_NAME> ]* [ <METRIC_SEPARATOR>, <METRIC> ]
+ * The bucket path syntax <AGG_NAME> [ <AGG_SEPARATOR>, <AGG_NAME> ]* [ <METRIC_SEPARATOR>, <METRIC>
+ * ]
  *
- * https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-pipeline.html#buckets-path-syntax
+ * <p>https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-pipeline.html#buckets-path-syntax
  */
 public class BucketPath {
-    private Deque<Path> pathStack = new ArrayDeque<>();
+  private Deque<Path> pathStack = new ArrayDeque<>();
 
-    public BucketPath add(Path path) {
-        if (pathStack.isEmpty()) {
-            assert path.isMetricPath() : "The last path in the bucket path must be Metric";
-        } else {
-            assert path.isAggPath() : "All the other path in the bucket path must be Agg";
-        }
-        pathStack.push(path);
-        return this;
+  public BucketPath add(Path path) {
+    if (pathStack.isEmpty()) {
+      assert path.isMetricPath() : "The last path in the bucket path must be Metric";
+    } else {
+      assert path.isAggPath() : "All the other path in the bucket path must be Agg";
     }
+    pathStack.push(path);
+    return this;
+  }
 
-    /**
-     * Return the bucket path.
-     * Return "", if there is no agg or metric available
-     */
-    public String getBucketPath() {
-        String bucketPath = pathStack.isEmpty() ? "" : pathStack.pop().getPath();
-        return pathStack.stream()
-                .map(path -> path.getSeparator() + path.getPath())
-                .reduce(bucketPath, String::concat);
-    }
+  /** Return the bucket path. Return "", if there is no agg or metric available */
+  public String getBucketPath() {
+    String bucketPath = pathStack.isEmpty() ? "" : pathStack.pop().getPath();
+    return pathStack.stream()
+        .map(path -> path.getSeparator() + path.getPath())
+        .reduce(bucketPath, String::concat);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/bucketpath/Path.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/bucketpath/Path.java
index d5c897cf90..4827e0e61c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/bucketpath/Path.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/bucketpath/Path.java
@@ -3,49 +3,49 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain.bucketpath;
 
 public class Path {
-    private final String path;
-    private final String separator;
-    private final PathType type;
-
-    private Path(String path, String separator, PathType type) {
-        this.path = path;
-        this.separator = separator;
-        this.type = type;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public String getSeparator() {
-        return separator;
-    }
-
-    public PathType getType() {
-        return type;
-    }
-
-    public boolean isMetricPath() {
-        return type == PathType.METRIC;
-    }
-
-    public boolean isAggPath() {
-        return type == PathType.AGG;
-    }
-
-    public static Path getAggPath(String path) {
-        return new Path(path, ">", PathType.AGG);
-    }
-
-    public static Path getMetricPath(String path) {
-        return new Path(path, ".", PathType.METRIC);
-    }
-
-    public enum PathType {
-        AGG, METRIC
-    }
+  private final String path;
+  private final String separator;
+  private final PathType type;
+
+  private Path(String path, String separator, PathType type) {
+    this.path = path;
+    this.separator = separator;
+    this.type = type;
+  }
+
+  public String getPath() {
+    return path;
+  }
+
+  public String getSeparator() {
+    return separator;
+  }
+
+  public PathType getType() {
+    return type;
+  }
+
+  public boolean isMetricPath() {
+    return type == PathType.METRIC;
+  }
+
+  public boolean isAggPath() {
+    return type == PathType.AGG;
+  }
+
+  public static Path getAggPath(String path) {
+    return new Path(path, ">", PathType.AGG);
+  }
+
+  public static Path getMetricPath(String path) {
+    return new Path(path, ".", PathType.METRIC);
+  }
+
+  public enum PathType {
+    AGG,
+    METRIC
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/Hint.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/Hint.java
index 8a5c174c41..b83c63aae1 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/Hint.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/Hint.java
@@ -3,26 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain.hints;
 
-/**
- * Created by Eliran on 5/9/2015.
- */
+/** Created by Eliran on 5/9/2015. */
 public class Hint {
-    private HintType type;
-    private Object[] params;
+  private HintType type;
+  private Object[] params;
 
-    public Hint(HintType type, Object[] params) {
-        this.type = type;
-        this.params = params;
-    }
+  public Hint(HintType type, Object[] params) {
+    this.type = type;
+    this.params = params;
+  }
 
-    public HintType getType() {
-        return type;
-    }
+  public HintType getType() {
+    return type;
+  }
 
-    public Object[] getParams() {
-        return params;
-    }
+  public Object[] getParams() {
+    return params;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/HintFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/HintFactory.java
index 59ecf2eba8..ec258e0fbc 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/HintFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/HintFactory.java
@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain.hints;
 
-
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLParser;
 import java.io.IOException;
@@ -14,215 +12,221 @@
 import java.util.List;
 import java.util.Map;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
 import org.opensearch.common.xcontent.yaml.YamlXContentParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.sql.legacy.exception.SqlParseException;
 
-/**
- * Created by Eliran on 5/9/2015.
- */
+/** Created by Eliran on 5/9/2015. */
 public class HintFactory {
 
-    private static final String PREFIX = "! ";
+  private static final String PREFIX = "! ";
 
-    public static Hint getHintFromString(String hintAsString) throws SqlParseException {
-        if (hintAsString.startsWith("! USE_NESTED_LOOPS") || hintAsString.startsWith("! USE_NL")) {
-            return new Hint(HintType.USE_NESTED_LOOPS, null);
-        }
-
-        if (hintAsString.startsWith("! SHARD_SIZE")) {
-            String[] numbers = getParamsFromHint(hintAsString, "! SHARD_SIZE");
-            //todo: check if numbers etc..
-            List<Object> params = new ArrayList<>();
-            for (String number : numbers) {
-                if (number.equals("null") || number.equals("infinity")) {
-                    params.add(null);
-                } else {
-                    params.add(Integer.parseInt(number));
-                }
-            }
-            return new Hint(HintType.SHARD_SIZE, params.toArray());
-        }
-
-        if (hintAsString.equals("! HASH_WITH_TERMS_FILTER")) {
-            return new Hint(HintType.HASH_WITH_TERMS_FILTER, null);
-        }
-        if (hintAsString.startsWith("! JOIN_TABLES_LIMIT")) {
-            String[] numbers = getParamsFromHint(hintAsString, "! JOIN_TABLES_LIMIT");
-            //todo: check if numbers etc..
-            List<Object> params = new ArrayList<>();
-            for (String number : numbers) {
-                if (number.equals("null") || number.equals("infinity")) {
-                    params.add(null);
-                } else {
-                    params.add(Integer.parseInt(number));
-                }
-            }
-
-            return new Hint(HintType.JOIN_LIMIT, params.toArray());
-        }
-        if (hintAsString.startsWith("! NL_MULTISEARCH_SIZE")) {
-            String[] number = getParamsFromHint(hintAsString, "! NL_MULTISEARCH_SIZE");
-            //todo: check if numbers etc..
-            int multiSearchSize = Integer.parseInt(number[0]);
-            return new Hint(HintType.NL_MULTISEARCH_SIZE, new Object[]{multiSearchSize});
-        }
-        if (hintAsString.startsWith("! USE_SCROLL")) {
-            String[] scrollParams = getParamsFromHint(hintAsString, "! USE_SCROLL");
-            if (scrollParams != null && scrollParams.length == 2) {
-                String param = scrollParams[0];
-                return new Hint(HintType.USE_SCROLL,
-                        new Object[]{
-                                (param.startsWith("\"") && param.endsWith("\""))
-                                        || (param.startsWith("'") && param.endsWith("'"))
-                                        ? param.substring(1, param.length() - 1) : Integer.parseInt(param),
-                                Integer.parseInt(scrollParams[1])});
-            } else {
-                return new Hint(HintType.USE_SCROLL, new Object[]{50, 60000});
-            }
-        }
-        if (hintAsString.startsWith("! IGNORE_UNAVAILABLE")) {
-            return new Hint(HintType.IGNORE_UNAVAILABLE, null);
-        }
-        if (hintAsString.startsWith("! DOCS_WITH_AGGREGATION")) {
-            Integer[] params = parseParamsAsInts(hintAsString, "! DOCS_WITH_AGGREGATION");
-            return new Hint(HintType.DOCS_WITH_AGGREGATION, params);
-        }
-        if (hintAsString.startsWith("! ROUTINGS")) {
-            String[] routings = getParamsFromHint(hintAsString, "! ROUTINGS");
-            return new Hint(HintType.ROUTINGS, routings);
-        }
-        if (hintAsString.startsWith("! HIGHLIGHT")) {
-            String[] heighlights = getParamsFromHint(hintAsString, "! HIGHLIGHT");
-            ArrayList hintParams = new ArrayList();
-            hintParams.add(heighlights[0]);
-            if (heighlights.length > 1) {
-                StringBuilder builder = new StringBuilder();
-                for (int i = 1; i < heighlights.length; i++) {
-                    if (i != 1) {
-                        builder.append("\n");
-                    }
-                    builder.append(heighlights[i]);
-                }
-                String heighlightParam = builder.toString();
-                YAMLFactory yamlFactory = new YAMLFactory();
-                YAMLParser yamlParser = null;
-                try {
-                    yamlParser = yamlFactory.createParser(heighlightParam.toCharArray());
-                    YamlXContentParser yamlXContentParser = new YamlXContentParser(NamedXContentRegistry.EMPTY,
-                            LoggingDeprecationHandler.INSTANCE, yamlParser);
-                    Map<String, Object> map = yamlXContentParser.map();
-                    hintParams.add(map);
-                } catch (IOException e) {
-                    throw new SqlParseException("could not parse heighlight hint: " + e.getMessage());
-                }
-            }
-            return new Hint(HintType.HIGHLIGHT, hintParams.toArray());
-        }
-        if (hintAsString.startsWith("! MINUS_SCROLL_FETCH_AND_RESULT_LIMITS")) {
-            Integer[] params = parseParamsAsInts(hintAsString, "! MINUS_SCROLL_FETCH_AND_RESULT_LIMITS");
-            if (params.length > 3) {
-                throw new SqlParseException("MINUS_FETCH_AND_RESULT_LIMITS should have 3 int params "
-                        + "(maxFromFirst,maxFromSecond,hitsPerScrollShard)");
-            }
-            Integer[] paramsWithDefaults = new Integer[3];
-            int defaultMaxFetchFromTable = 100000;
-            int defaultFetchOnScroll = 1000;
-            paramsWithDefaults[0] = defaultMaxFetchFromTable;
-            paramsWithDefaults[1] = defaultMaxFetchFromTable;
-            paramsWithDefaults[2] = defaultFetchOnScroll;
-            for (int i = 0; i < params.length; i++) {
-                paramsWithDefaults[i] = params[i];
-            }
-
-            return new Hint(HintType.MINUS_FETCH_AND_RESULT_LIMITS, paramsWithDefaults);
-        }
-        if (hintAsString.startsWith("! MINUS_USE_TERMS_OPTIMIZATION")) {
-            String[] param = getParamsFromHint(hintAsString, "! MINUS_USE_TERMS_OPTIMIZATION");
-            boolean shouldLowerStringOnTerms = false;
-            if (param != null) {
-                if (param.length != 1) {
-                    throw new SqlParseException(
-                            "MINUS_USE_TERMS_OPTIMIZATION should have none or one boolean param: false/true ");
-                }
-                try {
-                    shouldLowerStringOnTerms = Boolean.parseBoolean(param[0].toLowerCase());
-                } catch (Exception e) {
-                    throw new SqlParseException("MINUS_USE_TERMS_OPTIMIZATION should have none or one boolean param: "
-                            + "false/true , got:" + param[0]);
-                }
-            }
-            return new Hint(HintType.MINUS_USE_TERMS_OPTIMIZATION, new Object[]{shouldLowerStringOnTerms});
-        }
-        if (hintAsString.startsWith("! COLLAPSE")) {
-            String collapse = getParamFromHint(hintAsString, "! COLLAPSE");
-            return new Hint(HintType.COLLAPSE, new String[]{collapse});
-        }
-        if (hintAsString.startsWith("! POST_FILTER")) {
-            String postFilter = getParamFromHint(hintAsString, "! POST_FILTER");
-            return new Hint(HintType.POST_FILTER, new String[]{postFilter});
-        }
-
-        Hint queryPlanHint = parseHintForQueryPlanner(hintAsString);
-        if (queryPlanHint != null) {
-            return queryPlanHint;
-        }
-
-        return null;
-    }
-
-    /**
-     * Parse hints for hash join in new query planning framework.
-     * Only check syntax error here and leave semantics interpret work for planner.
-     */
-    private static Hint parseHintForQueryPlanner(String hintStr) {
-        if (hintStr.contains("(")
-                && (hintStr.startsWith("! JOIN_ALGORITHM_BLOCK_SIZE")
-                        || hintStr.startsWith("! JOIN_SCROLL_PAGE_SIZE")
-                        || hintStr.startsWith("! JOIN_CIRCUIT_BREAK_LIMIT")
-                        || hintStr.startsWith("! JOIN_BACK_OFF_RETRY_INTERVALS")
-                        || hintStr.startsWith("! JOIN_TIME_OUT")
-                )) { // Note that Trie tree is needed here if many hint options
-
-            String hintName = hintStr.substring(PREFIX.length(), hintStr.indexOf('(')).trim();
-            String hintPrefix = PREFIX + hintName;
-            HintType hintType = HintType.valueOf(hintName);
-            Integer[] params = parseParamsAsInts(hintStr, hintPrefix);
-
-            if (params != null && params.length > 0) {
-                return new Hint(hintType, params);
-            }
-        } else if (hintStr.startsWith("! JOIN_ALGORITHM_USE_LEGACY")) {
-            return new Hint(HintType.JOIN_ALGORITHM_USE_LEGACY, new Object[0]);
-        }
-        return null;
+  public static Hint getHintFromString(String hintAsString) throws SqlParseException {
+    if (hintAsString.startsWith("! USE_NESTED_LOOPS") || hintAsString.startsWith("! USE_NL")) {
+      return new Hint(HintType.USE_NESTED_LOOPS, null);
     }
 
-    private static String getParamFromHint(String hint, String prefix) {
-        if (!hint.contains("(")) {
-            return null;
-        }
-        return hint.replace(prefix, "").replaceAll("\\s*\\(\\s*", "").replaceAll("\\s*\\,\\s*", ",")
-                .replaceAll("\\s*\\)\\s*", "");
+    if (hintAsString.startsWith("! SHARD_SIZE")) {
+      String[] numbers = getParamsFromHint(hintAsString, "! SHARD_SIZE");
+      // todo: check if numbers etc..
+      List<Object> params = new ArrayList<>();
+      for (String number : numbers) {
+        if (number.equals("null") || number.equals("infinity")) {
+          params.add(null);
+        } else {
+          params.add(Integer.parseInt(number));
+        }
+      }
+      return new Hint(HintType.SHARD_SIZE, params.toArray());
     }
 
-    private static String[] getParamsFromHint(String hint, String prefix) {
-        String param = getParamFromHint(hint, prefix);
-        return param != null ? param.split(",") : null;
+    if (hintAsString.equals("! HASH_WITH_TERMS_FILTER")) {
+      return new Hint(HintType.HASH_WITH_TERMS_FILTER, null);
+    }
+    if (hintAsString.startsWith("! JOIN_TABLES_LIMIT")) {
+      String[] numbers = getParamsFromHint(hintAsString, "! JOIN_TABLES_LIMIT");
+      // todo: check if numbers etc..
+      List<Object> params = new ArrayList<>();
+      for (String number : numbers) {
+        if (number.equals("null") || number.equals("infinity")) {
+          params.add(null);
+        } else {
+          params.add(Integer.parseInt(number));
+        }
+      }
+
+      return new Hint(HintType.JOIN_LIMIT, params.toArray());
+    }
+    if (hintAsString.startsWith("! NL_MULTISEARCH_SIZE")) {
+      String[] number = getParamsFromHint(hintAsString, "! NL_MULTISEARCH_SIZE");
+      // todo: check if numbers etc..
+      int multiSearchSize = Integer.parseInt(number[0]);
+      return new Hint(HintType.NL_MULTISEARCH_SIZE, new Object[] {multiSearchSize});
+    }
+    if (hintAsString.startsWith("! USE_SCROLL")) {
+      String[] scrollParams = getParamsFromHint(hintAsString, "! USE_SCROLL");
+      if (scrollParams != null && scrollParams.length == 2) {
+        String param = scrollParams[0];
+        return new Hint(
+            HintType.USE_SCROLL,
+            new Object[] {
+              (param.startsWith("\"") && param.endsWith("\""))
+                      || (param.startsWith("'") && param.endsWith("'"))
+                  ? param.substring(1, param.length() - 1)
+                  : Integer.parseInt(param),
+              Integer.parseInt(scrollParams[1])
+            });
+      } else {
+        return new Hint(HintType.USE_SCROLL, new Object[] {50, 60000});
+      }
+    }
+    if (hintAsString.startsWith("! IGNORE_UNAVAILABLE")) {
+      return new Hint(HintType.IGNORE_UNAVAILABLE, null);
+    }
+    if (hintAsString.startsWith("! DOCS_WITH_AGGREGATION")) {
+      Integer[] params = parseParamsAsInts(hintAsString, "! DOCS_WITH_AGGREGATION");
+      return new Hint(HintType.DOCS_WITH_AGGREGATION, params);
+    }
+    if (hintAsString.startsWith("! ROUTINGS")) {
+      String[] routings = getParamsFromHint(hintAsString, "! ROUTINGS");
+      return new Hint(HintType.ROUTINGS, routings);
+    }
+    if (hintAsString.startsWith("! HIGHLIGHT")) {
+      String[] heighlights = getParamsFromHint(hintAsString, "! HIGHLIGHT");
+      ArrayList hintParams = new ArrayList();
+      hintParams.add(heighlights[0]);
+      if (heighlights.length > 1) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 1; i < heighlights.length; i++) {
+          if (i != 1) {
+            builder.append("\n");
+          }
+          builder.append(heighlights[i]);
+        }
+        String heighlightParam = builder.toString();
+        YAMLFactory yamlFactory = new YAMLFactory();
+        YAMLParser yamlParser = null;
+        try {
+          yamlParser = yamlFactory.createParser(heighlightParam.toCharArray());
+          YamlXContentParser yamlXContentParser =
+              new YamlXContentParser(
+                  NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, yamlParser);
+          Map<String, Object> map = yamlXContentParser.map();
+          hintParams.add(map);
+        } catch (IOException e) {
+          throw new SqlParseException("could not parse heighlight hint: " + e.getMessage());
+        }
+      }
+      return new Hint(HintType.HIGHLIGHT, hintParams.toArray());
+    }
+    if (hintAsString.startsWith("! MINUS_SCROLL_FETCH_AND_RESULT_LIMITS")) {
+      Integer[] params = parseParamsAsInts(hintAsString, "! MINUS_SCROLL_FETCH_AND_RESULT_LIMITS");
+      if (params.length > 3) {
+        throw new SqlParseException(
+            "MINUS_FETCH_AND_RESULT_LIMITS should have 3 int params "
+                + "(maxFromFirst,maxFromSecond,hitsPerScrollShard)");
+      }
+      Integer[] paramsWithDefaults = new Integer[3];
+      int defaultMaxFetchFromTable = 100000;
+      int defaultFetchOnScroll = 1000;
+      paramsWithDefaults[0] = defaultMaxFetchFromTable;
+      paramsWithDefaults[1] = defaultMaxFetchFromTable;
+      paramsWithDefaults[2] = defaultFetchOnScroll;
+      for (int i = 0; i < params.length; i++) {
+        paramsWithDefaults[i] = params[i];
+      }
+
+      return new Hint(HintType.MINUS_FETCH_AND_RESULT_LIMITS, paramsWithDefaults);
+    }
+    if (hintAsString.startsWith("! MINUS_USE_TERMS_OPTIMIZATION")) {
+      String[] param = getParamsFromHint(hintAsString, "! MINUS_USE_TERMS_OPTIMIZATION");
+      boolean shouldLowerStringOnTerms = false;
+      if (param != null) {
+        if (param.length != 1) {
+          throw new SqlParseException(
+              "MINUS_USE_TERMS_OPTIMIZATION should have none or one boolean param: false/true ");
+        }
+        try {
+          shouldLowerStringOnTerms = Boolean.parseBoolean(param[0].toLowerCase());
+        } catch (Exception e) {
+          throw new SqlParseException(
+              "MINUS_USE_TERMS_OPTIMIZATION should have none or one boolean param: "
+                  + "false/true , got:"
+                  + param[0]);
+        }
+      }
+      return new Hint(
+          HintType.MINUS_USE_TERMS_OPTIMIZATION, new Object[] {shouldLowerStringOnTerms});
+    }
+    if (hintAsString.startsWith("! COLLAPSE")) {
+      String collapse = getParamFromHint(hintAsString, "! COLLAPSE");
+      return new Hint(HintType.COLLAPSE, new String[] {collapse});
+    }
+    if (hintAsString.startsWith("! POST_FILTER")) {
+      String postFilter = getParamFromHint(hintAsString, "! POST_FILTER");
+      return new Hint(HintType.POST_FILTER, new String[] {postFilter});
     }
 
-    private static Integer[] parseParamsAsInts(String hintAsString, String startWith) {
-        String[] number = getParamsFromHint(hintAsString, startWith);
-        if (number == null) {
-            return new Integer[0];
-        }
-        //todo: check if numbers etc..
-        Integer[] params = new Integer[number.length];
-        for (int i = 0; i < params.length; i++) {
-            params[i] = Integer.parseInt(number[i]);
-        }
-        return params;
+    Hint queryPlanHint = parseHintForQueryPlanner(hintAsString);
+    if (queryPlanHint != null) {
+      return queryPlanHint;
     }
 
+    return null;
+  }
+
+  /**
+   * Parse hints for hash join in new query planning framework. Only check syntax error here and
+   * leave semantics interpret work for planner.
+   */
+  private static Hint parseHintForQueryPlanner(String hintStr) {
+    if (hintStr.contains("(")
+        && (hintStr.startsWith("! JOIN_ALGORITHM_BLOCK_SIZE")
+            || hintStr.startsWith("! JOIN_SCROLL_PAGE_SIZE")
+            || hintStr.startsWith("! JOIN_CIRCUIT_BREAK_LIMIT")
+            || hintStr.startsWith("! JOIN_BACK_OFF_RETRY_INTERVALS")
+            || hintStr.startsWith(
+                "! JOIN_TIME_OUT"))) { // Note that Trie tree is needed here if many hint options
+
+      String hintName = hintStr.substring(PREFIX.length(), hintStr.indexOf('(')).trim();
+      String hintPrefix = PREFIX + hintName;
+      HintType hintType = HintType.valueOf(hintName);
+      Integer[] params = parseParamsAsInts(hintStr, hintPrefix);
+
+      if (params != null && params.length > 0) {
+        return new Hint(hintType, params);
+      }
+    } else if (hintStr.startsWith("! JOIN_ALGORITHM_USE_LEGACY")) {
+      return new Hint(HintType.JOIN_ALGORITHM_USE_LEGACY, new Object[0]);
+    }
+    return null;
+  }
 
+  private static String getParamFromHint(String hint, String prefix) {
+    if (!hint.contains("(")) {
+      return null;
+    }
+    return hint.replace(prefix, "")
+        .replaceAll("\\s*\\(\\s*", "")
+        .replaceAll("\\s*\\,\\s*", ",")
+        .replaceAll("\\s*\\)\\s*", "");
+  }
+
+  private static String[] getParamsFromHint(String hint, String prefix) {
+    String param = getParamFromHint(hint, prefix);
+    return param != null ? param.split(",") : null;
+  }
+
+  private static Integer[] parseParamsAsInts(String hintAsString, String startWith) {
+    String[] number = getParamsFromHint(hintAsString, startWith);
+    if (number == null) {
+      return new Integer[0];
+    }
+    // todo: check if numbers etc..
+    Integer[] params = new Integer[number.length];
+    for (int i = 0; i < params.length; i++) {
+      params[i] = Integer.parseInt(number[i]);
+    }
+    return params;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/HintType.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/HintType.java
index 7d3444c36c..0134ef0874 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/HintType.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/hints/HintType.java
@@ -3,31 +3,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.domain.hints;
 
-/**
- * Created by Eliran on 29/8/2015.
- */
+/** Created by Eliran on 29/8/2015. */
 public enum HintType {
-    HASH_WITH_TERMS_FILTER,
-    JOIN_LIMIT,
-    USE_NESTED_LOOPS,
-    NL_MULTISEARCH_SIZE,
-    USE_SCROLL,
-    IGNORE_UNAVAILABLE,
-    DOCS_WITH_AGGREGATION,
-    ROUTINGS,
-    SHARD_SIZE,
-    HIGHLIGHT,
-    MINUS_FETCH_AND_RESULT_LIMITS,
-    MINUS_USE_TERMS_OPTIMIZATION,
-    COLLAPSE,
-    POST_FILTER,
-    JOIN_ALGORITHM_BLOCK_SIZE,
-    JOIN_ALGORITHM_USE_LEGACY,
-    JOIN_SCROLL_PAGE_SIZE,
-    JOIN_CIRCUIT_BREAK_LIMIT,
-    JOIN_BACK_OFF_RETRY_INTERVALS,
-    JOIN_TIME_OUT
+  HASH_WITH_TERMS_FILTER,
+  JOIN_LIMIT,
+  USE_NESTED_LOOPS,
+  NL_MULTISEARCH_SIZE,
+  USE_SCROLL,
+  IGNORE_UNAVAILABLE,
+  DOCS_WITH_AGGREGATION,
+  ROUTINGS,
+  SHARD_SIZE,
+  HIGHLIGHT,
+  MINUS_FETCH_AND_RESULT_LIMITS,
+  MINUS_USE_TERMS_OPTIMIZATION,
+  COLLAPSE,
+  POST_FILTER,
+  JOIN_ALGORITHM_BLOCK_SIZE,
+  JOIN_ALGORITHM_USE_LEGACY,
+  JOIN_SCROLL_PAGE_SIZE,
+  JOIN_CIRCUIT_BREAK_LIMIT,
+  JOIN_BACK_OFF_RETRY_INTERVALS,
+  JOIN_TIME_OUT
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/LocalClusterState.java b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/LocalClusterState.java
index 37d9322b46..786c9310df 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/LocalClusterState.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/LocalClusterState.java
@@ -3,29 +3,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.esdomain;
 
-import static org.opensearch.common.settings.Settings.EMPTY;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import java.io.IOException;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Function;
-import java.util.function.Predicate;
+import java.util.concurrent.TimeUnit;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.support.IndicesOptions;
-import org.opensearch.cluster.ClusterState;
-import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.metadata.MappingMetadata;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.sql.common.setting.Settings;
@@ -33,188 +26,131 @@
 import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
 
 /**
- * Local cluster state information which may be stale but help avoid blocking operation in NIO thread.
- * <p>
- * 1) Why extending TransportAction doesn't work here?
- * TransportAction enforce implementation to be performed remotely but local cluster state read is expected here.
- * <p>
- * 2) Why injection by AbstractModule doesn't work here?
- * Because this state needs to be used across the plugin, ex. in rewriter, pretty formatter etc.
+ * Local cluster state information which may be stale but help avoid blocking operation in NIO
+ * thread.
+ *
+ * <p>1) Why extending TransportAction doesn't work here? TransportAction enforce implementation to
+ * be performed remotely but local cluster state read is expected here.
+ *
+ * <p>2) Why injection by AbstractModule doesn't work here? Because this state needs to be used
+ * across the plugin, ex. in rewriter, pretty formatter etc.
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class LocalClusterState {
 
-    private static final Logger LOG = LogManager.getLogger();
-
-    private static final Function<String, Predicate<String>> ALL_FIELDS = (anyIndex -> (anyField -> true));
-
-    /**
-     * Singleton instance
-     */
-    private static LocalClusterState INSTANCE;
+  private static final Logger LOG = LogManager.getLogger();
 
-    /**
-     * Current cluster state on local node
-     */
-    private ClusterService clusterService;
+  /** Singleton instance */
+  private static LocalClusterState INSTANCE;
 
-    private OpenSearchSettings pluginSettings;
+  /** Current cluster state on local node */
+  private ClusterService clusterService;
 
-    /**
-     * Index name expression resolver to get concrete index name
-     */
-    private IndexNameExpressionResolver resolver;
+  private Client client;
 
-    /**
-     * Thread-safe mapping cache to save the computation of sourceAsMap() which is not lightweight as thought
-     * Array cannot be used as key because hashCode() always return reference address, so either use wrapper or List.
-     */
-    private final Cache<List<String>, IndexMappings> cache;
+  private OpenSearchSettings pluginSettings;
 
-    /**
-     * Latest setting value for each registered key. Thread-safe is required.
-     */
-    private final Map<String, Object> latestSettings = new ConcurrentHashMap<>();
+  /** Latest setting value for each registered key. Thread-safe is required. */
+  private final Map<String, Object> latestSettings = new ConcurrentHashMap<>();
 
-    public static synchronized LocalClusterState state() {
-        if (INSTANCE == null) {
-            INSTANCE = new LocalClusterState();
-        }
-        return INSTANCE;
+  public static synchronized LocalClusterState state() {
+    if (INSTANCE == null) {
+      INSTANCE = new LocalClusterState();
     }
-
-    /**
-     * Give testing code a chance to inject mock object
-     */
-    public static synchronized void state(LocalClusterState instance) {
-        INSTANCE = instance;
-    }
-
-    public void setClusterService(ClusterService clusterService) {
-        this.clusterService = clusterService;
-
-        clusterService.addListener(event -> {
-            if (event.metadataChanged()) {
-                // State in cluster service is already changed to event.state() before listener fired
+    return INSTANCE;
+  }
+
+  /** Give testing code a chance to inject mock object */
+  public static synchronized void state(LocalClusterState instance) {
+    INSTANCE = instance;
+  }
+
+  /**
+   * Sets the ClusterService used to receive ClusterSetting update notifications.
+   *
+   * @param clusterService The non-null cluster service instance.
+   */
+  public void setClusterService(@NonNull ClusterService clusterService) {
+    this.clusterService = clusterService;
+  }
+
+  /**
+   * Sets the Client used to interact with OpenSearch core.
+   *
+   * @param client The non-null client instance
+   */
+  public void setClient(@NonNull Client client) {
+    this.client = client;
+  }
+
+  /**
+   * Sets the plugin's settings.
+   *
+   * @param settings The non-null plugin settings instance
+   */
+  public void setPluginSettings(@NonNull OpenSearchSettings settings) {
+
+    this.pluginSettings = settings;
+
+    for (Setting<?> setting : settings.getSettings()) {
+      clusterService
+          .getClusterSettings()
+          .addSettingsUpdateConsumer(
+              setting,
+              newVal -> {
                 if (LOG.isDebugEnabled()) {
-                    LOG.debug("Metadata in cluster state changed: {}",
-                            new IndexMappings(clusterService.state().metadata()));
+                  LOG.debug("The value of setting [{}] changed to [{}]", setting.getKey(), newVal);
                 }
-                cache.invalidateAll();
-            }
-        });
+                latestSettings.put(setting.getKey(), newVal);
+              });
     }
-
-    public void setPluginSettings(OpenSearchSettings settings) {
-        this.pluginSettings = settings;
-        for (Setting<?> setting: settings.getSettings()) {
-            clusterService.getClusterSettings().addSettingsUpdateConsumer(
-                setting,
-                newVal -> {
-                    if (LOG.isDebugEnabled()) {
-                        LOG.debug("The value of setting [{}] changed to [{}]", setting.getKey(), newVal);
-                    }
-                    latestSettings.put(setting.getKey(), newVal);
-                }
-            );
-        }
-
-    }
-
-    public void setResolver(IndexNameExpressionResolver resolver) {
-        this.resolver = resolver;
-    }
-
-    private LocalClusterState() {
-        cache = CacheBuilder.newBuilder().maximumSize(100).build();
+  }
+
+  /**
+   * Get plugin setting value by key. Return default value if not configured explicitly.
+   *
+   * @param key setting key registered during plugin bootstrap.
+   * @return setting value or default.
+   */
+  @SuppressWarnings("unchecked")
+  public <T> T getSettingValue(Settings.Key key) {
+    Objects.requireNonNull(pluginSettings, "SQL plugin setting is null");
+    return (T) latestSettings.getOrDefault(key.getKeyValue(), pluginSettings.getSettingValue(key));
+  }
+
+  /**
+   * Get field mappings by index expressions. Because IndexMetaData/MappingMetaData is hard to
+   * convert to FieldMappingMetaData, custom mapping domain objects are being used here. In future,
+   * it should be moved to domain model layer for all OpenSearch specific knowledge.
+   *
+   * @param indices index name expression
+   * @return index mapping(s)
+   */
+  public IndexMappings getFieldMappings(String[] indices) {
+    Objects.requireNonNull(client, "Client is null");
+
+    try {
+
+      Map<String, MappingMetadata> mappingMetadata =
+          client
+              .admin()
+              .indices()
+              .prepareGetMappings(indices)
+              .setLocal(true)
+              .setIndicesOptions(IndicesOptions.strictExpandOpen())
+              .execute()
+              .actionGet(0, TimeUnit.NANOSECONDS)
+              .mappings();
+
+      IndexMappings mappings = new IndexMappings(mappingMetadata);
+
+      LOG.debug("Found mappings: {}", mappings);
+      return mappings;
+    } catch (IndexNotFoundException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException(
+          "Failed to read mapping in cluster state for indices=" + Arrays.toString(indices), e);
     }
-
-    /**
-     * Get plugin setting value by key. Return default value if not configured explicitly.
-     * @param key setting key registered during plugin bootstrap.
-     * @return setting value or default.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T getSettingValue(Settings.Key key) {
-        Objects.requireNonNull(pluginSettings, "SQL plugin setting is null");
-        return (T) latestSettings.getOrDefault(key.getKeyValue(),
-            pluginSettings.getSettingValue(key));
-    }
-
-    /**
-     * Get field mappings by index expressions. All types and fields are included in response.
-     */
-    public IndexMappings getFieldMappings(String[] indices) {
-        return getFieldMappings(indices, ALL_FIELDS);
-    }
-
-    /**
-     * Get field mappings by index expressions, type and field filter. Because IndexMetaData/MappingMetaData
-     * is hard to convert to FieldMappingMetaData, custom mapping domain objects are being used here. In future,
-     * it should be moved to domain model layer for all OpenSearch specific knowledge.
-     * <p>
-     * Note that cluster state may be change inside OpenSearch so it's possible to read different state in 2 accesses
-     * to ClusterService.state() here.
-     *
-     * @param indices     index name expression
-     * @param fieldFilter field filter predicate
-     * @return index mapping(s)
-     */
-    private IndexMappings getFieldMappings(String[] indices, Function<String, Predicate<String>> fieldFilter) {
-        Objects.requireNonNull(clusterService, "Cluster service is null");
-        Objects.requireNonNull(resolver, "Index name expression resolver is null");
-
-        try {
-            ClusterState state = clusterService.state();
-            String[] concreteIndices = resolveIndexExpression(state, indices);
-
-            IndexMappings mappings;
-            if (fieldFilter == ALL_FIELDS) {
-                mappings = findMappingsInCache(state, concreteIndices);
-            } else {
-                mappings = findMappings(state, concreteIndices, fieldFilter);
-            }
-
-            LOG.debug("Found mappings: {}", mappings);
-            return mappings;
-        } catch (IndexNotFoundException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new IllegalStateException(
-                    "Failed to read mapping in cluster state for indices="
-                            + Arrays.toString(indices) , e);
-        }
-    }
-
-    private String[] resolveIndexExpression(ClusterState state, String[] indices) {
-        String[] concreteIndices = resolver.concreteIndexNames(state, IndicesOptions.strictExpandOpen(), true, indices);
-
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Resolved index expression {} to concrete index names {}",
-                    Arrays.toString(indices), Arrays.toString(concreteIndices));
-        }
-        return concreteIndices;
-    }
-
-    private IndexMappings findMappings(ClusterState state, String[] indices,
-                                       Function<String, Predicate<String>> fieldFilter) throws IOException {
-        LOG.debug("Cache didn't help. Load and parse mapping in cluster state");
-        return new IndexMappings(
-                state.metadata().findMappings(indices, fieldFilter)
-        );
-    }
-
-    private IndexMappings findMappingsInCache(ClusterState state, String[] indices)
-            throws ExecutionException {
-        LOG.debug("Looking for mapping in cache: {}", cache.asMap());
-        return cache.get(sortToList(indices),
-                () -> findMappings(state, indices, ALL_FIELDS)
-        );
-    }
-
-    private <T> List<T> sortToList(T[] array) {
-        // Mostly array has single element
-        Arrays.sort(array);
-        return Arrays.asList(array);
-    }
-
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/OpenSearchClient.java b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/OpenSearchClient.java
index a823947466..fd02486fae 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/OpenSearchClient.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/OpenSearchClient.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.esdomain;
 
 import java.util.ArrayList;
@@ -19,47 +18,57 @@
 
 public class OpenSearchClient {
 
-    private static final Logger LOG = LogManager.getLogger();
-    private static final int[] retryIntervals = new int[]{4, 12, 20, 20};
-    private final Client client;
+  private static final Logger LOG = LogManager.getLogger();
+  private static final int[] retryIntervals = new int[] {4, 12, 20, 20};
+  private final Client client;
 
-    public OpenSearchClient(Client client) {
-        this.client = client;
-    }
+  public OpenSearchClient(Client client) {
+    this.client = client;
+  }
 
-    public MultiSearchResponse.Item[] multiSearch(MultiSearchRequest multiSearchRequest) {
-        MultiSearchResponse.Item[] responses = new MultiSearchResponse.Item[multiSearchRequest.requests().size()];
-        multiSearchRetry(responses, multiSearchRequest,
-                IntStream.range(0, multiSearchRequest.requests().size()).boxed().collect(Collectors.toList()), 0);
+  public MultiSearchResponse.Item[] multiSearch(MultiSearchRequest multiSearchRequest) {
+    MultiSearchResponse.Item[] responses =
+        new MultiSearchResponse.Item[multiSearchRequest.requests().size()];
+    multiSearchRetry(
+        responses,
+        multiSearchRequest,
+        IntStream.range(0, multiSearchRequest.requests().size())
+            .boxed()
+            .collect(Collectors.toList()),
+        0);
 
-        return responses;
-    }
+    return responses;
+  }
 
-    private void multiSearchRetry(MultiSearchResponse.Item[] responses, MultiSearchRequest multiSearchRequest,
-                                  List<Integer> indices, int retry) {
-        MultiSearchRequest multiSearchRequestRetry = new MultiSearchRequest();
-        for (int i : indices) {
-            multiSearchRequestRetry.add(multiSearchRequest.requests().get(i));
-        }
-        MultiSearchResponse.Item[] res = client.multiSearch(multiSearchRequestRetry).actionGet().getResponses();
-        List<Integer> indicesFailure = new ArrayList<>();
-        //Could get EsRejectedExecutionException and OpenSearchException as getCause
-        for (int i = 0; i < res.length; i++) {
-            if (res[i].isFailure()) {
-                indicesFailure.add(indices.get(i));
-                if (retry == 3) {
-                    responses[indices.get(i)] = res[i];
-                }
-            } else {
-                responses[indices.get(i)] = res[i];
-            }
-        }
-        if (!indicesFailure.isEmpty()) {
-            LOG.info("OpenSearch multisearch has failures on retry {}", retry);
-            if (retry < 3) {
-                BackOffRetryStrategy.backOffSleep(retryIntervals[retry]);
-                multiSearchRetry(responses, multiSearchRequest, indicesFailure, retry + 1);
-            }
+  private void multiSearchRetry(
+      MultiSearchResponse.Item[] responses,
+      MultiSearchRequest multiSearchRequest,
+      List<Integer> indices,
+      int retry) {
+    MultiSearchRequest multiSearchRequestRetry = new MultiSearchRequest();
+    for (int i : indices) {
+      multiSearchRequestRetry.add(multiSearchRequest.requests().get(i));
+    }
+    MultiSearchResponse.Item[] res =
+        client.multiSearch(multiSearchRequestRetry).actionGet().getResponses();
+    List<Integer> indicesFailure = new ArrayList<>();
+    // Could get EsRejectedExecutionException and OpenSearchException as getCause
+    for (int i = 0; i < res.length; i++) {
+      if (res[i].isFailure()) {
+        indicesFailure.add(indices.get(i));
+        if (retry == 3) {
+          responses[indices.get(i)] = res[i];
         }
+      } else {
+        responses[indices.get(i)] = res[i];
+      }
+    }
+    if (!indicesFailure.isEmpty()) {
+      LOG.info("OpenSearch multisearch has failures on retry {}", retry);
+      if (retry < 3) {
+        BackOffRetryStrategy.backOffSleep(retryIntervals[retry]);
+        multiSearchRetry(responses, multiSearchRequest, indicesFailure, retry + 1);
+      }
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMapping.java b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMapping.java
index bc6c26a6d6..89f8f9ac89 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMapping.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMapping.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.esdomain.mapping;
 
 import static java.util.Collections.emptyMap;
@@ -16,121 +15,119 @@
 
 /**
  * Field mapping that parses native OpenSearch mapping.
- * <p>
- * NOTE that approaches in this class are NOT reliable because of the OpenSearch mapping query API used.
- * We should deprecate this in future and parse field mapping in more solid way.
+ *
+ * <p>NOTE that approaches in this class are NOT reliable because of the OpenSearch mapping query
+ * API used. We should deprecate this in future and parse field mapping in more solid way.
  */
 public class FieldMapping {
 
-    /**
-     * Name of the Field to be parsed
-     */
-    private final String fieldName;
-
-    /**
-     * Native mapping information returned from OpenSearch
-     */
-    private final Map<String, FieldMappingMetadata> typeMappings;
-
-    /**
-     * Maps a field name to Field object that specified in query explicitly
-     */
-    private final Map<String, Field> specifiedFieldsByName;
-
-    public FieldMapping(String fieldName) {
-        this(fieldName, emptyMap(), emptyMap());
-    }
-
-    public FieldMapping(String fieldName,
-                        Map<String, FieldMappingMetadata> typeMappings,
-                        Map<String, Field> specifiedFieldByNames) {
-
-        this.fieldName = fieldName;
-        this.typeMappings = typeMappings;
-        this.specifiedFieldsByName = specifiedFieldByNames;
-    }
-
-    /**
-     * Is field specified explicitly in query
-     *
-     * @return true if specified
-     */
-    public boolean isSpecified() {
-        return specifiedFieldsByName.containsKey(fieldName);
-    }
-
-    /**
-     * Verify if property field matches wildcard pattern specified in query
-     *
-     * @return true if matched
-     */
-    public boolean isWildcardSpecified() {
-        return specifiedFieldsByName.containsKey(path() + ".*");
-    }
-
-    /**
-     * Is field a property field, which means either object field or nested field.
-     *
-     * @return true for property field
-     */
-    public boolean isPropertyField() {
-        int numOfDots = StringUtils.countMatches(fieldName, '.');
-        return numOfDots > 1 || (numOfDots == 1 && !isMultiField());
-    }
-
-    /**
-     * Is field a/in multi-field, for example, field "a.keyword" in field "a"
-     *
-     * @return true for multi field
-     */
-    public boolean isMultiField() {
-        return fieldName.endsWith(".keyword");
+  /** Name of the Field to be parsed */
+  private final String fieldName;
+
+  /** Native mapping information returned from OpenSearch */
+  private final Map<String, FieldMappingMetadata> typeMappings;
+
+  /** Maps a field name to Field object that specified in query explicitly */
+  private final Map<String, Field> specifiedFieldsByName;
+
+  public FieldMapping(String fieldName) {
+    this(fieldName, emptyMap(), emptyMap());
+  }
+
+  public FieldMapping(
+      String fieldName,
+      Map<String, FieldMappingMetadata> typeMappings,
+      Map<String, Field> specifiedFieldByNames) {
+
+    this.fieldName = fieldName;
+    this.typeMappings = typeMappings;
+    this.specifiedFieldsByName = specifiedFieldByNames;
+  }
+
+  /**
+   * Is field specified explicitly in query
+   *
+   * @return true if specified
+   */
+  public boolean isSpecified() {
+    return specifiedFieldsByName.containsKey(fieldName);
+  }
+
+  /**
+   * Verify if property field matches wildcard pattern specified in query
+   *
+   * @return true if matched
+   */
+  public boolean isWildcardSpecified() {
+    return specifiedFieldsByName.containsKey(path() + ".*");
+  }
+
+  /**
+   * Is field a property field, which means either object field or nested field.
+   *
+   * @return true for property field
+   */
+  public boolean isPropertyField() {
+    int numOfDots = StringUtils.countMatches(fieldName, '.');
+    return numOfDots > 1 || (numOfDots == 1 && !isMultiField());
+  }
+
+  /**
+   * Is field a/in multi-field, for example, field "a.keyword" in field "a"
+   *
+   * @return true for multi field
+   */
+  public boolean isMultiField() {
+    return fieldName.endsWith(".keyword");
+  }
+
+  /**
+   * Is field meta field, such as _id, _index, _source etc.
+   *
+   * @return true for meta field
+   */
+  public boolean isMetaField() {
+    return fieldName.startsWith("_");
+  }
+
+  /**
+   * Path of property field, for example "employee" in "employee.manager"
+   *
+   * @return path of property field
+   */
+  public String path() {
+    int lastDot = fieldName.lastIndexOf(".");
+    if (lastDot == -1) {
+      throw new IllegalStateException(
+          "path() is being invoked on the wrong field [" + fieldName + "]");
     }
-
-    /**
-     * Is field meta field, such as _id, _index, _source etc.
-     *
-     * @return true for meta field
-     */
-    public boolean isMetaField() {
-        return fieldName.startsWith("_");
-    }
-
-    /**
-     * Path of property field, for example "employee" in "employee.manager"
-     *
-     * @return path of property field
-     */
-    public String path() {
-        int lastDot = fieldName.lastIndexOf(".");
-        if (lastDot == -1) {
-            throw new IllegalStateException("path() is being invoked on the wrong field [" + fieldName + "]");
-        }
-        return fieldName.substring(0, lastDot);
-    }
-
-    /**
-     * Find field type in OpenSearch Get Field Mapping API response. Note that Get Field Mapping API does NOT return
-     * the type for object or nested field. In this case, object type is used as default under the assumption
-     * that the field queried here must exist (which is true if semantic analyzer is enabled).
-     *
-     * @return      field type if found in mapping, otherwise "object" type returned
-     */
-    @SuppressWarnings("unchecked")
-    public String type() {
-        FieldMappingMetadata metaData = typeMappings.get(fieldName);
-        if (metaData == null) {
-            return DescribeResultSet.DEFAULT_OBJECT_DATATYPE;
-        }
-
-        Map<String, Object> source = metaData.sourceAsMap();
-        String[] fieldPath = fieldName.split("\\.");
-
-        // For object/nested field, fieldName is full path though only innermost field name present in mapping
-        // For example, fieldName='employee.location.city', metaData='{"city":{"type":"text"}}'
-        String innermostFieldName = (fieldPath.length == 1) ? fieldName : fieldPath[fieldPath.length - 1];
-        Map<String, Object> fieldMapping = (Map<String, Object>) source.get(innermostFieldName);
-        return (String) fieldMapping.get("type");
+    return fieldName.substring(0, lastDot);
+  }
+
+  /**
+   * Find field type in OpenSearch Get Field Mapping API response. Note that Get Field Mapping API
+   * does NOT return the type for object or nested field. In this case, object type is used as
+   * default under the assumption that the field queried here must exist (which is true if semantic
+   * analyzer is enabled).
+   *
+   * @return field type if found in mapping, otherwise "object" type returned
+   */
+  @SuppressWarnings("unchecked")
+  public String type() {
+    FieldMappingMetadata metaData = typeMappings.get(fieldName);
+    if (metaData == null) {
+      return DescribeResultSet.DEFAULT_OBJECT_DATATYPE;
     }
 
+    Map<String, Object> source = metaData.sourceAsMap();
+    String[] fieldPath = fieldName.split("\\.");
+
+    // For object/nested field, fieldName is full path though only innermost field name present in
+    // mapping
+    // For example, fieldName='employee.location.city', metaData='{"city":{"type":"text"}}'
+    String innermostFieldName =
+        (fieldPath.length == 1) ? fieldName : fieldPath[fieldPath.length - 1];
+    Map<String, Object> fieldMapping = (Map<String, Object>) source.get(innermostFieldName);
+    return (String) fieldMapping.get("type");
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappings.java b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappings.java
index 257e397478..bff494ed0e 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappings.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappings.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.esdomain.mapping;
 
 import java.util.HashMap;
@@ -16,132 +15,106 @@
 
 /**
  * Field mappings in a specific type.
- * <p>
- * Sample:
- * fieldMappings: {
- * 'properties': {
- * 'balance': {
- * 'type': long
- * },
- * 'age': {
- * 'type': integer
- * },
- * 'state': {
- * 'type': text，
- * }
- * 'name': {
- * 'type': text，
- * 'fields': {
- * 'keyword': {
- * 'type': keyword,
- * 'ignore_above': 256
- * }
- * }
- * }
- * }
- * }
+ *
+ * <p>Sample: fieldMappings: { 'properties': { 'balance': { 'type': long }, 'age': { 'type': integer
+ * }, 'state': { 'type': text } 'name': { 'type': text 'fields': { 'keyword': { 'type': keyword,
+ * 'ignore_above': 256 } } } } }
  */
 @SuppressWarnings("unchecked")
 public class FieldMappings implements Mappings<Map<String, Object>> {
 
-    private static final String PROPERTIES = "properties";
-
-    /**
-     * Mapping from field name to its type
-     */
-    private final Map<String, Object> fieldMappings;
-
-    public FieldMappings(MappingMetadata mappings) {
-        fieldMappings = mappings.sourceAsMap();
-    }
+  private static final String PROPERTIES = "properties";
 
-    public FieldMappings(Map<String, Map<String, Object>> mapping) {
-        Map<String, Object> finalMapping = new HashMap<>();
-        finalMapping.put(PROPERTIES, mapping);
-        fieldMappings = finalMapping;
-    }
-
-    @Override
-    public boolean has(String path) {
-        return mapping(path) != null;
-    }
+  /** Mapping from field name to its type */
+  private final Map<String, Object> fieldMappings;
 
-    /**
-     * Different from default implementation that search mapping for path is required
-     */
-    @Override
-    public Map<String, Object> mapping(String path) {
-        Map<String, Object> mapping = fieldMappings;
-        for (String name : path.split("\\.")) {
-            if (mapping == null || !mapping.containsKey(PROPERTIES)) {
-                return null;
-            }
-
-            mapping = (Map<String, Object>)
-                    ((Map<String, Object>) mapping.get(PROPERTIES)).get(name);
-        }
-        return mapping;
-    }
+  public FieldMappings(MappingMetadata mappings) {
+    fieldMappings = mappings.sourceAsMap();
+  }
 
-    @Override
-    public Map<String, Map<String, Object>> data() {
-        // Is this assumption true? Is it possible mapping of field is NOT a Map<String,Object>?
-        return (Map<String, Map<String, Object>>) fieldMappings.get(PROPERTIES);
-    }
+  public FieldMappings(Map<String, Map<String, Object>> mapping) {
+    Map<String, Object> finalMapping = new HashMap<>();
+    finalMapping.put(PROPERTIES, mapping);
+    fieldMappings = finalMapping;
+  }
 
-    public void flat(BiConsumer<String, String> func) {
-        flatMappings(data(), Optional.empty(), func);
-    }
+  @Override
+  public boolean has(String path) {
+    return mapping(path) != null;
+  }
 
-    @SuppressWarnings("unchecked")
-    private void flatMappings(Map<String, Map<String, Object>> mappings,
-                              Optional<String> path,
-                              BiConsumer<String, String> func) {
-        mappings.forEach(
-            (fieldName, mapping) -> {
-                String fullFieldName = path.map(s -> s + "." + fieldName).orElse(fieldName);
-                String type = (String) mapping.getOrDefault("type", "object");
-                func.accept(fullFieldName, type);
-
-                if (mapping.containsKey("fields")) {
-                    ((Map<String, Map<String, Object>>) mapping.get("fields")).forEach(
-                        (innerFieldName, innerMapping) ->
-                            func.accept(fullFieldName + "." + innerFieldName,
-                                        (String) innerMapping.getOrDefault("type", "object"))
-                    );
-                }
-
-                if (mapping.containsKey("properties")) {
-                    flatMappings(
-                        (Map<String, Map<String, Object>>) mapping.get("properties"),
-                        Optional.of(fullFieldName),
-                        func
-                    );
-                }
-            }
-        );
-    }
+  /** Different from default implementation that search mapping for path is required */
+  @Override
+  public Map<String, Object> mapping(String path) {
+    Map<String, Object> mapping = fieldMappings;
+    for (String name : path.split("\\.")) {
+      if (mapping == null || !mapping.containsKey(PROPERTIES)) {
+        return null;
+      }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        FieldMappings that = (FieldMappings) o;
-        return Objects.equals(fieldMappings, that.fieldMappings);
+      mapping = (Map<String, Object>) ((Map<String, Object>) mapping.get(PROPERTIES)).get(name);
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(fieldMappings);
+    return mapping;
+  }
+
+  @Override
+  public Map<String, Map<String, Object>> data() {
+    // Is this assumption true? Is it possible mapping of field is NOT a Map<String,Object>?
+    return (Map<String, Map<String, Object>>) fieldMappings.get(PROPERTIES);
+  }
+
+  public void flat(BiConsumer<String, String> func) {
+    flatMappings(data(), Optional.empty(), func);
+  }
+
+  @SuppressWarnings("unchecked")
+  private void flatMappings(
+      Map<String, Map<String, Object>> mappings,
+      Optional<String> path,
+      BiConsumer<String, String> func) {
+    mappings.forEach(
+        (fieldName, mapping) -> {
+          String fullFieldName = path.map(s -> s + "." + fieldName).orElse(fieldName);
+          String type = (String) mapping.getOrDefault("type", "object");
+          func.accept(fullFieldName, type);
+
+          if (mapping.containsKey("fields")) {
+            ((Map<String, Map<String, Object>>) mapping.get("fields"))
+                .forEach(
+                    (innerFieldName, innerMapping) ->
+                        func.accept(
+                            fullFieldName + "." + innerFieldName,
+                            (String) innerMapping.getOrDefault("type", "object")));
+          }
+
+          if (mapping.containsKey("properties")) {
+            flatMappings(
+                (Map<String, Map<String, Object>>) mapping.get("properties"),
+                Optional.of(fullFieldName),
+                func);
+          }
+        });
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public String toString() {
-        return "FieldMappings" + new JSONObject(fieldMappings).toString(2);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
-
+    FieldMappings that = (FieldMappings) o;
+    return Objects.equals(fieldMappings, that.fieldMappings);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(fieldMappings);
+  }
+
+  @Override
+  public String toString() {
+    return "FieldMappings" + new JSONObject(fieldMappings).toString(2);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/IndexMappings.java b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/IndexMappings.java
index a1b54faddf..dd09713d64 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/IndexMappings.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/IndexMappings.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.esdomain.mapping;
 
 import static java.util.Collections.emptyMap;
@@ -12,73 +11,66 @@
 import java.util.Objects;
 import org.opensearch.cluster.metadata.MappingMetadata;
 import org.opensearch.cluster.metadata.Metadata;
-import org.opensearch.common.collect.ImmutableOpenMap;
-import org.opensearch.sql.legacy.domain.Field;
 
 /**
  * Index mappings in the cluster.
- * <p>
- * Sample:
- * indexMappings: {
- * 'accounts': typeMappings1,
- * 'logs':     typeMappings2
- * }
- * <p>
- * Difference between response of getMapping/clusterState and getFieldMapping:
- * <p>
- * 1) MappingMetadata:
- * ((Map) ((Map) (mapping.get("bank").get("account").sourceAsMap().get("properties"))).get("balance")).get("type")
- * <p>
- * 2) FieldMetadata:
- * ((Map) client.admin().indices().getFieldMappings(request).actionGet().mappings().get("bank")
+ *
+ * <p>Sample: indexMappings: { 'accounts': typeMappings1, 'logs': typeMappings2 }
+ *
+ * <p>Difference between response of getMapping/clusterState and getFieldMapping:
+ *
+ * <p>1) MappingMetadata: ((Map) ((Map)
+ * (mapping.get("bank").get("account").sourceAsMap().get("properties"))).get("balance")).get("type")
+ *
+ * <p>2) FieldMetadata: ((Map)
+ * client.admin().indices().getFieldMappings(request).actionGet().mappings().get("bank")
  * .get("account").get("balance").sourceAsMap().get("balance")).get("type")
  */
 public class IndexMappings implements Mappings<FieldMappings> {
 
-    public static final IndexMappings EMPTY = new IndexMappings();
+  public static final IndexMappings EMPTY = new IndexMappings();
 
-    /**
-     * Mapping from Index name to mappings of all fields in it
-     */
-    private final Map<String, FieldMappings> indexMappings;
+  /** Mapping from Index name to mappings of all fields in it */
+  private final Map<String, FieldMappings> indexMappings;
 
-    public IndexMappings() {
-        this.indexMappings = emptyMap();
-    }
+  public IndexMappings() {
+    this.indexMappings = emptyMap();
+  }
 
-    public IndexMappings(Metadata metaData) {
-        this.indexMappings = buildMappings(metaData.indices(),
-                indexMetaData -> new FieldMappings(indexMetaData.mapping()));
-    }
+  public IndexMappings(Metadata metaData) {
+    this.indexMappings =
+        buildMappings(
+            metaData.indices(), indexMetaData -> new FieldMappings(indexMetaData.mapping()));
+  }
 
-    public IndexMappings(ImmutableOpenMap<String, MappingMetadata> mappings) {
-        this.indexMappings = buildMappings(mappings, FieldMappings::new);
-    }
+  public IndexMappings(Map<String, MappingMetadata> mappings) {
+    this.indexMappings = buildMappings(mappings, FieldMappings::new);
+  }
 
-    @Override
-    public Map<String, FieldMappings> data() {
-        return indexMappings;
-    }
+  @Override
+  public Map<String, FieldMappings> data() {
+    return indexMappings;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        IndexMappings that = (IndexMappings) o;
-        return Objects.equals(indexMappings, that.indexMappings);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(indexMappings);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    IndexMappings that = (IndexMappings) o;
+    return Objects.equals(indexMappings, that.indexMappings);
+  }
 
-    @Override
-    public String toString() {
-        return "IndexMappings{" + indexMappings + '}';
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(indexMappings);
+  }
+
+  @Override
+  public String toString() {
+    return "IndexMappings{" + indexMappings + '}';
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/Mappings.java b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/Mappings.java
index 23e9eefd06..3cf02b55d8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/Mappings.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/mapping/Mappings.java
@@ -3,57 +3,51 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.esdomain.mapping;
 
-import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
-import com.google.common.collect.ImmutableMap;
 import java.util.Collection;
 import java.util.Map;
 import java.util.function.Function;
-import org.opensearch.common.collect.ImmutableOpenMap;
+import java.util.stream.Collectors;
 
 /**
- * Mappings interface to provide default implementation (minimal set of Map methods) for subclass in hierarchy.
+ * Mappings interface to provide default implementation (minimal set of Map methods) for subclass in
+ * hierarchy.
  *
  * @param <T> Type of nested mapping
  */
 public interface Mappings<T> {
 
-    default boolean has(String name) {
-        return data().containsKey(name);
-    }
-
-    default Collection<String> allNames() {
-        return data().keySet();
-    }
-
-    default T mapping(String name) {
-        return data().get(name);
-    }
-
-    default T firstMapping() {
-        return allMappings().iterator().next();
-    }
-
-    default Collection<T> allMappings() {
-        return data().values();
-    }
-
-    default boolean isEmpty() {
-        return data().isEmpty();
-    }
-
-    Map<String, T> data();
-
-    /**
-     * Convert OpenSearch ImmutableOpenMap<String, X> to JDK Map<String, Y> by applying function: Y func(X)
-     */
-    default <X, Y> Map<String, Y> buildMappings(ImmutableOpenMap<String, X> mappings, Function<X, Y> func) {
-        ImmutableMap.Builder<String, Y> builder = ImmutableMap.builder();
-        for (ObjectObjectCursor<String, X> mapping : mappings) {
-            builder.put(mapping.key, func.apply(mapping.value));
-        }
-        return builder.build();
-    }
+  default boolean has(String name) {
+    return data().containsKey(name);
+  }
+
+  default Collection<String> allNames() {
+    return data().keySet();
+  }
+
+  default T mapping(String name) {
+    return data().get(name);
+  }
+
+  default T firstMapping() {
+    return allMappings().iterator().next();
+  }
+
+  default Collection<T> allMappings() {
+    return data().values();
+  }
+
+  default boolean isEmpty() {
+    return data().isEmpty();
+  }
+
+  Map<String, T> data();
+
+  /** Build a map from an existing map by applying provided function to each value. */
+  default <X, Y> Map<String, Y> buildMappings(Map<String, X> mappings, Function<X, Y> func) {
+    return mappings.entrySet().stream()
+        .collect(
+            Collectors.toUnmodifiableMap(Map.Entry::getKey, func.compose(Map.Entry::getValue)));
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/exception/SQLFeatureDisabledException.java b/legacy/src/main/java/org/opensearch/sql/legacy/exception/SQLFeatureDisabledException.java
index 52cdda3cdd..4578cd6c93 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/exception/SQLFeatureDisabledException.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/exception/SQLFeatureDisabledException.java
@@ -3,15 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.exception;
 
 public class SQLFeatureDisabledException extends Exception {
 
-    private static final long serialVersionUID = 1L;
-
-    public SQLFeatureDisabledException(String message) {
-        super(message);
-    }
+  private static final long serialVersionUID = 1L;
 
+  public SQLFeatureDisabledException(String message) {
+    super(message);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/exception/SqlFeatureNotImplementedException.java b/legacy/src/main/java/org/opensearch/sql/legacy/exception/SqlFeatureNotImplementedException.java
index 9225986132..43ad6d97b5 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/exception/SqlFeatureNotImplementedException.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/exception/SqlFeatureNotImplementedException.java
@@ -3,21 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.exception;
 
 /**
- * Intended for cases when we knowingly omitted some case, letting users know that we didn't implemented feature, but
- * it may be implemented in future.
+ * Intended for cases when we knowingly omitted some case, letting users know that we didn't
+ * implemented feature, but it may be implemented in future.
  */
 public class SqlFeatureNotImplementedException extends RuntimeException {
-    private static final long serialVersionUID = 1;
+  private static final long serialVersionUID = 1;
 
-    public SqlFeatureNotImplementedException(String message) {
-        super(message);
-    }
+  public SqlFeatureNotImplementedException(String message) {
+    super(message);
+  }
 
-    public SqlFeatureNotImplementedException(String message, Throwable cause) {
-        super(message, cause);
-    }
+  public SqlFeatureNotImplementedException(String message, Throwable cause) {
+    super(message, cause);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/exception/SqlParseException.java b/legacy/src/main/java/org/opensearch/sql/legacy/exception/SqlParseException.java
index c93ad2a2fa..a09ddc97d1 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/exception/SqlParseException.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/exception/SqlParseException.java
@@ -3,16 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.exception;
 
 public class SqlParseException extends Exception {
 
-    public SqlParseException(String message) {
-        super(message);
-    }
-
-
-    private static final long serialVersionUID = 1L;
+  public SqlParseException(String message) {
+    super(message);
+  }
 
+  private static final long serialVersionUID = 1L;
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ActionRequestRestExecutorFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ActionRequestRestExecutorFactory.java
index d56ff231e0..c58bba9e26 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ActionRequestRestExecutorFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ActionRequestRestExecutorFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor;
 
 import org.opensearch.sql.legacy.executor.csv.CSVResultRestExecutor;
@@ -12,41 +11,37 @@
 import org.opensearch.sql.legacy.query.join.OpenSearchJoinQueryAction;
 import org.opensearch.sql.legacy.query.multi.MultiQueryAction;
 
-/**
- * Created by Eliran on 26/12/2015.
- */
+/** Created by Eliran on 26/12/2015. */
 public class ActionRequestRestExecutorFactory {
-    /**
-     * Create executor based on the format and wrap with AsyncRestExecutor
-     * to async blocking execute() call if necessary.
-     *
-     * @param format      format of response
-     * @param queryAction query action
-     * @return executor
-     */
-    public static RestExecutor createExecutor(Format format, QueryAction queryAction) {
-        switch (format) {
-            case CSV:
-                return new AsyncRestExecutor(new CSVResultRestExecutor());
-            case JSON:
-                return new AsyncRestExecutor(
-                        new ElasticDefaultRestExecutor(queryAction),
-                        action -> isJoin(action) || isUnionMinus(action)
-                );
-            case JDBC:
-            case RAW:
-            case TABLE:
-            default:
-                return new AsyncRestExecutor(new PrettyFormatRestExecutor(format.getFormatName()));
-        }
+  /**
+   * Create executor based on the format and wrap with AsyncRestExecutor to async blocking execute()
+   * call if necessary.
+   *
+   * @param format format of response
+   * @param queryAction query action
+   * @return executor
+   */
+  public static RestExecutor createExecutor(Format format, QueryAction queryAction) {
+    switch (format) {
+      case CSV:
+        return new AsyncRestExecutor(new CSVResultRestExecutor());
+      case JSON:
+        return new AsyncRestExecutor(
+            new ElasticDefaultRestExecutor(queryAction),
+            action -> isJoin(action) || isUnionMinus(action));
+      case JDBC:
+      case RAW:
+      case TABLE:
+      default:
+        return new AsyncRestExecutor(new PrettyFormatRestExecutor(format.getFormatName()));
     }
+  }
 
-    private static boolean isJoin(QueryAction queryAction) {
-        return queryAction instanceof OpenSearchJoinQueryAction;
-    }
-
-    private static boolean isUnionMinus(QueryAction queryAction) {
-        return queryAction instanceof MultiQueryAction;
-    }
+  private static boolean isJoin(QueryAction queryAction) {
+    return queryAction instanceof OpenSearchJoinQueryAction;
+  }
 
+  private static boolean isUnionMinus(QueryAction queryAction) {
+    return queryAction instanceof MultiQueryAction;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/AsyncRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/AsyncRestExecutor.java
index 4ad6e55777..4fdf6391bd 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/AsyncRestExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/AsyncRestExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor;
 
 import java.io.IOException;
@@ -15,9 +14,9 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.client.Client;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.common.utils.QueryContext;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
@@ -29,135 +28,141 @@
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.Transports;
 
-/**
- * A RestExecutor wrapper to execute request asynchronously to avoid blocking transport thread.
- */
+/** A RestExecutor wrapper to execute request asynchronously to avoid blocking transport thread. */
 public class AsyncRestExecutor implements RestExecutor {
 
-    /**
-     * Custom thread pool name managed by OpenSearch
-     */
-    public static final String SQL_WORKER_THREAD_POOL_NAME = "sql-worker";
-
-    private static final Logger LOG = LogManager.getLogger(AsyncRestExecutor.class);
-
-    /**
-     * Treat all actions as blocking which means async all actions,
-     * ex. execute() in csv executor or pretty format executor
-     */
-    private static final Predicate<QueryAction> ALL_ACTION_IS_BLOCKING = anyAction -> true;
-
-    /**
-     * Delegated rest executor to async
-     */
-    private final RestExecutor executor;
-
-    /**
-     * Request type that expect to async to avoid blocking
-     */
-    private final Predicate<QueryAction> isBlocking;
-
-
-    AsyncRestExecutor(RestExecutor executor) {
-        this(executor, ALL_ACTION_IS_BLOCKING);
+  /** Custom thread pool name managed by OpenSearch */
+  public static final String SQL_WORKER_THREAD_POOL_NAME = "sql-worker";
+
+  private static final Logger LOG = LogManager.getLogger(AsyncRestExecutor.class);
+
+  /**
+   * Treat all actions as blocking which means async all actions, ex. execute() in csv executor or
+   * pretty format executor
+   */
+  private static final Predicate<QueryAction> ALL_ACTION_IS_BLOCKING = anyAction -> true;
+
+  /** Delegated rest executor to async */
+  private final RestExecutor executor;
+
+  /** Request type that expect to async to avoid blocking */
+  private final Predicate<QueryAction> isBlocking;
+
+  AsyncRestExecutor(RestExecutor executor) {
+    this(executor, ALL_ACTION_IS_BLOCKING);
+  }
+
+  AsyncRestExecutor(RestExecutor executor, Predicate<QueryAction> isBlocking) {
+    this.executor = executor;
+    this.isBlocking = isBlocking;
+  }
+
+  @Override
+  public void execute(
+      Client client, Map<String, String> params, QueryAction queryAction, RestChannel channel)
+      throws Exception {
+    if (isBlockingAction(queryAction) && isRunningInTransportThread()) {
+      if (LOG.isDebugEnabled()) {
+        LOG.debug(
+            "[{}] Async blocking query action [{}] for executor [{}] in current thread [{}]",
+            QueryContext.getRequestId(),
+            name(executor),
+            name(queryAction),
+            Thread.currentThread().getName());
+      }
+      async(client, params, queryAction, channel);
+    } else {
+      if (LOG.isDebugEnabled()) {
+        LOG.debug(
+            "[{}] Continue running query action [{}] for executor [{}] in current thread [{}]",
+            QueryContext.getRequestId(),
+            name(executor),
+            name(queryAction),
+            Thread.currentThread().getName());
+      }
+      doExecuteWithTimeMeasured(client, params, queryAction, channel);
     }
-
-    AsyncRestExecutor(RestExecutor executor, Predicate<QueryAction> isBlocking) {
-        this.executor = executor;
-        this.isBlocking = isBlocking;
-    }
-
-    @Override
-    public void execute(Client client, Map<String, String> params, QueryAction queryAction, RestChannel channel)
-            throws Exception {
-        if (isBlockingAction(queryAction) && isRunningInTransportThread()) {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("[{}] Async blocking query action [{}] for executor [{}] in current thread [{}]",
-                        QueryContext.getRequestId(), name(executor), name(queryAction), Thread.currentThread().getName());
-            }
-            async(client, params, queryAction, channel);
-        } else {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("[{}] Continue running query action [{}] for executor [{}] in current thread [{}]",
-                        QueryContext.getRequestId(), name(executor), name(queryAction), Thread.currentThread().getName());
-            }
+  }
+
+  @Override
+  public String execute(Client client, Map<String, String> params, QueryAction queryAction)
+      throws Exception {
+    // Result is always required and no easy way to async it here.
+    return executor.execute(client, params, queryAction);
+  }
+
+  private boolean isBlockingAction(QueryAction queryAction) {
+    return isBlocking.test(queryAction);
+  }
+
+  private boolean isRunningInTransportThread() {
+    return Transports.isTransportThread(Thread.currentThread());
+  }
+
+  /** Run given task in thread pool asynchronously */
+  private void async(
+      Client client, Map<String, String> params, QueryAction queryAction, RestChannel channel) {
+
+    ThreadPool threadPool = client.threadPool();
+    Runnable runnable =
+        () -> {
+          try {
             doExecuteWithTimeMeasured(client, params, queryAction, channel);
-        }
-    }
-
-    @Override
-    public String execute(Client client, Map<String, String> params, QueryAction queryAction) throws Exception {
-        // Result is always required and no easy way to async it here.
-        return executor.execute(client, params, queryAction);
-    }
-
-    private boolean isBlockingAction(QueryAction queryAction) {
-        return isBlocking.test(queryAction);
-    }
-
-    private boolean isRunningInTransportThread() {
-        return Transports.isTransportThread(Thread.currentThread());
-    }
-
-    /**
-     * Run given task in thread pool asynchronously
-     */
-    private void async(Client client, Map<String, String> params, QueryAction queryAction, RestChannel channel) {
-
-        ThreadPool threadPool = client.threadPool();
-        Runnable runnable = () -> {
-            try {
-                doExecuteWithTimeMeasured(client, params, queryAction, channel);
-            } catch (IOException | SqlParseException | OpenSearchException e) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-                LOG.warn("[{}] [MCB] async task got an IO/SQL exception: {}", QueryContext.getRequestId(),
-                        e.getMessage());
-                channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR, e.getMessage()));
-            } catch (IllegalStateException e) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-                LOG.warn("[{}] [MCB] async task got a runtime exception: {}", QueryContext.getRequestId(),
-                        e.getMessage());
-                channel.sendResponse(new BytesRestResponse(RestStatus.INSUFFICIENT_STORAGE,
-                        "Memory circuit is broken."));
-            } catch (Throwable t) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-                LOG.warn("[{}] [MCB] async task got an unknown throwable: {}", QueryContext.getRequestId(),
-                        t.getMessage());
-                channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR,
-                        String.valueOf(t.getMessage())));
-            } finally {
-                BackOffRetryStrategy.releaseMem(executor);
-            }
+          } catch (IOException | SqlParseException | OpenSearchException e) {
+            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
+            LOG.warn(
+                "[{}] [MCB] async task got an IO/SQL exception: {}",
+                QueryContext.getRequestId(),
+                e.getMessage());
+            channel.sendResponse(
+                new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR, e.getMessage()));
+          } catch (IllegalStateException e) {
+            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
+            LOG.warn(
+                "[{}] [MCB] async task got a runtime exception: {}",
+                QueryContext.getRequestId(),
+                e.getMessage());
+            channel.sendResponse(
+                new BytesRestResponse(
+                    RestStatus.INSUFFICIENT_STORAGE, "Memory circuit is broken."));
+          } catch (Throwable t) {
+            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
+            LOG.warn(
+                "[{}] [MCB] async task got an unknown throwable: {}",
+                QueryContext.getRequestId(),
+                t.getMessage());
+            channel.sendResponse(
+                new BytesRestResponse(
+                    RestStatus.INTERNAL_SERVER_ERROR, String.valueOf(t.getMessage())));
+          } finally {
+            BackOffRetryStrategy.releaseMem(executor);
+          }
         };
 
-        // Preserve context of calling thread to ensure headers of requests are forwarded when running blocking actions
-        threadPool.schedule(
-                QueryContext.withCurrentContext(runnable),
-                new TimeValue(0L),
-                SQL_WORKER_THREAD_POOL_NAME
-        );
+    // Preserve context of calling thread to ensure headers of requests are forwarded when running
+    // blocking actions
+    threadPool.schedule(
+        QueryContext.withCurrentContext(runnable), new TimeValue(0L), SQL_WORKER_THREAD_POOL_NAME);
+  }
+
+  /** Time the real execution of Executor and log slow query for troubleshooting */
+  private void doExecuteWithTimeMeasured(
+      Client client, Map<String, String> params, QueryAction action, RestChannel channel)
+      throws Exception {
+    long startTime = System.nanoTime();
+    try {
+      executor.execute(client, params, action, channel);
+    } finally {
+      Duration elapsed = Duration.ofNanos(System.nanoTime() - startTime);
+      int slowLogThreshold = LocalClusterState.state().getSettingValue(Settings.Key.SQL_SLOWLOG);
+      if (elapsed.getSeconds() >= slowLogThreshold) {
+        LOG.warn(
+            "[{}] Slow query: elapsed={} (ms)", QueryContext.getRequestId(), elapsed.toMillis());
+      }
     }
+  }
 
-    /**
-     * Time the real execution of Executor and log slow query for troubleshooting
-     */
-    private void doExecuteWithTimeMeasured(Client client,
-                                           Map<String, String> params,
-                                           QueryAction action,
-                                           RestChannel channel) throws Exception {
-        long startTime = System.nanoTime();
-        try {
-            executor.execute(client, params, action, channel);
-        } finally {
-            Duration elapsed = Duration.ofNanos(System.nanoTime() - startTime);
-            int slowLogThreshold = LocalClusterState.state().getSettingValue(Settings.Key.SQL_SLOWLOG);
-            if (elapsed.getSeconds() >= slowLogThreshold) {
-                LOG.warn("[{}] Slow query: elapsed={} (ms)", QueryContext.getRequestId(), elapsed.toMillis());
-            }
-        }
-    }
-
-    private String name(Object object) {
-        return object.getClass().getSimpleName();
-    }
+  private String name(Object object) {
+    return object.getClass().getSimpleName();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticDefaultRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticDefaultRestExecutor.java
index b5132d7ffb..54c4dd5abb 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticDefaultRestExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticDefaultRestExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor;
 
 import com.google.common.collect.Maps;
@@ -11,18 +10,18 @@
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.action.ActionFuture;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.admin.indices.get.GetIndexRequest;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchScrollRequest;
 import org.opensearch.client.Client;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.index.reindex.BulkIndexByScrollResponseContentListener;
 import org.opensearch.index.reindex.DeleteByQueryRequest;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.rest.action.RestStatusToXContentListener;
 import org.opensearch.search.SearchHits;
 import org.opensearch.sql.legacy.exception.SqlParseException;
@@ -35,90 +34,94 @@
 import org.opensearch.sql.legacy.query.join.JoinRequestBuilder;
 import org.opensearch.sql.legacy.query.multi.MultiQueryRequestBuilder;
 
-
 public class ElasticDefaultRestExecutor implements RestExecutor {
 
-    /**
-     * Request builder to generate OpenSearch DSL
-     */
-    private final SqlElasticRequestBuilder requestBuilder;
+  /** Request builder to generate OpenSearch DSL */
+  private final SqlElasticRequestBuilder requestBuilder;
 
-    private static final Logger LOG = LogManager.getLogger(ElasticDefaultRestExecutor.class);
+  private static final Logger LOG = LogManager.getLogger(ElasticDefaultRestExecutor.class);
 
-    public ElasticDefaultRestExecutor(QueryAction queryAction) {
-        // Put explain() here to make it run in NIO thread
-        try {
-            this.requestBuilder = queryAction.explain();
-        } catch (SqlParseException e) {
-            throw new IllegalStateException("Failed to explain query action", e);
-        }
+  public ElasticDefaultRestExecutor(QueryAction queryAction) {
+    // Put explain() here to make it run in NIO thread
+    try {
+      this.requestBuilder = queryAction.explain();
+    } catch (SqlParseException e) {
+      throw new IllegalStateException("Failed to explain query action", e);
     }
+  }
 
-    /**
-     * Execute the ActionRequest and returns the REST response using the channel.
-     */
-    @Override
-    public void execute(Client client, Map<String, String> params, QueryAction queryAction, RestChannel channel)
-            throws Exception {
-        ActionRequest request = requestBuilder.request();
+  /** Execute the ActionRequest and returns the REST response using the channel. */
+  @Override
+  public void execute(
+      Client client, Map<String, String> params, QueryAction queryAction, RestChannel channel)
+      throws Exception {
+    ActionRequest request = requestBuilder.request();
 
-        if (requestBuilder instanceof JoinRequestBuilder) {
-            ElasticJoinExecutor executor = ElasticJoinExecutor.createJoinExecutor(client, requestBuilder);
-            executor.run();
-            executor.sendResponse(channel);
-        } else if (requestBuilder instanceof MultiQueryRequestBuilder) {
-            ElasticHitsExecutor executor = MultiRequestExecutorFactory.createExecutor(client,
-                    (MultiQueryRequestBuilder) requestBuilder);
-            executor.run();
-            sendDefaultResponse(executor.getHits(), channel);
-        } else if (request instanceof SearchRequest) {
-            client.search((SearchRequest) request, new RestStatusToXContentListener<>(channel));
-        } else if (request instanceof DeleteByQueryRequest) {
-            requestBuilder.getBuilder().execute(
-                    new BulkIndexByScrollResponseContentListener(channel, Maps.newHashMap()));
-        } else if (request instanceof GetIndexRequest) {
-            requestBuilder.getBuilder().execute(new GetIndexRequestRestListener(channel, (GetIndexRequest) request));
-        } else if (request instanceof SearchScrollRequest) {
-            client.searchScroll((SearchScrollRequest) request, new RestStatusToXContentListener<>(channel));
-        } else {
-            throw new Exception(String.format("Unsupported ActionRequest provided: %s", request.getClass().getName()));
-        }
+    if (requestBuilder instanceof JoinRequestBuilder) {
+      ElasticJoinExecutor executor = ElasticJoinExecutor.createJoinExecutor(client, requestBuilder);
+      executor.run();
+      executor.sendResponse(channel);
+    } else if (requestBuilder instanceof MultiQueryRequestBuilder) {
+      ElasticHitsExecutor executor =
+          MultiRequestExecutorFactory.createExecutor(
+              client, (MultiQueryRequestBuilder) requestBuilder);
+      executor.run();
+      sendDefaultResponse(executor.getHits(), channel);
+    } else if (request instanceof SearchRequest) {
+      client.search((SearchRequest) request, new RestStatusToXContentListener<>(channel));
+    } else if (request instanceof DeleteByQueryRequest) {
+      requestBuilder
+          .getBuilder()
+          .execute(new BulkIndexByScrollResponseContentListener(channel, Maps.newHashMap()));
+    } else if (request instanceof GetIndexRequest) {
+      requestBuilder
+          .getBuilder()
+          .execute(new GetIndexRequestRestListener(channel, (GetIndexRequest) request));
+    } else if (request instanceof SearchScrollRequest) {
+      client.searchScroll(
+          (SearchScrollRequest) request, new RestStatusToXContentListener<>(channel));
+    } else {
+      throw new Exception(
+          String.format("Unsupported ActionRequest provided: %s", request.getClass().getName()));
     }
+  }
 
-    @Override
-    public String execute(Client client, Map<String, String> params, QueryAction queryAction) throws Exception {
-        ActionRequest request = requestBuilder.request();
-
-        if (requestBuilder instanceof JoinRequestBuilder) {
-            ElasticJoinExecutor executor = ElasticJoinExecutor.createJoinExecutor(client, requestBuilder);
-            executor.run();
-            return ElasticUtils.hitsAsStringResult(executor.getHits(), new MetaSearchResult());
-        } else if (requestBuilder instanceof MultiQueryRequestBuilder) {
-            ElasticHitsExecutor executor = MultiRequestExecutorFactory.createExecutor(client,
-                    (MultiQueryRequestBuilder) requestBuilder);
-            executor.run();
-            return ElasticUtils.hitsAsStringResult(executor.getHits(), new MetaSearchResult());
-        } else if (request instanceof SearchRequest) {
-            ActionFuture<SearchResponse> future = client.search((SearchRequest) request);
-            SearchResponse response = future.actionGet();
-            return response.toString();
-        } else if (request instanceof DeleteByQueryRequest) {
-            return requestBuilder.get().toString();
-        } else if (request instanceof GetIndexRequest) {
-            return requestBuilder.getBuilder().execute().actionGet().toString();
-        } else {
-            throw new Exception(String.format("Unsupported ActionRequest provided: %s", request.getClass().getName()));
-        }
+  @Override
+  public String execute(Client client, Map<String, String> params, QueryAction queryAction)
+      throws Exception {
+    ActionRequest request = requestBuilder.request();
 
+    if (requestBuilder instanceof JoinRequestBuilder) {
+      ElasticJoinExecutor executor = ElasticJoinExecutor.createJoinExecutor(client, requestBuilder);
+      executor.run();
+      return ElasticUtils.hitsAsStringResult(executor.getHits(), new MetaSearchResult());
+    } else if (requestBuilder instanceof MultiQueryRequestBuilder) {
+      ElasticHitsExecutor executor =
+          MultiRequestExecutorFactory.createExecutor(
+              client, (MultiQueryRequestBuilder) requestBuilder);
+      executor.run();
+      return ElasticUtils.hitsAsStringResult(executor.getHits(), new MetaSearchResult());
+    } else if (request instanceof SearchRequest) {
+      ActionFuture<SearchResponse> future = client.search((SearchRequest) request);
+      SearchResponse response = future.actionGet();
+      return response.toString();
+    } else if (request instanceof DeleteByQueryRequest) {
+      return requestBuilder.get().toString();
+    } else if (request instanceof GetIndexRequest) {
+      return requestBuilder.getBuilder().execute().actionGet().toString();
+    } else {
+      throw new Exception(
+          String.format("Unsupported ActionRequest provided: %s", request.getClass().getName()));
     }
+  }
 
-    private void sendDefaultResponse(SearchHits hits, RestChannel channel) {
-        try {
-            String json = ElasticUtils.hitsAsStringResult(hits, new MetaSearchResult());
-            BytesRestResponse bytesRestResponse = new BytesRestResponse(RestStatus.OK, json);
-            channel.sendResponse(bytesRestResponse);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+  private void sendDefaultResponse(SearchHits hits, RestChannel channel) {
+    try {
+      String json = ElasticUtils.hitsAsStringResult(hits, new MetaSearchResult());
+      BytesRestResponse bytesRestResponse = new BytesRestResponse(RestStatus.OK, json);
+      channel.sendResponse(bytesRestResponse);
+    } catch (IOException e) {
+      e.printStackTrace();
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticHitsExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticHitsExecutor.java
index c48eb673bd..62a6d63ef7 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticHitsExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticHitsExecutor.java
@@ -3,18 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor;
 
 import java.io.IOException;
 import org.opensearch.search.SearchHits;
 import org.opensearch.sql.legacy.exception.SqlParseException;
 
-/**
- * Created by Eliran on 21/8/2016.
- */
+/** Created by Eliran on 21/8/2016. */
 public interface ElasticHitsExecutor {
-    void run() throws IOException, SqlParseException;
+  void run() throws IOException, SqlParseException;
 
-    SearchHits getHits();
+  SearchHits getHits();
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticResultHandler.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticResultHandler.java
index ff241fce77..6f753a5e7c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticResultHandler.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticResultHandler.java
@@ -3,38 +3,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor;
 
 import java.util.Map;
 import org.opensearch.search.SearchHit;
 
-/**
- * Created by Eliran on 3/10/2015.
- */
+/** Created by Eliran on 3/10/2015. */
 public class ElasticResultHandler {
-    public static Object getFieldValue(SearchHit hit, String field) {
-        return deepSearchInMap(hit.getSourceAsMap(), field);
-    }
+  public static Object getFieldValue(SearchHit hit, String field) {
+    return deepSearchInMap(hit.getSourceAsMap(), field);
+  }
 
-    private static Object deepSearchInMap(Map<String, Object> fieldsMap, String name) {
-        if (name.contains(".")) {
-            String[] path = name.split("\\.");
-            Map<String, Object> currentObject = fieldsMap;
-            for (int i = 0; i < path.length - 1; i++) {
-                Object valueFromCurrentMap = currentObject.get(path[i]);
-                if (valueFromCurrentMap == null) {
-                    return null;
-                }
-                if (!Map.class.isAssignableFrom(valueFromCurrentMap.getClass())) {
-                    return null;
-                }
-                currentObject = (Map<String, Object>) valueFromCurrentMap;
-            }
-            return currentObject.get(path[path.length - 1]);
+  private static Object deepSearchInMap(Map<String, Object> fieldsMap, String name) {
+    if (name.contains(".")) {
+      String[] path = name.split("\\.");
+      Map<String, Object> currentObject = fieldsMap;
+      for (int i = 0; i < path.length - 1; i++) {
+        Object valueFromCurrentMap = currentObject.get(path[i]);
+        if (valueFromCurrentMap == null) {
+          return null;
         }
-
-        return fieldsMap.get(name);
+        if (!Map.class.isAssignableFrom(valueFromCurrentMap.getClass())) {
+          return null;
+        }
+        currentObject = (Map<String, Object>) valueFromCurrentMap;
+      }
+      return currentObject.get(path[path.length - 1]);
     }
 
+    return fieldsMap.get(name);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/Format.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/Format.java
index 454babd2e9..c47092f10b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/Format.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/Format.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor;
 
 import com.google.common.collect.ImmutableMap;
@@ -14,25 +13,25 @@
 
 @RequiredArgsConstructor
 public enum Format {
-    JDBC("jdbc"),
-    JSON("json"),
-    CSV("csv"),
-    RAW("raw"),
-    TABLE("table");
+  JDBC("jdbc"),
+  JSON("json"),
+  CSV("csv"),
+  RAW("raw"),
+  TABLE("table");
 
-    @Getter
-    private final String formatName;
+  @Getter private final String formatName;
 
-    private static final Map<String, Format> ALL_FORMATS;
-    static {
-        ImmutableMap.Builder<String, Format> builder = new ImmutableMap.Builder<>();
-        for (Format format : Format.values()) {
-            builder.put(format.formatName, format);
-        }
-        ALL_FORMATS = builder.build();
-    }
+  private static final Map<String, Format> ALL_FORMATS;
 
-    public static Optional<Format> of(String formatName) {
-        return Optional.ofNullable(ALL_FORMATS.getOrDefault(formatName, null));
+  static {
+    ImmutableMap.Builder<String, Format> builder = new ImmutableMap.Builder<>();
+    for (Format format : Format.values()) {
+      builder.put(format.formatName, format);
     }
+    ALL_FORMATS = builder.build();
+  }
+
+  public static Optional<Format> of(String formatName) {
+    return Optional.ofNullable(ALL_FORMATS.getOrDefault(formatName, null));
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/GetIndexRequestRestListener.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/GetIndexRequestRestListener.java
index b930044345..58808ee8f3 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/GetIndexRequestRestListener.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/GetIndexRequestRestListener.java
@@ -3,104 +3,97 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor;
 
-import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
-
 import org.opensearch.action.admin.indices.get.GetIndexRequest;
 import org.opensearch.action.admin.indices.get.GetIndexResponse;
 import org.opensearch.cluster.metadata.AliasMetadata;
 import org.opensearch.cluster.metadata.MappingMetadata;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestResponse;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.rest.action.RestBuilderListener;
 import org.opensearch.sql.legacy.antlr.semantic.SemanticAnalysisException;
-import org.opensearch.sql.legacy.domain.Field;
 
-/**
- * Created by Eliran on 6/10/2015.
- */
+/** Created by Eliran on 6/10/2015. */
 public class GetIndexRequestRestListener extends RestBuilderListener<GetIndexResponse> {
 
-    private GetIndexRequest getIndexRequest;
-
-    public GetIndexRequestRestListener(RestChannel channel, GetIndexRequest getIndexRequest) {
-        super(channel);
-        this.getIndexRequest = getIndexRequest;
-    }
-
-    @Override
-    public RestResponse buildResponse(GetIndexResponse getIndexResponse, XContentBuilder builder) throws Exception {
-        GetIndexRequest.Feature[] features = getIndexRequest.features();
-        String[] indices = getIndexResponse.indices();
-
-        builder.startObject();
-        for (String index : indices) {
-            builder.startObject(index);
-            for (GetIndexRequest.Feature feature : features) {
-                switch (feature) {
-                    case ALIASES:
-                        writeAliases(getIndexResponse.aliases().get(index), builder, channel.request());
-                        break;
-                    case MAPPINGS:
-                        writeMappings(getIndexResponse.mappings().get(index), builder, channel.request());
-                        break;
-                    case SETTINGS:
-                        writeSettings(getIndexResponse.settings().get(index), builder, channel.request());
-                        break;
-                    default:
-                        throw new SemanticAnalysisException("Unsupported feature: " + feature);
-                }
-            }
-            builder.endObject();
-
-        }
-        builder.endObject();
-
-        return new BytesRestResponse(RestStatus.OK, builder);
-    }
-
-    private void writeAliases(List<AliasMetadata> aliases, XContentBuilder builder, ToXContent.Params params)
-            throws IOException {
-        builder.startObject(Fields.ALIASES);
-        if (aliases != null) {
-            for (AliasMetadata alias : aliases) {
-                AliasMetadata.Builder.toXContent(alias, builder, params);
-            }
+  private GetIndexRequest getIndexRequest;
+
+  public GetIndexRequestRestListener(RestChannel channel, GetIndexRequest getIndexRequest) {
+    super(channel);
+    this.getIndexRequest = getIndexRequest;
+  }
+
+  @Override
+  public RestResponse buildResponse(GetIndexResponse getIndexResponse, XContentBuilder builder)
+      throws Exception {
+    GetIndexRequest.Feature[] features = getIndexRequest.features();
+    String[] indices = getIndexResponse.indices();
+
+    builder.startObject();
+    for (String index : indices) {
+      builder.startObject(index);
+      for (GetIndexRequest.Feature feature : features) {
+        switch (feature) {
+          case ALIASES:
+            writeAliases(getIndexResponse.aliases().get(index), builder, channel.request());
+            break;
+          case MAPPINGS:
+            writeMappings(getIndexResponse.mappings().get(index), builder, channel.request());
+            break;
+          case SETTINGS:
+            writeSettings(getIndexResponse.settings().get(index), builder, channel.request());
+            break;
+          default:
+            throw new SemanticAnalysisException("Unsupported feature: " + feature);
         }
-        builder.endObject();
+      }
+      builder.endObject();
     }
-
-    private void writeSettings(Settings settings, XContentBuilder builder, ToXContent.Params params)
-            throws IOException {
-        builder.startObject(Fields.SETTINGS);
-        settings.toXContent(builder, params);
-        builder.endObject();
+    builder.endObject();
+
+    return new BytesRestResponse(RestStatus.OK, builder);
+  }
+
+  private void writeAliases(
+      List<AliasMetadata> aliases, XContentBuilder builder, ToXContent.Params params)
+      throws IOException {
+    builder.startObject(Fields.ALIASES);
+    if (aliases != null) {
+      for (AliasMetadata alias : aliases) {
+        AliasMetadata.Builder.toXContent(alias, builder, params);
+      }
     }
-
-    private void writeMappings(MappingMetadata mappingMetadata,
-                               XContentBuilder builder, ToXContent.Params params) throws IOException {
-        if ( mappingMetadata != null) {
-            builder.field(Fields.MAPPINGS);
-            builder.map(mappingMetadata.getSourceAsMap());
-        }
-    }
-
-
-    static class Fields {
-        static final String ALIASES = "aliases";
-        static final String MAPPINGS = "mappings";
-        static final String SETTINGS = "settings";
-        static final String WARMERS = "warmers";
+    builder.endObject();
+  }
+
+  private void writeSettings(Settings settings, XContentBuilder builder, ToXContent.Params params)
+      throws IOException {
+    builder.startObject(Fields.SETTINGS);
+    settings.toXContent(builder, params);
+    builder.endObject();
+  }
+
+  private void writeMappings(
+      MappingMetadata mappingMetadata, XContentBuilder builder, ToXContent.Params params)
+      throws IOException {
+    if (mappingMetadata != null) {
+      builder.field(Fields.MAPPINGS);
+      builder.map(mappingMetadata.getSourceAsMap());
     }
+  }
+
+  static class Fields {
+    static final String ALIASES = "aliases";
+    static final String MAPPINGS = "mappings";
+    static final String SETTINGS = "settings";
+    static final String WARMERS = "warmers";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/QueryActionElasticExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/QueryActionElasticExecutor.java
index 185820c0a4..2e45fb45b7 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/QueryActionElasticExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/QueryActionElasticExecutor.java
@@ -3,14 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor;
 
 import java.io.IOException;
 import java.util.List;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.search.SearchHits;
 import org.opensearch.search.aggregations.Aggregations;
 import org.opensearch.sql.legacy.exception.SqlParseException;
@@ -31,81 +30,85 @@
 import org.opensearch.sql.legacy.query.multi.MultiQueryAction;
 import org.opensearch.sql.legacy.query.multi.MultiQueryRequestBuilder;
 
-/**
- * Created by Eliran on 3/10/2015.
- */
+/** Created by Eliran on 3/10/2015. */
 public class QueryActionElasticExecutor {
-    public static SearchHits executeSearchAction(DefaultQueryAction searchQueryAction) throws SqlParseException {
-        SqlOpenSearchRequestBuilder builder = searchQueryAction.explain();
-        return ((SearchResponse) builder.get()).getHits();
-    }
+  public static SearchHits executeSearchAction(DefaultQueryAction searchQueryAction)
+      throws SqlParseException {
+    SqlOpenSearchRequestBuilder builder = searchQueryAction.explain();
+    return ((SearchResponse) builder.get()).getHits();
+  }
 
-    public static SearchHits executeJoinSearchAction(Client client, OpenSearchJoinQueryAction joinQueryAction)
-            throws IOException, SqlParseException {
-        SqlElasticRequestBuilder joinRequestBuilder = joinQueryAction.explain();
-        ElasticJoinExecutor executor = ElasticJoinExecutor.createJoinExecutor(client, joinRequestBuilder);
-        executor.run();
-        return executor.getHits();
-    }
+  public static SearchHits executeJoinSearchAction(
+      Client client, OpenSearchJoinQueryAction joinQueryAction)
+      throws IOException, SqlParseException {
+    SqlElasticRequestBuilder joinRequestBuilder = joinQueryAction.explain();
+    ElasticJoinExecutor executor =
+        ElasticJoinExecutor.createJoinExecutor(client, joinRequestBuilder);
+    executor.run();
+    return executor.getHits();
+  }
 
-    public static Aggregations executeAggregationAction(AggregationQueryAction aggregationQueryAction)
-            throws SqlParseException {
-        SqlOpenSearchRequestBuilder select = aggregationQueryAction.explain();
-        return ((SearchResponse) select.get()).getAggregations();
-    }
+  public static Aggregations executeAggregationAction(AggregationQueryAction aggregationQueryAction)
+      throws SqlParseException {
+    SqlOpenSearchRequestBuilder select = aggregationQueryAction.explain();
+    return ((SearchResponse) select.get()).getAggregations();
+  }
 
-    public static List<BindingTuple> executeQueryPlanQueryAction(QueryPlanQueryAction queryPlanQueryAction) {
-        QueryPlanRequestBuilder select = (QueryPlanRequestBuilder) queryPlanQueryAction.explain();
-        return select.execute();
-    }
+  public static List<BindingTuple> executeQueryPlanQueryAction(
+      QueryPlanQueryAction queryPlanQueryAction) {
+    QueryPlanRequestBuilder select = (QueryPlanRequestBuilder) queryPlanQueryAction.explain();
+    return select.execute();
+  }
 
-    public static ActionResponse executeShowQueryAction(ShowQueryAction showQueryAction) {
-        return showQueryAction.explain().get();
-    }
+  public static ActionResponse executeShowQueryAction(ShowQueryAction showQueryAction) {
+    return showQueryAction.explain().get();
+  }
 
-    public static ActionResponse executeDescribeQueryAction(DescribeQueryAction describeQueryAction) {
-        return describeQueryAction.explain().get();
-    }
+  public static ActionResponse executeDescribeQueryAction(DescribeQueryAction describeQueryAction) {
+    return describeQueryAction.explain().get();
+  }
 
-    public static ActionResponse executeDeleteAction(DeleteQueryAction deleteQueryAction) throws SqlParseException {
-        return deleteQueryAction.explain().get();
-    }
+  public static ActionResponse executeDeleteAction(DeleteQueryAction deleteQueryAction)
+      throws SqlParseException {
+    return deleteQueryAction.explain().get();
+  }
 
-    public static SearchHits executeMultiQueryAction(Client client, MultiQueryAction queryAction)
-            throws SqlParseException, IOException {
-        SqlElasticRequestBuilder multiRequestBuilder = queryAction.explain();
-        ElasticHitsExecutor executor = MultiRequestExecutorFactory.createExecutor(client,
-                (MultiQueryRequestBuilder) multiRequestBuilder);
-        executor.run();
-        return executor.getHits();
-    }
+  public static SearchHits executeMultiQueryAction(Client client, MultiQueryAction queryAction)
+      throws SqlParseException, IOException {
+    SqlElasticRequestBuilder multiRequestBuilder = queryAction.explain();
+    ElasticHitsExecutor executor =
+        MultiRequestExecutorFactory.createExecutor(
+            client, (MultiQueryRequestBuilder) multiRequestBuilder);
+    executor.run();
+    return executor.getHits();
+  }
 
-    public static Object executeAnyAction(Client client, QueryAction queryAction)
-            throws SqlParseException, IOException {
-        if (queryAction instanceof DefaultQueryAction) {
-            return executeSearchAction((DefaultQueryAction) queryAction);
-        }
-        if (queryAction instanceof AggregationQueryAction) {
-            return executeAggregationAction((AggregationQueryAction) queryAction);
-        }
-        if (queryAction instanceof QueryPlanQueryAction) {
-            return executeQueryPlanQueryAction((QueryPlanQueryAction) queryAction);
-        }
-        if (queryAction instanceof ShowQueryAction) {
-            return executeShowQueryAction((ShowQueryAction) queryAction);
-        }
-        if (queryAction instanceof DescribeQueryAction) {
-            return executeDescribeQueryAction((DescribeQueryAction) queryAction);
-        }
-        if (queryAction instanceof OpenSearchJoinQueryAction) {
-            return executeJoinSearchAction(client, (OpenSearchJoinQueryAction) queryAction);
-        }
-        if (queryAction instanceof MultiQueryAction) {
-            return executeMultiQueryAction(client, (MultiQueryAction) queryAction);
-        }
-        if (queryAction instanceof DeleteQueryAction) {
-            return executeDeleteAction((DeleteQueryAction) queryAction);
-        }
-        return null;
+  public static Object executeAnyAction(Client client, QueryAction queryAction)
+      throws SqlParseException, IOException {
+    if (queryAction instanceof DefaultQueryAction) {
+      return executeSearchAction((DefaultQueryAction) queryAction);
+    }
+    if (queryAction instanceof AggregationQueryAction) {
+      return executeAggregationAction((AggregationQueryAction) queryAction);
+    }
+    if (queryAction instanceof QueryPlanQueryAction) {
+      return executeQueryPlanQueryAction((QueryPlanQueryAction) queryAction);
+    }
+    if (queryAction instanceof ShowQueryAction) {
+      return executeShowQueryAction((ShowQueryAction) queryAction);
+    }
+    if (queryAction instanceof DescribeQueryAction) {
+      return executeDescribeQueryAction((DescribeQueryAction) queryAction);
+    }
+    if (queryAction instanceof OpenSearchJoinQueryAction) {
+      return executeJoinSearchAction(client, (OpenSearchJoinQueryAction) queryAction);
+    }
+    if (queryAction instanceof MultiQueryAction) {
+      return executeMultiQueryAction(client, (MultiQueryAction) queryAction);
+    }
+    if (queryAction instanceof DeleteQueryAction) {
+      return executeDeleteAction((DeleteQueryAction) queryAction);
     }
+    return null;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/RestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/RestExecutor.java
index e0124fb8be..8a0ab65970 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/RestExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/RestExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor;
 
 import java.util.Map;
@@ -11,12 +10,12 @@
 import org.opensearch.rest.RestChannel;
 import org.opensearch.sql.legacy.query.QueryAction;
 
-/**
- * Created by Eliran on 26/12/2015.
- */
+/** Created by Eliran on 26/12/2015. */
 public interface RestExecutor {
-    void execute(Client client, Map<String, String> params, QueryAction queryAction, RestChannel channel)
-            throws Exception;
+  void execute(
+      Client client, Map<String, String> params, QueryAction queryAction, RestChannel channel)
+      throws Exception;
 
-    String execute(Client client, Map<String, String> params, QueryAction queryAction) throws Exception;
+  String execute(Client client, Map<String, String> params, QueryAction queryAction)
+      throws Exception;
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/adapter/QueryPlanQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/adapter/QueryPlanQueryAction.java
index 091abca554..b0179d3d8d 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/adapter/QueryPlanQueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/adapter/QueryPlanQueryAction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.adapter;
 
 import com.google.common.base.Strings;
@@ -14,27 +13,31 @@
 import org.opensearch.sql.legacy.query.SqlElasticRequestBuilder;
 
 /**
- * The definition of QueryPlan of QueryAction which works as the adapter to the current QueryAction framework.
+ * The definition of QueryPlan of QueryAction which works as the adapter to the current QueryAction
+ * framework.
  */
 public class QueryPlanQueryAction extends QueryAction {
-    private final QueryPlanRequestBuilder requestBuilder;
+  private final QueryPlanRequestBuilder requestBuilder;
 
-    public QueryPlanQueryAction(QueryPlanRequestBuilder requestBuilder) {
-        super(null, null);
-        this.requestBuilder = requestBuilder;
-    }
+  public QueryPlanQueryAction(QueryPlanRequestBuilder requestBuilder) {
+    super(null, null);
+    this.requestBuilder = requestBuilder;
+  }
 
-    @Override
-    public SqlElasticRequestBuilder explain() {
-        return requestBuilder;
-    }
+  @Override
+  public SqlElasticRequestBuilder explain() {
+    return requestBuilder;
+  }
 
-    @Override
-    public Optional<List<String>> getFieldNames() {
-        List<String> fieldNames = ((QueryPlanRequestBuilder) requestBuilder).outputColumns()
-                .stream()
-                .map(node -> Strings.isNullOrEmpty(node.getAlias()) ? node.getName() : node.getAlias())
+  @Override
+  public Optional<List<String>> getFieldNames() {
+    List<String> fieldNames =
+        ((QueryPlanRequestBuilder) requestBuilder)
+            .outputColumns().stream()
+                .map(
+                    node ->
+                        Strings.isNullOrEmpty(node.getAlias()) ? node.getName() : node.getAlias())
                 .collect(Collectors.toList());
-        return Optional.of(fieldNames);
-    }
+    return Optional.of(fieldNames);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/adapter/QueryPlanRequestBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/adapter/QueryPlanRequestBuilder.java
index a7b0f96b1b..3933df9bbb 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/adapter/QueryPlanRequestBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/adapter/QueryPlanRequestBuilder.java
@@ -3,51 +3,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.adapter;
 
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestBuilder;
-import org.opensearch.action.ActionResponse;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
 import org.opensearch.sql.legacy.query.SqlElasticRequestBuilder;
 import org.opensearch.sql.legacy.query.planner.core.BindingTupleQueryPlanner;
 import org.opensearch.sql.legacy.query.planner.core.ColumnNode;
 
-/**
- * The definition of QueryPlan SqlElasticRequestBuilder.
- */
+/** The definition of QueryPlan SqlElasticRequestBuilder. */
 @RequiredArgsConstructor
 public class QueryPlanRequestBuilder implements SqlElasticRequestBuilder {
-    private final BindingTupleQueryPlanner queryPlanner;
-
-    public List<BindingTuple> execute() {
-        return queryPlanner.execute();
-    }
-
-    public List<ColumnNode> outputColumns() {
-        return queryPlanner.getColumnNodes();
-    }
-
-    @Override
-    public String explain() {
-        return queryPlanner.explain();
-    }
-
-    @Override
-    public ActionRequest request() {
-        throw new RuntimeException("unsupported operation");
-    }
-
-    @Override
-    public ActionResponse get() {
-        throw new RuntimeException("unsupported operation");
-    }
-
-    @Override
-    public ActionRequestBuilder getBuilder() {
-        throw new RuntimeException("unsupported operation");
-    }
+  private final BindingTupleQueryPlanner queryPlanner;
+
+  public List<BindingTuple> execute() {
+    return queryPlanner.execute();
+  }
+
+  public List<ColumnNode> outputColumns() {
+    return queryPlanner.getColumnNodes();
+  }
+
+  @Override
+  public String explain() {
+    return queryPlanner.explain();
+  }
+
+  @Override
+  public ActionRequest request() {
+    throw new RuntimeException("unsupported operation");
+  }
+
+  @Override
+  public ActionResponse get() {
+    throw new RuntimeException("unsupported operation");
+  }
+
+  @Override
+  public ActionRequestBuilder getBuilder() {
+    throw new RuntimeException("unsupported operation");
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResult.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResult.java
index 680c0c8e85..8df3dd6b83 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResult.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResult.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.csv;
 
 import com.google.common.collect.ImmutableSet;
@@ -12,86 +11,83 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-/**
- * Created by Eliran on 27/12/2015.
- */
+/** Created by Eliran on 27/12/2015. */
 public class CSVResult {
 
-    private static final Set<String> SENSITIVE_CHAR = ImmutableSet.of("=", "+", "-", "@");
-
-    private final List<String> headers;
-    private final List<String> lines;
-
-    /**
-     * Skip sanitizing if string line provided. This constructor is basically used by
-     * assertion in test code.
-     */
-    public CSVResult(List<String> headers, List<String> lines) {
-        this.headers = headers;
-        this.lines = lines;
+  private static final Set<String> SENSITIVE_CHAR = ImmutableSet.of("=", "+", "-", "@");
+
+  private final List<String> headers;
+  private final List<String> lines;
+
+  /**
+   * Skip sanitizing if string line provided. This constructor is basically used by assertion in
+   * test code.
+   */
+  public CSVResult(List<String> headers, List<String> lines) {
+    this.headers = headers;
+    this.lines = lines;
+  }
+
+  /**
+   * Sanitize both headers and data lines by: 1) First prepend single quote if first char is
+   * sensitive (= - + @) 2) Second double quote entire cell if any comma found
+   */
+  public CSVResult(String separator, List<String> headers, List<List<String>> lines) {
+    this.headers = sanitizeHeaders(separator, headers);
+    this.lines = sanitizeLines(separator, lines);
+  }
+
+  /**
+   * Return CSV header names which are sanitized because OpenSearch allows special character present
+   * in field name too.
+   *
+   * @return CSV header name list after sanitized
+   */
+  public List<String> getHeaders() {
+    return headers;
+  }
+
+  /**
+   * Return CSV lines in which each cell is sanitized to avoid CSV injection.
+   *
+   * @return CSV lines after sanitized
+   */
+  public List<String> getLines() {
+    return lines;
+  }
+
+  private List<String> sanitizeHeaders(String separator, List<String> headers) {
+    return headers.stream()
+        .map(this::sanitizeCell)
+        .map(cell -> quoteIfRequired(separator, cell))
+        .collect(Collectors.toList());
+  }
+
+  private List<String> sanitizeLines(String separator, List<List<String>> lines) {
+    List<String> result = new ArrayList<>();
+    for (List<String> line : lines) {
+      result.add(
+          line.stream()
+              .map(this::sanitizeCell)
+              .map(cell -> quoteIfRequired(separator, cell))
+              .collect(Collectors.joining(separator)));
     }
+    return result;
+  }
 
-    /**
-     * Sanitize both headers and data lines by:
-     *  1) First prepend single quote if first char is sensitive (= - + @)
-     *  2) Second double quote entire cell if any comma found
-     */
-    public CSVResult(String separator, List<String> headers, List<List<String>> lines) {
-        this.headers = sanitizeHeaders(separator, headers);
-        this.lines = sanitizeLines(separator, lines);
+  private String sanitizeCell(String cell) {
+    if (isStartWithSensitiveChar(cell)) {
+      return "'" + cell;
     }
+    return cell;
+  }
 
-    /**
-     * Return CSV header names which are sanitized because OpenSearch allows
-     * special character present in field name too.
-     * @return  CSV header name list after sanitized
-     */
-    public List<String> getHeaders() {
-        return headers;
-    }
-
-    /**
-     * Return CSV lines in which each cell is sanitized to avoid CSV injection.
-     * @return  CSV lines after sanitized
-     */
-    public List<String> getLines() {
-        return lines;
-    }
-
-    private List<String> sanitizeHeaders(String separator, List<String> headers) {
-        return headers.stream().
-                       map(this::sanitizeCell).
-                       map(cell -> quoteIfRequired(separator, cell)).
-                       collect(Collectors.toList());
-    }
-
-    private List<String> sanitizeLines(String separator, List<List<String>> lines) {
-        List<String> result = new ArrayList<>();
-        for (List<String> line : lines) {
-            result.add(line.stream().
-                            map(this::sanitizeCell).
-                            map(cell -> quoteIfRequired(separator, cell)).
-                            collect(Collectors.joining(separator)));
-        }
-        return result;
-    }
-
-    private String sanitizeCell(String cell) {
-        if (isStartWithSensitiveChar(cell)) {
-            return "'" + cell;
-        }
-        return cell;
-    }
-
-    private String quoteIfRequired(String separator, String cell) {
-        final String quote = "\"";
-        return cell.contains(separator)
-            ? quote + cell.replaceAll("\"", "\"\"") + quote : cell;
-    }
-
-    private boolean isStartWithSensitiveChar(String cell) {
-        return SENSITIVE_CHAR.stream().
-                              anyMatch(cell::startsWith);
-    }
+  private String quoteIfRequired(String separator, String cell) {
+    final String quote = "\"";
+    return cell.contains(separator) ? quote + cell.replaceAll("\"", "\"\"") + quote : cell;
+  }
 
+  private boolean isStartWithSensitiveChar(String cell) {
+    return SENSITIVE_CHAR.stream().anyMatch(cell::startsWith);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultRestExecutor.java
index 2f11d2c606..a69ff31a49 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultRestExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultRestExecutor.java
@@ -3,75 +3,78 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.csv;
 
 import com.google.common.base.Joiner;
 import java.util.List;
 import java.util.Map;
 import org.opensearch.client.Client;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.sql.legacy.executor.QueryActionElasticExecutor;
 import org.opensearch.sql.legacy.executor.RestExecutor;
 import org.opensearch.sql.legacy.query.QueryAction;
 import org.opensearch.sql.legacy.query.join.BackOffRetryStrategy;
 
-/**
- * Created by Eliran on 26/12/2015.
- */
+/** Created by Eliran on 26/12/2015. */
 public class CSVResultRestExecutor implements RestExecutor {
 
-    @Override
-    public void execute(final Client client, final Map<String, String> params, final QueryAction queryAction,
-                        final RestChannel channel) throws Exception {
-
-        final String csvString = execute(client, params, queryAction);
-        final BytesRestResponse bytesRestResponse = new BytesRestResponse(RestStatus.OK, csvString);
+  @Override
+  public void execute(
+      final Client client,
+      final Map<String, String> params,
+      final QueryAction queryAction,
+      final RestChannel channel)
+      throws Exception {
 
-        if (!BackOffRetryStrategy.isHealthy(2 * bytesRestResponse.content().length(), this)) {
-            throw new IllegalStateException(
-                    "[CSVResultRestExecutor] Memory could be insufficient when sendResponse().");
-        }
+    final String csvString = execute(client, params, queryAction);
+    final BytesRestResponse bytesRestResponse = new BytesRestResponse(RestStatus.OK, csvString);
 
-        channel.sendResponse(bytesRestResponse);
+    if (!BackOffRetryStrategy.isHealthy(2 * bytesRestResponse.content().length(), this)) {
+      throw new IllegalStateException(
+          "[CSVResultRestExecutor] Memory could be insufficient when sendResponse().");
     }
 
-    @Override
-    public String execute(final Client client, final Map<String, String> params, final QueryAction queryAction)
-            throws Exception {
+    channel.sendResponse(bytesRestResponse);
+  }
 
-        final Object queryResult = QueryActionElasticExecutor.executeAnyAction(client, queryAction);
+  @Override
+  public String execute(
+      final Client client, final Map<String, String> params, final QueryAction queryAction)
+      throws Exception {
 
-        final String separator = params.getOrDefault("separator", ",");
-        final String newLine = params.getOrDefault("newLine", "\n");
+    final Object queryResult = QueryActionElasticExecutor.executeAnyAction(client, queryAction);
 
-        final boolean flat = getBooleanOrDefault(params, "flat", false);
-        final boolean includeScore = getBooleanOrDefault(params, "_score", false);
-        final boolean includeId = getBooleanOrDefault(params, "_id", false);
+    final String separator = params.getOrDefault("separator", ",");
+    final String newLine = params.getOrDefault("newLine", "\n");
 
-        final List<String> fieldNames = queryAction.getFieldNames().orElse(null);
-        final CSVResult result = new CSVResultsExtractor(includeScore, includeId)
-                .extractResults(queryResult, flat, separator, fieldNames);
+    final boolean flat = getBooleanOrDefault(params, "flat", false);
+    final boolean includeScore = getBooleanOrDefault(params, "_score", false);
+    final boolean includeId = getBooleanOrDefault(params, "_id", false);
 
-        return buildString(separator, result, newLine);
-    }
+    final List<String> fieldNames = queryAction.getFieldNames().orElse(null);
+    final CSVResult result =
+        new CSVResultsExtractor(includeScore, includeId)
+            .extractResults(queryResult, flat, separator, fieldNames);
 
-    private boolean getBooleanOrDefault(Map<String, String> params, String param, boolean defaultValue) {
-        boolean flat = defaultValue;
-        if (params.containsKey(param)) {
-            flat = Boolean.parseBoolean(params.get(param));
-        }
-        return flat;
-    }
+    return buildString(separator, result, newLine);
+  }
 
-    private String buildString(String separator, CSVResult result, String newLine) {
-        StringBuilder csv = new StringBuilder();
-        csv.append(Joiner.on(separator).join(result.getHeaders()));
-        csv.append(newLine);
-        csv.append(Joiner.on(newLine).join(result.getLines()));
-        return csv.toString();
+  private boolean getBooleanOrDefault(
+      Map<String, String> params, String param, boolean defaultValue) {
+    boolean flat = defaultValue;
+    if (params.containsKey(param)) {
+      flat = Boolean.parseBoolean(params.get(param));
     }
-
+    return flat;
+  }
+
+  private String buildString(String separator, CSVResult result, String newLine) {
+    StringBuilder csv = new StringBuilder();
+    csv.append(Joiner.on(separator).join(result.getHeaders()));
+    csv.append(newLine);
+    csv.append(Joiner.on(newLine).join(result.getLines()));
+    return csv.toString();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultsExtractor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultsExtractor.java
index 70cdd91452..5a3b3bc498 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultsExtractor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultsExtractor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.csv;
 
 import java.util.ArrayList;
@@ -14,6 +13,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.opensearch.common.document.DocumentField;
+import org.opensearch.geo.search.aggregations.metrics.GeoBounds;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 import org.opensearch.search.aggregations.Aggregation;
@@ -21,7 +21,6 @@
 import org.opensearch.search.aggregations.bucket.MultiBucketsAggregation;
 import org.opensearch.search.aggregations.bucket.SingleBucketAggregation;
 import org.opensearch.search.aggregations.metrics.ExtendedStats;
-import org.opensearch.geo.search.aggregations.metrics.GeoBounds;
 import org.opensearch.search.aggregations.metrics.NumericMetricsAggregation;
 import org.opensearch.search.aggregations.metrics.Percentile;
 import org.opensearch.search.aggregations.metrics.Percentiles;
@@ -31,320 +30,332 @@
 import org.opensearch.sql.legacy.expression.model.ExprValue;
 import org.opensearch.sql.legacy.utils.Util;
 
-/**
- * Created by Eliran on 27/12/2015.
- */
+/** Created by Eliran on 27/12/2015. */
 public class CSVResultsExtractor {
 
-    private final boolean includeScore;
-    private final boolean includeId;
-    private int currentLineIndex;
-
-    public CSVResultsExtractor(boolean includeScore, boolean includeId) {
-        this.includeScore = includeScore;
-        this.includeId = includeId;
-        this.currentLineIndex = 0;
+  private final boolean includeScore;
+  private final boolean includeId;
+  private int currentLineIndex;
+
+  public CSVResultsExtractor(boolean includeScore, boolean includeId) {
+    this.includeScore = includeScore;
+    this.includeId = includeId;
+    this.currentLineIndex = 0;
+  }
+
+  public CSVResult extractResults(
+      Object queryResult, boolean flat, String separator, final List<String> fieldNames)
+      throws CsvExtractorException {
+
+    if (queryResult instanceof SearchHits) {
+      SearchHit[] hits = ((SearchHits) queryResult).getHits();
+      List<Map<String, Object>> docsAsMap = new ArrayList<>();
+      List<String> headers = createHeadersAndFillDocsMap(flat, hits, docsAsMap, fieldNames);
+      List<List<String>> csvLines = createCSVLinesFromDocs(flat, separator, docsAsMap, headers);
+      return new CSVResult(separator, headers, csvLines);
     }
-
-    public CSVResult extractResults(Object queryResult, boolean flat, String separator,
-                                    final List<String> fieldNames) throws CsvExtractorException {
-
-        if (queryResult instanceof SearchHits) {
-            SearchHit[] hits = ((SearchHits) queryResult).getHits();
-            List<Map<String, Object>> docsAsMap = new ArrayList<>();
-            List<String> headers = createHeadersAndFillDocsMap(flat, hits, docsAsMap, fieldNames);
-            List<List<String>> csvLines = createCSVLinesFromDocs(flat, separator, docsAsMap, headers);
-            return new CSVResult(separator, headers, csvLines);
-        }
-        if (queryResult instanceof Aggregations) {
-            List<String> headers = new ArrayList<>();
-            List<List<String>> lines = new ArrayList<>();
-            lines.add(new ArrayList<String>());
-            handleAggregations((Aggregations) queryResult, headers, lines);
-            return new CSVResult(separator, headers, lines);
-        }
-        // Handle List<BindingTuple> result.
-        if (queryResult instanceof List) {
-            List<BindingTuple> bindingTuples = (List<BindingTuple>) queryResult;
-            List<List<String>> csvLines = bindingTuples.stream().map(tuple -> {
-                Map<String, ExprValue> bindingMap = tuple.getBindingMap();
-                List<String> rowValues = new ArrayList<>();
-                for (String fieldName : fieldNames) {
-                    if (bindingMap.containsKey(fieldName)) {
+    if (queryResult instanceof Aggregations) {
+      List<String> headers = new ArrayList<>();
+      List<List<String>> lines = new ArrayList<>();
+      lines.add(new ArrayList<String>());
+      handleAggregations((Aggregations) queryResult, headers, lines);
+      return new CSVResult(separator, headers, lines);
+    }
+    // Handle List<BindingTuple> result.
+    if (queryResult instanceof List) {
+      List<BindingTuple> bindingTuples = (List<BindingTuple>) queryResult;
+      List<List<String>> csvLines =
+          bindingTuples.stream()
+              .map(
+                  tuple -> {
+                    Map<String, ExprValue> bindingMap = tuple.getBindingMap();
+                    List<String> rowValues = new ArrayList<>();
+                    for (String fieldName : fieldNames) {
+                      if (bindingMap.containsKey(fieldName)) {
                         rowValues.add(String.valueOf(bindingMap.get(fieldName).value()));
-                    } else {
+                      } else {
                         rowValues.add("");
+                      }
                     }
-                }
-                return rowValues;
-            }).collect(Collectors.toList());
+                    return rowValues;
+                  })
+              .collect(Collectors.toList());
 
-            return new CSVResult(separator, fieldNames, csvLines);
-        }
-        return null;
+      return new CSVResult(separator, fieldNames, csvLines);
     }
-
-    private void handleAggregations(Aggregations aggregations, List<String> headers, List<List<String>> lines)
-            throws CsvExtractorException {
-        if (allNumericAggregations(aggregations)) {
-            lines.get(this.currentLineIndex)
-                    .addAll(fillHeaderAndCreateLineForNumericAggregations(aggregations, headers));
-            return;
-        }
-        //aggregations with size one only supported when not metrics.
-        List<Aggregation> aggregationList = aggregations.asList();
-        if (aggregationList.size() > 1) {
-            throw new CsvExtractorException(
-                    "currently support only one aggregation at same level (Except for numeric metrics)");
-        }
-        Aggregation aggregation = aggregationList.get(0);
-        //we want to skip singleBucketAggregations (nested,reverse_nested,filters)
-        if (aggregation instanceof SingleBucketAggregation) {
-            Aggregations singleBucketAggs = ((SingleBucketAggregation) aggregation).getAggregations();
-            handleAggregations(singleBucketAggs, headers, lines);
-            return;
-        }
-        if (aggregation instanceof NumericMetricsAggregation) {
-            handleNumericMetricAggregation(headers, lines.get(currentLineIndex), aggregation);
-            return;
-        }
-        if (aggregation instanceof GeoBounds) {
-            handleGeoBoundsAggregation(headers, lines, (GeoBounds) aggregation);
-            return;
-        }
-        if (aggregation instanceof TopHits) {
-            //todo: handle this . it returns hits... maby back to normal?
-            //todo: read about this usages
-            // TopHits topHitsAggregation = (TopHits) aggregation;
-        }
-        if (aggregation instanceof MultiBucketsAggregation) {
-            MultiBucketsAggregation bucketsAggregation = (MultiBucketsAggregation) aggregation;
-            String name = bucketsAggregation.getName();
-            //checking because it can comes from sub aggregation again
-            if (!headers.contains(name)) {
-                headers.add(name);
-            }
-            Collection<? extends MultiBucketsAggregation.Bucket> buckets = bucketsAggregation.getBuckets();
-
-            //clone current line.
-            List<String> currentLine = lines.get(this.currentLineIndex);
-            List<String> clonedLine = new ArrayList<>(currentLine);
-
-            //call handle_Agg with current_line++
-            boolean firstLine = true;
-            for (MultiBucketsAggregation.Bucket bucket : buckets) {
-                //each bucket need to add new line with current line copied => except for first line
-                String key = bucket.getKeyAsString();
-                if (firstLine) {
-                    firstLine = false;
-                } else {
-                    currentLineIndex++;
-                    currentLine = new ArrayList<String>(clonedLine);
-                    lines.add(currentLine);
-                }
-                currentLine.add(key);
-                handleAggregations(bucket.getAggregations(), headers, lines);
-
-            }
-        }
+    return null;
+  }
+
+  private void handleAggregations(
+      Aggregations aggregations, List<String> headers, List<List<String>> lines)
+      throws CsvExtractorException {
+    if (allNumericAggregations(aggregations)) {
+      lines
+          .get(this.currentLineIndex)
+          .addAll(fillHeaderAndCreateLineForNumericAggregations(aggregations, headers));
+      return;
     }
-
-    private void handleGeoBoundsAggregation(List<String> headers, List<List<String>> lines,
-                                            GeoBounds geoBoundsAggregation) {
-        String geoBoundAggName = geoBoundsAggregation.getName();
-        headers.add(geoBoundAggName + ".topLeft.lon");
-        headers.add(geoBoundAggName + ".topLeft.lat");
-        headers.add(geoBoundAggName + ".bottomRight.lon");
-        headers.add(geoBoundAggName + ".bottomRight.lat");
-        List<String> line = lines.get(this.currentLineIndex);
-        line.add(String.valueOf(geoBoundsAggregation.topLeft().getLon()));
-        line.add(String.valueOf(geoBoundsAggregation.topLeft().getLat()));
-        line.add(String.valueOf(geoBoundsAggregation.bottomRight().getLon()));
-        line.add(String.valueOf(geoBoundsAggregation.bottomRight().getLat()));
-        lines.add(line);
+    // aggregations with size one only supported when not metrics.
+    List<Aggregation> aggregationList = aggregations.asList();
+    if (aggregationList.size() > 1) {
+      throw new CsvExtractorException(
+          "currently support only one aggregation at same level (Except for numeric metrics)");
     }
-
-    private List<String> fillHeaderAndCreateLineForNumericAggregations(Aggregations aggregations, List<String> header)
-            throws CsvExtractorException {
-        List<String> line = new ArrayList<>();
-        List<Aggregation> aggregationList = aggregations.asList();
-        for (Aggregation aggregation : aggregationList) {
-            handleNumericMetricAggregation(header, line, aggregation);
-        }
-        return line;
+    Aggregation aggregation = aggregationList.get(0);
+    // we want to skip singleBucketAggregations (nested,reverse_nested,filters)
+    if (aggregation instanceof SingleBucketAggregation) {
+      Aggregations singleBucketAggs = ((SingleBucketAggregation) aggregation).getAggregations();
+      handleAggregations(singleBucketAggs, headers, lines);
+      return;
     }
-
-    private void handleNumericMetricAggregation(List<String> header, List<String> line, Aggregation aggregation)
-            throws CsvExtractorException {
-        final String name = aggregation.getName();
-
-        if (aggregation instanceof NumericMetricsAggregation.SingleValue) {
-            if (!header.contains(name)) {
-                header.add(name);
-            }
-            NumericMetricsAggregation.SingleValue agg = (NumericMetricsAggregation.SingleValue) aggregation;
-            line.add(!Double.isInfinite(agg.value()) ? agg.getValueAsString() : "null");
-        } else if (aggregation instanceof NumericMetricsAggregation.MultiValue) {
-            //todo:Numeric MultiValue - Stats,ExtendedStats,Percentile...
-            if (aggregation instanceof Stats) {
-                String[] statsHeaders = new String[]{"count", "sum", "avg", "min", "max"};
-                boolean isExtendedStats = aggregation instanceof ExtendedStats;
-                if (isExtendedStats) {
-                    String[] extendedHeaders = new String[]{"sumOfSquares", "variance", "stdDeviation"};
-                    statsHeaders = Util.concatStringsArrays(statsHeaders, extendedHeaders);
-                }
-                mergeHeadersWithPrefix(header, name, statsHeaders);
-                Stats stats = (Stats) aggregation;
-                line.add(String.valueOf(stats.getCount()));
-                line.add(stats.getSumAsString());
-                line.add(stats.getAvgAsString());
-                line.add(stats.getMinAsString());
-                line.add(stats.getMaxAsString());
-                if (isExtendedStats) {
-                    ExtendedStats extendedStats = (ExtendedStats) aggregation;
-                    line.add(extendedStats.getSumOfSquaresAsString());
-                    line.add(extendedStats.getVarianceAsString());
-                    line.add(extendedStats.getStdDeviationAsString());
-                }
-            } else if (aggregation instanceof Percentiles) {
-
-                final List<String> percentileHeaders = new ArrayList<>(7);
-                final Percentiles percentiles = (Percentiles) aggregation;
-
-                for (final Percentile p : percentiles) {
-                    percentileHeaders.add(String.valueOf(p.getPercent()));
-                    line.add(percentiles.percentileAsString(p.getPercent()));
-                }
-                mergeHeadersWithPrefix(header, name, percentileHeaders.toArray(new String[0]));
-            } else {
-                throw new CsvExtractorException(
-                        "unknown NumericMetricsAggregation.MultiValue:" + aggregation.getClass());
-            }
-
+    if (aggregation instanceof NumericMetricsAggregation) {
+      handleNumericMetricAggregation(headers, lines.get(currentLineIndex), aggregation);
+      return;
+    }
+    if (aggregation instanceof GeoBounds) {
+      handleGeoBoundsAggregation(headers, lines, (GeoBounds) aggregation);
+      return;
+    }
+    if (aggregation instanceof TopHits) {
+      // todo: handle this . it returns hits... maby back to normal?
+      // todo: read about this usages
+      // TopHits topHitsAggregation = (TopHits) aggregation;
+    }
+    if (aggregation instanceof MultiBucketsAggregation) {
+      MultiBucketsAggregation bucketsAggregation = (MultiBucketsAggregation) aggregation;
+      String name = bucketsAggregation.getName();
+      // checking because it can comes from sub aggregation again
+      if (!headers.contains(name)) {
+        headers.add(name);
+      }
+      Collection<? extends MultiBucketsAggregation.Bucket> buckets =
+          bucketsAggregation.getBuckets();
+
+      // clone current line.
+      List<String> currentLine = lines.get(this.currentLineIndex);
+      List<String> clonedLine = new ArrayList<>(currentLine);
+
+      // call handle_Agg with current_line++
+      boolean firstLine = true;
+      for (MultiBucketsAggregation.Bucket bucket : buckets) {
+        // each bucket need to add new line with current line copied => except for first line
+        String key = bucket.getKeyAsString();
+        if (firstLine) {
+          firstLine = false;
         } else {
-            throw new CsvExtractorException("unknown NumericMetricsAggregation" + aggregation.getClass());
+          currentLineIndex++;
+          currentLine = new ArrayList<String>(clonedLine);
+          lines.add(currentLine);
         }
+        currentLine.add(key);
+        handleAggregations(bucket.getAggregations(), headers, lines);
+      }
     }
-
-    private void mergeHeadersWithPrefix(List<String> header, String prefix, String[] newHeaders) {
-        for (int i = 0; i < newHeaders.length; i++) {
-            String newHeader = newHeaders[i];
-            if (prefix != null && !prefix.equals("")) {
-                newHeader = prefix + "." + newHeader;
-            }
-            if (!header.contains(newHeader)) {
-                header.add(newHeader);
-            }
-        }
+  }
+
+  private void handleGeoBoundsAggregation(
+      List<String> headers, List<List<String>> lines, GeoBounds geoBoundsAggregation) {
+    String geoBoundAggName = geoBoundsAggregation.getName();
+    headers.add(geoBoundAggName + ".topLeft.lon");
+    headers.add(geoBoundAggName + ".topLeft.lat");
+    headers.add(geoBoundAggName + ".bottomRight.lon");
+    headers.add(geoBoundAggName + ".bottomRight.lat");
+    List<String> line = lines.get(this.currentLineIndex);
+    line.add(String.valueOf(geoBoundsAggregation.topLeft().getLon()));
+    line.add(String.valueOf(geoBoundsAggregation.topLeft().getLat()));
+    line.add(String.valueOf(geoBoundsAggregation.bottomRight().getLon()));
+    line.add(String.valueOf(geoBoundsAggregation.bottomRight().getLat()));
+    lines.add(line);
+  }
+
+  private List<String> fillHeaderAndCreateLineForNumericAggregations(
+      Aggregations aggregations, List<String> header) throws CsvExtractorException {
+    List<String> line = new ArrayList<>();
+    List<Aggregation> aggregationList = aggregations.asList();
+    for (Aggregation aggregation : aggregationList) {
+      handleNumericMetricAggregation(header, line, aggregation);
     }
-
-    private boolean allNumericAggregations(Aggregations aggregations) {
-        List<Aggregation> aggregationList = aggregations.asList();
-        for (Aggregation aggregation : aggregationList) {
-            if (!(aggregation instanceof NumericMetricsAggregation)) {
-                return false;
-            }
+    return line;
+  }
+
+  private void handleNumericMetricAggregation(
+      List<String> header, List<String> line, Aggregation aggregation)
+      throws CsvExtractorException {
+    final String name = aggregation.getName();
+
+    if (aggregation instanceof NumericMetricsAggregation.SingleValue) {
+      if (!header.contains(name)) {
+        header.add(name);
+      }
+      NumericMetricsAggregation.SingleValue agg =
+          (NumericMetricsAggregation.SingleValue) aggregation;
+      line.add(!Double.isInfinite(agg.value()) ? agg.getValueAsString() : "null");
+    } else if (aggregation instanceof NumericMetricsAggregation.MultiValue) {
+      // todo:Numeric MultiValue - Stats,ExtendedStats,Percentile...
+      if (aggregation instanceof Stats) {
+        String[] statsHeaders = new String[] {"count", "sum", "avg", "min", "max"};
+        boolean isExtendedStats = aggregation instanceof ExtendedStats;
+        if (isExtendedStats) {
+          String[] extendedHeaders = new String[] {"sumOfSquares", "variance", "stdDeviation"};
+          statsHeaders = Util.concatStringsArrays(statsHeaders, extendedHeaders);
         }
-        return true;
-    }
+        mergeHeadersWithPrefix(header, name, statsHeaders);
+        Stats stats = (Stats) aggregation;
+        line.add(String.valueOf(stats.getCount()));
+        line.add(stats.getSumAsString());
+        line.add(stats.getAvgAsString());
+        line.add(stats.getMinAsString());
+        line.add(stats.getMaxAsString());
+        if (isExtendedStats) {
+          ExtendedStats extendedStats = (ExtendedStats) aggregation;
+          line.add(extendedStats.getSumOfSquaresAsString());
+          line.add(extendedStats.getVarianceAsString());
+          line.add(extendedStats.getStdDeviationAsString());
+        }
+      } else if (aggregation instanceof Percentiles) {
+
+        final List<String> percentileHeaders = new ArrayList<>(7);
+        final Percentiles percentiles = (Percentiles) aggregation;
 
-    private Aggregation skipAggregations(Aggregation firstAggregation) {
-        while (firstAggregation instanceof SingleBucketAggregation) {
-            firstAggregation = getFirstAggregation(((SingleBucketAggregation) firstAggregation).getAggregations());
+        for (final Percentile p : percentiles) {
+          percentileHeaders.add(String.valueOf(p.getPercent()));
+          line.add(percentiles.percentileAsString(p.getPercent()));
         }
-        return firstAggregation;
+        mergeHeadersWithPrefix(header, name, percentileHeaders.toArray(new String[0]));
+      } else {
+        throw new CsvExtractorException(
+            "unknown NumericMetricsAggregation.MultiValue:" + aggregation.getClass());
+      }
+
+    } else {
+      throw new CsvExtractorException("unknown NumericMetricsAggregation" + aggregation.getClass());
     }
-
-    private Aggregation getFirstAggregation(Aggregations aggregations) {
-        return aggregations.asList().get(0);
+  }
+
+  private void mergeHeadersWithPrefix(List<String> header, String prefix, String[] newHeaders) {
+    for (int i = 0; i < newHeaders.length; i++) {
+      String newHeader = newHeaders[i];
+      if (prefix != null && !prefix.equals("")) {
+        newHeader = prefix + "." + newHeader;
+      }
+      if (!header.contains(newHeader)) {
+        header.add(newHeader);
+      }
+    }
+  }
+
+  private boolean allNumericAggregations(Aggregations aggregations) {
+    List<Aggregation> aggregationList = aggregations.asList();
+    for (Aggregation aggregation : aggregationList) {
+      if (!(aggregation instanceof NumericMetricsAggregation)) {
+        return false;
+      }
     }
+    return true;
+  }
 
-    private List<List<String>> createCSVLinesFromDocs(boolean flat, String separator,
-                                                      List<Map<String, Object>> docsAsMap,
-                                                      List<String> headers) {
-        List<List<String>> csvLines = new ArrayList<>();
-        for (Map<String, Object> doc : docsAsMap) {
-            List<String> line = new ArrayList<>();
-            for (String header : headers) {
-                line.add(findFieldValue(header, doc, flat, separator));
-            }
-            csvLines.add(line);
-        }
-        return csvLines;
+  private Aggregation skipAggregations(Aggregation firstAggregation) {
+    while (firstAggregation instanceof SingleBucketAggregation) {
+      firstAggregation =
+          getFirstAggregation(((SingleBucketAggregation) firstAggregation).getAggregations());
+    }
+    return firstAggregation;
+  }
+
+  private Aggregation getFirstAggregation(Aggregations aggregations) {
+    return aggregations.asList().get(0);
+  }
+
+  private List<List<String>> createCSVLinesFromDocs(
+      boolean flat, String separator, List<Map<String, Object>> docsAsMap, List<String> headers) {
+    List<List<String>> csvLines = new ArrayList<>();
+    for (Map<String, Object> doc : docsAsMap) {
+      List<String> line = new ArrayList<>();
+      for (String header : headers) {
+        line.add(findFieldValue(header, doc, flat, separator));
+      }
+      csvLines.add(line);
+    }
+    return csvLines;
+  }
+
+  private List<String> createHeadersAndFillDocsMap(
+      final boolean flat,
+      final SearchHit[] hits,
+      final List<Map<String, Object>> docsAsMap,
+      final List<String> fieldNames) {
+    final Set<String> csvHeaders = new LinkedHashSet<>();
+    if (fieldNames != null) {
+      csvHeaders.addAll(fieldNames);
     }
 
-    private List<String> createHeadersAndFillDocsMap(final boolean flat, final SearchHit[] hits,
-                                                     final List<Map<String, Object>> docsAsMap,
-                                                     final List<String> fieldNames) {
-        final Set<String> csvHeaders = new LinkedHashSet<>();
-        if (fieldNames != null) {
-            csvHeaders.addAll(fieldNames);
-        }
+    for (final SearchHit hit : hits) {
+      final Map<String, Object> doc = hit.getSourceAsMap();
+      final Map<String, DocumentField> fields = hit.getFields();
+      for (final DocumentField searchHitField : fields.values()) {
+        doc.put(searchHitField.getName(), searchHitField.getValue());
+      }
+
+      if (this.includeId) {
+        doc.put("_id", hit.getId());
+      }
+      if (this.includeScore) {
+        doc.put("_score", hit.getScore());
+      }
+
+      // select function as field is a special case where each hit has non-null field (function)
+      // and sourceAsMap is all columns in index (the same as 'SELECT *')
+      if (fields.isEmpty()) {
+        mergeHeaders(csvHeaders, doc, flat);
+      }
+      docsAsMap.add(doc);
+    }
 
-        for (final SearchHit hit : hits) {
-            final Map<String, Object> doc = hit.getSourceAsMap();
-            final Map<String, DocumentField> fields = hit.getFields();
-            for (final DocumentField searchHitField : fields.values()) {
-                doc.put(searchHitField.getName(), searchHitField.getValue());
-            }
-
-            if (this.includeId) {
-                doc.put("_id", hit.getId());
-            }
-            if (this.includeScore) {
-                doc.put("_score", hit.getScore());
-            }
-
-            // select function as field is a special case where each hit has non-null field (function)
-            // and sourceAsMap is all columns in index (the same as 'SELECT *')
-            if (fields.isEmpty()) {
-                mergeHeaders(csvHeaders, doc, flat);
-            }
-            docsAsMap.add(doc);
-        }
+    return new ArrayList<>(csvHeaders);
+  }
 
-        return new ArrayList<>(csvHeaders);
-    }
+  private String findFieldValue(
+      String header, Map<String, Object> doc, boolean flat, String separator) {
+    if (flat && header.contains(".")) {
+      String[] split = header.split("\\.");
+      Object innerDoc = doc;
 
-    private String findFieldValue(String header, Map<String, Object> doc, boolean flat, String separator) {
-        if (flat && header.contains(".")) {
-            String[] split = header.split("\\.");
-            Object innerDoc = doc;
-
-            for (String innerField : split) {
-                if (!(innerDoc instanceof Map)) {
-                    return "";
-                }
-                innerDoc = ((Map<String, Object>) innerDoc).get(innerField);
-                if (innerDoc == null) {
-                    return "";
-                }
-            }
-            return innerDoc.toString();
-        } else {
-            if (doc.containsKey(header)) {
-                return String.valueOf(doc.get(header));
-            }
+      for (String innerField : split) {
+        if (!(innerDoc instanceof Map)) {
+          return "";
         }
-        return "";
-    }
-
-    private void mergeHeaders(Set<String> headers, Map<String, Object> doc, boolean flat) {
-        if (!flat) {
-            headers.addAll(doc.keySet());
-            return;
+        innerDoc = ((Map<String, Object>) innerDoc).get(innerField);
+        if (innerDoc == null) {
+          return "";
         }
-        mergeFieldNamesRecursive(headers, doc, "");
+      }
+      return innerDoc.toString();
+    } else {
+      if (doc.containsKey(header)) {
+        return String.valueOf(doc.get(header));
+      }
     }
+    return "";
+  }
 
-    private void mergeFieldNamesRecursive(Set<String> headers, Map<String, Object> doc, String prefix) {
-        for (Map.Entry<String, Object> field : doc.entrySet()) {
-            Object value = field.getValue();
-            if (value instanceof Map) {
-                mergeFieldNamesRecursive(headers, (Map<String, Object>) value, prefix + field.getKey() + ".");
-            } else {
-                headers.add(prefix + field.getKey());
-            }
-        }
+  private void mergeHeaders(Set<String> headers, Map<String, Object> doc, boolean flat) {
+    if (!flat) {
+      headers.addAll(doc.keySet());
+      return;
+    }
+    mergeFieldNamesRecursive(headers, doc, "");
+  }
+
+  private void mergeFieldNamesRecursive(
+      Set<String> headers, Map<String, Object> doc, String prefix) {
+    for (Map.Entry<String, Object> field : doc.entrySet()) {
+      Object value = field.getValue();
+      if (value instanceof Map) {
+        mergeFieldNamesRecursive(
+            headers, (Map<String, Object>) value, prefix + field.getKey() + ".");
+      } else {
+        headers.add(prefix + field.getKey());
+      }
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CsvExtractorException.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CsvExtractorException.java
index 7e0f8e8ff9..cb289e4625 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CsvExtractorException.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CsvExtractorException.java
@@ -3,14 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.csv;
 
-/**
- * Created by Eliran on 29/12/2015.
- */
+/** Created by Eliran on 29/12/2015. */
 public class CsvExtractorException extends Exception {
-    public CsvExtractorException(String message) {
-        super(message);
-    }
+  public CsvExtractorException(String message) {
+    super(message);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorActionRequestRestExecutorFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorActionRequestRestExecutorFactory.java
index 7c8ed62a07..b4add64f9c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorActionRequestRestExecutorFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorActionRequestRestExecutorFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.cursor;
 
 import org.opensearch.rest.RestRequest;
@@ -11,16 +10,17 @@
 
 public class CursorActionRequestRestExecutorFactory {
 
-    public static CursorAsyncRestExecutor createExecutor(RestRequest request, String cursorId, Format format) {
+  public static CursorAsyncRestExecutor createExecutor(
+      RestRequest request, String cursorId, Format format) {
 
-        if (isCursorCloseRequest(request)) {
-            return new CursorAsyncRestExecutor(new CursorCloseExecutor(cursorId));
-        } else {
-            return new CursorAsyncRestExecutor(new CursorResultExecutor(cursorId, format));
-        }
+    if (isCursorCloseRequest(request)) {
+      return new CursorAsyncRestExecutor(new CursorCloseExecutor(cursorId));
+    } else {
+      return new CursorAsyncRestExecutor(new CursorResultExecutor(cursorId, format));
     }
+  }
 
-    private static boolean isCursorCloseRequest(final RestRequest request) {
-        return request.path().endsWith("/_sql/close");
-    }
+  private static boolean isCursorCloseRequest(final RestRequest request) {
+    return request.path().endsWith("/_sql/close");
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorAsyncRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorAsyncRestExecutor.java
index 7bb6421502..ffcf2adbf3 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorAsyncRestExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorAsyncRestExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.cursor;
 
 import java.io.IOException;
@@ -13,9 +12,9 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.client.Client;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.common.utils.QueryContext;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
@@ -25,84 +24,83 @@
 import org.opensearch.threadpool.ThreadPool;
 
 public class CursorAsyncRestExecutor {
-    /**
-     * Custom thread pool name managed by OpenSearch
-     */
-    public static final String SQL_WORKER_THREAD_POOL_NAME = "sql-worker";
+  /** Custom thread pool name managed by OpenSearch */
+  public static final String SQL_WORKER_THREAD_POOL_NAME = "sql-worker";
 
-    private static final Logger LOG = LogManager.getLogger(CursorAsyncRestExecutor.class);
+  private static final Logger LOG = LogManager.getLogger(CursorAsyncRestExecutor.class);
 
-    /**
-     * Delegated rest executor to async
-     */
-    private final CursorRestExecutor executor;
+  /** Delegated rest executor to async */
+  private final CursorRestExecutor executor;
 
+  CursorAsyncRestExecutor(CursorRestExecutor executor) {
+    this.executor = executor;
+  }
 
-    CursorAsyncRestExecutor(CursorRestExecutor executor) {
-        this.executor = executor;
-    }
+  public void execute(Client client, Map<String, String> params, RestChannel channel) {
+    async(client, params, channel);
+  }
 
-    public void execute(Client client, Map<String, String> params, RestChannel channel) {
-        async(client, params, channel);
-    }
+  /** Run given task in thread pool asynchronously */
+  private void async(Client client, Map<String, String> params, RestChannel channel) {
 
-    /**
-     * Run given task in thread pool asynchronously
-     */
-    private void async(Client client, Map<String, String> params, RestChannel channel) {
-
-        ThreadPool threadPool = client.threadPool();
-        Runnable runnable = () -> {
-            try {
-                doExecuteWithTimeMeasured(client, params, channel);
-            } catch (IOException e) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-                LOG.warn("[{}] [MCB] async task got an IO/SQL exception: {}", QueryContext.getRequestId(),
-                        e.getMessage());
-                e.printStackTrace();
-                channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR, e.getMessage()));
-            } catch (IllegalStateException e) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-                LOG.warn("[{}] [MCB] async task got a runtime exception: {}", QueryContext.getRequestId(),
-                        e.getMessage());
-                e.printStackTrace();
-                channel.sendResponse(new BytesRestResponse(RestStatus.INSUFFICIENT_STORAGE,
-                        "Memory circuit is broken."));
-            } catch (Throwable t) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-                LOG.warn("[{}] [MCB] async task got an unknown throwable: {}", QueryContext.getRequestId(),
-                        t.getMessage());
-                t.printStackTrace();
-                channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR,
-                        String.valueOf(t.getMessage())));
-            } finally {
-                BackOffRetryStrategy.releaseMem(executor);
-            }
+    ThreadPool threadPool = client.threadPool();
+    Runnable runnable =
+        () -> {
+          try {
+            doExecuteWithTimeMeasured(client, params, channel);
+          } catch (IOException e) {
+            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
+            LOG.warn(
+                "[{}] [MCB] async task got an IO/SQL exception: {}",
+                QueryContext.getRequestId(),
+                e.getMessage());
+            e.printStackTrace();
+            channel.sendResponse(
+                new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR, e.getMessage()));
+          } catch (IllegalStateException e) {
+            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
+            LOG.warn(
+                "[{}] [MCB] async task got a runtime exception: {}",
+                QueryContext.getRequestId(),
+                e.getMessage());
+            e.printStackTrace();
+            channel.sendResponse(
+                new BytesRestResponse(
+                    RestStatus.INSUFFICIENT_STORAGE, "Memory circuit is broken."));
+          } catch (Throwable t) {
+            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
+            LOG.warn(
+                "[{}] [MCB] async task got an unknown throwable: {}",
+                QueryContext.getRequestId(),
+                t.getMessage());
+            t.printStackTrace();
+            channel.sendResponse(
+                new BytesRestResponse(
+                    RestStatus.INTERNAL_SERVER_ERROR, String.valueOf(t.getMessage())));
+          } finally {
+            BackOffRetryStrategy.releaseMem(executor);
+          }
         };
 
-        // Preserve context of calling thread to ensure headers of requests are forwarded when running blocking actions
-        threadPool.schedule(
-                QueryContext.withCurrentContext(runnable),
-                new TimeValue(0L),
-                SQL_WORKER_THREAD_POOL_NAME
-        );
-    }
+    // Preserve context of calling thread to ensure headers of requests are forwarded when running
+    // blocking actions
+    threadPool.schedule(
+        QueryContext.withCurrentContext(runnable), new TimeValue(0L), SQL_WORKER_THREAD_POOL_NAME);
+  }
 
-    /**
-     * Time the real execution of Executor and log slow query for troubleshooting
-     */
-    private void doExecuteWithTimeMeasured(Client client,
-                                           Map<String, String> params,
-                                           RestChannel channel) throws Exception {
-        long startTime = System.nanoTime();
-        try {
-            executor.execute(client, params, channel);
-        } finally {
-            Duration elapsed = Duration.ofNanos(System.nanoTime() - startTime);
-            int slowLogThreshold = LocalClusterState.state().getSettingValue(Settings.Key.SQL_SLOWLOG);
-            if (elapsed.getSeconds() >= slowLogThreshold) {
-                LOG.warn("[{}] Slow query: elapsed={} (ms)", QueryContext.getRequestId(), elapsed.toMillis());
-            }
-        }
+  /** Time the real execution of Executor and log slow query for troubleshooting */
+  private void doExecuteWithTimeMeasured(
+      Client client, Map<String, String> params, RestChannel channel) throws Exception {
+    long startTime = System.nanoTime();
+    try {
+      executor.execute(client, params, channel);
+    } finally {
+      Duration elapsed = Duration.ofNanos(System.nanoTime() - startTime);
+      int slowLogThreshold = LocalClusterState.state().getSettingValue(Settings.Key.SQL_SLOWLOG);
+      if (elapsed.getSeconds() >= slowLogThreshold) {
+        LOG.warn(
+            "[{}] Slow query: elapsed={} (ms)", QueryContext.getRequestId(), elapsed.toMillis());
+      }
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorCloseExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorCloseExecutor.java
index 901962dbbe..7282eaed4c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorCloseExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorCloseExecutor.java
@@ -3,10 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.cursor;
 
-import static org.opensearch.rest.RestStatus.OK;
+import static org.opensearch.core.rest.RestStatus.OK;
 
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
@@ -25,66 +24,69 @@
 
 public class CursorCloseExecutor implements CursorRestExecutor {
 
-    private static final Logger LOG = LogManager.getLogger(CursorCloseExecutor.class);
-
-    private static final String SUCCEEDED_TRUE = "{\"succeeded\":true}";
-    private static final String SUCCEEDED_FALSE = "{\"succeeded\":false}";
-
-    private String cursorId;
-
-    public CursorCloseExecutor(String cursorId) {
-        this.cursorId = cursorId;
-    }
-
-    public void execute(Client client, Map<String, String> params, RestChannel channel) throws Exception {
-        try {
-            String formattedResponse = execute(client, params);
-            channel.sendResponse(new BytesRestResponse(OK, "application/json; charset=UTF-8", formattedResponse));
-        } catch (IllegalArgumentException | JSONException e) {
-            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CUS).increment();
-            LOG.error("Error parsing the cursor", e);
-            channel.sendResponse(new BytesRestResponse(channel, e));
-        } catch (OpenSearchException e) {
-            int status = (e.status().getStatus());
-            if (status > 399 && status < 500) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CUS).increment();
-            } else if (status > 499) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-            }
-            LOG.error("Error completing cursor request", e);
-            channel.sendResponse(new BytesRestResponse(channel, e));
-        }
+  private static final Logger LOG = LogManager.getLogger(CursorCloseExecutor.class);
+
+  private static final String SUCCEEDED_TRUE = "{\"succeeded\":true}";
+  private static final String SUCCEEDED_FALSE = "{\"succeeded\":false}";
+
+  private String cursorId;
+
+  public CursorCloseExecutor(String cursorId) {
+    this.cursorId = cursorId;
+  }
+
+  public void execute(Client client, Map<String, String> params, RestChannel channel)
+      throws Exception {
+    try {
+      String formattedResponse = execute(client, params);
+      channel.sendResponse(
+          new BytesRestResponse(OK, "application/json; charset=UTF-8", formattedResponse));
+    } catch (IllegalArgumentException | JSONException e) {
+      Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CUS).increment();
+      LOG.error("Error parsing the cursor", e);
+      channel.sendResponse(new BytesRestResponse(channel, e));
+    } catch (OpenSearchException e) {
+      int status = (e.status().getStatus());
+      if (status > 399 && status < 500) {
+        Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CUS).increment();
+      } else if (status > 499) {
+        Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
+      }
+      LOG.error("Error completing cursor request", e);
+      channel.sendResponse(new BytesRestResponse(channel, e));
     }
+  }
 
-    public String execute(Client client, Map<String, String> params) throws Exception {
-        String[] splittedCursor = cursorId.split(":");
-
-        if (splittedCursor.length!=2) {
-            throw new VerificationException("Not able to parse invalid cursor");
-        }
-
-        String type = splittedCursor[0];
-        CursorType cursorType = CursorType.getById(type);
-
-        switch(cursorType) {
-            case DEFAULT:
-                DefaultCursor defaultCursor = DefaultCursor.from(splittedCursor[1]);
-                return handleDefaultCursorCloseRequest(client, defaultCursor);
-            case AGGREGATION:
-            case JOIN:
-            default: throw new VerificationException("Unsupported cursor type [" + type + "]");
-        }
+  public String execute(Client client, Map<String, String> params) throws Exception {
+    String[] splittedCursor = cursorId.split(":");
 
+    if (splittedCursor.length != 2) {
+      throw new VerificationException("Not able to parse invalid cursor");
     }
 
-    private String handleDefaultCursorCloseRequest(Client client, DefaultCursor cursor) {
-        String scrollId = cursor.getScrollId();
-        ClearScrollResponse clearScrollResponse = client.prepareClearScroll().addScrollId(scrollId).get();
-        if (clearScrollResponse.isSucceeded()) {
-            return SUCCEEDED_TRUE;
-        } else {
-            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-            return SUCCEEDED_FALSE;
-        }
+    String type = splittedCursor[0];
+    CursorType cursorType = CursorType.getById(type);
+
+    switch (cursorType) {
+      case DEFAULT:
+        DefaultCursor defaultCursor = DefaultCursor.from(splittedCursor[1]);
+        return handleDefaultCursorCloseRequest(client, defaultCursor);
+      case AGGREGATION:
+      case JOIN:
+      default:
+        throw new VerificationException("Unsupported cursor type [" + type + "]");
+    }
+  }
+
+  private String handleDefaultCursorCloseRequest(Client client, DefaultCursor cursor) {
+    String scrollId = cursor.getScrollId();
+    ClearScrollResponse clearScrollResponse =
+        client.prepareClearScroll().addScrollId(scrollId).get();
+    if (clearScrollResponse.isSucceeded()) {
+      return SUCCEEDED_TRUE;
+    } else {
+      Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
+      return SUCCEEDED_FALSE;
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorRestExecutor.java
index 5f294f8e32..4c4b854379 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorRestExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorRestExecutor.java
@@ -3,21 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
-
 package org.opensearch.sql.legacy.executor.cursor;
 
 import java.util.Map;
 import org.opensearch.client.Client;
 import org.opensearch.rest.RestChannel;
 
-/**
- * Interface to execute cursor request.
- */
+/** Interface to execute cursor request. */
 public interface CursorRestExecutor {
 
-    void execute(Client client, Map<String, String> params, RestChannel channel)
-            throws Exception;
+  void execute(Client client, Map<String, String> params, RestChannel channel) throws Exception;
 
-    String execute(Client client, Map<String, String> params) throws Exception;
+  String execute(Client client, Map<String, String> params) throws Exception;
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorResultExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorResultExecutor.java
index b7d6da1137..854a40b4dd 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorResultExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorResultExecutor.java
@@ -3,10 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.cursor;
 
-import static org.opensearch.rest.RestStatus.OK;
+import static org.opensearch.core.rest.RestStatus.OK;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -34,99 +33,104 @@
 
 public class CursorResultExecutor implements CursorRestExecutor {
 
-    private String cursorId;
-    private Format format;
+  private String cursorId;
+  private Format format;
+
+  private static final Logger LOG = LogManager.getLogger(CursorResultExecutor.class);
+
+  public CursorResultExecutor(String cursorId, Format format) {
+    this.cursorId = cursorId;
+    this.format = format;
+  }
+
+  public void execute(Client client, Map<String, String> params, RestChannel channel)
+      throws Exception {
+    try {
+      String formattedResponse = execute(client, params);
+      channel.sendResponse(
+          new BytesRestResponse(OK, "application/json; charset=UTF-8", formattedResponse));
+    } catch (IllegalArgumentException | JSONException e) {
+      Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CUS).increment();
+      LOG.error("Error parsing the cursor", e);
+      channel.sendResponse(new BytesRestResponse(channel, e));
+    } catch (OpenSearchException e) {
+      int status = (e.status().getStatus());
+      if (status > 399 && status < 500) {
+        Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CUS).increment();
+      } else if (status > 499) {
+        Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
+      }
+      LOG.error("Error completing cursor request", e);
+      channel.sendResponse(new BytesRestResponse(channel, e));
+    }
+  }
 
-    private static final Logger LOG = LogManager.getLogger(CursorResultExecutor.class);
+  public String execute(Client client, Map<String, String> params) throws Exception {
+    /**
+     * All cursor's are of the form <cursorType>:<base64 encoded cursor> The serialized form before
+     * encoding is upto Cursor implementation
+     */
+    String[] splittedCursor = cursorId.split(":", 2);
 
-    public CursorResultExecutor(String cursorId, Format format) {
-        this.cursorId = cursorId;
-        this.format = format;
+    if (splittedCursor.length != 2) {
+      throw new VerificationException("Not able to parse invalid cursor");
     }
 
-    public void execute(Client client, Map<String, String> params, RestChannel channel) throws Exception {
-        try {
-            String formattedResponse = execute(client, params);
-            channel.sendResponse(new BytesRestResponse(OK, "application/json; charset=UTF-8", formattedResponse));
-        } catch (IllegalArgumentException | JSONException e) {
-            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CUS).increment();
-            LOG.error("Error parsing the cursor", e);
-            channel.sendResponse(new BytesRestResponse(channel, e));
-        } catch (OpenSearchException e) {
-            int status = (e.status().getStatus());
-            if (status > 399 && status < 500) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CUS).increment();
-            } else if (status > 499) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-            }
-            LOG.error("Error completing cursor request", e);
-            channel.sendResponse(new BytesRestResponse(channel, e));
-        }
+    String type = splittedCursor[0];
+    CursorType cursorType = CursorType.getById(type);
+
+    switch (cursorType) {
+      case DEFAULT:
+        DefaultCursor defaultCursor = DefaultCursor.from(splittedCursor[1]);
+        return handleDefaultCursorRequest(client, defaultCursor);
+      case AGGREGATION:
+      case JOIN:
+      default:
+        throw new VerificationException("Unsupported cursor type [" + type + "]");
     }
-
-    public String execute(Client client, Map<String, String> params) throws Exception {
-        /**
-         * All cursor's are of the form <cursorType>:<base64 encoded cursor>
-         * The serialized form before encoding is upto Cursor implementation
-         */
-        String[] splittedCursor = cursorId.split(":", 2);
-
-        if (splittedCursor.length!=2) {
-            throw new VerificationException("Not able to parse invalid cursor");
-        }
-
-        String type = splittedCursor[0];
-        CursorType cursorType = CursorType.getById(type);
-
-        switch(cursorType) {
-            case DEFAULT:
-                DefaultCursor defaultCursor = DefaultCursor.from(splittedCursor[1]);
-                return handleDefaultCursorRequest(client, defaultCursor);
-            case AGGREGATION:
-            case JOIN:
-            default: throw new VerificationException("Unsupported cursor type [" + type + "]");
-        }
+  }
+
+  private String handleDefaultCursorRequest(Client client, DefaultCursor cursor) {
+    String previousScrollId = cursor.getScrollId();
+    LocalClusterState clusterState = LocalClusterState.state();
+    TimeValue scrollTimeout = clusterState.getSettingValue(Settings.Key.SQL_CURSOR_KEEP_ALIVE);
+    SearchResponse scrollResponse =
+        client.prepareSearchScroll(previousScrollId).setScroll(scrollTimeout).get();
+    SearchHits searchHits = scrollResponse.getHits();
+    SearchHit[] searchHitArray = searchHits.getHits();
+    String newScrollId = scrollResponse.getScrollId();
+
+    int rowsLeft = (int) cursor.getRowsLeft();
+    int fetch = cursor.getFetchSize();
+
+    if (rowsLeft < fetch && rowsLeft < searchHitArray.length) {
+      /**
+       * This condition implies we are on the last page, and we might need to truncate the result
+       * from SearchHit[] Avoid truncating in following two scenarios 1. number of rows to be sent
+       * equals fetchSize 2. size of SearchHit[] is already less that rows that needs to be sent
+       *
+       * <p>Else truncate to desired number of rows
+       */
+      SearchHit[] newSearchHits = Arrays.copyOf(searchHitArray, rowsLeft);
+      searchHits =
+          new SearchHits(newSearchHits, searchHits.getTotalHits(), searchHits.getMaxScore());
     }
 
-    private String handleDefaultCursorRequest(Client client, DefaultCursor cursor) {
-        String previousScrollId = cursor.getScrollId();
-        LocalClusterState clusterState = LocalClusterState.state();
-        TimeValue scrollTimeout = clusterState.getSettingValue(Settings.Key.SQL_CURSOR_KEEP_ALIVE);
-        SearchResponse scrollResponse = client.prepareSearchScroll(previousScrollId).setScroll(scrollTimeout).get();
-        SearchHits searchHits = scrollResponse.getHits();
-        SearchHit[] searchHitArray = searchHits.getHits();
-        String newScrollId = scrollResponse.getScrollId();
-
-        int rowsLeft = (int) cursor.getRowsLeft();
-        int fetch = cursor.getFetchSize();
-
-        if (rowsLeft < fetch && rowsLeft < searchHitArray.length) {
-            /**
-             * This condition implies we are on the last page, and we might need to truncate the result from SearchHit[]
-             * Avoid truncating in following two scenarios
-             * 1. number of rows to be sent equals fetchSize
-             * 2. size of SearchHit[] is already less that rows that needs to be sent
-             *
-             * Else truncate to desired number of rows
-             */
-            SearchHit[] newSearchHits = Arrays.copyOf(searchHitArray, rowsLeft);
-            searchHits = new SearchHits(newSearchHits, searchHits.getTotalHits(), searchHits.getMaxScore());
-        }
-
-        rowsLeft = rowsLeft - fetch;
-
-        if (rowsLeft <=0) {
-            /** Clear the scroll context on last page */
-            ClearScrollResponse clearScrollResponse = client.prepareClearScroll().addScrollId(newScrollId).get();
-            if (!clearScrollResponse.isSucceeded()) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-                LOG.info("Error closing the cursor context {} ", newScrollId);
-            }
-        }
-
-        cursor.setRowsLeft(rowsLeft);
-        cursor.setScrollId(newScrollId);
-        Protocol protocol = new Protocol(client, searchHits, format.name().toLowerCase(), cursor);
-        return protocol.cursorFormat();
+    rowsLeft = rowsLeft - fetch;
+
+    if (rowsLeft <= 0) {
+      /** Clear the scroll context on last page */
+      ClearScrollResponse clearScrollResponse =
+          client.prepareClearScroll().addScrollId(newScrollId).get();
+      if (!clearScrollResponse.isSucceeded()) {
+        Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
+        LOG.info("Error closing the cursor context {} ", newScrollId);
+      }
     }
+
+    cursor.setRowsLeft(rowsLeft);
+    cursor.setScrollId(newScrollId);
+    Protocol protocol = new Protocol(client, searchHits, format.name().toLowerCase(), cursor);
+    return protocol.cursorFormat();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/BindingTupleResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/BindingTupleResultSet.java
index c3b5d2e84d..872442f04f 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/BindingTupleResultSet.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/BindingTupleResultSet.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import static org.opensearch.sql.legacy.executor.format.DateFieldFormatter.FORMAT_JDBC;
@@ -18,44 +17,44 @@
 import org.opensearch.sql.legacy.expression.model.ExprValue;
 import org.opensearch.sql.legacy.query.planner.core.ColumnNode;
 
-/**
- * The definition of BindingTuple ResultSet.
- */
+/** The definition of BindingTuple ResultSet. */
 public class BindingTupleResultSet extends ResultSet {
 
-    public BindingTupleResultSet(List<ColumnNode> columnNodes, List<BindingTuple> bindingTuples) {
-        this.schema = buildSchema(columnNodes);
-        this.dataRows = buildDataRows(columnNodes, bindingTuples);
-    }
-
-    @VisibleForTesting
-    public static Schema buildSchema(List<ColumnNode> columnNodes) {
-        List<Schema.Column> columnList = columnNodes.stream()
-                                                 .map(node -> new Schema.Column(
-                                                         node.getName(),
-                                                         node.getAlias(),
-                                                         node.getType()))
-                                                 .collect(Collectors.toList());
-        return new Schema(columnList);
-    }
-
-    @VisibleForTesting
-    public static DataRows buildDataRows(List<ColumnNode> columnNodes, List<BindingTuple> bindingTuples) {
-        List<DataRows.Row> rowList = bindingTuples.stream().map(tuple -> {
-            Map<String, ExprValue> bindingMap = tuple.getBindingMap();
-            Map<String, Object> rowMap = new HashMap<>();
-            for (ColumnNode column : columnNodes) {
-                String columnName = column.columnName();
-                Object value = bindingMap.get(columnName).value();
-                if (column.getType() == Schema.Type.DATE) {
-                    value = DateFormat.getFormattedDate(new Date((Long) value), FORMAT_JDBC);
-                }
-                rowMap.put(columnName, value);
-            }
-            return new DataRows.Row(rowMap);
-        }).collect(Collectors.toList());
-
-        return new DataRows(bindingTuples.size(), bindingTuples.size(), rowList);
-    }
+  public BindingTupleResultSet(List<ColumnNode> columnNodes, List<BindingTuple> bindingTuples) {
+    this.schema = buildSchema(columnNodes);
+    this.dataRows = buildDataRows(columnNodes, bindingTuples);
+  }
+
+  @VisibleForTesting
+  public static Schema buildSchema(List<ColumnNode> columnNodes) {
+    List<Schema.Column> columnList =
+        columnNodes.stream()
+            .map(node -> new Schema.Column(node.getName(), node.getAlias(), node.getType()))
+            .collect(Collectors.toList());
+    return new Schema(columnList);
+  }
+
+  @VisibleForTesting
+  public static DataRows buildDataRows(
+      List<ColumnNode> columnNodes, List<BindingTuple> bindingTuples) {
+    List<DataRows.Row> rowList =
+        bindingTuples.stream()
+            .map(
+                tuple -> {
+                  Map<String, ExprValue> bindingMap = tuple.getBindingMap();
+                  Map<String, Object> rowMap = new HashMap<>();
+                  for (ColumnNode column : columnNodes) {
+                    String columnName = column.columnName();
+                    Object value = bindingMap.get(columnName).value();
+                    if (column.getType() == Schema.Type.DATE) {
+                      value = DateFormat.getFormattedDate(new Date((Long) value), FORMAT_JDBC);
+                    }
+                    rowMap.put(columnName, value);
+                  }
+                  return new DataRows.Row(rowMap);
+                })
+            .collect(Collectors.toList());
+
+    return new DataRows(bindingTuples.size(), bindingTuples.size(), rowList);
+  }
 }
-
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DataRows.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DataRows.java
index 541d3200a5..fc153afae8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DataRows.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DataRows.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import java.util.Iterator;
@@ -12,76 +11,76 @@
 
 public class DataRows implements Iterable<DataRows.Row> {
 
-    private long size;
-    private long totalHits;
-    private List<Row> rows;
-
-    public DataRows(long size, long totalHits, List<Row> rows) {
-        this.size = size;
-        this.totalHits = totalHits;
-        this.rows = rows;
+  private long size;
+  private long totalHits;
+  private List<Row> rows;
+
+  public DataRows(long size, long totalHits, List<Row> rows) {
+    this.size = size;
+    this.totalHits = totalHits;
+    this.rows = rows;
+  }
+
+  public DataRows(List<Row> rows) {
+    this.size = rows.size();
+    this.totalHits = rows.size();
+    this.rows = rows;
+  }
+
+  public long getSize() {
+    return size;
+  }
+
+  public long getTotalHits() {
+    return totalHits;
+  }
+
+  // Iterator method for DataRows
+  @Override
+  public Iterator<Row> iterator() {
+    return new Iterator<Row>() {
+      private final Iterator<Row> iter = rows.iterator();
+
+      @Override
+      public boolean hasNext() {
+        return iter.hasNext();
+      }
+
+      @Override
+      public Row next() {
+        return iter.next();
+      }
+
+      @Override
+      public void remove() {
+        throw new UnsupportedOperationException("No changes allowed to DataRows rows");
+      }
+    };
+  }
+
+  // Inner class for Row object
+  public static class Row {
+
+    private Map<String, Object> data;
+
+    public Row(Map<String, Object> data) {
+      this.data = data;
     }
 
-    public DataRows(List<Row> rows) {
-        this.size = rows.size();
-        this.totalHits = rows.size();
-        this.rows = rows;
+    public Map<String, Object> getContents() {
+      return data;
     }
 
-    public long getSize() {
-        return size;
+    public boolean hasField(String field) {
+      return data.containsKey(field);
     }
 
-    public long getTotalHits() {
-        return totalHits;
+    public Object getData(String field) {
+      return data.get(field);
     }
 
-    // Iterator method for DataRows
-    @Override
-    public Iterator<Row> iterator() {
-        return new Iterator<Row>() {
-            private final Iterator<Row> iter = rows.iterator();
-
-            @Override
-            public boolean hasNext() {
-                return iter.hasNext();
-            }
-
-            @Override
-            public Row next() {
-                return iter.next();
-            }
-
-            @Override
-            public void remove() {
-                throw new UnsupportedOperationException("No changes allowed to DataRows rows");
-            }
-        };
-    }
-
-    // Inner class for Row object
-    public static class Row {
-
-        private Map<String, Object> data;
-
-        public Row(Map<String, Object> data) {
-            this.data = data;
-        }
-
-        public Map<String, Object> getContents() {
-            return data;
-        }
-
-        public boolean hasField(String field) {
-            return data.containsKey(field);
-        }
-
-        public Object getData(String field) {
-            return data.get(field);
-        }
-
-        public Object getDataOrDefault(String field, Object defaultValue) {
-            return data.getOrDefault(field, defaultValue);
-        }
+    public Object getDataOrDefault(String field, Object defaultValue) {
+      return data.getOrDefault(field, defaultValue);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DateFieldFormatter.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DateFieldFormatter.java
index aa803975df..dc239abd84 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DateFieldFormatter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DateFieldFormatter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -23,163 +22,169 @@
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
 import org.opensearch.sql.legacy.esdomain.mapping.FieldMappings;
 
-/**
- * Formatter to transform date fields into a consistent format for consumption by clients.
- */
+/** Formatter to transform date fields into a consistent format for consumption by clients. */
 public class DateFieldFormatter {
-    private static final Logger LOG = LogManager.getLogger(DateFieldFormatter.class);
-    public static final String FORMAT_JDBC = "yyyy-MM-dd HH:mm:ss.SSS";
-    private static final String FORMAT_DELIMITER = "\\|\\|";
-
-    private static final String FORMAT_DOT_DATE_AND_TIME = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
-    private static final String FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_LOGS_EXCEPTION = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-    private static final String FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_FLIGHTS_EXCEPTION = "yyyy-MM-dd'T'HH:mm:ss";
-    private static final String
-        FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_FLIGHTS_EXCEPTION_NO_TIME = "yyyy-MM-dd'T'";
-    private static final String FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_ECOMMERCE_EXCEPTION = "yyyy-MM-dd'T'HH:mm:ssXXX";
-    private static final String FORMAT_DOT_DATE = DateFormat.getFormatString("date");
-
-    private final Map<String, List<String>> dateFieldFormatMap;
-    private final Map<String, String> fieldAliasMap;
-    private Set<String> dateColumns;
-
-    public DateFieldFormatter(String indexName, List<Schema.Column> columns, Map<String, String> fieldAliasMap) {
-        this.dateFieldFormatMap = getDateFieldFormatMap(indexName);
-        this.dateColumns = getDateColumns(columns);
-        this.fieldAliasMap = fieldAliasMap;
+  private static final Logger LOG = LogManager.getLogger(DateFieldFormatter.class);
+  public static final String FORMAT_JDBC = "yyyy-MM-dd HH:mm:ss.SSS";
+  private static final String FORMAT_DELIMITER = "\\|\\|";
+
+  private static final String FORMAT_DOT_DATE_AND_TIME = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
+  private static final String FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_LOGS_EXCEPTION =
+      "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+  private static final String FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_FLIGHTS_EXCEPTION =
+      "yyyy-MM-dd'T'HH:mm:ss";
+  private static final String
+      FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_FLIGHTS_EXCEPTION_NO_TIME = "yyyy-MM-dd'T'";
+  private static final String FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_ECOMMERCE_EXCEPTION =
+      "yyyy-MM-dd'T'HH:mm:ssXXX";
+  private static final String FORMAT_DOT_DATE = DateFormat.getFormatString("date");
+
+  private final Map<String, List<String>> dateFieldFormatMap;
+  private final Map<String, String> fieldAliasMap;
+  private Set<String> dateColumns;
+
+  public DateFieldFormatter(
+      String indexName, List<Schema.Column> columns, Map<String, String> fieldAliasMap) {
+    this.dateFieldFormatMap = getDateFieldFormatMap(indexName);
+    this.dateColumns = getDateColumns(columns);
+    this.fieldAliasMap = fieldAliasMap;
+  }
+
+  @VisibleForTesting
+  protected DateFieldFormatter(
+      Map<String, List<String>> dateFieldFormatMap,
+      List<Schema.Column> columns,
+      Map<String, String> fieldAliasMap) {
+    this.dateFieldFormatMap = dateFieldFormatMap;
+    this.dateColumns = getDateColumns(columns);
+    this.fieldAliasMap = fieldAliasMap;
+  }
+
+  /**
+   * Apply the JDBC date format ({@code yyyy-MM-dd HH:mm:ss.SSS}) to date values in the current row.
+   *
+   * @param rowSource The row in which to format the date values.
+   */
+  public void applyJDBCDateFormat(Map<String, Object> rowSource) {
+    for (String columnName : dateColumns) {
+      Object columnOriginalDate = rowSource.get(columnName);
+      if (columnOriginalDate == null) {
+        // Don't try to parse null date values
+        continue;
+      }
+
+      List<String> formats = getFormatsForColumn(columnName);
+      if (formats == null) {
+        LOG.warn(
+            "Could not determine date formats for column {}; returning original value", columnName);
+        continue;
+      }
+
+      Date date = parseDateString(formats, columnOriginalDate.toString());
+      if (date != null) {
+        rowSource.put(columnName, DateFormat.getFormattedDate(date, FORMAT_JDBC));
+        break;
+      } else {
+        LOG.warn("Could not parse date value; returning original value");
+      }
     }
-
-    @VisibleForTesting
-    protected DateFieldFormatter(Map<String, List<String>> dateFieldFormatMap,
-                                 List<Schema.Column> columns,
-                                 Map<String, String> fieldAliasMap) {
-        this.dateFieldFormatMap = dateFieldFormatMap;
-        this.dateColumns = getDateColumns(columns);
-        this.fieldAliasMap = fieldAliasMap;
+  }
+
+  private List<String> getFormatsForColumn(String columnName) {
+    // Handle special cases for column names
+    if (fieldAliasMap.get(columnName) != null) {
+      // Column was aliased, and we need to find the base name for the column
+      columnName = fieldAliasMap.get(columnName);
+    } else if (columnName.split("\\.").length == 2) {
+      // Column is part of a join, and is qualified by the table alias
+      columnName = columnName.split("\\.")[1];
     }
-
-    /**
-     * Apply the JDBC date format ({@code yyyy-MM-dd HH:mm:ss.SSS}) to date values in the current row.
-     *
-     * @param rowSource The row in which to format the date values.
-     */
-    public void applyJDBCDateFormat(Map<String, Object> rowSource) {
-        for (String columnName : dateColumns) {
-            Object columnOriginalDate = rowSource.get(columnName);
-            if (columnOriginalDate == null) {
-                // Don't try to parse null date values
-                continue;
-            }
-
-            List<String> formats = getFormatsForColumn(columnName);
-            if (formats == null) {
-                LOG.warn("Could not determine date formats for column {}; returning original value", columnName);
-                continue;
-            }
-
-            Date date = parseDateString(formats, columnOriginalDate.toString());
-            if (date != null) {
-                rowSource.put(columnName, DateFormat.getFormattedDate(date, FORMAT_JDBC));
-                break;
-            } else {
-                LOG.warn("Could not parse date value; returning original value");
-            }
+    return dateFieldFormatMap.get(columnName);
+  }
+
+  private Set<String> getDateColumns(List<Schema.Column> columns) {
+    return columns.stream()
+        .filter(column -> column.getType().equals(Schema.Type.DATE.nameLowerCase()))
+        .map(Schema.Column::getName)
+        .collect(Collectors.toSet());
+  }
+
+  private Map<String, List<String>> getDateFieldFormatMap(String indexName) {
+    LocalClusterState state = LocalClusterState.state();
+    Map<String, List<String>> formatMap = new HashMap<>();
+
+    String[] indices = indexName.split("\\|");
+    Collection<FieldMappings> typeProperties = state.getFieldMappings(indices).allMappings();
+
+    for (FieldMappings fieldMappings : typeProperties) {
+      for (Map.Entry<String, Map<String, Object>> field : fieldMappings.data().entrySet()) {
+        String fieldName = field.getKey();
+        Map<String, Object> properties = field.getValue();
+
+        if (properties.containsKey("format")) {
+          formatMap.put(fieldName, getFormatsFromProperties(properties.get("format").toString()));
+        } else {
+          // Give all field types a format, since operations such as casts
+          // can change the output type for a field to `date`.
+          formatMap.put(fieldName, getFormatsFromProperties("date_optional_time"));
         }
+      }
     }
 
-    private List<String> getFormatsForColumn(String columnName) {
-        // Handle special cases for column names
-        if (fieldAliasMap.get(columnName) != null) {
-            // Column was aliased, and we need to find the base name for the column
-            columnName = fieldAliasMap.get(columnName);
-        } else if (columnName.split("\\.").length == 2) {
-            // Column is part of a join, and is qualified by the table alias
-            columnName = columnName.split("\\.")[1];
-        }
-        return dateFieldFormatMap.get(columnName);
-    }
-
-    private Set<String> getDateColumns(List<Schema.Column> columns) {
-        return columns.stream()
-            .filter(column -> column.getType().equals(Schema.Type.DATE.nameLowerCase()))
-            .map(Schema.Column::getName)
-            .collect(Collectors.toSet());
-    }
-
-    private Map<String, List<String>> getDateFieldFormatMap(String indexName) {
-        LocalClusterState state = LocalClusterState.state();
-        Map<String, List<String>> formatMap = new HashMap<>();
-
-        String[] indices = indexName.split("\\|");
-        Collection<FieldMappings> typeProperties = state.getFieldMappings(indices)
-            .allMappings();
-
-        for (FieldMappings fieldMappings: typeProperties) {
-            for (Map.Entry<String, Map<String, Object>> field : fieldMappings.data().entrySet()) {
-                String fieldName = field.getKey();
-                Map<String, Object> properties = field.getValue();
-
-                if (properties.containsKey("format")) {
-                    formatMap.put(fieldName, getFormatsFromProperties(properties.get("format").toString()));
-                } else {
-                    // Give all field types a format, since operations such as casts
-                    // can change the output type for a field to `date`.
-                    formatMap.put(fieldName, getFormatsFromProperties("date_optional_time"));
-                }
+    return formatMap;
+  }
+
+  private List<String> getFormatsFromProperties(String formatProperty) {
+    String[] formats = formatProperty.split(FORMAT_DELIMITER);
+    return Arrays.asList(formats);
+  }
+
+  private Date parseDateString(List<String> formats, String columnOriginalDate) {
+    TimeZone originalDefaultTimeZone = TimeZone.getDefault();
+    Date parsedDate = null;
+
+    // Apache Commons DateUtils uses the default TimeZone for the JVM when parsing.
+    // However, since all dates on OpenSearch are stored as UTC, we need to
+    // parse these values using the UTC timezone.
+    TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    for (String columnFormat : formats) {
+      try {
+        switch (columnFormat) {
+          case "date_optional_time":
+          case "strict_date_optional_time":
+            parsedDate =
+                DateUtils.parseDate(
+                    columnOriginalDate,
+                    FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_LOGS_EXCEPTION,
+                    FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_FLIGHTS_EXCEPTION,
+                    FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_FLIGHTS_EXCEPTION_NO_TIME,
+                    FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_ECOMMERCE_EXCEPTION,
+                    FORMAT_DOT_DATE_AND_TIME,
+                    FORMAT_DOT_DATE);
+            break;
+          case "epoch_millis":
+            parsedDate = new Date(Long.parseLong(columnOriginalDate));
+            break;
+          case "epoch_second":
+            parsedDate = new Date(Long.parseLong(columnOriginalDate) * 1000);
+            break;
+          default:
+            String formatString = DateFormat.getFormatString(columnFormat);
+            if (formatString == null) {
+              // Custom format; take as-is
+              formatString = columnFormat;
             }
+            parsedDate = DateUtils.parseDate(columnOriginalDate, formatString);
         }
-
-        return formatMap;
-    }
-
-    private List<String> getFormatsFromProperties(String formatProperty) {
-        String[] formats = formatProperty.split(FORMAT_DELIMITER);
-        return Arrays.asList(formats);
+      } catch (ParseException | NumberFormatException e) {
+        LOG.warn(
+            String.format(
+                "Could not parse date string %s as %s", columnOriginalDate, columnFormat));
+      }
     }
+    // Reset default timezone after parsing
+    TimeZone.setDefault(originalDefaultTimeZone);
 
-    private Date parseDateString(List<String> formats, String columnOriginalDate) {
-        TimeZone originalDefaultTimeZone = TimeZone.getDefault();
-        Date parsedDate = null;
-
-        // Apache Commons DateUtils uses the default TimeZone for the JVM when parsing.
-        // However, since all dates on OpenSearch are stored as UTC, we need to
-        // parse these values using the UTC timezone.
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-        for (String columnFormat : formats) {
-            try {
-                switch (columnFormat) {
-                    case "date_optional_time":
-                    case "strict_date_optional_time":
-                        parsedDate = DateUtils.parseDate(
-                            columnOriginalDate,
-                            FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_LOGS_EXCEPTION,
-                            FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_FLIGHTS_EXCEPTION,
-                            FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_FLIGHTS_EXCEPTION_NO_TIME,
-                            FORMAT_DOT_OPENSEARCH_DASHBOARDS_SAMPLE_DATA_ECOMMERCE_EXCEPTION,
-                            FORMAT_DOT_DATE_AND_TIME,
-                            FORMAT_DOT_DATE);
-                        break;
-                    case "epoch_millis":
-                        parsedDate = new Date(Long.parseLong(columnOriginalDate));
-                        break;
-                    case "epoch_second":
-                        parsedDate = new Date(Long.parseLong(columnOriginalDate) * 1000);
-                        break;
-                    default:
-                        String formatString = DateFormat.getFormatString(columnFormat);
-                        if (formatString == null) {
-                            // Custom format; take as-is
-                            formatString = columnFormat;
-                        }
-                        parsedDate = DateUtils.parseDate(columnOriginalDate, formatString);
-                }
-            } catch (ParseException | NumberFormatException e) {
-                LOG.warn(String.format("Could not parse date string %s as %s", columnOriginalDate, columnFormat));
-            }
-        }
-        // Reset default timezone after parsing
-        TimeZone.setDefault(originalDefaultTimeZone);
-
-        return parsedDate;
-    }
+    return parsedDate;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DateFormat.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DateFormat.java
index 40151c9413..fc9237918c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DateFormat.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DateFormat.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import java.time.Instant;
@@ -15,112 +14,121 @@
 
 public class DateFormat {
 
-    private static Map<String, String> formatMap = new HashMap<>();
-
-    static {
-        // Special cases that are parsed separately
-        formatMap.put("date_optional_time", "");
-        formatMap.put("strict_date_optional_time", "");
-        formatMap.put("epoch_millis", "");
-        formatMap.put("epoch_second", "");
-
-        formatMap.put("basic_date", Date.BASIC_DATE);
-        formatMap.put("basic_date_time", Date.BASIC_DATE + Time.T + Time.BASIC_TIME + Time.MILLIS + Time.TZ);
-        formatMap.put("basic_date_time_no_millis", Date.BASIC_DATE + Time.T + Time.BASIC_TIME + Time.TZ);
-
-        formatMap.put("basic_ordinal_date", Date.BASIC_ORDINAL_DATE);
-        formatMap.put("basic_ordinal_date_time",
-                      Date.BASIC_ORDINAL_DATE + Time.T + Time.BASIC_TIME + Time.MILLIS + Time.TZ);
-        formatMap.put("basic_ordinal_date_time_no_millis", Date.BASIC_ORDINAL_DATE+ Time.T + Time.BASIC_TIME + Time.TZ);
-
-        formatMap.put("basic_time", Time.BASIC_TIME + Time.MILLIS + Time.TZ);
-        formatMap.put("basic_time_no_millis", Time.BASIC_TIME + Time.TZ);
-
-        formatMap.put("basic_t_time", Time.T + Time.BASIC_TIME + Time.MILLIS + Time.TZ);
-        formatMap.put("basic_t_time_no_millis", Time.T + Time.BASIC_TIME + Time.TZ);
-
-        formatMap.put("basic_week_date", Date.BASIC_WEEK_DATE);
-        formatMap.put("basic_week_date_time", Date.BASIC_WEEK_DATE + Time.T + Time.BASIC_TIME + Time.MILLIS + Time.TZ);
-        formatMap.put("basic_week_date_time_no_millis", Date.BASIC_WEEK_DATE + Time.T + Time.BASIC_TIME + Time.TZ);
-
-        formatMap.put("date", Date.DATE);
-        formatMap.put("date_hour", Date.DATE + Time.T + Time.HOUR);
-        formatMap.put("date_hour_minute", Date.DATE + Time.T + Time.HOUR_MINUTE);
-        formatMap.put("date_hour_minute_second", Date.DATE + Time.T + Time.TIME);
-        formatMap.put("date_hour_minute_second_fraction", Date.DATE + Time.T + Time.TIME + Time.MILLIS);
-        formatMap.put("date_hour_minute_second_millis", Date.DATE + Time.T + Time.TIME + Time.MILLIS);
-        formatMap.put("date_time", Date.DATE + Time.T + Time.TIME + Time.MILLIS + Time.TZZ);
-        formatMap.put("date_time_no_millis", Date.DATE + Time.T + Time.TIME + Time.TZZ);
-
-        formatMap.put("hour", Time.HOUR);
-        formatMap.put("hour_minute", Time.HOUR_MINUTE);
-        formatMap.put("hour_minute_second", Time.TIME);
-        formatMap.put("hour_minute_second_fraction", Time.TIME + Time.MILLIS);
-        formatMap.put("hour_minute_second_millis", Time.TIME + Time.MILLIS);
-
-        formatMap.put("ordinal_date", Date.ORDINAL_DATE);
-        formatMap.put("ordinal_date_time", Date.ORDINAL_DATE + Time.T + Time.TIME + Time.MILLIS + Time.TZZ);
-        formatMap.put("ordinal_date_time_no_millis", Date.ORDINAL_DATE + Time.T + Time.TIME + Time.TZZ);
-
-        formatMap.put("time", Time.TIME + Time.MILLIS + Time.TZZ);
-        formatMap.put("time_no_millis", Time.TIME + Time.TZZ);
-
-        formatMap.put("t_time", Time.T + Time.TIME + Time.MILLIS + Time.TZZ);
-        formatMap.put("t_time_no_millis", Time.T + Time.TIME + Time.TZZ);
-
-        formatMap.put("week_date", Date.WEEK_DATE);
-        formatMap.put("week_date_time", Date.WEEK_DATE + Time.T + Time.TIME + Time.MILLIS + Time.TZZ);
-        formatMap.put("week_date_time_no_millis", Date.WEEK_DATE + Time.T + Time.TIME + Time.TZZ);
-
-        // Note: input mapping is "weekyear", but output value is "week_year"
-        formatMap.put("week_year", Date.WEEKYEAR);
-        formatMap.put("weekyear_week", Date.WEEKYEAR_WEEK);
-        formatMap.put("weekyear_week_day", Date.WEEK_DATE);
-
-        formatMap.put("year", Date.YEAR);
-        formatMap.put("year_month", Date.YEAR_MONTH);
-        formatMap.put("year_month_day", Date.DATE);
-    }
-
-    private DateFormat() {
-    }
-
-    public static String getFormatString(String formatName) {
-        return formatMap.get(formatName);
-    }
-
-    public static String getFormattedDate(java.util.Date date, String dateFormat) {
-        Instant instant = date.toInstant();
-        ZonedDateTime zdt = ZonedDateTime.ofInstant(instant, ZoneId.of("Etc/UTC"));
-        return zdt.format(DateTimeFormatter.ofPattern(dateFormat));
-    }
-
-    private static class Date {
-        static String BASIC_DATE = "yyyyMMdd";
-        static String BASIC_ORDINAL_DATE = "yyyyDDD";
-        static String BASIC_WEEK_DATE = "YYYY'W'wwu";
-
-        static String DATE = "yyyy-MM-dd";
-        static String ORDINAL_DATE = "yyyy-DDD";
-
-        static String YEAR = "yyyy";
-        static String YEAR_MONTH = "yyyy-MM";
-
-        static String WEEK_DATE = "YYYY-'W'ww-u";
-        static String WEEKYEAR = "YYYY";
-        static String WEEKYEAR_WEEK = "YYYY-'W'ww";
-    }
-
-    private static class Time {
-        static String T = "'T'";
-        static String BASIC_TIME = "HHmmss";
-        static String TIME = "HH:mm:ss";
-
-        static String HOUR = "HH";
-        static String HOUR_MINUTE = "HH:mm";
-
-        static String MILLIS = ".SSS";
-        static String TZ = "Z";
-        static String TZZ = "XX";
-    }
+  private static Map<String, String> formatMap = new HashMap<>();
+
+  static {
+    // Special cases that are parsed separately
+    formatMap.put("date_optional_time", "");
+    formatMap.put("strict_date_optional_time", "");
+    formatMap.put("epoch_millis", "");
+    formatMap.put("epoch_second", "");
+
+    formatMap.put("basic_date", Date.BASIC_DATE);
+    formatMap.put(
+        "basic_date_time", Date.BASIC_DATE + Time.T + Time.BASIC_TIME + Time.MILLIS + Time.TZ);
+    formatMap.put(
+        "basic_date_time_no_millis", Date.BASIC_DATE + Time.T + Time.BASIC_TIME + Time.TZ);
+
+    formatMap.put("basic_ordinal_date", Date.BASIC_ORDINAL_DATE);
+    formatMap.put(
+        "basic_ordinal_date_time",
+        Date.BASIC_ORDINAL_DATE + Time.T + Time.BASIC_TIME + Time.MILLIS + Time.TZ);
+    formatMap.put(
+        "basic_ordinal_date_time_no_millis",
+        Date.BASIC_ORDINAL_DATE + Time.T + Time.BASIC_TIME + Time.TZ);
+
+    formatMap.put("basic_time", Time.BASIC_TIME + Time.MILLIS + Time.TZ);
+    formatMap.put("basic_time_no_millis", Time.BASIC_TIME + Time.TZ);
+
+    formatMap.put("basic_t_time", Time.T + Time.BASIC_TIME + Time.MILLIS + Time.TZ);
+    formatMap.put("basic_t_time_no_millis", Time.T + Time.BASIC_TIME + Time.TZ);
+
+    formatMap.put("basic_week_date", Date.BASIC_WEEK_DATE);
+    formatMap.put(
+        "basic_week_date_time",
+        Date.BASIC_WEEK_DATE + Time.T + Time.BASIC_TIME + Time.MILLIS + Time.TZ);
+    formatMap.put(
+        "basic_week_date_time_no_millis",
+        Date.BASIC_WEEK_DATE + Time.T + Time.BASIC_TIME + Time.TZ);
+
+    formatMap.put("date", Date.DATE);
+    formatMap.put("date_hour", Date.DATE + Time.T + Time.HOUR);
+    formatMap.put("date_hour_minute", Date.DATE + Time.T + Time.HOUR_MINUTE);
+    formatMap.put("date_hour_minute_second", Date.DATE + Time.T + Time.TIME);
+    formatMap.put("date_hour_minute_second_fraction", Date.DATE + Time.T + Time.TIME + Time.MILLIS);
+    formatMap.put("date_hour_minute_second_millis", Date.DATE + Time.T + Time.TIME + Time.MILLIS);
+    formatMap.put("date_time", Date.DATE + Time.T + Time.TIME + Time.MILLIS + Time.TZZ);
+    formatMap.put("date_time_no_millis", Date.DATE + Time.T + Time.TIME + Time.TZZ);
+
+    formatMap.put("hour", Time.HOUR);
+    formatMap.put("hour_minute", Time.HOUR_MINUTE);
+    formatMap.put("hour_minute_second", Time.TIME);
+    formatMap.put("hour_minute_second_fraction", Time.TIME + Time.MILLIS);
+    formatMap.put("hour_minute_second_millis", Time.TIME + Time.MILLIS);
+
+    formatMap.put("ordinal_date", Date.ORDINAL_DATE);
+    formatMap.put(
+        "ordinal_date_time", Date.ORDINAL_DATE + Time.T + Time.TIME + Time.MILLIS + Time.TZZ);
+    formatMap.put("ordinal_date_time_no_millis", Date.ORDINAL_DATE + Time.T + Time.TIME + Time.TZZ);
+
+    formatMap.put("time", Time.TIME + Time.MILLIS + Time.TZZ);
+    formatMap.put("time_no_millis", Time.TIME + Time.TZZ);
+
+    formatMap.put("t_time", Time.T + Time.TIME + Time.MILLIS + Time.TZZ);
+    formatMap.put("t_time_no_millis", Time.T + Time.TIME + Time.TZZ);
+
+    formatMap.put("week_date", Date.WEEK_DATE);
+    formatMap.put("week_date_time", Date.WEEK_DATE + Time.T + Time.TIME + Time.MILLIS + Time.TZZ);
+    formatMap.put("week_date_time_no_millis", Date.WEEK_DATE + Time.T + Time.TIME + Time.TZZ);
+
+    // Note: input mapping is "weekyear", but output value is "week_year"
+    formatMap.put("week_year", Date.WEEKYEAR);
+    formatMap.put("weekyear_week", Date.WEEKYEAR_WEEK);
+    formatMap.put("weekyear_week_day", Date.WEEK_DATE);
+
+    formatMap.put("year", Date.YEAR);
+    formatMap.put("year_month", Date.YEAR_MONTH);
+    formatMap.put("year_month_day", Date.DATE);
+  }
+
+  private DateFormat() {}
+
+  public static String getFormatString(String formatName) {
+    return formatMap.get(formatName);
+  }
+
+  public static String getFormattedDate(java.util.Date date, String dateFormat) {
+    Instant instant = date.toInstant();
+    ZonedDateTime zdt = ZonedDateTime.ofInstant(instant, ZoneId.of("Etc/UTC"));
+    return zdt.format(DateTimeFormatter.ofPattern(dateFormat));
+  }
+
+  private static class Date {
+    static String BASIC_DATE = "yyyyMMdd";
+    static String BASIC_ORDINAL_DATE = "yyyyDDD";
+    static String BASIC_WEEK_DATE = "YYYY'W'wwu";
+
+    static String DATE = "yyyy-MM-dd";
+    static String ORDINAL_DATE = "yyyy-DDD";
+
+    static String YEAR = "yyyy";
+    static String YEAR_MONTH = "yyyy-MM";
+
+    static String WEEK_DATE = "YYYY-'W'ww-u";
+    static String WEEKYEAR = "YYYY";
+    static String WEEKYEAR_WEEK = "YYYY-'W'ww";
+  }
+
+  private static class Time {
+    static String T = "'T'";
+    static String BASIC_TIME = "HHmmss";
+    static String TIME = "HH:mm:ss";
+
+    static String HOUR = "HH";
+    static String HOUR_MINUTE = "HH:mm";
+
+    static String MILLIS = ".SSS";
+    static String TZ = "Z";
+    static String TZZ = "XX";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DeleteResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DeleteResultSet.java
index ccecacc432..24afb0a7af 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DeleteResultSet.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DeleteResultSet.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import java.util.Collections;
@@ -14,28 +13,28 @@
 import org.opensearch.sql.legacy.domain.Delete;
 
 public class DeleteResultSet extends ResultSet {
-    private Delete query;
-    private Object queryResult;
-
-    public static final String DELETED = "deleted_rows";
-
-    public DeleteResultSet(Client client, Delete query, Object queryResult) {
-        this.client = client;
-        this.query = query;
-        this.queryResult = queryResult;
-        this.schema = new Schema(loadColumns());
-        this.dataRows = new DataRows(loadRows());
-    }
-
-    private List<Schema.Column> loadColumns() {
-        return Collections.singletonList(new Schema.Column(DELETED, null, Schema.Type.LONG));
-    }
-
-    private List<DataRows.Row> loadRows() {
-        return Collections.singletonList(new DataRows.Row(loadDeletedData()));
-    }
-
-    private Map<String, Object> loadDeletedData(){
-        return Collections.singletonMap(DELETED, ((BulkByScrollResponse) queryResult).getDeleted());
-    }
+  private Delete query;
+  private Object queryResult;
+
+  public static final String DELETED = "deleted_rows";
+
+  public DeleteResultSet(Client client, Delete query, Object queryResult) {
+    this.client = client;
+    this.query = query;
+    this.queryResult = queryResult;
+    this.schema = new Schema(loadColumns());
+    this.dataRows = new DataRows(loadRows());
+  }
+
+  private List<Schema.Column> loadColumns() {
+    return Collections.singletonList(new Schema.Column(DELETED, null, Schema.Type.LONG));
+  }
+
+  private List<DataRows.Row> loadRows() {
+    return Collections.singletonList(new DataRows.Row(loadDeletedData()));
+  }
+
+  private Map<String, Object> loadDeletedData() {
+    return Collections.singletonMap(DELETED, ((BulkByScrollResponse) queryResult).getDeleted());
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DescribeResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DescribeResultSet.java
index 7d09aa5996..eba6db2453 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DescribeResultSet.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DescribeResultSet.java
@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
-import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -15,7 +13,6 @@
 import org.opensearch.action.admin.indices.get.GetIndexResponse;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.MappingMetadata;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.sql.legacy.domain.IndexStatement;
 import org.opensearch.sql.legacy.executor.format.DataRows.Row;
 import org.opensearch.sql.legacy.executor.format.Schema.Column;
@@ -23,145 +20,142 @@
 
 public class DescribeResultSet extends ResultSet {
 
-    private static final int DEFAULT_NUM_PREC_RADIX = 10;
-    private static final String IS_AUTOINCREMENT = "NO";
-
-    /**
-     * You are not required to set the field type to object explicitly, as this is the default value.
-     * https://www.elastic.co/guide/en/elasticsearch/reference/current/object.html
-     */
-    public static final String DEFAULT_OBJECT_DATATYPE = "object";
-
-    private IndexStatement statement;
-    private Object queryResult;
-
-    public DescribeResultSet(Client client, IndexStatement statement, Object queryResult) {
-        this.client = client;
-        this.clusterName = getClusterName();
-        this.statement = statement;
-        this.queryResult = queryResult;
-
-        this.schema = new Schema(statement, loadColumns());
-        this.dataRows = new DataRows(loadRows());
+  private static final int DEFAULT_NUM_PREC_RADIX = 10;
+  private static final String IS_AUTOINCREMENT = "NO";
+
+  /**
+   * You are not required to set the field type to object explicitly, as this is the default value.
+   * https://www.elastic.co/guide/en/elasticsearch/reference/current/object.html
+   */
+  public static final String DEFAULT_OBJECT_DATATYPE = "object";
+
+  private IndexStatement statement;
+  private Object queryResult;
+
+  public DescribeResultSet(Client client, IndexStatement statement, Object queryResult) {
+    this.client = client;
+    this.clusterName = getClusterName();
+    this.statement = statement;
+    this.queryResult = queryResult;
+
+    this.schema = new Schema(statement, loadColumns());
+    this.dataRows = new DataRows(loadRows());
+  }
+
+  private List<Column> loadColumns() {
+    List<Column> columns = new ArrayList<>();
+    // Unused Columns are still included in Schema to match JDBC/ODBC standard
+    columns.add(new Column("TABLE_CAT", null, Type.KEYWORD));
+    columns.add(new Column("TABLE_SCHEM", null, Type.KEYWORD));
+    columns.add(new Column("TABLE_NAME", null, Type.KEYWORD));
+    columns.add(new Column("COLUMN_NAME", null, Type.KEYWORD));
+    columns.add(new Column("DATA_TYPE", null, Type.INTEGER));
+    columns.add(new Column("TYPE_NAME", null, Type.KEYWORD));
+    columns.add(new Column("COLUMN_SIZE", null, Type.INTEGER));
+    columns.add(new Column("BUFFER_LENGTH", null, Type.INTEGER)); // Not used
+    columns.add(new Column("DECIMAL_DIGITS", null, Type.INTEGER));
+    columns.add(new Column("NUM_PREC_RADIX", null, Type.INTEGER));
+    columns.add(new Column("NULLABLE", null, Type.INTEGER));
+    columns.add(new Column("REMARKS", null, Type.KEYWORD));
+    columns.add(new Column("COLUMN_DEF", null, Type.KEYWORD));
+    columns.add(new Column("SQL_DATA_TYPE", null, Type.INTEGER)); // Not used
+    columns.add(new Column("SQL_DATETIME_SUB", null, Type.INTEGER)); // Not used
+    columns.add(new Column("CHAR_OCTET_LENGTH", null, Type.INTEGER));
+    columns.add(new Column("ORDINAL_POSITION", null, Type.INTEGER));
+    columns.add(new Column("IS_NULLABLE", null, Type.KEYWORD));
+    columns.add(new Column("SCOPE_CATALOG", null, Type.KEYWORD)); // Not used
+    columns.add(new Column("SCOPE_SCHEMA", null, Type.KEYWORD)); // Not used
+    columns.add(new Column("SCOPE_TABLE", null, Type.KEYWORD)); // Not used
+    columns.add(new Column("SOURCE_DATA_TYPE", null, Type.SHORT)); // Not used
+    columns.add(new Column("IS_AUTOINCREMENT", null, Type.KEYWORD));
+    columns.add(new Column("IS_GENERATEDCOLUMN", null, Type.KEYWORD));
+
+    return columns;
+  }
+
+  private List<Row> loadRows() {
+    List<Row> rows = new ArrayList<>();
+    GetIndexResponse indexResponse = (GetIndexResponse) queryResult;
+    Map<String, MappingMetadata> indexMappings = indexResponse.getMappings();
+
+    // Iterate through indices in indexMappings
+    for (Entry<String, MappingMetadata> indexCursor : indexMappings.entrySet()) {
+      String index = indexCursor.getKey();
+
+      if (matchesPatternIfRegex(index, statement.getIndexPattern())) {
+        rows.addAll(loadIndexData(index, indexCursor.getValue().getSourceAsMap()));
+      }
     }
-
-    private List<Column> loadColumns() {
-        List<Column> columns = new ArrayList<>();
-        // Unused Columns are still included in Schema to match JDBC/ODBC standard
-        columns.add(new Column("TABLE_CAT", null, Type.KEYWORD));
-        columns.add(new Column("TABLE_SCHEM", null, Type.KEYWORD));
-        columns.add(new Column("TABLE_NAME", null, Type.KEYWORD));
-        columns.add(new Column("COLUMN_NAME", null, Type.KEYWORD));
-        columns.add(new Column("DATA_TYPE", null, Type.INTEGER));
-        columns.add(new Column("TYPE_NAME", null, Type.KEYWORD));
-        columns.add(new Column("COLUMN_SIZE", null, Type.INTEGER));
-        columns.add(new Column("BUFFER_LENGTH", null, Type.INTEGER)); // Not used
-        columns.add(new Column("DECIMAL_DIGITS", null, Type.INTEGER));
-        columns.add(new Column("NUM_PREC_RADIX", null, Type.INTEGER));
-        columns.add(new Column("NULLABLE", null, Type.INTEGER));
-        columns.add(new Column("REMARKS", null, Type.KEYWORD));
-        columns.add(new Column("COLUMN_DEF", null, Type.KEYWORD));
-        columns.add(new Column("SQL_DATA_TYPE", null, Type.INTEGER)); // Not used
-        columns.add(new Column("SQL_DATETIME_SUB", null, Type.INTEGER)); // Not used
-        columns.add(new Column("CHAR_OCTET_LENGTH", null, Type.INTEGER));
-        columns.add(new Column("ORDINAL_POSITION", null, Type.INTEGER));
-        columns.add(new Column("IS_NULLABLE", null, Type.KEYWORD));
-        columns.add(new Column("SCOPE_CATALOG", null, Type.KEYWORD)); // Not used
-        columns.add(new Column("SCOPE_SCHEMA", null, Type.KEYWORD)); // Not used
-        columns.add(new Column("SCOPE_TABLE", null, Type.KEYWORD)); // Not used
-        columns.add(new Column("SOURCE_DATA_TYPE", null, Type.SHORT)); // Not used
-        columns.add(new Column("IS_AUTOINCREMENT", null, Type.KEYWORD));
-        columns.add(new Column("IS_GENERATEDCOLUMN", null, Type.KEYWORD));
-
-        return columns;
+    return rows;
+  }
+
+  @SuppressWarnings("unchecked")
+  private List<Row> loadIndexData(String index, Map<String, Object> mappingMetadata) {
+    List<Row> rows = new ArrayList<>();
+
+    Map<String, String> flattenedMetaData =
+        flattenMappingMetaData(mappingMetadata, "", new HashMap<>());
+    int position = 1; // Used as an arbitrary ORDINAL_POSITION value for the time being
+    for (Entry<String, String> entry : flattenedMetaData.entrySet()) {
+      String columnPattern = statement.getColumnPattern();
+
+      // Check to see if column name matches pattern, if given
+      if (columnPattern == null || matchesPattern(entry.getKey(), columnPattern)) {
+        rows.add(new Row(loadRowData(index, entry.getKey(), entry.getValue(), position)));
+        position++;
+      }
     }
 
-    private List<Row> loadRows() {
-        List<Row> rows = new ArrayList<>();
-        GetIndexResponse indexResponse = (GetIndexResponse) queryResult;
-        ImmutableOpenMap<String, MappingMetadata> indexMappings = indexResponse.getMappings();
-
-        // Iterate through indices in indexMappings
-        for (ObjectObjectCursor<String, MappingMetadata> indexCursor : indexMappings) {
-            String index = indexCursor.key;
-
-            if (matchesPatternIfRegex(index, statement.getIndexPattern())) {
-                rows.addAll(loadIndexData(index, indexCursor.value.getSourceAsMap()));
-            }
-        }
-        return rows;
-    }
-
-    @SuppressWarnings("unchecked")
-    private List<Row> loadIndexData(String index, Map<String, Object> mappingMetadata) {
-        List<Row> rows = new ArrayList<>();
-
-        Map<String, String> flattenedMetaData = flattenMappingMetaData(mappingMetadata, "", new HashMap<>());
-        int position = 1; // Used as an arbitrary ORDINAL_POSITION value for the time being
-        for (Entry<String, String> entry : flattenedMetaData.entrySet()) {
-            String columnPattern = statement.getColumnPattern();
-
-            // Check to see if column name matches pattern, if given
-            if (columnPattern == null || matchesPattern(entry.getKey(), columnPattern)) {
-                rows.add(
-                        new Row(
-                                loadRowData(index, entry.getKey(), entry.getValue(), position)
-                        )
-                );
-                position++;
-            }
-        }
-
-        return rows;
+    return rows;
+  }
+
+  private Map<String, Object> loadRowData(String index, String column, String type, int position) {
+    Map<String, Object> data = new HashMap<>();
+    data.put("TABLE_CAT", clusterName);
+    data.put("TABLE_NAME", index);
+    data.put("COLUMN_NAME", column);
+    data.put("TYPE_NAME", type);
+    data.put("NUM_PREC_RADIX", DEFAULT_NUM_PREC_RADIX);
+    data.put("NULLABLE", 2); // TODO Defaulting to 2, need to find a way to check this
+    data.put("ORDINAL_POSITION", position); // There is no deterministic position of column in table
+    data.put("IS_NULLABLE", ""); // TODO Defaulting to unknown, need to check this
+    data.put("IS_AUTOINCREMENT", IS_AUTOINCREMENT); // Defaulting to "NO"
+    data.put("IS_GENERATEDCOLUMN", ""); // TODO Defaulting to unknown, need to check
+
+    return data;
+  }
+
+  /**
+   * To not disrupt old logic, for the time being, ShowQueryAction and DescribeQueryAction are using
+   * the same 'GetIndexRequestBuilder' that was used in the old ShowQueryAction. Since the format of
+   * the resulting meta data is different, this method is being used to flatten and retrieve types.
+   *
+   * <p>In the future, should look for a way to generalize this since Schema is currently using
+   * FieldMappingMetaData whereas here we are using MappingMetaData.
+   */
+  @SuppressWarnings("unchecked")
+  private Map<String, String> flattenMappingMetaData(
+      Map<String, Object> mappingMetaData, String currPath, Map<String, String> flattenedMapping) {
+    Map<String, Object> properties = (Map<String, Object>) mappingMetaData.get("properties");
+    for (Entry<String, Object> entry : properties.entrySet()) {
+      Map<String, Object> metaData = (Map<String, Object>) entry.getValue();
+
+      String fullPath = addToPath(currPath, entry.getKey());
+      flattenedMapping.put(
+          fullPath, (String) metaData.getOrDefault("type", DEFAULT_OBJECT_DATATYPE));
+      if (metaData.containsKey("properties")) {
+        flattenedMapping = flattenMappingMetaData(metaData, fullPath, flattenedMapping);
+      }
     }
 
-    private Map<String, Object> loadRowData(String index, String column, String type, int position) {
-        Map<String, Object> data = new HashMap<>();
-        data.put("TABLE_CAT", clusterName);
-        data.put("TABLE_NAME", index);
-        data.put("COLUMN_NAME", column);
-        data.put("TYPE_NAME", type);
-        data.put("NUM_PREC_RADIX", DEFAULT_NUM_PREC_RADIX);
-        data.put("NULLABLE", 2); // TODO Defaulting to 2, need to find a way to check this
-        data.put("ORDINAL_POSITION", position); // There is no deterministic position of column in table
-        data.put("IS_NULLABLE", ""); // TODO Defaulting to unknown, need to check this
-        data.put("IS_AUTOINCREMENT", IS_AUTOINCREMENT); // Defaulting to "NO"
-        data.put("IS_GENERATEDCOLUMN", ""); // TODO Defaulting to unknown, need to check
-
-        return data;
-    }
+    return flattenedMapping;
+  }
 
-    /**
-     * To not disrupt old logic, for the time being, ShowQueryAction and DescribeQueryAction are using the same
-     * 'GetIndexRequestBuilder' that was used in the old ShowQueryAction. Since the format of the resulting meta data
-     * is different, this method is being used to flatten and retrieve types.
-     * <p>
-     * In the future, should look for a way to generalize this since Schema is currently using FieldMappingMetaData
-     * whereas here we are using MappingMetaData.
-     */
-    @SuppressWarnings("unchecked")
-    private Map<String, String> flattenMappingMetaData(Map<String, Object> mappingMetaData,
-                                                       String currPath,
-                                                       Map<String, String> flattenedMapping) {
-        Map<String, Object> properties = (Map<String, Object>) mappingMetaData.get("properties");
-        for (Entry<String, Object> entry : properties.entrySet()) {
-            Map<String, Object> metaData = (Map<String, Object>) entry.getValue();
-
-            String fullPath = addToPath(currPath, entry.getKey());
-            flattenedMapping.put(fullPath, (String) metaData.getOrDefault("type", DEFAULT_OBJECT_DATATYPE));
-            if (metaData.containsKey("properties")) {
-                flattenedMapping = flattenMappingMetaData(metaData, fullPath, flattenedMapping);
-            }
-        }
-
-        return flattenedMapping;
+  private String addToPath(String currPath, String field) {
+    if (currPath.isEmpty()) {
+      return field;
     }
 
-    private String addToPath(String currPath, String field) {
-        if (currPath.isEmpty()) {
-            return field;
-        }
-
-        return currPath + "." + field;
-    }
+    return currPath + "." + field;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ErrorMessage.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ErrorMessage.java
index 1ba9490916..aa0d02bed8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ErrorMessage.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ErrorMessage.java
@@ -3,67 +3,66 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import org.json.JSONObject;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 
 public class ErrorMessage<E extends Exception> {
 
-    protected E exception;
+  protected E exception;
 
-    private int status;
-    private String type;
-    private String reason;
-    private String details;
+  private int status;
+  private String type;
+  private String reason;
+  private String details;
 
-    public ErrorMessage(E exception, int status) {
-        this.exception = exception;
-        this.status = status;
+  public ErrorMessage(E exception, int status) {
+    this.exception = exception;
+    this.status = status;
 
-        this.type = fetchType();
-        this.reason = fetchReason();
-        this.details = fetchDetails();
-    }
+    this.type = fetchType();
+    this.reason = fetchReason();
+    this.details = fetchDetails();
+  }
 
-    private String fetchType() {
-        return exception.getClass().getSimpleName();
-    }
+  private String fetchType() {
+    return exception.getClass().getSimpleName();
+  }
 
-    protected String fetchReason() {
-        return status == RestStatus.BAD_REQUEST.getStatus()
-                ? "Invalid SQL query"
-                : "There was internal problem at backend";
-    }
+  protected String fetchReason() {
+    return status == RestStatus.BAD_REQUEST.getStatus()
+        ? "Invalid SQL query"
+        : "There was internal problem at backend";
+  }
 
-    protected String fetchDetails() {
-        // Some exception prints internal information (full class name) which is security concern
-        //return exception.toString();
-        return emptyStringIfNull(exception.getLocalizedMessage());
-    }
+  protected String fetchDetails() {
+    // Some exception prints internal information (full class name) which is security concern
+    // return exception.toString();
+    return emptyStringIfNull(exception.getLocalizedMessage());
+  }
 
-    private String emptyStringIfNull(String str) {
-        return str != null ? str : "";
-    }
+  private String emptyStringIfNull(String str) {
+    return str != null ? str : "";
+  }
 
-    @Override
-    public String toString() {
-        JSONObject output = new JSONObject();
+  @Override
+  public String toString() {
+    JSONObject output = new JSONObject();
 
-        output.put("status", status);
-        output.put("error", getErrorAsJson());
+    output.put("status", status);
+    output.put("error", getErrorAsJson());
 
-        return output.toString(2);
-    }
+    return output.toString(2);
+  }
 
-    private JSONObject getErrorAsJson() {
-        JSONObject errorJson = new JSONObject();
+  private JSONObject getErrorAsJson() {
+    JSONObject errorJson = new JSONObject();
 
-        errorJson.put("type", type);
-        errorJson.put("reason", reason);
-        errorJson.put("details", details);
+    errorJson.put("type", type);
+    errorJson.put("reason", reason);
+    errorJson.put("details", details);
 
-        return errorJson;
-    }
+    return errorJson;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ErrorMessageFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ErrorMessageFactory.java
index 0e96fe9b67..ba28ee8325 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ErrorMessageFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ErrorMessageFactory.java
@@ -3,42 +3,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import org.opensearch.OpenSearchException;
 
 public class ErrorMessageFactory {
-    /**
-     * Create error message based on the exception type
-     * Exceptions of OpenSearch exception type and exceptions with wrapped OpenSearch exception causes
-     * should create {@link OpenSearchErrorMessage}
-     *
-     * @param e         exception to create error message
-     * @param status    exception status code
-     * @return          error message
-     */
-
-    public static ErrorMessage createErrorMessage(Exception e, int status) {
-        if (e instanceof OpenSearchException) {
-            return new OpenSearchErrorMessage((OpenSearchException) e,
-                    ((OpenSearchException) e).status().getStatus());
-        } else if (unwrapCause(e) instanceof OpenSearchException) {
-            OpenSearchException exception = (OpenSearchException) unwrapCause(e);
-            return new OpenSearchErrorMessage(exception, exception.status().getStatus());
-        }
-        return new ErrorMessage(e, status);
+  /**
+   * Create error message based on the exception type Exceptions of OpenSearch exception type and
+   * exceptions with wrapped OpenSearch exception causes should create {@link
+   * OpenSearchErrorMessage}
+   *
+   * @param e exception to create error message
+   * @param status exception status code
+   * @return error message
+   */
+  public static ErrorMessage createErrorMessage(Exception e, int status) {
+    if (e instanceof OpenSearchException) {
+      return new OpenSearchErrorMessage(
+          (OpenSearchException) e, ((OpenSearchException) e).status().getStatus());
+    } else if (unwrapCause(e) instanceof OpenSearchException) {
+      OpenSearchException exception = (OpenSearchException) unwrapCause(e);
+      return new OpenSearchErrorMessage(exception, exception.status().getStatus());
     }
+    return new ErrorMessage(e, status);
+  }
 
-    public static Throwable unwrapCause(Throwable t) {
-        Throwable result = t;
-        if (result instanceof OpenSearchException) {
-            return result;
-        }
-        if (result.getCause() == null) {
-            return result;
-        }
-        result = unwrapCause(result.getCause());
-        return result;
+  public static Throwable unwrapCause(Throwable t) {
+    Throwable result = t;
+    if (result instanceof OpenSearchException) {
+      return result;
+    }
+    if (result.getCause() == null) {
+      return result;
     }
+    result = unwrapCause(result.getCause());
+    return result;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/OpenSearchErrorMessage.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/OpenSearchErrorMessage.java
index a48ab003dc..8117d241b1 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/OpenSearchErrorMessage.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/OpenSearchErrorMessage.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import org.opensearch.OpenSearchException;
@@ -13,46 +12,53 @@
 
 public class OpenSearchErrorMessage extends ErrorMessage<OpenSearchException> {
 
-    OpenSearchErrorMessage(OpenSearchException exception, int status) {
-        super(exception, status);
-    }
+  OpenSearchErrorMessage(OpenSearchException exception, int status) {
+    super(exception, status);
+  }
 
-    @Override
-    protected String fetchReason() {
-        return "Error occurred in OpenSearch engine: " + exception.getMessage();
-    }
+  @Override
+  protected String fetchReason() {
+    return "Error occurred in OpenSearch engine: " + exception.getMessage();
+  }
 
-    /** Currently Sql-Jdbc plugin only supports string type as reason and details in the error messages */
-    @Override
-    protected String fetchDetails() {
-        StringBuilder details = new StringBuilder();
-        if (exception instanceof SearchPhaseExecutionException) {
-            details.append(fetchSearchPhaseExecutionExceptionDetails((SearchPhaseExecutionException) exception));
-        } else {
-            details.append(defaultDetails(exception));
-        }
-        details.append("\nFor more details, please send request for Json format to see the raw response from "
-                + "OpenSearch engine.");
-        return details.toString();
+  /**
+   * Currently Sql-Jdbc plugin only supports string type as reason and details in the error messages
+   */
+  @Override
+  protected String fetchDetails() {
+    StringBuilder details = new StringBuilder();
+    if (exception instanceof SearchPhaseExecutionException) {
+      details.append(
+          fetchSearchPhaseExecutionExceptionDetails((SearchPhaseExecutionException) exception));
+    } else {
+      details.append(defaultDetails(exception));
     }
+    details.append(
+        "\nFor more details, please send request for Json format to see the raw response from "
+            + "OpenSearch engine.");
+    return details.toString();
+  }
 
-    private String defaultDetails(OpenSearchException exception) {
-        return exception.getDetailedMessage();
-    }
+  private String defaultDetails(OpenSearchException exception) {
+    return exception.getDetailedMessage();
+  }
 
-    /**
-     * Could not deliver the exactly same error messages due to the limit of JDBC types.
-     * Currently our cases occurred only SearchPhaseExecutionException instances among all types of OpenSearch exceptions
-     * according to the survey, see all types: OpenSearchException.OpenSearchExceptionHandle.
-     * Either add methods of fetching details for different types, or re-make a consistent message by not giving
-     * detailed messages/root causes but only a suggestion message.
-     */
-    private String fetchSearchPhaseExecutionExceptionDetails(SearchPhaseExecutionException exception) {
-        StringBuilder details = new StringBuilder();
-        ShardSearchFailure[] shardFailures = exception.shardFailures();
-        for (ShardSearchFailure failure : shardFailures) {
-            details.append(StringUtils.format("Shard[%d]: %s\n", failure.shardId(), failure.getCause().toString()));
-        }
-        return details.toString();
+  /**
+   * Could not deliver the exactly same error messages due to the limit of JDBC types. Currently our
+   * cases occurred only SearchPhaseExecutionException instances among all types of OpenSearch
+   * exceptions according to the survey, see all types:
+   * OpenSearchException.OpenSearchExceptionHandle. Either add methods of fetching details for
+   * different types, or re-make a consistent message by not giving detailed messages/root causes
+   * but only a suggestion message.
+   */
+  private String fetchSearchPhaseExecutionExceptionDetails(
+      SearchPhaseExecutionException exception) {
+    StringBuilder details = new StringBuilder();
+    ShardSearchFailure[] shardFailures = exception.shardFailures();
+    for (ShardSearchFailure failure : shardFailures) {
+      details.append(
+          StringUtils.format("Shard[%d]: %s\n", failure.shardId(), failure.getCause().toString()));
     }
+    return details.toString();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/PrettyFormatRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/PrettyFormatRestExecutor.java
index ceccd7ca4a..00feabf5d8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/PrettyFormatRestExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/PrettyFormatRestExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import java.util.Map;
@@ -12,10 +11,10 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.sql.legacy.cursor.Cursor;
 import org.opensearch.sql.legacy.cursor.DefaultCursor;
 import org.opensearch.sql.legacy.exception.SqlParseException;
@@ -27,82 +26,84 @@
 
 public class PrettyFormatRestExecutor implements RestExecutor {
 
-    private static final Logger LOG = LogManager.getLogger();
-
-    private final String format;
-
-    public PrettyFormatRestExecutor(String format) {
-        this.format = format.toLowerCase();
+  private static final Logger LOG = LogManager.getLogger();
+
+  private final String format;
+
+  public PrettyFormatRestExecutor(String format) {
+    this.format = format.toLowerCase();
+  }
+
+  /** Execute the QueryAction and return the REST response using the channel. */
+  @Override
+  public void execute(
+      Client client, Map<String, String> params, QueryAction queryAction, RestChannel channel) {
+    String formattedResponse = execute(client, params, queryAction);
+    BytesRestResponse bytesRestResponse;
+    if (format.equals("jdbc")) {
+      bytesRestResponse =
+          new BytesRestResponse(
+              RestStatus.OK, "application/json; charset=UTF-8", formattedResponse);
+    } else {
+      bytesRestResponse = new BytesRestResponse(RestStatus.OK, formattedResponse);
     }
 
-    /**
-     * Execute the QueryAction and return the REST response using the channel.
-     */
-    @Override
-    public void execute(Client client, Map<String, String> params, QueryAction queryAction, RestChannel channel) {
-        String formattedResponse = execute(client, params, queryAction);
-        BytesRestResponse bytesRestResponse;
-        if (format.equals("jdbc")) {
-            bytesRestResponse = new BytesRestResponse(RestStatus.OK,
-                    "application/json; charset=UTF-8",
-                    formattedResponse);
-        } else {
-            bytesRestResponse = new BytesRestResponse(RestStatus.OK, formattedResponse);
-        }
-
-        if (!BackOffRetryStrategy.isHealthy(2 * bytesRestResponse.content().length(), this)) {
-            throw new IllegalStateException(
-                    "[PrettyFormatRestExecutor] Memory could be insufficient when sendResponse().");
-        }
-
-        channel.sendResponse(bytesRestResponse);
+    if (!BackOffRetryStrategy.isHealthy(2 * bytesRestResponse.content().length(), this)) {
+      throw new IllegalStateException(
+          "[PrettyFormatRestExecutor] Memory could be insufficient when sendResponse().");
     }
 
-    @Override
-    public String execute(Client client, Map<String, String> params, QueryAction queryAction) {
-        Protocol protocol;
-
-        try {
-            if (queryAction instanceof DefaultQueryAction) {
-                protocol = buildProtocolForDefaultQuery(client, (DefaultQueryAction) queryAction);
-            } else {
-                Object queryResult = QueryActionElasticExecutor.executeAnyAction(client, queryAction);
-                protocol = new Protocol(client, queryAction, queryResult, format, Cursor.NULL_CURSOR);
-            }
-        } catch (Exception e) {
-            if (e instanceof OpenSearchException) {
-                LOG.warn("An error occurred in OpenSearch engine: "
-                        + ((OpenSearchException) e).getDetailedMessage(), e);
-            } else {
-                LOG.warn("Error happened in pretty formatter", e);
-            }
-            protocol = new Protocol(e);
-        }
-
-        return protocol.format();
+    channel.sendResponse(bytesRestResponse);
+  }
+
+  @Override
+  public String execute(Client client, Map<String, String> params, QueryAction queryAction) {
+    Protocol protocol;
+
+    try {
+      if (queryAction instanceof DefaultQueryAction) {
+        protocol = buildProtocolForDefaultQuery(client, (DefaultQueryAction) queryAction);
+      } else {
+        Object queryResult = QueryActionElasticExecutor.executeAnyAction(client, queryAction);
+        protocol = new Protocol(client, queryAction, queryResult, format, Cursor.NULL_CURSOR);
+      }
+    } catch (Exception e) {
+      if (e instanceof OpenSearchException) {
+        LOG.warn(
+            "An error occurred in OpenSearch engine: "
+                + ((OpenSearchException) e).getDetailedMessage(),
+            e);
+      } else {
+        LOG.warn("Error happened in pretty formatter", e);
+      }
+      protocol = new Protocol(e);
     }
 
-    /**
-     * QueryActionElasticExecutor.executeAnyAction() returns SearchHits inside SearchResponse.
-     * In order to get scroll ID if any, we need to execute DefaultQueryAction ourselves for SearchResponse.
-     */
-    private Protocol buildProtocolForDefaultQuery(Client client, DefaultQueryAction queryAction)
-            throws SqlParseException {
-
-        SearchResponse response = (SearchResponse) queryAction.explain().get();
-        String scrollId = response.getScrollId();
-
-        Protocol protocol;
-        if (!Strings.isNullOrEmpty(scrollId)) {
-            DefaultCursor defaultCursor = new DefaultCursor();
-            defaultCursor.setScrollId(scrollId);
-            defaultCursor.setLimit(queryAction.getSelect().getRowCount());
-            defaultCursor.setFetchSize(queryAction.getSqlRequest().fetchSize());
-            protocol = new Protocol(client, queryAction, response.getHits(), format, defaultCursor);
-        } else {
-            protocol = new Protocol(client, queryAction, response.getHits(), format, Cursor.NULL_CURSOR);
-        }
-
-        return protocol;
+    return protocol.format();
+  }
+
+  /**
+   * QueryActionElasticExecutor.executeAnyAction() returns SearchHits inside SearchResponse. In
+   * order to get scroll ID if any, we need to execute DefaultQueryAction ourselves for
+   * SearchResponse.
+   */
+  private Protocol buildProtocolForDefaultQuery(Client client, DefaultQueryAction queryAction)
+      throws SqlParseException {
+
+    SearchResponse response = (SearchResponse) queryAction.explain().get();
+    String scrollId = response.getScrollId();
+
+    Protocol protocol;
+    if (!Strings.isNullOrEmpty(scrollId)) {
+      DefaultCursor defaultCursor = new DefaultCursor();
+      defaultCursor.setScrollId(scrollId);
+      defaultCursor.setLimit(queryAction.getSelect().getRowCount());
+      defaultCursor.setFetchSize(queryAction.getSqlRequest().fetchSize());
+      protocol = new Protocol(client, queryAction, response.getHits(), format, defaultCursor);
+    } else {
+      protocol = new Protocol(client, queryAction, response.getHits(), format, Cursor.NULL_CURSOR);
     }
+
+    return protocol;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Protocol.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Protocol.java
index aba0a3c599..e6ea767e17 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Protocol.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Protocol.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import static org.opensearch.sql.legacy.domain.IndexStatement.StatementType;
@@ -33,215 +32,223 @@
 
 public class Protocol {
 
-    static final int OK_STATUS = 200;
-    static final int ERROR_STATUS = 500;
-
-    private final String formatType;
-    private int status;
-    private long size;
-    private long total;
-    private ResultSet resultSet;
-    private ErrorMessage error;
-    private List<ColumnNode> columnNodeList;
-    private Cursor cursor = new NullCursor();
-    private ColumnTypeProvider scriptColumnType = new ColumnTypeProvider();
-
-    public Protocol(Client client, QueryAction queryAction, Object queryResult, String formatType, Cursor cursor) {
-        this.cursor = cursor;
-
-        if (queryAction instanceof QueryPlanQueryAction) {
-            this.columnNodeList =
-                    ((QueryPlanRequestBuilder) (((QueryPlanQueryAction) queryAction).explain())).outputColumns();
-        } else if (queryAction instanceof DefaultQueryAction) {
-            scriptColumnType = queryAction.getScriptColumnType();
-        }
-
-        this.formatType = formatType;
-        QueryStatement query = queryAction.getQueryStatement();
-        this.status = OK_STATUS;
-        this.resultSet = loadResultSet(client, query, queryResult);
-        this.size = resultSet.getDataRows().getSize();
-        this.total = resultSet.getDataRows().getTotalHits();
-    }
-
-
-    public Protocol(Client client, Object queryResult, String formatType, Cursor cursor) {
-        this.cursor = cursor;
-        this.status = OK_STATUS;
-        this.formatType = formatType;
-        this.resultSet = loadResultSetForCursor(client, queryResult);
-    }
-
-    public Protocol(Exception e) {
-        this.formatType = null;
-        this.status = ERROR_STATUS;
-        this.error = ErrorMessageFactory.createErrorMessage(e, status);
-    }
-
-    private ResultSet loadResultSetForCursor(Client client, Object queryResult) {
-        return new SelectResultSet(client, queryResult, formatType, cursor);
-    }
-
-    private ResultSet loadResultSet(Client client, QueryStatement queryStatement, Object queryResult) {
-        if (queryResult instanceof List) {
-            return new BindingTupleResultSet(columnNodeList, (List<BindingTuple>) queryResult);
-        }
-        if (queryStatement instanceof Delete) {
-            return new DeleteResultSet(client, (Delete) queryStatement, queryResult);
-        } else if (queryStatement instanceof Query) {
-            return new SelectResultSet(client, (Query) queryStatement, queryResult,
-                                        scriptColumnType, formatType, cursor);
-        } else if (queryStatement instanceof IndexStatement) {
-            IndexStatement statement = (IndexStatement) queryStatement;
-            StatementType statementType = statement.getStatementType();
-
-            if (statementType == StatementType.SHOW) {
-                return new ShowResultSet(client, statement, queryResult);
-            } else if (statementType == StatementType.DESCRIBE) {
-                return new DescribeResultSet(client, statement, queryResult);
-            }
-        }
-
-        throw new UnsupportedOperationException(
-                String.format("The following instance of QueryStatement is not supported: %s",
-                        queryStatement.getClass().toString())
-        );
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public ResultSet getResultSet() {
-        return resultSet;
-    }
-
-    public String format() {
-        if (status == OK_STATUS) {
-            switch (formatType) {
-                case "jdbc":
-                    return outputInJdbcFormat();
-                case "table":
-                    return outputInTableFormat();
-                case "raw":
-                    return outputInRawFormat();
-                default:
-                    throw new UnsupportedOperationException(
-                            String.format("The following format is not supported: %s", formatType));
-            }
-        }
-
-        return error.toString();
+  static final int OK_STATUS = 200;
+  static final int ERROR_STATUS = 500;
+
+  private final String formatType;
+  private int status;
+  private long size;
+  private long total;
+  private ResultSet resultSet;
+  private ErrorMessage error;
+  private List<ColumnNode> columnNodeList;
+  private Cursor cursor = new NullCursor();
+  private ColumnTypeProvider scriptColumnType = new ColumnTypeProvider();
+
+  public Protocol(
+      Client client,
+      QueryAction queryAction,
+      Object queryResult,
+      String formatType,
+      Cursor cursor) {
+    this.cursor = cursor;
+
+    if (queryAction instanceof QueryPlanQueryAction) {
+      this.columnNodeList =
+          ((QueryPlanRequestBuilder) (((QueryPlanQueryAction) queryAction).explain()))
+              .outputColumns();
+    } else if (queryAction instanceof DefaultQueryAction) {
+      scriptColumnType = queryAction.getScriptColumnType();
+    }
+
+    this.formatType = formatType;
+    QueryStatement query = queryAction.getQueryStatement();
+    this.status = OK_STATUS;
+    this.resultSet = loadResultSet(client, query, queryResult);
+    this.size = resultSet.getDataRows().getSize();
+    this.total = resultSet.getDataRows().getTotalHits();
+  }
+
+  public Protocol(Client client, Object queryResult, String formatType, Cursor cursor) {
+    this.cursor = cursor;
+    this.status = OK_STATUS;
+    this.formatType = formatType;
+    this.resultSet = loadResultSetForCursor(client, queryResult);
+  }
+
+  public Protocol(Exception e) {
+    this.formatType = null;
+    this.status = ERROR_STATUS;
+    this.error = ErrorMessageFactory.createErrorMessage(e, status);
+  }
+
+  private ResultSet loadResultSetForCursor(Client client, Object queryResult) {
+    return new SelectResultSet(client, queryResult, formatType, cursor);
+  }
+
+  private ResultSet loadResultSet(
+      Client client, QueryStatement queryStatement, Object queryResult) {
+    if (queryResult instanceof List) {
+      return new BindingTupleResultSet(columnNodeList, (List<BindingTuple>) queryResult);
+    }
+    if (queryStatement instanceof Delete) {
+      return new DeleteResultSet(client, (Delete) queryStatement, queryResult);
+    } else if (queryStatement instanceof Query) {
+      return new SelectResultSet(
+          client, (Query) queryStatement, queryResult, scriptColumnType, formatType, cursor);
+    } else if (queryStatement instanceof IndexStatement) {
+      IndexStatement statement = (IndexStatement) queryStatement;
+      StatementType statementType = statement.getStatementType();
+
+      if (statementType == StatementType.SHOW) {
+        return new ShowResultSet(client, statement, queryResult);
+      } else if (statementType == StatementType.DESCRIBE) {
+        return new DescribeResultSet(client, statement, queryResult);
+      }
+    }
+
+    throw new UnsupportedOperationException(
+        String.format(
+            "The following instance of QueryStatement is not supported: %s",
+            queryStatement.getClass().toString()));
+  }
+
+  public int getStatus() {
+    return status;
+  }
+
+  public ResultSet getResultSet() {
+    return resultSet;
+  }
+
+  public String format() {
+    if (status == OK_STATUS) {
+      switch (formatType) {
+        case "jdbc":
+          return outputInJdbcFormat();
+        case "table":
+          return outputInTableFormat();
+        case "raw":
+          return outputInRawFormat();
+        default:
+          throw new UnsupportedOperationException(
+              String.format("The following format is not supported: %s", formatType));
+      }
+    }
+
+    return error.toString();
+  }
+
+  private String outputInJdbcFormat() {
+    JSONObject formattedOutput = new JSONObject();
+
+    formattedOutput.put("status", status);
+    formattedOutput.put("size", size);
+    formattedOutput.put("total", total);
+
+    JSONArray schema = getSchemaAsJson();
+
+    formattedOutput.put("schema", schema);
+    formattedOutput.put("datarows", getDataRowsAsJson());
+
+    String cursorId = cursor.generateCursorId();
+    if (!Strings.isNullOrEmpty(cursorId)) {
+      formattedOutput.put("cursor", cursorId);
+    }
+
+    return formattedOutput.toString(2);
+  }
+
+  private String outputInRawFormat() {
+    Schema schema = resultSet.getSchema();
+    DataRows dataRows = resultSet.getDataRows();
+
+    StringBuilder formattedOutput = new StringBuilder();
+    for (Row row : dataRows) {
+      formattedOutput.append(rawEntry(row, schema)).append("\n");
+    }
+
+    return formattedOutput.toString();
+  }
+
+  private String outputInTableFormat() {
+    return null;
+  }
+
+  public String cursorFormat() {
+    if (status == OK_STATUS) {
+      switch (formatType) {
+        case "jdbc":
+          return cursorOutputInJDBCFormat();
+        default:
+          throw new UnsupportedOperationException(
+              String.format(
+                  "The following response format is not supported for cursor: [%s]", formatType));
+      }
     }
+    return error.toString();
+  }
 
-    private String outputInJdbcFormat() {
-        JSONObject formattedOutput = new JSONObject();
+  private String cursorOutputInJDBCFormat() {
+    JSONObject formattedOutput = new JSONObject();
+    formattedOutput.put("datarows", getDataRowsAsJson());
 
-        formattedOutput.put("status", status);
-        formattedOutput.put("size", size);
-        formattedOutput.put("total", total);
-
-        JSONArray schema = getSchemaAsJson();
-
-        formattedOutput.put("schema", schema);
-        formattedOutput.put("datarows", getDataRowsAsJson());
-
-        String cursorId = cursor.generateCursorId();
-        if (!Strings.isNullOrEmpty(cursorId)) {
-            formattedOutput.put("cursor", cursorId);
-        }
-
-        return formattedOutput.toString(2);
+    String cursorId = cursor.generateCursorId();
+    if (!Strings.isNullOrEmpty(cursorId)) {
+      formattedOutput.put("cursor", cursorId);
     }
+    return formattedOutput.toString(2);
+  }
 
-    private String outputInRawFormat() {
-        Schema schema = resultSet.getSchema();
-        DataRows dataRows = resultSet.getDataRows();
+  private String rawEntry(Row row, Schema schema) {
+    // TODO String separator is being kept to "|" for the time being as using "\t" will require
+    // formatting since
+    // TODO tabs are occurring in multiple of 4 (one option is Guava's Strings.padEnd() method)
+    return StreamSupport.stream(schema.spliterator(), false)
+        .map(column -> row.getDataOrDefault(column.getName(), "NULL").toString())
+        .collect(Collectors.joining("|"));
+  }
 
-        StringBuilder formattedOutput = new StringBuilder();
-        for (Row row : dataRows) {
-            formattedOutput.append(rawEntry(row, schema)).append("\n");
-        }
-
-        return formattedOutput.toString();
-    }
-
-    private String outputInTableFormat() {
-        return null;
-    }
+  private JSONArray getSchemaAsJson() {
+    Schema schema = resultSet.getSchema();
+    JSONArray schemaJson = new JSONArray();
 
-    public String cursorFormat() {
-        if (status == OK_STATUS) {
-            switch (formatType) {
-                case "jdbc":
-                    return cursorOutputInJDBCFormat();
-                default:
-                    throw new UnsupportedOperationException(String.format(
-                            "The following response format is not supported for cursor: [%s]", formatType));
-            }
-        }
-        return error.toString();
+    for (Column column : schema) {
+      schemaJson.put(schemaEntry(column.getName(), column.getAlias(), column.getType()));
     }
 
-    private String cursorOutputInJDBCFormat() {
-        JSONObject formattedOutput = new JSONObject();
-        formattedOutput.put("datarows", getDataRowsAsJson());
+    return schemaJson;
+  }
 
-        String cursorId = cursor.generateCursorId();
-        if (!Strings.isNullOrEmpty(cursorId)) {
-            formattedOutput.put("cursor", cursorId);
-        }
-        return formattedOutput.toString(2);
+  private JSONObject schemaEntry(String name, String alias, String type) {
+    JSONObject entry = new JSONObject();
+    entry.put("name", name);
+    if (alias != null) {
+      entry.put("alias", alias);
     }
+    entry.put("type", type);
 
-    private String rawEntry(Row row, Schema schema) {
-        // TODO String separator is being kept to "|" for the time being as using "\t" will require formatting since
-        // TODO tabs are occurring in multiple of 4 (one option is Guava's Strings.padEnd() method)
-        return StreamSupport.stream(schema.spliterator(), false)
-                .map(column -> row.getDataOrDefault(column.getName(), "NULL").toString())
-                .collect(Collectors.joining("|"));
-    }
-
-    private JSONArray getSchemaAsJson() {
-        Schema schema = resultSet.getSchema();
-        JSONArray schemaJson = new JSONArray();
-
-        for (Column column : schema) {
-            schemaJson.put(schemaEntry(column.getName(), column.getAlias(), column.getType()));
-        }
-
-        return schemaJson;
-    }
+    return entry;
+  }
 
-    private JSONObject schemaEntry(String name, String alias, String type) {
-        JSONObject entry = new JSONObject();
-        entry.put("name", name);
-        if (alias != null) {
-            entry.put("alias", alias);
-        }
-        entry.put("type", type);
+  private JSONArray getDataRowsAsJson() {
+    Schema schema = resultSet.getSchema();
+    DataRows dataRows = resultSet.getDataRows();
+    JSONArray dataRowsJson = new JSONArray();
 
-        return entry;
+    for (Row row : dataRows) {
+      dataRowsJson.put(dataEntry(row, schema));
     }
 
-    private JSONArray getDataRowsAsJson() {
-        Schema schema = resultSet.getSchema();
-        DataRows dataRows = resultSet.getDataRows();
-        JSONArray dataRowsJson = new JSONArray();
-
-        for (Row row : dataRows) {
-            dataRowsJson.put(dataEntry(row, schema));
-        }
-
-        return dataRowsJson;
-    }
+    return dataRowsJson;
+  }
 
-    private JSONArray dataEntry(Row dataRow, Schema schema) {
-        JSONArray entry = new JSONArray();
-        for (Column column : schema) {
-            String columnName = column.getIdentifier();
-            entry.put(dataRow.getDataOrDefault(columnName, JSONObject.NULL));
-        }
-        return entry;
+  private JSONArray dataEntry(Row dataRow, Schema schema) {
+    JSONArray entry = new JSONArray();
+    for (Column column : schema) {
+      String columnName = column.getIdentifier();
+      entry.put(dataRow.getDataOrDefault(columnName, JSONObject.NULL));
     }
+    return entry;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ResultSet.java
index 9864f1ffdc..079a738eb3 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ResultSet.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ResultSet.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import java.util.regex.Matcher;
@@ -12,47 +11,44 @@
 
 public abstract class ResultSet {
 
-    protected Schema schema;
-    protected DataRows dataRows;
-
-    protected Client client;
-    protected String clusterName;
-
-    public Schema getSchema() {
-        return schema;
-    }
-
-    public DataRows getDataRows() {
-        return dataRows;
-    }
-
-    protected String getClusterName() {
-        return client.admin().cluster()
-                .prepareHealth()
-                .get()
-                .getClusterName();
-    }
-
-    /**
-     * Check if given string matches the pattern. Do this check only if the pattern is a regex.
-     * Otherwise skip the matching process and consider it's a match.
-     * This is a quick fix to support SHOW/DESCRIBE alias by skip mismatch between actual index name
-     * and pattern (alias).
-     * @param string   string to match
-     * @param pattern  pattern
-     * @return true if match or pattern is not regular expression. otherwise false.
-     */
-    protected boolean matchesPatternIfRegex(String string, String pattern) {
-        return isNotRegexPattern(pattern) || matchesPattern(string, pattern);
-    }
-
-    protected boolean matchesPattern(String string, String pattern) {
-        Pattern p = Pattern.compile(pattern);
-        Matcher matcher = p.matcher(string);
-        return matcher.find();
-    }
-
-    private boolean isNotRegexPattern(String pattern) {
-        return !pattern.contains(".") && !pattern.contains("*");
-    }
+  protected Schema schema;
+  protected DataRows dataRows;
+
+  protected Client client;
+  protected String clusterName;
+
+  public Schema getSchema() {
+    return schema;
+  }
+
+  public DataRows getDataRows() {
+    return dataRows;
+  }
+
+  protected String getClusterName() {
+    return client.admin().cluster().prepareHealth().get().getClusterName();
+  }
+
+  /**
+   * Check if given string matches the pattern. Do this check only if the pattern is a regex.
+   * Otherwise skip the matching process and consider it's a match. This is a quick fix to support
+   * SHOW/DESCRIBE alias by skip mismatch between actual index name and pattern (alias).
+   *
+   * @param string string to match
+   * @param pattern pattern
+   * @return true if match or pattern is not regular expression. otherwise false.
+   */
+  protected boolean matchesPatternIfRegex(String string, String pattern) {
+    return isNotRegexPattern(pattern) || matchesPattern(string, pattern);
+  }
+
+  protected boolean matchesPattern(String string, String pattern) {
+    Pattern p = Pattern.compile(pattern);
+    Matcher matcher = p.matcher(string);
+    return matcher.find();
+  }
+
+  private boolean isNotRegexPattern(String pattern) {
+    return !pattern.contains(".") && !pattern.contains("*");
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Schema.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Schema.java
index e02841fcd6..b29369f713 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Schema.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Schema.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import static java.util.Collections.unmodifiableList;
@@ -17,144 +16,155 @@
 
 public class Schema implements Iterable<Schema.Column> {
 
-    private String indexName;
-    private List<Column> columns;
+  private String indexName;
+  private List<Column> columns;
 
-    private static Set<String> types;
+  private static Set<String> types;
 
-    static {
-        types = getTypes();
-    }
+  static {
+    types = getTypes();
+  }
 
-    public Schema(String indexName, List<Column> columns) {
-        this.indexName = indexName;
-        this.columns = columns;
-    }
+  public Schema(String indexName, List<Column> columns) {
+    this.indexName = indexName;
+    this.columns = columns;
+  }
 
-    public Schema(IndexStatement statement, List<Column> columns) {
-        this.indexName = statement.getIndexPattern();
-        this.columns = columns;
-    }
+  public Schema(IndexStatement statement, List<Column> columns) {
+    this.indexName = statement.getIndexPattern();
+    this.columns = columns;
+  }
 
-    public Schema(List<Column> columns){
-        this.columns = columns;
-    }
+  public Schema(List<Column> columns) {
+    this.columns = columns;
+  }
+
+  public String getIndexName() {
+    return indexName;
+  }
 
-    public String getIndexName() {
-        return indexName;
+  public List<String> getHeaders() {
+    return columns.stream().map(column -> column.getName()).collect(Collectors.toList());
+  }
+
+  public List<Column> getColumns() {
+    return unmodifiableList(columns);
+  }
+
+  private static Set<String> getTypes() {
+    HashSet<String> types = new HashSet<>();
+    for (Type type : Type.values()) {
+      types.add(type.name());
     }
 
-    public List<String> getHeaders() {
-        return columns.stream()
-                .map(column -> column.getName())
-                .collect(Collectors.toList());
+    return types;
+  }
+
+  // A method for efficiently checking if a Type exists
+  public static boolean hasType(String type) {
+    return types.contains(type);
+  }
+
+  // Iterator method for Schema
+  @Override
+  public Iterator<Column> iterator() {
+    return new Iterator<Column>() {
+      private final Iterator<Column> iter = columns.iterator();
+
+      @Override
+      public boolean hasNext() {
+        return iter.hasNext();
+      }
+
+      @Override
+      public Column next() {
+        return iter.next();
+      }
+
+      @Override
+      public void remove() {
+        throw new UnsupportedOperationException("No changes allowed to Schema columns");
+      }
+    };
+  }
+
+  // Only core OpenSearch datatypes currently supported
+  public enum Type {
+    TEXT,
+    KEYWORD,
+    IP, // String types
+    LONG,
+    INTEGER,
+    SHORT,
+    BYTE,
+    DOUBLE,
+    FLOAT,
+    HALF_FLOAT,
+    SCALED_FLOAT, // Numeric types
+    DATE, // Date types
+    BOOLEAN, // Boolean types
+    BINARY, // Binary types
+    OBJECT,
+    NESTED,
+    INTEGER_RANGE,
+    FLOAT_RANGE,
+    LONG_RANGE,
+    DOUBLE_RANGE,
+    DATE_RANGE; // Range types
+
+    public String nameLowerCase() {
+      return name().toLowerCase();
     }
+  }
+
+  // Inner class for Column object
+  public static class Column {
 
-    public List<Column> getColumns() {
-        return unmodifiableList(columns);
+    private final String name;
+    private String alias;
+    private final Type type;
+
+    private boolean identifiedByAlias;
+
+    public Column(String name, String alias, Type type, boolean identifiedByAlias) {
+      this.name = name;
+      this.alias = alias;
+      this.type = type;
+      this.identifiedByAlias = identifiedByAlias;
     }
 
-    private static Set<String> getTypes() {
-        HashSet<String> types = new HashSet<>();
-        for (Type type : Type.values()) {
-            types.add(type.name());
-        }
+    public Column(String name, String alias, Type type) {
+      this(name, alias, type, false);
+    }
 
-        return types;
+    public String getName() {
+      return name;
     }
 
-    // A method for efficiently checking if a Type exists
-    public static boolean hasType(String type) {
-        return types.contains(type);
+    public String getAlias() {
+      return alias;
     }
 
-    // Iterator method for Schema
-    @Override
-    public Iterator<Column> iterator() {
-        return new Iterator<Column>() {
-            private final Iterator<Column> iter = columns.iterator();
-
-            @Override
-            public boolean hasNext() {
-                return iter.hasNext();
-            }
-
-            @Override
-            public Column next() {
-                return iter.next();
-            }
-
-            @Override
-            public void remove() {
-                throw new UnsupportedOperationException("No changes allowed to Schema columns");
-            }
-        };
+    public String getType() {
+      return type.nameLowerCase();
     }
 
-    // Only core OpenSearch datatypes currently supported
-    public enum Type {
-        TEXT, KEYWORD, IP, // String types
-        LONG, INTEGER, SHORT, BYTE, DOUBLE, FLOAT, HALF_FLOAT, SCALED_FLOAT, // Numeric types
-        DATE, // Date types
-        BOOLEAN, // Boolean types
-        BINARY, // Binary types
-        OBJECT,
-        NESTED,
-        INTEGER_RANGE, FLOAT_RANGE, LONG_RANGE, DOUBLE_RANGE, DATE_RANGE; // Range types
-
-        public String nameLowerCase() {
-            return name().toLowerCase();
-        }
+    /*
+     * Some query types (like JOIN) label the data in SearchHit using alias instead of field name if it's given.
+     *
+     * This method returns the alias as the identifier if the identifiedByAlias flag is set for such cases so that
+     * the correct identifier is used to access related data in DataRows.
+     */
+    public String getIdentifier() {
+      if (identifiedByAlias && alias != null) {
+        return alias;
+      } else {
+        return name;
+      }
     }
 
-    // Inner class for Column object
-    public static class Column {
-
-        private final String name;
-        private String alias;
-        private final Type type;
-
-        private boolean identifiedByAlias;
-
-        public Column(String name, String alias, Type type, boolean identifiedByAlias) {
-            this.name = name;
-            this.alias = alias;
-            this.type = type;
-            this.identifiedByAlias = identifiedByAlias;
-        }
-
-        public Column(String name, String alias, Type type) {
-            this(name, alias, type, false);
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String getAlias() {
-            return alias;
-        }
-
-        public String getType() {
-            return type.nameLowerCase();
-        }
-
-        /*
-         * Some query types (like JOIN) label the data in SearchHit using alias instead of field name if it's given.
-         *
-         * This method returns the alias as the identifier if the identifiedByAlias flag is set for such cases so that
-         * the correct identifier is used to access related data in DataRows.
-         */
-        public String getIdentifier() {
-            if (identifiedByAlias && alias != null) {
-                return alias;
-            } else {
-                return name;
-            }
-        }
-
-        public Type getEnumType() {
-            return type;
-        }
+    public Type getEnumType() {
+      return type;
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java
index 8e9d48ce06..aaf5ef2bc0 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import static java.util.Collections.unmodifiableMap;
@@ -31,8 +30,8 @@
 import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
 import org.opensearch.action.search.ClearScrollResponse;
 import org.opensearch.client.Client;
-import org.opensearch.common.Strings;
 import org.opensearch.common.document.DocumentField;
+import org.opensearch.core.common.Strings;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 import org.opensearch.search.aggregations.Aggregation;
@@ -59,820 +58,787 @@
 
 public class SelectResultSet extends ResultSet {
 
-    private static final Logger LOG = LogManager.getLogger(SelectResultSet.class);
-
-    public static final String SCORE = "_score";
-    private final String formatType;
-
-    private Query query;
-    private Object queryResult;
-
-    private boolean selectAll;
-    private String indexName;
-    private List<Schema.Column> columns = new ArrayList<>();
-    private ColumnTypeProvider outputColumnType;
-
-    private List<String> head;
-    private long size;
-    private long totalHits;
-    private long internalTotalHits;
-    private List<DataRows.Row> rows;
-    private Cursor cursor;
-
-    private DateFieldFormatter dateFieldFormatter;
-    // alias -> base field name
-    private Map<String, String> fieldAliasMap = new HashMap<>();
-
-    public SelectResultSet(Client client,
-                           Query query,
-                           Object queryResult,
-                           ColumnTypeProvider outputColumnType,
-                           String formatType,
-                           Cursor cursor) {
-        this.client = client;
-        this.query = query;
-        this.queryResult = queryResult;
-        this.selectAll = false;
-        this.formatType = formatType;
-        this.outputColumnType = outputColumnType;
-        this.cursor = cursor;
-
-        if (isJoinQuery()) {
-            JoinSelect joinQuery = (JoinSelect) query;
-            loadFromEsState(joinQuery.getFirstTable());
-            loadFromEsState(joinQuery.getSecondTable());
-        } else {
-            loadFromEsState(query);
-        }
-        this.schema = new Schema(indexName, columns);
-        this.head = schema.getHeaders();
-        this.dateFieldFormatter = new DateFieldFormatter(indexName, columns, fieldAliasMap);
-
-        extractData();
-        populateCursor();
-        this.dataRows = new DataRows(size, totalHits, rows);
-    }
-
-    public SelectResultSet(Client client, Object queryResult, String formatType, Cursor cursor) {
-        this.cursor = cursor;
-        this.client = client;
-        this.queryResult = queryResult;
-        this.selectAll = false;
-        this.formatType = formatType;
-        populateResultSetFromCursor(cursor);
-    }
-
-    public String indexName(){
-        return this.indexName;
-    }
-
-    public Map<String, String> fieldAliasMap() {
-        return unmodifiableMap(this.fieldAliasMap);
-    }
-
-    public void populateResultSetFromCursor(Cursor cursor) {
-        switch (cursor.getType()) {
-            case DEFAULT:
-                populateResultSetFromDefaultCursor((DefaultCursor) cursor);
-            default:
-                return;
-        }
-    }
-
-    private void populateResultSetFromDefaultCursor(DefaultCursor cursor) {
-        this.columns = cursor.getColumns();
-        this.schema = new Schema(columns);
-        this.head = schema.getHeaders();
-        this.dateFieldFormatter = new DateFieldFormatter(
-                cursor.getIndexPattern(),
-                columns,
-                cursor.getFieldAliasMap()
-        );
-        extractData();
-        this.dataRows = new DataRows(size, totalHits, rows);
-    }
-
-    //***********************************************************
-    //      Logic for loading Columns to be stored in Schema
-    //***********************************************************
-
-    /**
-     * Makes a request to local node to receive meta data information and maps each field specified in SELECT to its
-     * type in the index mapping
-     */
-    private void loadFromEsState(Query query) {
-        String indexName = fetchIndexName(query);
-        String[] fieldNames = fetchFieldsAsArray(query);
-
-        // Reset boolean in the case of JOIN query where multiple calls to loadFromEsState() are made
-        selectAll = isSimpleQuerySelectAll(query) || isJoinQuerySelectAll(query, fieldNames);
-
-        GetFieldMappingsRequest request = new GetFieldMappingsRequest()
-                .indices(indexName)
-                .fields(selectAllFieldsIfEmpty(fieldNames))
-                .local(true);
-        GetFieldMappingsResponse response = client.admin().indices()
-                .getFieldMappings(request)
-                .actionGet();
-
-        Map<String,  Map<String, FieldMappingMetadata>> mappings = response.mappings();
-        if (mappings.isEmpty() || !mappings.containsKey(indexName)) {
-            throw new IllegalArgumentException(String.format("Index type %s does not exist", query.getFrom()));
-        }
-        Map<String, FieldMappingMetadata> typeMappings = mappings.get(indexName);
-
-
-        this.indexName = this.indexName == null ? indexName : (this.indexName + "|" + indexName);
-        this.columns.addAll(renameColumnWithTableAlias(query, populateColumns(query, fieldNames, typeMappings)));
-    }
-
-    /**
-     * Rename column name with table alias as prefix for join query
-     */
-    private List<Schema.Column> renameColumnWithTableAlias(Query query, List<Schema.Column> columns) {
-        List<Schema.Column> renamedCols;
-        if ((query instanceof TableOnJoinSelect)
-                && !Strings.isNullOrEmpty(((TableOnJoinSelect) query).getAlias())) {
-
-            TableOnJoinSelect joinQuery = (TableOnJoinSelect) query;
-            renamedCols = new ArrayList<>();
-
-            for (Schema.Column column : columns) {
-                renamedCols.add(new Schema.Column(
-                        joinQuery.getAlias() + "." + column.getName(),
-                        column.getAlias(),
-                        Schema.Type.valueOf(column.getType().toUpperCase()),
-                        true
-                ));
-            }
-        } else {
-            renamedCols = columns;
-        }
-        return renamedCols;
-    }
-
-    private boolean isSelectAll() {
-        return selectAll;
-    }
-
-    /**
-     * Is a simple (non-join/non-group-by) query with SELECT * explicitly
-     */
-    private boolean isSimpleQuerySelectAll(Query query) {
-        return (query instanceof Select) && ((Select) query).isSelectAll();
-    }
-
-    /**
-     * Is a join query with SELECT * on either one of the tables  some fields specified
-     */
-    private boolean isJoinQuerySelectAll(Query query, String[] fieldNames) {
-        return fieldNames.length == 0 && !fieldsSelectedOnAnotherTable(query);
-    }
-
-    /**
-     * In the case of a JOIN query, if no fields are SELECTed on for a particular table, the other table's fields are
-     * checked in SELECT to ensure a table is not incorrectly marked as a isSelectAll() case.
-     */
-    private boolean fieldsSelectedOnAnotherTable(Query query) {
-        if (isJoinQuery()) {
-            TableOnJoinSelect otherTable = getOtherTable(query);
-            return otherTable.getSelectedFields().size() > 0;
-        }
-
-        return false;
-    }
-
-    private TableOnJoinSelect getOtherTable(Query currJoinSelect) {
-        JoinSelect joinQuery = (JoinSelect) query;
-        if (joinQuery.getFirstTable() == currJoinSelect) {
-            return joinQuery.getSecondTable();
-        } else {
-            return joinQuery.getFirstTable();
-        }
-    }
-
-    private boolean containsWildcard(Query query) {
-        for (Field field : fetchFields(query)) {
-            if (!(field instanceof MethodField) && field.getName().contains("*")) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private String fetchIndexName(Query query) {
-        return query.getFrom().get(0).getIndex();
-    }
-
-    /**
-     * queryResult is checked to see if it's of type Aggregation in which case the aggregation fields in GROUP BY
-     * are returned as well. This prevents returning a Schema of all fields when SELECT * is called with
-     * GROUP BY (since all fields will be retrieved from the typeMappings request when no fields are returned from
-     * fetchFields()).
-     * <p>
-     * After getting all of the fields from GROUP BY, the fields from SELECT are iterated and only the fields of type
-     * MethodField are added (to prevent duplicate field in Schema for queries like
-     * "SELECT age, COUNT(*) FROM bank GROUP BY age" where 'age' is mentioned in both SELECT and GROUP BY).
+  private static final Logger LOG = LogManager.getLogger(SelectResultSet.class);
+
+  public static final String SCORE = "_score";
+  private final String formatType;
+
+  private Query query;
+  private Object queryResult;
+
+  private boolean selectAll;
+  private String indexName;
+  private List<Schema.Column> columns = new ArrayList<>();
+  private ColumnTypeProvider outputColumnType;
+
+  private List<String> head;
+  private long size;
+  private long totalHits;
+  private long internalTotalHits;
+  private List<DataRows.Row> rows;
+  private Cursor cursor;
+
+  private DateFieldFormatter dateFieldFormatter;
+  // alias -> base field name
+  private Map<String, String> fieldAliasMap = new HashMap<>();
+
+  public SelectResultSet(
+      Client client,
+      Query query,
+      Object queryResult,
+      ColumnTypeProvider outputColumnType,
+      String formatType,
+      Cursor cursor) {
+    this.client = client;
+    this.query = query;
+    this.queryResult = queryResult;
+    this.selectAll = false;
+    this.formatType = formatType;
+    this.outputColumnType = outputColumnType;
+    this.cursor = cursor;
+
+    if (isJoinQuery()) {
+      JoinSelect joinQuery = (JoinSelect) query;
+      loadFromEsState(joinQuery.getFirstTable());
+      loadFromEsState(joinQuery.getSecondTable());
+    } else {
+      loadFromEsState(query);
+    }
+    this.schema = new Schema(indexName, columns);
+    this.head = schema.getHeaders();
+    this.dateFieldFormatter = new DateFieldFormatter(indexName, columns, fieldAliasMap);
+
+    extractData();
+    populateCursor();
+    this.dataRows = new DataRows(size, totalHits, rows);
+  }
+
+  public SelectResultSet(Client client, Object queryResult, String formatType, Cursor cursor) {
+    this.cursor = cursor;
+    this.client = client;
+    this.queryResult = queryResult;
+    this.selectAll = false;
+    this.formatType = formatType;
+    populateResultSetFromCursor(cursor);
+  }
+
+  public String indexName() {
+    return this.indexName;
+  }
+
+  public Map<String, String> fieldAliasMap() {
+    return unmodifiableMap(this.fieldAliasMap);
+  }
+
+  public void populateResultSetFromCursor(Cursor cursor) {
+    switch (cursor.getType()) {
+      case DEFAULT:
+        populateResultSetFromDefaultCursor((DefaultCursor) cursor);
+      default:
+        return;
+    }
+  }
+
+  private void populateResultSetFromDefaultCursor(DefaultCursor cursor) {
+    this.columns = cursor.getColumns();
+    this.schema = new Schema(columns);
+    this.head = schema.getHeaders();
+    this.dateFieldFormatter =
+        new DateFieldFormatter(cursor.getIndexPattern(), columns, cursor.getFieldAliasMap());
+    extractData();
+    this.dataRows = new DataRows(size, totalHits, rows);
+  }
+
+  // ***********************************************************
+  //      Logic for loading Columns to be stored in Schema
+  // ***********************************************************
+
+  /**
+   * Makes a request to local node to receive meta data information and maps each field specified in
+   * SELECT to its type in the index mapping
+   */
+  private void loadFromEsState(Query query) {
+    String indexName = fetchIndexName(query);
+    String[] fieldNames = fetchFieldsAsArray(query);
+
+    // Reset boolean in the case of JOIN query where multiple calls to loadFromEsState() are made
+    selectAll = isSimpleQuerySelectAll(query) || isJoinQuerySelectAll(query, fieldNames);
+
+    GetFieldMappingsRequest request =
+        new GetFieldMappingsRequest()
+            .indices(indexName)
+            .fields(selectAllFieldsIfEmpty(fieldNames))
+            .local(true);
+    GetFieldMappingsResponse response =
+        client.admin().indices().getFieldMappings(request).actionGet();
+
+    Map<String, Map<String, FieldMappingMetadata>> mappings = response.mappings();
+    if (mappings.isEmpty() || !mappings.containsKey(indexName)) {
+      throw new IllegalArgumentException(
+          String.format("Index type %s does not exist", query.getFrom()));
+    }
+    Map<String, FieldMappingMetadata> typeMappings = mappings.get(indexName);
+
+    this.indexName = this.indexName == null ? indexName : (this.indexName + "|" + indexName);
+    this.columns.addAll(
+        renameColumnWithTableAlias(query, populateColumns(query, fieldNames, typeMappings)));
+  }
+
+  /** Rename column name with table alias as prefix for join query */
+  private List<Schema.Column> renameColumnWithTableAlias(Query query, List<Schema.Column> columns) {
+    List<Schema.Column> renamedCols;
+    if ((query instanceof TableOnJoinSelect)
+        && !Strings.isNullOrEmpty(((TableOnJoinSelect) query).getAlias())) {
+
+      TableOnJoinSelect joinQuery = (TableOnJoinSelect) query;
+      renamedCols = new ArrayList<>();
+
+      for (Schema.Column column : columns) {
+        renamedCols.add(
+            new Schema.Column(
+                joinQuery.getAlias() + "." + column.getName(),
+                column.getAlias(),
+                Schema.Type.valueOf(column.getType().toUpperCase()),
+                true));
+      }
+    } else {
+      renamedCols = columns;
+    }
+    return renamedCols;
+  }
+
+  private boolean isSelectAll() {
+    return selectAll;
+  }
+
+  /** Is a simple (non-join/non-group-by) query with SELECT * explicitly */
+  private boolean isSimpleQuerySelectAll(Query query) {
+    return (query instanceof Select) && ((Select) query).isSelectAll();
+  }
+
+  /** Is a join query with SELECT * on either one of the tables some fields specified */
+  private boolean isJoinQuerySelectAll(Query query, String[] fieldNames) {
+    return fieldNames.length == 0 && !fieldsSelectedOnAnotherTable(query);
+  }
+
+  /**
+   * In the case of a JOIN query, if no fields are SELECTed on for a particular table, the other
+   * table's fields are checked in SELECT to ensure a table is not incorrectly marked as a
+   * isSelectAll() case.
+   */
+  private boolean fieldsSelectedOnAnotherTable(Query query) {
+    if (isJoinQuery()) {
+      TableOnJoinSelect otherTable = getOtherTable(query);
+      return otherTable.getSelectedFields().size() > 0;
+    }
+
+    return false;
+  }
+
+  private TableOnJoinSelect getOtherTable(Query currJoinSelect) {
+    JoinSelect joinQuery = (JoinSelect) query;
+    if (joinQuery.getFirstTable() == currJoinSelect) {
+      return joinQuery.getSecondTable();
+    } else {
+      return joinQuery.getFirstTable();
+    }
+  }
+
+  private boolean containsWildcard(Query query) {
+    for (Field field : fetchFields(query)) {
+      if (!(field instanceof MethodField) && field.getName().contains("*")) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  private String fetchIndexName(Query query) {
+    return query.getFrom().get(0).getIndex();
+  }
+
+  /**
+   * queryResult is checked to see if it's of type Aggregation in which case the aggregation fields
+   * in GROUP BY are returned as well. This prevents returning a Schema of all fields when SELECT *
+   * is called with GROUP BY (since all fields will be retrieved from the typeMappings request when
+   * no fields are returned from fetchFields()).
+   *
+   * <p>After getting all of the fields from GROUP BY, the fields from SELECT are iterated and only
+   * the fields of type MethodField are added (to prevent duplicate field in Schema for queries like
+   * "SELECT age, COUNT(*) FROM bank GROUP BY age" where 'age' is mentioned in both SELECT and GROUP
+   * BY).
+   */
+  private List<Field> fetchFields(Query query) {
+    Select select = (Select) query;
+
+    if (queryResult instanceof Aggregations) {
+      List<Field> groupByFields =
+          select.getGroupBys().isEmpty() ? new ArrayList<>() : select.getGroupBys().get(0);
+
+      for (Field selectField : select.getFields()) {
+        if (selectField instanceof MethodField && !selectField.isScriptField()) {
+          groupByFields.add(selectField);
+        } else if (selectField.isScriptField()
+            && selectField.getAlias().equals(groupByFields.get(0).getName())) {
+          return select.getFields();
+        }
+      }
+      return groupByFields;
+    }
+
+    if (query instanceof TableOnJoinSelect) {
+      return ((TableOnJoinSelect) query).getSelectedFields();
+    }
+
+    return select.getFields();
+  }
+
+  private String[] fetchFieldsAsArray(Query query) {
+    List<Field> fields = fetchFields(query);
+    return fields.stream().map(this::getFieldName).toArray(String[]::new);
+  }
+
+  private String getFieldName(Field field) {
+    if (field instanceof MethodField) {
+      return field.getAlias();
+    }
+
+    return field.getName();
+  }
+
+  private Map<String, Field> fetchFieldMap(Query query) {
+    Map<String, Field> fieldMap = new HashMap<>();
+
+    for (Field field : fetchFields(query)) {
+      fieldMap.put(getFieldName(field), field);
+    }
+
+    return fieldMap;
+  }
+
+  private String[] selectAllFieldsIfEmpty(String[] fields) {
+    if (isSelectAll()) {
+      return new String[] {"*"};
+    }
+
+    return fields;
+  }
+
+  private String[] emptyArrayIfNull(String typeName) {
+    if (typeName != null) {
+      return new String[] {typeName};
+    } else {
+      return Strings.EMPTY_ARRAY;
+    }
+  }
+
+  private Schema.Type fetchMethodReturnType(int fieldIndex, MethodField field) {
+    switch (field.getName().toLowerCase()) {
+      case "count":
+        return Schema.Type.LONG;
+      case "sum":
+      case "avg":
+      case "min":
+      case "max":
+      case "percentiles":
+        return Schema.Type.DOUBLE;
+      case "script":
+        {
+          // TODO: return type information is disconnected from the function definitions in
+          // SQLFunctions.
+          // Refactor SQLFunctions to have functions self-explanatory (types, scripts) and pluggable
+          // (similar to Strategy pattern)
+          if (field.getExpression() instanceof SQLCaseExpr) {
+            return Schema.Type.TEXT;
+          }
+          Schema.Type resolvedType = outputColumnType.get(fieldIndex);
+          return SQLFunctions.getScriptFunctionReturnType(field, resolvedType);
+        }
+      default:
+        throw new UnsupportedOperationException(
+            String.format("The following method is not supported in Schema: %s", field.getName()));
+    }
+  }
+
+  /**
+   * Returns a list of Column objects which contain names identifying the field as well as its type.
+   *
+   * <p>If all fields are being selected (SELECT *) then the order of fields returned will be
+   * random, otherwise the output will be in the same order as how they were selected.
+   *
+   * <p>If an alias was given for a field, that will be used to identify the field in Column,
+   * otherwise the field name will be used.
+   */
+  private List<Schema.Column> populateColumns(
+      Query query, String[] fieldNames, Map<String, FieldMappingMetadata> typeMappings) {
+    List<String> fieldNameList;
+
+    if (isSelectAll() || containsWildcard(query)) {
+      fieldNameList = new ArrayList<>(typeMappings.keySet());
+    } else {
+      fieldNameList = Arrays.asList(fieldNames);
+    }
+
+    /*
+     * The reason the 'fieldMap' mapping is needed on top of 'fieldNameList' is because the map would be
+     * empty in cases like 'SELECT *' but List<String> fieldNameList will always be set in either case.
+     * That way, 'fieldNameList' is used to access field names in order that they were selected, if given,
+     * and then 'fieldMap' is used to access the respective Field object to check for aliases.
      */
-    private List<Field> fetchFields(Query query) {
-        Select select = (Select) query;
-
-        if (queryResult instanceof Aggregations) {
-            List<Field> groupByFields = select.getGroupBys().isEmpty() ? new ArrayList<>() :
-                    select.getGroupBys().get(0);
-
-
-            for (Field selectField : select.getFields()) {
-                if (selectField instanceof MethodField && !selectField.isScriptField()) {
-                    groupByFields.add(selectField);
-                } else if (selectField.isScriptField()
-                        && selectField.getAlias().equals(groupByFields.get(0).getName())) {
-                    return select.getFields();
-                }
-            }
-            return groupByFields;
-        }
-
-        if (query instanceof TableOnJoinSelect) {
-            return ((TableOnJoinSelect) query).getSelectedFields();
-        }
-
-        return select.getFields();
-    }
-
-    private String[] fetchFieldsAsArray(Query query) {
-        List<Field> fields = fetchFields(query);
-        return fields.stream()
-                .map(this::getFieldName)
-                .toArray(String[]::new);
-    }
-
-    private String getFieldName(Field field) {
-        if (field instanceof MethodField) {
-            return field.getAlias();
-        }
-
-        return field.getName();
-    }
-
-    private Map<String, Field> fetchFieldMap(Query query) {
-        Map<String, Field> fieldMap = new HashMap<>();
-
-        for (Field field : fetchFields(query)) {
-            fieldMap.put(getFieldName(field), field);
-        }
-
-        return fieldMap;
-    }
-
-    private String[] selectAllFieldsIfEmpty(String[] fields) {
-        if (isSelectAll()) {
-            return new String[]{"*"};
-        }
-
-        return fields;
-    }
-
-    private String[] emptyArrayIfNull(String typeName) {
-        if (typeName != null) {
-            return new String[]{typeName};
-        } else {
-            return Strings.EMPTY_ARRAY;
-        }
-    }
-
-    private Schema.Type fetchMethodReturnType(int fieldIndex, MethodField field) {
-        switch (field.getName().toLowerCase()) {
-            case "count":
-                return Schema.Type.LONG;
-            case "sum":
-            case "avg":
-            case "min":
-            case "max":
-            case "percentiles":
-                return Schema.Type.DOUBLE;
-            case "script": {
-                // TODO: return type information is disconnected from the function definitions in SQLFunctions.
-                // Refactor SQLFunctions to have functions self-explanatory (types, scripts) and pluggable
-                // (similar to Strategy pattern)
-                if (field.getExpression() instanceof SQLCaseExpr) {
-                    return Schema.Type.TEXT;
-                }
-                Schema.Type resolvedType = outputColumnType.get(fieldIndex);
-                return SQLFunctions.getScriptFunctionReturnType(field, resolvedType);
-            }
-            default:
-                throw new UnsupportedOperationException(
-                        String.format("The following method is not supported in Schema: %s", field.getName()));
-        }
-    }
-
-    /**
-     * Returns a list of Column objects which contain names identifying the field as well as its type.
-     * <p>
-     * If all fields are being selected (SELECT *) then the order of fields returned will be random, otherwise
-     * the output will be in the same order as how they were selected.
-     * <p>
-     * If an alias was given for a field, that will be used to identify the field in Column, otherwise the field name
-     * will be used.
-     */
-    private List<Schema.Column> populateColumns(Query query, String[] fieldNames, Map<String,
-            FieldMappingMetadata> typeMappings) {
-        List<String> fieldNameList;
-
-        if (isSelectAll() || containsWildcard(query)) {
-            fieldNameList = new ArrayList<>(typeMappings.keySet());
-        } else {
-            fieldNameList = Arrays.asList(fieldNames);
+    Map<String, Field> fieldMap = fetchFieldMap(query);
+    List<Schema.Column> columns = new ArrayList<>();
+    for (String fieldName : fieldNameList) {
+      // _score is a special case since it is not included in typeMappings, so it is checked for
+      // here
+      if (fieldName.equals(SCORE)) {
+        columns.add(
+            new Schema.Column(fieldName, fetchAlias(fieldName, fieldMap), Schema.Type.FLOAT));
+        continue;
+      }
+      /*
+       * Methods are also a special case as their type cannot be determined from typeMappings, so it is checked
+       * for here.
+       *
+       * Note: When adding the Column for Method, alias is used in place of getName() because the default name
+       * is set as alias (ex. COUNT(*)) and overwritten if an alias is given. So alias is used as the
+       * name instead.
+       */
+      if (fieldMap.get(fieldName) instanceof MethodField) {
+        MethodField methodField = (MethodField) fieldMap.get(fieldName);
+        int fieldIndex = fieldNameList.indexOf(fieldName);
+
+        SQLExpr expr = methodField.getExpression();
+        if (expr instanceof SQLCastExpr) {
+          // Since CAST expressions create an alias for a field, we need to save the original field
+          // name
+          // for this alias for formatting data later.
+          SQLIdentifierExpr castFieldIdentifier =
+              (SQLIdentifierExpr) ((SQLCastExpr) expr).getExpr();
+          fieldAliasMap.put(methodField.getAlias(), castFieldIdentifier.getName());
+        }
+
+        columns.add(
+            new Schema.Column(
+                methodField.getAlias(), null, fetchMethodReturnType(fieldIndex, methodField)));
+        continue;
+      }
+
+      /*
+       * Unnecessary fields (ex. _index, _parent) are ignored.
+       * Fields like field.keyword will be ignored when isSelectAll is true but will be returned if
+       * explicitly selected.
+       */
+      FieldMapping field = new FieldMapping(fieldName, typeMappings, fieldMap);
+      if (!field.isMetaField()) {
+
+        if (field.isMultiField() && !field.isSpecified()) {
+          continue;
+        }
+        if (field.isPropertyField() && !field.isSpecified() && !field.isWildcardSpecified()) {
+          continue;
         }
 
         /*
-         * The reason the 'fieldMap' mapping is needed on top of 'fieldNameList' is because the map would be
-         * empty in cases like 'SELECT *' but List<String> fieldNameList will always be set in either case.
-         * That way, 'fieldNameList' is used to access field names in order that they were selected, if given,
-         * and then 'fieldMap' is used to access the respective Field object to check for aliases.
+         * Three cases regarding Type:
+         * 1. If Type exists, create Column
+         * 2. If Type doesn't exist and isSelectAll() is false, throw exception
+         * 3. If Type doesn't exist and isSelectAll() is true, Column creation for fieldName is skipped
          */
-        Map<String, Field> fieldMap = fetchFieldMap(query);
-        List<Schema.Column> columns = new ArrayList<>();
-        for (String fieldName : fieldNameList) {
-            // _score is a special case since it is not included in typeMappings, so it is checked for here
-            if (fieldName.equals(SCORE)) {
-                columns.add(new Schema.Column(fieldName, fetchAlias(fieldName, fieldMap), Schema.Type.FLOAT));
-                continue;
-            }
-            /*
-             * Methods are also a special case as their type cannot be determined from typeMappings, so it is checked
-             * for here.
-             *
-             * Note: When adding the Column for Method, alias is used in place of getName() because the default name
-             * is set as alias (ex. COUNT(*)) and overwritten if an alias is given. So alias is used as the
-             * name instead.
-             */
-            if (fieldMap.get(fieldName) instanceof MethodField) {
-                MethodField methodField = (MethodField) fieldMap.get(fieldName);
-                int fieldIndex = fieldNameList.indexOf(fieldName);
-
-                SQLExpr expr = methodField.getExpression();
-                if (expr instanceof SQLCastExpr) {
-                    // Since CAST expressions create an alias for a field, we need to save the original field name
-                    // for this alias for formatting data later.
-                    SQLIdentifierExpr castFieldIdentifier = (SQLIdentifierExpr) ((SQLCastExpr) expr).getExpr();
-                    fieldAliasMap.put(methodField.getAlias(), castFieldIdentifier.getName());
-                }
-
-                columns.add(
-                        new Schema.Column(
-                                methodField.getAlias(),
-                                null,
-                                fetchMethodReturnType(fieldIndex, methodField)
-                        )
-                );
-                continue;
-            }
-
-            /*
-             * Unnecessary fields (ex. _index, _parent) are ignored.
-             * Fields like field.keyword will be ignored when isSelectAll is true but will be returned if
-             * explicitly selected.
-             */
-            FieldMapping field = new FieldMapping(fieldName, typeMappings, fieldMap);
-            if (!field.isMetaField()) {
-
-                if (field.isMultiField() && !field.isSpecified()) {
-                    continue;
-                }
-                if (field.isPropertyField() && !field.isSpecified() && !field.isWildcardSpecified()) {
-                    continue;
-                }
-
-                /*
-                 * Three cases regarding Type:
-                 * 1. If Type exists, create Column
-                 * 2. If Type doesn't exist and isSelectAll() is false, throw exception
-                 * 3. If Type doesn't exist and isSelectAll() is true, Column creation for fieldName is skipped
-                 */
-                String type = field.type().toUpperCase();
-                if (Schema.hasType(type)) {
-
-                    // If the current field is a group key, we should use alias as the identifier
-                    boolean isGroupKey = false;
-                    Select select = (Select) query;
-                    if (null != select.getGroupBys()
-                            && !select.getGroupBys().isEmpty()
-                            && select.getGroupBys().get(0).contains(fieldMap.get(fieldName))) {
-                        isGroupKey = true;
-                    }
-
-                    columns.add(
-                            new Schema.Column(
-                                    fieldName,
-                                    fetchAlias(fieldName, fieldMap),
-                                    Schema.Type.valueOf(type),
-                                    isGroupKey
-                            )
-                    );
-                } else if (!isSelectAll()) {
-                    throw new IllegalArgumentException(
-                            String.format("%s fieldName types are currently not supported.", type));
-                }
-            }
-        }
-
-        if (isSelectAllOnly(query)) {
-            populateAllNestedFields(columns, fieldNameList);
-        }
-        return columns;
-    }
-
-    /**
-     * SELECT * only without other columns or wildcard pattern specified.
-     */
-    private boolean isSelectAllOnly(Query query) {
-        return isSelectAll() && fetchFields(query).isEmpty();
-    }
-
-    /**
-     * Special case which trades off consistency of SELECT * meaning for more intuition from customer perspective.
-     * In other cases, * means all regular fields on the level.
-     * The only exception here is * picks all non-regular (nested) fields as JSON without flatten.
-     */
-    private void populateAllNestedFields(List<Schema.Column> columns, List<String> fields) {
-        Set<String> nestedFieldPaths = fields.stream().
-                map(FieldMapping::new).
-                filter(FieldMapping::isPropertyField).
-                filter(f -> !f.isMultiField()).
-                map(FieldMapping::path).
-                collect(toSet());
-
-        for (String nestedFieldPath : nestedFieldPaths) {
-            columns.add(
-                    new Schema.Column(nestedFieldPath, "", Schema.Type.TEXT)
-            );
-        }
-    }
-
-    /**
-     * Since this helper method is called within a check to see if the field exists in type mapping, it's
-     * already confirmed that the fieldName is valid. The check for fieldName in fieldMap has to be done in the case
-     * that 'SELECT *' was called since the map will be empty.
-     */
-    private String fetchAlias(String fieldName, Map<String, Field> fieldMap) {
-        if (fieldMap.containsKey(fieldName)) {
-            return fieldMap.get(fieldName).getAlias();
-        }
-
-        return null;
-    }
-
-    //***********************************************************
-    //      Logic for loading Rows to be stored in DataRows
-    //***********************************************************
-
+        String type = field.type().toUpperCase();
+        if (Schema.hasType(type)) {
+
+          // If the current field is a group key, we should use alias as the identifier
+          boolean isGroupKey = false;
+          Select select = (Select) query;
+          if (null != select.getGroupBys()
+              && !select.getGroupBys().isEmpty()
+              && select.getGroupBys().get(0).contains(fieldMap.get(fieldName))) {
+            isGroupKey = true;
+          }
+
+          columns.add(
+              new Schema.Column(
+                  fieldName,
+                  fetchAlias(fieldName, fieldMap),
+                  Schema.Type.valueOf(type),
+                  isGroupKey));
+        } else if (!isSelectAll()) {
+          throw new IllegalArgumentException(
+              String.format("%s fieldName types are currently not supported.", type));
+        }
+      }
+    }
+
+    if (isSelectAllOnly(query)) {
+      populateAllNestedFields(columns, fieldNameList);
+    }
+    return columns;
+  }
+
+  /** SELECT * only without other columns or wildcard pattern specified. */
+  private boolean isSelectAllOnly(Query query) {
+    return isSelectAll() && fetchFields(query).isEmpty();
+  }
+
+  /**
+   * Special case which trades off consistency of SELECT * meaning for more intuition from customer
+   * perspective. In other cases, * means all regular fields on the level. The only exception here
+   * is * picks all non-regular (nested) fields as JSON without flatten.
+   */
+  private void populateAllNestedFields(List<Schema.Column> columns, List<String> fields) {
+    Set<String> nestedFieldPaths =
+        fields.stream()
+            .map(FieldMapping::new)
+            .filter(FieldMapping::isPropertyField)
+            .filter(f -> !f.isMultiField())
+            .map(FieldMapping::path)
+            .collect(toSet());
+
+    for (String nestedFieldPath : nestedFieldPaths) {
+      columns.add(new Schema.Column(nestedFieldPath, "", Schema.Type.TEXT));
+    }
+  }
+
+  /**
+   * Since this helper method is called within a check to see if the field exists in type mapping,
+   * it's already confirmed that the fieldName is valid. The check for fieldName in fieldMap has to
+   * be done in the case that 'SELECT *' was called since the map will be empty.
+   */
+  private String fetchAlias(String fieldName, Map<String, Field> fieldMap) {
+    if (fieldMap.containsKey(fieldName)) {
+      return fieldMap.get(fieldName).getAlias();
+    }
+
+    return null;
+  }
+
+  // ***********************************************************
+  //      Logic for loading Rows to be stored in DataRows
+  // ***********************************************************
+
+  /**
+   * Extract data from query results into Row objects Need to cover two cases: 1. queryResult is a
+   * SearchHits object 2. queryResult is an Aggregations object
+   *
+   * <p>Ignoring queryResult being ActionResponse (from executeDeleteAction), there should be no
+   * data in this case
+   */
+  private void extractData() {
+    if (queryResult instanceof SearchHits) {
+      SearchHits searchHits = (SearchHits) queryResult;
+
+      this.rows = populateRows(searchHits);
+      this.size = rows.size();
+      this.internalTotalHits =
+          Optional.ofNullable(searchHits.getTotalHits()).map(th -> th.value).orElse(0L);
+      // size may be greater than totalHits after nested rows be flatten
+      this.totalHits = Math.max(size, internalTotalHits);
+    } else if (queryResult instanceof Aggregations) {
+      Aggregations aggregations = (Aggregations) queryResult;
+
+      this.rows = populateRows(aggregations);
+      this.size = rows.size();
+      this.internalTotalHits = size;
+      // Total hits is not available from Aggregations so 'size' is used
+      this.totalHits = size;
+    }
+  }
+
+  private void populateCursor() {
+    switch (cursor.getType()) {
+      case DEFAULT:
+        populateDefaultCursor((DefaultCursor) cursor);
+      default:
+        return;
+    }
+  }
+
+  private void populateDefaultCursor(DefaultCursor cursor) {
     /**
-     * Extract data from query results into Row objects
-     * Need to cover two cases:
-     * 1. queryResult is a SearchHits object
-     * 2. queryResult is an Aggregations object
-     * <p>
-     * Ignoring queryResult being ActionResponse (from executeDeleteAction), there should be no data in this case
+     * Assumption: scrollId, fetchSize, limit already being set in
+     *
+     * @see PrettyFormatRestExecutor.buildProtocolForDefaultQuery()
      */
-    private void extractData() {
-        if (queryResult instanceof SearchHits) {
-            SearchHits searchHits = (SearchHits) queryResult;
-
-            this.rows = populateRows(searchHits);
-            this.size = rows.size();
-            this.internalTotalHits = Optional.ofNullable(searchHits.getTotalHits()).map(th -> th.value).orElse(0L);
-            // size may be greater than totalHits after nested rows be flatten
-            this.totalHits = Math.max(size, internalTotalHits);
-        } else if (queryResult instanceof Aggregations) {
-            Aggregations aggregations = (Aggregations) queryResult;
-
-            this.rows = populateRows(aggregations);
-            this.size = rows.size();
-            this.internalTotalHits = size;
-            // Total hits is not available from Aggregations so 'size' is used
-            this.totalHits = size;
-        }
-    }
-
-    private void populateCursor() {
-        switch(cursor.getType()) {
-            case DEFAULT:
-                populateDefaultCursor((DefaultCursor) cursor);
-            default:
-                return;
-        }
-    }
-
-    private void populateDefaultCursor(DefaultCursor cursor) {
-        /**
-         * Assumption: scrollId, fetchSize, limit already being set in
-         * @see PrettyFormatRestExecutor.buildProtocolForDefaultQuery()
-         */
-
-        Integer limit = cursor.getLimit();
-        long rowsLeft = rowsLeft(cursor.getFetchSize(), cursor.getLimit());
-        if (rowsLeft <= 0) {
-            // close the cursor
-            String scrollId = cursor.getScrollId();
-            ClearScrollResponse clearScrollResponse = client.prepareClearScroll().addScrollId(scrollId).get();
-            if (!clearScrollResponse.isSucceeded()) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-                LOG.error("Error closing the cursor context {} ", scrollId);
-            }
-            return;
-        }
-
-        cursor.setRowsLeft(rowsLeft);
-        cursor.setIndexPattern(indexName);
-        cursor.setFieldAliasMap(fieldAliasMap());
-        cursor.setColumns(columns);
-        this.totalHits = limit != null && limit < internalTotalHits ? limit : internalTotalHits;
-    }
-
-    private long rowsLeft(Integer fetchSize, Integer limit) {
-        long rowsLeft = 0;
-        long totalHits = internalTotalHits;
-        if (limit != null && limit < totalHits) {
-            rowsLeft = limit - fetchSize;
-        } else {
-            rowsLeft = totalHits - fetchSize;
-        }
-        return rowsLeft;
-    }
-
-    private List<DataRows.Row> populateRows(SearchHits searchHits) {
-        List<DataRows.Row> rows = new ArrayList<>();
-        Set<String> newKeys = new HashSet<>(head);
-        for (SearchHit hit : searchHits) {
-            Map<String, Object> rowSource = hit.getSourceAsMap();
-            List<DataRows.Row> result;
-
-            if (!isJoinQuery()) {
-                // Row already flatten in source in join. And join doesn't support nested fields for now.
-                rowSource = flatRow(head, rowSource);
-                rowSource.put(SCORE, hit.getScore());
-
-                for (Map.Entry<String, DocumentField> field : hit.getFields().entrySet()) {
-                    rowSource.put(field.getKey(), field.getValue().getValue());
-                }
-                if (formatType.equalsIgnoreCase(Format.JDBC.getFormatName())) {
-                    dateFieldFormatter.applyJDBCDateFormat(rowSource);
-                }
-                result = flatNestedField(newKeys, rowSource, hit.getInnerHits());
-            } else {
-                if (formatType.equalsIgnoreCase(Format.JDBC.getFormatName())) {
-                    dateFieldFormatter.applyJDBCDateFormat(rowSource);
-                }
-                result = new ArrayList<>();
-                result.add(new DataRows.Row(rowSource));
-            }
-
-            rows.addAll(result);
-        }
-
-        return rows;
-    }
-
-    private List<DataRows.Row> populateRows(Aggregations aggregations) {
-        List<DataRows.Row> rows = new ArrayList<>();
-        List<Aggregation> aggs = aggregations.asList();
-        if (hasTermAggregations(aggs)) {
-            Terms terms = (Terms) aggs.get(0);
-            String field = terms.getName();
-
-            for (Terms.Bucket bucket : terms.getBuckets()) {
-                List<DataRows.Row> aggRows = new ArrayList<>();
-                getAggsData(bucket, aggRows, addMap(field, bucket.getKey()));
-
-                rows.addAll(aggRows);
-            }
-        } else {
-            // This occurs for cases like "SELECT AVG(age) FROM bank" where we aggregate in SELECT with no GROUP BY
-            rows.add(
-                    new DataRows.Row(
-                            addNumericAggregation(aggs, new HashMap<>())
-                    )
-            );
+    Integer limit = cursor.getLimit();
+    long rowsLeft = rowsLeft(cursor.getFetchSize(), cursor.getLimit());
+    if (rowsLeft <= 0) {
+      // close the cursor
+      String scrollId = cursor.getScrollId();
+      ClearScrollResponse clearScrollResponse =
+          client.prepareClearScroll().addScrollId(scrollId).get();
+      if (!clearScrollResponse.isSucceeded()) {
+        Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
+        LOG.error("Error closing the cursor context {} ", scrollId);
+      }
+      return;
+    }
+
+    cursor.setRowsLeft(rowsLeft);
+    cursor.setIndexPattern(indexName);
+    cursor.setFieldAliasMap(fieldAliasMap());
+    cursor.setColumns(columns);
+    this.totalHits = limit != null && limit < internalTotalHits ? limit : internalTotalHits;
+  }
+
+  private long rowsLeft(Integer fetchSize, Integer limit) {
+    long rowsLeft = 0;
+    long totalHits = internalTotalHits;
+    if (limit != null && limit < totalHits) {
+      rowsLeft = limit - fetchSize;
+    } else {
+      rowsLeft = totalHits - fetchSize;
+    }
+    return rowsLeft;
+  }
+
+  private List<DataRows.Row> populateRows(SearchHits searchHits) {
+    List<DataRows.Row> rows = new ArrayList<>();
+    Set<String> newKeys = new HashSet<>(head);
+    for (SearchHit hit : searchHits) {
+      Map<String, Object> rowSource = hit.getSourceAsMap();
+      List<DataRows.Row> result;
+
+      if (!isJoinQuery()) {
+        // Row already flatten in source in join. And join doesn't support nested fields for now.
+        rowSource = flatRow(head, rowSource);
+        rowSource.put(SCORE, hit.getScore());
+
+        for (Map.Entry<String, DocumentField> field : hit.getFields().entrySet()) {
+          rowSource.put(field.getKey(), field.getValue().getValue());
+        }
+        if (formatType.equalsIgnoreCase(Format.JDBC.getFormatName())) {
+          dateFieldFormatter.applyJDBCDateFormat(rowSource);
+        }
+        result = flatNestedField(newKeys, rowSource, hit.getInnerHits());
+      } else {
+        if (formatType.equalsIgnoreCase(Format.JDBC.getFormatName())) {
+          dateFieldFormatter.applyJDBCDateFormat(rowSource);
+        }
+        result = new ArrayList<>();
+        result.add(new DataRows.Row(rowSource));
+      }
+
+      rows.addAll(result);
+    }
+
+    return rows;
+  }
+
+  private List<DataRows.Row> populateRows(Aggregations aggregations) {
+    List<DataRows.Row> rows = new ArrayList<>();
+    List<Aggregation> aggs = aggregations.asList();
+    if (hasTermAggregations(aggs)) {
+      Terms terms = (Terms) aggs.get(0);
+      String field = terms.getName();
+
+      for (Terms.Bucket bucket : terms.getBuckets()) {
+        List<DataRows.Row> aggRows = new ArrayList<>();
+        getAggsData(bucket, aggRows, addMap(field, bucket.getKey()));
+
+        rows.addAll(aggRows);
+      }
+    } else {
+      // This occurs for cases like "SELECT AVG(age) FROM bank" where we aggregate in SELECT with no
+      // GROUP BY
+      rows.add(new DataRows.Row(addNumericAggregation(aggs, new HashMap<>())));
+    }
+    return rows;
+  }
+
+  /**
+   * This recursive method goes through the buckets iterated through populateRows() and flattens any
+   * inner aggregations and puts that data as a Map into a Row (this nested aggregation happens when
+   * we GROUP BY multiple fields)
+   */
+  private void getAggsData(
+      Terms.Bucket bucket, List<DataRows.Row> aggRows, Map<String, Object> data) {
+    List<Aggregation> aggs = bucket.getAggregations().asList();
+    if (hasTermAggregations(aggs)) {
+      Terms terms = (Terms) aggs.get(0);
+      String field = terms.getName();
+
+      for (Terms.Bucket innerBucket : terms.getBuckets()) {
+        data.put(field, innerBucket.getKey());
+        getAggsData(innerBucket, aggRows, data);
+        data.remove(field);
+      }
+    } else {
+      data = addNumericAggregation(aggs, data);
+      aggRows.add(new DataRows.Row(new HashMap<>(data)));
+    }
+  }
+
+  /**
+   * hasTermAggregations() checks for specific type of aggregation, one that contains Terms. This is
+   * the case when the aggregations contains the contents of a GROUP BY field.
+   *
+   * <p>If the aggregation contains the data for an aggregation function (ex. COUNT(*)), the items
+   * in the list will be of instance InternalValueCount, InternalSum, etc. (depending on the
+   * aggregation function) and will be considered a base case of getAggsData() which will add that
+   * data to the Row (if it exists).
+   */
+  private boolean hasTermAggregations(List<Aggregation> aggs) {
+    return !aggs.isEmpty() && aggs.get(0) instanceof Terms;
+  }
+
+  /**
+   * Adds the contents of Aggregation (specifically the NumericMetricsAggregation.SingleValue
+   * instance) from bucket.aggregations into the data map
+   */
+  private Map<String, Object> addNumericAggregation(
+      List<Aggregation> aggs, Map<String, Object> data) {
+    for (Aggregation aggregation : aggs) {
+      if (aggregation instanceof NumericMetricsAggregation.SingleValue) {
+        NumericMetricsAggregation.SingleValue singleValueAggregation =
+            (NumericMetricsAggregation.SingleValue) aggregation;
+        data.put(
+            singleValueAggregation.getName(),
+            !Double.isInfinite(singleValueAggregation.value())
+                ? singleValueAggregation.getValueAsString()
+                : "null");
+      } else if (aggregation instanceof Percentiles) {
+        Percentiles percentiles = (Percentiles) aggregation;
+
+        data.put(
+            percentiles.getName(),
+            StreamSupport.stream(percentiles.spliterator(), false)
+                .collect(
+                    Collectors.toMap(
+                        Percentile::getPercent,
+                        Percentile::getValue,
+                        (v1, v2) -> {
+                          throw new IllegalArgumentException(
+                              String.format("Duplicate key for values %s and %s", v1, v2));
+                        },
+                        TreeMap::new)));
+      } else {
+        throw new SqlFeatureNotImplementedException(
+            "Aggregation type " + aggregation.getType() + " is not yet implemented");
+      }
+    }
+
+    return data;
+  }
+
+  /**
+   * Simplifies the structure of row's source Map by flattening it, making the full path of an
+   * object the key and the Object it refers to the value. This handles the case of regular object
+   * since nested objects will not be in hit.source but rather in hit.innerHits
+   *
+   * <p>Sample input: keys = ['comments.likes'] row = comments: { likes: 2 }
+   *
+   * <p>Return: flattenedRow = {comment.likes: 2}
+   */
+  @SuppressWarnings("unchecked")
+  private Map<String, Object> flatRow(List<String> keys, Map<String, Object> row) {
+    Map<String, Object> flattenedRow = new HashMap<>();
+    for (String key : keys) {
+      String[] splitKeys = key.split("\\.");
+      boolean found = true;
+      Object currentObj = row;
+
+      for (String splitKey : splitKeys) {
+        // This check is made to prevent Cast Exception as an ArrayList of objects can be in the
+        // sourceMap
+        if (!(currentObj instanceof Map)) {
+          found = false;
+          break;
+        }
+
+        Map<String, Object> currentMap = (Map<String, Object>) currentObj;
+        if (!currentMap.containsKey(splitKey)) {
+          found = false;
+          break;
+        }
+
+        currentObj = currentMap.get(splitKey);
+      }
+
+      if (found) {
+        flattenedRow.put(key, currentObj);
+      }
+    }
+
+    return flattenedRow;
+  }
+
+  /**
+   * If innerHits associated with column name exists, flatten both the inner field name and the
+   * inner rows in it.
+   *
+   * <p>Sample input: newKeys = {'region', 'employees.age'}, row = {'region': 'US'} innerHits =
+   * employees: { hits: [{ source: { age: 26, firstname: 'Hank' } },{ source: { age: 30, firstname:
+   * 'John' } }] }
+   */
+  private List<DataRows.Row> flatNestedField(
+      Set<String> newKeys, Map<String, Object> row, Map<String, SearchHits> innerHits) {
+    List<DataRows.Row> result = new ArrayList<>();
+    result.add(new DataRows.Row(row));
+
+    if (innerHits == null) {
+      return result;
+    }
+
+    for (String colName : innerHits.keySet()) {
+      SearchHit[] colValue = innerHits.get(colName).getHits();
+      doFlatNestedFieldName(colName, colValue, newKeys);
+      result = doFlatNestedFieldValue(colName, colValue, result);
+    }
+
+    return result;
+  }
+
+  private void doFlatNestedFieldName(String colName, SearchHit[] colValue, Set<String> keys) {
+    Map<String, Object> innerRow = colValue[0].getSourceAsMap();
+    for (String field : innerRow.keySet()) {
+      String innerName = colName + "." + field;
+      keys.add(innerName);
+    }
+
+    keys.remove(colName);
+  }
+
+  /**
+   * Do Cartesian Product between current outer row and inner rows by nested loop and remove
+   * original outer row.
+   *
+   * <p>Sample input: colName = 'employees', rows = [{region: 'US'}] colValue= [{ source: { age: 26,
+   * firstname: 'Hank' } },{ source: { age: 30, firstname: 'John' } }]
+   *
+   * <p>Return: [ {region:'US', employees.age:26, employees.firstname:'Hank'}, {region:'US',
+   * employees.age:30, employees.firstname:'John'} ]
+   */
+  private List<DataRows.Row> doFlatNestedFieldValue(
+      String colName, SearchHit[] colValue, List<DataRows.Row> rows) {
+    List<DataRows.Row> result = new ArrayList<>();
+    for (DataRows.Row row : rows) {
+      for (SearchHit hit : colValue) {
+        Map<String, Object> innerRow = hit.getSourceAsMap();
+        Map<String, Object> copy = new HashMap<>();
+
+        for (String field : row.getContents().keySet()) {
+          copy.put(field, row.getData(field));
         }
-        return rows;
-    }
-
-    /**
-     * This recursive method goes through the buckets iterated through populateRows() and flattens any inner
-     * aggregations and puts that data as a Map into a Row (this nested aggregation happens when we GROUP BY
-     * multiple fields)
-     */
-    private void getAggsData(Terms.Bucket bucket, List<DataRows.Row> aggRows, Map<String, Object> data) {
-        List<Aggregation> aggs = bucket.getAggregations().asList();
-        if (hasTermAggregations(aggs)) {
-            Terms terms = (Terms) aggs.get(0);
-            String field = terms.getName();
-
-            for (Terms.Bucket innerBucket : terms.getBuckets()) {
-                data.put(field, innerBucket.getKey());
-                getAggsData(innerBucket, aggRows, data);
-                data.remove(field);
-            }
-        } else {
-            data = addNumericAggregation(aggs, data);
-            aggRows.add(new DataRows.Row(new HashMap<>(data)));
-        }
-    }
-
-    /**
-     * hasTermAggregations() checks for specific type of aggregation, one that contains Terms. This is the case when the
-     * aggregations contains the contents of a GROUP BY field.
-     * <p>
-     * If the aggregation contains the data for an aggregation function (ex. COUNT(*)), the items in the list will
-     * be of instance InternalValueCount, InternalSum, etc. (depending on the aggregation function) and will be
-     * considered a base case of getAggsData() which will add that data to the Row (if it exists).
-     */
-    private boolean hasTermAggregations(List<Aggregation> aggs) {
-        return !aggs.isEmpty() && aggs.get(0) instanceof Terms;
-    }
-
-    /**
-     * Adds the contents of Aggregation (specifically the NumericMetricsAggregation.SingleValue instance) from
-     * bucket.aggregations into the data map
-     */
-    private Map<String, Object> addNumericAggregation(List<Aggregation> aggs, Map<String, Object> data) {
-        for (Aggregation aggregation : aggs) {
-            if (aggregation instanceof NumericMetricsAggregation.SingleValue) {
-                NumericMetricsAggregation.SingleValue singleValueAggregation =
-                        (NumericMetricsAggregation.SingleValue) aggregation;
-                data.put(singleValueAggregation.getName(), !Double.isInfinite(singleValueAggregation.value())
-                        ? singleValueAggregation.getValueAsString() : "null");
-            } else if (aggregation instanceof Percentiles) {
-                Percentiles percentiles = (Percentiles) aggregation;
-
-                data.put(percentiles.getName(), StreamSupport
-                        .stream(percentiles.spliterator(), false)
-                        .collect(
-                                Collectors.toMap(
-                                        Percentile::getPercent,
-                                        Percentile::getValue,
-                                        (v1, v2) -> {
-                                            throw new IllegalArgumentException(
-                                                    String.format("Duplicate key for values %s and %s", v1, v2));
-                                        },
-                                        TreeMap::new)));
-            } else {
-                throw new SqlFeatureNotImplementedException("Aggregation type " + aggregation.getType()
-                        + " is not yet implemented");
-            }
-        }
-
-        return data;
-    }
-
-    /**
-     * Simplifies the structure of row's source Map by flattening it, making the full path of an object the key
-     * and the Object it refers to the value. This handles the case of regular object since nested objects will not
-     * be in hit.source but rather in hit.innerHits
-     * <p>
-     * Sample input:
-     * keys = ['comments.likes']
-     * row = comments: {
-     * likes: 2
-     * }
-     * <p>
-     * Return:
-     * flattenedRow = {comment.likes: 2}
-     */
-    @SuppressWarnings("unchecked")
-    private Map<String, Object> flatRow(List<String> keys, Map<String, Object> row) {
-        Map<String, Object> flattenedRow = new HashMap<>();
-        for (String key : keys) {
-            String[] splitKeys = key.split("\\.");
-            boolean found = true;
-            Object currentObj = row;
-
-            for (String splitKey : splitKeys) {
-                // This check is made to prevent Cast Exception as an ArrayList of objects can be in the sourceMap
-                if (!(currentObj instanceof Map)) {
-                    found = false;
-                    break;
-                }
-
-                Map<String, Object> currentMap = (Map<String, Object>) currentObj;
-                if (!currentMap.containsKey(splitKey)) {
-                    found = false;
-                    break;
-                }
-
-                currentObj = currentMap.get(splitKey);
-            }
-
-            if (found) {
-                flattenedRow.put(key, currentObj);
-            }
-        }
-
-        return flattenedRow;
-    }
-
-    /**
-     * If innerHits associated with column name exists, flatten both the inner field name and the inner rows in it.
-     * <p>
-     * Sample input:
-     * newKeys = {'region', 'employees.age'}, row = {'region': 'US'}
-     * innerHits = employees: {
-     * hits: [{
-     * source: {
-     * age: 26,
-     * firstname: 'Hank'
-     * }
-     * },{
-     * source: {
-     * age: 30,
-     * firstname: 'John'
-     * }
-     * }]
-     * }
-     */
-    private List<DataRows.Row> flatNestedField(Set<String> newKeys, Map<String, Object> row,
-                                               Map<String, SearchHits> innerHits) {
-        List<DataRows.Row> result = new ArrayList<>();
-        result.add(new DataRows.Row(row));
-
-        if (innerHits == null) {
-            return result;
-        }
-
-        for (String colName : innerHits.keySet()) {
-            SearchHit[] colValue = innerHits.get(colName).getHits();
-            doFlatNestedFieldName(colName, colValue, newKeys);
-            result = doFlatNestedFieldValue(colName, colValue, result);
-        }
-
-        return result;
-    }
-
-    private void doFlatNestedFieldName(String colName, SearchHit[] colValue, Set<String> keys) {
-        Map<String, Object> innerRow = colValue[0].getSourceAsMap();
         for (String field : innerRow.keySet()) {
-            String innerName = colName + "." + field;
-            keys.add(innerName);
+          copy.put(colName + "." + field, innerRow.get(field));
         }
 
-        keys.remove(colName);
+        copy.remove(colName);
+        result.add(new DataRows.Row(copy));
+      }
     }
 
-    /**
-     * Do Cartesian Product between current outer row and inner rows by nested loop and remove original outer row.
-     * <p>
-     * Sample input:
-     * colName = 'employees', rows = [{region: 'US'}]
-     * colValue= [{
-     * source: {
-     * age: 26,
-     * firstname: 'Hank'
-     * }
-     * },{
-     * source: {
-     * age: 30,
-     * firstname: 'John'
-     * }
-     * }]
-     * <p>
-     * Return:
-     * [
-     * {region:'US', employees.age:26, employees.firstname:'Hank'},
-     * {region:'US', employees.age:30, employees.firstname:'John'}
-     * ]
-     */
-    private List<DataRows.Row> doFlatNestedFieldValue(String colName, SearchHit[] colValue, List<DataRows.Row> rows) {
-        List<DataRows.Row> result = new ArrayList<>();
-        for (DataRows.Row row : rows) {
-            for (SearchHit hit : colValue) {
-                Map<String, Object> innerRow = hit.getSourceAsMap();
-                Map<String, Object> copy = new HashMap<>();
-
-                for (String field : row.getContents().keySet()) {
-                    copy.put(field, row.getData(field));
-                }
-                for (String field : innerRow.keySet()) {
-                    copy.put(colName + "." + field, innerRow.get(field));
-                }
-
-                copy.remove(colName);
-                result.add(new DataRows.Row(copy));
-            }
-        }
+    return result;
+  }
 
-        return result;
-    }
-
-    private Map<String, Object> addMap(String field, Object term) {
-        Map<String, Object> data = new HashMap<>();
-        data.put(field, term);
-        return data;
-    }
+  private Map<String, Object> addMap(String field, Object term) {
+    Map<String, Object> data = new HashMap<>();
+    data.put(field, term);
+    return data;
+  }
 
-    private boolean isJoinQuery() {
-        return query instanceof JoinSelect;
-    }
+  private boolean isJoinQuery() {
+    return query instanceof JoinSelect;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ShowResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ShowResultSet.java
index 0a32f6c582..263bf1e7db 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ShowResultSet.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ShowResultSet.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import java.util.ArrayList;
@@ -21,62 +20,62 @@
 
 public class ShowResultSet extends ResultSet {
 
-    private static final String TABLE_TYPE = "BASE TABLE";
-
-    private IndexStatement statement;
-    private Object queryResult;
-
-    public ShowResultSet(Client client, IndexStatement statement, Object queryResult) {
-        this.client = client;
-        this.clusterName = getClusterName();
-        this.statement = statement;
-        this.queryResult = queryResult;
-
-        this.schema = new Schema(statement, loadColumns());
-        this.dataRows = new DataRows(loadRows());
+  private static final String TABLE_TYPE = "BASE TABLE";
+
+  private IndexStatement statement;
+  private Object queryResult;
+
+  public ShowResultSet(Client client, IndexStatement statement, Object queryResult) {
+    this.client = client;
+    this.clusterName = getClusterName();
+    this.statement = statement;
+    this.queryResult = queryResult;
+
+    this.schema = new Schema(statement, loadColumns());
+    this.dataRows = new DataRows(loadRows());
+  }
+
+  private List<Column> loadColumns() {
+    List<Column> columns = new ArrayList<>();
+    // Unused Columns are still included in Schema to match JDBC/ODBC standard
+    columns.add(new Column("TABLE_CAT", null, Type.KEYWORD));
+    columns.add(new Column("TABLE_SCHEM", null, Type.KEYWORD)); // Not used
+    columns.add(new Column("TABLE_NAME", null, Type.KEYWORD));
+    columns.add(new Column("TABLE_TYPE", null, Type.KEYWORD));
+    columns.add(new Column("REMARKS", null, Type.KEYWORD)); // Not used
+    columns.add(new Column("TYPE_CAT", null, Type.KEYWORD)); // Not used
+    columns.add(new Column("TYPE_SCHEM", null, Type.KEYWORD)); // Not used
+    columns.add(new Column("TYPE_NAME", null, Type.KEYWORD)); // Not used
+    columns.add(new Column("SELF_REFERENCING_COL_NAME", null, Type.KEYWORD)); // Not used
+    columns.add(new Column("REF_GENERATION", null, Type.KEYWORD)); // Not used
+
+    return columns;
+  }
+
+  private List<Row> loadRows() {
+    List<Row> rows = new ArrayList<>();
+    for (String index : extractIndices()) {
+      rows.add(new Row(loadData(index)));
     }
 
-    private List<Column> loadColumns() {
-        List<Column> columns = new ArrayList<>();
-        // Unused Columns are still included in Schema to match JDBC/ODBC standard
-        columns.add(new Column("TABLE_CAT", null, Type.KEYWORD));
-        columns.add(new Column("TABLE_SCHEM", null, Type.KEYWORD)); // Not used
-        columns.add(new Column("TABLE_NAME", null, Type.KEYWORD));
-        columns.add(new Column("TABLE_TYPE", null, Type.KEYWORD));
-        columns.add(new Column("REMARKS", null, Type.KEYWORD)); // Not used
-        columns.add(new Column("TYPE_CAT", null, Type.KEYWORD)); // Not used
-        columns.add(new Column("TYPE_SCHEM", null, Type.KEYWORD)); // Not used
-        columns.add(new Column("TYPE_NAME", null, Type.KEYWORD)); // Not used
-        columns.add(new Column("SELF_REFERENCING_COL_NAME", null, Type.KEYWORD)); // Not used
-        columns.add(new Column("REF_GENERATION", null, Type.KEYWORD)); // Not used
+    return rows;
+  }
 
-        return columns;
-    }
+  private List<String> extractIndices() {
+    String indexPattern = statement.getIndexPattern();
+    String[] indices = ((GetIndexResponse) queryResult).getIndices();
 
-    private List<Row> loadRows() {
-        List<Row> rows = new ArrayList<>();
-        for (String index : extractIndices()) {
-            rows.add(new Row(loadData(index)));
-        }
+    return Arrays.stream(indices)
+        .filter(index -> matchesPatternIfRegex(index, indexPattern))
+        .collect(Collectors.toList());
+  }
 
-        return rows;
-    }
+  private Map<String, Object> loadData(String tableName) {
+    Map<String, Object> data = new HashMap<>();
+    data.put("TABLE_CAT", clusterName);
+    data.put("TABLE_NAME", tableName);
+    data.put("TABLE_TYPE", TABLE_TYPE);
 
-    private List<String> extractIndices() {
-        String indexPattern = statement.getIndexPattern();
-        String[] indices = ((GetIndexResponse) queryResult).getIndices();
-
-        return Arrays.stream(indices)
-                .filter(index -> matchesPatternIfRegex(index, indexPattern))
-                .collect(Collectors.toList());
-    }
-
-    private Map<String, Object> loadData(String tableName) {
-        Map<String, Object> data = new HashMap<>();
-        data.put("TABLE_CAT", clusterName);
-        data.put("TABLE_NAME", tableName);
-        data.put("TABLE_TYPE", TABLE_TYPE);
-
-        return data;
-    }
+    return data;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticJoinExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticJoinExecutor.java
index 811d444a7f..f0ffafc470 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticJoinExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticJoinExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.join;
 
 import java.io.IOException;
@@ -21,13 +20,12 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
 import org.opensearch.common.document.DocumentField;
-import org.opensearch.common.text.Text;
 import org.opensearch.common.unit.TimeValue;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 import org.opensearch.search.sort.FieldSortBuilder;
@@ -42,219 +40,239 @@
 import org.opensearch.sql.legacy.query.join.TableInJoinRequestBuilder;
 import org.opensearch.sql.legacy.query.planner.HashJoinQueryPlanRequestBuilder;
 
-/**
- * Created by Eliran on 15/9/2015.
- */
+/** Created by Eliran on 15/9/2015. */
 public abstract class ElasticJoinExecutor implements ElasticHitsExecutor {
-    private static final Logger LOG = LogManager.getLogger();
-
-    protected List<SearchHit> results; // Keep list to avoid copy to new array in SearchHits
-    protected MetaSearchResult metaResults;
-    protected final int MAX_RESULTS_ON_ONE_FETCH = 10000;
-    private Set<String> aliasesOnReturn;
-    private boolean allFieldsReturn;
-
-    protected ElasticJoinExecutor(JoinRequestBuilder requestBuilder) {
-        metaResults = new MetaSearchResult();
-        aliasesOnReturn = new HashSet<>();
-        List<Field> firstTableReturnedField = requestBuilder.getFirstTable().getReturnedFields();
-        List<Field> secondTableReturnedField = requestBuilder.getSecondTable().getReturnedFields();
-        allFieldsReturn = (firstTableReturnedField == null || firstTableReturnedField.size() == 0)
-                && (secondTableReturnedField == null || secondTableReturnedField.size() == 0);
-    }
-
-    public void sendResponse(RestChannel channel) throws IOException {
-        XContentBuilder builder = null;
-        long len;
-        try {
-            builder = ElasticUtils.hitsAsStringResultZeroCopy(results, metaResults, this);
-            BytesRestResponse bytesRestResponse = new BytesRestResponse(RestStatus.OK, builder);
-            len = bytesRestResponse.content().length();
-            channel.sendResponse(bytesRestResponse);
-        } catch (IOException e) {
-            try {
-                if (builder != null) {
-                    builder.close();
-                }
-            } catch (Exception ex) {
-                // Ignore. Already logged in channel
-            }
-            throw e;
+  private static final Logger LOG = LogManager.getLogger();
+
+  protected List<SearchHit> results; // Keep list to avoid copy to new array in SearchHits
+  protected MetaSearchResult metaResults;
+  protected final int MAX_RESULTS_ON_ONE_FETCH = 10000;
+  private Set<String> aliasesOnReturn;
+  private boolean allFieldsReturn;
+
+  protected ElasticJoinExecutor(JoinRequestBuilder requestBuilder) {
+    metaResults = new MetaSearchResult();
+    aliasesOnReturn = new HashSet<>();
+    List<Field> firstTableReturnedField = requestBuilder.getFirstTable().getReturnedFields();
+    List<Field> secondTableReturnedField = requestBuilder.getSecondTable().getReturnedFields();
+    allFieldsReturn =
+        (firstTableReturnedField == null || firstTableReturnedField.size() == 0)
+            && (secondTableReturnedField == null || secondTableReturnedField.size() == 0);
+  }
+
+  public void sendResponse(RestChannel channel) throws IOException {
+    XContentBuilder builder = null;
+    long len;
+    try {
+      builder = ElasticUtils.hitsAsStringResultZeroCopy(results, metaResults, this);
+      BytesRestResponse bytesRestResponse = new BytesRestResponse(RestStatus.OK, builder);
+      len = bytesRestResponse.content().length();
+      channel.sendResponse(bytesRestResponse);
+    } catch (IOException e) {
+      try {
+        if (builder != null) {
+          builder.close();
         }
-        LOG.debug("[MCB] Successfully send response with size of {}. Thread id = {}", len,
-                Thread.currentThread().getId());
-    }
-
-    public void run() throws IOException, SqlParseException {
-        long timeBefore = System.currentTimeMillis();
-        results = innerRun();
-        long joinTimeInMilli = System.currentTimeMillis() - timeBefore;
-        this.metaResults.setTookImMilli(joinTimeInMilli);
+      } catch (Exception ex) {
+        // Ignore. Already logged in channel
+      }
+      throw e;
     }
-
-
-    protected abstract List<SearchHit> innerRun() throws IOException, SqlParseException;
-
-    public SearchHits getHits() {
-        return new SearchHits(results.toArray(new SearchHit[results.size()]), new TotalHits(results.size(),
-                Relation.EQUAL_TO), 1.0f);
+    LOG.debug(
+        "[MCB] Successfully send response with size of {}. Thread id = {}",
+        len,
+        Thread.currentThread().getId());
+  }
+
+  public void run() throws IOException, SqlParseException {
+    long timeBefore = System.currentTimeMillis();
+    results = innerRun();
+    long joinTimeInMilli = System.currentTimeMillis() - timeBefore;
+    this.metaResults.setTookImMilli(joinTimeInMilli);
+  }
+
+  protected abstract List<SearchHit> innerRun() throws IOException, SqlParseException;
+
+  public SearchHits getHits() {
+    return new SearchHits(
+        results.toArray(new SearchHit[results.size()]),
+        new TotalHits(results.size(), Relation.EQUAL_TO),
+        1.0f);
+  }
+
+  public static ElasticJoinExecutor createJoinExecutor(
+      Client client, SqlElasticRequestBuilder requestBuilder) {
+    if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
+      return new QueryPlanElasticExecutor((HashJoinQueryPlanRequestBuilder) requestBuilder);
+    } else if (requestBuilder instanceof HashJoinElasticRequestBuilder) {
+      HashJoinElasticRequestBuilder hashJoin = (HashJoinElasticRequestBuilder) requestBuilder;
+      return new HashJoinElasticExecutor(client, hashJoin);
+    } else if (requestBuilder instanceof NestedLoopsElasticRequestBuilder) {
+      NestedLoopsElasticRequestBuilder nestedLoops =
+          (NestedLoopsElasticRequestBuilder) requestBuilder;
+      return new NestedLoopsElasticExecutor(client, nestedLoops);
+    } else {
+      throw new RuntimeException("Unsuported requestBuilder of type: " + requestBuilder.getClass());
     }
-
-    public static ElasticJoinExecutor createJoinExecutor(Client client, SqlElasticRequestBuilder requestBuilder) {
-        if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
-            return new QueryPlanElasticExecutor((HashJoinQueryPlanRequestBuilder) requestBuilder);
-        } else if (requestBuilder instanceof HashJoinElasticRequestBuilder) {
-            HashJoinElasticRequestBuilder hashJoin = (HashJoinElasticRequestBuilder) requestBuilder;
-            return new HashJoinElasticExecutor(client, hashJoin);
-        } else if (requestBuilder instanceof NestedLoopsElasticRequestBuilder) {
-            NestedLoopsElasticRequestBuilder nestedLoops = (NestedLoopsElasticRequestBuilder) requestBuilder;
-            return new NestedLoopsElasticExecutor(client, nestedLoops);
-        } else {
-            throw new RuntimeException("Unsuported requestBuilder of type: " + requestBuilder.getClass());
-        }
+  }
+
+  protected void mergeSourceAndAddAliases(
+      Map<String, Object> secondTableHitSource,
+      SearchHit searchHit,
+      String t1Alias,
+      String t2Alias) {
+    Map<String, Object> results = mapWithAliases(searchHit.getSourceAsMap(), t1Alias);
+    results.putAll(mapWithAliases(secondTableHitSource, t2Alias));
+    searchHit.getSourceAsMap().clear();
+    searchHit.getSourceAsMap().putAll(results);
+  }
+
+  protected Map<String, Object> mapWithAliases(Map<String, Object> source, String alias) {
+    Map<String, Object> mapWithAliases = new HashMap<>();
+    for (Map.Entry<String, Object> fieldNameToValue : source.entrySet()) {
+      if (!aliasesOnReturn.contains(fieldNameToValue.getKey())) {
+        mapWithAliases.put(alias + "." + fieldNameToValue.getKey(), fieldNameToValue.getValue());
+      } else {
+        mapWithAliases.put(fieldNameToValue.getKey(), fieldNameToValue.getValue());
+      }
     }
-
-    protected void mergeSourceAndAddAliases(Map<String, Object> secondTableHitSource, SearchHit searchHit,
-                                            String t1Alias, String t2Alias) {
-        Map<String, Object> results = mapWithAliases(searchHit.getSourceAsMap(), t1Alias);
-        results.putAll(mapWithAliases(secondTableHitSource, t2Alias));
-        searchHit.getSourceAsMap().clear();
-        searchHit.getSourceAsMap().putAll(results);
+    return mapWithAliases;
+  }
+
+  protected void onlyReturnedFields(
+      Map<String, Object> fieldsMap, List<Field> required, boolean allRequired) {
+    HashMap<String, Object> filteredMap = new HashMap<>();
+    if (allFieldsReturn || allRequired) {
+      filteredMap.putAll(fieldsMap);
+      return;
     }
-
-    protected Map<String, Object> mapWithAliases(Map<String, Object> source, String alias) {
-        Map<String, Object> mapWithAliases = new HashMap<>();
-        for (Map.Entry<String, Object> fieldNameToValue : source.entrySet()) {
-            if (!aliasesOnReturn.contains(fieldNameToValue.getKey())) {
-                mapWithAliases.put(alias + "." + fieldNameToValue.getKey(), fieldNameToValue.getValue());
-            } else {
-                mapWithAliases.put(fieldNameToValue.getKey(), fieldNameToValue.getValue());
-            }
-        }
-        return mapWithAliases;
+    for (Field field : required) {
+      String name = field.getName();
+      String returnName = name;
+      String alias = field.getAlias();
+      if (alias != null && alias != "") {
+        returnName = alias;
+        aliasesOnReturn.add(alias);
+      }
+      filteredMap.put(returnName, deepSearchInMap(fieldsMap, name));
     }
-
-    protected void onlyReturnedFields(Map<String, Object> fieldsMap, List<Field> required, boolean allRequired) {
-        HashMap<String, Object> filteredMap = new HashMap<>();
-        if (allFieldsReturn || allRequired) {
-            filteredMap.putAll(fieldsMap);
-            return;
+    fieldsMap.clear();
+    fieldsMap.putAll(filteredMap);
+  }
+
+  protected Object deepSearchInMap(Map<String, Object> fieldsMap, String name) {
+    if (name.contains(".")) {
+      String[] path = name.split("\\.");
+      Map<String, Object> currentObject = fieldsMap;
+      for (int i = 0; i < path.length - 1; i++) {
+        Object valueFromCurrentMap = currentObject.get(path[i]);
+        if (valueFromCurrentMap == null) {
+          return null;
         }
-        for (Field field : required) {
-            String name = field.getName();
-            String returnName = name;
-            String alias = field.getAlias();
-            if (alias != null && alias != "") {
-                returnName = alias;
-                aliasesOnReturn.add(alias);
-            }
-            filteredMap.put(returnName, deepSearchInMap(fieldsMap, name));
+        if (!Map.class.isAssignableFrom(valueFromCurrentMap.getClass())) {
+          return null;
         }
-        fieldsMap.clear();
-        fieldsMap.putAll(filteredMap);
-
+        currentObject = (Map<String, Object>) valueFromCurrentMap;
+      }
+      return currentObject.get(path[path.length - 1]);
     }
 
-    protected Object deepSearchInMap(Map<String, Object> fieldsMap, String name) {
-        if (name.contains(".")) {
-            String[] path = name.split("\\.");
-            Map<String, Object> currentObject = fieldsMap;
-            for (int i = 0; i < path.length - 1; i++) {
-                Object valueFromCurrentMap = currentObject.get(path[i]);
-                if (valueFromCurrentMap == null) {
-                    return null;
-                }
-                if (!Map.class.isAssignableFrom(valueFromCurrentMap.getClass())) {
-                    return null;
-                }
-                currentObject = (Map<String, Object>) valueFromCurrentMap;
-            }
-            return currentObject.get(path[path.length - 1]);
+    return fieldsMap.get(name);
+  }
+
+  protected void addUnmatchedResults(
+      List<SearchHit> combinedResults,
+      Collection<SearchHitsResult> firstTableSearchHits,
+      List<Field> secondTableReturnedFields,
+      int currentNumOfIds,
+      int totalLimit,
+      String t1Alias,
+      String t2Alias) {
+    boolean limitReached = false;
+    for (SearchHitsResult hitsResult : firstTableSearchHits) {
+      if (!hitsResult.isMatchedWithOtherTable()) {
+        for (SearchHit hit : hitsResult.getSearchHits()) {
+
+          // todo: decide which id to put or type. or maby its ok this way. just need to doc.
+          SearchHit unmachedResult =
+              createUnmachedResult(secondTableReturnedFields, hit.docId(), t1Alias, t2Alias, hit);
+          combinedResults.add(unmachedResult);
+          currentNumOfIds++;
+          if (currentNumOfIds >= totalLimit) {
+            limitReached = true;
+            break;
+          }
         }
-
-        return fieldsMap.get(name);
+      }
+      if (limitReached) {
+        break;
+      }
     }
-
-
-    protected void addUnmatchedResults(List<SearchHit> combinedResults,
-                                       Collection<SearchHitsResult> firstTableSearchHits,
-                                       List<Field> secondTableReturnedFields, int currentNumOfIds, int totalLimit,
-                                       String t1Alias, String t2Alias) {
-        boolean limitReached = false;
-        for (SearchHitsResult hitsResult : firstTableSearchHits) {
-            if (!hitsResult.isMatchedWithOtherTable()) {
-                for (SearchHit hit : hitsResult.getSearchHits()) {
-
-                    //todo: decide which id to put or type. or maby its ok this way. just need to doc.
-                    SearchHit unmachedResult = createUnmachedResult(secondTableReturnedFields, hit.docId(),
-                            t1Alias, t2Alias, hit);
-                    combinedResults.add(unmachedResult);
-                    currentNumOfIds++;
-                    if (currentNumOfIds >= totalLimit) {
-                        limitReached = true;
-                        break;
-                    }
-
-                }
-            }
-            if (limitReached) {
-                break;
-            }
-        }
+  }
+
+  protected SearchHit createUnmachedResult(
+      List<Field> secondTableReturnedFields,
+      int docId,
+      String t1Alias,
+      String t2Alias,
+      SearchHit hit) {
+    String unmatchedId = hit.getId() + "|0";
+
+    Map<String, DocumentField> documentFields = new HashMap<>();
+    Map<String, DocumentField> metaFields = new HashMap<>();
+    hit.getFields()
+        .forEach(
+            (fieldName, docField) ->
+                (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName)
+                        ? metaFields
+                        : documentFields)
+                    .put(fieldName, docField));
+    SearchHit searchHit = new SearchHit(docId, unmatchedId, documentFields, metaFields);
+
+    searchHit.sourceRef(hit.getSourceRef());
+    searchHit.getSourceAsMap().clear();
+    searchHit.getSourceAsMap().putAll(hit.getSourceAsMap());
+    Map<String, Object> emptySecondTableHitSource = createNullsSource(secondTableReturnedFields);
+
+    mergeSourceAndAddAliases(emptySecondTableHitSource, searchHit, t1Alias, t2Alias);
+
+    return searchHit;
+  }
+
+  protected Map<String, Object> createNullsSource(List<Field> secondTableReturnedFields) {
+    Map<String, Object> nulledSource = new HashMap<>();
+    for (Field field : secondTableReturnedFields) {
+      if (!field.getName().equals("*")) {
+        nulledSource.put(field.getName(), null);
+      }
     }
-
-    protected SearchHit createUnmachedResult(List<Field> secondTableReturnedFields, int docId, String t1Alias,
-                                             String t2Alias, SearchHit hit) {
-        String unmatchedId = hit.getId() + "|0";
-
-        Map<String, DocumentField> documentFields = new HashMap<>();
-        Map<String, DocumentField> metaFields = new HashMap<>();
-        hit.getFields().forEach((fieldName, docField) ->
-            (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName) ? metaFields : documentFields).put(fieldName, docField));
-        SearchHit searchHit = new SearchHit(docId, unmatchedId,  documentFields, metaFields);
-
-        searchHit.sourceRef(hit.getSourceRef());
-        searchHit.getSourceAsMap().clear();
-        searchHit.getSourceAsMap().putAll(hit.getSourceAsMap());
-        Map<String, Object> emptySecondTableHitSource = createNullsSource(secondTableReturnedFields);
-
-        mergeSourceAndAddAliases(emptySecondTableHitSource, searchHit, t1Alias, t2Alias);
-
-        return searchHit;
+    return nulledSource;
+  }
+
+  protected void updateMetaSearchResults(SearchResponse searchResponse) {
+    this.metaResults.addSuccessfulShards(searchResponse.getSuccessfulShards());
+    this.metaResults.addFailedShards(searchResponse.getFailedShards());
+    this.metaResults.addTotalNumOfShards(searchResponse.getTotalShards());
+    this.metaResults.updateTimeOut(searchResponse.isTimedOut());
+  }
+
+  protected SearchResponse scrollOneTimeWithMax(
+      Client client, TableInJoinRequestBuilder tableRequest) {
+    SearchRequestBuilder scrollRequest =
+        tableRequest
+            .getRequestBuilder()
+            .setScroll(new TimeValue(60000))
+            .setSize(MAX_RESULTS_ON_ONE_FETCH);
+    boolean ordered = tableRequest.getOriginalSelect().isOrderdSelect();
+    if (!ordered) {
+      scrollRequest.addSort(FieldSortBuilder.DOC_FIELD_NAME, SortOrder.ASC);
     }
-
-    protected Map<String, Object> createNullsSource(List<Field> secondTableReturnedFields) {
-        Map<String, Object> nulledSource = new HashMap<>();
-        for (Field field : secondTableReturnedFields) {
-            if (!field.getName().equals("*")) {
-                nulledSource.put(field.getName(), null);
-            }
-        }
-        return nulledSource;
-    }
-
-    protected void updateMetaSearchResults(SearchResponse searchResponse) {
-        this.metaResults.addSuccessfulShards(searchResponse.getSuccessfulShards());
-        this.metaResults.addFailedShards(searchResponse.getFailedShards());
-        this.metaResults.addTotalNumOfShards(searchResponse.getTotalShards());
-        this.metaResults.updateTimeOut(searchResponse.isTimedOut());
-    }
-
-    protected SearchResponse scrollOneTimeWithMax(Client client, TableInJoinRequestBuilder tableRequest) {
-        SearchRequestBuilder scrollRequest = tableRequest.getRequestBuilder()
-                .setScroll(new TimeValue(60000)).setSize(MAX_RESULTS_ON_ONE_FETCH);
-        boolean ordered = tableRequest.getOriginalSelect().isOrderdSelect();
-        if (!ordered) {
-            scrollRequest.addSort(FieldSortBuilder.DOC_FIELD_NAME, SortOrder.ASC);
-        }
-        SearchResponse responseWithHits = scrollRequest.get();
-        //on ordered select - not using SCAN , elastic returns hits on first scroll
-        //es5.0 elastic always return docs on scan
-        //  if(!ordered)
-        //  responseWithHits = client.prepareSearchScroll(responseWithHits.getScrollId())
-        //  .setScroll(new TimeValue(600000)).get();
-        return responseWithHits;
-    }
-
-
+    SearchResponse responseWithHits = scrollRequest.get();
+    // on ordered select - not using SCAN , elastic returns hits on first scroll
+    // es5.0 elastic always return docs on scan
+    //  if(!ordered)
+    //  responseWithHits = client.prepareSearchScroll(responseWithHits.getScrollId())
+    //  .setScroll(new TimeValue(600000)).get();
+    return responseWithHits;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticUtils.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticUtils.java
index c3b03c653a..7b6228a3d2 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticUtils.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticUtils.java
@@ -3,10 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.join;
 
-import static org.opensearch.common.xcontent.ToXContent.EMPTY_PARAMS;
+import static org.opensearch.core.xcontent.ToXContent.EMPTY_PARAMS;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
@@ -17,13 +16,12 @@
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
-import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.unit.TimeValue;
-import org.opensearch.common.xcontent.ToXContent.Params;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.xcontent.ToXContent.Params;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 import org.opensearch.search.sort.FieldSortBuilder;
@@ -31,136 +29,144 @@
 import org.opensearch.sql.legacy.domain.Select;
 import org.opensearch.sql.legacy.query.join.BackOffRetryStrategy;
 
-/**
- * Created by Eliran on 2/9/2016.
- */
+/** Created by Eliran on 2/9/2016. */
 public class ElasticUtils {
 
-    public static SearchResponse scrollOneTimeWithHits(Client client, SearchRequestBuilder requestBuilder,
-                                                       Select originalSelect, int resultSize) {
-        SearchRequestBuilder scrollRequest = requestBuilder
-                .setScroll(new TimeValue(60000)).setSize(resultSize);
-        boolean ordered = originalSelect.isOrderdSelect();
-        if (!ordered) {
-            scrollRequest.addSort(FieldSortBuilder.DOC_FIELD_NAME, SortOrder.ASC);
-        }
-        SearchResponse responseWithHits = scrollRequest.get();
-        //on ordered select - not using SCAN , elastic returns hits on first scroll
-        //es5.0 elastic always return docs on scan
-//        if(!ordered) {
-//            responseWithHits = client.prepareSearchScroll(responseWithHits.getScrollId())
-//            .setScroll(new TimeValue(600000)).get();
-//        }
-        return responseWithHits;
+  public static SearchResponse scrollOneTimeWithHits(
+      Client client, SearchRequestBuilder requestBuilder, Select originalSelect, int resultSize) {
+    SearchRequestBuilder scrollRequest =
+        requestBuilder.setScroll(new TimeValue(60000)).setSize(resultSize);
+    boolean ordered = originalSelect.isOrderdSelect();
+    if (!ordered) {
+      scrollRequest.addSort(FieldSortBuilder.DOC_FIELD_NAME, SortOrder.ASC);
+    }
+    SearchResponse responseWithHits = scrollRequest.get();
+    // on ordered select - not using SCAN , elastic returns hits on first scroll
+    // es5.0 elastic always return docs on scan
+    //        if(!ordered) {
+    //            responseWithHits = client.prepareSearchScroll(responseWithHits.getScrollId())
+    //            .setScroll(new TimeValue(600000)).get();
+    //        }
+    return responseWithHits;
+  }
+
+  // use our deserializer instead of results toXcontent because the source field is different from
+  // sourceAsMap.
+  public static String hitsAsStringResult(SearchHits results, MetaSearchResult metaResults)
+      throws IOException {
+    if (results == null) {
+      return null;
+    }
+    Object[] searchHits;
+    searchHits =
+        new Object
+            [Optional.ofNullable(results.getTotalHits()).map(th -> th.value).orElse(0L).intValue()];
+    int i = 0;
+    for (SearchHit hit : results) {
+      HashMap<String, Object> value = new HashMap<>();
+      value.put("_id", hit.getId());
+      value.put("_score", hit.getScore());
+      value.put("_source", hit.getSourceAsMap());
+      searchHits[i] = value;
+      i++;
+    }
+    HashMap<String, Object> hits = new HashMap<>();
+    hits.put(
+        "total",
+        ImmutableMap.of(
+            "value", Optional.ofNullable(results.getTotalHits()).map(th -> th.value).orElse(0L),
+            "relation",
+                Optional.ofNullable(results.getTotalHits())
+                    .map(th -> th.relation)
+                    .orElse(Relation.EQUAL_TO)));
+    hits.put("max_score", results.getMaxScore());
+    hits.put("hits", searchHits);
+    XContentBuilder builder = XContentFactory.jsonBuilder().prettyPrint();
+    builder.startObject();
+    builder.field("took", metaResults.getTookImMilli());
+    builder.field("timed_out", metaResults.isTimedOut());
+    builder.field(
+        "_shards",
+        ImmutableMap.of(
+            "total",
+            metaResults.getTotalNumOfShards(),
+            "successful",
+            metaResults.getSuccessfulShards(),
+            "failed",
+            metaResults.getFailedShards()));
+    builder.field("hits", hits);
+    builder.endObject();
+    return BytesReference.bytes(builder).utf8ToString();
+  }
+
+  /** Generate string by serializing SearchHits in place without any new HashMap copy */
+  public static XContentBuilder hitsAsStringResultZeroCopy(
+      List<SearchHit> results, MetaSearchResult metaResults, ElasticJoinExecutor executor)
+      throws IOException {
+    BytesStreamOutput outputStream = new BytesStreamOutput();
+
+    XContentBuilder builder = XContentFactory.jsonBuilder(outputStream).prettyPrint();
+    builder.startObject();
+    builder.field("took", metaResults.getTookImMilli());
+    builder.field("timed_out", metaResults.isTimedOut());
+    builder.field(
+        "_shards",
+        ImmutableMap.of(
+            "total", metaResults.getTotalNumOfShards(),
+            "successful", metaResults.getSuccessfulShards(),
+            "failed", metaResults.getFailedShards()));
+    toXContent(builder, EMPTY_PARAMS, results, executor);
+    builder.endObject();
+
+    if (!BackOffRetryStrategy.isHealthy(2 * outputStream.size(), executor)) {
+      throw new IllegalStateException("Memory could be insufficient when sendResponse().");
     }
 
-
-    //use our deserializer instead of results toXcontent because the source field is different from sourceAsMap.
-    public static String hitsAsStringResult(SearchHits results, MetaSearchResult metaResults) throws IOException {
-        if (results == null) {
-            return null;
-        }
-        Object[] searchHits;
-        searchHits = new Object[Optional.ofNullable(results.getTotalHits()).map(th -> th.value).orElse(0L).intValue()];
-        int i = 0;
-        for (SearchHit hit : results) {
-            HashMap<String, Object> value = new HashMap<>();
-            value.put("_id", hit.getId());
-            value.put("_score", hit.getScore());
-            value.put("_source", hit.getSourceAsMap());
-            searchHits[i] = value;
-            i++;
-        }
-        HashMap<String, Object> hits = new HashMap<>();
-        hits.put("total", ImmutableMap.of(
-                "value", Optional.ofNullable(results.getTotalHits()).map(th -> th.value).orElse(0L),
-                "relation", Optional.ofNullable(results.getTotalHits()).map(th -> th.relation).orElse(Relation.EQUAL_TO)
-        ));
-        hits.put("max_score", results.getMaxScore());
-        hits.put("hits", searchHits);
-        XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON).prettyPrint();
-        builder.startObject();
-        builder.field("took", metaResults.getTookImMilli());
-        builder.field("timed_out", metaResults.isTimedOut());
-        builder.field("_shards", ImmutableMap.of("total", metaResults.getTotalNumOfShards(),
-                "successful", metaResults.getSuccessfulShards()
-                , "failed", metaResults.getFailedShards()));
-        builder.field("hits", hits);
-        builder.endObject();
-        return BytesReference.bytes(builder).utf8ToString();
+    return builder;
+  }
+
+  /** Code copy from SearchHits */
+  private static void toXContent(
+      XContentBuilder builder, Params params, List<SearchHit> hits, ElasticJoinExecutor executor)
+      throws IOException {
+    builder.startObject(SearchHits.Fields.HITS);
+    builder.field(
+        SearchHits.Fields.TOTAL,
+        ImmutableMap.of("value", hits.size(), "relation", Relation.EQUAL_TO));
+    builder.field(SearchHits.Fields.MAX_SCORE, 1.0f);
+    builder.field(SearchHits.Fields.HITS);
+    builder.startArray();
+
+    for (int i = 0; i < hits.size(); i++) {
+      if (i % 10000 == 0 && !BackOffRetryStrategy.isHealthy()) {
+        throw new IllegalStateException("Memory circuit break when generating json builder");
+      }
+      toXContent(builder, params, hits.get(i));
     }
 
-    /**
-     * Generate string by serializing SearchHits in place without any new HashMap copy
-     */
-    public static XContentBuilder hitsAsStringResultZeroCopy(List<SearchHit> results, MetaSearchResult metaResults,
-                                                             ElasticJoinExecutor executor) throws IOException {
-        BytesStreamOutput outputStream = new BytesStreamOutput();
-
-        XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, outputStream).prettyPrint();
-        builder.startObject();
-        builder.field("took", metaResults.getTookImMilli());
-        builder.field("timed_out", metaResults.isTimedOut());
-        builder.field("_shards", ImmutableMap.of(
-                "total", metaResults.getTotalNumOfShards(),
-                "successful", metaResults.getSuccessfulShards(),
-                "failed", metaResults.getFailedShards()
-        ));
-        toXContent(builder, EMPTY_PARAMS, results, executor);
-        builder.endObject();
-
-        if (!BackOffRetryStrategy.isHealthy(2 * outputStream.size(), executor)) {
-            throw new IllegalStateException("Memory could be insufficient when sendResponse().");
-        }
-
-        return builder;
+    builder.endArray();
+    builder.endObject();
+  }
+
+  /** Code copy from SearchHit but only keep fields interested and replace source by sourceMap */
+  private static void toXContent(XContentBuilder builder, Params params, SearchHit hit)
+      throws IOException {
+    builder.startObject();
+    if (hit.getId() != null) {
+      builder.field("_id", hit.getId());
     }
 
-    /**
-     * Code copy from SearchHits
-     */
-    private static void toXContent(XContentBuilder builder, Params params, List<SearchHit> hits,
-                                   ElasticJoinExecutor executor) throws IOException {
-        builder.startObject(SearchHits.Fields.HITS);
-        builder.field(SearchHits.Fields.TOTAL, ImmutableMap.of(
-                "value", hits.size(),
-                "relation", Relation.EQUAL_TO
-        ));
-        builder.field(SearchHits.Fields.MAX_SCORE, 1.0f);
-        builder.field(SearchHits.Fields.HITS);
-        builder.startArray();
-
-        for (int i = 0; i < hits.size(); i++) {
-            if (i % 10000 == 0 && !BackOffRetryStrategy.isHealthy()) {
-                throw new IllegalStateException("Memory circuit break when generating json builder");
-            }
-            toXContent(builder, params, hits.get(i));
-        }
-
-        builder.endArray();
-        builder.endObject();
+    if (Float.isNaN(hit.getScore())) {
+      builder.nullField("_score");
+    } else {
+      builder.field("_score", hit.getScore());
     }
 
-    /**
-     * Code copy from SearchHit but only keep fields interested and replace source by sourceMap
+    /*
+     * Use sourceMap rather than binary source because source is out-of-date
+     * and only used when creating a new instance of SearchHit
      */
-    private static void toXContent(XContentBuilder builder, Params params, SearchHit hit) throws IOException {
-        builder.startObject();
-        if (hit.getId() != null) {
-            builder.field("_id", hit.getId());
-        }
-
-        if (Float.isNaN(hit.getScore())) {
-            builder.nullField("_score");
-        } else {
-            builder.field("_score", hit.getScore());
-        }
-
-        /*
-         * Use sourceMap rather than binary source because source is out-of-date
-         * and only used when creating a new instance of SearchHit
-         */
-        builder.field("_source", hit.getSourceAsMap());
-        builder.endObject();
-    }
+    builder.field("_source", hit.getSourceAsMap());
+    builder.endObject();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinComparisonStructure.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinComparisonStructure.java
index 52d292a2e5..8216feac66 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinComparisonStructure.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinComparisonStructure.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.join;
 
 import java.util.ArrayList;
@@ -14,55 +13,56 @@
 import org.opensearch.search.SearchHit;
 import org.opensearch.sql.legacy.domain.Field;
 
-/**
- * Created by Eliran on 2/11/2015.
- */
+/** Created by Eliran on 2/11/2015. */
 public class HashJoinComparisonStructure {
-    private HashMap<String, List<Map.Entry<Field, Field>>> comparisonIDtoComparisonFields;
-    private HashMap<String, HashMap<String, SearchHitsResult>> comparisonIDtoComparisonHash;
+  private HashMap<String, List<Map.Entry<Field, Field>>> comparisonIDtoComparisonFields;
+  private HashMap<String, HashMap<String, SearchHitsResult>> comparisonIDtoComparisonHash;
 
-    public HashJoinComparisonStructure(List<List<Map.Entry<Field, Field>>> t1ToT2FieldsComparisons) {
-        comparisonIDtoComparisonFields = new HashMap<>();
-        comparisonIDtoComparisonHash = new HashMap<>();
-        if (t1ToT2FieldsComparisons == null || t1ToT2FieldsComparisons.size() == 0) {
-            String comparisonId = UUID.randomUUID().toString();
-            this.comparisonIDtoComparisonFields.put(comparisonId, new ArrayList<Map.Entry<Field, Field>>());
-            this.comparisonIDtoComparisonHash.put(comparisonId, new HashMap<String, SearchHitsResult>());
-        }
-        for (List<Map.Entry<Field, Field>> comparisonFields : t1ToT2FieldsComparisons) {
-            String comparisonId = UUID.randomUUID().toString();
-            //maby from field to List<IDS> ?
-            this.comparisonIDtoComparisonFields.put(comparisonId, comparisonFields);
-            this.comparisonIDtoComparisonHash.put(comparisonId, new HashMap<String, SearchHitsResult>());
-        }
+  public HashJoinComparisonStructure(List<List<Map.Entry<Field, Field>>> t1ToT2FieldsComparisons) {
+    comparisonIDtoComparisonFields = new HashMap<>();
+    comparisonIDtoComparisonHash = new HashMap<>();
+    if (t1ToT2FieldsComparisons == null || t1ToT2FieldsComparisons.size() == 0) {
+      String comparisonId = UUID.randomUUID().toString();
+      this.comparisonIDtoComparisonFields.put(
+          comparisonId, new ArrayList<Map.Entry<Field, Field>>());
+      this.comparisonIDtoComparisonHash.put(comparisonId, new HashMap<String, SearchHitsResult>());
     }
-
-    public HashMap<String, List<Map.Entry<Field, Field>>> getComparisons() {
-        return comparisonIDtoComparisonFields;
+    for (List<Map.Entry<Field, Field>> comparisonFields : t1ToT2FieldsComparisons) {
+      String comparisonId = UUID.randomUUID().toString();
+      // maby from field to List<IDS> ?
+      this.comparisonIDtoComparisonFields.put(comparisonId, comparisonFields);
+      this.comparisonIDtoComparisonHash.put(comparisonId, new HashMap<String, SearchHitsResult>());
     }
+  }
 
-    public void insertIntoComparisonHash(String comparisonID, String comparisonKey, SearchHit hit) {
-        HashMap<String, SearchHitsResult> comparisonHash = this.comparisonIDtoComparisonHash.get(comparisonID);
-        SearchHitsResult currentSearchHitsResult = comparisonHash.get(comparisonKey);
-        if (currentSearchHitsResult == null) {
-            currentSearchHitsResult = new SearchHitsResult(new ArrayList<SearchHit>(), false);
-            comparisonHash.put(comparisonKey, currentSearchHitsResult);
-        }
-        currentSearchHitsResult.getSearchHits().add(hit);
-    }
+  public HashMap<String, List<Map.Entry<Field, Field>>> getComparisons() {
+    return comparisonIDtoComparisonFields;
+  }
 
-    public SearchHitsResult searchForMatchingSearchHits(String comparisonID, String comparisonKey) {
-        HashMap<String, SearchHitsResult> comparisonHash = this.comparisonIDtoComparisonHash.get(comparisonID);
-        return comparisonHash.get(comparisonKey);
+  public void insertIntoComparisonHash(String comparisonID, String comparisonKey, SearchHit hit) {
+    HashMap<String, SearchHitsResult> comparisonHash =
+        this.comparisonIDtoComparisonHash.get(comparisonID);
+    SearchHitsResult currentSearchHitsResult = comparisonHash.get(comparisonKey);
+    if (currentSearchHitsResult == null) {
+      currentSearchHitsResult = new SearchHitsResult(new ArrayList<SearchHit>(), false);
+      comparisonHash.put(comparisonKey, currentSearchHitsResult);
     }
+    currentSearchHitsResult.getSearchHits().add(hit);
+  }
 
-    public List<SearchHitsResult> getAllSearchHits() {
-        List<SearchHitsResult> allSearchHits = new ArrayList<>();
+  public SearchHitsResult searchForMatchingSearchHits(String comparisonID, String comparisonKey) {
+    HashMap<String, SearchHitsResult> comparisonHash =
+        this.comparisonIDtoComparisonHash.get(comparisonID);
+    return comparisonHash.get(comparisonKey);
+  }
 
-        for (HashMap<String, SearchHitsResult> comparisonHash : this.comparisonIDtoComparisonHash.values()) {
-            allSearchHits.addAll(comparisonHash.values());
-        }
-        return allSearchHits;
-    }
+  public List<SearchHitsResult> getAllSearchHits() {
+    List<SearchHitsResult> allSearchHits = new ArrayList<>();
 
+    for (HashMap<String, SearchHitsResult> comparisonHash :
+        this.comparisonIDtoComparisonHash.values()) {
+      allSearchHits.addAll(comparisonHash.values());
+    }
+    return allSearchHits;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinElasticExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinElasticExecutor.java
index c5511eefc4..06a913205d 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinElasticExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinElasticExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.join;
 
 import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
@@ -21,7 +20,6 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
 import org.opensearch.common.document.DocumentField;
-import org.opensearch.common.text.Text;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.index.query.BoolQueryBuilder;
@@ -35,341 +33,385 @@
 import org.opensearch.sql.legacy.query.join.TableInJoinRequestBuilder;
 import org.opensearch.sql.legacy.query.maker.QueryMaker;
 
-/**
- * Created by Eliran on 22/8/2015.
- */
+/** Created by Eliran on 22/8/2015. */
 public class HashJoinElasticExecutor extends ElasticJoinExecutor {
-    private HashJoinElasticRequestBuilder requestBuilder;
-
-
-    private Client client;
-    private boolean useQueryTermsFilterOptimization = false;
-    private final int MAX_RESULTS_FOR_FIRST_TABLE = 100000;
-    HashJoinComparisonStructure hashJoinComparisonStructure;
-    private Set<String> alreadyMatched;
-
-    public HashJoinElasticExecutor(Client client, HashJoinElasticRequestBuilder requestBuilder) {
-        super(requestBuilder);
-        this.client = client;
-        this.requestBuilder = requestBuilder;
-        this.useQueryTermsFilterOptimization = requestBuilder.isUseTermFiltersOptimization();
-        this.hashJoinComparisonStructure = new HashJoinComparisonStructure(requestBuilder.getT1ToT2FieldsComparison());
-        this.alreadyMatched = new HashSet<>();
+  private HashJoinElasticRequestBuilder requestBuilder;
+
+  private Client client;
+  private boolean useQueryTermsFilterOptimization = false;
+  private final int MAX_RESULTS_FOR_FIRST_TABLE = 100000;
+  HashJoinComparisonStructure hashJoinComparisonStructure;
+  private Set<String> alreadyMatched;
+
+  public HashJoinElasticExecutor(Client client, HashJoinElasticRequestBuilder requestBuilder) {
+    super(requestBuilder);
+    this.client = client;
+    this.requestBuilder = requestBuilder;
+    this.useQueryTermsFilterOptimization = requestBuilder.isUseTermFiltersOptimization();
+    this.hashJoinComparisonStructure =
+        new HashJoinComparisonStructure(requestBuilder.getT1ToT2FieldsComparison());
+    this.alreadyMatched = new HashSet<>();
+  }
+
+  public List<SearchHit> innerRun() throws IOException, SqlParseException {
+
+    Map<String, Map<String, List<Object>>> optimizationTermsFilterStructure =
+        initOptimizationStructure();
+
+    updateFirstTableLimitIfNeeded();
+    TableInJoinRequestBuilder firstTableRequest = requestBuilder.getFirstTable();
+    createKeyToResultsAndFillOptimizationStructure(
+        optimizationTermsFilterStructure, firstTableRequest);
+
+    TableInJoinRequestBuilder secondTableRequest = requestBuilder.getSecondTable();
+    if (needToOptimize(optimizationTermsFilterStructure)) {
+      updateRequestWithTermsFilter(optimizationTermsFilterStructure, secondTableRequest);
     }
 
-    public List<SearchHit> innerRun() throws IOException, SqlParseException {
-
-        Map<String, Map<String, List<Object>>> optimizationTermsFilterStructure = initOptimizationStructure();
-
-        updateFirstTableLimitIfNeeded();
-        TableInJoinRequestBuilder firstTableRequest = requestBuilder.getFirstTable();
-        createKeyToResultsAndFillOptimizationStructure(optimizationTermsFilterStructure, firstTableRequest);
-
-        TableInJoinRequestBuilder secondTableRequest = requestBuilder.getSecondTable();
-        if (needToOptimize(optimizationTermsFilterStructure)) {
-            updateRequestWithTermsFilter(optimizationTermsFilterStructure, secondTableRequest);
-        }
-
-        List<SearchHit> combinedResult = createCombinedResults(secondTableRequest);
-
-        int currentNumOfResults = combinedResult.size();
-        int totalLimit = requestBuilder.getTotalLimit();
-        if (requestBuilder.getJoinType() == SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN
-                && currentNumOfResults < totalLimit) {
-            String t1Alias = requestBuilder.getFirstTable().getAlias();
-            String t2Alias = requestBuilder.getSecondTable().getAlias();
-            //todo: for each till Limit
-            addUnmatchedResults(combinedResult, this.hashJoinComparisonStructure.getAllSearchHits(),
-                    requestBuilder.getSecondTable().getReturnedFields(),
-                    currentNumOfResults, totalLimit,
-                    t1Alias,
-                    t2Alias);
-        }
-        if (firstTableRequest.getOriginalSelect().isOrderdSelect()) {
-            Collections.sort(combinedResult, new Comparator<SearchHit>() {
-                @Override
-                public int compare(SearchHit o1, SearchHit o2) {
-                    return o1.docId() - o2.docId();
-                }
-            });
-
-        }
-        return combinedResult;
+    List<SearchHit> combinedResult = createCombinedResults(secondTableRequest);
+
+    int currentNumOfResults = combinedResult.size();
+    int totalLimit = requestBuilder.getTotalLimit();
+    if (requestBuilder.getJoinType() == SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN
+        && currentNumOfResults < totalLimit) {
+      String t1Alias = requestBuilder.getFirstTable().getAlias();
+      String t2Alias = requestBuilder.getSecondTable().getAlias();
+      // todo: for each till Limit
+      addUnmatchedResults(
+          combinedResult,
+          this.hashJoinComparisonStructure.getAllSearchHits(),
+          requestBuilder.getSecondTable().getReturnedFields(),
+          currentNumOfResults,
+          totalLimit,
+          t1Alias,
+          t2Alias);
     }
-
-    private Map<String, Map<String, List<Object>>> initOptimizationStructure() {
-        Map<String, Map<String, List<Object>>> optimizationTermsFilterStructure = new HashMap<>();
-        for (String comparisonId : this.hashJoinComparisonStructure.getComparisons().keySet()) {
-            optimizationTermsFilterStructure.put(comparisonId, new HashMap<String, List<Object>>());
-        }
-        return optimizationTermsFilterStructure;
-    }
-
-    private void updateFirstTableLimitIfNeeded() {
-        if (requestBuilder.getJoinType() == SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN) {
-            Integer firstTableHintLimit = requestBuilder.getFirstTable().getHintLimit();
-            int totalLimit = requestBuilder.getTotalLimit();
-            if (firstTableHintLimit == null || firstTableHintLimit > totalLimit) {
-                requestBuilder.getFirstTable().setHintLimit(totalLimit);
+    if (firstTableRequest.getOriginalSelect().isOrderdSelect()) {
+      Collections.sort(
+          combinedResult,
+          new Comparator<SearchHit>() {
+            @Override
+            public int compare(SearchHit o1, SearchHit o2) {
+              return o1.docId() - o2.docId();
             }
-        }
+          });
     }
+    return combinedResult;
+  }
 
-    private List<SearchHit> createCombinedResults(TableInJoinRequestBuilder secondTableRequest) {
-        List<SearchHit> combinedResult = new ArrayList<>();
-        int resultIds = 0;
-        int totalLimit = this.requestBuilder.getTotalLimit();
-        Integer hintLimit = secondTableRequest.getHintLimit();
-        SearchResponse searchResponse;
-        boolean finishedScrolling;
-        if (hintLimit != null && hintLimit < MAX_RESULTS_ON_ONE_FETCH) {
-            searchResponse = secondTableRequest.getRequestBuilder().setSize(hintLimit).get();
-            finishedScrolling = true;
-        } else {
-            searchResponse = secondTableRequest.getRequestBuilder()
-                    .setScroll(new TimeValue(60000))
-                    .setSize(MAX_RESULTS_ON_ONE_FETCH).get();
-            //es5.0 no need to scroll again!
-//            searchResponse = client.prepareSearchScroll(searchResponse.getScrollId())
-//            .setScroll(new TimeValue(600000)).get();
-            finishedScrolling = false;
+  private Map<String, Map<String, List<Object>>> initOptimizationStructure() {
+    Map<String, Map<String, List<Object>>> optimizationTermsFilterStructure = new HashMap<>();
+    for (String comparisonId : this.hashJoinComparisonStructure.getComparisons().keySet()) {
+      optimizationTermsFilterStructure.put(comparisonId, new HashMap<String, List<Object>>());
+    }
+    return optimizationTermsFilterStructure;
+  }
+
+  private void updateFirstTableLimitIfNeeded() {
+    if (requestBuilder.getJoinType() == SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN) {
+      Integer firstTableHintLimit = requestBuilder.getFirstTable().getHintLimit();
+      int totalLimit = requestBuilder.getTotalLimit();
+      if (firstTableHintLimit == null || firstTableHintLimit > totalLimit) {
+        requestBuilder.getFirstTable().setHintLimit(totalLimit);
+      }
+    }
+  }
+
+  private List<SearchHit> createCombinedResults(TableInJoinRequestBuilder secondTableRequest) {
+    List<SearchHit> combinedResult = new ArrayList<>();
+    int resultIds = 0;
+    int totalLimit = this.requestBuilder.getTotalLimit();
+    Integer hintLimit = secondTableRequest.getHintLimit();
+    SearchResponse searchResponse;
+    boolean finishedScrolling;
+    if (hintLimit != null && hintLimit < MAX_RESULTS_ON_ONE_FETCH) {
+      searchResponse = secondTableRequest.getRequestBuilder().setSize(hintLimit).get();
+      finishedScrolling = true;
+    } else {
+      searchResponse =
+          secondTableRequest
+              .getRequestBuilder()
+              .setScroll(new TimeValue(60000))
+              .setSize(MAX_RESULTS_ON_ONE_FETCH)
+              .get();
+      // es5.0 no need to scroll again!
+      //            searchResponse = client.prepareSearchScroll(searchResponse.getScrollId())
+      //            .setScroll(new TimeValue(600000)).get();
+      finishedScrolling = false;
+    }
+    updateMetaSearchResults(searchResponse);
+
+    boolean limitReached = false;
+    int fetchedSoFarFromSecondTable = 0;
+    while (!limitReached) {
+      SearchHit[] secondTableHits = searchResponse.getHits().getHits();
+      fetchedSoFarFromSecondTable += secondTableHits.length;
+      for (SearchHit secondTableHit : secondTableHits) {
+        if (limitReached) {
+          break;
         }
-        updateMetaSearchResults(searchResponse);
-
-        boolean limitReached = false;
-        int fetchedSoFarFromSecondTable = 0;
-        while (!limitReached) {
-            SearchHit[] secondTableHits = searchResponse.getHits().getHits();
-            fetchedSoFarFromSecondTable += secondTableHits.length;
-            for (SearchHit secondTableHit : secondTableHits) {
-                if (limitReached) {
-                    break;
-                }
-                //todo: need to run on comparisons. for each comparison check if exists and add.
-                HashMap<String, List<Map.Entry<Field, Field>>> comparisons =
-                        this.hashJoinComparisonStructure.getComparisons();
-
-                for (Map.Entry<String, List<Map.Entry<Field, Field>>> comparison : comparisons.entrySet()) {
-                    String comparisonID = comparison.getKey();
-                    List<Map.Entry<Field, Field>> t1ToT2FieldsComparison = comparison.getValue();
-                    String key = getComparisonKey(t1ToT2FieldsComparison, secondTableHit, false, null);
-
-                    SearchHitsResult searchHitsResult =
-                            this.hashJoinComparisonStructure.searchForMatchingSearchHits(comparisonID, key);
-
-                    if (searchHitsResult != null && searchHitsResult.getSearchHits().size() > 0) {
-                        searchHitsResult.setMatchedWithOtherTable(true);
-                        List<SearchHit> searchHits = searchHitsResult.getSearchHits();
-                        for (SearchHit matchingHit : searchHits) {
-                            String combinedId = matchingHit.getId() + "|" + secondTableHit.getId();
-                            //in order to prevent same matching when using OR on hashJoins.
-                            if (this.alreadyMatched.contains(combinedId)) {
-                                continue;
-                            } else {
-                                this.alreadyMatched.add(combinedId);
-                            }
-
-                            Map<String, Object> copiedSource = new HashMap<String, Object>();
-                            copyMaps(copiedSource, secondTableHit.getSourceAsMap());
-                            onlyReturnedFields(copiedSource, secondTableRequest.getReturnedFields(),
-                                    secondTableRequest.getOriginalSelect().isSelectAll());
-
-                            Map<String, DocumentField> documentFields = new HashMap<>();
-                            Map<String, DocumentField> metaFields = new HashMap<>();
-                            matchingHit.getFields().forEach((fieldName, docField) ->
-                                (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName) ? metaFields : documentFields).put(fieldName, docField));
-                            SearchHit searchHit = new SearchHit(matchingHit.docId(), combinedId,
-                                    documentFields, metaFields);
-                            searchHit.sourceRef(matchingHit.getSourceRef());
-                            searchHit.getSourceAsMap().clear();
-                            searchHit.getSourceAsMap().putAll(matchingHit.getSourceAsMap());
-                            String t1Alias = requestBuilder.getFirstTable().getAlias();
-                            String t2Alias = requestBuilder.getSecondTable().getAlias();
-                            mergeSourceAndAddAliases(copiedSource, searchHit, t1Alias, t2Alias);
-
-                            combinedResult.add(searchHit);
-                            resultIds++;
-                            if (resultIds >= totalLimit) {
-                                limitReached = true;
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            if (!finishedScrolling) {
-                if (secondTableHits.length > 0 && (hintLimit == null || fetchedSoFarFromSecondTable >= hintLimit)) {
-                    searchResponse = client.prepareSearchScroll(searchResponse.getScrollId())
-                            .setScroll(new TimeValue(600000)).execute().actionGet();
-                } else {
-                    break;
-                }
-            } else {
+        // todo: need to run on comparisons. for each comparison check if exists and add.
+        HashMap<String, List<Map.Entry<Field, Field>>> comparisons =
+            this.hashJoinComparisonStructure.getComparisons();
+
+        for (Map.Entry<String, List<Map.Entry<Field, Field>>> comparison : comparisons.entrySet()) {
+          String comparisonID = comparison.getKey();
+          List<Map.Entry<Field, Field>> t1ToT2FieldsComparison = comparison.getValue();
+          String key = getComparisonKey(t1ToT2FieldsComparison, secondTableHit, false, null);
+
+          SearchHitsResult searchHitsResult =
+              this.hashJoinComparisonStructure.searchForMatchingSearchHits(comparisonID, key);
+
+          if (searchHitsResult != null && searchHitsResult.getSearchHits().size() > 0) {
+            searchHitsResult.setMatchedWithOtherTable(true);
+            List<SearchHit> searchHits = searchHitsResult.getSearchHits();
+            for (SearchHit matchingHit : searchHits) {
+              String combinedId = matchingHit.getId() + "|" + secondTableHit.getId();
+              // in order to prevent same matching when using OR on hashJoins.
+              if (this.alreadyMatched.contains(combinedId)) {
+                continue;
+              } else {
+                this.alreadyMatched.add(combinedId);
+              }
+
+              Map<String, Object> copiedSource = new HashMap<String, Object>();
+              copyMaps(copiedSource, secondTableHit.getSourceAsMap());
+              onlyReturnedFields(
+                  copiedSource,
+                  secondTableRequest.getReturnedFields(),
+                  secondTableRequest.getOriginalSelect().isSelectAll());
+
+              Map<String, DocumentField> documentFields = new HashMap<>();
+              Map<String, DocumentField> metaFields = new HashMap<>();
+              matchingHit
+                  .getFields()
+                  .forEach(
+                      (fieldName, docField) ->
+                          (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName)
+                                  ? metaFields
+                                  : documentFields)
+                              .put(fieldName, docField));
+              SearchHit searchHit =
+                  new SearchHit(matchingHit.docId(), combinedId, documentFields, metaFields);
+              searchHit.sourceRef(matchingHit.getSourceRef());
+              searchHit.getSourceAsMap().clear();
+              searchHit.getSourceAsMap().putAll(matchingHit.getSourceAsMap());
+              String t1Alias = requestBuilder.getFirstTable().getAlias();
+              String t2Alias = requestBuilder.getSecondTable().getAlias();
+              mergeSourceAndAddAliases(copiedSource, searchHit, t1Alias, t2Alias);
+
+              combinedResult.add(searchHit);
+              resultIds++;
+              if (resultIds >= totalLimit) {
+                limitReached = true;
                 break;
+              }
             }
+          }
         }
-        return combinedResult;
-    }
-
-    private void copyMaps(Map<String, Object> into, Map<String, Object> from) {
-        for (Map.Entry<String, Object> keyAndValue : from.entrySet()) {
-            into.put(keyAndValue.getKey(), keyAndValue.getValue());
+      }
+      if (!finishedScrolling) {
+        if (secondTableHits.length > 0
+            && (hintLimit == null || fetchedSoFarFromSecondTable >= hintLimit)) {
+          searchResponse =
+              client
+                  .prepareSearchScroll(searchResponse.getScrollId())
+                  .setScroll(new TimeValue(600000))
+                  .execute()
+                  .actionGet();
+        } else {
+          break;
         }
+      } else {
+        break;
+      }
     }
+    return combinedResult;
+  }
 
-    private void createKeyToResultsAndFillOptimizationStructure(
-            Map<String, Map<String, List<Object>>> optimizationTermsFilterStructure,
-            TableInJoinRequestBuilder firstTableRequest) {
-        List<SearchHit> firstTableHits = fetchAllHits(firstTableRequest);
-
-        int resultIds = 1;
-        for (SearchHit hit : firstTableHits) {
-            HashMap<String, List<Map.Entry<Field, Field>>> comparisons =
-                    this.hashJoinComparisonStructure.getComparisons();
-            for (Map.Entry<String, List<Map.Entry<Field, Field>>> comparison : comparisons.entrySet()) {
-                String comparisonID = comparison.getKey();
-                List<Map.Entry<Field, Field>> t1ToT2FieldsComparison = comparison.getValue();
-
-                String key = getComparisonKey(t1ToT2FieldsComparison, hit, true,
-                        optimizationTermsFilterStructure.get(comparisonID));
-
-                //int docid , id
-                Map<String, DocumentField> documentFields = new HashMap<>();
-                Map<String, DocumentField> metaFields = new HashMap<>();
-                hit.getFields().forEach((fieldName, docField) ->
-                    (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName) ? metaFields : documentFields).put(fieldName, docField));
-                SearchHit searchHit = new SearchHit(resultIds, hit.getId(), documentFields
-                        , metaFields);
-                searchHit.sourceRef(hit.getSourceRef());
-
-                onlyReturnedFields(searchHit.getSourceAsMap(), firstTableRequest.getReturnedFields(),
-                        firstTableRequest.getOriginalSelect().isSelectAll());
-                resultIds++;
-                this.hashJoinComparisonStructure.insertIntoComparisonHash(comparisonID, key, searchHit);
-            }
-        }
+  private void copyMaps(Map<String, Object> into, Map<String, Object> from) {
+    for (Map.Entry<String, Object> keyAndValue : from.entrySet()) {
+      into.put(keyAndValue.getKey(), keyAndValue.getValue());
     }
-
-    private List<SearchHit> fetchAllHits(TableInJoinRequestBuilder tableInJoinRequest) {
-        Integer hintLimit = tableInJoinRequest.getHintLimit();
-        SearchRequestBuilder requestBuilder = tableInJoinRequest.getRequestBuilder();
-        if (hintLimit != null && hintLimit < MAX_RESULTS_ON_ONE_FETCH) {
-            requestBuilder.setSize(hintLimit);
-            SearchResponse searchResponse = requestBuilder.get();
-            updateMetaSearchResults(searchResponse);
-            return Arrays.asList(searchResponse.getHits().getHits());
-        }
-        return scrollTillLimit(tableInJoinRequest, hintLimit);
+  }
+
+  private void createKeyToResultsAndFillOptimizationStructure(
+      Map<String, Map<String, List<Object>>> optimizationTermsFilterStructure,
+      TableInJoinRequestBuilder firstTableRequest) {
+    List<SearchHit> firstTableHits = fetchAllHits(firstTableRequest);
+
+    int resultIds = 1;
+    for (SearchHit hit : firstTableHits) {
+      HashMap<String, List<Map.Entry<Field, Field>>> comparisons =
+          this.hashJoinComparisonStructure.getComparisons();
+      for (Map.Entry<String, List<Map.Entry<Field, Field>>> comparison : comparisons.entrySet()) {
+        String comparisonID = comparison.getKey();
+        List<Map.Entry<Field, Field>> t1ToT2FieldsComparison = comparison.getValue();
+
+        String key =
+            getComparisonKey(
+                t1ToT2FieldsComparison,
+                hit,
+                true,
+                optimizationTermsFilterStructure.get(comparisonID));
+
+        // int docid , id
+        Map<String, DocumentField> documentFields = new HashMap<>();
+        Map<String, DocumentField> metaFields = new HashMap<>();
+        hit.getFields()
+            .forEach(
+                (fieldName, docField) ->
+                    (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName)
+                            ? metaFields
+                            : documentFields)
+                        .put(fieldName, docField));
+        SearchHit searchHit = new SearchHit(resultIds, hit.getId(), documentFields, metaFields);
+        searchHit.sourceRef(hit.getSourceRef());
+
+        onlyReturnedFields(
+            searchHit.getSourceAsMap(),
+            firstTableRequest.getReturnedFields(),
+            firstTableRequest.getOriginalSelect().isSelectAll());
+        resultIds++;
+        this.hashJoinComparisonStructure.insertIntoComparisonHash(comparisonID, key, searchHit);
+      }
+    }
+  }
+
+  private List<SearchHit> fetchAllHits(TableInJoinRequestBuilder tableInJoinRequest) {
+    Integer hintLimit = tableInJoinRequest.getHintLimit();
+    SearchRequestBuilder requestBuilder = tableInJoinRequest.getRequestBuilder();
+    if (hintLimit != null && hintLimit < MAX_RESULTS_ON_ONE_FETCH) {
+      requestBuilder.setSize(hintLimit);
+      SearchResponse searchResponse = requestBuilder.get();
+      updateMetaSearchResults(searchResponse);
+      return Arrays.asList(searchResponse.getHits().getHits());
     }
+    return scrollTillLimit(tableInJoinRequest, hintLimit);
+  }
 
-    private List<SearchHit> scrollTillLimit(TableInJoinRequestBuilder tableInJoinRequest, Integer hintLimit) {
-        SearchResponse scrollResp = scrollOneTimeWithMax(client, tableInJoinRequest);
+  private List<SearchHit> scrollTillLimit(
+      TableInJoinRequestBuilder tableInJoinRequest, Integer hintLimit) {
+    SearchResponse scrollResp = scrollOneTimeWithMax(client, tableInJoinRequest);
 
-        updateMetaSearchResults(scrollResp);
-        List<SearchHit> hitsWithScan = new ArrayList<>();
-        int curentNumOfResults = 0;
-        SearchHit[] hits = scrollResp.getHits().getHits();
+    updateMetaSearchResults(scrollResp);
+    List<SearchHit> hitsWithScan = new ArrayList<>();
+    int curentNumOfResults = 0;
+    SearchHit[] hits = scrollResp.getHits().getHits();
 
-        if (hintLimit == null) {
-            hintLimit = MAX_RESULTS_FOR_FIRST_TABLE;
-        }
-
-        while (hits.length != 0 && curentNumOfResults < hintLimit) {
-            curentNumOfResults += hits.length;
-            Collections.addAll(hitsWithScan, hits);
-            if (curentNumOfResults >= MAX_RESULTS_FOR_FIRST_TABLE) {
-                //todo: log or exception?
-                System.out.println("too many results for first table, stoping at:" + curentNumOfResults);
-                break;
-            }
-            scrollResp = client.prepareSearchScroll(scrollResp.getScrollId()).setScroll(new TimeValue(600000))
-                    .execute().actionGet();
-            hits = scrollResp.getHits().getHits();
-        }
-        return hitsWithScan;
+    if (hintLimit == null) {
+      hintLimit = MAX_RESULTS_FOR_FIRST_TABLE;
     }
 
-    private boolean needToOptimize(Map<String, Map<String, List<Object>>> optimizationTermsFilterStructure) {
-        if (!useQueryTermsFilterOptimization && optimizationTermsFilterStructure != null
-                && optimizationTermsFilterStructure.size() > 0) {
-            return false;
-        }
-        boolean allEmpty = true;
-        for (Map<String, List<Object>> optimization : optimizationTermsFilterStructure.values()) {
-            if (optimization.size() > 0) {
-                allEmpty = false;
-                break;
-            }
-        }
-        return !allEmpty;
+    while (hits.length != 0 && curentNumOfResults < hintLimit) {
+      curentNumOfResults += hits.length;
+      Collections.addAll(hitsWithScan, hits);
+      if (curentNumOfResults >= MAX_RESULTS_FOR_FIRST_TABLE) {
+        // todo: log or exception?
+        System.out.println("too many results for first table, stoping at:" + curentNumOfResults);
+        break;
+      }
+      scrollResp =
+          client
+              .prepareSearchScroll(scrollResp.getScrollId())
+              .setScroll(new TimeValue(600000))
+              .execute()
+              .actionGet();
+      hits = scrollResp.getHits().getHits();
     }
-
-    private void updateRequestWithTermsFilter(Map<String, Map<String, List<Object>>> optimizationTermsFilterStructure,
-                                              TableInJoinRequestBuilder secondTableRequest) throws SqlParseException {
-        Select select = secondTableRequest.getOriginalSelect();
-
-        BoolQueryBuilder orQuery = QueryBuilders.boolQuery();
-        for (Map<String, List<Object>> optimization : optimizationTermsFilterStructure.values()) {
-            BoolQueryBuilder andQuery = QueryBuilders.boolQuery();
-            for (Map.Entry<String, List<Object>> keyToValues : optimization.entrySet()) {
-                String fieldName = keyToValues.getKey();
-                List<Object> values = keyToValues.getValue();
-                andQuery.must(QueryBuilders.termsQuery(fieldName, values));
-            }
-            orQuery.should(andQuery);
-        }
-
-        Where where = select.getWhere();
-
-        BoolQueryBuilder boolQuery;
-        if (where != null) {
-            boolQuery = QueryMaker.explain(where, false);
-            boolQuery.must(orQuery);
-        } else {
-            boolQuery = orQuery;
-        }
-        secondTableRequest.getRequestBuilder().setQuery(boolQuery);
+    return hitsWithScan;
+  }
+
+  private boolean needToOptimize(
+      Map<String, Map<String, List<Object>>> optimizationTermsFilterStructure) {
+    if (!useQueryTermsFilterOptimization
+        && optimizationTermsFilterStructure != null
+        && optimizationTermsFilterStructure.size() > 0) {
+      return false;
+    }
+    boolean allEmpty = true;
+    for (Map<String, List<Object>> optimization : optimizationTermsFilterStructure.values()) {
+      if (optimization.size() > 0) {
+        allEmpty = false;
+        break;
+      }
+    }
+    return !allEmpty;
+  }
+
+  private void updateRequestWithTermsFilter(
+      Map<String, Map<String, List<Object>>> optimizationTermsFilterStructure,
+      TableInJoinRequestBuilder secondTableRequest)
+      throws SqlParseException {
+    Select select = secondTableRequest.getOriginalSelect();
+
+    BoolQueryBuilder orQuery = QueryBuilders.boolQuery();
+    for (Map<String, List<Object>> optimization : optimizationTermsFilterStructure.values()) {
+      BoolQueryBuilder andQuery = QueryBuilders.boolQuery();
+      for (Map.Entry<String, List<Object>> keyToValues : optimization.entrySet()) {
+        String fieldName = keyToValues.getKey();
+        List<Object> values = keyToValues.getValue();
+        andQuery.must(QueryBuilders.termsQuery(fieldName, values));
+      }
+      orQuery.should(andQuery);
     }
 
-    private String getComparisonKey(List<Map.Entry<Field, Field>> t1ToT2FieldsComparison, SearchHit hit,
-                                    boolean firstTable, Map<String, List<Object>> optimizationTermsFilterStructure) {
-        String key = "";
-        Map<String, Object> sourceAsMap = hit.getSourceAsMap();
-        for (Map.Entry<Field, Field> t1ToT2 : t1ToT2FieldsComparison) {
-            //todo: change to our function find if key contains '.'
-            String name;
-            if (firstTable) {
-                name = t1ToT2.getKey().getName();
-            } else {
-                name = t1ToT2.getValue().getName();
-            }
+    Where where = select.getWhere();
 
-            Object data = deepSearchInMap(sourceAsMap, name);
-            if (firstTable && useQueryTermsFilterOptimization) {
-                updateOptimizationData(optimizationTermsFilterStructure, data, t1ToT2.getValue().getName());
-            }
-            if (data == null) {
-                key += "|null|";
-            } else {
-                key += "|" + data.toString() + "|";
-            }
-        }
-        return key;
+    BoolQueryBuilder boolQuery;
+    if (where != null) {
+      boolQuery = QueryMaker.explain(where, false);
+      boolQuery.must(orQuery);
+    } else {
+      boolQuery = orQuery;
     }
-
-    private void updateOptimizationData(Map<String, List<Object>> optimizationTermsFilterStructure,
-                                        Object data, String queryOptimizationKey) {
-        List<Object> values = optimizationTermsFilterStructure.get(queryOptimizationKey);
-        if (values == null) {
-            values = new ArrayList<>();
-            optimizationTermsFilterStructure.put(queryOptimizationKey, values);
-        }
-        if (data instanceof String) {
-            //todo: analyzed or not analyzed check..
-            data = ((String) data).toLowerCase();
-        }
-        if (data != null) {
-            values.add(data);
-        }
+    secondTableRequest.getRequestBuilder().setQuery(boolQuery);
+  }
+
+  private String getComparisonKey(
+      List<Map.Entry<Field, Field>> t1ToT2FieldsComparison,
+      SearchHit hit,
+      boolean firstTable,
+      Map<String, List<Object>> optimizationTermsFilterStructure) {
+    String key = "";
+    Map<String, Object> sourceAsMap = hit.getSourceAsMap();
+    for (Map.Entry<Field, Field> t1ToT2 : t1ToT2FieldsComparison) {
+      // todo: change to our function find if key contains '.'
+      String name;
+      if (firstTable) {
+        name = t1ToT2.getKey().getName();
+      } else {
+        name = t1ToT2.getValue().getName();
+      }
+
+      Object data = deepSearchInMap(sourceAsMap, name);
+      if (firstTable && useQueryTermsFilterOptimization) {
+        updateOptimizationData(optimizationTermsFilterStructure, data, t1ToT2.getValue().getName());
+      }
+      if (data == null) {
+        key += "|null|";
+      } else {
+        key += "|" + data.toString() + "|";
+      }
+    }
+    return key;
+  }
+
+  private void updateOptimizationData(
+      Map<String, List<Object>> optimizationTermsFilterStructure,
+      Object data,
+      String queryOptimizationKey) {
+    List<Object> values = optimizationTermsFilterStructure.get(queryOptimizationKey);
+    if (values == null) {
+      values = new ArrayList<>();
+      optimizationTermsFilterStructure.put(queryOptimizationKey, values);
+    }
+    if (data instanceof String) {
+      // todo: analyzed or not analyzed check..
+      data = ((String) data).toLowerCase();
+    }
+    if (data != null) {
+      values.add(data);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/MetaSearchResult.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/MetaSearchResult.java
index abdcf05751..a4174b7247 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/MetaSearchResult.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/MetaSearchResult.java
@@ -3,64 +3,60 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.join;
 
-/**
- * Created by Eliran on 4/9/2015.
- */
+/** Created by Eliran on 4/9/2015. */
 public class MetaSearchResult {
-    private long tookImMilli;
-    private int totalNumOfShards;
-    private int successfulShards;
-    private int failedShards;
-    private boolean isTimedOut;
-
-    public MetaSearchResult() {
-        totalNumOfShards = 0;
-        failedShards = 0;
-        successfulShards = 0;
-        isTimedOut = false;
-    }
-
-    public int getTotalNumOfShards() {
-        return totalNumOfShards;
-    }
-
-    public int getSuccessfulShards() {
-        return successfulShards;
-    }
-
-    public int getFailedShards() {
-        return failedShards;
-    }
-
-    public boolean isTimedOut() {
-        return isTimedOut;
-    }
-
-    public long getTookImMilli() {
-        return tookImMilli;
-    }
-
-    public void setTookImMilli(long tookImMilli) {
-        this.tookImMilli = tookImMilli;
-    }
-
-    public void addFailedShards(int shards) {
-        this.failedShards += shards;
-    }
-
-    public void addSuccessfulShards(int shards) {
-        this.successfulShards += shards;
-    }
-
-    public void addTotalNumOfShards(int shards) {
-        this.totalNumOfShards += shards;
-    }
-
-    public void updateTimeOut(boolean isTimedOut) {
-        this.isTimedOut = this.isTimedOut || isTimedOut;
-    }
-
+  private long tookImMilli;
+  private int totalNumOfShards;
+  private int successfulShards;
+  private int failedShards;
+  private boolean isTimedOut;
+
+  public MetaSearchResult() {
+    totalNumOfShards = 0;
+    failedShards = 0;
+    successfulShards = 0;
+    isTimedOut = false;
+  }
+
+  public int getTotalNumOfShards() {
+    return totalNumOfShards;
+  }
+
+  public int getSuccessfulShards() {
+    return successfulShards;
+  }
+
+  public int getFailedShards() {
+    return failedShards;
+  }
+
+  public boolean isTimedOut() {
+    return isTimedOut;
+  }
+
+  public long getTookImMilli() {
+    return tookImMilli;
+  }
+
+  public void setTookImMilli(long tookImMilli) {
+    this.tookImMilli = tookImMilli;
+  }
+
+  public void addFailedShards(int shards) {
+    this.failedShards += shards;
+  }
+
+  public void addSuccessfulShards(int shards) {
+    this.successfulShards += shards;
+  }
+
+  public void addTotalNumOfShards(int shards) {
+    this.totalNumOfShards += shards;
+  }
+
+  public void updateTimeOut(boolean isTimedOut) {
+    this.isTimedOut = this.isTimedOut || isTimedOut;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/NestedLoopsElasticExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/NestedLoopsElasticExecutor.java
index cc6971a220..56c5f96af5 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/NestedLoopsElasticExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/NestedLoopsElasticExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.join;
 
 import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
@@ -19,7 +18,6 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
 import org.opensearch.common.document.DocumentField;
-import org.opensearch.common.text.Text;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.search.SearchHit;
@@ -35,301 +33,354 @@
 import org.opensearch.sql.legacy.query.join.TableInJoinRequestBuilder;
 import org.opensearch.sql.legacy.query.maker.Maker;
 
-/**
- * Created by Eliran on 15/9/2015.
- */
+/** Created by Eliran on 15/9/2015. */
 public class NestedLoopsElasticExecutor extends ElasticJoinExecutor {
 
-    private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LogManager.getLogger();
 
-    private final NestedLoopsElasticRequestBuilder nestedLoopsRequest;
-    private final Client client;
+  private final NestedLoopsElasticRequestBuilder nestedLoopsRequest;
+  private final Client client;
 
-    public NestedLoopsElasticExecutor(Client client, NestedLoopsElasticRequestBuilder nestedLoops) {
-        super(nestedLoops);
-        this.client = client;
-        this.nestedLoopsRequest = nestedLoops;
-    }
+  public NestedLoopsElasticExecutor(Client client, NestedLoopsElasticRequestBuilder nestedLoops) {
+    super(nestedLoops);
+    this.client = client;
+    this.nestedLoopsRequest = nestedLoops;
+  }
 
-    @Override
-    protected List<SearchHit> innerRun() throws SqlParseException {
-        List<SearchHit> combinedResults = new ArrayList<>();
-        int totalLimit = nestedLoopsRequest.getTotalLimit();
-        int multiSearchMaxSize = nestedLoopsRequest.getMultiSearchMaxSize();
-        Select secondTableSelect = nestedLoopsRequest.getSecondTable().getOriginalSelect();
-        Where originalSecondTableWhere = secondTableSelect.getWhere();
+  @Override
+  protected List<SearchHit> innerRun() throws SqlParseException {
+    List<SearchHit> combinedResults = new ArrayList<>();
+    int totalLimit = nestedLoopsRequest.getTotalLimit();
+    int multiSearchMaxSize = nestedLoopsRequest.getMultiSearchMaxSize();
+    Select secondTableSelect = nestedLoopsRequest.getSecondTable().getOriginalSelect();
+    Where originalSecondTableWhere = secondTableSelect.getWhere();
 
-        orderConditions(nestedLoopsRequest.getFirstTable().getAlias(), nestedLoopsRequest.getSecondTable().getAlias());
+    orderConditions(
+        nestedLoopsRequest.getFirstTable().getAlias(),
+        nestedLoopsRequest.getSecondTable().getAlias());
 
+    if (!BackOffRetryStrategy.isHealthy()) {
+      throw new IllegalStateException("Memory circuit is broken");
+    }
+    FetchWithScrollResponse fetchWithScrollResponse =
+        firstFetch(this.nestedLoopsRequest.getFirstTable());
+    SearchResponse firstTableResponse = fetchWithScrollResponse.getResponse();
+    boolean needScrollForFirstTable = fetchWithScrollResponse.isNeedScrollForFirstTable();
+
+    int currentCombinedResults = 0;
+    boolean finishedWithFirstTable = false;
+
+    while (totalLimit > currentCombinedResults && !finishedWithFirstTable) {
+
+      SearchHit[] hits = firstTableResponse.getHits().getHits();
+      boolean finishedMultiSearches = hits.length == 0;
+      int currentHitsIndex = 0;
+
+      while (!finishedMultiSearches) {
+        MultiSearchRequest multiSearchRequest =
+            createMultiSearchRequest(
+                multiSearchMaxSize,
+                nestedLoopsRequest.getConnectedWhere(),
+                hits,
+                secondTableSelect,
+                originalSecondTableWhere,
+                currentHitsIndex);
+        int multiSearchSize = multiSearchRequest.requests().size();
         if (!BackOffRetryStrategy.isHealthy()) {
-            throw new IllegalStateException("Memory circuit is broken");
+          throw new IllegalStateException("Memory circuit is broken");
         }
-        FetchWithScrollResponse fetchWithScrollResponse = firstFetch(this.nestedLoopsRequest.getFirstTable());
-        SearchResponse firstTableResponse = fetchWithScrollResponse.getResponse();
-        boolean needScrollForFirstTable = fetchWithScrollResponse.isNeedScrollForFirstTable();
-
-        int currentCombinedResults = 0;
-        boolean finishedWithFirstTable = false;
-
-        while (totalLimit > currentCombinedResults && !finishedWithFirstTable) {
-
-            SearchHit[] hits = firstTableResponse.getHits().getHits();
-            boolean finishedMultiSearches = hits.length == 0;
-            int currentHitsIndex = 0;
-
-            while (!finishedMultiSearches) {
-                MultiSearchRequest multiSearchRequest = createMultiSearchRequest(multiSearchMaxSize,
-                        nestedLoopsRequest.getConnectedWhere(), hits, secondTableSelect,
-                        originalSecondTableWhere, currentHitsIndex);
-                int multiSearchSize = multiSearchRequest.requests().size();
-                if (!BackOffRetryStrategy.isHealthy()) {
-                    throw new IllegalStateException("Memory circuit is broken");
-                }
-                currentCombinedResults = combineResultsFromMultiResponses(combinedResults, totalLimit,
-                        currentCombinedResults, hits, currentHitsIndex, multiSearchRequest);
-                currentHitsIndex += multiSearchSize;
-                finishedMultiSearches = currentHitsIndex >= hits.length - 1 || currentCombinedResults >= totalLimit;
-            }
-
-            if (hits.length < MAX_RESULTS_ON_ONE_FETCH) {
-                needScrollForFirstTable = false;
-            }
-
-            if (!finishedWithFirstTable) {
-                if (needScrollForFirstTable) {
-                    if (!BackOffRetryStrategy.isHealthy()) {
-                        throw new IllegalStateException("Memory circuit is broken");
-                    }
-                    firstTableResponse = client.prepareSearchScroll(firstTableResponse.getScrollId())
-                            .setScroll(new TimeValue(600000)).get();
-                } else {
-                    finishedWithFirstTable = true;
-                }
-            }
-
+        currentCombinedResults =
+            combineResultsFromMultiResponses(
+                combinedResults,
+                totalLimit,
+                currentCombinedResults,
+                hits,
+                currentHitsIndex,
+                multiSearchRequest);
+        currentHitsIndex += multiSearchSize;
+        finishedMultiSearches =
+            currentHitsIndex >= hits.length - 1 || currentCombinedResults >= totalLimit;
+      }
+
+      if (hits.length < MAX_RESULTS_ON_ONE_FETCH) {
+        needScrollForFirstTable = false;
+      }
+
+      if (!finishedWithFirstTable) {
+        if (needScrollForFirstTable) {
+          if (!BackOffRetryStrategy.isHealthy()) {
+            throw new IllegalStateException("Memory circuit is broken");
+          }
+          firstTableResponse =
+              client
+                  .prepareSearchScroll(firstTableResponse.getScrollId())
+                  .setScroll(new TimeValue(600000))
+                  .get();
+        } else {
+          finishedWithFirstTable = true;
         }
-        return combinedResults;
+      }
     }
-
-    private int combineResultsFromMultiResponses(List<SearchHit> combinedResults, int totalLimit,
-                                                 int currentCombinedResults, SearchHit[] hits, int currentIndex,
-                                                 MultiSearchRequest multiSearchRequest) {
-        MultiSearchResponse.Item[] responses = new OpenSearchClient(client).multiSearch(multiSearchRequest);
-        String t1Alias = nestedLoopsRequest.getFirstTable().getAlias();
-        String t2Alias = nestedLoopsRequest.getSecondTable().getAlias();
-
-        for (int j = 0; j < responses.length && currentCombinedResults < totalLimit; j++) {
-            SearchHit hitFromFirstTable = hits[currentIndex + j];
-            onlyReturnedFields(hitFromFirstTable.getSourceAsMap(),
-                    nestedLoopsRequest.getFirstTable().getReturnedFields(),
-                    nestedLoopsRequest.getFirstTable().getOriginalSelect().isSelectAll());
-
-            SearchResponse multiItemResponse = responses[j].getResponse();
-
-            if (multiItemResponse == null) {
-                continue;
-            }
-
-            updateMetaSearchResults(multiItemResponse);
-
-            //todo: if responseForHit.getHits.length < responseForHit.getTotalHits(). need to fetch more!
-            SearchHits responseForHit = multiItemResponse.getHits();
-
-            if (responseForHit.getHits().length == 0 && nestedLoopsRequest.getJoinType()
-                    == SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN) {
-                SearchHit unmachedResult = createUnmachedResult(nestedLoopsRequest.getSecondTable().getReturnedFields(),
-                        currentCombinedResults, t1Alias, t2Alias, hitFromFirstTable);
-                combinedResults.add(unmachedResult);
-                currentCombinedResults++;
-                continue;
-            }
-
-            for (SearchHit matchedHit : responseForHit.getHits()) {
-                SearchHit searchHit = getMergedHit(currentCombinedResults, t1Alias, t2Alias, hitFromFirstTable,
-                        matchedHit);
-                combinedResults.add(searchHit);
-                currentCombinedResults++;
-                if (currentCombinedResults >= totalLimit) {
-                    break;
-                }
-            }
-            if (currentCombinedResults >= totalLimit) {
-                break;
-            }
-
+    return combinedResults;
+  }
+
+  private int combineResultsFromMultiResponses(
+      List<SearchHit> combinedResults,
+      int totalLimit,
+      int currentCombinedResults,
+      SearchHit[] hits,
+      int currentIndex,
+      MultiSearchRequest multiSearchRequest) {
+    MultiSearchResponse.Item[] responses =
+        new OpenSearchClient(client).multiSearch(multiSearchRequest);
+    String t1Alias = nestedLoopsRequest.getFirstTable().getAlias();
+    String t2Alias = nestedLoopsRequest.getSecondTable().getAlias();
+
+    for (int j = 0; j < responses.length && currentCombinedResults < totalLimit; j++) {
+      SearchHit hitFromFirstTable = hits[currentIndex + j];
+      onlyReturnedFields(
+          hitFromFirstTable.getSourceAsMap(),
+          nestedLoopsRequest.getFirstTable().getReturnedFields(),
+          nestedLoopsRequest.getFirstTable().getOriginalSelect().isSelectAll());
+
+      SearchResponse multiItemResponse = responses[j].getResponse();
+
+      if (multiItemResponse == null) {
+        continue;
+      }
+
+      updateMetaSearchResults(multiItemResponse);
+
+      // todo: if responseForHit.getHits.length < responseForHit.getTotalHits(). need to fetch more!
+      SearchHits responseForHit = multiItemResponse.getHits();
+
+      if (responseForHit.getHits().length == 0
+          && nestedLoopsRequest.getJoinType() == SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN) {
+        SearchHit unmachedResult =
+            createUnmachedResult(
+                nestedLoopsRequest.getSecondTable().getReturnedFields(),
+                currentCombinedResults,
+                t1Alias,
+                t2Alias,
+                hitFromFirstTable);
+        combinedResults.add(unmachedResult);
+        currentCombinedResults++;
+        continue;
+      }
+
+      for (SearchHit matchedHit : responseForHit.getHits()) {
+        SearchHit searchHit =
+            getMergedHit(currentCombinedResults, t1Alias, t2Alias, hitFromFirstTable, matchedHit);
+        combinedResults.add(searchHit);
+        currentCombinedResults++;
+        if (currentCombinedResults >= totalLimit) {
+          break;
         }
-        return currentCombinedResults;
-    }
-
-    private SearchHit getMergedHit(int currentCombinedResults, String t1Alias, String t2Alias,
-                                   SearchHit hitFromFirstTable, SearchHit matchedHit) {
-        onlyReturnedFields(matchedHit.getSourceAsMap(), nestedLoopsRequest.getSecondTable().getReturnedFields(),
-                nestedLoopsRequest.getSecondTable().getOriginalSelect().isSelectAll());
-        Map<String, DocumentField> documentFields = new HashMap<>();
-        Map<String, DocumentField> metaFields = new HashMap<>();
-        matchedHit.getFields().forEach((fieldName, docField) ->
-            (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName) ? metaFields : documentFields).put(fieldName, docField));
-        SearchHit searchHit = new SearchHit(currentCombinedResults, hitFromFirstTable.getId() + "|"
-                + matchedHit.getId(), documentFields, metaFields);
-        searchHit.sourceRef(hitFromFirstTable.getSourceRef());
-        searchHit.getSourceAsMap().clear();
-        searchHit.getSourceAsMap().putAll(hitFromFirstTable.getSourceAsMap());
-
-        mergeSourceAndAddAliases(matchedHit.getSourceAsMap(), searchHit, t1Alias, t2Alias);
-        return searchHit;
+      }
+      if (currentCombinedResults >= totalLimit) {
+        break;
+      }
     }
-
-    private MultiSearchRequest createMultiSearchRequest(int multiSearchMaxSize, Where connectedWhere, SearchHit[] hits,
-                                                        Select secondTableSelect, Where originalWhere, int currentIndex)
-            throws SqlParseException {
-        MultiSearchRequest multiSearchRequest = new MultiSearchRequest();
-        for (int i = currentIndex; i < currentIndex + multiSearchMaxSize && i < hits.length; i++) {
-            Map<String, Object> hitFromFirstTableAsMap = hits[i].getSourceAsMap();
-            Where newWhere = Where.newInstance();
-            if (originalWhere != null) {
-                newWhere.addWhere(originalWhere);
-            }
-            if (connectedWhere != null) {
-                Where connectedWhereCloned = null;
-                try {
-                    connectedWhereCloned = (Where) connectedWhere.clone();
-                } catch (CloneNotSupportedException e) {
-                    e.printStackTrace();
-                }
-                updateValuesOnWhereConditions(hitFromFirstTableAsMap, connectedWhereCloned);
-                newWhere.addWhere(connectedWhereCloned);
-            }
-
-
-//            for(Condition c : conditions){
-//                Object value = deepSearchInMap(hitFromFirstTableAsMap,c.getValue().toString());
-//                Condition conditionWithValue = new Condition(Where.CONN.AND,c.getName(),c.getOpear(),value);
-//                newWhere.addWhere(conditionWithValue);
-//            }
-            //using the 2nd table select and DefaultAction because we can't just change query on request
-            // (need to create lot of requests)
-            if (newWhere.getWheres().size() != 0) {
-                secondTableSelect.setWhere(newWhere);
-            }
-            DefaultQueryAction action = new DefaultQueryAction(this.client, secondTableSelect);
-            action.explain();
-            SearchRequestBuilder secondTableRequest = action.getRequestBuilder();
-            Integer secondTableHintLimit = this.nestedLoopsRequest.getSecondTable().getHintLimit();
-            if (secondTableHintLimit != null && secondTableHintLimit <= MAX_RESULTS_ON_ONE_FETCH) {
-                secondTableRequest.setSize(secondTableHintLimit);
-            }
-            multiSearchRequest.add(secondTableRequest);
+    return currentCombinedResults;
+  }
+
+  private SearchHit getMergedHit(
+      int currentCombinedResults,
+      String t1Alias,
+      String t2Alias,
+      SearchHit hitFromFirstTable,
+      SearchHit matchedHit) {
+    onlyReturnedFields(
+        matchedHit.getSourceAsMap(),
+        nestedLoopsRequest.getSecondTable().getReturnedFields(),
+        nestedLoopsRequest.getSecondTable().getOriginalSelect().isSelectAll());
+    Map<String, DocumentField> documentFields = new HashMap<>();
+    Map<String, DocumentField> metaFields = new HashMap<>();
+    matchedHit
+        .getFields()
+        .forEach(
+            (fieldName, docField) ->
+                (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName)
+                        ? metaFields
+                        : documentFields)
+                    .put(fieldName, docField));
+    SearchHit searchHit =
+        new SearchHit(
+            currentCombinedResults,
+            hitFromFirstTable.getId() + "|" + matchedHit.getId(),
+            documentFields,
+            metaFields);
+    searchHit.sourceRef(hitFromFirstTable.getSourceRef());
+    searchHit.getSourceAsMap().clear();
+    searchHit.getSourceAsMap().putAll(hitFromFirstTable.getSourceAsMap());
+
+    mergeSourceAndAddAliases(matchedHit.getSourceAsMap(), searchHit, t1Alias, t2Alias);
+    return searchHit;
+  }
+
+  private MultiSearchRequest createMultiSearchRequest(
+      int multiSearchMaxSize,
+      Where connectedWhere,
+      SearchHit[] hits,
+      Select secondTableSelect,
+      Where originalWhere,
+      int currentIndex)
+      throws SqlParseException {
+    MultiSearchRequest multiSearchRequest = new MultiSearchRequest();
+    for (int i = currentIndex; i < currentIndex + multiSearchMaxSize && i < hits.length; i++) {
+      Map<String, Object> hitFromFirstTableAsMap = hits[i].getSourceAsMap();
+      Where newWhere = Where.newInstance();
+      if (originalWhere != null) {
+        newWhere.addWhere(originalWhere);
+      }
+      if (connectedWhere != null) {
+        Where connectedWhereCloned = null;
+        try {
+          connectedWhereCloned = (Where) connectedWhere.clone();
+        } catch (CloneNotSupportedException e) {
+          e.printStackTrace();
         }
-        return multiSearchRequest;
+        updateValuesOnWhereConditions(hitFromFirstTableAsMap, connectedWhereCloned);
+        newWhere.addWhere(connectedWhereCloned);
+      }
+
+      //            for(Condition c : conditions){
+      //                Object value =
+      // deepSearchInMap(hitFromFirstTableAsMap,c.getValue().toString());
+      //                Condition conditionWithValue = new
+      // Condition(Where.CONN.AND,c.getName(),c.getOpear(),value);
+      //                newWhere.addWhere(conditionWithValue);
+      //            }
+      // using the 2nd table select and DefaultAction because we can't just change query on request
+      // (need to create lot of requests)
+      if (newWhere.getWheres().size() != 0) {
+        secondTableSelect.setWhere(newWhere);
+      }
+      DefaultQueryAction action = new DefaultQueryAction(this.client, secondTableSelect);
+      action.explain();
+      SearchRequestBuilder secondTableRequest = action.getRequestBuilder();
+      Integer secondTableHintLimit = this.nestedLoopsRequest.getSecondTable().getHintLimit();
+      if (secondTableHintLimit != null && secondTableHintLimit <= MAX_RESULTS_ON_ONE_FETCH) {
+        secondTableRequest.setSize(secondTableHintLimit);
+      }
+      multiSearchRequest.add(secondTableRequest);
     }
-
-    private void updateValuesOnWhereConditions(Map<String, Object> hit, Where where) {
-        if (where instanceof Condition) {
-            Condition c = (Condition) where;
-            Object value = deepSearchInMap(hit, c.getValue().toString());
-            if (value == null) {
-                value = Maker.NONE;
-            }
-            c.setValue(value);
-        }
-        for (Where innerWhere : where.getWheres()) {
-            updateValuesOnWhereConditions(hit, innerWhere);
-        }
+    return multiSearchRequest;
+  }
+
+  private void updateValuesOnWhereConditions(Map<String, Object> hit, Where where) {
+    if (where instanceof Condition) {
+      Condition c = (Condition) where;
+      Object value = deepSearchInMap(hit, c.getValue().toString());
+      if (value == null) {
+        value = Maker.NONE;
+      }
+      c.setValue(value);
     }
-
-    private FetchWithScrollResponse firstFetch(TableInJoinRequestBuilder tableRequest) {
-        Integer hintLimit = tableRequest.getHintLimit();
-        boolean needScrollForFirstTable = false;
-        SearchResponse responseWithHits;
-        if (hintLimit != null && hintLimit < MAX_RESULTS_ON_ONE_FETCH) {
-
-            responseWithHits = tableRequest.getRequestBuilder().setSize(hintLimit).get();
-            needScrollForFirstTable = false;
-        } else {
-            //scroll request with max.
-            responseWithHits = scrollOneTimeWithMax(client, tableRequest);
-            if (responseWithHits.getHits().getTotalHits() != null
-                    && responseWithHits.getHits().getTotalHits().value < MAX_RESULTS_ON_ONE_FETCH) {
-                needScrollForFirstTable = true;
-            }
-        }
-
-        updateMetaSearchResults(responseWithHits);
-        return new FetchWithScrollResponse(responseWithHits, needScrollForFirstTable);
+    for (Where innerWhere : where.getWheres()) {
+      updateValuesOnWhereConditions(hit, innerWhere);
     }
-
-
-    private void orderConditions(String t1Alias, String t2Alias) {
-        orderConditionRecursive(t1Alias, t2Alias, nestedLoopsRequest.getConnectedWhere());
-//        Collection<Condition> conditions = nestedLoopsRequest.getT1FieldToCondition().values();
-//        for(Condition c : conditions){
-//            //TODO: support all orders and for each OPEAR find his related OPEAR (< is > , EQ is EQ ,etc..)
-//            if(!c.getName().startsWith(t2Alias+".") || !c.getValue().toString().startsWith(t1Alias +"."))
-//                throw new RuntimeException("On NestedLoops currently only supported Ordered conditions
-//                t2.field2 OPEAR t1.field1) , badCondition was:" + c);
-//            c.setName(c.getName().replaceFirst(t2Alias+".",""));
-//            c.setValue(c.getValue().toString().replaceFirst(t1Alias+ ".", ""));
-//        }
+  }
+
+  private FetchWithScrollResponse firstFetch(TableInJoinRequestBuilder tableRequest) {
+    Integer hintLimit = tableRequest.getHintLimit();
+    boolean needScrollForFirstTable = false;
+    SearchResponse responseWithHits;
+    if (hintLimit != null && hintLimit < MAX_RESULTS_ON_ONE_FETCH) {
+
+      responseWithHits = tableRequest.getRequestBuilder().setSize(hintLimit).get();
+      needScrollForFirstTable = false;
+    } else {
+      // scroll request with max.
+      responseWithHits = scrollOneTimeWithMax(client, tableRequest);
+      if (responseWithHits.getHits().getTotalHits() != null
+          && responseWithHits.getHits().getTotalHits().value < MAX_RESULTS_ON_ONE_FETCH) {
+        needScrollForFirstTable = true;
+      }
     }
 
-    private void orderConditionRecursive(String t1Alias, String t2Alias, Where where) {
-        if (where == null) {
-            return;
-        }
-        if (where instanceof Condition) {
-            Condition c = (Condition) where;
-            if (shouldReverse(c, t1Alias, t2Alias)) {
-                try {
-                    reverseOrderOfCondition(c, t1Alias, t2Alias);
-                    return;
-                } catch (SqlParseException e) {
-                    //Do nothing here to continue using original logic below.
-                    //The condition is not changed here.
-                }
-            }
-            if (!c.getName().startsWith(t2Alias + ".") || !c.getValue().toString().startsWith(t1Alias + ".")) {
-                throw new RuntimeException("On NestedLoops currently only supported Ordered conditions "
-                        + "(t2.field2 OPEAR t1.field1) , badCondition was:" + c);
-            }
-            c.setName(c.getName().replaceFirst(t2Alias + ".", ""));
-            c.setValue(c.getValue().toString().replaceFirst(t1Alias + ".", ""));
-            return;
-        } else {
-            for (Where innerWhere : where.getWheres()) {
-                orderConditionRecursive(t1Alias, t2Alias, innerWhere);
-            }
+    updateMetaSearchResults(responseWithHits);
+    return new FetchWithScrollResponse(responseWithHits, needScrollForFirstTable);
+  }
+
+  private void orderConditions(String t1Alias, String t2Alias) {
+    orderConditionRecursive(t1Alias, t2Alias, nestedLoopsRequest.getConnectedWhere());
+    //        Collection<Condition> conditions =
+    // nestedLoopsRequest.getT1FieldToCondition().values();
+    //        for(Condition c : conditions){
+    //            //TODO: support all orders and for each OPEAR find his related OPEAR (< is > , EQ
+    // is EQ ,etc..)
+    //            if(!c.getName().startsWith(t2Alias+".") ||
+    // !c.getValue().toString().startsWith(t1Alias +"."))
+    //                throw new RuntimeException("On NestedLoops currently only supported Ordered
+    // conditions
+    //                t2.field2 OPEAR t1.field1) , badCondition was:" + c);
+    //            c.setName(c.getName().replaceFirst(t2Alias+".",""));
+    //            c.setValue(c.getValue().toString().replaceFirst(t1Alias+ ".", ""));
+    //        }
+  }
+
+  private void orderConditionRecursive(String t1Alias, String t2Alias, Where where) {
+    if (where == null) {
+      return;
+    }
+    if (where instanceof Condition) {
+      Condition c = (Condition) where;
+      if (shouldReverse(c, t1Alias, t2Alias)) {
+        try {
+          reverseOrderOfCondition(c, t1Alias, t2Alias);
+          return;
+        } catch (SqlParseException e) {
+          // Do nothing here to continue using original logic below.
+          // The condition is not changed here.
         }
+      }
+      if (!c.getName().startsWith(t2Alias + ".")
+          || !c.getValue().toString().startsWith(t1Alias + ".")) {
+        throw new RuntimeException(
+            "On NestedLoops currently only supported Ordered conditions "
+                + "(t2.field2 OPEAR t1.field1) , badCondition was:"
+                + c);
+      }
+      c.setName(c.getName().replaceFirst(t2Alias + ".", ""));
+      c.setValue(c.getValue().toString().replaceFirst(t1Alias + ".", ""));
+      return;
+    } else {
+      for (Where innerWhere : where.getWheres()) {
+        orderConditionRecursive(t1Alias, t2Alias, innerWhere);
+      }
     }
-
-    private Boolean shouldReverse(Condition cond, String t1Alias, String t2Alias) {
-        return cond.getName().startsWith(t1Alias + ".") && cond.getValue().toString().startsWith(t2Alias + ".")
-                && cond.getOPERATOR().isSimpleOperator();
+  }
+
+  private Boolean shouldReverse(Condition cond, String t1Alias, String t2Alias) {
+    return cond.getName().startsWith(t1Alias + ".")
+        && cond.getValue().toString().startsWith(t2Alias + ".")
+        && cond.getOPERATOR().isSimpleOperator();
+  }
+
+  private void reverseOrderOfCondition(Condition cond, String t1Alias, String t2Alias)
+      throws SqlParseException {
+    cond.setOPERATOR(cond.getOPERATOR().simpleReverse());
+    String name = cond.getName();
+    cond.setName(cond.getValue().toString().replaceFirst(t2Alias + ".", ""));
+    cond.setValue(name.replaceFirst(t1Alias + ".", ""));
+  }
+
+  private class FetchWithScrollResponse {
+    private SearchResponse response;
+    private boolean needScrollForFirstTable;
+
+    private FetchWithScrollResponse(SearchResponse response, boolean needScrollForFirstTable) {
+      this.response = response;
+      this.needScrollForFirstTable = needScrollForFirstTable;
     }
 
-    private void reverseOrderOfCondition(Condition cond, String t1Alias, String t2Alias) throws SqlParseException {
-        cond.setOPERATOR(cond.getOPERATOR().simpleReverse());
-        String name = cond.getName();
-        cond.setName(cond.getValue().toString().replaceFirst(t2Alias + ".", ""));
-        cond.setValue(name.replaceFirst(t1Alias + ".", ""));
+    public SearchResponse getResponse() {
+      return response;
     }
 
-
-    private class FetchWithScrollResponse {
-        private SearchResponse response;
-        private boolean needScrollForFirstTable;
-
-        private FetchWithScrollResponse(SearchResponse response, boolean needScrollForFirstTable) {
-            this.response = response;
-            this.needScrollForFirstTable = needScrollForFirstTable;
-        }
-
-        public SearchResponse getResponse() {
-            return response;
-        }
-
-        public boolean isNeedScrollForFirstTable() {
-            return needScrollForFirstTable;
-        }
-
+    public boolean isNeedScrollForFirstTable() {
+      return needScrollForFirstTable;
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/QueryPlanElasticExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/QueryPlanElasticExecutor.java
index 5702d397d5..f4b2f5421d 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/QueryPlanElasticExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/QueryPlanElasticExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.join;
 
 import java.util.List;
@@ -12,31 +11,30 @@
 import org.opensearch.sql.legacy.query.planner.core.QueryPlanner;
 
 /**
- * Executor for generic QueryPlanner execution. This executor is just acting as adaptor to integrate with
- * existing framework. In future, QueryPlanner should be executed by itself and leave the response sent back
- * or other post-processing logic to ElasticDefaultRestExecutor.
+ * Executor for generic QueryPlanner execution. This executor is just acting as adaptor to integrate
+ * with existing framework. In future, QueryPlanner should be executed by itself and leave the
+ * response sent back or other post-processing logic to ElasticDefaultRestExecutor.
  */
 class QueryPlanElasticExecutor extends ElasticJoinExecutor {
 
-    private final QueryPlanner queryPlanner;
-
-    QueryPlanElasticExecutor(HashJoinQueryPlanRequestBuilder request) {
-        super(request);
-        this.queryPlanner = request.plan();
-    }
-
-    @Override
-    protected List<SearchHit> innerRun() {
-        List<SearchHit> result = queryPlanner.execute();
-        populateMetaResult();
-        return result;
-    }
-
-    private void populateMetaResult() {
-        metaResults.addTotalNumOfShards(queryPlanner.getMetaResult().getTotalNumOfShards());
-        metaResults.addSuccessfulShards(queryPlanner.getMetaResult().getSuccessfulShards());
-        metaResults.addFailedShards(queryPlanner.getMetaResult().getFailedShards());
-        metaResults.updateTimeOut(queryPlanner.getMetaResult().isTimedOut());
-    }
-
+  private final QueryPlanner queryPlanner;
+
+  QueryPlanElasticExecutor(HashJoinQueryPlanRequestBuilder request) {
+    super(request);
+    this.queryPlanner = request.plan();
+  }
+
+  @Override
+  protected List<SearchHit> innerRun() {
+    List<SearchHit> result = queryPlanner.execute();
+    populateMetaResult();
+    return result;
+  }
+
+  private void populateMetaResult() {
+    metaResults.addTotalNumOfShards(queryPlanner.getMetaResult().getTotalNumOfShards());
+    metaResults.addSuccessfulShards(queryPlanner.getMetaResult().getSuccessfulShards());
+    metaResults.addFailedShards(queryPlanner.getMetaResult().getFailedShards());
+    metaResults.updateTimeOut(queryPlanner.getMetaResult().isTimedOut());
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/SearchHitsResult.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/SearchHitsResult.java
index 0955de9b88..10a1555874 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/SearchHitsResult.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/SearchHitsResult.java
@@ -3,42 +3,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.join;
 
 import java.util.ArrayList;
 import java.util.List;
 import org.opensearch.search.SearchHit;
 
-/**
- * Created by Eliran on 28/8/2015.
- */
+/** Created by Eliran on 28/8/2015. */
 public class SearchHitsResult {
-    private List<SearchHit> searchHits;
-    private boolean matchedWithOtherTable;
+  private List<SearchHit> searchHits;
+  private boolean matchedWithOtherTable;
 
-    public SearchHitsResult() {
-        searchHits = new ArrayList<>();
-    }
+  public SearchHitsResult() {
+    searchHits = new ArrayList<>();
+  }
 
-    public SearchHitsResult(List<SearchHit> searchHits, boolean matchedWithOtherTable) {
-        this.searchHits = searchHits;
-        this.matchedWithOtherTable = matchedWithOtherTable;
-    }
+  public SearchHitsResult(List<SearchHit> searchHits, boolean matchedWithOtherTable) {
+    this.searchHits = searchHits;
+    this.matchedWithOtherTable = matchedWithOtherTable;
+  }
 
-    public List<SearchHit> getSearchHits() {
-        return searchHits;
-    }
+  public List<SearchHit> getSearchHits() {
+    return searchHits;
+  }
 
-    public void setSearchHits(List<SearchHit> searchHits) {
-        this.searchHits = searchHits;
-    }
+  public void setSearchHits(List<SearchHit> searchHits) {
+    this.searchHits = searchHits;
+  }
 
-    public boolean isMatchedWithOtherTable() {
-        return matchedWithOtherTable;
-    }
+  public boolean isMatchedWithOtherTable() {
+    return matchedWithOtherTable;
+  }
 
-    public void setMatchedWithOtherTable(boolean matchedWithOtherTable) {
-        this.matchedWithOtherTable = matchedWithOtherTable;
-    }
+  public void setMatchedWithOtherTable(boolean matchedWithOtherTable) {
+    this.matchedWithOtherTable = matchedWithOtherTable;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/ComperableHitResult.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/ComperableHitResult.java
index 766ecd3692..fa3514600b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/ComperableHitResult.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/ComperableHitResult.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.multi;
 
 import com.google.common.base.Joiner;
@@ -14,72 +13,70 @@
 import org.opensearch.search.SearchHit;
 import org.opensearch.sql.legacy.utils.Util;
 
-/**
- * Created by Eliran on 9/9/2016.
- */
+/** Created by Eliran on 9/9/2016. */
 public class ComperableHitResult {
-    private SearchHit hit;
-    private String comperator;
-    private boolean isAllNull;
-    private Map<String, Object> flattenMap;
+  private SearchHit hit;
+  private String comperator;
+  private boolean isAllNull;
+  private Map<String, Object> flattenMap;
 
-    public ComperableHitResult(SearchHit hit, String[] fieldsOrder, String seperator) {
-        this.hit = hit;
-        Map<String, Object> hitAsMap = hit.getSourceAsMap();
-        this.flattenMap = new HashMap<>();
-        List<String> results = new ArrayList<>();
-        this.isAllNull = true;
+  public ComperableHitResult(SearchHit hit, String[] fieldsOrder, String seperator) {
+    this.hit = hit;
+    Map<String, Object> hitAsMap = hit.getSourceAsMap();
+    this.flattenMap = new HashMap<>();
+    List<String> results = new ArrayList<>();
+    this.isAllNull = true;
 
-        for (int i = 0; i < fieldsOrder.length; i++) {
-            String field = fieldsOrder[i];
-            Object result = Util.deepSearchInMap(hitAsMap, field);
-            if (result == null) {
-                results.add("");
-            } else {
-                this.isAllNull = false;
-                results.add(result.toString());
-                this.flattenMap.put(field, result);
-            }
-        }
-        this.comperator = Joiner.on(seperator).join(results);
+    for (int i = 0; i < fieldsOrder.length; i++) {
+      String field = fieldsOrder[i];
+      Object result = Util.deepSearchInMap(hitAsMap, field);
+      if (result == null) {
+        results.add("");
+      } else {
+        this.isAllNull = false;
+        results.add(result.toString());
+        this.flattenMap.put(field, result);
+      }
     }
+    this.comperator = Joiner.on(seperator).join(results);
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        ComperableHitResult that = (ComperableHitResult) o;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
 
-        if (!comperator.equals(that.comperator)) {
-            return false;
-        }
+    ComperableHitResult that = (ComperableHitResult) o;
 
-        return true;
+    if (!comperator.equals(that.comperator)) {
+      return false;
     }
 
-    public boolean isAllNull() {
-        return isAllNull;
-    }
+    return true;
+  }
 
-    @Override
-    public int hashCode() {
-        return comperator.hashCode();
-    }
+  public boolean isAllNull() {
+    return isAllNull;
+  }
 
-    public String getComperator() {
-        return comperator;
-    }
+  @Override
+  public int hashCode() {
+    return comperator.hashCode();
+  }
 
-    public Map<String, Object> getFlattenMap() {
-        return flattenMap;
-    }
+  public String getComperator() {
+    return comperator;
+  }
 
-    public SearchHit getOriginalHit() {
-        return hit;
-    }
+  public Map<String, Object> getFlattenMap() {
+    return flattenMap;
+  }
+
+  public SearchHit getOriginalHit() {
+    return hit;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusExecutor.java
index 8d37cb0656..03e16424e7 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.multi;
 
 import java.util.ArrayList;
@@ -19,7 +18,6 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
 import org.opensearch.common.document.DocumentField;
-import org.opensearch.common.text.Text;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.search.SearchHit;
@@ -37,409 +35,453 @@
 import org.opensearch.sql.legacy.query.multi.MultiQueryRequestBuilder;
 import org.opensearch.sql.legacy.utils.Util;
 
-
-/**
- * Created by Eliran on 26/8/2016.
- */
+/** Created by Eliran on 26/8/2016. */
 public class MinusExecutor implements ElasticHitsExecutor {
-    private Client client;
-    private MultiQueryRequestBuilder builder;
-    private SearchHits minusHits;
-    private boolean useTermsOptimization;
-    private boolean termsOptimizationWithToLower;
-    private boolean useScrolling;
-    private int maxDocsToFetchOnFirstTable;
-    private int maxDocsToFetchOnSecondTable;
-    private int maxDocsToFetchOnEachScrollShard;
-    private String[] fieldsOrderFirstTable;
-    private String[] fieldsOrderSecondTable;
-    private String seperator;
-
-    public MinusExecutor(Client client, MultiQueryRequestBuilder builder) {
-        this.client = client;
-        this.builder = builder;
-        this.useTermsOptimization = false;
-        this.termsOptimizationWithToLower = false;
-        this.useScrolling = false;
-        parseHintsIfAny(builder.getOriginalSelect(true).getHints());
-        fillFieldsOrder();
-        seperator = UUID.randomUUID().toString();
+  private Client client;
+  private MultiQueryRequestBuilder builder;
+  private SearchHits minusHits;
+  private boolean useTermsOptimization;
+  private boolean termsOptimizationWithToLower;
+  private boolean useScrolling;
+  private int maxDocsToFetchOnFirstTable;
+  private int maxDocsToFetchOnSecondTable;
+  private int maxDocsToFetchOnEachScrollShard;
+  private String[] fieldsOrderFirstTable;
+  private String[] fieldsOrderSecondTable;
+  private String seperator;
+
+  public MinusExecutor(Client client, MultiQueryRequestBuilder builder) {
+    this.client = client;
+    this.builder = builder;
+    this.useTermsOptimization = false;
+    this.termsOptimizationWithToLower = false;
+    this.useScrolling = false;
+    parseHintsIfAny(builder.getOriginalSelect(true).getHints());
+    fillFieldsOrder();
+    seperator = UUID.randomUUID().toString();
+  }
+
+  @Override
+  public void run() throws SqlParseException {
+    if (this.useTermsOptimization && this.fieldsOrderFirstTable.length != 1) {
+      throw new SqlParseException(
+          "Terms optimization failed: terms optimization for minus execution is supported with one"
+              + " field");
     }
-
-    @Override
-    public void run() throws SqlParseException {
-        if (this.useTermsOptimization && this.fieldsOrderFirstTable.length != 1) {
-            throw new SqlParseException(
-                    "Terms optimization failed: terms optimization for minus execution is supported with one field");
-        }
-        if (this.useTermsOptimization && !this.useScrolling) {
-            throw new SqlParseException(
-                    "Terms optimization failed: using scrolling is required for terms optimization");
-        }
-        if (!this.useScrolling || !this.useTermsOptimization) {
-            Set<ComperableHitResult> comperableHitResults;
-            if (!this.useScrolling) {
-                //1. get results from first search , put in set
-                //2. get reults from second search
-                //2.1 for each result remove from set
-                comperableHitResults = simpleOneTimeQueryEach();
-            } else {
-                //if scrolling
-                //1. get all results in scrolls (till some limit) . put on set
-                //2. scroll on second table
-                //3. on each scroll result remove items from set
-                comperableHitResults = runWithScrollings();
-            }
-            fillMinusHitsFromResults(comperableHitResults);
-            return;
-        } else {
-            //if scrolling and optimization
-            // 0. save the original second table where , init set
-            // 1. on each scroll on first table , create miniSet
-            //1.1 build where from all results (terms filter) , and run query
-            //1.1.1 on each result remove from miniSet
-            //1.1.2 add all results left from miniset to bigset
-            Select firstSelect = this.builder.getOriginalSelect(true);
-            MinusOneFieldAndOptimizationResult optimizationResult =
-                    runWithScrollingAndAddFilter(fieldsOrderFirstTable[0], fieldsOrderSecondTable[0]);
-            String fieldName = getFieldName(firstSelect.getFields().get(0));
-            Set<Object> results = optimizationResult.getFieldValues();
-            SearchHit someHit = optimizationResult.getSomeHit();
-            fillMinusHitsFromOneField(fieldName, results, someHit);
-
+    if (this.useTermsOptimization && !this.useScrolling) {
+      throw new SqlParseException(
+          "Terms optimization failed: using scrolling is required for terms optimization");
+    }
+    if (!this.useScrolling || !this.useTermsOptimization) {
+      Set<ComperableHitResult> comperableHitResults;
+      if (!this.useScrolling) {
+        // 1. get results from first search , put in set
+        // 2. get reults from second search
+        // 2.1 for each result remove from set
+        comperableHitResults = simpleOneTimeQueryEach();
+      } else {
+        // if scrolling
+        // 1. get all results in scrolls (till some limit) . put on set
+        // 2. scroll on second table
+        // 3. on each scroll result remove items from set
+        comperableHitResults = runWithScrollings();
+      }
+      fillMinusHitsFromResults(comperableHitResults);
+      return;
+    } else {
+      // if scrolling and optimization
+      // 0. save the original second table where , init set
+      // 1. on each scroll on first table , create miniSet
+      // 1.1 build where from all results (terms filter) , and run query
+      // 1.1.1 on each result remove from miniSet
+      // 1.1.2 add all results left from miniset to bigset
+      Select firstSelect = this.builder.getOriginalSelect(true);
+      MinusOneFieldAndOptimizationResult optimizationResult =
+          runWithScrollingAndAddFilter(fieldsOrderFirstTable[0], fieldsOrderSecondTable[0]);
+      String fieldName = getFieldName(firstSelect.getFields().get(0));
+      Set<Object> results = optimizationResult.getFieldValues();
+      SearchHit someHit = optimizationResult.getSomeHit();
+      fillMinusHitsFromOneField(fieldName, results, someHit);
+    }
+  }
+
+  @Override
+  public SearchHits getHits() {
+    return this.minusHits;
+  }
+
+  private void fillMinusHitsFromOneField(
+      String fieldName, Set<Object> fieldValues, SearchHit someHit) {
+    List<SearchHit> minusHitsList = new ArrayList<>();
+    int currentId = 1;
+    for (Object result : fieldValues) {
+      Map<String, DocumentField> fields = new HashMap<>();
+      ArrayList<Object> values = new ArrayList<>();
+      values.add(result);
+      fields.put(fieldName, new DocumentField(fieldName, values));
+      Map<String, DocumentField> documentFields = new HashMap<>();
+      Map<String, DocumentField> metaFields = new HashMap<>();
+      someHit
+          .getFields()
+          .forEach(
+              (field, docField) ->
+                  (MapperService.META_FIELDS_BEFORE_7DOT8.contains(field)
+                          ? metaFields
+                          : documentFields)
+                      .put(field, docField));
+      SearchHit searchHit = new SearchHit(currentId, currentId + "", documentFields, metaFields);
+      searchHit.sourceRef(someHit.getSourceRef());
+      searchHit.getSourceAsMap().clear();
+      Map<String, Object> sourceAsMap = new HashMap<>();
+      sourceAsMap.put(fieldName, result);
+      searchHit.getSourceAsMap().putAll(sourceAsMap);
+      currentId++;
+      minusHitsList.add(searchHit);
+    }
+    int totalSize = currentId - 1;
+    SearchHit[] unionHitsArr = minusHitsList.toArray(new SearchHit[totalSize]);
+    this.minusHits =
+        new SearchHits(unionHitsArr, new TotalHits(totalSize, Relation.EQUAL_TO), 1.0f);
+  }
+
+  private void fillMinusHitsFromResults(Set<ComperableHitResult> comperableHitResults) {
+    int currentId = 1;
+    List<SearchHit> minusHitsList = new ArrayList<>();
+    for (ComperableHitResult result : comperableHitResults) {
+      ArrayList<Object> values = new ArrayList<>();
+      values.add(result);
+      SearchHit originalHit = result.getOriginalHit();
+      Map<String, DocumentField> documentFields = new HashMap<>();
+      Map<String, DocumentField> metaFields = new HashMap<>();
+      originalHit
+          .getFields()
+          .forEach(
+              (fieldName, docField) ->
+                  (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName)
+                          ? metaFields
+                          : documentFields)
+                      .put(fieldName, docField));
+      SearchHit searchHit =
+          new SearchHit(currentId, originalHit.getId(), documentFields, metaFields);
+      searchHit.sourceRef(originalHit.getSourceRef());
+      searchHit.getSourceAsMap().clear();
+      Map<String, Object> sourceAsMap = result.getFlattenMap();
+      for (Map.Entry<String, String> entry : this.builder.getFirstTableFieldToAlias().entrySet()) {
+        if (sourceAsMap.containsKey(entry.getKey())) {
+          Object value = sourceAsMap.get(entry.getKey());
+          sourceAsMap.remove(entry.getKey());
+          sourceAsMap.put(entry.getValue(), value);
         }
+      }
 
+      searchHit.getSourceAsMap().putAll(sourceAsMap);
+      currentId++;
+      minusHitsList.add(searchHit);
     }
-
-
-    @Override
-    public SearchHits getHits() {
-        return this.minusHits;
+    int totalSize = currentId - 1;
+    SearchHit[] unionHitsArr = minusHitsList.toArray(new SearchHit[totalSize]);
+    this.minusHits =
+        new SearchHits(unionHitsArr, new TotalHits(totalSize, Relation.EQUAL_TO), 1.0f);
+  }
+
+  private Set<ComperableHitResult> runWithScrollings() {
+
+    SearchResponse scrollResp =
+        ElasticUtils.scrollOneTimeWithHits(
+            this.client,
+            this.builder.getFirstSearchRequest(),
+            builder.getOriginalSelect(true),
+            this.maxDocsToFetchOnEachScrollShard);
+    Set<ComperableHitResult> results = new HashSet<>();
+
+    SearchHit[] hits = scrollResp.getHits().getHits();
+    if (hits == null || hits.length == 0) {
+      return new HashSet<>();
     }
-
-    private void fillMinusHitsFromOneField(String fieldName, Set<Object> fieldValues, SearchHit someHit) {
-        List<SearchHit> minusHitsList = new ArrayList<>();
-        int currentId = 1;
-        for (Object result : fieldValues) {
-            Map<String, DocumentField> fields = new HashMap<>();
-            ArrayList<Object> values = new ArrayList<>();
-            values.add(result);
-            fields.put(fieldName, new DocumentField(fieldName, values));
-            Map<String, DocumentField> documentFields = new HashMap<>();
-            Map<String, DocumentField> metaFields = new HashMap<>();
-            someHit.getFields().forEach((field, docField) ->
-                (MapperService.META_FIELDS_BEFORE_7DOT8.contains(field) ? metaFields : documentFields).put(field, docField));
-            SearchHit searchHit = new SearchHit(currentId, currentId + "",
-                    documentFields, metaFields);
-            searchHit.sourceRef(someHit.getSourceRef());
-            searchHit.getSourceAsMap().clear();
-            Map<String, Object> sourceAsMap = new HashMap<>();
-            sourceAsMap.put(fieldName, result);
-            searchHit.getSourceAsMap().putAll(sourceAsMap);
-            currentId++;
-            minusHitsList.add(searchHit);
-        }
-        int totalSize = currentId - 1;
-        SearchHit[] unionHitsArr = minusHitsList.toArray(new SearchHit[totalSize]);
-        this.minusHits = new SearchHits(unionHitsArr, new TotalHits(totalSize, Relation.EQUAL_TO), 1.0f);
+    int totalDocsFetchedFromFirstTable = 0;
+
+    // fetch from first table . fill set.
+    while (hits != null && hits.length != 0) {
+      totalDocsFetchedFromFirstTable += hits.length;
+      fillComperableSetFromHits(this.fieldsOrderFirstTable, hits, results);
+      if (totalDocsFetchedFromFirstTable > this.maxDocsToFetchOnFirstTable) {
+        break;
+      }
+      scrollResp =
+          client
+              .prepareSearchScroll(scrollResp.getScrollId())
+              .setScroll(new TimeValue(600000))
+              .execute()
+              .actionGet();
+      hits = scrollResp.getHits().getHits();
     }
-
-    private void fillMinusHitsFromResults(Set<ComperableHitResult> comperableHitResults) {
-        int currentId = 1;
-        List<SearchHit> minusHitsList = new ArrayList<>();
-        for (ComperableHitResult result : comperableHitResults) {
-            ArrayList<Object> values = new ArrayList<>();
-            values.add(result);
-            SearchHit originalHit = result.getOriginalHit();
-            Map<String, DocumentField> documentFields = new HashMap<>();
-            Map<String, DocumentField> metaFields = new HashMap<>();
-            originalHit.getFields().forEach((fieldName, docField) ->
-                (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName) ? metaFields : documentFields).put(fieldName, docField));
-            SearchHit searchHit = new SearchHit(currentId, originalHit.getId(),
-                    documentFields, metaFields);
-            searchHit.sourceRef(originalHit.getSourceRef());
-            searchHit.getSourceAsMap().clear();
-            Map<String, Object> sourceAsMap = result.getFlattenMap();
-            for (Map.Entry<String, String> entry : this.builder.getFirstTableFieldToAlias().entrySet()) {
-                if (sourceAsMap.containsKey(entry.getKey())) {
-                    Object value = sourceAsMap.get(entry.getKey());
-                    sourceAsMap.remove(entry.getKey());
-                    sourceAsMap.put(entry.getValue(), value);
-                }
-            }
-
-            searchHit.getSourceAsMap().putAll(sourceAsMap);
-            currentId++;
-            minusHitsList.add(searchHit);
-        }
-        int totalSize = currentId - 1;
-        SearchHit[] unionHitsArr = minusHitsList.toArray(new SearchHit[totalSize]);
-        this.minusHits = new SearchHits(unionHitsArr, new TotalHits(totalSize, Relation.EQUAL_TO), 1.0f);
+    scrollResp =
+        ElasticUtils.scrollOneTimeWithHits(
+            this.client,
+            this.builder.getSecondSearchRequest(),
+            builder.getOriginalSelect(false),
+            this.maxDocsToFetchOnEachScrollShard);
+
+    hits = scrollResp.getHits().getHits();
+    if (hits == null || hits.length == 0) {
+      return results;
     }
-
-    private Set<ComperableHitResult> runWithScrollings() {
-
-        SearchResponse scrollResp = ElasticUtils.scrollOneTimeWithHits(this.client,
-                this.builder.getFirstSearchRequest(),
-                builder.getOriginalSelect(true), this.maxDocsToFetchOnEachScrollShard);
-        Set<ComperableHitResult> results = new HashSet<>();
-
-        SearchHit[] hits = scrollResp.getHits().getHits();
-        if (hits == null || hits.length == 0) {
-            return new HashSet<>();
-        }
-        int totalDocsFetchedFromFirstTable = 0;
-
-        //fetch from first table . fill set.
-        while (hits != null && hits.length != 0) {
-            totalDocsFetchedFromFirstTable += hits.length;
-            fillComperableSetFromHits(this.fieldsOrderFirstTable, hits, results);
-            if (totalDocsFetchedFromFirstTable > this.maxDocsToFetchOnFirstTable) {
-                break;
-            }
-            scrollResp = client.prepareSearchScroll(scrollResp.getScrollId())
-                    .setScroll(new TimeValue(600000)).execute().actionGet();
-            hits = scrollResp.getHits().getHits();
-        }
-        scrollResp = ElasticUtils.scrollOneTimeWithHits(this.client, this.builder.getSecondSearchRequest(),
-                builder.getOriginalSelect(false), this.maxDocsToFetchOnEachScrollShard);
-
-
-        hits = scrollResp.getHits().getHits();
-        if (hits == null || hits.length == 0) {
-            return results;
-        }
-        int totalDocsFetchedFromSecondTable = 0;
-        while (hits != null && hits.length != 0) {
-            totalDocsFetchedFromSecondTable += hits.length;
-            removeValuesFromSetAccordingToHits(this.fieldsOrderSecondTable, results, hits);
-            if (totalDocsFetchedFromSecondTable > this.maxDocsToFetchOnSecondTable) {
-                break;
-            }
-            scrollResp = client.prepareSearchScroll(scrollResp.getScrollId())
-                    .setScroll(new TimeValue(600000)).execute().actionGet();
-            hits = scrollResp.getHits().getHits();
-        }
-
-        return results;
+    int totalDocsFetchedFromSecondTable = 0;
+    while (hits != null && hits.length != 0) {
+      totalDocsFetchedFromSecondTable += hits.length;
+      removeValuesFromSetAccordingToHits(this.fieldsOrderSecondTable, results, hits);
+      if (totalDocsFetchedFromSecondTable > this.maxDocsToFetchOnSecondTable) {
+        break;
+      }
+      scrollResp =
+          client
+              .prepareSearchScroll(scrollResp.getScrollId())
+              .setScroll(new TimeValue(600000))
+              .execute()
+              .actionGet();
+      hits = scrollResp.getHits().getHits();
     }
 
-    private Set<ComperableHitResult> simpleOneTimeQueryEach() {
-        SearchHit[] firstTableHits = this.builder.getFirstSearchRequest().get().getHits().getHits();
-        if (firstTableHits == null || firstTableHits.length == 0) {
-            return new HashSet<>();
-        }
+    return results;
+  }
 
-        Set<ComperableHitResult> result = new HashSet<>();
-        fillComperableSetFromHits(this.fieldsOrderFirstTable, firstTableHits, result);
-        SearchHit[] secondTableHits = this.builder.getSecondSearchRequest().get().getHits().getHits();
-        if (secondTableHits == null || secondTableHits.length == 0) {
-            return result;
-        }
-        removeValuesFromSetAccordingToHits(this.fieldsOrderSecondTable, result, secondTableHits);
-        return result;
+  private Set<ComperableHitResult> simpleOneTimeQueryEach() {
+    SearchHit[] firstTableHits = this.builder.getFirstSearchRequest().get().getHits().getHits();
+    if (firstTableHits == null || firstTableHits.length == 0) {
+      return new HashSet<>();
     }
 
-    private void removeValuesFromSetAccordingToHits(String[] fieldsOrder,
-                                                    Set<ComperableHitResult> set, SearchHit[] hits) {
-        for (SearchHit hit : hits) {
-            ComperableHitResult comperableHitResult = new ComperableHitResult(hit, fieldsOrder, this.seperator);
-            if (!comperableHitResult.isAllNull()) {
-                set.remove(comperableHitResult);
-            }
-        }
+    Set<ComperableHitResult> result = new HashSet<>();
+    fillComperableSetFromHits(this.fieldsOrderFirstTable, firstTableHits, result);
+    SearchHit[] secondTableHits = this.builder.getSecondSearchRequest().get().getHits().getHits();
+    if (secondTableHits == null || secondTableHits.length == 0) {
+      return result;
     }
-
-    private void fillComperableSetFromHits(String[] fieldsOrder, SearchHit[] hits, Set<ComperableHitResult> setToFill) {
-        for (SearchHit hit : hits) {
-            ComperableHitResult comperableHitResult = new ComperableHitResult(hit, fieldsOrder, this.seperator);
-            if (!comperableHitResult.isAllNull()) {
-                setToFill.add(comperableHitResult);
-            }
-        }
+    removeValuesFromSetAccordingToHits(this.fieldsOrderSecondTable, result, secondTableHits);
+    return result;
+  }
+
+  private void removeValuesFromSetAccordingToHits(
+      String[] fieldsOrder, Set<ComperableHitResult> set, SearchHit[] hits) {
+    for (SearchHit hit : hits) {
+      ComperableHitResult comperableHitResult =
+          new ComperableHitResult(hit, fieldsOrder, this.seperator);
+      if (!comperableHitResult.isAllNull()) {
+        set.remove(comperableHitResult);
+      }
     }
-
-    private String getFieldName(Field field) {
-        String alias = field.getAlias();
-        if (alias != null && !alias.isEmpty()) {
-            return alias;
-        }
-        return field.getName();
+  }
+
+  private void fillComperableSetFromHits(
+      String[] fieldsOrder, SearchHit[] hits, Set<ComperableHitResult> setToFill) {
+    for (SearchHit hit : hits) {
+      ComperableHitResult comperableHitResult =
+          new ComperableHitResult(hit, fieldsOrder, this.seperator);
+      if (!comperableHitResult.isAllNull()) {
+        setToFill.add(comperableHitResult);
+      }
     }
+  }
 
-    private boolean checkIfOnlyOneField(Select firstSelect, Select secondSelect) {
-        return firstSelect.getFields().size() == 1 && secondSelect.getFields().size() == 1;
+  private String getFieldName(Field field) {
+    String alias = field.getAlias();
+    if (alias != null && !alias.isEmpty()) {
+      return alias;
     }
-
-
-    // 0. save the original second table where , init set
-    // 1. on each scroll on first table , create miniSet
-    //1.1 build where from all results (terms filter) , and run query
-    //1.1.1 on each result remove from miniSet
-    //1.1.2 add all results left from miniset to bigset
-    private MinusOneFieldAndOptimizationResult runWithScrollingAndAddFilter(String firstFieldName,
-                                                                            String secondFieldName)
-            throws SqlParseException {
-        SearchResponse scrollResp = ElasticUtils.scrollOneTimeWithHits(this.client,
-                this.builder.getFirstSearchRequest(),
-                builder.getOriginalSelect(true), this.maxDocsToFetchOnEachScrollShard);
-        Set<Object> results = new HashSet<>();
-        int currentNumOfResults = 0;
-        SearchHit[] hits = scrollResp.getHits().getHits();
-        SearchHit someHit = null;
-        if (hits.length != 0) {
-            //we need some hit for creating InnerResults.
-            someHit = hits[0];
-        }
-        int totalDocsFetchedFromFirstTable = 0;
-        int totalDocsFetchedFromSecondTable = 0;
-        Where originalWhereSecondTable = this.builder.getOriginalSelect(false).getWhere();
-        while (hits.length != 0) {
-            totalDocsFetchedFromFirstTable += hits.length;
-            Set<Object> currentSetFromResults = new HashSet<>();
-            fillSetFromHits(firstFieldName, hits, currentSetFromResults);
-            //fetch from second
-            Select secondQuerySelect = this.builder.getOriginalSelect(false);
-            Where where = createWhereWithOrigianlAndTermsFilter(secondFieldName, originalWhereSecondTable,
-                    currentSetFromResults);
-            secondQuerySelect.setWhere(where);
-            DefaultQueryAction queryAction = new DefaultQueryAction(this.client, secondQuerySelect);
-            queryAction.explain();
-            if (totalDocsFetchedFromSecondTable > this.maxDocsToFetchOnSecondTable) {
-                break;
-            }
-            SearchResponse responseForSecondTable = ElasticUtils.scrollOneTimeWithHits(this.client,
-                    queryAction.getRequestBuilder(), secondQuerySelect, this.maxDocsToFetchOnEachScrollShard);
-            SearchHits secondQuerySearchHits = responseForSecondTable.getHits();
-
-            SearchHit[] secondQueryHits = secondQuerySearchHits.getHits();
-            while (secondQueryHits.length > 0) {
-                totalDocsFetchedFromSecondTable += secondQueryHits.length;
-                removeValuesFromSetAccordingToHits(secondFieldName, currentSetFromResults, secondQueryHits);
-                if (totalDocsFetchedFromSecondTable > this.maxDocsToFetchOnSecondTable) {
-                    break;
-                }
-                responseForSecondTable = client.prepareSearchScroll(responseForSecondTable.getScrollId())
-                        .setScroll(new TimeValue(600000)).execute().actionGet();
-                secondQueryHits = responseForSecondTable.getHits().getHits();
-            }
-            results.addAll(currentSetFromResults);
-            if (totalDocsFetchedFromFirstTable > this.maxDocsToFetchOnFirstTable) {
-                System.out.println("too many results for first table, stoping at:" + totalDocsFetchedFromFirstTable);
-                break;
-            }
-
-            scrollResp = client.prepareSearchScroll(scrollResp.getScrollId())
-                    .setScroll(new TimeValue(600000)).execute().actionGet();
-            hits = scrollResp.getHits().getHits();
-        }
-        return new MinusOneFieldAndOptimizationResult(results, someHit);
-
-
+    return field.getName();
+  }
+
+  private boolean checkIfOnlyOneField(Select firstSelect, Select secondSelect) {
+    return firstSelect.getFields().size() == 1 && secondSelect.getFields().size() == 1;
+  }
+
+  // 0. save the original second table where , init set
+  // 1. on each scroll on first table , create miniSet
+  // 1.1 build where from all results (terms filter) , and run query
+  // 1.1.1 on each result remove from miniSet
+  // 1.1.2 add all results left from miniset to bigset
+  private MinusOneFieldAndOptimizationResult runWithScrollingAndAddFilter(
+      String firstFieldName, String secondFieldName) throws SqlParseException {
+    SearchResponse scrollResp =
+        ElasticUtils.scrollOneTimeWithHits(
+            this.client,
+            this.builder.getFirstSearchRequest(),
+            builder.getOriginalSelect(true),
+            this.maxDocsToFetchOnEachScrollShard);
+    Set<Object> results = new HashSet<>();
+    int currentNumOfResults = 0;
+    SearchHit[] hits = scrollResp.getHits().getHits();
+    SearchHit someHit = null;
+    if (hits.length != 0) {
+      // we need some hit for creating InnerResults.
+      someHit = hits[0];
     }
-
-    private void removeValuesFromSetAccordingToHits(String fieldName, Set<Object> setToRemoveFrom, SearchHit[] hits) {
-        for (SearchHit hit : hits) {
-            Object fieldValue = getFieldValue(hit, fieldName);
-            if (fieldValue != null) {
-                if (setToRemoveFrom.contains(fieldValue)) {
-                    setToRemoveFrom.remove(fieldValue);
-                }
-            }
+    int totalDocsFetchedFromFirstTable = 0;
+    int totalDocsFetchedFromSecondTable = 0;
+    Where originalWhereSecondTable = this.builder.getOriginalSelect(false).getWhere();
+    while (hits.length != 0) {
+      totalDocsFetchedFromFirstTable += hits.length;
+      Set<Object> currentSetFromResults = new HashSet<>();
+      fillSetFromHits(firstFieldName, hits, currentSetFromResults);
+      // fetch from second
+      Select secondQuerySelect = this.builder.getOriginalSelect(false);
+      Where where =
+          createWhereWithOrigianlAndTermsFilter(
+              secondFieldName, originalWhereSecondTable, currentSetFromResults);
+      secondQuerySelect.setWhere(where);
+      DefaultQueryAction queryAction = new DefaultQueryAction(this.client, secondQuerySelect);
+      queryAction.explain();
+      if (totalDocsFetchedFromSecondTable > this.maxDocsToFetchOnSecondTable) {
+        break;
+      }
+      SearchResponse responseForSecondTable =
+          ElasticUtils.scrollOneTimeWithHits(
+              this.client,
+              queryAction.getRequestBuilder(),
+              secondQuerySelect,
+              this.maxDocsToFetchOnEachScrollShard);
+      SearchHits secondQuerySearchHits = responseForSecondTable.getHits();
+
+      SearchHit[] secondQueryHits = secondQuerySearchHits.getHits();
+      while (secondQueryHits.length > 0) {
+        totalDocsFetchedFromSecondTable += secondQueryHits.length;
+        removeValuesFromSetAccordingToHits(secondFieldName, currentSetFromResults, secondQueryHits);
+        if (totalDocsFetchedFromSecondTable > this.maxDocsToFetchOnSecondTable) {
+          break;
         }
+        responseForSecondTable =
+            client
+                .prepareSearchScroll(responseForSecondTable.getScrollId())
+                .setScroll(new TimeValue(600000))
+                .execute()
+                .actionGet();
+        secondQueryHits = responseForSecondTable.getHits().getHits();
+      }
+      results.addAll(currentSetFromResults);
+      if (totalDocsFetchedFromFirstTable > this.maxDocsToFetchOnFirstTable) {
+        System.out.println(
+            "too many results for first table, stoping at:" + totalDocsFetchedFromFirstTable);
+        break;
+      }
+
+      scrollResp =
+          client
+              .prepareSearchScroll(scrollResp.getScrollId())
+              .setScroll(new TimeValue(600000))
+              .execute()
+              .actionGet();
+      hits = scrollResp.getHits().getHits();
     }
-
-    private void fillSetFromHits(String fieldName, SearchHit[] hits, Set<Object> setToFill) {
-        for (SearchHit hit : hits) {
-            Object fieldValue = getFieldValue(hit, fieldName);
-            if (fieldValue != null) {
-                setToFill.add(fieldValue);
-            }
+    return new MinusOneFieldAndOptimizationResult(results, someHit);
+  }
+
+  private void removeValuesFromSetAccordingToHits(
+      String fieldName, Set<Object> setToRemoveFrom, SearchHit[] hits) {
+    for (SearchHit hit : hits) {
+      Object fieldValue = getFieldValue(hit, fieldName);
+      if (fieldValue != null) {
+        if (setToRemoveFrom.contains(fieldValue)) {
+          setToRemoveFrom.remove(fieldValue);
         }
+      }
     }
-
-    private Where createWhereWithOrigianlAndTermsFilter(String secondFieldName, Where originalWhereSecondTable,
-                                                        Set<Object> currentSetFromResults) throws SqlParseException {
-        Where where = Where.newInstance();
-        where.setConn(Where.CONN.AND);
-        where.addWhere(originalWhereSecondTable);
-        where.addWhere(buildTermsFilterFromResults(currentSetFromResults, secondFieldName));
-        return where;
+  }
+
+  private void fillSetFromHits(String fieldName, SearchHit[] hits, Set<Object> setToFill) {
+    for (SearchHit hit : hits) {
+      Object fieldValue = getFieldValue(hit, fieldName);
+      if (fieldValue != null) {
+        setToFill.add(fieldValue);
+      }
     }
-
-    private Where buildTermsFilterFromResults(Set<Object> results, String fieldName) throws SqlParseException {
-        return new Condition(Where.CONN.AND, fieldName, null, Condition.OPERATOR.IN_TERMS, results.toArray(), null);
+  }
+
+  private Where createWhereWithOrigianlAndTermsFilter(
+      String secondFieldName, Where originalWhereSecondTable, Set<Object> currentSetFromResults)
+      throws SqlParseException {
+    Where where = Where.newInstance();
+    where.setConn(Where.CONN.AND);
+    where.addWhere(originalWhereSecondTable);
+    where.addWhere(buildTermsFilterFromResults(currentSetFromResults, secondFieldName));
+    return where;
+  }
+
+  private Where buildTermsFilterFromResults(Set<Object> results, String fieldName)
+      throws SqlParseException {
+    return new Condition(
+        Where.CONN.AND, fieldName, null, Condition.OPERATOR.IN_TERMS, results.toArray(), null);
+  }
+
+  private Object getFieldValue(SearchHit hit, String fieldName) {
+    Map<String, Object> sourceAsMap = hit.getSourceAsMap();
+    if (fieldName.contains(".")) {
+      String[] split = fieldName.split("\\.");
+      return Util.searchPathInMap(sourceAsMap, split);
+    } else if (sourceAsMap.containsKey(fieldName)) {
+      return sourceAsMap.get(fieldName);
     }
-
-    private Object getFieldValue(SearchHit hit, String fieldName) {
-        Map<String, Object> sourceAsMap = hit.getSourceAsMap();
-        if (fieldName.contains(".")) {
-            String[] split = fieldName.split("\\.");
-            return Util.searchPathInMap(sourceAsMap, split);
-        } else if (sourceAsMap.containsKey(fieldName)) {
-            return sourceAsMap.get(fieldName);
-        }
-        return null;
+    return null;
+  }
+
+  private void fillFieldsOrder() {
+    List<String> fieldsOrAliases = new ArrayList<>();
+    Map<String, String> firstTableFieldToAlias = this.builder.getFirstTableFieldToAlias();
+    List<Field> firstTableFields = this.builder.getOriginalSelect(true).getFields();
+
+    for (Field field : firstTableFields) {
+      if (firstTableFieldToAlias.containsKey(field.getName())) {
+        fieldsOrAliases.add(field.getAlias());
+      } else {
+        fieldsOrAliases.add(field.getName());
+      }
     }
-
-    private void fillFieldsOrder() {
-        List<String> fieldsOrAliases = new ArrayList<>();
-        Map<String, String> firstTableFieldToAlias = this.builder.getFirstTableFieldToAlias();
-        List<Field> firstTableFields = this.builder.getOriginalSelect(true).getFields();
-
-        for (Field field : firstTableFields) {
-            if (firstTableFieldToAlias.containsKey(field.getName())) {
-                fieldsOrAliases.add(field.getAlias());
-            } else {
-                fieldsOrAliases.add(field.getName());
-            }
-        }
-        Collections.sort(fieldsOrAliases);
-
-        int fieldsSize = fieldsOrAliases.size();
-        this.fieldsOrderFirstTable = new String[fieldsSize];
-        fillFieldsArray(fieldsOrAliases, firstTableFieldToAlias, this.fieldsOrderFirstTable);
-        this.fieldsOrderSecondTable = new String[fieldsSize];
-        fillFieldsArray(fieldsOrAliases, this.builder.getSecondTableFieldToAlias(), this.fieldsOrderSecondTable);
+    Collections.sort(fieldsOrAliases);
+
+    int fieldsSize = fieldsOrAliases.size();
+    this.fieldsOrderFirstTable = new String[fieldsSize];
+    fillFieldsArray(fieldsOrAliases, firstTableFieldToAlias, this.fieldsOrderFirstTable);
+    this.fieldsOrderSecondTable = new String[fieldsSize];
+    fillFieldsArray(
+        fieldsOrAliases, this.builder.getSecondTableFieldToAlias(), this.fieldsOrderSecondTable);
+  }
+
+  private void fillFieldsArray(
+      List<String> fieldsOrAliases, Map<String, String> fieldsToAlias, String[] fields) {
+    Map<String, String> aliasToField = inverseMap(fieldsToAlias);
+    for (int i = 0; i < fields.length; i++) {
+      String field = fieldsOrAliases.get(i);
+      if (aliasToField.containsKey(field)) {
+        field = aliasToField.get(field);
+      }
+      fields[i] = field;
     }
+  }
 
-    private void fillFieldsArray(List<String> fieldsOrAliases, Map<String, String> fieldsToAlias, String[] fields) {
-        Map<String, String> aliasToField = inverseMap(fieldsToAlias);
-        for (int i = 0; i < fields.length; i++) {
-            String field = fieldsOrAliases.get(i);
-            if (aliasToField.containsKey(field)) {
-                field = aliasToField.get(field);
-            }
-            fields[i] = field;
-        }
+  private Map<String, String> inverseMap(Map<String, String> mapToInverse) {
+    Map<String, String> inversedMap = new HashMap<>();
+    for (Map.Entry<String, String> entry : mapToInverse.entrySet()) {
+      inversedMap.put(entry.getValue(), entry.getKey());
     }
+    return inversedMap;
+  }
 
-    private Map<String, String> inverseMap(Map<String, String> mapToInverse) {
-        Map<String, String> inversedMap = new HashMap<>();
-        for (Map.Entry<String, String> entry : mapToInverse.entrySet()) {
-            inversedMap.put(entry.getValue(), entry.getKey());
-        }
-        return inversedMap;
+  private void parseHintsIfAny(List<Hint> hints) {
+    if (hints == null) {
+      return;
     }
-
-    private void parseHintsIfAny(List<Hint> hints) {
-        if (hints == null) {
-            return;
-        }
-        for (Hint hint : hints) {
-            if (hint.getType() == HintType.MINUS_USE_TERMS_OPTIMIZATION) {
-                Object[] params = hint.getParams();
-                if (params != null && params.length == 1) {
-                    this.termsOptimizationWithToLower = (boolean) params[0];
-                }
-            } else if (hint.getType() == HintType.MINUS_FETCH_AND_RESULT_LIMITS) {
-                Object[] params = hint.getParams();
-                this.useScrolling = true;
-                this.maxDocsToFetchOnFirstTable = (int) params[0];
-                this.maxDocsToFetchOnSecondTable = (int) params[1];
-                this.maxDocsToFetchOnEachScrollShard = (int) params[2];
-            }
+    for (Hint hint : hints) {
+      if (hint.getType() == HintType.MINUS_USE_TERMS_OPTIMIZATION) {
+        Object[] params = hint.getParams();
+        if (params != null && params.length == 1) {
+          this.termsOptimizationWithToLower = (boolean) params[0];
         }
+      } else if (hint.getType() == HintType.MINUS_FETCH_AND_RESULT_LIMITS) {
+        Object[] params = hint.getParams();
+        this.useScrolling = true;
+        this.maxDocsToFetchOnFirstTable = (int) params[0];
+        this.maxDocsToFetchOnSecondTable = (int) params[1];
+        this.maxDocsToFetchOnEachScrollShard = (int) params[2];
+      }
     }
-
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusOneFieldAndOptimizationResult.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusOneFieldAndOptimizationResult.java
index 3b4696bc1e..3d7206ab13 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusOneFieldAndOptimizationResult.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusOneFieldAndOptimizationResult.java
@@ -3,30 +3,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.multi;
 
 import java.util.Set;
 import org.opensearch.search.SearchHit;
 
-
-/**
- * Created by Eliran on 26/8/2016.
- */
+/** Created by Eliran on 26/8/2016. */
 class MinusOneFieldAndOptimizationResult {
-    private Set<Object> fieldValues;
-    private SearchHit someHit;
+  private Set<Object> fieldValues;
+  private SearchHit someHit;
 
-    MinusOneFieldAndOptimizationResult(Set<Object> fieldValues, SearchHit someHit) {
-        this.fieldValues = fieldValues;
-        this.someHit = someHit;
-    }
+  MinusOneFieldAndOptimizationResult(Set<Object> fieldValues, SearchHit someHit) {
+    this.fieldValues = fieldValues;
+    this.someHit = someHit;
+  }
 
-    public Set<Object> getFieldValues() {
-        return fieldValues;
-    }
+  public Set<Object> getFieldValues() {
+    return fieldValues;
+  }
 
-    public SearchHit getSomeHit() {
-        return someHit;
-    }
+  public SearchHit getSomeHit() {
+    return someHit;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MultiRequestExecutorFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MultiRequestExecutorFactory.java
index 239bc98772..03c6958076 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MultiRequestExecutorFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MultiRequestExecutorFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.multi;
 
 import com.alibaba.druid.sql.ast.statement.SQLUnionOperator;
@@ -12,20 +11,19 @@
 import org.opensearch.sql.legacy.executor.ElasticHitsExecutor;
 import org.opensearch.sql.legacy.query.multi.MultiQueryRequestBuilder;
 
-/**
- * Created by Eliran on 21/8/2016.
- */
+/** Created by Eliran on 21/8/2016. */
 public class MultiRequestExecutorFactory {
-    public static ElasticHitsExecutor createExecutor(Client client, MultiQueryRequestBuilder builder) {
-        SQLUnionOperator relation = builder.getRelation();
-        switch (relation) {
-            case UNION_ALL:
-            case UNION:
-                return new UnionExecutor(client, builder);
-            case MINUS:
-                return new MinusExecutor(client, builder);
-            default:
-                throw new SemanticAnalysisException("Unsupported operator: " + relation);
-        }
+  public static ElasticHitsExecutor createExecutor(
+      Client client, MultiQueryRequestBuilder builder) {
+    SQLUnionOperator relation = builder.getRelation();
+    switch (relation) {
+      case UNION_ALL:
+      case UNION:
+        return new UnionExecutor(client, builder);
+      case MINUS:
+        return new MinusExecutor(client, builder);
+      default:
+        throw new SemanticAnalysisException("Unsupported operator: " + relation);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/UnionExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/UnionExecutor.java
index fba2b2dcaf..6b8b64c4e8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/UnionExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/UnionExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.multi;
 
 import java.util.ArrayList;
@@ -16,7 +15,6 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
 import org.opensearch.common.document.DocumentField;
-import org.opensearch.common.text.Text;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
@@ -24,87 +22,92 @@
 import org.opensearch.sql.legacy.query.multi.MultiQueryRequestBuilder;
 import org.opensearch.sql.legacy.utils.Util;
 
-/**
- * Created by Eliran on 21/8/2016.
- */
+/** Created by Eliran on 21/8/2016. */
 public class UnionExecutor implements ElasticHitsExecutor {
 
-    private MultiQueryRequestBuilder multiQueryBuilder;
-    private SearchHits results;
-    private Client client;
-    private int currentId;
+  private MultiQueryRequestBuilder multiQueryBuilder;
+  private SearchHits results;
+  private Client client;
+  private int currentId;
 
-    public UnionExecutor(Client client, MultiQueryRequestBuilder builder) {
-        multiQueryBuilder = builder;
-        this.client = client;
-        currentId = 0;
-    }
+  public UnionExecutor(Client client, MultiQueryRequestBuilder builder) {
+    multiQueryBuilder = builder;
+    this.client = client;
+    currentId = 0;
+  }
 
-    @Override
-    public void run() {
-        SearchResponse firstResponse = this.multiQueryBuilder.getFirstSearchRequest().get();
-        SearchHit[] hits = firstResponse.getHits().getHits();
-        List<SearchHit> unionHits = new ArrayList<>(hits.length);
-        fillInternalSearchHits(unionHits, hits, this.multiQueryBuilder.getFirstTableFieldToAlias());
-        SearchResponse secondResponse = this.multiQueryBuilder.getSecondSearchRequest().get();
-        fillInternalSearchHits(unionHits, secondResponse.getHits().getHits(),
-                this.multiQueryBuilder.getSecondTableFieldToAlias());
-        int totalSize = unionHits.size();
-        SearchHit[] unionHitsArr = unionHits.toArray(new SearchHit[totalSize]);
-        this.results = new SearchHits(unionHitsArr, new TotalHits(totalSize, Relation.EQUAL_TO), 1.0f);
-    }
+  @Override
+  public void run() {
+    SearchResponse firstResponse = this.multiQueryBuilder.getFirstSearchRequest().get();
+    SearchHit[] hits = firstResponse.getHits().getHits();
+    List<SearchHit> unionHits = new ArrayList<>(hits.length);
+    fillInternalSearchHits(unionHits, hits, this.multiQueryBuilder.getFirstTableFieldToAlias());
+    SearchResponse secondResponse = this.multiQueryBuilder.getSecondSearchRequest().get();
+    fillInternalSearchHits(
+        unionHits,
+        secondResponse.getHits().getHits(),
+        this.multiQueryBuilder.getSecondTableFieldToAlias());
+    int totalSize = unionHits.size();
+    SearchHit[] unionHitsArr = unionHits.toArray(new SearchHit[totalSize]);
+    this.results = new SearchHits(unionHitsArr, new TotalHits(totalSize, Relation.EQUAL_TO), 1.0f);
+  }
 
-    private void fillInternalSearchHits(List<SearchHit> unionHits, SearchHit[] hits,
-                                        Map<String, String> fieldNameToAlias) {
-        for (SearchHit hit : hits) {
-            Map<String, DocumentField> documentFields = new HashMap<>();
-            Map<String, DocumentField> metaFields = new HashMap<>();
-            hit.getFields().forEach((fieldName, docField) ->
-                (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName) ? metaFields : documentFields).put(fieldName, docField));
-            SearchHit searchHit = new SearchHit(currentId, hit.getId(), documentFields, metaFields);
-            searchHit.sourceRef(hit.getSourceRef());
-            searchHit.getSourceAsMap().clear();
-            Map<String, Object> sourceAsMap = hit.getSourceAsMap();
-            if (!fieldNameToAlias.isEmpty()) {
-                updateFieldNamesToAlias(sourceAsMap, fieldNameToAlias);
-            }
-            searchHit.getSourceAsMap().putAll(sourceAsMap);
-            currentId++;
-            unionHits.add(searchHit);
-        }
+  private void fillInternalSearchHits(
+      List<SearchHit> unionHits, SearchHit[] hits, Map<String, String> fieldNameToAlias) {
+    for (SearchHit hit : hits) {
+      Map<String, DocumentField> documentFields = new HashMap<>();
+      Map<String, DocumentField> metaFields = new HashMap<>();
+      hit.getFields()
+          .forEach(
+              (fieldName, docField) ->
+                  (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName)
+                          ? metaFields
+                          : documentFields)
+                      .put(fieldName, docField));
+      SearchHit searchHit = new SearchHit(currentId, hit.getId(), documentFields, metaFields);
+      searchHit.sourceRef(hit.getSourceRef());
+      searchHit.getSourceAsMap().clear();
+      Map<String, Object> sourceAsMap = hit.getSourceAsMap();
+      if (!fieldNameToAlias.isEmpty()) {
+        updateFieldNamesToAlias(sourceAsMap, fieldNameToAlias);
+      }
+      searchHit.getSourceAsMap().putAll(sourceAsMap);
+      currentId++;
+      unionHits.add(searchHit);
     }
+  }
 
-
-    private void updateFieldNamesToAlias(Map<String, Object> sourceAsMap, Map<String, String> fieldNameToAlias) {
-        for (Map.Entry<String, String> fieldToAlias : fieldNameToAlias.entrySet()) {
-            String fieldName = fieldToAlias.getKey();
-            Object value = null;
-            Map<String, Object> deleteFrom = null;
-            if (fieldName.contains(".")) {
-                String[] split = fieldName.split("\\.");
-                String[] path = Arrays.copyOf(split, split.length - 1);
-                Object placeInMap = Util.searchPathInMap(sourceAsMap, path);
-                if (placeInMap != null) {
-                    if (!Map.class.isAssignableFrom(placeInMap.getClass())) {
-                        continue;
-                    }
-                }
-                deleteFrom = (Map<String, Object>) placeInMap;
-                value = deleteFrom.get(split[split.length - 1]);
-            } else if (sourceAsMap.containsKey(fieldName)) {
-                value = sourceAsMap.get(fieldName);
-                deleteFrom = sourceAsMap;
-            }
-            if (value != null) {
-                sourceAsMap.put(fieldToAlias.getValue(), value);
-                deleteFrom.remove(fieldName);
-            }
+  private void updateFieldNamesToAlias(
+      Map<String, Object> sourceAsMap, Map<String, String> fieldNameToAlias) {
+    for (Map.Entry<String, String> fieldToAlias : fieldNameToAlias.entrySet()) {
+      String fieldName = fieldToAlias.getKey();
+      Object value = null;
+      Map<String, Object> deleteFrom = null;
+      if (fieldName.contains(".")) {
+        String[] split = fieldName.split("\\.");
+        String[] path = Arrays.copyOf(split, split.length - 1);
+        Object placeInMap = Util.searchPathInMap(sourceAsMap, path);
+        if (placeInMap != null) {
+          if (!Map.class.isAssignableFrom(placeInMap.getClass())) {
+            continue;
+          }
         }
-        Util.clearEmptyPaths(sourceAsMap);
+        deleteFrom = (Map<String, Object>) placeInMap;
+        value = deleteFrom.get(split[split.length - 1]);
+      } else if (sourceAsMap.containsKey(fieldName)) {
+        value = sourceAsMap.get(fieldName);
+        deleteFrom = sourceAsMap;
+      }
+      if (value != null) {
+        sourceAsMap.put(fieldToAlias.getValue(), value);
+        deleteFrom.remove(fieldName);
+      }
     }
+    Util.clearEmptyPaths(sourceAsMap);
+  }
 
-    @Override
-    public SearchHits getHits() {
-        return results;
-    }
+  @Override
+  public SearchHits getHits() {
+    return results;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/Expression.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/Expression.java
index a858d99d3f..3a9ac5a66d 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/Expression.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/Expression.java
@@ -3,21 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core;
 
-
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
 import org.opensearch.sql.legacy.expression.model.ExprValue;
 
-/**
- * The definition of the Expression.
- */
+/** The definition of the Expression. */
 public interface Expression {
-    /**
-     * Evaluate the result on the BindingTuple context.
-     * @param tuple BindingTuple
-     * @return ExprValue
-     */
-    ExprValue valueOf(BindingTuple tuple);
+  /**
+   * Evaluate the result on the BindingTuple context.
+   *
+   * @param tuple BindingTuple
+   * @return ExprValue
+   */
+  ExprValue valueOf(BindingTuple tuple);
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/ExpressionFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/ExpressionFactory.java
index cf5fd4627f..1df81e34b3 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/ExpressionFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/ExpressionFactory.java
@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core;
 
-
 import static org.opensearch.sql.legacy.expression.core.operator.ScalarOperation.ABS;
 import static org.opensearch.sql.legacy.expression.core.operator.ScalarOperation.ACOS;
 import static org.opensearch.sql.legacy.expression.core.operator.ScalarOperation.ADD;
@@ -38,89 +36,80 @@
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
 import org.opensearch.sql.legacy.expression.model.ExprValue;
 
-
-/**
- * The definition of Expression factory.
- */
+/** The definition of Expression factory. */
 public class ExpressionFactory {
 
-    private static final Map<ScalarOperation, ExpressionBuilder> operationExpressionBuilderMap =
-            new ImmutableMap.Builder<ScalarOperation, ExpressionBuilder>()
-                    .put(ADD, ArithmeticFunctionFactory.add())
-                    .put(SUBTRACT, ArithmeticFunctionFactory.subtract())
-                    .put(MULTIPLY, ArithmeticFunctionFactory.multiply())
-                    .put(DIVIDE, ArithmeticFunctionFactory.divide())
-                    .put(MODULES, ArithmeticFunctionFactory.modules())
-                    .put(ABS, ArithmeticFunctionFactory.abs())
-                    .put(ACOS, ArithmeticFunctionFactory.acos())
-                    .put(ASIN, ArithmeticFunctionFactory.asin())
-                    .put(ATAN, ArithmeticFunctionFactory.atan())
-                    .put(ATAN2, ArithmeticFunctionFactory.atan2())
-                    .put(TAN, ArithmeticFunctionFactory.tan())
-                    .put(CBRT, ArithmeticFunctionFactory.cbrt())
-                    .put(CEIL, ArithmeticFunctionFactory.ceil())
-                    .put(COS, ArithmeticFunctionFactory.cos())
-                    .put(COSH, ArithmeticFunctionFactory.cosh())
-                    .put(EXP, ArithmeticFunctionFactory.exp())
-                    .put(FLOOR, ArithmeticFunctionFactory.floor())
-                    .put(LN, ArithmeticFunctionFactory.ln())
-                    .put(LOG, ArithmeticFunctionFactory.log())
-                    .put(LOG2, ArithmeticFunctionFactory.log2())
-                    .put(LOG10, ArithmeticFunctionFactory.log10())
-                    .build();
+  private static final Map<ScalarOperation, ExpressionBuilder> operationExpressionBuilderMap =
+      new ImmutableMap.Builder<ScalarOperation, ExpressionBuilder>()
+          .put(ADD, ArithmeticFunctionFactory.add())
+          .put(SUBTRACT, ArithmeticFunctionFactory.subtract())
+          .put(MULTIPLY, ArithmeticFunctionFactory.multiply())
+          .put(DIVIDE, ArithmeticFunctionFactory.divide())
+          .put(MODULES, ArithmeticFunctionFactory.modules())
+          .put(ABS, ArithmeticFunctionFactory.abs())
+          .put(ACOS, ArithmeticFunctionFactory.acos())
+          .put(ASIN, ArithmeticFunctionFactory.asin())
+          .put(ATAN, ArithmeticFunctionFactory.atan())
+          .put(ATAN2, ArithmeticFunctionFactory.atan2())
+          .put(TAN, ArithmeticFunctionFactory.tan())
+          .put(CBRT, ArithmeticFunctionFactory.cbrt())
+          .put(CEIL, ArithmeticFunctionFactory.ceil())
+          .put(COS, ArithmeticFunctionFactory.cos())
+          .put(COSH, ArithmeticFunctionFactory.cosh())
+          .put(EXP, ArithmeticFunctionFactory.exp())
+          .put(FLOOR, ArithmeticFunctionFactory.floor())
+          .put(LN, ArithmeticFunctionFactory.ln())
+          .put(LOG, ArithmeticFunctionFactory.log())
+          .put(LOG2, ArithmeticFunctionFactory.log2())
+          .put(LOG10, ArithmeticFunctionFactory.log10())
+          .build();
 
-    public static Expression of(ScalarOperation op, List<Expression> expressions) {
-        return operationExpressionBuilderMap.get(op).build(expressions);
-    }
+  public static Expression of(ScalarOperation op, List<Expression> expressions) {
+    return operationExpressionBuilderMap.get(op).build(expressions);
+  }
 
-    /**
-     * Ref Expression. Define the binding name which could be resolved in {@link BindingTuple}
-     */
-    public static Expression ref(String bindingName) {
-        return new Expression() {
-            @Override
-            public ExprValue valueOf(BindingTuple tuple) {
-                return tuple.resolve(bindingName);
-            }
+  /** Ref Expression. Define the binding name which could be resolved in {@link BindingTuple} */
+  public static Expression ref(String bindingName) {
+    return new Expression() {
+      @Override
+      public ExprValue valueOf(BindingTuple tuple) {
+        return tuple.resolve(bindingName);
+      }
 
-            @Override
-            public String toString() {
-                return String.format("%s", bindingName);
-            }
-        };
-    }
+      @Override
+      public String toString() {
+        return String.format("%s", bindingName);
+      }
+    };
+  }
 
-    /**
-     * Literal Expression.
-     */
-    public static Expression literal(ExprValue value) {
-        return new Expression() {
-            @Override
-            public ExprValue valueOf(BindingTuple tuple) {
-                return value;
-            }
+  /** Literal Expression. */
+  public static Expression literal(ExprValue value) {
+    return new Expression() {
+      @Override
+      public ExprValue valueOf(BindingTuple tuple) {
+        return value;
+      }
 
-            @Override
-            public String toString() {
-                return String.format("%s", value);
-            }
-        };
-    }
+      @Override
+      public String toString() {
+        return String.format("%s", value);
+      }
+    };
+  }
 
-    /**
-     * Cast Expression.
-     */
-    public static Expression cast(Expression expr) {
-        return new Expression() {
-            @Override
-            public ExprValue valueOf(BindingTuple tuple) {
-                return expr.valueOf(tuple);
-            }
+  /** Cast Expression. */
+  public static Expression cast(Expression expr) {
+    return new Expression() {
+      @Override
+      public ExprValue valueOf(BindingTuple tuple) {
+        return expr.valueOf(tuple);
+      }
 
-            @Override
-            public String toString() {
-                return String.format("cast(%s)", expr);
-            }
-        };
-    }
+      @Override
+      public String toString() {
+        return String.format("cast(%s)", expr);
+      }
+    };
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/ArithmeticFunctionFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/ArithmeticFunctionFactory.java
index afa6f6c439..c1de63fe88 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/ArithmeticFunctionFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/ArithmeticFunctionFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core.builder;
 
 import org.opensearch.sql.legacy.expression.core.operator.BinaryScalarOperator;
@@ -12,205 +11,130 @@
 import org.opensearch.sql.legacy.expression.core.operator.ScalarOperation;
 import org.opensearch.sql.legacy.expression.core.operator.UnaryScalarOperator;
 
-/**
- * The definition of arithmetic function builder factory.
- */
+/** The definition of arithmetic function builder factory. */
 public class ArithmeticFunctionFactory {
-    public static ExpressionBuilder add() {
-        return new BinaryExpressionBuilder(
-                new BinaryScalarOperator(
-                        ScalarOperation.ADD,
-                        Math::addExact,
-                        Math::addExact,
-                        Double::sum,
-                        Float::sum));
-    }
-
-    public static ExpressionBuilder subtract() {
-        return new BinaryExpressionBuilder(
-                new BinaryScalarOperator(
-                        ScalarOperation.ADD,
-                        Math::subtractExact,
-                        Math::subtractExact,
-                        (v1, v2) -> v1 - v2,
-                        (v1, v2) -> v1 - v2));
-    }
-
-    public static ExpressionBuilder multiply() {
-        return new BinaryExpressionBuilder(
-                new BinaryScalarOperator(
-                        ScalarOperation.MULTIPLY,
-                        Math::multiplyExact,
-                        Math::multiplyExact,
-                        (v1, v2) -> v1 * v2,
-                        (v1, v2) -> v1 * v2
-                ));
-    }
-
-    public static ExpressionBuilder divide() {
-        return new BinaryExpressionBuilder(
-                new BinaryScalarOperator(
-                        ScalarOperation.DIVIDE,
-                        (v1, v2) -> v1 / v2,
-                        (v1, v2) -> v1 / v2,
-                        (v1, v2) -> v1 / v2,
-                        (v1, v2) -> v1 / v2
-                ));
-    }
-
-    public static ExpressionBuilder modules() {
-        return new BinaryExpressionBuilder(
-                new BinaryScalarOperator(
-                        ScalarOperation.MODULES,
-                        (v1, v2) -> v1 % v2,
-                        (v1, v2) -> v1 % v2,
-                        (v1, v2) -> v1 % v2,
-                        (v1, v2) -> v1 % v2
-                ));
-    }
-
-    public static ExpressionBuilder abs() {
-        return new UnaryExpressionBuilder(
-                new UnaryScalarOperator(
-                        ScalarOperation.ABS,
-                        Math::abs,
-                        Math::abs,
-                        Math::abs,
-                        Math::abs
-                ));
-    }
-
-    public static ExpressionBuilder acos() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.ACOS,
-                        Math::acos
-                ));
-    }
-
-    public static ExpressionBuilder asin() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.ASIN,
-                        Math::asin
-                )
-        );
-    }
-
-    public static ExpressionBuilder atan() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.ATAN,
-                        Math::atan
-                )
-        );
-    }
-
-    public static ExpressionBuilder atan2() {
-        return new BinaryExpressionBuilder(
-                new DoubleBinaryScalarOperator(
-                        ScalarOperation.ATAN2,
-                        Math::atan2
-                )
-        );
-    }
-
-    public static ExpressionBuilder tan() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.TAN,
-                        Math::tan
-                )
-        );
-    }
-
-    public static ExpressionBuilder cbrt() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.CBRT,
-                        Math::cbrt
-                )
-        );
-    }
-
-    public static ExpressionBuilder ceil() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.CEIL,
-                        Math::ceil
-                )
-        );
-    }
-
-    public static ExpressionBuilder cos() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.COS,
-                        Math::cos
-                )
-        );
-    }
-
-    public static ExpressionBuilder cosh() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.COSH,
-                        Math::cosh
-                )
-        );
-    }
-
-    public static ExpressionBuilder exp() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.EXP,
-                        Math::exp
-                )
-        );
-    }
-
-    public static ExpressionBuilder floor() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.FLOOR,
-                        Math::floor
-                )
-        );
-    }
-
-    public static ExpressionBuilder ln() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.LN,
-                        Math::log
-                )
-        );
-    }
-
-    public static ExpressionBuilder log() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.LOG,
-                        Math::log
-                )
-        );
-    }
-
-    public static ExpressionBuilder log2() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.LOG2,
-                        (x) -> Math.log(x) / Math.log(2d)
-                )
-        );
-    }
-
-    public static ExpressionBuilder log10() {
-        return new UnaryExpressionBuilder(
-                new DoubleUnaryScalarOperator(
-                        ScalarOperation.LOG10,
-                        Math::log10
-                )
-        );
-    }
+  public static ExpressionBuilder add() {
+    return new BinaryExpressionBuilder(
+        new BinaryScalarOperator(
+            ScalarOperation.ADD, Math::addExact, Math::addExact, Double::sum, Float::sum));
+  }
+
+  public static ExpressionBuilder subtract() {
+    return new BinaryExpressionBuilder(
+        new BinaryScalarOperator(
+            ScalarOperation.ADD,
+            Math::subtractExact,
+            Math::subtractExact,
+            (v1, v2) -> v1 - v2,
+            (v1, v2) -> v1 - v2));
+  }
+
+  public static ExpressionBuilder multiply() {
+    return new BinaryExpressionBuilder(
+        new BinaryScalarOperator(
+            ScalarOperation.MULTIPLY,
+            Math::multiplyExact,
+            Math::multiplyExact,
+            (v1, v2) -> v1 * v2,
+            (v1, v2) -> v1 * v2));
+  }
+
+  public static ExpressionBuilder divide() {
+    return new BinaryExpressionBuilder(
+        new BinaryScalarOperator(
+            ScalarOperation.DIVIDE,
+            (v1, v2) -> v1 / v2,
+            (v1, v2) -> v1 / v2,
+            (v1, v2) -> v1 / v2,
+            (v1, v2) -> v1 / v2));
+  }
+
+  public static ExpressionBuilder modules() {
+    return new BinaryExpressionBuilder(
+        new BinaryScalarOperator(
+            ScalarOperation.MODULES,
+            (v1, v2) -> v1 % v2,
+            (v1, v2) -> v1 % v2,
+            (v1, v2) -> v1 % v2,
+            (v1, v2) -> v1 % v2));
+  }
+
+  public static ExpressionBuilder abs() {
+    return new UnaryExpressionBuilder(
+        new UnaryScalarOperator(ScalarOperation.ABS, Math::abs, Math::abs, Math::abs, Math::abs));
+  }
+
+  public static ExpressionBuilder acos() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.ACOS, Math::acos));
+  }
+
+  public static ExpressionBuilder asin() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.ASIN, Math::asin));
+  }
+
+  public static ExpressionBuilder atan() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.ATAN, Math::atan));
+  }
+
+  public static ExpressionBuilder atan2() {
+    return new BinaryExpressionBuilder(
+        new DoubleBinaryScalarOperator(ScalarOperation.ATAN2, Math::atan2));
+  }
+
+  public static ExpressionBuilder tan() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.TAN, Math::tan));
+  }
+
+  public static ExpressionBuilder cbrt() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.CBRT, Math::cbrt));
+  }
+
+  public static ExpressionBuilder ceil() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.CEIL, Math::ceil));
+  }
+
+  public static ExpressionBuilder cos() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.COS, Math::cos));
+  }
+
+  public static ExpressionBuilder cosh() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.COSH, Math::cosh));
+  }
+
+  public static ExpressionBuilder exp() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.EXP, Math::exp));
+  }
+
+  public static ExpressionBuilder floor() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.FLOOR, Math::floor));
+  }
+
+  public static ExpressionBuilder ln() {
+    return new UnaryExpressionBuilder(new DoubleUnaryScalarOperator(ScalarOperation.LN, Math::log));
+  }
+
+  public static ExpressionBuilder log() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.LOG, Math::log));
+  }
+
+  public static ExpressionBuilder log2() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.LOG2, (x) -> Math.log(x) / Math.log(2d)));
+  }
+
+  public static ExpressionBuilder log10() {
+    return new UnaryExpressionBuilder(
+        new DoubleUnaryScalarOperator(ScalarOperation.LOG10, Math::log10));
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/BinaryExpressionBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/BinaryExpressionBuilder.java
index 99ddd50248..fcf08180a5 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/BinaryExpressionBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/BinaryExpressionBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core.builder;
 
 import java.util.Arrays;
@@ -14,33 +13,32 @@
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
 import org.opensearch.sql.legacy.expression.model.ExprValue;
 
-/**
- * The definition of the Expression Builder which has two arguments.
- */
+/** The definition of the Expression Builder which has two arguments. */
 @RequiredArgsConstructor
 public class BinaryExpressionBuilder implements ExpressionBuilder {
-    private final ScalarOperator op;
+  private final ScalarOperator op;
 
-    /**
-     * Build the expression with two {@link Expression} as arguments.
-     * @param expressionList expression list.
-     * @return expression.
-     */
-    @Override
-    public Expression build(List<Expression> expressionList) {
-        Expression e1 = expressionList.get(0);
-        Expression e2 = expressionList.get(1);
+  /**
+   * Build the expression with two {@link Expression} as arguments.
+   *
+   * @param expressionList expression list.
+   * @return expression.
+   */
+  @Override
+  public Expression build(List<Expression> expressionList) {
+    Expression e1 = expressionList.get(0);
+    Expression e2 = expressionList.get(1);
 
-        return new Expression() {
-            @Override
-            public ExprValue valueOf(BindingTuple tuple) {
-                return op.apply(Arrays.asList(e1.valueOf(tuple), e2.valueOf(tuple)));
-            }
+    return new Expression() {
+      @Override
+      public ExprValue valueOf(BindingTuple tuple) {
+        return op.apply(Arrays.asList(e1.valueOf(tuple), e2.valueOf(tuple)));
+      }
 
-            @Override
-            public String toString() {
-                return String.format("%s(%s,%s)", op.name(), e1, e2);
-            }
-        };
-    }
+      @Override
+      public String toString() {
+        return String.format("%s(%s,%s)", op.name(), e1, e2);
+      }
+    };
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/ExpressionBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/ExpressionBuilder.java
index 5f2cbb5776..76744d7d34 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/ExpressionBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/ExpressionBuilder.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core.builder;
 
 import java.util.List;
 import org.opensearch.sql.legacy.expression.core.Expression;
 
-/**
- * The definition of the {@link Expression} builder.
- */
+/** The definition of the {@link Expression} builder. */
 public interface ExpressionBuilder {
-    Expression build(List<Expression> expressionList);
+  Expression build(List<Expression> expressionList);
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/UnaryExpressionBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/UnaryExpressionBuilder.java
index f9bdce8ce4..3d40c3a527 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/UnaryExpressionBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/builder/UnaryExpressionBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core.builder;
 
 import java.util.Arrays;
@@ -14,32 +13,31 @@
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
 import org.opensearch.sql.legacy.expression.model.ExprValue;
 
-/**
- * The definition of the Expression Builder which has one argument.
- */
+/** The definition of the Expression Builder which has one argument. */
 @RequiredArgsConstructor
 public class UnaryExpressionBuilder implements ExpressionBuilder {
-    private final ScalarOperator op;
+  private final ScalarOperator op;
 
-    /**
-     * Build the expression with two {@link Expression} as arguments.
-     * @param expressionList expression list.
-     * @return expression.
-     */
-    @Override
-    public Expression build(List<Expression> expressionList) {
-        Expression expression = expressionList.get(0);
+  /**
+   * Build the expression with two {@link Expression} as arguments.
+   *
+   * @param expressionList expression list.
+   * @return expression.
+   */
+  @Override
+  public Expression build(List<Expression> expressionList) {
+    Expression expression = expressionList.get(0);
 
-        return new Expression() {
-            @Override
-            public ExprValue valueOf(BindingTuple tuple) {
-                return op.apply(Arrays.asList(expression.valueOf(tuple)));
-            }
+    return new Expression() {
+      @Override
+      public ExprValue valueOf(BindingTuple tuple) {
+        return op.apply(Arrays.asList(expression.valueOf(tuple)));
+      }
 
-            @Override
-            public String toString() {
-                return String.format("%s(%s)", op.name(), expression);
-            }
-        };
-    }
+      @Override
+      public String toString() {
+        return String.format("%s(%s)", op.name(), expression);
+      }
+    };
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/BinaryScalarOperator.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/BinaryScalarOperator.java
index 70d47a3e83..02d29e1ed9 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/BinaryScalarOperator.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/BinaryScalarOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core.operator;
 
 import static org.opensearch.sql.legacy.expression.model.ExprValue.ExprValueKind.DOUBLE_VALUE;
@@ -24,54 +23,53 @@
 import org.opensearch.sql.legacy.expression.model.ExprValueFactory;
 
 /**
- * Binary Scalar Operator take two {@link ExprValue} as arguments ans return one {@link ExprValue} as result.
+ * Binary Scalar Operator take two {@link ExprValue} as arguments ans return one {@link ExprValue}
+ * as result.
  */
 @RequiredArgsConstructor
 public class BinaryScalarOperator implements ScalarOperator {
-    private static final Map<ExprValue.ExprValueKind, Integer> numberTypeOrder =
-            new ImmutableMap.Builder<ExprValue.ExprValueKind, Integer>()
-                    .put(INTEGER_VALUE, 0)
-                    .put(LONG_VALUE, 1)
-                    .put(DOUBLE_VALUE, 2)
-                    .put(FLOAT_VALUE, 3)
-                    .build();
+  private static final Map<ExprValue.ExprValueKind, Integer> numberTypeOrder =
+      new ImmutableMap.Builder<ExprValue.ExprValueKind, Integer>()
+          .put(INTEGER_VALUE, 0)
+          .put(LONG_VALUE, 1)
+          .put(DOUBLE_VALUE, 2)
+          .put(FLOAT_VALUE, 3)
+          .build();
 
-    private final ScalarOperation op;
-    private final BiFunction<Integer, Integer, Integer> integerFunc;
-    private final BiFunction<Long, Long, Long> longFunc;
-    private final BiFunction<Double, Double, Double> doubleFunc;
-    private final BiFunction<Float, Float, Float> floatFunc;
+  private final ScalarOperation op;
+  private final BiFunction<Integer, Integer, Integer> integerFunc;
+  private final BiFunction<Long, Long, Long> longFunc;
+  private final BiFunction<Double, Double, Double> doubleFunc;
+  private final BiFunction<Float, Float, Float> floatFunc;
 
-    @Override
-    public ExprValue apply(List<ExprValue> valueList) {
-        ExprValue v1 = valueList.get(0);
-        ExprValue v2 = valueList.get(1);
-        if (!numberTypeOrder.containsKey(v1.kind()) || !numberTypeOrder.containsKey(v2.kind())) {
-            throw new RuntimeException(
-                    String.format("unexpected operation type: %s(%s, %s) ", op.name(), v1.kind(), v2.kind()));
-        }
-        ExprValue.ExprValueKind expectedType = numberTypeOrder.get(v1.kind()) > numberTypeOrder.get(v2.kind())
-                ? v1.kind() : v2.kind();
-        switch (expectedType) {
-            case DOUBLE_VALUE:
-                return ExprValueFactory.from(doubleFunc.apply(getDoubleValue(v1), getDoubleValue(v2)));
-            case INTEGER_VALUE:
-                return ExprValueFactory
-                        .from(integerFunc.apply(getIntegerValue(v1), getIntegerValue(v2)));
-            case LONG_VALUE:
-                return ExprValueFactory
-                        .from(longFunc.apply(getLongValue(v1), getLongValue(v2)));
-            case FLOAT_VALUE:
-                return ExprValueFactory
-                        .from(floatFunc.apply(getFloatValue(v1), getFloatValue(v2)));
-            default:
-                throw new RuntimeException(String.format("unexpected operation type: %s(%s, %s)", op.name(), v1.kind(),
-                                                         v2.kind()));
-        }
+  @Override
+  public ExprValue apply(List<ExprValue> valueList) {
+    ExprValue v1 = valueList.get(0);
+    ExprValue v2 = valueList.get(1);
+    if (!numberTypeOrder.containsKey(v1.kind()) || !numberTypeOrder.containsKey(v2.kind())) {
+      throw new RuntimeException(
+          String.format("unexpected operation type: %s(%s, %s) ", op.name(), v1.kind(), v2.kind()));
     }
-
-    @Override
-    public String name() {
-        return op.name();
+    ExprValue.ExprValueKind expectedType =
+        numberTypeOrder.get(v1.kind()) > numberTypeOrder.get(v2.kind()) ? v1.kind() : v2.kind();
+    switch (expectedType) {
+      case DOUBLE_VALUE:
+        return ExprValueFactory.from(doubleFunc.apply(getDoubleValue(v1), getDoubleValue(v2)));
+      case INTEGER_VALUE:
+        return ExprValueFactory.from(integerFunc.apply(getIntegerValue(v1), getIntegerValue(v2)));
+      case LONG_VALUE:
+        return ExprValueFactory.from(longFunc.apply(getLongValue(v1), getLongValue(v2)));
+      case FLOAT_VALUE:
+        return ExprValueFactory.from(floatFunc.apply(getFloatValue(v1), getFloatValue(v2)));
+      default:
+        throw new RuntimeException(
+            String.format(
+                "unexpected operation type: %s(%s, %s)", op.name(), v1.kind(), v2.kind()));
     }
+  }
+
+  @Override
+  public String name() {
+    return op.name();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/DoubleBinaryScalarOperator.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/DoubleBinaryScalarOperator.java
index 2555b2a53c..12e7aacbaa 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/DoubleBinaryScalarOperator.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/DoubleBinaryScalarOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core.operator;
 
 import static org.opensearch.sql.legacy.expression.model.ExprValueUtils.getDoubleValue;
@@ -16,37 +15,41 @@
 import org.opensearch.sql.legacy.expression.model.ExprValueFactory;
 
 /**
- * Double Binary Scalar Operator take two {@link ExprValue} which have double value as arguments ans return one
- * {@link ExprDoubleValue} as result.
+ * Double Binary Scalar Operator take two {@link ExprValue} which have double value as arguments ans
+ * return one {@link ExprDoubleValue} as result.
  */
 @RequiredArgsConstructor
 public class DoubleBinaryScalarOperator implements ScalarOperator {
-    private final ScalarOperation op;
-    private final BiFunction<Double, Double, Double> doubleFunc;
+  private final ScalarOperation op;
+  private final BiFunction<Double, Double, Double> doubleFunc;
 
-    @Override
-    public ExprValue apply(List<ExprValue> exprValues) {
-        ExprValue exprValue1 = exprValues.get(0);
-        ExprValue exprValue2 = exprValues.get(1);
-        if (exprValue1.kind() != exprValue2.kind()) {
-            throw new RuntimeException(String.format("unexpected operation type: %s(%s,%s)", op.name(),
-                                                     exprValue1.kind(), exprValue2.kind()));
-        }
-        switch (exprValue1.kind()) {
-            case DOUBLE_VALUE:
-            case INTEGER_VALUE:
-            case LONG_VALUE:
-            case FLOAT_VALUE:
-                return ExprValueFactory.from(doubleFunc.apply(getDoubleValue(exprValue1),
-                                                              getDoubleValue(exprValue2)));
-            default:
-                throw new RuntimeException(String.format("unexpected operation type: %s(%s,%s)", op.name(),
-                                                         exprValue1.kind(), exprValue2.kind()));
-        }
+  @Override
+  public ExprValue apply(List<ExprValue> exprValues) {
+    ExprValue exprValue1 = exprValues.get(0);
+    ExprValue exprValue2 = exprValues.get(1);
+    if (exprValue1.kind() != exprValue2.kind()) {
+      throw new RuntimeException(
+          String.format(
+              "unexpected operation type: %s(%s,%s)",
+              op.name(), exprValue1.kind(), exprValue2.kind()));
     }
-
-    @Override
-    public String name() {
-        return op.name();
+    switch (exprValue1.kind()) {
+      case DOUBLE_VALUE:
+      case INTEGER_VALUE:
+      case LONG_VALUE:
+      case FLOAT_VALUE:
+        return ExprValueFactory.from(
+            doubleFunc.apply(getDoubleValue(exprValue1), getDoubleValue(exprValue2)));
+      default:
+        throw new RuntimeException(
+            String.format(
+                "unexpected operation type: %s(%s,%s)",
+                op.name(), exprValue1.kind(), exprValue2.kind()));
     }
+  }
+
+  @Override
+  public String name() {
+    return op.name();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/DoubleUnaryScalarOperator.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/DoubleUnaryScalarOperator.java
index 736216472f..8242eee8a6 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/DoubleUnaryScalarOperator.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/DoubleUnaryScalarOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core.operator;
 
 import static org.opensearch.sql.legacy.expression.model.ExprValueUtils.getDoubleValue;
@@ -16,31 +15,31 @@
 import org.opensearch.sql.legacy.expression.model.ExprValueFactory;
 
 /**
- * Unary Binary Scalar Operator take one {@link ExprValue} which have double value as arguments ans return one
- * {@link ExprDoubleValue} as result.
+ * Unary Binary Scalar Operator take one {@link ExprValue} which have double value as arguments ans
+ * return one {@link ExprDoubleValue} as result.
  */
 @RequiredArgsConstructor
 public class DoubleUnaryScalarOperator implements ScalarOperator {
-    private final ScalarOperation op;
-    private final Function<Double, Double> doubleFunc;
+  private final ScalarOperation op;
+  private final Function<Double, Double> doubleFunc;
 
-    @Override
-    public ExprValue apply(List<ExprValue> exprValues) {
-        ExprValue exprValue = exprValues.get(0);
-        switch (exprValue.kind()) {
-            case DOUBLE_VALUE:
-            case INTEGER_VALUE:
-            case LONG_VALUE:
-            case FLOAT_VALUE:
-                return ExprValueFactory.from(doubleFunc.apply(getDoubleValue(exprValue)));
-            default:
-                throw new RuntimeException(String.format("unexpected operation type: %s(%s)",
-                                                         op.name(), exprValue.kind()));
-        }
+  @Override
+  public ExprValue apply(List<ExprValue> exprValues) {
+    ExprValue exprValue = exprValues.get(0);
+    switch (exprValue.kind()) {
+      case DOUBLE_VALUE:
+      case INTEGER_VALUE:
+      case LONG_VALUE:
+      case FLOAT_VALUE:
+        return ExprValueFactory.from(doubleFunc.apply(getDoubleValue(exprValue)));
+      default:
+        throw new RuntimeException(
+            String.format("unexpected operation type: %s(%s)", op.name(), exprValue.kind()));
     }
+  }
 
-    @Override
-    public String name() {
-        return op.name();
-    }
+  @Override
+  public String name() {
+    return op.name();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/ScalarOperation.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/ScalarOperation.java
index 0be4dfa786..ea2a698921 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/ScalarOperation.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/ScalarOperation.java
@@ -3,39 +3,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core.operator;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-/**
- * The definition of the Scalar Operation.
- */
+/** The definition of the Scalar Operation. */
 @Getter
 @RequiredArgsConstructor
 public enum ScalarOperation {
-    ADD("add"),
-    SUBTRACT("subtract"),
-    MULTIPLY("multiply"),
-    DIVIDE("divide"),
-    MODULES("modules"),
-    ABS("abs"),
-    ACOS("acos"),
-    ASIN("asin"),
-    ATAN("atan"),
-    ATAN2("atan2"),
-    TAN("tan"),
-    CBRT("cbrt"),
-    CEIL("ceil"),
-    COS("cos"),
-    COSH("cosh"),
-    EXP("exp"),
-    FLOOR("floor"),
-    LN("ln"),
-    LOG("log"),
-    LOG2("log2"),
-    LOG10("log10");
+  ADD("add"),
+  SUBTRACT("subtract"),
+  MULTIPLY("multiply"),
+  DIVIDE("divide"),
+  MODULES("modules"),
+  ABS("abs"),
+  ACOS("acos"),
+  ASIN("asin"),
+  ATAN("atan"),
+  ATAN2("atan2"),
+  TAN("tan"),
+  CBRT("cbrt"),
+  CEIL("ceil"),
+  COS("cos"),
+  COSH("cosh"),
+  EXP("exp"),
+  FLOOR("floor"),
+  LN("ln"),
+  LOG("log"),
+  LOG2("log2"),
+  LOG10("log10");
 
-    private final String name;
+  private final String name;
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/ScalarOperator.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/ScalarOperator.java
index bfb3a75afb..c0c3360afc 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/ScalarOperator.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/ScalarOperator.java
@@ -3,26 +3,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core.operator;
 
 import java.util.List;
 import org.opensearch.sql.legacy.expression.model.ExprValue;
 
-/**
- * Scalar Operator is a function has one or more arguments and return a single value.
- */
+/** Scalar Operator is a function has one or more arguments and return a single value. */
 public interface ScalarOperator {
-    /**
-     * Apply the operator to the input arguments.
-     * @param valueList argument list.
-     * @return result.
-     */
-    ExprValue apply(List<ExprValue> valueList);
+  /**
+   * Apply the operator to the input arguments.
+   *
+   * @param valueList argument list.
+   * @return result.
+   */
+  ExprValue apply(List<ExprValue> valueList);
 
-    /**
-     * The name of the operator.
-     * @return name.
-     */
-    String name();
+  /**
+   * The name of the operator.
+   *
+   * @return name.
+   */
+  String name();
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/UnaryScalarOperator.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/UnaryScalarOperator.java
index a6bfc48a1a..deb979f767 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/UnaryScalarOperator.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/core/operator/UnaryScalarOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.core.operator;
 
 import static org.opensearch.sql.legacy.expression.model.ExprValueUtils.getDoubleValue;
@@ -18,36 +17,37 @@
 import org.opensearch.sql.legacy.expression.model.ExprValueFactory;
 
 /**
- * Unary Scalar Operator take one {@link ExprValue} as arguments ans return one {@link ExprValue} as result.
+ * Unary Scalar Operator take one {@link ExprValue} as arguments ans return one {@link ExprValue} as
+ * result.
  */
 @RequiredArgsConstructor
 public class UnaryScalarOperator implements ScalarOperator {
-    private final ScalarOperation op;
-    private final Function<Integer, Integer> integerFunc;
-    private final Function<Long, Long> longFunc;
-    private final Function<Double, Double> doubleFunc;
-    private final Function<Float, Float> floatFunc;
+  private final ScalarOperation op;
+  private final Function<Integer, Integer> integerFunc;
+  private final Function<Long, Long> longFunc;
+  private final Function<Double, Double> doubleFunc;
+  private final Function<Float, Float> floatFunc;
 
-    @Override
-    public ExprValue apply(List<ExprValue> exprValues) {
-        ExprValue exprValue = exprValues.get(0);
-        switch (exprValue.kind()) {
-            case DOUBLE_VALUE:
-                return ExprValueFactory.from(doubleFunc.apply(getDoubleValue(exprValue)));
-            case INTEGER_VALUE:
-                return ExprValueFactory.from(integerFunc.apply(getIntegerValue(exprValue)));
-            case LONG_VALUE:
-                return ExprValueFactory.from(longFunc.apply(getLongValue(exprValue)));
-            case FLOAT_VALUE:
-                return ExprValueFactory.from(floatFunc.apply(getFloatValue(exprValue)));
-            default:
-                throw new RuntimeException(String.format("unexpected operation type: %s(%s)", op.name(),
-                                                         exprValue.kind()));
-        }
+  @Override
+  public ExprValue apply(List<ExprValue> exprValues) {
+    ExprValue exprValue = exprValues.get(0);
+    switch (exprValue.kind()) {
+      case DOUBLE_VALUE:
+        return ExprValueFactory.from(doubleFunc.apply(getDoubleValue(exprValue)));
+      case INTEGER_VALUE:
+        return ExprValueFactory.from(integerFunc.apply(getIntegerValue(exprValue)));
+      case LONG_VALUE:
+        return ExprValueFactory.from(longFunc.apply(getLongValue(exprValue)));
+      case FLOAT_VALUE:
+        return ExprValueFactory.from(floatFunc.apply(getFloatValue(exprValue)));
+      default:
+        throw new RuntimeException(
+            String.format("unexpected operation type: %s(%s)", op.name(), exprValue.kind()));
     }
+  }
 
-    @Override
-    public String name() {
-        return op.name();
-    }
+  @Override
+  public String name() {
+    return op.name();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/domain/BindingTuple.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/domain/BindingTuple.java
index badc7c8355..328f63b7ca 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/domain/BindingTuple.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/domain/BindingTuple.java
@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.domain;
 
-
 import java.util.Map;
 import java.util.stream.Collectors;
 import lombok.Builder;
@@ -19,42 +17,41 @@
 import org.opensearch.sql.legacy.expression.model.ExprValueFactory;
 
 /**
- * BindingTuple represents the a relationship between bindingName and ExprValue.
- * e.g. The operation output column name is bindingName, the value is the ExprValue.
+ * BindingTuple represents the a relationship between bindingName and ExprValue. e.g. The operation
+ * output column name is bindingName, the value is the ExprValue.
  */
 @Builder
 @Getter
 @EqualsAndHashCode
 public class BindingTuple {
-    @Singular("binding")
-    private final Map<String, ExprValue> bindingMap;
-
-    /**
-     * Resolve the Binding Name in BindingTuple context.
-     *
-     * @param bindingName binding name.
-     * @return binding value.
-     */
-    public ExprValue resolve(String bindingName) {
-        return bindingMap.getOrDefault(bindingName, new ExprMissingValue());
-    }
-
-    @Override
-    public String toString() {
-        return bindingMap.entrySet()
-                .stream()
-                .map(entry -> String.format("%s:%s", entry.getKey(), entry.getValue()))
-                .collect(Collectors.joining(",", "<", ">"));
-    }
-
-    public static BindingTuple from(Map<String, Object> map) {
-        return from(new JSONObject(map));
-    }
-
-    public static BindingTuple from(JSONObject json) {
-        Map<String, Object> map = json.toMap();
-        BindingTupleBuilder bindingTupleBuilder = BindingTuple.builder();
-        map.forEach((key, value) -> bindingTupleBuilder.binding(key, ExprValueFactory.from(value)));
-        return bindingTupleBuilder.build();
-    }
+  @Singular("binding")
+  private final Map<String, ExprValue> bindingMap;
+
+  /**
+   * Resolve the Binding Name in BindingTuple context.
+   *
+   * @param bindingName binding name.
+   * @return binding value.
+   */
+  public ExprValue resolve(String bindingName) {
+    return bindingMap.getOrDefault(bindingName, new ExprMissingValue());
+  }
+
+  @Override
+  public String toString() {
+    return bindingMap.entrySet().stream()
+        .map(entry -> String.format("%s:%s", entry.getKey(), entry.getValue()))
+        .collect(Collectors.joining(",", "<", ">"));
+  }
+
+  public static BindingTuple from(Map<String, Object> map) {
+    return from(new JSONObject(map));
+  }
+
+  public static BindingTuple from(JSONObject json) {
+    Map<String, Object> map = json.toMap();
+    BindingTupleBuilder bindingTupleBuilder = BindingTuple.builder();
+    map.forEach((key, value) -> bindingTupleBuilder.binding(key, ExprValueFactory.from(value)));
+    return bindingTupleBuilder.build();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprBooleanValue.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprBooleanValue.java
index 50b1523497..ce7c1a8fca 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprBooleanValue.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprBooleanValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
 import lombok.EqualsAndHashCode;
@@ -12,23 +11,23 @@
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class ExprBooleanValue implements ExprValue {
-    private final Boolean value;
+  private final Boolean value;
 
-    @Override
-    public Object value() {
-        return value;
-    }
+  @Override
+  public Object value() {
+    return value;
+  }
 
-    @Override
-    public ExprValueKind kind() {
-        return ExprValueKind.BOOLEAN_VALUE;
-    }
+  @Override
+  public ExprValueKind kind() {
+    return ExprValueKind.BOOLEAN_VALUE;
+  }
 
-    @Override
-    public String toString() {
-        final StringBuffer sb = new StringBuffer("SSBooleanValue{");
-        sb.append("value=").append(value);
-        sb.append('}');
-        return sb.toString();
-    }
+  @Override
+  public String toString() {
+    final StringBuffer sb = new StringBuffer("SSBooleanValue{");
+    sb.append("value=").append(value);
+    sb.append('}');
+    return sb.toString();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprCollectionValue.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprCollectionValue.java
index 99eb35272d..f6200a2bea 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprCollectionValue.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprCollectionValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
 import static org.opensearch.sql.legacy.expression.model.ExprValue.ExprValueKind.COLLECTION_VALUE;
@@ -16,22 +15,20 @@
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class ExprCollectionValue implements ExprValue {
-    private final List<ExprValue> valueList;
-
-    @Override
-    public Object value() {
-        return valueList;
-    }
-
-    @Override
-    public ExprValueKind kind() {
-        return COLLECTION_VALUE;
-    }
-
-    @Override
-    public String toString() {
-        return valueList.stream()
-                .map(Object::toString)
-                .collect(Collectors.joining(",", "[", "]"));
-    }
+  private final List<ExprValue> valueList;
+
+  @Override
+  public Object value() {
+    return valueList;
+  }
+
+  @Override
+  public ExprValueKind kind() {
+    return COLLECTION_VALUE;
+  }
+
+  @Override
+  public String toString() {
+    return valueList.stream().map(Object::toString).collect(Collectors.joining(",", "[", "]"));
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprDoubleValue.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprDoubleValue.java
index fdfacc4c55..16c607cae5 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprDoubleValue.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprDoubleValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
 import lombok.EqualsAndHashCode;
@@ -12,20 +11,20 @@
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class ExprDoubleValue implements ExprValue {
-    private final Double value;
+  private final Double value;
 
-    @Override
-    public Object value() {
-        return value;
-    }
+  @Override
+  public Object value() {
+    return value;
+  }
 
-    @Override
-    public ExprValueKind kind() {
-        return ExprValueKind.DOUBLE_VALUE;
-    }
+  @Override
+  public ExprValueKind kind() {
+    return ExprValueKind.DOUBLE_VALUE;
+  }
 
-    @Override
-    public String toString() {
-        return value.toString();
-    }
+  @Override
+  public String toString() {
+    return value.toString();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprFloatValue.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprFloatValue.java
index f4d4dfc1b3..478ca645a7 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprFloatValue.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprFloatValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
 import lombok.EqualsAndHashCode;
@@ -12,20 +11,20 @@
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class ExprFloatValue implements ExprValue {
-    private final Float value;
+  private final Float value;
 
-    @Override
-    public Object value() {
-        return value;
-    }
+  @Override
+  public Object value() {
+    return value;
+  }
 
-    @Override
-    public ExprValueKind kind() {
-        return ExprValueKind.DOUBLE_VALUE;
-    }
+  @Override
+  public ExprValueKind kind() {
+    return ExprValueKind.DOUBLE_VALUE;
+  }
 
-    @Override
-    public String toString() {
-        return value.toString();
-    }
+  @Override
+  public String toString() {
+    return value.toString();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprIntegerValue.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprIntegerValue.java
index 3285934280..92c4d38a4c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprIntegerValue.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprIntegerValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
 import lombok.EqualsAndHashCode;
@@ -12,20 +11,20 @@
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class ExprIntegerValue implements ExprValue {
-    private final Integer value;
+  private final Integer value;
 
-    @Override
-    public Object value() {
-        return value;
-    }
+  @Override
+  public Object value() {
+    return value;
+  }
 
-    @Override
-    public ExprValueKind kind() {
-        return ExprValueKind.INTEGER_VALUE;
-    }
+  @Override
+  public ExprValueKind kind() {
+    return ExprValueKind.INTEGER_VALUE;
+  }
 
-    @Override
-    public String toString() {
-        return value.toString();
-    }
+  @Override
+  public String toString() {
+    return value.toString();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprLongValue.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprLongValue.java
index b50a0088db..4f96ecf89a 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprLongValue.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprLongValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
 import lombok.EqualsAndHashCode;
@@ -12,20 +11,20 @@
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class ExprLongValue implements ExprValue {
-    private final Long value;
+  private final Long value;
 
-    @Override
-    public Object value() {
-        return value;
-    }
+  @Override
+  public Object value() {
+    return value;
+  }
 
-    @Override
-    public ExprValueKind kind() {
-        return ExprValueKind.LONG_VALUE;
-    }
+  @Override
+  public ExprValueKind kind() {
+    return ExprValueKind.LONG_VALUE;
+  }
 
-    @Override
-    public String toString() {
-        return value.toString();
-    }
+  @Override
+  public String toString() {
+    return value.toString();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprMissingValue.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprMissingValue.java
index e05e32b920..c2b70537c9 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprMissingValue.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprMissingValue.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
-/**
- * The definition of the missing value.
- */
+/** The definition of the missing value. */
 public class ExprMissingValue implements ExprValue {
-    @Override
-    public ExprValueKind kind() {
-        return ExprValueKind.MISSING_VALUE;
-    }
+  @Override
+  public ExprValueKind kind() {
+    return ExprValueKind.MISSING_VALUE;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprStringValue.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprStringValue.java
index dcdec6117f..3c93b82187 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprStringValue.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprStringValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
 import lombok.EqualsAndHashCode;
@@ -12,20 +11,20 @@
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class ExprStringValue implements ExprValue {
-    private final String value;
+  private final String value;
 
-    @Override
-    public Object value() {
-        return value;
-    }
+  @Override
+  public Object value() {
+    return value;
+  }
 
-    @Override
-    public ExprValueKind kind() {
-        return ExprValueKind.STRING_VALUE;
-    }
+  @Override
+  public ExprValueKind kind() {
+    return ExprValueKind.STRING_VALUE;
+  }
 
-    @Override
-    public String toString() {
-        return value;
-    }
+  @Override
+  public String toString() {
+    return value;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprTupleValue.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprTupleValue.java
index 7debcef864..5f690a6b3e 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprTupleValue.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprTupleValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
 import java.util.Map;
@@ -14,23 +13,22 @@
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class ExprTupleValue implements ExprValue {
-    private final Map<String, ExprValue> valueMap;
+  private final Map<String, ExprValue> valueMap;
 
-    @Override
-    public Object value() {
-        return valueMap;
-    }
+  @Override
+  public Object value() {
+    return valueMap;
+  }
 
-    @Override
-    public ExprValueKind kind() {
-        return ExprValueKind.TUPLE_VALUE;
-    }
+  @Override
+  public ExprValueKind kind() {
+    return ExprValueKind.TUPLE_VALUE;
+  }
 
-    @Override
-    public String toString() {
-        return valueMap.entrySet()
-                .stream()
-                .map(entry -> String.format("%s:%s", entry.getKey(), entry.getValue()))
-                .collect(Collectors.joining(",", "{", "}"));
-    }
+  @Override
+  public String toString() {
+    return valueMap.entrySet().stream()
+        .map(entry -> String.format("%s:%s", entry.getKey(), entry.getValue()))
+        .collect(Collectors.joining(",", "{", "}"));
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValue.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValue.java
index d15cb39270..aae1973d4b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValue.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValue.java
@@ -3,31 +3,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
-/**
- * The definition of the Expression Value.
- */
+/** The definition of the Expression Value. */
 public interface ExprValue {
-    default Object value() {
-        throw new IllegalStateException("invalid value operation on " + kind());
-    }
+  default Object value() {
+    throw new IllegalStateException("invalid value operation on " + kind());
+  }
 
-    default ExprValueKind kind() {
-        throw new IllegalStateException("invalid kind operation");
-    }
+  default ExprValueKind kind() {
+    throw new IllegalStateException("invalid kind operation");
+  }
 
-    enum ExprValueKind {
-        TUPLE_VALUE,
-        COLLECTION_VALUE,
-        MISSING_VALUE,
+  enum ExprValueKind {
+    TUPLE_VALUE,
+    COLLECTION_VALUE,
+    MISSING_VALUE,
 
-        BOOLEAN_VALUE,
-        INTEGER_VALUE,
-        DOUBLE_VALUE,
-        LONG_VALUE,
-        FLOAT_VALUE,
-        STRING_VALUE
-    }
+    BOOLEAN_VALUE,
+    INTEGER_VALUE,
+    DOUBLE_VALUE,
+    LONG_VALUE,
+    FLOAT_VALUE,
+    STRING_VALUE
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValueFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValueFactory.java
index bc7cb40c31..28f4c70293 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValueFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValueFactory.java
@@ -3,68 +3,68 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-/**
- * The definition of {@link ExprValue} factory.
- */
+/** The definition of {@link ExprValue} factory. */
 public class ExprValueFactory {
 
-    public static ExprValue booleanValue(Boolean value) {
-        return new ExprBooleanValue(value);
-    }
+  public static ExprValue booleanValue(Boolean value) {
+    return new ExprBooleanValue(value);
+  }
 
-    public static ExprValue integerValue(Integer value) {
-        return new ExprIntegerValue(value);
-    }
+  public static ExprValue integerValue(Integer value) {
+    return new ExprIntegerValue(value);
+  }
 
-    public static ExprValue doubleValue(Double value) {
-        return new ExprDoubleValue(value);
-    }
+  public static ExprValue doubleValue(Double value) {
+    return new ExprDoubleValue(value);
+  }
 
-    public static ExprValue stringValue(String value) {
-        return new ExprStringValue(value);
-    }
+  public static ExprValue stringValue(String value) {
+    return new ExprStringValue(value);
+  }
 
-    public static ExprValue longValue(Long value) {
-        return new ExprLongValue(value);
-    }
+  public static ExprValue longValue(Long value) {
+    return new ExprLongValue(value);
+  }
 
-    public static ExprValue tupleValue(Map<String, Object> map) {
-        Map<String, ExprValue> valueMap = new HashMap<>();
-        map.forEach((k, v) -> valueMap.put(k, from(v)));
-        return new ExprTupleValue(valueMap);
-    }
+  public static ExprValue tupleValue(Map<String, Object> map) {
+    Map<String, ExprValue> valueMap = new HashMap<>();
+    map.forEach((k, v) -> valueMap.put(k, from(v)));
+    return new ExprTupleValue(valueMap);
+  }
 
-    public static ExprValue collectionValue(List<Object> list) {
-        List<ExprValue> valueList = new ArrayList<>();
-        list.forEach(o -> valueList.add(from(o)));
-        return new ExprCollectionValue(valueList);
-    }
+  public static ExprValue collectionValue(List<Object> list) {
+    List<ExprValue> valueList = new ArrayList<>();
+    list.forEach(o -> valueList.add(from(o)));
+    return new ExprCollectionValue(valueList);
+  }
 
-    public static ExprValue from(Object o) {
-        if (o instanceof Map) {
-            return tupleValue((Map) o);
-        } else if (o instanceof List) {
-            return collectionValue(((List) o));
-        } else if (o instanceof Integer) {
-            return integerValue((Integer) o);
-        } else if (o instanceof Long) {
-            return longValue(((Long) o));
-        } else if (o instanceof Boolean) {
-            return booleanValue((Boolean) o);
-        } else if (o instanceof Double) {
-            return doubleValue((Double) o);
-        } else if (o instanceof String) {
-            return stringValue((String) o);
-        } else {
-            throw new IllegalStateException("unsupported type " + o.getClass());
-        }
+  public static ExprValue from(Object o) {
+    if (o instanceof Map) {
+      return tupleValue((Map) o);
+    } else if (o instanceof List) {
+      return collectionValue(((List) o));
+    } else if (o instanceof Integer) {
+      return integerValue((Integer) o);
+    } else if (o instanceof Long) {
+      return longValue(((Long) o));
+    } else if (o instanceof Boolean) {
+      return booleanValue((Boolean) o);
+    } else if (o instanceof Double) {
+      return doubleValue((Double) o);
+    } else if (o instanceof BigDecimal) {
+      return doubleValue(((BigDecimal) o).doubleValue());
+    } else if (o instanceof String) {
+      return stringValue((String) o);
+    } else {
+      throw new IllegalStateException("unsupported type " + o.getClass());
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValueUtils.java b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValueUtils.java
index 4688e74b6a..9873c72886 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValueUtils.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/expression/model/ExprValueUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.expression.model;
 
 import static org.opensearch.sql.legacy.expression.model.ExprValue.ExprValueKind.BOOLEAN_VALUE;
@@ -15,64 +14,62 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * The definition of ExprValue Utils.
- */
+/** The definition of ExprValue Utils. */
 public class ExprValueUtils {
-    public static Integer getIntegerValue(ExprValue exprValue) {
-        return getNumberValue(exprValue).intValue();
-    }
+  public static Integer getIntegerValue(ExprValue exprValue) {
+    return getNumberValue(exprValue).intValue();
+  }
 
-    public static Double getDoubleValue(ExprValue exprValue) {
-        return getNumberValue(exprValue).doubleValue();
-    }
+  public static Double getDoubleValue(ExprValue exprValue) {
+    return getNumberValue(exprValue).doubleValue();
+  }
 
-    public static Long getLongValue(ExprValue exprValue) {
-        return getNumberValue(exprValue).longValue();
-    }
+  public static Long getLongValue(ExprValue exprValue) {
+    return getNumberValue(exprValue).longValue();
+  }
 
-    public static Float getFloatValue(ExprValue exprValue) {
-        return getNumberValue(exprValue).floatValue();
-    }
+  public static Float getFloatValue(ExprValue exprValue) {
+    return getNumberValue(exprValue).floatValue();
+  }
 
-    public static String getStringValue(ExprValue exprValue) {
-        return convert(exprValue, STRING_VALUE);
-    }
+  public static String getStringValue(ExprValue exprValue) {
+    return convert(exprValue, STRING_VALUE);
+  }
 
-    public static List<ExprValue> getCollectionValue(ExprValue exprValue) {
-        return convert(exprValue, COLLECTION_VALUE);
-    }
+  public static List<ExprValue> getCollectionValue(ExprValue exprValue) {
+    return convert(exprValue, COLLECTION_VALUE);
+  }
 
-    public static Map<String, ExprValue> getTupleValue(ExprValue exprValue) {
-        return convert(exprValue, TUPLE_VALUE);
-    }
+  public static Map<String, ExprValue> getTupleValue(ExprValue exprValue) {
+    return convert(exprValue, TUPLE_VALUE);
+  }
 
-    public static Boolean getBooleanValue(ExprValue exprValue) {
-        return convert(exprValue, BOOLEAN_VALUE);
-    }
+  public static Boolean getBooleanValue(ExprValue exprValue) {
+    return convert(exprValue, BOOLEAN_VALUE);
+  }
 
-    @VisibleForTesting
-    public static Number getNumberValue(ExprValue exprValue) {
-        switch (exprValue.kind()) {
-            case INTEGER_VALUE:
-            case DOUBLE_VALUE:
-            case LONG_VALUE:
-            case FLOAT_VALUE:
-                return (Number) exprValue.value();
-            default:
-                break;
-        }
-        throw new IllegalStateException(
-                String.format("invalid to get NUMBER_VALUE from expr type of %s", exprValue.kind()));
+  @VisibleForTesting
+  public static Number getNumberValue(ExprValue exprValue) {
+    switch (exprValue.kind()) {
+      case INTEGER_VALUE:
+      case DOUBLE_VALUE:
+      case LONG_VALUE:
+      case FLOAT_VALUE:
+        return (Number) exprValue.value();
+      default:
+        break;
     }
+    throw new IllegalStateException(
+        String.format("invalid to get NUMBER_VALUE from expr type of %s", exprValue.kind()));
+  }
 
-    @SuppressWarnings("unchecked")
-    private static <T> T convert(ExprValue exprValue, ExprValue.ExprValueKind toType) {
-        if (exprValue.kind() == toType) {
-            return (T) exprValue.value();
-        } else {
-            throw new IllegalStateException(
-                    String.format("invalid to get %s from expr type of %s", toType, exprValue.kind()));
-        }
+  @SuppressWarnings("unchecked")
+  private static <T> T convert(ExprValue exprValue, ExprValue.ExprValueKind toType) {
+    if (exprValue.kind() == toType) {
+      return (T) exprValue.value();
+    } else {
+      throw new IllegalStateException(
+          String.format("invalid to get %s from expr type of %s", toType, exprValue.kind()));
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/BasicCounter.java b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/BasicCounter.java
index 8bb15eeb74..88d5f817e8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/BasicCounter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/BasicCounter.java
@@ -3,32 +3,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.metrics;
 
 import java.util.concurrent.atomic.LongAdder;
 
 public class BasicCounter implements Counter<Long> {
 
-    private LongAdder count = new LongAdder();
+  private LongAdder count = new LongAdder();
 
-    @Override
-    public void increment() {
-        count.increment();
-    }
+  @Override
+  public void increment() {
+    count.increment();
+  }
 
-    @Override
-    public void add(long n) {
-        count.add(n);
-    }
+  @Override
+  public void add(long n) {
+    count.add(n);
+  }
 
-    @Override
-    public Long getValue() {
-        return count.longValue();
-    }
+  @Override
+  public Long getValue() {
+    return count.longValue();
+  }
 
-    @Override
-    public void reset() {
-        count.reset();
-    }
+  @Override
+  public void reset() {
+    count.reset();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Counter.java b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Counter.java
index 7d490704e8..f91731ab0e 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Counter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Counter.java
@@ -3,16 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.metrics;
 
 public interface Counter<T> {
 
-    void increment();
+  void increment();
 
-    void add(long n);
+  void add(long n);
 
-    T getValue();
+  T getValue();
 
-    void reset();
+  void reset();
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/GaugeMetric.java b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/GaugeMetric.java
index 5752927952..2f7c269351 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/GaugeMetric.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/GaugeMetric.java
@@ -3,29 +3,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.metrics;
 
 import java.util.function.Supplier;
 
-/**
- * Gauge metric, an instant value like cpu usage, state and so on
- */
+/** Gauge metric, an instant value like cpu usage, state and so on */
 public class GaugeMetric<T> extends Metric<T> {
 
-    private Supplier<T> loadValue;
-
-    public GaugeMetric(String name, Supplier<T> supplier) {
-        super(name);
-        this.loadValue = supplier;
-    }
+  private Supplier<T> loadValue;
 
-    public String getName() {
-        return super.getName();
-    }
+  public GaugeMetric(String name, Supplier<T> supplier) {
+    super(name);
+    this.loadValue = supplier;
+  }
 
-    public T getValue() {
-        return loadValue.get();
-    }
+  public String getName() {
+    return super.getName();
+  }
 
+  public T getValue() {
+    return loadValue.get();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Metric.java b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Metric.java
index 9e31b0d9cd..956e0f558c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Metric.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Metric.java
@@ -3,23 +3,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.metrics;
 
 public abstract class Metric<T> implements java.io.Serializable {
 
-    private static final long serialVersionUID = 1L;
-
-    private String name;
+  private static final long serialVersionUID = 1L;
 
-    public Metric(String name) {
-        this.name = name;
-    }
+  private String name;
 
-    public String getName() {
-        return name;
-    }
+  public Metric(String name) {
+    this.name = name;
+  }
 
-    public abstract T getValue();
+  public String getName() {
+    return name;
+  }
 
+  public abstract T getValue();
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/MetricFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/MetricFactory.java
index 9319b77644..fc243e1b50 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/MetricFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/MetricFactory.java
@@ -3,34 +3,46 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.metrics;
 
 import org.opensearch.sql.legacy.query.join.BackOffRetryStrategy;
 
 public class MetricFactory {
 
-    public static Metric createMetric(MetricName name) {
+  public static Metric createMetric(MetricName name) {
 
-        switch (name) {
-            case REQ_TOTAL:
-            case DEFAULT_CURSOR_REQUEST_TOTAL:
-            case DEFAULT:
-            case PPL_REQ_TOTAL:
-                return new NumericMetric<>(name.getName(), new BasicCounter());
-            case CIRCUIT_BREAKER:
-                return new GaugeMetric<>(name.getName(), BackOffRetryStrategy.GET_CB_STATE);
-            case REQ_COUNT_TOTAL:
-            case DEFAULT_CURSOR_REQUEST_COUNT_TOTAL:
-            case FAILED_REQ_COUNT_CUS:
-            case FAILED_REQ_COUNT_SYS:
-            case FAILED_REQ_COUNT_CB:
-            case PPL_REQ_COUNT_TOTAL:
-            case PPL_FAILED_REQ_COUNT_CUS:
-            case PPL_FAILED_REQ_COUNT_SYS:
-                return new NumericMetric<>(name.getName(), new RollingCounter());
-            default:
-                return new NumericMetric<>(name.getName(), new BasicCounter());
-        }
+    switch (name) {
+      case REQ_TOTAL:
+      case DEFAULT_CURSOR_REQUEST_TOTAL:
+      case DEFAULT:
+      case PPL_REQ_TOTAL:
+        return new NumericMetric<>(name.getName(), new BasicCounter());
+      case CIRCUIT_BREAKER:
+        return new GaugeMetric<>(name.getName(), BackOffRetryStrategy.GET_CB_STATE);
+      case REQ_COUNT_TOTAL:
+      case DEFAULT_CURSOR_REQUEST_COUNT_TOTAL:
+      case FAILED_REQ_COUNT_CUS:
+      case FAILED_REQ_COUNT_SYS:
+      case FAILED_REQ_COUNT_CB:
+      case PPL_REQ_COUNT_TOTAL:
+      case PPL_FAILED_REQ_COUNT_CUS:
+      case PPL_FAILED_REQ_COUNT_SYS:
+      case DATASOURCE_CREATION_REQ_COUNT:
+      case DATASOURCE_GET_REQ_COUNT:
+      case DATASOURCE_PUT_REQ_COUNT:
+      case DATASOURCE_PATCH_REQ_COUNT:
+      case DATASOURCE_DELETE_REQ_COUNT:
+      case DATASOURCE_FAILED_REQ_COUNT_SYS:
+      case DATASOURCE_FAILED_REQ_COUNT_CUS:
+      case EMR_GET_JOB_RESULT_FAILURE_COUNT:
+      case EMR_START_JOB_REQUEST_FAILURE_COUNT:
+      case EMR_CANCEL_JOB_REQUEST_FAILURE_COUNT:
+      case EMR_BATCH_QUERY_JOBS_CREATION_COUNT:
+      case EMR_STREAMING_QUERY_JOBS_CREATION_COUNT:
+      case EMR_INTERACTIVE_QUERY_JOBS_CREATION_COUNT:
+        return new NumericMetric<>(name.getName(), new RollingCounter());
+      default:
+        return new NumericMetric<>(name.getName(), new BasicCounter());
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/MetricName.java b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/MetricName.java
index 2092bc1ae1..72960944b6 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/MetricName.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/MetricName.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.metrics;
 
 import com.google.common.collect.ImmutableSet;
@@ -13,48 +12,98 @@
 import java.util.stream.Collectors;
 
 public enum MetricName {
+  REQ_TOTAL("request_total"),
+  REQ_COUNT_TOTAL("request_count"),
+  FAILED_REQ_COUNT_SYS("failed_request_count_syserr"),
+  FAILED_REQ_COUNT_CUS("failed_request_count_cuserr"),
+  FAILED_REQ_COUNT_CB("failed_request_count_cb"),
+  DEFAULT_CURSOR_REQUEST_TOTAL("default_cursor_request_total"),
+  DEFAULT_CURSOR_REQUEST_COUNT_TOTAL("default_cursor_request_count"),
+  CIRCUIT_BREAKER("circuit_breaker"),
+  DEFAULT("default"),
+
+  PPL_REQ_TOTAL("ppl_request_total"),
+  PPL_REQ_COUNT_TOTAL("ppl_request_count"),
+  PPL_FAILED_REQ_COUNT_SYS("ppl_failed_request_count_syserr"),
+  PPL_FAILED_REQ_COUNT_CUS("ppl_failed_request_count_cuserr"),
+  DATASOURCE_CREATION_REQ_COUNT("datasource_create_request_count"),
+  DATASOURCE_GET_REQ_COUNT("datasource_get_request_count"),
+  DATASOURCE_PUT_REQ_COUNT("datasource_put_request_count"),
+  DATASOURCE_PATCH_REQ_COUNT("datasource_patch_request_count"),
+  DATASOURCE_DELETE_REQ_COUNT("datasource_delete_request_count"),
+  DATASOURCE_FAILED_REQ_COUNT_SYS("datasource_failed_request_count_syserr"),
+  DATASOURCE_FAILED_REQ_COUNT_CUS("datasource_failed_request_count_cuserr"),
+  ASYNC_QUERY_CREATE_API_REQUEST_COUNT("async_query_create_api_request_count"),
+  ASYNC_QUERY_GET_API_REQUEST_COUNT("async_query_get_api_request_count"),
+  ASYNC_QUERY_CANCEL_API_REQUEST_COUNT("async_query_cancel_api_request_count"),
+  ASYNC_QUERY_GET_API_FAILED_REQ_COUNT_SYS("async_query_get_api_failed_request_count_syserr"),
+  ASYNC_QUERY_GET_API_FAILED_REQ_COUNT_CUS("async_query_get_api_failed_request_count_cuserr"),
+  ASYNC_QUERY_CREATE_API_FAILED_REQ_COUNT_SYS("async_query_create_api_failed_request_count_syserr"),
+  ASYNC_QUERY_CREATE_API_FAILED_REQ_COUNT_CUS("async_query_create_api_failed_request_count_cuserr"),
+  ASYNC_QUERY_CANCEL_API_FAILED_REQ_COUNT_SYS("async_query_cancel_api_failed_request_count_syserr"),
+  ASYNC_QUERY_CANCEL_API_FAILED_REQ_COUNT_CUS("async_query_cancel_api_failed_request_count_cuserr"),
+  EMR_START_JOB_REQUEST_FAILURE_COUNT("emr_start_job_request_failure_count"),
+  EMR_GET_JOB_RESULT_FAILURE_COUNT("emr_get_job_request_failure_count"),
+  EMR_CANCEL_JOB_REQUEST_FAILURE_COUNT("emr_cancel_job_request_failure_count"),
+  EMR_STREAMING_QUERY_JOBS_CREATION_COUNT("emr_streaming_jobs_creation_count"),
+  EMR_INTERACTIVE_QUERY_JOBS_CREATION_COUNT("emr_interactive_jobs_creation_count"),
+  EMR_BATCH_QUERY_JOBS_CREATION_COUNT("emr_batch_jobs_creation_count"),
+  STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT("streaming_job_housekeeper_task_failure_count");
+
+  private String name;
+
+  MetricName(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public static List<String> getNames() {
+    return Arrays.stream(MetricName.values()).map(v -> v.name).collect(Collectors.toList());
+  }
+
+  private static Set<MetricName> NUMERICAL_METRIC =
+      new ImmutableSet.Builder<MetricName>()
+          .add(PPL_REQ_TOTAL)
+          .add(PPL_REQ_COUNT_TOTAL)
+          .add(PPL_FAILED_REQ_COUNT_SYS)
+          .add(PPL_FAILED_REQ_COUNT_CUS)
+          .add(DATASOURCE_CREATION_REQ_COUNT)
+          .add(DATASOURCE_DELETE_REQ_COUNT)
+          .add(DATASOURCE_FAILED_REQ_COUNT_CUS)
+          .add(DATASOURCE_GET_REQ_COUNT)
+          .add(DATASOURCE_PATCH_REQ_COUNT)
+          .add(DATASOURCE_FAILED_REQ_COUNT_SYS)
+          .add(DATASOURCE_PUT_REQ_COUNT)
+          .add(EMR_GET_JOB_RESULT_FAILURE_COUNT)
+          .add(EMR_CANCEL_JOB_REQUEST_FAILURE_COUNT)
+          .add(EMR_START_JOB_REQUEST_FAILURE_COUNT)
+          .add(EMR_INTERACTIVE_QUERY_JOBS_CREATION_COUNT)
+          .add(EMR_STREAMING_QUERY_JOBS_CREATION_COUNT)
+          .add(EMR_BATCH_QUERY_JOBS_CREATION_COUNT)
+          .add(ASYNC_QUERY_CREATE_API_FAILED_REQ_COUNT_CUS)
+          .add(ASYNC_QUERY_CREATE_API_FAILED_REQ_COUNT_SYS)
+          .add(ASYNC_QUERY_CANCEL_API_FAILED_REQ_COUNT_CUS)
+          .add(ASYNC_QUERY_CANCEL_API_FAILED_REQ_COUNT_SYS)
+          .add(ASYNC_QUERY_GET_API_FAILED_REQ_COUNT_CUS)
+          .add(ASYNC_QUERY_GET_API_FAILED_REQ_COUNT_SYS)
+          .add(ASYNC_QUERY_CREATE_API_REQUEST_COUNT)
+          .add(ASYNC_QUERY_GET_API_REQUEST_COUNT)
+          .add(ASYNC_QUERY_CANCEL_API_REQUEST_COUNT)
+          .add(STREAMING_JOB_HOUSEKEEPER_TASK_FAILURE_COUNT)
+          .build();
 
-    REQ_TOTAL("request_total"),
-    REQ_COUNT_TOTAL("request_count"),
-    FAILED_REQ_COUNT_SYS("failed_request_count_syserr"),
-    FAILED_REQ_COUNT_CUS("failed_request_count_cuserr"),
-    FAILED_REQ_COUNT_CB("failed_request_count_cb"),
-    DEFAULT_CURSOR_REQUEST_TOTAL("default_cursor_request_total"),
-    DEFAULT_CURSOR_REQUEST_COUNT_TOTAL("default_cursor_request_count"),
-    CIRCUIT_BREAKER("circuit_breaker"),
-    DEFAULT("default"),
-
-    PPL_REQ_TOTAL("ppl_request_total"),
-    PPL_REQ_COUNT_TOTAL("ppl_request_count"),
-    PPL_FAILED_REQ_COUNT_SYS("ppl_failed_request_count_syserr"),
-    PPL_FAILED_REQ_COUNT_CUS("ppl_failed_request_count_cuserr");
-
-    private String name;
-
-    MetricName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public static List<String> getNames() {
-        return Arrays.stream(MetricName.values()).map(v -> v.name).collect(Collectors.toList());
-    }
-
-
-    private static Set<MetricName> NUMERICAL_METRIC = new ImmutableSet.Builder<MetricName>()
-        .add(PPL_REQ_TOTAL)
-        .add(PPL_REQ_COUNT_TOTAL)
-        .add(PPL_FAILED_REQ_COUNT_SYS)
-        .add(PPL_FAILED_REQ_COUNT_CUS)
-        .build();
-
-    public boolean isNumerical() {
-        return this == REQ_TOTAL || this == REQ_COUNT_TOTAL || this == FAILED_REQ_COUNT_SYS
-            || this == FAILED_REQ_COUNT_CUS || this == FAILED_REQ_COUNT_CB || this == DEFAULT
-            || this == DEFAULT_CURSOR_REQUEST_TOTAL || this == DEFAULT_CURSOR_REQUEST_COUNT_TOTAL
-            || NUMERICAL_METRIC.contains(this);
-    }
+  public boolean isNumerical() {
+    return this == REQ_TOTAL
+        || this == REQ_COUNT_TOTAL
+        || this == FAILED_REQ_COUNT_SYS
+        || this == FAILED_REQ_COUNT_CUS
+        || this == FAILED_REQ_COUNT_CB
+        || this == DEFAULT
+        || this == DEFAULT_CURSOR_REQUEST_TOTAL
+        || this == DEFAULT_CURSOR_REQUEST_COUNT_TOTAL
+        || NUMERICAL_METRIC.contains(this);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Metrics.java b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Metrics.java
index e53dfa6804..858f9e5cef 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Metrics.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/Metrics.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.metrics;
 
 import java.util.ArrayList;
@@ -13,69 +12,68 @@
 
 public class Metrics {
 
-    private static Metrics metrics = new Metrics();
-    private ConcurrentHashMap<String, Metric> registeredMetricsByName = new ConcurrentHashMap<>();
-
-    public static Metrics getInstance() {
-        return metrics;
-    }
+  private static Metrics metrics = new Metrics();
+  private ConcurrentHashMap<String, Metric> registeredMetricsByName = new ConcurrentHashMap<>();
 
-    private Metrics() {
-    }
+  public static Metrics getInstance() {
+    return metrics;
+  }
 
-    public void registerDefaultMetrics() {
-        for (MetricName metricName : MetricName.values()) {
-            registerMetric(MetricFactory.createMetric(metricName));
-        }
-    }
+  private Metrics() {}
 
-    public void registerMetric(Metric metric) {
-        registeredMetricsByName.put(metric.getName(), metric);
+  public void registerDefaultMetrics() {
+    for (MetricName metricName : MetricName.values()) {
+      registerMetric(MetricFactory.createMetric(metricName));
     }
+  }
 
-    public void unregisterMetric(String name) {
-        if (name == null) {
-            return;
-        }
+  public void registerMetric(Metric metric) {
+    registeredMetricsByName.put(metric.getName(), metric);
+  }
 
-        registeredMetricsByName.remove(name);
+  public void unregisterMetric(String name) {
+    if (name == null) {
+      return;
     }
 
-    public Metric getMetric(String name) {
-        if (name == null) {
-            return null;
-        }
+    registeredMetricsByName.remove(name);
+  }
 
-        return registeredMetricsByName.get(name);
+  public Metric getMetric(String name) {
+    if (name == null) {
+      return null;
     }
 
-    public NumericMetric getNumericalMetric(MetricName metricName) {
-        String name = metricName.getName();
-        if (!metricName.isNumerical()) {
-            name = MetricName.DEFAULT.getName();
-        }
+    return registeredMetricsByName.get(name);
+  }
 
-        return (NumericMetric) registeredMetricsByName.get(name);
+  public NumericMetric getNumericalMetric(MetricName metricName) {
+    String name = metricName.getName();
+    if (!metricName.isNumerical()) {
+      name = MetricName.DEFAULT.getName();
     }
 
-    public List<Metric> getAllMetrics() {
-        return new ArrayList<>(registeredMetricsByName.values());
-    }
+    return (NumericMetric) registeredMetricsByName.get(name);
+  }
 
-    public String collectToJSON() {
-        JSONObject metricsJSONObject = new JSONObject();
+  public List<Metric> getAllMetrics() {
+    return new ArrayList<>(registeredMetricsByName.values());
+  }
 
-        for (Metric metric : registeredMetricsByName.values()) {
-            if (metric.getName().equals("default")) {
-                continue;
-            }
-            metricsJSONObject.put(metric.getName(), metric.getValue());
-        }
+  public String collectToJSON() {
+    JSONObject metricsJSONObject = new JSONObject();
 
-        return metricsJSONObject.toString();
+    for (Metric metric : registeredMetricsByName.values()) {
+      if (metric.getName().equals("default")) {
+        continue;
+      }
+      metricsJSONObject.put(metric.getName(), metric.getValue());
     }
 
-    public void clear() {
-        registeredMetricsByName.clear();
-    }
+    return metricsJSONObject.toString();
+  }
+
+  public void clear() {
+    registeredMetricsByName.clear();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/NumericMetric.java b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/NumericMetric.java
index 085034bcd2..ee6d373f8f 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/NumericMetric.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/NumericMetric.java
@@ -3,40 +3,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.metrics;
 
 public class NumericMetric<T> extends Metric<T> {
 
-    private Counter<T> counter;
-
-    public NumericMetric(String name, Counter counter) {
-        super(name);
-        this.counter = counter;
-    }
+  private Counter<T> counter;
 
-    public String getName() {
-        return super.getName();
-    }
+  public NumericMetric(String name, Counter counter) {
+    super(name);
+    this.counter = counter;
+  }
 
-    public Counter<T> getCounter() {
-        return counter;
-    }
+  public String getName() {
+    return super.getName();
+  }
 
-    public void increment() {
-        counter.increment();
-    }
+  public Counter<T> getCounter() {
+    return counter;
+  }
 
-    public void increment(long n) {
-        counter.add(n);
-    }
+  public void increment() {
+    counter.increment();
+  }
 
-    public T getValue() {
-        return counter.getValue();
-    }
+  public void increment(long n) {
+    counter.add(n);
+  }
 
-    public void clear() {
-        counter.reset();
-    }
+  public T getValue() {
+    return counter.getValue();
+  }
 
+  public void clear() {
+    counter.reset();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/RollingCounter.java b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/RollingCounter.java
index 1c624d7ffe..c7b9ec56ec 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/metrics/RollingCounter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/metrics/RollingCounter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.metrics;
 
 import java.time.Clock;
@@ -13,87 +12,85 @@
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
 
 /**
- * Rolling counter. The count is refreshed every interval. In every interval the count is cumulative.
+ * Rolling counter. The count is refreshed every interval. In every interval the count is
+ * cumulative.
  */
 public class RollingCounter implements Counter<Long> {
 
-    private final long capacity;
-    private final long window;
-    private final long interval;
-    private final Clock clock;
-    private final ConcurrentSkipListMap<Long, Long> time2CountWin;
-    private final LongAdder count;
-
-    public RollingCounter() {
-        this(
-            LocalClusterState.state().getSettingValue(
-                Settings.Key.METRICS_ROLLING_WINDOW),
-            LocalClusterState.state().getSettingValue(
-                Settings.Key.METRICS_ROLLING_INTERVAL));
-    }
-
-    public RollingCounter(long window, long interval, Clock clock) {
-        this.window = window;
-        this.interval = interval;
-        this.clock = clock;
-        time2CountWin = new ConcurrentSkipListMap<>();
-        count = new LongAdder();
-        capacity = window / interval * 2;
-    }
-
-    public RollingCounter(long window, long interval) {
-        this(window, interval, Clock.systemDefaultZone());
+  private final long capacity;
+  private final long window;
+  private final long interval;
+  private final Clock clock;
+  private final ConcurrentSkipListMap<Long, Long> time2CountWin;
+  private final LongAdder count;
+
+  public RollingCounter() {
+    this(
+        LocalClusterState.state().getSettingValue(Settings.Key.METRICS_ROLLING_WINDOW),
+        LocalClusterState.state().getSettingValue(Settings.Key.METRICS_ROLLING_INTERVAL));
+  }
+
+  public RollingCounter(long window, long interval, Clock clock) {
+    this.window = window;
+    this.interval = interval;
+    this.clock = clock;
+    time2CountWin = new ConcurrentSkipListMap<>();
+    count = new LongAdder();
+    capacity = window / interval * 2;
+  }
+
+  public RollingCounter(long window, long interval) {
+    this(window, interval, Clock.systemDefaultZone());
+  }
+
+  @Override
+  public void increment() {
+    add(1L);
+  }
+
+  @Override
+  public void add(long n) {
+    trim();
+    time2CountWin.compute(getKey(clock.millis()), (k, v) -> (v == null) ? n : v + n);
+  }
+
+  @Override
+  public Long getValue() {
+    return getValue(getPreKey(clock.millis()));
+  }
+
+  public long getValue(long key) {
+    Long res = time2CountWin.get(key);
+    if (res == null) {
+      return 0;
     }
 
-    @Override
-    public void increment() {
-        add(1L);
-    }
+    return res;
+  }
 
-    @Override
-    public void add(long n) {
-        trim();
-        time2CountWin.compute(getKey(clock.millis()), (k, v) -> (v == null) ? n : v + n);
-    }
+  public long getSum() {
+    return count.longValue();
+  }
 
-    @Override
-    public Long getValue() {
-        return getValue(getPreKey(clock.millis()));
+  private void trim() {
+    if (time2CountWin.size() > capacity) {
+      time2CountWin.headMap(getKey(clock.millis() - window * 1000)).clear();
     }
+  }
 
-    public long getValue(long key) {
-        Long res = time2CountWin.get(key);
-        if (res == null) {
-            return 0;
-        }
+  private long getKey(long millis) {
+    return millis / 1000 / this.interval;
+  }
 
-        return res;
-    }
-
-    public long getSum() {
-        return count.longValue();
-    }
+  private long getPreKey(long millis) {
+    return getKey(millis) - 1;
+  }
 
-    private void trim() {
-        if (time2CountWin.size() > capacity) {
-            time2CountWin.headMap(getKey(clock.millis() - window * 1000)).clear();
-        }
-    }
-
-    private long getKey(long millis) {
-        return millis / 1000 / this.interval;
-    }
-
-    private long getPreKey(long millis) {
-        return getKey(millis) - 1;
-    }
-
-    public int size() {
-        return time2CountWin.size();
-    }
-
-    public void reset() {
-        time2CountWin.clear();
-    }
+  public int size() {
+    return time2CountWin.size();
+  }
 
+  public void reset() {
+    time2CountWin.clear();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/CaseWhenParser.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/CaseWhenParser.java
index c711ee2929..d55ee64601 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/CaseWhenParser.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/CaseWhenParser.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -19,101 +18,119 @@
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.utils.Util;
 
-/**
- * Created by allwefantasy on 9/3/16.
- */
+/** Created by allwefantasy on 9/3/16. */
 public class CaseWhenParser {
 
-    private SQLCaseExpr caseExpr;
-    private String alias;
-    private String tableAlias;
-
-    public CaseWhenParser(SQLCaseExpr caseExpr, String alias, String tableAlias) {
-        this.alias = alias;
-        this.tableAlias = tableAlias;
-        this.caseExpr = caseExpr;
+  private SQLCaseExpr caseExpr;
+  private String alias;
+  private String tableAlias;
+
+  public CaseWhenParser(SQLCaseExpr caseExpr, String alias, String tableAlias) {
+    this.alias = alias;
+    this.tableAlias = tableAlias;
+    this.caseExpr = caseExpr;
+  }
+
+  public String parse() throws SqlParseException {
+    List<String> result = new ArrayList<>();
+
+    if (caseExpr.getValueExpr() != null) {
+      for (SQLCaseExpr.Item item : caseExpr.getItems()) {
+        SQLExpr left = caseExpr.getValueExpr();
+        SQLExpr right = item.getConditionExpr();
+        SQLBinaryOpExpr conditionExpr =
+            new SQLBinaryOpExpr(left, SQLBinaryOperator.Equality, right);
+        item.setConditionExpr(conditionExpr);
+      }
+      caseExpr.setValueExpr(null);
     }
 
-    public String parse() throws SqlParseException {
-        List<String> result = new ArrayList<>();
-
-        if (caseExpr.getValueExpr() != null) {
-            for (SQLCaseExpr.Item item : caseExpr.getItems()) {
-                SQLExpr left = caseExpr.getValueExpr();
-                SQLExpr right = item.getConditionExpr();
-                SQLBinaryOpExpr conditionExpr = new SQLBinaryOpExpr(left, SQLBinaryOperator.Equality, right);
-                item.setConditionExpr(conditionExpr);
-            }
-            caseExpr.setValueExpr(null);
-        }
-
-        for (SQLCaseExpr.Item item : caseExpr.getItems()) {
-            SQLExpr conditionExpr = item.getConditionExpr();
-
-            WhereParser parser = new WhereParser(new SqlParser(), conditionExpr);
-            String scriptCode = explain(parser.findWhere());
-            if (scriptCode.startsWith(" &&")) {
-                scriptCode = scriptCode.substring(3);
-            }
-            if (result.size() == 0) {
-                result.add("if(" + scriptCode + ")" + "{" + Util.getScriptValueWithQuote(item.getValueExpr(),
-                        "'") + "}");
-            } else {
-                result.add("else if(" + scriptCode + ")" + "{" + Util.getScriptValueWithQuote(item.getValueExpr(),
-                        "'") + "}");
-            }
-
-        }
-        SQLExpr elseExpr = caseExpr.getElseExpr();
-        if (elseExpr == null) {
-            result.add("else { null }");
-        } else {
-            result.add("else {" + Util.getScriptValueWithQuote(elseExpr, "'") + "}");
-        }
-
-
-        return Joiner.on(" ").join(result);
+    for (SQLCaseExpr.Item item : caseExpr.getItems()) {
+      SQLExpr conditionExpr = item.getConditionExpr();
+
+      WhereParser parser = new WhereParser(new SqlParser(), conditionExpr);
+      String scriptCode = explain(parser.findWhere());
+      if (scriptCode.startsWith(" &&")) {
+        scriptCode = scriptCode.substring(3);
+      }
+      if (result.size() == 0) {
+        result.add(
+            "if("
+                + scriptCode
+                + ")"
+                + "{"
+                + Util.getScriptValueWithQuote(item.getValueExpr(), "'")
+                + "}");
+      } else {
+        result.add(
+            "else if("
+                + scriptCode
+                + ")"
+                + "{"
+                + Util.getScriptValueWithQuote(item.getValueExpr(), "'")
+                + "}");
+      }
     }
-
-    public String explain(Where where) throws SqlParseException {
-        List<String> codes = new ArrayList<>();
-        while (where.getWheres().size() == 1) {
-            where = where.getWheres().getFirst();
-        }
-        explainWhere(codes, where);
-        String relation = where.getConn().name().equals("AND") ? " && " : " || ";
-        return Joiner.on(relation).join(codes);
+    SQLExpr elseExpr = caseExpr.getElseExpr();
+    if (elseExpr == null) {
+      result.add("else { null }");
+    } else {
+      result.add("else {" + Util.getScriptValueWithQuote(elseExpr, "'") + "}");
     }
 
+    return Joiner.on(" ").join(result);
+  }
 
-    private void explainWhere(List<String> codes, Where where) throws SqlParseException {
-        if (where instanceof Condition) {
-            Condition condition = (Condition) where;
-
-            if (condition.getValue() instanceof ScriptFilter) {
-                codes.add("(" + ((ScriptFilter) condition.getValue()).getScript() + ")");
-            } else if (condition.getOPERATOR() == Condition.OPERATOR.BETWEEN) {
-                Object[] objs = (Object[]) condition.getValue();
-                codes.add("(" + "doc['" + condition.getName() + "'].value >= " + objs[0] + " && doc['"
-                        + condition.getName() + "'].value <=" + objs[1] + ")");
-            } else {
-                SQLExpr nameExpr = condition.getNameExpr();
-                SQLExpr valueExpr = condition.getValueExpr();
-                if (valueExpr instanceof SQLNullExpr) {
-                    codes.add("(" + "doc['" + nameExpr.toString() + "']" + ".empty)");
-                } else {
-                    codes.add("(" + Util.getScriptValueWithQuote(nameExpr, "'") + condition.getOpertatorSymbol()
-                            + Util.getScriptValueWithQuote(valueExpr, "'") + ")");
-                }
-            }
+  public String explain(Where where) throws SqlParseException {
+    List<String> codes = new ArrayList<>();
+    while (where.getWheres().size() == 1) {
+      where = where.getWheres().getFirst();
+    }
+    explainWhere(codes, where);
+    String relation = where.getConn().name().equals("AND") ? " && " : " || ";
+    return Joiner.on(relation).join(codes);
+  }
+
+  private void explainWhere(List<String> codes, Where where) throws SqlParseException {
+    if (where instanceof Condition) {
+      Condition condition = (Condition) where;
+
+      if (condition.getValue() instanceof ScriptFilter) {
+        codes.add("(" + ((ScriptFilter) condition.getValue()).getScript() + ")");
+      } else if (condition.getOPERATOR() == Condition.OPERATOR.BETWEEN) {
+        Object[] objs = (Object[]) condition.getValue();
+        codes.add(
+            "("
+                + "doc['"
+                + condition.getName()
+                + "'].value >= "
+                + objs[0]
+                + " && doc['"
+                + condition.getName()
+                + "'].value <="
+                + objs[1]
+                + ")");
+      } else {
+        SQLExpr nameExpr = condition.getNameExpr();
+        SQLExpr valueExpr = condition.getValueExpr();
+        if (valueExpr instanceof SQLNullExpr) {
+          codes.add("(" + "doc['" + nameExpr.toString() + "']" + ".empty)");
         } else {
-            for (Where subWhere : where.getWheres()) {
-                List<String> subCodes = new ArrayList<>();
-                explainWhere(subCodes, subWhere);
-                String relation = subWhere.getConn().name().equals("AND") ? "&&" : "||";
-                codes.add(Joiner.on(relation).join(subCodes));
-            }
+          codes.add(
+              "("
+                  + Util.getScriptValueWithQuote(nameExpr, "'")
+                  + condition.getOpertatorSymbol()
+                  + Util.getScriptValueWithQuote(valueExpr, "'")
+                  + ")");
         }
+      }
+    } else {
+      for (Where subWhere : where.getWheres()) {
+        List<String> subCodes = new ArrayList<>();
+        explainWhere(subCodes, subWhere);
+        String relation = subWhere.getConn().name().equals("AND") ? "&&" : "||";
+        codes.add(Joiner.on(relation).join(subCodes));
+      }
     }
-
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/ChildrenType.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/ChildrenType.java
index 74945cb94f..27374849df 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/ChildrenType.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/ChildrenType.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -16,56 +15,55 @@
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.utils.Util;
 
-/**
- * Created by Razma Tazz on 14/04/2016.
- */
+/** Created by Razma Tazz on 14/04/2016. */
 public class ChildrenType {
-    public String field;
-    public String childType;
-    public Where where;
-    private boolean simple;
+  public String field;
+  public String childType;
+  public Where where;
+  private boolean simple;
 
-    public boolean tryFillFromExpr(SQLExpr expr) throws SqlParseException {
-        if (!(expr instanceof SQLMethodInvokeExpr)) {
-            return false;
-        }
-        SQLMethodInvokeExpr method = (SQLMethodInvokeExpr) expr;
-
-        String methodName = method.getMethodName();
+  public boolean tryFillFromExpr(SQLExpr expr) throws SqlParseException {
+    if (!(expr instanceof SQLMethodInvokeExpr)) {
+      return false;
+    }
+    SQLMethodInvokeExpr method = (SQLMethodInvokeExpr) expr;
 
-        if (!methodName.toLowerCase().equals("children")) {
-            return false;
-        }
+    String methodName = method.getMethodName();
 
-        List<SQLExpr> parameters = method.getParameters();
+    if (!methodName.toLowerCase().equals("children")) {
+      return false;
+    }
 
-        if (parameters.size() != 2) {
-            throw new SqlParseException(
-                    "on children object only allowed 2 parameters (type, field)/(type, conditions...) ");
-        }
+    List<SQLExpr> parameters = method.getParameters();
 
-        String type = Util.extendedToString(parameters.get(0));
-        this.childType = type;
+    if (parameters.size() != 2) {
+      throw new SqlParseException(
+          "on children object only allowed 2 parameters (type, field)/(type, conditions...) ");
+    }
 
-        SQLExpr secondParameter = parameters.get(1);
-        if (secondParameter instanceof SQLTextLiteralExpr || secondParameter instanceof SQLIdentifierExpr
-                || secondParameter instanceof SQLPropertyExpr) {
-            this.field = Util.extendedToString(secondParameter);
-            this.simple = true;
-        } else {
-            Where where = Where.newInstance();
-            new WhereParser(new SqlParser()).parseWhere(secondParameter, where);
-            if (where.getWheres().size() == 0) {
-                throw new SqlParseException("Failed to parse filter condition");
-            }
-            this.where = where;
-            simple = false;
-        }
+    String type = Util.extendedToString(parameters.get(0));
+    this.childType = type;
 
-        return true;
+    SQLExpr secondParameter = parameters.get(1);
+    if (secondParameter instanceof SQLTextLiteralExpr
+        || secondParameter instanceof SQLIdentifierExpr
+        || secondParameter instanceof SQLPropertyExpr) {
+      this.field = Util.extendedToString(secondParameter);
+      this.simple = true;
+    } else {
+      Where where = Where.newInstance();
+      new WhereParser(new SqlParser()).parseWhere(secondParameter, where);
+      if (where.getWheres().size() == 0) {
+        throw new SqlParseException("Failed to parse filter condition");
+      }
+      this.where = where;
+      simple = false;
     }
 
-    public boolean isSimple() {
-        return simple;
-    }
+    return true;
+  }
+
+  public boolean isSimple() {
+    return simple;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticLexer.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticLexer.java
index 8720c3ba85..67b49fb4ad 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticLexer.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticLexer.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import static com.alibaba.druid.sql.parser.CharTypes.isFirstIdentifierChar;
@@ -14,86 +13,82 @@
 import com.alibaba.druid.sql.parser.ParserException;
 import com.alibaba.druid.sql.parser.Token;
 
-/**
- * Created by Eliran on 18/8/2015.
- */
+/** Created by Eliran on 18/8/2015. */
 public class ElasticLexer extends MySqlLexer {
-    public ElasticLexer(String input) {
-        super(input);
-    }
+  public ElasticLexer(String input) {
+    super(input);
+  }
 
+  public ElasticLexer(char[] input, int inputLength, boolean skipComment) {
+    super(input, inputLength, skipComment);
+  }
 
-    public ElasticLexer(char[] input, int inputLength, boolean skipComment) {
-        super(input, inputLength, skipComment);
-    }
+  public void scanIdentifier() {
+    final char first = ch;
+
+    if (ch == '`') {
 
-    public void scanIdentifier() {
-        final char first = ch;
+      mark = pos;
+      bufPos = 1;
+      char ch;
+      for (; ; ) {
+        ch = charAt(++pos);
 
         if (ch == '`') {
+          bufPos++;
+          ch = charAt(++pos);
+          break;
+        } else if (ch == EOI) {
+          throw new ParserException("illegal identifier");
+        }
 
-            mark = pos;
-            bufPos = 1;
-            char ch;
-            for (; ; ) {
-                ch = charAt(++pos);
-
-                if (ch == '`') {
-                    bufPos++;
-                    ch = charAt(++pos);
-                    break;
-                } else if (ch == EOI) {
-                    throw new ParserException("illegal identifier");
-                }
-
-                bufPos++;
-                continue;
-            }
-
-            this.ch = charAt(pos);
-
-            stringVal = subString(mark, bufPos);
-            Token tok = keywods.getKeyword(stringVal);
-            if (tok != null) {
-                token = tok;
-            } else {
-                token = Token.IDENTIFIER;
-            }
-        } else {
-
-            final boolean firstFlag = isFirstIdentifierChar(first);
-            if (!firstFlag) {
-                throw new ParserException("illegal identifier");
-            }
-
-            mark = pos;
-            bufPos = 1;
-            char ch;
-            for (; ; ) {
-                ch = charAt(++pos);
-
-                if (!isElasticIdentifierChar(ch)) {
-                    break;
-                }
-
-                bufPos++;
-                continue;
-            }
-
-            this.ch = charAt(pos);
-
-            stringVal = addSymbol();
-            Token tok = keywods.getKeyword(stringVal);
-            if (tok != null) {
-                token = tok;
-            } else {
-                token = Token.IDENTIFIER;
-            }
+        bufPos++;
+        continue;
+      }
+
+      this.ch = charAt(pos);
+
+      stringVal = subString(mark, bufPos);
+      Token tok = keywods.getKeyword(stringVal);
+      if (tok != null) {
+        token = tok;
+      } else {
+        token = Token.IDENTIFIER;
+      }
+    } else {
+
+      final boolean firstFlag = isFirstIdentifierChar(first);
+      if (!firstFlag) {
+        throw new ParserException("illegal identifier");
+      }
+
+      mark = pos;
+      bufPos = 1;
+      char ch;
+      for (; ; ) {
+        ch = charAt(++pos);
+
+        if (!isElasticIdentifierChar(ch)) {
+          break;
         }
-    }
 
+        bufPos++;
+        continue;
+      }
 
-    private boolean isElasticIdentifierChar(char ch) {
-        return ch == '*' || ch == ':' || ch == '-' || ch == '.' || ch == ';' || isIdentifierChar(ch);
+      this.ch = charAt(pos);
+
+      stringVal = addSymbol();
+      Token tok = keywods.getKeyword(stringVal);
+      if (tok != null) {
+        token = tok;
+      } else {
+        token = Token.IDENTIFIER;
+      }
     }
+  }
+
+  private boolean isElasticIdentifierChar(char ch) {
+    return ch == '*' || ch == ':' || ch == '-' || ch == '.' || ch == ';' || isIdentifierChar(ch);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticSqlExprParser.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticSqlExprParser.java
index 5f6d03f0ac..be9c2f9652 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticSqlExprParser.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticSqlExprParser.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import static org.opensearch.sql.legacy.utils.StringUtils.isQuoted;
@@ -53,987 +52,1002 @@
 import com.alibaba.druid.util.JdbcConstants;
 import java.util.List;
 
-/**
- * Created by Eliran on 18/8/2015.
- */
+/** Created by Eliran on 18/8/2015. */
 public class ElasticSqlExprParser extends SQLExprParser {
-    public ElasticSqlExprParser(Lexer lexer) {
-        super(lexer);
-        this.aggregateFunctions = AGGREGATE_FUNCTIONS;
+  public ElasticSqlExprParser(Lexer lexer) {
+    super(lexer);
+    this.aggregateFunctions = AGGREGATE_FUNCTIONS;
+  }
+
+  public ElasticSqlExprParser(String sql) {
+    this(new ElasticLexer(sql));
+    this.lexer.nextToken();
+  }
+
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  @Override
+  public void parseHints(List hints) {
+    while (lexer.token() == Token.HINT) {
+      hints.add(new SQLCommentHint(lexer.stringVal()));
+      lexer.nextToken();
     }
+  }
 
-    public ElasticSqlExprParser(String sql) {
-        this(new ElasticLexer(sql));
-        this.lexer.nextToken();
+  @Override
+  protected SQLExpr methodRest(SQLExpr expr, boolean acceptLPAREN) {
+    if (acceptLPAREN) {
+      accept(Token.LPAREN);
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @Override
-    public void parseHints(List hints) {
-        while (lexer.token() == Token.HINT) {
-            hints.add(new SQLCommentHint(lexer.stringVal()));
-            lexer.nextToken();
-        }
+    if (expr instanceof SQLName || expr instanceof SQLDefaultExpr) {
+      String methodName;
+
+      SQLMethodInvokeExpr methodInvokeExpr;
+      if (expr instanceof SQLPropertyExpr) {
+        methodName = ((SQLPropertyExpr) expr).getName();
+        methodInvokeExpr = new SQLMethodInvokeExpr(methodName);
+        methodInvokeExpr.setOwner(((SQLPropertyExpr) expr).getOwner());
+      } else {
+        methodName = expr.toString();
+        methodInvokeExpr = new SQLMethodInvokeExpr(methodName);
+      }
+
+      if (isAggreateFunction(methodName)) {
+        SQLAggregateExpr aggregateExpr = parseAggregateExpr(methodName);
+
+        return aggregateExpr;
+      }
+
+      if (lexer.token() != Token.RPAREN) {
+        exprList(methodInvokeExpr.getParameters(), methodInvokeExpr);
+      }
+
+      accept(Token.RPAREN);
+
+      return primaryRest(methodInvokeExpr);
     }
 
-    @Override
-    protected SQLExpr methodRest(SQLExpr expr, boolean acceptLPAREN) {
-        if (acceptLPAREN) {
-            accept(Token.LPAREN);
+    throw new ParserException("Syntax error: " + lexer.token());
+  }
+
+  public SQLExpr primary() {
+
+    if (lexer.token() == Token.LBRACE) {
+      lexer.nextToken();
+      boolean foundRBrace = false;
+      if (lexer.stringVal().equals("ts")) {
+        String current = lexer.stringVal();
+        do {
+          if (current.equals(lexer.token().RBRACE.name())) {
+            foundRBrace = true;
+            break;
+          }
+          lexer.nextToken();
+          current = lexer.token().name();
+        } while (!foundRBrace && !current.trim().equals(""));
+
+        if (foundRBrace) {
+          SQLOdbcExpr sdle = new SQLOdbcExpr(lexer.stringVal());
+
+          accept(Token.RBRACE);
+          return sdle;
+        } else {
+          throw new ParserException("Error. Unable to find closing RBRACE");
         }
+      } else {
+        throw new ParserException("Error. Unable to parse ODBC Literal Timestamp");
+      }
+    } else if (lexer.token() == Token.LBRACKET) {
+      StringBuilder identifier = new StringBuilder();
+      lexer.nextToken();
+      String prefix = "";
+      while (lexer.token() != Token.RBRACKET) {
+        if (lexer.token() != Token.IDENTIFIER
+            && lexer.token() != Token.INDEX
+            && lexer.token() != Token.LITERAL_CHARS) {
+          throw new ParserException(
+              "All items between Brackets should be identifiers , got:" + lexer.token());
+        }
+        identifier.append(prefix);
+        identifier.append(lexer.stringVal());
+        prefix = " ";
+        lexer.nextToken();
+      }
+
+      accept(Token.RBRACKET);
+      return new SQLIdentifierExpr(identifier.toString());
+    } else if (lexer.token() == Token.NOT) {
+      lexer.nextToken();
+      SQLExpr sqlExpr;
+      if (lexer.token() == Token.EXISTS) {
+        lexer.nextToken();
+        accept(Token.LPAREN);
+        sqlExpr = new SQLExistsExpr(createSelectParser().select(), true);
+        accept(Token.RPAREN);
+      } else if (lexer.token() == Token.LPAREN) {
+        lexer.nextToken();
 
-        if (expr instanceof SQLName || expr instanceof SQLDefaultExpr) {
-            String methodName;
-
-            SQLMethodInvokeExpr methodInvokeExpr;
-            if (expr instanceof SQLPropertyExpr) {
-                methodName = ((SQLPropertyExpr) expr).getName();
-                methodInvokeExpr = new SQLMethodInvokeExpr(methodName);
-                methodInvokeExpr.setOwner(((SQLPropertyExpr) expr).getOwner());
-            } else {
-                methodName = expr.toString();
-                methodInvokeExpr = new SQLMethodInvokeExpr(methodName);
-            }
+        SQLExpr notTarget = expr();
 
-            if (isAggreateFunction(methodName)) {
-                SQLAggregateExpr aggregateExpr = parseAggregateExpr(methodName);
+        accept(Token.RPAREN);
 
-                return aggregateExpr;
-            }
+        sqlExpr = new SQLNotExpr(notTarget);
 
-            if (lexer.token() != Token.RPAREN) {
-                exprList(methodInvokeExpr.getParameters(), methodInvokeExpr);
-            }
+        return primaryRest(sqlExpr);
+      } else {
+        SQLExpr restExpr = relational();
+        sqlExpr = new SQLNotExpr(restExpr);
+      }
+      return sqlExpr;
+    }
 
-            accept(Token.RPAREN);
+    boolean parenWrapped = lexer.token() == Token.LPAREN;
 
-            return primaryRest(methodInvokeExpr);
-        }
+    SQLExpr expr = primary2();
 
-        throw new ParserException("Syntax error: " + lexer.token());
+    // keep track of if the identifier is wrapped in parens
+    if (parenWrapped && expr instanceof SQLIdentifierExpr) {
+      expr = new SQLParensIdentifierExpr((SQLIdentifierExpr) expr);
     }
 
+    return expr;
+  }
 
-    public SQLExpr primary() {
+  public static String[] AGGREGATE_FUNCTIONS = {
+    "AVG", "COUNT", "GROUP_CONCAT", "MAX", "MIN", "STDDEV", "SUM"
+  };
 
-        if (lexer.token() == Token.LBRACE) {
-            lexer.nextToken();
-            boolean foundRBrace = false;
-            if (lexer.stringVal().equals("ts")) {
-                String current = lexer.stringVal();
-                do {
-                    if (current.equals(lexer.token().RBRACE.name())) {
-                        foundRBrace = true;
-                        break;
-                    }
-                    lexer.nextToken();
-                    current = lexer.token().name();
-                } while (!foundRBrace && !current.trim().equals(""));
-
-                if (foundRBrace) {
-                    SQLOdbcExpr sdle = new SQLOdbcExpr(lexer.stringVal());
-
-                    accept(Token.RBRACE);
-                    return sdle;
-                } else {
-                    throw new ParserException("Error. Unable to find closing RBRACE");
-                }
-            } else {
-                throw new ParserException("Error. Unable to parse ODBC Literal Timestamp");
-            }
-        } else if (lexer.token() == Token.LBRACKET) {
-            StringBuilder identifier = new StringBuilder();
-            lexer.nextToken();
-            String prefix = "";
-            while (lexer.token() != Token.RBRACKET) {
-                if (lexer.token() != Token.IDENTIFIER && lexer.token() != Token.INDEX
-                        && lexer.token() != Token.LITERAL_CHARS) {
-                    throw new ParserException("All items between Brackets should be identifiers , got:"
-                            + lexer.token());
-                }
-                identifier.append(prefix);
-                identifier.append(lexer.stringVal());
-                prefix = " ";
-                lexer.nextToken();
-            }
+  public SQLExpr relationalRest(SQLExpr expr) {
+    if (identifierEquals("REGEXP")) {
+      lexer.nextToken();
+      SQLExpr rightExp = equality();
 
-            accept(Token.RBRACKET);
-            return new SQLIdentifierExpr(identifier.toString());
-        } else if (lexer.token() == Token.NOT) {
-            lexer.nextToken();
-            SQLExpr sqlExpr;
-            if (lexer.token() == Token.EXISTS) {
-                lexer.nextToken();
-                accept(Token.LPAREN);
-                sqlExpr = new SQLExistsExpr(createSelectParser().select(), true);
-                accept(Token.RPAREN);
-            } else if (lexer.token() == Token.LPAREN) {
-                lexer.nextToken();
+      rightExp = relationalRest(rightExp);
 
-                SQLExpr notTarget = expr();
+      return new SQLBinaryOpExpr(expr, SQLBinaryOperator.RegExp, rightExp, JdbcConstants.MYSQL);
+    }
 
-                accept(Token.RPAREN);
+    return super.relationalRest(expr);
+  }
 
-                sqlExpr = new SQLNotExpr(notTarget);
+  public SQLExpr multiplicativeRest(SQLExpr expr) {
+    if (lexer.token() == Token.IDENTIFIER && "MOD".equalsIgnoreCase(lexer.stringVal())) {
+      lexer.nextToken();
+      SQLExpr rightExp = primary();
 
-                return primaryRest(sqlExpr);
-            } else {
-                SQLExpr restExpr = relational();
-                sqlExpr = new SQLNotExpr(restExpr);
-            }
-            return sqlExpr;
-        }
+      rightExp = relationalRest(rightExp);
+
+      return new SQLBinaryOpExpr(expr, SQLBinaryOperator.Modulus, rightExp, JdbcConstants.MYSQL);
+    }
 
-        boolean parenWrapped = lexer.token() == Token.LPAREN;
+    return super.multiplicativeRest(expr);
+  }
 
-        SQLExpr expr = primary2();
+  public SQLExpr notRationalRest(SQLExpr expr) {
+    if (identifierEquals("REGEXP")) {
+      lexer.nextToken();
+      SQLExpr rightExp = primary();
 
-        // keep track of if the identifier is wrapped in parens
-        if (parenWrapped && expr instanceof SQLIdentifierExpr) {
-            expr = new SQLParensIdentifierExpr((SQLIdentifierExpr) expr);
-        }
+      rightExp = relationalRest(rightExp);
 
-        return expr;
+      return new SQLBinaryOpExpr(expr, SQLBinaryOperator.NotRegExp, rightExp, JdbcConstants.MYSQL);
     }
 
-    public static String[] AGGREGATE_FUNCTIONS = {"AVG", "COUNT", "GROUP_CONCAT", "MAX", "MIN", "STDDEV", "SUM"};
+    return super.notRationalRest(expr);
+  }
 
+  public SQLExpr primary2() {
+    final Token tok = lexer.token();
 
-    public SQLExpr relationalRest(SQLExpr expr) {
-        if (identifierEquals("REGEXP")) {
-            lexer.nextToken();
-            SQLExpr rightExp = equality();
+    if (identifierEquals("outfile")) {
+      lexer.nextToken();
+      SQLExpr file = primary();
+      SQLExpr expr = new MySqlOutFileExpr(file);
 
-            rightExp = relationalRest(rightExp);
+      return primaryRest(expr);
+    }
 
-            return new SQLBinaryOpExpr(expr, SQLBinaryOperator.RegExp, rightExp, JdbcConstants.MYSQL);
+    switch (tok) {
+      case LITERAL_ALIAS:
+        String aliasValue = lexer.stringVal();
+        lexer.nextToken();
+        return primaryRest(new SQLCharExpr(aliasValue));
+      case VARIANT:
+        SQLVariantRefExpr varRefExpr = new SQLVariantRefExpr(lexer.stringVal());
+        lexer.nextToken();
+        if (varRefExpr.getName().equalsIgnoreCase("@@global")) {
+          accept(Token.DOT);
+          varRefExpr = new SQLVariantRefExpr(lexer.stringVal(), true);
+          lexer.nextToken();
+        } else if (varRefExpr.getName().equals("@") && lexer.token() == Token.LITERAL_CHARS) {
+          varRefExpr.setName("@'" + lexer.stringVal() + "'");
+          lexer.nextToken();
+        } else if (varRefExpr.getName().equals("@@") && lexer.token() == Token.LITERAL_CHARS) {
+          varRefExpr.setName("@@'" + lexer.stringVal() + "'");
+          lexer.nextToken();
+        }
+        return primaryRest(varRefExpr);
+      case VALUES:
+        lexer.nextToken();
+        if (lexer.token() != Token.LPAREN) {
+          throw new ParserException("Syntax error: " + lexer.token());
+        }
+        return this.methodRest(new SQLIdentifierExpr("VALUES"), true);
+      case BINARY:
+        lexer.nextToken();
+        if (lexer.token() == Token.COMMA
+            || lexer.token() == Token.SEMI
+            || lexer.token() == Token.EOF) {
+          return new SQLIdentifierExpr("BINARY");
+        } else {
+          SQLUnaryExpr binaryExpr = new SQLUnaryExpr(SQLUnaryOperator.BINARY, expr());
+          return primaryRest(binaryExpr);
         }
+      case CACHE:
+      case GROUP:
+        lexer.nextToken();
+        return primaryRest(new SQLIdentifierExpr(lexer.stringVal()));
+      case DOT:
+        lexer.nextToken();
+        return primaryRest(new SQLIdentifierExpr("." + lexer.stringVal()));
+      default:
+        return super.primary();
+    }
+  }
 
-        return super.relationalRest(expr);
+  public final SQLExpr primaryRest(SQLExpr expr) {
+    if (expr == null) {
+      throw new IllegalArgumentException("Illegal expression: NULL");
     }
 
-    public SQLExpr multiplicativeRest(SQLExpr expr) {
-        if (lexer.token() == Token.IDENTIFIER && "MOD".equalsIgnoreCase(lexer.stringVal())) {
+    if (lexer.token() == Token.LITERAL_CHARS) {
+      if (expr instanceof SQLIdentifierExpr) {
+        SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
+        String ident = identExpr.getName();
+
+        if (ident.equalsIgnoreCase("x")) {
+          String charValue = lexer.stringVal();
+          lexer.nextToken();
+          expr = new SQLHexExpr(charValue);
+
+          return primaryRest(expr);
+        } else if (ident.equalsIgnoreCase("b")) {
+          String charValue = lexer.stringVal();
+          lexer.nextToken();
+          expr = new SQLBinaryExpr(charValue);
+
+          return primaryRest(expr);
+        } else if (ident.startsWith("_")) {
+          String charValue = lexer.stringVal();
+          lexer.nextToken();
+
+          MySqlCharExpr mysqlCharExpr = new MySqlCharExpr(charValue);
+          mysqlCharExpr.setCharset(identExpr.getName());
+          if (identifierEquals("COLLATE")) {
             lexer.nextToken();
-            SQLExpr rightExp = primary();
 
-            rightExp = relationalRest(rightExp);
+            String collate = lexer.stringVal();
+            mysqlCharExpr.setCollate(collate);
+            accept(Token.IDENTIFIER);
+          }
+
+          expr = mysqlCharExpr;
 
-            return new SQLBinaryOpExpr(expr, SQLBinaryOperator.Modulus, rightExp, JdbcConstants.MYSQL);
+          return primaryRest(expr);
         }
+      } else if (expr instanceof SQLCharExpr) {
+        SQLMethodInvokeExpr concat = new SQLMethodInvokeExpr("CONCAT");
+        concat.addParameter(expr);
+        do {
+          String chars = lexer.stringVal();
+          concat.addParameter(new SQLCharExpr(chars));
+          lexer.nextToken();
+        } while (lexer.token() == Token.LITERAL_CHARS || lexer.token() == Token.LITERAL_ALIAS);
+        expr = concat;
+      }
+    } else if (lexer.token() == Token.IDENTIFIER) {
+      if (expr instanceof SQLHexExpr) {
+        if ("USING".equalsIgnoreCase(lexer.stringVal())) {
+          lexer.nextToken();
+          if (lexer.token() != Token.IDENTIFIER) {
+            throw new ParserException("Syntax error: " + lexer.token());
+          }
+          String charSet = lexer.stringVal();
+          lexer.nextToken();
+          expr.getAttributes().put("USING", charSet);
+
+          return primaryRest(expr);
+        }
+      } else if ("COLLATE".equalsIgnoreCase(lexer.stringVal())) {
+        lexer.nextToken();
 
-        return super.multiplicativeRest(expr);
-    }
+        if (lexer.token() == Token.EQ) {
+          lexer.nextToken();
+        }
 
-    public SQLExpr notRationalRest(SQLExpr expr) {
-        if (identifierEquals("REGEXP")) {
-            lexer.nextToken();
-            SQLExpr rightExp = primary();
+        if (lexer.token() != Token.IDENTIFIER) {
+          throw new ParserException("Syntax error: " + lexer.token());
+        }
 
-            rightExp = relationalRest(rightExp);
+        String collate = lexer.stringVal();
+        lexer.nextToken();
 
-            return new SQLBinaryOpExpr(expr, SQLBinaryOperator.NotRegExp, rightExp, JdbcConstants.MYSQL);
-        }
+        expr =
+            new SQLBinaryOpExpr(
+                expr,
+                SQLBinaryOperator.COLLATE,
+                new SQLIdentifierExpr(collate),
+                JdbcConstants.MYSQL);
 
-        return super.notRationalRest(expr);
-    }
+        return primaryRest(expr);
+      } else if (expr instanceof SQLVariantRefExpr) {
+        if ("COLLATE".equalsIgnoreCase(lexer.stringVal())) {
+          lexer.nextToken();
 
-    public SQLExpr primary2() {
-        final Token tok = lexer.token();
+          if (lexer.token() != Token.IDENTIFIER) {
+            throw new ParserException("Syntax error: " + lexer.token());
+          }
 
-        if (identifierEquals("outfile")) {
-            lexer.nextToken();
-            SQLExpr file = primary();
-            SQLExpr expr = new MySqlOutFileExpr(file);
+          String collate = lexer.stringVal();
+          lexer.nextToken();
 
-            return primaryRest(expr);
+          expr.putAttribute("COLLATE", collate);
 
+          return primaryRest(expr);
         }
-
-        switch (tok) {
-            case LITERAL_ALIAS:
-                String aliasValue = lexer.stringVal();
-                lexer.nextToken();
-                return primaryRest(new SQLCharExpr(aliasValue));
-            case VARIANT:
-                SQLVariantRefExpr varRefExpr = new SQLVariantRefExpr(lexer.stringVal());
-                lexer.nextToken();
-                if (varRefExpr.getName().equalsIgnoreCase("@@global")) {
-                    accept(Token.DOT);
-                    varRefExpr = new SQLVariantRefExpr(lexer.stringVal(), true);
-                    lexer.nextToken();
-                } else if (varRefExpr.getName().equals("@") && lexer.token() == Token.LITERAL_CHARS) {
-                    varRefExpr.setName("@'" + lexer.stringVal() + "'");
-                    lexer.nextToken();
-                } else if (varRefExpr.getName().equals("@@") && lexer.token() == Token.LITERAL_CHARS) {
-                    varRefExpr.setName("@@'" + lexer.stringVal() + "'");
-                    lexer.nextToken();
-                }
-                return primaryRest(varRefExpr);
-            case VALUES:
-                lexer.nextToken();
-                if (lexer.token() != Token.LPAREN) {
-                    throw new ParserException("Syntax error: " + lexer.token());
-                }
-                return this.methodRest(new SQLIdentifierExpr("VALUES"), true);
-            case BINARY:
-                lexer.nextToken();
-                if (lexer.token() == Token.COMMA || lexer.token() == Token.SEMI || lexer.token() == Token.EOF) {
-                    return new SQLIdentifierExpr("BINARY");
-                } else {
-                    SQLUnaryExpr binaryExpr = new SQLUnaryExpr(SQLUnaryOperator.BINARY, expr());
-                    return primaryRest(binaryExpr);
-                }
-            case CACHE:
-            case GROUP:
-                lexer.nextToken();
-                return primaryRest(new SQLIdentifierExpr(lexer.stringVal()));
-            case DOT:
-                lexer.nextToken();
-                return primaryRest(new SQLIdentifierExpr("." + lexer.stringVal()));
-            default:
-                return super.primary();
+      } else if (expr instanceof SQLIntegerExpr) {
+        SQLIntegerExpr intExpr = (SQLIntegerExpr) expr;
+        String binaryString = lexer.stringVal();
+        if (intExpr.getNumber().intValue() == 0 && binaryString.startsWith("b")) {
+          lexer.nextToken();
+          expr = new SQLBinaryExpr(binaryString.substring(1));
+
+          return primaryRest(expr);
         }
-
+      }
     }
 
+    if (lexer.token() == Token.LPAREN && expr instanceof SQLIdentifierExpr) {
+      SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
+      String ident = identExpr.getName();
 
-    public final SQLExpr primaryRest(SQLExpr expr) {
-        if (expr == null) {
-            throw new IllegalArgumentException("Illegal expression: NULL");
-        }
+      if ("EXTRACT".equalsIgnoreCase(ident)) {
+        lexer.nextToken();
 
-        if (lexer.token() == Token.LITERAL_CHARS) {
-            if (expr instanceof SQLIdentifierExpr) {
-                SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
-                String ident = identExpr.getName();
-
-                if (ident.equalsIgnoreCase("x")) {
-                    String charValue = lexer.stringVal();
-                    lexer.nextToken();
-                    expr = new SQLHexExpr(charValue);
-
-                    return primaryRest(expr);
-                } else if (ident.equalsIgnoreCase("b")) {
-                    String charValue = lexer.stringVal();
-                    lexer.nextToken();
-                    expr = new SQLBinaryExpr(charValue);
-
-                    return primaryRest(expr);
-                } else if (ident.startsWith("_")) {
-                    String charValue = lexer.stringVal();
-                    lexer.nextToken();
-
-                    MySqlCharExpr mysqlCharExpr = new MySqlCharExpr(charValue);
-                    mysqlCharExpr.setCharset(identExpr.getName());
-                    if (identifierEquals("COLLATE")) {
-                        lexer.nextToken();
-
-                        String collate = lexer.stringVal();
-                        mysqlCharExpr.setCollate(collate);
-                        accept(Token.IDENTIFIER);
-                    }
-
-                    expr = mysqlCharExpr;
-
-                    return primaryRest(expr);
-                }
-            } else if (expr instanceof SQLCharExpr) {
-                SQLMethodInvokeExpr concat = new SQLMethodInvokeExpr("CONCAT");
-                concat.addParameter(expr);
-                do {
-                    String chars = lexer.stringVal();
-                    concat.addParameter(new SQLCharExpr(chars));
-                    lexer.nextToken();
-                } while (lexer.token() == Token.LITERAL_CHARS || lexer.token() == Token.LITERAL_ALIAS);
-                expr = concat;
-            }
-        } else if (lexer.token() == Token.IDENTIFIER) {
-            if (expr instanceof SQLHexExpr) {
-                if ("USING".equalsIgnoreCase(lexer.stringVal())) {
-                    lexer.nextToken();
-                    if (lexer.token() != Token.IDENTIFIER) {
-                        throw new ParserException("Syntax error: " + lexer.token());
-                    }
-                    String charSet = lexer.stringVal();
-                    lexer.nextToken();
-                    expr.getAttributes().put("USING", charSet);
-
-                    return primaryRest(expr);
-                }
-            } else if ("COLLATE".equalsIgnoreCase(lexer.stringVal())) {
-                lexer.nextToken();
-
-                if (lexer.token() == Token.EQ) {
-                    lexer.nextToken();
-                }
-
-                if (lexer.token() != Token.IDENTIFIER) {
-                    throw new ParserException("Syntax error: " + lexer.token());
-                }
-
-                String collate = lexer.stringVal();
-                lexer.nextToken();
-
-                expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.COLLATE,
-                        new SQLIdentifierExpr(collate), JdbcConstants.MYSQL);
-
-                return primaryRest(expr);
-            } else if (expr instanceof SQLVariantRefExpr) {
-                if ("COLLATE".equalsIgnoreCase(lexer.stringVal())) {
-                    lexer.nextToken();
-
-                    if (lexer.token() != Token.IDENTIFIER) {
-                        throw new ParserException("Syntax error: " + lexer.token());
-                    }
-
-                    String collate = lexer.stringVal();
-                    lexer.nextToken();
-
-                    expr.putAttribute("COLLATE", collate);
-
-                    return primaryRest(expr);
-                }
-            } else if (expr instanceof SQLIntegerExpr) {
-                SQLIntegerExpr intExpr = (SQLIntegerExpr) expr;
-                String binaryString = lexer.stringVal();
-                if (intExpr.getNumber().intValue() == 0 && binaryString.startsWith("b")) {
-                    lexer.nextToken();
-                    expr = new SQLBinaryExpr(binaryString.substring(1));
-
-                    return primaryRest(expr);
-                }
-            }
+        if (lexer.token() != Token.IDENTIFIER) {
+          throw new ParserException("Syntax error: " + lexer.token());
         }
 
-        if (lexer.token() == Token.LPAREN && expr instanceof SQLIdentifierExpr) {
-            SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
-            String ident = identExpr.getName();
-
-            if ("EXTRACT".equalsIgnoreCase(ident)) {
-                lexer.nextToken();
-
-                if (lexer.token() != Token.IDENTIFIER) {
-                    throw new ParserException("Syntax error: " + lexer.token());
-                }
-
-                String unitVal = lexer.stringVal();
-                MySqlIntervalUnit unit = MySqlIntervalUnit.valueOf(unitVal.toUpperCase());
-                lexer.nextToken();
-
-                accept(Token.FROM);
-
-                SQLExpr value = expr();
-
-                MySqlExtractExpr extract = new MySqlExtractExpr();
-                extract.setValue(value);
-                extract.setUnit(unit);
-                accept(Token.RPAREN);
-
-                expr = extract;
-
-                return primaryRest(expr);
-            } else if ("SUBSTRING".equalsIgnoreCase(ident)) {
-                lexer.nextToken();
-                SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(ident);
-                for (; ; ) {
-                    SQLExpr param = expr();
-                    methodInvokeExpr.addParameter(param);
-
-                    if (lexer.token() == Token.COMMA) {
-                        lexer.nextToken();
-                        continue;
-                    } else if (lexer.token() == Token.FROM) {
-                        lexer.nextToken();
-                        SQLExpr from = expr();
-                        methodInvokeExpr.addParameter(from);
-
-                        if (lexer.token() == Token.FOR) {
-                            lexer.nextToken();
-                            SQLExpr forExpr = expr();
-                            methodInvokeExpr.addParameter(forExpr);
-                        }
-                        break;
-                    } else if (lexer.token() == Token.RPAREN) {
-                        break;
-                    } else {
-                        throw new ParserException("Syntax error: " + lexer.token());
-                    }
-                }
-
-                accept(Token.RPAREN);
-                expr = methodInvokeExpr;
-
-                return primaryRest(expr);
-            } else if ("TRIM".equalsIgnoreCase(ident)) {
-                lexer.nextToken();
-                SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(ident);
-
-                if (lexer.token() == Token.IDENTIFIER) {
-                    String flagVal = lexer.stringVal();
-                    if ("LEADING".equalsIgnoreCase(flagVal)) {
-                        lexer.nextToken();
-                        methodInvokeExpr.getAttributes().put("TRIM_TYPE", "LEADING");
-                    } else if ("BOTH".equalsIgnoreCase(flagVal)) {
-                        lexer.nextToken();
-                        methodInvokeExpr.getAttributes().put("TRIM_TYPE", "BOTH");
-                    } else if ("TRAILING".equalsIgnoreCase(flagVal)) {
-                        lexer.nextToken();
-                        methodInvokeExpr.putAttribute("TRIM_TYPE", "TRAILING");
-                    }
-                }
-
-                SQLExpr param = expr();
-                methodInvokeExpr.addParameter(param);
-
-                if (lexer.token() == Token.FROM) {
-                    lexer.nextToken();
-                    SQLExpr from = expr();
-                    methodInvokeExpr.putAttribute("FROM", from);
-                }
-
-                accept(Token.RPAREN);
-                expr = methodInvokeExpr;
-
-                return primaryRest(expr);
-            } else if ("MATCH".equalsIgnoreCase(ident)) {
-                lexer.nextToken();
-                MySqlMatchAgainstExpr matchAgainstExpr = new MySqlMatchAgainstExpr();
-
-                if (lexer.token() == Token.RPAREN) {
-                    lexer.nextToken();
-                } else {
-                    exprList(matchAgainstExpr.getColumns(), matchAgainstExpr);
-                    accept(Token.RPAREN);
-                }
-
-                acceptIdentifier("AGAINST");
-
-                accept(Token.LPAREN);
-                SQLExpr against = primary();
-                matchAgainstExpr.setAgainst(against);
-
-                if (lexer.token() == Token.IN) {
-                    lexer.nextToken();
-                    if (identifierEquals("NATURAL")) {
-                        lexer.nextToken();
-                        acceptIdentifier("LANGUAGE");
-                        acceptIdentifier("MODE");
-                        if (lexer.token() == Token.WITH) {
-                            lexer.nextToken();
-                            acceptIdentifier("QUERY");
-                            acceptIdentifier("EXPANSION");
-                            matchAgainstExpr.setSearchModifier(
-                                    MySqlMatchAgainstExpr.SearchModifier.IN_NATURAL_LANGUAGE_MODE_WITH_QUERY_EXPANSION);
-                        } else {
-                            matchAgainstExpr.setSearchModifier(
-                                    MySqlMatchAgainstExpr.SearchModifier.IN_NATURAL_LANGUAGE_MODE);
-                        }
-                    } else if (identifierEquals("BOOLEAN")) {
-                        lexer.nextToken();
-                        acceptIdentifier("MODE");
-                        matchAgainstExpr.setSearchModifier(MySqlMatchAgainstExpr.SearchModifier.IN_BOOLEAN_MODE);
-                    } else {
-                        throw new ParserException("Syntax error: " + lexer.token());
-                    }
-                } else if (lexer.token() == Token.WITH) {
-                    throw new ParserException("Syntax error: " + lexer.token());
-                }
-
-                accept(Token.RPAREN);
-
-                expr = matchAgainstExpr;
-
-                return primaryRest(expr);
-            } else if ("CONVERT".equalsIgnoreCase(ident)) {
-                lexer.nextToken();
-                SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(ident);
-
-                if (lexer.token() != Token.RPAREN) {
-                    exprList(methodInvokeExpr.getParameters(), methodInvokeExpr);
-                }
-
-                if (identifierEquals("USING")) {
-                    lexer.nextToken();
-                    if (lexer.token() != Token.IDENTIFIER) {
-                        throw new ParserException("Syntax error: " + lexer.token());
-                    }
-                    String charset = lexer.stringVal();
-                    lexer.nextToken();
-                    methodInvokeExpr.putAttribute("USING", charset);
-                }
-
-                accept(Token.RPAREN);
-
-                expr = methodInvokeExpr;
-
-                return primaryRest(expr);
-            } else if ("POSITION".equalsIgnoreCase(ident)) {
-                accept(Token.LPAREN);
-                SQLExpr subStr = this.primary();
-                accept(Token.IN);
-                SQLExpr str = this.expr();
-                accept(Token.RPAREN);
-
-                SQLMethodInvokeExpr locate = new SQLMethodInvokeExpr("LOCATE");
-                locate.addParameter(subStr);
-                locate.addParameter(str);
-
-                expr = locate;
-                return primaryRest(expr);
-            }
-        }
+        String unitVal = lexer.stringVal();
+        MySqlIntervalUnit unit = MySqlIntervalUnit.valueOf(unitVal.toUpperCase());
+        lexer.nextToken();
+
+        accept(Token.FROM);
+
+        SQLExpr value = expr();
+
+        MySqlExtractExpr extract = new MySqlExtractExpr();
+        extract.setValue(value);
+        extract.setUnit(unit);
+        accept(Token.RPAREN);
+
+        expr = extract;
+
+        return primaryRest(expr);
+      } else if ("SUBSTRING".equalsIgnoreCase(ident)) {
+        lexer.nextToken();
+        SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(ident);
+        for (; ; ) {
+          SQLExpr param = expr();
+          methodInvokeExpr.addParameter(param);
 
-        if (lexer.token() == Token.VARIANT && "@".equals(lexer.stringVal())) {
+          if (lexer.token() == Token.COMMA) {
             lexer.nextToken();
-            MySqlUserName userName = new MySqlUserName();
-            if (expr instanceof SQLCharExpr) {
-                userName.setUserName(((SQLCharExpr) expr).toString());
-            } else {
-                userName.setUserName(((SQLIdentifierExpr) expr).getName());
-            }
+            continue;
+          } else if (lexer.token() == Token.FROM) {
+            lexer.nextToken();
+            SQLExpr from = expr();
+            methodInvokeExpr.addParameter(from);
 
-            if (lexer.token() == Token.LITERAL_CHARS) {
-                userName.setHost("'" + lexer.stringVal() + "'");
-            } else {
-                userName.setHost(lexer.stringVal());
+            if (lexer.token() == Token.FOR) {
+              lexer.nextToken();
+              SQLExpr forExpr = expr();
+              methodInvokeExpr.addParameter(forExpr);
             }
-            lexer.nextToken();
-            return userName;
+            break;
+          } else if (lexer.token() == Token.RPAREN) {
+            break;
+          } else {
+            throw new ParserException("Syntax error: " + lexer.token());
+          }
         }
 
-        //
-        if (expr instanceof SQLMethodInvokeExpr && lexer.token() == Token.LBRACKET) {
+        accept(Token.RPAREN);
+        expr = methodInvokeExpr;
+
+        return primaryRest(expr);
+      } else if ("TRIM".equalsIgnoreCase(ident)) {
+        lexer.nextToken();
+        SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(ident);
+
+        if (lexer.token() == Token.IDENTIFIER) {
+          String flagVal = lexer.stringVal();
+          if ("LEADING".equalsIgnoreCase(flagVal)) {
+            lexer.nextToken();
+            methodInvokeExpr.getAttributes().put("TRIM_TYPE", "LEADING");
+          } else if ("BOTH".equalsIgnoreCase(flagVal)) {
+            lexer.nextToken();
+            methodInvokeExpr.getAttributes().put("TRIM_TYPE", "BOTH");
+          } else if ("TRAILING".equalsIgnoreCase(flagVal)) {
             lexer.nextToken();
-            expr = bracketRest(expr);
-            return primaryRest(expr);
+            methodInvokeExpr.putAttribute("TRIM_TYPE", "TRAILING");
+          }
         }
 
-        if (lexer.token() == Token.ERROR) {
-            throw new ParserException("Syntax error, token: " + lexer.token() + " " + lexer.stringVal() + ", pos: "
-                    + lexer.pos());
-        }
+        SQLExpr param = expr();
+        methodInvokeExpr.addParameter(param);
 
-        /**
-         * When the druid parser parses the quoted field in SELECT clause, e.g. SELECT `b`.`lastname` FROM bank AS `b`,
-         * "`b`" is recognized as an identifier expr, and the token is DOT, then the next identifier "`lastname`" would
-         * be recognized as the property name of "`b`". The parser creates a SQLPropertyExpr with owner of "`b`" and
-         * property name of "`lastname`".
-         *
-         * The following block of code prevents this specific case to generate SQLPropertyExpr, but corrects the parser
-         * to generate a SQLIdentifierExpr with expr = "`b`.`lastname`".
-         */
-        if (lexer.token() == Token.DOT && expr instanceof SQLIdentifierExpr) {
-            if (isQuoted(((SQLIdentifierExpr) expr).getName(), "`")) {
-                lexer.nextToken();
-                ((SQLIdentifierExpr) expr).setName(((SQLIdentifierExpr) expr).getName() + "." + lexer.stringVal());
-                lexer.nextToken();
-            }
+        if (lexer.token() == Token.FROM) {
+          lexer.nextToken();
+          SQLExpr from = expr();
+          methodInvokeExpr.putAttribute("FROM", from);
         }
 
-        return super.primaryRest(expr);
-    }
+        accept(Token.RPAREN);
+        expr = methodInvokeExpr;
 
-    protected SQLExpr bracketRest(SQLExpr expr) {
-        Number index;
+        return primaryRest(expr);
+      } else if ("MATCH".equalsIgnoreCase(ident)) {
+        lexer.nextToken();
+        MySqlMatchAgainstExpr matchAgainstExpr = new MySqlMatchAgainstExpr();
 
-        if (lexer.token() == Token.LITERAL_INT) {
-            index = lexer.integerValue();
-            lexer.nextToken();
+        if (lexer.token() == Token.RPAREN) {
+          lexer.nextToken();
         } else {
-            throw new ParserException("Syntax error : " + lexer.stringVal());
+          exprList(matchAgainstExpr.getColumns(), matchAgainstExpr);
+          accept(Token.RPAREN);
         }
 
-        if (expr instanceof SQLMethodInvokeExpr) {
-            SQLMethodInvokeExpr methodInvokeExpr = (SQLMethodInvokeExpr) expr;
-            methodInvokeExpr.getParameters().add(new SQLIntegerExpr(index));
+        acceptIdentifier("AGAINST");
+
+        accept(Token.LPAREN);
+        SQLExpr against = primary();
+        matchAgainstExpr.setAgainst(against);
+
+        if (lexer.token() == Token.IN) {
+          lexer.nextToken();
+          if (identifierEquals("NATURAL")) {
+            lexer.nextToken();
+            acceptIdentifier("LANGUAGE");
+            acceptIdentifier("MODE");
+            if (lexer.token() == Token.WITH) {
+              lexer.nextToken();
+              acceptIdentifier("QUERY");
+              acceptIdentifier("EXPANSION");
+              matchAgainstExpr.setSearchModifier(
+                  MySqlMatchAgainstExpr.SearchModifier
+                      .IN_NATURAL_LANGUAGE_MODE_WITH_QUERY_EXPANSION);
+            } else {
+              matchAgainstExpr.setSearchModifier(
+                  MySqlMatchAgainstExpr.SearchModifier.IN_NATURAL_LANGUAGE_MODE);
+            }
+          } else if (identifierEquals("BOOLEAN")) {
+            lexer.nextToken();
+            acceptIdentifier("MODE");
+            matchAgainstExpr.setSearchModifier(
+                MySqlMatchAgainstExpr.SearchModifier.IN_BOOLEAN_MODE);
+          } else {
+            throw new ParserException("Syntax error: " + lexer.token());
+          }
+        } else if (lexer.token() == Token.WITH) {
+          throw new ParserException("Syntax error: " + lexer.token());
         }
+
+        accept(Token.RPAREN);
+
+        expr = matchAgainstExpr;
+
+        return primaryRest(expr);
+      } else if ("CONVERT".equalsIgnoreCase(ident)) {
         lexer.nextToken();
-        expr = primaryRest(expr);
-        return expr;
-    }
+        SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(ident);
 
-    public SQLSelectParser createSelectParser() {
-        return new ElasticSqlSelectParser(this);
-    }
+        if (lexer.token() != Token.RPAREN) {
+          exprList(methodInvokeExpr.getParameters(), methodInvokeExpr);
+        }
 
-    protected SQLExpr parseInterval() {
-        accept(Token.INTERVAL);
+        if (identifierEquals("USING")) {
+          lexer.nextToken();
+          if (lexer.token() != Token.IDENTIFIER) {
+            throw new ParserException("Syntax error: " + lexer.token());
+          }
+          String charset = lexer.stringVal();
+          lexer.nextToken();
+          methodInvokeExpr.putAttribute("USING", charset);
+        }
 
-        if (lexer.token() == Token.LPAREN) {
-            lexer.nextToken();
+        accept(Token.RPAREN);
 
-            SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("INTERVAL");
-            if (lexer.token() != Token.RPAREN) {
-                exprList(methodInvokeExpr.getParameters(), methodInvokeExpr);
-            }
+        expr = methodInvokeExpr;
 
-            accept(Token.RPAREN);
+        return primaryRest(expr);
+      } else if ("POSITION".equalsIgnoreCase(ident)) {
+        accept(Token.LPAREN);
+        SQLExpr subStr = this.primary();
+        accept(Token.IN);
+        SQLExpr str = this.expr();
+        accept(Token.RPAREN);
 
-            return primaryRest(methodInvokeExpr);
-        } else {
-            SQLExpr value = expr();
+        SQLMethodInvokeExpr locate = new SQLMethodInvokeExpr("LOCATE");
+        locate.addParameter(subStr);
+        locate.addParameter(str);
 
-            if (lexer.token() != Token.IDENTIFIER) {
-                throw new ParserException("Syntax error: " + lexer.token());
-            }
+        expr = locate;
+        return primaryRest(expr);
+      }
+    }
 
-            String unit = lexer.stringVal();
-            lexer.nextToken();
+    if (lexer.token() == Token.VARIANT && "@".equals(lexer.stringVal())) {
+      lexer.nextToken();
+      MySqlUserName userName = new MySqlUserName();
+      if (expr instanceof SQLCharExpr) {
+        userName.setUserName(((SQLCharExpr) expr).toString());
+      } else {
+        userName.setUserName(((SQLIdentifierExpr) expr).getName());
+      }
+
+      if (lexer.token() == Token.LITERAL_CHARS) {
+        userName.setHost("'" + lexer.stringVal() + "'");
+      } else {
+        userName.setHost(lexer.stringVal());
+      }
+      lexer.nextToken();
+      return userName;
+    }
 
-            MySqlIntervalExpr intervalExpr = new MySqlIntervalExpr();
-            intervalExpr.setValue(value);
-            intervalExpr.setUnit(MySqlIntervalUnit.valueOf(unit.toUpperCase()));
+    //
+    if (expr instanceof SQLMethodInvokeExpr && lexer.token() == Token.LBRACKET) {
+      lexer.nextToken();
+      expr = bracketRest(expr);
+      return primaryRest(expr);
+    }
 
-            return intervalExpr;
-        }
+    if (lexer.token() == Token.ERROR) {
+      throw new ParserException(
+          "Syntax error, token: "
+              + lexer.token()
+              + " "
+              + lexer.stringVal()
+              + ", pos: "
+              + lexer.pos());
+    }
+
+    /**
+     * When the druid parser parses the quoted field in SELECT clause, e.g. SELECT `b`.`lastname`
+     * FROM bank AS `b`, "`b`" is recognized as an identifier expr, and the token is DOT, then the
+     * next identifier "`lastname`" would be recognized as the property name of "`b`". The parser
+     * creates a SQLPropertyExpr with owner of "`b`" and property name of "`lastname`".
+     *
+     * <p>The following block of code prevents this specific case to generate SQLPropertyExpr, but
+     * corrects the parser to generate a SQLIdentifierExpr with expr = "`b`.`lastname`".
+     */
+    if (lexer.token() == Token.DOT && expr instanceof SQLIdentifierExpr) {
+      if (isQuoted(((SQLIdentifierExpr) expr).getName(), "`")) {
+        lexer.nextToken();
+        ((SQLIdentifierExpr) expr)
+            .setName(((SQLIdentifierExpr) expr).getName() + "." + lexer.stringVal());
+        lexer.nextToken();
+      }
     }
 
-    public SQLColumnDefinition parseColumn() {
-        MySqlSQLColumnDefinition column = new MySqlSQLColumnDefinition();
-        column.setName(name());
-        column.setDataType(parseDataType());
+    return super.primaryRest(expr);
+  }
+
+  protected SQLExpr bracketRest(SQLExpr expr) {
+    Number index;
 
-        return parseColumnRest(column);
+    if (lexer.token() == Token.LITERAL_INT) {
+      index = lexer.integerValue();
+      lexer.nextToken();
+    } else {
+      throw new ParserException("Syntax error : " + lexer.stringVal());
     }
 
-    public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) {
-        if (lexer.token() == Token.ON) {
-            lexer.nextToken();
-            accept(Token.UPDATE);
-            SQLExpr expr = this.expr();
-            ((MySqlSQLColumnDefinition) column).setOnUpdate(expr);
-        }
+    if (expr instanceof SQLMethodInvokeExpr) {
+      SQLMethodInvokeExpr methodInvokeExpr = (SQLMethodInvokeExpr) expr;
+      methodInvokeExpr.getParameters().add(new SQLIntegerExpr(index));
+    }
+    lexer.nextToken();
+    expr = primaryRest(expr);
+    return expr;
+  }
 
-        if (identifierEquals("AUTO_INCREMENT")) {
-            lexer.nextToken();
-            if (column instanceof MySqlSQLColumnDefinition) {
-                ((MySqlSQLColumnDefinition) column).setAutoIncrement(true);
-            }
-            return parseColumnRest(column);
-        }
+  public SQLSelectParser createSelectParser() {
+    return new ElasticSqlSelectParser(this);
+  }
 
-        if (identifierEquals("precision") && column.getDataType().getName().equalsIgnoreCase("double")) {
-            lexer.nextToken();
-        }
+  protected SQLExpr parseInterval() {
+    accept(Token.INTERVAL);
 
-        if (identifierEquals("PARTITION")) {
-            throw new ParserException("syntax error " + lexer.token() + " " + lexer.stringVal());
-        }
+    if (lexer.token() == Token.LPAREN) {
+      lexer.nextToken();
 
-        if (identifierEquals("STORAGE")) {
-            lexer.nextToken();
-            SQLExpr expr = expr();
-            if (column instanceof MySqlSQLColumnDefinition) {
-                ((MySqlSQLColumnDefinition) column).setStorage(expr);
-            }
-        }
+      SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("INTERVAL");
+      if (lexer.token() != Token.RPAREN) {
+        exprList(methodInvokeExpr.getParameters(), methodInvokeExpr);
+      }
 
-        super.parseColumnRest(column);
+      accept(Token.RPAREN);
 
-        return column;
+      return primaryRest(methodInvokeExpr);
+    } else {
+      SQLExpr value = expr();
+
+      if (lexer.token() != Token.IDENTIFIER) {
+        throw new ParserException("Syntax error: " + lexer.token());
+      }
+
+      String unit = lexer.stringVal();
+      lexer.nextToken();
+
+      MySqlIntervalExpr intervalExpr = new MySqlIntervalExpr();
+      intervalExpr.setValue(value);
+      intervalExpr.setUnit(MySqlIntervalUnit.valueOf(unit.toUpperCase()));
+
+      return intervalExpr;
+    }
+  }
+
+  public SQLColumnDefinition parseColumn() {
+    MySqlSQLColumnDefinition column = new MySqlSQLColumnDefinition();
+    column.setName(name());
+    column.setDataType(parseDataType());
+
+    return parseColumnRest(column);
+  }
+
+  public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) {
+    if (lexer.token() == Token.ON) {
+      lexer.nextToken();
+      accept(Token.UPDATE);
+      SQLExpr expr = this.expr();
+      ((MySqlSQLColumnDefinition) column).setOnUpdate(expr);
     }
 
-    protected SQLDataType parseDataTypeRest(SQLDataType dataType) {
-        super.parseDataTypeRest(dataType);
+    if (identifierEquals("AUTO_INCREMENT")) {
+      lexer.nextToken();
+      if (column instanceof MySqlSQLColumnDefinition) {
+        ((MySqlSQLColumnDefinition) column).setAutoIncrement(true);
+      }
+      return parseColumnRest(column);
+    }
 
-        if (identifierEquals("UNSIGNED")) {
-            lexer.nextToken();
-            dataType.getAttributes().put("UNSIGNED", true);
-        }
+    if (identifierEquals("precision")
+        && column.getDataType().getName().equalsIgnoreCase("double")) {
+      lexer.nextToken();
+    }
 
-        if (identifierEquals("ZEROFILL")) {
-            lexer.nextToken();
-            dataType.getAttributes().put("ZEROFILL", true);
-        }
+    if (identifierEquals("PARTITION")) {
+      throw new ParserException("syntax error " + lexer.token() + " " + lexer.stringVal());
+    }
 
-        return dataType;
+    if (identifierEquals("STORAGE")) {
+      lexer.nextToken();
+      SQLExpr expr = expr();
+      if (column instanceof MySqlSQLColumnDefinition) {
+        ((MySqlSQLColumnDefinition) column).setStorage(expr);
+      }
     }
 
-    public SQLExpr orRest(SQLExpr expr) {
+    super.parseColumnRest(column);
 
-        for (; ; ) {
-            if (lexer.token() == Token.OR || lexer.token() == Token.BARBAR) {
-                lexer.nextToken();
-                SQLExpr rightExp = and();
+    return column;
+  }
 
-                expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanOr, rightExp, JdbcConstants.MYSQL);
-            } else if (lexer.token() == Token.XOR) {
-                lexer.nextToken();
-                SQLExpr rightExp = and();
+  protected SQLDataType parseDataTypeRest(SQLDataType dataType) {
+    super.parseDataTypeRest(dataType);
 
-                expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanXor, rightExp, JdbcConstants.MYSQL);
-            } else {
-                break;
-            }
-        }
+    if (identifierEquals("UNSIGNED")) {
+      lexer.nextToken();
+      dataType.getAttributes().put("UNSIGNED", true);
+    }
 
-        return expr;
+    if (identifierEquals("ZEROFILL")) {
+      lexer.nextToken();
+      dataType.getAttributes().put("ZEROFILL", true);
     }
 
-    public SQLExpr additiveRest(SQLExpr expr) {
-        if (lexer.token() == Token.PLUS) {
-            lexer.nextToken();
-            SQLExpr rightExp = multiplicative();
+    return dataType;
+  }
 
-            expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Add, rightExp, JdbcConstants.MYSQL);
-            expr = additiveRest(expr);
-        } else if (lexer.token() == Token.SUB) {
-            lexer.nextToken();
-            SQLExpr rightExp = multiplicative();
+  public SQLExpr orRest(SQLExpr expr) {
 
-            expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Subtract, rightExp, JdbcConstants.MYSQL);
-            expr = additiveRest(expr);
-        }
+    for (; ; ) {
+      if (lexer.token() == Token.OR || lexer.token() == Token.BARBAR) {
+        lexer.nextToken();
+        SQLExpr rightExp = and();
+
+        expr =
+            new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanOr, rightExp, JdbcConstants.MYSQL);
+      } else if (lexer.token() == Token.XOR) {
+        lexer.nextToken();
+        SQLExpr rightExp = and();
 
-        return expr;
+        expr =
+            new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanXor, rightExp, JdbcConstants.MYSQL);
+      } else {
+        break;
+      }
     }
 
-    public SQLAssignItem parseAssignItem() {
-        SQLAssignItem item = new SQLAssignItem();
+    return expr;
+  }
 
-        SQLExpr var = primary();
+  public SQLExpr additiveRest(SQLExpr expr) {
+    if (lexer.token() == Token.PLUS) {
+      lexer.nextToken();
+      SQLExpr rightExp = multiplicative();
 
-        String ident = null;
-        if (var instanceof SQLIdentifierExpr) {
-            ident = ((SQLIdentifierExpr) var).getName();
+      expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Add, rightExp, JdbcConstants.MYSQL);
+      expr = additiveRest(expr);
+    } else if (lexer.token() == Token.SUB) {
+      lexer.nextToken();
+      SQLExpr rightExp = multiplicative();
 
-            if ("GLOBAL".equalsIgnoreCase(ident)) {
-                ident = lexer.stringVal();
-                lexer.nextToken();
-                var = new SQLVariantRefExpr(ident, true);
-            } else if ("SESSION".equalsIgnoreCase(ident)) {
-                ident = lexer.stringVal();
-                lexer.nextToken();
-                var = new SQLVariantRefExpr(ident, false);
-            } else {
-                var = new SQLVariantRefExpr(ident);
-            }
-        }
+      expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Subtract, rightExp, JdbcConstants.MYSQL);
+      expr = additiveRest(expr);
+    }
 
-        if ("NAMES".equalsIgnoreCase(ident)) {
-            // skip
-        } else if ("CHARACTER".equalsIgnoreCase(ident)) {
-            var = new SQLIdentifierExpr("CHARACTER SET");
-            accept(Token.SET);
-            if (lexer.token() == Token.EQ) {
-                lexer.nextToken();
-            }
-        } else {
-            if (lexer.token() == Token.COLONEQ) {
-                lexer.nextToken();
-            } else {
-                accept(Token.EQ);
-            }
-        }
+    return expr;
+  }
+
+  public SQLAssignItem parseAssignItem() {
+    SQLAssignItem item = new SQLAssignItem();
 
-        item.setValue(this.expr());
+    SQLExpr var = primary();
 
-        item.setTarget(var);
-        return item;
+    String ident = null;
+    if (var instanceof SQLIdentifierExpr) {
+      ident = ((SQLIdentifierExpr) var).getName();
+
+      if ("GLOBAL".equalsIgnoreCase(ident)) {
+        ident = lexer.stringVal();
+        lexer.nextToken();
+        var = new SQLVariantRefExpr(ident, true);
+      } else if ("SESSION".equalsIgnoreCase(ident)) {
+        ident = lexer.stringVal();
+        lexer.nextToken();
+        var = new SQLVariantRefExpr(ident, false);
+      } else {
+        var = new SQLVariantRefExpr(ident);
+      }
     }
 
-    public SQLName nameRest(SQLName name) {
-        if (lexer.token() == Token.VARIANT && "@".equals(lexer.stringVal())) {
-            lexer.nextToken();
-            MySqlUserName userName = new MySqlUserName();
-            userName.setUserName(((SQLIdentifierExpr) name).getName());
+    if ("NAMES".equalsIgnoreCase(ident)) {
+      // skip
+    } else if ("CHARACTER".equalsIgnoreCase(ident)) {
+      var = new SQLIdentifierExpr("CHARACTER SET");
+      accept(Token.SET);
+      if (lexer.token() == Token.EQ) {
+        lexer.nextToken();
+      }
+    } else {
+      if (lexer.token() == Token.COLONEQ) {
+        lexer.nextToken();
+      } else {
+        accept(Token.EQ);
+      }
+    }
 
-            if (lexer.token() == Token.LITERAL_CHARS) {
-                userName.setHost("'" + lexer.stringVal() + "'");
-            } else {
-                userName.setHost(lexer.stringVal());
-            }
-            lexer.nextToken();
-            return userName;
-        }
-        return super.nameRest(name);
+    item.setValue(this.expr());
+
+    item.setTarget(var);
+    return item;
+  }
+
+  public SQLName nameRest(SQLName name) {
+    if (lexer.token() == Token.VARIANT && "@".equals(lexer.stringVal())) {
+      lexer.nextToken();
+      MySqlUserName userName = new MySqlUserName();
+      userName.setUserName(((SQLIdentifierExpr) name).getName());
+
+      if (lexer.token() == Token.LITERAL_CHARS) {
+        userName.setHost("'" + lexer.stringVal() + "'");
+      } else {
+        userName.setHost(lexer.stringVal());
+      }
+      lexer.nextToken();
+      return userName;
     }
+    return super.nameRest(name);
+  }
 
-    public MySqlSelectQueryBlock.Limit parseLimit() {
-        if (lexer.token() == Token.LIMIT) {
-            lexer.nextToken();
+  public MySqlSelectQueryBlock.Limit parseLimit() {
+    if (lexer.token() == Token.LIMIT) {
+      lexer.nextToken();
 
-            MySqlSelectQueryBlock.Limit limit = new MySqlSelectQueryBlock.Limit();
-
-            SQLExpr temp = this.expr();
-            if (lexer.token() == (Token.COMMA)) {
-                limit.setOffset(temp);
-                lexer.nextToken();
-                limit.setRowCount(this.expr());
-            } else if (identifierEquals("OFFSET")) {
-                limit.setRowCount(temp);
-                lexer.nextToken();
-                limit.setOffset(this.expr());
-            } else {
-                limit.setRowCount(temp);
-            }
-            return limit;
-        }
+      MySqlSelectQueryBlock.Limit limit = new MySqlSelectQueryBlock.Limit();
 
-        return null;
+      SQLExpr temp = this.expr();
+      if (lexer.token() == (Token.COMMA)) {
+        limit.setOffset(temp);
+        lexer.nextToken();
+        limit.setRowCount(this.expr());
+      } else if (identifierEquals("OFFSET")) {
+        limit.setRowCount(temp);
+        lexer.nextToken();
+        limit.setOffset(this.expr());
+      } else {
+        limit.setRowCount(temp);
+      }
+      return limit;
     }
 
-    @Override
-    public MySqlPrimaryKey parsePrimaryKey() {
-        accept(Token.PRIMARY);
-        accept(Token.KEY);
+    return null;
+  }
 
-        MySqlPrimaryKey primaryKey = new MySqlPrimaryKey();
+  @Override
+  public MySqlPrimaryKey parsePrimaryKey() {
+    accept(Token.PRIMARY);
+    accept(Token.KEY);
 
-        if (identifierEquals("USING")) {
-            lexer.nextToken();
-            primaryKey.setIndexType(lexer.stringVal());
-            lexer.nextToken();
-        }
+    MySqlPrimaryKey primaryKey = new MySqlPrimaryKey();
 
-        accept(Token.LPAREN);
-        for (; ; ) {
-            primaryKey.getColumns().add(this.expr());
-            if (!(lexer.token() == (Token.COMMA))) {
-                break;
-            } else {
-                lexer.nextToken();
-            }
-        }
-        accept(Token.RPAREN);
+    if (identifierEquals("USING")) {
+      lexer.nextToken();
+      primaryKey.setIndexType(lexer.stringVal());
+      lexer.nextToken();
+    }
 
-        return primaryKey;
+    accept(Token.LPAREN);
+    for (; ; ) {
+      primaryKey.getColumns().add(this.expr());
+      if (!(lexer.token() == (Token.COMMA))) {
+        break;
+      } else {
+        lexer.nextToken();
+      }
     }
+    accept(Token.RPAREN);
 
-    public MySqlUnique parseUnique() {
-        accept(Token.UNIQUE);
+    return primaryKey;
+  }
 
-        if (lexer.token() == Token.KEY) {
-            lexer.nextToken();
-        }
+  public MySqlUnique parseUnique() {
+    accept(Token.UNIQUE);
 
-        if (lexer.token() == Token.INDEX) {
-            lexer.nextToken();
-        }
+    if (lexer.token() == Token.KEY) {
+      lexer.nextToken();
+    }
 
-        MySqlUnique unique = new MySqlUnique();
+    if (lexer.token() == Token.INDEX) {
+      lexer.nextToken();
+    }
 
-        if (lexer.token() != Token.LPAREN) {
-            SQLName indexName = name();
-            unique.setIndexName(indexName);
-        }
+    MySqlUnique unique = new MySqlUnique();
 
-        accept(Token.LPAREN);
-        for (; ; ) {
-            unique.getColumns().add(this.expr());
-            if (!(lexer.token() == (Token.COMMA))) {
-                break;
-            } else {
-                lexer.nextToken();
-            }
-        }
-        accept(Token.RPAREN);
+    if (lexer.token() != Token.LPAREN) {
+      SQLName indexName = name();
+      unique.setIndexName(indexName);
+    }
 
-        if (identifierEquals("USING")) {
-            lexer.nextToken();
-            unique.setIndexType(lexer.stringVal());
-            lexer.nextToken();
-        }
+    accept(Token.LPAREN);
+    for (; ; ) {
+      unique.getColumns().add(this.expr());
+      if (!(lexer.token() == (Token.COMMA))) {
+        break;
+      } else {
+        lexer.nextToken();
+      }
+    }
+    accept(Token.RPAREN);
 
-        return unique;
+    if (identifierEquals("USING")) {
+      lexer.nextToken();
+      unique.setIndexType(lexer.stringVal());
+      lexer.nextToken();
     }
 
-    public MysqlForeignKey parseForeignKey() {
-        accept(Token.FOREIGN);
-        accept(Token.KEY);
+    return unique;
+  }
 
-        MysqlForeignKey fk = new MysqlForeignKey();
+  public MysqlForeignKey parseForeignKey() {
+    accept(Token.FOREIGN);
+    accept(Token.KEY);
 
-        if (lexer.token() != Token.LPAREN) {
-            SQLName indexName = name();
-            fk.setIndexName(indexName);
-        }
+    MysqlForeignKey fk = new MysqlForeignKey();
 
-        accept(Token.LPAREN);
-        this.names(fk.getReferencingColumns());
-        accept(Token.RPAREN);
+    if (lexer.token() != Token.LPAREN) {
+      SQLName indexName = name();
+      fk.setIndexName(indexName);
+    }
 
-        accept(Token.REFERENCES);
+    accept(Token.LPAREN);
+    this.names(fk.getReferencingColumns());
+    accept(Token.RPAREN);
 
-        fk.setReferencedTableName(this.name());
+    accept(Token.REFERENCES);
 
-        accept(Token.LPAREN);
-        this.names(fk.getReferencedColumns());
-        accept(Token.RPAREN);
+    fk.setReferencedTableName(this.name());
 
-        if (identifierEquals("MATCH")) {
-            if (identifierEquals("FULL")) {
-                fk.setReferenceMatch(MysqlForeignKey.Match.FULL);
-            } else if (identifierEquals("PARTIAL")) {
-                fk.setReferenceMatch(MysqlForeignKey.Match.PARTIAL);
-            } else if (identifierEquals("SIMPLE")) {
-                fk.setReferenceMatch(MysqlForeignKey.Match.SIMPLE);
-            }
-        }
+    accept(Token.LPAREN);
+    this.names(fk.getReferencedColumns());
+    accept(Token.RPAREN);
 
-        if (lexer.token() == Token.ON) {
-            lexer.nextToken();
-            if (lexer.token() == Token.DELETE) {
-                fk.setReferenceOn(MysqlForeignKey.On.DELETE);
-            } else if (lexer.token() == Token.UPDATE) {
-                fk.setReferenceOn(MysqlForeignKey.On.UPDATE);
-            } else {
-                throw new ParserException("Syntax error, expect DELETE or UPDATE, actual " + lexer.token() + " "
-                        + lexer.stringVal());
-            }
-            lexer.nextToken();
+    if (identifierEquals("MATCH")) {
+      if (identifierEquals("FULL")) {
+        fk.setReferenceMatch(MysqlForeignKey.Match.FULL);
+      } else if (identifierEquals("PARTIAL")) {
+        fk.setReferenceMatch(MysqlForeignKey.Match.PARTIAL);
+      } else if (identifierEquals("SIMPLE")) {
+        fk.setReferenceMatch(MysqlForeignKey.Match.SIMPLE);
+      }
+    }
 
-            if (lexer.token() == Token.RESTRICT) {
-                fk.setReferenceOption(MysqlForeignKey.Option.RESTRICT);
-            } else if (identifierEquals("CASCADE")) {
-                fk.setReferenceOption(MysqlForeignKey.Option.CASCADE);
-            } else if (lexer.token() == Token.SET) {
-                accept(Token.NULL);
-                fk.setReferenceOption(MysqlForeignKey.Option.SET_NULL);
-            } else if (identifierEquals("ON")) {
-                lexer.nextToken();
-                if (identifierEquals("ACTION")) {
-                    fk.setReferenceOption(MysqlForeignKey.Option.NO_ACTION);
-                } else {
-                    throw new ParserException("Syntax error, expect ACTION, actual " + lexer.token() + " "
-                            + lexer.stringVal());
-                }
-            }
-            lexer.nextToken();
+    if (lexer.token() == Token.ON) {
+      lexer.nextToken();
+      if (lexer.token() == Token.DELETE) {
+        fk.setReferenceOn(MysqlForeignKey.On.DELETE);
+      } else if (lexer.token() == Token.UPDATE) {
+        fk.setReferenceOn(MysqlForeignKey.On.UPDATE);
+      } else {
+        throw new ParserException(
+            "Syntax error, expect DELETE or UPDATE, actual "
+                + lexer.token()
+                + " "
+                + lexer.stringVal());
+      }
+      lexer.nextToken();
+
+      if (lexer.token() == Token.RESTRICT) {
+        fk.setReferenceOption(MysqlForeignKey.Option.RESTRICT);
+      } else if (identifierEquals("CASCADE")) {
+        fk.setReferenceOption(MysqlForeignKey.Option.CASCADE);
+      } else if (lexer.token() == Token.SET) {
+        accept(Token.NULL);
+        fk.setReferenceOption(MysqlForeignKey.Option.SET_NULL);
+      } else if (identifierEquals("ON")) {
+        lexer.nextToken();
+        if (identifierEquals("ACTION")) {
+          fk.setReferenceOption(MysqlForeignKey.Option.NO_ACTION);
+        } else {
+          throw new ParserException(
+              "Syntax error, expect ACTION, actual " + lexer.token() + " " + lexer.stringVal());
         }
-        return fk;
+      }
+      lexer.nextToken();
     }
+    return fk;
+  }
 
-    protected SQLAggregateExpr parseAggregateExprRest(SQLAggregateExpr aggregateExpr) {
-        if (lexer.token() == Token.ORDER) {
-            SQLOrderBy orderBy = this.parseOrderBy();
-            aggregateExpr.putAttribute("ORDER BY", orderBy);
-        }
-        if (identifierEquals("SEPARATOR")) {
-            lexer.nextToken();
+  protected SQLAggregateExpr parseAggregateExprRest(SQLAggregateExpr aggregateExpr) {
+    if (lexer.token() == Token.ORDER) {
+      SQLOrderBy orderBy = this.parseOrderBy();
+      aggregateExpr.putAttribute("ORDER BY", orderBy);
+    }
+    if (identifierEquals("SEPARATOR")) {
+      lexer.nextToken();
 
-            SQLExpr seperator = this.primary();
+      SQLExpr seperator = this.primary();
 
-            aggregateExpr.putAttribute("SEPARATOR", seperator);
-        }
-        return aggregateExpr;
+      aggregateExpr.putAttribute("SEPARATOR", seperator);
     }
+    return aggregateExpr;
+  }
 
-    public MySqlSelectGroupByExpr parseSelectGroupByItem() {
-        MySqlSelectGroupByExpr item = new MySqlSelectGroupByExpr();
-
-        item.setExpr(expr());
+  public MySqlSelectGroupByExpr parseSelectGroupByItem() {
+    MySqlSelectGroupByExpr item = new MySqlSelectGroupByExpr();
 
-        if (lexer.token() == Token.ASC) {
-            lexer.nextToken();
-            item.setType(SQLOrderingSpecification.ASC);
-        } else if (lexer.token() == Token.DESC) {
-            lexer.nextToken();
-            item.setType(SQLOrderingSpecification.DESC);
-        }
+    item.setExpr(expr());
 
-        return item;
+    if (lexer.token() == Token.ASC) {
+      lexer.nextToken();
+      item.setType(SQLOrderingSpecification.ASC);
+    } else if (lexer.token() == Token.DESC) {
+      lexer.nextToken();
+      item.setType(SQLOrderingSpecification.DESC);
     }
 
+    return item;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticSqlSelectParser.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticSqlSelectParser.java
index 2038aa54ef..c405d90878 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticSqlSelectParser.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticSqlSelectParser.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -29,313 +28,311 @@
 import com.alibaba.druid.sql.parser.Token;
 import org.opensearch.sql.legacy.exception.SqlFeatureNotImplementedException;
 
-/**
- * Created by allwefantasy on 8/19/16.
- */
+/** Created by allwefantasy on 8/19/16. */
 public class ElasticSqlSelectParser extends SQLSelectParser {
-    public ElasticSqlSelectParser(SQLExprParser exprParser) {
-        super(exprParser);
+  public ElasticSqlSelectParser(SQLExprParser exprParser) {
+    super(exprParser);
+  }
+
+  @Override
+  public SQLSelectQuery query() {
+    if (lexer.token() == (Token.LPAREN)) {
+      lexer.nextToken();
+
+      SQLSelectQuery select = query();
+      accept(Token.RPAREN);
+
+      return queryRest(select);
     }
 
-    @Override
-    public SQLSelectQuery query() {
-        if (lexer.token() == (Token.LPAREN)) {
-            lexer.nextToken();
+    MySqlSelectQueryBlock queryBlock = new MySqlSelectQueryBlock();
+
+    if (lexer.token() == Token.SELECT) {
+      lexer.nextToken();
+
+      if (lexer.token() == Token.HINT) {
+        this.exprParser.parseHints(queryBlock.getHints());
+      }
+
+      if (lexer.token() == Token.COMMENT) {
+        lexer.nextToken();
+      }
+
+      if (lexer.token() == (Token.DISTINCT)) {
+        queryBlock.setDistionOption(SQLSetQuantifier.DISTINCT);
+        lexer.nextToken();
+      } else if (identifierEquals("DISTINCTROW")) {
+        queryBlock.setDistionOption(SQLSetQuantifier.DISTINCTROW);
+        lexer.nextToken();
+      } else if (lexer.token() == (Token.ALL)) {
+        queryBlock.setDistionOption(SQLSetQuantifier.ALL);
+        lexer.nextToken();
+      }
+
+      if (identifierEquals("HIGH_PRIORITY")) {
+        queryBlock.setHignPriority(true);
+        lexer.nextToken();
+      }
+
+      if (identifierEquals("STRAIGHT_JOIN")) {
+        queryBlock.setStraightJoin(true);
+        lexer.nextToken();
+      }
+
+      if (identifierEquals("SQL_SMALL_RESULT")) {
+        queryBlock.setSmallResult(true);
+        lexer.nextToken();
+      }
+
+      if (identifierEquals("SQL_BIG_RESULT")) {
+        queryBlock.setBigResult(true);
+        lexer.nextToken();
+      }
+
+      if (identifierEquals("SQL_BUFFER_RESULT")) {
+        queryBlock.setBufferResult(true);
+        lexer.nextToken();
+      }
+
+      if (identifierEquals("SQL_CACHE")) {
+        queryBlock.setCache(true);
+        lexer.nextToken();
+      }
+
+      if (identifierEquals("SQL_NO_CACHE")) {
+        queryBlock.setCache(false);
+        lexer.nextToken();
+      }
+
+      if (identifierEquals("SQL_CALC_FOUND_ROWS")) {
+        queryBlock.setCalcFoundRows(true);
+        lexer.nextToken();
+      }
+
+      parseSelectList(queryBlock);
+
+      parseInto(queryBlock);
+    }
 
-            SQLSelectQuery select = query();
-            accept(Token.RPAREN);
+    parseFrom(queryBlock);
 
-            return queryRest(select);
-        }
+    parseWhere(queryBlock);
 
-        MySqlSelectQueryBlock queryBlock = new MySqlSelectQueryBlock();
+    parseGroupBy(queryBlock);
 
-        if (lexer.token() == Token.SELECT) {
-            lexer.nextToken();
+    queryBlock.setOrderBy(this.exprParser.parseOrderBy());
 
-            if (lexer.token() == Token.HINT) {
-                this.exprParser.parseHints(queryBlock.getHints());
-            }
-
-            if (lexer.token() == Token.COMMENT) {
-                lexer.nextToken();
-            }
-
-            if (lexer.token() == (Token.DISTINCT)) {
-                queryBlock.setDistionOption(SQLSetQuantifier.DISTINCT);
-                lexer.nextToken();
-            } else if (identifierEquals("DISTINCTROW")) {
-                queryBlock.setDistionOption(SQLSetQuantifier.DISTINCTROW);
-                lexer.nextToken();
-            } else if (lexer.token() == (Token.ALL)) {
-                queryBlock.setDistionOption(SQLSetQuantifier.ALL);
-                lexer.nextToken();
-            }
-
-            if (identifierEquals("HIGH_PRIORITY")) {
-                queryBlock.setHignPriority(true);
-                lexer.nextToken();
-            }
-
-            if (identifierEquals("STRAIGHT_JOIN")) {
-                queryBlock.setStraightJoin(true);
-                lexer.nextToken();
-            }
-
-            if (identifierEquals("SQL_SMALL_RESULT")) {
-                queryBlock.setSmallResult(true);
-                lexer.nextToken();
-            }
-
-            if (identifierEquals("SQL_BIG_RESULT")) {
-                queryBlock.setBigResult(true);
-                lexer.nextToken();
-            }
-
-            if (identifierEquals("SQL_BUFFER_RESULT")) {
-                queryBlock.setBufferResult(true);
-                lexer.nextToken();
-            }
-
-            if (identifierEquals("SQL_CACHE")) {
-                queryBlock.setCache(true);
-                lexer.nextToken();
-            }
-
-            if (identifierEquals("SQL_NO_CACHE")) {
-                queryBlock.setCache(false);
-                lexer.nextToken();
-            }
-
-            if (identifierEquals("SQL_CALC_FOUND_ROWS")) {
-                queryBlock.setCalcFoundRows(true);
-                lexer.nextToken();
-            }
-
-            parseSelectList(queryBlock);
-
-            parseInto(queryBlock);
-        }
+    if (lexer.token() == Token.LIMIT) {
+      queryBlock.setLimit(parseLimit());
+    }
 
-        parseFrom(queryBlock);
+    if (lexer.token() == Token.PROCEDURE) {
+      lexer.nextToken();
+      throw new SqlFeatureNotImplementedException("Unsupported feature: " + Token.PROCEDURE.name);
+    }
 
-        parseWhere(queryBlock);
+    parseInto(queryBlock);
 
-        parseGroupBy(queryBlock);
+    if (lexer.token() == Token.FOR) {
+      lexer.nextToken();
+      accept(Token.UPDATE);
 
-        queryBlock.setOrderBy(this.exprParser.parseOrderBy());
+      queryBlock.setForUpdate(true);
+    }
 
-        if (lexer.token() == Token.LIMIT) {
-            queryBlock.setLimit(parseLimit());
-        }
+    if (lexer.token() == Token.LOCK) {
+      lexer.nextToken();
+      accept(Token.IN);
+      acceptIdentifier("SHARE");
+      acceptIdentifier("MODE");
+      queryBlock.setLockInShareMode(true);
+    }
 
-        if (lexer.token() == Token.PROCEDURE) {
-            lexer.nextToken();
-            throw new SqlFeatureNotImplementedException("Unsupported feature: " + Token.PROCEDURE.name);
-        }
+    return queryRest(queryBlock);
+  }
+
+  protected void parseInto(SQLSelectQueryBlock queryBlock) {
+    if (lexer.token() == (Token.INTO)) {
+      lexer.nextToken();
+
+      if (identifierEquals("OUTFILE")) {
+        lexer.nextToken();
+
+        MySqlOutFileExpr outFile = new MySqlOutFileExpr();
+        outFile.setFile(expr());
+
+        queryBlock.setInto(outFile);
+
+        if (identifierEquals("FIELDS") || identifierEquals("COLUMNS")) {
+          lexer.nextToken();
 
-        parseInto(queryBlock);
+          if (identifierEquals("TERMINATED")) {
+            lexer.nextToken();
+            accept(Token.BY);
+          }
+          outFile.setColumnsTerminatedBy((SQLLiteralExpr) expr());
 
-        if (lexer.token() == Token.FOR) {
+          if (identifierEquals("OPTIONALLY")) {
             lexer.nextToken();
-            accept(Token.UPDATE);
+            outFile.setColumnsEnclosedOptionally(true);
+          }
 
-            queryBlock.setForUpdate(true);
-        }
+          if (identifierEquals("ENCLOSED")) {
+            lexer.nextToken();
+            accept(Token.BY);
+            outFile.setColumnsEnclosedBy((SQLLiteralExpr) expr());
+          }
 
-        if (lexer.token() == Token.LOCK) {
+          if (identifierEquals("ESCAPED")) {
             lexer.nextToken();
-            accept(Token.IN);
-            acceptIdentifier("SHARE");
-            acceptIdentifier("MODE");
-            queryBlock.setLockInShareMode(true);
+            accept(Token.BY);
+            outFile.setColumnsEscaped((SQLLiteralExpr) expr());
+          }
         }
 
-        return queryRest(queryBlock);
-    }
+        if (identifierEquals("LINES")) {
+          lexer.nextToken();
 
-    protected void parseInto(SQLSelectQueryBlock queryBlock) {
-        if (lexer.token() == (Token.INTO)) {
+          if (identifierEquals("STARTING")) {
             lexer.nextToken();
-
-            if (identifierEquals("OUTFILE")) {
-                lexer.nextToken();
-
-                MySqlOutFileExpr outFile = new MySqlOutFileExpr();
-                outFile.setFile(expr());
-
-                queryBlock.setInto(outFile);
-
-                if (identifierEquals("FIELDS") || identifierEquals("COLUMNS")) {
-                    lexer.nextToken();
-
-                    if (identifierEquals("TERMINATED")) {
-                        lexer.nextToken();
-                        accept(Token.BY);
-                    }
-                    outFile.setColumnsTerminatedBy((SQLLiteralExpr) expr());
-
-                    if (identifierEquals("OPTIONALLY")) {
-                        lexer.nextToken();
-                        outFile.setColumnsEnclosedOptionally(true);
-                    }
-
-                    if (identifierEquals("ENCLOSED")) {
-                        lexer.nextToken();
-                        accept(Token.BY);
-                        outFile.setColumnsEnclosedBy((SQLLiteralExpr) expr());
-                    }
-
-                    if (identifierEquals("ESCAPED")) {
-                        lexer.nextToken();
-                        accept(Token.BY);
-                        outFile.setColumnsEscaped((SQLLiteralExpr) expr());
-                    }
-                }
-
-                if (identifierEquals("LINES")) {
-                    lexer.nextToken();
-
-                    if (identifierEquals("STARTING")) {
-                        lexer.nextToken();
-                        accept(Token.BY);
-                        outFile.setLinesStartingBy((SQLLiteralExpr) expr());
-                    } else {
-                        identifierEquals("TERMINATED");
-                        lexer.nextToken();
-                        accept(Token.BY);
-                        outFile.setLinesTerminatedBy((SQLLiteralExpr) expr());
-                    }
-                }
-            } else {
-                queryBlock.setInto(this.exprParser.name());
-            }
+            accept(Token.BY);
+            outFile.setLinesStartingBy((SQLLiteralExpr) expr());
+          } else {
+            identifierEquals("TERMINATED");
+            lexer.nextToken();
+            accept(Token.BY);
+            outFile.setLinesTerminatedBy((SQLLiteralExpr) expr());
+          }
         }
+      } else {
+        queryBlock.setInto(this.exprParser.name());
+      }
     }
+  }
 
-    protected void parseGroupBy(SQLSelectQueryBlock queryBlock) {
-        SQLSelectGroupByClause groupBy = null;
+  protected void parseGroupBy(SQLSelectQueryBlock queryBlock) {
+    SQLSelectGroupByClause groupBy = null;
 
-        if (lexer.token() == Token.GROUP) {
-            groupBy = new SQLSelectGroupByClause();
+    if (lexer.token() == Token.GROUP) {
+      groupBy = new SQLSelectGroupByClause();
 
-            lexer.nextToken();
-            accept(Token.BY);
+      lexer.nextToken();
+      accept(Token.BY);
 
-            while (true) {
-                groupBy.addItem(this.getExprParser().parseSelectGroupByItem());
-                if (!(lexer.token() == (Token.COMMA))) {
-                    break;
-                }
-                lexer.nextToken();
-            }
-
-            if (lexer.token() == Token.WITH) {
-                lexer.nextToken();
-                acceptIdentifier("ROLLUP");
-
-                MySqlSelectGroupBy mySqlGroupBy = new MySqlSelectGroupBy();
-                for (SQLExpr sqlExpr : groupBy.getItems()) {
-                    mySqlGroupBy.addItem(sqlExpr);
-                }
-                mySqlGroupBy.setRollUp(true);
-
-                groupBy = mySqlGroupBy;
-            }
+      while (true) {
+        groupBy.addItem(this.getExprParser().parseSelectGroupByItem());
+        if (!(lexer.token() == (Token.COMMA))) {
+          break;
         }
+        lexer.nextToken();
+      }
 
-        if (lexer.token() == Token.HAVING) {
-            lexer.nextToken();
+      if (lexer.token() == Token.WITH) {
+        lexer.nextToken();
+        acceptIdentifier("ROLLUP");
 
-            if (groupBy == null) {
-                groupBy = new SQLSelectGroupByClause();
-            }
-            groupBy.setHaving(this.exprParser.expr());
+        MySqlSelectGroupBy mySqlGroupBy = new MySqlSelectGroupBy();
+        for (SQLExpr sqlExpr : groupBy.getItems()) {
+          mySqlGroupBy.addItem(sqlExpr);
         }
+        mySqlGroupBy.setRollUp(true);
 
-        queryBlock.setGroupBy(groupBy);
+        groupBy = mySqlGroupBy;
+      }
     }
 
-    protected SQLTableSource parseTableSourceRest(SQLTableSource tableSource) {
-        if (identifierEquals("USING")) {
-            return tableSource;
-        }
+    if (lexer.token() == Token.HAVING) {
+      lexer.nextToken();
 
-        if (lexer.token() == Token.USE) {
-            lexer.nextToken();
-            MySqlUseIndexHint hint = new MySqlUseIndexHint();
-            parseIndexHint(hint);
-            tableSource.getHints().add(hint);
-        }
+      if (groupBy == null) {
+        groupBy = new SQLSelectGroupByClause();
+      }
+      groupBy.setHaving(this.exprParser.expr());
+    }
 
-        if (identifierEquals("IGNORE")) {
-            lexer.nextToken();
-            MySqlIgnoreIndexHint hint = new MySqlIgnoreIndexHint();
-            parseIndexHint(hint);
-            tableSource.getHints().add(hint);
-        }
+    queryBlock.setGroupBy(groupBy);
+  }
 
-        if (identifierEquals("FORCE")) {
-            lexer.nextToken();
-            MySqlForceIndexHint hint = new MySqlForceIndexHint();
-            parseIndexHint(hint);
-            tableSource.getHints().add(hint);
-        }
+  protected SQLTableSource parseTableSourceRest(SQLTableSource tableSource) {
+    if (identifierEquals("USING")) {
+      return tableSource;
+    }
 
-        return super.parseTableSourceRest(tableSource);
+    if (lexer.token() == Token.USE) {
+      lexer.nextToken();
+      MySqlUseIndexHint hint = new MySqlUseIndexHint();
+      parseIndexHint(hint);
+      tableSource.getHints().add(hint);
     }
 
-    private void parseIndexHint(MySqlIndexHintImpl hint) {
-        if (lexer.token() == Token.INDEX) {
-            lexer.nextToken();
-        } else {
-            accept(Token.KEY);
-        }
+    if (identifierEquals("IGNORE")) {
+      lexer.nextToken();
+      MySqlIgnoreIndexHint hint = new MySqlIgnoreIndexHint();
+      parseIndexHint(hint);
+      tableSource.getHints().add(hint);
+    }
 
-        if (lexer.token() == Token.FOR) {
-            lexer.nextToken();
+    if (identifierEquals("FORCE")) {
+      lexer.nextToken();
+      MySqlForceIndexHint hint = new MySqlForceIndexHint();
+      parseIndexHint(hint);
+      tableSource.getHints().add(hint);
+    }
 
-            if (lexer.token() == Token.JOIN) {
-                lexer.nextToken();
-                hint.setOption(MySqlIndexHint.Option.JOIN);
-            } else if (lexer.token() == Token.ORDER) {
-                lexer.nextToken();
-                accept(Token.BY);
-                hint.setOption(MySqlIndexHint.Option.ORDER_BY);
-            } else {
-                accept(Token.GROUP);
-                accept(Token.BY);
-                hint.setOption(MySqlIndexHint.Option.GROUP_BY);
-            }
-        }
+    return super.parseTableSourceRest(tableSource);
+  }
 
-        accept(Token.LPAREN);
-        if (lexer.token() == Token.PRIMARY) {
-            lexer.nextToken();
-            hint.getIndexList().add(new SQLIdentifierExpr("PRIMARY"));
-        } else {
-            this.exprParser.names(hint.getIndexList());
-        }
-        accept(Token.RPAREN);
+  private void parseIndexHint(MySqlIndexHintImpl hint) {
+    if (lexer.token() == Token.INDEX) {
+      lexer.nextToken();
+    } else {
+      accept(Token.KEY);
     }
 
-    protected MySqlUnionQuery createSQLUnionQuery() {
-        return new MySqlUnionQuery();
+    if (lexer.token() == Token.FOR) {
+      lexer.nextToken();
+
+      if (lexer.token() == Token.JOIN) {
+        lexer.nextToken();
+        hint.setOption(MySqlIndexHint.Option.JOIN);
+      } else if (lexer.token() == Token.ORDER) {
+        lexer.nextToken();
+        accept(Token.BY);
+        hint.setOption(MySqlIndexHint.Option.ORDER_BY);
+      } else {
+        accept(Token.GROUP);
+        accept(Token.BY);
+        hint.setOption(MySqlIndexHint.Option.GROUP_BY);
+      }
     }
 
-    public SQLUnionQuery unionRest(SQLUnionQuery union) {
-        if (lexer.token() == Token.LIMIT) {
-            MySqlUnionQuery mysqlUnionQuery = (MySqlUnionQuery) union;
-            mysqlUnionQuery.setLimit(parseLimit());
-        }
-        return super.unionRest(union);
+    accept(Token.LPAREN);
+    if (lexer.token() == Token.PRIMARY) {
+      lexer.nextToken();
+      hint.getIndexList().add(new SQLIdentifierExpr("PRIMARY"));
+    } else {
+      this.exprParser.names(hint.getIndexList());
     }
+    accept(Token.RPAREN);
+  }
 
-    public MySqlSelectQueryBlock.Limit parseLimit() {
-        return ((ElasticSqlExprParser) this.exprParser).parseLimit();
-    }
+  protected MySqlUnionQuery createSQLUnionQuery() {
+    return new MySqlUnionQuery();
+  }
 
-    public ElasticSqlExprParser getExprParser() {
-        return (ElasticSqlExprParser) exprParser;
+  public SQLUnionQuery unionRest(SQLUnionQuery union) {
+    if (lexer.token() == Token.LIMIT) {
+      MySqlUnionQuery mysqlUnionQuery = (MySqlUnionQuery) union;
+      mysqlUnionQuery.setLimit(parseLimit());
     }
+    return super.unionRest(union);
+  }
+
+  public MySqlSelectQueryBlock.Limit parseLimit() {
+    return ((ElasticSqlExprParser) this.exprParser).parseLimit();
+  }
+
+  public ElasticSqlExprParser getExprParser() {
+    return (ElasticSqlExprParser) exprParser;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/FieldMaker.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/FieldMaker.java
index 0f5a2af631..da08f81453 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/FieldMaker.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/FieldMaker.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -41,369 +40,396 @@
 import org.opensearch.sql.legacy.utils.Util;
 
 /**
- * 一些具有参数的一般在 select 函数.或者group by 函数
- *
  * @author ansj
  */
 public class FieldMaker {
-    private SQLFunctions sqlFunctions = new SQLFunctions();
-
-    public Field makeField(SQLExpr expr, String alias, String tableAlias) throws SqlParseException {
-        Field field = makeFieldImpl(expr, alias, tableAlias);
-        addGroupByForDistinctFieldsInSelect(expr, field);
+  private SQLFunctions sqlFunctions = new SQLFunctions();
 
-        // why we may get null as a field???
-        if (field != null) {
-            field.setExpression(expr);
-        }
+  public Field makeField(SQLExpr expr, String alias, String tableAlias) throws SqlParseException {
+    Field field = makeFieldImpl(expr, alias, tableAlias);
+    addGroupByForDistinctFieldsInSelect(expr, field);
 
-        return field;
+    // why we may get null as a field???
+    if (field != null) {
+      field.setExpression(expr);
     }
 
-    private Field makeFieldImpl(SQLExpr expr, String alias, String tableAlias) throws SqlParseException {
-        if (expr instanceof SQLIdentifierExpr || expr instanceof SQLPropertyExpr || expr instanceof SQLVariantRefExpr) {
-            return handleIdentifier(expr, alias, tableAlias);
-        } else if (expr instanceof SQLQueryExpr) {
-            throw new SqlParseException("unknown field name : " + expr);
-        } else if (expr instanceof SQLBinaryOpExpr) {
-            //make a SCRIPT method field;
-            return makeFieldImpl(makeBinaryMethodField((SQLBinaryOpExpr) expr, alias, true), alias, tableAlias);
-        } else if (expr instanceof SQLAllColumnExpr) {
-            return Field.STAR;
-        } else if (expr instanceof SQLMethodInvokeExpr) {
-            SQLMethodInvokeExpr mExpr = (SQLMethodInvokeExpr) expr;
-
-            String methodName = mExpr.getMethodName();
-
-            if (methodName.equalsIgnoreCase("nested") || methodName.equalsIgnoreCase("reverse_nested")) {
-                NestedType nestedType = new NestedType();
-                if (nestedType.tryFillFromExpr(mExpr)) {
-                    return handleIdentifier(nestedType, alias, tableAlias);
-                }
-            } else if (methodName.equalsIgnoreCase("children")) {
-                ChildrenType childrenType = new ChildrenType();
-                if (childrenType.tryFillFromExpr(mExpr)) {
-                    return handleIdentifier(childrenType, alias, tableAlias);
-                }
-            } else if (methodName.equalsIgnoreCase("filter")) {
-                return makeFilterMethodField(mExpr, alias);
-            }
-
-            if ((SQLFunctions.builtInFunctions.contains(methodName.toLowerCase())) && Strings.isNullOrEmpty(alias)) {
-                alias = mExpr.toString();
-            }
-            return makeMethodField(methodName, mExpr.getParameters(), null, alias, tableAlias, true);
-        } else if (expr instanceof SQLAggregateExpr) {
-            SQLAggregateExpr sExpr = (SQLAggregateExpr) expr;
-            return makeMethodField(sExpr.getMethodName(), sExpr.getArguments(), sExpr.getOption(),
-                    alias, tableAlias, true);
-        } else if (expr instanceof SQLCaseExpr) {
-            String scriptCode = new CaseWhenParser((SQLCaseExpr) expr, alias, tableAlias).parse();
-            List<KVValue> methodParameters = new ArrayList<>();
-            methodParameters.add(new KVValue(alias));
-            methodParameters.add(new KVValue(scriptCode));
-            return new MethodField("script", methodParameters, null, alias);
-        } else if (expr instanceof SQLCastExpr) {
-            SQLCastExpr castExpr = (SQLCastExpr) expr;
-            if (alias == null) {
-                alias = "cast_" + castExpr.getExpr().toString();
-            }
-            ArrayList<SQLExpr> methodParameters = new ArrayList<>();
-            methodParameters.add(((SQLCastExpr) expr).getExpr());
-            return makeMethodField("CAST", methodParameters, null, alias, tableAlias, true);
-        } else if (expr instanceof SQLNumericLiteralExpr) {
-            SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("assign", null);
-            methodInvokeExpr.addParameter(expr);
-            return makeMethodField(methodInvokeExpr.getMethodName(), methodInvokeExpr.getParameters(),
-                    null, alias, tableAlias, true);
-        } else {
-            throw new SqlParseException("unknown field name : " + expr);
+    return field;
+  }
+
+  private Field makeFieldImpl(SQLExpr expr, String alias, String tableAlias)
+      throws SqlParseException {
+    if (expr instanceof SQLIdentifierExpr
+        || expr instanceof SQLPropertyExpr
+        || expr instanceof SQLVariantRefExpr) {
+      return handleIdentifier(expr, alias, tableAlias);
+    } else if (expr instanceof SQLQueryExpr) {
+      throw new SqlParseException("unknown field name : " + expr);
+    } else if (expr instanceof SQLBinaryOpExpr) {
+      // make a SCRIPT method field;
+      return makeFieldImpl(
+          makeBinaryMethodField((SQLBinaryOpExpr) expr, alias, true), alias, tableAlias);
+    } else if (expr instanceof SQLAllColumnExpr) {
+      return Field.STAR;
+    } else if (expr instanceof SQLMethodInvokeExpr) {
+      SQLMethodInvokeExpr mExpr = (SQLMethodInvokeExpr) expr;
+
+      String methodName = mExpr.getMethodName();
+
+      if (methodName.equalsIgnoreCase("nested") || methodName.equalsIgnoreCase("reverse_nested")) {
+        NestedType nestedType = new NestedType();
+        if (nestedType.tryFillFromExpr(mExpr)) {
+          return handleIdentifier(nestedType, alias, tableAlias);
         }
-    }
-
-    private void addGroupByForDistinctFieldsInSelect(SQLExpr expr, Field field) {
-        if (expr.getParent() != null && expr.getParent() instanceof SQLSelectItem
-                && expr.getParent().getParent() != null
-                && expr.getParent().getParent() instanceof SQLSelectQueryBlock) {
-            SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) expr.getParent().getParent();
-            if (queryBlock.getDistionOption() == SQLSetQuantifier.DISTINCT) {
-                SQLAggregateOption option = SQLAggregateOption.DISTINCT;
-                field.setAggregationOption(option);
-                if (queryBlock.getGroupBy() == null) {
-                    queryBlock.setGroupBy(new SQLSelectGroupByClause());
-                }
-                SQLSelectGroupByClause groupByClause = queryBlock.getGroupBy();
-                groupByClause.addItem(expr);
-                queryBlock.setGroupBy(groupByClause);
-            }
+      } else if (methodName.equalsIgnoreCase("children")) {
+        ChildrenType childrenType = new ChildrenType();
+        if (childrenType.tryFillFromExpr(mExpr)) {
+          return handleIdentifier(childrenType, alias, tableAlias);
         }
+      } else if (methodName.equalsIgnoreCase("filter")) {
+        return makeFilterMethodField(mExpr, alias);
+      }
+
+      if ((SQLFunctions.builtInFunctions.contains(methodName.toLowerCase()))
+          && Strings.isNullOrEmpty(alias)) {
+        alias = mExpr.toString();
+      }
+      return makeMethodField(methodName, mExpr.getParameters(), null, alias, tableAlias, true);
+    } else if (expr instanceof SQLAggregateExpr) {
+      SQLAggregateExpr sExpr = (SQLAggregateExpr) expr;
+      return makeMethodField(
+          sExpr.getMethodName(), sExpr.getArguments(), sExpr.getOption(), alias, tableAlias, true);
+    } else if (expr instanceof SQLCaseExpr) {
+      String scriptCode = new CaseWhenParser((SQLCaseExpr) expr, alias, tableAlias).parse();
+      List<KVValue> methodParameters = new ArrayList<>();
+      methodParameters.add(new KVValue(alias));
+      methodParameters.add(new KVValue(scriptCode));
+      return new MethodField("script", methodParameters, null, alias);
+    } else if (expr instanceof SQLCastExpr) {
+      SQLCastExpr castExpr = (SQLCastExpr) expr;
+      if (alias == null) {
+        alias = "cast_" + castExpr.getExpr().toString();
+      }
+      ArrayList<SQLExpr> methodParameters = new ArrayList<>();
+      methodParameters.add(((SQLCastExpr) expr).getExpr());
+      return makeMethodField("CAST", methodParameters, null, alias, tableAlias, true);
+    } else if (expr instanceof SQLNumericLiteralExpr) {
+      SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("assign", null);
+      methodInvokeExpr.addParameter(expr);
+      return makeMethodField(
+          methodInvokeExpr.getMethodName(),
+          methodInvokeExpr.getParameters(),
+          null,
+          alias,
+          tableAlias,
+          true);
+    } else {
+      throw new SqlParseException("unknown field name : " + expr);
     }
-
-    private static Object getScriptValue(SQLExpr expr) throws SqlParseException {
-        return Util.getScriptValue(expr);
-    }
-
-    private Field makeScriptMethodField(SQLBinaryOpExpr binaryExpr, String alias, String tableAlias)
-            throws SqlParseException {
-        List<SQLExpr> params = new ArrayList<>();
-
-        String scriptFieldAlias;
-        if (alias == null || alias.equals("")) {
-            scriptFieldAlias = binaryExpr.toString();
-        } else {
-            scriptFieldAlias = alias;
+  }
+
+  private void addGroupByForDistinctFieldsInSelect(SQLExpr expr, Field field) {
+    if (expr.getParent() != null
+        && expr.getParent() instanceof SQLSelectItem
+        && expr.getParent().getParent() != null
+        && expr.getParent().getParent() instanceof SQLSelectQueryBlock) {
+      SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) expr.getParent().getParent();
+      if (queryBlock.getDistionOption() == SQLSetQuantifier.DISTINCT) {
+        SQLAggregateOption option = SQLAggregateOption.DISTINCT;
+        field.setAggregationOption(option);
+        if (queryBlock.getGroupBy() == null) {
+          queryBlock.setGroupBy(new SQLSelectGroupByClause());
         }
-        params.add(new SQLCharExpr(scriptFieldAlias));
+        SQLSelectGroupByClause groupByClause = queryBlock.getGroupBy();
+        groupByClause.addItem(expr);
+        queryBlock.setGroupBy(groupByClause);
+      }
+    }
+  }
 
-        Object left = getScriptValue(binaryExpr.getLeft());
-        Object right = getScriptValue(binaryExpr.getRight());
-        String script = String.format("%s %s %s", left, binaryExpr.getOperator().getName(), right);
+  private static Object getScriptValue(SQLExpr expr) throws SqlParseException {
+    return Util.getScriptValue(expr);
+  }
 
-        params.add(new SQLCharExpr(script));
+  private Field makeScriptMethodField(SQLBinaryOpExpr binaryExpr, String alias, String tableAlias)
+      throws SqlParseException {
+    List<SQLExpr> params = new ArrayList<>();
 
-        return makeMethodField("script", params, null, null, tableAlias, false);
+    String scriptFieldAlias;
+    if (alias == null || alias.equals("")) {
+      scriptFieldAlias = binaryExpr.toString();
+    } else {
+      scriptFieldAlias = alias;
     }
+    params.add(new SQLCharExpr(scriptFieldAlias));
 
+    Object left = getScriptValue(binaryExpr.getLeft());
+    Object right = getScriptValue(binaryExpr.getRight());
+    String script = String.format("%s %s %s", left, binaryExpr.getOperator().getName(), right);
 
-    private static Field makeFilterMethodField(SQLMethodInvokeExpr filterMethod, String alias)
-            throws SqlParseException {
-        List<SQLExpr> parameters = filterMethod.getParameters();
-        int parametersSize = parameters.size();
-        if (parametersSize != 1 && parametersSize != 2) {
-            throw new SqlParseException("filter group by field should only have one or 2 parameters"
-                    + " filter(Expr) or filter(name,Expr)");
-        }
-        String filterAlias = filterMethod.getMethodName();
-        SQLExpr exprToCheck = null;
-        if (parametersSize == 1) {
-            exprToCheck = parameters.get(0);
-            filterAlias = "filter(" + exprToCheck.toString().replaceAll("\n", " ") + ")";
-        }
-        if (parametersSize == 2) {
-            filterAlias = Util.extendedToString(parameters.get(0));
-            exprToCheck = parameters.get(1);
-        }
-        Where where = Where.newInstance();
-        new WhereParser(new SqlParser()).parseWhere(exprToCheck, where);
-        if (where.getWheres().size() == 0) {
-            throw new SqlParseException("Failed to parse filter condition");
-        }
-        List<KVValue> methodParameters = new ArrayList<>();
-        methodParameters.add(new KVValue("where", where));
-        methodParameters.add(new KVValue("alias", filterAlias + "@FILTER"));
-        return new MethodField("filter", methodParameters, null, alias);
-    }
+    params.add(new SQLCharExpr(script));
 
+    return makeMethodField("script", params, null, null, tableAlias, false);
+  }
 
-    private static Field handleIdentifier(NestedType nestedType, String alias, String tableAlias) {
-        Field field = handleIdentifier(new SQLIdentifierExpr(nestedType.field), alias, tableAlias);
-        field.setNested(nestedType);
-        field.setChildren(null);
-        return field;
+  private static Field makeFilterMethodField(SQLMethodInvokeExpr filterMethod, String alias)
+      throws SqlParseException {
+    List<SQLExpr> parameters = filterMethod.getParameters();
+    int parametersSize = parameters.size();
+    if (parametersSize != 1 && parametersSize != 2) {
+      throw new SqlParseException(
+          "filter group by field should only have one or 2 parameters"
+              + " filter(Expr) or filter(name,Expr)");
     }
-
-    private static Field handleIdentifier(ChildrenType childrenType, String alias, String tableAlias) {
-        Field field = handleIdentifier(new SQLIdentifierExpr(childrenType.field), alias, tableAlias);
-        field.setNested(null);
-        field.setChildren(childrenType);
-        return field;
+    String filterAlias = filterMethod.getMethodName();
+    SQLExpr exprToCheck = null;
+    if (parametersSize == 1) {
+      exprToCheck = parameters.get(0);
+      filterAlias = "filter(" + exprToCheck.toString().replaceAll("\n", " ") + ")";
     }
-
-
-    //binary method can nested
-    public SQLMethodInvokeExpr makeBinaryMethodField(SQLBinaryOpExpr expr, String alias, boolean first)
-            throws SqlParseException {
-        List<SQLExpr> params = new ArrayList<>();
-
-        String scriptFieldAlias;
-        if (first && (alias == null || alias.equals(""))) {
-            scriptFieldAlias = sqlFunctions.nextId("field");
-        } else {
-            scriptFieldAlias = alias;
-        }
-        params.add(new SQLCharExpr(scriptFieldAlias));
-
-        switch (expr.getOperator()) {
-            case Add:
-                return convertBinaryOperatorToMethod("add", expr);
-            case Multiply:
-                return convertBinaryOperatorToMethod("multiply", expr);
-
-            case Divide:
-                return convertBinaryOperatorToMethod("divide", expr);
-
-            case Modulus:
-                return convertBinaryOperatorToMethod("modulus", expr);
-
-            case Subtract:
-                return convertBinaryOperatorToMethod("subtract", expr);
-            default:
-                throw new SqlParseException("Unsupported operator: " + expr.getOperator().getName());
-        }
+    if (parametersSize == 2) {
+      filterAlias = Util.extendedToString(parameters.get(0));
+      exprToCheck = parameters.get(1);
     }
-
-    private static SQLMethodInvokeExpr convertBinaryOperatorToMethod(String operator, SQLBinaryOpExpr expr) {
-        SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(operator, null);
-        methodInvokeExpr.addParameter(expr.getLeft());
-        methodInvokeExpr.addParameter(expr.getRight());
-        methodInvokeExpr.putAttribute("source", expr);
-        return methodInvokeExpr;
+    Where where = Where.newInstance();
+    new WhereParser(new SqlParser()).parseWhere(exprToCheck, where);
+    if (where.getWheres().size() == 0) {
+      throw new SqlParseException("Failed to parse filter condition");
+    }
+    List<KVValue> methodParameters = new ArrayList<>();
+    methodParameters.add(new KVValue("where", where));
+    methodParameters.add(new KVValue("alias", filterAlias + "@FILTER"));
+    return new MethodField("filter", methodParameters, null, alias);
+  }
+
+  private static Field handleIdentifier(NestedType nestedType, String alias, String tableAlias) {
+    Field field = handleIdentifier(new SQLIdentifierExpr(nestedType.field), alias, tableAlias);
+    field.setNested(nestedType);
+    field.setChildren(null);
+    return field;
+  }
+
+  private static Field handleIdentifier(
+      ChildrenType childrenType, String alias, String tableAlias) {
+    Field field = handleIdentifier(new SQLIdentifierExpr(childrenType.field), alias, tableAlias);
+    field.setNested(null);
+    field.setChildren(childrenType);
+    return field;
+  }
+
+  // binary method can nested
+  public SQLMethodInvokeExpr makeBinaryMethodField(
+      SQLBinaryOpExpr expr, String alias, boolean first) throws SqlParseException {
+    List<SQLExpr> params = new ArrayList<>();
+
+    String scriptFieldAlias;
+    if (first && (alias == null || alias.equals(""))) {
+      scriptFieldAlias = sqlFunctions.nextId("field");
+    } else {
+      scriptFieldAlias = alias;
     }
+    params.add(new SQLCharExpr(scriptFieldAlias));
 
+    switch (expr.getOperator()) {
+      case Add:
+        return convertBinaryOperatorToMethod("add", expr);
+      case Multiply:
+        return convertBinaryOperatorToMethod("multiply", expr);
 
-    private static Field handleIdentifier(SQLExpr expr, String alias, String tableAlias) {
-        String name = expr.toString().replace("`", "");
-        String newFieldName = name;
-        Field field = null;
-        if (tableAlias != null) {
-            String aliasPrefix = tableAlias + ".";
-            if (name.startsWith(aliasPrefix)) {
-                newFieldName = name.replaceFirst(aliasPrefix, "");
-                field = new Field(newFieldName, alias);
-            }
-        }
+      case Divide:
+        return convertBinaryOperatorToMethod("divide", expr);
 
-        if (tableAlias == null) {
-            field = new Field(newFieldName, alias);
-        }
+      case Modulus:
+        return convertBinaryOperatorToMethod("modulus", expr);
 
-        return field;
+      case Subtract:
+        return convertBinaryOperatorToMethod("subtract", expr);
+      default:
+        throw new SqlParseException("Unsupported operator: " + expr.getOperator().getName());
+    }
+  }
+
+  private static SQLMethodInvokeExpr convertBinaryOperatorToMethod(
+      String operator, SQLBinaryOpExpr expr) {
+    SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(operator, null);
+    methodInvokeExpr.addParameter(expr.getLeft());
+    methodInvokeExpr.addParameter(expr.getRight());
+    methodInvokeExpr.putAttribute("source", expr);
+    return methodInvokeExpr;
+  }
+
+  private static Field handleIdentifier(SQLExpr expr, String alias, String tableAlias) {
+    String name = expr.toString().replace("`", "");
+    String newFieldName = name;
+    Field field = null;
+    if (tableAlias != null) {
+      String aliasPrefix = tableAlias + ".";
+      if (name.startsWith(aliasPrefix)) {
+        newFieldName = name.replaceFirst(aliasPrefix, "");
+        field = new Field(newFieldName, alias);
+      }
     }
 
-    public MethodField makeMethodField(String name, List<SQLExpr> arguments, SQLAggregateOption option,
-                                              String alias, String tableAlias, boolean first) throws SqlParseException {
-        List<KVValue> paramers = new LinkedList<>();
-
-        for (SQLExpr object : arguments) {
-
-            if (object instanceof SQLBinaryOpExpr) {
-
-                SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) object;
-
-                if (SQLFunctions.isFunctionTranslatedToScript(binaryOpExpr.getOperator().toString())) {
-                    SQLMethodInvokeExpr mExpr = makeBinaryMethodField(binaryOpExpr, alias, first);
-                    MethodField abc = makeMethodField(mExpr.getMethodName(), mExpr.getParameters(),
-                            null, null, tableAlias, false);
-                    paramers.add(new KVValue(abc.getParams().get(0).toString(),
-                            new SQLCharExpr(abc.getParams().get(1).toString())));
-                } else {
-                    if (!binaryOpExpr.getOperator().getName().equals("=")) {
-                        paramers.add(new KVValue("script", makeScriptMethodField(binaryOpExpr, null, tableAlias)));
-                    } else {
-                        SQLExpr right = binaryOpExpr.getRight();
-                        Object value = Util.expr2Object(right);
-                        paramers.add(new KVValue(binaryOpExpr.getLeft().toString(), value));
-                    }
-                }
-
-            } else if (object instanceof SQLMethodInvokeExpr) {
-                SQLMethodInvokeExpr mExpr = (SQLMethodInvokeExpr) object;
-                String methodName = mExpr.getMethodName().toLowerCase();
-                if (methodName.equals("script")) {
-                    KVValue script = new KVValue("script", makeMethodField(mExpr.getMethodName(), mExpr.getParameters(),
-                            null, alias, tableAlias, true));
-                    paramers.add(script);
-                } else if (methodName.equals("nested") || methodName.equals("reverse_nested")) {
-                    NestedType nestedType = new NestedType();
-
-                    if (!nestedType.tryFillFromExpr(object)) {
-                        throw new SqlParseException("Failed to parse nested expression: " + object);
-                    }
-
-                    // Fix bug: method name of reversed_nested() was set to "nested" wrongly
-                    paramers.add(new KVValue(methodName, nestedType));
-                } else if (methodName.equals("children")) {
-                    ChildrenType childrenType = new ChildrenType();
-
-                    if (!childrenType.tryFillFromExpr(object)) {
-                        throw new SqlParseException("Failed to parse children expression: " + object);
-                    }
-
-                    paramers.add(new KVValue("children", childrenType));
-                } else if (SQLFunctions.isFunctionTranslatedToScript(methodName)) {
-                    //throw new SqlParseException("only support script/nested as inner functions");
-                    MethodField abc = makeMethodField(methodName, mExpr.getParameters(), null, null, tableAlias, false);
-                    paramers.add(new KVValue(abc.getParams().get(0).toString(),
-                            new SQLCharExpr(abc.getParams().get(1).toString())));
-                } else {
-                    throw new SqlParseException("only support script/nested/children as inner functions");
-                }
-            } else if (object instanceof SQLCaseExpr) {
-                String scriptCode = new CaseWhenParser((SQLCaseExpr) object, alias, tableAlias).parse();
-                paramers.add(new KVValue("script", new SQLCharExpr(scriptCode)));
-            } else if (object instanceof SQLCastExpr) {
-                String castName = sqlFunctions.nextId("cast");
-                List<KVValue> methodParameters = new ArrayList<>();
-                methodParameters.add(new KVValue(((SQLCastExpr) object).getExpr().toString()));
-                String castType = ((SQLCastExpr) object).getDataType().getName();
-                String scriptCode = sqlFunctions.getCastScriptStatement(castName, castType, methodParameters);
-
-                // Parameter "first" indicates if return statement is required. Take CAST statement nested in
-                // aggregate function SUM(CAST...) for example, return statement is required in this case.
-                // Otherwise DSL with metric aggregation always returns 0 as result. And this works also because
-                // the caller makeFieldImpl(SQLExpr("SUM...")) does pass first=true to here.
-                if (first) {
-                    scriptCode += "; return " + castName;
-                }
-                methodParameters.add(new KVValue(scriptCode));
-                paramers.add(new KVValue("script", new SQLCharExpr(scriptCode)));
-            } else if (object instanceof SQLAggregateExpr) {
-                SQLObject parent = object.getParent();
-                SQLExpr source = (SQLExpr) parent.getAttribute("source");
-
-                if (parent instanceof SQLMethodInvokeExpr && source == null) {
-                    throw new SqlFeatureNotImplementedException(
-                            "Function calls of form '"
-                                    + ((SQLMethodInvokeExpr) parent).getMethodName()
-                                    + "("
-                                    + ((SQLAggregateExpr) object).getMethodName()
-                                    + "(...))' are not implemented yet");
-                }
-
-                throw new SqlFeatureNotImplementedException(
-                        "The complex aggregate expressions are not implemented yet: " + source);
-            } else {
-                paramers.add(new KVValue(Util.removeTableAilasFromField(object, tableAlias)));
-            }
+    if (tableAlias == null) {
+      field = new Field(newFieldName, alias);
+    }
 
+    return field;
+  }
+
+  public MethodField makeMethodField(
+      String name,
+      List<SQLExpr> arguments,
+      SQLAggregateOption option,
+      String alias,
+      String tableAlias,
+      boolean first)
+      throws SqlParseException {
+    List<KVValue> paramers = new LinkedList<>();
+
+    for (SQLExpr object : arguments) {
+
+      if (object instanceof SQLBinaryOpExpr) {
+
+        SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) object;
+
+        if (SQLFunctions.isFunctionTranslatedToScript(binaryOpExpr.getOperator().toString())) {
+          SQLMethodInvokeExpr mExpr = makeBinaryMethodField(binaryOpExpr, alias, first);
+          MethodField abc =
+              makeMethodField(
+                  mExpr.getMethodName(), mExpr.getParameters(), null, null, tableAlias, false);
+          paramers.add(
+              new KVValue(
+                  abc.getParams().get(0).toString(),
+                  new SQLCharExpr(abc.getParams().get(1).toString())));
+        } else {
+          if (!binaryOpExpr.getOperator().getName().equals("=")) {
+            paramers.add(
+                new KVValue("script", makeScriptMethodField(binaryOpExpr, null, tableAlias)));
+          } else {
+            SQLExpr right = binaryOpExpr.getRight();
+            Object value = Util.expr2Object(right);
+            paramers.add(new KVValue(binaryOpExpr.getLeft().toString(), value));
+          }
         }
 
-        //just check we can find the function
-        boolean builtInScriptFunction = SQLFunctions.isFunctionTranslatedToScript(name);
-        if (builtInScriptFunction) {
-            if (alias == null && first) {
-                alias = sqlFunctions.nextId(name);
-            }
-            //should check if field and first .
-            Tuple<String, String> newFunctions = sqlFunctions.function(name.toLowerCase(), paramers,
-                    paramers.isEmpty() ? null : paramers.get(0).key, first);
-            paramers.clear();
-            if (!first) {
-                //variance
-                paramers.add(new KVValue(newFunctions.v1()));
-            } else {
-                paramers.add(new KVValue(alias));
-            }
-
-            paramers.add(new KVValue(newFunctions.v2()));
+      } else if (object instanceof SQLMethodInvokeExpr) {
+        SQLMethodInvokeExpr mExpr = (SQLMethodInvokeExpr) object;
+        String methodName = mExpr.getMethodName().toLowerCase();
+        if (methodName.equals("script")) {
+          KVValue script =
+              new KVValue(
+                  "script",
+                  makeMethodField(
+                      mExpr.getMethodName(), mExpr.getParameters(), null, alias, tableAlias, true));
+          paramers.add(script);
+        } else if (methodName.equals("nested") || methodName.equals("reverse_nested")) {
+          NestedType nestedType = new NestedType();
+
+          if (!nestedType.tryFillFromExpr(object)) {
+            throw new SqlParseException("Failed to parse nested expression: " + object);
+          }
+
+          // Fix bug: method name of reversed_nested() was set to "nested" wrongly
+          paramers.add(new KVValue(methodName, nestedType));
+        } else if (methodName.equals("children")) {
+          ChildrenType childrenType = new ChildrenType();
+
+          if (!childrenType.tryFillFromExpr(object)) {
+            throw new SqlParseException("Failed to parse children expression: " + object);
+          }
+
+          paramers.add(new KVValue("children", childrenType));
+        } else if (SQLFunctions.isFunctionTranslatedToScript(methodName)) {
+          // throw new SqlParseException("only support script/nested as inner functions");
+          MethodField abc =
+              makeMethodField(methodName, mExpr.getParameters(), null, null, tableAlias, false);
+          paramers.add(
+              new KVValue(
+                  abc.getParams().get(0).toString(),
+                  new SQLCharExpr(abc.getParams().get(1).toString())));
+        } else {
+          throw new SqlParseException("only support script/nested/children as inner functions");
         }
+      } else if (object instanceof SQLCaseExpr) {
+        String scriptCode = new CaseWhenParser((SQLCaseExpr) object, alias, tableAlias).parse();
+        paramers.add(new KVValue("script", new SQLCharExpr(scriptCode)));
+      } else if (object instanceof SQLCastExpr) {
+        String castName = sqlFunctions.nextId("cast");
+        List<KVValue> methodParameters = new ArrayList<>();
+        methodParameters.add(new KVValue(((SQLCastExpr) object).getExpr().toString()));
+        String castType = ((SQLCastExpr) object).getDataType().getName();
+        String scriptCode =
+            sqlFunctions.getCastScriptStatement(castName, castType, methodParameters);
+
+        // Parameter "first" indicates if return statement is required. Take CAST statement nested
+        // in
+        // aggregate function SUM(CAST...) for example, return statement is required in this case.
+        // Otherwise DSL with metric aggregation always returns 0 as result. And this works also
+        // because
+        // the caller makeFieldImpl(SQLExpr("SUM...")) does pass first=true to here.
         if (first) {
-            List<KVValue> tempParamers = new LinkedList<>();
-            for (KVValue temp : paramers) {
-                if (temp.value instanceof SQLExpr) {
-                    tempParamers.add(new KVValue(temp.key, Util.expr2Object((SQLExpr) temp.value)));
-                } else {
-                    tempParamers.add(new KVValue(temp.key, temp.value));
-                }
-            }
-            paramers.clear();
-            paramers.addAll(tempParamers);
+          scriptCode += "; return " + castName;
+        }
+        methodParameters.add(new KVValue(scriptCode));
+        paramers.add(new KVValue("script", new SQLCharExpr(scriptCode)));
+      } else if (object instanceof SQLAggregateExpr) {
+        SQLObject parent = object.getParent();
+        SQLExpr source = (SQLExpr) parent.getAttribute("source");
+
+        if (parent instanceof SQLMethodInvokeExpr && source == null) {
+          throw new SqlFeatureNotImplementedException(
+              "Function calls of form '"
+                  + ((SQLMethodInvokeExpr) parent).getMethodName()
+                  + "("
+                  + ((SQLAggregateExpr) object).getMethodName()
+                  + "(...))' are not implemented yet");
         }
 
-        if (builtInScriptFunction) {
-            return new ScriptMethodField(name, paramers, option, alias);
+        throw new SqlFeatureNotImplementedException(
+            "The complex aggregate expressions are not implemented yet: " + source);
+      } else {
+        paramers.add(new KVValue(Util.removeTableAilasFromField(object, tableAlias)));
+      }
+    }
+
+    // just check we can find the function
+    boolean builtInScriptFunction = SQLFunctions.isFunctionTranslatedToScript(name);
+    if (builtInScriptFunction) {
+      if (alias == null && first) {
+        alias = sqlFunctions.nextId(name);
+      }
+      // should check if field and first .
+      Tuple<String, String> newFunctions =
+          sqlFunctions.function(
+              name.toLowerCase(), paramers, paramers.isEmpty() ? null : paramers.get(0).key, first);
+      paramers.clear();
+      if (!first) {
+        // variance
+        paramers.add(new KVValue(newFunctions.v1()));
+      } else {
+        paramers.add(new KVValue(alias));
+      }
+
+      paramers.add(new KVValue(newFunctions.v2()));
+    }
+    if (first) {
+      List<KVValue> tempParamers = new LinkedList<>();
+      for (KVValue temp : paramers) {
+        if (temp.value instanceof SQLExpr) {
+          tempParamers.add(new KVValue(temp.key, Util.expr2Object((SQLExpr) temp.value)));
         } else {
-            return new MethodField(name, paramers, option, alias);
+          tempParamers.add(new KVValue(temp.key, temp.value));
         }
+      }
+      paramers.clear();
+      paramers.addAll(tempParamers);
+    }
+
+    if (builtInScriptFunction) {
+      return new ScriptMethodField(name, paramers, option, alias);
+    } else {
+      return new MethodField(name, paramers, option, alias);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/HavingParser.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/HavingParser.java
index 307d87f6e8..e0d933a405 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/HavingParser.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/HavingParser.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -21,93 +20,89 @@
 import org.opensearch.sql.legacy.domain.Where;
 import org.opensearch.sql.legacy.exception.SqlParseException;
 
-/**
- * Parse expression in the Having clause.
- */
+/** Parse expression in the Having clause. */
 public class HavingParser {
-    private final WhereParser whereParser;
-    private final List<Field> havingFields;
-    private final HavingConditionRewriter havingConditionRewriter;
+  private final WhereParser whereParser;
+  private final List<Field> havingFields;
+  private final HavingConditionRewriter havingConditionRewriter;
 
-    public HavingParser(WhereParser whereParser) {
-        this.whereParser = whereParser;
-        this.havingFields = new ArrayList<>();
-        this.havingConditionRewriter = new HavingConditionRewriter();
-    }
+  public HavingParser(WhereParser whereParser) {
+    this.whereParser = whereParser;
+    this.havingFields = new ArrayList<>();
+    this.havingConditionRewriter = new HavingConditionRewriter();
+  }
 
-    public void parseWhere(SQLExpr expr, Where where) throws SqlParseException {
-        expr.accept(havingConditionRewriter);
-        whereParser.parseWhere(expr, where);
-    }
+  public void parseWhere(SQLExpr expr, Where where) throws SqlParseException {
+    expr.accept(havingConditionRewriter);
+    whereParser.parseWhere(expr, where);
+  }
 
-    public List<Field> getHavingFields() {
-        return havingFields;
-    }
-
-    private class HavingConditionRewriter extends MySqlASTVisitorAdapter {
-        private int aliasSuffix = 0;
+  public List<Field> getHavingFields() {
+    return havingFields;
+  }
 
-        @Override
-        public boolean visit(SQLAggregateExpr expr) {
-            SQLIdentifierExpr translatedExpr = translateAggExpr(expr);
-            SQLObject parent = expr.getParent();
-            // Rewrite {@link SQLAggregateExpr} in {@link SQLBinaryOpExpr}, e.g. HAVING AVG(age) > 30)
-            if (parent instanceof SQLBinaryOpExpr) {
-                SQLBinaryOpExpr parentOpExpr = (SQLBinaryOpExpr) parent;
-                if (parentOpExpr.getLeft() == expr) {
-                    parentOpExpr.setLeft(translatedExpr);
-                } else {
-                    parentOpExpr.setRight(translatedExpr);
-                }
-                // Rewrite {@link SQLAggregateExpr} in {@link SQLNotExpr}, e.g. HAVING NOT (AVG(a) > 30)
-            } else if (parent instanceof SQLNotExpr) {
-                SQLNotExpr parentNotExpr = (SQLNotExpr) parent;
-                parentNotExpr.setExpr(translatedExpr);
-                // Rewrite {@link SQLAggregateExpr} in {@link SQLInListExpr}, e.g. HAVING AVG(a) IN (30, 40, 50)
-            } else if (parent instanceof SQLInListExpr) {
-                SQLInListExpr parentInListExpr = (SQLInListExpr) parent;
-                parentInListExpr.setExpr(translatedExpr);
-                // Rewrite {@link SQLAggregateExpr} in {@link SQLBetweenExpr}, e.g. HAVING AVG(a) BETWEEN 30, 40
-            } else if (parent instanceof SQLBetweenExpr) {
-                SQLBetweenExpr parentBetweenExpr = (SQLBetweenExpr) parent;
-                parentBetweenExpr.setTestExpr(translatedExpr);
-            } else {
-                throw new IllegalStateException("Unsupported aggregation function in having clause "
-                                                + parent.getClass());
-            }
+  private class HavingConditionRewriter extends MySqlASTVisitorAdapter {
+    private int aliasSuffix = 0;
 
-            return true;
+    @Override
+    public boolean visit(SQLAggregateExpr expr) {
+      SQLIdentifierExpr translatedExpr = translateAggExpr(expr);
+      SQLObject parent = expr.getParent();
+      // Rewrite {@link SQLAggregateExpr} in {@link SQLBinaryOpExpr}, e.g. HAVING AVG(age) > 30)
+      if (parent instanceof SQLBinaryOpExpr) {
+        SQLBinaryOpExpr parentOpExpr = (SQLBinaryOpExpr) parent;
+        if (parentOpExpr.getLeft() == expr) {
+          parentOpExpr.setLeft(translatedExpr);
+        } else {
+          parentOpExpr.setRight(translatedExpr);
         }
+        // Rewrite {@link SQLAggregateExpr} in {@link SQLNotExpr}, e.g. HAVING NOT (AVG(a) > 30)
+      } else if (parent instanceof SQLNotExpr) {
+        SQLNotExpr parentNotExpr = (SQLNotExpr) parent;
+        parentNotExpr.setExpr(translatedExpr);
+        // Rewrite {@link SQLAggregateExpr} in {@link SQLInListExpr}, e.g. HAVING AVG(a) IN (30, 40,
+        // 50)
+      } else if (parent instanceof SQLInListExpr) {
+        SQLInListExpr parentInListExpr = (SQLInListExpr) parent;
+        parentInListExpr.setExpr(translatedExpr);
+        // Rewrite {@link SQLAggregateExpr} in {@link SQLBetweenExpr}, e.g. HAVING AVG(a) BETWEEN
+        // 30, 40
+      } else if (parent instanceof SQLBetweenExpr) {
+        SQLBetweenExpr parentBetweenExpr = (SQLBetweenExpr) parent;
+        parentBetweenExpr.setTestExpr(translatedExpr);
+      } else {
+        throw new IllegalStateException(
+            "Unsupported aggregation function in having clause " + parent.getClass());
+      }
 
-        /**
-         * If the expr is {@link SQLAggregateExpr}
-         * 1) rewrite as {@link SQLIdentifierExpr}
-         * 2) add the {@link SQLIdentifierExpr} to the havingFields
-         * <p>
-         * For example, the COUNT(age) is the {@link SQLAggregateExpr} in expression COUNT(age) > 1
-         * 1) parsing COUNT(age) as {@link SQLIdentifierExpr} count_1
-         * 2) return {@link SQLIdentifierExpr} count_1  to the havingFields
-         */
-        private SQLIdentifierExpr translateAggExpr(SQLAggregateExpr expr) {
-            String methodAlias = methodAlias(expr.getMethodName());
-            SQLIdentifierExpr sqlExpr = new SQLIdentifierExpr(methodAlias);
-            try {
-                havingFields.add(new FieldMaker().makeField(
-                        expr,
-                        methodAlias,
-                        null));
-                return sqlExpr;
-            } catch (SqlParseException e) {
-                throw new IllegalStateException(e);
-            }
-        }
+      return true;
+    }
 
-        private String methodAlias(String methodName) {
-            return String.format("%s_%d", methodName.toLowerCase(), nextAlias());
-        }
+    /**
+     * If the expr is {@link SQLAggregateExpr} 1) rewrite as {@link SQLIdentifierExpr} 2) add the
+     * {@link SQLIdentifierExpr} to the havingFields
+     *
+     * <p>For example, the COUNT(age) is the {@link SQLAggregateExpr} in expression COUNT(age) > 1
+     * 1) parsing COUNT(age) as {@link SQLIdentifierExpr} count_1 2) return {@link
+     * SQLIdentifierExpr} count_1 to the havingFields
+     */
+    private SQLIdentifierExpr translateAggExpr(SQLAggregateExpr expr) {
+      String methodAlias = methodAlias(expr.getMethodName());
+      SQLIdentifierExpr sqlExpr = new SQLIdentifierExpr(methodAlias);
+      try {
+        havingFields.add(new FieldMaker().makeField(expr, methodAlias, null));
+        return sqlExpr;
+      } catch (SqlParseException e) {
+        throw new IllegalStateException(e);
+      }
+    }
 
-        private Integer nextAlias() {
-            return aliasSuffix++;
-        }
+    private String methodAlias(String methodName) {
+      return String.format("%s_%d", methodName.toLowerCase(), nextAlias());
+    }
+
+    private Integer nextAlias() {
+      return aliasSuffix++;
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/NestedType.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/NestedType.java
index d9b7886310..8b0cd026e2 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/NestedType.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/NestedType.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -18,128 +17,112 @@
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.utils.Util;
 
-/**
- * Created by Eliran on 12/11/2015.
- */
+/** Created by Eliran on 12/11/2015. */
 public class NestedType {
-    public String field;
-    public String path;
-    public Where where;
-    private boolean reverse;
-    private boolean simple;
-    private final BucketPath bucketPath = new BucketPath();
-
-    public boolean tryFillFromExpr(SQLExpr expr) throws SqlParseException {
-        if (!(expr instanceof SQLMethodInvokeExpr)) {
-            return false;
-        }
-        SQLMethodInvokeExpr method = (SQLMethodInvokeExpr) expr;
-        String methodNameLower = method.getMethodName().toLowerCase();
-        if (!(methodNameLower.equals("nested") || methodNameLower.equals("reverse_nested"))) {
-            return false;
-        }
-
-        reverse = methodNameLower.equals("reverse_nested");
-
-        List<SQLExpr> parameters = method.getParameters();
-        if (parameters.size() != 2 && parameters.size() != 1) {
-            throw new IllegalArgumentException("on nested object only allowed 2 parameters "
-                    + "(field,path)/(path,conditions..) or 1 parameter (field) ");
-        }
-
-        String field = Util.extendedToString(parameters.get(0));
-        this.field = field;
-        if (parameters.size() == 1) {
-            //calc path myself..
-            if (!field.contains(".")) {
-                if (!reverse) {
-                    throw new IllegalArgumentException("Illegal nested field name: " + field);
-                } else {
-                    this.path = null;
-                    this.simple = true;
-                }
-            } else {
-                int lastDot = field.lastIndexOf(".");
-                this.path = field.substring(0, lastDot);
-                this.simple = true;
-
-            }
-
-        } else if (parameters.size() == 2) {
-            SQLExpr secondParameter = parameters.get(1);
-            if (secondParameter instanceof SQLTextLiteralExpr || secondParameter instanceof SQLIdentifierExpr
-                    || secondParameter instanceof SQLPropertyExpr) {
-
-                String pathString = Util.extendedToString(secondParameter);
-                if (pathString.equals("")) {
-                    this.path = null;
-                } else {
-                    this.path = pathString;
-                }
-                this.simple = true;
-            } else {
-                this.path = field;
-                Where where = Where.newInstance();
-                new WhereParser(new SqlParser()).parseWhere(secondParameter, where);
-                if (where.getWheres().size() == 0) {
-                    throw new SqlParseException("Failed to parse filter condition");
-                }
-                this.where = where;
-                simple = false;
-            }
-        }
-
-        return true;
+  public String field;
+  public String path;
+  public Where where;
+  private boolean reverse;
+  private boolean simple;
+  private final BucketPath bucketPath = new BucketPath();
+
+  public boolean tryFillFromExpr(SQLExpr expr) throws SqlParseException {
+    if (!(expr instanceof SQLMethodInvokeExpr)) {
+      return false;
     }
-
-    public boolean isSimple() {
-        return simple;
-    }
-
-    public boolean isReverse() {
-        return reverse;
-    }
-
-    /**
-     * Return the name of the Nested Aggregation.
-     */
-    public String getNestedAggName() {
-        return field + "@NESTED";
+    SQLMethodInvokeExpr method = (SQLMethodInvokeExpr) expr;
+    String methodNameLower = method.getMethodName().toLowerCase();
+    if (!(methodNameLower.equals("nested") || methodNameLower.equals("reverse_nested"))) {
+      return false;
     }
 
-    /**
-     * Return the name of the Filter Aggregation
-     */
-    public String getFilterAggName() {
-        return field + "@FILTER";
-    }
+    reverse = methodNameLower.equals("reverse_nested");
 
-    public void addBucketPath(Path path) {
-        bucketPath.add(path);
+    List<SQLExpr> parameters = method.getParameters();
+    if (parameters.size() != 2 && parameters.size() != 1) {
+      throw new IllegalArgumentException(
+          "on nested object only allowed 2 parameters "
+              + "(field,path)/(path,conditions..) or 1 parameter (field) ");
     }
 
-    public String getBucketPath() {
-        return bucketPath.getBucketPath();
+    String field = Util.extendedToString(parameters.get(0));
+    this.field = field;
+    if (parameters.size() == 1) {
+      // calc path myself..
+      if (!field.contains(".")) {
+        if (!reverse) {
+          throw new IllegalArgumentException("Illegal nested field name: " + field);
+        } else {
+          this.path = null;
+          this.simple = true;
+        }
+      } else {
+        int lastDot = field.lastIndexOf(".");
+        this.path = field.substring(0, lastDot);
+        this.simple = true;
+      }
+
+    } else if (parameters.size() == 2) {
+      SQLExpr secondParameter = parameters.get(1);
+      if (secondParameter instanceof SQLTextLiteralExpr
+          || secondParameter instanceof SQLIdentifierExpr
+          || secondParameter instanceof SQLPropertyExpr) {
+
+        String pathString = Util.extendedToString(secondParameter);
+        if (pathString.equals("")) {
+          this.path = null;
+        } else {
+          this.path = pathString;
+        }
+        this.simple = true;
+      } else {
+        this.path = field;
+        Where where = Where.newInstance();
+        new WhereParser(new SqlParser()).parseWhere(secondParameter, where);
+        if (where.getWheres().size() == 0) {
+          throw new SqlParseException("Failed to parse filter condition");
+        }
+        this.where = where;
+        simple = false;
+      }
     }
 
-    /**
-     * Return true if the filed is the nested filed.
-     * For example, the mapping
-     * {
-     * "projects":{
-     * "type": "nested"
-     * "properties": {
-     * "name": {
-     * "type": "text"
-     * }
-     * }
-     * }
-     * }
-     * <p>
-     * If the filed is projects, return true.
-     * If the filed is projects.name, return false.
-     */
-    public boolean isNestedField() {
-        return !field.contains(".") && field.equalsIgnoreCase(path);
-    }
+    return true;
+  }
+
+  public boolean isSimple() {
+    return simple;
+  }
+
+  public boolean isReverse() {
+    return reverse;
+  }
+
+  /** Return the name of the Nested Aggregation. */
+  public String getNestedAggName() {
+    return field + "@NESTED";
+  }
+
+  /** Return the name of the Filter Aggregation */
+  public String getFilterAggName() {
+    return field + "@FILTER";
+  }
+
+  public void addBucketPath(Path path) {
+    bucketPath.add(path);
+  }
+
+  public String getBucketPath() {
+    return bucketPath.getBucketPath();
+  }
+
+  /**
+   * Return true if the filed is the nested filed. For example, the mapping { "projects":{ "type":
+   * "nested" "properties": { "name": { "type": "text" } } } }
+   *
+   * <p>If the filed is projects, return true. If the filed is projects.name, return false.
+   */
+  public boolean isNestedField() {
+    return !field.contains(".") && field.equalsIgnoreCase(path);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SQLOdbcExpr.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SQLOdbcExpr.java
index d1cd32bc3b..64d1235f4d 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SQLOdbcExpr.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SQLOdbcExpr.java
@@ -3,51 +3,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
-
-/**
- * Created by jheimbouch on 3/17/15.
- */
+/** Created by jheimbouch on 3/17/15. */
 public class SQLOdbcExpr extends SQLCharExpr {
 
-    private static final long serialVersionUID = 1L;
+  private static final long serialVersionUID = 1L;
 
-    public SQLOdbcExpr() {
+  public SQLOdbcExpr() {}
 
-    }
-
-    public SQLOdbcExpr(String text) {
-        super(text);
-    }
+  public SQLOdbcExpr(String text) {
+    super(text);
+  }
 
-    @Override
-    public void output(StringBuffer buf) {
-        if ((this.text == null) || (this.text.length() == 0)) {
-            buf.append("NULL");
-        } else {
-            buf.append("{ts '");
-            buf.append(this.text.replaceAll("'", "''"));
-            buf.append("'}");
-        }
-    }
-
-    @Override
-    public String getText() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("{ts '");
-        sb.append(this.text);
-        sb.append("'}");
-        return sb.toString();
-    }
-
-    protected void accept0(SQLASTVisitor visitor) {
-        visitor.visit(this);
-        visitor.endVisit(this);
+  @Override
+  public void output(StringBuffer buf) {
+    if ((this.text == null) || (this.text.length() == 0)) {
+      buf.append("NULL");
+    } else {
+      buf.append("{ts '");
+      buf.append(this.text.replaceAll("'", "''"));
+      buf.append("'}");
     }
+  }
+
+  @Override
+  public String getText() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("{ts '");
+    sb.append(this.text);
+    sb.append("'}");
+    return sb.toString();
+  }
+
+  protected void accept0(SQLASTVisitor visitor) {
+    visitor.visit(this);
+    visitor.endVisit(this);
+  }
 }
-
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SQLParensIdentifierExpr.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SQLParensIdentifierExpr.java
index b9682ce84a..8eaae81dca 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SQLParensIdentifierExpr.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SQLParensIdentifierExpr.java
@@ -3,27 +3,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
 
-
 /**
- * An Identifier that is wrapped in parenthesis.
- * This is for tracking in group bys the difference between "group by state, age" and "group by (state), (age)".
- * For non group by identifiers, it acts as a normal SQLIdentifierExpr.
+ * An Identifier that is wrapped in parenthesis. This is for tracking in group bys the difference
+ * between "group by state, age" and "group by (state), (age)". For non group by identifiers, it
+ * acts as a normal SQLIdentifierExpr.
  */
 public class SQLParensIdentifierExpr extends SQLIdentifierExpr {
 
-    public SQLParensIdentifierExpr() {
-    }
+  public SQLParensIdentifierExpr() {}
 
-    public SQLParensIdentifierExpr(String name) {
-        super(name);
-    }
+  public SQLParensIdentifierExpr(String name) {
+    super(name);
+  }
 
-    public SQLParensIdentifierExpr(SQLIdentifierExpr expr) {
-        super(expr.getName());
-    }
+  public SQLParensIdentifierExpr(SQLIdentifierExpr expr) {
+    super(expr.getName());
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/ScriptFilter.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/ScriptFilter.java
index 3eb4fecf67..3f9b12ca84 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/ScriptFilter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/ScriptFilter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -16,96 +15,92 @@
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.utils.Util;
 
-/**
- * Created by Eliran on 11/12/2015.
- */
+/** Created by Eliran on 11/12/2015. */
 public class ScriptFilter {
-    private String script;
-    private Map<String, Object> args;
-    private ScriptType scriptType;
+  private String script;
+  private Map<String, Object> args;
+  private ScriptType scriptType;
 
-    public ScriptFilter() {
+  public ScriptFilter() {
 
-        args = null;
-        scriptType = ScriptType.INLINE;
-    }
+    args = null;
+    scriptType = ScriptType.INLINE;
+  }
 
-    public ScriptFilter(String script, Map<String, Object> args, ScriptType scriptType) {
-        this.script = script;
-        this.args = args;
-        this.scriptType = scriptType;
-    }
+  public ScriptFilter(String script, Map<String, Object> args, ScriptType scriptType) {
+    this.script = script;
+    this.args = args;
+    this.scriptType = scriptType;
+  }
 
-    public boolean tryParseFromMethodExpr(SQLMethodInvokeExpr expr) throws SqlParseException {
-        if (!expr.getMethodName().toLowerCase().equals("script")) {
-            return false;
-        }
-        List<SQLExpr> methodParameters = expr.getParameters();
-        if (methodParameters.size() == 0) {
-            return false;
-        }
-        script = Util.extendedToString(methodParameters.get(0));
-
-        if (methodParameters.size() == 1) {
-            return true;
-        }
-
-        args = new HashMap<>();
-        for (int i = 1; i < methodParameters.size(); i++) {
-
-            SQLExpr innerExpr = methodParameters.get(i);
-            if (!(innerExpr instanceof SQLBinaryOpExpr)) {
-                return false;
-            }
-            SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) innerExpr;
-            if (!binaryOpExpr.getOperator().getName().equals("=")) {
-                return false;
-            }
-
-            SQLExpr right = binaryOpExpr.getRight();
-            Object value = Util.expr2Object(right);
-            String key = Util.extendedToString(binaryOpExpr.getLeft());
-            if (key.equals("script_type")) {
-                parseAndUpdateScriptType(value.toString());
-            } else {
-                args.put(key, value);
-            }
-
-        }
-        return true;
+  public boolean tryParseFromMethodExpr(SQLMethodInvokeExpr expr) throws SqlParseException {
+    if (!expr.getMethodName().toLowerCase().equals("script")) {
+      return false;
     }
-
-    private void parseAndUpdateScriptType(String scriptType) {
-        String scriptTypeUpper = scriptType.toUpperCase();
-        switch (scriptTypeUpper) {
-            case "INLINE":
-                this.scriptType = ScriptType.INLINE;
-                break;
-            case "INDEXED":
-            case "STORED":
-                this.scriptType = ScriptType.STORED;
-                break;
-        }
+    List<SQLExpr> methodParameters = expr.getParameters();
+    if (methodParameters.size() == 0) {
+      return false;
     }
+    script = Util.extendedToString(methodParameters.get(0));
 
-    public boolean containsParameters() {
-        return args != null && args.size() > 0;
+    if (methodParameters.size() == 1) {
+      return true;
     }
 
-    public String getScript() {
-        return script;
+    args = new HashMap<>();
+    for (int i = 1; i < methodParameters.size(); i++) {
+
+      SQLExpr innerExpr = methodParameters.get(i);
+      if (!(innerExpr instanceof SQLBinaryOpExpr)) {
+        return false;
+      }
+      SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) innerExpr;
+      if (!binaryOpExpr.getOperator().getName().equals("=")) {
+        return false;
+      }
+
+      SQLExpr right = binaryOpExpr.getRight();
+      Object value = Util.expr2Object(right);
+      String key = Util.extendedToString(binaryOpExpr.getLeft());
+      if (key.equals("script_type")) {
+        parseAndUpdateScriptType(value.toString());
+      } else {
+        args.put(key, value);
+      }
     }
-
-    public ScriptType getScriptType() {
-        return scriptType;
+    return true;
+  }
+
+  private void parseAndUpdateScriptType(String scriptType) {
+    String scriptTypeUpper = scriptType.toUpperCase();
+    switch (scriptTypeUpper) {
+      case "INLINE":
+        this.scriptType = ScriptType.INLINE;
+        break;
+      case "INDEXED":
+      case "STORED":
+        this.scriptType = ScriptType.STORED;
+        break;
     }
+  }
 
-    public Map<String, Object> getArgs() {
-        return args;
-    }
+  public boolean containsParameters() {
+    return args != null && args.size() > 0;
+  }
 
-    public void setArgs(Map<String, Object> args) {
-        this.args = args;
-    }
+  public String getScript() {
+    return script;
+  }
+
+  public ScriptType getScriptType() {
+    return scriptType;
+  }
+
+  public Map<String, Object> getArgs() {
+    return args;
+  }
 
+  public void setArgs(Map<String, Object> args) {
+    this.args = args;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SelectParser.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SelectParser.java
index 85becdaa53..62a63b320f 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SelectParser.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SelectParser.java
@@ -3,11 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
-/**
- * Created by allwefantasy on 9/2/16.
- */
-public class SelectParser {
-}
+/** Created by allwefantasy on 9/2/16. */
+public class SelectParser {}
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SqlParser.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SqlParser.java
index cf184750f2..947533630b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SqlParser.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SqlParser.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import static org.opensearch.sql.legacy.utils.Util.NESTED_JOIN_TYPE;
@@ -50,546 +49,571 @@
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.query.multi.MultiQuerySelect;
 
-
 /**
  * OpenSearch sql support
  *
  * @author ansj
  */
 public class SqlParser {
-    private FieldMaker fieldMaker = new FieldMaker();
+  private FieldMaker fieldMaker = new FieldMaker();
 
-    public SqlParser() {
+  public SqlParser() {}
 
+  public Select parseSelect(SQLQueryExpr mySqlExpr) throws SqlParseException {
+    MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) mySqlExpr.getSubQuery().getQuery();
+    SubQueryParser subQueryParser = new SubQueryParser(this);
+    if (subQueryParser.containSubqueryInFrom(query)) {
+      return subQueryParser.parseSubQueryInFrom(query);
+    } else {
+      return parseSelect(query);
     }
+  }
 
-    public Select parseSelect(SQLQueryExpr mySqlExpr) throws SqlParseException {
-        MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) mySqlExpr.getSubQuery().getQuery();
-        SubQueryParser subQueryParser = new SubQueryParser(this);
-        if (subQueryParser.containSubqueryInFrom(query)) {
-            return subQueryParser.parseSubQueryInFrom(query);
-        } else {
-            return parseSelect(query);
-        }
-    }
+  public Select parseSelect(MySqlSelectQueryBlock query) throws SqlParseException {
 
-    public Select parseSelect(MySqlSelectQueryBlock query) throws SqlParseException {
+    Select select = new Select();
+    WhereParser whereParser = new WhereParser(this, query, fieldMaker);
 
-        Select select = new Select();
-        WhereParser whereParser = new WhereParser(this, query, fieldMaker);
+    if (query.getAttribute(NESTED_JOIN_TYPE) != null) {
+      select.setNestedJoinType((SQLJoinTableSource.JoinType) query.getAttribute(NESTED_JOIN_TYPE));
+    }
 
-        if (query.getAttribute(NESTED_JOIN_TYPE) != null) {
-            select.setNestedJoinType((SQLJoinTableSource.JoinType) query.getAttribute(NESTED_JOIN_TYPE));
-        }
+    findSelect(query, select, query.getFrom().getAlias());
 
-        findSelect(query, select, query.getFrom().getAlias());
+    select.getFrom().addAll(findFrom(query.getFrom()));
 
-        select.getFrom().addAll(findFrom(query.getFrom()));
+    select.setWhere(whereParser.findWhere());
 
-        select.setWhere(whereParser.findWhere());
+    select.fillSubQueries();
 
-        select.fillSubQueries();
+    select.getHints().addAll(parseHints(query.getHints()));
 
-        select.getHints().addAll(parseHints(query.getHints()));
+    findLimit(query.getLimit(), select);
 
-        findLimit(query.getLimit(), select);
+    if (query.getOrderBy() != null) {
+      addOrderByToSelect(select, query, query.getOrderBy().getItems(), null);
+    }
 
-        if (query.getOrderBy() != null) {
-            addOrderByToSelect(select, query, query.getOrderBy().getItems(), null);
-        }
+    if (query.getGroupBy() != null) {
+      findGroupBy(query, select);
+    }
 
-        if (query.getGroupBy() != null) {
-            findGroupBy(query, select);
-        }
+    return select;
+  }
 
-        return select;
-    }
+  public Delete parseDelete(SQLDeleteStatement deleteStatement) throws SqlParseException {
+    Delete delete = new Delete();
+    WhereParser whereParser = new WhereParser(this, deleteStatement);
 
-    public Delete parseDelete(SQLDeleteStatement deleteStatement) throws SqlParseException {
-        Delete delete = new Delete();
-        WhereParser whereParser = new WhereParser(this, deleteStatement);
+    delete.getFrom().addAll(findFrom(deleteStatement.getTableSource()));
 
-        delete.getFrom().addAll(findFrom(deleteStatement.getTableSource()));
+    delete.setWhere(whereParser.findWhere());
 
-        delete.setWhere(whereParser.findWhere());
+    return delete;
+  }
 
-        return delete;
-    }
+  public MultiQuerySelect parseMultiSelect(SQLUnionQuery query) throws SqlParseException {
+    Select firstTableSelect = this.parseSelect((MySqlSelectQueryBlock) query.getLeft());
+    Select secondTableSelect = this.parseSelect((MySqlSelectQueryBlock) query.getRight());
+    return new MultiQuerySelect(query.getOperator(), firstTableSelect, secondTableSelect);
+  }
 
-    public MultiQuerySelect parseMultiSelect(SQLUnionQuery query) throws SqlParseException {
-        Select firstTableSelect = this.parseSelect((MySqlSelectQueryBlock) query.getLeft());
-        Select secondTableSelect = this.parseSelect((MySqlSelectQueryBlock) query.getRight());
-        return new MultiQuerySelect(query.getOperator(), firstTableSelect, secondTableSelect);
+  private void findSelect(MySqlSelectQueryBlock query, Select select, String tableAlias)
+      throws SqlParseException {
+    List<SQLSelectItem> selectList = query.getSelectList();
+    for (SQLSelectItem sqlSelectItem : selectList) {
+      Field field =
+          fieldMaker.makeField(sqlSelectItem.getExpr(), sqlSelectItem.getAlias(), tableAlias);
+      select.addField(field);
     }
-
-    private void findSelect(MySqlSelectQueryBlock query, Select select, String tableAlias) throws SqlParseException {
-        List<SQLSelectItem> selectList = query.getSelectList();
-        for (SQLSelectItem sqlSelectItem : selectList) {
-            Field field = fieldMaker.makeField(sqlSelectItem.getExpr(), sqlSelectItem.getAlias(), tableAlias);
-            select.addField(field);
-        }
+  }
+
+  private void findGroupBy(MySqlSelectQueryBlock query, Select select) throws SqlParseException {
+    Map<String, SQLExpr> aliasesToExperssions =
+        query.getSelectList().stream()
+            .filter(item -> item.getAlias() != null)
+            .collect(Collectors.toMap(SQLSelectItem::getAlias, SQLSelectItem::getExpr));
+
+    SQLSelectGroupByClause groupBy = query.getGroupBy();
+    SQLTableSource sqlTableSource = query.getFrom();
+
+    findHaving(query, select);
+
+    List<SQLExpr> items = groupBy.getItems();
+
+    List<SQLExpr> standardGroupBys = new ArrayList<>();
+    for (SQLExpr sqlExpr : items) {
+      // todo: mysql expr patch
+      if (sqlExpr instanceof MySqlSelectGroupByExpr) {
+        MySqlSelectGroupByExpr sqlSelectGroupByExpr = (MySqlSelectGroupByExpr) sqlExpr;
+        sqlExpr = sqlSelectGroupByExpr.getExpr();
+      }
+
+      if ((sqlExpr instanceof SQLParensIdentifierExpr
+              || !(sqlExpr instanceof SQLIdentifierExpr || sqlExpr instanceof SQLMethodInvokeExpr))
+          && !standardGroupBys.isEmpty()) {
+        // flush the standard group bys
+        select.addGroupBy(convertExprsToFields(standardGroupBys, sqlTableSource));
+        standardGroupBys = new ArrayList<>();
+      }
+
+      if (sqlExpr instanceof SQLParensIdentifierExpr) {
+        // single item with parens (should get its own aggregation)
+        select.addGroupBy(fieldMaker.makeField(sqlExpr, null, sqlTableSource.getAlias()));
+      } else if (sqlExpr instanceof SQLListExpr) {
+        // multiple items in their own list
+        SQLListExpr listExpr = (SQLListExpr) sqlExpr;
+        select.addGroupBy(convertExprsToFields(listExpr.getItems(), sqlTableSource));
+      } else {
+        // check if field is actually alias
+        if (aliasesToExperssions.containsKey(sqlExpr.toString())) {
+          sqlExpr = aliasesToExperssions.get(sqlExpr.toString());
+        }
+        standardGroupBys.add(sqlExpr);
+      }
     }
-
-    private void findGroupBy(MySqlSelectQueryBlock query, Select select) throws SqlParseException {
-        Map<String, SQLExpr> aliasesToExperssions = query
-                .getSelectList()
-                .stream()
-                .filter(item -> item.getAlias() != null)
-                .collect(Collectors.toMap(SQLSelectItem::getAlias, SQLSelectItem::getExpr));
-
-        SQLSelectGroupByClause groupBy = query.getGroupBy();
-        SQLTableSource sqlTableSource = query.getFrom();
-
-        findHaving(query, select);
-
-        List<SQLExpr> items = groupBy.getItems();
-
-        List<SQLExpr> standardGroupBys = new ArrayList<>();
-        for (SQLExpr sqlExpr : items) {
-            //todo: mysql expr patch
-            if (sqlExpr instanceof MySqlSelectGroupByExpr) {
-                MySqlSelectGroupByExpr sqlSelectGroupByExpr = (MySqlSelectGroupByExpr) sqlExpr;
-                sqlExpr = sqlSelectGroupByExpr.getExpr();
-            }
-
-            if ((sqlExpr instanceof SQLParensIdentifierExpr || !(sqlExpr instanceof SQLIdentifierExpr
-                    || sqlExpr instanceof SQLMethodInvokeExpr)) && !standardGroupBys.isEmpty()) {
-                // flush the standard group bys
-                select.addGroupBy(convertExprsToFields(standardGroupBys, sqlTableSource));
-                standardGroupBys = new ArrayList<>();
-            }
-
-            if (sqlExpr instanceof SQLParensIdentifierExpr) {
-                // single item with parens (should get its own aggregation)
-                select.addGroupBy(fieldMaker.makeField(sqlExpr, null, sqlTableSource.getAlias()));
-            } else if (sqlExpr instanceof SQLListExpr) {
-                // multiple items in their own list
-                SQLListExpr listExpr = (SQLListExpr) sqlExpr;
-                select.addGroupBy(convertExprsToFields(listExpr.getItems(), sqlTableSource));
-            } else {
-                // check if field is actually alias
-                if (aliasesToExperssions.containsKey(sqlExpr.toString())) {
-                    sqlExpr = aliasesToExperssions.get(sqlExpr.toString());
-                }
-                standardGroupBys.add(sqlExpr);
-            }
-        }
-        if (!standardGroupBys.isEmpty()) {
-            select.addGroupBy(convertExprsToFields(standardGroupBys, sqlTableSource));
-        }
+    if (!standardGroupBys.isEmpty()) {
+      select.addGroupBy(convertExprsToFields(standardGroupBys, sqlTableSource));
     }
-
-    private void findHaving(MySqlSelectQueryBlock query, Select select) throws SqlParseException {
-        select.setHaving(new Having(query.getGroupBy(), new WhereParser(this, query, fieldMaker)));
+  }
+
+  private void findHaving(MySqlSelectQueryBlock query, Select select) throws SqlParseException {
+    select.setHaving(new Having(query.getGroupBy(), new WhereParser(this, query, fieldMaker)));
+  }
+
+  private List<Field> convertExprsToFields(
+      List<? extends SQLExpr> exprs, SQLTableSource sqlTableSource) throws SqlParseException {
+    List<Field> fields = new ArrayList<>(exprs.size());
+    for (SQLExpr expr : exprs) {
+      // here we suppose groupby field will not have alias,so set null in second parameter
+      fields.add(fieldMaker.makeField(expr, null, sqlTableSource.getAlias()));
     }
+    return fields;
+  }
 
-    private List<Field> convertExprsToFields(List<? extends SQLExpr> exprs, SQLTableSource sqlTableSource)
-            throws SqlParseException {
-        List<Field> fields = new ArrayList<>(exprs.size());
-        for (SQLExpr expr : exprs) {
-            //here we suppose groupby field will not have alias,so set null in second parameter
-            fields.add(fieldMaker.makeField(expr, null, sqlTableSource.getAlias()));
-        }
-        return fields;
+  private String sameAliasWhere(Where where, String... aliases) throws SqlParseException {
+    if (where == null) {
+      return null;
     }
 
-    private String sameAliasWhere(Where where, String... aliases) throws SqlParseException {
-        if (where == null) {
-            return null;
-        }
-
-        if (where instanceof Condition) {
-            Condition condition = (Condition) where;
-            String fieldName = condition.getName();
-            for (String alias : aliases) {
-                String prefix = alias + ".";
-                if (fieldName.startsWith(prefix)) {
-                    return alias;
-                }
-            }
-            throw new SqlParseException(String.format("Field [%s] with condition [%s] does not contain an alias",
-                    fieldName, condition.toString()));
-        }
-        List<String> sameAliases = new ArrayList<>();
-        if (where.getWheres() != null && where.getWheres().size() > 0) {
-            for (Where innerWhere : where.getWheres()) {
-                sameAliases.add(sameAliasWhere(innerWhere, aliases));
-            }
-        }
-
-        if (sameAliases.contains(null)) {
-            return null;
-        }
-        String firstAlias = sameAliases.get(0);
-        //return null if more than one alias
-        for (String alias : sameAliases) {
-            if (!alias.equals(firstAlias)) {
-                return null;
-            }
-        }
-        return firstAlias;
-    }
-
-    private void addOrderByToSelect(Select select, MySqlSelectQueryBlock queryBlock, List<SQLSelectOrderByItem> items,
-                                    String alias)
-            throws SqlParseException {
-
-        Map<String, SQLExpr> aliasesToExpressions = queryBlock
-                .getSelectList()
-                .stream()
-                .filter(item -> item.getAlias() != null)
-                .collect(Collectors.toMap(SQLSelectItem::getAlias, SQLSelectItem::getExpr));
-
-        for (SQLSelectOrderByItem sqlSelectOrderByItem : items) {
-            if (sqlSelectOrderByItem.getType() == null) {
-                sqlSelectOrderByItem.setType(SQLOrderingSpecification.ASC);
-            }
-            String type = sqlSelectOrderByItem.getType().toString();
-            SQLExpr expr = extractExprFromOrderExpr(sqlSelectOrderByItem);
-
-            if (expr instanceof SQLIdentifierExpr) {
-                if (queryBlock.getGroupBy() == null || queryBlock.getGroupBy().getItems().isEmpty()) {
-                    if (aliasesToExpressions.containsKey(((SQLIdentifierExpr) expr).getName())) {
-                        expr = aliasesToExpressions.get(((SQLIdentifierExpr) expr).getName());
-                    }
-                }
-            }
-
-            Field field = fieldMaker.makeField(expr, null, null);
-
-            SQLExpr sqlExpr = sqlSelectOrderByItem.getExpr();
-            if (sqlExpr instanceof SQLBinaryOpExpr && hasNullOrderInBinaryOrderExpr(sqlExpr)) {
-                // override Field.expression to SQLBinaryOpExpr,
-                // which was set by FieldMaker.makeField() to SQLIdentifierExpr above
-                field.setExpression(sqlExpr);
-            }
-
-            String orderByName;
-            if (field.isScriptField()) {
-                MethodField methodField = (MethodField) field;
-
-                // 0 - generated field name
-                final int SCRIPT_CONTENT_INDEX = 1;
-                orderByName = methodField.getParams().get(SCRIPT_CONTENT_INDEX).toString();
-
-            } else {
-                orderByName = field.toString();
-            }
-
-            orderByName = orderByName.replace("`", "");
-            if (alias != null) {
-                orderByName = orderByName.replaceFirst(alias + "\\.", "");
-            }
-            select.addOrderBy(field.getNestedPath(), orderByName, type, field);
-        }
+    if (where instanceof Condition) {
+      Condition condition = (Condition) where;
+      String fieldName = condition.getName();
+      for (String alias : aliases) {
+        String prefix = alias + ".";
+        if (fieldName.startsWith(prefix)) {
+          return alias;
+        }
+      }
+      throw new SqlParseException(
+          String.format(
+              "Field [%s] with condition [%s] does not contain an alias",
+              fieldName, condition.toString()));
     }
-
-    private SQLExpr extractExprFromOrderExpr(SQLSelectOrderByItem sqlSelectOrderByItem) {
-        SQLExpr expr = sqlSelectOrderByItem.getExpr();
-
-        // extract SQLIdentifier from Order IS NULL/NOT NULL expression to generate Field
-        // else passing SQLBinaryOpExpr to FieldMaker.makeFieldImpl tries to convert to SQLMethodInvokeExpr
-        // and throws SQLParserException
-        if (hasNullOrderInBinaryOrderExpr(expr)) {
-            return ((SQLBinaryOpExpr) expr).getLeft();
-        }
-        return expr;
-    }
-
-    private boolean hasNullOrderInBinaryOrderExpr(SQLExpr expr) {
-        /**
-         * Valid AST that meets ORDER BY IS NULL/NOT NULL condition (true)
-         *
-         *            SQLSelectOrderByItem
-         *                      |
-         *             SQLBinaryOpExpr (Is || IsNot)
-         *                    /  \
-         *    SQLIdentifierExpr  SQLNullExpr
-         */
-        if (!(expr instanceof SQLBinaryOpExpr)) {
-            return false;
-        }
-
-        // check "shape of expression": <identifier> <operator> <NULL>
-        SQLBinaryOpExpr binaryExpr = (SQLBinaryOpExpr) expr;
-        if (!(binaryExpr.getLeft() instanceof SQLIdentifierExpr)|| !(binaryExpr.getRight() instanceof SQLNullExpr)) {
-            return false;
-        }
-
-        // check that operator IS or IS NOT
-        SQLBinaryOperator operator = binaryExpr.getOperator();
-        return operator == SQLBinaryOperator.Is || operator == SQLBinaryOperator.IsNot;
-
+    List<String> sameAliases = new ArrayList<>();
+    if (where.getWheres() != null && where.getWheres().size() > 0) {
+      for (Where innerWhere : where.getWheres()) {
+        sameAliases.add(sameAliasWhere(innerWhere, aliases));
+      }
     }
 
-    private void findLimit(MySqlSelectQueryBlock.Limit limit, Select select) {
-
-        if (limit == null) {
-            return;
-        }
+    if (sameAliases.contains(null)) {
+      return null;
+    }
+    String firstAlias = sameAliases.get(0);
+    // return null if more than one alias
+    for (String alias : sameAliases) {
+      if (!alias.equals(firstAlias)) {
+        return null;
+      }
+    }
+    return firstAlias;
+  }
+
+  private void addOrderByToSelect(
+      Select select,
+      MySqlSelectQueryBlock queryBlock,
+      List<SQLSelectOrderByItem> items,
+      String alias)
+      throws SqlParseException {
+
+    Map<String, SQLExpr> aliasesToExpressions =
+        queryBlock.getSelectList().stream()
+            .filter(item -> item.getAlias() != null)
+            .collect(Collectors.toMap(SQLSelectItem::getAlias, SQLSelectItem::getExpr));
+
+    for (SQLSelectOrderByItem sqlSelectOrderByItem : items) {
+      if (sqlSelectOrderByItem.getType() == null) {
+        sqlSelectOrderByItem.setType(SQLOrderingSpecification.ASC);
+      }
+      String type = sqlSelectOrderByItem.getType().toString();
+      SQLExpr expr = extractExprFromOrderExpr(sqlSelectOrderByItem);
+
+      if (expr instanceof SQLIdentifierExpr) {
+        if (queryBlock.getGroupBy() == null || queryBlock.getGroupBy().getItems().isEmpty()) {
+          if (aliasesToExpressions.containsKey(((SQLIdentifierExpr) expr).getName())) {
+            expr = aliasesToExpressions.get(((SQLIdentifierExpr) expr).getName());
+          }
+        }
+      }
+
+      Field field = fieldMaker.makeField(expr, null, null);
+
+      SQLExpr sqlExpr = sqlSelectOrderByItem.getExpr();
+      if (sqlExpr instanceof SQLBinaryOpExpr && hasNullOrderInBinaryOrderExpr(sqlExpr)) {
+        // override Field.expression to SQLBinaryOpExpr,
+        // which was set by FieldMaker.makeField() to SQLIdentifierExpr above
+        field.setExpression(sqlExpr);
+      }
+
+      String orderByName;
+      if (field.isScriptField()) {
+        MethodField methodField = (MethodField) field;
+
+        // 0 - generated field name
+        final int SCRIPT_CONTENT_INDEX = 1;
+        orderByName = methodField.getParams().get(SCRIPT_CONTENT_INDEX).toString();
+
+      } else {
+        orderByName = field.toString();
+      }
+
+      orderByName = orderByName.replace("`", "");
+      if (alias != null) {
+        orderByName = orderByName.replaceFirst(alias + "\\.", "");
+      }
+      select.addOrderBy(field.getNestedPath(), orderByName, type, field);
+    }
+  }
 
-        select.setRowCount(Integer.parseInt(limit.getRowCount().toString()));
+  private SQLExpr extractExprFromOrderExpr(SQLSelectOrderByItem sqlSelectOrderByItem) {
+    SQLExpr expr = sqlSelectOrderByItem.getExpr();
 
-        if (limit.getOffset() != null) {
-            select.setOffset(Integer.parseInt(limit.getOffset().toString()));
-        }
+    // extract SQLIdentifier from Order IS NULL/NOT NULL expression to generate Field
+    // else passing SQLBinaryOpExpr to FieldMaker.makeFieldImpl tries to convert to
+    // SQLMethodInvokeExpr
+    // and throws SQLParserException
+    if (hasNullOrderInBinaryOrderExpr(expr)) {
+      return ((SQLBinaryOpExpr) expr).getLeft();
     }
+    return expr;
+  }
 
+  private boolean hasNullOrderInBinaryOrderExpr(SQLExpr expr) {
     /**
-     * Parse the from clause
+     * Valid AST that meets ORDER BY IS NULL/NOT NULL condition (true)
      *
-     * @param from the from clause.
-     * @return list of From objects represents all the sources.
+     * <p>SQLSelectOrderByItem | SQLBinaryOpExpr (Is || IsNot) / \ SQLIdentifierExpr SQLNullExpr
      */
-    private List<From> findFrom(SQLTableSource from) {
-        boolean isSqlExprTable = from.getClass().isAssignableFrom(SQLExprTableSource.class);
-
-        if (isSqlExprTable) {
-            SQLExprTableSource fromExpr = (SQLExprTableSource) from;
-            String[] split = fromExpr.getExpr().toString().split(",");
-
-            ArrayList<From> fromList = new ArrayList<>();
-            for (String source : split) {
-                fromList.add(new From(source.trim(), fromExpr.getAlias()));
-            }
-            return fromList;
-        }
+    if (!(expr instanceof SQLBinaryOpExpr)) {
+      return false;
+    }
 
-        SQLJoinTableSource joinTableSource = ((SQLJoinTableSource) from);
-        List<From> fromList = new ArrayList<>();
-        fromList.addAll(findFrom(joinTableSource.getLeft()));
-        fromList.addAll(findFrom(joinTableSource.getRight()));
-        return fromList;
+    // check "shape of expression": <identifier> <operator> <NULL>
+    SQLBinaryOpExpr binaryExpr = (SQLBinaryOpExpr) expr;
+    if (!(binaryExpr.getLeft() instanceof SQLIdentifierExpr)
+        || !(binaryExpr.getRight() instanceof SQLNullExpr)) {
+      return false;
     }
 
-    public JoinSelect parseJoinSelect(SQLQueryExpr sqlExpr) throws SqlParseException {
+    // check that operator IS or IS NOT
+    SQLBinaryOperator operator = binaryExpr.getOperator();
+    return operator == SQLBinaryOperator.Is || operator == SQLBinaryOperator.IsNot;
+  }
 
-        MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) sqlExpr.getSubQuery().getQuery();
+  private void findLimit(MySqlSelectQueryBlock.Limit limit, Select select) {
 
-        List<From> joinedFrom = findJoinedFrom(query.getFrom());
-        if (joinedFrom.size() != 2) {
-            throw new RuntimeException("currently supports only 2 tables join");
-        }
+    if (limit == null) {
+      return;
+    }
 
-        JoinSelect joinSelect = createBasicJoinSelectAccordingToTableSource((SQLJoinTableSource) query.getFrom());
-        List<Hint> hints = parseHints(query.getHints());
-        joinSelect.setHints(hints);
-        String firstTableAlias = joinedFrom.get(0).getAlias();
-        String secondTableAlias = joinedFrom.get(1).getAlias();
-        Map<String, Where> aliasToWhere = splitAndFindWhere(query.getWhere(), firstTableAlias, secondTableAlias);
-        Map<String, List<SQLSelectOrderByItem>> aliasToOrderBy = splitAndFindOrder(query.getOrderBy(), firstTableAlias,
-                secondTableAlias);
-        List<Condition> connectedConditions = getConditionsFlatten(joinSelect.getConnectedWhere());
-        joinSelect.setConnectedConditions(connectedConditions);
-        fillTableSelectedJoin(joinSelect.getFirstTable(), query, joinedFrom.get(0),
-                aliasToWhere.get(firstTableAlias), aliasToOrderBy.get(firstTableAlias), connectedConditions);
-        fillTableSelectedJoin(joinSelect.getSecondTable(), query, joinedFrom.get(1),
-                aliasToWhere.get(secondTableAlias), aliasToOrderBy.get(secondTableAlias), connectedConditions);
-
-        updateJoinLimit(query.getLimit(), joinSelect);
-
-        //todo: throw error feature not supported:  no group bys on joins ?
-        return joinSelect;
-    }
-
-    private Map<String, List<SQLSelectOrderByItem>> splitAndFindOrder(SQLOrderBy orderBy, String firstTableAlias,
-                                                                      String secondTableAlias)
-            throws SqlParseException {
-        Map<String, List<SQLSelectOrderByItem>> aliasToOrderBys = new HashMap<>();
-        aliasToOrderBys.put(firstTableAlias, new ArrayList<>());
-        aliasToOrderBys.put(secondTableAlias, new ArrayList<>());
-        if (orderBy == null) {
-            return aliasToOrderBys;
-        }
-        List<SQLSelectOrderByItem> orderByItems = orderBy.getItems();
-        for (SQLSelectOrderByItem orderByItem : orderByItems) {
-            if (orderByItem.getExpr().toString().startsWith(firstTableAlias + ".")) {
-                aliasToOrderBys.get(firstTableAlias).add(orderByItem);
-            } else if (orderByItem.getExpr().toString().startsWith(secondTableAlias + ".")) {
-                aliasToOrderBys.get(secondTableAlias).add(orderByItem);
-            } else {
-                throw new SqlParseException("order by field on join request should have alias before, got "
-                        + orderByItem.getExpr().toString());
-            }
+    select.setRowCount(Integer.parseInt(limit.getRowCount().toString()));
 
-        }
-        return aliasToOrderBys;
+    if (limit.getOffset() != null) {
+      select.setOffset(Integer.parseInt(limit.getOffset().toString()));
     }
-
-    private void updateJoinLimit(MySqlSelectQueryBlock.Limit limit, JoinSelect joinSelect) {
-        if (limit != null && limit.getRowCount() != null) {
-            int sizeLimit = Integer.parseInt(limit.getRowCount().toString());
-            joinSelect.setTotalLimit(sizeLimit);
-        }
+  }
+
+  /**
+   * Parse the from clause
+   *
+   * @param from the from clause.
+   * @return list of From objects represents all the sources.
+   */
+  private List<From> findFrom(SQLTableSource from) {
+    boolean isSqlExprTable = from.getClass().isAssignableFrom(SQLExprTableSource.class);
+
+    if (isSqlExprTable) {
+      SQLExprTableSource fromExpr = (SQLExprTableSource) from;
+      String[] split = fromExpr.getExpr().toString().split(",");
+
+      ArrayList<From> fromList = new ArrayList<>();
+      for (String source : split) {
+        fromList.add(new From(source.trim(), fromExpr.getAlias()));
+      }
+      return fromList;
     }
 
-    private List<Hint> parseHints(List<SQLCommentHint> sqlHints) throws SqlParseException {
-        List<Hint> hints = new ArrayList<>();
-        for (SQLCommentHint sqlHint : sqlHints) {
-            Hint hint = HintFactory.getHintFromString(sqlHint.getText());
-            if (hint != null) {
-                hints.add(hint);
-            }
-        }
-        return hints;
-    }
+    SQLJoinTableSource joinTableSource = ((SQLJoinTableSource) from);
+    List<From> fromList = new ArrayList<>();
+    fromList.addAll(findFrom(joinTableSource.getLeft()));
+    fromList.addAll(findFrom(joinTableSource.getRight()));
+    return fromList;
+  }
 
-    private JoinSelect createBasicJoinSelectAccordingToTableSource(SQLJoinTableSource joinTableSource)
-            throws SqlParseException {
-        JoinSelect joinSelect = new JoinSelect();
-        if (joinTableSource.getCondition() != null) {
-            Where where = Where.newInstance();
-            WhereParser whereParser = new WhereParser(this, joinTableSource.getCondition());
-            whereParser.parseWhere(joinTableSource.getCondition(), where);
-            joinSelect.setConnectedWhere(where);
-        }
-        SQLJoinTableSource.JoinType joinType = joinTableSource.getJoinType();
-        joinSelect.setJoinType(joinType);
-        return joinSelect;
-    }
+  public JoinSelect parseJoinSelect(SQLQueryExpr sqlExpr) throws SqlParseException {
 
-    private Map<String, Where> splitAndFindWhere(SQLExpr whereExpr, String firstTableAlias, String secondTableAlias)
-            throws SqlParseException {
-        WhereParser whereParser = new WhereParser(this, whereExpr);
-        Where where = whereParser.findWhere();
-        return splitWheres(where, firstTableAlias, secondTableAlias);
-    }
+    MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) sqlExpr.getSubQuery().getQuery();
 
-    private void fillTableSelectedJoin(TableOnJoinSelect tableOnJoin, MySqlSelectQueryBlock query, From tableFrom,
-                                       Where where, List<SQLSelectOrderByItem> orderBys, List<Condition> conditions)
-            throws SqlParseException {
-        String alias = tableFrom.getAlias();
-        fillBasicTableSelectJoin(tableOnJoin, tableFrom, where, orderBys, query);
-        tableOnJoin.setConnectedFields(getConnectedFields(conditions, alias));
-        tableOnJoin.setSelectedFields(new ArrayList<>(tableOnJoin.getFields()));
-        tableOnJoin.setAlias(alias);
-        tableOnJoin.fillSubQueries();
+    List<From> joinedFrom = findJoinedFrom(query.getFrom());
+    if (joinedFrom.size() != 2) {
+      throw new RuntimeException("currently supports only 2 tables join");
     }
 
-    private List<Field> getConnectedFields(List<Condition> conditions, String alias) throws SqlParseException {
-        List<Field> fields = new ArrayList<>();
-        String prefix = alias + ".";
-        for (Condition condition : conditions) {
-            if (condition.getName().startsWith(prefix)) {
-                fields.add(new Field(condition.getName().replaceFirst(prefix, ""), null));
-            } else {
-                if (!((condition.getValue() instanceof SQLPropertyExpr)
-                        || (condition.getValue() instanceof SQLIdentifierExpr)
-                        || (condition.getValue() instanceof String))) {
-                    throw new SqlParseException("Illegal condition content: " + condition.toString());
-                }
-                String aliasDotValue = condition.getValue().toString();
-                int indexOfDot = aliasDotValue.indexOf(".");
-                String owner = aliasDotValue.substring(0, indexOfDot);
-                if (owner.equals(alias)) {
-                    fields.add(new Field(aliasDotValue.substring(indexOfDot + 1), null));
-                }
-            }
-        }
-        return fields;
+    JoinSelect joinSelect =
+        createBasicJoinSelectAccordingToTableSource((SQLJoinTableSource) query.getFrom());
+    List<Hint> hints = parseHints(query.getHints());
+    joinSelect.setHints(hints);
+    String firstTableAlias = joinedFrom.get(0).getAlias();
+    String secondTableAlias = joinedFrom.get(1).getAlias();
+    Map<String, Where> aliasToWhere =
+        splitAndFindWhere(query.getWhere(), firstTableAlias, secondTableAlias);
+    Map<String, List<SQLSelectOrderByItem>> aliasToOrderBy =
+        splitAndFindOrder(query.getOrderBy(), firstTableAlias, secondTableAlias);
+    List<Condition> connectedConditions = getConditionsFlatten(joinSelect.getConnectedWhere());
+    joinSelect.setConnectedConditions(connectedConditions);
+    fillTableSelectedJoin(
+        joinSelect.getFirstTable(),
+        query,
+        joinedFrom.get(0),
+        aliasToWhere.get(firstTableAlias),
+        aliasToOrderBy.get(firstTableAlias),
+        connectedConditions);
+    fillTableSelectedJoin(
+        joinSelect.getSecondTable(),
+        query,
+        joinedFrom.get(1),
+        aliasToWhere.get(secondTableAlias),
+        aliasToOrderBy.get(secondTableAlias),
+        connectedConditions);
+
+    updateJoinLimit(query.getLimit(), joinSelect);
+
+    // todo: throw error feature not supported:  no group bys on joins ?
+    return joinSelect;
+  }
+
+  private Map<String, List<SQLSelectOrderByItem>> splitAndFindOrder(
+      SQLOrderBy orderBy, String firstTableAlias, String secondTableAlias)
+      throws SqlParseException {
+    Map<String, List<SQLSelectOrderByItem>> aliasToOrderBys = new HashMap<>();
+    aliasToOrderBys.put(firstTableAlias, new ArrayList<>());
+    aliasToOrderBys.put(secondTableAlias, new ArrayList<>());
+    if (orderBy == null) {
+      return aliasToOrderBys;
     }
-
-    private void fillBasicTableSelectJoin(TableOnJoinSelect select, From from, Where where,
-                                          List<SQLSelectOrderByItem> orderBys, MySqlSelectQueryBlock query)
-            throws SqlParseException {
-        select.getFrom().add(from);
-        findSelect(query, select, from.getAlias());
-        select.setWhere(where);
-        addOrderByToSelect(select, query, orderBys, from.getAlias());
+    List<SQLSelectOrderByItem> orderByItems = orderBy.getItems();
+    for (SQLSelectOrderByItem orderByItem : orderByItems) {
+      if (orderByItem.getExpr().toString().startsWith(firstTableAlias + ".")) {
+        aliasToOrderBys.get(firstTableAlias).add(orderByItem);
+      } else if (orderByItem.getExpr().toString().startsWith(secondTableAlias + ".")) {
+        aliasToOrderBys.get(secondTableAlias).add(orderByItem);
+      } else {
+        throw new SqlParseException(
+            "order by field on join request should have alias before, got "
+                + orderByItem.getExpr().toString());
+      }
     }
+    return aliasToOrderBys;
+  }
 
-    private List<Condition> getJoinConditionsFlatten(SQLJoinTableSource from) throws SqlParseException {
-        List<Condition> conditions = new ArrayList<>();
-        if (from.getCondition() == null) {
-            return conditions;
-        }
-        Where where = Where.newInstance();
-        WhereParser whereParser = new WhereParser(this, from.getCondition());
-        whereParser.parseWhere(from.getCondition(), where);
-        addIfConditionRecursive(where, conditions);
-        return conditions;
+  private void updateJoinLimit(MySqlSelectQueryBlock.Limit limit, JoinSelect joinSelect) {
+    if (limit != null && limit.getRowCount() != null) {
+      int sizeLimit = Integer.parseInt(limit.getRowCount().toString());
+      joinSelect.setTotalLimit(sizeLimit);
     }
-
-    private List<Condition> getConditionsFlatten(Where where) throws SqlParseException {
-        List<Condition> conditions = new ArrayList<>();
-        if (where == null) {
-            return conditions;
-        }
-        addIfConditionRecursive(where, conditions);
-        return conditions;
+  }
+
+  private List<Hint> parseHints(List<SQLCommentHint> sqlHints) throws SqlParseException {
+    List<Hint> hints = new ArrayList<>();
+    for (SQLCommentHint sqlHint : sqlHints) {
+      Hint hint = HintFactory.getHintFromString(sqlHint.getText());
+      if (hint != null) {
+        hints.add(hint);
+      }
+    }
+    return hints;
+  }
+
+  private JoinSelect createBasicJoinSelectAccordingToTableSource(SQLJoinTableSource joinTableSource)
+      throws SqlParseException {
+    JoinSelect joinSelect = new JoinSelect();
+    if (joinTableSource.getCondition() != null) {
+      Where where = Where.newInstance();
+      WhereParser whereParser = new WhereParser(this, joinTableSource.getCondition());
+      whereParser.parseWhere(joinTableSource.getCondition(), where);
+      joinSelect.setConnectedWhere(where);
+    }
+    SQLJoinTableSource.JoinType joinType = joinTableSource.getJoinType();
+    joinSelect.setJoinType(joinType);
+    return joinSelect;
+  }
+
+  private Map<String, Where> splitAndFindWhere(
+      SQLExpr whereExpr, String firstTableAlias, String secondTableAlias) throws SqlParseException {
+    WhereParser whereParser = new WhereParser(this, whereExpr);
+    Where where = whereParser.findWhere();
+    return splitWheres(where, firstTableAlias, secondTableAlias);
+  }
+
+  private void fillTableSelectedJoin(
+      TableOnJoinSelect tableOnJoin,
+      MySqlSelectQueryBlock query,
+      From tableFrom,
+      Where where,
+      List<SQLSelectOrderByItem> orderBys,
+      List<Condition> conditions)
+      throws SqlParseException {
+    String alias = tableFrom.getAlias();
+    fillBasicTableSelectJoin(tableOnJoin, tableFrom, where, orderBys, query);
+    tableOnJoin.setConnectedFields(getConnectedFields(conditions, alias));
+    tableOnJoin.setSelectedFields(new ArrayList<>(tableOnJoin.getFields()));
+    tableOnJoin.setAlias(alias);
+    tableOnJoin.fillSubQueries();
+  }
+
+  private List<Field> getConnectedFields(List<Condition> conditions, String alias)
+      throws SqlParseException {
+    List<Field> fields = new ArrayList<>();
+    String prefix = alias + ".";
+    for (Condition condition : conditions) {
+      if (condition.getName().startsWith(prefix)) {
+        fields.add(new Field(condition.getName().replaceFirst(prefix, ""), null));
+      } else {
+        if (!((condition.getValue() instanceof SQLPropertyExpr)
+            || (condition.getValue() instanceof SQLIdentifierExpr)
+            || (condition.getValue() instanceof String))) {
+          throw new SqlParseException("Illegal condition content: " + condition.toString());
+        }
+        String aliasDotValue = condition.getValue().toString();
+        int indexOfDot = aliasDotValue.indexOf(".");
+        String owner = aliasDotValue.substring(0, indexOfDot);
+        if (owner.equals(alias)) {
+          fields.add(new Field(aliasDotValue.substring(indexOfDot + 1), null));
+        }
+      }
+    }
+    return fields;
+  }
+
+  private void fillBasicTableSelectJoin(
+      TableOnJoinSelect select,
+      From from,
+      Where where,
+      List<SQLSelectOrderByItem> orderBys,
+      MySqlSelectQueryBlock query)
+      throws SqlParseException {
+    select.getFrom().add(from);
+    findSelect(query, select, from.getAlias());
+    select.setWhere(where);
+    addOrderByToSelect(select, query, orderBys, from.getAlias());
+  }
+
+  private List<Condition> getJoinConditionsFlatten(SQLJoinTableSource from)
+      throws SqlParseException {
+    List<Condition> conditions = new ArrayList<>();
+    if (from.getCondition() == null) {
+      return conditions;
+    }
+    Where where = Where.newInstance();
+    WhereParser whereParser = new WhereParser(this, from.getCondition());
+    whereParser.parseWhere(from.getCondition(), where);
+    addIfConditionRecursive(where, conditions);
+    return conditions;
+  }
+
+  private List<Condition> getConditionsFlatten(Where where) throws SqlParseException {
+    List<Condition> conditions = new ArrayList<>();
+    if (where == null) {
+      return conditions;
+    }
+    addIfConditionRecursive(where, conditions);
+    return conditions;
+  }
+
+  private Map<String, Where> splitWheres(Where where, String... aliases) throws SqlParseException {
+    Map<String, Where> aliasToWhere = new HashMap<>();
+    for (String alias : aliases) {
+      aliasToWhere.put(alias, null);
+    }
+    if (where == null) {
+      return aliasToWhere;
     }
 
+    String allWhereFromSameAlias = sameAliasWhere(where, aliases);
+    if (allWhereFromSameAlias != null) {
+      removeAliasPrefix(where, allWhereFromSameAlias);
+      aliasToWhere.put(allWhereFromSameAlias, where);
+      return aliasToWhere;
+    }
+    for (Where innerWhere : where.getWheres()) {
+      String sameAlias = sameAliasWhere(innerWhere, aliases);
+      if (sameAlias == null) {
+        throw new SqlParseException(
+            "Currently support only one hierarchy on different tables where");
+      }
+      removeAliasPrefix(innerWhere, sameAlias);
+      Where aliasCurrentWhere = aliasToWhere.get(sameAlias);
+      if (aliasCurrentWhere == null) {
+        aliasToWhere.put(sameAlias, innerWhere);
+      } else {
+        Where andWhereContainer = Where.newInstance();
+        andWhereContainer.addWhere(aliasCurrentWhere);
+        andWhereContainer.addWhere(innerWhere);
+        aliasToWhere.put(sameAlias, andWhereContainer);
+      }
+    }
 
-    private Map<String, Where> splitWheres(Where where, String... aliases) throws SqlParseException {
-        Map<String, Where> aliasToWhere = new HashMap<>();
-        for (String alias : aliases) {
-            aliasToWhere.put(alias, null);
-        }
-        if (where == null) {
-            return aliasToWhere;
-        }
+    return aliasToWhere;
+  }
 
-        String allWhereFromSameAlias = sameAliasWhere(where, aliases);
-        if (allWhereFromSameAlias != null) {
-            removeAliasPrefix(where, allWhereFromSameAlias);
-            aliasToWhere.put(allWhereFromSameAlias, where);
-            return aliasToWhere;
-        }
-        for (Where innerWhere : where.getWheres()) {
-            String sameAlias = sameAliasWhere(innerWhere, aliases);
-            if (sameAlias == null) {
-                throw new SqlParseException("Currently support only one hierarchy on different tables where");
-            }
-            removeAliasPrefix(innerWhere, sameAlias);
-            Where aliasCurrentWhere = aliasToWhere.get(sameAlias);
-            if (aliasCurrentWhere == null) {
-                aliasToWhere.put(sameAlias, innerWhere);
-            } else {
-                Where andWhereContainer = Where.newInstance();
-                andWhereContainer.addWhere(aliasCurrentWhere);
-                andWhereContainer.addWhere(innerWhere);
-                aliasToWhere.put(sameAlias, andWhereContainer);
-            }
-        }
+  private void removeAliasPrefix(Where where, String alias) {
 
-        return aliasToWhere;
+    if (where instanceof Condition) {
+      Condition cond = (Condition) where;
+      String aliasPrefix = alias + ".";
+      cond.setName(cond.getName().replaceFirst(aliasPrefix, ""));
+      return;
     }
-
-    private void removeAliasPrefix(Where where, String alias) {
-
-        if (where instanceof Condition) {
-            Condition cond = (Condition) where;
-            String aliasPrefix = alias + ".";
-            cond.setName(cond.getName().replaceFirst(aliasPrefix, ""));
-            return;
-        }
-        for (Where innerWhere : where.getWheres()) {
-            removeAliasPrefix(innerWhere, alias);
-        }
+    for (Where innerWhere : where.getWheres()) {
+      removeAliasPrefix(innerWhere, alias);
     }
-
-    private void addIfConditionRecursive(Where where, List<Condition> conditions) throws SqlParseException {
-        if (where instanceof Condition) {
-            Condition cond = (Condition) where;
-            if (!((cond.getValue() instanceof SQLIdentifierExpr) || (cond.getValue() instanceof SQLPropertyExpr)
-                    || (cond.getValue() instanceof String))) {
-                throw new SqlParseException("conditions on join should be one side is secondTable OPEAR firstTable, "
-                        + "condition was:" + cond.toString());
-            }
-            conditions.add(cond);
-        }
-        for (Where innerWhere : where.getWheres()) {
-            addIfConditionRecursive(innerWhere, conditions);
-        }
+  }
+
+  private void addIfConditionRecursive(Where where, List<Condition> conditions)
+      throws SqlParseException {
+    if (where instanceof Condition) {
+      Condition cond = (Condition) where;
+      if (!((cond.getValue() instanceof SQLIdentifierExpr)
+          || (cond.getValue() instanceof SQLPropertyExpr)
+          || (cond.getValue() instanceof String))) {
+        throw new SqlParseException(
+            "conditions on join should be one side is secondTable OPEAR firstTable, "
+                + "condition was:"
+                + cond.toString());
+      }
+      conditions.add(cond);
     }
-
-    private List<From> findJoinedFrom(SQLTableSource from) {
-        SQLJoinTableSource joinTableSource = ((SQLJoinTableSource) from);
-        List<From> fromList = new ArrayList<>();
-        fromList.addAll(findFrom(joinTableSource.getLeft()));
-        fromList.addAll(findFrom(joinTableSource.getRight()));
-        return fromList;
+    for (Where innerWhere : where.getWheres()) {
+      addIfConditionRecursive(innerWhere, conditions);
     }
-
-
+  }
+
+  private List<From> findJoinedFrom(SQLTableSource from) {
+    SQLJoinTableSource joinTableSource = ((SQLJoinTableSource) from);
+    List<From> fromList = new ArrayList<>();
+    fromList.addAll(findFrom(joinTableSource.getLeft()));
+    fromList.addAll(findFrom(joinTableSource.getRight()));
+    return fromList;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SubQueryExpression.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SubQueryExpression.java
index 168318c490..e9b0797d00 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SubQueryExpression.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SubQueryExpression.java
@@ -3,42 +3,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import org.opensearch.sql.legacy.domain.Select;
 
-/**
- * Created by Eliran on 3/10/2015.
- */
+/** Created by Eliran on 3/10/2015. */
 public class SubQueryExpression {
-    private Object[] values;
-    private Select select;
-    private String returnField;
-
-    public SubQueryExpression(Select innerSelect) {
-        this.select = innerSelect;
-        this.returnField = select.getFields().get(0).getName();
-        values = null;
-    }
-
-    public Object[] getValues() {
-        return values;
-    }
-
-    public void setValues(Object[] values) {
-        this.values = values;
-    }
-
-    public Select getSelect() {
-        return select;
-    }
-
-    public void setSelect(Select select) {
-        this.select = select;
-    }
-
-    public String getReturnField() {
-        return returnField;
-    }
+  private Object[] values;
+  private Select select;
+  private String returnField;
+
+  public SubQueryExpression(Select innerSelect) {
+    this.select = innerSelect;
+    this.returnField = select.getFields().get(0).getName();
+    values = null;
+  }
+
+  public Object[] getValues() {
+    return values;
+  }
+
+  public void setValues(Object[] values) {
+    this.values = values;
+  }
+
+  public Select getSelect() {
+    return select;
+  }
+
+  public void setSelect(Select select) {
+    this.select = select;
+  }
+
+  public String getReturnField() {
+    return returnField;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SubQueryParser.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SubQueryParser.java
index 71b19db0cf..b6d04ddd54 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/SubQueryParser.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/SubQueryParser.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -23,88 +22,89 @@
 import org.opensearch.sql.legacy.domain.Where;
 import org.opensearch.sql.legacy.exception.SqlParseException;
 
-/**
- * Definition of SubQuery Parser
- */
+/** Definition of SubQuery Parser */
 public class SubQueryParser {
-    private final SqlParser sqlParser;
+  private final SqlParser sqlParser;
 
-    public SubQueryParser(SqlParser sqlParser) {
-        this.sqlParser = sqlParser;
-    }
+  public SubQueryParser(SqlParser sqlParser) {
+    this.sqlParser = sqlParser;
+  }
 
-    public boolean containSubqueryInFrom(MySqlSelectQueryBlock query) {
-        return query.getFrom() instanceof SQLSubqueryTableSource;
-    }
+  public boolean containSubqueryInFrom(MySqlSelectQueryBlock query) {
+    return query.getFrom() instanceof SQLSubqueryTableSource;
+  }
 
-    public Select parseSubQueryInFrom(MySqlSelectQueryBlock query) throws SqlParseException {
-        assert query.getFrom() instanceof SQLSubqueryTableSource;
+  public Select parseSubQueryInFrom(MySqlSelectQueryBlock query) throws SqlParseException {
+    assert query.getFrom() instanceof SQLSubqueryTableSource;
 
-        Select select = sqlParser.parseSelect(
-                (MySqlSelectQueryBlock) ((SQLSubqueryTableSource) query.getFrom()).getSelect()
-                .getQuery());
-        String subQueryAlias = query.getFrom().getAlias();
-        return pushSelect(query.getSelectList(), select, subQueryAlias);
-    }
+    Select select =
+        sqlParser.parseSelect(
+            (MySqlSelectQueryBlock)
+                ((SQLSubqueryTableSource) query.getFrom()).getSelect().getQuery());
+    String subQueryAlias = query.getFrom().getAlias();
+    return pushSelect(query.getSelectList(), select, subQueryAlias);
+  }
 
-    private Select pushSelect(List<SQLSelectItem> selectItems, Select subquerySelect, String subQueryAlias) {
-        Map<String, Function<String, String>> fieldAliasRewriter = prepareFieldAliasRewriter(
-                selectItems,
-                subQueryAlias);
+  private Select pushSelect(
+      List<SQLSelectItem> selectItems, Select subquerySelect, String subQueryAlias) {
+    Map<String, Function<String, String>> fieldAliasRewriter =
+        prepareFieldAliasRewriter(selectItems, subQueryAlias);
 
-        //1. rewrite field in select list
-        Iterator<Field> fieldIterator = subquerySelect.getFields().iterator();
-        while (fieldIterator.hasNext()) {
-            Field field = fieldIterator.next();
-            /*
-             * return true if the subquerySelectItem in the final select list.
-             * for example, subquerySelectItem is "SUM(emp.empno) as TEMP",
-             * and final select list is TEMP. then return true.
-             */
-            String fieldIdentifier = Strings.isNullOrEmpty(field.getAlias()) ? field.getName() : field.getAlias();
-            if (fieldAliasRewriter.containsKey(fieldIdentifier)) {
-                field.setAlias(fieldAliasRewriter.get(fieldIdentifier).apply(fieldIdentifier));
-            } else {
-                fieldIterator.remove();
-            }
-        }
-
-        //2. rewrite field in order by
-        for (Order orderBy : subquerySelect.getOrderBys()) {
-            if (fieldAliasRewriter.containsKey(orderBy.getName())) {
-                String replaceOrderName = fieldAliasRewriter.get(orderBy.getName()).apply(orderBy.getName());
-                orderBy.setName(replaceOrderName);
-                orderBy.getSortField().setName(replaceOrderName);
-            }
-        }
+    // 1. rewrite field in select list
+    Iterator<Field> fieldIterator = subquerySelect.getFields().iterator();
+    while (fieldIterator.hasNext()) {
+      Field field = fieldIterator.next();
+      /*
+       * return true if the subquerySelectItem in the final select list.
+       * for example, subquerySelectItem is "SUM(emp.empno) as TEMP",
+       * and final select list is TEMP. then return true.
+       */
+      String fieldIdentifier =
+          Strings.isNullOrEmpty(field.getAlias()) ? field.getName() : field.getAlias();
+      if (fieldAliasRewriter.containsKey(fieldIdentifier)) {
+        field.setAlias(fieldAliasRewriter.get(fieldIdentifier).apply(fieldIdentifier));
+      } else {
+        fieldIterator.remove();
+      }
+    }
 
-        // 3. rewrite field in having
-        if (subquerySelect.getHaving() != null) {
-            for (Where condition : subquerySelect.getHaving().getConditions()) {
-                Condition cond = (Condition) condition;
-                if (fieldAliasRewriter.containsKey(cond.getName())) {
-                    String replaceOrderName = fieldAliasRewriter.get(cond.getName()).apply(cond.getName());
-                    cond.setName(replaceOrderName);
-                }
-            }
-        }
-        return subquerySelect;
+    // 2. rewrite field in order by
+    for (Order orderBy : subquerySelect.getOrderBys()) {
+      if (fieldAliasRewriter.containsKey(orderBy.getName())) {
+        String replaceOrderName =
+            fieldAliasRewriter.get(orderBy.getName()).apply(orderBy.getName());
+        orderBy.setName(replaceOrderName);
+        orderBy.getSortField().setName(replaceOrderName);
+      }
     }
 
-    private Map<String, Function<String, String>> prepareFieldAliasRewriter(List<SQLSelectItem> selectItems,
-                                                                          String owner) {
-        HashMap<String, Function<String, String>> selectMap = new HashMap<>();
-        for (SQLSelectItem item : selectItems) {
-            if (Strings.isNullOrEmpty(item.getAlias())) {
-                selectMap.put(getFieldName(item.getExpr(), owner), Function.identity());
-            } else {
-                selectMap.put(getFieldName(item.getExpr(), owner), s -> item.getAlias());
-            }
+    // 3. rewrite field in having
+    if (subquerySelect.getHaving() != null) {
+      for (Where condition : subquerySelect.getHaving().getConditions()) {
+        Condition cond = (Condition) condition;
+        if (fieldAliasRewriter.containsKey(cond.getName())) {
+          String replaceOrderName = fieldAliasRewriter.get(cond.getName()).apply(cond.getName());
+          cond.setName(replaceOrderName);
         }
-        return selectMap;
+      }
     }
+    return subquerySelect;
+  }
 
-    private String getFieldName(SQLExpr expr, String owner) {
-        return expr.toString().replace(String.format("%s.", owner), "");
+  private Map<String, Function<String, String>> prepareFieldAliasRewriter(
+      List<SQLSelectItem> selectItems, String owner) {
+    HashMap<String, Function<String, String>> selectMap = new HashMap<>();
+    for (SQLSelectItem item : selectItems) {
+      if (Strings.isNullOrEmpty(item.getAlias())) {
+        selectMap.put(getFieldName(item.getExpr(), owner), Function.identity());
+      } else {
+        selectMap.put(getFieldName(item.getExpr(), owner), s -> item.getAlias());
+      }
     }
+    return selectMap;
+  }
+
+  private String getFieldName(SQLExpr expr, String owner) {
+    return expr.toString().replace(String.format("%s.", owner), "");
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/WhereParser.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/WhereParser.java
index c3ea5270e3..a329d1ed52 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/parser/WhereParser.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/parser/WhereParser.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -43,637 +42,808 @@
 import org.opensearch.sql.legacy.utils.SQLFunctions;
 import org.opensearch.sql.legacy.utils.Util;
 
-/**
- * Created by allwefantasy on 9/2/16.
- */
+/** Created by allwefantasy on 9/2/16. */
 public class WhereParser {
-    private FieldMaker fieldMaker;
+  private FieldMaker fieldMaker;
 
-    private MySqlSelectQueryBlock query;
-    private SQLDeleteStatement delete;
-    private SQLExpr where;
-    private SqlParser sqlParser;
+  private MySqlSelectQueryBlock query;
+  private SQLDeleteStatement delete;
+  private SQLExpr where;
+  private SqlParser sqlParser;
 
-    public WhereParser(SqlParser sqlParser, MySqlSelectQueryBlock query, FieldMaker fieldMaker) {
-        this.sqlParser = sqlParser;
-        this.where = query.getWhere();
-
-        this.query = query;
-        this.fieldMaker = fieldMaker;
-    }
+  public WhereParser(SqlParser sqlParser, MySqlSelectQueryBlock query, FieldMaker fieldMaker) {
+    this.sqlParser = sqlParser;
+    this.where = query.getWhere();
 
-    public WhereParser(SqlParser sqlParser, SQLDeleteStatement delete) {
-        this(sqlParser, delete.getWhere());
+    this.query = query;
+    this.fieldMaker = fieldMaker;
+  }
 
-        this.delete = delete;
-    }
+  public WhereParser(SqlParser sqlParser, SQLDeleteStatement delete) {
+    this(sqlParser, delete.getWhere());
 
-    public WhereParser(SqlParser sqlParser, SQLExpr expr) {
-        this(sqlParser);
-        this.where = expr;
-    }
+    this.delete = delete;
+  }
 
-    public WhereParser(SqlParser sqlParser) {
-        this.sqlParser = sqlParser;
-        this.fieldMaker = new FieldMaker();
-    }
+  public WhereParser(SqlParser sqlParser, SQLExpr expr) {
+    this(sqlParser);
+    this.where = expr;
+  }
 
-    public Where findWhere() throws SqlParseException {
-        if (where == null) {
-            return null;
-        }
+  public WhereParser(SqlParser sqlParser) {
+    this.sqlParser = sqlParser;
+    this.fieldMaker = new FieldMaker();
+  }
 
-        Where myWhere = Where.newInstance();
-        parseWhere(where, myWhere);
-        return myWhere;
+  public Where findWhere() throws SqlParseException {
+    if (where == null) {
+      return null;
     }
 
-    public void parseWhere(SQLExpr expr, Where where) throws SqlParseException {
-        if (expr instanceof SQLBinaryOpExpr) {
-            SQLBinaryOpExpr bExpr = (SQLBinaryOpExpr) expr;
-            if (explainSpecialCondWithBothSidesAreLiterals(bExpr, where)) {
-                return;
-            }
-            if (explainSpecialCondWithBothSidesAreProperty(bExpr, where)) {
-                return;
-            }
-        }
-
-        if (expr instanceof SQLBinaryOpExpr && !isCond((SQLBinaryOpExpr) expr)) {
-            SQLBinaryOpExpr bExpr = (SQLBinaryOpExpr) expr;
-            routeCond(bExpr, bExpr.getLeft(), where);
-            routeCond(bExpr, bExpr.getRight(), where);
-        } else if (expr instanceof SQLNotExpr) {
-            parseWhere(((SQLNotExpr) expr).getExpr(), where);
-            negateWhere(where);
-        } else {
-            explainCond("AND", expr, where);
-        }
+    Where myWhere = Where.newInstance();
+    parseWhere(where, myWhere);
+    return myWhere;
+  }
+
+  public void parseWhere(SQLExpr expr, Where where) throws SqlParseException {
+    if (expr instanceof SQLBinaryOpExpr) {
+      SQLBinaryOpExpr bExpr = (SQLBinaryOpExpr) expr;
+      if (explainSpecialCondWithBothSidesAreLiterals(bExpr, where)) {
+        return;
+      }
+      if (explainSpecialCondWithBothSidesAreProperty(bExpr, where)) {
+        return;
+      }
     }
 
-    private void negateWhere(Where where) throws SqlParseException {
-        for (Where sub : where.getWheres()) {
-            if (sub instanceof Condition) {
-                Condition cond = (Condition) sub;
-                cond.setOPERATOR(cond.getOPERATOR().negative());
-            } else {
-                negateWhere(sub);
-            }
-            sub.setConn(sub.getConn().negative());
-        }
+    if (expr instanceof SQLBinaryOpExpr && !isCond((SQLBinaryOpExpr) expr)) {
+      SQLBinaryOpExpr bExpr = (SQLBinaryOpExpr) expr;
+      routeCond(bExpr, bExpr.getLeft(), where);
+      routeCond(bExpr, bExpr.getRight(), where);
+    } else if (expr instanceof SQLNotExpr) {
+      parseWhere(((SQLNotExpr) expr).getExpr(), where);
+      negateWhere(where);
+    } else {
+      explainCond("AND", expr, where);
     }
-
-    //some where conditions eg. 1=1 or 3>2 or 'a'='b'
-    private boolean explainSpecialCondWithBothSidesAreLiterals(SQLBinaryOpExpr bExpr, Where where)
-            throws SqlParseException {
-        if ((bExpr.getLeft() instanceof SQLNumericLiteralExpr || bExpr.getLeft() instanceof SQLCharExpr)
-                && (bExpr.getRight() instanceof SQLNumericLiteralExpr || bExpr.getRight() instanceof SQLCharExpr)
-        ) {
-            SQLMethodInvokeExpr sqlMethodInvokeExpr = new SQLMethodInvokeExpr("script", null);
-            String operator = bExpr.getOperator().getName();
-            if (operator.equals("=")) {
-                operator = "==";
-            }
-            sqlMethodInvokeExpr.addParameter(
-                    new SQLCharExpr(Util.expr2Object(bExpr.getLeft(), "'")
-                            + " " + operator + " " + Util.expr2Object(bExpr.getRight(), "'"))
-            );
-
-            explainCond("AND", sqlMethodInvokeExpr, where);
-            return true;
-        }
-        return false;
+  }
+
+  private void negateWhere(Where where) throws SqlParseException {
+    for (Where sub : where.getWheres()) {
+      if (sub instanceof Condition) {
+        Condition cond = (Condition) sub;
+        cond.setOPERATOR(cond.getOPERATOR().negative());
+      } else {
+        negateWhere(sub);
+      }
+      sub.setConn(sub.getConn().negative());
     }
-
-    //some where conditions eg. field1=field2 or field1>field2
-    private boolean explainSpecialCondWithBothSidesAreProperty(SQLBinaryOpExpr bExpr, Where where)
-            throws SqlParseException {
-        //join is not support
-        if ((bExpr.getLeft() instanceof SQLPropertyExpr || bExpr.getLeft() instanceof SQLIdentifierExpr)
-                && (bExpr.getRight() instanceof SQLPropertyExpr || bExpr.getRight() instanceof SQLIdentifierExpr)
-                && Sets.newHashSet("=", "<", ">", ">=", "<=").contains(bExpr.getOperator().getName())
-                && !Util.isFromJoinOrUnionTable(bExpr)
-        ) {
-            SQLMethodInvokeExpr sqlMethodInvokeExpr = new SQLMethodInvokeExpr("script", null);
-            String operator = bExpr.getOperator().getName();
-            if (operator.equals("=")) {
-                operator = "==";
-            }
-
-            String leftProperty = Util.expr2Object(bExpr.getLeft()).toString();
-            String rightProperty = Util.expr2Object(bExpr.getRight()).toString();
-            if (leftProperty.split("\\.").length > 1) {
-
-                leftProperty = leftProperty.substring(leftProperty.split("\\.")[0].length() + 1);
-            }
-
-            if (rightProperty.split("\\.").length > 1) {
-                rightProperty = rightProperty.substring(rightProperty.split("\\.")[0].length() + 1);
-            }
-
-            sqlMethodInvokeExpr.addParameter(new SQLCharExpr(
-                    "doc['" + leftProperty + "'].value " + operator + " doc['" + rightProperty + "'].value"));
-
-            explainCond("AND", sqlMethodInvokeExpr, where);
-            return true;
-        }
-        return false;
+  }
+
+  // some where conditions eg. 1=1 or 3>2 or 'a'='b'
+  private boolean explainSpecialCondWithBothSidesAreLiterals(SQLBinaryOpExpr bExpr, Where where)
+      throws SqlParseException {
+    if ((bExpr.getLeft() instanceof SQLNumericLiteralExpr || bExpr.getLeft() instanceof SQLCharExpr)
+        && (bExpr.getRight() instanceof SQLNumericLiteralExpr
+            || bExpr.getRight() instanceof SQLCharExpr)) {
+      SQLMethodInvokeExpr sqlMethodInvokeExpr = new SQLMethodInvokeExpr("script", null);
+      String operator = bExpr.getOperator().getName();
+      if (operator.equals("=")) {
+        operator = "==";
+      }
+      sqlMethodInvokeExpr.addParameter(
+          new SQLCharExpr(
+              Util.expr2Object(bExpr.getLeft(), "'")
+                  + " "
+                  + operator
+                  + " "
+                  + Util.expr2Object(bExpr.getRight(), "'")));
+
+      explainCond("AND", sqlMethodInvokeExpr, where);
+      return true;
     }
-
-
-    private boolean isCond(SQLBinaryOpExpr expr) {
-        SQLExpr leftSide = expr.getLeft();
-        if (leftSide instanceof SQLMethodInvokeExpr) {
-            return isAllowedMethodOnConditionLeft((SQLMethodInvokeExpr) leftSide, expr.getOperator());
-        }
-        return leftSide instanceof SQLIdentifierExpr
-                || leftSide instanceof SQLPropertyExpr
-                || leftSide instanceof SQLVariantRefExpr
-                || leftSide instanceof SQLCastExpr;
+    return false;
+  }
+
+  // some where conditions eg. field1=field2 or field1>field2
+  private boolean explainSpecialCondWithBothSidesAreProperty(SQLBinaryOpExpr bExpr, Where where)
+      throws SqlParseException {
+    // join is not support
+    if ((bExpr.getLeft() instanceof SQLPropertyExpr || bExpr.getLeft() instanceof SQLIdentifierExpr)
+        && (bExpr.getRight() instanceof SQLPropertyExpr
+            || bExpr.getRight() instanceof SQLIdentifierExpr)
+        && Sets.newHashSet("=", "<", ">", ">=", "<=").contains(bExpr.getOperator().getName())
+        && !Util.isFromJoinOrUnionTable(bExpr)) {
+      SQLMethodInvokeExpr sqlMethodInvokeExpr = new SQLMethodInvokeExpr("script", null);
+      String operator = bExpr.getOperator().getName();
+      if (operator.equals("=")) {
+        operator = "==";
+      }
+
+      String leftProperty = Util.expr2Object(bExpr.getLeft()).toString();
+      String rightProperty = Util.expr2Object(bExpr.getRight()).toString();
+      if (leftProperty.split("\\.").length > 1) {
+
+        leftProperty = leftProperty.substring(leftProperty.split("\\.")[0].length() + 1);
+      }
+
+      if (rightProperty.split("\\.").length > 1) {
+        rightProperty = rightProperty.substring(rightProperty.split("\\.")[0].length() + 1);
+      }
+
+      sqlMethodInvokeExpr.addParameter(
+          new SQLCharExpr(
+              "doc['"
+                  + leftProperty
+                  + "'].value "
+                  + operator
+                  + " doc['"
+                  + rightProperty
+                  + "'].value"));
+
+      explainCond("AND", sqlMethodInvokeExpr, where);
+      return true;
     }
+    return false;
+  }
 
-    private boolean isAllowedMethodOnConditionLeft(SQLMethodInvokeExpr method, SQLBinaryOperator operator) {
-        return (method.getMethodName().toLowerCase().equals("nested")
-                || method.getMethodName().toLowerCase().equals("children")
-                || SQLFunctions.isFunctionTranslatedToScript(method.getMethodName())
-        ) && !operator.isLogical();
+  private boolean isCond(SQLBinaryOpExpr expr) {
+    SQLExpr leftSide = expr.getLeft();
+    if (leftSide instanceof SQLMethodInvokeExpr) {
+      return isAllowedMethodOnConditionLeft((SQLMethodInvokeExpr) leftSide, expr.getOperator());
     }
-
-
-    private void routeCond(SQLBinaryOpExpr bExpr, SQLExpr sub, Where where) throws SqlParseException {
-        if (sub instanceof SQLBinaryOpExpr && !isCond((SQLBinaryOpExpr) sub)) {
-            SQLBinaryOpExpr binarySub = (SQLBinaryOpExpr) sub;
-            if (binarySub.getOperator().priority != bExpr.getOperator().priority) {
-                Where subWhere = new Where(bExpr.getOperator().name);
-                where.addWhere(subWhere);
-                parseWhere(binarySub, subWhere);
-            } else {
-                parseWhere(binarySub, where);
-            }
-        } else if (sub instanceof SQLNotExpr) {
-            Where subWhere = new Where(bExpr.getOperator().name);
-            where.addWhere(subWhere);
-            parseWhere(((SQLNotExpr) sub).getExpr(), subWhere);
-            negateWhere(subWhere);
-        } else {
-            explainCond(bExpr.getOperator().name, sub, where);
-        }
+    return leftSide instanceof SQLIdentifierExpr
+        || leftSide instanceof SQLPropertyExpr
+        || leftSide instanceof SQLVariantRefExpr
+        || leftSide instanceof SQLCastExpr;
+  }
+
+  private boolean isAllowedMethodOnConditionLeft(
+      SQLMethodInvokeExpr method, SQLBinaryOperator operator) {
+    return (method.getMethodName().toLowerCase().equals("nested")
+            || method.getMethodName().toLowerCase().equals("children")
+            || SQLFunctions.isFunctionTranslatedToScript(method.getMethodName()))
+        && !operator.isLogical();
+  }
+
+  private void routeCond(SQLBinaryOpExpr bExpr, SQLExpr sub, Where where) throws SqlParseException {
+    if (sub instanceof SQLBinaryOpExpr && !isCond((SQLBinaryOpExpr) sub)) {
+      SQLBinaryOpExpr binarySub = (SQLBinaryOpExpr) sub;
+      if (binarySub.getOperator().priority != bExpr.getOperator().priority) {
+        Where subWhere = new Where(bExpr.getOperator().name);
+        where.addWhere(subWhere);
+        parseWhere(binarySub, subWhere);
+      } else {
+        parseWhere(binarySub, where);
+      }
+    } else if (sub instanceof SQLNotExpr) {
+      Where subWhere = new Where(bExpr.getOperator().name);
+      where.addWhere(subWhere);
+      parseWhere(((SQLNotExpr) sub).getExpr(), subWhere);
+      negateWhere(subWhere);
+    } else {
+      explainCond(bExpr.getOperator().name, sub, where);
     }
-
-    private void explainCond(String opear, SQLExpr expr, Where where) throws SqlParseException {
-        if (expr instanceof SQLBinaryOpExpr) {
-            SQLBinaryOpExpr soExpr = (SQLBinaryOpExpr) expr;
-
-            boolean methodAsOpear = false;
-
-            boolean isNested = false;
-            boolean isChildren = false;
-
-            NestedType nestedType = new NestedType();
-            if (nestedType.tryFillFromExpr(soExpr.getLeft())) {
-                soExpr.setLeft(new SQLIdentifierExpr(nestedType.field));
-                isNested = true;
-            }
-
-            ChildrenType childrenType = new ChildrenType();
-            if (childrenType.tryFillFromExpr(soExpr.getLeft())) {
-                soExpr.setLeft(new SQLIdentifierExpr(childrenType.field));
-                isChildren = true;
-            }
-
-            if (soExpr.getRight() instanceof SQLMethodInvokeExpr) {
-                SQLMethodInvokeExpr method = (SQLMethodInvokeExpr) soExpr.getRight();
-                String methodName = method.getMethodName().toLowerCase();
-
-                if (Condition.OPERATOR.methodNameToOpear.containsKey(methodName)) {
-                    Object[] methodParametersValue = getMethodValuesWithSubQueries(method);
-
-                    final Condition condition;
-                    // fix OPEAR
-                    Condition.OPERATOR oper = Condition.OPERATOR.methodNameToOpear.get(methodName);
-                    if (soExpr.getOperator() == SQLBinaryOperator.LessThanOrGreater
-                            || soExpr.getOperator() == SQLBinaryOperator.NotEqual) {
-                        oper = oper.negative();
-                    }
-                    if (isNested) {
-                        condition = new Condition(Where.CONN.valueOf(opear), soExpr.getLeft().toString(),
-                                soExpr.getLeft(), oper, methodParametersValue, soExpr.getRight(), nestedType);
-                    } else if (isChildren) {
-                        condition = new Condition(Where.CONN.valueOf(opear), soExpr.getLeft().toString(),
-                                soExpr.getLeft(), oper, methodParametersValue, soExpr.getRight(), childrenType);
-                    } else {
-                        condition = new Condition(Where.CONN.valueOf(opear), soExpr.getLeft().toString(),
-                                soExpr.getLeft(), oper, methodParametersValue, soExpr.getRight(), null);
-                    }
-
-                    where.addWhere(condition);
-                    methodAsOpear = true;
-                }
-            }
-
-            if (!methodAsOpear) {
-                final Condition condition;
-
-                if (isNested) {
-                    condition = new Condition(Where.CONN.valueOf(opear), soExpr.getLeft().toString(), soExpr.getLeft(),
-                            soExpr.getOperator().name, parseValue(soExpr.getRight()), soExpr.getRight(), nestedType);
-                } else if (isChildren) {
-                    condition = new Condition(Where.CONN.valueOf(opear), soExpr.getLeft().toString(), soExpr.getLeft(),
-                            soExpr.getOperator().name, parseValue(soExpr.getRight()), soExpr.getRight(), childrenType);
-                } else {
-                    SQLMethodInvokeExpr sqlMethodInvokeExpr = parseSQLBinaryOpExprWhoIsConditionInWhere(soExpr);
-                    if (sqlMethodInvokeExpr == null) {
-                        condition = new Condition(Where.CONN.valueOf(opear), soExpr.getLeft().toString(),
-                                soExpr.getLeft(), soExpr.getOperator().name, parseValue(soExpr.getRight()),
-                                soExpr.getRight(), null);
-                    } else {
-                        ScriptFilter scriptFilter = new ScriptFilter();
-                        if (!scriptFilter.tryParseFromMethodExpr(sqlMethodInvokeExpr)) {
-                            throw new SqlParseException("could not parse script filter");
-                        }
-                        condition = new Condition(Where.CONN.valueOf(opear), null, soExpr.getLeft(),
-                                "SCRIPT", scriptFilter, soExpr.getRight());
-
-                    }
-
-                }
-                where.addWhere(condition);
+  }
+
+  private void explainCond(String opear, SQLExpr expr, Where where) throws SqlParseException {
+    if (expr instanceof SQLBinaryOpExpr) {
+      SQLBinaryOpExpr soExpr = (SQLBinaryOpExpr) expr;
+
+      boolean methodAsOpear = false;
+
+      boolean isNested = false;
+      boolean isChildren = false;
+
+      NestedType nestedType = new NestedType();
+      if (nestedType.tryFillFromExpr(soExpr.getLeft())) {
+        soExpr.setLeft(new SQLIdentifierExpr(nestedType.field));
+        isNested = true;
+      }
+
+      ChildrenType childrenType = new ChildrenType();
+      if (childrenType.tryFillFromExpr(soExpr.getLeft())) {
+        soExpr.setLeft(new SQLIdentifierExpr(childrenType.field));
+        isChildren = true;
+      }
+
+      if (soExpr.getRight() instanceof SQLMethodInvokeExpr) {
+        SQLMethodInvokeExpr method = (SQLMethodInvokeExpr) soExpr.getRight();
+        String methodName = method.getMethodName().toLowerCase();
+
+        if (Condition.OPERATOR.methodNameToOpear.containsKey(methodName)) {
+          Object[] methodParametersValue = getMethodValuesWithSubQueries(method);
+
+          final Condition condition;
+          // fix OPEAR
+          Condition.OPERATOR oper = Condition.OPERATOR.methodNameToOpear.get(methodName);
+          if (soExpr.getOperator() == SQLBinaryOperator.LessThanOrGreater
+              || soExpr.getOperator() == SQLBinaryOperator.NotEqual) {
+            oper = oper.negative();
+          }
+          if (isNested) {
+            condition =
+                new Condition(
+                    Where.CONN.valueOf(opear),
+                    soExpr.getLeft().toString(),
+                    soExpr.getLeft(),
+                    oper,
+                    methodParametersValue,
+                    soExpr.getRight(),
+                    nestedType);
+          } else if (isChildren) {
+            condition =
+                new Condition(
+                    Where.CONN.valueOf(opear),
+                    soExpr.getLeft().toString(),
+                    soExpr.getLeft(),
+                    oper,
+                    methodParametersValue,
+                    soExpr.getRight(),
+                    childrenType);
+          } else {
+            condition =
+                new Condition(
+                    Where.CONN.valueOf(opear),
+                    soExpr.getLeft().toString(),
+                    soExpr.getLeft(),
+                    oper,
+                    methodParametersValue,
+                    soExpr.getRight(),
+                    null);
+          }
+
+          where.addWhere(condition);
+          methodAsOpear = true;
+        }
+      }
+
+      if (!methodAsOpear) {
+        final Condition condition;
+
+        if (isNested) {
+          condition =
+              new Condition(
+                  Where.CONN.valueOf(opear),
+                  soExpr.getLeft().toString(),
+                  soExpr.getLeft(),
+                  soExpr.getOperator().name,
+                  parseValue(soExpr.getRight()),
+                  soExpr.getRight(),
+                  nestedType);
+        } else if (isChildren) {
+          condition =
+              new Condition(
+                  Where.CONN.valueOf(opear),
+                  soExpr.getLeft().toString(),
+                  soExpr.getLeft(),
+                  soExpr.getOperator().name,
+                  parseValue(soExpr.getRight()),
+                  soExpr.getRight(),
+                  childrenType);
+        } else {
+          SQLMethodInvokeExpr sqlMethodInvokeExpr =
+              parseSQLBinaryOpExprWhoIsConditionInWhere(soExpr);
+          if (sqlMethodInvokeExpr == null) {
+            condition =
+                new Condition(
+                    Where.CONN.valueOf(opear),
+                    soExpr.getLeft().toString(),
+                    soExpr.getLeft(),
+                    soExpr.getOperator().name,
+                    parseValue(soExpr.getRight()),
+                    soExpr.getRight(),
+                    null);
+          } else {
+            ScriptFilter scriptFilter = new ScriptFilter();
+            if (!scriptFilter.tryParseFromMethodExpr(sqlMethodInvokeExpr)) {
+              throw new SqlParseException("could not parse script filter");
             }
-        } else if (expr instanceof SQLInListExpr) {
-            SQLInListExpr siExpr = (SQLInListExpr) expr;
-            String leftSide = siExpr.getExpr().toString();
-
-            boolean isNested = false;
-            boolean isChildren = false;
+            condition =
+                new Condition(
+                    Where.CONN.valueOf(opear),
+                    null,
+                    soExpr.getLeft(),
+                    "SCRIPT",
+                    scriptFilter,
+                    soExpr.getRight());
+          }
+        }
+        where.addWhere(condition);
+      }
+    } else if (expr instanceof SQLInListExpr) {
+      SQLInListExpr siExpr = (SQLInListExpr) expr;
+      String leftSide = siExpr.getExpr().toString();
 
-            NestedType nestedType = new NestedType();
-            if (nestedType.tryFillFromExpr(siExpr.getExpr())) {
-                leftSide = nestedType.field;
+      boolean isNested = false;
+      boolean isChildren = false;
 
-                isNested = false;
-            }
+      NestedType nestedType = new NestedType();
+      if (nestedType.tryFillFromExpr(siExpr.getExpr())) {
+        leftSide = nestedType.field;
 
-            ChildrenType childrenType = new ChildrenType();
-            if (childrenType.tryFillFromExpr(siExpr.getExpr())) {
-                leftSide = childrenType.field;
+        isNested = false;
+      }
 
-                isChildren = true;
-            }
+      ChildrenType childrenType = new ChildrenType();
+      if (childrenType.tryFillFromExpr(siExpr.getExpr())) {
+        leftSide = childrenType.field;
 
-            final Condition condition;
-
-            if (isNested) {
-                condition = new Condition(Where.CONN.valueOf(opear), leftSide, null, siExpr.isNot() ? "NOT IN" : "IN",
-                        parseValue(siExpr.getTargetList()), null, nestedType);
-            } else if (isChildren) {
-                condition = new Condition(Where.CONN.valueOf(opear), leftSide, null, siExpr.isNot() ? "NOT IN" : "IN",
-                        parseValue(siExpr.getTargetList()), null, childrenType);
-            } else {
-                condition = new Condition(Where.CONN.valueOf(opear), leftSide, null, siExpr.isNot() ? "NOT IN" : "IN",
-                        parseValue(siExpr.getTargetList()), null);
-            }
+        isChildren = true;
+      }
 
-            where.addWhere(condition);
-        } else if (expr instanceof SQLBetweenExpr) {
-            SQLBetweenExpr between = ((SQLBetweenExpr) expr);
-            String leftSide = between.getTestExpr().toString();
+      final Condition condition;
 
-            boolean isNested = false;
-            boolean isChildren = false;
+      if (isNested) {
+        condition =
+            new Condition(
+                Where.CONN.valueOf(opear),
+                leftSide,
+                null,
+                siExpr.isNot() ? "NOT IN" : "IN",
+                parseValue(siExpr.getTargetList()),
+                null,
+                nestedType);
+      } else if (isChildren) {
+        condition =
+            new Condition(
+                Where.CONN.valueOf(opear),
+                leftSide,
+                null,
+                siExpr.isNot() ? "NOT IN" : "IN",
+                parseValue(siExpr.getTargetList()),
+                null,
+                childrenType);
+      } else {
+        condition =
+            new Condition(
+                Where.CONN.valueOf(opear),
+                leftSide,
+                null,
+                siExpr.isNot() ? "NOT IN" : "IN",
+                parseValue(siExpr.getTargetList()),
+                null);
+      }
 
-            NestedType nestedType = new NestedType();
-            if (nestedType.tryFillFromExpr(between.getTestExpr())) {
-                leftSide = nestedType.field;
+      where.addWhere(condition);
+    } else if (expr instanceof SQLBetweenExpr) {
+      SQLBetweenExpr between = ((SQLBetweenExpr) expr);
+      String leftSide = between.getTestExpr().toString();
 
-                isNested = true;
-            }
+      boolean isNested = false;
+      boolean isChildren = false;
 
-            ChildrenType childrenType = new ChildrenType();
-            if (childrenType.tryFillFromExpr(between.getTestExpr())) {
-                leftSide = childrenType.field;
+      NestedType nestedType = new NestedType();
+      if (nestedType.tryFillFromExpr(between.getTestExpr())) {
+        leftSide = nestedType.field;
 
-                isChildren = true;
-            }
+        isNested = true;
+      }
 
-            final Condition condition;
-
-            if (isNested) {
-                condition = new Condition(Where.CONN.valueOf(opear), leftSide, null,
-                        between.isNot() ? "NOT BETWEEN" : "BETWEEN", new Object[]{parseValue(between.beginExpr),
-                        parseValue(between.endExpr)}, null, nestedType);
-            } else if (isChildren) {
-                condition = new Condition(Where.CONN.valueOf(opear), leftSide, null,
-                        between.isNot() ? "NOT BETWEEN" : "BETWEEN", new Object[]{parseValue(between.beginExpr),
-                        parseValue(between.endExpr)}, null, childrenType);
-            } else {
-                condition = new Condition(Where.CONN.valueOf(opear), leftSide, null,
-                        between.isNot() ? "NOT BETWEEN" : "BETWEEN", new Object[]{parseValue(between.beginExpr),
-                        parseValue(between.endExpr)}, null, null);
-            }
+      ChildrenType childrenType = new ChildrenType();
+      if (childrenType.tryFillFromExpr(between.getTestExpr())) {
+        leftSide = childrenType.field;
 
-            where.addWhere(condition);
-        } else if (expr instanceof SQLMethodInvokeExpr) {
-
-            SQLMethodInvokeExpr methodExpr = (SQLMethodInvokeExpr) expr;
-            List<SQLExpr> methodParameters = methodExpr.getParameters();
-
-            String methodName = methodExpr.getMethodName();
-            if (SpatialParamsFactory.isAllowedMethod(methodName)) {
-                String fieldName = methodParameters.get(0).toString();
-
-                boolean isNested = false;
-                boolean isChildren = false;
-
-                NestedType nestedType = new NestedType();
-                if (nestedType.tryFillFromExpr(methodParameters.get(0))) {
-                    fieldName = nestedType.field;
-
-                    isNested = true;
-                }
-
-                ChildrenType childrenType = new ChildrenType();
-                if (childrenType.tryFillFromExpr(methodParameters.get(0))) {
-                    fieldName = childrenType.field;
-
-                    isChildren = true;
-                }
-
-                Object spatialParamsObject = SpatialParamsFactory.generateSpatialParamsObject(methodName,
-                        methodParameters);
-
-                final Condition condition;
-
-                if (isNested) {
-                    condition = new Condition(Where.CONN.valueOf(opear), fieldName, null, methodName,
-                            spatialParamsObject, null, nestedType);
-                } else if (isChildren) {
-                    condition = new Condition(Where.CONN.valueOf(opear), fieldName, null, methodName,
-                            spatialParamsObject, null, childrenType);
-                } else {
-                    condition = new Condition(Where.CONN.valueOf(opear), fieldName, null, methodName,
-                            spatialParamsObject, null, null);
-                }
-
-                where.addWhere(condition);
-            } else if (methodName.toLowerCase().equals("nested")) {
-                NestedType nestedType = new NestedType();
-
-                if (!nestedType.tryFillFromExpr(expr)) {
-                    throw new SqlParseException("could not fill nested from expr:" + expr);
-                }
-
-                Condition condition = new Condition(Where.CONN.valueOf(opear), nestedType.path, null,
-                        methodName.toUpperCase(), nestedType.where, null);
-
-                where.addWhere(condition);
-            } else if (methodName.toLowerCase().equals("children")) {
-                ChildrenType childrenType = new ChildrenType();
-
-                if (!childrenType.tryFillFromExpr(expr)) {
-                    throw new SqlParseException("could not fill children from expr:" + expr);
-                }
-
-                Condition condition = new Condition(Where.CONN.valueOf(opear), childrenType.childType, null,
-                        methodName.toUpperCase(), childrenType.where, null);
-
-                where.addWhere(condition);
-            } else if (methodName.toLowerCase().equals("script")) {
-                ScriptFilter scriptFilter = new ScriptFilter();
-                if (!scriptFilter.tryParseFromMethodExpr(methodExpr)) {
-                    throw new SqlParseException("could not parse script filter");
-                }
-                Condition condition = new Condition(Where.CONN.valueOf(opear), null, null, "SCRIPT",
-                        scriptFilter, null);
-                where.addWhere(condition);
-            } else if (Maker.isQueryFunction(methodName)) {
-                Condition condition = getConditionForMethod(expr, Where.CONN.valueOf(opear));
-
-                where.addWhere(condition);
-            } else {
-                throw new SqlParseException("unsupported method: " + methodName);
-            }
-        } else if (expr instanceof SQLInSubQueryExpr) {
-            SQLInSubQueryExpr sqlIn = (SQLInSubQueryExpr) expr;
+        isChildren = true;
+      }
 
-            Select innerSelect = sqlParser.parseSelect((MySqlSelectQueryBlock) sqlIn.getSubQuery().getQuery());
+      final Condition condition;
 
-            if (innerSelect.getFields() == null || innerSelect.getFields().size() != 1) {
-                throw new SqlParseException("should only have one return field in subQuery");
-            }
+      if (isNested) {
+        condition =
+            new Condition(
+                Where.CONN.valueOf(opear),
+                leftSide,
+                null,
+                between.isNot() ? "NOT BETWEEN" : "BETWEEN",
+                new Object[] {parseValue(between.beginExpr), parseValue(between.endExpr)},
+                null,
+                nestedType);
+      } else if (isChildren) {
+        condition =
+            new Condition(
+                Where.CONN.valueOf(opear),
+                leftSide,
+                null,
+                between.isNot() ? "NOT BETWEEN" : "BETWEEN",
+                new Object[] {parseValue(between.beginExpr), parseValue(between.endExpr)},
+                null,
+                childrenType);
+      } else {
+        condition =
+            new Condition(
+                Where.CONN.valueOf(opear),
+                leftSide,
+                null,
+                between.isNot() ? "NOT BETWEEN" : "BETWEEN",
+                new Object[] {parseValue(between.beginExpr), parseValue(between.endExpr)},
+                null,
+                null);
+      }
 
-            SubQueryExpression subQueryExpression = new SubQueryExpression(innerSelect);
+      where.addWhere(condition);
+    } else if (expr instanceof SQLMethodInvokeExpr) {
 
-            String leftSide = sqlIn.getExpr().toString();
+      SQLMethodInvokeExpr methodExpr = (SQLMethodInvokeExpr) expr;
+      List<SQLExpr> methodParameters = methodExpr.getParameters();
 
-            boolean isNested = false;
-            boolean isChildren = false;
+      String methodName = methodExpr.getMethodName();
+      if (SpatialParamsFactory.isAllowedMethod(methodName)) {
+        String fieldName = methodParameters.get(0).toString();
 
-            NestedType nestedType = new NestedType();
-            if (nestedType.tryFillFromExpr(sqlIn.getExpr())) {
-                leftSide = nestedType.field;
+        boolean isNested = false;
+        boolean isChildren = false;
 
-                isNested = true;
-            }
+        NestedType nestedType = new NestedType();
+        if (nestedType.tryFillFromExpr(methodParameters.get(0))) {
+          fieldName = nestedType.field;
 
-            ChildrenType childrenType = new ChildrenType();
-            if (childrenType.tryFillFromExpr(sqlIn.getExpr())) {
-                leftSide = childrenType.field;
+          isNested = true;
+        }
 
-                isChildren = true;
-            }
+        ChildrenType childrenType = new ChildrenType();
+        if (childrenType.tryFillFromExpr(methodParameters.get(0))) {
+          fieldName = childrenType.field;
 
-            final Condition condition;
-
-            if (isNested) {
-                condition = new Condition(Where.CONN.valueOf(opear), leftSide, null, sqlIn.isNot() ? "NOT IN" : "IN",
-                        subQueryExpression, null, nestedType);
-            } else if (isChildren) {
-                condition = new Condition(Where.CONN.valueOf(opear), leftSide, null, sqlIn.isNot() ? "NOT IN" : "IN",
-                        subQueryExpression, null, childrenType);
-            } else {
-                condition = new Condition(Where.CONN.valueOf(opear), leftSide, null, sqlIn.isNot() ? "NOT IN" : "IN",
-                        subQueryExpression, null, null);
-            }
+          isChildren = true;
+        }
 
-            where.addWhere(condition);
+        Object spatialParamsObject =
+            SpatialParamsFactory.generateSpatialParamsObject(methodName, methodParameters);
+
+        final Condition condition;
+
+        if (isNested) {
+          condition =
+              new Condition(
+                  Where.CONN.valueOf(opear),
+                  fieldName,
+                  null,
+                  methodName,
+                  spatialParamsObject,
+                  null,
+                  nestedType);
+        } else if (isChildren) {
+          condition =
+              new Condition(
+                  Where.CONN.valueOf(opear),
+                  fieldName,
+                  null,
+                  methodName,
+                  spatialParamsObject,
+                  null,
+                  childrenType);
         } else {
-            throw new SqlParseException("err find condition " + expr.getClass());
+          condition =
+              new Condition(
+                  Where.CONN.valueOf(opear),
+                  fieldName,
+                  null,
+                  methodName,
+                  spatialParamsObject,
+                  null,
+                  null);
         }
-    }
 
-    private MethodField parseSQLMethodInvokeExprWithFunctionInWhere(SQLMethodInvokeExpr soExpr)
-            throws SqlParseException {
+        where.addWhere(condition);
+      } else if (methodName.toLowerCase().equals("nested")) {
+        NestedType nestedType = new NestedType();
 
-        MethodField methodField = fieldMaker.makeMethodField(soExpr.getMethodName(),
-                soExpr.getParameters(),
-                null,
-                null,
-                query != null ? query.getFrom().getAlias() : null,
-                false);
-        return methodField;
-    }
+        if (!nestedType.tryFillFromExpr(expr)) {
+          throw new SqlParseException("could not fill nested from expr:" + expr);
+        }
 
-    private MethodField parseSQLCastExprWithFunctionInWhere(SQLCastExpr soExpr) throws SqlParseException {
-        ArrayList<SQLExpr> parameters = new ArrayList<>();
-        parameters.add(soExpr.getExpr());
-        return fieldMaker.makeMethodField(
-                "CAST",
-                parameters,
+        Condition condition =
+            new Condition(
+                Where.CONN.valueOf(opear),
+                nestedType.path,
                 null,
-                null,
-                query != null ? query.getFrom().getAlias() : null,
-                false
-        );
-    }
+                methodName.toUpperCase(),
+                nestedType.where,
+                null);
 
-    private SQLMethodInvokeExpr parseSQLBinaryOpExprWhoIsConditionInWhere(SQLBinaryOpExpr soExpr)
-            throws SqlParseException {
-
-        if (bothSideAreNotFunction(soExpr) && bothSidesAreNotCast(soExpr)) {
-            return null;
-        }
+        where.addWhere(condition);
+      } else if (methodName.toLowerCase().equals("children")) {
+        ChildrenType childrenType = new ChildrenType();
 
-        if (soExpr.getLeft() instanceof SQLMethodInvokeExpr) {
-            if (!SQLFunctions.isFunctionTranslatedToScript(((SQLMethodInvokeExpr) soExpr.getLeft()).getMethodName())) {
-                return null;
-            }
+        if (!childrenType.tryFillFromExpr(expr)) {
+          throw new SqlParseException("could not fill children from expr:" + expr);
         }
 
-        if (soExpr.getRight() instanceof SQLMethodInvokeExpr) {
-            if (!SQLFunctions.isFunctionTranslatedToScript(((SQLMethodInvokeExpr) soExpr.getRight()).getMethodName())) {
-                return null;
-            }
+        Condition condition =
+            new Condition(
+                Where.CONN.valueOf(opear),
+                childrenType.childType,
+                null,
+                methodName.toUpperCase(),
+                childrenType.where,
+                null);
+
+        where.addWhere(condition);
+      } else if (methodName.toLowerCase().equals("script")) {
+        ScriptFilter scriptFilter = new ScriptFilter();
+        if (!scriptFilter.tryParseFromMethodExpr(methodExpr)) {
+          throw new SqlParseException("could not parse script filter");
         }
+        Condition condition =
+            new Condition(Where.CONN.valueOf(opear), null, null, "SCRIPT", scriptFilter, null);
+        where.addWhere(condition);
+      } else if (Maker.isQueryFunction(methodName)) {
+        Condition condition = getConditionForMethod(expr, Where.CONN.valueOf(opear));
 
+        where.addWhere(condition);
+      } else {
+        throw new SqlParseException("unsupported method: " + methodName);
+      }
+    } else if (expr instanceof SQLInSubQueryExpr) {
+      SQLInSubQueryExpr sqlIn = (SQLInSubQueryExpr) expr;
 
-        MethodField leftMethod = new MethodField(null, Lists.newArrayList(
-                new KVValue("", Util.expr2Object(soExpr.getLeft(), "'"))), null, null);
-        MethodField rightMethod = new MethodField(null, Lists.newArrayList(
-                new KVValue("", Util.expr2Object(soExpr.getRight(), "'"))), null, null);
+      Select innerSelect =
+          sqlParser.parseSelect((MySqlSelectQueryBlock) sqlIn.getSubQuery().getQuery());
 
-        if (soExpr.getLeft() instanceof SQLIdentifierExpr || soExpr.getLeft() instanceof SQLPropertyExpr) {
-            leftMethod = new MethodField(null, Lists.newArrayList(
-                    new KVValue("", "doc['" + Util.expr2Object(soExpr.getLeft(), "'") + "'].value")),
-                    null, null);
-        }
-
-        if (soExpr.getRight() instanceof SQLIdentifierExpr || soExpr.getRight() instanceof SQLPropertyExpr) {
-            rightMethod = new MethodField(null, Lists.newArrayList(
-                    new KVValue("", "doc['" + Util.expr2Object(soExpr.getRight(), "'") + "'].value")),
-                    null, null);
-        }
+      if (innerSelect.getFields() == null || innerSelect.getFields().size() != 1) {
+        throw new SqlParseException("should only have one return field in subQuery");
+      }
 
-        if (soExpr.getLeft() instanceof SQLMethodInvokeExpr) {
-            leftMethod = parseSQLMethodInvokeExprWithFunctionInWhere((SQLMethodInvokeExpr) soExpr.getLeft());
-        }
-        if (soExpr.getRight() instanceof SQLMethodInvokeExpr) {
-            rightMethod = parseSQLMethodInvokeExprWithFunctionInWhere((SQLMethodInvokeExpr) soExpr.getRight());
-        }
+      SubQueryExpression subQueryExpression = new SubQueryExpression(innerSelect);
 
-        if (soExpr.getLeft() instanceof SQLCastExpr) {
-            leftMethod = parseSQLCastExprWithFunctionInWhere((SQLCastExpr) soExpr.getLeft());
-        }
-        if (soExpr.getRight() instanceof SQLCastExpr) {
-            rightMethod = parseSQLCastExprWithFunctionInWhere((SQLCastExpr) soExpr.getRight());
-        }
+      String leftSide = sqlIn.getExpr().toString();
 
-        String v1 = leftMethod.getParams().get(0).value.toString();
-        String v1Dec = leftMethod.getParams().size() == 2 ? leftMethod.getParams().get(1).value.toString() + ";" : "";
+      boolean isNested = false;
+      boolean isChildren = false;
 
+      NestedType nestedType = new NestedType();
+      if (nestedType.tryFillFromExpr(sqlIn.getExpr())) {
+        leftSide = nestedType.field;
 
-        String v2 = rightMethod.getParams().get(0).value.toString();
-        String v2Dec = rightMethod.getParams().size() == 2 ? rightMethod.getParams().get(1).value.toString() + ";" : "";
+        isNested = true;
+      }
 
-        String operator = soExpr.getOperator().getName();
+      ChildrenType childrenType = new ChildrenType();
+      if (childrenType.tryFillFromExpr(sqlIn.getExpr())) {
+        leftSide = childrenType.field;
 
-        if (operator.equals("=")) {
-            operator = "==";
-        }
+        isChildren = true;
+      }
 
-        String finalStr = v1Dec + v2Dec + v1 + " " + operator + " " + v2;
+      final Condition condition;
 
-        SQLMethodInvokeExpr scriptMethod = new SQLMethodInvokeExpr("script", null);
-        scriptMethod.addParameter(new SQLCharExpr(finalStr));
-        return scriptMethod;
+      if (isNested) {
+        condition =
+            new Condition(
+                Where.CONN.valueOf(opear),
+                leftSide,
+                null,
+                sqlIn.isNot() ? "NOT IN" : "IN",
+                subQueryExpression,
+                null,
+                nestedType);
+      } else if (isChildren) {
+        condition =
+            new Condition(
+                Where.CONN.valueOf(opear),
+                leftSide,
+                null,
+                sqlIn.isNot() ? "NOT IN" : "IN",
+                subQueryExpression,
+                null,
+                childrenType);
+      } else {
+        condition =
+            new Condition(
+                Where.CONN.valueOf(opear),
+                leftSide,
+                null,
+                sqlIn.isNot() ? "NOT IN" : "IN",
+                subQueryExpression,
+                null,
+                null);
+      }
 
+      where.addWhere(condition);
+    } else {
+      throw new SqlParseException("err find condition " + expr.getClass());
+    }
+  }
+
+  private MethodField parseSQLMethodInvokeExprWithFunctionInWhere(SQLMethodInvokeExpr soExpr)
+      throws SqlParseException {
+
+    MethodField methodField =
+        fieldMaker.makeMethodField(
+            soExpr.getMethodName(),
+            soExpr.getParameters(),
+            null,
+            null,
+            query != null ? query.getFrom().getAlias() : null,
+            false);
+    return methodField;
+  }
+
+  private MethodField parseSQLCastExprWithFunctionInWhere(SQLCastExpr soExpr)
+      throws SqlParseException {
+    ArrayList<SQLExpr> parameters = new ArrayList<>();
+    parameters.add(soExpr.getExpr());
+    return fieldMaker.makeMethodField(
+        "CAST", parameters, null, null, query != null ? query.getFrom().getAlias() : null, false);
+  }
+
+  private SQLMethodInvokeExpr parseSQLBinaryOpExprWhoIsConditionInWhere(SQLBinaryOpExpr soExpr)
+      throws SqlParseException {
+
+    if (bothSideAreNotFunction(soExpr) && bothSidesAreNotCast(soExpr)) {
+      return null;
     }
 
-    private Boolean bothSideAreNotFunction(SQLBinaryOpExpr soExpr) {
-        return !(soExpr.getLeft() instanceof SQLMethodInvokeExpr || soExpr.getRight() instanceof SQLMethodInvokeExpr);
+    if (soExpr.getLeft() instanceof SQLMethodInvokeExpr) {
+      if (!SQLFunctions.isFunctionTranslatedToScript(
+          ((SQLMethodInvokeExpr) soExpr.getLeft()).getMethodName())) {
+        return null;
+      }
     }
 
-    private Boolean bothSidesAreNotCast(SQLBinaryOpExpr soExpr) {
-        return !(soExpr.getLeft() instanceof SQLCastExpr || soExpr.getRight() instanceof SQLCastExpr);
+    if (soExpr.getRight() instanceof SQLMethodInvokeExpr) {
+      if (!SQLFunctions.isFunctionTranslatedToScript(
+          ((SQLMethodInvokeExpr) soExpr.getRight()).getMethodName())) {
+        return null;
+      }
     }
 
-    private Object[] getMethodValuesWithSubQueries(SQLMethodInvokeExpr method) throws SqlParseException {
-        List<Object> values = new ArrayList<>();
-        for (SQLExpr innerExpr : method.getParameters()) {
-            if (innerExpr instanceof SQLQueryExpr) {
-                Select select = sqlParser.parseSelect((MySqlSelectQueryBlock) ((SQLQueryExpr) innerExpr).getSubQuery()
-                        .getQuery());
-                values.add(new SubQueryExpression(select));
-            } else if (innerExpr instanceof SQLTextLiteralExpr) {
-                values.add(((SQLTextLiteralExpr) innerExpr).getText());
-            } else {
-                values.add(innerExpr);
-            }
+    MethodField leftMethod =
+        new MethodField(
+            null,
+            Lists.newArrayList(new KVValue("", Util.expr2Object(soExpr.getLeft(), "'"))),
+            null,
+            null);
+    MethodField rightMethod =
+        new MethodField(
+            null,
+            Lists.newArrayList(new KVValue("", Util.expr2Object(soExpr.getRight(), "'"))),
+            null,
+            null);
+
+    if (soExpr.getLeft() instanceof SQLIdentifierExpr
+        || soExpr.getLeft() instanceof SQLPropertyExpr) {
+      leftMethod =
+          new MethodField(
+              null,
+              Lists.newArrayList(
+                  new KVValue("", "doc['" + Util.expr2Object(soExpr.getLeft(), "'") + "'].value")),
+              null,
+              null);
+    }
 
-        }
-        return values.toArray();
+    if (soExpr.getRight() instanceof SQLIdentifierExpr
+        || soExpr.getRight() instanceof SQLPropertyExpr) {
+      rightMethod =
+          new MethodField(
+              null,
+              Lists.newArrayList(
+                  new KVValue("", "doc['" + Util.expr2Object(soExpr.getRight(), "'") + "'].value")),
+              null,
+              null);
     }
 
-    private Object[] parseValue(List<SQLExpr> targetList) throws SqlParseException {
-        Object[] value = new Object[targetList.size()];
-        for (int i = 0; i < targetList.size(); i++) {
-            value[i] = parseValue(targetList.get(i));
-        }
-        return value;
+    if (soExpr.getLeft() instanceof SQLMethodInvokeExpr) {
+      leftMethod =
+          parseSQLMethodInvokeExprWithFunctionInWhere((SQLMethodInvokeExpr) soExpr.getLeft());
+    }
+    if (soExpr.getRight() instanceof SQLMethodInvokeExpr) {
+      rightMethod =
+          parseSQLMethodInvokeExprWithFunctionInWhere((SQLMethodInvokeExpr) soExpr.getRight());
     }
 
-    private Object parseValue(SQLExpr expr) throws SqlParseException {
-        if (expr instanceof SQLNumericLiteralExpr) {
-            Number number = ((SQLNumericLiteralExpr) expr).getNumber();
-            if (number instanceof BigDecimal) {
-                return number.doubleValue();
-            }
-            if (number instanceof BigInteger) {
-                return number.longValue();
-            }
-            return ((SQLNumericLiteralExpr) expr).getNumber();
-        } else if (expr instanceof SQLCharExpr) {
-            return ((SQLCharExpr) expr).getText();
-        } else if (expr instanceof SQLMethodInvokeExpr) {
-            return expr;
-        } else if (expr instanceof SQLNullExpr) {
-            return null;
-        } else if (expr instanceof SQLIdentifierExpr) {
-            return expr;
-        } else if (expr instanceof SQLPropertyExpr) {
-            return expr;
-        } else if (expr instanceof SQLBooleanExpr) {
-            return ((SQLBooleanExpr) expr).getValue();
-        } else {
-            throw new SqlParseException(
-                    String.format("Failed to parse SqlExpression of type %s. expression value: %s",
-                            expr.getClass(), expr)
-            );
-        }
+    if (soExpr.getLeft() instanceof SQLCastExpr) {
+      leftMethod = parseSQLCastExprWithFunctionInWhere((SQLCastExpr) soExpr.getLeft());
+    }
+    if (soExpr.getRight() instanceof SQLCastExpr) {
+      rightMethod = parseSQLCastExprWithFunctionInWhere((SQLCastExpr) soExpr.getRight());
     }
 
-    public static Condition getConditionForMethod(SQLExpr expr, Where.CONN conn) throws SqlParseException {
-        SQLExpr param = ((SQLMethodInvokeExpr) expr).getParameters().get(0);
-        String fieldName = param.toString();
+    String v1 = leftMethod.getParams().get(0).value.toString();
+    String v1Dec =
+        leftMethod.getParams().size() == 2
+            ? leftMethod.getParams().get(1).value.toString() + ";"
+            : "";
 
-        NestedType nestedType = new NestedType();
-        ChildrenType childrenType = new ChildrenType();
+    String v2 = rightMethod.getParams().get(0).value.toString();
+    String v2Dec =
+        rightMethod.getParams().size() == 2
+            ? rightMethod.getParams().get(1).value.toString() + ";"
+            : "";
 
-        if (nestedType.tryFillFromExpr(param)) {
-            return new Condition(conn, nestedType.field, null, "=", expr, expr, nestedType);
-        } else if (childrenType.tryFillFromExpr(param)) {
-            return new Condition(conn, childrenType.field, null, "=", expr, expr, childrenType);
-        } else {
-            return new Condition(conn, fieldName, null, "=", expr, expr, null);
-        }
+    String operator = soExpr.getOperator().getName();
+
+    if (operator.equals("=")) {
+      operator = "==";
+    }
+
+    String finalStr = v1Dec + v2Dec + v1 + " " + operator + " " + v2;
+
+    SQLMethodInvokeExpr scriptMethod = new SQLMethodInvokeExpr("script", null);
+    scriptMethod.addParameter(new SQLCharExpr(finalStr));
+    return scriptMethod;
+  }
+
+  private Boolean bothSideAreNotFunction(SQLBinaryOpExpr soExpr) {
+    return !(soExpr.getLeft() instanceof SQLMethodInvokeExpr
+        || soExpr.getRight() instanceof SQLMethodInvokeExpr);
+  }
+
+  private Boolean bothSidesAreNotCast(SQLBinaryOpExpr soExpr) {
+    return !(soExpr.getLeft() instanceof SQLCastExpr || soExpr.getRight() instanceof SQLCastExpr);
+  }
+
+  private Object[] getMethodValuesWithSubQueries(SQLMethodInvokeExpr method)
+      throws SqlParseException {
+    List<Object> values = new ArrayList<>();
+    for (SQLExpr innerExpr : method.getParameters()) {
+      if (innerExpr instanceof SQLQueryExpr) {
+        Select select =
+            sqlParser.parseSelect(
+                (MySqlSelectQueryBlock) ((SQLQueryExpr) innerExpr).getSubQuery().getQuery());
+        values.add(new SubQueryExpression(select));
+      } else if (innerExpr instanceof SQLTextLiteralExpr) {
+        values.add(((SQLTextLiteralExpr) innerExpr).getText());
+      } else {
+        values.add(innerExpr);
+      }
+    }
+    return values.toArray();
+  }
+
+  private Object[] parseValue(List<SQLExpr> targetList) throws SqlParseException {
+    Object[] value = new Object[targetList.size()];
+    for (int i = 0; i < targetList.size(); i++) {
+      value[i] = parseValue(targetList.get(i));
+    }
+    return value;
+  }
+
+  private Object parseValue(SQLExpr expr) throws SqlParseException {
+    if (expr instanceof SQLNumericLiteralExpr) {
+      Number number = ((SQLNumericLiteralExpr) expr).getNumber();
+      if (number instanceof BigDecimal) {
+        return number.doubleValue();
+      }
+      if (number instanceof BigInteger) {
+        return number.longValue();
+      }
+      return ((SQLNumericLiteralExpr) expr).getNumber();
+    } else if (expr instanceof SQLCharExpr) {
+      return ((SQLCharExpr) expr).getText();
+    } else if (expr instanceof SQLMethodInvokeExpr) {
+      return expr;
+    } else if (expr instanceof SQLNullExpr) {
+      return null;
+    } else if (expr instanceof SQLIdentifierExpr) {
+      return expr;
+    } else if (expr instanceof SQLPropertyExpr) {
+      return expr;
+    } else if (expr instanceof SQLBooleanExpr) {
+      return ((SQLBooleanExpr) expr).getValue();
+    } else {
+      throw new SqlParseException(
+          String.format(
+              "Failed to parse SqlExpression of type %s. expression value: %s",
+              expr.getClass(), expr));
+    }
+  }
+
+  public static Condition getConditionForMethod(SQLExpr expr, Where.CONN conn)
+      throws SqlParseException {
+    SQLExpr param = ((SQLMethodInvokeExpr) expr).getParameters().get(0);
+    String fieldName = param.toString();
+
+    NestedType nestedType = new NestedType();
+    ChildrenType childrenType = new ChildrenType();
+
+    if (nestedType.tryFillFromExpr(param)) {
+      return new Condition(conn, nestedType.field, null, "=", expr, expr, nestedType);
+    } else if (childrenType.tryFillFromExpr(param)) {
+      return new Condition(conn, childrenType.field, null, "=", expr, expr, childrenType);
+    } else {
+      return new Condition(conn, fieldName, null, "=", expr, expr, null);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSQLQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSQLQueryAction.java
index a5a3ac5a4f..230b66fa7a 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSQLQueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSQLQueryAction.java
@@ -3,10 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.plugin;
 
-import static org.opensearch.rest.RestStatus.OK;
+import static org.opensearch.core.rest.RestStatus.OK;
 import static org.opensearch.sql.executor.ExecutionEngine.QueryResponse;
 import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.Style.PRETTY;
 
@@ -15,19 +14,22 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.client.node.NodeClient;
+import org.opensearch.common.inject.Injector;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestRequest;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.common.utils.QueryContext;
+import org.opensearch.sql.exception.UnsupportedCursorRequestException;
 import org.opensearch.sql.executor.ExecutionEngine.ExplainResponse;
 import org.opensearch.sql.legacy.metrics.MetricName;
 import org.opensearch.sql.legacy.metrics.Metrics;
 import org.opensearch.sql.opensearch.security.SecurityAccess;
 import org.opensearch.sql.protocol.response.QueryResult;
+import org.opensearch.sql.protocol.response.format.CommandResponseFormatter;
 import org.opensearch.sql.protocol.response.format.CsvResponseFormatter;
 import org.opensearch.sql.protocol.response.format.Format;
 import org.opensearch.sql.protocol.response.format.JdbcResponseFormatter;
@@ -36,12 +38,11 @@
 import org.opensearch.sql.protocol.response.format.ResponseFormatter;
 import org.opensearch.sql.sql.SQLService;
 import org.opensearch.sql.sql.domain.SQLQueryRequest;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 /**
- * New SQL REST action handler. This will not be registered to OpenSearch unless:
- *  1) we want to test new SQL engine;
- *  2) all old functionalities migrated to new query engine and legacy REST handler removed.
+ * New SQL REST action handler. This will not be registered to OpenSearch unless: 1) we want to test
+ * new SQL engine; 2) all old functionalities migrated to new query engine and legacy REST handler
+ * removed.
  */
 public class RestSQLQueryAction extends BaseRestHandler {
 
@@ -49,14 +50,12 @@ public class RestSQLQueryAction extends BaseRestHandler {
 
   public static final RestChannelConsumer NOT_SUPPORTED_YET = null;
 
-  private final AnnotationConfigApplicationContext applicationContext;
+  private final Injector injector;
 
-  /**
-   * Constructor of RestSQLQueryAction.
-   */
-  public RestSQLQueryAction(AnnotationConfigApplicationContext applicationContext) {
+  /** Constructor of RestSQLQueryAction. */
+  public RestSQLQueryAction(Injector injector) {
     super();
-    this.applicationContext = applicationContext;
+    this.injector = injector;
   }
 
   @Override
@@ -91,7 +90,7 @@ public RestChannelConsumer prepareRequest(
     }
 
     SQLService sqlService =
-        SecurityAccess.doPrivileged(() -> applicationContext.getBean(SQLService.class));
+        SecurityAccess.doPrivileged(() -> injector.getInstance(SQLService.class));
 
     if (request.isExplainRequest()) {
       return channel ->
@@ -101,7 +100,9 @@ public RestChannelConsumer prepareRequest(
                   channel,
                   createExplainResponseListener(channel, executionErrorHandler),
                   fallbackHandler));
-    } else {
+    }
+    // If close request, sqlService.closeCursor
+    else {
       return channel ->
           sqlService.execute(
               request,
@@ -119,14 +120,13 @@ private <T> ResponseListener<T> fallBackListener(
     return new ResponseListener<T>() {
       @Override
       public void onResponse(T response) {
-        LOG.error("[{}] Request is handled by new SQL query engine",
-            QueryContext.getRequestId());
+        LOG.info("[{}] Request is handled by new SQL query engine", QueryContext.getRequestId());
         next.onResponse(response);
       }
 
       @Override
       public void onFailure(Exception e) {
-        if (e instanceof SyntaxCheckException) {
+        if (e instanceof SyntaxCheckException || e instanceof UnsupportedCursorRequestException) {
           fallBackHandler.accept(channel, e);
         } else {
           next.onFailure(e);
@@ -137,15 +137,17 @@ public void onFailure(Exception e) {
 
   private ResponseListener<ExplainResponse> createExplainResponseListener(
       RestChannel channel, BiConsumer<RestChannel, Exception> errorHandler) {
-    return new ResponseListener<ExplainResponse>() {
+    return new ResponseListener<>() {
       @Override
       public void onResponse(ExplainResponse response) {
-        sendResponse(channel, OK, new JsonResponseFormatter<ExplainResponse>(PRETTY) {
-          @Override
-          protected Object buildJsonObject(ExplainResponse response) {
-            return response;
-          }
-        }.format(response));
+        JsonResponseFormatter<ExplainResponse> formatter =
+            new JsonResponseFormatter<>(PRETTY) {
+              @Override
+              protected Object buildJsonObject(ExplainResponse response) {
+                return response;
+              }
+            };
+        sendResponse(channel, OK, formatter.format(response), formatter.contentType());
       }
 
       @Override
@@ -161,18 +163,25 @@ private ResponseListener<QueryResponse> createQueryResponseListener(
       BiConsumer<RestChannel, Exception> errorHandler) {
     Format format = request.format();
     ResponseFormatter<QueryResult> formatter;
-    if (format.equals(Format.CSV)) {
+
+    if (request.isCursorCloseRequest()) {
+      formatter = new CommandResponseFormatter();
+    } else if (format.equals(Format.CSV)) {
       formatter = new CsvResponseFormatter(request.sanitize());
     } else if (format.equals(Format.RAW)) {
-      formatter = new RawResponseFormatter();
+      formatter = new RawResponseFormatter(request.pretty());
     } else {
       formatter = new JdbcResponseFormatter(PRETTY);
     }
     return new ResponseListener<QueryResponse>() {
       @Override
       public void onResponse(QueryResponse response) {
-        sendResponse(channel, OK,
-            formatter.format(new QueryResult(response.getSchema(), response.getResults())));
+        sendResponse(
+            channel,
+            OK,
+            formatter.format(
+                new QueryResult(response.getSchema(), response.getResults(), response.getCursor())),
+            formatter.contentType());
       }
 
       @Override
@@ -182,9 +191,9 @@ public void onFailure(Exception e) {
     };
   }
 
-  private void sendResponse(RestChannel channel, RestStatus status, String content) {
-    channel.sendResponse(new BytesRestResponse(
-        status, "application/json; charset=UTF-8", content));
+  private void sendResponse(
+      RestChannel channel, RestStatus status, String content, String contentType) {
+    channel.sendResponse(new BytesRestResponse(status, contentType, content));
   }
 
   private static void logAndPublishMetrics(Exception e) {
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java
index de09bcee1a..c47e5f05bd 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java
@@ -3,12 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.plugin;
 
-import static org.opensearch.rest.RestStatus.BAD_REQUEST;
-import static org.opensearch.rest.RestStatus.OK;
-import static org.opensearch.rest.RestStatus.SERVICE_UNAVAILABLE;
+import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
+import static org.opensearch.core.rest.RestStatus.INTERNAL_SERVER_ERROR;
+import static org.opensearch.core.rest.RestStatus.OK;
 
 import com.alibaba.druid.sql.parser.ParserException;
 import com.google.common.collect.ImmutableList;
@@ -24,15 +23,17 @@
 import java.util.regex.Pattern;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.OpenSearchException;
 import org.opensearch.client.Client;
 import org.opensearch.client.node.NodeClient;
+import org.opensearch.common.inject.Injector;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestRequest;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.common.utils.QueryContext;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
@@ -41,6 +42,7 @@
 import org.opensearch.sql.legacy.antlr.SqlAnalysisConfig;
 import org.opensearch.sql.legacy.antlr.SqlAnalysisException;
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
+import org.opensearch.sql.legacy.cursor.CursorType;
 import org.opensearch.sql.legacy.domain.ColumnTypeProvider;
 import org.opensearch.sql.legacy.domain.QueryActionRequest;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
@@ -62,232 +64,268 @@
 import org.opensearch.sql.legacy.utils.JsonPrettyFormatter;
 import org.opensearch.sql.legacy.utils.QueryDataAnonymizer;
 import org.opensearch.sql.sql.domain.SQLQueryRequest;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 public class RestSqlAction extends BaseRestHandler {
 
-    private static final Logger LOG = LogManager.getLogger(RestSqlAction.class);
-
-    private final boolean allowExplicitIndex;
-
-    private static final Predicate<String> CONTAINS_SUBQUERY = Pattern.compile("\\(\\s*select ").asPredicate();
-
-    /**
-     * API endpoint path
-     */
-    public static final String QUERY_API_ENDPOINT = "/_plugins/_sql";
-    public static final String EXPLAIN_API_ENDPOINT = QUERY_API_ENDPOINT + "/_explain";
-    public static final String CURSOR_CLOSE_ENDPOINT = QUERY_API_ENDPOINT + "/close";
-    public static final String LEGACY_QUERY_API_ENDPOINT = "/_opendistro/_sql";
-    public static final String LEGACY_EXPLAIN_API_ENDPOINT = LEGACY_QUERY_API_ENDPOINT + "/_explain";
-    public static final String LEGACY_CURSOR_CLOSE_ENDPOINT = LEGACY_QUERY_API_ENDPOINT + "/close";
-
-    /**
-     * New SQL query request handler.
-     */
-    private final RestSQLQueryAction newSqlQueryHandler;
-
-    /**
-     * Application context used to create SQLService for each request.
-     */
-    private final AnnotationConfigApplicationContext applicationContext;
-
-    public RestSqlAction(Settings settings, AnnotationConfigApplicationContext applicationContext) {
-        super();
-        this.allowExplicitIndex = MULTI_ALLOW_EXPLICIT_INDEX.get(settings);
-        this.newSqlQueryHandler = new RestSQLQueryAction(applicationContext);
-        this.applicationContext = applicationContext;
-    }
-
-    @Override
-    public List<Route> routes() {
-        return ImmutableList.of();
-    }
-
-    @Override
-    public List<ReplacedRoute> replacedRoutes() {
-        return ImmutableList.of(
-            new ReplacedRoute(
-                RestRequest.Method.POST, QUERY_API_ENDPOINT,
-                RestRequest.Method.POST, LEGACY_QUERY_API_ENDPOINT),
-            new ReplacedRoute(
-                RestRequest.Method.POST, EXPLAIN_API_ENDPOINT,
-                RestRequest.Method.POST, LEGACY_EXPLAIN_API_ENDPOINT),
-            new ReplacedRoute(
-                RestRequest.Method.POST, CURSOR_CLOSE_ENDPOINT,
-                RestRequest.Method.POST, LEGACY_CURSOR_CLOSE_ENDPOINT));
-    }
-
-    @Override
-    public String getName() {
-        return "sql_action";
-    }
-
-    @Override
-    protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
-        Metrics.getInstance().getNumericalMetric(MetricName.REQ_TOTAL).increment();
-        Metrics.getInstance().getNumericalMetric(MetricName.REQ_COUNT_TOTAL).increment();
-
-        QueryContext.addRequestId();
-
-        try {
-            if (!isSQLFeatureEnabled()) {
-                throw new SQLFeatureDisabledException(
-                        "Either plugins.sql.enabled or rest.action.multi.allow_explicit_index setting is false"
-                );
-            }
-
-            final SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(request);
-            if (sqlRequest.cursor() != null) {
-                if (isExplainRequest(request)) {
-                    throw new IllegalArgumentException("Invalid request. Cannot explain cursor");
-                } else {
-                    LOG.info("[{}] Cursor request {}: {}", QueryContext.getRequestId(), request.uri(), sqlRequest.cursor());
-                    return channel -> handleCursorRequest(request, sqlRequest.cursor(), client, channel);
-                }
-            }
-
-            LOG.info("[{}] Incoming request {}: {}", QueryContext.getRequestId(), request.uri(),
-                    QueryDataAnonymizer.anonymizeData(sqlRequest.getSql()));
-
-            Format format = SqlRequestParam.getFormat(request.params());
-
-            // Route request to new query engine if it's supported already
-            SQLQueryRequest newSqlRequest = new SQLQueryRequest(sqlRequest.getJsonContent(),
-                sqlRequest.getSql(), request.path(), request.params());
-            return newSqlQueryHandler.prepareRequest(newSqlRequest,
-                    (restChannel, exception) -> {
-                        try{
-                            if (newSqlRequest.isExplainRequest()) {
-                                LOG.info("Request is falling back to old SQL engine due to: " + exception.getMessage());
-                            }
-                            LOG.debug("[{}] Request {} is not supported and falling back to old SQL engine",
-                                QueryContext.getRequestId(), newSqlRequest);
-                            QueryAction queryAction = explainRequest(client, sqlRequest, format);
-                            executeSqlRequest(request, queryAction, client, restChannel);
-                        } catch (Exception e) {
-                            logAndPublishMetrics(e);
-                            reportError(restChannel, e, isClientError(e) ? BAD_REQUEST : SERVICE_UNAVAILABLE);
-                        }
-                    },
-                    (restChannel, exception) -> {
-                        logAndPublishMetrics(exception);
-                        reportError(restChannel, exception, isClientError(exception) ?
-                            BAD_REQUEST : SERVICE_UNAVAILABLE);
-                    });
-        } catch (Exception e) {
-            logAndPublishMetrics(e);
-            return channel -> reportError(channel, e, isClientError(e) ? BAD_REQUEST : SERVICE_UNAVAILABLE);
-        }
-    }
-
-    @Override
-    protected Set<String> responseParams() {
-        Set<String> responseParams = new HashSet<>(super.responseParams());
-        responseParams.addAll(Arrays.asList("sql", "flat", "separator", "_score", "_type", "_id", "newLine", "format", "sanitize"));
-        return responseParams;
-    }
-
-    private void handleCursorRequest(final RestRequest request, final String cursor, final Client client,
-                                     final RestChannel channel) throws Exception {
-        CursorAsyncRestExecutor cursorRestExecutor = CursorActionRequestRestExecutorFactory.createExecutor(
-                request, cursor, SqlRequestParam.getFormat(request.params()));
-        cursorRestExecutor.execute(client, request.params(), channel);
-    }
-
-    private static void logAndPublishMetrics(final Exception e) {
-        if (isClientError(e)) {
-            LOG.error(QueryContext.getRequestId() + " Client side error during query execution", e);
-            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CUS).increment();
-        } else {
-            LOG.error(QueryContext.getRequestId() + " Server side error during query execution", e);
-            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
-        }
-    }
-
-    private static QueryAction explainRequest(final NodeClient client, final SqlRequest sqlRequest, Format format)
-        throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
-
-        ColumnTypeProvider typeProvider = performAnalysis(sqlRequest.getSql());
-
-        final QueryAction queryAction = new SearchDao(client)
-                .explain(new QueryActionRequest(sqlRequest.getSql(), typeProvider, format));
-        queryAction.setSqlRequest(sqlRequest);
-        queryAction.setFormat(format);
-        queryAction.setColumnTypeProvider(typeProvider);
-        return queryAction;
-    }
-
-    private void executeSqlRequest(final RestRequest request, final QueryAction queryAction, final Client client,
-                                   final RestChannel channel) throws Exception {
-        Map<String, String> params = request.params();
+  private static final Logger LOG = LogManager.getLogger(RestSqlAction.class);
+
+  private final boolean allowExplicitIndex;
+
+  private static final Predicate<String> CONTAINS_SUBQUERY =
+      Pattern.compile("\\(\\s*select ").asPredicate();
+
+  /** API endpoint path */
+  public static final String QUERY_API_ENDPOINT = "/_plugins/_sql";
+
+  public static final String EXPLAIN_API_ENDPOINT = QUERY_API_ENDPOINT + "/_explain";
+  public static final String CURSOR_CLOSE_ENDPOINT = QUERY_API_ENDPOINT + "/close";
+  public static final String LEGACY_QUERY_API_ENDPOINT = "/_opendistro/_sql";
+  public static final String LEGACY_EXPLAIN_API_ENDPOINT = LEGACY_QUERY_API_ENDPOINT + "/_explain";
+  public static final String LEGACY_CURSOR_CLOSE_ENDPOINT = LEGACY_QUERY_API_ENDPOINT + "/close";
+
+  /** New SQL query request handler. */
+  private final RestSQLQueryAction newSqlQueryHandler;
+
+  public RestSqlAction(Settings settings, Injector injector) {
+    super();
+    this.allowExplicitIndex = MULTI_ALLOW_EXPLICIT_INDEX.get(settings);
+    this.newSqlQueryHandler = new RestSQLQueryAction(injector);
+  }
+
+  @Override
+  public List<Route> routes() {
+    return ImmutableList.of();
+  }
+
+  @Override
+  public List<ReplacedRoute> replacedRoutes() {
+    return ImmutableList.of(
+        new ReplacedRoute(
+            RestRequest.Method.POST, QUERY_API_ENDPOINT,
+            RestRequest.Method.POST, LEGACY_QUERY_API_ENDPOINT),
+        new ReplacedRoute(
+            RestRequest.Method.POST, EXPLAIN_API_ENDPOINT,
+            RestRequest.Method.POST, LEGACY_EXPLAIN_API_ENDPOINT),
+        new ReplacedRoute(
+            RestRequest.Method.POST, CURSOR_CLOSE_ENDPOINT,
+            RestRequest.Method.POST, LEGACY_CURSOR_CLOSE_ENDPOINT));
+  }
+
+  @Override
+  public String getName() {
+    return "sql_action";
+  }
+
+  @Override
+  protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
+    Metrics.getInstance().getNumericalMetric(MetricName.REQ_TOTAL).increment();
+    Metrics.getInstance().getNumericalMetric(MetricName.REQ_COUNT_TOTAL).increment();
+
+    QueryContext.addRequestId();
+
+    try {
+      if (!isSQLFeatureEnabled()) {
+        throw new SQLFeatureDisabledException(
+            "Either plugins.sql.enabled or rest.action.multi.allow_explicit_index setting is"
+                + " false");
+      }
+
+      final SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(request);
+      if (isLegacyCursor(sqlRequest)) {
         if (isExplainRequest(request)) {
-            final String jsonExplanation = queryAction.explain().explain();
-            String result;
-            if (SqlRequestParam.isPrettyFormat(params)) {
-                result = JsonPrettyFormatter.format(jsonExplanation);
-            } else {
-                result = jsonExplanation;
-            }
-            channel.sendResponse(new BytesRestResponse(OK, "application/json; charset=UTF-8", result));
+          throw new IllegalArgumentException("Invalid request. Cannot explain cursor");
         } else {
-            RestExecutor restExecutor = ActionRequestRestExecutorFactory.createExecutor(
-                    SqlRequestParam.getFormat(params),
-                    queryAction);
-            //doing this hack because OpenSearch throws exception for un-consumed props
-            Map<String, String> additionalParams = new HashMap<>();
-            for (String paramName : responseParams()) {
-                if (request.hasParam(paramName)) {
-                    additionalParams.put(paramName, request.param(paramName));
-                }
-            }
-            restExecutor.execute(client, additionalParams, queryAction, channel);
+          LOG.info(
+              "[{}] Cursor request {}: {}",
+              QueryContext.getRequestId(),
+              request.uri(),
+              sqlRequest.cursor());
+          return channel -> handleCursorRequest(request, sqlRequest.cursor(), client, channel);
         }
+      }
+
+      LOG.info("[{}] Incoming request {}", QueryContext.getRequestId(), request.uri());
+
+      Format format = SqlRequestParam.getFormat(request.params());
+
+      // Route request to new query engine if it's supported already
+      SQLQueryRequest newSqlRequest =
+          new SQLQueryRequest(
+              sqlRequest.getJsonContent(),
+              sqlRequest.getSql(),
+              request.path(),
+              request.params(),
+              sqlRequest.cursor());
+      return newSqlQueryHandler.prepareRequest(
+          newSqlRequest,
+          (restChannel, exception) -> {
+            try {
+              if (newSqlRequest.isExplainRequest()) {
+                LOG.info(
+                    "Request is falling back to old SQL engine due to: " + exception.getMessage());
+              }
+              LOG.info(
+                  "[{}] Request {} is not supported and falling back to old SQL engine",
+                  QueryContext.getRequestId(),
+                  newSqlRequest);
+              LOG.info("Request Query: {}", QueryDataAnonymizer.anonymizeData(sqlRequest.getSql()));
+              QueryAction queryAction = explainRequest(client, sqlRequest, format);
+              executeSqlRequest(request, queryAction, client, restChannel);
+            } catch (Exception e) {
+              handleException(restChannel, e);
+            }
+          },
+          this::handleException);
+    } catch (Exception e) {
+      return channel -> handleException(channel, e);
     }
-
-    private static boolean isExplainRequest(final RestRequest request) {
-        return request.path().endsWith("/_explain");
-    }
-
-    private static boolean isClientError(Exception e) {
-        return e instanceof NullPointerException // NPE is hard to differentiate but more likely caused by bad query
-            || e instanceof SqlParseException
-            || e instanceof ParserException
-            || e instanceof SQLFeatureNotSupportedException
-            || e instanceof SQLFeatureDisabledException
-            || e instanceof IllegalArgumentException
-            || e instanceof IndexNotFoundException
-            || e instanceof VerificationException
-            || e instanceof SqlAnalysisException
-            || e instanceof SyntaxCheckException
-            || e instanceof SemanticCheckException
-            || e instanceof ExpressionEvaluationException;
-    }
-
-    private void sendResponse(final RestChannel channel, final String message, final RestStatus status) {
-        channel.sendResponse(new BytesRestResponse(status, message));
+  }
+
+  private void handleException(RestChannel restChannel, Exception exception) {
+    logAndPublishMetrics(exception);
+    if (exception instanceof OpenSearchException) {
+      OpenSearchException openSearchException = (OpenSearchException) exception;
+      reportError(restChannel, openSearchException, openSearchException.status());
+    } else {
+      reportError(
+          restChannel, exception, isClientError(exception) ? BAD_REQUEST : INTERNAL_SERVER_ERROR);
     }
-
-    private void reportError(final RestChannel channel, final Exception e, final RestStatus status) {
-        sendResponse(channel, ErrorMessageFactory.createErrorMessage(e, status.getStatus()).toString(), status);
+  }
+
+  /**
+   * @param sqlRequest client request
+   * @return true if this cursor was generated by the legacy engine, false otherwise.
+   */
+  private static boolean isLegacyCursor(SqlRequest sqlRequest) {
+    String cursor = sqlRequest.cursor();
+    return cursor != null && CursorType.getById(cursor.substring(0, 1)) != CursorType.NULL;
+  }
+
+  @Override
+  protected Set<String> responseParams() {
+    Set<String> responseParams = new HashSet<>(super.responseParams());
+    responseParams.addAll(
+        Arrays.asList(
+            "sql", "flat", "separator", "_score", "_type", "_id", "newLine", "format", "sanitize"));
+    return responseParams;
+  }
+
+  private void handleCursorRequest(
+      final RestRequest request,
+      final String cursor,
+      final Client client,
+      final RestChannel channel)
+      throws Exception {
+    CursorAsyncRestExecutor cursorRestExecutor =
+        CursorActionRequestRestExecutorFactory.createExecutor(
+            request, cursor, SqlRequestParam.getFormat(request.params()));
+    cursorRestExecutor.execute(client, request.params(), channel);
+  }
+
+  private static void logAndPublishMetrics(final Exception e) {
+    if (isClientError(e)) {
+      LOG.error(QueryContext.getRequestId() + " Client side error during query execution", e);
+      Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CUS).increment();
+    } else {
+      LOG.error(QueryContext.getRequestId() + " Server side error during query execution", e);
+      Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
     }
-
-    private boolean isSQLFeatureEnabled() {
-        boolean isSqlEnabled = LocalClusterState.state().getSettingValue(
-            org.opensearch.sql.common.setting.Settings.Key.SQL_ENABLED);
-        return allowExplicitIndex && isSqlEnabled;
-    }
-
-    private static ColumnTypeProvider performAnalysis(String sql) {
-        LocalClusterState clusterState = LocalClusterState.state();
-        SqlAnalysisConfig config = new SqlAnalysisConfig(false, false, 200);
-
-        OpenSearchLegacySqlAnalyzer analyzer = new OpenSearchLegacySqlAnalyzer(config);
-        Optional<Type> outputColumnType = analyzer.analyze(sql, clusterState);
-        if (outputColumnType.isPresent()) {
-            return new ColumnTypeProvider(outputColumnType.get());
-        } else {
-            return new ColumnTypeProvider();
+  }
+
+  private static QueryAction explainRequest(
+      final NodeClient client, final SqlRequest sqlRequest, Format format)
+      throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
+
+    ColumnTypeProvider typeProvider = performAnalysis(sqlRequest.getSql());
+
+    final QueryAction queryAction =
+        new SearchDao(client)
+            .explain(new QueryActionRequest(sqlRequest.getSql(), typeProvider, format));
+    queryAction.setSqlRequest(sqlRequest);
+    queryAction.setFormat(format);
+    queryAction.setColumnTypeProvider(typeProvider);
+    return queryAction;
+  }
+
+  private void executeSqlRequest(
+      final RestRequest request,
+      final QueryAction queryAction,
+      final Client client,
+      final RestChannel channel)
+      throws Exception {
+    Map<String, String> params = request.params();
+    if (isExplainRequest(request)) {
+      final String jsonExplanation = queryAction.explain().explain();
+      String result;
+      if (SqlRequestParam.isPrettyFormat(params)) {
+        result = JsonPrettyFormatter.format(jsonExplanation);
+      } else {
+        result = jsonExplanation;
+      }
+      channel.sendResponse(new BytesRestResponse(OK, "application/json; charset=UTF-8", result));
+    } else {
+      RestExecutor restExecutor =
+          ActionRequestRestExecutorFactory.createExecutor(
+              SqlRequestParam.getFormat(params), queryAction);
+      // doing this hack because OpenSearch throws exception for un-consumed props
+      Map<String, String> additionalParams = new HashMap<>();
+      for (String paramName : responseParams()) {
+        if (request.hasParam(paramName)) {
+          additionalParams.put(paramName, request.param(paramName));
         }
+      }
+      restExecutor.execute(client, additionalParams, queryAction, channel);
+    }
+  }
+
+  private static boolean isExplainRequest(final RestRequest request) {
+    return request.path().endsWith("/_explain");
+  }
+
+  private static boolean isClientError(Exception e) {
+    return e
+            instanceof
+            NullPointerException // NPE is hard to differentiate but more likely caused by bad query
+        || e instanceof SqlParseException
+        || e instanceof ParserException
+        || e instanceof SQLFeatureNotSupportedException
+        || e instanceof SQLFeatureDisabledException
+        || e instanceof IllegalArgumentException
+        || e instanceof IndexNotFoundException
+        || e instanceof VerificationException
+        || e instanceof SqlAnalysisException
+        || e instanceof SyntaxCheckException
+        || e instanceof SemanticCheckException
+        || e instanceof ExpressionEvaluationException;
+  }
+
+  private void sendResponse(
+      final RestChannel channel, final String message, final RestStatus status) {
+    channel.sendResponse(new BytesRestResponse(status, message));
+  }
+
+  private void reportError(final RestChannel channel, final Exception e, final RestStatus status) {
+    sendResponse(
+        channel, ErrorMessageFactory.createErrorMessage(e, status.getStatus()).toString(), status);
+  }
+
+  private boolean isSQLFeatureEnabled() {
+    boolean isSqlEnabled =
+        LocalClusterState.state()
+            .getSettingValue(org.opensearch.sql.common.setting.Settings.Key.SQL_ENABLED);
+    return allowExplicitIndex && isSqlEnabled;
+  }
+
+  private static ColumnTypeProvider performAnalysis(String sql) {
+    LocalClusterState clusterState = LocalClusterState.state();
+    SqlAnalysisConfig config = new SqlAnalysisConfig(false, false, 200);
+
+    OpenSearchLegacySqlAnalyzer analyzer = new OpenSearchLegacySqlAnalyzer(config);
+    Optional<Type> outputColumnType = analyzer.analyze(sql, clusterState);
+    if (outputColumnType.isPresent()) {
+      return new ColumnTypeProvider(outputColumnType.get());
+    } else {
+      return new ColumnTypeProvider();
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlStatsAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlStatsAction.java
index 5b48ef6710..6f9d1e4117 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlStatsAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlStatsAction.java
@@ -3,88 +3,112 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.plugin;
 
-import static org.opensearch.rest.RestStatus.SERVICE_UNAVAILABLE;
+import static org.opensearch.core.rest.RestStatus.INTERNAL_SERVER_ERROR;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestController;
 import org.opensearch.rest.RestRequest;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.sql.common.utils.QueryContext;
 import org.opensearch.sql.legacy.executor.format.ErrorMessageFactory;
 import org.opensearch.sql.legacy.metrics.Metrics;
+import org.opensearch.threadpool.ThreadPool;
 
 /**
- * Currently this interface is for node level.
- * Cluster level is coming up soon. https://github.com/opendistro-for-elasticsearch/sql/issues/41
+ * Currently this interface is for node level. Cluster level is coming up soon.
+ * https://github.com/opendistro-for-elasticsearch/sql/issues/41
  */
 public class RestSqlStatsAction extends BaseRestHandler {
-    private static final Logger LOG = LogManager.getLogger(RestSqlStatsAction.class);
-
-    /**
-     * API endpoint path
-     */
-    public static final String STATS_API_ENDPOINT = "/_plugins/_sql/stats";
-    public static final String LEGACY_STATS_API_ENDPOINT = "/_opendistro/_sql/stats";
-
-    public RestSqlStatsAction(Settings settings, RestController restController) {
-        super();
-    }
-
-    @Override
-    public String getName() {
-        return "sql_stats_action";
-    }
-
-    @Override
-    public List<Route> routes() {
-        return ImmutableList.of();
-    }
-
-    @Override
-    public List<ReplacedRoute> replacedRoutes() {
-        return ImmutableList.of(
-            new ReplacedRoute(
-                RestRequest.Method.POST, STATS_API_ENDPOINT,
-                RestRequest.Method.POST, LEGACY_STATS_API_ENDPOINT),
-            new ReplacedRoute(
-                RestRequest.Method.GET, STATS_API_ENDPOINT,
-                RestRequest.Method.GET, LEGACY_STATS_API_ENDPOINT));
+  private static final Logger LOG = LogManager.getLogger(RestSqlStatsAction.class);
+
+  /** API endpoint path */
+  public static final String STATS_API_ENDPOINT = "/_plugins/_sql/stats";
+
+  public static final String LEGACY_STATS_API_ENDPOINT = "/_opendistro/_sql/stats";
+
+  public RestSqlStatsAction(Settings settings, RestController restController) {
+    super();
+  }
+
+  @Override
+  public String getName() {
+    return "sql_stats_action";
+  }
+
+  @Override
+  public List<Route> routes() {
+    return ImmutableList.of();
+  }
+
+  @Override
+  public List<ReplacedRoute> replacedRoutes() {
+    return ImmutableList.of(
+        new ReplacedRoute(
+            RestRequest.Method.POST, STATS_API_ENDPOINT,
+            RestRequest.Method.POST, LEGACY_STATS_API_ENDPOINT),
+        new ReplacedRoute(
+            RestRequest.Method.GET, STATS_API_ENDPOINT,
+            RestRequest.Method.GET, LEGACY_STATS_API_ENDPOINT));
+  }
+
+  @Override
+  protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
+
+    QueryContext.addRequestId();
+
+    try {
+      return channel ->
+          schedule(
+              client,
+              () ->
+                  channel.sendResponse(
+                      new BytesRestResponse(RestStatus.OK, Metrics.getInstance().collectToJSON())));
+    } catch (Exception e) {
+      LOG.error("Failed during Query SQL STATS Action.", e);
+
+      return channel ->
+          channel.sendResponse(
+              new BytesRestResponse(
+                  INTERNAL_SERVER_ERROR,
+                  ErrorMessageFactory.createErrorMessage(e, INTERNAL_SERVER_ERROR.getStatus())
+                      .toString()));
     }
-
-    @Override
-    protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
-
-        QueryContext.addRequestId();
-
-        try {
-            return channel -> channel.sendResponse(new BytesRestResponse(RestStatus.OK,
-                    Metrics.getInstance().collectToJSON()));
-        } catch (Exception e) {
-            LOG.error("Failed during Query SQL STATS Action.", e);
-
-            return channel -> channel.sendResponse(new BytesRestResponse(SERVICE_UNAVAILABLE,
-                    ErrorMessageFactory.createErrorMessage(e, SERVICE_UNAVAILABLE.getStatus()).toString()));
-        }
-    }
-
-    @Override
-    protected Set<String> responseParams() {
-        Set<String> responseParams = new HashSet<>(super.responseParams());
-        responseParams.addAll(Arrays.asList("sql", "flat", "separator", "_score", "_type", "_id", "newLine", "format", "sanitize"));
-        return responseParams;
-    }
-
+  }
+
+  @Override
+  protected Set<String> responseParams() {
+    Set<String> responseParams = new HashSet<>(super.responseParams());
+    responseParams.addAll(
+        Arrays.asList(
+            "sql", "flat", "separator", "_score", "_type", "_id", "newLine", "format", "sanitize"));
+    return responseParams;
+  }
+
+  private void schedule(NodeClient client, Runnable task) {
+    ThreadPool threadPool = client.threadPool();
+    threadPool.schedule(withCurrentContext(task), new TimeValue(0), "sql-worker");
+  }
+
+  private Runnable withCurrentContext(final Runnable task) {
+    final Map<String, String> currentContext = ThreadContext.getImmutableContext();
+    return () -> {
+      ThreadContext.putAll(currentContext);
+      task.run();
+    };
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/SearchDao.java b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/SearchDao.java
index a18895723c..ea4e08281c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/SearchDao.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/SearchDao.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.plugin;
 
 import java.sql.SQLFeatureNotSupportedException;
@@ -16,39 +15,36 @@
 import org.opensearch.sql.legacy.query.OpenSearchActionFactory;
 import org.opensearch.sql.legacy.query.QueryAction;
 
-
 public class SearchDao {
 
-    private static final Set<String> END_TABLE_MAP = new HashSet<>();
-
-    static {
-        END_TABLE_MAP.add("limit");
-        END_TABLE_MAP.add("order");
-        END_TABLE_MAP.add("where");
-        END_TABLE_MAP.add("group");
-
-    }
-
-    private Client client = null;
-
-    public SearchDao(Client client) {
-        this.client = client;
-    }
-
-    public Client getClient() {
-        return client;
-    }
-
-    /**
-     * Prepare action And transform sql
-     * into OpenSearch ActionRequest
-     *
-     * @param queryActionRequest SQL query action request to execute.
-     * @return OpenSearch request
-     * @throws SqlParseException
-     */
-    public QueryAction explain(QueryActionRequest queryActionRequest)
-        throws SqlParseException, SQLFeatureNotSupportedException, SQLFeatureDisabledException {
-        return OpenSearchActionFactory.create(client, queryActionRequest);
-    }
+  private static final Set<String> END_TABLE_MAP = new HashSet<>();
+
+  static {
+    END_TABLE_MAP.add("limit");
+    END_TABLE_MAP.add("order");
+    END_TABLE_MAP.add("where");
+    END_TABLE_MAP.add("group");
+  }
+
+  private Client client = null;
+
+  public SearchDao(Client client) {
+    this.client = client;
+  }
+
+  public Client getClient() {
+    return client;
+  }
+
+  /**
+   * Prepare action And transform sql into OpenSearch ActionRequest
+   *
+   * @param queryActionRequest SQL query action request to execute.
+   * @return OpenSearch request
+   * @throws SqlParseException
+   */
+  public QueryAction explain(QueryActionRequest queryActionRequest)
+      throws SqlParseException, SQLFeatureNotSupportedException, SQLFeatureDisabledException {
+    return OpenSearchActionFactory.create(client, queryActionRequest);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/AggregationQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/AggregationQueryAction.java
index 24194e8de5..57af269001 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/AggregationQueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/AggregationQueryAction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -38,457 +37,462 @@
 import org.opensearch.sql.legacy.query.maker.AggMaker;
 import org.opensearch.sql.legacy.query.maker.QueryMaker;
 
-/**
- * Transform SQL query to OpenSearch aggregations query
- */
+/** Transform SQL query to OpenSearch aggregations query */
 public class AggregationQueryAction extends QueryAction {
 
-    private final Select select;
-    private AggMaker aggMaker = new AggMaker();
-    private SearchRequestBuilder request;
-
-    public AggregationQueryAction(Client client, Select select) {
-        super(client, select);
-        this.select = select;
-    }
-
-    @Override
-    public SqlOpenSearchRequestBuilder explain() throws SqlParseException {
-        this.request = new SearchRequestBuilder(client, SearchAction.INSTANCE);
-
-        if (select.getRowCount() == null) {
-            select.setRowCount(Select.DEFAULT_LIMIT);
-        }
-
-        setIndicesAndTypes();
-
-        setWhere(select.getWhere());
-        AggregationBuilder lastAgg = null;
-
-        for (List<Field> groupBy : select.getGroupBys()) {
-            if (!groupBy.isEmpty()) {
-                Field field = groupBy.get(0);
-
-                //make groupby can reference to field alias
-                lastAgg = getGroupAgg(field, select);
-
-                if (lastAgg instanceof TermsAggregationBuilder) {
-
-                    // TODO: Consider removing that condition
-                    // in theory we should be able to apply this for all types of fields, but
-                    // this change requires too much of related integration tests (e.g. there are comparisons against
-                    // raw javascript dsl, so I'd like to scope the changes as of now to one particular fix for
-                    // scripted functions
-
-                    // the condition `field.getName().equals("script")` is to include the CAST cases, since the cast
-                    // method is instance of MethodField with script. => corrects the shard size of CASTs
-                    if (!(field instanceof MethodField) || field instanceof ScriptMethodField
-                            || field.getName().equals("script")) {
-                        //if limit size is too small, increasing shard  size is required
-                        if (select.getRowCount() < 200) {
-                            ((TermsAggregationBuilder) lastAgg).shardSize(2000);
-                            for (Hint hint : select.getHints()) {
-                                if (hint.getType() == HintType.SHARD_SIZE) {
-                                    if (hint.getParams() != null && hint.getParams().length != 0
-                                            && hint.getParams()[0] != null) {
-                                        ((TermsAggregationBuilder) lastAgg).shardSize((Integer) hint.getParams()[0]);
-                                    }
-                                }
-                            }
-                        }
-
-                        if (select.getRowCount() > 0) {
-                            ((TermsAggregationBuilder) lastAgg).size(select.getRowCount());
-                        }
-                    }
-                }
-
-                if (field.isNested()) {
-                    AggregationBuilder nestedBuilder = createNestedAggregation(field);
-
-                    if (insertFilterIfExistsAfter(lastAgg, groupBy, nestedBuilder, 1)) {
-                        groupBy.remove(1);
-                    } else {
-                        nestedBuilder.subAggregation(lastAgg);
-                    }
+  private final Select select;
+  private AggMaker aggMaker = new AggMaker();
+  private SearchRequestBuilder request;
 
-                    request.addAggregation(wrapNestedIfNeeded(nestedBuilder, field.isReverseNested()));
-                } else if (field.isChildren()) {
-                    AggregationBuilder childrenBuilder = createChildrenAggregation(field);
+  public AggregationQueryAction(Client client, Select select) {
+    super(client, select);
+    this.select = select;
+  }
 
-                    if (insertFilterIfExistsAfter(lastAgg, groupBy, childrenBuilder, 1)) {
-                        groupBy.remove(1);
-                    } else {
-                        childrenBuilder.subAggregation(lastAgg);
-                    }
+  @Override
+  public SqlOpenSearchRequestBuilder explain() throws SqlParseException {
+    this.request = new SearchRequestBuilder(client, SearchAction.INSTANCE);
 
-                    request.addAggregation(childrenBuilder);
-                } else {
-                    request.addAggregation(lastAgg);
-                }
+    if (select.getRowCount() == null) {
+      select.setRowCount(Select.DEFAULT_LIMIT);
+    }
 
-                for (int i = 1; i < groupBy.size(); i++) {
-                    field = groupBy.get(i);
-                    AggregationBuilder subAgg = getGroupAgg(field, select);
-                    //ES5.0 termsaggregation with size = 0 not supported anymore
-//                    if (subAgg instanceof TermsAggregationBuilder && !(field instanceof MethodField)) {
-
-//                        //((TermsAggregationBuilder) subAgg).size(0);
-//                    }
-
-                    if (field.isNested()) {
-                        AggregationBuilder nestedBuilder = createNestedAggregation(field);
-
-                        if (insertFilterIfExistsAfter(subAgg, groupBy, nestedBuilder, i + 1)) {
-                            groupBy.remove(i + 1);
-                            i++;
-                        } else {
-                            nestedBuilder.subAggregation(subAgg);
-                        }
-
-                        lastAgg.subAggregation(wrapNestedIfNeeded(nestedBuilder, field.isReverseNested()));
-                    } else if (field.isChildren()) {
-                        AggregationBuilder childrenBuilder = createChildrenAggregation(field);
-
-                        if (insertFilterIfExistsAfter(subAgg, groupBy, childrenBuilder, i + 1)) {
-                            groupBy.remove(i + 1);
-                            i++;
-                        } else {
-                            childrenBuilder.subAggregation(subAgg);
-                        }
-
-                        lastAgg.subAggregation(childrenBuilder);
-                    } else {
-                        lastAgg.subAggregation(subAgg);
-                    }
-
-                    lastAgg = subAgg;
+    setIndicesAndTypes();
+
+    setWhere(select.getWhere());
+    AggregationBuilder lastAgg = null;
+
+    for (List<Field> groupBy : select.getGroupBys()) {
+      if (!groupBy.isEmpty()) {
+        Field field = groupBy.get(0);
+
+        // make groupby can reference to field alias
+        lastAgg = getGroupAgg(field, select);
+
+        if (lastAgg instanceof TermsAggregationBuilder) {
+
+          // TODO: Consider removing that condition
+          // in theory we should be able to apply this for all types of fields, but
+          // this change requires too much of related integration tests (e.g. there are comparisons
+          // against
+          // raw javascript dsl, so I'd like to scope the changes as of now to one particular fix
+          // for
+          // scripted functions
+
+          // the condition `field.getName().equals("script")` is to include the CAST cases, since
+          // the cast
+          // method is instance of MethodField with script. => corrects the shard size of CASTs
+          if (!(field instanceof MethodField)
+              || field instanceof ScriptMethodField
+              || field.getName().equals("script")) {
+            // if limit size is too small, increasing shard  size is required
+            if (select.getRowCount() < 200) {
+              ((TermsAggregationBuilder) lastAgg).shardSize(2000);
+              for (Hint hint : select.getHints()) {
+                if (hint.getType() == HintType.SHARD_SIZE) {
+                  if (hint.getParams() != null
+                      && hint.getParams().length != 0
+                      && hint.getParams()[0] != null) {
+                    ((TermsAggregationBuilder) lastAgg).shardSize((Integer) hint.getParams()[0]);
+                  }
                 }
+              }
             }
 
-            // explain the field from SELECT and HAVING clause
-            List<Field> combinedList = new ArrayList<>();
-            combinedList.addAll(select.getFields());
-            if (select.getHaving() != null) {
-                combinedList.addAll(select.getHaving().getHavingFields());
+            if (select.getRowCount() > 0) {
+              ((TermsAggregationBuilder) lastAgg).size(select.getRowCount());
             }
-            // add aggregation function to each groupBy
-            explanFields(request, combinedList, lastAgg);
-
-            explainHaving(lastAgg);
+          }
         }
 
-        if (select.getGroupBys().size() < 1) {
-            //add aggregation when having no groupBy script
-            explanFields(request, select.getFields(), lastAgg);
+        if (field.isNested()) {
+          AggregationBuilder nestedBuilder = createNestedAggregation(field);
 
-        }
+          if (insertFilterIfExistsAfter(lastAgg, groupBy, nestedBuilder, 1)) {
+            groupBy.remove(1);
+          } else {
+            nestedBuilder.subAggregation(lastAgg);
+          }
 
-        Map<String, KVValue> groupMap = aggMaker.getGroupMap();
-        // add field
-        if (select.getFields().size() > 0) {
-            setFields(select.getFields());
-//            explanFields(request, select.getFields(), lastAgg);
-        }
+          request.addAggregation(wrapNestedIfNeeded(nestedBuilder, field.isReverseNested()));
+        } else if (field.isChildren()) {
+          AggregationBuilder childrenBuilder = createChildrenAggregation(field);
 
-        // add order
-        if (lastAgg != null && select.getOrderBys().size() > 0) {
-            for (Order order : select.getOrderBys()) {
-
-                // check "standard" fields
-                KVValue temp = groupMap.get(order.getName());
-                if (temp != null) {
-                    TermsAggregationBuilder termsBuilder = (TermsAggregationBuilder) temp.value;
-                    switch (temp.key) {
-                        case "COUNT":
-                            termsBuilder.order(BucketOrder.count(isASC(order)));
-                            break;
-                        case "KEY":
-                            termsBuilder.order(BucketOrder.key(isASC(order)));
-                            break;
-                        case "FIELD":
-                            termsBuilder.order(BucketOrder.aggregation(order.getName(), isASC(order)));
-                            break;
-                        default:
-                            throw new SqlParseException(order.getName() + " can not to order");
-                    }
-                } else if (order.isScript()) {
-                    // Do not add scripted fields into sort, they must be sorted inside of aggregation
-                } else {
-                    // TODO: Is there a legit case when we want to add field into sort for aggregation queries?
-                    request.addSort(order.getName(), SortOrder.valueOf(order.getType()));
-                }
-            }
+          if (insertFilterIfExistsAfter(lastAgg, groupBy, childrenBuilder, 1)) {
+            groupBy.remove(1);
+          } else {
+            childrenBuilder.subAggregation(lastAgg);
+          }
+
+          request.addAggregation(childrenBuilder);
+        } else {
+          request.addAggregation(lastAgg);
         }
 
-        setLimitFromHint(this.select.getHints());
+        for (int i = 1; i < groupBy.size(); i++) {
+          field = groupBy.get(i);
+          AggregationBuilder subAgg = getGroupAgg(field, select);
+          // ES5.0 termsaggregation with size = 0 not supported anymore
+          //                    if (subAgg instanceof TermsAggregationBuilder && !(field instanceof
+          // MethodField)) {
 
-        request.setSearchType(SearchType.DEFAULT);
-        updateRequestWithIndexAndRoutingOptions(select, request);
-        updateRequestWithHighlight(select, request);
-        updateRequestWithCollapse(select, request);
-        updateRequestWithPostFilter(select, request);
-        return new SqlOpenSearchRequestBuilder(request);
-    }
+          //                        //((TermsAggregationBuilder) subAgg).size(0);
+          //                    }
 
-    private AggregationBuilder getGroupAgg(Field groupByField, Select select) throws SqlParseException {
-        AggregationBuilder lastAgg = null;
-        Field shadowField = null;
-
-        for (Field selectField : select.getFields()) {
-            if (selectField instanceof MethodField && selectField.getName().equals("script")) {
-                MethodField scriptField = (MethodField) selectField;
-                for (KVValue kv : scriptField.getParams()) {
-                    if (kv.value.equals(groupByField.getName())) {
-                        shadowField = scriptField;
-                        break;
-                    }
-                }
-            }
-        }
+          if (field.isNested()) {
+            AggregationBuilder nestedBuilder = createNestedAggregation(field);
 
-        if (shadowField == null) {
-            for (Field selectField: select.getFields()) {
-                if (selectField.getAlias() != null
-                        && (groupByField.getName().equals(selectField.getAlias())
-                            || groupByField.getExpression().equals(selectField.getExpression()))) {
-                    shadowField = selectField;
-                }
+            if (insertFilterIfExistsAfter(subAgg, groupBy, nestedBuilder, i + 1)) {
+              groupBy.remove(i + 1);
+              i++;
+            } else {
+              nestedBuilder.subAggregation(subAgg);
             }
 
-        }
+            lastAgg.subAggregation(wrapNestedIfNeeded(nestedBuilder, field.isReverseNested()));
+          } else if (field.isChildren()) {
+            AggregationBuilder childrenBuilder = createChildrenAggregation(field);
 
-        if (null != shadowField) {
-            groupByField.setAlias(shadowField.getAlias());
-            groupByField = shadowField;
-        }
+            if (insertFilterIfExistsAfter(subAgg, groupBy, childrenBuilder, i + 1)) {
+              groupBy.remove(i + 1);
+              i++;
+            } else {
+              childrenBuilder.subAggregation(subAgg);
+            }
 
-        lastAgg = aggMaker.makeGroupAgg(groupByField);
+            lastAgg.subAggregation(childrenBuilder);
+          } else {
+            lastAgg.subAggregation(subAgg);
+          }
 
-        // find if we have order for that aggregation. As of now only special case for script fields
-        if (groupByField.isScriptField()) {
-            addOrderByScriptFieldIfPresent(select, (TermsAggregationBuilder) lastAgg, groupByField.getExpression());
+          lastAgg = subAgg;
         }
+      }
+
+      // explain the field from SELECT and HAVING clause
+      List<Field> combinedList = new ArrayList<>();
+      combinedList.addAll(select.getFields());
+      if (select.getHaving() != null) {
+        combinedList.addAll(select.getHaving().getHavingFields());
+      }
+      // add aggregation function to each groupBy
+      explanFields(request, combinedList, lastAgg);
+
+      explainHaving(lastAgg);
+    }
 
-        return lastAgg;
+    if (select.getGroupBys().size() < 1) {
+      // add aggregation when having no groupBy script
+      explanFields(request, select.getFields(), lastAgg);
     }
 
-    private void addOrderByScriptFieldIfPresent(Select select, TermsAggregationBuilder groupByAggregation,
-                                                SQLExpr groupByExpression) {
-        // TODO: Explore other ways to correlate different fields/functions in the query (params?)
-        // This feels like a hacky way, but it's the best that could be done now.
-        select
-                .getOrderBys()
-                .stream()
-                .filter(order -> groupByExpression.equals(order.getSortField().getExpression()))
-                .findFirst()
-                .ifPresent(orderForGroupBy -> groupByAggregation.order(BucketOrder.key(isASC(orderForGroupBy))));
+    Map<String, KVValue> groupMap = aggMaker.getGroupMap();
+    // add field
+    if (select.getFields().size() > 0) {
+      setFields(select.getFields());
+      //            explanFields(request, select.getFields(), lastAgg);
     }
 
-    private AggregationBuilder wrapNestedIfNeeded(AggregationBuilder nestedBuilder, boolean reverseNested) {
-        if (!reverseNested) {
-            return nestedBuilder;
+    // add order
+    if (lastAgg != null && select.getOrderBys().size() > 0) {
+      for (Order order : select.getOrderBys()) {
+
+        // check "standard" fields
+        KVValue temp = groupMap.get(order.getName());
+        if (temp != null) {
+          TermsAggregationBuilder termsBuilder = (TermsAggregationBuilder) temp.value;
+          switch (temp.key) {
+            case "COUNT":
+              termsBuilder.order(BucketOrder.count(isASC(order)));
+              break;
+            case "KEY":
+              termsBuilder.order(BucketOrder.key(isASC(order)));
+              break;
+            case "FIELD":
+              termsBuilder.order(BucketOrder.aggregation(order.getName(), isASC(order)));
+              break;
+            default:
+              throw new SqlParseException(order.getName() + " can not to order");
+          }
+        } else if (order.isScript()) {
+          // Do not add scripted fields into sort, they must be sorted inside of aggregation
+        } else {
+          // TODO: Is there a legit case when we want to add field into sort for aggregation
+          // queries?
+          request.addSort(order.getName(), SortOrder.valueOf(order.getType()));
         }
-        if (reverseNested && !(nestedBuilder instanceof NestedAggregationBuilder)) {
-            return nestedBuilder;
+      }
+    }
+
+    setLimitFromHint(this.select.getHints());
+
+    request.setSearchType(SearchType.DEFAULT);
+    updateRequestWithIndexAndRoutingOptions(select, request);
+    updateRequestWithHighlight(select, request);
+    updateRequestWithCollapse(select, request);
+    updateRequestWithPostFilter(select, request);
+    return new SqlOpenSearchRequestBuilder(request);
+  }
+
+  private AggregationBuilder getGroupAgg(Field groupByField, Select select)
+      throws SqlParseException {
+    AggregationBuilder lastAgg = null;
+    Field shadowField = null;
+
+    for (Field selectField : select.getFields()) {
+      if (selectField instanceof MethodField && selectField.getName().equals("script")) {
+        MethodField scriptField = (MethodField) selectField;
+        for (KVValue kv : scriptField.getParams()) {
+          if (kv.value.equals(groupByField.getName())) {
+            shadowField = scriptField;
+            break;
+          }
         }
-        //we need to jump back to root
-        return AggregationBuilders.reverseNested(nestedBuilder.getName() + "_REVERSED").subAggregation(nestedBuilder);
+      }
     }
 
-    private AggregationBuilder createNestedAggregation(Field field) {
-        AggregationBuilder nestedBuilder;
+    if (shadowField == null) {
+      for (Field selectField : select.getFields()) {
+        if (selectField.getAlias() != null
+            && (groupByField.getName().equals(selectField.getAlias())
+                || groupByField.getExpression().equals(selectField.getExpression()))) {
+          shadowField = selectField;
+        }
+      }
+    }
 
-        String nestedPath = field.getNestedPath();
+    if (null != shadowField) {
+      groupByField.setAlias(shadowField.getAlias());
+      groupByField = shadowField;
+    }
 
-        if (field.isReverseNested()) {
-            if (nestedPath == null || !nestedPath.startsWith("~")) {
-                ReverseNestedAggregationBuilder reverseNestedAggregationBuilder =
-                        AggregationBuilders.reverseNested(getNestedAggName(field));
-                if (nestedPath != null) {
-                    reverseNestedAggregationBuilder.path(nestedPath);
-                }
-                return reverseNestedAggregationBuilder;
-            }
-            nestedPath = nestedPath.substring(1);
-        }
+    lastAgg = aggMaker.makeGroupAgg(groupByField);
 
-        nestedBuilder = AggregationBuilders.nested(getNestedAggName(field), nestedPath);
+    // find if we have order for that aggregation. As of now only special case for script fields
+    if (groupByField.isScriptField()) {
+      addOrderByScriptFieldIfPresent(
+          select, (TermsAggregationBuilder) lastAgg, groupByField.getExpression());
+    }
 
-        return nestedBuilder;
+    return lastAgg;
+  }
+
+  private void addOrderByScriptFieldIfPresent(
+      Select select, TermsAggregationBuilder groupByAggregation, SQLExpr groupByExpression) {
+    // TODO: Explore other ways to correlate different fields/functions in the query (params?)
+    // This feels like a hacky way, but it's the best that could be done now.
+    select.getOrderBys().stream()
+        .filter(order -> groupByExpression.equals(order.getSortField().getExpression()))
+        .findFirst()
+        .ifPresent(
+            orderForGroupBy -> groupByAggregation.order(BucketOrder.key(isASC(orderForGroupBy))));
+  }
+
+  private AggregationBuilder wrapNestedIfNeeded(
+      AggregationBuilder nestedBuilder, boolean reverseNested) {
+    if (!reverseNested) {
+      return nestedBuilder;
+    }
+    if (reverseNested && !(nestedBuilder instanceof NestedAggregationBuilder)) {
+      return nestedBuilder;
+    }
+    // we need to jump back to root
+    return AggregationBuilders.reverseNested(nestedBuilder.getName() + "_REVERSED")
+        .subAggregation(nestedBuilder);
+  }
+
+  private AggregationBuilder createNestedAggregation(Field field) {
+    AggregationBuilder nestedBuilder;
+
+    String nestedPath = field.getNestedPath();
+
+    if (field.isReverseNested()) {
+      if (nestedPath == null || !nestedPath.startsWith("~")) {
+        ReverseNestedAggregationBuilder reverseNestedAggregationBuilder =
+            AggregationBuilders.reverseNested(getNestedAggName(field));
+        if (nestedPath != null) {
+          reverseNestedAggregationBuilder.path(nestedPath);
+        }
+        return reverseNestedAggregationBuilder;
+      }
+      nestedPath = nestedPath.substring(1);
     }
 
-    private AggregationBuilder createChildrenAggregation(Field field) {
-        AggregationBuilder childrenBuilder;
+    nestedBuilder = AggregationBuilders.nested(getNestedAggName(field), nestedPath);
 
-        String childType = field.getChildType();
+    return nestedBuilder;
+  }
 
-        childrenBuilder = JoinAggregationBuilders.children(getChildrenAggName(field), childType);
+  private AggregationBuilder createChildrenAggregation(Field field) {
+    AggregationBuilder childrenBuilder;
 
-        return childrenBuilder;
-    }
+    String childType = field.getChildType();
 
-    private String getNestedAggName(Field field) {
-        String prefix;
+    childrenBuilder = JoinAggregationBuilders.children(getChildrenAggName(field), childType);
 
-        if (field instanceof MethodField) {
-            String nestedPath = field.getNestedPath();
-            if (nestedPath != null) {
-                prefix = nestedPath;
-            } else {
-                prefix = field.getAlias();
-            }
-        } else {
-            prefix = field.getName();
-        }
-        return prefix + "@NESTED";
-    }
+    return childrenBuilder;
+  }
 
-    private String getChildrenAggName(Field field) {
-        String prefix;
+  private String getNestedAggName(Field field) {
+    String prefix;
 
-        if (field instanceof MethodField) {
-            String childType = field.getChildType();
+    if (field instanceof MethodField) {
+      String nestedPath = field.getNestedPath();
+      if (nestedPath != null) {
+        prefix = nestedPath;
+      } else {
+        prefix = field.getAlias();
+      }
+    } else {
+      prefix = field.getName();
+    }
+    return prefix + "@NESTED";
+  }
+
+  private String getChildrenAggName(Field field) {
+    String prefix;
+
+    if (field instanceof MethodField) {
+      String childType = field.getChildType();
+
+      if (childType != null) {
+        prefix = childType;
+      } else {
+        prefix = field.getAlias();
+      }
+    } else {
+      prefix = field.getName();
+    }
 
-            if (childType != null) {
-                prefix = childType;
-            } else {
-                prefix = field.getAlias();
-            }
-        } else {
-            prefix = field.getName();
-        }
+    return prefix + "@CHILDREN";
+  }
 
-        return prefix + "@CHILDREN";
+  private boolean insertFilterIfExistsAfter(
+      AggregationBuilder agg, List<Field> groupBy, AggregationBuilder builder, int nextPosition)
+      throws SqlParseException {
+    if (groupBy.size() <= nextPosition) {
+      return false;
     }
-
-    private boolean insertFilterIfExistsAfter(AggregationBuilder agg, List<Field> groupBy, AggregationBuilder builder,
-                                              int nextPosition) throws SqlParseException {
-        if (groupBy.size() <= nextPosition) {
-            return false;
-        }
-        Field filterFieldCandidate = groupBy.get(nextPosition);
-        if (!(filterFieldCandidate instanceof MethodField)) {
-            return false;
-        }
-        MethodField methodField = (MethodField) filterFieldCandidate;
-        if (!methodField.getName().toLowerCase().equals("filter")) {
-            return false;
-        }
-        builder.subAggregation(aggMaker.makeGroupAgg(filterFieldCandidate).subAggregation(agg));
-        return true;
+    Field filterFieldCandidate = groupBy.get(nextPosition);
+    if (!(filterFieldCandidate instanceof MethodField)) {
+      return false;
     }
-
-    private AggregationBuilder updateAggIfNested(AggregationBuilder lastAgg, Field field) {
-        if (field.isNested()) {
-            lastAgg = AggregationBuilders.nested(field.getName() + "Nested", field.getNestedPath())
-                    .subAggregation(lastAgg);
-        }
-        return lastAgg;
+    MethodField methodField = (MethodField) filterFieldCandidate;
+    if (!methodField.getName().toLowerCase().equals("filter")) {
+      return false;
     }
-
-    private boolean isASC(Order order) {
-        return "ASC".equals(order.getType());
+    builder.subAggregation(aggMaker.makeGroupAgg(filterFieldCandidate).subAggregation(agg));
+    return true;
+  }
+
+  private AggregationBuilder updateAggIfNested(AggregationBuilder lastAgg, Field field) {
+    if (field.isNested()) {
+      lastAgg =
+          AggregationBuilders.nested(field.getName() + "Nested", field.getNestedPath())
+              .subAggregation(lastAgg);
     }
+    return lastAgg;
+  }
 
-    private void setFields(List<Field> fields) {
-        if (select.getFields().size() > 0) {
-            ArrayList<String> includeFields = new ArrayList<>();
+  private boolean isASC(Order order) {
+    return "ASC".equals(order.getType());
+  }
 
-            for (Field field : fields) {
-                if (field != null) {
-                    includeFields.add(field.getName());
-                }
-            }
+  private void setFields(List<Field> fields) {
+    if (select.getFields().size() > 0) {
+      ArrayList<String> includeFields = new ArrayList<>();
 
-            request.setFetchSource(includeFields.toArray(new String[0]), null);
+      for (Field field : fields) {
+        if (field != null) {
+          includeFields.add(field.getName());
         }
-    }
+      }
 
-    private void explanFields(SearchRequestBuilder request, List<Field> fields, AggregationBuilder groupByAgg)
-            throws SqlParseException {
-        for (Field field : fields) {
-            if (field instanceof MethodField) {
-
-                if (field.getName().equals("script")) {
-                    request.addStoredField(field.getAlias());
-                    DefaultQueryAction defaultQueryAction = new DefaultQueryAction(client, select);
-                    defaultQueryAction.initialize(request);
-                    List<Field> tempFields = Lists.newArrayList(field);
-                    defaultQueryAction.setFields(tempFields);
-                    continue;
-                }
-
-                AggregationBuilder makeAgg = aggMaker
-                        .withWhere(select.getWhere())
-                        .makeFieldAgg((MethodField) field, groupByAgg);
-                if (groupByAgg != null) {
-                    groupByAgg.subAggregation(makeAgg);
-                } else {
-                    request.addAggregation(makeAgg);
-                }
-            } else if (field != null) {
-                request.addStoredField(field.getName());
-            } else {
-                throw new SqlParseException("it did not support this field method " + field);
-            }
-        }
+      request.setFetchSource(includeFields.toArray(new String[0]), null);
     }
-
-    private void explainHaving(AggregationBuilder lastAgg) throws SqlParseException {
-        Having having = select.getHaving();
-        if (having != null) {
-            having.explain(lastAgg, select.getFields());
+  }
+
+  private void explanFields(
+      SearchRequestBuilder request, List<Field> fields, AggregationBuilder groupByAgg)
+      throws SqlParseException {
+    for (Field field : fields) {
+      if (field instanceof MethodField) {
+
+        if (field.getName().equals("script")) {
+          request.addStoredField(field.getAlias());
+          DefaultQueryAction defaultQueryAction = new DefaultQueryAction(client, select);
+          defaultQueryAction.initialize(request);
+          List<Field> tempFields = Lists.newArrayList(field);
+          defaultQueryAction.setFields(tempFields);
+          continue;
         }
-    }
 
-    /**
-     * Create filters based on
-     * the Where clause.
-     *
-     * @param where the 'WHERE' part of the SQL query.
-     * @throws SqlParseException
-     */
-    private void setWhere(Where where) throws SqlParseException {
-        BoolQueryBuilder boolQuery = null;
-        if (where != null) {
-            boolQuery = QueryMaker.explain(where, this.select.isQuery);
-        }
-        // Used to prevent NullPointerException in old tests as they do not set sqlRequest in QueryAction
-        if (sqlRequest != null) {
-            boolQuery = sqlRequest.checkAndAddFilter(boolQuery);
+        AggregationBuilder makeAgg =
+            aggMaker.withWhere(select.getWhere()).makeFieldAgg((MethodField) field, groupByAgg);
+        if (groupByAgg != null) {
+          groupByAgg.subAggregation(makeAgg);
+        } else {
+          request.addAggregation(makeAgg);
         }
-        request.setQuery(boolQuery);
+      } else if (field != null) {
+        request.addStoredField(field.getName());
+      } else {
+        throw new SqlParseException("it did not support this field method " + field);
+      }
     }
+  }
 
-
-    /**
-     * Set indices and types to the search request.
-     */
-    private void setIndicesAndTypes() {
-        request.setIndices(query.getIndexArr());
+  private void explainHaving(AggregationBuilder lastAgg) throws SqlParseException {
+    Having having = select.getHaving();
+    if (having != null) {
+      having.explain(lastAgg, select.getFields());
     }
-
-    private void setLimitFromHint(List<Hint> hints) {
-        int from = 0;
-        int size = 0;
-        for (Hint hint : hints) {
-            if (hint.getType() == HintType.DOCS_WITH_AGGREGATION) {
-                Integer[] params = (Integer[]) hint.getParams();
-                if (params.length > 1) {
-                    // if 2 or more are given, use the first as the from and the second as the size
-                    // so it is the same as LIMIT from,size
-                    // except written as /*! DOCS_WITH_AGGREGATION(from,size) */
-                    from = params[0];
-                    size = params[1];
-                } else if (params.length == 1) {
-                    // if only 1 parameter is given, use it as the size with a from of 0
-                    size = params[0];
-                }
-                break;
-            }
+  }
+
+  /**
+   * Create filters based on the Where clause.
+   *
+   * @param where the 'WHERE' part of the SQL query.
+   * @throws SqlParseException
+   */
+  private void setWhere(Where where) throws SqlParseException {
+    BoolQueryBuilder boolQuery = null;
+    if (where != null) {
+      boolQuery = QueryMaker.explain(where, this.select.isQuery);
+    }
+    // Used to prevent NullPointerException in old tests as they do not set sqlRequest in
+    // QueryAction
+    if (sqlRequest != null) {
+      boolQuery = sqlRequest.checkAndAddFilter(boolQuery);
+    }
+    request.setQuery(boolQuery);
+  }
+
+  /** Set indices and types to the search request. */
+  private void setIndicesAndTypes() {
+    request.setIndices(query.getIndexArr());
+  }
+
+  private void setLimitFromHint(List<Hint> hints) {
+    int from = 0;
+    int size = 0;
+    for (Hint hint : hints) {
+      if (hint.getType() == HintType.DOCS_WITH_AGGREGATION) {
+        Integer[] params = (Integer[]) hint.getParams();
+        if (params.length > 1) {
+          // if 2 or more are given, use the first as the from and the second as the size
+          // so it is the same as LIMIT from,size
+          // except written as /*! DOCS_WITH_AGGREGATION(from,size) */
+          from = params[0];
+          size = params[1];
+        } else if (params.length == 1) {
+          // if only 1 parameter is given, use it as the size with a from of 0
+          size = params[0];
         }
-        request.setFrom(from);
-        request.setSize(size);
+        break;
+      }
     }
+    request.setFrom(from);
+    request.setSize(size);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/DefaultQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/DefaultQueryAction.java
index 0ed5043ac8..18c9708df8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/DefaultQueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/DefaultQueryAction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -50,264 +49,268 @@
 import org.opensearch.sql.legacy.rewriter.nestedfield.NestedFieldProjection;
 import org.opensearch.sql.legacy.utils.SQLFunctions;
 
-/**
- * Transform SQL query to standard OpenSearch search query
- */
+/** Transform SQL query to standard OpenSearch search query */
 public class DefaultQueryAction extends QueryAction {
 
-    private final Select select;
-    private SearchRequestBuilder request;
-
-    private final List<String> fieldNames = new LinkedList<>();
-
-    public DefaultQueryAction(Client client, Select select) {
-        super(client, select);
-        this.select = select;
-    }
-
-    public void initialize(SearchRequestBuilder request) {
-        this.request = request;
+  private final Select select;
+  private SearchRequestBuilder request;
+
+  private final List<String> fieldNames = new LinkedList<>();
+
+  public DefaultQueryAction(Client client, Select select) {
+    super(client, select);
+    this.select = select;
+  }
+
+  public void initialize(SearchRequestBuilder request) {
+    this.request = request;
+  }
+
+  @Override
+  public SqlOpenSearchRequestBuilder explain() throws SqlParseException {
+    Objects.requireNonNull(this.sqlRequest, "SqlRequest is required for OpenSearch request build");
+    buildRequest();
+    checkAndSetScroll();
+    return new SqlOpenSearchRequestBuilder(request);
+  }
+
+  private void buildRequest() throws SqlParseException {
+    this.request = new SearchRequestBuilder(client, SearchAction.INSTANCE);
+    setIndicesAndTypes();
+    setFields(select.getFields());
+    setWhere(select.getWhere());
+    setSorts(select.getOrderBys());
+    updateRequestWithIndexAndRoutingOptions(select, request);
+    updateRequestWithHighlight(select, request);
+    updateRequestWithCollapse(select, request);
+    updateRequestWithPostFilter(select, request);
+    updateRequestWithInnerHits(select, request);
+  }
+
+  @VisibleForTesting
+  public void checkAndSetScroll() {
+    LocalClusterState clusterState = LocalClusterState.state();
+
+    Integer fetchSize = sqlRequest.fetchSize();
+    TimeValue timeValue = clusterState.getSettingValue(Settings.Key.SQL_CURSOR_KEEP_ALIVE);
+    Integer rowCount = select.getRowCount();
+
+    if (checkIfScrollNeeded(fetchSize, rowCount)) {
+      Metrics.getInstance()
+          .getNumericalMetric(MetricName.DEFAULT_CURSOR_REQUEST_COUNT_TOTAL)
+          .increment();
+      Metrics.getInstance().getNumericalMetric(MetricName.DEFAULT_CURSOR_REQUEST_TOTAL).increment();
+      request.setSize(fetchSize).setScroll(timeValue);
+    } else {
+      request.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
+      setLimit(select.getOffset(), rowCount != null ? rowCount : Select.DEFAULT_LIMIT);
     }
-
-    @Override
-    public SqlOpenSearchRequestBuilder explain() throws SqlParseException {
-        Objects.requireNonNull(this.sqlRequest, "SqlRequest is required for OpenSearch request build");
-        buildRequest();
-        checkAndSetScroll();
-        return new SqlOpenSearchRequestBuilder(request);
-    }
-
-    private void buildRequest() throws SqlParseException {
-        this.request = new SearchRequestBuilder(client, SearchAction.INSTANCE);
-        setIndicesAndTypes();
-        setFields(select.getFields());
-        setWhere(select.getWhere());
-        setSorts(select.getOrderBys());
-        updateRequestWithIndexAndRoutingOptions(select, request);
-        updateRequestWithHighlight(select, request);
-        updateRequestWithCollapse(select, request);
-        updateRequestWithPostFilter(select, request);
-        updateRequestWithInnerHits(select, request);
-    }
-
-    @VisibleForTesting
-    public void checkAndSetScroll() {
-        LocalClusterState clusterState = LocalClusterState.state();
-
-        Integer fetchSize = sqlRequest.fetchSize();
-        TimeValue timeValue = clusterState.getSettingValue(Settings.Key.SQL_CURSOR_KEEP_ALIVE);
-        Integer rowCount = select.getRowCount();
-
-        if (checkIfScrollNeeded(fetchSize, rowCount)) {
-            Metrics.getInstance().getNumericalMetric(MetricName.DEFAULT_CURSOR_REQUEST_COUNT_TOTAL).increment();
-            Metrics.getInstance().getNumericalMetric(MetricName.DEFAULT_CURSOR_REQUEST_TOTAL).increment();
-            request.setSize(fetchSize).setScroll(timeValue);
-        } else {
-            request.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
-            setLimit(select.getOffset(), rowCount != null ? rowCount : Select.DEFAULT_LIMIT);
+  }
+
+  private boolean checkIfScrollNeeded(Integer fetchSize, Integer rowCount) {
+    return (format != null && format.equals(Format.JDBC))
+        && fetchSize > 0
+        && (rowCount == null || (rowCount > fetchSize));
+  }
+
+  @Override
+  public Optional<List<String>> getFieldNames() {
+    return Optional.of(fieldNames);
+  }
+
+  public Select getSelect() {
+    return select;
+  }
+
+  /** Set indices and types to the search request. */
+  private void setIndicesAndTypes() {
+    request.setIndices(query.getIndexArr());
+  }
+
+  /**
+   * Set source filtering on a search request.
+   *
+   * @param fields list of fields to source filter.
+   */
+  public void setFields(List<Field> fields) throws SqlParseException {
+
+    if (!select.getFields().isEmpty() && !select.isSelectAll()) {
+      ArrayList<String> includeFields = new ArrayList<>();
+      ArrayList<String> excludeFields = new ArrayList<>();
+
+      for (Field field : fields) {
+        if (field instanceof MethodField) {
+          MethodField method = (MethodField) field;
+          if (method.getName().toLowerCase().equals("script")) {
+            handleScriptField(method);
+            if (method.getExpression() instanceof SQLCastExpr) {
+              includeFields.add(method.getParams().get(0).toString());
+            }
+          } else if (method.getName().equalsIgnoreCase("include")) {
+            for (KVValue kvValue : method.getParams()) {
+              includeFields.add(kvValue.value.toString());
+            }
+          } else if (method.getName().equalsIgnoreCase("exclude")) {
+            for (KVValue kvValue : method.getParams()) {
+              excludeFields.add(kvValue.value.toString());
+            }
+          }
+        } else if (field != null) {
+          if (isNotNested(field)) {
+            includeFields.add(field.getName());
+          }
         }
-    }
-
-
-    private boolean checkIfScrollNeeded(Integer fetchSize, Integer rowCount) {
-        return (format != null && format.equals(Format.JDBC))
-                && fetchSize > 0
-                && (rowCount == null || (rowCount > fetchSize));
-    }
+      }
 
-    @Override
-    public Optional<List<String>> getFieldNames() {
-        return Optional.of(fieldNames);
+      fieldNames.addAll(includeFields);
+      request.setFetchSource(
+          includeFields.toArray(new String[0]), excludeFields.toArray(new String[0]));
     }
+  }
 
+  private void handleScriptField(final MethodField method) throws SqlParseException {
 
-    public Select getSelect() {
-        return select;
-    }
-
-    /**
-     * Set indices and types to the search request.
-     */
-    private void setIndicesAndTypes() {
-        request.setIndices(query.getIndexArr());
-    }
-
-    /**
-     * Set source filtering on a search request.
-     *
-     * @param fields list of fields to source filter.
-     */
-    public void setFields(List<Field> fields) throws SqlParseException {
-
-        if (!select.getFields().isEmpty() && !select.isSelectAll()) {
-            ArrayList<String> includeFields = new ArrayList<>();
-            ArrayList<String> excludeFields = new ArrayList<>();
-
-            for (Field field : fields) {
-                if (field instanceof MethodField) {
-                    MethodField method = (MethodField) field;
-                    if (method.getName().toLowerCase().equals("script")) {
-                        handleScriptField(method);
-                        if (method.getExpression() instanceof SQLCastExpr) {
-                            includeFields.add(method.getParams().get(0).toString());
-                        }
-                    } else if (method.getName().equalsIgnoreCase("include")) {
-                        for (KVValue kvValue : method.getParams()) {
-                            includeFields.add(kvValue.value.toString());
-                        }
-                    } else if (method.getName().equalsIgnoreCase("exclude")) {
-                        for (KVValue kvValue : method.getParams()) {
-                            excludeFields.add(kvValue.value.toString());
-                        }
-                    }
-                } else if (field != null) {
-                    if (isNotNested(field)) {
-                        includeFields.add(field.getName());
-                    }
-                }
-            }
+    final List<KVValue> params = method.getParams();
+    final int numOfParams = params.size();
 
-            fieldNames.addAll(includeFields);
-            request.setFetchSource(includeFields.toArray(new String[0]), excludeFields.toArray(new String[0]));
-        }
+    if (2 != numOfParams && 3 != numOfParams) {
+      throw new SqlParseException(
+          "scripted_field only allows 'script(name,script)' " + "or 'script(name,lang,script)'");
     }
 
-    private void handleScriptField(final MethodField method) throws SqlParseException {
-
-        final List<KVValue> params = method.getParams();
-        final int numOfParams = params.size();
-
-        if (2 != numOfParams && 3 != numOfParams) {
-            throw new SqlParseException("scripted_field only allows 'script(name,script)' "
-                    + "or 'script(name,lang,script)'");
-        }
-
-        final String fieldName = params.get(0).value.toString();
-        fieldNames.add(fieldName);
-
-        final String secondParam = params.get(1).value.toString();
-        final Script script = (2 == numOfParams) ? new Script(secondParam) :
-                new Script(ScriptType.INLINE, secondParam, params.get(2).value.toString(), Collections.emptyMap());
-        request.addScriptField(fieldName, script);
+    final String fieldName = params.get(0).value.toString();
+    fieldNames.add(fieldName);
+
+    final String secondParam = params.get(1).value.toString();
+    final Script script =
+        (2 == numOfParams)
+            ? new Script(secondParam)
+            : new Script(
+                ScriptType.INLINE,
+                secondParam,
+                params.get(2).value.toString(),
+                Collections.emptyMap());
+    request.addScriptField(fieldName, script);
+  }
+
+  /**
+   * Create filters or queries based on the Where clause.
+   *
+   * @param where the 'WHERE' part of the SQL query.
+   * @throws SqlParseException if the where clause does not represent valid sql
+   */
+  private void setWhere(Where where) throws SqlParseException {
+    BoolQueryBuilder boolQuery = null;
+    if (where != null) {
+      boolQuery = QueryMaker.explain(where, this.select.isQuery);
     }
-
-    /**
-     * Create filters or queries based on the Where clause.
-     *
-     * @param where the 'WHERE' part of the SQL query.
-     * @throws SqlParseException if the where clause does not represent valid sql
-     */
-    private void setWhere(Where where) throws SqlParseException {
-        BoolQueryBuilder boolQuery = null;
-        if (where != null) {
-            boolQuery = QueryMaker.explain(where, this.select.isQuery);
-        }
-        // Used to prevent NullPointerException in old tests as they do not set sqlRequest in QueryAction
-        if (sqlRequest != null) {
-            boolQuery = sqlRequest.checkAndAddFilter(boolQuery);
-        }
-        request.setQuery(boolQuery);
+    // Used to prevent NullPointerException in old tests as they do not set sqlRequest in
+    // QueryAction
+    if (sqlRequest != null) {
+      boolQuery = sqlRequest.checkAndAddFilter(boolQuery);
     }
-
-    /**
-     * Add sorts to the OpenSearch query based on the 'ORDER BY' clause.
-     *
-     * @param orderBys list of Order object
-     */
-    private void setSorts(List<Order> orderBys) {
-        Map<String, FieldSortBuilder> sortBuilderMap = new HashMap<>();
-
-        for (Order order : orderBys) {
-            String orderByName = order.getName();
-            SortOrder sortOrder = SortOrder.valueOf(order.getType());
-
-            if (order.getNestedPath() != null) {
-                request.addSort(
-                        SortBuilders.fieldSort(orderByName)
-                                .order(sortOrder)
-                                .setNestedSort(new NestedSortBuilder(order.getNestedPath())));
-            } else if (order.isScript()) {
-                // TODO: Investigate how to find the type of expression (string or number)
-                // As of now this shouldn't be a problem, because the support is for date_format function
-                request.addSort(
-                    SortBuilders
-                        .scriptSort(new Script(orderByName), getScriptSortType(order))
-                        .order(sortOrder));
-            } else if (orderByName.equals(ScoreSortBuilder.NAME)) {
-                request.addSort(orderByName, sortOrder);
-            } else {
-                FieldSortBuilder fieldSortBuilder = sortBuilderMap.computeIfAbsent(orderByName, key -> {
-                    FieldSortBuilder fs = SortBuilders.fieldSort(key);
-                    request.addSort(fs);
-                    return fs;
+    request.setQuery(boolQuery);
+  }
+
+  /**
+   * Add sorts to the OpenSearch query based on the 'ORDER BY' clause.
+   *
+   * @param orderBys list of Order object
+   */
+  private void setSorts(List<Order> orderBys) {
+    Map<String, FieldSortBuilder> sortBuilderMap = new HashMap<>();
+
+    for (Order order : orderBys) {
+      String orderByName = order.getName();
+      SortOrder sortOrder = SortOrder.valueOf(order.getType());
+
+      if (order.getNestedPath() != null) {
+        request.addSort(
+            SortBuilders.fieldSort(orderByName)
+                .order(sortOrder)
+                .setNestedSort(new NestedSortBuilder(order.getNestedPath())));
+      } else if (order.isScript()) {
+        // TODO: Investigate how to find the type of expression (string or number)
+        // As of now this shouldn't be a problem, because the support is for date_format function
+        request.addSort(
+            SortBuilders.scriptSort(new Script(orderByName), getScriptSortType(order))
+                .order(sortOrder));
+      } else if (orderByName.equals(ScoreSortBuilder.NAME)) {
+        request.addSort(orderByName, sortOrder);
+      } else {
+        FieldSortBuilder fieldSortBuilder =
+            sortBuilderMap.computeIfAbsent(
+                orderByName,
+                key -> {
+                  FieldSortBuilder fs = SortBuilders.fieldSort(key);
+                  request.addSort(fs);
+                  return fs;
                 });
-                setSortParams(fieldSortBuilder, order);
-            }
-        }
+        setSortParams(fieldSortBuilder, order);
+      }
     }
+  }
 
+  private void setSortParams(FieldSortBuilder fieldSortBuilder, Order order) {
+    fieldSortBuilder.order(SortOrder.valueOf(order.getType()));
 
-    private void setSortParams(FieldSortBuilder fieldSortBuilder, Order order) {
-        fieldSortBuilder.order(SortOrder.valueOf(order.getType()));
-
-        SQLExpr expr = order.getSortField().getExpression();
-        if (expr instanceof SQLBinaryOpExpr) {
-            // we set SQLBinaryOpExpr in Field.setExpression() to support ORDER by IS NULL/IS NOT NULL
-            fieldSortBuilder.missing(getNullOrderString((SQLBinaryOpExpr) expr));
-        }
+    SQLExpr expr = order.getSortField().getExpression();
+    if (expr instanceof SQLBinaryOpExpr) {
+      // we set SQLBinaryOpExpr in Field.setExpression() to support ORDER by IS NULL/IS NOT NULL
+      fieldSortBuilder.missing(getNullOrderString((SQLBinaryOpExpr) expr));
     }
-
-    private String getNullOrderString(SQLBinaryOpExpr expr) {
-        SQLBinaryOperator operator = expr.getOperator();
-        return operator == SQLBinaryOperator.IsNot ? "_first" : "_last";
+  }
+
+  private String getNullOrderString(SQLBinaryOpExpr expr) {
+    SQLBinaryOperator operator = expr.getOperator();
+    return operator == SQLBinaryOperator.IsNot ? "_first" : "_last";
+  }
+
+  private ScriptSortType getScriptSortType(Order order) {
+    ScriptSortType scriptSortType;
+    Schema.Type scriptFunctionReturnType = SQLFunctions.getOrderByFieldType(order.getSortField());
+
+    // as of now script function return type returns only text and double
+    switch (scriptFunctionReturnType) {
+      case TEXT:
+        scriptSortType = ScriptSortType.STRING;
+        break;
+
+      case DOUBLE:
+      case FLOAT:
+      case INTEGER:
+      case LONG:
+        scriptSortType = ScriptSortType.NUMBER;
+        break;
+      default:
+        throw new IllegalStateException("Unknown type: " + scriptFunctionReturnType);
     }
-
-    private ScriptSortType getScriptSortType(Order order) {
-        ScriptSortType scriptSortType;
-        Schema.Type scriptFunctionReturnType = SQLFunctions.getOrderByFieldType(order.getSortField());
-
-
-        // as of now script function return type returns only text and double
-        switch (scriptFunctionReturnType) {
-            case TEXT:
-                scriptSortType = ScriptSortType.STRING;
-                break;
-
-            case DOUBLE:
-            case FLOAT:
-            case INTEGER:
-            case LONG:
-                scriptSortType = ScriptSortType.NUMBER;
-                break;
-            default:
-                throw new IllegalStateException("Unknown type: " + scriptFunctionReturnType);
-        }
-        return scriptSortType;
+    return scriptSortType;
+  }
+
+  /**
+   * Add from and size to the OpenSearch query based on the 'LIMIT' clause
+   *
+   * @param from starts from document at position from
+   * @param size number of documents to return.
+   */
+  private void setLimit(int from, int size) {
+    request.setFrom(from);
+
+    if (size > -1) {
+      request.setSize(size);
     }
+  }
 
-    /**
-     * Add from and size to the OpenSearch query based on the 'LIMIT' clause
-     *
-     * @param from starts from document at position from
-     * @param size number of documents to return.
-     */
-    private void setLimit(int from, int size) {
-        request.setFrom(from);
-
-        if (size > -1) {
-            request.setSize(size);
-        }
-    }
+  public SearchRequestBuilder getRequestBuilder() {
+    return request;
+  }
 
-    public SearchRequestBuilder getRequestBuilder() {
-        return request;
-    }
+  private boolean isNotNested(Field field) {
+    return !field.isNested() || field.isReverseNested();
+  }
 
-    private boolean isNotNested(Field field) {
-        return !field.isNested() || field.isReverseNested();
-    }
-
-    private void updateRequestWithInnerHits(Select select, SearchRequestBuilder request) {
-        new NestedFieldProjection(request).project(select.getFields(), select.getNestedJoinType());
-    }
+  private void updateRequestWithInnerHits(Select select, SearchRequestBuilder request) {
+    new NestedFieldProjection(request).project(select.getFields(), select.getNestedJoinType());
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/DeleteQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/DeleteQueryAction.java
index 892c5aeb2d..331921345f 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/DeleteQueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/DeleteQueryAction.java
@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query;
 
-
 import org.opensearch.client.Client;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
@@ -20,50 +18,44 @@
 
 public class DeleteQueryAction extends QueryAction {
 
-    private final Delete delete;
-    private DeleteByQueryRequestBuilder request;
-
-    public DeleteQueryAction(Client client, Delete delete) {
-        super(client, delete);
-        this.delete = delete;
-    }
-
-    @Override
-    public SqlElasticDeleteByQueryRequestBuilder explain() throws SqlParseException {
-        this.request = new DeleteByQueryRequestBuilder(client, DeleteByQueryAction.INSTANCE);
-
-        setIndicesAndTypes();
-        setWhere(delete.getWhere());
-        SqlElasticDeleteByQueryRequestBuilder deleteByQueryRequestBuilder =
-                new SqlElasticDeleteByQueryRequestBuilder(request);
-        return deleteByQueryRequestBuilder;
-    }
-
-
-    /**
-     * Set indices and types to the delete by query request.
-     */
-    private void setIndicesAndTypes() {
-
-        DeleteByQueryRequest innerRequest = request.request();
-        innerRequest.indices(query.getIndexArr());
+  private final Delete delete;
+  private DeleteByQueryRequestBuilder request;
+
+  public DeleteQueryAction(Client client, Delete delete) {
+    super(client, delete);
+    this.delete = delete;
+  }
+
+  @Override
+  public SqlElasticDeleteByQueryRequestBuilder explain() throws SqlParseException {
+    this.request = new DeleteByQueryRequestBuilder(client, DeleteByQueryAction.INSTANCE);
+
+    setIndicesAndTypes();
+    setWhere(delete.getWhere());
+    SqlElasticDeleteByQueryRequestBuilder deleteByQueryRequestBuilder =
+        new SqlElasticDeleteByQueryRequestBuilder(request);
+    return deleteByQueryRequestBuilder;
+  }
+
+  /** Set indices and types to the delete by query request. */
+  private void setIndicesAndTypes() {
+
+    DeleteByQueryRequest innerRequest = request.request();
+    innerRequest.indices(query.getIndexArr());
+  }
+
+  /**
+   * Create filters based on the Where clause.
+   *
+   * @param where the 'WHERE' part of the SQL query.
+   * @throws SqlParseException
+   */
+  private void setWhere(Where where) throws SqlParseException {
+    if (where != null) {
+      QueryBuilder whereQuery = QueryMaker.explain(where);
+      request.filter(whereQuery);
+    } else {
+      request.filter(QueryBuilders.matchAllQuery());
     }
-
-
-    /**
-     * Create filters based on
-     * the Where clause.
-     *
-     * @param where the 'WHERE' part of the SQL query.
-     * @throws SqlParseException
-     */
-    private void setWhere(Where where) throws SqlParseException {
-        if (where != null) {
-            QueryBuilder whereQuery = QueryMaker.explain(where);
-            request.filter(whereQuery);
-        } else {
-            request.filter(QueryBuilders.matchAllQuery());
-        }
-    }
-
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/DescribeQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/DescribeQueryAction.java
index 077d9c28b8..ffc9695d81 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/DescribeQueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/DescribeQueryAction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query;
 
 import org.opensearch.action.admin.indices.get.GetIndexRequestBuilder;
@@ -14,22 +13,23 @@
 
 public class DescribeQueryAction extends QueryAction {
 
-    private final IndexStatement statement;
+  private final IndexStatement statement;
 
-    public DescribeQueryAction(Client client, IndexStatement statement) {
-        super(client, null);
-        this.statement = statement;
-    }
+  public DescribeQueryAction(Client client, IndexStatement statement) {
+    super(client, null);
+    this.statement = statement;
+  }
 
-    @Override
-    public QueryStatement getQueryStatement() {
-        return statement;
-    }
+  @Override
+  public QueryStatement getQueryStatement() {
+    return statement;
+  }
 
-    @Override
-    public SqlOpenSearchRequestBuilder explain() {
-        final GetIndexRequestBuilder indexRequestBuilder = Util.prepareIndexRequestBuilder(client, statement);
+  @Override
+  public SqlOpenSearchRequestBuilder explain() {
+    final GetIndexRequestBuilder indexRequestBuilder =
+        Util.prepareIndexRequestBuilder(client, statement);
 
-        return new SqlOpenSearchRequestBuilder(indexRequestBuilder);
-    }
+    return new SqlOpenSearchRequestBuilder(indexRequestBuilder);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/OpenSearchActionFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/OpenSearchActionFactory.java
index de7256d2cf..b9a7c9f218 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/OpenSearchActionFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/OpenSearchActionFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query;
 
 import static org.opensearch.sql.legacy.domain.IndexStatement.StatementType;
@@ -65,188 +64,193 @@
 
 public class OpenSearchActionFactory {
 
-    public static QueryAction create(Client client, String sql)
-        throws SqlParseException, SQLFeatureNotSupportedException, SQLFeatureDisabledException {
-        return create(client, new QueryActionRequest(sql, new ColumnTypeProvider(), Format.JSON));
-    }
-
-    /**
-     * Create the compatible Query object
-     * based on the SQL query.
-     *
-     * @param request The SQL query.
-     * @return Query object.
-     */
-    public static QueryAction create(Client client, QueryActionRequest request)
-        throws SqlParseException, SQLFeatureNotSupportedException, SQLFeatureDisabledException {
-        String sql = request.getSql();
-        // Remove line breaker anywhere and semicolon at the end
-        sql = sql.replaceAll("\\R", " ").trim();
-        if (sql.endsWith(";")) {
-            sql = sql.substring(0, sql.length() - 1);
-        }
-
-        switch (getFirstWord(sql)) {
-            case "SELECT":
-                SQLQueryExpr sqlExpr = (SQLQueryExpr) toSqlExpr(sql);
-
-                RewriteRuleExecutor<SQLQueryExpr> ruleExecutor = RewriteRuleExecutor.builder()
-                        .withRule(new SQLExprParentSetterRule())
-                        .withRule(new OrdinalRewriterRule(sql))
-                        .withRule(new UnquoteIdentifierRule())
-                        .withRule(new TableAliasPrefixRemoveRule())
-                        .withRule(new SubQueryRewriteRule())
-                        .build();
-                ruleExecutor.executeOn(sqlExpr);
-                sqlExpr.accept(new NestedFieldRewriter());
-
-                if (isMulti(sqlExpr)) {
-                    sqlExpr.accept(new TermFieldRewriter(TermRewriterFilter.MULTI_QUERY));
-                    MultiQuerySelect multiSelect =
-                            new SqlParser().parseMultiSelect((SQLUnionQuery) sqlExpr.getSubQuery().getQuery());
-                    return new MultiQueryAction(client, multiSelect);
-                } else if (isJoin(sqlExpr, sql)) {
-                    new JoinRewriteRule(LocalClusterState.state()).rewrite(sqlExpr);
-                    sqlExpr.accept(new TermFieldRewriter(TermRewriterFilter.JOIN));
-                    JoinSelect joinSelect = new SqlParser().parseJoinSelect(sqlExpr);
-                    return OpenSearchJoinQueryActionFactory.createJoinAction(client, joinSelect);
-                } else {
-                    sqlExpr.accept(new TermFieldRewriter());
-                    // migrate aggregation to query planner framework.
-                    if (shouldMigrateToQueryPlan(sqlExpr, request.getFormat())) {
-                        return new QueryPlanQueryAction(new QueryPlanRequestBuilder(
-                                new BindingTupleQueryPlanner(client, sqlExpr, request.getTypeProvider())));
-                    }
-                    Select select = new SqlParser().parseSelect(sqlExpr);
-                    return handleSelect(client, select);
-                }
-            case "DELETE":
-                if (isSQLDeleteEnabled()) {
-                    SQLStatementParser parser = createSqlStatementParser(sql);
-                    SQLDeleteStatement deleteStatement = parser.parseDeleteStatement();
-                    Delete delete = new SqlParser().parseDelete(deleteStatement);
-                    return new DeleteQueryAction(client, delete);
-                } else {
-                    throw new SQLFeatureDisabledException(
-                        StringUtils.format("DELETE clause is disabled by default and will be "
-                                + "deprecated. Using the %s setting to enable it",
-                            Settings.Key.SQL_DELETE_ENABLED.getKeyValue()));
-                }
-            case "SHOW":
-                IndexStatement showStatement = new IndexStatement(StatementType.SHOW, sql);
-                return new ShowQueryAction(client, showStatement);
-            case "DESCRIBE":
-                IndexStatement describeStatement = new IndexStatement(StatementType.DESCRIBE, sql);
-                return new DescribeQueryAction(client, describeStatement);
-            default:
-                throw new SQLFeatureNotSupportedException(
-                        String.format("Query must start with SELECT, DELETE, SHOW or DESCRIBE: %s", sql));
-        }
-    }
+  public static QueryAction create(Client client, String sql)
+      throws SqlParseException, SQLFeatureNotSupportedException, SQLFeatureDisabledException {
+    return create(client, new QueryActionRequest(sql, new ColumnTypeProvider(), Format.JSON));
+  }
 
-    private static boolean isSQLDeleteEnabled() {
-        return LocalClusterState.state().getSettingValue(Settings.Key.SQL_DELETE_ENABLED);
+  /**
+   * Create the compatible Query object based on the SQL query.
+   *
+   * @param request The SQL query.
+   * @return Query object.
+   */
+  public static QueryAction create(Client client, QueryActionRequest request)
+      throws SqlParseException, SQLFeatureNotSupportedException, SQLFeatureDisabledException {
+    String sql = request.getSql();
+    // Remove line breaker anywhere and semicolon at the end
+    sql = sql.replaceAll("\\R", " ").trim();
+    if (sql.endsWith(";")) {
+      sql = sql.substring(0, sql.length() - 1);
     }
 
-    private static String getFirstWord(String sql) {
-        int endOfFirstWord = sql.indexOf(' ');
-        return sql.substring(0, endOfFirstWord > 0 ? endOfFirstWord : sql.length()).toUpperCase();
-    }
+    switch (getFirstWord(sql)) {
+      case "SELECT":
+        SQLQueryExpr sqlExpr = (SQLQueryExpr) toSqlExpr(sql);
 
-    private static boolean isMulti(SQLQueryExpr sqlExpr) {
-        return sqlExpr.getSubQuery().getQuery() instanceof SQLUnionQuery;
-    }
+        RewriteRuleExecutor<SQLQueryExpr> ruleExecutor =
+            RewriteRuleExecutor.builder()
+                .withRule(new SQLExprParentSetterRule())
+                .withRule(new OrdinalRewriterRule(sql))
+                .withRule(new UnquoteIdentifierRule())
+                .withRule(new TableAliasPrefixRemoveRule())
+                .withRule(new SubQueryRewriteRule())
+                .build();
+        ruleExecutor.executeOn(sqlExpr);
+        sqlExpr.accept(new NestedFieldRewriter());
 
-    private static void executeAndFillSubQuery(Client client,
-                                               SubQueryExpression subQueryExpression,
-                                               QueryAction queryAction) throws SqlParseException {
-        List<Object> values = new ArrayList<>();
-        Object queryResult;
-        try {
-            queryResult = QueryActionElasticExecutor.executeAnyAction(client, queryAction);
-        } catch (Exception e) {
-            throw new SqlParseException("could not execute SubQuery: " + e.getMessage());
+        if (isMulti(sqlExpr)) {
+          sqlExpr.accept(new TermFieldRewriter(TermRewriterFilter.MULTI_QUERY));
+          MultiQuerySelect multiSelect =
+              new SqlParser().parseMultiSelect((SQLUnionQuery) sqlExpr.getSubQuery().getQuery());
+          return new MultiQueryAction(client, multiSelect);
+        } else if (isJoin(sqlExpr, sql)) {
+          new JoinRewriteRule(LocalClusterState.state()).rewrite(sqlExpr);
+          sqlExpr.accept(new TermFieldRewriter(TermRewriterFilter.JOIN));
+          JoinSelect joinSelect = new SqlParser().parseJoinSelect(sqlExpr);
+          return OpenSearchJoinQueryActionFactory.createJoinAction(client, joinSelect);
+        } else {
+          sqlExpr.accept(new TermFieldRewriter());
+          // migrate aggregation to query planner framework.
+          if (shouldMigrateToQueryPlan(sqlExpr, request.getFormat())) {
+            return new QueryPlanQueryAction(
+                new QueryPlanRequestBuilder(
+                    new BindingTupleQueryPlanner(client, sqlExpr, request.getTypeProvider())));
+          }
+          Select select = new SqlParser().parseSelect(sqlExpr);
+          return handleSelect(client, select);
         }
-
-        String returnField = subQueryExpression.getReturnField();
-        if (queryResult instanceof SearchHits) {
-            SearchHits hits = (SearchHits) queryResult;
-            for (SearchHit hit : hits) {
-                values.add(ElasticResultHandler.getFieldValue(hit, returnField));
-            }
+      case "DELETE":
+        if (isSQLDeleteEnabled()) {
+          SQLStatementParser parser = createSqlStatementParser(sql);
+          SQLDeleteStatement deleteStatement = parser.parseDeleteStatement();
+          Delete delete = new SqlParser().parseDelete(deleteStatement);
+          return new DeleteQueryAction(client, delete);
         } else {
-            throw new SqlParseException("on sub queries only support queries that return Hits and not aggregations");
+          throw new SQLFeatureDisabledException(
+              StringUtils.format(
+                  "DELETE clause is disabled by default and will be "
+                      + "deprecated. Using the %s setting to enable it",
+                  Settings.Key.SQL_DELETE_ENABLED.getKeyValue()));
         }
-        subQueryExpression.setValues(values.toArray());
+      case "SHOW":
+        IndexStatement showStatement = new IndexStatement(StatementType.SHOW, sql);
+        return new ShowQueryAction(client, showStatement);
+      case "DESCRIBE":
+        IndexStatement describeStatement = new IndexStatement(StatementType.DESCRIBE, sql);
+        return new DescribeQueryAction(client, describeStatement);
+      default:
+        throw new SQLFeatureNotSupportedException(
+            String.format("Query must start with SELECT, DELETE, SHOW or DESCRIBE: %s", sql));
     }
+  }
 
-    private static QueryAction handleSelect(Client client, Select select) {
-        if (select.isAggregate) {
-            return new AggregationQueryAction(client, select);
-        } else {
-            return new DefaultQueryAction(client, select);
-        }
+  private static boolean isSQLDeleteEnabled() {
+    return LocalClusterState.state().getSettingValue(Settings.Key.SQL_DELETE_ENABLED);
+  }
+
+  private static String getFirstWord(String sql) {
+    int endOfFirstWord = sql.indexOf(' ');
+    return sql.substring(0, endOfFirstWord > 0 ? endOfFirstWord : sql.length()).toUpperCase();
+  }
+
+  private static boolean isMulti(SQLQueryExpr sqlExpr) {
+    return sqlExpr.getSubQuery().getQuery() instanceof SQLUnionQuery;
+  }
+
+  private static void executeAndFillSubQuery(
+      Client client, SubQueryExpression subQueryExpression, QueryAction queryAction)
+      throws SqlParseException {
+    List<Object> values = new ArrayList<>();
+    Object queryResult;
+    try {
+      queryResult = QueryActionElasticExecutor.executeAnyAction(client, queryAction);
+    } catch (Exception e) {
+      throw new SqlParseException("could not execute SubQuery: " + e.getMessage());
     }
 
-    private static SQLStatementParser createSqlStatementParser(String sql) {
-        ElasticLexer lexer = new ElasticLexer(sql);
-        lexer.nextToken();
-        return new MySqlStatementParser(lexer);
+    String returnField = subQueryExpression.getReturnField();
+    if (queryResult instanceof SearchHits) {
+      SearchHits hits = (SearchHits) queryResult;
+      for (SearchHit hit : hits) {
+        values.add(ElasticResultHandler.getFieldValue(hit, returnField));
+      }
+    } else {
+      throw new SqlParseException(
+          "on sub queries only support queries that return Hits and not aggregations");
     }
+    subQueryExpression.setValues(values.toArray());
+  }
 
-    private static boolean isJoin(SQLQueryExpr sqlExpr, String sql) {
-        MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) sqlExpr.getSubQuery().getQuery();
-        return query.getFrom() instanceof SQLJoinTableSource
-               && ((SQLJoinTableSource) query.getFrom()).getJoinType() != SQLJoinTableSource.JoinType.COMMA;
+  private static QueryAction handleSelect(Client client, Select select) {
+    if (select.isAggregate) {
+      return new AggregationQueryAction(client, select);
+    } else {
+      return new DefaultQueryAction(client, select);
     }
+  }
 
-    @VisibleForTesting
-    public static boolean shouldMigrateToQueryPlan(SQLQueryExpr expr, Format format) {
-        // The JSON format will return the OpenSearch aggregation result, which is not supported by the QueryPlanner.
-        if (format == Format.JSON) {
-            return false;
-        }
-        QueryPlannerScopeDecider decider = new QueryPlannerScopeDecider();
-        return decider.isInScope(expr);
+  private static SQLStatementParser createSqlStatementParser(String sql) {
+    ElasticLexer lexer = new ElasticLexer(sql);
+    lexer.nextToken();
+    return new MySqlStatementParser(lexer);
+  }
+
+  private static boolean isJoin(SQLQueryExpr sqlExpr, String sql) {
+    MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) sqlExpr.getSubQuery().getQuery();
+    return query.getFrom() instanceof SQLJoinTableSource
+        && ((SQLJoinTableSource) query.getFrom()).getJoinType()
+            != SQLJoinTableSource.JoinType.COMMA;
+  }
+
+  @VisibleForTesting
+  public static boolean shouldMigrateToQueryPlan(SQLQueryExpr expr, Format format) {
+    // The JSON format will return the OpenSearch aggregation result, which is not supported by the
+    // QueryPlanner.
+    if (format == Format.JSON) {
+      return false;
     }
+    QueryPlannerScopeDecider decider = new QueryPlannerScopeDecider();
+    return decider.isInScope(expr);
+  }
 
-    private static class QueryPlannerScopeDecider extends MySqlASTVisitorAdapter {
-        private boolean hasAggregationFunc = false;
-        private boolean hasNestedFunction = false;
-        private boolean hasGroupBy = false;
-        private boolean hasAllColumnExpr = false;
+  private static class QueryPlannerScopeDecider extends MySqlASTVisitorAdapter {
+    private boolean hasAggregationFunc = false;
+    private boolean hasNestedFunction = false;
+    private boolean hasGroupBy = false;
+    private boolean hasAllColumnExpr = false;
 
-        public boolean isInScope(SQLQueryExpr expr) {
-            expr.accept(this);
-            return !hasAllColumnExpr && !hasNestedFunction && (hasGroupBy || hasAggregationFunc);
-        }
+    public boolean isInScope(SQLQueryExpr expr) {
+      expr.accept(this);
+      return !hasAllColumnExpr && !hasNestedFunction && (hasGroupBy || hasAggregationFunc);
+    }
 
-        @Override
-        public boolean visit(SQLSelectItem expr) {
-            if (expr.getExpr() instanceof SQLAllColumnExpr) {
-                hasAllColumnExpr = true;
-            }
-            return super.visit(expr);
-        }
+    @Override
+    public boolean visit(SQLSelectItem expr) {
+      if (expr.getExpr() instanceof SQLAllColumnExpr) {
+        hasAllColumnExpr = true;
+      }
+      return super.visit(expr);
+    }
 
-        @Override
-        public boolean visit(SQLSelectGroupByClause expr) {
-            hasGroupBy = true;
-            return super.visit(expr);
-        }
+    @Override
+    public boolean visit(SQLSelectGroupByClause expr) {
+      hasGroupBy = true;
+      return super.visit(expr);
+    }
 
-        @Override
-        public boolean visit(SQLAggregateExpr expr) {
-            hasAggregationFunc = true;
-            return super.visit(expr);
-        }
+    @Override
+    public boolean visit(SQLAggregateExpr expr) {
+      hasAggregationFunc = true;
+      return super.visit(expr);
+    }
 
-        @Override
-        public boolean visit(SQLMethodInvokeExpr expr) {
-            if (expr.getMethodName().equalsIgnoreCase("nested")) {
-                hasNestedFunction = true;
-            }
-            return super.visit(expr);
-        }
+    @Override
+    public boolean visit(SQLMethodInvokeExpr expr) {
+      if (expr.getMethodName().equalsIgnoreCase("nested")) {
+        hasNestedFunction = true;
+      }
+      return super.visit(expr);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/QueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/QueryAction.java
index 46a9dda1d7..c9b39d2f97 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/QueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/QueryAction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query;
 
 import com.fasterxml.jackson.core.JsonFactory;
@@ -16,8 +15,8 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.Client;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
 import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.collapse.CollapseBuilder;
 import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
@@ -32,199 +31,208 @@
 import org.opensearch.sql.legacy.request.SqlRequest;
 
 /**
- * Abstract class. used to transform Select object (Represents SQL query) to
- * SearchRequestBuilder (Represents OpenSearch query)
+ * Abstract class. used to transform Select object (Represents SQL query) to SearchRequestBuilder
+ * (Represents OpenSearch query)
  */
 public abstract class QueryAction {
 
-    protected Query query;
-    protected Client client;
-    protected SqlRequest sqlRequest = SqlRequest.NULL;
-    protected ColumnTypeProvider scriptColumnType;
-    protected Format format;
-
-    public QueryAction(Client client, Query query) {
-        this.client = client;
-        this.query = query;
-    }
-
-    public Client getClient() {
-        return client;
-    }
-
-    public QueryStatement getQueryStatement() {
-        return query;
-    }
-
-    public void setSqlRequest(SqlRequest sqlRequest) {
-        this.sqlRequest = sqlRequest;
-    }
-
-    public void setColumnTypeProvider(ColumnTypeProvider scriptColumnType) {
-        this.scriptColumnType = scriptColumnType;
-    }
-
-    public SqlRequest getSqlRequest() {
-        return sqlRequest;
-    }
-
-    public void setFormat(Format format) {
-        this.format = format;
-    }
-
-    public Format getFormat() {
-        return this.format;
-    }
-
-    public ColumnTypeProvider getScriptColumnType() {
-        return scriptColumnType;
-    }
-
-    /**
-     * @return List of field names produced by the query
-     */
-    public Optional<List<String>> getFieldNames() {
-        return Optional.empty();
-    }
-
-    protected void updateRequestWithCollapse(Select select, SearchRequestBuilder request) throws SqlParseException {
-        JsonFactory jsonFactory = new JsonFactory();
-        for (Hint hint : select.getHints()) {
-            if (hint.getType() == HintType.COLLAPSE && hint.getParams() != null && 0 < hint.getParams().length) {
-                try (JsonXContentParser parser = new JsonXContentParser(NamedXContentRegistry.EMPTY,
-                        LoggingDeprecationHandler.INSTANCE, jsonFactory.createParser(hint.getParams()[0].toString()))) {
-                    request.setCollapse(CollapseBuilder.fromXContent(parser));
-                } catch (IOException e) {
-                    throw new SqlParseException("could not parse collapse hint: " + e.getMessage());
-                }
-            }
-        }
-    }
-
-    protected void updateRequestWithPostFilter(Select select, SearchRequestBuilder request) {
-        for (Hint hint : select.getHints()) {
-            if (hint.getType() == HintType.POST_FILTER && hint.getParams() != null && 0 < hint.getParams().length) {
-                request.setPostFilter(QueryBuilders.wrapperQuery(hint.getParams()[0].toString()));
-            }
-        }
-    }
-
-    protected void updateRequestWithIndexAndRoutingOptions(Select select, SearchRequestBuilder request) {
-        for (Hint hint : select.getHints()) {
-            if (hint.getType() == HintType.IGNORE_UNAVAILABLE) {
-                //saving the defaults from TransportClient search
-                request.setIndicesOptions(IndicesOptions.fromOptions(true, false, true, false,
-                        IndicesOptions.strictExpandOpenAndForbidClosed()));
-            }
-            if (hint.getType() == HintType.ROUTINGS) {
-                Object[] routings = hint.getParams();
-                String[] routingsAsStringArray = new String[routings.length];
-                for (int i = 0; i < routings.length; i++) {
-                    routingsAsStringArray[i] = routings[i].toString();
-                }
-                request.setRouting(routingsAsStringArray);
-            }
-        }
-    }
-
-    protected void updateRequestWithHighlight(Select select, SearchRequestBuilder request) {
-        boolean foundAnyHighlights = false;
-        HighlightBuilder highlightBuilder = new HighlightBuilder();
-        for (Hint hint : select.getHints()) {
-            if (hint.getType() == HintType.HIGHLIGHT) {
-                HighlightBuilder.Field highlightField = parseHighlightField(hint.getParams());
-                if (highlightField != null) {
-                    foundAnyHighlights = true;
-                    highlightBuilder.field(highlightField);
-                }
-            }
-        }
-        if (foundAnyHighlights) {
-            request.highlighter(highlightBuilder);
-        }
-    }
-
-    protected HighlightBuilder.Field parseHighlightField(Object[] params) {
-        if (params == null || params.length == 0 || params.length > 2) {
-            //todo: exception.
+  protected Query query;
+  protected Client client;
+  protected SqlRequest sqlRequest = SqlRequest.NULL;
+  protected ColumnTypeProvider scriptColumnType;
+  protected Format format;
+
+  public QueryAction(Client client, Query query) {
+    this.client = client;
+    this.query = query;
+  }
+
+  public Client getClient() {
+    return client;
+  }
+
+  public QueryStatement getQueryStatement() {
+    return query;
+  }
+
+  public void setSqlRequest(SqlRequest sqlRequest) {
+    this.sqlRequest = sqlRequest;
+  }
+
+  public void setColumnTypeProvider(ColumnTypeProvider scriptColumnType) {
+    this.scriptColumnType = scriptColumnType;
+  }
+
+  public SqlRequest getSqlRequest() {
+    return sqlRequest;
+  }
+
+  public void setFormat(Format format) {
+    this.format = format;
+  }
+
+  public Format getFormat() {
+    return this.format;
+  }
+
+  public ColumnTypeProvider getScriptColumnType() {
+    return scriptColumnType;
+  }
+
+  /**
+   * @return List of field names produced by the query
+   */
+  public Optional<List<String>> getFieldNames() {
+    return Optional.empty();
+  }
+
+  protected void updateRequestWithCollapse(Select select, SearchRequestBuilder request)
+      throws SqlParseException {
+    JsonFactory jsonFactory = new JsonFactory();
+    for (Hint hint : select.getHints()) {
+      if (hint.getType() == HintType.COLLAPSE
+          && hint.getParams() != null
+          && 0 < hint.getParams().length) {
+        try (JsonXContentParser parser =
+            new JsonXContentParser(
+                NamedXContentRegistry.EMPTY,
+                LoggingDeprecationHandler.INSTANCE,
+                jsonFactory.createParser(hint.getParams()[0].toString()))) {
+          request.setCollapse(CollapseBuilder.fromXContent(parser));
+        } catch (IOException e) {
+          throw new SqlParseException("could not parse collapse hint: " + e.getMessage());
         }
-        HighlightBuilder.Field field = new HighlightBuilder.Field(params[0].toString());
-        if (params.length == 1) {
-            return field;
+      }
+    }
+  }
+
+  protected void updateRequestWithPostFilter(Select select, SearchRequestBuilder request) {
+    for (Hint hint : select.getHints()) {
+      if (hint.getType() == HintType.POST_FILTER
+          && hint.getParams() != null
+          && 0 < hint.getParams().length) {
+        request.setPostFilter(QueryBuilders.wrapperQuery(hint.getParams()[0].toString()));
+      }
+    }
+  }
+
+  protected void updateRequestWithIndexAndRoutingOptions(
+      Select select, SearchRequestBuilder request) {
+    for (Hint hint : select.getHints()) {
+      if (hint.getType() == HintType.IGNORE_UNAVAILABLE) {
+        // saving the defaults from TransportClient search
+        request.setIndicesOptions(
+            IndicesOptions.fromOptions(
+                true, false, true, false, IndicesOptions.strictExpandOpenAndForbidClosed()));
+      }
+      if (hint.getType() == HintType.ROUTINGS) {
+        Object[] routings = hint.getParams();
+        String[] routingsAsStringArray = new String[routings.length];
+        for (int i = 0; i < routings.length; i++) {
+          routingsAsStringArray[i] = routings[i].toString();
         }
-        Map<String, Object> highlightParams = (Map<String, Object>) params[1];
-
-        for (Map.Entry<String, Object> param : highlightParams.entrySet()) {
-            switch (param.getKey()) {
-                case "type":
-                    field.highlighterType((String) param.getValue());
-                    break;
-                case "boundary_chars":
-                    field.boundaryChars(fromArrayListToCharArray((ArrayList) param.getValue()));
-                    break;
-                case "boundary_max_scan":
-                    field.boundaryMaxScan((Integer) param.getValue());
-                    break;
-                case "force_source":
-                    field.forceSource((Boolean) param.getValue());
-                    break;
-                case "fragmenter":
-                    field.fragmenter((String) param.getValue());
-                    break;
-                case "fragment_offset":
-                    field.fragmentOffset((Integer) param.getValue());
-                    break;
-                case "fragment_size":
-                    field.fragmentSize((Integer) param.getValue());
-                    break;
-                case "highlight_filter":
-                    field.highlightFilter((Boolean) param.getValue());
-                    break;
-                case "matched_fields":
-                    field.matchedFields((String[]) ((ArrayList) param.getValue()).toArray(new String[0]));
-                    break;
-                case "no_match_size":
-                    field.noMatchSize((Integer) param.getValue());
-                    break;
-                case "num_of_fragments":
-                    field.numOfFragments((Integer) param.getValue());
-                    break;
-                case "order":
-                    field.order((String) param.getValue());
-                    break;
-                case "phrase_limit":
-                    field.phraseLimit((Integer) param.getValue());
-                    break;
-                case "post_tags":
-                    field.postTags((String[]) ((ArrayList) param.getValue()).toArray(new String[0]));
-                    break;
-                case "pre_tags":
-                    field.preTags((String[]) ((ArrayList) param.getValue()).toArray(new String[0]));
-                    break;
-                case "require_field_match":
-                    field.requireFieldMatch((Boolean) param.getValue());
-                    break;
-
-            }
+        request.setRouting(routingsAsStringArray);
+      }
+    }
+  }
+
+  protected void updateRequestWithHighlight(Select select, SearchRequestBuilder request) {
+    boolean foundAnyHighlights = false;
+    HighlightBuilder highlightBuilder = new HighlightBuilder();
+    for (Hint hint : select.getHints()) {
+      if (hint.getType() == HintType.HIGHLIGHT) {
+        HighlightBuilder.Field highlightField = parseHighlightField(hint.getParams());
+        if (highlightField != null) {
+          foundAnyHighlights = true;
+          highlightBuilder.field(highlightField);
         }
-        return field;
-    }
-
-    private char[] fromArrayListToCharArray(ArrayList arrayList) {
-        char[] chars = new char[arrayList.size()];
-        int i = 0;
-        for (Object item : arrayList) {
-            chars[i] = item.toString().charAt(0);
-            i++;
-        }
-        return chars;
-    }
-
-    /**
-     * Prepare the request, and return OpenSearch request.
-     *
-     * @return ActionRequestBuilder (OpenSearch request)
-     * @throws SqlParseException
-     */
-    public abstract SqlElasticRequestBuilder explain() throws SqlParseException;
+      }
+    }
+    if (foundAnyHighlights) {
+      request.highlighter(highlightBuilder);
+    }
+  }
+
+  protected HighlightBuilder.Field parseHighlightField(Object[] params) {
+    if (params == null || params.length == 0 || params.length > 2) {
+      // todo: exception.
+    }
+    HighlightBuilder.Field field = new HighlightBuilder.Field(params[0].toString());
+    if (params.length == 1) {
+      return field;
+    }
+    Map<String, Object> highlightParams = (Map<String, Object>) params[1];
+
+    for (Map.Entry<String, Object> param : highlightParams.entrySet()) {
+      switch (param.getKey()) {
+        case "type":
+          field.highlighterType((String) param.getValue());
+          break;
+        case "boundary_chars":
+          field.boundaryChars(fromArrayListToCharArray((ArrayList) param.getValue()));
+          break;
+        case "boundary_max_scan":
+          field.boundaryMaxScan((Integer) param.getValue());
+          break;
+        case "force_source":
+          field.forceSource((Boolean) param.getValue());
+          break;
+        case "fragmenter":
+          field.fragmenter((String) param.getValue());
+          break;
+        case "fragment_offset":
+          field.fragmentOffset((Integer) param.getValue());
+          break;
+        case "fragment_size":
+          field.fragmentSize((Integer) param.getValue());
+          break;
+        case "highlight_filter":
+          field.highlightFilter((Boolean) param.getValue());
+          break;
+        case "matched_fields":
+          field.matchedFields((String[]) ((ArrayList) param.getValue()).toArray(new String[0]));
+          break;
+        case "no_match_size":
+          field.noMatchSize((Integer) param.getValue());
+          break;
+        case "num_of_fragments":
+          field.numOfFragments((Integer) param.getValue());
+          break;
+        case "order":
+          field.order((String) param.getValue());
+          break;
+        case "phrase_limit":
+          field.phraseLimit((Integer) param.getValue());
+          break;
+        case "post_tags":
+          field.postTags((String[]) ((ArrayList) param.getValue()).toArray(new String[0]));
+          break;
+        case "pre_tags":
+          field.preTags((String[]) ((ArrayList) param.getValue()).toArray(new String[0]));
+          break;
+        case "require_field_match":
+          field.requireFieldMatch((Boolean) param.getValue());
+          break;
+      }
+    }
+    return field;
+  }
+
+  private char[] fromArrayListToCharArray(ArrayList arrayList) {
+    char[] chars = new char[arrayList.size()];
+    int i = 0;
+    for (Object item : arrayList) {
+      chars[i] = item.toString().charAt(0);
+      i++;
+    }
+    return chars;
+  }
+
+  /**
+   * Prepare the request, and return OpenSearch request.
+   *
+   * @return ActionRequestBuilder (OpenSearch request)
+   * @throws SqlParseException
+   */
+  public abstract SqlElasticRequestBuilder explain() throws SqlParseException;
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/ShowQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/ShowQueryAction.java
index 7a414087e4..d9baa901fa 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/ShowQueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/ShowQueryAction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query;
 
 import static org.opensearch.sql.legacy.utils.Util.prepareIndexRequestBuilder;
@@ -15,22 +14,23 @@
 
 public class ShowQueryAction extends QueryAction {
 
-    private final IndexStatement statement;
+  private final IndexStatement statement;
 
-    public ShowQueryAction(Client client, IndexStatement statement) {
-        super(client, null);
-        this.statement = statement;
-    }
+  public ShowQueryAction(Client client, IndexStatement statement) {
+    super(client, null);
+    this.statement = statement;
+  }
 
-    @Override
-    public QueryStatement getQueryStatement() {
-        return statement;
-    }
+  @Override
+  public QueryStatement getQueryStatement() {
+    return statement;
+  }
 
-    @Override
-    public SqlOpenSearchRequestBuilder explain() {
-        final GetIndexRequestBuilder indexRequestBuilder = prepareIndexRequestBuilder(client, statement);
+  @Override
+  public SqlOpenSearchRequestBuilder explain() {
+    final GetIndexRequestBuilder indexRequestBuilder =
+        prepareIndexRequestBuilder(client, statement);
 
-        return new SqlOpenSearchRequestBuilder(indexRequestBuilder);
-    }
+    return new SqlOpenSearchRequestBuilder(indexRequestBuilder);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlElasticDeleteByQueryRequestBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlElasticDeleteByQueryRequestBuilder.java
index 69036a6d10..2203cbb39e 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlElasticDeleteByQueryRequestBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlElasticDeleteByQueryRequestBuilder.java
@@ -3,50 +3,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query;
 
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestBuilder;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.index.reindex.DeleteByQueryRequestBuilder;
 
-/**
- * Created by Eliran on 19/8/2015.
- */
+/** Created by Eliran on 19/8/2015. */
 public class SqlElasticDeleteByQueryRequestBuilder implements SqlElasticRequestBuilder {
-    DeleteByQueryRequestBuilder deleteByQueryRequestBuilder;
-
-    public SqlElasticDeleteByQueryRequestBuilder(DeleteByQueryRequestBuilder deleteByQueryRequestBuilder) {
-        this.deleteByQueryRequestBuilder = deleteByQueryRequestBuilder;
-    }
-
-    @Override
-    public ActionRequest request() {
-        return deleteByQueryRequestBuilder.request();
+  DeleteByQueryRequestBuilder deleteByQueryRequestBuilder;
+
+  public SqlElasticDeleteByQueryRequestBuilder(
+      DeleteByQueryRequestBuilder deleteByQueryRequestBuilder) {
+    this.deleteByQueryRequestBuilder = deleteByQueryRequestBuilder;
+  }
+
+  @Override
+  public ActionRequest request() {
+    return deleteByQueryRequestBuilder.request();
+  }
+
+  @Override
+  public String explain() {
+    try {
+      SearchRequestBuilder source = deleteByQueryRequestBuilder.source();
+      return source.toString();
+    } catch (Exception e) {
+      e.printStackTrace();
     }
+    return null;
+  }
 
-    @Override
-    public String explain() {
-        try {
-            SearchRequestBuilder source = deleteByQueryRequestBuilder.source();
-            return source.toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    @Override
-    public ActionResponse get() {
+  @Override
+  public ActionResponse get() {
 
-        return this.deleteByQueryRequestBuilder.get();
-    }
-
-    @Override
-    public ActionRequestBuilder getBuilder() {
-        return deleteByQueryRequestBuilder;
-    }
+    return this.deleteByQueryRequestBuilder.get();
+  }
 
+  @Override
+  public ActionRequestBuilder getBuilder() {
+    return deleteByQueryRequestBuilder;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlElasticRequestBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlElasticRequestBuilder.java
index eb04be928c..7babbe5abe 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlElasticRequestBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlElasticRequestBuilder.java
@@ -3,22 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query;
 
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestBuilder;
-import org.opensearch.action.ActionResponse;
+import org.opensearch.core.action.ActionResponse;
 
-/**
- * Created by Eliran on 19/8/2015.
- */
+/** Created by Eliran on 19/8/2015. */
 public interface SqlElasticRequestBuilder {
-    ActionRequest request();
+  ActionRequest request();
 
-    String explain();
+  String explain();
 
-    ActionResponse get();
+  ActionResponse get();
 
-    ActionRequestBuilder getBuilder();
+  ActionRequestBuilder getBuilder();
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlOpenSearchRequestBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlOpenSearchRequestBuilder.java
index 3edd8d3fbd..2beb16837b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlOpenSearchRequestBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/SqlOpenSearchRequestBuilder.java
@@ -3,45 +3,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query;
 
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestBuilder;
-import org.opensearch.action.ActionResponse;
+import org.opensearch.core.action.ActionResponse;
 
-/**
- * Created by Eliran on 19/8/2015.
- */
+/** Created by Eliran on 19/8/2015. */
 public class SqlOpenSearchRequestBuilder implements SqlElasticRequestBuilder {
-    ActionRequestBuilder requestBuilder;
-
-    public SqlOpenSearchRequestBuilder(ActionRequestBuilder requestBuilder) {
-        this.requestBuilder = requestBuilder;
-    }
-
-    @Override
-    public ActionRequest request() {
-        return requestBuilder.request();
-    }
-
-    @Override
-    public String explain() {
-        return requestBuilder.toString();
-    }
-
-    @Override
-    public ActionResponse get() {
-        return requestBuilder.get();
-    }
-
-    @Override
-    public ActionRequestBuilder getBuilder() {
-        return requestBuilder;
-    }
-
-    @Override
-    public String toString() {
-        return this.requestBuilder.toString();
-    }
+  ActionRequestBuilder requestBuilder;
+
+  public SqlOpenSearchRequestBuilder(ActionRequestBuilder requestBuilder) {
+    this.requestBuilder = requestBuilder;
+  }
+
+  @Override
+  public ActionRequest request() {
+    return requestBuilder.request();
+  }
+
+  @Override
+  public String explain() {
+    return requestBuilder.toString();
+  }
+
+  @Override
+  public ActionResponse get() {
+    return requestBuilder.get();
+  }
+
+  @Override
+  public ActionRequestBuilder getBuilder() {
+    return requestBuilder;
+  }
+
+  @Override
+  public String toString() {
+    return this.requestBuilder.toString();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/BackOffRetryStrategy.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/BackOffRetryStrategy.java
index 06ec21247a..d767268cb1 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/BackOffRetryStrategy.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/BackOffRetryStrategy.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.join;
 
 import java.util.ArrayList;
@@ -22,198 +21,198 @@
 
 public class BackOffRetryStrategy {
 
-    private static final Logger LOG = LogManager.getLogger();
-
-    /**
-     * Interval (ms) between each retry
-     */
-    private static final long[] intervals = milliseconds(new double[]{4, 8 + 4, 16 + 4});
+  private static final Logger LOG = LogManager.getLogger();
 
-    /**
-     * Delta to randomize interval (ms)
-     */
-    private static final long delta = 4 * 1000;
+  /** Interval (ms) between each retry */
+  private static final long[] intervals = milliseconds(new double[] {4, 8 + 4, 16 + 4});
 
-    private static final int threshold = 85;
+  /** Delta to randomize interval (ms) */
+  private static final long delta = 4 * 1000;
 
-    private static IdentityHashMap<Object, Tuple<Long, Long>> memUse = new IdentityHashMap<>();
+  private static final int threshold = 85;
 
-    private static AtomicLong mem = new AtomicLong(0L);
+  private static IdentityHashMap<Object, Tuple<Long, Long>> memUse = new IdentityHashMap<>();
 
-    private static long lastTimeoutCleanTime = System.currentTimeMillis();
+  private static AtomicLong mem = new AtomicLong(0L);
 
-    private static final long RELTIMEOUT = 1000 * 60 * 30;
+  private static long lastTimeoutCleanTime = System.currentTimeMillis();
 
-    private static final int MAXRETRIES = 999;
+  private static final long RELTIMEOUT = 1000 * 60 * 30;
 
-    private static final Object obj = new Object();
+  private static final int MAXRETRIES = 999;
 
-    public static final Supplier<Integer> GET_CB_STATE = () -> isMemoryHealthy() ? 0 : 1;
+  private static final Object obj = new Object();
 
-    private BackOffRetryStrategy() {
+  public static final Supplier<Integer> GET_CB_STATE = () -> isMemoryHealthy() ? 0 : 1;
 
-    }
+  private BackOffRetryStrategy() {}
 
-    private static boolean isMemoryHealthy() {
-        final long freeMemory = Runtime.getRuntime().freeMemory();
-        final long totalMemory = Runtime.getRuntime().totalMemory();
-        final int memoryUsage = (int) Math.round((double) (totalMemory - freeMemory + mem.get())
-                / (double) totalMemory * 100);
+  private static boolean isMemoryHealthy() {
+    final long freeMemory = Runtime.getRuntime().freeMemory();
+    final long totalMemory = Runtime.getRuntime().totalMemory();
+    final int memoryUsage =
+        (int)
+            Math.round(
+                (double) (totalMemory - freeMemory + mem.get()) / (double) totalMemory * 100);
 
-        LOG.debug("[MCB1] Memory total, free, allocate: {}, {}, {}", totalMemory, freeMemory, mem.get());
-        LOG.debug("[MCB1] Memory usage and limit: {}%, {}%", memoryUsage, threshold);
+    LOG.debug(
+        "[MCB1] Memory total, free, allocate: {}, {}, {}", totalMemory, freeMemory, mem.get());
+    LOG.debug("[MCB1] Memory usage and limit: {}%, {}%", memoryUsage, threshold);
 
-        return memoryUsage < threshold;
-    }
+    return memoryUsage < threshold;
+  }
 
-    public static boolean isHealthy() {
-        for (int i = 0; i < intervals.length; i++) {
-            if (isMemoryHealthy()) {
-                return true;
-            }
-
-            LOG.warn("[MCB1] Memory monitor is unhealthy now, back off retrying: {} attempt, thread id = {}",
-                    i, Thread.currentThread().getId());
-            if (ThreadLocalRandom.current().nextBoolean()) {
-                Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CB).increment();
-                LOG.warn("[MCB1] Directly abort on idx {}.", i);
-                return false;
-            }
-            backOffSleep(intervals[i]);
-        }
-
-        boolean isHealthy = isMemoryHealthy();
-        if (!isHealthy) {
-            Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CB).increment();
-        }
+  public static boolean isHealthy() {
+    for (int i = 0; i < intervals.length; i++) {
+      if (isMemoryHealthy()) {
+        return true;
+      }
 
-        return isHealthy;
+      LOG.warn(
+          "[MCB1] Memory monitor is unhealthy now, back off retrying: {} attempt, thread id = {}",
+          i,
+          Thread.currentThread().getId());
+      if (ThreadLocalRandom.current().nextBoolean()) {
+        Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CB).increment();
+        LOG.warn("[MCB1] Directly abort on idx {}.", i);
+        return false;
+      }
+      backOffSleep(intervals[i]);
     }
 
-    private static boolean isMemoryHealthy(long allocateMemory, int idx, Object key) {
-        long logMem = mem.get();
-
-        releaseTimeoutMemory();
-        if (idx == 0 && allocateMemory > 0) {
-            logMem = mem.addAndGet(allocateMemory);
-            synchronized (BackOffRetryStrategy.class) {
-                if (memUse.containsKey(key)) {
-                    memUse.put(key, Tuple.tuple(memUse.get(key).v1(), memUse.get(key).v2() + allocateMemory));
-                } else {
-                    memUse.put(key, Tuple.tuple(System.currentTimeMillis(), allocateMemory));
-                }
-            }
-        }
-
-        final long freeMemory = Runtime.getRuntime().freeMemory();
-        final long totalMemory = Runtime.getRuntime().totalMemory();
-        final int memoryUsage = (int) Math.round((double) (totalMemory - freeMemory + logMem)
-                / (double) totalMemory * 100);
+    boolean isHealthy = isMemoryHealthy();
+    if (!isHealthy) {
+      Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_CB).increment();
+    }
 
-        LOG.debug("[MCB] Idx is {}", idx);
-        LOG.debug("[MCB] Memory total, free, allocate: {}, {}, {}, {}", totalMemory, freeMemory,
-                allocateMemory, logMem);
-        LOG.debug("[MCB] Memory usage and limit: {}%, {}%", memoryUsage, threshold);
+    return isHealthy;
+  }
 
-        return memoryUsage < threshold;
+  private static boolean isMemoryHealthy(long allocateMemory, int idx, Object key) {
+    long logMem = mem.get();
 
+    releaseTimeoutMemory();
+    if (idx == 0 && allocateMemory > 0) {
+      logMem = mem.addAndGet(allocateMemory);
+      synchronized (BackOffRetryStrategy.class) {
+        if (memUse.containsKey(key)) {
+          memUse.put(key, Tuple.tuple(memUse.get(key).v1(), memUse.get(key).v2() + allocateMemory));
+        } else {
+          memUse.put(key, Tuple.tuple(System.currentTimeMillis(), allocateMemory));
+        }
+      }
     }
 
-    public static boolean isHealthy(long allocateMemory, Object key) {
-        if (key == null) {
-            key = obj;
-        }
+    final long freeMemory = Runtime.getRuntime().freeMemory();
+    final long totalMemory = Runtime.getRuntime().totalMemory();
+    final int memoryUsage =
+        (int) Math.round((double) (totalMemory - freeMemory + logMem) / (double) totalMemory * 100);
+
+    LOG.debug("[MCB] Idx is {}", idx);
+    LOG.debug(
+        "[MCB] Memory total, free, allocate: {}, {}, {}, {}",
+        totalMemory,
+        freeMemory,
+        allocateMemory,
+        logMem);
+    LOG.debug("[MCB] Memory usage and limit: {}%, {}%", memoryUsage, threshold);
+
+    return memoryUsage < threshold;
+  }
+
+  public static boolean isHealthy(long allocateMemory, Object key) {
+    if (key == null) {
+      key = obj;
+    }
 
-        for (int i = 0; i < intervals.length; i++) {
-            if (isMemoryHealthy(allocateMemory, i, key)) {
-                return true;
-            }
-
-            LOG.warn("[MCB] Memory monitor is unhealthy now, back off retrying: {} attempt, "
-                    + "executor = {}, thread id = {}", i, key, Thread.currentThread().getId());
-            if (ThreadLocalRandom.current().nextBoolean()) {
-                LOG.warn("[MCB] Directly abort on idx {}, executor is {}.", i, key);
-                return false;
-            }
-            backOffSleep(intervals[i]);
-        }
-        return isMemoryHealthy(allocateMemory, MAXRETRIES, key);
+    for (int i = 0; i < intervals.length; i++) {
+      if (isMemoryHealthy(allocateMemory, i, key)) {
+        return true;
+      }
+
+      LOG.warn(
+          "[MCB] Memory monitor is unhealthy now, back off retrying: {} attempt, "
+              + "executor = {}, thread id = {}",
+          i,
+          key,
+          Thread.currentThread().getId());
+      if (ThreadLocalRandom.current().nextBoolean()) {
+        LOG.warn("[MCB] Directly abort on idx {}, executor is {}.", i, key);
+        return false;
+      }
+      backOffSleep(intervals[i]);
     }
+    return isMemoryHealthy(allocateMemory, MAXRETRIES, key);
+  }
 
-    public static void backOffSleep(long interval) {
-        try {
-            long millis = randomize(interval);
+  public static void backOffSleep(long interval) {
+    try {
+      long millis = randomize(interval);
 
-            LOG.info("[MCB] Back off sleeping: {} ms", millis);
-            Thread.sleep(millis);
-        } catch (InterruptedException e) {
-            LOG.error("[MCB] Sleep interrupted", e);
-        }
+      LOG.info("[MCB] Back off sleeping: {} ms", millis);
+      Thread.sleep(millis);
+    } catch (InterruptedException e) {
+      LOG.error("[MCB] Sleep interrupted", e);
     }
-
-    /**
-     * Generate random interval in [interval-delta, interval+delta)
-     */
-    private static long randomize(long interval) {
-        // Random number within range generator for JDK 7+
-        return ThreadLocalRandom.current().nextLong(
-                lowerBound(interval), upperBound(interval)
-        );
+  }
+
+  /** Generate random interval in [interval-delta, interval+delta) */
+  private static long randomize(long interval) {
+    // Random number within range generator for JDK 7+
+    return ThreadLocalRandom.current().nextLong(lowerBound(interval), upperBound(interval));
+  }
+
+  private static long lowerBound(long interval) {
+    return Math.max(0, interval - delta);
+  }
+
+  private static long upperBound(long interval) {
+    return interval + delta;
+  }
+
+  private static long[] milliseconds(double[] seconds) {
+    return Arrays.stream(seconds).mapToLong((second) -> (long) (1000 * second)).toArray();
+  }
+
+  public static void releaseMem(Object key) {
+    LOG.debug("[MCB] mem is {} before release", mem);
+    long v = 0L;
+    synchronized (BackOffRetryStrategy.class) {
+      if (memUse.containsKey(key)) {
+        v = memUse.get(key).v2();
+        memUse.remove(key);
+      }
     }
-
-    private static long lowerBound(long interval) {
-        return Math.max(0, interval - delta);
+    if (v > 0) {
+      atomicMinusLowBoundZero(mem, v);
     }
+    LOG.debug("[MCB] mem is {} after release", mem);
+  }
 
-    private static long upperBound(long interval) {
-        return interval + delta;
+  private static void releaseTimeoutMemory() {
+    long cur = System.currentTimeMillis();
+    if (cur - lastTimeoutCleanTime < RELTIMEOUT) {
+      return;
     }
 
-    private static long[] milliseconds(double[] seconds) {
-        return Arrays.stream(seconds).
-                mapToLong((second) -> (long) (1000 * second)).
-                toArray();
+    List<Long> bulks = new ArrayList<>();
+    Predicate<Tuple<Long, Long>> isTimeout = t -> cur - t.v1() > RELTIMEOUT;
+    synchronized (BackOffRetryStrategy.class) {
+      memUse.values().stream().filter(isTimeout).forEach(v -> bulks.add(v.v2()));
+      memUse.values().removeIf(isTimeout);
     }
 
-    public static void releaseMem(Object key) {
-        LOG.debug("[MCB] mem is {} before release", mem);
-        long v = 0L;
-        synchronized (BackOffRetryStrategy.class) {
-            if (memUse.containsKey(key)) {
-                v = memUse.get(key).v2();
-                memUse.remove(key);
-            }
-        }
-        if (v > 0) {
-            atomicMinusLowBoundZero(mem, v);
-        }
-        LOG.debug("[MCB] mem is {} after release", mem);
+    for (long v : bulks) {
+      atomicMinusLowBoundZero(mem, v);
     }
 
-    private static void releaseTimeoutMemory() {
-        long cur = System.currentTimeMillis();
-        if (cur - lastTimeoutCleanTime < RELTIMEOUT) {
-            return;
-        }
+    lastTimeoutCleanTime = cur;
+  }
 
-        List<Long> bulks = new ArrayList<>();
-        Predicate<Tuple<Long, Long>> isTimeout = t -> cur - t.v1() > RELTIMEOUT;
-        synchronized (BackOffRetryStrategy.class) {
-            memUse.values().stream().filter(isTimeout).forEach(v -> bulks.add(v.v2()));
-            memUse.values().removeIf(isTimeout);
-        }
-
-        for (long v : bulks) {
-            atomicMinusLowBoundZero(mem, v);
-        }
-
-        lastTimeoutCleanTime = cur;
-    }
-
-    private static void atomicMinusLowBoundZero(AtomicLong x, Long y) {
-        long memRes = x.addAndGet(-y);
-        if (memRes < 0) {
-            x.compareAndSet(memRes, 0L);
-        }
+  private static void atomicMinusLowBoundZero(AtomicLong x, Long y) {
+    long memRes = x.addAndGet(-y);
+    if (memRes < 0) {
+      x.compareAndSet(memRes, 0L);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/HashJoinElasticRequestBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/HashJoinElasticRequestBuilder.java
index 3ab8c11ee0..c8b44e1bbb 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/HashJoinElasticRequestBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/HashJoinElasticRequestBuilder.java
@@ -3,42 +3,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.join;
 
 import java.util.List;
 import java.util.Map;
 import org.opensearch.sql.legacy.domain.Field;
 
-/**
- * Created by Eliran on 22/8/2015.
- */
+/** Created by Eliran on 22/8/2015. */
 public class HashJoinElasticRequestBuilder extends JoinRequestBuilder {
 
-    private List<List<Map.Entry<Field, Field>>> t1ToT2FieldsComparison;
-    private boolean useTermFiltersOptimization;
+  private List<List<Map.Entry<Field, Field>>> t1ToT2FieldsComparison;
+  private boolean useTermFiltersOptimization;
 
-    public HashJoinElasticRequestBuilder() {
-    }
+  public HashJoinElasticRequestBuilder() {}
 
-    @Override
-    public String explain() {
-        return "HashJoin " + super.explain();
-    }
+  @Override
+  public String explain() {
+    return "HashJoin " + super.explain();
+  }
 
-    public List<List<Map.Entry<Field, Field>>> getT1ToT2FieldsComparison() {
-        return t1ToT2FieldsComparison;
-    }
+  public List<List<Map.Entry<Field, Field>>> getT1ToT2FieldsComparison() {
+    return t1ToT2FieldsComparison;
+  }
 
-    public void setT1ToT2FieldsComparison(List<List<Map.Entry<Field, Field>>> t1ToT2FieldsComparison) {
-        this.t1ToT2FieldsComparison = t1ToT2FieldsComparison;
-    }
+  public void setT1ToT2FieldsComparison(
+      List<List<Map.Entry<Field, Field>>> t1ToT2FieldsComparison) {
+    this.t1ToT2FieldsComparison = t1ToT2FieldsComparison;
+  }
 
-    public boolean isUseTermFiltersOptimization() {
-        return useTermFiltersOptimization;
-    }
+  public boolean isUseTermFiltersOptimization() {
+    return useTermFiltersOptimization;
+  }
 
-    public void setUseTermFiltersOptimization(boolean useTermFiltersOptimization) {
-        this.useTermFiltersOptimization = useTermFiltersOptimization;
-    }
+  public void setUseTermFiltersOptimization(boolean useTermFiltersOptimization) {
+    this.useTermFiltersOptimization = useTermFiltersOptimization;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/JoinRequestBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/JoinRequestBuilder.java
index b4ebbb2ad7..82ebd1b225 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/JoinRequestBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/JoinRequestBuilder.java
@@ -3,111 +3,113 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.join;
 
 import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
 import java.io.IOException;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestBuilder;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.search.MultiSearchRequest;
-import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.sql.legacy.query.SqlElasticRequestBuilder;
 
-/**
- * Created by Eliran on 15/9/2015.
- */
+/** Created by Eliran on 15/9/2015. */
 public class JoinRequestBuilder implements SqlElasticRequestBuilder {
 
-    private MultiSearchRequest multi;
-    private TableInJoinRequestBuilder firstTable;
-    private TableInJoinRequestBuilder secondTable;
-    private SQLJoinTableSource.JoinType joinType;
-    private int totalLimit;
-
-    public JoinRequestBuilder() {
-        firstTable = new TableInJoinRequestBuilder();
-        secondTable = new TableInJoinRequestBuilder();
-    }
-
-
-    @Override
-    public ActionRequest request() {
-        if (multi == null) {
-            buildMulti();
-        }
-        return multi;
-
-    }
-
-    private void buildMulti() {
-        multi = new MultiSearchRequest();
-        multi.add(firstTable.getRequestBuilder());
-        multi.add(secondTable.getRequestBuilder());
-    }
-
-    @Override
-    public String explain() {
-        try {
-            XContentBuilder firstBuilder = XContentFactory.contentBuilder(XContentType.JSON).prettyPrint();
-            firstTable.getRequestBuilder().request().source().toXContent(firstBuilder, ToXContent.EMPTY_PARAMS);
-
-            XContentBuilder secondBuilder = XContentFactory.contentBuilder(XContentType.JSON).prettyPrint();
-            secondTable.getRequestBuilder().request().source().toXContent(secondBuilder, ToXContent.EMPTY_PARAMS);
-            return String.format(" first query:\n%s\n second query:\n%s",
-                    BytesReference.bytes(firstBuilder).utf8ToString(),
-                    BytesReference.bytes(secondBuilder).utf8ToString());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    @Override
-    public ActionResponse get() {
-        return null;
-    }
-
-    @Override
-    public ActionRequestBuilder getBuilder() {
-        return this.firstTable.getRequestBuilder();
+  private MultiSearchRequest multi;
+  private TableInJoinRequestBuilder firstTable;
+  private TableInJoinRequestBuilder secondTable;
+  private SQLJoinTableSource.JoinType joinType;
+  private int totalLimit;
+
+  public JoinRequestBuilder() {
+    firstTable = new TableInJoinRequestBuilder();
+    secondTable = new TableInJoinRequestBuilder();
+  }
+
+  @Override
+  public ActionRequest request() {
+    if (multi == null) {
+      buildMulti();
     }
-
-    public MultiSearchRequest getMulti() {
-        return multi;
+    return multi;
+  }
+
+  private void buildMulti() {
+    multi = new MultiSearchRequest();
+    multi.add(firstTable.getRequestBuilder());
+    multi.add(secondTable.getRequestBuilder());
+  }
+
+  @Override
+  public String explain() {
+    try {
+      XContentBuilder firstBuilder = XContentFactory.jsonBuilder().prettyPrint();
+      firstTable
+          .getRequestBuilder()
+          .request()
+          .source()
+          .toXContent(firstBuilder, ToXContent.EMPTY_PARAMS);
+
+      XContentBuilder secondBuilder = XContentFactory.jsonBuilder().prettyPrint();
+      secondTable
+          .getRequestBuilder()
+          .request()
+          .source()
+          .toXContent(secondBuilder, ToXContent.EMPTY_PARAMS);
+      return String.format(
+          " first query:\n%s\n second query:\n%s",
+          BytesReference.bytes(firstBuilder).utf8ToString(),
+          BytesReference.bytes(secondBuilder).utf8ToString());
+    } catch (IOException e) {
+      e.printStackTrace();
     }
-
-    public void setMulti(MultiSearchRequest multi) {
-        this.multi = multi;
-    }
-
-    public SQLJoinTableSource.JoinType getJoinType() {
-        return joinType;
-    }
-
-    public void setJoinType(SQLJoinTableSource.JoinType joinType) {
-        this.joinType = joinType;
-    }
-
-    public TableInJoinRequestBuilder getFirstTable() {
-        return firstTable;
-    }
-
-    public TableInJoinRequestBuilder getSecondTable() {
-        return secondTable;
-    }
-
-    public int getTotalLimit() {
-        return totalLimit;
-    }
-
-    public void setTotalLimit(int totalLimit) {
-        this.totalLimit = totalLimit;
-    }
-
+    return null;
+  }
+
+  @Override
+  public ActionResponse get() {
+    return null;
+  }
+
+  @Override
+  public ActionRequestBuilder getBuilder() {
+    return this.firstTable.getRequestBuilder();
+  }
+
+  public MultiSearchRequest getMulti() {
+    return multi;
+  }
+
+  public void setMulti(MultiSearchRequest multi) {
+    this.multi = multi;
+  }
+
+  public SQLJoinTableSource.JoinType getJoinType() {
+    return joinType;
+  }
+
+  public void setJoinType(SQLJoinTableSource.JoinType joinType) {
+    this.joinType = joinType;
+  }
+
+  public TableInJoinRequestBuilder getFirstTable() {
+    return firstTable;
+  }
+
+  public TableInJoinRequestBuilder getSecondTable() {
+    return secondTable;
+  }
+
+  public int getTotalLimit() {
+    return totalLimit;
+  }
+
+  public void setTotalLimit(int totalLimit) {
+    this.totalLimit = totalLimit;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/NestedLoopsElasticRequestBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/NestedLoopsElasticRequestBuilder.java
index 2e80c05ff2..9dd34c71b9 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/NestedLoopsElasticRequestBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/NestedLoopsElasticRequestBuilder.java
@@ -3,103 +3,110 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.join;
 
-
 import java.io.IOException;
 import org.json.JSONObject;
 import org.json.JSONStringer;
-import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.sql.legacy.domain.Condition;
 import org.opensearch.sql.legacy.domain.Where;
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.query.maker.QueryMaker;
 
-/**
- * Created by Eliran on 15/9/2015.
- */
+/** Created by Eliran on 15/9/2015. */
 public class NestedLoopsElasticRequestBuilder extends JoinRequestBuilder {
 
-    private Where connectedWhere;
-    private int multiSearchMaxSize;
+  private Where connectedWhere;
+  private int multiSearchMaxSize;
 
-    public NestedLoopsElasticRequestBuilder() {
+  public NestedLoopsElasticRequestBuilder() {
 
-        multiSearchMaxSize = 100;
-    }
+    multiSearchMaxSize = 100;
+  }
 
-    @Override
-    public String explain() {
-        String conditions = "";
-
-        try {
-            Where where = (Where) this.connectedWhere.clone();
-            setValueTypeConditionToStringRecursive(where);
-            if (where != null) {
-                conditions = QueryMaker.explain(where, false).toString();
-            }
-        } catch (CloneNotSupportedException | SqlParseException e) {
-            conditions = "Could not parse conditions due to " + e.getMessage();
-        }
-
-        String desc = "Nested Loops run first query, and for each result run "
-                + "second query with additional conditions as following.";
-        String[] queries = explainNL();
-        JSONStringer jsonStringer = new JSONStringer();
-        jsonStringer.object().key("description").value(desc)
-                .key("conditions").value(new JSONObject(conditions))
-                .key("first query").value(new JSONObject(queries[0]))
-                .key("second query").value(new JSONObject(queries[1])).endObject();
-        return jsonStringer.toString();
-    }
+  @Override
+  public String explain() {
+    String conditions = "";
 
-    public int getMultiSearchMaxSize() {
-        return multiSearchMaxSize;
+    try {
+      Where where = (Where) this.connectedWhere.clone();
+      setValueTypeConditionToStringRecursive(where);
+      if (where != null) {
+        conditions = QueryMaker.explain(where, false).toString();
+      }
+    } catch (CloneNotSupportedException | SqlParseException e) {
+      conditions = "Could not parse conditions due to " + e.getMessage();
     }
 
-    public void setMultiSearchMaxSize(int multiSearchMaxSize) {
-        this.multiSearchMaxSize = multiSearchMaxSize;
+    String desc =
+        "Nested Loops run first query, and for each result run "
+            + "second query with additional conditions as following.";
+    String[] queries = explainNL();
+    JSONStringer jsonStringer = new JSONStringer();
+    jsonStringer
+        .object()
+        .key("description")
+        .value(desc)
+        .key("conditions")
+        .value(new JSONObject(conditions))
+        .key("first query")
+        .value(new JSONObject(queries[0]))
+        .key("second query")
+        .value(new JSONObject(queries[1]))
+        .endObject();
+    return jsonStringer.toString();
+  }
+
+  public int getMultiSearchMaxSize() {
+    return multiSearchMaxSize;
+  }
+
+  public void setMultiSearchMaxSize(int multiSearchMaxSize) {
+    this.multiSearchMaxSize = multiSearchMaxSize;
+  }
+
+  public Where getConnectedWhere() {
+    return connectedWhere;
+  }
+
+  public void setConnectedWhere(Where connectedWhere) {
+    this.connectedWhere = connectedWhere;
+  }
+
+  private void setValueTypeConditionToStringRecursive(Where where) {
+    if (where == null) {
+      return;
     }
-
-    public Where getConnectedWhere() {
-        return connectedWhere;
+    if (where instanceof Condition) {
+      Condition c = (Condition) where;
+      c.setValue(c.getValue().toString());
+      return;
+    } else {
+      for (Where innerWhere : where.getWheres()) {
+        setValueTypeConditionToStringRecursive(innerWhere);
+      }
     }
-
-    public void setConnectedWhere(Where connectedWhere) {
-        this.connectedWhere = connectedWhere;
-    }
-
-    private void setValueTypeConditionToStringRecursive(Where where) {
-        if (where == null) {
-            return;
-        }
-        if (where instanceof Condition) {
-            Condition c = (Condition) where;
-            c.setValue(c.getValue().toString());
-            return;
-        } else {
-            for (Where innerWhere : where.getWheres()) {
-                setValueTypeConditionToStringRecursive(innerWhere);
-            }
-        }
-    }
-
-    private String[] explainNL() {
-        return new String[]{explainQuery(this.getFirstTable()), explainQuery(this.getSecondTable())};
-    }
-
-    private String explainQuery(TableInJoinRequestBuilder requestBuilder) {
-        try {
-            XContentBuilder xContentBuilder = XContentFactory.contentBuilder(XContentType.JSON).prettyPrint();
-            requestBuilder.getRequestBuilder().request().source().toXContent(xContentBuilder, ToXContent.EMPTY_PARAMS);
-            return BytesReference.bytes(xContentBuilder).utf8ToString();
-        } catch (IOException e) {
-            return e.getMessage();
-        }
+  }
+
+  private String[] explainNL() {
+    return new String[] {explainQuery(this.getFirstTable()), explainQuery(this.getSecondTable())};
+  }
+
+  private String explainQuery(TableInJoinRequestBuilder requestBuilder) {
+    try {
+      XContentBuilder xContentBuilder = XContentFactory.jsonBuilder().prettyPrint();
+      requestBuilder
+          .getRequestBuilder()
+          .request()
+          .source()
+          .toXContent(xContentBuilder, ToXContent.EMPTY_PARAMS);
+      return BytesReference.bytes(xContentBuilder).utf8ToString();
+    } catch (IOException e) {
+      return e.getMessage();
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchHashJoinQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchHashJoinQueryAction.java
index 0a87c16067..078ed6bcce 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchHashJoinQueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchHashJoinQueryAction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.join;
 
 import java.util.AbstractMap;
@@ -20,129 +19,126 @@
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.query.planner.HashJoinQueryPlanRequestBuilder;
 
-/**
- * Created by Eliran on 22/8/2015.
- */
+/** Created by Eliran on 22/8/2015. */
 public class OpenSearchHashJoinQueryAction extends OpenSearchJoinQueryAction {
 
-    public OpenSearchHashJoinQueryAction(Client client, JoinSelect joinSelect) {
-        super(client, joinSelect);
-    }
+  public OpenSearchHashJoinQueryAction(Client client, JoinSelect joinSelect) {
+    super(client, joinSelect);
+  }
 
-    @Override
-    protected void fillSpecificRequestBuilder(JoinRequestBuilder requestBuilder) throws SqlParseException {
-        String t1Alias = joinSelect.getFirstTable().getAlias();
-        String t2Alias = joinSelect.getSecondTable().getAlias();
+  @Override
+  protected void fillSpecificRequestBuilder(JoinRequestBuilder requestBuilder)
+      throws SqlParseException {
+    String t1Alias = joinSelect.getFirstTable().getAlias();
+    String t2Alias = joinSelect.getSecondTable().getAlias();
 
-        List<List<Map.Entry<Field, Field>>> comparisonFields = getComparisonFields(t1Alias, t2Alias,
-                joinSelect.getConnectedWhere());
+    List<List<Map.Entry<Field, Field>>> comparisonFields =
+        getComparisonFields(t1Alias, t2Alias, joinSelect.getConnectedWhere());
 
-        ((HashJoinElasticRequestBuilder) requestBuilder).setT1ToT2FieldsComparison(comparisonFields);
-    }
+    ((HashJoinElasticRequestBuilder) requestBuilder).setT1ToT2FieldsComparison(comparisonFields);
+  }
 
-    @Override
-    protected JoinRequestBuilder createSpecificBuilder() {
-        if (isLegacy()) {
-            return new HashJoinElasticRequestBuilder();
-        }
-        return new HashJoinQueryPlanRequestBuilder(client, sqlRequest);
+  @Override
+  protected JoinRequestBuilder createSpecificBuilder() {
+    if (isLegacy()) {
+      return new HashJoinElasticRequestBuilder();
     }
-
-    @Override
-    protected void updateRequestWithHints(JoinRequestBuilder requestBuilder) {
-        super.updateRequestWithHints(requestBuilder);
-        for (Hint hint : joinSelect.getHints()) {
-            if (hint.getType() == HintType.HASH_WITH_TERMS_FILTER) {
-                ((HashJoinElasticRequestBuilder) requestBuilder).setUseTermFiltersOptimization(true);
-            }
-        }
+    return new HashJoinQueryPlanRequestBuilder(client, sqlRequest);
+  }
+
+  @Override
+  protected void updateRequestWithHints(JoinRequestBuilder requestBuilder) {
+    super.updateRequestWithHints(requestBuilder);
+    for (Hint hint : joinSelect.getHints()) {
+      if (hint.getType() == HintType.HASH_WITH_TERMS_FILTER) {
+        ((HashJoinElasticRequestBuilder) requestBuilder).setUseTermFiltersOptimization(true);
+      }
     }
-
-    /**
-     * Keep the option to run legacy hash join algorithm mainly for the comparison
-     */
-    private boolean isLegacy() {
-        for (Hint hint : joinSelect.getHints()) {
-            if (hint.getType() == HintType.JOIN_ALGORITHM_USE_LEGACY) {
-                return true;
-            }
-        }
-        return false;
+  }
+
+  /** Keep the option to run legacy hash join algorithm mainly for the comparison */
+  private boolean isLegacy() {
+    for (Hint hint : joinSelect.getHints()) {
+      if (hint.getType() == HintType.JOIN_ALGORITHM_USE_LEGACY) {
+        return true;
+      }
     }
-
-    private List<Map.Entry<Field, Field>> getComparisonFields(String t1Alias, String t2Alias,
-                                                              List<Condition> connectedConditions)
-            throws SqlParseException {
-        List<Map.Entry<Field, Field>> comparisonFields = new ArrayList<>();
-        for (Condition condition : connectedConditions) {
-
-            if (condition.getOPERATOR() != Condition.OPERATOR.EQ) {
-                throw new SqlParseException(
-                        String.format("HashJoin should only be with EQ conditions, got:%s on condition:%s",
-                                condition.getOPERATOR().name(), condition.toString()));
-            }
-
-            String firstField = condition.getName();
-            String secondField = condition.getValue().toString();
-            Field t1Field, t2Field;
-            if (firstField.startsWith(t1Alias)) {
-                t1Field = new Field(removeAlias(firstField, t1Alias), null);
-                t2Field = new Field(removeAlias(secondField, t2Alias), null);
-            } else {
-                t1Field = new Field(removeAlias(secondField, t1Alias), null);
-                t2Field = new Field(removeAlias(firstField, t2Alias), null);
-            }
-            comparisonFields.add(new AbstractMap.SimpleEntry<>(t1Field, t2Field));
-        }
-        return comparisonFields;
+    return false;
+  }
+
+  private List<Map.Entry<Field, Field>> getComparisonFields(
+      String t1Alias, String t2Alias, List<Condition> connectedConditions)
+      throws SqlParseException {
+    List<Map.Entry<Field, Field>> comparisonFields = new ArrayList<>();
+    for (Condition condition : connectedConditions) {
+
+      if (condition.getOPERATOR() != Condition.OPERATOR.EQ) {
+        throw new SqlParseException(
+            String.format(
+                "HashJoin should only be with EQ conditions, got:%s on condition:%s",
+                condition.getOPERATOR().name(), condition.toString()));
+      }
+
+      String firstField = condition.getName();
+      String secondField = condition.getValue().toString();
+      Field t1Field, t2Field;
+      if (firstField.startsWith(t1Alias)) {
+        t1Field = new Field(removeAlias(firstField, t1Alias), null);
+        t2Field = new Field(removeAlias(secondField, t2Alias), null);
+      } else {
+        t1Field = new Field(removeAlias(secondField, t1Alias), null);
+        t2Field = new Field(removeAlias(firstField, t2Alias), null);
+      }
+      comparisonFields.add(new AbstractMap.SimpleEntry<>(t1Field, t2Field));
     }
-
-    private List<List<Map.Entry<Field, Field>>> getComparisonFields(String t1Alias, String t2Alias,
-                                                                    Where connectedWhere) throws SqlParseException {
-        List<List<Map.Entry<Field, Field>>> comparisonFields = new ArrayList<>();
-        //where is AND with lots of conditions.
-        if (connectedWhere == null) {
-            return comparisonFields;
-        }
-        boolean allAnds = true;
-        for (Where innerWhere : connectedWhere.getWheres()) {
-            if (innerWhere.getConn() == Where.CONN.OR) {
-                allAnds = false;
-                break;
-            }
-        }
-        if (allAnds) {
-            List<Map.Entry<Field, Field>> innerComparisonFields =
-                    getComparisonFieldsFromWhere(t1Alias, t2Alias, connectedWhere);
-            comparisonFields.add(innerComparisonFields);
-        } else {
-            for (Where innerWhere : connectedWhere.getWheres()) {
-                comparisonFields.add(getComparisonFieldsFromWhere(t1Alias, t2Alias, innerWhere));
-            }
-        }
-
-        return comparisonFields;
+    return comparisonFields;
+  }
+
+  private List<List<Map.Entry<Field, Field>>> getComparisonFields(
+      String t1Alias, String t2Alias, Where connectedWhere) throws SqlParseException {
+    List<List<Map.Entry<Field, Field>>> comparisonFields = new ArrayList<>();
+    // where is AND with lots of conditions.
+    if (connectedWhere == null) {
+      return comparisonFields;
     }
-
-    private List<Map.Entry<Field, Field>> getComparisonFieldsFromWhere(String t1Alias, String t2Alias, Where where)
-            throws SqlParseException {
-        List<Condition> conditions = new ArrayList<>();
-        if (where instanceof Condition) {
-            conditions.add((Condition) where);
-        } else {
-            for (Where innerWhere : where.getWheres()) {
-                if (!(innerWhere instanceof Condition)) {
-                    throw new SqlParseException(
-                            "if connectedCondition is AND then all inner wheres should be Conditions");
-                }
-                conditions.add((Condition) innerWhere);
-            }
-        }
-        return getComparisonFields(t1Alias, t2Alias, conditions);
+    boolean allAnds = true;
+    for (Where innerWhere : connectedWhere.getWheres()) {
+      if (innerWhere.getConn() == Where.CONN.OR) {
+        allAnds = false;
+        break;
+      }
+    }
+    if (allAnds) {
+      List<Map.Entry<Field, Field>> innerComparisonFields =
+          getComparisonFieldsFromWhere(t1Alias, t2Alias, connectedWhere);
+      comparisonFields.add(innerComparisonFields);
+    } else {
+      for (Where innerWhere : connectedWhere.getWheres()) {
+        comparisonFields.add(getComparisonFieldsFromWhere(t1Alias, t2Alias, innerWhere));
+      }
     }
 
-    private String removeAlias(String field, String alias) {
-        return field.replace(alias + ".", "");
+    return comparisonFields;
+  }
+
+  private List<Map.Entry<Field, Field>> getComparisonFieldsFromWhere(
+      String t1Alias, String t2Alias, Where where) throws SqlParseException {
+    List<Condition> conditions = new ArrayList<>();
+    if (where instanceof Condition) {
+      conditions.add((Condition) where);
+    } else {
+      for (Where innerWhere : where.getWheres()) {
+        if (!(innerWhere instanceof Condition)) {
+          throw new SqlParseException(
+              "if connectedCondition is AND then all inner wheres should be Conditions");
+        }
+        conditions.add((Condition) innerWhere);
+      }
     }
+    return getComparisonFields(t1Alias, t2Alias, conditions);
+  }
 
+  private String removeAlias(String field, String alias) {
+    return field.replace(alias + ".", "");
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryAction.java
index 35e718d985..7068ddf9a2 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryAction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.join;
 
 import java.util.List;
@@ -20,111 +19,107 @@
 import org.opensearch.sql.legacy.query.planner.HashJoinQueryPlanRequestBuilder;
 import org.opensearch.sql.legacy.query.planner.core.Config;
 
-/**
- * Created by Eliran on 15/9/2015.
- */
+/** Created by Eliran on 15/9/2015. */
 public abstract class OpenSearchJoinQueryAction extends QueryAction {
 
-    protected JoinSelect joinSelect;
-
-    public OpenSearchJoinQueryAction(Client client, JoinSelect joinSelect) {
-        super(client, joinSelect);
-        this.joinSelect = joinSelect;
-    }
-
-    @Override
-    public SqlElasticRequestBuilder explain() throws SqlParseException {
-        JoinRequestBuilder requestBuilder = createSpecificBuilder();
-        fillBasicJoinRequestBuilder(requestBuilder);
-        fillSpecificRequestBuilder(requestBuilder);
-        return requestBuilder;
-    }
-
-    protected abstract void fillSpecificRequestBuilder(JoinRequestBuilder requestBuilder) throws SqlParseException;
-
-    protected abstract JoinRequestBuilder createSpecificBuilder();
-
-
-    private void fillBasicJoinRequestBuilder(JoinRequestBuilder requestBuilder) throws SqlParseException {
-
-        fillTableInJoinRequestBuilder(requestBuilder.getFirstTable(), joinSelect.getFirstTable());
-        fillTableInJoinRequestBuilder(requestBuilder.getSecondTable(), joinSelect.getSecondTable());
-
-        requestBuilder.setJoinType(joinSelect.getJoinType());
-
-        requestBuilder.setTotalLimit(joinSelect.getTotalLimit());
-
-        updateRequestWithHints(requestBuilder);
-
-
-    }
-
-    protected void updateRequestWithHints(JoinRequestBuilder requestBuilder) {
-        for (Hint hint : joinSelect.getHints()) {
-            Object[] params = hint.getParams();
-            switch (hint.getType()) {
-                case JOIN_LIMIT:
-                    requestBuilder.getFirstTable().setHintLimit((Integer) params[0]);
-                    requestBuilder.getSecondTable().setHintLimit((Integer) params[1]);
-                    break;
-                case JOIN_ALGORITHM_BLOCK_SIZE:
-                    if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
-                        queryPlannerConfig(requestBuilder).configureBlockSize(hint.getParams());
-                    }
-                    break;
-                case JOIN_SCROLL_PAGE_SIZE:
-                    if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
-                        queryPlannerConfig(requestBuilder).configureScrollPageSize(hint.getParams());
-                    }
-                    break;
-                case JOIN_CIRCUIT_BREAK_LIMIT:
-                    if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
-                        queryPlannerConfig(requestBuilder).configureCircuitBreakLimit(hint.getParams());
-                    }
-                    break;
-                case JOIN_BACK_OFF_RETRY_INTERVALS:
-                    if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
-                        queryPlannerConfig(requestBuilder).configureBackOffRetryIntervals(hint.getParams());
-                    }
-                    break;
-                case JOIN_TIME_OUT:
-                    if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
-                        queryPlannerConfig(requestBuilder).configureTimeOut(hint.getParams());
-                    }
-                    break;
-            }
-        }
+  protected JoinSelect joinSelect;
+
+  public OpenSearchJoinQueryAction(Client client, JoinSelect joinSelect) {
+    super(client, joinSelect);
+    this.joinSelect = joinSelect;
+  }
+
+  @Override
+  public SqlElasticRequestBuilder explain() throws SqlParseException {
+    JoinRequestBuilder requestBuilder = createSpecificBuilder();
+    fillBasicJoinRequestBuilder(requestBuilder);
+    fillSpecificRequestBuilder(requestBuilder);
+    return requestBuilder;
+  }
+
+  protected abstract void fillSpecificRequestBuilder(JoinRequestBuilder requestBuilder)
+      throws SqlParseException;
+
+  protected abstract JoinRequestBuilder createSpecificBuilder();
+
+  private void fillBasicJoinRequestBuilder(JoinRequestBuilder requestBuilder)
+      throws SqlParseException {
+
+    fillTableInJoinRequestBuilder(requestBuilder.getFirstTable(), joinSelect.getFirstTable());
+    fillTableInJoinRequestBuilder(requestBuilder.getSecondTable(), joinSelect.getSecondTable());
+
+    requestBuilder.setJoinType(joinSelect.getJoinType());
+
+    requestBuilder.setTotalLimit(joinSelect.getTotalLimit());
+
+    updateRequestWithHints(requestBuilder);
+  }
+
+  protected void updateRequestWithHints(JoinRequestBuilder requestBuilder) {
+    for (Hint hint : joinSelect.getHints()) {
+      Object[] params = hint.getParams();
+      switch (hint.getType()) {
+        case JOIN_LIMIT:
+          requestBuilder.getFirstTable().setHintLimit((Integer) params[0]);
+          requestBuilder.getSecondTable().setHintLimit((Integer) params[1]);
+          break;
+        case JOIN_ALGORITHM_BLOCK_SIZE:
+          if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
+            queryPlannerConfig(requestBuilder).configureBlockSize(hint.getParams());
+          }
+          break;
+        case JOIN_SCROLL_PAGE_SIZE:
+          if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
+            queryPlannerConfig(requestBuilder).configureScrollPageSize(hint.getParams());
+          }
+          break;
+        case JOIN_CIRCUIT_BREAK_LIMIT:
+          if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
+            queryPlannerConfig(requestBuilder).configureCircuitBreakLimit(hint.getParams());
+          }
+          break;
+        case JOIN_BACK_OFF_RETRY_INTERVALS:
+          if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
+            queryPlannerConfig(requestBuilder).configureBackOffRetryIntervals(hint.getParams());
+          }
+          break;
+        case JOIN_TIME_OUT:
+          if (requestBuilder instanceof HashJoinQueryPlanRequestBuilder) {
+            queryPlannerConfig(requestBuilder).configureTimeOut(hint.getParams());
+          }
+          break;
+      }
     }
-
-    private Config queryPlannerConfig(JoinRequestBuilder requestBuilder) {
-        return ((HashJoinQueryPlanRequestBuilder) requestBuilder).getConfig();
-    }
-
-    private void fillTableInJoinRequestBuilder(TableInJoinRequestBuilder requestBuilder,
-                                               TableOnJoinSelect tableOnJoinSelect) throws SqlParseException {
-        List<Field> connectedFields = tableOnJoinSelect.getConnectedFields();
-        addFieldsToSelectIfMissing(tableOnJoinSelect, connectedFields);
-        requestBuilder.setOriginalSelect(tableOnJoinSelect);
-        DefaultQueryAction queryAction = new DefaultQueryAction(client, tableOnJoinSelect);
-        queryAction.explain();
-        requestBuilder.setRequestBuilder(queryAction.getRequestBuilder());
-        requestBuilder.setReturnedFields(tableOnJoinSelect.getSelectedFields());
-        requestBuilder.setAlias(tableOnJoinSelect.getAlias());
+  }
+
+  private Config queryPlannerConfig(JoinRequestBuilder requestBuilder) {
+    return ((HashJoinQueryPlanRequestBuilder) requestBuilder).getConfig();
+  }
+
+  private void fillTableInJoinRequestBuilder(
+      TableInJoinRequestBuilder requestBuilder, TableOnJoinSelect tableOnJoinSelect)
+      throws SqlParseException {
+    List<Field> connectedFields = tableOnJoinSelect.getConnectedFields();
+    addFieldsToSelectIfMissing(tableOnJoinSelect, connectedFields);
+    requestBuilder.setOriginalSelect(tableOnJoinSelect);
+    DefaultQueryAction queryAction = new DefaultQueryAction(client, tableOnJoinSelect);
+    queryAction.explain();
+    requestBuilder.setRequestBuilder(queryAction.getRequestBuilder());
+    requestBuilder.setReturnedFields(tableOnJoinSelect.getSelectedFields());
+    requestBuilder.setAlias(tableOnJoinSelect.getAlias());
+  }
+
+  private void addFieldsToSelectIfMissing(Select select, List<Field> fields) {
+    // this means all fields
+    if (select.getFields() == null || select.getFields().size() == 0) {
+      return;
     }
 
-    private void addFieldsToSelectIfMissing(Select select, List<Field> fields) {
-        //this means all fields
-        if (select.getFields() == null || select.getFields().size() == 0) {
-            return;
-        }
-
-        List<Field> selectedFields = select.getFields();
-        for (Field field : fields) {
-            if (!selectedFields.contains(field)) {
-                selectedFields.add(field);
-            }
-        }
-
+    List<Field> selectedFields = select.getFields();
+    for (Field field : fields) {
+      if (!selectedFields.contains(field)) {
+        selectedFields.add(field);
+      }
     }
-
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryActionFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryActionFactory.java
index c96cb6120c..c638f43519 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryActionFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryActionFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.join;
 
 import java.util.List;
@@ -14,36 +13,32 @@
 import org.opensearch.sql.legacy.domain.hints.HintType;
 import org.opensearch.sql.legacy.query.QueryAction;
 
-/**
- * Created by Eliran on 15/9/2015.
- */
+/** Created by Eliran on 15/9/2015. */
 public class OpenSearchJoinQueryActionFactory {
-    public static QueryAction createJoinAction(Client client, JoinSelect joinSelect) {
-        List<Condition> connectedConditions = joinSelect.getConnectedConditions();
-        boolean allEqual = true;
-        for (Condition condition : connectedConditions) {
-            if (condition.getOPERATOR() != Condition.OPERATOR.EQ) {
-                allEqual = false;
-                break;
-            }
-
-        }
-        if (!allEqual) {
-            return new OpenSearchNestedLoopsQueryAction(client, joinSelect);
-        }
-
-        boolean useNestedLoopsHintExist = false;
-        for (Hint hint : joinSelect.getHints()) {
-            if (hint.getType() == HintType.USE_NESTED_LOOPS) {
-                useNestedLoopsHintExist = true;
-                break;
-            }
-        }
-        if (useNestedLoopsHintExist) {
-            return new OpenSearchNestedLoopsQueryAction(client, joinSelect);
-        }
-
-        return new OpenSearchHashJoinQueryAction(client, joinSelect);
+  public static QueryAction createJoinAction(Client client, JoinSelect joinSelect) {
+    List<Condition> connectedConditions = joinSelect.getConnectedConditions();
+    boolean allEqual = true;
+    for (Condition condition : connectedConditions) {
+      if (condition.getOPERATOR() != Condition.OPERATOR.EQ) {
+        allEqual = false;
+        break;
+      }
+    }
+    if (!allEqual) {
+      return new OpenSearchNestedLoopsQueryAction(client, joinSelect);
+    }
 
+    boolean useNestedLoopsHintExist = false;
+    for (Hint hint : joinSelect.getHints()) {
+      if (hint.getType() == HintType.USE_NESTED_LOOPS) {
+        useNestedLoopsHintExist = true;
+        break;
+      }
     }
+    if (useNestedLoopsHintExist) {
+      return new OpenSearchNestedLoopsQueryAction(client, joinSelect);
+    }
+
+    return new OpenSearchHashJoinQueryAction(client, joinSelect);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchNestedLoopsQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchNestedLoopsQueryAction.java
index 8954106f8a..e9e9169605 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchNestedLoopsQueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchNestedLoopsQueryAction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.join;
 
 import org.opensearch.client.Client;
@@ -13,45 +12,44 @@
 import org.opensearch.sql.legacy.domain.hints.HintType;
 import org.opensearch.sql.legacy.exception.SqlParseException;
 
-/**
- * Created by Eliran on 15/9/2015.
- */
+/** Created by Eliran on 15/9/2015. */
 public class OpenSearchNestedLoopsQueryAction extends OpenSearchJoinQueryAction {
 
-    public OpenSearchNestedLoopsQueryAction(Client client, JoinSelect joinSelect) {
-        super(client, joinSelect);
-    }
-
-    @Override
-    protected void fillSpecificRequestBuilder(JoinRequestBuilder requestBuilder) throws SqlParseException {
-        NestedLoopsElasticRequestBuilder nestedBuilder = (NestedLoopsElasticRequestBuilder) requestBuilder;
-        Where where = joinSelect.getConnectedWhere();
-        nestedBuilder.setConnectedWhere(where);
-
+  public OpenSearchNestedLoopsQueryAction(Client client, JoinSelect joinSelect) {
+    super(client, joinSelect);
+  }
+
+  @Override
+  protected void fillSpecificRequestBuilder(JoinRequestBuilder requestBuilder)
+      throws SqlParseException {
+    NestedLoopsElasticRequestBuilder nestedBuilder =
+        (NestedLoopsElasticRequestBuilder) requestBuilder;
+    Where where = joinSelect.getConnectedWhere();
+    nestedBuilder.setConnectedWhere(where);
+  }
+
+  @Override
+  protected JoinRequestBuilder createSpecificBuilder() {
+    return new NestedLoopsElasticRequestBuilder();
+  }
+
+  @Override
+  protected void updateRequestWithHints(JoinRequestBuilder requestBuilder) {
+    super.updateRequestWithHints(requestBuilder);
+    for (Hint hint : this.joinSelect.getHints()) {
+      if (hint.getType() == HintType.NL_MULTISEARCH_SIZE) {
+        Integer multiSearchMaxSize = (Integer) hint.getParams()[0];
+        ((NestedLoopsElasticRequestBuilder) requestBuilder)
+            .setMultiSearchMaxSize(multiSearchMaxSize);
+      }
     }
+  }
 
-    @Override
-    protected JoinRequestBuilder createSpecificBuilder() {
-        return new NestedLoopsElasticRequestBuilder();
+  private String removeAlias(String field) {
+    String alias = joinSelect.getFirstTable().getAlias();
+    if (!field.startsWith(alias + ".")) {
+      alias = joinSelect.getSecondTable().getAlias();
     }
-
-    @Override
-    protected void updateRequestWithHints(JoinRequestBuilder requestBuilder) {
-        super.updateRequestWithHints(requestBuilder);
-        for (Hint hint : this.joinSelect.getHints()) {
-            if (hint.getType() == HintType.NL_MULTISEARCH_SIZE) {
-                Integer multiSearchMaxSize = (Integer) hint.getParams()[0];
-                ((NestedLoopsElasticRequestBuilder) requestBuilder).setMultiSearchMaxSize(multiSearchMaxSize);
-            }
-        }
-    }
-
-    private String removeAlias(String field) {
-        String alias = joinSelect.getFirstTable().getAlias();
-        if (!field.startsWith(alias + ".")) {
-            alias = joinSelect.getSecondTable().getAlias();
-        }
-        return field.replace(alias + ".", "");
-    }
-
+    return field.replace(alias + ".", "");
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/TableInJoinRequestBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/TableInJoinRequestBuilder.java
index b1a07486b7..0b37497541 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/TableInJoinRequestBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/TableInJoinRequestBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.join;
 
 import java.util.List;
@@ -11,56 +10,53 @@
 import org.opensearch.sql.legacy.domain.Field;
 import org.opensearch.sql.legacy.domain.Select;
 
-/**
- * Created by Eliran on 28/8/2015.
- */
+/** Created by Eliran on 28/8/2015. */
 public class TableInJoinRequestBuilder {
-    private SearchRequestBuilder requestBuilder;
-    private String alias;
-    private List<Field> returnedFields;
-    private Select originalSelect;
-    private Integer hintLimit;
+  private SearchRequestBuilder requestBuilder;
+  private String alias;
+  private List<Field> returnedFields;
+  private Select originalSelect;
+  private Integer hintLimit;
 
-    public TableInJoinRequestBuilder() {
-    }
+  public TableInJoinRequestBuilder() {}
 
-    public SearchRequestBuilder getRequestBuilder() {
-        return requestBuilder;
-    }
+  public SearchRequestBuilder getRequestBuilder() {
+    return requestBuilder;
+  }
 
-    public void setRequestBuilder(SearchRequestBuilder requestBuilder) {
-        this.requestBuilder = requestBuilder;
-    }
+  public void setRequestBuilder(SearchRequestBuilder requestBuilder) {
+    this.requestBuilder = requestBuilder;
+  }
 
-    public String getAlias() {
-        return alias;
-    }
+  public String getAlias() {
+    return alias;
+  }
 
-    public void setAlias(String alias) {
-        this.alias = alias;
-    }
+  public void setAlias(String alias) {
+    this.alias = alias;
+  }
 
-    public List<Field> getReturnedFields() {
-        return returnedFields;
-    }
+  public List<Field> getReturnedFields() {
+    return returnedFields;
+  }
 
-    public void setReturnedFields(List<Field> returnedFields) {
-        this.returnedFields = returnedFields;
-    }
+  public void setReturnedFields(List<Field> returnedFields) {
+    this.returnedFields = returnedFields;
+  }
 
-    public Select getOriginalSelect() {
-        return originalSelect;
-    }
+  public Select getOriginalSelect() {
+    return originalSelect;
+  }
 
-    public void setOriginalSelect(Select originalSelect) {
-        this.originalSelect = originalSelect;
-    }
+  public void setOriginalSelect(Select originalSelect) {
+    this.originalSelect = originalSelect;
+  }
 
-    public Integer getHintLimit() {
-        return hintLimit;
-    }
+  public Integer getHintLimit() {
+    return hintLimit;
+  }
 
-    public void setHintLimit(Integer hintLimit) {
-        this.hintLimit = hintLimit;
-    }
+  public void setHintLimit(Integer hintLimit) {
+    this.hintLimit = hintLimit;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/AggMaker.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/AggMaker.java
index 87125721c0..6501fc480d 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/AggMaker.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/AggMaker.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.maker;
 
 import com.alibaba.druid.sql.ast.expr.SQLAggregateOption;
@@ -18,14 +17,16 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
-import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentParser;
 import org.opensearch.common.xcontent.json.JsonXContent;
 import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.common.ParsingException;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.geo.search.aggregations.bucket.geogrid.GeoGridAggregationBuilder;
 import org.opensearch.geo.search.aggregations.bucket.geogrid.GeoHashGridAggregationBuilder;
+import org.opensearch.geo.search.aggregations.metrics.GeoBoundsAggregationBuilder;
 import org.opensearch.join.aggregations.JoinAggregationBuilders;
 import org.opensearch.script.Script;
 import org.opensearch.script.ScriptType;
@@ -35,7 +36,6 @@
 import org.opensearch.search.aggregations.BucketOrder;
 import org.opensearch.search.aggregations.InternalOrder;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.opensearch.geo.search.aggregations.bucket.geogrid.GeoGridAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.DateHistogramInterval;
 import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
@@ -45,7 +45,6 @@
 import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.terms.IncludeExclude;
 import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.opensearch.geo.search.aggregations.metrics.GeoBoundsAggregationBuilder;
 import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
 import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
 import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
@@ -65,758 +64,782 @@
 
 public class AggMaker {
 
-    /**
-     * The mapping bettwen group fieldName or Alias to the KVValue.
-     */
-    private Map<String, KVValue> groupMap = new HashMap<>();
-    private Where where;
-
-    /**
-     * 分组查的聚合函数
-     *
-     * @param field
-     * @return
-     * @throws SqlParseException
-     */
-    public AggregationBuilder makeGroupAgg(Field field) throws SqlParseException {
-
-        if (field instanceof MethodField && field.getName().equals("script")) {
-            MethodField methodField = (MethodField) field;
-            TermsAggregationBuilder termsBuilder = AggregationBuilders.terms(methodField.getAlias())
-                    .script(new Script(methodField.getParams().get(1).value.toString()));
-            extendGroupMap(methodField, new KVValue("KEY", termsBuilder));
-            return termsBuilder;
-        }
-
-
-        if (field instanceof MethodField) {
-
-            MethodField methodField = (MethodField) field;
-            if (methodField.getName().equals("filter")) {
-                Map<String, Object> paramsAsMap = methodField.getParamsAsMap();
-                Where where = (Where) paramsAsMap.get("where");
-                return AggregationBuilders.filter(paramsAsMap.get("alias").toString(),
-                        QueryMaker.explain(where));
-            }
-            return makeRangeGroup(methodField);
-        } else {
-            String termName = (Strings.isNullOrEmpty(field.getAlias())) ? field.getName() : field.getAlias();
-            TermsAggregationBuilder termsBuilder = AggregationBuilders.terms(termName).field(field.getName());
-            final KVValue kvValue = new KVValue("KEY", termsBuilder);
-            groupMap.put(termName, kvValue);
-            // map the field name with KVValue if it is not yet. The use case is when alias exist,
-            // the termName is different with fieldName, both of them should be included in the map.
-            groupMap.putIfAbsent(field.getName(), kvValue);
-            return termsBuilder;
-        }
+  /** The mapping bettwen group fieldName or Alias to the KVValue. */
+  private Map<String, KVValue> groupMap = new HashMap<>();
+
+  private Where where;
+
+  /**
+   * @param field
+   * @return
+   * @throws SqlParseException
+   */
+  public AggregationBuilder makeGroupAgg(Field field) throws SqlParseException {
+
+    if (field instanceof MethodField && field.getName().equals("script")) {
+      MethodField methodField = (MethodField) field;
+      TermsAggregationBuilder termsBuilder =
+          AggregationBuilders.terms(methodField.getAlias())
+              .script(new Script(methodField.getParams().get(1).value.toString()));
+      extendGroupMap(methodField, new KVValue("KEY", termsBuilder));
+      return termsBuilder;
     }
 
-
-    /**
-     * Create aggregation according to the SQL function.
-     *
-     * @param field  SQL function
-     * @param parent parentAggregation
-     * @return AggregationBuilder represents the SQL function
-     * @throws SqlParseException in case of unrecognized function
-     */
-    public AggregationBuilder makeFieldAgg(MethodField field, AggregationBuilder parent) throws SqlParseException {
-        extendGroupMap(field, new KVValue("FIELD", parent));
-        ValuesSourceAggregationBuilder builder;
-        field.setAlias(fixAlias(field.getAlias()));
-        switch (field.getName().toUpperCase()) {
-            case "SUM":
-                builder = AggregationBuilders.sum(field.getAlias());
-                return addFieldToAgg(field, builder);
-            case "MAX":
-                builder = AggregationBuilders.max(field.getAlias());
-                return addFieldToAgg(field, builder);
-            case "MIN":
-                builder = AggregationBuilders.min(field.getAlias());
-                return addFieldToAgg(field, builder);
-            case "AVG":
-                builder = AggregationBuilders.avg(field.getAlias());
-                return addFieldToAgg(field, builder);
-            case "STATS":
-                builder = AggregationBuilders.stats(field.getAlias());
-                return addFieldToAgg(field, builder);
-            case "EXTENDED_STATS":
-                builder = AggregationBuilders.extendedStats(field.getAlias());
-                return addFieldToAgg(field, builder);
-            case "PERCENTILES":
-                builder = AggregationBuilders.percentiles(field.getAlias());
-                addSpecificPercentiles((PercentilesAggregationBuilder) builder, field.getParams());
-                return addFieldToAgg(field, builder);
-            case "TOPHITS":
-                return makeTopHitsAgg(field);
-            case "SCRIPTED_METRIC":
-                return scriptedMetric(field);
-            case "COUNT":
-                extendGroupMap(field, new KVValue("COUNT", parent));
-                return addFieldToAgg(field, makeCountAgg(field));
-            default:
-                throw new SqlParseException("the agg function not to define !");
-        }
+    if (field instanceof MethodField) {
+
+      MethodField methodField = (MethodField) field;
+      if (methodField.getName().equals("filter")) {
+        Map<String, Object> paramsAsMap = methodField.getParamsAsMap();
+        Where where = (Where) paramsAsMap.get("where");
+        return AggregationBuilders.filter(
+            paramsAsMap.get("alias").toString(), QueryMaker.explain(where));
+      }
+      return makeRangeGroup(methodField);
+    } else {
+      String termName =
+          (Strings.isNullOrEmpty(field.getAlias())) ? field.getName() : field.getAlias();
+      TermsAggregationBuilder termsBuilder =
+          AggregationBuilders.terms(termName).field(field.getName());
+      final KVValue kvValue = new KVValue("KEY", termsBuilder);
+      groupMap.put(termName, kvValue);
+      // map the field name with KVValue if it is not yet. The use case is when alias exist,
+      // the termName is different with fieldName, both of them should be included in the map.
+      groupMap.putIfAbsent(field.getName(), kvValue);
+      return termsBuilder;
     }
-
-    /**
-     * With {@link Where} Condition.
-     */
-    public AggMaker withWhere(Where where) {
-        this.where = where;
-        return this;
+  }
+
+  /**
+   * Create aggregation according to the SQL function.
+   *
+   * @param field SQL function
+   * @param parent parentAggregation
+   * @return AggregationBuilder represents the SQL function
+   * @throws SqlParseException in case of unrecognized function
+   */
+  public AggregationBuilder makeFieldAgg(MethodField field, AggregationBuilder parent)
+      throws SqlParseException {
+    extendGroupMap(field, new KVValue("FIELD", parent));
+    ValuesSourceAggregationBuilder builder;
+    field.setAlias(fixAlias(field.getAlias()));
+    switch (field.getName().toUpperCase()) {
+      case "SUM":
+        builder = AggregationBuilders.sum(field.getAlias());
+        return addFieldToAgg(field, builder);
+      case "MAX":
+        builder = AggregationBuilders.max(field.getAlias());
+        return addFieldToAgg(field, builder);
+      case "MIN":
+        builder = AggregationBuilders.min(field.getAlias());
+        return addFieldToAgg(field, builder);
+      case "AVG":
+        builder = AggregationBuilders.avg(field.getAlias());
+        return addFieldToAgg(field, builder);
+      case "STATS":
+        builder = AggregationBuilders.stats(field.getAlias());
+        return addFieldToAgg(field, builder);
+      case "EXTENDED_STATS":
+        builder = AggregationBuilders.extendedStats(field.getAlias());
+        return addFieldToAgg(field, builder);
+      case "PERCENTILES":
+        builder = AggregationBuilders.percentiles(field.getAlias());
+        addSpecificPercentiles((PercentilesAggregationBuilder) builder, field.getParams());
+        return addFieldToAgg(field, builder);
+      case "TOPHITS":
+        return makeTopHitsAgg(field);
+      case "SCRIPTED_METRIC":
+        return scriptedMetric(field);
+      case "COUNT":
+        extendGroupMap(field, new KVValue("COUNT", parent));
+        return addFieldToAgg(field, makeCountAgg(field));
+      default:
+        throw new SqlParseException("the agg function not to define !");
     }
-
-    private void addSpecificPercentiles(PercentilesAggregationBuilder percentilesBuilder, List<KVValue> params) {
-        List<Double> percentiles = new ArrayList<>();
-        for (KVValue kValue : params) {
-            if (kValue.value.getClass().equals(BigDecimal.class)) {
-                BigDecimal percentile = (BigDecimal) kValue.value;
-                percentiles.add(percentile.doubleValue());
-
-            } else if (kValue.value instanceof Integer) {
-                percentiles.add(((Integer) kValue.value).doubleValue());
-            }
-        }
-        if (percentiles.size() > 0) {
-            double[] percentilesArr = new double[percentiles.size()];
-            int i = 0;
-            for (Double percentile : percentiles) {
-                percentilesArr[i] = percentile;
-                i++;
-            }
-            percentilesBuilder.percentiles(percentilesArr);
-        }
+  }
+
+  /** With {@link Where} Condition. */
+  public AggMaker withWhere(Where where) {
+    this.where = where;
+    return this;
+  }
+
+  private void addSpecificPercentiles(
+      PercentilesAggregationBuilder percentilesBuilder, List<KVValue> params) {
+    List<Double> percentiles = new ArrayList<>();
+    for (KVValue kValue : params) {
+      if (kValue.value.getClass().equals(BigDecimal.class)) {
+        BigDecimal percentile = (BigDecimal) kValue.value;
+        percentiles.add(percentile.doubleValue());
+
+      } else if (kValue.value instanceof Integer) {
+        percentiles.add(((Integer) kValue.value).doubleValue());
+      }
     }
-
-    private String fixAlias(String alias) {
-        //because [ is not legal as alias
-        return alias.replaceAll("\\[", "(").replaceAll("\\]", ")");
+    if (percentiles.size() > 0) {
+      double[] percentilesArr = new double[percentiles.size()];
+      int i = 0;
+      for (Double percentile : percentiles) {
+        percentilesArr[i] = percentile;
+        i++;
+      }
+      percentilesBuilder.percentiles(percentilesArr);
     }
+  }
+
+  private String fixAlias(String alias) {
+    // because [ is not legal as alias
+    return alias.replaceAll("\\[", "(").replaceAll("\\]", ")");
+  }
+
+  private AggregationBuilder addFieldToAgg(
+      MethodField field, ValuesSourceAggregationBuilder builder) throws SqlParseException {
+    KVValue kvValue = field.getParams().get(0);
+    if (kvValue.key != null && kvValue.key.equals("script")) {
+      if (kvValue.value instanceof MethodField) {
+        return builder.script(
+            new Script(((MethodField) kvValue.value).getParams().get(1).toString()));
+      } else {
+        return builder.script(new Script(kvValue.value.toString()));
+      }
+
+    } else if (kvValue.key != null && kvValue.value.toString().trim().startsWith("def")) {
+      return builder.script(new Script(kvValue.value.toString()));
+    } else if (kvValue.key != null
+        && (kvValue.key.equals("nested") || kvValue.key.equals("reverse_nested"))) {
+      NestedType nestedType = (NestedType) kvValue.value;
+      nestedType.addBucketPath(Path.getMetricPath(builder.getName()));
+
+      if (nestedType.isNestedField()) {
+        builder.field("_index");
+      } else {
+        builder.field(nestedType.field);
+      }
+
+      AggregationBuilder nestedBuilder;
+
+      String nestedAggName = nestedType.getNestedAggName();
+
+      if (nestedType.isReverse()) {
+        if (nestedType.path != null && nestedType.path.startsWith("~")) {
+          String realPath = nestedType.path.substring(1);
+          nestedBuilder = AggregationBuilders.nested(nestedAggName, realPath);
+          nestedBuilder = nestedBuilder.subAggregation(builder);
+          return AggregationBuilders.reverseNested(nestedAggName + "_REVERSED")
+              .subAggregation(nestedBuilder);
+        } else {
+          ReverseNestedAggregationBuilder reverseNestedAggregationBuilder =
+              AggregationBuilders.reverseNested(nestedAggName);
+          if (nestedType.path != null) {
+            reverseNestedAggregationBuilder.path(nestedType.path);
+          }
+          nestedBuilder = reverseNestedAggregationBuilder;
+        }
+      } else {
+        nestedBuilder = AggregationBuilders.nested(nestedAggName, nestedType.path);
+      }
 
-    private AggregationBuilder addFieldToAgg(MethodField field, ValuesSourceAggregationBuilder builder)
-            throws SqlParseException {
-        KVValue kvValue = field.getParams().get(0);
-        if (kvValue.key != null && kvValue.key.equals("script")) {
-            if (kvValue.value instanceof MethodField) {
-                return builder.script(new Script(((MethodField) kvValue.value).getParams().get(1).toString()));
-            } else {
-                return builder.script(new Script(kvValue.value.toString()));
-            }
-
-        } else if (kvValue.key != null && kvValue.value.toString().trim().startsWith("def")) {
-            return builder.script(new Script(kvValue.value.toString()));
-        } else if (kvValue.key != null && (kvValue.key.equals("nested") || kvValue.key.equals("reverse_nested"))) {
-            NestedType nestedType = (NestedType) kvValue.value;
-            nestedType.addBucketPath(Path.getMetricPath(builder.getName()));
-
-            if (nestedType.isNestedField()) {
-                builder.field("_index");
-            } else {
-                builder.field(nestedType.field);
-            }
-
-            AggregationBuilder nestedBuilder;
-
-            String nestedAggName = nestedType.getNestedAggName();
-
-            if (nestedType.isReverse()) {
-                if (nestedType.path != null && nestedType.path.startsWith("~")) {
-                    String realPath = nestedType.path.substring(1);
-                    nestedBuilder = AggregationBuilders.nested(nestedAggName, realPath);
-                    nestedBuilder = nestedBuilder.subAggregation(builder);
-                    return AggregationBuilders.reverseNested(nestedAggName + "_REVERSED")
-                            .subAggregation(nestedBuilder);
-                } else {
-                    ReverseNestedAggregationBuilder reverseNestedAggregationBuilder =
-                            AggregationBuilders.reverseNested(nestedAggName);
-                    if (nestedType.path != null) {
-                        reverseNestedAggregationBuilder.path(nestedType.path);
-                    }
-                    nestedBuilder = reverseNestedAggregationBuilder;
-                }
-            } else {
-                nestedBuilder = AggregationBuilders.nested(nestedAggName, nestedType.path);
-            }
-
-            AggregationBuilder aggregation = nestedBuilder.subAggregation(wrapWithFilterAgg(
-                    nestedType,
-                    builder));
-            nestedType.addBucketPath(Path.getAggPath(nestedBuilder.getName()));
-            return aggregation;
-        } else if (kvValue.key != null && (kvValue.key.equals("children"))) {
-            ChildrenType childrenType = (ChildrenType) kvValue.value;
-
-            builder.field(childrenType.field);
+      AggregationBuilder aggregation =
+          nestedBuilder.subAggregation(wrapWithFilterAgg(nestedType, builder));
+      nestedType.addBucketPath(Path.getAggPath(nestedBuilder.getName()));
+      return aggregation;
+    } else if (kvValue.key != null && (kvValue.key.equals("children"))) {
+      ChildrenType childrenType = (ChildrenType) kvValue.value;
 
-            AggregationBuilder childrenBuilder;
+      builder.field(childrenType.field);
 
-            String childrenAggName = childrenType.field + "@CHILDREN";
+      AggregationBuilder childrenBuilder;
 
-            childrenBuilder = JoinAggregationBuilders.children(childrenAggName, childrenType.childType);
+      String childrenAggName = childrenType.field + "@CHILDREN";
 
-            return childrenBuilder;
-        }
+      childrenBuilder = JoinAggregationBuilders.children(childrenAggName, childrenType.childType);
 
-        return builder.field(kvValue.toString());
+      return childrenBuilder;
     }
 
-    private AggregationBuilder makeRangeGroup(MethodField field) throws SqlParseException {
-        switch (field.getName().toLowerCase()) {
-            case "range":
-                return rangeBuilder(field);
-            case "date_histogram":
-                return dateHistogram(field);
-            case "date_range":
-            case "month":
-                return dateRange(field);
-            case "histogram":
-                return histogram(field);
-            case "geohash_grid":
-                return geohashGrid(field);
-            case "geo_bounds":
-                return geoBounds(field);
-            case "terms":
-                return termsAgg(field);
-            default:
-                throw new SqlParseException("can define this method " + field);
-        }
-
+    return builder.field(kvValue.toString());
+  }
+
+  private AggregationBuilder makeRangeGroup(MethodField field) throws SqlParseException {
+    switch (field.getName().toLowerCase()) {
+      case "range":
+        return rangeBuilder(field);
+      case "date_histogram":
+        return dateHistogram(field);
+      case "date_range":
+      case "month":
+        return dateRange(field);
+      case "histogram":
+        return histogram(field);
+      case "geohash_grid":
+        return geohashGrid(field);
+      case "geo_bounds":
+        return geoBounds(field);
+      case "terms":
+        return termsAgg(field);
+      default:
+        throw new SqlParseException("can define this method " + field);
     }
-
-    private AggregationBuilder geoBounds(MethodField field) throws SqlParseException {
-        String aggName = gettAggNameFromParamsOrAlias(field);
-        GeoBoundsAggregationBuilder boundsBuilder = new GeoBoundsAggregationBuilder(aggName);
-        String value;
-        for (KVValue kv : field.getParams()) {
-            value = kv.value.toString();
-            switch (kv.key.toLowerCase()) {
-                case "field":
-                    boundsBuilder.field(value);
-                    break;
-                case "wrap_longitude":
-                    boundsBuilder.wrapLongitude(Boolean.getBoolean(value));
-                    break;
-                case "alias":
-                case "nested":
-                case "reverse_nested":
-                case "children":
-                    break;
-                default:
-                    throw new SqlParseException("geo_bounds err or not define field " + kv.toString());
-            }
-        }
-        return boundsBuilder;
+  }
+
+  private AggregationBuilder geoBounds(MethodField field) throws SqlParseException {
+    String aggName = gettAggNameFromParamsOrAlias(field);
+    GeoBoundsAggregationBuilder boundsBuilder = new GeoBoundsAggregationBuilder(aggName);
+    String value;
+    for (KVValue kv : field.getParams()) {
+      value = kv.value.toString();
+      switch (kv.key.toLowerCase()) {
+        case "field":
+          boundsBuilder.field(value);
+          break;
+        case "wrap_longitude":
+          boundsBuilder.wrapLongitude(Boolean.getBoolean(value));
+          break;
+        case "alias":
+        case "nested":
+        case "reverse_nested":
+        case "children":
+          break;
+        default:
+          throw new SqlParseException("geo_bounds err or not define field " + kv.toString());
+      }
     }
-
-    private AggregationBuilder termsAgg(MethodField field) throws SqlParseException {
-        String aggName = gettAggNameFromParamsOrAlias(field);
-        TermsAggregationBuilder terms = AggregationBuilders.terms(aggName);
-        String value;
-        IncludeExclude include = null, exclude = null;
-        for (KVValue kv : field.getParams()) {
-            if (kv.value.toString().contains("doc[")) {
-                String script = kv.value + "; return " + kv.key;
-                terms.script(new Script(script));
+    return boundsBuilder;
+  }
+
+  private AggregationBuilder termsAgg(MethodField field) throws SqlParseException {
+    String aggName = gettAggNameFromParamsOrAlias(field);
+    TermsAggregationBuilder terms = AggregationBuilders.terms(aggName);
+    String value;
+    IncludeExclude include = null, exclude = null;
+    for (KVValue kv : field.getParams()) {
+      if (kv.value.toString().contains("doc[")) {
+        String script = kv.value + "; return " + kv.key;
+        terms.script(new Script(script));
+      } else {
+        value = kv.value.toString();
+        switch (kv.key.toLowerCase()) {
+          case "field":
+            terms.field(value);
+            break;
+          case "size":
+            terms.size(Integer.parseInt(value));
+            break;
+          case "shard_size":
+            terms.shardSize(Integer.parseInt(value));
+            break;
+          case "min_doc_count":
+            terms.minDocCount(Integer.parseInt(value));
+            break;
+          case "missing":
+            terms.missing(value);
+            break;
+          case "order":
+            if ("asc".equalsIgnoreCase(value)) {
+              terms.order(BucketOrder.key(true));
+            } else if ("desc".equalsIgnoreCase(value)) {
+              terms.order(BucketOrder.key(false));
             } else {
-                value = kv.value.toString();
-                switch (kv.key.toLowerCase()) {
-                    case "field":
-                        terms.field(value);
-                        break;
-                    case "size":
-                        terms.size(Integer.parseInt(value));
-                        break;
-                    case "shard_size":
-                        terms.shardSize(Integer.parseInt(value));
-                        break;
-                    case "min_doc_count":
-                        terms.minDocCount(Integer.parseInt(value));
-                        break;
-                    case "missing":
-                        terms.missing(value);
-                        break;
-                    case "order":
-                        if ("asc".equalsIgnoreCase(value)) {
-                            terms.order(BucketOrder.key(true));
-                        } else if ("desc".equalsIgnoreCase(value)) {
-                            terms.order(BucketOrder.key(false));
-                        } else {
-                            List<BucketOrder> orderElements = new ArrayList<>();
-                            try (JsonXContentParser parser = new JsonXContentParser(NamedXContentRegistry.EMPTY,
-                                    LoggingDeprecationHandler.INSTANCE, new JsonFactory().createParser(value))) {
-                                XContentParser.Token currentToken = parser.nextToken();
-                                if (currentToken == XContentParser.Token.START_OBJECT) {
-                                    orderElements.add(InternalOrder.Parser.parseOrderParam(parser));
-                                } else if (currentToken == XContentParser.Token.START_ARRAY) {
-                                    for (currentToken = parser.nextToken();
-                                         currentToken != XContentParser.Token.END_ARRAY;
-                                         currentToken = parser.nextToken()) {
-                                        if (currentToken == XContentParser.Token.START_OBJECT) {
-                                            orderElements.add(InternalOrder.Parser.parseOrderParam(parser));
-                                        } else {
-                                            throw new ParsingException(parser.getTokenLocation(),
-                                                    "Invalid token in order array");
-                                        }
-                                    }
-                                }
-                            } catch (IOException e) {
-                                throw new SqlParseException("couldn't parse order: " + e.getMessage());
-                            }
-                            terms.order(orderElements);
-                        }
-                        break;
-                    case "alias":
-                    case "nested":
-                    case "reverse_nested":
-                    case "children":
-                        break;
-                    case "execution_hint":
-                        terms.executionHint(value);
-                        break;
-                    case "include":
-                        try (XContentParser parser = JsonXContent.jsonXContent.createParser(NamedXContentRegistry.EMPTY,
-                                LoggingDeprecationHandler.INSTANCE, value)) {
-                            parser.nextToken();
-                            include = IncludeExclude.parseInclude(parser);
-                        } catch (IOException e) {
-                            throw new SqlParseException("parse include[" + value + "] error: " + e.getMessage());
-                        }
-                        break;
-                    case "exclude":
-                        try (XContentParser parser = JsonXContent.jsonXContent.createParser(NamedXContentRegistry.EMPTY,
-                                LoggingDeprecationHandler.INSTANCE, value)) {
-                            parser.nextToken();
-                            exclude = IncludeExclude.parseExclude(parser);
-                        } catch (IOException e) {
-                            throw new SqlParseException("parse exclude[" + value + "] error: " + e.getMessage());
-                        }
-                        break;
-                    default:
-                        throw new SqlParseException("terms aggregation err or not define field " + kv.toString());
+              List<BucketOrder> orderElements = new ArrayList<>();
+              try (JsonXContentParser parser =
+                  new JsonXContentParser(
+                      NamedXContentRegistry.EMPTY,
+                      LoggingDeprecationHandler.INSTANCE,
+                      new JsonFactory().createParser(value))) {
+                XContentParser.Token currentToken = parser.nextToken();
+                if (currentToken == XContentParser.Token.START_OBJECT) {
+                  orderElements.add(InternalOrder.Parser.parseOrderParam(parser));
+                } else if (currentToken == XContentParser.Token.START_ARRAY) {
+                  for (currentToken = parser.nextToken();
+                      currentToken != XContentParser.Token.END_ARRAY;
+                      currentToken = parser.nextToken()) {
+                    if (currentToken == XContentParser.Token.START_OBJECT) {
+                      orderElements.add(InternalOrder.Parser.parseOrderParam(parser));
+                    } else {
+                      throw new ParsingException(
+                          parser.getTokenLocation(), "Invalid token in order array");
+                    }
+                  }
                 }
+              } catch (IOException e) {
+                throw new SqlParseException("couldn't parse order: " + e.getMessage());
+              }
+              terms.order(orderElements);
             }
-        }
-        terms.includeExclude(IncludeExclude.merge(include, exclude));
-        return terms;
-    }
-
-    private AbstractAggregationBuilder scriptedMetric(MethodField field) throws SqlParseException {
-        String aggName = gettAggNameFromParamsOrAlias(field);
-        ScriptedMetricAggregationBuilder scriptedMetricBuilder = AggregationBuilders.scriptedMetric(aggName);
-        Map<String, Object> scriptedMetricParams = field.getParamsAsMap();
-        if (!scriptedMetricParams.containsKey("map_script") && !scriptedMetricParams.containsKey("map_script_id")
-                && !scriptedMetricParams.containsKey("map_script_file")) {
-            throw new SqlParseException(
-                    "scripted metric parameters must contain map_script/map_script_id/map_script_file parameter");
-        }
-        HashMap<String, Object> scriptAdditionalParams = new HashMap<>();
-        HashMap<String, Object> reduceScriptAdditionalParams = new HashMap<>();
-        for (Map.Entry<String, Object> param : scriptedMetricParams.entrySet()) {
-            String paramValue = param.getValue().toString();
-            if (param.getKey().startsWith("@")) {
-                if (param.getKey().startsWith("@reduce_")) {
-                    reduceScriptAdditionalParams.put(param.getKey().replace("@reduce_", ""),
-                            param.getValue());
-                } else {
-                    scriptAdditionalParams.put(param.getKey().replace("@", ""), param.getValue());
-                }
-                continue;
+            break;
+          case "alias":
+          case "nested":
+          case "reverse_nested":
+          case "children":
+            break;
+          case "execution_hint":
+            terms.executionHint(value);
+            break;
+          case "include":
+            try (XContentParser parser =
+                JsonXContent.jsonXContent.createParser(
+                    NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, value)) {
+              parser.nextToken();
+              include = IncludeExclude.parseInclude(parser);
+            } catch (IOException e) {
+              throw new SqlParseException("parse include[" + value + "] error: " + e.getMessage());
             }
-
-            switch (param.getKey().toLowerCase()) {
-                case "map_script":
-                    scriptedMetricBuilder.mapScript(new Script(paramValue));
-                    break;
-                case "map_script_id":
-                    scriptedMetricBuilder.mapScript(new Script(ScriptType.STORED, Script.DEFAULT_SCRIPT_LANG,
-                            paramValue, new HashMap<>()));
-                    break;
-                case "init_script":
-                    scriptedMetricBuilder.initScript(new Script(paramValue));
-                    break;
-                case "init_script_id":
-                    scriptedMetricBuilder.initScript(new Script(ScriptType.STORED, Script.DEFAULT_SCRIPT_LANG,
-                            paramValue, new HashMap<>()));
-                    break;
-                case "combine_script":
-                    scriptedMetricBuilder.combineScript(new Script(paramValue));
-                    break;
-                case "combine_script_id":
-                    scriptedMetricBuilder.combineScript(new Script(ScriptType.STORED, Script.DEFAULT_SCRIPT_LANG,
-                            paramValue, new HashMap<>()));
-                    break;
-                case "reduce_script":
-                    scriptedMetricBuilder.reduceScript(new Script(ScriptType.INLINE, Script.DEFAULT_SCRIPT_LANG,
-                            paramValue, reduceScriptAdditionalParams));
-                    break;
-                case "reduce_script_id":
-                    scriptedMetricBuilder.reduceScript(new Script(ScriptType.STORED, Script.DEFAULT_SCRIPT_LANG,
-                            paramValue, reduceScriptAdditionalParams));
-                    break;
-                case "alias":
-                case "nested":
-                case "reverse_nested":
-                case "children":
-                    break;
-                default:
-                    throw new SqlParseException("scripted_metric err or not define field " + param.getKey());
+            break;
+          case "exclude":
+            try (XContentParser parser =
+                JsonXContent.jsonXContent.createParser(
+                    NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, value)) {
+              parser.nextToken();
+              exclude = IncludeExclude.parseExclude(parser);
+            } catch (IOException e) {
+              throw new SqlParseException("parse exclude[" + value + "] error: " + e.getMessage());
             }
+            break;
+          default:
+            throw new SqlParseException(
+                "terms aggregation err or not define field " + kv.toString());
         }
-        if (scriptAdditionalParams.size() > 0) {
-            scriptAdditionalParams.put("_agg", new HashMap<>());
-            scriptedMetricBuilder.params(scriptAdditionalParams);
-        }
-
-        return scriptedMetricBuilder;
+      }
     }
-
-    private AggregationBuilder geohashGrid(MethodField field) throws SqlParseException {
-        String aggName = gettAggNameFromParamsOrAlias(field);
-        GeoGridAggregationBuilder geoHashGrid = new GeoHashGridAggregationBuilder(aggName);
-        String value;
-        for (KVValue kv : field.getParams()) {
-            value = kv.value.toString();
-            switch (kv.key.toLowerCase()) {
-                case "precision":
-                    geoHashGrid.precision(Integer.parseInt(value));
-                    break;
-                case "field":
-                    geoHashGrid.field(value);
-                    break;
-                case "size":
-                    geoHashGrid.size(Integer.parseInt(value));
-                    break;
-                case "shard_size":
-                    geoHashGrid.shardSize(Integer.parseInt(value));
-                    break;
-                case "alias":
-                case "nested":
-                case "reverse_nested":
-                case "children":
-                    break;
-                default:
-                    throw new SqlParseException("geohash grid err or not define field " + kv.toString());
-            }
-        }
-        return geoHashGrid;
+    terms.includeExclude(IncludeExclude.merge(include, exclude));
+    return terms;
+  }
+
+  private AbstractAggregationBuilder scriptedMetric(MethodField field) throws SqlParseException {
+    String aggName = gettAggNameFromParamsOrAlias(field);
+    ScriptedMetricAggregationBuilder scriptedMetricBuilder =
+        AggregationBuilders.scriptedMetric(aggName);
+    Map<String, Object> scriptedMetricParams = field.getParamsAsMap();
+    if (!scriptedMetricParams.containsKey("map_script")
+        && !scriptedMetricParams.containsKey("map_script_id")
+        && !scriptedMetricParams.containsKey("map_script_file")) {
+      throw new SqlParseException(
+          "scripted metric parameters must contain map_script/map_script_id/map_script_file"
+              + " parameter");
     }
-
-    private static final String TIME_FARMAT = "yyyy-MM-dd HH:mm:ss";
-
-    private ValuesSourceAggregationBuilder dateRange(MethodField field) {
-        String alias = gettAggNameFromParamsOrAlias(field);
-        DateRangeAggregationBuilder dateRange = AggregationBuilders.dateRange(alias).format(TIME_FARMAT);
-
-        String value;
-        List<String> ranges = new ArrayList<>();
-        for (KVValue kv : field.getParams()) {
-            value = kv.value.toString();
-            if ("field".equals(kv.key)) {
-                dateRange.field(value);
-            } else if ("format".equals(kv.key)) {
-                dateRange.format(value);
-            } else if ("time_zone".equals(kv.key)) {
-                dateRange.timeZone(ZoneOffset.of(value));
-            } else if ("from".equals(kv.key)) {
-                dateRange.addUnboundedFrom(kv.value.toString());
-            } else if ("to".equals(kv.key)) {
-                dateRange.addUnboundedTo(kv.value.toString());
-            } else if (!"alias".equals(kv.key) && !"nested".equals(kv.key) && !"children".equals(kv.key)) {
-                ranges.add(value);
-            }
-        }
-
-        for (int i = 1; i < ranges.size(); i++) {
-            dateRange.addRange(ranges.get(i - 1), ranges.get(i));
+    HashMap<String, Object> scriptAdditionalParams = new HashMap<>();
+    HashMap<String, Object> reduceScriptAdditionalParams = new HashMap<>();
+    for (Map.Entry<String, Object> param : scriptedMetricParams.entrySet()) {
+      String paramValue = param.getValue().toString();
+      if (param.getKey().startsWith("@")) {
+        if (param.getKey().startsWith("@reduce_")) {
+          reduceScriptAdditionalParams.put(
+              param.getKey().replace("@reduce_", ""), param.getValue());
+        } else {
+          scriptAdditionalParams.put(param.getKey().replace("@", ""), param.getValue());
         }
+        continue;
+      }
+
+      switch (param.getKey().toLowerCase()) {
+        case "map_script":
+          scriptedMetricBuilder.mapScript(new Script(paramValue));
+          break;
+        case "map_script_id":
+          scriptedMetricBuilder.mapScript(
+              new Script(
+                  ScriptType.STORED, Script.DEFAULT_SCRIPT_LANG, paramValue, new HashMap<>()));
+          break;
+        case "init_script":
+          scriptedMetricBuilder.initScript(new Script(paramValue));
+          break;
+        case "init_script_id":
+          scriptedMetricBuilder.initScript(
+              new Script(
+                  ScriptType.STORED, Script.DEFAULT_SCRIPT_LANG, paramValue, new HashMap<>()));
+          break;
+        case "combine_script":
+          scriptedMetricBuilder.combineScript(new Script(paramValue));
+          break;
+        case "combine_script_id":
+          scriptedMetricBuilder.combineScript(
+              new Script(
+                  ScriptType.STORED, Script.DEFAULT_SCRIPT_LANG, paramValue, new HashMap<>()));
+          break;
+        case "reduce_script":
+          scriptedMetricBuilder.reduceScript(
+              new Script(
+                  ScriptType.INLINE,
+                  Script.DEFAULT_SCRIPT_LANG,
+                  paramValue,
+                  reduceScriptAdditionalParams));
+          break;
+        case "reduce_script_id":
+          scriptedMetricBuilder.reduceScript(
+              new Script(
+                  ScriptType.STORED,
+                  Script.DEFAULT_SCRIPT_LANG,
+                  paramValue,
+                  reduceScriptAdditionalParams));
+          break;
+        case "alias":
+        case "nested":
+        case "reverse_nested":
+        case "children":
+          break;
+        default:
+          throw new SqlParseException("scripted_metric err or not define field " + param.getKey());
+      }
+    }
+    if (scriptAdditionalParams.size() > 0) {
+      scriptAdditionalParams.put("_agg", new HashMap<>());
+      scriptedMetricBuilder.params(scriptAdditionalParams);
+    }
 
-        return dateRange;
+    return scriptedMetricBuilder;
+  }
+
+  private AggregationBuilder geohashGrid(MethodField field) throws SqlParseException {
+    String aggName = gettAggNameFromParamsOrAlias(field);
+    GeoGridAggregationBuilder geoHashGrid = new GeoHashGridAggregationBuilder(aggName);
+    String value;
+    for (KVValue kv : field.getParams()) {
+      value = kv.value.toString();
+      switch (kv.key.toLowerCase()) {
+        case "precision":
+          geoHashGrid.precision(Integer.parseInt(value));
+          break;
+        case "field":
+          geoHashGrid.field(value);
+          break;
+        case "size":
+          geoHashGrid.size(Integer.parseInt(value));
+          break;
+        case "shard_size":
+          geoHashGrid.shardSize(Integer.parseInt(value));
+          break;
+        case "alias":
+        case "nested":
+        case "reverse_nested":
+        case "children":
+          break;
+        default:
+          throw new SqlParseException("geohash grid err or not define field " + kv.toString());
+      }
+    }
+    return geoHashGrid;
+  }
+
+  private static final String TIME_FARMAT = "yyyy-MM-dd HH:mm:ss";
+
+  private ValuesSourceAggregationBuilder dateRange(MethodField field) {
+    String alias = gettAggNameFromParamsOrAlias(field);
+    DateRangeAggregationBuilder dateRange =
+        AggregationBuilders.dateRange(alias).format(TIME_FARMAT);
+
+    String value;
+    List<String> ranges = new ArrayList<>();
+    for (KVValue kv : field.getParams()) {
+      value = kv.value.toString();
+      if ("field".equals(kv.key)) {
+        dateRange.field(value);
+      } else if ("format".equals(kv.key)) {
+        dateRange.format(value);
+      } else if ("time_zone".equals(kv.key)) {
+        dateRange.timeZone(ZoneOffset.of(value));
+      } else if ("from".equals(kv.key)) {
+        dateRange.addUnboundedFrom(kv.value.toString());
+      } else if ("to".equals(kv.key)) {
+        dateRange.addUnboundedTo(kv.value.toString());
+      } else if (!"alias".equals(kv.key)
+          && !"nested".equals(kv.key)
+          && !"children".equals(kv.key)) {
+        ranges.add(value);
+      }
     }
 
-    /**
-     * 按照时间范围分组
-     *
-     * @param field
-     * @return
-     * @throws SqlParseException
-     */
-    private DateHistogramAggregationBuilder dateHistogram(MethodField field) throws SqlParseException {
-        String alias = gettAggNameFromParamsOrAlias(field);
-        DateHistogramAggregationBuilder dateHistogram = AggregationBuilders.dateHistogram(alias).format(TIME_FARMAT);
-        String value;
-        for (KVValue kv : field.getParams()) {
-            if (kv.value.toString().contains("doc[")) {
-                String script = kv.value + "; return " + kv.key;
-                dateHistogram.script(new Script(script));
-            } else {
-                value = kv.value.toString();
-                switch (kv.key.toLowerCase()) {
-                    case "interval":
-                        dateHistogram.dateHistogramInterval(new DateHistogramInterval(kv.value.toString()));
-                        break;
-                    case "fixed_interval":
-                        dateHistogram.fixedInterval(new DateHistogramInterval(kv.value.toString()));
-                        break;
-                    case "field":
-                        dateHistogram.field(value);
-                        break;
-                    case "format":
-                        dateHistogram.format(value);
-                        break;
-                    case "time_zone":
-                        dateHistogram.timeZone(ZoneOffset.of(value));
-                        break;
-                    case "min_doc_count":
-                        dateHistogram.minDocCount(Long.parseLong(value));
-                        break;
-                    case "order":
-                        dateHistogram.order("desc".equalsIgnoreCase(value) ? BucketOrder.key(false) :
-                                BucketOrder.key(true));
-                        break;
-                    case "extended_bounds":
-                        String[] bounds = value.split(":");
-                        if (bounds.length == 2) {
-                            dateHistogram.extendedBounds(new LongBounds(bounds[0], bounds[1]));
-                        }
-                        break;
-
-                    case "alias":
-                    case "nested":
-                    case "reverse_nested":
-                    case "children":
-                        break;
-                    default:
-                        throw new SqlParseException("date range err or not define field " + kv.toString());
-                }
-            }
-        }
-        return dateHistogram;
+    for (int i = 1; i < ranges.size(); i++) {
+      dateRange.addRange(ranges.get(i - 1), ranges.get(i));
     }
 
-    private String gettAggNameFromParamsOrAlias(MethodField field) {
-        String alias = field.getAlias();
-        for (KVValue kv : field.getParams()) {
-            if (kv.key != null && kv.key.equals("alias")) {
-                alias = kv.value.toString();
+    return dateRange;
+  }
+
+  /**
+   * @param field
+   * @return
+   * @throws SqlParseException
+   */
+  private DateHistogramAggregationBuilder dateHistogram(MethodField field)
+      throws SqlParseException {
+    String alias = gettAggNameFromParamsOrAlias(field);
+    DateHistogramAggregationBuilder dateHistogram =
+        AggregationBuilders.dateHistogram(alias).format(TIME_FARMAT);
+    String value;
+    for (KVValue kv : field.getParams()) {
+      if (kv.value.toString().contains("doc[")) {
+        String script = kv.value + "; return " + kv.key;
+        dateHistogram.script(new Script(script));
+      } else {
+        value = kv.value.toString();
+        switch (kv.key.toLowerCase()) {
+          case "interval":
+            dateHistogram.dateHistogramInterval(new DateHistogramInterval(kv.value.toString()));
+            break;
+          case "fixed_interval":
+            dateHistogram.fixedInterval(new DateHistogramInterval(kv.value.toString()));
+            break;
+          case "field":
+            dateHistogram.field(value);
+            break;
+          case "format":
+            dateHistogram.format(value);
+            break;
+          case "time_zone":
+            dateHistogram.timeZone(ZoneOffset.of(value));
+            break;
+          case "min_doc_count":
+            dateHistogram.minDocCount(Long.parseLong(value));
+            break;
+          case "order":
+            dateHistogram.order(
+                "desc".equalsIgnoreCase(value) ? BucketOrder.key(false) : BucketOrder.key(true));
+            break;
+          case "extended_bounds":
+            String[] bounds = value.split(":");
+            if (bounds.length == 2) {
+              dateHistogram.extendedBounds(new LongBounds(bounds[0], bounds[1]));
             }
+            break;
+
+          case "alias":
+          case "nested":
+          case "reverse_nested":
+          case "children":
+            break;
+          default:
+            throw new SqlParseException("date range err or not define field " + kv.toString());
         }
-        return alias;
+      }
     }
-
-    private HistogramAggregationBuilder histogram(MethodField field) throws SqlParseException {
-        String aggName = gettAggNameFromParamsOrAlias(field);
-        HistogramAggregationBuilder histogram = AggregationBuilders.histogram(aggName);
-        String value;
-        for (KVValue kv : field.getParams()) {
-            if (kv.value.toString().contains("doc[")) {
-                String script = kv.value + "; return " + kv.key;
-                histogram.script(new Script(script));
-            } else {
-                value = kv.value.toString();
-                switch (kv.key.toLowerCase()) {
-                    case "interval":
-                        histogram.interval(Long.parseLong(value));
-                        break;
-                    case "field":
-                        histogram.field(value);
-                        break;
-                    case "min_doc_count":
-                        histogram.minDocCount(Long.parseLong(value));
-                        break;
-                    case "extended_bounds":
-                        String[] bounds = value.split(":");
-                        if (bounds.length == 2) {
-                            histogram.extendedBounds(Long.valueOf(bounds[0]), Long.valueOf(bounds[1]));
-                        }
-                        break;
-                    case "alias":
-                    case "nested":
-                    case "reverse_nested":
-                    case "children":
-                        break;
-                    case "order":
-                        final BucketOrder order;
-                        switch (value) {
-                            case "key_desc":
-                                order = BucketOrder.key(false);
-                                break;
-                            case "count_asc":
-                                order = BucketOrder.count(true);
-                                break;
-                            case "count_desc":
-                                order = BucketOrder.count(false);
-                                break;
-                            case "key_asc":
-                            default:
-                                order = BucketOrder.key(true);
-                                break;
-                        }
-                        histogram.order(order);
-                        break;
-                    default:
-                        throw new SqlParseException("histogram err or not define field " + kv.toString());
-                }
+    return dateHistogram;
+  }
+
+  private String gettAggNameFromParamsOrAlias(MethodField field) {
+    String alias = field.getAlias();
+    for (KVValue kv : field.getParams()) {
+      if (kv.key != null && kv.key.equals("alias")) {
+        alias = kv.value.toString();
+      }
+    }
+    return alias;
+  }
+
+  private HistogramAggregationBuilder histogram(MethodField field) throws SqlParseException {
+    String aggName = gettAggNameFromParamsOrAlias(field);
+    HistogramAggregationBuilder histogram = AggregationBuilders.histogram(aggName);
+    String value;
+    for (KVValue kv : field.getParams()) {
+      if (kv.value.toString().contains("doc[")) {
+        String script = kv.value + "; return " + kv.key;
+        histogram.script(new Script(script));
+      } else {
+        value = kv.value.toString();
+        switch (kv.key.toLowerCase()) {
+          case "interval":
+            histogram.interval(Long.parseLong(value));
+            break;
+          case "field":
+            histogram.field(value);
+            break;
+          case "min_doc_count":
+            histogram.minDocCount(Long.parseLong(value));
+            break;
+          case "extended_bounds":
+            String[] bounds = value.split(":");
+            if (bounds.length == 2) {
+              histogram.extendedBounds(Long.valueOf(bounds[0]), Long.valueOf(bounds[1]));
             }
+            break;
+          case "alias":
+          case "nested":
+          case "reverse_nested":
+          case "children":
+            break;
+          case "order":
+            final BucketOrder order;
+            switch (value) {
+              case "key_desc":
+                order = BucketOrder.key(false);
+                break;
+              case "count_asc":
+                order = BucketOrder.count(true);
+                break;
+              case "count_desc":
+                order = BucketOrder.count(false);
+                break;
+              case "key_asc":
+              default:
+                order = BucketOrder.key(true);
+                break;
+            }
+            histogram.order(order);
+            break;
+          default:
+            throw new SqlParseException("histogram err or not define field " + kv.toString());
         }
-        return histogram;
+      }
     }
+    return histogram;
+  }
 
-    /**
-     * 构建范围查询
-     *
-     * @param field
-     * @return
-     */
-    private RangeAggregationBuilder rangeBuilder(MethodField field) {
-
-        // ignore alias param
-        LinkedList<KVValue> params = field.getParams().stream().filter(kv -> !"alias".equals(kv.key))
-                .collect(Collectors.toCollection(LinkedList::new));
+  /**
+   * @param field
+   * @return
+   */
+  private RangeAggregationBuilder rangeBuilder(MethodField field) {
 
-        String fieldName = params.poll().toString();
+    // ignore alias param
+    LinkedList<KVValue> params =
+        field.getParams().stream()
+            .filter(kv -> !"alias".equals(kv.key))
+            .collect(Collectors.toCollection(LinkedList::new));
 
-        double[] ds = Util.KV2DoubleArr(params);
+    String fieldName = params.poll().toString();
 
-        RangeAggregationBuilder range = AggregationBuilders.range(field.getAlias()).field(fieldName);
+    double[] ds = Util.KV2DoubleArr(params);
 
-        for (int i = 1; i < ds.length; i++) {
-            range.addRange(ds[i - 1], ds[i]);
-        }
+    RangeAggregationBuilder range = AggregationBuilders.range(field.getAlias()).field(fieldName);
 
-        return range;
+    for (int i = 1; i < ds.length; i++) {
+      range.addRange(ds[i - 1], ds[i]);
     }
 
+    return range;
+  }
+
+  /**
+   * Create count aggregation.
+   *
+   * @param field The count function
+   * @return AggregationBuilder use to count result
+   */
+  private ValuesSourceAggregationBuilder makeCountAgg(MethodField field) {
+
+    // Cardinality is approximate DISTINCT.
+    if (SQLAggregateOption.DISTINCT.equals(field.getOption())) {
+
+      if (field.getParams().size() == 1) {
+        return AggregationBuilders.cardinality(field.getAlias())
+            .field(field.getParams().get(0).value.toString());
+      } else {
+        Integer precision_threshold = (Integer) (field.getParams().get(1).value);
+        return AggregationBuilders.cardinality(field.getAlias())
+            .precisionThreshold(precision_threshold)
+            .field(field.getParams().get(0).value.toString());
+      }
+    }
 
-    /**
-     * Create count aggregation.
-     *
-     * @param field The count function
-     * @return AggregationBuilder use to count result
-     */
-    private ValuesSourceAggregationBuilder makeCountAgg(MethodField field) {
-
-        // Cardinality is approximate DISTINCT.
-        if (SQLAggregateOption.DISTINCT.equals(field.getOption())) {
-
-            if (field.getParams().size() == 1) {
-                return AggregationBuilders.cardinality(field.getAlias()).field(field.getParams().get(0).value
-                        .toString());
-            } else {
-                Integer precision_threshold = (Integer) (field.getParams().get(1).value);
-                return AggregationBuilders.cardinality(field.getAlias()).precisionThreshold(precision_threshold)
-                        .field(field.getParams().get(0).value.toString());
-            }
-
-        }
-
-        String fieldName = field.getParams().get(0).value.toString();
+    String fieldName = field.getParams().get(0).value.toString();
 
-        // In case of count(*) we use '_index' as field parameter to count all documents
-        if ("*".equals(fieldName)) {
-            KVValue kvValue = new KVValue(null, "_index");
-            field.getParams().set(0, kvValue);
-            return AggregationBuilders.count(field.getAlias()).field(kvValue.toString());
-        } else {
-            return AggregationBuilders.count(field.getAlias()).field(fieldName);
-        }
+    // In case of count(*) we use '_index' as field parameter to count all documents
+    if ("*".equals(fieldName)) {
+      KVValue kvValue = new KVValue(null, "_index");
+      field.getParams().set(0, kvValue);
+      return AggregationBuilders.count(field.getAlias()).field(kvValue.toString());
+    } else {
+      return AggregationBuilders.count(field.getAlias()).field(fieldName);
     }
-
-    /**
-     * TOPHITS查询
-     *
-     * @param field
-     * @return
-     */
-    private AbstractAggregationBuilder makeTopHitsAgg(MethodField field) {
-        String alias = gettAggNameFromParamsOrAlias(field);
-        TopHitsAggregationBuilder topHits = AggregationBuilders.topHits(alias);
-        List<KVValue> params = field.getParams();
-        String[] include = null;
-        String[] exclude = null;
-        for (KVValue kv : params) {
-            switch (kv.key) {
-                case "from":
-                    topHits.from((int) kv.value);
-                    break;
-                case "size":
-                    topHits.size((int) kv.value);
-                    break;
-                case "include":
-                    include = kv.value.toString().split(",");
-                    break;
-                case "exclude":
-                    exclude = kv.value.toString().split(",");
-                    break;
-                case "alias":
-                case "nested":
-                case "reverse_nested":
-                case "children":
-                    break;
-                default:
-                    topHits.sort(kv.key, SortOrder.valueOf(kv.value.toString().toUpperCase()));
-                    break;
-            }
-        }
-        if (include != null || exclude != null) {
-            topHits.fetchSource(include, exclude);
-        }
-        return topHits;
+  }
+
+  /**
+   * TOPHITS
+   *
+   * @param field
+   * @return
+   */
+  private AbstractAggregationBuilder makeTopHitsAgg(MethodField field) {
+    String alias = gettAggNameFromParamsOrAlias(field);
+    TopHitsAggregationBuilder topHits = AggregationBuilders.topHits(alias);
+    List<KVValue> params = field.getParams();
+    String[] include = null;
+    String[] exclude = null;
+    for (KVValue kv : params) {
+      switch (kv.key) {
+        case "from":
+          topHits.from((int) kv.value);
+          break;
+        case "size":
+          topHits.size((int) kv.value);
+          break;
+        case "include":
+          include = kv.value.toString().split(",");
+          break;
+        case "exclude":
+          exclude = kv.value.toString().split(",");
+          break;
+        case "alias":
+        case "nested":
+        case "reverse_nested":
+        case "children":
+          break;
+        default:
+          topHits.sort(kv.key, SortOrder.valueOf(kv.value.toString().toUpperCase()));
+          break;
+      }
     }
-
-    public Map<String, KVValue> getGroupMap() {
-        return this.groupMap;
+    if (include != null || exclude != null) {
+      topHits.fetchSource(include, exclude);
     }
-
-    /**
-     * Wrap the Metric Aggregation with Filter Aggregation if necessary.
-     * The Filter Aggregation condition is constructed from the nested condition in where clause.
-     */
-    private AggregationBuilder wrapWithFilterAgg(NestedType nestedType, ValuesSourceAggregationBuilder builder)
-            throws SqlParseException {
-        if (where != null && where.getWheres() != null) {
-            List<Condition> nestedConditionList = where.getWheres().stream()
-                    .filter(condition -> condition instanceof Condition)
-                    .map(condition -> (Condition) condition)
-                    .filter(condition -> condition.isNestedComplex()
-                            || nestedType.path.equalsIgnoreCase(condition.getNestedPath()))
-                    // ignore the OR condition on nested field.
-                    .filter(condition -> CONN.AND.equals(condition.getConn()))
-                    .collect(Collectors.toList());
-            if (!nestedConditionList.isEmpty()) {
-                Where filterWhere = new Where(where.getConn());
-                nestedConditionList.forEach(condition -> {
-                    if (condition.isNestedComplex()) {
-                        ((Where) condition.getValue()).getWheres().forEach(filterWhere::addWhere);
-                    } else {
-                        // Since the filter condition is used inside Nested Aggregation,remove the nested attribute.
-                        condition.setNested(false);
-                        condition.setNestedPath("");
-                        filterWhere.addWhere(condition);
-                    }
-                });
-                FilterAggregationBuilder filterAgg = AggregationBuilders.filter(
-                        nestedType.getFilterAggName(),
-                        QueryMaker.explain(filterWhere));
-                nestedType.addBucketPath(Path.getAggPath(filterAgg.getName()));
-                return filterAgg.subAggregation(builder);
-            }
-        }
-        return builder;
+    return topHits;
+  }
+
+  public Map<String, KVValue> getGroupMap() {
+    return this.groupMap;
+  }
+
+  /**
+   * Wrap the Metric Aggregation with Filter Aggregation if necessary. The Filter Aggregation
+   * condition is constructed from the nested condition in where clause.
+   */
+  private AggregationBuilder wrapWithFilterAgg(
+      NestedType nestedType, ValuesSourceAggregationBuilder builder) throws SqlParseException {
+    if (where != null && where.getWheres() != null) {
+      List<Condition> nestedConditionList =
+          where.getWheres().stream()
+              .filter(condition -> condition instanceof Condition)
+              .map(condition -> (Condition) condition)
+              .filter(
+                  condition ->
+                      condition.isNestedComplex()
+                          || nestedType.path.equalsIgnoreCase(condition.getNestedPath()))
+              // ignore the OR condition on nested field.
+              .filter(condition -> CONN.AND.equals(condition.getConn()))
+              .collect(Collectors.toList());
+      if (!nestedConditionList.isEmpty()) {
+        Where filterWhere = new Where(where.getConn());
+        nestedConditionList.forEach(
+            condition -> {
+              if (condition.isNestedComplex()) {
+                ((Where) condition.getValue()).getWheres().forEach(filterWhere::addWhere);
+              } else {
+                // Since the filter condition is used inside Nested Aggregation,remove the nested
+                // attribute.
+                condition.setNested(false);
+                condition.setNestedPath("");
+                filterWhere.addWhere(condition);
+              }
+            });
+        FilterAggregationBuilder filterAgg =
+            AggregationBuilders.filter(
+                nestedType.getFilterAggName(), QueryMaker.explain(filterWhere));
+        nestedType.addBucketPath(Path.getAggPath(filterAgg.getName()));
+        return filterAgg.subAggregation(builder);
+      }
     }
-
-    /**
-     * The groupMap is used when parsing order by to find out the corresponding field in aggregation.
-     * There are two cases.
-     * 1) using alias in order by, e.g. SELECT COUNT(*) as c FROM T GROUP BY age ORDER BY c
-     * 2) using full name in order by, e.g. SELECT COUNT(*) as c FROM T GROUP BY age ORDER BY COUNT(*)
-     * Then, the groupMap should support these two cases by maintain the mapping of
-     * {alias, value} and {full_name, value}
-     */
-    private void extendGroupMap(Field field, KVValue value) {
-        groupMap.put(field.toString(), value);
-        if (!StringUtils.isEmpty(field.getAlias())) {
-            groupMap.putIfAbsent(field.getAlias(), value);
-        }
+    return builder;
+  }
+
+  /**
+   * The groupMap is used when parsing order by to find out the corresponding field in aggregation.
+   * There are two cases. 1) using alias in order by, e.g. SELECT COUNT(*) as c FROM T GROUP BY age
+   * ORDER BY c 2) using full name in order by, e.g. SELECT COUNT(*) as c FROM T GROUP BY age ORDER
+   * BY COUNT(*) Then, the groupMap should support these two cases by maintain the mapping of
+   * {alias, value} and {full_name, value}
+   */
+  private void extendGroupMap(Field field, KVValue value) {
+    groupMap.put(field.toString(), value);
+    if (!StringUtils.isEmpty(field.getAlias())) {
+      groupMap.putIfAbsent(field.getAlias(), value);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/Maker.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/Maker.java
index 951d87a2c8..302af70ea8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/Maker.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/Maker.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.maker;
 
 import static org.opensearch.sql.legacy.parser.WhereParser.getConditionForMethod;
@@ -31,10 +30,10 @@
 import org.opensearch.common.geo.builders.ShapeBuilder;
 import org.opensearch.common.geo.parsers.ShapeParser;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContentParser;
 import org.opensearch.common.xcontent.json.JsonXContent;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.GeoPolygonQueryBuilder;
 import org.opensearch.index.query.MatchNoneQueryBuilder;
@@ -66,460 +65,472 @@
 
 public abstract class Maker {
 
-    /**
-     * UTC.
-     */
-    private static final ZoneId UTC = ZoneId.of("UTC");
-
-    public static final Object NONE = new Object();
-
-    public static final Set<String> queryFunctions = Sets.newHashSet(
-            "query",
-            "matchquery", "match_query", // match
-            "multimatchquery", "multi_match", "multimatch", // multi-match
-            "score", "scorequery", "score_query", // score
-            "wildcardquery", "wildcard_query", // wildcard
-            "matchphrasequery", "match_phrase", "matchphrase" // match-phrase
-    );
-
-    private static final Set<Condition.OPERATOR> NOT_OPERATOR_SET = ImmutableSet.of(
-            Condition.OPERATOR.N, Condition.OPERATOR.NIN, Condition.OPERATOR.ISN, Condition.OPERATOR.NBETWEEN,
-            Condition.OPERATOR.NLIKE, Condition.OPERATOR.NIN_TERMS, Condition.OPERATOR.NTERM,
-            Condition.OPERATOR.NOT_EXISTS_NESTED_COMPLEX, Condition.OPERATOR.NREGEXP
-    );
-
-    protected Maker(Boolean isQuery) {
-
+  /** UTC. */
+  private static final ZoneId UTC = ZoneId.of("UTC");
+
+  public static final Object NONE = new Object();
+
+  public static final Set<String> queryFunctions =
+      Sets.newHashSet(
+          "query",
+          "matchquery",
+          "match_query", // match
+          "multimatchquery",
+          "multi_match",
+          "multimatch", // multi-match
+          "score",
+          "scorequery",
+          "score_query", // score
+          "wildcardquery",
+          "wildcard_query", // wildcard
+          "matchphrasequery",
+          "match_phrase",
+          "matchphrase" // match-phrase
+          );
+
+  private static final Set<Condition.OPERATOR> NOT_OPERATOR_SET =
+      ImmutableSet.of(
+          Condition.OPERATOR.N,
+          Condition.OPERATOR.NIN,
+          Condition.OPERATOR.ISN,
+          Condition.OPERATOR.NBETWEEN,
+          Condition.OPERATOR.NLIKE,
+          Condition.OPERATOR.NIN_TERMS,
+          Condition.OPERATOR.NTERM,
+          Condition.OPERATOR.NOT_EXISTS_NESTED_COMPLEX,
+          Condition.OPERATOR.NREGEXP);
+
+  protected Maker(Boolean isQuery) {}
+
+  /**
+   * @param cond
+   * @return
+   * @throws SqlParseException
+   */
+  protected ToXContent make(Condition cond) throws SqlParseException {
+
+    String name = cond.getName();
+    Object value = cond.getValue();
+
+    ToXContent toXContent = null;
+
+    if (value instanceof SQLMethodInvokeExpr) {
+      toXContent = make(cond, name, (SQLMethodInvokeExpr) value);
+    } else if (value instanceof SubQueryExpression) {
+      toXContent = make(cond, name, ((SubQueryExpression) value).getValues());
+    } else {
+      if (cond.getValue() == NONE) {
+        toXContent = new MatchNoneQueryBuilder();
+      } else {
+        toXContent = make(cond, name, value);
+      }
     }
 
-    /**
-     * 构建过滤条件
-     *
-     * @param cond
-     * @return
-     * @throws SqlParseException
-     */
-    protected ToXContent make(Condition cond) throws SqlParseException {
-
-        String name = cond.getName();
-        Object value = cond.getValue();
-
-        ToXContent toXContent = null;
-
-        if (value instanceof SQLMethodInvokeExpr) {
-            toXContent = make(cond, name, (SQLMethodInvokeExpr) value);
-        } else if (value instanceof SubQueryExpression) {
-            toXContent = make(cond, name, ((SubQueryExpression) value).getValues());
-        } else {
-            if (cond.getValue() == NONE) {
-                toXContent = new MatchNoneQueryBuilder();
-            } else {
-                toXContent = make(cond, name, value);
-            }
+    return toXContent;
+  }
+
+  private ToXContent make(Condition cond, String name, SQLMethodInvokeExpr value)
+      throws SqlParseException {
+    ToXContent bqb = null;
+    Paramer paramer = null;
+    switch (value.getMethodName().toLowerCase()) {
+      case "query":
+        paramer = Paramer.parseParamer(value);
+        QueryStringQueryBuilder queryString = QueryBuilders.queryStringQuery(paramer.value);
+        bqb = Paramer.fullParamer(queryString, paramer);
+        bqb = applyNot(cond.getOPERATOR(), bqb);
+        break;
+      case "matchquery":
+      case "match_query":
+        paramer = Paramer.parseParamer(value);
+        MatchQueryBuilder matchQuery = QueryBuilders.matchQuery(name, paramer.value);
+        bqb = Paramer.fullParamer(matchQuery, paramer);
+        bqb = applyNot(cond.getOPERATOR(), bqb);
+        break;
+      case "score":
+      case "scorequery":
+      case "score_query":
+        Float boost = Float.parseFloat(value.getParameters().get(1).toString());
+        Condition subCond = getConditionForMethod(value.getParameters().get(0), cond.getConn());
+        QueryBuilder subQuery = (QueryBuilder) make(subCond);
+        if (subCond.isNested()) {
+          subQuery = QueryBuilders.nestedQuery(subCond.getNestedPath(), subQuery, ScoreMode.None);
         }
-
-        return toXContent;
+        bqb = QueryBuilders.constantScoreQuery(subQuery).boost(boost);
+        break;
+      case "wildcardquery":
+      case "wildcard_query":
+        paramer = Paramer.parseParamer(value);
+        WildcardQueryBuilder wildcardQuery = QueryBuilders.wildcardQuery(name, paramer.value);
+        bqb = Paramer.fullParamer(wildcardQuery, paramer);
+        break;
+
+      case "matchphrasequery":
+      case "match_phrase":
+      case "matchphrase":
+        paramer = Paramer.parseParamer(value);
+        MatchPhraseQueryBuilder matchPhraseQuery =
+            QueryBuilders.matchPhraseQuery(name, paramer.value);
+        bqb = Paramer.fullParamer(matchPhraseQuery, paramer);
+        break;
+
+      case "multimatchquery":
+      case "multi_match":
+      case "multimatch":
+        paramer = Paramer.parseParamer(value);
+        MultiMatchQueryBuilder multiMatchQuery =
+            QueryBuilders.multiMatchQuery(paramer.value).fields(paramer.fieldsBoosts);
+        bqb = Paramer.fullParamer(multiMatchQuery, paramer);
+        break;
+      default:
+        throw new SqlParseException(
+            "The following query method is not supported: " + value.getMethodName());
     }
 
-    private ToXContent make(Condition cond, String name, SQLMethodInvokeExpr value) throws SqlParseException {
-        ToXContent bqb = null;
-        Paramer paramer = null;
-        switch (value.getMethodName().toLowerCase()) {
-            case "query":
-                paramer = Paramer.parseParamer(value);
-                QueryStringQueryBuilder queryString = QueryBuilders.queryStringQuery(paramer.value);
-                bqb = Paramer.fullParamer(queryString, paramer);
-                bqb = applyNot(cond.getOPERATOR(), bqb);
-                break;
-            case "matchquery":
-            case "match_query":
-                paramer = Paramer.parseParamer(value);
-                MatchQueryBuilder matchQuery = QueryBuilders.matchQuery(name, paramer.value);
-                bqb = Paramer.fullParamer(matchQuery, paramer);
-                bqb = applyNot(cond.getOPERATOR(), bqb);
-                break;
-            case "score":
-            case "scorequery":
-            case "score_query":
-                Float boost = Float.parseFloat(value.getParameters().get(1).toString());
-                Condition subCond = getConditionForMethod(value.getParameters().get(0), cond.getConn());
-                QueryBuilder subQuery = (QueryBuilder) make(subCond);
-                if (subCond.isNested()) {
-                    subQuery = QueryBuilders.nestedQuery(subCond.getNestedPath(), subQuery, ScoreMode.None);
-                }
-                bqb = QueryBuilders.constantScoreQuery(subQuery).boost(boost);
-                break;
-            case "wildcardquery":
-            case "wildcard_query":
-                paramer = Paramer.parseParamer(value);
-                WildcardQueryBuilder wildcardQuery = QueryBuilders.wildcardQuery(name, paramer.value);
-                bqb = Paramer.fullParamer(wildcardQuery, paramer);
-                break;
-
-            case "matchphrasequery":
-            case "match_phrase":
-            case "matchphrase":
-                paramer = Paramer.parseParamer(value);
-                MatchPhraseQueryBuilder matchPhraseQuery = QueryBuilders.matchPhraseQuery(name, paramer.value);
-                bqb = Paramer.fullParamer(matchPhraseQuery, paramer);
-                break;
-
-            case "multimatchquery":
-            case "multi_match":
-            case "multimatch":
-                paramer = Paramer.parseParamer(value);
-                MultiMatchQueryBuilder multiMatchQuery = QueryBuilders.multiMatchQuery(paramer.value)
-                        .fields(paramer.fieldsBoosts);
-                bqb = Paramer.fullParamer(multiMatchQuery, paramer);
-                break;
-            default:
-                throw new SqlParseException("The following query method is not supported: " + value.getMethodName());
+    return bqb;
+  }
+
+  private ToXContent make(Condition cond, String name, Object value) throws SqlParseException {
+    ToXContent toXContent = null;
+    switch (cond.getOPERATOR()) {
+      case ISN:
+      case IS:
+      case N:
+      case EQ:
+        if (value == null || value instanceof SQLIdentifierExpr) {
+          // todo: change to exists
+          if (value == null || ((SQLIdentifierExpr) value).getName().equalsIgnoreCase("missing")) {
+            toXContent = QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery(name));
+          } else {
+            throw new SqlParseException(
+                String.format(
+                    "Cannot recoginze Sql identifer %s", ((SQLIdentifierExpr) value).getName()));
+          }
+          break;
+        } else {
+          toXContent = QueryBuilders.termQuery(name, value);
+          break;
         }
-
-        return bqb;
-    }
-
-    private ToXContent make(Condition cond, String name, Object value) throws SqlParseException {
-        ToXContent toXContent = null;
-        switch (cond.getOPERATOR()) {
-            case ISN:
-            case IS:
-            case N:
-            case EQ:
-                if (value == null || value instanceof SQLIdentifierExpr) {
-                    //todo: change to exists
-                    if (value == null || ((SQLIdentifierExpr) value).getName().equalsIgnoreCase("missing")) {
-                        toXContent = QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery(name));
-                    } else {
-                        throw new SqlParseException(String.format("Cannot recoginze Sql identifer %s",
-                                ((SQLIdentifierExpr) value).getName()));
-                    }
-                    break;
-                } else {
-                    toXContent = QueryBuilders.termQuery(name, value);
-                    break;
-                }
-            case LIKE:
-            case NLIKE:
-                String queryStr = ((String) value);
-                queryStr = queryStr.replace('%', '*').replace('_', '?');
-                queryStr = queryStr.replace("&PERCENT", "%").replace("&UNDERSCORE", "_");
-                toXContent = QueryBuilders.wildcardQuery(name, queryStr);
-                break;
-            case REGEXP:
-            case NREGEXP:
-                Object[] values = (Object[]) value;
-                RegexpQueryBuilder regexpQuery = QueryBuilders.regexpQuery(name, values[0].toString());
-                if (1 < values.length) {
-                    String[] flags = values[1].toString().split("\\|");
-                    RegexpFlag[] regexpFlags = new RegexpFlag[flags.length];
-                    for (int i = 0; i < flags.length; ++i) {
-                        regexpFlags[i] = RegexpFlag.valueOf(flags[i]);
-                    }
-                    regexpQuery.flags(regexpFlags);
-                }
-                if (2 < values.length) {
-                    regexpQuery.maxDeterminizedStates(Integer.parseInt(values[2].toString()));
-                }
-                toXContent = regexpQuery;
-                break;
-            case GT:
-                toXContent = QueryBuilders.rangeQuery(name).gt(value);
-                break;
-            case GTE:
-                toXContent = QueryBuilders.rangeQuery(name).gte(value);
-                break;
-            case LT:
-                toXContent = QueryBuilders.rangeQuery(name).lt(value);
-                break;
-            case LTE:
-                toXContent = QueryBuilders.rangeQuery(name).lte(value);
-                break;
-            case NIN:
-            case IN:
-                //todo: value is subquery? here or before
-                values = (Object[]) value;
-                TermQueryBuilder[] termQueries = new TermQueryBuilder[values.length];
-                for (int i = 0; i < values.length; i++) {
-                    termQueries[i] = QueryBuilders.termQuery(name, values[i]);
-                }
-
-                BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
-                for (TermQueryBuilder termQuery : termQueries) {
-                    boolQuery.should(termQuery);
-                }
-                toXContent = boolQuery;
-                break;
-            case BETWEEN:
-            case NBETWEEN:
-                toXContent = QueryBuilders.rangeQuery(name).gte(((Object[]) value)[0]).lte(((Object[]) value)[1]);
-                break;
-            case GEO_INTERSECTS:
-                String wkt = cond.getValue().toString();
-                try {
-                    ShapeBuilder shapeBuilder = getShapeBuilderFromString(wkt);
-                    toXContent = QueryBuilders.geoShapeQuery(cond.getName(), shapeBuilder);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    throw new SqlParseException(StringUtils.format("Failed to create shapeBuilder from [%s]", wkt));
-                }
-                break;
-            case GEO_BOUNDING_BOX:
-                BoundingBoxFilterParams boxFilterParams = (BoundingBoxFilterParams) cond.getValue();
-                Point topLeft = boxFilterParams.getTopLeft();
-                Point bottomRight = boxFilterParams.getBottomRight();
-                toXContent = QueryBuilders.geoBoundingBoxQuery(cond.getName()).setCorners(topLeft.getLat(),
-                        topLeft.getLon(), bottomRight.getLat(), bottomRight.getLon());
-                break;
-            case GEO_DISTANCE:
-                DistanceFilterParams distanceFilterParams = (DistanceFilterParams) cond.getValue();
-                Point fromPoint = distanceFilterParams.getFrom();
-                String distance = trimApostrophes(distanceFilterParams.getDistance());
-                toXContent = QueryBuilders.geoDistanceQuery(cond.getName()).distance(distance)
-                        .point(fromPoint.getLat(), fromPoint.getLon());
-                break;
-            case GEO_POLYGON:
-                PolygonFilterParams polygonFilterParams = (PolygonFilterParams) cond.getValue();
-                ArrayList<GeoPoint> geoPoints = new ArrayList<GeoPoint>();
-                for (Point p : polygonFilterParams.getPolygon()) {
-                    geoPoints.add(new GeoPoint(p.getLat(), p.getLon()));
-                }
-                GeoPolygonQueryBuilder polygonFilterBuilder = QueryBuilders.geoPolygonQuery(cond.getName(), geoPoints);
-                toXContent = polygonFilterBuilder;
-                break;
-            case NIN_TERMS:
-            case IN_TERMS:
-                Object[] termValues = (Object[]) value;
-                if (termValues.length == 1 && termValues[0] instanceof SubQueryExpression) {
-                    termValues = ((SubQueryExpression) termValues[0]).getValues();
-                }
-                Object[] termValuesObjects = new Object[termValues.length];
-                for (int i = 0; i < termValues.length; i++) {
-                    termValuesObjects[i] = parseTermValue(termValues[i]);
-                }
-                toXContent = QueryBuilders.termsQuery(name, termValuesObjects);
-                break;
-            case NTERM:
-            case TERM:
-                Object term = ((Object[]) value)[0];
-                toXContent = QueryBuilders.termQuery(name, parseTermValue(term));
-                break;
-            case IDS_QUERY:
-                Object[] idsParameters = (Object[]) value;
-                String[] ids;
-                if (idsParameters.length == 2 && idsParameters[1] instanceof SubQueryExpression) {
-                    Object[] idsFromSubQuery = ((SubQueryExpression) idsParameters[1]).getValues();
-                    ids = arrayOfObjectsToStringArray(idsFromSubQuery, 0, idsFromSubQuery.length - 1);
-                } else {
-                    ids = arrayOfObjectsToStringArray(idsParameters, 1, idsParameters.length - 1);
-                }
-                toXContent = QueryBuilders.idsQuery().addIds(ids);
-                break;
-            case NESTED_COMPLEX:
-            case NOT_EXISTS_NESTED_COMPLEX:
-                if (value == null || !(value instanceof Where)) {
-                    throw new SqlParseException("unsupported nested condition");
-                }
-
-                Where whereNested = (Where) value;
-                BoolQueryBuilder nestedFilter = QueryMaker.explain(whereNested);
-
-                toXContent = QueryBuilders.nestedQuery(name, nestedFilter, ScoreMode.None);
-                break;
-            case CHILDREN_COMPLEX:
-                if (value == null || !(value instanceof Where)) {
-                    throw new SqlParseException("unsupported nested condition");
-                }
-
-                Where whereChildren = (Where) value;
-                BoolQueryBuilder childrenFilter = QueryMaker.explain(whereChildren);
-                //todo: pass score mode
-                toXContent = JoinQueryBuilders.hasChildQuery(name, childrenFilter, ScoreMode.None);
-
-                break;
-            case SCRIPT:
-                ScriptFilter scriptFilter = (ScriptFilter) value;
-                Map<String, Object> params = new HashMap<>();
-                if (scriptFilter.containsParameters()) {
-                    params = scriptFilter.getArgs();
-                }
-
-                SQLExpr nameExpr = cond.getNameExpr();
-                SQLExpr valueExpr = cond.getValueExpr();
-                if (nameExpr instanceof SQLMethodInvokeExpr
-                        && ((SQLMethodInvokeExpr) nameExpr).getMethodName().equalsIgnoreCase("date_format")) {
-                    toXContent = makeForDateFormat((SQLMethodInvokeExpr) nameExpr, (SQLCharExpr) valueExpr);
-                } else {
-                    toXContent = QueryBuilders.scriptQuery(
-                            new Script(
-                                    scriptFilter.getScriptType(),
-                                    Script.DEFAULT_SCRIPT_LANG,
-                                    scriptFilter.getScript(),
-                                    params));
-                }
-                break;
-            default:
-                throw new SqlParseException("Undefined condition:  " + cond.getName());
+      case LIKE:
+      case NLIKE:
+        String queryStr = ((String) value);
+        queryStr = queryStr.replace('%', '*').replace('_', '?');
+        queryStr = queryStr.replace("&PERCENT", "%").replace("&UNDERSCORE", "_");
+        toXContent = QueryBuilders.wildcardQuery(name, queryStr);
+        break;
+      case REGEXP:
+      case NREGEXP:
+        Object[] values = (Object[]) value;
+        RegexpQueryBuilder regexpQuery = QueryBuilders.regexpQuery(name, values[0].toString());
+        if (1 < values.length) {
+          String[] flags = values[1].toString().split("\\|");
+          RegexpFlag[] regexpFlags = new RegexpFlag[flags.length];
+          for (int i = 0; i < flags.length; ++i) {
+            regexpFlags[i] = RegexpFlag.valueOf(flags[i]);
+          }
+          regexpQuery.flags(regexpFlags);
+        }
+        if (2 < values.length) {
+          regexpQuery.maxDeterminizedStates(Integer.parseInt(values[2].toString()));
+        }
+        toXContent = regexpQuery;
+        break;
+      case GT:
+        toXContent = QueryBuilders.rangeQuery(name).gt(value);
+        break;
+      case GTE:
+        toXContent = QueryBuilders.rangeQuery(name).gte(value);
+        break;
+      case LT:
+        toXContent = QueryBuilders.rangeQuery(name).lt(value);
+        break;
+      case LTE:
+        toXContent = QueryBuilders.rangeQuery(name).lte(value);
+        break;
+      case NIN:
+      case IN:
+        // todo: value is subquery? here or before
+        values = (Object[]) value;
+        TermQueryBuilder[] termQueries = new TermQueryBuilder[values.length];
+        for (int i = 0; i < values.length; i++) {
+          termQueries[i] = QueryBuilders.termQuery(name, values[i]);
         }
 
-        toXContent = applyNot(cond.getOPERATOR(), toXContent);
-        return toXContent;
-    }
-
-    public static boolean isQueryFunction(String methodName) {
-        return queryFunctions.contains(methodName.toLowerCase());
-    }
-
-    /**
-     * Helper method used to form a range query object for the date_format function.
-     * <p>
-     * Example: WHERE date_format(dateField, "YYYY-MM-dd") > "2012-01-01"
-     * Expected range query:
-     * "range": {
-     * "dateField": {
-     * "from": "2012-01-01",
-     * "to": null,
-     * "include_lower": false,
-     * "include_upper": true,
-     * "time_zone": "America/Los_Angeles",
-     * "format": "YYYY-MM-dd",
-     * "boost": 1
-     * }
-     * }
-     *
-     * @param nameExpr  SQL method expression (ex. date_format(dateField, "YYYY-MM-dd"))
-     * @param valueExpr Value expression being compared to the SQL method result (ex. "2012-01-01")
-     * @throws SqlParseException
-     */
-    private ToXContent makeForDateFormat(SQLMethodInvokeExpr nameExpr, SQLCharExpr valueExpr) throws SqlParseException {
-        ToXContent toXContent = null;
-        List<SQLExpr> params = nameExpr.getParameters();
-
-        String field = params.get(0).toString();
-        String format = removeSingleQuote(params.get(1).toString());
-        String dateToCompare = valueExpr.getText();
-        String oper = ((SQLBinaryOpExpr) nameExpr.getParent()).getOperator().name;
-
-        String zoneId;
-        if (params.size() > 2) {
-            zoneId = ZoneId.of(removeSingleQuote(params.get(2).toString())).toString();
+        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+        for (TermQueryBuilder termQuery : termQueries) {
+          boolQuery.should(termQuery);
+        }
+        toXContent = boolQuery;
+        break;
+      case BETWEEN:
+      case NBETWEEN:
+        toXContent =
+            QueryBuilders.rangeQuery(name).gte(((Object[]) value)[0]).lte(((Object[]) value)[1]);
+        break;
+      case GEO_INTERSECTS:
+        String wkt = cond.getValue().toString();
+        try {
+          ShapeBuilder shapeBuilder = getShapeBuilderFromString(wkt);
+          toXContent = QueryBuilders.geoShapeQuery(cond.getName(), shapeBuilder);
+        } catch (IOException e) {
+          e.printStackTrace();
+          throw new SqlParseException(
+              StringUtils.format("Failed to create shapeBuilder from [%s]", wkt));
+        }
+        break;
+      case GEO_BOUNDING_BOX:
+        BoundingBoxFilterParams boxFilterParams = (BoundingBoxFilterParams) cond.getValue();
+        Point topLeft = boxFilterParams.getTopLeft();
+        Point bottomRight = boxFilterParams.getBottomRight();
+        toXContent =
+            QueryBuilders.geoBoundingBoxQuery(cond.getName())
+                .setCorners(
+                    topLeft.getLat(), topLeft.getLon(), bottomRight.getLat(), bottomRight.getLon());
+        break;
+      case GEO_DISTANCE:
+        DistanceFilterParams distanceFilterParams = (DistanceFilterParams) cond.getValue();
+        Point fromPoint = distanceFilterParams.getFrom();
+        String distance = trimApostrophes(distanceFilterParams.getDistance());
+        toXContent =
+            QueryBuilders.geoDistanceQuery(cond.getName())
+                .distance(distance)
+                .point(fromPoint.getLat(), fromPoint.getLon());
+        break;
+      case GEO_POLYGON:
+        PolygonFilterParams polygonFilterParams = (PolygonFilterParams) cond.getValue();
+        ArrayList<GeoPoint> geoPoints = new ArrayList<GeoPoint>();
+        for (Point p : polygonFilterParams.getPolygon()) {
+          geoPoints.add(new GeoPoint(p.getLat(), p.getLon()));
+        }
+        GeoPolygonQueryBuilder polygonFilterBuilder =
+            QueryBuilders.geoPolygonQuery(cond.getName(), geoPoints);
+        toXContent = polygonFilterBuilder;
+        break;
+      case NIN_TERMS:
+      case IN_TERMS:
+        Object[] termValues = (Object[]) value;
+        if (termValues.length == 1 && termValues[0] instanceof SubQueryExpression) {
+          termValues = ((SubQueryExpression) termValues[0]).getValues();
+        }
+        Object[] termValuesObjects = new Object[termValues.length];
+        for (int i = 0; i < termValues.length; i++) {
+          termValuesObjects[i] = parseTermValue(termValues[i]);
+        }
+        toXContent = QueryBuilders.termsQuery(name, termValuesObjects);
+        break;
+      case NTERM:
+      case TERM:
+        Object term = ((Object[]) value)[0];
+        toXContent = QueryBuilders.termQuery(name, parseTermValue(term));
+        break;
+      case IDS_QUERY:
+        Object[] idsParameters = (Object[]) value;
+        String[] ids;
+        if (idsParameters.length == 2 && idsParameters[1] instanceof SubQueryExpression) {
+          Object[] idsFromSubQuery = ((SubQueryExpression) idsParameters[1]).getValues();
+          ids = arrayOfObjectsToStringArray(idsFromSubQuery, 0, idsFromSubQuery.length - 1);
         } else {
-            // Using UTC, if there is no Zone provided.
-            zoneId = UTC.getId();
+          ids = arrayOfObjectsToStringArray(idsParameters, 1, idsParameters.length - 1);
         }
-
-        RangeQueryBuilder rangeQuery = QueryBuilders.rangeQuery(field).format(format).timeZone(zoneId);
-        switch (oper) {
-            case "<>":
-            case "=":
-                toXContent = rangeQuery.gte(dateToCompare).lte(dateToCompare);
-                break;
-            case ">":
-                toXContent = rangeQuery.gt(dateToCompare);
-                break;
-            case "<":
-                toXContent = rangeQuery.lt(dateToCompare);
-                break;
-            case ">=":
-                toXContent = rangeQuery.gte(dateToCompare);
-                break;
-            case "<=":
-                toXContent = rangeQuery.lte(dateToCompare);
-                break;
-            case "BETWEEN":
-            case "NOT BETWEEN":
-                //todo: Add support for BETWEEN
-                break;
-            default:
-                throw new SqlParseException("date_format does not support the operation " + oper);
+        toXContent = QueryBuilders.idsQuery().addIds(ids);
+        break;
+      case NESTED_COMPLEX:
+      case NOT_EXISTS_NESTED_COMPLEX:
+        if (value == null || !(value instanceof Where)) {
+          throw new SqlParseException("unsupported nested condition");
         }
 
-        toXContent = applyNot(Condition.OPERATOR.operStringToOpear.get(oper), toXContent);
-        return toXContent;
-    }
+        Where whereNested = (Where) value;
+        BoolQueryBuilder nestedFilter = QueryMaker.explain(whereNested);
 
-    private String removeSingleQuote(String param) {
-        return param.replaceAll("\'", "");
-    }
+        toXContent = QueryBuilders.nestedQuery(name, nestedFilter, ScoreMode.None);
+        break;
+      case CHILDREN_COMPLEX:
+        if (value == null || !(value instanceof Where)) {
+          throw new SqlParseException("unsupported nested condition");
+        }
 
-    private String[] arrayOfObjectsToStringArray(Object[] values, int from, int to) {
-        String[] strings = new String[to - from + 1];
-        int counter = 0;
-        for (int i = from; i <= to; i++) {
-            strings[counter] = values[i].toString();
-            counter++;
+        Where whereChildren = (Where) value;
+        BoolQueryBuilder childrenFilter = QueryMaker.explain(whereChildren);
+        // todo: pass score mode
+        toXContent = JoinQueryBuilders.hasChildQuery(name, childrenFilter, ScoreMode.None);
+
+        break;
+      case SCRIPT:
+        ScriptFilter scriptFilter = (ScriptFilter) value;
+        Map<String, Object> params = new HashMap<>();
+        if (scriptFilter.containsParameters()) {
+          params = scriptFilter.getArgs();
         }
-        return strings;
-    }
 
-    private ShapeBuilder getShapeBuilderFromString(String str) throws IOException, SqlParseException {
-        String json;
-        if (str.contains("{")) {
-            json = fixJsonFromElastic(str);
+        SQLExpr nameExpr = cond.getNameExpr();
+        SQLExpr valueExpr = cond.getValueExpr();
+        if (nameExpr instanceof SQLMethodInvokeExpr
+            && ((SQLMethodInvokeExpr) nameExpr).getMethodName().equalsIgnoreCase("date_format")) {
+          toXContent = makeForDateFormat((SQLMethodInvokeExpr) nameExpr, (SQLCharExpr) valueExpr);
         } else {
-            json = WktToGeoJsonConverter.toGeoJson(trimApostrophes(str));
+          toXContent =
+              QueryBuilders.scriptQuery(
+                  new Script(
+                      scriptFilter.getScriptType(),
+                      Script.DEFAULT_SCRIPT_LANG,
+                      scriptFilter.getScript(),
+                      params));
         }
-
-        return getShapeBuilderFromJson(json);
+        break;
+      default:
+        throw new SqlParseException("Undefined condition:  " + cond.getName());
     }
 
-    /*
-     * elastic sends {coordinates=[[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]],
-     * type=Polygon}
-     * proper form is {"coordinates":[[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]],
-     * "type":"Polygon"}
-     *  */
-    private String fixJsonFromElastic(String elasticJson) {
-        String properJson = elasticJson.replaceAll("=", ":");
-        properJson = properJson.replaceAll("(type)(:)([a-zA-Z]+)", "\"type\":\"$3\"");
-        properJson = properJson.replaceAll("coordinates", "\"coordinates\"");
-        return properJson;
+    toXContent = applyNot(cond.getOPERATOR(), toXContent);
+    return toXContent;
+  }
+
+  public static boolean isQueryFunction(String methodName) {
+    return queryFunctions.contains(methodName.toLowerCase());
+  }
+
+  /**
+   * Helper method used to form a range query object for the date_format function.
+   *
+   * <p>Example: WHERE date_format(dateField, "YYYY-MM-dd") > "2012-01-01" Expected range query:
+   * "range": { "dateField": { "from": "2012-01-01", "to": null, "include_lower": false,
+   * "include_upper": true, "time_zone": "America/Los_Angeles", "format": "YYYY-MM-dd", "boost": 1 }
+   * }
+   *
+   * @param nameExpr SQL method expression (ex. date_format(dateField, "YYYY-MM-dd"))
+   * @param valueExpr Value expression being compared to the SQL method result (ex. "2012-01-01")
+   * @throws SqlParseException
+   */
+  private ToXContent makeForDateFormat(SQLMethodInvokeExpr nameExpr, SQLCharExpr valueExpr)
+      throws SqlParseException {
+    ToXContent toXContent = null;
+    List<SQLExpr> params = nameExpr.getParameters();
+
+    String field = params.get(0).toString();
+    String format = removeSingleQuote(params.get(1).toString());
+    String dateToCompare = valueExpr.getText();
+    String oper = ((SQLBinaryOpExpr) nameExpr.getParent()).getOperator().name;
+
+    String zoneId;
+    if (params.size() > 2) {
+      zoneId = ZoneId.of(removeSingleQuote(params.get(2).toString())).toString();
+    } else {
+      // Using UTC, if there is no Zone provided.
+      zoneId = UTC.getId();
     }
 
-    private ShapeBuilder getShapeBuilderFromJson(String json) throws IOException {
-        XContentParser parser = null;
-        parser = JsonXContent.jsonXContent.createParser(NamedXContentRegistry.EMPTY,
-                LoggingDeprecationHandler.INSTANCE, json);
-        parser.nextToken();
-        return ShapeParser.parse(parser);
+    RangeQueryBuilder rangeQuery = QueryBuilders.rangeQuery(field).format(format).timeZone(zoneId);
+    switch (oper) {
+      case "<>":
+      case "=":
+        toXContent = rangeQuery.gte(dateToCompare).lte(dateToCompare);
+        break;
+      case ">":
+        toXContent = rangeQuery.gt(dateToCompare);
+        break;
+      case "<":
+        toXContent = rangeQuery.lt(dateToCompare);
+        break;
+      case ">=":
+        toXContent = rangeQuery.gte(dateToCompare);
+        break;
+      case "<=":
+        toXContent = rangeQuery.lte(dateToCompare);
+        break;
+      case "BETWEEN":
+      case "NOT BETWEEN":
+        // todo: Add support for BETWEEN
+        break;
+      default:
+        throw new SqlParseException("date_format does not support the operation " + oper);
     }
 
-    private String trimApostrophes(String str) {
-        return str.substring(1, str.length() - 1);
-    }
+    toXContent = applyNot(Condition.OPERATOR.operStringToOpear.get(oper), toXContent);
+    return toXContent;
+  }
 
-    /**
-     * Applies negation to query builder if the operation is a "not" operation.
-     */
-    private ToXContent applyNot(Condition.OPERATOR OPERATOR, ToXContent bqb) {
-        if (NOT_OPERATOR_SET.contains(OPERATOR)) {
-            bqb = QueryBuilders.boolQuery().mustNot((QueryBuilder) bqb);
-        }
-        return bqb;
-    }
+  private String removeSingleQuote(String param) {
+    return param.replaceAll("\'", "");
+  }
 
-    private Object parseTermValue(Object termValue) {
-        if (termValue instanceof SQLNumericLiteralExpr) {
-            termValue = ((SQLNumericLiteralExpr) termValue).getNumber();
-            if (termValue instanceof BigDecimal || termValue instanceof Double) {
-                termValue = ((Number) termValue).doubleValue();
-            } else if (termValue instanceof Float) {
-                termValue = ((Number) termValue).floatValue();
-            } else if (termValue instanceof BigInteger || termValue instanceof Long) {
-                termValue = ((Number) termValue).longValue();
-            } else if (termValue instanceof Integer) {
-                termValue = ((Number) termValue).intValue();
-            } else if (termValue instanceof Short) {
-                termValue = ((Number) termValue).shortValue();
-            } else if (termValue instanceof Byte) {
-                termValue = ((Number) termValue).byteValue();
-            }
-        } else if (termValue instanceof SQLBooleanExpr) {
-            termValue = ((SQLBooleanExpr) termValue).getValue();
-        } else {
-            termValue = termValue.toString();
-        }
+  private String[] arrayOfObjectsToStringArray(Object[] values, int from, int to) {
+    String[] strings = new String[to - from + 1];
+    int counter = 0;
+    for (int i = from; i <= to; i++) {
+      strings[counter] = values[i].toString();
+      counter++;
+    }
+    return strings;
+  }
+
+  private ShapeBuilder getShapeBuilderFromString(String str) throws IOException, SqlParseException {
+    String json;
+    if (str.contains("{")) {
+      json = fixJsonFromElastic(str);
+    } else {
+      json = WktToGeoJsonConverter.toGeoJson(trimApostrophes(str));
+    }
 
-        return termValue;
+    return getShapeBuilderFromJson(json);
+  }
+
+  /*
+   * elastic sends {coordinates=[[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]],
+   * type=Polygon}
+   * proper form is {"coordinates":[[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]],
+   * "type":"Polygon"}
+   *  */
+  private String fixJsonFromElastic(String elasticJson) {
+    String properJson = elasticJson.replaceAll("=", ":");
+    properJson = properJson.replaceAll("(type)(:)([a-zA-Z]+)", "\"type\":\"$3\"");
+    properJson = properJson.replaceAll("coordinates", "\"coordinates\"");
+    return properJson;
+  }
+
+  private ShapeBuilder getShapeBuilderFromJson(String json) throws IOException {
+    XContentParser parser = null;
+    parser =
+        JsonXContent.jsonXContent.createParser(
+            NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, json);
+    parser.nextToken();
+    return ShapeParser.parse(parser);
+  }
+
+  private String trimApostrophes(String str) {
+    return str.substring(1, str.length() - 1);
+  }
+
+  /** Applies negation to query builder if the operation is a "not" operation. */
+  private ToXContent applyNot(Condition.OPERATOR OPERATOR, ToXContent bqb) {
+    if (NOT_OPERATOR_SET.contains(OPERATOR)) {
+      bqb = QueryBuilders.boolQuery().mustNot((QueryBuilder) bqb);
     }
+    return bqb;
+  }
+
+  private Object parseTermValue(Object termValue) {
+    if (termValue instanceof SQLNumericLiteralExpr) {
+      termValue = ((SQLNumericLiteralExpr) termValue).getNumber();
+      if (termValue instanceof BigDecimal || termValue instanceof Double) {
+        termValue = ((Number) termValue).doubleValue();
+      } else if (termValue instanceof Float) {
+        termValue = ((Number) termValue).floatValue();
+      } else if (termValue instanceof BigInteger || termValue instanceof Long) {
+        termValue = ((Number) termValue).longValue();
+      } else if (termValue instanceof Integer) {
+        termValue = ((Number) termValue).intValue();
+      } else if (termValue instanceof Short) {
+        termValue = ((Number) termValue).shortValue();
+      } else if (termValue instanceof Byte) {
+        termValue = ((Number) termValue).byteValue();
+      }
+    } else if (termValue instanceof SQLBooleanExpr) {
+      termValue = ((SQLBooleanExpr) termValue).getValue();
+    } else {
+      termValue = termValue.toString();
+    }
+
+    return termValue;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/QueryMaker.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/QueryMaker.java
index d6d2f1e58e..75f3538981 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/QueryMaker.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/maker/QueryMaker.java
@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.maker;
 
-
 import org.apache.lucene.search.join.ScoreMode;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
@@ -18,76 +16,76 @@
 
 public class QueryMaker extends Maker {
 
-    /**
-     * 将where条件构建成query
-     *
-     * @param where
-     * @return
-     * @throws SqlParseException
-     */
-    public static BoolQueryBuilder explain(Where where) throws SqlParseException {
-        return explain(where, true);
-    }
+  /**
+   * @param where
+   * @return
+   * @throws SqlParseException
+   */
+  public static BoolQueryBuilder explain(Where where) throws SqlParseException {
+    return explain(where, true);
+  }
 
-    public static BoolQueryBuilder explain(Where where, boolean isQuery) throws SqlParseException {
-        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
-        while (where.getWheres().size() == 1) {
-            where = where.getWheres().getFirst();
-        }
-        new QueryMaker().explanWhere(boolQuery, where);
-        if (isQuery) {
-            return boolQuery;
-        }
-        return QueryBuilders.boolQuery().filter(boolQuery);
+  public static BoolQueryBuilder explain(Where where, boolean isQuery) throws SqlParseException {
+    BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+    while (where.getWheres().size() == 1) {
+      where = where.getWheres().getFirst();
     }
-
-    private QueryMaker() {
-        super(true);
+    new QueryMaker().explanWhere(boolQuery, where);
+    if (isQuery) {
+      return boolQuery;
     }
+    return QueryBuilders.boolQuery().filter(boolQuery);
+  }
 
-    private void explanWhere(BoolQueryBuilder boolQuery, Where where) throws SqlParseException {
-        if (where instanceof Condition) {
-            addSubQuery(boolQuery, where, (QueryBuilder) make((Condition) where));
-        } else {
-            BoolQueryBuilder subQuery = QueryBuilders.boolQuery();
-            addSubQuery(boolQuery, where, subQuery);
-            for (Where subWhere : where.getWheres()) {
-                explanWhere(subQuery, subWhere);
-            }
-        }
-    }
+  private QueryMaker() {
+    super(true);
+  }
 
-    /**
-     * 增加嵌套插
-     *
-     * @param boolQuery
-     * @param where
-     * @param subQuery
-     */
-    private void addSubQuery(BoolQueryBuilder boolQuery, Where where, QueryBuilder subQuery) {
-        if (where instanceof Condition) {
-            Condition condition = (Condition) where;
+  private void explanWhere(BoolQueryBuilder boolQuery, Where where) throws SqlParseException {
+    if (where instanceof Condition) {
+      addSubQuery(boolQuery, where, (QueryBuilder) make((Condition) where));
+    } else {
+      BoolQueryBuilder subQuery = QueryBuilders.boolQuery();
+      addSubQuery(boolQuery, where, subQuery);
+      for (Where subWhere : where.getWheres()) {
+        explanWhere(subQuery, subWhere);
+      }
+    }
+  }
 
-            if (condition.isNested()) {
-                // bugfix #628
-                if ("missing".equalsIgnoreCase(String.valueOf(condition.getValue()))
-                        && (condition.getOPERATOR() == Condition.OPERATOR.IS
-                        || condition.getOPERATOR() == Condition.OPERATOR.EQ)) {
-                    boolQuery.mustNot(QueryBuilders.nestedQuery(condition.getNestedPath(),
-                            QueryBuilders.boolQuery().mustNot(subQuery), ScoreMode.None));
-                    return;
-                }
+  /**
+   * @param boolQuery
+   * @param where
+   * @param subQuery
+   */
+  private void addSubQuery(BoolQueryBuilder boolQuery, Where where, QueryBuilder subQuery) {
+    if (where instanceof Condition) {
+      Condition condition = (Condition) where;
 
-                subQuery = QueryBuilders.nestedQuery(condition.getNestedPath(), subQuery, ScoreMode.None);
-            } else if (condition.isChildren()) {
-                subQuery = JoinQueryBuilders.hasChildQuery(condition.getChildType(), subQuery, ScoreMode.None);
-            }
+      if (condition.isNested()) {
+        // bugfix #628
+        if ("missing".equalsIgnoreCase(String.valueOf(condition.getValue()))
+            && (condition.getOPERATOR() == Condition.OPERATOR.IS
+                || condition.getOPERATOR() == Condition.OPERATOR.EQ)) {
+          boolQuery.mustNot(
+              QueryBuilders.nestedQuery(
+                  condition.getNestedPath(),
+                  QueryBuilders.boolQuery().mustNot(subQuery),
+                  ScoreMode.None));
+          return;
         }
 
-        if (where.getConn() == Where.CONN.AND) {
-            boolQuery.must(subQuery);
-        } else {
-            boolQuery.should(subQuery);
-        }
+        subQuery = QueryBuilders.nestedQuery(condition.getNestedPath(), subQuery, ScoreMode.None);
+      } else if (condition.isChildren()) {
+        subQuery =
+            JoinQueryBuilders.hasChildQuery(condition.getChildType(), subQuery, ScoreMode.None);
+      }
+    }
+
+    if (where.getConn() == Where.CONN.AND) {
+      boolQuery.must(subQuery);
+    } else {
+      boolQuery.should(subQuery);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryAction.java
index cd9b1f4030..a9eb6113f7 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryAction.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryAction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.multi;
 
 import java.util.HashSet;
@@ -18,66 +17,68 @@
 import org.opensearch.sql.legacy.query.QueryAction;
 import org.opensearch.sql.legacy.query.SqlElasticRequestBuilder;
 
-/**
- * Created by Eliran on 19/8/2016.
- */
+/** Created by Eliran on 19/8/2016. */
 public class MultiQueryAction extends QueryAction {
-    private MultiQuerySelect multiQuerySelect;
+  private MultiQuerySelect multiQuerySelect;
+
+  public MultiQueryAction(Client client, MultiQuerySelect multiSelect) {
+    super(client, null);
+    this.multiQuerySelect = multiSelect;
+  }
 
-    public MultiQueryAction(Client client, MultiQuerySelect multiSelect) {
-        super(client, null);
-        this.multiQuerySelect = multiSelect;
+  @Override
+  public SqlElasticRequestBuilder explain() throws SqlParseException {
+    if (!isValidMultiSelectReturnFields()) {
+      throw new SqlParseException(
+          "on multi query fields/aliases of one table should be subset of other");
     }
+    MultiQueryRequestBuilder requestBuilder = new MultiQueryRequestBuilder(this.multiQuerySelect);
+    requestBuilder.setFirstSearchRequest(
+        createRequestBuilder(this.multiQuerySelect.getFirstSelect()));
+    requestBuilder.setSecondSearchRequest(
+        createRequestBuilder(this.multiQuerySelect.getSecondSelect()));
+    requestBuilder.fillTableAliases(
+        this.multiQuerySelect.getFirstSelect().getFields(),
+        this.multiQuerySelect.getSecondSelect().getFields());
 
-    @Override
-    public SqlElasticRequestBuilder explain() throws SqlParseException {
-        if (!isValidMultiSelectReturnFields()) {
-            throw new SqlParseException("on multi query fields/aliases of one table should be subset of other");
-        }
-        MultiQueryRequestBuilder requestBuilder = new MultiQueryRequestBuilder(this.multiQuerySelect);
-        requestBuilder.setFirstSearchRequest(createRequestBuilder(this.multiQuerySelect.getFirstSelect()));
-        requestBuilder.setSecondSearchRequest(createRequestBuilder(this.multiQuerySelect.getSecondSelect()));
-        requestBuilder.fillTableAliases(this.multiQuerySelect.getFirstSelect().getFields(),
-                this.multiQuerySelect.getSecondSelect().getFields());
+    return requestBuilder;
+  }
 
-        return requestBuilder;
+  private boolean isValidMultiSelectReturnFields() {
+    List<Field> firstQueryFields = multiQuerySelect.getFirstSelect().getFields();
+    List<Field> secondQueryFields = multiQuerySelect.getSecondSelect().getFields();
+    if (firstQueryFields.size() > secondQueryFields.size()) {
+      return isSubsetFields(firstQueryFields, secondQueryFields);
     }
+    return isSubsetFields(secondQueryFields, firstQueryFields);
+  }
 
-    private boolean isValidMultiSelectReturnFields() {
-        List<Field> firstQueryFields = multiQuerySelect.getFirstSelect().getFields();
-        List<Field> secondQueryFields = multiQuerySelect.getSecondSelect().getFields();
-        if (firstQueryFields.size() > secondQueryFields.size()) {
-            return isSubsetFields(firstQueryFields, secondQueryFields);
-        }
-        return isSubsetFields(secondQueryFields, firstQueryFields);
+  private boolean isSubsetFields(List<Field> bigGroup, List<Field> smallerGroup) {
+    Set<String> biggerGroup = new HashSet<>();
+    for (Field field : bigGroup) {
+      String fieldName = getNameOrAlias(field);
+      biggerGroup.add(fieldName);
     }
-
-    private boolean isSubsetFields(List<Field> bigGroup, List<Field> smallerGroup) {
-        Set<String> biggerGroup = new HashSet<>();
-        for (Field field : bigGroup) {
-            String fieldName = getNameOrAlias(field);
-            biggerGroup.add(fieldName);
-        }
-        for (Field field : smallerGroup) {
-            String fieldName = getNameOrAlias(field);
-            if (!biggerGroup.contains(fieldName)) {
-                return false;
-            }
-        }
-        return true;
+    for (Field field : smallerGroup) {
+      String fieldName = getNameOrAlias(field);
+      if (!biggerGroup.contains(fieldName)) {
+        return false;
+      }
     }
+    return true;
+  }
 
-    private String getNameOrAlias(Field field) {
-        String fieldName = field.getName();
-        if (field.getAlias() != null && !field.getAlias().isEmpty()) {
-            fieldName = field.getAlias();
-        }
-        return fieldName;
+  private String getNameOrAlias(Field field) {
+    String fieldName = field.getName();
+    if (field.getAlias() != null && !field.getAlias().isEmpty()) {
+      fieldName = field.getAlias();
     }
+    return fieldName;
+  }
 
-    protected SearchRequestBuilder createRequestBuilder(Select select) throws SqlParseException {
-        DefaultQueryAction queryAction = new DefaultQueryAction(client, select);
-        queryAction.explain();
-        return queryAction.getRequestBuilder();
-    }
+  protected SearchRequestBuilder createRequestBuilder(Select select) throws SqlParseException {
+    DefaultQueryAction queryAction = new DefaultQueryAction(client, select);
+    queryAction.explain();
+    return queryAction.getRequestBuilder();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryRequestBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryRequestBuilder.java
index 4b5448ac30..b4e92a8de6 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryRequestBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryRequestBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.multi;
 
 import com.alibaba.druid.sql.ast.statement.SQLUnionOperator;
@@ -13,119 +12,118 @@
 import java.util.Map;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestBuilder;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.search.SearchRequestBuilder;
-import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.sql.legacy.domain.Field;
 import org.opensearch.sql.legacy.domain.Select;
 import org.opensearch.sql.legacy.query.SqlElasticRequestBuilder;
 
-/**
- * Created by Eliran on 19/8/2016.
- */
+/** Created by Eliran on 19/8/2016. */
 public class MultiQueryRequestBuilder implements SqlElasticRequestBuilder {
 
-    private SearchRequestBuilder firstSearchRequest;
-    private SearchRequestBuilder secondSearchRequest;
-    private Map<String, String> firstTableFieldToAlias;
-    private Map<String, String> secondTableFieldToAlias;
-    private MultiQuerySelect multiQuerySelect;
-    private SQLUnionOperator relation;
-
-
-    public MultiQueryRequestBuilder(MultiQuerySelect multiQuerySelect) {
-        this.multiQuerySelect = multiQuerySelect;
-        this.relation = multiQuerySelect.getOperation();
-        this.firstTableFieldToAlias = new HashMap<>();
-        this.secondTableFieldToAlias = new HashMap<>();
-    }
-
-    @Override
-    public ActionRequest request() {
-        return null;
-    }
-
-
-    @Override
-    public String explain() {
-
-        try {
-            XContentBuilder firstBuilder = XContentFactory.contentBuilder(XContentType.JSON).prettyPrint();
-            this.firstSearchRequest.request().source().toXContent(firstBuilder, ToXContent.EMPTY_PARAMS);
-
-            XContentBuilder secondBuilder = XContentFactory.contentBuilder(XContentType.JSON).prettyPrint();
-            this.secondSearchRequest.request().source().toXContent(secondBuilder, ToXContent.EMPTY_PARAMS);
-            return String.format("performing %s on :\n left query:\n%s\n right query:\n%s",
-                    this.relation.name, BytesReference.bytes(firstBuilder).utf8ToString(),
-                    BytesReference.bytes(secondBuilder).utf8ToString());
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    @Override
-    public ActionResponse get() {
-        return null;
-    }
-
-    @Override
-    public ActionRequestBuilder getBuilder() {
-        return null;
+  private SearchRequestBuilder firstSearchRequest;
+  private SearchRequestBuilder secondSearchRequest;
+  private Map<String, String> firstTableFieldToAlias;
+  private Map<String, String> secondTableFieldToAlias;
+  private MultiQuerySelect multiQuerySelect;
+  private SQLUnionOperator relation;
+
+  public MultiQueryRequestBuilder(MultiQuerySelect multiQuerySelect) {
+    this.multiQuerySelect = multiQuerySelect;
+    this.relation = multiQuerySelect.getOperation();
+    this.firstTableFieldToAlias = new HashMap<>();
+    this.secondTableFieldToAlias = new HashMap<>();
+  }
+
+  @Override
+  public ActionRequest request() {
+    return null;
+  }
+
+  @Override
+  public String explain() {
+
+    try {
+      XContentBuilder firstBuilder = XContentFactory.jsonBuilder().prettyPrint();
+      this.firstSearchRequest.request().source().toXContent(firstBuilder, ToXContent.EMPTY_PARAMS);
+
+      XContentBuilder secondBuilder = XContentFactory.jsonBuilder().prettyPrint();
+      this.secondSearchRequest
+          .request()
+          .source()
+          .toXContent(secondBuilder, ToXContent.EMPTY_PARAMS);
+      return String.format(
+          "performing %s on :\n left query:\n%s\n right query:\n%s",
+          this.relation.name,
+          BytesReference.bytes(firstBuilder).utf8ToString(),
+          BytesReference.bytes(secondBuilder).utf8ToString());
+
+    } catch (IOException e) {
+      e.printStackTrace();
     }
-
-
-    public SearchRequestBuilder getFirstSearchRequest() {
-        return firstSearchRequest;
-    }
-
-    public SearchRequestBuilder getSecondSearchRequest() {
-        return secondSearchRequest;
-    }
-
-    public SQLUnionOperator getRelation() {
-        return relation;
-    }
-
-    public void setFirstSearchRequest(SearchRequestBuilder firstSearchRequest) {
-        this.firstSearchRequest = firstSearchRequest;
+    return null;
+  }
+
+  @Override
+  public ActionResponse get() {
+    return null;
+  }
+
+  @Override
+  public ActionRequestBuilder getBuilder() {
+    return null;
+  }
+
+  public SearchRequestBuilder getFirstSearchRequest() {
+    return firstSearchRequest;
+  }
+
+  public SearchRequestBuilder getSecondSearchRequest() {
+    return secondSearchRequest;
+  }
+
+  public SQLUnionOperator getRelation() {
+    return relation;
+  }
+
+  public void setFirstSearchRequest(SearchRequestBuilder firstSearchRequest) {
+    this.firstSearchRequest = firstSearchRequest;
+  }
+
+  public void setSecondSearchRequest(SearchRequestBuilder secondSearchRequest) {
+    this.secondSearchRequest = secondSearchRequest;
+  }
+
+  public void fillTableAliases(List<Field> firstTableFields, List<Field> secondTableFields) {
+    fillTableToAlias(this.firstTableFieldToAlias, firstTableFields);
+    fillTableToAlias(this.secondTableFieldToAlias, secondTableFields);
+  }
+
+  private void fillTableToAlias(Map<String, String> fieldToAlias, List<Field> fields) {
+    for (Field field : fields) {
+      if (field.getAlias() != null && !field.getAlias().isEmpty()) {
+        fieldToAlias.put(field.getName(), field.getAlias());
+      }
     }
+  }
 
-    public void setSecondSearchRequest(SearchRequestBuilder secondSearchRequest) {
-        this.secondSearchRequest = secondSearchRequest;
-    }
-
-    public void fillTableAliases(List<Field> firstTableFields, List<Field> secondTableFields) {
-        fillTableToAlias(this.firstTableFieldToAlias, firstTableFields);
-        fillTableToAlias(this.secondTableFieldToAlias, secondTableFields);
-    }
-
-    private void fillTableToAlias(Map<String, String> fieldToAlias, List<Field> fields) {
-        for (Field field : fields) {
-            if (field.getAlias() != null && !field.getAlias().isEmpty()) {
-                fieldToAlias.put(field.getName(), field.getAlias());
-            }
-        }
-    }
-
-    public Map<String, String> getFirstTableFieldToAlias() {
-        return firstTableFieldToAlias;
-    }
+  public Map<String, String> getFirstTableFieldToAlias() {
+    return firstTableFieldToAlias;
+  }
 
-    public Map<String, String> getSecondTableFieldToAlias() {
-        return secondTableFieldToAlias;
-    }
+  public Map<String, String> getSecondTableFieldToAlias() {
+    return secondTableFieldToAlias;
+  }
 
-    public Select getOriginalSelect(boolean first) {
-        if (first) {
-            return this.multiQuerySelect.getFirstSelect();
-        } else {
-            return this.multiQuerySelect.getSecondSelect();
-        }
+  public Select getOriginalSelect(boolean first) {
+    if (first) {
+      return this.multiQuerySelect.getFirstSelect();
+    } else {
+      return this.multiQuerySelect.getSecondSelect();
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQuerySelect.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQuerySelect.java
index e5dd1716ed..72e7232a30 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQuerySelect.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQuerySelect.java
@@ -3,35 +3,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.multi;
 
 import com.alibaba.druid.sql.ast.statement.SQLUnionOperator;
 import org.opensearch.sql.legacy.domain.Select;
 
-/**
- * Created by Eliran on 19/8/2016.
- */
+/** Created by Eliran on 19/8/2016. */
 public class MultiQuerySelect {
-    private SQLUnionOperator operation;
-    private Select firstSelect;
-    private Select secondSelect;
-
-    public MultiQuerySelect(SQLUnionOperator operation, Select firstSelect, Select secondSelect) {
-        this.operation = operation;
-        this.firstSelect = firstSelect;
-        this.secondSelect = secondSelect;
-    }
-
-    public SQLUnionOperator getOperation() {
-        return operation;
-    }
-
-    public Select getFirstSelect() {
-        return firstSelect;
-    }
-
-    public Select getSecondSelect() {
-        return secondSelect;
-    }
+  private SQLUnionOperator operation;
+  private Select firstSelect;
+  private Select secondSelect;
+
+  public MultiQuerySelect(SQLUnionOperator operation, Select firstSelect, Select secondSelect) {
+    this.operation = operation;
+    this.firstSelect = firstSelect;
+    this.secondSelect = secondSelect;
+  }
+
+  public SQLUnionOperator getOperation() {
+    return operation;
+  }
+
+  public Select getFirstSelect() {
+    return firstSelect;
+  }
+
+  public Select getSecondSelect() {
+    return secondSelect;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/OpenSearchMultiQueryActionFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/OpenSearchMultiQueryActionFactory.java
index be86fdef81..1f934e9a80 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/OpenSearchMultiQueryActionFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/OpenSearchMultiQueryActionFactory.java
@@ -3,26 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.multi;
 
 import org.opensearch.client.Client;
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.query.QueryAction;
 
-/**
- * Created by Eliran on 19/8/2016.
- */
+/** Created by Eliran on 19/8/2016. */
 public class OpenSearchMultiQueryActionFactory {
 
-    public static QueryAction createMultiQueryAction(Client client, MultiQuerySelect multiSelect)
-            throws SqlParseException {
-        switch (multiSelect.getOperation()) {
-            case UNION_ALL:
-            case UNION:
-                return new MultiQueryAction(client, multiSelect);
-            default:
-                throw new SqlParseException("only supports union and union all");
-        }
+  public static QueryAction createMultiQueryAction(Client client, MultiQuerySelect multiSelect)
+      throws SqlParseException {
+    switch (multiSelect.getOperation()) {
+      case UNION_ALL:
+      case UNION:
+        return new MultiQueryAction(client, multiSelect);
+      default:
+        throw new SqlParseException("only supports union and union all");
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/HashJoinQueryPlanRequestBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/HashJoinQueryPlanRequestBuilder.java
index 312ade197a..28146aaacb 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/HashJoinQueryPlanRequestBuilder.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/HashJoinQueryPlanRequestBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner;
 
 import org.opensearch.client.Client;
@@ -14,64 +13,50 @@
 import org.opensearch.sql.legacy.request.SqlRequest;
 
 /**
- * QueryPlanner builder for Hash Join query. In future, different queries could have its own builders to generate
- * QueryPlanner. QueryPlanner would run all stages in its pipeline no matter how it be assembled.
+ * QueryPlanner builder for Hash Join query. In future, different queries could have its own
+ * builders to generate QueryPlanner. QueryPlanner would run all stages in its pipeline no matter
+ * how it be assembled.
  */
 public class HashJoinQueryPlanRequestBuilder extends HashJoinElasticRequestBuilder {
 
-    /**
-     * Client connection to OpenSearch cluster
-     */
-    private final Client client;
-
-    /**
-     * Query request
-     */
-    private final SqlRequest request;
-
-    /**
-     * Query planner configuration
-     */
-    private final Config config;
-
-
-    public HashJoinQueryPlanRequestBuilder(Client client, SqlRequest request) {
-        this.client = client;
-        this.request = request;
-        this.config = new Config();
-    }
-
-    @Override
-    public String explain() {
-        return plan().explain();
-    }
-
-    /**
-     * Planning for the query and create planner for explain/execute later.
-     *
-     * @return query planner
-     */
-    public QueryPlanner plan() {
-        config.configureLimit(
-                getTotalLimit(),
-                getFirstTable().getHintLimit(),
-                getSecondTable().getHintLimit()
-        );
-        config.configureTermsFilterOptimization(isUseTermFiltersOptimization());
-
-        return new QueryPlanner(
-                client,
-                config,
-                new QueryParams(
-                        getFirstTable(),
-                        getSecondTable(),
-                        getJoinType(),
-                        getT1ToT2FieldsComparison()
-                )
-        );
-    }
-
-    public Config getConfig() {
-        return config;
-    }
+  /** Client connection to OpenSearch cluster */
+  private final Client client;
+
+  /** Query request */
+  private final SqlRequest request;
+
+  /** Query planner configuration */
+  private final Config config;
+
+  public HashJoinQueryPlanRequestBuilder(Client client, SqlRequest request) {
+    this.client = client;
+    this.request = request;
+    this.config = new Config();
+  }
+
+  @Override
+  public String explain() {
+    return plan().explain();
+  }
+
+  /**
+   * Planning for the query and create planner for explain/execute later.
+   *
+   * @return query planner
+   */
+  public QueryPlanner plan() {
+    config.configureLimit(
+        getTotalLimit(), getFirstTable().getHintLimit(), getSecondTable().getHintLimit());
+    config.configureTermsFilterOptimization(isUseTermFiltersOptimization());
+
+    return new QueryPlanner(
+        client,
+        config,
+        new QueryParams(
+            getFirstTable(), getSecondTable(), getJoinType(), getT1ToT2FieldsComparison()));
+  }
+
+  public Config getConfig() {
+    return config;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLAggregationParser.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLAggregationParser.java
index ac9a173212..b54e260fd4 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLAggregationParser.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLAggregationParser.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.converter;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -31,253 +30,281 @@
 import org.opensearch.sql.legacy.query.planner.core.ColumnNode;
 
 /**
- * The definition of SQL Aggregation Converter which will parse the query to project column node list and
- * aggregation list
- * e.g. parse the query: SELECT age, MAX(balance) - MIN(balance) FROM T GROUP BY age.
- * will generate the
- * node list: age, max_0 - min_0
- * aggregation list: age, max(balance) as max_0, min(balance) as min_0
- *
+ * The definition of SQL Aggregation Converter which will parse the query to project column node
+ * list and aggregation list e.g. parse the query: SELECT age, MAX(balance) - MIN(balance) FROM T
+ * GROUP BY age. will generate the node list: age, max_0 - min_0 aggregation list: age, max(balance)
+ * as max_0, min(balance) as min_0
  */
 @RequiredArgsConstructor
 public class SQLAggregationParser {
-    private final ColumnTypeProvider columnTypeProvider;
-    private Context context;
-    @Getter
-    private List<ColumnNode> columnNodes = new ArrayList<>();
-
-    public void parse(MySqlSelectQueryBlock queryBlock) {
-        context = new Context(constructSQLExprAliasMapFromSelect(queryBlock));
-
-        //1. extract raw names of selectItems
-        List<String> selectItemNames = extractSelectItemNames(queryBlock.getSelectList());
-
-        //2. rewrite all the function name to lower case.
-        rewriteFunctionNameToLowerCase(queryBlock);
-
-        //2. find all GroupKeyExpr from GroupBy expression.
-        findAllGroupKeyExprFromGroupByAndSelect(queryBlock);
-        findAllAggregationExprFromSelect(queryBlock);
-
-        //3. parse the select list to expression
-        parseExprInSelectList(queryBlock, selectItemNames, new SQLExprToExpressionConverter(context));
-    }
-
-    public List<SQLSelectItem> selectItemList() {
-        List<SQLSelectItem> sqlSelectItems = new ArrayList<>();
-        context.getGroupKeyExprMap().entrySet().forEach(entry -> sqlSelectItems
-                .add(new SQLSelectItem(entry.getKey(), entry.getValue().getExpression().toString())));
-        context.getAggregationExprMap().entrySet().forEach(entry -> sqlSelectItems
-                .add(new SQLSelectItem(entry.getKey(), entry.getValue().getExpression().toString())));
-        return sqlSelectItems;
+  private final ColumnTypeProvider columnTypeProvider;
+  private Context context;
+  @Getter private List<ColumnNode> columnNodes = new ArrayList<>();
+
+  public void parse(MySqlSelectQueryBlock queryBlock) {
+    context = new Context(constructSQLExprAliasMapFromSelect(queryBlock));
+
+    // 1. extract raw names of selectItems
+    List<String> selectItemNames = extractSelectItemNames(queryBlock.getSelectList());
+
+    // 2. rewrite all the function name to lower case.
+    rewriteFunctionNameToLowerCase(queryBlock);
+
+    // 2. find all GroupKeyExpr from GroupBy expression.
+    findAllGroupKeyExprFromGroupByAndSelect(queryBlock);
+    findAllAggregationExprFromSelect(queryBlock);
+
+    // 3. parse the select list to expression
+    parseExprInSelectList(queryBlock, selectItemNames, new SQLExprToExpressionConverter(context));
+  }
+
+  public List<SQLSelectItem> selectItemList() {
+    List<SQLSelectItem> sqlSelectItems = new ArrayList<>();
+    context
+        .getGroupKeyExprMap()
+        .entrySet()
+        .forEach(
+            entry ->
+                sqlSelectItems.add(
+                    new SQLSelectItem(
+                        entry.getKey(), entry.getValue().getExpression().toString())));
+    context
+        .getAggregationExprMap()
+        .entrySet()
+        .forEach(
+            entry ->
+                sqlSelectItems.add(
+                    new SQLSelectItem(
+                        entry.getKey(), entry.getValue().getExpression().toString())));
+    return sqlSelectItems;
+  }
+
+  private Map<SQLExpr, String> constructSQLExprAliasMapFromSelect(
+      MySqlSelectQueryBlock queryBlock) {
+    return queryBlock.getSelectList().stream()
+        .filter(item -> !Strings.isNullOrEmpty(item.getAlias()))
+        .collect(Collectors.toMap(SQLSelectItem::getExpr, SQLSelectItem::getAlias));
+  }
+
+  /**
+   * The SQL-92 require nonaggregated name column in the select list must appear in the GROUP BY,
+   * But the existing uses cases violate this require. e.g. AggregationIT. countGroupByDateTest Ref
+   * the https://dev.mysql.com/doc/refman/8.0/en/group-by-handling.html for detail information
+   */
+  private void findAllGroupKeyExprFromGroupByAndSelect(MySqlSelectQueryBlock queryBlock) {
+    if (queryBlock.getGroupBy() == null) {
+      return;
     }
-
-    private Map<SQLExpr, String> constructSQLExprAliasMapFromSelect(MySqlSelectQueryBlock queryBlock) {
-        return queryBlock.getSelectList().stream().filter(item -> !Strings.isNullOrEmpty(item.getAlias()))
-                .collect(Collectors.toMap(SQLSelectItem::getExpr, SQLSelectItem::getAlias));
-    }
-
-    /**
-     * The SQL-92 require nonaggregated name column in the select list must appear in the GROUP BY, But the
-     * existing uses cases violate this require. e.g. AggregationIT. countGroupByDateTest
-     * Ref the https://dev.mysql.com/doc/refman/8.0/en/group-by-handling.html for detail information
-     */
-    private void findAllGroupKeyExprFromGroupByAndSelect(MySqlSelectQueryBlock queryBlock) {
-        if (queryBlock.getGroupBy() == null) {
-            return;
-        }
-        // 1. fetch the expr from groupby clause.
-        List<SQLExpr> groupByKeyExprList =
-                queryBlock.getGroupBy().getItems().stream().map(item -> ((MySqlSelectGroupByExpr) item).getExpr())
-                        .collect(Collectors.toList());
-
-        // 2. find the group expr from select.
-        for (SQLSelectItem selectItem : queryBlock.getSelectList()) {
-            SQLExpr selectItemExpr = selectItem.getExpr();
-            // extension, group key in select could not in group by.
-            if (selectItemExpr instanceof SQLIdentifierExpr) {
-                context.addGroupKeyExpr(selectItemExpr);
-            } else {
-                for (SQLExpr groupByExpr : groupByKeyExprList) {
-                    // SQL-92,nonaggregated name column in the select list must appear in the GROUP BY
-                    if (compareSelectExprAndGroupByExpr(selectItemExpr, selectItem.getAlias(), groupByExpr)) {
-                        context.addGroupKeyExpr(selectItemExpr);
-                    } else if (groupByExpr instanceof SQLIdentifierExpr) {
-                        // support expression over group key, e.g. SELECT log(G), max(A) FROM T GROUP BY G.
-                        String groupByName = ((SQLIdentifierExpr) groupByExpr).getName();
-                        selectItemExpr.accept(new MySqlASTVisitorAdapter() {
-                            @Override
-                            public boolean visit(SQLAggregateExpr x) {
-                                return false;
-                            }
-
-                            @Override
-                            public boolean visit(SQLIdentifierExpr expr) {
-                                if (groupByName.equalsIgnoreCase(expr.getName())) {
-                                    expr.setParent(selectItem.getParent());
-                                    context.addGroupKeyExpr(expr);
-                                }
-                                return false;
-                            }
-                        });
+    // 1. fetch the expr from groupby clause.
+    List<SQLExpr> groupByKeyExprList =
+        queryBlock.getGroupBy().getItems().stream()
+            .map(item -> ((MySqlSelectGroupByExpr) item).getExpr())
+            .collect(Collectors.toList());
+
+    // 2. find the group expr from select.
+    for (SQLSelectItem selectItem : queryBlock.getSelectList()) {
+      SQLExpr selectItemExpr = selectItem.getExpr();
+      // extension, group key in select could not in group by.
+      if (selectItemExpr instanceof SQLIdentifierExpr) {
+        context.addGroupKeyExpr(selectItemExpr);
+      } else {
+        for (SQLExpr groupByExpr : groupByKeyExprList) {
+          // SQL-92,nonaggregated name column in the select list must appear in the GROUP BY
+          if (compareSelectExprAndGroupByExpr(selectItemExpr, selectItem.getAlias(), groupByExpr)) {
+            context.addGroupKeyExpr(selectItemExpr);
+          } else if (groupByExpr instanceof SQLIdentifierExpr) {
+            // support expression over group key, e.g. SELECT log(G), max(A) FROM T GROUP BY G.
+            String groupByName = ((SQLIdentifierExpr) groupByExpr).getName();
+            selectItemExpr.accept(
+                new MySqlASTVisitorAdapter() {
+                  @Override
+                  public boolean visit(SQLAggregateExpr x) {
+                    return false;
+                  }
+
+                  @Override
+                  public boolean visit(SQLIdentifierExpr expr) {
+                    if (groupByName.equalsIgnoreCase(expr.getName())) {
+                      expr.setParent(selectItem.getParent());
+                      context.addGroupKeyExpr(expr);
                     }
-                }
-            }
+                    return false;
+                  }
+                });
+          }
         }
+      }
+    }
+  }
+
+  private boolean compareSelectExprAndGroupByExpr(
+      SQLExpr selectItemExpr, String alias, SQLExpr groupByExpr) {
+    if (groupByExpr.equals(selectItemExpr)) {
+      return true;
+    } else if (groupByExpr instanceof SQLIdentifierExpr
+        && ((SQLIdentifierExpr) groupByExpr).getName().equalsIgnoreCase(alias)) {
+      return true;
     }
+    return false;
+  }
+
+  private void findAllAggregationExprFromSelect(MySqlSelectQueryBlock queryBlock) {
+    queryBlock
+        .getSelectList()
+        .forEach(
+            selectItem ->
+                selectItem.accept(
+                    new MySqlASTVisitorAdapter() {
+                      @Override
+                      public boolean visit(SQLAggregateExpr expr) {
+                        context.addAggregationExpr(expr);
+                        return true;
+                      }
+                    }));
+  }
+
+  private void parseExprInSelectList(
+      MySqlSelectQueryBlock queryBlock,
+      List<String> selectItemNames,
+      SQLExprToExpressionConverter exprConverter) {
+    List<SQLSelectItem> selectItems = queryBlock.getSelectList();
+    for (int i = 0; i < selectItems.size(); i++) {
+      Expression expression = exprConverter.convert(selectItems.get(i).getExpr());
+      ColumnNode columnNode =
+          ColumnNode.builder()
+              .name(selectItemNames.get(i))
+              .alias(selectItems.get(i).getAlias())
+              .type(columnTypeProvider.get(i))
+              .expr(expression)
+              .build();
+      columnNodes.add(columnNode);
+    }
+  }
 
-    private boolean compareSelectExprAndGroupByExpr(SQLExpr selectItemExpr, String alias, SQLExpr groupByExpr) {
-        if (groupByExpr.equals(selectItemExpr)) {
+  private List<String> extractSelectItemNames(List<SQLSelectItem> selectItems) {
+    List<String> selectItemNames = new ArrayList<>();
+    for (SQLSelectItem selectItem : selectItems) {
+      selectItemNames.add(nameOfSelectItem(selectItem));
+    }
+    return selectItemNames;
+  }
+
+  private void rewriteFunctionNameToLowerCase(MySqlSelectQueryBlock query) {
+    query.accept(
+        new MySqlASTVisitorAdapter() {
+          @Override
+          public boolean visit(SQLMethodInvokeExpr x) {
+            x.setMethodName(x.getMethodName().toLowerCase());
             return true;
-        } else if (groupByExpr instanceof SQLIdentifierExpr
-                   && ((SQLIdentifierExpr) groupByExpr).getName().equalsIgnoreCase(alias)) {
-                return true;
-        }
-        return false;
+          }
+        });
+  }
+
+  private String nameOfSelectItem(SQLSelectItem selectItem) {
+    return Strings.isNullOrEmpty(selectItem.getAlias())
+        ? Context.nameOfExpr(selectItem.getExpr())
+        : selectItem.getAlias();
+  }
+
+  @RequiredArgsConstructor
+  public static class Context {
+    private final AliasGenerator aliasGenerator = new AliasGenerator();
+
+    private final Map<SQLExpr, String> selectSQLExprAliasMap;
+
+    @Getter private final Map<SQLExpr, GroupKeyExpr> groupKeyExprMap = new LinkedHashMap<>();
+    @Getter private final Map<SQLExpr, AggregationExpr> aggregationExprMap = new LinkedHashMap<>();
+
+    Optional<Expression> resolve(SQLExpr expr) {
+      if (groupKeyExprMap.containsKey(expr)) {
+        return Optional.of(groupKeyExprMap.get(expr).getExpression());
+      } else if (aggregationExprMap.containsKey(expr)) {
+        return Optional.of(aggregationExprMap.get(expr).getExpression());
+      } else {
+        return Optional.empty();
+      }
     }
 
-    private void findAllAggregationExprFromSelect(MySqlSelectQueryBlock queryBlock) {
-        queryBlock.getSelectList().forEach(selectItem -> selectItem.accept(new MySqlASTVisitorAdapter() {
-            @Override
-            public boolean visit(SQLAggregateExpr expr) {
-                context.addAggregationExpr(expr);
-                return true;
-            }
-        }));
+    public void addGroupKeyExpr(SQLExpr groupKeyExpr) {
+      if (!groupKeyExprMap.containsKey(groupKeyExpr)) {
+        groupKeyExprMap.put(groupKeyExpr, new GroupKeyExpr(groupKeyExpr));
+      }
     }
 
-    private void parseExprInSelectList(
-            MySqlSelectQueryBlock queryBlock, List<String> selectItemNames,
-            SQLExprToExpressionConverter exprConverter) {
-        List<SQLSelectItem> selectItems = queryBlock.getSelectList();
-        for (int i = 0; i < selectItems.size(); i++) {
-            Expression expression = exprConverter.convert(selectItems.get(i).getExpr());
-            ColumnNode columnNode = ColumnNode.builder()
-                    .name(selectItemNames.get(i))
-                    .alias(selectItems.get(i).getAlias())
-                    .type(columnTypeProvider.get(i))
-                    .expr(expression)
-                    .build();
-            columnNodes.add(columnNode);
-        }
+    public void addAggregationExpr(SQLAggregateExpr aggregationExpr) {
+      if (!aggregationExprMap.containsKey(aggregationExpr)) {
+        aggregationExprMap.put(aggregationExpr, new AggregationExpr(aggregationExpr));
+      }
     }
 
-    private List<String> extractSelectItemNames(List<SQLSelectItem> selectItems) {
-        List<String> selectItemNames = new ArrayList<>();
-        for (SQLSelectItem selectItem: selectItems){
-            selectItemNames.add(nameOfSelectItem(selectItem));
+    @Getter
+    public class GroupKeyExpr {
+      private final SQLExpr expr;
+      private final Expression expression;
+
+      public GroupKeyExpr(SQLExpr expr) {
+        this.expr = expr;
+        String exprName = nameOfExpr(expr).replace(".", "#");
+        if (expr instanceof SQLIdentifierExpr
+            && selectSQLExprAliasMap.values().contains(((SQLIdentifierExpr) expr).getName())) {
+          exprName = ((SQLIdentifierExpr) expr).getName();
         }
-        return selectItemNames;
+        this.expression = ExpressionFactory.ref(selectSQLExprAliasMap.getOrDefault(expr, exprName));
+      }
     }
 
-    private void rewriteFunctionNameToLowerCase(MySqlSelectQueryBlock query) {
-        query.accept(new MySqlASTVisitorAdapter() {
-            @Override
-            public boolean visit(SQLMethodInvokeExpr x) {
-                x.setMethodName(x.getMethodName().toLowerCase());
-                return true;
-            }
-        });
+    @Getter
+    public class AggregationExpr {
+      private final SQLAggregateExpr expr;
+      private final Expression expression;
+
+      public AggregationExpr(SQLAggregateExpr expr) {
+        this.expr = expr;
+        this.expression =
+            ExpressionFactory.ref(
+                selectSQLExprAliasMap.getOrDefault(
+                    expr, aliasGenerator.nextAlias(expr.getMethodName())));
+      }
     }
 
-    private String nameOfSelectItem(SQLSelectItem selectItem) {
-        return Strings.isNullOrEmpty(selectItem.getAlias()) ? Context
-                .nameOfExpr(selectItem.getExpr()) : selectItem.getAlias();
+    public static String nameOfExpr(SQLExpr expr) {
+      String exprName = expr.toString().toLowerCase();
+      if (expr instanceof SQLAggregateExpr) {
+        SQLAggregateExpr aggExpr = (SQLAggregateExpr) expr;
+        SQLAggregateOption option = aggExpr.getOption();
+        exprName =
+            option == null
+                ? String.format("%s(%s)", aggExpr.getMethodName(), aggExpr.getArguments().get(0))
+                : String.format(
+                    "%s(%s %s)",
+                    aggExpr.getMethodName(), option.name(), aggExpr.getArguments().get(0));
+      } else if (expr instanceof SQLMethodInvokeExpr) {
+        exprName =
+            String.format(
+                "%s(%s)",
+                ((SQLMethodInvokeExpr) expr).getMethodName(),
+                nameOfExpr(((SQLMethodInvokeExpr) expr).getParameters().get(0)));
+      } else if (expr instanceof SQLIdentifierExpr) {
+        exprName = ((SQLIdentifierExpr) expr).getName();
+      } else if (expr instanceof SQLCastExpr) {
+        exprName =
+            String.format(
+                "CAST(%s AS %s)",
+                ((SQLCastExpr) expr).getExpr(), ((SQLCastExpr) expr).getDataType().getName());
+      }
+      return exprName;
     }
 
-    @RequiredArgsConstructor
-    public static class Context {
-        private final AliasGenerator aliasGenerator = new AliasGenerator();
-
-        private final Map<SQLExpr, String> selectSQLExprAliasMap;
-
-        @Getter
-        private final Map<SQLExpr, GroupKeyExpr> groupKeyExprMap = new LinkedHashMap<>();
-        @Getter
-        private final Map<SQLExpr, AggregationExpr> aggregationExprMap = new LinkedHashMap<>();
-
-        Optional<Expression> resolve(SQLExpr expr) {
-            if (groupKeyExprMap.containsKey(expr)) {
-                return Optional.of(groupKeyExprMap.get(expr).getExpression());
-            } else if (aggregationExprMap.containsKey(expr)) {
-                return Optional.of(aggregationExprMap.get(expr).getExpression());
-            } else {
-                return Optional.empty();
-            }
-        }
+    static class AliasGenerator {
+      private int aliasSuffix = 0;
 
-        public void addGroupKeyExpr(SQLExpr groupKeyExpr) {
-            if (!groupKeyExprMap.containsKey(groupKeyExpr)) {
-                groupKeyExprMap.put(groupKeyExpr, new GroupKeyExpr(groupKeyExpr));
-            }
-        }
-
-        public void addAggregationExpr(SQLAggregateExpr aggregationExpr) {
-            if (!aggregationExprMap.containsKey(aggregationExpr)) {
-                aggregationExprMap.put(aggregationExpr, new AggregationExpr(aggregationExpr));
-            }
-        }
+      private String nextAlias(String name) {
+        return String.format("%s_%d", name, next());
+      }
 
-        @Getter
-        public class GroupKeyExpr {
-            private final SQLExpr expr;
-            private final Expression expression;
-
-            public GroupKeyExpr(SQLExpr expr) {
-                this.expr = expr;
-                String exprName = nameOfExpr(expr).replace(".", "#");
-                if (expr instanceof SQLIdentifierExpr
-                    && selectSQLExprAliasMap.values().contains(((SQLIdentifierExpr) expr).getName())) {
-                    exprName = ((SQLIdentifierExpr) expr).getName();
-                }
-                this.expression = ExpressionFactory.ref(selectSQLExprAliasMap.getOrDefault(expr, exprName));
-            }
-        }
-
-        @Getter
-        public class AggregationExpr {
-            private final SQLAggregateExpr expr;
-            private final Expression expression;
-
-            public AggregationExpr(SQLAggregateExpr expr) {
-                this.expr = expr;
-                this.expression =
-                        ExpressionFactory.ref(selectSQLExprAliasMap.getOrDefault(expr, aliasGenerator
-                                .nextAlias(expr.getMethodName())));
-            }
-        }
-
-        public static String nameOfExpr(SQLExpr expr) {
-            String exprName = expr.toString().toLowerCase();
-            if (expr instanceof SQLAggregateExpr) {
-                SQLAggregateExpr aggExpr = (SQLAggregateExpr) expr;
-                SQLAggregateOption option = aggExpr.getOption();
-                exprName = option == null
-                        ? String.format("%s(%s)", aggExpr.getMethodName(), aggExpr.getArguments().get(0))
-                        : String.format("%s(%s %s)", aggExpr.getMethodName(), option.name(),
-                            aggExpr.getArguments().get(0));
-            } else if (expr instanceof SQLMethodInvokeExpr) {
-                exprName = String.format("%s(%s)", ((SQLMethodInvokeExpr) expr).getMethodName(),
-                        nameOfExpr(((SQLMethodInvokeExpr) expr).getParameters().get(0)));
-            } else if (expr instanceof SQLIdentifierExpr) {
-                exprName = ((SQLIdentifierExpr) expr).getName();
-            } else if (expr instanceof SQLCastExpr) {
-                exprName = String.format("CAST(%s AS %s)", ((SQLCastExpr) expr).getExpr(),
-                                         ((SQLCastExpr) expr).getDataType().getName());
-            }
-            return exprName;
-        }
-
-        static class AliasGenerator {
-            private int aliasSuffix = 0;
-
-            private String nextAlias(String name) {
-                return String.format("%s_%d", name, next());
-            }
-
-            private Integer next() {
-                return aliasSuffix++;
-            }
-        }
+      private Integer next() {
+        return aliasSuffix++;
+      }
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLExprToExpressionConverter.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLExprToExpressionConverter.java
index 0315fef900..800dac8426 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLExprToExpressionConverter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLExprToExpressionConverter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.converter;
 
 import static org.opensearch.sql.legacy.expression.core.ExpressionFactory.cast;
@@ -27,86 +26,86 @@
 import org.opensearch.sql.legacy.expression.core.operator.ScalarOperation;
 import org.opensearch.sql.legacy.expression.model.ExprValueFactory;
 
-/**
- * The definition of {@link SQLExpr} to {@link Expression} converter.
- */
+/** The definition of {@link SQLExpr} to {@link Expression} converter. */
 @RequiredArgsConstructor
 public class SQLExprToExpressionConverter {
-    private static final Map<SQLBinaryOperator, ScalarOperation> binaryOperatorOperationMap =
-            new ImmutableMap.Builder<SQLBinaryOperator, ScalarOperation>()
-                    .put(SQLBinaryOperator.Add, ScalarOperation.ADD)
-                    .put(SQLBinaryOperator.Subtract, ScalarOperation.SUBTRACT)
-                    .put(SQLBinaryOperator.Multiply, ScalarOperation.MULTIPLY)
-                    .put(SQLBinaryOperator.Divide, ScalarOperation.DIVIDE)
-                    .put(SQLBinaryOperator.Modulus, ScalarOperation.MODULES)
-                    .build();
-    private static final Map<String, ScalarOperation> methodOperationMap =
-            new ImmutableMap.Builder<String, ScalarOperation>()
-                    .put(ScalarOperation.ABS.getName(), ScalarOperation.ABS)
-                    .put(ScalarOperation.ACOS.getName(), ScalarOperation.ACOS)
-                    .put(ScalarOperation.ASIN.getName(), ScalarOperation.ASIN)
-                    .put(ScalarOperation.ATAN.getName(), ScalarOperation.ATAN)
-                    .put(ScalarOperation.ATAN2.getName(), ScalarOperation.ATAN2)
-                    .put(ScalarOperation.TAN.getName(), ScalarOperation.TAN)
-                    .put(ScalarOperation.CBRT.getName(), ScalarOperation.CBRT)
-                    .put(ScalarOperation.CEIL.getName(), ScalarOperation.CEIL)
-                    .put(ScalarOperation.COS.getName(), ScalarOperation.COS)
-                    .put(ScalarOperation.COSH.getName(), ScalarOperation.COSH)
-                    .put(ScalarOperation.EXP.getName(), ScalarOperation.EXP)
-                    .put(ScalarOperation.FLOOR.getName(), ScalarOperation.FLOOR)
-                    .put(ScalarOperation.LN.getName(), ScalarOperation.LN)
-                    .put(ScalarOperation.LOG.getName(), ScalarOperation.LOG)
-                    .put(ScalarOperation.LOG2.getName(), ScalarOperation.LOG2)
-                    .put(ScalarOperation.LOG10.getName(), ScalarOperation.LOG10)
-                    .build();
-
+  private static final Map<SQLBinaryOperator, ScalarOperation> binaryOperatorOperationMap =
+      new ImmutableMap.Builder<SQLBinaryOperator, ScalarOperation>()
+          .put(SQLBinaryOperator.Add, ScalarOperation.ADD)
+          .put(SQLBinaryOperator.Subtract, ScalarOperation.SUBTRACT)
+          .put(SQLBinaryOperator.Multiply, ScalarOperation.MULTIPLY)
+          .put(SQLBinaryOperator.Divide, ScalarOperation.DIVIDE)
+          .put(SQLBinaryOperator.Modulus, ScalarOperation.MODULES)
+          .build();
+  private static final Map<String, ScalarOperation> methodOperationMap =
+      new ImmutableMap.Builder<String, ScalarOperation>()
+          .put(ScalarOperation.ABS.getName(), ScalarOperation.ABS)
+          .put(ScalarOperation.ACOS.getName(), ScalarOperation.ACOS)
+          .put(ScalarOperation.ASIN.getName(), ScalarOperation.ASIN)
+          .put(ScalarOperation.ATAN.getName(), ScalarOperation.ATAN)
+          .put(ScalarOperation.ATAN2.getName(), ScalarOperation.ATAN2)
+          .put(ScalarOperation.TAN.getName(), ScalarOperation.TAN)
+          .put(ScalarOperation.CBRT.getName(), ScalarOperation.CBRT)
+          .put(ScalarOperation.CEIL.getName(), ScalarOperation.CEIL)
+          .put(ScalarOperation.COS.getName(), ScalarOperation.COS)
+          .put(ScalarOperation.COSH.getName(), ScalarOperation.COSH)
+          .put(ScalarOperation.EXP.getName(), ScalarOperation.EXP)
+          .put(ScalarOperation.FLOOR.getName(), ScalarOperation.FLOOR)
+          .put(ScalarOperation.LN.getName(), ScalarOperation.LN)
+          .put(ScalarOperation.LOG.getName(), ScalarOperation.LOG)
+          .put(ScalarOperation.LOG2.getName(), ScalarOperation.LOG2)
+          .put(ScalarOperation.LOG10.getName(), ScalarOperation.LOG10)
+          .build();
 
-    private final SQLAggregationParser.Context context;
+  private final SQLAggregationParser.Context context;
 
-    /**
-     * Convert the {@link SQLExpr} to {@link Expression}
-     *
-     * @param expr {@link SQLExpr}
-     * @return expression {@link Expression}
-     */
-    public Expression convert(SQLExpr expr) {
-        Optional<Expression> resolvedExpression = context.resolve(expr);
-        if (resolvedExpression.isPresent()) {
-            return resolvedExpression.get();
-        } else {
-            if (expr instanceof SQLBinaryOpExpr) {
-                return binaryOperatorToExpression((SQLBinaryOpExpr) expr, this::convert);
-            } else if (expr instanceof SQLMethodInvokeExpr) {
-                return methodToExpression((SQLMethodInvokeExpr) expr, this::convert);
-            } else if (expr instanceof SQLValuableExpr) {
-                return literal(ExprValueFactory.from(((SQLValuableExpr) expr).getValue()));
-            } else if (expr instanceof SQLCastExpr) {
-                return cast(convert(((SQLCastExpr) expr).getExpr()));
-            } else {
-                throw new RuntimeException("unsupported expr: " + expr);
-            }
-        }
+  /**
+   * Convert the {@link SQLExpr} to {@link Expression}
+   *
+   * @param expr {@link SQLExpr}
+   * @return expression {@link Expression}
+   */
+  public Expression convert(SQLExpr expr) {
+    Optional<Expression> resolvedExpression = context.resolve(expr);
+    if (resolvedExpression.isPresent()) {
+      return resolvedExpression.get();
+    } else {
+      if (expr instanceof SQLBinaryOpExpr) {
+        return binaryOperatorToExpression((SQLBinaryOpExpr) expr, this::convert);
+      } else if (expr instanceof SQLMethodInvokeExpr) {
+        return methodToExpression((SQLMethodInvokeExpr) expr, this::convert);
+      } else if (expr instanceof SQLValuableExpr) {
+        return literal(ExprValueFactory.from(((SQLValuableExpr) expr).getValue()));
+      } else if (expr instanceof SQLCastExpr) {
+        return cast(convert(((SQLCastExpr) expr).getExpr()));
+      } else {
+        throw new RuntimeException("unsupported expr: " + expr);
+      }
     }
+  }
 
-    private Expression binaryOperatorToExpression(SQLBinaryOpExpr expr,
-                                                  Function<SQLExpr, Expression> converter) {
-        if (binaryOperatorOperationMap.containsKey(expr.getOperator())) {
-            return ExpressionFactory.of(binaryOperatorOperationMap.get(expr.getOperator()),
-                                        Arrays.asList(converter.apply(expr.getLeft()),
-                                                      converter.apply(expr.getRight())));
-        } else {
-            throw new UnsupportedOperationException("unsupported operator: " + expr.getOperator().getName());
-        }
+  private Expression binaryOperatorToExpression(
+      SQLBinaryOpExpr expr, Function<SQLExpr, Expression> converter) {
+    if (binaryOperatorOperationMap.containsKey(expr.getOperator())) {
+      return ExpressionFactory.of(
+          binaryOperatorOperationMap.get(expr.getOperator()),
+          Arrays.asList(converter.apply(expr.getLeft()), converter.apply(expr.getRight())));
+    } else {
+      throw new UnsupportedOperationException(
+          "unsupported operator: " + expr.getOperator().getName());
     }
+  }
 
-    private Expression methodToExpression(SQLMethodInvokeExpr expr, Function<SQLExpr, Expression> converter) {
-        String methodName = expr.getMethodName().toLowerCase();
-        if (methodOperationMap.containsKey(methodName)) {
+  private Expression methodToExpression(
+      SQLMethodInvokeExpr expr, Function<SQLExpr, Expression> converter) {
+    String methodName = expr.getMethodName().toLowerCase();
+    if (methodOperationMap.containsKey(methodName)) {
 
-            return ExpressionFactory.of(methodOperationMap.get(methodName),
-                                        expr.getParameters().stream().map(converter).collect(Collectors.toList()));
-        } else {
-            throw new UnsupportedOperationException("unsupported operator: " + expr.getMethodName());
-        }
+      return ExpressionFactory.of(
+          methodOperationMap.get(methodName),
+          expr.getParameters().stream().map(converter).collect(Collectors.toList()));
+    } else {
+      throw new UnsupportedOperationException("unsupported operator: " + expr.getMethodName());
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLToOperatorConverter.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLToOperatorConverter.java
index fbaff0ba18..4d1ab58160 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLToOperatorConverter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLToOperatorConverter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.converter;
 
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
@@ -24,53 +23,49 @@
 import org.opensearch.sql.legacy.query.planner.physical.node.project.PhysicalProject;
 import org.opensearch.sql.legacy.query.planner.physical.node.scroll.PhysicalScroll;
 
-/**
- * Definition of SQL to PhysicalOperator converter.
- */
+/** Definition of SQL to PhysicalOperator converter. */
 public class SQLToOperatorConverter extends MySqlASTVisitorAdapter {
-    private static final Logger LOG = LogManager.getLogger(SQLToOperatorConverter.class);
-
-    private final Client client;
-    private final SQLAggregationParser aggregationParser;
+  private static final Logger LOG = LogManager.getLogger(SQLToOperatorConverter.class);
 
-    @Getter
-    private PhysicalOperator<BindingTuple> physicalOperator;
+  private final Client client;
+  private final SQLAggregationParser aggregationParser;
 
-    public SQLToOperatorConverter(Client client, ColumnTypeProvider columnTypeProvider) {
-        this.client = client;
-        this.aggregationParser = new SQLAggregationParser(columnTypeProvider);
-    }
+  @Getter private PhysicalOperator<BindingTuple> physicalOperator;
 
-    @Override
-    public boolean visit(MySqlSelectQueryBlock query) {
+  public SQLToOperatorConverter(Client client, ColumnTypeProvider columnTypeProvider) {
+    this.client = client;
+    this.aggregationParser = new SQLAggregationParser(columnTypeProvider);
+  }
 
-        //1. parse the aggregation
-        aggregationParser.parse(query);
+  @Override
+  public boolean visit(MySqlSelectQueryBlock query) {
 
+    // 1. parse the aggregation
+    aggregationParser.parse(query);
 
-        //2. construct the PhysicalOperator
-        physicalOperator = project(scroll(query));
-        return false;
-    }
+    // 2. construct the PhysicalOperator
+    physicalOperator = project(scroll(query));
+    return false;
+  }
 
-    /**
-     * Get list of {@link ColumnNode}.
-     *
-     * @return list of {@link ColumnNode}.
-     */
-    public List<ColumnNode> getColumnNodes() {
-        return aggregationParser.getColumnNodes();
-    }
+  /**
+   * Get list of {@link ColumnNode}.
+   *
+   * @return list of {@link ColumnNode}.
+   */
+  public List<ColumnNode> getColumnNodes() {
+    return aggregationParser.getColumnNodes();
+  }
 
-    private PhysicalOperator<BindingTuple> project(PhysicalOperator<BindingTuple> input) {
-        return new PhysicalProject(input, aggregationParser.getColumnNodes());
-    }
+  private PhysicalOperator<BindingTuple> project(PhysicalOperator<BindingTuple> input) {
+    return new PhysicalProject(input, aggregationParser.getColumnNodes());
+  }
 
-    @SneakyThrows
-    private PhysicalOperator<BindingTuple> scroll(MySqlSelectQueryBlock query) {
-        query.getSelectList().clear();
-        query.getSelectList().addAll(aggregationParser.selectItemList());
-        Select select = new SqlParser().parseSelect(query);
-        return new PhysicalScroll(new AggregationQueryAction(client, select));
-    }
+  @SneakyThrows
+  private PhysicalOperator<BindingTuple> scroll(MySqlSelectQueryBlock query) {
+    query.getSelectList().clear();
+    query.getSelectList().addAll(aggregationParser.selectItemList());
+    Select select = new SqlParser().parseSelect(query);
+    return new PhysicalScroll(new AggregationQueryAction(client, select));
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/BindingTupleQueryPlanner.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/BindingTupleQueryPlanner.java
index 01a0e78484..a8fb7cc53c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/BindingTupleQueryPlanner.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/BindingTupleQueryPlanner.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.core;
 
 import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
@@ -17,63 +16,63 @@
 import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator;
 import org.opensearch.sql.legacy.query.planner.physical.node.scroll.PhysicalScroll;
 
-/**
- * The definition of QueryPlanner which return the {@link BindingTuple} as result.
- */
+/** The definition of QueryPlanner which return the {@link BindingTuple} as result. */
 public class BindingTupleQueryPlanner {
-    private PhysicalOperator<BindingTuple> physicalOperator;
-    @Getter
-    private List<ColumnNode> columnNodes;
-
-    public BindingTupleQueryPlanner(Client client, SQLQueryExpr sqlExpr, ColumnTypeProvider columnTypeProvider) {
-        SQLToOperatorConverter converter = new SQLToOperatorConverter(client, columnTypeProvider);
-        sqlExpr.accept(converter);
-        this.physicalOperator = converter.getPhysicalOperator();
-        this.columnNodes = converter.getColumnNodes();
-    }
+  private PhysicalOperator<BindingTuple> physicalOperator;
+  @Getter private List<ColumnNode> columnNodes;
 
-    /**
-     * Execute the QueryPlanner.
-     * @return list of {@link BindingTuple}.
-     */
-    public List<BindingTuple> execute() {
-        PhysicalOperator<BindingTuple> op = physicalOperator;
-        List<BindingTuple> tuples = new ArrayList<>();
-        try {
-            op.open(null);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+  public BindingTupleQueryPlanner(
+      Client client, SQLQueryExpr sqlExpr, ColumnTypeProvider columnTypeProvider) {
+    SQLToOperatorConverter converter = new SQLToOperatorConverter(client, columnTypeProvider);
+    sqlExpr.accept(converter);
+    this.physicalOperator = converter.getPhysicalOperator();
+    this.columnNodes = converter.getColumnNodes();
+  }
 
-        while (op.hasNext()) {
-            tuples.add(op.next().data());
-        }
-        return tuples;
+  /**
+   * Execute the QueryPlanner.
+   *
+   * @return list of {@link BindingTuple}.
+   */
+  public List<BindingTuple> execute() {
+    PhysicalOperator<BindingTuple> op = physicalOperator;
+    List<BindingTuple> tuples = new ArrayList<>();
+    try {
+      op.open(null);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
     }
 
-    /**
-     * Explain the physical execution plan.
-     * @return execution plan.
-     */
-    public String explain() {
-        Explanation explanation = new Explanation();
-        physicalOperator.accept(explanation);
-        return explanation.explain();
+    while (op.hasNext()) {
+      tuples.add(op.next().data());
     }
+    return tuples;
+  }
+
+  /**
+   * Explain the physical execution plan.
+   *
+   * @return execution plan.
+   */
+  public String explain() {
+    Explanation explanation = new Explanation();
+    physicalOperator.accept(explanation);
+    return explanation.explain();
+  }
 
-    private static class Explanation implements PlanNode.Visitor {
-        private String explain;
+  private static class Explanation implements PlanNode.Visitor {
+    private String explain;
 
-        public String explain() {
-            return explain;
-        }
+    public String explain() {
+      return explain;
+    }
 
-        @Override
-        public boolean visit(PlanNode planNode) {
-            if (planNode instanceof PhysicalScroll) {
-                explain = planNode.toString();
-            }
-            return true;
-        }
+    @Override
+    public boolean visit(PlanNode planNode) {
+      if (planNode instanceof PhysicalScroll) {
+        explain = planNode.toString();
+      }
+      return true;
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/ColumnNode.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/ColumnNode.java
index 753d5ac001..9dd969fb83 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/ColumnNode.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/ColumnNode.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.core;
 
 import com.google.common.base.Strings;
@@ -14,20 +13,18 @@
 import org.opensearch.sql.legacy.executor.format.Schema;
 import org.opensearch.sql.legacy.expression.core.Expression;
 
-/**
- * The definition of column node.
- */
+/** The definition of column node. */
 @Builder
 @Setter
 @Getter
 @ToString
 public class ColumnNode {
-    private String name;
-    private String alias;
-    private Schema.Type type;
-    private Expression expr;
+  private String name;
+  private String alias;
+  private Schema.Type type;
+  private Expression expr;
 
-    public String columnName() {
-        return Strings.isNullOrEmpty(alias) ? name : alias;
-    }
+  public String columnName() {
+    return Strings.isNullOrEmpty(alias) ? name : alias;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/Config.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/Config.java
index 6e04c674cb..304a16756b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/Config.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/Config.java
@@ -3,156 +3,134 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.core;
 
 import org.opensearch.sql.legacy.query.planner.resource.blocksize.AdaptiveBlockSize;
 import org.opensearch.sql.legacy.query.planner.resource.blocksize.BlockSize;
 import org.opensearch.sql.legacy.query.planner.resource.blocksize.BlockSize.FixedBlockSize;
 
-/**
- * Query planner configuration
- */
+/** Query planner configuration */
 public class Config {
 
-    public static final int DEFAULT_BLOCK_SIZE = 10000;
-    public static final int DEFAULT_SCROLL_PAGE_SIZE = 10000;
-    public static final int DEFAULT_CIRCUIT_BREAK_LIMIT = 85;
-    public static final double[] DEFAULT_BACK_OFF_RETRY_INTERVALS = {4, 8 + 4, 16 + 4};
-    public static final int DEFAULT_TIME_OUT = 60;
-
-    /**
-     * Block size for join algorithm
-     */
-    private BlockSize blockSize = new FixedBlockSize(DEFAULT_BLOCK_SIZE);
-
-    /**
-     * Page size for scroll on each index
-     */
-    private Integer[] scrollPageSizes = {DEFAULT_SCROLL_PAGE_SIZE, DEFAULT_SCROLL_PAGE_SIZE};
-
-    /**
-     * Circuit breaker trigger limit (percentage)
-     */
-    private Integer circuitBreakLimit = DEFAULT_CIRCUIT_BREAK_LIMIT;
-
-    /**
-     * Intervals for back off retry
-     */
-    private double[] backOffRetryIntervals = DEFAULT_BACK_OFF_RETRY_INTERVALS;
-
-    /**
-     * Total number of rows in final result specified by LIMIT
-     */
-    private int totalLimit;
-
-    /**
-     * Number of rows fetched from each table specified by JOIN_TABLES_LIMIT hint
-     */
-    private int tableLimit1;
-    private int tableLimit2;
-
-    /**
-     * Push down column values in ON of first table to query against second table
-     */
-    private boolean isUseTermsFilterOptimization = false;
-
-    /**
-     * Total time out (seconds) for the execution
-     */
-    private int timeout = DEFAULT_TIME_OUT;
-
-
-    public BlockSize blockSize() {
-        return blockSize;
-    }
+  public static final int DEFAULT_BLOCK_SIZE = 10000;
+  public static final int DEFAULT_SCROLL_PAGE_SIZE = 10000;
+  public static final int DEFAULT_CIRCUIT_BREAK_LIMIT = 85;
+  public static final double[] DEFAULT_BACK_OFF_RETRY_INTERVALS = {4, 8 + 4, 16 + 4};
+  public static final int DEFAULT_TIME_OUT = 60;
 
-    public void configureBlockSize(Object[] params) {
-        if (params.length > 0) {
-            Integer size = (Integer) params[0];
-            if (size > 0) {
-                blockSize = new FixedBlockSize(size);
-            } else {
-                blockSize = new AdaptiveBlockSize(0);
-            }
-        }
-    }
+  /** Block size for join algorithm */
+  private BlockSize blockSize = new FixedBlockSize(DEFAULT_BLOCK_SIZE);
 
-    public Integer[] scrollPageSize() {
-        return scrollPageSizes;
-    }
+  /** Page size for scroll on each index */
+  private Integer[] scrollPageSizes = {DEFAULT_SCROLL_PAGE_SIZE, DEFAULT_SCROLL_PAGE_SIZE};
 
-    public void configureScrollPageSize(Object[] params) {
-        if (params.length == 1) {
-            scrollPageSizes = new Integer[]{
-                    (Integer) params[0],
-                    (Integer) params[0]
-            };
-        } else if (params.length >= 2) {
-            scrollPageSizes = (Integer[]) params;
-        }
-    }
+  /** Circuit breaker trigger limit (percentage) */
+  private Integer circuitBreakLimit = DEFAULT_CIRCUIT_BREAK_LIMIT;
 
-    public int circuitBreakLimit() {
-        return circuitBreakLimit;
-    }
+  /** Intervals for back off retry */
+  private double[] backOffRetryIntervals = DEFAULT_BACK_OFF_RETRY_INTERVALS;
 
-    public void configureCircuitBreakLimit(Object[] params) {
-        if (params.length > 0) {
-            circuitBreakLimit = (Integer) params[0];
-        }
-    }
+  /** Total number of rows in final result specified by LIMIT */
+  private int totalLimit;
 
-    public double[] backOffRetryIntervals() {
-        return backOffRetryIntervals;
-    }
+  /** Number of rows fetched from each table specified by JOIN_TABLES_LIMIT hint */
+  private int tableLimit1;
 
-    public void configureBackOffRetryIntervals(Object[] params) {
-        backOffRetryIntervals = new double[params.length];
-        for (int i = 0; i < params.length; i++) {
-            backOffRetryIntervals[i] = (Integer) params[i]; //Only support integer interval for now
-        }
-    }
+  private int tableLimit2;
 
-    public void configureLimit(Integer totalLimit, Integer tableLimit1, Integer tableLimit2) {
-        if (totalLimit != null) {
-            this.totalLimit = totalLimit;
-        }
-        if (tableLimit1 != null) {
-            this.tableLimit1 = tableLimit1;
-        }
-        if (tableLimit2 != null) {
-            this.tableLimit2 = tableLimit2;
-        }
-    }
+  /** Push down column values in ON of first table to query against second table */
+  private boolean isUseTermsFilterOptimization = false;
 
-    public int totalLimit() {
-        return totalLimit;
-    }
+  /** Total time out (seconds) for the execution */
+  private int timeout = DEFAULT_TIME_OUT;
 
-    public int tableLimit1() {
-        return tableLimit1;
+  public BlockSize blockSize() {
+    return blockSize;
+  }
+
+  public void configureBlockSize(Object[] params) {
+    if (params.length > 0) {
+      Integer size = (Integer) params[0];
+      if (size > 0) {
+        blockSize = new FixedBlockSize(size);
+      } else {
+        blockSize = new AdaptiveBlockSize(0);
+      }
     }
+  }
+
+  public Integer[] scrollPageSize() {
+    return scrollPageSizes;
+  }
 
-    public int tableLimit2() {
-        return tableLimit2;
+  public void configureScrollPageSize(Object[] params) {
+    if (params.length == 1) {
+      scrollPageSizes = new Integer[] {(Integer) params[0], (Integer) params[0]};
+    } else if (params.length >= 2) {
+      scrollPageSizes = (Integer[]) params;
     }
+  }
+
+  public int circuitBreakLimit() {
+    return circuitBreakLimit;
+  }
 
-    public void configureTermsFilterOptimization(boolean isUseTermFiltersOptimization) {
-        this.isUseTermsFilterOptimization = isUseTermFiltersOptimization;
+  public void configureCircuitBreakLimit(Object[] params) {
+    if (params.length > 0) {
+      circuitBreakLimit = (Integer) params[0];
     }
+  }
 
-    public boolean isUseTermsFilterOptimization() {
-        return isUseTermsFilterOptimization;
+  public double[] backOffRetryIntervals() {
+    return backOffRetryIntervals;
+  }
+
+  public void configureBackOffRetryIntervals(Object[] params) {
+    backOffRetryIntervals = new double[params.length];
+    for (int i = 0; i < params.length; i++) {
+      backOffRetryIntervals[i] = (Integer) params[i]; // Only support integer interval for now
     }
+  }
 
-    public void configureTimeOut(Object[] params) {
-        if (params.length > 0) {
-            timeout = (Integer) params[0];
-        }
+  public void configureLimit(Integer totalLimit, Integer tableLimit1, Integer tableLimit2) {
+    if (totalLimit != null) {
+      this.totalLimit = totalLimit;
+    }
+    if (tableLimit1 != null) {
+      this.tableLimit1 = tableLimit1;
+    }
+    if (tableLimit2 != null) {
+      this.tableLimit2 = tableLimit2;
     }
+  }
 
-    public int timeout() {
-        return timeout;
+  public int totalLimit() {
+    return totalLimit;
+  }
+
+  public int tableLimit1() {
+    return tableLimit1;
+  }
+
+  public int tableLimit2() {
+    return tableLimit2;
+  }
+
+  public void configureTermsFilterOptimization(boolean isUseTermFiltersOptimization) {
+    this.isUseTermsFilterOptimization = isUseTermFiltersOptimization;
+  }
+
+  public boolean isUseTermsFilterOptimization() {
+    return isUseTermsFilterOptimization;
+  }
+
+  public void configureTimeOut(Object[] params) {
+    if (params.length > 0) {
+      timeout = (Integer) params[0];
     }
+  }
+
+  public int timeout() {
+    return timeout;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/ExecuteParams.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/ExecuteParams.java
index dcb3c3b727..c5ed48a514 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/ExecuteParams.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/ExecuteParams.java
@@ -3,32 +3,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.core;
 
 import java.util.EnumMap;
 
-/**
- * Parameters needed for physical operator execution.
- */
+/** Parameters needed for physical operator execution. */
 public class ExecuteParams {
 
-    /**
-     * Mapping from type to parameters
-     */
-    private EnumMap<ExecuteParamType, Object> params = new EnumMap<>(ExecuteParamType.class);
-
-    public <T> void add(ExecuteParamType type, T param) {
-        params.put(type, param);
-    }
+  /** Mapping from type to parameters */
+  private EnumMap<ExecuteParamType, Object> params = new EnumMap<>(ExecuteParamType.class);
 
-    @SuppressWarnings("unchecked")
-    public <T> T get(ExecuteParamType type) {
-        return (T) params.get(type);
-    }
+  public <T> void add(ExecuteParamType type, T param) {
+    params.put(type, param);
+  }
 
-    public enum ExecuteParamType {
-        CLIENT, RESOURCE_MANAGER, EXTRA_QUERY_FILTER, TIMEOUT
-    }
+  @SuppressWarnings("unchecked")
+  public <T> T get(ExecuteParamType type) {
+    return (T) params.get(type);
+  }
 
+  public enum ExecuteParamType {
+    CLIENT,
+    RESOURCE_MANAGER,
+    EXTRA_QUERY_FILTER,
+    TIMEOUT
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/Plan.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/Plan.java
index f163e61f0e..328bb9451f 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/Plan.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/Plan.java
@@ -3,26 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.core;
 
 import org.opensearch.sql.legacy.query.planner.core.PlanNode.Visitor;
 
-/**
- * Query plan
- */
+/** Query plan */
 public interface Plan {
 
-    /**
-     * Explain current query plan by visitor
-     *
-     * @param explanation visitor to explain the plan
-     */
-    void traverse(Visitor explanation);
-
-    /**
-     * Optimize current query plan to get the optimal one
-     */
-    void optimize();
+  /**
+   * Explain current query plan by visitor
+   *
+   * @param explanation visitor to explain the plan
+   */
+  void traverse(Visitor explanation);
 
+  /** Optimize current query plan to get the optimal one */
+  void optimize();
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/PlanNode.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/PlanNode.java
index ad421f82a4..b30ec9d3d9 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/PlanNode.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/PlanNode.java
@@ -3,54 +3,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.core;
 
-/**
- * Abstract plan node in query plan.
- */
+/** Abstract plan node in query plan. */
 public interface PlanNode {
 
-    /**
-     * All child nodes of current node used for traversal.
-     *
-     * @return all children
-     */
-    PlanNode[] children();
+  /**
+   * All child nodes of current node used for traversal.
+   *
+   * @return all children
+   */
+  PlanNode[] children();
+
+  /**
+   * Accept a visitor and traverse the plan tree with it.
+   *
+   * @param visitor plan node visitor
+   */
+  default void accept(Visitor visitor) {
+    if (visitor.visit(this)) {
+      for (PlanNode node : children()) {
+        node.accept(visitor);
+      }
+    }
+    visitor.endVisit(this);
+  }
+
+  /** Plan node visitor. */
+  interface Visitor {
 
     /**
-     * Accept a visitor and traverse the plan tree with it.
+     * To avoid listing all subclasses of PlanNode here, we dispatch manually in concrete visitor.
      *
-     * @param visitor plan node visitor
+     * @param op plan node being visited
      */
-    default void accept(Visitor visitor) {
-        if (visitor.visit(this)) {
-            for (PlanNode node : children()) {
-                node.accept(visitor);
-            }
-        }
-        visitor.endVisit(this);
-    }
+    boolean visit(PlanNode op);
 
     /**
-     * Plan node visitor.
+     * Re-visit current node before return to parent node
+     *
+     * @param op plan node finished visit
      */
-    interface Visitor {
-
-        /**
-         * To avoid listing all subclasses of PlanNode here, we dispatch manually in concrete visitor.
-         *
-         * @param op plan node being visited
-         */
-        boolean visit(PlanNode op);
-
-        /**
-         * Re-visit current node before return to parent node
-         *
-         * @param op plan node finished visit
-         */
-        default void endVisit(PlanNode op) {
-        }
-    }
-
+    default void endVisit(PlanNode op) {}
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryParams.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryParams.java
index 2cb835da94..f5e2a3fcd6 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryParams.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryParams.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.core;
 
 import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
@@ -12,70 +11,63 @@
 import org.opensearch.sql.legacy.domain.Field;
 import org.opensearch.sql.legacy.query.join.TableInJoinRequestBuilder;
 
-/**
- * All parameters required by QueryPlanner
- */
+/** All parameters required by QueryPlanner */
 public class QueryParams {
 
-    /**
-     * Request builder for first table
-     */
-    private final TableInJoinRequestBuilder request1;
-
-    /**
-     * Request builder for second table
-     */
-    private final TableInJoinRequestBuilder request2;
+  /** Request builder for first table */
+  private final TableInJoinRequestBuilder request1;
 
-    /**
-     * Join type, ex. inner join, left join
-     */
-    private final SQLJoinTableSource.JoinType joinType;
+  /** Request builder for second table */
+  private final TableInJoinRequestBuilder request2;
 
-    /**
-     * Join conditions in ON clause grouped by OR.
-     * For example, "ON (a.name = b.id AND a.age = b.age) OR a.location = b.address"
-     * => list: [
-     * [ (a.name, b.id), (a.age, b.age) ],
-     * [ (a.location, b.address) ]
-     * ]
-     */
-    private final List<List<Map.Entry<Field, Field>>> joinConditions;
+  /** Join type, ex. inner join, left join */
+  private final SQLJoinTableSource.JoinType joinType;
 
+  /**
+   * Join conditions in ON clause grouped by OR. For example, "ON (a.name = b.id AND a.age = b.age)
+   * OR a.location = b.address" => list: [ [ (a.name, b.id), (a.age, b.age) ], [ (a.location,
+   * b.address) ] ]
+   */
+  private final List<List<Map.Entry<Field, Field>>> joinConditions;
 
-    public QueryParams(TableInJoinRequestBuilder request1,
-                       TableInJoinRequestBuilder request2,
-                       SQLJoinTableSource.JoinType joinType,
-                       List<List<Map.Entry<Field, Field>>> t1ToT2FieldsComparison) {
-        this.request1 = request1;
-        this.request2 = request2;
-        this.joinType = joinType;
-        this.joinConditions = t1ToT2FieldsComparison;
-    }
+  public QueryParams(
+      TableInJoinRequestBuilder request1,
+      TableInJoinRequestBuilder request2,
+      SQLJoinTableSource.JoinType joinType,
+      List<List<Map.Entry<Field, Field>>> t1ToT2FieldsComparison) {
+    this.request1 = request1;
+    this.request2 = request2;
+    this.joinType = joinType;
+    this.joinConditions = t1ToT2FieldsComparison;
+  }
 
-    public TableInJoinRequestBuilder firstRequest() {
-        return request1;
-    }
+  public TableInJoinRequestBuilder firstRequest() {
+    return request1;
+  }
 
-    public TableInJoinRequestBuilder secondRequest() {
-        return request2;
-    }
+  public TableInJoinRequestBuilder secondRequest() {
+    return request2;
+  }
 
-    public SQLJoinTableSource.JoinType joinType() {
-        return joinType;
-    }
+  public SQLJoinTableSource.JoinType joinType() {
+    return joinType;
+  }
 
-    public List<List<Map.Entry<Field, Field>>> joinConditions() {
-        return joinConditions;
-    }
+  public List<List<Map.Entry<Field, Field>>> joinConditions() {
+    return joinConditions;
+  }
 
-    @Override
-    public String toString() {
-        return "QueryParams{"
-                + "request1=" + request1
-                + ", request2=" + request2
-                + ", joinType=" + joinType
-                + ", joinConditions=" + joinConditions
-                + '}';
-    }
+  @Override
+  public String toString() {
+    return "QueryParams{"
+        + "request1="
+        + request1
+        + ", request2="
+        + request2
+        + ", joinType="
+        + joinType
+        + ", joinConditions="
+        + joinConditions
+        + '}';
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryPlanner.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryPlanner.java
index 56acfa5d0c..0a1c2fd24b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryPlanner.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryPlanner.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.core;
 
 import static org.opensearch.sql.legacy.query.planner.core.ExecuteParams.ExecuteParamType.CLIENT;
@@ -21,89 +20,69 @@
 import org.opensearch.sql.legacy.query.planner.resource.ResourceManager;
 import org.opensearch.sql.legacy.query.planner.resource.Stats;
 
-/**
- * Query planner that driver the logical planning, physical planning, execute and explain.
- */
+/** Query planner that driver the logical planning, physical planning, execute and explain. */
 public class QueryPlanner {
 
-    /**
-     * Connection to ElasticSearch
-     */
-    private final Client client;
-
-    /**
-     * Query plan configuration
-     */
-    private final Config config;
-
-    /**
-     * Optimized logical plan
-     */
-    private final LogicalPlan logicalPlan;
-
-    /**
-     * Best physical plan to execute
-     */
-    private final PhysicalPlan physicalPlan;
-
-    /**
-     * Statistics collector
-     */
-    private Stats stats;
-
-    /**
-     * Resource monitor and statistics manager
-     */
-    private ResourceManager resourceMgr;
-
-
-    public QueryPlanner(Client client, Config config, QueryParams params) {
-        this.client = client;
-        this.config = config;
-        this.stats = new Stats(client);
-        this.resourceMgr = new ResourceManager(stats, config);
-
-        logicalPlan = new LogicalPlan(config, params);
-        logicalPlan.optimize();
-
-        physicalPlan = new PhysicalPlan(logicalPlan);
-        physicalPlan.optimize();
-    }
-
-    /**
-     * Execute query plan
-     *
-     * @return response of the execution
-     */
-    public List<SearchHit> execute() {
-        ExecuteParams params = new ExecuteParams();
-        params.add(CLIENT, client);
-        params.add(TIMEOUT, config.timeout());
-        params.add(RESOURCE_MANAGER, resourceMgr);
-        return physicalPlan.execute(params);
-    }
-
-    /**
-     * Explain query plan
-     *
-     * @return explanation string of the plan
-     */
-    public String explain() {
-        return new Explanation(
-                logicalPlan, physicalPlan,
-                new JsonExplanationFormat(4)
-        ).toString();
-    }
-
-    public MetaSearchResult getMetaResult() {
-        return resourceMgr.getMetaResult();
-    }
-
-    /**
-     * Setter for unit test
-     */
-    public void setStats(Stats stats) {
-        this.stats = stats;
-        this.resourceMgr = new ResourceManager(stats, config);
-    }
+  /** Connection to ElasticSearch */
+  private final Client client;
+
+  /** Query plan configuration */
+  private final Config config;
+
+  /** Optimized logical plan */
+  private final LogicalPlan logicalPlan;
+
+  /** Best physical plan to execute */
+  private final PhysicalPlan physicalPlan;
+
+  /** Statistics collector */
+  private Stats stats;
+
+  /** Resource monitor and statistics manager */
+  private ResourceManager resourceMgr;
+
+  public QueryPlanner(Client client, Config config, QueryParams params) {
+    this.client = client;
+    this.config = config;
+    this.stats = new Stats(client);
+    this.resourceMgr = new ResourceManager(stats, config);
+
+    logicalPlan = new LogicalPlan(config, params);
+    logicalPlan.optimize();
+
+    physicalPlan = new PhysicalPlan(logicalPlan);
+    physicalPlan.optimize();
+  }
+
+  /**
+   * Execute query plan
+   *
+   * @return response of the execution
+   */
+  public List<SearchHit> execute() {
+    ExecuteParams params = new ExecuteParams();
+    params.add(CLIENT, client);
+    params.add(TIMEOUT, config.timeout());
+    params.add(RESOURCE_MANAGER, resourceMgr);
+    return physicalPlan.execute(params);
+  }
+
+  /**
+   * Explain query plan
+   *
+   * @return explanation string of the plan
+   */
+  public String explain() {
+    return new Explanation(logicalPlan, physicalPlan, new JsonExplanationFormat(4)).toString();
+  }
+
+  public MetaSearchResult getMetaResult() {
+    return resourceMgr.getMetaResult();
+  }
+
+  /** Setter for unit test */
+  public void setStats(Stats stats) {
+    this.stats = stats;
+    this.resourceMgr = new ResourceManager(stats, config);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/Explanation.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/Explanation.java
index a22f2c5b7f..635ea3aace 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/Explanation.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/Explanation.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.explain;
 
 import com.google.common.collect.ImmutableMap;
@@ -14,87 +13,71 @@
 import org.opensearch.sql.legacy.query.planner.logical.node.Group;
 import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator;
 
-/**
- * Base class for different explanation implementation
- */
+/** Base class for different explanation implementation */
 public class Explanation implements Visitor {
 
-    /**
-     * Hard coding description to be consistent with old nested join explanation
-     */
-    private static final String DESCRIPTION =
-            "Hash Join algorithm builds hash table based on result of first query, "
-                    + "and then probes hash table to find matched rows for each row returned by second query";
-
-    /**
-     * Plans to be explained
-     */
-    private final Plan logicalPlan;
-    private final Plan physicalPlan;
-
-    /**
-     * Explanation format
-     */
-    private final ExplanationFormat format;
-
-    public Explanation(Plan logicalPlan,
-                       Plan physicalPlan,
-                       ExplanationFormat format) {
-        this.logicalPlan = logicalPlan;
-        this.physicalPlan = physicalPlan;
-        this.format = format;
-    }
+  /** Hard coding description to be consistent with old nested join explanation */
+  private static final String DESCRIPTION =
+      "Hash Join algorithm builds hash table based on result of first query, "
+          + "and then probes hash table to find matched rows for each row returned by second query";
 
-    @Override
-    public String toString() {
-        format.prepare(ImmutableMap.of("description", DESCRIPTION));
+  /** Plans to be explained */
+  private final Plan logicalPlan;
 
-        format.start("Logical Plan");
-        logicalPlan.traverse(this);
-        format.end();
+  private final Plan physicalPlan;
 
-        format.start("Physical Plan");
-        physicalPlan.traverse(this);
-        format.end();
+  /** Explanation format */
+  private final ExplanationFormat format;
 
-        return format.toString();
-    }
+  public Explanation(Plan logicalPlan, Plan physicalPlan, ExplanationFormat format) {
+    this.logicalPlan = logicalPlan;
+    this.physicalPlan = physicalPlan;
+    this.format = format;
+  }
 
-    @Override
-    public boolean visit(PlanNode node) {
-        if (isValidOp(node)) {
-            format.explain(node);
-        }
-        return true;
-    }
+  @Override
+  public String toString() {
+    format.prepare(ImmutableMap.of("description", DESCRIPTION));
 
-    @Override
-    public void endVisit(PlanNode node) {
-        if (isValidOp(node)) {
-            format.end();
-        }
-    }
+    format.start("Logical Plan");
+    logicalPlan.traverse(this);
+    format.end();
 
-    /**
-     * Check if node is a valid logical or physical operator
-     */
-    private boolean isValidOp(PlanNode node) {
-        return isValidLogical(node) || isPhysical(node);
-    }
+    format.start("Physical Plan");
+    physicalPlan.traverse(this);
+    format.end();
 
-    /**
-     * Valid logical operator means it's Group OR NOT a no-op because Group clarify explanation
-     */
-    private boolean isValidLogical(PlanNode node) {
-        return (node instanceof LogicalOperator)
-                && (node instanceof Group || !((LogicalOperator) node).isNoOp());
-    }
+    return format.toString();
+  }
 
-    /**
-     * Right now all physical operators are valid and non-no-op
-     */
-    private boolean isPhysical(PlanNode node) {
-        return node instanceof PhysicalOperator;
+  @Override
+  public boolean visit(PlanNode node) {
+    if (isValidOp(node)) {
+      format.explain(node);
     }
+    return true;
+  }
 
+  @Override
+  public void endVisit(PlanNode node) {
+    if (isValidOp(node)) {
+      format.end();
+    }
+  }
+
+  /** Check if node is a valid logical or physical operator */
+  private boolean isValidOp(PlanNode node) {
+    return isValidLogical(node) || isPhysical(node);
+  }
+
+  /** Valid logical operator means it's Group OR NOT a no-op because Group clarify explanation */
+  private boolean isValidLogical(PlanNode node) {
+    return (node instanceof LogicalOperator)
+        && (node instanceof Group || !((LogicalOperator) node).isNoOp());
+  }
+
+  /** Right now all physical operators are valid and non-no-op */
+  private boolean isPhysical(PlanNode node) {
+    return node instanceof PhysicalOperator;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/ExplanationFormat.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/ExplanationFormat.java
index 23c8bb76fe..a349666221 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/ExplanationFormat.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/ExplanationFormat.java
@@ -3,42 +3,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.explain;
 
 import java.util.Map;
 
-/**
- * Explanation format
- */
+/** Explanation format */
 public interface ExplanationFormat {
 
-    /**
-     * Initialize internal data structure
-     *
-     * @param kvs key-value pairs
-     */
-    void prepare(Map<String, String> kvs);
-
-    /**
-     * Start a new section in explanation.
-     *
-     * @param name section name
-     */
-    void start(String name);
-
-
-    /**
-     * Explain and add to current section.
-     *
-     * @param object object to be added to explanation
-     */
-    void explain(Object object);
-
-
-    /**
-     * End current section.
-     */
-    void end();
-
+  /**
+   * Initialize internal data structure
+   *
+   * @param kvs key-value pairs
+   */
+  void prepare(Map<String, String> kvs);
+
+  /**
+   * Start a new section in explanation.
+   *
+   * @param name section name
+   */
+  void start(String name);
+
+  /**
+   * Explain and add to current section.
+   *
+   * @param object object to be added to explanation
+   */
+  void explain(Object object);
+
+  /** End current section. */
+  void end();
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/JsonExplanationFormat.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/JsonExplanationFormat.java
index 404205d30b..7bf4f833de 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/JsonExplanationFormat.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/explain/JsonExplanationFormat.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.explain;
 
 import java.util.ArrayDeque;
@@ -13,89 +12,80 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-/**
- * Explain query plan in JSON format.
- */
+/** Explain query plan in JSON format. */
 public class JsonExplanationFormat implements ExplanationFormat {
 
-    /**
-     * JSONObject stack to track the path from root to current ndoe
-     */
-    private final Deque<JSONObject> jsonObjStack = new ArrayDeque<>();
-
-    /**
-     * Indentation in final output string
-     */
-    private final int indent;
-
-    public JsonExplanationFormat(int indent) {
-        this.indent = indent;
-    }
-
-    @Override
-    public void prepare(Map<String, String> kvs) {
-        jsonObjStack.push(new JSONObject(kvs));
-    }
-
-    @Override
-    public void start(String name) {
-        JSONObject json = new JSONObject();
-        jsonObjStack.peek().put(name, json);
-        jsonObjStack.push(json);
-    }
-
-    @Override
-    public void explain(Object obj) {
-        JSONObject json = new JSONObject(obj); // JSONify using getter
-        jsonifyValueIfValidJson(json);
-        appendToArrayIfExist(nodeName(obj), json);
-        jsonObjStack.push(json);
+  /** JSONObject stack to track the path from root to current ndoe */
+  private final Deque<JSONObject> jsonObjStack = new ArrayDeque<>();
+
+  /** Indentation in final output string */
+  private final int indent;
+
+  public JsonExplanationFormat(int indent) {
+    this.indent = indent;
+  }
+
+  @Override
+  public void prepare(Map<String, String> kvs) {
+    jsonObjStack.push(new JSONObject(kvs));
+  }
+
+  @Override
+  public void start(String name) {
+    JSONObject json = new JSONObject();
+    jsonObjStack.peek().put(name, json);
+    jsonObjStack.push(json);
+  }
+
+  @Override
+  public void explain(Object obj) {
+    JSONObject json = new JSONObject(obj); // JSONify using getter
+    jsonifyValueIfValidJson(json);
+    appendToArrayIfExist(nodeName(obj), json);
+    jsonObjStack.push(json);
+  }
+
+  @Override
+  public void end() {
+    jsonObjStack.pop();
+  }
+
+  @Override
+  public String toString() {
+    return jsonObjStack.pop().toString(indent);
+  }
+
+  /**
+   * Trick to parse JSON in field getter due to missing support for custom processor in org.json.
+   * And also because it's not appropriate to make getter aware of concrete format logic
+   */
+  private void jsonifyValueIfValidJson(JSONObject json) {
+    for (String key : json.keySet()) {
+      try {
+        JSONObject jsonValue = new JSONObject(json.getString(key));
+        json.put(key, jsonValue);
+      } catch (JSONException e) {
+        // Ignore value that is not a valid JSON.
+      }
     }
-
-    @Override
-    public void end() {
-        jsonObjStack.pop();
-    }
-
-    @Override
-    public String toString() {
-        return jsonObjStack.pop().toString(indent);
-    }
-
-    /**
-     * Trick to parse JSON in field getter due to missing support for custom processor
-     * in org.json. And also because it's not appropriate to make getter aware of concrete format logic
-     */
-    private void jsonifyValueIfValidJson(JSONObject json) {
-        for (String key : json.keySet()) {
-            try {
-                JSONObject jsonValue = new JSONObject(json.getString(key));
-                json.put(key, jsonValue);
-            } catch (JSONException e) {
-                // Ignore value that is not a valid JSON.
-            }
-        }
+  }
+
+  private String nodeName(Object obj) {
+    return obj.toString(); // obj.getClass().getSimpleName();
+  }
+
+  /** Replace JSONObject by JSONArray if key is duplicate */
+  private void appendToArrayIfExist(String name, JSONObject child) {
+    JSONObject parent = jsonObjStack.peek();
+    Object otherChild = parent.opt(name);
+    if (otherChild == null) {
+      parent.put(name, child);
+    } else {
+      if (!(otherChild instanceof JSONArray)) {
+        parent.remove(name);
+        parent.append(name, otherChild);
+      }
+      parent.append(name, child);
     }
-
-    private String nodeName(Object obj) {
-        return obj.toString(); //obj.getClass().getSimpleName();
-    }
-
-    /**
-     * Replace JSONObject by JSONArray if key is duplicate
-     */
-    private void appendToArrayIfExist(String name, JSONObject child) {
-        JSONObject parent = jsonObjStack.peek();
-        Object otherChild = parent.opt(name);
-        if (otherChild == null) {
-            parent.put(name, child);
-        } else {
-            if (!(otherChild instanceof JSONArray)) {
-                parent.remove(name);
-                parent.append(name, otherChild);
-            }
-            parent.append(name, child);
-        }
-    }
-
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalOperator.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalOperator.java
index 825af762f5..b814f1f563 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalOperator.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical;
 
 import java.util.Map;
@@ -11,32 +10,29 @@
 import org.opensearch.sql.legacy.query.planner.core.PlanNode;
 import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator;
 
-/**
- * Logical operator in logical plan tree.
- */
+/** Logical operator in logical plan tree. */
 public interface LogicalOperator extends PlanNode {
 
-    /**
-     * If current operator is no operation. It depends on specific internal state of operator
-     * <p>
-     * Ignore this field in explanation because all explainable operator are NOT no-op.
-     *
-     * @return true if NoOp
-     */
-    @JSONPropertyIgnore
-    default boolean isNoOp() {
-        return false;
-    }
-
-    /**
-     * Map logical operator to physical operators (possibly 1 to N mapping)
-     * <p>
-     * Note that generic type on PhysicalOperator[] would enforce all impl convert array to generic type array
-     * because generic type array is unable to be created directly.
-     *
-     * @param optimalOps optimal physical operators estimated so far
-     * @return list of physical operator
-     */
-    <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps);
+  /**
+   * If current operator is no operation. It depends on specific internal state of operator
+   *
+   * <p>Ignore this field in explanation because all explainable operator are NOT no-op.
+   *
+   * @return true if NoOp
+   */
+  @JSONPropertyIgnore
+  default boolean isNoOp() {
+    return false;
+  }
 
+  /**
+   * Map logical operator to physical operators (possibly 1 to N mapping)
+   *
+   * <p>Note that generic type on PhysicalOperator[] would enforce all impl convert array to generic
+   * type array because generic type array is unable to be created directly.
+   *
+   * @param optimalOps optimal physical operators estimated so far
+   * @return list of physical operator
+   */
+  <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps);
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalPlan.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalPlan.java
index 369da44e7f..05a797bbe0 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalPlan.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalPlan.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical;
 
 import static org.opensearch.sql.legacy.query.planner.logical.node.Project.Visitor;
@@ -32,176 +31,154 @@
 import org.opensearch.sql.legacy.query.planner.logical.rule.ProjectionPushDown;
 import org.opensearch.sql.legacy.query.planner.logical.rule.SelectionPushDown;
 
-/**
- * Logical query plan.
- */
+/** Logical query plan. */
 public class LogicalPlan implements Plan {
 
-    /**
-     * Planner configuration
-     */
-    private final Config config;
-
-    /**
-     * Parameters
-     */
-    private final QueryParams params;
-
-    /**
-     * Root node of logical query plan tree
-     */
-    private final LogicalOperator root;
-
-    /**
-     * Transformation rule
-     */
-    private final List<LogicalPlanVisitor> rules = Arrays.asList(
-            new SelectionPushDown(), //Enforce this run first to simplify Group. Avoid this order dependency in future.
-            new ProjectionPushDown()
-    );
-
-    public LogicalPlan(Config config, QueryParams params) {
-        this.config = config;
-        this.params = params;
-        this.root = buildPlanTree();
-    }
-
-    @Override
-    public void traverse(Visitor visitor) {
-        root.accept(visitor);
-    }
-
-    @Override
-    public void optimize() {
-        for (LogicalPlanVisitor rule : rules) {
-            root.accept(rule);
-        }
+  /** Planner configuration */
+  private final Config config;
+
+  /** Parameters */
+  private final QueryParams params;
+
+  /** Root node of logical query plan tree */
+  private final LogicalOperator root;
+
+  /** Transformation rule */
+  private final List<LogicalPlanVisitor> rules =
+      Arrays.asList(
+          new SelectionPushDown(), // Enforce this run first to simplify Group. Avoid this order
+          // dependency in future.
+          new ProjectionPushDown());
+
+  public LogicalPlan(Config config, QueryParams params) {
+    this.config = config;
+    this.params = params;
+    this.root = buildPlanTree();
+  }
+
+  @Override
+  public void traverse(Visitor visitor) {
+    root.accept(visitor);
+  }
+
+  @Override
+  public void optimize() {
+    for (LogicalPlanVisitor rule : rules) {
+      root.accept(rule);
     }
-
-    /**
-     * Build logical plan tree
-     */
-    private LogicalOperator buildPlanTree() {
-        return project(
-                top(
-                        sort(
-                                filter(
-                                        join(
-                                                top(
-                                                        group(params.firstRequest(), config.scrollPageSize()[0]),
-                                                        config.tableLimit1()
-                                                ),
-                                                top(
-                                                        group(params.secondRequest(), config.scrollPageSize()[1]),
-                                                        config.tableLimit2()
-                                                )
-                                        )
-                                )
-                        ), config.totalLimit()
-                )
-        );
-    }
-
-    /**
-     * Create projection operator
-     */
-    private LogicalOperator project(LogicalOperator next) {
-        Project project = new Project(next);
-        for (TableInJoinRequestBuilder req : getRequests()) {
-            if (req.getOriginalSelect().isSelectAll()) {
-                project.projectAll(req.getAlias());
-            } else {
-                project.project(req.getAlias(), req.getReturnedFields());
-            }
-        }
-        return project;
+  }
+
+  /** Build logical plan tree */
+  private LogicalOperator buildPlanTree() {
+    return project(
+        top(
+            sort(
+                filter(
+                    join(
+                        top(
+                            group(params.firstRequest(), config.scrollPageSize()[0]),
+                            config.tableLimit1()),
+                        top(
+                            group(params.secondRequest(), config.scrollPageSize()[1]),
+                            config.tableLimit2())))),
+            config.totalLimit()));
+  }
+
+  /** Create projection operator */
+  private LogicalOperator project(LogicalOperator next) {
+    Project project = new Project(next);
+    for (TableInJoinRequestBuilder req : getRequests()) {
+      if (req.getOriginalSelect().isSelectAll()) {
+        project.projectAll(req.getAlias());
+      } else {
+        project.project(req.getAlias(), req.getReturnedFields());
+      }
     }
+    return project;
+  }
 
-    private LogicalOperator top(LogicalOperator next, int limit) {
-        if (limit > 0) {
-            return new Top(next, limit);
-        }
-        return next;
+  private LogicalOperator top(LogicalOperator next, int limit) {
+    if (limit > 0) {
+      return new Top(next, limit);
     }
-
-    private LogicalOperator sort(LogicalOperator next) {
-        List<String> orderByColNames = new ArrayList<>();
-        String orderByType = "";
-        for (TableInJoinRequestBuilder request : getRequests()) {
-            List<Order> orderBys = request.getOriginalSelect().getOrderBys();
-            if (orderBys != null) {
-                String tableAlias = request.getAlias() == null ? "" : request.getAlias() + ".";
-                for (Order orderBy : orderBys) {
-                    orderByColNames.add(tableAlias + orderBy.getName());
-                    orderByType = orderBy.getType();
-                }
-            }
-        }
-
-        if (orderByColNames.isEmpty()) {
-            return next;
+    return next;
+  }
+
+  private LogicalOperator sort(LogicalOperator next) {
+    List<String> orderByColNames = new ArrayList<>();
+    String orderByType = "";
+    for (TableInJoinRequestBuilder request : getRequests()) {
+      List<Order> orderBys = request.getOriginalSelect().getOrderBys();
+      if (orderBys != null) {
+        String tableAlias = request.getAlias() == null ? "" : request.getAlias() + ".";
+        for (Order orderBy : orderBys) {
+          orderByColNames.add(tableAlias + orderBy.getName());
+          orderByType = orderBy.getType();
         }
-        return new Sort(next, orderByColNames, orderByType);
+      }
     }
 
-    private LogicalOperator filter(LogicalOperator next) {
-        Filter filter = new Filter(next, getRequests());
-        if (filter.isNoOp()) {
-            return next;
-        }
-        return filter;
+    if (orderByColNames.isEmpty()) {
+      return next;
     }
+    return new Sort(next, orderByColNames, orderByType);
+  }
 
-    private LogicalOperator join(LogicalOperator left, LogicalOperator right) {
-        return new Join(
-                left, right,
-                params.joinType(),
-                groupJoinConditionByOr(),
-                config.blockSize(),
-                config.isUseTermsFilterOptimization()
-        );
+  private LogicalOperator filter(LogicalOperator next) {
+    Filter filter = new Filter(next, getRequests());
+    if (filter.isNoOp()) {
+      return next;
     }
-
-    /**
-     * Group conditions in ON by OR because it makes hash table group be required too
-     */
-    private JoinCondition groupJoinConditionByOr() {
-        String leftTableAlias = params.firstRequest().getAlias();
-        String rightTableAlias = params.secondRequest().getAlias();
-
-        JoinCondition orCond;
-        if (params.joinConditions().isEmpty()) {
-            orCond = new JoinCondition(leftTableAlias, rightTableAlias, 0);
-        } else {
-            orCond = new JoinCondition(leftTableAlias, rightTableAlias, params.joinConditions().size());
-            for (int i = 0; i < params.joinConditions().size(); i++) {
-                List<Map.Entry<Field, Field>> andCond = params.joinConditions().get(i);
-                String[] leftColumnNames = new String[andCond.size()];
-                String[] rightColumnNames = new String[andCond.size()];
-
-                for (int j = 0; j < andCond.size(); j++) {
-                    Map.Entry<Field, Field> cond = andCond.get(j);
-                    leftColumnNames[j] = cond.getKey().getName();
-                    rightColumnNames[j] = cond.getValue().getName();
-                }
-
-                orCond.addLeftColumnNames(i, leftColumnNames);
-                orCond.addRightColumnNames(i, rightColumnNames);
-            }
+    return filter;
+  }
+
+  private LogicalOperator join(LogicalOperator left, LogicalOperator right) {
+    return new Join(
+        left,
+        right,
+        params.joinType(),
+        groupJoinConditionByOr(),
+        config.blockSize(),
+        config.isUseTermsFilterOptimization());
+  }
+
+  /** Group conditions in ON by OR because it makes hash table group be required too */
+  private JoinCondition groupJoinConditionByOr() {
+    String leftTableAlias = params.firstRequest().getAlias();
+    String rightTableAlias = params.secondRequest().getAlias();
+
+    JoinCondition orCond;
+    if (params.joinConditions().isEmpty()) {
+      orCond = new JoinCondition(leftTableAlias, rightTableAlias, 0);
+    } else {
+      orCond = new JoinCondition(leftTableAlias, rightTableAlias, params.joinConditions().size());
+      for (int i = 0; i < params.joinConditions().size(); i++) {
+        List<Map.Entry<Field, Field>> andCond = params.joinConditions().get(i);
+        String[] leftColumnNames = new String[andCond.size()];
+        String[] rightColumnNames = new String[andCond.size()];
+
+        for (int j = 0; j < andCond.size(); j++) {
+          Map.Entry<Field, Field> cond = andCond.get(j);
+          leftColumnNames[j] = cond.getKey().getName();
+          rightColumnNames[j] = cond.getValue().getName();
         }
-        return orCond;
-    }
 
-    private LogicalOperator group(TableInJoinRequestBuilder request, int pageSize) {
-        return new Group(new TableScan(request, pageSize));
+        orCond.addLeftColumnNames(i, leftColumnNames);
+        orCond.addRightColumnNames(i, rightColumnNames);
+      }
     }
+    return orCond;
+  }
 
-    private List<TableInJoinRequestBuilder> getRequests() {
-        return Arrays.asList(params.firstRequest(), params.secondRequest());
-    }
+  private LogicalOperator group(TableInJoinRequestBuilder request, int pageSize) {
+    return new Group(new TableScan(request, pageSize));
+  }
 
-    private <T, U> List<T> map(Collection<U> source, Function<U, T> func) {
-        return source.stream().map(func).collect(Collectors.toList());
-    }
+  private List<TableInJoinRequestBuilder> getRequests() {
+    return Arrays.asList(params.firstRequest(), params.secondRequest());
+  }
 
+  private <T, U> List<T> map(Collection<U> source, Function<U, T> func) {
+    return source.stream().map(func).collect(Collectors.toList());
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalPlanVisitor.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalPlanVisitor.java
index b779242a09..ef9e1a8d93 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalPlanVisitor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/LogicalPlanVisitor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical;
 
 import org.opensearch.sql.legacy.query.planner.core.PlanNode;
@@ -21,93 +20,86 @@
  */
 public interface LogicalPlanVisitor extends Visitor {
 
-    @Override
-    default boolean visit(PlanNode op) {
-        if (op instanceof Project) {
-            return visit((Project) op);
-        } else if (op instanceof Filter) {
-            return visit((Filter) op);
-        } else if (op instanceof Join) {
-            return visit((Join) op);
-        } else if (op instanceof Group) {
-            return visit((Group) op);
-        } else if (op instanceof TableScan) {
-            return visit((TableScan) op);
-        } else if (op instanceof Top) {
-            return visit((Top) op);
-        } else if (op instanceof Sort) {
-            return visit((Sort) op);
-        }
-        throw new IllegalArgumentException("Unknown operator type: " + op);
-    }
-
-    @Override
-    default void endVisit(PlanNode op) {
-        if (op instanceof Project) {
-            endVisit((Project) op);
-        } else if (op instanceof Filter) {
-            endVisit((Filter) op);
-        } else if (op instanceof Join) {
-            endVisit((Join) op);
-        } else if (op instanceof Group) {
-            endVisit((Group) op);
-        } else if (op instanceof TableScan) {
-            endVisit((TableScan) op);
-        } else if (op instanceof Top) {
-            endVisit((Top) op);
-        } else if (op instanceof Sort) {
-            endVisit((Sort) op);
-        } else {
-            throw new IllegalArgumentException("Unknown operator type: " + op);
-        }
-    }
-
-    default boolean visit(Project project) {
-        return true;
-    }
-
-    default void endVisit(Project project) {
-    }
-
-    default boolean visit(Filter filter) {
-        return true;
-    }
-
-    default void endVisit(Filter filter) {
-    }
-
-    default boolean visit(Join join) {
-        return true;
-    }
-
-    default void endVisit(Join join) {
-    }
-
-    default boolean visit(Group group) {
-        return true;
-    }
-
-    default void endVisit(Group group) {
-    }
-
-    default boolean visit(TableScan scan) {
-        return true;
-    }
-
-    default void endVisit(TableScan scan) {
-    }
-
-    default boolean visit(Top top) {
-        return true;
-    }
-
-    default void endVisit(Top top) {
-    }
-
-    default boolean visit(Sort sort) {
-        return true;
-    }
-
-    default void endVisit(Sort sort) {
-    }
+  @Override
+  default boolean visit(PlanNode op) {
+    if (op instanceof Project) {
+      return visit((Project) op);
+    } else if (op instanceof Filter) {
+      return visit((Filter) op);
+    } else if (op instanceof Join) {
+      return visit((Join) op);
+    } else if (op instanceof Group) {
+      return visit((Group) op);
+    } else if (op instanceof TableScan) {
+      return visit((TableScan) op);
+    } else if (op instanceof Top) {
+      return visit((Top) op);
+    } else if (op instanceof Sort) {
+      return visit((Sort) op);
+    }
+    throw new IllegalArgumentException("Unknown operator type: " + op);
+  }
+
+  @Override
+  default void endVisit(PlanNode op) {
+    if (op instanceof Project) {
+      endVisit((Project) op);
+    } else if (op instanceof Filter) {
+      endVisit((Filter) op);
+    } else if (op instanceof Join) {
+      endVisit((Join) op);
+    } else if (op instanceof Group) {
+      endVisit((Group) op);
+    } else if (op instanceof TableScan) {
+      endVisit((TableScan) op);
+    } else if (op instanceof Top) {
+      endVisit((Top) op);
+    } else if (op instanceof Sort) {
+      endVisit((Sort) op);
+    } else {
+      throw new IllegalArgumentException("Unknown operator type: " + op);
+    }
+  }
+
+  default boolean visit(Project project) {
+    return true;
+  }
+
+  default void endVisit(Project project) {}
+
+  default boolean visit(Filter filter) {
+    return true;
+  }
+
+  default void endVisit(Filter filter) {}
+
+  default boolean visit(Join join) {
+    return true;
+  }
+
+  default void endVisit(Join join) {}
+
+  default boolean visit(Group group) {
+    return true;
+  }
+
+  default void endVisit(Group group) {}
+
+  default boolean visit(TableScan scan) {
+    return true;
+  }
+
+  default void endVisit(TableScan scan) {}
+
+  default boolean visit(Top top) {
+    return true;
+  }
+
+  default void endVisit(Top top) {}
+
+  default boolean visit(Sort sort) {
+    return true;
+  }
+
+  default void endVisit(Sort sort) {}
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Filter.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Filter.java
index f5e3e40f2d..5d4423d67a 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Filter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Filter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical.node;
 
 import java.util.HashMap;
@@ -16,59 +15,54 @@
 import org.opensearch.sql.legacy.query.planner.logical.LogicalOperator;
 import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator;
 
-/**
- * Selection expression
- */
+/** Selection expression */
 public class Filter implements LogicalOperator {
 
-    private final LogicalOperator next;
+  private final LogicalOperator next;
 
-    /**
-     * Alias to WHERE clause mapping
-     */
-    private final Map<String, Where> aliasWhereMap = new HashMap<>();
+  /** Alias to WHERE clause mapping */
+  private final Map<String, Where> aliasWhereMap = new HashMap<>();
 
-    public Filter(LogicalOperator next, List<TableInJoinRequestBuilder> tables) {
-        this.next = next;
-
-        for (TableInJoinRequestBuilder table : tables) {
-            Select select = table.getOriginalSelect();
-            if (select.getWhere() != null) {
-                aliasWhereMap.put(table.getAlias(), select.getWhere());
-            }
-        }
-    }
+  public Filter(LogicalOperator next, List<TableInJoinRequestBuilder> tables) {
+    this.next = next;
 
-    public Filter(LogicalOperator next) {
-        this.next = next;
+    for (TableInJoinRequestBuilder table : tables) {
+      Select select = table.getOriginalSelect();
+      if (select.getWhere() != null) {
+        aliasWhereMap.put(table.getAlias(), select.getWhere());
+      }
     }
+  }
 
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[]{next};
-    }
+  public Filter(LogicalOperator next) {
+    this.next = next;
+  }
 
-    @Override
-    public boolean isNoOp() {
-        return aliasWhereMap.isEmpty();
-    }
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[] {next};
+  }
 
-    @Override
-    public <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps) {
-        // Always no-op after push down, skip it by returning next
-        return new PhysicalOperator[]{optimalOps.get(next)};
-    }
+  @Override
+  public boolean isNoOp() {
+    return aliasWhereMap.isEmpty();
+  }
 
-    public void pushDown(String tableAlias, Filter pushedDownFilter) {
-        Where pushedDownWhere = pushedDownFilter.aliasWhereMap.remove(tableAlias);
-        if (pushedDownWhere != null) {
-            aliasWhereMap.put(tableAlias, pushedDownWhere);
-        }
-    }
+  @Override
+  public <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps) {
+    // Always no-op after push down, skip it by returning next
+    return new PhysicalOperator[] {optimalOps.get(next)};
+  }
 
-    @Override
-    public String toString() {
-        return "Filter [ conditions=" + aliasWhereMap.values() + " ]";
+  public void pushDown(String tableAlias, Filter pushedDownFilter) {
+    Where pushedDownWhere = pushedDownFilter.aliasWhereMap.remove(tableAlias);
+    if (pushedDownWhere != null) {
+      aliasWhereMap.put(tableAlias, pushedDownWhere);
     }
+  }
 
+  @Override
+  public String toString() {
+    return "Filter [ conditions=" + aliasWhereMap.values() + " ]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Group.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Group.java
index 5ae9ddc0a2..da94ae74da 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Group.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Group.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical.node;
 
 import java.util.Map;
@@ -11,66 +10,57 @@
 import org.opensearch.sql.legacy.query.planner.logical.LogicalOperator;
 import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator;
 
-/**
- * Project-Filter-TableScan group for push down optimization convenience.
- */
+/** Project-Filter-TableScan group for push down optimization convenience. */
 public class Group implements LogicalOperator {
 
-    /**
-     * Optional pushed down projection
-     */
-    private Project<?> project;
-
-    /**
-     * Optional pushed down filter (selection)
-     */
-    private Filter filter;
+  /** Optional pushed down projection */
+  private Project<?> project;
 
-    /**
-     * Required table scan operator
-     */
-    private final TableScan tableScan;
+  /** Optional pushed down filter (selection) */
+  private Filter filter;
 
+  /** Required table scan operator */
+  private final TableScan tableScan;
 
-    public Group(TableScan tableScan) {
-        this.tableScan = tableScan;
-        this.filter = new Filter(tableScan);
-        this.project = new Project<>(filter);
-    }
+  public Group(TableScan tableScan) {
+    this.tableScan = tableScan;
+    this.filter = new Filter(tableScan);
+    this.project = new Project<>(filter);
+  }
 
-    @Override
-    public boolean isNoOp() {
-        return true;
-    }
+  @Override
+  public boolean isNoOp() {
+    return true;
+  }
 
-    @Override
-    public <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps) {
-        return tableScan.toPhysical(optimalOps);
-    }
+  @Override
+  public <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps) {
+    return tableScan.toPhysical(optimalOps);
+  }
 
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[]{topNonNullNode()};
-    }
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[] {topNonNullNode()};
+  }
 
-    private PlanNode topNonNullNode() {
-        return project != null ? project : (filter != null ? filter : tableScan);
-    }
+  private PlanNode topNonNullNode() {
+    return project != null ? project : (filter != null ? filter : tableScan);
+  }
 
-    public String id() {
-        return tableScan.getTableAlias();
-    }
+  public String id() {
+    return tableScan.getTableAlias();
+  }
 
-    public void pushDown(Project<?> project) {
-        this.project.pushDown(id(), project);
-    }
+  public void pushDown(Project<?> project) {
+    this.project.pushDown(id(), project);
+  }
 
-    public void pushDown(Filter filter) {
-        this.filter.pushDown(id(), filter);
-    }
+  public void pushDown(Filter filter) {
+    this.filter.pushDown(id(), filter);
+  }
 
-    @Override
-    public String toString() {
-        return "Group";
-    }
+  @Override
+  public String toString() {
+    return "Group";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Join.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Join.java
index ae833ca580..686bf4c089 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Join.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Join.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical.node;
 
 import static com.alibaba.druid.sql.ast.statement.SQLJoinTableSource.JoinType;
@@ -15,162 +14,141 @@
 import org.opensearch.sql.legacy.query.planner.physical.node.join.BlockHashJoin;
 import org.opensearch.sql.legacy.query.planner.resource.blocksize.BlockSize;
 
-/**
- * Join expression
- */
+/** Join expression */
 public class Join implements LogicalOperator {
 
-    private final LogicalOperator left;
-    private final LogicalOperator right;
-
-    /**
-     * Join type, ex inner join, left join
-     */
-    private final JoinType type;
-
-    /**
-     * Joined columns in ON condition
-     */
-    private final JoinCondition condition;
-
-    /**
-     * Block size calculator
-     */
-    private final BlockSize blockSize;
-
-    /**
-     * Use terms filter optimization or not
-     */
-    private final boolean isUseTermsFilterOptimization;
-
-
-    public Join(LogicalOperator left,
-                LogicalOperator right,
-                JoinType joinType,
-                JoinCondition condition,
-                BlockSize blockSize,
-                boolean isUseTermsFilterOptimization) {
-        this.left = left;
-        this.right = right;
-        this.type = joinType;
-        this.condition = condition;
-        this.blockSize = blockSize;
-        this.isUseTermsFilterOptimization = isUseTermsFilterOptimization;
+  private final LogicalOperator left;
+  private final LogicalOperator right;
+
+  /** Join type, ex inner join, left join */
+  private final JoinType type;
+
+  /** Joined columns in ON condition */
+  private final JoinCondition condition;
+
+  /** Block size calculator */
+  private final BlockSize blockSize;
+
+  /** Use terms filter optimization or not */
+  private final boolean isUseTermsFilterOptimization;
+
+  public Join(
+      LogicalOperator left,
+      LogicalOperator right,
+      JoinType joinType,
+      JoinCondition condition,
+      BlockSize blockSize,
+      boolean isUseTermsFilterOptimization) {
+    this.left = left;
+    this.right = right;
+    this.type = joinType;
+    this.condition = condition;
+    this.blockSize = blockSize;
+    this.isUseTermsFilterOptimization = isUseTermsFilterOptimization;
+  }
+
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[] {left, right};
+  }
+
+  @Override
+  public <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps) {
+    PhysicalOperator<T> optimalLeft = optimalOps.get(left);
+    PhysicalOperator<T> optimalRight = optimalOps.get(right);
+    return new PhysicalOperator[] {
+      new BlockHashJoin<>(
+          optimalLeft, optimalRight, type, condition, blockSize, isUseTermsFilterOptimization)
+    };
+  }
+
+  public JoinCondition conditions() {
+    return condition;
+  }
+
+  @Override
+  public String toString() {
+    return "Join [ conditions=" + condition + " type=" + type + " ]";
+  }
+
+  /**
+   * Join condition in ON clause grouped by OR.
+   *
+   * <p>For example, "ON (a.name = b.id AND a.age = b.age) OR a.location = b.address" => input list:
+   * [ [ (a.name, b.id), (a.age, b.age) ], [ (a.location, b.address) ] ]
+   *
+   * <p>=> JoinCondition: leftTableAlias: "a", rightTableAlias: "b" leftColumnNames: [ ["name",
+   * "age"], ["location"] ] rightColumnNames: [ ["id", "age"], ["address" ] ]
+   */
+  public static class JoinCondition {
+
+    private final String leftTableAlias;
+    private final String rightTableAlias;
+
+    private final String[][] leftColumnNames;
+    private final String[][] rightColumnNames;
+
+    public JoinCondition(String leftTableAlias, String rightTableAlias, int groupSize) {
+      this.leftTableAlias = leftTableAlias;
+      this.rightTableAlias = rightTableAlias;
+      this.leftColumnNames = new String[groupSize][];
+      this.rightColumnNames = new String[groupSize][];
     }
 
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[]{left, right};
+    public void addLeftColumnNames(int groupNum, String[] colNames) {
+      leftColumnNames[groupNum] = colNames;
     }
 
-    @Override
-    public <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps) {
-        PhysicalOperator<T> optimalLeft = optimalOps.get(left);
-        PhysicalOperator<T> optimalRight = optimalOps.get(right);
-        return new PhysicalOperator[]{
-                new BlockHashJoin<>(
-                        optimalLeft, optimalRight, type, condition,
-                        blockSize, isUseTermsFilterOptimization
-                )
-        };
+    public void addRightColumnNames(int groupNum, String[] colNames) {
+      rightColumnNames[groupNum] = colNames;
     }
 
-    public JoinCondition conditions() {
-        return condition;
+    public int groupSize() {
+      return leftColumnNames.length;
     }
 
-    @Override
-    public String toString() {
-        return "Join [ conditions=" + condition + " type=" + type + " ]";
+    public String leftTableAlias() {
+      return leftTableAlias;
     }
 
-    /**
-     * Join condition in ON clause grouped by OR.
-     * <p>
-     * For example, "ON (a.name = b.id AND a.age = b.age) OR a.location = b.address"
-     * => input list: [
-     * [ (a.name, b.id), (a.age, b.age) ],
-     * [ (a.location, b.address) ]
-     * ]
-     * <p>
-     * => JoinCondition:
-     * leftTableAlias: "a", rightTableAlias: "b"
-     * leftColumnNames:  [ ["name", "age"], ["location"] ]
-     * rightColumnNames: [ ["id", "age"],   ["address" ] ]
-     */
-    public static class JoinCondition {
-
-        private final String leftTableAlias;
-        private final String rightTableAlias;
-
-        private final String[][] leftColumnNames;
-        private final String[][] rightColumnNames;
-
-        public JoinCondition(String leftTableAlias,
-                             String rightTableAlias,
-                             int groupSize) {
-            this.leftTableAlias = leftTableAlias;
-            this.rightTableAlias = rightTableAlias;
-            this.leftColumnNames = new String[groupSize][];
-            this.rightColumnNames = new String[groupSize][];
-        }
-
-        public void addLeftColumnNames(int groupNum, String[] colNames) {
-            leftColumnNames[groupNum] = colNames;
-        }
-
-        public void addRightColumnNames(int groupNum, String[] colNames) {
-            rightColumnNames[groupNum] = colNames;
-        }
-
-        public int groupSize() {
-            return leftColumnNames.length;
-        }
-
-        public String leftTableAlias() {
-            return leftTableAlias;
-        }
+    public String rightTableAlias() {
+      return rightTableAlias;
+    }
 
-        public String rightTableAlias() {
-            return rightTableAlias;
-        }
+    public String[] leftColumnNames(int groupNum) {
+      return leftColumnNames[groupNum];
+    }
 
-        public String[] leftColumnNames(int groupNum) {
-            return leftColumnNames[groupNum];
-        }
+    public String[] rightColumnNames(int groupNum) {
+      return rightColumnNames[groupNum];
+    }
 
-        public String[] rightColumnNames(int groupNum) {
-            return rightColumnNames[groupNum];
+    @Override
+    public String toString() {
+      StringBuilder str = new StringBuilder();
+      int groupSize = leftColumnNames.length;
+      for (int i = 0; i < groupSize; i++) {
+        if (i > 0) {
+          str.append(" OR ");
         }
 
-        @Override
-        public String toString() {
-            StringBuilder str = new StringBuilder();
-            int groupSize = leftColumnNames.length;
-            for (int i = 0; i < groupSize; i++) {
-                if (i > 0) {
-                    str.append(" OR ");
-                }
-
-                str.append("( ");
-                int condSize = leftColumnNames[i].length;
-                for (int j = 0; j < condSize; j++) {
-                    if (j > 0) {
-                        str.append(" AND ");
-                    }
-                    str.append(leftTableAlias).
-                            append(".").
-                            append(leftColumnNames[i][j]).
-                            append(" = ").
-                            append(rightTableAlias).
-                            append(".").
-                            append(rightColumnNames[i][j]);
-                }
-                str.append(" )");
-            }
-            return str.toString();
+        str.append("( ");
+        int condSize = leftColumnNames[i].length;
+        for (int j = 0; j < condSize; j++) {
+          if (j > 0) {
+            str.append(" AND ");
+          }
+          str.append(leftTableAlias)
+              .append(".")
+              .append(leftColumnNames[i][j])
+              .append(" = ")
+              .append(rightTableAlias)
+              .append(".")
+              .append(rightColumnNames[i][j]);
         }
-
+        str.append(" )");
+      }
+      return str.toString();
     }
-
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Project.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Project.java
index bd24564de2..4226744f1b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Project.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Project.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical.node;
 
 import com.google.common.collect.HashMultimap;
@@ -23,126 +22,116 @@
 import org.opensearch.sql.legacy.query.planner.physical.Row;
 import org.opensearch.sql.legacy.query.planner.physical.estimation.Cost;
 
-/**
- * Projection expression
- */
+/** Projection expression */
 public class Project<T> implements LogicalOperator, PhysicalOperator<T> {
 
-    private static final Logger LOG = LogManager.getLogger();
-
-    private final PlanNode next;
+  private static final Logger LOG = LogManager.getLogger();
 
-    /**
-     * All columns being projected in SELECT in each table
-     */
-    private final Multimap<String, Field> tableAliasColumns;
+  private final PlanNode next;
 
-    /**
-     * All columns full name (tableAlias.colName) to alias mapping
-     */
-    private final Map<String, String> fullNameAlias;
+  /** All columns being projected in SELECT in each table */
+  private final Multimap<String, Field> tableAliasColumns;
 
+  /** All columns full name (tableAlias.colName) to alias mapping */
+  private final Map<String, String> fullNameAlias;
 
-    @SuppressWarnings("unchecked")
-    public Project(PlanNode next) {
-        this(next, HashMultimap.create());
-    }
+  @SuppressWarnings("unchecked")
+  public Project(PlanNode next) {
+    this(next, HashMultimap.create());
+  }
 
-    @SuppressWarnings("unchecked")
-    public Project(PlanNode next, Multimap<String, Field> tableAliasToColumns) {
-        this.next = next;
-        this.tableAliasColumns = tableAliasToColumns;
-        this.fullNameAlias = fullNameAndAlias();
-    }
-
-    @Override
-    public boolean isNoOp() {
-        return tableAliasColumns.isEmpty();
-    }
-
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[]{next};
-    }
+  @SuppressWarnings("unchecked")
+  public Project(PlanNode next, Multimap<String, Field> tableAliasToColumns) {
+    this.next = next;
+    this.tableAliasColumns = tableAliasToColumns;
+    this.fullNameAlias = fullNameAndAlias();
+  }
 
-    @Override
-    public <U> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<U>> optimalOps) {
-        if (!(next instanceof LogicalOperator)) {
-            throw new IllegalStateException("Only logical operator can perform this toPhysical() operation");
-        }
-        return new PhysicalOperator[]{
-                new Project<U>(optimalOps.get(next), tableAliasColumns) // Create physical Project instance
-        };
-    }
+  @Override
+  public boolean isNoOp() {
+    return tableAliasColumns.isEmpty();
+  }
 
-    @Override
-    public Cost estimate() {
-        return new Cost();
-    }
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[] {next};
+  }
 
-    @Override
-    public boolean hasNext() {
-        return ((PhysicalOperator) next).hasNext();
+  @Override
+  public <U> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<U>> optimalOps) {
+    if (!(next instanceof LogicalOperator)) {
+      throw new IllegalStateException(
+          "Only logical operator can perform this toPhysical() operation");
     }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Row<T> next() {
-        Row<T> row = ((PhysicalOperator<T>) this.next).next();
-
-        /*
-         * Empty means SELECT * which means retain all fields from both tables
-         * Because push down is always applied, only limited support for this.
-         */
-        if (!fullNameAlias.isEmpty()) {
-            row.retain(fullNameAlias);
-        }
-
-        LOG.trace("Projected row by fields {}: {}", tableAliasColumns, row);
-        return row;
+    return new PhysicalOperator[] {
+      new Project<U>(optimalOps.get(next), tableAliasColumns) // Create physical Project instance
+    };
+  }
+
+  @Override
+  public Cost estimate() {
+    return new Cost();
+  }
+
+  @Override
+  public boolean hasNext() {
+    return ((PhysicalOperator) next).hasNext();
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public Row<T> next() {
+    Row<T> row = ((PhysicalOperator<T>) this.next).next();
+
+    /*
+     * Empty means SELECT * which means retain all fields from both tables
+     * Because push down is always applied, only limited support for this.
+     */
+    if (!fullNameAlias.isEmpty()) {
+      row.retain(fullNameAlias);
     }
 
-    public void project(String tableAlias, Collection<Field> columns) {
-        tableAliasColumns.putAll(tableAlias, columns);
-    }
+    LOG.trace("Projected row by fields {}: {}", tableAliasColumns, row);
+    return row;
+  }
 
-    public void projectAll(String tableAlias) {
-        tableAliasColumns.put(tableAlias, new Field("*", ""));
-    }
+  public void project(String tableAlias, Collection<Field> columns) {
+    tableAliasColumns.putAll(tableAlias, columns);
+  }
 
-    public void forEach(BiConsumer<String, Collection<Field>> action) {
-        tableAliasColumns.asMap().forEach(action);
-    }
+  public void projectAll(String tableAlias) {
+    tableAliasColumns.put(tableAlias, new Field("*", ""));
+  }
 
-    public void pushDown(String tableAlias, Project<?> pushedDownProj) {
-        Collection<Field> columns = pushedDownProj.tableAliasColumns.get(tableAlias);
-        if (columns != null) {
-            tableAliasColumns.putAll(tableAlias, columns);
-        }
-    }
+  public void forEach(BiConsumer<String, Collection<Field>> action) {
+    tableAliasColumns.asMap().forEach(action);
+  }
 
-    /**
-     * Return mapping from column full name ("e.age") and alias ("a" in "SELECT e.age AS a")
-     */
-    private Map<String, String> fullNameAndAlias() {
-        Map<String, String> fullNamesAlias = new HashMap<>();
-        forEach(
-                (tableAlias, fields) -> {
-                    for (Field field : fields) {
-                        fullNamesAlias.put(tableAlias + "." + field.getName(), field.getAlias());
-                    }
-                }
-        );
-        return fullNamesAlias;
+  public void pushDown(String tableAlias, Project<?> pushedDownProj) {
+    Collection<Field> columns = pushedDownProj.tableAliasColumns.get(tableAlias);
+    if (columns != null) {
+      tableAliasColumns.putAll(tableAlias, columns);
     }
-
-    @Override
-    public String toString() {
-        List<String> colStrs = new ArrayList<>();
-        for (Map.Entry<String, Field> entry : tableAliasColumns.entries()) {
-            colStrs.add(entry.getKey() + "." + entry.getValue().getName());
-        }
-        return "Project [ columns=[" + String.join(", ", colStrs) + "] ]";
+  }
+
+  /** Return mapping from column full name ("e.age") and alias ("a" in "SELECT e.age AS a") */
+  private Map<String, String> fullNameAndAlias() {
+    Map<String, String> fullNamesAlias = new HashMap<>();
+    forEach(
+        (tableAlias, fields) -> {
+          for (Field field : fields) {
+            fullNamesAlias.put(tableAlias + "." + field.getName(), field.getAlias());
+          }
+        });
+    return fullNamesAlias;
+  }
+
+  @Override
+  public String toString() {
+    List<String> colStrs = new ArrayList<>();
+    for (Map.Entry<String, Field> entry : tableAliasColumns.entries()) {
+      colStrs.add(entry.getKey() + "." + entry.getValue().getName());
     }
-
+    return "Project [ columns=[" + String.join(", ", colStrs) + "] ]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Sort.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Sort.java
index 670be71de5..f9033ce90f 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Sort.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Sort.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical.node;
 
 import java.util.List;
@@ -13,45 +12,37 @@
 import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator;
 import org.opensearch.sql.legacy.query.planner.physical.node.sort.QuickSort;
 
-/**
- * Logical operator for Sort.
- */
+/** Logical operator for Sort. */
 public class Sort implements LogicalOperator {
 
-    private final LogicalOperator next;
-
-    /**
-     * Column name list in ORDER BY
-     */
-    private final List<String> orderByColNames;
-
-    /**
-     * Order by type, ex. ASC, DESC
-     */
-    private final String orderByType;
+  private final LogicalOperator next;
 
+  /** Column name list in ORDER BY */
+  private final List<String> orderByColNames;
 
-    public Sort(LogicalOperator next, List<String> orderByColNames, String orderByType) {
-        this.next = next;
-        this.orderByColNames = orderByColNames;
-        this.orderByType = orderByType.toUpperCase();
-    }
+  /** Order by type, ex. ASC, DESC */
+  private final String orderByType;
 
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[]{next};
-    }
+  public Sort(LogicalOperator next, List<String> orderByColNames, String orderByType) {
+    this.next = next;
+    this.orderByColNames = orderByColNames;
+    this.orderByType = orderByType.toUpperCase();
+  }
 
-    @Override
-    public <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps) {
-        return new PhysicalOperator[]{
-                new QuickSort<>(optimalOps.get(next), orderByColNames, orderByType)
-        };
-    }
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[] {next};
+  }
 
-    @Override
-    public String toString() {
-        return "Sort [ columns=" + orderByColNames + " order=" + orderByType + " ]";
-    }
+  @Override
+  public <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps) {
+    return new PhysicalOperator[] {
+      new QuickSort<>(optimalOps.get(next), orderByColNames, orderByType)
+    };
+  }
 
+  @Override
+  public String toString() {
+    return "Sort [ columns=" + orderByColNames + " order=" + orderByType + " ]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/TableScan.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/TableScan.java
index 466779faae..16af199ed7 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/TableScan.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/TableScan.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical.node;
 
 import java.util.Map;
@@ -13,54 +12,44 @@
 import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator;
 import org.opensearch.sql.legacy.query.planner.physical.node.scroll.Scroll;
 
-/**
- * Table scan
- */
+/** Table scan */
 public class TableScan implements LogicalOperator {
 
-    /**
-     * Request builder for the table
-     */
-    private final TableInJoinRequestBuilder request;
-
-    /**
-     * Page size for physical operator
-     */
-    private final int pageSize;
-
-    public TableScan(TableInJoinRequestBuilder request, int pageSize) {
-        this.request = request;
-        this.pageSize = pageSize;
-    }
+  /** Request builder for the table */
+  private final TableInJoinRequestBuilder request;
 
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[0];
-    }
+  /** Page size for physical operator */
+  private final int pageSize;
 
-    @Override
-    public <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps) {
-        return new PhysicalOperator[]{
-                new Scroll(request, pageSize)
-        };
-    }
+  public TableScan(TableInJoinRequestBuilder request, int pageSize) {
+    this.request = request;
+    this.pageSize = pageSize;
+  }
 
-    @Override
-    public String toString() {
-        return "TableScan";
-    }
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[0];
+  }
 
+  @Override
+  public <T> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<T>> optimalOps) {
+    return new PhysicalOperator[] {new Scroll(request, pageSize)};
+  }
 
-    /*********************************************
-     *          Getters for Explain
-     *********************************************/
+  @Override
+  public String toString() {
+    return "TableScan";
+  }
 
-    public String getTableAlias() {
-        return request.getAlias();
-    }
+  /*********************************************
+   *          Getters for Explain
+   *********************************************/
 
-    public String getTableName() {
-        return request.getOriginalSelect().getFrom().get(0).getIndex();
-    }
+  public String getTableAlias() {
+    return request.getAlias();
+  }
 
+  public String getTableName() {
+    return request.getOriginalSelect().getFrom().get(0).getIndex();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Top.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Top.java
index e39f36ed5a..a484dc8a6a 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Top.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/node/Top.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical.node;
 
 import java.util.Map;
@@ -20,52 +19,51 @@
  */
 public class Top<T> implements LogicalOperator, PhysicalOperator<T> {
 
-    private final PlanNode next;
+  private final PlanNode next;
 
-    /**
-     * Number of rows to return in total
-     */
-    private int count;
+  /** Number of rows to return in total */
+  private int count;
 
-    @SuppressWarnings("unchecked")
-    public Top(PlanNode next, int count) {
-        this.next = next;
-        this.count = count;
-    }
+  @SuppressWarnings("unchecked")
+  public Top(PlanNode next, int count) {
+    this.next = next;
+    this.count = count;
+  }
 
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[]{next};
-    }
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[] {next};
+  }
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public boolean hasNext() {
-        return count > 0 && ((PhysicalOperator<T>) next).hasNext();
-    }
+  @SuppressWarnings("unchecked")
+  @Override
+  public boolean hasNext() {
+    return count > 0 && ((PhysicalOperator<T>) next).hasNext();
+  }
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public Row<T> next() {
-        count--;
-        return ((PhysicalOperator<T>) next).next();
-    }
+  @SuppressWarnings("unchecked")
+  @Override
+  public Row<T> next() {
+    count--;
+    return ((PhysicalOperator<T>) next).next();
+  }
 
-    @Override
-    public <U> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<U>> optimalOps) {
-        if (!(next instanceof LogicalOperator)) {
-            throw new IllegalStateException("Only logical operator can perform this toPhysical() operation");
-        }
-        return new PhysicalOperator[]{new Top<>(optimalOps.get(next), count)};
+  @Override
+  public <U> PhysicalOperator[] toPhysical(Map<LogicalOperator, PhysicalOperator<U>> optimalOps) {
+    if (!(next instanceof LogicalOperator)) {
+      throw new IllegalStateException(
+          "Only logical operator can perform this toPhysical() operation");
     }
+    return new PhysicalOperator[] {new Top<>(optimalOps.get(next), count)};
+  }
 
-    @Override
-    public Cost estimate() {
-        return new Cost();
-    }
+  @Override
+  public Cost estimate() {
+    return new Cost();
+  }
 
-    @Override
-    public String toString() {
-        return "Top [ " + "count=" + count + " ]";
-    }
+  @Override
+  public String toString() {
+    return "Top [ " + "count=" + count + " ]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/rule/ProjectionPushDown.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/rule/ProjectionPushDown.java
index f5a3e28fce..5195894a75 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/rule/ProjectionPushDown.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/rule/ProjectionPushDown.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical.rule;
 
 import static java.util.stream.Collectors.toList;
@@ -18,68 +17,54 @@
 import org.opensearch.sql.legacy.query.planner.logical.node.Join;
 import org.opensearch.sql.legacy.query.planner.logical.node.Project;
 
-
-/**
- * Projection push down optimization.
- */
+/** Projection push down optimization. */
 public class ProjectionPushDown implements LogicalPlanVisitor {
 
-    /**
-     * Project used to collect column names in SELECT, ON, ORDER BY...
-     */
-    private final Project<?> project = new Project(null);
+  /** Project used to collect column names in SELECT, ON, ORDER BY... */
+  private final Project<?> project = new Project(null);
 
-    @Override
-    public boolean visit(Project project) {
-        pushDown(project);
-        return true;
-    }
+  @Override
+  public boolean visit(Project project) {
+    pushDown(project);
+    return true;
+  }
 
-    @Override
-    public boolean visit(Join join) {
-        pushDown(join.conditions());
-        return true;
-    }
+  @Override
+  public boolean visit(Join join) {
+    pushDown(join.conditions());
+    return true;
+  }
 
-    @Override
-    public boolean visit(Group group) {
-        if (!project.isNoOp()) {
-            group.pushDown(project);
-        }
-        return false; // avoid iterating operators in virtual Group
+  @Override
+  public boolean visit(Group group) {
+    if (!project.isNoOp()) {
+      group.pushDown(project);
     }
+    return false; // avoid iterating operators in virtual Group
+  }
 
-    /**
-     * Note that raw type Project cause generic type of forEach be erased at compile time
-     */
-    private void pushDown(Project<?> project) {
-        project.forEach(this::project);
-    }
-
-    private void pushDown(JoinCondition orCond) {
-        for (int i = 0; i < orCond.groupSize(); i++) {
-            project(
-                    orCond.leftTableAlias(),
-                    columnNamesToFields(orCond.leftColumnNames(i))
-            );
-            project(
-                    orCond.rightTableAlias(),
-                    columnNamesToFields(orCond.rightColumnNames(i))
-            );
-        }
-    }
+  /** Note that raw type Project cause generic type of forEach be erased at compile time */
+  private void pushDown(Project<?> project) {
+    project.forEach(this::project);
+  }
 
-    private void project(String tableAlias, Collection<Field> columns) {
-        project.project(tableAlias, columns); // Bug: Field doesn't implement hashCode() which leads to duplicate
+  private void pushDown(JoinCondition orCond) {
+    for (int i = 0; i < orCond.groupSize(); i++) {
+      project(orCond.leftTableAlias(), columnNamesToFields(orCond.leftColumnNames(i)));
+      project(orCond.rightTableAlias(), columnNamesToFields(orCond.rightColumnNames(i)));
     }
+  }
 
-    /**
-     * Convert column name string to Field object with empty alias
-     */
-    private List<Field> columnNamesToFields(String[] colNames) {
-        return Arrays.stream(colNames).
-                map(name -> new Field(name, null)). // Alias is useless for pushed down project
-                collect(toList());
-    }
+  private void project(String tableAlias, Collection<Field> columns) {
+    project.project(
+        tableAlias, columns); // Bug: Field doesn't implement hashCode() which leads to duplicate
+  }
 
+  /** Convert column name string to Field object with empty alias */
+  private List<Field> columnNamesToFields(String[] colNames) {
+    return Arrays.stream(colNames)
+        .map(name -> new Field(name, null))
+        . // Alias is useless for pushed down project
+        collect(toList());
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/rule/SelectionPushDown.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/rule/SelectionPushDown.java
index 61578f91b7..deae266afc 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/rule/SelectionPushDown.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/logical/rule/SelectionPushDown.java
@@ -3,36 +3,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.logical.rule;
 
 import org.opensearch.sql.legacy.query.planner.logical.LogicalPlanVisitor;
 import org.opensearch.sql.legacy.query.planner.logical.node.Filter;
 import org.opensearch.sql.legacy.query.planner.logical.node.Group;
 
-/**
- * Push down selection (filter)
- */
+/** Push down selection (filter) */
 public class SelectionPushDown implements LogicalPlanVisitor {
 
-    /**
-     * Store the filter found in visit and reused to push down.
-     * It's not necessary to create a new one because no need to collect filter condition elsewhere
-     */
-    private Filter filter;
-
-    @Override
-    public boolean visit(Filter filter) {
-        this.filter = filter;
-        return true;
+  /**
+   * Store the filter found in visit and reused to push down. It's not necessary to create a new one
+   * because no need to collect filter condition elsewhere
+   */
+  private Filter filter;
+
+  @Override
+  public boolean visit(Filter filter) {
+    this.filter = filter;
+    return true;
+  }
+
+  @Override
+  public boolean visit(Group group) {
+    if (filter != null && !filter.isNoOp()) {
+      group.pushDown(filter);
     }
-
-    @Override
-    public boolean visit(Group group) {
-        if (filter != null && !filter.isNoOp()) {
-            group.pushDown(filter);
-        }
-        return false; // avoid iterating operators in virtual Group
-    }
-
+    return false; // avoid iterating operators in virtual Group
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/PhysicalOperator.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/PhysicalOperator.java
index 9271bae0d7..897beee3e9 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/PhysicalOperator.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/PhysicalOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical;
 
 import java.util.Iterator;
@@ -11,40 +10,36 @@
 import org.opensearch.sql.legacy.query.planner.core.PlanNode;
 import org.opensearch.sql.legacy.query.planner.physical.estimation.Cost;
 
-/**
- * Physical operator
- */
+/** Physical operator */
 public interface PhysicalOperator<T> extends PlanNode, Iterator<Row<T>>, AutoCloseable {
 
-    /**
-     * Estimate the cost of current physical operator
-     *
-     * @return cost
-     */
-    Cost estimate();
-
-
-    /**
-     * Initialize operator.
-     *
-     * @param params exuecution parameters needed
-     */
-    default void open(ExecuteParams params) throws Exception {
-        for (PlanNode node : children()) {
-            ((PhysicalOperator) node).open(params);
-        }
+  /**
+   * Estimate the cost of current physical operator
+   *
+   * @return cost
+   */
+  Cost estimate();
+
+  /**
+   * Initialize operator.
+   *
+   * @param params exuecution parameters needed
+   */
+  default void open(ExecuteParams params) throws Exception {
+    for (PlanNode node : children()) {
+      ((PhysicalOperator) node).open(params);
     }
-
-
-    /**
-     * Close resources related to the operator.
-     *
-     * @throws Exception potential exception raised
-     */
-    @Override
-    default void close() {
-        for (PlanNode node : children()) {
-            ((PhysicalOperator) node).close();
-        }
+  }
+
+  /**
+   * Close resources related to the operator.
+   *
+   * @throws Exception potential exception raised
+   */
+  @Override
+  default void close() {
+    for (PlanNode node : children()) {
+      ((PhysicalOperator) node).close();
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/PhysicalPlan.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/PhysicalPlan.java
index eac4e855b0..5a79c63838 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/PhysicalPlan.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/PhysicalPlan.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical;
 
 import java.util.ArrayList;
@@ -18,81 +17,69 @@
 import org.opensearch.sql.legacy.query.planner.physical.estimation.Estimation;
 import org.opensearch.sql.legacy.query.planner.resource.ResourceManager;
 
-/**
- * Physical plan
- */
+/** Physical plan */
 public class PhysicalPlan implements Plan {
 
-    private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LogManager.getLogger();
 
-    /**
-     * Optimized logical plan that being ready for physical planning
-     */
-    private final LogicalPlan logicalPlan;
+  /** Optimized logical plan that being ready for physical planning */
+  private final LogicalPlan logicalPlan;
 
-    /**
-     * Root of physical plan tree
-     */
-    private PhysicalOperator<SearchHit> root;
+  /** Root of physical plan tree */
+  private PhysicalOperator<SearchHit> root;
 
-    public PhysicalPlan(LogicalPlan logicalPlan) {
-        this.logicalPlan = logicalPlan;
-    }
+  public PhysicalPlan(LogicalPlan logicalPlan) {
+    this.logicalPlan = logicalPlan;
+  }
 
-    @Override
-    public void traverse(Visitor visitor) {
-        if (root != null) {
-            root.accept(visitor);
-        }
+  @Override
+  public void traverse(Visitor visitor) {
+    if (root != null) {
+      root.accept(visitor);
     }
-
-    @Override
-    public void optimize() {
-        Estimation<SearchHit> estimation = new Estimation<>();
-        logicalPlan.traverse(estimation);
-        root = estimation.optimalPlan();
+  }
+
+  @Override
+  public void optimize() {
+    Estimation<SearchHit> estimation = new Estimation<>();
+    logicalPlan.traverse(estimation);
+    root = estimation.optimalPlan();
+  }
+
+  /** Execute physical plan after verifying if system is healthy at the moment */
+  public List<SearchHit> execute(ExecuteParams params) {
+    if (shouldReject(params)) {
+      throw new IllegalStateException("Query request rejected due to insufficient resource");
     }
 
-    /**
-     * Execute physical plan after verifying if system is healthy at the moment
-     */
-    public List<SearchHit> execute(ExecuteParams params) {
-        if (shouldReject(params)) {
-            throw new IllegalStateException("Query request rejected due to insufficient resource");
-        }
-
-        try (PhysicalOperator<SearchHit> op = root) {
-            return doExecutePlan(op, params);
-        } catch (Exception e) {
-            LOG.error("Error happened during execution", e);
-            // Runtime error or circuit break. Should we return partial result to customer?
-            throw new IllegalStateException("Error happened during execution", e);
-        }
+    try (PhysicalOperator<SearchHit> op = root) {
+      return doExecutePlan(op, params);
+    } catch (Exception e) {
+      LOG.error("Error happened during execution", e);
+      // Runtime error or circuit break. Should we return partial result to customer?
+      throw new IllegalStateException("Error happened during execution", e);
     }
-
-    /**
-     * Reject physical plan execution of new query request if unhealthy
-     */
-    private boolean shouldReject(ExecuteParams params) {
-        return !((ResourceManager) params.get(ExecuteParams.ExecuteParamType.RESOURCE_MANAGER)).isHealthy();
+  }
+
+  /** Reject physical plan execution of new query request if unhealthy */
+  private boolean shouldReject(ExecuteParams params) {
+    return !((ResourceManager) params.get(ExecuteParams.ExecuteParamType.RESOURCE_MANAGER))
+        .isHealthy();
+  }
+
+  /** Execute physical plan in order: open, fetch result, close */
+  private List<SearchHit> doExecutePlan(PhysicalOperator<SearchHit> op, ExecuteParams params)
+      throws Exception {
+    List<SearchHit> hits = new ArrayList<>();
+    op.open(params);
+
+    while (op.hasNext()) {
+      hits.add(op.next().data());
     }
 
-    /**
-     * Execute physical plan in order: open, fetch result, close
-     */
-    private List<SearchHit> doExecutePlan(PhysicalOperator<SearchHit> op,
-                                          ExecuteParams params) throws Exception {
-        List<SearchHit> hits = new ArrayList<>();
-        op.open(params);
-
-        while (op.hasNext()) {
-            hits.add(op.next().data());
-        }
-
-        if (LOG.isTraceEnabled()) {
-            hits.forEach(hit -> LOG.trace("Final result row: {}", hit.getSourceAsMap()));
-        }
-        return hits;
+    if (LOG.isTraceEnabled()) {
+      hits.forEach(hit -> LOG.trace("Final result row: {}", hit.getSourceAsMap()));
     }
-
+    return hits;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/Row.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/Row.java
index 9e7d81a194..5ed074da6d 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/Row.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/Row.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical;
 
 import java.util.Arrays;
@@ -17,106 +16,93 @@
  */
 public interface Row<T> {
 
-    Row NULL = null;
-
-    /**
-     * Generate key to represent identity of the row.
-     *
-     * @param colNames column names as keys
-     * @return row key
-     */
-    RowKey key(String[] colNames);
-
-
-    /**
-     * Combine current row and another row together to generate a new combined row.
-     *
-     * @param otherRow another row
-     * @return combined row
-     */
-    Row<T> combine(Row<T> otherRow);
-
-
-    /**
-     * Retain columns specified and rename to alias if any.
-     *
-     * @param colNameAlias column names to alias mapping
-     */
-    void retain(Map<String, String> colNameAlias);
-
+  Row NULL = null;
+
+  /**
+   * Generate key to represent identity of the row.
+   *
+   * @param colNames column names as keys
+   * @return row key
+   */
+  RowKey key(String[] colNames);
+
+  /**
+   * Combine current row and another row together to generate a new combined row.
+   *
+   * @param otherRow another row
+   * @return combined row
+   */
+  Row<T> combine(Row<T> otherRow);
+
+  /**
+   * Retain columns specified and rename to alias if any.
+   *
+   * @param colNameAlias column names to alias mapping
+   */
+  void retain(Map<String, String> colNameAlias);
+
+  /**
+   * @return raw data of row wrapped inside
+   */
+  T data();
+
+  /** Key that help Row be sorted or hashed. */
+  class RowKey implements Comparable<RowKey> {
+
+    /** Represent null key if any joined column value is NULL */
+    public static final RowKey NULL = null;
+
+    /** Values of row key */
+    private final Object[] keys;
+
+    /** Cached hash code since this class is intended to be used by hash table */
+    private final int hashCode;
+
+    public RowKey(Object... keys) {
+      this.keys = keys;
+      this.hashCode = Objects.hash(keys);
+    }
 
-    /**
-     * @return raw data of row wrapped inside
-     */
-    T data();
+    public Object[] keys() {
+      return keys;
+    }
 
+    @Override
+    public int hashCode() {
+      return hashCode;
+    }
 
-    /**
-     * Key that help Row be sorted or hashed.
-     */
-    class RowKey implements Comparable<RowKey> {
+    @Override
+    public boolean equals(Object other) {
+      return other instanceof RowKey && Arrays.deepEquals(this.keys, ((RowKey) other).keys);
+    }
 
-        /**
-         * Represent null key if any joined column value is NULL
-         */
-        public static final RowKey NULL = null;
+    @SuppressWarnings("unchecked")
+    @Override
+    public int compareTo(RowKey other) {
+      for (int i = 0; i < keys.length; i++) {
 
-        /**
-         * Values of row key
+        /*
+         * Only one is null, otherwise (both null or non-null) go ahead.
+         * Always consider NULL is smaller value which means NULL comes last in ASC and first in DESC
          */
-        private final Object[] keys;
-
-        /**
-         * Cached hash code since this class is intended to be used by hash table
-         */
-        private final int hashCode;
-
-        public RowKey(Object... keys) {
-            this.keys = keys;
-            this.hashCode = Objects.hash(keys);
-        }
-
-        public Object[] keys() {
-            return keys;
-        }
-
-        @Override
-        public int hashCode() {
-            return hashCode;
+        if (keys[i] == null ^ other.keys[i] == null) {
+          return keys[i] == null ? 1 : -1;
         }
 
-        @Override
-        public boolean equals(Object other) {
-            return other instanceof RowKey && Arrays.deepEquals(this.keys, ((RowKey) other).keys);
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public int compareTo(RowKey other) {
-            for (int i = 0; i < keys.length; i++) {
-
-                /*
-                 * Only one is null, otherwise (both null or non-null) go ahead.
-                 * Always consider NULL is smaller value which means NULL comes last in ASC and first in DESC
-                 */
-                if (keys[i] == null ^ other.keys[i] == null) {
-                    return keys[i] == null ? 1 : -1;
-                }
-
-                if (keys[i] instanceof Comparable) {
-                    int result = ((Comparable) keys[i]).compareTo(other.keys[i]);
-                    if (result != 0) {
-                        return result;
-                    }
-                } // Ignore incomparable field silently?
-            }
-            return 0;
-        }
-
-        @Override
-        public String toString() {
-            return "RowKey: " + Arrays.toString(keys);
-        }
+        if (keys[i] instanceof Comparable) {
+          int result = ((Comparable) keys[i]).compareTo(other.keys[i]);
+          if (result != 0) {
+            return result;
+          }
+        } // Ignore incomparable field silently?
+      }
+      return 0;
+    }
 
+    @Override
+    public String toString() {
+      return "RowKey: " + Arrays.toString(keys);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/estimation/Cost.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/estimation/Cost.java
index efaf7057b6..86f155d626 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/estimation/Cost.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/estimation/Cost.java
@@ -3,22 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.estimation;
 
 public class Cost implements Comparable<Cost> {
 
-    public static final Cost INFINITY = new Cost();
+  public static final Cost INFINITY = new Cost();
 
-    private long inputSize;
+  private long inputSize;
 
-    private long time;
+  private long time;
 
-    public Cost() {
-    }
+  public Cost() {}
 
-    @Override
-    public int compareTo(Cost o) {
-        return 0;
-    }
+  @Override
+  public int compareTo(Cost o) {
+    return 0;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/estimation/Estimation.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/estimation/Estimation.java
index 1648cf854d..72ffbd4652 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/estimation/Estimation.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/estimation/Estimation.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.estimation;
 
 import static java.util.Comparator.comparing;
@@ -18,39 +17,35 @@
 import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator;
 
 /**
- * Convert and estimate the cost of each operator and generate one optimal plan.
- * Memorize cost of candidate physical operators in the bottom-up way to avoid duplicate computation.
+ * Convert and estimate the cost of each operator and generate one optimal plan. Memorize cost of
+ * candidate physical operators in the bottom-up way to avoid duplicate computation.
  */
 public class Estimation<T> implements LogicalPlanVisitor {
 
-    /**
-     * Optimal physical operator for logical operator based on completed estimation
-     */
-    private Map<LogicalOperator, PhysicalOperator<T>> optimalOps = new IdentityHashMap<>();
-
-    /**
-     * Keep tracking of the operator that exit visit()
-     */
-    private PhysicalOperator<T> root;
-
-    @Override
-    public boolean visit(Group group) {
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void endVisit(PlanNode node) {
-        LogicalOperator op = (LogicalOperator) node;
-        PhysicalOperator<T> optimal = Arrays.stream(op.toPhysical(optimalOps)).
-                min(comparing(PhysicalOperator::estimate)).
-                orElseThrow(() -> new IllegalStateException(
-                        "No optimal operator found: " + op));
-        optimalOps.put(op, optimal);
-        root = optimal;
-    }
-
-    public PhysicalOperator<T> optimalPlan() {
-        return root;
-    }
+  /** Optimal physical operator for logical operator based on completed estimation */
+  private Map<LogicalOperator, PhysicalOperator<T>> optimalOps = new IdentityHashMap<>();
+
+  /** Keep tracking of the operator that exit visit() */
+  private PhysicalOperator<T> root;
+
+  @Override
+  public boolean visit(Group group) {
+    return false;
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public void endVisit(PlanNode node) {
+    LogicalOperator op = (LogicalOperator) node;
+    PhysicalOperator<T> optimal =
+        Arrays.stream(op.toPhysical(optimalOps))
+            .min(comparing(PhysicalOperator::estimate))
+            .orElseThrow(() -> new IllegalStateException("No optimal operator found: " + op));
+    optimalOps.put(op, optimal);
+    root = optimal;
+  }
+
+  public PhysicalOperator<T> optimalPlan() {
+    return root;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/BatchPhysicalOperator.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/BatchPhysicalOperator.java
index 3b4eb2b48e..127e542255 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/BatchPhysicalOperator.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/BatchPhysicalOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node;
 
 import static org.opensearch.sql.legacy.query.planner.core.ExecuteParams.ExecuteParamType.RESOURCE_MANAGER;
@@ -19,78 +18,74 @@
 import org.opensearch.sql.legacy.query.planner.resource.ResourceManager;
 
 /**
- * Abstraction for physical operators that load large volume of data and generally prefetch for efficiency.
+ * Abstraction for physical operators that load large volume of data and generally prefetch for
+ * efficiency.
  *
  * @param <T>
  */
 public abstract class BatchPhysicalOperator<T> implements PhysicalOperator<T> {
 
-    protected static final Logger LOG = LogManager.getLogger();
+  protected static final Logger LOG = LogManager.getLogger();
 
-    /**
-     * Resource monitor to avoid consuming too much resource
-     */
-    private ResourceManager resourceMgr;
+  /** Resource monitor to avoid consuming too much resource */
+  private ResourceManager resourceMgr;
 
-    /**
-     * Current batch of data
-     */
-    private Iterator<Row<T>> curBatch;
+  /** Current batch of data */
+  private Iterator<Row<T>> curBatch;
 
-    @Override
-    public void open(ExecuteParams params) throws Exception {
-        //PhysicalOperator.super.open(params); // Child needs to call this super.open() and open its next node too
-        resourceMgr = params.get(RESOURCE_MANAGER);
-    }
+  @Override
+  public void open(ExecuteParams params) throws Exception {
+    // PhysicalOperator.super.open(params); // Child needs to call this super.open() and open its
+    // next node too
+    resourceMgr = params.get(RESOURCE_MANAGER);
+  }
 
-    @Override
-    public boolean hasNext() {
-        if (isNoMoreDataInCurrentBatch()) {
-            LOG.debug("{} No more data in current batch, pre-fetching next batch", this);
-            Collection<Row<T>> nextBatch = prefetchSafely();
+  @Override
+  public boolean hasNext() {
+    if (isNoMoreDataInCurrentBatch()) {
+      LOG.debug("{} No more data in current batch, pre-fetching next batch", this);
+      Collection<Row<T>> nextBatch = prefetchSafely();
 
-            LOG.debug("{} Pre-fetched {} rows", this, nextBatch.size());
-            if (LOG.isTraceEnabled()) {
-                nextBatch.forEach(row -> LOG.trace("Row pre-fetched: {}", row));
-            }
+      LOG.debug("{} Pre-fetched {} rows", this, nextBatch.size());
+      if (LOG.isTraceEnabled()) {
+        nextBatch.forEach(row -> LOG.trace("Row pre-fetched: {}", row));
+      }
 
-            curBatch = nextBatch.iterator();
-        }
-        return curBatch.hasNext();
+      curBatch = nextBatch.iterator();
     }
-
-    @Override
-    public Row<T> next() {
-        return curBatch.next();
-    }
-
-    /**
-     * Prefetch next batch safely by checking resource monitor
-     */
-    private Collection<Row<T>> prefetchSafely() {
-        Objects.requireNonNull(resourceMgr, "ResourceManager is not set so unable to do sanity check");
-
-        boolean isHealthy = resourceMgr.isHealthy();
-        boolean isTimeout = resourceMgr.isTimeout();
-        if (isHealthy && !isTimeout) {
-            try {
-                return prefetch();
-            } catch (Exception e) {
-                throw new IllegalStateException("Failed to prefetch next batch", e);
-            }
-        }
-        throw new IllegalStateException("Exit due to " + (isHealthy ? "time out" : "insufficient resource"));
+    return curBatch.hasNext();
+  }
+
+  @Override
+  public Row<T> next() {
+    return curBatch.next();
+  }
+
+  /** Prefetch next batch safely by checking resource monitor */
+  private Collection<Row<T>> prefetchSafely() {
+    Objects.requireNonNull(resourceMgr, "ResourceManager is not set so unable to do sanity check");
+
+    boolean isHealthy = resourceMgr.isHealthy();
+    boolean isTimeout = resourceMgr.isTimeout();
+    if (isHealthy && !isTimeout) {
+      try {
+        return prefetch();
+      } catch (Exception e) {
+        throw new IllegalStateException("Failed to prefetch next batch", e);
+      }
     }
-
-    /**
-     * Prefetch next batch if current is exhausted.
-     *
-     * @return next batch
-     */
-    protected abstract Collection<Row<T>> prefetch() throws Exception;
-
-    private boolean isNoMoreDataInCurrentBatch() {
-        return curBatch == null || !curBatch.hasNext();
-    }
-
+    throw new IllegalStateException(
+        "Exit due to " + (isHealthy ? "time out" : "insufficient resource"));
+  }
+
+  /**
+   * Prefetch next batch if current is exhausted.
+   *
+   * @return next batch
+   */
+  protected abstract Collection<Row<T>> prefetch() throws Exception;
+
+  private boolean isNoMoreDataInCurrentBatch() {
+    return curBatch == null || !curBatch.hasNext();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/BlockHashJoin.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/BlockHashJoin.java
index 47decf9583..90bf9923d3 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/BlockHashJoin.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/BlockHashJoin.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.join;
 
 import static com.alibaba.druid.sql.ast.statement.SQLJoinTableSource.JoinType;
@@ -16,7 +15,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import org.opensearch.common.Strings;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.sql.legacy.query.planner.core.ExecuteParams;
 import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator;
@@ -24,91 +24,87 @@
 import org.opensearch.sql.legacy.query.planner.physical.estimation.Cost;
 import org.opensearch.sql.legacy.query.planner.resource.blocksize.BlockSize;
 
-/**
- * Block-based Hash Join implementation
- */
+/** Block-based Hash Join implementation */
 public class BlockHashJoin<T> extends JoinAlgorithm<T> {
 
-    /**
-     * Use terms filter optimization or not
-     */
-    private final boolean isUseTermsFilterOptimization;
+  /** Use terms filter optimization or not */
+  private final boolean isUseTermsFilterOptimization;
 
-    public BlockHashJoin(PhysicalOperator<T> left,
-                         PhysicalOperator<T> right,
-                         JoinType type,
-                         JoinCondition condition,
-                         BlockSize blockSize,
-                         boolean isUseTermsFilterOptimization) {
-        super(left, right, type, condition, blockSize);
+  public BlockHashJoin(
+      PhysicalOperator<T> left,
+      PhysicalOperator<T> right,
+      JoinType type,
+      JoinCondition condition,
+      BlockSize blockSize,
+      boolean isUseTermsFilterOptimization) {
+    super(left, right, type, condition, blockSize);
 
-        this.isUseTermsFilterOptimization = isUseTermsFilterOptimization;
-    }
+    this.isUseTermsFilterOptimization = isUseTermsFilterOptimization;
+  }
 
-    @Override
-    public Cost estimate() {
-        return new Cost();
-    }
+  @Override
+  public Cost estimate() {
+    return new Cost();
+  }
 
-    @Override
-    protected void reopenRight() throws Exception {
-        Objects.requireNonNull(params, "Execute params is not set so unable to add extra filter");
+  @Override
+  protected void reopenRight() throws Exception {
+    Objects.requireNonNull(params, "Execute params is not set so unable to add extra filter");
 
-        if (isUseTermsFilterOptimization) {
-            params.add(ExecuteParams.ExecuteParamType.EXTRA_QUERY_FILTER, queryForPushedDownOnConds());
-        }
-        right.open(params);
+    if (isUseTermsFilterOptimization) {
+      params.add(ExecuteParams.ExecuteParamType.EXTRA_QUERY_FILTER, queryForPushedDownOnConds());
     }
-
-    @Override
-    protected List<CombinedRow<T>> probe() {
-        List<CombinedRow<T>> combinedRows = new ArrayList<>();
-        int totalSize = 0;
-
-        /* Return if already found enough matched rows to give ResourceMgr a chance to check resource usage */
-        while (right.hasNext() && totalSize < hashTable.size()) {
-            Row<T> rightRow = right.next();
-            Collection<Row<T>> matchedLeftRows = hashTable.match(rightRow);
-
-            if (!matchedLeftRows.isEmpty()) {
-                combinedRows.add(new CombinedRow<>(rightRow, matchedLeftRows));
-                totalSize += matchedLeftRows.size();
-            }
-        }
-        return combinedRows;
+    right.open(params);
+  }
+
+  @Override
+  protected List<CombinedRow<T>> probe() {
+    List<CombinedRow<T>> combinedRows = new ArrayList<>();
+    int totalSize = 0;
+
+    /* Return if already found enough matched rows to give ResourceMgr a chance to check resource usage */
+    while (right.hasNext() && totalSize < hashTable.size()) {
+      Row<T> rightRow = right.next();
+      Collection<Row<T>> matchedLeftRows = hashTable.match(rightRow);
+
+      if (!matchedLeftRows.isEmpty()) {
+        combinedRows.add(new CombinedRow<>(rightRow, matchedLeftRows));
+        totalSize += matchedLeftRows.size();
+      }
     }
-
-    /**
-     * Build query for pushed down conditions in ON
-     */
-    private BoolQueryBuilder queryForPushedDownOnConds() {
-        BoolQueryBuilder orQuery = boolQuery();
-        Map<String, Collection<Object>>[] rightNameToLeftValuesGroup = hashTable.rightFieldWithLeftValues();
-
-        for (Map<String, Collection<Object>> rightNameToLeftValues : rightNameToLeftValuesGroup) {
-            if (LOG.isTraceEnabled()) {
-                rightNameToLeftValues.forEach((rightName, leftValues) ->
-                        LOG.trace("Right name to left values mapping: {} => {}", rightName, leftValues));
-            }
-
-            BoolQueryBuilder andQuery = boolQuery();
-            rightNameToLeftValues.forEach(
-                    (rightName, leftValues) -> andQuery.must(termsQuery(rightName, leftValues))
-            );
-
-            if (LOG.isTraceEnabled()) {
-                LOG.trace("Terms filter optimization: {}", Strings.toString(andQuery));
-            }
-            orQuery.should(andQuery);
-        }
-        return orQuery;
+    return combinedRows;
+  }
+
+  /** Build query for pushed down conditions in ON */
+  private BoolQueryBuilder queryForPushedDownOnConds() {
+    BoolQueryBuilder orQuery = boolQuery();
+    Map<String, Collection<Object>>[] rightNameToLeftValuesGroup =
+        hashTable.rightFieldWithLeftValues();
+
+    for (Map<String, Collection<Object>> rightNameToLeftValues : rightNameToLeftValuesGroup) {
+      if (LOG.isTraceEnabled()) {
+        rightNameToLeftValues.forEach(
+            (rightName, leftValues) ->
+                LOG.trace("Right name to left values mapping: {} => {}", rightName, leftValues));
+      }
+
+      BoolQueryBuilder andQuery = boolQuery();
+      rightNameToLeftValues.forEach(
+          (rightName, leftValues) -> andQuery.must(termsQuery(rightName, leftValues)));
+
+      if (LOG.isTraceEnabled()) {
+        LOG.trace("Terms filter optimization: {}", Strings.toString(XContentType.JSON, andQuery));
+      }
+      orQuery.should(andQuery);
     }
+    return orQuery;
+  }
 
-    /*********************************************
-     *          Getters for Explain
-     *********************************************/
+  /*********************************************
+   *          Getters for Explain
+   *********************************************/
 
-    public boolean isUseTermsFilterOptimization() {
-        return isUseTermsFilterOptimization;
-    }
+  public boolean isUseTermsFilterOptimization() {
+    return isUseTermsFilterOptimization;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/CombinedRow.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/CombinedRow.java
index e83bbb7d0e..b1fb43441e 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/CombinedRow.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/CombinedRow.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.join;
 
 import java.util.ArrayList;
@@ -19,28 +18,28 @@
  */
 public class CombinedRow<T> {
 
-    private Row<T> rightRow;
-    private Collection<Row<T>> leftRows;
+  private Row<T> rightRow;
+  private Collection<Row<T>> leftRows;
 
-    public CombinedRow(Row<T> rightRow, Collection<Row<T>> leftRows) {
-        this.rightRow = rightRow;
-        this.leftRows = leftRows;
-    }
+  public CombinedRow(Row<T> rightRow, Collection<Row<T>> leftRows) {
+    this.rightRow = rightRow;
+    this.leftRows = leftRows;
+  }
 
-    public List<Row<T>> combine() {
-        List<Row<T>> combinedRows = new ArrayList<>();
-        for (Row<T> leftRow : leftRows) {
-            combinedRows.add(leftRow.combine(rightRow));
-        }
-        return combinedRows;
+  public List<Row<T>> combine() {
+    List<Row<T>> combinedRows = new ArrayList<>();
+    for (Row<T> leftRow : leftRows) {
+      combinedRows.add(leftRow.combine(rightRow));
     }
+    return combinedRows;
+  }
 
-    public Collection<Row<T>> leftMatchedRows() {
-        return Collections.unmodifiableCollection(leftRows);
-    }
+  public Collection<Row<T>> leftMatchedRows() {
+    return Collections.unmodifiableCollection(leftRows);
+  }
 
-    @Override
-    public String toString() {
-        return "CombinedRow{rightRow=" + rightRow + ", leftRows=" + leftRows + '}';
-    }
+  @Override
+  public String toString() {
+    return "CombinedRow{rightRow=" + rightRow + ", leftRows=" + leftRows + '}';
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/DefaultHashTable.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/DefaultHashTable.java
index 733d7a78ab..23e79d2c31 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/DefaultHashTable.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/DefaultHashTable.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.join;
 
 import static java.util.Collections.emptyList;
@@ -22,102 +21,98 @@
 import org.opensearch.sql.legacy.query.planner.physical.Row.RowKey;
 
 /**
- * Hash table implementation.
- * In the case of no join condition, hash table degrades to linked list with all rows in block paired to RowKey.NULL
+ * Hash table implementation. In the case of no join condition, hash table degrades to linked list
+ * with all rows in block paired to RowKey.NULL
  *
  * @param <T> Row data type
  */
 public class DefaultHashTable<T> implements HashTable<T> {
 
-    private static final Logger LOG = LogManager.getLogger();
-
-    /**
-     * Hash table implementation
-     */
-    private final Multimap<RowKey, Row<T>> table = ArrayListMultimap.create();
-
-    /**
-     * Left join conditions to generate key to build hash table by left rows from block
-     */
-    private final String[] leftJoinFields;
-
-    /**
-     * Right join conditions to generate key to probe hash table by right rows
-     */
-    private final String[] rightJoinFields;
-
-
-    public DefaultHashTable(String[] leftJoinFields, String[] rightJoinFields) {
-        this.leftJoinFields = leftJoinFields;
-        this.rightJoinFields = rightJoinFields;
+  private static final Logger LOG = LogManager.getLogger();
+
+  /** Hash table implementation */
+  private final Multimap<RowKey, Row<T>> table = ArrayListMultimap.create();
+
+  /** Left join conditions to generate key to build hash table by left rows from block */
+  private final String[] leftJoinFields;
+
+  /** Right join conditions to generate key to probe hash table by right rows */
+  private final String[] rightJoinFields;
+
+  public DefaultHashTable(String[] leftJoinFields, String[] rightJoinFields) {
+    this.leftJoinFields = leftJoinFields;
+    this.rightJoinFields = rightJoinFields;
+  }
+
+  /**
+   * Add row in block to hash table by left conditions in ON. For the duplicate key, append them to
+   * the list in value (MultiMap)
+   */
+  @Override
+  public void add(Row<T> row) {
+    RowKey key = row.key(leftJoinFields);
+    if (key == RowKey.NULL) {
+      LOG.debug(
+          "Skip rows with NULL column value during build: row={}, conditions={}",
+          row,
+          leftJoinFields);
+    } else {
+      table.put(key, row);
     }
-
-    /**
-     * Add row in block to hash table by left conditions in ON.
-     * For the duplicate key, append them to the list in value (MultiMap)
-     */
-    @Override
-    public void add(Row<T> row) {
-        RowKey key = row.key(leftJoinFields);
-        if (key == RowKey.NULL) {
-            LOG.debug("Skip rows with NULL column value during build: row={}, conditions={}", row, leftJoinFields);
-        } else {
-            table.put(key, row);
-        }
+  }
+
+  /** Probe hash table to match right rows by values of right conditions */
+  @Override
+  public Collection<Row<T>> match(Row<T> row) {
+    RowKey key = row.key(rightJoinFields);
+    if (key == RowKey.NULL) {
+      LOG.debug(
+          "Skip rows with NULL column value during probing: row={}, conditions={}",
+          row,
+          rightJoinFields);
+      return emptyList();
     }
-
-    /**
-     * Probe hash table to match right rows by values of right conditions
-     */
-    @Override
-    public Collection<Row<T>> match(Row<T> row) {
-        RowKey key = row.key(rightJoinFields);
-        if (key == RowKey.NULL) {
-            LOG.debug("Skip rows with NULL column value during probing: row={}, conditions={}", row, rightJoinFields);
-            return emptyList();
-        }
-        return table.get(key); // Multimap returns empty list rather null.
+    return table.get(key); // Multimap returns empty list rather null.
+  }
+
+  /** Right joined field name with according column value list to push down */
+  @SuppressWarnings("unchecked")
+  @Override
+  public Map<String, Collection<Object>>[] rightFieldWithLeftValues() {
+    Map<String, Collection<Object>> result =
+        new HashMap<>(); // Eliminate potential duplicate in values
+    for (RowKey key : table.keySet()) {
+      Object[] keys = key.keys();
+      for (int i = 0; i < keys.length; i++) {
+        result
+            .computeIfAbsent(rightJoinFields[i], (k -> new HashSet<>()))
+            .add(lowercaseIfStr(keys[i])); // Terms stored in lower case in OpenSearch
+      }
     }
 
-    /**
-     * Right joined field name with according column value list to push down
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public Map<String, Collection<Object>>[] rightFieldWithLeftValues() {
-        Map<String, Collection<Object>> result = new HashMap<>(); // Eliminate potential duplicate in values
-        for (RowKey key : table.keySet()) {
-            Object[] keys = key.keys();
-            for (int i = 0; i < keys.length; i++) {
-                result.computeIfAbsent(rightJoinFields[i], (k -> new HashSet<>())).
-                        add(lowercaseIfStr(keys[i])); // Terms stored in lower case in OpenSearch
-            }
-        }
-
-        // Convert value of Map from Guava's Set to JDK list which is expected by OpenSearch writer
-        for (Entry<String, Collection<Object>> entry : result.entrySet()) {
-            entry.setValue(new ArrayList<>(entry.getValue()));
-        }
-        return new Map[]{result};
+    // Convert value of Map from Guava's Set to JDK list which is expected by OpenSearch writer
+    for (Entry<String, Collection<Object>> entry : result.entrySet()) {
+      entry.setValue(new ArrayList<>(entry.getValue()));
     }
-
-    @Override
-    public int size() {
-        return table.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return table.isEmpty();
-    }
-
-    @Override
-    public void clear() {
-        table.clear();
-    }
-
-    private Object lowercaseIfStr(Object key) {
-        return key instanceof String ? ((String) key).toLowerCase() : key;
-    }
-
+    return new Map[] {result};
+  }
+
+  @Override
+  public int size() {
+    return table.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return table.isEmpty();
+  }
+
+  @Override
+  public void clear() {
+    table.clear();
+  }
+
+  private Object lowercaseIfStr(Object key) {
+    return key instanceof String ? ((String) key).toLowerCase() : key;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/HashTable.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/HashTable.java
index 4a20b1833b..1811af5158 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/HashTable.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/HashTable.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.join;
 
 import java.util.Collection;
@@ -17,50 +16,42 @@
  */
 public interface HashTable<T> {
 
-    /**
-     * Add one row to the hash table
-     *
-     * @param row row
-     */
-    void add(Row<T> row);
-
-
-    /**
-     * Find all matched row(s) in the hash table.
-     *
-     * @param row row to be matched
-     * @return all matches
-     */
-    Collection<Row<T>> match(Row<T> row);
-
-
-    /**
-     * Mapping from right field to value(s) of left size
-     *
-     * @return
-     */
-    Map<String, Collection<Object>>[] rightFieldWithLeftValues();
-
-
-    /**
-     * Get size of hash table
-     *
-     * @return size of hash table
-     */
-    int size();
-
-
-    /**
-     * Is hash table empty?
-     *
-     * @return true for yes
-     */
-    boolean isEmpty();
-
-
-    /**
-     * Clear internal data structure
-     */
-    void clear();
-
+  /**
+   * Add one row to the hash table
+   *
+   * @param row row
+   */
+  void add(Row<T> row);
+
+  /**
+   * Find all matched row(s) in the hash table.
+   *
+   * @param row row to be matched
+   * @return all matches
+   */
+  Collection<Row<T>> match(Row<T> row);
+
+  /**
+   * Mapping from right field to value(s) of left size
+   *
+   * @return
+   */
+  Map<String, Collection<Object>>[] rightFieldWithLeftValues();
+
+  /**
+   * Get size of hash table
+   *
+   * @return size of hash table
+   */
+  int size();
+
+  /**
+   * Is hash table empty?
+   *
+   * @return true for yes
+   */
+  boolean isEmpty();
+
+  /** Clear internal data structure */
+  void clear();
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/HashTableGroup.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/HashTableGroup.java
index c22eb9dc19..ded83429d8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/HashTableGroup.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/HashTableGroup.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.join;
 
 import static org.opensearch.sql.legacy.query.planner.logical.node.Join.JoinCondition;
@@ -15,75 +14,69 @@
 import java.util.Set;
 import org.opensearch.sql.legacy.query.planner.physical.Row;
 
-/**
- * Hash table group with each hash table per AND join condition.
- */
+/** Hash table group with each hash table per AND join condition. */
 public class HashTableGroup<T> implements HashTable<T> {
 
-    private final HashTable<T>[] hashTables;
+  private final HashTable<T>[] hashTables;
 
-    /**
-     * Number of rows stored in the hash table (in other words, = block size)
-     */
-    private int numOfRows = 0;
+  /** Number of rows stored in the hash table (in other words, = block size) */
+  private int numOfRows = 0;
 
-    @SuppressWarnings("unchecked")
-    public HashTableGroup(JoinCondition condition) {
-        int groupSize = condition.groupSize();
-        if (groupSize == 0) {
-            // Create one hash table (degraded to list) for Cross Join
-            hashTables = new HashTable[]{new ListHashTable()};
-        } else {
-            hashTables = new HashTable[groupSize];
-            for (int i = 0; i < groupSize; i++) {
-                hashTables[i] = new DefaultHashTable<>(
-                        condition.leftColumnNames(i),
-                        condition.rightColumnNames(i)
-                );
-            }
-        }
+  @SuppressWarnings("unchecked")
+  public HashTableGroup(JoinCondition condition) {
+    int groupSize = condition.groupSize();
+    if (groupSize == 0) {
+      // Create one hash table (degraded to list) for Cross Join
+      hashTables = new HashTable[] {new ListHashTable()};
+    } else {
+      hashTables = new HashTable[groupSize];
+      for (int i = 0; i < groupSize; i++) {
+        hashTables[i] =
+            new DefaultHashTable<>(condition.leftColumnNames(i), condition.rightColumnNames(i));
+      }
     }
+  }
 
-    @Override
-    public void add(Row<T> row) {
-        for (HashTable<T> hashTable : hashTables) {
-            hashTable.add(row);
-        }
-        numOfRows++;
+  @Override
+  public void add(Row<T> row) {
+    for (HashTable<T> hashTable : hashTables) {
+      hashTable.add(row);
     }
+    numOfRows++;
+  }
 
-    @Override
-    public Collection<Row<T>> match(Row<T> row) {
-        Set<Row<T>> allMatched = Sets.newIdentityHashSet();
-        for (HashTable<T> hashTable : hashTables) {
-            allMatched.addAll(hashTable.match(row));
-        }
-        return allMatched;
+  @Override
+  public Collection<Row<T>> match(Row<T> row) {
+    Set<Row<T>> allMatched = Sets.newIdentityHashSet();
+    for (HashTable<T> hashTable : hashTables) {
+      allMatched.addAll(hashTable.match(row));
     }
+    return allMatched;
+  }
 
-    @SuppressWarnings("unchecked")
-    public Map<String, Collection<Object>>[] rightFieldWithLeftValues() {
-        return Arrays.stream(hashTables).
-                map(hashTable -> hashTable.rightFieldWithLeftValues()[0]). // Make interface consistent
-                toArray(Map[]::new);
-    }
+  @SuppressWarnings("unchecked")
+  public Map<String, Collection<Object>>[] rightFieldWithLeftValues() {
+    return Arrays.stream(hashTables)
+        .map(hashTable -> hashTable.rightFieldWithLeftValues()[0])
+        . // Make interface consistent
+        toArray(Map[]::new);
+  }
 
-    @Override
-    public boolean isEmpty() {
-        return numOfRows == 0;
-    }
+  @Override
+  public boolean isEmpty() {
+    return numOfRows == 0;
+  }
 
-    @Override
-    public int size() {
-        return numOfRows;
-    }
+  @Override
+  public int size() {
+    return numOfRows;
+  }
 
-    @Override
-    public void clear() {
-        for (HashTable<T> hashTable : hashTables) {
-            hashTable.clear();
-        }
-        numOfRows = 0;
+  @Override
+  public void clear() {
+    for (HashTable<T> hashTable : hashTables) {
+      hashTable.clear();
     }
-
+    numOfRows = 0;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/JoinAlgorithm.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/JoinAlgorithm.java
index 07f008bea4..cdda116970 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/JoinAlgorithm.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/JoinAlgorithm.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.join;
 
 import static java.util.Collections.emptyList;
@@ -31,253 +30,232 @@
  */
 public abstract class JoinAlgorithm<T> extends BatchPhysicalOperator<T> {
 
-    protected static final Logger LOG = LogManager.getLogger();
-
-    /**
-     * Left child operator
-     */
-    private final PhysicalOperator<T> left;
-
-    /**
-     * Right child operator handled by concrete join algorithm subclass
-     */
-    protected final PhysicalOperator<T> right;
-
-    /**
-     * Join type ex. inner join, left join
-     */
-    private final JoinType type;
-
-    /**
-     * Joined columns in ON conditions
-     */
-    private final JoinCondition condition;
-
-    /**
-     * Block size calculator
-     */
-    private final BlockSize blockSize;
-
-    /**
-     * Bookkeeping unmatched rows in current block from left
-     */
-    private final Set<Row<T>> leftMismatch;
-
-    /**
-     * Hash table for right table probing
-     */
-    protected HashTable<T> hashTable;
-
-    /**
-     * Execute params to reset right side for each left block
-     */
-    protected ExecuteParams params;
-
-    JoinAlgorithm(PhysicalOperator<T> left,
-                  PhysicalOperator<T> right,
-                  JoinType type,
-                  JoinCondition condition,
-                  BlockSize blockSize) {
-        this.left = left;
-        this.right = right;
-        this.type = type;
-        this.condition = condition;
-        this.blockSize = blockSize;
-        this.hashTable = new HashTableGroup<>(condition);
-        this.leftMismatch = Sets.newIdentityHashSet();
-    }
-
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[]{left, right};
-    }
+  protected static final Logger LOG = LogManager.getLogger();
+
+  /** Left child operator */
+  private final PhysicalOperator<T> left;
+
+  /** Right child operator handled by concrete join algorithm subclass */
+  protected final PhysicalOperator<T> right;
+
+  /** Join type ex. inner join, left join */
+  private final JoinType type;
+
+  /** Joined columns in ON conditions */
+  private final JoinCondition condition;
+
+  /** Block size calculator */
+  private final BlockSize blockSize;
+
+  /** Bookkeeping unmatched rows in current block from left */
+  private final Set<Row<T>> leftMismatch;
+
+  /** Hash table for right table probing */
+  protected HashTable<T> hashTable;
+
+  /** Execute params to reset right side for each left block */
+  protected ExecuteParams params;
+
+  JoinAlgorithm(
+      PhysicalOperator<T> left,
+      PhysicalOperator<T> right,
+      JoinType type,
+      JoinCondition condition,
+      BlockSize blockSize) {
+    this.left = left;
+    this.right = right;
+    this.type = type;
+    this.condition = condition;
+    this.blockSize = blockSize;
+    this.hashTable = new HashTableGroup<>(condition);
+    this.leftMismatch = Sets.newIdentityHashSet();
+  }
+
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[] {left, right};
+  }
+
+  @Override
+  public void open(ExecuteParams params) throws Exception {
+    super.open(params);
+    left.open(params);
+    this.params = params;
+  }
+
+  @Override
+  public void close() {
+    super.close();
+    hashTable.clear();
+    leftMismatch.clear();
+    LOG.debug("Cleared all resources used by join");
+  }
+
+  /**
+   * Build-probe left and right block by block to prefetch next matches (and mismatches if outer
+   * join).
+   *
+   * <p>1) Build hash table and open right side. 2) Keep probing right to find matched rows
+   * (meanwhile update mismatched set) 3) Check if any row in mismatched set to return in the case
+   * of outer join. 4) Nothing remained now, move on to next block of left. Go back to step 1.
+   *
+   * <p>This is a new run AND no block from left means algorithm should stop and return empty.
+   */
+  @Override
+  protected Collection<Row<T>> prefetch() throws Exception {
+    while (!isNewRunButNoMoreBlockFromLeft()) {
+
+      // 1.Build hash table and (re-)open right side for the new run
+      if (isNewRun()) {
+        buildHashTableByNextBlock();
+        reopenRight();
+      }
+
+      // 2.Keep probing right by the hash table and bookkeeping mismatch
+      while (isAnyMoreDataFromRight()) {
+        Collection<Row<T>> matched = probeMatchAndBookkeepMismatch();
+        if (!matched.isEmpty()) {
+          return matched;
+        }
+      }
 
-    @Override
-    public void open(ExecuteParams params) throws Exception {
-        super.open(params);
-        left.open(params);
-        this.params = params;
-    }
+      // 3.You know it's a mismatch only after this run finished (left block + all right).
+      if (isAnyMismatchForOuterJoin()) {
+        return returnAndClearMismatch();
+      }
 
-    @Override
-    public void close() {
-        super.close();
-        hashTable.clear();
-        leftMismatch.clear();
-        LOG.debug("Cleared all resources used by join");
+      // 4.Clean up and close right
+      cleanUpAndCloseRight();
     }
+    return emptyList();
+  }
 
-    /**
-     * Build-probe left and right block by block to prefetch next matches (and mismatches if outer join).
-     * <p>
-     * 1) Build hash table and open right side.
-     * 2) Keep probing right to find matched rows (meanwhile update mismatched set)
-     * 3) Check if any row in mismatched set to return in the case of outer join.
-     * 4) Nothing remained now, move on to next block of left. Go back to step 1.
-     * <p>
-     * This is a new run AND no block from left means algorithm should stop and return empty.
-     */
-    @Override
-    protected Collection<Row<T>> prefetch() throws Exception {
-        while (!isNewRunButNoMoreBlockFromLeft()) {
-
-            // 1.Build hash table and (re-)open right side for the new run
-            if (isNewRun()) {
-                buildHashTableByNextBlock();
-                reopenRight();
-            }
-
-            // 2.Keep probing right by the hash table and bookkeeping mismatch
-            while (isAnyMoreDataFromRight()) {
-                Collection<Row<T>> matched = probeMatchAndBookkeepMismatch();
-                if (!matched.isEmpty()) {
-                    return matched;
-                }
-            }
-
-            // 3.You know it's a mismatch only after this run finished (left block + all right).
-            if (isAnyMismatchForOuterJoin()) {
-                return returnAndClearMismatch();
-            }
-
-            // 4.Clean up and close right
-            cleanUpAndCloseRight();
-        }
-        return emptyList();
+  /** Probe right by hash table built from left. Handle matched and mismatched rows. */
+  private Collection<Row<T>> probeMatchAndBookkeepMismatch() {
+    if (hashTable.isEmpty()) {
+      throw new IllegalStateException("Hash table is NOT supposed to be empty");
     }
 
-    /**
-     * Probe right by hash table built from left. Handle matched and mismatched rows.
-     */
-    private Collection<Row<T>> probeMatchAndBookkeepMismatch() {
-        if (hashTable.isEmpty()) {
-            throw new IllegalStateException("Hash table is NOT supposed to be empty");
-        }
+    List<CombinedRow<T>> combinedRows = probe();
 
-        List<CombinedRow<T>> combinedRows = probe();
+    List<Row<T>> matchRows = new ArrayList<>();
+    if (combinedRows.isEmpty()) {
+      LOG.debug("No matched row found");
+    } else {
+      if (LOG.isTraceEnabled()) {
+        combinedRows.forEach(row -> LOG.trace("Matched row before combined: {}", row));
+      }
 
-        List<Row<T>> matchRows = new ArrayList<>();
-        if (combinedRows.isEmpty()) {
-            LOG.debug("No matched row found");
-        } else {
-            if (LOG.isTraceEnabled()) {
-                combinedRows.forEach(row -> LOG.trace("Matched row before combined: {}", row));
-            }
+      for (CombinedRow<T> row : combinedRows) {
+        matchRows.addAll(row.combine());
+      }
 
-            for (CombinedRow<T> row : combinedRows) {
-                matchRows.addAll(row.combine());
-            }
+      if (LOG.isTraceEnabled()) {
+        matchRows.forEach(row -> LOG.trace("Matched row after combined: {}", row));
+      }
 
-            if (LOG.isTraceEnabled()) {
-                matchRows.forEach(row -> LOG.trace("Matched row after combined: {}", row));
-            }
-
-            bookkeepMismatchedRows(combinedRows);
-        }
-        return matchRows;
+      bookkeepMismatchedRows(combinedRows);
     }
-
-    private boolean isNewRunButNoMoreBlockFromLeft() {
-        return isNewRun() && !isAnyMoreBlockFromLeft();
+    return matchRows;
+  }
+
+  private boolean isNewRunButNoMoreBlockFromLeft() {
+    return isNewRun() && !isAnyMoreBlockFromLeft();
+  }
+
+  private boolean isNewRun() {
+    return hashTable.isEmpty();
+  }
+
+  private boolean isAnyMoreBlockFromLeft() {
+    return left.hasNext();
+  }
+
+  private boolean isAnyMoreDataFromRight() {
+    return right.hasNext();
+  }
+
+  private boolean isAnyMismatchForOuterJoin() {
+    return !leftMismatch.isEmpty();
+  }
+
+  /** Clone mismatch list and clear it so that we won't return it forever */
+  @SuppressWarnings("unchecked")
+  private Collection<Row<T>> returnAndClearMismatch() {
+    if (LOG.isTraceEnabled()) {
+      leftMismatch.forEach(row -> LOG.trace("Mismatched rows before combined: {}", row));
     }
 
-    private boolean isNewRun() {
-        return hashTable.isEmpty();
+    List<Row<T>> result = new ArrayList<>();
+    for (Row<T> row : leftMismatch) {
+      result.add(row.combine(Row.NULL));
     }
 
-    private boolean isAnyMoreBlockFromLeft() {
-        return left.hasNext();
+    if (LOG.isTraceEnabled()) {
+      result.forEach(row -> LOG.trace("Mismatched rows after combined: {}", row));
     }
-
-    private boolean isAnyMoreDataFromRight() {
-        return right.hasNext();
+    leftMismatch.clear();
+    return result;
+  }
+
+  /** Building phase: Build hash table from data block. */
+  private void buildHashTableByNextBlock() {
+    List<Row<T>> block = loadNextBlockFromLeft(blockSize.size());
+    if (LOG.isTraceEnabled()) {
+      LOG.trace("Build hash table on conditions with block: {}, {}", condition, block);
     }
 
-    private boolean isAnyMismatchForOuterJoin() {
-        return !leftMismatch.isEmpty();
+    for (Row<T> data : block) {
+      hashTable.add(data);
     }
 
-    /**
-     * Clone mismatch list and clear it so that we won't return it forever
-     */
-    @SuppressWarnings("unchecked")
-    private Collection<Row<T>> returnAndClearMismatch() {
-        if (LOG.isTraceEnabled()) {
-            leftMismatch.forEach(row -> LOG.trace("Mismatched rows before combined: {}", row));
-        }
-
-        List<Row<T>> result = new ArrayList<>();
-        for (Row<T> row : leftMismatch) {
-            result.add(row.combine(Row.NULL));
-        }
-
-        if (LOG.isTraceEnabled()) {
-            result.forEach(row -> LOG.trace("Mismatched rows after combined: {}", row));
-        }
-        leftMismatch.clear();
-        return result;
+    if (type == JoinType.LEFT_OUTER_JOIN) {
+      leftMismatch.addAll(block);
     }
-
-    /**
-     * Building phase:
-     * Build hash table from data block.
-     */
-    private void buildHashTableByNextBlock() {
-        List<Row<T>> block = loadNextBlockFromLeft(blockSize.size());
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Build hash table on conditions with block: {}, {}", condition, block);
-        }
-
-        for (Row<T> data : block) {
-            hashTable.add(data);
-        }
-
-        if (type == JoinType.LEFT_OUTER_JOIN) {
-            leftMismatch.addAll(block);
-        }
-    }
-
-    private void cleanUpAndCloseRight() {
-        LOG.debug("No more data from right. Clean up and close right.");
-        hashTable.clear();
-        leftMismatch.clear();
-        right.close();
-    }
-
-    private List<Row<T>> loadNextBlockFromLeft(int blockSize) {
-        List<Row<T>> block = new ArrayList<>();
-        for (int i = 0; i < blockSize && left.hasNext(); i++) {
-            block.add(left.next());
-        }
-        return block;
+  }
+
+  private void cleanUpAndCloseRight() {
+    LOG.debug("No more data from right. Clean up and close right.");
+    hashTable.clear();
+    leftMismatch.clear();
+    right.close();
+  }
+
+  private List<Row<T>> loadNextBlockFromLeft(int blockSize) {
+    List<Row<T>> block = new ArrayList<>();
+    for (int i = 0; i < blockSize && left.hasNext(); i++) {
+      block.add(left.next());
     }
-
-    private void bookkeepMismatchedRows(List<CombinedRow<T>> combinedRows) {
-        if (type == JoinType.LEFT_OUTER_JOIN) {
-            for (CombinedRow<T> row : combinedRows) {
-                leftMismatch.removeAll(row.leftMatchedRows());
-            }
-        }
+    return block;
+  }
+
+  private void bookkeepMismatchedRows(List<CombinedRow<T>> combinedRows) {
+    if (type == JoinType.LEFT_OUTER_JOIN) {
+      for (CombinedRow<T> row : combinedRows) {
+        leftMismatch.removeAll(row.leftMatchedRows());
+      }
     }
-
-    /**
-     * (Re-)open right side by params.
-     */
-    protected abstract void reopenRight() throws Exception;
-
-
-    /**
-     * Probing phase
-     *
-     * @return matched rows from left and right in
-     */
-    protected abstract List<CombinedRow<T>> probe();
-
-
-    @Override
-    public String toString() {
-        return getClass().getSimpleName() + "[ conditions=" + condition
-                + ", type=" + type + ", blockSize=[" + blockSize + "] ]";
-    }
-
+  }
+
+  /** (Re-)open right side by params. */
+  protected abstract void reopenRight() throws Exception;
+
+  /**
+   * Probing phase
+   *
+   * @return matched rows from left and right in
+   */
+  protected abstract List<CombinedRow<T>> probe();
+
+  @Override
+  public String toString() {
+    return getClass().getSimpleName()
+        + "[ conditions="
+        + condition
+        + ", type="
+        + type
+        + ", blockSize=["
+        + blockSize
+        + "] ]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/ListHashTable.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/ListHashTable.java
index 5d39529632..baf0af8c86 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/ListHashTable.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/join/ListHashTable.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.join;
 
 import java.util.ArrayList;
@@ -13,41 +12,39 @@
 import java.util.Map;
 import org.opensearch.sql.legacy.query.planner.physical.Row;
 
-/**
- * List implementation to avoid normal hash table degrading into linked list.
- */
+/** List implementation to avoid normal hash table degrading into linked list. */
 public class ListHashTable<T> implements HashTable<T> {
 
-    private List<Row<T>> rows = new ArrayList<>();
-
-    @Override
-    public void add(Row<T> row) {
-        rows.add(row);
-    }
-
-    @Override
-    public Collection<Row<T>> match(Row<T> row) {
-        return rows;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Map<String, Collection<Object>>[] rightFieldWithLeftValues() {
-        return new Map[]{new HashMap()};
-    }
-
-    @Override
-    public int size() {
-        return rows.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return rows.isEmpty();
-    }
-
-    @Override
-    public void clear() {
-        rows.clear();
-    }
+  private List<Row<T>> rows = new ArrayList<>();
+
+  @Override
+  public void add(Row<T> row) {
+    rows.add(row);
+  }
+
+  @Override
+  public Collection<Row<T>> match(Row<T> row) {
+    return rows;
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public Map<String, Collection<Object>>[] rightFieldWithLeftValues() {
+    return new Map[] {new HashMap()};
+  }
+
+  @Override
+  public int size() {
+    return rows.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return rows.isEmpty();
+  }
+
+  @Override
+  public void clear() {
+    rows.clear();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/project/PhysicalProject.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/project/PhysicalProject.java
index 9c4bdc5c9e..e09ef5c3fe 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/project/PhysicalProject.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/project/PhysicalProject.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.project;
 
 import java.util.List;
@@ -16,34 +15,34 @@
 import org.opensearch.sql.legacy.query.planner.physical.estimation.Cost;
 import org.opensearch.sql.legacy.query.planner.physical.node.scroll.BindingTupleRow;
 
-/**
- * The definition of Project Operator.
- */
+/** The definition of Project Operator. */
 @RequiredArgsConstructor
 public class PhysicalProject implements PhysicalOperator<BindingTuple> {
-    private final PhysicalOperator<BindingTuple> next;
-    private final List<ColumnNode> fields;
-
-    @Override
-    public Cost estimate() {
-        return null;
-    }
-
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[]{next};
-    }
-
-    @Override
-    public boolean hasNext() {
-        return next.hasNext();
-    }
-
-    @Override
-    public Row<BindingTuple> next() {
-        BindingTuple input = next.next().data();
-        BindingTuple.BindingTupleBuilder outputBindingTupleBuilder = BindingTuple.builder();
-        fields.forEach(field -> outputBindingTupleBuilder.binding(field.getName(), field.getExpr().valueOf(input)));
-        return new BindingTupleRow(outputBindingTupleBuilder.build());
-    }
+  private final PhysicalOperator<BindingTuple> next;
+  private final List<ColumnNode> fields;
+
+  @Override
+  public Cost estimate() {
+    return null;
+  }
+
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[] {next};
+  }
+
+  @Override
+  public boolean hasNext() {
+    return next.hasNext();
+  }
+
+  @Override
+  public Row<BindingTuple> next() {
+    BindingTuple input = next.next().data();
+    BindingTuple.BindingTupleBuilder outputBindingTupleBuilder = BindingTuple.builder();
+    fields.forEach(
+        field ->
+            outputBindingTupleBuilder.binding(field.getName(), field.getExpr().valueOf(input)));
+    return new BindingTupleRow(outputBindingTupleBuilder.build());
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/BindingTupleRow.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/BindingTupleRow.java
index 9e3a190e30..41f500fed1 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/BindingTupleRow.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/BindingTupleRow.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.scroll;
 
 import java.util.Map;
@@ -13,25 +12,25 @@
 
 @RequiredArgsConstructor
 public class BindingTupleRow implements Row<BindingTuple> {
-    private final BindingTuple bindingTuple;
-
-    @Override
-    public RowKey key(String[] colNames) {
-        return null;
-    }
-
-    @Override
-    public Row<BindingTuple> combine(Row<BindingTuple> otherRow) {
-        throw new RuntimeException("unsupported operation");
-    }
-
-    @Override
-    public void retain(Map<String, String> colNameAlias) {
-        // do nothing
-    }
-
-    @Override
-    public BindingTuple data() {
-        return bindingTuple;
-    }
+  private final BindingTuple bindingTuple;
+
+  @Override
+  public RowKey key(String[] colNames) {
+    return null;
+  }
+
+  @Override
+  public Row<BindingTuple> combine(Row<BindingTuple> otherRow) {
+    throw new RuntimeException("unsupported operation");
+  }
+
+  @Override
+  public void retain(Map<String, String> colNameAlias) {
+    // do nothing
+  }
+
+  @Override
+  public BindingTuple data() {
+    return bindingTuple;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/PhysicalScroll.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/PhysicalScroll.java
index ec81913807..16ad327a87 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/PhysicalScroll.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/PhysicalScroll.java
@@ -3,14 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.scroll;
 
 import java.util.Iterator;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.search.SearchResponse;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
 import org.opensearch.sql.legacy.query.AggregationQueryAction;
@@ -21,54 +20,53 @@
 import org.opensearch.sql.legacy.query.planner.physical.Row;
 import org.opensearch.sql.legacy.query.planner.physical.estimation.Cost;
 
-/**
- * The definition of Scroll Operator.
- */
+/** The definition of Scroll Operator. */
 @RequiredArgsConstructor
 public class PhysicalScroll implements PhysicalOperator<BindingTuple> {
-    private final QueryAction queryAction;
+  private final QueryAction queryAction;
 
-    private Iterator<BindingTupleRow> rowIterator;
+  private Iterator<BindingTupleRow> rowIterator;
 
-    @Override
-    public Cost estimate() {
-        return null;
-    }
+  @Override
+  public Cost estimate() {
+    return null;
+  }
 
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[0];
-    }
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[0];
+  }
 
-    @Override
-    public boolean hasNext() {
-        return rowIterator.hasNext();
-    }
+  @Override
+  public boolean hasNext() {
+    return rowIterator.hasNext();
+  }
 
-    @Override
-    public Row<BindingTuple> next() {
-        return rowIterator.next();
-    }
+  @Override
+  public Row<BindingTuple> next() {
+    return rowIterator.next();
+  }
 
-    @Override
-    public void open(ExecuteParams params) {
-        try {
-            ActionResponse response = queryAction.explain().get();
-            if (queryAction instanceof AggregationQueryAction) {
-                rowIterator = SearchAggregationResponseHelper
-                        .populateSearchAggregationResponse(((SearchResponse) response).getAggregations())
-                        .iterator();
-            } else {
-                throw new IllegalStateException("Not support QueryAction type: " + queryAction.getClass());
-            }
-        } catch (SqlParseException e) {
-            throw new RuntimeException(e);
-        }
+  @Override
+  public void open(ExecuteParams params) {
+    try {
+      ActionResponse response = queryAction.explain().get();
+      if (queryAction instanceof AggregationQueryAction) {
+        rowIterator =
+            SearchAggregationResponseHelper.populateSearchAggregationResponse(
+                    ((SearchResponse) response).getAggregations())
+                .iterator();
+      } else {
+        throw new IllegalStateException("Not support QueryAction type: " + queryAction.getClass());
+      }
+    } catch (SqlParseException e) {
+      throw new RuntimeException(e);
     }
+  }
 
-    @SneakyThrows
-    @Override
-    public String toString() {
-        return queryAction.explain().toString();
-    }
+  @SneakyThrows
+  @Override
+  public String toString() {
+    return queryAction.explain().toString();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/Scroll.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/Scroll.java
index 875216e3c7..40e9860886 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/Scroll.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/Scroll.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.scroll;
 
 import java.util.Arrays;
@@ -12,8 +11,9 @@
 import org.opensearch.action.search.ClearScrollResponse;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
-import org.opensearch.common.Strings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.search.SearchHit;
@@ -30,170 +30,160 @@
 import org.opensearch.sql.legacy.query.planner.physical.node.BatchPhysicalOperator;
 import org.opensearch.sql.legacy.query.planner.resource.ResourceManager;
 
-/**
- * OpenSearch Scroll API as physical implementation of TableScan
- */
+/** OpenSearch Scroll API as physical implementation of TableScan */
 public class Scroll extends BatchPhysicalOperator<SearchHit> {
 
-    /**
-     * Request to submit to OpenSearch to scroll over
-     */
-    private final TableInJoinRequestBuilder request;
-
-    /**
-     * Page size to scroll over index
-     */
-    private final int pageSize;
-
-    /**
-     * Client connection to ElasticSearch
-     */
-    private Client client;
-
-    /**
-     * Currently undergoing Scroll
-     */
-    private SearchResponse scrollResponse;
-
-    /**
-     * Time out
-     */
-    private Integer timeout;
-
-    /**
-     * Resource monitor manager
-     */
-    private ResourceManager resourceMgr;
-
-
-    public Scroll(TableInJoinRequestBuilder request, int pageSize) {
-        this.request = request;
-        this.pageSize = pageSize;
+  /** Request to submit to OpenSearch to scroll over */
+  private final TableInJoinRequestBuilder request;
+
+  /** Page size to scroll over index */
+  private final int pageSize;
+
+  /** Client connection to ElasticSearch */
+  private Client client;
+
+  /** Currently undergoing Scroll */
+  private SearchResponse scrollResponse;
+
+  /** Time out */
+  private Integer timeout;
+
+  /** Resource monitor manager */
+  private ResourceManager resourceMgr;
+
+  public Scroll(TableInJoinRequestBuilder request, int pageSize) {
+    this.request = request;
+    this.pageSize = pageSize;
+  }
+
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[0];
+  }
+
+  @Override
+  public Cost estimate() {
+    return new Cost();
+  }
+
+  @Override
+  public void open(ExecuteParams params) throws Exception {
+    super.open(params);
+    client = params.get(ExecuteParams.ExecuteParamType.CLIENT);
+    timeout = params.get(ExecuteParams.ExecuteParamType.TIMEOUT);
+    resourceMgr = params.get(ExecuteParams.ExecuteParamType.RESOURCE_MANAGER);
+
+    Object filter = params.get(ExecuteParams.ExecuteParamType.EXTRA_QUERY_FILTER);
+    if (filter instanceof BoolQueryBuilder) {
+      request
+          .getRequestBuilder()
+          .setQuery(generateNewQueryWithExtraFilter((BoolQueryBuilder) filter));
+
+      if (LOG.isDebugEnabled()) {
+        LOG.debug(
+            "Received extra query filter, re-build query: {}",
+            Strings.toString(
+                XContentType.JSON, request.getRequestBuilder().request().source(), true, true));
+      }
     }
-
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[0];
+  }
+
+  @Override
+  public void close() {
+    if (scrollResponse != null) {
+      LOG.debug("Closing all scroll resources");
+      ClearScrollResponse clearScrollResponse =
+          client.prepareClearScroll().addScrollId(scrollResponse.getScrollId()).get();
+      if (!clearScrollResponse.isSucceeded()) {
+        LOG.warn("Failed to close scroll: {}", clearScrollResponse.status());
+      }
+      scrollResponse = null;
+    } else {
+      LOG.debug("Scroll already be closed");
     }
-
-    @Override
-    public Cost estimate() {
-        return new Cost();
+  }
+
+  @Override
+  protected Collection<Row<SearchHit>> prefetch() {
+    Objects.requireNonNull(client, "Client connection is not ready");
+    Objects.requireNonNull(resourceMgr, "ResourceManager is not set");
+    Objects.requireNonNull(timeout, "Time out is not set");
+
+    if (scrollResponse == null) {
+      loadFirstBatch();
+      updateMetaResult();
+    } else {
+      loadNextBatchByScrollId();
     }
-
-    @Override
-    public void open(ExecuteParams params) throws Exception {
-        super.open(params);
-        client = params.get(ExecuteParams.ExecuteParamType.CLIENT);
-        timeout = params.get(ExecuteParams.ExecuteParamType.TIMEOUT);
-        resourceMgr = params.get(ExecuteParams.ExecuteParamType.RESOURCE_MANAGER);
-
-        Object filter = params.get(ExecuteParams.ExecuteParamType.EXTRA_QUERY_FILTER);
-        if (filter instanceof BoolQueryBuilder) {
-            request.getRequestBuilder().setQuery(
-                    generateNewQueryWithExtraFilter((BoolQueryBuilder) filter));
-
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Received extra query filter, re-build query: {}", Strings.toString(
-                        request.getRequestBuilder().request().source(), true, true
-                ));
-            }
-        }
+    return wrapRowForCurrentBatch();
+  }
+
+  /**
+   * Extra filter pushed down from upstream. Re-parse WHERE clause with extra filter because
+   * OpenSearch RequestBuilder doesn't allow QueryBuilder inside be changed after added.
+   */
+  private QueryBuilder generateNewQueryWithExtraFilter(BoolQueryBuilder filter)
+      throws SqlParseException {
+    Where where = request.getOriginalSelect().getWhere();
+    BoolQueryBuilder newQuery;
+    if (where != null) {
+      newQuery = QueryMaker.explain(where, false);
+      newQuery.must(filter);
+    } else {
+      newQuery = filter;
     }
-
-    @Override
-    public void close() {
-        if (scrollResponse != null) {
-            LOG.debug("Closing all scroll resources");
-            ClearScrollResponse clearScrollResponse = client.prepareClearScroll().
-                    addScrollId(scrollResponse.getScrollId()).
-                    get();
-            if (!clearScrollResponse.isSucceeded()) {
-                LOG.warn("Failed to close scroll: {}", clearScrollResponse.status());
-            }
-            scrollResponse = null;
-        } else {
-            LOG.debug("Scroll already be closed");
-        }
+    return newQuery;
+  }
+
+  private void loadFirstBatch() {
+    scrollResponse =
+        request
+            .getRequestBuilder()
+            .addSort(FieldSortBuilder.DOC_FIELD_NAME, SortOrder.ASC)
+            .setSize(pageSize)
+            .setScroll(TimeValue.timeValueSeconds(timeout))
+            .get();
+  }
+
+  private void updateMetaResult() {
+    resourceMgr.getMetaResult().addTotalNumOfShards(scrollResponse.getTotalShards());
+    resourceMgr.getMetaResult().addSuccessfulShards(scrollResponse.getSuccessfulShards());
+    resourceMgr.getMetaResult().addFailedShards(scrollResponse.getFailedShards());
+    resourceMgr.getMetaResult().updateTimeOut(scrollResponse.isTimedOut());
+  }
+
+  private void loadNextBatchByScrollId() {
+    scrollResponse =
+        client
+            .prepareSearchScroll(scrollResponse.getScrollId())
+            .setScroll(TimeValue.timeValueSeconds(timeout))
+            .get();
+  }
+
+  @SuppressWarnings("unchecked")
+  private Collection<Row<SearchHit>> wrapRowForCurrentBatch() {
+    SearchHit[] hits = scrollResponse.getHits().getHits();
+    Row[] rows = new Row[hits.length];
+    for (int i = 0; i < hits.length; i++) {
+      rows[i] = new SearchHitRow(hits[i], request.getAlias());
     }
+    return Arrays.asList(rows);
+  }
 
-    @Override
-    protected Collection<Row<SearchHit>> prefetch() {
-        Objects.requireNonNull(client, "Client connection is not ready");
-        Objects.requireNonNull(resourceMgr, "ResourceManager is not set");
-        Objects.requireNonNull(timeout, "Time out is not set");
-
-        if (scrollResponse == null) {
-            loadFirstBatch();
-            updateMetaResult();
-        } else {
-            loadNextBatchByScrollId();
-        }
-        return wrapRowForCurrentBatch();
-    }
+  @Override
+  public String toString() {
+    return "Scroll [ " + describeTable() + ", pageSize=" + pageSize + " ]";
+  }
 
-    /**
-     * Extra filter pushed down from upstream. Re-parse WHERE clause with extra filter
-     * because OpenSearch RequestBuilder doesn't allow QueryBuilder inside be changed after added.
-     */
-    private QueryBuilder generateNewQueryWithExtraFilter(BoolQueryBuilder filter) throws SqlParseException {
-        Where where = request.getOriginalSelect().getWhere();
-        BoolQueryBuilder newQuery;
-        if (where != null) {
-            newQuery = QueryMaker.explain(where, false);
-            newQuery.must(filter);
-        } else {
-            newQuery = filter;
-        }
-        return newQuery;
-    }
+  private String describeTable() {
+    return request.getOriginalSelect().getFrom().get(0).getIndex() + " as " + request.getAlias();
+  }
 
-    private void loadFirstBatch() {
-        scrollResponse = request.getRequestBuilder().
-                addSort(FieldSortBuilder.DOC_FIELD_NAME, SortOrder.ASC).
-                setSize(pageSize).
-                setScroll(TimeValue.timeValueSeconds(timeout)).
-                get();
-    }
-
-    private void updateMetaResult() {
-        resourceMgr.getMetaResult().addTotalNumOfShards(scrollResponse.getTotalShards());
-        resourceMgr.getMetaResult().addSuccessfulShards(scrollResponse.getSuccessfulShards());
-        resourceMgr.getMetaResult().addFailedShards(scrollResponse.getFailedShards());
-        resourceMgr.getMetaResult().updateTimeOut(scrollResponse.isTimedOut());
-    }
-
-    private void loadNextBatchByScrollId() {
-        scrollResponse = client.prepareSearchScroll(scrollResponse.getScrollId()).
-                setScroll(TimeValue.timeValueSeconds(timeout)).
-                get();
-    }
-
-    @SuppressWarnings("unchecked")
-    private Collection<Row<SearchHit>> wrapRowForCurrentBatch() {
-        SearchHit[] hits = scrollResponse.getHits().getHits();
-        Row[] rows = new Row[hits.length];
-        for (int i = 0; i < hits.length; i++) {
-            rows[i] = new SearchHitRow(hits[i], request.getAlias());
-        }
-        return Arrays.asList(rows);
-    }
+  /*********************************************
+   *          Getters for Explain
+   *********************************************/
 
-    @Override
-    public String toString() {
-        return "Scroll [ " + describeTable() + ", pageSize=" + pageSize + " ]";
-    }
-
-    private String describeTable() {
-        return request.getOriginalSelect().getFrom().get(0).getIndex() + " as " + request.getAlias();
-    }
-
-
-    /*********************************************
-     *          Getters for Explain
-     *********************************************/
-
-    public String getRequest() {
-        return Strings.toString(request.getRequestBuilder().request().source());
-    }
+  public String getRequest() {
+    return Strings.toString(XContentType.JSON, request.getRequestBuilder().request().source());
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/SearchAggregationResponseHelper.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/SearchAggregationResponseHelper.java
index 5e0ce1f2b4..ed0e0f2423 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/SearchAggregationResponseHelper.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/SearchAggregationResponseHelper.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.scroll;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -22,70 +21,82 @@
 import org.opensearch.search.aggregations.metrics.Percentiles;
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
 
-/**
- * The definition of Search {@link Aggregations} parser helper class.
- */
+/** The definition of Search {@link Aggregations} parser helper class. */
 public class SearchAggregationResponseHelper {
-    public static List<BindingTupleRow> populateSearchAggregationResponse(Aggregations aggs) {
-        List<Map<String, Object>> flatten = flatten(aggs);
-        List<BindingTupleRow> bindingTupleList = flatten.stream()
-                .map(BindingTuple::from)
-                .map(bindingTuple -> new BindingTupleRow(bindingTuple))
-                .collect(Collectors.toList());
-        return bindingTupleList;
-    }
+  public static List<BindingTupleRow> populateSearchAggregationResponse(Aggregations aggs) {
+    List<Map<String, Object>> flatten = flatten(aggs);
+    List<BindingTupleRow> bindingTupleList =
+        flatten.stream()
+            .map(BindingTuple::from)
+            .map(bindingTuple -> new BindingTupleRow(bindingTuple))
+            .collect(Collectors.toList());
+    return bindingTupleList;
+  }
 
-    @VisibleForTesting
-    public static List<Map<String, Object>> flatten(Aggregations aggregations) {
-        List<Aggregation> aggregationList = aggregations.asList();
-        List<Map<String, Object>> resultList = new ArrayList<>();
-        Map<String, Object> resultMap = new HashMap<>();
-        for (Aggregation aggregation : aggregationList) {
-            if (aggregation instanceof Terms) {
-                for (Terms.Bucket bucket : ((Terms) aggregation).getBuckets()) {
-                    List<Map<String, Object>> internalBucketList = flatten(bucket.getAggregations());
-                    fillResultListWithInternalBucket(resultList, internalBucketList, aggregation.getName(),
-                                                     bucket.getKey());
-                }
-            } else if (aggregation instanceof NumericMetricsAggregation.SingleValue) {
-                resultMap.put(aggregation.getName(), ((NumericMetricsAggregation.SingleValue) aggregation).value());
-            } else if (aggregation instanceof Percentiles) {
-                Percentiles percentiles = (Percentiles) aggregation;
-                resultMap.putAll((Map<String, Double>) StreamSupport.stream(percentiles.spliterator(), false)
-                        .collect(Collectors.toMap(
-                                (percentile) -> String.format("%s_%s", percentiles.getName(), percentile.getPercent()),
-                                Percentile::getValue, (v1, v2) -> {
-                                    throw new IllegalArgumentException(
-                                            String.format("Duplicate key for values %s and %s", v1, v2));
-                                }, HashMap::new)));
-            } else if (aggregation instanceof Histogram) {
-                for (Histogram.Bucket bucket : ((Histogram) aggregation).getBuckets()) {
-                    List<Map<String, Object>> internalBucketList = flatten(bucket.getAggregations());
-                    fillResultListWithInternalBucket(resultList, internalBucketList, aggregation.getName(),
-                                                     bucket.getKeyAsString());
-                }
-            } else {
-                throw new RuntimeException("unsupported aggregation type " + aggregation.getType());
-            }
+  @VisibleForTesting
+  public static List<Map<String, Object>> flatten(Aggregations aggregations) {
+    List<Aggregation> aggregationList = aggregations.asList();
+    List<Map<String, Object>> resultList = new ArrayList<>();
+    Map<String, Object> resultMap = new HashMap<>();
+    for (Aggregation aggregation : aggregationList) {
+      if (aggregation instanceof Terms) {
+        for (Terms.Bucket bucket : ((Terms) aggregation).getBuckets()) {
+          List<Map<String, Object>> internalBucketList = flatten(bucket.getAggregations());
+          fillResultListWithInternalBucket(
+              resultList, internalBucketList, aggregation.getName(), bucket.getKey());
         }
-        if (!resultMap.isEmpty()) {
-            resultList.add(resultMap);
+      } else if (aggregation instanceof NumericMetricsAggregation.SingleValue) {
+        resultMap.put(
+            aggregation.getName(), ((NumericMetricsAggregation.SingleValue) aggregation).value());
+      } else if (aggregation instanceof Percentiles) {
+        Percentiles percentiles = (Percentiles) aggregation;
+        resultMap.putAll(
+            (Map<String, Double>)
+                StreamSupport.stream(percentiles.spliterator(), false)
+                    .collect(
+                        Collectors.toMap(
+                            (percentile) ->
+                                String.format(
+                                    "%s_%s", percentiles.getName(), percentile.getPercent()),
+                            Percentile::getValue,
+                            (v1, v2) -> {
+                              throw new IllegalArgumentException(
+                                  String.format("Duplicate key for values %s and %s", v1, v2));
+                            },
+                            HashMap::new)));
+      } else if (aggregation instanceof Histogram) {
+        for (Histogram.Bucket bucket : ((Histogram) aggregation).getBuckets()) {
+          List<Map<String, Object>> internalBucketList = flatten(bucket.getAggregations());
+          fillResultListWithInternalBucket(
+              resultList, internalBucketList, aggregation.getName(), bucket.getKeyAsString());
         }
-        return resultList;
+      } else {
+        throw new RuntimeException("unsupported aggregation type " + aggregation.getType());
+      }
+    }
+    if (!resultMap.isEmpty()) {
+      resultList.add(resultMap);
     }
+    return resultList;
+  }
 
-    private static void fillResultListWithInternalBucket(List<Map<String, Object>> resultList,
-                                                         List<Map<String, Object>> internalBucketList,
-                                                         String aggregationName, Object bucketKey) {
-        if (internalBucketList.isEmpty()) {
-            resultList.add(new HashMap<String, Object>() {{
-                put(aggregationName, bucketKey);
-            }});
-        } else {
-            for (Map<String, Object> map : internalBucketList) {
-                map.put(aggregationName, bucketKey);
+  private static void fillResultListWithInternalBucket(
+      List<Map<String, Object>> resultList,
+      List<Map<String, Object>> internalBucketList,
+      String aggregationName,
+      Object bucketKey) {
+    if (internalBucketList.isEmpty()) {
+      resultList.add(
+          new HashMap<String, Object>() {
+            {
+              put(aggregationName, bucketKey);
             }
-            resultList.addAll(internalBucketList);
-        }
+          });
+    } else {
+      for (Map<String, Object> map : internalBucketList) {
+        map.put(aggregationName, bucketKey);
+      }
+      resultList.addAll(internalBucketList);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/SearchHitRow.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/SearchHitRow.java
index 8f418deadb..a859a7c88c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/SearchHitRow.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/SearchHitRow.java
@@ -3,187 +3,183 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.scroll;
 
 import com.google.common.base.Strings;
 import java.util.HashMap;
 import java.util.Map;
 import org.opensearch.common.document.DocumentField;
-import org.opensearch.common.text.Text;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.search.SearchHit;
 import org.opensearch.sql.legacy.query.planner.physical.Row;
 
 /**
- * Search hit row that implements basic accessor for SearchHit.
- * Encapsulate all OpenSearch specific knowledge: how to parse source including nested path.
- * <p>
- * State transition:
- * for example, SELECT e.name.first AS firstName, e.age AS age FROM E e JOIN D d ON ... ORDER BY ...
- * <p>
- * Stage               | hit.source                                               | tableAlias | Passed in args
+ * Search hit row that implements basic accessor for SearchHit. Encapsulate all OpenSearch specific
+ * knowledge: how to parse source including nested path.
+ *
+ * <p>State transition: for example, SELECT e.name.first AS firstName, e.age AS age FROM E e JOIN D
+ * d ON ... ORDER BY ...
+ *
+ * <p>Stage | hit.source | tableAlias | Passed in args
  * ----------------------------------------------------------------------------------------------------------------------
- * new in Scroll       | {"name":{"first": "Allen", "last": "Hank"}, "age": 30}   | "e"|  new(SearchHit, "e")
+ * new in Scroll | {"name":{"first": "Allen", "last": "Hank"}, "age": 30} | "e"| new(SearchHit, "e")
  * ----------------------------------------------------------------------------------------------------------------------
- * key()/combine()     |                                                          |    | key("name.first", "age")
- * in JoinAlgorithm    | {"e.name": {...}, "e.age": 30, "d..." } (after combined) | "" | combine(row of D)
+ * key()/combine() | | | key("name.first", "age") in JoinAlgorithm | {"e.name": {...}, "e.age": 30,
+ * "d..." } (after combined) | "" | combine(row of D)
  * ----------------------------------------------------------------------------------------------------------------------
- * key() in XXSort     | same                                                     | "" | key("e.name.first", "e.age")
+ * key() in XXSort | same | "" | key("e.name.first", "e.age")
  * ----------------------------------------------------------------------------------------------------------------------
- * retain() in Project | {"firstName": "Allen", "age": 30 }                       | "" | retain("e.name.first", "e.age")
+ * retain() in Project | {"firstName": "Allen", "age": 30 } | "" | retain("e.name.first", "e.age")
  * ----------------------------------------------------------------------------------------------------------------------
  */
 class SearchHitRow implements Row<SearchHit> {
 
-    /**
-     * Native OpenSearch data object for each row
-     */
-    private final SearchHit hit;
-
-    /**
-     * Column and value pairs
-     */
-    private final Map<String, Object> source;
-
-    /**
-     * Table alias owned the row. Empty if this row comes from combination of two other rows
-     */
-    private final String tableAlias;
+  /** Native OpenSearch data object for each row */
+  private final SearchHit hit;
 
-    SearchHitRow(SearchHit hit, String tableAlias) {
-        this.hit = hit;
-        this.source = hit.getSourceAsMap();
-        this.tableAlias = tableAlias;
-    }
+  /** Column and value pairs */
+  private final Map<String, Object> source;
 
-    @Override
-    public RowKey key(String[] colNames) {
-        if (colNames.length == 0) {
-            return RowKey.NULL;
-        }
-
-        Object[] keys = new Object[colNames.length];
-        for (int i = 0; i < colNames.length; i++) {
-            keys[i] = getValueOfPath(colNames[i]);
-
-            if (keys[i] == null) {
-                return RowKey.NULL;
-            }
-        }
-        return new RowKey(keys);
-    }
+  /** Table alias owned the row. Empty if this row comes from combination of two other rows */
+  private final String tableAlias;
 
-    /**
-     * Replace column name by full name to avoid naming conflicts.
-     * For efficiency, this only happens here when matched rows found.
-     * Create a new one to avoid mutating the original ones in hash table which impact subsequent match.
-     */
-    @Override
-    public Row<SearchHit> combine(Row<SearchHit> other) {
-        SearchHit combined = cloneHit(other);
-
-        collectFullName(combined.getSourceAsMap(), this);
-        if (other != NULL) {
-            collectFullName(combined.getSourceAsMap(), (SearchHitRow) other);
-        }
-        return new SearchHitRow(combined, "");
-    }
+  SearchHitRow(SearchHit hit, String tableAlias) {
+    this.hit = hit;
+    this.source = hit.getSourceAsMap();
+    this.tableAlias = tableAlias;
+  }
 
-    @Override
-    public void retain(Map<String, String> colNameAlias) {
-        Map<String, Object> aliasSource = new HashMap<>();
-        colNameAlias.forEach((colName, alias) -> {
-            if (colName.endsWith(".*")) {
-                String tableAlias = colName.substring(0, colName.length() - 2) + ".";
-                retainAllFieldsFromTable(aliasSource, tableAlias);
-            } else {
-                retainOneField(aliasSource, colName, alias);
-            }
-        });
-        resetSource(aliasSource);
+  @Override
+  public RowKey key(String[] colNames) {
+    if (colNames.length == 0) {
+      return RowKey.NULL;
     }
 
-    @Override
-    public SearchHit data() {
-        return hit;
-    }
+    Object[] keys = new Object[colNames.length];
+    for (int i = 0; i < colNames.length; i++) {
+      keys[i] = getValueOfPath(colNames[i]);
 
-    @Override
-    public String toString() {
-        return "SearchHitRow{" + "hit=" + source + '}';
+      if (keys[i] == null) {
+        return RowKey.NULL;
+      }
     }
-
-    private Object getValueOfPath(String path) {
-        /*
-         * If table alias is missing which means the row was generated by combine().
-         * In this case, table alias is present and the first dot should be ignored, ex. "e.name.first"
-         */
-        return getValueOfPath(source, path, Strings.isNullOrEmpty(tableAlias));
+    return new RowKey(keys);
+  }
+
+  /**
+   * Replace column name by full name to avoid naming conflicts. For efficiency, this only happens
+   * here when matched rows found. Create a new one to avoid mutating the original ones in hash
+   * table which impact subsequent match.
+   */
+  @Override
+  public Row<SearchHit> combine(Row<SearchHit> other) {
+    SearchHit combined = cloneHit(other);
+
+    collectFullName(combined.getSourceAsMap(), this);
+    if (other != NULL) {
+      collectFullName(combined.getSourceAsMap(), (SearchHitRow) other);
     }
-
-    /**
-     * Recursively get value for field name path, such as object field a.b.c
+    return new SearchHitRow(combined, "");
+  }
+
+  @Override
+  public void retain(Map<String, String> colNameAlias) {
+    Map<String, Object> aliasSource = new HashMap<>();
+    colNameAlias.forEach(
+        (colName, alias) -> {
+          if (colName.endsWith(".*")) {
+            String tableAlias = colName.substring(0, colName.length() - 2) + ".";
+            retainAllFieldsFromTable(aliasSource, tableAlias);
+          } else {
+            retainOneField(aliasSource, colName, alias);
+          }
+        });
+    resetSource(aliasSource);
+  }
+
+  @Override
+  public SearchHit data() {
+    return hit;
+  }
+
+  @Override
+  public String toString() {
+    return "SearchHitRow{" + "hit=" + source + '}';
+  }
+
+  private Object getValueOfPath(String path) {
+    /*
+     * If table alias is missing which means the row was generated by combine().
+     * In this case, table alias is present and the first dot should be ignored, ex. "e.name.first"
      */
-    private Object getValueOfPath(Object source, String path, boolean isIgnoreFirstDot) {
-        if (!(source instanceof Map) || path.isEmpty()) {
-            return source;
-        }
-
-        int dot = path.indexOf('.', (isIgnoreFirstDot ? path.indexOf('.') + 1 : 0));
-        if (dot == -1) {
-            return ((Map) source).get(path);
-        }
-        return getValueOfPath(
-                ((Map) source).get(path.substring(0, dot)),
-                path.substring(dot + 1),
-                false
-        );
-    }
+    return getValueOfPath(source, path, Strings.isNullOrEmpty(tableAlias));
+  }
 
-    private SearchHit cloneHit(Row<SearchHit> other) {
-        Map<String, DocumentField> documentFields = new HashMap<>();
-        Map<String, DocumentField> metaFields = new HashMap<>();
-        hit.getFields().forEach((fieldName, docField) ->
-            (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName) ? metaFields : documentFields).put(fieldName, docField));
-        SearchHit combined = new SearchHit(
-                hit.docId(),
-                hit.getId() + "|" + (other == NULL ? "0" : ((SearchHitRow) other).hit.getId()),
-                documentFields,
-                metaFields
-        );
-        combined.sourceRef(hit.getSourceRef());
-        combined.getSourceAsMap().clear();
-        return combined;
+  /** Recursively get value for field name path, such as object field a.b.c */
+  private Object getValueOfPath(Object source, String path, boolean isIgnoreFirstDot) {
+    if (!(source instanceof Map) || path.isEmpty()) {
+      return source;
     }
 
-    private void collectFullName(Map<String, Object> newSource, SearchHitRow row) {
-        row.source.forEach((colName, value) -> newSource.put(row.tableAlias + "." + colName, value));
+    int dot = path.indexOf('.', (isIgnoreFirstDot ? path.indexOf('.') + 1 : 0));
+    if (dot == -1) {
+      return ((Map) source).get(path);
     }
 
-    private void retainAllFieldsFromTable(Map<String, Object> aliasSource, String tableAlias) {
-        source.entrySet().
-                stream().
-                filter(e -> e.getKey().startsWith(tableAlias)).
-                forEach(e -> aliasSource.put(e.getKey(), e.getValue()));
+    // Object field name maybe unexpanded without recursive object structure
+    // ex. {"a.b.c": value} instead of {"a": {"b": {"c": value}}}}
+    if (((Map) source).containsKey(path)) {
+      return ((Map) source).get(path);
     }
 
-    /**
-     * Note that column here is already prefixed by table alias after combine().
-     * <p>
-     * Meanwhile check if column name with table alias prefix, ex. a.name, is property, namely a.name.lastname.
-     * In this case, split by first second dot and continue searching for the final value in nested map
-     * by getValueOfPath(source.get("a.name"), "lastname")
-     */
-    private void retainOneField(Map<String, Object> aliasSource, String colName, String alias) {
-        aliasSource.put(
-                Strings.isNullOrEmpty(alias) ? colName : alias,
-                getValueOfPath(colName)
-        );
-    }
-
-    private void resetSource(Map<String, Object> newSource) {
-        source.clear();
-        source.putAll(newSource);
-    }
+    return getValueOfPath(
+        ((Map) source).get(path.substring(0, dot)), path.substring(dot + 1), false);
+  }
+
+  private SearchHit cloneHit(Row<SearchHit> other) {
+    Map<String, DocumentField> documentFields = new HashMap<>();
+    Map<String, DocumentField> metaFields = new HashMap<>();
+    hit.getFields()
+        .forEach(
+            (fieldName, docField) ->
+                (MapperService.META_FIELDS_BEFORE_7DOT8.contains(fieldName)
+                        ? metaFields
+                        : documentFields)
+                    .put(fieldName, docField));
+    SearchHit combined =
+        new SearchHit(
+            hit.docId(),
+            hit.getId() + "|" + (other == NULL ? "0" : ((SearchHitRow) other).hit.getId()),
+            documentFields,
+            metaFields);
+    combined.sourceRef(hit.getSourceRef());
+    combined.getSourceAsMap().clear();
+    return combined;
+  }
+
+  private void collectFullName(Map<String, Object> newSource, SearchHitRow row) {
+    row.source.forEach((colName, value) -> newSource.put(row.tableAlias + "." + colName, value));
+  }
+
+  private void retainAllFieldsFromTable(Map<String, Object> aliasSource, String tableAlias) {
+    source.entrySet().stream()
+        .filter(e -> e.getKey().startsWith(tableAlias))
+        .forEach(e -> aliasSource.put(e.getKey(), e.getValue()));
+  }
+
+  /**
+   * Note that column here is already prefixed by table alias after combine().
+   *
+   * <p>Meanwhile check if column name with table alias prefix, ex. a.name, is property, namely
+   * a.name.lastname. In this case, split by first second dot and continue searching for the final
+   * value in nested map by getValueOfPath(source.get("a.name"), "lastname")
+   */
+  private void retainOneField(Map<String, Object> aliasSource, String colName, String alias) {
+    aliasSource.put(Strings.isNullOrEmpty(alias) ? colName : alias, getValueOfPath(colName));
+  }
+
+  private void resetSource(Map<String, Object> newSource) {
+    source.clear();
+    source.putAll(newSource);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/sort/QuickSort.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/sort/QuickSort.java
index 90ae595d56..abfcf273ad 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/sort/QuickSort.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/sort/QuickSort.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.physical.node.sort;
 
 import static java.util.Collections.emptyList;
@@ -23,83 +22,80 @@
 import org.opensearch.sql.legacy.query.planner.physical.node.BatchPhysicalOperator;
 
 /**
- * Physical operator to sort by quick sort implementation in JDK.
- * Note that this is all in-memory operator which may be a problem for large index.
+ * Physical operator to sort by quick sort implementation in JDK. Note that this is all in-memory
+ * operator which may be a problem for large index.
  *
  * @param <T> actual data type, ex.SearchHit
  */
 public class QuickSort<T> extends BatchPhysicalOperator<T> {
 
-    private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LogManager.getLogger();
 
-    private final PhysicalOperator<T> next;
+  private final PhysicalOperator<T> next;
 
-    /**
-     * Column name list in ORDER BY
-     */
-    private final String[] orderByColNames;
+  /** Column name list in ORDER BY */
+  private final String[] orderByColNames;
 
-    /**
-     * Order by type, ex. ASC, DESC
-     */
-    private final String orderByType;
+  /** Order by type, ex. ASC, DESC */
+  private final String orderByType;
 
-    private boolean isDone = false;
+  private boolean isDone = false;
 
-    public QuickSort(PhysicalOperator<T> next, List<String> orderByColNames, String orderByType) {
-        this.next = next;
-        this.orderByColNames = orderByColNames.toArray(new String[0]);
-        this.orderByType = orderByType;
-    }
+  public QuickSort(PhysicalOperator<T> next, List<String> orderByColNames, String orderByType) {
+    this.next = next;
+    this.orderByColNames = orderByColNames.toArray(new String[0]);
+    this.orderByType = orderByType;
+  }
 
-    @Override
-    public PlanNode[] children() {
-        return new PlanNode[]{next};
-    }
+  @Override
+  public PlanNode[] children() {
+    return new PlanNode[] {next};
+  }
 
-    @Override
-    public Cost estimate() {
-        return new Cost();
-    }
+  @Override
+  public Cost estimate() {
+    return new Cost();
+  }
 
-    @Override
-    public void open(ExecuteParams params) throws Exception {
-        super.open(params);
-        next.open(params);
-    }
+  @Override
+  public void open(ExecuteParams params) throws Exception {
+    super.open(params);
+    next.open(params);
+  }
 
-    /**
-     * Only load all data once and return one batch
-     */
-    @Override
-    protected Collection<Row<T>> prefetch() {
-        if (isDone) {
-            return emptyList();
-        }
-
-        List<Row<T>> allRowsSorted = new ArrayList<>();
-        next.forEachRemaining(allRowsSorted::add);
-        allRowsSorted.sort(createRowComparator());
-
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("All rows being sorted in RB-Tree: {}", allRowsSorted);
-        }
-
-        isDone = true;
-        return allRowsSorted;
+  /** Only load all data once and return one batch */
+  @Override
+  protected Collection<Row<T>> prefetch() {
+    if (isDone) {
+      return emptyList();
     }
 
-    private Comparator<Row<T>> createRowComparator() {
-        Comparator<Row<T>> comparator = Comparator.comparing(o -> o.key(orderByColNames));
-        if ("DESC".equals(orderByType)) {
-            comparator = comparator.reversed();
-        }
-        return comparator;
-    }
+    List<Row<T>> allRowsSorted = new ArrayList<>();
+    next.forEachRemaining(allRowsSorted::add);
+    allRowsSorted.sort(createRowComparator());
 
-    @Override
-    public String toString() {
-        return "QuickSort [ columns=" + Arrays.toString(orderByColNames) + ", order=" + orderByType + " ]";
+    if (LOG.isTraceEnabled()) {
+      LOG.trace("All rows being sorted in RB-Tree: {}", allRowsSorted);
     }
 
+    isDone = true;
+    return allRowsSorted;
+  }
+
+  private Comparator<Row<T>> createRowComparator() {
+    Comparator<Row<T>> comparator = Comparator.comparing(o -> o.key(orderByColNames));
+    if ("DESC".equals(orderByType)) {
+      comparator = comparator.reversed();
+    }
+    return comparator;
+  }
+
+  @Override
+  public String toString() {
+    return "QuickSort [ columns="
+        + Arrays.toString(orderByColNames)
+        + ", order="
+        + orderByType
+        + " ]";
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/ResourceManager.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/ResourceManager.java
index 32cc7f45e3..4818d0a3ee 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/ResourceManager.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/ResourceManager.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.resource;
 
 import java.time.Duration;
@@ -18,55 +17,48 @@
 import org.opensearch.sql.legacy.query.planner.resource.monitor.Monitor;
 import org.opensearch.sql.legacy.query.planner.resource.monitor.TotalMemoryMonitor;
 
-/**
- * Aggregated resource monitor
- */
+/** Aggregated resource monitor */
 public class ResourceManager {
 
-    private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LogManager.getLogger();
+
+  /** Actual resource monitor list */
+  private final List<Monitor> monitors = new ArrayList<>();
 
-    /**
-     * Actual resource monitor list
-     */
-    private final List<Monitor> monitors = new ArrayList<>();
+  /** Time out for the execution */
+  private final int timeout;
 
-    /**
-     * Time out for the execution
-     */
-    private final int timeout;
-    private final Instant startTime;
+  private final Instant startTime;
 
-    /**
-     * Meta result of the execution
-     */
-    private final MetaSearchResult metaResult;
+  /** Meta result of the execution */
+  private final MetaSearchResult metaResult;
 
-    public ResourceManager(Stats stats, Config config) {
-        this.monitors.add(new TotalMemoryMonitor(stats, config));
-        this.timeout = config.timeout();
-        this.startTime = Instant.now();
-        this.metaResult = new MetaSearchResult();
-    }
+  public ResourceManager(Stats stats, Config config) {
+    this.monitors.add(new TotalMemoryMonitor(stats, config));
+    this.timeout = config.timeout();
+    this.startTime = Instant.now();
+    this.metaResult = new MetaSearchResult();
+  }
 
-    /**
-     * Is all resource monitor healthy with strategy.
-     *
-     * @return true for yes
-     */
-    public boolean isHealthy() {
-        return BackOffRetryStrategy.isHealthy();
-    }
+  /**
+   * Is all resource monitor healthy with strategy.
+   *
+   * @return true for yes
+   */
+  public boolean isHealthy() {
+    return BackOffRetryStrategy.isHealthy();
+  }
 
-    /**
-     * Is current execution time out?
-     *
-     * @return true for yes
-     */
-    public boolean isTimeout() {
-        return Duration.between(startTime, Instant.now()).getSeconds() >= timeout;
-    }
+  /**
+   * Is current execution time out?
+   *
+   * @return true for yes
+   */
+  public boolean isTimeout() {
+    return Duration.between(startTime, Instant.now()).getSeconds() >= timeout;
+  }
 
-    public MetaSearchResult getMetaResult() {
-        return metaResult;
-    }
+  public MetaSearchResult getMetaResult() {
+    return metaResult;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/Stats.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/Stats.java
index ec03eeaccb..8cf827d58e 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/Stats.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/Stats.java
@@ -3,67 +3,57 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.resource;
 
 import org.opensearch.client.Client;
 
 /**
  * Statistics collector collects from OpenSearch stats, JVM etc for other components:
- * <p>
- * 1) Resource monitor
- * 2) Cost estimation
- * 3) Block size calculation
+ *
+ * <p>1) Resource monitor 2) Cost estimation 3) Block size calculation
  */
 public class Stats {
 
-    /**
-     * Client connection to OpenSearch cluster (unused now)
-     */
-    private Client client;
-
-    public Stats(Client client) {
-        this.client = client;
-    }
-
-    public MemStats collectMemStats() {
-        return new MemStats(
-                Runtime.getRuntime().freeMemory(),
-                Runtime.getRuntime().totalMemory()
-        );
-    }
+  /** Client connection to OpenSearch cluster (unused now) */
+  private Client client;
 
-    /**
-     * Statistics data class for memory usage
-     */
-    public static class MemStats {
-        private long free;
-        private long total;
+  public Stats(Client client) {
+    this.client = client;
+  }
 
-        public MemStats(long free, long total) {
-            this.free = free;
-            this.total = total;
-        }
+  public MemStats collectMemStats() {
+    return new MemStats(Runtime.getRuntime().freeMemory(), Runtime.getRuntime().totalMemory());
+  }
 
-        public long getFree() {
-            return free;
-        }
+  /** Statistics data class for memory usage */
+  public static class MemStats {
+    private long free;
+    private long total;
 
-        public long getTotal() {
-            return total;
-        }
+    public MemStats(long free, long total) {
+      this.free = free;
+      this.total = total;
     }
 
-    /*
-    public class IndexStats {
-        private long size;
-        private long docNum;
+    public long getFree() {
+      return free;
+    }
 
-        public IndexStats(long size, long docNum) {
-            this.size = size;
-            this.docNum = docNum;
-        }
+    public long getTotal() {
+      return total;
     }
-    */
+  }
+
+  /*
+  public class IndexStats {
+      private long size;
+      private long docNum;
+
+      public IndexStats(long size, long docNum) {
+          this.size = size;
+          this.docNum = docNum;
+      }
+  }
+  */
 
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/blocksize/AdaptiveBlockSize.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/blocksize/AdaptiveBlockSize.java
index 7990b8c8d4..339e326cc3 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/blocksize/AdaptiveBlockSize.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/blocksize/AdaptiveBlockSize.java
@@ -3,28 +3,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.resource.blocksize;
 
-/**
- * Adaptive block size calculator based on resource usage dynamically.
- */
+/** Adaptive block size calculator based on resource usage dynamically. */
 public class AdaptiveBlockSize implements BlockSize {
 
-    private int upperLimit;
+  private int upperLimit;
 
-    public AdaptiveBlockSize(int upperLimit) {
-        this.upperLimit = upperLimit;
-    }
+  public AdaptiveBlockSize(int upperLimit) {
+    this.upperLimit = upperLimit;
+  }
 
-    @Override
-    public int size() {
-        //TODO: calculate dynamically on each call
-        return upperLimit;
-    }
+  @Override
+  public int size() {
+    // TODO: calculate dynamically on each call
+    return upperLimit;
+  }
 
-    @Override
-    public String toString() {
-        return "AdaptiveBlockSize with " + "upperLimit=" + upperLimit;
-    }
+  @Override
+  public String toString() {
+    return "AdaptiveBlockSize with " + "upperLimit=" + upperLimit;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/blocksize/BlockSize.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/blocksize/BlockSize.java
index d68b16b8bb..d8db7a0fad 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/blocksize/BlockSize.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/blocksize/BlockSize.java
@@ -3,42 +3,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.resource.blocksize;
 
-/**
- * Block size calculating logic.
- */
+/** Block size calculating logic. */
 public interface BlockSize {
 
-    /**
-     * Get block size configured or dynamically. Integer should be sufficient for single block size.
-     *
-     * @return block size.
-     */
-    int size();
-
+  /**
+   * Get block size configured or dynamically. Integer should be sufficient for single block size.
+   *
+   * @return block size.
+   */
+  int size();
 
-    /**
-     * Default implementation with fixed block size
-     */
-    class FixedBlockSize implements BlockSize {
+  /** Default implementation with fixed block size */
+  class FixedBlockSize implements BlockSize {
 
-        private int blockSize;
+    private int blockSize;
 
-        public FixedBlockSize(int blockSize) {
-            this.blockSize = blockSize;
-        }
-
-        @Override
-        public int size() {
-            return blockSize;
-        }
+    public FixedBlockSize(int blockSize) {
+      this.blockSize = blockSize;
+    }
 
-        @Override
-        public String toString() {
-            return "FixedBlockSize with " + "size=" + blockSize;
-        }
+    @Override
+    public int size() {
+      return blockSize;
     }
 
+    @Override
+    public String toString() {
+      return "FixedBlockSize with " + "size=" + blockSize;
+    }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/monitor/Monitor.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/monitor/Monitor.java
index 10b36f2483..52bc42587f 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/monitor/Monitor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/monitor/Monitor.java
@@ -3,19 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.resource.monitor;
 
-/**
- * Interface for different monitor component
- */
+/** Interface for different monitor component */
 public interface Monitor {
 
-    /**
-     * Is resource being monitored exhausted.
-     *
-     * @return true if yes
-     */
-    boolean isHealthy();
-
+  /**
+   * Is resource being monitored exhausted.
+   *
+   * @return true if yes
+   */
+  boolean isHealthy();
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/monitor/TotalMemoryMonitor.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/monitor/TotalMemoryMonitor.java
index 961729867d..76a8c5902c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/monitor/TotalMemoryMonitor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/monitor/TotalMemoryMonitor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.query.planner.resource.monitor;
 
 import org.apache.logging.log4j.LogManager;
@@ -12,46 +11,39 @@
 import org.opensearch.sql.legacy.query.planner.resource.Stats;
 import org.opensearch.sql.legacy.query.planner.resource.Stats.MemStats;
 
-/**
- * Circuit breaker for total memory usage in JVM on current OpenSearch node.
- */
+/** Circuit breaker for total memory usage in JVM on current OpenSearch node. */
 public class TotalMemoryMonitor implements Monitor {
 
-    private static final Logger LOG = LogManager.getLogger();
-
-    /**
-     * Statistic collector
-     */
-    private final Stats stats;
+  private static final Logger LOG = LogManager.getLogger();
 
-    /**
-     * Upper limit for memory usage percentage
-     */
-    private final int limit;
+  /** Statistic collector */
+  private final Stats stats;
 
-    public TotalMemoryMonitor(Stats stats, Config config) {
-        this.stats = stats;
-        this.limit = config.circuitBreakLimit();
-    }
+  /** Upper limit for memory usage percentage */
+  private final int limit;
 
-    @Override
-    public boolean isHealthy() {
-        MemStats memStats = stats.collectMemStats();
-        int usage = percentage(memUsage(memStats));
+  public TotalMemoryMonitor(Stats stats, Config config) {
+    this.stats = stats;
+    this.limit = config.circuitBreakLimit();
+  }
 
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Memory usage and limit: {}%, {}%", usage, limit);
-        }
+  @Override
+  public boolean isHealthy() {
+    MemStats memStats = stats.collectMemStats();
+    int usage = percentage(memUsage(memStats));
 
-        return usage < limit;
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Memory usage and limit: {}%, {}%", usage, limit);
     }
 
-    private int percentage(double usage) {
-        return (int) Math.round(usage * 100);
-    }
+    return usage < limit;
+  }
 
-    private double memUsage(MemStats memStats) {
-        return (1.0 * (memStats.getTotal() - memStats.getFree())) / memStats.getTotal();
-    }
+  private int percentage(double usage) {
+    return (int) Math.round(usage * 100);
+  }
 
+  private double memUsage(MemStats memStats) {
+    return (1.0 * (memStats.getTotal() - memStats.getFree())) / memStats.getTotal();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/request/PreparedStatementRequest.java b/legacy/src/main/java/org/opensearch/sql/legacy/request/PreparedStatementRequest.java
index deff4e2393..c32e529157 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/request/PreparedStatementRequest.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/request/PreparedStatementRequest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.request;
 
 import java.util.List;
@@ -11,174 +10,181 @@
 
 public class PreparedStatementRequest extends SqlRequest {
 
-    private List<PreparedStatementParameter> parameters;
-    private String sqlTemplate;
-
-    public PreparedStatementRequest(String sql, JSONObject payloadJson, List<PreparedStatementParameter> parameters) {
-        super(null, payloadJson);
-        this.sqlTemplate = sql;
-        this.parameters = parameters;
-        this.sql = this.substituteParameters();
-    }
-
-    public PreparedStatementRequest(String sql, final Integer fetchSize,
-                                    JSONObject payloadJson, List<PreparedStatementParameter> parameters) {
-        this(sql, payloadJson, parameters);
-        this.fetchSize = fetchSize;
+  private List<PreparedStatementParameter> parameters;
+  private String sqlTemplate;
+
+  public PreparedStatementRequest(
+      String sql, JSONObject payloadJson, List<PreparedStatementParameter> parameters) {
+    super(null, payloadJson);
+    this.sqlTemplate = sql;
+    this.parameters = parameters;
+    this.sql = this.substituteParameters();
+  }
+
+  public PreparedStatementRequest(
+      String sql,
+      final Integer fetchSize,
+      JSONObject payloadJson,
+      List<PreparedStatementParameter> parameters) {
+    this(sql, payloadJson, parameters);
+    this.fetchSize = fetchSize;
+  }
+
+  public List<PreparedStatementParameter> getParameters() {
+    return this.parameters;
+  }
+
+  @Override
+  public String getSql() {
+    return this.sql;
+  }
+
+  public String getPreparedStatement() {
+    return this.sqlTemplate;
+  }
+
+  private String substituteParameters() {
+    if (this.sqlTemplate == null) {
+      return null;
     }
 
-    public List<PreparedStatementParameter> getParameters() {
-        return this.parameters;
-    }
-
-    @Override
-    public String getSql() {
-        return this.sql;
-    }
-
-    public String getPreparedStatement() {
-        return this.sqlTemplate;
-    }
-
-    private String substituteParameters() {
-        if (this.sqlTemplate == null) {
-            return null;
-        }
-
-        StringBuilder sb = new StringBuilder();
-        int paramIndex = 0;
-        int i = 0;
+    StringBuilder sb = new StringBuilder();
+    int paramIndex = 0;
+    int i = 0;
+    while (i < this.sqlTemplate.length()) {
+      char c = this.sqlTemplate.charAt(i);
+      if (c == '\'') {
+        // found string starting quote character, skip the string
+        sb.append(c);
+        i++;
         while (i < this.sqlTemplate.length()) {
-            char c = this.sqlTemplate.charAt(i);
-            if (c == '\'') {
-                // found string starting quote character, skip the string
-                sb.append(c);
-                i++;
-                while (i < this.sqlTemplate.length()) {
-                    char s = this.sqlTemplate.charAt(i);
-                    sb.append(s);
-                    if (s == '\'') {
-                        if (this.sqlTemplate.charAt(i - 1) == '\\') {
-                            // this is an escaped single quote (\') still in the string
-                            i++;
-                        } else if ((i + 1) < this.sqlTemplate.length() && this.sqlTemplate.charAt(i + 1) == '\'') {
-                            // found 2 single quote {''} in a string, which is escaped single quote {'}
-                            // move to next character
-                            sb.append('\'');
-                            i += 2;
-                        } else {
-                            // found the string ending single quote char
-                            break;
-                        }
-                    } else {
-                        // not single quote character, move on
-                        i++;
-                    }
-                }
-            } else if (c == '?') {
-                // question mark "?" not in a string
-                if (paramIndex >= this.parameters.size()) {
-                    throw new IllegalStateException("Placeholder count is greater than parameter number "
-                            + parameters.size() + " . Cannot convert PreparedStatement to sql query");
-                }
-                sb.append(this.parameters.get(paramIndex).getSqlSubstitutionValue());
-                paramIndex++;
+          char s = this.sqlTemplate.charAt(i);
+          sb.append(s);
+          if (s == '\'') {
+            if (this.sqlTemplate.charAt(i - 1) == '\\') {
+              // this is an escaped single quote (\') still in the string
+              i++;
+            } else if ((i + 1) < this.sqlTemplate.length()
+                && this.sqlTemplate.charAt(i + 1) == '\'') {
+              // found 2 single quote {''} in a string, which is escaped single quote {'}
+              // move to next character
+              sb.append('\'');
+              i += 2;
             } else {
-                // other character, simply append
-                sb.append(c);
+              // found the string ending single quote char
+              break;
             }
+          } else {
+            // not single quote character, move on
             i++;
+          }
         }
-
-        return sb.toString();
+      } else if (c == '?') {
+        // question mark "?" not in a string
+        if (paramIndex >= this.parameters.size()) {
+          throw new IllegalStateException(
+              "Placeholder count is greater than parameter number "
+                  + parameters.size()
+                  + " . Cannot convert PreparedStatement to sql query");
+        }
+        sb.append(this.parameters.get(paramIndex).getSqlSubstitutionValue());
+        paramIndex++;
+      } else {
+        // other character, simply append
+        sb.append(c);
+      }
+      i++;
     }
 
-    //////////////////////////////////////////////////
-    // Parameter related types below
-    //////////////////////////////////////////////////
-    public enum ParameterType {
-        BYTE,
-        SHORT,
-        INTEGER,
-        LONG,
-        FLOAT,
-        DOUBLE,
-        BOOLEAN,
-        STRING,
-        KEYWORD,
-        DATE,
-        NULL
+    return sb.toString();
+  }
+
+  //////////////////////////////////////////////////
+  // Parameter related types below
+  //////////////////////////////////////////////////
+  public enum ParameterType {
+    BYTE,
+    SHORT,
+    INTEGER,
+    LONG,
+    FLOAT,
+    DOUBLE,
+    BOOLEAN,
+    STRING,
+    KEYWORD,
+    DATE,
+    NULL
+  }
+
+  public static class PreparedStatementParameter<T> {
+    protected T value;
+
+    public PreparedStatementParameter(T value) {
+      this.value = value;
     }
 
-    public static class PreparedStatementParameter<T> {
-        protected T value;
-
-        public PreparedStatementParameter(T value) {
-            this.value = value;
-        }
-
-        public String getSqlSubstitutionValue() {
-            return String.valueOf(this.value);
-        }
+    public String getSqlSubstitutionValue() {
+      return String.valueOf(this.value);
+    }
 
-        public T getValue() {
-            return this.value;
-        }
+    public T getValue() {
+      return this.value;
     }
+  }
 
-    public static class StringParameter extends PreparedStatementParameter<String> {
+  public static class StringParameter extends PreparedStatementParameter<String> {
 
-        public StringParameter(String value) {
-            super(value);
-        }
+    public StringParameter(String value) {
+      super(value);
+    }
 
-        @Override
-        public String getSqlSubstitutionValue() {
-            // TODO: investigate other injection prevention
-            if (this.value == null) {
-                return "null";
-            }
-            StringBuilder sb = new StringBuilder();
-            sb.append('\''); // starting quote
-            for (int i = 0; i < this.value.length(); i++) {
-                char c = this.value.charAt(i);
-                switch (c) {
-                    case 0:
-                        sb.append('\\').append(0);
-                        break;
-                    case '\n':
-                        sb.append('\\').append('n');
-                        break;
-                    case '\r':
-                        sb.append('\\').append('r');
-                        break;
-                    case '\\':
-                        sb.append('\\').append('\\');
-                        break;
-                    case '\'':
-                        sb.append('\\').append('\'');
-                        break;
-                    case '\"':
-                        sb.append('\\').append('\"');
-                        break;
-                    default:
-                        sb.append(c);
-                }
-            }
-            sb.append('\''); // ending quote
-            return sb.toString();
+    @Override
+    public String getSqlSubstitutionValue() {
+      // TODO: investigate other injection prevention
+      if (this.value == null) {
+        return "null";
+      }
+      StringBuilder sb = new StringBuilder();
+      sb.append('\''); // starting quote
+      for (int i = 0; i < this.value.length(); i++) {
+        char c = this.value.charAt(i);
+        switch (c) {
+          case 0:
+            sb.append('\\').append(0);
+            break;
+          case '\n':
+            sb.append('\\').append('n');
+            break;
+          case '\r':
+            sb.append('\\').append('r');
+            break;
+          case '\\':
+            sb.append('\\').append('\\');
+            break;
+          case '\'':
+            sb.append('\\').append('\'');
+            break;
+          case '\"':
+            sb.append('\\').append('\"');
+            break;
+          default:
+            sb.append(c);
         }
+      }
+      sb.append('\''); // ending quote
+      return sb.toString();
     }
+  }
 
-    public static class NullParameter extends PreparedStatementParameter {
+  public static class NullParameter extends PreparedStatementParameter {
 
-        public NullParameter() {
-            super(null);
-        }
+    public NullParameter() {
+      super(null);
+    }
 
-        @Override
-        public String getSqlSubstitutionValue() {
-            return "null";
-        }
+    @Override
+    public String getSqlSubstitutionValue() {
+      return "null";
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequest.java b/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequest.java
index 14acb26b3c..bffdd36688 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequest.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequest.java
@@ -3,114 +3,114 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.request;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import java.io.IOException;
 import java.util.Collections;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.search.SearchModule;
 import org.opensearch.sql.legacy.exception.SqlParseException;
 
 public class SqlRequest {
 
-    public static final SqlRequest NULL = new SqlRequest("", null);
-
-    String sql;
-    JSONObject jsonContent;
-    String cursor;
-    Integer fetchSize;
-
-    public SqlRequest(final String sql, final JSONObject jsonContent) {
-        this.sql = sql;
-        this.jsonContent = jsonContent;
-    }
-
-    public SqlRequest(final String cursor) {
-        this.cursor = cursor;
-    }
-
-    public SqlRequest(final String sql, final Integer fetchSize, final JSONObject jsonContent) {
-        this.sql = sql;
-        this.fetchSize = fetchSize;
-        this.jsonContent = jsonContent;
-    }
-
-    private static boolean isValidJson(String json) {
-        try {
-            new JSONObject(json);
-        } catch (JSONException e) {
-            return false;
-        }
-        return true;
+  public static final SqlRequest NULL = new SqlRequest("", null);
+
+  String sql;
+  JSONObject jsonContent;
+  String cursor;
+  Integer fetchSize;
+
+  public SqlRequest(final String sql, final JSONObject jsonContent) {
+    this.sql = sql;
+    this.jsonContent = jsonContent;
+  }
+
+  public SqlRequest(final String cursor) {
+    this.cursor = cursor;
+  }
+
+  public SqlRequest(final String sql, final Integer fetchSize, final JSONObject jsonContent) {
+    this.sql = sql;
+    this.fetchSize = fetchSize;
+    this.jsonContent = jsonContent;
+  }
+
+  private static boolean isValidJson(String json) {
+    try {
+      new JSONObject(json);
+    } catch (JSONException e) {
+      return false;
     }
-
-    public String getSql() {
-        return this.sql;
-    }
-
-    public String cursor() {
-        return this.cursor;
-    }
-
-    public Integer fetchSize() {
-        return this.fetchSize;
-    }
-
-    public JSONObject getJsonContent() {
-        return this.jsonContent;
-    }
-
-    /**
-     * JSONObject's getJSONObject method will return just the value, this helper method is to extract the key and
-     * value of 'filter' and return the JSON as a string.
-     */
-    private String getFilterObjectAsString(JSONObject jsonContent) {
-        String filterVal = jsonContent.getJSONObject("filter").toString();
-        return "{\"filter\":" + filterVal + "}";
-    }
-
-    private boolean hasFilterInRequest() {
-        return jsonContent != null && jsonContent.has("filter");
-    }
-
-    /**
-     * Takes 'filter' parameter from JSON request if JSON request and 'filter' were given and creates a QueryBuilder
-     * object out of it to add to the filterClauses of the BoolQueryBuilder.
-     */
-    private void addFilterFromJson(BoolQueryBuilder boolQuery) throws SqlParseException {
-        try {
-            String filter = getFilterObjectAsString(jsonContent);
-            SearchModule searchModule = new SearchModule(Settings.EMPTY,  Collections.emptyList());
-            XContentParser parser = XContentFactory.xContent(XContentType.JSON).
-                    createParser(new NamedXContentRegistry(searchModule.getNamedXContents()),
-                            LoggingDeprecationHandler.INSTANCE,
-                            filter);
-
-            // nextToken is called before passing the parser to fromXContent since the fieldName will be null if the
-            // first token it parses is START_OBJECT resulting in an exception
-            parser.nextToken();
-            boolQuery.filter(BoolQueryBuilder.fromXContent(parser));
-        } catch (IOException e) {
-            throw new SqlParseException("Unable to parse 'filter' in JSON request: " + e.getMessage());
-        }
-
+    return true;
+  }
+
+  public String getSql() {
+    return this.sql;
+  }
+
+  public String cursor() {
+    return this.cursor;
+  }
+
+  public Integer fetchSize() {
+    return this.fetchSize;
+  }
+
+  public JSONObject getJsonContent() {
+    return this.jsonContent;
+  }
+
+  /**
+   * JSONObject's getJSONObject method will return just the value, this helper method is to extract
+   * the key and value of 'filter' and return the JSON as a string.
+   */
+  private String getFilterObjectAsString(JSONObject jsonContent) {
+    String filterVal = jsonContent.getJSONObject("filter").toString();
+    return "{\"filter\":" + filterVal + "}";
+  }
+
+  private boolean hasFilterInRequest() {
+    return jsonContent != null && jsonContent.has("filter");
+  }
+
+  /**
+   * Takes 'filter' parameter from JSON request if JSON request and 'filter' were given and creates
+   * a QueryBuilder object out of it to add to the filterClauses of the BoolQueryBuilder.
+   */
+  private void addFilterFromJson(BoolQueryBuilder boolQuery) throws SqlParseException {
+    try {
+      String filter = getFilterObjectAsString(jsonContent);
+      SearchModule searchModule = new SearchModule(Settings.EMPTY, Collections.emptyList());
+      XContentParser parser =
+          new JsonXContentParser(
+              new NamedXContentRegistry(searchModule.getNamedXContents()),
+              LoggingDeprecationHandler.INSTANCE,
+              new JsonFactory().createParser(filter));
+
+      // nextToken is called before passing the parser to fromXContent since the fieldName will be
+      // null if the
+      // first token it parses is START_OBJECT resulting in an exception
+      parser.nextToken();
+      boolQuery.filter(BoolQueryBuilder.fromXContent(parser));
+    } catch (IOException e) {
+      throw new SqlParseException("Unable to parse 'filter' in JSON request: " + e.getMessage());
     }
+  }
 
-    public BoolQueryBuilder checkAndAddFilter(BoolQueryBuilder boolQuery) throws SqlParseException {
-        if (hasFilterInRequest()) {
-            // if WHERE was not given, create a new BoolQuery to add "filter" to
-            boolQuery = boolQuery == null ? new BoolQueryBuilder() : boolQuery;
-            addFilterFromJson(boolQuery);
-        }
-        return boolQuery;
+  public BoolQueryBuilder checkAndAddFilter(BoolQueryBuilder boolQuery) throws SqlParseException {
+    if (hasFilterInRequest()) {
+      // if WHERE was not given, create a new BoolQuery to add "filter" to
+      boolQuery = boolQuery == null ? new BoolQueryBuilder() : boolQuery;
+      addFilterFromJson(boolQuery);
     }
+    return boolQuery;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequestFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequestFactory.java
index 4c5d207be8..0fee6cff86 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequestFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequestFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.request;
 
 import java.util.ArrayList;
@@ -16,128 +15,134 @@
 
 public class SqlRequestFactory {
 
-    private static final String SQL_URL_PARAM_KEY = "sql";
-    private static final String SQL_FIELD_NAME = "query";
-    private static final String PARAM_FIELD_NAME = "parameters";
-    private static final String PARAM_TYPE_FIELD_NAME = "type";
-    private static final String PARAM_VALUE_FIELD_NAME = "value";
+  private static final String SQL_URL_PARAM_KEY = "sql";
+  private static final String SQL_FIELD_NAME = "query";
+  private static final String PARAM_FIELD_NAME = "parameters";
+  private static final String PARAM_TYPE_FIELD_NAME = "type";
+  private static final String PARAM_VALUE_FIELD_NAME = "value";
 
-    public static final String SQL_CURSOR_FIELD_NAME = "cursor";
-    public static final String SQL_FETCH_FIELD_NAME = "fetch_size";
+  public static final String SQL_CURSOR_FIELD_NAME = "cursor";
+  public static final String SQL_FETCH_FIELD_NAME = "fetch_size";
 
-    public static SqlRequest getSqlRequest(RestRequest request) {
-        switch (request.method()) {
-            case POST:
-                return parseSqlRequestFromPayload(request);
-            default:
-                throw new IllegalArgumentException("OpenSearch SQL doesn't supported HTTP " + request.method().name());
-        }
+  public static SqlRequest getSqlRequest(RestRequest request) {
+    switch (request.method()) {
+      case POST:
+        return parseSqlRequestFromPayload(request);
+      default:
+        throw new IllegalArgumentException(
+            "OpenSearch SQL doesn't supported HTTP " + request.method().name());
     }
+  }
 
-    private static SqlRequest parseSqlRequestFromUrl(RestRequest restRequest) {
-        String sql;
+  private static SqlRequest parseSqlRequestFromUrl(RestRequest restRequest) {
+    String sql;
 
-        sql = restRequest.param(SQL_URL_PARAM_KEY);
-        if (sql == null) {
-            throw new IllegalArgumentException("Cannot find sql parameter from the URL");
-        }
-        return new SqlRequest(sql, null);
+    sql = restRequest.param(SQL_URL_PARAM_KEY);
+    if (sql == null) {
+      throw new IllegalArgumentException("Cannot find sql parameter from the URL");
     }
+    return new SqlRequest(sql, null);
+  }
 
-    private static SqlRequest parseSqlRequestFromPayload(RestRequest restRequest) {
-        String content = restRequest.content().utf8ToString();
+  private static SqlRequest parseSqlRequestFromPayload(RestRequest restRequest) {
+    String content = restRequest.content().utf8ToString();
 
-        JSONObject jsonContent;
-        try {
-            jsonContent = new JSONObject(content);
-            if (jsonContent.has(SQL_CURSOR_FIELD_NAME)) {
-                return new SqlRequest(jsonContent.getString(SQL_CURSOR_FIELD_NAME));
-            }
-        } catch (JSONException e) {
-            throw new IllegalArgumentException("Failed to parse request payload", e);
-        }
-        String sql = jsonContent.getString(SQL_FIELD_NAME);
-
-        if (jsonContent.has(PARAM_FIELD_NAME)) { // is a PreparedStatement
-            JSONArray paramArray = jsonContent.getJSONArray(PARAM_FIELD_NAME);
-            List<PreparedStatementRequest.PreparedStatementParameter> parameters = parseParameters(paramArray);
-            return new PreparedStatementRequest(sql, validateAndGetFetchSize(jsonContent), jsonContent, parameters);
-        }
-        return new SqlRequest(sql, validateAndGetFetchSize(jsonContent), jsonContent);
+    JSONObject jsonContent;
+    try {
+      jsonContent = new JSONObject(content);
+      if (jsonContent.has(SQL_CURSOR_FIELD_NAME)) {
+        return new SqlRequest(jsonContent.getString(SQL_CURSOR_FIELD_NAME));
+      }
+    } catch (JSONException e) {
+      throw new IllegalArgumentException("Failed to parse request payload", e);
     }
+    String sql = jsonContent.getString(SQL_FIELD_NAME);
 
+    if (jsonContent.has(PARAM_FIELD_NAME)) { // is a PreparedStatement
+      JSONArray paramArray = jsonContent.getJSONArray(PARAM_FIELD_NAME);
+      List<PreparedStatementRequest.PreparedStatementParameter> parameters =
+          parseParameters(paramArray);
+      return new PreparedStatementRequest(
+          sql, validateAndGetFetchSize(jsonContent), jsonContent, parameters);
+    }
+    return new SqlRequest(sql, validateAndGetFetchSize(jsonContent), jsonContent);
+  }
 
-    private static Integer validateAndGetFetchSize(JSONObject jsonContent) {
-        Optional<Integer> fetchSize = Optional.empty();
-        try {
-            if (jsonContent.has(SQL_FETCH_FIELD_NAME)) {
-                fetchSize = Optional.of(jsonContent.getInt(SQL_FETCH_FIELD_NAME));
-                if (fetchSize.get() < 0) {
-                    throw new IllegalArgumentException("Fetch_size must be greater or equal to 0");
-                }
-            }
-        } catch (JSONException e) {
-            throw new IllegalArgumentException("Failed to parse field [" + SQL_FETCH_FIELD_NAME +"]", e);
+  private static Integer validateAndGetFetchSize(JSONObject jsonContent) {
+    Optional<Integer> fetchSize = Optional.empty();
+    try {
+      if (jsonContent.has(SQL_FETCH_FIELD_NAME)) {
+        fetchSize = Optional.of(jsonContent.getInt(SQL_FETCH_FIELD_NAME));
+        if (fetchSize.get() < 0) {
+          throw new IllegalArgumentException("Fetch_size must be greater or equal to 0");
         }
-        return fetchSize.orElse(0);
+      }
+    } catch (JSONException e) {
+      throw new IllegalArgumentException("Failed to parse field [" + SQL_FETCH_FIELD_NAME + "]", e);
     }
+    return fetchSize.orElse(0);
+  }
 
-    private static List<PreparedStatementRequest.PreparedStatementParameter> parseParameters(
-            JSONArray paramsJsonArray) {
-        List<PreparedStatementRequest.PreparedStatementParameter> parameters = new ArrayList<>();
-        for (int i = 0; i < paramsJsonArray.length(); i++) {
-            JSONObject paramJson = paramsJsonArray.getJSONObject(i);
-            String typeString = paramJson.getString(PARAM_TYPE_FIELD_NAME);
-            if (typeString == null) {
-                throw new IllegalArgumentException("Parameter type cannot be null. parameter json: "
-                        + paramJson.toString());
-            }
-            PreparedStatementRequest.ParameterType type;
-            try {
-                type = PreparedStatementRequest.ParameterType.valueOf(typeString.toUpperCase());
-            } catch (IllegalArgumentException e) {
-                throw new IllegalArgumentException("Unsupported parameter type " + typeString, e);
-            }
-            try {
-                PreparedStatementRequest.PreparedStatementParameter parameter;
-                switch (type) {
-                    case BOOLEAN:
-                        parameter = new PreparedStatementRequest.PreparedStatementParameter<>(
-                                paramJson.getBoolean(PARAM_VALUE_FIELD_NAME));
-                        parameters.add(parameter);
-                        break;
-                    case KEYWORD:
-                    case STRING:
-                    case DATE:
-                        parameter = new PreparedStatementRequest.StringParameter(
-                                paramJson.getString(PARAM_VALUE_FIELD_NAME));
-                        parameters.add(parameter);
-                        break;
-                    case BYTE:
-                    case SHORT:
-                    case INTEGER:
-                    case LONG:
-                        parameter = new PreparedStatementRequest.PreparedStatementParameter<>(
-                                paramJson.getLong(PARAM_VALUE_FIELD_NAME));
-                        parameters.add(parameter);
-                        break;
-                    case FLOAT:
-                    case DOUBLE:
-                        parameter = new PreparedStatementRequest.PreparedStatementParameter<>(
-                                paramJson.getDouble(PARAM_VALUE_FIELD_NAME));
-                        parameters.add(parameter);
-                        break;
-                    case NULL:
-                        parameter = new PreparedStatementRequest.NullParameter();
-                        parameters.add(parameter);
-                        break;
-                    default:
-                        throw new IllegalArgumentException("Failed to handle parameter type " + type.name());
-                }
-            } catch (JSONException e) {
-                throw new IllegalArgumentException("Failed to parse PreparedStatement parameters", e);
-            }
+  private static List<PreparedStatementRequest.PreparedStatementParameter> parseParameters(
+      JSONArray paramsJsonArray) {
+    List<PreparedStatementRequest.PreparedStatementParameter> parameters = new ArrayList<>();
+    for (int i = 0; i < paramsJsonArray.length(); i++) {
+      JSONObject paramJson = paramsJsonArray.getJSONObject(i);
+      String typeString = paramJson.getString(PARAM_TYPE_FIELD_NAME);
+      if (typeString == null) {
+        throw new IllegalArgumentException(
+            "Parameter type cannot be null. parameter json: " + paramJson.toString());
+      }
+      PreparedStatementRequest.ParameterType type;
+      try {
+        type = PreparedStatementRequest.ParameterType.valueOf(typeString.toUpperCase());
+      } catch (IllegalArgumentException e) {
+        throw new IllegalArgumentException("Unsupported parameter type " + typeString, e);
+      }
+      try {
+        PreparedStatementRequest.PreparedStatementParameter parameter;
+        switch (type) {
+          case BOOLEAN:
+            parameter =
+                new PreparedStatementRequest.PreparedStatementParameter<>(
+                    paramJson.getBoolean(PARAM_VALUE_FIELD_NAME));
+            parameters.add(parameter);
+            break;
+          case KEYWORD:
+          case STRING:
+          case DATE:
+            parameter =
+                new PreparedStatementRequest.StringParameter(
+                    paramJson.getString(PARAM_VALUE_FIELD_NAME));
+            parameters.add(parameter);
+            break;
+          case BYTE:
+          case SHORT:
+          case INTEGER:
+          case LONG:
+            parameter =
+                new PreparedStatementRequest.PreparedStatementParameter<>(
+                    paramJson.getLong(PARAM_VALUE_FIELD_NAME));
+            parameters.add(parameter);
+            break;
+          case FLOAT:
+          case DOUBLE:
+            parameter =
+                new PreparedStatementRequest.PreparedStatementParameter<>(
+                    paramJson.getDouble(PARAM_VALUE_FIELD_NAME));
+            parameters.add(parameter);
+            break;
+          case NULL:
+            parameter = new PreparedStatementRequest.NullParameter();
+            parameters.add(parameter);
+            break;
+          default:
+            throw new IllegalArgumentException("Failed to handle parameter type " + type.name());
         }
-        return parameters;
+      } catch (JSONException e) {
+        throw new IllegalArgumentException("Failed to parse PreparedStatement parameters", e);
+      }
     }
+    return parameters;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequestParam.java b/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequestParam.java
index c9d3abb320..b151fabde6 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequestParam.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/request/SqlRequestParam.java
@@ -3,57 +3,56 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.request;
 
 import java.util.Map;
 import java.util.Optional;
 import org.opensearch.sql.legacy.executor.Format;
 
-/**
- * Utils class for parse the request params.
- */
+/** Utils class for parse the request params. */
 public class SqlRequestParam {
-    public static final String QUERY_PARAMS_FORMAT = "format";
-    public static final String QUERY_PARAMS_PRETTY = "pretty";
-    public static final String QUERY_PARAMS_ESCAPE = "escape";
-
-    private static final String DEFAULT_RESPONSE_FORMAT = "jdbc";
-
-    /**
-     * Parse the pretty params to decide whether the response should be pretty formatted.
-     * @param requestParams request params.
-     * @return return true if the response required pretty format, otherwise return false.
-     */
-    public static boolean isPrettyFormat(Map<String, String> requestParams) {
-        return requestParams.containsKey(QUERY_PARAMS_PRETTY)
-               && ("".equals(requestParams.get(QUERY_PARAMS_PRETTY))
-                   || "true".equals(requestParams.get(QUERY_PARAMS_PRETTY)));
-    }
-
-    /**
-     * Parse the request params and return the {@link Format} of the response
-     * @param requestParams request params
-     * @return The response Format.
-     */
-    public static Format getFormat(Map<String, String> requestParams) {
-        String formatName =
-            requestParams.containsKey(QUERY_PARAMS_FORMAT)
-                ? requestParams.get(QUERY_PARAMS_FORMAT).toLowerCase()
-                : DEFAULT_RESPONSE_FORMAT;
-        Optional<Format> optionalFormat = Format.of(formatName);
-        if (optionalFormat.isPresent()) {
-            return optionalFormat.get();
-        } else {
-            throw new IllegalArgumentException("Failed to create executor due to unknown response format: "
-                                               + formatName);
-        }
+  public static final String QUERY_PARAMS_FORMAT = "format";
+  public static final String QUERY_PARAMS_PRETTY = "pretty";
+  public static final String QUERY_PARAMS_ESCAPE = "escape";
+
+  private static final String DEFAULT_RESPONSE_FORMAT = "jdbc";
+
+  /**
+   * Parse the pretty params to decide whether the response should be pretty formatted.
+   *
+   * @param requestParams request params.
+   * @return return true if the response required pretty format, otherwise return false.
+   */
+  public static boolean isPrettyFormat(Map<String, String> requestParams) {
+    return requestParams.containsKey(QUERY_PARAMS_PRETTY)
+        && ("".equals(requestParams.get(QUERY_PARAMS_PRETTY))
+            || "true".equals(requestParams.get(QUERY_PARAMS_PRETTY)));
+  }
+
+  /**
+   * Parse the request params and return the {@link Format} of the response
+   *
+   * @param requestParams request params
+   * @return The response Format.
+   */
+  public static Format getFormat(Map<String, String> requestParams) {
+    String formatName =
+        requestParams.containsKey(QUERY_PARAMS_FORMAT)
+            ? requestParams.get(QUERY_PARAMS_FORMAT).toLowerCase()
+            : DEFAULT_RESPONSE_FORMAT;
+    Optional<Format> optionalFormat = Format.of(formatName);
+    if (optionalFormat.isPresent()) {
+      return optionalFormat.get();
+    } else {
+      throw new IllegalArgumentException(
+          "Failed to create executor due to unknown response format: " + formatName);
     }
+  }
 
-    public static boolean getEscapeOption(Map<String, String> requestParams) {
-        if (requestParams.containsKey(QUERY_PARAMS_ESCAPE)) {
-            return Boolean.parseBoolean(requestParams.get(QUERY_PARAMS_ESCAPE));
-        }
-        return false;
+  public static boolean getEscapeOption(Map<String, String> requestParams) {
+    if (requestParams.containsKey(QUERY_PARAMS_ESCAPE)) {
+      return Boolean.parseBoolean(requestParams.get(QUERY_PARAMS_ESCAPE));
     }
+    return false;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/RewriteRule.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/RewriteRule.java
index 6744bfa3e5..cd6400ed88 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/RewriteRule.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/RewriteRule.java
@@ -3,29 +3,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter;
 
 import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
 import java.sql.SQLFeatureNotSupportedException;
 
-/**
- * Query Optimize Rule
- */
+/** Query Optimize Rule */
 public interface RewriteRule<T extends SQLQueryExpr> {
 
-    /**
-     * Checking whether the rule match the query?
-     *
-     * @return true if the rule match to the query.
-     * @throws SQLFeatureNotSupportedException
-     */
-    boolean match(T expr) throws SQLFeatureNotSupportedException;
+  /**
+   * Checking whether the rule match the query?
+   *
+   * @return true if the rule match to the query.
+   * @throws SQLFeatureNotSupportedException
+   */
+  boolean match(T expr) throws SQLFeatureNotSupportedException;
 
-    /**
-     * Optimize the query.
-     *
-     * @throws SQLFeatureNotSupportedException
-     */
-    void rewrite(T expr) throws SQLFeatureNotSupportedException;
+  /**
+   * Optimize the query.
+   *
+   * @throws SQLFeatureNotSupportedException
+   */
+  void rewrite(T expr) throws SQLFeatureNotSupportedException;
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/RewriteRuleExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/RewriteRuleExecutor.java
index 86aa3d0b20..20fd018ae8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/RewriteRuleExecutor.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/RewriteRuleExecutor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter;
 
 import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
@@ -11,50 +10,42 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Query RewriteRuleExecutor which will execute the {@link RewriteRule} with registered order.
- */
+/** Query RewriteRuleExecutor which will execute the {@link RewriteRule} with registered order. */
 public class RewriteRuleExecutor<T extends SQLQueryExpr> {
-    private final List<RewriteRule<T>> rewriteRules;
-
-    public RewriteRuleExecutor(List<RewriteRule<T>> rewriteRules) {
-        this.rewriteRules = rewriteRules;
+  private final List<RewriteRule<T>> rewriteRules;
+
+  public RewriteRuleExecutor(List<RewriteRule<T>> rewriteRules) {
+    this.rewriteRules = rewriteRules;
+  }
+
+  /** Execute the registered {@link RewriteRule} in order on the Query. */
+  public void executeOn(T expr) throws SQLFeatureNotSupportedException {
+    for (RewriteRule<T> rule : rewriteRules) {
+      if (rule.match(expr)) {
+        rule.rewrite(expr);
+      }
     }
-
-    /**
-     * Execute the registered {@link RewriteRule} in order on the Query.
-     */
-    public void executeOn(T expr) throws SQLFeatureNotSupportedException {
-        for (RewriteRule<T> rule : rewriteRules) {
-            if (rule.match(expr)) {
-                rule.rewrite(expr);
-            }
-        }
-    }
-
-    /**
-     * Build {@link RewriteRuleExecutor}
-     */
-    public static <T extends SQLQueryExpr> BuilderOptimizer<T> builder() {
-        return new BuilderOptimizer<T>();
+  }
+
+  /** Build {@link RewriteRuleExecutor} */
+  public static <T extends SQLQueryExpr> BuilderOptimizer<T> builder() {
+    return new BuilderOptimizer<T>();
+  }
+
+  /** Builder of {@link RewriteRuleExecutor} */
+  public static class BuilderOptimizer<T extends SQLQueryExpr> {
+    private List<RewriteRule<T>> rewriteRules;
+
+    public BuilderOptimizer<T> withRule(RewriteRule<T> rule) {
+      if (rewriteRules == null) {
+        rewriteRules = new ArrayList<>();
+      }
+      rewriteRules.add(rule);
+      return this;
     }
 
-    /**
-     * Builder of {@link RewriteRuleExecutor}
-     */
-    public static class BuilderOptimizer<T extends SQLQueryExpr> {
-        private List<RewriteRule<T>> rewriteRules;
-
-        public BuilderOptimizer<T> withRule(RewriteRule<T> rule) {
-            if (rewriteRules == null) {
-                rewriteRules = new ArrayList<>();
-            }
-            rewriteRules.add(rule);
-            return this;
-        }
-
-        public RewriteRuleExecutor<T> build() {
-            return new RewriteRuleExecutor<T>(rewriteRules);
-        }
+    public RewriteRuleExecutor<T> build() {
+      return new RewriteRuleExecutor<T>(rewriteRules);
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/Identifier.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/Identifier.java
index 6c708b91b0..9863862af9 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/Identifier.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/Identifier.java
@@ -3,42 +3,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.alias;
 
 import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
 
-/**
- * Util class for identifier expression parsing
- */
+/** Util class for identifier expression parsing */
 class Identifier {
 
-    private final SQLIdentifierExpr idExpr;
+  private final SQLIdentifierExpr idExpr;
 
-    Identifier(SQLIdentifierExpr idExpr) {
-        this.idExpr = idExpr;
-    }
+  Identifier(SQLIdentifierExpr idExpr) {
+    this.idExpr = idExpr;
+  }
 
-    String name() {
-        return idExpr.getName();
-    }
+  String name() {
+    return idExpr.getName();
+  }
 
-    boolean hasPrefix() {
-        return firstDotIndex() != -1;
-    }
+  boolean hasPrefix() {
+    return firstDotIndex() != -1;
+  }
 
-    /** Assumption: identifier has prefix */
-    String prefix() {
-        return name().substring(0, firstDotIndex());
-    }
+  /** Assumption: identifier has prefix */
+  String prefix() {
+    return name().substring(0, firstDotIndex());
+  }
 
-    /** Assumption: identifier has prefix */
-    void removePrefix() {
-        String nameWithoutPrefix = name().substring(prefix().length() + 1);
-        idExpr.setName(nameWithoutPrefix);
-    }
+  /** Assumption: identifier has prefix */
+  void removePrefix() {
+    String nameWithoutPrefix = name().substring(prefix().length() + 1);
+    idExpr.setName(nameWithoutPrefix);
+  }
 
-    private int firstDotIndex() {
-        return name().indexOf('.', 1);
-    }
+  private int firstDotIndex() {
+    return name().indexOf('.', 1);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/Table.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/Table.java
index 63c33d4721..015d8d8858 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/Table.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/Table.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.alias;
 
 import static com.alibaba.druid.sql.ast.expr.SQLBinaryOperator.Divide;
@@ -14,44 +13,42 @@
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.google.common.base.Strings;
 
-/**
- * Util class for table expression parsing
- */
+/** Util class for table expression parsing */
 class Table {
 
-    private final SQLExprTableSource tableExpr;
-
-    Table(SQLExprTableSource tableExpr) {
-        this.tableExpr = tableExpr;
-    }
+  private final SQLExprTableSource tableExpr;
 
-    boolean hasAlias() {
-        return !alias().isEmpty();
-    }
+  Table(SQLExprTableSource tableExpr) {
+    this.tableExpr = tableExpr;
+  }
 
-    String alias() {
-        return Strings.nullToEmpty(tableExpr.getAlias());
-    }
+  boolean hasAlias() {
+    return !alias().isEmpty();
+  }
 
-    void removeAlias() {
-        tableExpr.setAlias(null);
-    }
+  String alias() {
+    return Strings.nullToEmpty(tableExpr.getAlias());
+  }
 
-    /** Extract table name in table expression */
-    String name() {
-        SQLExpr expr = tableExpr.getExpr();
-        if (expr instanceof SQLIdentifierExpr) {
-            return ((SQLIdentifierExpr) expr).getName();
-        } else if (isTableWithType(expr)) {
-            return ((SQLIdentifierExpr) ((SQLBinaryOpExpr) expr).getLeft()).getName();
-        }
-        return expr.toString();
-    }
+  void removeAlias() {
+    tableExpr.setAlias(null);
+  }
 
-    /** Return true for table name along with type name, for example 'accounts/_doc' */
-    private boolean isTableWithType(SQLExpr expr) {
-        return expr instanceof SQLBinaryOpExpr
-            && ((SQLBinaryOpExpr) expr).getLeft() instanceof SQLIdentifierExpr
-            && ((SQLBinaryOpExpr) expr).getOperator() == Divide;
+  /** Extract table name in table expression */
+  String name() {
+    SQLExpr expr = tableExpr.getExpr();
+    if (expr instanceof SQLIdentifierExpr) {
+      return ((SQLIdentifierExpr) expr).getName();
+    } else if (isTableWithType(expr)) {
+      return ((SQLIdentifierExpr) ((SQLBinaryOpExpr) expr).getLeft()).getName();
     }
+    return expr.toString();
+  }
+
+  /** Return true for table name along with type name, for example 'accounts/_doc' */
+  private boolean isTableWithType(SQLExpr expr) {
+    return expr instanceof SQLBinaryOpExpr
+        && ((SQLBinaryOpExpr) expr).getLeft() instanceof SQLIdentifierExpr
+        && ((SQLBinaryOpExpr) expr).getOperator() == Divide;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/TableAliasPrefixRemoveRule.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/TableAliasPrefixRemoveRule.java
index b8500454cd..80190a5889 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/TableAliasPrefixRemoveRule.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/alias/TableAliasPrefixRemoveRule.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.alias;
 
 import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
@@ -17,86 +16,87 @@
 import org.opensearch.sql.legacy.rewriter.RewriteRule;
 import org.opensearch.sql.legacy.rewriter.subquery.utils.FindSubQuery;
 
-/**
- * Rewrite rule for removing table alias or table name prefix in field name.
- */
+/** Rewrite rule for removing table alias or table name prefix in field name. */
 public class TableAliasPrefixRemoveRule implements RewriteRule<SQLQueryExpr> {
 
-    /** Table aliases in FROM clause. Store table name for those without alias. */
-    private final Set<String> tableAliasesToRemove = new HashSet<>();
+  /** Table aliases in FROM clause. Store table name for those without alias. */
+  private final Set<String> tableAliasesToRemove = new HashSet<>();
 
-    @Override
-    public boolean match(SQLQueryExpr root) {
-        if (hasSubQuery(root)) {
-            return false;
-        }
-        collectTableAliasesThatCanBeRemoved(root);
-        return !tableAliasesToRemove.isEmpty();
+  @Override
+  public boolean match(SQLQueryExpr root) {
+    if (hasSubQuery(root)) {
+      return false;
     }
+    collectTableAliasesThatCanBeRemoved(root);
+    return !tableAliasesToRemove.isEmpty();
+  }
 
-    @Override
-    public void rewrite(SQLQueryExpr root) {
-        removeTableAliasPrefixInColumnName(root);
-    }
+  @Override
+  public void rewrite(SQLQueryExpr root) {
+    removeTableAliasPrefixInColumnName(root);
+  }
 
-    private boolean hasSubQuery(SQLQueryExpr root) {
-        FindSubQuery visitor = new FindSubQuery();
-        root.accept(visitor);
-        return visitor.hasSubQuery();
-    }
+  private boolean hasSubQuery(SQLQueryExpr root) {
+    FindSubQuery visitor = new FindSubQuery();
+    root.accept(visitor);
+    return visitor.hasSubQuery();
+  }
 
-    private void collectTableAliasesThatCanBeRemoved(SQLQueryExpr root) {
-        visitNonJoinedTable(root, tableExpr -> {
-            Table table = new Table(tableExpr);
-            if (table.hasAlias()) {
-                tableAliasesToRemove.add(table.alias());
-                table.removeAlias();
-            } else {
-                tableAliasesToRemove.add(table.name());
-            }
+  private void collectTableAliasesThatCanBeRemoved(SQLQueryExpr root) {
+    visitNonJoinedTable(
+        root,
+        tableExpr -> {
+          Table table = new Table(tableExpr);
+          if (table.hasAlias()) {
+            tableAliasesToRemove.add(table.alias());
+            table.removeAlias();
+          } else {
+            tableAliasesToRemove.add(table.name());
+          }
         });
-    }
+  }
 
-    private void removeTableAliasPrefixInColumnName(SQLQueryExpr root) {
-        visitColumnName(root, idExpr -> {
-            Identifier field = new Identifier(idExpr);
-            if (field.hasPrefix() && tableAliasesToRemove.contains(field.prefix())) {
-                field.removePrefix();
-            }
+  private void removeTableAliasPrefixInColumnName(SQLQueryExpr root) {
+    visitColumnName(
+        root,
+        idExpr -> {
+          Identifier field = new Identifier(idExpr);
+          if (field.hasPrefix() && tableAliasesToRemove.contains(field.prefix())) {
+            field.removePrefix();
+          }
         });
-    }
+  }
 
-    private void visitNonJoinedTable(SQLQueryExpr root,
-                                     Consumer<SQLExprTableSource> visit) {
-        root.accept(new MySqlASTVisitorAdapter() {
-            @Override
-            public boolean visit(SQLJoinTableSource x) {
-                // Avoid visiting table name in any JOIN including comma/inner/left join
-                //  between 2 indices or between index and nested field.
-                // For the latter case, alias is taken care of in {@link NestedFieldRewriter}.
-                return false;
-            }
+  private void visitNonJoinedTable(SQLQueryExpr root, Consumer<SQLExprTableSource> visit) {
+    root.accept(
+        new MySqlASTVisitorAdapter() {
+          @Override
+          public boolean visit(SQLJoinTableSource x) {
+            // Avoid visiting table name in any JOIN including comma/inner/left join
+            //  between 2 indices or between index and nested field.
+            // For the latter case, alias is taken care of in {@link NestedFieldRewriter}.
+            return false;
+          }
 
-            @Override
-            public void endVisit(SQLExprTableSource tableExpr) {
-                visit.accept(tableExpr);
-            }
+          @Override
+          public void endVisit(SQLExprTableSource tableExpr) {
+            visit.accept(tableExpr);
+          }
         });
-    }
+  }
 
-    private void visitColumnName(SQLQueryExpr expr,
-                                 Consumer<SQLIdentifierExpr> visit) {
-        expr.accept(new MySqlASTVisitorAdapter() {
-            @Override
-            public boolean visit(SQLExprTableSource x) {
-                return false; // Avoid rewriting identifier in table name
-            }
+  private void visitColumnName(SQLQueryExpr expr, Consumer<SQLIdentifierExpr> visit) {
+    expr.accept(
+        new MySqlASTVisitorAdapter() {
+          @Override
+          public boolean visit(SQLExprTableSource x) {
+            return false; // Avoid rewriting identifier in table name
+          }
 
-            @Override
-            public void endVisit(SQLIdentifierExpr idExpr) {
-                visit.accept(idExpr);
-            }
+          @Override
+          public void endVisit(SQLIdentifierExpr idExpr) {
+            visit.accept(idExpr);
+          }
         });
-    }
-
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/identifier/AnonymizeSensitiveDataRule.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/identifier/AnonymizeSensitiveDataRule.java
index 2768b269bf..c4f3ee5a10 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/identifier/AnonymizeSensitiveDataRule.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/identifier/AnonymizeSensitiveDataRule.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.identifier;
 
 import com.alibaba.druid.sql.ast.expr.SQLBooleanExpr;
@@ -17,53 +16,53 @@
 import org.opensearch.sql.legacy.rewriter.RewriteRule;
 
 /**
- * Rewrite rule to anonymize sensitive data in logging queries.
- * This rule replace the content of specific nodes (that might involve index data) in AST
- * to anonymous content.
+ * Rewrite rule to anonymize sensitive data in logging queries. This rule replace the content of
+ * specific nodes (that might involve index data) in AST to anonymous content.
  */
-public class AnonymizeSensitiveDataRule extends MySqlASTVisitorAdapter implements RewriteRule<SQLQueryExpr> {
+public class AnonymizeSensitiveDataRule extends MySqlASTVisitorAdapter
+    implements RewriteRule<SQLQueryExpr> {
 
-    @Override
-    public boolean visit(SQLIdentifierExpr identifierExpr) {
-        if (identifierExpr.getParent() instanceof SQLExprTableSource) {
-            identifierExpr.setName("table");
-        } else {
-            identifierExpr.setName("identifier");
-        }
-        return true;
+  @Override
+  public boolean visit(SQLIdentifierExpr identifierExpr) {
+    if (identifierExpr.getParent() instanceof SQLExprTableSource) {
+      identifierExpr.setName("table");
+    } else {
+      identifierExpr.setName("identifier");
     }
+    return true;
+  }
 
-    @Override
-    public boolean visit(SQLIntegerExpr integerExpr) {
-        integerExpr.setNumber(0);
-        return true;
-    }
+  @Override
+  public boolean visit(SQLIntegerExpr integerExpr) {
+    integerExpr.setNumber(0);
+    return true;
+  }
 
-    @Override
-    public boolean visit(SQLNumberExpr numberExpr) {
-        numberExpr.setNumber(0);
-        return true;
-    }
+  @Override
+  public boolean visit(SQLNumberExpr numberExpr) {
+    numberExpr.setNumber(0);
+    return true;
+  }
 
-    @Override
-    public boolean visit(SQLCharExpr charExpr) {
-        charExpr.setText("string_literal");
-        return true;
-    }
+  @Override
+  public boolean visit(SQLCharExpr charExpr) {
+    charExpr.setText("string_literal");
+    return true;
+  }
 
-    @Override
-    public boolean visit(SQLBooleanExpr booleanExpr) {
-        booleanExpr.setValue(false);
-        return true;
-    }
+  @Override
+  public boolean visit(SQLBooleanExpr booleanExpr) {
+    booleanExpr.setValue(false);
+    return true;
+  }
 
-    @Override
-    public boolean match(SQLQueryExpr expr) {
-        return true;
-    }
+  @Override
+  public boolean match(SQLQueryExpr expr) {
+    return true;
+  }
 
-    @Override
-    public void rewrite(SQLQueryExpr expr) {
-        expr.accept(this);
-    }
+  @Override
+  public void rewrite(SQLQueryExpr expr) {
+    expr.accept(this);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/identifier/UnquoteIdentifierRule.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/identifier/UnquoteIdentifierRule.java
index 31fc732879..b0258420eb 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/identifier/UnquoteIdentifierRule.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/identifier/UnquoteIdentifierRule.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.identifier;
 
 import static org.opensearch.sql.legacy.utils.StringUtils.unquoteFullColumn;
@@ -16,53 +15,52 @@
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter;
 import org.opensearch.sql.legacy.rewriter.RewriteRule;
 
-/**
- * Quoted Identifiers Rewriter Rule
- */
-public class UnquoteIdentifierRule extends MySqlASTVisitorAdapter implements RewriteRule<SQLQueryExpr> {
+/** Quoted Identifiers Rewriter Rule */
+public class UnquoteIdentifierRule extends MySqlASTVisitorAdapter
+    implements RewriteRule<SQLQueryExpr> {
 
-    /**
-     *
-     * This method is to adjust the AST in the cases where the field is quoted,
-     * and the full name in the SELECT field is in the format of indexAlias.fieldName
-     * (e.g. SELECT b.`lastname` FROM bank AS b).
-     *
-     * In this case, the druid parser constructs a SQLSelectItem for the field "b.`lastname`", with SQLIdentifierExpr of
-     * "b." and alias of "`lastname`".
-     *
-     * This method corrects the SQLSelectItem object to have SQLIdentifier of "b.lastname" and alias of null.
-     */
-    @Override
-    public boolean visit(SQLSelectItem selectItem) {
-        if (selectItem.getExpr() instanceof SQLIdentifierExpr) {
-            String identifier = ((SQLIdentifierExpr) selectItem.getExpr()).getName();
-            if (identifier.endsWith(".")) {
-                String correctedIdentifier = identifier + unquoteSingleField(selectItem.getAlias(), "`");
-                selectItem.setExpr(new SQLIdentifierExpr(correctedIdentifier));
-                selectItem.setAlias(null);
-            }
-        }
-        selectItem.setAlias(unquoteSingleField(selectItem.getAlias(), "`"));
-        return true;
+  /**
+   * This method is to adjust the AST in the cases where the field is quoted, and the full name in
+   * the SELECT field is in the format of indexAlias.fieldName (e.g. SELECT b.`lastname` FROM bank
+   * AS b).
+   *
+   * <p>In this case, the druid parser constructs a SQLSelectItem for the field "b.`lastname`", with
+   * SQLIdentifierExpr of "b." and alias of "`lastname`".
+   *
+   * <p>This method corrects the SQLSelectItem object to have SQLIdentifier of "b.lastname" and
+   * alias of null.
+   */
+  @Override
+  public boolean visit(SQLSelectItem selectItem) {
+    if (selectItem.getExpr() instanceof SQLIdentifierExpr) {
+      String identifier = ((SQLIdentifierExpr) selectItem.getExpr()).getName();
+      if (identifier.endsWith(".")) {
+        String correctedIdentifier = identifier + unquoteSingleField(selectItem.getAlias(), "`");
+        selectItem.setExpr(new SQLIdentifierExpr(correctedIdentifier));
+        selectItem.setAlias(null);
+      }
     }
+    selectItem.setAlias(unquoteSingleField(selectItem.getAlias(), "`"));
+    return true;
+  }
 
-    @Override
-    public void endVisit(SQLIdentifierExpr identifierExpr) {
-        identifierExpr.setName(unquoteFullColumn(identifierExpr.getName()));
-    }
+  @Override
+  public void endVisit(SQLIdentifierExpr identifierExpr) {
+    identifierExpr.setName(unquoteFullColumn(identifierExpr.getName()));
+  }
 
-    @Override
-    public void endVisit(SQLExprTableSource tableSource) {
-        tableSource.setAlias(unquoteSingleField(tableSource.getAlias()));
-    }
+  @Override
+  public void endVisit(SQLExprTableSource tableSource) {
+    tableSource.setAlias(unquoteSingleField(tableSource.getAlias()));
+  }
 
-    @Override
-    public boolean match(SQLQueryExpr root) {
-        return true;
-    }
+  @Override
+  public boolean match(SQLQueryExpr root) {
+    return true;
+  }
 
-    @Override
-    public void rewrite(SQLQueryExpr root) {
-        root.accept(new UnquoteIdentifierRule());
-    }
+  @Override
+  public void rewrite(SQLQueryExpr root) {
+    root.accept(new UnquoteIdentifierRule());
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/join/JoinRewriteRule.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/join/JoinRewriteRule.java
index b32803561e..5a2d107a0a 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/join/JoinRewriteRule.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/join/JoinRewriteRule.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.join;
 
 import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
@@ -28,22 +27,20 @@
 import org.opensearch.sql.legacy.utils.StringUtils;
 
 /**
- *  Rewrite rule to add table alias to columnNames for JOIN queries without table alias.
- * <p>
- *  We use a map from columnName to tableName. This is required to remove any ambiguity
- *  while mapping fields to right table. If there is no explicit alias we create one and use that
- *  to prefix columnName.
+ * Rewrite rule to add table alias to columnNames for JOIN queries without table alias.
+ *
+ * <p>We use a map from columnName to tableName. This is required to remove any ambiguity while
+ * mapping fields to right table. If there is no explicit alias we create one and use that to prefix
+ * columnName.
+ *
+ * <p>Different tableName on either side of join: Case a: If columnName(without alias) present in
+ * both tables, throw error. Case b: If columnName already has some alias, and that alias is a table
+ * name, change it to explicit alias of that table. Case c: If columnName is unique to a table
  *
- *  Different tableName on either side of join:
- *  Case a: If columnName(without alias) present in both tables, throw error.
- *  Case b: If columnName already has some alias, and that alias is a table name,
- *          change it to explicit alias of that table.
- *  Case c: If columnName is unique to a table
+ * <p>Same tableName on either side of join: Case a: If neither has explicit alias, throw error.
+ * Case b: If any one table has explicit alias, use explicit alias of other table for columnNames
+ * with tableName as prefix. (See below example)
  *
- *  Same tableName on either side of join:
- *  Case a: If neither has explicit alias, throw error.
- *  Case b: If any one table has explicit alias,
- *          use explicit alias of other table for columnNames with tableName as prefix. (See below example)
  * <pre>
  *       ex: SELECT table.field_a , a.field_b  | SELECT table.field_a , a.field_b
  *            FROM table a                     |  FROM table
@@ -54,164 +51,172 @@
  *                            FROM table a
  *                             JOIN table table_0
  *                              ON table_0.field_c = a.field_d
- *</pre>
- * </p>
+ * </pre>
  */
 public class JoinRewriteRule implements RewriteRule<SQLQueryExpr> {
 
-    private static final String DOT = ".";
-    private int aliasSuffix = 0;
-    private final LocalClusterState clusterState;
+  private static final String DOT = ".";
+  private int aliasSuffix = 0;
+  private final LocalClusterState clusterState;
 
-    public JoinRewriteRule(LocalClusterState clusterState) {
-        this.clusterState = clusterState;
-    }
+  public JoinRewriteRule(LocalClusterState clusterState) {
+    this.clusterState = clusterState;
+  }
 
-    @Override
-    public boolean match(SQLQueryExpr root) {
-        return isJoin(root);
-    }
+  @Override
+  public boolean match(SQLQueryExpr root) {
+    return isJoin(root);
+  }
 
-    private boolean isJoin(SQLQueryExpr sqlExpr) {
-        SQLSelectQuery sqlSelectQuery = sqlExpr.getSubQuery().getQuery();
+  private boolean isJoin(SQLQueryExpr sqlExpr) {
+    SQLSelectQuery sqlSelectQuery = sqlExpr.getSubQuery().getQuery();
 
-        if (!(sqlSelectQuery instanceof MySqlSelectQueryBlock)) {
-            return false;
-        }
-
-        MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) sqlSelectQuery;
-        return query.getFrom() instanceof SQLJoinTableSource
-            && ((SQLJoinTableSource) query.getFrom()).getJoinType() != SQLJoinTableSource.JoinType.COMMA;
+    if (!(sqlSelectQuery instanceof MySqlSelectQueryBlock)) {
+      return false;
     }
 
-    @Override
-    public void rewrite(SQLQueryExpr root) {
+    MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) sqlSelectQuery;
+    return query.getFrom() instanceof SQLJoinTableSource
+        && ((SQLJoinTableSource) query.getFrom()).getJoinType()
+            != SQLJoinTableSource.JoinType.COMMA;
+  }
 
-        final Multimap<String, Table> tableByFieldName = ArrayListMultimap.create();
-        final Map<String, String> tableNameToAlias = new HashMap<>();
+  @Override
+  public void rewrite(SQLQueryExpr root) {
 
-        // Used to handle case of same tableNames in JOIN
-        final Set<String> explicitAliases = new HashSet<>();
+    final Multimap<String, Table> tableByFieldName = ArrayListMultimap.create();
+    final Map<String, String> tableNameToAlias = new HashMap<>();
 
-        visitTable(root, tableExpr -> {
-            // Copied from SubqueryAliasRewriter ; Removes index type name if any
-            String tableName = tableExpr.getExpr().toString().replaceAll(" ", "").split("/")[0];
+    // Used to handle case of same tableNames in JOIN
+    final Set<String> explicitAliases = new HashSet<>();
 
-            if (tableExpr.getAlias() == null) {
-                String alias = createAlias(tableName);
-                tableExpr.setAlias(alias);
-                explicitAliases.add(alias);
-            }
+    visitTable(
+        root,
+        tableExpr -> {
+          // Copied from SubqueryAliasRewriter ; Removes index type name if any
+          String tableName = tableExpr.getExpr().toString().replaceAll(" ", "").split("/")[0];
 
-            Table table = new Table(tableName, tableExpr.getAlias());
+          if (tableExpr.getAlias() == null) {
+            String alias = createAlias(tableName);
+            tableExpr.setAlias(alias);
+            explicitAliases.add(alias);
+          }
 
-            tableNameToAlias.put(table.getName(), table.getAlias());
+          Table table = new Table(tableName, tableExpr.getAlias());
 
-            FieldMappings fieldMappings = clusterState. getFieldMappings(
-                new String[]{tableName}).firstMapping();
-            fieldMappings.flat((fieldName, type) -> tableByFieldName.put(fieldName, table));
-        });
+          tableNameToAlias.put(table.getName(), table.getAlias());
 
-        //Handling cases for same tableName on either side of JOIN
-        if (tableNameToAlias.size() == 1) {
-            String tableName = tableNameToAlias.keySet().iterator().next();
-            if (explicitAliases.size() == 2) {
-                // Neither table has explicit alias
-                throw new VerificationException(StringUtils.format("Not unique table/alias: [%s]", tableName));
-            } else if (explicitAliases.size() == 1) {
-                // One table has explicit alias; use created alias for other table as alias to override fields
-                // starting with actual tableName as alias to explicit alias
-                tableNameToAlias.put(tableName, explicitAliases.iterator().next());
-            }
-        }
-
-        visitColumnName(root, idExpr -> {
-            String columnName = idExpr.getName();
-            Collection<Table> tables = tableByFieldName.get(columnName);
-            if (tables.size() > 1) {
-                // columnName without alias present in both tables
-                throw new VerificationException(StringUtils.format("Field name [%s] is ambiguous", columnName));
-            } else if (tables.isEmpty()) {
-                // size() == 0?
-                // 1. Either the columnName does not exist (handled by SemanticAnalyzer [SemanticAnalysisException])
-                // 2. Or column starts with tableName as alias or explicit alias
-                //    If starts with tableName as alias change to explicit alias
-                tableNameToAlias.keySet().stream().forEach(tableName -> {
-                    if (columnName.startsWith(tableName + DOT)) {
-                        idExpr.setName(columnName.replace(tableName + DOT, tableNameToAlias.get(tableName) + DOT));
-                    }
-                });
-            } else {
-                // columnName with any alias and unique to one table
-                Table table = tables.iterator().next();
-                idExpr.setName(String.join(DOT, table.getAlias(), columnName));
-            }
+          FieldMappings fieldMappings =
+              clusterState.getFieldMappings(new String[] {tableName}).firstMapping();
+          fieldMappings.flat((fieldName, type) -> tableByFieldName.put(fieldName, table));
         });
+
+    // Handling cases for same tableName on either side of JOIN
+    if (tableNameToAlias.size() == 1) {
+      String tableName = tableNameToAlias.keySet().iterator().next();
+      if (explicitAliases.size() == 2) {
+        // Neither table has explicit alias
+        throw new VerificationException(
+            StringUtils.format("Not unique table/alias: [%s]", tableName));
+      } else if (explicitAliases.size() == 1) {
+        // One table has explicit alias; use created alias for other table as alias to override
+        // fields
+        // starting with actual tableName as alias to explicit alias
+        tableNameToAlias.put(tableName, explicitAliases.iterator().next());
+      }
     }
 
-    private void visitTable(SQLQueryExpr root,
-                            Consumer<SQLExprTableSource> visit) {
-        root.accept(new MySqlASTVisitorAdapter() {
-            @Override
-            public void endVisit(SQLExprTableSource tableExpr) {
-                visit.accept(tableExpr);
-            }
+    visitColumnName(
+        root,
+        idExpr -> {
+          String columnName = idExpr.getName();
+          Collection<Table> tables = tableByFieldName.get(columnName);
+          if (tables.size() > 1) {
+            // columnName without alias present in both tables
+            throw new VerificationException(
+                StringUtils.format("Field name [%s] is ambiguous", columnName));
+          } else if (tables.isEmpty()) {
+            // size() == 0?
+            // 1. Either the columnName does not exist (handled by SemanticAnalyzer
+            // [SemanticAnalysisException])
+            // 2. Or column starts with tableName as alias or explicit alias
+            //    If starts with tableName as alias change to explicit alias
+            tableNameToAlias.keySet().stream()
+                .forEach(
+                    tableName -> {
+                      if (columnName.startsWith(tableName + DOT)) {
+                        idExpr.setName(
+                            columnName.replace(
+                                tableName + DOT, tableNameToAlias.get(tableName) + DOT));
+                      }
+                    });
+          } else {
+            // columnName with any alias and unique to one table
+            Table table = tables.iterator().next();
+            idExpr.setName(String.join(DOT, table.getAlias(), columnName));
+          }
         });
-    }
+  }
+
+  private void visitTable(SQLQueryExpr root, Consumer<SQLExprTableSource> visit) {
+    root.accept(
+        new MySqlASTVisitorAdapter() {
+          @Override
+          public void endVisit(SQLExprTableSource tableExpr) {
+            visit.accept(tableExpr);
+          }
+        });
+  }
+
+  private void visitColumnName(SQLQueryExpr expr, Consumer<SQLIdentifierExpr> visit) {
+    expr.accept(
+        new MySqlASTVisitorAdapter() {
+          @Override
+          public boolean visit(SQLExprTableSource x) {
+            // Avoid rewriting identifier in table name
+            return false;
+          }
 
-    private void visitColumnName(SQLQueryExpr expr,
-                                 Consumer<SQLIdentifierExpr> visit) {
-        expr.accept(new MySqlASTVisitorAdapter() {
-            @Override
-            public boolean visit(SQLExprTableSource x) {
-                // Avoid rewriting identifier in table name
-                return false;
-            }
-
-            @Override
-            public void endVisit(SQLIdentifierExpr idExpr) {
-                visit.accept(idExpr);
-            }
+          @Override
+          public void endVisit(SQLIdentifierExpr idExpr) {
+            visit.accept(idExpr);
+          }
         });
-    }
+  }
 
-    private String createAlias(String alias) {
-        return String.format("%s_%d", alias, next());
-    }
+  private String createAlias(String alias) {
+    return String.format("%s_%d", alias, next());
+  }
 
-    private Integer next() {
-        return aliasSuffix++;
-    }
+  private Integer next() {
+    return aliasSuffix++;
+  }
 
-    private static class Table {
+  private static class Table {
 
-        public String getName() {
-            return name;
-        }
+    public String getName() {
+      return name;
+    }
 
-        public String getAlias() {
-            return alias;
-        }
+    public String getAlias() {
+      return alias;
+    }
 
-        /**
-         * Table Name.
-         */
-        private String name;
+    /** Table Name. */
+    private String name;
 
-        /**
-         * Table Alias.
-         */
-        private String alias;
+    /** Table Alias. */
+    private String alias;
 
-        Table(String name, String alias) {
-            this.name = name;
-            this.alias = alias;
-        }
+    Table(String name, String alias) {
+      this.name = name;
+      this.alias = alias;
+    }
 
-        // Added for debugging
-        @Override
-        public String toString() {
-            return this.name + "-->" + this.alias;
-        }
+    // Added for debugging
+    @Override
+    public String toString() {
+      return this.name + "-->" + this.alias;
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/TermFieldRewriter.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/TermFieldRewriter.java
index 5890befbca..1200c8befb 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/TermFieldRewriter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/TermFieldRewriter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.matchtoterm;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -35,233 +34,236 @@
 
 /**
  * Visitor to rewrite AST (abstract syntax tree) for supporting term_query in WHERE and IN condition
- * Simple changing the matchQuery() to termQuery() will not work when mapping is both text and keyword
- * The approach is to implement SQLIdentifier.visit() based on the correct field mapping.
+ * Simple changing the matchQuery() to termQuery() will not work when mapping is both text and
+ * keyword The approach is to implement SQLIdentifier.visit() based on the correct field mapping.
  */
-
 public class TermFieldRewriter extends MySqlASTVisitorAdapter {
 
-    private Deque<TermFieldScope> environment = new ArrayDeque<>();
-    private TermRewriterFilter filterType;
+  private Deque<TermFieldScope> environment = new ArrayDeque<>();
+  private TermRewriterFilter filterType;
 
-    public TermFieldRewriter() {
-        this.filterType = TermRewriterFilter.COMMA;
-    }
-
-    public TermFieldRewriter(TermRewriterFilter filterType) {
-        this.filterType = filterType;
-    }
-
-    @Override
-    public boolean visit(MySqlSelectQueryBlock query) {
-        environment.push(new TermFieldScope());
-        if (query.getFrom() == null) {
-            return false;
-        }
-
-        Map<String, String> indexToType = new HashMap<>();
-        collect(query.getFrom(), indexToType, curScope().getAliases());
-        if (indexToType.isEmpty()) {
-            // no index found for current scope, continue.
-            return true;
-        }
-        curScope().setMapper(getMappings(indexToType));
+  public TermFieldRewriter() {
+    this.filterType = TermRewriterFilter.COMMA;
+  }
 
-        if (this.filterType == TermRewriterFilter.COMMA || this.filterType == TermRewriterFilter.MULTI_QUERY) {
-            checkMappingCompatibility(curScope(), indexToType);
-        }
+  public TermFieldRewriter(TermRewriterFilter filterType) {
+    this.filterType = filterType;
+  }
 
-        return true;
+  @Override
+  public boolean visit(MySqlSelectQueryBlock query) {
+    environment.push(new TermFieldScope());
+    if (query.getFrom() == null) {
+      return false;
     }
 
-    @Override
-    public void endVisit(MySqlSelectQueryBlock query) {
-        environment.pop();
+    Map<String, String> indexToType = new HashMap<>();
+    collect(query.getFrom(), indexToType, curScope().getAliases());
+    if (indexToType.isEmpty()) {
+      // no index found for current scope, continue.
+      return true;
     }
+    curScope().setMapper(getMappings(indexToType));
 
-    @Override
-    public boolean visit(SQLSelectItem sqlSelectItem) {
-        return false;
+    if (this.filterType == TermRewriterFilter.COMMA
+        || this.filterType == TermRewriterFilter.MULTI_QUERY) {
+      checkMappingCompatibility(curScope(), indexToType);
     }
 
-    @Override
-    public boolean visit(SQLJoinTableSource tableSource) {
-        return false;
-    }
+    return true;
+  }
+
+  @Override
+  public void endVisit(MySqlSelectQueryBlock query) {
+    environment.pop();
+  }
+
+  @Override
+  public boolean visit(SQLSelectItem sqlSelectItem) {
+    return false;
+  }
+
+  @Override
+  public boolean visit(SQLJoinTableSource tableSource) {
+    return false;
+  }
+
+  @Override
+  public boolean visit(SQLExprTableSource tableSource) {
+    return false;
+  }
+
+  /** Fix null parent problem which is required when visiting SQLIdentifier */
+  public boolean visit(SQLInListExpr inListExpr) {
+    inListExpr.getExpr().setParent(inListExpr);
+    return true;
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public boolean visit(SQLIdentifierExpr expr) {
+    if (isValidIdentifierForTerm(expr)) {
+      Map<String, Object> source = null;
+      if (this.filterType == TermRewriterFilter.COMMA
+          || this.filterType == TermRewriterFilter.MULTI_QUERY) {
+        Optional<Map<String, Object>> optionalMap = curScope().resolveFieldMapping(expr.getName());
+        if (optionalMap.isPresent()) {
+          source = optionalMap.get();
+        } else {
+          return true;
+        }
 
-    @Override
-    public boolean visit(SQLExprTableSource tableSource) {
-        return false;
-    }
+      } else if (this.filterType == TermRewriterFilter.JOIN) {
+        String[] arr = expr.getName().split("\\.", 2);
+        if (arr.length < 2) {
+          throw new VerificationException("table alias or field name missing");
+        }
+        String alias = arr[0];
+        String fullFieldName = arr[1];
+
+        String index = curScope().getAliases().get(alias);
+        FieldMappings fieldMappings = curScope().getMapper().mapping(index);
+        if (fieldMappings.has(fullFieldName)) {
+          source = fieldMappings.mapping(fullFieldName);
+        } else {
+          return true;
+        }
+      }
 
-    /**
-     * Fix null parent problem which is required when visiting SQLIdentifier
-     */
-    public boolean visit(SQLInListExpr inListExpr) {
-        inListExpr.getExpr().setParent(inListExpr);
-        return true;
+      String keywordAlias = isBothTextAndKeyword(source);
+      if (keywordAlias != null) {
+        expr.setName(expr.getName() + "." + keywordAlias);
+      }
     }
-
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public boolean visit(SQLIdentifierExpr expr) {
-        if (isValidIdentifierForTerm(expr)) {
-            Map<String, Object> source = null;
-            if (this.filterType == TermRewriterFilter.COMMA || this.filterType == TermRewriterFilter.MULTI_QUERY) {
-                Optional<Map<String, Object>> optionalMap = curScope().resolveFieldMapping(expr.getName());
-                if (optionalMap.isPresent()) {
-                    source = optionalMap.get();
-                } else {
-                    return true;
-                }
-
-            } else if (this.filterType == TermRewriterFilter.JOIN) {
-                String[] arr = expr.getName().split("\\.", 2);
-                if (arr.length < 2) {
-                    throw new VerificationException("table alias or field name missing");
-                }
-                String alias = arr[0];
-                String fullFieldName = arr[1];
-
-                String index = curScope().getAliases().get(alias);
-                FieldMappings fieldMappings = curScope().getMapper().mapping(index);
-                if (fieldMappings.has(fullFieldName)) {
-                    source = fieldMappings.mapping(fullFieldName);
-                } else {
-                    return true;
-                }
-            }
-
-            String keywordAlias = isBothTextAndKeyword(source);
-            if (keywordAlias != null) {
-                expr.setName(expr.getName() + "." + keywordAlias);
-            }
+    return true;
+  }
+
+  public void collect(
+      SQLTableSource tableSource, Map<String, String> indexToType, Map<String, String> aliases) {
+    if (tableSource instanceof SQLExprTableSource) {
+
+      String tableName = null;
+      SQLExprTableSource sqlExprTableSource = (SQLExprTableSource) tableSource;
+
+      if (sqlExprTableSource.getExpr() instanceof SQLIdentifierExpr) {
+        SQLIdentifierExpr sqlIdentifier = (SQLIdentifierExpr) sqlExprTableSource.getExpr();
+        tableName = sqlIdentifier.getName();
+        indexToType.put(tableName, null);
+      } else if (sqlExprTableSource.getExpr() instanceof SQLBinaryOpExpr) {
+        SQLBinaryOpExpr sqlBinaryOpExpr = (SQLBinaryOpExpr) sqlExprTableSource.getExpr();
+        SQLExpr leftSideOfExpression = sqlBinaryOpExpr.getLeft();
+        if (leftSideOfExpression instanceof SQLIdentifierExpr) {
+          tableName = ((SQLIdentifierExpr) sqlBinaryOpExpr.getLeft()).getName();
+        } else {
+          throw new ParserException(
+              "Left side of the expression ["
+                  + leftSideOfExpression.toString()
+                  + "] is expected to be an identifier");
+        }
+        SQLExpr rightSideOfExpression = sqlBinaryOpExpr.getRight();
+
+        // This assumes that right side of the expression is different name in query
+        if (rightSideOfExpression instanceof SQLIdentifierExpr) {
+          SQLIdentifierExpr right = (SQLIdentifierExpr) rightSideOfExpression;
+          indexToType.put(tableName, right.getName());
+        } else {
+          throw new ParserException(
+              "Right side of the expression ["
+                  + rightSideOfExpression.toString()
+                  + "] is expected to be an identifier");
         }
-        return true;
+      }
+      if (tableSource.getAlias() != null) {
+        aliases.put(tableSource.getAlias(), tableName);
+      } else {
+        aliases.put(tableName, tableName);
+      }
+
+    } else if (tableSource instanceof SQLJoinTableSource) {
+      collect(((SQLJoinTableSource) tableSource).getLeft(), indexToType, aliases);
+      collect(((SQLJoinTableSource) tableSource).getRight(), indexToType, aliases);
     }
-
-    public void collect(SQLTableSource tableSource, Map<String, String> indexToType, Map<String, String> aliases) {
-        if (tableSource instanceof SQLExprTableSource) {
-
-            String tableName = null;
-            SQLExprTableSource sqlExprTableSource = (SQLExprTableSource) tableSource;
-
-            if (sqlExprTableSource.getExpr() instanceof SQLIdentifierExpr) {
-                SQLIdentifierExpr sqlIdentifier = (SQLIdentifierExpr) sqlExprTableSource.getExpr();
-                tableName = sqlIdentifier.getName();
-                indexToType.put(tableName, null);
-            } else if (sqlExprTableSource.getExpr() instanceof SQLBinaryOpExpr) {
-                SQLBinaryOpExpr sqlBinaryOpExpr = (SQLBinaryOpExpr) sqlExprTableSource.getExpr();
-                tableName = ((SQLIdentifierExpr) sqlBinaryOpExpr.getLeft()).getName();
-                SQLExpr rightSideOfExpression = sqlBinaryOpExpr.getRight();
-
-                // This assumes that right side of the expression is different name in query
-                if (rightSideOfExpression instanceof SQLIdentifierExpr) {
-                    SQLIdentifierExpr right = (SQLIdentifierExpr) rightSideOfExpression;
-                    indexToType.put(tableName, right.getName());
-                } else {
-                    throw new ParserException("Right side of the expression [" + rightSideOfExpression.toString()
-                            + "] is expected to be an identifier");
-                }
-            }
-            if (tableSource.getAlias() != null) {
-                aliases.put(tableSource.getAlias(), tableName);
-            } else {
-                aliases.put(tableName, tableName);
-            }
-
-        } else if (tableSource instanceof SQLJoinTableSource) {
-            collect(((SQLJoinTableSource) tableSource).getLeft(), indexToType, aliases);
-            collect(((SQLJoinTableSource) tableSource).getRight(), indexToType, aliases);
+  }
+
+  /** Current scope which is top of the stack */
+  private TermFieldScope curScope() {
+    return environment.peek();
+  }
+
+  public String isBothTextAndKeyword(Map<String, Object> source) {
+    if (source.containsKey("fields")) {
+      for (Object key : ((Map) source.get("fields")).keySet()) {
+        if (key instanceof String
+            && ((Map) ((Map) source.get("fields")).get(key)).get("type").equals("keyword")) {
+          return (String) key;
         }
+      }
     }
+    return null;
+  }
 
+  public boolean isValidIdentifierForTerm(SQLIdentifierExpr expr) {
     /**
-     * Current scope which is top of the stack
+     * Only for following conditions Identifier will be modified Where: WHERE identifier =
+     * 'something' IN list: IN ('Tom', 'Dick', 'Harry') IN subquery: IN (SELECT firstname from
+     * accounts/account where firstname = 'John') Group by: GROUP BY state , employer , ... Order
+     * by: ORDER BY firstname, lastname , ...
+     *
+     * <p>NOTE: Does not impact fields on ON condition clause in JOIN as we skip visiting
+     * SQLJoinTableSource
      */
-    private TermFieldScope curScope() {
-        return environment.peek();
+    return !expr.getName().startsWith("_")
+        && (isValidIdentifier(expr) || checkIfNestedIdentifier(expr));
+  }
+
+  private boolean checkIfNestedIdentifier(SQLIdentifierExpr expr) {
+    return expr.getParent() instanceof SQLMethodInvokeExpr
+        && ((SQLMethodInvokeExpr) expr.getParent()).getMethodName().equals("nested")
+        && isValidIdentifier(expr.getParent());
+  }
+
+  private boolean isValidIdentifier(SQLObject expr) {
+    SQLObject parent = expr.getParent();
+    return isBinaryExprWithValidOperators(parent)
+        || parent instanceof SQLInListExpr
+        || parent instanceof SQLInSubQueryExpr
+        || parent instanceof SQLSelectOrderByItem
+        || parent instanceof MySqlSelectGroupByExpr;
+  }
+
+  private boolean isBinaryExprWithValidOperators(SQLObject expr) {
+    if (!(expr instanceof SQLBinaryOpExpr)) {
+      return false;
     }
+    return Stream.of(SQLBinaryOperator.Equality, SQLBinaryOperator.Is, SQLBinaryOperator.IsNot)
+        .anyMatch(operator -> operator == ((SQLBinaryOpExpr) expr).getOperator());
+  }
 
-    public String isBothTextAndKeyword(Map<String, Object> source) {
-        if (source.containsKey("fields")) {
-            for (Object key : ((Map) source.get("fields")).keySet()) {
-                if (key instanceof String
-                        && ((Map) ((Map) source.get("fields")).get(key)).get("type").equals("keyword")) {
-                    return (String) key;
-                }
-            }
-        }
-        return null;
+  private void checkMappingCompatibility(TermFieldScope scope, Map<String, String> indexToType) {
+    if (scope.getMapper().isEmpty()) {
+      throw new VerificationException("Unknown index " + indexToType.keySet());
     }
+  }
 
-    public boolean isValidIdentifierForTerm(SQLIdentifierExpr expr) {
-        /**
-         * Only for following conditions Identifier will be modified
-         *  Where:  WHERE identifier = 'something'
-         *  IN list: IN ('Tom', 'Dick', 'Harry')
-         *  IN subquery: IN (SELECT firstname from accounts/account where firstname = 'John')
-         *  Group by: GROUP BY state , employer , ...
-         *  Order by: ORDER BY firstname, lastname , ...
-         *
-         * NOTE: Does not impact fields on ON condition clause in JOIN as we skip visiting SQLJoinTableSource
-         */
-        return !expr.getName().startsWith("_") && (isValidIdentifier(expr) || checkIfNestedIdentifier(expr));
-    }
-
-    private boolean checkIfNestedIdentifier(SQLIdentifierExpr expr) {
-        return
-            expr.getParent() instanceof SQLMethodInvokeExpr
-                && ((SQLMethodInvokeExpr) expr.getParent()).getMethodName().equals("nested")
-                && isValidIdentifier(expr.getParent());
-    }
-
-    private boolean isValidIdentifier(SQLObject expr) {
-        SQLObject parent = expr.getParent();
-        return isBinaryExprWithValidOperators(parent)
-                || parent instanceof SQLInListExpr
-                || parent instanceof SQLInSubQueryExpr
-                || parent instanceof SQLSelectOrderByItem
-                || parent instanceof MySqlSelectGroupByExpr;
-    }
+  public IndexMappings getMappings(Map<String, String> indexToType) {
+    String[] allIndexes = indexToType.keySet().stream().toArray(String[]::new);
+    // GetFieldMappingsRequest takes care of wildcard index expansion
+    return LocalClusterState.state().getFieldMappings(allIndexes);
+  }
 
-    private boolean isBinaryExprWithValidOperators(SQLObject expr) {
-        if (!(expr instanceof SQLBinaryOpExpr)) {
-            return false;
-        }
-        return Stream.of(
-            SQLBinaryOperator.Equality,
-            SQLBinaryOperator.Is,
-            SQLBinaryOperator.IsNot
-        ).anyMatch(operator -> operator == ((SQLBinaryOpExpr) expr).getOperator());
-    }
+  public enum TermRewriterFilter {
+    COMMA(","), // No joins, multiple tables in SELECT
+    JOIN("JOIN"), // All JOINs
+    MULTI_QUERY("MULTI_QUERY"); // MINUS and UNION
 
-    private void checkMappingCompatibility(TermFieldScope scope, Map<String, String> indexToType) {
-        if (scope.getMapper().isEmpty()) {
-            throw new VerificationException("Unknown index " + indexToType.keySet());
-        }
-    }
+    public final String name;
 
-    public IndexMappings getMappings(Map<String, String> indexToType) {
-        String[] allIndexes = indexToType.keySet().stream().toArray(String[]::new);
-        // GetFieldMappingsRequest takes care of wildcard index expansion
-        return LocalClusterState.state().getFieldMappings(allIndexes);
+    TermRewriterFilter(String name) {
+      this.name = name;
     }
 
-    public enum TermRewriterFilter {
-        COMMA(","), // No joins, multiple tables in SELECT
-        JOIN("JOIN"), // All JOINs
-        MULTI_QUERY("MULTI_QUERY"); // MINUS and UNION
-
-        public final String name;
-
-        TermRewriterFilter(String name) {
-            this.name = name;
-        }
-
-        public static String toString(TermRewriterFilter filter) {
-            return filter.name;
-        }
+    public static String toString(TermRewriterFilter filter) {
+      return filter.name;
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/TermFieldScope.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/TermFieldScope.java
index fd6380d9d1..29f8ed82b8 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/TermFieldScope.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/TermFieldScope.java
@@ -3,66 +3,69 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.matchtoterm;
 
 import java.util.*;
-import java.util.stream.Collectors;
 import org.json.JSONObject;
 import org.opensearch.sql.legacy.esdomain.mapping.FieldMappings;
 import org.opensearch.sql.legacy.esdomain.mapping.IndexMappings;
 
-/**
- * Index Mapping information in current query being visited.
- */
+/** Index Mapping information in current query being visited. */
 public class TermFieldScope {
 
-    // mapper => index, type, field_name, FieldMappingMetaData
-    private IndexMappings mapper;
-    private FieldMappings finalMapping;
-    private Map<String, String> aliases;
+  // mapper => index, type, field_name, FieldMappingMetaData
+  private IndexMappings mapper;
+  private FieldMappings finalMapping;
+  private Map<String, String> aliases;
 
-    public TermFieldScope() {
-        this.mapper = IndexMappings.EMPTY;
-        this.aliases = new HashMap<>();
-    }
+  public TermFieldScope() {
+    this.mapper = IndexMappings.EMPTY;
+    this.aliases = new HashMap<>();
+  }
 
-    public Map<String, String> getAliases() {
-        return aliases;
-    }
+  public Map<String, String> getAliases() {
+    return aliases;
+  }
 
-    public void setAliases(Map<String, String> aliases) {
-        this.aliases = aliases;
-    }
+  public void setAliases(Map<String, String> aliases) {
+    this.aliases = aliases;
+  }
 
-    public IndexMappings getMapper() {
-        return this.mapper;
-    }
+  public IndexMappings getMapper() {
+    return this.mapper;
+  }
 
-    public void setMapper(IndexMappings mapper) {
-        this.mapper = mapper;
-    }
+  public void setMapper(IndexMappings mapper) {
+    this.mapper = mapper;
+  }
 
-    public Optional<Map<String, Object>> resolveFieldMapping(String fieldName) {
-        Set<FieldMappings> indexMappings = new HashSet<>(mapper.allMappings());
-        Optional<Map<String, Object>> resolvedMapping =
-                indexMappings.stream()
-                        .filter(mapping -> mapping.has(fieldName))
-                        .map(mapping -> mapping.mapping(fieldName)).reduce((map1, map2) -> {
-                    if (!map1.equals(map2)) {
-                        // TODO: Merge mappings if they are compatible, for text and text/keyword to text/keyword.
-                        String exceptionReason = String.format(Locale.ROOT, "Different mappings are not allowed "
-                                        + "for the same field[%s]: found [%s] and [%s] ",
-                                fieldName, pretty(map1), pretty(map2));
-                        throw new VerificationException(exceptionReason);
-                    }
-                    return map1;
+  public Optional<Map<String, Object>> resolveFieldMapping(String fieldName) {
+    Set<FieldMappings> indexMappings = new HashSet<>(mapper.allMappings());
+    Optional<Map<String, Object>> resolvedMapping =
+        indexMappings.stream()
+            .filter(mapping -> mapping.has(fieldName))
+            .map(mapping -> mapping.mapping(fieldName))
+            .reduce(
+                (map1, map2) -> {
+                  if (!map1.equals(map2)) {
+                    // TODO: Merge mappings if they are compatible, for text and text/keyword to
+                    // text/keyword.
+                    String exceptionReason =
+                        String.format(
+                            Locale.ROOT,
+                            "Different mappings are not allowed "
+                                + "for the same field[%s]: found [%s] and [%s] ",
+                            fieldName,
+                            pretty(map1),
+                            pretty(map2));
+                    throw new VerificationException(exceptionReason);
+                  }
+                  return map1;
                 });
-        return resolvedMapping;
-    }
-
-    private static String pretty(Map<String, Object> mapping) {
-        return new JSONObject(mapping).toString().replaceAll("\"", "");
-    }
+    return resolvedMapping;
+  }
 
+  private static String pretty(Map<String, Object> mapping) {
+    return new JSONObject(mapping).toString().replaceAll("\"", "");
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/VerificationException.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/VerificationException.java
index 29e2a3ff7c..f8ec8ad215 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/VerificationException.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/VerificationException.java
@@ -3,20 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.matchtoterm;
 
 import org.opensearch.OpenSearchException;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 
 public class VerificationException extends OpenSearchException {
 
-    public VerificationException(String message) {
-        super(message);
-    }
+  public VerificationException(String message) {
+    super(message);
+  }
 
-    @Override
-    public RestStatus status() {
-        return RestStatus.BAD_REQUEST;
-    }
+  @Override
+  public RestStatus status() {
+    return RestStatus.BAD_REQUEST;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/From.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/From.java
index 609d26f4a1..893a305096 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/From.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/From.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.nestedfield;
 
 import static com.alibaba.druid.sql.ast.statement.SQLJoinTableSource.JoinType.COMMA;
@@ -14,119 +13,109 @@
 import com.alibaba.druid.sql.ast.statement.SQLTableSource;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
 
-/**
- * Table (OpenSearch Index) expression in FROM statement.
- */
+/** Table (OpenSearch Index) expression in FROM statement. */
 class From extends SQLClause<SQLTableSource> {
 
-    From(SQLTableSource expr) {
-        super(expr);
-    }
-
-    /**
-     * Collect nested field(s) information and then remove them from FROM statement.
-     * Assumption: only 1 regular table in FROM (which is the first one) and nested field(s) has alias.
-     */
-    @Override
-    void rewrite(Scope scope) {
-        if (!isJoin()) {
-            return;
-        }
-
-        // At this point, FROM expr is SQLJoinTableSource.
-        if (!isCommaJoin()) {
-            scope.setActualJoinType(((SQLJoinTableSource) expr).getJoinType());
-            ((SQLJoinTableSource) expr).setJoinType(COMMA);
-        }
-
-        if (parentAlias(scope).isEmpty()) {
-            // Could also be empty now since normal JOIN tables may not have alias
-            if (scope.getActualJoinType() != null) {
-                ((SQLJoinTableSource) expr).setJoinType(scope.getActualJoinType());
-            }
-            return;
-        }
-
-        collectNestedFields(scope);
-        if (scope.isAnyNestedField()) {
-            eraseParentAlias();
-            keepParentTableOnly();
-        } else if (scope.getActualJoinType() != null){
-            // set back the JoinType to original value if non COMMA JOIN on regular tables
-            ((SQLJoinTableSource) expr).setJoinType(scope.getActualJoinType());
-        }
-    }
-
-    private String parentAlias(Scope scope) {
-        scope.setParentAlias(((SQLJoinTableSource) expr).getLeft().getAlias());
-        return emptyIfNull(scope.getParentAlias());
+  From(SQLTableSource expr) {
+    super(expr);
+  }
+
+  /**
+   * Collect nested field(s) information and then remove them from FROM statement. Assumption: only
+   * 1 regular table in FROM (which is the first one) and nested field(s) has alias.
+   */
+  @Override
+  void rewrite(Scope scope) {
+    if (!isJoin()) {
+      return;
     }
 
-    /**
-     * Erase alias otherwise NLPchina has problem parsing nested field like 't.employees.name'
-     */
-    private void eraseParentAlias() {
-        left().expr.setAlias(null);
+    // At this point, FROM expr is SQLJoinTableSource.
+    if (!isCommaJoin()) {
+      scope.setActualJoinType(((SQLJoinTableSource) expr).getJoinType());
+      ((SQLJoinTableSource) expr).setJoinType(COMMA);
     }
 
-    private void keepParentTableOnly() {
-        MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) expr.getParent();
-        query.setFrom(left().expr);
-        left().expr.setParent(query);
+    if (parentAlias(scope).isEmpty()) {
+      // Could also be empty now since normal JOIN tables may not have alias
+      if (scope.getActualJoinType() != null) {
+        ((SQLJoinTableSource) expr).setJoinType(scope.getActualJoinType());
+      }
+      return;
     }
 
-    /**
-     * Collect path alias and full path mapping of nested field in FROM clause.
-     * Sample:
-     * FROM team t, t.employees e ...
-     * <p>
-     * Join
-     * /    \
-     * team t    Join
-     * /    \
-     * t.employees e  ...
-     * <p>
-     * t.employees is nested because path "t" == parentAlias "t"
-     * Save path alias to full path name mapping {"e": "employees"} to Scope
-     */
-    private void collectNestedFields(Scope scope) {
-        From clause = this;
-        for (; clause.isCommaJoin(); clause = clause.right()) {
-            clause.left().addIfNestedField(scope);
-        }
-        clause.addIfNestedField(scope);
+    collectNestedFields(scope);
+    if (scope.isAnyNestedField()) {
+      eraseParentAlias();
+      keepParentTableOnly();
+    } else if (scope.getActualJoinType() != null) {
+      // set back the JoinType to original value if non COMMA JOIN on regular tables
+      ((SQLJoinTableSource) expr).setJoinType(scope.getActualJoinType());
     }
-
-    private boolean isCommaJoin() {
-        return expr instanceof SQLJoinTableSource && ((SQLJoinTableSource) expr).getJoinType() == COMMA;
+  }
+
+  private String parentAlias(Scope scope) {
+    scope.setParentAlias(((SQLJoinTableSource) expr).getLeft().getAlias());
+    return emptyIfNull(scope.getParentAlias());
+  }
+
+  /** Erase alias otherwise NLPchina has problem parsing nested field like 't.employees.name' */
+  private void eraseParentAlias() {
+    left().expr.setAlias(null);
+  }
+
+  private void keepParentTableOnly() {
+    MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) expr.getParent();
+    query.setFrom(left().expr);
+    left().expr.setParent(query);
+  }
+
+  /**
+   * Collect path alias and full path mapping of nested field in FROM clause. Sample: FROM team t,
+   * t.employees e ...
+   *
+   * <p>Join / \ team t Join / \ t.employees e ...
+   *
+   * <p>t.employees is nested because path "t" == parentAlias "t" Save path alias to full path name
+   * mapping {"e": "employees"} to Scope
+   */
+  private void collectNestedFields(Scope scope) {
+    From clause = this;
+    for (; clause.isCommaJoin(); clause = clause.right()) {
+      clause.left().addIfNestedField(scope);
     }
+    clause.addIfNestedField(scope);
+  }
 
-    private boolean isJoin() {
-        return expr instanceof SQLJoinTableSource;
-    }
+  private boolean isCommaJoin() {
+    return expr instanceof SQLJoinTableSource && ((SQLJoinTableSource) expr).getJoinType() == COMMA;
+  }
 
-    private From left() {
-        return new From(((SQLJoinTableSource) expr).getLeft());
-    }
+  private boolean isJoin() {
+    return expr instanceof SQLJoinTableSource;
+  }
 
-    private From right() {
-        return new From(((SQLJoinTableSource) expr).getRight());
-    }
+  private From left() {
+    return new From(((SQLJoinTableSource) expr).getLeft());
+  }
 
-    private void addIfNestedField(Scope scope) {
-        if (!(expr instanceof SQLExprTableSource
-                && ((SQLExprTableSource) expr).getExpr() instanceof SQLIdentifierExpr)) {
-            return;
-        }
+  private From right() {
+    return new From(((SQLJoinTableSource) expr).getRight());
+  }
 
-        Identifier table = new Identifier((SQLIdentifierExpr) ((SQLExprTableSource) expr).getExpr());
-        if (table.path().equals(scope.getParentAlias())) {
-            scope.addAliasFullPath(emptyIfNull(expr.getAlias()), table.name());
-        }
+  private void addIfNestedField(Scope scope) {
+    if (!(expr instanceof SQLExprTableSource
+        && ((SQLExprTableSource) expr).getExpr() instanceof SQLIdentifierExpr)) {
+      return;
     }
 
-    private String emptyIfNull(String str) {
-        return str == null ? "" : str;
+    Identifier table = new Identifier((SQLIdentifierExpr) ((SQLExprTableSource) expr).getExpr());
+    if (table.path().equals(scope.getParentAlias())) {
+      scope.addAliasFullPath(emptyIfNull(expr.getAlias()), table.name());
     }
+  }
 
+  private String emptyIfNull(String str) {
+    return str == null ? "" : str;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Identifier.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Identifier.java
index 635cc63671..64938c71b1 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Identifier.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Identifier.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.nestedfield;
 
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
@@ -11,87 +10,85 @@
 
 /**
  * Identifier expression in SELECT, FROM, WHERE, GROUP BY, ORDER BY etc.
- * <p>
- * Ex. To make concepts clear, for "e.firstname AND t.region" in "FROM team t, t.employees e":
- * parent alias (to erase): 't'
- * path:                    'e' (full path saved in Scope is 'employees')
- * name:                    'firstname'
+ *
+ * <p>Ex. To make concepts clear, for "e.firstname AND t.region" in "FROM team t, t.employees e":
+ * parent alias (to erase): 't' path: 'e' (full path saved in Scope is 'employees') name:
+ * 'firstname'
  */
 class Identifier extends SQLClause<SQLIdentifierExpr> {
 
-    private static final String SEPARATOR = ".";
-
-    Identifier(SQLIdentifierExpr expr) {
-        super(expr);
-    }
-
-    /**
-     * Erase parent alias for all identifiers but only rewrite those (nested field identifier) NOT in WHERE.
-     * For identifier in conditions in WHERE, use full path as tag and delay the rewrite in Where.rewrite().
-     */
-    @Override
-    void rewrite(Scope scope) {
-        eraseParentAlias(scope);
-        if (isNestedField(scope)) {
-            renameByFullPath(scope);
-            if (isInCondition()) {
-                useFullPathAsTag(scope);
-            } else {
-                replaceByNestedFunction(expr, pathFromIdentifier(expr));
-            }
-        }
-    }
-
-    /**
-     * return the path of the expr name. e.g.
-     * expecting p returned as path in both WHERE p.name = 'A' and WHERE p IS NULL cases,
-     * in which expr.name = p.name and p separately
-     */
-    String path() {
-        return separatorIndex() == -1 ? expr.getName() : expr.getName().substring(0, separatorIndex());
-    }
-
-    String name() {
-        return expr.getName().substring(separatorIndex() + 1);
+  private static final String SEPARATOR = ".";
+
+  Identifier(SQLIdentifierExpr expr) {
+    super(expr);
+  }
+
+  /**
+   * Erase parent alias for all identifiers but only rewrite those (nested field identifier) NOT in
+   * WHERE. For identifier in conditions in WHERE, use full path as tag and delay the rewrite in
+   * Where.rewrite().
+   */
+  @Override
+  void rewrite(Scope scope) {
+    eraseParentAlias(scope);
+    if (isNestedField(scope)) {
+      renameByFullPath(scope);
+      if (isInCondition()) {
+        useFullPathAsTag(scope);
+      } else {
+        replaceByNestedFunction(expr, pathFromIdentifier(expr));
+      }
     }
-
-    private int separatorIndex() {
-        return expr.getName().indexOf(SEPARATOR);
-    }
-
-    /**
-     * Erase parent alias otherwise it's required to specify it everywhere even on nested
-     * field (which NLPchina has problem with).
-     * Sample: "FROM team t, t.employees e WHERE t.region = 'US'" => "WHERE region = 'US'"
-     */
-    private void eraseParentAlias(Scope scope) {
-        if (isStartWithParentAlias(scope)) {
-            expr.setName(name());
-        }
-    }
-
-    private boolean isStartWithParentAlias(Scope scope) {
-        return path().equals(scope.getParentAlias());
+  }
+
+  /**
+   * return the path of the expr name. e.g. expecting p returned as path in both WHERE p.name = 'A'
+   * and WHERE p IS NULL cases, in which expr.name = p.name and p separately
+   */
+  String path() {
+    return separatorIndex() == -1 ? expr.getName() : expr.getName().substring(0, separatorIndex());
+  }
+
+  String name() {
+    return expr.getName().substring(separatorIndex() + 1);
+  }
+
+  private int separatorIndex() {
+    return expr.getName().indexOf(SEPARATOR);
+  }
+
+  /**
+   * Erase parent alias otherwise it's required to specify it everywhere even on nested field (which
+   * NLPchina has problem with). Sample: "FROM team t, t.employees e WHERE t.region = 'US'" =>
+   * "WHERE region = 'US'"
+   */
+  private void eraseParentAlias(Scope scope) {
+    if (isStartWithParentAlias(scope)) {
+      expr.setName(name());
     }
+  }
 
-    private boolean isNestedField(Scope scope) {
-        return !scope.getFullPath(path()).isEmpty();
-    }
+  private boolean isStartWithParentAlias(Scope scope) {
+    return path().equals(scope.getParentAlias());
+  }
 
-    private void renameByFullPath(Scope scope) {
-        String fullPath = scope.getFullPath(path());
-        if (fullPath.isEmpty()) {
-            throw new IllegalStateException("Full path not found for identifier:" + expr.getName());
-        }
-        expr.setName(expr.getName().replaceFirst(path(), fullPath));
-    }
+  private boolean isNestedField(Scope scope) {
+    return !scope.getFullPath(path()).isEmpty();
+  }
 
-    private void useFullPathAsTag(Scope scope) {
-        scope.addConditionTag((SQLBinaryOpExpr) expr.getParent(), path());
+  private void renameByFullPath(Scope scope) {
+    String fullPath = scope.getFullPath(path());
+    if (fullPath.isEmpty()) {
+      throw new IllegalStateException("Full path not found for identifier:" + expr.getName());
     }
+    expr.setName(expr.getName().replaceFirst(path(), fullPath));
+  }
 
-    private boolean isInCondition() {
-        return expr.getParent() instanceof SQLBinaryOpExpr;
-    }
+  private void useFullPathAsTag(Scope scope) {
+    scope.addConditionTag((SQLBinaryOpExpr) expr.getParent(), path());
+  }
 
+  private boolean isInCondition() {
+    return expr.getParent() instanceof SQLBinaryOpExpr;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/NestedFieldProjection.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/NestedFieldProjection.java
index 4fa4611f9a..11e5007122 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/NestedFieldProjection.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/NestedFieldProjection.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.nestedfield;
 
 import static com.alibaba.druid.sql.ast.statement.SQLJoinTableSource.JoinType;
@@ -33,152 +32,153 @@
 import org.opensearch.sql.legacy.rewriter.matchtoterm.VerificationException;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-/**
- * Nested field projection class to make OpenSearch return matched rows in nested field.
- */
+/** Nested field projection class to make OpenSearch return matched rows in nested field. */
 public class NestedFieldProjection {
 
-    private final SearchRequestBuilder request;
-
-    public NestedFieldProjection(SearchRequestBuilder request) {
-        this.request = request;
-    }
-
-    /**
-     * Project nested field in SELECT clause to InnerHit in NestedQueryBuilder
-     *
-     * @param fields list of field domain object
-     */
-    public void project(List<Field> fields, JoinType nestedJoinType) {
-        if (isAnyNestedField(fields)) {
-            initBoolQueryFilterIfNull();
-            List<NestedQueryBuilder> nestedQueries = extractNestedQueries(query());
-
-            if (nestedJoinType == JoinType.LEFT_OUTER_JOIN) {
-                // for LEFT JOIN on nested field as right table, the query will have only one nested field, so one path
-                Map<String, List<String>> fieldNamesByPath = groupFieldNamesByPath(fields);
-
-                if (fieldNamesByPath.size() > 1) {
-                    String message = StringUtils.format(
-                        "only single nested field is allowed as right table for LEFT JOIN, found %s ",
-                        fieldNamesByPath.keySet()
-                    );
-
-                    throw new VerificationException(message);
-                }
-
-                Map.Entry<String, List<String>> pathToFields = fieldNamesByPath.entrySet().iterator().next();
-                String path = pathToFields.getKey();
-                List<String> fieldNames = pathToFields.getValue();
-                buildNestedLeftJoinQuery(path, fieldNames);
-            } else {
-
-                groupFieldNamesByPath(fields).forEach(
-                    (path, fieldNames) -> buildInnerHit(fieldNames, findNestedQueryWithSamePath(nestedQueries, path))
-                );
-            }
-        }
-    }
-
-    /**
-     * Check via traditional for loop first to avoid lambda performance impact on all queries
-     * even though those without nested field
-     */
-    private boolean isAnyNestedField(List<Field> fields) {
-        for (Field field : fields) {
-            if (field.isNested() && !field.isReverseNested()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void initBoolQueryFilterIfNull() {
-        if (request.request().source() == null || query() == null) {
-            request.setQuery(boolQuery());
-        }
-        if (query().filter().isEmpty()) {
-            query().filter(boolQuery());
-        }
-    }
-
-    private Map<String, List<String>> groupFieldNamesByPath(List<Field> fields) {
-        return fields.stream().
-                filter(Field::isNested).
-                filter(not(Field::isReverseNested)).
-                collect(groupingBy(Field::getNestedPath, mapping(Field::getName, toList())));
-    }
-
-    /**
-     * Why search for NestedQueryBuilder recursively?
-     * Because 1) it was added and wrapped by BoolQuery when WHERE explained (far from here)
-     * 2) InnerHit must be added to the NestedQueryBuilder related
-     * <p>
-     * Either we store it to global data structure (which requires to be thread-safe or ThreadLocal)
-     * or we peel off BoolQuery to find it (the way we followed here because recursion tree should be very thin).
-     */
-    private List<NestedQueryBuilder> extractNestedQueries(QueryBuilder query) {
-        List<NestedQueryBuilder> result = new ArrayList<>();
-        if (query instanceof NestedQueryBuilder) {
-            result.add((NestedQueryBuilder) query);
-        } else if (query instanceof BoolQueryBuilder) {
-            BoolQueryBuilder boolQ = (BoolQueryBuilder) query;
-            Stream.of(boolQ.filter(), boolQ.must(), boolQ.should()).
-                    flatMap(Collection::stream).
-                    forEach(q -> result.addAll(extractNestedQueries(q)));
+  private final SearchRequestBuilder request;
+
+  public NestedFieldProjection(SearchRequestBuilder request) {
+    this.request = request;
+  }
+
+  /**
+   * Project nested field in SELECT clause to InnerHit in NestedQueryBuilder
+   *
+   * @param fields list of field domain object
+   */
+  public void project(List<Field> fields, JoinType nestedJoinType) {
+    if (isAnyNestedField(fields)) {
+      initBoolQueryFilterIfNull();
+      List<NestedQueryBuilder> nestedQueries = extractNestedQueries(query());
+
+      if (nestedJoinType == JoinType.LEFT_OUTER_JOIN) {
+        // for LEFT JOIN on nested field as right table, the query will have only one nested field,
+        // so one path
+        Map<String, List<String>> fieldNamesByPath = groupFieldNamesByPath(fields);
+
+        if (fieldNamesByPath.size() > 1) {
+          String message =
+              StringUtils.format(
+                  "only single nested field is allowed as right table for LEFT JOIN, found %s ",
+                  fieldNamesByPath.keySet());
+
+          throw new VerificationException(message);
         }
-        return result;
-    }
-
-    private void buildInnerHit(List<String> fieldNames, NestedQueryBuilder query) {
-        query.innerHit(new InnerHitBuilder().setFetchSourceContext(
-                new FetchSourceContext(true, fieldNames.toArray(new String[0]), null)
-        ));
-    }
-
-    /**
-     * Why linear search? Because NestedQueryBuilder hides "path" field from any access.
-     * Assumption: collected NestedQueryBuilder list should be very small or mostly only one.
-     */
-    private NestedQueryBuilder findNestedQueryWithSamePath(List<NestedQueryBuilder> nestedQueries, String path) {
-        return nestedQueries.stream().
-                filter(query -> isSamePath(path, query)).
-                findAny().
-                orElseGet(createEmptyNestedQuery(path));
-    }
 
-    private boolean isSamePath(String path, NestedQueryBuilder query) {
-        return nestedQuery(path, query.query(), query.scoreMode()).equals(query);
+        Map.Entry<String, List<String>> pathToFields =
+            fieldNamesByPath.entrySet().iterator().next();
+        String path = pathToFields.getKey();
+        List<String> fieldNames = pathToFields.getValue();
+        buildNestedLeftJoinQuery(path, fieldNames);
+      } else {
+
+        groupFieldNamesByPath(fields)
+            .forEach(
+                (path, fieldNames) ->
+                    buildInnerHit(fieldNames, findNestedQueryWithSamePath(nestedQueries, path)));
+      }
     }
-
-    /**
-     * Create a nested query with match all filter to place inner hits
-     */
-    private Supplier<NestedQueryBuilder> createEmptyNestedQuery(String path) {
-        return () -> {
-            NestedQueryBuilder nestedQuery = nestedQuery(path, matchAllQuery(), ScoreMode.None);
-            ((BoolQueryBuilder) query().filter().get(0)).must(nestedQuery);
-            return nestedQuery;
-        };
+  }
+
+  /**
+   * Check via traditional for loop first to avoid lambda performance impact on all queries even
+   * though those without nested field
+   */
+  private boolean isAnyNestedField(List<Field> fields) {
+    for (Field field : fields) {
+      if (field.isNested() && !field.isReverseNested()) {
+        return true;
+      }
     }
+    return false;
+  }
 
-    private BoolQueryBuilder query() {
-        return (BoolQueryBuilder) request.request().source().query();
+  private void initBoolQueryFilterIfNull() {
+    if (request.request().source() == null || query() == null) {
+      request.setQuery(boolQuery());
     }
-
-    private <T> Predicate<T> not(Predicate<T> predicate) {
-        return predicate.negate();
+    if (query().filter().isEmpty()) {
+      query().filter(boolQuery());
     }
-
-
-    private void buildNestedLeftJoinQuery(String path, List<String> fieldNames) {
-        BoolQueryBuilder existsNestedQuery = boolQuery();
-        existsNestedQuery.mustNot().add(nestedQuery(path, existsQuery(path), ScoreMode.None));
-
-        NestedQueryBuilder matchAllNestedQuery = nestedQuery(path, matchAllQuery(), ScoreMode.None);
-        buildInnerHit(fieldNames, matchAllNestedQuery);
-
-        ((BoolQueryBuilder) query().filter().get(0)).should().add(existsNestedQuery);
-        ((BoolQueryBuilder) query().filter().get(0)).should().add(matchAllNestedQuery);
+  }
+
+  private Map<String, List<String>> groupFieldNamesByPath(List<Field> fields) {
+    return fields.stream()
+        .filter(Field::isNested)
+        .filter(not(Field::isReverseNested))
+        .collect(groupingBy(Field::getNestedPath, mapping(Field::getName, toList())));
+  }
+
+  /**
+   * Why search for NestedQueryBuilder recursively? Because 1) it was added and wrapped by BoolQuery
+   * when WHERE explained (far from here) 2) InnerHit must be added to the NestedQueryBuilder
+   * related
+   *
+   * <p>Either we store it to global data structure (which requires to be thread-safe or
+   * ThreadLocal) or we peel off BoolQuery to find it (the way we followed here because recursion
+   * tree should be very thin).
+   */
+  private List<NestedQueryBuilder> extractNestedQueries(QueryBuilder query) {
+    List<NestedQueryBuilder> result = new ArrayList<>();
+    if (query instanceof NestedQueryBuilder) {
+      result.add((NestedQueryBuilder) query);
+    } else if (query instanceof BoolQueryBuilder) {
+      BoolQueryBuilder boolQ = (BoolQueryBuilder) query;
+      Stream.of(boolQ.filter(), boolQ.must(), boolQ.should())
+          .flatMap(Collection::stream)
+          .forEach(q -> result.addAll(extractNestedQueries(q)));
     }
+    return result;
+  }
+
+  private void buildInnerHit(List<String> fieldNames, NestedQueryBuilder query) {
+    query.innerHit(
+        new InnerHitBuilder()
+            .setFetchSourceContext(
+                new FetchSourceContext(true, fieldNames.toArray(new String[0]), null)));
+  }
+
+  /**
+   * Why linear search? Because NestedQueryBuilder hides "path" field from any access. Assumption:
+   * collected NestedQueryBuilder list should be very small or mostly only one.
+   */
+  private NestedQueryBuilder findNestedQueryWithSamePath(
+      List<NestedQueryBuilder> nestedQueries, String path) {
+    return nestedQueries.stream()
+        .filter(query -> isSamePath(path, query))
+        .findAny()
+        .orElseGet(createEmptyNestedQuery(path));
+  }
+
+  private boolean isSamePath(String path, NestedQueryBuilder query) {
+    return nestedQuery(path, query.query(), query.scoreMode()).equals(query);
+  }
+
+  /** Create a nested query with match all filter to place inner hits */
+  private Supplier<NestedQueryBuilder> createEmptyNestedQuery(String path) {
+    return () -> {
+      NestedQueryBuilder nestedQuery = nestedQuery(path, matchAllQuery(), ScoreMode.None);
+      ((BoolQueryBuilder) query().filter().get(0)).must(nestedQuery);
+      return nestedQuery;
+    };
+  }
+
+  private BoolQueryBuilder query() {
+    return (BoolQueryBuilder) request.request().source().query();
+  }
+
+  private <T> Predicate<T> not(Predicate<T> predicate) {
+    return predicate.negate();
+  }
+
+  private void buildNestedLeftJoinQuery(String path, List<String> fieldNames) {
+    BoolQueryBuilder existsNestedQuery = boolQuery();
+    existsNestedQuery.mustNot().add(nestedQuery(path, existsQuery(path), ScoreMode.None));
+
+    NestedQueryBuilder matchAllNestedQuery = nestedQuery(path, matchAllQuery(), ScoreMode.None);
+    buildInnerHit(fieldNames, matchAllNestedQuery);
+
+    ((BoolQueryBuilder) query().filter().get(0)).should().add(existsNestedQuery);
+    ((BoolQueryBuilder) query().filter().get(0)).should().add(matchAllNestedQuery);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/NestedFieldRewriter.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/NestedFieldRewriter.java
index 47beab5485..c128b1f6f0 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/NestedFieldRewriter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/NestedFieldRewriter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.nestedfield;
 
 import static org.opensearch.sql.legacy.utils.Util.NESTED_JOIN_TYPE;
@@ -16,98 +15,93 @@
 import java.util.Deque;
 
 /**
- * Visitor to rewrite AST (abstract syntax tree) for nested type fields to support implicit nested() function call.
- * Intuitively, the approach is to implement SQLIdentifier.visit() and wrap nested() function for nested field.
- * The parsing result of FROM clause will be used to determine if an identifier is nested field.
- * <p>
- * State transition table (state here means Scope + Query AST):
+ * Visitor to rewrite AST (abstract syntax tree) for nested type fields to support implicit nested()
+ * function call. Intuitively, the approach is to implement SQLIdentifier.visit() and wrap nested()
+ * function for nested field. The parsing result of FROM clause will be used to determine if an
+ * identifier is nested field.
+ *
+ * <p>State transition table (state here means Scope + Query AST):
  * _________________________________________________________________________________________________________________
- * |    Rewrite   |            Scope              |                        Sample Query                            |
+ * | Rewrite | Scope | Sample Query |
  * |---------------------------------------------------------------------------------------------------------------|
- * |   (Start)    |             ()                | SELECT e.lastname, COUNT(*) FROM team t, employees e           |
- * |              |                               |   WHERE region = 'US' and e.firstname = 'John'                 |
- * |              |                               |     GROUP BY e.lastname                                        |
+ * | (Start) | () | SELECT e.lastname, COUNT(*) FROM team t, employees e | | | | WHERE region = 'US'
+ * and e.firstname = 'John' | | | | GROUP BY e.lastname |
  * |---------------------------------------------------------------------------------------------------------------|
- * |     FROM     | (parentAlias='t'              | SELECT e.lastname, COUNT(*) FROM team                          |
- * |              |  aliasFullPaths={e: employees}|   WHERE region = 'US' and e.firstname = 'John'                 |
- * |              |  conditionTags={})            |     GROUP BY e.lastname                                        |
+ * | FROM | (parentAlias='t' | SELECT e.lastname, COUNT(*) FROM team | | | aliasFullPaths={e:
+ * employees}| WHERE region = 'US' and e.firstname = 'John' | | | conditionTags={}) | GROUP BY
+ * e.lastname |
  * |---------------------------------------------------------------------------------------------------------------|
- * |   Identifier | (parentAlias='t'              | SELECT nested(employees.lastname), COUNT(*) FROM team          |
- * |              |  aliasFullPaths={e: employees}|   WHERE region = 'US' and employees.firstname = 'John'         |
- * |              |  conditionTags={c: employees})|     GROUP BY nested(employees.lastname)                        |
+ * | Identifier | (parentAlias='t' | SELECT nested(employees.lastname), COUNT(*) FROM team | | |
+ * aliasFullPaths={e: employees}| WHERE region = 'US' and employees.firstname = 'John' | | |
+ * conditionTags={c: employees})| GROUP BY nested(employees.lastname) |
  * |---------------------------------------------------------------------------------------------------------------|
- * |    WHERE     | (parentAlias='t'              | SELECT nested(employees.lastname), COUNT(*) FROM team          |
- * |              |  aliasFullPaths={e: employees}|   WHERE region = 'US' and nested(employees.firstname) = 'John' |
- * |              |  conditionTags={c: employees})|     GROUP BY nested(employees.lastname)                        |
+ * | WHERE | (parentAlias='t' | SELECT nested(employees.lastname), COUNT(*) FROM team | | |
+ * aliasFullPaths={e: employees}| WHERE region = 'US' and nested(employees.firstname) = 'John' | | |
+ * conditionTags={c: employees})| GROUP BY nested(employees.lastname) |
  * |---------------------------------------------------------------------------------------------------------------|
- * <p>
- * Note 'c' in conditionTag refer to the reference to SQLBinaryOpExpr object of condition 'employees.firstname = 'John'
- * <p>
- * More details:
- * 1) Manage environment in the case of subquery
- * 2) Add nested field to select for SELECT *
- * 3) Merge conditions of same nested field to single nested() call
+ *
+ * <p>Note 'c' in conditionTag refer to the reference to SQLBinaryOpExpr object of condition
+ * 'employees.firstname = 'John'
+ *
+ * <p>More details: 1) Manage environment in the case of subquery 2) Add nested field to select for
+ * SELECT * 3) Merge conditions of same nested field to single nested() call
  */
 public class NestedFieldRewriter extends MySqlASTVisitorAdapter {
 
-    /**
-     * Scope stack to record the state (nested field names etc) for current query.
-     * In the case of subquery, the active scope of current query is the top element of the stack.
-     */
-    private Deque<Scope> environment = new ArrayDeque<>();
-
-    /**
-     * Rewrite FROM here to make sure FROM statement always be visited before other statement in query.
-     * Note that return true anyway to continue visiting FROM in subquery if any.
-     */
-    @Override
-    public boolean visit(MySqlSelectQueryBlock query) {
-        environment.push(new Scope());
-        if (query.getFrom() == null) {
-            return false;
-        }
-
-        query.getFrom().setParent(query);
-        new From(query.getFrom()).rewrite(curScope());
+  /**
+   * Scope stack to record the state (nested field names etc) for current query. In the case of
+   * subquery, the active scope of current query is the top element of the stack.
+   */
+  private Deque<Scope> environment = new ArrayDeque<>();
+
+  /**
+   * Rewrite FROM here to make sure FROM statement always be visited before other statement in
+   * query. Note that return true anyway to continue visiting FROM in subquery if any.
+   */
+  @Override
+  public boolean visit(MySqlSelectQueryBlock query) {
+    environment.push(new Scope());
+    if (query.getFrom() == null) {
+      return false;
+    }
 
-        if (curScope().isAnyNestedField() && isNotGroupBy(query)) {
-            new Select(query.getSelectList()).rewrite(curScope());
-        }
+    query.getFrom().setParent(query);
+    new From(query.getFrom()).rewrite(curScope());
 
-        query.putAttribute(NESTED_JOIN_TYPE, curScope().getActualJoinType());
-        return true;
+    if (curScope().isAnyNestedField() && isNotGroupBy(query)) {
+      new Select(query.getSelectList()).rewrite(curScope());
     }
 
-    @Override
-    public boolean visit(SQLIdentifierExpr expr) {
-        if (curScope().isAnyNestedField()) {
-            new Identifier(expr).rewrite(curScope());
-        }
-        return true;
-    }
+    query.putAttribute(NESTED_JOIN_TYPE, curScope().getActualJoinType());
+    return true;
+  }
 
-    @Override
-    public void endVisit(SQLBinaryOpExpr expr) {
-        if (curScope().isAnyNestedField()) {
-            new Where(expr).rewrite(curScope());
-        }
+  @Override
+  public boolean visit(SQLIdentifierExpr expr) {
+    if (curScope().isAnyNestedField()) {
+      new Identifier(expr).rewrite(curScope());
     }
+    return true;
+  }
 
-    @Override
-    public void endVisit(MySqlSelectQueryBlock query) {
-        environment.pop();
+  @Override
+  public void endVisit(SQLBinaryOpExpr expr) {
+    if (curScope().isAnyNestedField()) {
+      new Where(expr).rewrite(curScope());
     }
+  }
 
-    /**
-     * Current scope which is top of the stack
-     */
-    private Scope curScope() {
-        return environment.peek();
-    }
+  @Override
+  public void endVisit(MySqlSelectQueryBlock query) {
+    environment.pop();
+  }
 
-    private boolean isNotGroupBy(MySqlSelectQueryBlock query) {
-        return query.getGroupBy() == null;
-    }
+  /** Current scope which is top of the stack */
+  private Scope curScope() {
+    return environment.peek();
+  }
 
+  private boolean isNotGroupBy(MySqlSelectQueryBlock query) {
+    return query.getGroupBy() == null;
+  }
 }
-
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/SQLClause.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/SQLClause.java
index 160403ab11..fb4c1b9fe9 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/SQLClause.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/SQLClause.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.nestedfield;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -28,71 +27,69 @@
  */
 abstract class SQLClause<T> {
 
-    protected final T expr;
-
-    SQLClause(T expr) {
-        this.expr = expr;
-    }
+  protected final T expr;
 
-    /**
-     * Rewrite nested fields in query according to/fill into information in scope.
-     *
-     * @param scope Scope of current query
-     */
-    abstract void rewrite(Scope scope);
+  SQLClause(T expr) {
+    this.expr = expr;
+  }
 
-    SQLMethodInvokeExpr replaceByNestedFunction(SQLExpr expr, String nestedPath) {
-        final int nestedPathIndex = 1;
-        SQLMethodInvokeExpr nestedFunc = replaceByNestedFunction(expr);
-        nestedFunc.getParameters().add(nestedPathIndex, new SQLCharExpr(nestedPath));
-        return nestedFunc;
-    }
+  /**
+   * Rewrite nested fields in query according to/fill into information in scope.
+   *
+   * @param scope Scope of current query
+   */
+  abstract void rewrite(Scope scope);
 
-    /**
-     * Replace expr by nested(expr) and set pointer in parent properly
-     */
-    SQLMethodInvokeExpr replaceByNestedFunction(SQLExpr expr) {
-        SQLObject parent = expr.getParent();
-        SQLMethodInvokeExpr nestedFunc = wrapNestedFunction(expr);
-        if (parent instanceof SQLAggregateExpr) {
-            List<SQLExpr> args = ((SQLAggregateExpr) parent).getArguments();
-            args.set(args.indexOf(expr), nestedFunc);
-        } else if (parent instanceof SQLSelectItem) {
-            ((SQLSelectItem) parent).setExpr(nestedFunc);
-        } else if (parent instanceof MySqlSelectGroupByExpr) {
-            ((MySqlSelectGroupByExpr) parent).setExpr(nestedFunc);
-        } else if (parent instanceof SQLSelectOrderByItem) {
-            ((SQLSelectOrderByItem) parent).setExpr(nestedFunc);
-        } else if (parent instanceof SQLInSubQueryExpr) {
-            ((SQLInSubQueryExpr) parent).setExpr(nestedFunc);
-        } else if (parent instanceof SQLBinaryOpExpr) {
-            SQLBinaryOpExpr parentOp = (SQLBinaryOpExpr) parent;
-            if (parentOp.getLeft() == expr) {
-                parentOp.setLeft(nestedFunc);
-            } else {
-                parentOp.setRight(nestedFunc);
-            }
-        } else if (parent instanceof MySqlSelectQueryBlock) {
-            ((MySqlSelectQueryBlock) parent).setWhere(nestedFunc);
-        } else if (parent instanceof SQLNotExpr) {
-              ((SQLNotExpr) parent).setExpr(nestedFunc);
-        } else {
-            throw new IllegalStateException("Unsupported place to use nested field under parent: " + parent);
-        }
-        return nestedFunc;
-    }
+  SQLMethodInvokeExpr replaceByNestedFunction(SQLExpr expr, String nestedPath) {
+    final int nestedPathIndex = 1;
+    SQLMethodInvokeExpr nestedFunc = replaceByNestedFunction(expr);
+    nestedFunc.getParameters().add(nestedPathIndex, new SQLCharExpr(nestedPath));
+    return nestedFunc;
+  }
 
-    private SQLMethodInvokeExpr wrapNestedFunction(SQLExpr expr) {
-        SQLMethodInvokeExpr nestedFunc = new SQLMethodInvokeExpr("nested");
-        nestedFunc.setParent(expr.getParent());
-        nestedFunc.addParameter(expr);  // this will auto set parent of expr
-        return nestedFunc;
+  /** Replace expr by nested(expr) and set pointer in parent properly */
+  SQLMethodInvokeExpr replaceByNestedFunction(SQLExpr expr) {
+    SQLObject parent = expr.getParent();
+    SQLMethodInvokeExpr nestedFunc = wrapNestedFunction(expr);
+    if (parent instanceof SQLAggregateExpr) {
+      List<SQLExpr> args = ((SQLAggregateExpr) parent).getArguments();
+      args.set(args.indexOf(expr), nestedFunc);
+    } else if (parent instanceof SQLSelectItem) {
+      ((SQLSelectItem) parent).setExpr(nestedFunc);
+    } else if (parent instanceof MySqlSelectGroupByExpr) {
+      ((MySqlSelectGroupByExpr) parent).setExpr(nestedFunc);
+    } else if (parent instanceof SQLSelectOrderByItem) {
+      ((SQLSelectOrderByItem) parent).setExpr(nestedFunc);
+    } else if (parent instanceof SQLInSubQueryExpr) {
+      ((SQLInSubQueryExpr) parent).setExpr(nestedFunc);
+    } else if (parent instanceof SQLBinaryOpExpr) {
+      SQLBinaryOpExpr parentOp = (SQLBinaryOpExpr) parent;
+      if (parentOp.getLeft() == expr) {
+        parentOp.setLeft(nestedFunc);
+      } else {
+        parentOp.setRight(nestedFunc);
+      }
+    } else if (parent instanceof MySqlSelectQueryBlock) {
+      ((MySqlSelectQueryBlock) parent).setWhere(nestedFunc);
+    } else if (parent instanceof SQLNotExpr) {
+      ((SQLNotExpr) parent).setExpr(nestedFunc);
+    } else {
+      throw new IllegalStateException(
+          "Unsupported place to use nested field under parent: " + parent);
     }
+    return nestedFunc;
+  }
 
-    String pathFromIdentifier(SQLExpr identifier) {
-        String field = Util.extendedToString(identifier);
-        int lastDot = field.lastIndexOf(".");
-        return lastDot == -1 ? field :field.substring(0, lastDot);
-    }
+  private SQLMethodInvokeExpr wrapNestedFunction(SQLExpr expr) {
+    SQLMethodInvokeExpr nestedFunc = new SQLMethodInvokeExpr("nested");
+    nestedFunc.setParent(expr.getParent());
+    nestedFunc.addParameter(expr); // this will auto set parent of expr
+    return nestedFunc;
+  }
 
+  String pathFromIdentifier(SQLExpr identifier) {
+    String field = Util.extendedToString(identifier);
+    int lastDot = field.lastIndexOf(".");
+    return lastDot == -1 ? field : field.substring(0, lastDot);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Scope.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Scope.java
index 5f035bc725..f65d7f166b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Scope.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Scope.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.nestedfield;
 
 import static com.alibaba.druid.sql.ast.statement.SQLJoinTableSource.JoinType;
@@ -14,71 +13,68 @@
 import java.util.Map;
 import java.util.Set;
 
-/**
- * Nested field information in current query being visited.
- */
+/** Nested field information in current query being visited. */
 class Scope {
 
-    /** Join Type as passed in the actual SQL subquery */
-    private JoinType actualJoinType;
-
-    /** Alias of parent such as alias "t" of parent table "team" in "FROM team t, t.employees e" */
-
-    private String parentAlias;
-
-    /**
-     * Mapping from nested field path alias to path full name in FROM.
-     * eg. e in {e => employees} in "FROM t.employees e"
-     */
-    private Map<String, String> aliasFullPaths = new HashMap<>();
-
-    /**
-     * Mapping from binary operation condition (in WHERE) to nested
-     * field tag (full path for nested, EMPTY for non-nested field)
-     */
-    private Map<SQLBinaryOpExpr, String> conditionTags = new IdentityHashMap<>();
-
-    String getParentAlias() {
-        return parentAlias;
-    }
-
-    void setParentAlias(String parentAlias) {
-        this.parentAlias = parentAlias;
+  /** Join Type as passed in the actual SQL subquery */
+  private JoinType actualJoinType;
+
+  /** Alias of parent such as alias "t" of parent table "team" in "FROM team t, t.employees e" */
+  private String parentAlias;
+
+  /**
+   * Mapping from nested field path alias to path full name in FROM. eg. e in {e => employees} in
+   * "FROM t.employees e"
+   */
+  private Map<String, String> aliasFullPaths = new HashMap<>();
+
+  /**
+   * Mapping from binary operation condition (in WHERE) to nested field tag (full path for nested,
+   * EMPTY for non-nested field)
+   */
+  private Map<SQLBinaryOpExpr, String> conditionTags = new IdentityHashMap<>();
+
+  String getParentAlias() {
+    return parentAlias;
+  }
+
+  void setParentAlias(String parentAlias) {
+    this.parentAlias = parentAlias;
+  }
+
+  void addAliasFullPath(String alias, String path) {
+    if (alias.isEmpty()) {
+      aliasFullPaths.put(path, path);
+    } else {
+      aliasFullPaths.put(alias, path);
     }
+  }
 
-    void addAliasFullPath(String alias, String path) {
-        if (alias.isEmpty()) {
-            aliasFullPaths.put(path, path);
-        } else {
-            aliasFullPaths.put(alias, path);
-        }
-    }
+  String getFullPath(String alias) {
+    return aliasFullPaths.getOrDefault(alias, "");
+  }
 
-    String getFullPath(String alias) {
-        return aliasFullPaths.getOrDefault(alias, "");
-    }
+  boolean isAnyNestedField() {
+    return !aliasFullPaths.isEmpty();
+  }
 
-    boolean isAnyNestedField() {
-        return !aliasFullPaths.isEmpty();
-    }
+  Set<String> getAliases() {
+    return aliasFullPaths.keySet();
+  }
 
-    Set<String> getAliases() {
-        return aliasFullPaths.keySet();
-    }
+  String getConditionTag(SQLBinaryOpExpr expr) {
+    return conditionTags.getOrDefault(expr, "");
+  }
 
-    String getConditionTag(SQLBinaryOpExpr expr) {
-        return conditionTags.getOrDefault(expr, "");
-    }
+  void addConditionTag(SQLBinaryOpExpr expr, String tag) {
+    conditionTags.put(expr, tag);
+  }
 
-    void addConditionTag(SQLBinaryOpExpr expr, String tag) {
-        conditionTags.put(expr, tag);
-    }
-
-    JoinType getActualJoinType() {
-        return actualJoinType;
-    }
+  JoinType getActualJoinType() {
+    return actualJoinType;
+  }
 
-    void setActualJoinType(JoinType joinType) {
-        actualJoinType = joinType;
-    }
+  void setActualJoinType(JoinType joinType) {
+    actualJoinType = joinType;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Select.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Select.java
index f514e6d081..8d2d6402e1 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Select.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Select.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.nestedfield;
 
 import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
@@ -11,39 +10,37 @@
 import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
 import java.util.List;
 
-/**
- * Column list in SELECT statement.
- */
+/** Column list in SELECT statement. */
 class Select extends SQLClause<List<SQLSelectItem>> {
 
-    Select(List<SQLSelectItem> expr) {
-        super(expr);
-    }
-
-    /**
-     * Rewrite by adding nested field to SELECT in the case of 'SELECT *'.
-     * <p>
-     * Ex. 'SELECT *' => 'SELECT *, employees.*'
-     * So that NestedFieldProjection will add 'employees.*' to includes list in inner_hits.
-     */
-    @Override
-    void rewrite(Scope scope) {
-        if (isSelectAllOnly()) {
-            addSelectAllForNestedField(scope);
-        }
+  Select(List<SQLSelectItem> expr) {
+    super(expr);
+  }
+
+  /**
+   * Rewrite by adding nested field to SELECT in the case of 'SELECT *'.
+   *
+   * <p>Ex. 'SELECT *' => 'SELECT *, employees.*' So that NestedFieldProjection will add
+   * 'employees.*' to includes list in inner_hits.
+   */
+  @Override
+  void rewrite(Scope scope) {
+    if (isSelectAllOnly()) {
+      addSelectAllForNestedField(scope);
     }
+  }
 
-    private boolean isSelectAllOnly() {
-        return expr.size() == 1 && expr.get(0).getExpr() instanceof SQLAllColumnExpr;
-    }
+  private boolean isSelectAllOnly() {
+    return expr.size() == 1 && expr.get(0).getExpr() instanceof SQLAllColumnExpr;
+  }
 
-    private void addSelectAllForNestedField(Scope scope) {
-        for (String alias : scope.getAliases()) {
-            expr.add(createSelectItem(alias + ".*"));
-        }
+  private void addSelectAllForNestedField(Scope scope) {
+    for (String alias : scope.getAliases()) {
+      expr.add(createSelectItem(alias + ".*"));
     }
+  }
 
-    private SQLSelectItem createSelectItem(String name) {
-        return new SQLSelectItem(new SQLIdentifierExpr(name));
-    }
+  private SQLSelectItem createSelectItem(String name) {
+    return new SQLSelectItem(new SQLIdentifierExpr(name));
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Where.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Where.java
index c126bb264f..3c1b995a4c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Where.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/nestedfield/Where.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.nestedfield;
 
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
@@ -11,116 +10,92 @@
 import com.alibaba.druid.sql.ast.expr.SQLNotExpr;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
 
-/**
- * Condition expression in WHERE statement.
- */
+/** Condition expression in WHERE statement. */
 class Where extends SQLClause<SQLBinaryOpExpr> {
 
-    Where(SQLBinaryOpExpr expr) {
-        super(expr);
-    }
+  Where(SQLBinaryOpExpr expr) {
+    super(expr);
+  }
 
-    /**
-     * Rewrite if left and right tag is different (or reach root of WHERE).
-     * Otherwise continue delaying the rewrite.
-     * <p>
-     * Assumption: there are only 2 forms of condition
-     * 1) BinaryOp: Left=Identifier, right=value
-     * 2) BinaryOp: Left=BinaryOp, right=BinaryOp
-     */
-    @Override
-    void rewrite(Scope scope) {
-        if (isLeftChildCondition()) {
-            if (isChildTagEquals(scope)) {
-                useAnyChildTag(scope);
-            } else {
-                left().mergeNestedField(scope);
-                right().mergeNestedField(scope);
-            }
-        }
-        mergeIfHaveTagAndIsRootOfWhereOrNot(scope);
+  /**
+   * Rewrite if left and right tag is different (or reach root of WHERE). Otherwise continue
+   * delaying the rewrite.
+   *
+   * <p>Assumption: there are only 2 forms of condition 1) BinaryOp: Left=Identifier, right=value 2)
+   * BinaryOp: Left=BinaryOp, right=BinaryOp
+   */
+  @Override
+  void rewrite(Scope scope) {
+    if (isLeftChildCondition()) {
+      if (isChildTagEquals(scope)) {
+        useAnyChildTag(scope);
+      } else {
+        left().mergeNestedField(scope);
+        right().mergeNestedField(scope);
+      }
     }
+    mergeIfHaveTagAndIsRootOfWhereOrNot(scope);
+  }
 
-    private boolean isLeftChildCondition() {
-        return expr.getLeft() instanceof SQLBinaryOpExpr;
-    }
+  private boolean isLeftChildCondition() {
+    return expr.getLeft() instanceof SQLBinaryOpExpr;
+  }
 
-    private boolean isChildTagEquals(Scope scope) {
-        String left = scope.getConditionTag((SQLBinaryOpExpr) expr.getLeft());
-        String right = scope.getConditionTag((SQLBinaryOpExpr) expr.getRight());
-        return left.equals(right);
-    }
+  private boolean isChildTagEquals(Scope scope) {
+    String left = scope.getConditionTag((SQLBinaryOpExpr) expr.getLeft());
+    String right = scope.getConditionTag((SQLBinaryOpExpr) expr.getRight());
+    return left.equals(right);
+  }
 
-    private void useAnyChildTag(Scope scope) {
-        scope.addConditionTag(expr, scope.getConditionTag((SQLBinaryOpExpr) expr.getLeft()));
-    }
+  private void useAnyChildTag(Scope scope) {
+    scope.addConditionTag(expr, scope.getConditionTag((SQLBinaryOpExpr) expr.getLeft()));
+  }
 
-    /**
-     * Merge anyway if the root of WHERE clause or {@link SQLNotExpr} be reached.
-     */
-    private void mergeIfHaveTagAndIsRootOfWhereOrNot(Scope scope) {
-        if (scope.getConditionTag(expr).isEmpty()) {
-            return;
-        }
-        if (expr.getParent() instanceof MySqlSelectQueryBlock
-            || expr.getParent() instanceof SQLNotExpr) {
-            mergeNestedField(scope);
-        }
+  /** Merge anyway if the root of WHERE clause or {@link SQLNotExpr} be reached. */
+  private void mergeIfHaveTagAndIsRootOfWhereOrNot(Scope scope) {
+    if (scope.getConditionTag(expr).isEmpty()) {
+      return;
     }
-
-    private Where left() {
-        return new Where((SQLBinaryOpExpr) expr.getLeft());
+    if (expr.getParent() instanceof MySqlSelectQueryBlock
+        || expr.getParent() instanceof SQLNotExpr) {
+      mergeNestedField(scope);
     }
+  }
 
-    private Where right() {
-        return new Where((SQLBinaryOpExpr) expr.getRight());
-    }
+  private Where left() {
+    return new Where((SQLBinaryOpExpr) expr.getLeft());
+  }
 
-    /**
-     * There are 2 cases:
-     * 1) For a single condition, just wrap nested() function. That's it.
-     * <p>
-     * BinaryOp
-     * /       \
-     * Identifier       Value
-     * "employees.age"      "30"
-     * <p>
-     * to
-     * <p>
-     * BinaryOp
-     * /       \
-     * Method       Value
-     * "nested"       "30"
-     * |
-     * Identifier
-     * "employees.age"
-     * <p>
-     * 2) For multiple conditions, put entire BinaryOp to the parameter and add function name "nested()" first
-     * <p>
-     * BinaryOp (a)
-     * /       \
-     * BinaryOp   BinaryOp
-     * |         |
-     * ...       ...
-     * <p>
-     * to
-     * <p>
-     * Method
-     * "nested"
-     * |
-     * BinaryOp (a)
-     * /      \
-     * ...    ...
-     */
-    private void mergeNestedField(Scope scope) {
-        String tag = scope.getConditionTag(expr);
-        if (!tag.isEmpty()) {
-            if (isLeftChildCondition()) {
-                replaceByNestedFunction(expr).getParameters().add(0, new SQLCharExpr(tag));
-            } else {
-                replaceByNestedFunction(expr.getLeft(), pathFromIdentifier(expr.getLeft()));
-            }
-        }
-    }
+  private Where right() {
+    return new Where((SQLBinaryOpExpr) expr.getRight());
+  }
 
+  /**
+   * There are 2 cases: 1) For a single condition, just wrap nested() function. That's it.
+   *
+   * <p>BinaryOp / \ Identifier Value "employees.age" "30"
+   *
+   * <p>to
+   *
+   * <p>BinaryOp / \ Method Value "nested" "30" | Identifier "employees.age"
+   *
+   * <p>2) For multiple conditions, put entire BinaryOp to the parameter and add function name
+   * "nested()" first
+   *
+   * <p>BinaryOp (a) / \ BinaryOp BinaryOp | | ... ...
+   *
+   * <p>to
+   *
+   * <p>Method "nested" | BinaryOp (a) / \ ... ...
+   */
+  private void mergeNestedField(Scope scope) {
+    String tag = scope.getConditionTag(expr);
+    if (!tag.isEmpty()) {
+      if (isLeftChildCondition()) {
+        replaceByNestedFunction(expr).getParameters().add(0, new SQLCharExpr(tag));
+      } else {
+        replaceByNestedFunction(expr.getLeft(), pathFromIdentifier(expr.getLeft()));
+      }
+    }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/ordinal/OrdinalRewriterRule.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/ordinal/OrdinalRewriterRule.java
index 1d44ac8261..f9766e60ce 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/ordinal/OrdinalRewriterRule.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/ordinal/OrdinalRewriterRule.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.ordinal;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -23,148 +22,145 @@
 import org.opensearch.sql.legacy.rewriter.matchtoterm.VerificationException;
 
 /**
- * Rewrite rule for changing ordinal alias in order by and group by to actual select field.
- * Since we cannot clone or deepcopy the Druid SQL objects, we need to generate the
- * two syntax tree from the  original query to map Group By and Order By fields with ordinal alias
- * to Select fields in newly generated syntax tree.
+ * Rewrite rule for changing ordinal alias in order by and group by to actual select field. Since we
+ * cannot clone or deepcopy the Druid SQL objects, we need to generate the two syntax tree from the
+ * original query to map Group By and Order By fields with ordinal alias to Select fields in newly
+ * generated syntax tree.
  *
- * This rewriter assumes that all the backticks have been removed from identifiers.
- * It also assumes that table alias have been removed from SELECT, WHERE, GROUP BY, ORDER BY fields.
+ * <p>This rewriter assumes that all the backticks have been removed from identifiers. It also
+ * assumes that table alias have been removed from SELECT, WHERE, GROUP BY, ORDER BY fields.
  */
-
 public class OrdinalRewriterRule implements RewriteRule<SQLQueryExpr> {
 
-    private final String sql;
+  private final String sql;
 
-    public OrdinalRewriterRule(String sql) {
-        this.sql = sql;
-    }
+  public OrdinalRewriterRule(String sql) {
+    this.sql = sql;
+  }
 
-    @Override
-    public boolean match(SQLQueryExpr root) {
-        SQLSelectQuery sqlSelectQuery = root.getSubQuery().getQuery();
-         if (!(sqlSelectQuery instanceof MySqlSelectQueryBlock)) {
-             // it could be SQLUnionQuery
-             return false;
-         }
-
-        MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) sqlSelectQuery;
-        if (!hasGroupByWithOrdinals(query) && !hasOrderByWithOrdinals(query)) {
-            return false;
-        }
-        return true;
+  @Override
+  public boolean match(SQLQueryExpr root) {
+    SQLSelectQuery sqlSelectQuery = root.getSubQuery().getQuery();
+    if (!(sqlSelectQuery instanceof MySqlSelectQueryBlock)) {
+      // it could be SQLUnionQuery
+      return false;
     }
 
-    @Override
-    public void rewrite(SQLQueryExpr root) {
-        // we cannot clone SQLSelectItem, so we need similar objects to assign to GroupBy and OrderBy items
-        SQLQueryExpr sqlExprGroupCopy = toSqlExpr();
-        SQLQueryExpr sqlExprOrderCopy = toSqlExpr();
-
-        changeOrdinalAliasInGroupAndOrderBy(root, sqlExprGroupCopy, sqlExprOrderCopy);
+    MySqlSelectQueryBlock query = (MySqlSelectQueryBlock) sqlSelectQuery;
+    if (!hasGroupByWithOrdinals(query) && !hasOrderByWithOrdinals(query)) {
+      return false;
     }
-
-    private void changeOrdinalAliasInGroupAndOrderBy(SQLQueryExpr root,
-                                                     SQLQueryExpr exprGroup,
-                                                     SQLQueryExpr exprOrder) {
-        root.accept(new MySqlASTVisitorAdapter() {
-
-            private String groupException = "Invalid ordinal [%s] specified in [GROUP BY %s]";
-            private String orderException = "Invalid ordinal [%s] specified in [ORDER BY %s]";
-
-            private List<SQLSelectItem> groupSelectList = ((MySqlSelectQueryBlock) exprGroup.getSubQuery().getQuery())
-                                                            .getSelectList();
-
-            private List<SQLSelectItem> orderSelectList = ((MySqlSelectQueryBlock) exprOrder.getSubQuery().getQuery())
-                                                            .getSelectList();
-
-            @Override
-            public boolean visit(MySqlSelectGroupByExpr groupByExpr) {
-                SQLExpr expr = groupByExpr.getExpr();
-                if (expr instanceof SQLIntegerExpr) {
-                    Integer ordinalValue = ((SQLIntegerExpr) expr).getNumber().intValue();
-                    SQLExpr newExpr = checkAndGet(groupSelectList, ordinalValue, groupException);
-                    groupByExpr.setExpr(newExpr);
-                    newExpr.setParent(groupByExpr);
-                }
-                return false;
+    return true;
+  }
+
+  @Override
+  public void rewrite(SQLQueryExpr root) {
+    // we cannot clone SQLSelectItem, so we need similar objects to assign to GroupBy and OrderBy
+    // items
+    SQLQueryExpr sqlExprGroupCopy = toSqlExpr();
+    SQLQueryExpr sqlExprOrderCopy = toSqlExpr();
+
+    changeOrdinalAliasInGroupAndOrderBy(root, sqlExprGroupCopy, sqlExprOrderCopy);
+  }
+
+  private void changeOrdinalAliasInGroupAndOrderBy(
+      SQLQueryExpr root, SQLQueryExpr exprGroup, SQLQueryExpr exprOrder) {
+    root.accept(
+        new MySqlASTVisitorAdapter() {
+
+          private String groupException = "Invalid ordinal [%s] specified in [GROUP BY %s]";
+          private String orderException = "Invalid ordinal [%s] specified in [ORDER BY %s]";
+
+          private List<SQLSelectItem> groupSelectList =
+              ((MySqlSelectQueryBlock) exprGroup.getSubQuery().getQuery()).getSelectList();
+
+          private List<SQLSelectItem> orderSelectList =
+              ((MySqlSelectQueryBlock) exprOrder.getSubQuery().getQuery()).getSelectList();
+
+          @Override
+          public boolean visit(MySqlSelectGroupByExpr groupByExpr) {
+            SQLExpr expr = groupByExpr.getExpr();
+            if (expr instanceof SQLIntegerExpr) {
+              Integer ordinalValue = ((SQLIntegerExpr) expr).getNumber().intValue();
+              SQLExpr newExpr = checkAndGet(groupSelectList, ordinalValue, groupException);
+              groupByExpr.setExpr(newExpr);
+              newExpr.setParent(groupByExpr);
             }
-
-            @Override
-            public boolean visit(SQLSelectOrderByItem orderByItem) {
-                SQLExpr expr = orderByItem.getExpr();
-                Integer ordinalValue;
-
-                if (expr instanceof SQLIntegerExpr) {
-                    ordinalValue = ((SQLIntegerExpr) expr).getNumber().intValue();
-                    SQLExpr newExpr = checkAndGet(orderSelectList, ordinalValue, orderException);
-                    orderByItem.setExpr(newExpr);
-                    newExpr.setParent(orderByItem);
-                } else if (expr instanceof SQLBinaryOpExpr
-                    && ((SQLBinaryOpExpr) expr).getLeft() instanceof SQLIntegerExpr) {
-                    // support ORDER BY IS NULL/NOT NULL
-                    SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) expr;
-                    SQLIntegerExpr integerExpr = (SQLIntegerExpr) binaryOpExpr.getLeft();
-
-                    ordinalValue = integerExpr.getNumber().intValue();
-                    SQLExpr newExpr = checkAndGet(orderSelectList, ordinalValue, orderException);
-                    binaryOpExpr.setLeft(newExpr);
-                    newExpr.setParent(binaryOpExpr);
-                }
-
-                return false;
+            return false;
+          }
+
+          @Override
+          public boolean visit(SQLSelectOrderByItem orderByItem) {
+            SQLExpr expr = orderByItem.getExpr();
+            Integer ordinalValue;
+
+            if (expr instanceof SQLIntegerExpr) {
+              ordinalValue = ((SQLIntegerExpr) expr).getNumber().intValue();
+              SQLExpr newExpr = checkAndGet(orderSelectList, ordinalValue, orderException);
+              orderByItem.setExpr(newExpr);
+              newExpr.setParent(orderByItem);
+            } else if (expr instanceof SQLBinaryOpExpr
+                && ((SQLBinaryOpExpr) expr).getLeft() instanceof SQLIntegerExpr) {
+              // support ORDER BY IS NULL/NOT NULL
+              SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) expr;
+              SQLIntegerExpr integerExpr = (SQLIntegerExpr) binaryOpExpr.getLeft();
+
+              ordinalValue = integerExpr.getNumber().intValue();
+              SQLExpr newExpr = checkAndGet(orderSelectList, ordinalValue, orderException);
+              binaryOpExpr.setLeft(newExpr);
+              newExpr.setParent(binaryOpExpr);
             }
-        });
-    }
 
-    private SQLExpr checkAndGet(List<SQLSelectItem> selectList, Integer ordinal, String exception) {
-        if (ordinal > selectList.size()) {
-            throw new VerificationException(String.format(exception, ordinal, ordinal));
-        }
+            return false;
+          }
+        });
+  }
 
-        return selectList.get(ordinal-1).getExpr();
+  private SQLExpr checkAndGet(List<SQLSelectItem> selectList, Integer ordinal, String exception) {
+    if (ordinal > selectList.size()) {
+      throw new VerificationException(String.format(exception, ordinal, ordinal));
     }
 
-    private boolean hasGroupByWithOrdinals(MySqlSelectQueryBlock query) {
-        if (query.getGroupBy() == null) {
-            return false;
-        } else if (query.getGroupBy().getItems().isEmpty()){
-            return false;
-        }
+    return selectList.get(ordinal - 1).getExpr();
+  }
 
-        return query.getGroupBy().getItems().stream().anyMatch(x ->
-            x instanceof MySqlSelectGroupByExpr && ((MySqlSelectGroupByExpr) x).getExpr() instanceof SQLIntegerExpr
-        );
+  private boolean hasGroupByWithOrdinals(MySqlSelectQueryBlock query) {
+    if (query.getGroupBy() == null) {
+      return false;
+    } else if (query.getGroupBy().getItems().isEmpty()) {
+      return false;
     }
 
-    private boolean hasOrderByWithOrdinals(MySqlSelectQueryBlock query) {
-        if (query.getOrderBy() == null) {
-            return false;
-        } else if (query.getOrderBy().getItems().isEmpty()){
-            return false;
-        }
-
-        /**
-         * The second condition checks valid AST that meets ORDER BY IS NULL/NOT NULL condition
-         *
-         *            SQLSelectOrderByItem
-         *                      |
-         *             SQLBinaryOpExpr (Is || IsNot)
-         *                    /  \
-         *    SQLIdentifierExpr  SQLNullExpr
-         */
-        return query.getOrderBy().getItems().stream().anyMatch(x ->
-            x.getExpr() instanceof SQLIntegerExpr
-            || (
-                x.getExpr() instanceof SQLBinaryOpExpr
-                && ((SQLBinaryOpExpr) x.getExpr()).getLeft() instanceof SQLIntegerExpr
-            )
-        );
+    return query.getGroupBy().getItems().stream()
+        .anyMatch(
+            x ->
+                x instanceof MySqlSelectGroupByExpr
+                    && ((MySqlSelectGroupByExpr) x).getExpr() instanceof SQLIntegerExpr);
+  }
+
+  private boolean hasOrderByWithOrdinals(MySqlSelectQueryBlock query) {
+    if (query.getOrderBy() == null) {
+      return false;
+    } else if (query.getOrderBy().getItems().isEmpty()) {
+      return false;
     }
 
-    private SQLQueryExpr toSqlExpr() {
-        SQLExprParser parser = new ElasticSqlExprParser(sql);
-        SQLExpr expr = parser.expr();
-        return (SQLQueryExpr) expr;
-    }
+    /**
+     * The second condition checks valid AST that meets ORDER BY IS NULL/NOT NULL condition
+     *
+     * <p>SQLSelectOrderByItem | SQLBinaryOpExpr (Is || IsNot) / \ SQLIdentifierExpr SQLNullExpr
+     */
+    return query.getOrderBy().getItems().stream()
+        .anyMatch(
+            x ->
+                x.getExpr() instanceof SQLIntegerExpr
+                    || (x.getExpr() instanceof SQLBinaryOpExpr
+                        && ((SQLBinaryOpExpr) x.getExpr()).getLeft() instanceof SQLIntegerExpr));
+  }
+
+  private SQLQueryExpr toSqlExpr() {
+    SQLExprParser parser = new ElasticSqlExprParser(sql);
+    SQLExpr expr = parser.expr();
+    return (SQLQueryExpr) expr;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/parent/SQLExprParentSetter.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/parent/SQLExprParentSetter.java
index 9de81f2ab1..3ad2955798 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/parent/SQLExprParentSetter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/parent/SQLExprParentSetter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.parent;
 
 import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
@@ -12,35 +11,27 @@
 import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter;
 
-/**
- * Add the parent for the node in {@link SQLQueryExpr} if it is missing.
- */
+/** Add the parent for the node in {@link SQLQueryExpr} if it is missing. */
 public class SQLExprParentSetter extends MySqlASTVisitorAdapter {
 
-    /**
-     * Fix null parent problem which is required by SQLIdentifier.visit()
-     */
-    @Override
-    public boolean visit(SQLInSubQueryExpr subQuery) {
-        subQuery.getExpr().setParent(subQuery);
-        return true;
-    }
+  /** Fix null parent problem which is required by SQLIdentifier.visit() */
+  @Override
+  public boolean visit(SQLInSubQueryExpr subQuery) {
+    subQuery.getExpr().setParent(subQuery);
+    return true;
+  }
 
-    /**
-     * Fix null parent problem which is required by SQLIdentifier.visit()
-     */
-    @Override
-    public boolean visit(SQLInListExpr expr) {
-        expr.getExpr().setParent(expr);
-        return true;
-    }
+  /** Fix null parent problem which is required by SQLIdentifier.visit() */
+  @Override
+  public boolean visit(SQLInListExpr expr) {
+    expr.getExpr().setParent(expr);
+    return true;
+  }
 
-    /**
-     * Fix the expr in {@link SQLNotExpr} without parent.
-     */
-    @Override
-    public boolean visit(SQLNotExpr notExpr) {
-        notExpr.getExpr().setParent(notExpr);
-        return true;
-    }
+  /** Fix the expr in {@link SQLNotExpr} without parent. */
+  @Override
+  public boolean visit(SQLNotExpr notExpr) {
+    notExpr.getExpr().setParent(notExpr);
+    return true;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/parent/SQLExprParentSetterRule.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/parent/SQLExprParentSetterRule.java
index 62ad0765d8..b623998b6e 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/parent/SQLExprParentSetterRule.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/parent/SQLExprParentSetterRule.java
@@ -3,24 +3,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.parent;
 
 import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
 import org.opensearch.sql.legacy.rewriter.RewriteRule;
 
-/**
- * The {@link RewriteRule} which will apply {@link SQLExprParentSetter} for {@link SQLQueryExpr}
- */
+/** The {@link RewriteRule} which will apply {@link SQLExprParentSetter} for {@link SQLQueryExpr} */
 public class SQLExprParentSetterRule implements RewriteRule<SQLQueryExpr> {
 
-    @Override
-    public boolean match(SQLQueryExpr expr) {
-        return true;
-    }
+  @Override
+  public boolean match(SQLQueryExpr expr) {
+    return true;
+  }
 
-    @Override
-    public void rewrite(SQLQueryExpr expr) {
-        expr.accept(new SQLExprParentSetter());
-    }
+  @Override
+  public void rewrite(SQLQueryExpr expr) {
+    expr.accept(new SQLExprParentSetter());
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/NestedQueryContext.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/NestedQueryContext.java
index ce254e2103..4be5f3ec69 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/NestedQueryContext.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/NestedQueryContext.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.subquery;
 
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
@@ -14,65 +13,60 @@
 import java.util.Map;
 
 /**
- * {@link NestedQueryContext} build the context with Query to detected the specified table is nested or not.
- * Todo current implementation doesn't rely on the index mapping which should be added after the semantics is builded.
+ * {@link NestedQueryContext} build the context with Query to detected the specified table is nested
+ * or not. Todo current implementation doesn't rely on the index mapping which should be added after
+ * the semantics is builded.
  */
 public class NestedQueryContext {
-    private static final String SEPARATOR = ".";
-    private static final String EMPTY = "";
-    // <tableAlias, parentTableAlias>, if parentTable not exist, parentTableAlias = "";
-    private final Map<String, String> aliasParents = new HashMap<>();
+  private static final String SEPARATOR = ".";
+  private static final String EMPTY = "";
+  // <tableAlias, parentTableAlias>, if parentTable not exist, parentTableAlias = "";
+  private final Map<String, String> aliasParents = new HashMap<>();
 
-    /**
-     * Is the table refer to the nested field of the parent table.
-     */
-    public boolean isNested(SQLExprTableSource table) {
-        String parent = parent(table);
-        if (Strings.isNullOrEmpty(parent)) {
-            return !Strings.isNullOrEmpty(aliasParents.get(alias(table)));
-        } else {
-            return aliasParents.containsKey(parent);
-        }
+  /** Is the table refer to the nested field of the parent table. */
+  public boolean isNested(SQLExprTableSource table) {
+    String parent = parent(table);
+    if (Strings.isNullOrEmpty(parent)) {
+      return !Strings.isNullOrEmpty(aliasParents.get(alias(table)));
+    } else {
+      return aliasParents.containsKey(parent);
     }
+  }
 
-    /**
-     * add table to the context.
-     */
-    public void add(SQLTableSource table) {
-        if (table instanceof SQLExprTableSource) {
-            process((SQLExprTableSource) table);
-        } else if (table instanceof SQLJoinTableSource) {
-            add(((SQLJoinTableSource) table).getLeft());
-            add(((SQLJoinTableSource) table).getRight());
-        } else {
-            throw new IllegalStateException("unsupported table source");
-        }
+  /** add table to the context. */
+  public void add(SQLTableSource table) {
+    if (table instanceof SQLExprTableSource) {
+      process((SQLExprTableSource) table);
+    } else if (table instanceof SQLJoinTableSource) {
+      add(((SQLJoinTableSource) table).getLeft());
+      add(((SQLJoinTableSource) table).getRight());
+    } else {
+      throw new IllegalStateException("unsupported table source");
     }
+  }
 
-    private void process(SQLExprTableSource table) {
-        String alias = alias(table);
-        String parent = parent(table);
-        if (!Strings.isNullOrEmpty(alias)) {
-            aliasParents.putIfAbsent(alias, parent);
-        }
+  private void process(SQLExprTableSource table) {
+    String alias = alias(table);
+    String parent = parent(table);
+    if (!Strings.isNullOrEmpty(alias)) {
+      aliasParents.putIfAbsent(alias, parent);
     }
+  }
 
-    /**
-     * Extract the parent alias from the tableName. For example
-     * SELECT * FROM employee e, e.project as p,
-     * For expr: employee, the parent alias is "".
-     * For expr: e.project, the parent alias is e.
-     */
-    private String parent(SQLExprTableSource table) {
-        String tableName = table.getExpr().toString();
-        int index = tableName.indexOf(SEPARATOR);
-        return index == -1 ? EMPTY : tableName.substring(0, index);
-    }
+  /**
+   * Extract the parent alias from the tableName. For example SELECT * FROM employee e, e.project as
+   * p, For expr: employee, the parent alias is "". For expr: e.project, the parent alias is e.
+   */
+  private String parent(SQLExprTableSource table) {
+    String tableName = table.getExpr().toString();
+    int index = tableName.indexOf(SEPARATOR);
+    return index == -1 ? EMPTY : tableName.substring(0, index);
+  }
 
-    private String alias(SQLExprTableSource table) {
-        if (Strings.isNullOrEmpty(table.getAlias())) {
-            return table.getExpr().toString();
-        }
-        return table.getAlias();
+  private String alias(SQLExprTableSource table) {
+    if (Strings.isNullOrEmpty(table.getAlias())) {
+      return table.getExpr().toString();
     }
+    return table.getAlias();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/RewriterContext.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/RewriterContext.java
index 09698095e6..54cba6547b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/RewriterContext.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/RewriterContext.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.subquery;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -19,68 +18,66 @@
 import java.util.Deque;
 import java.util.List;
 
-/**
- * Environment for rewriting the SQL.
- */
+/** Environment for rewriting the SQL. */
 public class RewriterContext {
-    private final Deque<SQLTableSource> tableStack = new ArrayDeque<>();
-    private final Deque<SQLExpr> conditionStack = new ArrayDeque<>();
-    private final List<SQLInSubQueryExpr> sqlInSubQueryExprs = new ArrayList<>();
-    private final List<SQLExistsExpr> sqlExistsExprs = new ArrayList<>();
-    private final NestedQueryContext nestedQueryDetector = new NestedQueryContext();
+  private final Deque<SQLTableSource> tableStack = new ArrayDeque<>();
+  private final Deque<SQLExpr> conditionStack = new ArrayDeque<>();
+  private final List<SQLInSubQueryExpr> sqlInSubQueryExprs = new ArrayList<>();
+  private final List<SQLExistsExpr> sqlExistsExprs = new ArrayList<>();
+  private final NestedQueryContext nestedQueryDetector = new NestedQueryContext();
 
-    public SQLTableSource popJoin() {
-        return tableStack.pop();
-    }
+  public SQLTableSource popJoin() {
+    return tableStack.pop();
+  }
 
-    public SQLExpr popWhere() {
-        return conditionStack.pop();
-    }
+  public SQLExpr popWhere() {
+    return conditionStack.pop();
+  }
 
-    public void addWhere(SQLExpr expr) {
-        conditionStack.push(expr);
-    }
+  public void addWhere(SQLExpr expr) {
+    conditionStack.push(expr);
+  }
 
-    /**
-     * Add the Join right table and {@link JoinType} and {@link SQLBinaryOpExpr} which will
-     * merge the left table in the tableStack.
-     */
-    public void addJoin(SQLTableSource right, JoinType joinType, SQLBinaryOpExpr condition) {
-        SQLTableSource left = tableStack.pop();
-        SQLJoinTableSource joinTableSource = new SQLJoinTableSource();
-        joinTableSource.setLeft(left);
-        joinTableSource.setRight(right);
-        joinTableSource.setJoinType(joinType);
-        joinTableSource.setCondition(condition);
-        tableStack.push(joinTableSource);
-    }
+  /**
+   * Add the Join right table and {@link JoinType} and {@link SQLBinaryOpExpr} which will merge the
+   * left table in the tableStack.
+   */
+  public void addJoin(SQLTableSource right, JoinType joinType, SQLBinaryOpExpr condition) {
+    SQLTableSource left = tableStack.pop();
+    SQLJoinTableSource joinTableSource = new SQLJoinTableSource();
+    joinTableSource.setLeft(left);
+    joinTableSource.setRight(right);
+    joinTableSource.setJoinType(joinType);
+    joinTableSource.setCondition(condition);
+    tableStack.push(joinTableSource);
+  }
 
-    public void addJoin(SQLTableSource right, JoinType joinType) {
-        addJoin(right, joinType, null);
-    }
+  public void addJoin(SQLTableSource right, JoinType joinType) {
+    addJoin(right, joinType, null);
+  }
 
-    public void addTable(SQLTableSource table) {
-        tableStack.push(table);
-        nestedQueryDetector.add(table);
-    }
+  public void addTable(SQLTableSource table) {
+    tableStack.push(table);
+    nestedQueryDetector.add(table);
+  }
 
-    public boolean isNestedQuery(SQLExprTableSource table) {
-        return nestedQueryDetector.isNested(table);
-    }
+  public boolean isNestedQuery(SQLExprTableSource table) {
+    return nestedQueryDetector.isNested(table);
+  }
 
-    public void setInSubQuery(SQLInSubQueryExpr expr) {
-        sqlInSubQueryExprs.add(expr);
-    }
+  public void setInSubQuery(SQLInSubQueryExpr expr) {
+    sqlInSubQueryExprs.add(expr);
+  }
 
-    public void setExistsSubQuery(SQLExistsExpr expr) {
-        sqlExistsExprs.add(expr);
-    }
+  public void setExistsSubQuery(SQLExistsExpr expr) {
+    sqlExistsExprs.add(expr);
+  }
 
-    public List<SQLInSubQueryExpr> getSqlInSubQueryExprs() {
-        return sqlInSubQueryExprs;
-    }
+  public List<SQLInSubQueryExpr> getSqlInSubQueryExprs() {
+    return sqlInSubQueryExprs;
+  }
 
-    public List<SQLExistsExpr> getSqlExistsExprs() {
-        return sqlExistsExprs;
-    }
+  public List<SQLExistsExpr> getSqlExistsExprs() {
+    return sqlExistsExprs;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/SubQueryRewriteRule.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/SubQueryRewriteRule.java
index 44a68b1bbb..5177b2d6d3 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/SubQueryRewriteRule.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/SubQueryRewriteRule.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.subquery;
 
 import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
@@ -12,42 +11,44 @@
 import org.opensearch.sql.legacy.rewriter.subquery.rewriter.SubqueryAliasRewriter;
 import org.opensearch.sql.legacy.rewriter.subquery.utils.FindSubQuery;
 
-/**
- * Subquery Rewriter Rule.
- */
+/** Subquery Rewriter Rule. */
 public class SubQueryRewriteRule implements RewriteRule<SQLQueryExpr> {
-    private FindSubQuery findAllSubQuery = new FindSubQuery();
-
-    @Override
-    public boolean match(SQLQueryExpr expr) throws SQLFeatureNotSupportedException {
-        expr.accept(findAllSubQuery);
-
-        if (isContainSubQuery(findAllSubQuery)) {
-            if (isSupportedSubQuery(findAllSubQuery)) {
-                return true;
-            } else {
-                throw new SQLFeatureNotSupportedException("Unsupported subquery. Only one EXISTS or IN is supported");
-            }
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public void rewrite(SQLQueryExpr expr) {
-        expr.accept(new SubqueryAliasRewriter());
-        new SubQueryRewriter().convert(expr.getSubQuery());
+  private FindSubQuery findAllSubQuery = new FindSubQuery();
+
+  @Override
+  public boolean match(SQLQueryExpr expr) throws SQLFeatureNotSupportedException {
+    expr.accept(findAllSubQuery);
+
+    if (isContainSubQuery(findAllSubQuery)) {
+      if (isSupportedSubQuery(findAllSubQuery)) {
+        return true;
+      } else {
+        throw new SQLFeatureNotSupportedException(
+            "Unsupported subquery. Only one EXISTS or IN is supported");
+      }
+    } else {
+      return false;
     }
-
-    private boolean isContainSubQuery(FindSubQuery allSubQuery) {
-        return !allSubQuery.getSqlExistsExprs().isEmpty() || !allSubQuery.getSqlInSubQueryExprs().isEmpty();
-    }
-
-    private boolean isSupportedSubQuery(FindSubQuery allSubQuery) {
-        if ((allSubQuery.getSqlInSubQueryExprs().size() == 1 && allSubQuery.getSqlExistsExprs().size() == 0)
-            || (allSubQuery.getSqlInSubQueryExprs().size() == 0 && allSubQuery.getSqlExistsExprs().size() == 1)) {
-            return true;
-        }
-        return false;
+  }
+
+  @Override
+  public void rewrite(SQLQueryExpr expr) {
+    expr.accept(new SubqueryAliasRewriter());
+    new SubQueryRewriter().convert(expr.getSubQuery());
+  }
+
+  private boolean isContainSubQuery(FindSubQuery allSubQuery) {
+    return !allSubQuery.getSqlExistsExprs().isEmpty()
+        || !allSubQuery.getSqlInSubQueryExprs().isEmpty();
+  }
+
+  private boolean isSupportedSubQuery(FindSubQuery allSubQuery) {
+    if ((allSubQuery.getSqlInSubQueryExprs().size() == 1
+            && allSubQuery.getSqlExistsExprs().size() == 0)
+        || (allSubQuery.getSqlInSubQueryExprs().size() == 0
+            && allSubQuery.getSqlExistsExprs().size() == 1)) {
+      return true;
     }
+    return false;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/SubQueryRewriter.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/SubQueryRewriter.java
index fd503a0e9b..c788e8f559 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/SubQueryRewriter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/SubQueryRewriter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.subquery;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -19,73 +18,73 @@
 import org.opensearch.sql.legacy.rewriter.subquery.utils.FindSubQuery;
 
 public class SubQueryRewriter {
-    private final RewriterContext ctx = new RewriterContext();
+  private final RewriterContext ctx = new RewriterContext();
 
-    public void convert(SQLSelect query) {
-        SQLSelectQuery queryExpr = query.getQuery();
-        if (queryExpr instanceof MySqlSelectQueryBlock) {
-            MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) queryExpr;
-            ctx.addTable(queryBlock.getFrom());
+  public void convert(SQLSelect query) {
+    SQLSelectQuery queryExpr = query.getQuery();
+    if (queryExpr instanceof MySqlSelectQueryBlock) {
+      MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) queryExpr;
+      ctx.addTable(queryBlock.getFrom());
 
-            queryBlock.setWhere(convertWhere(queryBlock.getWhere()));
-            queryBlock.setFrom(convertFrom(queryBlock.getFrom()));
-        }
+      queryBlock.setWhere(convertWhere(queryBlock.getWhere()));
+      queryBlock.setFrom(convertFrom(queryBlock.getFrom()));
     }
+  }
 
-    private SQLTableSource convertFrom(SQLTableSource expr) {
-        SQLTableSource join = ctx.popJoin();
-        if (join != null) {
-            return join;
-        }
-        return expr;
+  private SQLTableSource convertFrom(SQLTableSource expr) {
+    SQLTableSource join = ctx.popJoin();
+    if (join != null) {
+      return join;
     }
+    return expr;
+  }
 
-    private SQLExpr convertWhere(SQLExpr expr) {
-        if (expr instanceof SQLExistsExpr) {
-            ctx.setExistsSubQuery((SQLExistsExpr) expr);
-            rewriteSubQuery(expr, ((SQLExistsExpr) expr).getSubQuery());
-            return ctx.popWhere();
-        } else if (expr instanceof SQLInSubQueryExpr) {
-            ctx.setInSubQuery((SQLInSubQueryExpr) expr);
-            rewriteSubQuery(expr, ((SQLInSubQueryExpr) expr).getSubQuery());
-            return ctx.popWhere();
-        } else if (expr instanceof SQLBinaryOpExpr) {
-            SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) expr;
-            SQLExpr left = convertWhere(binaryOpExpr.getLeft());
-            left.setParent(binaryOpExpr);
-            binaryOpExpr.setLeft(left);
-            SQLExpr right = convertWhere(binaryOpExpr.getRight());
-            right.setParent(binaryOpExpr);
-            binaryOpExpr.setRight(right);
-        }
-        return expr;
+  private SQLExpr convertWhere(SQLExpr expr) {
+    if (expr instanceof SQLExistsExpr) {
+      ctx.setExistsSubQuery((SQLExistsExpr) expr);
+      rewriteSubQuery(expr, ((SQLExistsExpr) expr).getSubQuery());
+      return ctx.popWhere();
+    } else if (expr instanceof SQLInSubQueryExpr) {
+      ctx.setInSubQuery((SQLInSubQueryExpr) expr);
+      rewriteSubQuery(expr, ((SQLInSubQueryExpr) expr).getSubQuery());
+      return ctx.popWhere();
+    } else if (expr instanceof SQLBinaryOpExpr) {
+      SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) expr;
+      SQLExpr left = convertWhere(binaryOpExpr.getLeft());
+      left.setParent(binaryOpExpr);
+      binaryOpExpr.setLeft(left);
+      SQLExpr right = convertWhere(binaryOpExpr.getRight());
+      right.setParent(binaryOpExpr);
+      binaryOpExpr.setRight(right);
     }
+    return expr;
+  }
 
-    private void rewriteSubQuery(SQLExpr subQueryExpr, SQLSelect subQuerySelect) {
-        if (containSubQuery(subQuerySelect)) {
-            convert(subQuerySelect);
-        } else if (isSupportedSubQuery(ctx)){
-            for (Rewriter rewriter : RewriterFactory.createRewriterList(subQueryExpr, ctx)) {
-                if (rewriter.canRewrite()) {
-                    rewriter.rewrite();
-                    return;
-                }
-            }
+  private void rewriteSubQuery(SQLExpr subQueryExpr, SQLSelect subQuerySelect) {
+    if (containSubQuery(subQuerySelect)) {
+      convert(subQuerySelect);
+    } else if (isSupportedSubQuery(ctx)) {
+      for (Rewriter rewriter : RewriterFactory.createRewriterList(subQueryExpr, ctx)) {
+        if (rewriter.canRewrite()) {
+          rewriter.rewrite();
+          return;
         }
-        throw new IllegalStateException("Unsupported subquery");
+      }
     }
+    throw new IllegalStateException("Unsupported subquery");
+  }
 
-    private boolean containSubQuery(SQLSelect query) {
-        FindSubQuery findSubQuery = new FindSubQuery().continueVisitWhenFound(false);
-        query.accept(findSubQuery);
-        return findSubQuery.hasSubQuery();
-    }
+  private boolean containSubQuery(SQLSelect query) {
+    FindSubQuery findSubQuery = new FindSubQuery().continueVisitWhenFound(false);
+    query.accept(findSubQuery);
+    return findSubQuery.hasSubQuery();
+  }
 
-    private boolean isSupportedSubQuery(RewriterContext ctx) {
-        if ((ctx.getSqlInSubQueryExprs().size() == 1 && ctx.getSqlExistsExprs().size() == 0)
-            || (ctx.getSqlInSubQueryExprs().size() == 0 && ctx.getSqlExistsExprs().size() == 1)) {
-            return true;
-        }
-        return false;
+  private boolean isSupportedSubQuery(RewriterContext ctx) {
+    if ((ctx.getSqlInSubQueryExprs().size() == 1 && ctx.getSqlExistsExprs().size() == 0)
+        || (ctx.getSqlInSubQueryExprs().size() == 0 && ctx.getSqlExistsExprs().size() == 1)) {
+      return true;
     }
+    return false;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/InRewriter.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/InRewriter.java
index 99505e5e49..587651fb92 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/InRewriter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/InRewriter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.subquery.rewriter;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -17,87 +16,76 @@
 import org.opensearch.sql.legacy.rewriter.subquery.RewriterContext;
 
 /**
- * IN Subquery Rewriter.
- * For example,
- * SELECT * FROM A WHERE a IN (SELECT b FROM B) and c > 10 should be rewritten to
- * SELECT A.* FROM A JOIN B ON A.a = B.b WHERE c > 10 and B.b IS NOT NULL.
+ * IN Subquery Rewriter. For example, SELECT * FROM A WHERE a IN (SELECT b FROM B) and c > 10 should
+ * be rewritten to SELECT A.* FROM A JOIN B ON A.a = B.b WHERE c > 10 and B.b IS NOT NULL.
  */
 public class InRewriter implements Rewriter {
-    private final SQLInSubQueryExpr inExpr;
-    private final RewriterContext ctx;
-    private final MySqlSelectQueryBlock queryBlock;
+  private final SQLInSubQueryExpr inExpr;
+  private final RewriterContext ctx;
+  private final MySqlSelectQueryBlock queryBlock;
 
-    public InRewriter(SQLInSubQueryExpr inExpr, RewriterContext ctx) {
-        this.inExpr = inExpr;
-        this.ctx = ctx;
-        this.queryBlock = (MySqlSelectQueryBlock) inExpr.getSubQuery().getQuery();
-    }
+  public InRewriter(SQLInSubQueryExpr inExpr, RewriterContext ctx) {
+    this.inExpr = inExpr;
+    this.ctx = ctx;
+    this.queryBlock = (MySqlSelectQueryBlock) inExpr.getSubQuery().getQuery();
+  }
 
-    @Override
-    public boolean canRewrite() {
-        return !inExpr.isNot();
-    }
+  @Override
+  public boolean canRewrite() {
+    return !inExpr.isNot();
+  }
 
-    /**
-     * Build Where clause from input query.
-     * <p>
-     * With the input query.
-     *         Query
-     *      /    |     \
-     *  SELECT  FROM  WHERE
-     *  |        |    /   |  \
-     *  *         A  c>10 AND INSubquery
-     *                         /    \
-     *                        a    Query
-     *                        /      \
-     *                           SELECT FROM
-     *                             |     |
-     *                             b     B
-     * <p>
-     *
-     */
-    @Override
-    public void rewrite() {
-        SQLTableSource from = queryBlock.getFrom();
-        addJoinTable(from);
+  /**
+   * Build Where clause from input query.
+   *
+   * <p>With the input query. Query / | \ SELECT FROM WHERE | | / | \ * A c>10 AND INSubquery / \ a
+   * Query / \ SELECT FROM | | b B
+   *
+   * <p>
+   */
+  @Override
+  public void rewrite() {
+    SQLTableSource from = queryBlock.getFrom();
+    addJoinTable(from);
 
-        SQLExpr where = queryBlock.getWhere();
-        if (null == where) {
-            ctx.addWhere(generateNullOp());
-        } else if (where instanceof SQLBinaryOpExpr) {
-            ctx.addWhere(and(generateNullOp(), (SQLBinaryOpExpr) where));
-        } else {
-            throw new IllegalStateException("unsupported where class type " + where.getClass());
-        }
+    SQLExpr where = queryBlock.getWhere();
+    if (null == where) {
+      ctx.addWhere(generateNullOp());
+    } else if (where instanceof SQLBinaryOpExpr) {
+      ctx.addWhere(and(generateNullOp(), (SQLBinaryOpExpr) where));
+    } else {
+      throw new IllegalStateException("unsupported where class type " + where.getClass());
     }
+  }
 
-    /**
-     * Build the Null check expression. For example,
-     * SELECT * FROM A WHERE a IN (SELECT b FROM B), should return B.b IS NOT NULL
-     */
-    private SQLBinaryOpExpr generateNullOp() {
-        SQLBinaryOpExpr binaryOpExpr = new SQLBinaryOpExpr();
-        binaryOpExpr.setLeft(fetchJoinExpr());
-        binaryOpExpr.setRight(new SQLNullExpr());
-        binaryOpExpr.setOperator(SQLBinaryOperator.IsNot);
+  /**
+   * Build the Null check expression. For example, SELECT * FROM A WHERE a IN (SELECT b FROM B),
+   * should return B.b IS NOT NULL
+   */
+  private SQLBinaryOpExpr generateNullOp() {
+    SQLBinaryOpExpr binaryOpExpr = new SQLBinaryOpExpr();
+    binaryOpExpr.setLeft(fetchJoinExpr());
+    binaryOpExpr.setRight(new SQLNullExpr());
+    binaryOpExpr.setOperator(SQLBinaryOperator.IsNot);
 
-        return binaryOpExpr;
-    }
+    return binaryOpExpr;
+  }
 
-    /**
-     * Add the {@link SQLTableSource} with {@link JoinType} and {@link SQLBinaryOpExpr} to the {@link RewriterContext}.
-     */
-    private void addJoinTable(SQLTableSource right) {
-        SQLBinaryOpExpr binaryOpExpr = new SQLBinaryOpExpr(inExpr.getExpr(),
-                SQLBinaryOperator.Equality,
-                fetchJoinExpr());
-        ctx.addJoin(right, JoinType.JOIN, binaryOpExpr);
-    }
+  /**
+   * Add the {@link SQLTableSource} with {@link JoinType} and {@link SQLBinaryOpExpr} to the {@link
+   * RewriterContext}.
+   */
+  private void addJoinTable(SQLTableSource right) {
+    SQLBinaryOpExpr binaryOpExpr =
+        new SQLBinaryOpExpr(inExpr.getExpr(), SQLBinaryOperator.Equality, fetchJoinExpr());
+    ctx.addJoin(right, JoinType.JOIN, binaryOpExpr);
+  }
 
-    private SQLExpr fetchJoinExpr() {
-        if (queryBlock.getSelectList().size() > 1) {
-            throw new IllegalStateException("Unsupported subquery with multiple select " + queryBlock.getSelectList());
-        }
-        return queryBlock.getSelectList().get(0).getExpr();
+  private SQLExpr fetchJoinExpr() {
+    if (queryBlock.getSelectList().size() > 1) {
+      throw new IllegalStateException(
+          "Unsupported subquery with multiple select " + queryBlock.getSelectList());
     }
+    return queryBlock.getSelectList().get(0).getExpr();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/NestedExistsRewriter.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/NestedExistsRewriter.java
index c7656e420f..ad4996875a 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/NestedExistsRewriter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/NestedExistsRewriter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.subquery.rewriter;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -18,78 +17,71 @@
 import org.opensearch.sql.legacy.rewriter.subquery.RewriterContext;
 
 /**
- * Nested EXISTS SQL Rewriter.
- * The EXISTS clause will be remove from the SQL. The translated SQL will use ElasticSearch's nested query logic.
+ * Nested EXISTS SQL Rewriter. The EXISTS clause will be remove from the SQL. The translated SQL
+ * will use ElasticSearch's nested query logic.
+ *
+ * <p>For example,
  *
- * For example,
- * <p>
- * SELECT e.name
- * FROM employee as e, e.projects as p
- * WHERE EXISTS (SELECT * FROM p)
- * should be rewritten to
- * SELECT e.name
- * FROM employee as e, e.projects as p
- * WHERE p is not null
- * </p>
+ * <p>SELECT e.name FROM employee as e, e.projects as p WHERE EXISTS (SELECT * FROM p) should be
+ * rewritten to SELECT e.name FROM employee as e, e.projects as p WHERE p is not null
  */
 public class NestedExistsRewriter implements Rewriter {
-    private final SQLExistsExpr existsExpr;
-    private final RewriterContext ctx;
-    private final SQLExprTableSource from;
-    private final SQLExpr where;
+  private final SQLExistsExpr existsExpr;
+  private final RewriterContext ctx;
+  private final SQLExprTableSource from;
+  private final SQLExpr where;
 
-    public NestedExistsRewriter(SQLExistsExpr existsExpr, RewriterContext board) {
-        this.existsExpr = existsExpr;
-        this.ctx = board;
-        MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) existsExpr.getSubQuery().getQuery();
-        if (queryBlock.getFrom() instanceof SQLExprTableSource) {
-            this.from = (SQLExprTableSource) queryBlock.getFrom();
-        } else {
-            throw new IllegalStateException("unsupported expression in from " + queryBlock.getFrom().getClass());
-        }
-        this.where = queryBlock.getWhere();
+  public NestedExistsRewriter(SQLExistsExpr existsExpr, RewriterContext board) {
+    this.existsExpr = existsExpr;
+    this.ctx = board;
+    MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) existsExpr.getSubQuery().getQuery();
+    if (queryBlock.getFrom() instanceof SQLExprTableSource) {
+      this.from = (SQLExprTableSource) queryBlock.getFrom();
+    } else {
+      throw new IllegalStateException(
+          "unsupported expression in from " + queryBlock.getFrom().getClass());
     }
+    this.where = queryBlock.getWhere();
+  }
 
-    /**
-     * The from table must be nested field.
-     */
-    @Override
-    public boolean canRewrite() {
-        return ctx.isNestedQuery(from);
-    }
+  /** The from table must be nested field. */
+  @Override
+  public boolean canRewrite() {
+    return ctx.isNestedQuery(from);
+  }
 
-    @Override
-    public void rewrite() {
-        ctx.addJoin(from, JoinType.COMMA);
-        ctx.addWhere(rewriteExistsWhere());
-    }
+  @Override
+  public void rewrite() {
+    ctx.addJoin(from, JoinType.COMMA);
+    ctx.addWhere(rewriteExistsWhere());
+  }
 
-    private SQLExpr rewriteExistsWhere() {
-        SQLBinaryOpExpr translatedWhere;
-        SQLBinaryOpExpr notMissingOp = buildNotMissingOp();
-        if (null == where) {
-            translatedWhere = notMissingOp;
-        } else if (where instanceof SQLBinaryOpExpr) {
-            translatedWhere = and(notMissingOp, (SQLBinaryOpExpr) where);
-        } else {
-            throw new IllegalStateException("unsupported expression in where " + where.getClass());
-        }
+  private SQLExpr rewriteExistsWhere() {
+    SQLBinaryOpExpr translatedWhere;
+    SQLBinaryOpExpr notMissingOp = buildNotMissingOp();
+    if (null == where) {
+      translatedWhere = notMissingOp;
+    } else if (where instanceof SQLBinaryOpExpr) {
+      translatedWhere = and(notMissingOp, (SQLBinaryOpExpr) where);
+    } else {
+      throw new IllegalStateException("unsupported expression in where " + where.getClass());
+    }
 
-        if (existsExpr.isNot()) {
-            SQLNotExpr sqlNotExpr = new SQLNotExpr(translatedWhere);
-            translatedWhere.setParent(sqlNotExpr);
-            return sqlNotExpr;
-        } else {
-            return translatedWhere;
-        }
+    if (existsExpr.isNot()) {
+      SQLNotExpr sqlNotExpr = new SQLNotExpr(translatedWhere);
+      translatedWhere.setParent(sqlNotExpr);
+      return sqlNotExpr;
+    } else {
+      return translatedWhere;
     }
+  }
 
-    private SQLBinaryOpExpr buildNotMissingOp() {
-        SQLBinaryOpExpr binaryOpExpr = new SQLBinaryOpExpr();
-        binaryOpExpr.setLeft(new SQLIdentifierExpr(from.getAlias()));
-        binaryOpExpr.setRight(new SQLIdentifierExpr("MISSING"));
-        binaryOpExpr.setOperator(SQLBinaryOperator.IsNot);
+  private SQLBinaryOpExpr buildNotMissingOp() {
+    SQLBinaryOpExpr binaryOpExpr = new SQLBinaryOpExpr();
+    binaryOpExpr.setLeft(new SQLIdentifierExpr(from.getAlias()));
+    binaryOpExpr.setRight(new SQLIdentifierExpr("MISSING"));
+    binaryOpExpr.setOperator(SQLBinaryOperator.IsNot);
 
-        return binaryOpExpr;
-    }
+    return binaryOpExpr;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/Rewriter.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/Rewriter.java
index 5ca0a38d7f..a23eaaf514 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/Rewriter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/Rewriter.java
@@ -3,28 +3,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.subquery.rewriter;
 
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
 
-/**
- * Interface of SQL Rewriter
- */
+/** Interface of SQL Rewriter */
 public interface Rewriter {
 
-    /**
-     * Whether the Rewriter can rewrite the SQL?
-     */
-    boolean canRewrite();
+  /** Whether the Rewriter can rewrite the SQL? */
+  boolean canRewrite();
 
-    /**
-     * Rewrite the SQL.
-     */
-    void rewrite();
+  /** Rewrite the SQL. */
+  void rewrite();
 
-    default SQLBinaryOpExpr and(SQLBinaryOpExpr left, SQLBinaryOpExpr right) {
-        return new SQLBinaryOpExpr(left, SQLBinaryOperator.BooleanAnd, right);
-    }
+  default SQLBinaryOpExpr and(SQLBinaryOpExpr left, SQLBinaryOpExpr right) {
+    return new SQLBinaryOpExpr(left, SQLBinaryOperator.BooleanAnd, right);
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/RewriterFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/RewriterFactory.java
index ace333e981..6e6656ec37 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/RewriterFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/RewriterFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.subquery.rewriter;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -13,32 +12,26 @@
 import java.util.List;
 import org.opensearch.sql.legacy.rewriter.subquery.RewriterContext;
 
-/**
- * Factory for generating the {@link Rewriter}.
- */
+/** Factory for generating the {@link Rewriter}. */
 public class RewriterFactory {
 
-    /**
-     * Create list of {@link Rewriter}.
-     */
-    public static List<Rewriter> createRewriterList(SQLExpr expr, RewriterContext bb) {
-        if (expr instanceof SQLExistsExpr) {
-            return existRewriterList((SQLExistsExpr) expr, bb);
-        } else if (expr instanceof SQLInSubQueryExpr) {
-            return inRewriterList((SQLInSubQueryExpr) expr, bb);
-        }
-        return ImmutableList.of();
+  /** Create list of {@link Rewriter}. */
+  public static List<Rewriter> createRewriterList(SQLExpr expr, RewriterContext bb) {
+    if (expr instanceof SQLExistsExpr) {
+      return existRewriterList((SQLExistsExpr) expr, bb);
+    } else if (expr instanceof SQLInSubQueryExpr) {
+      return inRewriterList((SQLInSubQueryExpr) expr, bb);
     }
+    return ImmutableList.of();
+  }
 
-    private static List<Rewriter> existRewriterList(SQLExistsExpr existsExpr, RewriterContext bb) {
-        return new ImmutableList.Builder<Rewriter>()
-                .add(new NestedExistsRewriter(existsExpr, bb))
-                .build();
-    }
+  private static List<Rewriter> existRewriterList(SQLExistsExpr existsExpr, RewriterContext bb) {
+    return new ImmutableList.Builder<Rewriter>()
+        .add(new NestedExistsRewriter(existsExpr, bb))
+        .build();
+  }
 
-    private static List<Rewriter> inRewriterList(SQLInSubQueryExpr inExpr, RewriterContext bb) {
-        return new ImmutableList.Builder<Rewriter>()
-                .add(new InRewriter(inExpr, bb))
-                .build();
-    }
+  private static List<Rewriter> inRewriterList(SQLInSubQueryExpr inExpr, RewriterContext bb) {
+    return new ImmutableList.Builder<Rewriter>().add(new InRewriter(inExpr, bb)).build();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/SubqueryAliasRewriter.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/SubqueryAliasRewriter.java
index e47027f024..cc9ba1e37b 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/SubqueryAliasRewriter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/rewriter/SubqueryAliasRewriter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.subquery.rewriter;
 
 import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
@@ -20,147 +19,146 @@
 import java.util.Deque;
 
 /**
- * Add the alias for identifier the subquery query.
- * Use the table alias if it already has one, Auto generate if it doesn't has one.
- * <p>
- * The following table demonstrate how the rewriter works with scope and query.
+ * Add the alias for identifier the subquery query. Use the table alias if it already has one, Auto
+ * generate if it doesn't has one.
+ *
+ * <p>The following table demonstrate how the rewriter works with scope and query.
  * +-----------------------+-------------+-----------------------------------------------------------------------------------------------------+
- * | Rewrite               | TableScope  | Query                                                                                               |
+ * | Rewrite | TableScope | Query |
  * +-----------------------+-------------+-----------------------------------------------------------------------------------------------------+
- * | (Start)               | ()          | SELECT * FROM TbA WHERE a IN (SELECT b FROM TbB) and c > 10                                         |
+ * | (Start) | () | SELECT * FROM TbA WHERE a IN (SELECT b FROM TbB) and c > 10 |
  * +-----------------------+-------------+-----------------------------------------------------------------------------------------------------+
- * | MySqlSelectQueryBlock | (TbA,TbA_0) | SELECT * FROM TbA as TbA_0 WHERE a IN (SELECT b FROM TbB) and c > 10                                |
+ * | MySqlSelectQueryBlock | (TbA,TbA_0) | SELECT * FROM TbA as TbA_0 WHERE a IN (SELECT b FROM TbB)
+ * and c > 10 |
  * +-----------------------+-------------+-----------------------------------------------------------------------------------------------------+
- * | Identifier in Select  | (TbA,TbA_0) | SELECT TbA.* FROM TbA as TbA_0 WHERE a IN (SELECT b FROM TbB) and c > 10                            |
+ * | Identifier in Select | (TbA,TbA_0) | SELECT TbA.* FROM TbA as TbA_0 WHERE a IN (SELECT b FROM
+ * TbB) and c > 10 |
  * +-----------------------+-------------+-----------------------------------------------------------------------------------------------------+
- * | Identifier in Where   | (TbA,TbA_0) | SELECT TbA.* FROM TbA as TbA_0 WHERE TbA_0.a IN (SELECT b FROM TbB) and TbA_0.c > 10                |
+ * | Identifier in Where | (TbA,TbA_0) | SELECT TbA.* FROM TbA as TbA_0 WHERE TbA_0.a IN (SELECT b
+ * FROM TbB) and TbA_0.c > 10 |
  * +-----------------------+-------------+-----------------------------------------------------------------------------------------------------+
- * | MySqlSelectQueryBlock | (TbA,TbA_0) | SELECT TbA.* FROM TbA as TbA_0 WHERE TbA_0.a IN (SELECT b FROM TbB as TbB_0) and TbA_0.c > 10       |
- * |                       | (TbB,TbB_0) |                                                                                                     |
+ * | MySqlSelectQueryBlock | (TbA,TbA_0) | SELECT TbA.* FROM TbA as TbA_0 WHERE TbA_0.a IN (SELECT b
+ * FROM TbB as TbB_0) and TbA_0.c > 10 | | | (TbB,TbB_0) | |
  * +-----------------------+-------------+-----------------------------------------------------------------------------------------------------+
- * | Identifier in Select  | (TbA,TbA_0) | SELECT TbA.* FROM TbA as TbA_0 WHERE TbA_0.a IN (SELECT TbB_0.b FROM TbB as TbB_0) and TbA_0.c > 10 |
- * |                       | (TbB,TbB_0) |                                                                                                     |
+ * | Identifier in Select | (TbA,TbA_0) | SELECT TbA.* FROM TbA as TbA_0 WHERE TbA_0.a IN (SELECT
+ * TbB_0.b FROM TbB as TbB_0) and TbA_0.c > 10 | | | (TbB,TbB_0) | |
  * +-----------------------+-------------+-----------------------------------------------------------------------------------------------------+
  */
 public class SubqueryAliasRewriter extends MySqlASTVisitorAdapter {
-    private final Deque<Table> tableScope = new ArrayDeque<>();
-    private int aliasSuffix = 0;
-    private static final String DOT = ".";
-
-    @Override
-    public boolean visit(MySqlSelectQueryBlock query) {
-        SQLTableSource from = query.getFrom();
-        if (from instanceof SQLExprTableSource) {
-            SQLExprTableSource expr = (SQLExprTableSource) from;
-            String tableName = expr.getExpr().toString().replaceAll(" ", "");
-
-            if (expr.getAlias() != null) {
-                tableScope.push(new Table(tableName, expr.getAlias()));
-            } else {
-                expr.setAlias(createAlias(tableName));
-                tableScope.push(new Table(tableName, expr.getAlias()));
-            }
-        }
-        return true;
+  private final Deque<Table> tableScope = new ArrayDeque<>();
+  private int aliasSuffix = 0;
+  private static final String DOT = ".";
+
+  @Override
+  public boolean visit(MySqlSelectQueryBlock query) {
+    SQLTableSource from = query.getFrom();
+    if (from instanceof SQLExprTableSource) {
+      SQLExprTableSource expr = (SQLExprTableSource) from;
+      String tableName = expr.getExpr().toString().replaceAll(" ", "");
+
+      if (expr.getAlias() != null) {
+        tableScope.push(new Table(tableName, expr.getAlias()));
+      } else {
+        expr.setAlias(createAlias(tableName));
+        tableScope.push(new Table(tableName, expr.getAlias()));
+      }
     }
+    return true;
+  }
 
-    @Override
-    public boolean visit(SQLIdentifierExpr expr) {
-        if (!tableScope.isEmpty() && (inSelect(expr) || inWhere(expr) || inSubquery(expr))) {
-            rewrite(tableScope.peek(), expr);
-        }
-        return true;
+  @Override
+  public boolean visit(SQLIdentifierExpr expr) {
+    if (!tableScope.isEmpty() && (inSelect(expr) || inWhere(expr) || inSubquery(expr))) {
+      rewrite(tableScope.peek(), expr);
     }
+    return true;
+  }
 
-    @Override
-    public boolean visit(SQLAllColumnExpr expr) {
-        if (!tableScope.isEmpty() && inSelect(expr)) {
-            ((SQLSelectItem) expr.getParent()).setExpr(createIdentifierExpr(tableScope.peek()));
-        }
-        return true;
+  @Override
+  public boolean visit(SQLAllColumnExpr expr) {
+    if (!tableScope.isEmpty() && inSelect(expr)) {
+      ((SQLSelectItem) expr.getParent()).setExpr(createIdentifierExpr(tableScope.peek()));
     }
-
-    private boolean inSelect(SQLIdentifierExpr expr) {
-        return expr.getParent() instanceof SQLSelectItem;
+    return true;
+  }
+
+  private boolean inSelect(SQLIdentifierExpr expr) {
+    return expr.getParent() instanceof SQLSelectItem;
+  }
+
+  private boolean inSelect(SQLAllColumnExpr expr) {
+    return expr.getParent() instanceof SQLSelectItem;
+  }
+
+  private boolean inWhere(SQLIdentifierExpr expr) {
+    return expr.getParent() instanceof SQLBinaryOpExpr
+        && !isESTable((SQLBinaryOpExpr) expr.getParent());
+  }
+
+  /**
+   * The table name in OpenSearch could be "index/type". Which represent as SQLBinaryOpExpr in AST.
+   */
+  private boolean isESTable(SQLBinaryOpExpr expr) {
+    return expr.getOperator() == SQLBinaryOperator.Divide
+        && expr.getParent() instanceof SQLExprTableSource;
+  }
+
+  private boolean inSubquery(SQLIdentifierExpr expr) {
+    return expr.getParent() instanceof SQLInSubQueryExpr;
+  }
+
+  @Override
+  public void endVisit(MySqlSelectQueryBlock query) {
+    if (!tableScope.isEmpty()) {
+      tableScope.pop();
     }
+  }
 
-    private boolean inSelect(SQLAllColumnExpr expr) {
-        return expr.getParent() instanceof SQLSelectItem;
-    }
+  private void rewrite(Table table, SQLIdentifierExpr expr) {
+    String tableAlias = table.getAlias();
+    String tableName = table.getName();
 
-    private boolean inWhere(SQLIdentifierExpr expr) {
-        return expr.getParent() instanceof SQLBinaryOpExpr && !isESTable((SQLBinaryOpExpr) expr.getParent());
+    String exprName = expr.getName();
+    if (exprName.startsWith(tableName + DOT) || exprName.startsWith(tableAlias + DOT)) {
+      expr.setName(exprName.replace(tableName + DOT, tableAlias + DOT));
+    } else {
+      expr.setName(String.join(DOT, tableAlias, exprName));
     }
+  }
 
-    /**
-     * The table name in OpenSearch could be "index/type". Which represent as SQLBinaryOpExpr in AST.
-     */
-    private boolean isESTable(SQLBinaryOpExpr expr) {
-        return expr.getOperator() == SQLBinaryOperator.Divide && expr.getParent() instanceof SQLExprTableSource;
-    }
+  private SQLIdentifierExpr createIdentifierExpr(Table table) {
+    String newIdentifierName = String.join(DOT, table.getAlias(), "*");
+    return new SQLIdentifierExpr(newIdentifierName);
+  }
 
-    private boolean inSubquery(SQLIdentifierExpr expr) {
-        return expr.getParent() instanceof SQLInSubQueryExpr;
-    }
+  private String createAlias(String alias) {
+    return String.format("%s_%d", alias, next());
+  }
 
-    @Override
-    public void endVisit(MySqlSelectQueryBlock query) {
-        if (!tableScope.isEmpty()) {
-            tableScope.pop();
-        }
-    }
+  private Integer next() {
+    return aliasSuffix++;
+  }
 
-    private void rewrite(Table table, SQLIdentifierExpr expr) {
-        String tableAlias = table.getAlias();
-        String tableName = table.getName();
+  /** Table Bean. */
+  private static class Table {
 
-        String exprName = expr.getName();
-        if (exprName.startsWith(tableName + DOT) || exprName.startsWith(tableAlias + DOT)) {
-            expr.setName(exprName.replace(tableName + DOT, tableAlias + DOT));
-        } else {
-            expr.setName(String.join(DOT, tableAlias, exprName));
-        }
+    public String getName() {
+      return name;
     }
 
-    private SQLIdentifierExpr createIdentifierExpr(Table table) {
-        String newIdentifierName = String.join(DOT, table.getAlias(), "*");
-        return new SQLIdentifierExpr(newIdentifierName);
+    public String getAlias() {
+      return alias;
     }
 
-    private String createAlias(String alias) {
-        return String.format("%s_%d", alias, next());
-    }
+    /** Table Name. */
+    private String name;
 
-    private Integer next() {
-        return aliasSuffix++;
-    }
+    /** Table Alias. */
+    private String alias;
 
-    /**
-     * Table Bean.
-     */
-    private static class Table {
-
-        public String getName() {
-            return name;
-        }
-
-        public String getAlias() {
-            return alias;
-        }
-
-        /**
-         * Table Name.
-         */
-        private String name;
-
-        /**
-         * Table Alias.
-         */
-        private String alias;
-
-        Table(String name, String alias) {
-            this.name = name;
-            this.alias = alias;
-        }
+    Table(String name, String alias) {
+      this.name = name;
+      this.alias = alias;
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/utils/FindSubQuery.java b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/utils/FindSubQuery.java
index ec35151e4d..de6694d90d 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/utils/FindSubQuery.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/rewriter/subquery/utils/FindSubQuery.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.subquery.utils;
 
 import com.alibaba.druid.sql.ast.expr.SQLExistsExpr;
@@ -12,43 +11,39 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Visitor which try to find the SubQuery.
- */
+/** Visitor which try to find the SubQuery. */
 public class FindSubQuery extends MySqlASTVisitorAdapter {
-    private final List<SQLInSubQueryExpr> sqlInSubQueryExprs = new ArrayList<>();
-    private final List<SQLExistsExpr> sqlExistsExprs = new ArrayList<>();
-    private boolean continueVisit = true;
-
-    public FindSubQuery continueVisitWhenFound(boolean continueVisit) {
-        this.continueVisit = continueVisit;
-        return this;
-    }
-
-    /**
-     * Return true if has SubQuery.
-     */
-    public boolean hasSubQuery() {
-        return !sqlInSubQueryExprs.isEmpty() || !sqlExistsExprs.isEmpty();
-    }
-
-    @Override
-    public boolean visit(SQLInSubQueryExpr query) {
-        sqlInSubQueryExprs.add(query);
-        return continueVisit;
-    }
-
-    @Override
-    public boolean visit(SQLExistsExpr query) {
-        sqlExistsExprs.add(query);
-        return continueVisit;
-    }
-
-    public List<SQLInSubQueryExpr> getSqlInSubQueryExprs() {
-        return sqlInSubQueryExprs;
-    }
-
-    public List<SQLExistsExpr> getSqlExistsExprs() {
-        return sqlExistsExprs;
-    }
+  private final List<SQLInSubQueryExpr> sqlInSubQueryExprs = new ArrayList<>();
+  private final List<SQLExistsExpr> sqlExistsExprs = new ArrayList<>();
+  private boolean continueVisit = true;
+
+  public FindSubQuery continueVisitWhenFound(boolean continueVisit) {
+    this.continueVisit = continueVisit;
+    return this;
+  }
+
+  /** Return true if has SubQuery. */
+  public boolean hasSubQuery() {
+    return !sqlInSubQueryExprs.isEmpty() || !sqlExistsExprs.isEmpty();
+  }
+
+  @Override
+  public boolean visit(SQLInSubQueryExpr query) {
+    sqlInSubQueryExprs.add(query);
+    return continueVisit;
+  }
+
+  @Override
+  public boolean visit(SQLExistsExpr query) {
+    sqlExistsExprs.add(query);
+    return continueVisit;
+  }
+
+  public List<SQLInSubQueryExpr> getSqlInSubQueryExprs() {
+    return sqlInSubQueryExprs;
+  }
+
+  public List<SQLExistsExpr> getSqlExistsExprs() {
+    return sqlExistsExprs;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/BoundingBoxFilterParams.java b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/BoundingBoxFilterParams.java
index df9f4c88b2..fb62f60ae7 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/BoundingBoxFilterParams.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/BoundingBoxFilterParams.java
@@ -3,26 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.spatial;
 
-/**
- * Created by Eliran on 1/8/2015.
- */
+/** Created by Eliran on 1/8/2015. */
 public class BoundingBoxFilterParams {
-    private Point topLeft;
-    private Point bottomRight;
+  private Point topLeft;
+  private Point bottomRight;
 
-    public BoundingBoxFilterParams(Point topLeft, Point bottomRight) {
-        this.topLeft = topLeft;
-        this.bottomRight = bottomRight;
-    }
+  public BoundingBoxFilterParams(Point topLeft, Point bottomRight) {
+    this.topLeft = topLeft;
+    this.bottomRight = bottomRight;
+  }
 
-    public Point getTopLeft() {
-        return topLeft;
-    }
+  public Point getTopLeft() {
+    return topLeft;
+  }
 
-    public Point getBottomRight() {
-        return bottomRight;
-    }
+  public Point getBottomRight() {
+    return bottomRight;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/CellFilterParams.java b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/CellFilterParams.java
index 93caa66906..6c50c17467 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/CellFilterParams.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/CellFilterParams.java
@@ -3,37 +3,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.spatial;
 
-/**
- * Created by Eliran on 15/8/2015.
- */
+/** Created by Eliran on 15/8/2015. */
 public class CellFilterParams {
-    private Point geohashPoint;
-    private int precision;
-    private boolean neighbors;
-
-    public CellFilterParams(Point geohashPoint, int precision, boolean neighbors) {
-        this.geohashPoint = geohashPoint;
-        this.precision = precision;
-        this.neighbors = neighbors;
-    }
-
-    public CellFilterParams(Point geohashPoint, int precision) {
-        this(geohashPoint, precision, false);
-    }
-
-    public Point getGeohashPoint() {
-        return geohashPoint;
-    }
-
-    public int getPrecision() {
-        return precision;
-    }
-
-    public boolean isNeighbors() {
-        return neighbors;
-    }
+  private Point geohashPoint;
+  private int precision;
+  private boolean neighbors;
+
+  public CellFilterParams(Point geohashPoint, int precision, boolean neighbors) {
+    this.geohashPoint = geohashPoint;
+    this.precision = precision;
+    this.neighbors = neighbors;
+  }
+
+  public CellFilterParams(Point geohashPoint, int precision) {
+    this(geohashPoint, precision, false);
+  }
+
+  public Point getGeohashPoint() {
+    return geohashPoint;
+  }
+
+  public int getPrecision() {
+    return precision;
+  }
+
+  public boolean isNeighbors() {
+    return neighbors;
+  }
 }
-
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/DistanceFilterParams.java b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/DistanceFilterParams.java
index 1141da08ca..8c419de58d 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/DistanceFilterParams.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/DistanceFilterParams.java
@@ -3,26 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.spatial;
 
-/**
- * Created by Eliran on 1/8/2015.
- */
+/** Created by Eliran on 1/8/2015. */
 public class DistanceFilterParams {
-    private String distance;
-    private Point from;
+  private String distance;
+  private Point from;
 
-    public DistanceFilterParams(String distance, Point from) {
-        this.distance = distance;
-        this.from = from;
-    }
+  public DistanceFilterParams(String distance, Point from) {
+    this.distance = distance;
+    this.from = from;
+  }
 
-    public String getDistance() {
-        return distance;
-    }
+  public String getDistance() {
+    return distance;
+  }
 
-    public Point getFrom() {
-        return from;
-    }
+  public Point getFrom() {
+    return from;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/Point.java b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/Point.java
index c449ef1364..f3f8639a1c 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/Point.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/Point.java
@@ -3,26 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.spatial;
 
-/**
- * Created by Eliran on 1/8/2015.
- */
+/** Created by Eliran on 1/8/2015. */
 public class Point {
-    private double lon;
-    private double lat;
+  private double lon;
+  private double lat;
 
-    public Point(double lon, double lat) {
-        this.lon = lon;
-        this.lat = lat;
-    }
+  public Point(double lon, double lat) {
+    this.lon = lon;
+    this.lat = lat;
+  }
 
-    public double getLon() {
-        return lon;
-    }
+  public double getLon() {
+    return lon;
+  }
 
-    public double getLat() {
-        return lat;
-    }
+  public double getLat() {
+    return lat;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/PolygonFilterParams.java b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/PolygonFilterParams.java
index 0d0592f519..1aeddb24a4 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/PolygonFilterParams.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/PolygonFilterParams.java
@@ -3,22 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.spatial;
 
 import java.util.List;
 
-/**
- * Created by Eliran on 15/8/2015.
- */
+/** Created by Eliran on 15/8/2015. */
 public class PolygonFilterParams {
-    private List<Point> polygon;
+  private List<Point> polygon;
 
-    public PolygonFilterParams(List<Point> polygon) {
-        this.polygon = polygon;
-    }
+  public PolygonFilterParams(List<Point> polygon) {
+    this.polygon = polygon;
+  }
 
-    public List<Point> getPolygon() {
-        return polygon;
-    }
+  public List<Point> getPolygon() {
+    return polygon;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/RangeDistanceFilterParams.java b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/RangeDistanceFilterParams.java
index 91962332bf..0bdb01c3ce 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/RangeDistanceFilterParams.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/RangeDistanceFilterParams.java
@@ -3,25 +3,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.spatial;
 
-/**
- * Created by Eliran on 15/8/2015.
- */
+/** Created by Eliran on 15/8/2015. */
 public class RangeDistanceFilterParams extends DistanceFilterParams {
-    private String distanceTo;
+  private String distanceTo;
 
-    public RangeDistanceFilterParams(String distanceFrom, String distanceTo, Point from) {
-        super(distanceFrom, from);
-        this.distanceTo = distanceTo;
-    }
+  public RangeDistanceFilterParams(String distanceFrom, String distanceTo, Point from) {
+    super(distanceFrom, from);
+    this.distanceTo = distanceTo;
+  }
 
-    public String getDistanceTo() {
-        return distanceTo;
-    }
+  public String getDistanceTo() {
+    return distanceTo;
+  }
 
-    public String getDistanceFrom() {
-        return this.getDistance();
-    }
+  public String getDistanceFrom() {
+    return this.getDistance();
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/SpatialParamsFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/SpatialParamsFactory.java
index 7b99d52e68..5e1102994e 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/SpatialParamsFactory.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/SpatialParamsFactory.java
@@ -3,103 +3,105 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.spatial;
 
-
 import com.alibaba.druid.sql.ast.SQLExpr;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-/**
- * Created by Eliran on 1/8/2015.
- */
+/** Created by Eliran on 1/8/2015. */
 public class SpatialParamsFactory {
-    public static Set<String> allowedMethods;
+  public static Set<String> allowedMethods;
 
-    static {
-        allowedMethods = new HashSet<>();
-        allowedMethods.add("GEO_INTERSECTS");
-        allowedMethods.add("GEO_BOUNDING_BOX");
-        allowedMethods.add("GEO_DISTANCE");
-        allowedMethods.add("GEO_DISTANCE_RANGE");
-        allowedMethods.add("GEO_POLYGON");
-        allowedMethods.add("GEO_CELL");
-    }
+  static {
+    allowedMethods = new HashSet<>();
+    allowedMethods.add("GEO_INTERSECTS");
+    allowedMethods.add("GEO_BOUNDING_BOX");
+    allowedMethods.add("GEO_DISTANCE");
+    allowedMethods.add("GEO_DISTANCE_RANGE");
+    allowedMethods.add("GEO_POLYGON");
+    allowedMethods.add("GEO_CELL");
+  }
 
-    public static boolean isAllowedMethod(String name) {
-        return allowedMethods.contains(name);
-    }
+  public static boolean isAllowedMethod(String name) {
+    return allowedMethods.contains(name);
+  }
 
-    public static Object generateSpatialParamsObject(String methodName, List<SQLExpr> params) {
-        switch (methodName) {
-            case "GEO_INTERSECTS":
-                if (params.size() != 2) {
-                    throw new RuntimeException("GEO_INTERSECTS should have exactly 2 parameters : (fieldName,'WKT') ");
-                }
-                return params.get(1).toString();
-            case "GEO_BOUNDING_BOX":
-                if (params.size() != 5) {
-                    throw new RuntimeException("GEO_BOUNDING_BOX should have exactly 5 parameters : "
-                            + "(fieldName,topLeftLon,topLeftLan,bottomRightLon,bottomRightLan) ");
-                }
-                double topLeftLon = Double.parseDouble(params.get(1).toString());
-                double topLeftLat = Double.parseDouble(params.get(2).toString());
-                double bottomRightLon = Double.parseDouble(params.get(3).toString());
-                double bottomRightLat = Double.parseDouble(params.get(4).toString());
-                return new BoundingBoxFilterParams(new Point(topLeftLon, topLeftLat),
-                        new Point(bottomRightLon, bottomRightLat));
-            case "GEO_DISTANCE":
-                if (params.size() != 4) {
-                    throw new RuntimeException("GEO_DISTANCE should have exactly 4 parameters : "
-                            + "(fieldName,distance,fromLon,fromLat) ");
-                }
-                String distance = params.get(1).toString();
-                double lon = Double.parseDouble(params.get(2).toString());
-                double lat = Double.parseDouble(params.get(3).toString());
-                return new DistanceFilterParams(distance, new Point(lon, lat));
-            case "GEO_DISTANCE_RANGE":
-                if (params.size() != 5) {
-                    throw new RuntimeException("GEO_DISTANCE should have exactly 5 parameters : "
-                            + "(fieldName,distanceFrom,distanceTo,fromLon,fromLat) ");
-                }
-                String distanceFrom = params.get(1).toString();
-                String distanceTo = params.get(2).toString();
-                lon = Double.parseDouble(params.get(3).toString());
-                lat = Double.parseDouble(params.get(4).toString());
-                return new RangeDistanceFilterParams(distanceFrom, distanceTo, new Point(lon, lat));
-            case "GEO_POLYGON":
-                if (params.size() % 2 == 0 || params.size() <= 5) {
-                    throw new RuntimeException("GEO_POLYGON should have odd num of parameters and > 5 : "
-                            + "(fieldName,lon1,lat1,lon2,lat2,lon3,lat3,...) ");
-                }
-                int numberOfPoints = (params.size() - 1) / 2;
-                List<Point> points = new LinkedList<>();
-                for (int i = 0; i < numberOfPoints; i++) {
-                    int currentPointLocation = 1 + i * 2;
-                    lon = Double.parseDouble(params.get(currentPointLocation).toString());
-                    lat = Double.parseDouble(params.get(currentPointLocation + 1).toString());
-                    points.add(new Point(lon, lat));
-                }
-                return new PolygonFilterParams(points);
-            case "GEO_CELL":
-                if (params.size() < 4 || params.size() > 5) {
-                    throw new RuntimeException("GEO_CELL should have 4 or 5 params "
-                            + "(fieldName,lon,lat,precision,neighbors(optional)) ");
-                }
-                lon = Double.parseDouble(params.get(1).toString());
-                lat = Double.parseDouble(params.get(2).toString());
-                Point geoHashPoint = new Point(lon, lat);
-                int precision = Integer.parseInt(params.get(3).toString());
-                if (params.size() == 4) {
-                    return new CellFilterParams(geoHashPoint, precision);
-                }
-                boolean neighbors = Boolean.parseBoolean(params.get(4).toString());
-                return new CellFilterParams(geoHashPoint, precision, neighbors);
-            default:
-                throw new RuntimeException(String.format("Unknown method name: %s", methodName));
+  public static Object generateSpatialParamsObject(String methodName, List<SQLExpr> params) {
+    switch (methodName) {
+      case "GEO_INTERSECTS":
+        if (params.size() != 2) {
+          throw new RuntimeException(
+              "GEO_INTERSECTS should have exactly 2 parameters : (fieldName,'WKT') ");
+        }
+        return params.get(1).toString();
+      case "GEO_BOUNDING_BOX":
+        if (params.size() != 5) {
+          throw new RuntimeException(
+              "GEO_BOUNDING_BOX should have exactly 5 parameters : "
+                  + "(fieldName,topLeftLon,topLeftLan,bottomRightLon,bottomRightLan) ");
+        }
+        double topLeftLon = Double.parseDouble(params.get(1).toString());
+        double topLeftLat = Double.parseDouble(params.get(2).toString());
+        double bottomRightLon = Double.parseDouble(params.get(3).toString());
+        double bottomRightLat = Double.parseDouble(params.get(4).toString());
+        return new BoundingBoxFilterParams(
+            new Point(topLeftLon, topLeftLat), new Point(bottomRightLon, bottomRightLat));
+      case "GEO_DISTANCE":
+        if (params.size() != 4) {
+          throw new RuntimeException(
+              "GEO_DISTANCE should have exactly 4 parameters : "
+                  + "(fieldName,distance,fromLon,fromLat) ");
+        }
+        String distance = params.get(1).toString();
+        double lon = Double.parseDouble(params.get(2).toString());
+        double lat = Double.parseDouble(params.get(3).toString());
+        return new DistanceFilterParams(distance, new Point(lon, lat));
+      case "GEO_DISTANCE_RANGE":
+        if (params.size() != 5) {
+          throw new RuntimeException(
+              "GEO_DISTANCE should have exactly 5 parameters : "
+                  + "(fieldName,distanceFrom,distanceTo,fromLon,fromLat) ");
+        }
+        String distanceFrom = params.get(1).toString();
+        String distanceTo = params.get(2).toString();
+        lon = Double.parseDouble(params.get(3).toString());
+        lat = Double.parseDouble(params.get(4).toString());
+        return new RangeDistanceFilterParams(distanceFrom, distanceTo, new Point(lon, lat));
+      case "GEO_POLYGON":
+        if (params.size() % 2 == 0 || params.size() <= 5) {
+          throw new RuntimeException(
+              "GEO_POLYGON should have odd num of parameters and > 5 : "
+                  + "(fieldName,lon1,lat1,lon2,lat2,lon3,lat3,...) ");
+        }
+        int numberOfPoints = (params.size() - 1) / 2;
+        List<Point> points = new LinkedList<>();
+        for (int i = 0; i < numberOfPoints; i++) {
+          int currentPointLocation = 1 + i * 2;
+          lon = Double.parseDouble(params.get(currentPointLocation).toString());
+          lat = Double.parseDouble(params.get(currentPointLocation + 1).toString());
+          points.add(new Point(lon, lat));
+        }
+        return new PolygonFilterParams(points);
+      case "GEO_CELL":
+        if (params.size() < 4 || params.size() > 5) {
+          throw new RuntimeException(
+              "GEO_CELL should have 4 or 5 params "
+                  + "(fieldName,lon,lat,precision,neighbors(optional)) ");
+        }
+        lon = Double.parseDouble(params.get(1).toString());
+        lat = Double.parseDouble(params.get(2).toString());
+        Point geoHashPoint = new Point(lon, lat);
+        int precision = Integer.parseInt(params.get(3).toString());
+        if (params.size() == 4) {
+          return new CellFilterParams(geoHashPoint, precision);
         }
+        boolean neighbors = Boolean.parseBoolean(params.get(4).toString());
+        return new CellFilterParams(geoHashPoint, precision, neighbors);
+      default:
+        throw new RuntimeException(String.format("Unknown method name: %s", methodName));
     }
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/WktToGeoJsonConverter.java b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/WktToGeoJsonConverter.java
index 99bc8f0742..13f51ed777 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/spatial/WktToGeoJsonConverter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/spatial/WktToGeoJsonConverter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.spatial;
 
 import com.google.common.base.Joiner;
@@ -11,160 +10,156 @@
 import java.util.List;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-/**
- * Created by Eliran on 4/8/2015.
- */
+/** Created by Eliran on 4/8/2015. */
 public class WktToGeoJsonConverter {
-    public static String toGeoJson(String wkt) {
-        wkt = wkt.toLowerCase();
-        int startOfCoordinates = wkt.indexOf("(");
-        if (startOfCoordinates == -1) {
-            throw new IllegalArgumentException(
-                    StringUtils.format("Failed to convert well-known-text [%s] to geometry type", wkt));
-        }
-
-        String wktType = wkt.substring(0, startOfCoordinates).trim();
-        wkt = wkt.substring(startOfCoordinates);
-
-        String type = "";
-        String coordinates = "";
-        switch (wktType) {
-            case ("point"):
-                type = "Point";
-                coordinates = pointCoordinatesFromWkt(wkt);
-                break;
-            case ("polygon"):
-                type = "Polygon";
-                coordinates = polygonCoordinatesFromWkt(wkt);
-                break;
-            case ("linestring"):
-                type = "LineString";
-                coordinates = lineStringCoordinatesFromWkt(wkt);
-                break;
-            case ("multipolygon"):
-                type = "MultiPolygon";
-                coordinates = multiPolygonCoordinatesFromWkt(wkt);
-                break;
-            case ("multipoint"):
-                type = "MultiPoint";
-                coordinates = multiPointCoordinatesFromWkt(wkt);
-                break;
-            case ("multilinestring"):
-                type = "MultiLineString";
-                coordinates = multiLineStringCoordinatesFromWkt(wkt);
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupported well-known-text type: " + wktType);
-
-        }
-
-        return buildGeoJson(type, coordinates);
+  public static String toGeoJson(String wkt) {
+    wkt = wkt.toLowerCase();
+    int startOfCoordinates = wkt.indexOf("(");
+    if (startOfCoordinates == -1) {
+      throw new IllegalArgumentException(
+          StringUtils.format("Failed to convert well-known-text [%s] to geometry type", wkt));
     }
 
-    //input: ((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))
-    private static String multiLineStringCoordinatesFromWkt(String wkt) {
-        wkt = removeBrackets(wkt, 1);
-        String lineStringsWithPipeSeparator = wkt.replaceAll("\\s*\\)\\s*,\\s*\\(", ")|(");
-        String[] lineStrings = lineStringsWithPipeSeparator.split("\\|");
-        String[] coordinates = new String[lineStrings.length];
-        for (int i = 0; i < lineStrings.length; i++) {
-            coordinates[i] = lineStringCoordinatesFromWkt(lineStrings[i]);
-        }
-        String multiLineStringCoordinates = Joiner.on(",").join(coordinates);
-        return String.format("[%s]", multiLineStringCoordinates);
-
+    String wktType = wkt.substring(0, startOfCoordinates).trim();
+    wkt = wkt.substring(startOfCoordinates);
+
+    String type = "";
+    String coordinates = "";
+    switch (wktType) {
+      case ("point"):
+        type = "Point";
+        coordinates = pointCoordinatesFromWkt(wkt);
+        break;
+      case ("polygon"):
+        type = "Polygon";
+        coordinates = polygonCoordinatesFromWkt(wkt);
+        break;
+      case ("linestring"):
+        type = "LineString";
+        coordinates = lineStringCoordinatesFromWkt(wkt);
+        break;
+      case ("multipolygon"):
+        type = "MultiPolygon";
+        coordinates = multiPolygonCoordinatesFromWkt(wkt);
+        break;
+      case ("multipoint"):
+        type = "MultiPoint";
+        coordinates = multiPointCoordinatesFromWkt(wkt);
+        break;
+      case ("multilinestring"):
+        type = "MultiLineString";
+        coordinates = multiLineStringCoordinatesFromWkt(wkt);
+        break;
+      default:
+        throw new IllegalArgumentException("Unsupported well-known-text type: " + wktType);
     }
 
-    //input v1:MULTIPOINT (10 40, 40 30, 20 20, 30 10)
-    //v2:MULTIPOINT ((10 40), (40 30), (20 20), (30 10))
-    private static String multiPointCoordinatesFromWkt(String wkt) {
-        wkt = removeBrackets(wkt, 1);
-        boolean isSecondVersionMultiPoint = wkt.contains("(");
-        String coordinates = "";
-        if (isSecondVersionMultiPoint) {
-            //(10 40), (40 30), (20 20)-> 10 40, 40 30, 20 20
-            wkt = wkt.replaceAll("\\(|\\)", "");
-        }
-        coordinates = getJsonArrayFromListOfPoints(wkt);
-        return coordinates;
+    return buildGeoJson(type, coordinates);
+  }
+
+  // input: ((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))
+  private static String multiLineStringCoordinatesFromWkt(String wkt) {
+    wkt = removeBrackets(wkt, 1);
+    String lineStringsWithPipeSeparator = wkt.replaceAll("\\s*\\)\\s*,\\s*\\(", ")|(");
+    String[] lineStrings = lineStringsWithPipeSeparator.split("\\|");
+    String[] coordinates = new String[lineStrings.length];
+    for (int i = 0; i < lineStrings.length; i++) {
+      coordinates[i] = lineStringCoordinatesFromWkt(lineStrings[i]);
     }
-
-    //input (((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))
-    private static String multiPolygonCoordinatesFromWkt(String wkt) {
-        wkt = removeBrackets(wkt, 1);
-        String polygonsWithPipeSeparator = wkt.replaceAll("\\s*\\)\\s*\\)\\s*,\\s*\\(\\s*\\(\\s*", "))|((");
-        String[] polygons = polygonsWithPipeSeparator.split("\\|");
-        String[] polygonsCoordinates = new String[polygons.length];
-        for (int i = 0; i < polygons.length; i++) {
-            polygonsCoordinates[i] = polygonCoordinatesFromWkt(polygons[i]);
-        }
-        String coordinates = Joiner.on(",").join(polygonsCoordinates);
-        return String.format("[%s]", coordinates);
+    String multiLineStringCoordinates = Joiner.on(",").join(coordinates);
+    return String.format("[%s]", multiLineStringCoordinates);
+  }
+
+  // input v1:MULTIPOINT (10 40, 40 30, 20 20, 30 10)
+  // v2:MULTIPOINT ((10 40), (40 30), (20 20), (30 10))
+  private static String multiPointCoordinatesFromWkt(String wkt) {
+    wkt = removeBrackets(wkt, 1);
+    boolean isSecondVersionMultiPoint = wkt.contains("(");
+    String coordinates = "";
+    if (isSecondVersionMultiPoint) {
+      // (10 40), (40 30), (20 20)-> 10 40, 40 30, 20 20
+      wkt = wkt.replaceAll("\\(|\\)", "");
     }
-
-    //input : (30 10, 10 30, 40 40)
-    private static String lineStringCoordinatesFromWkt(String wkt) {
-        wkt = removeBrackets(wkt, 1);
-        return getJsonArrayFromListOfPoints(wkt);
+    coordinates = getJsonArrayFromListOfPoints(wkt);
+    return coordinates;
+  }
+
+  // input (((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))
+  private static String multiPolygonCoordinatesFromWkt(String wkt) {
+    wkt = removeBrackets(wkt, 1);
+    String polygonsWithPipeSeparator =
+        wkt.replaceAll("\\s*\\)\\s*\\)\\s*,\\s*\\(\\s*\\(\\s*", "))|((");
+    String[] polygons = polygonsWithPipeSeparator.split("\\|");
+    String[] polygonsCoordinates = new String[polygons.length];
+    for (int i = 0; i < polygons.length; i++) {
+      polygonsCoordinates[i] = polygonCoordinatesFromWkt(polygons[i]);
     }
-
-    //input: v1:((35 10, 45 45, 15 40, 10 20, 35 10))
-    //v2:((35 10, 45 45, 15 40, 10 20, 35 10),(20 30, 35 35, 30 20, 20 30))
-    private static String polygonCoordinatesFromWkt(String wkt) {
-        wkt = removeBrackets(wkt, 2);
-        String coordinates;
-        boolean polygonContainsInnerHoles = wkt.contains("(");
-        if (polygonContainsInnerHoles) {
-            String[] polygons = wkt.split("\\s*\\)\\s*,\\s*\\(\\s*");
-            String[] coordinatesOfPolygons = new String[polygons.length];
-            for (int i = 0; i < polygons.length; i++) {
-                String polygonCoordinates = getJsonArrayFromListOfPoints(polygons[i]);
-                coordinatesOfPolygons[i] = polygonCoordinates;
-            }
-            coordinates = Joiner.on(",").join(coordinatesOfPolygons);
-        } else {
-            coordinates = getJsonArrayFromListOfPoints(wkt);
-        }
-        return String.format("[%s]", coordinates);
+    String coordinates = Joiner.on(",").join(polygonsCoordinates);
+    return String.format("[%s]", coordinates);
+  }
+
+  // input : (30 10, 10 30, 40 40)
+  private static String lineStringCoordinatesFromWkt(String wkt) {
+    wkt = removeBrackets(wkt, 1);
+    return getJsonArrayFromListOfPoints(wkt);
+  }
+
+  // input: v1:((35 10, 45 45, 15 40, 10 20, 35 10))
+  // v2:((35 10, 45 45, 15 40, 10 20, 35 10),(20 30, 35 35, 30 20, 20 30))
+  private static String polygonCoordinatesFromWkt(String wkt) {
+    wkt = removeBrackets(wkt, 2);
+    String coordinates;
+    boolean polygonContainsInnerHoles = wkt.contains("(");
+    if (polygonContainsInnerHoles) {
+      String[] polygons = wkt.split("\\s*\\)\\s*,\\s*\\(\\s*");
+      String[] coordinatesOfPolygons = new String[polygons.length];
+      for (int i = 0; i < polygons.length; i++) {
+        String polygonCoordinates = getJsonArrayFromListOfPoints(polygons[i]);
+        coordinatesOfPolygons[i] = polygonCoordinates;
+      }
+      coordinates = Joiner.on(",").join(coordinatesOfPolygons);
+    } else {
+      coordinates = getJsonArrayFromListOfPoints(wkt);
     }
-
-    private static String getJsonArrayFromListOfPoints(String pointsInWkt) {
-        String[] points = pointsInWkt.split(",");
-        List<String> coordinates = new ArrayList<>();
-        for (String point : points) {
-            coordinates.add(extractCoordinateFromPoint(point));
-        }
-
-        String joinedCoordinates = Joiner.on(",").join(coordinates);
-        return String.format("[%s]", joinedCoordinates);
+    return String.format("[%s]", coordinates);
+  }
+
+  private static String getJsonArrayFromListOfPoints(String pointsInWkt) {
+    String[] points = pointsInWkt.split(",");
+    List<String> coordinates = new ArrayList<>();
+    for (String point : points) {
+      coordinates.add(extractCoordinateFromPoint(point));
     }
 
-    private static String buildGeoJson(String type, String coordinates) {
-        return String.format("{\"type\":\"%s\", \"coordinates\": %s}", type, coordinates);
+    String joinedCoordinates = Joiner.on(",").join(coordinates);
+    return String.format("[%s]", joinedCoordinates);
+  }
+
+  private static String buildGeoJson(String type, String coordinates) {
+    return String.format("{\"type\":\"%s\", \"coordinates\": %s}", type, coordinates);
+  }
+
+  // input : (30 10)
+  public static String pointCoordinatesFromWkt(String wkt) {
+    wkt = removeBrackets(wkt, 1);
+    return extractCoordinateFromPoint(wkt);
+  }
+
+  private static String extractCoordinateFromPoint(String point) {
+    String pointPattern = "(\\s*)([0-9\\.-]+)(\\s*)([0-9\\.-]+)(\\s*)";
+    return point.replaceAll(pointPattern, "[$2,$4]");
+  }
+
+  private static String removeBrackets(String wkt, int num) {
+    String result = wkt;
+    for (int i = 0; i < num; i++) {
+      int lastClosingBrackets = result.lastIndexOf(")");
+      int firstOpenBrackets = result.indexOf("(");
+      if (lastClosingBrackets == -1 || firstOpenBrackets == -1) {
+        throw new IllegalArgumentException("Illegal syntax: " + wkt);
+      }
+      result = result.substring(firstOpenBrackets + 1, lastClosingBrackets);
     }
-
-    //input : (30 10)
-    public static String pointCoordinatesFromWkt(String wkt) {
-        wkt = removeBrackets(wkt, 1);
-        return extractCoordinateFromPoint(wkt);
-    }
-
-    private static String extractCoordinateFromPoint(String point) {
-        String pointPattern = "(\\s*)([0-9\\.-]+)(\\s*)([0-9\\.-]+)(\\s*)";
-        return point.replaceAll(pointPattern, "[$2,$4]");
-    }
-
-    private static String removeBrackets(String wkt, int num) {
-        String result = wkt;
-        for (int i = 0; i < num; i++) {
-            int lastClosingBrackets = result.lastIndexOf(")");
-            int firstOpenBrackets = result.indexOf("(");
-            if (lastClosingBrackets == -1 || firstOpenBrackets == -1) {
-                throw new IllegalArgumentException("Illegal syntax: " + wkt);
-            }
-            result = result.substring(firstOpenBrackets + 1, lastClosingBrackets);
-        }
-        return result;
-    }
-
+    return result;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/utils/JsonPrettyFormatter.java b/legacy/src/main/java/org/opensearch/sql/legacy/utils/JsonPrettyFormatter.java
index b94ef06c25..26f17feeb6 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/utils/JsonPrettyFormatter.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/utils/JsonPrettyFormatter.java
@@ -3,41 +3,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.utils;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import java.io.IOException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
 
-/**
- * Utility Class for formatting Json string pretty.
- */
+/** Utility Class for formatting Json string pretty. */
 public class JsonPrettyFormatter {
 
-    /**
-     * @param jsonString Json string without/with pretty format
-     * @return A standard and pretty formatted json string
-     * @throws IOException
-     */
-    public static String format(String jsonString) throws IOException {
-        //turn _explain response into pretty formatted Json
-        XContentBuilder contentBuilder = XContentFactory.jsonBuilder().prettyPrint();
-        try (
-                XContentParser contentParser = XContentFactory.xContent(XContentType.JSON)
-                        .createParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, jsonString)
-        ){
-            contentBuilder.copyCurrentStructure(contentParser);
-        }
-        return Strings.toString(contentBuilder);
+  /**
+   * @param jsonString Json string without/with pretty format
+   * @return A standard and pretty formatted json string
+   * @throws IOException
+   */
+  public static String format(String jsonString) throws IOException {
+    // turn _explain response into pretty formatted Json
+    XContentBuilder contentBuilder = XContentFactory.jsonBuilder().prettyPrint();
+    try (XContentParser contentParser =
+        new JsonXContentParser(
+            NamedXContentRegistry.EMPTY,
+            LoggingDeprecationHandler.INSTANCE,
+            new JsonFactory().createParser(jsonString))) {
+      contentBuilder.copyCurrentStructure(contentParser);
     }
+    return contentBuilder.toString();
+  }
 
-    private JsonPrettyFormatter() {
-        throw new AssertionError(getClass().getCanonicalName() + " is a utility class and must not be initialized");
-    }
+  private JsonPrettyFormatter() {
+    throw new AssertionError(
+        getClass().getCanonicalName() + " is a utility class and must not be initialized");
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/utils/MetricUtils.java b/legacy/src/main/java/org/opensearch/sql/legacy/utils/MetricUtils.java
new file mode 100644
index 0000000000..b7a56bde4f
--- /dev/null
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/utils/MetricUtils.java
@@ -0,0 +1,22 @@
+package org.opensearch.sql.legacy.utils;
+
+import lombok.experimental.UtilityClass;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.sql.legacy.metrics.MetricName;
+import org.opensearch.sql.legacy.metrics.Metrics;
+
+/** Utility to add metrics. */
+@UtilityClass
+public class MetricUtils {
+
+  private static final Logger LOG = LogManager.getLogger();
+
+  public static void incrementNumericalMetric(MetricName metricName) {
+    try {
+      Metrics.getInstance().getNumericalMetric(metricName).increment();
+    } catch (Throwable throwable) {
+      LOG.error("Error while adding metric: {}", throwable.getMessage());
+    }
+  }
+}
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/utils/QueryDataAnonymizer.java b/legacy/src/main/java/org/opensearch/sql/legacy/utils/QueryDataAnonymizer.java
index b58691c022..acf7a73ba5 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/utils/QueryDataAnonymizer.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/utils/QueryDataAnonymizer.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.utils;
 
 import static org.opensearch.sql.legacy.utils.Util.toSqlExpr;
@@ -14,35 +13,35 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.sql.legacy.rewriter.identifier.AnonymizeSensitiveDataRule;
 
-/**
- * Utility class to mask sensitive information in incoming SQL queries
- */
+/** Utility class to mask sensitive information in incoming SQL queries */
 public class QueryDataAnonymizer {
 
-    private static final Logger LOG = LogManager.getLogger(QueryDataAnonymizer.class);
+  private static final Logger LOG = LogManager.getLogger(QueryDataAnonymizer.class);
 
-    /**
-     * This method is used to anonymize sensitive data in SQL query.
-     * Sensitive data includes index names, column names etc.,
-     * which in druid parser are parsed to SQLIdentifierExpr instances
-     * @param query entire sql query string
-     * @return sql query string with all identifiers replaced with "***" on success
-     * and failure string otherwise to ensure no non-anonymized data is logged in production.
-     */
-    public static String anonymizeData(String query) {
-        String resultQuery;
-        try {
-            AnonymizeSensitiveDataRule rule = new AnonymizeSensitiveDataRule();
-            SQLQueryExpr sqlExpr = (SQLQueryExpr) toSqlExpr(query);
-            rule.rewrite(sqlExpr);
-            resultQuery = SQLUtils.toMySqlString(sqlExpr).replaceAll("0", "number")
-                    .replaceAll("false", "boolean_literal")
-                    .replaceAll("[\\n][\\t]+", " ");
-        } catch (Exception e) {
-            LOG.warn("Caught an exception when anonymizing sensitive data.");
-            LOG.debug("String {} failed anonymization.", query);
-            resultQuery = "Failed to anonymize data.";
-        }
-        return resultQuery;
+  /**
+   * This method is used to anonymize sensitive data in SQL query. Sensitive data includes index
+   * names, column names etc., which in druid parser are parsed to SQLIdentifierExpr instances
+   *
+   * @param query entire sql query string
+   * @return sql query string with all identifiers replaced with "***" on success and failure string
+   *     otherwise to ensure no non-anonymized data is logged in production.
+   */
+  public static String anonymizeData(String query) {
+    String resultQuery;
+    try {
+      AnonymizeSensitiveDataRule rule = new AnonymizeSensitiveDataRule();
+      SQLQueryExpr sqlExpr = (SQLQueryExpr) toSqlExpr(query);
+      rule.rewrite(sqlExpr);
+      resultQuery =
+          SQLUtils.toMySqlString(sqlExpr)
+              .replaceAll("0", "number")
+              .replaceAll("false", "boolean_literal")
+              .replaceAll("[\\n][\\t]+", " ");
+    } catch (Exception e) {
+      LOG.warn("Caught an exception when anonymizing sensitive data.");
+      LOG.debug("String {} failed anonymization.", query);
+      resultQuery = "Failed to anonymize data.";
     }
+    return resultQuery;
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/utils/SQLFunctions.java b/legacy/src/main/java/org/opensearch/sql/legacy/utils/SQLFunctions.java
index de8e6eb0fa..d46a80f6d3 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/utils/SQLFunctions.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/utils/SQLFunctions.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.utils;
 
 import static org.opensearch.sql.legacy.utils.StringUtils.format;
@@ -39,1019 +38,1171 @@
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.executor.format.Schema;
 
-/**
- * Created by allwefantasy on 8/19/16.
- */
+/** Created by allwefantasy on 8/19/16. */
 public class SQLFunctions {
 
-    private static final Set<String> numberOperators = Sets.newHashSet(
-            "exp", "expm1", "log", "log2", "log10", "ln", "sqrt", "cbrt", "ceil", "floor", "rint", "pow", "power",
-            "round", "rand", "abs", "sign", "signum"
-    );
-
-    private static final Set<String> mathConstants = Sets.newHashSet("e", "pi");
-
-    private static final Set<String> trigFunctions = Sets.newHashSet(
-            "degrees", "radians", "sin", "cos", "tan", "asin", "acos", "atan", "atan2", "sinh", "cosh", "cot"
-    );
-
-    private static final Set<String> stringOperators = Sets.newHashSet(
-            "split", "concat_ws", "substring", "trim", "lower", "upper", "rtrim", "ltrim", "replace",
-            "left", "right"
-    );
-
-    private static final Set<String> stringFunctions = Sets.newHashSet(
-            "length", "locate", "ascii"
-    );
-
-    private static final Set<String> binaryOperators = Sets.newHashSet(
-            "add", "multiply", "divide", "subtract", "modulus"
-    );
-
-    private static final Set<String> dateFunctions = Sets.newHashSet(
-            "date_format", "year", "month_of_year", "week_of_year", "day_of_year", "day_of_month",
-            "day_of_week", "hour_of_day", "minute_of_day", "minute_of_hour", "second_of_minute", "month", "dayofmonth",
-            "date", "monthname", "timestamp", "maketime", "now", "curdate"
-    );
-
-    private static final Set<String> conditionalFunctions = Sets.newHashSet(
-            "if", "ifnull", "isnull"
-    );
-
-    private static final Set<String> utilityFunctions = Sets.newHashSet("field", "assign", "cast");
-
-    public static final Set<String> builtInFunctions = Stream.of(
-            numberOperators,
-            mathConstants,
-            trigFunctions,
-            stringOperators,
-            stringFunctions,
-            binaryOperators,
-            dateFunctions,
-            conditionalFunctions,
-            utilityFunctions)
-            .flatMap(Set::stream).collect(Collectors.toSet());
-
-    private Map<String, Integer> generatedIds = new HashMap<>();
-
-    /**
-     * Generates next id for given method name. The id's are increasing for each method name, so
-     * nextId("a"), nextId("a"), nextId("b") will return a_1, a_2, b_1
-     */
-    public String nextId(String methodName) {
-        return methodName + "_" + generatedIds.merge(methodName, 1, Integer::sum);
-    }
-
-
-    /**
-     * Is the function actually translated into Elastic DSL script during execution?
-     */
-    public static boolean isFunctionTranslatedToScript(String function) {
-        return builtInFunctions.contains(function.toLowerCase());
-    }
-
-    public Tuple<String, String> function(String methodName, List<KVValue> paramers, String name,
-                                                 boolean returnValue) throws SqlParseException {
-        Tuple<String, String> functionStr = null;
-        switch (methodName.toLowerCase()) {
-            case "cast": {
-                SQLCastExpr castExpr = (SQLCastExpr) ((SQLIdentifierExpr) paramers.get(0).value).getParent();
-                String typeName = castExpr.getDataType().getName();
-                functionStr = cast(typeName, paramers);
-                break;
-            }
-            case "lower": {
-                functionStr = lower(
-                        (SQLExpr) paramers.get(0).value,
-                        getLocaleForCaseChangingFunction(paramers),
-                        name
-                );
-                break;
-            }
-            case "upper": {
-                functionStr = upper(
-                        (SQLExpr) paramers.get(0).value,
-                        getLocaleForCaseChangingFunction(paramers),
-                        name);
-                break;
-            }
-
-            // Split is currently not supported since its using .split() in painless which is not allow-listed
-            case "split":
-                if (paramers.size() == 3) {
-                    functionStr = split((SQLExpr) paramers.get(0).value,
-                            Util.expr2Object((SQLExpr) paramers.get(1).value).toString(),
-                            Integer.parseInt(Util.expr2Object((SQLExpr) paramers.get(2).value).toString()), name);
-                } else {
-                    functionStr = split((SQLExpr) paramers.get(0).value,
-                            paramers.get(1).value.toString(),
-                            name);
-                }
-
-                break;
-
-            case "concat_ws":
-                List<SQLExpr> result = Lists.newArrayList();
-                for (int i = 1; i < paramers.size(); i++) {
-                    result.add((SQLExpr) paramers.get(i).value);
-                }
-                functionStr = concat_ws(paramers.get(0).value.toString(), result);
-
-                break;
-
-
-            case "date_format":
-                functionStr = date_format(
-                        (SQLExpr) paramers.get(0).value,
-                        Util.expr2Object((SQLExpr) paramers.get(1).value).toString(),
-                        paramers.size() > 2 ? Util.expr2Object((SQLExpr) paramers.get(2).value).toString() : null,
-                        name);
-                break;
-
-            case "year":
-                functionStr = dateFunctionTemplate("year", (SQLExpr) paramers.get(0).value);
-                break;
-            case "month_of_year":
-            case "month":
-                functionStr = dateFunctionTemplate("monthValue", (SQLExpr) paramers.get(0).value);
-                break;
-            case "monthname":
-                functionStr = dateFunctionTemplate("month", (SQLExpr) paramers.get(0).value);
-                break;
-            case "week_of_year":
-                functionStr = dateFunctionTemplate("weekOfWeekyear",
-                                                   "get(WeekFields.ISO.weekOfWeekBasedYear())",
-                                                   (SQLExpr) paramers.get(0).value);
-                break;
-            case "day_of_year":
-                functionStr = dateFunctionTemplate("dayOfYear", (SQLExpr) paramers.get(0).value);
-                break;
-            case "day_of_month":
-            case "dayofmonth":
-                functionStr = dateFunctionTemplate("dayOfMonth", (SQLExpr) paramers.get(0).value);
-                break;
-            case "day_of_week":
-                functionStr = dateFunctionTemplate("dayOfWeek",
-                                                   "getDayOfWeekEnum().getValue()",
-                                                   (SQLExpr) paramers.get(0).value);
-                break;
-            case "date":
-                functionStr = date((SQLExpr) paramers.get(0).value);
-                break;
-            case "hour_of_day":
-                functionStr = dateFunctionTemplate("hour", (SQLExpr) paramers.get(0).value);
-                break;
-            case "minute_of_day":
-                functionStr = dateFunctionTemplate("minuteOfDay",
-                                                   "get(ChronoField.MINUTE_OF_DAY)",
-                                                   (SQLExpr) paramers.get(0).value);
-                break;
-            case "minute_of_hour":
-                functionStr = dateFunctionTemplate("minute", (SQLExpr) paramers.get(0).value);
-                break;
-            case "second_of_minute":
-                functionStr = dateFunctionTemplate("second", (SQLExpr) paramers.get(0).value);
-                break;
-            case "timestamp":
-                functionStr = timestamp((SQLExpr) paramers.get(0).value);
-                break;
-            case "maketime":
-                functionStr = maketime((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value,
-                        (SQLExpr) paramers.get(2).value);
-                break;
-            case "now":
-                functionStr = now();
-                break;
-            case "curdate":
-                functionStr = curdate();
-                break;
-
-            case "e":
-            case "pi":
-                methodName = methodName.toUpperCase();
-                functionStr = mathConstantTemplate("Math." + methodName, methodName);
-                break;
-
-            case "abs":
-            case "round":
-            case "floor":
-            case "ceil":
-            case "cbrt":
-            case "rint":
-            case "exp":
-            case "expm1":
-            case "sqrt":
-            case "sin":
-            case "cos":
-            case "tan":
-            case "asin":
-            case "acos":
-            case "atan":
-            case "sinh":
-            case "cosh":
-                functionStr = mathSingleValueTemplate("Math." + methodName, methodName,
-                        (SQLExpr) paramers.get(0).value, name);
-                break;
-
-            case "rand":
-                if (paramers.isEmpty()) {
-                    functionStr = rand();
-                } else {
-                    functionStr = rand((SQLExpr) paramers.get(0).value);
-                }
-                break;
-
-            case "cot":
-                // OpenSearch does not support the function name cot
-                functionStr = mathSingleValueTemplate("1 / Math.tan", methodName,
-                        (SQLExpr) paramers.get(0).value, name);
-                break;
-
-            case "sign":
-            case "signum":
-                methodName = "signum";
-                functionStr = mathSingleValueTemplate("Math." + methodName, methodName,
-                        (SQLExpr) paramers.get(0).value, name);
-                break;
-
-            case "pow":
-            case "power":
-                methodName = "pow";
-                functionStr = mathDoubleValueTemplate("Math." + methodName, methodName,
-                        (SQLExpr) paramers.get(0).value, Util.expr2Object((SQLExpr) paramers.get(1).value).toString(),
-                        name);
-                break;
-
-            case "atan2":
-                functionStr = mathDoubleValueTemplate("Math." + methodName, methodName,
-                        (SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
-                break;
-
-            case "substring":
-                functionStr = substring((SQLExpr) paramers.get(0).value,
-                        Integer.parseInt(Util.expr2Object((SQLExpr) paramers.get(1).value).toString()),
-                        Integer.parseInt(Util.expr2Object((SQLExpr) paramers.get(2).value).toString()));
-                break;
-
-            case "degrees":
-                functionStr = degrees((SQLExpr) paramers.get(0).value, name);
-                break;
-            case "radians":
-                functionStr = radians((SQLExpr) paramers.get(0).value, name);
-                break;
-
-            case "trim":
-                functionStr = trim((SQLExpr) paramers.get(0).value, name);
-                break;
-
-            case "add":
-                functionStr = add((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
-                break;
-
-            case "subtract":
-                functionStr = subtract((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
-                break;
-            case "divide":
-                functionStr = divide((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
-                break;
-
-            case "multiply":
-                functionStr = multiply((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
-                break;
-            case "modulus":
-                functionStr = modulus((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
-                break;
-
-            case "field":
-                functionStr = field(Util.expr2Object((SQLExpr) paramers.get(0).value).toString());
-                break;
-
-            case "log2":
-                functionStr = log(SQLUtils.toSQLExpr("2"), (SQLExpr) paramers.get(0).value, name);
-                break;
-            case "log10":
-                functionStr = log10((SQLExpr) paramers.get(0).value);
-                break;
-            case "log":
-                if (paramers.size() > 1) {
-                    functionStr = log((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value, name);
-                } else {
-                    functionStr = ln((SQLExpr) paramers.get(0).value);
-                }
-                break;
-            case "ln":
-                functionStr = ln((SQLExpr) paramers.get(0).value);
-                break;
-            case "assign":
-                functionStr = assign((SQLExpr) paramers.get(0).value);
-                break;
-            case "length":
-                functionStr = length((SQLExpr) paramers.get(0).value);
-                break;
-            case "replace":
-                functionStr = replace((SQLExpr) paramers.get(0).value, paramers.get(1).value.toString(),
-                        paramers.get(2).value.toString());
-                break;
-            case "locate":
-                int start = 0;
-                if (paramers.size() > 2) {
-                    start = Integer.parseInt(paramers.get(2).value.toString());
-                }
-                functionStr = locate(paramers.get(0).value.toString(), (SQLExpr) paramers.get(1).value, start);
-                break;
-            case "rtrim":
-                functionStr = rtrim((SQLExpr) paramers.get(0).value);
-                break;
-            case "ltrim":
-                functionStr = ltrim((SQLExpr) paramers.get(0).value);
-                break;
-            case "ascii":
-                functionStr = ascii((SQLExpr) paramers.get(0).value);
-                break;
-            case "left":
-                functionStr = left((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
-                break;
-            case "right":
-                functionStr = right((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
-                break;
-
-            case "if":
-                functionStr = ifFunc(paramers);
-                break;
-            case "ifnull":
-                functionStr = ifnull((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
-                break;
-            case "isnull":
-                functionStr = isnull((SQLExpr) paramers.get(0).value);
-                break;
-
-            default:
-
-        }
-        if (returnValue) {
-            String generatedFieldName = functionStr.v1();
-            String returnCommand = ";return " + generatedFieldName + ";";
-            String newScript = functionStr.v2() + returnCommand;
-            functionStr = new Tuple<>(generatedFieldName, newScript);
-        }
-        return functionStr;
-    }
-
-    public String getLocaleForCaseChangingFunction(List<KVValue> paramers) {
-        String locale;
-        if (paramers.size() == 1) {
-            locale = Locale.getDefault().getLanguage();
-        } else {
-            locale = Util.expr2Object((SQLExpr) paramers.get(1).value).toString();
+  private static final Set<String> numberOperators =
+      Sets.newHashSet(
+          "exp", "expm1", "log", "log2", "log10", "ln", "sqrt", "cbrt", "ceil", "floor", "rint",
+          "pow", "power", "round", "rand", "abs", "sign", "signum");
+
+  private static final Set<String> mathConstants = Sets.newHashSet("e", "pi");
+
+  private static final Set<String> trigFunctions =
+      Sets.newHashSet(
+          "degrees", "radians", "sin", "cos", "tan", "asin", "acos", "atan", "atan2", "sinh",
+          "cosh", "cot");
+
+  private static final Set<String> stringOperators =
+      Sets.newHashSet(
+          "split",
+          "concat_ws",
+          "substring",
+          "trim",
+          "lower",
+          "upper",
+          "rtrim",
+          "ltrim",
+          "replace",
+          "left",
+          "right");
+
+  private static final Set<String> stringFunctions = Sets.newHashSet("length", "locate", "ascii");
+
+  private static final Set<String> binaryOperators =
+      Sets.newHashSet("add", "multiply", "divide", "subtract", "modulus");
+
+  private static final Set<String> dateFunctions =
+      Sets.newHashSet(
+          "date_format",
+          "year",
+          "month_of_year",
+          "week_of_year",
+          "day_of_year",
+          "day_of_month",
+          "day_of_week",
+          "hour_of_day",
+          "minute_of_day",
+          "minute_of_hour",
+          "second_of_minute",
+          "month",
+          "dayofmonth",
+          "date",
+          "monthname",
+          "timestamp",
+          "maketime",
+          "now",
+          "curdate");
+
+  private static final Set<String> conditionalFunctions = Sets.newHashSet("if", "ifnull", "isnull");
+
+  private static final Set<String> utilityFunctions = Sets.newHashSet("field", "assign", "cast");
+
+  public static final Set<String> builtInFunctions =
+      Stream.of(
+              numberOperators,
+              mathConstants,
+              trigFunctions,
+              stringOperators,
+              stringFunctions,
+              binaryOperators,
+              dateFunctions,
+              conditionalFunctions,
+              utilityFunctions)
+          .flatMap(Set::stream)
+          .collect(Collectors.toSet());
+
+  private Map<String, Integer> generatedIds = new HashMap<>();
+
+  /**
+   * Generates next id for given method name. The id's are increasing for each method name, so
+   * nextId("a"), nextId("a"), nextId("b") will return a_1, a_2, b_1
+   */
+  public String nextId(String methodName) {
+    return methodName + "_" + generatedIds.merge(methodName, 1, Integer::sum);
+  }
+
+  /** Is the function actually translated into Elastic DSL script during execution? */
+  public static boolean isFunctionTranslatedToScript(String function) {
+    return builtInFunctions.contains(function.toLowerCase());
+  }
+
+  public Tuple<String, String> function(
+      String methodName, List<KVValue> paramers, String name, boolean returnValue)
+      throws SqlParseException {
+    Tuple<String, String> functionStr = null;
+    switch (methodName.toLowerCase()) {
+      case "cast":
+        {
+          SQLCastExpr castExpr =
+              (SQLCastExpr) ((SQLIdentifierExpr) paramers.get(0).value).getParent();
+          String typeName = castExpr.getDataType().getName();
+          functionStr = cast(typeName, paramers);
+          break;
         }
-        return locale;
-    }
-
-    public Tuple<String, String> cast(String castType, List<KVValue> paramers) throws SqlParseException {
-        String name = nextId("cast");
-        return new Tuple<>(name, getCastScriptStatement(name, castType, paramers));
-    }
-
-
-    public Tuple<String, String> upper(SQLExpr field, String locale, String valueName) {
-        String name = nextId("upper");
-
-        if (valueName == null) {
-            return new Tuple<>(name, def(name, upper(getPropertyOrStringValue(field), locale)));
-        } else {
-            return new Tuple<>(name, getPropertyOrStringValue(field) + "; "
-                    + def(name, valueName + "." + upper(getPropertyOrStringValue(field), locale)));
+      case "lower":
+        {
+          functionStr =
+              lower(
+                  (SQLExpr) paramers.get(0).value,
+                  getLocaleForCaseChangingFunction(paramers),
+                  name);
+          break;
         }
-    }
-
-    public Tuple<String, String> lower(SQLExpr field, String locale, String valueName) {
-        String name = nextId("lower");
-
-        if (valueName == null) {
-            return new Tuple<>(name, def(name, lower(getPropertyOrStringValue(field), locale)));
-        } else {
-            return new Tuple<>(name, getPropertyOrStringValue(field) + "; "
-                    + def(name, valueName + "." + lower(getPropertyOrStringValue(field), locale)));
+      case "upper":
+        {
+          functionStr =
+              upper(
+                  (SQLExpr) paramers.get(0).value,
+                  getLocaleForCaseChangingFunction(paramers),
+                  name);
+          break;
         }
-    }
-
-    private static String def(String name, String value) {
-        return "def " + name + " = " + value;
-    }
-
-    private static String doc(SQLExpr field) {
-        return "doc['" + exprString(field) + "']";
-    }
-
-    private static String doc(String field) {
-        return "doc['" + field + "']";
-    }
-
-    private static String exprString(SQLExpr expr) {
-        return Util.expr2Object(expr).toString();
-    }
-
-    private static String func(String methodName, boolean quotes, String... params) {
-        if (quotes) {
-            return methodName + "(" + quoteParams(params) + ")";
-        }
-
-        return methodName + "(" + String.join(", ", params) + ")";
-    }
-
-    /**
-     * Helper method to surround each param with '' (single quotes) for painless script
-     */
-    private static String quoteParams(String... params) {
-        return Stream.of(params).collect(Collectors.joining("', '", "'", "'"));
-    }
-
-    private Tuple<String, String> concat_ws(String split, List<SQLExpr> columns) {
-        String name = nextId("concat_ws");
-        List<String> result = Lists.newArrayList();
-
-        for (SQLExpr column : columns) {
-            String strColumn = exprString(column);
-            if (strColumn.startsWith("def ")) {
-                result.add(strColumn);
-            } else if (isProperty(column)) {
-                result.add("doc['" + strColumn + "'].value");
-            } else {
-                result.add("'" + strColumn + "'");
-            }
-
-        }
-        return new Tuple<>(name, def(name, Joiner.on("+ " + split + " +").join(result)));
-    }
-
-
-    //split(Column expr, java.lang.String pattern)
-    public Tuple<String, String> split(SQLExpr field, String pattern, int index, String valueName) {
-        String name = nextId("split");
-        final String script;
-        if (valueName == null) {
-            script = def(name,
-                    getPropertyOrValue(field) + "."
-                    + func("split", true, pattern) + "[" + index + "]");
-        } else {
-            script = "; " + def(name, valueName + "."
-                    + func("split", true, pattern) + "[" + index + "]");
-        }
-        return new Tuple<>(name, script);
-    }
-
-    //split(Column expr, java.lang.String pattern)
-    public Tuple<String, String> split(SQLExpr field, String pattern, String valueName) {
-        String name = nextId("split");
-        if (valueName == null) {
-            return new Tuple<>(name,
-                    def(name, getPropertyOrValue(field) + "."
-                            + func("split", true, pattern)));
-        } else {
-            return new Tuple<>(name, getPropertyOrValue(field) + "; "
-                    + def(name, valueName + "." + func("split", true, pattern)));
-        }
-    }
-
-    private Tuple<String, String> date_format(SQLExpr field, String pattern, String zoneId, String valueName) {
-        String name = nextId("date_format");
-        if (valueName == null) {
-            return new Tuple<>(name, "def " + name + " = DateTimeFormatter.ofPattern('" + pattern + "').withZone("
-                    + (zoneId != null ? "ZoneId.of('" + zoneId + "')" : "ZoneId.of(\"UTC\")")
-                    + ").format(Instant.ofEpochMilli(" + getPropertyOrValue(field) + ".toInstant().toEpochMilli()))");
-        } else {
-            return new Tuple<>(name, exprString(field) + "; "
-                    + "def " + name + " = new SimpleDateFormat('" + pattern + "').format("
-                    + "new Date(" + valueName + " - 8*1000*60*60))");
-        }
-    }
-
-    /**
-     * Explicitly pass in name used to generate variable ID because methodName is not always valid
-     *
-     * For example,
-     *  <code>
-     *      functionStr = dateFunctionTemplate("weekOfWeekyear",
-     *                                         "get(WeekFields.ISO.weekOfWeekBasedYear())",
-     *                                         (SQLExpr) paramers.get(0).value);
-     *  </code>
-     *
-     *  The old dateFunctionTemplate(methodName, field) passes string "get(WeekFields.ISO.weekOfWeekBasedYear())"
-     *  to nextId() which generates an invalid variable name in painless script.
-     */
-    private Tuple<String, String> dateFunctionTemplate(String name, String methodName, SQLExpr field) {
-        String id = nextId(name);
-        return new Tuple<>(id, def(id, doc(field) + ".value." + methodName));
-    }
-
-    private Tuple<String, String> dateFunctionTemplate(String methodName, SQLExpr field) {
-        return dateFunctionTemplate(methodName, methodName, field);
-    }
-
-    public Tuple<String, String> add(SQLExpr a, SQLExpr b) {
-        return binaryOpertator("add", "+", a, b);
-    }
-
-    public Tuple<String, String> assign(SQLExpr a) {
-        String name = nextId("assign");
-        return new Tuple<>(name,
-                def(name, extractName(a)));
-    }
-
-    private Tuple<String, String> modulus(SQLExpr a, SQLExpr b) {
-        return binaryOpertator("modulus", "%", a, b);
-    }
-
-    public Tuple<String, String> field(String a) {
-        String name = nextId("field");
-        return new Tuple<>(name, def(name, doc(a) + ".value"));
-    }
-
-    private Tuple<String, String> subtract(SQLExpr a, SQLExpr b) {
-        return binaryOpertator("subtract", "-", a, b);
-    }
-
-    private Tuple<String, String> multiply(SQLExpr a, SQLExpr b) {
-        return binaryOpertator("multiply", "*", a, b);
-    }
-
-    private Tuple<String, String> divide(SQLExpr a, SQLExpr b) {
-        return binaryOpertator("divide", "/", a, b);
-    }
-
-    private Tuple<String, String> binaryOpertator(String methodName, String operator, SQLExpr a, SQLExpr b) {
-        String name = nextId(methodName);
-        return new Tuple<>(name,
-                scriptDeclare(a) + scriptDeclare(b) + convertType(a) + convertType(b)
-                        + def(name, extractName(a) + " " + operator + " " + extractName(b)));
-    }
-
-    private static boolean isProperty(SQLExpr expr) {
-        return (expr instanceof SQLIdentifierExpr || expr instanceof SQLPropertyExpr
-                || expr instanceof SQLVariantRefExpr);
-    }
-
-    private static String getPropertyOrValue(SQLExpr expr) {
-        if (isProperty(expr)) {
-            return doc(expr) + ".value";
-        } else {
-            return exprString(expr);
-        }
-    }
-
-    private static String getPropertyOrValue(String expr) {
-        if (isQuoted(expr, "'")) {
-            return expr;
-        } else if (StringUtils.isNumeric(expr)) {
-            return expr;
-        } else {
-            return doc(expr) + ".value";
-        }
-    }
-
-    private static String getPropertyOrStringValue(SQLExpr expr) {
-        if (isProperty(expr)) {
-            return doc(expr) + ".value";
-        } else {
-            return "'" + exprString(expr) + "'";
-        }
-    }
-
-    private static String scriptDeclare(SQLExpr a) {
-
-        if (isProperty(a) || a instanceof SQLNumericLiteralExpr) {
-            return "";
-        } else {
-            return exprString(a) + ";";
-        }
-    }
-
-    private static String extractName(SQLExpr script) {
-        if (isProperty(script)) {
-            return doc(script) + ".value";
-        }
-        String scriptStr = exprString(script);
-        String[] variance = scriptStr.split(";");
-        String newScript = variance[variance.length - 1];
-        if (newScript.trim().startsWith("def ")) {
-            //for now ,if variant is string,then change to double.
-            return newScript.trim().substring(4).split("=")[0].trim();
-        } else {
-            return scriptStr;
-        }
-    }
 
-    //cast(year as int)
-
-    private static String convertType(SQLExpr script) {
-        String[] variance = exprString(script).split(";");
-        String newScript = variance[variance.length - 1];
-        if (newScript.trim().startsWith("def ")) {
-            //for now ,if variant is string,then change to double.
-            String temp = newScript.trim().substring(4).split("=")[0].trim();
-
-            return " if( " + temp + " instanceof String) " + temp + "= Double.parseDouble(" + temp.trim() + "); ";
+        // Split is currently not supported since its using .split() in painless which is not
+        // allow-listed
+      case "split":
+        if (paramers.size() == 3) {
+          functionStr =
+              split(
+                  (SQLExpr) paramers.get(0).value,
+                  Util.expr2Object((SQLExpr) paramers.get(1).value).toString(),
+                  Integer.parseInt(Util.expr2Object((SQLExpr) paramers.get(2).value).toString()),
+                  name);
         } else {
-            return "";
+          functionStr =
+              split((SQLExpr) paramers.get(0).value, paramers.get(1).value.toString(), name);
         }
 
+        break;
 
-    }
-
-    private String getScriptText(MethodField field) {
-        String content = ((SQLTextLiteralExpr) field.getParams().get(1).value).getText();
-        return content;
-    }
-
-    /**
-     * Using exprString() rather than getPropertyOrValue() for "base" since something like "Math.E" gets evaluated
-     * incorrectly in getPropertyOrValue(), returning it as a doc value instead of the literal string
-     */
-    public Tuple<String, String> log(SQLExpr base, SQLExpr field, String valueName) {
-        String name = nextId("log");
-        String result;
-        if (valueName == null) {
-            result = def(name, func("Math.log", false, getPropertyOrValue(field))
-                    + "/" + func("Math.log", false, exprString(base)));
-        } else {
-            result = getPropertyOrValue(field) + "; "
-                    + def(name, func("Math.log", false, valueName) + "/"
-                            + func("Math.log", false, exprString(base)));
+      case "concat_ws":
+        List<SQLExpr> result = Lists.newArrayList();
+        for (int i = 1; i < paramers.size(); i++) {
+          result.add((SQLExpr) paramers.get(i).value);
         }
-        return new Tuple<>(name, result);
-    }
-
-    public Tuple<String, String> log10(SQLExpr field) {
-        String name = nextId("log10");
-        return new Tuple<>(name, def(name, StringUtils.format("Math.log10(%s)", getPropertyOrValue(field))));
-    }
-
-    public Tuple<String, String> ln(SQLExpr field) {
-        String name = nextId("ln");
-        return new Tuple<>(name, def(name, StringUtils.format("Math.log(%s)", getPropertyOrValue(field))));
-    }
-
-    public Tuple<String, String> trim(SQLExpr field, String valueName) {
-        return strSingleValueTemplate("trim", field, valueName);
-    }
-
-    private Tuple<String, String> degrees(SQLExpr field, String valueName) {
-        return mathSingleValueTemplate("Math.toDegrees", "degrees", field, valueName);
-    }
-
-    private Tuple<String, String> radians(SQLExpr field, String valueName) {
-        return mathSingleValueTemplate("Math.toRadians", "radians", field, valueName);
-    }
-
-    private Tuple<String, String> rand(SQLExpr expr) {
-        String name = nextId("rand");
-        return new Tuple<>(name, def(name, format("new Random(%s).nextDouble()", getPropertyOrValue(expr))));
-    }
-
-    private Tuple<String, String> rand() {
-        String name = nextId("rand");
-        return new Tuple<>(name, def(name, "new Random().nextDouble()"));
-    }
-
-    private Tuple<String, String> mathDoubleValueTemplate(String methodName, String fieldName, SQLExpr val1,
-                                                                 String val2, String valueName) {
-        String name = nextId(fieldName);
-        if (valueName == null) {
-            return new Tuple<>(name, def(name, func(methodName, false, getPropertyOrValue(val1),
-                    getPropertyOrValue(val2))));
+        functionStr = concat_ws(paramers.get(0).value.toString(), result);
+
+        break;
+
+      case "date_format":
+        functionStr =
+            date_format(
+                (SQLExpr) paramers.get(0).value,
+                Util.expr2Object((SQLExpr) paramers.get(1).value).toString(),
+                paramers.size() > 2
+                    ? Util.expr2Object((SQLExpr) paramers.get(2).value).toString()
+                    : null,
+                name);
+        break;
+
+      case "year":
+        functionStr = dateFunctionTemplate("year", (SQLExpr) paramers.get(0).value);
+        break;
+      case "month_of_year":
+      case "month":
+        functionStr = dateFunctionTemplate("monthValue", (SQLExpr) paramers.get(0).value);
+        break;
+      case "monthname":
+        functionStr = dateFunctionTemplate("month", (SQLExpr) paramers.get(0).value);
+        break;
+      case "week_of_year":
+        functionStr =
+            dateFunctionTemplate(
+                "weekOfWeekyear",
+                "get(WeekFields.ISO.weekOfWeekBasedYear())",
+                (SQLExpr) paramers.get(0).value);
+        break;
+      case "day_of_year":
+        functionStr = dateFunctionTemplate("dayOfYear", (SQLExpr) paramers.get(0).value);
+        break;
+      case "day_of_month":
+      case "dayofmonth":
+        functionStr = dateFunctionTemplate("dayOfMonth", (SQLExpr) paramers.get(0).value);
+        break;
+      case "day_of_week":
+        functionStr =
+            dateFunctionTemplate(
+                "dayOfWeek", "getDayOfWeekEnum().getValue()", (SQLExpr) paramers.get(0).value);
+        break;
+      case "date":
+        functionStr = date((SQLExpr) paramers.get(0).value);
+        break;
+      case "hour_of_day":
+        functionStr = dateFunctionTemplate("hour", (SQLExpr) paramers.get(0).value);
+        break;
+      case "minute_of_day":
+        functionStr =
+            dateFunctionTemplate(
+                "minuteOfDay", "get(ChronoField.MINUTE_OF_DAY)", (SQLExpr) paramers.get(0).value);
+        break;
+      case "minute_of_hour":
+        functionStr = dateFunctionTemplate("minute", (SQLExpr) paramers.get(0).value);
+        break;
+      case "second_of_minute":
+        functionStr = dateFunctionTemplate("second", (SQLExpr) paramers.get(0).value);
+        break;
+      case "timestamp":
+        functionStr = timestamp((SQLExpr) paramers.get(0).value);
+        break;
+      case "maketime":
+        functionStr =
+            maketime(
+                (SQLExpr) paramers.get(0).value,
+                (SQLExpr) paramers.get(1).value,
+                (SQLExpr) paramers.get(2).value);
+        break;
+      case "now":
+        functionStr = now();
+        break;
+      case "curdate":
+        functionStr = curdate();
+        break;
+
+      case "e":
+      case "pi":
+        methodName = methodName.toUpperCase();
+        functionStr = mathConstantTemplate("Math." + methodName, methodName);
+        break;
+
+      case "abs":
+      case "round":
+      case "floor":
+      case "ceil":
+      case "cbrt":
+      case "rint":
+      case "exp":
+      case "expm1":
+      case "sqrt":
+      case "sin":
+      case "cos":
+      case "tan":
+      case "asin":
+      case "acos":
+      case "atan":
+      case "sinh":
+      case "cosh":
+        functionStr =
+            mathSingleValueTemplate(
+                "Math." + methodName, methodName, (SQLExpr) paramers.get(0).value, name);
+        break;
+
+      case "rand":
+        if (paramers.isEmpty()) {
+          functionStr = rand();
         } else {
-            return new Tuple<>(name, getPropertyOrValue(val1) + "; "
-                    + def(name, func(methodName, false, valueName, getPropertyOrValue(val2))));
+          functionStr = rand((SQLExpr) paramers.get(0).value);
         }
-    }
-
-    private Tuple<String, String> mathDoubleValueTemplate(String methodName, String fieldName, SQLExpr val1,
-                                                          SQLExpr val2) {
-        String name = nextId(fieldName);
-        return new Tuple<>(name, def(name, func(methodName, false,
-                getPropertyOrValue(val1), getPropertyOrValue(val2))));
-    }
-
-    private Tuple<String, String> mathSingleValueTemplate(String methodName, String fieldName, SQLExpr field,
-                                                                 String valueName) {
-        String name = nextId(fieldName);
-        if (valueName == null) {
-            return new Tuple<>(name, def(name, func(methodName, false, getPropertyOrValue(field))));
+        break;
+
+      case "cot":
+        // OpenSearch does not support the function name cot
+        functionStr =
+            mathSingleValueTemplate(
+                "1 / Math.tan", methodName, (SQLExpr) paramers.get(0).value, name);
+        break;
+
+      case "sign":
+      case "signum":
+        methodName = "signum";
+        functionStr =
+            mathSingleValueTemplate(
+                "Math." + methodName, methodName, (SQLExpr) paramers.get(0).value, name);
+        break;
+
+      case "pow":
+      case "power":
+        methodName = "pow";
+        functionStr =
+            mathDoubleValueTemplate(
+                "Math." + methodName,
+                methodName,
+                (SQLExpr) paramers.get(0).value,
+                Util.expr2Object((SQLExpr) paramers.get(1).value).toString(),
+                name);
+        break;
+
+      case "atan2":
+        functionStr =
+            mathDoubleValueTemplate(
+                "Math." + methodName,
+                methodName,
+                (SQLExpr) paramers.get(0).value,
+                (SQLExpr) paramers.get(1).value);
+        break;
+
+      case "substring":
+        functionStr =
+            substring(
+                (SQLExpr) paramers.get(0).value,
+                Integer.parseInt(Util.expr2Object((SQLExpr) paramers.get(1).value).toString()),
+                Integer.parseInt(Util.expr2Object((SQLExpr) paramers.get(2).value).toString()));
+        break;
+
+      case "degrees":
+        functionStr = degrees((SQLExpr) paramers.get(0).value, name);
+        break;
+      case "radians":
+        functionStr = radians((SQLExpr) paramers.get(0).value, name);
+        break;
+
+      case "trim":
+        functionStr = trim((SQLExpr) paramers.get(0).value, name);
+        break;
+
+      case "add":
+        functionStr = add((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
+        break;
+
+      case "subtract":
+        functionStr = subtract((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
+        break;
+      case "divide":
+        functionStr = divide((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
+        break;
+
+      case "multiply":
+        functionStr = multiply((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
+        break;
+      case "modulus":
+        functionStr = modulus((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
+        break;
+
+      case "field":
+        functionStr = field(Util.expr2Object((SQLExpr) paramers.get(0).value).toString());
+        break;
+
+      case "log2":
+        functionStr = log(SQLUtils.toSQLExpr("2"), (SQLExpr) paramers.get(0).value, name);
+        break;
+      case "log10":
+        functionStr = log10((SQLExpr) paramers.get(0).value);
+        break;
+      case "log":
+        if (paramers.size() > 1) {
+          functionStr = log((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value, name);
         } else {
-            return new Tuple<>(name, getPropertyOrValue(field) + "; "
-                    + def(name, func(methodName, false, valueName)));
+          functionStr = ln((SQLExpr) paramers.get(0).value);
         }
-
-    }
-
-    private Tuple<String, String> mathConstantTemplate(String methodName, String fieldName) {
-        String name = nextId(fieldName);
-        return new Tuple<>(name, def(name, methodName));
-    }
-
-    private Tuple<String, String> strSingleValueTemplate(String methodName, SQLExpr field, String valueName) {
-        String name = nextId(methodName);
-        if (valueName == null) {
-            return new Tuple<>(name, def(name, getPropertyOrStringValue(field) + "." + func(methodName, false)));
-        } else {
-            return new Tuple<>(name, getPropertyOrStringValue(field) + "; "
-                    + def(name, valueName + "." + func(methodName, false)));
+        break;
+      case "ln":
+        functionStr = ln((SQLExpr) paramers.get(0).value);
+        break;
+      case "assign":
+        functionStr = assign((SQLExpr) paramers.get(0).value);
+        break;
+      case "length":
+        functionStr = length((SQLExpr) paramers.get(0).value);
+        break;
+      case "replace":
+        functionStr =
+            replace(
+                (SQLExpr) paramers.get(0).value,
+                paramers.get(1).value.toString(),
+                paramers.get(2).value.toString());
+        break;
+      case "locate":
+        int start = 0;
+        if (paramers.size() > 2) {
+          start = Integer.parseInt(paramers.get(2).value.toString());
         }
-
-    }
-
-    // query: substring(Column expr, int pos, int len)
-    // painless script: substring(int begin, int end)
-    // OpenSearch behavior: 1-index, supports out-of-bound index
-    public Tuple<String, String> substring(SQLExpr field, int pos, int len) {
-        String name = nextId("substring");
-        // start and end are 0-indexes
-        int start = pos < 1 ? 0 : pos - 1;
-        return new Tuple<>(name, StringUtils.format(
-                "def end = (int) Math.min(%s + %s, %s.length()); "
-                + def(name, getPropertyOrStringValue(field) + "."
-                + func("substring", false, Integer.toString(start), "end")),
-                Integer.toString(start), Integer.toString(len), getPropertyOrStringValue(field)
-        ));
-    }
-
-    private String lower(String property, String culture) {
-        return property + ".toLowerCase(Locale.forLanguageTag(\"" + culture + "\"))";
-    }
-
-    private String upper(String property, String culture) {
-        return property + ".toUpperCase(Locale.forLanguageTag(\"" + culture + "\"))";
-    }
-
-    private Tuple<String, String> length(SQLExpr field) {
-        String name = nextId("length");
-        return new Tuple<>(name, def(name, getPropertyOrStringValue(field) + ".length()"));
-    }
-
-    private Tuple<String, String> replace(SQLExpr field, String target, String replacement) {
-        String name = nextId("replace");
-        return new Tuple<>(name, def(name, getPropertyOrStringValue(field)
-                + ".replace(" + target + "," + replacement + ")"));
-    }
-
-    // OpenSearch behavior: both 'start' and return value are 1-index; return 0 if pattern does not exist;
-    // support out-of-bound index
-    private Tuple<String, String> locate(String pattern, SQLExpr source, int start) {
-        String name = nextId("locate");
-        String docSource = getPropertyOrStringValue(source);
-        start = start < 1 ? 0 : start - 1;
-        return new Tuple<>(name, def(name, StringUtils.format("%s.indexOf(%s,%d)+1", docSource, pattern, start)));
-    }
-
-    private Tuple<String, String> rtrim(SQLExpr field) {
-        String name = nextId("rtrim");
-        String fieldString = getPropertyOrStringValue(field);
-        return new Tuple<>(name, StringUtils.format(
-                "int pos=%s.length()-1;"
+        functionStr =
+            locate(paramers.get(0).value.toString(), (SQLExpr) paramers.get(1).value, start);
+        break;
+      case "rtrim":
+        functionStr = rtrim((SQLExpr) paramers.get(0).value);
+        break;
+      case "ltrim":
+        functionStr = ltrim((SQLExpr) paramers.get(0).value);
+        break;
+      case "ascii":
+        functionStr = ascii((SQLExpr) paramers.get(0).value);
+        break;
+      case "left":
+        functionStr = left((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
+        break;
+      case "right":
+        functionStr = right((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
+        break;
+
+      case "if":
+        functionStr = ifFunc(paramers);
+        break;
+      case "ifnull":
+        functionStr = ifnull((SQLExpr) paramers.get(0).value, (SQLExpr) paramers.get(1).value);
+        break;
+      case "isnull":
+        functionStr = isnull((SQLExpr) paramers.get(0).value);
+        break;
+
+      default:
+    }
+    if (returnValue) {
+      String generatedFieldName = functionStr.v1();
+      String returnCommand = ";return " + generatedFieldName + ";";
+      String newScript = functionStr.v2() + returnCommand;
+      functionStr = new Tuple<>(generatedFieldName, newScript);
+    }
+    return functionStr;
+  }
+
+  public String getLocaleForCaseChangingFunction(List<KVValue> paramers) {
+    String locale;
+    if (paramers.size() == 1) {
+      locale = Locale.getDefault().getLanguage();
+    } else {
+      locale = Util.expr2Object((SQLExpr) paramers.get(1).value).toString();
+    }
+    return locale;
+  }
+
+  public Tuple<String, String> cast(String castType, List<KVValue> paramers)
+      throws SqlParseException {
+    String name = nextId("cast");
+    return new Tuple<>(name, getCastScriptStatement(name, castType, paramers));
+  }
+
+  public Tuple<String, String> upper(SQLExpr field, String locale, String valueName) {
+    String name = nextId("upper");
+
+    if (valueName == null) {
+      return new Tuple<>(name, def(name, upper(getPropertyOrStringValue(field), locale)));
+    } else {
+      return new Tuple<>(
+          name,
+          getPropertyOrStringValue(field)
+              + "; "
+              + def(name, valueName + "." + upper(getPropertyOrStringValue(field), locale)));
+    }
+  }
+
+  public Tuple<String, String> lower(SQLExpr field, String locale, String valueName) {
+    String name = nextId("lower");
+
+    if (valueName == null) {
+      return new Tuple<>(name, def(name, lower(getPropertyOrStringValue(field), locale)));
+    } else {
+      return new Tuple<>(
+          name,
+          getPropertyOrStringValue(field)
+              + "; "
+              + def(name, valueName + "." + lower(getPropertyOrStringValue(field), locale)));
+    }
+  }
+
+  private static String def(String name, String value) {
+    return "def " + name + " = " + value;
+  }
+
+  private static String doc(SQLExpr field) {
+    return "doc['" + exprString(field) + "']";
+  }
+
+  private static String doc(String field) {
+    return "doc['" + field + "']";
+  }
+
+  private static String exprString(SQLExpr expr) {
+    return Util.expr2Object(expr).toString();
+  }
+
+  private static String func(String methodName, boolean quotes, String... params) {
+    if (quotes) {
+      return methodName + "(" + quoteParams(params) + ")";
+    }
+
+    return methodName + "(" + String.join(", ", params) + ")";
+  }
+
+  /** Helper method to surround each param with '' (single quotes) for painless script */
+  private static String quoteParams(String... params) {
+    return Stream.of(params).collect(Collectors.joining("', '", "'", "'"));
+  }
+
+  private Tuple<String, String> concat_ws(String split, List<SQLExpr> columns) {
+    String name = nextId("concat_ws");
+    List<String> result = Lists.newArrayList();
+
+    for (SQLExpr column : columns) {
+      String strColumn = exprString(column);
+      if (strColumn.startsWith("def ")) {
+        result.add(strColumn);
+      } else if (isProperty(column)) {
+        result.add("doc['" + strColumn + "'].value");
+      } else {
+        result.add("'" + strColumn + "'");
+      }
+    }
+    return new Tuple<>(name, def(name, Joiner.on("+ " + split + " +").join(result)));
+  }
+
+  // split(Column expr, java.lang.String pattern)
+  public Tuple<String, String> split(SQLExpr field, String pattern, int index, String valueName) {
+    String name = nextId("split");
+    final String script;
+    if (valueName == null) {
+      script =
+          def(
+              name,
+              getPropertyOrValue(field) + "." + func("split", true, pattern) + "[" + index + "]");
+    } else {
+      script = "; " + def(name, valueName + "." + func("split", true, pattern) + "[" + index + "]");
+    }
+    return new Tuple<>(name, script);
+  }
+
+  // split(Column expr, java.lang.String pattern)
+  public Tuple<String, String> split(SQLExpr field, String pattern, String valueName) {
+    String name = nextId("split");
+    if (valueName == null) {
+      return new Tuple<>(
+          name, def(name, getPropertyOrValue(field) + "." + func("split", true, pattern)));
+    } else {
+      return new Tuple<>(
+          name,
+          getPropertyOrValue(field)
+              + "; "
+              + def(name, valueName + "." + func("split", true, pattern)));
+    }
+  }
+
+  private Tuple<String, String> date_format(
+      SQLExpr field, String pattern, String zoneId, String valueName) {
+    String name = nextId("date_format");
+    if (valueName == null) {
+      return new Tuple<>(
+          name,
+          "def "
+              + name
+              + " = DateTimeFormatter.ofPattern('"
+              + pattern
+              + "').withZone("
+              + (zoneId != null ? "ZoneId.of('" + zoneId + "')" : "ZoneId.of(\"UTC\")")
+              + ").format(Instant.ofEpochMilli("
+              + getPropertyOrValue(field)
+              + ".toInstant().toEpochMilli()))");
+    } else {
+      return new Tuple<>(
+          name,
+          exprString(field)
+              + "; "
+              + "def "
+              + name
+              + " = new SimpleDateFormat('"
+              + pattern
+              + "').format("
+              + "new Date("
+              + valueName
+              + " - 8*1000*60*60))");
+    }
+  }
+
+  /**
+   * Explicitly pass in name used to generate variable ID because methodName is not always valid
+   *
+   * <p>For example, <code>
+   *      functionStr = dateFunctionTemplate("weekOfWeekyear",
+   *                                         "get(WeekFields.ISO.weekOfWeekBasedYear())",
+   *                                         (SQLExpr) paramers.get(0).value);
+   *  </code> The old dateFunctionTemplate(methodName, field) passes string
+   * "get(WeekFields.ISO.weekOfWeekBasedYear())" to nextId() which generates an invalid variable
+   * name in painless script.
+   */
+  private Tuple<String, String> dateFunctionTemplate(
+      String name, String methodName, SQLExpr field) {
+    String id = nextId(name);
+    return new Tuple<>(id, def(id, doc(field) + ".value." + methodName));
+  }
+
+  private Tuple<String, String> dateFunctionTemplate(String methodName, SQLExpr field) {
+    return dateFunctionTemplate(methodName, methodName, field);
+  }
+
+  public Tuple<String, String> add(SQLExpr a, SQLExpr b) {
+    return binaryOpertator("add", "+", a, b);
+  }
+
+  public Tuple<String, String> assign(SQLExpr a) {
+    String name = nextId("assign");
+    return new Tuple<>(name, def(name, extractName(a)));
+  }
+
+  private Tuple<String, String> modulus(SQLExpr a, SQLExpr b) {
+    return binaryOpertator("modulus", "%", a, b);
+  }
+
+  public Tuple<String, String> field(String a) {
+    String name = nextId("field");
+    return new Tuple<>(name, def(name, doc(a) + ".value"));
+  }
+
+  private Tuple<String, String> subtract(SQLExpr a, SQLExpr b) {
+    return binaryOpertator("subtract", "-", a, b);
+  }
+
+  private Tuple<String, String> multiply(SQLExpr a, SQLExpr b) {
+    return binaryOpertator("multiply", "*", a, b);
+  }
+
+  private Tuple<String, String> divide(SQLExpr a, SQLExpr b) {
+    return binaryOpertator("divide", "/", a, b);
+  }
+
+  private Tuple<String, String> binaryOpertator(
+      String methodName, String operator, SQLExpr a, SQLExpr b) {
+    String name = nextId(methodName);
+    return new Tuple<>(
+        name,
+        scriptDeclare(a)
+            + scriptDeclare(b)
+            + convertType(a)
+            + convertType(b)
+            + def(name, extractName(a) + " " + operator + " " + extractName(b)));
+  }
+
+  private static boolean isProperty(SQLExpr expr) {
+    return (expr instanceof SQLIdentifierExpr
+        || expr instanceof SQLPropertyExpr
+        || expr instanceof SQLVariantRefExpr);
+  }
+
+  private static String getPropertyOrValue(SQLExpr expr) {
+    if (isProperty(expr)) {
+      return doc(expr) + ".value";
+    } else {
+      return exprString(expr);
+    }
+  }
+
+  private static String getPropertyOrValue(String expr) {
+    if (isQuoted(expr, "'")) {
+      return expr;
+    } else if (StringUtils.isNumeric(expr)) {
+      return expr;
+    } else {
+      return doc(expr) + ".value";
+    }
+  }
+
+  private static String getPropertyOrStringValue(SQLExpr expr) {
+    if (isProperty(expr)) {
+      return doc(expr) + ".value";
+    } else {
+      return "'" + exprString(expr) + "'";
+    }
+  }
+
+  private static String scriptDeclare(SQLExpr a) {
+
+    if (isProperty(a) || a instanceof SQLNumericLiteralExpr) {
+      return "";
+    } else {
+      return exprString(a) + ";";
+    }
+  }
+
+  private static String extractName(SQLExpr script) {
+    if (isProperty(script)) {
+      return doc(script) + ".value";
+    }
+    String scriptStr = exprString(script);
+    String[] variance = scriptStr.split(";");
+    String newScript = variance[variance.length - 1];
+    if (newScript.trim().startsWith("def ")) {
+      // for now ,if variant is string,then change to double.
+      return newScript.trim().substring(4).split("=")[0].trim();
+    } else {
+      return scriptStr;
+    }
+  }
+
+  // cast(year as int)
+
+  private static String convertType(SQLExpr script) {
+    String[] variance = exprString(script).split(";");
+    String newScript = variance[variance.length - 1];
+    if (newScript.trim().startsWith("def ")) {
+      // for now ,if variant is string,then change to double.
+      String temp = newScript.trim().substring(4).split("=")[0].trim();
+
+      return " if( "
+          + temp
+          + " instanceof String) "
+          + temp
+          + "= Double.parseDouble("
+          + temp.trim()
+          + "); ";
+    } else {
+      return "";
+    }
+  }
+
+  private String getScriptText(MethodField field) {
+    String content = ((SQLTextLiteralExpr) field.getParams().get(1).value).getText();
+    return content;
+  }
+
+  /**
+   * Using exprString() rather than getPropertyOrValue() for "base" since something like "Math.E"
+   * gets evaluated incorrectly in getPropertyOrValue(), returning it as a doc value instead of the
+   * literal string
+   */
+  public Tuple<String, String> log(SQLExpr base, SQLExpr field, String valueName) {
+    String name = nextId("log");
+    String result;
+    if (valueName == null) {
+      result =
+          def(
+              name,
+              func("Math.log", false, getPropertyOrValue(field))
+                  + "/"
+                  + func("Math.log", false, exprString(base)));
+    } else {
+      result =
+          getPropertyOrValue(field)
+              + "; "
+              + def(
+                  name,
+                  func("Math.log", false, valueName)
+                      + "/"
+                      + func("Math.log", false, exprString(base)));
+    }
+    return new Tuple<>(name, result);
+  }
+
+  public Tuple<String, String> log10(SQLExpr field) {
+    String name = nextId("log10");
+    return new Tuple<>(
+        name, def(name, StringUtils.format("Math.log10(%s)", getPropertyOrValue(field))));
+  }
+
+  public Tuple<String, String> ln(SQLExpr field) {
+    String name = nextId("ln");
+    return new Tuple<>(
+        name, def(name, StringUtils.format("Math.log(%s)", getPropertyOrValue(field))));
+  }
+
+  public Tuple<String, String> trim(SQLExpr field, String valueName) {
+    return strSingleValueTemplate("trim", field, valueName);
+  }
+
+  private Tuple<String, String> degrees(SQLExpr field, String valueName) {
+    return mathSingleValueTemplate("Math.toDegrees", "degrees", field, valueName);
+  }
+
+  private Tuple<String, String> radians(SQLExpr field, String valueName) {
+    return mathSingleValueTemplate("Math.toRadians", "radians", field, valueName);
+  }
+
+  private Tuple<String, String> rand(SQLExpr expr) {
+    String name = nextId("rand");
+    return new Tuple<>(
+        name, def(name, format("new Random(%s).nextDouble()", getPropertyOrValue(expr))));
+  }
+
+  private Tuple<String, String> rand() {
+    String name = nextId("rand");
+    return new Tuple<>(name, def(name, "new Random().nextDouble()"));
+  }
+
+  private Tuple<String, String> mathDoubleValueTemplate(
+      String methodName, String fieldName, SQLExpr val1, String val2, String valueName) {
+    String name = nextId(fieldName);
+    if (valueName == null) {
+      return new Tuple<>(
+          name,
+          def(name, func(methodName, false, getPropertyOrValue(val1), getPropertyOrValue(val2))));
+    } else {
+      return new Tuple<>(
+          name,
+          getPropertyOrValue(val1)
+              + "; "
+              + def(name, func(methodName, false, valueName, getPropertyOrValue(val2))));
+    }
+  }
+
+  private Tuple<String, String> mathDoubleValueTemplate(
+      String methodName, String fieldName, SQLExpr val1, SQLExpr val2) {
+    String name = nextId(fieldName);
+    return new Tuple<>(
+        name,
+        def(name, func(methodName, false, getPropertyOrValue(val1), getPropertyOrValue(val2))));
+  }
+
+  private Tuple<String, String> mathSingleValueTemplate(
+      String methodName, String fieldName, SQLExpr field, String valueName) {
+    String name = nextId(fieldName);
+    if (valueName == null) {
+      return new Tuple<>(name, def(name, func(methodName, false, getPropertyOrValue(field))));
+    } else {
+      return new Tuple<>(
+          name, getPropertyOrValue(field) + "; " + def(name, func(methodName, false, valueName)));
+    }
+  }
+
+  private Tuple<String, String> mathConstantTemplate(String methodName, String fieldName) {
+    String name = nextId(fieldName);
+    return new Tuple<>(name, def(name, methodName));
+  }
+
+  private Tuple<String, String> strSingleValueTemplate(
+      String methodName, SQLExpr field, String valueName) {
+    String name = nextId(methodName);
+    if (valueName == null) {
+      return new Tuple<>(
+          name, def(name, getPropertyOrStringValue(field) + "." + func(methodName, false)));
+    } else {
+      return new Tuple<>(
+          name,
+          getPropertyOrStringValue(field)
+              + "; "
+              + def(name, valueName + "." + func(methodName, false)));
+    }
+  }
+
+  // query: substring(Column expr, int pos, int len)
+  // painless script: substring(int begin, int end)
+  // OpenSearch behavior: 1-index, supports out-of-bound index
+  public Tuple<String, String> substring(SQLExpr field, int pos, int len) {
+    String name = nextId("substring");
+    // start and end are 0-indexes
+    int start = pos < 1 ? 0 : pos - 1;
+    return new Tuple<>(
+        name,
+        StringUtils.format(
+            "def end = (int) Math.min(%s + %s, %s.length()); "
+                + def(
+                    name,
+                    getPropertyOrStringValue(field)
+                        + "."
+                        + func("substring", false, Integer.toString(start), "end")),
+            Integer.toString(start),
+            Integer.toString(len),
+            getPropertyOrStringValue(field)));
+  }
+
+  private String lower(String property, String culture) {
+    return property + ".toLowerCase(Locale.forLanguageTag(\"" + culture + "\"))";
+  }
+
+  private String upper(String property, String culture) {
+    return property + ".toUpperCase(Locale.forLanguageTag(\"" + culture + "\"))";
+  }
+
+  private Tuple<String, String> length(SQLExpr field) {
+    String name = nextId("length");
+    return new Tuple<>(name, def(name, getPropertyOrStringValue(field) + ".length()"));
+  }
+
+  private Tuple<String, String> replace(SQLExpr field, String target, String replacement) {
+    String name = nextId("replace");
+    return new Tuple<>(
+        name,
+        def(
+            name,
+            getPropertyOrStringValue(field) + ".replace(" + target + "," + replacement + ")"));
+  }
+
+  // OpenSearch behavior: both 'start' and return value are 1-index; return 0 if pattern does not
+  // exist;
+  // support out-of-bound index
+  private Tuple<String, String> locate(String pattern, SQLExpr source, int start) {
+    String name = nextId("locate");
+    String docSource = getPropertyOrStringValue(source);
+    start = start < 1 ? 0 : start - 1;
+    return new Tuple<>(
+        name, def(name, StringUtils.format("%s.indexOf(%s,%d)+1", docSource, pattern, start)));
+  }
+
+  private Tuple<String, String> rtrim(SQLExpr field) {
+    String name = nextId("rtrim");
+    String fieldString = getPropertyOrStringValue(field);
+    return new Tuple<>(
+        name,
+        StringUtils.format(
+            "int pos=%s.length()-1;"
                 + "while(pos >= 0 && Character.isWhitespace(%s.charAt(pos))) {pos --;} "
                 + def(name, "%s.substring(0, pos+1)"),
-                fieldString, fieldString, fieldString
-        ));
-    }
-
-    private Tuple<String, String> ltrim(SQLExpr field) {
-        String name = nextId("ltrim");
-        String fieldString = getPropertyOrStringValue(field);
-        return new Tuple<>(name, StringUtils.format(
-                "int pos=0;"
+            fieldString,
+            fieldString,
+            fieldString));
+  }
+
+  private Tuple<String, String> ltrim(SQLExpr field) {
+    String name = nextId("ltrim");
+    String fieldString = getPropertyOrStringValue(field);
+    return new Tuple<>(
+        name,
+        StringUtils.format(
+            "int pos=0;"
                 + "while(pos < %s.length() && Character.isWhitespace(%s.charAt(pos))) {pos ++;} "
                 + def(name, "%s.substring(pos, %s.length())"),
-                fieldString, fieldString, fieldString, fieldString
-        ));
-    }
-
-    private Tuple<String, String> ascii(SQLExpr field) {
-        String name = nextId("ascii");
-        return new Tuple<>(name, def(name, "(int) " + getPropertyOrStringValue(field) + ".charAt(0)"));
-    }
-
-    private Tuple<String, String> left(SQLExpr expr, SQLExpr length) {
-        String name = nextId("left");
-        return new Tuple<>(name, StringUtils.format(
-                "def len = (int) Math.min(%s, %s.length()); def %s = %s.substring(0, len)",
-                exprString(length), getPropertyOrStringValue(expr), name, getPropertyOrStringValue(expr)));
-    }
-
-    private Tuple<String, String> right(SQLExpr expr, SQLExpr length) {
-        String name = nextId("right");
-        return new Tuple<>(name, StringUtils.format(
-                "def start = (int) Math.max(0, %s.length()-%s); def %s = %s.substring(start)",
-                getPropertyOrStringValue(expr), exprString(length), name, getPropertyOrStringValue(expr)));
-    }
-
-    private Tuple<String, String> date(SQLExpr field) {
-        String name = nextId("date");
-        return new Tuple<>(name, def(name,
-                "LocalDate.parse(" + getPropertyOrStringValue(field) + ".toString(),"
-                        + "DateTimeFormatter.ISO_DATE_TIME)"));
-    }
-
-    private Tuple<String, String> timestamp(SQLExpr field) {
-        String name = nextId("timestamp");
-        return new Tuple<>(name, def(name,
-                "DateTimeFormatter.ofPattern('yyyy-MM-dd HH:mm:ss').format("
-                        + "DateTimeFormatter.ISO_DATE_TIME.parse("
-                        + getPropertyOrStringValue(field) + ".toString()))"));
-    }
-
-    private Tuple<String, String> maketime(SQLExpr hr, SQLExpr min, SQLExpr sec) {
-        String name = nextId("maketime");
-        return new Tuple<>(name, def(name, StringUtils.format(
+            fieldString,
+            fieldString,
+            fieldString,
+            fieldString));
+  }
+
+  private Tuple<String, String> ascii(SQLExpr field) {
+    String name = nextId("ascii");
+    return new Tuple<>(name, def(name, "(int) " + getPropertyOrStringValue(field) + ".charAt(0)"));
+  }
+
+  private Tuple<String, String> left(SQLExpr expr, SQLExpr length) {
+    String name = nextId("left");
+    return new Tuple<>(
+        name,
+        StringUtils.format(
+            "def len = (int) Math.min(%s, %s.length()); def %s = %s.substring(0, len)",
+            exprString(length),
+            getPropertyOrStringValue(expr),
+            name,
+            getPropertyOrStringValue(expr)));
+  }
+
+  private Tuple<String, String> right(SQLExpr expr, SQLExpr length) {
+    String name = nextId("right");
+    return new Tuple<>(
+        name,
+        StringUtils.format(
+            "def start = (int) Math.max(0, %s.length()-%s); def %s = %s.substring(start)",
+            getPropertyOrStringValue(expr),
+            exprString(length),
+            name,
+            getPropertyOrStringValue(expr)));
+  }
+
+  private Tuple<String, String> date(SQLExpr field) {
+    String name = nextId("date");
+    return new Tuple<>(
+        name,
+        def(
+            name,
+            "LocalDate.parse("
+                + getPropertyOrStringValue(field)
+                + ".toString(),"
+                + "DateTimeFormatter.ISO_DATE_TIME)"));
+  }
+
+  private Tuple<String, String> timestamp(SQLExpr field) {
+    String name = nextId("timestamp");
+    return new Tuple<>(
+        name,
+        def(
+            name,
+            "DateTimeFormatter.ofPattern('yyyy-MM-dd HH:mm:ss').format("
+                + "DateTimeFormatter.ISO_DATE_TIME.parse("
+                + getPropertyOrStringValue(field)
+                + ".toString()))"));
+  }
+
+  private Tuple<String, String> maketime(SQLExpr hr, SQLExpr min, SQLExpr sec) {
+    String name = nextId("maketime");
+    return new Tuple<>(
+        name,
+        def(
+            name,
+            StringUtils.format(
                 "LocalTime.of(%s, %s, %s).format(DateTimeFormatter.ofPattern('HH:mm:ss'))",
                 hr.toString(), min.toString(), sec.toString())));
-    }
-
-    private Tuple<String, String> now() {
-        String name = nextId("now");
-        return new Tuple<>(name, def(name, "new SimpleDateFormat('HH:mm:ss').format(System.currentTimeMillis())"));
-    }
-
-    private Tuple<String, String> curdate() {
-        String name = nextId("curdate");
-        return new Tuple<>(name, def(name, "new SimpleDateFormat('yyyy-MM-dd').format(System.currentTimeMillis())"));
-    }
-
-    private Tuple<String, String> ifFunc(List<KVValue> paramers) {
-        String expr1 = paramers.get(1).value.toString();
-        String expr2 = paramers.get(2).value.toString();
-        String name = nextId("if");
-
-        /** Input with null is regarded as false */
-        if (paramers.get(0).value instanceof SQLNullExpr) {
-            return new Tuple<>(name, def(name, expr2));
-        }
-        if (paramers.get(0).value instanceof MethodField) {
-            String condition = getScriptText((MethodField) paramers.get(0).value);
-            return new Tuple<>(name, "boolean cond = " + condition + ";"
-                    + def(name, "cond ? " + expr1 + " : " + expr2));
-        } else if (paramers.get(0).value instanceof SQLBooleanExpr) {
-            Boolean condition = ((SQLBooleanExpr) paramers.get(0).value).getValue();
-            if (condition) {
-                return new Tuple<>(name, def(name, expr1));
-            } else {
-                return new Tuple<>(name, def(name, expr2));
-            }
-        } else {
-            /**
-             * Detailed explanation of cases that come here:
-             * the condition expression would be in the format of a=b:
-             * a is parsed as the key (String) of a KVValue (get from paramers.get(0))
-             * and b is parsed as the value (Object) of this KVValue.
-             *
-             * Either a or b could be a column name, literal, or a number:
-             * - if isNumeric is true --> number
-             * - else if this string is single quoted --> literal
-             * - else --> column name
-             */
-            String key = getPropertyOrValue(paramers.get(0).key);
-            String value = getPropertyOrValue(paramers.get(0).value.toString());
-            String condition = key + " == " + value;
-            return new Tuple<>(name, "boolean cond = " + condition + ";"
-                    + def(name, "cond ? " + expr1 + " : " + expr2));
-        }
-    }
-
-    private Tuple<String, String> ifnull(SQLExpr condition, SQLExpr expr) {
-        String name = nextId("ifnull");
-        if (condition instanceof SQLNullExpr) {
-            return new Tuple<>(name, def(name, expr.toString()));
-        }
-        if (isProperty(condition)) {
-            return new Tuple<>(name, def(name, doc(condition) + ".size()==0 ? " + expr.toString() + " : "
-                    + getPropertyOrValue(condition)));
-        } else {
-            String condStr = Strings.isNullOrEmpty(condition.toString()) ? null : getPropertyOrStringValue(condition);
-            return new Tuple<>(name, def(name, condStr));
-        }
-    }
-
-    private Tuple<String, String> isnull(SQLExpr expr) {
-        String name = nextId("isnull");
-        if (expr instanceof SQLNullExpr) {
-            return new Tuple<>(name, def(name, "1"));
-        }
-        if (isProperty(expr)) {
-            return new Tuple<>(name, def(name, doc(expr) + ".size()==0 ? 1 : 0"));
-        }
-        // cases that return 1:
-        // expr is null || expr is math func but tends to throw "divided by zero" arithmetic exception
-        String resultStr = "0";
-        if (Strings.isNullOrEmpty(expr.toString())) {
-            resultStr = "1";
-        }
-        if (expr instanceof SQLCharExpr && this.generatedIds.size() > 1) {
-            // the expr is a math expression
-            String mathExpr = ((SQLCharExpr) expr).getText();
-            return new Tuple<>(name, StringUtils.format(
-                    "try {%s;} "
-                            + "catch(ArithmeticException e) "
-                            + "{return 1;} "
-                            + "def %s=0",
-                    mathExpr, name, name)
-            );
-        }
-        return new Tuple<>(name, def(name, resultStr));
-    }
-
-    public String getCastScriptStatement(String name, String castType, List<KVValue> paramers)
-            throws SqlParseException {
-        String castFieldName = String.format("doc['%s'].value", paramers.get(0).toString());
-        switch (StringUtils.toUpper(castType)) {
-            case "INT":
-            case "LONG":
-            case "FLOAT":
-            case "DOUBLE":
-                return getCastToNumericValueScript(name, castFieldName, StringUtils.toLower(castType));
-            case "STRING":
-                return String.format("def %s = %s.toString()", name, castFieldName);
-            case "DATETIME":
-                return String.format("def %s = DateTimeFormatter.ofPattern(\"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'\").format("
-                        + "DateTimeFormatter.ISO_DATE_TIME.parse(%s.toString()))", name, castFieldName);
-            default:
-                throw new SqlParseException("Unsupported cast type " + castType);
-        }
-    }
-
-    private String getCastToNumericValueScript(String varName, String docValue, String targetType) {
-        String script =
-            "def %1$s = (%2$s instanceof boolean) "
-                + "? (%2$s ? 1 : 0) "
-                + ": Double.parseDouble(%2$s.toString()).%3$sValue()";
-        return StringUtils.format(script, varName, docValue, targetType);
-    }
-
-    /**
-     * Returns return type of script function. This is simple approach, that might be not the best solution in the long
-     * term. For example - for JDBC, if the column type in index is INTEGER, and the query is "select column+5", current
-     * approach will return type of result column as DOUBLE, although there is enough information to understand that
-     * it might be safely treated as INTEGER.
-     */
-    public static Schema.Type getScriptFunctionReturnType(MethodField field, Schema.Type resolvedType) {
-        String functionName = ((ScriptMethodField) field).getFunctionName().toLowerCase();
-        if (functionName.equals("cast")) {
-            String castType = ((SQLCastExpr) field.getExpression()).getDataType().getName();
-            return getCastFunctionReturnType(castType);
-        }
-        return resolvedType;
-    }
-
-    public static Schema.Type getCastFunctionReturnType(String castType) {
-        switch (StringUtils.toUpper(castType)) {
-            case "FLOAT":
-                return Schema.Type.FLOAT;
-            case "DOUBLE":
-                return Schema.Type.DOUBLE;
-            case "INT":
-                return Schema.Type.INTEGER;
-            case "STRING":
-                return Schema.Type.TEXT;
-            case "DATETIME":
-                return Schema.Type.DATE;
-            case "LONG":
-                return Schema.Type.LONG;
-            default:
-                throw new UnsupportedOperationException(
-                    StringUtils.format("The following type is not supported by cast(): %s", castType)
-                );
-        }
-    }
-
-    /**
-     *
-     * @param field
-     * @return Schema.Type.TEXT or DOUBLE
-     * There are only two ORDER BY types (TEXT, NUMBER) in OpenSearch, so the Type that is returned here essentially
-     * indicates the category of the function as opposed to the actual return type.
-     */
-    public static Schema.Type getOrderByFieldType(Field field) {
-        String functionName = ((ScriptMethodField) field).getFunctionName().toLowerCase();
-        if (functionName.equals("cast")) {
-            String castType = ((SQLCastExpr) field.getExpression()).getDataType().getName();
-            return getCastFunctionReturnType(castType);
-        }
-
-        if (numberOperators.contains(functionName) || mathConstants.contains(functionName)
-                || trigFunctions.contains(functionName) || binaryOperators.contains(functionName)) {
-            return Schema.Type.DOUBLE;
-        } else if (dateFunctions.contains(functionName)) {
-            if (functionName.equals("date_format") || functionName.equals("now")
-                    || functionName.equals("curdate") || functionName.equals("date")
-                    || functionName.equals("timestamp") || functionName.equals("monthname")) {
-                return Schema.Type.TEXT;
-            }
-            return Schema.Type.DOUBLE;
-        } else if (stringFunctions.contains(functionName) || stringOperators.contains(functionName)) {
-            return Schema.Type.TEXT;
-        }
-
+  }
+
+  private Tuple<String, String> now() {
+    String name = nextId("now");
+    return new Tuple<>(
+        name, def(name, "new SimpleDateFormat('HH:mm:ss').format(System.currentTimeMillis())"));
+  }
+
+  private Tuple<String, String> curdate() {
+    String name = nextId("curdate");
+    return new Tuple<>(
+        name, def(name, "new SimpleDateFormat('yyyy-MM-dd').format(System.currentTimeMillis())"));
+  }
+
+  private Tuple<String, String> ifFunc(List<KVValue> paramers) {
+    String expr1 = paramers.get(1).value.toString();
+    String expr2 = paramers.get(2).value.toString();
+    String name = nextId("if");
+
+    /** Input with null is regarded as false */
+    if (paramers.get(0).value instanceof SQLNullExpr) {
+      return new Tuple<>(name, def(name, expr2));
+    }
+    if (paramers.get(0).value instanceof MethodField) {
+      String condition = getScriptText((MethodField) paramers.get(0).value);
+      return new Tuple<>(
+          name, "boolean cond = " + condition + ";" + def(name, "cond ? " + expr1 + " : " + expr2));
+    } else if (paramers.get(0).value instanceof SQLBooleanExpr) {
+      Boolean condition = ((SQLBooleanExpr) paramers.get(0).value).getValue();
+      if (condition) {
+        return new Tuple<>(name, def(name, expr1));
+      } else {
+        return new Tuple<>(name, def(name, expr2));
+      }
+    } else {
+      /**
+       * Detailed explanation of cases that come here: the condition expression would be in the
+       * format of a=b: a is parsed as the key (String) of a KVValue (get from paramers.get(0)) and
+       * b is parsed as the value (Object) of this KVValue.
+       *
+       * <p>Either a or b could be a column name, literal, or a number: - if isNumeric is true -->
+       * number - else if this string is single quoted --> literal - else --> column name
+       */
+      String key = getPropertyOrValue(paramers.get(0).key);
+      String value = getPropertyOrValue(paramers.get(0).value.toString());
+      String condition = key + " == " + value;
+      return new Tuple<>(
+          name, "boolean cond = " + condition + ";" + def(name, "cond ? " + expr1 + " : " + expr2));
+    }
+  }
+
+  private Tuple<String, String> ifnull(SQLExpr condition, SQLExpr expr) {
+    String name = nextId("ifnull");
+    if (condition instanceof SQLNullExpr) {
+      return new Tuple<>(name, def(name, expr.toString()));
+    }
+    if (isProperty(condition)) {
+      return new Tuple<>(
+          name,
+          def(
+              name,
+              doc(condition)
+                  + ".size()==0 ? "
+                  + expr.toString()
+                  + " : "
+                  + getPropertyOrValue(condition)));
+    } else {
+      String condStr =
+          Strings.isNullOrEmpty(condition.toString()) ? null : getPropertyOrStringValue(condition);
+      return new Tuple<>(name, def(name, condStr));
+    }
+  }
+
+  private Tuple<String, String> isnull(SQLExpr expr) {
+    String name = nextId("isnull");
+    if (expr instanceof SQLNullExpr) {
+      return new Tuple<>(name, def(name, "1"));
+    }
+    if (isProperty(expr)) {
+      return new Tuple<>(name, def(name, doc(expr) + ".size()==0 ? 1 : 0"));
+    }
+    // cases that return 1:
+    // expr is null || expr is math func but tends to throw "divided by zero" arithmetic exception
+    String resultStr = "0";
+    if (Strings.isNullOrEmpty(expr.toString())) {
+      resultStr = "1";
+    }
+    if (expr instanceof SQLCharExpr && this.generatedIds.size() > 1) {
+      // the expr is a math expression
+      String mathExpr = ((SQLCharExpr) expr).getText();
+      return new Tuple<>(
+          name,
+          StringUtils.format(
+              "try {%s;} " + "catch(ArithmeticException e) " + "{return 1;} " + "def %s=0",
+              mathExpr, name, name));
+    }
+    return new Tuple<>(name, def(name, resultStr));
+  }
+
+  public String getCastScriptStatement(String name, String castType, List<KVValue> paramers)
+      throws SqlParseException {
+    String castFieldName = String.format("doc['%s'].value", paramers.get(0).toString());
+    switch (StringUtils.toUpper(castType)) {
+      case "INT":
+      case "LONG":
+      case "FLOAT":
+      case "DOUBLE":
+        return getCastToNumericValueScript(name, castFieldName, StringUtils.toLower(castType));
+      case "STRING":
+        return String.format("def %s = %s.toString()", name, castFieldName);
+      case "DATETIME":
+        return String.format(
+            "def %s = DateTimeFormatter.ofPattern(\"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'\").format("
+                + "DateTimeFormatter.ISO_DATE_TIME.parse(%s.toString()))",
+            name, castFieldName);
+      default:
+        throw new SqlParseException("Unsupported cast type " + castType);
+    }
+  }
+
+  private String getCastToNumericValueScript(String varName, String docValue, String targetType) {
+    String script =
+        "def %1$s = (%2$s instanceof boolean) "
+            + "? (%2$s ? 1 : 0) "
+            + ": Double.parseDouble(%2$s.toString()).%3$sValue()";
+    return StringUtils.format(script, varName, docValue, targetType);
+  }
+
+  /**
+   * Returns return type of script function. This is simple approach, that might be not the best
+   * solution in the long term. For example - for JDBC, if the column type in index is INTEGER, and
+   * the query is "select column+5", current approach will return type of result column as DOUBLE,
+   * although there is enough information to understand that it might be safely treated as INTEGER.
+   */
+  public static Schema.Type getScriptFunctionReturnType(
+      MethodField field, Schema.Type resolvedType) {
+    String functionName = ((ScriptMethodField) field).getFunctionName().toLowerCase();
+    if (functionName.equals("cast")) {
+      String castType = ((SQLCastExpr) field.getExpression()).getDataType().getName();
+      return getCastFunctionReturnType(castType);
+    }
+    return resolvedType;
+  }
+
+  public static Schema.Type getCastFunctionReturnType(String castType) {
+    switch (StringUtils.toUpper(castType)) {
+      case "FLOAT":
+        return Schema.Type.FLOAT;
+      case "DOUBLE":
+        return Schema.Type.DOUBLE;
+      case "INT":
+        return Schema.Type.INTEGER;
+      case "STRING":
+        return Schema.Type.TEXT;
+      case "DATETIME":
+        return Schema.Type.DATE;
+      case "LONG":
+        return Schema.Type.LONG;
+      default:
         throw new UnsupportedOperationException(
-                String.format(
-                        "The following method is not supported in Schema for Order By: %s",
-                        functionName));
-    }
+            StringUtils.format("The following type is not supported by cast(): %s", castType));
+    }
+  }
+
+  /**
+   * @param field
+   * @return Schema.Type.TEXT or DOUBLE There are only two ORDER BY types (TEXT, NUMBER) in
+   *     OpenSearch, so the Type that is returned here essentially indicates the category of the
+   *     function as opposed to the actual return type.
+   */
+  public static Schema.Type getOrderByFieldType(Field field) {
+    String functionName = ((ScriptMethodField) field).getFunctionName().toLowerCase();
+    if (functionName.equals("cast")) {
+      String castType = ((SQLCastExpr) field.getExpression()).getDataType().getName();
+      return getCastFunctionReturnType(castType);
+    }
+
+    if (numberOperators.contains(functionName)
+        || mathConstants.contains(functionName)
+        || trigFunctions.contains(functionName)
+        || binaryOperators.contains(functionName)) {
+      return Schema.Type.DOUBLE;
+    } else if (dateFunctions.contains(functionName)) {
+      if (functionName.equals("date_format")
+          || functionName.equals("now")
+          || functionName.equals("curdate")
+          || functionName.equals("date")
+          || functionName.equals("timestamp")
+          || functionName.equals("monthname")) {
+        return Schema.Type.TEXT;
+      }
+      return Schema.Type.DOUBLE;
+    } else if (stringFunctions.contains(functionName) || stringOperators.contains(functionName)) {
+      return Schema.Type.TEXT;
+    }
+
+    throw new UnsupportedOperationException(
+        String.format(
+            "The following method is not supported in Schema for Order By: %s", functionName));
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/utils/StringUtils.java b/legacy/src/main/java/org/opensearch/sql/legacy/utils/StringUtils.java
index 515d980db9..757ee49f6e 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/utils/StringUtils.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/utils/StringUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.utils;
 
 import com.google.common.base.Strings;
@@ -17,106 +16,102 @@
  */
 public class StringUtils {
 
-    /**
-     * Returns a formatted string using the specified format string and
-     * arguments, as well as the {@link Locale#ROOT} locale.
-     *
-     * @param format format string
-     * @param args   arguments referenced by the format specifiers in the format string
-     * @return A formatted string
-     * @throws java.util.IllegalFormatException If a format string contains an illegal syntax, a format
-     *                                          specifier that is incompatible with the given arguments,
-     *                                          insufficient arguments given the format string, or other
-     *                                          illegal conditions.
-     * @see java.lang.String#format(Locale, String, Object...)
-     */
-    public static String format(final String format, Object... args) {
-        return String.format(Locale.ROOT, format, args);
-    }
+  /**
+   * Returns a formatted string using the specified format string and arguments, as well as the
+   * {@link Locale#ROOT} locale.
+   *
+   * @param format format string
+   * @param args arguments referenced by the format specifiers in the format string
+   * @return A formatted string
+   * @throws java.util.IllegalFormatException If a format string contains an illegal syntax, a
+   *     format specifier that is incompatible with the given arguments, insufficient arguments
+   *     given the format string, or other illegal conditions.
+   * @see java.lang.String#format(Locale, String, Object...)
+   */
+  public static String format(final String format, Object... args) {
+    return String.format(Locale.ROOT, format, args);
+  }
 
-    /**
-     * Converts all of the characters in this {@code String} to lower
-     * case using the rules of the {@link Locale#ROOT} locale. This is equivalent to calling
-     * {@link String#toLowerCase(Locale)} with {@link Locale#ROOT}.
-     *
-     * @param input the input String
-     * @return the {@code String}, converted to lowercase
-     * @see java.lang.String#toLowerCase(Locale)
-     */
-    public static String toLower(final String input) {
-        return input.toLowerCase(Locale.ROOT);
-    }
+  /**
+   * Converts all of the characters in this {@code String} to lower case using the rules of the
+   * {@link Locale#ROOT} locale. This is equivalent to calling {@link String#toLowerCase(Locale)}
+   * with {@link Locale#ROOT}.
+   *
+   * @param input the input String
+   * @return the {@code String}, converted to lowercase
+   * @see java.lang.String#toLowerCase(Locale)
+   */
+  public static String toLower(final String input) {
+    return input.toLowerCase(Locale.ROOT);
+  }
 
-    /**
-     * Converts all of the characters in this {@code String} to upper
-     * case using the rules of the {@link Locale#ROOT} locale. This is equivalent to calling
-     * {@link String#toUpperCase(Locale)} with {@link Locale#ROOT}.
-     *
-     * @param input the input String
-     * @return the {@code String}, converted to uppercase
-     * @see java.lang.String#toUpperCase(Locale)
-     */
-    public static String toUpper(final String input) {
-        return input.toUpperCase(Locale.ROOT);
-    }
+  /**
+   * Converts all of the characters in this {@code String} to upper case using the rules of the
+   * {@link Locale#ROOT} locale. This is equivalent to calling {@link String#toUpperCase(Locale)}
+   * with {@link Locale#ROOT}.
+   *
+   * @param input the input String
+   * @return the {@code String}, converted to uppercase
+   * @see java.lang.String#toUpperCase(Locale)
+   */
+  public static String toUpper(final String input) {
+    return input.toUpperCase(Locale.ROOT);
+  }
 
-    /**
-     * Count how many occurrences of character in this input {@code Sequence}.
-     *
-     * @param input the input string
-     * @param match char to be matched
-     * @return number of occurrences
-     */
-    public static int countMatches(CharSequence input, char match) {
-        return Math.toIntExact(input.chars().
-                filter(c -> c == match).
-                count());
-    }
+  /**
+   * Count how many occurrences of character in this input {@code Sequence}.
+   *
+   * @param input the input string
+   * @param match char to be matched
+   * @return number of occurrences
+   */
+  public static int countMatches(CharSequence input, char match) {
+    return Math.toIntExact(input.chars().filter(c -> c == match).count());
+  }
 
-    /**
-     *
-     * @param text string
-     * @param quote
-     * @return An unquoted string whose outer pair of back-ticks (if any) has been removed
-     */
-    public static String unquoteSingleField(String text, String quote) {
-        if (isQuoted(text, quote)) {
-            return text.substring(quote.length(), text.length() - quote.length());
-        }
-        return text;
+  /**
+   * @param text string
+   * @param quote
+   * @return An unquoted string whose outer pair of back-ticks (if any) has been removed
+   */
+  public static String unquoteSingleField(String text, String quote) {
+    if (isQuoted(text, quote)) {
+      return text.substring(quote.length(), text.length() - quote.length());
     }
+    return text;
+  }
 
-    public static String unquoteSingleField(String text) {
-        return unquoteSingleField(text, "`");
-    }
+  public static String unquoteSingleField(String text) {
+    return unquoteSingleField(text, "`");
+  }
 
-    /**
-     *
-     * @param text
-     * @return A string whose each dot-seperated field has been unquoted from back-ticks (if any)
-     */
-    public static String unquoteFullColumn(String text, String quote) {
-        String[] strs = text.split("\\.");
-        for (int i = 0; i < strs.length; i++) {
-            String unquotedSubstr = unquoteSingleField(strs[i], quote);
-            strs[i] = unquotedSubstr;
-        }
-        return String.join(".", strs);
+  /**
+   * @param text
+   * @return A string whose each dot-seperated field has been unquoted from back-ticks (if any)
+   */
+  public static String unquoteFullColumn(String text, String quote) {
+    String[] strs = text.split("\\.");
+    for (int i = 0; i < strs.length; i++) {
+      String unquotedSubstr = unquoteSingleField(strs[i], quote);
+      strs[i] = unquotedSubstr;
     }
+    return String.join(".", strs);
+  }
 
-    public static String unquoteFullColumn(String text) {
-        return unquoteFullColumn(text, "`");
-    }
+  public static String unquoteFullColumn(String text) {
+    return unquoteFullColumn(text, "`");
+  }
 
-    public static boolean isQuoted(String text, String quote) {
-        return !Strings.isNullOrEmpty(text) && text.startsWith(quote) && text.endsWith(quote);
-    }
+  public static boolean isQuoted(String text, String quote) {
+    return !Strings.isNullOrEmpty(text) && text.startsWith(quote) && text.endsWith(quote);
+  }
 
-    public static boolean isNumeric(String text) {
-        return Doubles.tryParse(text) != null;
-    }
+  public static boolean isNumeric(String text) {
+    return Doubles.tryParse(text) != null;
+  }
 
-    private StringUtils() {
-        throw new AssertionError(getClass().getCanonicalName() + " is a utility class and must not be initialized");
-    }
+  private StringUtils() {
+    throw new AssertionError(
+        getClass().getCanonicalName() + " is a utility class and must not be initialized");
+  }
 }
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/utils/Util.java b/legacy/src/main/java/org/opensearch/sql/legacy/utils/Util.java
index bd1b7f3865..632074bbbe 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/utils/Util.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/utils/Util.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.utils;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -38,231 +37,247 @@
 import org.opensearch.sql.legacy.exception.SqlParseException;
 import org.opensearch.sql.legacy.parser.ElasticSqlExprParser;
 
-
 public class Util {
 
-    public static final String NESTED_JOIN_TYPE = "NestedJoinType";
-
-    public static String joiner(List<KVValue> lists, String oper) {
-
-        if (lists.size() == 0) {
-            return null;
-        }
+  public static final String NESTED_JOIN_TYPE = "NestedJoinType";
 
-        StringBuilder sb = new StringBuilder(lists.get(0).toString());
-        for (int i = 1; i < lists.size(); i++) {
-            sb.append(oper);
-            sb.append(lists.get(i).toString());
-        }
+  public static String joiner(List<KVValue> lists, String oper) {
 
-        return sb.toString();
+    if (lists.size() == 0) {
+      return null;
     }
 
-    public static Object removeTableAilasFromField(Object expr, String tableAlias) {
-
-        if (expr instanceof SQLIdentifierExpr || expr instanceof SQLPropertyExpr || expr instanceof SQLVariantRefExpr) {
-            String name = expr.toString().replace("`", "");
-            if (tableAlias != null) {
-                String aliasPrefix = tableAlias + ".";
-                if (name.startsWith(aliasPrefix)) {
-                    String newFieldName = name.replaceFirst(aliasPrefix, "");
-                    return new SQLIdentifierExpr(newFieldName);
-                }
-            }
-        }
-        return expr;
+    StringBuilder sb = new StringBuilder(lists.get(0).toString());
+    for (int i = 1; i < lists.size(); i++) {
+      sb.append(oper);
+      sb.append(lists.get(i).toString());
     }
 
+    return sb.toString();
+  }
 
-    public static Object expr2Object(SQLExpr expr) {
-        return expr2Object(expr, "");
-    }
+  public static Object removeTableAilasFromField(Object expr, String tableAlias) {
 
-    public static Object expr2Object(SQLExpr expr, String charWithQuote) {
-        Object value = null;
-        if (expr instanceof SQLNumericLiteralExpr) {
-            value = ((SQLNumericLiteralExpr) expr).getNumber();
-        } else if (expr instanceof SQLCharExpr) {
-            value = charWithQuote + ((SQLCharExpr) expr).getText() + charWithQuote;
-        } else if (expr instanceof SQLIdentifierExpr) {
-            value = expr.toString();
-        } else if (expr instanceof SQLPropertyExpr) {
-            value = expr.toString();
-        } else if (expr instanceof SQLVariantRefExpr) {
-            value = expr.toString();
-        } else if (expr instanceof SQLAllColumnExpr) {
-            value = "*";
-        } else if (expr instanceof SQLValuableExpr) {
-            value = ((SQLValuableExpr) expr).getValue();
-        } else {
-            //throw new SqlParseException("can not support this type " + expr.getClass());
+    if (expr instanceof SQLIdentifierExpr
+        || expr instanceof SQLPropertyExpr
+        || expr instanceof SQLVariantRefExpr) {
+      String name = expr.toString().replace("`", "");
+      if (tableAlias != null) {
+        String aliasPrefix = tableAlias + ".";
+        if (name.startsWith(aliasPrefix)) {
+          String newFieldName = name.replaceFirst(aliasPrefix, "");
+          return new SQLIdentifierExpr(newFieldName);
         }
-        return value;
+      }
     }
-
-    public static Object getScriptValue(SQLExpr expr) throws SqlParseException {
-        if (expr instanceof SQLIdentifierExpr || expr instanceof SQLPropertyExpr || expr instanceof SQLVariantRefExpr) {
-            return "doc['" + expr.toString() + "'].value";
-        } else if (expr instanceof SQLValuableExpr) {
-            return ((SQLValuableExpr) expr).getValue();
-        }
-        throw new SqlParseException("could not parse sqlBinaryOpExpr need to be identifier/valuable got"
-                + expr.getClass().toString() + " with value:" + expr.toString());
+    return expr;
+  }
+
+  public static Object expr2Object(SQLExpr expr) {
+    return expr2Object(expr, "");
+  }
+
+  public static Object expr2Object(SQLExpr expr, String charWithQuote) {
+    Object value = null;
+    if (expr instanceof SQLNumericLiteralExpr) {
+      value = ((SQLNumericLiteralExpr) expr).getNumber();
+    } else if (expr instanceof SQLCharExpr) {
+      value = charWithQuote + ((SQLCharExpr) expr).getText() + charWithQuote;
+    } else if (expr instanceof SQLIdentifierExpr) {
+      value = expr.toString();
+    } else if (expr instanceof SQLPropertyExpr) {
+      value = expr.toString();
+    } else if (expr instanceof SQLVariantRefExpr) {
+      value = expr.toString();
+    } else if (expr instanceof SQLAllColumnExpr) {
+      value = "*";
+    } else if (expr instanceof SQLValuableExpr) {
+      value = ((SQLValuableExpr) expr).getValue();
+    } else {
+      // throw new SqlParseException("can not support this type " + expr.getClass());
     }
-
-    public static Object getScriptValueWithQuote(SQLExpr expr, String quote) throws SqlParseException {
-        if (expr instanceof SQLIdentifierExpr || expr instanceof SQLPropertyExpr || expr instanceof SQLVariantRefExpr) {
-            return "doc['" + expr.toString() + "'].value";
-        } else if (expr instanceof SQLCharExpr) {
-            return quote + ((SQLCharExpr) expr).getValue() + quote;
-        } else if (expr instanceof SQLIntegerExpr) {
-            return ((SQLIntegerExpr) expr).getValue();
-        } else if (expr instanceof SQLNumericLiteralExpr) {
-            return ((SQLNumericLiteralExpr) expr).getNumber();
-        } else if (expr instanceof SQLNullExpr) {
-            return ((SQLNullExpr) expr).toString().toLowerCase();
-        }
-        throw new SqlParseException("could not parse sqlBinaryOpExpr need to be identifier/valuable got"
-                + expr.getClass().toString() + " with value:" + expr.toString());
+    return value;
+  }
+
+  public static Object getScriptValue(SQLExpr expr) throws SqlParseException {
+    if (expr instanceof SQLIdentifierExpr
+        || expr instanceof SQLPropertyExpr
+        || expr instanceof SQLVariantRefExpr) {
+      return "doc['" + expr.toString() + "'].value";
+    } else if (expr instanceof SQLValuableExpr) {
+      return ((SQLValuableExpr) expr).getValue();
     }
-
-    public static boolean isFromJoinOrUnionTable(SQLExpr expr) {
-        SQLObject temp = expr;
-        AtomicInteger counter = new AtomicInteger(10);
-        while (temp != null && !(expr instanceof SQLSelectQueryBlock)
-                && !(expr instanceof SQLJoinTableSource) && !(expr instanceof SQLUnionQuery) && counter.get() > 0) {
-            counter.decrementAndGet();
-            temp = temp.getParent();
-            if (temp instanceof SQLSelectQueryBlock) {
-                SQLTableSource from = ((SQLSelectQueryBlock) temp).getFrom();
-                if (from instanceof SQLJoinTableSource || from instanceof SQLUnionQuery) {
-                    return true;
-                }
-            }
-            if (temp instanceof SQLJoinTableSource || temp instanceof SQLUnionQuery) {
-                return true;
-            }
-        }
-        return false;
+    throw new SqlParseException(
+        "could not parse sqlBinaryOpExpr need to be identifier/valuable got"
+            + expr.getClass().toString()
+            + " with value:"
+            + expr.toString());
+  }
+
+  public static Object getScriptValueWithQuote(SQLExpr expr, String quote)
+      throws SqlParseException {
+    if (expr instanceof SQLIdentifierExpr
+        || expr instanceof SQLPropertyExpr
+        || expr instanceof SQLVariantRefExpr) {
+      return "doc['" + expr.toString() + "'].value";
+    } else if (expr instanceof SQLCharExpr) {
+      return quote + ((SQLCharExpr) expr).getValue() + quote;
+    } else if (expr instanceof SQLIntegerExpr) {
+      return ((SQLIntegerExpr) expr).getValue();
+    } else if (expr instanceof SQLNumericLiteralExpr) {
+      return ((SQLNumericLiteralExpr) expr).getNumber();
+    } else if (expr instanceof SQLNullExpr) {
+      return ((SQLNullExpr) expr).toString().toLowerCase();
     }
-
-    public static double[] KV2DoubleArr(List<KVValue> params) {
-        double[] ds = new double[params.size()];
-        int i = 0;
-        for (KVValue v : params) {
-            ds[i] = Double.parseDouble(v.value.toString());
-            i++;
+    throw new SqlParseException(
+        "could not parse sqlBinaryOpExpr need to be identifier/valuable got"
+            + expr.getClass().toString()
+            + " with value:"
+            + expr.toString());
+  }
+
+  public static boolean isFromJoinOrUnionTable(SQLExpr expr) {
+    SQLObject temp = expr;
+    AtomicInteger counter = new AtomicInteger(10);
+    while (temp != null
+        && !(expr instanceof SQLSelectQueryBlock)
+        && !(expr instanceof SQLJoinTableSource)
+        && !(expr instanceof SQLUnionQuery)
+        && counter.get() > 0) {
+      counter.decrementAndGet();
+      temp = temp.getParent();
+      if (temp instanceof SQLSelectQueryBlock) {
+        SQLTableSource from = ((SQLSelectQueryBlock) temp).getFrom();
+        if (from instanceof SQLJoinTableSource || from instanceof SQLUnionQuery) {
+          return true;
         }
-        return ds;
+      }
+      if (temp instanceof SQLJoinTableSource || temp instanceof SQLUnionQuery) {
+        return true;
+      }
     }
-
-
-    public static String extendedToString(SQLExpr sqlExpr) {
-        if (sqlExpr instanceof SQLTextLiteralExpr) {
-            return ((SQLTextLiteralExpr) sqlExpr).getText();
-        }
-        return sqlExpr.toString();
+    return false;
+  }
+
+  public static double[] KV2DoubleArr(List<KVValue> params) {
+    double[] ds = new double[params.size()];
+    int i = 0;
+    for (KVValue v : params) {
+      ds[i] = Double.parseDouble(v.value.toString());
+      i++;
     }
+    return ds;
+  }
 
-    public static String[] concatStringsArrays(String[] a1, String[] a2) {
-        String[] strings = new String[a1.length + a2.length];
-        for (int i = 0; i < a1.length; i++) {
-            strings[i] = a1[i];
-        }
-        for (int i = 0; i < a2.length; i++) {
-            strings[a1.length + i] = a2[i];
-        }
-        return strings;
+  public static String extendedToString(SQLExpr sqlExpr) {
+    if (sqlExpr instanceof SQLTextLiteralExpr) {
+      return ((SQLTextLiteralExpr) sqlExpr).getText();
     }
+    return sqlExpr.toString();
+  }
 
-    public static Object searchPathInMap(Map<String, Object> fieldsMap, String[] path) {
-        Map<String, Object> currentObject = fieldsMap;
-        for (int i = 0; i < path.length - 1; i++) {
-            Object valueFromCurrentMap = currentObject.get(path[i]);
-            if (valueFromCurrentMap == null) {
-                return null;
-            }
-            if (!Map.class.isAssignableFrom(valueFromCurrentMap.getClass())) {
-                return null;
-            }
-            currentObject = (Map<String, Object>) valueFromCurrentMap;
-        }
-        return currentObject.get(path[path.length - 1]);
+  public static String[] concatStringsArrays(String[] a1, String[] a2) {
+    String[] strings = new String[a1.length + a2.length];
+    for (int i = 0; i < a1.length; i++) {
+      strings[i] = a1[i];
+    }
+    for (int i = 0; i < a2.length; i++) {
+      strings[a1.length + i] = a2[i];
     }
+    return strings;
+  }
+
+  public static Object searchPathInMap(Map<String, Object> fieldsMap, String[] path) {
+    Map<String, Object> currentObject = fieldsMap;
+    for (int i = 0; i < path.length - 1; i++) {
+      Object valueFromCurrentMap = currentObject.get(path[i]);
+      if (valueFromCurrentMap == null) {
+        return null;
+      }
+      if (!Map.class.isAssignableFrom(valueFromCurrentMap.getClass())) {
+        return null;
+      }
+      currentObject = (Map<String, Object>) valueFromCurrentMap;
+    }
+    return currentObject.get(path[path.length - 1]);
+  }
 
-    public static Object deepSearchInMap(Map<String, Object> fieldsMap, String field) {
-        if (field.contains(".")) {
-            String[] split = field.split("\\.");
-            return searchPathInMap(fieldsMap, split);
-        }
-        return fieldsMap.get(field);
+  public static Object deepSearchInMap(Map<String, Object> fieldsMap, String field) {
+    if (field.contains(".")) {
+      String[] split = field.split("\\.");
+      return searchPathInMap(fieldsMap, split);
     }
+    return fieldsMap.get(field);
+  }
 
-    public static boolean clearEmptyPaths(Map<String, Object> map) {
-        if (map.size() == 0) {
-            return true;
-        }
-        Set<String> keysToDelete = new HashSet<>();
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            Object value = entry.getValue();
-            if (Map.class.isAssignableFrom(value.getClass())) {
-                if (clearEmptyPaths((Map<String, Object>) value)) {
-                    keysToDelete.add(entry.getKey());
-                }
-            }
-        }
-        if (keysToDelete.size() != 0) {
-            if (map.size() == keysToDelete.size()) {
-                map.clear();
-                return true;
-            }
-            for (String key : keysToDelete) {
-                // TODO: seems like a bug, either fix, or just get rid of for loop and remove the first key
-                map.remove(key);
-                return false;
-            }
+  public static boolean clearEmptyPaths(Map<String, Object> map) {
+    if (map.size() == 0) {
+      return true;
+    }
+    Set<String> keysToDelete = new HashSet<>();
+    for (Map.Entry<String, Object> entry : map.entrySet()) {
+      Object value = entry.getValue();
+      if (Map.class.isAssignableFrom(value.getClass())) {
+        if (clearEmptyPaths((Map<String, Object>) value)) {
+          keysToDelete.add(entry.getKey());
         }
+      }
+    }
+    if (keysToDelete.size() != 0) {
+      if (map.size() == keysToDelete.size()) {
+        map.clear();
+        return true;
+      }
+      for (String key : keysToDelete) {
+        // TODO: seems like a bug, either fix, or just get rid of for loop and remove the first key
+        map.remove(key);
         return false;
+      }
     }
-
-    public static GetIndexRequestBuilder prepareIndexRequestBuilder(Client client, IndexStatement statement) {
-        /*
-         * indexPattern represents wildcard as '.*' which is the regex syntax for matching anything but
-         * indexRequestBuilder uses the file-match syntax like UNIX which is just '*', so the pattern is converted
-         * in case its added to the request below
-         */
-        String indexPattern = statement.getIndexPattern().replace(".*", "*");
-
-        /*
-         * Ideally all features should be removed from the indexRequest used in SHOW to prevent wasted data
-         * since only the index name is required in the JDBC format response. However, the type is obtained from the
-         * mappings response so this feature will need to be set if retrieving type is necessary in other formats.
-         * (For the time being it is included since the GUI returns types for SHOW queries)
-         */
-        GetIndexRequestBuilder indexRequestBuilder = client.admin().indices()
-                .prepareGetIndex()
-                .setFeatures(GetIndexRequest.Feature.MAPPINGS)
-                .setLocal(true);
-
-        /*
-         * Since the index request supports index names with wildcard (*) but not (.) it is checked for here so that the
-         * results returned can be reduced if possible (the regex checks in the ResultSet classes handle the rest).
-         */
-        if (!indexPattern.contains(".")) {
-            indexRequestBuilder.addIndices(indexPattern);
-        }
-
-        return indexRequestBuilder;
+    return false;
+  }
+
+  public static GetIndexRequestBuilder prepareIndexRequestBuilder(
+      Client client, IndexStatement statement) {
+    /*
+     * indexPattern represents wildcard as '.*' which is the regex syntax for matching anything but
+     * indexRequestBuilder uses the file-match syntax like UNIX which is just '*', so the pattern is converted
+     * in case its added to the request below
+     */
+    String indexPattern = statement.getIndexPattern().replace(".*", "*");
+
+    /*
+     * Ideally all features should be removed from the indexRequest used in SHOW to prevent wasted data
+     * since only the index name is required in the JDBC format response. However, the type is obtained from the
+     * mappings response so this feature will need to be set if retrieving type is necessary in other formats.
+     * (For the time being it is included since the GUI returns types for SHOW queries)
+     */
+    GetIndexRequestBuilder indexRequestBuilder =
+        client
+            .admin()
+            .indices()
+            .prepareGetIndex()
+            .setFeatures(GetIndexRequest.Feature.MAPPINGS)
+            .setLocal(true);
+
+    /*
+     * Since the index request supports index names with wildcard (*) but not (.) it is checked for here so that the
+     * results returned can be reduced if possible (the regex checks in the ResultSet classes handle the rest).
+     */
+    if (!indexPattern.contains(".")) {
+      indexRequestBuilder.addIndices(indexPattern);
     }
 
-    public static SQLExpr toSqlExpr(String sql) {
-        SQLExprParser parser = new ElasticSqlExprParser(sql);
-        SQLExpr expr = parser.expr();
+    return indexRequestBuilder;
+  }
 
-        if (parser.getLexer().token() != Token.EOF) {
-            throw new ParserException("Illegal SQL expression : " + sql);
-        }
-        return expr;
-    }
+  public static SQLExpr toSqlExpr(String sql) {
+    SQLExprParser parser = new ElasticSqlExprParser(sql);
+    SQLExpr expr = parser.expr();
 
+    if (parser.getLexer().token() != Token.EOF) {
+      throw new ParserException("Illegal SQL expression : " + sql);
+    }
+    return expr;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/SymbolSimilarityTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/SymbolSimilarityTest.java
index a894f4311a..fbdcca2bb0 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/SymbolSimilarityTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/SymbolSimilarityTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr;
 
 import static java.util.Collections.emptyList;
@@ -14,42 +13,39 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- * Test cases for symbol similarity
- */
+/** Test cases for symbol similarity */
 public class SymbolSimilarityTest {
 
-    @Test
-    public void noneCandidateShouldReturnTargetStringItself() {
-        String target = "test";
-        String mostSimilarSymbol = new SimilarSymbols(emptyList()).mostSimilarTo(target);
-        Assert.assertEquals(target, mostSimilarSymbol);
-    }
-
-    @Test
-    public void singleCandidateShouldReturnTheOnlyCandidate() {
-        String target = "test";
-        String candidate = "hello";
-        String mostSimilarSymbol = new SimilarSymbols(singletonList(candidate)).mostSimilarTo(target);
-        Assert.assertEquals(candidate, mostSimilarSymbol);
-    }
-
-    @Test
-    public void twoCandidatesShouldReturnMostSimilarCandidate() {
-        String target = "test";
-        String mostSimilar = "tests";
-        List<String> candidates = Arrays.asList("hello", mostSimilar);
-        String mostSimilarSymbol = new SimilarSymbols(candidates).mostSimilarTo(target);
-        Assert.assertEquals(mostSimilar, mostSimilarSymbol);
-    }
-
-    @Test
-    public void manyCandidatesShouldReturnMostSimilarCandidate() {
-        String target = "test";
-        String mostSimilar = "tests";
-        List<String> candidates = Arrays.asList("hello", mostSimilar, "world");
-        String mostSimilarSymbol = new SimilarSymbols(candidates).mostSimilarTo(target);
-        Assert.assertEquals(mostSimilar, mostSimilarSymbol);
-    }
-
+  @Test
+  public void noneCandidateShouldReturnTargetStringItself() {
+    String target = "test";
+    String mostSimilarSymbol = new SimilarSymbols(emptyList()).mostSimilarTo(target);
+    Assert.assertEquals(target, mostSimilarSymbol);
+  }
+
+  @Test
+  public void singleCandidateShouldReturnTheOnlyCandidate() {
+    String target = "test";
+    String candidate = "hello";
+    String mostSimilarSymbol = new SimilarSymbols(singletonList(candidate)).mostSimilarTo(target);
+    Assert.assertEquals(candidate, mostSimilarSymbol);
+  }
+
+  @Test
+  public void twoCandidatesShouldReturnMostSimilarCandidate() {
+    String target = "test";
+    String mostSimilar = "tests";
+    List<String> candidates = Arrays.asList("hello", mostSimilar);
+    String mostSimilarSymbol = new SimilarSymbols(candidates).mostSimilarTo(target);
+    Assert.assertEquals(mostSimilar, mostSimilarSymbol);
+  }
+
+  @Test
+  public void manyCandidatesShouldReturnMostSimilarCandidate() {
+    String target = "test";
+    String mostSimilar = "tests";
+    List<String> candidates = Arrays.asList("hello", mostSimilar, "world");
+    String mostSimilarSymbol = new SimilarSymbols(candidates).mostSimilarTo(target);
+    Assert.assertEquals(mostSimilar, mostSimilarSymbol);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/SyntaxAnalysisTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/SyntaxAnalysisTest.java
index bd71fd2500..765bb0616e 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/SyntaxAnalysisTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/SyntaxAnalysisTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr;
 
 import static java.util.stream.Collectors.toList;
@@ -17,124 +16,115 @@
 import org.opensearch.sql.legacy.antlr.syntax.SyntaxAnalysisException;
 
 /**
- * Test cases focused on illegal syntax testing (denylist) along with a few normal cases not covered previously.
- * All other normal cases should be covered in existing unit test and IT.
+ * Test cases focused on illegal syntax testing (denylist) along with a few normal cases not covered
+ * previously. All other normal cases should be covered in existing unit test and IT.
  */
 public class SyntaxAnalysisTest {
 
-    /** public accessor is required by @Rule annotation */
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
-    private OpenSearchLegacySqlAnalyzer
-        analyzer = new OpenSearchLegacySqlAnalyzer(new SqlAnalysisConfig(true, true, 1000));
-
-    /** In reality exception occurs before reaching new parser for now */
-    @Test
-    public void unsupportedKeywordShouldThrowException() {
-        expectValidationFailWithErrorMessage(
-            "INSERT INTO accounts VALUES ('a')",
-            "offending symbol [INSERT]"
-        );
-    }
-
-    /**
-     * Why we need to let it go and verify in semantic analyzer?
-     *  Parser treats LOG123 a valid column and stops at '(' which gives wrong location and expected token
-     *  In this case it's hard for parser to figure out if this is a wrong function name indeed or not.
-     *  So we let it pass as an UDF and fail in semantic analyzer with meaningful message.
-     */
-    @Test //(expected = SyntaxAnalysisException.class)
-    public void unsupportedFunctionShouldThrowException() {
-        validate("SELECT * FROM accounts WHERE LOG123(balance) = 1");
-    }
-
-    @Test
-    public void unsupportedOperatorShouldPassSyntaxCheck() {
-        expectValidationFailWithErrorMessage(
-            "SELECT * FROM accounts WHERE age <=> 1",
-            "offending symbol [>]"
-        );
-    }
-
-    @Test
-    public void missingFromClauseShouldThrowException() {
-        expectValidationFailWithErrorMessage(
-            "SELECT 1",
-            "offending symbol [<EOF>]" // parsing was unable to terminate normally
-        );
-    }
-
-    @Test
-    public void missingWhereKeywordShouldThrowException() {
-        expectValidationFailWithErrorMessage(
-            "SELECT * FROM accounts age = 1",
-            "offending symbol [=]", // parser thought 'age' is alias of 'accounts' and failed at '='
-            "Expecting", ";"        // "Expecting tokens in {<EOF>, ';'}"
+  /** public accessor is required by @Rule annotation */
+  @Rule public ExpectedException exception = ExpectedException.none();
+
+  private OpenSearchLegacySqlAnalyzer analyzer =
+      new OpenSearchLegacySqlAnalyzer(new SqlAnalysisConfig(true, true, 1000));
+
+  /** In reality exception occurs before reaching new parser for now */
+  @Test
+  public void unsupportedKeywordShouldThrowException() {
+    expectValidationFailWithErrorMessage(
+        "INSERT INTO accounts VALUES ('a')", "offending symbol [INSERT]");
+  }
+
+  /**
+   * Why we need to let it go and verify in semantic analyzer? Parser treats LOG123 a valid column
+   * and stops at '(' which gives wrong location and expected token In this case it's hard for
+   * parser to figure out if this is a wrong function name indeed or not. So we let it pass as an
+   * UDF and fail in semantic analyzer with meaningful message.
+   */
+  @Test // (expected = SyntaxAnalysisException.class)
+  public void unsupportedFunctionShouldThrowException() {
+    validate("SELECT * FROM accounts WHERE LOG123(balance) = 1");
+  }
+
+  @Test
+  public void unsupportedOperatorShouldPassSyntaxCheck() {
+    expectValidationFailWithErrorMessage(
+        "SELECT * FROM accounts WHERE age <=> 1", "offending symbol [>]");
+  }
+
+  @Test
+  public void missingFromClauseShouldThrowException() {
+    expectValidationFailWithErrorMessage(
+        "SELECT 1", "offending symbol [<EOF>]" // parsing was unable to terminate normally
         );
-    }
-
-    @Test
-    public void someKeywordsShouldBeAbleToUseAsIdentifier() {
-        validate("SELECT AVG(balance) AS avg FROM accounts");
-    }
-
-    @Test
-    public void specialIndexNameShouldPass() {
-        validate("SELECT * FROM accounts/temp");
-        validate("SELECT * FROM account*");
-        validate("SELECT * FROM opensearch-accounts");
-        validate("SELECT * FROM opensearch-account*");
-    }
-
-    @Test
-    public void typeNamePatternShouldThrowException() {
-        expectValidationFailWithErrorMessage(
-            "SELECT * FROM accounts/tem*",
-            "offending symbol [*]"
+  }
+
+  @Test
+  public void missingWhereKeywordShouldThrowException() {
+    expectValidationFailWithErrorMessage(
+        "SELECT * FROM accounts age = 1",
+        "offending symbol [=]", // parser thought 'age' is alias of 'accounts' and failed at '='
+        "Expecting",
+        ";" // "Expecting tokens in {<EOF>, ';'}"
         );
-    }
-
-    @Test
-    public void systemIndexNameShouldPass() {
-        validate("SELECT * FROM .opensearch_dashboards");
-    }
-
-    @Test
-    public void useMetadataFieldShouldPass() {
-        validate("SELECT @timestamp FROM accounts");
-    }
-
-    @Test
-    public void leftJoinOnNestedFieldWithoutOnClauseShouldPass() {
-        validate("SELECT * FROM accounts a LEFT JOIN a.projects p");
-    }
-
-    @Test
-    public void useDeepNestedFieldShouldPass() {
-        validate("SELECT a.projects.name FROM accounts a");
-    }
-
-    /** As the translation is not supported for now, check this in semantic analyzer */
-    @Test
-    public void arithmeticExpressionInWhereClauseShouldPass() {
-        validate("SELECT * FROM accounts WHERE age + 1 = 10");
-    }
-
-    @Test
-    public void queryEndWithSemiColonShouldPass() {
-        validate("SELECT * FROM accounts;");
-    }
-
-    private void expectValidationFailWithErrorMessage(String query, String... messages) {
-        exception.expect(SyntaxAnalysisException.class);
-        exception.expectMessage(allOf(Arrays.stream(messages).
-                                      map(Matchers::containsString).
-                                      collect(toList())));
-        validate(query);
-    }
-
-    private void validate(String sql) {
-        analyzer.analyzeSyntax(sql);
-    }
+  }
+
+  @Test
+  public void someKeywordsShouldBeAbleToUseAsIdentifier() {
+    validate("SELECT AVG(balance) AS avg FROM accounts");
+  }
+
+  @Test
+  public void specialIndexNameShouldPass() {
+    validate("SELECT * FROM accounts/temp");
+    validate("SELECT * FROM account*");
+    validate("SELECT * FROM opensearch-accounts");
+    validate("SELECT * FROM opensearch-account*");
+  }
+
+  @Test
+  public void typeNamePatternShouldThrowException() {
+    expectValidationFailWithErrorMessage("SELECT * FROM accounts/tem*", "offending symbol [*]");
+  }
+
+  @Test
+  public void systemIndexNameShouldPass() {
+    validate("SELECT * FROM .opensearch_dashboards");
+  }
+
+  @Test
+  public void useMetadataFieldShouldPass() {
+    validate("SELECT @timestamp FROM accounts");
+  }
+
+  @Test
+  public void leftJoinOnNestedFieldWithoutOnClauseShouldPass() {
+    validate("SELECT * FROM accounts a LEFT JOIN a.projects p");
+  }
+
+  @Test
+  public void useDeepNestedFieldShouldPass() {
+    validate("SELECT a.projects.name FROM accounts a");
+  }
+
+  /** As the translation is not supported for now, check this in semantic analyzer */
+  @Test
+  public void arithmeticExpressionInWhereClauseShouldPass() {
+    validate("SELECT * FROM accounts WHERE age + 1 = 10");
+  }
+
+  @Test
+  public void queryEndWithSemiColonShouldPass() {
+    validate("SELECT * FROM accounts;");
+  }
+
+  private void expectValidationFailWithErrorMessage(String query, String... messages) {
+    exception.expect(SyntaxAnalysisException.class);
+    exception.expectMessage(
+        allOf(Arrays.stream(messages).map(Matchers::containsString).collect(toList())));
+    validate(query);
+  }
+
+  private void validate(String sql) {
+    analyzer.analyzeSyntax(sql);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerAggregateFunctionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerAggregateFunctionTest.java
index 6671542298..df258270b9 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerAggregateFunctionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerAggregateFunctionTest.java
@@ -3,154 +3,147 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
-/**
- * Semantic analysis test for aggregate functions.
- */
+/** Semantic analysis test for aggregate functions. */
 public class SemanticAnalyzerAggregateFunctionTest extends SemanticAnalyzerTestBase {
 
-    @Ignore("To be implemented")
-    @Test(expected = SemanticAnalysisException.class)
-    public void useAggregateFunctionInWhereClauseShouldFail() {
-        validate("SELECT * FROM semantics WHERE AVG(balance) > 10000");
-    }
-
-    @Test
-    public void useAggregateFunctionInSelectClauseShouldPass() {
-        validate(
-            "SELECT" +
-            " city," +
-            " COUNT(*)," +
-            " MAX(age)," +
-            " MIN(balance)," +
-            " AVG(manager.salary)," +
-            " SUM(balance)" +
-            "FROM semantics " +
-            "GROUP BY city");
-    }
-
-    @Test
-    public void useAggregateFunctionInSelectClauseWithoutGroupByShouldPass() {
-        validate(
-            "SELECT" +
-            " COUNT(*)," +
-            " MAX(age)," +
-            " MIN(balance)," +
-            " AVG(manager.salary)," +
-            " SUM(balance)" +
-            "FROM semantics");
-    }
-
-    @Test
-    public void countFunctionCallOnAnyFieldShouldPass() {
-        validate(
-            "SELECT" +
-            " COUNT(address)," +
-            " COUNT(age)," +
-            " COUNT(birthday)," +
-            " COUNT(location)," +
-            " COUNT(manager.address)," +
-            " COUNT(employer)" +
-            "FROM semantics");
-    }
-
-    @Test
-    public void maxFunctionCallOnTextFieldShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT MAX(address) FROM semantics",
-            "Function [MAX] cannot work with [TEXT].",
-            "Usage: MAX(NUMBER T) -> T"
-        );
-    }
-
-    @Test
-    public void minFunctionCallOnDateFieldShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT MIN(birthday) FROM semantics",
-            "Function [MIN] cannot work with [DATE].",
-            "Usage: MIN(NUMBER T) -> T"
-        );
-    }
-
-    @Test
-    public void avgFunctionCallOnBooleanFieldShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT AVG(p.active) FROM semantics s, s.projects p",
-            "Function [AVG] cannot work with [BOOLEAN].",
-            "Usage: AVG(NUMBER T) -> DOUBLE"
-        );
-    }
-
-    @Test
-    public void sumFunctionCallOnBooleanFieldShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT SUM(city) FROM semantics",
-            "Function [SUM] cannot work with [KEYWORD].",
-            "Usage: SUM(NUMBER T) -> T"
-        );
-    }
-
-    @Test
-    public void useAvgFunctionCallAliasInHavingClauseShouldPass() {
-        validate("SELECT city, AVG(age) AS avg FROM semantics GROUP BY city HAVING avg > 10");
-    }
-
-    @Test
-    public void useAvgAndMaxFunctionCallAliasInHavingClauseShouldPass() {
-        validate(
-            "SELECT city, AVG(age) AS avg, MAX(balance) AS bal FROM semantics " +
-            "GROUP BY city HAVING avg > 10 AND bal > 10000"
-        );
-    }
-
-    @Test
-    public void useAvgFunctionCallWithoutAliasInHavingShouldPass() {
-        validate("SELECT city, AVG(age) FROM semantics GROUP BY city HAVING AVG(age) > 10");
-    }
-
-    @Test
-    public void useDifferentAggregateFunctionInHavingClauseShouldPass() {
-        validate("SELECT city, AVG(age) FROM semantics GROUP BY city HAVING COUNT(*) > 10 AND SUM(balance) <= 10000");
-    }
-
-    @Test
-    public void useAvgFunctionCallAliasInOrderByClauseShouldPass() {
-        validate("SELECT city, AVG(age) AS avg FROM semantics GROUP BY city ORDER BY avg");
-    }
-
-    @Test
-    public void useAvgFunctionCallAliasInGroupByAndOrderByClauseShouldPass() {
-        validate("SELECT SUBSTRING(address, 0, 3) AS add FROM semantics GROUP BY add ORDER BY add");
-    }
-
-    @Test
-    public void useColumnNameAliasInOrderByClauseShouldPass() {
-        validate("SELECT age AS a, AVG(balance) FROM semantics GROUP BY age ORDER BY a");
-    }
-
-    @Test
-    public void useExpressionAliasInOrderByClauseShouldPass() {
-        validate("SELECT age + 1 AS a FROM semantics GROUP BY age ORDER BY a");
-    }
-
-    @Test
-    public void useAvgFunctionCallWithTextFieldInHavingClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT city FROM semantics GROUP BY city HAVING AVG(address) > 10",
-            "Function [AVG] cannot work with [TEXT].",
-            "Usage: AVG(NUMBER T) -> DOUBLE"
-        );
-    }
-
-    @Test
-    public void useCountFunctionCallWithNestedFieldShouldPass() {
-        validate("SELECT * FROM semantics s, s.projects p GROUP BY city HAVING COUNT(p) > 1");
-        validate("SELECT * FROM semantics s, s.projects p, p.members m GROUP BY city HAVING COUNT(m) > 1");
-    }
-
+  @Ignore("To be implemented")
+  @Test(expected = SemanticAnalysisException.class)
+  public void useAggregateFunctionInWhereClauseShouldFail() {
+    validate("SELECT * FROM semantics WHERE AVG(balance) > 10000");
+  }
+
+  @Test
+  public void useAggregateFunctionInSelectClauseShouldPass() {
+    validate(
+        "SELECT"
+            + " city,"
+            + " COUNT(*),"
+            + " MAX(age),"
+            + " MIN(balance),"
+            + " AVG(manager.salary),"
+            + " SUM(balance)"
+            + "FROM semantics "
+            + "GROUP BY city");
+  }
+
+  @Test
+  public void useAggregateFunctionInSelectClauseWithoutGroupByShouldPass() {
+    validate(
+        "SELECT"
+            + " COUNT(*),"
+            + " MAX(age),"
+            + " MIN(balance),"
+            + " AVG(manager.salary),"
+            + " SUM(balance)"
+            + "FROM semantics");
+  }
+
+  @Test
+  public void countFunctionCallOnAnyFieldShouldPass() {
+    validate(
+        "SELECT"
+            + " COUNT(address),"
+            + " COUNT(age),"
+            + " COUNT(birthday),"
+            + " COUNT(location),"
+            + " COUNT(manager.address),"
+            + " COUNT(employer)"
+            + "FROM semantics");
+  }
+
+  @Test
+  public void maxFunctionCallOnTextFieldShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT MAX(address) FROM semantics",
+        "Function [MAX] cannot work with [TEXT].",
+        "Usage: MAX(NUMBER T) -> T");
+  }
+
+  @Test
+  public void minFunctionCallOnDateFieldShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT MIN(birthday) FROM semantics",
+        "Function [MIN] cannot work with [DATE].",
+        "Usage: MIN(NUMBER T) -> T");
+  }
+
+  @Test
+  public void avgFunctionCallOnBooleanFieldShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT AVG(p.active) FROM semantics s, s.projects p",
+        "Function [AVG] cannot work with [BOOLEAN].",
+        "Usage: AVG(NUMBER T) -> DOUBLE");
+  }
+
+  @Test
+  public void sumFunctionCallOnBooleanFieldShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT SUM(city) FROM semantics",
+        "Function [SUM] cannot work with [KEYWORD].",
+        "Usage: SUM(NUMBER T) -> T");
+  }
+
+  @Test
+  public void useAvgFunctionCallAliasInHavingClauseShouldPass() {
+    validate("SELECT city, AVG(age) AS avg FROM semantics GROUP BY city HAVING avg > 10");
+  }
+
+  @Test
+  public void useAvgAndMaxFunctionCallAliasInHavingClauseShouldPass() {
+    validate(
+        "SELECT city, AVG(age) AS avg, MAX(balance) AS bal FROM semantics "
+            + "GROUP BY city HAVING avg > 10 AND bal > 10000");
+  }
+
+  @Test
+  public void useAvgFunctionCallWithoutAliasInHavingShouldPass() {
+    validate("SELECT city, AVG(age) FROM semantics GROUP BY city HAVING AVG(age) > 10");
+  }
+
+  @Test
+  public void useDifferentAggregateFunctionInHavingClauseShouldPass() {
+    validate(
+        "SELECT city, AVG(age) FROM semantics GROUP BY city HAVING COUNT(*) > 10 AND SUM(balance)"
+            + " <= 10000");
+  }
+
+  @Test
+  public void useAvgFunctionCallAliasInOrderByClauseShouldPass() {
+    validate("SELECT city, AVG(age) AS avg FROM semantics GROUP BY city ORDER BY avg");
+  }
+
+  @Test
+  public void useAvgFunctionCallAliasInGroupByAndOrderByClauseShouldPass() {
+    validate("SELECT SUBSTRING(address, 0, 3) AS add FROM semantics GROUP BY add ORDER BY add");
+  }
+
+  @Test
+  public void useColumnNameAliasInOrderByClauseShouldPass() {
+    validate("SELECT age AS a, AVG(balance) FROM semantics GROUP BY age ORDER BY a");
+  }
+
+  @Test
+  public void useExpressionAliasInOrderByClauseShouldPass() {
+    validate("SELECT age + 1 AS a FROM semantics GROUP BY age ORDER BY a");
+  }
+
+  @Test
+  public void useAvgFunctionCallWithTextFieldInHavingClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT city FROM semantics GROUP BY city HAVING AVG(address) > 10",
+        "Function [AVG] cannot work with [TEXT].",
+        "Usage: AVG(NUMBER T) -> DOUBLE");
+  }
+
+  @Test
+  public void useCountFunctionCallWithNestedFieldShouldPass() {
+    validate("SELECT * FROM semantics s, s.projects p GROUP BY city HAVING COUNT(p) > 1");
+    validate(
+        "SELECT * FROM semantics s, s.projects p, p.members m GROUP BY city HAVING COUNT(m) > 1");
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerBasicTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerBasicTest.java
index 67af723f8c..1d5ff595f3 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerBasicTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerBasicTest.java
@@ -3,13 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.aMapWithSize;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.BOOLEAN;
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.DATE;
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.DOUBLE;
@@ -37,561 +36,576 @@
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
 
 /**
- * Semantic analysis test cases focused on basic scope building logic which is the cornerstone of analysis followed.
- * The low abstraction here enumerating all present field names in each test case is intentional for better demonstration.
+ * Semantic analysis test cases focused on basic scope building logic which is the cornerstone of
+ * analysis followed. The low abstraction here enumerating all present field names in each test case
+ * is intentional for better demonstration.
  */
 public class SemanticAnalyzerBasicTest extends SemanticAnalyzerTestBase {
 
-    private SemanticContext context;
-
-    private OpenSearchMappingLoader analyzer;
+  private SemanticContext context;
 
-    @Before
-    public void setUp() {
-        context = new SemanticContext();
-        analyzer = new OpenSearchMappingLoader(context, LocalClusterState.state(), 1000);
-    }
+  private OpenSearchMappingLoader analyzer;
 
-    @Test
-    public void contextShouldIncludeAllFieldsAfterVisitingIndexNameInFromClause() {
-        analyzer.visitIndexName("semantics");
+  @Before
+  public void setUp() {
+    context = new SemanticContext();
+    analyzer = new OpenSearchMappingLoader(context, LocalClusterState.state(), 1000);
+  }
 
-        Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(21),
-                hasEntry("semantics", (Type) new OpenSearchIndex("semantics", INDEX)),
-                hasEntry("address", TEXT),
-                hasEntry("age", INTEGER),
-                hasEntry("balance", DOUBLE),
-                hasEntry("city", KEYWORD),
-                hasEntry("birthday", DATE),
-                hasEntry("location", GEO_POINT),
-                hasEntry("new_field", UNKNOWN),
-                hasEntry("field with spaces", TEXT),
-                hasEntry("employer", TEXT),
-                hasEntry("employer.keyword", KEYWORD),
-                hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
-                hasEntry("projects.active", BOOLEAN),
-                hasEntry("projects.release", DATE),
-                hasEntry("projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
-                hasEntry("projects.members.name", TEXT),
-                hasEntry("manager", OBJECT),
-                hasEntry("manager.name", TEXT),
-                hasEntry("manager.name.keyword", KEYWORD),
-                hasEntry("manager.address", KEYWORD),
-                hasEntry("manager.salary", LONG)
-            )
-        );
+  @Test
+  public void contextShouldIncludeAllFieldsAfterVisitingIndexNameInFromClause() {
+    analyzer.visitIndexName("semantics");
 
-        analyzer.visitAs("", new OpenSearchIndex("semantics", INDEX));
-        typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(41),
-                hasEntry("semantics", (Type) new OpenSearchIndex("semantics", INDEX)),
-                hasEntry("address", TEXT),
-                hasEntry("age", INTEGER),
-                hasEntry("balance", DOUBLE),
-                hasEntry("city", KEYWORD),
-                hasEntry("birthday", DATE),
-                hasEntry("location", GEO_POINT),
-                hasEntry("new_field", UNKNOWN),
-                hasEntry("field with spaces", TEXT),
-                hasEntry("employer", TEXT),
-                hasEntry("employer.keyword", KEYWORD),
-                hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
-                hasEntry("projects.active", BOOLEAN),
-                hasEntry("projects.release", DATE),
-                hasEntry("projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
-                hasEntry("projects.members.name", TEXT),
-                hasEntry("manager", OBJECT),
-                hasEntry("manager.name", TEXT),
-                hasEntry("manager.name.keyword", KEYWORD),
-                hasEntry("manager.address", KEYWORD),
-                hasEntry("manager.salary", LONG),
-                // These are also valid identifier in SQL
-                hasEntry("semantics.address", TEXT),
-                hasEntry("semantics.age", INTEGER),
-                hasEntry("semantics.balance", DOUBLE),
-                hasEntry("semantics.city", KEYWORD),
-                hasEntry("semantics.birthday", DATE),
-                hasEntry("semantics.location", GEO_POINT),
-                hasEntry("semantics.new_field", UNKNOWN),
-                hasEntry("semantics.field with spaces", TEXT),
-                hasEntry("semantics.employer", TEXT),
-                hasEntry("semantics.employer.keyword", KEYWORD),
-                hasEntry("semantics.projects", (Type) new OpenSearchIndex("semantics.projects", NESTED_FIELD)),
-                hasEntry("semantics.projects.active", BOOLEAN),
-                hasEntry("semantics.projects.release", DATE),
-                hasEntry("semantics.projects.members", (Type) new OpenSearchIndex("semantics.projects.members", NESTED_FIELD)),
-                hasEntry("semantics.projects.members.name", TEXT),
-                hasEntry("semantics.manager", OBJECT),
-                hasEntry("semantics.manager.name", TEXT),
-                hasEntry("semantics.manager.name.keyword", KEYWORD),
-                hasEntry("semantics.manager.address", KEYWORD),
-                hasEntry("semantics.manager.salary", LONG)
-            )
-        );
-    }
+    Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(21),
+            hasEntry("semantics", (Type) new OpenSearchIndex("semantics", INDEX)),
+            hasEntry("address", TEXT),
+            hasEntry("age", INTEGER),
+            hasEntry("balance", DOUBLE),
+            hasEntry("city", KEYWORD),
+            hasEntry("birthday", DATE),
+            hasEntry("location", GEO_POINT),
+            hasEntry("new_field", UNKNOWN),
+            hasEntry("field with spaces", TEXT),
+            hasEntry("employer", TEXT),
+            hasEntry("employer.keyword", KEYWORD),
+            hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
+            hasEntry("projects.active", BOOLEAN),
+            hasEntry("projects.release", DATE),
+            hasEntry(
+                "projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
+            hasEntry("projects.members.name", TEXT),
+            hasEntry("manager", OBJECT),
+            hasEntry("manager.name", TEXT),
+            hasEntry("manager.name.keyword", KEYWORD),
+            hasEntry("manager.address", KEYWORD),
+            hasEntry("manager.salary", LONG)));
 
-    @Test
-    public void contextShouldIncludeAllFieldsPrefixedByIndexAliasAfterVisitingIndexNameWithAliasInFromClause() {
-        OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
-        analyzer.visitIndexName("semantics");
-        analyzer.visitAs("s", indexType);
+    analyzer.visitAs("", new OpenSearchIndex("semantics", INDEX));
+    typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(41),
+            hasEntry("semantics", (Type) new OpenSearchIndex("semantics", INDEX)),
+            hasEntry("address", TEXT),
+            hasEntry("age", INTEGER),
+            hasEntry("balance", DOUBLE),
+            hasEntry("city", KEYWORD),
+            hasEntry("birthday", DATE),
+            hasEntry("location", GEO_POINT),
+            hasEntry("new_field", UNKNOWN),
+            hasEntry("field with spaces", TEXT),
+            hasEntry("employer", TEXT),
+            hasEntry("employer.keyword", KEYWORD),
+            hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
+            hasEntry("projects.active", BOOLEAN),
+            hasEntry("projects.release", DATE),
+            hasEntry(
+                "projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
+            hasEntry("projects.members.name", TEXT),
+            hasEntry("manager", OBJECT),
+            hasEntry("manager.name", TEXT),
+            hasEntry("manager.name.keyword", KEYWORD),
+            hasEntry("manager.address", KEYWORD),
+            hasEntry("manager.salary", LONG),
+            // These are also valid identifier in SQL
+            hasEntry("semantics.address", TEXT),
+            hasEntry("semantics.age", INTEGER),
+            hasEntry("semantics.balance", DOUBLE),
+            hasEntry("semantics.city", KEYWORD),
+            hasEntry("semantics.birthday", DATE),
+            hasEntry("semantics.location", GEO_POINT),
+            hasEntry("semantics.new_field", UNKNOWN),
+            hasEntry("semantics.field with spaces", TEXT),
+            hasEntry("semantics.employer", TEXT),
+            hasEntry("semantics.employer.keyword", KEYWORD),
+            hasEntry(
+                "semantics.projects",
+                (Type) new OpenSearchIndex("semantics.projects", NESTED_FIELD)),
+            hasEntry("semantics.projects.active", BOOLEAN),
+            hasEntry("semantics.projects.release", DATE),
+            hasEntry(
+                "semantics.projects.members",
+                (Type) new OpenSearchIndex("semantics.projects.members", NESTED_FIELD)),
+            hasEntry("semantics.projects.members.name", TEXT),
+            hasEntry("semantics.manager", OBJECT),
+            hasEntry("semantics.manager.name", TEXT),
+            hasEntry("semantics.manager.name.keyword", KEYWORD),
+            hasEntry("semantics.manager.address", KEYWORD),
+            hasEntry("semantics.manager.salary", LONG)));
+  }
 
-        Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(41),
-                hasEntry("semantics", (Type) indexType),
-                // These are also valid because alias is optional in SQL
-                hasEntry("address", TEXT),
-                hasEntry("age", INTEGER),
-                hasEntry("balance", DOUBLE),
-                hasEntry("city", KEYWORD),
-                hasEntry("birthday", DATE),
-                hasEntry("location", GEO_POINT),
-                hasEntry("new_field", UNKNOWN),
-                hasEntry("field with spaces", TEXT),
-                hasEntry("employer", TEXT),
-                hasEntry("employer.keyword", KEYWORD),
-                hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
-                hasEntry("projects.active", BOOLEAN),
-                hasEntry("projects.release", DATE),
-                hasEntry("projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
-                hasEntry("projects.members.name", TEXT),
-                hasEntry("manager", OBJECT),
-                hasEntry("manager.name", TEXT),
-                hasEntry("manager.name.keyword", KEYWORD),
-                hasEntry("manager.address", KEYWORD),
-                hasEntry("manager.salary", LONG),
-                // These are valid because of alias specified
-                hasEntry("s.address", TEXT),
-                hasEntry("s.age", INTEGER),
-                hasEntry("s.balance", DOUBLE),
-                hasEntry("s.city", KEYWORD),
-                hasEntry("s.birthday", DATE),
-                hasEntry("s.location", GEO_POINT),
-                hasEntry("s.new_field", UNKNOWN),
-                hasEntry("s.field with spaces", TEXT),
-                hasEntry("s.employer", TEXT),
-                hasEntry("s.employer.keyword", KEYWORD),
-                hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("s.projects.active", BOOLEAN),
-                hasEntry("s.projects.release", DATE),
-                hasEntry("s.projects.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("s.projects.members.name", TEXT),
-                hasEntry("s.manager", OBJECT),
-                hasEntry("s.manager.name", TEXT),
-                hasEntry("s.manager.name.keyword", KEYWORD),
-                hasEntry("s.manager.address", KEYWORD),
-                hasEntry("s.manager.salary", LONG)
-            )
-        );
-    }
+  @Test
+  public void
+      contextShouldIncludeAllFieldsPrefixedByIndexAliasAfterVisitingIndexNameWithAliasInFromClause() {
+    OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
+    analyzer.visitIndexName("semantics");
+    analyzer.visitAs("s", indexType);
 
-    @Test
-    public void contextShouldIncludeSameFieldsAfterVisitingNestedFieldWithoutAliasInFromClause() {
-        OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
-        analyzer.visitIndexName("semantics");
-        analyzer.visitAs("s", indexType);
-        analyzer.visitIndexName("s.projects");
-        analyzer.visitAs("", new OpenSearchIndex("s.projects", NESTED_FIELD));
+    Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(41),
+            hasEntry("semantics", (Type) indexType),
+            // These are also valid because alias is optional in SQL
+            hasEntry("address", TEXT),
+            hasEntry("age", INTEGER),
+            hasEntry("balance", DOUBLE),
+            hasEntry("city", KEYWORD),
+            hasEntry("birthday", DATE),
+            hasEntry("location", GEO_POINT),
+            hasEntry("new_field", UNKNOWN),
+            hasEntry("field with spaces", TEXT),
+            hasEntry("employer", TEXT),
+            hasEntry("employer.keyword", KEYWORD),
+            hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
+            hasEntry("projects.active", BOOLEAN),
+            hasEntry("projects.release", DATE),
+            hasEntry(
+                "projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
+            hasEntry("projects.members.name", TEXT),
+            hasEntry("manager", OBJECT),
+            hasEntry("manager.name", TEXT),
+            hasEntry("manager.name.keyword", KEYWORD),
+            hasEntry("manager.address", KEYWORD),
+            hasEntry("manager.salary", LONG),
+            // These are valid because of alias specified
+            hasEntry("s.address", TEXT),
+            hasEntry("s.age", INTEGER),
+            hasEntry("s.balance", DOUBLE),
+            hasEntry("s.city", KEYWORD),
+            hasEntry("s.birthday", DATE),
+            hasEntry("s.location", GEO_POINT),
+            hasEntry("s.new_field", UNKNOWN),
+            hasEntry("s.field with spaces", TEXT),
+            hasEntry("s.employer", TEXT),
+            hasEntry("s.employer.keyword", KEYWORD),
+            hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("s.projects.active", BOOLEAN),
+            hasEntry("s.projects.release", DATE),
+            hasEntry(
+                "s.projects.members",
+                (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("s.projects.members.name", TEXT),
+            hasEntry("s.manager", OBJECT),
+            hasEntry("s.manager.name", TEXT),
+            hasEntry("s.manager.name.keyword", KEYWORD),
+            hasEntry("s.manager.address", KEYWORD),
+            hasEntry("s.manager.salary", LONG)));
+  }
 
-        Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(41),
-                hasEntry("semantics", (Type) indexType),
-                // These are also valid because alias is optional in SQL
-                hasEntry("address", TEXT),
-                hasEntry("age", INTEGER),
-                hasEntry("balance", DOUBLE),
-                hasEntry("city", KEYWORD),
-                hasEntry("birthday", DATE),
-                hasEntry("location", GEO_POINT),
-                hasEntry("new_field", UNKNOWN),
-                hasEntry("field with spaces", TEXT),
-                hasEntry("employer", TEXT),
-                hasEntry("employer.keyword", KEYWORD),
-                hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
-                hasEntry("projects.active", BOOLEAN),
-                hasEntry("projects.release", DATE),
-                hasEntry("projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
-                hasEntry("projects.members.name", TEXT),
-                hasEntry("manager", OBJECT),
-                hasEntry("manager.name", TEXT),
-                hasEntry("manager.name.keyword", KEYWORD),
-                hasEntry("manager.address", KEYWORD),
-                hasEntry("manager.salary", LONG),
-                // These are valid because of alias specified
-                hasEntry("s.address", TEXT),
-                hasEntry("s.age", INTEGER),
-                hasEntry("s.balance", DOUBLE),
-                hasEntry("s.city", KEYWORD),
-                hasEntry("s.birthday", DATE),
-                hasEntry("s.location", GEO_POINT),
-                hasEntry("s.new_field", UNKNOWN),
-                hasEntry("s.field with spaces", TEXT),
-                hasEntry("s.employer", TEXT),
-                hasEntry("s.employer.keyword", KEYWORD),
-                hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("s.projects.active", BOOLEAN),
-                hasEntry("s.projects.release", DATE),
-                hasEntry("s.projects.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("s.projects.members.name", TEXT),
-                hasEntry("s.manager", OBJECT),
-                hasEntry("s.manager.name", TEXT),
-                hasEntry("s.manager.name.keyword", KEYWORD),
-                hasEntry("s.manager.address", KEYWORD),
-                hasEntry("s.manager.salary", LONG)
-            )
-        );
-    }
+  @Test
+  public void contextShouldIncludeSameFieldsAfterVisitingNestedFieldWithoutAliasInFromClause() {
+    OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
+    analyzer.visitIndexName("semantics");
+    analyzer.visitAs("s", indexType);
+    analyzer.visitIndexName("s.projects");
+    analyzer.visitAs("", new OpenSearchIndex("s.projects", NESTED_FIELD));
 
-    @Test
-    public void contextShouldIncludeMoreFieldsPrefixedByNestedFieldAliasAfterVisitingNestedFieldWithAliasInFromClause() {
-        OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
-        analyzer.visitIndexName("semantics");
-        analyzer.visitAs("s", indexType);
-        analyzer.visitIndexName("s.projects");
-        analyzer.visitAs("p", new OpenSearchIndex("s.projects", NESTED_FIELD));
+    Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(41),
+            hasEntry("semantics", (Type) indexType),
+            // These are also valid because alias is optional in SQL
+            hasEntry("address", TEXT),
+            hasEntry("age", INTEGER),
+            hasEntry("balance", DOUBLE),
+            hasEntry("city", KEYWORD),
+            hasEntry("birthday", DATE),
+            hasEntry("location", GEO_POINT),
+            hasEntry("new_field", UNKNOWN),
+            hasEntry("field with spaces", TEXT),
+            hasEntry("employer", TEXT),
+            hasEntry("employer.keyword", KEYWORD),
+            hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
+            hasEntry("projects.active", BOOLEAN),
+            hasEntry("projects.release", DATE),
+            hasEntry(
+                "projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
+            hasEntry("projects.members.name", TEXT),
+            hasEntry("manager", OBJECT),
+            hasEntry("manager.name", TEXT),
+            hasEntry("manager.name.keyword", KEYWORD),
+            hasEntry("manager.address", KEYWORD),
+            hasEntry("manager.salary", LONG),
+            // These are valid because of alias specified
+            hasEntry("s.address", TEXT),
+            hasEntry("s.age", INTEGER),
+            hasEntry("s.balance", DOUBLE),
+            hasEntry("s.city", KEYWORD),
+            hasEntry("s.birthday", DATE),
+            hasEntry("s.location", GEO_POINT),
+            hasEntry("s.new_field", UNKNOWN),
+            hasEntry("s.field with spaces", TEXT),
+            hasEntry("s.employer", TEXT),
+            hasEntry("s.employer.keyword", KEYWORD),
+            hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("s.projects.active", BOOLEAN),
+            hasEntry("s.projects.release", DATE),
+            hasEntry(
+                "s.projects.members",
+                (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("s.projects.members.name", TEXT),
+            hasEntry("s.manager", OBJECT),
+            hasEntry("s.manager.name", TEXT),
+            hasEntry("s.manager.name.keyword", KEYWORD),
+            hasEntry("s.manager.address", KEYWORD),
+            hasEntry("s.manager.salary", LONG)));
+  }
 
-        Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(46),
-                // These are also valid because alias is optional in SQL
-                hasEntry("semantics", (Type) indexType),
-                // These are also valid because alias is optional in SQL
-                hasEntry("address", TEXT),
-                hasEntry("age", INTEGER),
-                hasEntry("balance", DOUBLE),
-                hasEntry("city", KEYWORD),
-                hasEntry("birthday", DATE),
-                hasEntry("location", GEO_POINT),
-                hasEntry("new_field", UNKNOWN),
-                hasEntry("field with spaces", TEXT),
-                hasEntry("employer", TEXT),
-                hasEntry("employer.keyword", KEYWORD),
-                hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
-                hasEntry("projects.active", BOOLEAN),
-                hasEntry("projects.release", DATE),
-                hasEntry("projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
-                hasEntry("projects.members.name", TEXT),
-                hasEntry("manager", OBJECT),
-                hasEntry("manager.name", TEXT),
-                hasEntry("manager.name.keyword", KEYWORD),
-                hasEntry("manager.address", KEYWORD),
-                hasEntry("manager.salary", LONG),
-                // These are valid because of alias specified
-                hasEntry("s.address", TEXT),
-                hasEntry("s.age", INTEGER),
-                hasEntry("s.balance", DOUBLE),
-                hasEntry("s.city", KEYWORD),
-                hasEntry("s.birthday", DATE),
-                hasEntry("s.location", GEO_POINT),
-                hasEntry("s.new_field", UNKNOWN),
-                hasEntry("s.field with spaces", TEXT),
-                hasEntry("s.employer", TEXT),
-                hasEntry("s.employer.keyword", KEYWORD),
-                hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("s.projects.active", BOOLEAN),
-                hasEntry("s.projects.release", DATE),
-                hasEntry("s.projects.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("s.projects.members.name", TEXT),
-                hasEntry("s.manager", OBJECT),
-                hasEntry("s.manager.name", TEXT),
-                hasEntry("s.manager.name.keyword", KEYWORD),
-                hasEntry("s.manager.address", KEYWORD),
-                hasEntry("s.manager.salary", LONG),
-                // Valid because of nested field alias specified
-                hasEntry("p", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("p.active", BOOLEAN),
-                hasEntry("p.release", DATE),
-                hasEntry("p.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("p.members.name", TEXT)
-            )
-        );
-    }
+  @Test
+  public void
+      contextShouldIncludeMoreFieldsPrefixedByNestedFieldAliasAfterVisitingNestedFieldWithAliasInFromClause() {
+    OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
+    analyzer.visitIndexName("semantics");
+    analyzer.visitAs("s", indexType);
+    analyzer.visitIndexName("s.projects");
+    analyzer.visitAs("p", new OpenSearchIndex("s.projects", NESTED_FIELD));
 
-    @Test
-    public void contextShouldIncludeMoreFieldsPrefixedByNestedFieldAliasAfterVisitingDeepNestedFieldWithAliasInFromClause() {
-        OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
-        analyzer.visitIndexName("semantics");
-        analyzer.visitAs("s", indexType);
-        analyzer.visitIndexName("s.projects.members");
-        analyzer.visitAs("m", new OpenSearchIndex("s.projects.members", NESTED_FIELD));
+    Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(46),
+            // These are also valid because alias is optional in SQL
+            hasEntry("semantics", (Type) indexType),
+            // These are also valid because alias is optional in SQL
+            hasEntry("address", TEXT),
+            hasEntry("age", INTEGER),
+            hasEntry("balance", DOUBLE),
+            hasEntry("city", KEYWORD),
+            hasEntry("birthday", DATE),
+            hasEntry("location", GEO_POINT),
+            hasEntry("new_field", UNKNOWN),
+            hasEntry("field with spaces", TEXT),
+            hasEntry("employer", TEXT),
+            hasEntry("employer.keyword", KEYWORD),
+            hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
+            hasEntry("projects.active", BOOLEAN),
+            hasEntry("projects.release", DATE),
+            hasEntry(
+                "projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
+            hasEntry("projects.members.name", TEXT),
+            hasEntry("manager", OBJECT),
+            hasEntry("manager.name", TEXT),
+            hasEntry("manager.name.keyword", KEYWORD),
+            hasEntry("manager.address", KEYWORD),
+            hasEntry("manager.salary", LONG),
+            // These are valid because of alias specified
+            hasEntry("s.address", TEXT),
+            hasEntry("s.age", INTEGER),
+            hasEntry("s.balance", DOUBLE),
+            hasEntry("s.city", KEYWORD),
+            hasEntry("s.birthday", DATE),
+            hasEntry("s.location", GEO_POINT),
+            hasEntry("s.new_field", UNKNOWN),
+            hasEntry("s.field with spaces", TEXT),
+            hasEntry("s.employer", TEXT),
+            hasEntry("s.employer.keyword", KEYWORD),
+            hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("s.projects.active", BOOLEAN),
+            hasEntry("s.projects.release", DATE),
+            hasEntry(
+                "s.projects.members",
+                (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("s.projects.members.name", TEXT),
+            hasEntry("s.manager", OBJECT),
+            hasEntry("s.manager.name", TEXT),
+            hasEntry("s.manager.name.keyword", KEYWORD),
+            hasEntry("s.manager.address", KEYWORD),
+            hasEntry("s.manager.salary", LONG),
+            // Valid because of nested field alias specified
+            hasEntry("p", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("p.active", BOOLEAN),
+            hasEntry("p.release", DATE),
+            hasEntry("p.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("p.members.name", TEXT)));
+  }
 
-        Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
+  @Test
+  public void
+      contextShouldIncludeMoreFieldsPrefixedByNestedFieldAliasAfterVisitingDeepNestedFieldWithAliasInFromClause() {
+    OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
+    analyzer.visitIndexName("semantics");
+    analyzer.visitAs("s", indexType);
+    analyzer.visitIndexName("s.projects.members");
+    analyzer.visitAs("m", new OpenSearchIndex("s.projects.members", NESTED_FIELD));
 
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(43),
-                hasEntry("semantics", (Type) indexType),
-                // These are also valid because alias is optional in SQL
-                hasEntry("address", TEXT),
-                hasEntry("age", INTEGER),
-                hasEntry("balance", DOUBLE),
-                hasEntry("city", KEYWORD),
-                hasEntry("birthday", DATE),
-                hasEntry("location", GEO_POINT),
-                hasEntry("new_field", UNKNOWN),
-                hasEntry("field with spaces", TEXT),
-                hasEntry("employer", TEXT),
-                hasEntry("employer.keyword", KEYWORD),
-                hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
-                hasEntry("projects.active", BOOLEAN),
-                hasEntry("projects.release", DATE),
-                hasEntry("projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
-                hasEntry("projects.members.name", TEXT),
-                hasEntry("manager", OBJECT),
-                hasEntry("manager.name", TEXT),
-                hasEntry("manager.name.keyword", KEYWORD),
-                hasEntry("manager.address", KEYWORD),
-                hasEntry("manager.salary", LONG),
-                // These are valid because of alias specified
-                hasEntry("s.address", TEXT),
-                hasEntry("s.age", INTEGER),
-                hasEntry("s.balance", DOUBLE),
-                hasEntry("s.city", KEYWORD),
-                hasEntry("s.birthday", DATE),
-                hasEntry("s.location", GEO_POINT),
-                hasEntry("s.new_field", UNKNOWN),
-                hasEntry("s.field with spaces", TEXT),
-                hasEntry("s.employer", TEXT),
-                hasEntry("s.employer.keyword", KEYWORD),
-                hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("s.projects.active", BOOLEAN),
-                hasEntry("s.projects.release", DATE),
-                hasEntry("s.projects.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("s.projects.members.name", TEXT),
-                hasEntry("s.manager", OBJECT),
-                hasEntry("s.manager.name", TEXT),
-                hasEntry("s.manager.name.keyword", KEYWORD),
-                hasEntry("s.manager.address", KEYWORD),
-                hasEntry("s.manager.salary", LONG),
-                // Valid because of deep nested field alias specified
-                hasEntry("m", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("m.name", TEXT)
-            )
-        );
-    }
+    Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
 
-    @Test
-    public void contextShouldIncludeMoreFieldsPrefixedByNestedFieldAliasAfterVisitingAllNestedFieldsWithAliasInFromClause() {
-        OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
-        analyzer.visitIndexName("semantics");
-        analyzer.visitAs("s", indexType);
-        analyzer.visitIndexName("s.projects");
-        analyzer.visitAs("p", new OpenSearchIndex("s.projects", NESTED_FIELD));
-        analyzer.visitIndexName("s.projects.members");
-        analyzer.visitAs("m", new OpenSearchIndex("s.projects.members", NESTED_FIELD));
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(43),
+            hasEntry("semantics", (Type) indexType),
+            // These are also valid because alias is optional in SQL
+            hasEntry("address", TEXT),
+            hasEntry("age", INTEGER),
+            hasEntry("balance", DOUBLE),
+            hasEntry("city", KEYWORD),
+            hasEntry("birthday", DATE),
+            hasEntry("location", GEO_POINT),
+            hasEntry("new_field", UNKNOWN),
+            hasEntry("field with spaces", TEXT),
+            hasEntry("employer", TEXT),
+            hasEntry("employer.keyword", KEYWORD),
+            hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
+            hasEntry("projects.active", BOOLEAN),
+            hasEntry("projects.release", DATE),
+            hasEntry(
+                "projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
+            hasEntry("projects.members.name", TEXT),
+            hasEntry("manager", OBJECT),
+            hasEntry("manager.name", TEXT),
+            hasEntry("manager.name.keyword", KEYWORD),
+            hasEntry("manager.address", KEYWORD),
+            hasEntry("manager.salary", LONG),
+            // These are valid because of alias specified
+            hasEntry("s.address", TEXT),
+            hasEntry("s.age", INTEGER),
+            hasEntry("s.balance", DOUBLE),
+            hasEntry("s.city", KEYWORD),
+            hasEntry("s.birthday", DATE),
+            hasEntry("s.location", GEO_POINT),
+            hasEntry("s.new_field", UNKNOWN),
+            hasEntry("s.field with spaces", TEXT),
+            hasEntry("s.employer", TEXT),
+            hasEntry("s.employer.keyword", KEYWORD),
+            hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("s.projects.active", BOOLEAN),
+            hasEntry("s.projects.release", DATE),
+            hasEntry(
+                "s.projects.members",
+                (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("s.projects.members.name", TEXT),
+            hasEntry("s.manager", OBJECT),
+            hasEntry("s.manager.name", TEXT),
+            hasEntry("s.manager.name.keyword", KEYWORD),
+            hasEntry("s.manager.address", KEYWORD),
+            hasEntry("s.manager.salary", LONG),
+            // Valid because of deep nested field alias specified
+            hasEntry("m", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("m.name", TEXT)));
+  }
 
-        Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(48),
-                hasEntry("semantics", (Type) indexType),
-                // These are also valid because alias is optional in SQL
-                hasEntry("address", TEXT),
-                hasEntry("age", INTEGER),
-                hasEntry("balance", DOUBLE),
-                hasEntry("city", KEYWORD),
-                hasEntry("birthday", DATE),
-                hasEntry("location", GEO_POINT),
-                hasEntry("new_field", UNKNOWN),
-                hasEntry("field with spaces", TEXT),
-                hasEntry("employer", TEXT),
-                hasEntry("employer.keyword", KEYWORD),
-                hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
-                hasEntry("projects.active", BOOLEAN),
-                hasEntry("projects.release", DATE),
-                hasEntry("projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
-                hasEntry("projects.members.name", TEXT),
-                hasEntry("manager", OBJECT),
-                hasEntry("manager.name", TEXT),
-                hasEntry("manager.name.keyword", KEYWORD),
-                hasEntry("manager.address", KEYWORD),
-                hasEntry("manager.salary", LONG),
-                // These are valid because of alias specified
-                hasEntry("s.address", TEXT),
-                hasEntry("s.age", INTEGER),
-                hasEntry("s.balance", DOUBLE),
-                hasEntry("s.city", KEYWORD),
-                hasEntry("s.birthday", DATE),
-                hasEntry("s.location", GEO_POINT),
-                hasEntry("s.new_field", UNKNOWN),
-                hasEntry("s.field with spaces", TEXT),
-                hasEntry("s.employer", TEXT),
-                hasEntry("s.employer.keyword", KEYWORD),
-                hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("s.projects.active", BOOLEAN),
-                hasEntry("s.projects.release", DATE),
-                hasEntry("s.projects.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("s.projects.members.name", TEXT),
-                hasEntry("s.manager", OBJECT),
-                hasEntry("s.manager.name", TEXT),
-                hasEntry("s.manager.name.keyword", KEYWORD),
-                hasEntry("s.manager.address", KEYWORD),
-                hasEntry("s.manager.salary", LONG),
-                // Valid because of nested field alias specified
-                hasEntry("p", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("p.active", BOOLEAN),
-                hasEntry("p.release", DATE),
-                hasEntry("p.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("p.members.name", TEXT),
-                // Valid because of deep nested field alias specified
-                hasEntry("m", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("m.name", TEXT)
-            )
-        );
-    }
+  @Test
+  public void
+      contextShouldIncludeMoreFieldsPrefixedByNestedFieldAliasAfterVisitingAllNestedFieldsWithAliasInFromClause() {
+    OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
+    analyzer.visitIndexName("semantics");
+    analyzer.visitAs("s", indexType);
+    analyzer.visitIndexName("s.projects");
+    analyzer.visitAs("p", new OpenSearchIndex("s.projects", NESTED_FIELD));
+    analyzer.visitIndexName("s.projects.members");
+    analyzer.visitAs("m", new OpenSearchIndex("s.projects.members", NESTED_FIELD));
 
-    @Test
-    public void contextShouldIncludeMoreFieldsPrefixedByNestedFieldAliasAfterVisitingNestedFieldWithAliasInSubqueryFromClause() {
-        OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
-        analyzer.visitIndexName("semantics");
-        analyzer.visitAs("s", indexType);
+    Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(48),
+            hasEntry("semantics", (Type) indexType),
+            // These are also valid because alias is optional in SQL
+            hasEntry("address", TEXT),
+            hasEntry("age", INTEGER),
+            hasEntry("balance", DOUBLE),
+            hasEntry("city", KEYWORD),
+            hasEntry("birthday", DATE),
+            hasEntry("location", GEO_POINT),
+            hasEntry("new_field", UNKNOWN),
+            hasEntry("field with spaces", TEXT),
+            hasEntry("employer", TEXT),
+            hasEntry("employer.keyword", KEYWORD),
+            hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
+            hasEntry("projects.active", BOOLEAN),
+            hasEntry("projects.release", DATE),
+            hasEntry(
+                "projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
+            hasEntry("projects.members.name", TEXT),
+            hasEntry("manager", OBJECT),
+            hasEntry("manager.name", TEXT),
+            hasEntry("manager.name.keyword", KEYWORD),
+            hasEntry("manager.address", KEYWORD),
+            hasEntry("manager.salary", LONG),
+            // These are valid because of alias specified
+            hasEntry("s.address", TEXT),
+            hasEntry("s.age", INTEGER),
+            hasEntry("s.balance", DOUBLE),
+            hasEntry("s.city", KEYWORD),
+            hasEntry("s.birthday", DATE),
+            hasEntry("s.location", GEO_POINT),
+            hasEntry("s.new_field", UNKNOWN),
+            hasEntry("s.field with spaces", TEXT),
+            hasEntry("s.employer", TEXT),
+            hasEntry("s.employer.keyword", KEYWORD),
+            hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("s.projects.active", BOOLEAN),
+            hasEntry("s.projects.release", DATE),
+            hasEntry(
+                "s.projects.members",
+                (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("s.projects.members.name", TEXT),
+            hasEntry("s.manager", OBJECT),
+            hasEntry("s.manager.name", TEXT),
+            hasEntry("s.manager.name.keyword", KEYWORD),
+            hasEntry("s.manager.address", KEYWORD),
+            hasEntry("s.manager.salary", LONG),
+            // Valid because of nested field alias specified
+            hasEntry("p", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("p.active", BOOLEAN),
+            hasEntry("p.release", DATE),
+            hasEntry("p.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("p.members.name", TEXT),
+            // Valid because of deep nested field alias specified
+            hasEntry("m", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("m.name", TEXT)));
+  }
 
-        context.push();
-        analyzer.visitIndexName("s.projects");
-        analyzer.visitAs("p", new OpenSearchIndex("s.projects", NESTED_FIELD));
+  @Test
+  public void
+      contextShouldIncludeMoreFieldsPrefixedByNestedFieldAliasAfterVisitingNestedFieldWithAliasInSubqueryFromClause() {
+    OpenSearchIndex indexType = new OpenSearchIndex("semantics", INDEX);
+    analyzer.visitIndexName("semantics");
+    analyzer.visitAs("s", indexType);
 
-        Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(46),
-                // These are also valid because alias is optional in SQL
-                hasEntry("semantics", (Type) indexType),
-                // These are also valid because alias is optional in SQL
-                hasEntry("address", TEXT),
-                hasEntry("age", INTEGER),
-                hasEntry("balance", DOUBLE),
-                hasEntry("city", KEYWORD),
-                hasEntry("birthday", DATE),
-                hasEntry("location", GEO_POINT),
-                hasEntry("new_field", UNKNOWN),
-                hasEntry("field with spaces", TEXT),
-                hasEntry("employer", TEXT),
-                hasEntry("employer.keyword", KEYWORD),
-                hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
-                hasEntry("projects.active", BOOLEAN),
-                hasEntry("projects.release", DATE),
-                hasEntry("projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
-                hasEntry("projects.members.name", TEXT),
-                hasEntry("manager", OBJECT),
-                hasEntry("manager.name", TEXT),
-                hasEntry("manager.name.keyword", KEYWORD),
-                hasEntry("manager.address", KEYWORD),
-                hasEntry("manager.salary", LONG),
-                // These are valid because of alias specified
-                hasEntry("s.address", TEXT),
-                hasEntry("s.age", INTEGER),
-                hasEntry("s.balance", DOUBLE),
-                hasEntry("s.city", KEYWORD),
-                hasEntry("s.birthday", DATE),
-                hasEntry("s.location", GEO_POINT),
-                hasEntry("s.new_field", UNKNOWN),
-                hasEntry("s.field with spaces", TEXT),
-                hasEntry("s.employer", TEXT),
-                hasEntry("s.employer.keyword", KEYWORD),
-                hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("s.projects.active", BOOLEAN),
-                hasEntry("s.projects.release", DATE),
-                hasEntry("s.projects.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("s.projects.members.name", TEXT),
-                hasEntry("s.manager", OBJECT),
-                hasEntry("s.manager.name", TEXT),
-                hasEntry("s.manager.name.keyword", KEYWORD),
-                hasEntry("s.manager.address", KEYWORD),
-                hasEntry("s.manager.salary", LONG),
-                // Valid because of nested field alias specified
-                hasEntry("p", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("p.active", BOOLEAN),
-                hasEntry("p.release", DATE),
-                hasEntry("p.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("p.members.name", TEXT)
-            )
-        );
+    context.push();
+    analyzer.visitIndexName("s.projects");
+    analyzer.visitAs("p", new OpenSearchIndex("s.projects", NESTED_FIELD));
 
-        context.pop();
-        typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(41),
-                hasEntry("semantics", (Type) indexType),
-                // These are also valid because alias is optional in SQL
-                hasEntry("address", TEXT),
-                hasEntry("age", INTEGER),
-                hasEntry("balance", DOUBLE),
-                hasEntry("city", KEYWORD),
-                hasEntry("birthday", DATE),
-                hasEntry("location", GEO_POINT),
-                hasEntry("new_field", UNKNOWN),
-                hasEntry("field with spaces", TEXT),
-                hasEntry("employer", TEXT),
-                hasEntry("employer.keyword", KEYWORD),
-                hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
-                hasEntry("projects.active", BOOLEAN),
-                hasEntry("projects.release", DATE),
-                hasEntry("projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
-                hasEntry("projects.members.name", TEXT),
-                hasEntry("manager", OBJECT),
-                hasEntry("manager.name", TEXT),
-                hasEntry("manager.name.keyword", KEYWORD),
-                hasEntry("manager.address", KEYWORD),
-                hasEntry("manager.salary", LONG),
-                // These are valid because of alias specified
-                hasEntry("s.address", TEXT),
-                hasEntry("s.age", INTEGER),
-                hasEntry("s.balance", DOUBLE),
-                hasEntry("s.city", KEYWORD),
-                hasEntry("s.birthday", DATE),
-                hasEntry("s.location", GEO_POINT),
-                hasEntry("s.new_field", UNKNOWN),
-                hasEntry("s.field with spaces", TEXT),
-                hasEntry("s.employer", TEXT),
-                hasEntry("s.employer.keyword", KEYWORD),
-                hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("s.projects.active", BOOLEAN),
-                hasEntry("s.projects.release", DATE),
-                hasEntry("s.projects.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
-                hasEntry("s.projects.members.name", TEXT),
-                hasEntry("s.manager", OBJECT),
-                hasEntry("s.manager.name", TEXT),
-                hasEntry("s.manager.name.keyword", KEYWORD),
-                hasEntry("s.manager.address", KEYWORD),
-                hasEntry("s.manager.salary", LONG)
-            )
-        );
-    }
+    Map<String, Type> typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(46),
+            // These are also valid because alias is optional in SQL
+            hasEntry("semantics", (Type) indexType),
+            // These are also valid because alias is optional in SQL
+            hasEntry("address", TEXT),
+            hasEntry("age", INTEGER),
+            hasEntry("balance", DOUBLE),
+            hasEntry("city", KEYWORD),
+            hasEntry("birthday", DATE),
+            hasEntry("location", GEO_POINT),
+            hasEntry("new_field", UNKNOWN),
+            hasEntry("field with spaces", TEXT),
+            hasEntry("employer", TEXT),
+            hasEntry("employer.keyword", KEYWORD),
+            hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
+            hasEntry("projects.active", BOOLEAN),
+            hasEntry("projects.release", DATE),
+            hasEntry(
+                "projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
+            hasEntry("projects.members.name", TEXT),
+            hasEntry("manager", OBJECT),
+            hasEntry("manager.name", TEXT),
+            hasEntry("manager.name.keyword", KEYWORD),
+            hasEntry("manager.address", KEYWORD),
+            hasEntry("manager.salary", LONG),
+            // These are valid because of alias specified
+            hasEntry("s.address", TEXT),
+            hasEntry("s.age", INTEGER),
+            hasEntry("s.balance", DOUBLE),
+            hasEntry("s.city", KEYWORD),
+            hasEntry("s.birthday", DATE),
+            hasEntry("s.location", GEO_POINT),
+            hasEntry("s.new_field", UNKNOWN),
+            hasEntry("s.field with spaces", TEXT),
+            hasEntry("s.employer", TEXT),
+            hasEntry("s.employer.keyword", KEYWORD),
+            hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("s.projects.active", BOOLEAN),
+            hasEntry("s.projects.release", DATE),
+            hasEntry(
+                "s.projects.members",
+                (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("s.projects.members.name", TEXT),
+            hasEntry("s.manager", OBJECT),
+            hasEntry("s.manager.name", TEXT),
+            hasEntry("s.manager.name.keyword", KEYWORD),
+            hasEntry("s.manager.address", KEYWORD),
+            hasEntry("s.manager.salary", LONG),
+            // Valid because of nested field alias specified
+            hasEntry("p", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("p.active", BOOLEAN),
+            hasEntry("p.release", DATE),
+            hasEntry("p.members", (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("p.members.name", TEXT)));
 
-    @Test
-    public void fieldWithUnknownEsTypeShouldPass() {
-        analyzer.visitIndexName("semantics");
-        Optional<Type> type = context.peek().resolve(new Symbol(Namespace.FIELD_NAME, "new_field"));
-        Assert.assertTrue(type.isPresent());
-        Assert.assertSame(UNKNOWN, type.get());
-    }
+    context.pop();
+    typeByName = context.peek().resolveAll(Namespace.FIELD_NAME);
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(41),
+            hasEntry("semantics", (Type) indexType),
+            // These are also valid because alias is optional in SQL
+            hasEntry("address", TEXT),
+            hasEntry("age", INTEGER),
+            hasEntry("balance", DOUBLE),
+            hasEntry("city", KEYWORD),
+            hasEntry("birthday", DATE),
+            hasEntry("location", GEO_POINT),
+            hasEntry("new_field", UNKNOWN),
+            hasEntry("field with spaces", TEXT),
+            hasEntry("employer", TEXT),
+            hasEntry("employer.keyword", KEYWORD),
+            hasEntry("projects", (Type) new OpenSearchIndex("projects", NESTED_FIELD)),
+            hasEntry("projects.active", BOOLEAN),
+            hasEntry("projects.release", DATE),
+            hasEntry(
+                "projects.members", (Type) new OpenSearchIndex("projects.members", NESTED_FIELD)),
+            hasEntry("projects.members.name", TEXT),
+            hasEntry("manager", OBJECT),
+            hasEntry("manager.name", TEXT),
+            hasEntry("manager.name.keyword", KEYWORD),
+            hasEntry("manager.address", KEYWORD),
+            hasEntry("manager.salary", LONG),
+            // These are valid because of alias specified
+            hasEntry("s.address", TEXT),
+            hasEntry("s.age", INTEGER),
+            hasEntry("s.balance", DOUBLE),
+            hasEntry("s.city", KEYWORD),
+            hasEntry("s.birthday", DATE),
+            hasEntry("s.location", GEO_POINT),
+            hasEntry("s.new_field", UNKNOWN),
+            hasEntry("s.field with spaces", TEXT),
+            hasEntry("s.employer", TEXT),
+            hasEntry("s.employer.keyword", KEYWORD),
+            hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("s.projects.active", BOOLEAN),
+            hasEntry("s.projects.release", DATE),
+            hasEntry(
+                "s.projects.members",
+                (Type) new OpenSearchIndex("s.projects.members", NESTED_FIELD)),
+            hasEntry("s.projects.members.name", TEXT),
+            hasEntry("s.manager", OBJECT),
+            hasEntry("s.manager.name", TEXT),
+            hasEntry("s.manager.name.keyword", KEYWORD),
+            hasEntry("s.manager.address", KEYWORD),
+            hasEntry("s.manager.salary", LONG)));
+  }
 
-    @Test
-    public void fieldWithSpacesInNameShouldPass() {
-        analyzer.visitIndexName("semantics");
-        Optional<Type> type = context.peek().resolve(new Symbol(Namespace.FIELD_NAME, "field with spaces"));
-        Assert.assertTrue(type.isPresent());
-        Assert.assertSame(TEXT, type.get());
-    }
+  @Test
+  public void fieldWithUnknownEsTypeShouldPass() {
+    analyzer.visitIndexName("semantics");
+    Optional<Type> type = context.peek().resolve(new Symbol(Namespace.FIELD_NAME, "new_field"));
+    Assert.assertTrue(type.isPresent());
+    Assert.assertSame(UNKNOWN, type.get());
+  }
 
-}
\ No newline at end of file
+  @Test
+  public void fieldWithSpacesInNameShouldPass() {
+    analyzer.visitIndexName("semantics");
+    Optional<Type> type =
+        context.peek().resolve(new Symbol(Namespace.FIELD_NAME, "field with spaces"));
+    Assert.assertTrue(type.isPresent());
+    Assert.assertSame(TEXT, type.get());
+  }
+}
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerConfigTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerConfigTest.java
index 18253bd71f..2b9a5e418c 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerConfigTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerConfigTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import static org.hamcrest.Matchers.allOf;
@@ -17,54 +16,47 @@
 import org.opensearch.sql.legacy.antlr.SqlAnalysisConfig;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
 
-/**
- * Test cases for semantic analysis configuration
- */
+/** Test cases for semantic analysis configuration */
 public class SemanticAnalyzerConfigTest extends SemanticAnalyzerTestBase {
 
-    @Rule
-    public ExpectedException exceptionWithoutSuggestion = ExpectedException.none();
-
-    @Test
-    public void noAnalysisShouldPerformForNonSelectStatement() {
-        String sql = "DELETE FROM semantics WHERE age12 = 123";
-        expectValidationPassWithConfig(sql, new SqlAnalysisConfig(true, true, 1000));
-    }
-
-    @Test
-    public void noAnalysisShouldPerformIfDisabledAnalysis() {
-        String sql = "SELECT * FROM semantics WHERE age12 = 123";
-        expectValidationFailWithErrorMessages(sql, "Field [age12] cannot be found or used here.");
-        expectValidationPassWithConfig(sql, new SqlAnalysisConfig(false, true, 1000));
-    }
-
-    @Test
-    public void noFieldNameSuggestionIfDisabledSuggestion() {
-        String sql = "SELECT * FROM semantics WHERE age12 = 123";
-        expectValidationFailWithErrorMessages(sql,
-            "Field [age12] cannot be found or used here.",
-            "Did you mean [age]?");
-
-        exceptionWithoutSuggestion.expect(SemanticAnalysisException.class);
-        exceptionWithoutSuggestion.expectMessage(
-            allOf(
-                containsString("Field [age12] cannot be found or used here"),
-                not(containsString("Did you mean"))
-            )
-        );
-        new OpenSearchLegacySqlAnalyzer(new SqlAnalysisConfig(true, false, 1000)).
-            analyze(sql, LocalClusterState.state());
-    }
-
-    @Test
-    public void noAnalysisShouldPerformIfIndexMappingIsLargerThanThreshold() {
-        String sql = "SELECT * FROM semantics WHERE test = 123";
-        expectValidationFailWithErrorMessages(sql, "Field [test] cannot be found or used here.");
-        expectValidationPassWithConfig(sql, new SqlAnalysisConfig(true, true, 1));
-    }
-
-    private void expectValidationPassWithConfig(String sql, SqlAnalysisConfig config) {
-        new OpenSearchLegacySqlAnalyzer(config).analyze(sql, LocalClusterState.state());
-    }
-
+  @Rule public ExpectedException exceptionWithoutSuggestion = ExpectedException.none();
+
+  @Test
+  public void noAnalysisShouldPerformForNonSelectStatement() {
+    String sql = "DELETE FROM semantics WHERE age12 = 123";
+    expectValidationPassWithConfig(sql, new SqlAnalysisConfig(true, true, 1000));
+  }
+
+  @Test
+  public void noAnalysisShouldPerformIfDisabledAnalysis() {
+    String sql = "SELECT * FROM semantics WHERE age12 = 123";
+    expectValidationFailWithErrorMessages(sql, "Field [age12] cannot be found or used here.");
+    expectValidationPassWithConfig(sql, new SqlAnalysisConfig(false, true, 1000));
+  }
+
+  @Test
+  public void noFieldNameSuggestionIfDisabledSuggestion() {
+    String sql = "SELECT * FROM semantics WHERE age12 = 123";
+    expectValidationFailWithErrorMessages(
+        sql, "Field [age12] cannot be found or used here.", "Did you mean [age]?");
+
+    exceptionWithoutSuggestion.expect(SemanticAnalysisException.class);
+    exceptionWithoutSuggestion.expectMessage(
+        allOf(
+            containsString("Field [age12] cannot be found or used here"),
+            not(containsString("Did you mean"))));
+    new OpenSearchLegacySqlAnalyzer(new SqlAnalysisConfig(true, false, 1000))
+        .analyze(sql, LocalClusterState.state());
+  }
+
+  @Test
+  public void noAnalysisShouldPerformIfIndexMappingIsLargerThanThreshold() {
+    String sql = "SELECT * FROM semantics WHERE test = 123";
+    expectValidationFailWithErrorMessages(sql, "Field [test] cannot be found or used here.");
+    expectValidationPassWithConfig(sql, new SqlAnalysisConfig(true, true, 1));
+  }
+
+  private void expectValidationPassWithConfig(String sql, SqlAnalysisConfig config) {
+    new OpenSearchLegacySqlAnalyzer(config).analyze(sql, LocalClusterState.state());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerConstantTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerConstantTest.java
index 5ff8875f0c..48d9b6e36c 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerConstantTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerConstantTest.java
@@ -3,21 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import org.junit.Test;
 
 public class SemanticAnalyzerConstantTest extends SemanticAnalyzerTestBase {
 
-    @Test
-    public void useNegativeIntegerShouldPass() {
-        validate("SELECT * FROM test WHERE age > -1");
-    }
-
-    @Test
-    public void useNegativeFloatingPointNumberShouldPass() {
-        validate("SELECT * FROM test WHERE balance > -1.23456");
-    }
+  @Test
+  public void useNegativeIntegerShouldPass() {
+    validate("SELECT * FROM test WHERE age > -1");
+  }
 
+  @Test
+  public void useNegativeFloatingPointNumberShouldPass() {
+    validate("SELECT * FROM test WHERE balance > -1.23456");
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerESScalarFunctionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerESScalarFunctionTest.java
index 32c322f8c2..c16ecc33e3 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerESScalarFunctionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerESScalarFunctionTest.java
@@ -3,54 +3,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import org.junit.Test;
 
-/**
- * Semantic analysis test for Elaticsearch special scalar functions
- */
+/** Semantic analysis test for Elaticsearch special scalar functions */
 public class SemanticAnalyzerESScalarFunctionTest extends SemanticAnalyzerTestBase {
 
-    @Test
-    public void dateFunctionCallWithDateInSelectClauseShouldPass() {
-        validate("SELECT DAY_OF_MONTH(birthday) FROM semantics");
-        validate("SELECT DAY_OF_WEEK(birthday) FROM semantics");
-        validate("SELECT DAY_OF_YEAR(birthday) FROM semantics");
-        validate("SELECT MINUTE_OF_DAY(birthday) FROM semantics");
-        validate("SELECT MINUTE_OF_HOUR(birthday) FROM semantics");
-        validate("SELECT MONTH_OF_YEAR(birthday) FROM semantics");
-        validate("SELECT WEEK_OF_YEAR(birthday) FROM semantics");
-    }
-
-    @Test
-    public void dateFunctionCallWithDateInWhereClauseShouldPass() {
-        validate("SELECT * FROM semantics WHERE DAY_OF_MONTH(birthday) = 1");
-        validate("SELECT * FROM semantics WHERE DAY_OF_WEEK(birthday) = 1");
-        validate("SELECT * FROM semantics WHERE DAY_OF_YEAR(birthday) = 1");
-        validate("SELECT * FROM semantics WHERE MINUTE_OF_DAY(birthday) = 1");
-        validate("SELECT * FROM semantics WHERE MINUTE_OF_HOUR(birthday) = 1");
-        validate("SELECT * FROM semantics WHERE MONTH_OF_YEAR(birthday) = 1");
-        validate("SELECT * FROM semantics WHERE WEEK_OF_YEAR(birthday) = 1");
-    }
-
-    @Test
-    public void geoFunctionCallWithGeoPointInWhereClauseShouldPass() {
-        validate("SELECT * FROM semantics WHERE GEO_BOUNDING_BOX(location, 100.0, 1.0, 101, 0.0)");
-        validate("SELECT * FROM semantics WHERE GEO_DISTANCE(location, '1km', 100.5, 0.500001)");
-        validate("SELECT * FROM semantics WHERE GEO_DISTANCE_RANGE(location, '1km', 100.5, 0.500001)");
-    }
-
-    @Test
-    public void fullTextMatchFunctionCallWithStringInWhereClauseShouldPass() {
-        validate("SELECT * FROM semantics WHERE MATCH_PHRASE(address, 'Seattle')");
-        validate("SELECT * FROM semantics WHERE MATCHPHRASE(employer, 'Seattle')");
-        validate("SELECT * FROM semantics WHERE MATCH_QUERY(manager.name, 'Seattle')");
-        validate("SELECT * FROM semantics WHERE MATCHQUERY(manager.name, 'Seattle')");
-        validate("SELECT * FROM semantics WHERE QUERY('Seattle')");
-        validate("SELECT * FROM semantics WHERE WILDCARD_QUERY(manager.name, 'Sea*')");
-        validate("SELECT * FROM semantics WHERE WILDCARDQUERY(manager.name, 'Sea*')");
-    }
-
+  @Test
+  public void dateFunctionCallWithDateInSelectClauseShouldPass() {
+    validate("SELECT DAY_OF_MONTH(birthday) FROM semantics");
+    validate("SELECT DAY_OF_WEEK(birthday) FROM semantics");
+    validate("SELECT DAY_OF_YEAR(birthday) FROM semantics");
+    validate("SELECT MINUTE_OF_DAY(birthday) FROM semantics");
+    validate("SELECT MINUTE_OF_HOUR(birthday) FROM semantics");
+    validate("SELECT MONTH_OF_YEAR(birthday) FROM semantics");
+    validate("SELECT WEEK_OF_YEAR(birthday) FROM semantics");
+  }
+
+  @Test
+  public void dateFunctionCallWithDateInWhereClauseShouldPass() {
+    validate("SELECT * FROM semantics WHERE DAY_OF_MONTH(birthday) = 1");
+    validate("SELECT * FROM semantics WHERE DAY_OF_WEEK(birthday) = 1");
+    validate("SELECT * FROM semantics WHERE DAY_OF_YEAR(birthday) = 1");
+    validate("SELECT * FROM semantics WHERE MINUTE_OF_DAY(birthday) = 1");
+    validate("SELECT * FROM semantics WHERE MINUTE_OF_HOUR(birthday) = 1");
+    validate("SELECT * FROM semantics WHERE MONTH_OF_YEAR(birthday) = 1");
+    validate("SELECT * FROM semantics WHERE WEEK_OF_YEAR(birthday) = 1");
+  }
+
+  @Test
+  public void geoFunctionCallWithGeoPointInWhereClauseShouldPass() {
+    validate("SELECT * FROM semantics WHERE GEO_BOUNDING_BOX(location, 100.0, 1.0, 101, 0.0)");
+    validate("SELECT * FROM semantics WHERE GEO_DISTANCE(location, '1km', 100.5, 0.500001)");
+    validate("SELECT * FROM semantics WHERE GEO_DISTANCE_RANGE(location, '1km', 100.5, 0.500001)");
+  }
+
+  @Test
+  public void fullTextMatchFunctionCallWithStringInWhereClauseShouldPass() {
+    validate("SELECT * FROM semantics WHERE MATCH_PHRASE(address, 'Seattle')");
+    validate("SELECT * FROM semantics WHERE MATCHPHRASE(employer, 'Seattle')");
+    validate("SELECT * FROM semantics WHERE MATCH_QUERY(manager.name, 'Seattle')");
+    validate("SELECT * FROM semantics WHERE MATCHQUERY(manager.name, 'Seattle')");
+    validate("SELECT * FROM semantics WHERE QUERY('Seattle')");
+    validate("SELECT * FROM semantics WHERE WILDCARD_QUERY(manager.name, 'Sea*')");
+    validate("SELECT * FROM semantics WHERE WILDCARDQUERY(manager.name, 'Sea*')");
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerFieldTypeTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerFieldTypeTest.java
index 3e4d3e6eb5..1b9b0dde45 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerFieldTypeTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerFieldTypeTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import static org.opensearch.sql.legacy.util.MultipleIndexClusterUtils.mockMultipleIndexEnv;
@@ -12,87 +11,69 @@
 import org.junit.Test;
 
 public class SemanticAnalyzerFieldTypeTest extends SemanticAnalyzerTestBase {
-    @Before
-    public void setup() {
-        mockMultipleIndexEnv();
-    }
+  @Before
+  public void setup() {
+    mockMultipleIndexEnv();
+  }
 
-    /**
-     * id has same type in account1 and account2.
-     */
-    @Test
-    public void accessFieldTypeNotInQueryPassSemanticCheck() {
-        validate("SELECT id FROM account* WHERE id = 1");
-    }
+  /** id has same type in account1 and account2. */
+  @Test
+  public void accessFieldTypeNotInQueryPassSemanticCheck() {
+    validate("SELECT id FROM account* WHERE id = 1");
+  }
 
-    /**
-     * address doesn't exist in account1.
-     */
-    @Test
-    public void accessFieldTypeOnlyInOneIndexPassSemanticCheck() {
-        validate("SELECT address FROM account* WHERE id = 30");
-    }
+  /** address doesn't exist in account1. */
+  @Test
+  public void accessFieldTypeOnlyInOneIndexPassSemanticCheck() {
+    validate("SELECT address FROM account* WHERE id = 30");
+  }
 
-    /**
-     * age has different type in account1 and account2.
-     */
-    @Test
-    public void accessConflictFieldTypeShouldFailSemanticCheck() {
-        expectValidationFailWithErrorMessages("SELECT age FROM account* WHERE age = 30",
-                "Field [age] have conflict type");
-    }
+  /** age has different type in account1 and account2. */
+  @Test
+  public void accessConflictFieldTypeShouldFailSemanticCheck() {
+    expectValidationFailWithErrorMessages(
+        "SELECT age FROM account* WHERE age = 30", "Field [age] have conflict type");
+  }
 
-    /**
-     * age has different type in account1 and account2.
-     */
-    @Test
-    public void mixNonConflictTypeAndConflictFieldTypeShouldFailSemanticCheck() {
-        expectValidationFailWithErrorMessages("SELECT id, age FROM account* WHERE id = 1",
-                "Field [age] have conflict type");
-    }
+  /** age has different type in account1 and account2. */
+  @Test
+  public void mixNonConflictTypeAndConflictFieldTypeShouldFailSemanticCheck() {
+    expectValidationFailWithErrorMessages(
+        "SELECT id, age FROM account* WHERE id = 1", "Field [age] have conflict type");
+  }
 
-    /**
-     * age has different type in account1 and account2.
-     */
-    @Test
-    public void conflictFieldTypeWithAliasShouldFailSemanticCheck() {
-        expectValidationFailWithErrorMessages("SELECT a.age FROM account* as a",
-                "Field [a.age] have conflict type");
-    }
+  /** age has different type in account1 and account2. */
+  @Test
+  public void conflictFieldTypeWithAliasShouldFailSemanticCheck() {
+    expectValidationFailWithErrorMessages(
+        "SELECT a.age FROM account* as a", "Field [a.age] have conflict type");
+  }
 
-    /**
-     * age has different type in account1 and account2.
-     * Todo, the error message is not accurate.
-     */
-    @Test
-    public void selectAllFieldTypeShouldFailSemanticCheck() {
-        expectValidationFailWithErrorMessages("SELECT * FROM account*",
-                "Field [account*.age] have conflict type");
-    }
+  /** age has different type in account1 and account2. Todo, the error message is not accurate. */
+  @Test
+  public void selectAllFieldTypeShouldFailSemanticCheck() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM account*", "Field [account*.age] have conflict type");
+  }
 
-    /**
-     * age has different type in account1 and account2.
-     */
-    @Test
-    public void selectAllFieldTypeWithAliasShouldFailSemanticCheck() {
-        expectValidationFailWithErrorMessages("SELECT a.* FROM account* as a",
-                "Field [a.age] have conflict type");
-    }
+  /** age has different type in account1 and account2. */
+  @Test
+  public void selectAllFieldTypeWithAliasShouldFailSemanticCheck() {
+    expectValidationFailWithErrorMessages(
+        "SELECT a.* FROM account* as a", "Field [a.age] have conflict type");
+  }
 
-    /**
-     * a.projects.name has same type in account1 and account2.
-     */
-    @Test
-    public void selectNestedNoneConflictTypeShouldPassSemanticCheck() {
-        validate("SELECT a.projects.name FROM account* as a");
-    }
+  /** a.projects.name has same type in account1 and account2. */
+  @Test
+  public void selectNestedNoneConflictTypeShouldPassSemanticCheck() {
+    validate("SELECT a.projects.name FROM account* as a");
+  }
 
-    /**
-     * a.projects.started_year has conflict type in account1 and account2.
-     */
-    @Test
-    public void selectNestedConflictTypeShouldFailSemanticCheck() {
-        expectValidationFailWithErrorMessages("SELECT a.projects.started_year FROM account* as a",
-                "Field [a.projects.started_year] have conflict type");
-    }
+  /** a.projects.started_year has conflict type in account1 and account2. */
+  @Test
+  public void selectNestedConflictTypeShouldFailSemanticCheck() {
+    expectValidationFailWithErrorMessages(
+        "SELECT a.projects.started_year FROM account* as a",
+        "Field [a.projects.started_year] have conflict type");
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerFromClauseTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerFromClauseTest.java
index a487a7afaa..2a04321f2f 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerFromClauseTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerFromClauseTest.java
@@ -3,191 +3,173 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
 /**
- * Semantic analyzer tests for FROM clause, including parse single index, multiple indices,
- * index + (deep) nested field and multiple statements like UNION/MINUS etc. Basically, we
- * need to make sure the environment be set up properly so that semantic analysis followed
- * can be performed correctly.
+ * Semantic analyzer tests for FROM clause, including parse single index, multiple indices, index +
+ * (deep) nested field and multiple statements like UNION/MINUS etc. Basically, we need to make sure
+ * the environment be set up properly so that semantic analysis followed can be performed correctly.
  */
 public class SemanticAnalyzerFromClauseTest extends SemanticAnalyzerTestBase {
 
-    @Ignore("IndexNotFoundException should be thrown from OpenSearch API directly")
-    @Test
-    public void nonExistingIndexNameShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics1"
-        );
-    }
-
-    @Test
-    public void useNotExistFieldInIndexPatternShouldFail() {
-        expectValidationFailWithErrorMessages(
-                "SELECT abc FROM semant* WHERE def = 1",
-                "Field [def] cannot be found or used here.",
-                "Did you mean [address]?"
-        );
-    }
-
-    @Test
-    public void useNotExistFieldInIndexAndIndexPatternShouldFail() {
-        expectValidationFailWithErrorMessages(
-                "SELECT abc FROM semantics, semant* WHERE def = 1",
-                "Field [def] cannot be found or used here.",
-                "Did you mean [address]?"
-        );
-    }
-
-    /**
-     * As shown below, there are multiple cases for alias:
-     *  1. Alias is not present: either use full index name as prefix or not.
-     *  2. Alias is present: either use alias as prefix or not. Full index name is illegal.
-     */
-    @Test
-    public void indexNameAliasShouldBeOptional() {
-        validate("SELECT address FROM semantics");
-        validate("SELECT address FROM semantics s");
-        validate("SELECT * FROM semantics WHERE semantics.address LIKE 'Seattle'");
-    }
-
-    @Test
-    public void useFullIndexNameShouldFailIfAliasIsPresent() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s WHERE semantics.address LIKE 'Seattle'",
-            "Field [semantics.address] cannot be found or used here",
-            "Did you mean [s.manager.address]?"
-        );
-    }
-
-    @Test
-    public void invalidIndexNameAliasInFromClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s, a.projects p",
-            "Field [a.projects] cannot be found or used here",
-            "Did you mean [s.projects]?"
-        );
-    }
-
-    @Test
-    public void invalidIndexNameAliasInWhereClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s WHERE a.balance = 10000",
-            "Field [a.balance] cannot be found or used here",
-            "Did you mean [s.balance]?"
-        );
-    }
-
-    @Test
-    public void invalidIndexNameAliasInGroupByClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s GROUP BY a.balance",
-            "Field [a.balance] cannot be found or used here",
-            "Did you mean [s.balance]?"
-        );
-    }
-
-    @Test
-    public void invalidIndexNameAliasInHavingClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s HAVING COUNT(a.balance) > 5",
-            "Field [a.balance] cannot be found or used here",
-            "Did you mean [s.balance]?"
-        );
-    }
-
-    @Test
-    public void invalidIndexNameAliasInOrderByClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s ORDER BY a.balance",
-            "Field [a.balance] cannot be found or used here",
-            "Did you mean [s.balance]?"
-        );
-    }
-
-    @Test
-    public void invalidIndexNameAliasInOnClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics sem JOIN semantic tic ON sem.age = t.age",
-            "Field [t.age] cannot be found or used here",
-            "Did you mean [tic.age]?"
-        );
-    }
-
-    @Test
-    public void nonNestedFieldInFromClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s, s.manager m",
-            "Operator [JOIN] cannot work with [INDEX, OBJECT]."
-        );
-    }
-
-    @Test
-    public void nonExistingNestedFieldInFromClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s, s.project p",
-            "Field [s.project] cannot be found or used here",
-            "Did you mean [s.projects]?"
-        );
-    }
-
-    @Ignore("Need to figure out a better way to detect naming conflict")
-    @Test
-    public void duplicateIndexNameAliasInFromClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s, s.projects s",
-            "Field [s] is conflicting with field of same name defined by other index"
-        );
-    }
-
-    @Ignore("Need to figure out a better way to detect naming conflict")
-    @Test
-    public void duplicateFieldNameFromDifferentIndexShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics INNER JOIN semantics",
-            "is conflicting with field of same name defined by other index"
-        );
-    }
-
-    @Test
-    public void validIndexNameAliasShouldPass() {
-        validate("SELECT * FROM semantics s, s.projects p");
-        validate("SELECT * FROM semantics s WHERE s.balance = 10000");
-    }
-
-    @Test
-    public void indexNameWithTypeShouldPass() {
-        validate("SELECT * FROM semantics/docs WHERE balance = 10000");
-        validate("SELECT * FROM semantics/docs s WHERE s.balance = 10000");
-        validate("SELECT * FROM semantics/docs s, s.projects p WHERE p.active IS TRUE");
-    }
-
-    @Test
-    public void noIndexAliasShouldPass() {
-        validate("SELECT * FROM semantics");
-        validate("SELECT * FROM semantics, semantics.projects");
-    }
-
-    @Test
-    public void regularJoinShouldPass() {
-        validate("SELECT * FROM semantics s1, semantics s2");
-        validate("SELECT * FROM semantics s1 JOIN semantics s2");
-        validate("SELECT * FROM semantics s1 LEFT JOIN semantics s2 ON s1.balance = s2.balance");
-    }
-
-    @Test
-    public void deepNestedFieldInFromClauseShouldPass() {
-        validate("SELECT * FROM semantics s, s.projects p, p.members m");
-    }
-
-    @Test
-    public void duplicateFieldNameFromDifferentStatementShouldPass() {
-        validate("SELECT age FROM semantics UNION SELECT age FROM semantic");
-        validate("SELECT s.age FROM semantics s UNION SELECT s.age FROM semantic s");
-    }
-
+  @Ignore("IndexNotFoundException should be thrown from OpenSearch API directly")
+  @Test
+  public void nonExistingIndexNameShouldFail() {
+    expectValidationFailWithErrorMessages("SELECT * FROM semantics1");
+  }
+
+  @Test
+  public void useNotExistFieldInIndexPatternShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT abc FROM semant* WHERE def = 1",
+        "Field [def] cannot be found or used here.",
+        "Did you mean [address]?");
+  }
+
+  @Test
+  public void useNotExistFieldInIndexAndIndexPatternShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT abc FROM semantics, semant* WHERE def = 1",
+        "Field [def] cannot be found or used here.",
+        "Did you mean [address]?");
+  }
+
+  /**
+   * As shown below, there are multiple cases for alias: 1. Alias is not present: either use full
+   * index name as prefix or not. 2. Alias is present: either use alias as prefix or not. Full index
+   * name is illegal.
+   */
+  @Test
+  public void indexNameAliasShouldBeOptional() {
+    validate("SELECT address FROM semantics");
+    validate("SELECT address FROM semantics s");
+    validate("SELECT * FROM semantics WHERE semantics.address LIKE 'Seattle'");
+  }
+
+  @Test
+  public void useFullIndexNameShouldFailIfAliasIsPresent() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s WHERE semantics.address LIKE 'Seattle'",
+        "Field [semantics.address] cannot be found or used here",
+        "Did you mean [s.manager.address]?");
+  }
+
+  @Test
+  public void invalidIndexNameAliasInFromClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s, a.projects p",
+        "Field [a.projects] cannot be found or used here",
+        "Did you mean [s.projects]?");
+  }
+
+  @Test
+  public void invalidIndexNameAliasInWhereClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s WHERE a.balance = 10000",
+        "Field [a.balance] cannot be found or used here",
+        "Did you mean [s.balance]?");
+  }
+
+  @Test
+  public void invalidIndexNameAliasInGroupByClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s GROUP BY a.balance",
+        "Field [a.balance] cannot be found or used here",
+        "Did you mean [s.balance]?");
+  }
+
+  @Test
+  public void invalidIndexNameAliasInHavingClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s HAVING COUNT(a.balance) > 5",
+        "Field [a.balance] cannot be found or used here",
+        "Did you mean [s.balance]?");
+  }
+
+  @Test
+  public void invalidIndexNameAliasInOrderByClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s ORDER BY a.balance",
+        "Field [a.balance] cannot be found or used here",
+        "Did you mean [s.balance]?");
+  }
+
+  @Test
+  public void invalidIndexNameAliasInOnClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics sem JOIN semantic tic ON sem.age = t.age",
+        "Field [t.age] cannot be found or used here",
+        "Did you mean [tic.age]?");
+  }
+
+  @Test
+  public void nonNestedFieldInFromClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s, s.manager m",
+        "Operator [JOIN] cannot work with [INDEX, OBJECT].");
+  }
+
+  @Test
+  public void nonExistingNestedFieldInFromClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s, s.project p",
+        "Field [s.project] cannot be found or used here",
+        "Did you mean [s.projects]?");
+  }
+
+  @Ignore("Need to figure out a better way to detect naming conflict")
+  @Test
+  public void duplicateIndexNameAliasInFromClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s, s.projects s",
+        "Field [s] is conflicting with field of same name defined by other index");
+  }
+
+  @Ignore("Need to figure out a better way to detect naming conflict")
+  @Test
+  public void duplicateFieldNameFromDifferentIndexShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics INNER JOIN semantics",
+        "is conflicting with field of same name defined by other index");
+  }
+
+  @Test
+  public void validIndexNameAliasShouldPass() {
+    validate("SELECT * FROM semantics s, s.projects p");
+    validate("SELECT * FROM semantics s WHERE s.balance = 10000");
+  }
+
+  @Test
+  public void indexNameWithTypeShouldPass() {
+    validate("SELECT * FROM semantics/docs WHERE balance = 10000");
+    validate("SELECT * FROM semantics/docs s WHERE s.balance = 10000");
+    validate("SELECT * FROM semantics/docs s, s.projects p WHERE p.active IS TRUE");
+  }
+
+  @Test
+  public void noIndexAliasShouldPass() {
+    validate("SELECT * FROM semantics");
+    validate("SELECT * FROM semantics, semantics.projects");
+  }
+
+  @Test
+  public void regularJoinShouldPass() {
+    validate("SELECT * FROM semantics s1, semantics s2");
+    validate("SELECT * FROM semantics s1 JOIN semantics s2");
+    validate("SELECT * FROM semantics s1 LEFT JOIN semantics s2 ON s1.balance = s2.balance");
+  }
+
+  @Test
+  public void deepNestedFieldInFromClauseShouldPass() {
+    validate("SELECT * FROM semantics s, s.projects p, p.members m");
+  }
+
+  @Test
+  public void duplicateFieldNameFromDifferentStatementShouldPass() {
+    validate("SELECT age FROM semantics UNION SELECT age FROM semantic");
+    validate("SELECT s.age FROM semantics s UNION SELECT s.age FROM semantic s");
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerIdentifierTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerIdentifierTest.java
index 3d9133c937..35bcde3f76 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerIdentifierTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerIdentifierTest.java
@@ -3,169 +3,158 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
-/**
- * Semantic analyzer tests for identifier
- */
+/** Semantic analyzer tests for identifier */
 public class SemanticAnalyzerIdentifierTest extends SemanticAnalyzerTestBase {
 
-    @Ignore("To be implemented")
-    @Test
-    public void duplicateFieldAliasInSelectClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT age a, COUNT(*) a FROM semantics s, a.projects p",
-            "Field [a.projects] cannot be found or used here"
-        );
-    }
-
-    @Test
-    public void fieldWithDifferentCaseInSelectClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT Age a FROM semantics",
-            "Field [Age] cannot be found or used here",
-            "Did you mean [age]?"
-        );
-    }
-
-    @Test
-    public void useHiddenFieldShouldPass() {
-        validate("SELECT _score FROM semantics WHERE _id = 1 AND _type = '_doc'");
-    }
-
-    @Ignore("Need to remove single quote or back ticks")
-    @Test
-    public void useFieldNameWithSpaceShouldPass() {
-        validate("SELECT ['field with spaces'] FROM semantics");
-        validate("SELECT `field with spaces` FROM semantics");
-    }
-
-    @Test
-    public void nonExistingFieldNameInSelectClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT age1 FROM semantics s",
-            "Field [age1] cannot be found or used here.",
-            "Did you mean [age]?"
-        );
-    }
-
-    @Test
-    public void invalidIndexAliasInFromClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s, a.projects p",
-            "Field [a.projects] cannot be found or used here.",
-            "Did you mean [s.projects]?"
-        );
-    }
-
-    @Test
-    public void nonExistingFieldNameInWhereClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s WHERE s.balce = 10000",
-            "Field [s.balce] cannot be found or used here.",
-            "Did you mean [s.balance]?"
-        );
-    }
-
-    @Test
-    public void nonExistingFieldNameInGroupByClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s GROUP BY s.balce",
-            "Field [s.balce] cannot be found or used here.",
-            "Did you mean [s.balance]?"
-        );
-    }
-
-    @Test
-    public void nonExistingFieldNameInHavingClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s HAVING COUNT(s.balce) > 5",
-            "Field [s.balce] cannot be found or used here.",
-            "Did you mean [s.balance]?"
-        );
-    }
-
-    @Test
-    public void nonExistingFieldNameInOrderByClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s ORDER BY s.balce",
-            "Field [s.balce] cannot be found or used here.",
-            "Did you mean [s.balance]?"
-        );
-    }
-
-    @Test
-    public void nonExistingFieldNameInFunctionShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s WHERE LOG(s.balce) = 1",
-            "Field [s.balce] cannot be found or used here.",
-            "Did you mean [s.balance]?"
-        );
-    }
-
-    @Test
-    public void nonExistingNestedFieldNameInWhereClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s, s.projects p, p.members m WHERE m.nam = 'John'",
-            "Field [m.nam] cannot be found or used here.",
-            "Did you mean [m.name]?"
-        );
-    }
-
-    @Test
-    public void nonExistingNestedFieldNameInFunctionShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics WHERE nested(projects.actives) = TRUE",
-            "Field [projects.actives] cannot be found or used here.",
-            "Did you mean [projects.active]?"
-        );
-    }
-
-    @Test
-    public void useKeywordInMultiFieldShouldPass() {
-        validate("SELECT employer.keyword FROM semantics WHERE employer.keyword LIKE 'AWS' GROUP BY employer.keyword");
-        validate("SELECT * FROM semantics s WHERE s.manager.name.keyword LIKE 'John'");
-    }
-
-    @Test
-    public void useDeepNestedFieldNameShouldPass() {
-        validate("SELECT p.* FROM semantics s, s.projects p WHERE p IS NULL");
-        validate("SELECT p.active FROM semantics s, s.projects p WHERE p.active = TRUE");
-        validate("SELECT m.name FROM semantics s, s.projects p, p.members m WHERE m.name = 'John'");
-    }
-
-    @Test
-    public void useConstantLiteralInSelectClauseShouldPass() {
-        validate("SELECT 1 FROM semantics");
-        validate("SELECT 2.0 FROM semantics");
-        //validate("SELECT 'test' FROM semantics"); TODO: why 'test' goes to fullColumnName that can be string literal
-        validate("SELECT TRUE FROM semantics");
-    }
-
-    @Test
-    public void queryWithBackticksQuotedIndexShouldPass() {
-        validate("SELECT age FROM `semantics`");
-    }
-
-    @Test
-    public void queryWithBackticksQuotedIndexAliasShouldPass() {
-        validate("SELECT `s`.age FROM semantics AS `s`");
-        validate("SELECT `s t`.age FROM semantics AS `s t`");
-    }
-
-    @Test
-    public void queryWithBackticksQuotedFieldNameShouldPass() {
-        validate("SELECT `age` FROM semantics");
-        validate("SELECT s.`age` FROM semantics AS s");
-        validate("SELECT `s`.`age` FROM semantics AS `s`");
-    }
-
-    @Test
-    public void queryWithBackticksQuotedFieldNameInFunctionShouldPass() {
-        validate("SELECT SUM(`age`) FROM semantics");
-    }
+  @Ignore("To be implemented")
+  @Test
+  public void duplicateFieldAliasInSelectClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT age a, COUNT(*) a FROM semantics s, a.projects p",
+        "Field [a.projects] cannot be found or used here");
+  }
+
+  @Test
+  public void fieldWithDifferentCaseInSelectClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT Age a FROM semantics",
+        "Field [Age] cannot be found or used here",
+        "Did you mean [age]?");
+  }
+
+  @Test
+  public void useHiddenFieldShouldPass() {
+    validate("SELECT _score FROM semantics WHERE _id = 1 AND _type = '_doc'");
+  }
+
+  @Ignore("Need to remove single quote or back ticks")
+  @Test
+  public void useFieldNameWithSpaceShouldPass() {
+    validate("SELECT ['field with spaces'] FROM semantics");
+    validate("SELECT `field with spaces` FROM semantics");
+  }
+
+  @Test
+  public void nonExistingFieldNameInSelectClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT age1 FROM semantics s",
+        "Field [age1] cannot be found or used here.",
+        "Did you mean [age]?");
+  }
+
+  @Test
+  public void invalidIndexAliasInFromClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s, a.projects p",
+        "Field [a.projects] cannot be found or used here.",
+        "Did you mean [s.projects]?");
+  }
+
+  @Test
+  public void nonExistingFieldNameInWhereClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s WHERE s.balce = 10000",
+        "Field [s.balce] cannot be found or used here.",
+        "Did you mean [s.balance]?");
+  }
+
+  @Test
+  public void nonExistingFieldNameInGroupByClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s GROUP BY s.balce",
+        "Field [s.balce] cannot be found or used here.",
+        "Did you mean [s.balance]?");
+  }
+
+  @Test
+  public void nonExistingFieldNameInHavingClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s HAVING COUNT(s.balce) > 5",
+        "Field [s.balce] cannot be found or used here.",
+        "Did you mean [s.balance]?");
+  }
+
+  @Test
+  public void nonExistingFieldNameInOrderByClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s ORDER BY s.balce",
+        "Field [s.balce] cannot be found or used here.",
+        "Did you mean [s.balance]?");
+  }
+
+  @Test
+  public void nonExistingFieldNameInFunctionShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s WHERE LOG(s.balce) = 1",
+        "Field [s.balce] cannot be found or used here.",
+        "Did you mean [s.balance]?");
+  }
+
+  @Test
+  public void nonExistingNestedFieldNameInWhereClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s, s.projects p, p.members m WHERE m.nam = 'John'",
+        "Field [m.nam] cannot be found or used here.",
+        "Did you mean [m.name]?");
+  }
+
+  @Test
+  public void nonExistingNestedFieldNameInFunctionShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics WHERE nested(projects.actives) = TRUE",
+        "Field [projects.actives] cannot be found or used here.",
+        "Did you mean [projects.active]?");
+  }
+
+  @Test
+  public void useKeywordInMultiFieldShouldPass() {
+    validate(
+        "SELECT employer.keyword FROM semantics WHERE employer.keyword LIKE 'AWS' GROUP BY"
+            + " employer.keyword");
+    validate("SELECT * FROM semantics s WHERE s.manager.name.keyword LIKE 'John'");
+  }
+
+  @Test
+  public void useDeepNestedFieldNameShouldPass() {
+    validate("SELECT p.* FROM semantics s, s.projects p WHERE p IS NULL");
+    validate("SELECT p.active FROM semantics s, s.projects p WHERE p.active = TRUE");
+    validate("SELECT m.name FROM semantics s, s.projects p, p.members m WHERE m.name = 'John'");
+  }
+
+  @Test
+  public void useConstantLiteralInSelectClauseShouldPass() {
+    validate("SELECT 1 FROM semantics");
+    validate("SELECT 2.0 FROM semantics");
+    // validate("SELECT 'test' FROM semantics"); TODO: why 'test' goes to fullColumnName that can be
+    // string literal
+    validate("SELECT TRUE FROM semantics");
+  }
+
+  @Test
+  public void queryWithBackticksQuotedIndexShouldPass() {
+    validate("SELECT age FROM `semantics`");
+  }
+
+  @Test
+  public void queryWithBackticksQuotedIndexAliasShouldPass() {
+    validate("SELECT `s`.age FROM semantics AS `s`");
+    validate("SELECT `s t`.age FROM semantics AS `s t`");
+  }
+
+  @Test
+  public void queryWithBackticksQuotedFieldNameShouldPass() {
+    validate("SELECT `age` FROM semantics");
+    validate("SELECT s.`age` FROM semantics AS s");
+    validate("SELECT `s`.`age` FROM semantics AS `s`");
+  }
+
+  @Test
+  public void queryWithBackticksQuotedFieldNameInFunctionShouldPass() {
+    validate("SELECT SUM(`age`) FROM semantics");
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerMultiQueryTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerMultiQueryTest.java
index 3c4c71c6ea..319f6c5cfa 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerMultiQueryTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerMultiQueryTest.java
@@ -3,93 +3,87 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
-/**
- * Semantic analyzer tests for multi query like UNION and MINUS
- */
+/** Semantic analyzer tests for multi query like UNION and MINUS */
 public class SemanticAnalyzerMultiQueryTest extends SemanticAnalyzerTestBase {
 
-    @Test
-    public void unionDifferentResultTypeOfTwoQueriesShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT balance FROM semantics UNION SELECT address FROM semantics",
-            "Operator [UNION] cannot work with [DOUBLE, TEXT]."
-        );
-    }
-
-    @Test
-    public void unionDifferentNumberOfResultTypeOfTwoQueriesShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT balance FROM semantics UNION SELECT balance, age FROM semantics",
-            "Operator [UNION] cannot work with [DOUBLE, (DOUBLE, INTEGER)]."
-        );
-    }
-
-    @Test
-    public void minusDifferentResultTypeOfTwoQueriesShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT p.active FROM semantics s, s.projects p MINUS SELECT address FROM semantics",
-            "Operator [MINUS] cannot work with [BOOLEAN, TEXT]."
-        );
-    }
-
-    @Test
-    public void unionSameResultTypeOfTwoQueriesShouldPass() {
-        validate("SELECT balance FROM semantics UNION SELECT balance FROM semantics");
-    }
-
-    @Test
-    public void unionCompatibleResultTypeOfTwoQueriesShouldPass() {
-        validate("SELECT balance FROM semantics UNION SELECT age FROM semantics");
-        validate("SELECT address FROM semantics UNION ALL SELECT city FROM semantics");
-    }
-
-    @Test
-    public void minusSameResultTypeOfTwoQueriesShouldPass() {
-        validate("SELECT s.projects.active FROM semantics s UNION SELECT p.active FROM semantics s, s.projects p");
-    }
-
-    @Test
-    public void minusCompatibleResultTypeOfTwoQueriesShouldPass() {
-        validate("SELECT address FROM semantics MINUS SELECT manager.name.keyword FROM semantics");
-    }
-
-    @Test
-    public void unionSelectStarWithExtraFieldOfTwoQueriesShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics UNION SELECT *, city FROM semantics",
-            "Operator [UNION] cannot work with [(*), KEYWORD]."
-        );
-    }
-
-    @Test
-    public void minusSelectStarWithExtraFieldOfTwoQueriesShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT *, address, balance FROM semantics MINUS SELECT * FROM semantics",
-            "Operator [MINUS] cannot work with [(TEXT, DOUBLE), (*)]."
-        );
-    }
-
-    @Test
-    public void unionSelectStarOfTwoQueriesShouldPass() {
-        validate("SELECT * FROM semantics UNION SELECT * FROM semantics");
-        validate("SELECT *, age FROM semantics UNION SELECT *, balance FROM semantics");
-    }
-
-    @Test
-    public void unionSelectFunctionCallWithSameReturnTypeOfTwoQueriesShouldPass() {
-        validate("SELECT LOG(balance) FROM semantics UNION SELECT ABS(age) FROM semantics");
-    }
-
-    @Ignore("* is empty and ignored in product of select items for now")
-    @Test
-    public void unionSelectFieldWithExtraStarOfTwoQueriesShouldFail() {
-        expectValidationFailWithErrorMessages("SELECT age FROM semantics UNION SELECT *, age FROM semantics");
-    }
-
+  @Test
+  public void unionDifferentResultTypeOfTwoQueriesShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT balance FROM semantics UNION SELECT address FROM semantics",
+        "Operator [UNION] cannot work with [DOUBLE, TEXT].");
+  }
+
+  @Test
+  public void unionDifferentNumberOfResultTypeOfTwoQueriesShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT balance FROM semantics UNION SELECT balance, age FROM semantics",
+        "Operator [UNION] cannot work with [DOUBLE, (DOUBLE, INTEGER)].");
+  }
+
+  @Test
+  public void minusDifferentResultTypeOfTwoQueriesShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT p.active FROM semantics s, s.projects p MINUS SELECT address FROM semantics",
+        "Operator [MINUS] cannot work with [BOOLEAN, TEXT].");
+  }
+
+  @Test
+  public void unionSameResultTypeOfTwoQueriesShouldPass() {
+    validate("SELECT balance FROM semantics UNION SELECT balance FROM semantics");
+  }
+
+  @Test
+  public void unionCompatibleResultTypeOfTwoQueriesShouldPass() {
+    validate("SELECT balance FROM semantics UNION SELECT age FROM semantics");
+    validate("SELECT address FROM semantics UNION ALL SELECT city FROM semantics");
+  }
+
+  @Test
+  public void minusSameResultTypeOfTwoQueriesShouldPass() {
+    validate(
+        "SELECT s.projects.active FROM semantics s UNION SELECT p.active FROM semantics s,"
+            + " s.projects p");
+  }
+
+  @Test
+  public void minusCompatibleResultTypeOfTwoQueriesShouldPass() {
+    validate("SELECT address FROM semantics MINUS SELECT manager.name.keyword FROM semantics");
+  }
+
+  @Test
+  public void unionSelectStarWithExtraFieldOfTwoQueriesShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics UNION SELECT *, city FROM semantics",
+        "Operator [UNION] cannot work with [(*), KEYWORD].");
+  }
+
+  @Test
+  public void minusSelectStarWithExtraFieldOfTwoQueriesShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT *, address, balance FROM semantics MINUS SELECT * FROM semantics",
+        "Operator [MINUS] cannot work with [(TEXT, DOUBLE), (*)].");
+  }
+
+  @Test
+  public void unionSelectStarOfTwoQueriesShouldPass() {
+    validate("SELECT * FROM semantics UNION SELECT * FROM semantics");
+    validate("SELECT *, age FROM semantics UNION SELECT *, balance FROM semantics");
+  }
+
+  @Test
+  public void unionSelectFunctionCallWithSameReturnTypeOfTwoQueriesShouldPass() {
+    validate("SELECT LOG(balance) FROM semantics UNION SELECT ABS(age) FROM semantics");
+  }
+
+  @Ignore("* is empty and ignored in product of select items for now")
+  @Test
+  public void unionSelectFieldWithExtraStarOfTwoQueriesShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT age FROM semantics UNION SELECT *, age FROM semantics");
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerOperatorTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerOperatorTest.java
index 36046aa0ad..bd5aeba507 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerOperatorTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerOperatorTest.java
@@ -3,71 +3,62 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import org.junit.Test;
 
-/**
- * Semantic analysis test cases for operator
- */
+/** Semantic analysis test cases for operator */
 public class SemanticAnalyzerOperatorTest extends SemanticAnalyzerTestBase {
 
-    @Test
-    public void compareNumberIsBooleanShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics WHERE age IS FALSE",
-            "Operator [IS] cannot work with [INTEGER, BOOLEAN]."
-        );
-    }
-
-    @Test
-    public void compareTextIsNotBooleanShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics WHERE address IS NOT TRUE",
-            "Operator [IS] cannot work with [TEXT, BOOLEAN]."
-        );
-    }
+  @Test
+  public void compareNumberIsBooleanShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics WHERE age IS FALSE",
+        "Operator [IS] cannot work with [INTEGER, BOOLEAN].");
+  }
 
-    @Test
-    public void compareNumberEqualsToStringShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics WHERE balance = 'test'",
-            "Operator [=] cannot work with [DOUBLE, STRING]."
-        );
-    }
+  @Test
+  public void compareTextIsNotBooleanShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics WHERE address IS NOT TRUE",
+        "Operator [IS] cannot work with [TEXT, BOOLEAN].");
+  }
 
-    @Test
-    public void compareSubstringFunctionCallEqualsToNumberShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics WHERE SUBSTRING(address, 0, 3) = 1",
-            "Operator [=] cannot work with [TEXT, INTEGER]."
-        );
-    }
+  @Test
+  public void compareNumberEqualsToStringShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics WHERE balance = 'test'",
+        "Operator [=] cannot work with [DOUBLE, STRING].");
+  }
 
-    @Test
-    public void compareLogFunctionCallWithIntegerSmallerThanStringShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics WHERE LOG(age) < 'test'",
-            "Operator [<] cannot work with [DOUBLE, STRING]."
-        );
-    }
+  @Test
+  public void compareSubstringFunctionCallEqualsToNumberShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics WHERE SUBSTRING(address, 0, 3) = 1",
+        "Operator [=] cannot work with [TEXT, INTEGER].");
+  }
 
-    @Test
-    public void compareDoubleWithIntegerShouldPass() {
-        validate("SELECT * FROM semantics WHERE balance >= 1000");
-        validate("SELECT * FROM semantics WHERE balance <> 1000");
-        validate("SELECT * FROM semantics WHERE balance != 1000");
-    }
+  @Test
+  public void compareLogFunctionCallWithIntegerSmallerThanStringShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics WHERE LOG(age) < 'test'",
+        "Operator [<] cannot work with [DOUBLE, STRING].");
+  }
 
-    @Test
-    public void compareDateWithStringShouldPass() {
-        validate("SELECT * FROM semantics WHERE birthday = '2019-09-30'");
-    }
+  @Test
+  public void compareDoubleWithIntegerShouldPass() {
+    validate("SELECT * FROM semantics WHERE balance >= 1000");
+    validate("SELECT * FROM semantics WHERE balance <> 1000");
+    validate("SELECT * FROM semantics WHERE balance != 1000");
+  }
 
-    @Test
-    public void namedArgumentShouldSkipOperatorTypeCheck() {
-        validate("SELECT TOPHITS('size'=3, age='desc') FROM semantics GROUP BY city");
-    }
+  @Test
+  public void compareDateWithStringShouldPass() {
+    validate("SELECT * FROM semantics WHERE birthday = '2019-09-30'");
+  }
 
+  @Test
+  public void namedArgumentShouldSkipOperatorTypeCheck() {
+    validate("SELECT TOPHITS('size'=3, age='desc') FROM semantics GROUP BY city");
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerScalarFunctionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerScalarFunctionTest.java
index 83454b9549..8017c49548 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerScalarFunctionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerScalarFunctionTest.java
@@ -3,270 +3,255 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import org.junit.Ignore;
 import org.junit.Test;
 import org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType;
 
-/**
- * Semantic analysis tests for scalar function.
- */
+/** Semantic analysis tests for scalar function. */
 public class SemanticAnalyzerScalarFunctionTest extends SemanticAnalyzerTestBase {
 
-    @Test
-    public void unsupportedScalarFunctionCallInSelectClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT DAY() FROM semantics",
-            "Function [DAY] cannot be found or used here."
-        );
-    }
+  @Test
+  public void unsupportedScalarFunctionCallInSelectClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT DAY() FROM semantics", "Function [DAY] cannot be found or used here.");
+  }
 
-    @Test
-    public void unsupportedScalarFunctionCallInWhereClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics WHERE LOG100(balance) = 1",
-            "Function [LOG100] cannot be found or used here.",
-            "Did you mean [LOG10]?"
-        );
-    }
+  @Test
+  public void unsupportedScalarFunctionCallInWhereClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics WHERE LOG100(balance) = 1",
+        "Function [LOG100] cannot be found or used here.",
+        "Did you mean [LOG10]?");
+  }
 
-    @Test
-    public void scalarFunctionCallWithLessArgumentsInWhereClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics WHERE LOG() = 1",
-            "Function [LOG] cannot work with [<None>].",
-            "Usage: LOG(NUMBER T) -> DOUBLE"
-        );
-    }
+  @Test
+  public void scalarFunctionCallWithLessArgumentsInWhereClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics WHERE LOG() = 1",
+        "Function [LOG] cannot work with [<None>].",
+        "Usage: LOG(NUMBER T) -> DOUBLE");
+  }
 
-    @Test
-    public void scalarFunctionCallWithMoreArgumentsInWhereClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics WHERE LOG(age, city) = 1",
-            "Function [LOG] cannot work with [INTEGER, KEYWORD].",
-            "Usage: LOG(NUMBER T) -> DOUBLE"
-        );
-    }
+  @Test
+  public void scalarFunctionCallWithMoreArgumentsInWhereClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics WHERE LOG(age, city) = 1",
+        "Function [LOG] cannot work with [INTEGER, KEYWORD].",
+        "Usage: LOG(NUMBER T) -> DOUBLE");
+  }
 
-    @Test
-    public void logFunctionCallWithOneNestedInSelectClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT LOG(projects) FROM semantics",
-            "Function [LOG] cannot work with [NESTED_FIELD].",
-            "Usage: LOG(NUMBER T) -> DOUBLE"
-        );
-    }
+  @Test
+  public void logFunctionCallWithOneNestedInSelectClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT LOG(projects) FROM semantics",
+        "Function [LOG] cannot work with [NESTED_FIELD].",
+        "Usage: LOG(NUMBER T) -> DOUBLE");
+  }
 
-    @Test
-    public void logFunctionCallWithOneTextInWhereClauseShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics WHERE LOG(city) = 1",
-            "Function [LOG] cannot work with [KEYWORD].",
-            "Usage: LOG(NUMBER T) -> DOUBLE"
-        );
-    }
+  @Test
+  public void logFunctionCallWithOneTextInWhereClauseShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics WHERE LOG(city) = 1",
+        "Function [LOG] cannot work with [KEYWORD].",
+        "Usage: LOG(NUMBER T) -> DOUBLE");
+  }
 
-    @Test
-    public void logFunctionCallWithOneNumberShouldPass() {
-        validate("SELECT LOG(age) FROM semantics");
-        validate("SELECT * FROM semantics s WHERE LOG(s.balance) = 1000");
-        validate("SELECT LOG(s.manager.salary) FROM semantics s");
-    }
+  @Test
+  public void logFunctionCallWithOneNumberShouldPass() {
+    validate("SELECT LOG(age) FROM semantics");
+    validate("SELECT * FROM semantics s WHERE LOG(s.balance) = 1000");
+    validate("SELECT LOG(s.manager.salary) FROM semantics s");
+  }
 
-    @Test
-    public void logFunctionCallInDifferentCaseShouldPass() {
-        validate("SELECT log(age) FROM semantics");
-        validate("SELECT Log(age) FROM semantics");
-        validate("SELECT loG(age) FROM semantics");
-    }
+  @Test
+  public void logFunctionCallInDifferentCaseShouldPass() {
+    validate("SELECT log(age) FROM semantics");
+    validate("SELECT Log(age) FROM semantics");
+    validate("SELECT loG(age) FROM semantics");
+  }
 
-    @Test
-    public void logFunctionCallWithUnknownFieldShouldPass() {
-        validate("SELECT LOG(new_field) FROM semantics");
-    }
+  @Test
+  public void logFunctionCallWithUnknownFieldShouldPass() {
+    validate("SELECT LOG(new_field) FROM semantics");
+  }
 
-    @Ignore("Test set to ignore due to nested functions not supported and blocked by throwing SqlFeatureNotImplementedException")
-    @Test
-    public void substringWithLogFunctionCallWithUnknownFieldShouldPass() {
-        expectValidationFailWithErrorMessages(
-                "SELECT SUBSTRING(LOG(new_field), 0, 1) FROM semantics",
-                  "Function [SUBSTRING] cannot work with [DOUBLE, INTEGER, INTEGER]."
-                ," Usage: SUBSTRING(STRING T, INTEGER, INTEGER) -> T"
-                );
-    }
+  @Ignore(
+      "Test set to ignore due to nested functions not supported and blocked by throwing"
+          + " SqlFeatureNotImplementedException")
+  @Test
+  public void substringWithLogFunctionCallWithUnknownFieldShouldPass() {
+    expectValidationFailWithErrorMessages(
+        "SELECT SUBSTRING(LOG(new_field), 0, 1) FROM semantics",
+        "Function [SUBSTRING] cannot work with [DOUBLE, INTEGER, INTEGER].",
+        " Usage: SUBSTRING(STRING T, INTEGER, INTEGER) -> T");
+  }
 
-    @Ignore("Test set to ignore due to nested functions not supported and blocked by throwing SqlFeatureNotImplementedException")
-    @Test
-    public void logFunctionCallWithResultOfAbsFunctionCallWithOneNumberShouldPass() {
-        validate("SELECT LOG(ABS(age)) FROM semantics");
-    }
+  @Ignore(
+      "Test set to ignore due to nested functions not supported and blocked by throwing"
+          + " SqlFeatureNotImplementedException")
+  @Test
+  public void logFunctionCallWithResultOfAbsFunctionCallWithOneNumberShouldPass() {
+    validate("SELECT LOG(ABS(age)) FROM semantics");
+  }
 
-    @Ignore("Test set to ignore due to nested functions not supported and blocked by throwing SqlFeatureNotImplementedException")
-    @Test
-    public void logFunctionCallWithMoreNestedFunctionCallWithOneNumberShouldPass() {
-        validate("SELECT LOG(ABS(SQRT(balance))) FROM semantics");
-    }
+  @Ignore(
+      "Test set to ignore due to nested functions not supported and blocked by throwing"
+          + " SqlFeatureNotImplementedException")
+  @Test
+  public void logFunctionCallWithMoreNestedFunctionCallWithOneNumberShouldPass() {
+    validate("SELECT LOG(ABS(SQRT(balance))) FROM semantics");
+  }
 
-    @Ignore("Test set to ignore due to nested functions not supported and blocked by throwing SqlFeatureNotImplementedException")
-    @Test
-    public void substringFunctionCallWithResultOfAnotherSubstringAndAbsFunctionCallShouldPass() {
-        validate("SELECT SUBSTRING(SUBSTRING(city, ABS(age), 1), 2, ABS(1)) FROM semantics");
-    }
+  @Ignore(
+      "Test set to ignore due to nested functions not supported and blocked by throwing"
+          + " SqlFeatureNotImplementedException")
+  @Test
+  public void substringFunctionCallWithResultOfAnotherSubstringAndAbsFunctionCallShouldPass() {
+    validate("SELECT SUBSTRING(SUBSTRING(city, ABS(age), 1), 2, ABS(1)) FROM semantics");
+  }
 
-    @Ignore("Test set to ignore due to nested functions not supported and blocked by throwing SqlFeatureNotImplementedException")
-    @Test
-    public void substringFunctionCallWithResultOfMathFunctionCallShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT SUBSTRING(LOG(balance), 2, 3) FROM semantics",
-            "Function [SUBSTRING] cannot work with [DOUBLE, INTEGER, INTEGER].",
-            "Usage: SUBSTRING(STRING T, INTEGER, INTEGER) -> T"
-        );
-    }
+  @Ignore(
+      "Test set to ignore due to nested functions not supported and blocked by throwing"
+          + " SqlFeatureNotImplementedException")
+  @Test
+  public void substringFunctionCallWithResultOfMathFunctionCallShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT SUBSTRING(LOG(balance), 2, 3) FROM semantics",
+        "Function [SUBSTRING] cannot work with [DOUBLE, INTEGER, INTEGER].",
+        "Usage: SUBSTRING(STRING T, INTEGER, INTEGER) -> T");
+  }
 
-    @Ignore("Test set to ignore due to nested functions not supported and blocked by throwing SqlFeatureNotImplementedException")
-    @Test
-    public void logFunctionCallWithResultOfSubstringFunctionCallShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT LOG(SUBSTRING(address, 0, 1)) FROM semantics",
-            "Function [LOG] cannot work with [TEXT].",
-            "Usage: LOG(NUMBER T) -> DOUBLE or LOG(NUMBER T, NUMBER) -> DOUBLE"
-        );
-    }
+  @Ignore(
+      "Test set to ignore due to nested functions not supported and blocked by throwing"
+          + " SqlFeatureNotImplementedException")
+  @Test
+  public void logFunctionCallWithResultOfSubstringFunctionCallShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT LOG(SUBSTRING(address, 0, 1)) FROM semantics",
+        "Function [LOG] cannot work with [TEXT].",
+        "Usage: LOG(NUMBER T) -> DOUBLE or LOG(NUMBER T, NUMBER) -> DOUBLE");
+  }
 
-    @Test
-    public void allSupportedMathFunctionCallInSelectClauseShouldPass() {
-        validate(
-            "SELECT" +
-            " ABS(age), " +
-            " ASIN(age), " +
-            " ATAN(age), " +
-            " ATAN2(age, age), " +
-            " CBRT(age), " +
-            " CEIL(age), " +
-            " COS(age), " +
-            " COSH(age), " +
-            " DEGREES(age), " +
-            " EXP(age), " +
-            " EXPM1(age), " +
-            " FLOOR(age), " +
-            " LOG(age), " +
-            " LOG2(age), " +
-            " LOG10(age), " +
-            " LN(age), " +
-            " POW(age), " +
-            " RADIANS(age), " +
-            " RINT(age), " +
-            " ROUND(age), " +
-            " SIN(age), " +
-            " SINH(age), " +
-            " SQRT(age), " +
-            " TAN(age) " +
-            "FROM semantics"
-        );
-    }
+  @Test
+  public void allSupportedMathFunctionCallInSelectClauseShouldPass() {
+    validate(
+        "SELECT"
+            + " ABS(age), "
+            + " ASIN(age), "
+            + " ATAN(age), "
+            + " ATAN2(age, age), "
+            + " CBRT(age), "
+            + " CEIL(age), "
+            + " COS(age), "
+            + " COSH(age), "
+            + " DEGREES(age), "
+            + " EXP(age), "
+            + " EXPM1(age), "
+            + " FLOOR(age), "
+            + " LOG(age), "
+            + " LOG2(age), "
+            + " LOG10(age), "
+            + " LN(age), "
+            + " POW(age), "
+            + " RADIANS(age), "
+            + " RINT(age), "
+            + " ROUND(age), "
+            + " SIN(age), "
+            + " SINH(age), "
+            + " SQRT(age), "
+            + " TAN(age) "
+            + "FROM semantics");
+  }
 
-    @Test
-    public void allSupportedMathFunctionCallInWhereClauseShouldPass() {
-        validate(
-            "SELECT * FROM semantics WHERE " +
-            " ABS(age) = 1 AND " +
-            " ASIN(age) = 1 AND " +
-            " ATAN(age) = 1 AND " +
-            " ATAN2(age, age) = 1 AND " +
-            " CBRT(age) = 1 AND " +
-            " CEIL(age) = 1 AND " +
-            " COS(age) = 1 AND " +
-            " COSH(age) = 1 AND " +
-            " DEGREES(age) = 1 AND " +
-            " EXP(age) = 1 AND " +
-            " EXPM1(age) = 1 AND " +
-            " FLOOR(age) = 1 AND " +
-            " LOG(age) = 1 AND " +
-            " LOG2(age) = 1 AND " +
-            " LOG10(age) = 1 AND " +
-            " LN(age) = 1 AND " +
-            " POW(age) = 1 AND " +
-            " RADIANS(age) = 1 AND " +
-            " RINT(age) = 1 AND " +
-            " ROUND(age) = 1 AND " +
-            " SIN(age) = 1 AND " +
-            " SINH(age) = 1 AND " +
-            " SQRT(age) = 1 AND " +
-            " TAN(age) = 1 "
-        );
-    }
+  @Test
+  public void allSupportedMathFunctionCallInWhereClauseShouldPass() {
+    validate(
+        "SELECT * FROM semantics WHERE "
+            + " ABS(age) = 1 AND "
+            + " ASIN(age) = 1 AND "
+            + " ATAN(age) = 1 AND "
+            + " ATAN2(age, age) = 1 AND "
+            + " CBRT(age) = 1 AND "
+            + " CEIL(age) = 1 AND "
+            + " COS(age) = 1 AND "
+            + " COSH(age) = 1 AND "
+            + " DEGREES(age) = 1 AND "
+            + " EXP(age) = 1 AND "
+            + " EXPM1(age) = 1 AND "
+            + " FLOOR(age) = 1 AND "
+            + " LOG(age) = 1 AND "
+            + " LOG2(age) = 1 AND "
+            + " LOG10(age) = 1 AND "
+            + " LN(age) = 1 AND "
+            + " POW(age) = 1 AND "
+            + " RADIANS(age) = 1 AND "
+            + " RINT(age) = 1 AND "
+            + " ROUND(age) = 1 AND "
+            + " SIN(age) = 1 AND "
+            + " SINH(age) = 1 AND "
+            + " SQRT(age) = 1 AND "
+            + " TAN(age) = 1 ");
+  }
 
-    @Test
-    public void allSupportedConstantsUseInSelectClauseShouldPass() {
-        validate(
-            "SELECT " +
-            " E(), " +
-            " PI() " +
-            "FROM semantics"
-        );
-    }
+  @Test
+  public void allSupportedConstantsUseInSelectClauseShouldPass() {
+    validate("SELECT " + " E(), " + " PI() " + "FROM semantics");
+  }
 
-    @Test
-    public void allSupportedConstantsUseInWhereClauseShouldPass() {
-        validate(
-            "SELECT * FROM semantics WHERE " +
-            " E() > 1 OR " +
-            " PI() > 1"
-        );
-    }
+  @Test
+  public void allSupportedConstantsUseInWhereClauseShouldPass() {
+    validate("SELECT * FROM semantics WHERE " + " E() > 1 OR " + " PI() > 1");
+  }
 
-    @Test
-    public void allSupportedStringFunctionCallInSelectClauseShouldPass() {
-        validate(
-            "SELECT * FROM semantics WHERE " +
-                " SUBSTRING(city, 0, 3) = 'Sea' AND " +
-                " UPPER(city) = 'SEATTLE' AND " +
-                " LOWER(city) = 'seattle'"
-        );
-    }
+  @Test
+  public void allSupportedStringFunctionCallInSelectClauseShouldPass() {
+    validate(
+        "SELECT * FROM semantics WHERE "
+            + " SUBSTRING(city, 0, 3) = 'Sea' AND "
+            + " UPPER(city) = 'SEATTLE' AND "
+            + " LOWER(city) = 'seattle'");
+  }
 
-    @Test
-    public void allSupportedStringFunctionCallInWhereClauseShouldPass() {
-        validate(
-            "SELECT" +
-            " SUBSTRING(city, 0, 3), " +
-            " UPPER(address), " +
-            " LOWER(manager.name) " +
-            "FROM semantics "
-        );
-    }
+  @Test
+  public void allSupportedStringFunctionCallInWhereClauseShouldPass() {
+    validate(
+        "SELECT"
+            + " SUBSTRING(city, 0, 3), "
+            + " UPPER(address), "
+            + " LOWER(manager.name) "
+            + "FROM semantics ");
+  }
 
-    @Test
-    public void dateFormatFunctionCallWithNumberShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT DATE_FORMAT(balance, 'yyyy-MM') FROM semantics",
-            "Function [DATE_FORMAT] cannot work with [DOUBLE, STRING].",
-            "Usage: DATE_FORMAT(DATE, STRING) -> STRING or DATE_FORMAT(DATE, STRING, STRING) -> STRING"
-        );
-    }
+  @Test
+  public void dateFormatFunctionCallWithNumberShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT DATE_FORMAT(balance, 'yyyy-MM') FROM semantics",
+        "Function [DATE_FORMAT] cannot work with [DOUBLE, STRING].",
+        "Usage: DATE_FORMAT(DATE, STRING) -> STRING or DATE_FORMAT(DATE, STRING, STRING) ->"
+            + " STRING");
+  }
 
-    @Test
-    public void allSupportedDateFunctionCallShouldPass() {
-        validate(
-            "SELECT date_format(birthday, 'yyyy-MM') " +
-            "FROM semantics " +
-            "WHERE date_format(birthday, 'yyyy-MM') > '1980-01' " +
-            "GROUP BY date_format(birthday, 'yyyy-MM') " +
-            "ORDER BY date_format(birthday, 'yyyy-MM') DESC"
-        );
-    }
+  @Test
+  public void allSupportedDateFunctionCallShouldPass() {
+    validate(
+        "SELECT date_format(birthday, 'yyyy-MM') "
+            + "FROM semantics "
+            + "WHERE date_format(birthday, 'yyyy-MM') > '1980-01' "
+            + "GROUP BY date_format(birthday, 'yyyy-MM') "
+            + "ORDER BY date_format(birthday, 'yyyy-MM') DESC");
+  }
 
-    @Test
-    public void concatRequiresVarargSupportShouldPassAnyway() {
-        validate("SELECT CONCAT('aaa') FROM semantics");
-        validate("SELECT CONCAT('aaa', 'bbb') FROM semantics");
-        validate("SELECT CONCAT('aaa', 'bbb', 123) FROM semantics");
-    }
+  @Test
+  public void concatRequiresVarargSupportShouldPassAnyway() {
+    validate("SELECT CONCAT('aaa') FROM semantics");
+    validate("SELECT CONCAT('aaa', 'bbb') FROM semantics");
+    validate("SELECT CONCAT('aaa', 'bbb', 123) FROM semantics");
+  }
 
-    @Test
-    public void castFunctionShouldPass() {
-        validateWithType("SELECT CAST(age AS DOUBLE) FROM semantics", OpenSearchDataType.DOUBLE);
-    }
+  @Test
+  public void castFunctionShouldPass() {
+    validateWithType("SELECT CAST(age AS DOUBLE) FROM semantics", OpenSearchDataType.DOUBLE);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerSubqueryTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerSubqueryTest.java
index f34af4fe3a..7613806df7 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerSubqueryTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerSubqueryTest.java
@@ -3,105 +3,94 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import org.junit.Test;
 import org.opensearch.sql.legacy.antlr.visitor.EarlyExitAnalysisException;
 
-/**
- * Semantic analysis test for subquery
- */
+/** Semantic analysis test for subquery */
 public class SemanticAnalyzerSubqueryTest extends SemanticAnalyzerTestBase {
 
-    @Test
-    public void useExistClauseOnNestedFieldShouldPass() {
-        validate(
-            "SELECT * FROM semantics AS s WHERE EXISTS " +
-            " ( SELECT * FROM s.projects AS p WHERE p.active IS TRUE ) " +
-            " AND s.age > 10"
-        );
-    }
-
-    @Test
-    public void useNotExistClauseOnNestedFieldShouldPass() {
-        validate(
-            "SELECT * FROM semantics AS s WHERE NOT EXISTS " +
-            " ( SELECT * FROM s.projects AS p WHERE p.active IS TRUE ) " +
-            " AND s.age > 10"
-        );
-    }
-
-    @Test
-    public void useInClauseOnAgeWithIntegerLiteralListShouldPass() {
-        validate("SELECT * FROM semantics WHERE age IN (30, 40)");
-    }
-
-    @Test
-    public void useAliasInSubqueryShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s WHERE EXISTS (SELECT * FROM s.projects p) AND p.active IS TRUE",
-            "Field [p.active] cannot be found or used here.",
-            "Did you mean [projects.active]?"
-        );
-    }
-
-    @Test
-    public void useInClauseWithIncompatibleFieldTypesShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s WHERE age IN (SELECT p.active FROM s.projects p)",
-            "Operator [IN] cannot work with [INTEGER, BOOLEAN]."
-        );
-    }
-
-    @Test
-    public void useInClauseWithCompatibleFieldTypesShouldPass() {
-        validate("SELECT * FROM semantics s WHERE address IN (SELECT city FROM s.projects p)");
-    }
-
-    @Test
-    public void useNotInClauseWithCompatibleFieldTypesShouldPass() {
-        validate("SELECT * FROM semantics s WHERE address NOT IN (SELECT city FROM s.projects p)");
-    }
-
-    @Test
-    public void useInClauseWithCompatibleConstantShouldPass() {
-        validate("SELECT * FROM semantics WHERE age IN (10, 20, 30)");
-        validate("SELECT * FROM semantics WHERE city IN ('Seattle', 'Bellevue')");
-        validate("SELECT * FROM semantics WHERE birthday IN ('2000-01-01', '2010-01-01')");
-    }
-
-    @Test
-    public void useInClauseWithIncompatibleConstantShouldPass() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s WHERE age IN ('abc', 'def')",
-            "Operator [IN] cannot work with [INTEGER, STRING]."
-        );
-    }
-
-    @Test
-    public void useInClauseWithSelectStarShouldFail() {
-        expectValidationFailWithErrorMessages(
-            "SELECT * FROM semantics s WHERE address IN (SELECT * FROM s.projects p)",
-            "Operator [IN] cannot work with [TEXT, (*)]"
-        );
-    }
-
-    @Test
-    public void useExistsClauseWithSelectStarShouldPass() {
-        validate("SELECT * FROM semantics s WHERE EXISTS (SELECT * FROM s.projects p)");
-    }
-
-    @Test
-    public void useExistsClauseWithSelectConstantShouldPass() {
-        validate("SELECT * FROM semantics s WHERE EXISTS (SELECT 1 FROM s.projects p)");
-    }
-
-    /**
-     * Ignore the semantic analyzer by using {@link EarlyExitAnalysisException}
-     */
-    @Test
-    public void useSubqueryInFromClauseWithSelectConstantShouldPass() {
-        validate("SELECT t.TEMP as count FROM (SELECT COUNT(*) as TEMP FROM semantics) t");
-    }
+  @Test
+  public void useExistClauseOnNestedFieldShouldPass() {
+    validate(
+        "SELECT * FROM semantics AS s WHERE EXISTS "
+            + " ( SELECT * FROM s.projects AS p WHERE p.active IS TRUE ) "
+            + " AND s.age > 10");
+  }
+
+  @Test
+  public void useNotExistClauseOnNestedFieldShouldPass() {
+    validate(
+        "SELECT * FROM semantics AS s WHERE NOT EXISTS "
+            + " ( SELECT * FROM s.projects AS p WHERE p.active IS TRUE ) "
+            + " AND s.age > 10");
+  }
+
+  @Test
+  public void useInClauseOnAgeWithIntegerLiteralListShouldPass() {
+    validate("SELECT * FROM semantics WHERE age IN (30, 40)");
+  }
+
+  @Test
+  public void useAliasInSubqueryShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s WHERE EXISTS (SELECT * FROM s.projects p) AND p.active IS TRUE",
+        "Field [p.active] cannot be found or used here.",
+        "Did you mean [projects.active]?");
+  }
+
+  @Test
+  public void useInClauseWithIncompatibleFieldTypesShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s WHERE age IN (SELECT p.active FROM s.projects p)",
+        "Operator [IN] cannot work with [INTEGER, BOOLEAN].");
+  }
+
+  @Test
+  public void useInClauseWithCompatibleFieldTypesShouldPass() {
+    validate("SELECT * FROM semantics s WHERE address IN (SELECT city FROM s.projects p)");
+  }
+
+  @Test
+  public void useNotInClauseWithCompatibleFieldTypesShouldPass() {
+    validate("SELECT * FROM semantics s WHERE address NOT IN (SELECT city FROM s.projects p)");
+  }
+
+  @Test
+  public void useInClauseWithCompatibleConstantShouldPass() {
+    validate("SELECT * FROM semantics WHERE age IN (10, 20, 30)");
+    validate("SELECT * FROM semantics WHERE city IN ('Seattle', 'Bellevue')");
+    validate("SELECT * FROM semantics WHERE birthday IN ('2000-01-01', '2010-01-01')");
+  }
+
+  @Test
+  public void useInClauseWithIncompatibleConstantShouldPass() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s WHERE age IN ('abc', 'def')",
+        "Operator [IN] cannot work with [INTEGER, STRING].");
+  }
+
+  @Test
+  public void useInClauseWithSelectStarShouldFail() {
+    expectValidationFailWithErrorMessages(
+        "SELECT * FROM semantics s WHERE address IN (SELECT * FROM s.projects p)",
+        "Operator [IN] cannot work with [TEXT, (*)]");
+  }
+
+  @Test
+  public void useExistsClauseWithSelectStarShouldPass() {
+    validate("SELECT * FROM semantics s WHERE EXISTS (SELECT * FROM s.projects p)");
+  }
+
+  @Test
+  public void useExistsClauseWithSelectConstantShouldPass() {
+    validate("SELECT * FROM semantics s WHERE EXISTS (SELECT 1 FROM s.projects p)");
+  }
+
+  /** Ignore the semantic analyzer by using {@link EarlyExitAnalysisException} */
+  @Test
+  public void useSubqueryInFromClauseWithSelectConstantShouldPass() {
+    validate("SELECT t.TEMP as count FROM (SELECT COUNT(*) as TEMP FROM semantics) t");
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerTestBase.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerTestBase.java
index 7b53619d9c..403c2f49b7 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerTestBase.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerTestBase.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import static java.util.stream.Collectors.toList;
@@ -28,49 +27,45 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
 
-/**
- * Test cases for semantic analysis focused on semantic check which was missing in the past.
- */
+/** Test cases for semantic analysis focused on semantic check which was missing in the past. */
 public abstract class SemanticAnalyzerTestBase {
 
-    private static final String TEST_MAPPING_FILE = "mappings/semantics.json";
+  private static final String TEST_MAPPING_FILE = "mappings/semantics.json";
 
-    /** public accessor is required by @Rule annotation */
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
+  /** public accessor is required by @Rule annotation */
+  @Rule public ExpectedException exception = ExpectedException.none();
 
-    private OpenSearchLegacySqlAnalyzer
-        analyzer = new OpenSearchLegacySqlAnalyzer(new SqlAnalysisConfig(true, true, 1000));
+  private OpenSearchLegacySqlAnalyzer analyzer =
+      new OpenSearchLegacySqlAnalyzer(new SqlAnalysisConfig(true, true, 1000));
 
-    @SuppressWarnings("UnstableApiUsage")
-    @BeforeClass
-    public static void init() throws IOException {
-        URL url = Resources.getResource(TEST_MAPPING_FILE);
-        String mappings = Resources.toString(url, Charsets.UTF_8);
-        LocalClusterState.state(null);
-        mockLocalClusterState(mappings);
-    }
+  @SuppressWarnings("UnstableApiUsage")
+  @BeforeClass
+  public static void init() throws IOException {
+    URL url = Resources.getResource(TEST_MAPPING_FILE);
+    String mappings = Resources.toString(url, Charsets.UTF_8);
+    LocalClusterState.state(null);
+    mockLocalClusterState(mappings);
+  }
 
-    @AfterClass
-    public static void cleanUp() {
-        LocalClusterState.state(null);
-    }
+  @AfterClass
+  public static void cleanUp() {
+    LocalClusterState.state(null);
+  }
 
-    protected void expectValidationFailWithErrorMessages(String query, String... messages) {
-        exception.expect(SemanticAnalysisException.class);
-        exception.expectMessage(allOf(Arrays.stream(messages).
-                                      map(Matchers::containsString).
-                                      collect(toList())));
-        validate(query);
-    }
+  protected void expectValidationFailWithErrorMessages(String query, String... messages) {
+    exception.expect(SemanticAnalysisException.class);
+    exception.expectMessage(
+        allOf(Arrays.stream(messages).map(Matchers::containsString).collect(toList())));
+    validate(query);
+  }
 
-    protected void validate(String sql) {
-        analyzer.analyze(sql, LocalClusterState.state());
-    }
+  protected void validate(String sql) {
+    analyzer.analyze(sql, LocalClusterState.state());
+  }
 
-    protected void validateWithType(String sql, Type type) {
-        Optional<Type> analyze = analyzer.analyze(sql, LocalClusterState.state());
-        assertTrue(analyze.isPresent());
-        assertEquals(type, analyze.get());
-    }
+  protected void validateWithType(String sql, Type type) {
+    Optional<Type> analyze = analyzer.analyze(sql, LocalClusterState.state());
+    assertTrue(analyze.isPresent());
+    assertEquals(type, analyze.get());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerTests.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerTests.java
index 56a27b780f..7585152a4d 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerTests.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/SemanticAnalyzerTests.java
@@ -3,29 +3,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 /**
- * Semantic analyzer test suite to prepare mapping and avoid load from file every time.
- * But Gradle seems not work well with suite. So move common logic to test base class
- * and keep this for quick testing in IDE.
+ * Semantic analyzer test suite to prepare mapping and avoid load from file every time. But Gradle
+ * seems not work well with suite. So move common logic to test base class and keep this for quick
+ * testing in IDE.
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-    SemanticAnalyzerBasicTest.class,
-    SemanticAnalyzerConfigTest.class,
-    SemanticAnalyzerFromClauseTest.class,
-    SemanticAnalyzerIdentifierTest.class,
-    SemanticAnalyzerScalarFunctionTest.class,
-    SemanticAnalyzerESScalarFunctionTest.class,
-    SemanticAnalyzerAggregateFunctionTest.class,
-    SemanticAnalyzerOperatorTest.class,
-    SemanticAnalyzerSubqueryTest.class,
-    SemanticAnalyzerMultiQueryTest.class,
+  SemanticAnalyzerBasicTest.class,
+  SemanticAnalyzerConfigTest.class,
+  SemanticAnalyzerFromClauseTest.class,
+  SemanticAnalyzerIdentifierTest.class,
+  SemanticAnalyzerScalarFunctionTest.class,
+  SemanticAnalyzerESScalarFunctionTest.class,
+  SemanticAnalyzerAggregateFunctionTest.class,
+  SemanticAnalyzerOperatorTest.class,
+  SemanticAnalyzerSubqueryTest.class,
+  SemanticAnalyzerMultiQueryTest.class,
 })
-public class SemanticAnalyzerTests {
-}
+public class SemanticAnalyzerTests {}
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/EnvironmentTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/EnvironmentTest.java
index d9e9271728..c7639e542e 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/EnvironmentTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/EnvironmentTest.java
@@ -3,13 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.scope;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.aMapWithSize;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.BOOLEAN;
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.DATE;
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.KEYWORD;
@@ -23,141 +22,136 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.Type;
 import org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchIndex;
 
-/**
- * Test cases for environment
- */
+/** Test cases for environment */
 public class EnvironmentTest {
 
-    /** Use context class for push/pop */
-    private final SemanticContext context = new SemanticContext();
-
-    @Test
-    public void defineFieldSymbolInDifferentEnvironmentsShouldBeAbleToResolve() {
-        // Root environment
-        Symbol birthday = new Symbol(Namespace.FIELD_NAME, "s.birthday");
-        environment().define(birthday, DATE);
-        Assert.assertTrue(environment().resolve(birthday).isPresent());
-
-        // New environment 1
-        context.push();
-        Symbol city = new Symbol(Namespace.FIELD_NAME, "s.city");
-        environment().define(city, KEYWORD);
-        Assert.assertTrue(environment().resolve(birthday).isPresent());
-        Assert.assertTrue(environment().resolve(city).isPresent());
-
-        // New environment 2
-        context.push();
-        Symbol manager = new Symbol(Namespace.FIELD_NAME, "s.manager");
-        environment().define(manager, OBJECT);
-        Assert.assertTrue(environment().resolve(birthday).isPresent());
-        Assert.assertTrue(environment().resolve(city).isPresent());
-        Assert.assertTrue(environment().resolve(manager).isPresent());
-    }
-
-    @Test
-    public void defineFieldSymbolInDifferentEnvironmentsShouldNotAbleToResolveOncePopped() {
-        // Root environment
-        Symbol birthday = new Symbol(Namespace.FIELD_NAME, "s.birthday");
-        environment().define(birthday, DATE);
-
-        // New environment
-        context.push();
-        Symbol city = new Symbol(Namespace.FIELD_NAME, "s.city");
-        Symbol manager = new Symbol(Namespace.FIELD_NAME, "s.manager");
-        environment().define(city, OBJECT);
-        environment().define(manager, OBJECT);
-        Assert.assertTrue(environment().resolve(birthday).isPresent());
-        Assert.assertTrue(environment().resolve(city).isPresent());
-        Assert.assertTrue(environment().resolve(manager).isPresent());
-
-        context.pop();
-        Assert.assertFalse(environment().resolve(city).isPresent());
-        Assert.assertFalse(environment().resolve(manager).isPresent());
-        Assert.assertTrue(environment().resolve(birthday).isPresent());
-    }
-
-    @Test
-    public void defineFieldSymbolInDifferentEnvironmentsShouldBeAbleToResolveByPrefix() {
-        // Root environment
-        Symbol birthday = new Symbol(Namespace.FIELD_NAME, "s.birthday");
-        environment().define(birthday, DATE);
-
-        // New environment 1
-        context.push();
-        Symbol city = new Symbol(Namespace.FIELD_NAME, "s.city");
-        environment().define(city, KEYWORD);
-
-        // New environment 2
-        context.push();
-        Symbol manager = new Symbol(Namespace.FIELD_NAME, "s.manager");
-        environment().define(manager, OBJECT);
-
-        Map<String, Type> typeByName = environment().resolveByPrefix(new Symbol(Namespace.FIELD_NAME, "s"));
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(3),
-                hasEntry("s.birthday", DATE),
-                hasEntry("s.city", KEYWORD),
-                hasEntry("s.manager", OBJECT)
-            )
-        );
-    }
-
-    @Test
-    public void defineFieldSymbolShouldBeAbleToResolveAll() {
-        environment().define(new Symbol(Namespace.FIELD_NAME, "s.projects"), new OpenSearchIndex("s.projects", NESTED_FIELD));
-        environment().define(new Symbol(Namespace.FIELD_NAME, "s.projects.release"), DATE);
-        environment().define(new Symbol(Namespace.FIELD_NAME, "s.projects.active"), BOOLEAN);
-        environment().define(new Symbol(Namespace.FIELD_NAME, "s.address"), TEXT);
-        environment().define(new Symbol(Namespace.FIELD_NAME, "s.city"), KEYWORD);
-        environment().define(new Symbol(Namespace.FIELD_NAME, "s.manager.name"), TEXT);
-
-        Map<String, Type> typeByName = environment().resolveAll(Namespace.FIELD_NAME);
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(6),
-                hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("s.projects.release", DATE),
-                hasEntry("s.projects.active", BOOLEAN),
-                hasEntry("s.address", TEXT),
-                hasEntry("s.city", KEYWORD),
-                hasEntry("s.manager.name", TEXT)
-            )
-        );
-    }
-
-    @Test
-    public void defineFieldSymbolInDifferentEnvironmentsShouldBeAbleToResolveAll() {
-        // Root environment
-        Symbol birthday = new Symbol(Namespace.FIELD_NAME, "s.birthday");
-        environment().define(birthday, DATE);
-
-        // New environment 1
-        context.push();
-        Symbol city = new Symbol(Namespace.FIELD_NAME, "s.city");
-        environment().define(city, KEYWORD);
-
-        // New environment 2
-        context.push();
-        Symbol manager = new Symbol(Namespace.FIELD_NAME, "s.manager");
-        environment().define(manager, OBJECT);
-
-        Map<String, Type> typeByName = environment().resolveAll(Namespace.FIELD_NAME);
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(3),
-                hasEntry("s.birthday", DATE),
-                hasEntry("s.city", KEYWORD),
-                hasEntry("s.manager", OBJECT)
-            )
-        );
-    }
-
-    private Environment environment() {
-        return context.peek();
-    }
-
+  /** Use context class for push/pop */
+  private final SemanticContext context = new SemanticContext();
+
+  @Test
+  public void defineFieldSymbolInDifferentEnvironmentsShouldBeAbleToResolve() {
+    // Root environment
+    Symbol birthday = new Symbol(Namespace.FIELD_NAME, "s.birthday");
+    environment().define(birthday, DATE);
+    Assert.assertTrue(environment().resolve(birthday).isPresent());
+
+    // New environment 1
+    context.push();
+    Symbol city = new Symbol(Namespace.FIELD_NAME, "s.city");
+    environment().define(city, KEYWORD);
+    Assert.assertTrue(environment().resolve(birthday).isPresent());
+    Assert.assertTrue(environment().resolve(city).isPresent());
+
+    // New environment 2
+    context.push();
+    Symbol manager = new Symbol(Namespace.FIELD_NAME, "s.manager");
+    environment().define(manager, OBJECT);
+    Assert.assertTrue(environment().resolve(birthday).isPresent());
+    Assert.assertTrue(environment().resolve(city).isPresent());
+    Assert.assertTrue(environment().resolve(manager).isPresent());
+  }
+
+  @Test
+  public void defineFieldSymbolInDifferentEnvironmentsShouldNotAbleToResolveOncePopped() {
+    // Root environment
+    Symbol birthday = new Symbol(Namespace.FIELD_NAME, "s.birthday");
+    environment().define(birthday, DATE);
+
+    // New environment
+    context.push();
+    Symbol city = new Symbol(Namespace.FIELD_NAME, "s.city");
+    Symbol manager = new Symbol(Namespace.FIELD_NAME, "s.manager");
+    environment().define(city, OBJECT);
+    environment().define(manager, OBJECT);
+    Assert.assertTrue(environment().resolve(birthday).isPresent());
+    Assert.assertTrue(environment().resolve(city).isPresent());
+    Assert.assertTrue(environment().resolve(manager).isPresent());
+
+    context.pop();
+    Assert.assertFalse(environment().resolve(city).isPresent());
+    Assert.assertFalse(environment().resolve(manager).isPresent());
+    Assert.assertTrue(environment().resolve(birthday).isPresent());
+  }
+
+  @Test
+  public void defineFieldSymbolInDifferentEnvironmentsShouldBeAbleToResolveByPrefix() {
+    // Root environment
+    Symbol birthday = new Symbol(Namespace.FIELD_NAME, "s.birthday");
+    environment().define(birthday, DATE);
+
+    // New environment 1
+    context.push();
+    Symbol city = new Symbol(Namespace.FIELD_NAME, "s.city");
+    environment().define(city, KEYWORD);
+
+    // New environment 2
+    context.push();
+    Symbol manager = new Symbol(Namespace.FIELD_NAME, "s.manager");
+    environment().define(manager, OBJECT);
+
+    Map<String, Type> typeByName =
+        environment().resolveByPrefix(new Symbol(Namespace.FIELD_NAME, "s"));
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(3),
+            hasEntry("s.birthday", DATE),
+            hasEntry("s.city", KEYWORD),
+            hasEntry("s.manager", OBJECT)));
+  }
+
+  @Test
+  public void defineFieldSymbolShouldBeAbleToResolveAll() {
+    environment()
+        .define(
+            new Symbol(Namespace.FIELD_NAME, "s.projects"),
+            new OpenSearchIndex("s.projects", NESTED_FIELD));
+    environment().define(new Symbol(Namespace.FIELD_NAME, "s.projects.release"), DATE);
+    environment().define(new Symbol(Namespace.FIELD_NAME, "s.projects.active"), BOOLEAN);
+    environment().define(new Symbol(Namespace.FIELD_NAME, "s.address"), TEXT);
+    environment().define(new Symbol(Namespace.FIELD_NAME, "s.city"), KEYWORD);
+    environment().define(new Symbol(Namespace.FIELD_NAME, "s.manager.name"), TEXT);
+
+    Map<String, Type> typeByName = environment().resolveAll(Namespace.FIELD_NAME);
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(6),
+            hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("s.projects.release", DATE),
+            hasEntry("s.projects.active", BOOLEAN),
+            hasEntry("s.address", TEXT),
+            hasEntry("s.city", KEYWORD),
+            hasEntry("s.manager.name", TEXT)));
+  }
+
+  @Test
+  public void defineFieldSymbolInDifferentEnvironmentsShouldBeAbleToResolveAll() {
+    // Root environment
+    Symbol birthday = new Symbol(Namespace.FIELD_NAME, "s.birthday");
+    environment().define(birthday, DATE);
+
+    // New environment 1
+    context.push();
+    Symbol city = new Symbol(Namespace.FIELD_NAME, "s.city");
+    environment().define(city, KEYWORD);
+
+    // New environment 2
+    context.push();
+    Symbol manager = new Symbol(Namespace.FIELD_NAME, "s.manager");
+    environment().define(manager, OBJECT);
+
+    Map<String, Type> typeByName = environment().resolveAll(Namespace.FIELD_NAME);
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(3),
+            hasEntry("s.birthday", DATE),
+            hasEntry("s.city", KEYWORD),
+            hasEntry("s.manager", OBJECT)));
+  }
+
+  private Environment environment() {
+    return context.peek();
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/SemanticContextTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/SemanticContextTest.java
index 689fdd20f6..e19b48f2a0 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/SemanticContextTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/SemanticContextTest.java
@@ -3,42 +3,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.scope;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- * Test cases for semantic context
- */
+/** Test cases for semantic context */
 public class SemanticContextTest {
 
-    private final SemanticContext context = new SemanticContext();
-
-    @Test
-    public void rootEnvironmentShouldBeThereInitially() {
-        Assert.assertNotNull(
-            "Didn't find root environment. Context is NOT supposed to be empty initially",
-            context.peek()
-        );
-    }
-
-    @Test
-    public void pushAndPopEnvironmentShouldPass() {
-        context.push();
-        context.pop();
-    }
-
-    @Test
-    public void popRootEnvironmentShouldPass() {
-        context.pop();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void popEmptyEnvironmentStackShouldFail() {
-        context.pop();
-        context.pop();
-    }
-
+  private final SemanticContext context = new SemanticContext();
+
+  @Test
+  public void rootEnvironmentShouldBeThereInitially() {
+    Assert.assertNotNull(
+        "Didn't find root environment. Context is NOT supposed to be empty initially",
+        context.peek());
+  }
+
+  @Test
+  public void pushAndPopEnvironmentShouldPass() {
+    context.push();
+    context.pop();
+  }
+
+  @Test
+  public void popRootEnvironmentShouldPass() {
+    context.pop();
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void popEmptyEnvironmentStackShouldFail() {
+    context.pop();
+    context.pop();
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/SymbolTableTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/SymbolTableTest.java
index 3ccc75da62..8fde3bdc3c 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/SymbolTableTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/SymbolTableTest.java
@@ -3,13 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.scope;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.aMapWithSize;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.BOOLEAN;
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.DATE;
 import static org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType.KEYWORD;
@@ -25,65 +24,62 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.TypeExpression;
 import org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchIndex;
 
-/**
- * Test cases for symbol table
- */
+/** Test cases for symbol table */
 public class SymbolTableTest {
 
-    private final SymbolTable symbolTable = new SymbolTable();
+  private final SymbolTable symbolTable = new SymbolTable();
 
-    @Test
-    public void defineFieldSymbolShouldBeAbleToResolve() {
-        defineSymbolShouldBeAbleToResolve(new Symbol(Namespace.FIELD_NAME, "birthday"), DATE);
-    }
+  @Test
+  public void defineFieldSymbolShouldBeAbleToResolve() {
+    defineSymbolShouldBeAbleToResolve(new Symbol(Namespace.FIELD_NAME, "birthday"), DATE);
+  }
 
-    @Test
-    public void defineFunctionSymbolShouldBeAbleToResolve() {
-        String funcName = "LOG";
-        Type expectedType = new TypeExpression() {
-            @Override
-            public String getName() {
-                return "Temp type expression with [NUMBER] -> NUMBER specification";
-            }
+  @Test
+  public void defineFunctionSymbolShouldBeAbleToResolve() {
+    String funcName = "LOG";
+    Type expectedType =
+        new TypeExpression() {
+          @Override
+          public String getName() {
+            return "Temp type expression with [NUMBER] -> NUMBER specification";
+          }
 
-            @Override
-            public TypeExpressionSpec[] specifications() {
-                return new TypeExpressionSpec[] {
-                    new TypeExpressionSpec().map(NUMBER).to(NUMBER)
-                };
-            }
+          @Override
+          public TypeExpressionSpec[] specifications() {
+            return new TypeExpressionSpec[] {new TypeExpressionSpec().map(NUMBER).to(NUMBER)};
+          }
         };
-        Symbol symbol = new Symbol(Namespace.FUNCTION_NAME, funcName);
-        defineSymbolShouldBeAbleToResolve(symbol, expectedType);
-    }
-
-    @Test
-    public void defineFieldSymbolShouldBeAbleToResolveByPrefix() {
-        symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.projects"), new OpenSearchIndex("s.projects", NESTED_FIELD));
-        symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.projects.release"), DATE);
-        symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.projects.active"), BOOLEAN);
-        symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.address"), TEXT);
-        symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.city"), KEYWORD);
-        symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.manager.name"), TEXT);
+    Symbol symbol = new Symbol(Namespace.FUNCTION_NAME, funcName);
+    defineSymbolShouldBeAbleToResolve(symbol, expectedType);
+  }
 
-        Map<String, Type> typeByName = symbolTable.lookupByPrefix(new Symbol(Namespace.FIELD_NAME, "s.projects"));
-        assertThat(
-            typeByName,
-            allOf(
-                aMapWithSize(3),
-                hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
-                hasEntry("s.projects.release", DATE),
-                hasEntry("s.projects.active", BOOLEAN)
-            )
-        );
-    }
+  @Test
+  public void defineFieldSymbolShouldBeAbleToResolveByPrefix() {
+    symbolTable.store(
+        new Symbol(Namespace.FIELD_NAME, "s.projects"),
+        new OpenSearchIndex("s.projects", NESTED_FIELD));
+    symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.projects.release"), DATE);
+    symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.projects.active"), BOOLEAN);
+    symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.address"), TEXT);
+    symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.city"), KEYWORD);
+    symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.manager.name"), TEXT);
 
-    private void defineSymbolShouldBeAbleToResolve(Symbol symbol, Type expectedType) {
-        symbolTable.store(symbol, expectedType);
+    Map<String, Type> typeByName =
+        symbolTable.lookupByPrefix(new Symbol(Namespace.FIELD_NAME, "s.projects"));
+    assertThat(
+        typeByName,
+        allOf(
+            aMapWithSize(3),
+            hasEntry("s.projects", (Type) new OpenSearchIndex("s.projects", NESTED_FIELD)),
+            hasEntry("s.projects.release", DATE),
+            hasEntry("s.projects.active", BOOLEAN)));
+  }
 
-        Optional<Type> actualType = symbolTable.lookup(symbol);
-        Assert.assertTrue(actualType.isPresent());
-        Assert.assertEquals(expectedType, actualType.get());
-    }
+  private void defineSymbolShouldBeAbleToResolve(Symbol symbol, Type expectedType) {
+    symbolTable.store(symbol, expectedType);
 
+    Optional<Type> actualType = symbolTable.lookup(symbol);
+    Assert.assertTrue(actualType.isPresent());
+    Assert.assertEquals(expectedType, actualType.get());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/TypeSupplierTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/TypeSupplierTest.java
index a0b60de4be..e6090117c1 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/TypeSupplierTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/scope/TypeSupplierTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.scope;
 
 import static org.junit.Assert.assertEquals;
@@ -15,31 +14,30 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType;
 
 public class TypeSupplierTest {
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
+  @Rule public ExpectedException exception = ExpectedException.none();
 
-    @Test
-    public void haveOneTypeShouldPass() {
-        TypeSupplier age = new TypeSupplier("age", OpenSearchDataType.INTEGER);
+  @Test
+  public void haveOneTypeShouldPass() {
+    TypeSupplier age = new TypeSupplier("age", OpenSearchDataType.INTEGER);
 
-        assertEquals(OpenSearchDataType.INTEGER, age.get());
-    }
+    assertEquals(OpenSearchDataType.INTEGER, age.get());
+  }
 
-    @Test
-    public void addSameTypeShouldPass() {
-        TypeSupplier age = new TypeSupplier("age", OpenSearchDataType.INTEGER);
-        age.add(OpenSearchDataType.INTEGER);
+  @Test
+  public void addSameTypeShouldPass() {
+    TypeSupplier age = new TypeSupplier("age", OpenSearchDataType.INTEGER);
+    age.add(OpenSearchDataType.INTEGER);
 
-        assertEquals(OpenSearchDataType.INTEGER, age.get());
-    }
+    assertEquals(OpenSearchDataType.INTEGER, age.get());
+  }
 
-    @Test
-    public void haveTwoTypesShouldThrowException() {
-        TypeSupplier age = new TypeSupplier("age", OpenSearchDataType.INTEGER);
-        age.add(OpenSearchDataType.TEXT);
+  @Test
+  public void haveTwoTypesShouldThrowException() {
+    TypeSupplier age = new TypeSupplier("age", OpenSearchDataType.INTEGER);
+    age.add(OpenSearchDataType.TEXT);
 
-        exception.expect(SemanticAnalysisException.class);
-        exception.expectMessage("Field [age] have conflict type");
-        age.get();
-    }
+    exception.expect(SemanticAnalysisException.class);
+    exception.expectMessage("Field [age] have conflict type");
+    age.get();
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/BaseTypeTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/BaseTypeTest.java
index a8ddfd43e8..0269c6b01c 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/BaseTypeTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/BaseTypeTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types;
 
 import static org.junit.Assert.assertEquals;
@@ -30,78 +29,75 @@
 import org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchDataType;
 import org.opensearch.sql.legacy.antlr.semantic.types.base.OpenSearchIndex;
 
-/**
- * Test base type compatibility
- */
+/** Test base type compatibility */
 public class BaseTypeTest {
 
-    @Test
-    public void unknownTypeNameShouldReturnUnknown() {
-        assertEquals(UNKNOWN, OpenSearchDataType.typeOf("this_is_a_new_es_type_we_arent_aware"));
-    }
-
-    @Test
-    public void typeOfShouldIgnoreCase() {
-        assertEquals(INTEGER, OpenSearchDataType.typeOf("Integer"));
-    }
-
-    @Test
-    public void sameBaseTypeShouldBeCompatible() {
-        assertTrue(INTEGER.isCompatible(INTEGER));
-        assertTrue(BOOLEAN.isCompatible(BOOLEAN));
-    }
-
-    @Test
-    public void parentBaseTypeShouldBeCompatibleWithSubBaseType() {
-        assertTrue(NUMBER.isCompatible(DOUBLE));
-        assertTrue(DOUBLE.isCompatible(FLOAT));
-        assertTrue(FLOAT.isCompatible(INTEGER));
-        assertTrue(INTEGER.isCompatible(SHORT));
-        assertTrue(INTEGER.isCompatible(LONG));
-        assertTrue(STRING.isCompatible(TEXT));
-        assertTrue(STRING.isCompatible(KEYWORD));
-        assertTrue(DATE.isCompatible(STRING));
-    }
-
-    @Test
-    public void ancestorBaseTypeShouldBeCompatibleWithSubBaseType() {
-        assertTrue(NUMBER.isCompatible(LONG));
-        assertTrue(NUMBER.isCompatible(DOUBLE));
-        assertTrue(DOUBLE.isCompatible(INTEGER));
-        assertTrue(INTEGER.isCompatible(SHORT));
-        assertTrue(INTEGER.isCompatible(LONG));
-    }
-
-    @Ignore("Two way compatibility is not necessary")
-    @Test
-    public void subBaseTypeShouldBeCompatibleWithParentBaseType() {
-        assertTrue(KEYWORD.isCompatible(STRING));
-    }
-
-    @Test
-    public void nonRelatedBaseTypeShouldNotBeCompatible() {
-        assertFalse(SHORT.isCompatible(TEXT));
-        assertFalse(DATE.isCompatible(BOOLEAN));
-    }
-
-    @Test
-    public void unknownBaseTypeShouldBeCompatibleWithAnyBaseType() {
-        assertTrue(UNKNOWN.isCompatible(INTEGER));
-        assertTrue(UNKNOWN.isCompatible(KEYWORD));
-        assertTrue(UNKNOWN.isCompatible(BOOLEAN));
-    }
-
-    @Test
-    public void anyBaseTypeShouldBeCompatibleWithUnknownBaseType() {
-        assertTrue(LONG.isCompatible(UNKNOWN));
-        assertTrue(TEXT.isCompatible(UNKNOWN));
-        assertTrue(DATE.isCompatible(UNKNOWN));
-    }
-
-    @Test
-    public void nestedIndexTypeShouldBeCompatibleWithNestedDataType() {
-        assertTrue(NESTED.isCompatible(new OpenSearchIndex("test", NESTED_FIELD)));
-        assertTrue(OPENSEARCH_TYPE.isCompatible(new OpenSearchIndex("test", NESTED_FIELD)));
-    }
-
+  @Test
+  public void unknownTypeNameShouldReturnUnknown() {
+    assertEquals(UNKNOWN, OpenSearchDataType.typeOf("this_is_a_new_es_type_we_arent_aware"));
+  }
+
+  @Test
+  public void typeOfShouldIgnoreCase() {
+    assertEquals(INTEGER, OpenSearchDataType.typeOf("Integer"));
+  }
+
+  @Test
+  public void sameBaseTypeShouldBeCompatible() {
+    assertTrue(INTEGER.isCompatible(INTEGER));
+    assertTrue(BOOLEAN.isCompatible(BOOLEAN));
+  }
+
+  @Test
+  public void parentBaseTypeShouldBeCompatibleWithSubBaseType() {
+    assertTrue(NUMBER.isCompatible(DOUBLE));
+    assertTrue(DOUBLE.isCompatible(FLOAT));
+    assertTrue(FLOAT.isCompatible(INTEGER));
+    assertTrue(INTEGER.isCompatible(SHORT));
+    assertTrue(INTEGER.isCompatible(LONG));
+    assertTrue(STRING.isCompatible(TEXT));
+    assertTrue(STRING.isCompatible(KEYWORD));
+    assertTrue(DATE.isCompatible(STRING));
+  }
+
+  @Test
+  public void ancestorBaseTypeShouldBeCompatibleWithSubBaseType() {
+    assertTrue(NUMBER.isCompatible(LONG));
+    assertTrue(NUMBER.isCompatible(DOUBLE));
+    assertTrue(DOUBLE.isCompatible(INTEGER));
+    assertTrue(INTEGER.isCompatible(SHORT));
+    assertTrue(INTEGER.isCompatible(LONG));
+  }
+
+  @Ignore("Two way compatibility is not necessary")
+  @Test
+  public void subBaseTypeShouldBeCompatibleWithParentBaseType() {
+    assertTrue(KEYWORD.isCompatible(STRING));
+  }
+
+  @Test
+  public void nonRelatedBaseTypeShouldNotBeCompatible() {
+    assertFalse(SHORT.isCompatible(TEXT));
+    assertFalse(DATE.isCompatible(BOOLEAN));
+  }
+
+  @Test
+  public void unknownBaseTypeShouldBeCompatibleWithAnyBaseType() {
+    assertTrue(UNKNOWN.isCompatible(INTEGER));
+    assertTrue(UNKNOWN.isCompatible(KEYWORD));
+    assertTrue(UNKNOWN.isCompatible(BOOLEAN));
+  }
+
+  @Test
+  public void anyBaseTypeShouldBeCompatibleWithUnknownBaseType() {
+    assertTrue(LONG.isCompatible(UNKNOWN));
+    assertTrue(TEXT.isCompatible(UNKNOWN));
+    assertTrue(DATE.isCompatible(UNKNOWN));
+  }
+
+  @Test
+  public void nestedIndexTypeShouldBeCompatibleWithNestedDataType() {
+    assertTrue(NESTED.isCompatible(new OpenSearchIndex("test", NESTED_FIELD)));
+    assertTrue(OPENSEARCH_TYPE.isCompatible(new OpenSearchIndex("test", NESTED_FIELD)));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/GenericTypeTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/GenericTypeTest.java
index db76c01947..0bd8b526bb 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/GenericTypeTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/GenericTypeTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types;
 
 import static java.util.Collections.singletonList;
@@ -19,34 +18,31 @@
 
 import org.junit.Test;
 
-/**
- * Generic type test
- */
+/** Generic type test */
 public class GenericTypeTest {
 
-    @Test
-    public void passNumberArgToLogShouldReturnNumber() {
-        assertEquals(DOUBLE, LOG.construct(singletonList(NUMBER)));
-    }
-
-    @Test
-    public void passIntegerArgToLogShouldReturnDouble() {
-        assertEquals(DOUBLE, LOG.construct(singletonList(INTEGER)));
-    }
-
-    @Test
-    public void passLongArgToLogShouldReturnDouble() {
-        assertEquals(DOUBLE, LOG.construct(singletonList(LONG)));
-    }
-
-    @Test
-    public void passTextArgToLogShouldReturnTypeError() {
-        assertEquals(TYPE_ERROR, LOG.construct(singletonList(TEXT)));
-    }
-
-    @Test
-    public void passKeywordArgToLogShouldReturnTypeError() {
-        assertEquals(TYPE_ERROR, LOG.construct(singletonList(KEYWORD)));
-    }
-
+  @Test
+  public void passNumberArgToLogShouldReturnNumber() {
+    assertEquals(DOUBLE, LOG.construct(singletonList(NUMBER)));
+  }
+
+  @Test
+  public void passIntegerArgToLogShouldReturnDouble() {
+    assertEquals(DOUBLE, LOG.construct(singletonList(INTEGER)));
+  }
+
+  @Test
+  public void passLongArgToLogShouldReturnDouble() {
+    assertEquals(DOUBLE, LOG.construct(singletonList(LONG)));
+  }
+
+  @Test
+  public void passTextArgToLogShouldReturnTypeError() {
+    assertEquals(TYPE_ERROR, LOG.construct(singletonList(TEXT)));
+  }
+
+  @Test
+  public void passKeywordArgToLogShouldReturnTypeError() {
+    assertEquals(TYPE_ERROR, LOG.construct(singletonList(KEYWORD)));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/ProductTypeTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/ProductTypeTest.java
index 326dd6ce06..5c87aabdee 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/ProductTypeTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/ProductTypeTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types;
 
 import static java.util.Collections.singletonList;
@@ -18,56 +17,53 @@
 import org.junit.Test;
 import org.opensearch.sql.legacy.antlr.semantic.types.special.Product;
 
-/**
- * Test cases fro product type
- */
+/** Test cases fro product type */
 public class ProductTypeTest {
 
-    @Test
-    public void singleSameTypeInTwoProductsShouldPass() {
-        Product product1 = new Product(singletonList(INTEGER));
-        Product product2 = new Product(singletonList(INTEGER));
-        Assert.assertTrue(product1.isCompatible(product2));
-        Assert.assertTrue(product2.isCompatible(product1));
-    }
-
-    @Test
-    public void singleCompatibleTypeInTwoProductsShouldPass() {
-        Product product1 = new Product(singletonList(NUMBER));
-        Product product2 = new Product(singletonList(INTEGER));
-        Assert.assertTrue(product1.isCompatible(product2));
-        Assert.assertTrue(product2.isCompatible(product1));
-    }
+  @Test
+  public void singleSameTypeInTwoProductsShouldPass() {
+    Product product1 = new Product(singletonList(INTEGER));
+    Product product2 = new Product(singletonList(INTEGER));
+    Assert.assertTrue(product1.isCompatible(product2));
+    Assert.assertTrue(product2.isCompatible(product1));
+  }
 
-    @Test
-    public void twoCompatibleTypesInTwoProductsShouldPass() {
-        Product product1 = new Product(Arrays.asList(NUMBER, KEYWORD));
-        Product product2 = new Product(Arrays.asList(INTEGER, STRING));
-        Assert.assertTrue(product1.isCompatible(product2));
-        Assert.assertTrue(product2.isCompatible(product1));
-    }
+  @Test
+  public void singleCompatibleTypeInTwoProductsShouldPass() {
+    Product product1 = new Product(singletonList(NUMBER));
+    Product product2 = new Product(singletonList(INTEGER));
+    Assert.assertTrue(product1.isCompatible(product2));
+    Assert.assertTrue(product2.isCompatible(product1));
+  }
 
-    @Test
-    public void incompatibleTypesInTwoProductsShouldFail() {
-        Product product1 = new Product(singletonList(BOOLEAN));
-        Product product2 = new Product(singletonList(STRING));
-        Assert.assertFalse(product1.isCompatible(product2));
-        Assert.assertFalse(product2.isCompatible(product1));
-    }
+  @Test
+  public void twoCompatibleTypesInTwoProductsShouldPass() {
+    Product product1 = new Product(Arrays.asList(NUMBER, KEYWORD));
+    Product product2 = new Product(Arrays.asList(INTEGER, STRING));
+    Assert.assertTrue(product1.isCompatible(product2));
+    Assert.assertTrue(product2.isCompatible(product1));
+  }
 
-    @Test
-    public void compatibleButDifferentTypeNumberInTwoProductsShouldFail() {
-        Product product1 = new Product(Arrays.asList(KEYWORD, INTEGER));
-        Product product2 = new Product(singletonList(STRING));
-        Assert.assertFalse(product1.isCompatible(product2));
-        Assert.assertFalse(product2.isCompatible(product1));
-    }
+  @Test
+  public void incompatibleTypesInTwoProductsShouldFail() {
+    Product product1 = new Product(singletonList(BOOLEAN));
+    Product product2 = new Product(singletonList(STRING));
+    Assert.assertFalse(product1.isCompatible(product2));
+    Assert.assertFalse(product2.isCompatible(product1));
+  }
 
-    @Test
-    public void baseTypeShouldBeIncompatibleWithProductType() {
-        Product product = new Product(singletonList(INTEGER));
-        Assert.assertFalse(INTEGER.isCompatible(product));
-        Assert.assertFalse(product.isCompatible(INTEGER));
-    }
+  @Test
+  public void compatibleButDifferentTypeNumberInTwoProductsShouldFail() {
+    Product product1 = new Product(Arrays.asList(KEYWORD, INTEGER));
+    Product product2 = new Product(singletonList(STRING));
+    Assert.assertFalse(product1.isCompatible(product2));
+    Assert.assertFalse(product2.isCompatible(product1));
+  }
 
+  @Test
+  public void baseTypeShouldBeIncompatibleWithProductType() {
+    Product product = new Product(singletonList(INTEGER));
+    Assert.assertFalse(INTEGER.isCompatible(product));
+    Assert.assertFalse(product.isCompatible(INTEGER));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/TypeExpressionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/TypeExpressionTest.java
index d1d1d7799b..55c184bcaa 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/TypeExpressionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/semantic/types/TypeExpressionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.semantic.types;
 
 import static org.junit.Assert.assertEquals;
@@ -21,59 +20,58 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-/**
- * Test cases for default implementation methods in interface TypeExpression
- */
+/** Test cases for default implementation methods in interface TypeExpression */
 public class TypeExpressionTest {
 
-    private final TypeExpression test123 = new TypeExpression() {
+  private final TypeExpression test123 =
+      new TypeExpression() {
 
         @Override
         public String getName() {
-            return "TEST123";
+          return "TEST123";
         }
 
         @Override
         public TypeExpressionSpec[] specifications() {
-            return new TypeExpressionSpec[] {
-                new TypeExpressionSpec().map(T(NUMBER)).to(T),
-                new TypeExpressionSpec().map(STRING, BOOLEAN).to(DATE)
-            };
+          return new TypeExpressionSpec[] {
+            new TypeExpressionSpec().map(T(NUMBER)).to(T),
+            new TypeExpressionSpec().map(STRING, BOOLEAN).to(DATE)
+          };
         }
-    };
+      };
 
-    @Test
-    public void emptySpecificationShouldAlwaysReturnUnknown() {
-        TypeExpression expr = new TypeExpression() {
-            @Override
-            public TypeExpressionSpec[] specifications() {
-                return new TypeExpressionSpec[0];
-            }
+  @Test
+  public void emptySpecificationShouldAlwaysReturnUnknown() {
+    TypeExpression expr =
+        new TypeExpression() {
+          @Override
+          public TypeExpressionSpec[] specifications() {
+            return new TypeExpressionSpec[0];
+          }
 
-            @Override
-            public String getName() {
-                return "Temp type expression with empty specification";
-            }
+          @Override
+          public String getName() {
+            return "Temp type expression with empty specification";
+          }
         };
-        assertEquals(UNKNOWN, expr.construct(Arrays.asList(NUMBER)));
-        assertEquals(UNKNOWN, expr.construct(Arrays.asList(STRING, BOOLEAN)));
-        assertEquals(UNKNOWN, expr.construct(Arrays.asList(INTEGER, DOUBLE, GEO_POINT)));
-    }
-
-    @Test
-    public void compatibilityCheckShouldPassIfAnySpecificationCompatible() {
-        assertEquals(DOUBLE, test123.construct(Arrays.asList(DOUBLE)));
-        assertEquals(DATE, test123.construct(Arrays.asList(STRING, BOOLEAN)));
-    }
+    assertEquals(UNKNOWN, expr.construct(Arrays.asList(NUMBER)));
+    assertEquals(UNKNOWN, expr.construct(Arrays.asList(STRING, BOOLEAN)));
+    assertEquals(UNKNOWN, expr.construct(Arrays.asList(INTEGER, DOUBLE, GEO_POINT)));
+  }
 
-    @Test
-    public void compatibilityCheckShouldFailIfNoSpecificationCompatible() {
-        assertEquals(TYPE_ERROR, test123.construct(Arrays.asList(BOOLEAN)));
-    }
+  @Test
+  public void compatibilityCheckShouldPassIfAnySpecificationCompatible() {
+    assertEquals(DOUBLE, test123.construct(Arrays.asList(DOUBLE)));
+    assertEquals(DATE, test123.construct(Arrays.asList(STRING, BOOLEAN)));
+  }
 
-    @Test
-    public void usageShouldPrintAllSpecifications() {
-        assertEquals("TEST123(NUMBER T) -> T or TEST123(STRING, BOOLEAN) -> DATE", test123.usage());
-    }
+  @Test
+  public void compatibilityCheckShouldFailIfNoSpecificationCompatible() {
+    assertEquals(TYPE_ERROR, test123.construct(Arrays.asList(BOOLEAN)));
+  }
 
+  @Test
+  public void usageShouldPrintAllSpecifications() {
+    assertEquals("TEST123(NUMBER T) -> T or TEST123(STRING, BOOLEAN) -> DATE", test123.usage());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/visitor/AntlrSqlParseTreeVisitorTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/visitor/AntlrSqlParseTreeVisitorTest.java
index c4e7a7e725..be4b5a5197 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/antlr/visitor/AntlrSqlParseTreeVisitorTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/antlr/visitor/AntlrSqlParseTreeVisitorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.antlr.visitor;
 
 import static java.util.Collections.emptyList;
@@ -25,95 +24,97 @@
 import org.opensearch.sql.legacy.antlr.semantic.visitor.TypeChecker;
 import org.opensearch.sql.legacy.exception.SqlFeatureNotImplementedException;
 
-/**
- * Test cases for AntlrSqlParseTreeVisitor
- */
+/** Test cases for AntlrSqlParseTreeVisitor */
 public class AntlrSqlParseTreeVisitorTest {
 
-    private TypeChecker analyzer = new TypeChecker(new SemanticContext()) {
+  private TypeChecker analyzer =
+      new TypeChecker(new SemanticContext()) {
         @Override
         public Type visitIndexName(String indexName) {
-            return null; // avoid querying mapping on null LocalClusterState
+          return null; // avoid querying mapping on null LocalClusterState
         }
 
         @Override
         public Type visitFieldName(String fieldName) {
-            switch (fieldName) {
-                case "age": return INTEGER;
-                case "birthday": return DATE;
-                default: return UNKNOWN;
-            }
+          switch (fieldName) {
+            case "age":
+              return INTEGER;
+            case "birthday":
+              return DATE;
+            default:
+              return UNKNOWN;
+          }
         }
-    };
-
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
-
-    @Test
-    public void selectNumberShouldReturnNumberAsQueryVisitingResult() {
-        Type result = visit("SELECT age FROM test");
-        Assert.assertSame(result, INTEGER);
-    }
-
-    @Test
-    public void selectNumberAndDateShouldReturnProductOfThemAsQueryVisitingResult() {
-        Type result = visit("SELECT age, birthday FROM test");
-        Assert.assertTrue(result instanceof Product );
-        Assert.assertTrue(result.isCompatible(new Product(Arrays.asList(INTEGER, DATE))));
-    }
-
-    @Test
-    public void selectStarShouldReturnEmptyProductAsQueryVisitingResult() {
-        Type result = visit("SELECT * FROM test");
-        Assert.assertTrue(result instanceof Product);
-        Assert.assertTrue(result.isCompatible(new Product(emptyList())));
-    }
-
-    @Test
-    public void visitSelectNestedFunctionShouldThrowException() {
-        exceptionRule.expect(SqlFeatureNotImplementedException.class);
-        exceptionRule.expectMessage("Nested function calls like [abs(log(age))] are not supported yet");
-        visit("SELECT abs(log(age)) FROM test");
-    }
-
-    @Test
-    public void visitWhereNestedFunctionShouldThrowException() {
-        exceptionRule.expect(SqlFeatureNotImplementedException.class);
-        exceptionRule.expectMessage("Nested function calls like [abs(log(age))] are not supported yet");
-        visit("SELECT age FROM test WHERE abs(log(age)) = 1");
-    }
-
-    @Test
-    public void visitMathConstantAsNestedFunctionShouldPass() {
-        visit("SELECT abs(pi()) FROM test");
-    }
-
-    @Test
-    public void visitSupportedNestedFunctionShouldPass() {
-        visit("SELECT sum(nested(name.balance)) FROM test");
-    }
-
-    @Test
-    public void visitFunctionAsAggregatorShouldThrowException() {
-        exceptionRule.expect(SqlFeatureNotImplementedException.class);
-        exceptionRule.expectMessage("Aggregation calls with function aggregator like [max(abs(age))] are not supported yet");
-        visit("SELECT max(abs(age)) FROM test");
-    }
-
-    @Test
-    public void visitUnsupportedOperatorShouldThrowException() {
-        exceptionRule.expect(SqlFeatureNotImplementedException.class);
-        exceptionRule.expectMessage("Operator [DIV] is not supported yet");
-        visit("SELECT balance DIV age FROM test");
-    }
-
-    private ParseTree createParseTree(String sql) {
-        return new OpenSearchLegacySqlAnalyzer(new SqlAnalysisConfig(true, true, 1000)).analyzeSyntax(sql);
-    }
-
-    private Type visit(String sql) {
-        ParseTree parseTree = createParseTree(sql);
-        return parseTree.accept(new AntlrSqlParseTreeVisitor<>(analyzer));
-    }
-
+      };
+
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
+
+  @Test
+  public void selectNumberShouldReturnNumberAsQueryVisitingResult() {
+    Type result = visit("SELECT age FROM test");
+    Assert.assertSame(result, INTEGER);
+  }
+
+  @Test
+  public void selectNumberAndDateShouldReturnProductOfThemAsQueryVisitingResult() {
+    Type result = visit("SELECT age, birthday FROM test");
+    Assert.assertTrue(result instanceof Product);
+    Assert.assertTrue(result.isCompatible(new Product(Arrays.asList(INTEGER, DATE))));
+  }
+
+  @Test
+  public void selectStarShouldReturnEmptyProductAsQueryVisitingResult() {
+    Type result = visit("SELECT * FROM test");
+    Assert.assertTrue(result instanceof Product);
+    Assert.assertTrue(result.isCompatible(new Product(emptyList())));
+  }
+
+  @Test
+  public void visitSelectNestedFunctionShouldThrowException() {
+    exceptionRule.expect(SqlFeatureNotImplementedException.class);
+    exceptionRule.expectMessage("Nested function calls like [abs(log(age))] are not supported yet");
+    visit("SELECT abs(log(age)) FROM test");
+  }
+
+  @Test
+  public void visitWhereNestedFunctionShouldThrowException() {
+    exceptionRule.expect(SqlFeatureNotImplementedException.class);
+    exceptionRule.expectMessage("Nested function calls like [abs(log(age))] are not supported yet");
+    visit("SELECT age FROM test WHERE abs(log(age)) = 1");
+  }
+
+  @Test
+  public void visitMathConstantAsNestedFunctionShouldPass() {
+    visit("SELECT abs(pi()) FROM test");
+  }
+
+  @Test
+  public void visitSupportedNestedFunctionShouldPass() {
+    visit("SELECT sum(nested(name.balance)) FROM test");
+  }
+
+  @Test
+  public void visitFunctionAsAggregatorShouldThrowException() {
+    exceptionRule.expect(SqlFeatureNotImplementedException.class);
+    exceptionRule.expectMessage(
+        "Aggregation calls with function aggregator like [max(abs(age))] are not supported yet");
+    visit("SELECT max(abs(age)) FROM test");
+  }
+
+  @Test
+  public void visitUnsupportedOperatorShouldThrowException() {
+    exceptionRule.expect(SqlFeatureNotImplementedException.class);
+    exceptionRule.expectMessage("Operator [DIV] is not supported yet");
+    visit("SELECT balance DIV age FROM test");
+  }
+
+  private ParseTree createParseTree(String sql) {
+    return new OpenSearchLegacySqlAnalyzer(new SqlAnalysisConfig(true, true, 1000))
+        .analyzeSyntax(sql);
+  }
+
+  private Type visit(String sql) {
+    ParseTree parseTree = createParseTree(sql);
+    return parseTree.accept(new AntlrSqlParseTreeVisitor<>(analyzer));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappingTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappingTest.java
index 6821261420..ed2611786a 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappingTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappingTest.java
@@ -3,12 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.esdomain.mapping;
 
 import static java.util.Collections.emptyMap;
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
 import static org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
 
 import com.google.common.collect.ImmutableMap;
@@ -17,114 +16,88 @@
 import java.util.stream.Collectors;
 import org.hamcrest.Matcher;
 import org.junit.Test;
-import org.opensearch.common.bytes.BytesArray;
+import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.sql.legacy.domain.Field;
 import org.opensearch.sql.legacy.util.MatcherUtils;
 
 /**
- * Unit test for {@code FieldMapping} with trivial methods ignored such as isSpecified, isMetaField etc.
+ * Unit test for {@code FieldMapping} with trivial methods ignored such as isSpecified, isMetaField
+ * etc.
  */
 public class FieldMappingTest {
 
-    @Test
-    public void testFieldMatchesWildcardPatternSpecifiedInQuery() {
-        assertThat(
-            new FieldMapping("employee.first", emptyMap(), fieldsSpecifiedInQuery("employee.*")),
-            isWildcardSpecified(true)
-        );
-    }
-
-    @Test
-    public void testFieldMismatchesWildcardPatternSpecifiedInQuery() {
-        assertThat(
-            new FieldMapping("employee.first", emptyMap(), fieldsSpecifiedInQuery("manager.*")),
-            isWildcardSpecified(false)
-        );
-    }
-
-    @Test
-    public void testFieldIsProperty() {
-        assertThat(
-            new FieldMapping("employee.first"),
-            isPropertyField(true)
-        );
-    }
-
-    @Test
-    public void testNestedMultiFieldIsProperty() {
-        assertThat(
-            new FieldMapping("employee.first.keyword"),
-            isPropertyField(true)
-        );
-    }
-
-    @Test
-    public void testFieldIsNotProperty() {
-        assertThat(
-            new FieldMapping("employee"),
-            isPropertyField(false)
-        );
-    }
-
-    @Test
-    public void testMultiFieldIsNotProperty() {
-        assertThat(
-            new FieldMapping("employee.keyword"),
-            isPropertyField(false)
-        );
-    }
-
-    @Test
-    public void testUnknownFieldTreatedAsObject() {
-        assertThat(
-            new FieldMapping("employee"),
-            hasType("object")
-        );
-    }
-
-    @Test
-    public void testDeepNestedField() {
-        assertThat(
-            new FieldMapping(
+  @Test
+  public void testFieldMatchesWildcardPatternSpecifiedInQuery() {
+    assertThat(
+        new FieldMapping("employee.first", emptyMap(), fieldsSpecifiedInQuery("employee.*")),
+        isWildcardSpecified(true));
+  }
+
+  @Test
+  public void testFieldMismatchesWildcardPatternSpecifiedInQuery() {
+    assertThat(
+        new FieldMapping("employee.first", emptyMap(), fieldsSpecifiedInQuery("manager.*")),
+        isWildcardSpecified(false));
+  }
+
+  @Test
+  public void testFieldIsProperty() {
+    assertThat(new FieldMapping("employee.first"), isPropertyField(true));
+  }
+
+  @Test
+  public void testNestedMultiFieldIsProperty() {
+    assertThat(new FieldMapping("employee.first.keyword"), isPropertyField(true));
+  }
+
+  @Test
+  public void testFieldIsNotProperty() {
+    assertThat(new FieldMapping("employee"), isPropertyField(false));
+  }
+
+  @Test
+  public void testMultiFieldIsNotProperty() {
+    assertThat(new FieldMapping("employee.keyword"), isPropertyField(false));
+  }
+
+  @Test
+  public void testUnknownFieldTreatedAsObject() {
+    assertThat(new FieldMapping("employee"), hasType("object"));
+  }
+
+  @Test
+  public void testDeepNestedField() {
+    assertThat(
+        new FieldMapping(
+            "employee.location.city",
+            ImmutableMap.of(
                 "employee.location.city",
-                ImmutableMap.of(
+                new FieldMappingMetadata(
                     "employee.location.city",
-                    new FieldMappingMetadata("employee.location.city", new BytesArray(
-                        "{\n" +
-                        "  \"city\" : {\n" +
-                        "    \"type\" : \"text\"\n" +
-                        "  }\n" +
-                        "}")
-                    )
-                ),
-                emptyMap()
-            ),
-            hasType("text")
-        );
-    }
-
-    private Matcher<FieldMapping> isWildcardSpecified(boolean isMatched) {
-        return MatcherUtils.featureValueOf("is field match wildcard specified in query",
-                                           is(isMatched),
-                                           FieldMapping::isWildcardSpecified);
-    }
-
-    private Matcher<FieldMapping> isPropertyField(boolean isProperty) {
-        return MatcherUtils.featureValueOf("isPropertyField",
-                                           is(isProperty),
-                                           FieldMapping::isPropertyField);
-    }
-
-    private Matcher<FieldMapping> hasType(String expected) {
-        return MatcherUtils.featureValueOf("type",
-            is(expected),
-            FieldMapping::type);
-    }
-
-    private Map<String, Field> fieldsSpecifiedInQuery(String...fieldNames) {
-        return Arrays.stream(fieldNames).
-                      collect(Collectors.toMap(name -> name,
-                                               name -> new Field(name, "")));
-    }
-
+                    new BytesArray(
+                        "{\n" + "  \"city\" : {\n" + "    \"type\" : \"text\"\n" + "  }\n" + "}"))),
+            emptyMap()),
+        hasType("text"));
+  }
+
+  private Matcher<FieldMapping> isWildcardSpecified(boolean isMatched) {
+    return MatcherUtils.featureValueOf(
+        "is field match wildcard specified in query",
+        is(isMatched),
+        FieldMapping::isWildcardSpecified);
+  }
+
+  private Matcher<FieldMapping> isPropertyField(boolean isProperty) {
+    return MatcherUtils.featureValueOf(
+        "isPropertyField", is(isProperty), FieldMapping::isPropertyField);
+  }
+
+  private Matcher<FieldMapping> hasType(String expected) {
+    return MatcherUtils.featureValueOf("type", is(expected), FieldMapping::type);
+  }
+
+  private Map<String, Field> fieldsSpecifiedInQuery(String... fieldNames) {
+    return Arrays.stream(fieldNames)
+        .collect(Collectors.toMap(name -> name, name -> new Field(name, "")));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappingsTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappingsTest.java
index 412c351c56..f6de8a98e6 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappingsTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/esdomain/mapping/FieldMappingsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.esdomain.mapping;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -23,51 +22,47 @@
 import org.junit.Test;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
 
-/**
- * Test for FieldMappings class
- */
+/** Test for FieldMappings class */
 public class FieldMappingsTest {
 
-    private static final String TEST_MAPPING_FILE = "mappings/field_mappings.json";
-
-    @Before
-    public void setUp() throws IOException {
-        URL url = Resources.getResource(TEST_MAPPING_FILE);
-        String mappings = Resources.toString(url, Charsets.UTF_8);
-        mockLocalClusterState(mappings);
-    }
+  private static final String TEST_MAPPING_FILE = "mappings/field_mappings.json";
 
-    @After
-    public void cleanUp() {
-        LocalClusterState.state(null);
-    }
+  @Before
+  public void setUp() throws IOException {
+    URL url = Resources.getResource(TEST_MAPPING_FILE);
+    String mappings = Resources.toString(url, Charsets.UTF_8);
+    mockLocalClusterState(mappings);
+  }
 
-    @Test
-    public void flatFieldMappingsShouldIncludeFieldsOnAllLevels() {
-        IndexMappings indexMappings = LocalClusterState.state().getFieldMappings(new String[]{"field_mappings"});
-        FieldMappings fieldMappings = indexMappings.firstMapping();
+  @After
+  public void cleanUp() {
+    LocalClusterState.state(null);
+  }
 
-        Map<String, String> typeByFieldName = new HashMap<>();
-        fieldMappings.flat(typeByFieldName::put);
-        assertThat(
-            typeByFieldName,
-            allOf(
-                aMapWithSize(13),
-                hasEntry("address", "text"),
-                hasEntry("age", "integer"),
-                hasEntry("employer", "text"),
-                hasEntry("employer.raw", "text"),
-                hasEntry("employer.keyword", "keyword"),
-                hasEntry("projects", "nested"),
-                hasEntry("projects.active", "boolean"),
-                hasEntry("projects.members", "nested"),
-                hasEntry("projects.members.name", "text"),
-                hasEntry("manager", "object"),
-                hasEntry("manager.name", "text"),
-                hasEntry("manager.name.keyword", "keyword"),
-                hasEntry("manager.address", "keyword")
-            )
-        );
-    }
+  @Test
+  public void flatFieldMappingsShouldIncludeFieldsOnAllLevels() {
+    IndexMappings indexMappings =
+        LocalClusterState.state().getFieldMappings(new String[] {"field_mappings"});
+    FieldMappings fieldMappings = indexMappings.firstMapping();
 
+    Map<String, String> typeByFieldName = new HashMap<>();
+    fieldMappings.flat(typeByFieldName::put);
+    assertThat(
+        typeByFieldName,
+        allOf(
+            aMapWithSize(13),
+            hasEntry("address", "text"),
+            hasEntry("age", "integer"),
+            hasEntry("employer", "text"),
+            hasEntry("employer.raw", "text"),
+            hasEntry("employer.keyword", "keyword"),
+            hasEntry("projects", "nested"),
+            hasEntry("projects.active", "boolean"),
+            hasEntry("projects.members", "nested"),
+            hasEntry("projects.members.name", "text"),
+            hasEntry("manager", "object"),
+            hasEntry("manager.name", "text"),
+            hasEntry("manager.name.keyword", "keyword"),
+            hasEntry("manager.address", "keyword")));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/executor/AsyncRestExecutorTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/executor/AsyncRestExecutorTest.java
index 24d1814067..9be2517c4a 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/executor/AsyncRestExecutorTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/executor/AsyncRestExecutorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor;
 
 import static java.util.Collections.emptyList;
@@ -25,6 +24,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.client.Client;
+import org.opensearch.cluster.ClusterName;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
@@ -33,76 +33,69 @@
 import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
 import org.opensearch.threadpool.ThreadPool;
 
-/**
- * Test AsyncRestExecutor behavior.
- */
+/** Test AsyncRestExecutor behavior. */
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class AsyncRestExecutorTest {
 
-    private static final boolean NON_BLOCKING = false;
-
-    @Mock
-    private RestExecutor executor;
+  private static final boolean NON_BLOCKING = false;
 
-    @Mock
-    private Client client;
+  @Mock private RestExecutor executor;
 
-    private Map<String, String> params = emptyMap();
+  @Mock private Client client;
 
-    @Mock
-    private QueryAction action;
+  private Map<String, String> params = emptyMap();
 
-    @Mock
-    private RestChannel channel;
+  @Mock private QueryAction action;
 
-    @Mock
-    private ClusterSettings clusterSettings;
+  @Mock private RestChannel channel;
 
-    @Before
-    public void setUp() {
-        when(client.threadPool()).thenReturn(mock(ThreadPool.class));
-        when(action.getSqlRequest()).thenReturn(SqlRequest.NULL);
+  @Mock private ClusterSettings clusterSettings;
 
-        OpenSearchSettings settings = spy(new OpenSearchSettings(clusterSettings));
-        doReturn(emptyList()).when(settings).getSettings();
-        LocalClusterState.state().setPluginSettings(settings);
-    }
+  @Before
+  public void setUp() {
+    when(client.threadPool()).thenReturn(mock(ThreadPool.class));
+    when(action.getSqlRequest()).thenReturn(SqlRequest.NULL);
+    when(clusterSettings.get(ClusterName.CLUSTER_NAME_SETTING)).thenReturn(ClusterName.DEFAULT);
 
-    @Test
-    public void executeBlockingQuery() throws Exception {
-        Thread.currentThread().setName(TRANSPORT_WORKER_THREAD_NAME_PREFIX);
-        execute();
-        verifyRunInWorkerThread();
-    }
+    OpenSearchSettings settings = spy(new OpenSearchSettings(clusterSettings));
+    doReturn(emptyList()).when(settings).getSettings();
+    LocalClusterState.state().setPluginSettings(settings);
+  }
 
-    @Test
-    public void executeBlockingQueryButNotInTransport() throws Exception {
-        execute();
-        verifyRunInCurrentThread();
-    }
+  @Test
+  public void executeBlockingQuery() throws Exception {
+    Thread.currentThread().setName(TRANSPORT_WORKER_THREAD_NAME_PREFIX);
+    execute();
+    verifyRunInWorkerThread();
+  }
 
-    @Test
-    public void executeNonBlockingQuery() throws Exception {
-        execute(anyAction -> NON_BLOCKING);
-        verifyRunInCurrentThread();
-    }
+  @Test
+  public void executeBlockingQueryButNotInTransport() throws Exception {
+    execute();
+    verifyRunInCurrentThread();
+  }
 
-    private void execute() throws Exception {
-        AsyncRestExecutor asyncExecutor = new AsyncRestExecutor(executor);
-        asyncExecutor.execute(client, params, action, channel);
-    }
+  @Test
+  public void executeNonBlockingQuery() throws Exception {
+    execute(anyAction -> NON_BLOCKING);
+    verifyRunInCurrentThread();
+  }
 
-    private void execute(Predicate<QueryAction> isBlocking) throws Exception {
-        AsyncRestExecutor asyncExecutor = new AsyncRestExecutor(executor, isBlocking);
-        asyncExecutor.execute(client, params, action, channel);
-    }
+  private void execute() throws Exception {
+    AsyncRestExecutor asyncExecutor = new AsyncRestExecutor(executor);
+    asyncExecutor.execute(client, params, action, channel);
+  }
 
-    private void verifyRunInCurrentThread() {
-        verify(client, never()).threadPool();
-    }
+  private void execute(Predicate<QueryAction> isBlocking) throws Exception {
+    AsyncRestExecutor asyncExecutor = new AsyncRestExecutor(executor, isBlocking);
+    asyncExecutor.execute(client, params, action, channel);
+  }
 
-    private void verifyRunInWorkerThread() {
-        verify(client, times(1)).threadPool();
-    }
+  private void verifyRunInCurrentThread() {
+    verify(client, never()).threadPool();
+  }
 
+  private void verifyRunInWorkerThread() {
+    verify(client, times(1)).threadPool();
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/executor/csv/CSVResultTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/executor/csv/CSVResultTest.java
index 1a24045881..c877095d8f 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/executor/csv/CSVResultTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/executor/csv/CSVResultTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.csv;
 
 import static org.junit.Assert.assertEquals;
@@ -13,25 +12,21 @@
 import java.util.stream.Collectors;
 import org.junit.Test;
 
-/**
- * Unit tests for {@link CSVResult}
- */
+/** Unit tests for {@link CSVResult} */
 public class CSVResultTest {
 
-    private static final String SEPARATOR = ",";
+  private static final String SEPARATOR = ",";
 
-    @Test
-    public void getHeadersShouldReturnHeadersSanitized() {
-        CSVResult csv = csv(headers("name", "=age"), lines(line("John", "30")));
-        assertEquals(
-            headers("name", "'=age"),
-            csv.getHeaders()
-        );
-    }
+  @Test
+  public void getHeadersShouldReturnHeadersSanitized() {
+    CSVResult csv = csv(headers("name", "=age"), lines(line("John", "30")));
+    assertEquals(headers("name", "'=age"), csv.getHeaders());
+  }
 
-    @Test
-    public void getLinesShouldReturnLinesSanitized() {
-        CSVResult csv = csv(
+  @Test
+  public void getLinesShouldReturnLinesSanitized() {
+    CSVResult csv =
+        csv(
             headers("name", "city"),
             lines(
                 line("John", "Seattle"),
@@ -39,53 +34,42 @@ public void getLinesShouldReturnLinesSanitized() {
                 line("John", "+Seattle"),
                 line("-John", "Seattle"),
                 line("@John", "Seattle"),
-                line("John", "Seattle=")
-            )
-        );
-
-        assertEquals(
-            line(
-                "John,Seattle",
-                "John,'=Seattle",
-                "John,'+Seattle",
-                "'-John,Seattle",
-                "'@John,Seattle",
-                "John,Seattle="
-            ),
-            csv.getLines()
-        );
-    }
-
-    @Test
-    public void getHeadersShouldReturnHeadersQuotedIfRequired() {
-        CSVResult csv = csv(headers("na,me", ",,age"), lines(line("John", "30")));
-        assertEquals(
-            headers("\"na,me\"", "\",,age\""),
-            csv.getHeaders()
-        );
-    }
-
-    @Test
-    public void getLinesShouldReturnLinesQuotedIfRequired() {
-        CSVResult csv = csv(headers("name", "age"), lines(line("John,Smith", "30,,,")));
-        assertEquals(
-            line("\"John,Smith\",\"30,,,\""),
-            csv.getLines()
-        );
-    }
-
-    @Test
-    public void getHeadersShouldReturnHeadersBothSanitizedAndQuotedIfRequired() {
-        CSVResult csv = csv(headers("na,+me", ",,,=age", "=city,"), lines(line("John", "30", "Seattle")));
-        assertEquals(
-            headers("\"na,+me\"", "\",,,=age\"", "\"'=city,\""),
-            csv.getHeaders()
-        );
-    }
-
-    @Test
-    public void getLinesShouldReturnLinesBothSanitizedAndQuotedIfRequired() {
-        CSVResult csv = csv(
+                line("John", "Seattle=")));
+
+    assertEquals(
+        line(
+            "John,Seattle",
+            "John,'=Seattle",
+            "John,'+Seattle",
+            "'-John,Seattle",
+            "'@John,Seattle",
+            "John,Seattle="),
+        csv.getLines());
+  }
+
+  @Test
+  public void getHeadersShouldReturnHeadersQuotedIfRequired() {
+    CSVResult csv = csv(headers("na,me", ",,age"), lines(line("John", "30")));
+    assertEquals(headers("\"na,me\"", "\",,age\""), csv.getHeaders());
+  }
+
+  @Test
+  public void getLinesShouldReturnLinesQuotedIfRequired() {
+    CSVResult csv = csv(headers("name", "age"), lines(line("John,Smith", "30,,,")));
+    assertEquals(line("\"John,Smith\",\"30,,,\""), csv.getLines());
+  }
+
+  @Test
+  public void getHeadersShouldReturnHeadersBothSanitizedAndQuotedIfRequired() {
+    CSVResult csv =
+        csv(headers("na,+me", ",,,=age", "=city,"), lines(line("John", "30", "Seattle")));
+    assertEquals(headers("\"na,+me\"", "\",,,=age\"", "\"'=city,\""), csv.getHeaders());
+  }
+
+  @Test
+  public void getLinesShouldReturnLinesBothSanitizedAndQuotedIfRequired() {
+    CSVResult csv =
+        csv(
             headers("name", "city"),
             lines(
                 line("John", "Seattle"),
@@ -93,38 +77,33 @@ public void getLinesShouldReturnLinesBothSanitizedAndQuotedIfRequired() {
                 line("John", "+Sea,ttle"),
                 line(",-John", "Seattle"),
                 line(",,,@John", "Seattle"),
-                line("John", "Seattle=")
-            )
-        );
-
-        assertEquals(
-            line(
-                "John,Seattle",
-                "John,'=Seattle",
-                "John,\"'+Sea,ttle\"",
-                "\",-John\",Seattle",
-                "\",,,@John\",Seattle",
-                "John,Seattle="
-            ),
-            csv.getLines()
-        );
-    }
-
-    private CSVResult csv(List<String> headers, List<List<String>> lines) {
-        return new CSVResult(SEPARATOR, headers, lines);
-    }
-
-    private List<String> headers(String... headers) {
-        return Arrays.stream(headers).collect(Collectors.toList());
-    }
-
-    private List<String> line(String... line) {
-        return Arrays.stream(line).collect(Collectors.toList());
-    }
-
-    @SafeVarargs
-    private final List<List<String>> lines(List<String>... lines) {
-        return Arrays.stream(lines).collect(Collectors.toList());
-    }
-
+                line("John", "Seattle=")));
+
+    assertEquals(
+        line(
+            "John,Seattle",
+            "John,'=Seattle",
+            "John,\"'+Sea,ttle\"",
+            "\",-John\",Seattle",
+            "\",,,@John\",Seattle",
+            "John,Seattle="),
+        csv.getLines());
+  }
+
+  private CSVResult csv(List<String> headers, List<List<String>> lines) {
+    return new CSVResult(SEPARATOR, headers, lines);
+  }
+
+  private List<String> headers(String... headers) {
+    return Arrays.stream(headers).collect(Collectors.toList());
+  }
+
+  private List<String> line(String... line) {
+    return Arrays.stream(line).collect(Collectors.toList());
+  }
+
+  @SafeVarargs
+  private final List<List<String>> lines(List<String>... lines) {
+    return Arrays.stream(lines).collect(Collectors.toList());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/executor/format/DateFieldFormatterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/executor/format/DateFieldFormatterTest.java
index 5807ee2c44..1c2d1bae62 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/executor/format/DateFieldFormatterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/executor/format/DateFieldFormatterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import static org.junit.Assert.assertEquals;
@@ -18,685 +17,634 @@
 
 public class DateFieldFormatterTest {
 
-    @Test
-    public void testOpenSearchDashboardsSampleDataEcommerceOrderDateField()
-    {
-        String columnName = "order_date";
-        String dateFormat = "date_optional_time";
-        String originalDateValue = "2020-02-24T09:28:48+00:00";
-        String expectedDateValue = "2020-02-24 09:28:48.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testOpenSearchDashboardsSampleDataFlightsTimestampField()
-    {
-        String columnName = "timestamp";
-        String dateFormat = "date_optional_time";
-        String originalDateValue = "2020-02-03T00:00:00";
-        String expectedDateValue = "2020-02-03 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testOpenSearchDashboardsSampleDataFlightsTimestampFieldNoTime()
-    {
-        String columnName = "timestamp";
-        String dateFormat = "date_optional_time";
-        String originalDateValue = "2020-02-03T";
-        String expectedDateValue = "2020-02-03 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testOpenSearchDashboardsSampleDataLogsUtcDateField()
-    {
-        String columnName = "utc_date";
-        String dateFormat = "date_optional_time";
-        String originalDateValue = "2020-02-02T00:39:02.912Z";
-        String expectedDateValue = "2020-02-02 00:39:02.912";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testEpochMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "epoch_millis";
-        String originalDateValue = "727430805000";
-        String expectedDateValue = "1993-01-19 08:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testEpochSecond()
-    {
-        String columnName = "date_field";
-        String dateFormat = "epoch_second";
-        String originalDateValue = "727430805";
-        String expectedDateValue = "1993-01-19 08:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testDateOptionalTimeDateOnly()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_optional_time";
-        String originalDateValue = "1993-01-19";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testDateOptionalTimeDateAndTime()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_optional_time";
-        String originalDateValue = "1993-01-19T00:06:45.123-0800";
-        String expectedDateValue = "1993-01-19 08:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicDate()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_date";
-        String originalDateValue = "19930119";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicDateTime()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_date_time";
-        String originalDateValue = "19930119T120645.123-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicDateTimeNoMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_date_time_no_millis";
-        String originalDateValue = "19930119T120645-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicOrdinalDate()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_ordinal_date";
-        String originalDateValue = "1993019";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicOrdinalDateTime()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_ordinal_date_time";
-        String originalDateValue = "1993019T120645.123-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicOrdinalDateTimeNoMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_ordinal_date_time_no_millis";
-        String originalDateValue = "1993019T120645-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicTime()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_time";
-        String originalDateValue = "120645.123-0800";
-        String expectedDateValue = "1970-01-01 20:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicTimeNoMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_time_no_millis";
-        String originalDateValue = "120645-0800";
-        String expectedDateValue = "1970-01-01 20:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicTTime()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_t_time";
-        String originalDateValue = "T120645.123-0800";
-        String expectedDateValue = "1970-01-01 20:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicTTimeNoMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_t_time_no_millis";
-        String originalDateValue = "T120645-0800";
-        String expectedDateValue = "1970-01-01 20:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicWeekDate()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_week_date";
-        String originalDateValue = "1993W042";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicWeekDateTime()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_week_date_time";
-        String originalDateValue = "1993W042T120645.123-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testBasicWeekDateTimeNoMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "basic_week_date_time_no_millis";
-        String originalDateValue = "1993W042T120645-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testDate()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date";
-        String originalDateValue = "1993-01-19";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testDateHour()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_hour";
-        String originalDateValue = "1993-01-19T12";
-        String expectedDateValue = "1993-01-19 12:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testDateHourMinute()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_hour_minute";
-        String originalDateValue = "1993-01-19T12:06";
-        String expectedDateValue = "1993-01-19 12:06:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testDateHourMinuteSecond()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_hour_minute_second";
-        String originalDateValue = "1993-01-19T12:06:45";
-        String expectedDateValue = "1993-01-19 12:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testDateHourMinuteSecondFraction()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_hour_minute_second_fraction";
-        String originalDateValue = "1993-01-19T12:06:45.123";
-        String expectedDateValue = "1993-01-19 12:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testDateHourMinuteSecondMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_hour_minute_second_millis";
-        String originalDateValue = "1993-01-19T12:06:45.123";
-        String expectedDateValue = "1993-01-19 12:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testDateTime()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_time";
-        String originalDateValue = "1993-01-19T12:06:45.123-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testDateTimeNoMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_time_no_millis";
-        String originalDateValue = "1993-01-19T12:06:45-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testHour()
-    {
-        String columnName = "date_field";
-        String dateFormat = "hour";
-        String originalDateValue = "12";
-        String expectedDateValue = "1970-01-01 12:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testHourMinute()
-    {
-        String columnName = "date_field";
-        String dateFormat = "hour_minute";
-        String originalDateValue = "12:06";
-        String expectedDateValue = "1970-01-01 12:06:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testHourMinuteSecond()
-    {
-        String columnName = "date_field";
-        String dateFormat = "hour_minute_second";
-        String originalDateValue = "12:06:45";
-        String expectedDateValue = "1970-01-01 12:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testHourMinuteSecondFraction()
-    {
-        String columnName = "date_field";
-        String dateFormat = "hour_minute_second_fraction";
-        String originalDateValue = "12:06:45.123";
-        String expectedDateValue = "1970-01-01 12:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testHourMinuteSecondMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "hour_minute_second_millis";
-        String originalDateValue = "12:06:45.123";
-        String expectedDateValue = "1970-01-01 12:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testOrdinalDate()
-    {
-        String columnName = "date_field";
-        String dateFormat = "ordinal_date";
-        String originalDateValue = "1993-019";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testOrdinalDateTime()
-    {
-        String columnName = "date_field";
-        String dateFormat = "ordinal_date_time";
-        String originalDateValue = "1993-019T12:06:45.123-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testOrdinalDateTimeNoMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "ordinal_date_time_no_millis";
-        String originalDateValue = "1993-019T12:06:45-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testTime()
-    {
-        String columnName = "date_field";
-        String dateFormat = "time";
-        String originalDateValue = "12:06:45.123-0800";
-        String expectedDateValue = "1970-01-01 20:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testTimeNoMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "time_no_millis";
-        String originalDateValue = "12:06:45-0800";
-        String expectedDateValue = "1970-01-01 20:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testTTime()
-    {
-        String columnName = "date_field";
-        String dateFormat = "t_time";
-        String originalDateValue = "T12:06:45.123-0800";
-        String expectedDateValue = "1970-01-01 20:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testTTimeNoMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "t_time_no_millis";
-        String originalDateValue = "T12:06:45-0800";
-        String expectedDateValue = "1970-01-01 20:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testWeekDate()
-    {
-        String columnName = "date_field";
-        String dateFormat = "week_date";
-        String originalDateValue = "1993-W04-2";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testWeekDateTime()
-    {
-        String columnName = "date_field";
-        String dateFormat = "week_date_time";
-        String originalDateValue = "1993-W04-2T12:06:45.123-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.123";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testWeekDateTimeNoMillis()
-    {
-        String columnName = "date_field";
-        String dateFormat = "week_date_time_no_millis";
-        String originalDateValue = "1993-W04-2T12:06:45-0800";
-        String expectedDateValue = "1993-01-19 20:06:45.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testWeekyear()
-    {
-        String columnName = "date_field";
-        String dateFormat = "week_year";
-        String originalDateValue = "1993";
-        String expectedDateValue = "1993-01-01 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testWeekyearWeek()
-    {
-        String columnName = "date_field";
-        String dateFormat = "weekyear_week";
-        String originalDateValue = "1993-W04";
-        String expectedDateValue = "1993-01-17 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testWeekyearWeekDay()
-    {
-        String columnName = "date_field";
-        String dateFormat = "weekyear_week_day";
-        String originalDateValue = "1993-W04-2";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testYear()
-    {
-        String columnName = "date_field";
-        String dateFormat = "year";
-        String originalDateValue = "1993";
-        String expectedDateValue = "1993-01-01 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testYearMonth()
-    {
-        String columnName = "date_field";
-        String dateFormat = "year_month";
-        String originalDateValue = "1993-01";
-        String expectedDateValue = "1993-01-01 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testYearMonthDay()
-    {
-        String columnName = "date_field";
-        String dateFormat = "year_month_day";
-        String originalDateValue = "1993-01-19";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testCustomFormat()
-    {
-        String columnName = "date_field";
-        String dateFormat = "EEE, MMM d, ''yy";
-
-        String originalDateValue = "Tue, Jan 19, '93";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testMultipleFormats()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_optional_time||epoch_millis";
-
-        String originalDateValue = "1993-01-19";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-
-        originalDateValue = "727401600000";
-        expectedDateValue = "1993-01-19 00:00:00.000";
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testMultipleCustomFormats()
-    {
-        String columnName = "date_field";
-        String dateFormat = "EEE, MMM d, ''yy||yyMMddHHmmssZ";
-
-        String originalDateValue = "Tue, Jan 19, '93";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-
-        originalDateValue = "930119000000-0000";
-        expectedDateValue = "1993-01-19 00:00:00.000";
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testNamedAndCustomFormats()
-    {
-        String columnName = "date_field";
-        String dateFormat = "EEE, MMM d, ''yy||hour_minute_second";
-
-        String originalDateValue = "Tue, Jan 19, '93";
-        String expectedDateValue = "1993-01-19 00:00:00.000";
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-
-        originalDateValue = "12:06:45";
-        expectedDateValue = "1970-01-01 12:06:45.000";
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testIncorrectFormat()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_optional_time";
-        String originalDateValue = "1581724085";
-        // Invalid format for date value; should return original value
-        String expectedDateValue = "1581724085";
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testNullDateData()
-    {
-        String columnName = "date_field";
-        String dateFormat = "date_optional_time";
-        String originalDateValue = null;
-        // Nulls should be preserved
-        String expectedDateValue = null;
-
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    @Test
-    public void testStrictDateOptionalTimeOrEpochMillsShouldPass()
-    {
-        String columnName = "date_field";
-        String dateFormat = "strict_date_optional_time||epoch_millis";
-
-        String originalDateValue = "2015-01-01";
-        String expectedDateValue = "2015-01-01 00:00:00.000";
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-
-        originalDateValue = "2015-01-01T12:10:30Z";
-        expectedDateValue = "2015-01-01 12:10:30.000";
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-
-        originalDateValue = "1420070400001";
-        expectedDateValue = "2015-01-01 00:00:00.001";
-        verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
-    }
-
-    private void verifyFormatting(String columnName, String dateFormatProperty, String originalDateValue, String expectedDateValue)
-    {
-        List<Schema.Column> columns = buildColumnList(columnName);
-        Map<String, List<String>> dateFieldFormatMap = buildDateFieldFormatMap(columnName, dateFormatProperty);
-
-        Map<String, Object> rowSource = new HashMap<>();
-        rowSource.put(columnName, originalDateValue);
-
-        DateFieldFormatter dateFieldFormatter = new DateFieldFormatter(dateFieldFormatMap, columns, new HashMap<>());
-        executeFormattingAndCompare(dateFieldFormatter, rowSource, columnName, expectedDateValue);
-    }
-
-    private void executeFormattingAndCompare(
-            DateFieldFormatter formatter,
-            Map<String, Object> rowSource,
-            String columnToCheck,
-            String expectedDateValue) {
-        formatter.applyJDBCDateFormat(rowSource);
-        assertEquals(expectedDateValue, rowSource.get(columnToCheck));
-    }
-
-    private List<Schema.Column> buildColumnList(String columnName) {
-        return ImmutableList.<Schema.Column>builder()
-                .add(new Schema.Column(columnName, null, Schema.Type.DATE))
-                .build();
-    }
-
-    private Map<String, List<String>> buildDateFieldFormatMap(String columnName, String dateFormatProperty) {
-        return ImmutableMap.<String, List<String>>builder()
-                .put(columnName, Arrays.asList(dateFormatProperty.split("\\|\\|")))
-                .build();
-    }
+  @Test
+  public void testOpenSearchDashboardsSampleDataEcommerceOrderDateField() {
+    String columnName = "order_date";
+    String dateFormat = "date_optional_time";
+    String originalDateValue = "2020-02-24T09:28:48+00:00";
+    String expectedDateValue = "2020-02-24 09:28:48.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testOpenSearchDashboardsSampleDataFlightsTimestampField() {
+    String columnName = "timestamp";
+    String dateFormat = "date_optional_time";
+    String originalDateValue = "2020-02-03T00:00:00";
+    String expectedDateValue = "2020-02-03 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testOpenSearchDashboardsSampleDataFlightsTimestampFieldNoTime() {
+    String columnName = "timestamp";
+    String dateFormat = "date_optional_time";
+    String originalDateValue = "2020-02-03T";
+    String expectedDateValue = "2020-02-03 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testOpenSearchDashboardsSampleDataLogsUtcDateField() {
+    String columnName = "utc_date";
+    String dateFormat = "date_optional_time";
+    String originalDateValue = "2020-02-02T00:39:02.912Z";
+    String expectedDateValue = "2020-02-02 00:39:02.912";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testEpochMillis() {
+    String columnName = "date_field";
+    String dateFormat = "epoch_millis";
+    String originalDateValue = "727430805000";
+    String expectedDateValue = "1993-01-19 08:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testEpochSecond() {
+    String columnName = "date_field";
+    String dateFormat = "epoch_second";
+    String originalDateValue = "727430805";
+    String expectedDateValue = "1993-01-19 08:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testDateOptionalTimeDateOnly() {
+    String columnName = "date_field";
+    String dateFormat = "date_optional_time";
+    String originalDateValue = "1993-01-19";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testDateOptionalTimeDateAndTime() {
+    String columnName = "date_field";
+    String dateFormat = "date_optional_time";
+    String originalDateValue = "1993-01-19T00:06:45.123-0800";
+    String expectedDateValue = "1993-01-19 08:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicDate() {
+    String columnName = "date_field";
+    String dateFormat = "basic_date";
+    String originalDateValue = "19930119";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicDateTime() {
+    String columnName = "date_field";
+    String dateFormat = "basic_date_time";
+    String originalDateValue = "19930119T120645.123-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicDateTimeNoMillis() {
+    String columnName = "date_field";
+    String dateFormat = "basic_date_time_no_millis";
+    String originalDateValue = "19930119T120645-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicOrdinalDate() {
+    String columnName = "date_field";
+    String dateFormat = "basic_ordinal_date";
+    String originalDateValue = "1993019";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicOrdinalDateTime() {
+    String columnName = "date_field";
+    String dateFormat = "basic_ordinal_date_time";
+    String originalDateValue = "1993019T120645.123-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicOrdinalDateTimeNoMillis() {
+    String columnName = "date_field";
+    String dateFormat = "basic_ordinal_date_time_no_millis";
+    String originalDateValue = "1993019T120645-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicTime() {
+    String columnName = "date_field";
+    String dateFormat = "basic_time";
+    String originalDateValue = "120645.123-0800";
+    String expectedDateValue = "1970-01-01 20:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicTimeNoMillis() {
+    String columnName = "date_field";
+    String dateFormat = "basic_time_no_millis";
+    String originalDateValue = "120645-0800";
+    String expectedDateValue = "1970-01-01 20:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicTTime() {
+    String columnName = "date_field";
+    String dateFormat = "basic_t_time";
+    String originalDateValue = "T120645.123-0800";
+    String expectedDateValue = "1970-01-01 20:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicTTimeNoMillis() {
+    String columnName = "date_field";
+    String dateFormat = "basic_t_time_no_millis";
+    String originalDateValue = "T120645-0800";
+    String expectedDateValue = "1970-01-01 20:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicWeekDate() {
+    String columnName = "date_field";
+    String dateFormat = "basic_week_date";
+    String originalDateValue = "1993W042";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicWeekDateTime() {
+    String columnName = "date_field";
+    String dateFormat = "basic_week_date_time";
+    String originalDateValue = "1993W042T120645.123-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testBasicWeekDateTimeNoMillis() {
+    String columnName = "date_field";
+    String dateFormat = "basic_week_date_time_no_millis";
+    String originalDateValue = "1993W042T120645-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testDate() {
+    String columnName = "date_field";
+    String dateFormat = "date";
+    String originalDateValue = "1993-01-19";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testDateHour() {
+    String columnName = "date_field";
+    String dateFormat = "date_hour";
+    String originalDateValue = "1993-01-19T12";
+    String expectedDateValue = "1993-01-19 12:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testDateHourMinute() {
+    String columnName = "date_field";
+    String dateFormat = "date_hour_minute";
+    String originalDateValue = "1993-01-19T12:06";
+    String expectedDateValue = "1993-01-19 12:06:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testDateHourMinuteSecond() {
+    String columnName = "date_field";
+    String dateFormat = "date_hour_minute_second";
+    String originalDateValue = "1993-01-19T12:06:45";
+    String expectedDateValue = "1993-01-19 12:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testDateHourMinuteSecondFraction() {
+    String columnName = "date_field";
+    String dateFormat = "date_hour_minute_second_fraction";
+    String originalDateValue = "1993-01-19T12:06:45.123";
+    String expectedDateValue = "1993-01-19 12:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testDateHourMinuteSecondMillis() {
+    String columnName = "date_field";
+    String dateFormat = "date_hour_minute_second_millis";
+    String originalDateValue = "1993-01-19T12:06:45.123";
+    String expectedDateValue = "1993-01-19 12:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testDateTime() {
+    String columnName = "date_field";
+    String dateFormat = "date_time";
+    String originalDateValue = "1993-01-19T12:06:45.123-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testDateTimeNoMillis() {
+    String columnName = "date_field";
+    String dateFormat = "date_time_no_millis";
+    String originalDateValue = "1993-01-19T12:06:45-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testHour() {
+    String columnName = "date_field";
+    String dateFormat = "hour";
+    String originalDateValue = "12";
+    String expectedDateValue = "1970-01-01 12:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testHourMinute() {
+    String columnName = "date_field";
+    String dateFormat = "hour_minute";
+    String originalDateValue = "12:06";
+    String expectedDateValue = "1970-01-01 12:06:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testHourMinuteSecond() {
+    String columnName = "date_field";
+    String dateFormat = "hour_minute_second";
+    String originalDateValue = "12:06:45";
+    String expectedDateValue = "1970-01-01 12:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testHourMinuteSecondFraction() {
+    String columnName = "date_field";
+    String dateFormat = "hour_minute_second_fraction";
+    String originalDateValue = "12:06:45.123";
+    String expectedDateValue = "1970-01-01 12:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testHourMinuteSecondMillis() {
+    String columnName = "date_field";
+    String dateFormat = "hour_minute_second_millis";
+    String originalDateValue = "12:06:45.123";
+    String expectedDateValue = "1970-01-01 12:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testOrdinalDate() {
+    String columnName = "date_field";
+    String dateFormat = "ordinal_date";
+    String originalDateValue = "1993-019";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testOrdinalDateTime() {
+    String columnName = "date_field";
+    String dateFormat = "ordinal_date_time";
+    String originalDateValue = "1993-019T12:06:45.123-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testOrdinalDateTimeNoMillis() {
+    String columnName = "date_field";
+    String dateFormat = "ordinal_date_time_no_millis";
+    String originalDateValue = "1993-019T12:06:45-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testTime() {
+    String columnName = "date_field";
+    String dateFormat = "time";
+    String originalDateValue = "12:06:45.123-0800";
+    String expectedDateValue = "1970-01-01 20:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testTimeNoMillis() {
+    String columnName = "date_field";
+    String dateFormat = "time_no_millis";
+    String originalDateValue = "12:06:45-0800";
+    String expectedDateValue = "1970-01-01 20:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testTTime() {
+    String columnName = "date_field";
+    String dateFormat = "t_time";
+    String originalDateValue = "T12:06:45.123-0800";
+    String expectedDateValue = "1970-01-01 20:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testTTimeNoMillis() {
+    String columnName = "date_field";
+    String dateFormat = "t_time_no_millis";
+    String originalDateValue = "T12:06:45-0800";
+    String expectedDateValue = "1970-01-01 20:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testWeekDate() {
+    String columnName = "date_field";
+    String dateFormat = "week_date";
+    String originalDateValue = "1993-W04-2";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testWeekDateTime() {
+    String columnName = "date_field";
+    String dateFormat = "week_date_time";
+    String originalDateValue = "1993-W04-2T12:06:45.123-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.123";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testWeekDateTimeNoMillis() {
+    String columnName = "date_field";
+    String dateFormat = "week_date_time_no_millis";
+    String originalDateValue = "1993-W04-2T12:06:45-0800";
+    String expectedDateValue = "1993-01-19 20:06:45.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testWeekyear() {
+    String columnName = "date_field";
+    String dateFormat = "week_year";
+    String originalDateValue = "1993";
+    String expectedDateValue = "1993-01-01 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testWeekyearWeek() {
+    String columnName = "date_field";
+    String dateFormat = "weekyear_week";
+    String originalDateValue = "1993-W04";
+    String expectedDateValue = "1993-01-17 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testWeekyearWeekDay() {
+    String columnName = "date_field";
+    String dateFormat = "weekyear_week_day";
+    String originalDateValue = "1993-W04-2";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testYear() {
+    String columnName = "date_field";
+    String dateFormat = "year";
+    String originalDateValue = "1993";
+    String expectedDateValue = "1993-01-01 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testYearMonth() {
+    String columnName = "date_field";
+    String dateFormat = "year_month";
+    String originalDateValue = "1993-01";
+    String expectedDateValue = "1993-01-01 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testYearMonthDay() {
+    String columnName = "date_field";
+    String dateFormat = "year_month_day";
+    String originalDateValue = "1993-01-19";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testCustomFormat() {
+    String columnName = "date_field";
+    String dateFormat = "EEE, MMM d, ''yy";
+
+    String originalDateValue = "Tue, Jan 19, '93";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testMultipleFormats() {
+    String columnName = "date_field";
+    String dateFormat = "date_optional_time||epoch_millis";
+
+    String originalDateValue = "1993-01-19";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+
+    originalDateValue = "727401600000";
+    expectedDateValue = "1993-01-19 00:00:00.000";
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testMultipleCustomFormats() {
+    String columnName = "date_field";
+    String dateFormat = "EEE, MMM d, ''yy||yyMMddHHmmssZ";
+
+    String originalDateValue = "Tue, Jan 19, '93";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+
+    originalDateValue = "930119000000-0000";
+    expectedDateValue = "1993-01-19 00:00:00.000";
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testNamedAndCustomFormats() {
+    String columnName = "date_field";
+    String dateFormat = "EEE, MMM d, ''yy||hour_minute_second";
+
+    String originalDateValue = "Tue, Jan 19, '93";
+    String expectedDateValue = "1993-01-19 00:00:00.000";
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+
+    originalDateValue = "12:06:45";
+    expectedDateValue = "1970-01-01 12:06:45.000";
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testIncorrectFormat() {
+    String columnName = "date_field";
+    String dateFormat = "date_optional_time";
+    String originalDateValue = "1581724085";
+    // Invalid format for date value; should return original value
+    String expectedDateValue = "1581724085";
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testNullDateData() {
+    String columnName = "date_field";
+    String dateFormat = "date_optional_time";
+    String originalDateValue = null;
+    // Nulls should be preserved
+    String expectedDateValue = null;
+
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  @Test
+  public void testStrictDateOptionalTimeOrEpochMillsShouldPass() {
+    String columnName = "date_field";
+    String dateFormat = "strict_date_optional_time||epoch_millis";
+
+    String originalDateValue = "2015-01-01";
+    String expectedDateValue = "2015-01-01 00:00:00.000";
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+
+    originalDateValue = "2015-01-01T12:10:30Z";
+    expectedDateValue = "2015-01-01 12:10:30.000";
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+
+    originalDateValue = "1420070400001";
+    expectedDateValue = "2015-01-01 00:00:00.001";
+    verifyFormatting(columnName, dateFormat, originalDateValue, expectedDateValue);
+  }
+
+  private void verifyFormatting(
+      String columnName,
+      String dateFormatProperty,
+      String originalDateValue,
+      String expectedDateValue) {
+    List<Schema.Column> columns = buildColumnList(columnName);
+    Map<String, List<String>> dateFieldFormatMap =
+        buildDateFieldFormatMap(columnName, dateFormatProperty);
+
+    Map<String, Object> rowSource = new HashMap<>();
+    rowSource.put(columnName, originalDateValue);
+
+    DateFieldFormatter dateFieldFormatter =
+        new DateFieldFormatter(dateFieldFormatMap, columns, new HashMap<>());
+    executeFormattingAndCompare(dateFieldFormatter, rowSource, columnName, expectedDateValue);
+  }
+
+  private void executeFormattingAndCompare(
+      DateFieldFormatter formatter,
+      Map<String, Object> rowSource,
+      String columnToCheck,
+      String expectedDateValue) {
+    formatter.applyJDBCDateFormat(rowSource);
+    assertEquals(expectedDateValue, rowSource.get(columnToCheck));
+  }
+
+  private List<Schema.Column> buildColumnList(String columnName) {
+    return ImmutableList.<Schema.Column>builder()
+        .add(new Schema.Column(columnName, null, Schema.Type.DATE))
+        .build();
+  }
+
+  private Map<String, List<String>> buildDateFieldFormatMap(
+      String columnName, String dateFormatProperty) {
+    return ImmutableMap.<String, List<String>>builder()
+        .put(columnName, Arrays.asList(dateFormatProperty.split("\\|\\|")))
+        .build();
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/executor/format/ResultSetTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/executor/format/ResultSetTest.java
index 69da4ca475..c3d7e21704 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/executor/format/ResultSetTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/executor/format/ResultSetTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.executor.format;
 
 import static org.junit.Assert.assertFalse;
@@ -13,19 +12,17 @@
 
 public class ResultSetTest {
 
-  private final ResultSet resultSet = new ResultSet() {
-    @Override
-    public Schema getSchema() {
-      return super.getSchema();
-    }
-  };
+  private final ResultSet resultSet =
+      new ResultSet() {
+        @Override
+        public Schema getSchema() {
+          return super.getSchema();
+        }
+      };
 
   /**
-   * Case #1:
-   * LIKE 'test%' is converted to:
-   *  1. Regex pattern: test.*
-   *  2. OpenSearch search pattern: test*
-   * In this case, what OpenSearch returns is the final result.
+   * Case #1: LIKE 'test%' is converted to: 1. Regex pattern: test.* 2. OpenSearch search pattern:
+   * test* In this case, what OpenSearch returns is the final result.
    */
   @Test
   public void testWildcardForZeroOrMoreCharacters() {
@@ -33,13 +30,10 @@ public void testWildcardForZeroOrMoreCharacters() {
   }
 
   /**
-   * Case #2:
-   * LIKE 'test_123' is converted to:
-   *  1. Regex pattern: test.123
-   *  2. OpenSearch search pattern: (all)
-   * Because OpenSearch doesn't support single wildcard character, in this case, none is passed
-   * as OpenSearch search pattern. So all index names are returned and need to be filtered by
-   * regex pattern again.
+   * Case #2: LIKE 'test_123' is converted to: 1. Regex pattern: test.123 2. OpenSearch search
+   * pattern: (all) Because OpenSearch doesn't support single wildcard character, in this case, none
+   * is passed as OpenSearch search pattern. So all index names are returned and need to be filtered
+   * by regex pattern again.
    */
   @Test
   public void testWildcardForSingleCharacter() {
@@ -49,12 +43,10 @@ public void testWildcardForSingleCharacter() {
   }
 
   /**
-   * Case #3:
-   * LIKE 'acc' has same regex and OpenSearch pattern.
-   * In this case, only index name(s) aliased by 'acc' is returned.
-   * So regex match is skipped to avoid wrong empty result.
-   * The assumption here is OpenSearch won't return unrelated index names if
-   * LIKE pattern doesn't include any wildcard.
+   * Case #3: LIKE 'acc' has same regex and OpenSearch pattern. In this case, only index name(s)
+   * aliased by 'acc' is returned. So regex match is skipped to avoid wrong empty result. The
+   * assumption here is OpenSearch won't return unrelated index names if LIKE pattern doesn't
+   * include any wildcard.
    */
   @Test
   public void testIndexAlias() {
@@ -62,11 +54,9 @@ public void testIndexAlias() {
   }
 
   /**
-   * Case #4:
-   * LIKE 'test.2020.10' has same regex pattern. Because it includes dot (wildcard),
-   * OpenSearch search pattern is all.
-   * In this case, all index names are returned. Because the pattern includes dot,
-   * it's treated as regex and regex match won't be skipped.
+   * Case #4: LIKE 'test.2020.10' has same regex pattern. Because it includes dot (wildcard),
+   * OpenSearch search pattern is all. In this case, all index names are returned. Because the
+   * pattern includes dot, it's treated as regex and regex match won't be skipped.
    */
   @Test
   public void testIndexNameWithDot() {
@@ -74,5 +64,4 @@ public void testIndexNameWithDot() {
     assertFalse(resultSet.matchesPatternIfRegex(".opensearch_dashboards", "test.2020.10"));
     assertTrue(resultSet.matchesPatternIfRegex("test.2020.10", "test.2020.10"));
   }
-
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionCursorFallbackTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionCursorFallbackTest.java
new file mode 100644
index 0000000000..30d8c9d27d
--- /dev/null
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionCursorFallbackTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.legacy.plugin;
+
+import static org.junit.Assert.assertFalse;
+import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.common.inject.Injector;
+import org.opensearch.common.inject.ModulesBuilder;
+import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.rest.BaseRestHandler;
+import org.opensearch.rest.RestChannel;
+import org.opensearch.rest.RestRequest;
+import org.opensearch.sql.executor.QueryManager;
+import org.opensearch.sql.executor.execution.QueryPlanFactory;
+import org.opensearch.sql.sql.SQLService;
+import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
+import org.opensearch.sql.sql.domain.SQLQueryRequest;
+import org.opensearch.threadpool.ThreadPool;
+
+/** A test suite that verifies fallback behaviour of cursor queries. */
+@RunWith(MockitoJUnitRunner.class)
+public class RestSQLQueryActionCursorFallbackTest extends BaseRestHandler {
+
+  private NodeClient nodeClient;
+
+  @Mock private ThreadPool threadPool;
+
+  @Mock private QueryManager queryManager;
+
+  @Mock private QueryPlanFactory factory;
+
+  @Mock private RestChannel restChannel;
+
+  private Injector injector;
+
+  @Before
+  public void setup() {
+    nodeClient = new NodeClient(org.opensearch.common.settings.Settings.EMPTY, threadPool);
+    ModulesBuilder modules = new ModulesBuilder();
+    modules.add(
+        b -> {
+          b.bind(SQLService.class)
+              .toInstance(new SQLService(new SQLSyntaxParser(), queryManager, factory));
+        });
+    injector = modules.createInjector();
+    Mockito.lenient()
+        .when(threadPool.getThreadContext())
+        .thenReturn(new ThreadContext(org.opensearch.common.settings.Settings.EMPTY));
+  }
+
+  // Initial page request test cases
+
+  @Test
+  public void no_fallback_with_column_reference() throws Exception {
+    String query = "SELECT name FROM test1";
+    SQLQueryRequest request = createSqlQueryRequest(query, Optional.empty(), Optional.of(5));
+
+    assertFalse(doesQueryFallback(request));
+  }
+
+  private static SQLQueryRequest createSqlQueryRequest(
+      String query, Optional<String> cursorId, Optional<Integer> fetchSize) throws IOException {
+    var builder = XContentFactory.jsonBuilder().startObject().field("query").value(query);
+    if (cursorId.isPresent()) {
+      builder.field("cursor").value(cursorId.get());
+    }
+
+    if (fetchSize.isPresent()) {
+      builder.field("fetch_size").value(fetchSize.get());
+    }
+    builder.endObject();
+    JSONObject jsonContent = new JSONObject(builder.toString());
+
+    return new SQLQueryRequest(
+        jsonContent, query, QUERY_API_ENDPOINT, Map.of("format", "jdbc"), cursorId.orElse(""));
+  }
+
+  boolean doesQueryFallback(SQLQueryRequest request) throws Exception {
+    AtomicBoolean fallback = new AtomicBoolean(false);
+    RestSQLQueryAction queryAction = new RestSQLQueryAction(injector);
+    queryAction
+        .prepareRequest(
+            request,
+            (channel, exception) -> {
+              fallback.set(true);
+            },
+            (channel, exception) -> {})
+        .accept(restChannel);
+    return fallback.get();
+  }
+
+  @Override
+  public String getName() {
+    // do nothing, RestChannelConsumer is protected which required to extend BaseRestHandler
+    return null;
+  }
+
+  @Override
+  protected BaseRestHandler.RestChannelConsumer prepareRequest(
+      RestRequest restRequest, NodeClient nodeClient) {
+    // do nothing, RestChannelConsumer is protected which required to extend BaseRestHandler
+    return null;
+  }
+}
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionTest.java
index 3eafbd32d9..b14b2c09cb 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.plugin;
 
 import static org.junit.Assert.assertTrue;
@@ -23,132 +22,145 @@
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.client.node.NodeClient;
+import org.opensearch.common.inject.Injector;
+import org.opensearch.common.inject.ModulesBuilder;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestRequest;
-import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
-import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.QueryManager;
 import org.opensearch.sql.executor.execution.QueryPlanFactory;
-import org.opensearch.sql.sql.config.SQLServiceConfig;
+import org.opensearch.sql.sql.SQLService;
+import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
 import org.opensearch.sql.sql.domain.SQLQueryRequest;
-import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.threadpool.ThreadPool;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 @RunWith(MockitoJUnitRunner.class)
 public class RestSQLQueryActionTest extends BaseRestHandler {
 
   private NodeClient nodeClient;
 
-  @Mock
-  private ThreadPool threadPool;
-
-  @Mock
-  private QueryManager queryManager;
+  @Mock private ThreadPool threadPool;
 
-  @Mock
-  private QueryPlanFactory factory;
+  @Mock private QueryManager queryManager;
 
-  @Mock
-  private ExecutionEngine.Schema schema;
+  @Mock private QueryPlanFactory factory;
 
-  @Mock
-  private RestChannel restChannel;
+  @Mock private RestChannel restChannel;
 
-  private AnnotationConfigApplicationContext context;
+  private Injector injector;
 
   @Before
   public void setup() {
     nodeClient = new NodeClient(org.opensearch.common.settings.Settings.EMPTY, threadPool);
-    context = new AnnotationConfigApplicationContext();
-    context.registerBean(StorageEngine.class, () -> Mockito.mock(StorageEngine.class));
-    context.registerBean(ExecutionEngine.class, () -> Mockito.mock(ExecutionEngine.class));
-    context.registerBean(DataSourceService.class, () -> Mockito.mock(DataSourceService.class));
-    context.registerBean(QueryManager.class, () -> queryManager);
-    context.registerBean(QueryPlanFactory.class, () -> factory);
-    context.register(SQLServiceConfig.class);
-    context.refresh();
-    Mockito.lenient().when(threadPool.getThreadContext())
+    ModulesBuilder modules = new ModulesBuilder();
+    modules.add(
+        b -> {
+          b.bind(SQLService.class)
+              .toInstance(new SQLService(new SQLSyntaxParser(), queryManager, factory));
+        });
+    injector = modules.createInjector();
+    Mockito.lenient()
+        .when(threadPool.getThreadContext())
         .thenReturn(new ThreadContext(org.opensearch.common.settings.Settings.EMPTY));
   }
 
   @Test
   public void handleQueryThatCanSupport() throws Exception {
-    SQLQueryRequest request = new SQLQueryRequest(
-        new JSONObject("{\"query\": \"SELECT -123\"}"),
-        "SELECT -123",
-        QUERY_API_ENDPOINT,
-        "");
-
-    RestSQLQueryAction queryAction = new RestSQLQueryAction(context);
-    queryAction.prepareRequest(request, (channel, exception) -> {
-      fail();
-    }, (channel, exception) -> {
-      fail();
-    }).accept(restChannel);
+    SQLQueryRequest request =
+        new SQLQueryRequest(
+            new JSONObject("{\"query\": \"SELECT -123\"}"),
+            "SELECT -123",
+            QUERY_API_ENDPOINT,
+            "jdbc");
+
+    RestSQLQueryAction queryAction = new RestSQLQueryAction(injector);
+    queryAction
+        .prepareRequest(
+            request,
+            (channel, exception) -> {
+              fail();
+            },
+            (channel, exception) -> {
+              fail();
+            })
+        .accept(restChannel);
   }
 
   @Test
   public void handleExplainThatCanSupport() throws Exception {
-    SQLQueryRequest request = new SQLQueryRequest(
-        new JSONObject("{\"query\": \"SELECT -123\"}"),
-        "SELECT -123",
-        EXPLAIN_API_ENDPOINT,
-        "");
-
-    RestSQLQueryAction queryAction = new RestSQLQueryAction(context);
-    queryAction.prepareRequest(request, (channel, exception) -> {
-      fail();
-    }, (channel, exception) -> {
-      fail();
-    }).accept(restChannel);
+    SQLQueryRequest request =
+        new SQLQueryRequest(
+            new JSONObject("{\"query\": \"SELECT -123\"}"),
+            "SELECT -123",
+            EXPLAIN_API_ENDPOINT,
+            "jdbc");
+
+    RestSQLQueryAction queryAction = new RestSQLQueryAction(injector);
+    queryAction
+        .prepareRequest(
+            request,
+            (channel, exception) -> {
+              fail();
+            },
+            (channel, exception) -> {
+              fail();
+            })
+        .accept(restChannel);
   }
 
   @Test
   public void queryThatNotSupportIsHandledByFallbackHandler() throws Exception {
-    SQLQueryRequest request = new SQLQueryRequest(
-        new JSONObject(
-            "{\"query\": \"SELECT name FROM test1 JOIN test2 ON test1.name = test2.name\"}"),
-        "SELECT name FROM test1 JOIN test2 ON test1.name = test2.name",
-        QUERY_API_ENDPOINT,
-        "");
+    SQLQueryRequest request =
+        new SQLQueryRequest(
+            new JSONObject(
+                "{\"query\": \"SELECT name FROM test1 JOIN test2 ON test1.name = test2.name\"}"),
+            "SELECT name FROM test1 JOIN test2 ON test1.name = test2.name",
+            QUERY_API_ENDPOINT,
+            "jdbc");
 
     AtomicBoolean fallback = new AtomicBoolean(false);
-    RestSQLQueryAction queryAction = new RestSQLQueryAction(context);
-    queryAction.prepareRequest(request, (channel, exception) -> {
-      fallback.set(true);
-      assertTrue(exception instanceof SyntaxCheckException);
-    }, (channel, exception) -> {
-      fail();
-    }).accept(restChannel);
+    RestSQLQueryAction queryAction = new RestSQLQueryAction(injector);
+    queryAction
+        .prepareRequest(
+            request,
+            (channel, exception) -> {
+              fallback.set(true);
+              assertTrue(exception instanceof SyntaxCheckException);
+            },
+            (channel, exception) -> {
+              fail();
+            })
+        .accept(restChannel);
 
     assertTrue(fallback.get());
   }
 
   @Test
   public void queryExecutionFailedIsHandledByExecutionErrorHandler() throws Exception {
-    SQLQueryRequest request = new SQLQueryRequest(
-        new JSONObject(
-            "{\"query\": \"SELECT -123\"}"),
-        "SELECT -123",
-        QUERY_API_ENDPOINT,
-        "");
+    SQLQueryRequest request =
+        new SQLQueryRequest(
+            new JSONObject("{\"query\": \"SELECT -123\"}"),
+            "SELECT -123",
+            QUERY_API_ENDPOINT,
+            "jdbc");
 
-    doThrow(new IllegalStateException("execution exception"))
-        .when(queryManager)
-        .submit(any());
+    doThrow(new IllegalStateException("execution exception")).when(queryManager).submit(any());
 
     AtomicBoolean executionErrorHandler = new AtomicBoolean(false);
-    RestSQLQueryAction queryAction = new RestSQLQueryAction(context);
-    queryAction.prepareRequest(request, (channel, exception) -> {
-      assertTrue(exception instanceof SyntaxCheckException);
-    }, (channel, exception) -> {
-      executionErrorHandler.set(true);
-      assertTrue(exception instanceof IllegalStateException);
-    }).accept(restChannel);
+    RestSQLQueryAction queryAction = new RestSQLQueryAction(injector);
+    queryAction
+        .prepareRequest(
+            request,
+            (channel, exception) -> {
+              assertTrue(exception instanceof SyntaxCheckException);
+            },
+            (channel, exception) -> {
+              executionErrorHandler.set(true);
+              assertTrue(exception instanceof IllegalStateException);
+            })
+        .accept(restChannel);
 
     assertTrue(executionErrorHandler.get());
   }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/SearchHitRowTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/SearchHitRowTest.java
new file mode 100644
index 0000000000..dd0fc626c0
--- /dev/null
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/query/planner/physical/node/scroll/SearchHitRowTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.legacy.query.planner.physical.node.scroll;
+
+import static org.junit.Assert.assertEquals;
+import static org.opensearch.sql.legacy.query.planner.physical.Row.RowKey;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.Test;
+import org.opensearch.core.common.bytes.BytesArray;
+import org.opensearch.search.SearchHit;
+
+public class SearchHitRowTest {
+
+  @Test
+  public void testKeyWithObjectField() {
+    SearchHit hit = new SearchHit(1);
+    hit.sourceRef(new BytesArray("{\"id\": {\"serial\": 3}}"));
+    SearchHitRow row = new SearchHitRow(hit, "a");
+    RowKey key = row.key(new String[] {"id.serial"});
+
+    Object[] data = key.keys();
+    assertEquals(1, data.length);
+    assertEquals(3, data[0]);
+  }
+
+  @Test
+  public void testKeyWithUnexpandedObjectField() {
+    SearchHit hit = new SearchHit(1);
+    hit.sourceRef(new BytesArray("{\"attributes.hardware.correlate_id\": 10}"));
+    SearchHitRow row = new SearchHitRow(hit, "a");
+    RowKey key = row.key(new String[] {"attributes.hardware.correlate_id"});
+
+    Object[] data = key.keys();
+    assertEquals(1, data.length);
+    assertEquals(10, data[0]);
+  }
+
+  @Test
+  public void testRetainWithObjectField() {
+    SearchHit hit = new SearchHit(1);
+    hit.sourceRef(new BytesArray("{\"a.id\": {\"serial\": 3}}"));
+    SearchHitRow row = new SearchHitRow(hit, "");
+    row.retain(ImmutableMap.of("a.id.serial", ""));
+
+    SearchHit expected = new SearchHit(1);
+    expected.sourceRef(new BytesArray("{\"a.id\": {\"serial\": 3}}"));
+    assertEquals(expected, row.data());
+  }
+
+  @Test
+  public void testRetainWithUnexpandedObjectField() {
+    SearchHit hit = new SearchHit(1);
+    hit.sourceRef(new BytesArray("{\"a.attributes.hardware.correlate_id\": 10}"));
+    SearchHitRow row = new SearchHitRow(hit, "");
+    row.retain(ImmutableMap.of("a.attributes.hardware.correlate_id", ""));
+
+    SearchHit expected = new SearchHit(1);
+    expected.sourceRef(new BytesArray("{\"a.attributes.hardware.correlate_id\": 10}"));
+    assertEquals(expected, row.data());
+  }
+}
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/IdentifierTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/IdentifierTest.java
index b9c4935f50..5a6bc4541e 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/IdentifierTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/IdentifierTest.java
@@ -3,46 +3,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.alias;
 
 import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- * Test cases for util class {@link Identifier}.
- */
+/** Test cases for util class {@link Identifier}. */
 public class IdentifierTest {
 
-    @Test
-    public void identifierWithWordBeforeFirstDotShouldBeConsideredHavePrefix() {
-        Assert.assertTrue(identifier("accounts.age").hasPrefix());
-    }
-
-    @Test
-    public void identifierWithoutDotShouldNotBeConsideredHavePrefix() {
-        Assert.assertFalse(identifier("age").hasPrefix());
-    }
-
-    @Test
-    public void identifierStartingWithDotShouldNotBeConsideredHavePrefix() {
-        Assert.assertFalse(identifier(".age").hasPrefix());
-    }
-
-    @Test
-    public void prefixOfIdentifierShouldBeWordBeforeFirstDot() {
-        Assert.assertEquals("accounts", identifier("accounts.age").prefix());
-    }
-
-    @Test
-    public void removePrefixShouldRemoveFirstWordAndDot() {
-        Identifier identifier = identifier("accounts.age");
-        identifier.removePrefix();
-        Assert.assertEquals("age", identifier.name());
-    }
-
-    private Identifier identifier(String name) {
-        return new Identifier(new SQLIdentifierExpr(name));
-    }
+  @Test
+  public void identifierWithWordBeforeFirstDotShouldBeConsideredHavePrefix() {
+    Assert.assertTrue(identifier("accounts.age").hasPrefix());
+  }
+
+  @Test
+  public void identifierWithoutDotShouldNotBeConsideredHavePrefix() {
+    Assert.assertFalse(identifier("age").hasPrefix());
+  }
+
+  @Test
+  public void identifierStartingWithDotShouldNotBeConsideredHavePrefix() {
+    Assert.assertFalse(identifier(".age").hasPrefix());
+  }
+
+  @Test
+  public void prefixOfIdentifierShouldBeWordBeforeFirstDot() {
+    Assert.assertEquals("accounts", identifier("accounts.age").prefix());
+  }
+
+  @Test
+  public void removePrefixShouldRemoveFirstWordAndDot() {
+    Identifier identifier = identifier("accounts.age");
+    identifier.removePrefix();
+    Assert.assertEquals("age", identifier.name());
+  }
+
+  private Identifier identifier(String name) {
+    return new Identifier(new SQLIdentifierExpr(name));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/TableAliasPrefixRemoveRuleTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/TableAliasPrefixRemoveRuleTest.java
index b59bd218e0..4a4161a585 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/TableAliasPrefixRemoveRuleTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/TableAliasPrefixRemoveRuleTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.alias;
 
 import com.alibaba.druid.sql.SQLUtils;
@@ -12,122 +11,116 @@
 import org.junit.Test;
 import org.opensearch.sql.legacy.util.SqlParserUtils;
 
-/**
- * Test cases for field name prefix remove rule.
- */
+/** Test cases for field name prefix remove rule. */
 public class TableAliasPrefixRemoveRuleTest {
 
-    @Test
-    public void queryWithUnAliasedTableNameShouldMatch() {
-        query("SELECT account.age FROM accounts").shouldMatchRule();
-    }
-
-    @Test
-    public void queryWithUnAliasedTableNameInSubQueryShouldNotMatch() {
-        query("SELECT * FROM test t WHERE t.name IN (SELECT accounts.name FROM accounts)").shouldNotMatchRule();
-    }
-
-    @Test
-    public void queryWithoutUnAliasedTableNameShouldMatch() {
-        query("SELECT a.age FROM accounts a WHERE a.balance > 1000").shouldMatchRule();
-    }
-
-    @Test
-    public void joinQueryWithoutUnAliasedTableNameShouldNotMatch() {
-        query("SELECT * FROM accounts a1 JOIN accounts a2 ON a1.city = a2.city").shouldNotMatchRule();
-    }
-
-    @Test
-    public void nestedFieldQueryWithoutUnAliasedTableNameShouldNotMatch() {
-        query("SELECT * FROM accounts a, a.project p").shouldNotMatchRule();
-    }
-
-    @Test
-    public void selectedFieldNamePrefixedByUnAliasedTableNameShouldRemoveTableNamePrefix() {
-        query("SELECT accounts.age FROM accounts").shouldBeAfterRewrite("SELECT age FROM accounts");
-        query("SELECT accounts.age FROM accounts/temp").shouldBeAfterRewrite("SELECT age FROM accounts/temp");
-        query("SELECT age FROM accounts/temp a").shouldBeAfterRewrite("SELECT age FROM accounts/temp");
-    }
-
-    @Test
-    public void allFieldNamePrefixedByUnAliasedTableNameEverywhereShouldRemoveTableNamePrefix() {
-        query(
-            "SELECT accounts.age, AVG(accounts.salary) FROM accounts WHERE accounts.age > 10 " +
-            "GROUP BY accounts.age HAVING AVG(accounts.balance) > 1000 ORDER BY accounts.age"
-        ).shouldBeAfterRewrite(
-            "SELECT age, AVG(salary) FROM accounts WHERE age > 10 " +
-            "GROUP BY age HAVING AVG(balance) > 1000 ORDER BY age"
-        );
-    }
-
-    @Test
-    public void selectedFieldNamePrefixedByTableAliasShouldRemoveTableAliasPrefix() {
-        query("SELECT a.age FROM accounts a").shouldBeAfterRewrite("SELECT age FROM accounts");
-        query("SELECT a.age FROM accounts/temp a").shouldBeAfterRewrite("SELECT age FROM accounts/temp");
+  @Test
+  public void queryWithUnAliasedTableNameShouldMatch() {
+    query("SELECT account.age FROM accounts").shouldMatchRule();
+  }
+
+  @Test
+  public void queryWithUnAliasedTableNameInSubQueryShouldNotMatch() {
+    query("SELECT * FROM test t WHERE t.name IN (SELECT accounts.name FROM accounts)")
+        .shouldNotMatchRule();
+  }
+
+  @Test
+  public void queryWithoutUnAliasedTableNameShouldMatch() {
+    query("SELECT a.age FROM accounts a WHERE a.balance > 1000").shouldMatchRule();
+  }
+
+  @Test
+  public void joinQueryWithoutUnAliasedTableNameShouldNotMatch() {
+    query("SELECT * FROM accounts a1 JOIN accounts a2 ON a1.city = a2.city").shouldNotMatchRule();
+  }
+
+  @Test
+  public void nestedFieldQueryWithoutUnAliasedTableNameShouldNotMatch() {
+    query("SELECT * FROM accounts a, a.project p").shouldNotMatchRule();
+  }
+
+  @Test
+  public void selectedFieldNamePrefixedByUnAliasedTableNameShouldRemoveTableNamePrefix() {
+    query("SELECT accounts.age FROM accounts").shouldBeAfterRewrite("SELECT age FROM accounts");
+    query("SELECT accounts.age FROM accounts/temp")
+        .shouldBeAfterRewrite("SELECT age FROM accounts/temp");
+    query("SELECT age FROM accounts/temp a").shouldBeAfterRewrite("SELECT age FROM accounts/temp");
+  }
+
+  @Test
+  public void allFieldNamePrefixedByUnAliasedTableNameEverywhereShouldRemoveTableNamePrefix() {
+    query(
+            "SELECT accounts.age, AVG(accounts.salary) FROM accounts WHERE accounts.age > 10 "
+                + "GROUP BY accounts.age HAVING AVG(accounts.balance) > 1000 ORDER BY accounts.age")
+        .shouldBeAfterRewrite(
+            "SELECT age, AVG(salary) FROM accounts WHERE age > 10 "
+                + "GROUP BY age HAVING AVG(balance) > 1000 ORDER BY age");
+  }
+
+  @Test
+  public void selectedFieldNamePrefixedByTableAliasShouldRemoveTableAliasPrefix() {
+    query("SELECT a.age FROM accounts a").shouldBeAfterRewrite("SELECT age FROM accounts");
+    query("SELECT a.age FROM accounts/temp a")
+        .shouldBeAfterRewrite("SELECT age FROM accounts/temp");
+  }
+
+  @Test
+  public void allFieldNamePrefixedByTableAliasShouldRemoveTableAliasPrefix() {
+    query(
+            "SELECT a.age, AVG(a.salary) FROM accounts a WHERE a.age > 10 "
+                + "GROUP BY a.age HAVING AVG(a.balance) > 1000 ORDER BY a.age")
+        .shouldBeAfterRewrite(
+            "SELECT age, AVG(salary) FROM accounts WHERE age > 10 "
+                + "GROUP BY age HAVING AVG(balance) > 1000 ORDER BY age");
+  }
+
+  @Test
+  public void allFieldNamePrefixedByTableAliasInMultiQueryShouldRemoveTableAliasPrefix() {
+    query("SELECT t.name FROM test t UNION SELECT a.age FROM accounts a WHERE a.age > 10")
+        .shouldBeAfterRewrite(
+            "SELECT name FROM test UNION SELECT age FROM accounts WHERE age > 10");
+  }
+
+  @Test
+  public void unAliasedFieldNameShouldNotBeChanged() {
+    query("SELECT a.age, name FROM accounts a WHERE balance > 1000")
+        .shouldBeAfterRewrite("SELECT age, name FROM accounts WHERE balance > 1000");
+    query("SELECT accounts.age, name FROM accounts WHERE balance > 1000")
+        .shouldBeAfterRewrite("SELECT age, name FROM accounts WHERE balance > 1000");
+  }
+
+  private QueryAssertion query(String sql) {
+    return new QueryAssertion(sql);
+  }
+
+  private static class QueryAssertion {
+
+    private final TableAliasPrefixRemoveRule rule = new TableAliasPrefixRemoveRule();
+
+    private final SQLQueryExpr expr;
+
+    QueryAssertion(String sql) {
+      this.expr = SqlParserUtils.parse(sql);
     }
 
-    @Test
-    public void allFieldNamePrefixedByTableAliasShouldRemoveTableAliasPrefix() {
-        query(
-            "SELECT a.age, AVG(a.salary) FROM accounts a WHERE a.age > 10 " +
-            "GROUP BY a.age HAVING AVG(a.balance) > 1000 ORDER BY a.age"
-        ).shouldBeAfterRewrite(
-            "SELECT age, AVG(salary) FROM accounts WHERE age > 10 " +
-            "GROUP BY age HAVING AVG(balance) > 1000 ORDER BY age"
-        );
+    void shouldMatchRule() {
+      Assert.assertTrue(match());
     }
 
-    @Test
-    public void allFieldNamePrefixedByTableAliasInMultiQueryShouldRemoveTableAliasPrefix() {
-        query(
-            "SELECT t.name FROM test t UNION SELECT a.age FROM accounts a WHERE a.age > 10"
-        ).shouldBeAfterRewrite(
-            "SELECT name FROM test UNION SELECT age FROM accounts WHERE age > 10"
-        );
+    void shouldNotMatchRule() {
+      Assert.assertFalse(match());
     }
 
-    @Test
-    public void unAliasedFieldNameShouldNotBeChanged() {
-        query("SELECT a.age, name FROM accounts a WHERE balance > 1000").
-            shouldBeAfterRewrite("SELECT age, name FROM accounts WHERE balance > 1000");
-        query("SELECT accounts.age, name FROM accounts WHERE balance > 1000").
-            shouldBeAfterRewrite("SELECT age, name FROM accounts WHERE balance > 1000");
+    void shouldBeAfterRewrite(String expected) {
+      shouldMatchRule();
+      rule.rewrite(expr);
+      Assert.assertEquals(
+          SQLUtils.toMySqlString(SqlParserUtils.parse(expected)), SQLUtils.toMySqlString(expr));
     }
 
-    private QueryAssertion query(String sql) {
-        return new QueryAssertion(sql);
+    private boolean match() {
+      return rule.match(expr);
     }
-
-    private static class QueryAssertion {
-
-        private final TableAliasPrefixRemoveRule rule = new TableAliasPrefixRemoveRule();
-
-        private final SQLQueryExpr expr;
-
-        QueryAssertion(String sql) {
-            this.expr = SqlParserUtils.parse(sql);
-        }
-
-        void shouldMatchRule() {
-            Assert.assertTrue(match());
-        }
-
-        void shouldNotMatchRule() {
-            Assert.assertFalse(match());
-        }
-
-        void shouldBeAfterRewrite(String expected) {
-            shouldMatchRule();
-            rule.rewrite(expr);
-            Assert.assertEquals(
-                SQLUtils.toMySqlString(SqlParserUtils.parse(expected)),
-                SQLUtils.toMySqlString(expr)
-            );
-        }
-
-        private boolean match() {
-            return rule.match(expr);
-        }
-    }
-
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/TableTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/TableTest.java
index 5fc677785d..ab5c6b3d10 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/TableTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/rewriter/alias/TableTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.rewriter.alias;
 
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
@@ -13,27 +12,24 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- * Test cases for util class {@link Table}.
- */
+/** Test cases for util class {@link Table}. */
 public class TableTest {
 
-    @Test
-    public void identifierOfTableNameShouldReturnTheTableName() {
-        Table table = new Table(new SQLExprTableSource(new SQLIdentifierExpr("accounts")));
-        Assert.assertEquals("accounts", table.name());
-    }
-
-    @Test
-    public void identifierOfTableAndTypeNameShouldReturnTheTableNameOnly() {
-        Table table = new Table(new SQLExprTableSource(
-            new SQLBinaryOpExpr(
-                new SQLIdentifierExpr("accounts"),
-                SQLBinaryOperator.Divide,
-                new SQLIdentifierExpr("test")
-            )
-        ));
-        Assert.assertEquals("accounts", table.name());
-    }
+  @Test
+  public void identifierOfTableNameShouldReturnTheTableName() {
+    Table table = new Table(new SQLExprTableSource(new SQLIdentifierExpr("accounts")));
+    Assert.assertEquals("accounts", table.name());
+  }
 
+  @Test
+  public void identifierOfTableAndTypeNameShouldReturnTheTableNameOnly() {
+    Table table =
+        new Table(
+            new SQLExprTableSource(
+                new SQLBinaryOpExpr(
+                    new SQLIdentifierExpr("accounts"),
+                    SQLBinaryOperator.Divide,
+                    new SQLIdentifierExpr("test"))));
+    Assert.assertEquals("accounts", table.name());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/AggregationOptionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/AggregationOptionTest.java
index e5f44eacf0..526642e8ea 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/AggregationOptionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/AggregationOptionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import com.alibaba.druid.sql.ast.expr.SQLAggregateOption;
@@ -17,55 +16,53 @@
 import org.opensearch.sql.legacy.parser.SqlParser;
 import org.opensearch.sql.legacy.util.SqlParserUtils;
 
-/**
- * Unit test class for feature of aggregation options: DISTINCT, ALL, UNIQUE, DEDUPLICATION
- */
+/** Unit test class for feature of aggregation options: DISTINCT, ALL, UNIQUE, DEDUPLICATION */
 public class AggregationOptionTest {
 
-    @Test
-    public void selectDistinctFieldsShouldHaveAggregationOption() {
-        List<Field> fields = getSelectFields("SELECT DISTINCT gender, city FROM accounts");
-        for (Field field: fields) {
-            Assert.assertEquals(field.getOption(), SQLAggregateOption.DISTINCT);
-        }
+  @Test
+  public void selectDistinctFieldsShouldHaveAggregationOption() {
+    List<Field> fields = getSelectFields("SELECT DISTINCT gender, city FROM accounts");
+    for (Field field : fields) {
+      Assert.assertEquals(field.getOption(), SQLAggregateOption.DISTINCT);
     }
+  }
 
-    @Test
-    public void selectWithoutDistinctFieldsShouldNotHaveAggregationOption() {
-        List<Field> fields = getSelectFields("SELECT gender, city FROM accounts");
-        for (Field field: fields) {
-            Assert.assertNull(field.getOption());
-        }
+  @Test
+  public void selectWithoutDistinctFieldsShouldNotHaveAggregationOption() {
+    List<Field> fields = getSelectFields("SELECT gender, city FROM accounts");
+    for (Field field : fields) {
+      Assert.assertNull(field.getOption());
     }
+  }
 
-    @Test
-    public void selectDistinctWithoutGroupByShouldHaveGroupByItems() {
-        List<List<Field>> groupBys = getGroupBys("SELECT DISTINCT gender, city FROM accounts");
-        Assert.assertFalse(groupBys.isEmpty());
-    }
+  @Test
+  public void selectDistinctWithoutGroupByShouldHaveGroupByItems() {
+    List<List<Field>> groupBys = getGroupBys("SELECT DISTINCT gender, city FROM accounts");
+    Assert.assertFalse(groupBys.isEmpty());
+  }
 
-    @Test
-    public void selectWithoutDistinctWithoutGroupByShouldNotHaveGroupByItems() {
-        List<List<Field>> groupBys = getGroupBys("SELECT gender, city FROM accounts");
-        Assert.assertTrue(groupBys.isEmpty());
-    }
+  @Test
+  public void selectWithoutDistinctWithoutGroupByShouldNotHaveGroupByItems() {
+    List<List<Field>> groupBys = getGroupBys("SELECT gender, city FROM accounts");
+    Assert.assertTrue(groupBys.isEmpty());
+  }
 
-    private List<List<Field>> getGroupBys(String query) {
-        return getSelect(query).getGroupBys();
-    }
+  private List<List<Field>> getGroupBys(String query) {
+    return getSelect(query).getGroupBys();
+  }
 
-    private List<Field> getSelectFields(String query) {
-        return getSelect(query).getFields();
-    }
+  private List<Field> getSelectFields(String query) {
+    return getSelect(query).getFields();
+  }
 
-    private Select getSelect(String query) {
-        SQLQueryExpr queryExpr = SqlParserUtils.parse(query);
-        Select select = null;
-        try {
-            select = new SqlParser().parseSelect(queryExpr);
-        } catch (SqlParseException e) {
-            e.printStackTrace();
-        }
-        return select;
+  private Select getSelect(String query) {
+    SQLQueryExpr queryExpr = SqlParserUtils.parse(query);
+    Select select = null;
+    try {
+      select = new SqlParser().parseSelect(queryExpr);
+    } catch (SqlParseException e) {
+      e.printStackTrace();
     }
+    return select;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFormatTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFormatTest.java
index 89ac8b4563..3bb7b4a2b6 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFormatTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFormatTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -40,196 +39,238 @@
 
 public class DateFormatTest {
 
-    private static final String SELECT_CNT_FROM_DATE = "SELECT COUNT(*) AS c FROM dates ";
-
-    @Test
-    public void simpleFormatCondition() {
-        List<QueryBuilder> q = query(SELECT_CNT_FROM_DATE + "WHERE date_format(creationDate, 'YYYY') < '2018'");
-
-        assertThat(q, hasQueryWithValue("fieldName", equalTo("creationDate")));
-        assertThat(q, hasQueryWithValueGetter(MatcherUtils.featureValueOf("has format", equalTo("YYYY"), f->((RangeQueryBuilder)f).format())));
-    }
-
-    @Test
-    public void equalCondition() {
-        List<QueryBuilder> q = query(SELECT_CNT_FROM_DATE + "WHERE date_format(creationDate, 'YYYY-MM-dd') = '2018-04-02'");
-
-        assertThat(q, hasQueryWithValueGetter(MatcherUtils.featureValueOf("has format", equalTo("YYYY-MM-dd"), f->((RangeQueryBuilder)f).format())));
-
-        // Equality query for date_format is created with a rangeQuery where the 'from' and 'to' values are equal to the value we are equating to
-        assertThat(q, hasQueryWithValue("from", equalTo(BytesRefs.toBytesRef("2018-04-02")))); // converting string to bytes ref as RangeQueryBuilder stores it this way
-        assertThat(q, hasQueryWithValue("to", equalTo(BytesRefs.toBytesRef("2018-04-02"))));
-    }
-
-    @Test
-    public void orderByTest() {
-        String query = "SELECT agent, ip, date_format(utc_time, 'dd-MM-YYYY') date " +
-                "FROM opensearch_dashboards_sample_data_logs " +
-                "ORDER BY date_format(utc_time, 'dd-MM-YYYY') desc, ip";
-
-        Select select = getSelect(query);
-
-        List<Order> orderBys = select.getOrderBys();
-        assertThat(orderBys.size(), equalTo(2));
-
-        Order formula = orderBys.get(0);
-
-        assertThat(formula.isScript(), is(true));
-        assertThat(formula.getType(), is("DESC"));
-        assertThat(formula.getName(), containsString("DateTimeFormatter.ofPattern"));
-
-        Order ip = orderBys.get(1);
-
-        assertThat(ip.isScript(), is(false));
-        assertThat(ip.getName(), is("ip"));
-        assertThat(ip.getType(), is("ASC"));
-    }
-
-    @Test
-    public void groupByWithDescOrder() throws SqlParseException {
-        String query = "SELECT date_format(utc_time, 'dd-MM-YYYY'), count(*) " +
-                "FROM opensearch_dashboards_sample_data_logs " +
-                "GROUP BY date_format(utc_time, 'dd-MM-YYYY') " +
-                "ORDER BY date_format(utc_time, 'dd-MM-YYYY') DESC";
-
-        JSONObject aggregation = getAggregation(query);
-        assertThat(aggregation.getInt("size"), is(getSelect(query).getRowCount()));
-        assertThat(aggregation.getJSONObject("order").getString("_key"), is("desc"));
-    }
-
-    @Test
-    public void groupByWithAscOrder() throws SqlParseException {
-        String query = "SELECT date_format(utc_time, 'dd-MM-YYYY'), count(*) " +
-                "FROM opensearch_dashboards_sample_data_logs " +
-                "GROUP BY date_format(utc_time, 'dd-MM-YYYY') " +
-                "ORDER BY date_format(utc_time, 'dd-MM-YYYY')";
-
-        JSONObject aggregation = getAggregation(query);
-
-        assertThat(aggregation.getJSONObject("order").getString("_key"), is("asc"));
-    }
-
-    @Test
-    @Ignore("https://github.com/opendistro-for-elasticsearch/sql/issues/158")
-    public void groupByWithAndAlias() throws SqlParseException {
-        String query = "SELECT date_format(utc_time, 'dd-MM-YYYY') x, count(*) " +
-                "FROM opensearch_dashboards_sample_data_logs " +
-                "GROUP BY x " +
-                "ORDER BY x";
-
-        JSONObject aggregation = getAggregation(query);
-        assertThat(aggregation.getJSONObject("order").getString("_key"), is("asc"));
-    }
-
-    public JSONObject getAggregation(String query) throws SqlParseException {
-        Select select = getSelect(query);
-
-        Client client = mock(Client.class);
-        AggregationQueryAction queryAction = new AggregationQueryAction(client, select);
-
-        String elasticDsl = queryAction.explain().explain();
-        JSONObject elasticQuery = new JSONObject(elasticDsl);
-
-        JSONObject aggregations = elasticQuery.getJSONObject("aggregations");
-        String dateFormatAggregationKey = getScriptAggregationKey(aggregations, "date_format");
-
-        return aggregations.getJSONObject(dateFormatAggregationKey).getJSONObject("terms");
-    }
-
-    public static String getScriptAggregationKey(JSONObject aggregation, String prefix) {
-        return aggregation.keySet()
-                .stream()
-                .filter(x -> x.startsWith(prefix))
-                .findFirst()
-                .orElseThrow(()-> new RuntimeException("Can't find key" + prefix + " in aggregation " + aggregation));
-    }
-
-    @Test
-    public void notEqualCondition() {
-        List<QueryBuilder> q = query(SELECT_CNT_FROM_DATE + "WHERE date_format(creationDate, 'YYYY-MM-dd') <> '2018-04-02'");
-
-        assertThat(q, hasNotQueryWithValue("from", equalTo(BytesRefs.toBytesRef("2018-04-02"))));
-        assertThat(q, hasNotQueryWithValue("to", equalTo(BytesRefs.toBytesRef("2018-04-02"))));
-    }
-
-    @Test
-    public void greaterThanCondition() {
-        List<QueryBuilder> q = query(SELECT_CNT_FROM_DATE + "WHERE date_format(creationDate, 'YYYY-MM-dd') > '2018-04-02'");
-
-        assertThat(q, hasQueryWithValue("from", equalTo(BytesRefs.toBytesRef("2018-04-02"))));
-        assertThat(q, hasQueryWithValue("includeLower", equalTo(false)));
-        assertThat(q, hasQueryWithValue("includeUpper", equalTo(true)));
-    }
-
-    @Test
-    public void greaterThanOrEqualToCondition() {
-        List<QueryBuilder> q = query(SELECT_CNT_FROM_DATE + "WHERE date_format(creationDate, 'YYYY-MM-dd') >= '2018-04-02'");
-
-        assertThat(q, hasQueryWithValue("from", equalTo(BytesRefs.toBytesRef("2018-04-02"))));
-        assertThat(q, hasQueryWithValue("to", equalTo(null)));
-        assertThat(q, hasQueryWithValue("includeLower", equalTo(true)));
-        assertThat(q, hasQueryWithValue("includeUpper", equalTo(true)));
+  private static final String SELECT_CNT_FROM_DATE = "SELECT COUNT(*) AS c FROM dates ";
+
+  @Test
+  public void simpleFormatCondition() {
+    List<QueryBuilder> q =
+        query(SELECT_CNT_FROM_DATE + "WHERE date_format(creationDate, 'YYYY') < '2018'");
+
+    assertThat(q, hasQueryWithValue("fieldName", equalTo("creationDate")));
+    assertThat(
+        q,
+        hasQueryWithValueGetter(
+            MatcherUtils.featureValueOf(
+                "has format", equalTo("YYYY"), f -> ((RangeQueryBuilder) f).format())));
+  }
+
+  @Test
+  public void equalCondition() {
+    List<QueryBuilder> q =
+        query(
+            SELECT_CNT_FROM_DATE + "WHERE date_format(creationDate, 'YYYY-MM-dd') = '2018-04-02'");
+
+    assertThat(
+        q,
+        hasQueryWithValueGetter(
+            MatcherUtils.featureValueOf(
+                "has format", equalTo("YYYY-MM-dd"), f -> ((RangeQueryBuilder) f).format())));
+
+    // Equality query for date_format is created with a rangeQuery where the 'from' and 'to' values
+    // are equal to the value we are equating to
+    assertThat(
+        q,
+        hasQueryWithValue(
+            "from",
+            equalTo(
+                BytesRefs.toBytesRef(
+                    "2018-04-02")))); // converting string to bytes ref as RangeQueryBuilder stores
+    // it this way
+    assertThat(q, hasQueryWithValue("to", equalTo(BytesRefs.toBytesRef("2018-04-02"))));
+  }
+
+  @Test
+  public void orderByTest() {
+    String query =
+        "SELECT agent, ip, date_format(utc_time, 'dd-MM-YYYY') date "
+            + "FROM opensearch_dashboards_sample_data_logs "
+            + "ORDER BY date_format(utc_time, 'dd-MM-YYYY') desc, ip";
+
+    Select select = getSelect(query);
+
+    List<Order> orderBys = select.getOrderBys();
+    assertThat(orderBys.size(), equalTo(2));
+
+    Order formula = orderBys.get(0);
+
+    assertThat(formula.isScript(), is(true));
+    assertThat(formula.getType(), is("DESC"));
+    assertThat(formula.getName(), containsString("DateTimeFormatter.ofPattern"));
+
+    Order ip = orderBys.get(1);
+
+    assertThat(ip.isScript(), is(false));
+    assertThat(ip.getName(), is("ip"));
+    assertThat(ip.getType(), is("ASC"));
+  }
+
+  @Test
+  public void groupByWithDescOrder() throws SqlParseException {
+    String query =
+        "SELECT date_format(utc_time, 'dd-MM-YYYY'), count(*) "
+            + "FROM opensearch_dashboards_sample_data_logs "
+            + "GROUP BY date_format(utc_time, 'dd-MM-YYYY') "
+            + "ORDER BY date_format(utc_time, 'dd-MM-YYYY') DESC";
+
+    JSONObject aggregation = getAggregation(query);
+    assertThat(aggregation.getInt("size"), is(getSelect(query).getRowCount()));
+    assertThat(aggregation.getJSONObject("order").getString("_key"), is("desc"));
+  }
+
+  @Test
+  public void groupByWithAscOrder() throws SqlParseException {
+    String query =
+        "SELECT date_format(utc_time, 'dd-MM-YYYY'), count(*) "
+            + "FROM opensearch_dashboards_sample_data_logs "
+            + "GROUP BY date_format(utc_time, 'dd-MM-YYYY') "
+            + "ORDER BY date_format(utc_time, 'dd-MM-YYYY')";
+
+    JSONObject aggregation = getAggregation(query);
+
+    assertThat(aggregation.getJSONObject("order").getString("_key"), is("asc"));
+  }
+
+  @Test
+  @Ignore("https://github.com/opendistro-for-elasticsearch/sql/issues/158")
+  public void groupByWithAndAlias() throws SqlParseException {
+    String query =
+        "SELECT date_format(utc_time, 'dd-MM-YYYY') x, count(*) "
+            + "FROM opensearch_dashboards_sample_data_logs "
+            + "GROUP BY x "
+            + "ORDER BY x";
+
+    JSONObject aggregation = getAggregation(query);
+    assertThat(aggregation.getJSONObject("order").getString("_key"), is("asc"));
+  }
+
+  public JSONObject getAggregation(String query) throws SqlParseException {
+    Select select = getSelect(query);
+
+    Client client = mock(Client.class);
+    AggregationQueryAction queryAction = new AggregationQueryAction(client, select);
+
+    String elasticDsl = queryAction.explain().explain();
+    JSONObject elasticQuery = new JSONObject(elasticDsl);
+
+    JSONObject aggregations = elasticQuery.getJSONObject("aggregations");
+    String dateFormatAggregationKey = getScriptAggregationKey(aggregations, "date_format");
+
+    return aggregations.getJSONObject(dateFormatAggregationKey).getJSONObject("terms");
+  }
+
+  public static String getScriptAggregationKey(JSONObject aggregation, String prefix) {
+    return aggregation.keySet().stream()
+        .filter(x -> x.startsWith(prefix))
+        .findFirst()
+        .orElseThrow(
+            () ->
+                new RuntimeException("Can't find key" + prefix + " in aggregation " + aggregation));
+  }
+
+  @Test
+  public void notEqualCondition() {
+    List<QueryBuilder> q =
+        query(
+            SELECT_CNT_FROM_DATE + "WHERE date_format(creationDate, 'YYYY-MM-dd') <> '2018-04-02'");
+
+    assertThat(q, hasNotQueryWithValue("from", equalTo(BytesRefs.toBytesRef("2018-04-02"))));
+    assertThat(q, hasNotQueryWithValue("to", equalTo(BytesRefs.toBytesRef("2018-04-02"))));
+  }
+
+  @Test
+  public void greaterThanCondition() {
+    List<QueryBuilder> q =
+        query(
+            SELECT_CNT_FROM_DATE + "WHERE date_format(creationDate, 'YYYY-MM-dd') > '2018-04-02'");
+
+    assertThat(q, hasQueryWithValue("from", equalTo(BytesRefs.toBytesRef("2018-04-02"))));
+    assertThat(q, hasQueryWithValue("includeLower", equalTo(false)));
+    assertThat(q, hasQueryWithValue("includeUpper", equalTo(true)));
+  }
+
+  @Test
+  public void greaterThanOrEqualToCondition() {
+    List<QueryBuilder> q =
+        query(
+            SELECT_CNT_FROM_DATE + "WHERE date_format(creationDate, 'YYYY-MM-dd') >= '2018-04-02'");
+
+    assertThat(q, hasQueryWithValue("from", equalTo(BytesRefs.toBytesRef("2018-04-02"))));
+    assertThat(q, hasQueryWithValue("to", equalTo(null)));
+    assertThat(q, hasQueryWithValue("includeLower", equalTo(true)));
+    assertThat(q, hasQueryWithValue("includeUpper", equalTo(true)));
+  }
+
+  @Test
+  public void timeZoneCondition() {
+    List<QueryBuilder> q =
+        query(
+            SELECT_CNT_FROM_DATE
+                + "WHERE date_format(creationDate, 'YYYY-MM-dd', 'America/Phoenix') >"
+                + " '2018-04-02'");
+
+    // Used hasProperty here as getter followed convention for obtaining ID and Feature Matcher was
+    // having issues with generic type to obtain value
+    assertThat(q, hasQueryWithValue("timeZone", hasProperty("id", equalTo("America/Phoenix"))));
+  }
+
+  private List<QueryBuilder> query(String sql) {
+    return translate(parseSql(sql));
+  }
+
+  private List<QueryBuilder> translate(SQLQueryExpr expr) {
+    try {
+      Select select = new SqlParser().parseSelect(expr);
+      QueryBuilder whereQuery = QueryMaker.explain(select.getWhere(), select.isQuery);
+      return ((BoolQueryBuilder) whereQuery).filter();
+    } catch (SqlParseException e) {
+      throw new ParserException("Illegal sql expr: " + expr.toString());
     }
+  }
 
-    @Test
-    public void timeZoneCondition() {
-        List<QueryBuilder> q = query(SELECT_CNT_FROM_DATE + "WHERE date_format(creationDate, 'YYYY-MM-dd', 'America/Phoenix') > '2018-04-02'");
-
-        // Used hasProperty here as getter followed convention for obtaining ID and Feature Matcher was having issues with generic type to obtain value
-        assertThat(q, hasQueryWithValue("timeZone", hasProperty("id", equalTo("America/Phoenix"))));
-    }
-
-    private List<QueryBuilder> query(String sql) {
-        return translate(parseSql(sql));
-    }
-
-    private List<QueryBuilder> translate(SQLQueryExpr expr) {
-        try {
-            Select select = new SqlParser().parseSelect(expr);
-            QueryBuilder whereQuery = QueryMaker.explain(select.getWhere(), select.isQuery);
-            return ((BoolQueryBuilder) whereQuery).filter();
-        } catch (SqlParseException e) {
-            throw new ParserException("Illegal sql expr: " + expr.toString());
-        }
-    }
-
-    private SQLQueryExpr parseSql(String sql) {
-        ElasticSqlExprParser parser = new ElasticSqlExprParser(sql);
-        SQLExpr expr = parser.expr();
-        if (parser.getLexer().token() != Token.EOF) {
-            throw new ParserException("Illegal sql: " + sql);
-        }
-        return (SQLQueryExpr) expr;
+  private SQLQueryExpr parseSql(String sql) {
+    ElasticSqlExprParser parser = new ElasticSqlExprParser(sql);
+    SQLExpr expr = parser.expr();
+    if (parser.getLexer().token() != Token.EOF) {
+      throw new ParserException("Illegal sql: " + sql);
     }
-
-    private Select getSelect(String query) {
-        try {
-            Select select = new SqlParser().parseSelect(parseSql(query));
-            if (select.getRowCount() == null){
-                select.setRowCount(Select.DEFAULT_LIMIT);
-            }
-            return select;
-        } catch (SqlParseException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private <T, U> Matcher<Iterable<? super T>> hasQueryWithValue(String name, Matcher<? super U> matcher) {
-        return hasItem(
-                hasFieldWithValue("mustClauses", "has mustClauses",
-                        hasItem(hasFieldWithValue(name, "has " + name, matcher))));
-    }
-
-    private <T, U> Matcher<Iterable<? super T>> hasNotQueryWithValue(String name, Matcher<? super U> matcher) {
-        return hasItem(
-                hasFieldWithValue("mustClauses", "has mustClauses",
-                        hasItem(hasFieldWithValue("mustNotClauses", "has mustNotClauses",
-                                hasItem(hasFieldWithValue(name, "has " + name, matcher))))));
-    }
-
-    private <T, U> Matcher<Iterable<? super T>> hasQueryWithValueGetter(Matcher<? super U> matcher) {
-        return hasItem(
-                hasFieldWithValue("mustClauses", "has mustClauses",
-                        hasItem(matcher)));
+    return (SQLQueryExpr) expr;
+  }
+
+  private Select getSelect(String query) {
+    try {
+      Select select = new SqlParser().parseSelect(parseSql(query));
+      if (select.getRowCount() == null) {
+        select.setRowCount(Select.DEFAULT_LIMIT);
+      }
+      return select;
+    } catch (SqlParseException e) {
+      throw new RuntimeException(e);
     }
+  }
+
+  private <T, U> Matcher<Iterable<? super T>> hasQueryWithValue(
+      String name, Matcher<? super U> matcher) {
+    return hasItem(
+        hasFieldWithValue(
+            "mustClauses",
+            "has mustClauses",
+            hasItem(hasFieldWithValue(name, "has " + name, matcher))));
+  }
+
+  private <T, U> Matcher<Iterable<? super T>> hasNotQueryWithValue(
+      String name, Matcher<? super U> matcher) {
+    return hasItem(
+        hasFieldWithValue(
+            "mustClauses",
+            "has mustClauses",
+            hasItem(
+                hasFieldWithValue(
+                    "mustNotClauses",
+                    "has mustNotClauses",
+                    hasItem(hasFieldWithValue(name, "has " + name, matcher))))));
+  }
+
+  private <T, U> Matcher<Iterable<? super T>> hasQueryWithValueGetter(Matcher<? super U> matcher) {
+    return hasItem(hasFieldWithValue("mustClauses", "has mustClauses", hasItem(matcher)));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFunctionsTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFunctionsTest.java
index 771b0ce1bf..cf1be90665 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFunctionsTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFunctionsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static org.junit.Assert.assertTrue;
@@ -20,181 +19,132 @@
 
 public class DateFunctionsTest {
 
-    private static SqlParser parser;
-
-    @BeforeClass
-    public static void init() { parser = new SqlParser(); }
-
-    /**
-     * The following unit tests will only cover a subset of the available date functions as the painless script is
-     * generated from the same template. More thorough testing will be done in integration tests since output will
-     * differ for each function.
-     */
-
-    @Test
-    public void yearInSelect() {
-        String query = "SELECT YEAR(creationDate) " +
-                       "FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "doc['creationDate'].value.year"));
-    }
-
-    @Test
-    public void yearInWhere() {
-        String query = "SELECT * " +
-                       "FROM dates " +
-                       "WHERE YEAR(creationDate) > 2012";
-        ScriptFilter scriptFilter = getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                scriptContainsString(
-                        scriptFilter,
-                        "doc['creationDate'].value.year"));
-        assertTrue(
-                scriptHasPattern(
-                        scriptFilter,
-                        "year_\\d+ > 2012"));
-    }
-
-    @Test
-    public void weekOfYearInSelect() {
-        String query = "SELECT WEEK_OF_YEAR(creationDate) " +
-                       "FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "doc['creationDate'].value.get(WeekFields.ISO.weekOfWeekBasedYear())"));
-    }
-
-    @Test
-    public void weekOfYearInWhere() {
-        String query = "SELECT * " +
-                       "FROM dates " +
-                       "WHERE WEEK_OF_YEAR(creationDate) > 15";
-        ScriptFilter scriptFilter = getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                scriptContainsString(
-                        scriptFilter,
-                        "doc['creationDate'].value.get(WeekFields.ISO.weekOfWeekBasedYear())"));
-        assertTrue(
-                scriptHasPattern(
-                        scriptFilter,
-                        "weekOfWeekyear_\\d+ > 15"));
-    }
-
-    @Test
-    public void dayOfMonth() {
-        String query = "SELECT DAY_OF_MONTH(creationDate) " +
-                       "FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "doc['creationDate'].value.dayOfMonth"));
-    }
-
-    @Test
-    public void hourOfDay() {
-        String query = "SELECT HOUR_OF_DAY(creationDate) " +
-                       "FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "doc['creationDate'].value.hour"));
-    }
-
-    @Test
-    public void secondOfMinute() {
-        String query = "SELECT SECOND_OF_MINUTE(creationDate) " +
-                       "FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "doc['creationDate'].value.second"));
-    }
-
-    @Test
-    public void month() {
-        String query = "SELECT MONTH(creationDate) FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "doc['creationDate'].value.monthValue"));
-    }
-
-    @Test
-    public void dayofmonth() {
-        String query = "SELECT DAY_OF_MONTH(creationDate) FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "doc['creationDate'].value.dayOfMonth"));
-    }
-
-    @Test
-    public void date() {
-        String query = "SELECT DATE(creationDate) FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "LocalDate.parse(doc['creationDate'].value.toString(),DateTimeFormatter.ISO_DATE_TIME)"));
-    }
-
-    @Test
-    public void monthname() {
-        String query = "SELECT MONTHNAME(creationDate) FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "doc['creationDate'].value.month"));
-    }
-
-    @Test
-    public void timestamp() {
-        String query = "SELECT TIMESTAMP(creationDate) FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "DateTimeFormatter.ofPattern('yyyy-MM-dd HH:mm:ss')"));
-    }
-
-    @Test
-    public void maketime() {
-        String query = "SELECT MAKETIME(1, 1, 1) FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "LocalTime.of(1, 1, 1).format(DateTimeFormatter.ofPattern('HH:mm:ss'))"));
-    }
-
-    @Test
-    public void now() {
-        String query = "SELECT NOW() FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "System.currentTimeMillis()"));
-    }
-
-    @Test
-    public void curdate() {
-        String query = "SELECT CURDATE() FROM dates";
-        ScriptField scriptField = getScriptFieldFromQuery(query);
-        assertTrue(
-                scriptContainsString(
-                        scriptField,
-                        "System.currentTimeMillis()"));
-    }
+  private static SqlParser parser;
+
+  @BeforeClass
+  public static void init() {
+    parser = new SqlParser();
+  }
+
+  /**
+   * The following unit tests will only cover a subset of the available date functions as the
+   * painless script is generated from the same template. More thorough testing will be done in
+   * integration tests since output will differ for each function.
+   */
+  @Test
+  public void yearInSelect() {
+    String query = "SELECT YEAR(creationDate) " + "FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(scriptContainsString(scriptField, "doc['creationDate'].value.year"));
+  }
+
+  @Test
+  public void yearInWhere() {
+    String query = "SELECT * " + "FROM dates " + "WHERE YEAR(creationDate) > 2012";
+    ScriptFilter scriptFilter = getScriptFilterFromQuery(query, parser);
+    assertTrue(scriptContainsString(scriptFilter, "doc['creationDate'].value.year"));
+    assertTrue(scriptHasPattern(scriptFilter, "year_\\d+ > 2012"));
+  }
+
+  @Test
+  public void weekOfYearInSelect() {
+    String query = "SELECT WEEK_OF_YEAR(creationDate) " + "FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(
+        scriptContainsString(
+            scriptField, "doc['creationDate'].value.get(WeekFields.ISO.weekOfWeekBasedYear())"));
+  }
+
+  @Test
+  public void weekOfYearInWhere() {
+    String query = "SELECT * " + "FROM dates " + "WHERE WEEK_OF_YEAR(creationDate) > 15";
+    ScriptFilter scriptFilter = getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        scriptContainsString(
+            scriptFilter, "doc['creationDate'].value.get(WeekFields.ISO.weekOfWeekBasedYear())"));
+    assertTrue(scriptHasPattern(scriptFilter, "weekOfWeekyear_\\d+ > 15"));
+  }
+
+  @Test
+  public void dayOfMonth() {
+    String query = "SELECT DAY_OF_MONTH(creationDate) " + "FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(scriptContainsString(scriptField, "doc['creationDate'].value.dayOfMonth"));
+  }
+
+  @Test
+  public void hourOfDay() {
+    String query = "SELECT HOUR_OF_DAY(creationDate) " + "FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(scriptContainsString(scriptField, "doc['creationDate'].value.hour"));
+  }
+
+  @Test
+  public void secondOfMinute() {
+    String query = "SELECT SECOND_OF_MINUTE(creationDate) " + "FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(scriptContainsString(scriptField, "doc['creationDate'].value.second"));
+  }
+
+  @Test
+  public void month() {
+    String query = "SELECT MONTH(creationDate) FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(scriptContainsString(scriptField, "doc['creationDate'].value.monthValue"));
+  }
+
+  @Test
+  public void dayofmonth() {
+    String query = "SELECT DAY_OF_MONTH(creationDate) FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(scriptContainsString(scriptField, "doc['creationDate'].value.dayOfMonth"));
+  }
+
+  @Test
+  public void date() {
+    String query = "SELECT DATE(creationDate) FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(
+        scriptContainsString(
+            scriptField,
+            "LocalDate.parse(doc['creationDate'].value.toString(),DateTimeFormatter.ISO_DATE_TIME)"));
+  }
+
+  @Test
+  public void monthname() {
+    String query = "SELECT MONTHNAME(creationDate) FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(scriptContainsString(scriptField, "doc['creationDate'].value.month"));
+  }
+
+  @Test
+  public void timestamp() {
+    String query = "SELECT TIMESTAMP(creationDate) FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(
+        scriptContainsString(scriptField, "DateTimeFormatter.ofPattern('yyyy-MM-dd HH:mm:ss')"));
+  }
+
+  @Test
+  public void maketime() {
+    String query = "SELECT MAKETIME(1, 1, 1) FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(
+        scriptContainsString(
+            scriptField, "LocalTime.of(1, 1, 1).format(DateTimeFormatter.ofPattern('HH:mm:ss'))"));
+  }
+
+  @Test
+  public void now() {
+    String query = "SELECT NOW() FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(scriptContainsString(scriptField, "System.currentTimeMillis()"));
+  }
+
+  @Test
+  public void curdate() {
+    String query = "SELECT CURDATE() FROM dates";
+    ScriptField scriptField = getScriptFieldFromQuery(query);
+    assertTrue(scriptContainsString(scriptField, "System.currentTimeMillis()"));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/ErrorMessageFactoryTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/ErrorMessageFactoryTest.java
index 50b69d349b..09cd9e9efc 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/ErrorMessageFactoryTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/ErrorMessageFactoryTest.java
@@ -3,48 +3,51 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.opensearch.OpenSearchException;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.sql.legacy.executor.format.ErrorMessage;
 import org.opensearch.sql.legacy.executor.format.ErrorMessageFactory;
 import org.opensearch.sql.legacy.executor.format.OpenSearchErrorMessage;
 
 public class ErrorMessageFactoryTest {
 
-    private Throwable nonOpenSearchThrowable = new Throwable();
-    private Throwable openSearchThrowable = new OpenSearchException(nonOpenSearchThrowable);
-
-    @Test
-    public void openSearchExceptionShouldCreateEsErrorMessage() {
-        Exception exception = new OpenSearchException(nonOpenSearchThrowable);
-        ErrorMessage msg = ErrorMessageFactory.createErrorMessage(exception, RestStatus.BAD_REQUEST.getStatus());
-        Assert.assertTrue(msg instanceof OpenSearchErrorMessage);
-    }
-
-    @Test
-    public void nonOpenSearchExceptionShouldCreateGenericErrorMessage() {
-        Exception exception = new Exception(nonOpenSearchThrowable);
-        ErrorMessage msg = ErrorMessageFactory.createErrorMessage(exception, RestStatus.BAD_REQUEST.getStatus());
-        Assert.assertFalse(msg instanceof OpenSearchErrorMessage);
-    }
-
-    @Test
-    public void nonOpenSearchExceptionWithWrappedEsExceptionCauseShouldCreateEsErrorMessage() {
-        Exception exception = (Exception) openSearchThrowable;
-        ErrorMessage msg = ErrorMessageFactory.createErrorMessage(exception, RestStatus.BAD_REQUEST.getStatus());
-        Assert.assertTrue(msg instanceof OpenSearchErrorMessage);
-    }
-
-    @Test
-    public void nonOpenSearchExceptionWithMultiLayerWrappedEsExceptionCauseShouldCreateEsErrorMessage() {
-        Exception exception = new Exception(new Throwable(new Throwable(openSearchThrowable)));
-        ErrorMessage msg = ErrorMessageFactory.createErrorMessage(exception, RestStatus.BAD_REQUEST.getStatus());
-        Assert.assertTrue(msg instanceof OpenSearchErrorMessage);
-    }
-
+  private Throwable nonOpenSearchThrowable = new Throwable();
+  private Throwable openSearchThrowable = new OpenSearchException(nonOpenSearchThrowable);
+
+  @Test
+  public void openSearchExceptionShouldCreateEsErrorMessage() {
+    Exception exception = new OpenSearchException(nonOpenSearchThrowable);
+    ErrorMessage msg =
+        ErrorMessageFactory.createErrorMessage(exception, RestStatus.BAD_REQUEST.getStatus());
+    Assert.assertTrue(msg instanceof OpenSearchErrorMessage);
+  }
+
+  @Test
+  public void nonOpenSearchExceptionShouldCreateGenericErrorMessage() {
+    Exception exception = new Exception(nonOpenSearchThrowable);
+    ErrorMessage msg =
+        ErrorMessageFactory.createErrorMessage(exception, RestStatus.BAD_REQUEST.getStatus());
+    Assert.assertFalse(msg instanceof OpenSearchErrorMessage);
+  }
+
+  @Test
+  public void nonOpenSearchExceptionWithWrappedEsExceptionCauseShouldCreateEsErrorMessage() {
+    Exception exception = (Exception) openSearchThrowable;
+    ErrorMessage msg =
+        ErrorMessageFactory.createErrorMessage(exception, RestStatus.BAD_REQUEST.getStatus());
+    Assert.assertTrue(msg instanceof OpenSearchErrorMessage);
+  }
+
+  @Test
+  public void
+      nonOpenSearchExceptionWithMultiLayerWrappedEsExceptionCauseShouldCreateEsErrorMessage() {
+    Exception exception = new Exception(new Throwable(new Throwable(openSearchThrowable)));
+    ErrorMessage msg =
+        ErrorMessageFactory.createErrorMessage(exception, RestStatus.BAD_REQUEST.getStatus());
+    Assert.assertTrue(msg instanceof OpenSearchErrorMessage);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/FormatTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/FormatTest.java
index 5a13125013..deb7b5f600 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/FormatTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/FormatTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static org.junit.Assert.assertEquals;
@@ -16,15 +15,15 @@
 
 public class FormatTest {
 
-    @Test
-    public void ofJdbcShouldReturnJDBCFormat() {
-        Optional<Format> format = Format.of(Format.JDBC.getFormatName());
-        assertTrue(format.isPresent());
-        assertEquals(Format.JDBC, format.get());
-    }
+  @Test
+  public void ofJdbcShouldReturnJDBCFormat() {
+    Optional<Format> format = Format.of(Format.JDBC.getFormatName());
+    assertTrue(format.isPresent());
+    assertEquals(Format.JDBC, format.get());
+  }
 
-    @Test
-    public void ofUnknownFormatShouldReturnEmpty() {
-        assertFalse(Format.of("xml").isPresent());
-    }
+  @Test
+  public void ofUnknownFormatShouldReturnEmpty() {
+    assertFalse(Format.of("xml").isPresent());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/HavingTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/HavingTest.java
index 9630c28d07..8863af0463 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/HavingTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/HavingTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static java.util.stream.Collectors.toMap;
@@ -35,361 +34,277 @@
 import org.opensearch.sql.legacy.query.maker.AggMaker;
 import org.opensearch.sql.legacy.util.SqlParserUtils;
 
-
 public class HavingTest {
 
-    private static final String SELECT_CNT = "SELECT COUNT(*) as c ";
-    private static final String SELECT_CNT_AVG = "SELECT COUNT(*) as c, AVG(age) as a ";
-    private static final String SELECT_CNT_AVG_SUM = "SELECT COUNT(*) as c, AVG(age) as a, SUM(income) as i ";
-    private static final String FROM_BANK = "FROM bank ";
-    private static final String GROUP_BY_AGE = "GROUP BY age ";
-    private static final String SELECT_CNT_FROM_BANK_GROUP_BY_AGE = SELECT_CNT + FROM_BANK + GROUP_BY_AGE;
-    private static final String SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE = SELECT_CNT_AVG + FROM_BANK + GROUP_BY_AGE;
-    private static final String SELECT_CNT_AVG_SUM_FROM_BANK_GROUP_BY_AGE = SELECT_CNT_AVG_SUM + FROM_BANK + GROUP_BY_AGE;
-    private static final String NESTED_SELECT_COUNT = "SELECT COUNT(nested(income, 'income')) as c ";
-    private static final String NESTED_SELECT_CNT_FROM_BANK_GROUP_BY_AGE = NESTED_SELECT_COUNT + FROM_BANK + GROUP_BY_AGE;
-
-    @Test
-    public void singleCondition() {
-        assertThat(
-            query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a > 30"),
-            contains(
-                bucketSelector(
-                    hasBucketPath("c: c", "a: a"),
-                    hasScript("params.a > 30")
-                )
-            ));
-    }
-
-    @Ignore
-    @Test
-    public void singleConditionWithTwoAggExpr() {
-        assertThat(
-                query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a > c"),
-                contains(
-                        bucketSelector(
-                                hasBucketPath("c: c", "a: a"),
-                                hasScript("params.a > params.c")
-                        )
-                ));
-    }
-
-    @Test
-    public void singleConditionWithHavingAgg() {
-        assertThat(
-                query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(age) > 30"),
-                contains(
-                        bucketSelector(
-                                hasBucketPath("c: c", "a: a", "avg_0: avg_0"),
-                                hasScript("params.avg_0 > 30")
-                        )
-                ));
-    }
-
-    @Ignore
-    @Test
-    public void singleConditionWithHavingTwoAggExpr() {
-        assertThat(
-                query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(age) > COUNT(*)"),
-                contains(
-                        bucketSelector(
-                                hasBucketPath("c: c", "a: a", "avg_0: avg_0", "count_0: count_0"),
-                                hasScript("params.avg_0 > count_0")
-                        )
-                ));
-    }
-
-    @Test
-    public void nestedSingleCondition() {
-        assertThat(
-                query(NESTED_SELECT_CNT_FROM_BANK_GROUP_BY_AGE + "HAVING c > 30"),
-                contains(
-                        bucketSelector(
-                                hasBucketPath("c: income@NESTED.c"),
-                                hasScript("params.c > 30")
-                        )
-                ));
-    }
-
-    @Test
-    public void singleConditionWithOneFieldInSelect() {
-        assertThat(
-            query(SELECT_CNT_FROM_BANK_GROUP_BY_AGE + "HAVING a > 30"),
-            contains(
-                bucketSelector(
-                    hasBucketPath("c: c")
-                )
-            ));
-    }
-
-    @Test
-    public void singleConditionWithOneFieldInSelectWithHavingAgg() {
-        assertThat(
-                query(SELECT_CNT_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) > 30"),
-                contains(
-                        bucketSelector(
-                                hasBucketPath("c: c", "avg_0: avg_0"),
-                                hasScript("params.avg_0 > 30")
-                        )
-                ));
-    }
-
-    @Test
-    public void singleConditionWithThreeFieldsInSelect() {
-        assertThat(
-            query(SELECT_CNT_AVG_SUM_FROM_BANK_GROUP_BY_AGE + "HAVING a > 30"),
-            contains(
-                bucketSelector(
-                    hasBucketPath("c: c", "a: a", "i: i")
-                )
-            ));
-    }
-
-    @Test
-    public void singleConditionWithThreeFieldsInSelectWithHavingAgg() {
-        assertThat(
-                query(SELECT_CNT_AVG_SUM_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) > 30"),
-                contains(
-                        bucketSelector(
-                                hasBucketPath("c: c", "a: a", "i: i", "avg_0: avg_0"),
-                                hasScript("params.avg_0 > 30")
-                        )
-                ));
-    }
-
-    @Test
-    public void notEqualCondition() {
-        assertThat(
-            query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a <> 30"),
-            contains(
-                bucketSelector(
-                    hasScript("params.a != 30")
-                )
-            ));
-    }
-
-    @Test
-    public void notEqualConditionWithHavingAgg() {
-        assertThat(
-                query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) <> 30"),
-                contains(
-                        bucketSelector(
-                                hasScript("params.avg_0 != 30")
-                        )
-                ));
-    }
-
-    @Test
-    public void notCondition() {
-        assertThat(
-            query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING NOT (a > 30)"),
-            contains(
-                bucketSelector(
-                    hasScript("params.a <= 30")
-                )
-            ));
-    }
-
-    @Test
-    public void notConditionWithHavingAgg() {
-        assertThat(
-                query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING NOT (AVG(a) > 30)"),
-                contains(
-                        bucketSelector(
-                                hasScript("params.avg_0 <= 30")
-                        )
-                ));
-    }
-
-    @Test
-    public void andConditions() {
-        assertThat(
-            query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a > 30 AND c <= 10"),
-            contains(
-                bucketSelector(
-                    hasScript("params.a > 30 && params.c <= 10")
-                )
-            ));
-    }
-
-    @Test
-    public void andConditionsWithHavingAgg() {
-        assertThat(
-                query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) > 30 AND SUM(c) <= 10"),
-                contains(
-                        bucketSelector(
-                                hasScript("params.avg_0 > 30 && params.sum_1 <= 10")
-                        )
-                ));
-    }
-
-    @Test
-    public void orConditions() {
-        assertThat(
-            query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a > 30 OR c <= 10"),
-            contains(
-                bucketSelector(
-                    hasScript("params.a > 30 || params.c <= 10")
-                )
-            ));
-    }
-
-    @Test
-    public void orConditionsWithHavingAgg() {
-        assertThat(
-                query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) > 30 OR SUM(c) <= 10"),
-                contains(
-                        bucketSelector(
-                                hasScript("params.avg_0 > 30 || params.sum_1 <= 10")
-                        )
-                ));
-    }
-
-    @Test
-    public void betweenCondition() {
-        assertThat(
-            query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a BETWEEN 30 AND 50"),
-            contains(
-                bucketSelector(
-                    hasScript("params.a >= 30 && params.a <= 50")
-                )
-            ));
-    }
-
-    @Test
-    public void betweenConditionWithHavingAgg() {
-        assertThat(
-                query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) BETWEEN 30 AND 50"),
-                contains(
-                        bucketSelector(
-                                hasScript("params.avg_0 >= 30 && params.avg_0 <= 50")
-                        )
-                ));
-    }
-
-    @Test
-    public void notBetweenCondition() {
-        assertThat(
-            query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a NOT BETWEEN 30 AND 50"),
-            contains(
-                bucketSelector(
-                    hasScript("params.a < 30 || params.a > 50")
-                )
-            ));
-    }
-
-    @Test
-    public void notBetweenConditionWithHavingAgg() {
-        assertThat(
-                query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) NOT BETWEEN 30 AND 50"),
-                contains(
-                        bucketSelector(
-                                hasScript("params.avg_0 < 30 || params.avg_0 > 50")
-                        )
-                ));
-    }
-
-    @Test
-    public void inCondition() {
-        assertThat(
-            query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a IN (30, 40, 50)"),
-            contains(
-                bucketSelector(
-                    hasScript("params.a == 30 || params.a == 40 || params.a == 50")
-                )
-            ));
-    }
-
-    @Test
-    public void inConditionWithHavingAgg() {
-        assertThat(
-                query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) IN (30, 40, 50)"),
-                contains(
-                        bucketSelector(
-                                hasScript("params.avg_0 == 30 || params.avg_0 == 40 || params.avg_0 == 50")
-                        )
-                ));
-    }
-
-    @Test
-    public void notInCondition() {
-        assertThat(
-            query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a NOT IN (30, 40, 50)"),
-            contains(
-                bucketSelector(
-                    hasScript("params.a != 30 && params.a != 40 && params.a != 50")
-                )
-            ));
-    }
-
-    @Test
-    public void notInConditionWithHavingAgg() {
-        assertThat(
-                query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) NOT IN (30, 40, 50)"),
-                contains(
-                        bucketSelector(
-                                hasScript("params.avg_0 != 30 && params.avg_0 != 40 && params.avg_0 != 50")
-                        )
-                ));
-    }
-
-    @Test
-    public void nestedConditions() {
-        assertThat(
-            query(SELECT_CNT_AVG_SUM_FROM_BANK_GROUP_BY_AGE + "HAVING i <= 10000 OR NOT (a < 10 OR a > 30) AND c <= 10"),
-            contains(
-                bucketSelector(
-                    hasScript("params.i <= 10000 || ((params.a >= 10 && params.a <= 30) && params.c <= 10)")
-                )
-            ));
-    }
-
-    @Test(expected = ParserException.class)
-    public void aggregationFunctionOnTheRight() {
-        query(SELECT_CNT_AVG_SUM_FROM_BANK_GROUP_BY_AGE + "HAVING 10 < a");
-    }
-
-    private Collection<PipelineAggregationBuilder> query(String sql) {
-        return translate(SqlParserUtils.parse(sql));
-    }
-
-    private Collection<PipelineAggregationBuilder> translate(SQLQueryExpr expr) {
-        try {
-            Select select = new SqlParser().parseSelect(expr);
-            select.getFields().forEach(field -> {
+  private static final String SELECT_CNT = "SELECT COUNT(*) as c ";
+  private static final String SELECT_CNT_AVG = "SELECT COUNT(*) as c, AVG(age) as a ";
+  private static final String SELECT_CNT_AVG_SUM =
+      "SELECT COUNT(*) as c, AVG(age) as a, SUM(income) as i ";
+  private static final String FROM_BANK = "FROM bank ";
+  private static final String GROUP_BY_AGE = "GROUP BY age ";
+  private static final String SELECT_CNT_FROM_BANK_GROUP_BY_AGE =
+      SELECT_CNT + FROM_BANK + GROUP_BY_AGE;
+  private static final String SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE =
+      SELECT_CNT_AVG + FROM_BANK + GROUP_BY_AGE;
+  private static final String SELECT_CNT_AVG_SUM_FROM_BANK_GROUP_BY_AGE =
+      SELECT_CNT_AVG_SUM + FROM_BANK + GROUP_BY_AGE;
+  private static final String NESTED_SELECT_COUNT = "SELECT COUNT(nested(income, 'income')) as c ";
+  private static final String NESTED_SELECT_CNT_FROM_BANK_GROUP_BY_AGE =
+      NESTED_SELECT_COUNT + FROM_BANK + GROUP_BY_AGE;
+
+  @Test
+  public void singleCondition() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a > 30"),
+        contains(bucketSelector(hasBucketPath("c: c", "a: a"), hasScript("params.a > 30"))));
+  }
+
+  @Ignore
+  @Test
+  public void singleConditionWithTwoAggExpr() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a > c"),
+        contains(bucketSelector(hasBucketPath("c: c", "a: a"), hasScript("params.a > params.c"))));
+  }
+
+  @Test
+  public void singleConditionWithHavingAgg() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(age) > 30"),
+        contains(
+            bucketSelector(
+                hasBucketPath("c: c", "a: a", "avg_0: avg_0"), hasScript("params.avg_0 > 30"))));
+  }
+
+  @Ignore
+  @Test
+  public void singleConditionWithHavingTwoAggExpr() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(age) > COUNT(*)"),
+        contains(
+            bucketSelector(
+                hasBucketPath("c: c", "a: a", "avg_0: avg_0", "count_0: count_0"),
+                hasScript("params.avg_0 > count_0"))));
+  }
+
+  @Test
+  public void nestedSingleCondition() {
+    assertThat(
+        query(NESTED_SELECT_CNT_FROM_BANK_GROUP_BY_AGE + "HAVING c > 30"),
+        contains(bucketSelector(hasBucketPath("c: income@NESTED.c"), hasScript("params.c > 30"))));
+  }
+
+  @Test
+  public void singleConditionWithOneFieldInSelect() {
+    assertThat(
+        query(SELECT_CNT_FROM_BANK_GROUP_BY_AGE + "HAVING a > 30"),
+        contains(bucketSelector(hasBucketPath("c: c"))));
+  }
+
+  @Test
+  public void singleConditionWithOneFieldInSelectWithHavingAgg() {
+    assertThat(
+        query(SELECT_CNT_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) > 30"),
+        contains(
+            bucketSelector(hasBucketPath("c: c", "avg_0: avg_0"), hasScript("params.avg_0 > 30"))));
+  }
+
+  @Test
+  public void singleConditionWithThreeFieldsInSelect() {
+    assertThat(
+        query(SELECT_CNT_AVG_SUM_FROM_BANK_GROUP_BY_AGE + "HAVING a > 30"),
+        contains(bucketSelector(hasBucketPath("c: c", "a: a", "i: i"))));
+  }
+
+  @Test
+  public void singleConditionWithThreeFieldsInSelectWithHavingAgg() {
+    assertThat(
+        query(SELECT_CNT_AVG_SUM_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) > 30"),
+        contains(
+            bucketSelector(
+                hasBucketPath("c: c", "a: a", "i: i", "avg_0: avg_0"),
+                hasScript("params.avg_0 > 30"))));
+  }
+
+  @Test
+  public void notEqualCondition() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a <> 30"),
+        contains(bucketSelector(hasScript("params.a != 30"))));
+  }
+
+  @Test
+  public void notEqualConditionWithHavingAgg() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) <> 30"),
+        contains(bucketSelector(hasScript("params.avg_0 != 30"))));
+  }
+
+  @Test
+  public void notCondition() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING NOT (a > 30)"),
+        contains(bucketSelector(hasScript("params.a <= 30"))));
+  }
+
+  @Test
+  public void notConditionWithHavingAgg() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING NOT (AVG(a) > 30)"),
+        contains(bucketSelector(hasScript("params.avg_0 <= 30"))));
+  }
+
+  @Test
+  public void andConditions() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a > 30 AND c <= 10"),
+        contains(bucketSelector(hasScript("params.a > 30 && params.c <= 10"))));
+  }
+
+  @Test
+  public void andConditionsWithHavingAgg() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) > 30 AND SUM(c) <= 10"),
+        contains(bucketSelector(hasScript("params.avg_0 > 30 && params.sum_1 <= 10"))));
+  }
+
+  @Test
+  public void orConditions() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a > 30 OR c <= 10"),
+        contains(bucketSelector(hasScript("params.a > 30 || params.c <= 10"))));
+  }
+
+  @Test
+  public void orConditionsWithHavingAgg() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) > 30 OR SUM(c) <= 10"),
+        contains(bucketSelector(hasScript("params.avg_0 > 30 || params.sum_1 <= 10"))));
+  }
+
+  @Test
+  public void betweenCondition() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a BETWEEN 30 AND 50"),
+        contains(bucketSelector(hasScript("params.a >= 30 && params.a <= 50"))));
+  }
+
+  @Test
+  public void betweenConditionWithHavingAgg() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) BETWEEN 30 AND 50"),
+        contains(bucketSelector(hasScript("params.avg_0 >= 30 && params.avg_0 <= 50"))));
+  }
+
+  @Test
+  public void notBetweenCondition() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a NOT BETWEEN 30 AND 50"),
+        contains(bucketSelector(hasScript("params.a < 30 || params.a > 50"))));
+  }
+
+  @Test
+  public void notBetweenConditionWithHavingAgg() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) NOT BETWEEN 30 AND 50"),
+        contains(bucketSelector(hasScript("params.avg_0 < 30 || params.avg_0 > 50"))));
+  }
+
+  @Test
+  public void inCondition() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a IN (30, 40, 50)"),
+        contains(bucketSelector(hasScript("params.a == 30 || params.a == 40 || params.a == 50"))));
+  }
+
+  @Test
+  public void inConditionWithHavingAgg() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) IN (30, 40, 50)"),
+        contains(
+            bucketSelector(
+                hasScript("params.avg_0 == 30 || params.avg_0 == 40 || params.avg_0 == 50"))));
+  }
+
+  @Test
+  public void notInCondition() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING a NOT IN (30, 40, 50)"),
+        contains(bucketSelector(hasScript("params.a != 30 && params.a != 40 && params.a != 50"))));
+  }
+
+  @Test
+  public void notInConditionWithHavingAgg() {
+    assertThat(
+        query(SELECT_CNT_AVG_FROM_BANK_GROUP_BY_AGE + "HAVING AVG(a) NOT IN (30, 40, 50)"),
+        contains(
+            bucketSelector(
+                hasScript("params.avg_0 != 30 && params.avg_0 != 40 && params.avg_0 != 50"))));
+  }
+
+  @Test
+  public void nestedConditions() {
+    assertThat(
+        query(
+            SELECT_CNT_AVG_SUM_FROM_BANK_GROUP_BY_AGE
+                + "HAVING i <= 10000 OR NOT (a < 10 OR a > 30) AND c <= 10"),
+        contains(
+            bucketSelector(
+                hasScript(
+                    "params.i <= 10000 || ((params.a >= 10 && params.a <= 30) && params.c <="
+                        + " 10)"))));
+  }
+
+  @Test(expected = ParserException.class)
+  public void aggregationFunctionOnTheRight() {
+    query(SELECT_CNT_AVG_SUM_FROM_BANK_GROUP_BY_AGE + "HAVING 10 < a");
+  }
+
+  private Collection<PipelineAggregationBuilder> query(String sql) {
+    return translate(SqlParserUtils.parse(sql));
+  }
+
+  private Collection<PipelineAggregationBuilder> translate(SQLQueryExpr expr) {
+    try {
+      Select select = new SqlParser().parseSelect(expr);
+      select
+          .getFields()
+          .forEach(
+              field -> {
                 try {
-                    new AggMaker()
-                            .withWhere(select.getWhere())
-                            .makeFieldAgg((MethodField) field, AggregationBuilders.terms(""));
+                  new AggMaker()
+                      .withWhere(select.getWhere())
+                      .makeFieldAgg((MethodField) field, AggregationBuilders.terms(""));
                 } catch (SqlParseException e) {
-                    throw new RuntimeException(e);
+                  throw new RuntimeException(e);
                 }
-            });
-            AggregationBuilder agg = AggregationBuilders.terms("");
-            select.getHaving().explain(agg, select.getFields());
-            return agg.getPipelineAggregations();
-        } catch (SqlParseException e) {
-            throw new ParserException("Illegal sql expr: " + expr.toString());
-        }
-    }
-
-    @SafeVarargs
-    private final Matcher<PipelineAggregationBuilder> bucketSelector(Matcher<PipelineAggregationBuilder>... matchers) {
-        return both(Matchers.<PipelineAggregationBuilder>   // instanceOf() has type inference problem
-                    instanceOf(BucketSelectorPipelineAggregationBuilder.class)
-               ).
-               and(allOf(matchers));
-    }
-
-    private Matcher<PipelineAggregationBuilder> hasBucketPath(String... expectedBucketPath) {
-        Map<String, String> expectedMap = Arrays.stream(expectedBucketPath).
-                                                 map(e -> e.split(":")).
-                                                 collect(toMap(e -> e[0].trim(), e -> e[1].trim()));
-        return hasFieldWithValue("bucketsPathsMap", "has bucket path", is(expectedMap));
-    }
-
-    private Matcher<PipelineAggregationBuilder> hasScript(String expectedCode) {
-        return hasFieldWithValue("script", "has script", is(new Script(expectedCode)));
-    }
+              });
+      AggregationBuilder agg = AggregationBuilders.terms("");
+      select.getHaving().explain(agg, select.getFields());
+      return agg.getPipelineAggregations();
+    } catch (SqlParseException e) {
+      throw new ParserException("Illegal sql expr: " + expr.toString());
+    }
+  }
+
+  @SafeVarargs
+  private final Matcher<PipelineAggregationBuilder> bucketSelector(
+      Matcher<PipelineAggregationBuilder>... matchers) {
+    return both(Matchers
+            .<PipelineAggregationBuilder> // instanceOf() has type inference problem
+                instanceOf(BucketSelectorPipelineAggregationBuilder.class))
+        .and(allOf(matchers));
+  }
+
+  private Matcher<PipelineAggregationBuilder> hasBucketPath(String... expectedBucketPath) {
+    Map<String, String> expectedMap =
+        Arrays.stream(expectedBucketPath)
+            .map(e -> e.split(":"))
+            .collect(toMap(e -> e[0].trim(), e -> e[1].trim()));
+    return hasFieldWithValue("bucketsPathsMap", "has bucket path", is(expectedMap));
+  }
+
+  private Matcher<PipelineAggregationBuilder> hasScript(String expectedCode) {
+    return hasFieldWithValue("script", "has script", is(new Script(expectedCode)));
+  }
 }
-
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/JSONRequestTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/JSONRequestTest.java
index f546f3571a..94f1890efc 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/JSONRequestTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/JSONRequestTest.java
@@ -3,15 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -24,9 +22,7 @@
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockedStatic;
@@ -52,360 +48,461 @@
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class JSONRequestTest {
 
-    @Mock
-    private ColumnTypeProvider columnTypeProvider;
-
-    @Before
-    public void setup() {
-        when(columnTypeProvider.get(anyInt())).thenReturn(Schema.Type.DOUBLE);
-    }
-
-    @Test
-    public void aggWithoutWhere() {
-        String explainSQL = explainSQL("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                                       "FROM employee " +
-                                       "GROUP BY name " +
-                                       "HAVING c > 1");
-        assertThat(explainSQL, containsString(
-                "\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"c\":{\"value_count\":{\"field\":\"_index\"}}}"));
-        assertThat(explainSQL, containsString(
-                "\"buckets_path\":{\"c\":\"projects@NESTED.c\"}"));
-    }
-
-    @Test
-    public void aggWithWhereOnParent() {
-        String explainSQL = explainSQL("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                                       "FROM employee " +
-                                       "WHERE name LIKE '%smith%' " +
-                                       "GROUP BY name " +
-                                       "HAVING c > 1");
-
-        assertThat(explainSQL, containsString(
-                "\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"c\":{\"value_count\":{\"field\":\"_index\"}}}}"));
-        assertThat(explainSQL, containsString(
-                "\"buckets_path\":{\"c\":\"projects@NESTED.c\"}"));
-    }
-
-    @Test
-    public void aggWithWhereOnNested() {
-        String explainSQL = explainSQL("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                                       "FROM employee " +
-                                       "WHERE nested(projects.name, 'projects') LIKE '%security%' " +
-                                       "GROUP BY name " +
-                                       "HAVING c > 1");
-
-        assertThat(explainSQL, containsString("\"aggregations\":{\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"projects@FILTER\":{\"filter\":{\"bool\":{\"must\":[{\"wildcard\":{\"projects.name\":{\"wildcard\":\"*security*\",\"boost\":1.0}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"aggregations\":{\"c\":{\"value_count\":{\"field\":\"_index\"}}}}}}"));
-        assertThat(explainSQL, containsString("\"buckets_path\":{\"c\":\"projects@NESTED>projects@FILTER.c\"}"));
-    }
-
-    @Test
-    public void aggWithWhereOnParentOrNested() {
-        String explainSQL = explainSQL("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                                       "FROM employee " +
-                                       "WHERE name LIKE '%smith%' OR nested(projects.name, 'projects') LIKE '%security%' " +
-                                       "GROUP BY name " +
-                                       "HAVING c > 1");
-        assertThat(explainSQL, containsString(
-                "\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"c\":{\"value_count\":{\"field\":\"_index\"}}}}"));
-        assertThat(explainSQL, containsString(
-                "\"buckets_path\":{\"c\":\"projects@NESTED.c\"}"));
-    }
-
-    @Test
-    public void aggWithWhereOnParentAndNested() {
-        String explainSQL = explainSQL("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                                       "FROM employee " +
-                                       "WHERE name LIKE '%smith%' AND nested(projects.name, 'projects') LIKE '%security%' " +
-                                       "GROUP BY name " +
-                                       "HAVING c > 1");
-        assertThat(explainSQL, containsString(
-                "\"aggregations\":{\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"projects@FILTER\":{\"filter\":{\"bool\":{\"must\":[{\"wildcard\":{\"projects.name\":{\"wildcard\":\"*security*\",\"boost\":1.0}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"aggregations\":{\"c\":{\"value_count\":{\"field\":\"_index\"}}}}}"));
-        assertThat(explainSQL, containsString("\"buckets_path\":{\"c\":\"projects@NESTED>projects@FILTER.c\"}"));
-    }
-
-    @Test
-    public void aggWithWhereOnNestedAndNested() {
-        String explainSQL = explainSQL("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                                       "FROM employee " +
-                                       "WHERE nested('projects', projects.started_year > 2000 AND projects.name LIKE '%security%') " +
-                                       "GROUP BY name " +
-                                       "HAVING c > 1");
-        assertThat(explainSQL, containsString("\"aggregations\":{\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"projects@FILTER\":{\"filter\":{\"bool\":{\"must\":[{\"bool\":{\"must\":[{\"range\":{\"projects.started_year\":{\"from\":2000,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},{\"wildcard\":{\"projects.name\":{\"wildcard\":\"*security*\",\"boost\":1.0}}}"));
-        assertThat(explainSQL, containsString("\"buckets_path\":{\"c\":\"projects@NESTED>projects@FILTER.c\"}"));
-    }
-
-    @Test
-    public void aggWithWhereOnNestedOrNested() {
-        String explainSQL = explainSQL("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                                       "FROM employee " +
-                                       "WHERE nested('projects', projects.started_year > 2000 OR projects.name LIKE '%security%') " +
-                                       "GROUP BY name " +
-                                       "HAVING c > 1");
-        assertThat(explainSQL, containsString("\"aggregations\":{\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"projects@FILTER\":{\"filter\":{\"bool\":{\"must\":[{\"bool\":{\"should\":[{\"range\":{\"projects.started_year\":{\"from\":2000,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},{\"wildcard\":{\"projects.name\":{\"wildcard\":\"*security*\",\"boost\":1.0}}}"));
-        assertThat(explainSQL, containsString("\"buckets_path\":{\"c\":\"projects@NESTED>projects@FILTER.c\"}"));
-    }
-
-    @Test
-    public void aggInHavingWithoutWhere() {
-        JSONObject explainSQL = explainSQLToJson("SELECT name " +
-                                                 "FROM employee " +
-                                                 "GROUP BY name " +
-                                                 "HAVING COUNT(nested(projects, 'projects')) > 1");
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/projects@NESTED/aggregations/count_0/value_count"),
-                equalTo("{\"field\":\"_index\"}"));
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
-                equalTo("{\"count_0\":\"projects@NESTED.count_0\"}"));
-    }
-
-    @Test
-    public void aggInHavingWithWhereOnParent() {
-        JSONObject explainSQL = explainSQLToJson("SELECT name " +
-                                                 "FROM employee " +
-                                                 "WHERE name LIKE '%smith%' " +
-                                                 "GROUP BY name " +
-                                                 "HAVING COUNT(nested(projects, 'projects')) > 1");
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/projects@NESTED/aggregations/count_0/value_count"),
-                equalTo("{\"field\":\"_index\"}"));
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
-                equalTo("{\"count_0\":\"projects@NESTED.count_0\"}"));
+  @Mock private ColumnTypeProvider columnTypeProvider;
+
+  @Before
+  public void setup() {
+    when(columnTypeProvider.get(anyInt())).thenReturn(Schema.Type.DOUBLE);
+  }
+
+  @Test
+  public void aggWithoutWhere() {
+    String explainSQL =
+        explainSQL(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c "
+                + "FROM employee "
+                + "GROUP BY name "
+                + "HAVING c > 1");
+    assertThat(
+        explainSQL,
+        containsString(
+            "\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"c\":{\"value_count\":{\"field\":\"_index\"}}}"));
+    assertThat(explainSQL, containsString("\"buckets_path\":{\"c\":\"projects@NESTED.c\"}"));
+  }
+
+  @Test
+  public void aggWithWhereOnParent() {
+    String explainSQL =
+        explainSQL(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c "
+                + "FROM employee "
+                + "WHERE name LIKE '%smith%' "
+                + "GROUP BY name "
+                + "HAVING c > 1");
+
+    assertThat(
+        explainSQL,
+        containsString(
+            "\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"c\":{\"value_count\":{\"field\":\"_index\"}}}}"));
+    assertThat(explainSQL, containsString("\"buckets_path\":{\"c\":\"projects@NESTED.c\"}"));
+  }
+
+  @Test
+  public void aggWithWhereOnNested() {
+    String explainSQL =
+        explainSQL(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c "
+                + "FROM employee "
+                + "WHERE nested(projects.name, 'projects') LIKE '%security%' "
+                + "GROUP BY name "
+                + "HAVING c > 1");
+
+    assertThat(
+        explainSQL,
+        containsString(
+            "\"aggregations\":{\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"projects@FILTER\":{\"filter\":{\"bool\":{\"must\":[{\"wildcard\":{\"projects.name\":{\"wildcard\":\"*security*\",\"boost\":1.0}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"aggregations\":{\"c\":{\"value_count\":{\"field\":\"_index\"}}}}}}"));
+    assertThat(
+        explainSQL,
+        containsString("\"buckets_path\":{\"c\":\"projects@NESTED>projects@FILTER.c\"}"));
+  }
+
+  @Test
+  public void aggWithWhereOnParentOrNested() {
+    String explainSQL =
+        explainSQL(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c FROM employee WHERE name LIKE"
+                + " '%smith%' OR nested(projects.name, 'projects') LIKE '%security%' GROUP BY name"
+                + " HAVING c > 1");
+    assertThat(
+        explainSQL,
+        containsString(
+            "\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"c\":{\"value_count\":{\"field\":\"_index\"}}}}"));
+    assertThat(explainSQL, containsString("\"buckets_path\":{\"c\":\"projects@NESTED.c\"}"));
+  }
+
+  @Test
+  public void aggWithWhereOnParentAndNested() {
+    String explainSQL =
+        explainSQL(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c FROM employee WHERE name LIKE"
+                + " '%smith%' AND nested(projects.name, 'projects') LIKE '%security%' GROUP BY name"
+                + " HAVING c > 1");
+    assertThat(
+        explainSQL,
+        containsString(
+            "\"aggregations\":{\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"projects@FILTER\":{\"filter\":{\"bool\":{\"must\":[{\"wildcard\":{\"projects.name\":{\"wildcard\":\"*security*\",\"boost\":1.0}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"aggregations\":{\"c\":{\"value_count\":{\"field\":\"_index\"}}}}}"));
+    assertThat(
+        explainSQL,
+        containsString("\"buckets_path\":{\"c\":\"projects@NESTED>projects@FILTER.c\"}"));
+  }
+
+  @Test
+  public void aggWithWhereOnNestedAndNested() {
+    String explainSQL =
+        explainSQL(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c FROM employee WHERE"
+                + " nested('projects', projects.started_year > 2000 AND projects.name LIKE"
+                + " '%security%') GROUP BY name HAVING c > 1");
+    assertThat(
+        explainSQL,
+        containsString(
+            "\"aggregations\":{\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"projects@FILTER\":{\"filter\":{\"bool\":{\"must\":[{\"bool\":{\"must\":[{\"range\":{\"projects.started_year\":{\"from\":2000,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},{\"wildcard\":{\"projects.name\":{\"wildcard\":\"*security*\",\"boost\":1.0}}}"));
+    assertThat(
+        explainSQL,
+        containsString("\"buckets_path\":{\"c\":\"projects@NESTED>projects@FILTER.c\"}"));
+  }
+
+  @Test
+  public void aggWithWhereOnNestedOrNested() {
+    String explainSQL =
+        explainSQL(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c FROM employee WHERE"
+                + " nested('projects', projects.started_year > 2000 OR projects.name LIKE"
+                + " '%security%') GROUP BY name HAVING c > 1");
+    assertThat(
+        explainSQL,
+        containsString(
+            "\"aggregations\":{\"projects@NESTED\":{\"nested\":{\"path\":\"projects\"},\"aggregations\":{\"projects@FILTER\":{\"filter\":{\"bool\":{\"must\":[{\"bool\":{\"should\":[{\"range\":{\"projects.started_year\":{\"from\":2000,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},{\"wildcard\":{\"projects.name\":{\"wildcard\":\"*security*\",\"boost\":1.0}}}"));
+    assertThat(
+        explainSQL,
+        containsString("\"buckets_path\":{\"c\":\"projects@NESTED>projects@FILTER.c\"}"));
+  }
+
+  @Test
+  public void aggInHavingWithoutWhere() {
+    JSONObject explainSQL =
+        explainSQLToJson(
+            "SELECT name "
+                + "FROM employee "
+                + "GROUP BY name "
+                + "HAVING COUNT(nested(projects, 'projects')) > 1");
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/projects@NESTED/aggregations/count_0/value_count"),
+        equalTo("{\"field\":\"_index\"}"));
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
+        equalTo("{\"count_0\":\"projects@NESTED.count_0\"}"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnParent() {
+    JSONObject explainSQL =
+        explainSQLToJson(
+            "SELECT name "
+                + "FROM employee "
+                + "WHERE name LIKE '%smith%' "
+                + "GROUP BY name "
+                + "HAVING COUNT(nested(projects, 'projects')) > 1");
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/projects@NESTED/aggregations/count_0/value_count"),
+        equalTo("{\"field\":\"_index\"}"));
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
+        equalTo("{\"count_0\":\"projects@NESTED.count_0\"}"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnNested() {
+    JSONObject explainSQL =
+        explainSQLToJson(
+            "SELECT name "
+                + "FROM employee "
+                + "WHERE nested(projects.name, 'projects') LIKE '%security%' "
+                + "GROUP BY name "
+                + "HAVING COUNT(nested(projects, 'projects')) > 1");
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/aggregations/count_0/value_count"),
+        equalTo("{\"field\":\"_index\"}"));
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
+        equalTo("{\"count_0\":\"projects@NESTED>projects@FILTER.count_0\"}"));
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/filter/bool/must"),
+        equalTo("[{\"wildcard\":{\"projects.name\":{\"boost\":1,\"wildcard\":\"*security*\"}}}]"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnParentOrNested() {
+    JSONObject explainSQL =
+        explainSQLToJson(
+            "SELECT name FROM employee WHERE name LIKE '%smith%' OR nested(projects.name,"
+                + " 'projects') LIKE '%security%' GROUP BY name HAVING COUNT(nested(projects,"
+                + " 'projects')) > 1");
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/projects@NESTED/aggregations/count_0/value_count"),
+        equalTo("{\"field\":\"_index\"}"));
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
+        equalTo("{\"count_0\":\"projects@NESTED.count_0\"}"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnParentAndNested() {
+    JSONObject explainSQL =
+        explainSQLToJson(
+            "SELECT name FROM employee WHERE name LIKE '%smith%' AND nested(projects.name,"
+                + " 'projects') LIKE '%security%' GROUP BY name HAVING COUNT(nested(projects,"
+                + " 'projects')) > 1");
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/aggregations/count_0/value_count"),
+        equalTo("{\"field\":\"_index\"}"));
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
+        equalTo("{\"count_0\":\"projects@NESTED>projects@FILTER.count_0\"}"));
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/filter/bool/must"),
+        equalTo("[{\"wildcard\":{\"projects.name\":{\"boost\":1,\"wildcard\":\"*security*\"}}}]"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnNestedAndNested() {
+    JSONObject explainSQL =
+        explainSQLToJson(
+            "SELECT name FROM employee WHERE nested('projects', projects.started_year > 2000 AND"
+                + " projects.name LIKE '%security%') GROUP BY name HAVING COUNT(nested(projects,"
+                + " 'projects')) > 1");
+
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/aggregations/count_0/value_count"),
+        equalTo("{\"field\":\"_index\"}"));
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
+        equalTo("{\"count_0\":\"projects@NESTED>projects@FILTER.count_0\"}"));
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/filter/bool/must"),
+        equalTo(
+            "[{\"bool\":{\"adjust_pure_negative\":true,\"must\":[{\"range\":{\"projects.started_year\":{\"include_lower\":false,\"include_upper\":true,\"from\":2000,\"boost\":1,\"to\":null}}},{\"wildcard\":{\"projects.name\":{\"boost\":1,\"wildcard\":\"*security*\"}}}],\"boost\":1}}]"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnNestedOrNested() {
+    JSONObject explainSQL =
+        explainSQLToJson(
+            "SELECT name FROM employee WHERE nested('projects', projects.started_year > 2000 OR"
+                + " projects.name LIKE '%security%') GROUP BY name HAVING COUNT(nested(projects,"
+                + " 'projects')) > 1");
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/aggregations/count_0/value_count"),
+        equalTo("{\"field\":\"_index\"}"));
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
+        equalTo("{\"count_0\":\"projects@NESTED>projects@FILTER.count_0\"}"));
+    assertThat(
+        query(
+            explainSQL,
+            "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/filter/bool/must"),
+        equalTo(
+            "[{\"bool\":{\"adjust_pure_negative\":true,\"should\":[{\"range\":{\"projects.started_year\":{\"include_lower\":false,\"include_upper\":true,\"from\":2000,\"boost\":1,\"to\":null}}},{\"wildcard\":{\"projects.name\":{\"boost\":1,\"wildcard\":\"*security*\"}}}],\"boost\":1}}]"));
+  }
+
+  @Test
+  public void searchSanity() throws IOException {
+    String result =
+        explain(
+            String.format(
+                "{\"query\":\""
+                    + "SELECT * "
+                    + "FROM %s "
+                    + "WHERE firstname LIKE 'A%%' AND age > 20 "
+                    + "GROUP BY gender "
+                    + "ORDER BY _score\"}",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    String expectedOutput =
+        Files.toString(
+                new File(
+                    getResourcePath() + "src/test/resources/expectedOutput/search_explain.json"),
+                StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
+
+    assertThat(removeSpaces(result), equalTo(removeSpaces(expectedOutput)));
+  }
+
+  // This test was ignored because group by case function is not supported
+  @Ignore
+  @Test
+  public void aggregationQuery() throws IOException {
+    String result =
+        explain(
+            String.format(
+                "{\"query\":\"SELECT address, CASE WHEN gender='0' THEN 'aaa' ELSE 'bbb' END AS"
+                    + " a2345, count(age) FROM %s GROUP BY"
+                    + " terms('field'='address','execution_hint'='global_ordinals'), a2345\"}",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    String expectedOutput =
+        Files.toString(
+                new File(
+                    getResourcePath()
+                        + "src/test/resources/expectedOutput/aggregation_query_explain.json"),
+                StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
+
+    assertThat(removeSpaces(result), equalTo(removeSpaces(expectedOutput)));
+  }
+
+  @Test
+  public void deleteSanity() throws IOException {
+    try (MockedStatic<LocalClusterState> localClusterStateMockedStatic =
+        Mockito.mockStatic(LocalClusterState.class)) {
+      LocalClusterState state = mock(LocalClusterState.class);
+      localClusterStateMockedStatic.when(LocalClusterState::state).thenReturn(state);
+      when(state.getSettingValue(any(Settings.Key.class))).thenReturn(true);
+
+      String result =
+          explain(
+              String.format(
+                  "{\"query\":\""
+                      + "DELETE "
+                      + "FROM %s "
+                      + "WHERE firstname LIKE 'A%%' AND age > 20\"}",
+                  TestsConstants.TEST_INDEX_ACCOUNT));
+      String expectedOutput =
+          Files.toString(
+                  new File(
+                      getResourcePath() + "src/test/resources/expectedOutput/delete_explain.json"),
+                  StandardCharsets.UTF_8)
+              .replaceAll("\r", "");
+      assertThat(removeSpaces(result), equalTo(removeSpaces(expectedOutput)));
     }
-
-    @Test
-    public void aggInHavingWithWhereOnNested() {
-        JSONObject explainSQL = explainSQLToJson("SELECT name " +
-                                                 "FROM employee " +
-                                                 "WHERE nested(projects.name, 'projects') LIKE '%security%' " +
-                                                 "GROUP BY name " +
-                                                 "HAVING COUNT(nested(projects, 'projects')) > 1");
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/aggregations/count_0/value_count"),
-                equalTo("{\"field\":\"_index\"}"));
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
-                equalTo("{\"count_0\":\"projects@NESTED>projects@FILTER.count_0\"}"));
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/filter/bool/must"),
-                equalTo("[{\"wildcard\":{\"projects.name\":{\"boost\":1,\"wildcard\":\"*security*\"}}}]"));
-    }
-
-    @Test
-    public void aggInHavingWithWhereOnParentOrNested() {
-        JSONObject explainSQL = explainSQLToJson("SELECT name " +
-                                                 "FROM employee " +
-                                                 "WHERE name LIKE '%smith%' OR nested(projects.name, 'projects') LIKE '%security%' " +
-                                                 "GROUP BY name " +
-                                                 "HAVING COUNT(nested(projects, 'projects')) > 1");
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/projects@NESTED/aggregations/count_0/value_count"),
-                equalTo("{\"field\":\"_index\"}"));
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
-                equalTo("{\"count_0\":\"projects@NESTED.count_0\"}"));
+  }
+
+  @Test(expected = SQLFeatureDisabledException.class)
+  public void deleteShouldThrowExceptionWhenDisabled()
+      throws SQLFeatureDisabledException, SQLFeatureNotSupportedException, SqlParseException {
+    try (MockedStatic<LocalClusterState> localClusterStateMockedStatic =
+        Mockito.mockStatic(LocalClusterState.class)) {
+      LocalClusterState state = mock(LocalClusterState.class);
+      localClusterStateMockedStatic.when(LocalClusterState::state).thenReturn(state);
+      when(state.getSettingValue(any(Settings.Key.class))).thenReturn(false);
+
+      JSONObject jsonRequest =
+          new JSONObject(
+              StringUtils.format(
+                  "{\"query\":\""
+                      + "DELETE "
+                      + "FROM %s "
+                      + "WHERE firstname LIKE 'A%%' AND age > 20\"}",
+                  TestsConstants.TEST_INDEX_ACCOUNT));
+      translate(jsonRequest.getString("query"), jsonRequest);
     }
-
-    @Test
-    public void aggInHavingWithWhereOnParentAndNested() {
-        JSONObject explainSQL = explainSQLToJson("SELECT name " +
-                                                 "FROM employee " +
-                                                 "WHERE name LIKE '%smith%' AND nested(projects.name, 'projects') LIKE '%security%' " +
-                                                 "GROUP BY name " +
-                                                 "HAVING COUNT(nested(projects, 'projects')) > 1");
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/aggregations/count_0/value_count"),
-                equalTo("{\"field\":\"_index\"}"));
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
-                equalTo("{\"count_0\":\"projects@NESTED>projects@FILTER.count_0\"}"));
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/filter/bool/must"),
-                equalTo("[{\"wildcard\":{\"projects.name\":{\"boost\":1,\"wildcard\":\"*security*\"}}}]"));
+  }
+
+  @Test
+  public void queryFilter() throws IOException {
+    /*
+     * Human readable format of the request defined below:
+     * {
+     *   "query": "SELECT * FROM accounts WHERE age > 25",
+     *   "filter": {
+     *     "range": {
+     *       "balance": {
+     *         "lte": 30000
+     *       }
+     *     }
+     *   }
+     * }
+     */
+    String result =
+        explain(
+            String.format(
+                "{\"query\":\""
+                    + "SELECT * "
+                    + "FROM %s "
+                    + "WHERE age > 25\","
+                    + "\"filter\":{\"range\":{\"balance\":{\"lte\":30000}}}}",
+                TestsConstants.TEST_INDEX_ACCOUNT));
+    String expectedOutput =
+        Files.toString(
+                new File(
+                    getResourcePath()
+                        + "src/test/resources/expectedOutput/json_filter_explain.json"),
+                StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
+
+    assertThat(removeSpaces(result), equalTo(removeSpaces(expectedOutput)));
+  }
+
+  private String removeSpaces(String s) {
+    return s.replaceAll("\\s+", "");
+  }
+
+  private String explainSQL(String sql) {
+    return explain(String.format("{\"query\":\"%s\"}", sql));
+  }
+
+  private JSONObject explainSQLToJson(String sql) {
+    return new JSONObject(explain(String.format("{\"query\":\"%s\"}", sql)));
+  }
+
+  private String query(JSONObject jsonObject, String jsonPath) {
+    return jsonObject.query(jsonPath).toString();
+  }
+
+  private String explain(String request) {
+    try {
+      JSONObject jsonRequest = new JSONObject(request);
+      String sql = jsonRequest.getString("query");
+
+      return translate(sql, jsonRequest);
+    } catch (SqlParseException | SQLFeatureNotSupportedException | SQLFeatureDisabledException e) {
+      throw new ParserException("Illegal sql expr in request: " + request);
     }
-
-    @Test
-    public void aggInHavingWithWhereOnNestedAndNested() {
-        JSONObject explainSQL = explainSQLToJson("SELECT name " +
-                                                 "FROM employee " +
-                                                 "WHERE nested('projects', projects.started_year > 2000 AND projects.name LIKE '%security%') " +
-                                                 "GROUP BY name " +
-                                                 "HAVING COUNT(nested(projects, 'projects')) > 1");
-
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/aggregations/count_0/value_count"),
-                equalTo("{\"field\":\"_index\"}"));
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
-                equalTo("{\"count_0\":\"projects@NESTED>projects@FILTER.count_0\"}"));
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/filter/bool/must"),
-                equalTo("[{\"bool\":{\"adjust_pure_negative\":true,\"must\":[{\"range\":{\"projects.started_year\":{\"include_lower\":false,\"include_upper\":true,\"from\":2000,\"boost\":1,\"to\":null}}},{\"wildcard\":{\"projects.name\":{\"boost\":1,\"wildcard\":\"*security*\"}}}],\"boost\":1}}]"));
-    }
-
-    @Test
-    public void aggInHavingWithWhereOnNestedOrNested() {
-        JSONObject explainSQL = explainSQLToJson("SELECT name " +
-                                                 "FROM employee " +
-                                                 "WHERE nested('projects', projects.started_year > 2000 OR projects.name LIKE '%security%') " +
-                                                 "GROUP BY name " +
-                                                 "HAVING COUNT(nested(projects, 'projects')) > 1");
-        assertThat(
-                query(explainSQL,
-                        "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/aggregations/count_0/value_count"),
-                equalTo("{\"field\":\"_index\"}"));
-        assertThat(
-                query(explainSQL, "/aggregations/name/aggregations/bucket_filter/bucket_selector/buckets_path"),
-                equalTo("{\"count_0\":\"projects@NESTED>projects@FILTER.count_0\"}"));
-        assertThat(
-                query(explainSQL,
-                        "/aggregations/name/aggregations/projects@NESTED/aggregations/projects@FILTER/filter/bool/must"),
-                equalTo("[{\"bool\":{\"adjust_pure_negative\":true,\"should\":[{\"range\":{\"projects.started_year\":{\"include_lower\":false,\"include_upper\":true,\"from\":2000,\"boost\":1,\"to\":null}}},{\"wildcard\":{\"projects.name\":{\"boost\":1,\"wildcard\":\"*security*\"}}}],\"boost\":1}}]"));
-    }
-
-    @Test
-    public void searchSanity() throws IOException {
-        String result = explain(String.format("{\"query\":\"" +
-                "SELECT * " +
-                "FROM %s " +
-                "WHERE firstname LIKE 'A%%' AND age > 20 " +
-                "GROUP BY gender " +
-                "ORDER BY _score\"}", TestsConstants.TEST_INDEX_ACCOUNT));
-        String expectedOutput = Files.toString(
-                new File(getResourcePath() + "src/test/resources/expectedOutput/search_explain.json"), StandardCharsets.UTF_8)
-                .replaceAll("\r", "");
-
-        assertThat(removeSpaces(result), equalTo(removeSpaces(expectedOutput)));
-    }
-
-    // This test was ignored because group by case function is not supported
-    @Ignore
-    @Test
-    public void aggregationQuery() throws IOException {
-        String result = explain(String.format("{\"query\":\"" +
-                "SELECT address, CASE WHEN gender='0' THEN 'aaa' ELSE 'bbb' END AS a2345, count(age) " +
-                "FROM %s " +
-                "GROUP BY terms('field'='address','execution_hint'='global_ordinals'), a2345\"}", TestsConstants.TEST_INDEX_ACCOUNT));
-        String expectedOutput = Files.toString(
-                new File(getResourcePath() + "src/test/resources/expectedOutput/aggregation_query_explain.json"), StandardCharsets.UTF_8)
-                .replaceAll("\r", "");
-
-        assertThat(removeSpaces(result), equalTo(removeSpaces(expectedOutput)));
-    }
-
-    @Test
-    public void deleteSanity() throws IOException {
-        try (MockedStatic<LocalClusterState> localClusterStateMockedStatic =
-            Mockito.mockStatic(LocalClusterState.class)) {
-            LocalClusterState state = mock(LocalClusterState.class);
-            localClusterStateMockedStatic.when(LocalClusterState::state).thenReturn(state);
-            when(state.getSettingValue(any(Settings.Key.class))).thenReturn(true);
-
-            String result = explain(String.format("{\"query\":\"" +
-                "DELETE " +
-                "FROM %s " +
-                "WHERE firstname LIKE 'A%%' AND age > 20\"}", TestsConstants.TEST_INDEX_ACCOUNT));
-            String expectedOutput = Files.toString(
-                new File(getResourcePath() + "src/test/resources/expectedOutput/delete_explain.json"), StandardCharsets.UTF_8)
-                .replaceAll("\r", "");
-            assertThat(removeSpaces(result), equalTo(removeSpaces(expectedOutput)));
-        }
-    }
-
-    @Test(expected = SQLFeatureDisabledException.class)
-    public void deleteShouldThrowExceptionWhenDisabled()
-        throws SQLFeatureDisabledException, SQLFeatureNotSupportedException,
-        SqlParseException {
-        try (MockedStatic<LocalClusterState> localClusterStateMockedStatic =
-                 Mockito.mockStatic(LocalClusterState.class)) {
-            LocalClusterState state = mock(LocalClusterState.class);
-            localClusterStateMockedStatic.when(LocalClusterState::state).thenReturn(state);
-            when(state.getSettingValue(any(Settings.Key.class))).thenReturn(false);
-
-            JSONObject jsonRequest = new JSONObject(StringUtils.format("{\"query\":\"" +
-                "DELETE " +
-                "FROM %s " +
-                "WHERE firstname LIKE 'A%%' AND age > 20\"}", TestsConstants.TEST_INDEX_ACCOUNT));
-            translate(jsonRequest.getString("query"), jsonRequest);
-        }
-    }
-
-    @Test
-    public void queryFilter() throws IOException {
-        /*
-         * Human readable format of the request defined below:
-         * {
-         *   "query": "SELECT * FROM accounts WHERE age > 25",
-         *   "filter": {
-         *     "range": {
-         *       "balance": {
-         *         "lte": 30000
-         *       }
-         *     }
-         *   }
-         * }
-         */
-        String result = explain(String.format("{\"query\":\"" +
-                "SELECT * " +
-                "FROM %s " +
-                "WHERE age > 25\"," +
-                "\"filter\":{\"range\":{\"balance\":{\"lte\":30000}}}}", TestsConstants.TEST_INDEX_ACCOUNT));
-        String expectedOutput = Files.toString(
-                new File(getResourcePath() + "src/test/resources/expectedOutput/json_filter_explain.json"), StandardCharsets.UTF_8)
-                .replaceAll("\r", "");
-
-        assertThat(removeSpaces(result), equalTo(removeSpaces(expectedOutput)));
-    }
-
-    private String removeSpaces(String s) {
-        return s.replaceAll("\\s+", "");
-    }
-
-    private String explainSQL(String sql) {
-        return explain(String.format("{\"query\":\"%s\"}", sql));
-    }
-
-    private JSONObject explainSQLToJson(String sql) {
-        return new JSONObject(explain(String.format("{\"query\":\"%s\"}", sql)));
-    }
-
-    private String query(JSONObject jsonObject, String jsonPath) {
-        return jsonObject.query(jsonPath).toString();
-    }
-
-    private String explain(String request) {
-        try {
-            JSONObject jsonRequest = new JSONObject(request);
-            String sql = jsonRequest.getString("query");
-
-            return translate(sql, jsonRequest);
-        } catch (SqlParseException | SQLFeatureNotSupportedException | SQLFeatureDisabledException e) {
-            throw new ParserException("Illegal sql expr in request: " + request);
-        }
-    }
-
-    private String translate(String sql, JSONObject jsonRequest)
-        throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
-        Client mockClient = mock(Client.class);
-        CheckScriptContents.stubMockClient(mockClient);
-        QueryAction queryAction =
-                OpenSearchActionFactory
-                    .create(mockClient, new QueryActionRequest(sql, columnTypeProvider, Format.JDBC));
-
-        SqlRequest sqlRequest = new SqlRequest(sql, jsonRequest);
-        queryAction.setSqlRequest(sqlRequest);
-
-        SqlElasticRequestBuilder requestBuilder = queryAction.explain();
-        return requestBuilder.explain();
-    }
-
-    private String getResourcePath() {
-        String projectRoot = System.getProperty("project.root");
-        if ( projectRoot!= null && projectRoot.trim().length() > 0) {
-            return projectRoot.trim() + "/";
-        } else {
-            return "";
-        }
+  }
+
+  private String translate(String sql, JSONObject jsonRequest)
+      throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
+    Client mockClient = mock(Client.class);
+    CheckScriptContents.stubMockClient(mockClient);
+    QueryAction queryAction =
+        OpenSearchActionFactory.create(
+            mockClient, new QueryActionRequest(sql, columnTypeProvider, Format.JDBC));
+
+    SqlRequest sqlRequest = new SqlRequest(sql, jsonRequest);
+    queryAction.setSqlRequest(sqlRequest);
+
+    SqlElasticRequestBuilder requestBuilder = queryAction.explain();
+    return requestBuilder.explain();
+  }
+
+  private String getResourcePath() {
+    String projectRoot = System.getProperty("project.root");
+    if (projectRoot != null && projectRoot.trim().length() > 0) {
+      return projectRoot.trim() + "/";
+    } else {
+      return "";
     }
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/LocalClusterStateTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/LocalClusterStateTest.java
index 67ad4b9ba2..8e5c31d036 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/LocalClusterStateTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/LocalClusterStateTest.java
@@ -3,31 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opensearch.sql.legacy.util.CheckScriptContents.mockClusterService;
 import static org.opensearch.sql.legacy.util.CheckScriptContents.mockLocalClusterState;
 
-import java.io.IOException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opensearch.cluster.ClusterChangedEvent;
-import org.opensearch.cluster.ClusterStateListener;
-import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.cluster.ClusterName;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
@@ -36,152 +23,125 @@
 import org.opensearch.sql.legacy.util.TestsConstants;
 import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
 
-/**
- * Local cluster state testing without covering OpenSearch logic, ex. resolve index pattern.
- */
+/** Local cluster state testing without covering OpenSearch logic, ex. resolve index pattern. */
 public class LocalClusterStateTest {
 
-    private static final String INDEX_NAME = TestsConstants.TEST_INDEX_BANK;
-    private static final String TYPE_NAME = "account";
-
-    private static final String MAPPING = "{\n" +
-        "  \"opensearch-sql_test_index_bank\": {\n" +
-        "    \"mappings\": {\n" +
-        "      \"account\": {\n" +
-        "        \"properties\": {\n" +
-        "          \"address\": {\n" +
-        "            \"type\": \"text\"\n" +
-        "          },\n" +
-        "          \"age\": {\n" +
-        "            \"type\": \"integer\"\n" +
-        "          },\n" +
-        "          \"city\": {\n" +
-        "            \"type\": \"keyword\"\n" +
-        "          },\n" +
-        "          \"employer\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fields\": {\n" +
-        "              \"keyword\": {\n" +
-        "                \"type\": \"keyword\",\n" +
-        "                \"ignore_above\": 256\n" +
-        "              }\n" +
-        "            }\n" +
-        "          },\n" +
-        "          \"state\": {\n" +
-        "            \"type\": \"text\",\n" +
-        "            \"fields\": {\n" +
-        "              \"raw\": {\n" +
-        "                \"type\": \"keyword\",\n" +
-        "                \"ignore_above\": 256\n" +
-        "              }\n" +
-        "            }\n" +
-        "          },\n" +
-        "          \"manager\": {\n" +
-        "            \"properties\": {\n" +
-        "              \"name\": {\n" +
-        "                \"type\": \"text\",\n" +
-        "                \"fields\": {\n" +
-        "                  \"keyword\": {\n" +
-        "                    \"type\": \"keyword\",\n" +
-        "                    \"ignore_above\": 256\n" +
-        "                  }\n" +
-        "                }\n" +
-        "              },\n" +
-        "              \"address\": {\n" +
-        "                \"type\": \"keyword\"\n" +
-        "              }\n" +
-        "            }\n" +
-        "          }\n" +
-        "        }\n" +
-        "      }\n" +
-        "    },\n" +
-        // ==== All required by IndexMetaData.fromXContent() ====
-        "    \"settings\": {\n" +
-        "      \"index\": {\n" +
-        "        \"number_of_shards\": 5,\n" +
-        "        \"number_of_replicas\": 0,\n" +
-        "        \"version\": {\n" +
-        "          \"created\": \"6050399\"\n" +
-        "        }\n" +
-        "      }\n" +
-        "    },\n" +
-        "    \"mapping_version\": \"1\",\n" +
-        "    \"settings_version\": \"1\"\n" +
-        //=======================================================
-        "  }\n" +
-        "}";
-
-    @Mock private ClusterSettings clusterSettings;
-
-    @Before
-    public void init() {
-        MockitoAnnotations.openMocks(this);
-        LocalClusterState.state(null);
-        mockLocalClusterState(MAPPING);
-    }
-
-    @Test
-    public void getMappingForExistingField() {
-        IndexMappings indexMappings = LocalClusterState.state().getFieldMappings(new String[]{INDEX_NAME});
-        Assert.assertNotNull(indexMappings);
-
-        FieldMappings fieldMappings = indexMappings.mapping(INDEX_NAME);
-        Assert.assertNotNull(fieldMappings);
-
-        Assert.assertEquals("text", fieldMappings.mapping("address").get("type"));
-        Assert.assertEquals("integer", fieldMappings.mapping("age").get("type"));
-        Assert.assertEquals("keyword", fieldMappings.mapping("city").get("type"));
-        Assert.assertEquals("text", fieldMappings.mapping("employer").get("type"));
-
-        Assert.assertEquals("text", fieldMappings.mapping("manager.name").get("type"));
-        Assert.assertEquals("keyword", fieldMappings.mapping("manager.address").get("type"));
-    }
-
-    @Test
-    public void getMappingForInvalidField() {
-        IndexMappings indexMappings = LocalClusterState.state().getFieldMappings(new String[]{INDEX_NAME});
-        FieldMappings fieldMappings = indexMappings.mapping(INDEX_NAME);
-
-        Assert.assertNull(fieldMappings.mapping("work-email"));
-        Assert.assertNull(fieldMappings.mapping("manager.home-address"));
-        Assert.assertNull(fieldMappings.mapping("manager.name.first"));
-        Assert.assertNull(fieldMappings.mapping("manager.name.first.uppercase"));
-    }
-
-    @Test
-    public void getMappingFromCache() throws IOException {
-        // Mock here again for verification below and mock addListener()
-        ClusterService mockService = mockClusterService(MAPPING);
-        ClusterStateListener[] listener = new ClusterStateListener[1]; // Trick to access inside lambda
-        doAnswer(invocation -> {
-            listener[0] = (ClusterStateListener) invocation.getArguments()[0];
-            return null;
-        }).when(mockService).addListener(any());
-        LocalClusterState.state().setClusterService(mockService);
-
-        // 1.Actual findMappings be invoked only once
-        for (int i = 0; i < 10; i++) {
-            LocalClusterState.state().getFieldMappings(new String[]{INDEX_NAME});
-        }
-        verify(mockService.state().metadata(), times(1)).findMappings(eq(new String[]{INDEX_NAME}), any());
-
-        // 2.Fire cluster state change event
-        Assert.assertNotNull(listener[0]);
-        ClusterChangedEvent mockEvent = mock(ClusterChangedEvent.class);
-        when(mockEvent.metadataChanged()).thenReturn(true);
-        listener[0].clusterChanged(mockEvent);
-
-        // 3.Cache should be invalidated and call findMapping another time only
-        for (int i = 0; i < 5; i++) {
-            LocalClusterState.state().getFieldMappings(new String[]{INDEX_NAME});
-        }
-        verify(mockService.state().metadata(), times(2)).findMappings(eq(new String[]{INDEX_NAME}), any());
-    }
-
-    @Test
-    public void getDefaultValueForQuerySlowLog() {
-        OpenSearchSettings settings = new OpenSearchSettings(clusterSettings);
-        assertEquals(Integer.valueOf(2), settings.getSettingValue(Settings.Key.SQL_SLOWLOG));
-    }
-
+  private static final String INDEX_NAME = TestsConstants.TEST_INDEX_BANK;
+  private static final String TYPE_NAME = "account";
+
+  private static final String MAPPING =
+      "{\n"
+          + "  \"opensearch-sql_test_index_bank\": {\n"
+          + "    \"mappings\": {\n"
+          + "      \"account\": {\n"
+          + "        \"properties\": {\n"
+          + "          \"address\": {\n"
+          + "            \"type\": \"text\"\n"
+          + "          },\n"
+          + "          \"age\": {\n"
+          + "            \"type\": \"integer\"\n"
+          + "          },\n"
+          + "          \"city\": {\n"
+          + "            \"type\": \"keyword\"\n"
+          + "          },\n"
+          + "          \"employer\": {\n"
+          + "            \"type\": \"text\",\n"
+          + "            \"fields\": {\n"
+          + "              \"keyword\": {\n"
+          + "                \"type\": \"keyword\",\n"
+          + "                \"ignore_above\": 256\n"
+          + "              }\n"
+          + "            }\n"
+          + "          },\n"
+          + "          \"state\": {\n"
+          + "            \"type\": \"text\",\n"
+          + "            \"fields\": {\n"
+          + "              \"raw\": {\n"
+          + "                \"type\": \"keyword\",\n"
+          + "                \"ignore_above\": 256\n"
+          + "              }\n"
+          + "            }\n"
+          + "          },\n"
+          + "          \"manager\": {\n"
+          + "            \"properties\": {\n"
+          + "              \"name\": {\n"
+          + "                \"type\": \"text\",\n"
+          + "                \"fields\": {\n"
+          + "                  \"keyword\": {\n"
+          + "                    \"type\": \"keyword\",\n"
+          + "                    \"ignore_above\": 256\n"
+          + "                  }\n"
+          + "                }\n"
+          + "              },\n"
+          + "              \"address\": {\n"
+          + "                \"type\": \"keyword\"\n"
+          + "              }\n"
+          + "            }\n"
+          + "          }\n"
+          + "        }\n"
+          + "      }\n"
+          + "    },\n"
+          +
+          // ==== All required by IndexMetaData.fromXContent() ====
+          "    \"settings\": {\n"
+          + "      \"index\": {\n"
+          + "        \"number_of_shards\": 5,\n"
+          + "        \"number_of_replicas\": 0,\n"
+          + "        \"version\": {\n"
+          + "          \"created\": \"6050399\"\n"
+          + "        }\n"
+          + "      }\n"
+          + "    },\n"
+          + "    \"mapping_version\": \"1\",\n"
+          + "    \"settings_version\": \"1\"\n"
+          +
+          // =======================================================
+          "  }\n"
+          + "}";
+
+  @Mock private ClusterSettings clusterSettings;
+
+  @Before
+  public void init() {
+    MockitoAnnotations.openMocks(this);
+    LocalClusterState.state(null);
+    mockLocalClusterState(MAPPING);
+  }
+
+  @Test
+  public void getMappingForExistingField() {
+    IndexMappings indexMappings =
+        LocalClusterState.state().getFieldMappings(new String[] {INDEX_NAME});
+    Assert.assertNotNull(indexMappings);
+
+    FieldMappings fieldMappings = indexMappings.mapping(INDEX_NAME);
+    Assert.assertNotNull(fieldMappings);
+
+    Assert.assertEquals("text", fieldMappings.mapping("address").get("type"));
+    Assert.assertEquals("integer", fieldMappings.mapping("age").get("type"));
+    Assert.assertEquals("keyword", fieldMappings.mapping("city").get("type"));
+    Assert.assertEquals("text", fieldMappings.mapping("employer").get("type"));
+
+    Assert.assertEquals("text", fieldMappings.mapping("manager.name").get("type"));
+    Assert.assertEquals("keyword", fieldMappings.mapping("manager.address").get("type"));
+  }
+
+  @Test
+  public void getMappingForInvalidField() {
+    IndexMappings indexMappings =
+        LocalClusterState.state().getFieldMappings(new String[] {INDEX_NAME});
+    FieldMappings fieldMappings = indexMappings.mapping(INDEX_NAME);
+
+    Assert.assertNull(fieldMappings.mapping("work-email"));
+    Assert.assertNull(fieldMappings.mapping("manager.home-address"));
+    Assert.assertNull(fieldMappings.mapping("manager.name.first"));
+    Assert.assertNull(fieldMappings.mapping("manager.name.first.uppercase"));
+  }
+
+  @Test
+  public void getDefaultValueForQuerySlowLog() {
+    when(clusterSettings.get(ClusterName.CLUSTER_NAME_SETTING)).thenReturn(ClusterName.DEFAULT);
+    OpenSearchSettings settings = new OpenSearchSettings(clusterSettings);
+    assertEquals(Integer.valueOf(2), settings.getSettingValue(Settings.Key.SQL_SLOWLOG));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/MathFunctionsTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/MathFunctionsTest.java
index b52dd3efc6..ad01cb0e0f 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/MathFunctionsTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/MathFunctionsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static org.junit.Assert.assertTrue;
@@ -17,437 +16,291 @@
 
 public class MathFunctionsTest {
 
-    private static SqlParser parser;
-
-    @BeforeClass
-    public static void init() { parser = new SqlParser(); }
-
-    /** Tests for case insensitivity when calling SQL functions */
-    @Test
-    public void lowerCaseInSelect() {
-        String query = "SELECT abs(age) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.abs(doc['age'].value)"));
-    }
-
-    @Test
-    public void upperCaseInSelect() {
-        String query = "SELECT ABS(age) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.abs(doc['age'].value)"));
-    }
-
-    @Test
-    public void lowerCaseInWhere() {
-        String query = "SELECT * " +
-                       "FROM bank " +
-                       "WHERE sqrt(age) > 5";
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.sqrt(doc['age'].value)"));
-        assertTrue(
-                CheckScriptContents.scriptHasPattern(
-                        scriptFilter,
-                        "sqrt_\\d+ > 5"));
-    }
-
-    @Test
-    public void upperCaseInWhere() {
-        String query = "SELECT * " +
-                       "FROM bank " +
-                       "WHERE SQRT(age) > 5";
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.sqrt(doc['age'].value)"));
-        assertTrue(
-                CheckScriptContents.scriptHasPattern(
-                        scriptFilter,
-                        "sqrt_\\d+ > 5"));
-    }
-
-    /** Tests for constant functions */
-    @Test
-    public void eulersNumberInSelect() {
-        String query = "SELECT E() " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.E"));
-    }
-
-    @Test
-    public void eulersNumberInWhere() {
-        String query = "SELECT * " +
-                       "FROM bank " +
-                       "WHERE E() > 2";
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.E"));
-        assertTrue(
-                CheckScriptContents.scriptHasPattern(
-                        scriptFilter,
-                        "E_\\d+ > 2"));
-    }
-
-    @Test
-    public void piInSelect() {
-        String query = "SELECT PI() " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.PI"));
-    }
-
-    @Test
-    public void piInWhere() {
-        String query = "SELECT * " +
-                       "FROM bank " +
-                       "WHERE PI() < 4";
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.PI"));
-        assertTrue(
-                CheckScriptContents.scriptHasPattern(
-                        scriptFilter,
-                        "PI_\\d+ < 4"));
-    }
-
-    /** Tests for general math functions */
-    @Test
-    public void expm1WithPropertyArgument() {
-        String query = "SELECT * " +
-                       "FROM bank " +
-                       "WHERE expm1(age) > 10";
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.expm1(doc['age'].value)"));
-        assertTrue(
-                CheckScriptContents.scriptHasPattern(
-                        scriptFilter,
-                        "expm1_\\d+ > 10"));
-    }
-
-    @Test
-    public void expm1WithValueArgument() {
-        String query = "SELECT * " +
-                       "FROM bank " +
-                       "WHERE expm1(5) > 10";
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.expm1(5)"));
-        assertTrue(
-                CheckScriptContents.scriptHasPattern(
-                        scriptFilter,
-                        "expm1_\\d+ > 10"));
-    }
-
-
-    /** Tests for trigonometric functions */
-    @Test
-    public void degreesWithPropertyArgument() {
-        String query = "SELECT degrees(age) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.toDegrees(doc['age'].value)"));
-    }
-
-    @Test
-    public void degreesWithValueArgument() {
-        String query = "SELECT degrees(10) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.toDegrees(10)"));
-    }
-
-    @Test
-    public void radiansWithPropertyArgument() {
-        String query = "SELECT radians(age) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.toRadians(doc['age'].value)"));
-    }
-
-    @Test
-    public void radiansWithValueArgument() {
-        String query = "SELECT radians(180) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.toRadians(180)"));
-    }
-
-    @Test
-    public void sinWithPropertyArgument() {
-        String query = "SELECT sin(radians(age)) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.toRadians(doc['age'].value)"));
-        assertTrue(
-                CheckScriptContents.scriptHasPattern(
-                        scriptField,
-                        "Math.sin\\(radians_\\d+\\)"));
-    }
-
-    @Test
-    public void sinWithValueArgument() {
-        String query = "SELECT sin(radians(180)) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.toRadians(180)"));
-        assertTrue(
-                CheckScriptContents.scriptHasPattern(
-                        scriptField,
-                        "Math.sin\\(radians_\\d+\\)"));
-    }
-
-    @Test
-    public void atanWithPropertyArgument() {
-        String query = "SELECT atan(age) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.atan(doc['age'].value)"));
-    }
-
-    @Test
-    public void atanWithValueArgument() {
-        String query = "SELECT atan(1) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.atan(1)"));
-    }
-
-    @Test
-    public void atanWithFunctionArgument() {
-        String query = "SELECT atan(PI() / 2) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.PI"));
-        assertTrue(
-                CheckScriptContents.scriptHasPattern(
-                        scriptField,
-                        "PI_\\d+ / 2"));
-        assertTrue(
-                CheckScriptContents.scriptHasPattern(
-                        scriptField,
-                        "Math.atan\\(divide_\\d+\\)"));
-    }
-
-    @Test
-    public void coshWithPropertyArgument() {
-        String query = "SELECT cosh(age) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.cosh(doc['age'].value)"));
-    }
-
-    @Test
-    public void coshWithValueArgument() {
-        String query = "SELECT cosh(0) " +
-                       "FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.cosh(0)"));
-    }
-
-    @Test
-    public void powerWithPropertyArgument() {
-        String query = "SELECT POWER(age, 2) FROM bank WHERE POWER(balance, 3) > 0";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.pow(doc['age'].value, 2)"));
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.pow(doc['balance'].value, 3)"));
-    }
-
-    @Test
-    public void atan2WithPropertyArgument() {
-        String query = "SELECT ATAN2(age, 2) FROM bank WHERE ATAN2(balance, 3) > 0";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.atan2(doc['age'].value, 2)"));
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.atan2(doc['balance'].value, 3)"));
-    }
-
-    @Test
-    public void cotWithPropertyArgument() {
-        String query = "SELECT COT(age) FROM bank WHERE COT(balance) > 0";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "1 / Math.tan(doc['age'].value)"));
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "1 / Math.tan(doc['balance'].value)"));
-    }
-
-    @Test
-    public void signWithFunctionPropertyArgument() {
-        String query = "SELECT SIGN(age) FROM bank WHERE SIGNUM(balance) = 1";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(CheckScriptContents.scriptContainsString(
-                scriptField,
-                "Math.signum(doc['age'].value)"));
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.signum(doc['balance'].value)"));
-    }
-
-    @Test
-    public void logWithOneParam() {
-        String query = "SELECT LOG(age) FROM bank WHERE LOG(age) = 5.0";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.log(doc['age'].value)"));
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.log(doc['age'].value)"));
-    }
-
-    @Test
-    public void logWithTwoParams() {
-        String query = "SELECT LOG(3, age) FROM bank WHERE LOG(3, age) = 5.0";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.log(doc['age'].value)/Math.log(3)"));
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.log(doc['age'].value)/Math.log(3)"));
-    }
-
-    @Test
-    public void log10Test() {
-        String query = "SELECT LOG10(age) FROM accounts";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.log10(doc['age'].value)"
-                )
-        );
-    }
-
-    @Test
-    public void lnTest() {
-        String query = "SELECT LN(age) FROM age WHERE LN(age) = 5.0";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Math.log(doc['age'].value)"));
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Math.log(doc['age'].value)"));
-    }
-
-    @Test
-    public void randWithoutParamTest() {
-        String query = "SELECT RAND() FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "new Random().nextDouble()"
-                )
-        );
-    }
-
-    @Test
-    public void randWithOneParamTest() {
-        String query = "SELECT RAND(age) FROM bank";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "new Random(doc['age'].value).nextDouble()"
-                )
-        );
-    }
+  private static SqlParser parser;
+
+  @BeforeClass
+  public static void init() {
+    parser = new SqlParser();
+  }
+
+  /** Tests for case insensitivity when calling SQL functions */
+  @Test
+  public void lowerCaseInSelect() {
+    String query = "SELECT abs(age) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.abs(doc['age'].value)"));
+  }
+
+  @Test
+  public void upperCaseInSelect() {
+    String query = "SELECT ABS(age) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.abs(doc['age'].value)"));
+  }
+
+  @Test
+  public void lowerCaseInWhere() {
+    String query = "SELECT * " + "FROM bank " + "WHERE sqrt(age) > 5";
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptFilter, "Math.sqrt(doc['age'].value)"));
+    assertTrue(CheckScriptContents.scriptHasPattern(scriptFilter, "sqrt_\\d+ > 5"));
+  }
+
+  @Test
+  public void upperCaseInWhere() {
+    String query = "SELECT * " + "FROM bank " + "WHERE SQRT(age) > 5";
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptFilter, "Math.sqrt(doc['age'].value)"));
+    assertTrue(CheckScriptContents.scriptHasPattern(scriptFilter, "sqrt_\\d+ > 5"));
+  }
+
+  /** Tests for constant functions */
+  @Test
+  public void eulersNumberInSelect() {
+    String query = "SELECT E() " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.E"));
+  }
+
+  @Test
+  public void eulersNumberInWhere() {
+    String query = "SELECT * " + "FROM bank " + "WHERE E() > 2";
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptFilter, "Math.E"));
+    assertTrue(CheckScriptContents.scriptHasPattern(scriptFilter, "E_\\d+ > 2"));
+  }
+
+  @Test
+  public void piInSelect() {
+    String query = "SELECT PI() " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.PI"));
+  }
+
+  @Test
+  public void piInWhere() {
+    String query = "SELECT * " + "FROM bank " + "WHERE PI() < 4";
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptFilter, "Math.PI"));
+    assertTrue(CheckScriptContents.scriptHasPattern(scriptFilter, "PI_\\d+ < 4"));
+  }
+
+  /** Tests for general math functions */
+  @Test
+  public void expm1WithPropertyArgument() {
+    String query = "SELECT * " + "FROM bank " + "WHERE expm1(age) > 10";
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptFilter, "Math.expm1(doc['age'].value)"));
+    assertTrue(CheckScriptContents.scriptHasPattern(scriptFilter, "expm1_\\d+ > 10"));
+  }
+
+  @Test
+  public void expm1WithValueArgument() {
+    String query = "SELECT * " + "FROM bank " + "WHERE expm1(5) > 10";
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptFilter, "Math.expm1(5)"));
+    assertTrue(CheckScriptContents.scriptHasPattern(scriptFilter, "expm1_\\d+ > 10"));
+  }
+
+  /** Tests for trigonometric functions */
+  @Test
+  public void degreesWithPropertyArgument() {
+    String query = "SELECT degrees(age) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "Math.toDegrees(doc['age'].value)"));
+  }
+
+  @Test
+  public void degreesWithValueArgument() {
+    String query = "SELECT degrees(10) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.toDegrees(10)"));
+  }
+
+  @Test
+  public void radiansWithPropertyArgument() {
+    String query = "SELECT radians(age) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "Math.toRadians(doc['age'].value)"));
+  }
+
+  @Test
+  public void radiansWithValueArgument() {
+    String query = "SELECT radians(180) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.toRadians(180)"));
+  }
+
+  @Test
+  public void sinWithPropertyArgument() {
+    String query = "SELECT sin(radians(age)) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "Math.toRadians(doc['age'].value)"));
+    assertTrue(CheckScriptContents.scriptHasPattern(scriptField, "Math.sin\\(radians_\\d+\\)"));
+  }
+
+  @Test
+  public void sinWithValueArgument() {
+    String query = "SELECT sin(radians(180)) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.toRadians(180)"));
+    assertTrue(CheckScriptContents.scriptHasPattern(scriptField, "Math.sin\\(radians_\\d+\\)"));
+  }
+
+  @Test
+  public void atanWithPropertyArgument() {
+    String query = "SELECT atan(age) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "Math.atan(doc['age'].value)"));
+  }
+
+  @Test
+  public void atanWithValueArgument() {
+    String query = "SELECT atan(1) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.atan(1)"));
+  }
+
+  @Test
+  public void atanWithFunctionArgument() {
+    String query = "SELECT atan(PI() / 2) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.PI"));
+    assertTrue(CheckScriptContents.scriptHasPattern(scriptField, "PI_\\d+ / 2"));
+    assertTrue(CheckScriptContents.scriptHasPattern(scriptField, "Math.atan\\(divide_\\d+\\)"));
+  }
+
+  @Test
+  public void coshWithPropertyArgument() {
+    String query = "SELECT cosh(age) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "Math.cosh(doc['age'].value)"));
+  }
+
+  @Test
+  public void coshWithValueArgument() {
+    String query = "SELECT cosh(0) " + "FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.cosh(0)"));
+  }
+
+  @Test
+  public void powerWithPropertyArgument() {
+    String query = "SELECT POWER(age, 2) FROM bank WHERE POWER(balance, 3) > 0";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "Math.pow(doc['age'].value, 2)"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptFilter, "Math.pow(doc['balance'].value, 3)"));
+  }
+
+  @Test
+  public void atan2WithPropertyArgument() {
+    String query = "SELECT ATAN2(age, 2) FROM bank WHERE ATAN2(balance, 3) > 0";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "Math.atan2(doc['age'].value, 2)"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptFilter, "Math.atan2(doc['balance'].value, 3)"));
+  }
+
+  @Test
+  public void cotWithPropertyArgument() {
+    String query = "SELECT COT(age) FROM bank WHERE COT(balance) > 0";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "1 / Math.tan(doc['age'].value)"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptFilter, "1 / Math.tan(doc['balance'].value)"));
+  }
+
+  @Test
+  public void signWithFunctionPropertyArgument() {
+    String query = "SELECT SIGN(age) FROM bank WHERE SIGNUM(balance) = 1";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "Math.signum(doc['age'].value)"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptFilter, "Math.signum(doc['balance'].value)"));
+  }
+
+  @Test
+  public void logWithOneParam() {
+    String query = "SELECT LOG(age) FROM bank WHERE LOG(age) = 5.0";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.log(doc['age'].value)"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptFilter, "Math.log(doc['age'].value)"));
+  }
+
+  @Test
+  public void logWithTwoParams() {
+    String query = "SELECT LOG(3, age) FROM bank WHERE LOG(3, age) = 5.0";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "Math.log(doc['age'].value)/Math.log(3)"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptFilter, "Math.log(doc['age'].value)/Math.log(3)"));
+  }
+
+  @Test
+  public void log10Test() {
+    String query = "SELECT LOG10(age) FROM accounts";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "Math.log10(doc['age'].value)"));
+  }
+
+  @Test
+  public void lnTest() {
+    String query = "SELECT LN(age) FROM age WHERE LN(age) = 5.0";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "Math.log(doc['age'].value)"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptFilter, "Math.log(doc['age'].value)"));
+  }
+
+  @Test
+  public void randWithoutParamTest() {
+    String query = "SELECT RAND() FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "new Random().nextDouble()"));
+  }
+
+  @Test
+  public void randWithOneParamTest() {
+    String query = "SELECT RAND(age) FROM bank";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "new Random(doc['age'].value).nextDouble()"));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldProjectionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldProjectionTest.java
index 63af01caaa..d5d9194036 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldProjectionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldProjectionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -52,372 +51,284 @@
 
 public class NestedFieldProjectionTest {
 
-    @Test
-    public void regression() {
-        assertThat(query("SELECT region FROM team"), is(anything()));
-        assertThat(query("SELECT region FROM team WHERE nested(employees.age) = 30"), is(anything()));
-        assertThat(query("SELECT * FROM team WHERE region = 'US'"), is(anything()));
-    }
-
-    @Test
-    public void nestedFieldSelectAll() {
-        assertThat(
-            query("SELECT nested(employees.*) FROM team"),
-            source(
-                boolQuery(
-                    filter(
-                        boolQuery(
-                            must(
-                                nestedQuery(
-                                    path("employees"),
-                                    innerHits("employees.*")
-                                )
-                            )
-                        )
-                    )
-                )
-            )
-        );
-    }
-
-    @Test
-    public void nestedFieldInSelect() {
-         assertThat(
-            query("SELECT nested(employees.firstname) FROM team"),
-            source(
-                boolQuery(
-                    filter(
-                        boolQuery(
-                            must(
-                                nestedQuery(
-                                    path("employees"),
-                                    innerHits("employees.firstname")
-                                )
-                            )
-                        )
-                    )
-                )
-            )
-        );
-    }
-
-    @Test
-    public void regularAndNestedFieldInSelect() {
-        assertThat(
-            query("SELECT region, nested(employees.firstname) FROM team"),
-            source(
-                boolQuery(
-                    filter(
-                        boolQuery(
-                            must(
-                                nestedQuery(
-                                    path("employees"),
-                                    innerHits("employees.firstname")
-                                )
-                            )
-                        )
-                    )
-                ),
-                fetchSource("region")
-            )
-        );
-    }
-
-    /*
-    // Should be integration test
-    @Test
-    public void nestedFieldInWhereSelectAll() {}
-    */
-
-    @Test
-    public void nestedFieldInSelectAndWhere() {
-        assertThat(
-            query("SELECT nested(employees.firstname) " +
-                  "  FROM team " +
-                  "    WHERE nested(employees.age) = 30"),
-            source(
-                boolQuery(
-                    filter(
-                        boolQuery(
-                            must(
-                                nestedQuery(
-                                    path("employees"),
-                                    innerHits("employees.firstname")
-                                )
-                            )
-                        )
-                    )
-                )
-            )
-        );
-    }
-
-    @Test
-    public void regularAndNestedFieldInSelectAndWhere() {
-        assertThat(
-            query("SELECT region, nested(employees.firstname) " +
-                  "  FROM team " +
-                  "    WHERE nested(employees.age) = 30"),
-            source(
-                boolQuery(
-                    filter(
-                        boolQuery(
-                            must(
-                                nestedQuery(
-                                    innerHits("employees.firstname")
-                                )
-                            )
-                        )
-                    )
-                ),
-                fetchSource("region")
-            )
-        );
-    }
-
-    @Test
-    public void multipleSameNestedFields() {
-        assertThat(
-            query("SELECT nested(employees.firstname), nested(employees.lastname) " +
-                "  FROM team " +
-                "    WHERE nested(\"employees\", employees.age = 30 AND employees.firstname LIKE 'John')"),
-            source(
-                boolQuery(
-                    filter(
-                        boolQuery(
-                            must(
-                                nestedQuery(
-                                    path("employees"),
-                                    innerHits("employees.firstname", "employees.lastname")
-                                )
-                            )
-                        )
-                    )
-                )
-            )
-        );
+  @Test
+  public void regression() {
+    assertThat(query("SELECT region FROM team"), is(anything()));
+    assertThat(query("SELECT region FROM team WHERE nested(employees.age) = 30"), is(anything()));
+    assertThat(query("SELECT * FROM team WHERE region = 'US'"), is(anything()));
+  }
+
+  @Test
+  public void nestedFieldSelectAll() {
+    assertThat(
+        query("SELECT nested(employees.*) FROM team"),
+        source(
+            boolQuery(
+                filter(
+                    boolQuery(must(nestedQuery(path("employees"), innerHits("employees.*"))))))));
+  }
+
+  @Test
+  public void nestedFieldInSelect() {
+    assertThat(
+        query("SELECT nested(employees.firstname) FROM team"),
+        source(
+            boolQuery(
+                filter(
+                    boolQuery(
+                        must(nestedQuery(path("employees"), innerHits("employees.firstname"))))))));
+  }
+
+  @Test
+  public void regularAndNestedFieldInSelect() {
+    assertThat(
+        query("SELECT region, nested(employees.firstname) FROM team"),
+        source(
+            boolQuery(
+                filter(
+                    boolQuery(
+                        must(nestedQuery(path("employees"), innerHits("employees.firstname")))))),
+            fetchSource("region")));
+  }
+
+  /*
+  // Should be integration test
+  @Test
+  public void nestedFieldInWhereSelectAll() {}
+  */
+
+  @Test
+  public void nestedFieldInSelectAndWhere() {
+    assertThat(
+        query(
+            "SELECT nested(employees.firstname) "
+                + "  FROM team "
+                + "    WHERE nested(employees.age) = 30"),
+        source(
+            boolQuery(
+                filter(
+                    boolQuery(
+                        must(nestedQuery(path("employees"), innerHits("employees.firstname"))))))));
+  }
+
+  @Test
+  public void regularAndNestedFieldInSelectAndWhere() {
+    assertThat(
+        query(
+            "SELECT region, nested(employees.firstname) "
+                + "  FROM team "
+                + "    WHERE nested(employees.age) = 30"),
+        source(
+            boolQuery(filter(boolQuery(must(nestedQuery(innerHits("employees.firstname")))))),
+            fetchSource("region")));
+  }
+
+  @Test
+  public void multipleSameNestedFields() {
+    assertThat(
+        query(
+            "SELECT nested(employees.firstname), nested(employees.lastname)   FROM team     WHERE"
+                + " nested(\"employees\", employees.age = 30 AND employees.firstname LIKE 'John')"),
+        source(
+            boolQuery(
+                filter(
+                    boolQuery(
+                        must(
+                            nestedQuery(
+                                path("employees"),
+                                innerHits("employees.firstname", "employees.lastname"))))))));
+  }
+
+  @Test
+  public void multipleDifferentNestedFields() {
+    assertThat(
+        query(
+            "SELECT region, nested(employees.firstname), nested(manager.name) "
+                + "  FROM team "
+                + "    WHERE nested(employees.age) = 30 AND nested(manager.age) = 50"),
+        source(
+            boolQuery(
+                filter(
+                    boolQuery(
+                        must(
+                            boolQuery(
+                                must(
+                                    nestedQuery(
+                                        path("employees"), innerHits("employees.firstname")),
+                                    nestedQuery(path("manager"), innerHits("manager.name")))))))),
+            fetchSource("region")));
+  }
+
+  @Test
+  public void leftJoinWithSelectAll() {
+    assertThat(
+        query("SELECT * FROM team AS t LEFT JOIN t.projects AS p "),
+        source(
+            boolQuery(
+                filter(
+                    boolQuery(
+                        should(
+                            boolQuery(mustNot(nestedQuery(path("projects")))),
+                            nestedQuery(path("projects"), innerHits("projects.*"))))))));
+  }
+
+  @Test
+  public void leftJoinWithSpecificFields() {
+    assertThat(
+        query("SELECT t.name, p.name, p.started_year FROM team AS t LEFT JOIN t.projects AS p "),
+        source(
+            boolQuery(
+                filter(
+                    boolQuery(
+                        should(
+                            boolQuery(mustNot(nestedQuery(path("projects")))),
+                            nestedQuery(
+                                path("projects"),
+                                innerHits("projects.name", "projects.started_year")))))),
+            fetchSource("name")));
+  }
+
+  private Matcher<SearchSourceBuilder> source(Matcher<QueryBuilder> queryMatcher) {
+    return featureValueOf("query", queryMatcher, SearchSourceBuilder::query);
+  }
+
+  private Matcher<SearchSourceBuilder> source(
+      Matcher<QueryBuilder> queryMatcher, Matcher<FetchSourceContext> fetchSourceMatcher) {
+    return allOf(
+        featureValueOf("query", queryMatcher, SearchSourceBuilder::query),
+        featureValueOf("fetchSource", fetchSourceMatcher, SearchSourceBuilder::fetchSource));
+  }
+
+  /**
+   * Asserting instanceOf and continue other chained matchers of subclass requires explicity cast
+   */
+  @SuppressWarnings("unchecked")
+  private Matcher<QueryBuilder> boolQuery(Matcher<BoolQueryBuilder> matcher) {
+    return (Matcher) allOf(instanceOf(BoolQueryBuilder.class), matcher);
+  }
+
+  @SafeVarargs
+  @SuppressWarnings("unchecked")
+  private final Matcher<QueryBuilder> nestedQuery(Matcher<NestedQueryBuilder>... matchers) {
+    return (Matcher)
+        both(is(Matchers.<NestedQueryBuilder>instanceOf(NestedQueryBuilder.class)))
+            .and(allOf(matchers));
+  }
+
+  @SafeVarargs
+  private final FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>> filter(
+      Matcher<QueryBuilder>... matchers) {
+    return hasClauses("filter", BoolQueryBuilder::filter, matchers);
+  }
+
+  @SafeVarargs
+  private final FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>> must(
+      Matcher<QueryBuilder>... matchers) {
+    return hasClauses("must", BoolQueryBuilder::must, matchers);
+  }
+
+  @SafeVarargs
+  private final FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>> mustNot(
+      Matcher<QueryBuilder>... matchers) {
+    return hasClauses("must_not", BoolQueryBuilder::mustNot, matchers);
+  }
+
+  @SafeVarargs
+  private final FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>> should(
+      Matcher<QueryBuilder>... matchers) {
+    return hasClauses("should", BoolQueryBuilder::should, matchers);
+  }
+
+  /** Hide contains() assertion to simplify */
+  @SafeVarargs
+  private final FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>> hasClauses(
+      String name,
+      Function<BoolQueryBuilder, List<QueryBuilder>> func,
+      Matcher<QueryBuilder>... matchers) {
+    return new FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>>(
+        contains(matchers), name, name) {
+      @Override
+      protected List<QueryBuilder> featureValueOf(BoolQueryBuilder query) {
+        return func.apply(query);
+      }
+    };
+  }
+
+  private Matcher<NestedQueryBuilder> path(String expected) {
+    return HasFieldWithValue.hasFieldWithValue("path", "path", is(equalTo(expected)));
+  }
+
+  /** Skip intermediate property along the path. Hide arrayContaining assertion to simplify. */
+  private FeatureMatcher<NestedQueryBuilder, String[]> innerHits(String... expected) {
+    return featureValueOf(
+        "innerHits",
+        arrayContaining(expected),
+        (nestedQuery -> nestedQuery.innerHit().getFetchSourceContext().includes()));
+  }
+
+  @SuppressWarnings("unchecked")
+  private Matcher<FetchSourceContext> fetchSource(String... expected) {
+    if (expected.length == 0) {
+      return anyOf(
+          is(nullValue()),
+          featureValueOf("includes", is(nullValue()), FetchSourceContext::includes),
+          featureValueOf("includes", is(emptyArray()), FetchSourceContext::includes));
     }
-
-    @Test
-    public void multipleDifferentNestedFields() {
-        assertThat(
-            query("SELECT region, nested(employees.firstname), nested(manager.name) " +
-                  "  FROM team " +
-                  "    WHERE nested(employees.age) = 30 AND nested(manager.age) = 50"),
-            source(
-                boolQuery(
-                    filter(
-                        boolQuery(
-                            must(
-                                boolQuery(
-                                    must(
-                                        nestedQuery(
-                                            path("employees"),
-                                            innerHits("employees.firstname")
-                                        ),
-                                        nestedQuery(
-                                            path("manager"),
-                                            innerHits("manager.name")
-                                        )
-                                    )
-                                )
-                            )
-                        )
-                    )
-                ),
-                fetchSource("region")
-            )
-        );
-    }
-
-
-    @Test
-    public void leftJoinWithSelectAll() {
-        assertThat(
-            query("SELECT * FROM team AS t LEFT JOIN t.projects AS p "),
-            source(
-                boolQuery(
-                    filter(
-                        boolQuery(
-                            should(
-                                boolQuery(
-                                    mustNot(
-                                        nestedQuery(
-                                            path("projects")
-                                        )
-                                    )
-                                ),
-                                nestedQuery(
-                                    path("projects"),
-                                    innerHits("projects.*")
-                                )
-                            )
-                        )
-                    )
-                )
-            )
-        );
-    }
-
-    @Test
-    public void leftJoinWithSpecificFields() {
-        assertThat(
-            query("SELECT t.name, p.name, p.started_year FROM team AS t LEFT JOIN t.projects AS p "),
-            source(
-                boolQuery(
-                    filter(
-                        boolQuery(
-                            should(
-                                boolQuery(
-                                    mustNot(
-                                        nestedQuery(
-                                            path("projects")
-                                        )
-                                    )
-                                ),
-                                nestedQuery(
-                                    path("projects"),
-                                    innerHits("projects.name", "projects.started_year")
-                                )
-                            )
-                        )
-                    )
-                ),
-                fetchSource("name")
-            )
-        );
-    }
-
-    private Matcher<SearchSourceBuilder> source(Matcher<QueryBuilder> queryMatcher) {
-        return featureValueOf("query", queryMatcher, SearchSourceBuilder::query);
-    }
-
-    private Matcher<SearchSourceBuilder> source(Matcher<QueryBuilder> queryMatcher,
-                                                Matcher<FetchSourceContext> fetchSourceMatcher) {
-        return allOf(
-            featureValueOf("query", queryMatcher, SearchSourceBuilder::query),
-            featureValueOf("fetchSource", fetchSourceMatcher, SearchSourceBuilder::fetchSource)
-        );
-    }
-
-    /** Asserting instanceOf and continue other chained matchers of subclass requires explicity cast */
-    @SuppressWarnings("unchecked")
-    private Matcher<QueryBuilder> boolQuery(Matcher<BoolQueryBuilder> matcher) {
-        return (Matcher) allOf(instanceOf(BoolQueryBuilder.class), matcher);
+    return featureValueOf(
+        "includes", contains(expected), fetchSource -> Arrays.asList(fetchSource.includes()));
+  }
+
+  private <T, U> FeatureMatcher<T, U> featureValueOf(
+      String name, Matcher<U> subMatcher, Function<T, U> getter) {
+    return new FeatureMatcher<T, U>(subMatcher, name, name) {
+      @Override
+      protected U featureValueOf(T actual) {
+        return getter.apply(actual);
+      }
+    };
+  }
+
+  private SearchSourceBuilder query(String sql) {
+    SQLQueryExpr expr = parseSql(sql);
+    if (sql.contains("nested")) {
+      return translate(expr).source();
     }
 
-    @SafeVarargs
-    @SuppressWarnings("unchecked")
-    private final Matcher<QueryBuilder> nestedQuery(Matcher<NestedQueryBuilder>... matchers) {
-        return (Matcher) both(is(Matchers.<NestedQueryBuilder>instanceOf(NestedQueryBuilder.class))).
-                            and(allOf(matchers));
+    expr = rewrite(expr);
+    return translate(expr).source();
+  }
+
+  private SearchRequest translate(SQLQueryExpr expr) {
+    try {
+      Client mockClient = Mockito.mock(Client.class);
+      SearchRequestBuilder request = new SearchRequestBuilder(mockClient, SearchAction.INSTANCE);
+      Select select = new SqlParser().parseSelect(expr);
+
+      DefaultQueryAction action = new DefaultQueryAction(mockClient, select);
+      action.initialize(request);
+      action.setFields(select.getFields());
+
+      if (select.getWhere() != null) {
+        request.setQuery(QueryMaker.explain(select.getWhere(), select.isQuery));
+      }
+      new NestedFieldProjection(request).project(select.getFields(), select.getNestedJoinType());
+      return request.request();
+    } catch (SqlParseException e) {
+      throw new ParserException("Illegal sql expr: " + expr.toString());
     }
+  }
 
-    @SafeVarargs
-    private final FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>> filter(Matcher<QueryBuilder>... matchers) {
-        return hasClauses("filter", BoolQueryBuilder::filter, matchers);
+  private SQLQueryExpr parseSql(String sql) {
+    ElasticSqlExprParser parser = new ElasticSqlExprParser(sql);
+    SQLExpr expr = parser.expr();
+    if (parser.getLexer().token() != Token.EOF) {
+      throw new ParserException("Illegal sql: " + sql);
     }
+    return (SQLQueryExpr) expr;
+  }
 
-    @SafeVarargs
-    private final FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>> must(Matcher<QueryBuilder>... matchers) {
-        return hasClauses("must", BoolQueryBuilder::must, matchers);
-    }
-
-    @SafeVarargs
-    private final FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>> mustNot(Matcher<QueryBuilder>... matchers) {
-        return hasClauses("must_not", BoolQueryBuilder::mustNot, matchers);
-    }
-
-    @SafeVarargs
-    private final FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>> should(Matcher<QueryBuilder>... matchers) {
-        return hasClauses("should", BoolQueryBuilder::should, matchers);
-    }
-
-    /**  Hide contains() assertion to simplify */
-    @SafeVarargs
-    private final FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>> hasClauses(String name,
-                                                                                  Function<BoolQueryBuilder, List<QueryBuilder>> func,
-                                                                                  Matcher<QueryBuilder>... matchers) {
-        return new FeatureMatcher<BoolQueryBuilder, List<QueryBuilder>>(contains(matchers), name, name) {
-            @Override
-            protected List<QueryBuilder> featureValueOf(BoolQueryBuilder query) {
-                return func.apply(query);
-            }
-        };
-    }
-
-    private Matcher<NestedQueryBuilder> path(String expected) {
-        return HasFieldWithValue.hasFieldWithValue("path", "path", is(equalTo(expected)));
-    }
-
-    /** Skip intermediate property along the path. Hide arrayContaining assertion to simplify. */
-    private FeatureMatcher<NestedQueryBuilder, String[]> innerHits(String... expected) {
-        return featureValueOf("innerHits",
-                              arrayContaining(expected),
-                              (nestedQuery -> nestedQuery.innerHit().getFetchSourceContext().includes()));
-    }
-
-    @SuppressWarnings("unchecked")
-    private Matcher<FetchSourceContext> fetchSource(String... expected) {
-        if (expected.length == 0) {
-            return anyOf(is(nullValue()),
-                         featureValueOf("includes", is(nullValue()), FetchSourceContext::includes),
-                         featureValueOf("includes", is(emptyArray()), FetchSourceContext::includes));
-        }
-        return featureValueOf("includes", contains(expected), fetchSource -> Arrays.asList(fetchSource.includes()));
-    }
-
-    private <T, U> FeatureMatcher<T, U> featureValueOf(String name, Matcher<U> subMatcher, Function<T, U> getter) {
-        return new FeatureMatcher<T, U>(subMatcher, name, name) {
-            @Override
-            protected U featureValueOf(T actual) {
-                return getter.apply(actual);
-            }
-        };
-    }
-
-    private SearchSourceBuilder query(String sql) {
-        SQLQueryExpr expr = parseSql(sql);
-        if (sql.contains("nested")) {
-            return translate(expr).source();
-        }
-
-        expr = rewrite(expr);
-        return translate(expr).source();
-    }
-
-    private SearchRequest translate(SQLQueryExpr expr) {
-        try {
-            Client mockClient = Mockito.mock(Client.class);
-            SearchRequestBuilder request = new SearchRequestBuilder(mockClient, SearchAction.INSTANCE);
-            Select select = new SqlParser().parseSelect(expr);
-
-            DefaultQueryAction action = new DefaultQueryAction(mockClient, select);
-            action.initialize(request);
-            action.setFields(select.getFields());
-
-            if (select.getWhere() != null) {
-                request.setQuery(QueryMaker.explain(select.getWhere(), select.isQuery));
-            }
-            new NestedFieldProjection(request).project(select.getFields(), select.getNestedJoinType());
-            return request.request();
-        }
-        catch (SqlParseException e) {
-            throw new ParserException("Illegal sql expr: " + expr.toString());
-        }
-    }
-
-    private SQLQueryExpr parseSql(String sql) {
-        ElasticSqlExprParser parser = new ElasticSqlExprParser(sql);
-        SQLExpr expr = parser.expr();
-        if (parser.getLexer().token() != Token.EOF) {
-            throw new ParserException("Illegal sql: " + sql);
-        }
-        return (SQLQueryExpr) expr;
-    }
-
-    private SQLQueryExpr rewrite(SQLQueryExpr expr) {
-        expr.accept(new NestedFieldRewriter());
-        return expr;
-    }
+  private SQLQueryExpr rewrite(SQLQueryExpr expr) {
+    expr.accept(new NestedFieldRewriter());
+    return expr;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldRewriterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldRewriterTest.java
index 58a6f7e244..8cf99a0a40 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldRewriterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldRewriterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static java.util.stream.IntStream.range;
@@ -29,630 +28,607 @@
 
 public class NestedFieldRewriterTest {
 
-    @Test
-    public void regression() {
-        noImpact("SELECT * FROM team");
-        noImpact("SELECT region FROM team/test, employees/test");
-        noImpact("SELECT manager.name FROM team WHERE region = 'US' ORDER BY COUNT(*)");
-        noImpact("SELECT COUNT(*) FROM team GROUP BY region");
-    }
-
-    @Test
-    public void selectWithoutFrom() {
-        // Expect no exception thrown
-        query("SELECT now()");
-    }
-
-    @Test
-    public void selectAll() {
-        same(
-            query("SELECT * FROM team t, t.employees"),
-            query("SELECT *, nested(employees.*, 'employees') FROM team")
-        );
-    }
-
-    @Test
-    public void selectAllWithGroupBy() {
-        same(
-            query("SELECT * FROM team t, t.employees e GROUP BY e.firstname"),
-            query("SELECT * FROM team GROUP BY nested(employees.firstname, 'employees')")
-        );
-    }
-
-    @Test
-    public void selectAllWithCondition() {
-        same(
-            query("SELECT * FROM team t, t.employees e WHERE e.age = 26"),
-            query("SELECT *, nested(employees.*, 'employees') FROM team WHERE nested(employees.age, 'employees') = 26")
-        );
-    }
-
-    @Test
-    public void singleCondition() {
-        same(
-            query("SELECT region FROM team t, t.employees e WHERE e.age = 26"),
-            query("SELECT region FROM team WHERE nested(employees.age, 'employees') = 26")
-        );
-    }
-
-    @Test
-    public void mixedWithObjectType() {
-        same(
-            query("SELECT region FROM team t, t.employees e WHERE e.age > 30 OR manager.age = 50"),
-            query("SELECT region FROM team WHERE nested(employees.age, 'employees') > 30 OR manager.age = 50")
-        );
-    }
-
-    @Test
-    public void noAlias() {
-        same(
-            query("SELECT region FROM team t, t.employees WHERE employees.age = 26"),
-            query("SELECT region FROM team WHERE nested(employees.age, 'employees') = 26")
-        );
-    }
-
-    @Test(expected = AssertionError.class)
-    public void multipleRegularTables() {
-        same(
-            query("SELECT region FROM team t, t.employees e, company c WHERE e.age = 26"),
-            query("SELECT region FROM team, company WHERE nested(employees.age) = 26")
-        );
-    }
-
-    @Test
-    public void eraseParentAlias() {
-        same(
-            query("SELECT t.age FROM team t, t.employees e WHERE t.region = 'US' AND age > 26"),
-            query("SELECT age FROM team WHERE region = 'US' AND age > 26")
-        );
-        noImpact("SELECT t.age FROM team t WHERE t.region = 'US'");
-    }
-
-    @Test
-    public void select() {
-        same(
-            query("SELECT e.age FROM team t, t.employees e"),
-            query("SELECT nested(employees.age, 'employees' ) FROM team")
-        );
-    }
-
-    @Test
-    public void aggregationInSelect() {
-        same(
-            query("SELECT AVG(e.age) FROM team t, t.employees e"),
-            query("SELECT AVG(nested(employees.age, 'employees')) FROM team")
-        );
-    }
-
-    @Test
-    public void multipleAggregationsInSelect() {
-        same(
-            query("SELECT COUNT(*), AVG(e.age) FROM team t, t.employees e"),
-            query("SELECT COUNT(*), AVG(nested(employees.age, 'employees')) FROM team")
-        );
-    }
-
-    @Test
-    public void groupBy() {
-        same(
-            query("SELECT e.firstname, COUNT(*) FROM team t, t.employees e GROUP BY e.firstname"),
-            query("SELECT nested(employees.firstname, 'employees'), COUNT(*) FROM team GROUP BY nested(employees.firstname, 'employees')")
-        );
-    }
-
-    @Test
-    public void multipleFieldsInGroupBy() {
-        same(
-            query("SELECT COUNT(*) FROM team t, t.employees e GROUP BY t.manager, e.age"),
-            query("SELECT COUNT(*) FROM team GROUP BY manager, nested(employees.age, 'employees')")
-        );
-    }
-
-    @Test
-    public void orderBy() {
-        same(
-            query("SELECT region FROM team t, t.employees e ORDER BY e.age"),
-            query("SELECT region FROM team ORDER BY nested(employees.age)")
-        );
-    }
-
-    @Test
-    public void multipleConditions() {
-        same(
-            query("SELECT region " +
-                  "FROM team t, t.manager m, t.employees e " +
-                  "WHERE t.department = 'IT' AND " +
-                  "      (e.age = 26 OR (e.firstname = 'John' AND e.lastname = 'Smith')) AND " +
-                  "      t.region = 'US' AND " +
-                  "      (m.name = 'Alice' AND m.age = 50)"),
-            query("SELECT region " +
-                  "FROM team " +
-                  "WHERE department = 'IT' AND " +
-                  "      nested(\"employees\", employees.age = 26 OR (employees.firstname = 'John' AND employees.lastname = 'Smith')) AND " +
-                  "      region = 'US' AND " +
-                  "      nested(\"manager\", manager.name = 'Alice' AND manager.age = 50)")
-        );
-    }
-
-    @Test
-    public void multipleFieldsInFrom() {
-        same(
-            query("SELECT region FROM team/test t, t.manager m, t.employees e WHERE m.age = 30 AND e.age = 26"),
-            query("SELECT region FROM team/test WHERE nested(manager.age, 'manager') = 30 " +
-                  "AND nested(employees.age, 'employees') = 26")
-        );
-    }
-
-    @Test
-    public void unionAll() {
-        // NLPchina doesn't support UNION (intersection)
-        same(
-            query("SELECT region FROM team t, t.employees e WHERE e.age = 26 " +
-                  "UNION ALL " +
-                  "SELECT region FROM team t, t.employees e WHERE e.firstname = 'John'"),
-            query("SELECT region FROM team WHERE nested(employees.age, 'employees') = 26 " +
-                  "UNION ALL " +
-                  "SELECT region FROM team WHERE nested(employees.firstname, 'employees') = 'John'")
-        );
-    }
-
-    @Test
-    public void minus() {
-        same(
-            query("SELECT region FROM team t, t.employees e WHERE e.age = 26 " +
-                  "MINUS " +
-                  "SELECT region FROM team t, t.employees e WHERE e.firstname = 'John'"),
-            query("SELECT region FROM team WHERE nested(employees.age, 'employees') = 26 " +
-                  "MINUS " +
-                  "SELECT region FROM team WHERE nested(employees.firstname, 'employees') = 'John'")
-        );
-    }
-
-    public void join() {
-        // TODO
-    }
-
-    @Test
-    public void subQuery() {
-        // Subquery only support IN and TERMS
-        same(
-            query("SELECT region FROM team t, t.employees e " +
-                  "  WHERE e.age IN " +
-                  "    (SELECT t1.manager.age FROM team t1, t1.employees e1 WHERE e1.age > 0)"),
-            query("SELECT region FROM team " +
-                  "  WHERE nested(employees.age, 'employees') IN " +
-                  "    (SELECT manager.age FROM team WHERE nested(employees.age, 'employees') > 0)")
-        );
-    }
-
-    @Test
-    public void subQueryWitSameAlias() {
-        // Inner alias e shadow outer alias e of nested field
-        same(
-            query("SELECT name FROM team t, t.employees e " +
-                  "  WHERE e.age IN " +
-                  "    (SELECT e.age FROM team e, e.manager m WHERE e.age > 0 OR m.name = 'Alice')"),
-            query("SELECT name FROM team " +
-                  "  WHERE nested(employees.age, 'employees') IN " +
-                  "    (SELECT age FROM team WHERE age > 0 OR nested(manager.name, 'manager') = 'Alice')")
-        );
-    }
-
-    @Test
-    public void isNotNull() {
-        same(
-                query("SELECT e.name " +
-                      "FROM employee as e, e.projects as p " +
-                      "WHERE p IS NOT MISSING"),
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE nested(projects, 'projects') IS NOT MISSING")
-        );
-    }
-
-    @Test
-    public void isNotNullAndCondition() {
-        same(
-                query("SELECT e.name " +
-                      "FROM employee as e, e.projects as p " +
-                      "WHERE p IS NOT MISSING AND p.name LIKE 'security'"),
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE nested('projects', projects IS NOT MISSING AND projects.name LIKE 'security')")
-        );
-    }
-
-    @Test
-    public void multiCondition() {
-        same(
-                query("SELECT e.name FROM employee as e, e.projects as p WHERE p.year = 2016 and p.name LIKE 'security'"),
-                query("SELECT name FROM employee WHERE nested('projects', projects.year = 2016 AND projects.name LIKE 'security')")
-        );
-    }
-
-    @Test
-    public void nestedAndParentCondition() {
-        same(
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE nested(projects, 'projects') IS NOT MISSING AND name LIKE 'security'"),
-                query("SELECT e.name " +
-                      "FROM employee e, e.projects p " +
-                      "WHERE p IS NOT MISSING AND e.name LIKE 'security'")
-        );
-    }
-
-    @Test
-    public void aggWithWhereOnParent() {
-        same(
-                query("SELECT e.name, COUNT(p) as c " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE e.name like '%smith%' " +
-                      "GROUP BY e.name " +
-                      "HAVING c > 1"),
-                query("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                      "FROM employee " +
-                      "WHERE name LIKE '%smith%' " +
-                      "GROUP BY name " +
-                      "HAVING c > 1")
-        );
-
-    }
-
-    @Test
-    public void aggWithWhereOnNested() {
-        same(
-                query("SELECT e.name, COUNT(p) as c " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE p.name LIKE '%security%' " +
-                      "GROUP BY e.name " +
-                      "HAVING c > 1"),
-                query("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                      "FROM employee " +
-                      "WHERE nested(projects.name, 'projects') LIKE '%security%' " +
-                      "GROUP BY name " +
-                      "HAVING c > 1")
-        );
-    }
-
-    @Test
-    public void aggWithWhereOnParentOrNested() {
-        same(
-                query("SELECT e.name, COUNT(p) as c " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE e.name like '%smith%' or p.name LIKE '%security%' " +
-                      "GROUP BY e.name " +
-                      "HAVING c > 1"),
-                query("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                      "FROM employee " +
-                      "WHERE name LIKE '%smith%' OR nested(projects.name, 'projects') LIKE '%security%' " +
-                      "GROUP BY name " +
-                      "HAVING c > 1")
-        );
-    }
-
-    @Test
-    public void aggWithWhereOnParentAndNested() {
-        same(
-                query("SELECT e.name, COUNT(p) as c " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE e.name like '%smith%' AND p.name LIKE '%security%' " +
-                      "GROUP BY e.name " +
-                      "HAVING c > 1"),
-                query("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                      "FROM employee " +
-                      "WHERE name LIKE '%smith%' AND nested(projects.name, 'projects') LIKE '%security%' " +
-                      "GROUP BY name " +
-                      "HAVING c > 1")
-        );
-    }
-
-    @Test
-    public void aggWithWhereOnNestedAndNested() {
-        same(
-                query("SELECT e.name, COUNT(p) as c " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE p.started_year > 1990 AND p.name LIKE '%security%' " +
-                      "GROUP BY e.name " +
-                      "HAVING c > 1"),
-                query("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                      "FROM employee " +
-                      "WHERE nested('projects', projects.started_year > 1990 AND projects.name LIKE '%security%') " +
-                      "GROUP BY name " +
-                      "HAVING c > 1")
-        );
-    }
-
-    @Test
-    public void aggWithWhereOnNestedOrNested() {
-        same(
-                query("SELECT e.name, COUNT(p) as c " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE p.started_year > 1990 OR p.name LIKE '%security%' " +
-                      "GROUP BY e.name " +
-                      "HAVING c > 1"),
-                query("SELECT name, COUNT(nested(projects, 'projects')) AS c " +
-                      "FROM employee " +
-                      "WHERE nested('projects', projects.started_year > 1990 OR projects.name LIKE '%security%') " +
-                      "GROUP BY name " +
-                      "HAVING c > 1")
-        );
-    }
-
-    @Test
-    public void aggInHavingWithWhereOnParent() {
-        same(
-                query("SELECT e.name " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE e.name like '%smith%' " +
-                      "GROUP BY e.name " +
-                      "HAVING COUNT(p) > 1"),
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE name LIKE '%smith%' " +
-                      "GROUP BY name " +
-                      "HAVING COUNT(nested(projects, 'projects')) > 1")
-        );
-
-    }
-
-    @Test
-    public void aggInHavingWithWhereOnNested() {
-        same(
-                query("SELECT e.name " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE p.name LIKE '%security%' " +
-                      "GROUP BY e.name " +
-                      "HAVING COUNT(p) > 1"),
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE nested(projects.name, 'projects') LIKE '%security%' " +
-                      "GROUP BY name " +
-                      "HAVING COUNT(nested(projects, 'projects')) > 1")
-        );
-    }
-
-    @Test
-    public void aggInHavingWithWhereOnParentOrNested() {
-        same(
-                query("SELECT e.name " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE e.name like '%smith%' or p.name LIKE '%security%' " +
-                      "GROUP BY e.name " +
-                      "HAVING COUNT(p) > 1"),
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE name LIKE '%smith%' OR nested(projects.name, 'projects') LIKE '%security%' " +
-                      "GROUP BY name " +
-                      "HAVING COUNT(nested(projects, 'projects')) > 1")
-        );
-    }
-
-    @Test
-    public void aggInHavingWithWhereOnParentAndNested() {
-        same(
-                query("SELECT e.name " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE e.name like '%smith%' AND p.name LIKE '%security%' " +
-                      "GROUP BY e.name " +
-                      "HAVING COUNT(p) > 1"),
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE name LIKE '%smith%' AND nested(projects.name, 'projects') LIKE '%security%' " +
-                      "GROUP BY name " +
-                      "HAVING COUNT(nested(projects, 'projects')) > 1")
-        );
-    }
-
-    @Test
-    public void aggInHavingWithWhereOnNestedAndNested() {
-        same(
-                query("SELECT e.name " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE p.started_year > 1990 AND p.name LIKE '%security%' " +
-                      "GROUP BY e.name " +
-                      "HAVING COUNT(p) > 1"),
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE nested('projects', projects.started_year > 1990 AND projects.name LIKE '%security%') " +
-                      "GROUP BY name " +
-                      "HAVING COUNT(nested(projects, 'projects')) > 1")
-        );
-    }
-
-    @Test
-    public void aggInHavingWithWhereOnNestedOrNested() {
-        same(
-                query("SELECT e.name " +
-                      "FROM employee AS e, e.projects AS p " +
-                      "WHERE p.started_year > 1990 OR p.name LIKE '%security%' " +
-                      "GROUP BY e.name " +
-                      "HAVING COUNT(p) > 1"),
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE nested('projects', projects.started_year > 1990 OR projects.name LIKE '%security%') " +
-                      "GROUP BY name " +
-                      "HAVING COUNT(nested(projects, 'projects')) > 1")
-        );
-    }
-
-    @Test
-    public void notIsNotNull() {
-        same(
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE not (nested(projects, 'projects') IS NOT MISSING)"),
-                query("SELECT e.name " +
-                      "FROM employee as e, e.projects as p " +
-                      "WHERE not (p IS NOT MISSING)")
-        );
-    }
-
-    @Test
-    public void notIsNotNullAndCondition() {
-        same(
-                query("SELECT e.name " +
-                      "FROM employee as e, e.projects as p " +
-                      "WHERE not (p IS NOT MISSING AND p.name LIKE 'security')"),
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE not nested('projects', projects IS NOT MISSING AND projects.name LIKE 'security')")
-        );
-    }
-
-    @Test
-    public void notMultiCondition() {
-        same(
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE not nested('projects', projects.year = 2016 AND projects.name LIKE 'security')"),
-                query("SELECT e.name " +
-                      "FROM employee as e, e.projects as p " +
-                      "WHERE not (p.year = 2016 and p.name LIKE 'security')")
-        );
-    }
-
-    @Test
-    public void notNestedAndParentCondition() {
-        same(
-                query("SELECT name " +
-                      "FROM employee " +
-                      "WHERE (not nested(projects, 'projects') IS NOT MISSING) AND name LIKE 'security'"),
-                query("SELECT e.name " +
-                      "FROM employee e, e.projects p " +
-                      "WHERE not (p IS NOT MISSING) AND e.name LIKE 'security'")
-        );
-    }
-
-    private void noImpact(String sql) {
-        same(parse(sql), rewrite(parse(sql)));
-    }
-
-    /**
-     * The intention for this assert method is:
-     *
-     * 1) MySqlSelectQueryBlock.equals() doesn't call super.equals().
-     *    But select items, from, where and group by are all held by parent class SQLSelectQueryBlock.
-     *
-     * 2) SQLSelectGroupByClause doesn't implement equals() at all..
-     *    MySqlSelectGroupByExpr compares identity of expression..
-     *
-     * 3) MySqlUnionQuery doesn't implement equals() at all
-     */
-    private void same(SQLQueryExpr actual, SQLQueryExpr expected) {
-        assertEquals(expected.getClass(), actual.getClass());
-
-        SQLSelect expectedQuery = expected.getSubQuery();
-        SQLSelect actualQuery = actual.getSubQuery();
-        assertEquals(expectedQuery.getOrderBy(), actualQuery.getOrderBy());
-        assertQuery(expectedQuery, actualQuery);
-    }
-
-    private void assertQuery(SQLSelect expected, SQLSelect actual) {
-        SQLSelectQuery expectedQuery = expected.getQuery();
-        SQLSelectQuery actualQuery = actual.getQuery();
-        if (actualQuery instanceof SQLSelectQueryBlock) {
-            assertQueryBlock(
-                (SQLSelectQueryBlock) expectedQuery,
-                (SQLSelectQueryBlock) actualQuery
-            );
-        }
-        else if (actualQuery instanceof SQLUnionQuery) {
-            assertQueryBlock(
-                (SQLSelectQueryBlock) ((SQLUnionQuery) expectedQuery).getLeft(),
-                (SQLSelectQueryBlock) ((SQLUnionQuery) actualQuery).getLeft()
-            );
-            assertQueryBlock(
-                (SQLSelectQueryBlock) ((SQLUnionQuery) expectedQuery).getRight(),
-                (SQLSelectQueryBlock) ((SQLUnionQuery) actualQuery).getRight()
-            );
-            assertEquals(
-                ((SQLUnionQuery) expectedQuery).getOperator(),
-                ((SQLUnionQuery) actualQuery).getOperator()
-            );
-        }
-        else {
-            throw new IllegalStateException("Unsupported test SQL");
-        }
-    }
-
-    private void assertQueryBlock(SQLSelectQueryBlock expected, SQLSelectQueryBlock actual) {
-        assertEquals("SELECT", expected.getSelectList(), actual.getSelectList());
-        assertEquals("INTO", expected.getInto(), actual.getInto());
-        assertEquals("WHERE", expected.getWhere(), actual.getWhere());
-        if (actual.getWhere() instanceof SQLInSubQueryExpr) {
-            assertQuery(
-                ((SQLInSubQueryExpr) expected.getWhere()).getSubQuery(),
-                ((SQLInSubQueryExpr) actual.getWhere()).getSubQuery()
-            );
-        }
-        assertEquals("PARENTHESIZED", expected.isParenthesized(), actual.isParenthesized());
-        assertEquals("DISTION", expected.getDistionOption(), actual.getDistionOption());
-        assertFrom(expected, actual);
-        if (!(expected.getGroupBy() == null && actual.getGroupBy() == null)) {
-            assertGroupBy(expected.getGroupBy(), actual.getGroupBy());
-        }
-    }
-
-    private void assertFrom(SQLSelectQueryBlock expected, SQLSelectQueryBlock actual) {
-        // Only 2 tables JOIN at most is supported
-        if (expected.getFrom() instanceof SQLExprTableSource) {
-            assertTable(expected.getFrom(), actual.getFrom());
-        } else {
-            assertEquals(actual.getFrom().getClass(), SQLJoinTableSource.class);
-            assertTable(
-                ((SQLJoinTableSource) expected.getFrom()).getLeft(),
-                ((SQLJoinTableSource) actual.getFrom()).getLeft()
-            );
-            assertTable(
-                ((SQLJoinTableSource) expected.getFrom()).getRight(),
-                ((SQLJoinTableSource) actual.getFrom()).getRight()
-            );
-            assertEquals(
-                ((SQLJoinTableSource) expected.getFrom()).getJoinType(),
-                ((SQLJoinTableSource) actual.getFrom()).getJoinType()
-            );
-        }
-    }
-
-    private void assertGroupBy(SQLSelectGroupByClause expected, SQLSelectGroupByClause actual) {
-        assertEquals("HAVING", expected.getHaving(), actual.getHaving());
-
-        List<SQLExpr> expectedGroupby = expected.getItems();
-        List<SQLExpr> actualGroupby = actual.getItems();
-        assertEquals(expectedGroupby.size(), actualGroupby.size());
-        range(0, expectedGroupby.size()).
-            forEach(i -> assertEquals(
-                ((MySqlSelectGroupByExpr) expectedGroupby.get(i)).getExpr(),
-                ((MySqlSelectGroupByExpr) actualGroupby.get(i)).getExpr())
-            );
-    }
-
-    private void assertTable(SQLTableSource expect, SQLTableSource actual) {
-        assertEquals(SQLExprTableSource.class, expect.getClass());
-        assertEquals(SQLExprTableSource.class, actual.getClass());
-        assertEquals(((SQLExprTableSource) expect).getExpr(), ((SQLExprTableSource) actual).getExpr());
-        assertEquals(expect.getAlias(), actual.getAlias());
-    }
-
-    /**
-     * Walk through extra rewrite logic if NOT found "nested" in SQL query statement.
-     * Otherwise return as before so that original logic be compared with result of rewrite.
-     *
-     * @param sql  Test sql
-     * @return     Node parsed out of sql
-     */
-    private SQLQueryExpr query(String sql) {
-        SQLQueryExpr expr = SqlParserUtils.parse(sql);
-        if (sql.contains("nested")) {
-            return expr;
-        }
-        return rewrite(expr);
-    }
-
-    private SQLQueryExpr rewrite(SQLQueryExpr expr) {
-        expr.accept(new NestedFieldRewriter());
-        return expr;
-    }
-
+  @Test
+  public void regression() {
+    noImpact("SELECT * FROM team");
+    noImpact("SELECT region FROM team/test, employees/test");
+    noImpact("SELECT manager.name FROM team WHERE region = 'US' ORDER BY COUNT(*)");
+    noImpact("SELECT COUNT(*) FROM team GROUP BY region");
+  }
+
+  @Test
+  public void selectWithoutFrom() {
+    // Expect no exception thrown
+    query("SELECT now()");
+  }
+
+  @Test
+  public void selectAll() {
+    same(
+        query("SELECT * FROM team t, t.employees"),
+        query("SELECT *, nested(employees.*, 'employees') FROM team"));
+  }
+
+  @Test
+  public void selectAllWithGroupBy() {
+    same(
+        query("SELECT * FROM team t, t.employees e GROUP BY e.firstname"),
+        query("SELECT * FROM team GROUP BY nested(employees.firstname, 'employees')"));
+  }
+
+  @Test
+  public void selectAllWithCondition() {
+    same(
+        query("SELECT * FROM team t, t.employees e WHERE e.age = 26"),
+        query(
+            "SELECT *, nested(employees.*, 'employees') FROM team WHERE nested(employees.age,"
+                + " 'employees') = 26"));
+  }
+
+  @Test
+  public void singleCondition() {
+    same(
+        query("SELECT region FROM team t, t.employees e WHERE e.age = 26"),
+        query("SELECT region FROM team WHERE nested(employees.age, 'employees') = 26"));
+  }
+
+  @Test
+  public void mixedWithObjectType() {
+    same(
+        query("SELECT region FROM team t, t.employees e WHERE e.age > 30 OR manager.age = 50"),
+        query(
+            "SELECT region FROM team WHERE nested(employees.age, 'employees') > 30 OR manager.age ="
+                + " 50"));
+  }
+
+  @Test
+  public void noAlias() {
+    same(
+        query("SELECT region FROM team t, t.employees WHERE employees.age = 26"),
+        query("SELECT region FROM team WHERE nested(employees.age, 'employees') = 26"));
+  }
+
+  @Test(expected = AssertionError.class)
+  public void multipleRegularTables() {
+    same(
+        query("SELECT region FROM team t, t.employees e, company c WHERE e.age = 26"),
+        query("SELECT region FROM team, company WHERE nested(employees.age) = 26"));
+  }
+
+  @Test
+  public void eraseParentAlias() {
+    same(
+        query("SELECT t.age FROM team t, t.employees e WHERE t.region = 'US' AND age > 26"),
+        query("SELECT age FROM team WHERE region = 'US' AND age > 26"));
+    noImpact("SELECT t.age FROM team t WHERE t.region = 'US'");
+  }
+
+  @Test
+  public void select() {
+    same(
+        query("SELECT e.age FROM team t, t.employees e"),
+        query("SELECT nested(employees.age, 'employees' ) FROM team"));
+  }
+
+  @Test
+  public void aggregationInSelect() {
+    same(
+        query("SELECT AVG(e.age) FROM team t, t.employees e"),
+        query("SELECT AVG(nested(employees.age, 'employees')) FROM team"));
+  }
+
+  @Test
+  public void multipleAggregationsInSelect() {
+    same(
+        query("SELECT COUNT(*), AVG(e.age) FROM team t, t.employees e"),
+        query("SELECT COUNT(*), AVG(nested(employees.age, 'employees')) FROM team"));
+  }
+
+  @Test
+  public void groupBy() {
+    same(
+        query("SELECT e.firstname, COUNT(*) FROM team t, t.employees e GROUP BY e.firstname"),
+        query(
+            "SELECT nested(employees.firstname, 'employees'), COUNT(*) FROM team GROUP BY"
+                + " nested(employees.firstname, 'employees')"));
+  }
+
+  @Test
+  public void multipleFieldsInGroupBy() {
+    same(
+        query("SELECT COUNT(*) FROM team t, t.employees e GROUP BY t.manager, e.age"),
+        query("SELECT COUNT(*) FROM team GROUP BY manager, nested(employees.age, 'employees')"));
+  }
+
+  @Test
+  public void orderBy() {
+    same(
+        query("SELECT region FROM team t, t.employees e ORDER BY e.age"),
+        query("SELECT region FROM team ORDER BY nested(employees.age)"));
+  }
+
+  @Test
+  public void multipleConditions() {
+    same(
+        query(
+            "SELECT region "
+                + "FROM team t, t.manager m, t.employees e "
+                + "WHERE t.department = 'IT' AND "
+                + "      (e.age = 26 OR (e.firstname = 'John' AND e.lastname = 'Smith')) AND "
+                + "      t.region = 'US' AND "
+                + "      (m.name = 'Alice' AND m.age = 50)"),
+        query(
+            "SELECT region FROM team WHERE department = 'IT' AND       nested(\"employees\","
+                + " employees.age = 26 OR (employees.firstname = 'John' AND employees.lastname ="
+                + " 'Smith')) AND       region = 'US' AND       nested(\"manager\", manager.name ="
+                + " 'Alice' AND manager.age = 50)"));
+  }
+
+  @Test
+  public void multipleFieldsInFrom() {
+    same(
+        query(
+            "SELECT region FROM team/test t, t.manager m, t.employees e WHERE m.age = 30 AND e.age"
+                + " = 26"),
+        query(
+            "SELECT region FROM team/test WHERE nested(manager.age, 'manager') = 30 "
+                + "AND nested(employees.age, 'employees') = 26"));
+  }
+
+  @Test
+  public void unionAll() {
+    // NLPchina doesn't support UNION (intersection)
+    same(
+        query(
+            "SELECT region FROM team t, t.employees e WHERE e.age = 26 "
+                + "UNION ALL "
+                + "SELECT region FROM team t, t.employees e WHERE e.firstname = 'John'"),
+        query(
+            "SELECT region FROM team WHERE nested(employees.age, 'employees') = 26 UNION ALL SELECT"
+                + " region FROM team WHERE nested(employees.firstname, 'employees') = 'John'"));
+  }
+
+  @Test
+  public void minus() {
+    same(
+        query(
+            "SELECT region FROM team t, t.employees e WHERE e.age = 26 "
+                + "MINUS "
+                + "SELECT region FROM team t, t.employees e WHERE e.firstname = 'John'"),
+        query(
+            "SELECT region FROM team WHERE nested(employees.age, 'employees') = 26 MINUS SELECT"
+                + " region FROM team WHERE nested(employees.firstname, 'employees') = 'John'"));
+  }
+
+  public void join() {
+    // TODO
+  }
+
+  @Test
+  public void subQuery() {
+    // Subquery only support IN and TERMS
+    same(
+        query(
+            "SELECT region FROM team t, t.employees e "
+                + "  WHERE e.age IN "
+                + "    (SELECT t1.manager.age FROM team t1, t1.employees e1 WHERE e1.age > 0)"),
+        query(
+            "SELECT region FROM team   WHERE nested(employees.age, 'employees') IN     (SELECT"
+                + " manager.age FROM team WHERE nested(employees.age, 'employees') > 0)"));
+  }
+
+  @Test
+  public void subQueryWitSameAlias() {
+    // Inner alias e shadow outer alias e of nested field
+    same(
+        query(
+            "SELECT name FROM team t, t.employees e   WHERE e.age IN     (SELECT e.age FROM team e,"
+                + " e.manager m WHERE e.age > 0 OR m.name = 'Alice')"),
+        query(
+            "SELECT name FROM team   WHERE nested(employees.age, 'employees') IN     (SELECT age"
+                + " FROM team WHERE age > 0 OR nested(manager.name, 'manager') = 'Alice')"));
+  }
+
+  @Test
+  public void isNotNull() {
+    same(
+        query("SELECT e.name " + "FROM employee as e, e.projects as p " + "WHERE p IS NOT MISSING"),
+        query(
+            "SELECT name "
+                + "FROM employee "
+                + "WHERE nested(projects, 'projects') IS NOT MISSING"));
+  }
+
+  @Test
+  public void isNotNullAndCondition() {
+    same(
+        query(
+            "SELECT e.name "
+                + "FROM employee as e, e.projects as p "
+                + "WHERE p IS NOT MISSING AND p.name LIKE 'security'"),
+        query(
+            "SELECT name FROM employee WHERE nested('projects', projects IS NOT MISSING AND"
+                + " projects.name LIKE 'security')"));
+  }
+
+  @Test
+  public void multiCondition() {
+    same(
+        query(
+            "SELECT e.name FROM employee as e, e.projects as p WHERE p.year = 2016 and p.name LIKE"
+                + " 'security'"),
+        query(
+            "SELECT name FROM employee WHERE nested('projects', projects.year = 2016 AND"
+                + " projects.name LIKE 'security')"));
+  }
+
+  @Test
+  public void nestedAndParentCondition() {
+    same(
+        query(
+            "SELECT name "
+                + "FROM employee "
+                + "WHERE nested(projects, 'projects') IS NOT MISSING AND name LIKE 'security'"),
+        query(
+            "SELECT e.name "
+                + "FROM employee e, e.projects p "
+                + "WHERE p IS NOT MISSING AND e.name LIKE 'security'"));
+  }
+
+  @Test
+  public void aggWithWhereOnParent() {
+    same(
+        query(
+            "SELECT e.name, COUNT(p) as c "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE e.name like '%smith%' "
+                + "GROUP BY e.name "
+                + "HAVING c > 1"),
+        query(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c "
+                + "FROM employee "
+                + "WHERE name LIKE '%smith%' "
+                + "GROUP BY name "
+                + "HAVING c > 1"));
+  }
+
+  @Test
+  public void aggWithWhereOnNested() {
+    same(
+        query(
+            "SELECT e.name, COUNT(p) as c "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE p.name LIKE '%security%' "
+                + "GROUP BY e.name "
+                + "HAVING c > 1"),
+        query(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c "
+                + "FROM employee "
+                + "WHERE nested(projects.name, 'projects') LIKE '%security%' "
+                + "GROUP BY name "
+                + "HAVING c > 1"));
+  }
+
+  @Test
+  public void aggWithWhereOnParentOrNested() {
+    same(
+        query(
+            "SELECT e.name, COUNT(p) as c "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE e.name like '%smith%' or p.name LIKE '%security%' "
+                + "GROUP BY e.name "
+                + "HAVING c > 1"),
+        query(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c FROM employee WHERE name LIKE"
+                + " '%smith%' OR nested(projects.name, 'projects') LIKE '%security%' GROUP BY name"
+                + " HAVING c > 1"));
+  }
+
+  @Test
+  public void aggWithWhereOnParentAndNested() {
+    same(
+        query(
+            "SELECT e.name, COUNT(p) as c "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE e.name like '%smith%' AND p.name LIKE '%security%' "
+                + "GROUP BY e.name "
+                + "HAVING c > 1"),
+        query(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c FROM employee WHERE name LIKE"
+                + " '%smith%' AND nested(projects.name, 'projects') LIKE '%security%' GROUP BY name"
+                + " HAVING c > 1"));
+  }
+
+  @Test
+  public void aggWithWhereOnNestedAndNested() {
+    same(
+        query(
+            "SELECT e.name, COUNT(p) as c "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE p.started_year > 1990 AND p.name LIKE '%security%' "
+                + "GROUP BY e.name "
+                + "HAVING c > 1"),
+        query(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c FROM employee WHERE"
+                + " nested('projects', projects.started_year > 1990 AND projects.name LIKE"
+                + " '%security%') GROUP BY name HAVING c > 1"));
+  }
+
+  @Test
+  public void aggWithWhereOnNestedOrNested() {
+    same(
+        query(
+            "SELECT e.name, COUNT(p) as c "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE p.started_year > 1990 OR p.name LIKE '%security%' "
+                + "GROUP BY e.name "
+                + "HAVING c > 1"),
+        query(
+            "SELECT name, COUNT(nested(projects, 'projects')) AS c FROM employee WHERE"
+                + " nested('projects', projects.started_year > 1990 OR projects.name LIKE"
+                + " '%security%') GROUP BY name HAVING c > 1"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnParent() {
+    same(
+        query(
+            "SELECT e.name "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE e.name like '%smith%' "
+                + "GROUP BY e.name "
+                + "HAVING COUNT(p) > 1"),
+        query(
+            "SELECT name "
+                + "FROM employee "
+                + "WHERE name LIKE '%smith%' "
+                + "GROUP BY name "
+                + "HAVING COUNT(nested(projects, 'projects')) > 1"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnNested() {
+    same(
+        query(
+            "SELECT e.name "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE p.name LIKE '%security%' "
+                + "GROUP BY e.name "
+                + "HAVING COUNT(p) > 1"),
+        query(
+            "SELECT name "
+                + "FROM employee "
+                + "WHERE nested(projects.name, 'projects') LIKE '%security%' "
+                + "GROUP BY name "
+                + "HAVING COUNT(nested(projects, 'projects')) > 1"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnParentOrNested() {
+    same(
+        query(
+            "SELECT e.name "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE e.name like '%smith%' or p.name LIKE '%security%' "
+                + "GROUP BY e.name "
+                + "HAVING COUNT(p) > 1"),
+        query(
+            "SELECT name FROM employee WHERE name LIKE '%smith%' OR nested(projects.name,"
+                + " 'projects') LIKE '%security%' GROUP BY name HAVING COUNT(nested(projects,"
+                + " 'projects')) > 1"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnParentAndNested() {
+    same(
+        query(
+            "SELECT e.name "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE e.name like '%smith%' AND p.name LIKE '%security%' "
+                + "GROUP BY e.name "
+                + "HAVING COUNT(p) > 1"),
+        query(
+            "SELECT name FROM employee WHERE name LIKE '%smith%' AND nested(projects.name,"
+                + " 'projects') LIKE '%security%' GROUP BY name HAVING COUNT(nested(projects,"
+                + " 'projects')) > 1"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnNestedAndNested() {
+    same(
+        query(
+            "SELECT e.name "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE p.started_year > 1990 AND p.name LIKE '%security%' "
+                + "GROUP BY e.name "
+                + "HAVING COUNT(p) > 1"),
+        query(
+            "SELECT name FROM employee WHERE nested('projects', projects.started_year > 1990 AND"
+                + " projects.name LIKE '%security%') GROUP BY name HAVING COUNT(nested(projects,"
+                + " 'projects')) > 1"));
+  }
+
+  @Test
+  public void aggInHavingWithWhereOnNestedOrNested() {
+    same(
+        query(
+            "SELECT e.name "
+                + "FROM employee AS e, e.projects AS p "
+                + "WHERE p.started_year > 1990 OR p.name LIKE '%security%' "
+                + "GROUP BY e.name "
+                + "HAVING COUNT(p) > 1"),
+        query(
+            "SELECT name FROM employee WHERE nested('projects', projects.started_year > 1990 OR"
+                + " projects.name LIKE '%security%') GROUP BY name HAVING COUNT(nested(projects,"
+                + " 'projects')) > 1"));
+  }
+
+  @Test
+  public void notIsNotNull() {
+    same(
+        query(
+            "SELECT name "
+                + "FROM employee "
+                + "WHERE not (nested(projects, 'projects') IS NOT MISSING)"),
+        query(
+            "SELECT e.name "
+                + "FROM employee as e, e.projects as p "
+                + "WHERE not (p IS NOT MISSING)"));
+  }
+
+  @Test
+  public void notIsNotNullAndCondition() {
+    same(
+        query(
+            "SELECT e.name "
+                + "FROM employee as e, e.projects as p "
+                + "WHERE not (p IS NOT MISSING AND p.name LIKE 'security')"),
+        query(
+            "SELECT name FROM employee WHERE not nested('projects', projects IS NOT MISSING AND"
+                + " projects.name LIKE 'security')"));
+  }
+
+  @Test
+  public void notMultiCondition() {
+    same(
+        query(
+            "SELECT name FROM employee WHERE not nested('projects', projects.year = 2016 AND"
+                + " projects.name LIKE 'security')"),
+        query(
+            "SELECT e.name "
+                + "FROM employee as e, e.projects as p "
+                + "WHERE not (p.year = 2016 and p.name LIKE 'security')"));
+  }
+
+  @Test
+  public void notNestedAndParentCondition() {
+    same(
+        query(
+            "SELECT name FROM employee WHERE (not nested(projects, 'projects') IS NOT MISSING) AND"
+                + " name LIKE 'security'"),
+        query(
+            "SELECT e.name "
+                + "FROM employee e, e.projects p "
+                + "WHERE not (p IS NOT MISSING) AND e.name LIKE 'security'"));
+  }
+
+  private void noImpact(String sql) {
+    same(parse(sql), rewrite(parse(sql)));
+  }
+
+  /**
+   * The intention for this assert method is:
+   *
+   * <p>1) MySqlSelectQueryBlock.equals() doesn't call super.equals(). But select items, from, where
+   * and group by are all held by parent class SQLSelectQueryBlock.
+   *
+   * <p>2) SQLSelectGroupByClause doesn't implement equals() at all.. MySqlSelectGroupByExpr
+   * compares identity of expression..
+   *
+   * <p>3) MySqlUnionQuery doesn't implement equals() at all
+   */
+  private void same(SQLQueryExpr actual, SQLQueryExpr expected) {
+    assertEquals(expected.getClass(), actual.getClass());
+
+    SQLSelect expectedQuery = expected.getSubQuery();
+    SQLSelect actualQuery = actual.getSubQuery();
+    assertEquals(expectedQuery.getOrderBy(), actualQuery.getOrderBy());
+    assertQuery(expectedQuery, actualQuery);
+  }
+
+  private void assertQuery(SQLSelect expected, SQLSelect actual) {
+    SQLSelectQuery expectedQuery = expected.getQuery();
+    SQLSelectQuery actualQuery = actual.getQuery();
+    if (actualQuery instanceof SQLSelectQueryBlock) {
+      assertQueryBlock((SQLSelectQueryBlock) expectedQuery, (SQLSelectQueryBlock) actualQuery);
+    } else if (actualQuery instanceof SQLUnionQuery) {
+      assertQueryBlock(
+          (SQLSelectQueryBlock) ((SQLUnionQuery) expectedQuery).getLeft(),
+          (SQLSelectQueryBlock) ((SQLUnionQuery) actualQuery).getLeft());
+      assertQueryBlock(
+          (SQLSelectQueryBlock) ((SQLUnionQuery) expectedQuery).getRight(),
+          (SQLSelectQueryBlock) ((SQLUnionQuery) actualQuery).getRight());
+      assertEquals(
+          ((SQLUnionQuery) expectedQuery).getOperator(),
+          ((SQLUnionQuery) actualQuery).getOperator());
+    } else {
+      throw new IllegalStateException("Unsupported test SQL");
+    }
+  }
+
+  private void assertQueryBlock(SQLSelectQueryBlock expected, SQLSelectQueryBlock actual) {
+    assertEquals("SELECT", expected.getSelectList(), actual.getSelectList());
+    assertEquals("INTO", expected.getInto(), actual.getInto());
+    assertEquals("WHERE", expected.getWhere(), actual.getWhere());
+    if (actual.getWhere() instanceof SQLInSubQueryExpr) {
+      assertQuery(
+          ((SQLInSubQueryExpr) expected.getWhere()).getSubQuery(),
+          ((SQLInSubQueryExpr) actual.getWhere()).getSubQuery());
+    }
+    assertEquals("PARENTHESIZED", expected.isParenthesized(), actual.isParenthesized());
+    assertEquals("DISTION", expected.getDistionOption(), actual.getDistionOption());
+    assertFrom(expected, actual);
+    if (!(expected.getGroupBy() == null && actual.getGroupBy() == null)) {
+      assertGroupBy(expected.getGroupBy(), actual.getGroupBy());
+    }
+  }
+
+  private void assertFrom(SQLSelectQueryBlock expected, SQLSelectQueryBlock actual) {
+    // Only 2 tables JOIN at most is supported
+    if (expected.getFrom() instanceof SQLExprTableSource) {
+      assertTable(expected.getFrom(), actual.getFrom());
+    } else {
+      assertEquals(actual.getFrom().getClass(), SQLJoinTableSource.class);
+      assertTable(
+          ((SQLJoinTableSource) expected.getFrom()).getLeft(),
+          ((SQLJoinTableSource) actual.getFrom()).getLeft());
+      assertTable(
+          ((SQLJoinTableSource) expected.getFrom()).getRight(),
+          ((SQLJoinTableSource) actual.getFrom()).getRight());
+      assertEquals(
+          ((SQLJoinTableSource) expected.getFrom()).getJoinType(),
+          ((SQLJoinTableSource) actual.getFrom()).getJoinType());
+    }
+  }
+
+  private void assertGroupBy(SQLSelectGroupByClause expected, SQLSelectGroupByClause actual) {
+    assertEquals("HAVING", expected.getHaving(), actual.getHaving());
+
+    List<SQLExpr> expectedGroupby = expected.getItems();
+    List<SQLExpr> actualGroupby = actual.getItems();
+    assertEquals(expectedGroupby.size(), actualGroupby.size());
+    range(0, expectedGroupby.size())
+        .forEach(
+            i ->
+                assertEquals(
+                    ((MySqlSelectGroupByExpr) expectedGroupby.get(i)).getExpr(),
+                    ((MySqlSelectGroupByExpr) actualGroupby.get(i)).getExpr()));
+  }
+
+  private void assertTable(SQLTableSource expect, SQLTableSource actual) {
+    assertEquals(SQLExprTableSource.class, expect.getClass());
+    assertEquals(SQLExprTableSource.class, actual.getClass());
+    assertEquals(((SQLExprTableSource) expect).getExpr(), ((SQLExprTableSource) actual).getExpr());
+    assertEquals(expect.getAlias(), actual.getAlias());
+  }
+
+  /**
+   * Walk through extra rewrite logic if NOT found "nested" in SQL query statement. Otherwise return
+   * as before so that original logic be compared with result of rewrite.
+   *
+   * @param sql Test sql
+   * @return Node parsed out of sql
+   */
+  private SQLQueryExpr query(String sql) {
+    SQLQueryExpr expr = SqlParserUtils.parse(sql);
+    if (sql.contains("nested")) {
+      return expr;
+    }
+    return rewrite(expr);
+  }
+
+  private SQLQueryExpr rewrite(SQLQueryExpr expr) {
+    expr.accept(new NestedFieldRewriter());
+    return expr;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/OpenSearchClientTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/OpenSearchClientTest.java
index d0e740de51..fec029a638 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/OpenSearchClientTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/OpenSearchClientTest.java
@@ -3,10 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -17,49 +16,52 @@
 import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.opensearch.action.ActionFuture;
 import org.opensearch.action.search.MultiSearchRequest;
 import org.opensearch.action.search.MultiSearchResponse;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
+import org.opensearch.common.action.ActionFuture;
 import org.opensearch.sql.legacy.esdomain.OpenSearchClient;
 
 public class OpenSearchClientTest {
 
-    @Mock
-    protected Client client;
+  @Mock protected Client client;
 
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
-        ActionFuture<MultiSearchResponse> mockFuture = mock(ActionFuture.class);
-        when(client.multiSearch(any())).thenReturn(mockFuture);
+  @Before
+  public void init() {
+    MockitoAnnotations.initMocks(this);
+    ActionFuture<MultiSearchResponse> mockFuture = mock(ActionFuture.class);
+    when(client.multiSearch(any())).thenReturn(mockFuture);
 
-        MultiSearchResponse response = mock(MultiSearchResponse.class);
-        when(mockFuture.actionGet()).thenReturn(response);
+    MultiSearchResponse response = mock(MultiSearchResponse.class);
+    when(mockFuture.actionGet()).thenReturn(response);
 
-        MultiSearchResponse.Item item0 = new MultiSearchResponse.Item(mock(SearchResponse.class), null);
-        MultiSearchResponse.Item item1 = new MultiSearchResponse.Item(mock(SearchResponse.class), new Exception());
-        MultiSearchResponse.Item[] itemsRetry0 = new MultiSearchResponse.Item[]{item0, item1};
-        MultiSearchResponse.Item[] itemsRetry1 = new MultiSearchResponse.Item[]{item0};
-        when(response.getResponses()).thenAnswer(new Answer<MultiSearchResponse.Item[]>() {
-            private int callCnt;
+    MultiSearchResponse.Item item0 = new MultiSearchResponse.Item(mock(SearchResponse.class), null);
+    MultiSearchResponse.Item item1 =
+        new MultiSearchResponse.Item(mock(SearchResponse.class), new Exception());
+    MultiSearchResponse.Item[] itemsRetry0 = new MultiSearchResponse.Item[] {item0, item1};
+    MultiSearchResponse.Item[] itemsRetry1 = new MultiSearchResponse.Item[] {item0};
+    when(response.getResponses())
+        .thenAnswer(
+            new Answer<MultiSearchResponse.Item[]>() {
+              private int callCnt;
 
-            @Override
-            public MultiSearchResponse.Item[] answer(InvocationOnMock invocation) {
+              @Override
+              public MultiSearchResponse.Item[] answer(InvocationOnMock invocation) {
                 return callCnt++ == 0 ? itemsRetry0 : itemsRetry1;
-            }
-        });
-    }
-
-    @Test
-    public void multiSearchRetryOneTime() {
-        OpenSearchClient openSearchClient = new OpenSearchClient(client);
-        MultiSearchResponse.Item[] res = openSearchClient.multiSearch(new MultiSearchRequest().add(new SearchRequest()).add(new SearchRequest()));
-        Assert.assertEquals(res.length, 2);
-        Assert.assertFalse(res[0].isFailure());
-        Assert.assertFalse(res[1].isFailure());
-    }
+              }
+            });
+  }
 
+  @Test
+  public void multiSearchRetryOneTime() {
+    OpenSearchClient openSearchClient = new OpenSearchClient(client);
+    MultiSearchResponse.Item[] res =
+        openSearchClient.multiSearch(
+            new MultiSearchRequest().add(new SearchRequest()).add(new SearchRequest()));
+    Assert.assertEquals(res.length, 2);
+    Assert.assertFalse(res[0].isFailure());
+    Assert.assertFalse(res[1].isFailure());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/PreparedStatementRequestTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/PreparedStatementRequestTest.java
index 0b714ed41c..8a31c530e3 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/PreparedStatementRequestTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/PreparedStatementRequestTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import java.util.ArrayList;
@@ -15,64 +14,68 @@
 
 public class PreparedStatementRequestTest {
 
-    @Test
-    public void testSubstitute() {
-        String sqlTemplate = "select * from table_name where number_param > ? and string_param = 'Amazon.com' " +
-                "and test_str = '''test escape? \\'' and state in (?,?) and null_param = ? and double_param = ? " +
-                "and question_mark = '?'";
-        List<PreparedStatementRequest.PreparedStatementParameter> params = new ArrayList<>();
-        params.add(new PreparedStatementRequest.PreparedStatementParameter<Integer>(10));
-        params.add(new PreparedStatementRequest.StringParameter("WA"));
-        params.add(new PreparedStatementRequest.StringParameter(""));
-        params.add(new PreparedStatementRequest.NullParameter());
-        params.add(new PreparedStatementRequest.PreparedStatementParameter<Double>(2.0));
-        PreparedStatementRequest psr = new PreparedStatementRequest(sqlTemplate, new JSONObject(), params);
-        String generatedSql = psr.getSql();
-
-        String expectedSql = "select * from table_name where number_param > 10 and string_param = 'Amazon.com' " +
-                "and test_str = '''test escape? \\'' and state in ('WA','') and null_param = null " +
-                "and double_param = 2.0 and question_mark = '?'";
-        Assert.assertEquals(expectedSql, generatedSql);
-    }
-
-    @Test
-    public void testStringParameter() {
-        PreparedStatementRequest.StringParameter param;
-        param = new PreparedStatementRequest.StringParameter("test string");
-        Assert.assertEquals("'test string'", param.getSqlSubstitutionValue());
-
-        param = new PreparedStatementRequest.StringParameter("test ' single ' quote '");
-        Assert.assertEquals("'test \\' single \\' quote \\''", param.getSqlSubstitutionValue());
-
-        param = new PreparedStatementRequest.StringParameter("test line \n break \n char");
-        Assert.assertEquals("'test line \\n break \\n char'", param.getSqlSubstitutionValue());
-
-        param = new PreparedStatementRequest.StringParameter("test carriage \r return \r char");
-        Assert.assertEquals("'test carriage \\r return \\r char'", param.getSqlSubstitutionValue());
-
-        param = new PreparedStatementRequest.StringParameter("test \\ backslash \\ char");
-        Assert.assertEquals("'test \\\\ backslash \\\\ char'", param.getSqlSubstitutionValue());
-
-        param = new PreparedStatementRequest.StringParameter("test single ' quote ' char");
-        Assert.assertEquals("'test single \\' quote \\' char'", param.getSqlSubstitutionValue());
-
-        param = new PreparedStatementRequest.StringParameter("test double \" quote \" char");
-        Assert.assertEquals("'test double \\\" quote \\\" char'", param.getSqlSubstitutionValue());
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testSubstitute_parameterNumberNotMatch() {
-        String sqlTemplate = "select * from table_name where param1 = ? and param2 = ?";
-        List<PreparedStatementRequest.PreparedStatementParameter> params = new ArrayList<>();
-        params.add(new PreparedStatementRequest.StringParameter("value"));
-
-        PreparedStatementRequest psr = new PreparedStatementRequest(sqlTemplate, new JSONObject(), params);
-    }
-
-    @Test
-    public void testSubstitute_nullSql() {
-        PreparedStatementRequest psr = new PreparedStatementRequest(null, new JSONObject(), null);
-
-        Assert.assertNull(psr.getSql());
-    }
+  @Test
+  public void testSubstitute() {
+    String sqlTemplate =
+        "select * from table_name where number_param > ? and string_param = 'Amazon.com' and"
+            + " test_str = '''test escape? \\'' and state in (?,?) and null_param = ? and"
+            + " double_param = ? and question_mark = '?'";
+    List<PreparedStatementRequest.PreparedStatementParameter> params = new ArrayList<>();
+    params.add(new PreparedStatementRequest.PreparedStatementParameter<Integer>(10));
+    params.add(new PreparedStatementRequest.StringParameter("WA"));
+    params.add(new PreparedStatementRequest.StringParameter(""));
+    params.add(new PreparedStatementRequest.NullParameter());
+    params.add(new PreparedStatementRequest.PreparedStatementParameter<Double>(2.0));
+    PreparedStatementRequest psr =
+        new PreparedStatementRequest(sqlTemplate, new JSONObject(), params);
+    String generatedSql = psr.getSql();
+
+    String expectedSql =
+        "select * from table_name where number_param > 10 and string_param = 'Amazon.com' "
+            + "and test_str = '''test escape? \\'' and state in ('WA','') and null_param = null "
+            + "and double_param = 2.0 and question_mark = '?'";
+    Assert.assertEquals(expectedSql, generatedSql);
+  }
+
+  @Test
+  public void testStringParameter() {
+    PreparedStatementRequest.StringParameter param;
+    param = new PreparedStatementRequest.StringParameter("test string");
+    Assert.assertEquals("'test string'", param.getSqlSubstitutionValue());
+
+    param = new PreparedStatementRequest.StringParameter("test ' single ' quote '");
+    Assert.assertEquals("'test \\' single \\' quote \\''", param.getSqlSubstitutionValue());
+
+    param = new PreparedStatementRequest.StringParameter("test line \n break \n char");
+    Assert.assertEquals("'test line \\n break \\n char'", param.getSqlSubstitutionValue());
+
+    param = new PreparedStatementRequest.StringParameter("test carriage \r return \r char");
+    Assert.assertEquals("'test carriage \\r return \\r char'", param.getSqlSubstitutionValue());
+
+    param = new PreparedStatementRequest.StringParameter("test \\ backslash \\ char");
+    Assert.assertEquals("'test \\\\ backslash \\\\ char'", param.getSqlSubstitutionValue());
+
+    param = new PreparedStatementRequest.StringParameter("test single ' quote ' char");
+    Assert.assertEquals("'test single \\' quote \\' char'", param.getSqlSubstitutionValue());
+
+    param = new PreparedStatementRequest.StringParameter("test double \" quote \" char");
+    Assert.assertEquals("'test double \\\" quote \\\" char'", param.getSqlSubstitutionValue());
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void testSubstitute_parameterNumberNotMatch() {
+    String sqlTemplate = "select * from table_name where param1 = ? and param2 = ?";
+    List<PreparedStatementRequest.PreparedStatementParameter> params = new ArrayList<>();
+    params.add(new PreparedStatementRequest.StringParameter("value"));
+
+    PreparedStatementRequest psr =
+        new PreparedStatementRequest(sqlTemplate, new JSONObject(), params);
+  }
+
+  @Test
+  public void testSubstitute_nullSql() {
+    PreparedStatementRequest psr = new PreparedStatementRequest(null, new JSONObject(), null);
+
+    Assert.assertNull(psr.getSql());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/QueryFunctionsTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/QueryFunctionsTest.java
index fd650b310f..b5a82f6737 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/QueryFunctionsTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/QueryFunctionsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -24,7 +23,8 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.opensearch.client.Client;
-import org.opensearch.common.Strings;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.AbstractQueryBuilder;
 import org.opensearch.index.query.MultiMatchQueryBuilder;
 import org.opensearch.search.builder.SearchSourceBuilder.ScriptField;
@@ -36,272 +36,178 @@
 
 public class QueryFunctionsTest {
 
-    private static final String SELECT_ALL = "SELECT *";
-    private static final String FROM_ACCOUNTS = "FROM " + TestsConstants.TEST_INDEX_ACCOUNT + "/account";
-    private static final String FROM_NESTED = "FROM " + TestsConstants.TEST_INDEX_NESTED_TYPE + "/nestedType";
-    private static final String FROM_PHRASE = "FROM " + TestsConstants.TEST_INDEX_PHRASE + "/phrase";
-
-    @Test
-    public void query() {
-        assertThat(
-            query(
-                FROM_ACCOUNTS,
-                "WHERE QUERY('CA')"
-            ),
-            contains(
-                queryStringQuery("CA")
-            )
-        );
-    }
-
-    @Test
-    public void matchQueryRegularField() {
-        assertThat(
-            query(
-                FROM_ACCOUNTS,
-                "WHERE MATCH_QUERY(firstname, 'Ayers')"
-            ),
-            contains(
-                matchQuery("firstname", "Ayers")
-            )
-        );
-    }
-
-    @Test
-    public void matchQueryNestedField() {
-        assertThat(
-            query(
-                FROM_NESTED,
-                "WHERE MATCH_QUERY(NESTED(comment.data), 'aa')"
-            ),
-            contains(
-                nestedQuery("comment", matchQuery("comment.data", "aa"), ScoreMode.None)
-            )
-        );
-    }
-
-    @Test
-    public void scoreQuery() {
-        assertThat(
-            query(
-                FROM_ACCOUNTS,
-                "WHERE SCORE(MATCH_QUERY(firstname, 'Ayers'), 10)"
-            ),
-            contains(
-                constantScoreQuery(
-                    matchQuery("firstname", "Ayers")
-                ).boost(10)
-            )
-        );
-    }
-
-    @Test
-    public void scoreQueryWithNestedField() {
-        assertThat(
-            query(
-                FROM_NESTED,
-                "WHERE SCORE(MATCH_QUERY(NESTED(comment.data), 'ab'), 10)"
-            ),
-            contains(
-                constantScoreQuery(
-                    nestedQuery("comment", matchQuery("comment.data", "ab"), ScoreMode.None)
-                ).boost(10)
-            )
-        );
-    }
-
-    @Test
-    public void wildcardQueryRegularField() {
-        assertThat(
-            query(
-                FROM_ACCOUNTS,
-                "WHERE WILDCARD_QUERY(city.keyword, 'B*')"
-            ),
-            contains(
-                wildcardQuery("city.keyword", "B*")
-            )
-        );
-    }
-
-    @Test
-    public void wildcardQueryNestedField() {
-        assertThat(
-            query(
-                FROM_NESTED,
-                "WHERE WILDCARD_QUERY(nested(comment.data), 'a*')"
-            ),
-            contains(
-                nestedQuery("comment", wildcardQuery("comment.data", "a*"), ScoreMode.None)
-            )
-        );
-    }
-
-    @Test
-    public void matchPhraseQueryDefault() {
-        assertThat(
-            query(
-                FROM_PHRASE,
-                "WHERE MATCH_PHRASE(phrase, 'brown fox')"
-            ),
-            contains(
-                matchPhraseQuery("phrase", "brown fox")
-            )
-        );
-    }
-
-    @Test
-    public void matchPhraseQueryWithSlop() {
-        assertThat(
-            query(
-                FROM_PHRASE,
-                "WHERE MATCH_PHRASE(phrase, 'brown fox', slop=2)"
-            ),
-            contains(
-                matchPhraseQuery("phrase", "brown fox").slop(2)
-            )
-        );
-    }
-
-    @Test
-    public void multiMatchQuerySingleField() {
-        assertThat(
-            query(
-                FROM_ACCOUNTS,
-                "WHERE MULTI_MATCH(query='Ayers', fields='firstname')"
-            ),
-            contains(
-                multiMatchQuery("Ayers").field("firstname")
-            )
-        );
-    }
-
-    @Test
-    public void multiMatchQueryWildcardField() {
-        assertThat(
-            query(
-                FROM_ACCOUNTS,
-                "WHERE MULTI_MATCH(query='Ay', fields='*name', type='phrase_prefix')"
-            ),
-            contains(
-                multiMatchQuery("Ay").
-                                field("*name").
-                                type(MultiMatchQueryBuilder.Type.PHRASE_PREFIX)
-            )
-        );
-    }
-
-    @Test
-    public void numberLiteralInSelectField() {
-        String query = "SELECT 2 AS number FROM bank WHERE age > 20";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                     scriptField,
-                     "def assign"
-                )
-        );
-    }
-
-    @Test
-    public void ifFunctionWithConditionStatement() {
-        String query = "SELECT IF(age > 35, 'elastic', 'search') AS Ages FROM accounts";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "boolean cond = doc['age'].value > 35;"
-                )
-        );
-    }
-
-    @Test
-    public void ifFunctionWithEquationConditionStatement() {
-        String query = "SELECT IF(age = 35, 'elastic', 'search') AS Ages FROM accounts";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "boolean cond = doc['age'].value == 35;"
-                )
-        );
-    }
-
-    @Test
-    public void ifFunctionWithConstantConditionStatement() {
-        String query = "SELECT IF(1 = 2, 'elastic', 'search') FROM accounts";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "boolean cond = 1 == 2;"
-                )
-        );
-    }
-
-    @Test
-    public void ifNull() {
-        String query = "SELECT IFNULL(lastname, 'Unknown') FROM accounts";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "doc['lastname'].size()==0"
-                )
-        );
-    }
-
-    @Test
-    public void isNullWithMathExpr() {
-        String query = "SELECT ISNULL(1+1) FROM accounts";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "catch(ArithmeticException e)"
-                )
-        );
-
-    }
-
-    @Test(expected = SQLFeatureNotSupportedException.class)
-    public void emptyQueryShouldThrowSQLFeatureNotSupportedException()
-        throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
-        OpenSearchActionFactory.create(Mockito.mock(Client.class), "");
-    }
-
-    @Test(expected = SQLFeatureNotSupportedException.class)
-    public void emptyNewLineQueryShouldThrowSQLFeatureNotSupportedException()
-        throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
-        OpenSearchActionFactory.create(Mockito.mock(Client.class), "\n");
-    }
-
-    @Test(expected = SQLFeatureNotSupportedException.class)
-    public void emptyNewLineQueryShouldThrowSQLFeatureNotSupportedException2()
-        throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
-        OpenSearchActionFactory.create(Mockito.mock(Client.class), "\r\n");
-    }
-
-    @Test(expected = SQLFeatureNotSupportedException.class)
-    public void queryWithoutSpaceShouldSQLFeatureNotSupportedException()
-        throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
-        OpenSearchActionFactory.create(Mockito.mock(Client.class), "SELE");
-    }
-
-    @Test(expected = SQLFeatureNotSupportedException.class)
-    public void spacesOnlyQueryShouldThrowSQLFeatureNotSupportedException()
-        throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
-        OpenSearchActionFactory.create(Mockito.mock(Client.class), "      ");
-    }
-
-    private String query(String from, String... statements) {
-        return explain(SELECT_ALL + " " + from + " " + String.join(" ", statements));
-    }
-
-    private String query(String sql) {
-        return explain(sql);
-    }
-
-    private Matcher<String> contains(AbstractQueryBuilder queryBuilder) {
-        return containsString(Strings.toString(queryBuilder, false, false));
-    }
+  private static final String SELECT_ALL = "SELECT *";
+  private static final String FROM_ACCOUNTS =
+      "FROM " + TestsConstants.TEST_INDEX_ACCOUNT + "/account";
+  private static final String FROM_NESTED =
+      "FROM " + TestsConstants.TEST_INDEX_NESTED_TYPE + "/nestedType";
+  private static final String FROM_PHRASE = "FROM " + TestsConstants.TEST_INDEX_PHRASE + "/phrase";
+
+  @Test
+  public void query() {
+    assertThat(query(FROM_ACCOUNTS, "WHERE QUERY('CA')"), contains(queryStringQuery("CA")));
+  }
+
+  @Test
+  public void matchQueryRegularField() {
+    assertThat(
+        query(FROM_ACCOUNTS, "WHERE MATCH_QUERY(firstname, 'Ayers')"),
+        contains(matchQuery("firstname", "Ayers")));
+  }
+
+  @Test
+  public void matchQueryNestedField() {
+    assertThat(
+        query(FROM_NESTED, "WHERE MATCH_QUERY(NESTED(comment.data), 'aa')"),
+        contains(nestedQuery("comment", matchQuery("comment.data", "aa"), ScoreMode.None)));
+  }
+
+  @Test
+  public void scoreQuery() {
+    assertThat(
+        query(FROM_ACCOUNTS, "WHERE SCORE(MATCH_QUERY(firstname, 'Ayers'), 10)"),
+        contains(constantScoreQuery(matchQuery("firstname", "Ayers")).boost(10)));
+  }
+
+  @Test
+  public void scoreQueryWithNestedField() {
+    assertThat(
+        query(FROM_NESTED, "WHERE SCORE(MATCH_QUERY(NESTED(comment.data), 'ab'), 10)"),
+        contains(
+            constantScoreQuery(
+                    nestedQuery("comment", matchQuery("comment.data", "ab"), ScoreMode.None))
+                .boost(10)));
+  }
+
+  @Test
+  public void wildcardQueryRegularField() {
+    assertThat(
+        query(FROM_ACCOUNTS, "WHERE WILDCARD_QUERY(city.keyword, 'B*')"),
+        contains(wildcardQuery("city.keyword", "B*")));
+  }
+
+  @Test
+  public void wildcardQueryNestedField() {
+    assertThat(
+        query(FROM_NESTED, "WHERE WILDCARD_QUERY(nested(comment.data), 'a*')"),
+        contains(nestedQuery("comment", wildcardQuery("comment.data", "a*"), ScoreMode.None)));
+  }
+
+  @Test
+  public void matchPhraseQueryDefault() {
+    assertThat(
+        query(FROM_PHRASE, "WHERE MATCH_PHRASE(phrase, 'brown fox')"),
+        contains(matchPhraseQuery("phrase", "brown fox")));
+  }
+
+  @Test
+  public void matchPhraseQueryWithSlop() {
+    assertThat(
+        query(FROM_PHRASE, "WHERE MATCH_PHRASE(phrase, 'brown fox', slop=2)"),
+        contains(matchPhraseQuery("phrase", "brown fox").slop(2)));
+  }
+
+  @Test
+  public void multiMatchQuerySingleField() {
+    assertThat(
+        query(FROM_ACCOUNTS, "WHERE MULTI_MATCH(query='Ayers', fields='firstname')"),
+        contains(multiMatchQuery("Ayers").field("firstname")));
+  }
+
+  @Test
+  public void multiMatchQueryWildcardField() {
+    assertThat(
+        query(FROM_ACCOUNTS, "WHERE MULTI_MATCH(query='Ay', fields='*name', type='phrase_prefix')"),
+        contains(
+            multiMatchQuery("Ay").field("*name").type(MultiMatchQueryBuilder.Type.PHRASE_PREFIX)));
+  }
+
+  @Test
+  public void numberLiteralInSelectField() {
+    String query = "SELECT 2 AS number FROM bank WHERE age > 20";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "def assign"));
+  }
+
+  @Test
+  public void ifFunctionWithConditionStatement() {
+    String query = "SELECT IF(age > 35, 'elastic', 'search') AS Ages FROM accounts";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "boolean cond = doc['age'].value > 35;"));
+  }
+
+  @Test
+  public void ifFunctionWithEquationConditionStatement() {
+    String query = "SELECT IF(age = 35, 'elastic', 'search') AS Ages FROM accounts";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "boolean cond = doc['age'].value == 35;"));
+  }
+
+  @Test
+  public void ifFunctionWithConstantConditionStatement() {
+    String query = "SELECT IF(1 = 2, 'elastic', 'search') FROM accounts";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "boolean cond = 1 == 2;"));
+  }
+
+  @Test
+  public void ifNull() {
+    String query = "SELECT IFNULL(lastname, 'Unknown') FROM accounts";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(CheckScriptContents.scriptContainsString(scriptField, "doc['lastname'].size()==0"));
+  }
+
+  @Test
+  public void isNullWithMathExpr() {
+    String query = "SELECT ISNULL(1+1) FROM accounts";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "catch(ArithmeticException e)"));
+  }
+
+  @Test(expected = SQLFeatureNotSupportedException.class)
+  public void emptyQueryShouldThrowSQLFeatureNotSupportedException()
+      throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
+    OpenSearchActionFactory.create(Mockito.mock(Client.class), "");
+  }
+
+  @Test(expected = SQLFeatureNotSupportedException.class)
+  public void emptyNewLineQueryShouldThrowSQLFeatureNotSupportedException()
+      throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
+    OpenSearchActionFactory.create(Mockito.mock(Client.class), "\n");
+  }
+
+  @Test(expected = SQLFeatureNotSupportedException.class)
+  public void emptyNewLineQueryShouldThrowSQLFeatureNotSupportedException2()
+      throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
+    OpenSearchActionFactory.create(Mockito.mock(Client.class), "\r\n");
+  }
+
+  @Test(expected = SQLFeatureNotSupportedException.class)
+  public void queryWithoutSpaceShouldSQLFeatureNotSupportedException()
+      throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
+    OpenSearchActionFactory.create(Mockito.mock(Client.class), "SELE");
+  }
+
+  @Test(expected = SQLFeatureNotSupportedException.class)
+  public void spacesOnlyQueryShouldThrowSQLFeatureNotSupportedException()
+      throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
+    OpenSearchActionFactory.create(Mockito.mock(Client.class), "      ");
+  }
+
+  private String query(String from, String... statements) {
+    return explain(SELECT_ALL + " " + from + " " + String.join(" ", statements));
+  }
+
+  private String query(String sql) {
+    return explain(sql);
+  }
+
+  private Matcher<String> contains(AbstractQueryBuilder queryBuilder) {
+    return containsString(Strings.toString(XContentType.JSON, queryBuilder, false, false));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/SqlRequestFactoryTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/SqlRequestFactoryTest.java
index efc424789d..9911f265f1 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/SqlRequestFactoryTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/SqlRequestFactoryTest.java
@@ -3,12 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static java.util.Collections.emptyList;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -17,8 +15,8 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.opensearch.common.bytes.BytesArray;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
 import org.opensearch.sql.legacy.request.PreparedStatementRequest;
@@ -29,168 +27,186 @@
 @RunWith(MockitoJUnitRunner.class)
 public class SqlRequestFactoryTest {
 
-    @Mock
-    private RestRequest restRequest;
-
-    @Mock
-    private OpenSearchSettings settings;
-
-    @Before
-    public void setup() {
-        // Force return empty list to avoid ClusterSettings be invoked which is a final class and hard to mock.
-        // In this case, default value in Setting will be returned all the time.
-        doReturn(emptyList()).when(settings).getSettings();
-        LocalClusterState.state().setPluginSettings(settings);
-    }
-
-    @Ignore("RestRequest is a final method, and Mockito 1.x cannot mock it." +
-            "Ignore this test case till we can upgrade to Mockito 2.x")
-    @Test
-    public void testGenerateSqlRequest_fromUrlParams() {
-        String sql = "select * from table";
-        Mockito.when(restRequest.method()).thenReturn(RestRequest.Method.GET);
-        Mockito.when(restRequest.param("sql")).thenReturn(sql);
-
-        SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(restRequest);
-
-        Assert.assertFalse(sqlRequest instanceof PreparedStatementRequest);
-        Assert.assertEquals(sql, sqlRequest.getSql());
-    }
-
-    @Test
-    public void testGenerateSqlRequest_sqlRequestFromPayload() {
-        String payload = "{ \"query\": \"select * from my_table\" }";
-
-        Mockito.when(this.restRequest.content()).thenReturn(new BytesArray(payload));
-        Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.POST);
-
-        SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
-        Assert.assertFalse(sqlRequest instanceof PreparedStatementRequest);
-        Assert.assertEquals("select * from my_table", sqlRequest.getSql());
-    }
-
-    @Test
-    public void testGenerateSqlRequest_preparedStatementFromPayload() {
-        String payload = "{\n" +
-                "  \"query\": \"select * from my_table where int_param = ? and double_param = ? and string_param = ? and date_param = ? and null_param = ?\",\n" +
-                "  \"parameters\": [\n" +
-                "    {\n" +
-                "      \"type\": \"integer\",\n" +
-                "      \"value\": 1\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"type\": \"double\",\n" +
-                "      \"value\": \"2.0\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"type\": \"string\",\n" +
-                "      \"value\": \"string_value\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"type\": \"date\",\n" +
-                "      \"value\": \"2000-01-01\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"type\": \"null\",\n" +
-                "      \"value\": null\n" +
-                "    }\n" +
-                "  ]\n" +
-                "}";
-        Mockito.when(this.restRequest.content()).thenReturn(new BytesArray(payload));
-        Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.POST);
-
-        SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
-
-        Assert.assertTrue(sqlRequest instanceof  PreparedStatementRequest);
-        PreparedStatementRequest preparedStatementRequest = (PreparedStatementRequest) sqlRequest;
-        Assert.assertEquals("select * from my_table where int_param = ? and double_param = ? and string_param = ? and date_param = ? and null_param = ?", preparedStatementRequest.getPreparedStatement());
-        Assert.assertEquals("select * from my_table where int_param = 1 and double_param = 2.0 and string_param = 'string_value' and date_param = '2000-01-01' and null_param = null", preparedStatementRequest.getSql());
-        Assert.assertEquals(5, preparedStatementRequest.getParameters().size());
-        Assert.assertTrue(preparedStatementRequest.getParameters().get(0).getValue() instanceof Long);
-        Assert.assertTrue(preparedStatementRequest.getParameters().get(1).getValue() instanceof Double);
-        Assert.assertTrue(preparedStatementRequest.getParameters().get(2) instanceof PreparedStatementRequest.StringParameter);
-        Assert.assertTrue(preparedStatementRequest.getParameters().get(3) instanceof PreparedStatementRequest.StringParameter);
-        Assert.assertTrue(preparedStatementRequest.getParameters().get(4) instanceof PreparedStatementRequest.NullParameter);
-    }
-
-    @Test
-    public void testGenerateSqlRequest_prearedStatementFromPayload2() {
-        // type not covered in above test case
-        String payload = "{\n" +
-                "  \"query\": \"select * from my_table where long_param = ? and float_param = ? and keyword_param = ? and boolean_param = ? and byte_param = ?\",\n" +
-                "  \"parameters\": [\n" +
-                "    {\n" +
-                "      \"type\": \"long\",\n" +
-                "      \"value\": 1\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"type\": \"float\",\n" +
-                "      \"value\": \"2.0\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"type\": \"keyword\",\n" +
-                "      \"value\": \"string_value\"\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"type\": \"boolean\",\n" +
-                "      \"value\": true\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"type\": \"byte\",\n" +
-                "      \"value\": 91\n" +
-                "    }\n" +
-                "  ]\n" +
-                "}";
-        Mockito.when(this.restRequest.content()).thenReturn(new BytesArray(payload));
-        Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.POST);
-        SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
-
-        Assert.assertTrue(sqlRequest instanceof  PreparedStatementRequest);
-        PreparedStatementRequest preparedStatementRequest = (PreparedStatementRequest) sqlRequest;
-        Assert.assertEquals(5, preparedStatementRequest.getParameters().size());
-        Assert.assertTrue(preparedStatementRequest.getParameters().get(0).getValue() instanceof Long);
-        Assert.assertTrue(preparedStatementRequest.getParameters().get(1).getValue() instanceof Double);
-        Assert.assertTrue(preparedStatementRequest.getParameters().get(2) instanceof PreparedStatementRequest.StringParameter);
-        System.out.println(preparedStatementRequest.getParameters().get(3));
-        Assert.assertTrue(preparedStatementRequest.getParameters().get(3).getValue() instanceof Boolean);
-        Assert.assertTrue(preparedStatementRequest.getParameters().get(4).getValue() instanceof Long);
-
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testGenerateSqlRequest_unsupportedHttpMethod() {
-        Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.PUT);
-        SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testGenerateSqlRequest_invalidJson() {
-        String payload = "{\n" +
-                "  \"query\": \"select * from my_table where param1 = ?\",\n";
-        Mockito.when(this.restRequest.content()).thenReturn(new BytesArray(payload));
-        Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.POST);
-
-        SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testGenerateSqlRequest_unsupportedType() {
-        String payload = "{\n" +
-                "  \"query\": \"select * from my_table where param1 = ?\",\n" +
-                "  \"parameters\": [\n" +
-                "    {\n" +
-                "      \"type\": \"unsupported_type\",\n" +
-                "      \"value\": 1\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"type\": \"string\",\n" +
-                "      \"value\": \"string_value\"\n" +
-                "    }\n" +
-                "  ]\n" +
-                "}";
-        Mockito.when(this.restRequest.content()).thenReturn(new BytesArray(payload));
-        Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.POST);
-
-        SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
-    }
+  @Mock private RestRequest restRequest;
+
+  @Mock private OpenSearchSettings settings;
+
+  @Before
+  public void setup() {
+    // Force return empty list to avoid ClusterSettings be invoked which is a final class and hard
+    // to mock.
+    // In this case, default value in Setting will be returned all the time.
+    doReturn(emptyList()).when(settings).getSettings();
+    LocalClusterState.state().setPluginSettings(settings);
+  }
+
+  @Ignore(
+      "RestRequest is a final method, and Mockito 1.x cannot mock it."
+          + "Ignore this test case till we can upgrade to Mockito 2.x")
+  @Test
+  public void testGenerateSqlRequest_fromUrlParams() {
+    String sql = "select * from table";
+    Mockito.when(restRequest.method()).thenReturn(RestRequest.Method.GET);
+    Mockito.when(restRequest.param("sql")).thenReturn(sql);
+
+    SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(restRequest);
+
+    Assert.assertFalse(sqlRequest instanceof PreparedStatementRequest);
+    Assert.assertEquals(sql, sqlRequest.getSql());
+  }
+
+  @Test
+  public void testGenerateSqlRequest_sqlRequestFromPayload() {
+    String payload = "{ \"query\": \"select * from my_table\" }";
+
+    Mockito.when(this.restRequest.content()).thenReturn(new BytesArray(payload));
+    Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.POST);
+
+    SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
+    Assert.assertFalse(sqlRequest instanceof PreparedStatementRequest);
+    Assert.assertEquals("select * from my_table", sqlRequest.getSql());
+  }
+
+  @Test
+  public void testGenerateSqlRequest_preparedStatementFromPayload() {
+    String payload =
+        "{\n"
+            + "  \"query\": \"select * from my_table where int_param = ? and double_param = ? and"
+            + " string_param = ? and date_param = ? and null_param = ?\",\n"
+            + "  \"parameters\": [\n"
+            + "    {\n"
+            + "      \"type\": \"integer\",\n"
+            + "      \"value\": 1\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"type\": \"double\",\n"
+            + "      \"value\": \"2.0\"\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"type\": \"string\",\n"
+            + "      \"value\": \"string_value\"\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"type\": \"date\",\n"
+            + "      \"value\": \"2000-01-01\"\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"type\": \"null\",\n"
+            + "      \"value\": null\n"
+            + "    }\n"
+            + "  ]\n"
+            + "}";
+    Mockito.when(this.restRequest.content()).thenReturn(new BytesArray(payload));
+    Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.POST);
+
+    SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
+
+    Assert.assertTrue(sqlRequest instanceof PreparedStatementRequest);
+    PreparedStatementRequest preparedStatementRequest = (PreparedStatementRequest) sqlRequest;
+    Assert.assertEquals(
+        "select * from my_table where int_param = ? and double_param = ? and string_param = ? and"
+            + " date_param = ? and null_param = ?",
+        preparedStatementRequest.getPreparedStatement());
+    Assert.assertEquals(
+        "select * from my_table where int_param = 1 and double_param = 2.0 and string_param ="
+            + " 'string_value' and date_param = '2000-01-01' and null_param = null",
+        preparedStatementRequest.getSql());
+    Assert.assertEquals(5, preparedStatementRequest.getParameters().size());
+    Assert.assertTrue(preparedStatementRequest.getParameters().get(0).getValue() instanceof Long);
+    Assert.assertTrue(preparedStatementRequest.getParameters().get(1).getValue() instanceof Double);
+    Assert.assertTrue(
+        preparedStatementRequest.getParameters().get(2)
+            instanceof PreparedStatementRequest.StringParameter);
+    Assert.assertTrue(
+        preparedStatementRequest.getParameters().get(3)
+            instanceof PreparedStatementRequest.StringParameter);
+    Assert.assertTrue(
+        preparedStatementRequest.getParameters().get(4)
+            instanceof PreparedStatementRequest.NullParameter);
+  }
+
+  @Test
+  public void testGenerateSqlRequest_prearedStatementFromPayload2() {
+    // type not covered in above test case
+    String payload =
+        "{\n"
+            + "  \"query\": \"select * from my_table where long_param = ? and float_param = ? and"
+            + " keyword_param = ? and boolean_param = ? and byte_param = ?\",\n"
+            + "  \"parameters\": [\n"
+            + "    {\n"
+            + "      \"type\": \"long\",\n"
+            + "      \"value\": 1\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"type\": \"float\",\n"
+            + "      \"value\": \"2.0\"\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"type\": \"keyword\",\n"
+            + "      \"value\": \"string_value\"\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"type\": \"boolean\",\n"
+            + "      \"value\": true\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"type\": \"byte\",\n"
+            + "      \"value\": 91\n"
+            + "    }\n"
+            + "  ]\n"
+            + "}";
+    Mockito.when(this.restRequest.content()).thenReturn(new BytesArray(payload));
+    Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.POST);
+    SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
+
+    Assert.assertTrue(sqlRequest instanceof PreparedStatementRequest);
+    PreparedStatementRequest preparedStatementRequest = (PreparedStatementRequest) sqlRequest;
+    Assert.assertEquals(5, preparedStatementRequest.getParameters().size());
+    Assert.assertTrue(preparedStatementRequest.getParameters().get(0).getValue() instanceof Long);
+    Assert.assertTrue(preparedStatementRequest.getParameters().get(1).getValue() instanceof Double);
+    Assert.assertTrue(
+        preparedStatementRequest.getParameters().get(2)
+            instanceof PreparedStatementRequest.StringParameter);
+    System.out.println(preparedStatementRequest.getParameters().get(3));
+    Assert.assertTrue(
+        preparedStatementRequest.getParameters().get(3).getValue() instanceof Boolean);
+    Assert.assertTrue(preparedStatementRequest.getParameters().get(4).getValue() instanceof Long);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testGenerateSqlRequest_unsupportedHttpMethod() {
+    Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.PUT);
+    SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testGenerateSqlRequest_invalidJson() {
+    String payload = "{\n" + "  \"query\": \"select * from my_table where param1 = ?\",\n";
+    Mockito.when(this.restRequest.content()).thenReturn(new BytesArray(payload));
+    Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.POST);
+
+    SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testGenerateSqlRequest_unsupportedType() {
+    String payload =
+        "{\n"
+            + "  \"query\": \"select * from my_table where param1 = ?\",\n"
+            + "  \"parameters\": [\n"
+            + "    {\n"
+            + "      \"type\": \"unsupported_type\",\n"
+            + "      \"value\": 1\n"
+            + "    },\n"
+            + "    {\n"
+            + "      \"type\": \"string\",\n"
+            + "      \"value\": \"string_value\"\n"
+            + "    }\n"
+            + "  ]\n"
+            + "}";
+    Mockito.when(this.restRequest.content()).thenReturn(new BytesArray(payload));
+    Mockito.when(this.restRequest.method()).thenReturn(RestRequest.Method.POST);
+
+    SqlRequest sqlRequest = SqlRequestFactory.getSqlRequest(this.restRequest);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/SqlRequestParamTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/SqlRequestParamTest.java
index 103d43d95c..3c47832761 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/SqlRequestParamTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/SqlRequestParamTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static org.junit.Assert.assertEquals;
@@ -20,52 +19,52 @@
 import org.opensearch.sql.legacy.request.SqlRequestParam;
 
 public class SqlRequestParamTest {
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
-    @Test
-    public void shouldReturnTrueIfPrettyParamsIsTrue() {
-        assertTrue(SqlRequestParam.isPrettyFormat(ImmutableMap.of(QUERY_PARAMS_PRETTY, "true")));
-    }
+  @Test
+  public void shouldReturnTrueIfPrettyParamsIsTrue() {
+    assertTrue(SqlRequestParam.isPrettyFormat(ImmutableMap.of(QUERY_PARAMS_PRETTY, "true")));
+  }
 
-    @Test
-    public void shouldReturnTrueIfPrettyParamsIsEmpty() {
-        assertTrue(SqlRequestParam.isPrettyFormat(ImmutableMap.of(QUERY_PARAMS_PRETTY, "")));
-    }
+  @Test
+  public void shouldReturnTrueIfPrettyParamsIsEmpty() {
+    assertTrue(SqlRequestParam.isPrettyFormat(ImmutableMap.of(QUERY_PARAMS_PRETTY, "")));
+  }
 
-    @Test
-    public void shouldReturnFalseIfNoPrettyParams() {
-        assertFalse(SqlRequestParam.isPrettyFormat(ImmutableMap.of()));
-    }
+  @Test
+  public void shouldReturnFalseIfNoPrettyParams() {
+    assertFalse(SqlRequestParam.isPrettyFormat(ImmutableMap.of()));
+  }
 
-    @Test
-    public void shouldReturnFalseIfPrettyParamsIsUnknownValue() {
-        assertFalse(SqlRequestParam.isPrettyFormat(ImmutableMap.of(QUERY_PARAMS_PRETTY, "unknown")));
-    }
+  @Test
+  public void shouldReturnFalseIfPrettyParamsIsUnknownValue() {
+    assertFalse(SqlRequestParam.isPrettyFormat(ImmutableMap.of(QUERY_PARAMS_PRETTY, "unknown")));
+  }
 
-    @Test
-    public void shouldReturnJSONIfFormatParamsIsJSON() {
-        assertEquals(Format.JSON, SqlRequestParam.getFormat(ImmutableMap.of(QUERY_PARAMS_FORMAT, "json")));
-    }
+  @Test
+  public void shouldReturnJSONIfFormatParamsIsJSON() {
+    assertEquals(
+        Format.JSON, SqlRequestParam.getFormat(ImmutableMap.of(QUERY_PARAMS_FORMAT, "json")));
+  }
 
-    @Test
-    public void shouldReturnDefaultFormatIfNoFormatParams() {
-        assertEquals(Format.JDBC, SqlRequestParam.getFormat(ImmutableMap.of()));
-    }
+  @Test
+  public void shouldReturnDefaultFormatIfNoFormatParams() {
+    assertEquals(Format.JDBC, SqlRequestParam.getFormat(ImmutableMap.of()));
+  }
 
-    @Test
-    public void shouldThrowExceptionIfFormatParamsIsEmpty() {
-        exceptionRule.expect(IllegalArgumentException.class);
-        exceptionRule.expectMessage("Failed to create executor due to unknown response format: ");
+  @Test
+  public void shouldThrowExceptionIfFormatParamsIsEmpty() {
+    exceptionRule.expect(IllegalArgumentException.class);
+    exceptionRule.expectMessage("Failed to create executor due to unknown response format: ");
 
-        assertEquals(Format.JDBC, SqlRequestParam.getFormat(ImmutableMap.of(QUERY_PARAMS_FORMAT, "")));
-    }
+    assertEquals(Format.JDBC, SqlRequestParam.getFormat(ImmutableMap.of(QUERY_PARAMS_FORMAT, "")));
+  }
 
-    @Test
-    public void shouldThrowExceptionIfFormatParamsIsNotSupported() {
-        exceptionRule.expect(IllegalArgumentException.class);
-        exceptionRule.expectMessage("Failed to create executor due to unknown response format: xml");
+  @Test
+  public void shouldThrowExceptionIfFormatParamsIsNotSupported() {
+    exceptionRule.expect(IllegalArgumentException.class);
+    exceptionRule.expectMessage("Failed to create executor due to unknown response format: xml");
 
-        SqlRequestParam.getFormat(ImmutableMap.of(QUERY_PARAMS_FORMAT, "xml"));
-    }
+    SqlRequestParam.getFormat(ImmutableMap.of(QUERY_PARAMS_FORMAT, "xml"));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/StringOperatorsTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/StringOperatorsTest.java
index b2d13f3ead..27b8e7f2c6 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/StringOperatorsTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/StringOperatorsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static org.junit.Assert.assertTrue;
@@ -17,196 +16,154 @@
 
 public class StringOperatorsTest {
 
-    private static SqlParser parser;
-
-    @BeforeClass
-    public static void init() { parser = new SqlParser(); }
-
-    @Test
-    public void substringTest() {
-        String query = "SELECT substring(lastname, 2, 1) FROM accounts WHERE substring(lastname, 2, 1) = 'a' " +
-                "GROUP BY substring(lastname, 2, 1) ORDER BY substring(lastname, 2, 1)";
-
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "doc['lastname'].value.substring(1, end)"));
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "doc['lastname'].value.substring(1, end)"
-                )
-        );
-    }
-
-    @Test
-    public void substringIndexOutOfBoundTest() {
-        String query = "SELECT substring('sampleName', 0, 20) FROM accounts";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "def end = (int) Math.min(0 + 20, 'sampleName'.length())"
-                )
-        );
-    }
-
-    @Test
-    public void lengthTest() {
-        String query = "SELECT length(lastname) FROM accounts WHERE length(lastname) = 5 " +
-                "GROUP BY length(lastname) ORDER BY length(lastname)";
-
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "doc['lastname'].value.length()"
-                )
-        );
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "doc['lastname'].value.length()"
-                )
-        );
-    }
-
-    @Test
-    public void replaceTest() {
-        String query = "SELECT replace(lastname, 'a', 'A') FROM accounts WHERE replace(lastname, 'a', 'A') = 'aba' " +
-                "GROUP BY replace(lastname, 'a', 'A') ORDER BY replace(lastname, 'a', 'A')";
-
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "doc['lastname'].value.replace('a','A')"
-                )
-        );
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "doc['lastname'].value.replace('a','A')"
-                )
-        );
-    }
-
-    @Test
-    public void locateTest() {
-        String query = "SELECT locate('a', lastname, 1) FROM accounts WHERE locate('a', lastname, 1) = 4 " +
-                "GROUP BY locate('a', lastname, 1) ORDER BY locate('a', lastname, 1)";
-
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "doc['lastname'].value.indexOf('a',0)+1"
-                )
-        );
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "doc['lastname'].value.indexOf('a',0)+1"
-                )
-        );
-    }
-
-    @Test
-    public void ltrimTest() {
-        String query = "SELECT ltrim(lastname) FROM accounts WHERE ltrim(lastname) = 'abc' " +
-                "GROUP BY ltrim(lastname) ORDER BY ltrim(lastname)";
-
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Character.isWhitespace(doc['lastname'].value.charAt(pos))"
-                )
-        );
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Character.isWhitespace(doc['lastname'].value.charAt(pos))"
-                )
-        );
-    }
-
-    @Test
-    public void rtrimTest() {
-        String query = "SELECT rtrim(lastname) FROM accounts WHERE rtrim(lastname) = 'cba' " +
-                "GROUP BY rtrim(lastname) ORDER BY rtrim(lastname)";
-
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "Character.isWhitespace(doc['lastname'].value.charAt(pos))"
-                )
-        );
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "Character.isWhitespace(doc['lastname'].value.charAt(pos))"
-                )
-        );
-    }
-
-    @Test
-    public void asciiTest() {
-        String query = "SELECT ascii(lastname) FROM accounts WHERE ascii(lastname) = 108 " +
-                "GROUP BY ascii(lastname) ORDER BY ascii(lastname)";
-
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "(int) doc['lastname'].value.charAt(0)"
-                )
-        );
-
-        ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptFilter,
-                        "(int) doc['lastname'].value.charAt(0)"
-                )
-        );
-    }
-
-    @Test
-    public void left() {
-        String query = "SELECT left(lastname, 1) FROM accounts";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "doc['lastname'].value.substring(0, len)"
-                )
-        );
-    }
-
-    @Test
-    public void right() {
-        String query = "SELECT right(lastname, 2) FROM accounts";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "doc['lastname'].value.substring(start)"
-                )
-        );
-    }
+  private static SqlParser parser;
+
+  @BeforeClass
+  public static void init() {
+    parser = new SqlParser();
+  }
+
+  @Test
+  public void substringTest() {
+    String query =
+        "SELECT substring(lastname, 2, 1) FROM accounts WHERE substring(lastname, 2, 1) = 'a' "
+            + "GROUP BY substring(lastname, 2, 1) ORDER BY substring(lastname, 2, 1)";
+
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "doc['lastname'].value.substring(1, end)"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptFilter, "doc['lastname'].value.substring(1, end)"));
+  }
+
+  @Test
+  public void substringIndexOutOfBoundTest() {
+    String query = "SELECT substring('sampleName', 0, 20) FROM accounts";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "def end = (int) Math.min(0 + 20, 'sampleName'.length())"));
+  }
+
+  @Test
+  public void lengthTest() {
+    String query =
+        "SELECT length(lastname) FROM accounts WHERE length(lastname) = 5 "
+            + "GROUP BY length(lastname) ORDER BY length(lastname)";
+
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "doc['lastname'].value.length()"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(scriptFilter, "doc['lastname'].value.length()"));
+  }
+
+  @Test
+  public void replaceTest() {
+    String query =
+        "SELECT replace(lastname, 'a', 'A') FROM accounts WHERE replace(lastname, 'a', 'A') = 'aba'"
+            + " GROUP BY replace(lastname, 'a', 'A') ORDER BY replace(lastname, 'a', 'A')";
+
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "doc['lastname'].value.replace('a','A')"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptFilter, "doc['lastname'].value.replace('a','A')"));
+  }
+
+  @Test
+  public void locateTest() {
+    String query =
+        "SELECT locate('a', lastname, 1) FROM accounts WHERE locate('a', lastname, 1) = 4 "
+            + "GROUP BY locate('a', lastname, 1) ORDER BY locate('a', lastname, 1)";
+
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "doc['lastname'].value.indexOf('a',0)+1"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptFilter, "doc['lastname'].value.indexOf('a',0)+1"));
+  }
+
+  @Test
+  public void ltrimTest() {
+    String query =
+        "SELECT ltrim(lastname) FROM accounts WHERE ltrim(lastname) = 'abc' "
+            + "GROUP BY ltrim(lastname) ORDER BY ltrim(lastname)";
+
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "Character.isWhitespace(doc['lastname'].value.charAt(pos))"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptFilter, "Character.isWhitespace(doc['lastname'].value.charAt(pos))"));
+  }
+
+  @Test
+  public void rtrimTest() {
+    String query =
+        "SELECT rtrim(lastname) FROM accounts WHERE rtrim(lastname) = 'cba' "
+            + "GROUP BY rtrim(lastname) ORDER BY rtrim(lastname)";
+
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "Character.isWhitespace(doc['lastname'].value.charAt(pos))"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptFilter, "Character.isWhitespace(doc['lastname'].value.charAt(pos))"));
+  }
+
+  @Test
+  public void asciiTest() {
+    String query =
+        "SELECT ascii(lastname) FROM accounts WHERE ascii(lastname) = 108 "
+            + "GROUP BY ascii(lastname) ORDER BY ascii(lastname)";
+
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "(int) doc['lastname'].value.charAt(0)"));
+
+    ScriptFilter scriptFilter = CheckScriptContents.getScriptFilterFromQuery(query, parser);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptFilter, "(int) doc['lastname'].value.charAt(0)"));
+  }
+
+  @Test
+  public void left() {
+    String query = "SELECT left(lastname, 1) FROM accounts";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "doc['lastname'].value.substring(0, len)"));
+  }
+
+  @Test
+  public void right() {
+    String query = "SELECT right(lastname, 2) FROM accounts";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    assertTrue(
+        CheckScriptContents.scriptContainsString(
+            scriptField, "doc['lastname'].value.substring(start)"));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/WhereWithBoolConditionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/WhereWithBoolConditionTest.java
index e7df57ce31..de6f2c8dda 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/WhereWithBoolConditionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/WhereWithBoolConditionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -25,58 +24,60 @@
 import org.opensearch.sql.legacy.util.TestsConstants;
 import org.opensearch.sql.legacy.utils.StringUtils;
 
-
 public class WhereWithBoolConditionTest {
 
-    @Test
-    public void whereWithBoolCompilationTest()
-        throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
-       query(StringUtils.format("SELECT * FROM %s WHERE male = false", TestsConstants.TEST_INDEX_BANK));
-    }
+  @Test
+  public void whereWithBoolCompilationTest()
+      throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
+    query(
+        StringUtils.format("SELECT * FROM %s WHERE male = false", TestsConstants.TEST_INDEX_BANK));
+  }
 
-    @Test
-    public void selectAllTest()
-        throws SQLFeatureNotSupportedException, SqlParseException, IOException,
-        SQLFeatureDisabledException {
-        String expectedOutput = Files.toString(
-                new File(getResourcePath() + "src/test/resources/expectedOutput/select_where_true.json"), StandardCharsets.UTF_8)
-                .replaceAll("\r", "");
+  @Test
+  public void selectAllTest()
+      throws SQLFeatureNotSupportedException,
+          SqlParseException,
+          IOException,
+          SQLFeatureDisabledException {
+    String expectedOutput =
+        Files.toString(
+                new File(
+                    getResourcePath() + "src/test/resources/expectedOutput/select_where_true.json"),
+                StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
 
-        assertThat(removeSpaces(
-                query(
-                    StringUtils.format(
-                        "SELECT * " +
-                        "FROM %s " +
-                        "WHERE male = true",
-                        TestsConstants.TEST_INDEX_BANK))
-                ),
-                equalTo(removeSpaces(expectedOutput))
-        );
-    }
+    assertThat(
+        removeSpaces(
+            query(
+                StringUtils.format(
+                    "SELECT * " + "FROM %s " + "WHERE male = true",
+                    TestsConstants.TEST_INDEX_BANK))),
+        equalTo(removeSpaces(expectedOutput)));
+  }
 
-    private String query(String query)
-        throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
-        return explain(query);
-    }
+  private String query(String query)
+      throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
+    return explain(query);
+  }
 
-    private String explain(String sql)
-        throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
-        Client mockClient = Mockito.mock(Client.class);
-        CheckScriptContents.stubMockClient(mockClient);
-        QueryAction queryAction = OpenSearchActionFactory.create(mockClient, sql);
-        return queryAction.explain().explain();
-    }
+  private String explain(String sql)
+      throws SQLFeatureNotSupportedException, SqlParseException, SQLFeatureDisabledException {
+    Client mockClient = Mockito.mock(Client.class);
+    CheckScriptContents.stubMockClient(mockClient);
+    QueryAction queryAction = OpenSearchActionFactory.create(mockClient, sql);
+    return queryAction.explain().explain();
+  }
 
-    private String removeSpaces(String s) {
-        return s.replaceAll("\\s+", "");
-    }
+  private String removeSpaces(String s) {
+    return s.replaceAll("\\s+", "");
+  }
 
-    private String getResourcePath() {
-        String projectRoot = System.getProperty("project.root");
-        if ( projectRoot!= null && projectRoot.trim().length() > 0) {
-            return projectRoot.trim() + "/";
-        } else {
-            return "";
-        }
+  private String getResourcePath() {
+    String projectRoot = System.getProperty("project.root");
+    if (projectRoot != null && projectRoot.trim().length() > 0) {
+      return projectRoot.trim() + "/";
+    } else {
+      return "";
     }
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/cursor/DefaultCursorTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/cursor/DefaultCursorTest.java
index cfb70dc83c..1b9662035d 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/cursor/DefaultCursorTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/cursor/DefaultCursorTest.java
@@ -3,13 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.cursor;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.emptyOrNullString;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -19,40 +18,39 @@
 
 public class DefaultCursorTest {
 
-    @Test
-    public void checkCursorType() {
-        DefaultCursor cursor = new DefaultCursor();
-        assertEquals(cursor.getType(), CursorType.DEFAULT);
-    }
-
-
-    @Test
-    public void cursorShouldStartWithCursorTypeID() {
-        DefaultCursor cursor = new DefaultCursor();
-        cursor.setRowsLeft(50);
-        cursor.setScrollId("dbdskbcdjksbcjkdsbcjk+//");
-        cursor.setIndexPattern("myIndex");
-        cursor.setFetchSize(500);
-        cursor.setFieldAliasMap(Collections.emptyMap());
-        cursor.setColumns(new ArrayList<>());
-        assertThat(cursor.generateCursorId(), startsWith(cursor.getType().getId()+ ":") );
-    }
-
-    @Test
-    public void nullCursorWhenRowLeftIsLessThanEqualZero() {
-        DefaultCursor cursor = new DefaultCursor();
-        assertThat(cursor.generateCursorId(), emptyOrNullString());
-
-        cursor.setRowsLeft(-10);
-        assertThat(cursor.generateCursorId(), emptyOrNullString());
-    }
-
-    @Test
-    public void nullCursorWhenScrollIDIsNullOrEmpty() {
-        DefaultCursor cursor = new DefaultCursor();
-        assertThat(cursor.generateCursorId(), emptyOrNullString());
-
-        cursor.setScrollId("");
-        assertThat(cursor.generateCursorId(), emptyOrNullString());
-    }
+  @Test
+  public void checkCursorType() {
+    DefaultCursor cursor = new DefaultCursor();
+    assertEquals(cursor.getType(), CursorType.DEFAULT);
+  }
+
+  @Test
+  public void cursorShouldStartWithCursorTypeID() {
+    DefaultCursor cursor = new DefaultCursor();
+    cursor.setRowsLeft(50);
+    cursor.setScrollId("dbdskbcdjksbcjkdsbcjk+//");
+    cursor.setIndexPattern("myIndex");
+    cursor.setFetchSize(500);
+    cursor.setFieldAliasMap(Collections.emptyMap());
+    cursor.setColumns(new ArrayList<>());
+    assertThat(cursor.generateCursorId(), startsWith(cursor.getType().getId() + ":"));
+  }
+
+  @Test
+  public void nullCursorWhenRowLeftIsLessThanEqualZero() {
+    DefaultCursor cursor = new DefaultCursor();
+    assertThat(cursor.generateCursorId(), emptyOrNullString());
+
+    cursor.setRowsLeft(-10);
+    assertThat(cursor.generateCursorId(), emptyOrNullString());
+  }
+
+  @Test
+  public void nullCursorWhenScrollIDIsNullOrEmpty() {
+    DefaultCursor cursor = new DefaultCursor();
+    assertThat(cursor.generateCursorId(), emptyOrNullString());
+
+    cursor.setScrollId("");
+    assertThat(cursor.generateCursorId(), emptyOrNullString());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/domain/ColumnTypeProviderTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/domain/ColumnTypeProviderTest.java
index 205c63ad1d..6599d576b3 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/domain/ColumnTypeProviderTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/domain/ColumnTypeProviderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.domain;
 
 import static org.junit.Assert.assertEquals;
@@ -18,28 +17,29 @@
 import org.opensearch.sql.legacy.executor.format.Schema;
 
 public class ColumnTypeProviderTest {
-    @Test
-    public void singleESDataTypeShouldReturnCorrectSchemaType() {
-        assertEquals(Schema.Type.LONG, new ColumnTypeProvider(OpenSearchDataType.LONG).get(0));
-    }
-
-    @Test
-    public void productTypeShouldReturnCorrectSchemaType() {
-        ColumnTypeProvider columnTypeProvider =
-                new ColumnTypeProvider(new Product(ImmutableList.of(OpenSearchDataType.LONG, OpenSearchDataType.SHORT)));
-        assertEquals(Schema.Type.LONG, columnTypeProvider.get(0));
-        assertEquals(Schema.Type.SHORT, columnTypeProvider.get(1));
-    }
-
-    @Test
-    public void unSupportedTypeShouldReturnDefaultSchemaType() {
-        ColumnTypeProvider columnTypeProvider = new ColumnTypeProvider(SetOperator.UNION);
-        assertEquals(COLUMN_DEFAULT_TYPE, columnTypeProvider.get(0));
-    }
-
-    @Test
-    public void providerWithoutColumnTypeShouldReturnDefaultSchemaType() {
-        ColumnTypeProvider columnTypeProvider = new ColumnTypeProvider();
-        assertEquals(COLUMN_DEFAULT_TYPE, columnTypeProvider.get(0));
-    }
+  @Test
+  public void singleESDataTypeShouldReturnCorrectSchemaType() {
+    assertEquals(Schema.Type.LONG, new ColumnTypeProvider(OpenSearchDataType.LONG).get(0));
+  }
+
+  @Test
+  public void productTypeShouldReturnCorrectSchemaType() {
+    ColumnTypeProvider columnTypeProvider =
+        new ColumnTypeProvider(
+            new Product(ImmutableList.of(OpenSearchDataType.LONG, OpenSearchDataType.SHORT)));
+    assertEquals(Schema.Type.LONG, columnTypeProvider.get(0));
+    assertEquals(Schema.Type.SHORT, columnTypeProvider.get(1));
+  }
+
+  @Test
+  public void unSupportedTypeShouldReturnDefaultSchemaType() {
+    ColumnTypeProvider columnTypeProvider = new ColumnTypeProvider(SetOperator.UNION);
+    assertEquals(COLUMN_DEFAULT_TYPE, columnTypeProvider.get(0));
+  }
+
+  @Test
+  public void providerWithoutColumnTypeShouldReturnDefaultSchemaType() {
+    ColumnTypeProvider columnTypeProvider = new ColumnTypeProvider();
+    assertEquals(COLUMN_DEFAULT_TYPE, columnTypeProvider.get(0));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/DeleteResultSetTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/DeleteResultSetTest.java
index ed86b50f12..533c2b2989 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/DeleteResultSetTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/DeleteResultSetTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.executor;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -13,63 +12,62 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.xcontent.DeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.reindex.BulkByScrollResponse;
 import org.opensearch.sql.legacy.domain.Delete;
 import org.opensearch.sql.legacy.executor.format.DataRows;
 import org.opensearch.sql.legacy.executor.format.DeleteResultSet;
 import org.opensearch.sql.legacy.executor.format.Schema;
 
-
 public class DeleteResultSetTest {
 
-    @Mock
-    NodeClient client;
+  @Mock NodeClient client;
 
-    @Mock
-    Delete deleteQuery;
-    
-    @Test
-    public void testDeleteResponseForJdbcFormat() throws IOException {
+  @Mock Delete deleteQuery;
 
-        String jsonDeleteResponse = "{\n" +
-            "  \"took\" : 73,\n" +
-            "  \"timed_out\" : false,\n" +
-            "  \"total\" : 1,\n" +
-            "  \"updated\" : 0,\n" +
-            "  \"created\" : 0,\n" +
-            "  \"deleted\" : 10,\n" +
-            "  \"batches\" : 1,\n" +
-            "  \"version_conflicts\" : 0,\n" +
-            "  \"noops\" : 0,\n" +
-            "  \"retries\" : {\n" +
-            "    \"bulk\" : 0,\n" +
-            "    \"search\" : 0\n" +
-            "  },\n" +
-            "  \"throttled_millis\" : 0,\n" +
-            "  \"requests_per_second\" : -1.0,\n" +
-            "  \"throttled_until_millis\" : 0,\n" +
-            "  \"failures\" : [ ]\n" +
-            "}\n";
+  @Test
+  public void testDeleteResponseForJdbcFormat() throws IOException {
 
-        XContentType xContentType = XContentType.JSON;
-        XContentParser parser = xContentType.xContent().createParser(
-            NamedXContentRegistry.EMPTY,
-            DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
-            jsonDeleteResponse
-        );
+    String jsonDeleteResponse =
+        "{\n"
+            + "  \"took\" : 73,\n"
+            + "  \"timed_out\" : false,\n"
+            + "  \"total\" : 1,\n"
+            + "  \"updated\" : 0,\n"
+            + "  \"created\" : 0,\n"
+            + "  \"deleted\" : 10,\n"
+            + "  \"batches\" : 1,\n"
+            + "  \"version_conflicts\" : 0,\n"
+            + "  \"noops\" : 0,\n"
+            + "  \"retries\" : {\n"
+            + "    \"bulk\" : 0,\n"
+            + "    \"search\" : 0\n"
+            + "  },\n"
+            + "  \"throttled_millis\" : 0,\n"
+            + "  \"requests_per_second\" : -1.0,\n"
+            + "  \"throttled_until_millis\" : 0,\n"
+            + "  \"failures\" : [ ]\n"
+            + "}\n";
 
-        BulkByScrollResponse deleteResponse  = BulkByScrollResponse.fromXContent(parser);
-        DeleteResultSet deleteResultSet = new DeleteResultSet(client, deleteQuery, deleteResponse);
-        Schema schema = deleteResultSet.getSchema();
-        DataRows dataRows = deleteResultSet.getDataRows();
+    XContentType xContentType = XContentType.JSON;
+    XContentParser parser =
+        xContentType
+            .xContent()
+            .createParser(
+                NamedXContentRegistry.EMPTY,
+                DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
+                jsonDeleteResponse);
 
-        assertThat(schema.getHeaders().size(), equalTo(1));
-        assertThat(dataRows.getSize(), equalTo(1L));
-        assertThat(dataRows.iterator().next().getData(DeleteResultSet.DELETED), equalTo(10L));
-    }
+    BulkByScrollResponse deleteResponse = BulkByScrollResponse.fromXContent(parser);
+    DeleteResultSet deleteResultSet = new DeleteResultSet(client, deleteQuery, deleteResponse);
+    Schema schema = deleteResultSet.getSchema();
+    DataRows dataRows = deleteResultSet.getDataRows();
 
+    assertThat(schema.getHeaders().size(), equalTo(1));
+    assertThat(dataRows.getSize(), equalTo(1L));
+    assertThat(dataRows.iterator().next().getData(DeleteResultSet.DELETED), equalTo(10L));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/format/BindingTupleResultSetTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/format/BindingTupleResultSetTest.java
index d76aa84a5d..fa385fa14b 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/format/BindingTupleResultSetTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/format/BindingTupleResultSetTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.executor.format;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -27,53 +26,65 @@
 
 public class BindingTupleResultSetTest {
 
-    @Test
-    public void buildDataRowsFromBindingTupleShouldPass() {
-        assertThat(row(
+  @Test
+  public void buildDataRowsFromBindingTupleShouldPass() {
+    assertThat(
+        row(
             Arrays.asList(
                 ColumnNode.builder().name("age").type(Schema.Type.INTEGER).build(),
                 ColumnNode.builder().name("gender").type(Schema.Type.TEXT).build()),
-            Arrays.asList(BindingTuple.from(ImmutableMap.of("age", 31, "gender", "m")),
+            Arrays.asList(
+                BindingTuple.from(ImmutableMap.of("age", 31, "gender", "m")),
                 BindingTuple.from(ImmutableMap.of("age", 31, "gender", "f")),
                 BindingTuple.from(ImmutableMap.of("age", 39, "gender", "m")),
                 BindingTuple.from(ImmutableMap.of("age", 39, "gender", "f")))),
-            containsInAnyOrder(rowContents(allOf(hasEntry("age", 31), hasEntry("gender", (Object) "m"))),
-                rowContents(allOf(hasEntry("age", 31), hasEntry("gender", (Object) "f"))),
-                rowContents(allOf(hasEntry("age", 39), hasEntry("gender", (Object) "m"))),
-                rowContents(allOf(hasEntry("age", 39), hasEntry("gender", (Object) "f")))));
-    }
+        containsInAnyOrder(
+            rowContents(allOf(hasEntry("age", 31), hasEntry("gender", (Object) "m"))),
+            rowContents(allOf(hasEntry("age", 31), hasEntry("gender", (Object) "f"))),
+            rowContents(allOf(hasEntry("age", 39), hasEntry("gender", (Object) "m"))),
+            rowContents(allOf(hasEntry("age", 39), hasEntry("gender", (Object) "f")))));
+  }
 
-    @Test
-    public void buildDataRowsFromBindingTupleIncludeLongValueShouldPass() {
-        assertThat(row(
+  @Test
+  public void buildDataRowsFromBindingTupleIncludeLongValueShouldPass() {
+    assertThat(
+        row(
             Arrays.asList(
                 ColumnNode.builder().name("longValue").type(Schema.Type.LONG).build(),
                 ColumnNode.builder().name("gender").type(Schema.Type.TEXT).build()),
             Arrays.asList(
                 BindingTuple.from(ImmutableMap.of("longValue", Long.MAX_VALUE, "gender", "m")),
                 BindingTuple.from(ImmutableMap.of("longValue", Long.MIN_VALUE, "gender", "f")))),
-            containsInAnyOrder(
-                rowContents(allOf(hasEntry("longValue", Long.MAX_VALUE), hasEntry("gender", (Object) "m"))),
-                rowContents(allOf(hasEntry("longValue", Long.MIN_VALUE), hasEntry("gender", (Object) "f")))));
-    }
+        containsInAnyOrder(
+            rowContents(
+                allOf(hasEntry("longValue", Long.MAX_VALUE), hasEntry("gender", (Object) "m"))),
+            rowContents(
+                allOf(hasEntry("longValue", Long.MIN_VALUE), hasEntry("gender", (Object) "f")))));
+  }
 
-    @Test
-    public void buildDataRowsFromBindingTupleIncludeDateShouldPass() {
-        assertThat(row(
+  @Test
+  public void buildDataRowsFromBindingTupleIncludeDateShouldPass() {
+    assertThat(
+        row(
             Arrays.asList(
                 ColumnNode.builder().alias("dateValue").type(Schema.Type.DATE).build(),
                 ColumnNode.builder().alias("gender").type(Schema.Type.TEXT).build()),
             Arrays.asList(
                 BindingTuple.from(ImmutableMap.of("dateValue", 1529712000000L, "gender", "m")))),
-            containsInAnyOrder(
-                rowContents(allOf(hasEntry("dateValue", "2018-06-23 00:00:00.000"), hasEntry("gender", (Object) "m")))));
-    }
+        containsInAnyOrder(
+            rowContents(
+                allOf(
+                    hasEntry("dateValue", "2018-06-23 00:00:00.000"),
+                    hasEntry("gender", (Object) "m")))));
+  }
 
-    private static Matcher<DataRows.Row> rowContents(Matcher<Map<String, Object>> matcher) {
-        return featureValueOf("DataRows.Row", matcher, DataRows.Row::getContents);
-    }
+  private static Matcher<DataRows.Row> rowContents(Matcher<Map<String, Object>> matcher) {
+    return featureValueOf("DataRows.Row", matcher, DataRows.Row::getContents);
+  }
 
-    private List<DataRows.Row> row(List<ColumnNode> columnNodes, List<BindingTuple> bindingTupleList) {
-        return ImmutableList.copyOf(BindingTupleResultSet.buildDataRows(columnNodes, bindingTupleList).iterator());
-    }
+  private List<DataRows.Row> row(
+      List<ColumnNode> columnNodes, List<BindingTuple> bindingTupleList) {
+    return ImmutableList.copyOf(
+        BindingTupleResultSet.buildDataRows(columnNodes, bindingTupleList).iterator());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/format/CSVResultsExtractorTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/format/CSVResultsExtractorTest.java
index b3afff2ce1..be6029f9af 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/format/CSVResultsExtractorTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/format/CSVResultsExtractorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.executor.format;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -19,21 +18,25 @@
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
 
 public class CSVResultsExtractorTest {
-    private final CSVResultsExtractor csvResultsExtractor = new CSVResultsExtractor(false, false);
-
-    @Test
-    public void extractResultsFromBindingTupleListShouldPass() throws CsvExtractorException {
-        CSVResult csvResult = csv(Arrays.asList(BindingTuple.from(ImmutableMap.of("age", 31, "gender", "m")),
-                                                BindingTuple.from(ImmutableMap.of("age", 31, "gender", "f")),
-                                                BindingTuple.from(ImmutableMap.of("age", 39, "gender", "m")),
-                                                BindingTuple.from(ImmutableMap.of("age", 39, "gender", "f"))),
-                                  Arrays.asList("age", "gender"));
-
-        assertThat(csvResult.getHeaders(), contains("age", "gender"));
-        assertThat(csvResult.getLines(), contains("31,m", "31,f", "39,m", "39,f"));
-    }
-
-    private CSVResult csv(List<BindingTuple> bindingTupleList, List<String> fieldNames) throws CsvExtractorException {
-        return csvResultsExtractor.extractResults(bindingTupleList, false, ",", fieldNames);
-    }
+  private final CSVResultsExtractor csvResultsExtractor = new CSVResultsExtractor(false, false);
+
+  @Test
+  public void extractResultsFromBindingTupleListShouldPass() throws CsvExtractorException {
+    CSVResult csvResult =
+        csv(
+            Arrays.asList(
+                BindingTuple.from(ImmutableMap.of("age", 31, "gender", "m")),
+                BindingTuple.from(ImmutableMap.of("age", 31, "gender", "f")),
+                BindingTuple.from(ImmutableMap.of("age", 39, "gender", "m")),
+                BindingTuple.from(ImmutableMap.of("age", 39, "gender", "f"))),
+            Arrays.asList("age", "gender"));
+
+    assertThat(csvResult.getHeaders(), contains("age", "gender"));
+    assertThat(csvResult.getLines(), contains("31,m", "31,f", "39,m", "39,f"));
+  }
+
+  private CSVResult csv(List<BindingTuple> bindingTupleList, List<String> fieldNames)
+      throws CsvExtractorException {
+    return csvResultsExtractor.extractResults(bindingTupleList, false, ",", fieldNames);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/join/ElasticUtilsTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/join/ElasticUtilsTest.java
index 2160affda0..a642b03267 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/join/ElasticUtilsTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/join/ElasticUtilsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.executor.join;
 
 import java.io.IOException;
@@ -14,7 +13,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 import org.opensearch.sql.legacy.executor.join.ElasticUtils;
@@ -23,30 +22,28 @@
 @RunWith(MockitoJUnitRunner.class)
 public class ElasticUtilsTest {
 
-    @Mock
-    MetaSearchResult metaSearchResult;
-
-    /**
-     * test handling {@link TotalHits} correctly.
-     */
-    @Test
-    public void hitsAsStringResult() throws IOException {
-        final SearchHits searchHits = new SearchHits(new SearchHit[]{}, new TotalHits(1, Relation.EQUAL_TO), 0);
-        final String result = ElasticUtils.hitsAsStringResult(searchHits, metaSearchResult);
-
-        Assert.assertEquals(1, new JSONObject(result).query("/hits/total/value"));
-        Assert.assertEquals(Relation.EQUAL_TO.toString(), new JSONObject(result).query("/hits/total/relation"));
-    }
-
-    /**
-     * test handling {@link TotalHits} with null value correctly.
-     */
-    @Test
-    public void test_hitsAsStringResult_withNullTotalHits() throws IOException {
-        final SearchHits searchHits = new SearchHits(new SearchHit[]{}, null, 0);
-        final String result = ElasticUtils.hitsAsStringResult(searchHits, metaSearchResult);
-
-        Assert.assertEquals(0, new JSONObject(result).query("/hits/total/value"));
-        Assert.assertEquals(Relation.EQUAL_TO.toString(), new JSONObject(result).query("/hits/total/relation"));
-    }
+  @Mock MetaSearchResult metaSearchResult;
+
+  /** test handling {@link TotalHits} correctly. */
+  @Test
+  public void hitsAsStringResult() throws IOException {
+    final SearchHits searchHits =
+        new SearchHits(new SearchHit[] {}, new TotalHits(1, Relation.EQUAL_TO), 0);
+    final String result = ElasticUtils.hitsAsStringResult(searchHits, metaSearchResult);
+
+    Assert.assertEquals(1, new JSONObject(result).query("/hits/total/value"));
+    Assert.assertEquals(
+        Relation.EQUAL_TO.toString(), new JSONObject(result).query("/hits/total/relation"));
+  }
+
+  /** test handling {@link TotalHits} with null value correctly. */
+  @Test
+  public void test_hitsAsStringResult_withNullTotalHits() throws IOException {
+    final SearchHits searchHits = new SearchHits(new SearchHit[] {}, null, 0);
+    final String result = ElasticUtils.hitsAsStringResult(searchHits, metaSearchResult);
+
+    Assert.assertEquals(0, new JSONObject(result).query("/hits/total/value"));
+    Assert.assertEquals(
+        Relation.EQUAL_TO.toString(), new JSONObject(result).query("/hits/total/relation"));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/BinaryExpressionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/BinaryExpressionTest.java
index 2f802f4f91..acc0e9c60e 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/BinaryExpressionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/BinaryExpressionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.expression.core;
 
 import static org.junit.Assert.assertEquals;
@@ -16,74 +15,70 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.sql.legacy.expression.core.operator.ScalarOperation;
 
 @RunWith(MockitoJUnitRunner.class)
 public class BinaryExpressionTest extends ExpressionTest {
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
-
-    @Test
-    public void addIntegerValueShouldPass() {
-        assertEquals(2,
-                     apply(ScalarOperation.ADD, ref("intValue"), ref("intValue")));
-    }
-
-    @Test
-    public void multipleAddIntegerValueShouldPass() {
-        assertEquals(3,
-                     apply(ScalarOperation.ADD, ref("intValue"),
-                           of(ScalarOperation.ADD, ref("intValue"), ref("intValue"))));
-    }
-
-    @Test
-    public void addDoubleValueShouldPass() {
-        assertEquals(4d,
-                     apply(ScalarOperation.ADD, ref("doubleValue"), ref("doubleValue")));
-    }
-
-    @Test
-    public void addDoubleAndIntegerShouldPass() {
-        assertEquals(3d,
-                     apply(ScalarOperation.ADD, ref("doubleValue"), ref("intValue")));
-    }
-
-    @Test
-    public void divideIntegerValueShouldPass() {
-        assertEquals(0,
-                     apply(ScalarOperation.DIVIDE, ref("intValue"), ref("intValue2")));
-    }
-
-    @Test
-    public void divideIntegerAndDoubleShouldPass() {
-        assertEquals(0.5d,
-                     apply(ScalarOperation.DIVIDE, ref("intValue"), ref("doubleValue")));
-    }
-
-    @Test
-    public void subtractIntAndDoubleShouldPass() {
-        assertEquals(-1d,
-                     apply(ScalarOperation.SUBTRACT, ref("intValue"), ref("doubleValue")));
-    }
-
-    @Test
-    public void multiplyIntAndDoubleShouldPass() {
-        assertEquals(2d,
-                     apply(ScalarOperation.MULTIPLY, ref("intValue"), ref("doubleValue")));
-    }
-
-    @Test
-    public void modulesIntAndDoubleShouldPass() {
-        assertEquals(1d,
-                     apply(ScalarOperation.MODULES, ref("intValue"), ref("doubleValue")));
-    }
-
-    @Test
-    public void addIntAndStringShouldPass() {
-        exceptionRule.expect(RuntimeException.class);
-        exceptionRule.expectMessage("unexpected operation type: ADD(INTEGER_VALUE, STRING_VALUE)");
-
-        assertEquals(2, apply(ScalarOperation.ADD, literal(integerValue(1)), literal(stringValue("stringValue"))));
-    }
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
+
+  @Test
+  public void addIntegerValueShouldPass() {
+    assertEquals(2, apply(ScalarOperation.ADD, ref("intValue"), ref("intValue")));
+  }
+
+  @Test
+  public void multipleAddIntegerValueShouldPass() {
+    assertEquals(
+        3,
+        apply(
+            ScalarOperation.ADD,
+            ref("intValue"),
+            of(ScalarOperation.ADD, ref("intValue"), ref("intValue"))));
+  }
+
+  @Test
+  public void addDoubleValueShouldPass() {
+    assertEquals(4d, apply(ScalarOperation.ADD, ref("doubleValue"), ref("doubleValue")));
+  }
+
+  @Test
+  public void addDoubleAndIntegerShouldPass() {
+    assertEquals(3d, apply(ScalarOperation.ADD, ref("doubleValue"), ref("intValue")));
+  }
+
+  @Test
+  public void divideIntegerValueShouldPass() {
+    assertEquals(0, apply(ScalarOperation.DIVIDE, ref("intValue"), ref("intValue2")));
+  }
+
+  @Test
+  public void divideIntegerAndDoubleShouldPass() {
+    assertEquals(0.5d, apply(ScalarOperation.DIVIDE, ref("intValue"), ref("doubleValue")));
+  }
+
+  @Test
+  public void subtractIntAndDoubleShouldPass() {
+    assertEquals(-1d, apply(ScalarOperation.SUBTRACT, ref("intValue"), ref("doubleValue")));
+  }
+
+  @Test
+  public void multiplyIntAndDoubleShouldPass() {
+    assertEquals(2d, apply(ScalarOperation.MULTIPLY, ref("intValue"), ref("doubleValue")));
+  }
+
+  @Test
+  public void modulesIntAndDoubleShouldPass() {
+    assertEquals(1d, apply(ScalarOperation.MODULES, ref("intValue"), ref("doubleValue")));
+  }
+
+  @Test
+  public void addIntAndStringShouldPass() {
+    exceptionRule.expect(RuntimeException.class);
+    exceptionRule.expectMessage("unexpected operation type: ADD(INTEGER_VALUE, STRING_VALUE)");
+
+    assertEquals(
+        2,
+        apply(ScalarOperation.ADD, literal(integerValue(1)), literal(stringValue("stringValue"))));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/CompoundExpressionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/CompoundExpressionTest.java
index 2e75ee0c8b..3315024a13 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/CompoundExpressionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/CompoundExpressionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.expression.core;
 
 import static org.junit.Assert.assertEquals;
@@ -16,10 +15,12 @@
 
 public class CompoundExpressionTest extends ExpressionTest {
 
-    @Test
-    public void absAndAddShouldPass() {
-        assertEquals(2.0d, apply(ScalarOperation.ABS, of(ScalarOperation.ADD,
-                                                         literal(doubleValue(-1.0d)),
-                                                         literal(integerValue(-1)))));
-    }
+  @Test
+  public void absAndAddShouldPass() {
+    assertEquals(
+        2.0d,
+        apply(
+            ScalarOperation.ABS,
+            of(ScalarOperation.ADD, literal(doubleValue(-1.0d)), literal(integerValue(-1)))));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/ExpressionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/ExpressionTest.java
index a6b736eca1..08bac51d77 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/ExpressionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/ExpressionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.expression.core;
 
 import static org.opensearch.sql.legacy.expression.model.ExprValueUtils.getNumberValue;
@@ -15,35 +14,35 @@
 import org.opensearch.sql.legacy.expression.core.operator.ScalarOperation;
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
 
-
 public class ExpressionTest {
-    protected BindingTuple bindingTuple() {
-        String json = "{\n" +
-                      "  \"intValue\": 1,\n" +
-                      "  \"intValue2\": 2,\n" +
-                      "  \"doubleValue\": 2.0,\n" +
-                      "  \"negDoubleValue\": -2.0,\n" +
-                      "  \"stringValue\": \"string\",\n" +
-                      "  \"booleanValue\": true,\n" +
-                      "  \"tupleValue\": {\n" +
-                      "    \"intValue\": 1,\n" +
-                      "    \"doubleValue\": 2.0,\n" +
-                      "    \"stringValue\": \"string\"\n" +
-                      "  },\n" +
-                      "  \"collectValue\": [\n" +
-                      "    1,\n" +
-                      "    2,\n" +
-                      "    3\n" +
-                      "  ]\n" +
-                      "}";
-        return BindingTuple.from(new JSONObject(json));
-    }
-
-    protected Expression of(ScalarOperation op, Expression... expressions) {
-        return ExpressionFactory.of(op, Arrays.asList(expressions));
-    }
-
-    protected Number apply(ScalarOperation op, Expression... expressions) {
-        return getNumberValue(of(op, expressions).valueOf(bindingTuple()));
-    }
+  protected BindingTuple bindingTuple() {
+    String json =
+        "{\n"
+            + "  \"intValue\": 1,\n"
+            + "  \"intValue2\": 2,\n"
+            + "  \"doubleValue\": 2.0,\n"
+            + "  \"negDoubleValue\": -2.0,\n"
+            + "  \"stringValue\": \"string\",\n"
+            + "  \"booleanValue\": true,\n"
+            + "  \"tupleValue\": {\n"
+            + "    \"intValue\": 1,\n"
+            + "    \"doubleValue\": 2.0,\n"
+            + "    \"stringValue\": \"string\"\n"
+            + "  },\n"
+            + "  \"collectValue\": [\n"
+            + "    1,\n"
+            + "    2,\n"
+            + "    3\n"
+            + "  ]\n"
+            + "}";
+    return BindingTuple.from(new JSONObject(json));
+  }
+
+  protected Expression of(ScalarOperation op, Expression... expressions) {
+    return ExpressionFactory.of(op, Arrays.asList(expressions));
+  }
+
+  protected Number apply(ScalarOperation op, Expression... expressions) {
+    return getNumberValue(of(op, expressions).valueOf(bindingTuple()));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/RefExpressionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/RefExpressionTest.java
index f8607ca889..faefa6d2c1 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/RefExpressionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/RefExpressionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.expression.core;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -25,36 +24,40 @@
 import org.junit.Test;
 
 public class RefExpressionTest extends ExpressionTest {
-    @Test
-    public void refIntegerValueShouldPass() {
-        assertEquals(Integer.valueOf(1), getIntegerValue(ref("intValue").valueOf(bindingTuple())));
-    }
-
-    @Test
-    public void refDoubleValueShouldPass() {
-        assertEquals(Double.valueOf(2d), getDoubleValue(ref("doubleValue").valueOf(bindingTuple())));
-    }
-
-    @Test
-    public void refStringValueShouldPass() {
-        assertEquals("string", getStringValue(ref("stringValue").valueOf(bindingTuple())));
-    }
-
-    @Test
-    public void refBooleanValueShouldPass() {
-        assertEquals(true, getBooleanValue(ref("booleanValue").valueOf(bindingTuple())));
-    }
-
-    @Test
-    public void refTupleValueShouldPass() {
-        assertThat(getTupleValue(ref("tupleValue").valueOf(bindingTuple())),
-                   allOf(hasEntry("intValue", integerValue(1)), hasEntry("doubleValue", doubleValue(2d)),
-                         hasEntry("stringValue", stringValue("string"))));
-    }
-
-    @Test
-    public void refCollectValueShouldPass() {
-        assertThat(getCollectionValue(ref("collectValue").valueOf(bindingTuple())),
-                   contains(integerValue(1), integerValue(2), integerValue(3)));
-    }
+  @Test
+  public void refIntegerValueShouldPass() {
+    assertEquals(Integer.valueOf(1), getIntegerValue(ref("intValue").valueOf(bindingTuple())));
+  }
+
+  @Test
+  public void refDoubleValueShouldPass() {
+    assertEquals(Double.valueOf(2d), getDoubleValue(ref("doubleValue").valueOf(bindingTuple())));
+  }
+
+  @Test
+  public void refStringValueShouldPass() {
+    assertEquals("string", getStringValue(ref("stringValue").valueOf(bindingTuple())));
+  }
+
+  @Test
+  public void refBooleanValueShouldPass() {
+    assertEquals(true, getBooleanValue(ref("booleanValue").valueOf(bindingTuple())));
+  }
+
+  @Test
+  public void refTupleValueShouldPass() {
+    assertThat(
+        getTupleValue(ref("tupleValue").valueOf(bindingTuple())),
+        allOf(
+            hasEntry("intValue", integerValue(1)),
+            hasEntry("doubleValue", doubleValue(2d)),
+            hasEntry("stringValue", stringValue("string"))));
+  }
+
+  @Test
+  public void refCollectValueShouldPass() {
+    assertThat(
+        getCollectionValue(ref("collectValue").valueOf(bindingTuple())),
+        contains(integerValue(1), integerValue(2), integerValue(3)));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/UnaryExpressionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/UnaryExpressionTest.java
index 04196bab0a..e030e1c6cf 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/UnaryExpressionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/core/UnaryExpressionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.expression.core;
 
 import static org.junit.Assert.assertEquals;
@@ -15,114 +14,104 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.sql.legacy.expression.core.operator.ScalarOperation;
 
 @RunWith(MockitoJUnitRunner.class)
 public class UnaryExpressionTest extends ExpressionTest {
 
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
-
-    @Test
-    public void absShouldPass() {
-        assertEquals(2.0d, apply(ScalarOperation.ABS, literal(doubleValue(-2d))));
-    }
-
-    @Test
-    public void asinShouldPass() {
-        assertEquals(0.1001674211615598d, apply(ScalarOperation.ASIN, literal(doubleValue(0.1d))));
-    }
-
-    @Test
-    public void atanShouldPass() {
-        assertEquals(1.1071487177940904d, apply(ScalarOperation.ATAN, literal(doubleValue(2d))));
-    }
-
-    @Test
-    public void tanShouldPass() {
-        assertEquals(-2.185039863261519, apply(ScalarOperation.TAN, literal(doubleValue(2d))));
-    }
-
-    @Test
-    public void atan2ShouldPass() {
-        assertEquals(1.1071487177940904d,
-                     apply(ScalarOperation.ATAN2, literal(doubleValue(2d)), literal(doubleValue(1d))));
-    }
-
-    @Test
-    public void cbrtShouldPass() {
-        assertEquals(1.2599210498948732d,
-                     apply(ScalarOperation.CBRT, literal(doubleValue(2d))));
-    }
-
-    @Test
-    public void ceilShouldPass() {
-        assertEquals(3.0d,
-                     apply(ScalarOperation.CEIL, literal(doubleValue(2.1d))));
-    }
-
-    @Test
-    public void floorShouldPass() {
-        assertEquals(2.0d,
-                     apply(ScalarOperation.FLOOR, literal(doubleValue(2.1d))));
-    }
-
-    @Test
-    public void cosShouldPass() {
-        assertEquals(-0.4161468365471424d,
-                     apply(ScalarOperation.COS, literal(doubleValue(2d))));
-    }
-
-    @Test
-    public void coshShouldPass() {
-        assertEquals(3.7621956910836314d,
-                     apply(ScalarOperation.COSH, literal(doubleValue(2d))));
-    }
-
-    @Test
-    public void expShouldPass() {
-        assertEquals(7.38905609893065d,
-                     apply(ScalarOperation.EXP, literal(doubleValue(2d))));
-    }
-
-    @Test
-    public void lnShouldPass() {
-        assertEquals(0.6931471805599453d,
-                     apply(ScalarOperation.LN, literal(doubleValue(2d))));
-    }
-
-    @Test
-    public void logShouldPass() {
-        assertEquals(0.6931471805599453d,
-                     apply(ScalarOperation.LOG, literal(doubleValue(2d))));
-    }
-
-    @Test
-    public void log2ShouldPass() {
-        assertEquals(1.0d,
-                     apply(ScalarOperation.LOG2, literal(doubleValue(2d))));
-    }
-
-    @Test
-    public void log10ShouldPass() {
-        assertEquals(0.3010299956639812,
-                     apply(ScalarOperation.LOG10, literal(doubleValue(2d))));
-    }
-
-    @Test
-    public void absWithStringShouldThrowException() {
-        exceptionRule.expect(RuntimeException.class);
-        exceptionRule.expectMessage("unexpected operation type: ABS(STRING_VALUE)");
-
-        apply(ScalarOperation.ABS, literal(stringValue("stringValue")));
-    }
-
-    @Test
-    public void atan2WithStringShouldThrowException() {
-        exceptionRule.expect(RuntimeException.class);
-        exceptionRule.expectMessage("unexpected operation type: ATAN2(DOUBLE_VALUE,STRING_VALUE)");
-
-        apply(ScalarOperation.ATAN2, literal(doubleValue(2d)), literal(stringValue("stringValue")));
-    }
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
+
+  @Test
+  public void absShouldPass() {
+    assertEquals(2.0d, apply(ScalarOperation.ABS, literal(doubleValue(-2d))));
+  }
+
+  @Test
+  public void asinShouldPass() {
+    assertEquals(0.1001674211615598d, apply(ScalarOperation.ASIN, literal(doubleValue(0.1d))));
+  }
+
+  @Test
+  public void atanShouldPass() {
+    assertEquals(1.1071487177940904d, apply(ScalarOperation.ATAN, literal(doubleValue(2d))));
+  }
+
+  @Test
+  public void tanShouldPass() {
+    assertEquals(-2.185039863261519, apply(ScalarOperation.TAN, literal(doubleValue(2d))));
+  }
+
+  @Test
+  public void atan2ShouldPass() {
+    assertEquals(
+        1.1071487177940904d,
+        apply(ScalarOperation.ATAN2, literal(doubleValue(2d)), literal(doubleValue(1d))));
+  }
+
+  @Test
+  public void cbrtShouldPass() {
+    assertEquals(1.2599210498948732d, apply(ScalarOperation.CBRT, literal(doubleValue(2d))));
+  }
+
+  @Test
+  public void ceilShouldPass() {
+    assertEquals(3.0d, apply(ScalarOperation.CEIL, literal(doubleValue(2.1d))));
+  }
+
+  @Test
+  public void floorShouldPass() {
+    assertEquals(2.0d, apply(ScalarOperation.FLOOR, literal(doubleValue(2.1d))));
+  }
+
+  @Test
+  public void cosShouldPass() {
+    assertEquals(-0.4161468365471424d, apply(ScalarOperation.COS, literal(doubleValue(2d))));
+  }
+
+  @Test
+  public void coshShouldPass() {
+    assertEquals(3.7621956910836314d, apply(ScalarOperation.COSH, literal(doubleValue(2d))));
+  }
+
+  @Test
+  public void expShouldPass() {
+    assertEquals(7.38905609893065d, apply(ScalarOperation.EXP, literal(doubleValue(2d))));
+  }
+
+  @Test
+  public void lnShouldPass() {
+    assertEquals(0.6931471805599453d, apply(ScalarOperation.LN, literal(doubleValue(2d))));
+  }
+
+  @Test
+  public void logShouldPass() {
+    assertEquals(0.6931471805599453d, apply(ScalarOperation.LOG, literal(doubleValue(2d))));
+  }
+
+  @Test
+  public void log2ShouldPass() {
+    assertEquals(1.0d, apply(ScalarOperation.LOG2, literal(doubleValue(2d))));
+  }
+
+  @Test
+  public void log10ShouldPass() {
+    assertEquals(0.3010299956639812, apply(ScalarOperation.LOG10, literal(doubleValue(2d))));
+  }
+
+  @Test
+  public void absWithStringShouldThrowException() {
+    exceptionRule.expect(RuntimeException.class);
+    exceptionRule.expectMessage("unexpected operation type: ABS(STRING_VALUE)");
+
+    apply(ScalarOperation.ABS, literal(stringValue("stringValue")));
+  }
+
+  @Test
+  public void atan2WithStringShouldThrowException() {
+    exceptionRule.expect(RuntimeException.class);
+    exceptionRule.expectMessage("unexpected operation type: ATAN2(DOUBLE_VALUE,STRING_VALUE)");
+
+    apply(ScalarOperation.ATAN2, literal(doubleValue(2d)), literal(stringValue("stringValue")));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/model/ExprValueUtilsTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/model/ExprValueUtilsTest.java
index 150afcacd3..15fd72a522 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/model/ExprValueUtilsTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/expression/model/ExprValueUtilsTest.java
@@ -3,58 +3,56 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.expression.model;
 
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.sql.legacy.expression.model.ExprValueFactory;
 import org.opensearch.sql.legacy.expression.model.ExprValueUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ExprValueUtilsTest {
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
-
-    @Test
-    public void getIntegerValueWithIntegerExprValueShouldPass() {
-        assertThat(ExprValueUtils.getIntegerValue(ExprValueFactory.integerValue(1)), equalTo(1));
-    }
-
-    @Test
-    public void getDoubleValueWithIntegerExprValueShouldPass() {
-        assertThat(ExprValueUtils.getDoubleValue(ExprValueFactory.integerValue(1)), equalTo(1d));
-    }
-
-    @Test
-    public void getIntegerWithDoubleExprValueShouldPass() {
-        assertThat(ExprValueUtils.getIntegerValue(ExprValueFactory.doubleValue(1d)), equalTo(1));
-    }
-
-    @Test
-    public void getLongValueFromLongExprValueShouldPass() {
-        assertThat(ExprValueUtils.getLongValue(ExprValueFactory.from(1L)), equalTo(1L));
-    }
-
-    @Test
-    public void getIntegerValueFromStringExprValueShouldThrowException() {
-        exceptionRule.expect(IllegalStateException.class);
-        exceptionRule.expectMessage("invalid to get NUMBER_VALUE from expr type of STRING_VALUE");
-
-        ExprValueUtils.getIntegerValue(ExprValueFactory.stringValue("string"));
-    }
-
-    @Test
-    public void getStringValueFromIntegerExprValueShouldThrowException() {
-        exceptionRule.expect(IllegalStateException.class);
-        exceptionRule.expectMessage("invalid to get STRING_VALUE from expr type of INTEGER_VALUE");
-
-        ExprValueUtils.getStringValue(ExprValueFactory.integerValue(1));
-    }
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
+
+  @Test
+  public void getIntegerValueWithIntegerExprValueShouldPass() {
+    assertThat(ExprValueUtils.getIntegerValue(ExprValueFactory.integerValue(1)), equalTo(1));
+  }
+
+  @Test
+  public void getDoubleValueWithIntegerExprValueShouldPass() {
+    assertThat(ExprValueUtils.getDoubleValue(ExprValueFactory.integerValue(1)), equalTo(1d));
+  }
+
+  @Test
+  public void getIntegerWithDoubleExprValueShouldPass() {
+    assertThat(ExprValueUtils.getIntegerValue(ExprValueFactory.doubleValue(1d)), equalTo(1));
+  }
+
+  @Test
+  public void getLongValueFromLongExprValueShouldPass() {
+    assertThat(ExprValueUtils.getLongValue(ExprValueFactory.from(1L)), equalTo(1L));
+  }
+
+  @Test
+  public void getIntegerValueFromStringExprValueShouldThrowException() {
+    exceptionRule.expect(IllegalStateException.class);
+    exceptionRule.expectMessage("invalid to get NUMBER_VALUE from expr type of STRING_VALUE");
+
+    ExprValueUtils.getIntegerValue(ExprValueFactory.stringValue("string"));
+  }
+
+  @Test
+  public void getStringValueFromIntegerExprValueShouldThrowException() {
+    exceptionRule.expect(IllegalStateException.class);
+    exceptionRule.expectMessage("invalid to get STRING_VALUE from expr type of INTEGER_VALUE");
+
+    ExprValueUtils.getStringValue(ExprValueFactory.integerValue(1));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/BasicCounterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/BasicCounterTest.java
index ebe61109a7..34dc170a37 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/BasicCounterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/BasicCounterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.metrics;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -14,22 +13,21 @@
 
 public class BasicCounterTest {
 
-    @Test
-    public void increment() {
-        BasicCounter counter = new BasicCounter();
-        for (int i=0; i<5; ++i) {
-            counter.increment();
-        }
-
-        assertThat(counter.getValue(), equalTo(5L));
+  @Test
+  public void increment() {
+    BasicCounter counter = new BasicCounter();
+    for (int i = 0; i < 5; ++i) {
+      counter.increment();
     }
 
-    @Test
-    public void incrementN() {
-        BasicCounter counter = new BasicCounter();
-        counter.add(5);
+    assertThat(counter.getValue(), equalTo(5L));
+  }
 
-        assertThat(counter.getValue(), equalTo(5L));
-    }
+  @Test
+  public void incrementN() {
+    BasicCounter counter = new BasicCounter();
+    counter.add(5);
 
+    assertThat(counter.getValue(), equalTo(5L));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/GaugeMetricTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/GaugeMetricTest.java
index a818a115fd..1ec499ce9b 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/GaugeMetricTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/GaugeMetricTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.metrics;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -14,19 +13,17 @@
 
 public class GaugeMetricTest {
 
-    private static long x = 0;
-
-    @Test
-    public void getValue() {
-        GaugeMetric gaugeMetric = new GaugeMetric<>("test", this::getSeq);
-
-        assertThat(gaugeMetric.getValue(), equalTo(1L));
-        assertThat(gaugeMetric.getValue(), equalTo(2L));
+  private static long x = 0;
 
-    }
+  @Test
+  public void getValue() {
+    GaugeMetric gaugeMetric = new GaugeMetric<>("test", this::getSeq);
 
-    private long getSeq() {
-        return ++x;
-    }
+    assertThat(gaugeMetric.getValue(), equalTo(1L));
+    assertThat(gaugeMetric.getValue(), equalTo(2L));
+  }
 
+  private long getSeq() {
+    return ++x;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/MetricsTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/MetricsTest.java
index ff6d8e0c49..885ce6a7cd 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/MetricsTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/MetricsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.metrics;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -20,55 +19,53 @@
 
 public class MetricsTest {
 
-    @Test
-    public void registerMetric() {
-        Metrics.getInstance().clear();
-        Metrics.getInstance().registerMetric(new NumericMetric("test", new BasicCounter()));
-
-        assertThat(Metrics.getInstance().getAllMetrics().size(), equalTo(1));
-    }
-
-    @Test
-    public void unRegisterMetric() {
-        Metrics.getInstance().clear();
-        Metrics.getInstance().registerMetric(new NumericMetric("test1", new BasicCounter()));
-        Metrics.getInstance().registerMetric(new NumericMetric("test2", new BasicCounter()));
-        assertThat(Metrics.getInstance().getAllMetrics().size(), equalTo(2));
-
-        Metrics.getInstance().unregisterMetric("test2");
-        assertThat(Metrics.getInstance().getAllMetrics().size(), equalTo(1));
-    }
-
-    @Test
-    public void getMetric() {
-        Metrics.getInstance().clear();
-        Metrics.getInstance().registerMetric(new NumericMetric("test1", new BasicCounter()));
-        Metric metric = Metrics.getInstance().getMetric("test1");
-
-        assertThat(metric, notNullValue());
-    }
-
-
-    @Test
-    public void getAllMetric() {
-        Metrics.getInstance().clear();
-        Metrics.getInstance().registerMetric(new NumericMetric("test1", new BasicCounter()));
-        Metrics.getInstance().registerMetric(new NumericMetric("test2", new BasicCounter()));
-        List list = Metrics.getInstance().getAllMetrics();
-
-        assertThat(list.size(), equalTo(2));
-    }
-
-    @Test
-    public void collectToJSON() {
-        Metrics.getInstance().clear();
-        Metrics.getInstance().registerMetric(new NumericMetric("test1", new BasicCounter()));
-        Metrics.getInstance().registerMetric(new NumericMetric("test2", new BasicCounter()));
-        String res = Metrics.getInstance().collectToJSON();
-        JSONObject jsonObject = new JSONObject(res);
-
-        assertThat(jsonObject.getLong("test1"), equalTo(0L));
-        assertThat(jsonObject.getInt("test2"), equalTo(0));
-    }
-
+  @Test
+  public void registerMetric() {
+    Metrics.getInstance().clear();
+    Metrics.getInstance().registerMetric(new NumericMetric("test", new BasicCounter()));
+
+    assertThat(Metrics.getInstance().getAllMetrics().size(), equalTo(1));
+  }
+
+  @Test
+  public void unRegisterMetric() {
+    Metrics.getInstance().clear();
+    Metrics.getInstance().registerMetric(new NumericMetric("test1", new BasicCounter()));
+    Metrics.getInstance().registerMetric(new NumericMetric("test2", new BasicCounter()));
+    assertThat(Metrics.getInstance().getAllMetrics().size(), equalTo(2));
+
+    Metrics.getInstance().unregisterMetric("test2");
+    assertThat(Metrics.getInstance().getAllMetrics().size(), equalTo(1));
+  }
+
+  @Test
+  public void getMetric() {
+    Metrics.getInstance().clear();
+    Metrics.getInstance().registerMetric(new NumericMetric("test1", new BasicCounter()));
+    Metric metric = Metrics.getInstance().getMetric("test1");
+
+    assertThat(metric, notNullValue());
+  }
+
+  @Test
+  public void getAllMetric() {
+    Metrics.getInstance().clear();
+    Metrics.getInstance().registerMetric(new NumericMetric("test1", new BasicCounter()));
+    Metrics.getInstance().registerMetric(new NumericMetric("test2", new BasicCounter()));
+    List list = Metrics.getInstance().getAllMetrics();
+
+    assertThat(list.size(), equalTo(2));
+  }
+
+  @Test
+  public void collectToJSON() {
+    Metrics.getInstance().clear();
+    Metrics.getInstance().registerMetric(new NumericMetric("test1", new BasicCounter()));
+    Metrics.getInstance().registerMetric(new NumericMetric("test2", new BasicCounter()));
+    String res = Metrics.getInstance().collectToJSON();
+    JSONObject jsonObject = new JSONObject(res);
+
+    assertThat(jsonObject.getLong("test1"), equalTo(0L));
+    assertThat(jsonObject.getInt("test2"), equalTo(0));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/NumericMetricTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/NumericMetricTest.java
index f2c2c25fab..d76241056f 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/NumericMetricTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/NumericMetricTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.metrics;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -15,22 +14,21 @@
 
 public class NumericMetricTest {
 
-    @Test
-    public void increment() {
-        NumericMetric metric = new NumericMetric("test", new BasicCounter());
-        for (int i=0; i<5; ++i) {
-            metric.increment();
-        }
-
-        assertThat(metric.getValue(), equalTo(5L));
+  @Test
+  public void increment() {
+    NumericMetric metric = new NumericMetric("test", new BasicCounter());
+    for (int i = 0; i < 5; ++i) {
+      metric.increment();
     }
 
-    @Test
-    public void add() {
-        NumericMetric metric = new NumericMetric("test", new BasicCounter());
-        metric.increment(5);
+    assertThat(metric.getValue(), equalTo(5L));
+  }
 
-        assertThat(metric.getValue(), equalTo(5L));
-    }
+  @Test
+  public void add() {
+    NumericMetric metric = new NumericMetric("test", new BasicCounter());
+    metric.increment(5);
 
+    assertThat(metric.getValue(), equalTo(5L));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/RollingCounterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/RollingCounterTest.java
index a1651aad6b..62fca52eaf 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/RollingCounterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/metrics/RollingCounterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.metrics;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -15,66 +14,63 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.sql.legacy.metrics.RollingCounter;
 
 @RunWith(MockitoJUnitRunner.class)
 public class RollingCounterTest {
-    @Mock
-    Clock clock;
+  @Mock Clock clock;
 
-    @Test
-    public void increment() {
-        RollingCounter counter = new RollingCounter(3, 1, clock);
-        for (int i=0; i<5; ++i) {
-            counter.increment();
-        }
+  @Test
+  public void increment() {
+    RollingCounter counter = new RollingCounter(3, 1, clock);
+    for (int i = 0; i < 5; ++i) {
+      counter.increment();
+    }
 
-        assertThat(counter.getValue(), equalTo(0L));
+    assertThat(counter.getValue(), equalTo(0L));
 
-        when(clock.millis()).thenReturn(1000L); // 1 second passed
-        assertThat(counter.getValue(), equalTo(5L));
+    when(clock.millis()).thenReturn(1000L); // 1 second passed
+    assertThat(counter.getValue(), equalTo(5L));
 
-        counter.increment();
-        counter.increment();
+    counter.increment();
+    counter.increment();
 
-        when(clock.millis()).thenReturn(2000L); // 1 second passed
-        assertThat(counter.getValue(), lessThanOrEqualTo(3L));
+    when(clock.millis()).thenReturn(2000L); // 1 second passed
+    assertThat(counter.getValue(), lessThanOrEqualTo(3L));
 
-        when(clock.millis()).thenReturn(3000L); // 1 second passed
-        assertThat(counter.getValue(), equalTo(0L));
+    when(clock.millis()).thenReturn(3000L); // 1 second passed
+    assertThat(counter.getValue(), equalTo(0L));
+  }
 
-    }
+  @Test
+  public void add() {
+    RollingCounter counter = new RollingCounter(3, 1, clock);
 
-    @Test
-    public void add() {
-        RollingCounter counter = new RollingCounter(3, 1, clock);
+    counter.add(6);
+    assertThat(counter.getValue(), equalTo(0L));
 
-        counter.add(6);
-        assertThat(counter.getValue(), equalTo(0L));
+    when(clock.millis()).thenReturn(1000L); // 1 second passed
+    assertThat(counter.getValue(), equalTo(6L));
 
-        when(clock.millis()).thenReturn(1000L); // 1 second passed
-        assertThat(counter.getValue(), equalTo(6L));
+    counter.add(4);
+    when(clock.millis()).thenReturn(2000L); // 1 second passed
+    assertThat(counter.getValue(), equalTo(4L));
 
-        counter.add(4);
-        when(clock.millis()).thenReturn(2000L); // 1 second passed
-        assertThat(counter.getValue(), equalTo(4L));
+    when(clock.millis()).thenReturn(3000L); // 1 second passed
+    assertThat(counter.getValue(), equalTo(0L));
+  }
 
-        when(clock.millis()).thenReturn(3000L); // 1 second passed
-        assertThat(counter.getValue(), equalTo(0L));
-    }
+  @Test
+  public void trim() {
+    RollingCounter counter = new RollingCounter(2, 1, clock);
 
-    @Test
-    public void trim() {
-        RollingCounter counter = new RollingCounter(2, 1, clock);
-
-        for (int i=1; i<6; ++i) {
-            counter.increment();
-            assertThat(counter.size(), equalTo(i));
-            when(clock.millis()).thenReturn(i * 1000L); // i seconds passed
-        }
-        counter.increment();
-        assertThat(counter.size(), lessThanOrEqualTo(3));
+    for (int i = 1; i < 6; ++i) {
+      counter.increment();
+      assertThat(counter.size(), equalTo(i));
+      when(clock.millis()).thenReturn(i * 1000L); // i seconds passed
     }
-
+    counter.increment();
+    assertThat(counter.size(), lessThanOrEqualTo(3));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/BucketPathTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/BucketPathTest.java
index 067143716d..c26740a04c 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/BucketPathTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/BucketPathTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.parser;
 
 import static org.junit.Assert.assertEquals;
@@ -16,46 +15,45 @@
 
 public class BucketPathTest {
 
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
-    private final Path agg1 = Path.getAggPath("projects@NESTED");
-    private final Path agg2 = Path.getAggPath("projects@FILTERED");
-    private final Path metric = Path.getMetricPath("c");
+  private final Path agg1 = Path.getAggPath("projects@NESTED");
+  private final Path agg2 = Path.getAggPath("projects@FILTERED");
+  private final Path metric = Path.getMetricPath("c");
 
-    @Test
-    public void bucketPath() {
-        BucketPath bucketPath = new BucketPath();
-        bucketPath.add(metric);
-        bucketPath.add(agg2);
-        bucketPath.add(agg1);
+  @Test
+  public void bucketPath() {
+    BucketPath bucketPath = new BucketPath();
+    bucketPath.add(metric);
+    bucketPath.add(agg2);
+    bucketPath.add(agg1);
 
-        assertEquals("projects@NESTED>projects@FILTERED.c", bucketPath.getBucketPath());
-    }
+    assertEquals("projects@NESTED>projects@FILTERED.c", bucketPath.getBucketPath());
+  }
 
-    @Test
-    public void bucketPathEmpty() {
-        BucketPath bucketPath = new BucketPath();
+  @Test
+  public void bucketPathEmpty() {
+    BucketPath bucketPath = new BucketPath();
 
-        assertEquals("", bucketPath.getBucketPath());
-    }
+    assertEquals("", bucketPath.getBucketPath());
+  }
 
-    @Test
-    public void theLastMustBeMetric() {
-        BucketPath bucketPath = new BucketPath();
+  @Test
+  public void theLastMustBeMetric() {
+    BucketPath bucketPath = new BucketPath();
 
-        exceptionRule.expect(AssertionError.class);
-        exceptionRule.expectMessage("The last path in the bucket path must be Metric");
-        bucketPath.add(agg1);
-    }
+    exceptionRule.expect(AssertionError.class);
+    exceptionRule.expectMessage("The last path in the bucket path must be Metric");
+    bucketPath.add(agg1);
+  }
 
-    @Test
-    public void allTheOtherMustBeAgg() {
-        BucketPath bucketPath = new BucketPath();
+  @Test
+  public void allTheOtherMustBeAgg() {
+    BucketPath bucketPath = new BucketPath();
 
-        exceptionRule.expect(AssertionError.class);
-        exceptionRule.expectMessage("All the other path in the bucket path must be Agg");
-        bucketPath.add(metric);
-        bucketPath.add(metric);
-    }
+    exceptionRule.expect(AssertionError.class);
+    exceptionRule.expectMessage("All the other path in the bucket path must be Agg");
+    bucketPath.add(metric);
+    bucketPath.add(metric);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/FieldMakerTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/FieldMakerTest.java
index 5115757c9c..c33e768f43 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/FieldMakerTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/FieldMakerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.parser;
 
 import static org.junit.Assert.assertEquals;
@@ -19,36 +18,40 @@
 
 public class FieldMakerTest {
 
-    private static final String ALIAS = "a";
-
-    private static final String TABLE_ALIAS = "t";
-
-    private FieldMaker fieldMaker;
-
-    @Before
-    public void init() {
-        fieldMaker = new FieldMaker();
-    }
-
-    @Test
-    public void makeFieldAssign() throws SqlParseException {
-        final SQLIntegerExpr sqlExpr = new SQLIntegerExpr(10);
-        final MethodField field = (MethodField) fieldMaker.makeField(sqlExpr, ALIAS, TABLE_ALIAS);
-
-        assertEquals("script", field.getName());
-        assertEquals(ALIAS, field.getParams().get(0).value);
-        assertTrue(((String)field.getParams().get(1).value).matches("def assign_[0-9]+ = 10;return assign_[0-9]+;"));
-        assertEquals(ALIAS, field.getAlias());
-    }
-
-    @Test
-    public void makeFieldAssignDouble() throws SqlParseException {
-        final SQLNumberExpr sqlExpr = new SQLNumberExpr(10.0);
-        final MethodField field = (MethodField) fieldMaker.makeField(sqlExpr, ALIAS, TABLE_ALIAS);
-
-        assertEquals("script", field.getName());
-        assertEquals(ALIAS, field.getParams().get(0).value);
-        assertTrue(((String)field.getParams().get(1).value).matches("def assign_[0-9]+ = 10.0;return assign_[0-9]+;"));
-        assertEquals(ALIAS, field.getAlias());
-    }
+  private static final String ALIAS = "a";
+
+  private static final String TABLE_ALIAS = "t";
+
+  private FieldMaker fieldMaker;
+
+  @Before
+  public void init() {
+    fieldMaker = new FieldMaker();
+  }
+
+  @Test
+  public void makeFieldAssign() throws SqlParseException {
+    final SQLIntegerExpr sqlExpr = new SQLIntegerExpr(10);
+    final MethodField field = (MethodField) fieldMaker.makeField(sqlExpr, ALIAS, TABLE_ALIAS);
+
+    assertEquals("script", field.getName());
+    assertEquals(ALIAS, field.getParams().get(0).value);
+    assertTrue(
+        ((String) field.getParams().get(1).value)
+            .matches("def assign_[0-9]+ = 10;return assign_[0-9]+;"));
+    assertEquals(ALIAS, field.getAlias());
+  }
+
+  @Test
+  public void makeFieldAssignDouble() throws SqlParseException {
+    final SQLNumberExpr sqlExpr = new SQLNumberExpr(10.0);
+    final MethodField field = (MethodField) fieldMaker.makeField(sqlExpr, ALIAS, TABLE_ALIAS);
+
+    assertEquals("script", field.getName());
+    assertEquals(ALIAS, field.getParams().get(0).value);
+    assertTrue(
+        ((String) field.getParams().get(1).value)
+            .matches("def assign_[0-9]+ = 10.0;return assign_[0-9]+;"));
+    assertEquals(ALIAS, field.getAlias());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SqlParserTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SqlParserTest.java
index 354c6ff8a1..38eefaaec1 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SqlParserTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SqlParserTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.parser;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -56,1366 +55,1460 @@
 
 public class SqlParserTest {
 
-    private SqlParser parser;
-
-    @Before
-    public void init() {
-        parser = new SqlParser();
-    }
-
-    @Rule
-    public ExpectedException thrown= ExpectedException.none();
-
-    @Test
-    public void whereConditionLeftFunctionRightPropertyGreatTest() throws Exception {
-
-        String query = "SELECT " +
-                " * from " +
-                TEST_INDEX_ACCOUNT + "/account " +
-                " where floor(split(address,' ')[0]+0) > b limit 1000  ";
-
-        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-        Where where = select.getWhere();
-        Assert.assertTrue((where.getWheres().size() == 1));
-        Assert.assertTrue(((Condition) (where.getWheres().get(0))).getValue() instanceof ScriptFilter);
-        ScriptFilter scriptFilter = (ScriptFilter) (((Condition) (where.getWheres().get(0))).getValue());
-
-        Assert.assertTrue(scriptFilter.getScript().contains("doc['address'].value.split(' ')[0]"));
-        Pattern pattern = Pattern.compile("floor_\\d+ > doc\\['b'].value");
-        java.util.regex.Matcher matcher = pattern.matcher(scriptFilter.getScript());
-        Assert.assertTrue(matcher.find());
-    }
-
-    @Test()
-    public void failingQueryTest() throws SqlParseException {
-        thrown.expect(SqlFeatureNotImplementedException.class);
-        thrown.expectMessage(
-                "The complex aggregate expressions are not implemented yet: MAX(FlightDelayMin) - MIN(FlightDelayMin)");
-
-        Select select =
-                parser.parseSelect((SQLQueryExpr) queryToExpr(
-                        "SELECT DestCountry, dayOfWeek, max(FlightDelayMin) - min(FlightDelayMin)" +
-                        "   FROM opensearch_dashboards_sample_data_flights\n" +
-                        "   GROUP BY DestCountry, dayOfWeek\n"));
-
-        AggregationQueryAction queryAction = new AggregationQueryAction(mock(Client.class), select);
-        String elasticDsl = queryAction.explain().explain();
-    }
-
-    @Test()
-    public void failingQueryTest2() throws SqlParseException {
-        thrown.expect(SqlFeatureNotImplementedException.class);
-        thrown.expectMessage(
-                "Function calls of form 'log(MAX(...))' are not implemented yet");
-
-        Select select =
-                parser.parseSelect((SQLQueryExpr) queryToExpr(
-                        "SELECT DestCountry, dayOfWeek, log(max(FlightDelayMin))" +
-                        "   FROM opensearch_dashboards_sample_data_flights\n" +
-                        "   GROUP BY DestCountry, dayOfWeek\n"));
-
-        AggregationQueryAction queryAction = new AggregationQueryAction(mock(Client.class), select);
-        String elasticDsl = queryAction.explain().explain();
-    }
-
-    @Test()
-    public void failingQueryWithHavingTest() throws SqlParseException {
-        thrown.expect(SqlFeatureNotImplementedException.class);
-        thrown.expectMessage(
-                "The complex aggregate expressions are not implemented yet: MAX(FlightDelayMin) - MIN(FlightDelayMin)");
-
-        Select select =
-                parser.parseSelect((SQLQueryExpr) queryToExpr(
-                        "SELECT DestCountry, dayOfWeek, max(FlightDelayMin) - min(FlightDelayMin) " +
-                        "   FROM opensearch_dashboards_sample_data_flights\n" +
-                        "   GROUP BY DestCountry, dayOfWeek\n" +
-                        "   HAVING max(FlightDelayMin) - min(FlightDelayMin)) * count(FlightDelayMin) + 14 > 100"));
-
-        AggregationQueryAction queryAction = new AggregationQueryAction(mock(Client.class), select);
-        String elasticDsl = queryAction.explain().explain();
-    }
-
-    @Test()
-    @Ignore("Github issues: https://github.com/opendistro-for-elasticsearch/sql/issues/194, " +
-            "https://github.com/opendistro-for-elasticsearch/sql/issues/234")
-    public void failingQueryWithHavingTest2() throws SqlParseException {
-        Select select =
-                parser.parseSelect((SQLQueryExpr) queryToExpr(
-                        "SELECT DestCountry, dayOfWeek, max(FlightDelayMin) " +
-                        "   FROM opensearch_dashboards_sample_data_flights\n" +
-                        "   GROUP BY DestCountry, dayOfWeek\n" +
-                        "   HAVING max(FlightDelayMin) - min(FlightDelayMin) > 100"));
-
-        AggregationQueryAction queryAction = new AggregationQueryAction(mock(Client.class), select);
-
-        String elasticDsl = queryAction.explain().explain();
-    }
-
-    @Test
-    public void whereConditionLeftFunctionRightFunctionEqualTest() throws Exception {
-
-        String query = "SELECT " +
-                " * from " +
-                TEST_INDEX_ACCOUNT + "/account " +
-                " where floor(split(address,' ')[0]+0) = floor(split(address,' ')[0]+0) limit 1000  ";
-
-        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-        Where where = select.getWhere();
-        Assert.assertTrue((where.getWheres().size() == 1));
-        Assert.assertTrue(((Condition) (where.getWheres().get(0))).getValue() instanceof ScriptFilter);
-        ScriptFilter scriptFilter = (ScriptFilter) (((Condition) (where.getWheres().get(0))).getValue());
-        Assert.assertTrue(scriptFilter.getScript().contains("doc['address'].value.split(' ')[0]"));
-        Pattern pattern = Pattern.compile("floor_\\d+ == floor_\\d+");
-        java.util.regex.Matcher matcher = pattern.matcher(scriptFilter.getScript());
-        Assert.assertTrue(matcher.find());
-    }
-
-    @Test
-    public void whereConditionVariableRightVariableEqualTest() throws Exception {
-
-        String query = "SELECT " +
-                " * from " +
-                TEST_INDEX_ACCOUNT + "/account " +
-                " where a = b limit 1000  ";
-
-        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-        Where where = select.getWhere();
-        Assert.assertTrue((where.getWheres().size() == 1));
-        Assert.assertTrue(((Condition) (where.getWheres().get(0))).getValue() instanceof ScriptFilter);
-        ScriptFilter scriptFilter = (ScriptFilter) (((Condition) (where.getWheres().get(0))).getValue());
-        Assert.assertTrue(scriptFilter.getScript().contains("doc['a'].value == doc['b'].value"));
-    }
-
-    @Test
-    public void joinParseCheckSelectedFieldsSplit() throws SqlParseException {
-        String query = "SELECT a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM " +
-                TestsConstants.TEST_INDEX_ACCOUNT +
-                "/account a " +
-                "LEFT JOIN " +
-                TEST_INDEX_DOG +
-                "/dog d on d.holdersName = a.firstname " +
-                " AND d.age < a.age " +
-                " WHERE a.firstname = 'eliran' AND " +
-                " (a.age > 10 OR a.balance > 2000)" +
-                " AND d.age > 1";
-
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-
-        List<Field> t1Fields = joinSelect.getFirstTable().getSelectedFields();
-        Assert.assertEquals(t1Fields.size(), 3);
-        Assert.assertTrue(fieldExist(t1Fields, "firstname"));
-        Assert.assertTrue(fieldExist(t1Fields, "lastname"));
-        Assert.assertTrue(fieldExist(t1Fields, "gender"));
-
-        List<Field> t2Fields = joinSelect.getSecondTable().getSelectedFields();
-        Assert.assertEquals(t2Fields.size(), 2);
-        Assert.assertTrue(fieldExist(t2Fields, "holdersName"));
-        Assert.assertTrue(fieldExist(t2Fields, "name"));
-    }
-
-    @Test
-    public void joinParseCheckConnectedFields() throws SqlParseException {
-        String query = "SELECT a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM " +
-                TestsConstants.TEST_INDEX_ACCOUNT +
-                "/account a " +
-                "LEFT JOIN " +
-                TEST_INDEX_DOG +
-                "/dog d on d.holdersName = a.firstname " +
-                " AND d.age < a.age " +
-                " WHERE a.firstname = 'eliran' AND " +
-                " (a.age > 10 OR a.balance > 2000)" +
-                " AND d.age > 1";
-
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-
-        List<Field> t1Fields = joinSelect.getFirstTable().getConnectedFields();
-        Assert.assertEquals(t1Fields.size(), 2);
-        Assert.assertTrue(fieldExist(t1Fields, "firstname"));
-        Assert.assertTrue(fieldExist(t1Fields, "age"));
-
-        List<Field> t2Fields = joinSelect.getSecondTable().getConnectedFields();
-        Assert.assertEquals(t2Fields.size(), 2);
-        Assert.assertTrue(fieldExist(t2Fields, "holdersName"));
-        Assert.assertTrue(fieldExist(t2Fields, "age"));
-    }
-
-    private boolean fieldExist(List<Field> fields, String fieldName) {
-        for (Field field : fields)
-            if (field.getName().equals(fieldName)) return true;
-
-        return false;
-    }
-
-
-    @Test
-    public void joinParseFromsAreSplitedCorrectly() throws SqlParseException {
-        String query = "SELECT a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM " +
-                TestsConstants.TEST_INDEX_ACCOUNT +
-                " a " +
-                "LEFT JOIN " +
-                TEST_INDEX_DOG +
-                " d on d.holdersName = a.firstname" +
-                " WHERE a.firstname = 'eliran' AND " +
-                " (a.age > 10 OR a.balance > 2000)" +
-                " AND d.age > 1";
-
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-        List<From> t1From = joinSelect.getFirstTable().getFrom();
-
-        Assert.assertNotNull(t1From);
-        Assert.assertEquals(1, t1From.size());
-        Assert.assertTrue(checkFrom(t1From.get(0), TestsConstants.TEST_INDEX_ACCOUNT,  "a"));
-
-        List<From> t2From = joinSelect.getSecondTable().getFrom();
-        Assert.assertNotNull(t2From);
-        Assert.assertEquals(1, t2From.size());
-        Assert.assertTrue(checkFrom(t2From.get(0), TEST_INDEX_DOG,  "d"));
-    }
-
-    private boolean checkFrom(From from, String index, String alias) {
-        return from.getAlias().equals(alias) && from.getIndex().equals(index);
-    }
-
-    @Test
-    public void joinParseConditionsTestOneCondition() throws SqlParseException {
-        String query = "SELECT a.*, a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM " +
-                TestsConstants.TEST_INDEX_ACCOUNT +
-                "/account a " +
-                "LEFT JOIN " +
-                TEST_INDEX_DOG +
-                "/dog d on d.holdersName = a.firstname" +
-                " WHERE a.firstname = 'eliran' AND " +
-                " (a.age > 10 OR a.balance > 2000)" +
-                " AND d.age > 1";
-
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-        List<Condition> conditions = joinSelect.getConnectedConditions();
-        Assert.assertNotNull(conditions);
-        Assert.assertEquals(1, conditions.size());
-        Assert.assertTrue("condition not exist: d.holdersName = a.firstname",
-                conditionExist(conditions, "d.holdersName", "a.firstname", Condition.OPERATOR.EQ));
-    }
-
-    @Test
-    public void joinParseConditionsTestTwoConditions() throws SqlParseException {
-        String query = "SELECT a.*, a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM " +
-                TestsConstants.TEST_INDEX_ACCOUNT +
-                "/account a " +
-                "LEFT JOIN " +
-                TEST_INDEX_DOG +
-                "/dog d on d.holdersName = a.firstname " +
-                " AND d.age < a.age " +
-                " WHERE a.firstname = 'eliran' AND " +
-                " (a.age > 10 OR a.balance > 2000)" +
-                " AND d.age > 1";
-
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-        List<Condition> conditions = joinSelect.getConnectedConditions();
-        Assert.assertNotNull(conditions);
-        Assert.assertEquals(2, conditions.size());
-        Assert.assertTrue("condition not exist: d.holdersName = a.firstname",
-                conditionExist(conditions, "d.holdersName", "a.firstname", Condition.OPERATOR.EQ));
-        Assert.assertTrue("condition not exist: d.age < a.age",
-                conditionExist(conditions, "d.age", "a.age", Condition.OPERATOR.LT));
-    }
-
-
-    @Test
-    public void joinSplitWhereCorrectly() throws SqlParseException {
-        String query = "SELECT a.*, a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM " +
-                TestsConstants.TEST_INDEX_ACCOUNT +
-                "/account a " +
-                "LEFT JOIN " +
-                TEST_INDEX_DOG +
-                "/dog d on d.holdersName = a.firstname" +
-                " WHERE a.firstname = 'eliran' AND " +
-                " (a.age > 10 OR a.balance > 2000)" +
-                " AND d.age > 1";
-
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-        String s1Where = joinSelect.getFirstTable().getWhere().toString();
-        Assert.assertEquals("AND ( AND firstname EQ eliran, AND ( OR age GT 10, OR balance GT 2000 )  ) ", s1Where);
-        String s2Where = joinSelect.getSecondTable().getWhere().toString();
-        Assert.assertEquals("AND age GT 1", s2Where);
-    }
-
-    @Test
-    public void joinConditionWithComplexObjectComparisonRightSide() throws SqlParseException {
-        String query = String.format(Locale.ROOT, "select c.name.firstname,c.parents.father , h.name,h.words " +
-                "from %s/gotCharacters c " +
-                "JOIN %s/gotCharacters h " +
-                "on h.name = c.name.lastname  " +
-                "where c.name.firstname='Daenerys'", TEST_INDEX_GAME_OF_THRONES, TEST_INDEX_GAME_OF_THRONES);
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-        List<Condition> conditions = joinSelect.getConnectedConditions();
-        Assert.assertNotNull(conditions);
-        Assert.assertEquals(1, conditions.size());
-        Assert.assertTrue("condition not exist: h.name = c.name.lastname",
-                conditionExist(conditions, "h.name", "c.name.lastname", Condition.OPERATOR.EQ));
-    }
-
-    @Test
-    public void joinConditionWithComplexObjectComparisonLeftSide() throws SqlParseException {
-        String query = String.format(Locale.ROOT,
-                "select c.name.firstname,c.parents.father , h.name,h.words from %s/gotCharacters c " +
-                "JOIN %s/gotCharacters h " +
-                "on c.name.lastname = h.name  " +
-                "where c.name.firstname='Daenerys'", TEST_INDEX_GAME_OF_THRONES, TEST_INDEX_GAME_OF_THRONES);
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-        List<Condition> conditions = joinSelect.getConnectedConditions();
-        Assert.assertNotNull(conditions);
-        Assert.assertEquals(1, conditions.size());
-        Assert.assertTrue("condition not exist: c.name.lastname = h.name",
-                conditionExist(conditions, "c.name.lastname", "h.name", Condition.OPERATOR.EQ));
-    }
-
-
-    @Test
-    public void limitHintsOnJoin() throws SqlParseException {
-        String query = String.format(Locale.ROOT,"select /*! JOIN_TABLES_LIMIT(1000,null) */ " +
-                "c.name.firstname,c.parents.father , h.name,h.words from %s/gotCharacters c " +
-                "use KEY (termsFilter) " +
-                "JOIN %s/gotCharacters h " +
-                "on c.name.lastname = h.name  " +
-                "where c.name.firstname='Daenerys'", TEST_INDEX_GAME_OF_THRONES, TEST_INDEX_GAME_OF_THRONES);
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-        List<Hint> hints = joinSelect.getHints();
-        Assert.assertNotNull(hints);
-        Assert.assertEquals("hints size was not 1", 1, hints.size());
-        Hint hint = hints.get(0);
-        Assert.assertEquals(HintType.JOIN_LIMIT, hint.getType());
-        Object[] params = hint.getParams();
-        Assert.assertNotNull(params);
-        Assert.assertEquals("params size was not 2", 2, params.length);
-        Assert.assertEquals(1000, params[0]);
-        Assert.assertNull(params[1]);
-    }
-
-    @Test
-    public void hashTermsFilterHint() throws SqlParseException {
-        String query = String.format(Locale.ROOT, "select /*! HASH_WITH_TERMS_FILTER*/ " +
-                "c.name.firstname,c.parents.father , h.name,h.words from %s/gotCharacters c " +
-                "use KEY (termsFilter) " +
-                "JOIN %s/gotCharacters h " +
-                "on c.name.lastname = h.name  " +
-                "where c.name.firstname='Daenerys'", TEST_INDEX_GAME_OF_THRONES, TEST_INDEX_GAME_OF_THRONES);
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-        List<Hint> hints = joinSelect.getHints();
-        Assert.assertNotNull(hints);
-        Assert.assertEquals("hints size was not 1", 1, hints.size());
-        Hint hint = hints.get(0);
-        Assert.assertEquals(HintType.HASH_WITH_TERMS_FILTER, hint.getType());
-    }
-
-    @Test
-    public void multipleHints() throws SqlParseException {
-        String query = String.format(Locale.ROOT, "select /*! HASH_WITH_TERMS_FILTER*/ " +
-                "/*! JOIN_TABLES_LIMIT(1000,null) */ " +
-                " /*! JOIN_TABLES_LIMIT(100,200) */ " +
-                "c.name.firstname,c.parents.father , h.name,h.words from %s/gotCharacters c " +
-                "use KEY (termsFilter) " +
-                "JOIN %s/gotCharacters h " +
-                "on c.name.lastname = h.name  " +
-                "where c.name.firstname='Daenerys'", TEST_INDEX_GAME_OF_THRONES, TEST_INDEX_GAME_OF_THRONES);
-
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-        List<Hint> hints = joinSelect.getHints();
-
-        Assert.assertNotNull(hints);
-        Assert.assertEquals("hints size was not 3", 3, hints.size());
-        Hint firstHint = hints.get(0);
-        Assert.assertEquals(HintType.HASH_WITH_TERMS_FILTER, firstHint.getType());
-        Hint secondHint = hints.get(1);
-        Assert.assertEquals(HintType.JOIN_LIMIT, secondHint.getType());
-        Assert.assertEquals(1000, secondHint.getParams()[0]);
-        Assert.assertNull(secondHint.getParams()[1]);
-        Hint thirdHint = hints.get(2);
-        Assert.assertEquals(100, thirdHint.getParams()[0]);
-        Assert.assertEquals(200, thirdHint.getParams()[1]);
-        Assert.assertEquals(HintType.JOIN_LIMIT, thirdHint.getType());
-    }
-
-    @Test
-    public void searchWithOdbcTimeFormatParse() throws SqlParseException {
-        String query = String.format(Locale.ROOT, "SELECT insert_time FROM %s/odbc " +
-                "WHERE insert_time < {ts '2015-03-15 00:00:00.000'}", TEST_INDEX_ODBC);
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        LinkedList<Where> wheres = select.getWhere().getWheres();
-        Assert.assertEquals(1, wheres.size());
-        Condition condition = (Condition) wheres.get(0);
-        Assert.assertEquals("{ts '2015-03-15 00:00:00.000'}", condition.getValue().toString());
-
-    }
-
-    @Test
-    public void indexWithSpacesWithinBrackets() throws SqlParseException {
-        String query = "SELECT insert_time FROM [Test Index] WHERE age > 3";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<From> fromList = select.getFrom();
-        Assert.assertEquals(1, fromList.size());
-        From from = fromList.get(0);
-        Assert.assertEquals("Test Index", from.getIndex());
-    }
-
-    @Test
-    public void indexWithSpacesWithTypeWithinBrackets() throws SqlParseException {
-        String query = "SELECT insert_time FROM [Test Index] WHERE age > 3";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<From> fromList = select.getFrom();
-        Assert.assertEquals(1, fromList.size());
-        From from = fromList.get(0);
-        Assert.assertEquals("Test Index", from.getIndex());
-    }
-
-
-    @Test
-    public void fieldWithSpacesWithinBrackets() throws SqlParseException {
-        String query = "SELECT insert_time FROM name/type1 WHERE [first name] = 'Name'";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Where> where = select.getWhere().getWheres();
-        Assert.assertEquals(1, where.size());
-        Condition condition = (Condition) where.get(0);
-        Assert.assertEquals("first name", condition.getName());
-        Assert.assertEquals("Name", condition.getValue());
-    }
-
-    @Test
-    public void twoIndices() throws SqlParseException {
-        String query = "SELECT insert_time FROM index1, index2 WHERE age > 3";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<From> fromList = select.getFrom();
-        Assert.assertEquals(2, fromList.size());
-        From from1 = fromList.get(0);
-        From from2 = fromList.get(1);
-        boolean preservedOrder = from1.getIndex().equals("index1")
-                && from2.getIndex().equals("index2");
-        boolean notPreservedOrder = from1.getIndex().equals("index2")
-                && from2.getIndex().equals("index1");
-        Assert.assertTrue(preservedOrder || notPreservedOrder);
-    }
-
-    @Test
-    public void fieldWithATcharAtWhere() throws SqlParseException {
-        String query = "SELECT * FROM index/type where @field = 6 ";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        LinkedList<Where> wheres = select.getWhere().getWheres();
-        Assert.assertEquals(1, wheres.size());
-        Condition condition = (Condition) wheres.get(0);
-        Assert.assertEquals("@field", condition.getName());
-    }
-
-    @Test
-    public void fieldWithATcharAtSelect() throws SqlParseException {
-        String query = "SELECT @field FROM index/type where field2 = 6 ";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Field> fields = select.getFields();
-        Assert.assertEquals(1, fields.size());
-        Field field = fields.get(0);
-        Assert.assertEquals(field.getName(), "@field");
-    }
-
-    @Test
-    public void fieldWithATcharAtSelectOnAgg() throws SqlParseException {
-        String query = "SELECT max(@field) FROM index/type where field2 = 6 ";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Field> fields = select.getFields();
-        Assert.assertEquals(1, fields.size());
-        Field field = fields.get(0);
-        Assert.assertEquals("MAX(@field)", field.toString());
-    }
-
-    @Test
-    public void fieldWithColonCharAtSelect() throws SqlParseException {
-        String query = "SELECT a:b FROM index/type where field2 = 6 ";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Field> fields = select.getFields();
-        Assert.assertEquals(1, fields.size());
-        Field field = fields.get(0);
-        Assert.assertEquals(field.getName(), "a:b");
-    }
-
-    @Test
-    public void fieldWithColonCharAtWhere() throws SqlParseException {
-        String query = "SELECT * FROM index/type where a:b = 6 ";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        LinkedList<Where> wheres = select.getWhere().getWheres();
-        Assert.assertEquals(1, wheres.size());
-        Condition condition = (Condition) wheres.get(0);
-        Assert.assertEquals("a:b", condition.getName());
-    }
-
-    @Test
-    public void fieldIsNull() throws SqlParseException {
-        String query = "SELECT * FROM index/type where a IS NOT NULL";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        LinkedList<Where> wheres = select.getWhere().getWheres();
-        Assert.assertEquals(1, wheres.size());
-        Condition condition = (Condition) wheres.get(0);
-        Assert.assertEquals("a", condition.getName());
-        Assert.assertNull(condition.getValue());
-    }
-
-    @Test
-    public void innerQueryTest() throws SqlParseException {
-        String query = String.format(Locale.ROOT, "select * from %s/dog where holdersName " +
-                "IN (select firstname from %s/account where firstname = 'eliran')",
-                TEST_INDEX_DOG, TestsConstants.TEST_INDEX_ACCOUNT);
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Assert.assertTrue(select.containsSubQueries());
-        Assert.assertEquals(1, select.getSubQueries().size());
-    }
-
-    @Test
-    public void inTermsSubQueryTest() throws SqlParseException {
-        String query = String.format(Locale.ROOT, "select * from %s/dog where " +
-                "holdersName = IN_TERMS (select firstname from %s/account where firstname = 'eliran')",
-                TEST_INDEX_DOG, TestsConstants.TEST_INDEX_ACCOUNT);
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Assert.assertTrue(select.containsSubQueries());
-        Assert.assertEquals(1, select.getSubQueries().size());
-    }
-
-
-    @Test
-    public void innerQueryTestTwoQueries() throws SqlParseException {
-        String query = String.format(Locale.ROOT, "select * from %s/dog where holdersName IN " +
-                "(select firstname from %s/account where firstname = 'eliran') and " +
-                "age IN (select name.ofHisName from %s/gotCharacters) ",
-                TEST_INDEX_DOG, TestsConstants.TEST_INDEX_ACCOUNT, TEST_INDEX_GAME_OF_THRONES);
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Assert.assertTrue(select.containsSubQueries());
-        Assert.assertEquals(2, select.getSubQueries().size());
-    }
-
-    @Test
-    public void indexWithDotsAndHyphen() throws SqlParseException {
-        String query = "select * from data-2015.08.22";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Assert.assertEquals(1, select.getFrom().size());
-        Assert.assertEquals("data-2015.08.22", select.getFrom().get(0).getIndex());
-    }
-
-    @Test
-    public void indexNameWithDotAtTheStart() throws SqlParseException {
-        String query = "SELECT * FROM .opensearch_dashboards";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Assert.assertEquals(".opensearch_dashboards", select.getFrom().get(0).getIndex());
-    }
-
-    @Test
-    public void indexWithSemiColons() throws SqlParseException {
-        String query = "select * from some;index";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Assert.assertEquals(1, select.getFrom().size());
-        Assert.assertEquals("some;index", select.getFrom().get(0).getIndex());
-    }
-
-    @Test
-    public void scriptFiledPlusLiteralTest() throws SqlParseException {
-        String query = "SELECT field1 + 3 FROM index/type";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Field> fields = select.getFields();
-        Assert.assertEquals(1, fields.size());
-        Field field = fields.get(0);
-        Assert.assertTrue(field instanceof MethodField);
-        MethodField scriptMethod = (MethodField) field;
-        Assert.assertEquals("script", scriptMethod.getName().toLowerCase());
-        Assert.assertEquals(2, scriptMethod.getParams().size());
-        Assert.assertTrue(scriptMethod.getParams().get(1).toString().contains("doc['field1'].value + 3"));
-    }
-
-    @Test
-    public void scriptFieldPlusFieldTest() throws SqlParseException {
-        String query = "SELECT field1 + field2 FROM index/type";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Field> fields = select.getFields();
-        Assert.assertEquals(1, fields.size());
-        Field field = fields.get(0);
-        Assert.assertTrue(field instanceof MethodField);
-        MethodField scriptMethod = (MethodField) field;
-        Assert.assertEquals("script", scriptMethod.getName().toLowerCase());
-        Assert.assertEquals(2, scriptMethod.getParams().size());
-        Assert.assertTrue(scriptMethod.getParams().get(1).toString()
-                .contains("doc['field1'].value + doc['field2'].value"));
-    }
-
-
-    @Test
-    public void scriptLiteralPlusLiteralTest() throws SqlParseException {
-        String query = "SELECT 1 + 2  FROM index/type";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Field> fields = select.getFields();
-        Assert.assertEquals(1, fields.size());
-        Field field = fields.get(0);
-        Assert.assertTrue(field instanceof MethodField);
-        MethodField scriptMethod = (MethodField) field;
-        Assert.assertEquals("script", scriptMethod.getName().toLowerCase());
-        Assert.assertEquals(2, scriptMethod.getParams().size());
-        Assert.assertTrue(scriptMethod.getParams().get(1).toString().contains("1 + 2"));
-    }
-
-
-    @Test
-    public void explicitScriptOnAggregation() throws SqlParseException {
-        String query = "SELECT avg( script('add','doc[\\'field1\\'].value + doc[\\'field2\\'].value') )" +
-                " FROM index/type";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Field> fields = select.getFields();
-        Assert.assertEquals(1, fields.size());
-        Field field = fields.get(0);
-        Assert.assertTrue(field instanceof MethodField);
-        MethodField avgMethodField = (MethodField) field;
-        Assert.assertEquals("avg", avgMethodField.getName().toLowerCase());
-        Assert.assertEquals(1, avgMethodField.getParams().size());
-        MethodField scriptMethod = (MethodField) avgMethodField.getParams().get(0).value;
-        Assert.assertEquals("script", scriptMethod.getName().toLowerCase());
-        Assert.assertEquals(2, scriptMethod.getParams().size());
-        Assert.assertEquals("doc['field1'].value + doc['field2'].value",
-                scriptMethod.getParams().get(1).toString());
-    }
-
-    @Test
-    public void implicitScriptOnAggregation() throws SqlParseException {
-        String query = "SELECT avg(field(field1) + field(field2)) FROM index/type";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Field> fields = select.getFields();
-        Assert.assertEquals(1, fields.size());
-        Field field = fields.get(0);
-        Assert.assertTrue(field instanceof MethodField);
-        MethodField avgMethodField = (MethodField) field;
-        Assert.assertEquals("avg", avgMethodField.getName().toLowerCase());
-        Assert.assertEquals(1, avgMethodField.getParams().size());
-        Assert.assertTrue(avgMethodField.getParams().get(0).value.toString().contains("doc['field1'].value"));
-        Assert.assertTrue(avgMethodField.getParams().get(0).value.toString().contains("doc['field2'].value"));
-
-    }
-
-    @Test
-    public void nestedFieldOnWhereNoPathSimpleField() throws SqlParseException {
-        String query = "select * from myIndex where nested(message.name) = 'hey'";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Where where = select.getWhere().getWheres().get(0);
-        Assert.assertTrue("where should be condition", where instanceof Condition);
-        Condition condition = (Condition) where;
-        Assert.assertTrue("condition should be nested", condition.isNested());
-        Assert.assertEquals("message", condition.getNestedPath());
-        Assert.assertEquals("message.name", condition.getName());
-    }
-
-
-    @Test
-    public void nestedFieldOnWhereNoPathComplexField() throws SqlParseException {
-        String query = "select * from myIndex where nested(message.moreNested.name) = 'hey'";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Where where = select.getWhere().getWheres().get(0);
-        Assert.assertTrue("where should be condition", where instanceof Condition);
-        Condition condition = (Condition) where;
-        Assert.assertTrue("condition should be nested", condition.isNested());
-        Assert.assertEquals("message.moreNested", condition.getNestedPath());
-        Assert.assertEquals("message.moreNested.name", condition.getName());
-    }
-
-
-    @Test
-    public void aggFieldWithAliasTableAliasShouldBeRemoved() throws SqlParseException {
-        String query = "select count(t.*) as counts,sum(t.size) from xxx/locs as t group by t.kk";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Field> fields = select.getFields();
-        Assert.assertThat(fields.size(), equalTo(2));
-        Assert.assertEquals("COUNT(*)", fields.get(0).toString());
-        Assert.assertEquals("SUM(size)", fields.get(1).toString());
-        List<List<Field>> groups = select.getGroupBys();
-        Assert.assertThat(groups.size(), equalTo(1));
-        Assert.assertThat(groups.get(0).size(), equalTo(1));
-        Assert.assertEquals("kk", groups.get(0).get(0).getName());
-    }
-
-    @Test
-    public void nestedFieldOnWhereGivenPath() throws SqlParseException {
-        String query = "select * from myIndex where nested(message.name,message) = 'hey'";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Where where = select.getWhere().getWheres().get(0);
-        Assert.assertTrue("where should be condition", where instanceof Condition);
-        Condition condition = (Condition) where;
-        Assert.assertTrue("condition should be nested", condition.isNested());
-        Assert.assertEquals("message", condition.getNestedPath());
-        Assert.assertEquals("message.name", condition.getName());
-    }
-
-    @Test
-    public void nestedFieldOnGroupByNoPath() throws SqlParseException {
-        String query = "select * from myIndex group by nested(message.name)";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Field field = select.getGroupBys().get(0).get(0);
-        Assert.assertTrue("condition should be nested", field.isNested());
-        Assert.assertEquals("message", field.getNestedPath());
-        Assert.assertEquals("message.name", field.getName());
-    }
-
-    @Test
-    public void nestedFieldOnGroupByWithPath() throws SqlParseException {
-        String query = "select * from myIndex group by nested(message.name,message)";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Field field = select.getGroupBys().get(0).get(0);
-        Assert.assertTrue("condition should be nested", field.isNested());
-        Assert.assertEquals("message", field.getNestedPath());
-        Assert.assertEquals("message.name", field.getName());
-    }
-
-    @Test
-    public void filterAggTestNoAlias() throws SqlParseException {
-        String query = "select * from myIndex group by a , filter(  a > 3 AND b='3' )";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<List<Field>> groupBys = select.getGroupBys();
-        Assert.assertEquals(1, groupBys.size());
-        Field aAgg = groupBys.get(0).get(0);
-        Assert.assertEquals("a", aAgg.getName());
-        Field field = groupBys.get(0).get(1);
-        Assert.assertTrue("filter field should be method field", field instanceof MethodField);
-        MethodField filterAgg = (MethodField) field;
-        Assert.assertEquals("filter", filterAgg.getName());
-        Map<String, Object> params = filterAgg.getParamsAsMap();
-        Assert.assertEquals(2, params.size());
-        Object alias = params.get("alias");
-        Assert.assertEquals("filter(a > 3 AND b = '3')@FILTER", alias);
-
-        Assert.assertTrue(params.get("where") instanceof Where);
-        Where where = (Where) params.get("where");
-        Assert.assertEquals(2, where.getWheres().size());
-    }
-
-    @Test
-    public void filterAggTestWithAlias() throws SqlParseException {
-        String query = "select * from myIndex group by a , filter(myFilter, a > 3 AND b='3' )";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<List<Field>> groupBys = select.getGroupBys();
-        Assert.assertEquals(1, groupBys.size());
-        Field aAgg = groupBys.get(0).get(0);
-        Assert.assertEquals("a", aAgg.getName());
-        Field field = groupBys.get(0).get(1);
-        Assert.assertTrue("filter field should be method field", field instanceof MethodField);
-        MethodField filterAgg = (MethodField) field;
-        Assert.assertEquals("filter", filterAgg.getName());
-        Map<String, Object> params = filterAgg.getParamsAsMap();
-        Assert.assertEquals(2, params.size());
-        Object alias = params.get("alias");
-        Assert.assertEquals("myFilter@FILTER", alias);
-
-        Assert.assertTrue(params.get("where") instanceof Where);
-        Where where = (Where) params.get("where");
-        Assert.assertEquals(2, where.getWheres().size());
-    }
-
-
-    @Test
-    public void filterAggTestWithAliasAsString() throws SqlParseException {
-        String query = "select * from myIndex group by a , filter('my filter', a > 3 AND b='3' )";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<List<Field>> groupBys = select.getGroupBys();
-        Assert.assertEquals(1, groupBys.size());
-        Field aAgg = groupBys.get(0).get(0);
-        Assert.assertEquals("a", aAgg.getName());
-        Field field = groupBys.get(0).get(1);
-        Assert.assertTrue("filter field should be method field", field instanceof MethodField);
-        MethodField filterAgg = (MethodField) field;
-        Assert.assertEquals("filter", filterAgg.getName());
-        Map<String, Object> params = filterAgg.getParamsAsMap();
-        Assert.assertEquals(2, params.size());
-        Object alias = params.get("alias");
-        Assert.assertEquals("my filter@FILTER", alias);
-
-        Assert.assertTrue(params.get("where") instanceof Where);
-        Where where = (Where) params.get("where");
-        Assert.assertEquals(2, where.getWheres().size());
-    }
-
-    @Test
-    public void doubleOrderByTest() throws SqlParseException {
-        String query = "select * from indexName order by a asc, b desc";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Order> orderBys = select.getOrderBys();
-        Assert.assertEquals(2, orderBys.size());
-        Assert.assertEquals("a", orderBys.get(0).getName());
-        Assert.assertEquals("ASC", orderBys.get(0).getType());
-
-        Assert.assertEquals("b", orderBys.get(1).getName());
-        Assert.assertEquals("DESC", orderBys.get(1).getType());
-    }
-
-    @Test
-    public void parseJoinWithOneTableOrderByAttachToCorrectTable() throws SqlParseException {
-        String query = String.format(Locale.ROOT, "select c.name.firstname , d.words from %s/gotCharacters c " +
-                        "JOIN %s/gotCharacters d on d.name = c.house " +
-                        "order by c.name.firstname"
-                , TEST_INDEX_GAME_OF_THRONES, TEST_INDEX_GAME_OF_THRONES);
-
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-        Assert.assertTrue("first table should be ordered", joinSelect.getFirstTable().isOrderdSelect());
-        Assert.assertFalse("second table should not be ordered", joinSelect.getSecondTable().isOrderdSelect());
-
-    }
-
-    @Test
-    public void parseJoinWithOneTableOrderByRemoveAlias() throws SqlParseException {
-        String query = String.format(Locale.ROOT, "select c.name.firstname , d.words from %s/gotCharacters c " +
-                        "JOIN %s/gotCharacters d on d.name = c.house " +
-                        "order by c.name.firstname"
-                , TEST_INDEX_GAME_OF_THRONES, TEST_INDEX_GAME_OF_THRONES);
-
-        JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
-        List<Order> orderBys = joinSelect.getFirstTable().getOrderBys();
-        Assert.assertEquals(1, orderBys.size());
-        Order order = orderBys.get(0);
-        Assert.assertEquals("name.firstname", order.getName());
-
-    }
-
-    @Test
-    public void termsWithStringTest() throws SqlParseException {
-        String query = "select * from x where y = IN_TERMS('a','b')";
-        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-        Condition condition = (Condition) select.getWhere().getWheres().get(0);
-        Object[] values = (Object[]) condition.getValue();
-        Assert.assertEquals("a", values[0]);
-        Assert.assertEquals("b", values[1]);
-    }
-
-    @Test
-    public void termWithStringTest() throws SqlParseException {
-        String query = "select * from x where y = TERM('a')";
-        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-        Condition condition = (Condition) select.getWhere().getWheres().get(0);
-        Object[] values = (Object[]) condition.getValue();
-        Assert.assertEquals("a", values[0]);
-    }
-
-    @Test
-    public void complexNestedTest() throws SqlParseException {
-        String query = "select * from x where nested('y',y.b = 'a' and y.c  = 'd') ";
-        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-        Condition condition = (Condition) select.getWhere().getWheres().get(0);
-        Assert.assertEquals(Condition.OPERATOR.NESTED_COMPLEX, condition.getOPERATOR());
-        Assert.assertEquals("y", condition.getName());
-        Assert.assertTrue(condition.getValue() instanceof Where);
-        Where where = (Where) condition.getValue();
-        Assert.assertEquals(2, where.getWheres().size());
-    }
-
-    @Test
-    public void scriptOnFilterNoParams() throws SqlParseException {
-        String query = "select * from x where script('doc[\\'field\\'].date.hourOfDay == 3') ";
-        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-        Condition condition = (Condition) select.getWhere().getWheres().get(0);
-        Assert.assertEquals(Condition.OPERATOR.SCRIPT, condition.getOPERATOR());
-        Assert.assertNull(condition.getName());
-        Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
-        ScriptFilter scriptFilter = (ScriptFilter) condition.getValue();
-        Assert.assertEquals("doc['field'].date.hourOfDay == 3", scriptFilter.getScript());
-        Assert.assertFalse(scriptFilter.containsParameters());
-    }
-
-    @Test
-    public void scriptOnFilterWithParams() throws SqlParseException {
-        String query = "select * from x where script('doc[\\'field\\'].date.hourOfDay == x','x'=3) ";
-        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-        Condition condition = (Condition) select.getWhere().getWheres().get(0);
-        Assert.assertEquals(Condition.OPERATOR.SCRIPT, condition.getOPERATOR());
-        Assert.assertNull(condition.getName());
-        Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
-        ScriptFilter scriptFilter = (ScriptFilter) condition.getValue();
-        Assert.assertEquals("doc['field'].date.hourOfDay == x", scriptFilter.getScript());
-        Assert.assertTrue(scriptFilter.containsParameters());
-        Map<String, Object> args = scriptFilter.getArgs();
-        Assert.assertEquals(1, args.size());
-        Assert.assertTrue(args.containsKey("x"));
-        Assert.assertEquals(3, args.get("x"));
-
-    }
-
-    @Test
-    public void fieldsAsNumbersOnWhere() throws SqlParseException {
-        String query = "select * from x where ['3'] > 2";
-        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-        LinkedList<Where> wheres = select.getWhere().getWheres();
-        Assert.assertEquals(1, wheres.size());
-        Where where = wheres.get(0);
-        Assert.assertEquals(Condition.class, where.getClass());
-        Condition condition = (Condition) where;
-        Assert.assertEquals("3", condition.getName());
-    }
-
-    @Test
-    public void likeTestWithEscaped() throws SqlParseException {
-        String query = "select * from x where name like '&UNDERSCOREhey_%&PERCENT'";
-        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-        BoolQueryBuilder explan = QueryMaker.explain(select.getWhere());
-        String filterAsString = explan.toString();
-        Assert.assertTrue(filterAsString.contains("_hey?*%"));
-    }
-
-
-    @Test
-    public void complexNestedAndOtherQuery() throws SqlParseException {
-        String query = "select * from x where nested('path',path.x=3) and y=3";
-        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-        LinkedList<Where> wheres = select.getWhere().getWheres();
-        Assert.assertEquals(2, wheres.size());
-        Assert.assertEquals("AND path NESTED_COMPLEX AND ( AND path.x EQ 3 ) ", wheres.get(0).toString());
-        Assert.assertEquals("AND y EQ 3", wheres.get(1).toString());
-    }
-
-
-    @Test
-    public void numberEqualConditionWithoutProperty() throws SqlParseException {
-        SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where 1 = 1");
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Where> wheres = select.getWhere().getWheres();
-        Assert.assertThat(wheres.size(), equalTo(1));
-        Condition condition = (Condition) wheres.get(0);
-        Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
-        ScriptFilter sf = (ScriptFilter) condition.getValue();
-        Assert.assertEquals(sf.getScript(), "1 == 1");
-    }
-
-    @Test
-    public void numberGreatConditionWithoutProperty() throws SqlParseException {
-        SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where 1 > 1");
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Where> wheres = select.getWhere().getWheres();
-        Assert.assertThat(wheres.size(), equalTo(1));
-        Condition condition = (Condition) wheres.get(0);
-        Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
-        ScriptFilter sf = (ScriptFilter) condition.getValue();
-        Assert.assertEquals(sf.getScript(), "1 > 1");
-    }
-
-    @Test
-    public void stringEqualConditionWithoutProperty() throws SqlParseException {
-        SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where 'a' = 'b'");
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Where> wheres = select.getWhere().getWheres();
-        Assert.assertThat(wheres.size(), equalTo(1));
-        Condition condition = (Condition) wheres.get(0);
-        Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
-        ScriptFilter sf = (ScriptFilter) condition.getValue();
-        Assert.assertEquals(sf.getScript(), "'a' == 'b'");
-    }
-
-    @Test
-    public void propertyEqualCondition() throws SqlParseException {
-        SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where a = b");
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Where> wheres = select.getWhere().getWheres();
-        Assert.assertThat(wheres.size(), equalTo(1));
-        Condition condition = (Condition) wheres.get(0);
-        Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
-        ScriptFilter sf = (ScriptFilter) condition.getValue();
-        Assert.assertEquals(sf.getScript(), "doc['a'].value == doc['b'].value");
-    }
-
-
-    @Test
-    public void propertyWithTableAliasEqualCondition() throws SqlParseException {
-        SQLExpr sqlExpr = queryToExpr("select t.* from xxx/locs where t.a = t.b");
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Where> wheres = select.getWhere().getWheres();
-        Assert.assertThat(wheres.size(), equalTo(1));
-        Condition condition = (Condition) wheres.get(0);
-        Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
-        ScriptFilter sf = (ScriptFilter) condition.getValue();
-        Assert.assertEquals(sf.getScript(), "doc['a'].value == doc['b'].value");
-    }
-
-    @Test
-    public void propertyGreatCondition() throws SqlParseException {
-        SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where a > b");
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Where> wheres = select.getWhere().getWheres();
-        Assert.assertThat(wheres.size(), equalTo(1));
-        Condition condition = (Condition) wheres.get(0);
-        Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
-        ScriptFilter sf = (ScriptFilter) condition.getValue();
-        Assert.assertEquals(sf.getScript(), "doc['a'].value > doc['b'].value");
-    }
-
-    @Test
-    public void stringAndNumberEqualConditionWithoutProperty() throws SqlParseException {
-        SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where 'a' = 1");
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        List<Where> wheres = select.getWhere().getWheres();
-        Assert.assertThat(wheres.size(), equalTo(1));
-        Condition condition = (Condition) wheres.get(0);
-        Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
-        ScriptFilter sf = (ScriptFilter) condition.getValue();
-        Assert.assertEquals(sf.getScript(), "'a' == 1");
-    }
-
-
-    @Test
-    public void caseWhenTest() throws SqlParseException {
-        String query = "Select k,\n" +
-                "Case \n" +
-                "When floor(testBase)>=90 then 'A'\n" +
-                "When testBase = '80' then 'B'\n" +
-                "Else 'E' end as testBaseLevel\n" +
-                "from t";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        for (Field field : select.getFields()) {
-            if (field instanceof MethodField) {
-                MethodField methodField = (MethodField) field;
-                String alias = (String) methodField.getParams().get(0).value;
-                String scriptCode = (String) methodField.getParams().get(1).value;
-                Assert.assertEquals(alias, "testBaseLevel");
-                Matcher docValue = Pattern.compile("doc\\['testBase'].value").matcher(scriptCode);
-                Matcher number = Pattern.compile(" (\\s+90) | (\\s+'80')").matcher(scriptCode);
-
-                AtomicInteger docValueCounter = new AtomicInteger();
-
-                while (docValue.find()) {
-                    docValueCounter.incrementAndGet();
-                }
-
-                Assert.assertThat(docValueCounter.get(), equalTo(2));
-                Assert.assertThat(number.groupCount(), equalTo(2));
-
-            }
-        }
-
-    }
-
-    @Test
-    public void caseWhenTestWithFieldElseExpr() throws SqlParseException {
-        String query = "Select k,\n" +
-                "Case \n" +
-                "When floor(testBase)>=90 then 'A'\n" +
-                "When testBase = '80' then 'B'\n" +
-                "Else testBase end as testBaseLevel\n" +
-                "from t";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        for (Field field : select.getFields()) {
-            if (field instanceof MethodField) {
-                MethodField methodField = (MethodField) field;
-                String alias = (String) methodField.getParams().get(0).value;
-                String scriptCode = (String) methodField.getParams().get(1).value;
-                Assert.assertEquals(alias, "testBaseLevel");
-                Matcher docValue = Pattern.compile("doc\\['testBase'].value").matcher(scriptCode);
-                Matcher number = Pattern.compile(" (\\s+90) | (\\s+'80')").matcher(scriptCode);
-
-                AtomicInteger docValueCounter = new AtomicInteger();
-
-                while (docValue.find()) {
-                    docValueCounter.incrementAndGet();
-                }
-
-                Assert.assertThat(docValueCounter.get(), equalTo(3));
-                Assert.assertThat(number.groupCount(), equalTo(2));
-
-            }
-        }
-
-    }
-
-    @Test
-    public void caseWhenTestWithouhtElseExpr() throws SqlParseException {
-        String query = "Select k,\n" +
-                "Case \n" +
-                "When floor(testBase)>=90 then 'A'\n" +
-                "When testBase = '80' then 'B'\n" +
-                "end as testBaseLevel\n" +
-                "from t";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        for (Field field : select.getFields()) {
-            if (field instanceof MethodField) {
-                MethodField methodField = (MethodField) field;
-                String alias = (String) methodField.getParams().get(0).value;
-                String scriptCode = (String) methodField.getParams().get(1).value;
-                Assert.assertEquals(alias, "testBaseLevel");
-
-                Matcher docValue = Pattern.compile("\\{\\s+null\\s+}").matcher(scriptCode);
-
-                AtomicInteger docValueCounter = new AtomicInteger();
-
-                while (docValue.find()) {
-                    docValueCounter.incrementAndGet();
-                }
-
-                Assert.assertThat(docValueCounter.get(), equalTo(1));
-
-            }
-        }
-
-    }
-
-    @Test
-    public void caseWhenSwitchTest()  {
-        String query = "SELECT CASE weather "
-                     + "WHEN 'Sunny' THEN '0' "
-                     + "WHEN 'Rainy' THEN '1' "
-                     + "ELSE 'NA' END AS case "
-                     + "FROM t";
-        ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
-        Assert.assertTrue(
-                CheckScriptContents.scriptContainsString(
-                        scriptField,
-                        "doc['weather'].value=='Sunny'"
-                )
-        );
-    }
-
-    @Test
-    public void castToIntTest() throws Exception {
-        String query = "select cast(age as int) from "+ TestsConstants.TEST_INDEX_ACCOUNT + "/account limit 10";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Field castField = select.getFields().get(0);
-        Assert.assertTrue(castField instanceof MethodField);
-
-        MethodField methodField = (MethodField) castField;
-        Assert.assertEquals("script",castField.getName());
-
+  private SqlParser parser;
+
+  @Before
+  public void init() {
+    parser = new SqlParser();
+  }
+
+  @Rule public ExpectedException thrown = ExpectedException.none();
+
+  @Test
+  public void whereConditionLeftFunctionRightPropertyGreatTest() throws Exception {
+
+    String query =
+        "SELECT "
+            + " * from "
+            + TEST_INDEX_ACCOUNT
+            + "/account "
+            + " where floor(split(address,' ')[0]+0) > b limit 1000  ";
+
+    Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+    Where where = select.getWhere();
+    Assert.assertTrue((where.getWheres().size() == 1));
+    Assert.assertTrue(((Condition) (where.getWheres().get(0))).getValue() instanceof ScriptFilter);
+    ScriptFilter scriptFilter =
+        (ScriptFilter) (((Condition) (where.getWheres().get(0))).getValue());
+
+    Assert.assertTrue(scriptFilter.getScript().contains("doc['address'].value.split(' ')[0]"));
+    Pattern pattern = Pattern.compile("floor_\\d+ > doc\\['b'].value");
+    java.util.regex.Matcher matcher = pattern.matcher(scriptFilter.getScript());
+    Assert.assertTrue(matcher.find());
+  }
+
+  @Test()
+  public void failingQueryTest() throws SqlParseException {
+    thrown.expect(SqlFeatureNotImplementedException.class);
+    thrown.expectMessage(
+        "The complex aggregate expressions are not implemented yet: MAX(FlightDelayMin) -"
+            + " MIN(FlightDelayMin)");
+
+    Select select =
+        parser.parseSelect(
+            (SQLQueryExpr)
+                queryToExpr(
+                    "SELECT DestCountry, dayOfWeek, max(FlightDelayMin) - min(FlightDelayMin)"
+                        + "   FROM opensearch_dashboards_sample_data_flights\n"
+                        + "   GROUP BY DestCountry, dayOfWeek\n"));
+
+    AggregationQueryAction queryAction = new AggregationQueryAction(mock(Client.class), select);
+    String elasticDsl = queryAction.explain().explain();
+  }
+
+  @Test()
+  public void failingQueryTest2() throws SqlParseException {
+    thrown.expect(SqlFeatureNotImplementedException.class);
+    thrown.expectMessage("Function calls of form 'log(MAX(...))' are not implemented yet");
+
+    Select select =
+        parser.parseSelect(
+            (SQLQueryExpr)
+                queryToExpr(
+                    "SELECT DestCountry, dayOfWeek, log(max(FlightDelayMin))"
+                        + "   FROM opensearch_dashboards_sample_data_flights\n"
+                        + "   GROUP BY DestCountry, dayOfWeek\n"));
+
+    AggregationQueryAction queryAction = new AggregationQueryAction(mock(Client.class), select);
+    String elasticDsl = queryAction.explain().explain();
+  }
+
+  @Test()
+  public void failingQueryWithHavingTest() throws SqlParseException {
+    thrown.expect(SqlFeatureNotImplementedException.class);
+    thrown.expectMessage(
+        "The complex aggregate expressions are not implemented yet: MAX(FlightDelayMin) -"
+            + " MIN(FlightDelayMin)");
+
+    Select select =
+        parser.parseSelect(
+            (SQLQueryExpr)
+                queryToExpr(
+                    "SELECT DestCountry, dayOfWeek, max(FlightDelayMin) - min(FlightDelayMin)   "
+                        + " FROM opensearch_dashboards_sample_data_flights\n"
+                        + "   GROUP BY DestCountry, dayOfWeek\n"
+                        + "   HAVING max(FlightDelayMin) - min(FlightDelayMin)) *"
+                        + " count(FlightDelayMin) + 14 > 100"));
+
+    AggregationQueryAction queryAction = new AggregationQueryAction(mock(Client.class), select);
+    String elasticDsl = queryAction.explain().explain();
+  }
+
+  @Test()
+  @Ignore(
+      "Github issues: https://github.com/opendistro-for-elasticsearch/sql/issues/194, "
+          + "https://github.com/opendistro-for-elasticsearch/sql/issues/234")
+  public void failingQueryWithHavingTest2() throws SqlParseException {
+    Select select =
+        parser.parseSelect(
+            (SQLQueryExpr)
+                queryToExpr(
+                    "SELECT DestCountry, dayOfWeek, max(FlightDelayMin) "
+                        + "   FROM opensearch_dashboards_sample_data_flights\n"
+                        + "   GROUP BY DestCountry, dayOfWeek\n"
+                        + "   HAVING max(FlightDelayMin) - min(FlightDelayMin) > 100"));
+
+    AggregationQueryAction queryAction = new AggregationQueryAction(mock(Client.class), select);
+
+    String elasticDsl = queryAction.explain().explain();
+  }
+
+  @Test
+  public void whereConditionLeftFunctionRightFunctionEqualTest() throws Exception {
+
+    String query =
+        "SELECT "
+            + " * from "
+            + TEST_INDEX_ACCOUNT
+            + "/account "
+            + " where floor(split(address,' ')[0]+0) = floor(split(address,' ')[0]+0) limit 1000  ";
+
+    Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+    Where where = select.getWhere();
+    Assert.assertTrue((where.getWheres().size() == 1));
+    Assert.assertTrue(((Condition) (where.getWheres().get(0))).getValue() instanceof ScriptFilter);
+    ScriptFilter scriptFilter =
+        (ScriptFilter) (((Condition) (where.getWheres().get(0))).getValue());
+    Assert.assertTrue(scriptFilter.getScript().contains("doc['address'].value.split(' ')[0]"));
+    Pattern pattern = Pattern.compile("floor_\\d+ == floor_\\d+");
+    java.util.regex.Matcher matcher = pattern.matcher(scriptFilter.getScript());
+    Assert.assertTrue(matcher.find());
+  }
+
+  @Test
+  public void whereConditionVariableRightVariableEqualTest() throws Exception {
+
+    String query =
+        "SELECT " + " * from " + TEST_INDEX_ACCOUNT + "/account " + " where a = b limit 1000  ";
+
+    Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+    Where where = select.getWhere();
+    Assert.assertTrue((where.getWheres().size() == 1));
+    Assert.assertTrue(((Condition) (where.getWheres().get(0))).getValue() instanceof ScriptFilter);
+    ScriptFilter scriptFilter =
+        (ScriptFilter) (((Condition) (where.getWheres().get(0))).getValue());
+    Assert.assertTrue(scriptFilter.getScript().contains("doc['a'].value == doc['b'].value"));
+  }
+
+  @Test
+  public void joinParseCheckSelectedFieldsSplit() throws SqlParseException {
+    String query =
+        "SELECT a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + "/account a "
+            + "LEFT JOIN "
+            + TEST_INDEX_DOG
+            + "/dog d on d.holdersName = a.firstname "
+            + " AND d.age < a.age "
+            + " WHERE a.firstname = 'eliran' AND "
+            + " (a.age > 10 OR a.balance > 2000)"
+            + " AND d.age > 1";
+
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+
+    List<Field> t1Fields = joinSelect.getFirstTable().getSelectedFields();
+    Assert.assertEquals(t1Fields.size(), 3);
+    Assert.assertTrue(fieldExist(t1Fields, "firstname"));
+    Assert.assertTrue(fieldExist(t1Fields, "lastname"));
+    Assert.assertTrue(fieldExist(t1Fields, "gender"));
+
+    List<Field> t2Fields = joinSelect.getSecondTable().getSelectedFields();
+    Assert.assertEquals(t2Fields.size(), 2);
+    Assert.assertTrue(fieldExist(t2Fields, "holdersName"));
+    Assert.assertTrue(fieldExist(t2Fields, "name"));
+  }
+
+  @Test
+  public void joinParseCheckConnectedFields() throws SqlParseException {
+    String query =
+        "SELECT a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + "/account a "
+            + "LEFT JOIN "
+            + TEST_INDEX_DOG
+            + "/dog d on d.holdersName = a.firstname "
+            + " AND d.age < a.age "
+            + " WHERE a.firstname = 'eliran' AND "
+            + " (a.age > 10 OR a.balance > 2000)"
+            + " AND d.age > 1";
+
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+
+    List<Field> t1Fields = joinSelect.getFirstTable().getConnectedFields();
+    Assert.assertEquals(t1Fields.size(), 2);
+    Assert.assertTrue(fieldExist(t1Fields, "firstname"));
+    Assert.assertTrue(fieldExist(t1Fields, "age"));
+
+    List<Field> t2Fields = joinSelect.getSecondTable().getConnectedFields();
+    Assert.assertEquals(t2Fields.size(), 2);
+    Assert.assertTrue(fieldExist(t2Fields, "holdersName"));
+    Assert.assertTrue(fieldExist(t2Fields, "age"));
+  }
+
+  private boolean fieldExist(List<Field> fields, String fieldName) {
+    for (Field field : fields) if (field.getName().equals(fieldName)) return true;
+
+    return false;
+  }
+
+  @Test
+  public void joinParseFromsAreSplitedCorrectly() throws SqlParseException {
+    String query =
+        "SELECT a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + " a "
+            + "LEFT JOIN "
+            + TEST_INDEX_DOG
+            + " d on d.holdersName = a.firstname"
+            + " WHERE a.firstname = 'eliran' AND "
+            + " (a.age > 10 OR a.balance > 2000)"
+            + " AND d.age > 1";
+
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+    List<From> t1From = joinSelect.getFirstTable().getFrom();
+
+    Assert.assertNotNull(t1From);
+    Assert.assertEquals(1, t1From.size());
+    Assert.assertTrue(checkFrom(t1From.get(0), TestsConstants.TEST_INDEX_ACCOUNT, "a"));
+
+    List<From> t2From = joinSelect.getSecondTable().getFrom();
+    Assert.assertNotNull(t2From);
+    Assert.assertEquals(1, t2From.size());
+    Assert.assertTrue(checkFrom(t2From.get(0), TEST_INDEX_DOG, "d"));
+  }
+
+  private boolean checkFrom(From from, String index, String alias) {
+    return from.getAlias().equals(alias) && from.getIndex().equals(index);
+  }
+
+  @Test
+  public void joinParseConditionsTestOneCondition() throws SqlParseException {
+    String query =
+        "SELECT a.*, a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + "/account a "
+            + "LEFT JOIN "
+            + TEST_INDEX_DOG
+            + "/dog d on d.holdersName = a.firstname"
+            + " WHERE a.firstname = 'eliran' AND "
+            + " (a.age > 10 OR a.balance > 2000)"
+            + " AND d.age > 1";
+
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+    List<Condition> conditions = joinSelect.getConnectedConditions();
+    Assert.assertNotNull(conditions);
+    Assert.assertEquals(1, conditions.size());
+    Assert.assertTrue(
+        "condition not exist: d.holdersName = a.firstname",
+        conditionExist(conditions, "d.holdersName", "a.firstname", Condition.OPERATOR.EQ));
+  }
+
+  @Test
+  public void joinParseConditionsTestTwoConditions() throws SqlParseException {
+    String query =
+        "SELECT a.*, a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + "/account a "
+            + "LEFT JOIN "
+            + TEST_INDEX_DOG
+            + "/dog d on d.holdersName = a.firstname "
+            + " AND d.age < a.age "
+            + " WHERE a.firstname = 'eliran' AND "
+            + " (a.age > 10 OR a.balance > 2000)"
+            + " AND d.age > 1";
+
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+    List<Condition> conditions = joinSelect.getConnectedConditions();
+    Assert.assertNotNull(conditions);
+    Assert.assertEquals(2, conditions.size());
+    Assert.assertTrue(
+        "condition not exist: d.holdersName = a.firstname",
+        conditionExist(conditions, "d.holdersName", "a.firstname", Condition.OPERATOR.EQ));
+    Assert.assertTrue(
+        "condition not exist: d.age < a.age",
+        conditionExist(conditions, "d.age", "a.age", Condition.OPERATOR.LT));
+  }
+
+  @Test
+  public void joinSplitWhereCorrectly() throws SqlParseException {
+    String query =
+        "SELECT a.*, a.firstname ,a.lastname , a.gender ,  d.holdersName ,d.name  FROM "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + "/account a "
+            + "LEFT JOIN "
+            + TEST_INDEX_DOG
+            + "/dog d on d.holdersName = a.firstname"
+            + " WHERE a.firstname = 'eliran' AND "
+            + " (a.age > 10 OR a.balance > 2000)"
+            + " AND d.age > 1";
+
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+    String s1Where = joinSelect.getFirstTable().getWhere().toString();
+    Assert.assertEquals(
+        "AND ( AND firstname EQ eliran, AND ( OR age GT 10, OR balance GT 2000 )  ) ", s1Where);
+    String s2Where = joinSelect.getSecondTable().getWhere().toString();
+    Assert.assertEquals("AND age GT 1", s2Where);
+  }
+
+  @Test
+  public void joinConditionWithComplexObjectComparisonRightSide() throws SqlParseException {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select c.name.firstname,c.parents.father , h.name,h.words "
+                + "from %s/gotCharacters c "
+                + "JOIN %s/gotCharacters h "
+                + "on h.name = c.name.lastname  "
+                + "where c.name.firstname='Daenerys'",
+            TEST_INDEX_GAME_OF_THRONES,
+            TEST_INDEX_GAME_OF_THRONES);
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+    List<Condition> conditions = joinSelect.getConnectedConditions();
+    Assert.assertNotNull(conditions);
+    Assert.assertEquals(1, conditions.size());
+    Assert.assertTrue(
+        "condition not exist: h.name = c.name.lastname",
+        conditionExist(conditions, "h.name", "c.name.lastname", Condition.OPERATOR.EQ));
+  }
+
+  @Test
+  public void joinConditionWithComplexObjectComparisonLeftSide() throws SqlParseException {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select c.name.firstname,c.parents.father , h.name,h.words from %s/gotCharacters c "
+                + "JOIN %s/gotCharacters h "
+                + "on c.name.lastname = h.name  "
+                + "where c.name.firstname='Daenerys'",
+            TEST_INDEX_GAME_OF_THRONES,
+            TEST_INDEX_GAME_OF_THRONES);
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+    List<Condition> conditions = joinSelect.getConnectedConditions();
+    Assert.assertNotNull(conditions);
+    Assert.assertEquals(1, conditions.size());
+    Assert.assertTrue(
+        "condition not exist: c.name.lastname = h.name",
+        conditionExist(conditions, "c.name.lastname", "h.name", Condition.OPERATOR.EQ));
+  }
+
+  @Test
+  public void limitHintsOnJoin() throws SqlParseException {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select /*! JOIN_TABLES_LIMIT(1000,null) */ "
+                + "c.name.firstname,c.parents.father , h.name,h.words from %s/gotCharacters c "
+                + "use KEY (termsFilter) "
+                + "JOIN %s/gotCharacters h "
+                + "on c.name.lastname = h.name  "
+                + "where c.name.firstname='Daenerys'",
+            TEST_INDEX_GAME_OF_THRONES,
+            TEST_INDEX_GAME_OF_THRONES);
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+    List<Hint> hints = joinSelect.getHints();
+    Assert.assertNotNull(hints);
+    Assert.assertEquals("hints size was not 1", 1, hints.size());
+    Hint hint = hints.get(0);
+    Assert.assertEquals(HintType.JOIN_LIMIT, hint.getType());
+    Object[] params = hint.getParams();
+    Assert.assertNotNull(params);
+    Assert.assertEquals("params size was not 2", 2, params.length);
+    Assert.assertEquals(1000, params[0]);
+    Assert.assertNull(params[1]);
+  }
+
+  @Test
+  public void hashTermsFilterHint() throws SqlParseException {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select /*! HASH_WITH_TERMS_FILTER*/ "
+                + "c.name.firstname,c.parents.father , h.name,h.words from %s/gotCharacters c "
+                + "use KEY (termsFilter) "
+                + "JOIN %s/gotCharacters h "
+                + "on c.name.lastname = h.name  "
+                + "where c.name.firstname='Daenerys'",
+            TEST_INDEX_GAME_OF_THRONES,
+            TEST_INDEX_GAME_OF_THRONES);
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+    List<Hint> hints = joinSelect.getHints();
+    Assert.assertNotNull(hints);
+    Assert.assertEquals("hints size was not 1", 1, hints.size());
+    Hint hint = hints.get(0);
+    Assert.assertEquals(HintType.HASH_WITH_TERMS_FILTER, hint.getType());
+  }
+
+  @Test
+  public void multipleHints() throws SqlParseException {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select /*! HASH_WITH_TERMS_FILTER*/ "
+                + "/*! JOIN_TABLES_LIMIT(1000,null) */ "
+                + " /*! JOIN_TABLES_LIMIT(100,200) */ "
+                + "c.name.firstname,c.parents.father , h.name,h.words from %s/gotCharacters c "
+                + "use KEY (termsFilter) "
+                + "JOIN %s/gotCharacters h "
+                + "on c.name.lastname = h.name  "
+                + "where c.name.firstname='Daenerys'",
+            TEST_INDEX_GAME_OF_THRONES,
+            TEST_INDEX_GAME_OF_THRONES);
+
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+    List<Hint> hints = joinSelect.getHints();
+
+    Assert.assertNotNull(hints);
+    Assert.assertEquals("hints size was not 3", 3, hints.size());
+    Hint firstHint = hints.get(0);
+    Assert.assertEquals(HintType.HASH_WITH_TERMS_FILTER, firstHint.getType());
+    Hint secondHint = hints.get(1);
+    Assert.assertEquals(HintType.JOIN_LIMIT, secondHint.getType());
+    Assert.assertEquals(1000, secondHint.getParams()[0]);
+    Assert.assertNull(secondHint.getParams()[1]);
+    Hint thirdHint = hints.get(2);
+    Assert.assertEquals(100, thirdHint.getParams()[0]);
+    Assert.assertEquals(200, thirdHint.getParams()[1]);
+    Assert.assertEquals(HintType.JOIN_LIMIT, thirdHint.getType());
+  }
+
+  @Test
+  public void searchWithOdbcTimeFormatParse() throws SqlParseException {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "SELECT insert_time FROM %s/odbc "
+                + "WHERE insert_time < {ts '2015-03-15 00:00:00.000'}",
+            TEST_INDEX_ODBC);
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    LinkedList<Where> wheres = select.getWhere().getWheres();
+    Assert.assertEquals(1, wheres.size());
+    Condition condition = (Condition) wheres.get(0);
+    Assert.assertEquals("{ts '2015-03-15 00:00:00.000'}", condition.getValue().toString());
+  }
+
+  @Test
+  public void indexWithSpacesWithinBrackets() throws SqlParseException {
+    String query = "SELECT insert_time FROM [Test Index] WHERE age > 3";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<From> fromList = select.getFrom();
+    Assert.assertEquals(1, fromList.size());
+    From from = fromList.get(0);
+    Assert.assertEquals("Test Index", from.getIndex());
+  }
+
+  @Test
+  public void indexWithSpacesWithTypeWithinBrackets() throws SqlParseException {
+    String query = "SELECT insert_time FROM [Test Index] WHERE age > 3";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<From> fromList = select.getFrom();
+    Assert.assertEquals(1, fromList.size());
+    From from = fromList.get(0);
+    Assert.assertEquals("Test Index", from.getIndex());
+  }
+
+  @Test
+  public void fieldWithSpacesWithinBrackets() throws SqlParseException {
+    String query = "SELECT insert_time FROM name/type1 WHERE [first name] = 'Name'";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Where> where = select.getWhere().getWheres();
+    Assert.assertEquals(1, where.size());
+    Condition condition = (Condition) where.get(0);
+    Assert.assertEquals("first name", condition.getName());
+    Assert.assertEquals("Name", condition.getValue());
+  }
+
+  @Test
+  public void twoIndices() throws SqlParseException {
+    String query = "SELECT insert_time FROM index1, index2 WHERE age > 3";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<From> fromList = select.getFrom();
+    Assert.assertEquals(2, fromList.size());
+    From from1 = fromList.get(0);
+    From from2 = fromList.get(1);
+    boolean preservedOrder = from1.getIndex().equals("index1") && from2.getIndex().equals("index2");
+    boolean notPreservedOrder =
+        from1.getIndex().equals("index2") && from2.getIndex().equals("index1");
+    Assert.assertTrue(preservedOrder || notPreservedOrder);
+  }
+
+  @Test
+  public void fieldWithATcharAtWhere() throws SqlParseException {
+    String query = "SELECT * FROM index/type where @field = 6 ";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    LinkedList<Where> wheres = select.getWhere().getWheres();
+    Assert.assertEquals(1, wheres.size());
+    Condition condition = (Condition) wheres.get(0);
+    Assert.assertEquals("@field", condition.getName());
+  }
+
+  @Test
+  public void fieldWithATcharAtSelect() throws SqlParseException {
+    String query = "SELECT @field FROM index/type where field2 = 6 ";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Field> fields = select.getFields();
+    Assert.assertEquals(1, fields.size());
+    Field field = fields.get(0);
+    Assert.assertEquals(field.getName(), "@field");
+  }
+
+  @Test
+  public void fieldWithATcharAtSelectOnAgg() throws SqlParseException {
+    String query = "SELECT max(@field) FROM index/type where field2 = 6 ";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Field> fields = select.getFields();
+    Assert.assertEquals(1, fields.size());
+    Field field = fields.get(0);
+    Assert.assertEquals("MAX(@field)", field.toString());
+  }
+
+  @Test
+  public void fieldWithColonCharAtSelect() throws SqlParseException {
+    String query = "SELECT a:b FROM index/type where field2 = 6 ";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Field> fields = select.getFields();
+    Assert.assertEquals(1, fields.size());
+    Field field = fields.get(0);
+    Assert.assertEquals(field.getName(), "a:b");
+  }
+
+  @Test
+  public void fieldWithColonCharAtWhere() throws SqlParseException {
+    String query = "SELECT * FROM index/type where a:b = 6 ";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    LinkedList<Where> wheres = select.getWhere().getWheres();
+    Assert.assertEquals(1, wheres.size());
+    Condition condition = (Condition) wheres.get(0);
+    Assert.assertEquals("a:b", condition.getName());
+  }
+
+  @Test
+  public void fieldIsNull() throws SqlParseException {
+    String query = "SELECT * FROM index/type where a IS NOT NULL";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    LinkedList<Where> wheres = select.getWhere().getWheres();
+    Assert.assertEquals(1, wheres.size());
+    Condition condition = (Condition) wheres.get(0);
+    Assert.assertEquals("a", condition.getName());
+    Assert.assertNull(condition.getValue());
+  }
+
+  @Test
+  public void innerQueryTest() throws SqlParseException {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select * from %s/dog where holdersName "
+                + "IN (select firstname from %s/account where firstname = 'eliran')",
+            TEST_INDEX_DOG,
+            TestsConstants.TEST_INDEX_ACCOUNT);
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Assert.assertTrue(select.containsSubQueries());
+    Assert.assertEquals(1, select.getSubQueries().size());
+  }
+
+  @Test
+  public void inTermsSubQueryTest() throws SqlParseException {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select * from %s/dog where holdersName = IN_TERMS (select firstname from %s/account"
+                + " where firstname = 'eliran')",
+            TEST_INDEX_DOG,
+            TestsConstants.TEST_INDEX_ACCOUNT);
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Assert.assertTrue(select.containsSubQueries());
+    Assert.assertEquals(1, select.getSubQueries().size());
+  }
+
+  @Test
+  public void innerQueryTestTwoQueries() throws SqlParseException {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select * from %s/dog where holdersName IN "
+                + "(select firstname from %s/account where firstname = 'eliran') and "
+                + "age IN (select name.ofHisName from %s/gotCharacters) ",
+            TEST_INDEX_DOG,
+            TestsConstants.TEST_INDEX_ACCOUNT,
+            TEST_INDEX_GAME_OF_THRONES);
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Assert.assertTrue(select.containsSubQueries());
+    Assert.assertEquals(2, select.getSubQueries().size());
+  }
+
+  @Test
+  public void indexWithDotsAndHyphen() throws SqlParseException {
+    String query = "select * from data-2015.08.22";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Assert.assertEquals(1, select.getFrom().size());
+    Assert.assertEquals("data-2015.08.22", select.getFrom().get(0).getIndex());
+  }
+
+  @Test
+  public void indexNameWithDotAtTheStart() throws SqlParseException {
+    String query = "SELECT * FROM .opensearch_dashboards";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Assert.assertEquals(".opensearch_dashboards", select.getFrom().get(0).getIndex());
+  }
+
+  @Test
+  public void indexWithSemiColons() throws SqlParseException {
+    String query = "select * from some;index";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Assert.assertEquals(1, select.getFrom().size());
+    Assert.assertEquals("some;index", select.getFrom().get(0).getIndex());
+  }
+
+  @Test
+  public void scriptFiledPlusLiteralTest() throws SqlParseException {
+    String query = "SELECT field1 + 3 FROM index/type";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Field> fields = select.getFields();
+    Assert.assertEquals(1, fields.size());
+    Field field = fields.get(0);
+    Assert.assertTrue(field instanceof MethodField);
+    MethodField scriptMethod = (MethodField) field;
+    Assert.assertEquals("script", scriptMethod.getName().toLowerCase());
+    Assert.assertEquals(2, scriptMethod.getParams().size());
+    Assert.assertTrue(
+        scriptMethod.getParams().get(1).toString().contains("doc['field1'].value + 3"));
+  }
+
+  @Test
+  public void scriptFieldPlusFieldTest() throws SqlParseException {
+    String query = "SELECT field1 + field2 FROM index/type";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Field> fields = select.getFields();
+    Assert.assertEquals(1, fields.size());
+    Field field = fields.get(0);
+    Assert.assertTrue(field instanceof MethodField);
+    MethodField scriptMethod = (MethodField) field;
+    Assert.assertEquals("script", scriptMethod.getName().toLowerCase());
+    Assert.assertEquals(2, scriptMethod.getParams().size());
+    Assert.assertTrue(
+        scriptMethod
+            .getParams()
+            .get(1)
+            .toString()
+            .contains("doc['field1'].value + doc['field2'].value"));
+  }
+
+  @Test
+  public void scriptLiteralPlusLiteralTest() throws SqlParseException {
+    String query = "SELECT 1 + 2  FROM index/type";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Field> fields = select.getFields();
+    Assert.assertEquals(1, fields.size());
+    Field field = fields.get(0);
+    Assert.assertTrue(field instanceof MethodField);
+    MethodField scriptMethod = (MethodField) field;
+    Assert.assertEquals("script", scriptMethod.getName().toLowerCase());
+    Assert.assertEquals(2, scriptMethod.getParams().size());
+    Assert.assertTrue(scriptMethod.getParams().get(1).toString().contains("1 + 2"));
+  }
+
+  @Test
+  public void explicitScriptOnAggregation() throws SqlParseException {
+    String query =
+        "SELECT avg( script('add','doc[\\'field1\\'].value + doc[\\'field2\\'].value') )"
+            + " FROM index/type";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Field> fields = select.getFields();
+    Assert.assertEquals(1, fields.size());
+    Field field = fields.get(0);
+    Assert.assertTrue(field instanceof MethodField);
+    MethodField avgMethodField = (MethodField) field;
+    Assert.assertEquals("avg", avgMethodField.getName().toLowerCase());
+    Assert.assertEquals(1, avgMethodField.getParams().size());
+    MethodField scriptMethod = (MethodField) avgMethodField.getParams().get(0).value;
+    Assert.assertEquals("script", scriptMethod.getName().toLowerCase());
+    Assert.assertEquals(2, scriptMethod.getParams().size());
+    Assert.assertEquals(
+        "doc['field1'].value + doc['field2'].value", scriptMethod.getParams().get(1).toString());
+  }
+
+  @Test
+  public void implicitScriptOnAggregation() throws SqlParseException {
+    String query = "SELECT avg(field(field1) + field(field2)) FROM index/type";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Field> fields = select.getFields();
+    Assert.assertEquals(1, fields.size());
+    Field field = fields.get(0);
+    Assert.assertTrue(field instanceof MethodField);
+    MethodField avgMethodField = (MethodField) field;
+    Assert.assertEquals("avg", avgMethodField.getName().toLowerCase());
+    Assert.assertEquals(1, avgMethodField.getParams().size());
+    Assert.assertTrue(
+        avgMethodField.getParams().get(0).value.toString().contains("doc['field1'].value"));
+    Assert.assertTrue(
+        avgMethodField.getParams().get(0).value.toString().contains("doc['field2'].value"));
+  }
+
+  @Test
+  public void nestedFieldOnWhereNoPathSimpleField() throws SqlParseException {
+    String query = "select * from myIndex where nested(message.name) = 'hey'";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Where where = select.getWhere().getWheres().get(0);
+    Assert.assertTrue("where should be condition", where instanceof Condition);
+    Condition condition = (Condition) where;
+    Assert.assertTrue("condition should be nested", condition.isNested());
+    Assert.assertEquals("message", condition.getNestedPath());
+    Assert.assertEquals("message.name", condition.getName());
+  }
+
+  @Test
+  public void nestedFieldOnWhereNoPathComplexField() throws SqlParseException {
+    String query = "select * from myIndex where nested(message.moreNested.name) = 'hey'";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Where where = select.getWhere().getWheres().get(0);
+    Assert.assertTrue("where should be condition", where instanceof Condition);
+    Condition condition = (Condition) where;
+    Assert.assertTrue("condition should be nested", condition.isNested());
+    Assert.assertEquals("message.moreNested", condition.getNestedPath());
+    Assert.assertEquals("message.moreNested.name", condition.getName());
+  }
+
+  @Test
+  public void aggFieldWithAliasTableAliasShouldBeRemoved() throws SqlParseException {
+    String query = "select count(t.*) as counts,sum(t.size) from xxx/locs as t group by t.kk";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Field> fields = select.getFields();
+    Assert.assertThat(fields.size(), equalTo(2));
+    Assert.assertEquals("COUNT(*)", fields.get(0).toString());
+    Assert.assertEquals("SUM(size)", fields.get(1).toString());
+    List<List<Field>> groups = select.getGroupBys();
+    Assert.assertThat(groups.size(), equalTo(1));
+    Assert.assertThat(groups.get(0).size(), equalTo(1));
+    Assert.assertEquals("kk", groups.get(0).get(0).getName());
+  }
+
+  @Test
+  public void nestedFieldOnWhereGivenPath() throws SqlParseException {
+    String query = "select * from myIndex where nested(message.name,message) = 'hey'";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Where where = select.getWhere().getWheres().get(0);
+    Assert.assertTrue("where should be condition", where instanceof Condition);
+    Condition condition = (Condition) where;
+    Assert.assertTrue("condition should be nested", condition.isNested());
+    Assert.assertEquals("message", condition.getNestedPath());
+    Assert.assertEquals("message.name", condition.getName());
+  }
+
+  @Test
+  public void nestedFieldOnGroupByNoPath() throws SqlParseException {
+    String query = "select * from myIndex group by nested(message.name)";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Field field = select.getGroupBys().get(0).get(0);
+    Assert.assertTrue("condition should be nested", field.isNested());
+    Assert.assertEquals("message", field.getNestedPath());
+    Assert.assertEquals("message.name", field.getName());
+  }
+
+  @Test
+  public void nestedFieldOnGroupByWithPath() throws SqlParseException {
+    String query = "select * from myIndex group by nested(message.name,message)";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Field field = select.getGroupBys().get(0).get(0);
+    Assert.assertTrue("condition should be nested", field.isNested());
+    Assert.assertEquals("message", field.getNestedPath());
+    Assert.assertEquals("message.name", field.getName());
+  }
+
+  @Test
+  public void filterAggTestNoAlias() throws SqlParseException {
+    String query = "select * from myIndex group by a , filter(  a > 3 AND b='3' )";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<List<Field>> groupBys = select.getGroupBys();
+    Assert.assertEquals(1, groupBys.size());
+    Field aAgg = groupBys.get(0).get(0);
+    Assert.assertEquals("a", aAgg.getName());
+    Field field = groupBys.get(0).get(1);
+    Assert.assertTrue("filter field should be method field", field instanceof MethodField);
+    MethodField filterAgg = (MethodField) field;
+    Assert.assertEquals("filter", filterAgg.getName());
+    Map<String, Object> params = filterAgg.getParamsAsMap();
+    Assert.assertEquals(2, params.size());
+    Object alias = params.get("alias");
+    Assert.assertEquals("filter(a > 3 AND b = '3')@FILTER", alias);
+
+    Assert.assertTrue(params.get("where") instanceof Where);
+    Where where = (Where) params.get("where");
+    Assert.assertEquals(2, where.getWheres().size());
+  }
+
+  @Test
+  public void filterAggTestWithAlias() throws SqlParseException {
+    String query = "select * from myIndex group by a , filter(myFilter, a > 3 AND b='3' )";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<List<Field>> groupBys = select.getGroupBys();
+    Assert.assertEquals(1, groupBys.size());
+    Field aAgg = groupBys.get(0).get(0);
+    Assert.assertEquals("a", aAgg.getName());
+    Field field = groupBys.get(0).get(1);
+    Assert.assertTrue("filter field should be method field", field instanceof MethodField);
+    MethodField filterAgg = (MethodField) field;
+    Assert.assertEquals("filter", filterAgg.getName());
+    Map<String, Object> params = filterAgg.getParamsAsMap();
+    Assert.assertEquals(2, params.size());
+    Object alias = params.get("alias");
+    Assert.assertEquals("myFilter@FILTER", alias);
+
+    Assert.assertTrue(params.get("where") instanceof Where);
+    Where where = (Where) params.get("where");
+    Assert.assertEquals(2, where.getWheres().size());
+  }
+
+  @Test
+  public void filterAggTestWithAliasAsString() throws SqlParseException {
+    String query = "select * from myIndex group by a , filter('my filter', a > 3 AND b='3' )";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<List<Field>> groupBys = select.getGroupBys();
+    Assert.assertEquals(1, groupBys.size());
+    Field aAgg = groupBys.get(0).get(0);
+    Assert.assertEquals("a", aAgg.getName());
+    Field field = groupBys.get(0).get(1);
+    Assert.assertTrue("filter field should be method field", field instanceof MethodField);
+    MethodField filterAgg = (MethodField) field;
+    Assert.assertEquals("filter", filterAgg.getName());
+    Map<String, Object> params = filterAgg.getParamsAsMap();
+    Assert.assertEquals(2, params.size());
+    Object alias = params.get("alias");
+    Assert.assertEquals("my filter@FILTER", alias);
+
+    Assert.assertTrue(params.get("where") instanceof Where);
+    Where where = (Where) params.get("where");
+    Assert.assertEquals(2, where.getWheres().size());
+  }
+
+  @Test
+  public void doubleOrderByTest() throws SqlParseException {
+    String query = "select * from indexName order by a asc, b desc";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Order> orderBys = select.getOrderBys();
+    Assert.assertEquals(2, orderBys.size());
+    Assert.assertEquals("a", orderBys.get(0).getName());
+    Assert.assertEquals("ASC", orderBys.get(0).getType());
+
+    Assert.assertEquals("b", orderBys.get(1).getName());
+    Assert.assertEquals("DESC", orderBys.get(1).getType());
+  }
+
+  @Test
+  public void parseJoinWithOneTableOrderByAttachToCorrectTable() throws SqlParseException {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select c.name.firstname , d.words from %s/gotCharacters c "
+                + "JOIN %s/gotCharacters d on d.name = c.house "
+                + "order by c.name.firstname",
+            TEST_INDEX_GAME_OF_THRONES,
+            TEST_INDEX_GAME_OF_THRONES);
+
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+    Assert.assertTrue("first table should be ordered", joinSelect.getFirstTable().isOrderdSelect());
+    Assert.assertFalse(
+        "second table should not be ordered", joinSelect.getSecondTable().isOrderdSelect());
+  }
+
+  @Test
+  public void parseJoinWithOneTableOrderByRemoveAlias() throws SqlParseException {
+    String query =
+        String.format(
+            Locale.ROOT,
+            "select c.name.firstname , d.words from %s/gotCharacters c "
+                + "JOIN %s/gotCharacters d on d.name = c.house "
+                + "order by c.name.firstname",
+            TEST_INDEX_GAME_OF_THRONES,
+            TEST_INDEX_GAME_OF_THRONES);
+
+    JoinSelect joinSelect = parser.parseJoinSelect((SQLQueryExpr) queryToExpr(query));
+    List<Order> orderBys = joinSelect.getFirstTable().getOrderBys();
+    Assert.assertEquals(1, orderBys.size());
+    Order order = orderBys.get(0);
+    Assert.assertEquals("name.firstname", order.getName());
+  }
+
+  @Test
+  public void termsWithStringTest() throws SqlParseException {
+    String query = "select * from x where y = IN_TERMS('a','b')";
+    Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+    Condition condition = (Condition) select.getWhere().getWheres().get(0);
+    Object[] values = (Object[]) condition.getValue();
+    Assert.assertEquals("a", values[0]);
+    Assert.assertEquals("b", values[1]);
+  }
+
+  @Test
+  public void termWithStringTest() throws SqlParseException {
+    String query = "select * from x where y = TERM('a')";
+    Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+    Condition condition = (Condition) select.getWhere().getWheres().get(0);
+    Object[] values = (Object[]) condition.getValue();
+    Assert.assertEquals("a", values[0]);
+  }
+
+  @Test
+  public void complexNestedTest() throws SqlParseException {
+    String query = "select * from x where nested('y',y.b = 'a' and y.c  = 'd') ";
+    Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+    Condition condition = (Condition) select.getWhere().getWheres().get(0);
+    Assert.assertEquals(Condition.OPERATOR.NESTED_COMPLEX, condition.getOPERATOR());
+    Assert.assertEquals("y", condition.getName());
+    Assert.assertTrue(condition.getValue() instanceof Where);
+    Where where = (Where) condition.getValue();
+    Assert.assertEquals(2, where.getWheres().size());
+  }
+
+  @Test
+  public void scriptOnFilterNoParams() throws SqlParseException {
+    String query = "select * from x where script('doc[\\'field\\'].date.hourOfDay == 3') ";
+    Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+    Condition condition = (Condition) select.getWhere().getWheres().get(0);
+    Assert.assertEquals(Condition.OPERATOR.SCRIPT, condition.getOPERATOR());
+    Assert.assertNull(condition.getName());
+    Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
+    ScriptFilter scriptFilter = (ScriptFilter) condition.getValue();
+    Assert.assertEquals("doc['field'].date.hourOfDay == 3", scriptFilter.getScript());
+    Assert.assertFalse(scriptFilter.containsParameters());
+  }
+
+  @Test
+  public void scriptOnFilterWithParams() throws SqlParseException {
+    String query = "select * from x where script('doc[\\'field\\'].date.hourOfDay == x','x'=3) ";
+    Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+    Condition condition = (Condition) select.getWhere().getWheres().get(0);
+    Assert.assertEquals(Condition.OPERATOR.SCRIPT, condition.getOPERATOR());
+    Assert.assertNull(condition.getName());
+    Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
+    ScriptFilter scriptFilter = (ScriptFilter) condition.getValue();
+    Assert.assertEquals("doc['field'].date.hourOfDay == x", scriptFilter.getScript());
+    Assert.assertTrue(scriptFilter.containsParameters());
+    Map<String, Object> args = scriptFilter.getArgs();
+    Assert.assertEquals(1, args.size());
+    Assert.assertTrue(args.containsKey("x"));
+    Assert.assertEquals(3, args.get("x"));
+  }
+
+  @Test
+  public void fieldsAsNumbersOnWhere() throws SqlParseException {
+    String query = "select * from x where ['3'] > 2";
+    Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+    LinkedList<Where> wheres = select.getWhere().getWheres();
+    Assert.assertEquals(1, wheres.size());
+    Where where = wheres.get(0);
+    Assert.assertEquals(Condition.class, where.getClass());
+    Condition condition = (Condition) where;
+    Assert.assertEquals("3", condition.getName());
+  }
+
+  @Test
+  public void likeTestWithEscaped() throws SqlParseException {
+    String query = "select * from x where name like '&UNDERSCOREhey_%&PERCENT'";
+    Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+    BoolQueryBuilder explan = QueryMaker.explain(select.getWhere());
+    String filterAsString = explan.toString();
+    Assert.assertTrue(filterAsString.contains("_hey?*%"));
+  }
+
+  @Test
+  public void complexNestedAndOtherQuery() throws SqlParseException {
+    String query = "select * from x where nested('path',path.x=3) and y=3";
+    Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+    LinkedList<Where> wheres = select.getWhere().getWheres();
+    Assert.assertEquals(2, wheres.size());
+    Assert.assertEquals(
+        "AND path NESTED_COMPLEX AND ( AND path.x EQ 3 ) ", wheres.get(0).toString());
+    Assert.assertEquals("AND y EQ 3", wheres.get(1).toString());
+  }
+
+  @Test
+  public void numberEqualConditionWithoutProperty() throws SqlParseException {
+    SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where 1 = 1");
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Where> wheres = select.getWhere().getWheres();
+    Assert.assertThat(wheres.size(), equalTo(1));
+    Condition condition = (Condition) wheres.get(0);
+    Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
+    ScriptFilter sf = (ScriptFilter) condition.getValue();
+    Assert.assertEquals(sf.getScript(), "1 == 1");
+  }
+
+  @Test
+  public void numberGreatConditionWithoutProperty() throws SqlParseException {
+    SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where 1 > 1");
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Where> wheres = select.getWhere().getWheres();
+    Assert.assertThat(wheres.size(), equalTo(1));
+    Condition condition = (Condition) wheres.get(0);
+    Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
+    ScriptFilter sf = (ScriptFilter) condition.getValue();
+    Assert.assertEquals(sf.getScript(), "1 > 1");
+  }
+
+  @Test
+  public void stringEqualConditionWithoutProperty() throws SqlParseException {
+    SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where 'a' = 'b'");
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Where> wheres = select.getWhere().getWheres();
+    Assert.assertThat(wheres.size(), equalTo(1));
+    Condition condition = (Condition) wheres.get(0);
+    Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
+    ScriptFilter sf = (ScriptFilter) condition.getValue();
+    Assert.assertEquals(sf.getScript(), "'a' == 'b'");
+  }
+
+  @Test
+  public void propertyEqualCondition() throws SqlParseException {
+    SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where a = b");
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Where> wheres = select.getWhere().getWheres();
+    Assert.assertThat(wheres.size(), equalTo(1));
+    Condition condition = (Condition) wheres.get(0);
+    Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
+    ScriptFilter sf = (ScriptFilter) condition.getValue();
+    Assert.assertEquals(sf.getScript(), "doc['a'].value == doc['b'].value");
+  }
+
+  @Test
+  public void propertyWithTableAliasEqualCondition() throws SqlParseException {
+    SQLExpr sqlExpr = queryToExpr("select t.* from xxx/locs where t.a = t.b");
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Where> wheres = select.getWhere().getWheres();
+    Assert.assertThat(wheres.size(), equalTo(1));
+    Condition condition = (Condition) wheres.get(0);
+    Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
+    ScriptFilter sf = (ScriptFilter) condition.getValue();
+    Assert.assertEquals(sf.getScript(), "doc['a'].value == doc['b'].value");
+  }
+
+  @Test
+  public void propertyGreatCondition() throws SqlParseException {
+    SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where a > b");
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Where> wheres = select.getWhere().getWheres();
+    Assert.assertThat(wheres.size(), equalTo(1));
+    Condition condition = (Condition) wheres.get(0);
+    Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
+    ScriptFilter sf = (ScriptFilter) condition.getValue();
+    Assert.assertEquals(sf.getScript(), "doc['a'].value > doc['b'].value");
+  }
+
+  @Test
+  public void stringAndNumberEqualConditionWithoutProperty() throws SqlParseException {
+    SQLExpr sqlExpr = queryToExpr("select * from xxx/locs where 'a' = 1");
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    List<Where> wheres = select.getWhere().getWheres();
+    Assert.assertThat(wheres.size(), equalTo(1));
+    Condition condition = (Condition) wheres.get(0);
+    Assert.assertTrue(condition.getValue() instanceof ScriptFilter);
+    ScriptFilter sf = (ScriptFilter) condition.getValue();
+    Assert.assertEquals(sf.getScript(), "'a' == 1");
+  }
+
+  @Test
+  public void caseWhenTest() throws SqlParseException {
+    String query =
+        "Select k,\n"
+            + "Case \n"
+            + "When floor(testBase)>=90 then 'A'\n"
+            + "When testBase = '80' then 'B'\n"
+            + "Else 'E' end as testBaseLevel\n"
+            + "from t";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    for (Field field : select.getFields()) {
+      if (field instanceof MethodField) {
+        MethodField methodField = (MethodField) field;
         String alias = (String) methodField.getParams().get(0).value;
         String scriptCode = (String) methodField.getParams().get(1).value;
-        Assert.assertEquals("cast_age",alias);
-        Assert.assertTrue(scriptCode.contains("doc['age'].value"));
-        Assert.assertTrue(scriptCode.contains("Double.parseDouble(doc['age'].value.toString()).intValue()"));
-    }
+        Assert.assertEquals(alias, "testBaseLevel");
+        Matcher docValue = Pattern.compile("doc\\['testBase'].value").matcher(scriptCode);
+        Matcher number = Pattern.compile(" (\\s+90) | (\\s+'80')").matcher(scriptCode);
 
-    @Test
-    public void castToLongTest() throws Exception {
-        String query = "select cast(insert_time as long) from "+ TestsConstants.TEST_INDEX_ACCOUNT + " limit 10";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Field castField = select.getFields().get(0);
-        Assert.assertTrue(castField instanceof MethodField);
+        AtomicInteger docValueCounter = new AtomicInteger();
 
-        MethodField methodField = (MethodField) castField;
-        Assert.assertEquals("script",castField.getName());
-
-        String alias = (String) methodField.getParams().get(0).value;
-        String scriptCode = (String) methodField.getParams().get(1).value;
-        Assert.assertEquals("cast_insert_time",alias);
-        Assert.assertTrue(scriptCode.contains("doc['insert_time'].value"));
-        Assert.assertTrue(scriptCode.contains("Double.parseDouble(doc['insert_time'].value.toString()).longValue()"));
-    }
-
-    @Test
-    public void castToFloatTest() throws Exception {
-        String query = "select cast(age as float) from "+ TestsConstants.TEST_INDEX_ACCOUNT + " limit 10";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Field castField = select.getFields().get(0);
-        Assert.assertTrue(castField instanceof MethodField);
-
-        MethodField methodField = (MethodField) castField;
-        Assert.assertEquals("script",castField.getName());
-
-        String alias = (String) methodField.getParams().get(0).value;
-        String scriptCode = (String) methodField.getParams().get(1).value;
-        Assert.assertEquals("cast_age",alias);
-        Assert.assertTrue(scriptCode.contains("doc['age'].value"));
-        Assert.assertTrue(scriptCode.contains("Double.parseDouble(doc['age'].value.toString()).floatValue()"));
-    }
-
-    @Test
-    public void castToDoubleTest() throws Exception {
-        String query = "select cast(age as double) from "+ TestsConstants.TEST_INDEX_ACCOUNT + "/account limit 10";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Field castField = select.getFields().get(0);
-        Assert.assertTrue(castField instanceof MethodField);
-
-        MethodField methodField = (MethodField) castField;
-        Assert.assertEquals("script",castField.getName());
+        while (docValue.find()) {
+          docValueCounter.incrementAndGet();
+        }
 
+        Assert.assertThat(docValueCounter.get(), equalTo(2));
+        Assert.assertThat(number.groupCount(), equalTo(2));
+      }
+    }
+  }
+
+  @Test
+  public void caseWhenTestWithFieldElseExpr() throws SqlParseException {
+    String query =
+        "Select k,\n"
+            + "Case \n"
+            + "When floor(testBase)>=90 then 'A'\n"
+            + "When testBase = '80' then 'B'\n"
+            + "Else testBase end as testBaseLevel\n"
+            + "from t";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    for (Field field : select.getFields()) {
+      if (field instanceof MethodField) {
+        MethodField methodField = (MethodField) field;
         String alias = (String) methodField.getParams().get(0).value;
         String scriptCode = (String) methodField.getParams().get(1).value;
-        Assert.assertEquals("cast_age",alias);
-        Assert.assertTrue(scriptCode.contains("doc['age'].value"));
-        Assert.assertTrue(scriptCode.contains("Double.parseDouble(doc['age'].value.toString()).doubleValue()"));
-    }
-
-    @Test
-    public void castToStringTest() throws Exception {
-        String query = "select cast(age as string) from "+ TestsConstants.TEST_INDEX_ACCOUNT + "/account limit 10";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Field castField = select.getFields().get(0);
-        Assert.assertTrue(castField instanceof MethodField);
-
-        MethodField methodField = (MethodField) castField;
-        Assert.assertEquals("script",castField.getName());
+        Assert.assertEquals(alias, "testBaseLevel");
+        Matcher docValue = Pattern.compile("doc\\['testBase'].value").matcher(scriptCode);
+        Matcher number = Pattern.compile(" (\\s+90) | (\\s+'80')").matcher(scriptCode);
 
-        String alias = (String) methodField.getParams().get(0).value;
-        String scriptCode = (String) methodField.getParams().get(1).value;
-        Assert.assertEquals("cast_age",alias);
-        Assert.assertTrue(scriptCode.contains("doc['age'].value.toString()"));
-    }
+        AtomicInteger docValueCounter = new AtomicInteger();
 
-    @Test
-    public void castToDateTimeTest() throws Exception {
-        String query = "select cast(age as datetime) from "+ TestsConstants.TEST_INDEX_ACCOUNT + "/account limit 10";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Field castField = select.getFields().get(0);
-        Assert.assertTrue(castField instanceof MethodField);
-
-        MethodField methodField = (MethodField) castField;
-        Assert.assertEquals("script",castField.getName());
+        while (docValue.find()) {
+          docValueCounter.incrementAndGet();
+        }
 
+        Assert.assertThat(docValueCounter.get(), equalTo(3));
+        Assert.assertThat(number.groupCount(), equalTo(2));
+      }
+    }
+  }
+
+  @Test
+  public void caseWhenTestWithouhtElseExpr() throws SqlParseException {
+    String query =
+        "Select k,\n"
+            + "Case \n"
+            + "When floor(testBase)>=90 then 'A'\n"
+            + "When testBase = '80' then 'B'\n"
+            + "end as testBaseLevel\n"
+            + "from t";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    for (Field field : select.getFields()) {
+      if (field instanceof MethodField) {
+        MethodField methodField = (MethodField) field;
         String alias = (String) methodField.getParams().get(0).value;
         String scriptCode = (String) methodField.getParams().get(1).value;
-        Assert.assertEquals("cast_age",alias);
-        Assert.assertTrue(scriptCode.contains("doc['age'].value"));
-        Assert.assertTrue(scriptCode.contains("DateTimeFormatter.ofPattern(\"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'\").format("
-                + "DateTimeFormatter.ISO_DATE_TIME.parse(doc['age'].value.toString()))"));
-    }
+        Assert.assertEquals(alias, "testBaseLevel");
 
-    @Test
-    public void castToDoubleThenDivideTest() throws Exception {
-        String query = "select cast(age as double)/2 from "+ TestsConstants.TEST_INDEX_ACCOUNT + "/account limit 10";
-        SQLExpr sqlExpr = queryToExpr(query);
-        Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
-        Field castField = select.getFields().get(0);
-        Assert.assertTrue(castField instanceof MethodField);
-
-        MethodField methodField = (MethodField) castField;
-        Assert.assertEquals("script",castField.getName());
-
-        String scriptCode = (String) methodField.getParams().get(1).value;
-        Assert.assertTrue(scriptCode.contains("doc['age'].value"));
-        Assert.assertTrue(scriptCode.contains("Double.parseDouble(doc['age'].value.toString()).doubleValue()"));
-        Assert.assertTrue(scriptCode.contains("/ 2"));
-    }
+        Matcher docValue = Pattern.compile("\\{\\s+null\\s+}").matcher(scriptCode);
 
+        AtomicInteger docValueCounter = new AtomicInteger();
 
-    @Test
-    public void multiSelectMinusOperationCheckIndices() throws SqlParseException {
-        String query = "select pk from firstIndex minus  select pk from secondIndex ";
-        MultiQuerySelect select = parser.parseMultiSelect((SQLUnionQuery)
-                ((SQLQueryExpr) queryToExpr(query)).getSubQuery().getQuery());
-        Assert.assertEquals("firstIndex",select.getFirstSelect().getFrom().get(0).getIndex());
-        Assert.assertEquals("secondIndex",select.getSecondSelect().getFrom().get(0).getIndex());
-        Assert.assertEquals(SQLUnionOperator.MINUS,select.getOperation());
-    }
-
-    @Test
-    public void multiSelectMinusWithAliasCheckAliases() throws SqlParseException {
-        String query = "select pk as myId from firstIndex minus  select myId from secondIndex ";
-        MultiQuerySelect select = parser.parseMultiSelect((com.alibaba.druid.sql.ast.statement.SQLUnionQuery)
-                ((SQLQueryExpr) queryToExpr(query)).getSubQuery().getQuery());
-        Assert.assertEquals("myId",select.getFirstSelect().getFields().get(0).getAlias());
-        Assert.assertEquals("myId",select.getSecondSelect().getFields().get(0).getName());
-        Assert.assertEquals(SQLUnionOperator.MINUS,select.getOperation());
-    }
-    @Test
-    public void multiSelectMinusTestMinusHints() throws SqlParseException {
-        String query = "select /*! MINUS_SCROLL_FETCH_AND_RESULT_LIMITS(1000,50,100)*/ " +
-                "/*! MINUS_USE_TERMS_OPTIMIZATION(true)*/ pk from firstIndex minus  select pk from secondIndex ";
-        MultiQuerySelect select = parser.parseMultiSelect((SQLUnionQuery)
-                ((SQLQueryExpr) queryToExpr(query)).getSubQuery().getQuery());
-        List<Hint> hints = select.getFirstSelect().getHints();
-        Assert.assertEquals(2,hints.size());
-        for(Hint hint : hints) {
-            if (hint.getType() == HintType.MINUS_FETCH_AND_RESULT_LIMITS) {
-                Object[] params = hint.getParams();
-                Assert.assertEquals(1000,params[0]);
-                Assert.assertEquals(50,params[1]);
-                Assert.assertEquals(100,params[2]);
-            }
-            if(hint.getType() == HintType.MINUS_USE_TERMS_OPTIMIZATION){
-                Assert.assertEquals(true,hint.getParams()[0]);
-            }
+        while (docValue.find()) {
+          docValueCounter.incrementAndGet();
         }
-    }
 
-    @Test
-    public void multiSelectMinusScrollCheckDefaultsAllDefaults() throws SqlParseException {
-        String query = "select /*! MINUS_SCROLL_FETCH_AND_RESULT_LIMITS*/ pk from firstIndex " +
-                "minus  select pk from secondIndex ";
-        MultiQuerySelect select = parser.parseMultiSelect((com.alibaba.druid.sql.ast.statement.SQLUnionQuery)
+        Assert.assertThat(docValueCounter.get(), equalTo(1));
+      }
+    }
+  }
+
+  @Test
+  public void caseWhenSwitchTest() {
+    String query =
+        "SELECT CASE weather "
+            + "WHEN 'Sunny' THEN '0' "
+            + "WHEN 'Rainy' THEN '1' "
+            + "ELSE 'NA' END AS case "
+            + "FROM t";
+    ScriptField scriptField = CheckScriptContents.getScriptFieldFromQuery(query);
+    Assert.assertTrue(
+        CheckScriptContents.scriptContainsString(scriptField, "doc['weather'].value=='Sunny'"));
+  }
+
+  @Test
+  public void castToIntTest() throws Exception {
+    String query =
+        "select cast(age as int) from " + TestsConstants.TEST_INDEX_ACCOUNT + "/account limit 10";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Field castField = select.getFields().get(0);
+    Assert.assertTrue(castField instanceof MethodField);
+
+    MethodField methodField = (MethodField) castField;
+    Assert.assertEquals("script", castField.getName());
+
+    String alias = (String) methodField.getParams().get(0).value;
+    String scriptCode = (String) methodField.getParams().get(1).value;
+    Assert.assertEquals("cast_age", alias);
+    Assert.assertTrue(scriptCode.contains("doc['age'].value"));
+    Assert.assertTrue(
+        scriptCode.contains("Double.parseDouble(doc['age'].value.toString()).intValue()"));
+  }
+
+  @Test
+  public void castToLongTest() throws Exception {
+    String query =
+        "select cast(insert_time as long) from " + TestsConstants.TEST_INDEX_ACCOUNT + " limit 10";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Field castField = select.getFields().get(0);
+    Assert.assertTrue(castField instanceof MethodField);
+
+    MethodField methodField = (MethodField) castField;
+    Assert.assertEquals("script", castField.getName());
+
+    String alias = (String) methodField.getParams().get(0).value;
+    String scriptCode = (String) methodField.getParams().get(1).value;
+    Assert.assertEquals("cast_insert_time", alias);
+    Assert.assertTrue(scriptCode.contains("doc['insert_time'].value"));
+    Assert.assertTrue(
+        scriptCode.contains("Double.parseDouble(doc['insert_time'].value.toString()).longValue()"));
+  }
+
+  @Test
+  public void castToFloatTest() throws Exception {
+    String query =
+        "select cast(age as float) from " + TestsConstants.TEST_INDEX_ACCOUNT + " limit 10";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Field castField = select.getFields().get(0);
+    Assert.assertTrue(castField instanceof MethodField);
+
+    MethodField methodField = (MethodField) castField;
+    Assert.assertEquals("script", castField.getName());
+
+    String alias = (String) methodField.getParams().get(0).value;
+    String scriptCode = (String) methodField.getParams().get(1).value;
+    Assert.assertEquals("cast_age", alias);
+    Assert.assertTrue(scriptCode.contains("doc['age'].value"));
+    Assert.assertTrue(
+        scriptCode.contains("Double.parseDouble(doc['age'].value.toString()).floatValue()"));
+  }
+
+  @Test
+  public void castToDoubleTest() throws Exception {
+    String query =
+        "select cast(age as double) from "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + "/account limit 10";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Field castField = select.getFields().get(0);
+    Assert.assertTrue(castField instanceof MethodField);
+
+    MethodField methodField = (MethodField) castField;
+    Assert.assertEquals("script", castField.getName());
+
+    String alias = (String) methodField.getParams().get(0).value;
+    String scriptCode = (String) methodField.getParams().get(1).value;
+    Assert.assertEquals("cast_age", alias);
+    Assert.assertTrue(scriptCode.contains("doc['age'].value"));
+    Assert.assertTrue(
+        scriptCode.contains("Double.parseDouble(doc['age'].value.toString()).doubleValue()"));
+  }
+
+  @Test
+  public void castToStringTest() throws Exception {
+    String query =
+        "select cast(age as string) from "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + "/account limit 10";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Field castField = select.getFields().get(0);
+    Assert.assertTrue(castField instanceof MethodField);
+
+    MethodField methodField = (MethodField) castField;
+    Assert.assertEquals("script", castField.getName());
+
+    String alias = (String) methodField.getParams().get(0).value;
+    String scriptCode = (String) methodField.getParams().get(1).value;
+    Assert.assertEquals("cast_age", alias);
+    Assert.assertTrue(scriptCode.contains("doc['age'].value.toString()"));
+  }
+
+  @Test
+  public void castToDateTimeTest() throws Exception {
+    String query =
+        "select cast(age as datetime) from "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + "/account limit 10";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Field castField = select.getFields().get(0);
+    Assert.assertTrue(castField instanceof MethodField);
+
+    MethodField methodField = (MethodField) castField;
+    Assert.assertEquals("script", castField.getName());
+
+    String alias = (String) methodField.getParams().get(0).value;
+    String scriptCode = (String) methodField.getParams().get(1).value;
+    Assert.assertEquals("cast_age", alias);
+    Assert.assertTrue(scriptCode.contains("doc['age'].value"));
+    Assert.assertTrue(
+        scriptCode.contains(
+            "DateTimeFormatter.ofPattern(\"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'\").format("
+                + "DateTimeFormatter.ISO_DATE_TIME.parse(doc['age'].value.toString()))"));
+  }
+
+  @Test
+  public void castToDoubleThenDivideTest() throws Exception {
+    String query =
+        "select cast(age as double)/2 from "
+            + TestsConstants.TEST_INDEX_ACCOUNT
+            + "/account limit 10";
+    SQLExpr sqlExpr = queryToExpr(query);
+    Select select = parser.parseSelect((SQLQueryExpr) sqlExpr);
+    Field castField = select.getFields().get(0);
+    Assert.assertTrue(castField instanceof MethodField);
+
+    MethodField methodField = (MethodField) castField;
+    Assert.assertEquals("script", castField.getName());
+
+    String scriptCode = (String) methodField.getParams().get(1).value;
+    Assert.assertTrue(scriptCode.contains("doc['age'].value"));
+    Assert.assertTrue(
+        scriptCode.contains("Double.parseDouble(doc['age'].value.toString()).doubleValue()"));
+    Assert.assertTrue(scriptCode.contains("/ 2"));
+  }
+
+  @Test
+  public void multiSelectMinusOperationCheckIndices() throws SqlParseException {
+    String query = "select pk from firstIndex minus  select pk from secondIndex ";
+    MultiQuerySelect select =
+        parser.parseMultiSelect(
+            (SQLUnionQuery) ((SQLQueryExpr) queryToExpr(query)).getSubQuery().getQuery());
+    Assert.assertEquals("firstIndex", select.getFirstSelect().getFrom().get(0).getIndex());
+    Assert.assertEquals("secondIndex", select.getSecondSelect().getFrom().get(0).getIndex());
+    Assert.assertEquals(SQLUnionOperator.MINUS, select.getOperation());
+  }
+
+  @Test
+  public void multiSelectMinusWithAliasCheckAliases() throws SqlParseException {
+    String query = "select pk as myId from firstIndex minus  select myId from secondIndex ";
+    MultiQuerySelect select =
+        parser.parseMultiSelect(
+            (com.alibaba.druid.sql.ast.statement.SQLUnionQuery)
                 ((SQLQueryExpr) queryToExpr(query)).getSubQuery().getQuery());
-        List<Hint> hints = select.getFirstSelect().getHints();
-        Assert.assertEquals(1, hints.size());
-        Hint hint = hints.get(0);
-        Assert.assertEquals(HintType.MINUS_FETCH_AND_RESULT_LIMITS,hint.getType());
+    Assert.assertEquals("myId", select.getFirstSelect().getFields().get(0).getAlias());
+    Assert.assertEquals("myId", select.getSecondSelect().getFields().get(0).getName());
+    Assert.assertEquals(SQLUnionOperator.MINUS, select.getOperation());
+  }
+
+  @Test
+  public void multiSelectMinusTestMinusHints() throws SqlParseException {
+    String query =
+        "select /*! MINUS_SCROLL_FETCH_AND_RESULT_LIMITS(1000,50,100)*/ /*!"
+            + " MINUS_USE_TERMS_OPTIMIZATION(true)*/ pk from firstIndex minus  select pk from"
+            + " secondIndex ";
+    MultiQuerySelect select =
+        parser.parseMultiSelect(
+            (SQLUnionQuery) ((SQLQueryExpr) queryToExpr(query)).getSubQuery().getQuery());
+    List<Hint> hints = select.getFirstSelect().getHints();
+    Assert.assertEquals(2, hints.size());
+    for (Hint hint : hints) {
+      if (hint.getType() == HintType.MINUS_FETCH_AND_RESULT_LIMITS) {
         Object[] params = hint.getParams();
-        Assert.assertEquals(100000, params[0]);
-        Assert.assertEquals(100000, params[1]);
-        Assert.assertEquals(1000, params[2]);
-    }
-
-    @Test
-    public void multiSelectMinusScrollCheckDefaultsOneDefault() throws SqlParseException {
-        String query = "select /*! MINUS_SCROLL_FETCH_AND_RESULT_LIMITS(50,100)*/ pk " +
-                "from firstIndex minus  select pk from secondIndex ";
-        MultiQuerySelect select = parser.parseMultiSelect((com.alibaba.druid.sql.ast.statement.SQLUnionQuery)
+        Assert.assertEquals(1000, params[0]);
+        Assert.assertEquals(50, params[1]);
+        Assert.assertEquals(100, params[2]);
+      }
+      if (hint.getType() == HintType.MINUS_USE_TERMS_OPTIMIZATION) {
+        Assert.assertEquals(true, hint.getParams()[0]);
+      }
+    }
+  }
+
+  @Test
+  public void multiSelectMinusScrollCheckDefaultsAllDefaults() throws SqlParseException {
+    String query =
+        "select /*! MINUS_SCROLL_FETCH_AND_RESULT_LIMITS*/ pk from firstIndex "
+            + "minus  select pk from secondIndex ";
+    MultiQuerySelect select =
+        parser.parseMultiSelect(
+            (com.alibaba.druid.sql.ast.statement.SQLUnionQuery)
                 ((SQLQueryExpr) queryToExpr(query)).getSubQuery().getQuery());
-        List<Hint> hints = select.getFirstSelect().getHints();
-        Assert.assertEquals(1, hints.size());
-        Hint hint = hints.get(0);
-        Assert.assertEquals(HintType.MINUS_FETCH_AND_RESULT_LIMITS,hint.getType());
-        Object[] params = hint.getParams();
-        Assert.assertEquals(50, params[0]);
-        Assert.assertEquals(100, params[1]);
-        Assert.assertEquals(1000, params[2]);
-    }
-
-    private SQLExpr queryToExpr(String query) {
-        return new ElasticSqlExprParser(query).expr();
-    }
-
-    private boolean conditionExist(List<Condition> conditions, String from, String to, Condition.OPERATOR OPERATOR) {
-        String[] aliasAndField = to.split("\\.", 2);
-        String toAlias = aliasAndField[0];
-        String toField = aliasAndField[1];
-        for (Condition condition : conditions) {
-            if (condition.getOPERATOR() != OPERATOR) continue;
-
-            boolean fromIsEqual = condition.getName().equals(from);
-            if (!fromIsEqual) continue;
-
-            String[] valueAliasAndField = condition.getValue().toString().split("\\.", 2);
-            boolean toFieldNameIsEqual = valueAliasAndField[1].equals(toField);
-            boolean toAliasIsEqual = valueAliasAndField[0].equals(toAlias);
-            boolean toIsEqual = toAliasIsEqual && toFieldNameIsEqual;
-
-            if (toIsEqual) return true;
-        }
-        return false;
-    }
+    List<Hint> hints = select.getFirstSelect().getHints();
+    Assert.assertEquals(1, hints.size());
+    Hint hint = hints.get(0);
+    Assert.assertEquals(HintType.MINUS_FETCH_AND_RESULT_LIMITS, hint.getType());
+    Object[] params = hint.getParams();
+    Assert.assertEquals(100000, params[0]);
+    Assert.assertEquals(100000, params[1]);
+    Assert.assertEquals(1000, params[2]);
+  }
+
+  @Test
+  public void multiSelectMinusScrollCheckDefaultsOneDefault() throws SqlParseException {
+    String query =
+        "select /*! MINUS_SCROLL_FETCH_AND_RESULT_LIMITS(50,100)*/ pk "
+            + "from firstIndex minus  select pk from secondIndex ";
+    MultiQuerySelect select =
+        parser.parseMultiSelect(
+            (com.alibaba.druid.sql.ast.statement.SQLUnionQuery)
+                ((SQLQueryExpr) queryToExpr(query)).getSubQuery().getQuery());
+    List<Hint> hints = select.getFirstSelect().getHints();
+    Assert.assertEquals(1, hints.size());
+    Hint hint = hints.get(0);
+    Assert.assertEquals(HintType.MINUS_FETCH_AND_RESULT_LIMITS, hint.getType());
+    Object[] params = hint.getParams();
+    Assert.assertEquals(50, params[0]);
+    Assert.assertEquals(100, params[1]);
+    Assert.assertEquals(1000, params[2]);
+  }
+
+  private SQLExpr queryToExpr(String query) {
+    return new ElasticSqlExprParser(query).expr();
+  }
+
+  private boolean conditionExist(
+      List<Condition> conditions, String from, String to, Condition.OPERATOR OPERATOR) {
+    String[] aliasAndField = to.split("\\.", 2);
+    String toAlias = aliasAndField[0];
+    String toField = aliasAndField[1];
+    for (Condition condition : conditions) {
+      if (condition.getOPERATOR() != OPERATOR) continue;
+
+      boolean fromIsEqual = condition.getName().equals(from);
+      if (!fromIsEqual) continue;
+
+      String[] valueAliasAndField = condition.getValue().toString().split("\\.", 2);
+      boolean toFieldNameIsEqual = valueAliasAndField[1].equals(toField);
+      boolean toAliasIsEqual = valueAliasAndField[0].equals(toAlias);
+      boolean toIsEqual = toAliasIsEqual && toFieldNameIsEqual;
+
+      if (toIsEqual) return true;
+    }
+    return false;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SubQueryParserTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SubQueryParserTest.java
index ac614affdb..32885c79fe 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SubQueryParserTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SubQueryParserTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.parser;
 
 import static org.junit.Assert.assertEquals;
@@ -20,127 +19,135 @@
 
 public class SubQueryParserTest {
 
-    private static SqlParser parser = new SqlParser();
-
-    @Test
-    public void selectFromSubqueryShouldPass() throws SqlParseException {
-        Select select = parseSelect(
-                StringUtils.format(
-                        "SELECT t.T1 as age1, t.T2 as balance1 " +
-                        "FROM (SELECT age as T1, balance as T2 FROM %s/account) t",
-                        TEST_INDEX_ACCOUNT));
-
-        assertEquals(2, select.getFields().size());
-        assertEquals("age", select.getFields().get(0).getName());
-        assertEquals("age1", select.getFields().get(0).getAlias());
-        assertEquals("balance", select.getFields().get(1).getName());
-        assertEquals("balance1", select.getFields().get(1).getAlias());
-    }
-
-    @Test
-    public void selectFromSubqueryWithoutAliasShouldPass() throws SqlParseException {
-        Select select = parseSelect(
-                StringUtils.format(
-                        "SELECT t.age as finalAge, t.balance as finalBalance " +
-                                "FROM (SELECT age, balance FROM %s/account) t",
-                        TEST_INDEX_ACCOUNT));
-
-        assertEquals(2, select.getFields().size());
-        assertEquals("age", select.getFields().get(0).getName());
-        assertEquals("finalAge", select.getFields().get(0).getAlias());
-        assertEquals("balance", select.getFields().get(1).getName());
-        assertEquals("finalBalance", select.getFields().get(1).getAlias());
-    }
-
-    @Test
-    public void selectFromSubqueryShouldIgnoreUnusedField() throws SqlParseException {
-        Select select = parseSelect(
-                StringUtils.format(
-                        "SELECT t.T1 as age1 " +
-                        "FROM (SELECT age as T1, balance as T2 FROM %s/account) t",
-                        TEST_INDEX_ACCOUNT));
-
-        assertEquals(1, select.getFields().size());
-        assertEquals("age", select.getFields().get(0).getName());
-        assertEquals("age1", select.getFields().get(0).getAlias());
-    }
-
-    @Test
-    public void selectFromSubqueryWithAggShouldPass() throws SqlParseException {
-        Select select = parseSelect(
-                StringUtils.format(
-                        "SELECT t.TEMP as count " +
-                        "FROM (SELECT COUNT(*) as TEMP FROM %s/account) t",
-                        TEST_INDEX_ACCOUNT));
-        assertEquals(1, select.getFields().size());
-        assertEquals("COUNT", select.getFields().get(0).getName());
-        assertEquals("count", select.getFields().get(0).getAlias());
-    }
-
-    @Test
-    public void selectFromSubqueryWithWhereAndCountShouldPass() throws SqlParseException {
-        Select select = parseSelect(
-                StringUtils.format(
-                        "SELECT t.TEMP as count " +
-                        "FROM (SELECT COUNT(*) as TEMP FROM %s/account WHERE age > 30) t",
-                        TEST_INDEX_ACCOUNT));
-
-        assertEquals(1, select.getFields().size());
-        assertEquals("COUNT", select.getFields().get(0).getName());
-        assertEquals("count", select.getFields().get(0).getAlias());
-    }
-
-    @Test
-    public void selectFromSubqueryWithCountAndGroupByAndOrderByShouldPass() throws SqlParseException {
-        Select select = parseSelect(
-                StringUtils.format(
-                        "SELECT t.TEMP as count " +
-                        "FROM (SELECT COUNT(*) as TEMP FROM %s/account GROUP BY age ORDER BY TEMP) t",
-                        TEST_INDEX_ACCOUNT));
-
-        assertEquals(1, select.getFields().size());
-        assertEquals("COUNT", select.getFields().get(0).getName());
-        assertEquals("count", select.getFields().get(0).getAlias());
-        assertEquals(1, select.getOrderBys().size());
-        assertEquals("count", select.getOrderBys().get(0).getName());
-        assertEquals("count", select.getOrderBys().get(0).getSortField().getName());
-    }
-
-    @Test
-    public void selectFromSubqueryWithCountAndGroupByAndHavingShouldPass() throws Exception {
-
-        Select select = parseSelect(
-                StringUtils.format("SELECT t.T1 as g, t.T2 as c " +
-                                   "FROM (SELECT gender as T1, COUNT(*) as T2 " +
-                                   "      FROM %s/account " +
-                                   "      GROUP BY gender " +
-                                   "      HAVING T2 > 500) t", TEST_INDEX_ACCOUNT));
-
-        assertEquals(2, select.getFields().size());
-        assertEquals("gender", select.getFields().get(0).getName());
-        assertEquals("g", select.getFields().get(0).getAlias());
-        assertEquals("COUNT", select.getFields().get(1).getName());
-        assertEquals("c", select.getFields().get(1).getAlias());
-        assertEquals(1, select.getHaving().getConditions().size());
-        assertEquals("c", ((Condition) select.getHaving().getConditions().get(0)).getName());
-    }
-
-    @Test
-    public void selectFromSubqueryCountAndSum() throws Exception {
-        Select select = parseSelect(
-                StringUtils.format(
-                        "SELECT t.TEMP1 as count, t.TEMP2 as balance " +
-                        "FROM (SELECT COUNT(*) as TEMP1, SUM(balance) as TEMP2 " +
-                        "      FROM %s/account) t",
-                        TEST_INDEX_ACCOUNT));
-        assertEquals(2, select.getFields().size());
-        assertEquals("COUNT", select.getFields().get(0).getName());
-        assertEquals("count", select.getFields().get(0).getAlias());
-        assertEquals("SUM", select.getFields().get(1).getName());
-        assertEquals("balance", select.getFields().get(1).getAlias());
-    }
-
-    private Select parseSelect(String query) throws SqlParseException {
-        return parser.parseSelect((SQLQueryExpr) new ElasticSqlExprParser(query).expr());
-    }
+  private static SqlParser parser = new SqlParser();
+
+  @Test
+  public void selectFromSubqueryShouldPass() throws SqlParseException {
+    Select select =
+        parseSelect(
+            StringUtils.format(
+                "SELECT t.T1 as age1, t.T2 as balance1 "
+                    + "FROM (SELECT age as T1, balance as T2 FROM %s/account) t",
+                TEST_INDEX_ACCOUNT));
+
+    assertEquals(2, select.getFields().size());
+    assertEquals("age", select.getFields().get(0).getName());
+    assertEquals("age1", select.getFields().get(0).getAlias());
+    assertEquals("balance", select.getFields().get(1).getName());
+    assertEquals("balance1", select.getFields().get(1).getAlias());
+  }
+
+  @Test
+  public void selectFromSubqueryWithoutAliasShouldPass() throws SqlParseException {
+    Select select =
+        parseSelect(
+            StringUtils.format(
+                "SELECT t.age as finalAge, t.balance as finalBalance "
+                    + "FROM (SELECT age, balance FROM %s/account) t",
+                TEST_INDEX_ACCOUNT));
+
+    assertEquals(2, select.getFields().size());
+    assertEquals("age", select.getFields().get(0).getName());
+    assertEquals("finalAge", select.getFields().get(0).getAlias());
+    assertEquals("balance", select.getFields().get(1).getName());
+    assertEquals("finalBalance", select.getFields().get(1).getAlias());
+  }
+
+  @Test
+  public void selectFromSubqueryShouldIgnoreUnusedField() throws SqlParseException {
+    Select select =
+        parseSelect(
+            StringUtils.format(
+                "SELECT t.T1 as age1 " + "FROM (SELECT age as T1, balance as T2 FROM %s/account) t",
+                TEST_INDEX_ACCOUNT));
+
+    assertEquals(1, select.getFields().size());
+    assertEquals("age", select.getFields().get(0).getName());
+    assertEquals("age1", select.getFields().get(0).getAlias());
+  }
+
+  @Test
+  public void selectFromSubqueryWithAggShouldPass() throws SqlParseException {
+    Select select =
+        parseSelect(
+            StringUtils.format(
+                "SELECT t.TEMP as count " + "FROM (SELECT COUNT(*) as TEMP FROM %s/account) t",
+                TEST_INDEX_ACCOUNT));
+    assertEquals(1, select.getFields().size());
+    assertEquals("COUNT", select.getFields().get(0).getName());
+    assertEquals("count", select.getFields().get(0).getAlias());
+  }
+
+  @Test
+  public void selectFromSubqueryWithWhereAndCountShouldPass() throws SqlParseException {
+    Select select =
+        parseSelect(
+            StringUtils.format(
+                "SELECT t.TEMP as count "
+                    + "FROM (SELECT COUNT(*) as TEMP FROM %s/account WHERE age > 30) t",
+                TEST_INDEX_ACCOUNT));
+
+    assertEquals(1, select.getFields().size());
+    assertEquals("COUNT", select.getFields().get(0).getName());
+    assertEquals("count", select.getFields().get(0).getAlias());
+  }
+
+  @Test
+  public void selectFromSubqueryWithCountAndGroupByAndOrderByShouldPass() throws SqlParseException {
+    Select select =
+        parseSelect(
+            StringUtils.format(
+                "SELECT t.TEMP as count "
+                    + "FROM (SELECT COUNT(*) as TEMP FROM %s/account GROUP BY age ORDER BY TEMP) t",
+                TEST_INDEX_ACCOUNT));
+
+    assertEquals(1, select.getFields().size());
+    assertEquals("COUNT", select.getFields().get(0).getName());
+    assertEquals("count", select.getFields().get(0).getAlias());
+    assertEquals(1, select.getOrderBys().size());
+    assertEquals("count", select.getOrderBys().get(0).getName());
+    assertEquals("count", select.getOrderBys().get(0).getSortField().getName());
+  }
+
+  @Test
+  public void selectFromSubqueryWithCountAndGroupByAndHavingShouldPass() throws Exception {
+
+    Select select =
+        parseSelect(
+            StringUtils.format(
+                "SELECT t.T1 as g, t.T2 as c "
+                    + "FROM (SELECT gender as T1, COUNT(*) as T2 "
+                    + "      FROM %s/account "
+                    + "      GROUP BY gender "
+                    + "      HAVING T2 > 500) t",
+                TEST_INDEX_ACCOUNT));
+
+    assertEquals(2, select.getFields().size());
+    assertEquals("gender", select.getFields().get(0).getName());
+    assertEquals("g", select.getFields().get(0).getAlias());
+    assertEquals("COUNT", select.getFields().get(1).getName());
+    assertEquals("c", select.getFields().get(1).getAlias());
+    assertEquals(1, select.getHaving().getConditions().size());
+    assertEquals("c", ((Condition) select.getHaving().getConditions().get(0)).getName());
+  }
+
+  @Test
+  public void selectFromSubqueryCountAndSum() throws Exception {
+    Select select =
+        parseSelect(
+            StringUtils.format(
+                "SELECT t.TEMP1 as count, t.TEMP2 as balance "
+                    + "FROM (SELECT COUNT(*) as TEMP1, SUM(balance) as TEMP2 "
+                    + "      FROM %s/account) t",
+                TEST_INDEX_ACCOUNT));
+    assertEquals(2, select.getFields().size());
+    assertEquals("COUNT", select.getFields().get(0).getName());
+    assertEquals("count", select.getFields().get(0).getAlias());
+    assertEquals("SUM", select.getFields().get(1).getName());
+    assertEquals("balance", select.getFields().get(1).getAlias());
+  }
+
+  private Select parseSelect(String query) throws SqlParseException {
+    return parser.parseSelect((SQLQueryExpr) new ElasticSqlExprParser(query).expr());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/BindingTupleQueryPlannerExecuteTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/BindingTupleQueryPlannerExecuteTest.java
index db474e5136..5cb0bcf124 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/BindingTupleQueryPlannerExecuteTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/BindingTupleQueryPlannerExecuteTest.java
@@ -3,12 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -21,11 +20,11 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
-import org.opensearch.action.ActionFuture;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.Client;
+import org.opensearch.common.action.ActionFuture;
 import org.opensearch.search.aggregations.Aggregations;
 import org.opensearch.sql.legacy.domain.ColumnTypeProvider;
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
@@ -35,79 +34,78 @@
 
 @RunWith(MockitoJUnitRunner.class)
 public class BindingTupleQueryPlannerExecuteTest {
-    @Mock
-    private Client client;
-    @Mock
-    private SearchResponse aggResponse;
-    @Mock
-    private ColumnTypeProvider columnTypeProvider;
+  @Mock private Client client;
+  @Mock private SearchResponse aggResponse;
+  @Mock private ColumnTypeProvider columnTypeProvider;
 
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
+  @Before
+  public void init() {
+    MockitoAnnotations.initMocks(this);
 
-        ActionFuture mockFuture = mock(ActionFuture.class);
-        when(client.execute(any(), any())).thenReturn(mockFuture);
-        when(mockFuture.actionGet()).thenAnswer(invocationOnMock -> aggResponse);
-    }
+    ActionFuture mockFuture = mock(ActionFuture.class);
+    when(client.execute(any(), any())).thenReturn(mockFuture);
+    when(mockFuture.actionGet()).thenAnswer(invocationOnMock -> aggResponse);
+  }
 
-    @Test
-    public void testAggregationShouldPass() {
-        assertThat(query("SELECT gender, MAX(age) as max, MIN(age) as min FROM accounts GROUP BY gender",
-                         mockSearchAggregation()),
-                   containsInAnyOrder(
-                           BindingTuple.from(ImmutableMap.of("gender", "m", "max", 20d, "min", 10d)),
-                           BindingTuple.from(ImmutableMap.of("gender", "f", "max", 40d, "min", 20d))));
-    }
+  @Test
+  public void testAggregationShouldPass() {
+    assertThat(
+        query(
+            "SELECT gender, MAX(age) as max, MIN(age) as min FROM accounts GROUP BY gender",
+            mockSearchAggregation()),
+        containsInAnyOrder(
+            BindingTuple.from(ImmutableMap.of("gender", "m", "max", 20d, "min", 10d)),
+            BindingTuple.from(ImmutableMap.of("gender", "f", "max", 40d, "min", 20d))));
+  }
 
+  protected List<BindingTuple> query(String sql, MockSearchAggregation mockAgg) {
+    doAnswer(mockAgg).when(aggResponse).getAggregations();
 
-    protected List<BindingTuple> query(String sql, MockSearchAggregation mockAgg) {
-        doAnswer(mockAgg).when(aggResponse).getAggregations();
+    BindingTupleQueryPlanner queryPlanner =
+        new BindingTupleQueryPlanner(client, SqlParserUtils.parse(sql), columnTypeProvider);
+    return queryPlanner.execute();
+  }
 
-        BindingTupleQueryPlanner queryPlanner =
-                new BindingTupleQueryPlanner(client, SqlParserUtils.parse(sql), columnTypeProvider);
-        return queryPlanner.execute();
-    }
+  private MockSearchAggregation mockSearchAggregation() {
+    return new MockSearchAggregation(
+        "{\n"
+            + "  \"sterms#gender\": {\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": \"m\",\n"
+            + "        \"doc_count\": 507,\n"
+            + "        \"min#min\": {\n"
+            + "          \"value\": 10\n"
+            + "        },\n"
+            + "        \"max#max\": {\n"
+            + "          \"value\": 20\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\": \"f\",\n"
+            + "        \"doc_count\": 493,\n"
+            + "        \"min#min\": {\n"
+            + "          \"value\": 20\n"
+            + "        },\n"
+            + "        \"max#max\": {\n"
+            + "          \"value\": 40\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}");
+  }
 
-    private MockSearchAggregation mockSearchAggregation() {
-        return new MockSearchAggregation("{\n"
-                                         + "  \"sterms#gender\": {\n"
-                                         + "    \"buckets\": [\n"
-                                         + "      {\n"
-                                         + "        \"key\": \"m\",\n"
-                                         + "        \"doc_count\": 507,\n"
-                                         + "        \"min#min\": {\n"
-                                         + "          \"value\": 10\n"
-                                         + "        },\n"
-                                         + "        \"max#max\": {\n"
-                                         + "          \"value\": 20\n"
-                                         + "        }\n"
-                                         + "      },\n"
-                                         + "      {\n"
-                                         + "        \"key\": \"f\",\n"
-                                         + "        \"doc_count\": 493,\n"
-                                         + "        \"min#min\": {\n"
-                                         + "          \"value\": 20\n"
-                                         + "        },\n"
-                                         + "        \"max#max\": {\n"
-                                         + "          \"value\": 40\n"
-                                         + "        }\n"
-                                         + "      }\n"
-                                         + "    ]\n"
-                                         + "  }\n"
-                                         + "}");
-    }
-
-    protected static class MockSearchAggregation implements Answer<Aggregations> {
-        private final Aggregations aggregation;
+  protected static class MockSearchAggregation implements Answer<Aggregations> {
+    private final Aggregations aggregation;
 
-        public MockSearchAggregation(String agg) {
-            aggregation = AggregationUtils.fromJson(agg);
-        }
+    public MockSearchAggregation(String agg) {
+      aggregation = AggregationUtils.fromJson(agg);
+    }
 
-        @Override
-        public Aggregations answer(InvocationOnMock invocationOnMock) throws Throwable {
-            return aggregation;
-        }
+    @Override
+    public Aggregations answer(InvocationOnMock invocationOnMock) throws Throwable {
+      return aggregation;
     }
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/OpenSearchActionFactoryTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/OpenSearchActionFactoryTest.java
index 0b7c7f6740..3c3a7b37f5 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/OpenSearchActionFactoryTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/OpenSearchActionFactoryTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner;
 
 import static org.junit.Assert.assertFalse;
@@ -15,60 +14,51 @@
 import org.opensearch.sql.legacy.util.SqlParserUtils;
 
 public class OpenSearchActionFactoryTest {
-    @Test
-    public void josnOutputRequestShouldNotMigrateToQueryPlan() {
-        String sql = "SELECT age, MAX(balance) " +
-                     "FROM account " +
-                     "GROUP BY age";
+  @Test
+  public void josnOutputRequestShouldNotMigrateToQueryPlan() {
+    String sql = "SELECT age, MAX(balance) " + "FROM account " + "GROUP BY age";
 
-        assertFalse(
-            OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JSON));
-    }
+    assertFalse(
+        OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JSON));
+  }
 
-    @Test
-    public void nestQueryShouldNotMigrateToQueryPlan() {
-        String sql = "SELECT age, nested(balance) " +
-                     "FROM account " +
-                     "GROUP BY age";
+  @Test
+  public void nestQueryShouldNotMigrateToQueryPlan() {
+    String sql = "SELECT age, nested(balance) " + "FROM account " + "GROUP BY age";
 
-        assertFalse(
-            OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JDBC));
-    }
+    assertFalse(
+        OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JDBC));
+  }
 
-    @Test
-    public void nonAggregationQueryShouldNotMigrateToQueryPlan() {
-        String sql = "SELECT age " +
-                     "FROM account ";
+  @Test
+  public void nonAggregationQueryShouldNotMigrateToQueryPlan() {
+    String sql = "SELECT age " + "FROM account ";
 
-        assertFalse(
-            OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JDBC));
-    }
+    assertFalse(
+        OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JDBC));
+  }
 
-    @Test
-    public void aggregationQueryWithoutGroupByShouldMigrateToQueryPlan() {
-        String sql = "SELECT age, COUNT(balance) " +
-                     "FROM account ";
+  @Test
+  public void aggregationQueryWithoutGroupByShouldMigrateToQueryPlan() {
+    String sql = "SELECT age, COUNT(balance) " + "FROM account ";
 
-        assertTrue(
-            OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JDBC));
-    }
+    assertTrue(
+        OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JDBC));
+  }
 
-    @Test
-    public void aggregationQueryWithExpressionByShouldMigrateToQueryPlan() {
-        String sql = "SELECT age, MAX(balance) - MIN(balance) " +
-                     "FROM account ";
+  @Test
+  public void aggregationQueryWithExpressionByShouldMigrateToQueryPlan() {
+    String sql = "SELECT age, MAX(balance) - MIN(balance) " + "FROM account ";
 
-        assertTrue(
-            OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JDBC));
-    }
+    assertTrue(
+        OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JDBC));
+  }
 
-    @Test
-    public void queryOnlyHasGroupByShouldMigrateToQueryPlan() {
-        String sql = "SELECT CAST(age AS DOUBLE) as alias " +
-                     "FROM account " +
-                     "GROUP BY alias";
+  @Test
+  public void queryOnlyHasGroupByShouldMigrateToQueryPlan() {
+    String sql = "SELECT CAST(age AS DOUBLE) as alias " + "FROM account " + "GROUP BY alias";
 
-        assertTrue(
-            OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JDBC));
-    }
+    assertTrue(
+        OpenSearchActionFactory.shouldMigrateToQueryPlan(SqlParserUtils.parse(sql), Format.JDBC));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerBatchTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerBatchTest.java
index 52f8e2bc6e..0c77550a2f 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerBatchTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerBatchTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -17,7 +16,6 @@
 import java.util.Collection;
 import java.util.List;
 import org.hamcrest.Matcher;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -25,221 +23,153 @@
 import org.opensearch.search.SearchHits;
 
 /**
- * Batch prefetch testing. Test against different combination of algorithm block size and scroll page size.
+ * Batch prefetch testing. Test against different combination of algorithm block size and scroll
+ * page size.
  */
 @SuppressWarnings("unchecked")
 @RunWith(Parameterized.class)
 public class QueryPlannerBatchTest extends QueryPlannerTest {
 
-    private static final String TEST_SQL1 =
-        "SELECT " +
-        "  /*! JOIN_CIRCUIT_BREAK_LIMIT(100) */ " +
-        "  /*! JOIN_ALGORITHM_BLOCK_SIZE(%d) */ " +
-        "  /*! JOIN_SCROLL_PAGE_SIZE(%d) */ " +
-        "  e.lastname AS name, d.id AS id, d.name AS dep ";
-
-    private static final String TEST_SQL2_JOIN1 =
-        "FROM department d " +
-        "  %s employee e ";
-
-    private static final String TEST_SQL2_JOIN2 =
-        "FROM employee e " +
-        "  %s department d ";
-
-    private static final String TEST_SQL3 =
-        "ON d.id = e.departmentId " +
-        "  WHERE e.age <= 50";
-
-    private SearchHit[] employees = {
-        employee(1, "People 1", "A"),
-        employee(2, "People 2", "A"),
-        employee(3, "People 3", "A"),
-        employee(4, "People 4", "B"),
-        employee(5, "People 5", "B"),
-        employee(6, "People 6", "C"),
-        employee(7, "People 7", "D"),
-        employee(8, "People 8", "D"),
-        employee(9, "People 9", "E"),
-        employee(10, "People 10", "F")
-    };
-
-    private SearchHit[] departments = {
-        department(1, "A", "AWS"),
-        department(2, "C", "Capital One"),
-        department(3, "D", "Dell"),
-        department(4, "F", "Facebook"),
-        department(5, "G", "Google"),
-        department(6, "M", "Microsoft"),
-        department(7, "U", "Uber"),
-    };
-
-    private Matcher[] matched = {
-        hit(
-            kv("name", "People 1"),
-            kv("id", "A"),
-            kv("dep", "AWS")
-        ),
-        hit(
-            kv("name", "People 2"),
-            kv("id", "A"),
-            kv("dep", "AWS")
-        ),
-        hit(
-            kv("name", "People 3"),
-            kv("id", "A"),
-            kv("dep", "AWS")
-        ),
-        hit(
-            kv("name", "People 6"),
-            kv("id", "C"),
-            kv("dep", "Capital One")
-        ),
-        hit(
-            kv("name", "People 7"),
-            kv("id", "D"),
-            kv("dep", "Dell")
-        ),
-        hit(
-            kv("name", "People 8"),
-            kv("id", "D"),
-            kv("dep", "Dell")
-        ),
-        hit(
-            kv("name", "People 10"),
-            kv("id", "F"),
-            kv("dep", "Facebook")
-        )
-    };
-
-    private Matcher[] mismatched1 = {
-        hit(
-            kv("name", null),
-            kv("id", "G"),
-            kv("dep", "Google")
-        ),
-        hit(
-            kv("name", null),
-            kv("id", "M"),
-            kv("dep", "Microsoft")
-        ),
-        hit(
-            kv("name", null),
-            kv("id", "U"),
-            kv("dep", "Uber")
-        )
-    };
-
-    private Matcher[] mismatched2 = {
-        hit(
-            kv("name", "People 4"),
-            kv("id", null),
-            kv("dep", null)
-        ),
-        hit(
-            kv("name", "People 5"),
-            kv("id", null),
-            kv("dep", null)
-        ),
-        hit(
-            kv("name", "People 9"),
-            kv("id", null),
-            kv("dep", null)
-        )
-    };
-
-    private Matcher<SearchHits> expectedInnerJoinResult = hits(matched);
-
-    /** Department left join Employee */
-    private Matcher<SearchHits> expectedLeftOuterJoinResult1 = hits(concat(matched, mismatched1));
-
-    /** Employee left join Department */
-    private Matcher<SearchHits> expectedLeftOuterJoinResult2 = hits(concat(matched, mismatched2));
-
-    /** Parameterized test cases */
-    private final int blockSize;
-    private final int pageSize;
-
-    public QueryPlannerBatchTest(int blockSize, int pageSize) {
-        this.blockSize = blockSize;
-        this.pageSize = pageSize;
-    }
-
-    @Parameters
-    public static Collection<Object[]> data() {
-        List<Object[]> params = new ArrayList<>();
-        for (int blockSize = 1; blockSize <= 11; blockSize++) {
-            for (int pageSize = 1; pageSize <= 11; pageSize++) {
-                params.add(new Object[]{ blockSize, pageSize });
-            }
-        }
-        return params;
-    }
-
-    @Test
-    public void departmentInnerJoinEmployee() {
-        assertThat(
-            query(
-                String.format(
-                    TEST_SQL1 + TEST_SQL2_JOIN1 + TEST_SQL3,
-                    blockSize, pageSize, "INNER JOIN"),
-                departments(pageSize, departments),
-                employees(pageSize, employees)
-            ),
-            expectedInnerJoinResult
-        );
-    }
-
-    @Test
-    public void employeeInnerJoinDepartment() {
-        assertThat(
-            query(
-                String.format(
-                    TEST_SQL1 + TEST_SQL2_JOIN2 + TEST_SQL3,
-                    blockSize, pageSize, "INNER JOIN"),
-                employees(pageSize, employees),
-                departments(pageSize, departments)
-            ),
-            expectedInnerJoinResult
-        );
-    }
-
-    @Test
-    public void departmentLeftJoinEmployee() {
-        assertThat(
-            query(
-                String.format(
-                    TEST_SQL1 + TEST_SQL2_JOIN1 + TEST_SQL3,
-                    blockSize, pageSize, "LEFT JOIN"),
-                departments(pageSize, departments),
-                employees(pageSize, employees)
-            ),
-            expectedLeftOuterJoinResult1
-        );
-    }
-
-    @Test
-    public void employeeLeftJoinDepartment() {
-        assertThat(
-            query(
-                String.format(
-                    TEST_SQL1 + TEST_SQL2_JOIN2 + TEST_SQL3,
-                    blockSize, pageSize, "LEFT JOIN"),
-                employees(pageSize, employees),
-                departments(pageSize, departments)
-            ),
-            expectedLeftOuterJoinResult2
-        );
-    }
-
-    private static Matcher[] concat(Matcher[] one, Matcher[] other) {
-        return concat(one, other, Matcher.class);
-    }
-
-    /** Copy from OpenSearch ArrayUtils */
-    private static <T> T[] concat(T[] one, T[] other, Class<T> clazz) {
-        T[] target = (T[]) Array.newInstance(clazz, one.length + other.length);
-        System.arraycopy(one, 0, target, 0, one.length);
-        System.arraycopy(other, 0, target, one.length, other.length);
-        return target;
+  private static final String TEST_SQL1 =
+      "SELECT "
+          + "  /*! JOIN_CIRCUIT_BREAK_LIMIT(100) */ "
+          + "  /*! JOIN_ALGORITHM_BLOCK_SIZE(%d) */ "
+          + "  /*! JOIN_SCROLL_PAGE_SIZE(%d) */ "
+          + "  e.lastname AS name, d.id AS id, d.name AS dep ";
+
+  private static final String TEST_SQL2_JOIN1 = "FROM department d " + "  %s employee e ";
+
+  private static final String TEST_SQL2_JOIN2 = "FROM employee e " + "  %s department d ";
+
+  private static final String TEST_SQL3 = "ON d.id = e.departmentId " + "  WHERE e.age <= 50";
+
+  private SearchHit[] employees = {
+    employee(1, "People 1", "A"),
+    employee(2, "People 2", "A"),
+    employee(3, "People 3", "A"),
+    employee(4, "People 4", "B"),
+    employee(5, "People 5", "B"),
+    employee(6, "People 6", "C"),
+    employee(7, "People 7", "D"),
+    employee(8, "People 8", "D"),
+    employee(9, "People 9", "E"),
+    employee(10, "People 10", "F")
+  };
+
+  private SearchHit[] departments = {
+    department(1, "A", "AWS"),
+    department(2, "C", "Capital One"),
+    department(3, "D", "Dell"),
+    department(4, "F", "Facebook"),
+    department(5, "G", "Google"),
+    department(6, "M", "Microsoft"),
+    department(7, "U", "Uber"),
+  };
+
+  private Matcher[] matched = {
+    hit(kv("name", "People 1"), kv("id", "A"), kv("dep", "AWS")),
+    hit(kv("name", "People 2"), kv("id", "A"), kv("dep", "AWS")),
+    hit(kv("name", "People 3"), kv("id", "A"), kv("dep", "AWS")),
+    hit(kv("name", "People 6"), kv("id", "C"), kv("dep", "Capital One")),
+    hit(kv("name", "People 7"), kv("id", "D"), kv("dep", "Dell")),
+    hit(kv("name", "People 8"), kv("id", "D"), kv("dep", "Dell")),
+    hit(kv("name", "People 10"), kv("id", "F"), kv("dep", "Facebook"))
+  };
+
+  private Matcher[] mismatched1 = {
+    hit(kv("name", null), kv("id", "G"), kv("dep", "Google")),
+    hit(kv("name", null), kv("id", "M"), kv("dep", "Microsoft")),
+    hit(kv("name", null), kv("id", "U"), kv("dep", "Uber"))
+  };
+
+  private Matcher[] mismatched2 = {
+    hit(kv("name", "People 4"), kv("id", null), kv("dep", null)),
+    hit(kv("name", "People 5"), kv("id", null), kv("dep", null)),
+    hit(kv("name", "People 9"), kv("id", null), kv("dep", null))
+  };
+
+  private Matcher<SearchHits> expectedInnerJoinResult = hits(matched);
+
+  /** Department left join Employee */
+  private Matcher<SearchHits> expectedLeftOuterJoinResult1 = hits(concat(matched, mismatched1));
+
+  /** Employee left join Department */
+  private Matcher<SearchHits> expectedLeftOuterJoinResult2 = hits(concat(matched, mismatched2));
+
+  /** Parameterized test cases */
+  private final int blockSize;
+
+  private final int pageSize;
+
+  public QueryPlannerBatchTest(int blockSize, int pageSize) {
+    this.blockSize = blockSize;
+    this.pageSize = pageSize;
+  }
+
+  @Parameters
+  public static Collection<Object[]> data() {
+    List<Object[]> params = new ArrayList<>();
+    for (int blockSize = 1; blockSize <= 11; blockSize++) {
+      for (int pageSize = 1; pageSize <= 11; pageSize++) {
+        params.add(new Object[] {blockSize, pageSize});
+      }
     }
+    return params;
+  }
+
+  @Test
+  public void departmentInnerJoinEmployee() {
+    assertThat(
+        query(
+            String.format(
+                TEST_SQL1 + TEST_SQL2_JOIN1 + TEST_SQL3, blockSize, pageSize, "INNER JOIN"),
+            departments(pageSize, departments),
+            employees(pageSize, employees)),
+        expectedInnerJoinResult);
+  }
+
+  @Test
+  public void employeeInnerJoinDepartment() {
+    assertThat(
+        query(
+            String.format(
+                TEST_SQL1 + TEST_SQL2_JOIN2 + TEST_SQL3, blockSize, pageSize, "INNER JOIN"),
+            employees(pageSize, employees),
+            departments(pageSize, departments)),
+        expectedInnerJoinResult);
+  }
+
+  @Test
+  public void departmentLeftJoinEmployee() {
+    assertThat(
+        query(
+            String.format(
+                TEST_SQL1 + TEST_SQL2_JOIN1 + TEST_SQL3, blockSize, pageSize, "LEFT JOIN"),
+            departments(pageSize, departments),
+            employees(pageSize, employees)),
+        expectedLeftOuterJoinResult1);
+  }
+
+  @Test
+  public void employeeLeftJoinDepartment() {
+    assertThat(
+        query(
+            String.format(
+                TEST_SQL1 + TEST_SQL2_JOIN2 + TEST_SQL3, blockSize, pageSize, "LEFT JOIN"),
+            employees(pageSize, employees),
+            departments(pageSize, departments)),
+        expectedLeftOuterJoinResult2);
+  }
+
+  private static Matcher[] concat(Matcher[] one, Matcher[] other) {
+    return concat(one, other, Matcher.class);
+  }
+
+  /** Copy from OpenSearch ArrayUtils */
+  private static <T> T[] concat(T[] one, T[] other, Class<T> clazz) {
+    T[] target = (T[]) Array.newInstance(clazz, one.length + other.length);
+    System.arraycopy(one, 0, target, 0, one.length);
+    System.arraycopy(other, 0, target, one.length, other.length);
+    return target;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerConfigTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerConfigTest.java
index 07a84683ce..81d6d718b9 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerConfigTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerConfigTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -23,291 +22,252 @@
 import org.opensearch.sql.legacy.query.planner.HashJoinQueryPlanRequestBuilder;
 import org.opensearch.sql.legacy.query.planner.core.Config;
 
-/**
- * Hint & Configuring Ability Test Cases
- */
+/** Hint & Configuring Ability Test Cases */
 public class QueryPlannerConfigTest extends QueryPlannerTest {
 
-    private static final Matcher<Integer[]> DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER = totalAndTableLimit(200, 0, 0);
-
-    @Test
-    public void algorithmBlockSizeHint() {
-        assertThat(
-            parseHint("! JOIN_ALGORITHM_BLOCK_SIZE(100000)"),
-            hint(
-                hintType(HintType.JOIN_ALGORITHM_BLOCK_SIZE),
-                hintValues(100000)
-            )
-        );
-    }
-
-    @Test
-    public void algorithmUseLegacy() {
-        assertThat(
-            parseHint("! JOIN_ALGORITHM_USE_LEGACY"),
-            hint(
-                hintType(HintType.JOIN_ALGORITHM_USE_LEGACY),
-                hintValues()
-            )
-        );
-    }
-
-    @Test
-    public void algorithmBlockSizeHintWithSpaces() {
-        assertThat(
-            parseHint("! JOIN_ALGORITHM_BLOCK_SIZE ( 200000 ) "),
-            hint(
-                hintType(HintType.JOIN_ALGORITHM_BLOCK_SIZE),
-                hintValues(200000)
-            )
-        );
-    }
-
-    @Test
-    public void scrollPageSizeHint() {
-        assertThat(
-            parseHint("! JOIN_SCROLL_PAGE_SIZE(1000) "),
-            hint(
-                hintType(HintType.JOIN_SCROLL_PAGE_SIZE),
-                hintValues(1000)
-            )
-        );
-    }
-
-    @Test
-    public void scrollPageSizeHintWithTwoSizes() {
-        assertThat(
-            parseHint("! JOIN_SCROLL_PAGE_SIZE(1000, 2000) "),
-            hint(
-                hintType(HintType.JOIN_SCROLL_PAGE_SIZE),
-                hintValues(1000, 2000)
-            )
-        );
-    }
-
-    @Test
-    public void circuitBreakLimitHint() {
-        assertThat(
-            parseHint("! JOIN_CIRCUIT_BREAK_LIMIT(80)"),
-            hint(
-                hintType(HintType.JOIN_CIRCUIT_BREAK_LIMIT),
-                hintValues(80)
-            )
-        );
-    }
-
-    @Test
-    public void backOffRetryIntervalsHint() {
-        assertThat(
-            parseHint("! JOIN_BACK_OFF_RETRY_INTERVALS(1, 5)"),
-            hint(
-                hintType(HintType.JOIN_BACK_OFF_RETRY_INTERVALS),
-                hintValues(1, 5)
-            )
-        );
-    }
-
-    @Test
-    public void timeOutHint() {
-        assertThat(
-            parseHint("! JOIN_TIME_OUT(120)"),
-            hint(
-                hintType(HintType.JOIN_TIME_OUT),
-                hintValues(120)
-            )
-        );
-    }
-
-    @Test
-    public void blockSizeConfig() {
-        assertThat(queryPlannerConfig(
-            "SELECT /*! JOIN_ALGORITHM_BLOCK_SIZE(200000) */ " +
-            "  d.name FROM employee e JOIN department d ON d.id = e.departmentId "),
-            config(
-                blockSize(200000),
-                scrollPageSize(Config.DEFAULT_SCROLL_PAGE_SIZE, Config.DEFAULT_SCROLL_PAGE_SIZE),
-                circuitBreakLimit(Config.DEFAULT_CIRCUIT_BREAK_LIMIT),
-                backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
-                DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
-                timeOut(Config.DEFAULT_TIME_OUT)
-            )
-        );
-    }
-
-    @Test
-    public void scrollPageSizeConfig() {
-        assertThat(queryPlannerConfig(
-            "SELECT /*! JOIN_SCROLL_PAGE_SIZE(50, 20) */ " +
-            "  d.name FROM employee e JOIN department d ON d.id = e.departmentId "),
-            config(
-                blockSize(Config.DEFAULT_BLOCK_SIZE),
-                scrollPageSize(50, 20),
-                circuitBreakLimit(Config.DEFAULT_CIRCUIT_BREAK_LIMIT),
-                backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
-                DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
-                timeOut(Config.DEFAULT_TIME_OUT)
-            )
-        );
-    }
-
-    @Test
-    public void circuitBreakLimitConfig() {
-        assertThat(queryPlannerConfig(
-            "SELECT /*! JOIN_CIRCUIT_BREAK_LIMIT(60) */ " +
-            "  d.name FROM employee e JOIN department d ON d.id = e.departmentId "),
-            config(
-                blockSize(Config.DEFAULT_BLOCK_SIZE),
-                scrollPageSize(Config.DEFAULT_SCROLL_PAGE_SIZE, Config.DEFAULT_SCROLL_PAGE_SIZE),
-                circuitBreakLimit(60),
-                backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
-                DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
-                timeOut(Config.DEFAULT_TIME_OUT)
-            )
-        );
-    }
-
-    @Test
-    public void backOffRetryIntervalsConfig() {
-        assertThat(queryPlannerConfig(
-            "SELECT /*! JOIN_BACK_OFF_RETRY_INTERVALS(1, 3, 5, 10) */ " +
-            "  d.name FROM employee e JOIN department d ON d.id = e.departmentId "),
-            config(
-                blockSize(Config.DEFAULT_BLOCK_SIZE),
-                scrollPageSize(Config.DEFAULT_SCROLL_PAGE_SIZE, Config.DEFAULT_SCROLL_PAGE_SIZE),
-                circuitBreakLimit(Config.DEFAULT_CIRCUIT_BREAK_LIMIT),
-                backOffRetryIntervals(new double[]{1, 3, 5, 10}),
-                DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
-                timeOut(Config.DEFAULT_TIME_OUT)
-            )
-        );
-    }
-
-    @Test
-    public void totalAndTableLimitConfig() {
-        assertThat(queryPlannerConfig(
-            "SELECT /*! JOIN_TABLES_LIMIT(10, 20) */ " +
-            "  d.name FROM employee e JOIN department d ON d.id = e.departmentId LIMIT 50"),
-            config(
-                blockSize(Config.DEFAULT_BLOCK_SIZE),
-                scrollPageSize(Config.DEFAULT_SCROLL_PAGE_SIZE, Config.DEFAULT_SCROLL_PAGE_SIZE),
-                circuitBreakLimit(Config.DEFAULT_CIRCUIT_BREAK_LIMIT),
-                backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
-                totalAndTableLimit(50, 10, 20),
-                timeOut(Config.DEFAULT_TIME_OUT)
-            )
-        );
-    }
-
-    @Test
-    public void timeOutConfig() {
-        assertThat(queryPlannerConfig(
-            "SELECT /*! JOIN_TIME_OUT(120) */ " +
-            "  d.name FROM employee e JOIN department d ON d.id = e.departmentId"),
-            config(
-                blockSize(Config.DEFAULT_BLOCK_SIZE),
-                scrollPageSize(Config.DEFAULT_SCROLL_PAGE_SIZE, Config.DEFAULT_SCROLL_PAGE_SIZE),
-                circuitBreakLimit(Config.DEFAULT_CIRCUIT_BREAK_LIMIT),
-                backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
-                DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
-                timeOut(120)
-            )
-        );
-    }
-
-    @Test
-    public void multipleConfigCombined() {
-        assertThat(queryPlannerConfig(
-            "SELECT " +
-            "  /*! JOIN_ALGORITHM_BLOCK_SIZE(100) */ " +
-            "  /*! JOIN_SCROLL_PAGE_SIZE(50, 20) */ " +
-            "  /*! JOIN_CIRCUIT_BREAK_LIMIT(10) */ " +
-            "  d.name FROM employee e JOIN department d ON d.id = e.departmentId "),
-            config(
-                blockSize(100),
-                scrollPageSize(50, 20),
-                circuitBreakLimit(10),
-                backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
-                DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
-                timeOut(Config.DEFAULT_TIME_OUT)
-            )
-        );
-    }
-
-    private Hint parseHint(String hintStr) {
-        try {
-            return HintFactory.getHintFromString(hintStr);
-        }
-        catch (SqlParseException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    private Config queryPlannerConfig(String sql) {
-        HashJoinQueryPlanRequestBuilder request = ((HashJoinQueryPlanRequestBuilder) createRequestBuilder(sql));
-        request.plan();
-        return request.getConfig();
+  private static final Matcher<Integer[]> DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER =
+      totalAndTableLimit(200, 0, 0);
+
+  @Test
+  public void algorithmBlockSizeHint() {
+    assertThat(
+        parseHint("! JOIN_ALGORITHM_BLOCK_SIZE(100000)"),
+        hint(hintType(HintType.JOIN_ALGORITHM_BLOCK_SIZE), hintValues(100000)));
+  }
+
+  @Test
+  public void algorithmUseLegacy() {
+    assertThat(
+        parseHint("! JOIN_ALGORITHM_USE_LEGACY"),
+        hint(hintType(HintType.JOIN_ALGORITHM_USE_LEGACY), hintValues()));
+  }
+
+  @Test
+  public void algorithmBlockSizeHintWithSpaces() {
+    assertThat(
+        parseHint("! JOIN_ALGORITHM_BLOCK_SIZE ( 200000 ) "),
+        hint(hintType(HintType.JOIN_ALGORITHM_BLOCK_SIZE), hintValues(200000)));
+  }
+
+  @Test
+  public void scrollPageSizeHint() {
+    assertThat(
+        parseHint("! JOIN_SCROLL_PAGE_SIZE(1000) "),
+        hint(hintType(HintType.JOIN_SCROLL_PAGE_SIZE), hintValues(1000)));
+  }
+
+  @Test
+  public void scrollPageSizeHintWithTwoSizes() {
+    assertThat(
+        parseHint("! JOIN_SCROLL_PAGE_SIZE(1000, 2000) "),
+        hint(hintType(HintType.JOIN_SCROLL_PAGE_SIZE), hintValues(1000, 2000)));
+  }
+
+  @Test
+  public void circuitBreakLimitHint() {
+    assertThat(
+        parseHint("! JOIN_CIRCUIT_BREAK_LIMIT(80)"),
+        hint(hintType(HintType.JOIN_CIRCUIT_BREAK_LIMIT), hintValues(80)));
+  }
+
+  @Test
+  public void backOffRetryIntervalsHint() {
+    assertThat(
+        parseHint("! JOIN_BACK_OFF_RETRY_INTERVALS(1, 5)"),
+        hint(hintType(HintType.JOIN_BACK_OFF_RETRY_INTERVALS), hintValues(1, 5)));
+  }
+
+  @Test
+  public void timeOutHint() {
+    assertThat(
+        parseHint("! JOIN_TIME_OUT(120)"), hint(hintType(HintType.JOIN_TIME_OUT), hintValues(120)));
+  }
+
+  @Test
+  public void blockSizeConfig() {
+    assertThat(
+        queryPlannerConfig(
+            "SELECT /*! JOIN_ALGORITHM_BLOCK_SIZE(200000) */ "
+                + "  d.name FROM employee e JOIN department d ON d.id = e.departmentId "),
+        config(
+            blockSize(200000),
+            scrollPageSize(Config.DEFAULT_SCROLL_PAGE_SIZE, Config.DEFAULT_SCROLL_PAGE_SIZE),
+            circuitBreakLimit(Config.DEFAULT_CIRCUIT_BREAK_LIMIT),
+            backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
+            DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
+            timeOut(Config.DEFAULT_TIME_OUT)));
+  }
+
+  @Test
+  public void scrollPageSizeConfig() {
+    assertThat(
+        queryPlannerConfig(
+            "SELECT /*! JOIN_SCROLL_PAGE_SIZE(50, 20) */ "
+                + "  d.name FROM employee e JOIN department d ON d.id = e.departmentId "),
+        config(
+            blockSize(Config.DEFAULT_BLOCK_SIZE),
+            scrollPageSize(50, 20),
+            circuitBreakLimit(Config.DEFAULT_CIRCUIT_BREAK_LIMIT),
+            backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
+            DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
+            timeOut(Config.DEFAULT_TIME_OUT)));
+  }
+
+  @Test
+  public void circuitBreakLimitConfig() {
+    assertThat(
+        queryPlannerConfig(
+            "SELECT /*! JOIN_CIRCUIT_BREAK_LIMIT(60) */ "
+                + "  d.name FROM employee e JOIN department d ON d.id = e.departmentId "),
+        config(
+            blockSize(Config.DEFAULT_BLOCK_SIZE),
+            scrollPageSize(Config.DEFAULT_SCROLL_PAGE_SIZE, Config.DEFAULT_SCROLL_PAGE_SIZE),
+            circuitBreakLimit(60),
+            backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
+            DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
+            timeOut(Config.DEFAULT_TIME_OUT)));
+  }
+
+  @Test
+  public void backOffRetryIntervalsConfig() {
+    assertThat(
+        queryPlannerConfig(
+            "SELECT /*! JOIN_BACK_OFF_RETRY_INTERVALS(1, 3, 5, 10) */ "
+                + "  d.name FROM employee e JOIN department d ON d.id = e.departmentId "),
+        config(
+            blockSize(Config.DEFAULT_BLOCK_SIZE),
+            scrollPageSize(Config.DEFAULT_SCROLL_PAGE_SIZE, Config.DEFAULT_SCROLL_PAGE_SIZE),
+            circuitBreakLimit(Config.DEFAULT_CIRCUIT_BREAK_LIMIT),
+            backOffRetryIntervals(new double[] {1, 3, 5, 10}),
+            DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
+            timeOut(Config.DEFAULT_TIME_OUT)));
+  }
+
+  @Test
+  public void totalAndTableLimitConfig() {
+    assertThat(
+        queryPlannerConfig(
+            "SELECT /*! JOIN_TABLES_LIMIT(10, 20) */ "
+                + "  d.name FROM employee e JOIN department d ON d.id = e.departmentId LIMIT 50"),
+        config(
+            blockSize(Config.DEFAULT_BLOCK_SIZE),
+            scrollPageSize(Config.DEFAULT_SCROLL_PAGE_SIZE, Config.DEFAULT_SCROLL_PAGE_SIZE),
+            circuitBreakLimit(Config.DEFAULT_CIRCUIT_BREAK_LIMIT),
+            backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
+            totalAndTableLimit(50, 10, 20),
+            timeOut(Config.DEFAULT_TIME_OUT)));
+  }
+
+  @Test
+  public void timeOutConfig() {
+    assertThat(
+        queryPlannerConfig(
+            "SELECT /*! JOIN_TIME_OUT(120) */ "
+                + "  d.name FROM employee e JOIN department d ON d.id = e.departmentId"),
+        config(
+            blockSize(Config.DEFAULT_BLOCK_SIZE),
+            scrollPageSize(Config.DEFAULT_SCROLL_PAGE_SIZE, Config.DEFAULT_SCROLL_PAGE_SIZE),
+            circuitBreakLimit(Config.DEFAULT_CIRCUIT_BREAK_LIMIT),
+            backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
+            DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
+            timeOut(120)));
+  }
+
+  @Test
+  public void multipleConfigCombined() {
+    assertThat(
+        queryPlannerConfig(
+            "SELECT "
+                + "  /*! JOIN_ALGORITHM_BLOCK_SIZE(100) */ "
+                + "  /*! JOIN_SCROLL_PAGE_SIZE(50, 20) */ "
+                + "  /*! JOIN_CIRCUIT_BREAK_LIMIT(10) */ "
+                + "  d.name FROM employee e JOIN department d ON d.id = e.departmentId "),
+        config(
+            blockSize(100),
+            scrollPageSize(50, 20),
+            circuitBreakLimit(10),
+            backOffRetryIntervals(Config.DEFAULT_BACK_OFF_RETRY_INTERVALS),
+            DEFAULT_TOTAL_AND_TABLE_LIMIT_MATCHER,
+            timeOut(Config.DEFAULT_TIME_OUT)));
+  }
+
+  private Hint parseHint(String hintStr) {
+    try {
+      return HintFactory.getHintFromString(hintStr);
+    } catch (SqlParseException e) {
+      throw new IllegalArgumentException(e);
     }
-
-    private Matcher<Hint> hint(Matcher<HintType> typeMatcher, Matcher<Object[]> valuesMatcher) {
-        return both(
-            featureValueOf("HintType", typeMatcher, Hint::getType)
-        ).and(
-            featureValueOf("HintValue", valuesMatcher, Hint::getParams)
-        );
-    }
-
-    private Matcher<HintType> hintType(HintType type) {
-        return is(type);
-    }
-
-    private Matcher<Object[]> hintValues(Object... values) {
-        if (values.length == 0) {
-            return emptyArray();
-        }
-        return arrayContaining(values);
-    }
-
-    private Matcher<Config> config(Matcher<Integer> blockSizeMatcher,
-                                   Matcher<Integer[]> scrollPageSizeMatcher,
-                                   Matcher<Integer> circuitBreakLimitMatcher,
-                                   Matcher<double[]> backOffRetryIntervalsMatcher,
-                                   Matcher<Integer[]> totalAndTableLimitMatcher,
-                                   Matcher<Integer> timeOutMatcher) {
-        return allOf(
-            featureValueOf("Block size", blockSizeMatcher, (cfg -> cfg.blockSize().size())),
-            featureValueOf("Scroll page size", scrollPageSizeMatcher, Config::scrollPageSize),
-            featureValueOf("Circuit break limit", circuitBreakLimitMatcher, Config::circuitBreakLimit),
-            featureValueOf("Back off retry intervals", backOffRetryIntervalsMatcher, Config::backOffRetryIntervals),
-            featureValueOf("Total and table limit", totalAndTableLimitMatcher,
-                (cfg -> new Integer[]{cfg.totalLimit(), cfg.tableLimit1(), cfg.tableLimit2()})),
-            featureValueOf("Time out", timeOutMatcher, Config::timeout)
-        );
+  }
+
+  private Config queryPlannerConfig(String sql) {
+    HashJoinQueryPlanRequestBuilder request =
+        ((HashJoinQueryPlanRequestBuilder) createRequestBuilder(sql));
+    request.plan();
+    return request.getConfig();
+  }
+
+  private Matcher<Hint> hint(Matcher<HintType> typeMatcher, Matcher<Object[]> valuesMatcher) {
+    return both(featureValueOf("HintType", typeMatcher, Hint::getType))
+        .and(featureValueOf("HintValue", valuesMatcher, Hint::getParams));
+  }
+
+  private Matcher<HintType> hintType(HintType type) {
+    return is(type);
+  }
+
+  private Matcher<Object[]> hintValues(Object... values) {
+    if (values.length == 0) {
+      return emptyArray();
     }
-
-    private Matcher<Integer> blockSize(int size) {
-        return is(size);
-    }
-
-    @SuppressWarnings("unchecked")
-    private Matcher<Integer[]> scrollPageSize(int size1, int size2) {
-        return arrayContaining(is(size1), is(size2));
-    }
-
-    private Matcher<Integer> circuitBreakLimit(int limit) {
-        return is(limit);
-    }
-
-    private Matcher<double[]> backOffRetryIntervals(double[] intervals) {
-        return is(intervals);
-    }
-
-    @SuppressWarnings("unchecked")
-    private static Matcher<Integer[]> totalAndTableLimit(int totalLimit, int tableLimit1, int tableLimit2) {
-        return arrayContaining(is(totalLimit), is(tableLimit1), is(tableLimit2));
-    }
-
-    private static Matcher<Integer> timeOut(int timeout) {
-        return is(timeout);
-    }
-
+    return arrayContaining(values);
+  }
+
+  private Matcher<Config> config(
+      Matcher<Integer> blockSizeMatcher,
+      Matcher<Integer[]> scrollPageSizeMatcher,
+      Matcher<Integer> circuitBreakLimitMatcher,
+      Matcher<double[]> backOffRetryIntervalsMatcher,
+      Matcher<Integer[]> totalAndTableLimitMatcher,
+      Matcher<Integer> timeOutMatcher) {
+    return allOf(
+        featureValueOf("Block size", blockSizeMatcher, (cfg -> cfg.blockSize().size())),
+        featureValueOf("Scroll page size", scrollPageSizeMatcher, Config::scrollPageSize),
+        featureValueOf("Circuit break limit", circuitBreakLimitMatcher, Config::circuitBreakLimit),
+        featureValueOf(
+            "Back off retry intervals",
+            backOffRetryIntervalsMatcher,
+            Config::backOffRetryIntervals),
+        featureValueOf(
+            "Total and table limit",
+            totalAndTableLimitMatcher,
+            (cfg -> new Integer[] {cfg.totalLimit(), cfg.tableLimit1(), cfg.tableLimit2()})),
+        featureValueOf("Time out", timeOutMatcher, Config::timeout));
+  }
+
+  private Matcher<Integer> blockSize(int size) {
+    return is(size);
+  }
+
+  @SuppressWarnings("unchecked")
+  private Matcher<Integer[]> scrollPageSize(int size1, int size2) {
+    return arrayContaining(is(size1), is(size2));
+  }
+
+  private Matcher<Integer> circuitBreakLimit(int limit) {
+    return is(limit);
+  }
+
+  private Matcher<double[]> backOffRetryIntervals(double[] intervals) {
+    return is(intervals);
+  }
+
+  @SuppressWarnings("unchecked")
+  private static Matcher<Integer[]> totalAndTableLimit(
+      int totalLimit, int tableLimit1, int tableLimit2) {
+    return arrayContaining(is(totalLimit), is(tableLimit1), is(tableLimit2));
+  }
+
+  private static Matcher<Integer> timeOut(int timeout) {
+    return is(timeout);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerExecuteTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerExecuteTest.java
index 55ea8c390b..dc8e094e2d 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerExecuteTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerExecuteTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner;
 
 import static org.opensearch.sql.legacy.util.MatcherUtils.hit;
@@ -14,767 +13,420 @@
 import org.opensearch.search.SearchHit;
 import org.opensearch.sql.legacy.util.MatcherUtils;
 
-/**
- * Query planner execution unit test
- */
+/** Query planner execution unit test */
 public class QueryPlannerExecuteTest extends QueryPlannerTest {
 
-    @Test
-    public void simpleJoin() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname FROM employee e " +
-                "  JOIN department d ON d.id = e.departmentId " +
-                "    WHERE d.region = 'US' AND e.age > 30",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Hank", "1")
-                ),
-                departments(
-                    department(1, "1", "AWS")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Hank")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleJoinWithSelectAll() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT * FROM employee e " +
-                "  JOIN department d ON d.id = e.departmentId ",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Hank", "1")
-                ),
-                departments(
-                    department(1, "1", "AWS")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("d.id", "1"),
-                    MatcherUtils.kv("e.lastname", "Alice"),
-                    MatcherUtils.kv("e.departmentId", "1")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("d.id", "1"),
-                    MatcherUtils.kv("e.lastname", "Hank"),
-                    MatcherUtils.kv("e.departmentId", "1")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleLeftJoinWithSelectAllFromOneTable() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT e.lastname, d.* FROM employee e " +
-                "  LEFT JOIN department d ON d.id = e.departmentId ",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Hank", "1"),
-                    employee(3, "Allen", "3")
-                ),
-                departments(
-                    department(1, "1", "AWS"),
-                    department(2, "2", "Retail")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("e.lastname", "Alice"),
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("d.id", "1")
-                ),
-                hit(
-                    MatcherUtils.kv("e.lastname", "Hank"),
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("d.id", "1")
-                ),
-                hit(
-                    MatcherUtils.kv("e.lastname", "Allen")
-                    /*
-                     * Not easy to figure out all column names for d.* without reading metadata
-                     * or look into other rows from d. But in the extreme case, d could be empty table
-                     * which requires metadata read anyway.
-                     */
-                    //kv("d.name", null),
-                    //kv("d.id", null)
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleJoinWithSelectAllFromBothTables() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT e.*, d.* FROM employee e " +
-                "  JOIN department d ON d.id = e.departmentId ",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Hank", "1")
-                ),
-                departments(
-                    department(1, "1", "AWS")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("d.id", "1"),
-                    MatcherUtils.kv("e.lastname", "Alice"),
-                    MatcherUtils.kv("e.departmentId", "1")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("d.id", "1"),
-                    MatcherUtils.kv("e.lastname", "Hank"),
-                    MatcherUtils.kv("e.departmentId", "1")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleJoinWithoutMatch() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname FROM employee e " +
-                "  JOIN department d ON d.id = e.departmentId " +
-                "    WHERE d.region = 'US' AND e.age > 30",
-                employees(
-                    employee(1, "Alice", "2"),
-                    employee(2, "Hank", "3")
-                ),
-                departments(
-                    department(1, "1", "AWS")
-                )
-            ),
-            hits()
-        );
-    }
-
-    @Test
-    public void simpleJoinWithSomeMatches() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname FROM employee e " +
-                "  JOIN department d ON d.id = e.departmentId " +
-                "    WHERE d.region = 'US' AND e.age > 30",
-                employees(
-                    employee(1, "Alice", "2"),
-                    employee(2, "Hank", "3")
-                ),
-                departments(
-                    department(1, "1", "AWS"),
-                    department(2, "2", "Retail")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "Retail"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleJoinWithAllMatches() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname FROM employee e " +
-                "  JOIN department d ON d.id = e.departmentId " +
-                "    WHERE d.region = 'US' AND e.age > 30",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Hank", "1"),
-                    employee(3, "Mike", "2")
-                ),
-                departments(
-                    department(1, "1", "AWS"),
-                    department(2, "2", "Retail")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Hank")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "Retail"),
-                    MatcherUtils.kv("e.lastname", "Mike")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleJoinWithNull() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname FROM employee e " +
-                "  JOIN department d ON d.id = e.departmentId " +
-                "    WHERE d.region = 'US' AND e.age > 30",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Hank", null),
-                    employee(3, "Mike", "2")
-                ),
-                departments(
-                    department(1, "1", "AWS"),
-                    department(2, null, "Retail")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleJoinWithColumnNameConflict() {
-        // Add a same column 'name' as in department on purpose
-        SearchHit alice = employee(1, "Alice", "1");
-        alice.getSourceAsMap().put("name", "Alice Alice");
-        SearchHit hank = employee(2, "Hank", "2");
-        hank.getSourceAsMap().put("name", "Hank Hank");
-
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.name FROM employee e " +
-                "  JOIN department d ON d.id = e.departmentId " +
-                "    WHERE d.region = 'US' AND e.age > 30",
-                employees(
-                    alice, hank
-                ),
-                departments(
-                    department(1, "1", "AWS")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.name", "Alice Alice")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleJoinWithAliasInSelect() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name AS dname, e.lastname AS ename FROM employee e " +
-                "  JOIN department d ON d.id = e.departmentId " +
-                "    WHERE d.region = 'US' AND e.age > 30",
-                employees(
-                    employee(1, "Alice", "2"),
-                    employee(2, "Hank", "3")
-                ),
-                departments(
-                    department(1, "1", "AWS"),
-                    department(2, "2", "Retail")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("dname", "Retail"),
-                    MatcherUtils.kv("ename", "Alice")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleLeftJoinWithoutMatchInLeft() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname FROM employee e " +
-                "  LEFT JOIN department d ON d.id = e.departmentId " +
-                "    WHERE d.region = 'US' AND e.age > 30",
-                employees(
-                    employee(1, "Alice", "2"),
-                    employee(2, "Hank", "3")
-                ),
-                departments(
-                    department(1, "1", "AWS")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", null),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", null),
-                    MatcherUtils.kv("e.lastname", "Hank")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleLeftJoinWithSomeMismatchesInLeft() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname FROM employee e " +
-                "  LEFT JOIN department d ON d.id = e.departmentId " +
-                "    WHERE d.region = 'US' AND e.age > 30",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Hank", "2")
-                ),
-                departments(
-                    department(1, "1", "AWS")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", null),
-                    MatcherUtils.kv("e.lastname", "Hank")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleLeftJoinWithSomeMismatchesInRight() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname FROM employee e " +
-                "  LEFT JOIN department d ON d.id = e.departmentId " +
-                "    WHERE d.region = 'US' AND e.age > 30",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Hank", "1")
-                ),
-                departments(
-                    department(1, "1", "AWS"),
-                    department(2, "2", "Retail")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Hank")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleQueryWithTotalLimit() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname FROM employee e JOIN department d ON d.id = e.departmentId LIMIT 1",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Hank", "2")
-                ),
-                departments(
-                    department(1, "1", "AWS"),
-                    department(1, "2", "Retail")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleQueryWithTableLimit() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT /*! JOIN_TABLES_LIMIT(1, 5) */ d.name, e.lastname FROM employee e JOIN department d ON d.id = e.departmentId",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Hank", "1")
-                ),
-                departments(
-                    department(1, "1", "AWS"),
-                    department(1, "2", "Retail")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleQueryWithOrderBy() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname FROM employee e JOIN department d ON d.id = e.departmentId ORDER BY e.lastname",
-                employees(
-                    employee(1, "Hank", "1"),
-                    employee(2, "Alice", "2"),
-                    employee(3, "Allen", "1"),
-                    employee(4, "Ellis", "2"),
-                    employee(5, "Frank", "2")
-                ),
-                departments(
-                    department(1, "1", "AWS"),
-                    department(2, "2", "Retail")
-                )
-            ),
-            MatcherUtils.hitsInOrder(
-                hit(
-                    MatcherUtils.kv("d.name", "Retail"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Allen")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "Retail"),
-                    MatcherUtils.kv("e.lastname", "Ellis")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "Retail"),
-                    MatcherUtils.kv("e.lastname", "Frank")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "AWS"),
-                    MatcherUtils.kv("e.lastname", "Hank")
-                )
-            )
-        );
-    }
-
-    /** Doesn't support muliple columns from both tables (order is missing) */
-    @Test
-    public void simpleQueryWithLeftJoinAndOrderByMultipleColumnsFromOneTableInDesc() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.id AS id, e.lastname AS lastname FROM employee e " +
-                "  LEFT JOIN department d ON d.id = e.departmentId " +
-                "    ORDER BY e.departmentId, e.lastname DESC",
-                employees(
-                    employee(1, "Hank", "1"),
-                    employee(2, "Alice", "2"),
-                    employee(3, "Allen", "1"),
-                    employee(4, "Ellis", "2"),
-                    employee(5, "Gary", "3"),
-                    employee(5, "Frank", "3")
-                ),
-                departments(
-                    department(1, "1", "AWS"),
-                    department(2, "2", "Retail")
-                )
-            ),
-            MatcherUtils.hitsInOrder(
-                hit(
-                    MatcherUtils.kv("id", null),
-                    MatcherUtils.kv("lastname", "Gary")
-                ),
-                hit(
-                    MatcherUtils.kv("id", null),
-                    MatcherUtils.kv("lastname", "Frank")
-                ),
-                hit(
-                    MatcherUtils.kv("id", "2"),
-                    MatcherUtils.kv("lastname", "Ellis")
-                ),
-                hit(
-                    MatcherUtils.kv("id", "2"),
-                    MatcherUtils.kv("lastname", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("id", "1"),
-                    MatcherUtils.kv("lastname", "Hank")
-                ),
-                hit(
-                    MatcherUtils.kv("id", "1"),
-                    MatcherUtils.kv("lastname", "Allen")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleCrossJoin() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name AS dname, e.lastname AS ename FROM employee e JOIN department d",
-                employees(
-                    employee(1, "Alice", "2"),
-                    employee(2, "Hank", "3")
-                ),
-                departments(
-                    department(1, "1", "AWS"),
-                    department(2, "2", "Retail")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("dname", "AWS"),
-                    MatcherUtils.kv("ename", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("dname", "AWS"),
-                    MatcherUtils.kv("ename", "Hank")
-                ),
-                hit(
-                    MatcherUtils.kv("dname", "Retail"),
-                    MatcherUtils.kv("ename", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("dname", "Retail"),
-                    MatcherUtils.kv("ename", "Hank")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void simpleQueryWithTermsFilterOptimization() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT /*! HASH_WITH_TERMS_FILTER*/ " + // Be careful that no space between ...FILTER and */
-                "  e.lastname, d.id FROM employee e " +
-                "    JOIN department d ON d.id = e.departmentId AND d.name = e.lastname",
-                employees(
-                    employee(1, "Johnson", "1"),
-                    employee(2, "Allen", "4"),
-                    employee(3, "Ellis", "2"),
-                    employee(4, "Dell", "1"),
-                    employee(5, "Dell", "4")
-                ),
-                departments(
-                    department(1, "1", "Johnson"),
-                    department(1, "4", "Dell")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("e.lastname", "Johnson"),
-                    MatcherUtils.kv("d.id", "1")
-                ),
-                hit(
-                    MatcherUtils.kv("e.lastname", "Dell"),
-                    MatcherUtils.kv("d.id", "4")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void complexJoinWithMultipleConditions() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname, d.id " +
-                "  FROM employee e " +
-                "    JOIN department d " +
-                "      ON d.id = e.departmentId AND d.name = e.lastname" +
-                "        WHERE d.region = 'US' AND e.age > 30",
-                employees(
-                    employee(1, "Dell", "1"),
-                    employee(2, "Hank", "1")
-                ),
-                departments(
-                    department(1, "1", "Dell")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "Dell"),
-                    MatcherUtils.kv("e.lastname", "Dell"),
-                    MatcherUtils.kv("d.id", "1")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void complexJoinWithOrConditions() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname " +
-                "  FROM employee e " +
-                "    JOIN department d " +
-                "      ON d.id = e.departmentId OR d.name = e.lastname",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Dell", "2"),
-                    employee(3, "Hank", "3")
-                ),
-                departments(
-                    department(1, "1", "Dell"),
-                    department(2, "4", "AWS")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "Dell"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "Dell"),
-                    MatcherUtils.kv("e.lastname", "Dell")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void complexJoinWithOrConditionsDuplicate() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.departmentId " +
-                "  FROM employee e " +
-                "    JOIN department d " +
-                "      ON d.id = e.departmentId OR d.name = e.lastname",
-                employees(
-                    employee(1, "Dell", "1") // Match both condition but should only show once in result
-                ),
-                departments(
-                    department(1, "1", "Dell"),
-                    department(2, "4", "AWS")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "Dell"),
-                    MatcherUtils.kv("e.departmentId", "1")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void complexJoinWithOrConditionsAndTermsFilterOptimization() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT /*! HASH_WITH_TERMS_FILTER*/ " +
-                " d.name, e.lastname " +
-                "  FROM employee e " +
-                "    JOIN department d " +
-                "      ON d.id = e.departmentId OR d.name = e.lastname",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Dell", "2"),
-                    employee(3, "Hank", "3")
-                ),
-                departments(
-                    department(1, "1", "Dell"),
-                    department(2, "4", "AWS")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "Dell"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "Dell"),
-                    MatcherUtils.kv("e.lastname", "Dell")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void complexLeftJoinWithOrConditions() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT d.name, e.lastname " +
-                "  FROM employee e " +
-                "    LEFT JOIN department d " +
-                "      ON d.id = e.departmentId OR d.name = e.lastname",
-                employees(
-                    employee(1, "Alice", "1"),
-                    employee(2, "Dell", "2"),
-                    employee(3, "Hank", "3")
-                ),
-                departments(
-                    department(1, "1", "Dell"),
-                    department(2, "4", "AWS")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "Dell"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", "Dell"),
-                    MatcherUtils.kv("e.lastname", "Dell")
-                ),
-                hit(
-                    MatcherUtils.kv("d.name", null),
-                    MatcherUtils.kv("e.lastname", "Hank")
-                )
-            )
-        );
-    }
-
-    @Test
-    public void complexJoinWithTableLimitHint() {
-        MatcherAssert.assertThat(
-            query(
-                "SELECT " +
-                " /*! JOIN_TABLES_LIMIT(2, 1)*/" +
-                " d.name, e.lastname " +
-                "  FROM employee e " +
-                "    JOIN department d " +
-                "      ON d.id = e.departmentId",
-                employees(
-                    employee(1, "Alice", "1"),  // Only this and the second row will be pulled out
-                    employee(2, "Dell", "4"),
-                    employee(3, "Hank", "1")
-                ),
-                departments(
-                    department(1, "1", "Dell"), // Only this row will be pulled out
-                    department(2, "4", "AWS")
-                )
-            ),
-            hits(
-                hit(
-                    MatcherUtils.kv("d.name", "Dell"),
-                    MatcherUtils.kv("e.lastname", "Alice")
-                )
-            )
-        );
-    }
-
+  @Test
+  public void simpleJoin() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname FROM employee e "
+                + "  JOIN department d ON d.id = e.departmentId "
+                + "    WHERE d.region = 'US' AND e.age > 30",
+            employees(employee(1, "Alice", "1"), employee(2, "Hank", "1")),
+            departments(department(1, "1", "AWS"))),
+        hits(
+            hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Alice")),
+            hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Hank"))));
+  }
+
+  @Test
+  public void simpleJoinWithSelectAll() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT * FROM employee e " + "  JOIN department d ON d.id = e.departmentId ",
+            employees(employee(1, "Alice", "1"), employee(2, "Hank", "1")),
+            departments(department(1, "1", "AWS"))),
+        hits(
+            hit(
+                MatcherUtils.kv("d.name", "AWS"),
+                MatcherUtils.kv("d.id", "1"),
+                MatcherUtils.kv("e.lastname", "Alice"),
+                MatcherUtils.kv("e.departmentId", "1")),
+            hit(
+                MatcherUtils.kv("d.name", "AWS"),
+                MatcherUtils.kv("d.id", "1"),
+                MatcherUtils.kv("e.lastname", "Hank"),
+                MatcherUtils.kv("e.departmentId", "1"))));
+  }
+
+  @Test
+  public void simpleLeftJoinWithSelectAllFromOneTable() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT e.lastname, d.* FROM employee e "
+                + "  LEFT JOIN department d ON d.id = e.departmentId ",
+            employees(
+                employee(1, "Alice", "1"), employee(2, "Hank", "1"), employee(3, "Allen", "3")),
+            departments(department(1, "1", "AWS"), department(2, "2", "Retail"))),
+        hits(
+            hit(
+                MatcherUtils.kv("e.lastname", "Alice"),
+                MatcherUtils.kv("d.name", "AWS"),
+                MatcherUtils.kv("d.id", "1")),
+            hit(
+                MatcherUtils.kv("e.lastname", "Hank"),
+                MatcherUtils.kv("d.name", "AWS"),
+                MatcherUtils.kv("d.id", "1")),
+            hit(
+                MatcherUtils.kv("e.lastname", "Allen")
+                /*
+                 * Not easy to figure out all column names for d.* without reading metadata
+                 * or look into other rows from d. But in the extreme case, d could be empty table
+                 * which requires metadata read anyway.
+                 */
+                // kv("d.name", null),
+                // kv("d.id", null)
+                )));
+  }
+
+  @Test
+  public void simpleJoinWithSelectAllFromBothTables() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT e.*, d.* FROM employee e " + "  JOIN department d ON d.id = e.departmentId ",
+            employees(employee(1, "Alice", "1"), employee(2, "Hank", "1")),
+            departments(department(1, "1", "AWS"))),
+        hits(
+            hit(
+                MatcherUtils.kv("d.name", "AWS"),
+                MatcherUtils.kv("d.id", "1"),
+                MatcherUtils.kv("e.lastname", "Alice"),
+                MatcherUtils.kv("e.departmentId", "1")),
+            hit(
+                MatcherUtils.kv("d.name", "AWS"),
+                MatcherUtils.kv("d.id", "1"),
+                MatcherUtils.kv("e.lastname", "Hank"),
+                MatcherUtils.kv("e.departmentId", "1"))));
+  }
+
+  @Test
+  public void simpleJoinWithoutMatch() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname FROM employee e "
+                + "  JOIN department d ON d.id = e.departmentId "
+                + "    WHERE d.region = 'US' AND e.age > 30",
+            employees(employee(1, "Alice", "2"), employee(2, "Hank", "3")),
+            departments(department(1, "1", "AWS"))),
+        hits());
+  }
+
+  @Test
+  public void simpleJoinWithSomeMatches() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname FROM employee e "
+                + "  JOIN department d ON d.id = e.departmentId "
+                + "    WHERE d.region = 'US' AND e.age > 30",
+            employees(employee(1, "Alice", "2"), employee(2, "Hank", "3")),
+            departments(department(1, "1", "AWS"), department(2, "2", "Retail"))),
+        hits(hit(MatcherUtils.kv("d.name", "Retail"), MatcherUtils.kv("e.lastname", "Alice"))));
+  }
+
+  @Test
+  public void simpleJoinWithAllMatches() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname FROM employee e "
+                + "  JOIN department d ON d.id = e.departmentId "
+                + "    WHERE d.region = 'US' AND e.age > 30",
+            employees(
+                employee(1, "Alice", "1"), employee(2, "Hank", "1"), employee(3, "Mike", "2")),
+            departments(department(1, "1", "AWS"), department(2, "2", "Retail"))),
+        hits(
+            hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Alice")),
+            hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Hank")),
+            hit(MatcherUtils.kv("d.name", "Retail"), MatcherUtils.kv("e.lastname", "Mike"))));
+  }
+
+  @Test
+  public void simpleJoinWithNull() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname FROM employee e "
+                + "  JOIN department d ON d.id = e.departmentId "
+                + "    WHERE d.region = 'US' AND e.age > 30",
+            employees(
+                employee(1, "Alice", "1"), employee(2, "Hank", null), employee(3, "Mike", "2")),
+            departments(department(1, "1", "AWS"), department(2, null, "Retail"))),
+        hits(hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Alice"))));
+  }
+
+  @Test
+  public void simpleJoinWithColumnNameConflict() {
+    // Add a same column 'name' as in department on purpose
+    SearchHit alice = employee(1, "Alice", "1");
+    alice.getSourceAsMap().put("name", "Alice Alice");
+    SearchHit hank = employee(2, "Hank", "2");
+    hank.getSourceAsMap().put("name", "Hank Hank");
+
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.name FROM employee e "
+                + "  JOIN department d ON d.id = e.departmentId "
+                + "    WHERE d.region = 'US' AND e.age > 30",
+            employees(alice, hank),
+            departments(department(1, "1", "AWS"))),
+        hits(hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.name", "Alice Alice"))));
+  }
+
+  @Test
+  public void simpleJoinWithAliasInSelect() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name AS dname, e.lastname AS ename FROM employee e "
+                + "  JOIN department d ON d.id = e.departmentId "
+                + "    WHERE d.region = 'US' AND e.age > 30",
+            employees(employee(1, "Alice", "2"), employee(2, "Hank", "3")),
+            departments(department(1, "1", "AWS"), department(2, "2", "Retail"))),
+        hits(hit(MatcherUtils.kv("dname", "Retail"), MatcherUtils.kv("ename", "Alice"))));
+  }
+
+  @Test
+  public void simpleLeftJoinWithoutMatchInLeft() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname FROM employee e "
+                + "  LEFT JOIN department d ON d.id = e.departmentId "
+                + "    WHERE d.region = 'US' AND e.age > 30",
+            employees(employee(1, "Alice", "2"), employee(2, "Hank", "3")),
+            departments(department(1, "1", "AWS"))),
+        hits(
+            hit(MatcherUtils.kv("d.name", null), MatcherUtils.kv("e.lastname", "Alice")),
+            hit(MatcherUtils.kv("d.name", null), MatcherUtils.kv("e.lastname", "Hank"))));
+  }
+
+  @Test
+  public void simpleLeftJoinWithSomeMismatchesInLeft() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname FROM employee e "
+                + "  LEFT JOIN department d ON d.id = e.departmentId "
+                + "    WHERE d.region = 'US' AND e.age > 30",
+            employees(employee(1, "Alice", "1"), employee(2, "Hank", "2")),
+            departments(department(1, "1", "AWS"))),
+        hits(
+            hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Alice")),
+            hit(MatcherUtils.kv("d.name", null), MatcherUtils.kv("e.lastname", "Hank"))));
+  }
+
+  @Test
+  public void simpleLeftJoinWithSomeMismatchesInRight() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname FROM employee e "
+                + "  LEFT JOIN department d ON d.id = e.departmentId "
+                + "    WHERE d.region = 'US' AND e.age > 30",
+            employees(employee(1, "Alice", "1"), employee(2, "Hank", "1")),
+            departments(department(1, "1", "AWS"), department(2, "2", "Retail"))),
+        hits(
+            hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Alice")),
+            hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Hank"))));
+  }
+
+  @Test
+  public void simpleQueryWithTotalLimit() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname FROM employee e JOIN department d ON d.id = e.departmentId"
+                + " LIMIT 1",
+            employees(employee(1, "Alice", "1"), employee(2, "Hank", "2")),
+            departments(department(1, "1", "AWS"), department(1, "2", "Retail"))),
+        hits(hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Alice"))));
+  }
+
+  @Test
+  public void simpleQueryWithTableLimit() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT /*! JOIN_TABLES_LIMIT(1, 5) */ d.name, e.lastname FROM employee e JOIN"
+                + " department d ON d.id = e.departmentId",
+            employees(employee(1, "Alice", "1"), employee(2, "Hank", "1")),
+            departments(department(1, "1", "AWS"), department(1, "2", "Retail"))),
+        hits(hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Alice"))));
+  }
+
+  @Test
+  public void simpleQueryWithOrderBy() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname FROM employee e JOIN department d ON d.id = e.departmentId"
+                + " ORDER BY e.lastname",
+            employees(
+                employee(1, "Hank", "1"),
+                employee(2, "Alice", "2"),
+                employee(3, "Allen", "1"),
+                employee(4, "Ellis", "2"),
+                employee(5, "Frank", "2")),
+            departments(department(1, "1", "AWS"), department(2, "2", "Retail"))),
+        MatcherUtils.hitsInOrder(
+            hit(MatcherUtils.kv("d.name", "Retail"), MatcherUtils.kv("e.lastname", "Alice")),
+            hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Allen")),
+            hit(MatcherUtils.kv("d.name", "Retail"), MatcherUtils.kv("e.lastname", "Ellis")),
+            hit(MatcherUtils.kv("d.name", "Retail"), MatcherUtils.kv("e.lastname", "Frank")),
+            hit(MatcherUtils.kv("d.name", "AWS"), MatcherUtils.kv("e.lastname", "Hank"))));
+  }
+
+  /** Doesn't support muliple columns from both tables (order is missing) */
+  @Test
+  public void simpleQueryWithLeftJoinAndOrderByMultipleColumnsFromOneTableInDesc() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.id AS id, e.lastname AS lastname FROM employee e "
+                + "  LEFT JOIN department d ON d.id = e.departmentId "
+                + "    ORDER BY e.departmentId, e.lastname DESC",
+            employees(
+                employee(1, "Hank", "1"),
+                employee(2, "Alice", "2"),
+                employee(3, "Allen", "1"),
+                employee(4, "Ellis", "2"),
+                employee(5, "Gary", "3"),
+                employee(5, "Frank", "3")),
+            departments(department(1, "1", "AWS"), department(2, "2", "Retail"))),
+        MatcherUtils.hitsInOrder(
+            hit(MatcherUtils.kv("id", null), MatcherUtils.kv("lastname", "Gary")),
+            hit(MatcherUtils.kv("id", null), MatcherUtils.kv("lastname", "Frank")),
+            hit(MatcherUtils.kv("id", "2"), MatcherUtils.kv("lastname", "Ellis")),
+            hit(MatcherUtils.kv("id", "2"), MatcherUtils.kv("lastname", "Alice")),
+            hit(MatcherUtils.kv("id", "1"), MatcherUtils.kv("lastname", "Hank")),
+            hit(MatcherUtils.kv("id", "1"), MatcherUtils.kv("lastname", "Allen"))));
+  }
+
+  @Test
+  public void simpleCrossJoin() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name AS dname, e.lastname AS ename FROM employee e JOIN department d",
+            employees(employee(1, "Alice", "2"), employee(2, "Hank", "3")),
+            departments(department(1, "1", "AWS"), department(2, "2", "Retail"))),
+        hits(
+            hit(MatcherUtils.kv("dname", "AWS"), MatcherUtils.kv("ename", "Alice")),
+            hit(MatcherUtils.kv("dname", "AWS"), MatcherUtils.kv("ename", "Hank")),
+            hit(MatcherUtils.kv("dname", "Retail"), MatcherUtils.kv("ename", "Alice")),
+            hit(MatcherUtils.kv("dname", "Retail"), MatcherUtils.kv("ename", "Hank"))));
+  }
+
+  @Test
+  public void simpleQueryWithTermsFilterOptimization() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT /*! HASH_WITH_TERMS_FILTER*/ "
+                + // Be careful that no space between ...FILTER and */
+                "  e.lastname, d.id FROM employee e "
+                + "    JOIN department d ON d.id = e.departmentId AND d.name = e.lastname",
+            employees(
+                employee(1, "Johnson", "1"),
+                employee(2, "Allen", "4"),
+                employee(3, "Ellis", "2"),
+                employee(4, "Dell", "1"),
+                employee(5, "Dell", "4")),
+            departments(department(1, "1", "Johnson"), department(1, "4", "Dell"))),
+        hits(
+            hit(MatcherUtils.kv("e.lastname", "Johnson"), MatcherUtils.kv("d.id", "1")),
+            hit(MatcherUtils.kv("e.lastname", "Dell"), MatcherUtils.kv("d.id", "4"))));
+  }
+
+  @Test
+  public void complexJoinWithMultipleConditions() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname, d.id "
+                + "  FROM employee e "
+                + "    JOIN department d "
+                + "      ON d.id = e.departmentId AND d.name = e.lastname"
+                + "        WHERE d.region = 'US' AND e.age > 30",
+            employees(employee(1, "Dell", "1"), employee(2, "Hank", "1")),
+            departments(department(1, "1", "Dell"))),
+        hits(
+            hit(
+                MatcherUtils.kv("d.name", "Dell"),
+                MatcherUtils.kv("e.lastname", "Dell"),
+                MatcherUtils.kv("d.id", "1"))));
+  }
+
+  @Test
+  public void complexJoinWithOrConditions() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname "
+                + "  FROM employee e "
+                + "    JOIN department d "
+                + "      ON d.id = e.departmentId OR d.name = e.lastname",
+            employees(
+                employee(1, "Alice", "1"), employee(2, "Dell", "2"), employee(3, "Hank", "3")),
+            departments(department(1, "1", "Dell"), department(2, "4", "AWS"))),
+        hits(
+            hit(MatcherUtils.kv("d.name", "Dell"), MatcherUtils.kv("e.lastname", "Alice")),
+            hit(MatcherUtils.kv("d.name", "Dell"), MatcherUtils.kv("e.lastname", "Dell"))));
+  }
+
+  @Test
+  public void complexJoinWithOrConditionsDuplicate() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.departmentId "
+                + "  FROM employee e "
+                + "    JOIN department d "
+                + "      ON d.id = e.departmentId OR d.name = e.lastname",
+            employees(
+                employee(1, "Dell", "1") // Match both condition but should only show once in result
+                ),
+            departments(department(1, "1", "Dell"), department(2, "4", "AWS"))),
+        hits(hit(MatcherUtils.kv("d.name", "Dell"), MatcherUtils.kv("e.departmentId", "1"))));
+  }
+
+  @Test
+  public void complexJoinWithOrConditionsAndTermsFilterOptimization() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT /*! HASH_WITH_TERMS_FILTER*/ "
+                + " d.name, e.lastname "
+                + "  FROM employee e "
+                + "    JOIN department d "
+                + "      ON d.id = e.departmentId OR d.name = e.lastname",
+            employees(
+                employee(1, "Alice", "1"), employee(2, "Dell", "2"), employee(3, "Hank", "3")),
+            departments(department(1, "1", "Dell"), department(2, "4", "AWS"))),
+        hits(
+            hit(MatcherUtils.kv("d.name", "Dell"), MatcherUtils.kv("e.lastname", "Alice")),
+            hit(MatcherUtils.kv("d.name", "Dell"), MatcherUtils.kv("e.lastname", "Dell"))));
+  }
+
+  @Test
+  public void complexLeftJoinWithOrConditions() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT d.name, e.lastname "
+                + "  FROM employee e "
+                + "    LEFT JOIN department d "
+                + "      ON d.id = e.departmentId OR d.name = e.lastname",
+            employees(
+                employee(1, "Alice", "1"), employee(2, "Dell", "2"), employee(3, "Hank", "3")),
+            departments(department(1, "1", "Dell"), department(2, "4", "AWS"))),
+        hits(
+            hit(MatcherUtils.kv("d.name", "Dell"), MatcherUtils.kv("e.lastname", "Alice")),
+            hit(MatcherUtils.kv("d.name", "Dell"), MatcherUtils.kv("e.lastname", "Dell")),
+            hit(MatcherUtils.kv("d.name", null), MatcherUtils.kv("e.lastname", "Hank"))));
+  }
+
+  @Test
+  public void complexJoinWithTableLimitHint() {
+    MatcherAssert.assertThat(
+        query(
+            "SELECT "
+                + " /*! JOIN_TABLES_LIMIT(2, 1)*/"
+                + " d.name, e.lastname "
+                + "  FROM employee e "
+                + "    JOIN department d "
+                + "      ON d.id = e.departmentId",
+            employees(
+                employee(1, "Alice", "1"), // Only this and the second row will be pulled out
+                employee(2, "Dell", "4"),
+                employee(3, "Hank", "1")),
+            departments(
+                department(1, "1", "Dell"), // Only this row will be pulled out
+                department(2, "4", "AWS"))),
+        hits(hit(MatcherUtils.kv("d.name", "Dell"), MatcherUtils.kv("e.lastname", "Alice"))));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerExplainTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerExplainTest.java
index 2c92c91666..7f495935ca 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerExplainTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerExplainTest.java
@@ -3,45 +3,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner;
 
 import org.junit.Test;
 import org.opensearch.sql.legacy.query.planner.core.QueryPlanner;
 
-/**
- * Query planner explanation unit test
- */
+/** Query planner explanation unit test */
 public class QueryPlannerExplainTest extends QueryPlannerTest {
 
-    @Test
-    public void explainInJson() {
-        QueryPlanner planner = plan(
-            "SELECT d.name, e.lastname FROM employee e " +
-            "  JOIN department d ON d.id = e.departmentId " +
-            "    WHERE d.region = 'US' AND e.age > 30"
-        );
-        planner.explain();
-    }
-
-    @Test
-    public void explainInJsonWithComplicatedOn() {
-        QueryPlanner planner = plan(
-            "SELECT d.name, e.lastname FROM employee e " +
-            "  JOIN department d ON d.id = e.departmentId AND d.location = e.region " +
-            "    WHERE d.region = 'US' AND e.age > 30"
-        );
-        planner.explain();
-    }
-
-    @Test
-    public void explainInJsonWithDuplicateColumnsPushedDown() {
-        QueryPlanner planner = plan(
-            "SELECT d.id, e.departmentId FROM employee e " +
-            "  JOIN department d ON d.id = e.departmentId AND d.location = e.region " +
-            "    WHERE d.region = 'US' AND e.age > 30"
-        );
-        planner.explain();
-    }
-
+  @Test
+  public void explainInJson() {
+    QueryPlanner planner =
+        plan(
+            "SELECT d.name, e.lastname FROM employee e "
+                + "  JOIN department d ON d.id = e.departmentId "
+                + "    WHERE d.region = 'US' AND e.age > 30");
+    planner.explain();
+  }
+
+  @Test
+  public void explainInJsonWithComplicatedOn() {
+    QueryPlanner planner =
+        plan(
+            "SELECT d.name, e.lastname FROM employee e "
+                + "  JOIN department d ON d.id = e.departmentId AND d.location = e.region "
+                + "    WHERE d.region = 'US' AND e.age > 30");
+    planner.explain();
+  }
+
+  @Test
+  public void explainInJsonWithDuplicateColumnsPushedDown() {
+    QueryPlanner planner =
+        plan(
+            "SELECT d.id, e.departmentId FROM employee e "
+                + "  JOIN department d ON d.id = e.departmentId AND d.location = e.region "
+                + "    WHERE d.region = 'US' AND e.age > 30");
+    planner.explain();
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerMonitorTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerMonitorTest.java
index 66ce2411f4..9b1d307ebc 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerMonitorTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerMonitorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner;
 
 import static org.mockito.Mockito.doAnswer;
@@ -18,109 +17,95 @@
 import org.opensearch.sql.legacy.query.planner.resource.Stats;
 import org.opensearch.sql.legacy.query.planner.resource.Stats.MemStats;
 
-/**
- * Circuit breaker component test
- */
+/** Circuit breaker component test */
 @Ignore
 public class QueryPlannerMonitorTest extends QueryPlannerTest {
 
-    /** Configure back off strategy 1s, 1s and 1s - retry 4 times at most */
-    private static final String TEST_SQL1 =
-        "SELECT /*! JOIN_BACK_OFF_RETRY_INTERVALS(1, 1, 1) */ " +
-        "  /*! JOIN_CIRCUIT_BREAK_LIMIT(";
-
-    private static final String TEST_SQL2 =
-        ") */ d.name, e.lastname FROM employee e " +
-        "  JOIN department d ON d.id = e.departmentId " +
-        "    WHERE d.region = 'US' AND e.age > 30";
-
-    private static final long[] PERCENT_USAGE_15 = freeAndTotalMem(85, 100);
-    private static final long[] PERCENT_USAGE_24 = freeAndTotalMem(76, 100);
-    private static final long[] PERCENT_USAGE_50 = freeAndTotalMem(50, 100);
-
-    @Spy
-    private Stats stats = new Stats(client);
-
-    @Test
-    public void reachedLimitAndRecoverAt1stAttempt() {
-        mockMemUsage(PERCENT_USAGE_15, PERCENT_USAGE_50, PERCENT_USAGE_24);
-        queryWithLimit(25); // TODO: assert if final result set is correct after recovery
-    }
-
-    @Test
-    public void reachedLimitAndRecoverAt2ndAttempt() {
-        mockMemUsage(PERCENT_USAGE_15, PERCENT_USAGE_50, PERCENT_USAGE_50, PERCENT_USAGE_15);
-        queryWithLimit(25);
-    }
-
-    @Test
-    public void reachedLimitAndRecoverAt3rdAttempt() {
-        mockMemUsage(PERCENT_USAGE_15, PERCENT_USAGE_50, PERCENT_USAGE_50, PERCENT_USAGE_50, PERCENT_USAGE_15);
-        queryWithLimit(25);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void reachedLimitAndFailFinally() {
-        mockMemUsage(PERCENT_USAGE_15, PERCENT_USAGE_50);
-        queryWithLimit(25);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void reachedLimitAndRejectNewRequest() {
-        mockMemUsage(PERCENT_USAGE_50);
-        queryWithLimit(25);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void timeOut() {
-        query(
-            "SELECT /*! JOIN_TIME_OUT(0) */ " +
-            "  d.name FROM employee e JOIN department d ON d.id = e.departmentId",
-            employees(
-                employee(1, "Dell", "1")
-            ),
-            departments(
-                department(1, "1", "Dell")
-            )
-        );
-    }
-
-    private void mockMemUsage(long[]... memUsages) {
-        doAnswer(new Answer<MemStats>() {
-            private int callCnt = -1;
-
-            @Override
-            public MemStats answer(InvocationOnMock invocation) {
+  /** Configure back off strategy 1s, 1s and 1s - retry 4 times at most */
+  private static final String TEST_SQL1 =
+      "SELECT /*! JOIN_BACK_OFF_RETRY_INTERVALS(1, 1, 1) */ " + "  /*! JOIN_CIRCUIT_BREAK_LIMIT(";
+
+  private static final String TEST_SQL2 =
+      ") */ d.name, e.lastname FROM employee e "
+          + "  JOIN department d ON d.id = e.departmentId "
+          + "    WHERE d.region = 'US' AND e.age > 30";
+
+  private static final long[] PERCENT_USAGE_15 = freeAndTotalMem(85, 100);
+  private static final long[] PERCENT_USAGE_24 = freeAndTotalMem(76, 100);
+  private static final long[] PERCENT_USAGE_50 = freeAndTotalMem(50, 100);
+
+  @Spy private Stats stats = new Stats(client);
+
+  @Test
+  public void reachedLimitAndRecoverAt1stAttempt() {
+    mockMemUsage(PERCENT_USAGE_15, PERCENT_USAGE_50, PERCENT_USAGE_24);
+    queryWithLimit(25); // TODO: assert if final result set is correct after recovery
+  }
+
+  @Test
+  public void reachedLimitAndRecoverAt2ndAttempt() {
+    mockMemUsage(PERCENT_USAGE_15, PERCENT_USAGE_50, PERCENT_USAGE_50, PERCENT_USAGE_15);
+    queryWithLimit(25);
+  }
+
+  @Test
+  public void reachedLimitAndRecoverAt3rdAttempt() {
+    mockMemUsage(
+        PERCENT_USAGE_15, PERCENT_USAGE_50, PERCENT_USAGE_50, PERCENT_USAGE_50, PERCENT_USAGE_15);
+    queryWithLimit(25);
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void reachedLimitAndFailFinally() {
+    mockMemUsage(PERCENT_USAGE_15, PERCENT_USAGE_50);
+    queryWithLimit(25);
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void reachedLimitAndRejectNewRequest() {
+    mockMemUsage(PERCENT_USAGE_50);
+    queryWithLimit(25);
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void timeOut() {
+    query(
+        "SELECT /*! JOIN_TIME_OUT(0) */ "
+            + "  d.name FROM employee e JOIN department d ON d.id = e.departmentId",
+        employees(employee(1, "Dell", "1")),
+        departments(department(1, "1", "Dell")));
+  }
+
+  private void mockMemUsage(long[]... memUsages) {
+    doAnswer(
+            new Answer<MemStats>() {
+              private int callCnt = -1;
+
+              @Override
+              public MemStats answer(InvocationOnMock invocation) {
                 callCnt = Math.min(callCnt + 1, memUsages.length - 1);
-                return new MemStats(
-                    memUsages[callCnt][0], memUsages[callCnt][1]
-                );
-            }
-        }).when(stats).collectMemStats();
-    }
-
-    private static long[] freeAndTotalMem(long free, long total) {
-        return new long[]{ free, total };
-    }
-
-    private SearchHits queryWithLimit(int limit) {
-        return query(
-            TEST_SQL1 + limit + TEST_SQL2,
-            employees(
-                employee(1, "Dell", "1"),
-                employee(2, "Hank", "1")
-            ),
-            departments(
-                department(1, "1", "Dell")
-            )
-        );
-    }
-
-    @Override
-    protected QueryPlanner plan(String sql) {
-        QueryPlanner planner = super.plan(sql);
-        planner.setStats(stats);
-        return planner;
-    }
-
+                return new MemStats(memUsages[callCnt][0], memUsages[callCnt][1]);
+              }
+            })
+        .when(stats)
+        .collectMemStats();
+  }
+
+  private static long[] freeAndTotalMem(long free, long total) {
+    return new long[] {free, total};
+  }
+
+  private SearchHits queryWithLimit(int limit) {
+    return query(
+        TEST_SQL1 + limit + TEST_SQL2,
+        employees(employee(1, "Dell", "1"), employee(2, "Hank", "1")),
+        departments(department(1, "1", "Dell")));
+  }
+
+  @Override
+  protected QueryPlanner plan(String sql) {
+    QueryPlanner planner = super.plan(sql);
+    planner.setStats(stats);
+    return planner;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerTest.java
index 98e067a68a..521b225893 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerTest.java
@@ -3,11 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner;
 
 import static java.util.Collections.emptyList;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -19,7 +18,6 @@
 import com.alibaba.druid.sql.parser.ParserException;
 import com.alibaba.druid.sql.parser.SQLExprParser;
 import com.alibaba.druid.sql.parser.Token;
-import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
 import java.util.List;
 import org.apache.lucene.search.TotalHits;
@@ -32,16 +30,16 @@
 import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.opensearch.action.ActionFuture;
 import org.opensearch.action.search.ClearScrollRequestBuilder;
 import org.opensearch.action.search.ClearScrollResponse;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchScrollRequestBuilder;
 import org.opensearch.client.Client;
-import org.opensearch.common.bytes.BytesArray;
+import org.opensearch.cluster.ClusterName;
+import org.opensearch.common.action.ActionFuture;
 import org.opensearch.common.settings.ClusterSettings;
-import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 import org.opensearch.sql.legacy.domain.JoinSelect;
@@ -59,245 +57,240 @@
 import org.opensearch.sql.legacy.request.SqlRequest;
 import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
 
-/**
- * Test base class for all query planner tests.
- */
+/** Test base class for all query planner tests. */
 @Ignore
 public abstract class QueryPlannerTest {
 
-    @Mock
-    protected Client client;
+  @Mock protected Client client;
 
-    @Mock
-    private SearchResponse response1;
-    private static final String SCROLL_ID1 = "1";
+  @Mock private SearchResponse response1;
+  private static final String SCROLL_ID1 = "1";
 
-    @Mock
-    private SearchResponse response2;
-    private static final String SCROLL_ID2 = "2";
+  @Mock private SearchResponse response2;
+  private static final String SCROLL_ID2 = "2";
 
-    @Mock
-    private ClusterSettings clusterSettings;
+  @Mock private ClusterSettings clusterSettings;
 
-    /*
-    @BeforeClass
-    public static void initLogger() {
-        ConfigurationBuilder<BuiltConfiguration> builder = newConfigurationBuilder();
-        AppenderComponentBuilder appender = builder.newAppender("stdout", "Console");
+  /*
+  @BeforeClass
+  public static void initLogger() {
+      ConfigurationBuilder<BuiltConfiguration> builder = newConfigurationBuilder();
+      AppenderComponentBuilder appender = builder.newAppender("stdout", "Console");
 
-        LayoutComponentBuilder standard = builder.newLayout("PatternLayout");
-        standard.addAttribute("pattern", "%d [%t] %-5level: %msg%n%throwable");
-        appender.add(standard);
+      LayoutComponentBuilder standard = builder.newLayout("PatternLayout");
+      standard.addAttribute("pattern", "%d [%t] %-5level: %msg%n%throwable");
+      appender.add(standard);
 
-        RootLoggerComponentBuilder rootLogger = builder.newRootLogger(Level.ERROR);
-        rootLogger.add(builder.newAppenderRef("stdout"));
+      RootLoggerComponentBuilder rootLogger = builder.newRootLogger(Level.ERROR);
+      rootLogger.add(builder.newAppenderRef("stdout"));
 
-        LoggerComponentBuilder logger = builder.newLogger("org.nlpcn.es4sql.query.planner", Level.TRACE);
-        logger.add(builder.newAppenderRef("stdout"));
-        //logger.addAttribute("additivity", false);
+      LoggerComponentBuilder logger = builder.newLogger("org.nlpcn.es4sql.query.planner", Level.TRACE);
+      logger.add(builder.newAppenderRef("stdout"));
+      //logger.addAttribute("additivity", false);
 
-        builder.add(logger);
+      builder.add(logger);
 
-        Configurator.initialize(builder.build());
-    }
-    */
+      Configurator.initialize(builder.build());
+  }
+  */
 
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
+  @Before
+  public void init() {
+    MockitoAnnotations.initMocks(this);
+    when(clusterSettings.get(ClusterName.CLUSTER_NAME_SETTING)).thenReturn(ClusterName.DEFAULT);
+    OpenSearchSettings settings = spy(new OpenSearchSettings(clusterSettings));
 
-        OpenSearchSettings settings = spy(new OpenSearchSettings(clusterSettings));
-        // Force return empty list to avoid ClusterSettings be invoked which is a final class and hard to mock.
-        // In this case, default value in Setting will be returned all the time.
-        doReturn(emptyList()).when(settings).getSettings();
-        LocalClusterState.state().setPluginSettings(settings);
+    // Force return empty list to avoid ClusterSettings be invoked which is a final class and hard
+    // to mock.
+    // In this case, default value in Setting will be returned all the time.
+    doReturn(emptyList()).when(settings).getSettings();
+    LocalClusterState.state().setPluginSettings(settings);
 
-        ActionFuture mockFuture = mock(ActionFuture.class);
-        when(client.execute(any(), any())).thenReturn(mockFuture);
+    ActionFuture mockFuture = mock(ActionFuture.class);
+    when(client.execute(any(), any())).thenReturn(mockFuture);
 
-        // Differentiate response for Scroll-1/2 by call count and scroll ID.
-        when(mockFuture.actionGet()).thenAnswer(new Answer<SearchResponse>() {
-            private int callCnt;
+    // Differentiate response for Scroll-1/2 by call count and scroll ID.
+    when(mockFuture.actionGet())
+        .thenAnswer(
+            new Answer<SearchResponse>() {
+              private int callCnt;
 
-            @Override
-            public SearchResponse answer(InvocationOnMock invocation) {
+              @Override
+              public SearchResponse answer(InvocationOnMock invocation) {
                 /*
                  * This works based on assumption that first call comes from Scroll-1, all the following calls come from Scroll-2.
                  * Because Scroll-1 only open scroll once and must be ahead of Scroll-2 which opens multiple times later.
                  */
                 return callCnt++ == 0 ? response1 : response2;
-            }
-        });
-
-        doReturn(SCROLL_ID1).when(response1).getScrollId();
-        doReturn(SCROLL_ID2).when(response2).getScrollId();
-
-        // Avoid NPE in empty SearchResponse
-        doReturn(0).when(response1).getFailedShards();
-        doReturn(0).when(response2).getFailedShards();
-        doReturn(false).when(response1).isTimedOut();
-        doReturn(false).when(response2).isTimedOut();
-
-        returnMockResponse(SCROLL_ID1, response1);
-        returnMockResponse(SCROLL_ID2, response2);
-
-        Metrics.getInstance().registerDefaultMetrics();
-    }
-
-    private void returnMockResponse(String scrollId, SearchResponse response) {
-        SearchScrollRequestBuilder mockReqBuilder = mock(SearchScrollRequestBuilder.class);
-        when(client.prepareSearchScroll(scrollId)).thenReturn(mockReqBuilder);
-        when(mockReqBuilder.setScroll(any(TimeValue.class))).thenReturn(mockReqBuilder);
-        when(mockReqBuilder.get()).thenReturn(response);
-    }
-
-    protected SearchHits query(String sql, MockSearchHits mockHits1, MockSearchHits mockHits2) {
-        doAnswer(mockHits1).when(response1).getHits();
-        doAnswer(mockHits2).when(response2).getHits();
-
-        try (MockedStatic<BackOffRetryStrategy> backOffRetryStrategyMocked =
-            Mockito.mockStatic(BackOffRetryStrategy.class)) {
-            backOffRetryStrategyMocked.when(BackOffRetryStrategy::isHealthy).thenReturn(true);
+              }
+            });
 
-            ClearScrollRequestBuilder mockReqBuilder = mock(ClearScrollRequestBuilder.class);
-            when(client.prepareClearScroll()).thenReturn(mockReqBuilder);
-            when(mockReqBuilder.addScrollId(any())).thenReturn(mockReqBuilder);
-            when(mockReqBuilder.get()).thenAnswer(new Answer<ClearScrollResponse>() {
+    doReturn(SCROLL_ID1).when(response1).getScrollId();
+    doReturn(SCROLL_ID2).when(response2).getScrollId();
+
+    // Avoid NPE in empty SearchResponse
+    doReturn(0).when(response1).getFailedShards();
+    doReturn(0).when(response2).getFailedShards();
+    doReturn(false).when(response1).isTimedOut();
+    doReturn(false).when(response2).isTimedOut();
+
+    returnMockResponse(SCROLL_ID1, response1);
+    returnMockResponse(SCROLL_ID2, response2);
+
+    Metrics.getInstance().registerDefaultMetrics();
+  }
+
+  private void returnMockResponse(String scrollId, SearchResponse response) {
+    SearchScrollRequestBuilder mockReqBuilder = mock(SearchScrollRequestBuilder.class);
+    when(client.prepareSearchScroll(scrollId)).thenReturn(mockReqBuilder);
+    when(mockReqBuilder.setScroll(any(TimeValue.class))).thenReturn(mockReqBuilder);
+    when(mockReqBuilder.get()).thenReturn(response);
+  }
+
+  protected SearchHits query(String sql, MockSearchHits mockHits1, MockSearchHits mockHits2) {
+    doAnswer(mockHits1).when(response1).getHits();
+    doAnswer(mockHits2).when(response2).getHits();
+
+    try (MockedStatic<BackOffRetryStrategy> backOffRetryStrategyMocked =
+        Mockito.mockStatic(BackOffRetryStrategy.class)) {
+      backOffRetryStrategyMocked.when(BackOffRetryStrategy::isHealthy).thenReturn(true);
+
+      ClearScrollRequestBuilder mockReqBuilder = mock(ClearScrollRequestBuilder.class);
+      when(client.prepareClearScroll()).thenReturn(mockReqBuilder);
+      when(mockReqBuilder.addScrollId(any())).thenReturn(mockReqBuilder);
+      when(mockReqBuilder.get())
+          .thenAnswer(
+              new Answer<ClearScrollResponse>() {
                 @Override
                 public ClearScrollResponse answer(InvocationOnMock invocation) throws Throwable {
-                    mockHits2.reset();
-                    return new ClearScrollResponse(true, 0);
+                  mockHits2.reset();
+                  return new ClearScrollResponse(true, 0);
                 }
-            });
+              });
 
-            List<SearchHit> hits = plan(sql).execute();
-            return new SearchHits(hits.toArray(new SearchHit[0]), new TotalHits(hits.size(), Relation.EQUAL_TO), 0);
-        }
+      List<SearchHit> hits = plan(sql).execute();
+      return new SearchHits(
+          hits.toArray(new SearchHit[0]), new TotalHits(hits.size(), Relation.EQUAL_TO), 0);
     }
+  }
 
-    protected QueryPlanner plan(String sql) {
-        SqlElasticRequestBuilder request = createRequestBuilder(sql);
-        if (request instanceof HashJoinQueryPlanRequestBuilder) {
-            return ((HashJoinQueryPlanRequestBuilder) request).plan();
-        }
-        throw new IllegalStateException("Not a JOIN query: " + sql);
+  protected QueryPlanner plan(String sql) {
+    SqlElasticRequestBuilder request = createRequestBuilder(sql);
+    if (request instanceof HashJoinQueryPlanRequestBuilder) {
+      return ((HashJoinQueryPlanRequestBuilder) request).plan();
     }
-
-    protected SqlElasticRequestBuilder createRequestBuilder(String sql) {
-        try {
-            SQLQueryExpr sqlExpr = (SQLQueryExpr) toSqlExpr(sql);
-            JoinSelect joinSelect = new SqlParser().parseJoinSelect(sqlExpr); // Ignore handleSubquery()
-            QueryAction queryAction = OpenSearchJoinQueryActionFactory
-                .createJoinAction(client, joinSelect);
-            queryAction.setSqlRequest(new SqlRequest(sql, null));
-            return queryAction.explain();
-        }
-        catch (SqlParseException e) {
-            throw new IllegalStateException("Invalid query: " + sql, e);
-        }
+    throw new IllegalStateException("Not a JOIN query: " + sql);
+  }
+
+  protected SqlElasticRequestBuilder createRequestBuilder(String sql) {
+    try {
+      SQLQueryExpr sqlExpr = (SQLQueryExpr) toSqlExpr(sql);
+      JoinSelect joinSelect = new SqlParser().parseJoinSelect(sqlExpr); // Ignore handleSubquery()
+      QueryAction queryAction =
+          OpenSearchJoinQueryActionFactory.createJoinAction(client, joinSelect);
+      queryAction.setSqlRequest(new SqlRequest(sql, null));
+      return queryAction.explain();
+    } catch (SqlParseException e) {
+      throw new IllegalStateException("Invalid query: " + sql, e);
     }
+  }
 
-    private SQLExpr toSqlExpr(String sql) {
-        SQLExprParser parser = new ElasticSqlExprParser(sql);
-        SQLExpr expr = parser.expr();
+  private SQLExpr toSqlExpr(String sql) {
+    SQLExprParser parser = new ElasticSqlExprParser(sql);
+    SQLExpr expr = parser.expr();
 
-        if (parser.getLexer().token() != Token.EOF) {
-            throw new ParserException("illegal sql expr : " + sql);
-        }
-        return expr;
+    if (parser.getLexer().token() != Token.EOF) {
+      throw new ParserException("illegal sql expr : " + sql);
     }
+    return expr;
+  }
 
-    /**
-     * Mock SearchHits and slice and return in batch.
-     */
-    protected static class MockSearchHits implements Answer<SearchHits> {
-
-        private final SearchHit[] allHits;
-
-        private final int batchSize; //TODO: should be inferred from mock object dynamically
-
-        private int callCnt;
-
-        MockSearchHits(SearchHit[] allHits, int batchSize) {
-            this.allHits = allHits;
-            this.batchSize = batchSize;
-        }
-
-        @Override
-        public SearchHits answer(InvocationOnMock invocation) {
-            SearchHit[] curBatch;
-            if (isNoMoreBatch()) {
-                curBatch = new SearchHit[0];
-            } else {
-                curBatch = currentBatch();
-                callCnt++;
-            }
-            return new SearchHits(curBatch, new TotalHits(allHits.length, Relation.EQUAL_TO), 0);
-        }
-
-        private boolean isNoMoreBatch() {
-            return callCnt > allHits.length / batchSize;
-        }
-
-        private SearchHit[] currentBatch() {
-            return Arrays.copyOfRange(allHits, startIndex(), endIndex());
-        }
-
-        private int startIndex() {
-            return callCnt * batchSize;
-        }
-
-        private int endIndex() {
-            return Math.min(startIndex() + batchSize, allHits.length);
-        }
-
-        private void reset() {
-            callCnt = 0;
-        }
-    }
+  /** Mock SearchHits and slice and return in batch. */
+  protected static class MockSearchHits implements Answer<SearchHits> {
+
+    private final SearchHit[] allHits;
 
-    protected MockSearchHits employees(SearchHit... mockHits) {
-        return employees(5, mockHits);
+    private final int batchSize; // TODO: should be inferred from mock object dynamically
+
+    private int callCnt;
+
+    MockSearchHits(SearchHit[] allHits, int batchSize) {
+      this.allHits = allHits;
+      this.batchSize = batchSize;
     }
 
-    protected MockSearchHits employees(int pageSize, SearchHit... mockHits) {
-        return new MockSearchHits(mockHits, pageSize);
+    @Override
+    public SearchHits answer(InvocationOnMock invocation) {
+      SearchHit[] curBatch;
+      if (isNoMoreBatch()) {
+        curBatch = new SearchHit[0];
+      } else {
+        curBatch = currentBatch();
+        callCnt++;
+      }
+      return new SearchHits(curBatch, new TotalHits(allHits.length, Relation.EQUAL_TO), 0);
     }
 
-    protected MockSearchHits departments(SearchHit... mockHits) {
-        return departments(5, mockHits);
+    private boolean isNoMoreBatch() {
+      return callCnt > allHits.length / batchSize;
     }
 
-    protected MockSearchHits departments(int pageSize, SearchHit... mockHits) {
-        return new MockSearchHits(mockHits, pageSize);
+    private SearchHit[] currentBatch() {
+      return Arrays.copyOfRange(allHits, startIndex(), endIndex());
     }
 
-    protected SearchHit employee(int docId, String lastname, String departmentId) {
-        SearchHit hit = new SearchHit(docId);
-        if (lastname == null) {
-            hit.sourceRef(new BytesArray("{\"departmentId\":\"" + departmentId + "\"}"));
-        }
-        else if (departmentId == null) {
-            hit.sourceRef(new BytesArray("{\"lastname\":\"" + lastname + "\"}"));
-        }
-        else {
-            hit.sourceRef(new BytesArray("{\"lastname\":\"" + lastname + "\",\"departmentId\":\"" + departmentId + "\"}"));
-        }
-        return hit;
+    private int startIndex() {
+      return callCnt * batchSize;
     }
 
-    protected SearchHit department(int docId, String id, String name) {
-        SearchHit hit = new SearchHit(docId);
-        if (id == null) {
-            hit.sourceRef(new BytesArray("{\"name\":\"" + name + "\"}"));
-        }
-        else if (name == null) {
-            hit.sourceRef(new BytesArray("{\"id\":\"" + id + "\"}"));
-        }
-        else {
-            hit.sourceRef(new BytesArray("{\"id\":\"" + id + "\",\"name\":\"" + name + "\"}"));
-        }
-        return hit;
+    private int endIndex() {
+      return Math.min(startIndex() + batchSize, allHits.length);
     }
 
+    private void reset() {
+      callCnt = 0;
+    }
+  }
+
+  protected MockSearchHits employees(SearchHit... mockHits) {
+    return employees(5, mockHits);
+  }
+
+  protected MockSearchHits employees(int pageSize, SearchHit... mockHits) {
+    return new MockSearchHits(mockHits, pageSize);
+  }
+
+  protected MockSearchHits departments(SearchHit... mockHits) {
+    return departments(5, mockHits);
+  }
+
+  protected MockSearchHits departments(int pageSize, SearchHit... mockHits) {
+    return new MockSearchHits(mockHits, pageSize);
+  }
+
+  protected SearchHit employee(int docId, String lastname, String departmentId) {
+    SearchHit hit = new SearchHit(docId);
+    if (lastname == null) {
+      hit.sourceRef(new BytesArray("{\"departmentId\":\"" + departmentId + "\"}"));
+    } else if (departmentId == null) {
+      hit.sourceRef(new BytesArray("{\"lastname\":\"" + lastname + "\"}"));
+    } else {
+      hit.sourceRef(
+          new BytesArray(
+              "{\"lastname\":\"" + lastname + "\",\"departmentId\":\"" + departmentId + "\"}"));
+    }
+    return hit;
+  }
+
+  protected SearchHit department(int docId, String id, String name) {
+    SearchHit hit = new SearchHit(docId);
+    if (id == null) {
+      hit.sourceRef(new BytesArray("{\"name\":\"" + name + "\"}"));
+    } else if (name == null) {
+      hit.sourceRef(new BytesArray("{\"id\":\"" + id + "\"}"));
+    } else {
+      hit.sourceRef(new BytesArray("{\"id\":\"" + id + "\",\"name\":\"" + name + "\"}"));
+    }
+    return hit;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLAggregationParserTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLAggregationParserTest.java
index bdf3c64fd8..d6911ac2fc 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLAggregationParserTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLAggregationParserTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner.converter;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -27,7 +26,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.sql.legacy.domain.ColumnTypeProvider;
 import org.opensearch.sql.legacy.expression.core.Expression;
 import org.opensearch.sql.legacy.expression.core.ExpressionFactory;
@@ -36,321 +35,367 @@
 
 @RunWith(MockitoJUnitRunner.class)
 public class SQLAggregationParserTest {
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
-
-    @Test
-    public void parseAggWithoutExpressionShouldPass() {
-        String sql = "SELECT dayOfWeek, max(FlightDelayMin), MIN(FlightDelayMin) as min " +
-                     "FROM opensearch_dashboards_sample_data_flights " +
-                     "GROUP BY dayOfWeek";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(group("dayOfWeek", "dayOfWeek"),
-                                                      agg("MAX", "FlightDelayMin", "MAX_0"),
-                                                      agg("MIN", "FlightDelayMin", "min")));
-
-        assertThat(columnNodes, containsInAnyOrder(columnNode("dayOfWeek", null, ExpressionFactory.ref("dayOfWeek")),
-                                                   columnNode("MAX(FlightDelayMin)", null, ExpressionFactory
-                                                           .ref("MAX_0")),
-                                                   columnNode("min", "min", ExpressionFactory.ref("min"))));
-    }
-
-    @Test
-    public void parseAggWithFunctioniWithoutExpressionShouldPass() {
-        String sql = "SELECT dayOfWeek, max(FlightDelayMin), MIN(FlightDelayMin) as min " +
-                     "FROM opensearch_dashboards_sample_data_flights " +
-                     "GROUP BY dayOfWeek";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(group("dayOfWeek", "dayOfWeek"),
-                                                      agg("MAX", "FlightDelayMin", "MAX_0"),
-                                                      agg("MIN", "FlightDelayMin", "min")));
-
-        assertThat(columnNodes, containsInAnyOrder(columnNode("dayOfWeek", null, ExpressionFactory.ref("dayOfWeek")),
-                                                   columnNode("MAX(FlightDelayMin)", null, ExpressionFactory
-                                                           .ref("MAX_0")),
-                                                   columnNode("min", "min", ExpressionFactory.ref("min"))));
-    }
-
-    @Test
-    public void parseAggWithExpressionShouldPass() {
-        String sql = "SELECT dayOfWeek, max(FlightDelayMin) + MIN(FlightDelayMin) as sub " +
-                     "FROM opensearch_dashboards_sample_data_flights " +
-                     "GROUP BY dayOfWeek";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(group("dayOfWeek", "dayOfWeek"),
-                                                      agg("MAX", "FlightDelayMin", "MAX_0"),
-                                                      agg("MIN", "FlightDelayMin", "MIN_1")));
-
-        assertThat(columnNodes, containsInAnyOrder(columnNode("dayOfWeek", null, ExpressionFactory.ref("dayOfWeek")),
-                                                   columnNode("sub", "sub", add(ExpressionFactory.ref("MAX_0"), ExpressionFactory
-                                                           .ref("MIN_1")))));
-    }
-
-    @Test
-    public void parseWithRawSelectFuncnameShouldPass() {
-        String sql = "SELECT LOG(FlightDelayMin) " +
-                "FROM opensearch_dashboards_sample_data_flights " +
-                "GROUP BY log(FlightDelayMin)";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(group("log(FlightDelayMin)", "log(FlightDelayMin)")));
-
-        assertThat(
-                columnNodes,
-                containsInAnyOrder(
-                        columnNode(
-                                "LOG(FlightDelayMin)",
-                                null,
-                                ExpressionFactory.ref("log(FlightDelayMin)")
-                        )
-                )
-        );
-    }
-
-    @Test
-    public void functionOverFiledShouldPass() {
-        String sql = "SELECT dayOfWeek, max(FlightDelayMin) + MIN(FlightDelayMin) as sub " +
-                     "FROM opensearch_dashboards_sample_data_flights " +
-                     "GROUP BY dayOfWeek";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(group("dayOfWeek", "dayOfWeek"),
-                                                      agg("MAX", "FlightDelayMin", "MAX_0"),
-                                                      agg("MIN", "FlightDelayMin", "MIN_1")));
-
-        assertThat(columnNodes, containsInAnyOrder(columnNode("dayOfWeek", null, ExpressionFactory.ref("dayOfWeek")),
-                                                   columnNode("sub", "sub", add(ExpressionFactory.ref("MAX_0"), ExpressionFactory
-                                                           .ref("MIN_1")))));
-    }
-
-    @Test
-    public void parseCompoundAggWithExpressionShouldPass() {
-        String sql = "SELECT ASCII(dayOfWeek), log(max(FlightDelayMin) + MIN(FlightDelayMin)) as log " +
-                     "FROM opensearch_dashboards_sample_data_flights " +
-                     "GROUP BY ASCII(dayOfWeek)";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(group("ASCII(dayOfWeek)", "ASCII(dayOfWeek)"),
-                                                      agg("MAX", "FlightDelayMin", "MAX_0"),
-                                                      agg("MIN", "FlightDelayMin", "MIN_1")));
-
-        assertThat(columnNodes, containsInAnyOrder(columnNode("ASCII(dayOfWeek)", null, ExpressionFactory
-                                                           .ref("ASCII(dayOfWeek)")),
-                                                   columnNode("log", "log", log(add(ExpressionFactory.ref("MAX_0"), ExpressionFactory
-                                                           .ref("MIN_1"))))));
-    }
-
-    @Test
-    public void parseSingleFunctionOverAggShouldPass() {
-        String sql = "SELECT log(max(age)) FROM accounts";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(agg("max", "age", "max_0")));
-        assertThat(columnNodes, containsInAnyOrder(columnNode("log(max(age))", null, log(
-                ExpressionFactory.ref("max_0")))));
-    }
-
-    @Test
-    public void parseFunctionGroupColumnOverShouldPass() {
-        String sql = "SELECT CAST(balance AS FLOAT) FROM accounts GROUP BY balance";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(group("balance", "balance")));
-        assertThat(columnNodes, containsInAnyOrder(columnNode("CAST(balance AS FLOAT)", null, cast(
-                ExpressionFactory.ref("balance")))));
-    }
-
-    @Test
-    public void withoutAggregationShouldPass() {
-        String sql = "SELECT age, gender FROM accounts GROUP BY age, gender";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(
-                group("age", "age"),
-                group("gender", "gender")));
-        assertThat(columnNodes, containsInAnyOrder(
-                columnNode("age", null, ExpressionFactory.ref("age")),
-                columnNode("gender", null, ExpressionFactory.ref("gender"))));
-    }
-
-    @Test
-    public void groupKeyInSelectWithFunctionShouldPass() {
-        String sql = "SELECT log(age), max(balance) FROM accounts GROUP BY age";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(
-                group("age", "age"),
-                agg("max", "balance", "max_0")));
-        assertThat(columnNodes, containsInAnyOrder(
-                columnNode("log(age)", null, log(ExpressionFactory.ref("age"))),
-                columnNode("max(balance)", null, ExpressionFactory.ref("max_0"))));
-    }
-
-    @Test
-    public void theDotInFieldNameShouldBeReplaceWithSharp() {
-        String sql = "SELECT name.lastname, max(balance) FROM accounts GROUP BY name.lastname";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(
-                group("name.lastname", "name#lastname"),
-                agg("max", "balance", "max_0")));
-        assertThat(columnNodes, containsInAnyOrder(
-                columnNode("name.lastname", null, ExpressionFactory.ref("name#lastname")),
-                columnNode("max(balance)", null, ExpressionFactory.ref("max_0"))));
-    }
-
-    @Test
-    public void noGroupKeyInSelectShouldPass() {
-        String sql = "SELECT AVG(age) FROM t GROUP BY age";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(
-                agg("avg", "age", "avg_0")));
-        assertThat(columnNodes, containsInAnyOrder(
-                columnNode("avg(age)", null, ExpressionFactory.ref("avg_0"))));
-    }
-
-    @Test
-    public void aggWithDistinctShouldPass() {
-        String sql = "SELECT count(distinct gender) FROM t GROUP BY age";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-        List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
-        List<ColumnNode> columnNodes = parser.getColumnNodes();
-
-        assertThat(sqlSelectItems, containsInAnyOrder(
-                agg("count", "gender", "count_0")));
-        assertThat(columnNodes, containsInAnyOrder(
-                columnNode("count(distinct gender)", null, ExpressionFactory.ref("count_0"))));
-    }
-
-    /**
-     * TermQueryExplainIT.testNestedSingleGroupBy
-     */
-    @Test
-    public void aggregationWithNestedShouldThrowException() {
-        exceptionRule.expect(RuntimeException.class);
-        exceptionRule.expectMessage("unsupported operator: nested");
-
-        String sql = "SELECT nested(projects.name, 'projects'),id "
-                     + "FROM t "
-                     + "GROUP BY nested(projects.name.keyword, 'projects')";
-        SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
-        parser.parse(mYSqlSelectQueryBlock(sql));
-    }
-
-    private MySqlSelectQueryBlock mYSqlSelectQueryBlock(String sql) {
-        String dbType = JdbcConstants.MYSQL;
-        SQLQueryExpr sqlQueryExpr = (SQLQueryExpr) SQLUtils.toSQLExpr(sql, dbType);
-        return ((MySqlSelectQueryBlock) sqlQueryExpr.getSubQuery().getQuery());
-    }
-
-    private TypeSafeMatcher<ColumnNode> columnNode(String name, String alias, Expression expr) {
-        return new TypeSafeMatcher<ColumnNode>() {
-            @Override
-            public void describeTo(Description description) {
-                description.appendText(String.format("(name=%s,alias=%s,expression=%s)", name, alias, expr));
-            }
-
-            @Override
-            protected boolean matchesSafely(ColumnNode item) {
-                if (name == null) {
-                    return false;
-                }
-                if (alias == null && item.getAlias() != null) {
-                    return false;
-                }
-
-                return name.equalsIgnoreCase(item.getName()) &&
-                       ((alias == null && item.getAlias() == null) || alias.equals(item.getAlias())) &&
-                       expr.toString().equalsIgnoreCase(item.getExpr().toString());
-            }
-        };
-    }
-
-    private TypeSafeMatcher<SQLSelectItem> agg(String methodName, String name, String alias) {
-        return new TypeSafeMatcher<SQLSelectItem>() {
-            @Override
-            public void describeTo(Description description) {
-                description.appendText(String.format("(methodName=%s, name=%s, alias=%s)", methodName, name, alias));
-            }
-
-            @Override
-            protected boolean matchesSafely(SQLSelectItem item) {
-                if (item.getExpr() instanceof SQLAggregateExpr) {
-                    return ((SQLAggregateExpr) item.getExpr()).getMethodName().equalsIgnoreCase(methodName) &&
-                           ((SQLAggregateExpr) item.getExpr()).getArguments()
-                                                              .get(0)
-                                                              .toString()
-                                                              .equalsIgnoreCase(name) &&
-                           ((item.getAlias() == null && alias == null) || item.getAlias().equalsIgnoreCase(alias));
-                } else {
-                    return false;
-                }
-            }
-        };
-    }
-
-    private TypeSafeMatcher<SQLSelectItem> group(String name, String alias) {
-        return new TypeSafeMatcher<SQLSelectItem>() {
-            @Override
-            public void describeTo(Description description) {
-                description.appendText(String.format("(name=%s, alias=%s)", name, alias));
-            }
-
-            @Override
-            protected boolean matchesSafely(SQLSelectItem item) {
-                boolean b = item.getExpr().toString().equalsIgnoreCase(name) &&
-                            ((item.getAlias() == null && alias == null) || item.getAlias().equalsIgnoreCase(alias));
-                return b;
-            }
-        };
-    }
-
-    private Expression add(Expression... expressions) {
-        return of(ADD, Arrays.asList(expressions));
-    }
-
-    private Expression log(Expression... expressions) {
-        return of(LOG, Arrays.asList(expressions));
-    }
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
+
+  @Test
+  public void parseAggWithoutExpressionShouldPass() {
+    String sql =
+        "SELECT dayOfWeek, max(FlightDelayMin), MIN(FlightDelayMin) as min "
+            + "FROM opensearch_dashboards_sample_data_flights "
+            + "GROUP BY dayOfWeek";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(
+        sqlSelectItems,
+        containsInAnyOrder(
+            group("dayOfWeek", "dayOfWeek"),
+            agg("MAX", "FlightDelayMin", "MAX_0"),
+            agg("MIN", "FlightDelayMin", "min")));
+
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(
+            columnNode("dayOfWeek", null, ExpressionFactory.ref("dayOfWeek")),
+            columnNode("MAX(FlightDelayMin)", null, ExpressionFactory.ref("MAX_0")),
+            columnNode("min", "min", ExpressionFactory.ref("min"))));
+  }
+
+  @Test
+  public void parseAggWithFunctioniWithoutExpressionShouldPass() {
+    String sql =
+        "SELECT dayOfWeek, max(FlightDelayMin), MIN(FlightDelayMin) as min "
+            + "FROM opensearch_dashboards_sample_data_flights "
+            + "GROUP BY dayOfWeek";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(
+        sqlSelectItems,
+        containsInAnyOrder(
+            group("dayOfWeek", "dayOfWeek"),
+            agg("MAX", "FlightDelayMin", "MAX_0"),
+            agg("MIN", "FlightDelayMin", "min")));
+
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(
+            columnNode("dayOfWeek", null, ExpressionFactory.ref("dayOfWeek")),
+            columnNode("MAX(FlightDelayMin)", null, ExpressionFactory.ref("MAX_0")),
+            columnNode("min", "min", ExpressionFactory.ref("min"))));
+  }
+
+  @Test
+  public void parseAggWithExpressionShouldPass() {
+    String sql =
+        "SELECT dayOfWeek, max(FlightDelayMin) + MIN(FlightDelayMin) as sub "
+            + "FROM opensearch_dashboards_sample_data_flights "
+            + "GROUP BY dayOfWeek";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(
+        sqlSelectItems,
+        containsInAnyOrder(
+            group("dayOfWeek", "dayOfWeek"),
+            agg("MAX", "FlightDelayMin", "MAX_0"),
+            agg("MIN", "FlightDelayMin", "MIN_1")));
+
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(
+            columnNode("dayOfWeek", null, ExpressionFactory.ref("dayOfWeek")),
+            columnNode(
+                "sub",
+                "sub",
+                add(ExpressionFactory.ref("MAX_0"), ExpressionFactory.ref("MIN_1")))));
+  }
+
+  @Test
+  public void parseWithRawSelectFuncnameShouldPass() {
+    String sql =
+        "SELECT LOG(FlightDelayMin) "
+            + "FROM opensearch_dashboards_sample_data_flights "
+            + "GROUP BY log(FlightDelayMin)";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(
+        sqlSelectItems, containsInAnyOrder(group("log(FlightDelayMin)", "log(FlightDelayMin)")));
+
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(
+            columnNode("LOG(FlightDelayMin)", null, ExpressionFactory.ref("log(FlightDelayMin)"))));
+  }
+
+  @Test
+  public void functionOverFiledShouldPass() {
+    String sql =
+        "SELECT dayOfWeek, max(FlightDelayMin) + MIN(FlightDelayMin) as sub "
+            + "FROM opensearch_dashboards_sample_data_flights "
+            + "GROUP BY dayOfWeek";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(
+        sqlSelectItems,
+        containsInAnyOrder(
+            group("dayOfWeek", "dayOfWeek"),
+            agg("MAX", "FlightDelayMin", "MAX_0"),
+            agg("MIN", "FlightDelayMin", "MIN_1")));
+
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(
+            columnNode("dayOfWeek", null, ExpressionFactory.ref("dayOfWeek")),
+            columnNode(
+                "sub",
+                "sub",
+                add(ExpressionFactory.ref("MAX_0"), ExpressionFactory.ref("MIN_1")))));
+  }
+
+  @Test
+  public void parseCompoundAggWithExpressionShouldPass() {
+    String sql =
+        "SELECT ASCII(dayOfWeek), log(max(FlightDelayMin) + MIN(FlightDelayMin)) as log "
+            + "FROM opensearch_dashboards_sample_data_flights "
+            + "GROUP BY ASCII(dayOfWeek)";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(
+        sqlSelectItems,
+        containsInAnyOrder(
+            group("ASCII(dayOfWeek)", "ASCII(dayOfWeek)"),
+            agg("MAX", "FlightDelayMin", "MAX_0"),
+            agg("MIN", "FlightDelayMin", "MIN_1")));
+
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(
+            columnNode("ASCII(dayOfWeek)", null, ExpressionFactory.ref("ASCII(dayOfWeek)")),
+            columnNode(
+                "log",
+                "log",
+                log(add(ExpressionFactory.ref("MAX_0"), ExpressionFactory.ref("MIN_1"))))));
+  }
+
+  @Test
+  public void parseSingleFunctionOverAggShouldPass() {
+    String sql = "SELECT log(max(age)) FROM accounts";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(sqlSelectItems, containsInAnyOrder(agg("max", "age", "max_0")));
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(columnNode("log(max(age))", null, log(ExpressionFactory.ref("max_0")))));
+  }
+
+  @Test
+  public void parseFunctionGroupColumnOverShouldPass() {
+    String sql = "SELECT CAST(balance AS FLOAT) FROM accounts GROUP BY balance";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(sqlSelectItems, containsInAnyOrder(group("balance", "balance")));
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(
+            columnNode("CAST(balance AS FLOAT)", null, cast(ExpressionFactory.ref("balance")))));
+  }
+
+  @Test
+  public void withoutAggregationShouldPass() {
+    String sql = "SELECT age, gender FROM accounts GROUP BY age, gender";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(sqlSelectItems, containsInAnyOrder(group("age", "age"), group("gender", "gender")));
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(
+            columnNode("age", null, ExpressionFactory.ref("age")),
+            columnNode("gender", null, ExpressionFactory.ref("gender"))));
+  }
+
+  @Test
+  public void groupKeyInSelectWithFunctionShouldPass() {
+    String sql = "SELECT log(age), max(balance) FROM accounts GROUP BY age";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(
+        sqlSelectItems, containsInAnyOrder(group("age", "age"), agg("max", "balance", "max_0")));
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(
+            columnNode("log(age)", null, log(ExpressionFactory.ref("age"))),
+            columnNode("max(balance)", null, ExpressionFactory.ref("max_0"))));
+  }
+
+  @Test
+  public void theDotInFieldNameShouldBeReplaceWithSharp() {
+    String sql = "SELECT name.lastname, max(balance) FROM accounts GROUP BY name.lastname";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(
+        sqlSelectItems,
+        containsInAnyOrder(
+            group("name.lastname", "name#lastname"), agg("max", "balance", "max_0")));
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(
+            columnNode("name.lastname", null, ExpressionFactory.ref("name#lastname")),
+            columnNode("max(balance)", null, ExpressionFactory.ref("max_0"))));
+  }
+
+  @Test
+  public void noGroupKeyInSelectShouldPass() {
+    String sql = "SELECT AVG(age) FROM t GROUP BY age";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(sqlSelectItems, containsInAnyOrder(agg("avg", "age", "avg_0")));
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(columnNode("avg(age)", null, ExpressionFactory.ref("avg_0"))));
+  }
+
+  @Test
+  public void aggWithDistinctShouldPass() {
+    String sql = "SELECT count(distinct gender) FROM t GROUP BY age";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+    List<SQLSelectItem> sqlSelectItems = parser.selectItemList();
+    List<ColumnNode> columnNodes = parser.getColumnNodes();
+
+    assertThat(sqlSelectItems, containsInAnyOrder(agg("count", "gender", "count_0")));
+    assertThat(
+        columnNodes,
+        containsInAnyOrder(
+            columnNode("count(distinct gender)", null, ExpressionFactory.ref("count_0"))));
+  }
+
+  /** TermQueryExplainIT.testNestedSingleGroupBy */
+  @Test
+  public void aggregationWithNestedShouldThrowException() {
+    exceptionRule.expect(RuntimeException.class);
+    exceptionRule.expectMessage("unsupported operator: nested");
+
+    String sql =
+        "SELECT nested(projects.name, 'projects'),id "
+            + "FROM t "
+            + "GROUP BY nested(projects.name.keyword, 'projects')";
+    SQLAggregationParser parser = new SQLAggregationParser(new ColumnTypeProvider());
+    parser.parse(mYSqlSelectQueryBlock(sql));
+  }
+
+  private MySqlSelectQueryBlock mYSqlSelectQueryBlock(String sql) {
+    String dbType = JdbcConstants.MYSQL;
+    SQLQueryExpr sqlQueryExpr = (SQLQueryExpr) SQLUtils.toSQLExpr(sql, dbType);
+    return ((MySqlSelectQueryBlock) sqlQueryExpr.getSubQuery().getQuery());
+  }
+
+  private TypeSafeMatcher<ColumnNode> columnNode(String name, String alias, Expression expr) {
+    return new TypeSafeMatcher<ColumnNode>() {
+      @Override
+      public void describeTo(Description description) {
+        description.appendText(
+            String.format("(name=%s,alias=%s,expression=%s)", name, alias, expr));
+      }
+
+      @Override
+      protected boolean matchesSafely(ColumnNode item) {
+        if (name == null) {
+          return false;
+        }
+        if (alias == null && item.getAlias() != null) {
+          return false;
+        }
+
+        return name.equalsIgnoreCase(item.getName())
+            && ((alias == null && item.getAlias() == null) || alias.equals(item.getAlias()))
+            && expr.toString().equalsIgnoreCase(item.getExpr().toString());
+      }
+    };
+  }
+
+  private TypeSafeMatcher<SQLSelectItem> agg(String methodName, String name, String alias) {
+    return new TypeSafeMatcher<SQLSelectItem>() {
+      @Override
+      public void describeTo(Description description) {
+        description.appendText(
+            String.format("(methodName=%s, name=%s, alias=%s)", methodName, name, alias));
+      }
+
+      @Override
+      protected boolean matchesSafely(SQLSelectItem item) {
+        if (item.getExpr() instanceof SQLAggregateExpr) {
+          return ((SQLAggregateExpr) item.getExpr()).getMethodName().equalsIgnoreCase(methodName)
+              && ((SQLAggregateExpr) item.getExpr())
+                  .getArguments()
+                  .get(0)
+                  .toString()
+                  .equalsIgnoreCase(name)
+              && ((item.getAlias() == null && alias == null)
+                  || item.getAlias().equalsIgnoreCase(alias));
+        } else {
+          return false;
+        }
+      }
+    };
+  }
+
+  private TypeSafeMatcher<SQLSelectItem> group(String name, String alias) {
+    return new TypeSafeMatcher<SQLSelectItem>() {
+      @Override
+      public void describeTo(Description description) {
+        description.appendText(String.format("(name=%s, alias=%s)", name, alias));
+      }
+
+      @Override
+      protected boolean matchesSafely(SQLSelectItem item) {
+        boolean b =
+            item.getExpr().toString().equalsIgnoreCase(name)
+                && ((item.getAlias() == null && alias == null)
+                    || item.getAlias().equalsIgnoreCase(alias));
+        return b;
+      }
+    };
+  }
+
+  private Expression add(Expression... expressions) {
+    return of(ADD, Arrays.asList(expressions));
+  }
+
+  private Expression log(Expression... expressions) {
+    return of(LOG, Arrays.asList(expressions));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLExprToExpressionConverterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLExprToExpressionConverterTest.java
index e297c2c1d4..ac949eb0d7 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLExprToExpressionConverterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLExprToExpressionConverterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner.converter;
 
 import static org.junit.Assert.assertEquals;
@@ -34,118 +33,125 @@
 
 @RunWith(MockitoJUnitRunner.class)
 public class SQLExprToExpressionConverterTest {
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
-
-    private SQLExprToExpressionConverter converter;
-    private SQLAggregationParser.Context context;
-    private final SQLAggregateExpr maxA = new SQLAggregateExpr("MAX");
-    private final SQLAggregateExpr maxB = new SQLAggregateExpr("MAX");
-    private final SQLAggregateExpr minA = new SQLAggregateExpr("MIN");
-    private final SQLIdentifierExpr groupG = new SQLIdentifierExpr("A");
-    private final SQLIdentifierExpr aggA = new SQLIdentifierExpr("A");
-    private final SQLIdentifierExpr aggB = new SQLIdentifierExpr("B");
-    private final SQLIntegerExpr one = new SQLIntegerExpr(1);
-
-    @Before
-    public void setup() {
-        maxA.getArguments().add(aggA);
-        maxB.getArguments().add(aggB);
-        minA.getArguments().add(aggA);
-        context = new SQLAggregationParser.Context(ImmutableMap.of());
-        converter = new SQLExprToExpressionConverter(context);
-    }
-
-    @Test
-    public void identifierShouldReturnVarExpression() {
-        context.addGroupKeyExpr(groupG);
-        Expression expression = converter.convert(groupG);
-
-        assertEquals(ref("A").toString(), expression.toString());
-    }
-
-    @Test
-    public void binaryOperatorAddShouldReturnAddExpression() {
-        context.addAggregationExpr(maxA);
-        context.addAggregationExpr(minA);
-
-        Expression expression = converter.convert(new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add, minA));
-        assertEquals(add(ref("MAX_0"), ref("MIN_1")).toString(), expression.toString());
-    }
-
-    @Test
-    public void compoundBinaryOperatorShouldReturnCorrectExpression() {
-        context.addAggregationExpr(maxA);
-        context.addAggregationExpr(minA);
-
-        Expression expression = converter.convert(new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add,
-                                                                      new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add,
-                                                                                          minA)));
-        assertEquals(add(ref("MAX_0"), add(ref("MAX_0"), ref("MIN_1"))).toString(), expression.toString());
-    }
-
-    @Test
-    public void functionOverCompoundBinaryOperatorShouldReturnCorrectExpression() {
-        context.addAggregationExpr(maxA);
-        context.addAggregationExpr(minA);
-
-        SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("LOG");
-        methodInvokeExpr.addParameter(new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add,
-                                                          new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add,
-                                                                              minA)));
-
-        Expression expression = converter.convert(methodInvokeExpr);
-        assertEquals(log(add(ref("MAX_0"), add(ref("MAX_0"), ref("MIN_1")))).toString(), expression.toString());
-    }
-
-    @Test
-    public void functionOverGroupColumn() {
-        context.addAggregationExpr(maxA);
-        context.addAggregationExpr(minA);
-
-        SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("LOG");
-        methodInvokeExpr.addParameter(new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add,
-                                                          new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add,
-                                                                              minA)));
-
-        Expression expression = converter.convert(methodInvokeExpr);
-        assertEquals(log(add(ref("MAX_0"), add(ref("MAX_0"), ref("MIN_1")))).toString(), expression.toString());
-    }
-
-    @Test
-    public void binaryOperatorWithLiteralAddShouldReturnAddExpression() {
-        context.addAggregationExpr(maxA);
-
-        Expression expression = converter.convert(new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add, one));
-        assertEquals(add(ref("MAX_0"), literal(integerValue(1))).toString(), expression.toString());
-    }
-
-    @Test
-    public void unknownIdentifierShouldThrowException() {
-        context.addAggregationExpr(maxA);
-        context.addAggregationExpr(minA);
-
-        exceptionRule.expect(RuntimeException.class);
-        exceptionRule.expectMessage("unsupported expr");
-        converter.convert(new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add, maxB));
-    }
-
-    @Test
-    public void unsupportOperationShouldThrowException() {
-        exceptionRule.expect(UnsupportedOperationException.class);
-        exceptionRule.expectMessage("unsupported operator: cot");
-
-        context.addAggregationExpr(maxA);
-        SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("cot");
-        methodInvokeExpr.addParameter(maxA);
-        converter.convert(methodInvokeExpr);
-    }
-
-    private Expression add(Expression... expressions) {
-        return of(ADD, Arrays.asList(expressions));
-    }
-
-    private Expression log(Expression... expressions) {
-        return of(LOG, Arrays.asList(expressions));
-    }
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
+
+  private SQLExprToExpressionConverter converter;
+  private SQLAggregationParser.Context context;
+  private final SQLAggregateExpr maxA = new SQLAggregateExpr("MAX");
+  private final SQLAggregateExpr maxB = new SQLAggregateExpr("MAX");
+  private final SQLAggregateExpr minA = new SQLAggregateExpr("MIN");
+  private final SQLIdentifierExpr groupG = new SQLIdentifierExpr("A");
+  private final SQLIdentifierExpr aggA = new SQLIdentifierExpr("A");
+  private final SQLIdentifierExpr aggB = new SQLIdentifierExpr("B");
+  private final SQLIntegerExpr one = new SQLIntegerExpr(1);
+
+  @Before
+  public void setup() {
+    maxA.getArguments().add(aggA);
+    maxB.getArguments().add(aggB);
+    minA.getArguments().add(aggA);
+    context = new SQLAggregationParser.Context(ImmutableMap.of());
+    converter = new SQLExprToExpressionConverter(context);
+  }
+
+  @Test
+  public void identifierShouldReturnVarExpression() {
+    context.addGroupKeyExpr(groupG);
+    Expression expression = converter.convert(groupG);
+
+    assertEquals(ref("A").toString(), expression.toString());
+  }
+
+  @Test
+  public void binaryOperatorAddShouldReturnAddExpression() {
+    context.addAggregationExpr(maxA);
+    context.addAggregationExpr(minA);
+
+    Expression expression =
+        converter.convert(new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add, minA));
+    assertEquals(add(ref("MAX_0"), ref("MIN_1")).toString(), expression.toString());
+  }
+
+  @Test
+  public void compoundBinaryOperatorShouldReturnCorrectExpression() {
+    context.addAggregationExpr(maxA);
+    context.addAggregationExpr(minA);
+
+    Expression expression =
+        converter.convert(
+            new SQLBinaryOpExpr(
+                maxA,
+                SQLBinaryOperator.Add,
+                new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add, minA)));
+    assertEquals(
+        add(ref("MAX_0"), add(ref("MAX_0"), ref("MIN_1"))).toString(), expression.toString());
+  }
+
+  @Test
+  public void functionOverCompoundBinaryOperatorShouldReturnCorrectExpression() {
+    context.addAggregationExpr(maxA);
+    context.addAggregationExpr(minA);
+
+    SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("LOG");
+    methodInvokeExpr.addParameter(
+        new SQLBinaryOpExpr(
+            maxA, SQLBinaryOperator.Add, new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add, minA)));
+
+    Expression expression = converter.convert(methodInvokeExpr);
+    assertEquals(
+        log(add(ref("MAX_0"), add(ref("MAX_0"), ref("MIN_1")))).toString(), expression.toString());
+  }
+
+  @Test
+  public void functionOverGroupColumn() {
+    context.addAggregationExpr(maxA);
+    context.addAggregationExpr(minA);
+
+    SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("LOG");
+    methodInvokeExpr.addParameter(
+        new SQLBinaryOpExpr(
+            maxA, SQLBinaryOperator.Add, new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add, minA)));
+
+    Expression expression = converter.convert(methodInvokeExpr);
+    assertEquals(
+        log(add(ref("MAX_0"), add(ref("MAX_0"), ref("MIN_1")))).toString(), expression.toString());
+  }
+
+  @Test
+  public void binaryOperatorWithLiteralAddShouldReturnAddExpression() {
+    context.addAggregationExpr(maxA);
+
+    Expression expression =
+        converter.convert(new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add, one));
+    assertEquals(add(ref("MAX_0"), literal(integerValue(1))).toString(), expression.toString());
+  }
+
+  @Test
+  public void unknownIdentifierShouldThrowException() {
+    context.addAggregationExpr(maxA);
+    context.addAggregationExpr(minA);
+
+    exceptionRule.expect(RuntimeException.class);
+    exceptionRule.expectMessage("unsupported expr");
+    converter.convert(new SQLBinaryOpExpr(maxA, SQLBinaryOperator.Add, maxB));
+  }
+
+  @Test
+  public void unsupportOperationShouldThrowException() {
+    exceptionRule.expect(UnsupportedOperationException.class);
+    exceptionRule.expectMessage("unsupported operator: cot");
+
+    context.addAggregationExpr(maxA);
+    SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("cot");
+    methodInvokeExpr.addParameter(maxA);
+    converter.convert(methodInvokeExpr);
+  }
+
+  private Expression add(Expression... expressions) {
+    return of(ADD, Arrays.asList(expressions));
+  }
+
+  private Expression log(Expression... expressions) {
+    return of(LOG, Arrays.asList(expressions));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLToOperatorConverterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLToOperatorConverterTest.java
index f64a550a13..b9e48b27e4 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLToOperatorConverterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLToOperatorConverterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner.converter;
 
 import static org.junit.Assert.assertTrue;
@@ -15,7 +14,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.client.Client;
 import org.opensearch.sql.legacy.domain.ColumnTypeProvider;
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
@@ -25,51 +24,53 @@
 
 @RunWith(MockitoJUnitRunner.class)
 public class SQLToOperatorConverterTest {
-    @Mock
-    private Client client;
+  @Mock private Client client;
 
-    private SQLToOperatorConverter converter;
+  private SQLToOperatorConverter converter;
 
-    @Before
-    public void setup() {
-        converter = new SQLToOperatorConverter(client, new ColumnTypeProvider());
-    }
+  @Before
+  public void setup() {
+    converter = new SQLToOperatorConverter(client, new ColumnTypeProvider());
+  }
 
-    @Test
-    public void convertAggShouldPass() {
-        String sql = "SELECT dayOfWeek, max(FlightDelayMin), MIN(FlightDelayMin) as min " +
-                     "FROM opensearch_dashboards_sample_data_flights " +
-                     "GROUP BY dayOfWeek";
-        toExpr(sql).accept(converter);
-        PhysicalOperator<BindingTuple> physicalOperator = converter.getPhysicalOperator();
+  @Test
+  public void convertAggShouldPass() {
+    String sql =
+        "SELECT dayOfWeek, max(FlightDelayMin), MIN(FlightDelayMin) as min "
+            + "FROM opensearch_dashboards_sample_data_flights "
+            + "GROUP BY dayOfWeek";
+    toExpr(sql).accept(converter);
+    PhysicalOperator<BindingTuple> physicalOperator = converter.getPhysicalOperator();
 
-        assertTrue(physicalOperator instanceof PhysicalProject);
-    }
+    assertTrue(physicalOperator instanceof PhysicalProject);
+  }
 
-    @Test
-    public void convertMaxMinusMinShouldPass() {
-        String sql = "SELECT dayOfWeek, max(FlightDelayMin) - MIN(FlightDelayMin) as diff " +
-                     "FROM opensearch_dashboards_sample_data_flights " +
-                     "GROUP BY dayOfWeek";
-        toExpr(sql).accept(converter);
-        PhysicalOperator<BindingTuple> physicalOperator = converter.getPhysicalOperator();
+  @Test
+  public void convertMaxMinusMinShouldPass() {
+    String sql =
+        "SELECT dayOfWeek, max(FlightDelayMin) - MIN(FlightDelayMin) as diff "
+            + "FROM opensearch_dashboards_sample_data_flights "
+            + "GROUP BY dayOfWeek";
+    toExpr(sql).accept(converter);
+    PhysicalOperator<BindingTuple> physicalOperator = converter.getPhysicalOperator();
 
-        assertTrue(physicalOperator instanceof PhysicalProject);
-    }
+    assertTrue(physicalOperator instanceof PhysicalProject);
+  }
 
-    @Test
-    public void convertDistinctPass() {
-        String sql = "SELECT dayOfWeek, max(FlightDelayMin) - MIN(FlightDelayMin) as diff " +
-                     "FROM opensearch_dashboards_sample_data_flights " +
-                     "GROUP BY dayOfWeek";
-        toExpr(sql).accept(converter);
-        PhysicalOperator<BindingTuple> physicalOperator = converter.getPhysicalOperator();
+  @Test
+  public void convertDistinctPass() {
+    String sql =
+        "SELECT dayOfWeek, max(FlightDelayMin) - MIN(FlightDelayMin) as diff "
+            + "FROM opensearch_dashboards_sample_data_flights "
+            + "GROUP BY dayOfWeek";
+    toExpr(sql).accept(converter);
+    PhysicalOperator<BindingTuple> physicalOperator = converter.getPhysicalOperator();
 
-        assertTrue(physicalOperator instanceof PhysicalProject);
-    }
+    assertTrue(physicalOperator instanceof PhysicalProject);
+  }
 
-    private SQLQueryExpr toExpr(String sql) {
-        String dbType = JdbcConstants.MYSQL;
-        return (SQLQueryExpr) SQLUtils.toSQLExpr(sql, dbType);
-    }
+  private SQLQueryExpr toExpr(String sql) {
+    String dbType = JdbcConstants.MYSQL;
+    return (SQLQueryExpr) SQLUtils.toSQLExpr(sql, dbType);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/physical/SearchAggregationResponseHelperTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/physical/SearchAggregationResponseHelperTest.java
index 589dab8905..a456dc2a81 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/physical/SearchAggregationResponseHelperTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/physical/SearchAggregationResponseHelperTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.planner.physical;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -21,7 +20,7 @@
 import org.hamcrest.Matcher;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.sql.legacy.expression.domain.BindingTuple;
 import org.opensearch.sql.legacy.query.planner.physical.node.scroll.BindingTupleRow;
 import org.opensearch.sql.legacy.query.planner.physical.node.scroll.SearchAggregationResponseHelper;
@@ -29,305 +28,318 @@
 
 @RunWith(MockitoJUnitRunner.class)
 public class SearchAggregationResponseHelperTest {
-    /**
-     * SELECT MAX(age) as max
-     * FROM accounts
-     */
-    @Test
-    public void noBucketOneMetricShouldPass() {
-        String json = "{\n"
-                      + "  \"max#max\": {\n"
-                      + "    \"value\": 40\n"
-                      + "  }\n"
-                      + "}";
-        List<Map<String, Object>> result = SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
-        assertThat(result, contains(allOf(hasEntry("max", 40d))));
-    }
+  /** SELECT MAX(age) as max FROM accounts */
+  @Test
+  public void noBucketOneMetricShouldPass() {
+    String json = "{\n" + "  \"max#max\": {\n" + "    \"value\": 40\n" + "  }\n" + "}";
+    List<Map<String, Object>> result =
+        SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
+    assertThat(result, contains(allOf(hasEntry("max", 40d))));
+  }
 
-    /**
-     * SELECT MAX(age) as max, MIN(age) as min
-     * FROM accounts
-     */
-    @Test
-    public void noBucketMultipleMetricShouldPass() {
-        String json = "{\n"
-                      + "  \"max#max\": {\n"
-                      + "    \"value\": 40\n"
-                      + "  },\n"
-                      + "  \"min#min\": {\n"
-                      + "    \"value\": 20\n"
-                      + "  }\n"
-                      + "}";
-        List<Map<String, Object>> result = SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
-        assertThat(result, contains(allOf(hasEntry("max", 40d), hasEntry("min", 20d))));
-    }
+  /** SELECT MAX(age) as max, MIN(age) as min FROM accounts */
+  @Test
+  public void noBucketMultipleMetricShouldPass() {
+    String json =
+        "{\n"
+            + "  \"max#max\": {\n"
+            + "    \"value\": 40\n"
+            + "  },\n"
+            + "  \"min#min\": {\n"
+            + "    \"value\": 20\n"
+            + "  }\n"
+            + "}";
+    List<Map<String, Object>> result =
+        SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
+    assertThat(result, contains(allOf(hasEntry("max", 40d), hasEntry("min", 20d))));
+  }
 
-    /**
-     * SELECT gender, MAX(age) as max, MIN(age) as min
-     * FROM accounts
-     * GROUP BY gender
-     */
-    @Test
-    public void oneBucketMultipleMetricShouldPass() {
-        String json = "{\n"
-                      + "  \"sterms#gender\": {\n"
-                      + "    \"buckets\": [\n"
-                      + "      {\n"
-                      + "        \"key\": \"m\",\n"
-                      + "        \"doc_count\": 507,\n"
-                      + "        \"min#min\": {\n"
-                      + "          \"value\": 10\n"
-                      + "        },\n"
-                      + "        \"max#max\": {\n"
-                      + "          \"value\": 20\n"
-                      + "        }\n"
-                      + "      },\n"
-                      + "      {\n"
-                      + "        \"key\": \"f\",\n"
-                      + "        \"doc_count\": 493,\n"
-                      + "        \"min#min\": {\n"
-                      + "          \"value\": 20\n"
-                      + "        },\n"
-                      + "        \"max#max\": {\n"
-                      + "          \"value\": 40\n"
-                      + "        }\n"
-                      + "      }\n"
-                      + "    ]\n"
-                      + "  }\n"
-                      + "}";
-        List<Map<String, Object>> result = SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
-        assertThat(result, contains(allOf(hasEntry("gender", (Object) "m"), hasEntry("min", 10d), hasEntry("max", 20d)),
-                                    allOf(hasEntry("gender", (Object) "f"), hasEntry("min", 20d),
-                                          hasEntry("max", 40d))));
-    }
+  /** SELECT gender, MAX(age) as max, MIN(age) as min FROM accounts GROUP BY gender */
+  @Test
+  public void oneBucketMultipleMetricShouldPass() {
+    String json =
+        "{\n"
+            + "  \"sterms#gender\": {\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": \"m\",\n"
+            + "        \"doc_count\": 507,\n"
+            + "        \"min#min\": {\n"
+            + "          \"value\": 10\n"
+            + "        },\n"
+            + "        \"max#max\": {\n"
+            + "          \"value\": 20\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\": \"f\",\n"
+            + "        \"doc_count\": 493,\n"
+            + "        \"min#min\": {\n"
+            + "          \"value\": 20\n"
+            + "        },\n"
+            + "        \"max#max\": {\n"
+            + "          \"value\": 40\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
+    List<Map<String, Object>> result =
+        SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
+    assertThat(
+        result,
+        contains(
+            allOf(hasEntry("gender", (Object) "m"), hasEntry("min", 10d), hasEntry("max", 20d)),
+            allOf(hasEntry("gender", (Object) "f"), hasEntry("min", 20d), hasEntry("max", 40d))));
+  }
 
-    /**
-     * SELECT gender, state, MAX(age) as max, MIN(age) as min
-     * FROM accounts
-     * GROUP BY gender, state
-     */
-    @Test
-    public void multipleBucketMultipleMetricShouldPass() {
-        String json = "{\n"
-                      + "  \"sterms#gender\": {\n"
-                      + "    \"buckets\": [\n"
-                      + "      {\n"
-                      + "        \"key\": \"m\",\n"
-                      + "        \"sterms#state\": {\n"
-                      + "          \"buckets\": [\n"
-                      + "            {\n"
-                      + "              \"key\": \"MD\",\n"
-                      + "              \"min#min\": {\n"
-                      + "                \"value\": 22\n"
-                      + "              },\n"
-                      + "              \"max#max\": {\n"
-                      + "                \"value\": 39\n"
-                      + "              }\n"
-                      + "            },\n"
-                      + "            {\n"
-                      + "              \"key\": \"ID\",\n"
-                      + "              \"min#min\": {\n"
-                      + "                \"value\": 23\n"
-                      + "              },\n"
-                      + "              \"max#max\": {\n"
-                      + "                \"value\": 40\n"
-                      + "              }\n"
-                      + "            }\n"
-                      + "          ]\n"
-                      + "        }\n"
-                      + "      },\n"
-                      + "      {\n"
-                      + "        \"key\": \"f\",\n"
-                      + "        \"sterms#state\": {\n"
-                      + "          \"buckets\": [\n"
-                      + "            {\n"
-                      + "              \"key\": \"TX\",\n"
-                      + "              \"min#min\": {\n"
-                      + "                \"value\": 20\n"
-                      + "              },\n"
-                      + "              \"max#max\": {\n"
-                      + "                \"value\": 38\n"
-                      + "              }\n"
-                      + "            },\n"
-                      + "            {\n"
-                      + "              \"key\": \"MI\",\n"
-                      + "              \"min#min\": {\n"
-                      + "                \"value\": 22\n"
-                      + "              },\n"
-                      + "              \"max#max\": {\n"
-                      + "                \"value\": 40\n"
-                      + "              }\n"
-                      + "            }\n"
-                      + "          ]\n"
-                      + "        }\n"
-                      + "      }\n"
-                      + "    ]\n"
-                      + "  }\n"
-                      + "}";
-        List<Map<String, Object>> result = SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
-        assertThat(result, contains(
-                allOf(hasEntry("gender", (Object) "m"), hasEntry("state", (Object) "MD"), hasEntry("min", 22d),
-                      hasEntry("max", 39d)),
-                allOf(hasEntry("gender", (Object) "m"), hasEntry("state", (Object) "ID"), hasEntry("min", 23d),
-                      hasEntry("max", 40d)),
-                allOf(hasEntry("gender", (Object) "f"), hasEntry("state", (Object) "TX"), hasEntry("min", 20d),
-                      hasEntry("max", 38d)),
-                allOf(hasEntry("gender", (Object) "f"), hasEntry("state", (Object) "MI"), hasEntry("min", 22d),
-                      hasEntry("max", 40d))));
-    }
+  /** SELECT gender, state, MAX(age) as max, MIN(age) as min FROM accounts GROUP BY gender, state */
+  @Test
+  public void multipleBucketMultipleMetricShouldPass() {
+    String json =
+        "{\n"
+            + "  \"sterms#gender\": {\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": \"m\",\n"
+            + "        \"sterms#state\": {\n"
+            + "          \"buckets\": [\n"
+            + "            {\n"
+            + "              \"key\": \"MD\",\n"
+            + "              \"min#min\": {\n"
+            + "                \"value\": 22\n"
+            + "              },\n"
+            + "              \"max#max\": {\n"
+            + "                \"value\": 39\n"
+            + "              }\n"
+            + "            },\n"
+            + "            {\n"
+            + "              \"key\": \"ID\",\n"
+            + "              \"min#min\": {\n"
+            + "                \"value\": 23\n"
+            + "              },\n"
+            + "              \"max#max\": {\n"
+            + "                \"value\": 40\n"
+            + "              }\n"
+            + "            }\n"
+            + "          ]\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\": \"f\",\n"
+            + "        \"sterms#state\": {\n"
+            + "          \"buckets\": [\n"
+            + "            {\n"
+            + "              \"key\": \"TX\",\n"
+            + "              \"min#min\": {\n"
+            + "                \"value\": 20\n"
+            + "              },\n"
+            + "              \"max#max\": {\n"
+            + "                \"value\": 38\n"
+            + "              }\n"
+            + "            },\n"
+            + "            {\n"
+            + "              \"key\": \"MI\",\n"
+            + "              \"min#min\": {\n"
+            + "                \"value\": 22\n"
+            + "              },\n"
+            + "              \"max#max\": {\n"
+            + "                \"value\": 40\n"
+            + "              }\n"
+            + "            }\n"
+            + "          ]\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
+    List<Map<String, Object>> result =
+        SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
+    assertThat(
+        result,
+        contains(
+            allOf(
+                hasEntry("gender", (Object) "m"),
+                hasEntry("state", (Object) "MD"),
+                hasEntry("min", 22d),
+                hasEntry("max", 39d)),
+            allOf(
+                hasEntry("gender", (Object) "m"),
+                hasEntry("state", (Object) "ID"),
+                hasEntry("min", 23d),
+                hasEntry("max", 40d)),
+            allOf(
+                hasEntry("gender", (Object) "f"),
+                hasEntry("state", (Object) "TX"),
+                hasEntry("min", 20d),
+                hasEntry("max", 38d)),
+            allOf(
+                hasEntry("gender", (Object) "f"),
+                hasEntry("state", (Object) "MI"),
+                hasEntry("min", 22d),
+                hasEntry("max", 40d))));
+  }
 
-    /**
-     * SELECT age, gender FROM accounts GROUP BY age, gender
-     */
-    @Test
-    public void multipleBucketWithoutMetricShouldPass() {
-        String json = "{\n"
-                      + "  \"lterms#age\": {\n"
-                      + "    \"buckets\": [\n"
-                      + "      {\n"
-                      + "        \"key\": 31,\n"
-                      + "        \"doc_count\": 61,\n"
-                      + "        \"sterms#gender\": {\n"
-                      + "          \"buckets\": [\n"
-                      + "            {\n"
-                      + "              \"key\": \"m\",\n"
-                      + "              \"doc_count\": 35\n"
-                      + "            },\n"
-                      + "            {\n"
-                      + "              \"key\": \"f\",\n"
-                      + "              \"doc_count\": 26\n"
-                      + "            }\n"
-                      + "          ]\n"
-                      + "        }\n"
-                      + "      },\n"
-                      + "      {\n"
-                      + "        \"key\": 39,\n"
-                      + "        \"doc_count\": 60,\n"
-                      + "        \"sterms#gender\": {\n"
-                      + "          \"buckets\": [\n"
-                      + "            {\n"
-                      + "              \"key\": \"f\",\n"
-                      + "              \"doc_count\": 38\n"
-                      + "            },\n"
-                      + "            {\n"
-                      + "              \"key\": \"m\",\n"
-                      + "              \"doc_count\": 22\n"
-                      + "            }\n"
-                      + "          ]\n"
-                      + "        }\n"
-                      + "      }\n"
-                      + "    ]\n"
-                      + "  }\n"
-                      + "}";
-        List<Map<String, Object>> result = SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
-        assertThat(result, containsInAnyOrder(
-                allOf(hasEntry("age", (Object) 31L), hasEntry("gender","m")),
-                allOf(hasEntry("age", (Object) 31L), hasEntry("gender","f")),
-                allOf(hasEntry("age", (Object) 39L), hasEntry("gender","m")),
-                allOf(hasEntry("age", (Object) 39L), hasEntry("gender","f"))));
-    }
+  /** SELECT age, gender FROM accounts GROUP BY age, gender */
+  @Test
+  public void multipleBucketWithoutMetricShouldPass() {
+    String json =
+        "{\n"
+            + "  \"lterms#age\": {\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": 31,\n"
+            + "        \"doc_count\": 61,\n"
+            + "        \"sterms#gender\": {\n"
+            + "          \"buckets\": [\n"
+            + "            {\n"
+            + "              \"key\": \"m\",\n"
+            + "              \"doc_count\": 35\n"
+            + "            },\n"
+            + "            {\n"
+            + "              \"key\": \"f\",\n"
+            + "              \"doc_count\": 26\n"
+            + "            }\n"
+            + "          ]\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\": 39,\n"
+            + "        \"doc_count\": 60,\n"
+            + "        \"sterms#gender\": {\n"
+            + "          \"buckets\": [\n"
+            + "            {\n"
+            + "              \"key\": \"f\",\n"
+            + "              \"doc_count\": 38\n"
+            + "            },\n"
+            + "            {\n"
+            + "              \"key\": \"m\",\n"
+            + "              \"doc_count\": 22\n"
+            + "            }\n"
+            + "          ]\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
+    List<Map<String, Object>> result =
+        SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            allOf(hasEntry("age", (Object) 31L), hasEntry("gender", "m")),
+            allOf(hasEntry("age", (Object) 31L), hasEntry("gender", "f")),
+            allOf(hasEntry("age", (Object) 39L), hasEntry("gender", "m")),
+            allOf(hasEntry("age", (Object) 39L), hasEntry("gender", "f"))));
+  }
 
-    /**
-     * SELECT PERCENTILES(age) FROM accounts
-     */
-    @Test
-    public void noBucketPercentilesShouldPass() {
-        String json = "{\n"
-                      + "  \"percentiles_bucket#age\": {\n"
-                      + "    \"values\": {\n"
-                      + "      \"1.0\": 20,\n"
-                      + "      \"5.0\": 21,\n"
-                      + "      \"25.0\": 25,\n"
-                      + "      \"50.0\": 30.90909090909091,\n"
-                      + "      \"75.0\": 35,\n"
-                      + "      \"95.0\": 39,\n"
-                      + "      \"99.0\": 40\n"
-                      + "    }\n"
-                      + "  }\n"
-                      + "}";
-        List<Map<String, Object>> result = SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
-        assertThat(result, contains(allOf(hasEntry("age_1.0", 20d))));
-    }
+  /** SELECT PERCENTILES(age) FROM accounts */
+  @Test
+  public void noBucketPercentilesShouldPass() {
+    String json =
+        "{\n"
+            + "  \"percentiles_bucket#age\": {\n"
+            + "    \"values\": {\n"
+            + "      \"1.0\": 20,\n"
+            + "      \"5.0\": 21,\n"
+            + "      \"25.0\": 25,\n"
+            + "      \"50.0\": 30.90909090909091,\n"
+            + "      \"75.0\": 35,\n"
+            + "      \"95.0\": 39,\n"
+            + "      \"99.0\": 40\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
+    List<Map<String, Object>> result =
+        SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
+    assertThat(result, contains(allOf(hasEntry("age_1.0", 20d))));
+  }
 
-    /**
-     * SELECT count(*) from online
-     * GROUP BY date_histogram('field'='insert_time','interval'='4d','alias'='days')
-     */
-    @Test
-    public void populateShouldPass() {
-        String json = "{\n"
-                      + "  \"date_histogram#days\": {\n"
-                      + "    \"buckets\": [\n"
-                      + "      {\n"
-                      + "        \"key_as_string\": \"2014-08-14 00:00:00\",\n"
-                      + "        \"key\": 1407974400000,\n"
-                      + "        \"doc_count\": 477,\n"
-                      + "        \"value_count#COUNT_0\": {\n"
-                      + "          \"value\": 477\n"
-                      + "        }\n"
-                      + "      }\n"
-                      + "    ]\n"
-                      + "  }\n"
-                      + "}";
-        List<Map<String, Object>> result = SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
-        assertThat(result, containsInAnyOrder(
-                allOf(hasEntry("days", (Object) "2014-08-14 00:00:00"), hasEntry("COUNT_0",477d))));
-    }
+  /**
+   * SELECT count(*) from online GROUP BY
+   * date_histogram('field'='insert_time','interval'='4d','alias'='days')
+   */
+  @Test
+  public void populateShouldPass() {
+    String json =
+        "{\n"
+            + "  \"date_histogram#days\": {\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key_as_string\": \"2014-08-14 00:00:00\",\n"
+            + "        \"key\": 1407974400000,\n"
+            + "        \"doc_count\": 477,\n"
+            + "        \"value_count#COUNT_0\": {\n"
+            + "          \"value\": 477\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
+    List<Map<String, Object>> result =
+        SearchAggregationResponseHelper.flatten(AggregationUtils.fromJson(json));
+    assertThat(
+        result,
+        containsInAnyOrder(
+            allOf(hasEntry("days", (Object) "2014-08-14 00:00:00"), hasEntry("COUNT_0", 477d))));
+  }
 
-    /**
-     * SELECT s
-     */
-    @Test
-    public void populateSearchAggregationResponeShouldPass() {
-        String json = "{\n"
-                      + "  \"lterms#age\": {\n"
-                      + "    \"buckets\": [\n"
-                      + "      {\n"
-                      + "        \"key\": 31,\n"
-                      + "        \"doc_count\": 61,\n"
-                      + "        \"sterms#gender\": {\n"
-                      + "          \"buckets\": [\n"
-                      + "            {\n"
-                      + "              \"key\": \"m\",\n"
-                      + "              \"doc_count\": 35\n"
-                      + "            },\n"
-                      + "            {\n"
-                      + "              \"key\": \"f\",\n"
-                      + "              \"doc_count\": 26\n"
-                      + "            }\n"
-                      + "          ]\n"
-                      + "        }\n"
-                      + "      },\n"
-                      + "      {\n"
-                      + "        \"key\": 39,\n"
-                      + "        \"doc_count\": 60,\n"
-                      + "        \"sterms#gender\": {\n"
-                      + "          \"buckets\": [\n"
-                      + "            {\n"
-                      + "              \"key\": \"f\",\n"
-                      + "              \"doc_count\": 38\n"
-                      + "            },\n"
-                      + "            {\n"
-                      + "              \"key\": \"m\",\n"
-                      + "              \"doc_count\": 22\n"
-                      + "            }\n"
-                      + "          ]\n"
-                      + "        }\n"
-                      + "      }\n"
-                      + "    ]\n"
-                      + "  }\n"
-                      + "}";
-        List<BindingTupleRow> bindingTupleRows =
-                SearchAggregationResponseHelper.populateSearchAggregationResponse(AggregationUtils.fromJson(json));
-        assertEquals(4, bindingTupleRows.size());
-        assertThat(bindingTupleRows, containsInAnyOrder(
-                bindingTupleRow(BindingTuple.from(ImmutableMap.of("age", 31L, "gender", "m"))),
-                bindingTupleRow(BindingTuple.from(ImmutableMap.of("age", 31L, "gender", "f"))),
-                bindingTupleRow(BindingTuple.from(ImmutableMap.of("age", 39L, "gender", "m"))),
-                bindingTupleRow(BindingTuple.from(ImmutableMap.of("age", 39L, "gender", "f")))));
-    }
+  /** SELECT s */
+  @Test
+  public void populateSearchAggregationResponeShouldPass() {
+    String json =
+        "{\n"
+            + "  \"lterms#age\": {\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": 31,\n"
+            + "        \"doc_count\": 61,\n"
+            + "        \"sterms#gender\": {\n"
+            + "          \"buckets\": [\n"
+            + "            {\n"
+            + "              \"key\": \"m\",\n"
+            + "              \"doc_count\": 35\n"
+            + "            },\n"
+            + "            {\n"
+            + "              \"key\": \"f\",\n"
+            + "              \"doc_count\": 26\n"
+            + "            }\n"
+            + "          ]\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\": 39,\n"
+            + "        \"doc_count\": 60,\n"
+            + "        \"sterms#gender\": {\n"
+            + "          \"buckets\": [\n"
+            + "            {\n"
+            + "              \"key\": \"f\",\n"
+            + "              \"doc_count\": 38\n"
+            + "            },\n"
+            + "            {\n"
+            + "              \"key\": \"m\",\n"
+            + "              \"doc_count\": 22\n"
+            + "            }\n"
+            + "          ]\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
+    List<BindingTupleRow> bindingTupleRows =
+        SearchAggregationResponseHelper.populateSearchAggregationResponse(
+            AggregationUtils.fromJson(json));
+    assertEquals(4, bindingTupleRows.size());
+    assertThat(
+        bindingTupleRows,
+        containsInAnyOrder(
+            bindingTupleRow(BindingTuple.from(ImmutableMap.of("age", 31L, "gender", "m"))),
+            bindingTupleRow(BindingTuple.from(ImmutableMap.of("age", 31L, "gender", "f"))),
+            bindingTupleRow(BindingTuple.from(ImmutableMap.of("age", 39L, "gender", "m"))),
+            bindingTupleRow(BindingTuple.from(ImmutableMap.of("age", 39L, "gender", "f")))));
+  }
 
-    private static Matcher<BindingTupleRow> bindingTupleRow(BindingTuple bindingTuple) {
-        return featureValueOf("BindingTuple", equalTo(bindingTuple), BindingTupleRow::data);
-    }
+  private static Matcher<BindingTupleRow> bindingTupleRow(BindingTuple bindingTuple) {
+    return featureValueOf("BindingTuple", equalTo(bindingTuple), BindingTupleRow::data);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/query/DefaultQueryActionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/query/DefaultQueryActionTest.java
index 57530692d4..755d604a65 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/query/DefaultQueryActionTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/query/DefaultQueryActionTest.java
@@ -3,12 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.query;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -42,228 +41,225 @@
 
 public class DefaultQueryActionTest {
 
-    private DefaultQueryAction queryAction;
+  private DefaultQueryAction queryAction;
 
-    private Client mockClient;
+  private Client mockClient;
 
-    private Select mockSelect;
+  private Select mockSelect;
 
-    private SearchRequestBuilder mockRequestBuilder;
+  private SearchRequestBuilder mockRequestBuilder;
 
-    @Before
-    public void initDefaultQueryAction() {
+  @Before
+  public void initDefaultQueryAction() {
 
-        mockClient = mock(Client.class);
-        mockSelect = mock(Select.class);
-        mockRequestBuilder = mock(SearchRequestBuilder.class);
+    mockClient = mock(Client.class);
+    mockSelect = mock(Select.class);
+    mockRequestBuilder = mock(SearchRequestBuilder.class);
 
-        List<Field> fields = new LinkedList<>();
-        fields.add(new Field("balance", "bbb"));
+    List<Field> fields = new LinkedList<>();
+    fields.add(new Field("balance", "bbb"));
 
-        doReturn(fields).when(mockSelect).getFields();
-        doReturn(null).when(mockRequestBuilder).setFetchSource(any(String[].class), any(String[].class));
-        doReturn(null).when(mockRequestBuilder).addScriptField(anyString(), any(Script.class));
+    doReturn(fields).when(mockSelect).getFields();
+    doReturn(null)
+        .when(mockRequestBuilder)
+        .setFetchSource(any(String[].class), any(String[].class));
+    doReturn(null).when(mockRequestBuilder).addScriptField(anyString(), any(Script.class));
 
-        queryAction = new DefaultQueryAction(mockClient, mockSelect);
-        queryAction.initialize(mockRequestBuilder);
-    }
+    queryAction = new DefaultQueryAction(mockClient, mockSelect);
+    queryAction.initialize(mockRequestBuilder);
+  }
 
-    @After
-    public void cleanup() {
-        LocalClusterState.state(null);
-    }
+  @After
+  public void cleanup() {
+    LocalClusterState.state(null);
+  }
 
-    @Test
-    public void scriptFieldWithTwoParams() throws SqlParseException {
+  @Test
+  public void scriptFieldWithTwoParams() throws SqlParseException {
 
-        List<Field> fields = new LinkedList<>();
-        fields.add(createScriptField("script1", "doc['balance'] * 2",
-                false, true, false));
+    List<Field> fields = new LinkedList<>();
+    fields.add(createScriptField("script1", "doc['balance'] * 2", false, true, false));
 
-        queryAction.setFields(fields);
+    queryAction.setFields(fields);
 
-        final Optional<List<String>> fieldNames = queryAction.getFieldNames();
-        Assert.assertTrue("Field names have not been set", fieldNames.isPresent());
-        Assert.assertThat(fieldNames.get().size(), equalTo(1));
-        Assert.assertThat(fieldNames.get().get(0), equalTo("script1"));
+    final Optional<List<String>> fieldNames = queryAction.getFieldNames();
+    Assert.assertTrue("Field names have not been set", fieldNames.isPresent());
+    Assert.assertThat(fieldNames.get().size(), equalTo(1));
+    Assert.assertThat(fieldNames.get().get(0), equalTo("script1"));
 
-        Mockito.verify(mockRequestBuilder).addScriptField(eq("script1"), any(Script.class));
-    }
+    Mockito.verify(mockRequestBuilder).addScriptField(eq("script1"), any(Script.class));
+  }
 
-    @Test
-    public void scriptFieldWithThreeParams() throws SqlParseException {
+  @Test
+  public void scriptFieldWithThreeParams() throws SqlParseException {
 
-        List<Field> fields = new LinkedList<>();
-        fields.add(createScriptField("script1", "doc['balance'] * 2",
-                true, true, false));
+    List<Field> fields = new LinkedList<>();
+    fields.add(createScriptField("script1", "doc['balance'] * 2", true, true, false));
 
-        queryAction.setFields(fields);
+    queryAction.setFields(fields);
 
-        final Optional<List<String>> fieldNames = queryAction.getFieldNames();
-        Assert.assertTrue("Field names have not been set", fieldNames.isPresent());
-        Assert.assertThat(fieldNames.get().size(), equalTo(1));
-        Assert.assertThat(fieldNames.get().get(0), equalTo("script1"));
+    final Optional<List<String>> fieldNames = queryAction.getFieldNames();
+    Assert.assertTrue("Field names have not been set", fieldNames.isPresent());
+    Assert.assertThat(fieldNames.get().size(), equalTo(1));
+    Assert.assertThat(fieldNames.get().get(0), equalTo("script1"));
 
-        Mockito.verify(mockRequestBuilder).addScriptField(eq("script1"), any(Script.class));
-    }
+    Mockito.verify(mockRequestBuilder).addScriptField(eq("script1"), any(Script.class));
+  }
 
-    @Test(expected = SqlParseException.class)
-    public void scriptFieldWithLessThanTwoParams() throws SqlParseException {
+  @Test(expected = SqlParseException.class)
+  public void scriptFieldWithLessThanTwoParams() throws SqlParseException {
 
-        List<Field> fields = new LinkedList<>();
-        fields.add(createScriptField("script1", "doc['balance'] * 2",
-                false, false, false));
+    List<Field> fields = new LinkedList<>();
+    fields.add(createScriptField("script1", "doc['balance'] * 2", false, false, false));
 
-        queryAction.setFields(fields);
-    }
+    queryAction.setFields(fields);
+  }
 
-    @Test
-    public void scriptFieldWithMoreThanThreeParams() throws SqlParseException {
+  @Test
+  public void scriptFieldWithMoreThanThreeParams() throws SqlParseException {
 
-        List<Field> fields = new LinkedList<>();
-        fields.add(createScriptField("script1", "doc['balance'] * 2",
-                false, true, true));
-
-        queryAction.setFields(fields);
-    }
-
-    @Test
-    public void testIfScrollShouldBeOpenWithDifferentFormats() {
-        int settingFetchSize = 500;
-        TimeValue timeValue = new TimeValue(120000);
-        int limit = 2300;
-        mockLocalClusterStateAndInitializeMetrics(timeValue);
-
-        doReturn(limit).when(mockSelect).getRowCount();
-        doReturn(mockRequestBuilder).when(mockRequestBuilder).setSize(settingFetchSize);
-        SqlRequest mockSqlRequest = mock(SqlRequest.class);
-        doReturn(settingFetchSize).when(mockSqlRequest).fetchSize();
-        queryAction.setSqlRequest(mockSqlRequest);
-
-        Format[] formats = new Format[] {Format.CSV, Format.RAW, Format.JSON, Format.TABLE};
-        for (Format format : formats) {
-            queryAction.setFormat(format);
-            queryAction.checkAndSetScroll();
-        }
-
-        Mockito.verify(mockRequestBuilder, times(4)).setSize(limit);
-        Mockito.verify(mockRequestBuilder, never()).setScroll(any(TimeValue.class));
-
-        queryAction.setFormat(Format.JDBC);
-        queryAction.checkAndSetScroll();
-        Mockito.verify(mockRequestBuilder).setSize(settingFetchSize);
-        Mockito.verify(mockRequestBuilder).setScroll(timeValue);
-
-    }
+    List<Field> fields = new LinkedList<>();
+    fields.add(createScriptField("script1", "doc['balance'] * 2", false, true, true));
 
-    @Test
-    public void testIfScrollShouldBeOpen() {
-        int settingFetchSize = 500;
-        TimeValue timeValue = new TimeValue(120000);
-        int limit = 2300;
+    queryAction.setFields(fields);
+  }
 
-        doReturn(limit).when(mockSelect).getRowCount();
-        doReturn(mockRequestBuilder).when(mockRequestBuilder).setSize(settingFetchSize);
-        SqlRequest mockSqlRequest = mock(SqlRequest.class);
-        doReturn(settingFetchSize).when(mockSqlRequest).fetchSize();
-        queryAction.setSqlRequest(mockSqlRequest);
-        queryAction.setFormat(Format.JDBC);
+  @Test
+  public void testIfScrollShouldBeOpenWithDifferentFormats() {
+    int settingFetchSize = 500;
+    TimeValue timeValue = new TimeValue(120000);
+    int limit = 2300;
+    mockLocalClusterStateAndInitializeMetrics(timeValue);
 
-        mockLocalClusterStateAndInitializeMetrics(timeValue);
-        queryAction.checkAndSetScroll();
-        Mockito.verify(mockRequestBuilder).setSize(settingFetchSize);
-        Mockito.verify(mockRequestBuilder).setScroll(timeValue);
+    doReturn(limit).when(mockSelect).getRowCount();
+    doReturn(mockRequestBuilder).when(mockRequestBuilder).setSize(settingFetchSize);
+    SqlRequest mockSqlRequest = mock(SqlRequest.class);
+    doReturn(settingFetchSize).when(mockSqlRequest).fetchSize();
+    queryAction.setSqlRequest(mockSqlRequest);
 
+    Format[] formats = new Format[] {Format.CSV, Format.RAW, Format.JSON, Format.TABLE};
+    for (Format format : formats) {
+      queryAction.setFormat(format);
+      queryAction.checkAndSetScroll();
     }
 
-    @Test
-    public void testIfScrollShouldBeOpenWithDifferentFetchSize() {
-        TimeValue timeValue = new TimeValue(120000);
-        int limit = 2300;
-        mockLocalClusterStateAndInitializeMetrics(timeValue);
-
-        doReturn(limit).when(mockSelect).getRowCount();
-        SqlRequest mockSqlRequest = mock(SqlRequest.class);
-        queryAction.setSqlRequest(mockSqlRequest);
-        queryAction.setFormat(Format.JDBC);
-
-        int[] fetchSizes = new int[] {0, -10};
-        for (int fetch : fetchSizes) {
-            doReturn(fetch).when(mockSqlRequest).fetchSize();
-            queryAction.checkAndSetScroll();
-        }
-        Mockito.verify(mockRequestBuilder, times(2)).setSize(limit);
-        Mockito.verify(mockRequestBuilder, never()).setScroll(timeValue);
-
-        int userFetchSize = 20;
-        doReturn(userFetchSize).when(mockSqlRequest).fetchSize();
-        doReturn(mockRequestBuilder).when(mockRequestBuilder).setSize(userFetchSize);
-        queryAction.checkAndSetScroll();
-        Mockito.verify(mockRequestBuilder).setSize(20);
-        Mockito.verify(mockRequestBuilder).setScroll(timeValue);
+    Mockito.verify(mockRequestBuilder, times(4)).setSize(limit);
+    Mockito.verify(mockRequestBuilder, never()).setScroll(any(TimeValue.class));
+
+    queryAction.setFormat(Format.JDBC);
+    queryAction.checkAndSetScroll();
+    Mockito.verify(mockRequestBuilder).setSize(settingFetchSize);
+    Mockito.verify(mockRequestBuilder).setScroll(timeValue);
+  }
+
+  @Test
+  public void testIfScrollShouldBeOpen() {
+    int settingFetchSize = 500;
+    TimeValue timeValue = new TimeValue(120000);
+    int limit = 2300;
+
+    doReturn(limit).when(mockSelect).getRowCount();
+    doReturn(mockRequestBuilder).when(mockRequestBuilder).setSize(settingFetchSize);
+    SqlRequest mockSqlRequest = mock(SqlRequest.class);
+    doReturn(settingFetchSize).when(mockSqlRequest).fetchSize();
+    queryAction.setSqlRequest(mockSqlRequest);
+    queryAction.setFormat(Format.JDBC);
+
+    mockLocalClusterStateAndInitializeMetrics(timeValue);
+    queryAction.checkAndSetScroll();
+    Mockito.verify(mockRequestBuilder).setSize(settingFetchSize);
+    Mockito.verify(mockRequestBuilder).setScroll(timeValue);
+  }
+
+  @Test
+  public void testIfScrollShouldBeOpenWithDifferentFetchSize() {
+    TimeValue timeValue = new TimeValue(120000);
+    int limit = 2300;
+    mockLocalClusterStateAndInitializeMetrics(timeValue);
+
+    doReturn(limit).when(mockSelect).getRowCount();
+    SqlRequest mockSqlRequest = mock(SqlRequest.class);
+    queryAction.setSqlRequest(mockSqlRequest);
+    queryAction.setFormat(Format.JDBC);
+
+    int[] fetchSizes = new int[] {0, -10};
+    for (int fetch : fetchSizes) {
+      doReturn(fetch).when(mockSqlRequest).fetchSize();
+      queryAction.checkAndSetScroll();
     }
-
-
-    @Test
-    public void testIfScrollShouldBeOpenWithDifferentValidFetchSizeAndLimit() {
-        TimeValue timeValue = new TimeValue(120000);
-        mockLocalClusterStateAndInitializeMetrics(timeValue);
-
-        int limit = 2300;
-        doReturn(limit).when(mockSelect).getRowCount();
-        SqlRequest mockSqlRequest = mock(SqlRequest.class);
-
-        /** fetchSize <= LIMIT - open scroll*/
-        int userFetchSize = 1500;
-        doReturn(userFetchSize).when(mockSqlRequest).fetchSize();
-        doReturn(mockRequestBuilder).when(mockRequestBuilder).setSize(userFetchSize);
-        queryAction.setSqlRequest(mockSqlRequest);
-        queryAction.setFormat(Format.JDBC);
-
-        queryAction.checkAndSetScroll();
-        Mockito.verify(mockRequestBuilder).setSize(userFetchSize);
-        Mockito.verify(mockRequestBuilder).setScroll(timeValue);
-
-        /** fetchSize > LIMIT - no scroll */
-        userFetchSize = 5000;
-        doReturn(userFetchSize).when(mockSqlRequest).fetchSize();
-        mockRequestBuilder = mock(SearchRequestBuilder.class);
-        queryAction.initialize(mockRequestBuilder);
-        queryAction.checkAndSetScroll();
-        Mockito.verify(mockRequestBuilder).setSize(limit);
-        Mockito.verify(mockRequestBuilder, never()).setScroll(timeValue);
+    Mockito.verify(mockRequestBuilder, times(2)).setSize(limit);
+    Mockito.verify(mockRequestBuilder, never()).setScroll(timeValue);
+
+    int userFetchSize = 20;
+    doReturn(userFetchSize).when(mockSqlRequest).fetchSize();
+    doReturn(mockRequestBuilder).when(mockRequestBuilder).setSize(userFetchSize);
+    queryAction.checkAndSetScroll();
+    Mockito.verify(mockRequestBuilder).setSize(20);
+    Mockito.verify(mockRequestBuilder).setScroll(timeValue);
+  }
+
+  @Test
+  public void testIfScrollShouldBeOpenWithDifferentValidFetchSizeAndLimit() {
+    TimeValue timeValue = new TimeValue(120000);
+    mockLocalClusterStateAndInitializeMetrics(timeValue);
+
+    int limit = 2300;
+    doReturn(limit).when(mockSelect).getRowCount();
+    SqlRequest mockSqlRequest = mock(SqlRequest.class);
+
+    /** fetchSize <= LIMIT - open scroll */
+    int userFetchSize = 1500;
+    doReturn(userFetchSize).when(mockSqlRequest).fetchSize();
+    doReturn(mockRequestBuilder).when(mockRequestBuilder).setSize(userFetchSize);
+    queryAction.setSqlRequest(mockSqlRequest);
+    queryAction.setFormat(Format.JDBC);
+
+    queryAction.checkAndSetScroll();
+    Mockito.verify(mockRequestBuilder).setSize(userFetchSize);
+    Mockito.verify(mockRequestBuilder).setScroll(timeValue);
+
+    /** fetchSize > LIMIT - no scroll */
+    userFetchSize = 5000;
+    doReturn(userFetchSize).when(mockSqlRequest).fetchSize();
+    mockRequestBuilder = mock(SearchRequestBuilder.class);
+    queryAction.initialize(mockRequestBuilder);
+    queryAction.checkAndSetScroll();
+    Mockito.verify(mockRequestBuilder).setSize(limit);
+    Mockito.verify(mockRequestBuilder, never()).setScroll(timeValue);
+  }
+
+  private void mockLocalClusterStateAndInitializeMetrics(TimeValue time) {
+    LocalClusterState mockLocalClusterState = mock(LocalClusterState.class);
+    LocalClusterState.state(mockLocalClusterState);
+    doReturn(time).when(mockLocalClusterState).getSettingValue(Settings.Key.SQL_CURSOR_KEEP_ALIVE);
+    doReturn(3600L)
+        .when(mockLocalClusterState)
+        .getSettingValue(Settings.Key.METRICS_ROLLING_WINDOW);
+    doReturn(2L).when(mockLocalClusterState).getSettingValue(Settings.Key.METRICS_ROLLING_INTERVAL);
+
+    Metrics.getInstance().registerDefaultMetrics();
+  }
+
+  private Field createScriptField(
+      final String name,
+      final String script,
+      final boolean addScriptLanguage,
+      final boolean addScriptParam,
+      final boolean addRedundantParam) {
+
+    final List<KVValue> params = new ArrayList<>();
+
+    params.add(new KVValue("alias", name));
+    if (addScriptLanguage) {
+      params.add(new KVValue("painless"));
     }
-
-    private void mockLocalClusterStateAndInitializeMetrics(TimeValue time) {
-        LocalClusterState mockLocalClusterState = mock(LocalClusterState.class);
-        LocalClusterState.state(mockLocalClusterState);
-        doReturn(time).when(mockLocalClusterState).getSettingValue(
-            Settings.Key.SQL_CURSOR_KEEP_ALIVE);
-        doReturn(3600L).when(mockLocalClusterState).getSettingValue(
-            Settings.Key.METRICS_ROLLING_WINDOW);
-        doReturn(2L).when(mockLocalClusterState).getSettingValue(
-            Settings.Key.METRICS_ROLLING_INTERVAL);
-
-        Metrics.getInstance().registerDefaultMetrics();
-
+    if (addScriptParam) {
+      params.add(new KVValue(script));
     }
-
-    private Field createScriptField(final String name, final String script, final boolean addScriptLanguage,
-                                    final boolean addScriptParam, final boolean addRedundantParam) {
-
-        final List<KVValue> params = new ArrayList<>();
-
-        params.add(new KVValue("alias", name));
-        if (addScriptLanguage) {
-            params.add(new KVValue("painless"));
-        }
-        if (addScriptParam) {
-            params.add(new KVValue(script));
-        }
-        if (addRedundantParam) {
-            params.add(new KVValue("Fail the test"));
-        }
-
-        return new MethodField("script", params, null, null);
+    if (addRedundantParam) {
+      params.add(new KVValue("Fail the test"));
     }
+
+    return new MethodField("script", params, null, null);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/RewriteRuleExecutorTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/RewriteRuleExecutorTest.java
index 632cd2d7ea..badddd53a5 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/RewriteRuleExecutorTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/RewriteRuleExecutorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter;
 
 import static org.mockito.Mockito.never;
@@ -17,37 +16,35 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.sql.legacy.rewriter.RewriteRule;
 import org.opensearch.sql.legacy.rewriter.RewriteRuleExecutor;
 
 @RunWith(MockitoJUnitRunner.class)
 public class RewriteRuleExecutorTest {
-    @Mock
-    private RewriteRule<SQLQueryExpr> rewriter;
-    @Mock
-    private SQLQueryExpr expr;
+  @Mock private RewriteRule<SQLQueryExpr> rewriter;
+  @Mock private SQLQueryExpr expr;
 
-    private RewriteRuleExecutor<SQLQueryExpr> ruleExecutor;
+  private RewriteRuleExecutor<SQLQueryExpr> ruleExecutor;
 
-    @Before
-    public void setup() {
-        ruleExecutor = RewriteRuleExecutor.<SQLQueryExpr>builder().withRule(rewriter).build();
-    }
+  @Before
+  public void setup() {
+    ruleExecutor = RewriteRuleExecutor.<SQLQueryExpr>builder().withRule(rewriter).build();
+  }
 
-    @Test
-    public void optimize() throws SQLFeatureNotSupportedException {
-        when(rewriter.match(expr)).thenReturn(true);
+  @Test
+  public void optimize() throws SQLFeatureNotSupportedException {
+    when(rewriter.match(expr)).thenReturn(true);
 
-        ruleExecutor.executeOn(expr);
-        verify(rewriter, times(1)).rewrite(expr);
-    }
+    ruleExecutor.executeOn(expr);
+    verify(rewriter, times(1)).rewrite(expr);
+  }
 
-    @Test
-    public void noOptimize() throws SQLFeatureNotSupportedException {
-        when(rewriter.match(expr)).thenReturn(false);
+  @Test
+  public void noOptimize() throws SQLFeatureNotSupportedException {
+    when(rewriter.match(expr)).thenReturn(false);
 
-        ruleExecutor.executeOn(expr);
-        verify(rewriter, never()).rewrite(expr);
-    }
+    ruleExecutor.executeOn(expr);
+    verify(rewriter, never()).rewrite(expr);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/identifier/UnquoteIdentifierRuleTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/identifier/UnquoteIdentifierRuleTest.java
index 41f7b111b0..30bbac861a 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/identifier/UnquoteIdentifierRuleTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/identifier/UnquoteIdentifierRuleTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.identifier;
 
 import com.alibaba.druid.sql.SQLUtils;
@@ -13,75 +12,70 @@
 import org.opensearch.sql.legacy.rewriter.identifier.UnquoteIdentifierRule;
 import org.opensearch.sql.legacy.util.SqlParserUtils;
 
-
-/**
- * Test cases for backticks quoted identifiers
- */
+/** Test cases for backticks quoted identifiers */
 public class UnquoteIdentifierRuleTest {
 
-    @Test
-    public void queryWithQuotedIndex() {
-        query("SELECT lastname FROM `bank` WHERE balance > 1000 ORDER BY age"
-        ).shouldBeAfterRewrite("SELECT lastname FROM bank WHERE balance > 1000 ORDER BY age");
-    }
-
-    @Test
-    public void queryWithQuotedField() {
-        query("SELECT `lastname` FROM bank ORDER BY age"
-        ).shouldBeAfterRewrite("SELECT lastname FROM bank ORDER BY age");
-
-        query("SELECT b.`lastname` FROM bank AS b ORDER BY age"
-        ).shouldBeAfterRewrite("SELECT b.lastname FROM bank AS b ORDER BY age");
-    }
-
-    @Test
-    public void queryWithQuotedAlias() {
-        query("SELECT `b`.lastname FROM bank AS `b` ORDER BY age"
-        ).shouldBeAfterRewrite("SELECT b.lastname FROM bank AS b ORDER BY age");
-
-        query("SELECT `b`.`lastname` FROM bank AS `b` ORDER BY age"
-        ).shouldBeAfterRewrite("SELECT b.lastname FROM bank AS b ORDER BY age");
-
-        query("SELECT `b`.`lastname` AS `name` FROM bank AS `b` ORDER BY age"
-        ).shouldBeAfterRewrite("SELECT b.lastname AS name FROM bank AS b ORDER BY age");
+  @Test
+  public void queryWithQuotedIndex() {
+    query("SELECT lastname FROM `bank` WHERE balance > 1000 ORDER BY age")
+        .shouldBeAfterRewrite("SELECT lastname FROM bank WHERE balance > 1000 ORDER BY age");
+  }
+
+  @Test
+  public void queryWithQuotedField() {
+    query("SELECT `lastname` FROM bank ORDER BY age")
+        .shouldBeAfterRewrite("SELECT lastname FROM bank ORDER BY age");
+
+    query("SELECT b.`lastname` FROM bank AS b ORDER BY age")
+        .shouldBeAfterRewrite("SELECT b.lastname FROM bank AS b ORDER BY age");
+  }
+
+  @Test
+  public void queryWithQuotedAlias() {
+    query("SELECT `b`.lastname FROM bank AS `b` ORDER BY age")
+        .shouldBeAfterRewrite("SELECT b.lastname FROM bank AS b ORDER BY age");
+
+    query("SELECT `b`.`lastname` FROM bank AS `b` ORDER BY age")
+        .shouldBeAfterRewrite("SELECT b.lastname FROM bank AS b ORDER BY age");
+
+    query("SELECT `b`.`lastname` AS `name` FROM bank AS `b` ORDER BY age")
+        .shouldBeAfterRewrite("SELECT b.lastname AS name FROM bank AS b ORDER BY age");
+  }
+
+  @Test
+  public void selectSpecificFieldsUsingQuotedTableNamePrefix() {
+    query("SELECT `bank`.`lastname` FROM `bank`")
+        .shouldBeAfterRewrite("SELECT bank.lastname FROM bank");
+  }
+
+  @Test
+  public void queryWithQuotedAggrAndFunc() {
+    query(
+            ""
+                + "SELECT `b`.`lastname` AS `name`, AVG(`b`.`balance`) FROM `bank` AS `b` "
+                + "WHERE ABS(`b`.`age`) > 20 GROUP BY `b`.`lastname` ORDER BY `b`.`lastname`")
+        .shouldBeAfterRewrite(
+            "SELECT b.lastname AS name, AVG(b.balance) FROM bank AS b "
+                + "WHERE ABS(b.age) > 20 GROUP BY b.lastname ORDER BY b.lastname");
+  }
+
+  private QueryAssertion query(String sql) {
+    return new QueryAssertion(sql);
+  }
+
+  private static class QueryAssertion {
+
+    private UnquoteIdentifierRule rule = new UnquoteIdentifierRule();
+    private SQLQueryExpr expr;
+
+    QueryAssertion(String sql) {
+      this.expr = SqlParserUtils.parse(sql);
     }
 
-    @Test
-    public void selectSpecificFieldsUsingQuotedTableNamePrefix() {
-        query("SELECT `bank`.`lastname` FROM `bank`"
-        ).shouldBeAfterRewrite("SELECT bank.lastname FROM bank");
-    }
-
-    @Test
-    public void queryWithQuotedAggrAndFunc() {
-        query("" +
-                "SELECT `b`.`lastname` AS `name`, AVG(`b`.`balance`) FROM `bank` AS `b` " +
-                "WHERE ABS(`b`.`age`) > 20 GROUP BY `b`.`lastname` ORDER BY `b`.`lastname`"
-        ).shouldBeAfterRewrite(
-                "SELECT b.lastname AS name, AVG(b.balance) FROM bank AS b " +
-                        "WHERE ABS(b.age) > 20 GROUP BY b.lastname ORDER BY b.lastname"
-        );
-    }
-
-    private QueryAssertion query(String sql) {
-        return new QueryAssertion(sql);
-    }
-
-    private static class QueryAssertion {
-
-        private UnquoteIdentifierRule rule = new UnquoteIdentifierRule();
-        private SQLQueryExpr expr;
-
-        QueryAssertion(String sql) {
-            this.expr = SqlParserUtils.parse(sql);
-        }
-
-        void shouldBeAfterRewrite(String expected) {
-            rule.rewrite(expr);
-            Assert.assertEquals(
-                    SQLUtils.toMySqlString(SqlParserUtils.parse(expected)),
-                    SQLUtils.toMySqlString(expr)
-            );
-        }
+    void shouldBeAfterRewrite(String expected) {
+      rule.rewrite(expr);
+      Assert.assertEquals(
+          SQLUtils.toMySqlString(SqlParserUtils.parse(expected)), SQLUtils.toMySqlString(expr));
     }
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/inline/AliasInliningTests.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/inline/AliasInliningTests.java
index 0c16a3264a..168725ed11 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/inline/AliasInliningTests.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/inline/AliasInliningTests.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.inline;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -29,101 +28,111 @@
 
 public class AliasInliningTests {
 
-    private static final String TEST_MAPPING_FILE = "mappings/semantics.json";
-    @Before
-    public void setUp() throws IOException {
-        URL url = Resources.getResource(TEST_MAPPING_FILE);
-        String mappings = Resources.toString(url, Charsets.UTF_8);
-        mockLocalClusterState(mappings);
-    }
-
-    @Test
-    public void orderByAliasedFieldTest() throws SqlParseException {
-        String originalQuery = "SELECT utc_time date " +
-                "FROM opensearch_dashboards_sample_data_logs " +
-                "ORDER BY date DESC";
-        String originalDsl = parseAsSimpleQuery(originalQuery);
-
-        String rewrittenQuery =
-                "SELECT utc_time date " +
-                "FROM opensearch_dashboards_sample_data_logs " +
-                "ORDER BY utc_time DESC";
-
-        String rewrittenDsl = parseAsSimpleQuery(rewrittenQuery);
-
-        assertThat(originalDsl, equalTo(rewrittenDsl));
-    }
-
-    @Test
-    public void orderByAliasedScriptedField() throws SqlParseException {
-        String originalDsl = parseAsSimpleQuery("SELECT date_format(birthday, 'dd-MM-YYYY') date " +
-                "FROM bank " +
-                "ORDER BY date");
-        String rewrittenQuery = "SELECT date_format(birthday, 'dd-MM-YYYY') date " +
-                "FROM bank " +
-                "ORDER BY date_format(birthday, 'dd-MM-YYYY')";
-
-        String rewrittenDsl = parseAsSimpleQuery(rewrittenQuery);
-        assertThat(originalDsl, equalTo(rewrittenDsl));
-    }
-
-    @Test
-    public void groupByAliasedFieldTest() throws SqlParseException {
-        String originalQuery = "SELECT utc_time date " +
-                "FROM opensearch_dashboards_sample_data_logs " +
-                "GROUP BY date";
-
-        String originalDsl = parseAsAggregationQuery(originalQuery);
-
-        String rewrittenQuery = "SELECT utc_time date " +
-                "FROM opensearch_dashboards_sample_data_logs " +
-                "GROUP BY utc_time DESC";
-
-        String rewrittenDsl = parseAsAggregationQuery(rewrittenQuery);
-
-        assertThat(originalDsl, equalTo(rewrittenDsl));
-    }
-
-    @Test
-    public void groupAndSortBySameExprAlias() throws SqlParseException {
-        String query = "SELECT date_format(timestamp, 'yyyy-MM') opensearch-table.timestamp_tg, COUNT(*) count, COUNT(DistanceKilometers) opensearch-table.DistanceKilometers_count\n" +
-                "FROM opensearch_dashboards_sample_data_flights\n" +
-                "GROUP BY date_format(timestamp, 'yyyy-MM')\n" +
-                "ORDER BY date_format(timestamp, 'yyyy-MM') DESC\n" +
-                "LIMIT 2500";
-        String dsl = parseAsAggregationQuery(query);
-
-        JSONObject parseQuery = new JSONObject(dsl);
-
-        assertThat(parseQuery.query("/aggregations/opensearch-table.timestamp_tg/terms/script"), notNullValue());
-
-    }
-
-    @Test
-    public void groupByAndSortAliased() throws SqlParseException {
-        String dsl = parseAsAggregationQuery(
-                "SELECT date_format(utc_time, 'dd-MM-YYYY') date " +
-                        "FROM opensearch_dashboards_sample_data_logs " +
-                        "GROUP BY date " +
-                        "ORDER BY date DESC");
-
-        JSONObject parsedQuery = new JSONObject(dsl);
-
-        JSONObject query = (JSONObject)parsedQuery.query("/aggregations/date/terms/script");
-
-        assertThat(query, notNullValue());
-    }
-
-    private String parseAsSimpleQuery(String originalQuery) throws SqlParseException {
-        SqlRequest sqlRequest = new SqlRequest(originalQuery, new JSONObject());
-        DefaultQueryAction defaultQueryAction = new DefaultQueryAction(mock(Client.class),
-                new SqlParser().parseSelect(parse(originalQuery)));
-        defaultQueryAction.setSqlRequest(sqlRequest);
-        return defaultQueryAction.explain().explain();
-    }
-
-    private String parseAsAggregationQuery(String originalQuery) throws SqlParseException {
-        return new AggregationQueryAction(mock(Client.class),
-                new SqlParser().parseSelect(parse(originalQuery))).explain().explain();
-    }
+  private static final String TEST_MAPPING_FILE = "mappings/semantics.json";
+
+  @Before
+  public void setUp() throws IOException {
+    URL url = Resources.getResource(TEST_MAPPING_FILE);
+    String mappings = Resources.toString(url, Charsets.UTF_8);
+    mockLocalClusterState(mappings);
+  }
+
+  @Test
+  public void orderByAliasedFieldTest() throws SqlParseException {
+    String originalQuery =
+        "SELECT utc_time date "
+            + "FROM opensearch_dashboards_sample_data_logs "
+            + "ORDER BY date DESC";
+    String originalDsl = parseAsSimpleQuery(originalQuery);
+
+    String rewrittenQuery =
+        "SELECT utc_time date "
+            + "FROM opensearch_dashboards_sample_data_logs "
+            + "ORDER BY utc_time DESC";
+
+    String rewrittenDsl = parseAsSimpleQuery(rewrittenQuery);
+
+    assertThat(originalDsl, equalTo(rewrittenDsl));
+  }
+
+  @Test
+  public void orderByAliasedScriptedField() throws SqlParseException {
+    String originalDsl =
+        parseAsSimpleQuery(
+            "SELECT date_format(birthday, 'dd-MM-YYYY') date " + "FROM bank " + "ORDER BY date");
+    String rewrittenQuery =
+        "SELECT date_format(birthday, 'dd-MM-YYYY') date "
+            + "FROM bank "
+            + "ORDER BY date_format(birthday, 'dd-MM-YYYY')";
+
+    String rewrittenDsl = parseAsSimpleQuery(rewrittenQuery);
+    assertThat(originalDsl, equalTo(rewrittenDsl));
+  }
+
+  @Test
+  public void groupByAliasedFieldTest() throws SqlParseException {
+    String originalQuery =
+        "SELECT utc_time date " + "FROM opensearch_dashboards_sample_data_logs " + "GROUP BY date";
+
+    String originalDsl = parseAsAggregationQuery(originalQuery);
+
+    String rewrittenQuery =
+        "SELECT utc_time date "
+            + "FROM opensearch_dashboards_sample_data_logs "
+            + "GROUP BY utc_time DESC";
+
+    String rewrittenDsl = parseAsAggregationQuery(rewrittenQuery);
+
+    assertThat(originalDsl, equalTo(rewrittenDsl));
+  }
+
+  @Test
+  public void groupAndSortBySameExprAlias() throws SqlParseException {
+    String query =
+        "SELECT date_format(timestamp, 'yyyy-MM') opensearch-table.timestamp_tg, COUNT(*) count,"
+            + " COUNT(DistanceKilometers) opensearch-table.DistanceKilometers_count\n"
+            + "FROM opensearch_dashboards_sample_data_flights\n"
+            + "GROUP BY date_format(timestamp, 'yyyy-MM')\n"
+            + "ORDER BY date_format(timestamp, 'yyyy-MM') DESC\n"
+            + "LIMIT 2500";
+    String dsl = parseAsAggregationQuery(query);
+
+    JSONObject parseQuery = new JSONObject(dsl);
+
+    assertThat(
+        parseQuery.query("/aggregations/opensearch-table.timestamp_tg/terms/script"),
+        notNullValue());
+  }
+
+  @Test
+  public void groupByAndSortAliased() throws SqlParseException {
+    String dsl =
+        parseAsAggregationQuery(
+            "SELECT date_format(utc_time, 'dd-MM-YYYY') date "
+                + "FROM opensearch_dashboards_sample_data_logs "
+                + "GROUP BY date "
+                + "ORDER BY date DESC");
+
+    JSONObject parsedQuery = new JSONObject(dsl);
+
+    JSONObject query = (JSONObject) parsedQuery.query("/aggregations/date/terms/script");
+
+    assertThat(query, notNullValue());
+  }
+
+  private String parseAsSimpleQuery(String originalQuery) throws SqlParseException {
+    SqlRequest sqlRequest = new SqlRequest(originalQuery, new JSONObject());
+    DefaultQueryAction defaultQueryAction =
+        new DefaultQueryAction(
+            mock(Client.class), new SqlParser().parseSelect(parse(originalQuery)));
+    defaultQueryAction.setSqlRequest(sqlRequest);
+    return defaultQueryAction.explain().explain();
+  }
+
+  private String parseAsAggregationQuery(String originalQuery) throws SqlParseException {
+    return new AggregationQueryAction(
+            mock(Client.class), new SqlParser().parseSelect(parse(originalQuery)))
+        .explain()
+        .explain();
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/ordinal/OrdinalRewriterRuleTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/ordinal/OrdinalRewriterRuleTest.java
index 3f4f799d66..d27967e361 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/ordinal/OrdinalRewriterRuleTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/ordinal/OrdinalRewriterRuleTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.ordinal;
 
 import com.alibaba.druid.sql.SQLUtils;
@@ -16,141 +15,139 @@
 import org.opensearch.sql.legacy.rewriter.ordinal.OrdinalRewriterRule;
 import org.opensearch.sql.legacy.util.SqlParserUtils;
 
-/**
- * Test cases for ordinal aliases in GROUP BY and ORDER BY
- */
-
+/** Test cases for ordinal aliases in GROUP BY and ORDER BY */
 public class OrdinalRewriterRuleTest {
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
-    @Test
-    public void ordinalInGroupByShouldMatch() {
-        query("SELECT lastname FROM bank GROUP BY 1").shouldMatchRule();
-    }
-
-    @Test
-    public void ordinalInOrderByShouldMatch() {
-        query("SELECT lastname FROM bank ORDER BY 1").shouldMatchRule();
-    }
-
-    @Test
-    public void ordinalInGroupAndOrderByShouldMatch() {
-        query("SELECT lastname, age FROM bank GROUP BY 2, 1 ORDER BY 1").shouldMatchRule();
-    }
-
-    @Test
-    public void noOrdinalInGroupByShouldNotMatch() {
-        query("SELECT lastname FROM bank GROUP BY lastname").shouldNotMatchRule();
+  @Rule public ExpectedException exception = ExpectedException.none();
+
+  @Test
+  public void ordinalInGroupByShouldMatch() {
+    query("SELECT lastname FROM bank GROUP BY 1").shouldMatchRule();
+  }
+
+  @Test
+  public void ordinalInOrderByShouldMatch() {
+    query("SELECT lastname FROM bank ORDER BY 1").shouldMatchRule();
+  }
+
+  @Test
+  public void ordinalInGroupAndOrderByShouldMatch() {
+    query("SELECT lastname, age FROM bank GROUP BY 2, 1 ORDER BY 1").shouldMatchRule();
+  }
+
+  @Test
+  public void noOrdinalInGroupByShouldNotMatch() {
+    query("SELECT lastname FROM bank GROUP BY lastname").shouldNotMatchRule();
+  }
+
+  @Test
+  public void noOrdinalInOrderByShouldNotMatch() {
+    query("SELECT lastname, age FROM bank ORDER BY age").shouldNotMatchRule();
+  }
+
+  @Test
+  public void noOrdinalInGroupAndOrderByShouldNotMatch() {
+    query("SELECT lastname, age FROM bank GROUP BY lastname, age ORDER BY age")
+        .shouldNotMatchRule();
+  }
+
+  @Test
+  public void simpleGroupByOrdinal() {
+    query("SELECT lastname FROM bank GROUP BY 1")
+        .shouldBeAfterRewrite("SELECT lastname FROM bank GROUP BY lastname");
+  }
+
+  @Test
+  public void multipleGroupByOrdinal() {
+    query("SELECT lastname, age FROM bank GROUP BY 1, 2 ")
+        .shouldBeAfterRewrite("SELECT lastname, age FROM bank GROUP BY lastname, age");
+
+    query("SELECT lastname, age FROM bank GROUP BY 2, 1")
+        .shouldBeAfterRewrite("SELECT lastname, age FROM bank GROUP BY age, lastname");
+
+    query("SELECT lastname, age, firstname FROM bank GROUP BY 2, firstname, 1")
+        .shouldBeAfterRewrite(
+            "SELECT lastname, age, firstname FROM bank GROUP BY age, firstname, lastname");
+
+    query("SELECT lastname, age, firstname FROM bank GROUP BY 2, something, 1")
+        .shouldBeAfterRewrite(
+            "SELECT lastname, age, firstname FROM bank GROUP BY age, something, lastname");
+  }
+
+  @Test
+  public void simpleOrderByOrdinal() {
+    query("SELECT lastname FROM bank ORDER BY 1")
+        .shouldBeAfterRewrite("SELECT lastname FROM bank ORDER BY lastname");
+  }
+
+  @Test
+  public void multipleOrderByOrdinal() {
+    query("SELECT lastname, age FROM bank ORDER BY 1, 2 ")
+        .shouldBeAfterRewrite("SELECT lastname, age FROM bank ORDER BY lastname, age");
+
+    query("SELECT lastname, age FROM bank ORDER BY 2, 1")
+        .shouldBeAfterRewrite("SELECT lastname, age FROM bank ORDER BY age, lastname");
+
+    query("SELECT lastname, age, firstname FROM bank ORDER BY 2, firstname, 1")
+        .shouldBeAfterRewrite(
+            "SELECT lastname, age, firstname FROM bank ORDER BY age, firstname, lastname");
+
+    query("SELECT lastname, age, firstname FROM bank ORDER BY 2, department, 1")
+        .shouldBeAfterRewrite(
+            "SELECT lastname, age, firstname FROM bank ORDER BY age, department, lastname");
+  }
+
+  // Tests invalid Ordinals, non-positive ordinal values are already validated by semantic analyzer
+  @Test
+  public void invalidGroupByOrdinalShouldThrowException() {
+    exception.expect(VerificationException.class);
+    exception.expectMessage("Invalid ordinal [3] specified in [GROUP BY 3]");
+    query("SELECT lastname, MAX(lastname) FROM bank GROUP BY 3 ").rewrite();
+  }
+
+  @Test
+  public void invalidOrderByOrdinalShouldThrowException() {
+    exception.expect(VerificationException.class);
+    exception.expectMessage("Invalid ordinal [4] specified in [ORDER BY 4]");
+    query("SELECT `lastname`, `age`, `firstname` FROM bank ORDER BY 4 IS NOT NULL").rewrite();
+  }
+
+  private QueryAssertion query(String sql) {
+    return new QueryAssertion(sql);
+  }
+
+  private static class QueryAssertion {
+
+    private OrdinalRewriterRule rule;
+    private SQLQueryExpr expr;
+
+    QueryAssertion(String sql) {
+      this.expr = SqlParserUtils.parse(sql);
+      this.rule = new OrdinalRewriterRule(sql);
     }
 
-    @Test
-    public void noOrdinalInOrderByShouldNotMatch() {
-        query("SELECT lastname, age FROM bank ORDER BY age").shouldNotMatchRule();
+    void shouldBeAfterRewrite(String expected) {
+      shouldMatchRule();
+      rule.rewrite(expr);
+      Assert.assertEquals(
+          SQLUtils.toMySqlString(SqlParserUtils.parse(expected)), SQLUtils.toMySqlString(expr));
     }
 
-    @Test
-    public void noOrdinalInGroupAndOrderByShouldNotMatch() {
-        query("SELECT lastname, age FROM bank GROUP BY lastname, age ORDER BY age").shouldNotMatchRule();
+    void shouldMatchRule() {
+      Assert.assertTrue(match());
     }
 
-    @Test
-    public void simpleGroupByOrdinal() {
-        query("SELECT lastname FROM bank GROUP BY 1"
-        ).shouldBeAfterRewrite("SELECT lastname FROM bank GROUP BY lastname");
+    void shouldNotMatchRule() {
+      Assert.assertFalse(match());
     }
 
-    @Test
-    public void multipleGroupByOrdinal() {
-        query("SELECT lastname, age FROM bank GROUP BY 1, 2 "
-        ).shouldBeAfterRewrite("SELECT lastname, age FROM bank GROUP BY lastname, age");
-
-        query("SELECT lastname, age FROM bank GROUP BY 2, 1"
-        ).shouldBeAfterRewrite("SELECT lastname, age FROM bank GROUP BY age, lastname");
-
-        query("SELECT lastname, age, firstname FROM bank GROUP BY 2, firstname, 1"
-        ).shouldBeAfterRewrite("SELECT lastname, age, firstname FROM bank GROUP BY age, firstname, lastname");
-
-        query("SELECT lastname, age, firstname FROM bank GROUP BY 2, something, 1"
-        ).shouldBeAfterRewrite("SELECT lastname, age, firstname FROM bank GROUP BY age, something, lastname");
-
+    void rewrite() {
+      shouldMatchRule();
+      rule.rewrite(expr);
     }
 
-    @Test
-    public void simpleOrderByOrdinal() {
-        query("SELECT lastname FROM bank ORDER BY 1"
-        ).shouldBeAfterRewrite("SELECT lastname FROM bank ORDER BY lastname");
-    }
-
-    @Test
-    public void multipleOrderByOrdinal() {
-        query("SELECT lastname, age FROM bank ORDER BY 1, 2 "
-        ).shouldBeAfterRewrite("SELECT lastname, age FROM bank ORDER BY lastname, age");
-
-        query("SELECT lastname, age FROM bank ORDER BY 2, 1"
-        ).shouldBeAfterRewrite("SELECT lastname, age FROM bank ORDER BY age, lastname");
-
-        query("SELECT lastname, age, firstname FROM bank ORDER BY 2, firstname, 1"
-        ).shouldBeAfterRewrite("SELECT lastname, age, firstname FROM bank ORDER BY age, firstname, lastname");
-
-        query("SELECT lastname, age, firstname FROM bank ORDER BY 2, department, 1"
-        ).shouldBeAfterRewrite("SELECT lastname, age, firstname FROM bank ORDER BY age, department, lastname");
-    }
-
-    // Tests invalid Ordinals, non-positive ordinal values are already validated by semantic analyzer
-    @Test
-    public void invalidGroupByOrdinalShouldThrowException() {
-        exception.expect(VerificationException.class);
-        exception.expectMessage("Invalid ordinal [3] specified in [GROUP BY 3]");
-        query("SELECT lastname, MAX(lastname) FROM bank GROUP BY 3 ").rewrite();
-    }
-
-    @Test
-    public void invalidOrderByOrdinalShouldThrowException() {
-        exception.expect(VerificationException.class);
-        exception.expectMessage("Invalid ordinal [4] specified in [ORDER BY 4]");
-        query("SELECT `lastname`, `age`, `firstname` FROM bank ORDER BY 4 IS NOT NULL").rewrite();
-    }
-
-
-    private QueryAssertion query(String sql) {
-        return new QueryAssertion(sql);
-    }
-    private static class QueryAssertion {
-
-        private OrdinalRewriterRule rule;
-        private SQLQueryExpr expr;
-
-        QueryAssertion(String sql) {
-            this.expr = SqlParserUtils.parse(sql);
-            this.rule = new OrdinalRewriterRule(sql);
-        }
-
-        void shouldBeAfterRewrite(String expected) {
-            shouldMatchRule();
-            rule.rewrite(expr);
-            Assert.assertEquals(
-                SQLUtils.toMySqlString(SqlParserUtils.parse(expected)),
-                SQLUtils.toMySqlString(expr)
-            );
-        }
-
-        void shouldMatchRule() {
-            Assert.assertTrue(match());
-        }
-
-        void shouldNotMatchRule() {
-            Assert.assertFalse(match());
-        }
-
-        void rewrite() {
-            shouldMatchRule();
-            rule.rewrite(expr);
-        }
-
-        private boolean match() {
-            return rule.match(expr);
-        }
+    private boolean match() {
+      return rule.match(expr);
     }
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/parent/SQLExprParentSetterRuleTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/parent/SQLExprParentSetterRuleTest.java
index 15d97d362d..460b045ca0 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/parent/SQLExprParentSetterRuleTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/parent/SQLExprParentSetterRuleTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.parent;
 
 import static org.junit.Assert.assertTrue;
@@ -12,19 +11,18 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.sql.legacy.rewriter.parent.SQLExprParentSetterRule;
 
 @RunWith(MockitoJUnitRunner.class)
 public class SQLExprParentSetterRuleTest {
 
-    @Mock
-    private SQLQueryExpr queryExpr;
+  @Mock private SQLQueryExpr queryExpr;
 
-    private SQLExprParentSetterRule rule = new SQLExprParentSetterRule();
+  private SQLExprParentSetterRule rule = new SQLExprParentSetterRule();
 
-    @Test
-    public void match() {
-        assertTrue(rule.match(queryExpr));
-    }
+  @Test
+  public void match() {
+    assertTrue(rule.match(queryExpr));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/parent/SQLExprParentSetterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/parent/SQLExprParentSetterTest.java
index 49023f522a..40bdc262b4 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/parent/SQLExprParentSetterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/parent/SQLExprParentSetterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.parent;
 
 import static org.junit.Assert.assertNotNull;
@@ -17,36 +16,31 @@
 
 public class SQLExprParentSetterTest {
 
-    @Test
-    public void testSQLInSubQueryExprHasParent() {
-        String sql =
-                "SELECT * FROM TbA " +
-                "WHERE a IN (SELECT b FROM TbB)";
-        SQLQueryExpr expr = SqlParserUtils.parse(sql);
-        expr.accept(new SQLExprParentExistsValidator());
-    }
-
-    @Test
-    public void testSQLInListExprHasParent() {
-        String sql =
-                "SELECT * FROM TbA " +
-                "WHERE a IN (10, 20)";
-        SQLQueryExpr expr = SqlParserUtils.parse(sql);
-        expr.accept(new SQLExprParentExistsValidator());
+  @Test
+  public void testSQLInSubQueryExprHasParent() {
+    String sql = "SELECT * FROM TbA " + "WHERE a IN (SELECT b FROM TbB)";
+    SQLQueryExpr expr = SqlParserUtils.parse(sql);
+    expr.accept(new SQLExprParentExistsValidator());
+  }
+
+  @Test
+  public void testSQLInListExprHasParent() {
+    String sql = "SELECT * FROM TbA " + "WHERE a IN (10, 20)";
+    SQLQueryExpr expr = SqlParserUtils.parse(sql);
+    expr.accept(new SQLExprParentExistsValidator());
+  }
+
+  static class SQLExprParentExistsValidator extends MySqlASTVisitorAdapter {
+    @Override
+    public boolean visit(SQLInSubQueryExpr expr) {
+      assertNotNull(expr.getExpr().getParent());
+      return true;
     }
 
-    static class SQLExprParentExistsValidator extends MySqlASTVisitorAdapter {
-        @Override
-        public boolean visit(SQLInSubQueryExpr expr) {
-            assertNotNull(expr.getExpr().getParent());
-            return true;
-        }
-
-        @Override
-        public boolean visit(SQLInListExpr expr) {
-            assertNotNull(expr.getExpr().getParent());
-            return true;
-        }
+    @Override
+    public boolean visit(SQLInListExpr expr) {
+      assertNotNull(expr.getExpr().getParent());
+      return true;
     }
-
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/ExistsSubQueryRewriterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/ExistsSubQueryRewriterTest.java
index 9b88336a85..5f42e4a9c4 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/ExistsSubQueryRewriterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/ExistsSubQueryRewriterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.subquery;
 
 import static org.junit.Assert.assertEquals;
@@ -14,101 +13,104 @@
 
 public class ExistsSubQueryRewriterTest extends SubQueryRewriterTestBase {
 
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
-
-    @Test
-    public void nonCorrelatedExists() {
-        assertEquals(
-                sqlString(expr(
-                        "SELECT e.name " +
-                        "FROM employee e, e.projects p " +
-                        "WHERE p IS NOT MISSING")),
-                sqlString(rewrite(expr(
-                        "SELECT e.name " +
-                        "FROM employee as e " +
-                        "WHERE EXISTS (SELECT * FROM e.projects as p)")))
-        );
-    }
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
-    @Test
-    public void nonCorrelatedExistsWhere() {
-        assertEquals(
-                sqlString(expr(
-                        "SELECT e.name " +
-                        "FROM employee e, e.projects p " +
-                        "WHERE p IS NOT MISSING AND p.name LIKE 'security'")),
-                sqlString(rewrite(expr(
-                        "SELECT e.name " +
-                        "FROM employee as e " +
-                        "WHERE EXISTS (SELECT * FROM e.projects as p WHERE p.name LIKE 'security')")))
-        );
-    }
+  @Test
+  public void nonCorrelatedExists() {
+    assertEquals(
+        sqlString(
+            expr("SELECT e.name " + "FROM employee e, e.projects p " + "WHERE p IS NOT MISSING")),
+        sqlString(
+            rewrite(
+                expr(
+                    "SELECT e.name "
+                        + "FROM employee as e "
+                        + "WHERE EXISTS (SELECT * FROM e.projects as p)"))));
+  }
 
-    @Test
-    public void nonCorrelatedExistsParentWhere() {
-        assertEquals(
-                sqlString(expr(
-                        "SELECT e.name " +
-                        "FROM employee e, e.projects p " +
-                        "WHERE p IS NOT MISSING AND e.name LIKE 'security'")),
-                sqlString(rewrite(expr(
-                        "SELECT e.name " +
-                        "FROM employee as e " +
-                        "WHERE EXISTS (SELECT * FROM e.projects as p) AND e.name LIKE 'security'")))
-        );
-    }
+  @Test
+  public void nonCorrelatedExistsWhere() {
+    assertEquals(
+        sqlString(
+            expr(
+                "SELECT e.name "
+                    + "FROM employee e, e.projects p "
+                    + "WHERE p IS NOT MISSING AND p.name LIKE 'security'")),
+        sqlString(
+            rewrite(
+                expr(
+                    "SELECT e.name FROM employee as e WHERE EXISTS (SELECT * FROM e.projects as p"
+                        + " WHERE p.name LIKE 'security')"))));
+  }
 
-    @Test
-    public void nonCorrelatedNotExists() {
-        assertEquals(
-                sqlString(expr(
-                        "SELECT e.name " +
-                        "FROM employee e, e.projects p " +
-                        "WHERE NOT (p IS NOT MISSING)")),
-                sqlString(rewrite(expr(
-                        "SELECT e.name " +
-                        "FROM employee as e " +
-                        "WHERE NOT EXISTS (SELECT * FROM e.projects as p)")))
-        );
-    }
+  @Test
+  public void nonCorrelatedExistsParentWhere() {
+    assertEquals(
+        sqlString(
+            expr(
+                "SELECT e.name "
+                    + "FROM employee e, e.projects p "
+                    + "WHERE p IS NOT MISSING AND e.name LIKE 'security'")),
+        sqlString(
+            rewrite(
+                expr(
+                    "SELECT e.name FROM employee as e WHERE EXISTS (SELECT * FROM e.projects as p)"
+                        + " AND e.name LIKE 'security'"))));
+  }
 
-    @Test
-    public void nonCorrelatedNotExistsWhere() {
-        assertEquals(
-                sqlString(expr(
-                        "SELECT e.name " +
-                        "FROM employee e, e.projects p " +
-                        "WHERE NOT (p IS NOT MISSING AND p.name LIKE 'security')")),
-                sqlString(rewrite(expr(
-                        "SELECT e.name " +
-                        "FROM employee as e " +
-                        "WHERE NOT EXISTS (SELECT * FROM e.projects as p WHERE p.name LIKE 'security')")))
-        );
-    }
+  @Test
+  public void nonCorrelatedNotExists() {
+    assertEquals(
+        sqlString(
+            expr(
+                "SELECT e.name "
+                    + "FROM employee e, e.projects p "
+                    + "WHERE NOT (p IS NOT MISSING)")),
+        sqlString(
+            rewrite(
+                expr(
+                    "SELECT e.name "
+                        + "FROM employee as e "
+                        + "WHERE NOT EXISTS (SELECT * FROM e.projects as p)"))));
+  }
 
-    @Test
-    public void nonCorrelatedNotExistsParentWhere() {
-        assertEquals(
-                sqlString(expr(
-                        "SELECT e.name " +
-                        "FROM employee e, e.projects p " +
-                        "WHERE NOT (p IS NOT MISSING) AND e.name LIKE 'security'")),
-                sqlString(rewrite(expr(
-                        "SELECT e.name " +
-                        "FROM employee as e " +
-                        "WHERE NOT EXISTS (SELECT * FROM e.projects as p) AND e.name LIKE 'security'")))
-        );
-    }
+  @Test
+  public void nonCorrelatedNotExistsWhere() {
+    assertEquals(
+        sqlString(
+            expr(
+                "SELECT e.name "
+                    + "FROM employee e, e.projects p "
+                    + "WHERE NOT (p IS NOT MISSING AND p.name LIKE 'security')")),
+        sqlString(
+            rewrite(
+                expr(
+                    "SELECT e.name FROM employee as e WHERE NOT EXISTS (SELECT * FROM e.projects as"
+                        + " p WHERE p.name LIKE 'security')"))));
+  }
 
-    @Test
-    public void nonCorrelatedExistsAnd() {
-        exceptionRule.expect(IllegalStateException.class);
-        exceptionRule.expectMessage("Unsupported subquery");
-        rewrite(expr(
-                "SELECT e.name " +
-                "FROM employee as e " +
-                "WHERE EXISTS (SELECT * FROM e.projects as p) AND EXISTS (SELECT * FROM e.comments as c)"));
-    }
+  @Test
+  public void nonCorrelatedNotExistsParentWhere() {
+    assertEquals(
+        sqlString(
+            expr(
+                "SELECT e.name "
+                    + "FROM employee e, e.projects p "
+                    + "WHERE NOT (p IS NOT MISSING) AND e.name LIKE 'security'")),
+        sqlString(
+            rewrite(
+                expr(
+                    "SELECT e.name FROM employee as e WHERE NOT EXISTS (SELECT * FROM e.projects as"
+                        + " p) AND e.name LIKE 'security'"))));
+  }
 
+  @Test
+  public void nonCorrelatedExistsAnd() {
+    exceptionRule.expect(IllegalStateException.class);
+    exceptionRule.expectMessage("Unsupported subquery");
+    rewrite(
+        expr(
+            "SELECT e.name FROM employee as e WHERE EXISTS (SELECT * FROM e.projects as p) AND"
+                + " EXISTS (SELECT * FROM e.comments as c)"));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/InSubqueryRewriterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/InSubqueryRewriterTest.java
index e6bd42a273..596252c4cd 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/InSubqueryRewriterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/InSubqueryRewriterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.subquery;
 
 import static org.junit.Assert.assertEquals;
@@ -14,73 +13,62 @@
 
 public class InSubqueryRewriterTest extends SubQueryRewriterTestBase {
 
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
-
-    @Test
-    public void nonCorrleatedIn() throws Exception {
-        assertEquals(
-                sqlString(expr(
-                        "SELECT TbA_0.* " +
-                        "FROM TbA as TbA_0 " +
-                        "JOIN TbB as TbB_1 " +
-                        "ON TbA_0.a = TbB_1.b " +
-                        "WHERE TbB_1.b IS NOT NULL")),
-                sqlString(rewrite(expr(
-                        "SELECT * FROM TbA " +
-                        "WHERE a in (SELECT b FROM TbB)")))
-        );
-    }
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
-    @Test
-    public void nonCorrleatedInWithWhere() throws Exception {
-        assertEquals(
-                sqlString(expr(
-                        "SELECT TbA_0.* " +
-                        "FROM TbA as TbA_0 " +
-                        "JOIN TbB as TbB_1 " +
-                        "ON TbA_0.a = TbB_1.b " +
-                        "WHERE TbB_1.b IS NOT NULL AND TbB_1.b > 0")),
-                sqlString(rewrite(expr(
-                        "SELECT * " +
-                        "FROM TbA " +
-                        "WHERE a in (SELECT b FROM TbB WHERE b > 0)")))
-        );
-    }
+  @Test
+  public void nonCorrleatedIn() throws Exception {
+    assertEquals(
+        sqlString(
+            expr(
+                "SELECT TbA_0.* "
+                    + "FROM TbA as TbA_0 "
+                    + "JOIN TbB as TbB_1 "
+                    + "ON TbA_0.a = TbB_1.b "
+                    + "WHERE TbB_1.b IS NOT NULL")),
+        sqlString(rewrite(expr("SELECT * FROM TbA " + "WHERE a in (SELECT b FROM TbB)"))));
+  }
 
-    @Test
-    public void nonCorrleatedInWithOuterWhere() throws Exception {
-        assertEquals(
-                sqlString(expr(
-                        "SELECT TbA_0.* " +
-                        "FROM TbA as TbA_0 " +
-                        "JOIN TbB as TbB_1 " +
-                        "ON TbA_0.a = TbB_1.b " +
-                        "WHERE TbB_1.b IS NOT NULL AND TbA_0.a > 10")),
-                sqlString(rewrite(expr(
-                        "SELECT * " +
-                        "FROM TbA " +
-                        "WHERE a in (SELECT b FROM TbB) AND a > 10")))
-        );
-    }
+  @Test
+  public void nonCorrleatedInWithWhere() throws Exception {
+    assertEquals(
+        sqlString(
+            expr(
+                "SELECT TbA_0.* "
+                    + "FROM TbA as TbA_0 "
+                    + "JOIN TbB as TbB_1 "
+                    + "ON TbA_0.a = TbB_1.b "
+                    + "WHERE TbB_1.b IS NOT NULL AND TbB_1.b > 0")),
+        sqlString(
+            rewrite(
+                expr("SELECT * " + "FROM TbA " + "WHERE a in (SELECT b FROM TbB WHERE b > 0)"))));
+  }
 
+  @Test
+  public void nonCorrleatedInWithOuterWhere() throws Exception {
+    assertEquals(
+        sqlString(
+            expr(
+                "SELECT TbA_0.* "
+                    + "FROM TbA as TbA_0 "
+                    + "JOIN TbB as TbB_1 "
+                    + "ON TbA_0.a = TbB_1.b "
+                    + "WHERE TbB_1.b IS NOT NULL AND TbA_0.a > 10")),
+        sqlString(
+            rewrite(
+                expr("SELECT * " + "FROM TbA " + "WHERE a in (SELECT b FROM TbB) AND a > 10"))));
+  }
 
-    @Test
-    public void notInUnsupported() throws Exception {
-        exceptionRule.expect(IllegalStateException.class);
-        exceptionRule.expectMessage("Unsupported subquery");
-        rewrite(expr(
-                "SELECT * FROM TbA " +
-                "WHERE a not in (SELECT b FROM TbB)"));
-    }
+  @Test
+  public void notInUnsupported() throws Exception {
+    exceptionRule.expect(IllegalStateException.class);
+    exceptionRule.expectMessage("Unsupported subquery");
+    rewrite(expr("SELECT * FROM TbA " + "WHERE a not in (SELECT b FROM TbB)"));
+  }
 
-    @Test
-    public void testMultipleSelectException() throws Exception {
-        exceptionRule.expect(IllegalStateException.class);
-        exceptionRule.expectMessage("Unsupported subquery with multiple select [TbB_1.b1, TbB_1.b2]");
-        rewrite(expr(
-                "SELECT * " +
-                "FROM TbA " +
-                "WHERE a in (SELECT b1, b2 FROM TbB) AND a > 10"));
-    }
+  @Test
+  public void testMultipleSelectException() throws Exception {
+    exceptionRule.expect(IllegalStateException.class);
+    exceptionRule.expectMessage("Unsupported subquery with multiple select [TbB_1.b1, TbB_1.b2]");
+    rewrite(expr("SELECT * " + "FROM TbA " + "WHERE a in (SELECT b1, b2 FROM TbB) AND a > 10"));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/NestedQueryContextTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/NestedQueryContextTest.java
index a94b3e6112..3e20e8edf6 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/NestedQueryContextTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/NestedQueryContextTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.subquery;
 
 import static org.junit.Assert.assertFalse;
@@ -16,42 +15,48 @@
 import org.junit.Test;
 import org.opensearch.sql.legacy.rewriter.subquery.NestedQueryContext;
 
-
 public class NestedQueryContextTest {
 
-    @Test
-    public void isNested() {
-        NestedQueryContext nestedQueryDetector = new NestedQueryContext();
-        nestedQueryDetector.add(new SQLExprTableSource(new SQLIdentifierExpr("employee"), "e"));
-
-        assertFalse(nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("e"), "e1")));
-        assertTrue(nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("e.projects"), "p")));
-
-        nestedQueryDetector.add(new SQLExprTableSource(new SQLIdentifierExpr("e.projects"), "p"));
-        assertTrue(nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("p"))));
-    }
-
-    @Test
-    public void isNestedJoin() {
-        NestedQueryContext nestedQueryDetector = new NestedQueryContext();
-        SQLJoinTableSource joinTableSource = new SQLJoinTableSource();
-        joinTableSource.setLeft(new SQLExprTableSource(new SQLIdentifierExpr("employee"), "e"));
-        joinTableSource.setRight(new SQLExprTableSource(new SQLIdentifierExpr("e.projects"), "p"));
-        joinTableSource.setJoinType(JoinType.COMMA);
-        nestedQueryDetector.add(joinTableSource);
-
-        assertFalse(nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("e"), "e1")));
-        assertTrue(nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("e.projects"), "p")));
-        assertTrue(nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("p"))));
-    }
-
-    @Test
-    public void notNested() {
-        NestedQueryContext nestedQueryDetector = new NestedQueryContext();
-        nestedQueryDetector.add(new SQLExprTableSource(new SQLIdentifierExpr("employee"), "e"));
-        nestedQueryDetector.add(new SQLExprTableSource(new SQLIdentifierExpr("projects"), "p"));
-
-        assertFalse(nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("e"), "e1")));
-        assertFalse(nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("p"))));
-    }
+  @Test
+  public void isNested() {
+    NestedQueryContext nestedQueryDetector = new NestedQueryContext();
+    nestedQueryDetector.add(new SQLExprTableSource(new SQLIdentifierExpr("employee"), "e"));
+
+    assertFalse(
+        nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("e"), "e1")));
+    assertTrue(
+        nestedQueryDetector.isNested(
+            new SQLExprTableSource(new SQLIdentifierExpr("e.projects"), "p")));
+
+    nestedQueryDetector.add(new SQLExprTableSource(new SQLIdentifierExpr("e.projects"), "p"));
+    assertTrue(nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("p"))));
+  }
+
+  @Test
+  public void isNestedJoin() {
+    NestedQueryContext nestedQueryDetector = new NestedQueryContext();
+    SQLJoinTableSource joinTableSource = new SQLJoinTableSource();
+    joinTableSource.setLeft(new SQLExprTableSource(new SQLIdentifierExpr("employee"), "e"));
+    joinTableSource.setRight(new SQLExprTableSource(new SQLIdentifierExpr("e.projects"), "p"));
+    joinTableSource.setJoinType(JoinType.COMMA);
+    nestedQueryDetector.add(joinTableSource);
+
+    assertFalse(
+        nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("e"), "e1")));
+    assertTrue(
+        nestedQueryDetector.isNested(
+            new SQLExprTableSource(new SQLIdentifierExpr("e.projects"), "p")));
+    assertTrue(nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("p"))));
+  }
+
+  @Test
+  public void notNested() {
+    NestedQueryContext nestedQueryDetector = new NestedQueryContext();
+    nestedQueryDetector.add(new SQLExprTableSource(new SQLIdentifierExpr("employee"), "e"));
+    nestedQueryDetector.add(new SQLExprTableSource(new SQLIdentifierExpr("projects"), "p"));
+
+    assertFalse(
+        nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("e"), "e1")));
+    assertFalse(nestedQueryDetector.isNested(new SQLExprTableSource(new SQLIdentifierExpr("p"))));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/SubQueryRewriteRuleTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/SubQueryRewriteRuleTest.java
index a01988d965..20f4170a76 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/SubQueryRewriteRuleTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/SubQueryRewriteRuleTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.subquery;
 
 import static org.junit.Assert.assertFalse;
@@ -18,67 +17,57 @@
 
 public class SubQueryRewriteRuleTest {
 
-    final SubQueryRewriteRule rewriteRule = new SubQueryRewriteRule();
+  final SubQueryRewriteRule rewriteRule = new SubQueryRewriteRule();
 
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
-    @Test
-    public void isInMatch() throws SQLFeatureNotSupportedException {
-        String sql = "SELECT * " +
-                     "FROM A " +
-                     "WHERE a IN (SELECT b FROM B)";
-        assertTrue(rewriteRule.match(SqlParserUtils.parse(sql)));
-    }
+  @Test
+  public void isInMatch() throws SQLFeatureNotSupportedException {
+    String sql = "SELECT * " + "FROM A " + "WHERE a IN (SELECT b FROM B)";
+    assertTrue(rewriteRule.match(SqlParserUtils.parse(sql)));
+  }
 
-    @Test
-    public void isNotInMatch() throws SQLFeatureNotSupportedException {
-        String sql = "SELECT * " +
-                     "FROM A " +
-                     "WHERE a NOT IN (SELECT b FROM B)";
-        assertTrue(rewriteRule.match(SqlParserUtils.parse(sql)));
-    }
+  @Test
+  public void isNotInMatch() throws SQLFeatureNotSupportedException {
+    String sql = "SELECT * " + "FROM A " + "WHERE a NOT IN (SELECT b FROM B)";
+    assertTrue(rewriteRule.match(SqlParserUtils.parse(sql)));
+  }
 
-    @Test
-    public void isExistsMatch() throws SQLFeatureNotSupportedException {
-        String sql = "SELECT * " +
-                     "FROM A WHERE " +
-                     "EXISTS (SELECT 1 FROM B WHERE A.a_v = B.b_v)";
-        assertTrue(rewriteRule.match(SqlParserUtils.parse(sql)));
-    }
+  @Test
+  public void isExistsMatch() throws SQLFeatureNotSupportedException {
+    String sql = "SELECT * " + "FROM A WHERE " + "EXISTS (SELECT 1 FROM B WHERE A.a_v = B.b_v)";
+    assertTrue(rewriteRule.match(SqlParserUtils.parse(sql)));
+  }
 
-    @Test
-    public void isNotExistsMatch() throws SQLFeatureNotSupportedException {
-        String sql = "SELECT * " +
-                     "FROM A " +
-                     "WHERE NOT EXISTS (SELECT 1 FROM B WHERE A.a_v = B.b_v)";
-        assertTrue(rewriteRule.match(SqlParserUtils.parse(sql)));
-    }
+  @Test
+  public void isNotExistsMatch() throws SQLFeatureNotSupportedException {
+    String sql = "SELECT * " + "FROM A " + "WHERE NOT EXISTS (SELECT 1 FROM B WHERE A.a_v = B.b_v)";
+    assertTrue(rewriteRule.match(SqlParserUtils.parse(sql)));
+  }
 
-    @Test
-    public void subQueryInSelectNotMatch() throws SQLFeatureNotSupportedException {
-        String sql = "SELECT A.v as v, (SELECT MAX(b) FROM B WHERE A.id = B.id) as max_age " +
-                     "FROM A";
-        assertFalse(rewriteRule.match(SqlParserUtils.parse(sql)));
-    }
+  @Test
+  public void subQueryInSelectNotMatch() throws SQLFeatureNotSupportedException {
+    String sql = "SELECT A.v as v, (SELECT MAX(b) FROM B WHERE A.id = B.id) as max_age " + "FROM A";
+    assertFalse(rewriteRule.match(SqlParserUtils.parse(sql)));
+  }
 
-    @Test
-    public void moreThanOneInIsNotSupporeted() throws SQLFeatureNotSupportedException {
-        String sql = "SELECT * " +
-                     "FROM A " +
-                     "WHERE a IN (SELECT b FROM B) and d IN (SELECT e FROM F)";
-        exceptionRule.expect(SQLFeatureNotSupportedException.class);
-        exceptionRule.expectMessage("Unsupported subquery. Only one EXISTS or IN is supported");
-        rewriteRule.match(SqlParserUtils.parse(sql));
-    }
+  @Test
+  public void moreThanOneInIsNotSupporeted() throws SQLFeatureNotSupportedException {
+    String sql =
+        "SELECT * " + "FROM A " + "WHERE a IN (SELECT b FROM B) and d IN (SELECT e FROM F)";
+    exceptionRule.expect(SQLFeatureNotSupportedException.class);
+    exceptionRule.expectMessage("Unsupported subquery. Only one EXISTS or IN is supported");
+    rewriteRule.match(SqlParserUtils.parse(sql));
+  }
 
-    @Test
-    public void moreThanOneExistsIsNotSupporeted() throws SQLFeatureNotSupportedException {
-        String sql = "SELECT * " +
-                     "FROM A WHERE " +
-                     "EXISTS (SELECT 1 FROM B WHERE A.a_v = B.b_v) AND EXISTS (SELECT 1 FROM C)";
-        exceptionRule.expect(SQLFeatureNotSupportedException.class);
-        exceptionRule.expectMessage("Unsupported subquery. Only one EXISTS or IN is supported");
-        rewriteRule.match(SqlParserUtils.parse(sql));
-    }
+  @Test
+  public void moreThanOneExistsIsNotSupporeted() throws SQLFeatureNotSupportedException {
+    String sql =
+        "SELECT * "
+            + "FROM A WHERE "
+            + "EXISTS (SELECT 1 FROM B WHERE A.a_v = B.b_v) AND EXISTS (SELECT 1 FROM C)";
+    exceptionRule.expect(SQLFeatureNotSupportedException.class);
+    exceptionRule.expectMessage("Unsupported subquery. Only one EXISTS or IN is supported");
+    rewriteRule.match(SqlParserUtils.parse(sql));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/SubQueryRewriterTestBase.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/SubQueryRewriterTestBase.java
index 036d0fc86a..ef7098004f 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/SubQueryRewriterTestBase.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/SubQueryRewriterTestBase.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.subquery;
 
 import com.alibaba.druid.sql.SQLUtils;
@@ -14,19 +13,19 @@
 
 public abstract class SubQueryRewriterTestBase {
 
-    SQLQueryExpr expr(String query) {
-        return SqlParserUtils.parse(query);
-    }
+  SQLQueryExpr expr(String query) {
+    return SqlParserUtils.parse(query);
+  }
 
-    SQLQueryExpr rewrite(SQLQueryExpr expr) {
-        new SubQueryRewriteRule().rewrite(expr);
-        return expr;
-    }
+  SQLQueryExpr rewrite(SQLQueryExpr expr) {
+    new SubQueryRewriteRule().rewrite(expr);
+    return expr;
+  }
 
-    String sqlString(SQLObject expr) {
-        return SQLUtils.toMySqlString(expr)
-                .replaceAll("\n", " ")
-                .replaceAll("\t", " ")
-                .replaceAll(" +", " ");
-    }
+  String sqlString(SQLObject expr) {
+    return SQLUtils.toMySqlString(expr)
+        .replaceAll("\n", " ")
+        .replaceAll("\t", " ")
+        .replaceAll(" +", " ");
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/rewriter/SubqueryAliasRewriterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/rewriter/SubqueryAliasRewriterTest.java
index b729b7ad59..5c5bc40bda 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/rewriter/SubqueryAliasRewriterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/rewriter/SubqueryAliasRewriterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.subquery.rewriter;
 
 import static org.junit.Assert.assertEquals;
@@ -17,121 +16,137 @@
 
 public class SubqueryAliasRewriterTest {
 
-    @Test
-    public void testWithoutAlias() {
-        assertEquals(
-                sqlString(parse(
-                        "SELECT TbA_0.* " +
-                                "FROM TbA as TbA_0 " +
-                                "WHERE TbA_0.a IN (SELECT TbB_1.b FROM TbB as TbB_1) and TbA_0.c > 10")),
-                sqlString(rewrite(parse(
-                        "SELECT * " +
-                                "FROM TbA " +
-                                "WHERE a IN (SELECT b FROM TbB) and c > 10"))));
-    }
-
-    @Test
-    public void testWithAlias() {
-        assertEquals(
-                sqlString(parse(
-                        "SELECT A.* " +
-                                "FROM TbA as A " +
-                                "WHERE A.a IN (SELECT B.b FROM TbB as B) " +
-                                "AND A.c > 10")),
-                sqlString(rewrite(parse(
-                        "SELECT A.* " +
-                                "FROM TbA as A " +
-                                "WHERE A.a IN (SELECT B.b FROM TbB as B) " +
-                                "AND A.c > 10"))));
-    }
-
-    @Test
-    public void testOuterWithoutAliasInnerWithAlias() {
-        assertEquals(
-                sqlString(parse(
-                        "SELECT TbA_0.* " +
-                                "FROM TbA as TbA_0 " +
-                                "WHERE TbA_0.a IN (SELECT TbB.b FROM TbB as TbB) " +
-                                "AND TbA_0.c > 10")),
-                sqlString(rewrite(parse(
-                        "SELECT * " +
-                                "FROM TbA " +
-                                "WHERE a IN (SELECT TbB.b FROM TbB as TbB) " +
-                                "AND c > 10"))));
-    }
-
-    @Test
-    public void testOuterWithoutAliasInnerMixAlias() {
-        String expect =
-                "SELECT TbA_0.* " +
-                        "FROM TbA as TbA_0 " +
-                        "WHERE TbA_0.a IN (SELECT B.b FROM TbB as B) " +
-                        "AND TbA_0.c > 10";
-
-        assertEquals(
-                sqlString(parse(expect)),
-                sqlString(rewrite(parse(
-                        "SELECT * " +
-                                "FROM TbA " +
-                                "WHERE a IN (SELECT b FROM TbB as B) " +
-                                "AND c > 10"))));
-
-        assertEquals(
-                sqlString(parse(expect)),
-                sqlString(rewrite(parse(
-                        "SELECT * " +
-                                "FROM TbA " +
-                                "WHERE a IN (SELECT TbB.b FROM TbB as B) " +
-                                "AND c > 10"))));
-    }
-
-    @Test
-    public void testOuterWithAliasInnerWithoutAlias() {
-        assertEquals(
-                sqlString(parse(
-                        "SELECT TbA.* " +
-                                "FROM TbA as TbA " +
-                                "WHERE TbA.a IN (SELECT TbB_0.b FROM TbB as TbB_0) " +
-                                "AND TbA.c > 10")),
-                sqlString(rewrite(parse(
-                        "SELECT TbA.* " +
-                                "FROM TbA as TbA " +
-                                "WHERE TbA.a IN (SELECT b FROM TbB ) " +
-                                "AND TbA.c > 10"))));
-    }
-
-    @Test
-    public void testOuterMixAliasInnerWithoutAlias() {
-        String expect =
-                "SELECT A.* " +
-                        "FROM TbA as A " +
-                        "WHERE A.a IN (SELECT TbB_0.b FROM TbB as TbB_0) " +
-                        "AND A.c > 10";
-
-        assertEquals(
-                sqlString(parse(expect)),
-                sqlString(rewrite(parse(
-                        "SELECT TbA.* " +
-                                "FROM TbA as A " +
-                                "WHERE a IN (SELECT b FROM TbB ) " +
-                                "AND TbA.c > 10"))));
-
-        assertEquals(
-                sqlString(parse(expect)),
-                sqlString(rewrite(parse(
-                        "SELECT * " +
-                                "FROM TbA as A " +
-                                "WHERE TbA.a IN (SELECT b FROM TbB ) " +
-                                "AND TbA.c > 10"))));
-    }
-
-
-    private String sqlString(SQLExpr expr) {
-        return SQLUtils.toMySqlString(expr);
-    }
-
-    private SQLQueryExpr rewrite(SQLQueryExpr expr) {
-        expr.accept(new SubqueryAliasRewriter());
-        return expr;
-    }
+  @Test
+  public void testWithoutAlias() {
+    assertEquals(
+        sqlString(
+            parse(
+                "SELECT TbA_0.* "
+                    + "FROM TbA as TbA_0 "
+                    + "WHERE TbA_0.a IN (SELECT TbB_1.b FROM TbB as TbB_1) and TbA_0.c > 10")),
+        sqlString(
+            rewrite(
+                parse("SELECT * " + "FROM TbA " + "WHERE a IN (SELECT b FROM TbB) and c > 10"))));
+  }
+
+  @Test
+  public void testWithAlias() {
+    assertEquals(
+        sqlString(
+            parse(
+                "SELECT A.* "
+                    + "FROM TbA as A "
+                    + "WHERE A.a IN (SELECT B.b FROM TbB as B) "
+                    + "AND A.c > 10")),
+        sqlString(
+            rewrite(
+                parse(
+                    "SELECT A.* "
+                        + "FROM TbA as A "
+                        + "WHERE A.a IN (SELECT B.b FROM TbB as B) "
+                        + "AND A.c > 10"))));
+  }
+
+  @Test
+  public void testOuterWithoutAliasInnerWithAlias() {
+    assertEquals(
+        sqlString(
+            parse(
+                "SELECT TbA_0.* "
+                    + "FROM TbA as TbA_0 "
+                    + "WHERE TbA_0.a IN (SELECT TbB.b FROM TbB as TbB) "
+                    + "AND TbA_0.c > 10")),
+        sqlString(
+            rewrite(
+                parse(
+                    "SELECT * "
+                        + "FROM TbA "
+                        + "WHERE a IN (SELECT TbB.b FROM TbB as TbB) "
+                        + "AND c > 10"))));
+  }
+
+  @Test
+  public void testOuterWithoutAliasInnerMixAlias() {
+    String expect =
+        "SELECT TbA_0.* "
+            + "FROM TbA as TbA_0 "
+            + "WHERE TbA_0.a IN (SELECT B.b FROM TbB as B) "
+            + "AND TbA_0.c > 10";
+
+    assertEquals(
+        sqlString(parse(expect)),
+        sqlString(
+            rewrite(
+                parse(
+                    "SELECT * "
+                        + "FROM TbA "
+                        + "WHERE a IN (SELECT b FROM TbB as B) "
+                        + "AND c > 10"))));
+
+    assertEquals(
+        sqlString(parse(expect)),
+        sqlString(
+            rewrite(
+                parse(
+                    "SELECT * "
+                        + "FROM TbA "
+                        + "WHERE a IN (SELECT TbB.b FROM TbB as B) "
+                        + "AND c > 10"))));
+  }
+
+  @Test
+  public void testOuterWithAliasInnerWithoutAlias() {
+    assertEquals(
+        sqlString(
+            parse(
+                "SELECT TbA.* "
+                    + "FROM TbA as TbA "
+                    + "WHERE TbA.a IN (SELECT TbB_0.b FROM TbB as TbB_0) "
+                    + "AND TbA.c > 10")),
+        sqlString(
+            rewrite(
+                parse(
+                    "SELECT TbA.* "
+                        + "FROM TbA as TbA "
+                        + "WHERE TbA.a IN (SELECT b FROM TbB ) "
+                        + "AND TbA.c > 10"))));
+  }
+
+  @Test
+  public void testOuterMixAliasInnerWithoutAlias() {
+    String expect =
+        "SELECT A.* "
+            + "FROM TbA as A "
+            + "WHERE A.a IN (SELECT TbB_0.b FROM TbB as TbB_0) "
+            + "AND A.c > 10";
+
+    assertEquals(
+        sqlString(parse(expect)),
+        sqlString(
+            rewrite(
+                parse(
+                    "SELECT TbA.* "
+                        + "FROM TbA as A "
+                        + "WHERE a IN (SELECT b FROM TbB ) "
+                        + "AND TbA.c > 10"))));
+
+    assertEquals(
+        sqlString(parse(expect)),
+        sqlString(
+            rewrite(
+                parse(
+                    "SELECT * "
+                        + "FROM TbA as A "
+                        + "WHERE TbA.a IN (SELECT b FROM TbB ) "
+                        + "AND TbA.c > 10"))));
+  }
+
+  private String sqlString(SQLExpr expr) {
+    return SQLUtils.toMySqlString(expr);
+  }
+
+  private SQLQueryExpr rewrite(SQLQueryExpr expr) {
+    expr.accept(new SubqueryAliasRewriter());
+    return expr;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/utils/FindSubQueryTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/utils/FindSubQueryTest.java
index 34a915ac2b..7f97e601d6 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/utils/FindSubQueryTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/subquery/utils/FindSubQueryTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.subquery.utils;
 
 import static org.junit.Assert.assertEquals;
@@ -16,36 +15,34 @@
 
 public class FindSubQueryTest {
 
-    @Test
-    public void hasInSubQuery() {
-        FindSubQuery findSubQuery = new FindSubQuery();
-
-        parse("SELECT * FROM TbA " +
-              "WHERE a in (SELECT b FROM TbB)").accept(findSubQuery);
-        assertTrue(findSubQuery.hasSubQuery());
-        assertFalse(findSubQuery.getSqlInSubQueryExprs().isEmpty());
-        assertEquals(1, findSubQuery.getSqlInSubQueryExprs().size());
-    }
-
-    @Test
-    public void hasExistSubQuery() {
-        FindSubQuery findSubQuery = new FindSubQuery();
-
-        parse("SELECT * FROM TbA " +
-              "WHERE EXISTS (SELECT * FROM TbB)").accept(findSubQuery);
-        assertTrue(findSubQuery.hasSubQuery());
-        assertFalse(findSubQuery.getSqlExistsExprs().isEmpty());
-        assertEquals(1, findSubQuery.getSqlExistsExprs().size());
-    }
-
-    @Test
-    public void stopVisitWhenFound() {
-        FindSubQuery findSubQuery = new FindSubQuery().continueVisitWhenFound(false);
-
-        parse("SELECT * FROM TbA " +
-              "WHERE a in (SELECT b FROM TbB WHERE b2 in (SELECT c FROM Tbc))").accept(findSubQuery);
-        assertTrue(findSubQuery.hasSubQuery());
-        assertFalse(findSubQuery.getSqlInSubQueryExprs().isEmpty());
-        assertEquals(1, findSubQuery.getSqlInSubQueryExprs().size());
-    }
+  @Test
+  public void hasInSubQuery() {
+    FindSubQuery findSubQuery = new FindSubQuery();
+
+    parse("SELECT * FROM TbA " + "WHERE a in (SELECT b FROM TbB)").accept(findSubQuery);
+    assertTrue(findSubQuery.hasSubQuery());
+    assertFalse(findSubQuery.getSqlInSubQueryExprs().isEmpty());
+    assertEquals(1, findSubQuery.getSqlInSubQueryExprs().size());
+  }
+
+  @Test
+  public void hasExistSubQuery() {
+    FindSubQuery findSubQuery = new FindSubQuery();
+
+    parse("SELECT * FROM TbA " + "WHERE EXISTS (SELECT * FROM TbB)").accept(findSubQuery);
+    assertTrue(findSubQuery.hasSubQuery());
+    assertFalse(findSubQuery.getSqlExistsExprs().isEmpty());
+    assertEquals(1, findSubQuery.getSqlExistsExprs().size());
+  }
+
+  @Test
+  public void stopVisitWhenFound() {
+    FindSubQuery findSubQuery = new FindSubQuery().continueVisitWhenFound(false);
+
+    parse("SELECT * FROM TbA " + "WHERE a in (SELECT b FROM TbB WHERE b2 in (SELECT c FROM Tbc))")
+        .accept(findSubQuery);
+    assertTrue(findSubQuery.hasSubQuery());
+    assertFalse(findSubQuery.getSqlInSubQueryExprs().isEmpty());
+    assertEquals(1, findSubQuery.getSqlInSubQueryExprs().size());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/term/TermFieldRewriterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/term/TermFieldRewriterTest.java
index d001e0e1d0..7922d60647 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/term/TermFieldRewriterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/term/TermFieldRewriterTest.java
@@ -3,15 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.rewriter.term;
 
-
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.opensearch.sql.legacy.util.MultipleIndexClusterUtils.mockMultipleIndexEnv;
 
 import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
+import com.alibaba.druid.sql.parser.ParserException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -22,88 +21,102 @@
 import org.opensearch.sql.legacy.util.SqlParserUtils;
 
 public class TermFieldRewriterTest {
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
-    @Before
-    public void setup() {
-        mockMultipleIndexEnv();
-    }
-
-    @Test
-    public void testFromSubqueryShouldPass() {
-        String sql = "SELECT t.age as a FROM (SELECT age FROM account1 WHERE address = 'sea') t";
-        String expected = "SELECT t.age as a FROM (SELECT age FROM account1 WHERE address.keyword = 'sea') t";
-
-        assertThat(rewriteTerm(sql),
-                MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
-    }
-
-    @Test
-    public void testFromSubqueryWithoutTermShouldPass() {
-        String sql = "SELECT t.age as a FROM (SELECT age FROM account1 WHERE age = 10) t";
-        String expected = sql;
-
-        assertThat(rewriteTerm(sql),
-                MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
-    }
-
-    @Test
-    public void testFieldShouldBeRewritten() {
-        String sql = "SELECT age FROM account1 WHERE address = 'sea'";
-        String expected = "SELECT age FROM account1 WHERE address.keyword = 'sea'";
-
-        assertThat(rewriteTerm(sql),
-                MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
-    }
-
-    @Test
-    public void testSelectTheFieldWithCompatibleMappingShouldPass() {
-        String sql = "SELECT id FROM account* WHERE id = 10";
-        String expected = sql;
-
-        assertThat(rewriteTerm(sql),
-                MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
-    }
-
-    @Test
-    public void testSelectTheFieldOnlyInOneIndexShouldPass() {
-        String sql = "SELECT address FROM account*";
-        String expected = sql;
-
-        assertThat(rewriteTerm(sql),
-                MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
-    }
-
-    /**
-     * Ideally, it should fail. There are two reasons we didn't cover it now.
-     * 1. The semantic check already done that.
-     * 2. The {@link TermFieldRewriter} didn't touch allcolumn case.
-     */
-    @Test
-    public void testSelectAllFieldWithConflictMappingShouldPass() {
-        String sql = "SELECT * FROM account*";
-        String expected = sql;
-
-        assertThat(rewriteTerm(sql),
-                MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
-    }
-
-    @Test
-    public void testSelectTheFieldWithConflictMappingShouldThrowException() {
-        String sql = "SELECT age FROM account* WHERE age = 10";
-        exception.expect(VerificationException.class);
-        exception.expectMessage("Different mappings are not allowed for the same field[age]");
-        rewriteTerm(sql);
-    }
-
-    private String rewriteTerm(String sql) {
-        SQLQueryExpr sqlQueryExpr = SqlParserUtils.parse(sql);
-        sqlQueryExpr.accept(new TermFieldRewriter());
-        return SQLUtils.toMySqlString(sqlQueryExpr)
-                .replaceAll("[\\n\\t]+", " ")
-                .replaceAll("^\\(", " ")
-                .replaceAll("\\)$", " ")
-                .trim();
-    }
+  @Rule public ExpectedException exception = ExpectedException.none();
+
+  @Before
+  public void setup() {
+    mockMultipleIndexEnv();
+  }
+
+  @Test
+  public void testFromSubqueryShouldPass() {
+    String sql = "SELECT t.age as a FROM (SELECT age FROM account1 WHERE address = 'sea') t";
+    String expected =
+        "SELECT t.age as a FROM (SELECT age FROM account1 WHERE address.keyword = 'sea') t";
+
+    assertThat(
+        rewriteTerm(sql),
+        MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
+  }
+
+  @Test
+  public void testFromSubqueryWithoutTermShouldPass() {
+    String sql = "SELECT t.age as a FROM (SELECT age FROM account1 WHERE age = 10) t";
+    String expected = sql;
+
+    assertThat(
+        rewriteTerm(sql),
+        MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
+  }
+
+  @Test
+  public void testFieldShouldBeRewritten() {
+    String sql = "SELECT age FROM account1 WHERE address = 'sea'";
+    String expected = "SELECT age FROM account1 WHERE address.keyword = 'sea'";
+
+    assertThat(
+        rewriteTerm(sql),
+        MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
+  }
+
+  @Test
+  public void testSelectTheFieldWithCompatibleMappingShouldPass() {
+    String sql = "SELECT id FROM account* WHERE id = 10";
+    String expected = sql;
+
+    assertThat(
+        rewriteTerm(sql),
+        MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
+  }
+
+  @Test
+  public void testSelectTheFieldOnlyInOneIndexShouldPass() {
+    String sql = "SELECT address FROM account*";
+    String expected = sql;
+
+    assertThat(
+        rewriteTerm(sql),
+        MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
+  }
+
+  /**
+   * Ideally, it should fail. There are two reasons we didn't cover it now. 1. The semantic check
+   * already done that. 2. The {@link TermFieldRewriter} didn't touch allcolumn case.
+   */
+  @Test
+  public void testSelectAllFieldWithConflictMappingShouldPass() {
+    String sql = "SELECT * FROM account*";
+    String expected = sql;
+
+    assertThat(
+        rewriteTerm(sql),
+        MatcherUtils.IsEqualIgnoreCaseAndWhiteSpace.equalToIgnoreCaseAndWhiteSpace(expected));
+  }
+
+  @Test
+  public void testSelectTheFieldWithConflictMappingShouldThrowException() {
+    String sql = "SELECT age FROM account* WHERE age = 10";
+    exception.expect(VerificationException.class);
+    exception.expectMessage("Different mappings are not allowed for the same field[age]");
+    rewriteTerm(sql);
+  }
+
+  @Test
+  public void testIssue2391_WithWrongBinaryOperation() {
+    String sql = "SELECT * from I_THINK/IM/A_URL";
+    exception.expect(ParserException.class);
+    exception.expectMessage(
+        "Left side of the expression [I_THINK / IM] is expected to be an identifier");
+    rewriteTerm(sql);
+  }
+
+  private String rewriteTerm(String sql) {
+    SQLQueryExpr sqlQueryExpr = SqlParserUtils.parse(sql);
+    sqlQueryExpr.accept(new TermFieldRewriter());
+    return SQLUtils.toMySqlString(sqlQueryExpr)
+        .replaceAll("[\\n\\t]+", " ")
+        .replaceAll("^\\(", " ")
+        .replaceAll("\\)$", " ")
+        .trim();
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/spatial/WktToGeoJsonConverterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/spatial/WktToGeoJsonConverterTest.java
index 24889ff3ca..e63c60467f 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/spatial/WktToGeoJsonConverterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/spatial/WktToGeoJsonConverterTest.java
@@ -3,181 +3,206 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.spatial;
 
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opensearch.sql.legacy.spatial.WktToGeoJsonConverter;
 
-/**
- * Created by Eliran on 4/8/2015.
- */
+/** Created by Eliran on 4/8/2015. */
 public class WktToGeoJsonConverterTest {
 
-    @Test
-    public void convertPoint_NoRedundantSpaces_ShouldConvert(){
-        String wkt = "POINT(12.3 13.3)";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [12.3,13.3]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertPoint_WithRedundantSpaces_ShouldConvert(){
-        String wkt = " POINT ( 12.3 13.3 )   ";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [12.3,13.3]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertPoint_RoundNumbers_ShouldConvert(){
-        String wkt = "POINT(12 13)";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [12,13]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertPoint_FirstIsRoundNumber_ShouldConvert(){
-        String wkt = "POINT(12 13.3)";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [12,13.3]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertPoint_SecondIsRoundNumber_ShouldConvert(){
-        String wkt = "POINT(12.2 13)";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [12.2,13]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertPoint_NegativeCoordinates_ShouldConvert(){
-        String wkt = "POINT(-12.2 13)";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [-12.2,13]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertPolygon_NoRedundantSpaces_ShouldConvert(){
-        String wkt = "POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"Polygon\", \"coordinates\": [[[30,10],[40,40],[20,40],[10,20],[30,10]]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertPolygon_NegativeCoordinates_ShouldConvert(){
-        String wkt = "POLYGON ((-30 10, 40 40, 20 40, 10 20, -30 10))";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"Polygon\", \"coordinates\": [[[-30,10],[40,40],[20,40],[10,20],[-30,10]]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertPolygon_WithRedundantSpaces_ShouldConvert(){
-        String wkt = " POLYGON  ( (30  10, 40    40 , 20 40, 10  20, 30 10 ) ) ";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"Polygon\", \"coordinates\": [[[30,10],[40,40],[20,40],[10,20],[30,10]]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertPolygonWithHole_NoRedundantSpaces_ShouldConvert(){
-        String wkt = "POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10),(20 30, 35 35, 30 20, 20 30))";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"Polygon\", \"coordinates\": [[[35,10],[45,45],[15,40],[10,20],[35,10]],[[20,30],[35,35],[30,20],[20,30]]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertPolygonWithHole_WithRedundantSpaces_ShouldConvert(){
-        String wkt = "POLYGON ( (35 10, 45 45, 15 40, 10 20, 35 10 ), (20 30 , 35 35, 30 20,   20 30 ) ) ";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"Polygon\", \"coordinates\": [[[35,10],[45,45],[15,40],[10,20],[35,10]],[[20,30],[35,35],[30,20],[20,30]]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertLineString_NoRedundantSpaces_ShouldConvert(){
-        String wkt = "LINESTRING (30 10, 10 30, 40 40)";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"LineString\", \"coordinates\": [[30,10],[10,30],[40,40]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertLineString_NegativeCoordinates_ShouldConvert(){
-        String wkt = "LINESTRING (-30 10, 10 30, 40 40)";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"LineString\", \"coordinates\": [[-30,10],[10,30],[40,40]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertLineString_WithRedundantSpaces_ShouldConvert(){
-        String wkt = "LINESTRING (     30  10, 10 30 , 40 40    )";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"LineString\", \"coordinates\": [[30,10],[10,30],[40,40]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertMultiPolygon_NoRedundantSpaces_ShouldConvert(){
-        String wkt = "MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"MultiPolygon\", \"coordinates\": [[[[30,20],[45,40],[10,40],[30,20]]],[[[15,5],[40,10],[10,20],[5,10],[15,5]]]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-    @Test
-    public void convertMultiPolygon_WithRedundantSpaces_ShouldConvert(){
-        String wkt = "MULTIPOLYGON ( ((30 20, 45 40, 10 40, 30 20) ) , ((15 5, 40 10, 10 20, 5 10, 15 5)))";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"MultiPolygon\", \"coordinates\": [[[[30,20],[45,40],[10,40],[30,20]]],[[[15,5],[40,10],[10,20],[5,10],[15,5]]]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-    @Test
-    public void convertMultiPolygon_OnePolygonHaveHoles_ShouldConvert(){
-        String wkt = "MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20),(20 30, 35 35, 30 20, 20 30)),((15 5, 40 10, 10 20, 5 10, 15 5)))";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"MultiPolygon\", \"coordinates\": [[[[30,20],[45,40],[10,40],[30,20]],[[20,30],[35,35],[30,20],[20,30]]],[[[15,5],[40,10],[10,20],[5,10],[15,5]]]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertMultiPoint_V1_ShouldConvert(){
-        String wkt = "MULTIPOINT (10 40, 40 30, 20 20, 30 10)";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"MultiPoint\", \"coordinates\": [[10,40],[40,30],[20,20],[30,10]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertMultiPoint_V2_ShouldConvert(){
-        String wkt = "MULTIPOINT ((10 40), (40 30), (20 20), (30 10))";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"MultiPoint\", \"coordinates\": [[10,40],[40,30],[20,20],[30,10]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-
-    @Test
-    public void convertMultiLineString_NoRedundantSpaces_ShouldConvert(){
-        String wkt = "MULTILINESTRING ((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"MultiLineString\", \"coordinates\": [[[10,10],[20,20],[10,40]],[[40,40],[30,30],[40,20],[30,10]]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
-    @Test
-    public void convertMultiLineString_WithRedundantSpaces_ShouldConvert(){
-        String wkt = "MULTILINESTRING ( (10 10, 20 20, 10   40 ) , (40 40, 30 30, 40 20, 30 10))";
-        String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
-        String expectedGeoJson = "{\"type\":\"MultiLineString\", \"coordinates\": [[[10,10],[20,20],[10,40]],[[40,40],[30,30],[40,20],[30,10]]]}";
-        Assert.assertEquals(expectedGeoJson,geoJson);
-    }
+  @Test
+  public void convertPoint_NoRedundantSpaces_ShouldConvert() {
+    String wkt = "POINT(12.3 13.3)";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [12.3,13.3]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertPoint_WithRedundantSpaces_ShouldConvert() {
+    String wkt = " POINT ( 12.3 13.3 )   ";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [12.3,13.3]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertPoint_RoundNumbers_ShouldConvert() {
+    String wkt = "POINT(12 13)";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [12,13]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertPoint_FirstIsRoundNumber_ShouldConvert() {
+    String wkt = "POINT(12 13.3)";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [12,13.3]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertPoint_SecondIsRoundNumber_ShouldConvert() {
+    String wkt = "POINT(12.2 13)";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [12.2,13]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertPoint_NegativeCoordinates_ShouldConvert() {
+    String wkt = "POINT(-12.2 13)";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson = "{\"type\":\"Point\", \"coordinates\": [-12.2,13]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertPolygon_NoRedundantSpaces_ShouldConvert() {
+    String wkt = "POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"Polygon\", \"coordinates\": [[[30,10],[40,40],[20,40],[10,20],[30,10]]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertPolygon_NegativeCoordinates_ShouldConvert() {
+    String wkt = "POLYGON ((-30 10, 40 40, 20 40, 10 20, -30 10))";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"Polygon\", \"coordinates\": [[[-30,10],[40,40],[20,40],[10,20],[-30,10]]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertPolygon_WithRedundantSpaces_ShouldConvert() {
+    String wkt = " POLYGON  ( (30  10, 40    40 , 20 40, 10  20, 30 10 ) ) ";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"Polygon\", \"coordinates\": [[[30,10],[40,40],[20,40],[10,20],[30,10]]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertPolygonWithHole_NoRedundantSpaces_ShouldConvert() {
+    String wkt = "POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10),(20 30, 35 35, 30 20, 20 30))";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"Polygon\", \"coordinates\":"
+            + " [[[35,10],[45,45],[15,40],[10,20],[35,10]],[[20,30],[35,35],[30,20],[20,30]]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertPolygonWithHole_WithRedundantSpaces_ShouldConvert() {
+    String wkt =
+        "POLYGON ( (35 10, 45 45, 15 40, 10 20, 35 10 ), (20 30 , 35 35, 30 20,   20 30 ) ) ";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"Polygon\", \"coordinates\":"
+            + " [[[35,10],[45,45],[15,40],[10,20],[35,10]],[[20,30],[35,35],[30,20],[20,30]]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertLineString_NoRedundantSpaces_ShouldConvert() {
+    String wkt = "LINESTRING (30 10, 10 30, 40 40)";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"LineString\", \"coordinates\": [[30,10],[10,30],[40,40]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertLineString_NegativeCoordinates_ShouldConvert() {
+    String wkt = "LINESTRING (-30 10, 10 30, 40 40)";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"LineString\", \"coordinates\": [[-30,10],[10,30],[40,40]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertLineString_WithRedundantSpaces_ShouldConvert() {
+    String wkt = "LINESTRING (     30  10, 10 30 , 40 40    )";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"LineString\", \"coordinates\": [[30,10],[10,30],[40,40]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertMultiPolygon_NoRedundantSpaces_ShouldConvert() {
+    String wkt = "MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"MultiPolygon\", \"coordinates\":"
+            + " [[[[30,20],[45,40],[10,40],[30,20]]],[[[15,5],[40,10],[10,20],[5,10],[15,5]]]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertMultiPolygon_WithRedundantSpaces_ShouldConvert() {
+    String wkt =
+        "MULTIPOLYGON ( ((30 20, 45 40, 10 40, 30 20) ) , ((15 5, 40 10, 10 20, 5 10, 15 5)))";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"MultiPolygon\", \"coordinates\":"
+            + " [[[[30,20],[45,40],[10,40],[30,20]]],[[[15,5],[40,10],[10,20],[5,10],[15,5]]]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertMultiPolygon_OnePolygonHaveHoles_ShouldConvert() {
+    String wkt =
+        "MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20),(20 30, 35 35, 30 20, 20 30)),((15 5, 40 10,"
+            + " 10 20, 5 10, 15 5)))";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"MultiPolygon\", \"coordinates\":"
+            + " [[[[30,20],[45,40],[10,40],[30,20]],[[20,30],[35,35],[30,20],[20,30]]],[[[15,5],[40,10],[10,20],[5,10],[15,5]]]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertMultiPoint_V1_ShouldConvert() {
+    String wkt = "MULTIPOINT (10 40, 40 30, 20 20, 30 10)";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"MultiPoint\", \"coordinates\": [[10,40],[40,30],[20,20],[30,10]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertMultiPoint_V2_ShouldConvert() {
+    String wkt = "MULTIPOINT ((10 40), (40 30), (20 20), (30 10))";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"MultiPoint\", \"coordinates\": [[10,40],[40,30],[20,20],[30,10]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertMultiLineString_NoRedundantSpaces_ShouldConvert() {
+    String wkt = "MULTILINESTRING ((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"MultiLineString\", \"coordinates\":"
+            + " [[[10,10],[20,20],[10,40]],[[40,40],[30,30],[40,20],[30,10]]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
+
+  @Test
+  public void convertMultiLineString_WithRedundantSpaces_ShouldConvert() {
+    String wkt = "MULTILINESTRING ( (10 10, 20 20, 10   40 ) , (40 40, 30 30, 40 20, 30 10))";
+    String geoJson = WktToGeoJsonConverter.toGeoJson(wkt);
+    String expectedGeoJson =
+        "{\"type\":\"MultiLineString\", \"coordinates\":"
+            + " [[[10,10],[20,20],[10,40]],[[40,40],[30,30],[40,20],[30,10]]]}";
+    Assert.assertEquals(expectedGeoJson, geoJson);
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/BackticksUnquoterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/BackticksUnquoterTest.java
index b0c6b8a2d8..c7e7f22d5c 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/BackticksUnquoterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/BackticksUnquoterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.utils;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -15,28 +14,29 @@
 import org.opensearch.sql.legacy.utils.StringUtils;
 
 /**
- * To test the functionality of {@link StringUtils#unquoteSingleField}
- * and {@link StringUtils#unquoteFullColumn(String, String)}
+ * To test the functionality of {@link StringUtils#unquoteSingleField} and {@link
+ * StringUtils#unquoteFullColumn(String, String)}
  */
 public class BackticksUnquoterTest {
 
-    @Test
-    public void assertNotQuotedStringShouldKeepTheSame() {
-        assertThat(unquoteSingleField("identifier"), equalTo("identifier"));
-        assertThat(unquoteFullColumn("identifier"), equalTo("identifier"));
-    }
-
-    @Test
-    public void assertStringWithOneBackTickShouldKeepTheSame() {
-        assertThat(unquoteSingleField("`identifier"), equalTo("`identifier"));
-        assertThat(unquoteFullColumn("`identifier"), equalTo("`identifier"));
-    }
-
-    @Test
-    public void assertBackticksQuotedStringShouldBeUnquoted() {
-        assertThat("identifier", equalTo(unquoteSingleField("`identifier`")));
-
-        assertThat("identifier1.identifier2", equalTo(unquoteFullColumn("`identifier1`.`identifier2`")));
-        assertThat("identifier1.identifier2", equalTo(unquoteFullColumn("`identifier1`.identifier2")));
-    }
+  @Test
+  public void assertNotQuotedStringShouldKeepTheSame() {
+    assertThat(unquoteSingleField("identifier"), equalTo("identifier"));
+    assertThat(unquoteFullColumn("identifier"), equalTo("identifier"));
+  }
+
+  @Test
+  public void assertStringWithOneBackTickShouldKeepTheSame() {
+    assertThat(unquoteSingleField("`identifier"), equalTo("`identifier"));
+    assertThat(unquoteFullColumn("`identifier"), equalTo("`identifier"));
+  }
+
+  @Test
+  public void assertBackticksQuotedStringShouldBeUnquoted() {
+    assertThat("identifier", equalTo(unquoteSingleField("`identifier`")));
+
+    assertThat(
+        "identifier1.identifier2", equalTo(unquoteFullColumn("`identifier1`.`identifier2`")));
+    assertThat("identifier1.identifier2", equalTo(unquoteFullColumn("`identifier1`.identifier2")));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/PrettyFormatterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/PrettyFormatterTest.java
index f876b14110..68ad891020 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/PrettyFormatterTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/PrettyFormatterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.utils;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -19,42 +18,45 @@
 
 public class PrettyFormatterTest {
 
-    @Test
-    public void assertFormatterWithoutContentInside() throws IOException {
-        String noContentInput = "{ }";
-        String expectedOutput = "{ }";
-        String result = JsonPrettyFormatter.format(noContentInput);
-        assertThat(result, equalTo(expectedOutput));
-    }
-
-    @Test
-    public void assertFormatterOutputsPrettyJson() throws IOException {
-        String explainFormattedPrettyFilePath = TestUtils.getResourceFilePath(
-                "/src/test/resources/expectedOutput/explain_format_pretty.json");
-        String explainFormattedPretty = Files.toString(new File(explainFormattedPrettyFilePath), StandardCharsets.UTF_8)
-                .replaceAll("\r", "");
-
-        String explainFormattedOnelineFilePath = TestUtils.getResourceFilePath(
-                "/src/test/resources/explain_format_oneline.json");
-        String explainFormattedOneline = Files.toString(new File(explainFormattedOnelineFilePath), StandardCharsets.UTF_8)
-                .replaceAll("\r", "");
-        String result = JsonPrettyFormatter.format(explainFormattedOneline);
-
-        assertThat(result, equalTo(explainFormattedPretty));
-    }
-
-    @Test(expected = IOException.class)
-    public void illegalInputOfNull() throws IOException {
-        JsonPrettyFormatter.format("");
-    }
-
-    @Test(expected = IOException.class)
-    public void illegalInputOfUnpairedBrace() throws IOException {
-        JsonPrettyFormatter.format("{\"key\" : \"value\"");
-    }
-
-    @Test(expected = IOException.class)
-    public void illegalInputOfWrongBraces() throws IOException {
-        JsonPrettyFormatter.format("<\"key\" : \"value\">");
-    }
+  @Test
+  public void assertFormatterWithoutContentInside() throws IOException {
+    String noContentInput = "{ }";
+    String expectedOutput = "{ }";
+    String result = JsonPrettyFormatter.format(noContentInput);
+    assertThat(result, equalTo(expectedOutput));
+  }
+
+  @Test
+  public void assertFormatterOutputsPrettyJson() throws IOException {
+    String explainFormattedPrettyFilePath =
+        TestUtils.getResourceFilePath(
+            "/src/test/resources/expectedOutput/explain_format_pretty.json");
+    String explainFormattedPretty =
+        Files.toString(new File(explainFormattedPrettyFilePath), StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
+
+    String explainFormattedOnelineFilePath =
+        TestUtils.getResourceFilePath("/src/test/resources/explain_format_oneline.json");
+    String explainFormattedOneline =
+        Files.toString(new File(explainFormattedOnelineFilePath), StandardCharsets.UTF_8)
+            .replaceAll("\r", "");
+    String result = JsonPrettyFormatter.format(explainFormattedOneline);
+
+    assertThat(result, equalTo(explainFormattedPretty));
+  }
+
+  @Test(expected = IOException.class)
+  public void illegalInputOfNull() throws IOException {
+    JsonPrettyFormatter.format("");
+  }
+
+  @Test(expected = IOException.class)
+  public void illegalInputOfUnpairedBrace() throws IOException {
+    JsonPrettyFormatter.format("{\"key\" : \"value\"");
+  }
+
+  @Test(expected = IOException.class)
+  public void illegalInputOfWrongBraces() throws IOException {
+    JsonPrettyFormatter.format("<\"key\" : \"value\">");
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/QueryContextTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/QueryContextTest.java
index 55b78af0d7..5dbda8cb92 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/QueryContextTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/QueryContextTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.utils;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -18,56 +17,57 @@
 
 public class QueryContextTest {
 
-    private static final String REQUEST_ID_KEY = "request_id";
+  private static final String REQUEST_ID_KEY = "request_id";
 
-    @After
-    public void cleanUpContext() {
+  @After
+  public void cleanUpContext() {
 
-        ThreadContext.clearMap();
-    }
+    ThreadContext.clearMap();
+  }
 
-    @Test
-    public void addRequestId() {
+  @Test
+  public void addRequestId() {
 
-        Assert.assertNull(ThreadContext.get(REQUEST_ID_KEY));
-        QueryContext.addRequestId();
-        final String requestId = ThreadContext.get(REQUEST_ID_KEY);
-        Assert.assertNotNull(requestId);
-    }
+    Assert.assertNull(ThreadContext.get(REQUEST_ID_KEY));
+    QueryContext.addRequestId();
+    final String requestId = ThreadContext.get(REQUEST_ID_KEY);
+    Assert.assertNotNull(requestId);
+  }
 
-    @Test
-    public void addRequestId_alreadyExists() {
+  @Test
+  public void addRequestId_alreadyExists() {
 
-        QueryContext.addRequestId();
-        final String requestId = ThreadContext.get(REQUEST_ID_KEY);
-        QueryContext.addRequestId();
-        final String requestId2 = ThreadContext.get(REQUEST_ID_KEY);
-        Assert.assertThat(requestId2, not(equalTo(requestId)));
-    }
+    QueryContext.addRequestId();
+    final String requestId = ThreadContext.get(REQUEST_ID_KEY);
+    QueryContext.addRequestId();
+    final String requestId2 = ThreadContext.get(REQUEST_ID_KEY);
+    Assert.assertThat(requestId2, not(equalTo(requestId)));
+  }
 
-    @Test
-    public void getRequestId_doesNotExist() {
-        assertNotNull(QueryContext.getRequestId());
-    }
+  @Test
+  public void getRequestId_doesNotExist() {
+    assertNotNull(QueryContext.getRequestId());
+  }
 
-    @Test
-    public void getRequestId() {
+  @Test
+  public void getRequestId() {
 
-        final String test_request_id = "test_id_111";
-        ThreadContext.put(REQUEST_ID_KEY, test_request_id);
-        final String requestId = QueryContext.getRequestId();
-        Assert.assertThat(requestId, equalTo(test_request_id));
-    }
+    final String test_request_id = "test_id_111";
+    ThreadContext.put(REQUEST_ID_KEY, test_request_id);
+    final String requestId = QueryContext.getRequestId();
+    Assert.assertThat(requestId, equalTo(test_request_id));
+  }
 
-    @Test
-    public void withCurrentContext() throws InterruptedException {
+  @Test
+  public void withCurrentContext() throws InterruptedException {
 
-        Runnable task = () -> {
-            Assert.assertTrue(ThreadContext.containsKey("test11"));
-            Assert.assertTrue(ThreadContext.containsKey("test22"));
+    Runnable task =
+        () -> {
+          Assert.assertTrue(ThreadContext.containsKey("test11"));
+          Assert.assertTrue(ThreadContext.containsKey("test22"));
         };
-        ThreadContext.put("test11", "value11");
-        ThreadContext.put("test22", "value11");
-        new Thread(QueryContext.withCurrentContext(task)).join();
-    }
+    ThreadContext.put("test11", "value11");
+    ThreadContext.put("test22", "value11");
+    new Thread(QueryContext.withCurrentContext(task)).join();
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/QueryDataAnonymizerTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/QueryDataAnonymizerTest.java
index ca95b547a9..073fec61e7 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/QueryDataAnonymizerTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/QueryDataAnonymizerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.utils;
 
 import org.junit.Assert;
@@ -12,78 +11,84 @@
 
 public class QueryDataAnonymizerTest {
 
-    @Test
-    public void queriesShouldHaveAnonymousFieldAndIndex() {
-        String query = "SELECT ABS(balance) FROM accounts WHERE age > 30 GROUP BY ABS(balance)";
-        String expectedQuery = "( SELECT ABS(identifier) FROM table WHERE identifier > number GROUP BY ABS(identifier) )";
-        Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
-    }
+  @Test
+  public void queriesShouldHaveAnonymousFieldAndIndex() {
+    String query = "SELECT ABS(balance) FROM accounts WHERE age > 30 GROUP BY ABS(balance)";
+    String expectedQuery =
+        "( SELECT ABS(identifier) FROM table WHERE identifier > number GROUP BY ABS(identifier) )";
+    Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
+  }
 
-    @Test
-    public void queriesShouldAnonymousNumbers() {
-        String query = "SELECT ABS(20), LOG(20.20) FROM accounts";
-        String expectedQuery = "( SELECT ABS(number), LOG(number) FROM table )";
-        Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
-    }
+  @Test
+  public void queriesShouldAnonymousNumbers() {
+    String query = "SELECT ABS(20), LOG(20.20) FROM accounts";
+    String expectedQuery = "( SELECT ABS(number), LOG(number) FROM table )";
+    Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
+  }
 
-    @Test
-    public void queriesShouldHaveAnonymousBooleanLiterals() {
-        String query = "SELECT TRUE FROM accounts";
-        String expectedQuery = "( SELECT boolean_literal FROM table )";
-        Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
-    }
+  @Test
+  public void queriesShouldHaveAnonymousBooleanLiterals() {
+    String query = "SELECT TRUE FROM accounts";
+    String expectedQuery = "( SELECT boolean_literal FROM table )";
+    Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
+  }
 
-    @Test
-    public void queriesShouldHaveAnonymousInputStrings() {
-        String query = "SELECT * FROM accounts WHERE name = 'Oliver'";
-        String expectedQuery = "( SELECT * FROM table WHERE identifier = 'string_literal' )";
-        Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
-    }
+  @Test
+  public void queriesShouldHaveAnonymousInputStrings() {
+    String query = "SELECT * FROM accounts WHERE name = 'Oliver'";
+    String expectedQuery = "( SELECT * FROM table WHERE identifier = 'string_literal' )";
+    Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
+  }
 
-    @Test
-    public void queriesWithAliasesShouldAnonymizeSensitiveData() {
-        String query = "SELECT balance AS b FROM accounts AS a";
-        String expectedQuery = "( SELECT identifier AS b FROM table a )";
-        Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
-    }
+  @Test
+  public void queriesWithAliasesShouldAnonymizeSensitiveData() {
+    String query = "SELECT balance AS b FROM accounts AS a";
+    String expectedQuery = "( SELECT identifier AS b FROM table a )";
+    Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
+  }
 
-    @Test
-    public void queriesWithFunctionsShouldAnonymizeSensitiveData() {
-        String query = "SELECT LTRIM(firstname) FROM accounts";
-        String expectedQuery = "( SELECT LTRIM(identifier) FROM table )";
-        Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
-    }
+  @Test
+  public void queriesWithFunctionsShouldAnonymizeSensitiveData() {
+    String query = "SELECT LTRIM(firstname) FROM accounts";
+    String expectedQuery = "( SELECT LTRIM(identifier) FROM table )";
+    Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
+  }
 
-    @Test
-    public void queriesWithAggregatesShouldAnonymizeSensitiveData() {
-        String query = "SELECT MAX(price) - MIN(price) from tickets";
-        String expectedQuery = "( SELECT MAX(identifier) - MIN(identifier) FROM table )";
-        Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
-    }
+  @Test
+  public void queriesWithAggregatesShouldAnonymizeSensitiveData() {
+    String query = "SELECT MAX(price) - MIN(price) from tickets";
+    String expectedQuery = "( SELECT MAX(identifier) - MIN(identifier) FROM table )";
+    Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
+  }
 
-    @Test
-    public void queriesWithSubqueriesShouldAnonymizeSensitiveData() {
-        String query = "SELECT a.f, a.l, a.a FROM " +
-                "(SELECT firstname AS f, lastname AS l, age AS a FROM accounts WHERE age > 30) a";
-        String expectedQuery = "( SELECT identifier, identifier, identifier FROM (SELECT identifier AS f, " +
-                "identifier AS l, identifier AS a FROM table WHERE identifier > number ) a )";
-        Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
-    }
+  @Test
+  public void queriesWithSubqueriesShouldAnonymizeSensitiveData() {
+    String query =
+        "SELECT a.f, a.l, a.a FROM "
+            + "(SELECT firstname AS f, lastname AS l, age AS a FROM accounts WHERE age > 30) a";
+    String expectedQuery =
+        "( SELECT identifier, identifier, identifier FROM (SELECT identifier AS f, "
+            + "identifier AS l, identifier AS a FROM table WHERE identifier > number ) a )";
+    Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
+  }
 
-    @Test
-    public void joinQueriesShouldAnonymizeSensitiveData() {
-        String query = "SELECT a.account_number, a.firstname, a.lastname, e.id, e.name " +
-                "FROM accounts a JOIN employees e";
-        String expectedQuery = "( SELECT identifier, identifier, identifier, identifier, identifier " +
-                "FROM table a JOIN table e )";
-        Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
-    }
+  @Test
+  public void joinQueriesShouldAnonymizeSensitiveData() {
+    String query =
+        "SELECT a.account_number, a.firstname, a.lastname, e.id, e.name "
+            + "FROM accounts a JOIN employees e";
+    String expectedQuery =
+        "( SELECT identifier, identifier, identifier, identifier, identifier "
+            + "FROM table a JOIN table e )";
+    Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
+  }
 
-    @Test
-    public void unionQueriesShouldAnonymizeSensitiveData() {
-        String query = "SELECT name, age FROM accounts UNION SELECT name, age FROM employees";
-        String expectedQuery = "( SELECT identifier, identifier FROM table " +
-                "UNION SELECT identifier, identifier FROM table )";
-        Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
-    }
+  @Test
+  public void unionQueriesShouldAnonymizeSensitiveData() {
+    String query = "SELECT name, age FROM accounts UNION SELECT name, age FROM employees";
+    String expectedQuery =
+        "( SELECT identifier, identifier FROM table "
+            + "UNION SELECT identifier, identifier FROM table )";
+    Assert.assertEquals(expectedQuery, QueryDataAnonymizer.anonymizeData(query));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/SQLFunctionsTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/SQLFunctionsTest.java
index 70c4a2aa11..9fc2b6012d 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/SQLFunctionsTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/SQLFunctionsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.utils;
 
 import static org.junit.Assert.assertEquals;
@@ -35,69 +34,64 @@
 
 public class SQLFunctionsTest {
 
-    private SQLFunctions sqlFunctions = new SQLFunctions();
-
-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
-
-    @Test
-    public void testAssign() throws SqlParseException {
-        SQLFunctions sqlFunctions = new SQLFunctions();
-
-        final SQLIntegerExpr sqlIntegerExpr = new SQLIntegerExpr(10);
-        final Tuple<String, String> assign = sqlFunctions.function("assign",
-                ImmutableList.of(new KVValue(null, sqlIntegerExpr)),
-                null,
-                true);
-
-        assertTrue(assign.v1().matches("assign_[0-9]+"));
-        assertTrue(assign.v2().matches("def assign_[0-9]+ = 10;return assign_[0-9]+;"));
-    }
-
-    @Test
-    public void testAbsWithIntReturnType() {
-        final SQLIntegerExpr sqlIntegerExpr = new SQLIntegerExpr(6);
-
-        final SQLMethodInvokeExpr invokeExpr = new SQLMethodInvokeExpr("ABS");
-        invokeExpr.addParameter(sqlIntegerExpr);
-        List<KVValue> params = new ArrayList<>();
-
-        final MethodField field = new ScriptMethodField("ABS", params, null, null);
-        field.setExpression(invokeExpr);
-        ColumnTypeProvider columnTypeProvider = new ColumnTypeProvider(OpenSearchDataType.INTEGER);
-
-        Schema.Type resolvedType = columnTypeProvider.get(0);
-        final Schema.Type returnType = sqlFunctions.getScriptFunctionReturnType(field, resolvedType);
-        Assert.assertEquals(returnType, Schema.Type.INTEGER);
-    }
-
-    @Test
-    public void testCastReturnType() {
-        final SQLIdentifierExpr identifierExpr = new SQLIdentifierExpr("int_type");
-        SQLDataType sqlDataType = new SQLDataTypeImpl("INT");
-        final SQLCastExpr castExpr = new SQLCastExpr();
-        castExpr.setExpr(identifierExpr);
-        castExpr.setDataType(sqlDataType);
-
-        List<KVValue> params = new ArrayList<>();
-        final MethodField field = new ScriptMethodField("CAST", params, null, null);
-        field.setExpression(castExpr);
-        ColumnTypeProvider columnTypeProvider = new ColumnTypeProvider(OpenSearchDataType.INTEGER);
-
-        Schema.Type resolvedType = columnTypeProvider.get(0);
-        final Schema.Type returnType = sqlFunctions.getScriptFunctionReturnType(field, resolvedType);
-        Assert.assertEquals(returnType, Schema.Type.INTEGER);
-    }
-
-    @Test
-    public void testCastIntStatementScript() throws SqlParseException {
-        assertEquals(
-            "def result = (doc['age'].value instanceof boolean) "
-                + "? (doc['age'].value ? 1 : 0) "
-                + ": Double.parseDouble(doc['age'].value.toString()).intValue()",
-            sqlFunctions.getCastScriptStatement(
-                "result", "int", Arrays.asList(new KVValue("age")))
-        );
-    }
-
+  private SQLFunctions sqlFunctions = new SQLFunctions();
+
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
+
+  @Test
+  public void testAssign() throws SqlParseException {
+    SQLFunctions sqlFunctions = new SQLFunctions();
+
+    final SQLIntegerExpr sqlIntegerExpr = new SQLIntegerExpr(10);
+    final Tuple<String, String> assign =
+        sqlFunctions.function(
+            "assign", ImmutableList.of(new KVValue(null, sqlIntegerExpr)), null, true);
+
+    assertTrue(assign.v1().matches("assign_[0-9]+"));
+    assertTrue(assign.v2().matches("def assign_[0-9]+ = 10;return assign_[0-9]+;"));
+  }
+
+  @Test
+  public void testAbsWithIntReturnType() {
+    final SQLIntegerExpr sqlIntegerExpr = new SQLIntegerExpr(6);
+
+    final SQLMethodInvokeExpr invokeExpr = new SQLMethodInvokeExpr("ABS");
+    invokeExpr.addParameter(sqlIntegerExpr);
+    List<KVValue> params = new ArrayList<>();
+
+    final MethodField field = new ScriptMethodField("ABS", params, null, null);
+    field.setExpression(invokeExpr);
+    ColumnTypeProvider columnTypeProvider = new ColumnTypeProvider(OpenSearchDataType.INTEGER);
+
+    Schema.Type resolvedType = columnTypeProvider.get(0);
+    final Schema.Type returnType = sqlFunctions.getScriptFunctionReturnType(field, resolvedType);
+    Assert.assertEquals(returnType, Schema.Type.INTEGER);
+  }
+
+  @Test
+  public void testCastReturnType() {
+    final SQLIdentifierExpr identifierExpr = new SQLIdentifierExpr("int_type");
+    SQLDataType sqlDataType = new SQLDataTypeImpl("INT");
+    final SQLCastExpr castExpr = new SQLCastExpr();
+    castExpr.setExpr(identifierExpr);
+    castExpr.setDataType(sqlDataType);
+
+    List<KVValue> params = new ArrayList<>();
+    final MethodField field = new ScriptMethodField("CAST", params, null, null);
+    field.setExpression(castExpr);
+    ColumnTypeProvider columnTypeProvider = new ColumnTypeProvider(OpenSearchDataType.INTEGER);
+
+    Schema.Type resolvedType = columnTypeProvider.get(0);
+    final Schema.Type returnType = sqlFunctions.getScriptFunctionReturnType(field, resolvedType);
+    Assert.assertEquals(returnType, Schema.Type.INTEGER);
+  }
+
+  @Test
+  public void testCastIntStatementScript() throws SqlParseException {
+    assertEquals(
+        "def result = (doc['age'].value instanceof boolean) "
+            + "? (doc['age'].value ? 1 : 0) "
+            + ": Double.parseDouble(doc['age'].value.toString()).intValue()",
+        sqlFunctions.getCastScriptStatement("result", "int", Arrays.asList(new KVValue("age"))));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/StringUtilsTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/StringUtilsTest.java
index d25fed6f31..b73e91981e 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/StringUtilsTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/StringUtilsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.utils;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -17,55 +16,57 @@
 
 public class StringUtilsTest {
 
-    private Locale originalLocale;
+  private Locale originalLocale;
 
-    @Before
-    public void saveOriginalLocale() {
-        originalLocale = Locale.getDefault();
-    }
+  @Before
+  public void saveOriginalLocale() {
+    originalLocale = Locale.getDefault();
+  }
 
-    @After
-    public void restoreOriginalLocale() {
-        Locale.setDefault(originalLocale);
-    }
+  @After
+  public void restoreOriginalLocale() {
+    Locale.setDefault(originalLocale);
+  }
 
-    @Test
-    public void toLower() {
-        final String input = "SAMPLE STRING";
-        final String output = StringUtils.toLower(input);
+  @Test
+  public void toLower() {
+    final String input = "SAMPLE STRING";
+    final String output = StringUtils.toLower(input);
 
-        Assert.assertThat(output, equalTo("sample string"));
+    Assert.assertThat(output, equalTo("sample string"));
 
-        // See https://docs.oracle.com/javase/10/docs/api/java/lang/String.html#toLowerCase(java.util.Locale)
-        // for the choice of these characters and the locale.
-        final String upper = "\u0130 \u0049";
-        Locale.setDefault(Locale.forLanguageTag("tr"));
+    // See
+    // https://docs.oracle.com/javase/10/docs/api/java/lang/String.html#toLowerCase(java.util.Locale)
+    // for the choice of these characters and the locale.
+    final String upper = "\u0130 \u0049";
+    Locale.setDefault(Locale.forLanguageTag("tr"));
 
-        Assert.assertThat(upper.toUpperCase(Locale.ROOT), equalTo(StringUtils.toUpper(upper)));
-    }
+    Assert.assertThat(upper.toUpperCase(Locale.ROOT), equalTo(StringUtils.toUpper(upper)));
+  }
 
-    @Test
-    public void toUpper() {
-        final String input = "sample string";
-        final String output = StringUtils.toUpper(input);
+  @Test
+  public void toUpper() {
+    final String input = "sample string";
+    final String output = StringUtils.toUpper(input);
 
-        Assert.assertThat(output, equalTo("SAMPLE STRING"));
+    Assert.assertThat(output, equalTo("SAMPLE STRING"));
 
-        // See https://docs.oracle.com/javase/10/docs/api/java/lang/String.html#toUpperCase(java.util.Locale)
-        // for the choice of these characters and the locale.
-        final String lower = "\u0069 \u0131";
-        Locale.setDefault(Locale.forLanguageTag("tr"));
+    // See
+    // https://docs.oracle.com/javase/10/docs/api/java/lang/String.html#toUpperCase(java.util.Locale)
+    // for the choice of these characters and the locale.
+    final String lower = "\u0069 \u0131";
+    Locale.setDefault(Locale.forLanguageTag("tr"));
 
-        Assert.assertThat(lower.toUpperCase(Locale.ROOT), equalTo(StringUtils.toUpper(lower)));
-    }
+    Assert.assertThat(lower.toUpperCase(Locale.ROOT), equalTo(StringUtils.toUpper(lower)));
+  }
 
-    @Test
-    public void format() {
-        Locale.setDefault(Locale.forLanguageTag("tr"));
-        final String upper = "\u0130 \u0049";
-        final String lower = "\u0069 \u0131";
+  @Test
+  public void format() {
+    Locale.setDefault(Locale.forLanguageTag("tr"));
+    final String upper = "\u0130 \u0049";
+    final String lower = "\u0069 \u0131";
 
-        final String output = StringUtils.format("%s %s", upper, lower);
-        Assert.assertThat(output, equalTo(String.format(Locale.ROOT, "%s %s", upper, lower)));
-    }
+    final String output = StringUtils.format("%s %s", upper, lower);
+    Assert.assertThat(output, equalTo(String.format(Locale.ROOT, "%s %s", upper, lower)));
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/UtilTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/UtilTest.java
index 21731db5a5..e3c7a74a71 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/UtilTest.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/utils/UtilTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.unittest.utils;
 
 import java.util.HashMap;
@@ -14,54 +13,54 @@
 
 public class UtilTest {
 
-    @Test
-    public void clearEmptyPaths_EmptyMap_ShouldReturnTrue(){
-        Map<String,Object> map = new HashMap<>();
-        boolean result = Util.clearEmptyPaths(map);
-        //
-        Assert.assertTrue(result);
-    }
+  @Test
+  public void clearEmptyPaths_EmptyMap_ShouldReturnTrue() {
+    Map<String, Object> map = new HashMap<>();
+    boolean result = Util.clearEmptyPaths(map);
+    //
+    Assert.assertTrue(result);
+  }
 
-    @Test
-    public void clearEmptyPaths_EmptyPathSize1_ShouldReturnTrueAndMapShouldBeEmpty(){
-        Map<String,Object> map = new HashMap<>();
-        map.put("a",new HashMap<String,Object>());
-        boolean result = Util.clearEmptyPaths(map);
-        Assert.assertTrue(result);
-        Assert.assertEquals(0,map.size());
-    }
+  @Test
+  public void clearEmptyPaths_EmptyPathSize1_ShouldReturnTrueAndMapShouldBeEmpty() {
+    Map<String, Object> map = new HashMap<>();
+    map.put("a", new HashMap<String, Object>());
+    boolean result = Util.clearEmptyPaths(map);
+    Assert.assertTrue(result);
+    Assert.assertEquals(0, map.size());
+  }
 
-    @Test
-    public void clearEmptyPaths_EmptyPathSize2_ShouldReturnTrueAndMapShouldBeEmpty(){
-        Map<String,Object> map = new HashMap<>();
-        Map<String,Object> innerMap = new HashMap<>();
-        innerMap.put("b",new HashMap<String,Object>());
-        map.put("a",innerMap);
-        boolean result = Util.clearEmptyPaths(map);
-        Assert.assertTrue(result);
-        Assert.assertEquals(0,map.size());
-    }
+  @Test
+  public void clearEmptyPaths_EmptyPathSize2_ShouldReturnTrueAndMapShouldBeEmpty() {
+    Map<String, Object> map = new HashMap<>();
+    Map<String, Object> innerMap = new HashMap<>();
+    innerMap.put("b", new HashMap<String, Object>());
+    map.put("a", innerMap);
+    boolean result = Util.clearEmptyPaths(map);
+    Assert.assertTrue(result);
+    Assert.assertEquals(0, map.size());
+  }
 
-    @Test
-    public void clearEmptyPaths_2PathsOneEmpty_MapShouldBeSizeOne(){
-        Map<String,Object> map = new HashMap<>();
-        map.put("a",new HashMap<String,Object>());
-        map.put("c",1);
-        Util.clearEmptyPaths(map);
-        Assert.assertEquals(1,map.size());
-    }
+  @Test
+  public void clearEmptyPaths_2PathsOneEmpty_MapShouldBeSizeOne() {
+    Map<String, Object> map = new HashMap<>();
+    map.put("a", new HashMap<String, Object>());
+    map.put("c", 1);
+    Util.clearEmptyPaths(map);
+    Assert.assertEquals(1, map.size());
+  }
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void clearEmptyPaths_MapSizeTwoAndTwoOneInnerEmpty_MapShouldBeSizeTwoAndOne(){
-        Map<String,Object> map = new HashMap<>();
-        Map<String,Object> innerMap = new HashMap<>();
-        innerMap.put("b",2);
-        innerMap.put("c",new HashMap<String,Object>());
-        map.put("a",innerMap);
-        map.put("c",1);
-        Util.clearEmptyPaths(map);
-        Assert.assertEquals(2, map.size());
-        Assert.assertEquals(1,((HashMap<String,Object>)map.get("a")).size());
-    }
+  @Test
+  @SuppressWarnings("unchecked")
+  public void clearEmptyPaths_MapSizeTwoAndTwoOneInnerEmpty_MapShouldBeSizeTwoAndOne() {
+    Map<String, Object> map = new HashMap<>();
+    Map<String, Object> innerMap = new HashMap<>();
+    innerMap.put("b", 2);
+    innerMap.put("c", new HashMap<String, Object>());
+    map.put("a", innerMap);
+    map.put("c", 1);
+    Util.clearEmptyPaths(map);
+    Assert.assertEquals(2, map.size());
+    Assert.assertEquals(1, ((HashMap<String, Object>) map.get("a")).size());
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/AggregationUtils.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/AggregationUtils.java
index b4967a049e..85da1d990f 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/util/AggregationUtils.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/AggregationUtils.java
@@ -3,21 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.util;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ContextParser;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContent;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ContextParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.aggregations.Aggregation;
 import org.opensearch.search.aggregations.Aggregations;
 import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
@@ -42,41 +40,52 @@
 import org.opensearch.search.aggregations.pipeline.PercentilesBucketPipelineAggregationBuilder;
 
 public class AggregationUtils {
-    private final static List<NamedXContentRegistry.Entry> entryList =
-            new ImmutableMap.Builder<String, ContextParser<Object, ? extends Aggregation>>().put(
-                    MinAggregationBuilder.NAME, (p, c) -> ParsedMin.fromXContent(p, (String) c))
-                    .put(MaxAggregationBuilder.NAME, (p, c) -> ParsedMax.fromXContent(p, (String) c))
-                    .put(SumAggregationBuilder.NAME, (p, c) -> ParsedSum.fromXContent(p, (String) c))
-                    .put(AvgAggregationBuilder.NAME, (p, c) -> ParsedAvg.fromXContent(p, (String) c))
-                    .put(StringTerms.NAME, (p, c) -> ParsedStringTerms.fromXContent(p, (String) c))
-                    .put(LongTerms.NAME, (p, c) -> ParsedLongTerms.fromXContent(p, (String) c))
-                    .put(DoubleTerms.NAME, (p, c) -> ParsedDoubleTerms.fromXContent(p, (String) c))
-                    .put(ValueCountAggregationBuilder.NAME, (p, c) -> ParsedValueCount.fromXContent(p, (String) c))
-                    .put(PercentilesBucketPipelineAggregationBuilder.NAME,
-                         (p, c) -> ParsedPercentilesBucket.fromXContent(p, (String) c))
-                    .put(DateHistogramAggregationBuilder.NAME, (p, c) -> ParsedDateHistogram.fromXContent(p, (String) c))
-                    .build()
-                    .entrySet()
-                    .stream()
-                    .map(entry -> new NamedXContentRegistry.Entry(Aggregation.class, new ParseField(entry.getKey()),
-                                                                  entry.getValue()))
-                    .collect(Collectors.toList());
-    private final static NamedXContentRegistry namedXContentRegistry = new NamedXContentRegistry(entryList);
-    private final static XContent xContent = XContentFactory.xContent(XContentType.JSON);
+  private static final List<NamedXContentRegistry.Entry> entryList =
+      new ImmutableMap.Builder<String, ContextParser<Object, ? extends Aggregation>>()
+              .put(MinAggregationBuilder.NAME, (p, c) -> ParsedMin.fromXContent(p, (String) c))
+              .put(MaxAggregationBuilder.NAME, (p, c) -> ParsedMax.fromXContent(p, (String) c))
+              .put(SumAggregationBuilder.NAME, (p, c) -> ParsedSum.fromXContent(p, (String) c))
+              .put(AvgAggregationBuilder.NAME, (p, c) -> ParsedAvg.fromXContent(p, (String) c))
+              .put(StringTerms.NAME, (p, c) -> ParsedStringTerms.fromXContent(p, (String) c))
+              .put(LongTerms.NAME, (p, c) -> ParsedLongTerms.fromXContent(p, (String) c))
+              .put(DoubleTerms.NAME, (p, c) -> ParsedDoubleTerms.fromXContent(p, (String) c))
+              .put(
+                  ValueCountAggregationBuilder.NAME,
+                  (p, c) -> ParsedValueCount.fromXContent(p, (String) c))
+              .put(
+                  PercentilesBucketPipelineAggregationBuilder.NAME,
+                  (p, c) -> ParsedPercentilesBucket.fromXContent(p, (String) c))
+              .put(
+                  DateHistogramAggregationBuilder.NAME,
+                  (p, c) -> ParsedDateHistogram.fromXContent(p, (String) c))
+              .build()
+              .entrySet()
+              .stream()
+              .map(
+                  entry ->
+                      new NamedXContentRegistry.Entry(
+                          Aggregation.class, new ParseField(entry.getKey()), entry.getValue()))
+              .collect(Collectors.toList());
+  private static final NamedXContentRegistry namedXContentRegistry =
+      new NamedXContentRegistry(entryList);
 
-    /**
-     * Populate {@link Aggregations} from JSON string.
-     * @param json json string
-     * @return {@link Aggregations}
-     */
-    public static Aggregations fromJson(String json) {
-        try {
-            XContentParser xContentParser =
-                    xContent.createParser(namedXContentRegistry, LoggingDeprecationHandler.INSTANCE, json);
-            xContentParser.nextToken();
-            return Aggregations.fromXContent(xContentParser);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+  /**
+   * Populate {@link Aggregations} from JSON string.
+   *
+   * @param json json string
+   * @return {@link Aggregations}
+   */
+  public static Aggregations fromJson(String json) {
+    try {
+      XContentParser xContentParser =
+          new JsonXContentParser(
+              namedXContentRegistry,
+              LoggingDeprecationHandler.INSTANCE,
+              new JsonFactory().createParser(json));
+      xContentParser.nextToken();
+      return Aggregations.fromXContent(xContentParser);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
     }
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/CheckScriptContents.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/CheckScriptContents.java
index f427170cfc..76347c5048 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/util/CheckScriptContents.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/CheckScriptContents.java
@@ -3,17 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.util;
 
 import static java.util.Collections.emptyList;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.any;
 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.opensearch.search.builder.SearchSourceBuilder.ScriptField;
 
@@ -23,27 +21,24 @@
 import java.io.IOException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.mockito.stubbing.Answer;
-import org.opensearch.action.ActionFuture;
+import lombok.SneakyThrows;
+import org.mockito.Mockito;
 import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsRequest;
 import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.client.IndicesAdminClient;
-import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.metadata.IndexMetadata;
-import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
-import org.opensearch.cluster.metadata.MappingMetadata;
-import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.collect.ImmutableOpenMap;
-import org.opensearch.common.xcontent.DeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.common.action.ActionFuture;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.sql.legacy.domain.Condition;
 import org.opensearch.sql.legacy.domain.Select;
 import org.opensearch.sql.legacy.domain.Where;
@@ -60,205 +55,193 @@
 
 public class CheckScriptContents {
 
-    private static SQLExpr queryToExpr(String query) {
-        return new ElasticSqlExprParser(query).expr();
-    }
-
-    public static ScriptField getScriptFieldFromQuery(String query) {
-        try {
-            Client mockClient = mock(Client.class);
-            stubMockClient(mockClient);
-            QueryAction queryAction = OpenSearchActionFactory.create(mockClient, query);
-            SqlElasticRequestBuilder requestBuilder = queryAction.explain();
-
-            SearchRequestBuilder request = (SearchRequestBuilder) requestBuilder.getBuilder();
-            List<ScriptField> scriptFields = request.request().source().scriptFields();
-
-            assertTrue(scriptFields.size() == 1);
-
-            return scriptFields.get(0);
-
-        } catch (SQLFeatureNotSupportedException | SqlParseException | SQLFeatureDisabledException e) {
-            throw new ParserException("Unable to parse query: " + query, e);
-        }
-    }
-
-    public static ScriptFilter getScriptFilterFromQuery(String query, SqlParser parser) {
-        try {
-            Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
-            Where where = select.getWhere();
-
-            assertTrue(where.getWheres().size() == 1);
-            assertTrue(((Condition) (where.getWheres().get(0))).getValue() instanceof ScriptFilter);
-
-            return (ScriptFilter) (((Condition) (where.getWheres().get(0))).getValue());
-
-        } catch (SqlParseException e) {
-            throw new ParserException("Unable to parse query: " + query);
-        }
-    }
-
-    public static boolean scriptContainsString(ScriptField scriptField, String string) {
-        return scriptField.script().getIdOrCode().contains(string);
-    }
-
-    public static boolean scriptContainsString(ScriptFilter scriptFilter, String string) {
-        return scriptFilter.getScript().contains(string);
-    }
-
-    public static boolean scriptHasPattern(ScriptField scriptField, String regex) {
-        Pattern pattern = Pattern.compile(regex);
-        Matcher matcher = pattern.matcher(scriptField.script().getIdOrCode());
-        return matcher.find();
-    }
-
-    public static boolean scriptHasPattern(ScriptFilter scriptFilter, String regex) {
-        Pattern pattern = Pattern.compile(regex);
-        Matcher matcher = pattern.matcher(scriptFilter.getScript());
-        return matcher.find();
-    }
+  private static SQLExpr queryToExpr(String query) {
+    return new ElasticSqlExprParser(query).expr();
+  }
 
-    public static void stubMockClient(Client mockClient) {
-            String mappings = "{\n" +
-                "  \"opensearch-sql_test_index_bank\": {\n" +
-                "    \"mappings\": {\n" +
-                "      \"account\": {\n" +
-                "        \"properties\": {\n" +
-                "          \"account_number\": {\n" +
-                "            \"type\": \"long\"\n" +
-                "          },\n" +
-                "          \"address\": {\n" +
-                "            \"type\": \"text\"\n" +
-                "          },\n" +
-                "          \"age\": {\n" +
-                "            \"type\": \"integer\"\n" +
-                "          },\n" +
-                "          \"balance\": {\n" +
-                "            \"type\": \"long\"\n" +
-                "          },\n" +
-                "          \"birthdate\": {\n" +
-                "            \"type\": \"date\"\n" +
-                "          },\n" +
-                "          \"city\": {\n" +
-                "            \"type\": \"keyword\"\n" +
-                "          },\n" +
-                "          \"email\": {\n" +
-                "            \"type\": \"text\"\n" +
-                "          },\n" +
-                "          \"employer\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"fields\": {\n" +
-                "              \"keyword\": {\n" +
-                "                \"type\": \"keyword\",\n" +
-                "                \"ignore_above\": 256\n" +
-                "              }\n" +
-                "            }\n" +
-                "          },\n" +
-                "          \"firstname\": {\n" +
-                "            \"type\": \"text\"\n" +
-                "          },\n" +
-                "          \"gender\": {\n" +
-                "            \"type\": \"text\"\n" +
-                "          },\n" +
-                "          \"lastname\": {\n" +
-                "            \"type\": \"keyword\"\n" +
-                "          },\n" +
-                "          \"male\": {\n" +
-                "            \"type\": \"boolean\"\n" +
-                "          },\n" +
-                "          \"state\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"fields\": {\n" +
-                "              \"raw\": {\n" +
-                "                \"type\": \"keyword\",\n" +
-                "                \"ignore_above\": 256\n" +
-                "              }\n" +
-                "            }\n" +
-                "          }\n" +
-                "        }\n" +
-                "      }\n" +
-                "    },\n" +
-                // ==== All required by IndexMetaData.fromXContent() ====
-                "    \"settings\": {\n" +
-                "      \"index\": {\n" +
-                "        \"number_of_shards\": 5,\n" +
-                "        \"number_of_replicas\": 0,\n" +
-                "        \"version\": {\n" +
-                "          \"created\": \"6050399\"\n" +
-                "        }\n" +
-                "      }\n" +
-                "    },\n" +
-                "    \"mapping_version\": \"1\",\n" +
-                "    \"settings_version\": \"1\"\n" +
-                //=======================================================
-                "  }\n" +
-                "}";
+  public static ScriptField getScriptFieldFromQuery(String query) {
+    try {
+      Client mockClient = mock(Client.class);
+      stubMockClient(mockClient);
+      QueryAction queryAction = OpenSearchActionFactory.create(mockClient, query);
+      SqlElasticRequestBuilder requestBuilder = queryAction.explain();
 
-            AdminClient mockAdminClient = mock(AdminClient.class);
-            when(mockClient.admin()).thenReturn(mockAdminClient);
+      SearchRequestBuilder request = (SearchRequestBuilder) requestBuilder.getBuilder();
+      List<ScriptField> scriptFields = request.request().source().scriptFields();
 
-            IndicesAdminClient mockIndexClient = mock(IndicesAdminClient.class);
-            when(mockAdminClient.indices()).thenReturn(mockIndexClient);
+      assertTrue(scriptFields.size() == 1);
 
-            ActionFuture<GetFieldMappingsResponse> mockActionResp = mock(ActionFuture.class);
-            when(mockIndexClient.getFieldMappings(any(GetFieldMappingsRequest.class))).thenReturn(mockActionResp);
-            mockLocalClusterState(mappings);
-    }
+      return scriptFields.get(0);
 
-    public static XContentParser createParser(String mappings) throws IOException {
-        return XContentType.JSON.xContent().createParser(
-            NamedXContentRegistry.EMPTY,
-            DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
-            mappings
-        );
+    } catch (SQLFeatureNotSupportedException | SqlParseException | SQLFeatureDisabledException e) {
+      throw new ParserException("Unable to parse query: " + query, e);
     }
+  }
 
-    public static void mockLocalClusterState(String mappings) {
-        LocalClusterState.state().setClusterService(mockClusterService(mappings));
-        LocalClusterState.state().setResolver(mockIndexNameExpressionResolver());
-        LocalClusterState.state().setPluginSettings(mockPluginSettings());
-    }
+  public static ScriptFilter getScriptFilterFromQuery(String query, SqlParser parser) {
+    try {
+      Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+      Where where = select.getWhere();
 
-    public static ClusterService mockClusterService(String mappings) {
-        ClusterService mockService = mock(ClusterService.class);
-        ClusterState mockState = mock(ClusterState.class);
-        Metadata mockMetaData = mock(Metadata.class);
+      assertTrue(where.getWheres().size() == 1);
+      assertTrue(((Condition) (where.getWheres().get(0))).getValue() instanceof ScriptFilter);
 
-        when(mockService.state()).thenReturn(mockState);
-        when(mockState.metadata()).thenReturn(mockMetaData);
-        try {
-            ImmutableOpenMap.Builder<String, MappingMetadata> builder = ImmutableOpenMap.builder();
-            builder.put(TestsConstants.TEST_INDEX_BANK, IndexMetadata.fromXContent(createParser(mappings)).mapping());
-            when(mockMetaData.findMappings(any(),  any())).thenReturn(builder.build());
-        }
-        catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-        return mockService;
-    }
+      return (ScriptFilter) (((Condition) (where.getWheres().get(0))).getValue());
 
-    public static IndexNameExpressionResolver mockIndexNameExpressionResolver() {
-        IndexNameExpressionResolver mockResolver = mock(IndexNameExpressionResolver.class);
-        when(mockResolver.concreteIndexNames(any(), any(), anyBoolean(), anyString())).thenAnswer(
-            (Answer<String[]>) invocation -> {
-                // Return index expression directly without resolving
-                Object indexExprs = invocation.getArguments()[3];
-                if (indexExprs instanceof String) {
-                    return new String[]{ (String) indexExprs };
-                }
-                return (String[]) indexExprs;
-            }
-        );
-        return mockResolver;
+    } catch (SqlParseException e) {
+      throw new ParserException("Unable to parse query: " + query);
     }
-
-    public static OpenSearchSettings mockPluginSettings() {
-        OpenSearchSettings settings = mock(OpenSearchSettings.class);
-
-        // Force return empty list to avoid ClusterSettings be invoked which is a final class and hard to mock.
-        // In this case, default value in Setting will be returned all the time.
-        doReturn(emptyList()).when(settings).getSettings();
-        return settings;
-    }
-
+  }
+
+  public static boolean scriptContainsString(ScriptField scriptField, String string) {
+    return scriptField.script().getIdOrCode().contains(string);
+  }
+
+  public static boolean scriptContainsString(ScriptFilter scriptFilter, String string) {
+    return scriptFilter.getScript().contains(string);
+  }
+
+  public static boolean scriptHasPattern(ScriptField scriptField, String regex) {
+    Pattern pattern = Pattern.compile(regex);
+    Matcher matcher = pattern.matcher(scriptField.script().getIdOrCode());
+    return matcher.find();
+  }
+
+  public static boolean scriptHasPattern(ScriptFilter scriptFilter, String regex) {
+    Pattern pattern = Pattern.compile(regex);
+    Matcher matcher = pattern.matcher(scriptFilter.getScript());
+    return matcher.find();
+  }
+
+  public static void stubMockClient(Client mockClient) {
+    String mappings =
+        "{\n"
+            + "  \"opensearch-sql_test_index_bank\": {\n"
+            + "    \"mappings\": {\n"
+            + "      \"account\": {\n"
+            + "        \"properties\": {\n"
+            + "          \"account_number\": {\n"
+            + "            \"type\": \"long\"\n"
+            + "          },\n"
+            + "          \"address\": {\n"
+            + "            \"type\": \"text\"\n"
+            + "          },\n"
+            + "          \"age\": {\n"
+            + "            \"type\": \"integer\"\n"
+            + "          },\n"
+            + "          \"balance\": {\n"
+            + "            \"type\": \"long\"\n"
+            + "          },\n"
+            + "          \"birthdate\": {\n"
+            + "            \"type\": \"date\"\n"
+            + "          },\n"
+            + "          \"city\": {\n"
+            + "            \"type\": \"keyword\"\n"
+            + "          },\n"
+            + "          \"email\": {\n"
+            + "            \"type\": \"text\"\n"
+            + "          },\n"
+            + "          \"employer\": {\n"
+            + "            \"type\": \"text\",\n"
+            + "            \"fields\": {\n"
+            + "              \"keyword\": {\n"
+            + "                \"type\": \"keyword\",\n"
+            + "                \"ignore_above\": 256\n"
+            + "              }\n"
+            + "            }\n"
+            + "          },\n"
+            + "          \"firstname\": {\n"
+            + "            \"type\": \"text\"\n"
+            + "          },\n"
+            + "          \"gender\": {\n"
+            + "            \"type\": \"text\"\n"
+            + "          },\n"
+            + "          \"lastname\": {\n"
+            + "            \"type\": \"keyword\"\n"
+            + "          },\n"
+            + "          \"male\": {\n"
+            + "            \"type\": \"boolean\"\n"
+            + "          },\n"
+            + "          \"state\": {\n"
+            + "            \"type\": \"text\",\n"
+            + "            \"fields\": {\n"
+            + "              \"raw\": {\n"
+            + "                \"type\": \"keyword\",\n"
+            + "                \"ignore_above\": 256\n"
+            + "              }\n"
+            + "            }\n"
+            + "          }\n"
+            + "        }\n"
+            + "      }\n"
+            + "    },\n"
+            +
+            // ==== All required by IndexMetaData.fromXContent() ====
+            "    \"settings\": {\n"
+            + "      \"index\": {\n"
+            + "        \"number_of_shards\": 5,\n"
+            + "        \"number_of_replicas\": 0,\n"
+            + "        \"version\": {\n"
+            + "          \"created\": \"6050399\"\n"
+            + "        }\n"
+            + "      }\n"
+            + "    },\n"
+            + "    \"mapping_version\": \"1\",\n"
+            + "    \"settings_version\": \"1\"\n"
+            +
+            // =======================================================
+            "  }\n"
+            + "}";
+
+    AdminClient mockAdminClient = mock(AdminClient.class);
+    when(mockClient.admin()).thenReturn(mockAdminClient);
+
+    IndicesAdminClient mockIndexClient = mock(IndicesAdminClient.class);
+    when(mockAdminClient.indices()).thenReturn(mockIndexClient);
+
+    ActionFuture<GetFieldMappingsResponse> mockActionResp = mock(ActionFuture.class);
+    when(mockIndexClient.getFieldMappings(any(GetFieldMappingsRequest.class)))
+        .thenReturn(mockActionResp);
+    mockLocalClusterState(mappings);
+  }
+
+  public static XContentParser createParser(String mappings) throws IOException {
+    return XContentType.JSON
+        .xContent()
+        .createParser(
+            NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION, mappings);
+  }
+
+  @SneakyThrows
+  public static void mockLocalClusterState(String mappings) {
+
+    Client client = Mockito.mock(Client.class, Mockito.RETURNS_DEEP_STUBS);
+
+    when(client
+            .admin()
+            .indices()
+            .prepareGetMappings(any(String[].class))
+            .setLocal(anyBoolean())
+            .setIndicesOptions(any())
+            .execute()
+            .actionGet(anyLong(), any())
+            .mappings())
+        .thenReturn(
+            Map.of(
+                TestsConstants.TEST_INDEX_BANK,
+                IndexMetadata.fromXContent(createParser(mappings)).mapping()));
+
+    LocalClusterState.state().setClusterService(mock(ClusterService.class));
+    LocalClusterState.state().setPluginSettings(mockPluginSettings());
+    LocalClusterState.state().setClient(client);
+  }
+
+  public static OpenSearchSettings mockPluginSettings() {
+    OpenSearchSettings settings = mock(OpenSearchSettings.class);
+
+    // Force return empty list to avoid ClusterSettings be invoked which is a final class and hard
+    // to mock.
+    // In this case, default value in Setting will be returned all the time.
+    doReturn(emptyList()).when(settings).getSettings();
+    return settings;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/HasFieldWithValue.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/HasFieldWithValue.java
index 3a7f074a0f..74f6411f73 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/util/HasFieldWithValue.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/HasFieldWithValue.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.util;
 
 import java.lang.reflect.Field;
@@ -13,42 +12,43 @@
 /**
  * A matcher for private field value extraction along with matcher to assert its value.
  *
- * @param <T>   Type of target (actual) object
- * @param <U>   Type of field member (feature) extracted from target object by reflection
+ * @param <T> Type of target (actual) object
+ * @param <U> Type of field member (feature) extracted from target object by reflection
  */
 public class HasFieldWithValue<T, U> extends FeatureMatcher<T, U> {
 
-    private final String fieldName;
-
-    /**
-     * Construct a matcher. Reordered the argument list.
-     *
-     * @param name      Identifying text for mismatch message
-     * @param desc      Descriptive text to use in describeTo
-     * @param matcher   The matcher to apply to the feature
-     */
-    private HasFieldWithValue(String name, String desc, Matcher<? super U> matcher) {
-        super(matcher, desc, name);
-        this.fieldName = name;
-    }
-
-    public static <T, U> HasFieldWithValue<T, U> hasFieldWithValue(String name, String desc, Matcher<? super U> matcher) {
-        return new HasFieldWithValue<>(name, desc, matcher);
-    }
-
-    @Override
-    protected U featureValueOf(T targetObj) {
-        return getFieldValue(targetObj, fieldName);
-    }
-
-    @SuppressWarnings("unchecked")
-    private U getFieldValue(Object obj, String fieldName) {
-        try {
-            Field field = obj.getClass().getDeclaredField(fieldName);
-            field.setAccessible(true);
-            return (U) field.get(obj);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new IllegalArgumentException(e);
-        }
+  private final String fieldName;
+
+  /**
+   * Construct a matcher. Reordered the argument list.
+   *
+   * @param name Identifying text for mismatch message
+   * @param desc Descriptive text to use in describeTo
+   * @param matcher The matcher to apply to the feature
+   */
+  private HasFieldWithValue(String name, String desc, Matcher<? super U> matcher) {
+    super(matcher, desc, name);
+    this.fieldName = name;
+  }
+
+  public static <T, U> HasFieldWithValue<T, U> hasFieldWithValue(
+      String name, String desc, Matcher<? super U> matcher) {
+    return new HasFieldWithValue<>(name, desc, matcher);
+  }
+
+  @Override
+  protected U featureValueOf(T targetObj) {
+    return getFieldValue(targetObj, fieldName);
+  }
+
+  @SuppressWarnings("unchecked")
+  private U getFieldValue(Object obj, String fieldName) {
+    try {
+      Field field = obj.getClass().getDeclaredField(fieldName);
+      field.setAccessible(true);
+      return (U) field.get(obj);
+    } catch (NoSuchFieldException | IllegalAccessException e) {
+      throw new IllegalArgumentException(e);
     }
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/MatcherUtils.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/MatcherUtils.java
index 84f19de58b..0e5f699092 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/util/MatcherUtils.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/MatcherUtils.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.util;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
@@ -17,7 +17,6 @@
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasItems;
 import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
 
 import com.google.common.base.Strings;
 import java.util.ArrayList;
@@ -36,260 +35,266 @@
 
 public class MatcherUtils {
 
-    /**
-     * Assert field value in object by a custom matcher and getter to access the field.
-     *
-     * @param name          description
-     * @param subMatcher    sub-matcher for field
-     * @param getter        getter function to access the field
-     * @param <T>           type of outer object
-     * @param <U>           type of inner field
-     * @return              matcher
-     */
-    public static <T, U> FeatureMatcher<T, U> featureValueOf(String name,
-                                                             Matcher<U> subMatcher,
-                                                             Function<T, U> getter) {
-        return new FeatureMatcher<T, U>(subMatcher, name, name) {
-            @Override
-            protected U featureValueOf(T actual) {
-                return getter.apply(actual);
-            }
-        };
-    }
-
-    @SafeVarargs
-    public static Matcher<SearchHits> hits(Matcher<SearchHit>... hitMatchers) {
-        if (hitMatchers.length == 0) {
-            return featureValueOf("SearchHits", emptyArray(), SearchHits::getHits);
-        }
-        return featureValueOf("SearchHits", arrayContainingInAnyOrder(hitMatchers), SearchHits::getHits);
+  /**
+   * Assert field value in object by a custom matcher and getter to access the field.
+   *
+   * @param name description
+   * @param subMatcher sub-matcher for field
+   * @param getter getter function to access the field
+   * @param <T> type of outer object
+   * @param <U> type of inner field
+   * @return matcher
+   */
+  public static <T, U> FeatureMatcher<T, U> featureValueOf(
+      String name, Matcher<U> subMatcher, Function<T, U> getter) {
+    return new FeatureMatcher<T, U>(subMatcher, name, name) {
+      @Override
+      protected U featureValueOf(T actual) {
+        return getter.apply(actual);
+      }
+    };
+  }
+
+  @SafeVarargs
+  public static Matcher<SearchHits> hits(Matcher<SearchHit>... hitMatchers) {
+    if (hitMatchers.length == 0) {
+      return featureValueOf("SearchHits", emptyArray(), SearchHits::getHits);
     }
-
-    @SafeVarargs
-    public static Matcher<SearchHits> hitsInOrder(Matcher<SearchHit>... hitMatchers) {
-        if (hitMatchers.length == 0) {
-            return featureValueOf("SearchHits", emptyArray(), SearchHits::getHits);
-        }
-        return featureValueOf("SearchHits", arrayContaining(hitMatchers), SearchHits::getHits);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static Matcher<SearchHit> hit(Matcher<Map<String, Object>>... entryMatchers) {
-        return featureValueOf("SearchHit", allOf(entryMatchers), SearchHit::getSourceAsMap);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static Matcher<Map<String, Object>> kv(String key, Object value) {
-        // Use raw type to avoid generic type problem from Matcher<Map<K,V>> to Matcher<String,Object>
-        return (Matcher) hasEntry(key, value);
+    return featureValueOf(
+        "SearchHits", arrayContainingInAnyOrder(hitMatchers), SearchHits::getHits);
+  }
+
+  @SafeVarargs
+  public static Matcher<SearchHits> hitsInOrder(Matcher<SearchHit>... hitMatchers) {
+    if (hitMatchers.length == 0) {
+      return featureValueOf("SearchHits", emptyArray(), SearchHits::getHits);
     }
-
-    public static Matcher<JSONObject> hitAny(String query, Matcher<JSONObject>... matcher) {
-        return featureValueOf("SearchHits", hasItems(matcher), actual -> {
-            JSONArray array = (JSONArray) (actual.query(query));
-            List<JSONObject> results = new ArrayList<>(array.length());
-            for (Object element : array) {
-                results.add((JSONObject) element);
-            }
-            return results;
+    return featureValueOf("SearchHits", arrayContaining(hitMatchers), SearchHits::getHits);
+  }
+
+  @SuppressWarnings("unchecked")
+  public static Matcher<SearchHit> hit(Matcher<Map<String, Object>>... entryMatchers) {
+    return featureValueOf("SearchHit", allOf(entryMatchers), SearchHit::getSourceAsMap);
+  }
+
+  @SuppressWarnings("unchecked")
+  public static Matcher<Map<String, Object>> kv(String key, Object value) {
+    // Use raw type to avoid generic type problem from Matcher<Map<K,V>> to Matcher<String,Object>
+    return (Matcher) hasEntry(key, value);
+  }
+
+  public static Matcher<JSONObject> hitAny(String query, Matcher<JSONObject>... matcher) {
+    return featureValueOf(
+        "SearchHits",
+        hasItems(matcher),
+        actual -> {
+          JSONArray array = (JSONArray) (actual.query(query));
+          List<JSONObject> results = new ArrayList<>(array.length());
+          for (Object element : array) {
+            results.add((JSONObject) element);
+          }
+          return results;
         });
-    }
-
-    public static Matcher<JSONObject> hitAny(Matcher<JSONObject>... matcher) {
-        return hitAny("/hits/hits", matcher);
-    }
-
-    public static Matcher<JSONObject> hitAll(Matcher<JSONObject>... matcher) {
-        return featureValueOf("SearchHits", containsInAnyOrder(matcher), actual -> {
-            JSONArray array = (JSONArray) (actual.query("/hits/hits"));
-            List<JSONObject> results = new ArrayList<>(array.length());
-            for (Object element : array) {
-                results.add((JSONObject) element);
-            }
-            return results;
+  }
+
+  public static Matcher<JSONObject> hitAny(Matcher<JSONObject>... matcher) {
+    return hitAny("/hits/hits", matcher);
+  }
+
+  public static Matcher<JSONObject> hitAll(Matcher<JSONObject>... matcher) {
+    return featureValueOf(
+        "SearchHits",
+        containsInAnyOrder(matcher),
+        actual -> {
+          JSONArray array = (JSONArray) (actual.query("/hits/hits"));
+          List<JSONObject> results = new ArrayList<>(array.length());
+          for (Object element : array) {
+            results.add((JSONObject) element);
+          }
+          return results;
         });
+  }
+
+  public static Matcher<JSONObject> kvString(String key, Matcher<String> matcher) {
+    return featureValueOf("Json Match", matcher, actual -> (String) actual.query(key));
+  }
+
+  public static Matcher<JSONObject> kvDouble(String key, Matcher<Double> matcher) {
+    return featureValueOf("Json Match", matcher, actual -> (Double) actual.query(key));
+  }
+
+  public static Matcher<JSONObject> kvInt(String key, Matcher<Integer> matcher) {
+    return featureValueOf("Json Match", matcher, actual -> (Integer) actual.query(key));
+  }
+
+  @SafeVarargs
+  public static void verifySchema(JSONObject response, Matcher<JSONObject>... matchers) {
+    verify(response.getJSONArray("schema"), matchers);
+  }
+
+  @SafeVarargs
+  public static void verifyDataRows(JSONObject response, Matcher<JSONArray>... matchers) {
+    verify(response.getJSONArray("datarows"), matchers);
+  }
+
+  @SafeVarargs
+  public static void verifyColumn(JSONObject response, Matcher<JSONObject>... matchers) {
+    verify(response.getJSONArray("schema"), matchers);
+  }
+
+  @SafeVarargs
+  public static void verifyOrder(JSONObject response, Matcher<JSONArray>... matchers) {
+    verifyOrder(response.getJSONArray("datarows"), matchers);
+  }
+
+  @SafeVarargs
+  @SuppressWarnings("unchecked")
+  public static void verifyDataRowsInOrder(JSONObject response, Matcher<JSONArray>... matchers) {
+    verifyInOrder(response.getJSONArray("datarows"), matchers);
+  }
+
+  @SuppressWarnings("unchecked")
+  public static <T> void verify(JSONArray array, Matcher<T>... matchers) {
+    List<T> objects = new ArrayList<>();
+    array.iterator().forEachRemaining(o -> objects.add((T) o));
+    assertEquals(matchers.length, objects.size());
+    assertThat(objects, containsInAnyOrder(matchers));
+  }
+
+  @SafeVarargs
+  @SuppressWarnings("unchecked")
+  public static <T> void verifyInOrder(JSONArray array, Matcher<T>... matchers) {
+    List<T> objects = new ArrayList<>();
+    array.iterator().forEachRemaining(o -> objects.add((T) o));
+    assertEquals(matchers.length, objects.size());
+    assertThat(objects, contains(matchers));
+  }
+
+  @SuppressWarnings("unchecked")
+  public static <T> void verifySome(JSONArray array, Matcher<T>... matchers) {
+    List<T> objects = new ArrayList<>();
+    array.iterator().forEachRemaining(o -> objects.add((T) o));
+
+    assertThat(matchers.length, greaterThan(0));
+    for (Matcher<T> matcher : matchers) {
+      assertThat(objects, hasItems(matcher));
     }
-
-    public static Matcher<JSONObject> kvString(String key, Matcher<String> matcher) {
-        return featureValueOf("Json Match", matcher, actual -> (String) actual.query(key));
-    }
-
-    public static Matcher<JSONObject> kvDouble(String key, Matcher<Double> matcher) {
-        return featureValueOf("Json Match", matcher, actual -> (Double) actual.query(key));
+  }
+
+  @SafeVarargs
+  public static <T> void verifyOrder(JSONArray array, Matcher<T>... matchers) {
+    List<T> objects = new ArrayList<>();
+    array.iterator().forEachRemaining(o -> objects.add((T) o));
+    assertEquals(matchers.length, objects.size());
+    assertThat(objects, containsInRelativeOrder(matchers));
+  }
+
+  public static TypeSafeMatcher<JSONObject> schema(
+      String expectedName, String expectedAlias, String expectedType) {
+    return new TypeSafeMatcher<JSONObject>() {
+      @Override
+      public void describeTo(Description description) {
+        description.appendText(
+            String.format(
+                "(name=%s, alias=%s, type=%s)", expectedName, expectedAlias, expectedType));
+      }
+
+      @Override
+      protected boolean matchesSafely(JSONObject jsonObject) {
+        String actualName = (String) jsonObject.query("/name");
+        String actualAlias = (String) jsonObject.query("/alias");
+        String actualType = (String) jsonObject.query("/type");
+        return expectedName.equals(actualName)
+            && (Strings.isNullOrEmpty(actualAlias) && Strings.isNullOrEmpty(expectedAlias)
+                || expectedAlias.equals(actualAlias))
+            && expectedType.equals(actualType);
+      }
+    };
+  }
+
+  public static TypeSafeMatcher<JSONArray> rows(Object... expectedObjects) {
+    return new TypeSafeMatcher<JSONArray>() {
+      @Override
+      public void describeTo(Description description) {
+        description.appendText(String.join(",", Arrays.asList(expectedObjects).toString()));
+      }
+
+      @Override
+      protected boolean matchesSafely(JSONArray array) {
+        List<Object> actualObjects = new ArrayList<>();
+        array.iterator().forEachRemaining(actualObjects::add);
+        return Arrays.asList(expectedObjects).equals(actualObjects);
+      }
+    };
+  }
+
+  public static TypeSafeMatcher<JSONObject> columnPattern(String regex) {
+    return new TypeSafeMatcher<JSONObject>() {
+      @Override
+      protected boolean matchesSafely(JSONObject jsonObject) {
+        return ((String) jsonObject.query("/name")).matches(regex);
+      }
+
+      @Override
+      public void describeTo(Description description) {
+        description.appendText(String.format("(column_pattern=%s)", regex));
+      }
+    };
+  }
+
+  public static TypeSafeMatcher<JSONObject> columnName(String name) {
+    return new TypeSafeMatcher<JSONObject>() {
+      @Override
+      protected boolean matchesSafely(JSONObject jsonObject) {
+        return jsonObject.query("/name").equals(name);
+      }
+
+      @Override
+      public void describeTo(Description description) {
+        description.appendText(String.format("(name=%s)", name));
+      }
+    };
+  }
+
+  /** Tests if a string is equal to another string, ignore the case and whitespace. */
+  public static class IsEqualIgnoreCaseAndWhiteSpace extends TypeSafeMatcher<String> {
+    private final String string;
+
+    public IsEqualIgnoreCaseAndWhiteSpace(String string) {
+      if (string == null) {
+        throw new IllegalArgumentException("Non-null value required");
+      }
+      this.string = string;
     }
 
-    public static Matcher<JSONObject> kvInt(String key, Matcher<Integer> matcher) {
-        return featureValueOf("Json Match", matcher, actual -> (Integer) actual.query(key));
+    @Override
+    public boolean matchesSafely(String item) {
+      return ignoreCase(ignoreSpaces(string)).equals(ignoreCase(ignoreSpaces(item)));
     }
 
-    @SafeVarargs
-    public static void verifySchema(JSONObject response, Matcher<JSONObject>... matchers) {
-        verify(response.getJSONArray("schema"), matchers);
+    @Override
+    public void describeMismatchSafely(String item, Description mismatchDescription) {
+      mismatchDescription.appendText("was ").appendValue(item);
     }
 
-    @SafeVarargs
-    public static void verifyDataRows(JSONObject response, Matcher<JSONArray>... matchers) {
-        verify(response.getJSONArray("datarows"), matchers);
+    @Override
+    public void describeTo(Description description) {
+      description
+          .appendText("a string equal to ")
+          .appendValue(string)
+          .appendText(" ignore case and white space");
     }
 
-    @SafeVarargs
-    public static void verifyColumn(JSONObject response, Matcher<JSONObject>... matchers) {
-        verify(response.getJSONArray("schema"), matchers);
+    public String ignoreSpaces(String toBeStripped) {
+      return toBeStripped.replaceAll("\\s+", "").trim();
     }
 
-    @SafeVarargs
-    public static void verifyOrder(JSONObject response, Matcher<JSONArray>... matchers) {
-        verifyOrder(response.getJSONArray("datarows"), matchers);
+    public String ignoreCase(String toBeLower) {
+      return toBeLower.toLowerCase();
     }
 
-    @SafeVarargs
-    @SuppressWarnings("unchecked")
-    public static void verifyDataRowsInOrder(JSONObject response, Matcher<JSONArray>... matchers) {
-        verifyInOrder(response.getJSONArray("datarows"), matchers);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> void verify(JSONArray array, Matcher<T>... matchers) {
-        List<T> objects = new ArrayList<>();
-        array.iterator().forEachRemaining(o -> objects.add((T) o));
-        assertEquals(matchers.length, objects.size());
-        assertThat(objects, containsInAnyOrder(matchers));
-    }
-
-    @SafeVarargs
-    @SuppressWarnings("unchecked")
-    public static <T> void verifyInOrder(JSONArray array, Matcher<T>... matchers) {
-        List<T> objects = new ArrayList<>();
-        array.iterator().forEachRemaining(o -> objects.add((T) o));
-        assertEquals(matchers.length, objects.size());
-        assertThat(objects, contains(matchers));
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> void verifySome(JSONArray array, Matcher<T>... matchers) {
-        List<T> objects = new ArrayList<>();
-        array.iterator().forEachRemaining(o -> objects.add((T) o));
-
-        assertThat(matchers.length, greaterThan(0));
-        for (Matcher<T> matcher : matchers) {
-            assertThat(objects, hasItems(matcher));
-        }
-    }
-
-    @SafeVarargs
-    public static <T> void verifyOrder(JSONArray array, Matcher<T>... matchers) {
-        List<T> objects = new ArrayList<>();
-        array.iterator().forEachRemaining(o -> objects.add((T) o));
-        assertEquals(matchers.length, objects.size());
-        assertThat(objects, containsInRelativeOrder(matchers));
-    }
-
-    public static TypeSafeMatcher<JSONObject> schema(String expectedName, String expectedAlias, String expectedType) {
-        return new TypeSafeMatcher<JSONObject>() {
-            @Override
-            public void describeTo(Description description) {
-                description.appendText(
-                        String.format("(name=%s, alias=%s, type=%s)", expectedName, expectedAlias, expectedType));
-            }
-
-            @Override
-            protected boolean matchesSafely(JSONObject jsonObject) {
-                String actualName = (String) jsonObject.query("/name");
-                String actualAlias = (String) jsonObject.query("/alias");
-                String actualType = (String) jsonObject.query("/type");
-                return expectedName.equals(actualName) &&
-                       (Strings.isNullOrEmpty(actualAlias) && Strings.isNullOrEmpty(expectedAlias) ||
-                        expectedAlias.equals(actualAlias)) &&
-                       expectedType.equals(actualType);
-            }
-        };
-    }
-
-    public static TypeSafeMatcher<JSONArray> rows(Object... expectedObjects) {
-        return new TypeSafeMatcher<JSONArray>() {
-            @Override
-            public void describeTo(Description description) {
-                description.appendText(String.join(",", Arrays.asList(expectedObjects).toString()));
-            }
-
-            @Override
-            protected boolean matchesSafely(JSONArray array) {
-                List<Object> actualObjects = new ArrayList<>();
-                array.iterator().forEachRemaining(actualObjects::add);
-                return Arrays.asList(expectedObjects).equals(actualObjects);
-            }
-        };
-    }
-
-    public static TypeSafeMatcher<JSONObject> columnPattern(String regex) {
-        return new TypeSafeMatcher<JSONObject>() {
-            @Override
-            protected boolean matchesSafely(JSONObject jsonObject) {
-                return ((String)jsonObject.query("/name")).matches(regex);
-            }
-            
-            @Override
-            public void describeTo(Description description) {
-                description.appendText(String.format("(column_pattern=%s)", regex));
-            }
-        };
-    }
-    
-    public static TypeSafeMatcher<JSONObject> columnName(String name) {
-        return new TypeSafeMatcher<JSONObject>() {
-            @Override
-            protected boolean matchesSafely(JSONObject jsonObject) {
-                return jsonObject.query("/name").equals(name);
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendText(String.format("(name=%s)", name));
-            }
-        };
-    }
-
-
-    /**
-     * Tests if a string is equal to another string, ignore the case and whitespace.
-     */
-    public static class IsEqualIgnoreCaseAndWhiteSpace extends TypeSafeMatcher<String> {
-        private final String string;
-
-        public IsEqualIgnoreCaseAndWhiteSpace(String string) {
-            if (string == null) {
-                throw new IllegalArgumentException("Non-null value required");
-            }
-            this.string = string;
-        }
-
-        @Override
-        public boolean matchesSafely(String item) {
-            return ignoreCase(ignoreSpaces(string)).equals(ignoreCase(ignoreSpaces(item)));
-        }
-
-        @Override
-        public void describeMismatchSafely(String item, Description mismatchDescription) {
-            mismatchDescription.appendText("was ").appendValue(item);
-        }
-
-        @Override
-        public void describeTo(Description description) {
-            description.appendText("a string equal to ")
-                    .appendValue(string)
-                    .appendText(" ignore case and white space");
-        }
-
-        public String ignoreSpaces(String toBeStripped) {
-            return toBeStripped.replaceAll("\\s+", "").trim();
-        }
-
-        public String ignoreCase(String toBeLower) {
-            return toBeLower.toLowerCase();
-        }
-
-        public static Matcher<String> equalToIgnoreCaseAndWhiteSpace(String expectedString) {
-            return new IsEqualIgnoreCaseAndWhiteSpace(expectedString);
-        }
+    public static Matcher<String> equalToIgnoreCaseAndWhiteSpace(String expectedString) {
+      return new IsEqualIgnoreCaseAndWhiteSpace(expectedString);
     }
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/MultipleIndexClusterUtils.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/MultipleIndexClusterUtils.java
index 0213cac01b..b483ef0852 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/util/MultipleIndexClusterUtils.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/MultipleIndexClusterUtils.java
@@ -3,195 +3,208 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.util;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.opensearch.sql.legacy.util.CheckScriptContents.createParser;
-import static org.opensearch.sql.legacy.util.CheckScriptContents.mockIndexNameExpressionResolver;
 import static org.opensearch.sql.legacy.util.CheckScriptContents.mockPluginSettings;
 
-import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
 import java.util.Map;
-import org.opensearch.cluster.ClusterState;
+import java.util.stream.Collectors;
+import lombok.SneakyThrows;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
+import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.MappingMetadata;
-import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
 
-/**
- * Test Utility which provide the cluster have 2 indices.
- */
+/** Test Utility which provide the cluster have 2 indices. */
 public class MultipleIndexClusterUtils {
-    public final static String INDEX_ACCOUNT_1 = "account1";
-    public final static String INDEX_ACCOUNT_2 = "account2";
-    public final static String INDEX_ACCOUNT_ALL = "account*";
+  public static final String INDEX_ACCOUNT_1 = "account1";
+  public static final String INDEX_ACCOUNT_2 = "account2";
+  public static final String INDEX_ACCOUNT_ALL = "account*";
 
-    public static String INDEX_ACCOUNT_1_MAPPING = "{\n" +
-            "  \"field_mappings\": {\n" +
-            "    \"mappings\": {\n" +
-            "      \"account1\": {\n" +
-            "        \"properties\": {\n" +
-            "          \"id\": {\n" +
-            "            \"type\": \"long\"\n" +
-            "          },\n" +
-            "          \"address\": {\n" +
-            "            \"type\": \"text\",\n" +
-            "            \"fields\": {\n" +
-            "              \"keyword\": {\n" +
-            "                \"type\": \"keyword\"\n" +
-            "              }\n" +
-            "            },\n" +
-            "            \"fielddata\": true\n" +
-            "          },\n" +
-            "          \"age\": {\n" +
-            "            \"type\": \"integer\"\n" +
-            "          },\n" +
-            "          \"projects\": {\n" +
-            "            \"type\": \"nested\",\n" +
-            "            \"properties\": {\n" +
-            "              \"name\": {\n" +
-            "                \"type\": \"text\",\n" +
-            "                \"fields\": {\n" +
-            "                  \"keyword\": {\n" +
-            "                    \"type\": \"keyword\"\n" +
-            "                  }\n" +
-            "                },\n" +
-            "                \"fielddata\": true\n" +
-            "              },\n" +
-            "              \"started_year\": {\n" +
-            "                \"type\": \"int\"\n" +
-            "              }\n" +
-            "            }\n" +
-            "          }\n" +
-            "        }\n" +
-            "      }\n" +
-            "    },\n" +
-            "    \"settings\": {\n" +
-            "      \"index\": {\n" +
-            "        \"number_of_shards\": 1,\n" +
-            "        \"number_of_replicas\": 0,\n" +
-            "        \"version\": {\n" +
-            "          \"created\": \"6050399\"\n" +
-            "        }\n" +
-            "      }\n" +
-            "    },\n" +
-            "    \"mapping_version\": \"1\",\n" +
-            "    \"settings_version\": \"1\"\n" +
-            "  }\n" +
-            "}";
+  public static String INDEX_ACCOUNT_1_MAPPING =
+      "{\n"
+          + "  \"field_mappings\": {\n"
+          + "    \"mappings\": {\n"
+          + "      \"account1\": {\n"
+          + "        \"properties\": {\n"
+          + "          \"id\": {\n"
+          + "            \"type\": \"long\"\n"
+          + "          },\n"
+          + "          \"address\": {\n"
+          + "            \"type\": \"text\",\n"
+          + "            \"fields\": {\n"
+          + "              \"keyword\": {\n"
+          + "                \"type\": \"keyword\"\n"
+          + "              }\n"
+          + "            },\n"
+          + "            \"fielddata\": true\n"
+          + "          },\n"
+          + "          \"age\": {\n"
+          + "            \"type\": \"integer\"\n"
+          + "          },\n"
+          + "          \"projects\": {\n"
+          + "            \"type\": \"nested\",\n"
+          + "            \"properties\": {\n"
+          + "              \"name\": {\n"
+          + "                \"type\": \"text\",\n"
+          + "                \"fields\": {\n"
+          + "                  \"keyword\": {\n"
+          + "                    \"type\": \"keyword\"\n"
+          + "                  }\n"
+          + "                },\n"
+          + "                \"fielddata\": true\n"
+          + "              },\n"
+          + "              \"started_year\": {\n"
+          + "                \"type\": \"int\"\n"
+          + "              }\n"
+          + "            }\n"
+          + "          }\n"
+          + "        }\n"
+          + "      }\n"
+          + "    },\n"
+          + "    \"settings\": {\n"
+          + "      \"index\": {\n"
+          + "        \"number_of_shards\": 1,\n"
+          + "        \"number_of_replicas\": 0,\n"
+          + "        \"version\": {\n"
+          + "          \"created\": \"6050399\"\n"
+          + "        }\n"
+          + "      }\n"
+          + "    },\n"
+          + "    \"mapping_version\": \"1\",\n"
+          + "    \"settings_version\": \"1\"\n"
+          + "  }\n"
+          + "}";
 
-    /**
-     * The difference with account1.
-     * 1. missing address.
-     * 2. age has different type.
-     * 3. projects.started_year has different type.
-     */
-    public static String INDEX_ACCOUNT_2_MAPPING = "{\n" +
-            "  \"field_mappings\": {\n" +
-            "    \"mappings\": {\n" +
-            "      \"account2\": {\n" +
-            "        \"properties\": {\n" +
-            "          \"id\": {\n" +
-            "            \"type\": \"long\"\n" +
-            "          },\n" +
-            "          \"age\": {\n" +
-            "            \"type\": \"long\"\n" +
-            "          },\n" +
-            "          \"projects\": {\n" +
-            "            \"type\": \"nested\",\n" +
-            "            \"properties\": {\n" +
-            "              \"name\": {\n" +
-            "                \"type\": \"text\",\n" +
-            "                \"fields\": {\n" +
-            "                  \"keyword\": {\n" +
-            "                    \"type\": \"keyword\"\n" +
-            "                  }\n" +
-            "                },\n" +
-            "                \"fielddata\": true\n" +
-            "              },\n" +
-            "              \"started_year\": {\n" +
-            "                \"type\": \"long\"\n" +
-            "              }\n" +
-            "            }\n" +
-            "          }\n" +
-            "        }\n" +
-            "      }\n" +
-            "    },\n" +
-            "    \"settings\": {\n" +
-            "      \"index\": {\n" +
-            "        \"number_of_shards\": 1,\n" +
-            "        \"number_of_replicas\": 0,\n" +
-            "        \"version\": {\n" +
-            "          \"created\": \"6050399\"\n" +
-            "        }\n" +
-            "      }\n" +
-            "    },\n" +
-            "    \"mapping_version\": \"1\",\n" +
-            "    \"settings_version\": \"1\"\n" +
-            "  }\n" +
-            "}";
+  /**
+   * The difference with account1. 1. missing address. 2. age has different type. 3.
+   * projects.started_year has different type.
+   */
+  public static String INDEX_ACCOUNT_2_MAPPING =
+      "{\n"
+          + "  \"field_mappings\": {\n"
+          + "    \"mappings\": {\n"
+          + "      \"account2\": {\n"
+          + "        \"properties\": {\n"
+          + "          \"id\": {\n"
+          + "            \"type\": \"long\"\n"
+          + "          },\n"
+          + "          \"age\": {\n"
+          + "            \"type\": \"long\"\n"
+          + "          },\n"
+          + "          \"projects\": {\n"
+          + "            \"type\": \"nested\",\n"
+          + "            \"properties\": {\n"
+          + "              \"name\": {\n"
+          + "                \"type\": \"text\",\n"
+          + "                \"fields\": {\n"
+          + "                  \"keyword\": {\n"
+          + "                    \"type\": \"keyword\"\n"
+          + "                  }\n"
+          + "                },\n"
+          + "                \"fielddata\": true\n"
+          + "              },\n"
+          + "              \"started_year\": {\n"
+          + "                \"type\": \"long\"\n"
+          + "              }\n"
+          + "            }\n"
+          + "          }\n"
+          + "        }\n"
+          + "      }\n"
+          + "    },\n"
+          + "    \"settings\": {\n"
+          + "      \"index\": {\n"
+          + "        \"number_of_shards\": 1,\n"
+          + "        \"number_of_replicas\": 0,\n"
+          + "        \"version\": {\n"
+          + "          \"created\": \"6050399\"\n"
+          + "        }\n"
+          + "      }\n"
+          + "    },\n"
+          + "    \"mapping_version\": \"1\",\n"
+          + "    \"settings_version\": \"1\"\n"
+          + "  }\n"
+          + "}";
 
-    public static void mockMultipleIndexEnv() {
-        mockLocalClusterState(new ImmutableMap.Builder<String, ImmutableOpenMap<String, MappingMetadata>>()
-                .put(INDEX_ACCOUNT_1, buildIndexMapping(INDEX_ACCOUNT_1, INDEX_ACCOUNT_1_MAPPING))
-                .put(INDEX_ACCOUNT_2, buildIndexMapping(INDEX_ACCOUNT_2, INDEX_ACCOUNT_2_MAPPING))
-                .put(INDEX_ACCOUNT_ALL, buildIndexMapping(new ImmutableMap.Builder<String, String>()
-                        .put(INDEX_ACCOUNT_1, INDEX_ACCOUNT_1_MAPPING)
-                        .put(INDEX_ACCOUNT_2, INDEX_ACCOUNT_2_MAPPING)
-                        .build()))
-                .build());
-    }
+  public static void mockMultipleIndexEnv() {
+    mockLocalClusterState(
+        Map.of(
+            INDEX_ACCOUNT_1,
+            buildIndexMapping(INDEX_ACCOUNT_1, INDEX_ACCOUNT_1_MAPPING),
+            INDEX_ACCOUNT_2,
+            buildIndexMapping(INDEX_ACCOUNT_2, INDEX_ACCOUNT_2_MAPPING),
+            INDEX_ACCOUNT_ALL,
+            buildIndexMapping(
+                Map.of(
+                    INDEX_ACCOUNT_1,
+                    INDEX_ACCOUNT_1_MAPPING,
+                    INDEX_ACCOUNT_2,
+                    INDEX_ACCOUNT_2_MAPPING))));
+  }
 
-    public static void mockLocalClusterState(Map<String, ImmutableOpenMap<String,MappingMetadata>> indexMapping) {
-        LocalClusterState.state().setClusterService(mockClusterService(indexMapping));
-        LocalClusterState.state().setResolver(mockIndexNameExpressionResolver());
-        LocalClusterState.state().setPluginSettings(mockPluginSettings());
-    }
+  @SneakyThrows
+  public static void mockLocalClusterState(Map<String, Map<String, MappingMetadata>> indexMapping) {
 
+    Client client = Mockito.mock(Client.class, Mockito.RETURNS_DEEP_STUBS);
 
-    public static ClusterService mockClusterService(Map<String, ImmutableOpenMap<String,MappingMetadata>> indexMapping) {
-        ClusterService mockService = mock(ClusterService.class);
-        ClusterState mockState = mock(ClusterState.class);
-        Metadata mockMetaData = mock(Metadata.class);
+    ThreadLocal<String> callerIndexExpression = new ThreadLocal<>();
+    ArgumentMatcher<Object> preserveIndexMappingsFromCaller =
+        arg -> {
+          callerIndexExpression.set((String) arg);
+          return true;
+        };
+    Answer<Map<String, MappingMetadata>> getIndexMappingsForCaller =
+        invoke -> {
+          return indexMapping.get(callerIndexExpression.get());
+        };
 
-        when(mockService.state()).thenReturn(mockState);
-        when(mockState.metadata()).thenReturn(mockMetaData);
-        try {
-            for (Map.Entry<String, ImmutableOpenMap<String, MappingMetadata>> entry : indexMapping.entrySet()) {
-                when(mockMetaData.findMappings(eq(new String[]{entry.getKey()}), any())).thenReturn(entry.getValue());
-            }
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-        return mockService;
-    }
+    when(client
+            .admin()
+            .indices()
+            .prepareGetMappings((String[]) argThat(preserveIndexMappingsFromCaller))
+            .setLocal(anyBoolean())
+            .setIndicesOptions(any())
+            .execute()
+            .actionGet(anyLong(), any())
+            .mappings())
+        .thenAnswer(getIndexMappingsForCaller);
 
-    private static ImmutableOpenMap<String, MappingMetadata> buildIndexMapping(Map<String, String> indexMapping) {
-        try {
-            ImmutableOpenMap.Builder<String, MappingMetadata> builder = ImmutableOpenMap.builder();
-            for (Map.Entry<String, String> entry : indexMapping.entrySet()) {
-                builder.put(entry.getKey(), IndexMetadata.fromXContent(createParser(entry.getValue())).mapping());
-            }
-            return builder.build();
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-    }
+    LocalClusterState.state().setClusterService(mock(ClusterService.class));
+    LocalClusterState.state().setPluginSettings(mockPluginSettings());
+    LocalClusterState.state().setClient(client);
+  }
+
+  private static Map<String, MappingMetadata> buildIndexMapping(Map<String, String> indexMapping) {
+    return indexMapping.entrySet().stream()
+        .collect(
+            Collectors.toUnmodifiableMap(
+                Map.Entry::getKey,
+                e -> {
+                  try {
+                    return IndexMetadata.fromXContent(createParser(e.getValue())).mapping();
+                  } catch (IOException ex) {
+                    throw new IllegalStateException(ex);
+                  }
+                }));
+  }
 
-    private static ImmutableOpenMap<String, MappingMetadata> buildIndexMapping(String index, String mapping) {
-        try {
-            ImmutableOpenMap.Builder<String, MappingMetadata> builder = ImmutableOpenMap.builder();
-            builder.put(index, IndexMetadata.fromXContent(createParser(mapping)).mapping());
-            return builder.build();
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
+  private static Map<String, MappingMetadata> buildIndexMapping(String index, String mapping) {
+    try {
+      return Map.of(index, IndexMetadata.fromXContent(createParser(mapping)).mapping());
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
     }
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlExplainUtils.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlExplainUtils.java
index 6228b971e2..3ad1cae211 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlExplainUtils.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlExplainUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.util;
 
 import com.alibaba.druid.sql.parser.ParserException;
@@ -15,22 +14,20 @@
 import org.opensearch.sql.legacy.query.OpenSearchActionFactory;
 import org.opensearch.sql.legacy.query.QueryAction;
 
-/**
- * Test utils class that explains a query
- */
+/** Test utils class that explains a query */
 public class SqlExplainUtils {
 
-    public static String explain(String query) {
-        try {
-            Client mockClient = Mockito.mock(Client.class);
-            CheckScriptContents.stubMockClient(mockClient);
-            QueryAction queryAction = OpenSearchActionFactory.create(mockClient, query);
+  public static String explain(String query) {
+    try {
+      Client mockClient = Mockito.mock(Client.class);
+      CheckScriptContents.stubMockClient(mockClient);
+      QueryAction queryAction = OpenSearchActionFactory.create(mockClient, query);
 
-            return queryAction.explain().explain();
-        } catch (SqlParseException | SQLFeatureNotSupportedException | SQLFeatureDisabledException e) {
-            throw new ParserException("Illegal sql expr in: " + query);
-        }
+      return queryAction.explain().explain();
+    } catch (SqlParseException | SQLFeatureNotSupportedException | SQLFeatureDisabledException e) {
+      throw new ParserException("Illegal sql expr in: " + query);
     }
+  }
 
-    private SqlExplainUtils() {}
+  private SqlExplainUtils() {}
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlParserUtils.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlParserUtils.java
index a1c023cbff..90ccc705fd 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlParserUtils.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlParserUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.util;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -13,24 +12,23 @@
 import org.opensearch.sql.legacy.parser.ElasticSqlExprParser;
 import org.opensearch.sql.legacy.rewriter.parent.SQLExprParentSetter;
 
-/**
- * Test utils class include all SQLExpr related method.
- */
+/** Test utils class include all SQLExpr related method. */
 public class SqlParserUtils {
 
-    /**
-     * Parse sql with {@link ElasticSqlExprParser}
-     * @param sql sql
-     * @return {@link SQLQueryExpr}
-     */
-    public static SQLQueryExpr parse(String sql) {
-        ElasticSqlExprParser parser = new ElasticSqlExprParser(sql);
-        SQLExpr expr = parser.expr();
-        if (parser.getLexer().token() != Token.EOF) {
-            throw new ParserException("Illegal sql: " + sql);
-        }
-        SQLQueryExpr queryExpr = (SQLQueryExpr) expr;
-        queryExpr.accept(new SQLExprParentSetter());
-        return (SQLQueryExpr) expr;
+  /**
+   * Parse sql with {@link ElasticSqlExprParser}
+   *
+   * @param sql sql
+   * @return {@link SQLQueryExpr}
+   */
+  public static SQLQueryExpr parse(String sql) {
+    ElasticSqlExprParser parser = new ElasticSqlExprParser(sql);
+    SQLExpr expr = parser.expr();
+    if (parser.getLexer().token() != Token.EOF) {
+      throw new ParserException("Illegal sql: " + sql);
     }
+    SQLQueryExpr queryExpr = (SQLQueryExpr) expr;
+    queryExpr.accept(new SQLExprParentSetter());
+    return (SQLQueryExpr) expr;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/TestUtils.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/TestUtils.java
index 27be512fc0..ab9a0ded14 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/util/TestUtils.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/TestUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.util;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
@@ -36,792 +35,809 @@
 
 public class TestUtils {
 
-    /**
-     * Create test index by REST client.
-     * @param client        client connection
-     * @param indexName     test index name
-     * @param mapping       test index mapping or null if no predefined mapping
-     */
-    public static void createIndexByRestClient(RestClient client, String indexName, String mapping) {
-        Request request = new Request("PUT", "/" + indexName);
-        if (!isNullOrEmpty(mapping)) {
-            request.setJsonEntity(mapping);
-        }
-        performRequest(client, request);
-    }
-
-    /**
-     * https://github.com/elastic/elasticsearch/pull/49959
-     * Deprecate creation of dot-prefixed index names except for hidden and system indices.
-     * Create hidden index by REST client.
-     * @param client        client connection
-     * @param indexName     test index name
-     * @param mapping       test index mapping or null if no predefined mapping
-     */
-    public static void createHiddenIndexByRestClient(RestClient client, String indexName, String mapping) {
-        Request request = new Request("PUT", "/" + indexName);
-        JSONObject jsonObject = isNullOrEmpty(mapping) ? new JSONObject() : new JSONObject(mapping);
-        jsonObject.put("settings", new JSONObject("{\"index\":{\"hidden\":true}}"));
-        request.setJsonEntity(jsonObject.toString());
-
-        performRequest(client, request);
+  /**
+   * Create test index by REST client.
+   *
+   * @param client client connection
+   * @param indexName test index name
+   * @param mapping test index mapping or null if no predefined mapping
+   */
+  public static void createIndexByRestClient(RestClient client, String indexName, String mapping) {
+    Request request = new Request("PUT", "/" + indexName);
+    if (!isNullOrEmpty(mapping)) {
+      request.setJsonEntity(mapping);
     }
-
-    /**
-     * Check if index already exists by OpenSearch index exists API which returns:
-     *  200 - specified indices or aliases exist
-     *  404 - one or more indices specified or aliases do not exist
-     * @param client        client connection
-     * @param indexName     index name
-     * @return              true for index exist
-     */
-    public static boolean isIndexExist(RestClient client, String indexName) {
-        try {
-            Response response = client.performRequest(new Request("HEAD", "/" + indexName));
-            return (response.getStatusLine().getStatusCode() == 200);
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to perform request", e);
-        }
+    performRequest(client, request);
+  }
+
+  /**
+   * https://github.com/elastic/elasticsearch/pull/49959 Deprecate creation of dot-prefixed index
+   * names except for hidden and system indices. Create hidden index by REST client.
+   *
+   * @param client client connection
+   * @param indexName test index name
+   * @param mapping test index mapping or null if no predefined mapping
+   */
+  public static void createHiddenIndexByRestClient(
+      RestClient client, String indexName, String mapping) {
+    Request request = new Request("PUT", "/" + indexName);
+    JSONObject jsonObject = isNullOrEmpty(mapping) ? new JSONObject() : new JSONObject(mapping);
+    jsonObject.put("settings", new JSONObject("{\"index\":{\"hidden\":true}}"));
+    request.setJsonEntity(jsonObject.toString());
+
+    performRequest(client, request);
+  }
+
+  /**
+   * Check if index already exists by OpenSearch index exists API which returns: 200 - specified
+   * indices or aliases exist 404 - one or more indices specified or aliases do not exist
+   *
+   * @param client client connection
+   * @param indexName index name
+   * @return true for index exist
+   */
+  public static boolean isIndexExist(RestClient client, String indexName) {
+    try {
+      Response response = client.performRequest(new Request("HEAD", "/" + indexName));
+      return (response.getStatusLine().getStatusCode() == 200);
+    } catch (IOException e) {
+      throw new IllegalStateException("Failed to perform request", e);
     }
-
-    /**
-     * Load test data set by REST client.
-     * @param client            client connection
-     * @param indexName         index name
-     * @param dataSetFilePath   file path of test data set
-     * @throws IOException
-     */
-    public static void loadDataByRestClient(RestClient client, String indexName, String dataSetFilePath) throws IOException {
-        Path path = Paths.get(getResourceFilePath(dataSetFilePath));
-        Request request = new Request("POST", "/" + indexName + "/_bulk?refresh=true");
-        request.setJsonEntity(new String(Files.readAllBytes(path)));
-        performRequest(client, request);
+  }
+
+  /**
+   * Load test data set by REST client.
+   *
+   * @param client client connection
+   * @param indexName index name
+   * @param dataSetFilePath file path of test data set
+   * @throws IOException
+   */
+  public static void loadDataByRestClient(
+      RestClient client, String indexName, String dataSetFilePath) throws IOException {
+    Path path = Paths.get(getResourceFilePath(dataSetFilePath));
+    Request request = new Request("POST", "/" + indexName + "/_bulk?refresh=true");
+    request.setJsonEntity(new String(Files.readAllBytes(path)));
+    performRequest(client, request);
+  }
+
+  /**
+   * Perform a request by REST client.
+   *
+   * @param client client connection
+   * @param request request object
+   */
+  public static Response performRequest(RestClient client, Request request) {
+    try {
+      Response response = client.performRequest(request);
+      int status = response.getStatusLine().getStatusCode();
+      if (status >= 400) {
+        throw new IllegalStateException("Failed to perform request. Error code: " + status);
+      }
+      return response;
+    } catch (IOException e) {
+      throw new IllegalStateException("Failed to perform request", e);
     }
-
-    /**
-     * Perform a request by REST client.
-     * @param client    client connection
-     * @param request   request object
-     */
-    public static Response performRequest(RestClient client, Request request) {
-        try {
-            Response response = client.performRequest(request);
-            int status = response.getStatusLine().getStatusCode();
-            if (status >= 400) {
-                throw new IllegalStateException("Failed to perform request. Error code: " + status);
-            }
-            return response;
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to perform request", e);
+  }
+
+  public static String getAccountIndexMapping() {
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"gender\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          },"
+        + "          \"address\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          },"
+        + "          \"firstname\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true,\n"
+        + "            \"fields\": {\n"
+        + "              \"keyword\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"ignore_above\": 256\n"
+        + "              }"
+        + "            }"
+        + "          },"
+        + "          \"lastname\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true,\n"
+        + "            \"fields\": {\n"
+        + "              \"keyword\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"ignore_above\": 256\n"
+        + "              }"
+        + "            }"
+        + "          },"
+        + "          \"state\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true,\n"
+        + "            \"fields\": {\n"
+        + "              \"keyword\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"ignore_above\": 256\n"
+        + "              }"
+        + "            }"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
+  }
+
+  public static String getPhraseIndexMapping() {
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"phrase\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"store\": true\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
+  }
+
+  public static String getDogIndexMapping() {
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"dog_name\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
+  }
+
+  public static String getDogs2IndexMapping() {
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"dog_name\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          },\n"
+        + "          \"holdersName\": {\n"
+        + "            \"type\": \"keyword\"\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
+  }
+
+  public static String getDogs3IndexMapping() {
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"holdersName\": {\n"
+        + "            \"type\": \"keyword\"\n"
+        + "          },\n"
+        + "          \"color\": {\n"
+        + "            \"type\": \"text\"\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
+  }
+
+  public static String getPeople2IndexMapping() {
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"firstname\": {\n"
+        + "            \"type\": \"keyword\"\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
+  }
+
+  public static String getGameOfThronesIndexMapping() {
+    return "{  \"mappings\": { "
+        + "    \"properties\": {\n"
+        + "      \"nickname\": {\n"
+        + "        \"type\":\"text\", "
+        + "        \"fielddata\":true"
+        + "      },\n"
+        + "      \"name\": {\n"
+        + "        \"properties\": {\n"
+        + "          \"firstname\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          },\n"
+        + "          \"lastname\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fielddata\": true\n"
+        + "          },\n"
+        + "          \"ofHerName\": {\n"
+        + "            \"type\": \"integer\"\n"
+        + "          },\n"
+        + "          \"ofHisName\": {\n"
+        + "            \"type\": \"integer\"\n"
+        + "          }\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"house\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\"\n"
+        + "          }\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"gender\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\"\n"
+        + "          }\n"
+        + "        }\n"
+        + "      }"
+        + "} } }";
+  }
+
+  // System
+
+  public static String getOdbcIndexMapping() {
+    return "{\n"
+        + "\t\"mappings\" :{\n"
+        + "\t\t\"properties\":{\n"
+        + "\t\t\t\"odbc_time\":{\n"
+        + "\t\t\t\t\"type\":\"date\",\n"
+        + "\t\t\t\t\"format\": \"'{ts' ''yyyy-MM-dd HH:mm:ss.SSS'''}'\"\n"
+        + "\t\t\t},\n"
+        + "\t\t\t\"docCount\":{\n"
+        + "\t\t\t\t\"type\":\"text\"\n"
+        + "\t\t\t}\n"
+        + "\t\t}\n"
+        + "\t}\n"
+        + "}";
+  }
+
+  public static String getLocationIndexMapping() {
+    return "{\n"
+        + "\t\"mappings\" :{\n"
+        + "\t\t\"properties\":{\n"
+        + "\t\t\t\"place\":{\n"
+        + "\t\t\t\t\"type\":\"geo_shape\"\n"
+        +
+        // "\t\t\t\t\"tree\": \"quadtree\",\n" + // Field tree and precision are deprecated in
+        // OpenSearch
+        // "\t\t\t\t\"precision\": \"10km\"\n" +
+        "\t\t\t},\n"
+        + "\t\t\t\"center\":{\n"
+        + "\t\t\t\t\"type\":\"geo_point\"\n"
+        + "\t\t\t},\n"
+        + "\t\t\t\"description\":{\n"
+        + "\t\t\t\t\"type\":\"text\"\n"
+        + "\t\t\t}\n"
+        + "\t\t}\n"
+        + "\t}\n"
+        + "}";
+  }
+
+  public static String getEmployeeNestedTypeIndexMapping() {
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"comments\": {\n"
+        + "        \"type\": \"nested\",\n"
+        + "        \"properties\": {\n"
+        + "          \"date\": {\n"
+        + "            \"type\": \"date\"\n"
+        + "          },\n"
+        + "          \"likes\": {\n"
+        + "            \"type\": \"long\"\n"
+        + "          },\n"
+        + "          \"message\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fields\": {\n"
+        + "              \"keyword\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"ignore_above\": 256\n"
+        + "              }\n"
+        + "            }\n"
+        + "          }\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"id\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"name\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\",\n"
+        + "            \"ignore_above\": 256\n"
+        + "          }\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"projects\": {\n"
+        + "        \"type\": \"nested\",\n"
+        + "        \"properties\": {\n"
+        + "          \"address\": {\n"
+        + "            \"type\": \"nested\",\n"
+        + "            \"properties\": {\n"
+        + "              \"city\": {\n"
+        + "                \"type\": \"text\",\n"
+        + "                \"fields\": {\n"
+        + "                  \"keyword\": {\n"
+        + "                    \"type\": \"keyword\",\n"
+        + "                    \"ignore_above\": 256\n"
+        + "                  }\n"
+        + "                }\n"
+        + "              },\n"
+        + "              \"state\": {\n"
+        + "                \"type\": \"text\",\n"
+        + "                \"fields\": {\n"
+        + "                  \"keyword\": {\n"
+        + "                    \"type\": \"keyword\",\n"
+        + "                    \"ignore_above\": 256\n"
+        + "                  }\n"
+        + "                }\n"
+        + "              }\n"
+        + "            }\n"
+        + "          },\n"
+        + "          \"name\": {\n"
+        + "            \"type\": \"text\",\n"
+        + "            \"fields\": {\n"
+        + "              \"keyword\": {\n"
+        + "                \"type\": \"keyword\"\n"
+        + "              }\n"
+        + "            },\n"
+        + "            \"fielddata\": true\n"
+        + "          },\n"
+        + "          \"started_year\": {\n"
+        + "            \"type\": \"long\"\n"
+        + "          }\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"title\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\",\n"
+        + "            \"ignore_above\": 256\n"
+        + "          }\n"
+        + "        }\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}\n";
+  }
+
+  public static String getNestedTypeIndexMapping() {
+    return "{ \"mappings\": {\n"
+        + "        \"properties\": {\n"
+        + "          \"message\": {\n"
+        + "            \"type\": \"nested\",\n"
+        + "            \"properties\": {\n"
+        + "              \"info\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"index\": \"true\"\n"
+        + "              },\n"
+        + "              \"author\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"fields\": {\n"
+        + "                  \"keyword\": {\n"
+        + "                    \"type\": \"keyword\",\n"
+        + "                    \"ignore_above\" : 256\n"
+        + "                  }\n"
+        + "                },\n"
+        + "                \"index\": \"true\"\n"
+        + "              },\n"
+        + "              \"dayOfWeek\": {\n"
+        + "                \"type\": \"long\"\n"
+        + "              }\n"
+        + "            }\n"
+        + "          },\n"
+        + "          \"comment\": {\n"
+        + "            \"type\": \"nested\",\n"
+        + "            \"properties\": {\n"
+        + "              \"data\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"index\": \"true\"\n"
+        + "              },\n"
+        + "              \"likes\": {\n"
+        + "                \"type\": \"long\"\n"
+        + "              }\n"
+        + "            }\n"
+        + "          },\n"
+        + "          \"myNum\": {\n"
+        + "            \"type\": \"long\"\n"
+        + "          },\n"
+        + "          \"someField\": {\n"
+        + "                \"type\": \"keyword\",\n"
+        + "                \"index\": \"true\"\n"
+        + "          }\n"
+        + "        }\n"
+        + "      }\n"
+        + "    }}";
+  }
+
+  public static String getJoinTypeIndexMapping() {
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"join_field\": {\n"
+        + "        \"type\": \"join\",\n"
+        + "        \"relations\": {\n"
+        + "          \"parentType\": \"childrenType\"\n"
+        + "        }\n"
+        + "      },\n"
+        + "      \"parentTile\": {\n"
+        + "        \"index\": \"true\",\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      },\n"
+        + "      \"dayOfWeek\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"author\": {\n"
+        + "        \"index\": \"true\",\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      },\n"
+        + "      \"info\": {\n"
+        + "        \"index\": \"true\",\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}";
+  }
+
+  public static String getBankIndexMapping() {
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"account_number\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"address\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"age\": {\n"
+        + "        \"type\": \"integer\"\n"
+        + "      },\n"
+        + "      \"balance\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"birthdate\": {\n"
+        + "        \"type\": \"date\"\n"
+        + "      },\n"
+        + "      \"city\": {\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      },\n"
+        + "      \"email\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"employer\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"firstname\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"gender\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fielddata\": true\n"
+        + "      },"
+        + "      \"lastname\": {\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      },\n"
+        + "      \"male\": {\n"
+        + "        \"type\": \"boolean\"\n"
+        + "      },\n"
+        + "      \"state\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\",\n"
+        + "            \"ignore_above\": 256\n"
+        + "          }\n"
+        + "        }\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}";
+  }
+
+  public static String getBankWithNullValuesIndexMapping() {
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"account_number\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"address\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"age\": {\n"
+        + "        \"type\": \"integer\"\n"
+        + "      },\n"
+        + "      \"balance\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"gender\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"firstname\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"lastname\": {\n"
+        + "        \"type\": \"keyword\"\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}";
+  }
+
+  public static String getOrderIndexMapping() {
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"id\": {\n"
+        + "        \"type\": \"long\"\n"
+        + "      },\n"
+        + "      \"name\": {\n"
+        + "        \"type\": \"text\",\n"
+        + "        \"fields\": {\n"
+        + "          \"keyword\": {\n"
+        + "            \"type\": \"keyword\",\n"
+        + "            \"ignore_above\": 256\n"
+        + "          }\n"
+        + "        }\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}";
+  }
+
+  public static String getWeblogsIndexMapping() {
+    return "{\n"
+        + "  \"mappings\": {\n"
+        + "    \"properties\": {\n"
+        + "      \"host\": {\n"
+        + "        \"type\": \"ip\"\n"
+        + "      },\n"
+        + "      \"method\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"url\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"response\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      },\n"
+        + "      \"bytes\": {\n"
+        + "        \"type\": \"text\"\n"
+        + "      }\n"
+        + "    }\n"
+        + "  }\n"
+        + "}";
+  }
+
+  public static String getDateIndexMapping() {
+    return "{  \"mappings\": {"
+        + " \"properties\": {\n"
+        + "          \"date_keyword\": {\n"
+        + "            \"type\": \"keyword\",\n"
+        + "            \"ignore_above\": 256\n"
+        + "          }"
+        + "       }"
+        + "   }"
+        + "}";
+  }
+
+  public static String getDateTimeIndexMapping() {
+    return "{"
+        + "  \"mappings\": {"
+        + "    \"properties\": {"
+        + "      \"birthday\": {"
+        + "        \"type\": \"date\""
+        + "      }"
+        + "    }"
+        + "  }"
+        + "}";
+  }
+
+  public static String getNestedSimpleIndexMapping() {
+    return "{"
+        + "  \"mappings\": {"
+        + "    \"properties\": {"
+        + "      \"address\": {"
+        + "        \"type\": \"nested\","
+        + "        \"properties\": {"
+        + "          \"city\": {"
+        + "            \"type\": \"text\","
+        + "            \"fields\": {"
+        + "              \"keyword\": {"
+        + "                \"type\": \"keyword\","
+        + "                \"ignore_above\": 256"
+        + "              }"
+        + "            }"
+        + "          },"
+        + "          \"state\": {"
+        + "            \"type\": \"text\","
+        + "            \"fields\": {"
+        + "              \"keyword\": {"
+        + "                \"type\": \"keyword\","
+        + "                \"ignore_above\": 256"
+        + "              }"
+        + "            }"
+        + "          }"
+        + "        }"
+        + "      },"
+        + "      \"age\": {"
+        + "        \"type\": \"long\""
+        + "      },"
+        + "      \"id\": {"
+        + "        \"type\": \"long\""
+        + "      },"
+        + "      \"name\": {"
+        + "        \"type\": \"text\","
+        + "        \"fields\": {"
+        + "          \"keyword\": {"
+        + "            \"type\": \"keyword\","
+        + "            \"ignore_above\": 256"
+        + "          }"
+        + "        }"
+        + "      }"
+        + "    }"
+        + "  }"
+        + "}";
+  }
+
+  public static void loadBulk(Client client, String jsonPath, String defaultIndex)
+      throws Exception {
+    System.out.println(String.format("Loading file %s into OpenSearch cluster", jsonPath));
+    String absJsonPath = getResourceFilePath(jsonPath);
+
+    BulkRequest bulkRequest = new BulkRequest();
+    try (final InputStream stream = new FileInputStream(absJsonPath);
+        final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
+        final BufferedReader br = new BufferedReader(streamReader)) {
+
+      while (true) {
+
+        String actionLine = br.readLine();
+        if (actionLine == null || actionLine.trim().isEmpty()) {
+          break;
         }
+        String sourceLine = br.readLine();
+        JSONObject actionJson = new JSONObject(actionLine);
+
+        IndexRequest indexRequest = new IndexRequest();
+        indexRequest.index(defaultIndex);
+        if (actionJson.getJSONObject("index").has("_id")) {
+          String docId = actionJson.getJSONObject("index").getString("_id");
+          indexRequest.id(docId);
+        }
+        if (actionJson.getJSONObject("index").has("_routing")) {
+          String routing = actionJson.getJSONObject("index").getString("_routing");
+          indexRequest.routing(routing);
+        }
+        indexRequest.source(sourceLine, XContentType.JSON);
+        bulkRequest.add(indexRequest);
+      }
     }
 
-    public static String getAccountIndexMapping() {
-        return "{  \"mappings\": {" +
-                " \"properties\": {\n" +
-                "          \"gender\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"fielddata\": true\n" +
-                "          }," +
-                "          \"address\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"fielddata\": true\n" +
-                "          }," +
-                "          \"firstname\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"fielddata\": true,\n" +
-                "            \"fields\": {\n" +
-                "              \"keyword\": {\n" +
-                "                \"type\": \"keyword\",\n" +
-                "                \"ignore_above\": 256\n" +
-                "              }" +
-                "            }" +
-                "          }," +
-                "          \"lastname\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"fielddata\": true,\n" +
-                "            \"fields\": {\n" +
-                "              \"keyword\": {\n" +
-                "                \"type\": \"keyword\",\n" +
-                "                \"ignore_above\": 256\n" +
-                "              }" +
-                "            }" +
-                "          }," +
-                "          \"state\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"fielddata\": true,\n" +
-                "            \"fields\": {\n" +
-                "              \"keyword\": {\n" +
-                "                \"type\": \"keyword\",\n" +
-                "                \"ignore_above\": 256\n" +
-                "              }" +
-                "            }" +
-                "          }" +
-                "       }"+
-                "   }" +
-                "}";
-    }
-
-    public static String getPhraseIndexMapping() {
-        return "{  \"mappings\": {" +
-                " \"properties\": {\n" +
-                "          \"phrase\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"store\": true\n" +
-                "          }" +
-                "       }"+
-                "   }" +
-                "}";
-    }
-
-    public static String getDogIndexMapping() {
-        return "{  \"mappings\": {" +
-                " \"properties\": {\n" +
-                "          \"dog_name\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"fielddata\": true\n" +
-                "          }"+
-                "       }"+
-                "   }" +
-                "}";
-    }
-
-    public static String getDogs2IndexMapping() {
-        return "{  \"mappings\": {" +
-                " \"properties\": {\n" +
-                "          \"dog_name\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"fielddata\": true\n" +
-                "          },\n"+
-                "          \"holdersName\": {\n" +
-                "            \"type\": \"keyword\"\n" +
-                "          }"+
-                "       }"+
-                "   }" +
-                "}";
-    }
-
-    public static String getDogs3IndexMapping() {
-        return "{  \"mappings\": {" +
-                " \"properties\": {\n" +
-                "          \"holdersName\": {\n" +
-                "            \"type\": \"keyword\"\n" +
-                "          },\n"+
-                "          \"color\": {\n" +
-                "            \"type\": \"text\"\n" +
-                "          }"+
-                "       }"+
-                "   }" +
-                "}";
-    }
-
-    public static String getPeople2IndexMapping() {
-        return "{  \"mappings\": {" +
-                " \"properties\": {\n" +
-                "          \"firstname\": {\n" +
-                "            \"type\": \"keyword\"\n" +
-                "          }"+
-                "       }"+
-                "   }" +
-                "}";
-    }
+    BulkResponse bulkResponse = client.bulk(bulkRequest).actionGet();
 
-    public static String getGameOfThronesIndexMapping() {
-        return "{  \"mappings\": { " +
-                "    \"properties\": {\n" +
-                "      \"nickname\": {\n" +
-                "        \"type\":\"text\", "+
-                "        \"fielddata\":true"+
-                "      },\n"+
-                "      \"name\": {\n" +
-                "        \"properties\": {\n" +
-                "          \"firstname\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"fielddata\": true\n" +
-                "          },\n" +
-                "          \"lastname\": {\n" +
-                "            \"type\": \"text\",\n" +
-                "            \"fielddata\": true\n" +
-                "          },\n" +
-                "          \"ofHerName\": {\n" +
-                "            \"type\": \"integer\"\n" +
-                "          },\n" +
-                "          \"ofHisName\": {\n" +
-                "            \"type\": \"integer\"\n" +
-                "          }\n" +
-                "        }\n" +
-                "      },\n" +
-                "      \"house\": {\n" +
-                "        \"type\": \"text\",\n" +
-                "        \"fields\": {\n" +
-                "          \"keyword\": {\n" +
-                "            \"type\": \"keyword\"\n" +
-                "          }\n" +
-                "        }\n" +
-                "      },\n" +
-                "      \"gender\": {\n" +
-                "        \"type\": \"text\",\n" +
-                "        \"fields\": {\n" +
-                "          \"keyword\": {\n" +
-                "            \"type\": \"keyword\"\n" +
-                "          }\n" +
-                "        }\n" +
-                "      }" +
-                "} } }";
+    if (bulkResponse.hasFailures()) {
+      throw new Exception(
+          "Failed to load test data into index "
+              + defaultIndex
+              + ", "
+              + bulkResponse.buildFailureMessage());
     }
-
-    // System
-
-    public static String getOdbcIndexMapping() {
-        return "{\n" +
-                "\t\"mappings\" :{\n" +
-                "\t\t\"properties\":{\n" +
-                "\t\t\t\"odbc_time\":{\n" +
-                "\t\t\t\t\"type\":\"date\",\n" +
-                "\t\t\t\t\"format\": \"'{ts' ''yyyy-MM-dd HH:mm:ss.SSS'''}'\"\n" +
-                "\t\t\t},\n" +
-                "\t\t\t\"docCount\":{\n" +
-                "\t\t\t\t\"type\":\"text\"\n" +
-                "\t\t\t}\n" +
-                "\t\t}\n" +
-                "\t}\n" +
-                "}";
+    System.out.println(bulkResponse.getItems().length + " documents loaded.");
+    // ensure the documents are searchable
+    client.admin().indices().prepareRefresh(defaultIndex).execute().actionGet();
+  }
+
+  public static String getResourceFilePath(String relPath) {
+    String projectRoot = System.getProperty("project.root", null);
+    if (projectRoot == null) {
+      return new File(relPath).getAbsolutePath();
+    } else {
+      return new File(projectRoot + "/" + relPath).getAbsolutePath();
     }
+  }
 
-    public static String getLocationIndexMapping() {
-        return "{\n" +
-                "\t\"mappings\" :{\n" +
-                "\t\t\"properties\":{\n" +
-                "\t\t\t\"place\":{\n" +
-                "\t\t\t\t\"type\":\"geo_shape\"\n" +
-                //"\t\t\t\t\"tree\": \"quadtree\",\n" + // Field tree and precision are deprecated in OpenSearch
-                //"\t\t\t\t\"precision\": \"10km\"\n" +
-                "\t\t\t},\n" +
-                "\t\t\t\"center\":{\n" +
-                "\t\t\t\t\"type\":\"geo_point\"\n" +
-                "\t\t\t},\n" +
-                "\t\t\t\"description\":{\n" +
-                "\t\t\t\t\"type\":\"text\"\n" +
-                "\t\t\t}\n" +
-                "\t\t}\n" +
-                "\t}\n" +
-                "}";
-    }
+  public static String getResponseBody(Response response) throws IOException {
 
-    public static String getEmployeeNestedTypeIndexMapping() {
-        return "{\n" +
-            "  \"mappings\": {\n" +
-            "    \"properties\": {\n" +
-            "      \"comments\": {\n" +
-            "        \"type\": \"nested\",\n" +
-            "        \"properties\": {\n" +
-            "          \"date\": {\n" +
-            "            \"type\": \"date\"\n" +
-            "          },\n" +
-            "          \"likes\": {\n" +
-            "            \"type\": \"long\"\n" +
-            "          },\n" +
-            "          \"message\": {\n" +
-            "            \"type\": \"text\",\n" +
-            "            \"fields\": {\n" +
-            "              \"keyword\": {\n" +
-            "                \"type\": \"keyword\",\n" +
-            "                \"ignore_above\": 256\n" +
-            "              }\n" +
-            "            }\n" +
-            "          }\n" +
-            "        }\n" +
-            "      },\n" +
-            "      \"id\": {\n" +
-            "        \"type\": \"long\"\n" +
-            "      },\n" +
-            "      \"name\": {\n" +
-            "        \"type\": \"text\",\n" +
-            "        \"fields\": {\n" +
-            "          \"keyword\": {\n" +
-            "            \"type\": \"keyword\",\n" +
-            "            \"ignore_above\": 256\n" +
-            "          }\n" +
-            "        }\n" +
-            "      },\n" +
-            "      \"projects\": {\n" +
-            "        \"type\": \"nested\",\n" +
-            "        \"properties\": {\n" +
-            "          \"address\": {\n" +
-            "            \"type\": \"nested\",\n" +
-            "            \"properties\": {\n" +
-            "              \"city\": {\n" +
-            "                \"type\": \"text\",\n" +
-            "                \"fields\": {\n" +
-            "                  \"keyword\": {\n" +
-            "                    \"type\": \"keyword\",\n" +
-            "                    \"ignore_above\": 256\n" +
-            "                  }\n" +
-            "                }\n" +
-            "              },\n" +
-            "              \"state\": {\n" +
-            "                \"type\": \"text\",\n" +
-            "                \"fields\": {\n" +
-            "                  \"keyword\": {\n" +
-            "                    \"type\": \"keyword\",\n" +
-            "                    \"ignore_above\": 256\n" +
-            "                  }\n" +
-            "                }\n" +
-            "              }\n" +
-            "            }\n" +
-            "          },\n" +
-            "          \"name\": {\n" +
-            "            \"type\": \"text\",\n" +
-            "            \"fields\": {\n" +
-            "              \"keyword\": {\n" +
-            "                \"type\": \"keyword\"\n" +
-            "              }\n" +
-            "            },\n" +
-            "            \"fielddata\": true\n" +
-            "          },\n" +
-            "          \"started_year\": {\n" +
-            "            \"type\": \"long\"\n" +
-            "          }\n" +
-            "        }\n" +
-            "      },\n" +
-            "      \"title\": {\n" +
-            "        \"type\": \"text\",\n" +
-            "        \"fields\": {\n" +
-            "          \"keyword\": {\n" +
-            "            \"type\": \"keyword\",\n" +
-            "            \"ignore_above\": 256\n" +
-            "          }\n" +
-            "        }\n" +
-            "      }\n" +
-            "    }\n" +
-            "  }\n" +
-            "}\n";
-    }
+    return getResponseBody(response, false);
+  }
 
+  public static String getResponseBody(Response response, boolean retainNewLines)
+      throws IOException {
+    final StringBuilder sb = new StringBuilder();
 
-    public static String getNestedTypeIndexMapping() {
-        return "{ \"mappings\": {\n" +
-                "        \"properties\": {\n" +
-                "          \"message\": {\n" +
-                "            \"type\": \"nested\",\n" +
-                "            \"properties\": {\n" +
-                "              \"info\": {\n" +
-                "                \"type\": \"keyword\",\n" +
-                "                \"index\": \"true\"\n" +
-                "              },\n" +
-                "              \"author\": {\n" +
-                "                \"type\": \"keyword\",\n" +
-                "                \"fields\": {\n" +
-                "                  \"keyword\": {\n" +
-                "                    \"type\": \"keyword\",\n" +
-                "                    \"ignore_above\" : 256\n" +
-                "                  }\n" +
-                "                },\n" +
-                "                \"index\": \"true\"\n" +
-                "              },\n" +
-                "              \"dayOfWeek\": {\n" +
-                "                \"type\": \"long\"\n" +
-                "              }\n" +
-                "            }\n" +
-                "          },\n" +
-                "          \"comment\": {\n" +
-                "            \"type\": \"nested\",\n" +
-                "            \"properties\": {\n" +
-                "              \"data\": {\n" +
-                "                \"type\": \"keyword\",\n" +
-                "                \"index\": \"true\"\n" +
-                "              },\n" +
-                "              \"likes\": {\n" +
-                "                \"type\": \"long\"\n" +
-                "              }\n" +
-                "            }\n" +
-                "          },\n" +
-                "          \"myNum\": {\n" +
-                "            \"type\": \"long\"\n" +
-                "          },\n" +
-                "          \"someField\": {\n" +
-                "                \"type\": \"keyword\",\n" +
-                "                \"index\": \"true\"\n" +
-                "          }\n" +
-                "        }\n" +
-                "      }\n" +
-                "    }}";
-    }
-
-    public static String getJoinTypeIndexMapping() {
-        return "{\n" +
-                "  \"mappings\": {\n" +
-                "    \"properties\": {\n" +
-                "      \"join_field\": {\n" +
-                "        \"type\": \"join\",\n" +
-                "        \"relations\": {\n" +
-                "          \"parentType\": \"childrenType\"\n" +
-                "        }\n" +
-                "      },\n" +
-                "      \"parentTile\": {\n" +
-                "        \"index\": \"true\",\n" +
-                "        \"type\": \"keyword\"\n" +
-                "      },\n" +
-                "      \"dayOfWeek\": {\n" +
-                "        \"type\": \"long\"\n" +
-                "      },\n" +
-                "      \"author\": {\n" +
-                "        \"index\": \"true\",\n" +
-                "        \"type\": \"keyword\"\n" +
-                "      },\n" +
-                "      \"info\": {\n" +
-                "        \"index\": \"true\",\n" +
-                "        \"type\": \"keyword\"\n" +
-                "      }\n" +
-                "    }\n" +
-                "  }\n" +
-                "}";
-    }
-
-    public static String getBankIndexMapping() {
-        return "{\n" +
-                "  \"mappings\": {\n" +
-                "    \"properties\": {\n" +
-                "      \"account_number\": {\n" +
-                "        \"type\": \"long\"\n" +
-                "      },\n" +
-                "      \"address\": {\n" +
-                "        \"type\": \"text\"\n" +
-                "      },\n" +
-                "      \"age\": {\n" +
-                "        \"type\": \"integer\"\n" +
-                "      },\n" +
-                "      \"balance\": {\n" +
-                "        \"type\": \"long\"\n" +
-                "      },\n" +
-                "      \"birthdate\": {\n" +
-                "        \"type\": \"date\"\n" +
-                "      },\n" +
-                "      \"city\": {\n" +
-                "        \"type\": \"keyword\"\n" +
-                "      },\n" +
-                "      \"email\": {\n" +
-                "        \"type\": \"text\"\n" +
-                "      },\n" +
-                "      \"employer\": {\n" +
-                "        \"type\": \"text\"\n" +
-                "      },\n" +
-                "      \"firstname\": {\n" +
-                "        \"type\": \"text\"\n" +
-                "      },\n" +
-                "      \"gender\": {\n" +
-                "        \"type\": \"text\",\n" +
-                "        \"fielddata\": true\n" +
-                "      }," +
-                "      \"lastname\": {\n" +
-                "        \"type\": \"keyword\"\n" +
-                "      },\n" +
-                "      \"male\": {\n" +
-                "        \"type\": \"boolean\"\n" +
-                "      },\n" +
-                "      \"state\": {\n" +
-                "        \"type\": \"text\",\n" +
-                "        \"fields\": {\n" +
-                "          \"keyword\": {\n" +
-                "            \"type\": \"keyword\",\n" +
-                "            \"ignore_above\": 256\n" +
-                "          }\n" +
-                "        }\n" +
-                "      }\n" +
-                "    }\n" +
-                "  }\n" +
-                "}";
-    }
-
-    public static String getBankWithNullValuesIndexMapping() {
-        return "{\n" +
-                "  \"mappings\": {\n" +
-                "    \"properties\": {\n" +
-                "      \"account_number\": {\n" +
-                "        \"type\": \"long\"\n" +
-                "      },\n" +
-                "      \"address\": {\n" +
-                "        \"type\": \"text\"\n" +
-                "      },\n" +
-                "      \"age\": {\n" +
-                "        \"type\": \"integer\"\n" +
-                "      },\n" +
-                "      \"balance\": {\n" +
-                "        \"type\": \"long\"\n" +
-                "      },\n" +
-                "      \"gender\": {\n" +
-                "        \"type\": \"text\"\n" +
-                "      },\n" +
-                "      \"firstname\": {\n" +
-                "        \"type\": \"text\"\n" +
-                "      },\n" +
-                "      \"lastname\": {\n" +
-                "        \"type\": \"keyword\"\n" +
-                "      }\n" +
-                "    }\n" +
-                "  }\n" +
-                "}";
-    }
+    try (final InputStream is = response.getEntity().getContent();
+        final BufferedReader br =
+            new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
 
-    public static String getOrderIndexMapping() {
-        return "{\n" +
-            "  \"mappings\": {\n" +
-            "    \"properties\": {\n" +
-            "      \"id\": {\n" +
-            "        \"type\": \"long\"\n" +
-            "      },\n" +
-            "      \"name\": {\n" +
-            "        \"type\": \"text\",\n" +
-            "        \"fields\": {\n" +
-            "          \"keyword\": {\n" +
-            "            \"type\": \"keyword\",\n" +
-            "            \"ignore_above\": 256\n" +
-            "          }\n" +
-            "        }\n" +
-            "      }\n" +
-            "    }\n" +
-            "  }\n" +
-            "}";
+      String line;
+      while ((line = br.readLine()) != null) {
+        sb.append(line);
+        if (retainNewLines) {
+          sb.append(String.format(Locale.ROOT, "%n"));
+        }
+      }
     }
+    return sb.toString();
+  }
 
-    public static String getWeblogsIndexMapping() {
-        return "{\n" +
-                "  \"mappings\": {\n" +
-                "    \"properties\": {\n" +
-                "      \"host\": {\n" +
-                "        \"type\": \"ip\"\n" +
-                "      },\n" +
-                "      \"method\": {\n" +
-                "        \"type\": \"text\"\n" +
-                "      },\n" +
-                "      \"url\": {\n" +
-                "        \"type\": \"text\"\n" +
-                "      },\n" +
-                "      \"response\": {\n" +
-                "        \"type\": \"text\"\n" +
-                "      },\n" +
-                "      \"bytes\": {\n" +
-                "        \"type\": \"text\"\n" +
-                "      }\n" +
-                "    }\n" +
-                "  }\n" +
-                "}";
-    }
+  public static String fileToString(
+      final String filePathFromProjectRoot, final boolean removeNewLines) throws IOException {
 
-    public static String getDateIndexMapping() {
-        return "{  \"mappings\": {" +
-                " \"properties\": {\n" +
-                "          \"date_keyword\": {\n" +
-                "            \"type\": \"keyword\",\n" +
-                "            \"ignore_above\": 256\n" +
-                "          }"+
-                "       }"+
-                "   }" +
-                "}";
-    }
+    final String absolutePath = getResourceFilePath(filePathFromProjectRoot);
 
-    public static String getDateTimeIndexMapping() {
-        return "{" +
-                "  \"mappings\": {" +
-                "    \"properties\": {" +
-                "      \"birthday\": {" +
-                "        \"type\": \"date\"" +
-                "      }" +
-                "    }" +
-                "  }" +
-                "}";
-    }
+    try (final InputStream stream = new FileInputStream(absolutePath);
+        final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
+        final BufferedReader br = new BufferedReader(streamReader)) {
 
-    public static String getNestedSimpleIndexMapping() {
-        return "{" +
-                "  \"mappings\": {" +
-                "    \"properties\": {" +
-                "      \"address\": {" +
-                "        \"type\": \"nested\"," +
-                "        \"properties\": {" +
-                "          \"city\": {" +
-                "            \"type\": \"text\"," +
-                "            \"fields\": {" +
-                "              \"keyword\": {" +
-                "                \"type\": \"keyword\"," +
-                "                \"ignore_above\": 256" +
-                "              }" +
-                "            }" +
-                "          }," +
-                "          \"state\": {" +
-                "            \"type\": \"text\"," +
-                "            \"fields\": {" +
-                "              \"keyword\": {" +
-                "                \"type\": \"keyword\"," +
-                "                \"ignore_above\": 256" +
-                "              }" +
-                "            }" +
-                "          }" +
-                "        }" +
-                "      }," +
-                "      \"age\": {" +
-                "        \"type\": \"long\"" +
-                "      }," +
-                "      \"id\": {" +
-                "        \"type\": \"long\"" +
-                "      }," +
-                "      \"name\": {" +
-                "        \"type\": \"text\"," +
-                "        \"fields\": {" +
-                "          \"keyword\": {" +
-                "            \"type\": \"keyword\"," +
-                "            \"ignore_above\": 256" +
-                "          }" +
-                "        }" +
-                "      }" +
-                "    }" +
-                "  }" +
-                "}";
-    }
-    public static void loadBulk(Client client, String jsonPath, String defaultIndex) throws Exception {
-        System.out.println(String.format("Loading file %s into OpenSearch cluster", jsonPath));
-        String absJsonPath = getResourceFilePath(jsonPath);
-
-        BulkRequest bulkRequest = new BulkRequest();
-        try (final InputStream stream =  new FileInputStream(absJsonPath);
-             final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
-             final BufferedReader br = new BufferedReader(streamReader)) {
-
-            while (true) {
-
-                String actionLine = br.readLine();
-                if (actionLine == null || actionLine.trim().isEmpty()) {
-                    break;
-                }
-                String sourceLine = br.readLine();
-                JSONObject actionJson = new JSONObject(actionLine);
-
-                IndexRequest indexRequest = new IndexRequest();
-                indexRequest.index(defaultIndex);
-                if (actionJson.getJSONObject("index").has("_id")) {
-                    String docId = actionJson.getJSONObject("index").getString("_id");
-                    indexRequest.id(docId);
-                }
-                if (actionJson.getJSONObject("index").has("_routing")) {
-                    String routing = actionJson.getJSONObject("index").getString("_routing");
-                    indexRequest.routing(routing);
-                }
-                indexRequest.source(sourceLine, XContentType.JSON);
-                bulkRequest.add(indexRequest);
-            }
-        }
+      final StringBuilder stringBuilder = new StringBuilder();
+      String line = br.readLine();
 
-        BulkResponse bulkResponse = client.bulk(bulkRequest).actionGet();
+      while (line != null) {
 
-        if (bulkResponse.hasFailures()) {
-            throw new Exception("Failed to load test data into index " + defaultIndex + ", " +
-                    bulkResponse.buildFailureMessage());
+        stringBuilder.append(line);
+        if (!removeNewLines) {
+          stringBuilder.append(String.format(Locale.ROOT, "%n"));
         }
-        System.out.println(bulkResponse.getItems().length + " documents loaded.");
-        // ensure the documents are searchable
-        client.admin().indices().prepareRefresh(defaultIndex).execute().actionGet();
-    }
+        line = br.readLine();
+      }
 
-    public static String getResourceFilePath(String relPath) {
-        String projectRoot = System.getProperty("project.root", null);
-        if (projectRoot == null) {
-            return new File(relPath).getAbsolutePath();
-        } else {
-            return new File(projectRoot + "/" + relPath).getAbsolutePath();
-        }
+      return stringBuilder.toString();
     }
-
-    public static String getResponseBody(Response response) throws IOException {
-
-        return getResponseBody(response, false);
+  }
+
+  /**
+   * Builds all permutations of the given list of Strings
+   *
+   * @param items list of strings to permute
+   * @return list of permutations
+   */
+  public static List<List<String>> getPermutations(final List<String> items) {
+
+    if (items.size() > 5) {
+      throw new IllegalArgumentException("Inefficient test, please refactor");
     }
 
-    public static String getResponseBody(Response response, boolean retainNewLines) throws IOException {
-        final StringBuilder sb = new StringBuilder();
+    final List<List<String>> result = new LinkedList<>();
 
-        try (final InputStream is = response.getEntity().getContent();
-             final BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
+    if (items.isEmpty() || 1 == items.size()) {
 
-            String line;
-            while ((line = br.readLine()) != null) {
-                sb.append(line);
-                if (retainNewLines) {
-                    sb.append(String.format(Locale.ROOT, "%n"));
-                }
-            }
-        }
-        return sb.toString();
+      final List<String> onlyElement = new ArrayList<>();
+      if (1 == items.size()) {
+        onlyElement.add(items.get(0));
+      }
+      result.add(onlyElement);
+      return result;
     }
 
-    public static String fileToString(final String filePathFromProjectRoot, final boolean removeNewLines)
-            throws IOException {
-
-        final String absolutePath = getResourceFilePath(filePathFromProjectRoot);
-
-        try (final InputStream stream = new FileInputStream(absolutePath);
-             final Reader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8);
-             final BufferedReader br = new BufferedReader(streamReader)) {
-
-            final StringBuilder stringBuilder = new StringBuilder();
-            String line = br.readLine();
-
-            while (line != null) {
-
-                stringBuilder.append(line);
-                if (!removeNewLines) {
-                    stringBuilder.append(String.format(Locale.ROOT, "%n"));
-                }
-                line = br.readLine();
-            }
-
-            return stringBuilder.toString();
-        }
+    for (int i = 0; i < items.size(); ++i) {
+
+      final List<String> smallerSet = new ArrayList<>();
+
+      if (i != 0) {
+        smallerSet.addAll(items.subList(0, i));
+      }
+      if (i != items.size() - 1) {
+        smallerSet.addAll(items.subList(i + 1, items.size()));
+      }
+
+      final String currentItem = items.get(i);
+      result.addAll(
+          getPermutations(smallerSet).stream()
+              .map(
+                  smallerSetPermutation -> {
+                    final List<String> permutation = new ArrayList<>();
+                    permutation.add(currentItem);
+                    permutation.addAll(smallerSetPermutation);
+                    return permutation;
+                  })
+              .collect(Collectors.toCollection(LinkedList::new)));
     }
 
-    /**
-     * Builds all permutations of the given list of Strings
-     * @param items
-                list of strings to permute
-     * @return list of permutations
-     */
-    public static List<List<String>> getPermutations(final List<String> items) {
-
-        if (items.size() > 5) {
-            throw new IllegalArgumentException("Inefficient test, please refactor");
-        }
-
-        final List<List<String>> result = new LinkedList<>();
-
-        if (items.isEmpty() || 1 == items.size()) {
-
-            final List<String> onlyElement = new ArrayList<>();
-            if (1 == items.size()) {
-                onlyElement.add(items.get(0));
-            }
-            result.add(onlyElement);
-            return result;
-        }
-
-        for (int i = 0; i < items.size(); ++i) {
-
-            final List<String> smallerSet = new ArrayList<>();
-
-            if (i != 0) {
-                smallerSet.addAll(items.subList(0, i));
-            }
-            if (i != items.size() - 1) {
-                smallerSet.addAll(items.subList(i + 1, items.size()));
-            }
-
-            final String currentItem = items.get(i);
-            result.addAll(getPermutations(smallerSet).stream().map(smallerSetPermutation -> {
-                final List<String> permutation = new ArrayList<>();
-                permutation.add(currentItem);
-                permutation.addAll(smallerSetPermutation);
-                return permutation;
-            }).collect(Collectors.toCollection(LinkedList::new)));
-        }
-
-        return result;
-    }
+    return result;
+  }
 }
diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/TestsConstants.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/TestsConstants.java
index a6b2c84d55..f436cedaaa 100644
--- a/legacy/src/test/java/org/opensearch/sql/legacy/util/TestsConstants.java
+++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/TestsConstants.java
@@ -3,48 +3,46 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.legacy.util;
 
-/**
- * Created by omershelef on 18/12/14.
- */
+/** Created by omershelef on 18/12/14. */
 public class TestsConstants {
 
-    public final static String PERSISTENT = "persistent";
-    public final static String TRANSIENT = "transient";
-
-    public final static String TEST_INDEX = "opensearch-sql_test_index";
-
-    public final static String TEST_INDEX_ONLINE = TEST_INDEX + "_online";
-    public final static String TEST_INDEX_ACCOUNT = TEST_INDEX + "_account";
-    public final static String TEST_INDEX_PHRASE = TEST_INDEX + "_phrase";
-    public final static String TEST_INDEX_DOG = TEST_INDEX + "_dog";
-    public final static String TEST_INDEX_DOG2 = TEST_INDEX + "_dog2";
-    public final static String TEST_INDEX_DOG3 = TEST_INDEX + "_dog3";
-    public final static String TEST_INDEX_DOGSUBQUERY = TEST_INDEX + "_subquery";
-    public final static String TEST_INDEX_PEOPLE = TEST_INDEX + "_people";
-    public final static String TEST_INDEX_PEOPLE2 = TEST_INDEX + "_people2";
-    public final static String TEST_INDEX_GAME_OF_THRONES = TEST_INDEX + "_game_of_thrones";
-    public final static String TEST_INDEX_SYSTEM = TEST_INDEX + "_system";
-    public final static String TEST_INDEX_ODBC = TEST_INDEX + "_odbc";
-    public final static String TEST_INDEX_LOCATION = TEST_INDEX + "_location";
-    public final static String TEST_INDEX_LOCATION2 = TEST_INDEX + "_location2";
-    public final static String TEST_INDEX_NESTED_TYPE = TEST_INDEX + "_nested_type";
-    public final static String TEST_INDEX_NESTED_SIMPLE = TEST_INDEX + "_nested_simple";
-    public final static String TEST_INDEX_NESTED_WITH_QUOTES = TEST_INDEX + "_nested_type_with_quotes";
-    public final static String TEST_INDEX_EMPLOYEE_NESTED = TEST_INDEX + "_employee_nested";
-    public final static String TEST_INDEX_JOIN_TYPE = TEST_INDEX + "_join_type";
-    public final static String TEST_INDEX_BANK = TEST_INDEX + "_bank";
-    public final static String TEST_INDEX_BANK_TWO = TEST_INDEX_BANK + "_two";
-    public final static String TEST_INDEX_BANK_WITH_NULL_VALUES = TEST_INDEX_BANK + "_with_null_values";
-    public final static String TEST_INDEX_ORDER = TEST_INDEX + "_order";
-    public final static String TEST_INDEX_WEBLOG = TEST_INDEX + "_weblog";
-    public final static String TEST_INDEX_DATE = TEST_INDEX + "_date";
-    public final static String TEST_INDEX_DATE_TIME = TEST_INDEX + "_datetime";
-
-
-    public final static String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-    public final static String TS_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
-    public final static String SIMPLE_DATE_FORMAT = "yyyy-MM-dd";
+  public static final String PERSISTENT = "persistent";
+  public static final String TRANSIENT = "transient";
+
+  public static final String TEST_INDEX = "opensearch-sql_test_index";
+
+  public static final String TEST_INDEX_ONLINE = TEST_INDEX + "_online";
+  public static final String TEST_INDEX_ACCOUNT = TEST_INDEX + "_account";
+  public static final String TEST_INDEX_PHRASE = TEST_INDEX + "_phrase";
+  public static final String TEST_INDEX_DOG = TEST_INDEX + "_dog";
+  public static final String TEST_INDEX_DOG2 = TEST_INDEX + "_dog2";
+  public static final String TEST_INDEX_DOG3 = TEST_INDEX + "_dog3";
+  public static final String TEST_INDEX_DOGSUBQUERY = TEST_INDEX + "_subquery";
+  public static final String TEST_INDEX_PEOPLE = TEST_INDEX + "_people";
+  public static final String TEST_INDEX_PEOPLE2 = TEST_INDEX + "_people2";
+  public static final String TEST_INDEX_GAME_OF_THRONES = TEST_INDEX + "_game_of_thrones";
+  public static final String TEST_INDEX_SYSTEM = TEST_INDEX + "_system";
+  public static final String TEST_INDEX_ODBC = TEST_INDEX + "_odbc";
+  public static final String TEST_INDEX_LOCATION = TEST_INDEX + "_location";
+  public static final String TEST_INDEX_LOCATION2 = TEST_INDEX + "_location2";
+  public static final String TEST_INDEX_NESTED_TYPE = TEST_INDEX + "_nested_type";
+  public static final String TEST_INDEX_NESTED_SIMPLE = TEST_INDEX + "_nested_simple";
+  public static final String TEST_INDEX_NESTED_WITH_QUOTES =
+      TEST_INDEX + "_nested_type_with_quotes";
+  public static final String TEST_INDEX_EMPLOYEE_NESTED = TEST_INDEX + "_employee_nested";
+  public static final String TEST_INDEX_JOIN_TYPE = TEST_INDEX + "_join_type";
+  public static final String TEST_INDEX_BANK = TEST_INDEX + "_bank";
+  public static final String TEST_INDEX_BANK_TWO = TEST_INDEX_BANK + "_two";
+  public static final String TEST_INDEX_BANK_WITH_NULL_VALUES =
+      TEST_INDEX_BANK + "_with_null_values";
+  public static final String TEST_INDEX_ORDER = TEST_INDEX + "_order";
+  public static final String TEST_INDEX_WEBLOG = TEST_INDEX + "_weblog";
+  public static final String TEST_INDEX_DATE = TEST_INDEX + "_date";
+  public static final String TEST_INDEX_DATE_TIME = TEST_INDEX + "_datetime";
+
+  public static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+  public static final String TS_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
+  public static final String SIMPLE_DATE_FORMAT = "yyyy-MM-dd";
 }
diff --git a/opensearch/build.gradle b/opensearch/build.gradle
index 7ad7d63546..92cc92ac72 100644
--- a/opensearch/build.gradle
+++ b/opensearch/build.gradle
@@ -26,23 +26,28 @@ plugins {
     id 'java-library'
     id "io.freefair.lombok"
     id 'jacoco'
+    id 'com.diffplug.spotless' version '6.22.0'
 }
 
 dependencies {
     api project(':core')
     api group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
     implementation "io.github.resilience4j:resilience4j-retry:1.5.0"
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}"
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_databind_version}"
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}"
-    implementation group: 'org.json', name: 'json', version:'20180813'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${versions.jackson}"
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${versions.jackson_databind}"
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${versions.jackson}"
+    implementation group: 'org.json', name: 'json', version:'20231013'
     compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
     implementation group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}"
 
-    testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.9.3')
+    testImplementation('org.junit.jupiter:junit-jupiter-params:5.9.3')
+    testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.9.3')
+    testRuntimeOnly('org.junit.platform:junit-platform-launcher:1.9.3')
+
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.7.0'
     testImplementation group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
     testImplementation group: 'org.opensearch.test', name: 'framework', version: "${opensearch_version}"
 }
@@ -57,8 +62,8 @@ test {
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required = true
+        xml.required = true
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/MLClient.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/MLClient.java
index 19f49d0e5f..4bc6009875 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/MLClient.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/MLClient.java
@@ -3,16 +3,14 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.ml.client.MachineLearningNodeClient;
 
-
 public class MLClient {
   private static MachineLearningNodeClient INSTANCE;
 
-  private MLClient() {
-
-  }
+  private MLClient() {}
 
   /**
    * get machine learning client.
+   *
    * @param nodeClient node client
    * @return machine learning client
    */
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchClient.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchClient.java
index dc6e72bd91..0a9cc67993 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchClient.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchClient.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.client;
 
 import java.util.List;
@@ -14,9 +13,8 @@
 import org.opensearch.sql.opensearch.response.OpenSearchResponse;
 
 /**
- * OpenSearch client abstraction to wrap different OpenSearch client implementation. For
- * example, implementation by node client for OpenSearch plugin or by REST client for
- * standalone mode.
+ * OpenSearch client abstraction to wrap different OpenSearch client implementation. For example,
+ * implementation by node client for OpenSearch plugin or by REST client for standalone mode.
  */
 public interface OpenSearchClient {
 
@@ -24,6 +22,7 @@ public interface OpenSearchClient {
 
   /**
    * Check if the given index exists.
+   *
    * @param indexName index name
    * @return true if exists, otherwise false
    */
@@ -31,8 +30,9 @@ public interface OpenSearchClient {
 
   /**
    * Create OpenSearch index based on the given mappings.
+   *
    * @param indexName index name
-   * @param mappings  index mappings
+   * @param mappings index mappings
    */
   void createIndex(String indexName, Map<String, Object> mappings);
 
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java
index 13fb0f6391..993e092534 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java
@@ -3,13 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.client;
 
-import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Streams;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -26,8 +23,8 @@
 import org.opensearch.action.admin.indices.settings.get.GetSettingsResponse;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.metadata.AliasMetadata;
-import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.sql.opensearch.mapping.IndexMapping;
 import org.opensearch.sql.opensearch.request.OpenSearchRequest;
@@ -42,22 +39,16 @@ public class OpenSearchNodeClient implements OpenSearchClient {
   /** Node client provided by OpenSearch container. */
   private final NodeClient client;
 
-  /** Index name expression resolver to get concrete index name. */
-  private final IndexNameExpressionResolver resolver;
-
-  /**
-   * Constructor of ElasticsearchNodeClient.
-   */
+  /** Constructor of OpenSearchNodeClient. */
   public OpenSearchNodeClient(NodeClient client) {
     this.client = client;
-    this.resolver = new IndexNameExpressionResolver(client.threadPool().getThreadContext());
   }
 
   @Override
   public boolean exists(String indexName) {
     try {
-      IndicesExistsResponse checkExistResponse = client.admin().indices()
-          .exists(new IndicesExistsRequest(indexName)).actionGet();
+      IndicesExistsResponse checkExistResponse =
+          client.admin().indices().exists(new IndicesExistsRequest(indexName)).actionGet();
       return checkExistResponse.isExists();
     } catch (Exception e) {
       throw new IllegalStateException("Failed to check if index [" + indexName + "] exists", e);
@@ -89,13 +80,15 @@ public void createIndex(String indexName, Map<String, Object> mappings) {
   @Override
   public Map<String, IndexMapping> getIndexMappings(String... indexExpression) {
     try {
-      GetMappingsResponse mappingsResponse = client.admin().indices()
-          .prepareGetMappings(indexExpression)
-          .setLocal(true)
-          .get();
-      return Streams.stream(mappingsResponse.mappings().iterator())
-          .collect(Collectors.toMap(cursor -> cursor.key,
-              cursor -> new IndexMapping(cursor.value)));
+      GetMappingsResponse mappingsResponse =
+          client.admin().indices().prepareGetMappings(indexExpression).setLocal(true).get();
+      return mappingsResponse.mappings().entrySet().stream()
+          .collect(
+              Collectors.toUnmodifiableMap(
+                  Map.Entry::getKey, cursor -> new IndexMapping(cursor.getValue())));
+    } catch (IndexNotFoundException e) {
+      // Re-throw directly to be treated as client error finally
+      throw e;
     } catch (Exception e) {
       throw new IllegalStateException(
           "Failed to read mapping for index pattern [" + indexExpression + "]", e);
@@ -114,11 +107,11 @@ public Map<String, Integer> getIndexMaxResultWindows(String... indexExpression)
       GetSettingsResponse settingsResponse =
           client.admin().indices().prepareGetSettings(indexExpression).setLocal(true).get();
       ImmutableMap.Builder<String, Integer> result = ImmutableMap.builder();
-      for (ObjectObjectCursor<String, Settings> indexToSetting :
-          settingsResponse.getIndexToSettings()) {
-        Settings settings = indexToSetting.value;
+      for (Map.Entry<String, Settings> indexToSetting :
+          settingsResponse.getIndexToSettings().entrySet()) {
+        Settings settings = indexToSetting.getValue();
         result.put(
-            indexToSetting.key,
+            indexToSetting.getKey(),
             settings.getAsInt(
                 IndexSettings.MAX_RESULT_WINDOW_SETTING.getKey(),
                 IndexSettings.MAX_RESULT_WINDOW_SETTING.getDefault(settings)));
@@ -130,15 +123,11 @@ public Map<String, Integer> getIndexMaxResultWindows(String... indexExpression)
     }
   }
 
-  /**
-   * TODO: Scroll doesn't work for aggregation. Support aggregation later.
-   */
+  /** TODO: Scroll doesn't work for aggregation. Support aggregation later. */
   @Override
   public OpenSearchResponse search(OpenSearchRequest request) {
     return request.search(
-        req -> client.search(req).actionGet(),
-        req -> client.searchScroll(req).actionGet()
-    );
+        req -> client.search(req).actionGet(), req -> client.searchScroll(req).actionGet());
   }
 
   /**
@@ -148,13 +137,12 @@ public OpenSearchResponse search(OpenSearchRequest request) {
    */
   @Override
   public List<String> indices() {
-    final GetIndexResponse indexResponse = client.admin().indices()
-        .prepareGetIndex()
-        .setLocal(true)
-        .get();
+    final GetIndexResponse indexResponse =
+        client.admin().indices().prepareGetIndex().setLocal(true).get();
     final Stream<String> aliasStream =
-        ImmutableList.copyOf(indexResponse.aliases().valuesIt()).stream()
-            .flatMap(Collection::stream).map(AliasMetadata::alias);
+        ImmutableList.copyOf(indexResponse.aliases().values()).stream()
+            .flatMap(Collection::stream)
+            .map(AliasMetadata::alias);
 
     return Stream.concat(Arrays.stream(indexResponse.getIndices()), aliasStream)
         .collect(Collectors.toList());
@@ -167,13 +155,20 @@ public List<String> indices() {
    */
   @Override
   public Map<String, String> meta() {
-    return ImmutableMap.of(META_CLUSTER_NAME,
-        client.settings().get("cluster.name", "opensearch"));
+    return ImmutableMap.of(META_CLUSTER_NAME, client.settings().get("cluster.name", "opensearch"));
   }
 
   @Override
   public void cleanup(OpenSearchRequest request) {
-    request.clean(scrollId -> client.prepareClearScroll().addScrollId(scrollId).get());
+    request.clean(
+        scrollId -> {
+          try {
+            client.prepareClearScroll().addScrollId(scrollId).get();
+          } catch (Exception e) {
+            throw new IllegalStateException(
+                "Failed to clean up resources for search request " + request, e);
+          }
+        });
   }
 
   @Override
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java
index d9f9dbbe5d..b6106982a7 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.client;
 
 import com.google.common.collect.ImmutableList;
@@ -30,7 +29,6 @@
 import org.opensearch.client.indices.GetMappingsResponse;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.metadata.AliasMetadata;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.sql.opensearch.mapping.IndexMapping;
 import org.opensearch.sql.opensearch.request.OpenSearchRequest;
@@ -50,8 +48,7 @@ public class OpenSearchRestClient implements OpenSearchClient {
   @Override
   public boolean exists(String indexName) {
     try {
-      return client.indices().exists(
-          new GetIndexRequest(indexName), RequestOptions.DEFAULT);
+      return client.indices().exists(new GetIndexRequest(indexName), RequestOptions.DEFAULT);
     } catch (IOException e) {
       throw new IllegalStateException("Failed to check if index [" + indexName + "] exist", e);
     }
@@ -60,8 +57,9 @@ public boolean exists(String indexName) {
   @Override
   public void createIndex(String indexName, Map<String, Object> mappings) {
     try {
-      client.indices().create(
-          new CreateIndexRequest(indexName).mapping(mappings), RequestOptions.DEFAULT);
+      client
+          .indices()
+          .create(new CreateIndexRequest(indexName).mapping(mappings), RequestOptions.DEFAULT);
     } catch (IOException e) {
       throw new IllegalStateException("Failed to create index [" + indexName + "]", e);
     }
@@ -81,27 +79,29 @@ public Map<String, IndexMapping> getIndexMappings(String... indexExpression) {
 
   @Override
   public Map<String, Integer> getIndexMaxResultWindows(String... indexExpression) {
-    GetSettingsRequest request = new GetSettingsRequest()
-        .indices(indexExpression).includeDefaults(true);
+    GetSettingsRequest request =
+        new GetSettingsRequest().indices(indexExpression).includeDefaults(true);
     try {
       GetSettingsResponse response = client.indices().getSettings(request, RequestOptions.DEFAULT);
-      ImmutableOpenMap<String, Settings> settings = response.getIndexToSettings();
-      ImmutableOpenMap<String, Settings> defaultSettings = response.getIndexToDefaultSettings();
+      Map<String, Settings> settings = response.getIndexToSettings();
+      Map<String, Settings> defaultSettings = response.getIndexToDefaultSettings();
       Map<String, Integer> result = new HashMap<>();
 
-      defaultSettings.forEach(entry -> {
-        Integer maxResultWindow = entry.value.getAsInt("index.max_result_window", null);
-        if (maxResultWindow != null) {
-          result.put(entry.key, maxResultWindow);
-        }
-      });
-
-      settings.forEach(entry -> {
-        Integer maxResultWindow = entry.value.getAsInt("index.max_result_window", null);
-        if (maxResultWindow != null) {
-          result.put(entry.key, maxResultWindow);
-        }
-      });
+      defaultSettings.forEach(
+          (key, value) -> {
+            Integer maxResultWindow = value.getAsInt("index.max_result_window", null);
+            if (maxResultWindow != null) {
+              result.put(key, maxResultWindow);
+            }
+          });
+
+      settings.forEach(
+          (key, value) -> {
+            Integer maxResultWindow = value.getAsInt("index.max_result_window", null);
+            if (maxResultWindow != null) {
+              result.put(key, maxResultWindow);
+            }
+          });
 
       return result;
     } catch (IOException e) {
@@ -127,8 +127,7 @@ public OpenSearchResponse search(OpenSearchRequest request) {
             throw new IllegalStateException(
                 "Failed to perform scroll operation with request " + req, e);
           }
-        }
-    );
+        });
   }
 
   /**
@@ -143,7 +142,8 @@ public List<String> indices() {
           client.indices().get(new GetIndexRequest(), RequestOptions.DEFAULT);
       final Stream<String> aliasStream =
           ImmutableList.copyOf(indexResponse.getAliases().values()).stream()
-              .flatMap(Collection::stream).map(AliasMetadata::alias);
+              .flatMap(Collection::stream)
+              .map(AliasMetadata::alias);
       return Stream.concat(Arrays.stream(indexResponse.getIndices()), aliasStream)
           .collect(Collectors.toList());
     } catch (IOException e) {
@@ -174,17 +174,17 @@ public Map<String, String> meta() {
 
   @Override
   public void cleanup(OpenSearchRequest request) {
-    request.clean(scrollId -> {
-      try {
-        ClearScrollRequest clearRequest = new ClearScrollRequest();
-        clearRequest.addScrollId(scrollId);
-        client.clearScroll(clearRequest, RequestOptions.DEFAULT);
-      } catch (IOException e) {
-        throw new IllegalStateException(
-            "Failed to clean up resources for search request " + request, e);
-      }
-    });
-
+    request.clean(
+        scrollId -> {
+          try {
+            ClearScrollRequest clearRequest = new ClearScrollRequest();
+            clearRequest.addScrollId(scrollId);
+            client.clearScroll(clearRequest, RequestOptions.DEFAULT);
+          } catch (IOException e) {
+            throw new IllegalStateException(
+                "Failed to clean up resources for search request " + request, e);
+          }
+        });
   }
 
   @Override
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchBinaryType.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchBinaryType.java
new file mode 100644
index 0000000000..ddd7ab8eb9
--- /dev/null
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchBinaryType.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.data.type;
+
+import static org.opensearch.sql.data.type.ExprCoreType.UNKNOWN;
+
+import lombok.EqualsAndHashCode;
+
+/**
+ * The type of a binary value. See <a
+ * href="https://opensearch.org/docs/latest/opensearch/supported-field-types/binary/">doc</a>
+ */
+@EqualsAndHashCode(callSuper = false)
+public class OpenSearchBinaryType extends OpenSearchDataType {
+
+  private static final OpenSearchBinaryType instance = new OpenSearchBinaryType();
+
+  private OpenSearchBinaryType() {
+    super(MappingType.Binary);
+    exprCoreType = UNKNOWN;
+  }
+
+  public static OpenSearchBinaryType of() {
+    return OpenSearchBinaryType.instance;
+  }
+
+  @Override
+  protected OpenSearchDataType cloneEmpty() {
+    return instance;
+  }
+}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataType.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataType.java
index 05b80bfa23..c35eacfc72 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataType.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataType.java
@@ -3,142 +3,304 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.type;
 
-import static org.opensearch.sql.data.type.ExprCoreType.STRING;
-import static org.opensearch.sql.data.type.ExprCoreType.UNKNOWN;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableMap;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
-import lombok.RequiredArgsConstructor;
+import java.util.function.BiConsumer;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.apache.commons.lang3.EnumUtils;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * The extension of ExprType in Elasticsearch.
- */
-@RequiredArgsConstructor
-public enum OpenSearchDataType implements ExprType {
-  /**
-   * OpenSearch Text. Rather than cast text to other types (STRING), leave it alone to prevent
-   * cast_to_string(OPENSEARCH_TEXT).
-   * Ref: https://www.elastic.co/guide/en/elasticsearch/reference/current/text.html
-   */
-  OPENSEARCH_TEXT(Collections.singletonList(STRING), "string") {
-    @Override
-    public boolean shouldCast(ExprType other) {
-      return false;
-    }
-  },
+/** The extension of ExprType in OpenSearch. */
+@EqualsAndHashCode
+public class OpenSearchDataType implements ExprType, Serializable {
 
-  /**
-   * OpenSearch multi-fields which has text and keyword.
-   * Ref: https://www.elastic.co/guide/en/elasticsearch/reference/current/multi-fields.html
-   */
-  OPENSEARCH_TEXT_KEYWORD(Arrays.asList(STRING, OPENSEARCH_TEXT), "string") {
-    @Override
-    public boolean shouldCast(ExprType other) {
-      return false;
-    }
-  },
+  /** The mapping (OpenSearch engine) type. */
+  public enum MappingType {
+    Invalid(null, ExprCoreType.UNKNOWN),
+    Text("text", ExprCoreType.UNKNOWN),
+    Keyword("keyword", ExprCoreType.STRING),
+    Ip("ip", ExprCoreType.UNKNOWN),
+    GeoPoint("geo_point", ExprCoreType.UNKNOWN),
+    Binary("binary", ExprCoreType.UNKNOWN),
+    Date("date", ExprCoreType.TIMESTAMP),
+    DateNanos("date_nanos", ExprCoreType.TIMESTAMP),
+    Object("object", ExprCoreType.STRUCT),
+    Nested("nested", ExprCoreType.ARRAY),
+    Byte("byte", ExprCoreType.BYTE),
+    Short("short", ExprCoreType.SHORT),
+    Integer("integer", ExprCoreType.INTEGER),
+    Long("long", ExprCoreType.LONG),
+    Float("float", ExprCoreType.FLOAT),
+    HalfFloat("half_float", ExprCoreType.FLOAT),
+    ScaledFloat("scaled_float", ExprCoreType.DOUBLE),
+    Double("double", ExprCoreType.DOUBLE),
+    Boolean("boolean", ExprCoreType.BOOLEAN);
+    // TODO: ranges, geo shape, point, shape
 
+    private final String name;
+
+    // Associated `ExprCoreType`
+    @Getter private final ExprCoreType exprCoreType;
+
+    MappingType(String name, ExprCoreType exprCoreType) {
+      this.name = name;
+      this.exprCoreType = exprCoreType;
+    }
 
-  OPENSEARCH_IP(Arrays.asList(UNKNOWN), "ip"),
+    public String toString() {
+      return name;
+    }
+  }
 
-  OPENSEARCH_GEO_POINT(Arrays.asList(UNKNOWN), "geo_point"),
+  @EqualsAndHashCode.Exclude @Getter protected MappingType mappingType;
 
-  OPENSEARCH_BINARY(Arrays.asList(UNKNOWN), "binary");
+  // resolved ExprCoreType
+  @Getter protected ExprCoreType exprCoreType;
 
   /**
-   * Bidirectional mapping between OpenSearch type name and ExprType.
+   * Get a simplified type {@link ExprCoreType} if possible. To avoid returning `UNKNOWN` for
+   * `OpenSearch*Type`s, e.g. for IP, returns itself. If the `exprCoreType` is {@link
+   * ExprCoreType#DATE}, {@link ExprCoreType#TIMESTAMP}, {@link ExprCoreType#TIME}, or {@link
+   * ExprCoreType#UNKNOWN}, it returns the current instance; otherwise, it returns `exprCoreType`.
+   *
+   * @return An {@link ExprType}.
    */
-  private static final BiMap<String, ExprType> OPENSEARCH_TYPE_TO_EXPR_TYPE_MAPPING =
-      ImmutableBiMap.<String, ExprType>builder()
-          .put("text", OPENSEARCH_TEXT)
-          .put("text_keyword", OPENSEARCH_TEXT_KEYWORD)
-          .put("keyword", ExprCoreType.STRING)
-          .put("byte", ExprCoreType.BYTE)
-          .put("short", ExprCoreType.SHORT)
-          .put("integer", ExprCoreType.INTEGER)
-          .put("long", ExprCoreType.LONG)
-          .put("float", ExprCoreType.FLOAT)
-          .put("double", ExprCoreType.DOUBLE)
-          .put("boolean", ExprCoreType.BOOLEAN)
-          .put("nested", ExprCoreType.ARRAY)
-          .put("object", ExprCoreType.STRUCT)
-          .put("date", ExprCoreType.TIMESTAMP)
-          .put("ip", OPENSEARCH_IP)
-          .put("geo_point", OPENSEARCH_GEO_POINT)
-          .put("binary", OPENSEARCH_BINARY)
-          .build();
+  public ExprType getExprType() {
+    return (exprCoreType == ExprCoreType.DATE
+            || exprCoreType == ExprCoreType.TIMESTAMP
+            || exprCoreType == ExprCoreType.TIME
+            || exprCoreType == ExprCoreType.UNKNOWN)
+        ? this
+        : exprCoreType;
+  }
 
   /**
-   * Mapping from extra OpenSearch type name which may map to same ExprType as above.
+   * Simple instances of OpenSearchDataType are created once during entire SQL engine lifetime and
+   * cached there. This reduces memory usage and increases type comparison. Note: Types with
+   * non-empty fields and properties are not cached.
    */
-  private static final Map<String, ExprType> EXTRA_OPENSEARCH_TYPE_TO_EXPR_TYPE_MAPPING =
-      ImmutableMap.<String, ExprType>builder()
-          .put("half_float", ExprCoreType.FLOAT)
-          .put("scaled_float", ExprCoreType.DOUBLE)
-          .put("date_nanos", ExprCoreType.TIMESTAMP)
-          .build();
+  private static final Map<String, OpenSearchDataType> instances = new HashMap<>();
+
+  static {
+    EnumUtils.getEnumList(MappingType.class).stream()
+        .filter(t -> t != MappingType.Invalid)
+        .forEach(t -> instances.put(t.toString(), OpenSearchDataType.of(t)));
+    EnumUtils.getEnumList(ExprCoreType.class)
+        .forEach(t -> instances.put(t.toString(), OpenSearchDataType.of(t)));
+  }
 
   /**
-   * The mapping between Type and legacy JDBC type name.
+   * Parses index mapping and maps it to a Data type in the SQL plugin.
+   *
+   * @param indexMapping An input with keys and objects that need to be mapped to a data type.
+   * @return The mapping.
    */
-  private static final Map<ExprType, String> LEGACY_TYPE_NAME_MAPPING =
-      new ImmutableMap.Builder<ExprType, String>()
-          .put(OPENSEARCH_TEXT, "text")
-          .put(OPENSEARCH_TEXT_KEYWORD, "text")
-          .build();
+  public static Map<String, OpenSearchDataType> parseMapping(Map<String, Object> indexMapping) {
+    Map<String, OpenSearchDataType> result = new LinkedHashMap<>();
+
+    if (indexMapping == null) {
+      return result;
+    }
+
+    indexMapping.forEach(
+        (k, v) -> {
+          var innerMap = (Map<String, Object>) v;
+          // by default, the type is treated as an Object if "type" is not provided
+          var type = ((String) innerMap.getOrDefault("type", "object")).replace("_", "");
+          if (!EnumUtils.isValidEnumIgnoreCase(OpenSearchDataType.MappingType.class, type)) {
+            // unknown type, e.g. `alias`
+            // TODO resolve alias reference
+            return;
+          }
+          // create OpenSearchDataType
+          result.put(
+              k,
+              OpenSearchDataType.of(
+                  EnumUtils.getEnumIgnoreCase(OpenSearchDataType.MappingType.class, type),
+                  innerMap));
+        });
+    return result;
+  }
 
   /**
-   * Parent of current type.
+   * A constructor function which builds proper `OpenSearchDataType` for given mapping `Type`.
+   *
+   * @param mappingType A mapping type.
+   * @return An instance or inheritor of `OpenSearchDataType`.
    */
-  private final List<ExprType> parents;
+  @SuppressWarnings("unchecked")
+  public static OpenSearchDataType of(MappingType mappingType, Map<String, Object> innerMap) {
+    OpenSearchDataType res =
+        instances.getOrDefault(mappingType.toString(), new OpenSearchDataType(mappingType));
+    switch (mappingType) {
+      case Object:
+        // TODO: use Object type once it has been added
+      case Nested:
+        if (innerMap.isEmpty()) {
+          return res;
+        }
+        Map<String, OpenSearchDataType> properties =
+            parseMapping((Map<String, Object>) innerMap.getOrDefault("properties", Map.of()));
+        OpenSearchDataType objectDataType = res.cloneEmpty();
+        objectDataType.properties = properties;
+        return objectDataType;
+      case Text:
+        // TODO update these 2 below #1038 https://github.com/opensearch-project/sql/issues/1038
+        Map<String, OpenSearchDataType> fields =
+            parseMapping((Map<String, Object>) innerMap.getOrDefault("fields", Map.of()));
+        return (!fields.isEmpty()) ? OpenSearchTextType.of(fields) : OpenSearchTextType.of();
+      case GeoPoint:
+        return OpenSearchGeoPointType.of();
+      case Binary:
+        return OpenSearchBinaryType.of();
+      case Ip:
+        return OpenSearchIpType.of();
+      case Date:
+      case DateNanos:
+        // Default date formatter is used when "" is passed as the second parameter
+        String format = (String) innerMap.getOrDefault("format", "");
+        return OpenSearchDateType.of(format);
+      default:
+        return res;
+    }
+  }
+
   /**
-   * JDBC type name.
+   * A constructor function which builds proper `OpenSearchDataType` for given mapping `Type`.
+   * Designed to be called by the mapping parser only (and tests).
+   *
+   * @param mappingType A mapping type.
+   * @return An instance or inheritor of `OpenSearchDataType`.
    */
-  private final String jdbcType;
+  public static OpenSearchDataType of(MappingType mappingType) {
+    return of(mappingType, Map.of());
+  }
 
   /**
-   * Convert OpenSearch type string to ExprType.
-   * @param openSearchType OpenSearch type string
-   * @return expr type
+   * A constructor function which builds proper `OpenSearchDataType` for given {@link ExprType}.
+   *
+   * @param type A type.
+   * @return An instance of `OpenSearchDataType`.
    */
-  public static ExprType getExprType(String openSearchType) {
-    if (OPENSEARCH_TYPE_TO_EXPR_TYPE_MAPPING.containsKey(openSearchType)) {
-      return OPENSEARCH_TYPE_TO_EXPR_TYPE_MAPPING.get(openSearchType);
+  public static OpenSearchDataType of(ExprType type) {
+    if (type instanceof OpenSearchDataType) {
+      return (OpenSearchDataType) type;
+    }
+    var res = instances.getOrDefault(type.toString(), null);
+    if (res != null) {
+      return res;
+    }
+    if (OpenSearchDateType.isDateTypeCompatible(type)) {
+      return OpenSearchDateType.of(type);
     }
-    return EXTRA_OPENSEARCH_TYPE_TO_EXPR_TYPE_MAPPING.getOrDefault(openSearchType, UNKNOWN);
+
+    return new OpenSearchDataType((ExprCoreType) type);
   }
 
-  /**
-   * Convert ExprType to OpenSearch type string.
-   * @param type expr type
-   * @return OpenSearch type string
-   */
-  public static String getOpenSearchType(ExprType type) {
-    return OPENSEARCH_TYPE_TO_EXPR_TYPE_MAPPING.inverse().get(type);
+  protected OpenSearchDataType(MappingType mappingType) {
+    this.mappingType = mappingType;
+    this.exprCoreType = mappingType.getExprCoreType();
   }
 
-  @Override
-  public List<ExprType> getParent() {
-    return parents;
+  protected OpenSearchDataType(ExprCoreType type) {
+    this.exprCoreType = type;
   }
 
+  // For datatypes with properties (example: object and nested types)
+  // a read-only collection
+  @Getter @EqualsAndHashCode.Exclude Map<String, OpenSearchDataType> properties = ImmutableMap.of();
+
   @Override
+  // Called when building TypeEnvironment and when serializing PPL response
   public String typeName() {
-    return jdbcType;
+    // To avoid breaking changes return `string` for `typeName` call (PPL) and `text` for
+    // `legacyTypeName` call (SQL). See more: https://github.com/opensearch-project/sql/issues/1296
+    if (legacyTypeName().equals("TEXT")) {
+      return "STRING";
+    }
+    return legacyTypeName();
   }
 
   @Override
+  // Called when serializing SQL response
   public String legacyTypeName() {
-    return LEGACY_TYPE_NAME_MAPPING.getOrDefault(this, typeName());
+    if (mappingType == null) {
+      return exprCoreType.typeName();
+    }
+    if (mappingType.toString().equalsIgnoreCase("DATE")) {
+      return exprCoreType.typeName();
+    }
+    return mappingType.toString().toUpperCase();
+  }
+
+  /**
+   * Clone type object without {@link #properties} - without info about nested object types. Note:
+   * Should be overriden by all derived classes for proper work.
+   *
+   * @return A cloned object.
+   */
+  protected OpenSearchDataType cloneEmpty() {
+    return this.mappingType == null
+        ? new OpenSearchDataType(this.exprCoreType)
+        : new OpenSearchDataType(this.mappingType);
+  }
+
+  /**
+   * Flattens mapping tree into a single layer list of objects (pairs of name-types actually), which
+   * don't have nested types. See {@link OpenSearchDataTypeTest#traverseAndFlatten() test} for
+   * example.
+   *
+   * @param tree A list of `OpenSearchDataType`s - map between field name and its type.
+   * @return A list of all `OpenSearchDataType`s from given map on the same nesting level (1).
+   *     Nested object names are prefixed by names of their host.
+   */
+  public static Map<String, OpenSearchDataType> traverseAndFlatten(
+      Map<String, OpenSearchDataType> tree) {
+    final Map<String, OpenSearchDataType> result = new LinkedHashMap<>();
+    BiConsumer<Map<String, OpenSearchDataType>, String> visitLevel =
+        new BiConsumer<>() {
+          @Override
+          public void accept(Map<String, OpenSearchDataType> subtree, String prefix) {
+            for (var entry : subtree.entrySet()) {
+              String entryKey = entry.getKey();
+              var nextPrefix =
+                  prefix.isEmpty() ? entryKey : String.format("%s.%s", prefix, entryKey);
+              result.put(nextPrefix, entry.getValue().cloneEmpty());
+              var nextSubtree = entry.getValue().getProperties();
+              if (!nextSubtree.isEmpty()) {
+                accept(nextSubtree, nextPrefix);
+              }
+            }
+          }
+        };
+    visitLevel.accept(tree, "");
+    return result;
+  }
+
+  /**
+   * Resolve type of identified from parsed mapping tree.
+   *
+   * @param tree Parsed mapping tree (not flattened).
+   * @param id An identifier.
+   * @return Resolved OpenSearchDataType or null if not found.
+   */
+  public static OpenSearchDataType resolve(Map<String, OpenSearchDataType> tree, String id) {
+    for (var item : tree.entrySet()) {
+      if (item.getKey().equals(id)) {
+        return item.getValue();
+      }
+      OpenSearchDataType result = resolve(item.getValue().getProperties(), id);
+      if (result != null) {
+        return result;
+      }
+    }
+    return null;
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateType.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateType.java
new file mode 100644
index 0000000000..acf2e22243
--- /dev/null
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateType.java
@@ -0,0 +1,488 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.data.type;
+
+import static org.opensearch.common.time.DateFormatter.splitCombinedPatterns;
+import static org.opensearch.common.time.DateFormatter.strip8Prefix;
+import static org.opensearch.sql.data.type.ExprCoreType.DATE;
+import static org.opensearch.sql.data.type.ExprCoreType.TIME;
+import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
+
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.temporal.TemporalAccessor;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import lombok.EqualsAndHashCode;
+import org.opensearch.common.time.DateFormatter;
+import org.opensearch.common.time.DateFormatters;
+import org.opensearch.common.time.FormatNames;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.data.type.ExprType;
+
+/** Date type with support for predefined and custom formats read from the index mapping. */
+@EqualsAndHashCode(callSuper = true)
+public class OpenSearchDateType extends OpenSearchDataType {
+
+  private static final OpenSearchDateType instance = new OpenSearchDateType();
+
+  /** Numeric formats which support full datetime. */
+  public static final List<FormatNames> SUPPORTED_NAMED_NUMERIC_FORMATS =
+      List.of(FormatNames.EPOCH_MILLIS, FormatNames.EPOCH_SECOND);
+
+  /** List of named formats which support full datetime. */
+  public static final List<FormatNames> SUPPORTED_NAMED_DATETIME_FORMATS =
+      List.of(
+          FormatNames.ISO8601,
+          FormatNames.BASIC_DATE_TIME,
+          FormatNames.BASIC_DATE_TIME_NO_MILLIS,
+          FormatNames.BASIC_ORDINAL_DATE_TIME,
+          FormatNames.BASIC_ORDINAL_DATE_TIME_NO_MILLIS,
+          FormatNames.BASIC_WEEK_DATE_TIME,
+          FormatNames.STRICT_BASIC_WEEK_DATE_TIME,
+          FormatNames.BASIC_WEEK_DATE_TIME_NO_MILLIS,
+          FormatNames.STRICT_BASIC_WEEK_DATE_TIME_NO_MILLIS,
+          FormatNames.BASIC_WEEK_DATE,
+          FormatNames.STRICT_BASIC_WEEK_DATE,
+          FormatNames.DATE_OPTIONAL_TIME,
+          FormatNames.STRICT_DATE_OPTIONAL_TIME,
+          FormatNames.STRICT_DATE_OPTIONAL_TIME_NANOS,
+          FormatNames.DATE_TIME,
+          FormatNames.STRICT_DATE_TIME,
+          FormatNames.DATE_TIME_NO_MILLIS,
+          FormatNames.STRICT_DATE_TIME_NO_MILLIS,
+          FormatNames.DATE_HOUR_MINUTE_SECOND_FRACTION,
+          FormatNames.STRICT_DATE_HOUR_MINUTE_SECOND_FRACTION,
+          FormatNames.DATE_HOUR_MINUTE_SECOND_FRACTION,
+          FormatNames.DATE_HOUR_MINUTE_SECOND_MILLIS,
+          FormatNames.STRICT_DATE_HOUR_MINUTE_SECOND_MILLIS,
+          FormatNames.DATE_HOUR_MINUTE_SECOND,
+          FormatNames.STRICT_DATE_HOUR_MINUTE_SECOND,
+          FormatNames.DATE_HOUR_MINUTE,
+          FormatNames.STRICT_DATE_HOUR_MINUTE,
+          FormatNames.DATE_HOUR,
+          FormatNames.STRICT_DATE_HOUR,
+          FormatNames.ORDINAL_DATE_TIME,
+          FormatNames.STRICT_ORDINAL_DATE_TIME,
+          FormatNames.ORDINAL_DATE_TIME_NO_MILLIS,
+          FormatNames.STRICT_ORDINAL_DATE_TIME_NO_MILLIS,
+          FormatNames.WEEK_DATE_TIME,
+          FormatNames.STRICT_WEEK_DATE_TIME,
+          FormatNames.WEEK_DATE_TIME_NO_MILLIS,
+          FormatNames.STRICT_WEEK_DATE_TIME_NO_MILLIS);
+
+  /** List of named formats that only support year/month/day. */
+  public static final List<FormatNames> SUPPORTED_NAMED_DATE_FORMATS =
+      List.of(
+          FormatNames.BASIC_DATE,
+          FormatNames.BASIC_ORDINAL_DATE,
+          FormatNames.DATE,
+          FormatNames.STRICT_DATE,
+          FormatNames.YEAR_MONTH_DAY,
+          FormatNames.STRICT_YEAR_MONTH_DAY,
+          FormatNames.ORDINAL_DATE,
+          FormatNames.STRICT_ORDINAL_DATE,
+          FormatNames.WEEK_DATE,
+          FormatNames.STRICT_WEEK_DATE,
+          FormatNames.WEEKYEAR_WEEK_DAY,
+          FormatNames.STRICT_WEEKYEAR_WEEK_DAY);
+
+  /**
+   * list of named formats which produce incomplete date, e.g. 1 or 2 are missing from tuple
+   * year/month/day.
+   */
+  public static final List<FormatNames> SUPPORTED_NAMED_INCOMPLETE_DATE_FORMATS =
+      List.of(
+          FormatNames.YEAR_MONTH,
+          FormatNames.STRICT_YEAR_MONTH,
+          FormatNames.YEAR,
+          FormatNames.STRICT_YEAR,
+          FormatNames.WEEK_YEAR,
+          FormatNames.WEEK_YEAR_WEEK,
+          FormatNames.STRICT_WEEKYEAR_WEEK,
+          FormatNames.WEEKYEAR,
+          FormatNames.STRICT_WEEKYEAR);
+
+  /** List of named formats that only support hour/minute/second. */
+  public static final List<FormatNames> SUPPORTED_NAMED_TIME_FORMATS =
+      List.of(
+          FormatNames.BASIC_TIME,
+          FormatNames.BASIC_TIME_NO_MILLIS,
+          FormatNames.BASIC_T_TIME,
+          FormatNames.BASIC_T_TIME_NO_MILLIS,
+          FormatNames.TIME,
+          FormatNames.STRICT_TIME,
+          FormatNames.TIME_NO_MILLIS,
+          FormatNames.STRICT_TIME_NO_MILLIS,
+          FormatNames.HOUR_MINUTE_SECOND_FRACTION,
+          FormatNames.STRICT_HOUR_MINUTE_SECOND_FRACTION,
+          FormatNames.HOUR_MINUTE_SECOND_MILLIS,
+          FormatNames.STRICT_HOUR_MINUTE_SECOND_MILLIS,
+          FormatNames.HOUR_MINUTE_SECOND,
+          FormatNames.STRICT_HOUR_MINUTE_SECOND,
+          FormatNames.HOUR_MINUTE,
+          FormatNames.STRICT_HOUR_MINUTE,
+          FormatNames.HOUR,
+          FormatNames.STRICT_HOUR,
+          FormatNames.T_TIME,
+          FormatNames.STRICT_T_TIME,
+          FormatNames.T_TIME_NO_MILLIS,
+          FormatNames.STRICT_T_TIME_NO_MILLIS);
+
+  /**
+   * Formatter symbols which used to format time or date correspondingly. {@link
+   * java.time.format.DateTimeFormatter}.
+   */
+  private static final String CUSTOM_FORMAT_TIME_SYMBOLS = "nNASsmHkKha";
+
+  private static final String CUSTOM_FORMAT_DATE_SYMBOLS = "FecEWwYqQgdMLDyuG";
+
+  private static final List<DateFormatter> OPENSEARCH_DEFAULT_FORMATTERS =
+      Stream.of("strict_date_time_no_millis", "strict_date_optional_time", "epoch_millis")
+          .map(DateFormatter::forPattern)
+          .collect(Collectors.toList());
+
+  @EqualsAndHashCode.Exclude private final List<String> formats;
+
+  private OpenSearchDateType() {
+    super(MappingType.Date);
+    this.formats = List.of();
+  }
+
+  private OpenSearchDateType(ExprCoreType exprCoreType) {
+    this();
+    this.exprCoreType = exprCoreType;
+  }
+
+  private OpenSearchDateType(ExprType exprType) {
+    this();
+    this.exprCoreType = (ExprCoreType) exprType;
+  }
+
+  private OpenSearchDateType(String format) {
+    super(MappingType.Date);
+    this.formats = getFormatList(format);
+    this.exprCoreType = getExprTypeFromFormatString(format);
+  }
+
+  public boolean hasFormats() {
+    return !formats.isEmpty();
+  }
+
+  /**
+   * Retrieves and splits a user defined format string from the mapping into a list of formats.
+   *
+   * @return A list of format names and user defined formats.
+   */
+  private List<String> getFormatList(String format) {
+    format = strip8Prefix(format);
+    return splitCombinedPatterns(format).stream().map(String::trim).collect(Collectors.toList());
+  }
+
+  /**
+   * Retrieves a list of named OpenSearch formatters given by user mapping.
+   *
+   * @return a list of DateFormatters that can be used to parse a Date/Time/Timestamp.
+   */
+  public List<DateFormatter> getAllNamedFormatters() {
+    return formats.stream()
+        .filter(formatString -> FormatNames.forName(formatString) != null)
+        .map(DateFormatter::forPattern)
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Retrieves a list of numeric formatters that format for dates.
+   *
+   * @return a list of DateFormatters that can be used to parse a Date.
+   */
+  public List<DateFormatter> getNumericNamedFormatters() {
+    return formats.stream()
+        .filter(
+            formatString -> {
+              FormatNames namedFormat = FormatNames.forName(formatString);
+              return namedFormat != null && SUPPORTED_NAMED_NUMERIC_FORMATS.contains(namedFormat);
+            })
+        .map(DateFormatter::forPattern)
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Retrieves a list of custom formats defined by the user.
+   *
+   * @return a list of formats as strings that can be used to parse a Date/Time/Timestamp.
+   */
+  public List<String> getAllCustomFormats() {
+    return formats.stream()
+        .filter(format -> FormatNames.forName(format) == null)
+        .map(
+            format -> {
+              try {
+                DateFormatter.forPattern(format);
+                return format;
+              } catch (Exception ignored) {
+                // parsing failed
+                return null;
+              }
+            })
+        .filter(Objects::nonNull)
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Retrieves a list of custom formatters defined by the user.
+   *
+   * @return a list of DateFormatters that can be used to parse a Date/Time/Timestamp.
+   */
+  public List<DateFormatter> getAllCustomFormatters() {
+    return getAllCustomFormats().stream()
+        .map(DateFormatter::forPattern)
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Retrieves a list of custom formatters and OpenSearch named formatters defined by the user, and
+   * attempts to parse the given date/time string using these formatters.
+   *
+   * @param dateTime The date/time string to parse.
+   * @return A ZonedDateTime representing the parsed date/time in UTC, or null if parsing fails.
+   */
+  public ZonedDateTime getParsedDateTime(String dateTime) {
+    List<DateFormatter> dateFormatters =
+        Stream.concat(this.getAllNamedFormatters().stream(), this.getAllCustomFormatters().stream())
+            .collect(Collectors.toList());
+    ZonedDateTime zonedDateTime = null;
+
+    // check if dateFormatters are empty, then set default ones
+    if (dateFormatters.isEmpty()) {
+      dateFormatters = OPENSEARCH_DEFAULT_FORMATTERS;
+    }
+    // parse using OpenSearch DateFormatters
+    for (DateFormatter formatter : dateFormatters) {
+      try {
+        TemporalAccessor accessor = formatter.parse(dateTime);
+        zonedDateTime = DateFormatters.from(accessor).withZoneSameLocal(ZoneOffset.UTC);
+        break;
+      } catch (IllegalArgumentException ignored) {
+        // nothing to do, try another format
+      }
+    }
+    return zonedDateTime;
+  }
+
+  /**
+   * Returns a formatted date string using the internal formatter, if available.
+   *
+   * @param accessor The TemporalAccessor object containing the date/time information.
+   * @return A formatted date string if a formatter is available, otherwise null.
+   */
+  public String getFormattedDate(TemporalAccessor accessor) {
+    if (hasNoFormatter()) {
+      return OPENSEARCH_DEFAULT_FORMATTERS.get(0).format(accessor);
+    }
+    // Use the first available format string to create the formatter
+    return DateFormatter.forPattern(this.formats.get(0)).format(accessor);
+  }
+
+  /**
+   * Checks if the formatter is not initialized.
+   *
+   * @return True if the formatter is not set, otherwise false.
+   */
+  public boolean hasNoFormatter() {
+    return this.formats.isEmpty();
+  }
+
+  /**
+   * Retrieves a list of named formatters that format for dates.
+   *
+   * @return a list of DateFormatters that can be used to parse a Date.
+   */
+  public List<DateFormatter> getDateNamedFormatters() {
+    return formats.stream()
+        .filter(
+            formatString -> {
+              FormatNames namedFormat = FormatNames.forName(formatString);
+              return namedFormat != null && SUPPORTED_NAMED_DATE_FORMATS.contains(namedFormat);
+            })
+        .map(DateFormatter::forPattern)
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Retrieves a list of named formatters that format for Times.
+   *
+   * @return a list of DateFormatters that can be used to parse a Time.
+   */
+  public List<DateFormatter> getTimeNamedFormatters() {
+    return formats.stream()
+        .filter(
+            formatString -> {
+              FormatNames namedFormat = FormatNames.forName(formatString);
+              return namedFormat != null && SUPPORTED_NAMED_TIME_FORMATS.contains(namedFormat);
+            })
+        .map(DateFormatter::forPattern)
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Retrieves a list of named formatters that format for DateTimes.
+   *
+   * @return a list of DateFormatters that can be used to parse a DateTime.
+   */
+  public List<DateFormatter> getDateTimeNamedFormatters() {
+    return formats.stream()
+        .filter(
+            formatString -> {
+              FormatNames namedFormat = FormatNames.forName(formatString);
+              return namedFormat != null && SUPPORTED_NAMED_DATETIME_FORMATS.contains(namedFormat);
+            })
+        .map(DateFormatter::forPattern)
+        .collect(Collectors.toList());
+  }
+
+  private ExprCoreType getExprTypeFromCustomFormats(List<String> formats) {
+    boolean isDate = false;
+    boolean isTime = false;
+
+    for (String format : formats) {
+      if (!isTime) {
+        for (char symbol : CUSTOM_FORMAT_TIME_SYMBOLS.toCharArray()) {
+          if (format.contains(String.valueOf(symbol))) {
+            isTime = true;
+            break;
+          }
+        }
+      }
+      if (!isDate) {
+        for (char symbol : CUSTOM_FORMAT_DATE_SYMBOLS.toCharArray()) {
+          if (format.contains(String.valueOf(symbol))) {
+            isDate = true;
+            break;
+          }
+        }
+      }
+      if (isDate && isTime) {
+        return TIMESTAMP;
+      }
+    }
+
+    if (isDate) {
+      return DATE;
+    }
+    if (isTime) {
+      return TIME;
+    }
+
+    // Incomplete or incorrect formats: can't be converted to DATE nor TIME, for example `year`
+    return TIMESTAMP;
+  }
+
+  private ExprCoreType getExprTypeFromFormatString(String formatString) {
+    List<DateFormatter> datetimeFormatters = getDateTimeNamedFormatters();
+    List<DateFormatter> numericFormatters = getNumericNamedFormatters();
+
+    if (formatString.isEmpty() || !datetimeFormatters.isEmpty() || !numericFormatters.isEmpty()) {
+      return TIMESTAMP;
+    }
+
+    List<DateFormatter> timeFormatters = getTimeNamedFormatters();
+    List<DateFormatter> dateFormatters = getDateNamedFormatters();
+    if (!timeFormatters.isEmpty() && !dateFormatters.isEmpty()) {
+      return TIMESTAMP;
+    }
+
+    List<String> customFormatters = getAllCustomFormats();
+    if (!customFormatters.isEmpty()) {
+      ExprCoreType customFormatType = getExprTypeFromCustomFormats(customFormatters);
+      ExprCoreType combinedByDefaultFormats = customFormatType;
+      if (!dateFormatters.isEmpty()) {
+        combinedByDefaultFormats = DATE;
+      }
+      if (!timeFormatters.isEmpty()) {
+        combinedByDefaultFormats = TIME;
+      }
+      return customFormatType == combinedByDefaultFormats ? customFormatType : TIMESTAMP;
+    }
+
+    // if there is nothing in the dateformatter that accepts a year/month/day, then
+    // we can assume the type is strictly a Time object
+    if (!timeFormatters.isEmpty()) {
+      return TIME;
+    }
+
+    // if there is nothing in the dateformatter that accepts a hour/minute/second, then
+    // we can assume the type is strictly a Date object
+    if (!dateFormatters.isEmpty()) {
+      return DATE;
+    }
+
+    // Unknown or incorrect format provided
+    return TIMESTAMP;
+  }
+
+  /**
+   * Check if ExprType is compatible for creation of OpenSearchDateType object.
+   *
+   * @param exprType type of the field in the SQL query
+   * @return a boolean if type is a date/time/timestamp type
+   */
+  public static boolean isDateTypeCompatible(ExprType exprType) {
+    if (!(exprType instanceof ExprCoreType)) {
+      return false;
+    }
+    switch ((ExprCoreType) exprType) {
+      case TIMESTAMP:
+      case DATETIME:
+      case DATE:
+      case TIME:
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  /**
+   * Create a Date type which has a LinkedHashMap defining all formats.
+   *
+   * @return A new type object.
+   */
+  public static OpenSearchDateType of(String format) {
+    return new OpenSearchDateType(format);
+  }
+
+  public static OpenSearchDateType of(ExprCoreType exprCoreType) {
+    return new OpenSearchDateType(exprCoreType);
+  }
+
+  public static OpenSearchDateType of(ExprType exprType) {
+    return new OpenSearchDateType(exprType);
+  }
+
+  public static OpenSearchDateType of() {
+    return OpenSearchDateType.instance;
+  }
+
+  @Override
+  public List<ExprType> getParent() {
+    return List.of(exprCoreType);
+  }
+
+  @Override
+  public boolean shouldCast(ExprType other) {
+    return false;
+  }
+
+  @Override
+  protected OpenSearchDataType cloneEmpty() {
+    if (formats.isEmpty()) {
+      return OpenSearchDateType.of(exprCoreType);
+    }
+    return OpenSearchDateType.of(String.join(" || ", formats));
+  }
+}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchGeoPointType.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchGeoPointType.java
new file mode 100644
index 0000000000..75137973c5
--- /dev/null
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchGeoPointType.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.data.type;
+
+import static org.opensearch.sql.data.type.ExprCoreType.UNKNOWN;
+
+import lombok.EqualsAndHashCode;
+
+/**
+ * The type of a geo_point value. See <a
+ * href="https://opensearch.org/docs/latest/opensearch/supported-field-types/geo-point/">doc</a>
+ */
+@EqualsAndHashCode(callSuper = false)
+public class OpenSearchGeoPointType extends OpenSearchDataType {
+
+  private static final OpenSearchGeoPointType instance = new OpenSearchGeoPointType();
+
+  private OpenSearchGeoPointType() {
+    super(MappingType.GeoPoint);
+    exprCoreType = UNKNOWN;
+  }
+
+  public static OpenSearchGeoPointType of() {
+    return OpenSearchGeoPointType.instance;
+  }
+
+  @Override
+  protected OpenSearchDataType cloneEmpty() {
+    return instance;
+  }
+}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchIpType.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchIpType.java
new file mode 100644
index 0000000000..22581ec28c
--- /dev/null
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchIpType.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.data.type;
+
+import static org.opensearch.sql.data.type.ExprCoreType.UNKNOWN;
+
+import lombok.EqualsAndHashCode;
+
+/**
+ * The type of an ip value. See <a
+ * href="https://opensearch.org/docs/latest/opensearch/supported-field-types/ip/">doc</a>
+ */
+@EqualsAndHashCode(callSuper = false)
+public class OpenSearchIpType extends OpenSearchDataType {
+
+  private static final OpenSearchIpType instance = new OpenSearchIpType();
+
+  private OpenSearchIpType() {
+    super(MappingType.Ip);
+    exprCoreType = UNKNOWN;
+  }
+
+  public static OpenSearchIpType of() {
+    return OpenSearchIpType.instance;
+  }
+
+  @Override
+  protected OpenSearchDataType cloneEmpty() {
+    return instance;
+  }
+}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchTextType.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchTextType.java
new file mode 100644
index 0000000000..169eb3f49d
--- /dev/null
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchTextType.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.data.type;
+
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.data.type.ExprCoreType.UNKNOWN;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.List;
+import java.util.Map;
+import lombok.EqualsAndHashCode;
+import org.opensearch.sql.data.type.ExprType;
+
+/**
+ * The type of a text value. See <a
+ * href="https://opensearch.org/docs/latest/opensearch/supported-field-types/text/">doc</a>
+ */
+public class OpenSearchTextType extends OpenSearchDataType {
+
+  private static final OpenSearchTextType instance = new OpenSearchTextType();
+
+  // text could have fields
+  // a read-only collection
+  @EqualsAndHashCode.Exclude Map<String, OpenSearchDataType> fields = ImmutableMap.of();
+
+  private OpenSearchTextType() {
+    super(MappingType.Text);
+    exprCoreType = UNKNOWN;
+  }
+
+  /**
+   * Constructs a Text Type using the passed in fields argument.
+   *
+   * @param fields The fields to be used to construct the text type.
+   * @return A new OpenSeachTextTypeObject
+   */
+  public static OpenSearchTextType of(Map<String, OpenSearchDataType> fields) {
+    var res = new OpenSearchTextType();
+    res.fields = fields;
+    return res;
+  }
+
+  public static OpenSearchTextType of() {
+    return OpenSearchTextType.instance;
+  }
+
+  @Override
+  public List<ExprType> getParent() {
+    return List.of(STRING);
+  }
+
+  @Override
+  public boolean shouldCast(ExprType other) {
+    return false;
+  }
+
+  public Map<String, OpenSearchDataType> getFields() {
+    return fields;
+  }
+
+  @Override
+  protected OpenSearchDataType cloneEmpty() {
+    return OpenSearchTextType.of(Map.copyOf(this.fields));
+  }
+
+  /**
+   * Text field doesn't have doc value (exception thrown even when you call "get") Limitation:
+   * assume inner field name is always "keyword".
+   */
+  public static String convertTextToKeyword(String fieldName, ExprType fieldType) {
+    if (fieldType instanceof OpenSearchTextType
+        && ((OpenSearchTextType) fieldType).getFields().size() > 0) {
+      return fieldName + ".keyword";
+    }
+    return fieldName;
+  }
+}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/Content.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/Content.java
index 94cd9d93ca..21070fa3d6 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/Content.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/Content.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.utils;
 
 import java.util.Iterator;
@@ -12,85 +11,69 @@
 
 /**
  * Regardless the underling data format, the {@link Content} define the data in abstract manner.
- * which could be parsed by ElasticsearchExprValueFactory.
- * There are two major use cases:
- * 1. Represent the JSON data retrieve from OpenSearch search response.
- * 2. Represent the Object data extract from the OpenSearch aggregation response.
+ * which could be parsed by ElasticsearchExprValueFactory. There are two major use cases: 1.
+ * Represent the JSON data retrieve from OpenSearch search response. 2. Represent the Object data
+ * extract from the OpenSearch aggregation response.
  */
 public interface Content {
 
-  /**
-   * Is null value.
-   */
+  /** Is null value. */
   boolean isNull();
 
-  /**
-   * Is number value.
-   */
+  /** Is number value. */
   boolean isNumber();
 
-  /**
-   * Is string value.
-   */
+  /** Is float value. */
+  boolean isFloat();
+
+  /** Is double value. */
+  boolean isDouble();
+
+  /** Is long value. */
+  boolean isLong();
+
+  /** Is boolean value. */
+  boolean isBoolean();
+
+  /** Is string value. */
   boolean isString();
 
-  /**
-   * Get integer value.
-   */
+  /** Is array value. */
+  boolean isArray();
+
+  /** Get integer value. */
   Integer intValue();
 
-  /**
-   * Get long value.
-   */
+  /** Get long value. */
   Long longValue();
 
-  /**
-   * Get short value.
-   */
+  /** Get short value. */
   Short shortValue();
 
-  /**
-   * Get byte value.
-   */
+  /** Get byte value. */
   Byte byteValue();
 
-  /**
-   * Get float value.
-   */
+  /** Get float value. */
   Float floatValue();
 
-  /**
-   * Get double value.
-   */
+  /** Get double value. */
   Double doubleValue();
 
-  /**
-   * Get string value.
-   */
+  /** Get string value. */
   String stringValue();
 
-  /**
-   * Get boolean value.
-   */
+  /** Get boolean value. */
   Boolean booleanValue();
 
-  /**
-   * Get map of {@link Content} value.
-   */
+  /** Get map of {@link Content} value. */
   Iterator<Map.Entry<String, Content>> map();
 
-  /**
-   * Get array of {@link Content} value.
-   */
+  /** Get array of {@link Content} value. */
   Iterator<? extends Content> array();
 
-  /**
-   * Get geo point value.
-   */
+  /** Get geo point value. */
   Pair<Double, Double> geoValue();
 
-  /**
-   * Get {@link Object} value.
-   */
+  /** Get {@link Object} value. */
   Object objectValue();
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/ObjectContent.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/ObjectContent.java
index 15e2e959a4..fd45ca0d51 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/ObjectContent.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/ObjectContent.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.utils;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import java.util.AbstractMap;
 import java.util.Iterator;
 import java.util.List;
@@ -14,17 +14,15 @@
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.tuple.Pair;
 
-/**
- * The Implementation of Content to represent {@link Object}.
- */
+/** The Implementation of Content to represent {@link Object}. */
 @RequiredArgsConstructor
 public class ObjectContent implements Content {
 
   private final Object value;
 
   /**
-   * The parse method parses the value as double value,
-   * since the key values histogram buckets are defaulted to double.
+   * The parse method parses the value as double value, since the key values histogram buckets are
+   * defaulted to double.
    */
   @Override
   public Integer intValue() {
@@ -80,11 +78,14 @@ public Object objectValue() {
   @SuppressWarnings("unchecked")
   @Override
   public Iterator<Map.Entry<String, Content>> map() {
-    return ((Map<String, Object>) value).entrySet().stream()
-        .map(entry -> (Map.Entry<String, Content>) new AbstractMap.SimpleEntry<String, Content>(
-            entry.getKey(),
-            new ObjectContent(entry.getValue())))
-        .iterator();
+    return ((Map<String, Object>) value)
+        .entrySet().stream()
+            .map(
+                entry ->
+                    (Map.Entry<String, Content>)
+                        new AbstractMap.SimpleEntry<String, Content>(
+                            entry.getKey(), new ObjectContent(entry.getValue())))
+            .iterator();
   }
 
   @SuppressWarnings("unchecked")
@@ -103,6 +104,31 @@ public boolean isNumber() {
     return value instanceof Number;
   }
 
+  @Override
+  public boolean isFloat() {
+    return value instanceof Float;
+  }
+
+  @Override
+  public boolean isDouble() {
+    return value instanceof Double;
+  }
+
+  @Override
+  public boolean isLong() {
+    return value instanceof Long;
+  }
+
+  @Override
+  public boolean isBoolean() {
+    return value instanceof Boolean;
+  }
+
+  @Override
+  public boolean isArray() {
+    return value instanceof ArrayNode;
+  }
+
   @Override
   public boolean isString() {
     return value instanceof String;
@@ -114,8 +140,8 @@ public Pair<Double, Double> geoValue() {
     return Pair.of(Double.valueOf(split[0]), Double.valueOf(split[1]));
   }
 
-  private <T> T parseNumberValue(Object value, Function<String, T> stringTFunction,
-                                 Function<Number, T> numberTFunction) {
+  private <T> T parseNumberValue(
+      Object value, Function<String, T> stringTFunction, Function<Number, T> numberTFunction) {
     if (value instanceof String) {
       return stringTFunction.apply((String) value);
     } else {
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/OpenSearchJsonContent.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/OpenSearchJsonContent.java
index 13a1fbf6a4..4446c1f979 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/OpenSearchJsonContent.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/utils/OpenSearchJsonContent.java
@@ -3,20 +3,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.utils;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.Iterators;
+import java.io.IOException;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.tuple.Pair;
-
-/**
- * The Implementation of Content to represent {@link JsonNode}.
- */
+import org.opensearch.OpenSearchParseException;
+import org.opensearch.common.geo.GeoPoint;
+import org.opensearch.common.geo.GeoUtils;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
+
+/** The Implementation of Content to represent {@link JsonNode}. */
 @RequiredArgsConstructor
 public class OpenSearchJsonContent implements Content {
 
@@ -68,8 +73,7 @@ public Iterator<Map.Entry<String, Content>> map() {
     final JsonNode mapValue = value();
     mapValue
         .fieldNames()
-        .forEachRemaining(
-            field -> map.put(field, new OpenSearchJsonContent(mapValue.get(field))));
+        .forEachRemaining(field -> map.put(field, new OpenSearchJsonContent(mapValue.get(field))));
     return map.entrySet().iterator();
   }
 
@@ -88,11 +92,36 @@ public boolean isNumber() {
     return value().isNumber();
   }
 
+  @Override
+  public boolean isLong() {
+    return value().isLong();
+  }
+
+  @Override
+  public boolean isFloat() {
+    return value().isFloat();
+  }
+
+  @Override
+  public boolean isDouble() {
+    return value().isDouble();
+  }
+
   @Override
   public boolean isString() {
     return value().isTextual();
   }
 
+  @Override
+  public boolean isBoolean() {
+    return value().isBoolean();
+  }
+
+  @Override
+  public boolean isArray() {
+    return value().isArray();
+  }
+
   @Override
   public Object objectValue() {
     return value();
@@ -101,49 +130,22 @@ public Object objectValue() {
   @Override
   public Pair<Double, Double> geoValue() {
     final JsonNode value = value();
-    if (value.has("lat") && value.has("lon")) {
-      Double lat = 0d;
-      Double lon = 0d;
-      try {
-        lat = extractDoubleValue(value.get("lat"));
-      } catch (Exception exception) {
-        throw new IllegalStateException(
-            "latitude must be number value, but got value: " + value.get(
-                "lat"));
-      }
-      try {
-        lon = extractDoubleValue(value.get("lon"));
-      } catch (Exception exception) {
-        throw new IllegalStateException(
-            "longitude must be number value, but got value: " + value.get(
-                "lon"));
-      }
-      return Pair.of(lat, lon);
-    } else {
-      throw new IllegalStateException("geo point must in format of {\"lat\": number, \"lon\": "
-          + "number}");
+    try (XContentParser parser =
+        new JsonXContentParser(
+            NamedXContentRegistry.EMPTY,
+            DeprecationHandler.IGNORE_DEPRECATIONS,
+            value.traverse())) {
+      parser.nextToken();
+      GeoPoint point = new GeoPoint();
+      GeoUtils.parseGeoPoint(parser, point, true);
+      return Pair.of(point.getLat(), point.getLon());
+    } catch (IOException ex) {
+      throw new OpenSearchParseException("error parsing geo point", ex);
     }
   }
 
-  /**
-   * Return the first element if is OpenSearch Array.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html.
-   */
+  /** Getter for value. If value is array the whole array is returned. */
   private JsonNode value() {
-    return value.isArray() ? value.get(0) : value;
-  }
-
-  /**
-   * Get doubleValue from JsonNode if possible.
-   */
-  private Double extractDoubleValue(JsonNode node) {
-    if (node.isTextual()) {
-      return Double.valueOf(node.textValue());
-    }
-    if (node.isNumber()) {
-      return node.doubleValue();
-    } else {
-      throw new IllegalStateException("node must be a number");
-    }
+    return value;
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprBinaryValue.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprBinaryValue.java
index 05a1aad20b..1043c1acdc 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprBinaryValue.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprBinaryValue.java
@@ -3,18 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.value;
 
 import lombok.EqualsAndHashCode;
 import org.opensearch.sql.data.model.AbstractExprValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.type.ExprType;
-import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchBinaryType;
 
 /**
- * OpenSearch BinaryValue.
- * Todo, add this to avoid the unknown value type exception, the implementation will be changed.
+ * OpenSearch BinaryValue. Todo, add this to avoid the unknown value type exception, the
+ * implementation will be changed.
  */
 @EqualsAndHashCode(callSuper = false)
 public class OpenSearchExprBinaryValue extends AbstractExprValue {
@@ -41,6 +40,6 @@ public Object value() {
 
   @Override
   public ExprType type() {
-    return OpenSearchDataType.OPENSEARCH_BINARY;
+    return OpenSearchBinaryType.of();
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprGeoPointValue.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprGeoPointValue.java
index ff235cc330..0de9c898e8 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprGeoPointValue.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprGeoPointValue.java
@@ -3,20 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.value;
 
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_GEO_POINT;
-
 import java.util.Objects;
 import lombok.Data;
 import org.opensearch.sql.data.model.AbstractExprValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchGeoPointType;
 
 /**
- * OpenSearch GeoPointValue.
- * Todo, add this to avoid the unknown value type exception, the implementation will be changed.
+ * OpenSearch GeoPointValue. Todo, add this to avoid the unknown value type exception, the
+ * implementation will be changed.
  */
 public class OpenSearchExprGeoPointValue extends AbstractExprValue {
 
@@ -33,12 +31,13 @@ public Object value() {
 
   @Override
   public ExprType type() {
-    return OPENSEARCH_GEO_POINT;
+    return OpenSearchGeoPointType.of();
   }
 
   @Override
   public int compare(ExprValue other) {
-    return geoPoint.toString()
+    return geoPoint
+        .toString()
         .compareTo((((OpenSearchExprGeoPointValue) other).geoPoint).toString());
   }
 
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprIpValue.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprIpValue.java
index 8b4021833e..467e14e7f1 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprIpValue.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprIpValue.java
@@ -3,20 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.value;
 
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_IP;
-
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.data.model.AbstractExprValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchIpType;
 
 /**
- * OpenSearch IP ExprValue.
- * Todo, add this to avoid the unknown value type exception, the implementation will be changed.
+ * OpenSearch IP ExprValue. Todo, add this to avoid the unknown value type exception, the
+ * implementation will be changed.
  */
 @RequiredArgsConstructor
 public class OpenSearchExprIpValue extends AbstractExprValue {
@@ -30,7 +28,7 @@ public Object value() {
 
   @Override
   public ExprType type() {
-    return OPENSEARCH_IP;
+    return OpenSearchIpType.of();
   }
 
   @Override
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextKeywordValue.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextKeywordValue.java
deleted file mode 100644
index f7dafba23b..0000000000
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextKeywordValue.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.sql.opensearch.data.value;
-
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
-
-import org.opensearch.sql.data.model.ExprStringValue;
-import org.opensearch.sql.data.type.ExprType;
-
-/**
- * Expression Text Keyword Value, it is an extension of the ExprValue by Elasticsearch.
- * This mostly represents a multi-field in OpenSearch which has a text field and a
- * keyword field inside to preserve the original text.
- */
-public class OpenSearchExprTextKeywordValue extends ExprStringValue {
-
-  public OpenSearchExprTextKeywordValue(String value) {
-    super(value);
-  }
-
-  @Override
-  public ExprType type() {
-    return OPENSEARCH_TEXT_KEYWORD;
-  }
-
-}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextValue.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextValue.java
index 93681d6ded..fb696d6b04 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextValue.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextValue.java
@@ -3,17 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.value;
 
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT;
-
 import org.opensearch.sql.data.model.ExprStringValue;
 import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 
-/**
- * Expression Text Value, it is a extension of the ExprValue by Elasticsearch.
- */
+/** Expression Text Value, it is a extension of the ExprValue by OpenSearch. */
 public class OpenSearchExprTextValue extends ExprStringValue {
   public OpenSearchExprTextValue(String value) {
     super(value);
@@ -21,6 +17,6 @@ public OpenSearchExprTextValue(String value) {
 
   @Override
   public ExprType type() {
-    return OPENSEARCH_TEXT;
+    return OpenSearchTextType.of();
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java
index 2536121e91..e736663f60 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java
@@ -3,49 +3,51 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.value;
 
 import static org.opensearch.sql.data.type.ExprCoreType.ARRAY;
 import static org.opensearch.sql.data.type.ExprCoreType.BOOLEAN;
-import static org.opensearch.sql.data.type.ExprCoreType.BYTE;
 import static org.opensearch.sql.data.type.ExprCoreType.DATE;
 import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
 import static org.opensearch.sql.data.type.ExprCoreType.DOUBLE;
 import static org.opensearch.sql.data.type.ExprCoreType.FLOAT;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.LONG;
-import static org.opensearch.sql.data.type.ExprCoreType.SHORT;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
 import static org.opensearch.sql.data.type.ExprCoreType.TIME;
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_BINARY;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_GEO_POINT;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_IP;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
 import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER;
+import static org.opensearch.sql.utils.DateTimeFormatters.STRICT_HOUR_MINUTE_SECOND_FORMATTER;
+import static org.opensearch.sql.utils.DateTimeFormatters.STRICT_YEAR_MONTH_DAY_FORMATTER;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableMap;
 import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeParseException;
+import java.time.temporal.TemporalAccessor;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Function;
+import java.util.function.BiFunction;
 import lombok.Getter;
 import lombok.Setter;
+import org.opensearch.OpenSearchParseException;
+import org.opensearch.common.time.DateFormatter;
 import org.opensearch.common.time.DateFormatters;
+import org.opensearch.common.time.FormatNames;
 import org.opensearch.sql.data.model.ExprBooleanValue;
 import org.opensearch.sql.data.model.ExprByteValue;
 import org.opensearch.sql.data.model.ExprCollectionValue;
 import org.opensearch.sql.data.model.ExprDateValue;
-import org.opensearch.sql.data.model.ExprDatetimeValue;
 import org.opensearch.sql.data.model.ExprDoubleValue;
 import org.opensearch.sql.data.model.ExprFloatValue;
 import org.opensearch.sql.data.model.ExprIntegerValue;
@@ -57,101 +59,145 @@
 import org.opensearch.sql.data.model.ExprTimestampValue;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchBinaryType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDateType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchIpType;
 import org.opensearch.sql.opensearch.data.utils.Content;
 import org.opensearch.sql.opensearch.data.utils.ObjectContent;
 import org.opensearch.sql.opensearch.data.utils.OpenSearchJsonContent;
 import org.opensearch.sql.opensearch.response.agg.OpenSearchAggregationResponseParser;
 
-/**
- * Construct ExprValue from OpenSearch response.
- */
+/** Construct ExprValue from OpenSearch response. */
 public class OpenSearchExprValueFactory {
+  /** The Mapping of Field and ExprType. */
+  private final Map<String, OpenSearchDataType> typeMapping;
+
   /**
-   * The Mapping of Field and ExprType.
+   * Extend existing mapping by new data without overwrite. Called from aggregation only {@see
+   * AggregationQueryBuilder#buildTypeMapping}.
+   *
+   * @param typeMapping A data type mapping produced by aggregation.
    */
-  @Setter
-  private Map<String, ExprType> typeMapping;
+  public void extendTypeMapping(Map<String, OpenSearchDataType> typeMapping) {
+    for (var field : typeMapping.keySet()) {
+      // Prevent overwriting, because aggregation engine may be not aware
+      // of all niceties of all types.
+      if (!this.typeMapping.containsKey(field)) {
+        this.typeMapping.put(field, typeMapping.get(field));
+      }
+    }
+  }
 
-  @Getter
-  @Setter
-  private OpenSearchAggregationResponseParser parser;
+  @Getter @Setter private OpenSearchAggregationResponseParser parser;
 
   private static final String TOP_PATH = "";
 
   private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
-  private final Map<ExprType, Function<Content, ExprValue>> typeActionMap =
-      new ImmutableMap.Builder<ExprType, Function<Content, ExprValue>>()
-          .put(INTEGER, c -> new ExprIntegerValue(c.intValue()))
-          .put(LONG, c -> new ExprLongValue(c.longValue()))
-          .put(SHORT, c -> new ExprShortValue(c.shortValue()))
-          .put(BYTE, c -> new ExprByteValue(c.byteValue()))
-          .put(FLOAT, c -> new ExprFloatValue(c.floatValue()))
-          .put(DOUBLE, c -> new ExprDoubleValue(c.doubleValue()))
-          .put(STRING, c -> new ExprStringValue(c.stringValue()))
-          .put(BOOLEAN, c -> ExprBooleanValue.of(c.booleanValue()))
-          .put(TIMESTAMP, this::parseTimestamp)
-          .put(DATE, c -> new ExprDateValue(parseTimestamp(c).dateValue().toString()))
-          .put(TIME, c -> new ExprTimeValue(parseTimestamp(c).timeValue().toString()))
-          .put(DATETIME, c -> new ExprDatetimeValue(parseTimestamp(c).datetimeValue()))
-          .put(OPENSEARCH_TEXT, c -> new OpenSearchExprTextValue(c.stringValue()))
-          .put(OPENSEARCH_TEXT_KEYWORD, c -> new OpenSearchExprTextKeywordValue(c.stringValue()))
-          .put(OPENSEARCH_IP, c -> new OpenSearchExprIpValue(c.stringValue()))
-          .put(OPENSEARCH_GEO_POINT, c -> new OpenSearchExprGeoPointValue(c.geoValue().getLeft(),
-              c.geoValue().getRight()))
-          .put(OPENSEARCH_BINARY, c -> new OpenSearchExprBinaryValue(c.stringValue()))
+  private static final Map<ExprType, BiFunction<Content, ExprType, ExprValue>> typeActionMap =
+      new ImmutableMap.Builder<ExprType, BiFunction<Content, ExprType, ExprValue>>()
+          .put(
+              OpenSearchDataType.of(OpenSearchDataType.MappingType.Integer),
+              (c, dt) -> new ExprIntegerValue(c.intValue()))
+          .put(
+              OpenSearchDataType.of(OpenSearchDataType.MappingType.Long),
+              (c, dt) -> new ExprLongValue(c.longValue()))
+          .put(
+              OpenSearchDataType.of(OpenSearchDataType.MappingType.Short),
+              (c, dt) -> new ExprShortValue(c.shortValue()))
+          .put(
+              OpenSearchDataType.of(OpenSearchDataType.MappingType.Byte),
+              (c, dt) -> new ExprByteValue(c.byteValue()))
+          .put(
+              OpenSearchDataType.of(OpenSearchDataType.MappingType.Float),
+              (c, dt) -> new ExprFloatValue(c.floatValue()))
+          .put(
+              OpenSearchDataType.of(OpenSearchDataType.MappingType.Double),
+              (c, dt) -> new ExprDoubleValue(c.doubleValue()))
+          .put(
+              OpenSearchDataType.of(OpenSearchDataType.MappingType.Text),
+              (c, dt) -> new OpenSearchExprTextValue(c.stringValue()))
+          .put(
+              OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword),
+              (c, dt) -> new ExprStringValue(c.stringValue()))
+          .put(
+              OpenSearchDataType.of(OpenSearchDataType.MappingType.Boolean),
+              (c, dt) -> ExprBooleanValue.of(c.booleanValue()))
+          // Handles the creation of DATE, TIME & DATETIME
+          .put(OpenSearchDateType.of(TIME), OpenSearchExprValueFactory::createOpenSearchDateType)
+          .put(OpenSearchDateType.of(DATE), OpenSearchExprValueFactory::createOpenSearchDateType)
+          .put(
+              OpenSearchDateType.of(TIMESTAMP),
+              OpenSearchExprValueFactory::createOpenSearchDateType)
+          .put(
+              OpenSearchDateType.of(DATETIME), OpenSearchExprValueFactory::createOpenSearchDateType)
+          .put(
+              OpenSearchDataType.of(OpenSearchDataType.MappingType.Ip),
+              (c, dt) -> new OpenSearchExprIpValue(c.stringValue()))
+          .put(
+              OpenSearchDataType.of(OpenSearchDataType.MappingType.Binary),
+              (c, dt) -> new OpenSearchExprBinaryValue(c.stringValue()))
           .build();
 
-  /**
-   * Constructor of OpenSearchExprValueFactory.
-   */
-  public OpenSearchExprValueFactory(
-      Map<String, ExprType> typeMapping) {
-    this.typeMapping = typeMapping;
+  /** Constructor of OpenSearchExprValueFactory. */
+  public OpenSearchExprValueFactory(Map<String, OpenSearchDataType> typeMapping) {
+    this.typeMapping = OpenSearchDataType.traverseAndFlatten(typeMapping);
   }
 
   /**
-   * The struct construction has the following assumption. 1. The field has OpenSearch Object
-   * data type. https://www.elastic.co/guide/en/elasticsearch/reference/current/object.html 2. The
-   * deeper field is flattened in the typeMapping. e.g. {"employ", "STRUCT"} {"employ.id",
-   * "INTEGER"} {"employ.state", "STRING"}
+   * The struct construction has the following assumption: 1. The field has OpenSearch Object data
+   * type. See <a
+   * href="https://www.elastic.co/guide/en/elasticsearch/reference/current/object.html">docs</a> 2.
+   * The deeper field is flattened in the typeMapping. e.g. { "employ", "STRUCT" } { "employ.id",
+   * "INTEGER" } { "employ.state", "STRING" }
    */
-  public ExprValue construct(String jsonString) {
+  public ExprValue construct(String jsonString, boolean supportArrays) {
     try {
-      return parse(new OpenSearchJsonContent(OBJECT_MAPPER.readTree(jsonString)), TOP_PATH,
-          Optional.of(STRUCT));
+      return parse(
+          new OpenSearchJsonContent(OBJECT_MAPPER.readTree(jsonString)),
+          TOP_PATH,
+          Optional.of(STRUCT),
+          supportArrays);
     } catch (JsonProcessingException e) {
       throw new IllegalStateException(String.format("invalid json: %s.", jsonString), e);
     }
   }
 
   /**
-   * Construct ExprValue from field and its value object. Throw exception if trying
-   * to construct from field of unsupported type.
-   * Todo, add IP, GeoPoint support after we have function implementation around it.
+   * Construct ExprValue from field and its value object. Throw exception if trying to construct
+   * from field of unsupported type. Todo, add IP, GeoPoint support after we have function
+   * implementation around it.
    *
    * @param field field name
    * @param value value object
    * @return ExprValue
    */
-  public ExprValue construct(String field, Object value) {
-    return parse(new ObjectContent(value), field, type(field));
+  public ExprValue construct(String field, Object value, boolean supportArrays) {
+    return parse(new ObjectContent(value), field, type(field), supportArrays);
   }
 
-  private ExprValue parse(Content content, String field, Optional<ExprType> fieldType) {
+  private ExprValue parse(
+      Content content, String field, Optional<ExprType> fieldType, boolean supportArrays) {
     if (content.isNull() || !fieldType.isPresent()) {
       return ExprNullValue.of();
     }
 
-    ExprType type = fieldType.get();
-    if (type == STRUCT) {
-      return parseStruct(content, field);
-    } else if (type == ARRAY) {
-      return parseArray(content, field);
+    final ExprType type = fieldType.get();
+
+    if (type.equals(OpenSearchDataType.of(OpenSearchDataType.MappingType.GeoPoint))) {
+      return parseGeoPoint(content, supportArrays);
+    } else if (type.equals(OpenSearchDataType.of(OpenSearchDataType.MappingType.Nested))
+        || content.isArray()) {
+      return parseArray(content, field, type, supportArrays);
+    } else if (type.equals(OpenSearchDataType.of(OpenSearchDataType.MappingType.Object))
+        || type == STRUCT) {
+      return parseStruct(content, field, supportArrays);
     } else {
       if (typeActionMap.containsKey(type)) {
-        return typeActionMap.get(type).apply(content);
+        return typeActionMap.get(type).apply(content, type);
       } else {
         throw new IllegalStateException(
             String.format(
@@ -161,71 +207,237 @@ private ExprValue parse(Content content, String field, Optional<ExprType> fieldT
   }
 
   /**
-   * In OpenSearch, it is possible field doesn't have type definition in mapping.
-   * but has empty value. For example, {"empty_field": []}.
+   * In OpenSearch, it is possible field doesn't have type definition in mapping. but has empty
+   * value. For example, {"empty_field": []}.
    */
   private Optional<ExprType> type(String field) {
     return Optional.ofNullable(typeMapping.get(field));
   }
 
   /**
-   * Only default strict_date_optional_time||epoch_millis is supported,
-   * strict_date_optional_time_nanos||epoch_millis if field is date_nanos.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/date.html
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/date_nanos.html
-   * The customized date_format is not supported.
+   * Parse value with the first matching formatter into {@link ExprValue} with corresponding {@link
+   * ExprCoreType}.
+   *
+   * @param value - time as string
+   * @param dataType - field data type
+   * @return Parsed value
    */
-  private ExprValue constructTimestamp(String value) {
+  private static ExprValue parseDateTimeString(String value, OpenSearchDateType dataType) {
+    List<DateFormatter> formatters = dataType.getAllNamedFormatters();
+    formatters.addAll(dataType.getAllCustomFormatters());
+    ExprCoreType returnFormat = dataType.getExprCoreType();
+
+    for (DateFormatter formatter : formatters) {
+      try {
+        TemporalAccessor accessor = formatter.parse(value);
+        ZonedDateTime zonedDateTime = DateFormatters.from(accessor);
+        switch (returnFormat) {
+          case TIME:
+            return new ExprTimeValue(zonedDateTime.withZoneSameLocal(UTC_ZONE_ID).toLocalTime());
+          case DATE:
+            return new ExprDateValue(zonedDateTime.withZoneSameLocal(UTC_ZONE_ID).toLocalDate());
+          default:
+            return new ExprTimestampValue(zonedDateTime.withZoneSameLocal(UTC_ZONE_ID).toInstant());
+        }
+      } catch (IllegalArgumentException ignored) {
+        // nothing to do, try another format
+      }
+    }
+
+    // if no formatters are available, try the default formatter
     try {
-      return new ExprTimestampValue(
-          // Using OpenSearch DateFormatters for now.
-          DateFormatters.from(DATE_TIME_FORMATTER.parse(value)).toInstant());
-    } catch (DateTimeParseException e) {
-      throw new IllegalStateException(
-          String.format(
-              "Construct ExprTimestampValue from \"%s\" failed, unsupported date format.", value),
-          e);
+      switch (returnFormat) {
+        case TIME:
+          return new ExprTimeValue(
+              DateFormatters.from(STRICT_HOUR_MINUTE_SECOND_FORMATTER.parse(value)).toLocalTime());
+        case DATE:
+          return new ExprDateValue(
+              DateFormatters.from(STRICT_YEAR_MONTH_DAY_FORMATTER.parse(value)).toLocalDate());
+        default:
+          return new ExprTimestampValue(
+              DateFormatters.from(DATE_TIME_FORMATTER.parse(value)).toInstant());
+      }
+    } catch (DateTimeParseException ignored) {
+      // ignored
     }
+
+    throw new IllegalArgumentException(
+        String.format("Construct %s from \"%s\" failed, unsupported format.", returnFormat, value));
   }
 
-  private ExprValue parseTimestamp(Content value) {
-    if (value.isNumber()) {
-      return new ExprTimestampValue(Instant.ofEpochMilli(value.longValue()));
-    } else if (value.isString()) {
-      return constructTimestamp(value.stringValue());
-    } else {
-      return new ExprTimestampValue((Instant) value.objectValue());
+  private static ExprValue createOpenSearchDateType(Content value, ExprType type) {
+    OpenSearchDateType dt = (OpenSearchDateType) type;
+    ExprCoreType returnFormat = dt.getExprCoreType();
+    if (value.isNumber()) { // isNumber
+      var numFormatters = dt.getNumericNamedFormatters();
+      if (numFormatters.size() > 0 || !dt.hasFormats()) {
+        long epochMillis = 0;
+        if (numFormatters.contains(
+            DateFormatter.forPattern(FormatNames.EPOCH_SECOND.getSnakeCaseName()))) {
+          // no CamelCase for `EPOCH_*` formats
+          epochMillis = value.longValue() * 1000;
+        } else /* EPOCH_MILLIS */ {
+          epochMillis = value.longValue();
+        }
+        Instant instant = Instant.ofEpochMilli(epochMillis);
+        switch (returnFormat) {
+          case TIME:
+            return new ExprTimeValue(LocalTime.from(instant.atZone(UTC_ZONE_ID)));
+          case DATE:
+            return new ExprDateValue(LocalDate.ofInstant(instant, UTC_ZONE_ID));
+          default:
+            return new ExprTimestampValue(instant);
+        }
+      } else {
+        // custom format
+        return parseDateTimeString(value.stringValue(), dt);
+      }
+    }
+    if (value.isString()) {
+      return parseDateTimeString(value.stringValue(), dt);
     }
+
+    return new ExprTimestampValue((Instant) value.objectValue());
   }
 
-  private ExprValue parseStruct(Content content, String prefix) {
+  /**
+   * Parse struct content.
+   *
+   * @param content Content to parse.
+   * @param prefix Prefix for Level of object depth to parse.
+   * @param supportArrays Parsing the whole array if array is type nested.
+   * @return Value parsed from content.
+   */
+  private ExprValue parseStruct(Content content, String prefix, boolean supportArrays) {
     LinkedHashMap<String, ExprValue> result = new LinkedHashMap<>();
-    content.map().forEachRemaining(entry -> result.put(entry.getKey(),
-        parse(entry.getValue(),
-            makeField(prefix, entry.getKey()),
-            type(makeField(prefix, entry.getKey())))));
+    content
+        .map()
+        .forEachRemaining(
+            entry ->
+                result.put(
+                    entry.getKey(),
+                    parse(
+                        entry.getValue(),
+                        makeField(prefix, entry.getKey()),
+                        type(makeField(prefix, entry.getKey())),
+                        supportArrays)));
     return new ExprTupleValue(result);
   }
 
   /**
-   * Todo. ARRAY is not support now. In Elasticsearch, there is no dedicated array data type.
-   * https://www.elastic.co/guide/en/elasticsearch/reference/current/array.html. The similar data
-   * type is nested, but it can only allow a list of objects.
+   * Parse array content. Can also parse nested which isn't necessarily an array.
+   *
+   * @param content Content to parse.
+   * @param prefix Prefix for Level of object depth to parse.
+   * @param type Type of content parsing.
+   * @param supportArrays Parsing the whole array if array is type nested.
+   * @return Value parsed from content.
    */
-  private ExprValue parseArray(Content content, String prefix) {
+  private ExprValue parseArray(
+      Content content, String prefix, ExprType type, boolean supportArrays) {
     List<ExprValue> result = new ArrayList<>();
-    content.array().forEachRemaining(v -> {
-      // ExprCoreType.ARRAY does not indicate inner elements type. OpenSearch nested will be an
-      // array of structs, otherwise parseArray currently only supports array of strings.
-      if (v.isString()) {
-        result.add(parse(v, prefix, Optional.of(STRING)));
-      } else {
-        result.add(parse(v, prefix, Optional.of(STRUCT)));
-      }
-    });
+
+    // ARRAY is mapped to nested but can take the json structure of an Object.
+    if (content.objectValue() instanceof ObjectNode) {
+      result.add(parseStruct(content, prefix, supportArrays));
+      // non-object type arrays are only supported when parsing inner_hits of OS response.
+    } else if (!(type instanceof OpenSearchDataType
+            && ((OpenSearchDataType) type).getExprType().equals(ARRAY))
+        && !supportArrays) {
+      return parseInnerArrayValue(content.array().next(), prefix, type, supportArrays);
+    } else {
+      content
+          .array()
+          .forEachRemaining(
+              v -> {
+                result.add(parseInnerArrayValue(v, prefix, type, supportArrays));
+              });
+    }
     return new ExprCollectionValue(result);
   }
 
+  /**
+   * Parse geo point content.
+   *
+   * @param content Content to parse.
+   * @param supportArrays Parsing the whole array or not
+   * @return Geo point value parsed from content.
+   */
+  private ExprValue parseGeoPoint(Content content, boolean supportArrays) {
+    // there is only one point in doc.
+    if (content.isArray() == false) {
+      final var pair = content.geoValue();
+      return new OpenSearchExprGeoPointValue(pair.getLeft(), pair.getRight());
+    }
+
+    var elements = content.array();
+    var first = elements.next();
+    // an array in the [longitude, latitude] format.
+    if (first.isNumber()) {
+      double lon = first.doubleValue();
+      var second = elements.next();
+      if (second.isNumber() == false) {
+        throw new OpenSearchParseException("lat must be a number, got " + second.objectValue());
+      }
+      return new OpenSearchExprGeoPointValue(second.doubleValue(), lon);
+    }
+
+    // there are multi points in doc
+    var pair = first.geoValue();
+    var firstPoint = new OpenSearchExprGeoPointValue(pair.getLeft(), pair.getRight());
+    if (supportArrays) {
+      List<ExprValue> result = new ArrayList<>();
+      result.add(firstPoint);
+      elements.forEachRemaining(
+          e -> {
+            var p = e.geoValue();
+            result.add(new OpenSearchExprGeoPointValue(p.getLeft(), p.getRight()));
+          });
+      return new ExprCollectionValue(result);
+    } else {
+      return firstPoint;
+    }
+  }
+
+  /**
+   * Parse inner array value. Can be object type and recurse continues.
+   *
+   * @param content Array index being parsed.
+   * @param prefix Prefix for value.
+   * @param type Type of inner array value.
+   * @param supportArrays Parsing the whole array if array is type nested.
+   * @return Inner array value.
+   */
+  private ExprValue parseInnerArrayValue(
+      Content content, String prefix, ExprType type, boolean supportArrays) {
+    if (type instanceof OpenSearchIpType
+        || type instanceof OpenSearchBinaryType
+        || type instanceof OpenSearchDateType) {
+      return parse(content, prefix, Optional.of(type), supportArrays);
+    } else if (content.isString()) {
+      return parse(content, prefix, Optional.of(OpenSearchDataType.of(STRING)), supportArrays);
+    } else if (content.isLong()) {
+      return parse(content, prefix, Optional.of(OpenSearchDataType.of(LONG)), supportArrays);
+    } else if (content.isFloat()) {
+      return parse(content, prefix, Optional.of(OpenSearchDataType.of(FLOAT)), supportArrays);
+    } else if (content.isDouble()) {
+      return parse(content, prefix, Optional.of(OpenSearchDataType.of(DOUBLE)), supportArrays);
+    } else if (content.isNumber()) {
+      return parse(content, prefix, Optional.of(OpenSearchDataType.of(INTEGER)), supportArrays);
+    } else if (content.isBoolean()) {
+      return parse(content, prefix, Optional.of(OpenSearchDataType.of(BOOLEAN)), supportArrays);
+    } else {
+      return parse(content, prefix, Optional.of(STRUCT), supportArrays);
+    }
+  }
+
+  /**
+   * Make complete path string for field.
+   *
+   * @param path Path of field.
+   * @param field Field to append to path.
+   * @return Field appended to path level.
+   */
   private String makeField(String path, String field) {
     return path.equalsIgnoreCase(TOP_PATH) ? field : String.join(".", path, field);
   }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngine.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngine.java
index 9a136a3bec..21046956d0 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngine.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngine.java
@@ -3,18 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.executor;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.executor.ExecutionContext;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.Explain;
+import org.opensearch.sql.executor.pagination.PlanSerializer;
 import org.opensearch.sql.opensearch.client.OpenSearchClient;
 import org.opensearch.sql.opensearch.executor.protector.ExecutionProtector;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
@@ -27,6 +27,7 @@ public class OpenSearchExecutionEngine implements ExecutionEngine {
   private final OpenSearchClient client;
 
   private final ExecutionProtector executionProtector;
+  private final PlanSerializer planSerializer;
 
   @Override
   public void execute(PhysicalPlan physicalPlan, ResponseListener<QueryResponse> listener) {
@@ -34,8 +35,10 @@ public void execute(PhysicalPlan physicalPlan, ResponseListener<QueryResponse> l
   }
 
   @Override
-  public void execute(PhysicalPlan physicalPlan, ExecutionContext context,
-                      ResponseListener<QueryResponse> listener) {
+  public void execute(
+      PhysicalPlan physicalPlan,
+      ExecutionContext context,
+      ResponseListener<QueryResponse> listener) {
     PhysicalPlan plan = executionProtector.protect(physicalPlan);
     client.schedule(
         () -> {
@@ -49,7 +52,9 @@ public void execute(PhysicalPlan physicalPlan, ExecutionContext context,
               result.add(plan.next());
             }
 
-            QueryResponse response = new QueryResponse(physicalPlan.schema(), result);
+            QueryResponse response =
+                new QueryResponse(
+                    physicalPlan.schema(), result, planSerializer.convertToCursor(plan));
             listener.onResponse(response);
           } catch (Exception e) {
             listener.onFailure(e);
@@ -61,22 +66,27 @@ public void execute(PhysicalPlan physicalPlan, ExecutionContext context,
 
   @Override
   public void explain(PhysicalPlan plan, ResponseListener<ExplainResponse> listener) {
-    client.schedule(() -> {
-      try {
-        Explain openSearchExplain = new Explain() {
-          @Override
-          public ExplainResponseNode visitTableScan(TableScanOperator node, Object context) {
-            return explain(node, context, explainNode -> {
-              explainNode.setDescription(ImmutableMap.of("request", node.explain()));
-            });
-          }
-        };
+    client.schedule(
+        () -> {
+          try {
+            Explain openSearchExplain =
+                new Explain() {
+                  @Override
+                  public ExplainResponseNode visitTableScan(
+                      TableScanOperator node, Object context) {
+                    return explain(
+                        node,
+                        context,
+                        explainNode -> {
+                          explainNode.setDescription(Map.of("request", node.explain()));
+                        });
+                  }
+                };
 
-        listener.onResponse(openSearchExplain.apply(plan));
-      } catch (Exception e) {
-        listener.onFailure(e);
-      }
-    });
+            listener.onResponse(openSearchExplain.apply(plan));
+          } catch (Exception e) {
+            listener.onFailure(e);
+          }
+        });
   }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManager.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManager.java
index 9c6fcdb825..dbe91dc398 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManager.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManager.java
@@ -18,9 +18,7 @@
 import org.opensearch.sql.executor.execution.AbstractPlan;
 import org.opensearch.threadpool.ThreadPool;
 
-/**
- * QueryManager implemented in OpenSearch cluster.
- */
+/** QueryManager implemented in OpenSearch cluster. */
 @RequiredArgsConstructor
 public class OpenSearchQueryManager implements QueryManager {
 
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/ExecutionProtector.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/ExecutionProtector.java
index 42c49b44d8..3a11ee99d7 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/ExecutionProtector.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/ExecutionProtector.java
@@ -3,19 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.executor.protector;
 
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
 
-/**
- * Execution Plan Protector.
- */
+/** Execution Plan Protector. */
 public abstract class ExecutionProtector extends PhysicalPlanNodeVisitor<PhysicalPlan, Object> {
 
-  /**
-   * Decorated the PhysicalPlan to run in resource sensitive mode.
-   */
+  /** Decorated the PhysicalPlan to run in resource sensitive mode. */
   public abstract PhysicalPlan protect(PhysicalPlan physicalPlan);
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/NoopExecutionProtector.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/NoopExecutionProtector.java
index 03e2f0c61c..88a5108159 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/NoopExecutionProtector.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/NoopExecutionProtector.java
@@ -3,14 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.executor.protector;
 
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 
-/**
- * No operation execution protector.
- */
+/** No operation execution protector. */
 public class NoopExecutionProtector extends ExecutionProtector {
 
   @Override
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtector.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtector.java
index f06ecb8576..28827b0a54 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtector.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtector.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.executor.protector;
 
 import lombok.RequiredArgsConstructor;
@@ -12,35 +11,43 @@
 import org.opensearch.sql.opensearch.planner.physical.MLCommonsOperator;
 import org.opensearch.sql.opensearch.planner.physical.MLOperator;
 import org.opensearch.sql.planner.physical.AggregationOperator;
+import org.opensearch.sql.planner.physical.CursorCloseOperator;
 import org.opensearch.sql.planner.physical.DedupeOperator;
 import org.opensearch.sql.planner.physical.EvalOperator;
 import org.opensearch.sql.planner.physical.FilterOperator;
 import org.opensearch.sql.planner.physical.LimitOperator;
+import org.opensearch.sql.planner.physical.NestedOperator;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.planner.physical.ProjectOperator;
 import org.opensearch.sql.planner.physical.RareTopNOperator;
 import org.opensearch.sql.planner.physical.RemoveOperator;
 import org.opensearch.sql.planner.physical.RenameOperator;
 import org.opensearch.sql.planner.physical.SortOperator;
+import org.opensearch.sql.planner.physical.TakeOrderedOperator;
 import org.opensearch.sql.planner.physical.ValuesOperator;
 import org.opensearch.sql.planner.physical.WindowOperator;
 import org.opensearch.sql.storage.TableScanOperator;
 
-/**
- * OpenSearch Execution Protector.
- */
+/** OpenSearch Execution Protector. */
 @RequiredArgsConstructor
 public class OpenSearchExecutionProtector extends ExecutionProtector {
 
-  /**
-   * OpenSearch resource monitor.
-   */
+  /** OpenSearch resource monitor. */
   private final ResourceMonitor resourceMonitor;
 
   public PhysicalPlan protect(PhysicalPlan physicalPlan) {
     return physicalPlan.accept(this, null);
   }
 
+  /**
+   * Don't protect {@link CursorCloseOperator} and entire nested tree, because {@link
+   * CursorCloseOperator} as designed as no-op.
+   */
+  @Override
+  public PhysicalPlan visitCursorClose(CursorCloseOperator node, Object context) {
+    return node;
+  }
+
   @Override
   public PhysicalPlan visitFilter(FilterOperator node, Object context) {
     return new FilterOperator(visitInput(node.getInput(), context), node.getConditions());
@@ -48,14 +55,18 @@ public PhysicalPlan visitFilter(FilterOperator node, Object context) {
 
   @Override
   public PhysicalPlan visitAggregation(AggregationOperator node, Object context) {
-    return new AggregationOperator(visitInput(node.getInput(), context), node.getAggregatorList(),
-        node.getGroupByExprList());
+    return new AggregationOperator(
+        visitInput(node.getInput(), context), node.getAggregatorList(), node.getGroupByExprList());
   }
 
   @Override
   public PhysicalPlan visitRareTopN(RareTopNOperator node, Object context) {
-    return new RareTopNOperator(visitInput(node.getInput(), context), node.getCommandType(),
-        node.getNoOfResults(), node.getFieldExprList(), node.getGroupByExprList());
+    return new RareTopNOperator(
+        visitInput(node.getInput(), context),
+        node.getCommandType(),
+        node.getNoOfResults(),
+        node.getFieldExprList(),
+        node.getGroupByExprList());
   }
 
   @Override
@@ -63,9 +74,7 @@ public PhysicalPlan visitRename(RenameOperator node, Object context) {
     return new RenameOperator(visitInput(node.getInput(), context), node.getMapping());
   }
 
-  /**
-   * Decorate with {@link ResourceMonitorPlan}.
-   */
+  /** Decorate with {@link ResourceMonitorPlan}. */
   @Override
   public PhysicalPlan visitTableScan(TableScanOperator node, Object context) {
     return doProtect(node);
@@ -73,7 +82,9 @@ public PhysicalPlan visitTableScan(TableScanOperator node, Object context) {
 
   @Override
   public PhysicalPlan visitProject(ProjectOperator node, Object context) {
-    return new ProjectOperator(visitInput(node.getInput(), context), node.getProjectList(),
+    return new ProjectOperator(
+        visitInput(node.getInput(), context),
+        node.getProjectList(),
         node.getNamedParseExpressions());
   }
 
@@ -87,10 +98,23 @@ public PhysicalPlan visitEval(EvalOperator node, Object context) {
     return new EvalOperator(visitInput(node.getInput(), context), node.getExpressionList());
   }
 
+  @Override
+  public PhysicalPlan visitNested(NestedOperator node, Object context) {
+    return doProtect(
+        new NestedOperator(
+            visitInput(node.getInput(), context),
+            node.getFields(),
+            node.getGroupedPathsAndFields()));
+  }
+
   @Override
   public PhysicalPlan visitDedupe(DedupeOperator node, Object context) {
-    return new DedupeOperator(visitInput(node.getInput(), context), node.getDedupeList(),
-        node.getAllowedDuplication(), node.getKeepEmpty(), node.getConsecutive());
+    return new DedupeOperator(
+        visitInput(node.getInput(), context),
+        node.getDedupeList(),
+        node.getAllowedDuplication(),
+        node.getKeepEmpty(),
+        node.getConsecutive());
   }
 
   @Override
@@ -101,20 +125,25 @@ public PhysicalPlan visitWindow(WindowOperator node, Object context) {
         node.getWindowDefinition());
   }
 
-  /**
-   * Decorate with {@link ResourceMonitorPlan}.
-   */
+  /** Decorate with {@link ResourceMonitorPlan}. */
   @Override
   public PhysicalPlan visitSort(SortOperator node, Object context) {
+    return doProtect(new SortOperator(visitInput(node.getInput(), context), node.getSortList()));
+  }
+
+  /** Decorate with {@link ResourceMonitorPlan}. */
+  @Override
+  public PhysicalPlan visitTakeOrdered(TakeOrderedOperator node, Object context) {
     return doProtect(
-        new SortOperator(
+        new TakeOrderedOperator(
             visitInput(node.getInput(), context),
+            node.getLimit(),
+            node.getOffset(),
             node.getSortList()));
   }
 
   /**
-   * Values are a sequence of rows of literal value in memory
-   * which doesn't need memory protection.
+   * Values are a sequence of rows of literal value in memory which doesn't need memory protection.
    */
   @Override
   public PhysicalPlan visitValues(ValuesOperator node, Object context) {
@@ -124,41 +153,38 @@ public PhysicalPlan visitValues(ValuesOperator node, Object context) {
   @Override
   public PhysicalPlan visitLimit(LimitOperator node, Object context) {
     return new LimitOperator(
-        visitInput(node.getInput(), context),
-        node.getLimit(),
-        node.getOffset());
+        visitInput(node.getInput(), context), node.getLimit(), node.getOffset());
   }
 
   @Override
   public PhysicalPlan visitMLCommons(PhysicalPlan node, Object context) {
     MLCommonsOperator mlCommonsOperator = (MLCommonsOperator) node;
     return doProtect(
-            new MLCommonsOperator(visitInput(mlCommonsOperator.getInput(), context),
-                    mlCommonsOperator.getAlgorithm(),
-                    mlCommonsOperator.getArguments(),
-                    mlCommonsOperator.getNodeClient())
-    );
+        new MLCommonsOperator(
+            visitInput(mlCommonsOperator.getInput(), context),
+            mlCommonsOperator.getAlgorithm(),
+            mlCommonsOperator.getArguments(),
+            mlCommonsOperator.getNodeClient()));
   }
 
   @Override
   public PhysicalPlan visitAD(PhysicalPlan node, Object context) {
     ADOperator adOperator = (ADOperator) node;
     return doProtect(
-            new ADOperator(visitInput(adOperator.getInput(), context),
-                    adOperator.getArguments(),
-                    adOperator.getNodeClient()
-                    )
-    );
+        new ADOperator(
+            visitInput(adOperator.getInput(), context),
+            adOperator.getArguments(),
+            adOperator.getNodeClient()));
   }
 
   @Override
   public PhysicalPlan visitML(PhysicalPlan node, Object context) {
     MLOperator mlOperator = (MLOperator) node;
     return doProtect(
-            new MLOperator(visitInput(mlOperator.getInput(), context),
-                    mlOperator.getArguments(),
-                    mlOperator.getNodeClient())
-    );
+        new MLOperator(
+            visitInput(mlOperator.getInput(), context),
+            mlOperator.getArguments(),
+            mlOperator.getNodeClient()));
   }
 
   PhysicalPlan visitInput(PhysicalPlan node, Object context) {
@@ -179,5 +205,4 @@ protected PhysicalPlan doProtect(PhysicalPlan node) {
   private boolean isProtected(PhysicalPlan node) {
     return (node instanceof ResourceMonitorPlan);
   }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/ResourceMonitorPlan.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/ResourceMonitorPlan.java
index 9c59e4acaf..e3bc48ba72 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/ResourceMonitorPlan.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/protector/ResourceMonitorPlan.java
@@ -3,48 +3,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.executor.protector;
 
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.util.List;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.monitor.ResourceMonitor;
+import org.opensearch.sql.planner.SerializablePlan;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
 
-/**
- * A PhysicalPlan which will run the delegate plan in resource protection manner.
- */
+/** A PhysicalPlan which will run the delegate plan in resource protection manner. */
 @ToString
 @RequiredArgsConstructor
-@EqualsAndHashCode
-public class ResourceMonitorPlan extends PhysicalPlan {
+@EqualsAndHashCode(callSuper = false)
+public class ResourceMonitorPlan extends PhysicalPlan implements SerializablePlan {
 
-  /**
-   * How many method calls to delegate's next() to perform resource check once.
-   */
+  /** How many method calls to delegate's next() to perform resource check once. */
   public static final long NUMBER_OF_NEXT_CALL_TO_CHECK = 1000;
 
-  /**
-   * Delegated PhysicalPlan.
-   */
+  /** Delegated PhysicalPlan. */
   private final PhysicalPlan delegate;
 
-  /**
-   * ResourceMonitor.
-   */
-  @ToString.Exclude
-  private final ResourceMonitor monitor;
-
-  /**
-   * Count how many calls to delegate's next() already.
-   */
-  @EqualsAndHashCode.Exclude
-  private long nextCallCount = 0L;
+  /** ResourceMonitor. */
+  @ToString.Exclude private final ResourceMonitor monitor;
 
+  /** Count how many calls to delegate's next() already. */
+  @EqualsAndHashCode.Exclude private long nextCallCount = 0L;
 
   @Override
   public <R, C> R accept(PhysicalPlanNodeVisitor<R, C> visitor, C context) {
@@ -82,4 +72,23 @@ public ExprValue next() {
     }
     return delegate.next();
   }
+
+  @Override
+  public SerializablePlan getPlanForSerialization() {
+    return (SerializablePlan) delegate;
+  }
+
+  /**
+   * Those two methods should never be called. They called if a plan upper in the tree missed to
+   * call {@link #getPlanForSerialization}.
+   */
+  @Override
+  public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    throw new UnsupportedOperationException();
+  }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/mapping/IndexMapping.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/mapping/IndexMapping.java
index 64bfcc9972..87aa9d93dd 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/mapping/IndexMapping.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/mapping/IndexMapping.java
@@ -3,35 +3,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.mapping;
 
-import static java.util.Collections.emptyMap;
-
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import lombok.Getter;
 import lombok.ToString;
 import org.opensearch.cluster.metadata.MappingMetadata;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
 
 /**
- * OpenSearch index mapping. Because there is no specific behavior for different field types,
- * string is used to represent field types.
+ * OpenSearch index mapping. Because there is no specific behavior for different field types, string
+ * is used to represent field types.
  */
 @ToString
 public class IndexMapping {
 
   /** Field mappings from field name to field type in OpenSearch date type system. */
-  private final Map<String, String> fieldMappings;
-
-  public IndexMapping(Map<String, String> fieldMappings) {
-    this.fieldMappings = fieldMappings;
-  }
+  @Getter private final Map<String, OpenSearchDataType> fieldMappings;
 
+  /**
+   * Maps each column in the index definition to an OpenSearchSQL datatype.
+   *
+   * @param metaData The metadata retrieved from the index mapping defined by the user.
+   */
+  @SuppressWarnings("unchecked")
   public IndexMapping(MappingMetadata metaData) {
-    this.fieldMappings = flatMappings(metaData.getSourceAsMap());
+    this.fieldMappings =
+        OpenSearchDataType.parseMapping(
+            (Map<String, Object>) metaData.getSourceAsMap().getOrDefault("properties", null));
   }
 
   /**
@@ -42,63 +41,4 @@ public IndexMapping(MappingMetadata metaData) {
   public int size() {
     return fieldMappings.size();
   }
-
-  /**
-   * Return field type by its name.
-   *
-   * @param fieldName field name
-   * @return field type in string. Or null if not exist.
-   */
-  public String getFieldType(String fieldName) {
-    return fieldMappings.get(fieldName);
-  }
-
-  /**
-   * Get all field types and transform raw string type to expected type.
-   *
-   * @param transform transform function to transform field type in string to another type
-   * @param <T> expected field type class
-   * @return mapping from field name to field type
-   */
-  public <T> Map<String, T> getAllFieldTypes(Function<String, T> transform) {
-    return fieldMappings.entrySet().stream()
-        .collect(Collectors.toMap(Map.Entry::getKey, e -> transform.apply(e.getValue())));
-  }
-
-  @SuppressWarnings("unchecked")
-  private Map<String, String> flatMappings(Map<String, Object> indexMapping) {
-    ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<>();
-
-    flatMappings(
-        ((Map<String, Object>) indexMapping.getOrDefault("properties", emptyMap())),
-        "",
-        builder::put);
-    return builder.build();
-  }
-
-  @SuppressWarnings("unchecked")
-  private void flatMappings(
-      Map<String, Object> mappings, String path, BiConsumer<String, String> func) {
-    mappings.forEach(
-        (fieldName, mappingObject) -> {
-          Map<String, Object> mapping = (Map<String, Object>) mappingObject;
-          String fullFieldName = path.isEmpty() ? fieldName : path + "." + fieldName;
-
-          if (isMultiField(mapping)) {
-            func.accept(fullFieldName, "text_keyword");
-          } else {
-            String type = (String) mapping.getOrDefault("type", "object");
-            func.accept(fullFieldName, type);
-          }
-
-          if (mapping.containsKey("properties")) { // Nested field
-            flatMappings((Map<String, Object>) mapping.get("properties"), fullFieldName, func);
-          }
-        });
-  }
-
-  private boolean isMultiField(Map<String, Object> mapping) {
-    return mapping.containsKey("fields");
-  }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/monitor/OpenSearchMemoryHealthy.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/monitor/OpenSearchMemoryHealthy.java
index c0a4aeb0b7..4b7b6c5dcb 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/monitor/OpenSearchMemoryHealthy.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/monitor/OpenSearchMemoryHealthy.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.monitor;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -11,9 +10,7 @@
 import lombok.NoArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
-/**
- * OpenSearch Memory Monitor.
- */
+/** OpenSearch Memory Monitor. */
 @Log4j2
 public class OpenSearchMemoryHealthy {
   private final RandomFail randomFail;
@@ -25,16 +22,12 @@ public OpenSearchMemoryHealthy() {
   }
 
   @VisibleForTesting
-  public OpenSearchMemoryHealthy(
-      RandomFail randomFail,
-      MemoryUsage memoryUsage) {
+  public OpenSearchMemoryHealthy(RandomFail randomFail, MemoryUsage memoryUsage) {
     this.randomFail = randomFail;
     this.memoryUsage = memoryUsage;
   }
 
-  /**
-   * Is Memory Healthy. Calculate based on the current heap memory usage.
-   */
+  /** Is Memory Healthy. Calculate based on the current heap memory usage. */
   public boolean isMemoryHealthy(long limitBytes) {
     final long memoryUsage = this.memoryUsage.usage();
     log.debug("Memory usage:{}, limit:{}", memoryUsage, limitBytes);
@@ -66,12 +59,8 @@ public long usage() {
   }
 
   @NoArgsConstructor
-  public static class MemoryUsageExceedFastFailureException extends RuntimeException {
-
-  }
+  public static class MemoryUsageExceedFastFailureException extends RuntimeException {}
 
   @NoArgsConstructor
-  public static class MemoryUsageExceedException extends RuntimeException {
-
-  }
+  public static class MemoryUsageExceedException extends RuntimeException {}
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/monitor/OpenSearchResourceMonitor.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/monitor/OpenSearchResourceMonitor.java
index e6e070ed52..3c689f4933 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/monitor/OpenSearchResourceMonitor.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/monitor/OpenSearchResourceMonitor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.monitor;
 
 import io.github.resilience4j.core.IntervalFunction;
@@ -11,14 +10,13 @@
 import io.github.resilience4j.retry.RetryConfig;
 import java.util.function.Supplier;
 import lombok.extern.log4j.Log4j2;
-import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.unit.ByteSizeValue;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.monitor.ResourceMonitor;
 
 /**
  * {@link ResourceMonitor} implementation on Elasticsearch. When the heap memory usage exceeds
- * certain threshold, the monitor is not healthy.
- * Todo, add metrics.
+ * certain threshold, the monitor is not healthy. Todo, add metrics.
  */
 @Log4j2
 public class OpenSearchResourceMonitor extends ResourceMonitor {
@@ -26,20 +24,15 @@ public class OpenSearchResourceMonitor extends ResourceMonitor {
   private final Retry retry;
   private final OpenSearchMemoryHealthy memoryMonitor;
 
-  /**
-   * Constructor of ElasticsearchCircuitBreaker.
-   */
-  public OpenSearchResourceMonitor(
-      Settings settings,
-      OpenSearchMemoryHealthy memoryMonitor) {
+  /** Constructor of ElasticsearchCircuitBreaker. */
+  public OpenSearchResourceMonitor(Settings settings, OpenSearchMemoryHealthy memoryMonitor) {
     this.settings = settings;
     RetryConfig config =
         RetryConfig.custom()
             .maxAttempts(3)
             .intervalFunction(IntervalFunction.ofExponentialRandomBackoff(1000))
             .retryExceptions(OpenSearchMemoryHealthy.MemoryUsageExceedException.class)
-            .ignoreExceptions(
-                OpenSearchMemoryHealthy.MemoryUsageExceedFastFailureException.class)
+            .ignoreExceptions(OpenSearchMemoryHealthy.MemoryUsageExceedFastFailureException.class)
             .build();
     retry = Retry.of("mem", config);
     this.memoryMonitor = memoryMonitor;
@@ -55,9 +48,7 @@ public boolean isHealthy() {
     try {
       ByteSizeValue limit = settings.getSettingValue(Settings.Key.QUERY_MEMORY_LIMIT);
       Supplier<Boolean> booleanSupplier =
-          Retry.decorateSupplier(retry,
-              () -> memoryMonitor
-                  .isMemoryHealthy(limit.getBytes()));
+          Retry.decorateSupplier(retry, () -> memoryMonitor.isMemoryHealthy(limit.getBytes()));
       return booleanSupplier.get();
     } catch (Exception e) {
       return false;
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/ADOperator.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/ADOperator.java
index 7a0ae7c960..f9c32b7424 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/ADOperator.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/ADOperator.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.planner.physical;
 
 import static org.opensearch.sql.utils.MLCommonsConstants.ANOMALY_RATE;
@@ -41,65 +40,62 @@
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
 
-/**
- * AD Physical operator to call AD interface to get results for
- * algorithm execution.
- */
+/** AD Physical operator to call AD interface to get results for algorithm execution. */
 @RequiredArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 public class ADOperator extends MLCommonsOperatorActions {
 
-  @Getter
-  private final PhysicalPlan input;
+  @Getter private final PhysicalPlan input;
 
-  @Getter
-  private final Map<String, Literal> arguments;
+  @Getter private final Map<String, Literal> arguments;
 
-  @Getter
-  private final NodeClient nodeClient;
+  @Getter private final NodeClient nodeClient;
 
-  @EqualsAndHashCode.Exclude
-  private Iterator<ExprValue> iterator;
+  @EqualsAndHashCode.Exclude private Iterator<ExprValue> iterator;
 
   private FunctionName rcfType;
 
   @Override
   public void open() {
     super.open();
-    String categoryField = arguments.containsKey(CATEGORY_FIELD)
-        ? (String) arguments.get(CATEGORY_FIELD).getValue() : null;
-    List<Pair<DataFrame, DataFrame>>
-        inputDataFrames = generateCategorizedInputDataset(input, categoryField);
+    String categoryField =
+        arguments.containsKey(CATEGORY_FIELD)
+            ? (String) arguments.get(CATEGORY_FIELD).getValue()
+            : null;
+    List<Pair<DataFrame, DataFrame>> inputDataFrames =
+        generateCategorizedInputDataset(input, categoryField);
     MLAlgoParams mlAlgoParams = convertArgumentToMLParameter(arguments);
 
-    List<MLPredictionOutput> predictionResults = inputDataFrames.stream()
-        .map(pair -> getMLPredictionResult(rcfType, mlAlgoParams, pair.getRight(), nodeClient))
-        .collect(Collectors.toList());
+    List<MLPredictionOutput> predictionResults =
+        inputDataFrames.stream()
+            .map(pair -> getMLPredictionResult(rcfType, mlAlgoParams, pair.getRight(), nodeClient))
+            .collect(Collectors.toList());
 
     Iterator<Pair<DataFrame, DataFrame>> inputDataFramesIter = inputDataFrames.iterator();
     Iterator<MLPredictionOutput> predictionResultIter = predictionResults.iterator();
-    iterator = new Iterator<ExprValue>() {
-      private DataFrame inputDataFrame = null;
-      private Iterator<Row> inputRowIter = null;
-      private MLPredictionOutput predictionResult = null;
-      private Iterator<Row> resultRowIter = null;
-
-      @Override
-      public boolean hasNext() {
-        return inputRowIter != null && inputRowIter.hasNext() || inputDataFramesIter.hasNext();
-      }
-
-      @Override
-      public ExprValue next() {
-        if (inputRowIter == null || !inputRowIter.hasNext()) {
-          inputDataFrame = inputDataFramesIter.next().getLeft();
-          inputRowIter = inputDataFrame.iterator();
-          predictionResult = predictionResultIter.next();
-          resultRowIter = predictionResult.getPredictionResult().iterator();
-        }
-        return buildResult(inputRowIter, inputDataFrame, predictionResult, resultRowIter);
-      }
-    };
+    iterator =
+        new Iterator<ExprValue>() {
+          private DataFrame inputDataFrame = null;
+          private Iterator<Row> inputRowIter = null;
+          private MLPredictionOutput predictionResult = null;
+          private Iterator<Row> resultRowIter = null;
+
+          @Override
+          public boolean hasNext() {
+            return inputRowIter != null && inputRowIter.hasNext() || inputDataFramesIter.hasNext();
+          }
+
+          @Override
+          public ExprValue next() {
+            if (inputRowIter == null || !inputRowIter.hasNext()) {
+              inputDataFrame = inputDataFramesIter.next().getLeft();
+              inputRowIter = inputDataFrame.iterator();
+              predictionResult = predictionResultIter.next();
+              resultRowIter = predictionResult.getPredictionResult().iterator();
+            }
+            return buildResult(inputRowIter, inputDataFrame, predictionResult, resultRowIter);
+          }
+        };
   }
 
   @Override
@@ -126,53 +122,66 @@ protected MLAlgoParams convertArgumentToMLParameter(Map<String, Literal> argumen
     if (arguments.get(TIME_FIELD) == null) {
       rcfType = FunctionName.BATCH_RCF;
       return BatchRCFParams.builder()
-          .numberOfTrees(arguments.containsKey(NUMBER_OF_TREES)
-              ? ((Integer) arguments.get(NUMBER_OF_TREES).getValue())
-              : null)
-          .sampleSize(arguments.containsKey(SAMPLE_SIZE)
-              ? ((Integer) arguments.get(SAMPLE_SIZE).getValue())
-              : null)
-          .outputAfter(arguments.containsKey(OUTPUT_AFTER)
-              ? ((Integer) arguments.get(OUTPUT_AFTER).getValue())
-              : null)
-          .trainingDataSize(arguments.containsKey(TRAINING_DATA_SIZE)
-              ? ((Integer) arguments.get(TRAINING_DATA_SIZE).getValue())
-              : null)
-          .anomalyScoreThreshold(arguments.containsKey(ANOMALY_SCORE_THRESHOLD)
-              ? ((Double) arguments.get(ANOMALY_SCORE_THRESHOLD).getValue())
-              : null)
+          .numberOfTrees(
+              arguments.containsKey(NUMBER_OF_TREES)
+                  ? ((Integer) arguments.get(NUMBER_OF_TREES).getValue())
+                  : null)
+          .sampleSize(
+              arguments.containsKey(SAMPLE_SIZE)
+                  ? ((Integer) arguments.get(SAMPLE_SIZE).getValue())
+                  : null)
+          .outputAfter(
+              arguments.containsKey(OUTPUT_AFTER)
+                  ? ((Integer) arguments.get(OUTPUT_AFTER).getValue())
+                  : null)
+          .trainingDataSize(
+              arguments.containsKey(TRAINING_DATA_SIZE)
+                  ? ((Integer) arguments.get(TRAINING_DATA_SIZE).getValue())
+                  : null)
+          .anomalyScoreThreshold(
+              arguments.containsKey(ANOMALY_SCORE_THRESHOLD)
+                  ? ((Double) arguments.get(ANOMALY_SCORE_THRESHOLD).getValue())
+                  : null)
           .build();
     }
     rcfType = FunctionName.FIT_RCF;
     return FitRCFParams.builder()
-        .numberOfTrees(arguments.containsKey(NUMBER_OF_TREES)
-            ? ((Integer) arguments.get(NUMBER_OF_TREES).getValue())
-            : null)
-        .shingleSize(arguments.containsKey(SHINGLE_SIZE)
-            ? ((Integer) arguments.get(SHINGLE_SIZE).getValue())
-            : null)
-        .sampleSize(arguments.containsKey(SAMPLE_SIZE)
-            ? ((Integer) arguments.get(SAMPLE_SIZE).getValue())
-            : null)
-        .outputAfter(arguments.containsKey(OUTPUT_AFTER)
-            ? ((Integer) arguments.get(OUTPUT_AFTER).getValue())
-            : null)
-        .timeDecay(arguments.containsKey(TIME_DECAY)
-            ? ((Double) arguments.get(TIME_DECAY).getValue())
-            : null)
-        .anomalyRate(arguments.containsKey(ANOMALY_RATE)
-            ? ((Double) arguments.get(ANOMALY_RATE).getValue())
-            : null)
-        .timeField(arguments.containsKey(TIME_FIELD)
-            ? ((String) arguments.get(TIME_FIELD).getValue())
-            : null)
-        .dateFormat(arguments.containsKey(DATE_FORMAT)
-            ? ((String) arguments.get(DATE_FORMAT).getValue())
-            : "yyyy-MM-dd HH:mm:ss")
-        .timeZone(arguments.containsKey(TIME_ZONE)
-            ? ((String) arguments.get(TIME_ZONE).getValue())
-            : null)
+        .numberOfTrees(
+            arguments.containsKey(NUMBER_OF_TREES)
+                ? ((Integer) arguments.get(NUMBER_OF_TREES).getValue())
+                : null)
+        .shingleSize(
+            arguments.containsKey(SHINGLE_SIZE)
+                ? ((Integer) arguments.get(SHINGLE_SIZE).getValue())
+                : null)
+        .sampleSize(
+            arguments.containsKey(SAMPLE_SIZE)
+                ? ((Integer) arguments.get(SAMPLE_SIZE).getValue())
+                : null)
+        .outputAfter(
+            arguments.containsKey(OUTPUT_AFTER)
+                ? ((Integer) arguments.get(OUTPUT_AFTER).getValue())
+                : null)
+        .timeDecay(
+            arguments.containsKey(TIME_DECAY)
+                ? ((Double) arguments.get(TIME_DECAY).getValue())
+                : null)
+        .anomalyRate(
+            arguments.containsKey(ANOMALY_RATE)
+                ? ((Double) arguments.get(ANOMALY_RATE).getValue())
+                : null)
+        .timeField(
+            arguments.containsKey(TIME_FIELD)
+                ? ((String) arguments.get(TIME_FIELD).getValue())
+                : null)
+        .dateFormat(
+            arguments.containsKey(DATE_FORMAT)
+                ? ((String) arguments.get(DATE_FORMAT).getValue())
+                : "yyyy-MM-dd HH:mm:ss")
+        .timeZone(
+            arguments.containsKey(TIME_ZONE)
+                ? ((String) arguments.get(TIME_ZONE).getValue())
+                : null)
         .build();
   }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperator.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperator.java
index 48e21246b2..ef60782a24 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperator.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperator.java
@@ -30,26 +30,21 @@
 import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
 
 /**
- * ml-commons Physical operator to call machine learning interface to get results for
- * algorithm execution.
+ * ml-commons Physical operator to call machine learning interface to get results for algorithm
+ * execution.
  */
 @RequiredArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 public class MLCommonsOperator extends MLCommonsOperatorActions {
-  @Getter
-  private final PhysicalPlan input;
+  @Getter private final PhysicalPlan input;
 
-  @Getter
-  private final String algorithm;
+  @Getter private final String algorithm;
 
-  @Getter
-  private final Map<String, Literal> arguments;
+  @Getter private final Map<String, Literal> arguments;
 
-  @Getter
-  private final NodeClient nodeClient;
+  @Getter private final NodeClient nodeClient;
 
-  @EqualsAndHashCode.Exclude
-  private Iterator<ExprValue> iterator;
+  @EqualsAndHashCode.Exclude private Iterator<ExprValue> iterator;
 
   @Override
   public void open() {
@@ -57,22 +52,26 @@ public void open() {
     DataFrame inputDataFrame = generateInputDataset(input);
     MLAlgoParams mlAlgoParams = convertArgumentToMLParameter(arguments, algorithm);
     MLPredictionOutput predictionResult =
-            getMLPredictionResult(FunctionName.valueOf(algorithm.toUpperCase()),
-                    mlAlgoParams, inputDataFrame, nodeClient);
+        getMLPredictionResult(
+            FunctionName.valueOf(algorithm.toUpperCase()),
+            mlAlgoParams,
+            inputDataFrame,
+            nodeClient);
 
     Iterator<Row> inputRowIter = inputDataFrame.iterator();
     Iterator<Row> resultRowIter = predictionResult.getPredictionResult().iterator();
-    iterator = new Iterator<ExprValue>() {
-      @Override
-      public boolean hasNext() {
-        return inputRowIter.hasNext();
-      }
-
-      @Override
-      public ExprValue next() {
-        return buildResult(inputRowIter, inputDataFrame, predictionResult, resultRowIter);
-      }
-    };
+    iterator =
+        new Iterator<ExprValue>() {
+          @Override
+          public boolean hasNext() {
+            return inputRowIter.hasNext();
+          }
+
+          @Override
+          public ExprValue next() {
+            return buildResult(inputRowIter, inputDataFrame, predictionResult, resultRowIter);
+          }
+        };
   }
 
   @Override
@@ -95,31 +94,33 @@ public List<PhysicalPlan> getChild() {
     return Collections.singletonList(input);
   }
 
-  protected MLAlgoParams convertArgumentToMLParameter(Map<String, Literal> arguments,
-                                                      String algorithm) {
+  protected MLAlgoParams convertArgumentToMLParameter(
+      Map<String, Literal> arguments, String algorithm) {
     switch (FunctionName.valueOf(algorithm.toUpperCase())) {
       case KMEANS:
         return KMeansParams.builder()
-                .centroids(arguments.containsKey(CENTROIDS)
-                        ? ((Integer) arguments.get(CENTROIDS).getValue())
+            .centroids(
+                arguments.containsKey(CENTROIDS)
+                    ? ((Integer) arguments.get(CENTROIDS).getValue())
+                    : null)
+            .iterations(
+                arguments.containsKey(ITERATIONS)
+                    ? ((Integer) arguments.get(ITERATIONS).getValue())
+                    : null)
+            .distanceType(
+                arguments.containsKey(DISTANCE_TYPE)
+                    ? (arguments.get(DISTANCE_TYPE).getValue() != null
+                        ? KMeansParams.DistanceType.valueOf(
+                            ((String) arguments.get(DISTANCE_TYPE).getValue()).toUpperCase())
                         : null)
-                .iterations(arguments.containsKey(ITERATIONS)
-                        ? ((Integer) arguments.get(ITERATIONS).getValue())
-                        : null)
-                .distanceType(arguments.containsKey(DISTANCE_TYPE)
-                        ? (arguments.get(DISTANCE_TYPE).getValue() != null
-                        ? KMeansParams.DistanceType.valueOf((
-                                (String) arguments.get(DISTANCE_TYPE).getValue()).toUpperCase())
-                        : null)
-                        : null)
-                .build();
+                    : null)
+            .build();
       default:
         // TODO: update available algorithms in the message when adding a new case
         throw new IllegalArgumentException(
-                String.format("unsupported algorithm: %s, available algorithms: %s.",
+            String.format(
+                "unsupported algorithm: %s, available algorithms: %s.",
                 FunctionName.valueOf(algorithm.toUpperCase()), KMEANS));
     }
   }
-
 }
-
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorActions.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorActions.java
index e1f12fb8a7..ddb0e2d5f4 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorActions.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorActions.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.planner.physical;
 
 import static org.opensearch.sql.utils.MLCommonsConstants.MODELID;
@@ -48,13 +47,12 @@
 import org.opensearch.sql.opensearch.client.MLClient;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 
-/**
- * Common method actions for ml-commons related operators.
- */
+/** Common method actions for ml-commons related operators. */
 public abstract class MLCommonsOperatorActions extends PhysicalPlan {
 
   /**
    * generate ml-commons request input dataset.
+   *
    * @param input physical input
    * @return ml-commons dataframe
    */
@@ -70,33 +68,37 @@ protected DataFrame generateInputDataset(PhysicalPlan input) {
   /**
    * Generate ml-commons request input dataset per each category based on a given category field.
    * Each category value will be a {@link DataFrame} pair, where the left one contains all fields
-   * for building response, and the right one contains all fields except the aggregated field for
-   * ml prediction. This is a temporary solution before ml-commons supports 2 dimensional input.
+   * for building response, and the right one contains all fields except the aggregated field for ml
+   * prediction. This is a temporary solution before ml-commons supports 2 dimensional input.
    *
    * @param input physical input
    * @param categoryField String, the field should be aggregated on
    * @return list of ml-commons dataframe pairs
    */
-  protected List<Pair<DataFrame, DataFrame>> generateCategorizedInputDataset(PhysicalPlan input,
-                                                                             String categoryField) {
+  protected List<Pair<DataFrame, DataFrame>> generateCategorizedInputDataset(
+      PhysicalPlan input, String categoryField) {
     Map<ExprValue, MLInputRows> inputMap = new HashMap<>();
     while (input.hasNext()) {
       Map<String, ExprValue> tupleValue = input.next().tupleValue();
       ExprValue categoryValue = categoryField == null ? null : tupleValue.get(categoryField);
-      MLInputRows inputData =
-          inputMap.computeIfAbsent(categoryValue, k -> new MLInputRows());
+      MLInputRows inputData = inputMap.computeIfAbsent(categoryValue, k -> new MLInputRows());
       inputData.addTupleValue(tupleValue);
     }
 
     // categoryField should be excluded for ml-commons predictions
-    return inputMap.values().stream().filter(inputData -> inputData.size() > 0).map(
-            inputData -> new ImmutablePair<>(inputData.toDataFrame(),
-                inputData.toFilteredDataFrame(e -> !e.getKey().equals(categoryField))))
+    return inputMap.values().stream()
+        .filter(inputData -> inputData.size() > 0)
+        .map(
+            inputData ->
+                new ImmutablePair<>(
+                    inputData.toDataFrame(),
+                    inputData.toFilteredDataFrame(e -> !e.getKey().equals(categoryField))))
         .collect(Collectors.toList());
   }
 
   /**
    * covert result schema into ExprValue.
+   *
    * @param columnMetas column metas
    * @param row row
    * @return a map of result schema in ExprValue format
@@ -113,13 +115,15 @@ protected Map<String, ExprValue> convertRowIntoExprValue(ColumnMeta[] columnMeta
 
   /**
    * populate result map by ml-commons supported data type.
+   *
    * @param columnValue column value
    * @param resultKeyName result kay name
    * @param resultBuilder result builder
    */
-  protected void populateResultBuilder(ColumnValue columnValue,
-                                     String resultKeyName,
-                                     ImmutableMap.Builder<String, ExprValue> resultBuilder) {
+  protected void populateResultBuilder(
+      ColumnValue columnValue,
+      String resultKeyName,
+      ImmutableMap.Builder<String, ExprValue> resultBuilder) {
     switch (columnValue.columnType()) {
       case INTEGER:
         resultBuilder.put(resultKeyName, new ExprIntegerValue(columnValue.intValue()));
@@ -149,14 +153,14 @@ protected void populateResultBuilder(ColumnValue columnValue,
 
   /**
    * concert result into ExprValue.
+   *
    * @param columnMetas column metas
    * @param row row
    * @param schema schema
    * @return a map of result in ExprValue format
    */
-  protected Map<String, ExprValue> convertResultRowIntoExprValue(ColumnMeta[] columnMetas,
-                                                               Row row,
-                                                               Map<String, ExprValue> schema) {
+  protected Map<String, ExprValue> convertResultRowIntoExprValue(
+      ColumnMeta[] columnMetas, Row row, Map<String, ExprValue> schema) {
     ImmutableMap.Builder<String, ExprValue> resultBuilder = new ImmutableMap.Builder<>();
     for (int i = 0; i < columnMetas.length; i++) {
       ColumnValue columnValue = row.getValue(i);
@@ -167,29 +171,31 @@ protected Map<String, ExprValue> convertResultRowIntoExprValue(ColumnMeta[] colu
         resultKeyName = resultKeyName + "1";
       }
       populateResultBuilder(columnValue, resultKeyName, resultBuilder);
-
     }
     return resultBuilder.build();
   }
 
   /**
    * iterate result and built it into ExprTupleValue.
+   *
    * @param inputRowIter input row iterator
    * @param inputDataFrame input data frame
    * @param predictionResult prediction result
    * @param resultRowIter result row iterator
    * @return result in ExprTupleValue format
    */
-  protected ExprTupleValue buildResult(Iterator<Row> inputRowIter,
-                                       DataFrame inputDataFrame,
-                                       MLPredictionOutput predictionResult,
-                                       Iterator<Row> resultRowIter) {
+  protected ExprTupleValue buildResult(
+      Iterator<Row> inputRowIter,
+      DataFrame inputDataFrame,
+      MLPredictionOutput predictionResult,
+      Iterator<Row> resultRowIter) {
     ImmutableMap.Builder<String, ExprValue> resultSchemaBuilder = new ImmutableMap.Builder<>();
-    resultSchemaBuilder.putAll(convertRowIntoExprValue(inputDataFrame.columnMetas(),
-            inputRowIter.next()));
+    resultSchemaBuilder.putAll(
+        convertRowIntoExprValue(inputDataFrame.columnMetas(), inputRowIter.next()));
     Map<String, ExprValue> resultSchema = resultSchemaBuilder.build();
     ImmutableMap.Builder<String, ExprValue> resultBuilder = new ImmutableMap.Builder<>();
-    resultBuilder.putAll(convertResultRowIntoExprValue(
+    resultBuilder.putAll(
+        convertResultRowIntoExprValue(
             predictionResult.getPredictionResult().columnMetas(),
             resultRowIter.next(),
             resultSchema));
@@ -199,74 +205,73 @@ protected ExprTupleValue buildResult(Iterator<Row> inputRowIter,
 
   /**
    * get ml-commons train and predict result.
+   *
    * @param functionName ml-commons algorithm name
    * @param mlAlgoParams ml-commons algorithm parameters
    * @param inputDataFrame input data frame
    * @param nodeClient node client
    * @return ml-commons train and predict result
    */
-  protected MLPredictionOutput getMLPredictionResult(FunctionName functionName,
-                                                     MLAlgoParams mlAlgoParams,
-                                                     DataFrame inputDataFrame,
-                                                     NodeClient nodeClient) {
-    MLInput mlinput = MLInput.builder()
+  protected MLPredictionOutput getMLPredictionResult(
+      FunctionName functionName,
+      MLAlgoParams mlAlgoParams,
+      DataFrame inputDataFrame,
+      NodeClient nodeClient) {
+    MLInput mlinput =
+        MLInput.builder()
             .algorithm(functionName)
             .parameters(mlAlgoParams)
             .inputDataset(new DataFrameInputDataset(inputDataFrame))
             .build();
 
-    MachineLearningNodeClient machineLearningClient =
-            MLClient.getMLClient(nodeClient);
+    MachineLearningNodeClient machineLearningClient = MLClient.getMLClient(nodeClient);
 
-    return (MLPredictionOutput) machineLearningClient
-            .trainAndPredict(mlinput)
-            .actionGet(30, TimeUnit.SECONDS);
+    return (MLPredictionOutput)
+        machineLearningClient.trainAndPredict(mlinput).actionGet(30, TimeUnit.SECONDS);
   }
 
   /**
    * get ml-commons train, predict and trainandpredict result.
+   *
    * @param inputDataFrame input data frame
    * @param arguments ml parameters
    * @param nodeClient node client
    * @return ml-commons result
    */
-  protected MLOutput getMLOutput(DataFrame inputDataFrame,
-                                 Map<String, Object> arguments,
-                                 NodeClient nodeClient) {
-    MLInput mlinput = MLInput.builder()
+  protected MLOutput getMLOutput(
+      DataFrame inputDataFrame, Map<String, Object> arguments, NodeClient nodeClient) {
+    MLInput mlinput =
+        MLInput.builder()
             .inputDataset(new DataFrameInputDataset(inputDataFrame))
-            //Just the placeholders for algorithm and parameters which must be initialized.
-            //They will be overridden in ml client.
+            // Just the placeholders for algorithm and parameters which must be initialized.
+            // They will be overridden in ml client.
             .algorithm(FunctionName.SAMPLE_ALGO)
             .parameters(new SampleAlgoParams(0))
             .build();
 
-    MachineLearningNodeClient machineLearningClient =
-            MLClient.getMLClient(nodeClient);
+    MachineLearningNodeClient machineLearningClient = MLClient.getMLClient(nodeClient);
 
-    return machineLearningClient
-            .run(mlinput, arguments)
-            .actionGet(30, TimeUnit.SECONDS);
+    return machineLearningClient.run(mlinput, arguments).actionGet(30, TimeUnit.SECONDS);
   }
 
   /**
    * iterate result and built it into ExprTupleValue.
+   *
    * @param inputRowIter input row iterator
    * @param inputDataFrame input data frame
    * @param mlResult train/predict result
    * @param resultRowIter predict result iterator
    * @return result in ExprTupleValue format
    */
-  protected ExprTupleValue buildPPLResult(boolean isPredict,
-                                       Iterator<Row> inputRowIter,
-                                       DataFrame inputDataFrame,
-                                       MLOutput mlResult,
-                                       Iterator<Row> resultRowIter) {
+  protected ExprTupleValue buildPPLResult(
+      boolean isPredict,
+      Iterator<Row> inputRowIter,
+      DataFrame inputDataFrame,
+      MLOutput mlResult,
+      Iterator<Row> resultRowIter) {
     if (isPredict) {
-      return buildResult(inputRowIter,
-              inputDataFrame,
-              (MLPredictionOutput) mlResult,
-              resultRowIter);
+      return buildResult(
+          inputRowIter, inputDataFrame, (MLPredictionOutput) mlResult, resultRowIter);
     } else {
       return buildTrainResult((MLTrainingOutput) mlResult);
     }
@@ -284,18 +289,21 @@ protected ExprTupleValue buildTrainResult(MLTrainingOutput trainResult) {
   private static class MLInputRows extends LinkedList<Map<String, Object>> {
     /**
      * Add tuple value to input map, skip if any value is null.
+     *
      * @param tupleValue a row in input data.
      */
     public void addTupleValue(Map<String, ExprValue> tupleValue) {
       if (tupleValue.values().stream().anyMatch(e -> e.isNull() || e.isMissing())) {
         return;
       }
-      this.add(tupleValue.entrySet().stream()
-          .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().value())));
+      this.add(
+          tupleValue.entrySet().stream()
+              .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().value())));
     }
 
     /**
      * Convert to DataFrame.
+     *
      * @return DataFrame
      */
     public DataFrame toDataFrame() {
@@ -304,15 +312,19 @@ public DataFrame toDataFrame() {
 
     /**
      * Filter each row and convert to DataFrame.
+     *
      * @param filter used to filter fields in each row
      * @return DataFrame
      */
     public DataFrame toFilteredDataFrame(Predicate<Map.Entry<String, Object>> filter) {
-      return DataFrameBuilder.load(this.stream().map(
-              row -> row.entrySet().stream().filter(filter)
-                  .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)))
-          .collect(Collectors.toList()));
+      return DataFrameBuilder.load(
+          this.stream()
+              .map(
+                  row ->
+                      row.entrySet().stream()
+                          .filter(filter)
+                          .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)))
+              .collect(Collectors.toList()));
     }
   }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLOperator.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLOperator.java
index 938ff60157..6dc7078a0d 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLOperator.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLOperator.java
@@ -25,23 +25,19 @@
 import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
 
 /**
- * ml-commons Physical operator to call machine learning interface to get results for
- * algorithm execution.
+ * ml-commons Physical operator to call machine learning interface to get results for algorithm
+ * execution.
  */
 @RequiredArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 public class MLOperator extends MLCommonsOperatorActions {
-  @Getter
-  private final PhysicalPlan input;
+  @Getter private final PhysicalPlan input;
 
-  @Getter
-  private final Map<String, Literal> arguments;
+  @Getter private final Map<String, Literal> arguments;
 
-  @Getter
-  private final NodeClient nodeClient;
+  @Getter private final NodeClient nodeClient;
 
-  @EqualsAndHashCode.Exclude
-  private Iterator<ExprValue> iterator;
+  @EqualsAndHashCode.Exclude private Iterator<ExprValue> iterator;
 
   @Override
   public void open() {
@@ -53,34 +49,36 @@ public void open() {
     final Iterator<Row> inputRowIter = inputDataFrame.iterator();
     // Only need to check train here, as action should be already checked in ml client.
     final boolean isPrediction = ((String) args.get("action")).equals("train") ? false : true;
-    //For train, only one row to return.
-    final Iterator<String> trainIter = new ArrayList<String>() {
-      {
-        add("train");
-      }
-    }.iterator();
-    final Iterator<Row> resultRowIter = isPrediction
-            ? ((MLPredictionOutput) mlOutput).getPredictionResult().iterator()
-            : null;
-    iterator = new Iterator<ExprValue>() {
-      @Override
-      public boolean hasNext() {
-        if (isPrediction) {
-          return inputRowIter.hasNext();
-        } else {
-          boolean res = trainIter.hasNext();
-          if (res) {
-            trainIter.next();
+    // For train, only one row to return.
+    final Iterator<String> trainIter =
+        new ArrayList<String>() {
+          {
+            add("train");
+          }
+        }.iterator();
+    final Iterator<Row> resultRowIter =
+        isPrediction ? ((MLPredictionOutput) mlOutput).getPredictionResult().iterator() : null;
+    iterator =
+        new Iterator<ExprValue>() {
+          @Override
+          public boolean hasNext() {
+            if (isPrediction) {
+              return inputRowIter.hasNext();
+            } else {
+              boolean res = trainIter.hasNext();
+              if (res) {
+                trainIter.next();
+              }
+              return res;
+            }
           }
-          return res;
-        }
-      }
 
-      @Override
-      public ExprValue next() {
-        return buildPPLResult(isPrediction, inputRowIter, inputDataFrame, mlOutput, resultRowIter);
-      }
-    };
+          @Override
+          public ExprValue next() {
+            return buildPPLResult(
+                isPrediction, inputRowIter, inputDataFrame, mlOutput, resultRowIter);
+          }
+        };
   }
 
   @Override
@@ -109,4 +107,3 @@ protected Map<String, Object> processArgs(Map<String, Literal> arguments) {
     return res;
   }
 }
-
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequest.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequest.java
index 6f6fea841b..6cf7fe49c2 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequest.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequest.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request;
 
-import com.google.common.annotations.VisibleForTesting;
+import java.io.IOException;
+import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import lombok.EqualsAndHashCode;
@@ -15,7 +15,7 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchScrollRequest;
-import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.search.SearchHits;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
@@ -32,90 +32,81 @@
 @ToString
 public class OpenSearchQueryRequest implements OpenSearchRequest {
 
-  /**
-   * Default query timeout in minutes.
-   */
-  public static final TimeValue DEFAULT_QUERY_TIMEOUT = TimeValue.timeValueMinutes(1L);
-
-  /**
-   * {@link OpenSearchRequest.IndexName}.
-   */
+  /** {@link OpenSearchRequest.IndexName}. */
   private final IndexName indexName;
 
-  /**
-   * Search request source builder.
-   */
+  /** Search request source builder. */
   private final SearchSourceBuilder sourceBuilder;
 
-
-  /**
-   * OpenSearchExprValueFactory.
-   */
-  @EqualsAndHashCode.Exclude
-  @ToString.Exclude
+  /** OpenSearchExprValueFactory. */
+  @EqualsAndHashCode.Exclude @ToString.Exclude
   private final OpenSearchExprValueFactory exprValueFactory;
 
-  /**
-   * Indicate the search already done.
-   */
+  /** List of includes expected in the response. */
+  @EqualsAndHashCode.Exclude @ToString.Exclude private final List<String> includes;
+
+  /** Indicate the search already done. */
   private boolean searchDone = false;
 
-  /**
-   * Constructor of OpenSearchQueryRequest.
-   */
-  public OpenSearchQueryRequest(String indexName, int size,
-                                OpenSearchExprValueFactory factory) {
-    this(new IndexName(indexName), size, factory);
+  /** Constructor of OpenSearchQueryRequest. */
+  public OpenSearchQueryRequest(
+      String indexName, int size, OpenSearchExprValueFactory factory, List<String> includes) {
+    this(new IndexName(indexName), size, factory, includes);
   }
 
-  /**
-   * Constructor of OpenSearchQueryRequest.
-   */
-  public OpenSearchQueryRequest(IndexName indexName, int size,
-      OpenSearchExprValueFactory factory) {
+  /** Constructor of OpenSearchQueryRequest. */
+  public OpenSearchQueryRequest(
+      IndexName indexName, int size, OpenSearchExprValueFactory factory, List<String> includes) {
     this.indexName = indexName;
     this.sourceBuilder = new SearchSourceBuilder();
     sourceBuilder.from(0);
     sourceBuilder.size(size);
     sourceBuilder.timeout(DEFAULT_QUERY_TIMEOUT);
     this.exprValueFactory = factory;
+    this.includes = includes;
   }
 
-  /**
-   * Constructor of OpenSearchQueryRequest.
-   */
-  public OpenSearchQueryRequest(IndexName indexName, SearchSourceBuilder sourceBuilder,
-                                OpenSearchExprValueFactory factory) {
+  /** Constructor of OpenSearchQueryRequest. */
+  public OpenSearchQueryRequest(
+      IndexName indexName,
+      SearchSourceBuilder sourceBuilder,
+      OpenSearchExprValueFactory factory,
+      List<String> includes) {
     this.indexName = indexName;
     this.sourceBuilder = sourceBuilder;
     this.exprValueFactory = factory;
+    this.includes = includes;
   }
 
   @Override
-  public OpenSearchResponse search(Function<SearchRequest, SearchResponse> searchAction,
-                                   Function<SearchScrollRequest, SearchResponse> scrollAction) {
+  public OpenSearchResponse search(
+      Function<SearchRequest, SearchResponse> searchAction,
+      Function<SearchScrollRequest, SearchResponse> scrollAction) {
     if (searchDone) {
-      return new OpenSearchResponse(SearchHits.empty(), exprValueFactory);
+      return new OpenSearchResponse(SearchHits.empty(), exprValueFactory, includes);
     } else {
       searchDone = true;
-      return new OpenSearchResponse(searchAction.apply(searchRequest()), exprValueFactory);
+      return new OpenSearchResponse(
+          searchAction.apply(
+              new SearchRequest().indices(indexName.getIndexNames()).source(sourceBuilder)),
+          exprValueFactory,
+          includes);
     }
   }
 
   @Override
   public void clean(Consumer<String> cleanAction) {
-    //do nothing.
+    // do nothing.
   }
 
-  /**
-   * Generate OpenSearch search request.
-   *
-   * @return search request
-   */
-  @VisibleForTesting
-  protected SearchRequest searchRequest() {
-    return new SearchRequest()
-        .indices(indexName.getIndexNames())
-        .source(sourceBuilder);
+  @Override
+  public boolean hasAnotherBatch() {
+    return false;
+  }
+
+  @Override
+  public void writeTo(StreamOutput out) throws IOException {
+    throw new UnsupportedOperationException(
+        "OpenSearchQueryRequest serialization " + "is not implemented.");
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchRequest.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchRequest.java
index ce990780c1..f775d55296 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchRequest.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchRequest.java
@@ -3,32 +3,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request;
 
+import java.io.IOException;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import lombok.EqualsAndHashCode;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchScrollRequest;
-import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
 import org.opensearch.sql.opensearch.response.OpenSearchResponse;
 
-/**
- * OpenSearch search request.
- */
-public interface OpenSearchRequest {
+/** OpenSearch search request. */
+public interface OpenSearchRequest extends Writeable {
+
+  /** Default query timeout in minutes. */
+  TimeValue DEFAULT_QUERY_TIMEOUT = TimeValue.timeValueMinutes(1L);
+
   /**
    * Apply the search action or scroll action on request based on context.
    *
    * @param searchAction search action.
    * @param scrollAction scroll search action.
-   * @return ElasticsearchResponse.
+   * @return OpenSearchResponse.
    */
-  OpenSearchResponse search(Function<SearchRequest, SearchResponse> searchAction,
-                            Function<SearchScrollRequest, SearchResponse> scrollAction);
+  OpenSearchResponse search(
+      Function<SearchRequest, SearchResponse> searchAction,
+      Function<SearchScrollRequest, SearchResponse> scrollAction);
 
   /**
    * Apply the cleanAction on request.
@@ -38,28 +44,31 @@ OpenSearchResponse search(Function<SearchRequest, SearchResponse> searchAction,
   void clean(Consumer<String> cleanAction);
 
   /**
-   * Get the SearchSourceBuilder.
+   * Get the OpenSearchExprValueFactory.
    *
-   * @return SearchSourceBuilder.
-   */
-  SearchSourceBuilder getSourceBuilder();
-
-  /**
-   * Get the ElasticsearchExprValueFactory.
-   * @return ElasticsearchExprValueFactory.
+   * @return OpenSearchExprValueFactory.
    */
   OpenSearchExprValueFactory getExprValueFactory();
 
   /**
-   * OpenSearch Index Name.
-   * Indices are seperated by ",".
+   * Check if there is more data to get from OpenSearch.
+   *
+   * @return True if calling {@ref OpenSearchClient.search} with this request will return non-empty
+   *     response.
    */
+  boolean hasAnotherBatch();
+
+  /** OpenSearch Index Name. Indices are separated by ",". */
   @EqualsAndHashCode
-  class IndexName {
+  class IndexName implements Writeable {
     private static final String COMMA = ",";
 
     private final String[] indexNames;
 
+    public IndexName(StreamInput si) throws IOException {
+      indexNames = si.readStringArray();
+    }
+
     public IndexName(String indexName) {
       this.indexNames = indexName.split(COMMA);
     }
@@ -72,5 +81,10 @@ public String[] getIndexNames() {
     public String toString() {
       return String.join(COMMA, indexNames);
     }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+      out.writeStringArray(indexNames);
+    }
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilder.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilder.java
index 439a970a4f..1df3dcb183 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilder.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilder.java
@@ -3,103 +3,80 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request;
 
+import static java.util.stream.Collectors.mapping;
+import static java.util.stream.Collectors.toList;
+import static org.opensearch.index.query.QueryBuilders.matchAllQuery;
+import static org.opensearch.index.query.QueryBuilders.nestedQuery;
 import static org.opensearch.search.sort.FieldSortBuilder.DOC_FIELD_NAME;
 import static org.opensearch.search.sort.SortOrder.ASC;
 
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.lucene.search.join.ScoreMode;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.InnerHitBuilder;
+import org.opensearch.index.query.NestedQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.aggregations.AggregationBuilder;
 import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.search.fetch.subphase.FetchSourceContext;
 import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
-import org.opensearch.search.sort.FieldSortBuilder;
 import org.opensearch.search.sort.SortBuilder;
 import org.opensearch.search.sort.SortBuilders;
 import org.opensearch.sql.ast.expression.Literal;
-import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.common.utils.StringUtils;
-import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.ReferenceExpression;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
 import org.opensearch.sql.opensearch.response.agg.OpenSearchAggregationResponseParser;
 
-/**
- * OpenSearch search request builder.
- */
+/** OpenSearch search request builder. */
 @EqualsAndHashCode
 @Getter
 @ToString
 public class OpenSearchRequestBuilder {
 
-  /**
-   * Default query timeout in minutes.
-   */
-  public static final TimeValue DEFAULT_QUERY_TIMEOUT = TimeValue.timeValueMinutes(1L);
-
-  /**
-   * {@link OpenSearchRequest.IndexName}.
-   */
-  private final OpenSearchRequest.IndexName indexName;
+  /** Search request source builder. */
+  private final SearchSourceBuilder sourceBuilder;
 
-  /**
-   * Index max result window.
-   */
-  private final Integer maxResultWindow;
+  /** Query size of the request -- how many rows will be returned. */
+  private int requestedTotalSize;
 
-  /**
-   * Search request source builder.
-   */
-  private final SearchSourceBuilder sourceBuilder;
+  /** Size of each page request to return. */
+  private Integer pageSize = null;
 
-  /**
-   * OpenSearchExprValueFactory.
-   */
-  @EqualsAndHashCode.Exclude
-  @ToString.Exclude
+  /** OpenSearchExprValueFactory. */
+  @EqualsAndHashCode.Exclude @ToString.Exclude
   private final OpenSearchExprValueFactory exprValueFactory;
 
-  /**
-   * Query size of the request.
-   */
-  private Integer querySize;
+  private int startFrom = 0;
 
-  public OpenSearchRequestBuilder(String indexName,
-                                  Integer maxResultWindow,
-                                  Settings settings,
-                                  OpenSearchExprValueFactory exprValueFactory) {
-    this(new OpenSearchRequest.IndexName(indexName), maxResultWindow, settings, exprValueFactory);
-  }
-
-  /**
-   * Constructor.
-   */
-  public OpenSearchRequestBuilder(OpenSearchRequest.IndexName indexName,
-                                  Integer maxResultWindow,
-                                  Settings settings,
-                                  OpenSearchExprValueFactory exprValueFactory) {
-    this.indexName = indexName;
-    this.maxResultWindow = maxResultWindow;
-    this.sourceBuilder = new SearchSourceBuilder();
+  /** Constructor. */
+  public OpenSearchRequestBuilder(
+      int requestedTotalSize, OpenSearchExprValueFactory exprValueFactory) {
+    this.requestedTotalSize = requestedTotalSize;
+    this.sourceBuilder =
+        new SearchSourceBuilder()
+            .from(startFrom)
+            .timeout(OpenSearchRequest.DEFAULT_QUERY_TIMEOUT)
+            .trackScores(false);
     this.exprValueFactory = exprValueFactory;
-    this.querySize = settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT);
-    sourceBuilder.from(0);
-    sourceBuilder.size(querySize);
-    sourceBuilder.timeout(DEFAULT_QUERY_TIMEOUT);
   }
 
   /**
@@ -107,24 +84,41 @@ public OpenSearchRequestBuilder(OpenSearchRequest.IndexName indexName,
    *
    * @return query request or scroll request
    */
-  public OpenSearchRequest build() {
-    Integer from = sourceBuilder.from();
-    Integer size = sourceBuilder.size();
-
-    if (from + size <= maxResultWindow) {
-      return new OpenSearchQueryRequest(indexName, sourceBuilder, exprValueFactory);
+  public OpenSearchRequest build(
+      OpenSearchRequest.IndexName indexName, int maxResultWindow, TimeValue scrollTimeout) {
+    int size = requestedTotalSize;
+    FetchSourceContext fetchSource = this.sourceBuilder.fetchSource();
+    List<String> includes = fetchSource != null ? Arrays.asList(fetchSource.includes()) : List.of();
+    if (pageSize == null) {
+      if (startFrom + size > maxResultWindow) {
+        sourceBuilder.size(maxResultWindow - startFrom);
+        return new OpenSearchScrollRequest(
+            indexName, scrollTimeout, sourceBuilder, exprValueFactory, includes);
+      } else {
+        sourceBuilder.from(startFrom);
+        sourceBuilder.size(requestedTotalSize);
+        return new OpenSearchQueryRequest(indexName, sourceBuilder, exprValueFactory, includes);
+      }
     } else {
-      sourceBuilder.size(maxResultWindow - from);
-      return new OpenSearchScrollRequest(indexName, sourceBuilder, exprValueFactory);
+      if (startFrom != 0) {
+        throw new UnsupportedOperationException("Non-zero offset is not supported with pagination");
+      }
+      sourceBuilder.size(pageSize);
+      return new OpenSearchScrollRequest(
+          indexName, scrollTimeout, sourceBuilder, exprValueFactory, includes);
     }
   }
 
+  boolean isBoolFilterQuery(QueryBuilder current) {
+    return (current instanceof BoolQueryBuilder);
+  }
+
   /**
    * Push down query to DSL request.
    *
-   * @param query  query request
+   * @param query query request
    */
-  public void pushDown(QueryBuilder query) {
+  public void pushDownFilter(QueryBuilder query) {
     QueryBuilder current = sourceBuilder.query();
 
     if (current == null) {
@@ -133,9 +127,7 @@ public void pushDown(QueryBuilder query) {
       if (isBoolFilterQuery(current)) {
         ((BoolQueryBuilder) current).filter(query);
       } else {
-        sourceBuilder.query(QueryBuilders.boolQuery()
-            .filter(current)
-            .filter(query));
+        sourceBuilder.query(QueryBuilders.boolQuery().filter(current).filter(query));
       }
     }
 
@@ -151,7 +143,7 @@ public void pushDown(QueryBuilder query) {
    */
   public void pushDownAggregation(
       Pair<List<AggregationBuilder>, OpenSearchAggregationResponseParser> aggregationBuilder) {
-    aggregationBuilder.getLeft().forEach(builder -> sourceBuilder.aggregation(builder));
+    aggregationBuilder.getLeft().forEach(sourceBuilder::aggregation);
     sourceBuilder.size(0);
     exprValueFactory.setParser(aggregationBuilder.getRight());
   }
@@ -172,16 +164,24 @@ public void pushDownSort(List<SortBuilder<?>> sortBuilders) {
     }
   }
 
-  /**
-   * Push down size (limit) and from (offset) to DSL request.
-   */
+  /** Pushdown size (limit) and from (offset) to DSL request. */
   public void pushDownLimit(Integer limit, Integer offset) {
-    querySize = limit;
+    requestedTotalSize = limit;
+    startFrom = offset;
     sourceBuilder.from(offset).size(limit);
   }
 
+  public void pushDownTrackedScore(boolean trackScores) {
+    sourceBuilder.trackScores(trackScores);
+  }
+
+  public void pushDownPageSize(int pageSize) {
+    this.pageSize = pageSize;
+  }
+
   /**
    * Add highlight to DSL requests.
+   *
    * @param field name of the field to highlight
    */
   public void pushDownHighlight(String field, Map<String, Literal> arguments) {
@@ -190,51 +190,171 @@ public void pushDownHighlight(String field, Map<String, Literal> arguments) {
       // OS does not allow duplicates of highlight fields
       if (sourceBuilder.highlighter().fields().stream()
           .anyMatch(f -> f.name().equals(unquotedField))) {
-        throw new SemanticCheckException(String.format(
-            "Duplicate field %s in highlight", field));
+        throw new SemanticCheckException(String.format("Duplicate field %s in highlight", field));
       }
 
       sourceBuilder.highlighter().field(unquotedField);
     } else {
-      HighlightBuilder highlightBuilder =
-          new HighlightBuilder().field(unquotedField);
+      HighlightBuilder highlightBuilder = new HighlightBuilder().field(unquotedField);
       sourceBuilder.highlighter(highlightBuilder);
     }
 
     // lastFieldIndex denotes previously set highlighter with field parameter
     int lastFieldIndex = sourceBuilder.highlighter().fields().size() - 1;
     if (arguments.containsKey("pre_tags")) {
-      sourceBuilder.highlighter().fields().get(lastFieldIndex)
+      sourceBuilder
+          .highlighter()
+          .fields()
+          .get(lastFieldIndex)
           .preTags(arguments.get("pre_tags").toString());
     }
     if (arguments.containsKey("post_tags")) {
-      sourceBuilder.highlighter().fields().get(lastFieldIndex)
+      sourceBuilder
+          .highlighter()
+          .fields()
+          .get(lastFieldIndex)
           .postTags(arguments.get("post_tags").toString());
     }
   }
 
-  /**
-   * Push down project list to DSL requets.
-   */
+  /** Push down project list to DSL requests. */
   public void pushDownProjects(Set<ReferenceExpression> projects) {
-    final Set<String> projectsSet =
-        projects.stream().map(ReferenceExpression::getAttr).collect(Collectors.toSet());
-    sourceBuilder.fetchSource(projectsSet.toArray(new String[0]), new String[0]);
-  }
-
-  public void pushTypeMapping(Map<String, ExprType> typeMapping) {
-    exprValueFactory.setTypeMapping(typeMapping);
+    sourceBuilder.fetchSource(
+        projects.stream().map(ReferenceExpression::getAttr).distinct().toArray(String[]::new),
+        new String[0]);
   }
 
-  private boolean isBoolFilterQuery(QueryBuilder current) {
-    return (current instanceof BoolQueryBuilder);
+  public void pushTypeMapping(Map<String, OpenSearchDataType> typeMapping) {
+    exprValueFactory.extendTypeMapping(typeMapping);
   }
 
   private boolean isSortByDocOnly() {
     List<SortBuilder<?>> sorts = sourceBuilder.sorts();
     if (sorts != null) {
-      return sorts.equals(Arrays.asList(SortBuilders.fieldSort(DOC_FIELD_NAME)));
+      return sorts.equals(List.of(SortBuilders.fieldSort(DOC_FIELD_NAME)));
     }
     return false;
   }
+
+  /**
+   * Push down nested to sourceBuilder.
+   *
+   * @param nestedArgs : Nested arguments to push down.
+   */
+  public void pushDownNested(List<Map<String, ReferenceExpression>> nestedArgs) {
+    initBoolQueryFilter();
+    List<NestedQueryBuilder> nestedQueries = extractNestedQueries(query());
+    groupFieldNamesByPath(nestedArgs)
+        .forEach(
+            (path, fieldNames) ->
+                buildInnerHit(fieldNames, findNestedQueryWithSamePath(nestedQueries, path)));
+  }
+
+  /**
+   * InnerHit must be added to the NestedQueryBuilder. We need to extract the nested queries
+   * currently in the query if there is already a filter push down with nested query.
+   *
+   * @param query : current query.
+   * @return : grouped nested queries currently in query.
+   */
+  private List<NestedQueryBuilder> extractNestedQueries(QueryBuilder query) {
+    List<NestedQueryBuilder> result = new ArrayList<>();
+    if (query instanceof NestedQueryBuilder) {
+      result.add((NestedQueryBuilder) query);
+    } else if (query instanceof BoolQueryBuilder) {
+      BoolQueryBuilder boolQ = (BoolQueryBuilder) query;
+      Stream.of(boolQ.filter(), boolQ.must(), boolQ.should())
+          .flatMap(Collection::stream)
+          .forEach(q -> result.addAll(extractNestedQueries(q)));
+    }
+    return result;
+  }
+
+  public int getMaxResponseSize() {
+    return pageSize == null ? requestedTotalSize : pageSize;
+  }
+
+  /** Initialize bool query for push down. */
+  private void initBoolQueryFilter() {
+    if (sourceBuilder.query() == null) {
+      sourceBuilder.query(QueryBuilders.boolQuery());
+    } else {
+      sourceBuilder.query(QueryBuilders.boolQuery().must(sourceBuilder.query()));
+    }
+
+    sourceBuilder.query(QueryBuilders.boolQuery().filter(sourceBuilder.query()));
+  }
+
+  /**
+   * Map all field names in nested queries that use same path.
+   *
+   * @param fields : Fields for nested queries.
+   * @return : Map of path and associated field names.
+   */
+  private Map<String, List<String>> groupFieldNamesByPath(
+      List<Map<String, ReferenceExpression>> fields) {
+    // TODO filter out reverse nested when supported - .filter(not(isReverseNested()))
+    return fields.stream()
+        .collect(
+            Collectors.groupingBy(
+                m -> m.get("path").toString(), mapping(m -> m.get("field").toString(), toList())));
+  }
+
+  /**
+   * Build inner hits portion to nested query.
+   *
+   * @param paths : Set of all paths used in nested queries.
+   * @param query : Current pushDown query.
+   */
+  private void buildInnerHit(List<String> paths, NestedQueryBuilder query) {
+    query.innerHit(
+        new InnerHitBuilder()
+            .setFetchSourceContext(
+                new FetchSourceContext(true, paths.toArray(new String[0]), null)));
+  }
+
+  /**
+   * We need to group nested queries with same path for adding new fields with same path of inner
+   * hits. If we try to add additional inner hits with same path we get an OS error.
+   *
+   * @param nestedQueries Current list of nested queries in query.
+   * @param path path comparing with current nested queries.
+   * @return Query with same path or new empty nested query.
+   */
+  private NestedQueryBuilder findNestedQueryWithSamePath(
+      List<NestedQueryBuilder> nestedQueries, String path) {
+    return nestedQueries.stream()
+        .filter(query -> isSamePath(path, query))
+        .findAny()
+        .orElseGet(createEmptyNestedQuery(path));
+  }
+
+  /**
+   * Check if is nested query is of the same path value.
+   *
+   * @param path Value of path to compare with nested query.
+   * @param query nested query builder to compare with path.
+   * @return true if nested query has same path.
+   */
+  private boolean isSamePath(String path, NestedQueryBuilder query) {
+    return nestedQuery(path, query.query(), query.scoreMode()).equals(query);
+  }
+
+  /** Create a nested query with match all filter to place inner hits. */
+  private Supplier<NestedQueryBuilder> createEmptyNestedQuery(String path) {
+    return () -> {
+      NestedQueryBuilder nestedQuery = nestedQuery(path, matchAllQuery(), ScoreMode.None);
+      ((BoolQueryBuilder) query().filter().get(0)).must(nestedQuery);
+      return nestedQuery;
+    };
+  }
+
+  /**
+   * Return current query.
+   *
+   * @return : Current source builder query.
+   */
+  private BoolQueryBuilder query() {
+    return (BoolQueryBuilder) sourceBuilder.query();
+  }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchScrollRequest.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchScrollRequest.java
index 4509e443c0..c9490f0767 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchScrollRequest.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/OpenSearchScrollRequest.java
@@ -3,24 +3,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request;
 
+import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchScrollRequest;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
 import org.opensearch.sql.opensearch.response.OpenSearchResponse;
+import org.opensearch.sql.opensearch.storage.OpenSearchIndex;
+import org.opensearch.sql.opensearch.storage.OpenSearchStorageEngine;
 
 /**
  * OpenSearch scroll search request. This has to be stateful because it needs to:
@@ -33,94 +37,99 @@
 @ToString
 public class OpenSearchScrollRequest implements OpenSearchRequest {
 
-  /** Default scroll context timeout in minutes. */
-  public static final TimeValue DEFAULT_SCROLL_TIMEOUT = TimeValue.timeValueMinutes(1L);
-
   /**
-   * {@link OpenSearchRequest.IndexName}.
+   * Search request used to initiate paged (scrolled) search. Not needed to get subsequent pages.
    */
+  @EqualsAndHashCode.Exclude private final transient SearchRequest initialSearchRequest;
+
+  /** Scroll context timeout. */
+  private final TimeValue scrollTimeout;
+
+  /** {@link OpenSearchRequest.IndexName}. */
   private final IndexName indexName;
 
   /** Index name. */
-  @EqualsAndHashCode.Exclude
-  @ToString.Exclude
+  @EqualsAndHashCode.Exclude @ToString.Exclude
   private final OpenSearchExprValueFactory exprValueFactory;
 
   /**
-   * Scroll id which is set after first request issued. Because ElasticsearchClient is shared by
-   * multi-thread so this state has to be maintained here.
+   * Scroll id which is set after first request issued. Because OpenSearchClient is shared by
+   * multiple threads so this state has to be maintained here.
    */
-  @Setter
-  private String scrollId;
+  @Setter @Getter private String scrollId = NO_SCROLL_ID;
 
-  /** Search request source builder. */
-  private final SearchSourceBuilder sourceBuilder;
+  public static final String NO_SCROLL_ID = "";
 
-  /** Constructor. */
-  public OpenSearchScrollRequest(IndexName indexName, OpenSearchExprValueFactory exprValueFactory) {
-    this.indexName = indexName;
-    this.sourceBuilder = new SearchSourceBuilder();
-    this.exprValueFactory = exprValueFactory;
-  }
+  @EqualsAndHashCode.Exclude private boolean needClean = true;
 
-  public OpenSearchScrollRequest(String indexName, OpenSearchExprValueFactory exprValueFactory) {
-    this(new IndexName(indexName), exprValueFactory);
-  }
+  @Getter @EqualsAndHashCode.Exclude @ToString.Exclude private final List<String> includes;
 
   /** Constructor. */
-  public OpenSearchScrollRequest(IndexName indexName,
-                                 SearchSourceBuilder sourceBuilder,
-                                 OpenSearchExprValueFactory exprValueFactory) {
+  public OpenSearchScrollRequest(
+      IndexName indexName,
+      TimeValue scrollTimeout,
+      SearchSourceBuilder sourceBuilder,
+      OpenSearchExprValueFactory exprValueFactory,
+      List<String> includes) {
     this.indexName = indexName;
-    this.sourceBuilder = sourceBuilder;
+    this.scrollTimeout = scrollTimeout;
     this.exprValueFactory = exprValueFactory;
+    this.initialSearchRequest =
+        new SearchRequest()
+            .indices(indexName.getIndexNames())
+            .scroll(scrollTimeout)
+            .source(sourceBuilder);
+
+    this.includes = includes;
   }
 
-  /** Constructor. */
+  /**
+   * Executes request using either {@param searchAction} or {@param scrollAction} as appropriate.
+   */
   @Override
-  public OpenSearchResponse search(Function<SearchRequest, SearchResponse> searchAction,
-                                   Function<SearchScrollRequest, SearchResponse> scrollAction) {
+  public OpenSearchResponse search(
+      Function<SearchRequest, SearchResponse> searchAction,
+      Function<SearchScrollRequest, SearchResponse> scrollAction) {
     SearchResponse openSearchResponse;
-    if (isScrollStarted()) {
+    if (isScroll()) {
       openSearchResponse = scrollAction.apply(scrollRequest());
     } else {
-      openSearchResponse = searchAction.apply(searchRequest());
+      if (initialSearchRequest == null) {
+        // Probably a first page search (since there is no scroll set) called on a deserialized
+        // `OpenSearchScrollRequest`, which has no `initialSearchRequest`.
+        throw new UnsupportedOperationException("Misuse of OpenSearchScrollRequest");
+      }
+      openSearchResponse = searchAction.apply(initialSearchRequest);
     }
-    setScrollId(openSearchResponse.getScrollId());
 
-    return new OpenSearchResponse(openSearchResponse, exprValueFactory);
+    var response = new OpenSearchResponse(openSearchResponse, exprValueFactory, includes);
+    needClean = response.isEmpty();
+    if (!needClean) {
+      setScrollId(openSearchResponse.getScrollId());
+    }
+    return response;
   }
 
   @Override
   public void clean(Consumer<String> cleanAction) {
     try {
-      if (isScrollStarted()) {
+      // clean on the last page only, to prevent closing the scroll/cursor in the middle of paging.
+      if (needClean && isScroll()) {
         cleanAction.accept(getScrollId());
+        setScrollId(NO_SCROLL_ID);
       }
     } finally {
       reset();
     }
   }
 
-  /**
-   * Generate OpenSearch search request.
-   *
-   * @return search request
-   */
-  public SearchRequest searchRequest() {
-    return new SearchRequest()
-        .indices(indexName.getIndexNames())
-        .scroll(DEFAULT_SCROLL_TIMEOUT)
-        .source(sourceBuilder);
-  }
-
   /**
    * Is scroll started which means pages after first is being requested.
    *
    * @return true if scroll started
    */
-  public boolean isScrollStarted() {
-    return (scrollId != null);
+  public boolean isScroll() {
+    return !scrollId.equals(NO_SCROLL_ID);
   }
 
   /**
@@ -130,7 +139,7 @@ public boolean isScrollStarted() {
    */
   public SearchScrollRequest scrollRequest() {
     Objects.requireNonNull(scrollId, "Scroll id cannot be null");
-    return new SearchScrollRequest().scroll(DEFAULT_SCROLL_TIMEOUT).scrollId(scrollId);
+    return new SearchScrollRequest().scroll(scrollTimeout).scrollId(scrollId);
   }
 
   /**
@@ -138,6 +147,37 @@ public SearchScrollRequest scrollRequest() {
    * to be reused across different physical plan.
    */
   public void reset() {
-    scrollId = null;
+    scrollId = NO_SCROLL_ID;
+  }
+
+  @Override
+  public boolean hasAnotherBatch() {
+    return !needClean && !scrollId.equals(NO_SCROLL_ID);
+  }
+
+  @Override
+  public void writeTo(StreamOutput out) throws IOException {
+    out.writeTimeValue(scrollTimeout);
+    out.writeString(scrollId);
+    out.writeStringCollection(includes);
+    indexName.writeTo(out);
+  }
+
+  /**
+   * Constructs OpenSearchScrollRequest from serialized representation.
+   *
+   * @param in stream to read data from.
+   * @param engine OpenSearchSqlEngine to get node-specific context.
+   * @throws IOException thrown if reading from input {@code in} fails.
+   */
+  public OpenSearchScrollRequest(StreamInput in, OpenSearchStorageEngine engine)
+      throws IOException {
+    initialSearchRequest = null;
+    scrollTimeout = in.readTimeValue();
+    scrollId = in.readString();
+    includes = in.readStringList();
+    indexName = new IndexName(in);
+    OpenSearchIndex index = (OpenSearchIndex) engine.getTable(null, indexName.toString());
+    exprValueFactory = new OpenSearchExprValueFactory(index.getFieldOpenSearchTypes());
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchCatIndicesRequest.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchCatIndicesRequest.java
index 6e85dc00cc..e7685394f4 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchCatIndicesRequest.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchCatIndicesRequest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request.system;
 
 import static org.opensearch.sql.data.model.ExprValueUtils.stringValue;
@@ -18,9 +17,7 @@
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.opensearch.client.OpenSearchClient;
 
-/**
- * Cat indices request.
- */
+/** Cat indices request. */
 @RequiredArgsConstructor
 public class OpenSearchCatIndicesRequest implements OpenSearchSystemRequest {
 
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchDescribeIndexRequest.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchDescribeIndexRequest.java
index 50402fc75b..c4ac270547 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchDescribeIndexRequest.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchDescribeIndexRequest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request.system;
 
 import static org.opensearch.sql.data.model.ExprValueUtils.integerValue;
@@ -11,23 +10,19 @@
 import static org.opensearch.sql.opensearch.client.OpenSearchClient.META_CLUSTER_NAME;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.type.ExprCoreType;
-import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.opensearch.client.OpenSearchClient;
 import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
 import org.opensearch.sql.opensearch.mapping.IndexMapping;
 import org.opensearch.sql.opensearch.request.OpenSearchRequest;
 
-/**
- * Describe index meta data request.
- */
+/** Describe index meta data request. */
 public class OpenSearchDescribeIndexRequest implements OpenSearchSystemRequest {
 
   private static final String DEFAULT_TABLE_CAT = "opensearch";
@@ -38,22 +33,18 @@ public class OpenSearchDescribeIndexRequest implements OpenSearchSystemRequest {
 
   private static final String DEFAULT_IS_AUTOINCREMENT = "NO";
 
-  /**
-   * OpenSearch client connection.
-   */
+  /** OpenSearch client connection. */
   private final OpenSearchClient client;
 
-  /**
-   * {@link OpenSearchRequest.IndexName}.
-   */
+  /** {@link OpenSearchRequest.IndexName}. */
   private final OpenSearchRequest.IndexName indexName;
 
   public OpenSearchDescribeIndexRequest(OpenSearchClient client, String indexName) {
     this(client, new OpenSearchRequest.IndexName(indexName));
   }
 
-  public OpenSearchDescribeIndexRequest(OpenSearchClient client,
-      OpenSearchRequest.IndexName indexName) {
+  public OpenSearchDescribeIndexRequest(
+      OpenSearchClient client, OpenSearchRequest.IndexName indexName) {
     this.client = client;
     this.indexName = indexName;
   }
@@ -68,9 +59,13 @@ public List<ExprValue> search() {
     List<ExprValue> results = new ArrayList<>();
     Map<String, String> meta = client.meta();
     int pos = 0;
-    for (Map.Entry<String, ExprType> entry : getFieldTypes().entrySet()) {
+    for (Map.Entry<String, OpenSearchDataType> entry :
+        OpenSearchDataType.traverseAndFlatten(getFieldTypes()).entrySet()) {
       results.add(
-          row(entry.getKey(), entry.getValue().legacyTypeName().toLowerCase(), pos++,
+          row(
+              entry.getKey(),
+              entry.getValue().legacyTypeName().toLowerCase(),
+              pos++,
               clusterName(meta)));
     }
     return results;
@@ -81,14 +76,13 @@ public List<ExprValue> search() {
    *
    * @return mapping of field and type.
    */
-  public Map<String, ExprType> getFieldTypes() {
-    Map<String, ExprType> fieldTypes = new HashMap<>();
-    Map<String, IndexMapping> indexMappings = client.getIndexMappings(indexName.getIndexNames());
+  // TODO possible collision if two indices have fields with the same name and different mappings
+  public Map<String, OpenSearchDataType> getFieldTypes() {
+    Map<String, OpenSearchDataType> fieldTypes = new HashMap<>();
+    Map<String, IndexMapping> indexMappings =
+        client.getIndexMappings(getLocalIndexNames(indexName.getIndexNames()));
     for (IndexMapping indexMapping : indexMappings.values()) {
-      fieldTypes
-          .putAll(indexMapping.getAllFieldTypes(this::transformESTypeToExprType).entrySet().stream()
-              .filter(entry -> !ExprCoreType.UNKNOWN.equals(entry.getValue()))
-              .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
+      fieldTypes.putAll(indexMapping.getFieldMappings());
     }
     return fieldTypes;
   }
@@ -99,12 +93,12 @@ public Map<String, ExprType> getFieldTypes() {
    * @return max result window
    */
   public Integer getMaxResultWindow() {
-    return client.getIndexMaxResultWindows(indexName.getIndexNames())
-        .values().stream().min(Integer::compare).get();
-  }
-
-  private ExprType transformESTypeToExprType(String openSearchType) {
-    return OpenSearchDataType.getExprType(openSearchType);
+    return client
+        .getIndexMaxResultWindows(getLocalIndexNames(indexName.getIndexNames()))
+        .values()
+        .stream()
+        .min(Integer::compare)
+        .get();
   }
 
   private ExprTupleValue row(String fieldName, String fieldType, int position, String clusterName) {
@@ -127,14 +121,25 @@ private ExprTupleValue row(String fieldName, String fieldType, int position, Str
     return new ExprTupleValue(valueMap);
   }
 
+  /**
+   * Return index names without "{cluster}:" prefix. Without the prefix, they refer to the indices
+   * at the local cluster.
+   *
+   * @param indexNames a string array of index names
+   * @return local cluster index names
+   */
+  private String[] getLocalIndexNames(String[] indexNames) {
+    return Arrays.stream(indexNames)
+        .map(name -> name.substring(name.indexOf(":") + 1))
+        .toArray(String[]::new);
+  }
+
   private String clusterName(Map<String, String> meta) {
     return meta.getOrDefault(META_CLUSTER_NAME, DEFAULT_TABLE_CAT);
   }
 
   @Override
   public String toString() {
-    return "OpenSearchDescribeIndexRequest{"
-        + "indexName='" + indexName + '\''
-        + '}';
+    return "OpenSearchDescribeIndexRequest{" + "indexName='" + indexName + '\'' + '}';
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchSystemRequest.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchSystemRequest.java
index a2fbf79624..2969c7639b 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchSystemRequest.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchSystemRequest.java
@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request.system;
 
 import java.util.List;
 import org.opensearch.sql.data.model.ExprValue;
 
-/**
- * OpenSearch system request query against the system index.
- */
+/** OpenSearch system request query against the system index. */
 public interface OpenSearchSystemRequest {
 
   /**
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/OpenSearchResponse.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/OpenSearchResponse.java
index aadd73efdd..e43777a740 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/OpenSearchResponse.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/OpenSearchResponse.java
@@ -3,64 +3,72 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.response;
 
+import static org.opensearch.sql.opensearch.storage.OpenSearchIndex.METADATAFIELD_TYPE_MAP;
+import static org.opensearch.sql.opensearch.storage.OpenSearchIndex.METADATA_FIELD_ID;
+import static org.opensearch.sql.opensearch.storage.OpenSearchIndex.METADATA_FIELD_INDEX;
+import static org.opensearch.sql.opensearch.storage.OpenSearchIndex.METADATA_FIELD_MAXSCORE;
+import static org.opensearch.sql.opensearch.storage.OpenSearchIndex.METADATA_FIELD_ROUTING;
+import static org.opensearch.sql.opensearch.storage.OpenSearchIndex.METADATA_FIELD_SCORE;
+import static org.opensearch.sql.opensearch.storage.OpenSearchIndex.METADATA_FIELD_SORT;
+
 import com.google.common.collect.ImmutableMap;
 import java.util.Arrays;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.opensearch.action.search.SearchResponse;
+import org.opensearch.core.common.text.Text;
+import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 import org.opensearch.search.aggregations.Aggregations;
+import org.opensearch.sql.data.model.ExprFloatValue;
+import org.opensearch.sql.data.model.ExprLongValue;
+import org.opensearch.sql.data.model.ExprStringValue;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
 
-/**
- * OpenSearch search response.
- */
+/** OpenSearch search response. */
 @EqualsAndHashCode
 @ToString
 public class OpenSearchResponse implements Iterable<ExprValue> {
 
-  /**
-   * Search query result (non-aggregation).
-   */
+  /** Search query result (non-aggregation). */
   private final SearchHits hits;
 
-  /**
-   * Search aggregation result.
-   */
+  /** Search aggregation result. */
   private final Aggregations aggregations;
 
-  /**
-   * ElasticsearchExprValueFactory used to build ExprValue from search result.
-   */
-  @EqualsAndHashCode.Exclude
-  private final OpenSearchExprValueFactory exprValueFactory;
+  /** List of requested include fields. */
+  private final List<String> includes;
 
-  /**
-   * Constructor of ElasticsearchResponse.
-   */
-  public OpenSearchResponse(SearchResponse searchResponse,
-                            OpenSearchExprValueFactory exprValueFactory) {
+  /** OpenSearchExprValueFactory used to build ExprValue from search result. */
+  @EqualsAndHashCode.Exclude private final OpenSearchExprValueFactory exprValueFactory;
+
+  /** Constructor of OpenSearchResponse. */
+  public OpenSearchResponse(
+      SearchResponse searchResponse,
+      OpenSearchExprValueFactory exprValueFactory,
+      List<String> includes) {
     this.hits = searchResponse.getHits();
     this.aggregations = searchResponse.getAggregations();
     this.exprValueFactory = exprValueFactory;
+    this.includes = includes;
   }
 
-  /**
-   * Constructor of ElasticsearchResponse with SearchHits.
-   */
-  public OpenSearchResponse(SearchHits hits, OpenSearchExprValueFactory exprValueFactory) {
+  /** Constructor of OpenSearchResponse with SearchHits. */
+  public OpenSearchResponse(
+      SearchHits hits, OpenSearchExprValueFactory exprValueFactory, List<String> includes) {
     this.hits = hits;
     this.aggregations = null;
     this.exprValueFactory = exprValueFactory;
+    this.includes = includes;
   }
 
   /**
@@ -84,32 +92,112 @@ public boolean isAggregationResponse() {
    */
   public Iterator<ExprValue> iterator() {
     if (isAggregationResponse()) {
-      return exprValueFactory.getParser().parse(aggregations).stream().map(entry -> {
-        ImmutableMap.Builder<String, ExprValue> builder = new ImmutableMap.Builder<>();
-        for (Map.Entry<String, Object> value : entry.entrySet()) {
-          builder.put(value.getKey(), exprValueFactory.construct(value.getKey(), value.getValue()));
-        }
-        return (ExprValue) ExprTupleValue.fromExprValueMap(builder.build());
-      }).iterator();
+      return handleAggregationResponse();
     } else {
       return Arrays.stream(hits.getHits())
-          .map(hit -> {
-            ExprValue docData = exprValueFactory.construct(hit.getSourceAsString());
-            if (hit.getHighlightFields().isEmpty()) {
-              return docData;
-            } else {
+          .map(
+              hit -> {
+                ImmutableMap.Builder<String, ExprValue> builder = new ImmutableMap.Builder<>();
+                addParsedHitsToBuilder(builder, hit);
+                addMetaDataFieldsToBuilder(builder, hit);
+                addHighlightsToBuilder(builder, hit);
+                return (ExprValue) ExprTupleValue.fromExprValueMap(builder.build());
+              })
+          .iterator();
+    }
+  }
+
+  /**
+   * Parse response for all hits to add to builder. Inner_hits supports arrays of objects with
+   * nested type.
+   *
+   * @param builder builder to build values from response.
+   * @param hit Search hit from response.
+   */
+  private void addParsedHitsToBuilder(
+      ImmutableMap.Builder<String, ExprValue> builder, SearchHit hit) {
+    builder.putAll(
+        exprValueFactory
+            .construct(
+                hit.getSourceAsString(),
+                !(hit.getInnerHits() == null || hit.getInnerHits().isEmpty()))
+            .tupleValue());
+  }
+
+  /**
+   * If highlight fields are present in response add the fields to the builder.
+   *
+   * @param builder builder to build values from response.
+   * @param hit Search hit from response.
+   */
+  private void addHighlightsToBuilder(
+      ImmutableMap.Builder<String, ExprValue> builder, SearchHit hit) {
+    if (!hit.getHighlightFields().isEmpty()) {
+      var hlBuilder = ImmutableMap.<String, ExprValue>builder();
+      for (var es : hit.getHighlightFields().entrySet()) {
+        hlBuilder.put(
+            es.getKey(),
+            ExprValueUtils.collectionValue(
+                Arrays.stream(es.getValue().fragments())
+                    .map(Text::toString)
+                    .collect(Collectors.toList())));
+      }
+      builder.put("_highlight", ExprTupleValue.fromExprValueMap(hlBuilder.build()));
+    }
+  }
+
+  /**
+   * Add metadata fields to builder from response.
+   *
+   * @param builder builder to build values from response.
+   * @param hit Search hit from response.
+   */
+  private void addMetaDataFieldsToBuilder(
+      ImmutableMap.Builder<String, ExprValue> builder, SearchHit hit) {
+    List<String> metaDataFieldSet =
+        includes.stream().filter(METADATAFIELD_TYPE_MAP::containsKey).collect(Collectors.toList());
+    ExprFloatValue maxScore =
+        Float.isNaN(hits.getMaxScore()) ? null : new ExprFloatValue(hits.getMaxScore());
+
+    metaDataFieldSet.forEach(
+        metaDataField -> {
+          if (metaDataField.equals(METADATA_FIELD_INDEX)) {
+            builder.put(METADATA_FIELD_INDEX, new ExprStringValue(hit.getIndex()));
+          } else if (metaDataField.equals(METADATA_FIELD_ID)) {
+            builder.put(METADATA_FIELD_ID, new ExprStringValue(hit.getId()));
+          } else if (metaDataField.equals(METADATA_FIELD_SCORE)) {
+            if (!Float.isNaN(hit.getScore())) {
+              builder.put(METADATA_FIELD_SCORE, new ExprFloatValue(hit.getScore()));
+            }
+          } else if (metaDataField.equals(METADATA_FIELD_MAXSCORE)) {
+            if (maxScore != null) {
+              builder.put(METADATA_FIELD_MAXSCORE, maxScore);
+            }
+          } else if (metaDataField.equals(METADATA_FIELD_SORT)) {
+            builder.put(METADATA_FIELD_SORT, new ExprLongValue(hit.getSeqNo()));
+          } else { // if (metaDataField.equals(METADATA_FIELD_ROUTING)){
+            builder.put(METADATA_FIELD_ROUTING, new ExprStringValue(hit.getShard().toString()));
+          }
+        });
+  }
+
+  /**
+   * Handle an aggregation response.
+   *
+   * @return Parsed and built return values from response.
+   */
+  private Iterator<ExprValue> handleAggregationResponse() {
+    return exprValueFactory.getParser().parse(aggregations).stream()
+        .map(
+            entry -> {
               ImmutableMap.Builder<String, ExprValue> builder = new ImmutableMap.Builder<>();
-              builder.putAll(docData.tupleValue());
-              var hlBuilder = ImmutableMap.<String, ExprValue>builder();
-              for (var es : hit.getHighlightFields().entrySet()) {
-                hlBuilder.put(es.getKey(), ExprValueUtils.collectionValue(
-                    Arrays.stream(es.getValue().fragments()).map(
-                        t -> (t.toString())).collect(Collectors.toList())));
+              for (Map.Entry<String, Object> value : entry.entrySet()) {
+                builder.put(
+                    value.getKey(),
+                    exprValueFactory.construct(value.getKey(), value.getValue(), false));
               }
-              builder.put("_highlight", ExprTupleValue.fromExprValueMap(hlBuilder.build()));
-              return ExprTupleValue.fromExprValueMap(builder.build());
-            }
-          }).iterator();
-    }
+              return (ExprValue) ExprTupleValue.fromExprValueMap(builder.build());
+            })
+        .iterator();
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/CompositeAggregationParser.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/CompositeAggregationParser.java
index 7459300caa..581f708f22 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/CompositeAggregationParser.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/CompositeAggregationParser.java
@@ -22,9 +22,7 @@
 import org.opensearch.search.aggregations.Aggregations;
 import org.opensearch.search.aggregations.bucket.composite.CompositeAggregation;
 
-/**
- * Composite Aggregation Parser which include composite aggregation and metric parsers.
- */
+/** Composite Aggregation Parser which include composite aggregation and metric parsers. */
 @EqualsAndHashCode
 public class CompositeAggregationParser implements OpenSearchAggregationResponseParser {
 
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/FilterParser.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/FilterParser.java
index 8358379be0..406f279784 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/FilterParser.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/FilterParser.java
@@ -21,9 +21,8 @@
 import org.opensearch.search.aggregations.bucket.filter.Filter;
 
 /**
- * {@link Filter} Parser.
- * The current use case is filter aggregation, e.g. avg(age) filter(balance>0). The filter parser
- * do nothing and return the result from metricsParser.
+ * {@link Filter} Parser. The current use case is filter aggregation, e.g. avg(age)
+ * filter(balance>0). The filter parser do nothing and return the result from metricsParser.
  */
 @Builder
 @EqualsAndHashCode
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/MetricParser.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/MetricParser.java
index 15f05e5b05..0f8f8e284b 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/MetricParser.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/MetricParser.java
@@ -16,14 +16,10 @@
 import java.util.Map;
 import org.opensearch.search.aggregations.Aggregation;
 
-/**
- * Metric Aggregation Parser.
- */
+/** Metric Aggregation Parser. */
 public interface MetricParser {
 
-  /**
-   * Get the name of metric parser.
-   */
+  /** Get the name of metric parser. */
   String getName();
 
   /**
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/MetricParserHelper.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/MetricParserHelper.java
index d5c0141ad2..0d1f770470 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/MetricParserHelper.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/MetricParserHelper.java
@@ -23,9 +23,7 @@
 import org.opensearch.search.aggregations.Aggregations;
 import org.opensearch.sql.common.utils.StringUtils;
 
-/**
- * Parse multiple metrics in one bucket.
- */
+/** Parse multiple metrics in one bucket. */
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class MetricParserHelper {
@@ -49,8 +47,9 @@ public Map<String, Object> parse(Aggregations aggregations) {
       if (metricParserMap.containsKey(aggregation.getName())) {
         resultMap.putAll(metricParserMap.get(aggregation.getName()).parse(aggregation));
       } else {
-        throw new RuntimeException(StringUtils.format("couldn't parse field %s in aggregation "
-            + "response", aggregation.getName()));
+        throw new RuntimeException(
+            StringUtils.format(
+                "couldn't parse field %s in aggregation " + "response", aggregation.getName()));
       }
     }
     return resultMap;
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/NoBucketAggregationParser.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/NoBucketAggregationParser.java
index 5756003523..de0ee5883c 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/NoBucketAggregationParser.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/NoBucketAggregationParser.java
@@ -19,9 +19,7 @@
 import java.util.Map;
 import org.opensearch.search.aggregations.Aggregations;
 
-/**
- * No Bucket Aggregation Parser which include only metric parsers.
- */
+/** No Bucket Aggregation Parser which include only metric parsers. */
 public class NoBucketAggregationParser implements OpenSearchAggregationResponseParser {
 
   private final MetricParserHelper metricsParser;
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/OpenSearchAggregationResponseParser.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/OpenSearchAggregationResponseParser.java
index 3a19747ef3..0c15d72eb6 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/OpenSearchAggregationResponseParser.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/OpenSearchAggregationResponseParser.java
@@ -17,13 +17,12 @@
 import java.util.Map;
 import org.opensearch.search.aggregations.Aggregations;
 
-/**
- * OpenSearch Aggregation Response Parser.
- */
+/** OpenSearch Aggregation Response Parser. */
 public interface OpenSearchAggregationResponseParser {
 
   /**
    * Parse the OpenSearch Aggregation Response.
+   *
    * @param aggregations Aggregations.
    * @return aggregation result.
    */
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/PercentilesParser.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/PercentilesParser.java
new file mode 100644
index 0000000000..86ed735b4a
--- /dev/null
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/PercentilesParser.java
@@ -0,0 +1,44 @@
+/*
+ *   Licensed under the Apache License, Version 2.0 (the "License").
+ *   You may not use this file except in compliance with the License.
+ *   A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file. This file is distributed
+ *   on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *   express or implied. See the License for the specific language governing
+ *   permissions and limitations under the License.
+ */
+
+package org.opensearch.sql.opensearch.response.agg;
+
+import com.google.common.collect.Streams;
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.search.aggregations.Aggregation;
+import org.opensearch.search.aggregations.metrics.Percentile;
+import org.opensearch.search.aggregations.metrics.Percentiles;
+
+@EqualsAndHashCode
+@RequiredArgsConstructor
+public class PercentilesParser implements MetricParser {
+
+  @Getter private final String name;
+
+  @Override
+  public Map<String, Object> parse(Aggregation agg) {
+    return Collections.singletonMap(
+        agg.getName(),
+        // TODO a better implementation here is providing a class `MultiValueParser`
+        // similar to `SingleValueParser`. However, there is no method `values()` available
+        // in `org.opensearch.search.aggregations.metrics.MultiValue`.
+        Streams.stream(((Percentiles) agg).iterator())
+            .map(Percentile::getValue)
+            .collect(Collectors.toList()));
+  }
+}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/SinglePercentileParser.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/SinglePercentileParser.java
new file mode 100644
index 0000000000..94a70302af
--- /dev/null
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/SinglePercentileParser.java
@@ -0,0 +1,40 @@
+/*
+ *   Licensed under the Apache License, Version 2.0 (the "License").
+ *   You may not use this file except in compliance with the License.
+ *   A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file. This file is distributed
+ *   on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *   express or implied. See the License for the specific language governing
+ *   permissions and limitations under the License.
+ */
+
+package org.opensearch.sql.opensearch.response.agg;
+
+import com.google.common.collect.Streams;
+import java.util.Collections;
+import java.util.Map;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.search.aggregations.Aggregation;
+import org.opensearch.search.aggregations.metrics.Percentiles;
+
+@EqualsAndHashCode
+@RequiredArgsConstructor
+public class SinglePercentileParser implements MetricParser {
+
+  @Getter private final String name;
+
+  @Override
+  public Map<String, Object> parse(Aggregation agg) {
+    return Collections.singletonMap(
+        agg.getName(),
+        // TODO `Percentiles` implements interface
+        // `org.opensearch.search.aggregations.metrics.MultiValue`, but there is not
+        // method `values()` available in this interface. So we
+        Streams.stream(((Percentiles) agg).iterator()).findFirst().get().getValue());
+  }
+}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/SingleValueParser.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/SingleValueParser.java
index 384e07ad8f..1492fedfc2 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/SingleValueParser.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/SingleValueParser.java
@@ -23,9 +23,7 @@
 import org.opensearch.search.aggregations.Aggregation;
 import org.opensearch.search.aggregations.metrics.NumericMetricsAggregation;
 
-/**
- * {@link NumericMetricsAggregation.SingleValue} metric parser.
- */
+/** {@link NumericMetricsAggregation.SingleValue} metric parser. */
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class SingleValueParser implements MetricParser {
@@ -35,7 +33,6 @@ public class SingleValueParser implements MetricParser {
   @Override
   public Map<String, Object> parse(Aggregation agg) {
     return Collections.singletonMap(
-        agg.getName(),
-        handleNanInfValue(((NumericMetricsAggregation.SingleValue) agg).value()));
+        agg.getName(), handleNanInfValue(((NumericMetricsAggregation.SingleValue) agg).value()));
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/StatsParser.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/StatsParser.java
index c80b75de05..82a2f8648f 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/StatsParser.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/StatsParser.java
@@ -24,9 +24,7 @@
 import org.opensearch.search.aggregations.Aggregation;
 import org.opensearch.search.aggregations.metrics.ExtendedStats;
 
-/**
- * {@link ExtendedStats} metric parser.
- */
+/** {@link ExtendedStats} metric parser. */
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class StatsParser implements MetricParser {
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/TopHitsParser.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/TopHitsParser.java
index a98e1b4ce3..b29b44f033 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/TopHitsParser.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/TopHitsParser.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.response.agg;
 
 import java.util.Arrays;
@@ -16,21 +15,19 @@
 import org.opensearch.search.aggregations.Aggregation;
 import org.opensearch.search.aggregations.metrics.TopHits;
 
-/**
- * {@link TopHits} metric parser.
- */
+/** {@link TopHits} metric parser. */
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class TopHitsParser implements MetricParser {
 
-  @Getter
-  private final String name;
+  @Getter private final String name;
 
   @Override
   public Map<String, Object> parse(Aggregation agg) {
     return Collections.singletonMap(
         agg.getName(),
         Arrays.stream(((TopHits) agg).getHits().getHits())
-            .flatMap(h -> h.getSourceAsMap().values().stream()).collect(Collectors.toList()));
+            .flatMap(h -> h.getSourceAsMap().values().stream())
+            .collect(Collectors.toList()));
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/Utils.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/Utils.java
index 953f4d19b4..9ce46c6de6 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/Utils.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/Utils.java
@@ -19,6 +19,7 @@
 public class Utils {
   /**
    * Utils to handle Nan/Infinite Value.
+   *
    * @return null if is Nan or is +-Infinity.
    */
   public static Object handleNanInfValue(double value) {
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/ErrorMessage.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/ErrorMessage.java
index c26c833f67..bbcacc1d2c 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/ErrorMessage.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/ErrorMessage.java
@@ -3,34 +3,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.response.error;
 
 import lombok.Getter;
 import org.json.JSONObject;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 
-/**
- * Error Message.
- */
+/** Error Message. */
 public class ErrorMessage {
 
   protected Throwable exception;
 
   private final int status;
 
-  @Getter
-  private final String type;
+  @Getter private final String type;
 
-  @Getter
-  private final String reason;
+  @Getter private final String reason;
 
-  @Getter
-  private final String details;
+  @Getter private final String details;
 
-  /**
-   * Error Message Constructor.
-   */
+  /** Error Message Constructor. */
   public ErrorMessage(Throwable exception, int status) {
     this.exception = exception;
     this.status = status;
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/ErrorMessageFactory.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/ErrorMessageFactory.java
index 204c6a8b93..901bfc30c8 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/ErrorMessageFactory.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/ErrorMessageFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.response.error;
 
 import lombok.experimental.UtilityClass;
@@ -12,11 +11,11 @@
 @UtilityClass
 public class ErrorMessageFactory {
   /**
-   * Create error message based on the exception type.
-   * Exceptions of OpenSearch exception type and exceptions with wrapped OpenSearch exception causes
-   * should create {@link OpenSearchErrorMessage}
+   * Create error message based on the exception type. Exceptions of OpenSearch exception type and
+   * exceptions with wrapped OpenSearch exception causes should create {@link
+   * OpenSearchErrorMessage}
    *
-   * @param e      exception to create error message
+   * @param e exception to create error message
    * @param status exception status code
    * @return error message
    */
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessage.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessage.java
index a90c52922e..87a374d353 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessage.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessage.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.response.error;
 
 import java.util.Locale;
@@ -11,9 +10,7 @@
 import org.opensearch.action.search.SearchPhaseExecutionException;
 import org.opensearch.action.search.ShardSearchFailure;
 
-/**
- * OpenSearch Error Message.
- */
+/** OpenSearch Error Message. */
 public class OpenSearchErrorMessage extends ErrorMessage {
 
   OpenSearchErrorMessage(OpenSearchException exception, int status) {
@@ -45,21 +42,21 @@ protected String fetchDetails() {
   }
 
   /**
-   * Could not deliver the exactly same error messages due to the limit of JDBC types.
-   * Currently our cases occurred only SearchPhaseExecutionException instances
-   * among all types of OpenSearch exceptions
-   * according to the survey, see all types: OpenSearchException.OpenSearchExceptionHandle.
-   * Either add methods of fetching details for different types, or re-make a consistent
-   * message by not giving
-   * detailed messages/root causes but only a suggestion message.
+   * Could not deliver the exactly same error messages due to the limit of JDBC types. Currently our
+   * cases occurred only SearchPhaseExecutionException instances among all types of OpenSearch
+   * exceptions according to the survey, see all types:
+   * OpenSearchException.OpenSearchExceptionHandle. Either add methods of fetching details for
+   * different types, or re-make a consistent message by not giving detailed messages/root causes
+   * but only a suggestion message.
    */
   private String fetchSearchPhaseExecutionExceptionDetails(
       SearchPhaseExecutionException exception) {
     StringBuilder details = new StringBuilder();
     ShardSearchFailure[] shardFailures = exception.shardFailures();
     for (ShardSearchFailure failure : shardFailures) {
-      details.append(String.format(Locale.ROOT, "Shard[%d]: %s\n", failure.shardId(),
-          failure.getCause().toString()));
+      details.append(
+          String.format(
+              Locale.ROOT, "Shard[%d]: %s\n", failure.shardId(), failure.getCause().toString()));
     }
     return details.toString();
   }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/security/SecurityAccess.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/security/SecurityAccess.java
index 0c1b2e58b1..95c52ea275 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/security/SecurityAccess.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/security/SecurityAccess.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.security;
 
 import java.security.AccessController;
@@ -17,9 +16,7 @@
  */
 public class SecurityAccess {
 
-  /**
-   * Execute the operation in privileged mode.
-   */
+  /** Execute the operation in privileged mode. */
   public static <T> T doPrivileged(final PrivilegedExceptionAction<T> operation) {
     SpecialPermission.check();
     try {
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/LegacyOpenDistroSettings.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/LegacyOpenDistroSettings.java
index 7ac7e6eccb..f20551b89d 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/LegacyOpenDistroSettings.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/LegacyOpenDistroSettings.java
@@ -11,109 +11,115 @@
 import java.util.List;
 import lombok.experimental.UtilityClass;
 import org.opensearch.common.settings.Setting;
-import org.opensearch.common.unit.ByteSizeValue;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.unit.ByteSizeValue;
 import org.opensearch.sql.common.setting.LegacySettings;
 
 @UtilityClass
 public class LegacyOpenDistroSettings {
 
-  public static final Setting<Boolean> SQL_ENABLED_SETTING = Setting.boolSetting(
-      LegacySettings.Key.SQL_ENABLED.getKeyValue(),
-      true,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic,
-      Setting.Property.Deprecated);
-
-  public static final Setting<Integer> SQL_QUERY_SLOWLOG_SETTING = Setting.intSetting(
-      LegacySettings.Key.SQL_QUERY_SLOWLOG.getKeyValue(),
-      2,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic,
-      Setting.Property.Deprecated);
-
-  public static final Setting<TimeValue> SQL_CURSOR_KEEPALIVE_SETTING = Setting.positiveTimeSetting(
-      LegacySettings.Key.SQL_CURSOR_KEEPALIVE.getKeyValue(),
-      timeValueMinutes(1),
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic,
-      Setting.Property.Deprecated);
-
-  public static final Setting<Long> METRICS_ROLLING_WINDOW_SETTING = Setting.longSetting(
-      LegacySettings.Key.METRICS_ROLLING_WINDOW.getKeyValue(),
-      3600L,
-      2L,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic,
-      Setting.Property.Deprecated);
-
-  public static final Setting<Long> METRICS_ROLLING_INTERVAL_SETTING = Setting.longSetting(
-      LegacySettings.Key.METRICS_ROLLING_INTERVAL.getKeyValue(),
-      60L,
-      1L,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic,
-      Setting.Property.Deprecated);
-
-  public static final Setting<Boolean> PPL_ENABLED_SETTING = Setting.boolSetting(
-      LegacySettings.Key.PPL_ENABLED.getKeyValue(),
-      true,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic,
-      Setting.Property.Deprecated);
-
-  public static final Setting<ByteSizeValue>
-      PPL_QUERY_MEMORY_LIMIT_SETTING = Setting.memorySizeSetting(
-      LegacySettings.Key.PPL_QUERY_MEMORY_LIMIT.getKeyValue(),
-      "85%",
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic,
-      Setting.Property.Deprecated);
-
-  public static final Setting<Integer> QUERY_SIZE_LIMIT_SETTING = Setting.intSetting(
-      LegacySettings.Key.QUERY_SIZE_LIMIT.getKeyValue(),
-      200,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic,
-      Setting.Property.Deprecated);
+  public static final Setting<Boolean> SQL_ENABLED_SETTING =
+      Setting.boolSetting(
+          LegacySettings.Key.SQL_ENABLED.getKeyValue(),
+          true,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic,
+          Setting.Property.Deprecated);
 
-  /**
-   * Deprecated and will be removed then.
-   * From OpenSearch 1.0, the new engine is always enabled.
-   */
-  public static final Setting<Boolean> SQL_NEW_ENGINE_ENABLED_SETTING = Setting.boolSetting(
-      LegacySettings.Key.SQL_NEW_ENGINE_ENABLED.getKeyValue(),
-      true,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic,
-      Setting.Property.Deprecated);
+  public static final Setting<Integer> SQL_QUERY_SLOWLOG_SETTING =
+      Setting.intSetting(
+          LegacySettings.Key.SQL_QUERY_SLOWLOG.getKeyValue(),
+          2,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic,
+          Setting.Property.Deprecated);
+
+  public static final Setting<TimeValue> SQL_CURSOR_KEEPALIVE_SETTING =
+      Setting.positiveTimeSetting(
+          LegacySettings.Key.SQL_CURSOR_KEEPALIVE.getKeyValue(),
+          timeValueMinutes(1),
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic,
+          Setting.Property.Deprecated);
+
+  public static final Setting<Long> METRICS_ROLLING_WINDOW_SETTING =
+      Setting.longSetting(
+          LegacySettings.Key.METRICS_ROLLING_WINDOW.getKeyValue(),
+          3600L,
+          2L,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic,
+          Setting.Property.Deprecated);
+
+  public static final Setting<Long> METRICS_ROLLING_INTERVAL_SETTING =
+      Setting.longSetting(
+          LegacySettings.Key.METRICS_ROLLING_INTERVAL.getKeyValue(),
+          60L,
+          1L,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic,
+          Setting.Property.Deprecated);
+
+  public static final Setting<Boolean> PPL_ENABLED_SETTING =
+      Setting.boolSetting(
+          LegacySettings.Key.PPL_ENABLED.getKeyValue(),
+          true,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic,
+          Setting.Property.Deprecated);
+
+  public static final Setting<ByteSizeValue> PPL_QUERY_MEMORY_LIMIT_SETTING =
+      Setting.memorySizeSetting(
+          LegacySettings.Key.PPL_QUERY_MEMORY_LIMIT.getKeyValue(),
+          "85%",
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic,
+          Setting.Property.Deprecated);
+
+  public static final Setting<Integer> QUERY_SIZE_LIMIT_SETTING =
+      Setting.intSetting(
+          LegacySettings.Key.QUERY_SIZE_LIMIT.getKeyValue(),
+          200,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic,
+          Setting.Property.Deprecated);
+
+  /** Deprecated and will be removed then. From OpenSearch 1.0, the new engine is always enabled. */
+  public static final Setting<Boolean> SQL_NEW_ENGINE_ENABLED_SETTING =
+      Setting.boolSetting(
+          LegacySettings.Key.SQL_NEW_ENGINE_ENABLED.getKeyValue(),
+          true,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic,
+          Setting.Property.Deprecated);
 
   /**
-   * Deprecated and will be removed then.
-   * From OpenSearch 1.0, the query analysis in legacy engine is disabled.
+   * Deprecated and will be removed then. From OpenSearch 1.0, the query analysis in legacy engine
+   * is disabled.
    */
-  public static final Setting<Boolean> QUERY_ANALYSIS_ENABLED_SETTING = Setting.boolSetting(
-      LegacySettings.Key.QUERY_ANALYSIS_ENABLED.getKeyValue(),
-      false,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic,
-      Setting.Property.Deprecated);
+  public static final Setting<Boolean> QUERY_ANALYSIS_ENABLED_SETTING =
+      Setting.boolSetting(
+          LegacySettings.Key.QUERY_ANALYSIS_ENABLED.getKeyValue(),
+          false,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic,
+          Setting.Property.Deprecated);
 
   /**
-   * Deprecated and will be removed then.
-   * From OpenSearch 1.0, the query analysis suggestion in legacy engine is disabled.
+   * Deprecated and will be removed then. From OpenSearch 1.0, the query analysis suggestion in
+   * legacy engine is disabled.
    */
   public static final Setting<Boolean> QUERY_ANALYSIS_SEMANTIC_SUGGESTION_SETTING =
       Setting.boolSetting(
-      LegacySettings.Key.QUERY_ANALYSIS_SEMANTIC_SUGGESTION.getKeyValue(),
-      false,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic,
-      Setting.Property.Deprecated);
+          LegacySettings.Key.QUERY_ANALYSIS_SEMANTIC_SUGGESTION.getKeyValue(),
+          false,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic,
+          Setting.Property.Deprecated);
 
   /**
-   * Deprecated and will be removed then.
-   * From OpenSearch 1.0, the query analysis threshold in legacy engine is disabled.
+   * Deprecated and will be removed then. From OpenSearch 1.0, the query analysis threshold in
+   * legacy engine is disabled.
    */
   public static final Setting<Integer> QUERY_ANALYSIS_SEMANTIC_THRESHOLD_SETTING =
       Setting.intSetting(
@@ -124,8 +130,8 @@ public class LegacyOpenDistroSettings {
           Setting.Property.Deprecated);
 
   /**
-   * Deprecated and will be removed then.
-   * From OpenSearch 1.0, the query response format is default to JDBC format.
+   * Deprecated and will be removed then. From OpenSearch 1.0, the query response format is default
+   * to JDBC format.
    */
   public static final Setting<String> QUERY_RESPONSE_FORMAT_SETTING =
       Setting.simpleString(
@@ -136,8 +142,8 @@ public class LegacyOpenDistroSettings {
           Setting.Property.Deprecated);
 
   /**
-   * Deprecated and will be removed then.
-   * From OpenSearch 1.0, the cursor feature is enabled by default.
+   * Deprecated and will be removed then. From OpenSearch 1.0, the cursor feature is enabled by
+   * default.
    */
   public static final Setting<Boolean> SQL_CURSOR_ENABLED_SETTING =
       Setting.boolSetting(
@@ -146,10 +152,10 @@ public class LegacyOpenDistroSettings {
           Setting.Property.NodeScope,
           Setting.Property.Dynamic,
           Setting.Property.Deprecated);
+
   /**
-   * Deprecated and will be removed then.
-   * From OpenSearch 1.0, the fetch_size in query body will decide whether create the cursor
-   * context. No cursor will be created if the fetch_size = 0.
+   * Deprecated and will be removed then. From OpenSearch 1.0, the fetch_size in query body will
+   * decide whether create the cursor context. No cursor will be created if the fetch_size = 0.
    */
   public static final Setting<Integer> SQL_CURSOR_FETCH_SIZE_SETTING =
       Setting.intSetting(
@@ -159,9 +165,7 @@ public class LegacyOpenDistroSettings {
           Setting.Property.Dynamic,
           Setting.Property.Deprecated);
 
-  /**
-   * Used by Plugin to init Setting.
-   */
+  /** Used by Plugin to init Setting. */
   public static List<Setting<?>> legacySettings() {
     return new ImmutableList.Builder<Setting<?>>()
         .add(SQL_ENABLED_SETTING)
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java
index ae5174d678..3cb245b487 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java
@@ -3,126 +3,369 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.setting;
 
 import static org.opensearch.common.settings.Settings.EMPTY;
+import static org.opensearch.common.unit.TimeValue.timeValueDays;
+import static org.opensearch.common.unit.TimeValue.timeValueMinutes;
+import static org.opensearch.sql.common.setting.Settings.Key.ENCYRPTION_MASTER_KEY;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import java.io.InputStream;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.opensearch.cluster.ClusterName;
 import org.opensearch.common.settings.ClusterSettings;
+import org.opensearch.common.settings.SecureSetting;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.unit.MemorySizeValue;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.index.IndexSettings;
 import org.opensearch.sql.common.setting.LegacySettings;
 import org.opensearch.sql.common.setting.Settings;
 
-/**
- * Setting implementation on OpenSearch.
- */
+/** Setting implementation on OpenSearch. */
 @Log4j2
 public class OpenSearchSettings extends Settings {
-  /**
-   * Default settings.
-   */
+  /** Default settings. */
   private final Map<Settings.Key, Setting<?>> defaultSettings;
-  /**
-   * Latest setting value for each registered key. Thread-safe is required.
-   */
+
+  /** Latest setting value for each registered key. Thread-safe is required. */
   @VisibleForTesting
   private final Map<Settings.Key, Object> latestSettings = new ConcurrentHashMap<>();
 
-  public static final Setting<?> SQL_ENABLED_SETTING = Setting.boolSetting(
-      Key.SQL_ENABLED.getKeyValue(),
-      LegacyOpenDistroSettings.SQL_ENABLED_SETTING,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic);
-
-  public static final Setting<?> SQL_SLOWLOG_SETTING = Setting.intSetting(
-      Key.SQL_SLOWLOG.getKeyValue(),
-      LegacyOpenDistroSettings.SQL_QUERY_SLOWLOG_SETTING,
-      0,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic);
-
-  public static final Setting<?> SQL_CURSOR_KEEP_ALIVE_SETTING = Setting.positiveTimeSetting(
-      Key.SQL_CURSOR_KEEP_ALIVE.getKeyValue(),
-      LegacyOpenDistroSettings.SQL_CURSOR_KEEPALIVE_SETTING,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic);
-
-  public static final Setting<?> SQL_DELETE_ENABLED_SETTING = Setting.boolSetting(
-      Key.SQL_DELETE_ENABLED.getKeyValue(),
-      false,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic);
-
-  public static final Setting<?> PPL_ENABLED_SETTING = Setting.boolSetting(
-      Key.PPL_ENABLED.getKeyValue(),
-      LegacyOpenDistroSettings.PPL_ENABLED_SETTING,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic);
-
-  public static final Setting<?> QUERY_MEMORY_LIMIT_SETTING = new Setting<>(
-      Key.QUERY_MEMORY_LIMIT.getKeyValue(),
-      LegacyOpenDistroSettings.PPL_QUERY_MEMORY_LIMIT_SETTING,
-      (s) -> MemorySizeValue.parseBytesSizeValueOrHeapRatio(
-          s, LegacySettings.Key.PPL_QUERY_MEMORY_LIMIT.getKeyValue()),
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic);
-
-  public static final Setting<?> QUERY_SIZE_LIMIT_SETTING = Setting.intSetting(
-      Key.QUERY_SIZE_LIMIT.getKeyValue(),
-      LegacyOpenDistroSettings.QUERY_SIZE_LIMIT_SETTING,
-      0,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic);
-
-  public static final Setting<?> METRICS_ROLLING_WINDOW_SETTING = Setting.longSetting(
-      Key.METRICS_ROLLING_WINDOW.getKeyValue(),
-      LegacyOpenDistroSettings.METRICS_ROLLING_WINDOW_SETTING,
-      2L,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic);
-
-  public static final Setting<?> METRICS_ROLLING_INTERVAL_SETTING = Setting.longSetting(
-      Key.METRICS_ROLLING_INTERVAL.getKeyValue(),
-      LegacyOpenDistroSettings.METRICS_ROLLING_INTERVAL_SETTING,
-      1L,
-      Setting.Property.NodeScope,
-      Setting.Property.Dynamic);
+  public static final Setting<?> SQL_ENABLED_SETTING =
+      Setting.boolSetting(
+          Key.SQL_ENABLED.getKeyValue(),
+          LegacyOpenDistroSettings.SQL_ENABLED_SETTING,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
 
-  /**
-   * Construct ElasticsearchSetting.
-   * The ElasticsearchSetting must be singleton.
-   */
+  public static final Setting<?> SQL_SLOWLOG_SETTING =
+      Setting.intSetting(
+          Key.SQL_SLOWLOG.getKeyValue(),
+          LegacyOpenDistroSettings.SQL_QUERY_SLOWLOG_SETTING,
+          0,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<?> SQL_CURSOR_KEEP_ALIVE_SETTING =
+      Setting.positiveTimeSetting(
+          Key.SQL_CURSOR_KEEP_ALIVE.getKeyValue(),
+          LegacyOpenDistroSettings.SQL_CURSOR_KEEPALIVE_SETTING,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<?> SQL_DELETE_ENABLED_SETTING =
+      Setting.boolSetting(
+          Key.SQL_DELETE_ENABLED.getKeyValue(),
+          false,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<?> PPL_ENABLED_SETTING =
+      Setting.boolSetting(
+          Key.PPL_ENABLED.getKeyValue(),
+          LegacyOpenDistroSettings.PPL_ENABLED_SETTING,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<?> QUERY_MEMORY_LIMIT_SETTING =
+      new Setting<>(
+          Key.QUERY_MEMORY_LIMIT.getKeyValue(),
+          LegacyOpenDistroSettings.PPL_QUERY_MEMORY_LIMIT_SETTING,
+          (s) ->
+              MemorySizeValue.parseBytesSizeValueOrHeapRatio(
+                  s, LegacySettings.Key.PPL_QUERY_MEMORY_LIMIT.getKeyValue()),
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<?> QUERY_SIZE_LIMIT_SETTING =
+      Setting.intSetting(
+          Key.QUERY_SIZE_LIMIT.getKeyValue(),
+          IndexSettings.MAX_RESULT_WINDOW_SETTING,
+          0,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<?> METRICS_ROLLING_WINDOW_SETTING =
+      Setting.longSetting(
+          Key.METRICS_ROLLING_WINDOW.getKeyValue(),
+          LegacyOpenDistroSettings.METRICS_ROLLING_WINDOW_SETTING,
+          2L,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<?> METRICS_ROLLING_INTERVAL_SETTING =
+      Setting.longSetting(
+          Key.METRICS_ROLLING_INTERVAL.getKeyValue(),
+          LegacyOpenDistroSettings.METRICS_ROLLING_INTERVAL_SETTING,
+          1L,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  // we are keeping this to not break upgrades if the config is already present.
+  // This will be completely removed in 3.0.
+  public static final Setting<InputStream> DATASOURCE_CONFIG =
+      SecureSetting.secureFile(
+          "plugins.query.federation.datasources.config", null, Setting.Property.Deprecated);
+
+  public static final Setting<String> DATASOURCE_MASTER_SECRET_KEY =
+      Setting.simpleString(
+          ENCYRPTION_MASTER_KEY.getKeyValue(),
+          Setting.Property.NodeScope,
+          Setting.Property.Final,
+          Setting.Property.Filtered);
+
+  public static final Setting<List<String>> DATASOURCE_URI_HOSTS_DENY_LIST =
+      Setting.listSetting(
+          Key.DATASOURCES_URI_HOSTS_DENY_LIST.getKeyValue(),
+          Collections.emptyList(),
+          Function.identity(),
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<Boolean> DATASOURCE_ENABLED_SETTING =
+      Setting.boolSetting(
+          Key.DATASOURCES_ENABLED.getKeyValue(),
+          true,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<Boolean> ASYNC_QUERY_ENABLED_SETTING =
+      Setting.boolSetting(
+          Key.ASYNC_QUERY_ENABLED.getKeyValue(),
+          true,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<Boolean> ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED_SETTING =
+      Setting.boolSetting(
+          Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED.getKeyValue(),
+          true,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<String> ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL_SETTING =
+      Setting.simpleString(
+          Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL.getKeyValue(),
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<String> SPARK_EXECUTION_ENGINE_CONFIG =
+      Setting.simpleString(
+          Key.SPARK_EXECUTION_ENGINE_CONFIG.getKeyValue(),
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<?> SPARK_EXECUTION_SESSION_LIMIT_SETTING =
+      Setting.intSetting(
+          Key.SPARK_EXECUTION_SESSION_LIMIT.getKeyValue(),
+          10,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<?> SPARK_EXECUTION_REFRESH_JOB_LIMIT_SETTING =
+      Setting.intSetting(
+          Key.SPARK_EXECUTION_REFRESH_JOB_LIMIT.getKeyValue(),
+          5,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<TimeValue> SESSION_INDEX_TTL_SETTING =
+      Setting.positiveTimeSetting(
+          Key.SESSION_INDEX_TTL.getKeyValue(),
+          timeValueDays(30),
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<TimeValue> RESULT_INDEX_TTL_SETTING =
+      Setting.positiveTimeSetting(
+          Key.RESULT_INDEX_TTL.getKeyValue(),
+          timeValueDays(60),
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<Boolean> AUTO_INDEX_MANAGEMENT_ENABLED_SETTING =
+      Setting.boolSetting(
+          Key.AUTO_INDEX_MANAGEMENT_ENABLED.getKeyValue(),
+          true,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<?> DATASOURCES_LIMIT_SETTING =
+      Setting.intSetting(
+          Key.DATASOURCES_LIMIT.getKeyValue(),
+          20,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<Long> SESSION_INACTIVITY_TIMEOUT_MILLIS_SETTING =
+      Setting.longSetting(
+          Key.SESSION_INACTIVITY_TIMEOUT_MILLIS.getKeyValue(),
+          180000L,
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  public static final Setting<TimeValue> STREAMING_JOB_HOUSEKEEPER_INTERVAL_SETTING =
+      Setting.positiveTimeSetting(
+          Key.STREAMING_JOB_HOUSEKEEPER_INTERVAL.getKeyValue(),
+          timeValueMinutes(15),
+          Setting.Property.NodeScope,
+          Setting.Property.Dynamic);
+
+  /** Construct OpenSearchSetting. The OpenSearchSetting must be singleton. */
   @SuppressWarnings("unchecked")
   public OpenSearchSettings(ClusterSettings clusterSettings) {
     ImmutableMap.Builder<Key, Setting<?>> settingBuilder = new ImmutableMap.Builder<>();
-    register(settingBuilder, clusterSettings, Key.SQL_ENABLED,
-        SQL_ENABLED_SETTING, new Updater(Key.SQL_ENABLED));
-    register(settingBuilder, clusterSettings, Key.SQL_SLOWLOG,
-        SQL_SLOWLOG_SETTING, new Updater(Key.SQL_SLOWLOG));
-    register(settingBuilder, clusterSettings, Key.SQL_CURSOR_KEEP_ALIVE,
-        SQL_CURSOR_KEEP_ALIVE_SETTING, new Updater(Key.SQL_CURSOR_KEEP_ALIVE));
-    register(settingBuilder, clusterSettings, Key.SQL_DELETE_ENABLED,
-        SQL_DELETE_ENABLED_SETTING, new Updater(Key.SQL_DELETE_ENABLED));
-    register(settingBuilder, clusterSettings, Key.PPL_ENABLED,
-        PPL_ENABLED_SETTING, new Updater(Key.PPL_ENABLED));
-    register(settingBuilder, clusterSettings, Key.QUERY_MEMORY_LIMIT,
-        QUERY_MEMORY_LIMIT_SETTING, new Updater(Key.QUERY_MEMORY_LIMIT));
-    register(settingBuilder, clusterSettings, Key.QUERY_SIZE_LIMIT,
-        QUERY_SIZE_LIMIT_SETTING, new Updater(Key.QUERY_SIZE_LIMIT));
-    register(settingBuilder, clusterSettings, Key.METRICS_ROLLING_WINDOW,
-        METRICS_ROLLING_WINDOW_SETTING, new Updater(Key.METRICS_ROLLING_WINDOW));
-    register(settingBuilder, clusterSettings, Key.METRICS_ROLLING_INTERVAL,
-        METRICS_ROLLING_INTERVAL_SETTING, new Updater(Key.METRICS_ROLLING_INTERVAL));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.SQL_ENABLED,
+        SQL_ENABLED_SETTING,
+        new Updater(Key.SQL_ENABLED));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.SQL_SLOWLOG,
+        SQL_SLOWLOG_SETTING,
+        new Updater(Key.SQL_SLOWLOG));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.SQL_CURSOR_KEEP_ALIVE,
+        SQL_CURSOR_KEEP_ALIVE_SETTING,
+        new Updater(Key.SQL_CURSOR_KEEP_ALIVE));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.SQL_DELETE_ENABLED,
+        SQL_DELETE_ENABLED_SETTING,
+        new Updater(Key.SQL_DELETE_ENABLED));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.PPL_ENABLED,
+        PPL_ENABLED_SETTING,
+        new Updater(Key.PPL_ENABLED));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.QUERY_MEMORY_LIMIT,
+        QUERY_MEMORY_LIMIT_SETTING,
+        new Updater(Key.QUERY_MEMORY_LIMIT));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.QUERY_SIZE_LIMIT,
+        QUERY_SIZE_LIMIT_SETTING,
+        new Updater(Key.QUERY_SIZE_LIMIT));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.METRICS_ROLLING_WINDOW,
+        METRICS_ROLLING_WINDOW_SETTING,
+        new Updater(Key.METRICS_ROLLING_WINDOW));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.METRICS_ROLLING_INTERVAL,
+        METRICS_ROLLING_INTERVAL_SETTING,
+        new Updater(Key.METRICS_ROLLING_INTERVAL));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.DATASOURCES_URI_HOSTS_DENY_LIST,
+        DATASOURCE_URI_HOSTS_DENY_LIST,
+        new Updater(Key.DATASOURCES_URI_HOSTS_DENY_LIST));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.DATASOURCES_ENABLED,
+        DATASOURCE_ENABLED_SETTING,
+        new Updater(Key.DATASOURCES_ENABLED));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.ASYNC_QUERY_ENABLED,
+        ASYNC_QUERY_ENABLED_SETTING,
+        new Updater(Key.ASYNC_QUERY_ENABLED));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED,
+        ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED_SETTING,
+        new Updater(Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL,
+        ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL_SETTING,
+        new Updater(Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.SPARK_EXECUTION_ENGINE_CONFIG,
+        SPARK_EXECUTION_ENGINE_CONFIG,
+        new Updater(Key.SPARK_EXECUTION_ENGINE_CONFIG));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.SPARK_EXECUTION_SESSION_LIMIT,
+        SPARK_EXECUTION_SESSION_LIMIT_SETTING,
+        new Updater(Key.SPARK_EXECUTION_SESSION_LIMIT));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.SPARK_EXECUTION_REFRESH_JOB_LIMIT,
+        SPARK_EXECUTION_REFRESH_JOB_LIMIT_SETTING,
+        new Updater(Key.SPARK_EXECUTION_REFRESH_JOB_LIMIT));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.SESSION_INDEX_TTL,
+        SESSION_INDEX_TTL_SETTING,
+        new Updater(Key.SESSION_INDEX_TTL));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.RESULT_INDEX_TTL,
+        RESULT_INDEX_TTL_SETTING,
+        new Updater(Key.RESULT_INDEX_TTL));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.AUTO_INDEX_MANAGEMENT_ENABLED,
+        AUTO_INDEX_MANAGEMENT_ENABLED_SETTING,
+        new Updater(Key.AUTO_INDEX_MANAGEMENT_ENABLED));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.DATASOURCES_LIMIT,
+        DATASOURCES_LIMIT_SETTING,
+        new Updater(Key.DATASOURCES_LIMIT));
+    registerNonDynamicSettings(
+        settingBuilder, clusterSettings, Key.CLUSTER_NAME, ClusterName.CLUSTER_NAME_SETTING);
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.SESSION_INACTIVITY_TIMEOUT_MILLIS,
+        SESSION_INACTIVITY_TIMEOUT_MILLIS_SETTING,
+        new Updater((Key.SESSION_INACTIVITY_TIMEOUT_MILLIS)));
+    register(
+        settingBuilder,
+        clusterSettings,
+        Key.STREAMING_JOB_HOUSEKEEPER_INTERVAL,
+        STREAMING_JOB_HOUSEKEEPER_INTERVAL_SETTING,
+        new Updater((Key.STREAMING_JOB_HOUSEKEEPER_INTERVAL)));
     defaultSettings = settingBuilder.build();
   }
 
@@ -132,21 +375,33 @@ public <T> T getSettingValue(Settings.Key key) {
     return (T) latestSettings.getOrDefault(key, defaultSettings.get(key).getDefault(EMPTY));
   }
 
-  /**
-   * Register the pair of {key, setting}.
-   */
-  private void register(ImmutableMap.Builder<Key, Setting<?>> settingBuilder,
-                        ClusterSettings clusterSettings, Settings.Key key,
-                        Setting setting,
-                        Consumer<Object> updater) {
+  /** Register the pair of {key, setting}. */
+  private void register(
+      ImmutableMap.Builder<Key, Setting<?>> settingBuilder,
+      ClusterSettings clusterSettings,
+      Settings.Key key,
+      Setting setting,
+      Consumer<Object> updater) {
+    if (clusterSettings.get(setting) != null) {
+      latestSettings.put(key, clusterSettings.get(setting));
+    }
     settingBuilder.put(key, setting);
-    clusterSettings
-        .addSettingsUpdateConsumer(setting, updater);
+    clusterSettings.addSettingsUpdateConsumer(setting, updater);
+  }
+
+  /** Register Non Dynamic Settings without consumer. */
+  private void registerNonDynamicSettings(
+      ImmutableMap.Builder<Key, Setting<?>> settingBuilder,
+      ClusterSettings clusterSettings,
+      Settings.Key key,
+      Setting setting) {
+    settingBuilder.put(key, setting);
+    latestSettings.put(key, clusterSettings.get(setting));
   }
 
   /**
-   * Add the inner class only for UT coverage purpose.
-   * Lambda could be much elegant solution. But which is hard to test.
+   * Add the inner class only for UT coverage purpose. Lambda could be much elegant solution. But
+   * which is hard to test.
    */
   @VisibleForTesting
   @RequiredArgsConstructor
@@ -160,9 +415,7 @@ public void accept(Object newValue) {
     }
   }
 
-  /**
-   * Used by Plugin to init Setting.
-   */
+  /** Used by Plugin to init Setting. */
   public static List<Setting<?>> pluginSettings() {
     return new ImmutableList.Builder<Setting<?>>()
         .add(SQL_ENABLED_SETTING)
@@ -174,12 +427,32 @@ public static List<Setting<?>> pluginSettings() {
         .add(QUERY_SIZE_LIMIT_SETTING)
         .add(METRICS_ROLLING_WINDOW_SETTING)
         .add(METRICS_ROLLING_INTERVAL_SETTING)
+        .add(DATASOURCE_URI_HOSTS_DENY_LIST)
+        .add(DATASOURCE_ENABLED_SETTING)
+        .add(ASYNC_QUERY_ENABLED_SETTING)
+        .add(ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED_SETTING)
+        .add(ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL_SETTING)
+        .add(SPARK_EXECUTION_ENGINE_CONFIG)
+        .add(SPARK_EXECUTION_SESSION_LIMIT_SETTING)
+        .add(SPARK_EXECUTION_REFRESH_JOB_LIMIT_SETTING)
+        .add(SESSION_INDEX_TTL_SETTING)
+        .add(RESULT_INDEX_TTL_SETTING)
+        .add(AUTO_INDEX_MANAGEMENT_ENABLED_SETTING)
+        .add(DATASOURCES_LIMIT_SETTING)
+        .add(SESSION_INACTIVITY_TIMEOUT_MILLIS_SETTING)
+        .add(STREAMING_JOB_HOUSEKEEPER_INTERVAL_SETTING)
         .build();
   }
 
-  /**
-   * Used by local cluster to get settings from a setting instance.
-   */
+  /** Init Non Dynamic Plugin Settings. */
+  public static List<Setting<?>> pluginNonDynamicSettings() {
+    return new ImmutableList.Builder<Setting<?>>()
+        .add(DATASOURCE_MASTER_SECRET_KEY)
+        .add(DATASOURCE_CONFIG)
+        .build();
+  }
+
+  /** Used by local cluster to get settings from a setting instance. */
   public List<Setting<?>> getSettings() {
     return pluginSettings();
   }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchDataSourceFactory.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchDataSourceFactory.java
index 011f6236fb..b30d460c00 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchDataSourceFactory.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchDataSourceFactory.java
@@ -28,7 +28,9 @@ public DataSourceType getDataSourceType() {
 
   @Override
   public DataSource createDataSource(DataSourceMetadata metadata) {
-    return new DataSource(metadata.getName(), DataSourceType.OPENSEARCH,
+    return new DataSource(
+        metadata.getName(),
+        DataSourceType.OPENSEARCH,
         new OpenSearchStorageEngine(client, settings));
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchIndex.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchIndex.java
index c694769b89..c6afdb8511 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchIndex.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchIndex.java
@@ -3,14 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.function.Function;
 import lombok.RequiredArgsConstructor;
+import org.opensearch.common.unit.TimeValue;
 import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.opensearch.client.OpenSearchClient;
 import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
@@ -19,7 +22,9 @@
 import org.opensearch.sql.opensearch.planner.physical.MLCommonsOperator;
 import org.opensearch.sql.opensearch.planner.physical.MLOperator;
 import org.opensearch.sql.opensearch.request.OpenSearchRequest;
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
 import org.opensearch.sql.opensearch.request.system.OpenSearchDescribeIndexRequest;
+import org.opensearch.sql.opensearch.storage.scan.OpenSearchIndexScan;
 import org.opensearch.sql.opensearch.storage.scan.OpenSearchIndexScanBuilder;
 import org.opensearch.sql.planner.DefaultImplementor;
 import org.opensearch.sql.planner.logical.LogicalAD;
@@ -33,29 +38,41 @@
 /** OpenSearch table (index) implementation. */
 public class OpenSearchIndex implements Table {
 
+  public static final String METADATA_FIELD_ID = "_id";
+  public static final String METADATA_FIELD_INDEX = "_index";
+  public static final String METADATA_FIELD_SCORE = "_score";
+  public static final String METADATA_FIELD_MAXSCORE = "_maxscore";
+  public static final String METADATA_FIELD_SORT = "_sort";
+
+  public static final String METADATA_FIELD_ROUTING = "_routing";
+
+  public static final java.util.Map<String, ExprType> METADATAFIELD_TYPE_MAP =
+      Map.of(
+          METADATA_FIELD_ID, ExprCoreType.STRING,
+          METADATA_FIELD_INDEX, ExprCoreType.STRING,
+          METADATA_FIELD_SCORE, ExprCoreType.FLOAT,
+          METADATA_FIELD_MAXSCORE, ExprCoreType.FLOAT,
+          METADATA_FIELD_SORT, ExprCoreType.LONG,
+          METADATA_FIELD_ROUTING, ExprCoreType.STRING);
+
   /** OpenSearch client connection. */
   private final OpenSearchClient client;
 
   private final Settings settings;
 
-  /**
-   * {@link OpenSearchRequest.IndexName}.
-   */
+  /** {@link OpenSearchRequest.IndexName}. */
   private final OpenSearchRequest.IndexName indexName;
 
-  /**
-   * The cached mapping of field and type in index.
-   */
+  /** The cached mapping of field and type in index. */
+  private Map<String, OpenSearchDataType> cachedFieldOpenSearchTypes = null;
+
+  /** The cached ExprType of fields. */
   private Map<String, ExprType> cachedFieldTypes = null;
 
-  /**
-   * The cached max result window setting of index.
-   */
+  /** The cached max result window setting of index. */
   private Integer cachedMaxResultWindow = null;
 
-  /**
-   * Constructor.
-   */
+  /** Constructor. */
   public OpenSearchIndex(OpenSearchClient client, Settings settings, String indexName) {
     this.client = client;
     this.settings = settings;
@@ -74,7 +91,7 @@ public void create(Map<String, ExprType> schema) {
     mappings.put("properties", properties);
 
     for (Map.Entry<String, ExprType> colType : schema.entrySet()) {
-      properties.put(colType.getKey(), OpenSearchDataType.getOpenSearchType(colType.getValue()));
+      properties.put(colType.getKey(), colType.getValue().legacyTypeName().toLowerCase());
     }
     client.createIndex(indexName.toString(), mappings);
   }
@@ -84,17 +101,48 @@ public void create(Map<String, ExprType> schema) {
    *  Need to either handle field name conflicts
    *   or lazy evaluate when query engine pulls field type.
    */
+  /**
+   * Get simplified parsed mapping info. Unlike {@link #getFieldOpenSearchTypes()} it returns a
+   * flattened map.
+   *
+   * @return A map between field names and matching `ExprCoreType`s.
+   */
   @Override
   public Map<String, ExprType> getFieldTypes() {
+    if (cachedFieldOpenSearchTypes == null) {
+      cachedFieldOpenSearchTypes =
+          new OpenSearchDescribeIndexRequest(client, indexName).getFieldTypes();
+    }
     if (cachedFieldTypes == null) {
-      cachedFieldTypes = new OpenSearchDescribeIndexRequest(client, indexName).getFieldTypes();
+      cachedFieldTypes =
+          OpenSearchDataType.traverseAndFlatten(cachedFieldOpenSearchTypes).entrySet().stream()
+              .collect(
+                  LinkedHashMap::new,
+                  (map, item) -> map.put(item.getKey(), item.getValue().getExprType()),
+                  Map::putAll);
     }
     return cachedFieldTypes;
   }
 
+  @Override
+  public Map<String, ExprType> getReservedFieldTypes() {
+    return METADATAFIELD_TYPE_MAP;
+  }
+
   /**
-   * Get the max result window setting of the table.
+   * Get parsed mapping info.
+   *
+   * @return A complete map between field names and their types.
    */
+  public Map<String, OpenSearchDataType> getFieldOpenSearchTypes() {
+    if (cachedFieldOpenSearchTypes == null) {
+      cachedFieldOpenSearchTypes =
+          new OpenSearchDescribeIndexRequest(client, indexName).getFieldTypes();
+    }
+    return cachedFieldOpenSearchTypes;
+  }
+
+  /** Get the max result window setting of the table. */
   public Integer getMaxResultWindow() {
     if (cachedMaxResultWindow == null) {
       cachedMaxResultWindow =
@@ -103,9 +151,7 @@ public Integer getMaxResultWindow() {
     return cachedMaxResultWindow;
   }
 
-  /**
-   * TODO: Push down operations to index scan operator as much as possible in future.
-   */
+  /** TODO: Push down operations to index scan operator as much as possible in future. */
   @Override
   public PhysicalPlan implement(LogicalPlan plan) {
     // TODO: Leave it here to avoid impact Prometheus and AD operators. Need to move to Planner.
@@ -113,41 +159,50 @@ public PhysicalPlan implement(LogicalPlan plan) {
   }
 
   @Override
-  public LogicalPlan optimize(LogicalPlan plan) {
-    // No-op because optimization already done in Planner
-    return plan;
+  public TableScanBuilder createScanBuilder() {
+    final int querySizeLimit = settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT);
+
+    final TimeValue cursorKeepAlive = settings.getSettingValue(Settings.Key.SQL_CURSOR_KEEP_ALIVE);
+    var builder = new OpenSearchRequestBuilder(querySizeLimit, createExprValueFactory());
+    Function<OpenSearchRequestBuilder, OpenSearchIndexScan> createScanOperator =
+        requestBuilder ->
+            new OpenSearchIndexScan(
+                client,
+                requestBuilder.getMaxResponseSize(),
+                requestBuilder.build(indexName, getMaxResultWindow(), cursorKeepAlive));
+    return new OpenSearchIndexScanBuilder(builder, createScanOperator);
   }
 
-  @Override
-  public TableScanBuilder createScanBuilder() {
-    OpenSearchIndexScan indexScan = new OpenSearchIndexScan(client, settings, indexName,
-        getMaxResultWindow(), new OpenSearchExprValueFactory(getFieldTypes()));
-    return new OpenSearchIndexScanBuilder(indexScan);
+  private OpenSearchExprValueFactory createExprValueFactory() {
+    Map<String, OpenSearchDataType> allFields = new HashMap<>();
+    getReservedFieldTypes().forEach((k, v) -> allFields.put(k, OpenSearchDataType.of(v)));
+    allFields.putAll(getFieldOpenSearchTypes());
+    return new OpenSearchExprValueFactory(allFields);
   }
 
   @VisibleForTesting
   @RequiredArgsConstructor
-  public static class OpenSearchDefaultImplementor
-      extends DefaultImplementor<OpenSearchIndexScan> {
+  public static class OpenSearchDefaultImplementor extends DefaultImplementor<OpenSearchIndexScan> {
 
     private final OpenSearchClient client;
 
     @Override
     public PhysicalPlan visitMLCommons(LogicalMLCommons node, OpenSearchIndexScan context) {
-      return new MLCommonsOperator(visitChild(node, context), node.getAlgorithm(),
-              node.getArguments(), client.getNodeClient());
+      return new MLCommonsOperator(
+          visitChild(node, context),
+          node.getAlgorithm(),
+          node.getArguments(),
+          client.getNodeClient());
     }
 
     @Override
     public PhysicalPlan visitAD(LogicalAD node, OpenSearchIndexScan context) {
-      return new ADOperator(visitChild(node, context),
-              node.getArguments(), client.getNodeClient());
+      return new ADOperator(visitChild(node, context), node.getArguments(), client.getNodeClient());
     }
 
     @Override
     public PhysicalPlan visitML(LogicalML node, OpenSearchIndexScan context) {
-      return new MLOperator(visitChild(node, context),
-              node.getArguments(), client.getNodeClient());
+      return new MLOperator(visitChild(node, context), node.getArguments(), client.getNodeClient());
     }
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexScan.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexScan.java
deleted file mode 100644
index e9746e1fae..0000000000
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexScan.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.sql.opensearch.storage;
-
-import java.util.Collections;
-import java.util.Iterator;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
-import org.opensearch.sql.common.setting.Settings;
-import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.opensearch.client.OpenSearchClient;
-import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
-import org.opensearch.sql.opensearch.request.OpenSearchRequest;
-import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
-import org.opensearch.sql.opensearch.response.OpenSearchResponse;
-import org.opensearch.sql.storage.TableScanOperator;
-
-/**
- * OpenSearch index scan operator.
- */
-@EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = false)
-@ToString(onlyExplicitlyIncluded = true)
-public class OpenSearchIndexScan extends TableScanOperator {
-
-  /** OpenSearch client. */
-  private final OpenSearchClient client;
-
-  /** Search request builder. */
-  @EqualsAndHashCode.Include
-  @Getter
-  @ToString.Include
-  private final OpenSearchRequestBuilder requestBuilder;
-
-  /** Search request. */
-  @EqualsAndHashCode.Include
-  @ToString.Include
-  private OpenSearchRequest request;
-
-  /** Total query size. */
-  @EqualsAndHashCode.Include
-  @ToString.Include
-  private Integer querySize;
-
-  /** Number of rows returned. */
-  private Integer queryCount;
-
-  /** Search response for current batch. */
-  private Iterator<ExprValue> iterator;
-
-  /**
-   * Constructor.
-   */
-  public OpenSearchIndexScan(OpenSearchClient client, Settings settings,
-                             String indexName, Integer maxResultWindow,
-                             OpenSearchExprValueFactory exprValueFactory) {
-    this(client, settings,
-        new OpenSearchRequest.IndexName(indexName),maxResultWindow, exprValueFactory);
-  }
-
-  /**
-   * Constructor.
-   */
-  public OpenSearchIndexScan(OpenSearchClient client, Settings settings,
-                             OpenSearchRequest.IndexName indexName, Integer maxResultWindow,
-                             OpenSearchExprValueFactory exprValueFactory) {
-    this.client = client;
-    this.requestBuilder = new OpenSearchRequestBuilder(
-        indexName, maxResultWindow, settings,exprValueFactory);
-  }
-
-  @Override
-  public void open() {
-    super.open();
-    querySize = requestBuilder.getQuerySize();
-    request = requestBuilder.build();
-    iterator = Collections.emptyIterator();
-    queryCount = 0;
-    fetchNextBatch();
-  }
-
-  @Override
-  public boolean hasNext() {
-    if (queryCount >= querySize) {
-      iterator = Collections.emptyIterator();
-    } else if (!iterator.hasNext()) {
-      fetchNextBatch();
-    }
-    return iterator.hasNext();
-  }
-
-  @Override
-  public ExprValue next() {
-    queryCount++;
-    return iterator.next();
-  }
-
-  private void fetchNextBatch() {
-    OpenSearchResponse response = client.search(request);
-    if (!response.isEmpty()) {
-      iterator = response.iterator();
-    }
-  }
-
-  @Override
-  public void close() {
-    super.close();
-
-    client.cleanup(request);
-  }
-
-  @Override
-  public String explain() {
-    return getRequestBuilder().build().toString();
-  }
-}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngine.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngine.java
index 4a3393abc9..7c022e2190 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngine.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngine.java
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage;
 
 import static org.opensearch.sql.utils.SystemIndexUtils.isSystemIndex;
 
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.DataSourceSchemaName;
 import org.opensearch.sql.common.setting.Settings;
@@ -21,9 +21,9 @@
 public class OpenSearchStorageEngine implements StorageEngine {
 
   /** OpenSearch client connection. */
-  private final OpenSearchClient client;
+  @Getter private final OpenSearchClient client;
 
-  private final Settings settings;
+  @Getter private final Settings settings;
 
   @Override
   public Table getTable(DataSourceSchemaName dataSourceSchemaName, String name) {
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScan.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScan.java
new file mode 100644
index 0000000000..b1e4ccc463
--- /dev/null
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScan.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.storage.scan;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collections;
+import java.util.Iterator;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.opensearch.common.io.stream.BytesStreamOutput;
+import org.opensearch.core.common.io.stream.BytesStreamInput;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.exception.NoCursorException;
+import org.opensearch.sql.executor.pagination.PlanSerializer;
+import org.opensearch.sql.opensearch.client.OpenSearchClient;
+import org.opensearch.sql.opensearch.request.OpenSearchRequest;
+import org.opensearch.sql.opensearch.request.OpenSearchScrollRequest;
+import org.opensearch.sql.opensearch.response.OpenSearchResponse;
+import org.opensearch.sql.opensearch.storage.OpenSearchStorageEngine;
+import org.opensearch.sql.planner.SerializablePlan;
+import org.opensearch.sql.storage.TableScanOperator;
+
+/** OpenSearch index scan operator. */
+@EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = false)
+@ToString(onlyExplicitlyIncluded = true)
+public class OpenSearchIndexScan extends TableScanOperator implements SerializablePlan {
+
+  /** OpenSearch client. */
+  private OpenSearchClient client;
+
+  /** Search request. */
+  @EqualsAndHashCode.Include @ToString.Include private OpenSearchRequest request;
+
+  /** Largest number of rows allowed in the response. */
+  @EqualsAndHashCode.Include @ToString.Include private int maxResponseSize;
+
+  /** Number of rows returned. */
+  private Integer queryCount;
+
+  /** Search response for current batch. */
+  private Iterator<ExprValue> iterator;
+
+  /** Creates index scan based on a provided OpenSearchRequestBuilder. */
+  public OpenSearchIndexScan(
+      OpenSearchClient client, int maxResponseSize, OpenSearchRequest request) {
+    this.client = client;
+    this.maxResponseSize = maxResponseSize;
+    this.request = request;
+  }
+
+  @Override
+  public void open() {
+    super.open();
+    iterator = Collections.emptyIterator();
+    queryCount = 0;
+    fetchNextBatch();
+  }
+
+  @Override
+  public boolean hasNext() {
+    if (queryCount >= maxResponseSize) {
+      iterator = Collections.emptyIterator();
+    } else if (!iterator.hasNext()) {
+      fetchNextBatch();
+    }
+    return iterator.hasNext();
+  }
+
+  @Override
+  public ExprValue next() {
+    queryCount++;
+    return iterator.next();
+  }
+
+  private void fetchNextBatch() {
+    OpenSearchResponse response = client.search(request);
+    if (!response.isEmpty()) {
+      iterator = response.iterator();
+    }
+  }
+
+  @Override
+  public void close() {
+    super.close();
+
+    client.cleanup(request);
+  }
+
+  @Override
+  public String explain() {
+    return request.toString();
+  }
+
+  /**
+   * No-args constructor.
+   *
+   * @deprecated Exists only to satisfy Java serialization API.
+   */
+  @Deprecated(since = "introduction")
+  public OpenSearchIndexScan() {}
+
+  @Override
+  public void readExternal(ObjectInput in) throws IOException {
+    int reqSize = in.readInt();
+    byte[] requestStream = new byte[reqSize];
+    int read = 0;
+    do {
+      int currentRead = in.read(requestStream, read, reqSize - read);
+      if (currentRead == -1) {
+        throw new IOException();
+      }
+      read += currentRead;
+    } while (read < reqSize);
+
+    var engine =
+        (OpenSearchStorageEngine)
+            ((PlanSerializer.CursorDeserializationStream) in).resolveObject("engine");
+
+    try (BytesStreamInput bsi = new BytesStreamInput(requestStream)) {
+      request = new OpenSearchScrollRequest(bsi, engine);
+    }
+    maxResponseSize = in.readInt();
+
+    client = engine.getClient();
+  }
+
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    if (!request.hasAnotherBatch()) {
+      throw new NoCursorException();
+    }
+    // request is not directly Serializable so..
+    // 1. Serialize request to an opensearch byte stream.
+    BytesStreamOutput reqOut = new BytesStreamOutput();
+    request.writeTo(reqOut);
+    reqOut.flush();
+
+    // 2. Extract byte[] from the opensearch byte stream
+    var reqAsBytes = reqOut.bytes().toBytesRef().bytes;
+
+    // 3. Write out the byte[] to object output stream.
+    out.writeInt(reqOut.size());
+    out.write(reqAsBytes, 0, reqOut.size());
+
+    out.writeInt(maxResponseSize);
+  }
+}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanAggregationBuilder.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanAggregationBuilder.java
index e52fc566cd..02ac21a39d 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanAggregationBuilder.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanAggregationBuilder.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.search.aggregations.AggregationBuilder;
 import org.opensearch.sql.ast.tree.Sort;
@@ -15,58 +16,51 @@
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
 import org.opensearch.sql.opensearch.response.agg.OpenSearchAggregationResponseParser;
-import org.opensearch.sql.opensearch.storage.OpenSearchIndexScan;
 import org.opensearch.sql.opensearch.storage.script.aggregation.AggregationQueryBuilder;
 import org.opensearch.sql.opensearch.storage.serialization.DefaultExpressionSerializer;
 import org.opensearch.sql.planner.logical.LogicalAggregation;
+import org.opensearch.sql.planner.logical.LogicalFilter;
 import org.opensearch.sql.planner.logical.LogicalSort;
-import org.opensearch.sql.storage.TableScanOperator;
-import org.opensearch.sql.storage.read.TableScanBuilder;
 
-/**
- * Index scan builder for aggregate query used by {@link OpenSearchIndexScanBuilder} internally.
- */
-class OpenSearchIndexScanAggregationBuilder extends TableScanBuilder {
+/** Index scan builder for aggregate query used by {@link OpenSearchIndexScanBuilder} internally. */
+@EqualsAndHashCode
+class OpenSearchIndexScanAggregationBuilder implements PushDownQueryBuilder {
 
   /** OpenSearch index scan to be optimized. */
-  private final OpenSearchIndexScan indexScan;
+  private final OpenSearchRequestBuilder requestBuilder;
 
   /** Aggregators pushed down. */
-  private List<NamedAggregator> aggregatorList;
+  private final List<NamedAggregator> aggregatorList;
 
   /** Grouping items pushed down. */
-  private List<NamedExpression> groupByList;
+  private final List<NamedExpression> groupByList;
 
   /** Sorting items pushed down. */
   private List<Pair<Sort.SortOption, Expression>> sortList;
 
-  /**
-   * Initialize with given index scan and perform push-down optimization later.
-   *
-   * @param indexScan index scan not fully optimized yet
-   */
-  OpenSearchIndexScanAggregationBuilder(OpenSearchIndexScan indexScan) {
-    this.indexScan = indexScan;
+  OpenSearchIndexScanAggregationBuilder(
+      OpenSearchRequestBuilder requestBuilder, LogicalAggregation aggregation) {
+    this.requestBuilder = requestBuilder;
+    aggregatorList = aggregation.getAggregatorList();
+    groupByList = aggregation.getGroupByList();
   }
 
   @Override
-  public TableScanOperator build() {
+  public OpenSearchRequestBuilder build() {
     AggregationQueryBuilder builder =
         new AggregationQueryBuilder(new DefaultExpressionSerializer());
     Pair<List<AggregationBuilder>, OpenSearchAggregationResponseParser> aggregationBuilder =
         builder.buildAggregationBuilder(aggregatorList, groupByList, sortList);
-    indexScan.getRequestBuilder().pushDownAggregation(aggregationBuilder);
-    indexScan.getRequestBuilder().pushTypeMapping(
-        builder.buildTypeMapping(aggregatorList, groupByList));
-    return indexScan;
+    requestBuilder.pushDownAggregation(aggregationBuilder);
+    requestBuilder.pushTypeMapping(builder.buildTypeMapping(aggregatorList, groupByList));
+    return requestBuilder;
   }
 
   @Override
-  public boolean pushDownAggregation(LogicalAggregation aggregation) {
-    aggregatorList = aggregation.getAggregatorList();
-    groupByList = aggregation.getGroupByList();
-    return true;
+  public boolean pushDownFilter(LogicalFilter filter) {
+    return false;
   }
 
   @Override
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanBuilder.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanBuilder.java
index d7483cfcf0..8a2f3e98f4 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanBuilder.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanBuilder.java
@@ -5,14 +5,18 @@
 
 package org.opensearch.sql.opensearch.storage.scan;
 
-import com.google.common.annotations.VisibleForTesting;
+import static org.opensearch.sql.analysis.NestedAnalyzer.isNestedFunction;
+
+import java.util.function.Function;
 import lombok.EqualsAndHashCode;
 import org.opensearch.sql.expression.ReferenceExpression;
-import org.opensearch.sql.opensearch.storage.OpenSearchIndexScan;
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
 import org.opensearch.sql.planner.logical.LogicalAggregation;
 import org.opensearch.sql.planner.logical.LogicalFilter;
 import org.opensearch.sql.planner.logical.LogicalHighlight;
 import org.opensearch.sql.planner.logical.LogicalLimit;
+import org.opensearch.sql.planner.logical.LogicalNested;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
 import org.opensearch.sql.planner.logical.LogicalProject;
 import org.opensearch.sql.planner.logical.LogicalSort;
 import org.opensearch.sql.storage.TableScanOperator;
@@ -25,32 +29,33 @@
  */
 public class OpenSearchIndexScanBuilder extends TableScanBuilder {
 
-  /**
-   * Delegated index scan builder for non-aggregate or aggregate query.
-   */
-  @EqualsAndHashCode.Include
-  private TableScanBuilder delegate;
+  private final Function<OpenSearchRequestBuilder, OpenSearchIndexScan> scanFactory;
+
+  /** Delegated index scan builder for non-aggregate or aggregate query. */
+  @EqualsAndHashCode.Include private PushDownQueryBuilder delegate;
 
   /** Is limit operator pushed down. */
   private boolean isLimitPushedDown = false;
 
-  @VisibleForTesting
-  OpenSearchIndexScanBuilder(TableScanBuilder delegate) {
-    this.delegate = delegate;
+  /** Constructor used during query execution. */
+  public OpenSearchIndexScanBuilder(
+      OpenSearchRequestBuilder requestBuilder,
+      Function<OpenSearchRequestBuilder, OpenSearchIndexScan> scanFactory) {
+    this.delegate = new OpenSearchIndexScanQueryBuilder(requestBuilder);
+    this.scanFactory = scanFactory;
   }
 
-  /**
-   * Initialize with given index scan.
-   *
-   * @param indexScan index scan to optimize
-   */
-  public OpenSearchIndexScanBuilder(OpenSearchIndexScan indexScan) {
-    this.delegate = new OpenSearchIndexScanQueryBuilder(indexScan);
+  /** Constructor used for unit tests. */
+  protected OpenSearchIndexScanBuilder(
+      PushDownQueryBuilder translator,
+      Function<OpenSearchRequestBuilder, OpenSearchIndexScan> scanFactory) {
+    this.delegate = translator;
+    this.scanFactory = scanFactory;
   }
 
   @Override
   public TableScanOperator build() {
-    return delegate.build();
+    return scanFactory.apply(delegate.build());
   }
 
   @Override
@@ -66,10 +71,13 @@ public boolean pushDownAggregation(LogicalAggregation aggregation) {
 
     // Switch to builder for aggregate query which has different push down logic
     //  for later filter, sort and limit operator.
-    delegate = new OpenSearchIndexScanAggregationBuilder(
-        (OpenSearchIndexScan) delegate.build());
+    delegate = new OpenSearchIndexScanAggregationBuilder(delegate.build(), aggregation);
+    return true;
+  }
 
-    return delegate.pushDownAggregation(aggregation);
+  @Override
+  public boolean pushDownPageSize(LogicalPaginate paginate) {
+    return delegate.pushDownPageSize(paginate);
   }
 
   @Override
@@ -97,9 +105,23 @@ public boolean pushDownHighlight(LogicalHighlight highlight) {
     return delegate.pushDownHighlight(highlight);
   }
 
+  @Override
+  public boolean pushDownNested(LogicalNested nested) {
+    return delegate.pushDownNested(nested);
+  }
+
+  /**
+   * Valid if sorting is only by fields.
+   *
+   * @param sort Logical sort
+   * @return True if sorting by fields only
+   */
   private boolean sortByFieldsOnly(LogicalSort sort) {
     return sort.getSortList().stream()
-        .map(sortItem -> sortItem.getRight() instanceof ReferenceExpression)
+        .map(
+            sortItem ->
+                sortItem.getRight() instanceof ReferenceExpression
+                    || isNestedFunction(sortItem.getRight()))
         .reduce(true, Boolean::logicalAnd);
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanQueryBuilder.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanQueryBuilder.java
index 7190d58000..f4b0b05256 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanQueryBuilder.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanQueryBuilder.java
@@ -18,51 +18,43 @@
 import org.opensearch.sql.common.utils.StringUtils;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ExpressionNodeVisitor;
+import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
-import org.opensearch.sql.opensearch.storage.OpenSearchIndexScan;
+import org.opensearch.sql.expression.function.OpenSearchFunctions;
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
 import org.opensearch.sql.opensearch.storage.script.filter.FilterQueryBuilder;
 import org.opensearch.sql.opensearch.storage.script.sort.SortQueryBuilder;
 import org.opensearch.sql.opensearch.storage.serialization.DefaultExpressionSerializer;
 import org.opensearch.sql.planner.logical.LogicalFilter;
 import org.opensearch.sql.planner.logical.LogicalHighlight;
 import org.opensearch.sql.planner.logical.LogicalLimit;
+import org.opensearch.sql.planner.logical.LogicalNested;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
 import org.opensearch.sql.planner.logical.LogicalProject;
 import org.opensearch.sql.planner.logical.LogicalSort;
-import org.opensearch.sql.storage.TableScanOperator;
-import org.opensearch.sql.storage.read.TableScanBuilder;
 
 /**
- * Index scan builder for simple non-aggregate query used by
- * {@link OpenSearchIndexScanBuilder} internally.
+ * Index scan builder for simple non-aggregate query used by {@link OpenSearchIndexScanBuilder}
+ * internally.
  */
 @VisibleForTesting
-class OpenSearchIndexScanQueryBuilder extends TableScanBuilder {
+@EqualsAndHashCode
+class OpenSearchIndexScanQueryBuilder implements PushDownQueryBuilder {
 
-  /** OpenSearch index scan to be optimized. */
-  @EqualsAndHashCode.Include
-  private final OpenSearchIndexScan indexScan;
+  OpenSearchRequestBuilder requestBuilder;
 
-  /**
-   * Initialize with given index scan and perform push-down optimization later.
-   *
-   * @param indexScan index scan not optimized yet
-   */
-  OpenSearchIndexScanQueryBuilder(OpenSearchIndexScan indexScan) {
-    this.indexScan = indexScan;
-  }
-
-  @Override
-  public TableScanOperator build() {
-    return indexScan;
+  public OpenSearchIndexScanQueryBuilder(OpenSearchRequestBuilder requestBuilder) {
+    this.requestBuilder = requestBuilder;
   }
 
   @Override
   public boolean pushDownFilter(LogicalFilter filter) {
-    FilterQueryBuilder queryBuilder = new FilterQueryBuilder(
-        new DefaultExpressionSerializer());
-    QueryBuilder query = queryBuilder.build(filter.getCondition());
-    indexScan.getRequestBuilder().pushDown(query);
+    FilterQueryBuilder queryBuilder = new FilterQueryBuilder(new DefaultExpressionSerializer());
+    Expression queryCondition = filter.getCondition();
+    QueryBuilder query = queryBuilder.build(queryCondition);
+    requestBuilder.pushDownFilter(query);
+    requestBuilder.pushDownTrackedScore(trackScoresFromOpenSearchFunction(queryCondition));
     return true;
   }
 
@@ -70,22 +62,22 @@ public boolean pushDownFilter(LogicalFilter filter) {
   public boolean pushDownSort(LogicalSort sort) {
     List<Pair<Sort.SortOption, Expression>> sortList = sort.getSortList();
     final SortQueryBuilder builder = new SortQueryBuilder();
-    indexScan.getRequestBuilder().pushDownSort(sortList.stream()
-        .map(sortItem -> builder.build(sortItem.getValue(), sortItem.getKey()))
-        .collect(Collectors.toList()));
+    requestBuilder.pushDownSort(
+        sortList.stream()
+            .map(sortItem -> builder.build(sortItem.getValue(), sortItem.getKey()))
+            .collect(Collectors.toList()));
     return true;
   }
 
   @Override
   public boolean pushDownLimit(LogicalLimit limit) {
-    indexScan.getRequestBuilder().pushDownLimit(limit.getLimit(), limit.getOffset());
+    requestBuilder.pushDownLimit(limit.getLimit(), limit.getOffset());
     return true;
   }
 
   @Override
   public boolean pushDownProject(LogicalProject project) {
-    indexScan.getRequestBuilder().pushDownProjects(
-        findReferenceExpressions(project.getProjectList()));
+    requestBuilder.pushDownProjects(findReferenceExpressions(project.getProjectList()));
 
     // Return false intentionally to keep the original project operator
     return false;
@@ -93,17 +85,51 @@ public boolean pushDownProject(LogicalProject project) {
 
   @Override
   public boolean pushDownHighlight(LogicalHighlight highlight) {
-    indexScan.getRequestBuilder().pushDownHighlight(
+    requestBuilder.pushDownHighlight(
         StringUtils.unquoteText(highlight.getHighlightField().toString()),
         highlight.getArguments());
     return true;
   }
 
+  @Override
+  public boolean pushDownPageSize(LogicalPaginate paginate) {
+    requestBuilder.pushDownPageSize(paginate.getPageSize());
+    return true;
+  }
+
+  private boolean trackScoresFromOpenSearchFunction(Expression condition) {
+    if (condition instanceof OpenSearchFunctions.OpenSearchFunction
+        && ((OpenSearchFunctions.OpenSearchFunction) condition).isScoreTracked()) {
+      return true;
+    }
+    if (condition instanceof FunctionExpression) {
+      return ((FunctionExpression) condition)
+          .getArguments().stream().anyMatch(this::trackScoresFromOpenSearchFunction);
+    }
+    return false;
+  }
+
+  @Override
+  public boolean pushDownNested(LogicalNested nested) {
+    requestBuilder.pushDownNested(nested.getFields());
+    requestBuilder.pushDownProjects(findReferenceExpressions(nested.getProjectList()));
+    // Return false intentionally to keep the original nested operator
+    // Since we return false we need to pushDownProject here as it won't be
+    // pushed down due to no matching push down rule.
+    // TODO: improve LogicalPlanOptimizer pushdown api.
+    return false;
+  }
+
+  @Override
+  public OpenSearchRequestBuilder build() {
+    return requestBuilder;
+  }
+
   /**
    * Find reference expression from expression.
-   * @param expressions a list of expression.
    *
-   * @return a list of ReferenceExpression
+   * @param expressions a list of expression.
+   * @return a set of ReferenceExpression
    */
   public static Set<ReferenceExpression> findReferenceExpressions(
       List<NamedExpression> expressions) {
@@ -116,18 +142,20 @@ public static Set<ReferenceExpression> findReferenceExpressions(
 
   /**
    * Find reference expression from expression.
-   * @param expression expression.
    *
+   * @param expression expression.
    * @return a list of ReferenceExpression
    */
   public static List<ReferenceExpression> findReferenceExpression(NamedExpression expression) {
     List<ReferenceExpression> results = new ArrayList<>();
-    expression.accept(new ExpressionNodeVisitor<>() {
-      @Override
-      public Object visitReference(ReferenceExpression node, Object context) {
-        return results.add(node);
-      }
-    }, null);
+    expression.accept(
+        new ExpressionNodeVisitor<>() {
+          @Override
+          public Object visitReference(ReferenceExpression node, Object context) {
+            return results.add(node);
+          }
+        },
+        null);
     return results;
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/PushDownQueryBuilder.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/PushDownQueryBuilder.java
new file mode 100644
index 0000000000..b855b9a8b5
--- /dev/null
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/PushDownQueryBuilder.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.storage.scan;
+
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
+import org.opensearch.sql.planner.logical.LogicalFilter;
+import org.opensearch.sql.planner.logical.LogicalHighlight;
+import org.opensearch.sql.planner.logical.LogicalLimit;
+import org.opensearch.sql.planner.logical.LogicalNested;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
+import org.opensearch.sql.planner.logical.LogicalProject;
+import org.opensearch.sql.planner.logical.LogicalSort;
+
+/** Translates a logical query plan into OpenSearch DSL and an appropriate request. */
+public interface PushDownQueryBuilder {
+  default boolean pushDownFilter(LogicalFilter filter) {
+    return false;
+  }
+
+  default boolean pushDownSort(LogicalSort sort) {
+    return false;
+  }
+
+  default boolean pushDownLimit(LogicalLimit limit) {
+    return false;
+  }
+
+  default boolean pushDownProject(LogicalProject project) {
+    return false;
+  }
+
+  default boolean pushDownHighlight(LogicalHighlight highlight) {
+    return false;
+  }
+
+  default boolean pushDownPageSize(LogicalPaginate paginate) {
+    return false;
+  }
+
+  default boolean pushDownNested(LogicalNested nested) {
+    return false;
+  }
+
+  OpenSearchRequestBuilder build();
+}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/ExpressionScriptEngine.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/ExpressionScriptEngine.java
index 855aae645d..167bf88f30 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/ExpressionScriptEngine.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/ExpressionScriptEngine.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script;
 
 import com.google.common.collect.ImmutableMap;
@@ -21,29 +20,23 @@
 import org.opensearch.sql.opensearch.storage.serialization.ExpressionSerializer;
 
 /**
- * Custom expression script engine that supports using core engine expression code in DSL
- * as a new script language just like built-in Painless language.
+ * Custom expression script engine that supports using core engine expression code in DSL as a new
+ * script language just like built-in Painless language.
  */
 @RequiredArgsConstructor
 public class ExpressionScriptEngine implements ScriptEngine {
 
-  /**
-   * Expression script language name.
-   */
+  /** Expression script language name. */
   public static final String EXPRESSION_LANG_NAME = "opensearch_query_expression";
 
-  /**
-   * All supported script contexts and function to create factory from expression.
-   */
+  /** All supported script contexts and function to create factory from expression. */
   private static final Map<ScriptContext<?>, Function<Expression, Object>> CONTEXTS =
       new ImmutableMap.Builder<ScriptContext<?>, Function<Expression, Object>>()
           .put(FilterScript.CONTEXT, ExpressionFilterScriptFactory::new)
           .put(AggregationScript.CONTEXT, ExpressionAggregationScriptFactory::new)
           .build();
 
-  /**
-   * Expression serializer that (de-)serializes expression.
-   */
+  /** Expression serializer that (de-)serializes expression. */
   private final ExpressionSerializer serializer;
 
   @Override
@@ -52,10 +45,8 @@ public String getType() {
   }
 
   @Override
-  public <T> T compile(String scriptName,
-                       String scriptCode,
-                       ScriptContext<T> context,
-                       Map<String, String> params) {
+  public <T> T compile(
+      String scriptName, String scriptCode, ScriptContext<T> context, Map<String, String> params) {
     /*
      * Note that in fact the expression source is already compiled in query engine.
      * The "code" is actually a serialized expression tree by our serializer.
@@ -66,13 +57,15 @@ public <T> T compile(String scriptName,
     if (CONTEXTS.containsKey(context)) {
       return context.factoryClazz.cast(CONTEXTS.get(context).apply(expression));
     }
-    throw new IllegalStateException(String.format("Script context is currently not supported: "
-        + "all supported contexts [%s], given context [%s] ", CONTEXTS, context));
+    throw new IllegalStateException(
+        String.format(
+            "Script context is currently not supported: "
+                + "all supported contexts [%s], given context [%s] ",
+            CONTEXTS, context));
   }
 
   @Override
   public Set<ScriptContext<?>> getSupportedContexts() {
     return CONTEXTS.keySet();
   }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/ScriptUtils.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/ScriptUtils.java
deleted file mode 100644
index 98a599dfdf..0000000000
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/ScriptUtils.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.sql.opensearch.storage.script;
-
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
-
-import lombok.experimental.UtilityClass;
-import org.opensearch.sql.data.type.ExprType;
-
-/**
- * Script Utils.
- */
-@UtilityClass
-public class ScriptUtils {
-
-  /**
-   * Text field doesn't have doc value (exception thrown even when you call "get")
-   * Limitation: assume inner field name is always "keyword".
-   */
-  public static String convertTextToKeyword(String fieldName, ExprType fieldType) {
-    if (fieldType == OPENSEARCH_TEXT_KEYWORD) {
-      return fieldName + ".keyword";
-    }
-    return fieldName;
-  }
-}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/StringUtils.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/StringUtils.java
index 7b68bd5c92..a485296b52 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/StringUtils.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/StringUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script;
 
 import lombok.experimental.UtilityClass;
@@ -12,6 +11,7 @@
 public class StringUtils {
   /**
    * Converts sql wildcard character % and _ to * and ?.
+   *
    * @param text string to be converted
    * @return converted string
    */
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilder.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilder.java
index ae3239eea0..a218151b2e 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilder.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -24,12 +23,12 @@
 import org.opensearch.search.aggregations.bucket.missing.MissingOrder;
 import org.opensearch.search.sort.SortOrder;
 import org.opensearch.sql.ast.tree.Sort;
-import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ExpressionNodeVisitor;
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
 import org.opensearch.sql.opensearch.response.agg.CompositeAggregationParser;
 import org.opensearch.sql.opensearch.response.agg.MetricParser;
 import org.opensearch.sql.opensearch.response.agg.NoBucketAggregationParser;
@@ -39,32 +38,23 @@
 import org.opensearch.sql.opensearch.storage.serialization.ExpressionSerializer;
 
 /**
- * Build the AggregationBuilder from the list of {@link NamedAggregator}
- * and list of {@link NamedExpression}.
+ * Build the AggregationBuilder from the list of {@link NamedAggregator} and list of {@link
+ * NamedExpression}.
  */
 @RequiredArgsConstructor
 public class AggregationQueryBuilder extends ExpressionNodeVisitor<AggregationBuilder, Object> {
 
-  /**
-   * How many composite buckets should be returned.
-   */
+  /** How many composite buckets should be returned. */
   public static final int AGGREGATION_BUCKET_SIZE = 1000;
 
-  /**
-   * Bucket Aggregation builder.
-   */
+  /** Bucket Aggregation builder. */
   private final BucketAggregationBuilder bucketBuilder;
 
-  /**
-   * Metric Aggregation builder.
-   */
+  /** Metric Aggregation builder. */
   private final MetricAggregationBuilder metricBuilder;
 
-  /**
-   * Aggregation Query Builder Constructor.
-   */
-  public AggregationQueryBuilder(
-      ExpressionSerializer serializer) {
+  /** Aggregation Query Builder Constructor. */
+  public AggregationQueryBuilder(ExpressionSerializer serializer) {
     this.bucketBuilder = new BucketAggregationBuilder(serializer);
     this.metricBuilder = new MetricAggregationBuilder(serializer);
   }
@@ -93,7 +83,10 @@ public AggregationQueryBuilder(
                       bucketBuilder.build(
                           groupByList.stream()
                               .sorted(groupSortOrder)
-                              .map(expr -> Triple.of(expr,
+                              .map(
+                                  expr ->
+                                      Triple.of(
+                                          expr,
                                           groupSortOrder.sortOrder(expr),
                                           groupSortOrder.missingOrder(expr)))
                               .collect(Collectors.toList())))
@@ -103,70 +96,62 @@ public AggregationQueryBuilder(
     }
   }
 
-  /**
-   * Build ElasticsearchExprValueFactory.
-   */
-  public Map<String, ExprType> buildTypeMapping(
-      List<NamedAggregator> namedAggregatorList,
-      List<NamedExpression> groupByList) {
-    ImmutableMap.Builder<String, ExprType> builder = new ImmutableMap.Builder<>();
-    namedAggregatorList.forEach(agg -> builder.put(agg.getName(), agg.type()));
-    groupByList.forEach(group -> builder.put(group.getNameOrAlias(), group.type()));
+  /** Build mapping for OpenSearchExprValueFactory. */
+  public Map<String, OpenSearchDataType> buildTypeMapping(
+      List<NamedAggregator> namedAggregatorList, List<NamedExpression> groupByList) {
+    ImmutableMap.Builder<String, OpenSearchDataType> builder = new ImmutableMap.Builder<>();
+    namedAggregatorList.forEach(
+        agg -> builder.put(agg.getName(), OpenSearchDataType.of(agg.type())));
+    groupByList.forEach(
+        group -> builder.put(group.getNameOrAlias(), OpenSearchDataType.of(group.type())));
     return builder.build();
   }
 
-  /**
-   * Group By field sort order.
-   */
+  /** Group By field sort order. */
   @VisibleForTesting
   public static class GroupSortOrder implements Comparator<NamedExpression> {
 
     /**
-     * The default order of group field.
-     * The order is ASC NULL_FIRST.
-     * The field should be the last one in the group list.
+     * The default order of group field. The order is ASC NULL_FIRST. The field should be the last
+     * one in the group list.
      */
     private static final Pair<Sort.SortOption, Integer> DEFAULT_ORDER =
         Pair.of(Sort.SortOption.DEFAULT_ASC, Integer.MAX_VALUE);
 
-    /**
-     * The mapping between {@link Sort.SortOrder} and {@link SortOrder}.
-     */
+    /** The mapping between {@link Sort.SortOrder} and {@link SortOrder}. */
     private static final Map<Sort.SortOrder, SortOrder> SORT_MAP =
         new ImmutableMap.Builder<Sort.SortOrder, SortOrder>()
             .put(Sort.SortOrder.ASC, SortOrder.ASC)
-            .put(Sort.SortOrder.DESC, SortOrder.DESC).build();
+            .put(Sort.SortOrder.DESC, SortOrder.DESC)
+            .build();
 
-    /**
-     * The mapping between {@link Sort.NullOrder} and {@link MissingOrder}.
-     */
+    /** The mapping between {@link Sort.NullOrder} and {@link MissingOrder}. */
     private static final Map<Sort.NullOrder, MissingOrder> NULL_MAP =
         new ImmutableMap.Builder<Sort.NullOrder, MissingOrder>()
             .put(Sort.NullOrder.NULL_FIRST, MissingOrder.FIRST)
-            .put(Sort.NullOrder.NULL_LAST, MissingOrder.LAST).build();
+            .put(Sort.NullOrder.NULL_LAST, MissingOrder.LAST)
+            .build();
 
     private final Map<String, Pair<Sort.SortOption, Integer>> map = new HashMap<>();
 
-    /**
-     * Constructor of GroupSortOrder.
-     */
+    /** Constructor of GroupSortOrder. */
     public GroupSortOrder(List<Pair<Sort.SortOption, Expression>> sortList) {
       if (null == sortList) {
         return;
       }
       int pos = 0;
       for (Pair<Sort.SortOption, Expression> sortPair : sortList) {
-        map.put(((ReferenceExpression) sortPair.getRight()).getAttr(),
+        map.put(
+            ((ReferenceExpression) sortPair.getRight()).getAttr(),
             Pair.of(sortPair.getLeft(), pos++));
       }
     }
 
     /**
-     * Compare the two expressions. The comparison is based on the pos in the sort list.
-     * If the expression is defined in the sort list. then the order of the expression is the pos
-     * in sort list.
-     * If the expression isn't defined in the sort list. the the order of the expression is the
-     * Integer.MAX_VALUE. you can think it is at the end of the sort list.
+     * Compare the two expressions. The comparison is based on the pos in the sort list. If the
+     * expression is defined in the sort list. then the order of the expression is the pos in sort
+     * list. If the expression isn't defined in the sort list. the the order of the expression is
+     * the Integer.MAX_VALUE. you can think it is at the end of the sort list.
      *
      * @param o1 NamedExpression
      * @param o2 NamedExpression
@@ -174,24 +159,19 @@ public GroupSortOrder(List<Pair<Sort.SortOption, Expression>> sortList) {
      */
     @Override
     public int compare(NamedExpression o1, NamedExpression o2) {
-      final Pair<Sort.SortOption, Integer> o1Value =
-          map.getOrDefault(o1.getName(), DEFAULT_ORDER);
-      final Pair<Sort.SortOption, Integer> o2Value =
-          map.getOrDefault(o2.getName(), DEFAULT_ORDER);
+      final Pair<Sort.SortOption, Integer> o1Value = map.getOrDefault(o1.getName(), DEFAULT_ORDER);
+      final Pair<Sort.SortOption, Integer> o2Value = map.getOrDefault(o2.getName(), DEFAULT_ORDER);
       return o1Value.getRight().compareTo(o2Value.getRight());
     }
 
-    /**
-     * Get the {@link SortOrder} for expression.
-     * By default, the {@link SortOrder} is ASC.
-     */
+    /** Get the {@link SortOrder} for expression. By default, the {@link SortOrder} is ASC. */
     public SortOrder sortOrder(NamedExpression expression) {
       return SORT_MAP.get(sortOption(expression).getSortOrder());
     }
 
     /**
-     * Get the {@link MissingOrder} for expression.
-     * By default, the {@link MissingOrder} is ASC missing first / DESC missing last.
+     * Get the {@link MissingOrder} for expression. By default, the {@link MissingOrder} is ASC
+     * missing first / DESC missing last.
      */
     public MissingOrder missingOrder(NamedExpression expression) {
       return NULL_MAP.get(sortOption(expression).getNullOrder());
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScript.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScript.java
index 6236d7bb32..7e7b2e959a 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScript.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScript.java
@@ -3,9 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation;
 
+import static java.time.temporal.ChronoUnit.MILLIS;
+
+import java.time.LocalTime;
 import java.util.Map;
 import lombok.EqualsAndHashCode;
 import org.apache.lucene.index.LeafReaderContext;
@@ -13,24 +15,20 @@
 import org.opensearch.search.lookup.SearchLookup;
 import org.opensearch.sql.data.model.ExprNullValue;
 import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.env.Environment;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
 import org.opensearch.sql.opensearch.storage.script.core.ExpressionScript;
 
-/**
- * Aggregation expression script that executed on each document.
- */
+/** Aggregation expression script that executed on each document. */
 @EqualsAndHashCode(callSuper = false)
 public class ExpressionAggregationScript extends AggregationScript {
 
-  /**
-   * Expression Script.
-   */
+  /** Expression Script. */
   private final ExpressionScript expressionScript;
 
-  /**
-   * Constructor of ExpressionAggregationScript.
-   */
+  /** Constructor of ExpressionAggregationScript. */
   public ExpressionAggregationScript(
       Expression expression,
       SearchLookup lookup,
@@ -42,11 +40,25 @@ public ExpressionAggregationScript(
 
   @Override
   public Object execute() {
-    return expressionScript.execute(this::getDoc, this::evaluateExpression).value();
+    var expr = expressionScript.execute(this::getDoc, this::evaluateExpression);
+    if (expr.type() instanceof OpenSearchDataType) {
+      return expr.value();
+    }
+    switch ((ExprCoreType) expr.type()) {
+      case TIME:
+        // Can't get timestamp from `ExprTimeValue`
+        return MILLIS.between(LocalTime.MIN, expr.timeValue());
+      case DATE:
+      case DATETIME:
+      case TIMESTAMP:
+        return expr.timestampValue().toEpochMilli();
+      default:
+        return expr.value();
+    }
   }
 
-  private ExprValue evaluateExpression(Expression expression, Environment<Expression,
-                                       ExprValue> valueEnv) {
+  private ExprValue evaluateExpression(
+      Expression expression, Environment<Expression, ExprValue> valueEnv) {
     ExprValue result = expression.valueOf(valueEnv);
 
     // The missing value is treated as null value in doc_value, so we can't distinguish with them.
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptFactory.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptFactory.java
index 3138ee90fc..c0b92e5438 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptFactory.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation;
 
 import java.util.Map;
@@ -12,9 +11,7 @@
 import org.opensearch.search.lookup.SearchLookup;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Aggregation Expression script factory that generates leaf factory.
- */
+/** Aggregation Expression script factory that generates leaf factory. */
 @EqualsAndHashCode
 public class ExpressionAggregationScriptFactory implements AggregationScript.Factory {
 
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptLeafFactory.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptLeafFactory.java
index 7d22f724e3..13f9c95c8f 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptLeafFactory.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptLeafFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation;
 
 import java.util.Map;
@@ -12,29 +11,19 @@
 import org.opensearch.search.lookup.SearchLookup;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Expression script leaf factory that produces script executor for each leaf.
- */
+/** Expression script leaf factory that produces script executor for each leaf. */
 public class ExpressionAggregationScriptLeafFactory implements AggregationScript.LeafFactory {
 
-  /**
-   * Expression to execute.
-   */
+  /** Expression to execute. */
   private final Expression expression;
 
-  /**
-   * Expression to execute.
-   */
+  /** Expression to execute. */
   private final Map<String, Object> params;
 
-  /**
-   * Expression to execute.
-   */
+  /** Expression to execute. */
   private final SearchLookup lookup;
 
-  /**
-   * Constructor of ExpressionAggregationScriptLeafFactory.
-   */
+  /** Constructor of ExpressionAggregationScriptLeafFactory. */
   public ExpressionAggregationScriptLeafFactory(
       Expression expression, Map<String, Object> params, SearchLookup lookup) {
     this.expression = expression;
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/AggregationBuilderHelper.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/AggregationBuilderHelper.java
index b0a935f623..7dd02d82d0 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/AggregationBuilderHelper.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/AggregationBuilderHelper.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation.dsl;
 
 import static java.util.Collections.emptyMap;
@@ -15,13 +14,12 @@
 import org.opensearch.script.Script;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.FunctionExpression;
+import org.opensearch.sql.expression.LiteralExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
-import org.opensearch.sql.opensearch.storage.script.ScriptUtils;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.storage.serialization.ExpressionSerializer;
 
-/**
- * Abstract Aggregation Builder.
- */
+/** Abstract Aggregation Builder. */
 @RequiredArgsConstructor
 public class AggregationBuilderHelper {
 
@@ -33,18 +31,23 @@ public class AggregationBuilderHelper {
    * @param expression Expression
    * @return AggregationBuilder
    */
-  public <T> T build(Expression expression, Function<String, T> fieldBuilder,
-                 Function<Script, T> scriptBuilder) {
+  public <T> T build(
+      Expression expression, Function<String, T> fieldBuilder, Function<Script, T> scriptBuilder) {
     if (expression instanceof ReferenceExpression) {
       String fieldName = ((ReferenceExpression) expression).getAttr();
-      return fieldBuilder.apply(ScriptUtils.convertTextToKeyword(fieldName, expression.type()));
-    } else if (expression instanceof FunctionExpression) {
-      return scriptBuilder.apply(new Script(
-          DEFAULT_SCRIPT_TYPE, EXPRESSION_LANG_NAME, serializer.serialize(expression),
-          emptyMap()));
+      return fieldBuilder.apply(
+          OpenSearchTextType.convertTextToKeyword(fieldName, expression.type()));
+    } else if (expression instanceof FunctionExpression
+        || expression instanceof LiteralExpression) {
+      return scriptBuilder.apply(
+          new Script(
+              DEFAULT_SCRIPT_TYPE,
+              EXPRESSION_LANG_NAME,
+              serializer.serialize(expression),
+              emptyMap()));
     } else {
-      throw new IllegalStateException(String.format("metric aggregation doesn't support "
-          + "expression %s", expression));
+      throw new IllegalStateException(
+          String.format("metric aggregation doesn't support " + "expression %s", expression));
     }
   }
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/BucketAggregationBuilder.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/BucketAggregationBuilder.java
index 8ef8a5e4a8..9a98eaac42 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/BucketAggregationBuilder.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/BucketAggregationBuilder.java
@@ -5,6 +5,11 @@
 
 package org.opensearch.sql.opensearch.storage.script.aggregation.dsl;
 
+import static org.opensearch.sql.data.type.ExprCoreType.DATE;
+import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
+import static org.opensearch.sql.data.type.ExprCoreType.TIME;
+import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
+
 import com.google.common.collect.ImmutableList;
 import java.util.List;
 import org.apache.commons.lang3.tuple.Triple;
@@ -14,35 +19,32 @@
 import org.opensearch.search.aggregations.bucket.composite.TermsValuesSourceBuilder;
 import org.opensearch.search.aggregations.bucket.histogram.DateHistogramInterval;
 import org.opensearch.search.aggregations.bucket.missing.MissingOrder;
+import org.opensearch.search.aggregations.support.ValueType;
 import org.opensearch.search.sort.SortOrder;
 import org.opensearch.sql.ast.expression.SpanUnit;
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.span.SpanExpression;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDateType;
 import org.opensearch.sql.opensearch.storage.serialization.ExpressionSerializer;
 
-/**
- * Bucket Aggregation Builder.
- */
+/** Bucket Aggregation Builder. */
 public class BucketAggregationBuilder {
 
   private final AggregationBuilderHelper helper;
 
-  public BucketAggregationBuilder(
-      ExpressionSerializer serializer) {
+  public BucketAggregationBuilder(ExpressionSerializer serializer) {
     this.helper = new AggregationBuilderHelper(serializer);
   }
 
-  /**
-   * Build the list of CompositeValuesSourceBuilder.
-   */
+  /** Build the list of CompositeValuesSourceBuilder. */
   public List<CompositeValuesSourceBuilder<?>> build(
       List<Triple<NamedExpression, SortOrder, MissingOrder>> groupList) {
     ImmutableList.Builder<CompositeValuesSourceBuilder<?>> resultBuilder =
         new ImmutableList.Builder<>();
     for (Triple<NamedExpression, SortOrder, MissingOrder> groupPair : groupList) {
       resultBuilder.add(
-          buildCompositeValuesSourceBuilder(groupPair.getLeft(),
-              groupPair.getMiddle(), groupPair.getRight()));
+          buildCompositeValuesSourceBuilder(
+              groupPair.getLeft(), groupPair.getMiddle(), groupPair.getRight()));
     }
     return resultBuilder.build();
   }
@@ -64,6 +66,13 @@ private CompositeValuesSourceBuilder<?> buildCompositeValuesSourceBuilder(
               .missingBucket(true)
               .missingOrder(missingOrder)
               .order(sortOrder);
+      // Time types values are converted to LONG in ExpressionAggregationScript::execute
+      if ((expr.getDelegated().type() instanceof OpenSearchDateType
+              && List.of(TIMESTAMP, TIME, DATE, DATETIME)
+                  .contains(((OpenSearchDateType) expr.getDelegated().type()).getExprCoreType()))
+          || List.of(TIMESTAMP, TIME, DATE, DATETIME).contains(expr.getDelegated().type())) {
+        sourceBuilder.userValuetypeHint(ValueType.LONG);
+      }
       return helper.build(expr.getDelegated(), sourceBuilder::field, sourceBuilder::script);
     }
   }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
index 5e7d34abce..779fe2f1c9 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation.dsl;
 
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
@@ -18,6 +17,7 @@
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
 import org.opensearch.search.aggregations.metrics.ExtendedStats;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
 import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
 import org.opensearch.search.aggregations.support.ValuesSourceAggregationBuilder;
 import org.opensearch.sql.expression.Expression;
@@ -25,26 +25,18 @@
 import org.opensearch.sql.expression.LiteralExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
-import org.opensearch.sql.opensearch.response.agg.FilterParser;
-import org.opensearch.sql.opensearch.response.agg.MetricParser;
-import org.opensearch.sql.opensearch.response.agg.SingleValueParser;
-import org.opensearch.sql.opensearch.response.agg.StatsParser;
-import org.opensearch.sql.opensearch.response.agg.TopHitsParser;
+import org.opensearch.sql.opensearch.response.agg.*;
 import org.opensearch.sql.opensearch.storage.script.filter.FilterQueryBuilder;
 import org.opensearch.sql.opensearch.storage.serialization.ExpressionSerializer;
 
-/**
- * Build the Metric Aggregation and List of {@link MetricParser} from {@link NamedAggregator}.
- */
+/** Build the Metric Aggregation and List of {@link MetricParser} from {@link NamedAggregator}. */
 public class MetricAggregationBuilder
     extends ExpressionNodeVisitor<Pair<AggregationBuilder, MetricParser>, Object> {
 
   private final AggregationBuilderHelper helper;
   private final FilterQueryBuilder filterBuilder;
 
-  /**
-   * Constructor.
-   */
+  /** Constructor. */
   public MetricAggregationBuilder(ExpressionSerializer serializer) {
     this.helper = new AggregationBuilderHelper(serializer);
     this.filterBuilder = new FilterQueryBuilder(serializer);
@@ -87,8 +79,9 @@ public Pair<AggregationBuilder, MetricParser> visitNamedAggregator(
               name,
               new SingleValueParser(name));
         default:
-          throw new IllegalStateException(String.format(
-              "unsupported distinct aggregator %s", node.getFunctionName().getFunctionName()));
+          throw new IllegalStateException(
+              String.format(
+                  "unsupported distinct aggregator %s", node.getFunctionName().getFunctionName()));
       }
     }
 
@@ -164,6 +157,16 @@ public Pair<AggregationBuilder, MetricParser> visitNamedAggregator(
             condition,
             name,
             new TopHitsParser(name));
+      case "percentile":
+      case "percentile_approx":
+        return make(
+            AggregationBuilders.percentiles(name),
+            expression,
+            node.getArguments().get(1), // percent
+            node.getArguments().size() >= 3 ? node.getArguments().get(2) : null, // compression
+            condition,
+            name,
+            new SinglePercentileParser(name));
       default:
         throw new IllegalStateException(
             String.format("unsupported aggregator %s", node.getFunctionName().getFunctionName()));
@@ -186,14 +189,13 @@ private Pair<AggregationBuilder, MetricParser> make(
     return Pair.of(aggregationBuilder, parser);
   }
 
-  /**
-   * Make {@link CardinalityAggregationBuilder} for distinct count aggregations.
-   */
-  private Pair<AggregationBuilder, MetricParser> make(CardinalityAggregationBuilder builder,
-                                                      Expression expression,
-                                                      Expression condition,
-                                                      String name,
-                                                      MetricParser parser) {
+  /** Make {@link CardinalityAggregationBuilder} for distinct count aggregations. */
+  private Pair<AggregationBuilder, MetricParser> make(
+      CardinalityAggregationBuilder builder,
+      Expression expression,
+      Expression condition,
+      String name,
+      MetricParser parser) {
     CardinalityAggregationBuilder aggregationBuilder =
         helper.build(expression, builder::field, builder::script);
     if (condition != null) {
@@ -204,15 +206,14 @@ private Pair<AggregationBuilder, MetricParser> make(CardinalityAggregationBuilde
     return Pair.of(aggregationBuilder, parser);
   }
 
-  /**
-   * Make {@link TopHitsAggregationBuilder} for take aggregations.
-   */
-  private Pair<AggregationBuilder, MetricParser> make(TopHitsAggregationBuilder builder,
-                                                      Expression expression,
-                                                      Expression size,
-                                                      Expression condition,
-                                                      String name,
-                                                      MetricParser parser) {
+  /** Make {@link TopHitsAggregationBuilder} for take aggregations. */
+  private Pair<AggregationBuilder, MetricParser> make(
+      TopHitsAggregationBuilder builder,
+      Expression expression,
+      Expression size,
+      Expression condition,
+      String name,
+      MetricParser parser) {
     String fieldName = ((ReferenceExpression) expression).getAttr();
     builder.fetchSource(fieldName, null);
     builder.size(size.valueOf().integerValue());
@@ -225,6 +226,28 @@ private Pair<AggregationBuilder, MetricParser> make(TopHitsAggregationBuilder bu
     return Pair.of(builder, parser);
   }
 
+  private Pair<AggregationBuilder, MetricParser> make(
+      PercentilesAggregationBuilder builder,
+      Expression expression,
+      Expression percent,
+      Expression compression,
+      Expression condition,
+      String name,
+      MetricParser parser) {
+    PercentilesAggregationBuilder aggregationBuilder =
+        helper.build(expression, builder::field, builder::script);
+    if (compression != null) {
+      aggregationBuilder.compression(compression.valueOf().doubleValue());
+    }
+    aggregationBuilder.percentiles(percent.valueOf().doubleValue());
+    if (condition != null) {
+      return Pair.of(
+          makeFilterAggregation(aggregationBuilder, condition, name),
+          FilterParser.builder().name(name).metricsParser(parser).build());
+    }
+    return Pair.of(aggregationBuilder, parser);
+  }
+
   /**
    * Replace star or literal with OpenSearch metadata field "_index". Because: 1) Analyzer already
    * converts * to string literal, literal check here can handle both COUNT(*) and COUNT(1). 2)
@@ -245,8 +268,8 @@ private Expression replaceStarOrLiteral(Expression countArg) {
    * Make builder to build FilterAggregation for aggregations with filter in the bucket.
    *
    * @param subAggBuilder AggregationBuilder instance which the filter is applied to.
-   * @param condition     Condition expression in the filter.
-   * @param name          Name of the FilterAggregation instance to build.
+   * @param condition Condition expression in the filter.
+   * @param name Name of the FilterAggregation instance to build.
    * @return {@link FilterAggregationBuilder}.
    */
   private FilterAggregationBuilder makeFilterAggregation(
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/core/ExpressionScript.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/core/ExpressionScript.java
index 9399c38e46..3a9ff02ba0 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/core/ExpressionScript.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/core/ExpressionScript.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.core;
 
 import static java.util.stream.Collectors.toMap;
@@ -28,40 +27,32 @@
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.parse.ParseExpression;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
-import org.opensearch.sql.opensearch.storage.script.ScriptUtils;
 
 /**
- * Expression script executor that executes the expression on each document
- * and determine if the document is supposed to be filtered out or not.
+ * Expression script executor that executes the expression on each document and determine if the
+ * document is supposed to be filtered out or not.
  */
 @EqualsAndHashCode(callSuper = false)
 public class ExpressionScript {
 
-  /**
-   * Expression to execute.
-   */
+  /** Expression to execute. */
   private final Expression expression;
 
-  /**
-   * ElasticsearchExprValueFactory.
-   */
-  @EqualsAndHashCode.Exclude
-  private final OpenSearchExprValueFactory valueFactory;
+  /** ElasticsearchExprValueFactory. */
+  @EqualsAndHashCode.Exclude private final OpenSearchExprValueFactory valueFactory;
 
-  /**
-   * Reference Fields.
-   */
-  @EqualsAndHashCode.Exclude
-  private final Set<ReferenceExpression> fields;
+  /** Reference Fields. */
+  @EqualsAndHashCode.Exclude private final Set<ReferenceExpression> fields;
 
-  /**
-   * Expression constructor.
-   */
+  /** Expression constructor. */
   public ExpressionScript(Expression expression) {
     this.expression = expression;
-    this.fields = AccessController.doPrivileged((PrivilegedAction<Set<ReferenceExpression>>) () ->
-        extractFields(expression));
+    this.fields =
+        AccessController.doPrivileged(
+            (PrivilegedAction<Set<ReferenceExpression>>) () -> extractFields(expression));
     this.valueFactory =
         AccessController.doPrivileged(
             (PrivilegedAction<OpenSearchExprValueFactory>) () -> buildValueFactory(fields));
@@ -71,64 +62,68 @@ public ExpressionScript(Expression expression) {
    * Evaluate on the doc generate by the doc provider.
    *
    * @param docProvider doc provider.
-   * @param evaluator   evaluator
+   * @param evaluator evaluator
    * @return expr value
    */
-  public ExprValue execute(Supplier<Map<String, ScriptDocValues<?>>> docProvider,
-                           BiFunction<Expression,
-                               Environment<Expression,
-                                   ExprValue>, ExprValue> evaluator) {
-    return AccessController.doPrivileged((PrivilegedAction<ExprValue>) () -> {
-      Environment<Expression, ExprValue> valueEnv =
-          buildValueEnv(fields, valueFactory, docProvider);
-      ExprValue result = evaluator.apply(expression, valueEnv);
-      return result;
-    });
+  public ExprValue execute(
+      Supplier<Map<String, ScriptDocValues<?>>> docProvider,
+      BiFunction<Expression, Environment<Expression, ExprValue>, ExprValue> evaluator) {
+    return AccessController.doPrivileged(
+        (PrivilegedAction<ExprValue>)
+            () -> {
+              Environment<Expression, ExprValue> valueEnv =
+                  buildValueEnv(fields, valueFactory, docProvider);
+              ExprValue result = evaluator.apply(expression, valueEnv);
+              return result;
+            });
   }
 
   private Set<ReferenceExpression> extractFields(Expression expr) {
     Set<ReferenceExpression> fields = new HashSet<>();
-    expr.accept(new ExpressionNodeVisitor<Object, Set<ReferenceExpression>>() {
-      @Override
-      public Object visitReference(ReferenceExpression node, Set<ReferenceExpression> context) {
-        context.add(node);
-        return null;
-      }
-
-      @Override
-      public Object visitParse(ParseExpression node, Set<ReferenceExpression> context) {
-        node.getSourceField().accept(this, context);
-        return null;
-      }
-    }, fields);
+    expr.accept(
+        new ExpressionNodeVisitor<Object, Set<ReferenceExpression>>() {
+          @Override
+          public Object visitReference(ReferenceExpression node, Set<ReferenceExpression> context) {
+            context.add(node);
+            return null;
+          }
+
+          @Override
+          public Object visitParse(ParseExpression node, Set<ReferenceExpression> context) {
+            node.getSourceField().accept(this, context);
+            return null;
+          }
+        },
+        fields);
     return fields;
   }
 
   private OpenSearchExprValueFactory buildValueFactory(Set<ReferenceExpression> fields) {
-    Map<String, ExprType> typeEnv = fields.stream()
-        .collect(toMap(
-            ReferenceExpression::getAttr,
-            ReferenceExpression::type));
+    Map<String, OpenSearchDataType> typeEnv =
+        fields.stream()
+            .collect(toMap(ReferenceExpression::getAttr, e -> OpenSearchDataType.of(e.type())));
     return new OpenSearchExprValueFactory(typeEnv);
   }
 
   private Environment<Expression, ExprValue> buildValueEnv(
-      Set<ReferenceExpression> fields, OpenSearchExprValueFactory valueFactory,
+      Set<ReferenceExpression> fields,
+      OpenSearchExprValueFactory valueFactory,
       Supplier<Map<String, ScriptDocValues<?>>> docProvider) {
 
     Map<Expression, ExprValue> valueEnv = new HashMap<>();
     for (ReferenceExpression field : fields) {
       String fieldName = field.getAttr();
-      ExprValue exprValue = valueFactory.construct(fieldName, getDocValue(field, docProvider));
+      ExprValue exprValue =
+          valueFactory.construct(fieldName, getDocValue(field, docProvider), false);
       valueEnv.put(field, exprValue);
     }
     // Encapsulate map data structure into anonymous Environment class
     return valueEnv::get;
   }
 
-  private Object getDocValue(ReferenceExpression field,
-                             Supplier<Map<String, ScriptDocValues<?>>> docProvider) {
-    String fieldName = getDocValueName(field);
+  private Object getDocValue(
+      ReferenceExpression field, Supplier<Map<String, ScriptDocValues<?>>> docProvider) {
+    String fieldName = OpenSearchTextType.convertTextToKeyword(field.getAttr(), field.type());
     ScriptDocValues<?> docValue = docProvider.get().get(fieldName);
     if (docValue == null || docValue.isEmpty()) {
       return null; // No way to differentiate null and missing from doc value
@@ -142,18 +137,9 @@ private Object getDocValue(ReferenceExpression field,
   }
 
   /**
-   * Text field doesn't have doc value (exception thrown even when you call "get")
-   * Limitation: assume inner field name is always "keyword".
-   */
-  private String getDocValueName(ReferenceExpression field) {
-    String fieldName = field.getAttr();
-    return ScriptUtils.convertTextToKeyword(fieldName, field.type());
-  }
-
-  /**
-   * DocValue only support long and double so cast to integer and float if needed.
-   * The doc value must be Long and Double for expr type Long/Integer and Double/Float respectively.
-   * Otherwise there must be bugs in our engine that causes the mismatch.
+   * DocValue only support long and double so cast to integer and float if needed. The doc value
+   * must be Long and Double for expr type Long/Integer and Double/Float respectively. Otherwise
+   * there must be bugs in our engine that causes the mismatch.
    */
   private Object castNumberToFieldType(Object value, ExprType type) {
     if (value == null) {
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScript.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScript.java
index adce89d0df..557cbbe4c9 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScript.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScript.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter;
 
 import java.util.Map;
@@ -19,21 +18,20 @@
 import org.opensearch.sql.opensearch.storage.script.core.ExpressionScript;
 
 /**
- * Expression script executor that executes the expression on each document
- * and determine if the document is supposed to be filtered out or not.
+ * Expression script executor that executes the expression on each document and determine if the
+ * document is supposed to be filtered out or not.
  */
 @EqualsAndHashCode(callSuper = false)
 class ExpressionFilterScript extends FilterScript {
 
-  /**
-   * Expression Script.
-   */
+  /** Expression Script. */
   private final ExpressionScript expressionScript;
 
-  public ExpressionFilterScript(Expression expression,
-                                SearchLookup lookup,
-                                LeafReaderContext context,
-                                Map<String, Object> params) {
+  public ExpressionFilterScript(
+      Expression expression,
+      SearchLookup lookup,
+      LeafReaderContext context,
+      Map<String, Object> params) {
     super(params, lookup, context);
     this.expressionScript = new ExpressionScript(expression);
   }
@@ -43,19 +41,20 @@ public boolean execute() {
     return expressionScript.execute(this::getDoc, this::evaluateExpression).booleanValue();
   }
 
-  private ExprValue evaluateExpression(Expression expression,
-                                       Environment<Expression, ExprValue> valueEnv) {
+  private ExprValue evaluateExpression(
+      Expression expression, Environment<Expression, ExprValue> valueEnv) {
     ExprValue result = expression.valueOf(valueEnv);
     if (result.isNull()) {
       return ExprBooleanValue.of(false);
     }
 
     if (result.type() != ExprCoreType.BOOLEAN) {
-      throw new IllegalStateException(String.format(
-          "Expression has wrong result type instead of boolean: "
-              + "expression [%s], result [%s]", expression, result));
+      throw new IllegalStateException(
+          String.format(
+              "Expression has wrong result type instead of boolean: "
+                  + "expression [%s], result [%s]",
+              expression, result));
     }
     return result;
   }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptFactory.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptFactory.java
index e35482d618..5db10733a7 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptFactory.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter;
 
 import java.util.Map;
@@ -12,15 +11,11 @@
 import org.opensearch.search.lookup.SearchLookup;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Expression script factory that generates leaf factory.
- */
+/** Expression script factory that generates leaf factory. */
 @EqualsAndHashCode
 public class ExpressionFilterScriptFactory implements FilterScript.Factory {
 
-  /**
-   * Expression to execute.
-   */
+  /** Expression to execute. */
   private final Expression expression;
 
   public ExpressionFilterScriptFactory(Expression expression) {
@@ -37,5 +32,4 @@ public boolean isResultDeterministic() {
   public FilterScript.LeafFactory newFactory(Map<String, Object> params, SearchLookup lookup) {
     return new ExpressionFilterScriptLeafFactory(expression, params, lookup);
   }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptLeafFactory.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptLeafFactory.java
index 22b4be1b69..6c04ca7233 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptLeafFactory.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptLeafFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter;
 
 import java.util.Map;
@@ -12,29 +11,20 @@
 import org.opensearch.search.lookup.SearchLookup;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Expression script leaf factory that produces script executor for each leaf.
- */
+/** Expression script leaf factory that produces script executor for each leaf. */
 class ExpressionFilterScriptLeafFactory implements FilterScript.LeafFactory {
 
-  /**
-   * Expression to execute.
-   */
+  /** Expression to execute. */
   private final Expression expression;
 
-  /**
-   * Parameters for the expression.
-   */
+  /** Parameters for the expression. */
   private final Map<String, Object> params;
 
-  /**
-   * Document lookup that returns doc values.
-   */
+  /** Document lookup that returns doc values. */
   private final SearchLookup lookup;
 
-  public ExpressionFilterScriptLeafFactory(Expression expression,
-                                           Map<String, Object> params,
-                                           SearchLookup lookup) {
+  public ExpressionFilterScriptLeafFactory(
+      Expression expression, Map<String, Object> params, SearchLookup lookup) {
     this.expression = expression;
     this.params = params;
     this.lookup = lookup;
@@ -44,5 +34,4 @@ public ExpressionFilterScriptLeafFactory(Expression expression,
   public FilterScript newInstance(LeafReaderContext ctx) {
     return new ExpressionFilterScript(expression, lookup, ctx, params);
   }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilder.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilder.java
index 5f36954d4a..fa0fe19105 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilder.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter;
 
 import static java.util.Collections.emptyMap;
@@ -19,6 +18,7 @@
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.query.ScriptQueryBuilder;
 import org.opensearch.script.Script;
+import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.ExpressionNodeVisitor;
 import org.opensearch.sql.expression.FunctionExpression;
@@ -26,6 +26,7 @@
 import org.opensearch.sql.expression.function.FunctionName;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.LikeQuery;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.LuceneQuery;
+import org.opensearch.sql.opensearch.storage.script.filter.lucene.NestedQuery;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.RangeQuery;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.RangeQuery.Comparison;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.TermQuery;
@@ -43,14 +44,10 @@
 @RequiredArgsConstructor
 public class FilterQueryBuilder extends ExpressionNodeVisitor<QueryBuilder, Object> {
 
-  /**
-   * Serializer that serializes expression for build DSL query.
-   */
+  /** Serializer that serializes expression for build DSL query. */
   private final ExpressionSerializer serializer;
 
-  /**
-   * Mapping from function name to lucene query builder.
-   */
+  /** Mapping from function name to lucene query builder. */
   private final Map<FunctionName, LuceneQuery> luceneQueries =
       ImmutableMap.<FunctionName, LuceneQuery>builder()
           .put(BuiltinFunctionName.EQUAL.getName(), new TermQuery())
@@ -75,12 +72,14 @@ public class FilterQueryBuilder extends ExpressionNodeVisitor<QueryBuilder, Obje
           .put(BuiltinFunctionName.MATCH_PHRASE_PREFIX.getName(), new MatchPhrasePrefixQuery())
           .put(BuiltinFunctionName.WILDCARD_QUERY.getName(), new WildcardQuery())
           .put(BuiltinFunctionName.WILDCARDQUERY.getName(), new WildcardQuery())
+          .put(BuiltinFunctionName.NESTED.getName(), new NestedQuery())
           .build();
 
   /**
    * Build OpenSearch filter query from expression.
-   * @param expr  expression
-   * @return      query
+   *
+   * @param expr expression
+   * @return query
    */
   public QueryBuilder build(Expression expr) {
     return expr.accept(this, null);
@@ -96,20 +95,32 @@ public QueryBuilder visitFunction(FunctionExpression func, Object context) {
         return buildBoolQuery(func, context, BoolQueryBuilder::should);
       case "not":
         return buildBoolQuery(func, context, BoolQueryBuilder::mustNot);
-      default: {
-        LuceneQuery query = luceneQueries.get(name);
-        if (query != null && query.canSupport(func)) {
-          return query.build(func);
+      case "nested":
+        // TODO Fill in case when adding support for syntax - nested(path, condition)
+        throw new SyntaxCheckException(
+            "Invalid syntax used for nested function in WHERE clause: "
+                + "nested(field | field, path) OPERATOR LITERAL");
+      default:
+        {
+          LuceneQuery query = luceneQueries.get(name);
+          if (query != null && query.canSupport(func)) {
+            return query.build(func);
+          } else if (query != null && query.isNestedPredicate(func)) {
+            NestedQuery nestedQuery =
+                (NestedQuery)
+                    luceneQueries.get(
+                        ((FunctionExpression) func.getArguments().get(0)).getFunctionName());
+            return nestedQuery.buildNested(func, query);
+          }
+          return buildScriptQuery(func);
         }
-        return buildScriptQuery(func);
-      }
     }
   }
 
-  private BoolQueryBuilder buildBoolQuery(FunctionExpression node,
-                                          Object context,
-                                          BiFunction<BoolQueryBuilder, QueryBuilder,
-                                              QueryBuilder> accumulator) {
+  private BoolQueryBuilder buildBoolQuery(
+      FunctionExpression node,
+      Object context,
+      BiFunction<BoolQueryBuilder, QueryBuilder, QueryBuilder> accumulator) {
     BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
     for (Expression arg : node.getArguments()) {
       accumulator.apply(boolQuery, arg.accept(this, context));
@@ -118,8 +129,8 @@ private BoolQueryBuilder buildBoolQuery(FunctionExpression node,
   }
 
   private ScriptQueryBuilder buildScriptQuery(FunctionExpression node) {
-    return new ScriptQueryBuilder(new Script(
-        DEFAULT_SCRIPT_TYPE, EXPRESSION_LANG_NAME, serializer.serialize(node), emptyMap()));
+    return new ScriptQueryBuilder(
+        new Script(
+            DEFAULT_SCRIPT_TYPE, EXPRESSION_LANG_NAME, serializer.serialize(node), emptyMap()));
   }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LikeQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LikeQuery.java
index ad47ba437a..44c1c30200 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LikeQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LikeQuery.java
@@ -9,26 +9,21 @@
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.query.WildcardQueryBuilder;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.expression.Expression;
-import org.opensearch.sql.expression.FunctionExpression;
-import org.opensearch.sql.expression.ReferenceExpression;
+import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.storage.script.StringUtils;
 
 public class LikeQuery extends LuceneQuery {
   @Override
-  public QueryBuilder build(FunctionExpression func) {
-    ReferenceExpression ref = (ReferenceExpression) func.getArguments().get(0);
-    String field = convertTextToKeyword(ref.getAttr(), ref.type());
-    Expression expr = func.getArguments().get(1);
-    ExprValue literalValue = expr.valueOf();
-    return createBuilder(field, literalValue.stringValue());
+  public QueryBuilder doBuild(String fieldName, ExprType fieldType, ExprValue literal) {
+    String field = OpenSearchTextType.convertTextToKeyword(fieldName, fieldType);
+    return createBuilder(field, literal.stringValue());
   }
 
   /**
-   * Though WildcardQueryBuilder is required, LikeQuery needed its own class as
-   * it is not a relevance function which wildcard_query is. The arguments in
-   * LIKE are of type ReferenceExpression while wildcard_query are of type
-   * NamedArgumentExpression
+   * Though WildcardQueryBuilder is required, LikeQuery needed its own class as it is not a
+   * relevance function which wildcard_query is. The arguments in LIKE are of type
+   * ReferenceExpression while wildcard_query are of type NamedArgumentExpression
    */
   protected WildcardQueryBuilder createBuilder(String field, String query) {
     String matchText = StringUtils.convertSqlWildcardToLucene(query);
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LuceneQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LuceneQuery.java
index 6810ca599c..34a7b34ce7 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LuceneQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LuceneQuery.java
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter.lucene;
 
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
+import static org.opensearch.sql.analysis.NestedAnalyzer.isNestedFunction;
 
 import com.google.common.collect.ImmutableMap;
+import java.time.ZonedDateTime;
 import java.util.Map;
-import java.util.function.Function;
+import java.util.function.BiFunction;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.sql.data.model.ExprBooleanValue;
 import org.opensearch.sql.data.model.ExprByteValue;
@@ -34,34 +34,42 @@
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDateType;
 
-/**
- * Lucene query abstraction that builds Lucene query from function expression.
- */
+/** Lucene query abstraction that builds Lucene query from function expression. */
 public abstract class LuceneQuery {
 
   /**
-   * Check if function expression supported by current Lucene query.
-   * Default behavior is that report supported if:
-   *  1. Left is a reference
-   *  2. Right side is a literal
+   * Check if function expression supported by current Lucene query. Default behavior is that report
+   * supported if: 1. Left is a reference 2. Right side is a literal
    *
-   * @param func    function
-   * @return        return true if supported, otherwise false.
+   * @param func function
+   * @return return true if supported, otherwise false.
    */
   public boolean canSupport(FunctionExpression func) {
     return (func.getArguments().size() == 2)
-        && (func.getArguments().get(0) instanceof ReferenceExpression)
-        && (func.getArguments().get(1) instanceof LiteralExpression
-        || literalExpressionWrappedByCast(func))
+            && (func.getArguments().get(0) instanceof ReferenceExpression)
+            && (func.getArguments().get(1) instanceof LiteralExpression
+                || literalExpressionWrappedByCast(func))
         || isMultiParameterQuery(func);
   }
 
+  /**
+   * Check if predicate expression has nested function on left side of predicate expression.
+   * Validation for right side being a `LiteralExpression` is done in NestedQuery.
+   *
+   * @param func function.
+   * @return return true if function has supported nested function expression.
+   */
+  public boolean isNestedPredicate(FunctionExpression func) {
+    return isNestedFunction(func.getArguments().get(0));
+  }
+
   /**
    * Check if the function expression has multiple named argument expressions as the parameters.
    *
-   * @param func      function
-   * @return          return true if the expression is a multi-parameter function.
+   * @param func function
+   * @return return true if the expression is a multi-parameter function.
    */
   private boolean isMultiParameterQuery(FunctionExpression func) {
     for (Expression expr : func.getArguments()) {
@@ -85,139 +93,192 @@ private boolean literalExpressionWrappedByCast(FunctionExpression func) {
   }
 
   /**
-   * Build Lucene query from function expression.
-   * The cast function is converted to literal expressions before generating DSL.
+   * Build Lucene query from function expression. The cast function is converted to literal
+   * expressions before generating DSL.
    *
-   * @param func  function
-   * @return      query
+   * @param func function
+   * @return query
    */
   public QueryBuilder build(FunctionExpression func) {
     ReferenceExpression ref = (ReferenceExpression) func.getArguments().get(0);
     Expression expr = func.getArguments().get(1);
-    ExprValue literalValue = expr instanceof LiteralExpression ? expr
-        .valueOf() : cast((FunctionExpression) expr);
+    ExprValue literalValue =
+        expr instanceof LiteralExpression ? expr.valueOf() : cast((FunctionExpression) expr, ref);
     return doBuild(ref.getAttr(), ref.type(), literalValue);
   }
 
-  private ExprValue cast(FunctionExpression castFunction) {
-    return castMap.get(castFunction.getFunctionName()).apply(
-        (LiteralExpression) castFunction.getArguments().get(0));
+  private ExprValue cast(FunctionExpression castFunction, ReferenceExpression ref) {
+    return castMap
+        .get(castFunction.getFunctionName())
+        .apply((LiteralExpression) castFunction.getArguments().get(0), ref);
   }
 
+  /** Type converting map. */
+  private final Map<FunctionName, BiFunction<LiteralExpression, ReferenceExpression, ExprValue>>
+      castMap =
+          ImmutableMap
+              .<FunctionName, BiFunction<LiteralExpression, ReferenceExpression, ExprValue>>
+                  builder()
+              .put(
+                  BuiltinFunctionName.CAST_TO_STRING.getName(),
+                  (expr, ref) -> {
+                    if (!expr.type().equals(ExprCoreType.STRING)) {
+                      return new ExprStringValue(String.valueOf(expr.valueOf().value()));
+                    } else {
+                      return expr.valueOf();
+                    }
+                  })
+              .put(
+                  BuiltinFunctionName.CAST_TO_BYTE.getName(),
+                  (expr, ref) -> {
+                    if (ExprCoreType.numberTypes().contains(expr.type())) {
+                      return new ExprByteValue(expr.valueOf().byteValue());
+                    } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
+                      return new ExprByteValue(expr.valueOf().booleanValue() ? 1 : 0);
+                    } else {
+                      return new ExprByteValue(Byte.valueOf(expr.valueOf().stringValue()));
+                    }
+                  })
+              .put(
+                  BuiltinFunctionName.CAST_TO_SHORT.getName(),
+                  (expr, ref) -> {
+                    if (ExprCoreType.numberTypes().contains(expr.type())) {
+                      return new ExprShortValue(expr.valueOf().shortValue());
+                    } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
+                      return new ExprShortValue(expr.valueOf().booleanValue() ? 1 : 0);
+                    } else {
+                      return new ExprShortValue(Short.valueOf(expr.valueOf().stringValue()));
+                    }
+                  })
+              .put(
+                  BuiltinFunctionName.CAST_TO_INT.getName(),
+                  (expr, ref) -> {
+                    if (ExprCoreType.numberTypes().contains(expr.type())) {
+                      return new ExprIntegerValue(expr.valueOf().integerValue());
+                    } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
+                      return new ExprIntegerValue(expr.valueOf().booleanValue() ? 1 : 0);
+                    } else {
+                      return new ExprIntegerValue(Integer.valueOf(expr.valueOf().stringValue()));
+                    }
+                  })
+              .put(
+                  BuiltinFunctionName.CAST_TO_LONG.getName(),
+                  (expr, ref) -> {
+                    if (ExprCoreType.numberTypes().contains(expr.type())) {
+                      return new ExprLongValue(expr.valueOf().longValue());
+                    } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
+                      return new ExprLongValue(expr.valueOf().booleanValue() ? 1 : 0);
+                    } else {
+                      return new ExprLongValue(Long.valueOf(expr.valueOf().stringValue()));
+                    }
+                  })
+              .put(
+                  BuiltinFunctionName.CAST_TO_FLOAT.getName(),
+                  (expr, ref) -> {
+                    if (ExprCoreType.numberTypes().contains(expr.type())) {
+                      return new ExprFloatValue(expr.valueOf().floatValue());
+                    } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
+                      return new ExprFloatValue(expr.valueOf().booleanValue() ? 1 : 0);
+                    } else {
+                      return new ExprFloatValue(Float.valueOf(expr.valueOf().stringValue()));
+                    }
+                  })
+              .put(
+                  BuiltinFunctionName.CAST_TO_DOUBLE.getName(),
+                  (expr, ref) -> {
+                    if (ExprCoreType.numberTypes().contains(expr.type())) {
+                      return new ExprDoubleValue(expr.valueOf().doubleValue());
+                    } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
+                      return new ExprDoubleValue(expr.valueOf().booleanValue() ? 1 : 0);
+                    } else {
+                      return new ExprDoubleValue(Double.valueOf(expr.valueOf().stringValue()));
+                    }
+                  })
+              .put(
+                  BuiltinFunctionName.CAST_TO_BOOLEAN.getName(),
+                  (expr, ref) -> {
+                    if (ExprCoreType.numberTypes().contains(expr.type())) {
+                      return expr.valueOf().doubleValue() != 0
+                          ? ExprBooleanValue.of(true)
+                          : ExprBooleanValue.of(false);
+                    } else if (expr.type().equals(ExprCoreType.STRING)) {
+                      return ExprBooleanValue.of(Boolean.valueOf(expr.valueOf().stringValue()));
+                    } else {
+                      return expr.valueOf();
+                    }
+                  })
+              .put(
+                  BuiltinFunctionName.CAST_TO_DATE.getName(),
+                  (expr, ref) -> {
+                    if (expr.type().equals(ExprCoreType.STRING)) {
+                      ZonedDateTime zonedDateTime = getParsedDateTime(expr, ref);
+                      if (zonedDateTime != null) {
+                        return new ExprDateValue(zonedDateTime.toLocalDate());
+                      }
+                      return new ExprDateValue(expr.valueOf().stringValue());
+                    } else {
+                      return new ExprDateValue(expr.valueOf().dateValue());
+                    }
+                  })
+              .put(
+                  BuiltinFunctionName.CAST_TO_TIME.getName(),
+                  (expr, ref) -> {
+                    if (expr.type().equals(ExprCoreType.STRING)) {
+                      ZonedDateTime zonedDateTime = getParsedDateTime(expr, ref);
+                      if (zonedDateTime != null) {
+                        return new ExprTimeValue(zonedDateTime.toLocalTime());
+                      }
+                      return new ExprTimeValue(expr.valueOf().stringValue());
+                    } else {
+                      return new ExprTimeValue(expr.valueOf().timeValue());
+                    }
+                  })
+              .put(
+                  BuiltinFunctionName.CAST_TO_DATETIME.getName(),
+                  (expr, ref) -> {
+                    if (expr.type().equals(ExprCoreType.STRING)) {
+                      return new ExprDatetimeValue(expr.valueOf().stringValue());
+                    } else {
+                      return new ExprDatetimeValue(expr.valueOf().datetimeValue());
+                    }
+                  })
+              .put(
+                  BuiltinFunctionName.CAST_TO_TIMESTAMP.getName(),
+                  (expr, ref) -> {
+                    if (expr.type().equals(ExprCoreType.STRING)) {
+                      ZonedDateTime zonedDateTime = getParsedDateTime(expr, ref);
+                      if (zonedDateTime != null) {
+                        return new ExprTimestampValue(zonedDateTime.toInstant());
+                      }
+                      return new ExprTimestampValue(expr.valueOf().stringValue());
+                    } else {
+                      return new ExprTimestampValue(expr.valueOf().timestampValue());
+                    }
+                  })
+              .build();
+
   /**
-   * Type converting map.
+   * Parses the date/time from the given expression if the reference type is an instance of
+   * OpenSearchDateType.
+   *
+   * @param expr The expression to parse.
+   * @return The parsed ZonedDateTime or null if the conditions are not met.
    */
-  private final Map<FunctionName, Function<LiteralExpression, ExprValue>> castMap = ImmutableMap
-      .<FunctionName, Function<LiteralExpression, ExprValue>>builder()
-      .put(BuiltinFunctionName.CAST_TO_STRING.getName(), expr -> {
-        if (!expr.type().equals(ExprCoreType.STRING)) {
-          return new ExprStringValue(String.valueOf(expr.valueOf().value()));
-        } else {
-          return expr.valueOf();
-        }
-      })
-      .put(BuiltinFunctionName.CAST_TO_BYTE.getName(), expr -> {
-        if (ExprCoreType.numberTypes().contains(expr.type())) {
-          return new ExprByteValue(expr.valueOf().byteValue());
-        } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
-          return new ExprByteValue(expr.valueOf().booleanValue() ? 1 : 0);
-        } else {
-          return new ExprByteValue(Byte.valueOf(expr.valueOf().stringValue()));
-        }
-      })
-      .put(BuiltinFunctionName.CAST_TO_SHORT.getName(), expr -> {
-        if (ExprCoreType.numberTypes().contains(expr.type())) {
-          return new ExprShortValue(expr.valueOf().shortValue());
-        } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
-          return new ExprShortValue(expr.valueOf().booleanValue() ? 1 : 0);
-        } else {
-          return new ExprShortValue(Short.valueOf(expr.valueOf().stringValue()));
-        }
-      })
-      .put(BuiltinFunctionName.CAST_TO_INT.getName(), expr -> {
-        if (ExprCoreType.numberTypes().contains(expr.type())) {
-          return new ExprIntegerValue(expr.valueOf().integerValue());
-        } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
-          return new ExprIntegerValue(expr.valueOf().booleanValue() ? 1 : 0);
-        } else {
-          return new ExprIntegerValue(Integer.valueOf(expr.valueOf().stringValue()));
-        }
-      })
-      .put(BuiltinFunctionName.CAST_TO_LONG.getName(), expr -> {
-        if (ExprCoreType.numberTypes().contains(expr.type())) {
-          return new ExprLongValue(expr.valueOf().longValue());
-        } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
-          return new ExprLongValue(expr.valueOf().booleanValue() ? 1 : 0);
-        } else {
-          return new ExprLongValue(Long.valueOf(expr.valueOf().stringValue()));
-        }
-      })
-      .put(BuiltinFunctionName.CAST_TO_FLOAT.getName(), expr -> {
-        if (ExprCoreType.numberTypes().contains(expr.type())) {
-          return new ExprFloatValue(expr.valueOf().floatValue());
-        } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
-          return new ExprFloatValue(expr.valueOf().booleanValue() ? 1 : 0);
-        } else {
-          return new ExprFloatValue(Float.valueOf(expr.valueOf().stringValue()));
-        }
-      })
-      .put(BuiltinFunctionName.CAST_TO_DOUBLE.getName(), expr -> {
-        if (ExprCoreType.numberTypes().contains(expr.type())) {
-          return new ExprDoubleValue(expr.valueOf().doubleValue());
-        } else if (expr.type().equals(ExprCoreType.BOOLEAN)) {
-          return new ExprDoubleValue(expr.valueOf().booleanValue() ? 1 : 0);
-        } else {
-          return new ExprDoubleValue(Double.valueOf(expr.valueOf().stringValue()));
-        }
-      })
-      .put(BuiltinFunctionName.CAST_TO_BOOLEAN.getName(), expr -> {
-        if (ExprCoreType.numberTypes().contains(expr.type())) {
-          return expr.valueOf().doubleValue() != 0
-              ? ExprBooleanValue.of(true) : ExprBooleanValue.of(false);
-        } else if (expr.type().equals(ExprCoreType.STRING)) {
-          return ExprBooleanValue.of(Boolean.valueOf(expr.valueOf().stringValue()));
-        } else {
-          return expr.valueOf();
-        }
-      })
-      .put(BuiltinFunctionName.CAST_TO_DATE.getName(), expr -> {
-        if (expr.type().equals(ExprCoreType.STRING)) {
-          return new ExprDateValue(expr.valueOf().stringValue());
-        } else {
-          return new ExprDateValue(expr.valueOf().dateValue());
-        }
-      })
-      .put(BuiltinFunctionName.CAST_TO_TIME.getName(), expr -> {
-        if (expr.type().equals(ExprCoreType.STRING)) {
-          return new ExprTimeValue(expr.valueOf().stringValue());
-        } else {
-          return new ExprTimeValue(expr.valueOf().timeValue());
-        }
-      })
-      .put(BuiltinFunctionName.CAST_TO_DATETIME.getName(), expr -> {
-        if (expr.type().equals(ExprCoreType.STRING)) {
-          return new ExprDatetimeValue(expr.valueOf().stringValue());
-        } else {
-          return new ExprDatetimeValue(expr.valueOf().datetimeValue());
-        }
-      })
-      .put(BuiltinFunctionName.CAST_TO_TIMESTAMP.getName(), expr -> {
-        if (expr.type().equals(ExprCoreType.STRING)) {
-          return new ExprTimestampValue(expr.valueOf().stringValue());
-        } else {
-          return new ExprTimestampValue(expr.valueOf().timestampValue());
-        }
-      })
-      .build();
+  private ZonedDateTime getParsedDateTime(LiteralExpression expr, ReferenceExpression ref) {
+    if (ref.type() instanceof OpenSearchDateType) {
+      return ((OpenSearchDateType) ref.type()).getParsedDateTime(expr.valueOf().stringValue());
+    }
+    return null;
+  }
 
   /**
-   * Build method that subclass implements by default which is to build query
-   * from reference and literal in function arguments.
+   * Build method that subclass implements by default which is to build query from reference and
+   * literal in function arguments.
    *
-   * @param fieldName   field name
-   * @param fieldType   field type
-   * @param literal     field value literal
-   * @return            query
+   * @param fieldName field name
+   * @param fieldType field type
+   * @param literal field value literal
+   * @return query
    */
   protected QueryBuilder doBuild(String fieldName, ExprType fieldType, ExprValue literal) {
     throw new UnsupportedOperationException(
@@ -225,18 +286,34 @@ protected QueryBuilder doBuild(String fieldName, ExprType fieldType, ExprValue l
   }
 
   /**
-   * Convert multi-field text field name to its inner keyword field. The limitation and assumption
-   * is that the keyword field name is always "keyword" which is true by default.
+   * Converts a literal value to a formatted date or time value based on the specified field type.
    *
-   * @param fieldName   field name
-   * @param fieldType   field type
-   * @return            keyword field name for multi-field, otherwise original field name returned
+   * <p>If the field type is an instance of {@link OpenSearchDateType}, this method checks the type
+   * of the literal value and converts it to a formatted date or time if necessary. The formatting
+   * is applied if the {@link OpenSearchDateType} has a formatter. Otherwise, the raw value is
+   * returned.
+   *
+   * @param literal the literal value to be converted
+   * @param fieldType the field type to determine the conversion logic
+   * @return the formatted date or time value if the field type requires it, otherwise the raw value
    */
-  protected String convertTextToKeyword(String fieldName, ExprType fieldType) {
-    if (fieldType == OPENSEARCH_TEXT_KEYWORD) {
-      return fieldName + ".keyword";
+  protected Object value(ExprValue literal, ExprType fieldType) {
+    if (fieldType instanceof OpenSearchDateType) {
+      OpenSearchDateType openSearchDateType = (OpenSearchDateType) fieldType;
+      if (literal.type().equals(ExprCoreType.TIMESTAMP)) {
+        return openSearchDateType.hasNoFormatter()
+            ? literal.timestampValue().toEpochMilli()
+            : openSearchDateType.getFormattedDate(literal.timestampValue());
+      } else if (literal.type().equals(ExprCoreType.DATE)) {
+        return openSearchDateType.hasNoFormatter()
+            ? literal.value()
+            : openSearchDateType.getFormattedDate(literal.dateValue());
+      } else if (literal.type().equals(ExprCoreType.TIME)) {
+        return openSearchDateType.hasNoFormatter()
+            ? literal.value()
+            : openSearchDateType.getFormattedDate(literal.timeValue());
+      }
     }
-    return fieldName;
+    return literal.value();
   }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/NestedQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/NestedQuery.java
new file mode 100644
index 0000000000..f098d5df5a
--- /dev/null
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/NestedQuery.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.storage.script.filter.lucene;
+
+import org.apache.lucene.search.join.ScoreMode;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.FunctionExpression;
+import org.opensearch.sql.expression.LiteralExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
+
+/** Lucene query that build nested query. */
+public class NestedQuery extends LuceneQuery {
+
+  /**
+   * Build query for 'nested' function used in predicate expression. Supports 'nested' function on
+   * left and literal on right.
+   *
+   * @param func Function expression.
+   * @param innerQuery Comparison query to be place inside nested query.
+   * @return Nested query.
+   */
+  public QueryBuilder buildNested(FunctionExpression func, LuceneQuery innerQuery) {
+    // Generate inner query for placement inside nested query
+    FunctionExpression nestedFunc = (FunctionExpression) func.getArguments().get(0);
+    validateArgs(nestedFunc, func.getArguments().get(1));
+    ExprValue literalValue = func.getArguments().get(1).valueOf();
+    ReferenceExpression ref = (ReferenceExpression) nestedFunc.getArguments().get(0);
+    QueryBuilder innerQueryResult =
+        innerQuery.doBuild(ref.getAttr(), nestedFunc.type(), literalValue);
+
+    // Generate nested query
+    boolean hasPathParam = nestedFunc.getArguments().size() == 2;
+    String pathStr =
+        hasPathParam
+            ? nestedFunc.getArguments().get(1).toString()
+            : getNestedPathString((ReferenceExpression) nestedFunc.getArguments().get(0));
+    return QueryBuilders.nestedQuery(pathStr, innerQueryResult, ScoreMode.None);
+  }
+
+  /**
+   * Dynamically generate path for nested field. An example field of 'office.section.cubicle' would
+   * dynamically generate the path 'office.section'.
+   *
+   * @param field nested field to generate path for.
+   * @return path for nested field.
+   */
+  private String getNestedPathString(ReferenceExpression field) {
+    String ret = "";
+    for (int i = 0; i < field.getPaths().size() - 1; i++) {
+      ret += (i == 0) ? field.getPaths().get(i) : "." + field.getPaths().get(i);
+    }
+    return ret;
+  }
+
+  /**
+   * Validate arguments in nested function and predicate expression.
+   *
+   * @param nestedFunc Nested function expression.
+   */
+  private void validateArgs(FunctionExpression nestedFunc, Expression rightExpression) {
+    if (nestedFunc.getArguments().size() > 2) {
+      throw new IllegalArgumentException(
+          "nested function supports 2 parameters (field, path) or 1 parameter (field)");
+    }
+
+    for (var arg : nestedFunc.getArguments()) {
+      if (!(arg instanceof ReferenceExpression)) {
+        throw new IllegalArgumentException(
+            String.format("Illegal nested field name: %s", arg.toString()));
+      }
+    }
+
+    if (!(rightExpression instanceof LiteralExpression)) {
+      throw new IllegalArgumentException(
+          String.format(
+              "Illegal argument on right side of predicate expression: %s",
+              rightExpression.toString()));
+    }
+  }
+}
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQuery.java
index 7e13cad592..e9a38b6ee3 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQuery.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter.lucene;
 
 import lombok.RequiredArgsConstructor;
@@ -11,27 +10,26 @@
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.query.RangeQueryBuilder;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Lucene query that builds range query for non-quality comparison.
- */
+/** Lucene query that builds range query for non-quality comparison. */
 @RequiredArgsConstructor
 public class RangeQuery extends LuceneQuery {
 
   public enum Comparison {
-    LT, GT, LTE, GTE, BETWEEN
+    LT,
+    GT,
+    LTE,
+    GTE,
+    BETWEEN
   }
 
-  /**
-   * Comparison that range query build for.
-   */
+  /** Comparison that range query build for. */
   private final Comparison comparison;
 
   @Override
   protected QueryBuilder doBuild(String fieldName, ExprType fieldType, ExprValue literal) {
-    Object value = value(literal);
+    Object value = this.value(literal, fieldType);
 
     RangeQueryBuilder query = QueryBuilders.rangeQuery(fieldName);
     switch (comparison) {
@@ -47,13 +45,4 @@ protected QueryBuilder doBuild(String fieldName, ExprType fieldType, ExprValue l
         throw new IllegalStateException("Comparison is supported by range query: " + comparison);
     }
   }
-
-  private Object value(ExprValue literal) {
-    if (literal.type().equals(ExprCoreType.TIMESTAMP)) {
-      return literal.timestampValue().toEpochMilli();
-    } else {
-      return literal.value();
-    }
-  }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/TermQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/TermQuery.java
index 91aad409f2..f8988b3cd9 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/TermQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/TermQuery.java
@@ -3,32 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter.lucene;
 
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 
-/**
- * Lucene query that build term query for equality comparison.
- */
+/** Lucene query that build term query for equality comparison. */
 public class TermQuery extends LuceneQuery {
 
   @Override
   protected QueryBuilder doBuild(String fieldName, ExprType fieldType, ExprValue literal) {
-    fieldName = convertTextToKeyword(fieldName, fieldType);
-    return QueryBuilders.termQuery(fieldName, value(literal));
+    fieldName = OpenSearchTextType.convertTextToKeyword(fieldName, fieldType);
+    return QueryBuilders.termQuery(fieldName, this.value(literal, fieldType));
   }
-
-  private Object value(ExprValue literal) {
-    if (literal.type().equals(ExprCoreType.TIMESTAMP)) {
-      return literal.timestampValue().toEpochMilli();
-    } else {
-      return literal.value();
-    }
-  }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/FunctionParameterRepository.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/FunctionParameterRepository.java
index 1adddff95d..f86fc08f04 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/FunctionParameterRepository.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/FunctionParameterRepository.java
@@ -31,192 +31,254 @@
 public class FunctionParameterRepository {
 
   public static final Map<String, RelevanceQuery.QueryBuilderStep<MatchBoolPrefixQueryBuilder>>
-      MatchBoolPrefixQueryBuildActions = ImmutableMap.<String,
-          RelevanceQuery.QueryBuilderStep<MatchBoolPrefixQueryBuilder>>builder()
-          .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
-          .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
-          .put("fuzziness", (b, v) -> b.fuzziness(convertFuzziness(v)))
-          .put("fuzzy_rewrite", (b, v) -> b.fuzzyRewrite(checkRewrite(v, "fuzzy_rewrite")))
-          .put("fuzzy_transpositions", (b, v) -> b.fuzzyTranspositions(
-              convertBoolValue(v, "fuzzy_transpositions")))
-          .put("max_expansions", (b, v) -> b.maxExpansions(convertIntValue(v, "max_expansions")))
-          .put("minimum_should_match", (b, v) -> b.minimumShouldMatch(v.stringValue()))
-          .put("operator", (b, v) -> b.operator(convertOperator(v, "operator")))
-          .put("prefix_length", (b, v) -> b.prefixLength(convertIntValue(v, "prefix_length")))
-          .build();
+      MatchBoolPrefixQueryBuildActions =
+          ImmutableMap
+              .<String, RelevanceQuery.QueryBuilderStep<MatchBoolPrefixQueryBuilder>>builder()
+              .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
+              .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
+              .put("fuzziness", (b, v) -> b.fuzziness(convertFuzziness(v)))
+              .put("fuzzy_rewrite", (b, v) -> b.fuzzyRewrite(checkRewrite(v, "fuzzy_rewrite")))
+              .put(
+                  "fuzzy_transpositions",
+                  (b, v) -> b.fuzzyTranspositions(convertBoolValue(v, "fuzzy_transpositions")))
+              .put(
+                  "max_expansions", (b, v) -> b.maxExpansions(convertIntValue(v, "max_expansions")))
+              .put("minimum_should_match", (b, v) -> b.minimumShouldMatch(v.stringValue()))
+              .put("operator", (b, v) -> b.operator(convertOperator(v, "operator")))
+              .put("prefix_length", (b, v) -> b.prefixLength(convertIntValue(v, "prefix_length")))
+              .build();
 
   public static final Map<String, RelevanceQuery.QueryBuilderStep<MatchPhrasePrefixQueryBuilder>>
-      MatchPhrasePrefixQueryBuildActions = ImmutableMap.<String,
-          RelevanceQuery.QueryBuilderStep<MatchPhrasePrefixQueryBuilder>>builder()
-          .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
-          .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
-          .put("max_expansions", (b, v) -> b.maxExpansions(convertIntValue(v, "max_expansions")))
-          .put("slop", (b, v) -> b.slop(convertIntValue(v, "slop")))
-          .put("zero_terms_query", (b, v) -> b.zeroTermsQuery(convertZeroTermsQuery(v)))
-          .build();
+      MatchPhrasePrefixQueryBuildActions =
+          ImmutableMap
+              .<String, RelevanceQuery.QueryBuilderStep<MatchPhrasePrefixQueryBuilder>>builder()
+              .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
+              .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
+              .put(
+                  "max_expansions", (b, v) -> b.maxExpansions(convertIntValue(v, "max_expansions")))
+              .put("slop", (b, v) -> b.slop(convertIntValue(v, "slop")))
+              .put("zero_terms_query", (b, v) -> b.zeroTermsQuery(convertZeroTermsQuery(v)))
+              .build();
 
   public static final Map<String, RelevanceQuery.QueryBuilderStep<MatchPhraseQueryBuilder>>
-      MatchPhraseQueryBuildActions = ImmutableMap.<String,
-          RelevanceQuery.QueryBuilderStep<MatchPhraseQueryBuilder>>builder()
-          .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
-          .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
-          .put("slop", (b, v) -> b.slop(convertIntValue(v, "slop")))
-          .put("zero_terms_query", (b, v) -> b.zeroTermsQuery(convertZeroTermsQuery(v)))
-          .build();
+      MatchPhraseQueryBuildActions =
+          ImmutableMap.<String, RelevanceQuery.QueryBuilderStep<MatchPhraseQueryBuilder>>builder()
+              .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
+              .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
+              .put("slop", (b, v) -> b.slop(convertIntValue(v, "slop")))
+              .put("zero_terms_query", (b, v) -> b.zeroTermsQuery(convertZeroTermsQuery(v)))
+              .build();
 
   public static final Map<String, RelevanceQuery.QueryBuilderStep<MatchQueryBuilder>>
-      MatchQueryBuildActions = ImmutableMap.<String,
-          RelevanceQuery.QueryBuilderStep<MatchQueryBuilder>>builder()
-          .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
-          .put("auto_generate_synonyms_phrase_query", (b, v) -> b.autoGenerateSynonymsPhraseQuery(
-              convertBoolValue(v, "auto_generate_synonyms_phrase_query")))
-          .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
-          .put("fuzziness", (b, v) -> b.fuzziness(convertFuzziness(v)))
-          .put("fuzzy_rewrite", (b, v) -> b.fuzzyRewrite(checkRewrite(v, "fuzzy_rewrite")))
-          .put("fuzzy_transpositions", (b, v) -> b.fuzzyTranspositions(
-              convertBoolValue(v, "fuzzy_transpositions")))
-          .put("lenient", (b, v) -> b.lenient(convertBoolValue(v, "lenient")))
-          .put("minimum_should_match", (b, v) -> b.minimumShouldMatch(v.stringValue()))
-          .put("max_expansions", (b, v) -> b.maxExpansions(convertIntValue(v, "max_expansions")))
-          .put("operator", (b, v) -> b.operator(convertOperator(v, "operator")))
-          .put("prefix_length", (b, v) -> b.prefixLength(convertIntValue(v, "prefix_length")))
-          .put("zero_terms_query", (b, v) -> b.zeroTermsQuery(convertZeroTermsQuery(v)))
-          .build();
+      MatchQueryBuildActions =
+          ImmutableMap.<String, RelevanceQuery.QueryBuilderStep<MatchQueryBuilder>>builder()
+              .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
+              .put(
+                  "auto_generate_synonyms_phrase_query",
+                  (b, v) ->
+                      b.autoGenerateSynonymsPhraseQuery(
+                          convertBoolValue(v, "auto_generate_synonyms_phrase_query")))
+              .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
+              .put("fuzziness", (b, v) -> b.fuzziness(convertFuzziness(v)))
+              .put("fuzzy_rewrite", (b, v) -> b.fuzzyRewrite(checkRewrite(v, "fuzzy_rewrite")))
+              .put(
+                  "fuzzy_transpositions",
+                  (b, v) -> b.fuzzyTranspositions(convertBoolValue(v, "fuzzy_transpositions")))
+              .put("lenient", (b, v) -> b.lenient(convertBoolValue(v, "lenient")))
+              .put("minimum_should_match", (b, v) -> b.minimumShouldMatch(v.stringValue()))
+              .put(
+                  "max_expansions", (b, v) -> b.maxExpansions(convertIntValue(v, "max_expansions")))
+              .put("operator", (b, v) -> b.operator(convertOperator(v, "operator")))
+              .put("prefix_length", (b, v) -> b.prefixLength(convertIntValue(v, "prefix_length")))
+              .put("zero_terms_query", (b, v) -> b.zeroTermsQuery(convertZeroTermsQuery(v)))
+              .build();
 
   @SuppressWarnings("deprecation") // cutoffFrequency is deprecated
   public static final Map<String, RelevanceQuery.QueryBuilderStep<MultiMatchQueryBuilder>>
-      MultiMatchQueryBuildActions = ImmutableMap.<String,
-          RelevanceQuery.QueryBuilderStep<MultiMatchQueryBuilder>>builder()
-          .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
-          .put("auto_generate_synonyms_phrase_query", (b, v) -> b.autoGenerateSynonymsPhraseQuery(
-              convertBoolValue(v, "auto_generate_synonyms_phrase_query")))
-          .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
-          .put("cutoff_frequency", (b, v) -> b.cutoffFrequency(
-              convertFloatValue(v, "cutoff_frequency")))
-          .put("fuzziness", (b, v) -> b.fuzziness(convertFuzziness(v)))
-          .put("fuzzy_transpositions", (b, v) -> b.fuzzyTranspositions(
-              convertBoolValue(v, "fuzzy_transpositions")))
-          .put("lenient", (b, v) -> b.lenient(convertBoolValue(v, "lenient")))
-          .put("max_expansions", (b, v) -> b.maxExpansions(convertIntValue(v, "max_expansions")))
-          .put("minimum_should_match", (b, v) -> b.minimumShouldMatch(v.stringValue()))
-          .put("operator", (b, v) -> b.operator(convertOperator(v, "operator")))
-          .put("prefix_length", (b, v) -> b.prefixLength(convertIntValue(v, "prefix_length")))
-          .put("slop", (b, v) -> b.slop(convertIntValue(v, "slop")))
-          .put("tie_breaker", (b, v) -> b.tieBreaker(convertFloatValue(v, "tie_breaker")))
-          .put("type", (b, v) -> b.type(convertType(v)))
-          .put("zero_terms_query", (b, v) -> b.zeroTermsQuery(convertZeroTermsQuery(v)))
-          .build();
+      MultiMatchQueryBuildActions =
+          ImmutableMap.<String, RelevanceQuery.QueryBuilderStep<MultiMatchQueryBuilder>>builder()
+              .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
+              .put(
+                  "auto_generate_synonyms_phrase_query",
+                  (b, v) ->
+                      b.autoGenerateSynonymsPhraseQuery(
+                          convertBoolValue(v, "auto_generate_synonyms_phrase_query")))
+              .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
+              .put(
+                  "cutoff_frequency",
+                  (b, v) -> b.cutoffFrequency(convertFloatValue(v, "cutoff_frequency")))
+              .put("fuzziness", (b, v) -> b.fuzziness(convertFuzziness(v)))
+              .put(
+                  "fuzzy_transpositions",
+                  (b, v) -> b.fuzzyTranspositions(convertBoolValue(v, "fuzzy_transpositions")))
+              .put("lenient", (b, v) -> b.lenient(convertBoolValue(v, "lenient")))
+              .put(
+                  "max_expansions", (b, v) -> b.maxExpansions(convertIntValue(v, "max_expansions")))
+              .put("minimum_should_match", (b, v) -> b.minimumShouldMatch(v.stringValue()))
+              .put("operator", (b, v) -> b.operator(convertOperator(v, "operator")))
+              .put("prefix_length", (b, v) -> b.prefixLength(convertIntValue(v, "prefix_length")))
+              .put("slop", (b, v) -> b.slop(convertIntValue(v, "slop")))
+              .put("tie_breaker", (b, v) -> b.tieBreaker(convertFloatValue(v, "tie_breaker")))
+              .put("type", (b, v) -> b.type(convertType(v)))
+              .put("zero_terms_query", (b, v) -> b.zeroTermsQuery(convertZeroTermsQuery(v)))
+              .build();
 
   public static final Map<String, RelevanceQuery.QueryBuilderStep<QueryStringQueryBuilder>>
-      QueryStringQueryBuildActions = ImmutableMap.<String,
-          RelevanceQuery.QueryBuilderStep<QueryStringQueryBuilder>>builder()
-          .put("allow_leading_wildcard", (b, v) -> b.allowLeadingWildcard(
-              convertBoolValue(v, "allow_leading_wildcard")))
-          .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
-          .put("analyze_wildcard", (b, v) -> b.analyzeWildcard(
-              convertBoolValue(v, "analyze_wildcard")))
-          .put("auto_generate_synonyms_phrase_query", (b, v) -> b.autoGenerateSynonymsPhraseQuery(
-              convertBoolValue(v, "auto_generate_synonyms_phrase_query")))
-          .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
-          .put("default_operator", (b, v) -> b.defaultOperator(
-              convertOperator(v, "default_operator")))
-          .put("enable_position_increments", (b, v) -> b.enablePositionIncrements(
-              convertBoolValue(v, "enable_position_increments")))
-          .put("escape", (b, v) -> b.escape(convertBoolValue(v, "escape")))
-          .put("fuzziness", (b, v) -> b.fuzziness(convertFuzziness(v)))
-          .put("fuzzy_max_expansions", (b, v) -> b.fuzzyMaxExpansions(
-              convertIntValue(v, "fuzzy_max_expansions")))
-          .put("fuzzy_prefix_length", (b, v) -> b.fuzzyPrefixLength(
-              convertIntValue(v, "fuzzy_prefix_length")))
-          .put("fuzzy_rewrite", (b, v) -> b.fuzzyRewrite(checkRewrite(v, "fuzzy_rewrite")))
-          .put("fuzzy_transpositions", (b, v) -> b.fuzzyTranspositions(
-              convertBoolValue(v, "fuzzy_transpositions")))
-          .put("lenient", (b, v) -> b.lenient(convertBoolValue(v, "lenient")))
-          .put("max_determinized_states", (b, v) -> b.maxDeterminizedStates(
-              convertIntValue(v, "max_determinized_states")))
-          .put("minimum_should_match", (b, v) -> b.minimumShouldMatch(v.stringValue()))
-          .put("phrase_slop", (b, v) -> b.phraseSlop(convertIntValue(v, "phrase_slop")))
-          .put("quote_analyzer", (b, v) -> b.quoteAnalyzer(v.stringValue()))
-          .put("quote_field_suffix", (b, v) -> b.quoteFieldSuffix(v.stringValue()))
-          .put("rewrite", (b, v) -> b.rewrite(checkRewrite(v, "rewrite")))
-          .put("tie_breaker", (b, v) -> b.tieBreaker(convertFloatValue(v, "tie_breaker")))
-          .put("time_zone", (b, v) -> b.timeZone(checkTimeZone(v)))
-          .put("type", (b, v) -> b.type(convertType(v)))
-          .build();
+      QueryStringQueryBuildActions =
+          ImmutableMap.<String, RelevanceQuery.QueryBuilderStep<QueryStringQueryBuilder>>builder()
+              .put(
+                  "allow_leading_wildcard",
+                  (b, v) -> b.allowLeadingWildcard(convertBoolValue(v, "allow_leading_wildcard")))
+              .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
+              .put(
+                  "analyze_wildcard",
+                  (b, v) -> b.analyzeWildcard(convertBoolValue(v, "analyze_wildcard")))
+              .put(
+                  "auto_generate_synonyms_phrase_query",
+                  (b, v) ->
+                      b.autoGenerateSynonymsPhraseQuery(
+                          convertBoolValue(v, "auto_generate_synonyms_phrase_query")))
+              .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
+              .put(
+                  "default_operator",
+                  (b, v) -> b.defaultOperator(convertOperator(v, "default_operator")))
+              .put(
+                  "enable_position_increments",
+                  (b, v) ->
+                      b.enablePositionIncrements(convertBoolValue(v, "enable_position_increments")))
+              .put("escape", (b, v) -> b.escape(convertBoolValue(v, "escape")))
+              .put("fuzziness", (b, v) -> b.fuzziness(convertFuzziness(v)))
+              .put(
+                  "fuzzy_max_expansions",
+                  (b, v) -> b.fuzzyMaxExpansions(convertIntValue(v, "fuzzy_max_expansions")))
+              .put(
+                  "fuzzy_prefix_length",
+                  (b, v) -> b.fuzzyPrefixLength(convertIntValue(v, "fuzzy_prefix_length")))
+              .put("fuzzy_rewrite", (b, v) -> b.fuzzyRewrite(checkRewrite(v, "fuzzy_rewrite")))
+              .put(
+                  "fuzzy_transpositions",
+                  (b, v) -> b.fuzzyTranspositions(convertBoolValue(v, "fuzzy_transpositions")))
+              .put("lenient", (b, v) -> b.lenient(convertBoolValue(v, "lenient")))
+              .put(
+                  "max_determinized_states",
+                  (b, v) -> b.maxDeterminizedStates(convertIntValue(v, "max_determinized_states")))
+              .put("minimum_should_match", (b, v) -> b.minimumShouldMatch(v.stringValue()))
+              .put("phrase_slop", (b, v) -> b.phraseSlop(convertIntValue(v, "phrase_slop")))
+              .put("quote_analyzer", (b, v) -> b.quoteAnalyzer(v.stringValue()))
+              .put("quote_field_suffix", (b, v) -> b.quoteFieldSuffix(v.stringValue()))
+              .put("rewrite", (b, v) -> b.rewrite(checkRewrite(v, "rewrite")))
+              .put("tie_breaker", (b, v) -> b.tieBreaker(convertFloatValue(v, "tie_breaker")))
+              .put("time_zone", (b, v) -> b.timeZone(checkTimeZone(v)))
+              .put("type", (b, v) -> b.type(convertType(v)))
+              .build();
 
   public static final Map<String, RelevanceQuery.QueryBuilderStep<SimpleQueryStringBuilder>>
-      SimpleQueryStringQueryBuildActions = ImmutableMap.<String,
-          RelevanceQuery.QueryBuilderStep<SimpleQueryStringBuilder>>builder()
-          .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
-          .put("analyze_wildcard", (b, v) -> b.analyzeWildcard(
-              convertBoolValue(v, "analyze_wildcard")))
-          .put("auto_generate_synonyms_phrase_query", (b, v) -> b.autoGenerateSynonymsPhraseQuery(
-              convertBoolValue(v, "auto_generate_synonyms_phrase_query")))
-          .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
-          .put("default_operator", (b, v) -> b.defaultOperator(
-              convertOperator(v, "default_operator")))
-          .put("flags", (b, v) -> b.flags(convertFlags(v)))
-          .put("fuzzy_max_expansions", (b, v) -> b.fuzzyMaxExpansions(
-              convertIntValue(v, "fuzzy_max_expansions")))
-          .put("fuzzy_prefix_length", (b, v) -> b.fuzzyPrefixLength(
-              convertIntValue(v, "fuzzy_prefix_length")))
-          .put("fuzzy_transpositions", (b, v) -> b.fuzzyTranspositions(
-              convertBoolValue(v, "fuzzy_transpositions")))
-          .put("lenient", (b, v) -> b.lenient(convertBoolValue(v, "lenient")))
-          .put("minimum_should_match", (b, v) -> b.minimumShouldMatch(v.stringValue()))
-          .put("quote_field_suffix", (b, v) -> b.quoteFieldSuffix(v.stringValue()))
-          .build();
+      SimpleQueryStringQueryBuildActions =
+          ImmutableMap.<String, RelevanceQuery.QueryBuilderStep<SimpleQueryStringBuilder>>builder()
+              .put("analyzer", (b, v) -> b.analyzer(v.stringValue()))
+              .put(
+                  "analyze_wildcard",
+                  (b, v) -> b.analyzeWildcard(convertBoolValue(v, "analyze_wildcard")))
+              .put(
+                  "auto_generate_synonyms_phrase_query",
+                  (b, v) ->
+                      b.autoGenerateSynonymsPhraseQuery(
+                          convertBoolValue(v, "auto_generate_synonyms_phrase_query")))
+              .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
+              .put(
+                  "default_operator",
+                  (b, v) -> b.defaultOperator(convertOperator(v, "default_operator")))
+              .put("flags", (b, v) -> b.flags(convertFlags(v)))
+              .put(
+                  "fuzzy_max_expansions",
+                  (b, v) -> b.fuzzyMaxExpansions(convertIntValue(v, "fuzzy_max_expansions")))
+              .put(
+                  "fuzzy_prefix_length",
+                  (b, v) -> b.fuzzyPrefixLength(convertIntValue(v, "fuzzy_prefix_length")))
+              .put(
+                  "fuzzy_transpositions",
+                  (b, v) -> b.fuzzyTranspositions(convertBoolValue(v, "fuzzy_transpositions")))
+              .put("lenient", (b, v) -> b.lenient(convertBoolValue(v, "lenient")))
+              .put("minimum_should_match", (b, v) -> b.minimumShouldMatch(v.stringValue()))
+              .put("quote_field_suffix", (b, v) -> b.quoteFieldSuffix(v.stringValue()))
+              .build();
 
   public static final Map<String, RelevanceQuery.QueryBuilderStep<WildcardQueryBuilder>>
-      WildcardQueryBuildActions = ImmutableMap.<String,
-          RelevanceQuery.QueryBuilderStep<WildcardQueryBuilder>>builder()
-      .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
-      .put("case_insensitive", (b, v) -> b.caseInsensitive(convertBoolValue(v, "case_insensitive")))
-      .put("rewrite", (b, v) -> b.rewrite(checkRewrite(v, "rewrite")))
-      .build();
+      WildcardQueryBuildActions =
+          ImmutableMap.<String, RelevanceQuery.QueryBuilderStep<WildcardQueryBuilder>>builder()
+              .put("boost", (b, v) -> b.boost(convertFloatValue(v, "boost")))
+              .put(
+                  "case_insensitive",
+                  (b, v) -> b.caseInsensitive(convertBoolValue(v, "case_insensitive")))
+              .put("rewrite", (b, v) -> b.rewrite(checkRewrite(v, "rewrite")))
+              .build();
 
   public static final Map<String, String> ArgumentLimitations =
       ImmutableMap.<String, String>builder()
-      .put("boost", "Accepts only floating point values greater than 0.")
-      .put("tie_breaker", "Accepts only floating point values in range 0 to 1.")
-      .put("rewrite", "Available values are: constant_score, "
-          + "scoring_boolean, constant_score_boolean, top_terms_X, top_terms_boost_X, "
-          + "top_terms_blended_freqs_X, where X is an integer value.")
-      .put("flags", String.format(
-          "Available values are: %s and any combinations of these separated by '|'.",
-          Arrays.stream(SimpleQueryStringFlag.class.getEnumConstants())
-              .map(Enum::toString).collect(Collectors.joining(", "))))
-      .put("time_zone", "For more information, follow this link: "
-          + "https://docs.oracle.com/javase/8/docs/api/java/time/ZoneId.html#of-java.lang.String-")
-      .put("fuzziness", "Available values are: "
-          + "'AUTO', 'AUTO:x,y' or z, where x, y, z - integer values.")
-      .put("operator", String.format("Available values are: %s.",
-          Arrays.stream(Operator.class.getEnumConstants())
-              .map(Enum::toString).collect(Collectors.joining(", "))))
-      .put("type", String.format("Available values are: %s.",
-          Arrays.stream(MultiMatchQueryBuilder.Type.class.getEnumConstants())
-              .map(Enum::toString).collect(Collectors.joining(", "))))
-      .put("zero_terms_query", String.format("Available values are: %s.",
-          Arrays.stream(MatchQuery.ZeroTermsQuery.class.getEnumConstants())
-              .map(Enum::toString).collect(Collectors.joining(", "))))
-      .put("int", "Accepts only integer values.")
-      .put("float", "Accepts only floating point values.")
-      .put("bool", "Accepts only boolean values: 'true' or 'false'.")
-      .build();
-
+          .put("boost", "Accepts only floating point values greater than 0.")
+          .put("tie_breaker", "Accepts only floating point values in range 0 to 1.")
+          .put(
+              "rewrite",
+              "Available values are: constant_score, "
+                  + "scoring_boolean, constant_score_boolean, top_terms_X, top_terms_boost_X, "
+                  + "top_terms_blended_freqs_X, where X is an integer value.")
+          .put(
+              "flags",
+              String.format(
+                  "Available values are: %s and any combinations of these separated by '|'.",
+                  Arrays.stream(SimpleQueryStringFlag.class.getEnumConstants())
+                      .map(Enum::toString)
+                      .collect(Collectors.joining(", "))))
+          .put(
+              "time_zone",
+              "For more information, follow this link: "
+                  + "https://docs.oracle.com/javase/8/docs/api/java/time/ZoneId.html#of-java.lang.String-")
+          .put(
+              "fuzziness",
+              "Available values are: " + "'AUTO', 'AUTO:x,y' or z, where x, y, z - integer values.")
+          .put(
+              "operator",
+              String.format(
+                  "Available values are: %s.",
+                  Arrays.stream(Operator.class.getEnumConstants())
+                      .map(Enum::toString)
+                      .collect(Collectors.joining(", "))))
+          .put(
+              "type",
+              String.format(
+                  "Available values are: %s.",
+                  Arrays.stream(MultiMatchQueryBuilder.Type.class.getEnumConstants())
+                      .map(Enum::toString)
+                      .collect(Collectors.joining(", "))))
+          .put(
+              "zero_terms_query",
+              String.format(
+                  "Available values are: %s.",
+                  Arrays.stream(MatchQuery.ZeroTermsQuery.class.getEnumConstants())
+                      .map(Enum::toString)
+                      .collect(Collectors.joining(", "))))
+          .put("int", "Accepts only integer values.")
+          .put("float", "Accepts only floating point values.")
+          .put("bool", "Accepts only boolean values: 'true' or 'false'.")
+          .build();
 
   private static String formatErrorMessage(String name, String value) {
     return formatErrorMessage(name, value, name);
   }
 
   private static String formatErrorMessage(String name, String value, String limitationName) {
-    return String.format("Invalid %s value: '%s'. %s",
-        name, value, ArgumentLimitations.containsKey(name) ? ArgumentLimitations.get(name)
+    return String.format(
+        "Invalid %s value: '%s'. %s",
+        name,
+        value,
+        ArgumentLimitations.containsKey(name)
+            ? ArgumentLimitations.get(name)
             : ArgumentLimitations.getOrDefault(limitationName, ""));
   }
 
   /**
    * Check whether value is valid for 'rewrite' or 'fuzzy_rewrite'.
+   *
    * @param value Value
    * @param name Value name
    * @return Converted
@@ -233,6 +295,7 @@ public static String checkRewrite(ExprValue value, String name) {
 
   /**
    * Convert ExprValue to Flags.
+   *
    * @param value Value
    * @return Array of flags
    */
@@ -248,6 +311,7 @@ public static SimpleQueryStringFlag[] convertFlags(ExprValue value) {
 
   /**
    * Check whether ExprValue could be converted to timezone object.
+   *
    * @param value Value
    * @return Converted to string
    */
@@ -262,6 +326,7 @@ public static String checkTimeZone(ExprValue value) {
 
   /**
    * Convert ExprValue to Fuzziness object.
+   *
    * @param value Value
    * @return Fuzziness
    */
@@ -275,6 +340,7 @@ public static Fuzziness convertFuzziness(ExprValue value) {
 
   /**
    * Convert ExprValue to Operator object, could be used for 'operator' and 'default_operator'.
+   *
    * @param value Value
    * @param name Value name
    * @return Operator
@@ -289,13 +355,14 @@ public static Operator convertOperator(ExprValue value, String name) {
 
   /**
    * Convert ExprValue to Type object.
+   *
    * @param value Value
    * @return Type
    */
   public static MultiMatchQueryBuilder.Type convertType(ExprValue value) {
     try {
-      return MultiMatchQueryBuilder.Type.parse(value.stringValue().toLowerCase(),
-          LoggingDeprecationHandler.INSTANCE);
+      return MultiMatchQueryBuilder.Type.parse(
+          value.stringValue().toLowerCase(), LoggingDeprecationHandler.INSTANCE);
     } catch (Exception e) {
       throw new RuntimeException(formatErrorMessage("type", value.stringValue()), e);
     }
@@ -303,6 +370,7 @@ public static MultiMatchQueryBuilder.Type convertType(ExprValue value) {
 
   /**
    * Convert ExprValue to ZeroTermsQuery object.
+   *
    * @param value Value
    * @return ZeroTermsQuery
    */
@@ -316,6 +384,7 @@ public static MatchQuery.ZeroTermsQuery convertZeroTermsQuery(ExprValue value) {
 
   /**
    * Convert ExprValue to int.
+   *
    * @param value Value
    * @param name Value name
    * @return int
@@ -330,6 +399,7 @@ public static int convertIntValue(ExprValue value, String name) {
 
   /**
    * Convert ExprValue to float.
+   *
    * @param value Value
    * @param name Value name
    * @return float
@@ -344,6 +414,7 @@ public static float convertFloatValue(ExprValue value, String name) {
 
   /**
    * Convert ExprValue to bool.
+   *
    * @param value Value
    * @param name Value name
    * @return bool
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchBoolPrefixQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchBoolPrefixQuery.java
index 7044a56035..5443d7154d 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchBoolPrefixQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchBoolPrefixQuery.java
@@ -8,14 +8,11 @@
 import org.opensearch.index.query.MatchBoolPrefixQueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 
-/**
- * Initializes MatchBoolPrefixQueryBuilder from a FunctionExpression.
- */
-public class MatchBoolPrefixQuery
-    extends SingleFieldQuery<MatchBoolPrefixQueryBuilder> {
+/** Initializes MatchBoolPrefixQueryBuilder from a FunctionExpression. */
+public class MatchBoolPrefixQuery extends SingleFieldQuery<MatchBoolPrefixQueryBuilder> {
   /**
-   * Constructor for MatchBoolPrefixQuery to configure RelevanceQuery
-   * with support of optional parameters.
+   * Constructor for MatchBoolPrefixQuery to configure RelevanceQuery with support of optional
+   * parameters.
    */
   public MatchBoolPrefixQuery() {
     super(FunctionParameterRepository.MatchBoolPrefixQueryBuildActions);
@@ -23,9 +20,10 @@ public MatchBoolPrefixQuery() {
 
   /**
    * Maps correct query builder function to class.
-   * @param field  Field to execute query in
-   * @param query  Text used to search field
-   * @return  Object of executed query
+   *
+   * @param field Field to execute query in
+   * @param query Text used to search field
+   * @return Object of executed query
    */
   @Override
   protected MatchBoolPrefixQueryBuilder createBuilder(String field, String query) {
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhrasePrefixQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhrasePrefixQuery.java
index 8ee9ae299e..5a9b5e0d1c 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhrasePrefixQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhrasePrefixQuery.java
@@ -8,12 +8,10 @@
 import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 
-/**
-    * Lucene query that builds a match_phrase_prefix query.
-    */
+/** Lucene query that builds a match_phrase_prefix query. */
 public class MatchPhrasePrefixQuery extends SingleFieldQuery<MatchPhrasePrefixQueryBuilder> {
   /**
-   *  Default constructor for MatchPhrasePrefixQuery configures how RelevanceQuery.build() handles
+   * Default constructor for MatchPhrasePrefixQuery configures how RelevanceQuery.build() handles
    * named arguments.
    */
   public MatchPhrasePrefixQuery() {
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhraseQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhraseQuery.java
index 2afaca1a7a..3c823b7cae 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhraseQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhraseQuery.java
@@ -8,13 +8,11 @@
 import org.opensearch.index.query.MatchPhraseQueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 
-/**
- * Lucene query that builds a match_phrase query.
- */
+/** Lucene query that builds a match_phrase query. */
 public class MatchPhraseQuery extends SingleFieldQuery<MatchPhraseQueryBuilder> {
   /**
-   *  Default constructor for MatchPhraseQuery configures how RelevanceQuery.build() handles
-   * named arguments.
+   * Default constructor for MatchPhraseQuery configures how RelevanceQuery.build() handles named
+   * arguments.
    */
   public MatchPhraseQuery() {
     super(FunctionParameterRepository.MatchPhraseQueryBuildActions);
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchQuery.java
index a4de1c0831..b40d4fb85b 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchQuery.java
@@ -8,13 +8,11 @@
 import org.opensearch.index.query.MatchQueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 
-/**
- * Initializes MatchQueryBuilder from a FunctionExpression.
- */
+/** Initializes MatchQueryBuilder from a FunctionExpression. */
 public class MatchQuery extends SingleFieldQuery<MatchQueryBuilder> {
   /**
-   *  Default constructor for MatchQuery configures how RelevanceQuery.build() handles
-   * named arguments.
+   * Default constructor for MatchQuery configures how RelevanceQuery.build() handles named
+   * arguments.
    */
   public MatchQuery() {
     super(FunctionParameterRepository.MatchQueryBuildActions);
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiFieldQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiFieldQuery.java
index 9f37951072..b6e854a3f8 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiFieldQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiFieldQuery.java
@@ -13,7 +13,8 @@
 import org.opensearch.sql.expression.NamedArgumentExpression;
 
 /**
- *  Base class to represent relevance queries that search multiple fields.
+ * Base class to represent relevance queries that search multiple fields.
+ *
  * @param <T> The builder class for the OpenSearch query.
  */
 abstract class MultiFieldQuery<T extends QueryBuilder> extends RelevanceQuery<T> {
@@ -25,26 +26,24 @@ public MultiFieldQuery(Map<String, QueryBuilderStep<T>> queryBuildActions) {
   @Override
   public T createQueryBuilder(List<NamedArgumentExpression> arguments) {
     // Extract 'fields' and 'query'
-    var fields = arguments.stream()
-        .filter(a -> a.getArgName().equalsIgnoreCase("fields"))
-        .findFirst()
-        .orElseThrow(() -> new SemanticCheckException("'fields' parameter is missing."));
-
-    var query = arguments.stream()
-        .filter(a -> a.getArgName().equalsIgnoreCase("query"))
-        .findFirst()
-        .orElseThrow(() -> new SemanticCheckException("'query' parameter is missing"));
-
-    var fieldsAndWeights = fields
-        .getValue()
-        .valueOf()
-        .tupleValue()
-        .entrySet()
-        .stream()
-        .collect(ImmutableMap.toImmutableMap(e -> e.getKey(), e -> e.getValue().floatValue()));
+    var fields =
+        arguments.stream()
+            .filter(a -> a.getArgName().equalsIgnoreCase("fields"))
+            .findFirst()
+            .orElseThrow(() -> new SemanticCheckException("'fields' parameter is missing."));
+
+    var query =
+        arguments.stream()
+            .filter(a -> a.getArgName().equalsIgnoreCase("query"))
+            .findFirst()
+            .orElseThrow(() -> new SemanticCheckException("'query' parameter is missing"));
+
+    var fieldsAndWeights =
+        fields.getValue().valueOf().tupleValue().entrySet().stream()
+            .collect(ImmutableMap.toImmutableMap(e -> e.getKey(), e -> e.getValue().floatValue()));
 
     return createBuilder(fieldsAndWeights, query.getValue().valueOf().stringValue());
   }
 
-  protected abstract  T createBuilder(ImmutableMap<String, Float> fields, String query);
+  protected abstract T createBuilder(ImmutableMap<String, Float> fields, String query);
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiMatchQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiMatchQuery.java
index a791bf756b..826e6d7dde 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiMatchQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiMatchQuery.java
@@ -11,8 +11,8 @@
 
 public class MultiMatchQuery extends MultiFieldQuery<MultiMatchQueryBuilder> {
   /**
-   *  Default constructor for MultiMatch configures how RelevanceQuery.build() handles
-   * named arguments.
+   * Default constructor for MultiMatch configures how RelevanceQuery.build() handles named
+   * arguments.
    */
   public MultiMatchQuery() {
     super(FunctionParameterRepository.MultiMatchQueryBuildActions);
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/NoFieldQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/NoFieldQuery.java
index 1467cf8e4b..ba79147c8c 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/NoFieldQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/NoFieldQuery.java
@@ -7,7 +7,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
@@ -34,36 +33,39 @@ protected void ignoreArguments(List<NamedArgumentExpression> arguments) {
   protected void checkValidArguments(String argNormalized, T queryBuilder) {
     if (!getQueryBuildActions().containsKey(argNormalized)) {
       throw new SemanticCheckException(
-              String.format("Parameter %s is invalid for %s function.",
-                      argNormalized, getQueryName()));
+          String.format("Parameter %s is invalid for %s function.", argNormalized, getQueryName()));
     }
   }
+
   /**
-   * Override build function because RelevanceQuery requires 2 fields,
-   * but NoFieldQuery must have no fields.
+   * Override build function because RelevanceQuery requires 2 fields, but NoFieldQuery must have no
+   * fields.
    *
    * @param func : Contains function name and passed in arguments.
    * @return : QueryBuilder object
    */
-
   @Override
   public QueryBuilder build(FunctionExpression func) {
-    var arguments = func.getArguments().stream().map(
-        a -> (NamedArgumentExpression) a).collect(Collectors.toList());
+    var arguments =
+        func.getArguments().stream()
+            .map(a -> (NamedArgumentExpression) a)
+            .collect(Collectors.toList());
     if (arguments.size() < 1) {
-      throw new SyntaxCheckException(String.format(
-          "%s requires at least one parameter", func.getFunctionName()));
+      throw new SyntaxCheckException(
+          String.format("%s requires at least one parameter", func.getFunctionName()));
     }
 
     return loadArguments(arguments);
   }
 
-
   @Override
   public T createQueryBuilder(List<NamedArgumentExpression> arguments) {
     // Extract 'query'
-    var query = arguments.stream().filter(a -> a.getArgName().equalsIgnoreCase("query")).findFirst()
-        .orElseThrow(() -> new SemanticCheckException("'query' parameter is missing"));
+    var query =
+        arguments.stream()
+            .filter(a -> a.getArgName().equalsIgnoreCase("query"))
+            .findFirst()
+            .orElseThrow(() -> new SemanticCheckException("'query' parameter is missing"));
 
     return createBuilder(query.getValue().valueOf().stringValue());
   }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryQuery.java
index 35d5a43a41..0346b7712e 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryQuery.java
@@ -8,16 +8,14 @@
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.query.QueryStringQueryBuilder;
 
-/**
- * Class for Lucene query that builds the 'query' query.
- */
+/** Class for Lucene query that builds the 'query' query. */
 public class QueryQuery extends NoFieldQuery<QueryStringQueryBuilder> {
 
   private final String queryQueryName = "query";
 
   /**
-   * Default constructor for QueryQuery configures how RelevanceQuery.build() handles
-   * named arguments by calling the constructor of QueryStringQuery.
+   * Default constructor for QueryQuery configures how RelevanceQuery.build() handles named
+   * arguments by calling the constructor of QueryStringQuery.
    */
   public QueryQuery() {
     super(FunctionParameterRepository.QueryStringQueryBuildActions);
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryStringQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryStringQuery.java
index 43131baa3e..410c55cea6 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryStringQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryStringQuery.java
@@ -9,13 +9,11 @@
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.query.QueryStringQueryBuilder;
 
-/**
- * Class for Lucene query that builds the query_string query.
- */
+/** Class for Lucene query that builds the query_string query. */
 public class QueryStringQuery extends MultiFieldQuery<QueryStringQueryBuilder> {
   /**
-   *  Default constructor for QueryString configures how RelevanceQuery.build() handles
-   * named arguments.
+   * Default constructor for QueryString configures how RelevanceQuery.build() handles named
+   * arguments.
    */
   public QueryStringQuery() {
     super(FunctionParameterRepository.QueryStringQueryBuildActions);
@@ -29,8 +27,8 @@ public QueryStringQuery() {
    * @return : Builder for query_string query
    */
   @Override
-  protected QueryStringQueryBuilder createBuilder(ImmutableMap<String, Float> fields,
-                                                  String query) {
+  protected QueryStringQueryBuilder createBuilder(
+      ImmutableMap<String, Float> fields, String query) {
     return QueryBuilders.queryStringQuery(query).fields(fields);
   }
 
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQuery.java
index e07c0cd966..87faf320ec 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQuery.java
@@ -20,37 +20,39 @@
 import org.opensearch.sql.expression.NamedArgumentExpression;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.LuceneQuery;
 
-/**
- * Base class for query abstraction that builds a relevance query from function expression.
- */
+/** Base class for query abstraction that builds a relevance query from function expression. */
 @RequiredArgsConstructor
 public abstract class RelevanceQuery<T extends QueryBuilder> extends LuceneQuery {
-  @Getter
-  private final Map<String, QueryBuilderStep<T>> queryBuildActions;
+  @Getter private final Map<String, QueryBuilderStep<T>> queryBuildActions;
 
   protected void ignoreArguments(List<NamedArgumentExpression> arguments) {
-    arguments.removeIf(a -> a.getArgName().equalsIgnoreCase("field")
-            || a.getArgName().equalsIgnoreCase("fields")
-            || a.getArgName().equalsIgnoreCase("query"));
+    arguments.removeIf(
+        a ->
+            a.getArgName().equalsIgnoreCase("field")
+                || a.getArgName().equalsIgnoreCase("fields")
+                || a.getArgName().equalsIgnoreCase("query"));
   }
 
   protected void checkValidArguments(String argNormalized, T queryBuilder) {
     if (!queryBuildActions.containsKey(argNormalized)) {
       throw new SemanticCheckException(
-              String.format("Parameter %s is invalid for %s function.",
-                      argNormalized, queryBuilder.getWriteableName()));
+          String.format(
+              "Parameter %s is invalid for %s function.",
+              argNormalized, queryBuilder.getWriteableName()));
     }
   }
 
   protected T loadArguments(List<NamedArgumentExpression> arguments) throws SemanticCheckException {
     // Aggregate parameters by name, so getting a Map<Name:String, List>
-    arguments.stream().collect(Collectors.groupingBy(a -> a.getArgName().toLowerCase()))
-        .forEach((k, v) -> {
-          if (v.size() > 1) {
-            throw new SemanticCheckException(
-                String.format("Parameter '%s' can only be specified once.", k));
-          }
-        });
+    arguments.stream()
+        .collect(Collectors.groupingBy(a -> a.getArgName().toLowerCase()))
+        .forEach(
+            (k, v) -> {
+              if (v.size() > 1) {
+                throw new SemanticCheckException(
+                    String.format("Parameter '%s' can only be specified once.", k));
+              }
+            });
 
     T queryBuilder = createQueryBuilder(arguments);
 
@@ -63,9 +65,7 @@ protected T loadArguments(List<NamedArgumentExpression> arguments) throws Semant
 
       checkValidArguments(argNormalized, queryBuilder);
 
-      (Objects.requireNonNull(
-          queryBuildActions
-              .get(argNormalized)))
+      (Objects.requireNonNull(queryBuildActions.get(argNormalized)))
           .apply(queryBuilder, arg.getValue().valueOf());
     }
 
@@ -74,32 +74,27 @@ protected T loadArguments(List<NamedArgumentExpression> arguments) throws Semant
 
   @Override
   public QueryBuilder build(FunctionExpression func) {
-    var arguments = func.getArguments().stream()
-        .map(a -> (NamedArgumentExpression)a).collect(Collectors.toList());
+    var arguments =
+        func.getArguments().stream()
+            .map(a -> (NamedArgumentExpression) a)
+            .collect(Collectors.toList());
     if (arguments.size() < 2) {
       throw new SyntaxCheckException(
           String.format("%s requires at least two parameters", getQueryName()));
     }
 
     return loadArguments(arguments);
-
   }
 
   protected abstract T createQueryBuilder(List<NamedArgumentExpression> arguments);
 
   protected abstract String getQueryName();
 
-  public Map<String, QueryBuilderStep<T>> getQueryBuildActions() {
-    return queryBuildActions;
-  }
-
   /**
-   * Convenience interface for a function that updates a QueryBuilder
-   * based on ExprValue.
+   * Convenience interface for a function that updates a QueryBuilder based on ExprValue.
    *
    * @param <T> Concrete query builder
    */
-  protected interface QueryBuilderStep<T extends QueryBuilder> extends
-      BiFunction<T, ExprValue, T> {
-  }
+  protected interface QueryBuilderStep<T extends QueryBuilder>
+      extends BiFunction<T, ExprValue, T> {}
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SimpleQueryStringQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SimpleQueryStringQuery.java
index 157921572a..86dd44c118 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SimpleQueryStringQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SimpleQueryStringQuery.java
@@ -11,16 +11,16 @@
 
 public class SimpleQueryStringQuery extends MultiFieldQuery<SimpleQueryStringBuilder> {
   /**
-   *  Default constructor for SimpleQueryString configures how RelevanceQuery.build() handles
-   * named arguments.
+   * Default constructor for SimpleQueryString configures how RelevanceQuery.build() handles named
+   * arguments.
    */
   public SimpleQueryStringQuery() {
     super(FunctionParameterRepository.SimpleQueryStringQueryBuildActions);
   }
 
   @Override
-  protected SimpleQueryStringBuilder createBuilder(ImmutableMap<String, Float> fields,
-                                                   String query) {
+  protected SimpleQueryStringBuilder createBuilder(
+      ImmutableMap<String, Float> fields, String query) {
     return QueryBuilders.simpleQueryStringQuery(query).fields(fields);
   }
 
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SingleFieldQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SingleFieldQuery.java
index a7d7584d4f..086aaddc5e 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SingleFieldQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SingleFieldQuery.java
@@ -10,6 +10,7 @@
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.NamedArgumentExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
 
 /**
  * Base class to represent builder class for relevance queries like match_query, match_bool_prefix,
@@ -25,18 +26,20 @@ public SingleFieldQuery(Map<String, QueryBuilderStep<T>> queryBuildActions) {
   @Override
   protected T createQueryBuilder(List<NamedArgumentExpression> arguments) {
     // Extract 'field' and 'query'
-    var field = arguments.stream()
-        .filter(a -> a.getArgName().equalsIgnoreCase("field"))
-        .findFirst()
-        .orElseThrow(() -> new SemanticCheckException("'field' parameter is missing."));
+    var field =
+        arguments.stream()
+            .filter(a -> a.getArgName().equalsIgnoreCase("field"))
+            .findFirst()
+            .orElseThrow(() -> new SemanticCheckException("'field' parameter is missing."));
 
-    var query = arguments.stream()
-        .filter(a -> a.getArgName().equalsIgnoreCase("query"))
-        .findFirst()
-        .orElseThrow(() -> new SemanticCheckException("'query' parameter is missing"));
+    var query =
+        arguments.stream()
+            .filter(a -> a.getArgName().equalsIgnoreCase("query"))
+            .findFirst()
+            .orElseThrow(() -> new SemanticCheckException("'query' parameter is missing"));
 
     return createBuilder(
-        field.getValue().valueOf().stringValue(),
+        ((ReferenceExpression) field.getValue()).getAttr(),
         query.getValue().valueOf().stringValue());
   }
 
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/WildcardQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/WildcardQuery.java
index 9fd37e3de7..7b9887e516 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/WildcardQuery.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/WildcardQuery.java
@@ -3,20 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter.lucene.relevance;
 
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.query.WildcardQueryBuilder;
 import org.opensearch.sql.opensearch.storage.script.StringUtils;
 
-/**
- * Lucene query that builds wildcard query.
- */
+/** Lucene query that builds wildcard query. */
 public class WildcardQuery extends SingleFieldQuery<WildcardQueryBuilder> {
   /**
-   *  Default constructor for WildcardQuery configures how RelevanceQuery.build() handles
-   * named arguments.
+   * Default constructor for WildcardQuery configures how RelevanceQuery.build() handles named
+   * arguments.
    */
   public WildcardQuery() {
     super(FunctionParameterRepository.WildcardQueryBuildActions);
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/sort/SortQueryBuilder.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/sort/SortQueryBuilder.java
index 8fb4eabbd8..7669b569d4 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/sort/SortQueryBuilder.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/sort/SortQueryBuilder.java
@@ -3,37 +3,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.sort;
 
+import static org.opensearch.sql.analysis.NestedAnalyzer.generatePath;
+import static org.opensearch.sql.analysis.NestedAnalyzer.isNestedFunction;
+
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.opensearch.search.sort.FieldSortBuilder;
+import org.opensearch.search.sort.NestedSortBuilder;
 import org.opensearch.search.sort.SortBuilder;
 import org.opensearch.search.sort.SortBuilders;
 import org.opensearch.search.sort.SortOrder;
 import org.opensearch.sql.ast.tree.Sort;
 import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
-import org.opensearch.sql.opensearch.storage.script.ScriptUtils;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 
-/**
- * Builder of {@link SortBuilder}.
- */
+/** Builder of {@link SortBuilder}. */
 public class SortQueryBuilder {
 
-  /**
-   * The mapping between Core Engine sort order and OpenSearch sort order.
-   */
+  /** The mapping between Core Engine sort order and OpenSearch sort order. */
   private Map<Sort.SortOrder, SortOrder> sortOrderMap =
       new ImmutableMap.Builder<Sort.SortOrder, SortOrder>()
           .put(Sort.SortOrder.ASC, SortOrder.ASC)
           .put(Sort.SortOrder.DESC, SortOrder.DESC)
           .build();
 
-  /**
-   * The mapping between Core Engine null order and OpenSearch null order.
-   */
+  /** The mapping between Core Engine null order and OpenSearch null order. */
   private Map<Sort.NullOrder, String> missingMap =
       new ImmutableMap.Builder<Sort.NullOrder, String>()
           .put(Sort.NullOrder.NULL_FIRST, "_first")
@@ -49,14 +47,49 @@ public class SortQueryBuilder {
    */
   public SortBuilder<?> build(Expression expression, Sort.SortOption option) {
     if (expression instanceof ReferenceExpression) {
+      if (((ReferenceExpression) expression).getAttr().equalsIgnoreCase("_score")) {
+        return SortBuilders.scoreSort().order(sortOrderMap.get(option.getSortOrder()));
+      }
       return fieldBuild((ReferenceExpression) expression, option);
+    } else if (isNestedFunction(expression)) {
+
+      validateNestedArgs((FunctionExpression) expression);
+      String orderByName = ((FunctionExpression) expression).getArguments().get(0).toString();
+      // Generate path if argument not supplied in function.
+      ReferenceExpression path =
+          ((FunctionExpression) expression).getArguments().size() == 2
+              ? (ReferenceExpression) ((FunctionExpression) expression).getArguments().get(1)
+              : generatePath(orderByName);
+      return SortBuilders.fieldSort(orderByName)
+          .order(sortOrderMap.get(option.getSortOrder()))
+          .setNestedSort(new NestedSortBuilder(path.toString()));
     } else {
       throw new IllegalStateException("unsupported expression " + expression.getClass());
     }
   }
 
+  /**
+   * Validate semantics for arguments in nested function.
+   *
+   * @param nestedFunc Nested function expression.
+   */
+  private void validateNestedArgs(FunctionExpression nestedFunc) {
+    if (nestedFunc.getArguments().size() < 1 || nestedFunc.getArguments().size() > 2) {
+      throw new IllegalArgumentException(
+          "nested function supports 2 parameters (field, path) or 1 parameter (field)");
+    }
+
+    for (Expression arg : nestedFunc.getArguments()) {
+      if (!(arg instanceof ReferenceExpression)) {
+        throw new IllegalArgumentException(
+            String.format("Illegal nested field name: %s", arg.toString()));
+      }
+    }
+  }
+
   private FieldSortBuilder fieldBuild(ReferenceExpression ref, Sort.SortOption option) {
-    return SortBuilders.fieldSort(ScriptUtils.convertTextToKeyword(ref.getAttr(), ref.type()))
+    return SortBuilders.fieldSort(
+            OpenSearchTextType.convertTextToKeyword(ref.getAttr(), ref.type()))
         .order(sortOrderMap.get(option.getSortOrder()))
         .missing(missingMap.get(option.getNullOrder()));
   }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/serialization/DefaultExpressionSerializer.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/serialization/DefaultExpressionSerializer.java
index dc67da9de5..aa78d60a6e 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/serialization/DefaultExpressionSerializer.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/serialization/DefaultExpressionSerializer.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.serialization;
 
 import java.io.ByteArrayInputStream;
@@ -14,9 +13,7 @@
 import java.util.Base64;
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Default serializer that (de-)serialize expressions by JDK serialization.
- */
+/** Default serializer that (de-)serialize expressions by JDK serialization. */
 public class DefaultExpressionSerializer implements ExpressionSerializer {
 
   @Override
@@ -42,5 +39,4 @@ public Expression deserialize(String code) {
       throw new IllegalStateException("Failed to deserialize expression code: " + code, e);
     }
   }
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/serialization/ExpressionSerializer.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/serialization/ExpressionSerializer.java
index b7caeb30f8..9c9779696c 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/serialization/ExpressionSerializer.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/serialization/ExpressionSerializer.java
@@ -3,28 +3,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.serialization;
 
 import org.opensearch.sql.expression.Expression;
 
-/**
- * Expression serializer that (de-)serializes expression object.
- */
+/** Expression serializer that (de-)serializes expression object. */
 public interface ExpressionSerializer {
 
   /**
    * Serialize an expression.
-   * @param expr  expression
-   * @return      serialized string
+   *
+   * @param expr expression
+   * @return serialized string
    */
   String serialize(Expression expr);
 
   /**
    * Deserialize an expression.
-   * @param code  serialized code
-   * @return      original expression object
+   *
+   * @param code serialized code
+   * @return original expression object
    */
   Expression deserialize(String code);
-
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndex.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndex.java
index 7b6efeeba4..b1b2081f94 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndex.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndex.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.system;
 
 import static org.opensearch.sql.utils.SystemIndexUtils.systemTable;
@@ -24,17 +23,12 @@
 import org.opensearch.sql.storage.Table;
 import org.opensearch.sql.utils.SystemIndexUtils;
 
-/**
- * OpenSearch System Index Table Implementation.
- */
+/** OpenSearch System Index Table Implementation. */
 public class OpenSearchSystemIndex implements Table {
-  /**
-   * System Index Name.
-   */
+  /** System Index Name. */
   private final Pair<OpenSearchSystemIndexSchema, OpenSearchSystemRequest> systemIndexBundle;
 
-  public OpenSearchSystemIndex(
-      OpenSearchClient client, String indexName) {
+  public OpenSearchSystemIndex(OpenSearchClient client, String indexName) {
     this.systemIndexBundle = buildIndexBundle(client, indexName);
   }
 
@@ -61,8 +55,7 @@ public PhysicalPlan implement(LogicalPlan plan) {
 
   @VisibleForTesting
   @RequiredArgsConstructor
-  public class OpenSearchSystemIndexDefaultImplementor
-      extends DefaultImplementor<Object> {
+  public class OpenSearchSystemIndexDefaultImplementor extends DefaultImplementor<Object> {
 
     @Override
     public PhysicalPlan visitRelation(LogicalRelation node, Object context) {
@@ -79,10 +72,11 @@ private Pair<OpenSearchSystemIndexSchema, OpenSearchSystemRequest> buildIndexBun
       OpenSearchClient client, String indexName) {
     SystemIndexUtils.SystemTable systemTable = systemTable(indexName);
     if (systemTable.isSystemInfoTable()) {
-      return Pair.of(OpenSearchSystemIndexSchema.SYS_TABLE_TABLES,
-          new OpenSearchCatIndicesRequest(client));
+      return Pair.of(
+          OpenSearchSystemIndexSchema.SYS_TABLE_TABLES, new OpenSearchCatIndicesRequest(client));
     } else {
-      return Pair.of(OpenSearchSystemIndexSchema.SYS_TABLE_MAPPINGS,
+      return Pair.of(
+          OpenSearchSystemIndexSchema.SYS_TABLE_MAPPINGS,
           new OpenSearchDescribeIndexRequest(client, systemTable.getTableName()));
     }
   }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexScan.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexScan.java
index eb4cb865e2..57cdd52985 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexScan.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexScan.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.system;
 
 import java.util.Iterator;
@@ -14,26 +13,21 @@
 import org.opensearch.sql.opensearch.request.system.OpenSearchSystemRequest;
 import org.opensearch.sql.storage.TableScanOperator;
 
-/**
- * OpenSearch index scan operator.
- */
+/** OpenSearch index scan operator. */
 @RequiredArgsConstructor
 @EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = false)
 @ToString(onlyExplicitlyIncluded = true)
 public class OpenSearchSystemIndexScan extends TableScanOperator {
-  /**
-   * OpenSearch client.
-   */
+  /** OpenSearch request. */
   private final OpenSearchSystemRequest request;
 
-  /**
-   * Search response for current batch.
-   */
+  /** Search response for current batch. */
   private Iterator<ExprValue> iterator;
 
   @Override
   public void open() {
-    iterator = request.search().iterator();
+    var response = request.search();
+    iterator = response.iterator();
   }
 
   @Override
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexSchema.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexSchema.java
index aa09ff4660..781431ea67 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexSchema.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexSchema.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.system;
 
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
@@ -15,53 +14,52 @@
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.data.type.ExprType;
 
-/**
- * Definition of the system table schema.
- */
+/** Definition of the system table schema. */
 @Getter
 @RequiredArgsConstructor
 public enum OpenSearchSystemIndexSchema {
-
-  SYS_TABLE_TABLES(new LinkedHashMap<String, ExprType>() {{
-      put("TABLE_CAT", STRING);
-      put("TABLE_SCHEM", STRING);
-      put("TABLE_NAME", STRING);
-      put("TABLE_TYPE", STRING);
-      put("REMARKS", STRING);
-      put("TYPE_CAT", STRING);
-      put("TYPE_SCHEM", STRING);
-      put("TYPE_NAME", STRING);
-      put("SELF_REFERENCING_COL_NAME", STRING);
-      put("REF_GENERATION", STRING);
-    }
-  }
-  ),
-  SYS_TABLE_MAPPINGS(new ImmutableMap.Builder<String, ExprType>()
-      .put("TABLE_CAT", STRING)
-      .put("TABLE_SCHEM", STRING)
-      .put("TABLE_NAME", STRING)
-      .put("COLUMN_NAME", STRING)
-      .put("DATA_TYPE", STRING)
-      .put("TYPE_NAME", STRING)
-      .put("COLUMN_SIZE", STRING)
-      .put("BUFFER_LENGTH", STRING)
-      .put("DECIMAL_DIGITS", STRING)
-      .put("NUM_PREC_RADIX", STRING)
-      .put("NULLABLE", STRING)
-      .put("REMARKS", STRING)
-      .put("COLUMN_DEF", STRING)
-      .put("SQL_DATA_TYPE", STRING)
-      .put("SQL_DATETIME_SUB", STRING)
-      .put("CHAR_OCTET_LENGTH", STRING)
-      .put("ORDINAL_POSITION", STRING)
-      .put("IS_NULLABLE", STRING)
-      .put("SCOPE_CATALOG", STRING)
-      .put("SCOPE_SCHEMA", STRING)
-      .put("SCOPE_TABLE", STRING)
-      .put("SOURCE_DATA_TYPE", STRING)
-      .put("IS_AUTOINCREMENT", STRING)
-      .put("IS_GENERATEDCOLUMN", STRING)
-      .build());
+  SYS_TABLE_TABLES(
+      new LinkedHashMap<String, ExprType>() {
+        {
+          put("TABLE_CAT", STRING);
+          put("TABLE_SCHEM", STRING);
+          put("TABLE_NAME", STRING);
+          put("TABLE_TYPE", STRING);
+          put("REMARKS", STRING);
+          put("TYPE_CAT", STRING);
+          put("TYPE_SCHEM", STRING);
+          put("TYPE_NAME", STRING);
+          put("SELF_REFERENCING_COL_NAME", STRING);
+          put("REF_GENERATION", STRING);
+        }
+      }),
+  SYS_TABLE_MAPPINGS(
+      new ImmutableMap.Builder<String, ExprType>()
+          .put("TABLE_CAT", STRING)
+          .put("TABLE_SCHEM", STRING)
+          .put("TABLE_NAME", STRING)
+          .put("COLUMN_NAME", STRING)
+          .put("DATA_TYPE", STRING)
+          .put("TYPE_NAME", STRING)
+          .put("COLUMN_SIZE", STRING)
+          .put("BUFFER_LENGTH", STRING)
+          .put("DECIMAL_DIGITS", STRING)
+          .put("NUM_PREC_RADIX", STRING)
+          .put("NULLABLE", STRING)
+          .put("REMARKS", STRING)
+          .put("COLUMN_DEF", STRING)
+          .put("SQL_DATA_TYPE", STRING)
+          .put("SQL_DATETIME_SUB", STRING)
+          .put("CHAR_OCTET_LENGTH", STRING)
+          .put("ORDINAL_POSITION", STRING)
+          .put("IS_NULLABLE", STRING)
+          .put("SCOPE_CATALOG", STRING)
+          .put("SCOPE_SCHEMA", STRING)
+          .put("SCOPE_TABLE", STRING)
+          .put("SOURCE_DATA_TYPE", STRING)
+          .put("IS_AUTOINCREMENT", STRING)
+          .put("IS_GENERATEDCOLUMN", STRING)
+          .build());
 
   private final Map<String, ExprType> mapping;
 }
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/util/RestRequestUtil.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/util/RestRequestUtil.java
new file mode 100644
index 0000000000..e02bcf5af9
--- /dev/null
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/util/RestRequestUtil.java
@@ -0,0 +1,25 @@
+package org.opensearch.sql.opensearch.util;
+
+import lombok.NonNull;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.rest.RestChannel;
+import org.opensearch.rest.RestRequest;
+
+/** RestRequestUtil is a utility class for common operations on OpenSearch RestRequest's. */
+public class RestRequestUtil {
+
+  private RestRequestUtil() {
+    // utility class
+  }
+
+  /**
+   * Utility method for consuming all the request parameters. Doing this will ensure that the
+   * BaseRestHandler doesn't fail the request with an unconsumed parameter exception.
+   *
+   * @see org.opensearch.rest.BaseRestHandler#handleRequest(RestRequest, RestChannel, NodeClient)
+   * @param request - The request to consume all parameters on
+   */
+  public static void consumeAllRequestParameters(@NonNull RestRequest request) {
+    request.params().keySet().forEach(request::param);
+  }
+}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClientTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClientTest.java
index c3cd30a530..9da6e05e92 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClientTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClientTest.java
@@ -3,12 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.client;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
@@ -20,19 +21,23 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.opensearch.sql.opensearch.client.OpenSearchClient.META_CLUSTER_NAME;
+import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.MappingType;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Resources;
 import java.io.IOException;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.lucene.search.TotalHits;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InOrder;
@@ -52,24 +57,29 @@
 import org.opensearch.cluster.metadata.AliasMetadata;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.MappingMetadata;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.util.concurrent.ThreadContext;
-import org.opensearch.common.xcontent.DeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
+import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.sql.data.model.ExprIntegerValue;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
 import org.opensearch.sql.opensearch.mapping.IndexMapping;
+import org.opensearch.sql.opensearch.request.OpenSearchRequest;
 import org.opensearch.sql.opensearch.request.OpenSearchScrollRequest;
 import org.opensearch.sql.opensearch.response.OpenSearchResponse;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class OpenSearchNodeClientTest {
 
   private static final String TEST_MAPPING_FILE = "mappings/accounts.json";
@@ -78,20 +88,14 @@ class OpenSearchNodeClientTest {
   @Mock(answer = RETURNS_DEEP_STUBS)
   private NodeClient nodeClient;
 
-  @Mock
-  private OpenSearchExprValueFactory factory;
-
-  @Mock
-  private SearchHit searchHit;
+  @Mock private OpenSearchExprValueFactory factory;
 
-  @Mock
-  private ThreadContext threadContext;
+  @Mock private SearchHit searchHit;
 
-  @Mock
-  private GetIndexResponse indexResponse;
+  @Mock private GetIndexResponse indexResponse;
 
-  private ExprTupleValue exprTupleValue = ExprTupleValue.fromExprValueMap(ImmutableMap.of("id",
-      new ExprIntegerValue(1)));
+  private final ExprTupleValue exprTupleValue =
+      ExprTupleValue.fromExprValueMap(Map.of("id", new ExprIntegerValue(1)));
 
   private OpenSearchClient client;
 
@@ -101,86 +105,118 @@ void setUp() {
   }
 
   @Test
-  void isIndexExist() {
-    when(nodeClient.admin().indices()
-        .exists(any(IndicesExistsRequest.class)).actionGet())
+  void is_index_exist() {
+    when(nodeClient.admin().indices().exists(any(IndicesExistsRequest.class)).actionGet())
         .thenReturn(new IndicesExistsResponse(true));
 
     assertTrue(client.exists("test"));
   }
 
   @Test
-  void isIndexNotExist() {
+  void is_index_not_exist() {
     String indexName = "test";
-    when(nodeClient.admin().indices()
-        .exists(any(IndicesExistsRequest.class)).actionGet())
+    when(nodeClient.admin().indices().exists(any(IndicesExistsRequest.class)).actionGet())
         .thenReturn(new IndicesExistsResponse(false));
 
     assertFalse(client.exists(indexName));
   }
 
   @Test
-  void isIndexExistWithException() {
+  void is_index_exist_with_exception() {
     when(nodeClient.admin().indices().exists(any())).thenThrow(RuntimeException.class);
 
     assertThrows(IllegalStateException.class, () -> client.exists("test"));
   }
 
   @Test
-  void createIndex() {
+  void create_index() {
     String indexName = "test";
-    Map<String, Object> mappings = ImmutableMap.of(
-        "properties",
-        ImmutableMap.of("name", "text"));
-    when(nodeClient.admin().indices()
-        .create(any(CreateIndexRequest.class)).actionGet())
+    Map<String, Object> mappings = ImmutableMap.of("properties", ImmutableMap.of("name", "text"));
+    when(nodeClient.admin().indices().create(any(CreateIndexRequest.class)).actionGet())
         .thenReturn(new CreateIndexResponse(true, true, indexName));
 
     client.createIndex(indexName, mappings);
   }
 
   @Test
-  void createIndexWithException() {
+  void create_index_with_exception() {
     when(nodeClient.admin().indices().create(any())).thenThrow(RuntimeException.class);
 
-    assertThrows(IllegalStateException.class,
-        () -> client.createIndex("test", ImmutableMap.of()));
+    assertThrows(IllegalStateException.class, () -> client.createIndex("test", ImmutableMap.of()));
   }
 
   @Test
-  void getIndexMappings() throws IOException {
+  void get_index_mappings() throws IOException {
     URL url = Resources.getResource(TEST_MAPPING_FILE);
     String mappings = Resources.toString(url, Charsets.UTF_8);
     String indexName = "test";
     mockNodeClientIndicesMappings(indexName, mappings);
 
     Map<String, IndexMapping> indexMappings = client.getIndexMappings(indexName);
-    assertEquals(1, indexMappings.size());
 
-    IndexMapping indexMapping = indexMappings.values().iterator().next();
-    assertEquals(18, indexMapping.size());
-    assertEquals("text", indexMapping.getFieldType("address"));
-    assertEquals("integer", indexMapping.getFieldType("age"));
-    assertEquals("double", indexMapping.getFieldType("balance"));
-    assertEquals("keyword", indexMapping.getFieldType("city"));
-    assertEquals("date", indexMapping.getFieldType("birthday"));
-    assertEquals("geo_point", indexMapping.getFieldType("location"));
-    assertEquals("some_new_es_type_outside_type_system", indexMapping.getFieldType("new_field"));
-    assertEquals("text", indexMapping.getFieldType("field with spaces"));
-    assertEquals("text_keyword", indexMapping.getFieldType("employer"));
-    assertEquals("nested", indexMapping.getFieldType("projects"));
-    assertEquals("boolean", indexMapping.getFieldType("projects.active"));
-    assertEquals("date", indexMapping.getFieldType("projects.release"));
-    assertEquals("nested", indexMapping.getFieldType("projects.members"));
-    assertEquals("text", indexMapping.getFieldType("projects.members.name"));
-    assertEquals("object", indexMapping.getFieldType("manager"));
-    assertEquals("text_keyword", indexMapping.getFieldType("manager.name"));
-    assertEquals("keyword", indexMapping.getFieldType("manager.address"));
-    assertEquals("long", indexMapping.getFieldType("manager.salary"));
+    var mapping = indexMappings.values().iterator().next().getFieldMappings();
+    var parsedTypes = OpenSearchDataType.traverseAndFlatten(mapping);
+    assertAll(
+        () -> assertEquals(1, indexMappings.size()),
+        // 10 types extended to 17 after flattening
+        () -> assertEquals(10, mapping.size()),
+        () -> assertEquals(17, parsedTypes.size()),
+        () -> assertEquals("TEXT", mapping.get("address").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Text), parsedTypes.get("address")),
+        () -> assertEquals("INTEGER", mapping.get("age").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Integer), parsedTypes.get("age")),
+        () -> assertEquals("DOUBLE", mapping.get("balance").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Double), parsedTypes.get("balance")),
+        () -> assertEquals("KEYWORD", mapping.get("city").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Keyword), parsedTypes.get("city")),
+        () -> assertEquals("TIMESTAMP", mapping.get("birthday").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Date), parsedTypes.get("birthday")),
+        () -> assertEquals("GEO_POINT", mapping.get("location").legacyTypeName()),
+        () ->
+            assertEquals(OpenSearchTextType.of(MappingType.GeoPoint), parsedTypes.get("location")),
+        // unknown type isn't parsed and ignored
+        () -> assertFalse(mapping.containsKey("new_field")),
+        () -> assertNull(parsedTypes.get("new_field")),
+        () -> assertEquals("TEXT", mapping.get("field with spaces").legacyTypeName()),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Text), parsedTypes.get("field with spaces")),
+        () -> assertEquals("TEXT", mapping.get("employer").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Text), parsedTypes.get("employer")),
+        // `employer` is a `text` with `fields`
+        () -> assertTrue(((OpenSearchTextType) parsedTypes.get("employer")).getFields().size() > 0),
+        () -> assertEquals("NESTED", mapping.get("projects").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Nested), parsedTypes.get("projects")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Boolean), parsedTypes.get("projects.active")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Date), parsedTypes.get("projects.release")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Nested), parsedTypes.get("projects.members")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Text), parsedTypes.get("projects.members.name")),
+        () -> assertEquals("OBJECT", mapping.get("manager").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Object), parsedTypes.get("manager")),
+        () ->
+            assertEquals(OpenSearchTextType.of(MappingType.Text), parsedTypes.get("manager.name")),
+        // `manager.name` is a `text` with `fields`
+        () ->
+            assertTrue(
+                ((OpenSearchTextType) parsedTypes.get("manager.name")).getFields().size() > 0),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Keyword), parsedTypes.get("manager.address")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Long), parsedTypes.get("manager.salary")));
   }
 
   @Test
-  void getIndexMappingsWithEmptyMapping() {
+  void get_index_mappings_with_empty_mapping() {
     String indexName = "test";
     mockNodeClientIndicesMappings(indexName, "");
     Map<String, IndexMapping> indexMappings = client.getIndexMappings(indexName);
@@ -191,7 +227,7 @@ void getIndexMappingsWithEmptyMapping() {
   }
 
   @Test
-  void getIndexMappingsWithIOException() {
+  void get_index_mappings_with_IOException() {
     String indexName = "test";
     when(nodeClient.admin().indices()).thenThrow(RuntimeException.class);
 
@@ -199,13 +235,15 @@ void getIndexMappingsWithIOException() {
   }
 
   @Test
-  void getIndexMappingsWithNonExistIndex() {
-    mockNodeClient("test");
-    assertTrue(client.getIndexMappings("non_exist_index").isEmpty());
+  void get_index_mappings_with_non_exist_index() {
+    when(nodeClient.admin().indices().prepareGetMappings(any()).setLocal(anyBoolean()).get())
+        .thenThrow(IndexNotFoundException.class);
+
+    assertThrows(IndexNotFoundException.class, () -> client.getIndexMappings("non_exist_index"));
   }
 
   @Test
-  void getIndexMaxResultWindows() throws IOException {
+  void get_index_max_result_windows() throws IOException {
     URL url = Resources.getResource(TEST_MAPPING_SETTINGS_FILE);
     String indexMetadata = Resources.toString(url, Charsets.UTF_8);
     String indexName = "accounts";
@@ -219,7 +257,7 @@ void getIndexMaxResultWindows() throws IOException {
   }
 
   @Test
-  void getIndexMaxResultWindowsWithDefaultSettings() throws IOException {
+  void get_index_max_result_windows_with_default_settings() throws IOException {
     URL url = Resources.getResource(TEST_MAPPING_FILE);
     String indexMetadata = Resources.toString(url, Charsets.UTF_8);
     String indexName = "accounts";
@@ -233,7 +271,7 @@ void getIndexMaxResultWindowsWithDefaultSettings() throws IOException {
   }
 
   @Test
-  void getIndexMaxResultWindowsWithIOException() {
+  void get_index_max_result_windows_with_IOException() {
     String indexName = "test";
     when(nodeClient.admin().indices()).thenThrow(RuntimeException.class);
 
@@ -242,7 +280,7 @@ void getIndexMaxResultWindowsWithIOException() {
 
   /** Jacoco enforce this constant lambda be tested. */
   @Test
-  void testAllFieldsPredicate() {
+  void test_all_fields_predicate() {
     assertTrue(OpenSearchNodeClient.ALL_FIELDS.apply("any_index").test("any_field"));
   }
 
@@ -255,29 +293,34 @@ void search() {
     when(searchResponse.getHits())
         .thenReturn(
             new SearchHits(
-                new SearchHit[] {searchHit},
-                new TotalHits(1L, TotalHits.Relation.EQUAL_TO),
-                1.0F));
+                new SearchHit[] {searchHit}, new TotalHits(1L, TotalHits.Relation.EQUAL_TO), 1.0F));
     when(searchHit.getSourceAsString()).thenReturn("{\"id\", 1}");
-    when(factory.construct(any())).thenReturn(exprTupleValue);
+    when(searchHit.getInnerHits()).thenReturn(null);
+    when(factory.construct(any(), anyBoolean())).thenReturn(exprTupleValue);
 
     // Mock second scroll request followed
     SearchResponse scrollResponse = mock(SearchResponse.class);
     when(nodeClient.searchScroll(any()).actionGet()).thenReturn(scrollResponse);
-    when(scrollResponse.getScrollId()).thenReturn("scroll456");
     when(scrollResponse.getHits()).thenReturn(SearchHits.empty());
 
     // Verify response for first scroll request
-    OpenSearchScrollRequest request = new OpenSearchScrollRequest("test", factory);
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            new SearchSourceBuilder(),
+            factory,
+            List.of("id"));
     OpenSearchResponse response1 = client.search(request);
     assertFalse(response1.isEmpty());
 
     Iterator<ExprValue> hits = response1.iterator();
     assertTrue(hits.hasNext());
-    assertEquals(exprTupleValue, hits.next());
+    assertEquals(exprTupleValue.tupleValue().get("id"), hits.next().tupleValue().get("id"));
     assertFalse(hits.hasNext());
 
     // Verify response for second scroll request
+    request.setScrollId("scroll123");
     OpenSearchResponse response2 = client.search(request);
     assertTrue(response2.isEmpty());
   }
@@ -293,16 +336,25 @@ void schedule() {
   }
 
   @Test
+  @SneakyThrows
   void cleanup() {
     ClearScrollRequestBuilder requestBuilder = mock(ClearScrollRequestBuilder.class);
     when(nodeClient.prepareClearScroll()).thenReturn(requestBuilder);
     when(requestBuilder.addScrollId(any())).thenReturn(requestBuilder);
     when(requestBuilder.get()).thenReturn(null);
 
-    OpenSearchScrollRequest request = new OpenSearchScrollRequest("test", factory);
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            new SearchSourceBuilder(),
+            factory,
+            List.of());
     request.setScrollId("scroll123");
+    // Enforce cleaning by setting a private field.
+    FieldUtils.writeField(request, "needClean", true, true);
     client.cleanup(request);
-    assertFalse(request.isScrollStarted());
+    assertFalse(request.isScroll());
 
     InOrder inOrder = Mockito.inOrder(nodeClient, requestBuilder);
     inOrder.verify(nodeClient).prepareClearScroll();
@@ -311,23 +363,43 @@ void cleanup() {
   }
 
   @Test
-  void cleanupWithoutScrollId() {
-    OpenSearchScrollRequest request = new OpenSearchScrollRequest("test", factory);
+  void cleanup_without_scrollId() {
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            new SearchSourceBuilder(),
+            factory,
+            List.of());
     client.cleanup(request);
     verify(nodeClient, never()).prepareClearScroll();
   }
 
   @Test
-  void getIndices() {
+  @SneakyThrows
+  void cleanup_rethrows_exception() {
+    when(nodeClient.prepareClearScroll()).thenThrow(new RuntimeException());
+
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            new SearchSourceBuilder(),
+            factory,
+            List.of());
+    request.setScrollId("scroll123");
+    // Enforce cleaning by setting a private field.
+    FieldUtils.writeField(request, "needClean", true, true);
+    assertThrows(IllegalStateException.class, () -> client.cleanup(request));
+  }
+
+  @Test
+  void get_indices() {
     AliasMetadata aliasMetadata = mock(AliasMetadata.class);
-    ImmutableOpenMap.Builder<String, List<AliasMetadata>> builder = ImmutableOpenMap.builder();
-    builder.fPut("index",Arrays.asList(aliasMetadata));
-    final ImmutableOpenMap<String, List<AliasMetadata>> openMap = builder.build();
+    final var openMap = Map.of("index", List.of(aliasMetadata));
     when(aliasMetadata.alias()).thenReturn("index_alias");
-    when(nodeClient.admin().indices()
-        .prepareGetIndex()
-        .setLocal(true)
-        .get()).thenReturn(indexResponse);
+    when(nodeClient.admin().indices().prepareGetIndex().setLocal(true).get())
+        .thenReturn(indexResponse);
     when(indexResponse.getIndices()).thenReturn(new String[] {"index"});
     when(indexResponse.aliases()).thenReturn(openMap);
 
@@ -353,21 +425,15 @@ void ml() {
   public void mockNodeClientIndicesMappings(String indexName, String mappings) {
     GetMappingsResponse mockResponse = mock(GetMappingsResponse.class);
     MappingMetadata emptyMapping = mock(MappingMetadata.class);
-    when(nodeClient.admin().indices()
-        .prepareGetMappings(any())
-        .setLocal(anyBoolean())
-        .get()).thenReturn(mockResponse);
+    when(nodeClient.admin().indices().prepareGetMappings(any()).setLocal(anyBoolean()).get())
+        .thenReturn(mockResponse);
     try {
-      ImmutableOpenMap<String, MappingMetadata> metadata;
+      Map<String, MappingMetadata> metadata;
       if (mappings.isEmpty()) {
-        when(emptyMapping.getSourceAsMap()).thenReturn(ImmutableMap.of());
-        metadata =
-            new ImmutableOpenMap.Builder<String, MappingMetadata>()
-                .fPut(indexName, emptyMapping)
-                .build();
+        when(emptyMapping.getSourceAsMap()).thenReturn(Map.of());
+        metadata = Map.of(indexName, emptyMapping);
       } else {
-        metadata = new ImmutableOpenMap.Builder<String, MappingMetadata>().fPut(indexName,
-            IndexMetadata.fromXContent(createParser(mappings)).mapping()).build();
+        metadata = Map.of(indexName, IndexMetadata.fromXContent(createParser(mappings)).mapping());
       }
       when(mockResponse.mappings()).thenReturn(metadata);
     } catch (IOException e) {
@@ -375,24 +441,12 @@ public void mockNodeClientIndicesMappings(String indexName, String mappings) {
     }
   }
 
-  public void mockNodeClient(String indexName) {
-    GetMappingsResponse mockResponse = mock(GetMappingsResponse.class);
-    when(nodeClient.admin().indices()
-        .prepareGetMappings(any())
-        .setLocal(anyBoolean())
-        .get()).thenReturn(mockResponse);
-    when(mockResponse.mappings()).thenReturn(ImmutableOpenMap.of());
-  }
-
-  private void mockNodeClientSettings(String indexName, String indexMetadata)
-      throws IOException {
+  private void mockNodeClientSettings(String indexName, String indexMetadata) throws IOException {
     GetSettingsResponse mockResponse = mock(GetSettingsResponse.class);
     when(nodeClient.admin().indices().prepareGetSettings(any()).setLocal(anyBoolean()).get())
         .thenReturn(mockResponse);
-    ImmutableOpenMap<String, Settings> metadata =
-        new ImmutableOpenMap.Builder<String, Settings>()
-            .fPut(indexName, IndexMetadata.fromXContent(createParser(indexMetadata)).getSettings())
-            .build();
+    Map<String, Settings> metadata =
+        Map.of(indexName, IndexMetadata.fromXContent(createParser(indexMetadata)).getSettings());
 
     when(mockResponse.getIndexToSettings()).thenReturn(metadata);
   }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchRestClientTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchRestClientTest.java
index 25cfd6b35c..b83313de07 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchRestClientTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchRestClientTest.java
@@ -3,20 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.client;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.opensearch.sql.opensearch.client.OpenSearchClient.META_CLUSTER_NAME;
+import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.MappingType;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableMap;
@@ -27,8 +30,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.lucene.search.TotalHits;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -46,23 +53,28 @@
 import org.opensearch.client.indices.GetMappingsResponse;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.MappingMetadata;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.xcontent.DeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
+import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.sql.data.model.ExprIntegerValue;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
 import org.opensearch.sql.opensearch.mapping.IndexMapping;
+import org.opensearch.sql.opensearch.request.OpenSearchRequest;
 import org.opensearch.sql.opensearch.request.OpenSearchScrollRequest;
 import org.opensearch.sql.opensearch.response.OpenSearchResponse;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class OpenSearchRestClientTest {
 
   private static final String TEST_MAPPING_FILE = "mappings/accounts.json";
@@ -72,17 +84,14 @@ class OpenSearchRestClientTest {
 
   private OpenSearchClient client;
 
-  @Mock
-  private OpenSearchExprValueFactory factory;
+  @Mock private OpenSearchExprValueFactory factory;
 
-  @Mock
-  private SearchHit searchHit;
+  @Mock private SearchHit searchHit;
 
-  @Mock
-  private GetIndexResponse getIndexResponse;
+  @Mock private GetIndexResponse getIndexResponse;
 
-  private ExprTupleValue exprTupleValue = ExprTupleValue.fromExprValueMap(ImmutableMap.of("id",
-      new ExprIntegerValue(1)));
+  private final ExprTupleValue exprTupleValue =
+      ExprTupleValue.fromExprValueMap(Map.of("id", new ExprIntegerValue(1)));
 
   @BeforeEach
   void setUp() {
@@ -90,53 +99,50 @@ void setUp() {
   }
 
   @Test
-  void isIndexExist() throws IOException {
-    when(restClient.indices()
-        .exists(any(), any())) // use any() because missing equals() in GetIndexRequest
+  void is_index_exist() throws IOException {
+    when(restClient
+            .indices()
+            .exists(any(), any())) // use any() because missing equals() in GetIndexRequest
         .thenReturn(true);
 
     assertTrue(client.exists("test"));
   }
 
   @Test
-  void isIndexNotExist() throws IOException {
-    when(restClient.indices()
-        .exists(any(), any())) // use any() because missing equals() in GetIndexRequest
+  void is_index_not_exist() throws IOException {
+    when(restClient
+            .indices()
+            .exists(any(), any())) // use any() because missing equals() in GetIndexRequest
         .thenReturn(false);
 
     assertFalse(client.exists("test"));
   }
 
   @Test
-  void isIndexExistWithException() throws IOException {
+  void is_index_exist_with_exception() throws IOException {
     when(restClient.indices().exists(any(), any())).thenThrow(IOException.class);
 
     assertThrows(IllegalStateException.class, () -> client.exists("test"));
   }
 
   @Test
-  void createIndex() throws IOException {
+  void create_index() throws IOException {
     String indexName = "test";
-    Map<String, Object> mappings = ImmutableMap.of(
-        "properties",
-        ImmutableMap.of("name", "text"));
-    when(restClient.indices()
-        .create(any(), any()))
+    Map<String, Object> mappings = ImmutableMap.of("properties", ImmutableMap.of("name", "text"));
+    when(restClient.indices().create(any(), any()))
         .thenReturn(new CreateIndexResponse(true, true, indexName));
 
     client.createIndex(indexName, mappings);
   }
 
   @Test
-  void createIndexWithIOException() throws IOException {
+  void create_index_with_IOException() throws IOException {
     when(restClient.indices().create(any(), any())).thenThrow(IOException.class);
-
-    assertThrows(IllegalStateException.class,
-        () -> client.createIndex("test", ImmutableMap.of()));
+    assertThrows(IllegalStateException.class, () -> client.createIndex("test", ImmutableMap.of()));
   }
 
   @Test
-  void getIndexMappings() throws IOException {
+  void get_index_mappings() throws IOException {
     URL url = Resources.getResource(TEST_MAPPING_FILE);
     String mappings = Resources.toString(url, Charsets.UTF_8);
     String indexName = "test";
@@ -147,51 +153,86 @@ void getIndexMappings() throws IOException {
         .thenReturn(response);
 
     Map<String, IndexMapping> indexMappings = client.getIndexMappings(indexName);
-    assertEquals(1, indexMappings.size());
-
-    IndexMapping indexMapping = indexMappings.values().iterator().next();
-    assertEquals(18, indexMapping.size());
-    assertEquals("text", indexMapping.getFieldType("address"));
-    assertEquals("integer", indexMapping.getFieldType("age"));
-    assertEquals("double", indexMapping.getFieldType("balance"));
-    assertEquals("keyword", indexMapping.getFieldType("city"));
-    assertEquals("date", indexMapping.getFieldType("birthday"));
-    assertEquals("geo_point", indexMapping.getFieldType("location"));
-    assertEquals("some_new_es_type_outside_type_system", indexMapping.getFieldType("new_field"));
-    assertEquals("text", indexMapping.getFieldType("field with spaces"));
-    assertEquals("text_keyword", indexMapping.getFieldType("employer"));
-    assertEquals("nested", indexMapping.getFieldType("projects"));
-    assertEquals("boolean", indexMapping.getFieldType("projects.active"));
-    assertEquals("date", indexMapping.getFieldType("projects.release"));
-    assertEquals("nested", indexMapping.getFieldType("projects.members"));
-    assertEquals("text", indexMapping.getFieldType("projects.members.name"));
-    assertEquals("object", indexMapping.getFieldType("manager"));
-    assertEquals("text_keyword", indexMapping.getFieldType("manager.name"));
-    assertEquals("keyword", indexMapping.getFieldType("manager.address"));
-    assertEquals("long", indexMapping.getFieldType("manager.salary"));
+
+    var mapping = indexMappings.values().iterator().next().getFieldMappings();
+    var parsedTypes = OpenSearchDataType.traverseAndFlatten(mapping);
+    assertAll(
+        () -> assertEquals(1, indexMappings.size()),
+        // 10 types extended to 17 after flattening
+        () -> assertEquals(10, mapping.size()),
+        () -> assertEquals(17, parsedTypes.size()),
+        () -> assertEquals("TEXT", mapping.get("address").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Text), parsedTypes.get("address")),
+        () -> assertEquals("INTEGER", mapping.get("age").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Integer), parsedTypes.get("age")),
+        () -> assertEquals("DOUBLE", mapping.get("balance").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Double), parsedTypes.get("balance")),
+        () -> assertEquals("KEYWORD", mapping.get("city").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Keyword), parsedTypes.get("city")),
+        () -> assertEquals("TIMESTAMP", mapping.get("birthday").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Date), parsedTypes.get("birthday")),
+        () -> assertEquals("GEO_POINT", mapping.get("location").legacyTypeName()),
+        () ->
+            assertEquals(OpenSearchTextType.of(MappingType.GeoPoint), parsedTypes.get("location")),
+        // unknown type isn't parsed and ignored
+        () -> assertFalse(mapping.containsKey("new_field")),
+        () -> assertNull(parsedTypes.get("new_field")),
+        () -> assertEquals("TEXT", mapping.get("field with spaces").legacyTypeName()),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Text), parsedTypes.get("field with spaces")),
+        () -> assertEquals("TEXT", mapping.get("employer").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Text), parsedTypes.get("employer")),
+        // `employer` is a `text` with `fields`
+        () -> assertTrue(((OpenSearchTextType) parsedTypes.get("employer")).getFields().size() > 0),
+        () -> assertEquals("NESTED", mapping.get("projects").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Nested), parsedTypes.get("projects")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Boolean), parsedTypes.get("projects.active")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Date), parsedTypes.get("projects.release")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Nested), parsedTypes.get("projects.members")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Text), parsedTypes.get("projects.members.name")),
+        () -> assertEquals("OBJECT", mapping.get("manager").legacyTypeName()),
+        () -> assertEquals(OpenSearchTextType.of(MappingType.Object), parsedTypes.get("manager")),
+        () ->
+            assertEquals(OpenSearchTextType.of(MappingType.Text), parsedTypes.get("manager.name")),
+        // `manager.name` is a `text` with `fields`
+        () ->
+            assertTrue(
+                ((OpenSearchTextType) parsedTypes.get("manager.name")).getFields().size() > 0),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Keyword), parsedTypes.get("manager.address")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(MappingType.Long), parsedTypes.get("manager.salary")));
   }
 
   @Test
-  void getIndexMappingsWithIOException() throws IOException {
+  void get_index_mappings_with_IOException() throws IOException {
     when(restClient.indices().getMapping(any(GetMappingsRequest.class), any()))
         .thenThrow(new IOException());
     assertThrows(IllegalStateException.class, () -> client.getIndexMappings("test"));
   }
 
   @Test
-  void getIndexMaxResultWindowsSettings() throws IOException {
+  void get_index_max_result_windows_settings() throws IOException {
     String indexName = "test";
     Integer maxResultWindow = 1000;
 
     GetSettingsResponse response = mock(GetSettingsResponse.class);
-    Settings maxResultWindowSettings = Settings.builder()
-        .put("index.max_result_window", maxResultWindow)
-        .build();
+    Settings maxResultWindowSettings =
+        Settings.builder().put("index.max_result_window", maxResultWindow).build();
     Settings emptySettings = Settings.builder().build();
-    ImmutableOpenMap<String, Settings> indexToSettings =
-        mockSettings(indexName, maxResultWindowSettings);
-    ImmutableOpenMap<String, Settings> indexToDefaultSettings =
-        mockSettings(indexName, emptySettings);
+    Map<String, Settings> indexToSettings = mockSettings(indexName, maxResultWindowSettings);
+    Map<String, Settings> indexToDefaultSettings = mockSettings(indexName, emptySettings);
     when(response.getIndexToSettings()).thenReturn(indexToSettings);
     when(response.getIndexToDefaultSettings()).thenReturn(indexToDefaultSettings);
     when(restClient.indices().getSettings(any(GetSettingsRequest.class), any()))
@@ -203,19 +244,16 @@ void getIndexMaxResultWindowsSettings() throws IOException {
   }
 
   @Test
-  void getIndexMaxResultWindowsDefaultSettings() throws IOException {
+  void get_index_max_result_windows_default_settings() throws IOException {
     String indexName = "test";
     Integer maxResultWindow = 10000;
 
     GetSettingsResponse response = mock(GetSettingsResponse.class);
-    Settings maxResultWindowSettings = Settings.builder()
-        .put("index.max_result_window", maxResultWindow)
-        .build();
+    Settings maxResultWindowSettings =
+        Settings.builder().put("index.max_result_window", maxResultWindow).build();
     Settings emptySettings = Settings.builder().build();
-    ImmutableOpenMap<String, Settings> indexToSettings =
-        mockSettings(indexName, emptySettings);
-    ImmutableOpenMap<String, Settings> indexToDefaultSettings =
-        mockSettings(indexName, maxResultWindowSettings);
+    Map<String, Settings> indexToSettings = mockSettings(indexName, emptySettings);
+    Map<String, Settings> indexToDefaultSettings = mockSettings(indexName, maxResultWindowSettings);
     when(response.getIndexToSettings()).thenReturn(indexToSettings);
     when(response.getIndexToDefaultSettings()).thenReturn(indexToDefaultSettings);
     when(restClient.indices().getSettings(any(GetSettingsRequest.class), any()))
@@ -227,7 +265,7 @@ void getIndexMaxResultWindowsDefaultSettings() throws IOException {
   }
 
   @Test
-  void getIndexMaxResultWindowsWithIOException() throws IOException {
+  void get_index_max_result_windows_with_IOException() throws IOException {
     when(restClient.indices().getSettings(any(GetSettingsRequest.class), any()))
         .thenThrow(new IOException());
     assertThrows(IllegalStateException.class, () -> client.getIndexMaxResultWindows("test"));
@@ -242,43 +280,55 @@ void search() throws IOException {
     when(searchResponse.getHits())
         .thenReturn(
             new SearchHits(
-                new SearchHit[] {searchHit},
-                new TotalHits(1L, TotalHits.Relation.EQUAL_TO),
-                1.0F));
+                new SearchHit[] {searchHit}, new TotalHits(1L, TotalHits.Relation.EQUAL_TO), 1.0F));
     when(searchHit.getSourceAsString()).thenReturn("{\"id\", 1}");
-    when(factory.construct(any())).thenReturn(exprTupleValue);
+    when(searchHit.getInnerHits()).thenReturn(null);
+    when(factory.construct(any(), anyBoolean())).thenReturn(exprTupleValue);
 
     // Mock second scroll request followed
     SearchResponse scrollResponse = mock(SearchResponse.class);
     when(restClient.scroll(any(), any())).thenReturn(scrollResponse);
-    when(scrollResponse.getScrollId()).thenReturn("scroll456");
     when(scrollResponse.getHits()).thenReturn(SearchHits.empty());
 
     // Verify response for first scroll request
-    OpenSearchScrollRequest request = new OpenSearchScrollRequest("test", factory);
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            new SearchSourceBuilder(),
+            factory,
+            List.of("id"));
     OpenSearchResponse response1 = client.search(request);
     assertFalse(response1.isEmpty());
 
     Iterator<ExprValue> hits = response1.iterator();
     assertTrue(hits.hasNext());
-    assertEquals(exprTupleValue, hits.next());
+    assertEquals(exprTupleValue.tupleValue().get("id"), hits.next().tupleValue().get("id"));
     assertFalse(hits.hasNext());
 
     // Verify response for second scroll request
+    request.setScrollId("scroll123");
     OpenSearchResponse response2 = client.search(request);
     assertTrue(response2.isEmpty());
   }
 
   @Test
-  void searchWithIOException() throws IOException {
+  void search_with_IOException() throws IOException {
     when(restClient.search(any(), any())).thenThrow(new IOException());
     assertThrows(
         IllegalStateException.class,
-        () -> client.search(new OpenSearchScrollRequest("test", factory)));
+        () ->
+            client.search(
+                new OpenSearchScrollRequest(
+                    new OpenSearchRequest.IndexName("test"),
+                    TimeValue.timeValueMinutes(1),
+                    new SearchSourceBuilder(),
+                    factory,
+                    List.of())));
   }
 
   @Test
-  void scrollWithIOException() throws IOException {
+  void scroll_with_IOException() throws IOException {
     // Mock first scroll request
     SearchResponse searchResponse = mock(SearchResponse.class);
     when(restClient.search(any(), any())).thenReturn(searchResponse);
@@ -294,49 +344,75 @@ void scrollWithIOException() throws IOException {
     when(restClient.scroll(any(), any())).thenThrow(new IOException());
 
     // First request run successfully
-    OpenSearchScrollRequest scrollRequest = new OpenSearchScrollRequest("test", factory);
+    OpenSearchScrollRequest scrollRequest =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            new SearchSourceBuilder(),
+            factory,
+            List.of());
     client.search(scrollRequest);
-    assertThrows(
-        IllegalStateException.class, () -> client.search(scrollRequest));
+    assertThrows(IllegalStateException.class, () -> client.search(scrollRequest));
   }
 
   @Test
   void schedule() {
     AtomicBoolean isRun = new AtomicBoolean(false);
-    client.schedule(
-        () -> {
-          isRun.set(true);
-        });
+    client.schedule(() -> isRun.set(true));
     assertTrue(isRun.get());
   }
 
   @Test
-  void cleanup() throws IOException {
-    OpenSearchScrollRequest request = new OpenSearchScrollRequest("test", factory);
+  @SneakyThrows
+  void cleanup() {
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            new SearchSourceBuilder(),
+            factory,
+            List.of());
+    // Enforce cleaning by setting a private field.
+    FieldUtils.writeField(request, "needClean", true, true);
     request.setScrollId("scroll123");
     client.cleanup(request);
     verify(restClient).clearScroll(any(), any());
-    assertFalse(request.isScrollStarted());
+    assertFalse(request.isScroll());
   }
 
   @Test
-  void cleanupWithoutScrollId() throws IOException {
-    OpenSearchScrollRequest request = new OpenSearchScrollRequest("test", factory);
+  void cleanup_without_scrollId() throws IOException {
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            new SearchSourceBuilder(),
+            factory,
+            List.of());
     client.cleanup(request);
     verify(restClient, never()).clearScroll(any(), any());
   }
 
   @Test
-  void cleanupWithIOException() throws IOException {
+  @SneakyThrows
+  void cleanup_with_IOException() {
     when(restClient.clearScroll(any(), any())).thenThrow(new IOException());
 
-    OpenSearchScrollRequest request = new OpenSearchScrollRequest("test", factory);
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            new SearchSourceBuilder(),
+            factory,
+            List.of());
+    // Enforce cleaning by setting a private field.
+    FieldUtils.writeField(request, "needClean", true, true);
     request.setScrollId("scroll123");
     assertThrows(IllegalStateException.class, () -> client.cleanup(request));
   }
 
   @Test
-  void getIndices() throws IOException {
+  void get_indices() throws IOException {
     when(restClient.indices().get(any(GetIndexRequest.class), any(RequestOptions.class)))
         .thenReturn(getIndexResponse);
     when(getIndexResponse.getIndices()).thenReturn(new String[] {"index"});
@@ -346,7 +422,7 @@ void getIndices() throws IOException {
   }
 
   @Test
-  void getIndicesWithIOException() throws IOException {
+  void get_indices_with_IOException() throws IOException {
     when(restClient.indices().get(any(GetIndexRequest.class), any(RequestOptions.class)))
         .thenThrow(new IOException());
     assertThrows(IllegalStateException.class, () -> client.indices());
@@ -365,7 +441,7 @@ void meta() throws IOException {
   }
 
   @Test
-  void metaWithIOException() throws IOException {
+  void meta_with_IOException() throws IOException {
     when(restClient.cluster().getSettings(any(), any(RequestOptions.class)))
         .thenThrow(new IOException());
 
@@ -373,7 +449,7 @@ void metaWithIOException() throws IOException {
   }
 
   @Test
-  void mlWithException() {
+  void ml_with_exception() {
     assertThrows(UnsupportedOperationException.class, () -> client.getNodeClient());
   }
 
@@ -382,10 +458,8 @@ private Map<String, MappingMetadata> mockFieldMappings(String indexName, String
     return ImmutableMap.of(indexName, IndexMetadata.fromXContent(createParser(mappings)).mapping());
   }
 
-  private ImmutableOpenMap<String, Settings> mockSettings(String indexName, Settings settings) {
-    ImmutableOpenMap.Builder<String, Settings> indexToSettingsBuilder = ImmutableOpenMap.builder();
-    indexToSettingsBuilder.put(indexName, settings);
-    return indexToSettingsBuilder.build();
+  private Map<String, Settings> mockSettings(String indexName, Settings settings) {
+    return Map.of(indexName, settings);
   }
 
   private XContentParser createParser(String mappings) throws IOException {
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataTypeRecognitionTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataTypeRecognitionTest.java
index 22ccff9d25..35ad6b7ea6 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataTypeRecognitionTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataTypeRecognitionTest.java
@@ -7,38 +7,50 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Map;
 import java.util.stream.Stream;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprBinaryValue;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprGeoPointValue;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprIpValue;
-import org.opensearch.sql.opensearch.data.value.OpenSearchExprTextKeywordValue;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprTextValue;
 
 public class OpenSearchDataTypeRecognitionTest {
 
-  @ParameterizedTest
+  @ParameterizedTest(name = "{2}")
   @MethodSource("types")
-  public void typeof(String expected, ExprValue value) {
+  public void typeof(String expected, ExprValue value, String testName) {
     assertEquals(expected, typeofGetValue(value));
   }
 
   private static Stream<Arguments> types() {
-    // TODO: OPENSEARCH_ARRAY and new types
+    // TODO: ARRAY and new types
     return Stream.of(
-        Arguments.of("OPENSEARCH_TEXT", new OpenSearchExprTextValue("A")),
-        Arguments.of("OPENSEARCH_BINARY", new OpenSearchExprBinaryValue("A")),
-        Arguments.of("OPENSEARCH_IP", new OpenSearchExprIpValue("A")),
-        Arguments.of("OPENSEARCH_TEXT_KEYWORD", new OpenSearchExprTextKeywordValue("A")),
-        Arguments.of("OPENSEARCH_GEO_POINT", new OpenSearchExprGeoPointValue(0d, 0d))
-    );
+        Arguments.of("TEXT", new OpenSearchExprTextValue("A"), "text without fields"),
+        Arguments.of("BINARY", new OpenSearchExprBinaryValue("A"), "binary"),
+        Arguments.of("IP", new OpenSearchExprIpValue("A"), "ip"),
+        Arguments.of("TEXT", new TestTextWithFieldValue("Hello World"), "text with fields"),
+        Arguments.of("GEO_POINT", new OpenSearchExprGeoPointValue(0d, 0d), "geo point"));
   }
 
   private String typeofGetValue(ExprValue input) {
     return DSL.typeof(DSL.literal(input)).valueOf().stringValue();
   }
+
+  static class TestTextWithFieldValue extends OpenSearchExprTextValue {
+    public TestTextWithFieldValue(String value) {
+      super(value);
+    }
+
+    @Override
+    public ExprType type() {
+      return OpenSearchTextType.of(
+          Map.of("words", OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword)));
+    }
+  }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataTypeTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataTypeTest.java
index 57bfcd1ea8..76fbbd6e65 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataTypeTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDataTypeTest.java
@@ -3,65 +3,432 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.type;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.opensearch.sql.data.type.ExprCoreType.ARRAY;
+import static org.opensearch.sql.data.type.ExprCoreType.BOOLEAN;
+import static org.opensearch.sql.data.type.ExprCoreType.BYTE;
+import static org.opensearch.sql.data.type.ExprCoreType.DATE;
 import static org.opensearch.sql.data.type.ExprCoreType.DOUBLE;
 import static org.opensearch.sql.data.type.ExprCoreType.FLOAT;
+import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+import static org.opensearch.sql.data.type.ExprCoreType.LONG;
+import static org.opensearch.sql.data.type.ExprCoreType.SHORT;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
+import static org.opensearch.sql.data.type.ExprCoreType.UNKNOWN;
+import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.MappingType;
 
+import java.util.Map;
+import java.util.stream.Stream;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.data.type.ExprType;
 
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class OpenSearchDataTypeTest {
+
+  private static final OpenSearchDataType textType = OpenSearchDataType.of(MappingType.Text);
+  private static final OpenSearchDataType textKeywordType =
+      OpenSearchTextType.of(Map.of("words", OpenSearchTextType.of(MappingType.Keyword)));
+
+  private static final String emptyFormatString = "";
+
+  private static final OpenSearchDateType dateType = OpenSearchDateType.of(emptyFormatString);
+
   @Test
-  public void testIsCompatible() {
-    assertTrue(STRING.isCompatible(OPENSEARCH_TEXT));
-    assertFalse(OPENSEARCH_TEXT.isCompatible(STRING));
+  public void isCompatible() {
+    assertTrue(STRING.isCompatible(textType));
+    assertFalse(textType.isCompatible(STRING));
 
-    assertTrue(STRING.isCompatible(OPENSEARCH_TEXT_KEYWORD));
-    assertTrue(OPENSEARCH_TEXT.isCompatible(OPENSEARCH_TEXT_KEYWORD));
+    assertTrue(STRING.isCompatible(textKeywordType));
+    assertTrue(textType.isCompatible(textKeywordType));
   }
 
+  // `typeName` and `legacyTypeName` return different things:
+  // https://github.com/opensearch-project/sql/issues/1296
   @Test
-  public void testTypeName() {
-    assertEquals("string", OPENSEARCH_TEXT.typeName());
-    assertEquals("string", OPENSEARCH_TEXT_KEYWORD.typeName());
+  public void typeName() {
+    assertEquals("STRING", textType.typeName());
+    assertEquals("STRING", textKeywordType.typeName());
+    assertEquals("OBJECT", OpenSearchDataType.of(MappingType.Object).typeName());
+    assertEquals("TIMESTAMP", OpenSearchDataType.of(MappingType.Date).typeName());
+    assertEquals("DOUBLE", OpenSearchDataType.of(MappingType.Double).typeName());
+    assertEquals("KEYWORD", OpenSearchDataType.of(MappingType.Keyword).typeName());
   }
 
   @Test
   public void legacyTypeName() {
-    assertEquals("text", OPENSEARCH_TEXT.legacyTypeName());
-    assertEquals("text", OPENSEARCH_TEXT_KEYWORD.legacyTypeName());
+    assertEquals("TEXT", textType.legacyTypeName());
+    assertEquals("TEXT", textKeywordType.legacyTypeName());
+    assertEquals("OBJECT", OpenSearchDataType.of(MappingType.Object).legacyTypeName());
+    assertEquals("TIMESTAMP", OpenSearchDataType.of(MappingType.Date).legacyTypeName());
+    assertEquals("DOUBLE", OpenSearchDataType.of(MappingType.Double).legacyTypeName());
+    assertEquals("KEYWORD", OpenSearchDataType.of(MappingType.Keyword).legacyTypeName());
   }
 
   @Test
-  public void testShouldCast() {
-    assertFalse(OPENSEARCH_TEXT.shouldCast(STRING));
-    assertFalse(OPENSEARCH_TEXT_KEYWORD.shouldCast(STRING));
+  public void shouldCast() {
+    assertFalse(textType.shouldCast(STRING));
+    assertFalse(textKeywordType.shouldCast(STRING));
+  }
+
+  private static Stream<Arguments> getTestDataWithType() {
+    return Stream.of(
+        Arguments.of(MappingType.Text, "text", OpenSearchTextType.of()),
+        Arguments.of(MappingType.Keyword, "keyword", STRING),
+        Arguments.of(MappingType.Byte, "byte", BYTE),
+        Arguments.of(MappingType.Short, "short", SHORT),
+        Arguments.of(MappingType.Integer, "integer", INTEGER),
+        Arguments.of(MappingType.Long, "long", LONG),
+        Arguments.of(MappingType.HalfFloat, "half_float", FLOAT),
+        Arguments.of(MappingType.Float, "float", FLOAT),
+        Arguments.of(MappingType.ScaledFloat, "scaled_float", DOUBLE),
+        Arguments.of(MappingType.Double, "double", DOUBLE),
+        Arguments.of(MappingType.Boolean, "boolean", BOOLEAN),
+        Arguments.of(MappingType.Date, "timestamp", TIMESTAMP),
+        Arguments.of(MappingType.DateNanos, "timestamp", TIMESTAMP),
+        Arguments.of(MappingType.Object, "object", STRUCT),
+        Arguments.of(MappingType.Nested, "nested", ARRAY),
+        Arguments.of(MappingType.GeoPoint, "geo_point", OpenSearchGeoPointType.of()),
+        Arguments.of(MappingType.Binary, "binary", OpenSearchBinaryType.of()),
+        Arguments.of(MappingType.Ip, "ip", OpenSearchIpType.of()));
+  }
+
+  @ParameterizedTest(name = "{1}")
+  @MethodSource("getTestDataWithType")
+  public void of_MappingType(MappingType mappingType, String name, ExprType dataType) {
+    var type = OpenSearchDataType.of(mappingType);
+    // For serialization of SQL and PPL different functions are used, and it was designed to return
+    // different types. No clue why, but it should be fixed in #1296.
+    var nameForSQL = name.toUpperCase();
+    var nameForPPL = name.equals("text") ? "STRING" : name.toUpperCase();
+    assertAll(
+        () -> assertEquals(nameForPPL, type.typeName()),
+        () -> assertEquals(nameForSQL, type.legacyTypeName()),
+        () -> {
+          if (dataType == ExprCoreType.TIMESTAMP
+              || dataType == ExprCoreType.DATE
+              || dataType == ExprCoreType.TIME) {
+            assertEquals(dataType, type.getExprCoreType());
+          } else {
+            assertEquals(dataType, type.getExprType());
+          }
+        });
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @EnumSource(ExprCoreType.class)
+  public void of_ExprCoreType(ExprCoreType coreType) {
+    assumeFalse(coreType == UNKNOWN);
+    var type = OpenSearchDataType.of(coreType);
+    if (type instanceof OpenSearchDateType) {
+      assertEquals(coreType, type.getExprCoreType());
+    } else {
+      assertEquals(coreType.toString(), type.typeName());
+      assertEquals(coreType.toString(), type.legacyTypeName());
+      assertEquals(coreType, type.getExprType());
+    }
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @EnumSource(ExprCoreType.class)
+  public void of_OpenSearchDataType_from_ExprCoreType(ExprCoreType coreType) {
+    var type = OpenSearchDataType.of(coreType);
+    var derivedType = OpenSearchDataType.of(type);
+    assertEquals(type, derivedType);
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @EnumSource(MappingType.class)
+  public void of_OpenSearchDataType_from_MappingType(OpenSearchDataType.MappingType mappingType) {
+    assumeFalse(mappingType == MappingType.Invalid);
+    var type = OpenSearchDataType.of(mappingType);
+    var derivedType = OpenSearchDataType.of(type);
+    assertEquals(type, derivedType);
+  }
+
+  @Test
+  // All types without `fields` and `properties` are singletones unless cloned.
+  public void types_but_clones_are_singletons_and_cached() {
+    var type = OpenSearchDataType.of(MappingType.Object);
+    var alsoType = OpenSearchDataType.of(MappingType.Object);
+    Map<String, Object> properties =
+        Map.of("properties", Map.of("number", Map.of("type", "integer")));
+    var typeWithProperties = OpenSearchDataType.of(MappingType.Object, properties);
+    var typeWithFields = OpenSearchDataType.of(MappingType.Text, Map.of());
+    var cloneType = type.cloneEmpty();
+
+    assertAll(
+        () -> assertSame(type, alsoType),
+        () -> assertNotSame(type, cloneType),
+        () -> assertNotSame(type, typeWithProperties),
+        () -> assertNotSame(type, typeWithFields),
+        () -> assertNotSame(typeWithProperties, typeWithProperties.cloneEmpty()),
+        () -> assertNotSame(typeWithFields, typeWithFields.cloneEmpty()),
+        () -> assertNotSame(dateType, dateType.cloneEmpty()),
+        () -> assertSame(OpenSearchDataType.of(MappingType.Text), OpenSearchTextType.of()),
+        () -> assertSame(OpenSearchDataType.of(MappingType.Binary), OpenSearchBinaryType.of()),
+        () -> assertSame(OpenSearchDataType.of(MappingType.GeoPoint), OpenSearchGeoPointType.of()),
+        () -> assertSame(OpenSearchDataType.of(MappingType.Ip), OpenSearchIpType.of()),
+        () ->
+            assertNotSame(
+                OpenSearchTextType.of(),
+                OpenSearchTextType.of(Map.of("properties", OpenSearchDataType.of(INTEGER)))),
+        () -> assertSame(OpenSearchDataType.of(INTEGER), OpenSearchDataType.of(INTEGER)),
+        () -> assertSame(OpenSearchDataType.of(STRING), OpenSearchDataType.of(STRING)),
+        () -> assertSame(OpenSearchDataType.of(STRUCT), OpenSearchDataType.of(STRUCT)),
+        () ->
+            assertNotSame(
+                OpenSearchDataType.of(INTEGER), OpenSearchDataType.of(INTEGER).cloneEmpty()));
+  }
+
+  @Test
+  // Use OpenSearchDataType.of(type, properties, fields) or OpenSearchTextType.of(fields)
+  // to create a new type object with required parameters. Types are immutable, even clones.
+  public void fields_and_properties_are_readonly() {
+    var objectType = OpenSearchDataType.of(MappingType.Object);
+    var textType = OpenSearchTextType.of();
+    var textTypeWithFields =
+        OpenSearchTextType.of(Map.of("letters", OpenSearchDataType.of(MappingType.Keyword)));
+    assertAll(
+        () ->
+            assertThrows(
+                UnsupportedOperationException.class,
+                () -> objectType.getProperties().put("something", OpenSearchDataType.of(INTEGER))),
+        () ->
+            assertThrows(
+                UnsupportedOperationException.class,
+                () ->
+                    textType.getFields().put("words", OpenSearchDataType.of(MappingType.Keyword))),
+        () ->
+            assertThrows(
+                UnsupportedOperationException.class,
+                () ->
+                    textTypeWithFields
+                        .getFields()
+                        .put("words", OpenSearchDataType.of(MappingType.Keyword))));
+  }
+
+  @Test
+  // Test and type added for coverage only
+  public void of_null_MappingType() {
+    assertNotNull(OpenSearchDataType.of(MappingType.Invalid));
+  }
+
+  @Test
+  // cloneEmpty doesn't clone properties and fields.
+  // Fields are cloned by OpenSearchTextType::cloneEmpty, because it is used in that type only.
+  public void cloneEmpty() {
+    var type =
+        OpenSearchDataType.of(MappingType.Object, Map.of("val", OpenSearchDataType.of(INTEGER)));
+    var clone = type.cloneEmpty();
+    var textClone = textKeywordType.cloneEmpty();
+
+    assertAll(
+        // can compare because `properties` and `fields` are marked as @EqualsAndHashCode.Exclude
+        () -> assertEquals(type, clone),
+        () -> assertTrue(clone.getProperties().isEmpty()),
+        () -> assertEquals(textKeywordType, textClone),
+        () ->
+            assertEquals(
+                FieldUtils.readField(textKeywordType, "fields", true),
+                FieldUtils.readField(textClone, "fields", true)));
+  }
+
+  // Following structure of nested objects should be flattened
+  // =====================
+  // type
+  //    |- subtype
+  //    |        |
+  //    |        |- subsubtype
+  //    |        |           |
+  //    |        |           |- textWithKeywordType
+  //    |        |           |                    |- keyword
+  //    |        |           |
+  //    |        |           |- INTEGER
+  //    |        |
+  //    |        |- GeoPoint
+  //    |        |- textWithFieldsType
+  //    |                            |- words
+  //    |
+  //    |- text
+  //    |- keyword
+  // =================
+  // as
+  // =================
+  // mapping : Object
+  // mapping.submapping : Object
+  // mapping.submapping.subsubmapping : Object
+  // mapping.submapping.subsubmapping.textWithKeywordType : Text
+  //                                           |- keyword : Keyword
+  // mapping.submapping.subsubmapping.INTEGER : INTEGER
+  // mapping.submapping.geo_point : GeoPoint
+  // mapping.submapping.textWithFieldsType: Text
+  //                               |- words : Keyword
+  // mapping.text : Text
+  // mapping.keyword : Keyword
+  // ==================
+  // Objects are flattened by OpenSearch, but Texts aren't
+  // TODO Arrays
+  @Test
+  public void traverseAndFlatten() {
+    var flattened = OpenSearchDataType.traverseAndFlatten(getSampleMapping());
+    var objectType = OpenSearchDataType.of(MappingType.Object);
+    assertAll(
+        () -> assertEquals(9, flattened.size()),
+        () -> assertTrue(flattened.get("mapping").getProperties().isEmpty()),
+        () -> assertTrue(flattened.get("mapping.submapping").getProperties().isEmpty()),
+        () ->
+            assertTrue(flattened.get("mapping.submapping.subsubmapping").getProperties().isEmpty()),
+        () -> assertEquals(objectType, flattened.get("mapping")),
+        () -> assertEquals(objectType, flattened.get("mapping.submapping")),
+        () -> assertEquals(objectType, flattened.get("mapping.submapping.subsubmapping")),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(MappingType.Keyword), flattened.get("mapping.keyword")),
+        () -> assertEquals(OpenSearchDataType.of(MappingType.Text), flattened.get("mapping.text")),
+        () ->
+            assertEquals(
+                OpenSearchGeoPointType.of(), flattened.get("mapping.submapping.geo_point")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(), flattened.get("mapping.submapping.textWithFieldsType")),
+        () ->
+            assertEquals(
+                OpenSearchTextType.of(),
+                flattened.get("mapping.submapping.subsubmapping.texttype")),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(INTEGER),
+                flattened.get("mapping.submapping.subsubmapping.INTEGER")));
+  }
+
+  @Test
+  public void resolve() {
+    var mapping = getSampleMapping();
+
+    assertAll(
+        () -> assertNull(OpenSearchDataType.resolve(mapping, "incorrect")),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(MappingType.Object),
+                OpenSearchDataType.resolve(mapping, "mapping")),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(MappingType.Object),
+                OpenSearchDataType.resolve(mapping, "submapping")),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(MappingType.Object),
+                OpenSearchDataType.resolve(mapping, "subsubmapping")),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(MappingType.Text),
+                OpenSearchDataType.resolve(mapping, "texttype")),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(MappingType.Text),
+                OpenSearchDataType.resolve(mapping, "textWithFieldsType")),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(MappingType.Text),
+                OpenSearchDataType.resolve(mapping, "text")),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(MappingType.Integer),
+                OpenSearchDataType.resolve(mapping, "INTEGER")),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(MappingType.GeoPoint),
+                OpenSearchDataType.resolve(mapping, "geo_point")),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(MappingType.Keyword),
+                OpenSearchDataType.resolve(mapping, "keyword")));
+  }
+
+  // type : Object
+  // type.subtype : Object
+  // type.subtype.subsubtype : Object
+  // type.subtype.subsubtype.textWithKeywordType : Text
+  //                                           |- keyword : Keyword
+  // type.subtype.subsubtype.INTEGER : INTEGER
+  // type.subtype.geo_point : GeoPoint
+  // type.subtype.textWithFieldsType: Text
+  //                               |- words : Keyword
+  // type.text : Text
+  // type.keyword : Keyword
+
+  @Test
+  public void text_type_with_fields_ctor() {
+    var type = OpenSearchTextType.of(Map.of("words", OpenSearchDataType.of(MappingType.Keyword)));
+    assertAll(
+        () -> assertEquals(OpenSearchTextType.of(), type),
+        () -> assertEquals(1, type.getFields().size()),
+        () ->
+            assertEquals(
+                OpenSearchDataType.of(MappingType.Keyword), type.getFields().get("words")));
+  }
+
+  private Map<String, OpenSearchDataType> getSampleMapping() {
+    Map<String, Object> subsubmapping =
+        Map.of(
+            "properties",
+            Map.of(
+                "texttype", Map.of("type", "text"),
+                "INTEGER", Map.of("type", "integer")));
+
+    Map<String, Object> submapping =
+        Map.of(
+            "properties",
+            Map.of(
+                "subsubmapping", subsubmapping,
+                "textWithFieldsType", Map.of("type", "text", "fieldsType", true),
+                "geo_point", Map.of("type", "geo_point")));
+
+    Map<String, Object> types =
+        Map.of(
+            "properties",
+            Map.of(
+                "submapping", submapping,
+                "keyword", Map.of("type", "keyword"),
+                "text", Map.of("type", "text")));
+
+    var mapping = OpenSearchDataType.of(MappingType.Object, types);
+    return Map.of("mapping", mapping);
   }
 
   @Test
-  public void testGetExprType() {
-    assertEquals(OPENSEARCH_TEXT, OpenSearchDataType.getExprType("text"));
-    assertEquals(FLOAT, OpenSearchDataType.getExprType("float"));
-    assertEquals(FLOAT, OpenSearchDataType.getExprType("half_float"));
-    assertEquals(DOUBLE, OpenSearchDataType.getExprType("double"));
-    assertEquals(DOUBLE, OpenSearchDataType.getExprType("scaled_float"));
-    assertEquals(TIMESTAMP, OpenSearchDataType.getExprType("date"));
-    assertEquals(TIMESTAMP, OpenSearchDataType.getExprType("date_nanos"));
+  public void test_getExprType() {
+    assertEquals(OpenSearchTextType.of(), OpenSearchDataType.of(MappingType.Text).getExprType());
+    assertEquals(FLOAT, OpenSearchDataType.of(MappingType.Float).getExprType());
+    assertEquals(FLOAT, OpenSearchDataType.of(MappingType.HalfFloat).getExprType());
+    assertEquals(DOUBLE, OpenSearchDataType.of(MappingType.Double).getExprType());
+    assertEquals(DOUBLE, OpenSearchDataType.of(MappingType.ScaledFloat).getExprType());
+    assertEquals(TIMESTAMP, OpenSearchDataType.of(MappingType.Date).getExprCoreType());
   }
 
   @Test
-  public void testGetOpenSearchType() {
-    assertEquals("text", OpenSearchDataType.getOpenSearchType(OPENSEARCH_TEXT));
-    assertEquals("float", OpenSearchDataType.getOpenSearchType(FLOAT));
-    assertEquals("double", OpenSearchDataType.getOpenSearchType(DOUBLE));
-    assertEquals("date", OpenSearchDataType.getOpenSearchType(TIMESTAMP));
+  public void test_shouldCastFunction() {
+    assertFalse(dateType.shouldCast(DATE));
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateTypeTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateTypeTest.java
new file mode 100644
index 0000000000..b4c1a65350
--- /dev/null
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchDateTypeTest.java
@@ -0,0 +1,444 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.data.type;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.opensearch.sql.data.type.ExprCoreType.DATE;
+import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
+import static org.opensearch.sql.data.type.ExprCoreType.TIME;
+import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
+import static org.opensearch.sql.opensearch.data.type.OpenSearchDateType.SUPPORTED_NAMED_DATETIME_FORMATS;
+import static org.opensearch.sql.opensearch.data.type.OpenSearchDateType.SUPPORTED_NAMED_DATE_FORMATS;
+import static org.opensearch.sql.opensearch.data.type.OpenSearchDateType.SUPPORTED_NAMED_INCOMPLETE_DATE_FORMATS;
+import static org.opensearch.sql.opensearch.data.type.OpenSearchDateType.SUPPORTED_NAMED_NUMERIC_FORMATS;
+import static org.opensearch.sql.opensearch.data.type.OpenSearchDateType.SUPPORTED_NAMED_TIME_FORMATS;
+import static org.opensearch.sql.opensearch.data.type.OpenSearchDateType.isDateTypeCompatible;
+
+import com.google.common.collect.Lists;
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opensearch.common.time.FormatNames;
+import org.opensearch.sql.data.type.ExprCoreType;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+class OpenSearchDateTypeTest {
+  private static final String defaultFormatString = "";
+
+  private static final String dateFormatString = "date";
+
+  private static final String timeFormatString = "hourMinuteSecond";
+
+  private static final String datetimeFormatString = "basic_date_time";
+
+  private static final OpenSearchDateType defaultDateType =
+      OpenSearchDateType.of(defaultFormatString);
+  private static final OpenSearchDateType dateDateType = OpenSearchDateType.of(dateFormatString);
+  private static final OpenSearchDateType timeDateType = OpenSearchDateType.of(timeFormatString);
+  private static final OpenSearchDateType datetimeDateType =
+      OpenSearchDateType.of(datetimeFormatString);
+
+  @Test
+  public void isCompatible() {
+    assertAll(
+        // timestamp types is compatible with all date-types
+        () -> assertTrue(TIMESTAMP.isCompatible(defaultDateType)),
+        () -> assertTrue(TIMESTAMP.isCompatible(dateDateType)),
+        () -> assertTrue(TIMESTAMP.isCompatible(timeDateType)),
+        () -> assertTrue(TIMESTAMP.isCompatible(datetimeDateType)),
+
+        // datetime
+        () -> assertFalse(DATETIME.isCompatible(defaultDateType)),
+        () -> assertTrue(DATETIME.isCompatible(dateDateType)),
+        () -> assertTrue(DATETIME.isCompatible(timeDateType)),
+        () -> assertFalse(DATETIME.isCompatible(datetimeDateType)),
+
+        // time type
+        () -> assertFalse(TIME.isCompatible(defaultDateType)),
+        () -> assertFalse(TIME.isCompatible(dateDateType)),
+        () -> assertTrue(TIME.isCompatible(timeDateType)),
+        () -> assertFalse(TIME.isCompatible(datetimeDateType)),
+
+        // date type
+        () -> assertFalse(DATE.isCompatible(defaultDateType)),
+        () -> assertTrue(DATE.isCompatible(dateDateType)),
+        () -> assertFalse(DATE.isCompatible(timeDateType)),
+        () -> assertFalse(DATE.isCompatible(datetimeDateType)));
+  }
+
+  // `typeName` and `legacyTypeName` return the same thing for date objects:
+  // https://github.com/opensearch-project/sql/issues/1296
+  @Test
+  public void check_typeName() {
+    assertAll(
+        // always use the MappingType of "DATE"
+        () -> assertEquals("TIMESTAMP", defaultDateType.typeName()),
+        () -> assertEquals("TIME", timeDateType.typeName()),
+        () -> assertEquals("DATE", dateDateType.typeName()));
+  }
+
+  @Test
+  public void check_legacyTypeName() {
+    assertAll(
+        // always use the legacy "DATE" type
+        () -> assertEquals("TIMESTAMP", defaultDateType.legacyTypeName()),
+        () -> assertEquals("TIME", timeDateType.legacyTypeName()),
+        () -> assertEquals("DATE", dateDateType.legacyTypeName()));
+  }
+
+  @Test
+  public void check_exprTypeName() {
+    assertAll(
+        () -> assertEquals(TIMESTAMP, defaultDateType.getExprCoreType()),
+        () -> assertEquals(TIME, timeDateType.getExprCoreType()),
+        () -> assertEquals(DATE, dateDateType.getExprCoreType()));
+  }
+
+  private static Stream<Arguments> getAllSupportedFormats() {
+    return EnumSet.allOf(FormatNames.class).stream().map(Arguments::of);
+  }
+
+  // Added RFC3339_LENIENT as a temporary fix.
+  // Issue: https://github.com/opensearch-project/sql/issues/2478
+  @ParameterizedTest
+  @MethodSource("getAllSupportedFormats")
+  public void check_supported_format_names_coverage(FormatNames formatName) {
+    assertTrue(
+        SUPPORTED_NAMED_NUMERIC_FORMATS.contains(formatName)
+            || SUPPORTED_NAMED_DATETIME_FORMATS.contains(formatName)
+            || SUPPORTED_NAMED_DATE_FORMATS.contains(formatName)
+            || SUPPORTED_NAMED_TIME_FORMATS.contains(formatName)
+            || SUPPORTED_NAMED_INCOMPLETE_DATE_FORMATS.contains(formatName)
+            || formatName.equals(FormatNames.RFC3339_LENIENT),
+        formatName + " not supported");
+  }
+
+  private static Stream<Arguments> getSupportedDatetimeFormats() {
+    return SUPPORTED_NAMED_DATETIME_FORMATS.stream().map(Arguments::of);
+  }
+
+  @ParameterizedTest
+  @MethodSource("getSupportedDatetimeFormats")
+  public void check_datetime_format_names(FormatNames datetimeFormat) {
+    String camelCaseName = datetimeFormat.getCamelCaseName();
+    if (camelCaseName != null && !camelCaseName.isEmpty()) {
+      OpenSearchDateType dateType = OpenSearchDateType.of(camelCaseName);
+      assertSame(
+          dateType.getExprCoreType(),
+          TIMESTAMP,
+          camelCaseName
+              + " does not format to a TIMESTAMP type, instead got "
+              + dateType.getExprCoreType());
+    }
+
+    String snakeCaseName = datetimeFormat.getSnakeCaseName();
+    if (snakeCaseName != null && !snakeCaseName.isEmpty()) {
+      OpenSearchDateType dateType = OpenSearchDateType.of(snakeCaseName);
+      assertSame(
+          dateType.getExprCoreType(),
+          TIMESTAMP,
+          snakeCaseName
+              + " does not format to a TIMESTAMP type, instead got "
+              + dateType.getExprCoreType());
+    } else {
+      fail();
+    }
+  }
+
+  private static Stream<Arguments> getSupportedDateFormats() {
+    return SUPPORTED_NAMED_DATE_FORMATS.stream().map(Arguments::of);
+  }
+
+  @ParameterizedTest
+  @MethodSource("getSupportedDateFormats")
+  public void check_date_format_names(FormatNames dateFormat) {
+    String camelCaseName = dateFormat.getCamelCaseName();
+    if (camelCaseName != null && !camelCaseName.isEmpty()) {
+      OpenSearchDateType dateType = OpenSearchDateType.of(camelCaseName);
+      assertSame(
+          dateType.getExprCoreType(),
+          DATE,
+          camelCaseName
+              + " does not format to a DATE type, instead got "
+              + dateType.getExprCoreType());
+    }
+
+    String snakeCaseName = dateFormat.getSnakeCaseName();
+    if (snakeCaseName != null && !snakeCaseName.isEmpty()) {
+      OpenSearchDateType dateType = OpenSearchDateType.of(snakeCaseName);
+      assertSame(
+          dateType.getExprCoreType(),
+          DATE,
+          snakeCaseName
+              + " does not format to a DATE type, instead got "
+              + dateType.getExprCoreType());
+    } else {
+      fail();
+    }
+  }
+
+  private static Stream<Arguments> getSupportedTimeFormats() {
+    return SUPPORTED_NAMED_TIME_FORMATS.stream().map(Arguments::of);
+  }
+
+  @ParameterizedTest
+  @MethodSource("getSupportedTimeFormats")
+  public void check_time_format_names(FormatNames timeFormat) {
+    String camelCaseName = timeFormat.getCamelCaseName();
+    if (camelCaseName != null && !camelCaseName.isEmpty()) {
+      OpenSearchDateType dateType = OpenSearchDateType.of(camelCaseName);
+      assertSame(
+          dateType.getExprCoreType(),
+          TIME,
+          camelCaseName
+              + " does not format to a TIME type, instead got "
+              + dateType.getExprCoreType());
+    }
+
+    String snakeCaseName = timeFormat.getSnakeCaseName();
+    if (snakeCaseName != null && !snakeCaseName.isEmpty()) {
+      OpenSearchDateType dateType = OpenSearchDateType.of(snakeCaseName);
+      assertSame(
+          dateType.getExprCoreType(),
+          TIME,
+          snakeCaseName
+              + " does not format to a TIME type, instead got "
+              + dateType.getExprCoreType());
+    } else {
+      fail();
+    }
+  }
+
+  private static Stream<Arguments> get_format_combinations_for_test() {
+    return Stream.of(
+        Arguments.of(DATE, List.of("dd.MM.yyyy", "date"), "d && custom date"),
+        Arguments.of(TIME, List.of("time", "HH:mm"), "t && custom time"),
+        Arguments.of(TIMESTAMP, List.of("dd.MM.yyyy", "time"), "t && custom date"),
+        Arguments.of(TIMESTAMP, List.of("date", "HH:mm"), "d && custom time"),
+        Arguments.of(TIMESTAMP, List.of("dd.MM.yyyy HH:mm", "date_time"), "dt && custom datetime"),
+        Arguments.of(TIMESTAMP, List.of("dd.MM.yyyy", "date_time"), "dt && custom date"),
+        Arguments.of(TIMESTAMP, List.of("HH:mm", "date_time"), "dt && custom time"),
+        Arguments.of(TIMESTAMP, List.of("dd.MM.yyyy", "epoch_second"), "custom date && num"),
+        Arguments.of(TIMESTAMP, List.of("HH:mm", "epoch_second"), "custom time && num"),
+        Arguments.of(TIMESTAMP, List.of("date_time", "epoch_second"), "dt && num"),
+        Arguments.of(TIMESTAMP, List.of("date", "epoch_second"), "d && num"),
+        Arguments.of(TIMESTAMP, List.of("time", "epoch_second"), "t && num"),
+        Arguments.of(TIMESTAMP, List.of(""), "no formats given"),
+        Arguments.of(TIMESTAMP, List.of("time", "date"), "t && d"),
+        Arguments.of(TIMESTAMP, List.of("epoch_second"), "numeric"),
+        Arguments.of(TIME, List.of("time"), "t"),
+        Arguments.of(DATE, List.of("date"), "d"),
+        Arguments.of(TIMESTAMP, List.of("date_time"), "dt"),
+        Arguments.of(TIMESTAMP, List.of("unknown"), "unknown/incorrect"),
+        Arguments.of(DATE, List.of("uuuu"), "incomplete date"),
+        Arguments.of(TIME, List.of("HH"), "incomplete time"),
+        Arguments.of(DATE, List.of("E-w"), "incomplete"),
+        // E - day of week, w - week of year
+        Arguments.of(DATE, List.of("uuuu", "E-w"), "incomplete with year"),
+        Arguments.of(TIMESTAMP, List.of("---"), "incorrect"),
+        Arguments.of(TIMESTAMP, List.of("dd.MM.yyyy", "HH:mm"), "custom date and time"),
+        // D - day of year, N - nano of day
+        Arguments.of(TIMESTAMP, List.of("dd.MM.yyyy N", "uuuu:D:HH:mm"), "custom datetime"),
+        Arguments.of(DATE, List.of("dd.MM.yyyy", "uuuu:D"), "custom date"),
+        Arguments.of(TIME, List.of("HH:mm", "N"), "custom time"));
+  }
+
+  @ParameterizedTest(name = "[{index}] {2}")
+  @MethodSource("get_format_combinations_for_test")
+  public void check_ExprCoreType_of_combinations_of_custom_and_predefined_formats(
+      ExprCoreType expected, List<String> formats, String testName) {
+    assertEquals(expected, OpenSearchDateType.of(String.join(" || ", formats)).getExprCoreType());
+    formats = Lists.reverse(formats);
+    assertEquals(expected, OpenSearchDateType.of(String.join(" || ", formats)).getExprCoreType());
+  }
+
+  @Test
+  public void dont_use_incorrect_format_as_custom() {
+    assertEquals(0, OpenSearchDateType.of(" ").getAllCustomFormatters().size());
+  }
+
+  @Test
+  public void check_if_date_type_compatible() {
+    assertTrue(isDateTypeCompatible(DATE));
+    assertFalse(isDateTypeCompatible(OpenSearchDataType.of(OpenSearchDataType.MappingType.Text)));
+  }
+
+  @Test
+  void test_valid_timestamp_with_custom_format() {
+    String timestamp = "2021-11-08T17:00:00Z";
+    String format = "strict_date_time_no_millis";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    ZonedDateTime zonedDateTime = dateType.getParsedDateTime(timestamp);
+
+    assertEquals("2021-11-08T17:00:00Z", dateType.getFormattedDate(zonedDateTime.toInstant()));
+    assertEquals(LocalDate.parse("2021-11-08"), zonedDateTime.toLocalDate());
+    assertFalse(dateType.hasNoFormatter());
+  }
+
+  @Test
+  void test_valid_timestamp_with_multiple_formats() {
+    String timestamp = "2021-11-08T17:00:00Z";
+    String timestamp2 = "2021/11/08T17:00:00Z";
+
+    List<String> formats = Arrays.asList("strict_date_time_no_millis", "yyyy/MM/dd'T'HH:mm:ssX");
+    OpenSearchDateType dateType = OpenSearchDateType.of(String.join(" || ", formats));
+
+    // Testing with the first timestamp
+    ZonedDateTime zonedDateTime1 = dateType.getParsedDateTime(timestamp);
+
+    assertEquals("2021-11-08T17:00:00Z", dateType.getFormattedDate(zonedDateTime1.toInstant()));
+    assertEquals(LocalDate.parse("2021-11-08"), zonedDateTime1.toLocalDate());
+    assertFalse(dateType.hasNoFormatter());
+
+    // Testing with the second timestamp
+    ZonedDateTime zonedDateTime2 = dateType.getParsedDateTime(timestamp2);
+
+    assertEquals("2021-11-08T17:00:00Z", dateType.getFormattedDate(zonedDateTime2.toInstant()));
+    assertEquals(LocalDate.parse("2021-11-08"), zonedDateTime2.toLocalDate());
+    assertFalse(dateType.hasNoFormatter());
+  }
+
+  @Test
+  void test_openSearch_datetime_named_formatter() {
+    String timestamp = "2019-03-23T21:34:46";
+    String format = "strict_date_hour_minute_second";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    ZonedDateTime zonedDateTime = dateType.getParsedDateTime(timestamp);
+
+    assertEquals("2019-03-23T21:34:46", dateType.getFormattedDate(zonedDateTime.toInstant()));
+    assertEquals(LocalDate.parse("2019-03-23"), zonedDateTime.toLocalDate());
+    assertEquals(LocalTime.parse("21:34:46"), zonedDateTime.toLocalTime());
+    assertFalse(dateType.hasNoFormatter());
+  }
+
+  @Test
+  void test_openSearch_datetime_with_default_formatter() {
+    String timestamp = "2019-03-23T21:34:46";
+    OpenSearchDateType dateType = OpenSearchDateType.of(TIMESTAMP);
+    ZonedDateTime zonedDateTime = dateType.getParsedDateTime(timestamp);
+    // formatted using OpenSearch default formatter
+    assertEquals("2019-03-23T21:34:46Z", dateType.getFormattedDate(zonedDateTime.toInstant()));
+    assertEquals(LocalDate.parse("2019-03-23"), zonedDateTime.toLocalDate());
+    assertEquals(LocalTime.parse("21:34:46"), zonedDateTime.toLocalTime());
+    assertTrue(dateType.hasNoFormatter());
+  }
+
+  @Test
+  void test_invalid_date_with_named_formatter() {
+    // Incorrect date
+    String timestamp = "2019-23-23";
+    String format = "strict_date_hour_minute_second";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    ZonedDateTime zonedDateTime = dateType.getParsedDateTime(timestamp);
+    assertNull(zonedDateTime);
+    assertFalse(dateType.hasNoFormatter());
+  }
+
+  @Test
+  void test_invalid_time_with_custom_formatter() {
+    String timestamp = "invalid-timestamp";
+    List<String> formats = Arrays.asList("yyyy/MM/dd'T'HH:mm:ssX", "yyyy-MM-dd'T'HH:mm:ssX");
+    OpenSearchDateType dateType = OpenSearchDateType.of(String.join(" || ", formats));
+    ZonedDateTime zonedDateTime = dateType.getParsedDateTime(timestamp);
+    assertNull(zonedDateTime);
+    assertFalse(dateType.hasNoFormatter());
+  }
+
+  @Test
+  void test_epoch_datetime_formatter() {
+    long epochTimestamp = 1636390800000L; // Corresponds to "2021-11-08T17:00:00Z"
+    String format = "epoch_millis";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    ZonedDateTime zonedDateTime = dateType.getParsedDateTime(String.valueOf(epochTimestamp));
+
+    assertEquals(Long.toString(epochTimestamp), dateType.getFormattedDate(zonedDateTime));
+    assertEquals(LocalDate.parse("2021-11-08"), zonedDateTime.toLocalDate());
+    assertEquals(LocalTime.parse("17:00:00"), zonedDateTime.toLocalTime());
+    assertFalse(dateType.hasNoFormatter());
+  }
+
+  @Test
+  void test_timeStamp_format_with_default_formatters() {
+    String timestamp = "2021-11-08 17:00:00";
+    String format = "strict_date_time_no_millis || epoch_millis";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    assertNull(dateType.getParsedDateTime(timestamp));
+  }
+
+  @Test
+  void test_valid_date_with_custom_formatter() {
+    String dateString = "2021-11-08";
+    String format = "yyyy-MM-dd";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+
+    LocalDate expectedDate = LocalDate.parse(dateString, DateTimeFormatter.ISO_DATE);
+    LocalDate parsedDate = dateType.getParsedDateTime(dateString).toLocalDate();
+
+    assertEquals(expectedDate, parsedDate);
+    assertEquals("2021-11-08", dateType.getFormattedDate(parsedDate));
+  }
+
+  @Test
+  void test_valid_date_string_with_custom_formatter() {
+    String dateString = "03-Jan-21";
+    String format = "dd-MMM-yy";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+
+    LocalDate parsedDate = dateType.getParsedDateTime(dateString).toLocalDate();
+
+    assertEquals(LocalDate.parse("2021-01-03"), parsedDate);
+    assertEquals("03-Jan-21", dateType.getFormattedDate(parsedDate));
+    assertFalse(dateType.hasNoFormatter());
+  }
+
+  @Test
+  void test_valid_date_with_multiple_formatters() {
+    String dateString = "2021-11-08";
+    String format = "yyyy/MM/dd || yyyy-MM-dd";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+
+    LocalDate expectedDate = LocalDate.parse(dateString, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+    LocalDate parsedDate = dateType.getParsedDateTime(dateString).toLocalDate();
+
+    assertEquals(expectedDate, parsedDate);
+    assertEquals("2021/11/08", dateType.getFormattedDate(parsedDate));
+  }
+
+  @Test
+  void test_valid_time_with_custom_formatter() {
+    String timeString = "12:10:30.000";
+    String format = "HH:mm:ss.SSS";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+
+    LocalTime expectedTime = LocalTime.parse(timeString, DateTimeFormatter.ofPattern(format));
+    LocalTime parsedTime = dateType.getParsedDateTime(timeString).toLocalTime();
+
+    assertEquals(expectedTime, parsedTime);
+    assertEquals("12:10:30.000", dateType.getFormattedDate(parsedTime));
+  }
+
+  @Test
+  void test_valid_time_with_multiple_formatters() {
+    String timeString = "12:10:30";
+    String format = "HH:mm:ss.SSS || HH:mm:ss";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+
+    LocalTime expectedTime = LocalTime.parse(timeString, DateTimeFormatter.ofPattern("HH:mm:ss"));
+    LocalTime parsedTime = dateType.getParsedDateTime(timeString).toLocalTime();
+
+    assertEquals(expectedTime, parsedTime);
+    assertEquals("12:10:30.000", dateType.getFormattedDate(parsedTime));
+  }
+}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/utils/OpenSearchJsonContentTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/utils/OpenSearchJsonContentTest.java
new file mode 100644
index 0000000000..c2cf0328bd
--- /dev/null
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/utils/OpenSearchJsonContentTest.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.data.utils;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
+import org.junit.jupiter.api.Test;
+import org.opensearch.OpenSearchParseException;
+
+public class OpenSearchJsonContentTest {
+  @Test
+  public void testGetValueWithIOException() throws IOException {
+    JsonNode jsonNode = mock(JsonNode.class);
+    JsonParser jsonParser = mock(JsonParser.class);
+    when(jsonNode.traverse()).thenReturn(jsonParser);
+    when(jsonParser.nextToken()).thenThrow(new IOException());
+    OpenSearchJsonContent content = new OpenSearchJsonContent(jsonNode);
+    OpenSearchParseException exception =
+        assertThrows(OpenSearchParseException.class, content::geoValue);
+    assertTrue(exception.getMessage().contains("error parsing geo point"));
+  }
+}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprBinaryValueTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprBinaryValueTest.java
index 35f84a6e63..fa221bc214 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprBinaryValueTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprBinaryValueTest.java
@@ -3,14 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.value;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_BINARY;
 
 import org.junit.jupiter.api.Test;
+import org.opensearch.sql.opensearch.data.type.OpenSearchBinaryType;
 
 public class OpenSearchExprBinaryValueTest {
 
@@ -24,23 +23,19 @@ public void compare() {
 
   @Test
   public void equal() {
-    OpenSearchExprBinaryValue value =
-        new OpenSearchExprBinaryValue("U29tZSBiaW5hcnkgYmxvYg==");
+    OpenSearchExprBinaryValue value = new OpenSearchExprBinaryValue("U29tZSBiaW5hcnkgYmxvYg==");
     assertTrue(value.equal(new OpenSearchExprBinaryValue("U29tZSBiaW5hcnkgYmxvYg==")));
   }
 
   @Test
   public void value() {
-    OpenSearchExprBinaryValue value =
-        new OpenSearchExprBinaryValue("U29tZSBiaW5hcnkgYmxvYg==");
+    OpenSearchExprBinaryValue value = new OpenSearchExprBinaryValue("U29tZSBiaW5hcnkgYmxvYg==");
     assertEquals("U29tZSBiaW5hcnkgYmxvYg==", value.value());
   }
 
   @Test
   public void type() {
-    OpenSearchExprBinaryValue value =
-        new OpenSearchExprBinaryValue("U29tZSBiaW5hcnkgYmxvYg==");
-    assertEquals(OPENSEARCH_BINARY, value.type());
+    OpenSearchExprBinaryValue value = new OpenSearchExprBinaryValue("U29tZSBiaW5hcnkgYmxvYg==");
+    assertEquals(OpenSearchBinaryType.of(), value.type());
   }
-
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprGeoPointValueTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprGeoPointValueTest.java
index 302a2aad96..defa97d8c8 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprGeoPointValueTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprGeoPointValueTest.java
@@ -3,20 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.value;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_GEO_POINT;
 
 import org.junit.jupiter.api.Test;
+import org.opensearch.sql.opensearch.data.type.OpenSearchGeoPointType;
 
 class OpenSearchExprGeoPointValueTest {
 
-  private OpenSearchExprGeoPointValue geoPointValue = new OpenSearchExprGeoPointValue(1.0,
-      1.0);
+  private OpenSearchExprGeoPointValue geoPointValue = new OpenSearchExprGeoPointValue(1.0, 1.0);
 
   @Test
   void value() {
@@ -25,18 +23,18 @@ void value() {
 
   @Test
   void type() {
-    assertEquals(OPENSEARCH_GEO_POINT, geoPointValue.type());
+    assertEquals(OpenSearchGeoPointType.of(), geoPointValue.type());
   }
 
   @Test
   void compare() {
     assertEquals(0, geoPointValue.compareTo(new OpenSearchExprGeoPointValue(1.0, 1.0)));
+    assertEquals(geoPointValue, new OpenSearchExprGeoPointValue(1.0, 1.0));
   }
 
   @Test
   void equal() {
-    assertTrue(geoPointValue.equal(new OpenSearchExprGeoPointValue(1.0,
-        1.0)));
+    assertTrue(geoPointValue.equal(new OpenSearchExprGeoPointValue(1.0, 1.0)));
   }
 
   @Test
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprIpValueTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprIpValueTest.java
index baaceb2641..38a4ad3199 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprIpValueTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprIpValueTest.java
@@ -3,15 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.value;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_IP;
 
 import org.junit.jupiter.api.Test;
+import org.opensearch.sql.opensearch.data.type.OpenSearchIpType;
 
 public class OpenSearchExprIpValueTest {
 
@@ -24,12 +23,13 @@ void value() {
 
   @Test
   void type() {
-    assertEquals(OPENSEARCH_IP, ipValue.type());
+    assertEquals(OpenSearchIpType.of(), ipValue.type());
   }
 
   @Test
   void compare() {
     assertEquals(0, ipValue.compareTo(new OpenSearchExprIpValue("192.168.0.1")));
+    assertEquals(ipValue, new OpenSearchExprIpValue("192.168.0.1"));
   }
 
   @Test
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextKeywordValueTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextKeywordValueTest.java
deleted file mode 100644
index ee2bbaf13c..0000000000
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextKeywordValueTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.sql.opensearch.data.value;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
-
-import org.junit.jupiter.api.Test;
-
-class OpenSearchExprTextKeywordValueTest {
-
-  @Test
-  public void testTypeOfExprTextKeywordValue() {
-    assertEquals(OPENSEARCH_TEXT_KEYWORD, new OpenSearchExprTextKeywordValue("A").type());
-  }
-
-}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextValueTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextValueTest.java
index bb7a6b415b..9b7e032c57 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextValueTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprTextValueTest.java
@@ -3,17 +3,96 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.value;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT;
+import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 
+import java.util.Map;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class OpenSearchExprTextValueTest {
   @Test
-  public void typeOfExprTextValue() {
-    assertEquals(OPENSEARCH_TEXT, new OpenSearchExprTextValue("A").type());
+  public void type_of_ExprTextValue() {
+    assertEquals(OpenSearchTextType.of(), new OpenSearchExprTextValue("A").type());
+  }
+
+  @Test
+  public void getFields() {
+    var fields =
+        Map.of(
+            "f1", OpenSearchDataType.of(OpenSearchDataType.MappingType.Integer),
+            "f2", OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword),
+            "f3", OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword));
+    assertEquals(fields, OpenSearchTextType.of(fields).getFields());
+  }
+
+  @Test
+  void non_text_types_arent_converted() {
+    assertAll(
+        () ->
+            assertEquals(
+                "field",
+                OpenSearchTextType.convertTextToKeyword("field", OpenSearchDataType.of(INTEGER))),
+        () ->
+            assertEquals(
+                "field",
+                OpenSearchTextType.convertTextToKeyword("field", OpenSearchDataType.of(STRING))),
+        () ->
+            assertEquals(
+                "field",
+                OpenSearchTextType.convertTextToKeyword(
+                    "field", OpenSearchDataType.of(OpenSearchDataType.MappingType.GeoPoint))),
+        () ->
+            assertEquals(
+                "field",
+                OpenSearchTextType.convertTextToKeyword(
+                    "field", OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword))),
+        () ->
+            assertEquals(
+                "field",
+                OpenSearchTextType.convertTextToKeyword(
+                    "field", OpenSearchDataType.of(OpenSearchDataType.MappingType.Integer))),
+        () -> assertEquals("field", OpenSearchTextType.convertTextToKeyword("field", STRING)),
+        () -> assertEquals("field", OpenSearchTextType.convertTextToKeyword("field", INTEGER)));
+  }
+
+  @Test
+  void non_text_types_with_nested_objects_arent_converted() {
+    var objectType =
+        OpenSearchDataType.of(
+            OpenSearchDataType.MappingType.Object,
+            Map.of("subfield", OpenSearchDataType.of(STRING)));
+    var arrayType =
+        OpenSearchDataType.of(
+            OpenSearchDataType.MappingType.Nested,
+            Map.of("subfield", OpenSearchDataType.of(STRING)));
+    assertAll(
+        () -> assertEquals("field", OpenSearchTextType.convertTextToKeyword("field", objectType)),
+        () -> assertEquals("field", OpenSearchTextType.convertTextToKeyword("field", arrayType)));
+  }
+
+  @Test
+  void text_type_without_fields_isnt_converted() {
+    assertEquals(
+        "field",
+        OpenSearchTextType.convertTextToKeyword(
+            "field", OpenSearchDataType.of(OpenSearchDataType.MappingType.Text)));
+  }
+
+  @Test
+  void text_type_with_fields_is_converted() {
+    var textWithKeywordType =
+        OpenSearchTextType.of(
+            Map.of("keyword", OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword)));
+    assertEquals(
+        "field.keyword", OpenSearchTextType.convertTextToKeyword("field", textWithKeywordType));
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactoryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactoryTest.java
index 8d5552d6a8..d1bc3c500b 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactoryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactoryTest.java
@@ -3,14 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.data.value;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opensearch.sql.data.model.ExprValueUtils.booleanValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.byteValue;
+import static org.opensearch.sql.data.model.ExprValueUtils.collectionValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.doubleValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.floatValue;
 import static org.opensearch.sql.data.model.ExprValueUtils.integerValue;
@@ -32,67 +34,120 @@
 import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
 import static org.opensearch.sql.data.type.ExprCoreType.TIME;
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_BINARY;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_GEO_POINT;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_IP;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
+import static org.opensearch.sql.utils.DateTimeUtils.UTC_ZONE_ID;
 
-import com.google.common.collect.ImmutableList;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
 import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.junit.jupiter.api.Test;
+import org.opensearch.OpenSearchParseException;
+import org.opensearch.geometry.utils.Geohash;
 import org.opensearch.sql.data.model.ExprCollectionValue;
 import org.opensearch.sql.data.model.ExprDateValue;
 import org.opensearch.sql.data.model.ExprDatetimeValue;
-import org.opensearch.sql.data.model.ExprStringValue;
 import org.opensearch.sql.data.model.ExprTimeValue;
 import org.opensearch.sql.data.model.ExprTimestampValue;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDateType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.data.utils.OpenSearchJsonContent;
 
 class OpenSearchExprValueFactoryTest {
 
-  private static final Map<String, ExprType> MAPPING =
-      new ImmutableMap.Builder<String, ExprType>()
-          .put("byteV", BYTE)
-          .put("shortV", SHORT)
-          .put("intV", INTEGER)
-          .put("longV", LONG)
-          .put("floatV", FLOAT)
-          .put("doubleV", DOUBLE)
-          .put("stringV", STRING)
-          .put("dateV", DATE)
-          .put("datetimeV", DATETIME)
-          .put("timeV", TIME)
-          .put("timestampV", TIMESTAMP)
-          .put("boolV", BOOLEAN)
-          .put("structV", STRUCT)
-          .put("structV.id", INTEGER)
-          .put("structV.state", STRING)
-          .put("arrayV", ARRAY)
-          .put("arrayV.info", STRING)
-          .put("arrayV.author", STRING)
-          .put("textV", OPENSEARCH_TEXT)
-          .put("textKeywordV", OPENSEARCH_TEXT_KEYWORD)
-          .put("ipV", OPENSEARCH_IP)
-          .put("geoV", OPENSEARCH_GEO_POINT)
-          .put("binaryV", OPENSEARCH_BINARY)
+  private static final Map<String, OpenSearchDataType> MAPPING =
+      new ImmutableMap.Builder<String, OpenSearchDataType>()
+          .put("byteV", OpenSearchDataType.of(BYTE))
+          .put("shortV", OpenSearchDataType.of(SHORT))
+          .put("intV", OpenSearchDataType.of(INTEGER))
+          .put("longV", OpenSearchDataType.of(LONG))
+          .put("floatV", OpenSearchDataType.of(FLOAT))
+          .put("doubleV", OpenSearchDataType.of(DOUBLE))
+          .put("stringV", OpenSearchDataType.of(STRING))
+          .put("dateV", OpenSearchDateType.of(DATE))
+          .put("datetimeV", OpenSearchDateType.of(DATETIME))
+          .put("timeV", OpenSearchDateType.of(TIME))
+          .put("timestampV", OpenSearchDateType.of(TIMESTAMP))
+          .put("datetimeDefaultV", OpenSearchDateType.of())
+          .put("dateStringV", OpenSearchDateType.of("date"))
+          .put("timeStringV", OpenSearchDateType.of("time"))
+          .put("epochMillisV", OpenSearchDateType.of("epoch_millis"))
+          .put("epochSecondV", OpenSearchDateType.of("epoch_second"))
+          .put("timeCustomV", OpenSearchDateType.of("HHmmss"))
+          .put("dateCustomV", OpenSearchDateType.of("uuuuMMdd"))
+          .put("dateTimeCustomV", OpenSearchDateType.of("uuuuMMddHHmmss"))
+          .put("dateOrEpochMillisV", OpenSearchDateType.of("date_time_no_millis || epoch_millis"))
+          .put("timeNoMillisOrTimeV", OpenSearchDateType.of("time_no_millis || time"))
+          .put("dateOrOrdinalDateV", OpenSearchDateType.of("date || ordinal_date"))
+          .put("customFormatV", OpenSearchDateType.of("yyyy-MM-dd-HH-mm-ss"))
+          .put(
+              "customAndEpochMillisV", OpenSearchDateType.of("yyyy-MM-dd-HH-mm-ss || epoch_millis"))
+          .put("incompleteFormatV", OpenSearchDateType.of("year"))
+          .put("boolV", OpenSearchDataType.of(BOOLEAN))
+          .put("structV", OpenSearchDataType.of(STRUCT))
+          .put("structV.id", OpenSearchDataType.of(INTEGER))
+          .put("structV.state", OpenSearchDataType.of(STRING))
+          .put("arrayV", OpenSearchDataType.of(ARRAY))
+          .put("arrayV.info", OpenSearchDataType.of(STRING))
+          .put("arrayV.author", OpenSearchDataType.of(STRING))
+          .put(
+              "deepNestedV",
+              OpenSearchDataType.of(OpenSearchDataType.of(OpenSearchDataType.MappingType.Nested)))
+          .put(
+              "deepNestedV.year",
+              OpenSearchDataType.of(OpenSearchDataType.of(OpenSearchDataType.MappingType.Nested)))
+          .put("deepNestedV.year.timeV", OpenSearchDateType.of(TIME))
+          .put(
+              "nestedV",
+              OpenSearchDataType.of(OpenSearchDataType.of(OpenSearchDataType.MappingType.Nested)))
+          .put("nestedV.count", OpenSearchDataType.of(INTEGER))
+          .put("textV", OpenSearchDataType.of(OpenSearchDataType.MappingType.Text))
+          .put(
+              "textKeywordV",
+              OpenSearchTextType.of(
+                  Map.of("words", OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword))))
+          .put("ipV", OpenSearchDataType.of(OpenSearchDataType.MappingType.Ip))
+          .put("geoV", OpenSearchDataType.of(OpenSearchDataType.MappingType.GeoPoint))
+          .put("binaryV", OpenSearchDataType.of(OpenSearchDataType.MappingType.Binary))
           .build();
-  private OpenSearchExprValueFactory exprValueFactory =
+
+  private final OpenSearchExprValueFactory exprValueFactory =
       new OpenSearchExprValueFactory(MAPPING);
 
   @Test
   public void constructNullValue() {
-    assertEquals(nullValue(), tupleValue("{\"intV\":null}").get("intV"));
-    assertEquals(nullValue(), constructFromObject("intV",  null));
-    assertTrue(new OpenSearchJsonContent(null).isNull());
+    assertAll(
+        () -> assertEquals(nullValue(), tupleValue("{\"intV\":null}").get("intV")),
+        () -> assertEquals(nullValue(), constructFromObject("intV", null)),
+        () -> assertTrue(new OpenSearchJsonContent(null).isNull()));
+  }
+
+  @Test
+  public void iterateArrayValue() throws JsonProcessingException {
+    ObjectMapper mapper = new ObjectMapper();
+    var arrayIt = new OpenSearchJsonContent(mapper.readTree("[\"zz\",\"bb\"]")).array();
+    assertAll(
+        () -> assertEquals("zz", arrayIt.next().stringValue()),
+        () -> assertEquals("bb", arrayIt.next().stringValue()),
+        () -> assertFalse(arrayIt.hasNext()));
+  }
+
+  @Test
+  public void iterateArrayValueWithOneElement() throws JsonProcessingException {
+    ObjectMapper mapper = new ObjectMapper();
+    var arrayIt = new OpenSearchJsonContent(mapper.readTree("[\"zz\"]")).array();
+    assertAll(
+        () -> assertEquals("zz", arrayIt.next().stringValue()),
+        () -> assertFalse(arrayIt.hasNext()));
   }
 
   @Test
@@ -102,23 +157,26 @@ public void constructNullArrayValue() {
 
   @Test
   public void constructByte() {
-    assertEquals(byteValue((byte) 1), tupleValue("{\"byteV\":1}").get("byteV"));
-    assertEquals(byteValue((byte) 1), constructFromObject("byteV", 1));
-    assertEquals(byteValue((byte) 1), constructFromObject("byteV", "1.0"));
+    assertAll(
+        () -> assertEquals(byteValue((byte) 1), tupleValue("{\"byteV\":1}").get("byteV")),
+        () -> assertEquals(byteValue((byte) 1), constructFromObject("byteV", 1)),
+        () -> assertEquals(byteValue((byte) 1), constructFromObject("byteV", "1.0")));
   }
 
   @Test
   public void constructShort() {
-    assertEquals(shortValue((short) 1), tupleValue("{\"shortV\":1}").get("shortV"));
-    assertEquals(shortValue((short) 1), constructFromObject("shortV", 1));
-    assertEquals(shortValue((short) 1), constructFromObject("shortV", "1.0"));
+    assertAll(
+        () -> assertEquals(shortValue((short) 1), tupleValue("{\"shortV\":1}").get("shortV")),
+        () -> assertEquals(shortValue((short) 1), constructFromObject("shortV", 1)),
+        () -> assertEquals(shortValue((short) 1), constructFromObject("shortV", "1.0")));
   }
 
   @Test
   public void constructInteger() {
-    assertEquals(integerValue(1), tupleValue("{\"intV\":1}").get("intV"));
-    assertEquals(integerValue(1), constructFromObject("intV", 1));
-    assertEquals(integerValue(1), constructFromObject("intV", "1.0"));
+    assertAll(
+        () -> assertEquals(integerValue(1), tupleValue("{\"intV\":1}").get("intV")),
+        () -> assertEquals(integerValue(1), constructFromObject("intV", 1)),
+        () -> assertEquals(integerValue(1), constructFromObject("intV", "1.0")));
   }
 
   @Test
@@ -128,131 +186,491 @@ public void constructIntegerValueInStringValue() {
 
   @Test
   public void constructLong() {
-    assertEquals(longValue(1L), tupleValue("{\"longV\":1}").get("longV"));
-    assertEquals(longValue(1L), constructFromObject("longV", 1L));
-    assertEquals(longValue(1L), constructFromObject("longV", "1.0"));
+    assertAll(
+        () -> assertEquals(longValue(1L), tupleValue("{\"longV\":1}").get("longV")),
+        () -> assertEquals(longValue(1L), constructFromObject("longV", 1L)),
+        () -> assertEquals(longValue(1L), constructFromObject("longV", "1.0")));
   }
 
   @Test
   public void constructFloat() {
-    assertEquals(floatValue(1f), tupleValue("{\"floatV\":1.0}").get("floatV"));
-    assertEquals(floatValue(1f), constructFromObject("floatV", 1f));
+    assertAll(
+        () -> assertEquals(floatValue(1f), tupleValue("{\"floatV\":1.0}").get("floatV")),
+        () -> assertEquals(floatValue(1f), constructFromObject("floatV", 1f)));
   }
 
   @Test
   public void constructDouble() {
-    assertEquals(doubleValue(1d), tupleValue("{\"doubleV\":1.0}").get("doubleV"));
-    assertEquals(doubleValue(1d), constructFromObject("doubleV", 1d));
+    assertAll(
+        () -> assertEquals(doubleValue(1d), tupleValue("{\"doubleV\":1.0}").get("doubleV")),
+        () -> assertEquals(doubleValue(1d), constructFromObject("doubleV", 1d)));
   }
 
   @Test
   public void constructString() {
-    assertEquals(stringValue("text"), tupleValue("{\"stringV\":\"text\"}").get("stringV"));
-    assertEquals(stringValue("text"), constructFromObject("stringV", "text"));
+    assertAll(
+        () ->
+            assertEquals(stringValue("text"), tupleValue("{\"stringV\":\"text\"}").get("stringV")),
+        () -> assertEquals(stringValue("text"), constructFromObject("stringV", "text")));
   }
 
   @Test
   public void constructBoolean() {
-    assertEquals(booleanValue(true), tupleValue("{\"boolV\":true}").get("boolV"));
-    assertEquals(booleanValue(true), constructFromObject("boolV", true));
-    assertEquals(booleanValue(true), constructFromObject("boolV", "true"));
-    assertEquals(booleanValue(true), constructFromObject("boolV", 1));
-    assertEquals(booleanValue(false), constructFromObject("boolV", 0));
+    assertAll(
+        () -> assertEquals(booleanValue(true), tupleValue("{\"boolV\":true}").get("boolV")),
+        () -> assertEquals(booleanValue(true), constructFromObject("boolV", true)),
+        () -> assertEquals(booleanValue(true), constructFromObject("boolV", "true")),
+        () -> assertEquals(booleanValue(true), constructFromObject("boolV", 1)),
+        () -> assertEquals(booleanValue(false), constructFromObject("boolV", 0)));
   }
 
   @Test
   public void constructText() {
-    assertEquals(new OpenSearchExprTextValue("text"),
-                 tupleValue("{\"textV\":\"text\"}").get("textV"));
-    assertEquals(new OpenSearchExprTextValue("text"),
-                 constructFromObject("textV", "text"));
+    assertAll(
+        () ->
+            assertEquals(
+                new OpenSearchExprTextValue("text"),
+                tupleValue("{\"textV\":\"text\"}").get("textV")),
+        () ->
+            assertEquals(new OpenSearchExprTextValue("text"), constructFromObject("textV", "text")),
+        () ->
+            assertEquals(
+                new OpenSearchExprTextValue("text"),
+                tupleValue("{\"textKeywordV\":\"text\"}").get("textKeywordV")),
+        () ->
+            assertEquals(
+                new OpenSearchExprTextValue("text"), constructFromObject("textKeywordV", "text")));
+  }
 
-    assertEquals(new OpenSearchExprTextKeywordValue("text"),
-                 tupleValue("{\"textKeywordV\":\"text\"}").get("textKeywordV"));
-    assertEquals(new OpenSearchExprTextKeywordValue("text"),
-                 constructFromObject("textKeywordV", "text"));
+  @Test
+  public void constructDates() {
+    ExprValue dateStringV = constructFromObject("dateStringV", "1984-04-12");
+    assertAll(
+        () -> assertEquals(new ExprDateValue("1984-04-12"), dateStringV),
+        () ->
+            assertEquals(
+                new ExprDateValue(
+                    LocalDate.ofInstant(Instant.ofEpochMilli(450576000000L), UTC_ZONE_ID)),
+                constructFromObject("dateV", 450576000000L)),
+        () ->
+            assertEquals(
+                new ExprDateValue("1984-04-12"),
+                constructFromObject("dateOrOrdinalDateV", "1984-103")),
+        () ->
+            assertEquals(
+                new ExprDateValue("2015-01-01"),
+                tupleValue("{\"dateV\":\"2015-01-01\"}").get("dateV")));
   }
 
   @Test
-  public void constructDate() {
-    assertEquals(
-        new ExprTimestampValue("2015-01-01 00:00:00"),
-        tupleValue("{\"timestampV\":\"2015-01-01\"}").get("timestampV"));
-    assertEquals(
-        new ExprTimestampValue("2015-01-01 12:10:30"),
-        tupleValue("{\"timestampV\":\"2015-01-01T12:10:30Z\"}").get("timestampV"));
-    assertEquals(
-        new ExprTimestampValue("2015-01-01 12:10:30"),
-        tupleValue("{\"timestampV\":\"2015-01-01T12:10:30\"}").get("timestampV"));
-    assertEquals(
-        new ExprTimestampValue("2015-01-01 12:10:30"),
-        tupleValue("{\"timestampV\":\"2015-01-01 12:10:30\"}").get("timestampV"));
+  public void constructTimes() {
+    ExprValue timeStringV = constructFromObject("timeStringV", "12:10:30.000Z");
+    assertAll(
+        () -> assertTrue(timeStringV.isDateTime()),
+        () -> assertTrue(timeStringV instanceof ExprTimeValue),
+        () -> assertEquals(new ExprTimeValue("12:10:30"), timeStringV),
+        () ->
+            assertEquals(
+                new ExprTimeValue(
+                    LocalTime.from(Instant.ofEpochMilli(1420070400001L).atZone(UTC_ZONE_ID))),
+                constructFromObject("timeV", 1420070400001L)),
+        () ->
+            assertEquals(
+                new ExprTimeValue("09:07:42.000"),
+                constructFromObject("timeNoMillisOrTimeV", "09:07:42.000Z")),
+        () ->
+            assertEquals(
+                new ExprTimeValue("09:07:42"),
+                tupleValue("{\"timeV\":\"09:07:42\"}").get("timeV")));
+  }
+
+  @Test
+  public void constructDatetime() {
+    assertAll(
+        () ->
+            assertEquals(
+                new ExprTimestampValue("2015-01-01 00:00:00"),
+                tupleValue("{\"timestampV\":\"2015-01-01\"}").get("timestampV")),
+        () ->
+            assertEquals(
+                new ExprTimestampValue("2015-01-01 12:10:30"),
+                tupleValue("{\"timestampV\":\"2015-01-01T12:10:30Z\"}").get("timestampV")),
+        () ->
+            assertEquals(
+                new ExprTimestampValue("2015-01-01 12:10:30"),
+                tupleValue("{\"timestampV\":\"2015-01-01T12:10:30\"}").get("timestampV")),
+        () ->
+            assertEquals(
+                new ExprTimestampValue("2015-01-01 12:10:30"),
+                tupleValue("{\"timestampV\":\"2015-01-01 12:10:30\"}").get("timestampV")),
+        () ->
+            assertEquals(
+                new ExprTimestampValue(Instant.ofEpochMilli(1420070400001L)),
+                constructFromObject("timestampV", 1420070400001L)),
+        () ->
+            assertEquals(
+                new ExprTimestampValue(Instant.ofEpochMilli(1420070400001L)),
+                constructFromObject("timestampV", Instant.ofEpochMilli(1420070400001L))),
+        () ->
+            assertEquals(
+                new ExprTimestampValue(Instant.ofEpochMilli(1420070400001L)),
+                constructFromObject("epochMillisV", "1420070400001")),
+        () ->
+            assertEquals(
+                new ExprTimestampValue(Instant.ofEpochMilli(1420070400001L)),
+                constructFromObject("epochMillisV", 1420070400001L)),
+        () ->
+            assertEquals(
+                new ExprTimestampValue(Instant.ofEpochSecond(142704001L)),
+                constructFromObject("epochSecondV", 142704001L)),
+        () ->
+            assertEquals(
+                new ExprTimeValue("10:20:30"),
+                tupleValue("{ \"timeCustomV\" : 102030 }").get("timeCustomV")),
+        () ->
+            assertEquals(
+                new ExprDateValue("1961-04-12"),
+                tupleValue("{ \"dateCustomV\" : 19610412 }").get("dateCustomV")),
+        () ->
+            assertEquals(
+                new ExprTimestampValue("1984-05-10 20:30:40"),
+                tupleValue("{ \"dateTimeCustomV\" : 19840510203040 }").get("dateTimeCustomV")),
+        () ->
+            assertEquals(
+                new ExprTimestampValue("2015-01-01 12:10:30"),
+                constructFromObject("timestampV", "2015-01-01 12:10:30")),
+        () ->
+            assertEquals(
+                new ExprDatetimeValue("2015-01-01 12:10:30"),
+                constructFromObject("datetimeV", "2015-01-01 12:10:30")),
+        () ->
+            assertEquals(
+                new ExprDatetimeValue("2015-01-01 12:10:30"),
+                constructFromObject("datetimeDefaultV", "2015-01-01 12:10:30")),
+        () ->
+            assertEquals(
+                new ExprTimestampValue(Instant.ofEpochMilli(1420070400001L)),
+                constructFromObject("dateOrEpochMillisV", "1420070400001")),
+
+        // case: timestamp-formatted field, but it only gets a time: should match a time
+        () ->
+            assertEquals(
+                new ExprTimeValue("19:36:22"),
+                tupleValue("{\"timestampV\":\"19:36:22\"}").get("timestampV")),
+
+        // case: timestamp-formatted field, but it only gets a date: should match a date
+        () ->
+            assertEquals(
+                new ExprDateValue("2011-03-03"),
+                tupleValue("{\"timestampV\":\"2011-03-03\"}").get("timestampV")));
+  }
+
+  @Test
+  public void constructDatetime_fromCustomFormat() {
     assertEquals(
-        new ExprTimestampValue(Instant.ofEpochMilli(1420070400001L)),
-        tupleValue("{\"timestampV\":1420070400001}").get("timestampV"));
+        new ExprDatetimeValue("2015-01-01 12:10:30"),
+        constructFromObject("customFormatV", "2015-01-01-12-10-30"));
+
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> constructFromObject("customFormatV", "2015-01-01 12-10-30"));
     assertEquals(
-        new ExprTimeValue("19:36:22"),
-        tupleValue("{\"timestampV\":\"19:36:22\"}").get("timestampV"));
+        "Construct TIMESTAMP from \"2015-01-01 12-10-30\" failed, " + "unsupported format.",
+        exception.getMessage());
 
     assertEquals(
-        new ExprTimestampValue(Instant.ofEpochMilli(1420070400001L)),
-        constructFromObject("timestampV", 1420070400001L));
+        new ExprDatetimeValue("2015-01-01 12:10:30"),
+        constructFromObject("customAndEpochMillisV", "2015-01-01 12:10:30"));
+
     assertEquals(
-        new ExprTimestampValue(Instant.ofEpochMilli(1420070400001L)),
-        constructFromObject("timestampV", Instant.ofEpochMilli(1420070400001L)));
+        new ExprDatetimeValue("2015-01-01 12:10:30"),
+        constructFromObject("customAndEpochMillisV", "2015-01-01-12-10-30"));
+  }
+
+  @Test
+  public void constructDatetimeFromUnsupportedFormat_ThrowIllegalArgumentException() {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> constructFromObject("timestampV", "2015-01-01 12:10"));
     assertEquals(
-        new ExprTimestampValue("2015-01-01 12:10:30"),
-        constructFromObject("timestampV", "2015-01-01 12:10:30"));
+        "Construct TIMESTAMP from \"2015-01-01 12:10\" failed, " + "unsupported format.",
+        exception.getMessage());
+
+    // fail with missing seconds
+    exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> constructFromObject("dateOrEpochMillisV", "2015-01-01 12:10"));
     assertEquals(
-        new ExprDateValue("2015-01-01"),
-        constructFromObject("dateV","2015-01-01"));
+        "Construct TIMESTAMP from \"2015-01-01 12:10\" failed, " + "unsupported format.",
+        exception.getMessage());
+  }
+
+  @Test
+  public void constructTimeFromUnsupportedFormat_ThrowIllegalArgumentException() {
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class, () -> constructFromObject("timeV", "2015-01-01"));
     assertEquals(
-        new ExprTimeValue("12:10:30"),
-        constructFromObject("timeV","12:10:30"));
+        "Construct TIME from \"2015-01-01\" failed, " + "unsupported format.",
+        exception.getMessage());
+
+    exception =
+        assertThrows(
+            IllegalArgumentException.class, () -> constructFromObject("timeStringV", "10:10"));
     assertEquals(
-        new ExprDatetimeValue("2015-01-01 12:10:30"),
-        constructFromObject("datetimeV", "2015-01-01 12:10:30"));
+        "Construct TIME from \"10:10\" failed, " + "unsupported format.", exception.getMessage());
   }
 
   @Test
-  public void constructDateFromUnsupportedFormatThrowException() {
-    IllegalStateException exception =
+  public void constructDateFromUnsupportedFormat_ThrowIllegalArgumentException() {
+    IllegalArgumentException exception =
         assertThrows(
-            IllegalStateException.class, () -> tupleValue("{\"timestampV\":\"2015-01-01 12:10\"}"));
+            IllegalArgumentException.class, () -> constructFromObject("dateV", "12:10:10"));
     assertEquals(
-        "Construct ExprTimestampValue from \"2015-01-01 12:10\" failed, "
-            + "unsupported date format.",
+        "Construct DATE from \"12:10:10\" failed, " + "unsupported format.",
         exception.getMessage());
+
+    exception =
+        assertThrows(
+            IllegalArgumentException.class, () -> constructFromObject("dateStringV", "abc"));
+    assertEquals(
+        "Construct DATE from \"abc\" failed, " + "unsupported format.", exception.getMessage());
+  }
+
+  @Test
+  public void constructDateFromIncompleteFormat() {
+    assertEquals(new ExprDateValue("1984-01-01"), constructFromObject("incompleteFormatV", "1984"));
   }
 
   @Test
   public void constructArray() {
     assertEquals(
-        new ExprCollectionValue(ImmutableList.of(new ExprTupleValue(
-            new LinkedHashMap<String, ExprValue>() {
-              {
-                put("info", stringValue("zz"));
-                put("author", stringValue("au"));
-              }
-            }))),
+        new ExprCollectionValue(
+            List.of(
+                new ExprTupleValue(
+                    new LinkedHashMap<String, ExprValue>() {
+                      {
+                        put("info", stringValue("zz"));
+                        put("author", stringValue("au"));
+                      }
+                    }))),
         tupleValue("{\"arrayV\":[{\"info\":\"zz\",\"author\":\"au\"}]}").get("arrayV"));
     assertEquals(
-        new ExprCollectionValue(ImmutableList.of(new ExprTupleValue(
-            new LinkedHashMap<String, ExprValue>() {
-              {
-                put("info", stringValue("zz"));
-                put("author", stringValue("au"));
-              }
-            }))),
-        constructFromObject("arrayV", ImmutableList.of(
-            ImmutableMap.of("info", "zz", "author", "au"))));
+        new ExprCollectionValue(
+            List.of(
+                new ExprTupleValue(
+                    new LinkedHashMap<String, ExprValue>() {
+                      {
+                        put("info", stringValue("zz"));
+                        put("author", stringValue("au"));
+                      }
+                    }))),
+        constructFromObject("arrayV", List.of(ImmutableMap.of("info", "zz", "author", "au"))));
   }
 
   @Test
   public void constructArrayOfStrings() {
-    assertEquals(new ExprCollectionValue(
-            ImmutableList.of(new ExprStringValue("zz"), new ExprStringValue("au"))),
-        constructFromObject("arrayV", ImmutableList.of("zz", "au")));
+    assertEquals(
+        new ExprCollectionValue(List.of(stringValue("zz"), stringValue("au"))),
+        constructFromObject("arrayV", List.of("zz", "au")));
+  }
+
+  @Test
+  public void constructNestedArraysOfStrings() {
+    assertEquals(
+        new ExprCollectionValue(
+            List.of(collectionValue(List.of("zz", "au")), collectionValue(List.of("ss")))),
+        tupleValueWithArraySupport("{\"stringV\":[" + "[\"zz\", \"au\"]," + "[\"ss\"]" + "]}")
+            .get("stringV"));
+  }
+
+  @Test
+  public void constructNestedArraysOfStringsReturnsFirstIndex() {
+    assertEquals(
+        stringValue("zz"),
+        tupleValue("{\"stringV\":[" + "[\"zz\", \"au\"]," + "[\"ss\"]" + "]}").get("stringV"));
+  }
+
+  @Test
+  public void constructMultiNestedArraysOfStringsReturnsFirstIndex() {
+    assertEquals(
+        stringValue("z"),
+        tupleValue("{\"stringV\":" + "[\"z\"," + "[\"s\"]," + "[\"zz\", \"au\"]" + "]}")
+            .get("stringV"));
+  }
+
+  @Test
+  public void constructArrayOfInts() {
+    assertEquals(
+        new ExprCollectionValue(List.of(integerValue(1), integerValue(2))),
+        constructFromObject("arrayV", List.of(1, 2)));
+  }
+
+  @Test
+  public void constructArrayOfShorts() {
+    // Shorts are treated same as integer
+    assertEquals(
+        new ExprCollectionValue(List.of(shortValue((short) 3), shortValue((short) 4))),
+        constructFromObject("arrayV", List.of(3, 4)));
+  }
+
+  @Test
+  public void constructArrayOfLongs() {
+    assertEquals(
+        new ExprCollectionValue(List.of(longValue(123456789L), longValue(987654321L))),
+        constructFromObject("arrayV", List.of(123456789L, 987654321L)));
+  }
+
+  @Test
+  public void constructArrayOfFloats() {
+    assertEquals(
+        new ExprCollectionValue(List.of(floatValue(3.14f), floatValue(4.13f))),
+        constructFromObject("arrayV", List.of(3.14f, 4.13f)));
+  }
+
+  @Test
+  public void constructArrayOfDoubles() {
+    assertEquals(
+        new ExprCollectionValue(List.of(doubleValue(9.1928374756D), doubleValue(4.987654321D))),
+        constructFromObject("arrayV", List.of(9.1928374756D, 4.987654321D)));
+  }
+
+  @Test
+  public void constructArrayOfBooleans() {
+    assertEquals(
+        new ExprCollectionValue(List.of(booleanValue(true), booleanValue(false))),
+        constructFromObject("arrayV", List.of(true, false)));
+  }
+
+  @Test
+  public void constructNestedObjectArrayNode() {
+    assertEquals(
+        collectionValue(List.of(Map.of("count", 1), Map.of("count", 2))),
+        tupleValueWithArraySupport("{\"nestedV\":[{\"count\":1},{\"count\":2}]}").get("nestedV"));
+  }
+
+  @Test
+  public void constructNestedObjectArrayOfObjectArraysNode() {
+    assertEquals(
+        collectionValue(
+            List.of(
+                Map.of(
+                    "year",
+                    List.of(
+                        Map.of("timeV", new ExprTimeValue("09:07:42")),
+                        Map.of("timeV", new ExprTimeValue("09:07:42")))),
+                Map.of(
+                    "year",
+                    List.of(
+                        Map.of("timeV", new ExprTimeValue("09:07:42")),
+                        Map.of("timeV", new ExprTimeValue("09:07:42")))))),
+        tupleValueWithArraySupport(
+                "{\"deepNestedV\":"
+                    + "["
+                    + "{\"year\":"
+                    + "["
+                    + "{\"timeV\":\"09:07:42\"},"
+                    + "{\"timeV\":\"09:07:42\"}"
+                    + "]"
+                    + "},"
+                    + "{\"year\":"
+                    + "["
+                    + "{\"timeV\":\"09:07:42\"},"
+                    + "{\"timeV\":\"09:07:42\"}"
+                    + "]"
+                    + "}"
+                    + "]"
+                    + "}")
+            .get("deepNestedV"));
+  }
+
+  @Test
+  public void constructNestedArrayNode() {
+    assertEquals(
+        collectionValue(List.of(1969, 2011)),
+        tupleValueWithArraySupport("{\"nestedV\":[1969,2011]}").get("nestedV"));
+  }
+
+  @Test
+  public void constructNestedObjectNode() {
+    assertEquals(
+        collectionValue(List.of(Map.of("count", 1969))),
+        tupleValue("{\"nestedV\":{\"count\":1969}}").get("nestedV"));
+  }
+
+  @Test
+  public void constructArrayOfGeoPoints() {
+    assertEquals(
+        new ExprCollectionValue(
+            List.of(
+                new OpenSearchExprGeoPointValue(42.60355556, -97.25263889),
+                new OpenSearchExprGeoPointValue(-33.6123556, 66.287449))),
+        tupleValueWithArraySupport(
+                "{\"geoV\":["
+                    + "{\"lat\":42.60355556,\"lon\":-97.25263889},"
+                    + "{\"lat\":-33.6123556,\"lon\":66.287449}"
+                    + "]}")
+            .get("geoV"));
+  }
+
+  @Test
+  public void constructArrayOfGeoPointsReturnsFirstIndex() {
+    assertEquals(
+        new OpenSearchExprGeoPointValue(42.60355556, -97.25263889),
+        tupleValue(
+                "{\"geoV\":["
+                    + "{\"lat\":42.60355556,\"lon\":-97.25263889},"
+                    + "{\"lat\":-33.6123556,\"lon\":66.287449}"
+                    + "]}")
+            .get("geoV"));
+  }
+
+  @Test
+  public void constructArrayOfIPsReturnsFirstIndex() {
+    assertEquals(
+        new OpenSearchExprIpValue("192.168.0.1"),
+        tupleValue("{\"ipV\":[\"192.168.0.1\",\"192.168.0.2\"]}").get("ipV"));
+  }
+
+  @Test
+  public void constructBinaryArrayReturnsFirstIndex() {
+    assertEquals(
+        new OpenSearchExprBinaryValue("U29tZSBiaWsdfsdfgYmxvYg=="),
+        tupleValue("{\"binaryV\":[\"U29tZSBiaWsdfsdfgYmxvYg==\",\"U987yuhjjiy8jhk9vY+98jjdf\"]}")
+            .get("binaryV"));
+  }
+
+  @Test
+  public void constructArrayOfCustomEpochMillisReturnsFirstIndex() {
+    assertEquals(
+        new ExprDatetimeValue("2015-01-01 12:10:30"),
+        tupleValue("{\"customAndEpochMillisV\":[\"2015-01-01 12:10:30\",\"1999-11-09 01:09:44\"]}")
+            .get("customAndEpochMillisV"));
+  }
+
+  @Test
+  public void constructArrayOfDateStringsReturnsFirstIndex() {
+    assertEquals(
+        new ExprDateValue("1984-04-12"),
+        tupleValue("{\"dateStringV\":[\"1984-04-12\",\"2033-05-03\"]}").get("dateStringV"));
+  }
+
+  @Test
+  public void constructArrayOfTimeStringsReturnsFirstIndex() {
+    assertEquals(
+        new ExprTimeValue("12:10:30"),
+        tupleValue("{\"timeStringV\":[\"12:10:30.000Z\",\"18:33:55.000Z\"]}").get("timeStringV"));
+  }
+
+  @Test
+  public void constructArrayOfEpochMillis() {
+    assertEquals(
+        new ExprTimestampValue(Instant.ofEpochMilli(1420070400001L)),
+        tupleValue("{\"dateOrEpochMillisV\":[\"1420070400001\",\"1454251113333\"]}")
+            .get("dateOrEpochMillisV"));
   }
 
   @Test
@@ -279,54 +697,85 @@ public void constructStruct() {
 
   @Test
   public void constructIP() {
-    assertEquals(new OpenSearchExprIpValue("192.168.0.1"),
+    assertEquals(
+        new OpenSearchExprIpValue("192.168.0.1"),
         tupleValue("{\"ipV\":\"192.168.0.1\"}").get("ipV"));
   }
 
+  private static final double TOLERANCE = 1E-5;
+
   @Test
   public void constructGeoPoint() {
-    assertEquals(new OpenSearchExprGeoPointValue(42.60355556, -97.25263889),
-        tupleValue("{\"geoV\":{\"lat\":42.60355556,\"lon\":-97.25263889}}").get("geoV"));
-    assertEquals(new OpenSearchExprGeoPointValue(42.60355556, -97.25263889),
-        tupleValue("{\"geoV\":{\"lat\":\"42.60355556\",\"lon\":\"-97.25263889\"}}").get("geoV"));
-    assertEquals(new OpenSearchExprGeoPointValue(42.60355556, -97.25263889),
+    final double lat = 42.60355556;
+    final double lon = -97.25263889;
+    final var expectedGeoPointValue = new OpenSearchExprGeoPointValue(lat, lon);
+    // An object with a latitude and longitude.
+    assertEquals(
+        expectedGeoPointValue,
+        tupleValue(String.format("{\"geoV\":{\"lat\":%.8f,\"lon\":%.8f}}", lat, lon)).get("geoV"));
+
+    // A string in the “latitude,longitude” format.
+    assertEquals(
+        expectedGeoPointValue,
+        tupleValue(String.format("{\"geoV\":\"%.8f,%.8f\"}", lat, lon)).get("geoV"));
+
+    // A geohash.
+    var point =
+        (OpenSearchExprGeoPointValue.GeoPoint)
+            tupleValue(String.format("{\"geoV\":\"%s\"}", Geohash.stringEncode(lon, lat)))
+                .get("geoV")
+                .value();
+    assertEquals(lat, point.getLat(), TOLERANCE);
+    assertEquals(lon, point.getLon(), TOLERANCE);
+
+    // An array in the [longitude, latitude] format.
+    assertEquals(
+        expectedGeoPointValue,
+        tupleValue(String.format("{\"geoV\":[%.8f, %.8f]}", lon, lat)).get("geoV"));
+
+    // A Well-Known Text POINT in the “POINT(longitude latitude)” format.
+    assertEquals(
+        expectedGeoPointValue,
+        tupleValue(String.format("{\"geoV\":\"POINT (%.8f %.8f)\"}", lon, lat)).get("geoV"));
+
+    // GeoJSON format, where the coordinates are in the [longitude, latitude] format
+    assertEquals(
+        expectedGeoPointValue,
+        tupleValue(
+                String.format(
+                    "{\"geoV\":{\"type\":\"Point\",\"coordinates\":[%.8f,%.8f]}}", lon, lat))
+            .get("geoV"));
+
+    assertEquals(
+        new OpenSearchExprGeoPointValue(42.60355556, -97.25263889),
         constructFromObject("geoV", "42.60355556,-97.25263889"));
   }
 
   @Test
   public void constructGeoPointFromUnsupportedFormatShouldThrowException() {
-    IllegalStateException exception =
-        assertThrows(IllegalStateException.class,
-            () -> tupleValue("{\"geoV\":[42.60355556,-97.25263889]}").get("geoV"));
-    assertEquals("geo point must in format of {\"lat\": number, \"lon\": number}",
-        exception.getMessage());
+    OpenSearchParseException exception =
+        assertThrows(
+            OpenSearchParseException.class,
+            () -> tupleValue("{\"geoV\": [42.60355556, false]}").get("geoV"));
+    assertEquals("lat must be a number, got false", exception.getMessage());
 
     exception =
-        assertThrows(IllegalStateException.class,
+        assertThrows(
+            OpenSearchParseException.class,
             () -> tupleValue("{\"geoV\":{\"lon\":-97.25263889}}").get("geoV"));
-    assertEquals("geo point must in format of {\"lat\": number, \"lon\": number}",
-        exception.getMessage());
-
-    exception =
-        assertThrows(IllegalStateException.class,
-            () -> tupleValue("{\"geoV\":{\"lat\":-97.25263889}}").get("geoV"));
-    assertEquals("geo point must in format of {\"lat\": number, \"lon\": number}",
-        exception.getMessage());
+    assertEquals("field [lat] missing", exception.getMessage());
 
     exception =
-        assertThrows(IllegalStateException.class,
+        assertThrows(
+            OpenSearchParseException.class,
             () -> tupleValue("{\"geoV\":{\"lat\":true,\"lon\":-97.25263889}}").get("geoV"));
-    assertEquals("latitude must be number value, but got value: true", exception.getMessage());
-
-    exception =
-        assertThrows(IllegalStateException.class,
-            () -> tupleValue("{\"geoV\":{\"lat\":42.60355556,\"lon\":false}}").get("geoV"));
-    assertEquals("longitude must be number value, but got value: false", exception.getMessage());
+    assertEquals("lat must be a number", exception.getMessage());
   }
 
   @Test
   public void constructBinary() {
-    assertEquals(new OpenSearchExprBinaryValue("U29tZSBiaW5hcnkgYmxvYg=="),
+    assertEquals(
+        new OpenSearchExprBinaryValue("U29tZSBiaW5hcnkgYmxvYg=="),
         tupleValue("{\"binaryV\":\"U29tZSBiaW5hcnkgYmxvYg==\"}").get("binaryV"));
   }
 
@@ -337,14 +786,16 @@ public void constructBinary() {
   @Test
   public void constructFromOpenSearchArrayReturnFirstElement() {
     assertEquals(integerValue(1), tupleValue("{\"intV\":[1, 2, 3]}").get("intV"));
-    assertEquals(new ExprTupleValue(
-        new LinkedHashMap<String, ExprValue>() {
-          {
-            put("id", integerValue(1));
-            put("state", stringValue("WA"));
-          }
-        }), tupleValue("{\"structV\":[{\"id\":1,\"state\":\"WA\"},{\"id\":2,\"state\":\"CA\"}]}}")
-        .get("structV"));
+    assertEquals(
+        new ExprTupleValue(
+            new LinkedHashMap<String, ExprValue>() {
+              {
+                put("id", integerValue(1));
+                put("state", stringValue("WA"));
+              }
+            }),
+        tupleValue("{\"structV\":[{\"id\":1,\"state\":\"WA\"},{\"id\":2,\"state\":\"CA\"}]}}")
+            .get("structV"));
   }
 
   @Test
@@ -364,30 +815,71 @@ public void noTypeFoundForMapping() {
   @Test
   public void constructUnsupportedTypeThrowException() {
     OpenSearchExprValueFactory exprValueFactory =
-        new OpenSearchExprValueFactory(ImmutableMap.of("type", new TestType()));
+        new OpenSearchExprValueFactory(Map.of("type", new TestType()));
     IllegalStateException exception =
-        assertThrows(IllegalStateException.class, () -> exprValueFactory.construct("{\"type\":1}"));
+        assertThrows(
+            IllegalStateException.class, () -> exprValueFactory.construct("{\"type\":1}", false));
     assertEquals("Unsupported type: TEST_TYPE for value: 1.", exception.getMessage());
 
     exception =
-        assertThrows(IllegalStateException.class, () -> exprValueFactory.construct("type", 1));
-    assertEquals(
-        "Unsupported type: TEST_TYPE for value: 1.",
-        exception.getMessage());
+        assertThrows(
+            IllegalStateException.class, () -> exprValueFactory.construct("type", 1, false));
+    assertEquals("Unsupported type: TEST_TYPE for value: 1.", exception.getMessage());
+  }
+
+  @Test
+  // aggregation adds info about new columns to the factory,
+  // it is accepted without overwriting existing data.
+  public void factoryMappingsAreExtendableWithoutOverWrite()
+      throws NoSuchFieldException, IllegalAccessException {
+    var factory = new OpenSearchExprValueFactory(Map.of("value", OpenSearchDataType.of(INTEGER)));
+    factory.extendTypeMapping(
+        Map.of(
+            "value", OpenSearchDataType.of(DOUBLE),
+            "agg", OpenSearchDataType.of(DATE)));
+    // extract private field for testing purposes
+    var field = factory.getClass().getDeclaredField("typeMapping");
+    field.setAccessible(true);
+    @SuppressWarnings("unchecked")
+    var mapping = (Map<String, OpenSearchDataType>) field.get(factory);
+    assertAll(
+        () -> assertEquals(2, mapping.size()),
+        () -> assertTrue(mapping.containsKey("value")),
+        () -> assertTrue(mapping.containsKey("agg")),
+        () -> assertEquals(OpenSearchDataType.of(INTEGER), mapping.get("value")),
+        () -> assertEquals(OpenSearchDataType.of(DATE), mapping.get("agg")));
   }
 
   public Map<String, ExprValue> tupleValue(String jsonString) {
-    final ExprValue construct = exprValueFactory.construct(jsonString);
+    final ExprValue construct = exprValueFactory.construct(jsonString, false);
+    return construct.tupleValue();
+  }
+
+  public Map<String, ExprValue> tupleValueWithArraySupport(String jsonString) {
+    final ExprValue construct = exprValueFactory.construct(jsonString, true);
     return construct.tupleValue();
   }
 
   private ExprValue constructFromObject(String fieldName, Object value) {
-    return exprValueFactory.construct(fieldName, value);
+    return exprValueFactory.construct(fieldName, value, false);
+  }
+
+  private ExprValue constructFromObjectWithArraySupport(String fieldName, Object value) {
+    return exprValueFactory.construct(fieldName, value, true);
   }
 
-  @EqualsAndHashCode
+  @EqualsAndHashCode(callSuper = false)
   @ToString
-  private static class TestType implements ExprType {
+  private static class TestType extends OpenSearchDataType {
+
+    public TestType() {
+      super(MappingType.Invalid);
+    }
+
+    @Override
+    protected OpenSearchDataType cloneEmpty() {
+      return this;
+    }
 
     @Override
     public String typeName() {
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngineTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngineTest.java
index 4a0c6e24f1..739b70b1b8 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngineTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngineTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.executor;
 
 import static com.google.common.collect.ImmutableMap.of;
@@ -17,38 +16,47 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opensearch.sql.common.setting.Settings.Key.QUERY_SIZE_LIMIT;
+import static org.opensearch.sql.common.setting.Settings.Key.SQL_CURSOR_KEEP_ALIVE;
 import static org.opensearch.sql.data.model.ExprValueUtils.tupleValue;
 import static org.opensearch.sql.executor.ExecutionEngine.QueryResponse;
 
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import lombok.RequiredArgsConstructor;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.common.unit.TimeValue;
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.executor.ExecutionContext;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.ExecutionEngine.ExplainResponse;
+import org.opensearch.sql.executor.pagination.PlanSerializer;
 import org.opensearch.sql.opensearch.client.OpenSearchClient;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
 import org.opensearch.sql.opensearch.executor.protector.OpenSearchExecutionProtector;
-import org.opensearch.sql.opensearch.storage.OpenSearchIndexScan;
+import org.opensearch.sql.opensearch.request.OpenSearchRequest;
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
+import org.opensearch.sql.opensearch.storage.scan.OpenSearchIndexScan;
+import org.opensearch.sql.planner.SerializablePlan;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.storage.TableScanOperator;
 import org.opensearch.sql.storage.split.Split;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class OpenSearchExecutionEngineTest {
 
   @Mock private OpenSearchClient client;
@@ -64,29 +72,30 @@ class OpenSearchExecutionEngineTest {
   @BeforeEach
   void setUp() {
     doAnswer(
-        invocation -> {
-          // Run task immediately
-          Runnable task = invocation.getArgument(0);
-          task.run();
-          return null;
-        })
+            invocation -> {
+              // Run task immediately
+              Runnable task = invocation.getArgument(0);
+              task.run();
+              return null;
+            })
         .when(client)
         .schedule(any());
   }
 
   @Test
-  void executeSuccessfully() {
+  void execute_successfully() {
     List<ExprValue> expected =
         Arrays.asList(
             tupleValue(of("name", "John", "age", 20)), tupleValue(of("name", "Allen", "age", 30)));
     FakePhysicalPlan plan = new FakePhysicalPlan(expected.iterator());
     when(protector.protect(plan)).thenReturn(plan);
 
-    OpenSearchExecutionEngine executor = new OpenSearchExecutionEngine(client, protector);
+    OpenSearchExecutionEngine executor =
+        new OpenSearchExecutionEngine(client, protector, new PlanSerializer(null));
     List<ExprValue> actual = new ArrayList<>();
     executor.execute(
         plan,
-        new ResponseListener<QueryResponse>() {
+        new ResponseListener<>() {
           @Override
           public void onResponse(QueryResponse response) {
             actual.addAll(response.getResults());
@@ -104,17 +113,47 @@ public void onFailure(Exception e) {
   }
 
   @Test
-  void executeWithFailure() {
+  void execute_with_cursor() {
+    List<ExprValue> expected =
+        Arrays.asList(
+            tupleValue(of("name", "John", "age", 20)), tupleValue(of("name", "Allen", "age", 30)));
+    var plan = new FakePhysicalPlan(expected.iterator());
+    when(protector.protect(plan)).thenReturn(plan);
+
+    OpenSearchExecutionEngine executor =
+        new OpenSearchExecutionEngine(client, protector, new PlanSerializer(null));
+    List<ExprValue> actual = new ArrayList<>();
+    executor.execute(
+        plan,
+        new ResponseListener<>() {
+          @Override
+          public void onResponse(QueryResponse response) {
+            actual.addAll(response.getResults());
+            assertTrue(response.getCursor().toString().startsWith("n:"));
+          }
+
+          @Override
+          public void onFailure(Exception e) {
+            fail("Error occurred during execution", e);
+          }
+        });
+
+    assertEquals(expected, actual);
+  }
+
+  @Test
+  void execute_with_failure() {
     PhysicalPlan plan = mock(PhysicalPlan.class);
     RuntimeException expected = new RuntimeException("Execution error");
     when(plan.hasNext()).thenThrow(expected);
     when(protector.protect(plan)).thenReturn(plan);
 
-    OpenSearchExecutionEngine executor = new OpenSearchExecutionEngine(client, protector);
+    OpenSearchExecutionEngine executor =
+        new OpenSearchExecutionEngine(client, protector, new PlanSerializer(null));
     AtomicReference<Exception> actual = new AtomicReference<>();
     executor.execute(
         plan,
-        new ResponseListener<QueryResponse>() {
+        new ResponseListener<>() {
           @Override
           public void onResponse(QueryResponse response) {
             fail("Expected error didn't happen");
@@ -130,53 +169,69 @@ public void onFailure(Exception e) {
   }
 
   @Test
-  void explainSuccessfully() {
-    OpenSearchExecutionEngine executor = new OpenSearchExecutionEngine(client, protector);
+  void explain_successfully() {
+    OpenSearchExecutionEngine executor =
+        new OpenSearchExecutionEngine(client, protector, new PlanSerializer(null));
     Settings settings = mock(Settings.class);
-    when(settings.getSettingValue(QUERY_SIZE_LIMIT)).thenReturn(100);
-    PhysicalPlan plan = new OpenSearchIndexScan(mock(OpenSearchClient.class),
-        settings, "test", 10000, mock(OpenSearchExprValueFactory.class));
+    when(settings.getSettingValue(SQL_CURSOR_KEEP_ALIVE)).thenReturn(TimeValue.timeValueMinutes(1));
+
+    OpenSearchExprValueFactory exprValueFactory = mock(OpenSearchExprValueFactory.class);
+    final var name = new OpenSearchRequest.IndexName("test");
+    final int defaultQuerySize = 100;
+    final int maxResultWindow = 10000;
+    final var requestBuilder = new OpenSearchRequestBuilder(defaultQuerySize, exprValueFactory);
+    PhysicalPlan plan =
+        new OpenSearchIndexScan(
+            mock(OpenSearchClient.class),
+            maxResultWindow,
+            requestBuilder.build(
+                name, maxResultWindow, settings.getSettingValue(SQL_CURSOR_KEEP_ALIVE)));
 
     AtomicReference<ExplainResponse> result = new AtomicReference<>();
-    executor.explain(plan, new ResponseListener<ExplainResponse>() {
-      @Override
-      public void onResponse(ExplainResponse response) {
-        result.set(response);
-      }
-
-      @Override
-      public void onFailure(Exception e) {
-        fail(e);
-      }
-    });
+    executor.explain(
+        plan,
+        new ResponseListener<>() {
+          @Override
+          public void onResponse(ExplainResponse response) {
+            result.set(response);
+          }
+
+          @Override
+          public void onFailure(Exception e) {
+            fail(e);
+          }
+        });
 
     assertNotNull(result.get());
   }
 
   @Test
-  void explainWithFailure() {
-    OpenSearchExecutionEngine executor = new OpenSearchExecutionEngine(client, protector);
+  void explain_with_failure() {
+    OpenSearchExecutionEngine executor =
+        new OpenSearchExecutionEngine(client, protector, new PlanSerializer(null));
     PhysicalPlan plan = mock(PhysicalPlan.class);
     when(plan.accept(any(), any())).thenThrow(IllegalStateException.class);
 
     AtomicReference<Exception> result = new AtomicReference<>();
-    executor.explain(plan, new ResponseListener<ExplainResponse>() {
-      @Override
-      public void onResponse(ExplainResponse response) {
-        fail("Should fail as expected");
-      }
-
-      @Override
-      public void onFailure(Exception e) {
-        result.set(e);
-      }
-    });
+    executor.explain(
+        plan,
+        new ResponseListener<>() {
+          @Override
+          public void onResponse(ExplainResponse response) {
+            fail("Should fail as expected");
+          }
+
+          @Override
+          public void onFailure(Exception e) {
+            result.set(e);
+          }
+        });
 
     assertNotNull(result.get());
   }
 
   @Test
-  void callAddSplitAndOpenInOrder() {
+  void call_add_split_and_open_in_order() {
     List<ExprValue> expected =
         Arrays.asList(
             tupleValue(of("name", "John", "age", 20)), tupleValue(of("name", "Allen", "age", 30)));
@@ -184,7 +239,8 @@ void callAddSplitAndOpenInOrder() {
     when(protector.protect(plan)).thenReturn(plan);
     when(executionContext.getSplit()).thenReturn(Optional.of(split));
 
-    OpenSearchExecutionEngine executor = new OpenSearchExecutionEngine(client, protector);
+    OpenSearchExecutionEngine executor =
+        new OpenSearchExecutionEngine(client, protector, new PlanSerializer(null));
     List<ExprValue> actual = new ArrayList<>();
     executor.execute(
         plan,
@@ -208,12 +264,18 @@ public void onFailure(Exception e) {
   }
 
   @RequiredArgsConstructor
-  private static class FakePhysicalPlan extends TableScanOperator {
+  private static class FakePhysicalPlan extends TableScanOperator implements SerializablePlan {
     private final Iterator<ExprValue> it;
     private boolean hasOpen;
     private boolean hasClosed;
     private boolean hasSplit;
 
+    @Override
+    public void readExternal(ObjectInput in) {}
+
+    @Override
+    public void writeExternal(ObjectOutput out) {}
+
     @Override
     public void open() {
       super.open();
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManagerTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManagerTest.java
index 6d2b9b13ce..047a510180 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManagerTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManagerTest.java
@@ -32,17 +32,13 @@
 @ExtendWith(MockitoExtension.class)
 class OpenSearchQueryManagerTest {
 
-  @Mock
-  private QueryId queryId;
+  @Mock private QueryId queryId;
 
-  @Mock
-  private QueryService queryService;
+  @Mock private QueryService queryService;
 
-  @Mock
-  private UnresolvedPlan plan;
+  @Mock private UnresolvedPlan plan;
 
-  @Mock
-  private ResponseListener<ExecutionEngine.QueryResponse> listener;
+  @Mock private ResponseListener<ExecutionEngine.QueryResponse> listener;
 
   @Test
   public void submitQuery() {
@@ -51,19 +47,20 @@ public void submitQuery() {
     when(nodeClient.threadPool()).thenReturn(threadPool);
 
     AtomicBoolean isRun = new AtomicBoolean(false);
-    AbstractPlan queryPlan = new QueryPlan(queryId, plan, queryService, listener) {
-      @Override
-      public void execute() {
-        isRun.set(true);
-      }
-    };
+    AbstractPlan queryPlan =
+        new QueryPlan(queryId, plan, queryService, listener) {
+          @Override
+          public void execute() {
+            isRun.set(true);
+          }
+        };
 
     doAnswer(
-        invocation -> {
-          Runnable task = invocation.getArgument(0);
-          task.run();
-          return null;
-        })
+            invocation -> {
+              Runnable task = invocation.getArgument(0);
+              task.run();
+              return null;
+            })
         .when(threadPool)
         .schedule(any(), any(), any());
     new OpenSearchQueryManager(nodeClient).submit(queryPlan);
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/ResourceMonitorPlanTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/ResourceMonitorPlanTest.java
index d4d987a7df..26bcdf6d89 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/ResourceMonitorPlanTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/ResourceMonitorPlanTest.java
@@ -3,14 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.executor;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -19,22 +20,19 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.monitor.ResourceMonitor;
 import org.opensearch.sql.opensearch.executor.protector.ResourceMonitorPlan;
+import org.opensearch.sql.planner.SerializablePlan;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor;
 
 @ExtendWith(MockitoExtension.class)
 class ResourceMonitorPlanTest {
-  @Mock
-  private PhysicalPlan plan;
+  @Mock private PhysicalPlan plan;
 
-  @Mock
-  private ResourceMonitor resourceMonitor;
+  @Mock private ResourceMonitor resourceMonitor;
 
-  @Mock
-  private PhysicalPlanNodeVisitor visitor;
+  @Mock private PhysicalPlanNodeVisitor visitor;
 
-  @Mock
-  private Object context;
+  @Mock private Object context;
 
   private ResourceMonitorPlan monitorPlan;
 
@@ -107,4 +105,18 @@ void acceptSuccess() {
     monitorPlan.accept(visitor, context);
     verify(plan, times(1)).accept(visitor, context);
   }
+
+  @Test
+  void getPlanForSerialization() {
+    plan = mock(PhysicalPlan.class, withSettings().extraInterfaces(SerializablePlan.class));
+    monitorPlan = new ResourceMonitorPlan(plan, resourceMonitor);
+    assertEquals(plan, monitorPlan.getPlanForSerialization());
+  }
+
+  @Test
+  void notSerializable() {
+    // ResourceMonitorPlan shouldn't be serialized, attempt should throw an exception
+    assertThrows(UnsupportedOperationException.class, () -> monitorPlan.writeExternal(null));
+    assertThrows(UnsupportedOperationException.class, () -> monitorPlan.readExternal(null));
+  }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/NoopExecutionProtectorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/NoopExecutionProtectorTest.java
index 8dc49aad01..f028f3ea5d 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/NoopExecutionProtectorTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/NoopExecutionProtectorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.executor.protector;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -17,8 +16,7 @@
 @ExtendWith(MockitoExtension.class)
 class NoopExecutionProtectorTest {
 
-  @Mock
-  private PhysicalPlan plan;
+  @Mock private PhysicalPlan plan;
 
   @Test
   void protect() {
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java
index 857ff601e1..5cd11c6cd4 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java
@@ -3,13 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.executor.protector;
 
 import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.opensearch.sql.ast.tree.Sort.SortOption.DEFAULT_ASC;
 import static org.opensearch.sql.data.type.ExprCoreType.DOUBLE;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
@@ -24,13 +25,15 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -57,25 +60,27 @@
 import org.opensearch.sql.opensearch.planner.physical.ADOperator;
 import org.opensearch.sql.opensearch.planner.physical.MLCommonsOperator;
 import org.opensearch.sql.opensearch.planner.physical.MLOperator;
+import org.opensearch.sql.opensearch.request.OpenSearchRequest;
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
 import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
-import org.opensearch.sql.opensearch.storage.OpenSearchIndexScan;
+import org.opensearch.sql.opensearch.storage.scan.OpenSearchIndexScan;
+import org.opensearch.sql.planner.physical.CursorCloseOperator;
+import org.opensearch.sql.planner.physical.NestedOperator;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.planner.physical.PhysicalPlanDSL;
+import org.opensearch.sql.planner.physical.TakeOrderedOperator;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class OpenSearchExecutionProtectorTest {
 
-  @Mock
-  private OpenSearchClient client;
+  @Mock private OpenSearchClient client;
 
-  @Mock
-  private ResourceMonitor resourceMonitor;
+  @Mock private ResourceMonitor resourceMonitor;
 
-  @Mock
-  private OpenSearchExprValueFactory exprValueFactory;
+  @Mock private OpenSearchExprValueFactory exprValueFactory;
 
-  @Mock
-  private OpenSearchSettings settings;
+  @Mock private OpenSearchSettings settings;
 
   private OpenSearchExecutionProtector executionProtector;
 
@@ -85,32 +90,35 @@ public void setup() {
   }
 
   @Test
-  public void testProtectIndexScan() {
-    when(settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT)).thenReturn(200);
-
+  void test_protect_indexScan() {
     String indexName = "test";
-    Integer maxResultWindow = 10000;
+    final int maxResultWindow = 10000;
+    final int querySizeLimit = 200;
     NamedExpression include = named("age", ref("age", INTEGER));
     ReferenceExpression exclude = ref("name", STRING);
     ReferenceExpression dedupeField = ref("name", STRING);
     ReferenceExpression topField = ref("name", STRING);
-    List<Expression> topExprs = Arrays.asList(ref("age", INTEGER));
+    List<Expression> topExprs = List.of(ref("age", INTEGER));
     Expression filterExpr = literal(ExprBooleanValue.of(true));
-    List<NamedExpression> groupByExprs = Arrays.asList(named("age", ref("age", INTEGER)));
+    List<NamedExpression> groupByExprs = List.of(named("age", ref("age", INTEGER)));
     List<NamedAggregator> aggregators =
-        Arrays.asList(named("avg(age)", new AvgAggregator(Arrays.asList(ref("age", INTEGER)),
-            DOUBLE)));
+        List.of(named("avg(age)", new AvgAggregator(List.of(ref("age", INTEGER)), DOUBLE)));
     Map<ReferenceExpression, ReferenceExpression> mappings =
         ImmutableMap.of(ref("name", STRING), ref("lastname", STRING));
     Pair<ReferenceExpression, Expression> newEvalField =
         ImmutablePair.of(ref("name1", STRING), ref("name", STRING));
-    Integer sortCount = 100;
     Pair<Sort.SortOption, Expression> sortField =
         ImmutablePair.of(DEFAULT_ASC, ref("name1", STRING));
-    Integer size = 200;
     Integer limit = 10;
     Integer offset = 10;
 
+    final var name = new OpenSearchRequest.IndexName(indexName);
+    final var request =
+        new OpenSearchRequestBuilder(querySizeLimit, exprValueFactory)
+            .build(
+                name,
+                maxResultWindow,
+                settings.getSettingValue(Settings.Key.SQL_CURSOR_KEEP_ALIVE));
     assertEquals(
         PhysicalPlanDSL.project(
             PhysicalPlanDSL.limit(
@@ -125,8 +133,7 @@ public void testProtectIndexScan() {
                                                 filter(
                                                     resourceMonitor(
                                                         new OpenSearchIndexScan(
-                                                            client, settings, indexName,
-                                                            maxResultWindow, exprValueFactory)),
+                                                            client, maxResultWindow, request)),
                                                     filterExpr),
                                                 aggregators,
                                                 groupByExprs),
@@ -153,8 +160,7 @@ public void testProtectIndexScan() {
                                             PhysicalPlanDSL.agg(
                                                 filter(
                                                     new OpenSearchIndexScan(
-                                                        client, settings, indexName,
-                                                        maxResultWindow, exprValueFactory),
+                                                        client, maxResultWindow, request),
                                                     filterExpr),
                                                 aggregators,
                                                 groupByExprs),
@@ -173,7 +179,7 @@ public void testProtectIndexScan() {
 
   @SuppressWarnings("unchecked")
   @Test
-  public void testProtectSortForWindowOperator() {
+  void test_protect_sort_for_windowOperator() {
     NamedExpression rank = named(mock(RankFunction.class));
     Pair<Sort.SortOption, Expression> sortItem =
         ImmutablePair.of(DEFAULT_ASC, DSL.ref("age", INTEGER));
@@ -181,44 +187,24 @@ public void testProtectSortForWindowOperator() {
         new WindowDefinition(emptyList(), ImmutableList.of(sortItem));
 
     assertEquals(
-        window(
-            resourceMonitor(
-                sort(
-                    values(emptyList()),
-                    sortItem)),
-            rank,
-            windowDefinition),
+        window(resourceMonitor(sort(values(emptyList()), sortItem)), rank, windowDefinition),
         executionProtector.protect(
-            window(
-                sort(
-                    values(emptyList()),
-                    sortItem
-                ),
-                rank,
-                windowDefinition)));
+            window(sort(values(emptyList()), sortItem), rank, windowDefinition)));
   }
 
   @Test
-  public void testProtectWindowOperatorInput() {
+  void test_protect_windowOperator_input() {
     NamedExpression avg = named(mock(AggregateWindowFunction.class));
     WindowDefinition windowDefinition = mock(WindowDefinition.class);
 
     assertEquals(
-        window(
-            resourceMonitor(
-                values()),
-            avg,
-            windowDefinition),
-        executionProtector.protect(
-            window(
-                values(),
-                avg,
-                windowDefinition)));
+        window(resourceMonitor(values()), avg, windowDefinition),
+        executionProtector.protect(window(values(), avg, windowDefinition)));
   }
 
   @SuppressWarnings("unchecked")
   @Test
-  public void testNotProtectWindowOperatorInputIfAlreadyProtected() {
+  void test_not_protect_windowOperator_input_if_already_protected() {
     NamedExpression avg = named(mock(AggregateWindowFunction.class));
     Pair<Sort.SortOption, Expression> sortItem =
         ImmutablePair.of(DEFAULT_ASC, DSL.ref("age", INTEGER));
@@ -226,92 +212,109 @@ public void testNotProtectWindowOperatorInputIfAlreadyProtected() {
         new WindowDefinition(emptyList(), ImmutableList.of(sortItem));
 
     assertEquals(
-        window(
-            resourceMonitor(
-                sort(
-                    values(emptyList()),
-                    sortItem)),
-            avg,
-            windowDefinition),
+        window(resourceMonitor(sort(values(emptyList()), sortItem)), avg, windowDefinition),
         executionProtector.protect(
-            window(
-                sort(
-                    values(emptyList()),
-                    sortItem),
-                avg,
-                windowDefinition)));
+            window(sort(values(emptyList()), sortItem), avg, windowDefinition)));
   }
 
   @Test
-  public void testWithoutProtection() {
+  void test_without_protection() {
     Expression filterExpr = literal(ExprBooleanValue.of(true));
 
     assertEquals(
-        filter(
-            filter(null, filterExpr),
-            filterExpr),
-        executionProtector.protect(
-            filter(
-                filter(null, filterExpr),
-                filterExpr)
-        )
-    );
+        filter(filter(null, filterExpr), filterExpr),
+        executionProtector.protect(filter(filter(null, filterExpr), filterExpr)));
   }
 
   @Test
-  public void testVisitMlCommons() {
+  void test_visitMLcommons() {
     NodeClient nodeClient = mock(NodeClient.class);
     MLCommonsOperator mlCommonsOperator =
-            new MLCommonsOperator(
-              values(emptyList()), "kmeans",
-                new HashMap<String, Literal>() {{
-                  put("centroids", new Literal(3, DataType.INTEGER));
-                  put("iterations", new Literal(2, DataType.INTEGER));
-                  put("distance_type", new Literal(null, DataType.STRING));
-                }},
-                nodeClient
-            );
+        new MLCommonsOperator(
+            values(emptyList()),
+            "kmeans",
+            new HashMap<String, Literal>() {
+              {
+                put("centroids", new Literal(3, DataType.INTEGER));
+                put("iterations", new Literal(2, DataType.INTEGER));
+                put("distance_type", new Literal(null, DataType.STRING));
+              }
+            },
+            nodeClient);
 
-    assertEquals(executionProtector.doProtect(mlCommonsOperator),
-            executionProtector.visitMLCommons(mlCommonsOperator, null));
+    assertEquals(
+        executionProtector.doProtect(mlCommonsOperator),
+        executionProtector.visitMLCommons(mlCommonsOperator, null));
   }
 
   @Test
-  public void testVisitAD() {
+  void test_visitAD() {
     NodeClient nodeClient = mock(NodeClient.class);
     ADOperator adOperator =
-            new ADOperator(
-                values(emptyList()),
-                new HashMap<String, Literal>() {{
-                  put("shingle_size", new Literal(8, DataType.INTEGER));
-                  put("time_decay", new Literal(0.0001, DataType.DOUBLE));
-                  put("time_field", new Literal(null, DataType.STRING));
-                }},
-                nodeClient
-            );
+        new ADOperator(
+            values(emptyList()),
+            new HashMap<String, Literal>() {
+              {
+                put("shingle_size", new Literal(8, DataType.INTEGER));
+                put("time_decay", new Literal(0.0001, DataType.DOUBLE));
+                put("time_field", new Literal(null, DataType.STRING));
+              }
+            },
+            nodeClient);
 
-    assertEquals(executionProtector.doProtect(adOperator),
-            executionProtector.visitAD(adOperator, null));
+    assertEquals(
+        executionProtector.doProtect(adOperator), executionProtector.visitAD(adOperator, null));
   }
 
   @Test
-  public void testVisitML() {
+  void test_visitML() {
     NodeClient nodeClient = mock(NodeClient.class);
     MLOperator mlOperator =
-            new MLOperator(
-                values(emptyList()),
-                new HashMap<String, Literal>() {{
-                  put("action", new Literal("train", DataType.STRING));
-                  put("algorithm", new Literal("rcf", DataType.STRING));
-                  put("shingle_size", new Literal(8, DataType.INTEGER));
-                  put("time_decay", new Literal(0.0001, DataType.DOUBLE));
-                  put("time_field", new Literal(null, DataType.STRING));
-                }},
-                nodeClient
-            );
+        new MLOperator(
+            values(emptyList()),
+            new HashMap<String, Literal>() {
+              {
+                put("action", new Literal("train", DataType.STRING));
+                put("algorithm", new Literal("rcf", DataType.STRING));
+                put("shingle_size", new Literal(8, DataType.INTEGER));
+                put("time_decay", new Literal(0.0001, DataType.DOUBLE));
+                put("time_field", new Literal(null, DataType.STRING));
+              }
+            },
+            nodeClient);
 
-    assertEquals(executionProtector.doProtect(mlOperator),
-            executionProtector.visitML(mlOperator, null));
+    assertEquals(
+        executionProtector.doProtect(mlOperator), executionProtector.visitML(mlOperator, null));
+  }
+
+  @Test
+  void test_visitNested() {
+    Set<String> args = Set.of("message.info");
+    Map<String, List<String>> groupedFieldsByPath = Map.of("message", List.of("message.info"));
+    NestedOperator nestedOperator =
+        new NestedOperator(values(emptyList()), args, groupedFieldsByPath);
+
+    assertEquals(
+        executionProtector.doProtect(nestedOperator),
+        executionProtector.visitNested(nestedOperator, values(emptyList())));
+  }
+
+  @Test
+  void do_nothing_with_CursorCloseOperator_and_children() {
+    var child = mock(PhysicalPlan.class);
+    var plan = new CursorCloseOperator(child);
+    assertSame(plan, executionProtector.protect(plan));
+    verify(child, never()).accept(executionProtector, null);
+  }
+
+  @Test
+  public void test_visitTakeOrdered() {
+    Pair<Sort.SortOption, Expression> sort =
+        ImmutablePair.of(Sort.SortOption.DEFAULT_ASC, ref("a", INTEGER));
+    TakeOrderedOperator takeOrdered =
+        PhysicalPlanDSL.takeOrdered(PhysicalPlanDSL.values(emptyList()), 10, 5, sort);
+    assertEquals(
+        resourceMonitor(takeOrdered), executionProtector.visitTakeOrdered(takeOrdered, null));
   }
 
   PhysicalPlan resourceMonitor(PhysicalPlan input) {
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/mapping/IndexMappingTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/mapping/IndexMappingTest.java
deleted file mode 100644
index 302dbb1d51..0000000000
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/mapping/IndexMappingTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.sql.opensearch.mapping;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.aMapWithSize;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-import com.google.common.collect.ImmutableMap;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-class IndexMappingTest {
-
-  @Test
-  public void getFieldType() {
-    IndexMapping indexMapping = new IndexMapping(ImmutableMap.of("name", "text"));
-    assertEquals("text", indexMapping.getFieldType("name"));
-    assertNull(indexMapping.getFieldType("not_exist"));
-  }
-
-  @Test
-  public void getAllFieldTypes() {
-    IndexMapping indexMapping = new IndexMapping(ImmutableMap.of("name", "text", "age", "int"));
-    Map<String, String> fieldTypes = indexMapping.getAllFieldTypes(type -> "our_type");
-    assertThat(
-        fieldTypes,
-        allOf(aMapWithSize(2), hasEntry("name", "our_type"), hasEntry("age", "our_type")));
-  }
-}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/monitor/OpenSearchMemoryHealthyTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/monitor/OpenSearchMemoryHealthyTest.java
index af4cdc8ce6..a61f7343e6 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/monitor/OpenSearchMemoryHealthyTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/monitor/OpenSearchMemoryHealthyTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.monitor;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -20,11 +19,9 @@
 @ExtendWith(MockitoExtension.class)
 class OpenSearchMemoryHealthyTest {
 
-  @Mock
-  private OpenSearchMemoryHealthy.RandomFail randomFail;
+  @Mock private OpenSearchMemoryHealthy.RandomFail randomFail;
 
-  @Mock
-  private OpenSearchMemoryHealthy.MemoryUsage memoryUsage;
+  @Mock private OpenSearchMemoryHealthy.MemoryUsage memoryUsage;
 
   private OpenSearchMemoryHealthy monitor;
 
@@ -45,7 +42,8 @@ void memoryUsageExceedLimitFastFailure() {
     when(memoryUsage.usage()).thenReturn(10L);
     when(randomFail.shouldFail()).thenReturn(true);
 
-    assertThrows(OpenSearchMemoryHealthy.MemoryUsageExceedFastFailureException.class,
+    assertThrows(
+        OpenSearchMemoryHealthy.MemoryUsageExceedFastFailureException.class,
         () -> monitor.isMemoryHealthy(9L));
   }
 
@@ -54,7 +52,8 @@ void memoryUsageExceedLimitWithoutFastFailure() {
     when(memoryUsage.usage()).thenReturn(10L);
     when(randomFail.shouldFail()).thenReturn(false);
 
-    assertThrows(OpenSearchMemoryHealthy.MemoryUsageExceedException.class,
+    assertThrows(
+        OpenSearchMemoryHealthy.MemoryUsageExceedException.class,
         () -> monitor.isMemoryHealthy(9L));
   }
 
@@ -72,8 +71,7 @@ void randomFail() {
 
   @Test
   void setMemoryUsage() {
-    OpenSearchMemoryHealthy.MemoryUsage usage =
-        new OpenSearchMemoryHealthy.MemoryUsage();
+    OpenSearchMemoryHealthy.MemoryUsage usage = new OpenSearchMemoryHealthy.MemoryUsage();
     assertTrue(usage.usage() > 0);
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/monitor/OpenSearchResourceMonitorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/monitor/OpenSearchResourceMonitorTest.java
index 75f1ea7a17..f56d8cb81b 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/monitor/OpenSearchResourceMonitorTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/monitor/OpenSearchResourceMonitorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.monitor;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -18,17 +17,15 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.unit.ByteSizeValue;
 import org.opensearch.sql.common.setting.Settings;
 
 @ExtendWith(MockitoExtension.class)
 class OpenSearchResourceMonitorTest {
 
-  @Mock
-  private Settings settings;
+  @Mock private Settings settings;
 
-  @Mock
-  private OpenSearchMemoryHealthy memoryMonitor;
+  @Mock private OpenSearchMemoryHealthy memoryMonitor;
 
   @BeforeEach
   public void setup() {
@@ -47,8 +44,8 @@ void isHealthy() {
 
   @Test
   void notHealthyFastFailure() {
-    when(memoryMonitor.isMemoryHealthy(anyLong())).thenThrow(
-        OpenSearchMemoryHealthy.MemoryUsageExceedFastFailureException.class);
+    when(memoryMonitor.isMemoryHealthy(anyLong()))
+        .thenThrow(OpenSearchMemoryHealthy.MemoryUsageExceedFastFailureException.class);
 
     OpenSearchResourceMonitor resourceMonitor =
         new OpenSearchResourceMonitor(settings, memoryMonitor);
@@ -58,8 +55,8 @@ void notHealthyFastFailure() {
 
   @Test
   void notHealthyWithRetry() {
-    when(memoryMonitor.isMemoryHealthy(anyLong())).thenThrow(
-        OpenSearchMemoryHealthy.MemoryUsageExceedException.class);
+    when(memoryMonitor.isMemoryHealthy(anyLong()))
+        .thenThrow(OpenSearchMemoryHealthy.MemoryUsageExceedException.class);
 
     OpenSearchResourceMonitor resourceMonitor =
         new OpenSearchResourceMonitor(settings, memoryMonitor);
@@ -70,8 +67,9 @@ void notHealthyWithRetry() {
   @Test
   void healthyWithRetry() {
 
-    when(memoryMonitor.isMemoryHealthy(anyLong())).thenThrow(
-        OpenSearchMemoryHealthy.MemoryUsageExceedException.class).thenReturn(true);
+    when(memoryMonitor.isMemoryHealthy(anyLong()))
+        .thenThrow(OpenSearchMemoryHealthy.MemoryUsageExceedException.class)
+        .thenReturn(true);
 
     OpenSearchResourceMonitor resourceMonitor =
         new OpenSearchResourceMonitor(settings, memoryMonitor);
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorTest.java
index 20d2f633dd..e6d2bac85b 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorTest.java
@@ -52,60 +52,60 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class MLCommonsOperatorTest {
-  @Mock
-  private PhysicalPlan input;
+  @Mock private PhysicalPlan input;
 
-  @Mock(answer =  Answers.RETURNS_DEEP_STUBS)
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
   private NodeClient nodeClient;
 
   private MLCommonsOperator mlCommonsOperator;
 
-  @Mock(answer =  Answers.RETURNS_DEEP_STUBS)
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
   private MachineLearningNodeClient machineLearningNodeClient;
 
   @BeforeEach
   void setUp() {
     Map<String, Literal> arguments = new HashMap<>();
-    arguments.put("k1",AstDSL.intLiteral(3));
-    arguments.put("k2",AstDSL.stringLiteral("v1"));
-    arguments.put("k3",AstDSL.booleanLiteral(true));
-    arguments.put("k4",AstDSL.doubleLiteral(2.0D));
-    arguments.put("k5",AstDSL.shortLiteral((short)2));
-    arguments.put("k6",AstDSL.longLiteral(2L));
-    arguments.put("k7",AstDSL.floatLiteral(2F));
-
-
-    mlCommonsOperator = new MLCommonsOperator(input, "kmeans", arguments,
-            nodeClient);
+    arguments.put("k1", AstDSL.intLiteral(3));
+    arguments.put("k2", AstDSL.stringLiteral("v1"));
+    arguments.put("k3", AstDSL.booleanLiteral(true));
+    arguments.put("k4", AstDSL.doubleLiteral(2.0D));
+    arguments.put("k5", AstDSL.shortLiteral((short) 2));
+    arguments.put("k6", AstDSL.longLiteral(2L));
+    arguments.put("k7", AstDSL.floatLiteral(2F));
+
+    mlCommonsOperator = new MLCommonsOperator(input, "kmeans", arguments, nodeClient);
     when(input.hasNext()).thenReturn(true).thenReturn(false);
     ImmutableMap.Builder<String, ExprValue> resultBuilder = new ImmutableMap.Builder<>();
     resultBuilder.put("k1", new ExprIntegerValue(2));
     when(input.next()).thenReturn(ExprTupleValue.fromExprValueMap(resultBuilder.build()));
 
-    DataFrame dataFrame = DataFrameBuilder
-            .load(Collections.singletonList(
-                    ImmutableMap.<String, Object>builder().put("result-k1", 2D)
-                            .put("result-k2", 1)
-                            .put("result-k3", "v3")
-                            .put("result-k4", true)
-                            .put("result-k5", (short)2)
-                            .put("result-k6", 2L)
-                            .put("result-k7", 2F)
-                            .build())
-            );
-    MLPredictionOutput mlPredictionOutput = MLPredictionOutput.builder()
+    DataFrame dataFrame =
+        DataFrameBuilder.load(
+            Collections.singletonList(
+                ImmutableMap.<String, Object>builder()
+                    .put("result-k1", 2D)
+                    .put("result-k2", 1)
+                    .put("result-k3", "v3")
+                    .put("result-k4", true)
+                    .put("result-k5", (short) 2)
+                    .put("result-k6", 2L)
+                    .put("result-k7", 2F)
+                    .build()));
+    MLPredictionOutput mlPredictionOutput =
+        MLPredictionOutput.builder()
             .taskId("test_task_id")
             .status("test_status")
             .predictionResult(dataFrame)
             .build();
 
     try (MockedStatic<MLClient> mlClientMockedStatic = Mockito.mockStatic(MLClient.class)) {
-      mlClientMockedStatic.when(() -> MLClient.getMLClient(any(NodeClient.class)))
-              .thenReturn(machineLearningNodeClient);
-      when(machineLearningNodeClient.trainAndPredict(any(MLInput.class))
-              .actionGet(anyLong(),
-                      eq(TimeUnit.SECONDS)))
-              .thenReturn(mlPredictionOutput);
+      mlClientMockedStatic
+          .when(() -> MLClient.getMLClient(any(NodeClient.class)))
+          .thenReturn(machineLearningNodeClient);
+      when(machineLearningNodeClient
+              .trainAndPredict(any(MLInput.class))
+              .actionGet(anyLong(), eq(TimeUnit.SECONDS)))
+          .thenReturn(mlPredictionOutput);
     }
   }
 
@@ -120,17 +120,17 @@ public void testOpen() {
 
   @Test
   public void testAccept() {
-    PhysicalPlanNodeVisitor physicalPlanNodeVisitor
-            = new PhysicalPlanNodeVisitor<Integer, Object>() {};
+    PhysicalPlanNodeVisitor physicalPlanNodeVisitor =
+        new PhysicalPlanNodeVisitor<Integer, Object>() {};
     assertNull(mlCommonsOperator.accept(physicalPlanNodeVisitor, null));
   }
 
   @Test
   public void testConvertArgumentToMLParameter_UnsupportedType() {
     Map<String, Literal> argument = new HashMap<>();
-    argument.put("k2",AstDSL.dateLiteral("2020-10-31"));
-    assertThrows(IllegalArgumentException.class, () -> mlCommonsOperator
-            .convertArgumentToMLParameter(argument, "LINEAR_REGRESSION"));
+    argument.put("k2", AstDSL.dateLiteral("2020-10-31"));
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> mlCommonsOperator.convertArgumentToMLParameter(argument, "LINEAR_REGRESSION"));
   }
-
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLOperatorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLOperatorTest.java
index 7a73468391..0a3f56285f 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLOperatorTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLOperatorTest.java
@@ -57,29 +57,27 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class MLOperatorTest {
-  @Mock
-  private PhysicalPlan input;
+  @Mock private PhysicalPlan input;
 
-  @Mock
-  PlainActionFuture<MLOutput> actionFuture;
+  @Mock PlainActionFuture<MLOutput> actionFuture;
 
-  @Mock(answer =  Answers.RETURNS_DEEP_STUBS)
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
   private NodeClient nodeClient;
 
   private MLOperator mlOperator;
   Map<String, Literal> arguments = new HashMap<>();
 
-  @Mock(answer =  Answers.RETURNS_DEEP_STUBS)
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
   private MachineLearningNodeClient machineLearningNodeClient;
 
   void setUp(boolean isPredict) {
-    arguments.put("k1",AstDSL.intLiteral(3));
-    arguments.put("k2",AstDSL.stringLiteral("v1"));
-    arguments.put("k3",AstDSL.booleanLiteral(true));
-    arguments.put("k4",AstDSL.doubleLiteral(2.0D));
-    arguments.put("k5",AstDSL.shortLiteral((short)2));
-    arguments.put("k6",AstDSL.longLiteral(2L));
-    arguments.put("k7",AstDSL.floatLiteral(2F));
+    arguments.put("k1", AstDSL.intLiteral(3));
+    arguments.put("k2", AstDSL.stringLiteral("v1"));
+    arguments.put("k3", AstDSL.booleanLiteral(true));
+    arguments.put("k4", AstDSL.doubleLiteral(2.0D));
+    arguments.put("k5", AstDSL.shortLiteral((short) 2));
+    arguments.put("k6", AstDSL.longLiteral(2L));
+    arguments.put("k7", AstDSL.floatLiteral(2F));
 
     mlOperator = new MLOperator(input, arguments, nodeClient);
     when(input.hasNext()).thenReturn(true).thenReturn(false);
@@ -87,49 +85,50 @@ void setUp(boolean isPredict) {
     resultBuilder.put("k1", new ExprIntegerValue(2));
     when(input.next()).thenReturn(ExprTupleValue.fromExprValueMap(resultBuilder.build()));
 
-    DataFrame dataFrame = DataFrameBuilder
-            .load(Collections.singletonList(
-                    ImmutableMap.<String, Object>builder().put("result-k1", 2D)
-                            .put("result-k2", 1)
-                            .put("result-k3", "v3")
-                            .put("result-k4", true)
-                            .put("result-k5", (short)2)
-                            .put("result-k6", 2L)
-                            .put("result-k7", 2F)
-                            .build())
-            );
+    DataFrame dataFrame =
+        DataFrameBuilder.load(
+            Collections.singletonList(
+                ImmutableMap.<String, Object>builder()
+                    .put("result-k1", 2D)
+                    .put("result-k2", 1)
+                    .put("result-k3", "v3")
+                    .put("result-k4", true)
+                    .put("result-k5", (short) 2)
+                    .put("result-k6", 2L)
+                    .put("result-k7", 2F)
+                    .build()));
 
     MLOutput mlOutput;
     if (isPredict) {
-      mlOutput = MLPredictionOutput.builder()
+      mlOutput =
+          MLPredictionOutput.builder()
               .taskId("test_task_id")
               .status("test_status")
               .predictionResult(dataFrame)
               .build();
     } else {
-      mlOutput = MLTrainingOutput.builder()
+      mlOutput =
+          MLTrainingOutput.builder()
               .taskId("test_task_id")
               .status("test_status")
               .modelId("test_model_id")
               .build();
     }
 
-    when(actionFuture.actionGet(anyLong(), eq(TimeUnit.SECONDS)))
-            .thenReturn(mlOutput);
-    when(machineLearningNodeClient.run(any(MLInput.class), any()))
-            .thenReturn(actionFuture);
+    when(actionFuture.actionGet(anyLong(), eq(TimeUnit.SECONDS))).thenReturn(mlOutput);
+    when(machineLearningNodeClient.run(any(MLInput.class), any())).thenReturn(actionFuture);
   }
 
   void setUpPredict() {
-    arguments.put(ACTION,AstDSL.stringLiteral(PREDICT));
-    arguments.put(ALGO,AstDSL.stringLiteral(KMEANS));
-    arguments.put("modelid",AstDSL.stringLiteral("dummyID"));
+    arguments.put(ACTION, AstDSL.stringLiteral(PREDICT));
+    arguments.put(ALGO, AstDSL.stringLiteral(KMEANS));
+    arguments.put("modelid", AstDSL.stringLiteral("dummyID"));
     setUp(true);
   }
 
   void setUpTrain() {
-    arguments.put(ACTION,AstDSL.stringLiteral(TRAIN));
-    arguments.put(ALGO,AstDSL.stringLiteral(KMEANS));
+    arguments.put(ACTION, AstDSL.stringLiteral(TRAIN));
+    arguments.put(ALGO, AstDSL.stringLiteral(KMEANS));
     setUp(false);
   }
 
@@ -162,10 +161,9 @@ public void testAccept() {
     setUpPredict();
     try (MockedStatic<MLClient> mlClientMockedStatic = Mockito.mockStatic(MLClient.class)) {
       when(MLClient.getMLClient(any(NodeClient.class))).thenReturn(machineLearningNodeClient);
-      PhysicalPlanNodeVisitor physicalPlanNodeVisitor
-              = new PhysicalPlanNodeVisitor<Integer, Object>() {};
+      PhysicalPlanNodeVisitor physicalPlanNodeVisitor =
+          new PhysicalPlanNodeVisitor<Integer, Object>() {};
       assertNull(mlOperator.accept(physicalPlanNodeVisitor, null));
     }
   }
-
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequestTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequestTest.java
index 1ba26e33dc..d2bc5b0641 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequestTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequestTest.java
@@ -3,20 +3,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
 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.opensearch.sql.opensearch.request.OpenSearchRequest.DEFAULT_QUERY_TIMEOUT;
 
+import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import org.apache.lucene.search.TotalHits;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -24,42 +28,48 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchScrollRequest;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.search.fetch.subphase.FetchSourceContext;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
 import org.opensearch.sql.opensearch.response.OpenSearchResponse;
 
 @ExtendWith(MockitoExtension.class)
 public class OpenSearchQueryRequestTest {
 
-  @Mock
-  private Function<SearchRequest, SearchResponse> searchAction;
+  @Mock private Function<SearchRequest, SearchResponse> searchAction;
+
+  @Mock private Function<SearchScrollRequest, SearchResponse> scrollAction;
+
+  @Mock private Consumer<String> cleanAction;
 
-  @Mock
-  private Function<SearchScrollRequest, SearchResponse> scrollAction;
+  @Mock private SearchResponse searchResponse;
 
-  @Mock
-  private Consumer<String> cleanAction;
+  @Mock private SearchHits searchHits;
 
-  @Mock
-  private SearchResponse searchResponse;
+  @Mock private SearchHit searchHit;
 
-  @Mock
-  private SearchHits searchHits;
+  @Mock private SearchSourceBuilder sourceBuilder;
 
-  @Mock
-  private SearchHit searchHit;
+  @Mock private FetchSourceContext fetchSourceContext;
 
-  @Mock
-  private OpenSearchExprValueFactory factory;
+  @Mock private OpenSearchExprValueFactory factory;
 
   private final OpenSearchQueryRequest request =
-      new OpenSearchQueryRequest("test", 200, factory);
+      new OpenSearchQueryRequest("test", 200, factory, List.of());
+
+  private final OpenSearchQueryRequest remoteRequest =
+      new OpenSearchQueryRequest("ccs:test", 200, factory, List.of());
 
   @Test
   void search() {
+    OpenSearchQueryRequest request =
+        new OpenSearchQueryRequest(
+            new OpenSearchRequest.IndexName("test"), sourceBuilder, factory, List.of());
+
     when(searchAction.apply(any())).thenReturn(searchResponse);
     when(searchResponse.getHits()).thenReturn(searchHits);
     when(searchHits.getHits()).thenReturn(new SearchHit[] {searchHit});
@@ -71,6 +81,40 @@ void search() {
     verify(searchAction, times(1)).apply(any());
   }
 
+  @Test
+  void search_withoutContext() {
+    OpenSearchQueryRequest request =
+        new OpenSearchQueryRequest(
+            new OpenSearchRequest.IndexName("test"), sourceBuilder, factory, List.of());
+
+    when(searchAction.apply(any())).thenReturn(searchResponse);
+    when(searchResponse.getHits()).thenReturn(searchHits);
+    when(searchHits.getHits()).thenReturn(new SearchHit[] {searchHit});
+    OpenSearchResponse searchResponse = request.search(searchAction, scrollAction);
+    assertFalse(searchResponse.isEmpty());
+    assertFalse(request.hasAnotherBatch());
+  }
+
+  @Test
+  void search_withIncludes() {
+    OpenSearchQueryRequest request =
+        new OpenSearchQueryRequest(
+            new OpenSearchRequest.IndexName("test"), sourceBuilder, factory, List.of());
+
+    String[] includes = {"_id", "_index"};
+    when(searchAction.apply(any())).thenReturn(searchResponse);
+    when(searchResponse.getHits()).thenReturn(searchHits);
+    when(searchHits.getHits()).thenReturn(new SearchHit[] {searchHit});
+
+    OpenSearchResponse searchResponse = request.search(searchAction, scrollAction);
+    assertFalse(searchResponse.isEmpty());
+
+    searchResponse = request.search(searchAction, scrollAction);
+    assertTrue(searchResponse.isEmpty());
+
+    verify(searchAction, times(1)).apply(any());
+  }
+
   @Test
   void clean() {
     request.clean(cleanAction);
@@ -81,14 +125,50 @@ void clean() {
   void searchRequest() {
     request.getSourceBuilder().query(QueryBuilders.termQuery("name", "John"));
 
-    assertEquals(
+    assertSearchRequest(
         new SearchRequest()
             .indices("test")
-            .source(new SearchSourceBuilder()
-                .timeout(OpenSearchQueryRequest.DEFAULT_QUERY_TIMEOUT)
-                .from(0)
-                .size(200)
-                .query(QueryBuilders.termQuery("name", "John"))),
-        request.searchRequest());
+            .source(
+                new SearchSourceBuilder()
+                    .timeout(DEFAULT_QUERY_TIMEOUT)
+                    .from(0)
+                    .size(200)
+                    .query(QueryBuilders.termQuery("name", "John"))),
+        request);
+  }
+
+  @Test
+  void searchCrossClusterRequest() {
+    remoteRequest.getSourceBuilder().query(QueryBuilders.termQuery("name", "John"));
+
+    assertSearchRequest(
+        new SearchRequest()
+            .indices("ccs:test")
+            .source(
+                new SearchSourceBuilder()
+                    .timeout(DEFAULT_QUERY_TIMEOUT)
+                    .from(0)
+                    .size(200)
+                    .query(QueryBuilders.termQuery("name", "John"))),
+        remoteRequest);
+  }
+
+  @Test
+  void writeTo_unsupported() {
+    assertThrows(
+        UnsupportedOperationException.class, () -> request.writeTo(mock(StreamOutput.class)));
+  }
+
+  private void assertSearchRequest(SearchRequest expected, OpenSearchQueryRequest request) {
+    Function<SearchRequest, SearchResponse> querySearch =
+        searchRequest -> {
+          assertEquals(expected, searchRequest);
+          return when(mock(SearchResponse.class).getHits())
+              .thenReturn(
+                  new SearchHits(
+                      new SearchHit[0], new TotalHits(0, TotalHits.Relation.EQUAL_TO), 0.0f))
+              .getMock();
+        };
+    request.search(querySearch, searchScrollRequest -> null);
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilderTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilderTest.java
index 33376ece83..742e76cbd0 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilderTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilderTest.java
@@ -3,74 +3,92 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request;
 
+import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.opensearch.index.query.QueryBuilders.matchAllQuery;
+import static org.opensearch.index.query.QueryBuilders.nestedQuery;
 import static org.opensearch.search.sort.FieldSortBuilder.DOC_FIELD_NAME;
 import static org.opensearch.search.sort.SortOrder.ASC;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.lucene.search.TotalHits;
+import org.apache.lucene.search.join.ScoreMode;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.search.SearchScrollRequest;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.index.query.InnerHitBuilder;
+import org.opensearch.index.query.NestedQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
 import org.opensearch.search.aggregations.AggregationBuilder;
 import org.opensearch.search.aggregations.AggregationBuilders;
 import org.opensearch.search.aggregations.bucket.composite.TermsValuesSourceBuilder;
 import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.search.fetch.subphase.FetchSourceContext;
 import org.opensearch.search.sort.FieldSortBuilder;
 import org.opensearch.search.sort.ScoreSortBuilder;
 import org.opensearch.search.sort.SortBuilders;
-import org.opensearch.sql.common.setting.Settings;
-import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
 import org.opensearch.sql.opensearch.response.agg.CompositeAggregationParser;
 import org.opensearch.sql.opensearch.response.agg.OpenSearchAggregationResponseParser;
+import org.opensearch.sql.opensearch.response.agg.SinglePercentileParser;
 import org.opensearch.sql.opensearch.response.agg.SingleValueParser;
+import org.opensearch.sql.planner.logical.LogicalNested;
 
 @ExtendWith(MockitoExtension.class)
-public class OpenSearchRequestBuilderTest {
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+class OpenSearchRequestBuilderTest {
 
   private static final TimeValue DEFAULT_QUERY_TIMEOUT = TimeValue.timeValueMinutes(1L);
   private static final Integer DEFAULT_OFFSET = 0;
   private static final Integer DEFAULT_LIMIT = 200;
   private static final Integer MAX_RESULT_WINDOW = 500;
 
-  @Mock
-  private Settings settings;
+  private static final OpenSearchRequest.IndexName indexName =
+      new OpenSearchRequest.IndexName("test");
 
-  @Mock
-  private OpenSearchExprValueFactory exprValueFactory;
+  @Mock private OpenSearchExprValueFactory exprValueFactory;
 
   private OpenSearchRequestBuilder requestBuilder;
 
   @BeforeEach
   void setup() {
-    when(settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT)).thenReturn(200);
-
-    requestBuilder = new OpenSearchRequestBuilder(
-        "test", MAX_RESULT_WINDOW, settings, exprValueFactory);
+    requestBuilder = new OpenSearchRequestBuilder(DEFAULT_LIMIT, exprValueFactory);
   }
 
   @Test
-  void buildQueryRequest() {
+  void build_query_request() {
     Integer limit = 200;
     Integer offset = 0;
     requestBuilder.pushDownLimit(limit, offset);
+    requestBuilder.pushDownTrackedScore(true);
 
     assertEquals(
         new OpenSearchQueryRequest(
@@ -78,13 +96,15 @@ void buildQueryRequest() {
             new SearchSourceBuilder()
                 .from(offset)
                 .size(limit)
-                .timeout(DEFAULT_QUERY_TIMEOUT),
-            exprValueFactory),
-        requestBuilder.build());
+                .timeout(DEFAULT_QUERY_TIMEOUT)
+                .trackScores(true),
+            exprValueFactory,
+            List.of()),
+        requestBuilder.build(indexName, MAX_RESULT_WINDOW, DEFAULT_QUERY_TIMEOUT));
   }
 
   @Test
-  void buildScrollRequestWithCorrectSize() {
+  void build_scroll_request_with_correct_size() {
     Integer limit = 800;
     Integer offset = 10;
     requestBuilder.pushDownLimit(limit, offset);
@@ -92,38 +112,67 @@ void buildScrollRequestWithCorrectSize() {
     assertEquals(
         new OpenSearchScrollRequest(
             new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
             new SearchSourceBuilder()
                 .from(offset)
                 .size(MAX_RESULT_WINDOW - offset)
                 .timeout(DEFAULT_QUERY_TIMEOUT),
-        exprValueFactory),
-        requestBuilder.build());
+            exprValueFactory,
+            List.of()),
+        requestBuilder.build(indexName, MAX_RESULT_WINDOW, DEFAULT_QUERY_TIMEOUT));
   }
 
   @Test
-  void testPushDownQuery() {
+  void test_push_down_query() {
     QueryBuilder query = QueryBuilders.termQuery("intA", 1);
-    requestBuilder.pushDown(query);
+    requestBuilder.pushDownFilter(query);
+
+    var r = requestBuilder.build(indexName, MAX_RESULT_WINDOW, DEFAULT_QUERY_TIMEOUT);
+    Function<SearchRequest, SearchResponse> querySearch =
+        searchRequest -> {
+          assertEquals(
+              new SearchSourceBuilder()
+                  .from(DEFAULT_OFFSET)
+                  .size(DEFAULT_LIMIT)
+                  .timeout(DEFAULT_QUERY_TIMEOUT)
+                  .query(query)
+                  .sort(DOC_FIELD_NAME, ASC),
+              searchRequest.source());
+          return mock();
+        };
+    Function<SearchScrollRequest, SearchResponse> scrollSearch =
+        searchScrollRequest -> {
+          throw new UnsupportedOperationException();
+        };
+    r.search(querySearch, scrollSearch);
+  }
+
+  @Test
+  void test_push_down_aggregation() {
+    AggregationBuilder aggBuilder =
+        AggregationBuilders.composite(
+            "composite_buckets", Collections.singletonList(new TermsValuesSourceBuilder("longA")));
+    OpenSearchAggregationResponseParser responseParser =
+        new CompositeAggregationParser(new SingleValueParser("AVG(intA)"));
+    requestBuilder.pushDownAggregation(Pair.of(List.of(aggBuilder), responseParser));
 
     assertEquals(
         new SearchSourceBuilder()
             .from(DEFAULT_OFFSET)
-            .size(DEFAULT_LIMIT)
+            .size(0)
             .timeout(DEFAULT_QUERY_TIMEOUT)
-            .query(query)
-            .sort(DOC_FIELD_NAME, ASC),
-        requestBuilder.getSourceBuilder()
-    );
+            .aggregation(aggBuilder),
+        requestBuilder.getSourceBuilder());
+    verify(exprValueFactory).setParser(responseParser);
   }
 
   @Test
-  void testPushDownAggregation() {
-    AggregationBuilder aggBuilder = AggregationBuilders.composite(
-        "composite_buckets",
-        Collections.singletonList(new TermsValuesSourceBuilder("longA")));
+  void test_push_down_percentile_aggregation() {
+    AggregationBuilder aggBuilder =
+        AggregationBuilders.composite(
+            "composite_buckets", Collections.singletonList(new TermsValuesSourceBuilder("longA")));
     OpenSearchAggregationResponseParser responseParser =
-        new CompositeAggregationParser(
-            new SingleValueParser("AVG(intA)"));
+        new CompositeAggregationParser(new SinglePercentileParser("PERCENTILE(intA, 50)"));
     requestBuilder.pushDownAggregation(Pair.of(List.of(aggBuilder), responseParser));
 
     assertEquals(
@@ -132,92 +181,358 @@ void testPushDownAggregation() {
             .size(0)
             .timeout(DEFAULT_QUERY_TIMEOUT)
             .aggregation(aggBuilder),
-        requestBuilder.getSourceBuilder()
-    );
+        requestBuilder.getSourceBuilder());
     verify(exprValueFactory).setParser(responseParser);
   }
 
   @Test
-  void testPushDownQueryAndSort() {
+  void test_push_down_query_and_sort() {
     QueryBuilder query = QueryBuilders.termQuery("intA", 1);
-    requestBuilder.pushDown(query);
+    requestBuilder.pushDownFilter(query);
 
     FieldSortBuilder sortBuilder = SortBuilders.fieldSort("intA");
     requestBuilder.pushDownSort(List.of(sortBuilder));
 
-    assertEquals(
+    assertSearchSourceBuilder(
         new SearchSourceBuilder()
             .from(DEFAULT_OFFSET)
             .size(DEFAULT_LIMIT)
             .timeout(DEFAULT_QUERY_TIMEOUT)
             .query(query)
             .sort(sortBuilder),
-        requestBuilder.getSourceBuilder());
+        requestBuilder);
+  }
+
+  void assertSearchSourceBuilder(
+      SearchSourceBuilder expected, OpenSearchRequestBuilder requestBuilder)
+      throws UnsupportedOperationException {
+    Function<SearchRequest, SearchResponse> querySearch =
+        searchRequest -> {
+          assertEquals(expected, searchRequest.source());
+          return when(mock(SearchResponse.class).getHits())
+              .thenReturn(
+                  new SearchHits(
+                      new SearchHit[0], new TotalHits(0, TotalHits.Relation.EQUAL_TO), 0.0f))
+              .getMock();
+        };
+    Function<SearchScrollRequest, SearchResponse> scrollSearch =
+        searchScrollRequest -> {
+          throw new UnsupportedOperationException();
+        };
+    requestBuilder
+        .build(indexName, MAX_RESULT_WINDOW, DEFAULT_QUERY_TIMEOUT)
+        .search(querySearch, scrollSearch);
   }
 
   @Test
-  void testPushDownSort() {
+  void test_push_down_sort() {
     FieldSortBuilder sortBuilder = SortBuilders.fieldSort("intA");
     requestBuilder.pushDownSort(List.of(sortBuilder));
 
-    assertEquals(
+    assertSearchSourceBuilder(
         new SearchSourceBuilder()
             .from(DEFAULT_OFFSET)
             .size(DEFAULT_LIMIT)
             .timeout(DEFAULT_QUERY_TIMEOUT)
             .sort(sortBuilder),
-        requestBuilder.getSourceBuilder());
+        requestBuilder);
   }
 
   @Test
-  void testPushDownNonFieldSort() {
+  void test_push_down_non_field_sort() {
     ScoreSortBuilder sortBuilder = SortBuilders.scoreSort();
     requestBuilder.pushDownSort(List.of(sortBuilder));
 
-    assertEquals(
+    assertSearchSourceBuilder(
         new SearchSourceBuilder()
             .from(DEFAULT_OFFSET)
             .size(DEFAULT_LIMIT)
             .timeout(DEFAULT_QUERY_TIMEOUT)
             .sort(sortBuilder),
-        requestBuilder.getSourceBuilder());
+        requestBuilder);
   }
 
   @Test
-  void testPushDownMultipleSort() {
-    requestBuilder.pushDownSort(List.of(
-        SortBuilders.fieldSort("intA"),
-        SortBuilders.fieldSort("intB")));
+  void test_push_down_multiple_sort() {
+    requestBuilder.pushDownSort(
+        List.of(SortBuilders.fieldSort("intA"), SortBuilders.fieldSort("intB")));
 
-    assertEquals(
+    assertSearchSourceBuilder(
         new SearchSourceBuilder()
             .from(DEFAULT_OFFSET)
             .size(DEFAULT_LIMIT)
             .timeout(DEFAULT_QUERY_TIMEOUT)
             .sort(SortBuilders.fieldSort("intA"))
             .sort(SortBuilders.fieldSort("intB")),
-        requestBuilder.getSourceBuilder());
+        requestBuilder);
   }
 
   @Test
-  void testPushDownProject() {
+  void test_push_down_project() {
     Set<ReferenceExpression> references = Set.of(DSL.ref("intA", INTEGER));
     requestBuilder.pushDownProjects(references);
 
-    assertEquals(
+    assertSearchSourceBuilder(
         new SearchSourceBuilder()
             .from(DEFAULT_OFFSET)
             .size(DEFAULT_LIMIT)
             .timeout(DEFAULT_QUERY_TIMEOUT)
-            .fetchSource(new String[]{"intA"}, new String[0]),
-        requestBuilder.getSourceBuilder());
+            .fetchSource(new String[] {"intA"}, new String[0]),
+        requestBuilder);
+
+    assertEquals(
+        new OpenSearchQueryRequest(
+            new OpenSearchRequest.IndexName("test"),
+            new SearchSourceBuilder()
+                .from(DEFAULT_OFFSET)
+                .size(DEFAULT_LIMIT)
+                .timeout(DEFAULT_QUERY_TIMEOUT)
+                .fetchSource("intA", null),
+            exprValueFactory,
+            List.of("intA")),
+        requestBuilder.build(indexName, MAX_RESULT_WINDOW, DEFAULT_QUERY_TIMEOUT));
   }
 
   @Test
-  void testPushTypeMapping() {
-    Map<String, ExprType> typeMapping = Map.of("intA", INTEGER);
+  void test_push_down_project_limit() {
+    Set<ReferenceExpression> references = Set.of(DSL.ref("intA", INTEGER));
+    requestBuilder.pushDownProjects(references);
+
+    Integer limit = 200;
+    Integer offset = 0;
+    requestBuilder.pushDownLimit(limit, offset);
+
+    assertSearchSourceBuilder(
+        new SearchSourceBuilder()
+            .from(offset)
+            .size(limit)
+            .timeout(DEFAULT_QUERY_TIMEOUT)
+            .fetchSource(new String[] {"intA"}, new String[0]),
+        requestBuilder);
+
+    assertEquals(
+        new OpenSearchQueryRequest(
+            new OpenSearchRequest.IndexName("test"),
+            new SearchSourceBuilder()
+                .from(offset)
+                .size(limit)
+                .timeout(DEFAULT_QUERY_TIMEOUT)
+                .fetchSource("intA", null),
+            exprValueFactory,
+            List.of("intA")),
+        requestBuilder.build(indexName, MAX_RESULT_WINDOW, DEFAULT_QUERY_TIMEOUT));
+  }
+
+  @Test
+  void test_push_down_project_limit_and_offset() {
+    Set<ReferenceExpression> references = Set.of(DSL.ref("intA", INTEGER));
+    requestBuilder.pushDownProjects(references);
+
+    Integer limit = 200;
+    Integer offset = 10;
+    requestBuilder.pushDownLimit(limit, offset);
+
+    assertSearchSourceBuilder(
+        new SearchSourceBuilder()
+            .from(offset)
+            .size(limit)
+            .timeout(DEFAULT_QUERY_TIMEOUT)
+            .fetchSource(new String[] {"intA"}, new String[0]),
+        requestBuilder);
+
+    assertEquals(
+        new OpenSearchQueryRequest(
+            new OpenSearchRequest.IndexName("test"),
+            new SearchSourceBuilder()
+                .from(offset)
+                .size(limit)
+                .timeout(DEFAULT_QUERY_TIMEOUT)
+                .fetchSource("intA", null),
+            exprValueFactory,
+            List.of("intA")),
+        requestBuilder.build(indexName, MAX_RESULT_WINDOW, DEFAULT_QUERY_TIMEOUT));
+  }
+
+  @Test
+  void test_push_down_nested() {
+    List<Map<String, ReferenceExpression>> args =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression("message.info", DSL.nested(DSL.ref("message.info", STRING)), null));
+
+    LogicalNested nested = new LogicalNested(null, args, projectList);
+    requestBuilder.pushDownNested(nested.getFields());
+
+    NestedQueryBuilder nestedQuery =
+        nestedQuery("message", matchAllQuery(), ScoreMode.None)
+            .innerHit(
+                new InnerHitBuilder()
+                    .setFetchSourceContext(
+                        new FetchSourceContext(true, new String[] {"message.info"}, null)));
+
+    assertSearchSourceBuilder(
+        new SearchSourceBuilder()
+            .query(QueryBuilders.boolQuery().filter(QueryBuilders.boolQuery().must(nestedQuery)))
+            .from(DEFAULT_OFFSET)
+            .size(DEFAULT_LIMIT)
+            .timeout(DEFAULT_QUERY_TIMEOUT),
+        requestBuilder);
+  }
+
+  @Test
+  void test_push_down_multiple_nested_with_same_path() {
+    List<Map<String, ReferenceExpression>> args =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)),
+            Map.of(
+                "field", new ReferenceExpression("message.from", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression("message.info", DSL.nested(DSL.ref("message.info", STRING)), null),
+            new NamedExpression("message.from", DSL.nested(DSL.ref("message.from", STRING)), null));
+
+    LogicalNested nested = new LogicalNested(null, args, projectList);
+    requestBuilder.pushDownNested(nested.getFields());
+
+    NestedQueryBuilder nestedQuery =
+        nestedQuery("message", matchAllQuery(), ScoreMode.None)
+            .innerHit(
+                new InnerHitBuilder()
+                    .setFetchSourceContext(
+                        new FetchSourceContext(
+                            true, new String[] {"message.info", "message.from"}, null)));
+    assertSearchSourceBuilder(
+        new SearchSourceBuilder()
+            .query(QueryBuilders.boolQuery().filter(QueryBuilders.boolQuery().must(nestedQuery)))
+            .from(DEFAULT_OFFSET)
+            .size(DEFAULT_LIMIT)
+            .timeout(DEFAULT_QUERY_TIMEOUT),
+        requestBuilder);
+  }
+
+  @Test
+  void test_push_down_nested_with_filter() {
+    List<Map<String, ReferenceExpression>> args =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression("message.info", DSL.nested(DSL.ref("message.info", STRING)), null));
+
+    LogicalNested nested = new LogicalNested(null, args, projectList);
+    requestBuilder.getSourceBuilder().query(QueryBuilders.rangeQuery("myNum").gt(3));
+    requestBuilder.pushDownNested(nested.getFields());
+
+    NestedQueryBuilder nestedQuery =
+        nestedQuery("message", matchAllQuery(), ScoreMode.None)
+            .innerHit(
+                new InnerHitBuilder()
+                    .setFetchSourceContext(
+                        new FetchSourceContext(true, new String[] {"message.info"}, null)));
+
+    assertSearchSourceBuilder(
+        new SearchSourceBuilder()
+            .query(
+                QueryBuilders.boolQuery()
+                    .filter(
+                        QueryBuilders.boolQuery()
+                            .must(QueryBuilders.rangeQuery("myNum").gt(3))
+                            .must(nestedQuery)))
+            .from(DEFAULT_OFFSET)
+            .size(DEFAULT_LIMIT)
+            .timeout(DEFAULT_QUERY_TIMEOUT),
+        requestBuilder);
+  }
+
+  @Test
+  void testPushDownNestedWithNestedFilter() {
+    List<Map<String, ReferenceExpression>> args =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression("message.info", DSL.nested(DSL.ref("message.info", STRING)), null));
+
+    QueryBuilder innerFilterQuery = QueryBuilders.rangeQuery("myNum").gt(3);
+    QueryBuilder filterQuery =
+        QueryBuilders.nestedQuery("message", innerFilterQuery, ScoreMode.None);
+    LogicalNested nested = new LogicalNested(null, args, projectList);
+    requestBuilder.getSourceBuilder().query(filterQuery);
+    requestBuilder.pushDownNested(nested.getFields());
+
+    NestedQueryBuilder nestedQuery =
+        nestedQuery("message", matchAllQuery(), ScoreMode.None)
+            .innerHit(
+                new InnerHitBuilder()
+                    .setFetchSourceContext(
+                        new FetchSourceContext(true, new String[] {"message.info"}, null)));
+
+    assertSearchSourceBuilder(
+        new SearchSourceBuilder()
+            .query(QueryBuilders.boolQuery().filter(QueryBuilders.boolQuery().must(filterQuery)))
+            .from(DEFAULT_OFFSET)
+            .size(DEFAULT_LIMIT)
+            .timeout(DEFAULT_QUERY_TIMEOUT),
+        requestBuilder);
+  }
+
+  @Test
+  void test_push_type_mapping() {
+    Map<String, OpenSearchDataType> typeMapping = Map.of("intA", OpenSearchDataType.of(INTEGER));
     requestBuilder.pushTypeMapping(typeMapping);
 
-    verify(exprValueFactory).setTypeMapping(typeMapping);
+    verify(exprValueFactory).extendTypeMapping(typeMapping);
+  }
+
+  @Test
+  void push_down_highlight_with_repeating_fields() {
+    requestBuilder.pushDownHighlight("name", Map.of());
+    var exception =
+        assertThrows(
+            SemanticCheckException.class, () -> requestBuilder.pushDownHighlight("name", Map.of()));
+    assertEquals("Duplicate field name in highlight", exception.getMessage());
+  }
+
+  @Test
+  void push_down_page_size() {
+    requestBuilder.pushDownPageSize(3);
+    assertSearchSourceBuilder(
+        new SearchSourceBuilder().from(DEFAULT_OFFSET).size(3).timeout(DEFAULT_QUERY_TIMEOUT),
+        requestBuilder);
+  }
+
+  @Test
+  void exception_when_non_zero_offset_and_page_size() {
+    requestBuilder.pushDownPageSize(3);
+    requestBuilder.pushDownLimit(300, 2);
+    assertThrows(
+        UnsupportedOperationException.class,
+        () -> requestBuilder.build(indexName, MAX_RESULT_WINDOW, DEFAULT_QUERY_TIMEOUT));
+  }
+
+  @Test
+  void maxResponseSize_is_page_size() {
+    requestBuilder.pushDownPageSize(4);
+    assertEquals(4, requestBuilder.getMaxResponseSize());
+  }
+
+  @Test
+  void maxResponseSize_is_limit() {
+    requestBuilder.pushDownLimit(100, 0);
+    assertEquals(100, requestBuilder.getMaxResponseSize());
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchScrollRequestTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchScrollRequestTest.java
index 0fc9c92810..66cb6bf14c 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchScrollRequestTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchScrollRequestTest.java
@@ -3,59 +3,312 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.opensearch.request.OpenSearchScrollRequest.NO_SCROLL_ID;
 
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.lucene.search.TotalHits;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchScrollRequest;
+import org.opensearch.common.io.stream.BytesStreamOutput;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.io.stream.BytesStreamInput;
 import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
+import org.opensearch.sql.opensearch.response.OpenSearchResponse;
+import org.opensearch.sql.opensearch.storage.OpenSearchIndex;
+import org.opensearch.sql.opensearch.storage.OpenSearchStorageEngine;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class OpenSearchScrollRequestTest {
 
-  @Mock
-  private OpenSearchExprValueFactory factory;
+  public static final OpenSearchRequest.IndexName INDEX_NAME =
+      new OpenSearchRequest.IndexName("test");
+  public static final TimeValue SCROLL_TIMEOUT = TimeValue.timeValueMinutes(1);
+  @Mock private SearchResponse searchResponse;
+
+  @Mock private SearchHits searchHits;
+
+  @Mock private SearchHit searchHit;
+
+  @Mock private SearchSourceBuilder sourceBuilder;
+
+  @Mock private OpenSearchExprValueFactory factory;
 
+  private final SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
   private final OpenSearchScrollRequest request =
-      new OpenSearchScrollRequest("test", factory);
+      new OpenSearchScrollRequest(
+          INDEX_NAME, SCROLL_TIMEOUT, searchSourceBuilder, factory, List.of());
 
   @Test
-  void searchRequest() {
-    request.getSourceBuilder().query(QueryBuilders.termQuery("name", "John"));
+  void constructor() {
+    var request =
+        new OpenSearchScrollRequest(
+            INDEX_NAME, SCROLL_TIMEOUT, searchSourceBuilder, factory, List.of("test"));
+    assertEquals(List.of("test"), request.getIncludes());
+  }
 
-    assertEquals(
-        new SearchRequest()
-            .indices("test")
-            .scroll(OpenSearchScrollRequest.DEFAULT_SCROLL_TIMEOUT)
-            .source(new SearchSourceBuilder().query(QueryBuilders.termQuery("name", "John"))),
-        request.searchRequest());
+  @Test
+  void searchRequest() {
+    searchSourceBuilder.query(QueryBuilders.termQuery("name", "John"));
+    request.search(
+        searchRequest -> {
+          assertEquals(
+              new SearchRequest()
+                  .indices("test")
+                  .scroll(TimeValue.timeValueMinutes(1))
+                  .source(new SearchSourceBuilder().query(QueryBuilders.termQuery("name", "John"))),
+              searchRequest);
+          SearchHits searchHitsMock =
+              when(mock(SearchHits.class).getHits()).thenReturn(new SearchHit[0]).getMock();
+          return when(mock(SearchResponse.class).getHits()).thenReturn(searchHitsMock).getMock();
+        },
+        searchScrollRequest -> null);
   }
 
   @Test
   void isScrollStarted() {
-    assertFalse(request.isScrollStarted());
+    assertFalse(request.isScroll());
 
     request.setScrollId("scroll123");
-    assertTrue(request.isScrollStarted());
+    assertTrue(request.isScroll());
+
+    request.reset();
+    assertFalse(request.isScroll());
   }
 
   @Test
   void scrollRequest() {
     request.setScrollId("scroll123");
     assertEquals(
-        new SearchScrollRequest()
-            .scroll(OpenSearchScrollRequest.DEFAULT_SCROLL_TIMEOUT)
-            .scrollId("scroll123"),
+        new SearchScrollRequest().scroll(TimeValue.timeValueMinutes(1)).scrollId("scroll123"),
         request.scrollRequest());
   }
+
+  @Test
+  void search() {
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            sourceBuilder,
+            factory,
+            List.of());
+
+    when(searchResponse.getHits()).thenReturn(searchHits);
+    when(searchHits.getHits()).thenReturn(new SearchHit[] {searchHit});
+
+    OpenSearchResponse response = request.search((sr) -> searchResponse, (sr) -> fail());
+    assertFalse(response.isEmpty());
+  }
+
+  @Test
+  void search_without_context() {
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            sourceBuilder,
+            factory,
+            List.of());
+
+    when(searchResponse.getHits()).thenReturn(searchHits);
+    when(searchHits.getHits()).thenReturn(new SearchHit[] {searchHit});
+
+    OpenSearchResponse response = request.search((sr) -> searchResponse, (sr) -> fail());
+    assertFalse(response.isEmpty());
+  }
+
+  @Test
+  @SneakyThrows
+  void search_without_scroll_and_initial_request_should_throw() {
+    // Steps: serialize a not used request, deserialize it, then use
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            sourceBuilder,
+            factory,
+            List.of());
+    var outStream = new BytesStreamOutput();
+    request.writeTo(outStream);
+    outStream.flush();
+    var inStream = new BytesStreamInput(outStream.bytes().toBytesRef().bytes);
+    var indexMock = mock(OpenSearchIndex.class);
+    var engine = mock(OpenSearchStorageEngine.class);
+    when(engine.getTable(any(), any())).thenReturn(indexMock);
+    var request2 = new OpenSearchScrollRequest(inStream, engine);
+    assertAll(
+        () -> assertFalse(request2.isScroll()),
+        () -> assertNull(request2.getInitialSearchRequest()),
+        () ->
+            assertThrows(
+                UnsupportedOperationException.class,
+                () -> request2.search(sr -> fail("search"), sr -> fail("scroll"))));
+  }
+
+  @Test
+  void search_withoutIncludes() {
+    OpenSearchScrollRequest request =
+        new OpenSearchScrollRequest(
+            new OpenSearchRequest.IndexName("test"),
+            TimeValue.timeValueMinutes(1),
+            sourceBuilder,
+            factory,
+            List.of());
+
+    when(searchResponse.getHits()).thenReturn(searchHits);
+    when(searchHits.getHits()).thenReturn(new SearchHit[] {searchHit});
+
+    OpenSearchResponse response = request.search((sr) -> searchResponse, (sr) -> fail());
+    assertFalse(response.isEmpty());
+  }
+
+  @Test
+  @SneakyThrows
+  void hasAnotherBatch() {
+    FieldUtils.writeField(request, "needClean", false, true);
+    request.setScrollId("scroll123");
+    assertTrue(request.hasAnotherBatch());
+
+    request.reset();
+    assertFalse(request.hasAnotherBatch());
+
+    request.setScrollId("");
+    assertFalse(request.hasAnotherBatch());
+  }
+
+  @Test
+  void clean_on_empty_response() {
+    // This could happen on sequential search calls
+    SearchResponse searchResponse = mock();
+    when(searchResponse.getScrollId()).thenReturn("scroll1", "scroll2");
+    when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(new SearchHit[1], new TotalHits(1, TotalHits.Relation.EQUAL_TO), 1F),
+            new SearchHits(new SearchHit[0], new TotalHits(0, TotalHits.Relation.EQUAL_TO), 1F));
+
+    request.search((x) -> searchResponse, (x) -> searchResponse);
+    assertEquals("scroll1", request.getScrollId());
+    request.search((x) -> searchResponse, (x) -> searchResponse);
+    assertEquals("scroll1", request.getScrollId());
+
+    AtomicBoolean cleanCalled = new AtomicBoolean(false);
+    request.clean((s) -> cleanCalled.set(true));
+
+    assertEquals(NO_SCROLL_ID, request.getScrollId());
+    assertTrue(cleanCalled.get());
+  }
+
+  @Test
+  void no_clean_on_non_empty_response() {
+    SearchResponse searchResponse = mock();
+    when(searchResponse.getScrollId()).thenReturn("scroll");
+    when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(new SearchHit[1], new TotalHits(1, TotalHits.Relation.EQUAL_TO), 1F));
+
+    request.search((sr) -> searchResponse, (sr) -> searchResponse);
+    assertEquals("scroll", request.getScrollId());
+
+    request.clean((s) -> fail());
+    assertEquals(NO_SCROLL_ID, request.getScrollId());
+  }
+
+  @Test
+  void no_cursor_on_empty_response() {
+    SearchResponse searchResponse = mock();
+    when(searchResponse.getHits()).thenReturn(new SearchHits(new SearchHit[0], null, 1f));
+
+    request.search((x) -> searchResponse, (x) -> searchResponse);
+    assertFalse(request.hasAnotherBatch());
+  }
+
+  @Test
+  void no_clean_if_no_scroll_in_response() {
+    SearchResponse searchResponse = mock();
+    when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(new SearchHit[0], new TotalHits(0, TotalHits.Relation.EQUAL_TO), 1F));
+
+    request.search((x) -> searchResponse, (x) -> searchResponse);
+    assertEquals(NO_SCROLL_ID, request.getScrollId());
+
+    request.clean((s) -> fail());
+  }
+
+  @Test
+  @SneakyThrows
+  void serialize_deserialize_no_needClean() {
+    var stream = new BytesStreamOutput();
+    request.writeTo(stream);
+    stream.flush();
+    assertTrue(stream.size() > 0);
+
+    // deserialize
+    var inStream = new BytesStreamInput(stream.bytes().toBytesRef().bytes);
+    var indexMock = mock(OpenSearchIndex.class);
+    var engine = mock(OpenSearchStorageEngine.class);
+    when(engine.getTable(any(), any())).thenReturn(indexMock);
+    var newRequest = new OpenSearchScrollRequest(inStream, engine);
+    assertEquals(request, newRequest);
+    assertEquals("", newRequest.getScrollId());
+  }
+
+  @Test
+  @SneakyThrows
+  void serialize_deserialize_needClean() {
+    lenient()
+        .when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(new SearchHit[0], new TotalHits(0, TotalHits.Relation.EQUAL_TO), 1F));
+    lenient().when(searchResponse.getScrollId()).thenReturn("");
+
+    var stream = new BytesStreamOutput();
+    request.search(searchRequest -> searchResponse, null);
+    request.writeTo(stream);
+    stream.flush();
+    assertTrue(stream.size() > 0);
+
+    // deserialize
+    var inStream = new BytesStreamInput(stream.bytes().toBytesRef().bytes);
+    var indexMock = mock(OpenSearchIndex.class);
+    var engine = mock(OpenSearchStorageEngine.class);
+    when(engine.getTable(any(), any())).thenReturn(indexMock);
+    var newRequest = new OpenSearchScrollRequest(inStream, engine);
+    assertEquals(request, newRequest);
+    assertEquals("", newRequest.getScrollId());
+  }
+
+  @Test
+  void setScrollId() {
+    request.setScrollId("test");
+    assertEquals("test", request.getScrollId());
+  }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/system/OpenSearchCatIndicesRequestTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/system/OpenSearchCatIndicesRequestTest.java
index a720c2a266..8f954b68b2 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/system/OpenSearchCatIndicesRequestTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/system/OpenSearchCatIndicesRequestTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request.system;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -25,8 +24,7 @@
 @ExtendWith(MockitoExtension.class)
 class OpenSearchCatIndicesRequestTest {
 
-  @Mock
-  private OpenSearchClient client;
+  @Mock private OpenSearchClient client;
 
   @Test
   void testSearch() {
@@ -34,14 +32,12 @@ void testSearch() {
 
     final List<ExprValue> results = new OpenSearchCatIndicesRequest(client).search();
     assertEquals(1, results.size());
-    assertThat(results.get(0).tupleValue(), anyOf(
-        hasEntry("TABLE_NAME", stringValue("index"))
-    ));
+    assertThat(results.get(0).tupleValue(), anyOf(hasEntry("TABLE_NAME", stringValue("index"))));
   }
 
   @Test
   void testToString() {
-    assertEquals("OpenSearchCatIndicesRequest{}",
-        new OpenSearchCatIndicesRequest(client).toString());
+    assertEquals(
+        "OpenSearchCatIndicesRequest{}", new OpenSearchCatIndicesRequest(client).toString());
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/system/OpenSearchDescribeIndexRequestTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/system/OpenSearchDescribeIndexRequestTest.java
index f387219814..59ece9bfbc 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/system/OpenSearchDescribeIndexRequestTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/system/OpenSearchDescribeIndexRequestTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.request.system;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -12,7 +11,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
 import static org.opensearch.sql.data.model.ExprValueUtils.stringValue;
-import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.List;
@@ -22,57 +20,54 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.opensearch.client.OpenSearchClient;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
 import org.opensearch.sql.opensearch.mapping.IndexMapping;
 
 @ExtendWith(MockitoExtension.class)
 class OpenSearchDescribeIndexRequestTest {
 
-  @Mock
-  private OpenSearchClient client;
+  @Mock private OpenSearchClient client;
+
+  @Mock private IndexMapping mapping;
 
   @Test
   void testSearch() {
-    when(client.getIndexMappings("index"))
-        .thenReturn(
-            ImmutableMap.of(
-                "test",
-                new IndexMapping(
-                    ImmutableMap.<String, String>builder()
-                        .put("name", "keyword")
-                        .build())));
+    when(mapping.getFieldMappings())
+        .thenReturn(Map.of("name", OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword)));
+    when(client.getIndexMappings("index")).thenReturn(ImmutableMap.of("test", mapping));
 
     final List<ExprValue> results = new OpenSearchDescribeIndexRequest(client, "index").search();
     assertEquals(1, results.size());
-    assertThat(results.get(0).tupleValue(), anyOf(
-        hasEntry("TABLE_NAME", stringValue("index")),
-        hasEntry("COLUMN_NAME", stringValue("name")),
-        hasEntry("TYPE_NAME", stringValue("STRING"))
-    ));
+    assertThat(
+        results.get(0).tupleValue(),
+        anyOf(
+            hasEntry("TABLE_NAME", stringValue("index")),
+            hasEntry("COLUMN_NAME", stringValue("name")),
+            hasEntry("TYPE_NAME", stringValue("STRING"))));
   }
 
   @Test
-  void testToString() {
-    assertEquals("OpenSearchDescribeIndexRequest{indexName='index'}",
-        new OpenSearchDescribeIndexRequest(client, "index").toString());
+  void testCrossClusterShouldSearchLocal() {
+    when(mapping.getFieldMappings())
+        .thenReturn(Map.of("name", OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword)));
+    when(client.getIndexMappings("index")).thenReturn(ImmutableMap.of("test", mapping));
+
+    final List<ExprValue> results =
+        new OpenSearchDescribeIndexRequest(client, "ccs:index").search();
+    assertEquals(1, results.size());
+    assertThat(
+        results.get(0).tupleValue(),
+        anyOf(
+            hasEntry("TABLE_NAME", stringValue("index")),
+            hasEntry("COLUMN_NAME", stringValue("name")),
+            hasEntry("TYPE_NAME", stringValue("STRING"))));
   }
 
   @Test
-  void filterOutUnknownType() {
-    when(client.getIndexMappings("index"))
-        .thenReturn(
-            ImmutableMap.of(
-                "test",
-                new IndexMapping(
-                    ImmutableMap.<String, String>builder()
-                        .put("name", "keyword")
-                        .put("@timestamp", "alias")
-                        .build())));
-
-    final Map<String, ExprType> fieldTypes =
-        new OpenSearchDescribeIndexRequest(client, "index").getFieldTypes();
-    assertEquals(1, fieldTypes.size());
-    assertThat(fieldTypes, hasEntry("name", STRING));
+  void testToString() {
+    assertEquals(
+        "OpenSearchDescribeIndexRequest{indexName='index'}",
+        new OpenSearchDescribeIndexRequest(client, "index").toString());
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/AggregationResponseUtils.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/AggregationResponseUtils.java
index bb8ab11c15..ccdfdce7a4 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/AggregationResponseUtils.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/AggregationResponseUtils.java
@@ -3,21 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.response;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ContextParser;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContent;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ContextParser;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.aggregations.Aggregation;
 import org.opensearch.search.aggregations.Aggregations;
 import org.opensearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;
@@ -43,8 +41,10 @@
 import org.opensearch.search.aggregations.metrics.ParsedMax;
 import org.opensearch.search.aggregations.metrics.ParsedMin;
 import org.opensearch.search.aggregations.metrics.ParsedSum;
+import org.opensearch.search.aggregations.metrics.ParsedTDigestPercentiles;
 import org.opensearch.search.aggregations.metrics.ParsedTopHits;
 import org.opensearch.search.aggregations.metrics.ParsedValueCount;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
 import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
 import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
 import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
@@ -53,40 +53,50 @@
 
 public class AggregationResponseUtils {
   private static final List<NamedXContentRegistry.Entry> entryList =
-      new ImmutableMap.Builder<String, ContextParser<Object, ? extends Aggregation>>().put(
-          MinAggregationBuilder.NAME, (p, c) -> ParsedMin.fromXContent(p, (String) c))
-          .put(MaxAggregationBuilder.NAME, (p, c) -> ParsedMax.fromXContent(p, (String) c))
-          .put(SumAggregationBuilder.NAME, (p, c) -> ParsedSum.fromXContent(p, (String) c))
-          .put(AvgAggregationBuilder.NAME, (p, c) -> ParsedAvg.fromXContent(p, (String) c))
-          .put(ExtendedStatsAggregationBuilder.NAME,
-              (p, c) -> ParsedExtendedStats.fromXContent(p, (String) c))
-          .put(StringTerms.NAME, (p, c) -> ParsedStringTerms.fromXContent(p, (String) c))
-          .put(LongTerms.NAME, (p, c) -> ParsedLongTerms.fromXContent(p, (String) c))
-          .put(DoubleTerms.NAME, (p, c) -> ParsedDoubleTerms.fromXContent(p, (String) c))
-          .put(ValueCountAggregationBuilder.NAME,
-              (p, c) -> ParsedValueCount.fromXContent(p, (String) c))
-          .put(PercentilesBucketPipelineAggregationBuilder.NAME,
-              (p, c) -> ParsedPercentilesBucket.fromXContent(p, (String) c))
-          .put(DateHistogramAggregationBuilder.NAME,
-              (p, c) -> ParsedDateHistogram.fromXContent(p, (String) c))
-          .put(HistogramAggregationBuilder.NAME,
-              (p, c) -> ParsedHistogram.fromXContent(p, (String) c))
-          .put(CompositeAggregationBuilder.NAME,
-              (p, c) -> ParsedComposite.fromXContent(p, (String) c))
-          .put(FilterAggregationBuilder.NAME,
-              (p, c) -> ParsedFilter.fromXContent(p, (String) c))
-          .put(TopHitsAggregationBuilder.NAME,
-              (p, c) -> ParsedTopHits.fromXContent(p, (String) c))
-          .build()
-          .entrySet()
-          .stream()
-          .map(entry -> new NamedXContentRegistry.Entry(Aggregation.class,
-              new ParseField(entry.getKey()),
-              entry.getValue()))
-          .collect(Collectors.toList());
+      new ImmutableMap.Builder<String, ContextParser<Object, ? extends Aggregation>>()
+              .put(MinAggregationBuilder.NAME, (p, c) -> ParsedMin.fromXContent(p, (String) c))
+              .put(MaxAggregationBuilder.NAME, (p, c) -> ParsedMax.fromXContent(p, (String) c))
+              .put(SumAggregationBuilder.NAME, (p, c) -> ParsedSum.fromXContent(p, (String) c))
+              .put(AvgAggregationBuilder.NAME, (p, c) -> ParsedAvg.fromXContent(p, (String) c))
+              .put(
+                  PercentilesAggregationBuilder.NAME,
+                  (p, c) -> ParsedTDigestPercentiles.fromXContent(p, (String) c))
+              .put(
+                  ExtendedStatsAggregationBuilder.NAME,
+                  (p, c) -> ParsedExtendedStats.fromXContent(p, (String) c))
+              .put(StringTerms.NAME, (p, c) -> ParsedStringTerms.fromXContent(p, (String) c))
+              .put(LongTerms.NAME, (p, c) -> ParsedLongTerms.fromXContent(p, (String) c))
+              .put(DoubleTerms.NAME, (p, c) -> ParsedDoubleTerms.fromXContent(p, (String) c))
+              .put(
+                  ValueCountAggregationBuilder.NAME,
+                  (p, c) -> ParsedValueCount.fromXContent(p, (String) c))
+              .put(
+                  PercentilesBucketPipelineAggregationBuilder.NAME,
+                  (p, c) -> ParsedPercentilesBucket.fromXContent(p, (String) c))
+              .put(
+                  DateHistogramAggregationBuilder.NAME,
+                  (p, c) -> ParsedDateHistogram.fromXContent(p, (String) c))
+              .put(
+                  HistogramAggregationBuilder.NAME,
+                  (p, c) -> ParsedHistogram.fromXContent(p, (String) c))
+              .put(
+                  CompositeAggregationBuilder.NAME,
+                  (p, c) -> ParsedComposite.fromXContent(p, (String) c))
+              .put(
+                  FilterAggregationBuilder.NAME, (p, c) -> ParsedFilter.fromXContent(p, (String) c))
+              .put(
+                  TopHitsAggregationBuilder.NAME,
+                  (p, c) -> ParsedTopHits.fromXContent(p, (String) c))
+              .build()
+              .entrySet()
+              .stream()
+              .map(
+                  entry ->
+                      new NamedXContentRegistry.Entry(
+                          Aggregation.class, new ParseField(entry.getKey()), entry.getValue()))
+              .collect(Collectors.toList());
   private static final NamedXContentRegistry namedXContentRegistry =
       new NamedXContentRegistry(entryList);
-  private static final XContent xContent = XContentFactory.xContent(XContentType.JSON);
 
   /**
    * Populate {@link Aggregations} from JSON string.
@@ -97,7 +107,10 @@ public class AggregationResponseUtils {
   public static Aggregations fromJson(String json) {
     try {
       XContentParser contentParser =
-          xContent.createParser(namedXContentRegistry, LoggingDeprecationHandler.INSTANCE, json);
+          new JsonXContentParser(
+              namedXContentRegistry,
+              LoggingDeprecationHandler.INSTANCE,
+              new JsonFactory().createParser(json));
       contentParser.nextToken();
       return Aggregations.fromXContent(contentParser);
     } catch (IOException e) {
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/OpenSearchAggregationResponseParserTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/OpenSearchAggregationResponseParserTest.java
index 318110bdde..9ae76f8843 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/OpenSearchAggregationResponseParserTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/OpenSearchAggregationResponseParserTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.response;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -27,6 +26,8 @@
 import org.opensearch.sql.opensearch.response.agg.FilterParser;
 import org.opensearch.sql.opensearch.response.agg.NoBucketAggregationParser;
 import org.opensearch.sql.opensearch.response.agg.OpenSearchAggregationResponseParser;
+import org.opensearch.sql.opensearch.response.agg.PercentilesParser;
+import org.opensearch.sql.opensearch.response.agg.SinglePercentileParser;
 import org.opensearch.sql.opensearch.response.agg.SingleValueParser;
 import org.opensearch.sql.opensearch.response.agg.StatsParser;
 import org.opensearch.sql.opensearch.response.agg.TopHitsParser;
@@ -34,127 +35,116 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class OpenSearchAggregationResponseParserTest {
 
-  /**
-   * SELECT MAX(age) as max FROM accounts.
-   */
+  /** SELECT MAX(age) as max FROM accounts. */
   @Test
   void no_bucket_one_metric_should_pass() {
-    String response = "{\n"
-        + "  \"max#max\": {\n"
-        + "    \"value\": 40\n"
-        + "  }\n"
-        + "}";
-    NoBucketAggregationParser parser = new NoBucketAggregationParser(
-        new SingleValueParser("max")
-    );
+    String response = "{\n" + "  \"max#max\": {\n" + "    \"value\": 40\n" + "  }\n" + "}";
+    NoBucketAggregationParser parser = new NoBucketAggregationParser(new SingleValueParser("max"));
     assertThat(parse(parser, response), contains(entry("max", 40d)));
   }
 
-  /**
-   * SELECT MAX(age) as max, MIN(age) as min FROM accounts.
-   */
+  /** SELECT MAX(age) as max, MIN(age) as min FROM accounts. */
   @Test
   void no_bucket_two_metric_should_pass() {
-    String response = "{\n"
-        + "  \"max#max\": {\n"
-        + "    \"value\": 40\n"
-        + "  },\n"
-        + "  \"min#min\": {\n"
-        + "    \"value\": 20\n"
-        + "  }\n"
-        + "}";
-    NoBucketAggregationParser parser = new NoBucketAggregationParser(
-        new SingleValueParser("max"),
-        new SingleValueParser("min")
-    );
-    assertThat(parse(parser, response),
-        contains(entry("max", 40d,"min", 20d)));
+    String response =
+        "{\n"
+            + "  \"max#max\": {\n"
+            + "    \"value\": 40\n"
+            + "  },\n"
+            + "  \"min#min\": {\n"
+            + "    \"value\": 20\n"
+            + "  }\n"
+            + "}";
+    NoBucketAggregationParser parser =
+        new NoBucketAggregationParser(new SingleValueParser("max"), new SingleValueParser("min"));
+    assertThat(parse(parser, response), contains(entry("max", 40d, "min", 20d)));
   }
 
   @Test
   void one_bucket_one_metric_should_pass() {
-    String response = "{\n"
-        + "  \"composite#composite_buckets\": {\n"
-        + "    \"after_key\": {\n"
-        + "      \"type\": \"sale\"\n"
-        + "    },\n"
-        + "    \"buckets\": [\n"
-        + "      {\n"
-        + "        \"key\": {\n"
-        + "          \"type\": \"cost\"\n"
-        + "        },\n"
-        + "        \"doc_count\": 2,\n"
-        + "        \"avg#avg\": {\n"
-        + "          \"value\": 20\n"
-        + "        }\n"
-        + "      },\n"
-        + "      {\n"
-        + "        \"key\": {\n"
-        + "          \"type\": \"sale\"\n"
-        + "        },\n"
-        + "        \"doc_count\": 2,\n"
-        + "        \"avg#avg\": {\n"
-        + "          \"value\": 105\n"
-        + "        }\n"
-        + "      }\n"
-        + "    ]\n"
-        + "  }\n"
-        + "}";
+    String response =
+        "{\n"
+            + "  \"composite#composite_buckets\": {\n"
+            + "    \"after_key\": {\n"
+            + "      \"type\": \"sale\"\n"
+            + "    },\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"cost\"\n"
+            + "        },\n"
+            + "        \"doc_count\": 2,\n"
+            + "        \"avg#avg\": {\n"
+            + "          \"value\": 20\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"sale\"\n"
+            + "        },\n"
+            + "        \"doc_count\": 2,\n"
+            + "        \"avg#avg\": {\n"
+            + "          \"value\": 105\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
 
-    OpenSearchAggregationResponseParser parser = new CompositeAggregationParser(
-            new SingleValueParser("avg"));
-    assertThat(parse(parser, response),
-        containsInAnyOrder(ImmutableMap.of("type", "cost", "avg", 20d),
+    OpenSearchAggregationResponseParser parser =
+        new CompositeAggregationParser(new SingleValueParser("avg"));
+    assertThat(
+        parse(parser, response),
+        containsInAnyOrder(
+            ImmutableMap.of("type", "cost", "avg", 20d),
             ImmutableMap.of("type", "sale", "avg", 105d)));
   }
 
   @Test
   void two_bucket_one_metric_should_pass() {
-    String response = "{\n"
-        + "  \"composite#composite_buckets\": {\n"
-        + "    \"after_key\": {\n"
-        + "      \"type\": \"sale\",\n"
-        + "      \"region\": \"us\"\n"
-        + "    },\n"
-        + "    \"buckets\": [\n"
-        + "      {\n"
-        + "        \"key\": {\n"
-        + "          \"type\": \"cost\",\n"
-        + "          \"region\": \"us\"\n"
-        + "        },\n"
-        + "        \"avg#avg\": {\n"
-        + "          \"value\": 20\n"
-        + "        }\n"
-        + "      },\n"
-        + "      {\n"
-        + "        \"key\": {\n"
-        + "          \"type\": \"sale\",\n"
-        + "          \"region\": \"uk\"\n"
-        + "        },\n"
-        + "        \"avg#avg\": {\n"
-        + "          \"value\": 130\n"
-        + "        }\n"
-        + "      }\n"
-        + "    ]\n"
-        + "  }\n"
-        + "}";
-    OpenSearchAggregationResponseParser parser = new CompositeAggregationParser(
-        new SingleValueParser("avg"));
-    assertThat(parse(parser, response),
-        containsInAnyOrder(ImmutableMap.of("type", "cost", "region", "us", "avg", 20d),
+    String response =
+        "{\n"
+            + "  \"composite#composite_buckets\": {\n"
+            + "    \"after_key\": {\n"
+            + "      \"type\": \"sale\",\n"
+            + "      \"region\": \"us\"\n"
+            + "    },\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"cost\",\n"
+            + "          \"region\": \"us\"\n"
+            + "        },\n"
+            + "        \"avg#avg\": {\n"
+            + "          \"value\": 20\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"sale\",\n"
+            + "          \"region\": \"uk\"\n"
+            + "        },\n"
+            + "        \"avg#avg\": {\n"
+            + "          \"value\": 130\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
+    OpenSearchAggregationResponseParser parser =
+        new CompositeAggregationParser(new SingleValueParser("avg"));
+    assertThat(
+        parse(parser, response),
+        containsInAnyOrder(
+            ImmutableMap.of("type", "cost", "region", "us", "avg", 20d),
             ImmutableMap.of("type", "sale", "region", "uk", "avg", 130d)));
   }
 
   @Test
   void unsupported_aggregation_should_fail() {
-    String response = "{\n"
-        + "  \"date_histogram#date_histogram\": {\n"
-        + "    \"value\": 40\n"
-        + "  }\n"
-        + "}";
-    NoBucketAggregationParser parser = new NoBucketAggregationParser(
-        new SingleValueParser("max")
-    );
+    String response =
+        "{\n" + "  \"date_histogram#date_histogram\": {\n" + "    \"value\": 40\n" + "  }\n" + "}";
+    NoBucketAggregationParser parser = new NoBucketAggregationParser(new SingleValueParser("max"));
     RuntimeException exception =
         assertThrows(RuntimeException.class, () -> parse(parser, response));
     assertEquals(
@@ -170,14 +160,15 @@ void nan_value_should_return_null() {
 
   @Test
   void filter_aggregation_should_pass() {
-    String response = "{\n"
-        +     "    \"filter#filtered\" : {\n"
-        +     "      \"doc_count\" : 3,\n"
-        +     "      \"avg#filtered\" : {\n"
-        +     "        \"value\" : 37.0\n"
-        +     "      }\n"
-        +     "    }\n"
-        +     "  }";
+    String response =
+        "{\n"
+            + "    \"filter#filtered\" : {\n"
+            + "      \"doc_count\" : 3,\n"
+            + "      \"avg#filtered\" : {\n"
+            + "        \"value\" : 37.0\n"
+            + "      }\n"
+            + "    }\n"
+            + "  }";
     OpenSearchAggregationResponseParser parser =
         new NoBucketAggregationParser(
             FilterParser.builder()
@@ -189,135 +180,422 @@ void filter_aggregation_should_pass() {
 
   @Test
   void filter_aggregation_group_by_should_pass() {
-    String response = "{\n"
-        + "  \"composite#composite_buckets\":{\n"
-        + "    \"after_key\":{\n"
-        + "      \"gender\":\"m\"\n"
-        + "    },\n"
-        + "    \"buckets\":[\n"
-        + "      {\n"
-        + "        \"key\":{\n"
-        + "          \"gender\":\"f\"\n"
-        + "        },\n"
-        + "        \"doc_count\":3,\n"
-        + "        \"filter#filter\":{\n"
-        + "          \"doc_count\":1,\n"
-        + "          \"avg#avg\":{\n"
-        + "            \"value\":39.0\n"
-        + "          }\n"
-        + "        }\n"
-        + "      },\n"
-        + "      {\n"
-        + "        \"key\":{\n"
-        + "          \"gender\":\"m\"\n"
-        + "        },\n"
-        + "        \"doc_count\":4,\n"
-        + "        \"filter#filter\":{\n"
-        + "          \"doc_count\":2,\n"
-        + "          \"avg#avg\":{\n"
-        + "            \"value\":36.0\n"
-        + "          }\n"
-        + "        }\n"
-        + "      }\n"
-        + "    ]\n"
-        + "  }\n"
-        + "}";
-    OpenSearchAggregationResponseParser parser = new CompositeAggregationParser(
-        FilterParser.builder()
-            .name("filter")
-            .metricsParser(new SingleValueParser("avg"))
-            .build()
-    );
-    assertThat(parse(parser, response), containsInAnyOrder(
-        entry("gender", "f", "avg", 39.0),
-        entry("gender", "m", "avg", 36.0)));
+    String response =
+        "{\n"
+            + "  \"composite#composite_buckets\":{\n"
+            + "    \"after_key\":{\n"
+            + "      \"gender\":\"m\"\n"
+            + "    },\n"
+            + "    \"buckets\":[\n"
+            + "      {\n"
+            + "        \"key\":{\n"
+            + "          \"gender\":\"f\"\n"
+            + "        },\n"
+            + "        \"doc_count\":3,\n"
+            + "        \"filter#filter\":{\n"
+            + "          \"doc_count\":1,\n"
+            + "          \"avg#avg\":{\n"
+            + "            \"value\":39.0\n"
+            + "          }\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\":{\n"
+            + "          \"gender\":\"m\"\n"
+            + "        },\n"
+            + "        \"doc_count\":4,\n"
+            + "        \"filter#filter\":{\n"
+            + "          \"doc_count\":2,\n"
+            + "          \"avg#avg\":{\n"
+            + "            \"value\":36.0\n"
+            + "          }\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
+    OpenSearchAggregationResponseParser parser =
+        new CompositeAggregationParser(
+            FilterParser.builder()
+                .name("filter")
+                .metricsParser(new SingleValueParser("avg"))
+                .build());
+    assertThat(
+        parse(parser, response),
+        containsInAnyOrder(entry("gender", "f", "avg", 39.0), entry("gender", "m", "avg", 36.0)));
   }
 
-  /**
-   * SELECT MAX(age) as max, STDDEV(age) as min FROM accounts.
-   */
+  /** SELECT MAX(age) as max, STDDEV(age) as min FROM accounts. */
   @Test
   void no_bucket_max_and_extended_stats() {
-    String response = "{\n"
-        + "  \"extended_stats#esField\": {\n"
-        + "    \"count\": 2033,\n"
-        + "    \"min\": 0,\n"
-        + "    \"max\": 360,\n"
-        + "    \"avg\": 45.47958681751107,\n"
-        + "    \"sum\": 92460,\n"
-        + "    \"sum_of_squares\": 22059450,\n"
-        + "    \"variance\": 8782.295820390027,\n"
-        + "    \"variance_population\": 8782.295820390027,\n"
-        + "    \"variance_sampling\": 8786.61781636463,\n"
-        + "    \"std_deviation\": 93.71390409320287,\n"
-        + "    \"std_deviation_population\": 93.71390409320287,\n"
-        + "    \"std_deviation_sampling\": 93.73696078049805,\n"
-        + "    \"std_deviation_bounds\": {\n"
-        + "      \"upper\": 232.9073950039168,\n"
-        + "      \"lower\": -141.94822136889468,\n"
-        + "      \"upper_population\": 232.9073950039168,\n"
-        + "      \"lower_population\": -141.94822136889468,\n"
-        + "      \"upper_sampling\": 232.95350837850717,\n"
-        + "      \"lower_sampling\": -141.99433474348504\n"
-        + "    }\n"
-        + "  },\n"
-        + "  \"max#maxField\": {\n"
-        + "    \"value\": 360\n"
-        + "  }\n"
-        + "}";
+    String response =
+        "{\n"
+            + "  \"extended_stats#esField\": {\n"
+            + "    \"count\": 2033,\n"
+            + "    \"min\": 0,\n"
+            + "    \"max\": 360,\n"
+            + "    \"avg\": 45.47958681751107,\n"
+            + "    \"sum\": 92460,\n"
+            + "    \"sum_of_squares\": 22059450,\n"
+            + "    \"variance\": 8782.295820390027,\n"
+            + "    \"variance_population\": 8782.295820390027,\n"
+            + "    \"variance_sampling\": 8786.61781636463,\n"
+            + "    \"std_deviation\": 93.71390409320287,\n"
+            + "    \"std_deviation_population\": 93.71390409320287,\n"
+            + "    \"std_deviation_sampling\": 93.73696078049805,\n"
+            + "    \"std_deviation_bounds\": {\n"
+            + "      \"upper\": 232.9073950039168,\n"
+            + "      \"lower\": -141.94822136889468,\n"
+            + "      \"upper_population\": 232.9073950039168,\n"
+            + "      \"lower_population\": -141.94822136889468,\n"
+            + "      \"upper_sampling\": 232.95350837850717,\n"
+            + "      \"lower_sampling\": -141.99433474348504\n"
+            + "    }\n"
+            + "  },\n"
+            + "  \"max#maxField\": {\n"
+            + "    \"value\": 360\n"
+            + "  }\n"
+            + "}";
 
-    NoBucketAggregationParser parser = new NoBucketAggregationParser(
-        new SingleValueParser("maxField"),
-        new StatsParser(ExtendedStats::getStdDeviation, "esField")
-    );
-    assertThat(parse(parser, response),
-        contains(entry("esField", 93.71390409320287, "maxField", 360D)));
+    NoBucketAggregationParser parser =
+        new NoBucketAggregationParser(
+            new SingleValueParser("maxField"),
+            new StatsParser(ExtendedStats::getStdDeviation, "esField"));
+    assertThat(
+        parse(parser, response), contains(entry("esField", 93.71390409320287, "maxField", 360D)));
   }
 
   @Test
   void top_hits_aggregation_should_pass() {
-    String response = "{\n"
-        + "  \"composite#composite_buckets\": {\n"
-        + "    \"buckets\": [\n"
-        + "      {\n"
-        + "        \"key\": {\n"
-        + "          \"type\": \"take\"\n"
-        + "        },\n"
-        + "        \"doc_count\": 2,\n"
-        + "        \"top_hits#take\": {\n"
-        + "          \"hits\": {\n"
-        + "            \"total\": { \"value\": 2, \"relation\": \"eq\" },\n"
-        + "            \"max_score\": 1.0,\n"
-        + "            \"hits\": [\n"
-        + "              {\n"
-        + "                \"_index\": \"accounts\",\n"
-        + "                \"_id\": \"1\",\n"
-        + "                \"_score\": 1.0,\n"
-        + "                \"_source\": {\n"
-        + "                  \"gender\": \"m\"\n"
-        + "                }\n"
-        + "              },\n"
-        + "              {\n"
-        + "                \"_index\": \"accounts\",\n"
-        + "                \"_id\": \"2\",\n"
-        + "                \"_score\": 1.0,\n"
-        + "                \"_source\": {\n"
-        + "                  \"gender\": \"f\"\n"
-        + "                }\n"
-        + "              }\n"
-        + "            ]\n"
-        + "          }\n"
-        + "        }\n"
-        + "      }\n"
-        + "    ]\n"
-        + "  }\n"
-        + "}";
+    String response =
+        "{\n"
+            + "  \"composite#composite_buckets\": {\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"take\"\n"
+            + "        },\n"
+            + "        \"doc_count\": 2,\n"
+            + "        \"top_hits#take\": {\n"
+            + "          \"hits\": {\n"
+            + "            \"total\": { \"value\": 2, \"relation\": \"eq\" },\n"
+            + "            \"max_score\": 1.0,\n"
+            + "            \"hits\": [\n"
+            + "              {\n"
+            + "                \"_index\": \"accounts\",\n"
+            + "                \"_id\": \"1\",\n"
+            + "                \"_score\": 1.0,\n"
+            + "                \"_source\": {\n"
+            + "                  \"gender\": \"m\"\n"
+            + "                }\n"
+            + "              },\n"
+            + "              {\n"
+            + "                \"_index\": \"accounts\",\n"
+            + "                \"_id\": \"2\",\n"
+            + "                \"_score\": 1.0,\n"
+            + "                \"_source\": {\n"
+            + "                  \"gender\": \"f\"\n"
+            + "                }\n"
+            + "              }\n"
+            + "            ]\n"
+            + "          }\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
     OpenSearchAggregationResponseParser parser =
         new CompositeAggregationParser(new TopHitsParser("take"));
-    assertThat(parse(parser, response),
+    assertThat(
+        parse(parser, response),
         contains(ImmutableMap.of("type", "take", "take", ImmutableList.of("m", "f"))));
   }
 
+  /** SELECT PERCENTILE(age, 50) FROM accounts. */
+  @Test
+  void no_bucket_one_metric_percentile_should_pass() {
+    String response =
+        "{\n"
+            + "      \"percentiles#percentile\": {\n"
+            + "        \"values\": {\n"
+            + "          \"50.0\": 35.0\n"
+            + "        }\n"
+            + "      }\n"
+            + "    }";
+    NoBucketAggregationParser parser =
+        new NoBucketAggregationParser(new SinglePercentileParser("percentile"));
+    assertThat(parse(parser, response), contains(entry("percentile", 35.0)));
+  }
+
+  /** SELECT PERCENTILE(age, 50), MAX(age) FROM accounts. */
+  @Test
+  void no_bucket_two_metric_percentile_should_pass() {
+    String response =
+        "{\n"
+            + "      \"percentiles#percentile\": {\n"
+            + "        \"values\": {\n"
+            + "          \"50.0\": 35.0\n"
+            + "        }\n"
+            + "      },\n"
+            + "      \"max#max\": {\n"
+            + "        \"value\": 40\n"
+            + "      }\n"
+            + "    }";
+    NoBucketAggregationParser parser =
+        new NoBucketAggregationParser(
+            new SinglePercentileParser("percentile"), new SingleValueParser("max"));
+    assertThat(parse(parser, response), contains(entry("percentile", 35.0, "max", 40.0)));
+  }
+
+  /** SELECT PERCENTILE(age, 50) FROM accounts GROUP BY type. */
+  @Test
+  void one_bucket_one_metric_percentile_should_pass() {
+    String response =
+        "{\n"
+            + "  \"composite#composite_buckets\": {\n"
+            + "    \"after_key\": {\n"
+            + "      \"type\": \"sale\"\n"
+            + "    },\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"cost\"\n"
+            + "        },\n"
+            + "        \"doc_count\": 2,\n"
+            + "        \"percentiles#percentile\": {\n"
+            + "          \"values\": {\n"
+            + "              \"50.0\": 40.0\n"
+            + "          }\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"sale\"\n"
+            + "        },\n"
+            + "        \"doc_count\": 2,\n"
+            + "        \"percentiles#percentile\": {\n"
+            + "          \"values\": {\n"
+            + "              \"50.0\": 100.0\n"
+            + "          }\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
+
+    OpenSearchAggregationResponseParser parser =
+        new CompositeAggregationParser(new SinglePercentileParser("percentile"));
+    assertThat(
+        parse(parser, response),
+        containsInAnyOrder(
+            ImmutableMap.of("type", "cost", "percentile", 40d),
+            ImmutableMap.of("type", "sale", "percentile", 100d)));
+  }
+
+  /** SELECT PERCENTILE(age, 50) FROM accounts GROUP BY type, region. */
+  @Test
+  void two_bucket_one_metric_percentile_should_pass() {
+    String response =
+        "{\n"
+            + "  \"composite#composite_buckets\": {\n"
+            + "    \"after_key\": {\n"
+            + "      \"type\": \"sale\",\n"
+            + "      \"region\": \"us\"\n"
+            + "    },\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"cost\",\n"
+            + "          \"region\": \"us\"\n"
+            + "        },\n"
+            + "        \"doc_count\": 2,\n"
+            + "        \"percentiles#percentile\": {\n"
+            + "          \"values\": {\n"
+            + "              \"50.0\": 40.0\n"
+            + "          }\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"sale\",\n"
+            + "          \"region\": \"uk\"\n"
+            + "        },\n"
+            + "        \"doc_count\": 2,\n"
+            + "        \"percentiles#percentile\": {\n"
+            + "          \"values\": {\n"
+            + "              \"50.0\": 100.0\n"
+            + "          }\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
+
+    OpenSearchAggregationResponseParser parser =
+        new CompositeAggregationParser(
+            new SinglePercentileParser("percentile"), new SingleValueParser("max"));
+    assertThat(
+        parse(parser, response),
+        containsInAnyOrder(
+            ImmutableMap.of("type", "cost", "region", "us", "percentile", 40d),
+            ImmutableMap.of("type", "sale", "region", "uk", "percentile", 100d)));
+  }
+
+  /** SELECT PERCENTILES(age) FROM accounts. */
+  @Test
+  void no_bucket_percentiles_should_pass() {
+    String response =
+        "{\n"
+            + "      \"percentiles#percentiles\": {\n"
+            + "        \"values\": {\n"
+            + "          \"1.0\": 21.0,\n"
+            + "          \"5.0\": 27.0,\n"
+            + "          \"25.0\": 30.0,\n"
+            + "          \"50.0\": 35.0,\n"
+            + "          \"75.0\": 55.0,\n"
+            + "          \"95.0\": 58.0,\n"
+            + "          \"99.0\": 60.0\n"
+            + "        }\n"
+            + "      }\n"
+            + "    }";
+    NoBucketAggregationParser parser =
+        new NoBucketAggregationParser(new PercentilesParser("percentiles"));
+    assertThat(
+        parse(parser, response),
+        contains(entry("percentiles", List.of(21.0, 27.0, 30.0, 35.0, 55.0, 58.0, 60.0))));
+  }
+
+  /** SELECT PERCENTILES(age) FROM accounts GROUP BY type. */
+  @Test
+  void one_bucket_percentiles_should_pass() {
+    String response =
+        "{\n"
+            + "  \"composite#composite_buckets\": {\n"
+            + "    \"after_key\": {\n"
+            + "      \"type\": \"sale\"\n"
+            + "    },\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"cost\"\n"
+            + "        },\n"
+            + "        \"doc_count\": 2,\n"
+            + "        \"percentiles#percentiles\": {\n"
+            + "          \"values\": {\n"
+            + "            \"1.0\": 21.0,\n"
+            + "            \"5.0\": 27.0,\n"
+            + "            \"25.0\": 30.0,\n"
+            + "            \"50.0\": 35.0,\n"
+            + "            \"75.0\": 55.0,\n"
+            + "            \"95.0\": 58.0,\n"
+            + "            \"99.0\": 60.0\n"
+            + "          }\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"sale\"\n"
+            + "        },\n"
+            + "        \"doc_count\": 2,\n"
+            + "        \"percentiles#percentiles\": {\n"
+            + "          \"values\": {\n"
+            + "            \"1.0\": 21.0,\n"
+            + "            \"5.0\": 27.0,\n"
+            + "            \"25.0\": 30.0,\n"
+            + "            \"50.0\": 35.0,\n"
+            + "            \"75.0\": 55.0,\n"
+            + "            \"95.0\": 58.0,\n"
+            + "            \"99.0\": 60.0\n"
+            + "          }\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
+
+    OpenSearchAggregationResponseParser parser =
+        new CompositeAggregationParser(new PercentilesParser("percentiles"));
+    assertThat(
+        parse(parser, response),
+        containsInAnyOrder(
+            ImmutableMap.of(
+                "type", "cost", "percentiles", List.of(21.0, 27.0, 30.0, 35.0, 55.0, 58.0, 60.0)),
+            ImmutableMap.of(
+                "type", "sale", "percentiles", List.of(21.0, 27.0, 30.0, 35.0, 55.0, 58.0, 60.0))));
+  }
+
+  /** SELECT PERCENTILES(age) FROM accounts GROUP BY type, region. */
+  @Test
+  void two_bucket_percentiles_should_pass() {
+    String response =
+        "{\n"
+            + "  \"composite#composite_buckets\": {\n"
+            + "    \"after_key\": {\n"
+            + "      \"type\": \"sale\",\n"
+            + "      \"region\": \"us\"\n"
+            + "    },\n"
+            + "    \"buckets\": [\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"cost\",\n"
+            + "          \"region\": \"us\"\n"
+            + "        },\n"
+            + "        \"doc_count\": 2,\n"
+            + "        \"percentiles#percentiles\": {\n"
+            + "          \"values\": {\n"
+            + "            \"1.0\": 21.0,\n"
+            + "            \"5.0\": 27.0,\n"
+            + "            \"25.0\": 30.0,\n"
+            + "            \"50.0\": 35.0,\n"
+            + "            \"75.0\": 55.0,\n"
+            + "            \"95.0\": 58.0,\n"
+            + "            \"99.0\": 60.0\n"
+            + "          }\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"key\": {\n"
+            + "          \"type\": \"sale\",\n"
+            + "          \"region\": \"uk\"\n"
+            + "        },\n"
+            + "        \"doc_count\": 2,\n"
+            + "        \"percentiles#percentiles\": {\n"
+            + "          \"values\": {\n"
+            + "            \"1.0\": 21.0,\n"
+            + "            \"5.0\": 27.0,\n"
+            + "            \"25.0\": 30.0,\n"
+            + "            \"50.0\": 35.0,\n"
+            + "            \"75.0\": 55.0,\n"
+            + "            \"95.0\": 58.0,\n"
+            + "            \"99.0\": 60.0\n"
+            + "          }\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ]\n"
+            + "  }\n"
+            + "}";
+
+    OpenSearchAggregationResponseParser parser =
+        new CompositeAggregationParser(new PercentilesParser("percentiles"));
+    assertThat(
+        parse(parser, response),
+        containsInAnyOrder(
+            ImmutableMap.of(
+                "type",
+                "cost",
+                "region",
+                "us",
+                "percentiles",
+                List.of(21.0, 27.0, 30.0, 35.0, 55.0, 58.0, 60.0)),
+            ImmutableMap.of(
+                "type",
+                "sale",
+                "region",
+                "uk",
+                "percentiles",
+                List.of(21.0, 27.0, 30.0, 35.0, 55.0, 58.0, 60.0))));
+  }
+
   public List<Map<String, Object>> parse(OpenSearchAggregationResponseParser parser, String json) {
     return parser.parse(fromJson(json));
   }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/OpenSearchResponseTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/OpenSearchResponseTest.java
index 0a60503415..6f4605bc2f 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/OpenSearchResponseTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/OpenSearchResponseTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.response;
 
 import static java.util.Collections.emptyList;
@@ -12,11 +11,14 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.lucene.search.TotalHits;
@@ -25,13 +27,18 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.action.search.SearchResponse;
-import org.opensearch.common.bytes.BytesArray;
-import org.opensearch.common.text.Text;
+import org.opensearch.core.common.bytes.BytesArray;
+import org.opensearch.core.common.text.Text;
+import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
+import org.opensearch.search.SearchShardTarget;
 import org.opensearch.search.aggregations.Aggregations;
 import org.opensearch.search.fetch.subphase.highlight.HighlightField;
+import org.opensearch.sql.data.model.ExprFloatValue;
 import org.opensearch.sql.data.model.ExprIntegerValue;
+import org.opensearch.sql.data.model.ExprLongValue;
+import org.opensearch.sql.data.model.ExprStringValue;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.data.model.ExprValue;
 import org.opensearch.sql.data.model.ExprValueUtils;
@@ -41,29 +48,25 @@
 @ExtendWith(MockitoExtension.class)
 class OpenSearchResponseTest {
 
-  @Mock
-  private SearchResponse searchResponse;
+  @Mock private SearchResponse searchResponse;
+
+  @Mock private OpenSearchExprValueFactory factory;
 
-  @Mock
-  private OpenSearchExprValueFactory factory;
+  @Mock private SearchHit searchHit1;
 
-  @Mock
-  private SearchHit searchHit1;
+  @Mock private SearchHit searchHit2;
 
-  @Mock
-  private SearchHit searchHit2;
+  @Mock private Aggregations aggregations;
 
-  @Mock
-  private Aggregations aggregations;
+  private List<String> includes = List.of();
 
-  @Mock
-  private OpenSearchAggregationResponseParser parser;
+  @Mock private OpenSearchAggregationResponseParser parser;
 
-  private ExprTupleValue exprTupleValue1 = ExprTupleValue.fromExprValueMap(ImmutableMap.of("id1",
-      new ExprIntegerValue(1)));
+  private ExprTupleValue exprTupleValue1 =
+      ExprTupleValue.fromExprValueMap(ImmutableMap.of("id1", new ExprIntegerValue(1)));
 
-  private ExprTupleValue exprTupleValue2 = ExprTupleValue.fromExprValueMap(ImmutableMap.of("id2",
-      new ExprIntegerValue(2)));
+  private ExprTupleValue exprTupleValue2 =
+      ExprTupleValue.fromExprValueMap(ImmutableMap.of("id2", new ExprIntegerValue(2)));
 
   @Test
   void isEmpty() {
@@ -74,20 +77,25 @@ void isEmpty() {
                 new TotalHits(2L, TotalHits.Relation.EQUAL_TO),
                 1.0F));
 
-    assertFalse(new OpenSearchResponse(searchResponse, factory).isEmpty());
+    var response = new OpenSearchResponse(searchResponse, factory, includes);
+    assertFalse(response.isEmpty());
 
     when(searchResponse.getHits()).thenReturn(SearchHits.empty());
     when(searchResponse.getAggregations()).thenReturn(null);
-    assertTrue(new OpenSearchResponse(searchResponse, factory).isEmpty());
+
+    response = new OpenSearchResponse(searchResponse, factory, includes);
+    assertTrue(response.isEmpty());
 
     when(searchResponse.getHits())
         .thenReturn(new SearchHits(null, new TotalHits(0, TotalHits.Relation.EQUAL_TO), 0));
-    OpenSearchResponse response3 = new OpenSearchResponse(searchResponse, factory);
-    assertTrue(response3.isEmpty());
+    response = new OpenSearchResponse(searchResponse, factory, includes);
+    assertTrue(response.isEmpty());
 
     when(searchResponse.getHits()).thenReturn(SearchHits.empty());
     when(searchResponse.getAggregations()).thenReturn(new Aggregations(emptyList()));
-    assertFalse(new OpenSearchResponse(searchResponse, factory).isEmpty());
+
+    response = new OpenSearchResponse(searchResponse, factory, includes);
+    assertFalse(response.isEmpty());
   }
 
   @Test
@@ -101,14 +109,18 @@ void iterator() {
 
     when(searchHit1.getSourceAsString()).thenReturn("{\"id1\", 1}");
     when(searchHit2.getSourceAsString()).thenReturn("{\"id1\", 2}");
-    when(factory.construct(any())).thenReturn(exprTupleValue1).thenReturn(exprTupleValue2);
+    when(searchHit1.getInnerHits()).thenReturn(null);
+    when(searchHit2.getInnerHits()).thenReturn(null);
+    when(factory.construct(any(), anyBoolean()))
+        .thenReturn(exprTupleValue1)
+        .thenReturn(exprTupleValue2);
 
     int i = 0;
-    for (ExprValue hit : new OpenSearchResponse(searchResponse, factory)) {
+    for (ExprValue hit : new OpenSearchResponse(searchResponse, factory, List.of("id1"))) {
       if (i == 0) {
-        assertEquals(exprTupleValue1, hit);
+        assertEquals(exprTupleValue1.tupleValue().get("id"), hit.tupleValue().get("id"));
       } else if (i == 1) {
-        assertEquals(exprTupleValue2, hit);
+        assertEquals(exprTupleValue2.tupleValue().get("id"), hit.tupleValue().get("id"));
       } else {
         fail("More search hits returned than expected");
       }
@@ -116,11 +128,153 @@ void iterator() {
     }
   }
 
+  @Test
+  void iterator_metafields() {
+
+    ExprTupleValue exprTupleHit =
+        ExprTupleValue.fromExprValueMap(ImmutableMap.of("id1", new ExprIntegerValue(1)));
+
+    when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit1},
+                new TotalHits(1L, TotalHits.Relation.EQUAL_TO),
+                3.75F));
+
+    ShardId shardId = new ShardId("index", "indexUUID", 42);
+    SearchShardTarget shardTarget = new SearchShardTarget("node", shardId, null, null);
+
+    when(searchHit1.getSourceAsString()).thenReturn("{\"id1\", 1}");
+    when(searchHit1.getId()).thenReturn("testId");
+    when(searchHit1.getIndex()).thenReturn("testIndex");
+    when(searchHit1.getShard()).thenReturn(shardTarget);
+    when(searchHit1.getScore()).thenReturn(3.75F);
+    when(searchHit1.getSeqNo()).thenReturn(123456L);
+
+    when(factory.construct(any(), anyBoolean())).thenReturn(exprTupleHit);
+
+    ExprTupleValue exprTupleResponse =
+        ExprTupleValue.fromExprValueMap(
+            ImmutableMap.of(
+                "id1", new ExprIntegerValue(1),
+                "_index", new ExprStringValue("testIndex"),
+                "_id", new ExprStringValue("testId"),
+                "_routing", new ExprStringValue(shardTarget.toString()),
+                "_sort", new ExprLongValue(123456L),
+                "_score", new ExprFloatValue(3.75F),
+                "_maxscore", new ExprFloatValue(3.75F)));
+    List includes = List.of("id1", "_index", "_id", "_routing", "_sort", "_score", "_maxscore");
+    int i = 0;
+    for (ExprValue hit : new OpenSearchResponse(searchResponse, factory, includes)) {
+      if (i == 0) {
+        assertEquals(exprTupleResponse, hit);
+      } else {
+        fail("More search hits returned than expected");
+      }
+      i++;
+    }
+  }
+
+  @Test
+  void iterator_metafields_withoutIncludes() {
+
+    ExprTupleValue exprTupleHit =
+        ExprTupleValue.fromExprValueMap(ImmutableMap.of("id1", new ExprIntegerValue(1)));
+
+    when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit1},
+                new TotalHits(1L, TotalHits.Relation.EQUAL_TO),
+                3.75F));
+
+    when(searchHit1.getSourceAsString()).thenReturn("{\"id1\", 1}");
+
+    when(factory.construct(any(), anyBoolean())).thenReturn(exprTupleHit);
+
+    List includes = List.of("id1");
+    ExprTupleValue exprTupleResponse =
+        ExprTupleValue.fromExprValueMap(ImmutableMap.of("id1", new ExprIntegerValue(1)));
+    int i = 0;
+    for (ExprValue hit : new OpenSearchResponse(searchResponse, factory, includes)) {
+      if (i == 0) {
+        assertEquals(exprTupleResponse, hit);
+      } else {
+        fail("More search hits returned than expected");
+      }
+      i++;
+    }
+  }
+
+  @Test
+  void iterator_metafields_scoreNaN() {
+
+    ExprTupleValue exprTupleHit =
+        ExprTupleValue.fromExprValueMap(ImmutableMap.of("id1", new ExprIntegerValue(1)));
+
+    when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit1},
+                new TotalHits(1L, TotalHits.Relation.EQUAL_TO),
+                Float.NaN));
+
+    when(searchHit1.getSourceAsString()).thenReturn("{\"id1\", 1}");
+    when(searchHit1.getId()).thenReturn("testId");
+    when(searchHit1.getIndex()).thenReturn("testIndex");
+    when(searchHit1.getScore()).thenReturn(Float.NaN);
+    when(searchHit1.getSeqNo()).thenReturn(123456L);
+
+    when(factory.construct(any(), anyBoolean())).thenReturn(exprTupleHit);
+
+    List includes = List.of("id1", "_index", "_id", "_sort", "_score", "_maxscore");
+    ExprTupleValue exprTupleResponse =
+        ExprTupleValue.fromExprValueMap(
+            ImmutableMap.of(
+                "id1", new ExprIntegerValue(1),
+                "_index", new ExprStringValue("testIndex"),
+                "_id", new ExprStringValue("testId"),
+                "_sort", new ExprLongValue(123456L)));
+    int i = 0;
+    for (ExprValue hit : new OpenSearchResponse(searchResponse, factory, includes)) {
+      if (i == 0) {
+        assertEquals(exprTupleResponse, hit);
+      } else {
+        fail("More search hits returned than expected");
+      }
+      i++;
+    }
+  }
+
+  @Test
+  void iterator_with_inner_hits() {
+    when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit1},
+                new TotalHits(2L, TotalHits.Relation.EQUAL_TO),
+                1.0F));
+    when(searchHit1.getInnerHits())
+        .thenReturn(
+            Map.of(
+                "innerHit",
+                new SearchHits(
+                    new SearchHit[] {searchHit1},
+                    new TotalHits(2L, TotalHits.Relation.EQUAL_TO),
+                    1.0F)));
+
+    when(factory.construct(any(), anyBoolean())).thenReturn(exprTupleValue1);
+
+    for (ExprValue hit : new OpenSearchResponse(searchResponse, factory, includes)) {
+      assertEquals(exprTupleValue1, hit);
+    }
+  }
+
   @Test
   void response_is_aggregation_when_aggregation_not_empty() {
     when(searchResponse.getAggregations()).thenReturn(aggregations);
 
-    OpenSearchResponse response = new OpenSearchResponse(searchResponse, factory);
+    OpenSearchResponse response = new OpenSearchResponse(searchResponse, factory, includes);
     assertTrue(response.isAggregationResponse());
   }
 
@@ -128,22 +282,24 @@ void response_is_aggregation_when_aggregation_not_empty() {
   void response_isnot_aggregation_when_aggregation_is_empty() {
     when(searchResponse.getAggregations()).thenReturn(null);
 
-    OpenSearchResponse response = new OpenSearchResponse(searchResponse, factory);
+    OpenSearchResponse response = new OpenSearchResponse(searchResponse, factory, includes);
     assertFalse(response.isAggregationResponse());
   }
 
   @Test
   void aggregation_iterator() {
+    final List includes = List.of("id1", "id2");
+
     when(parser.parse(any()))
         .thenReturn(Arrays.asList(ImmutableMap.of("id1", 1), ImmutableMap.of("id2", 2)));
     when(searchResponse.getAggregations()).thenReturn(aggregations);
     when(factory.getParser()).thenReturn(parser);
-    when(factory.construct(anyString(), any()))
+    when(factory.construct(anyString(), anyInt(), anyBoolean()))
         .thenReturn(new ExprIntegerValue(1))
         .thenReturn(new ExprIntegerValue(2));
 
     int i = 0;
-    for (ExprValue hit : new OpenSearchResponse(searchResponse, factory)) {
+    for (ExprValue hit : new OpenSearchResponse(searchResponse, factory, includes)) {
       if (i == 0) {
         assertEquals(exprTupleValue1, hit);
       } else if (i == 1) {
@@ -158,30 +314,30 @@ void aggregation_iterator() {
   @Test
   void highlight_iterator() {
     SearchHit searchHit = new SearchHit(1);
-    searchHit.sourceRef(
-        new BytesArray("{\"name\":\"John\"}"));
-    Map<String, HighlightField> highlightMap = Map.of("highlights",
-        new HighlightField("Title", new Text[] {new Text("field")}));
-    searchHit.highlightFields(Map.of("highlights", new HighlightField("Title",
-        new Text[] {new Text("field")})));
+    searchHit.sourceRef(new BytesArray("{\"name\":\"John\"}"));
+    Map<String, HighlightField> highlightMap =
+        Map.of("highlights", new HighlightField("Title", new Text[] {new Text("field")}));
+    searchHit.highlightFields(
+        Map.of("highlights", new HighlightField("Title", new Text[] {new Text("field")})));
     ExprValue resultTuple = ExprValueUtils.tupleValue(searchHit.getSourceAsMap());
 
     when(searchResponse.getHits())
         .thenReturn(
             new SearchHits(
-                new SearchHit[]{searchHit1},
+                new SearchHit[] {searchHit1},
                 new TotalHits(1L, TotalHits.Relation.EQUAL_TO),
                 1.0F));
 
     when(searchHit1.getHighlightFields()).thenReturn(highlightMap);
-    when(factory.construct(any())).thenReturn(resultTuple);
-
-    for (ExprValue resultHit : new OpenSearchResponse(searchResponse, factory)) {
-      var expected = ExprValueUtils.collectionValue(
-          Arrays.stream(searchHit.getHighlightFields().get("highlights").getFragments())
-              .map(t -> (t.toString())).collect(Collectors.toList()));
-      var result = resultHit.tupleValue().get(
-          "_highlight").tupleValue().get("highlights");
+    when(factory.construct(any(), anyBoolean())).thenReturn(resultTuple);
+
+    for (ExprValue resultHit : new OpenSearchResponse(searchResponse, factory, includes)) {
+      var expected =
+          ExprValueUtils.collectionValue(
+              Arrays.stream(searchHit.getHighlightFields().get("highlights").getFragments())
+                  .map(t -> (t.toString()))
+                  .collect(Collectors.toList()));
+      var result = resultHit.tupleValue().get("_highlight").tupleValue().get("highlights");
       assertTrue(expected.equals(result));
     }
   }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/ErrorMessageFactoryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/ErrorMessageFactoryTest.java
index ffd1a9d14e..eb759233a8 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/ErrorMessageFactoryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/ErrorMessageFactoryTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.response.error;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -11,7 +10,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.opensearch.OpenSearchException;
-import org.opensearch.rest.RestStatus;
+import org.opensearch.core.rest.RestStatus;
 
 public class ErrorMessageFactoryTest {
   private Throwable nonOpenSearchThrowable = new Throwable();
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/ErrorMessageTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/ErrorMessageTest.java
index 0c5e018f88..90268502c2 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/ErrorMessageTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/ErrorMessageTest.java
@@ -3,12 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.response.error;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.opensearch.rest.RestStatus.BAD_REQUEST;
-import static org.opensearch.rest.RestStatus.SERVICE_UNAVAILABLE;
+import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
+import static org.opensearch.core.rest.RestStatus.SERVICE_UNAVAILABLE;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -20,45 +19,49 @@ class ErrorMessageTest {
   @Test
   public void testToString() {
     ErrorMessage errorMessage =
-        new ErrorMessage(new IllegalStateException("illegal state"),
-            SERVICE_UNAVAILABLE.getStatus());
-    assertEquals("{\n"
-        + "  \"error\": {\n"
-        + "    \"reason\": \"There was internal problem at backend\",\n"
-        + "    \"details\": \"illegal state\",\n"
-        + "    \"type\": \"IllegalStateException\"\n"
-        + "  },\n"
-        + "  \"status\": 503\n"
-        + "}", errorMessage.toString());
+        new ErrorMessage(
+            new IllegalStateException("illegal state"), SERVICE_UNAVAILABLE.getStatus());
+    assertEquals(
+        "{\n"
+            + "  \"error\": {\n"
+            + "    \"reason\": \"There was internal problem at backend\",\n"
+            + "    \"details\": \"illegal state\",\n"
+            + "    \"type\": \"IllegalStateException\"\n"
+            + "  },\n"
+            + "  \"status\": 503\n"
+            + "}",
+        errorMessage.toString());
   }
 
   @Test
   public void testBadRequestToString() {
     ErrorMessage errorMessage =
-        new ErrorMessage(new IllegalStateException(),
-            BAD_REQUEST.getStatus());
-    assertEquals("{\n"
-        + "  \"error\": {\n"
-        + "    \"reason\": \"Invalid Query\",\n"
-        + "    \"details\": \"\",\n"
-        + "    \"type\": \"IllegalStateException\"\n"
-        + "  },\n"
-        + "  \"status\": 400\n"
-        + "}", errorMessage.toString());
+        new ErrorMessage(new IllegalStateException(), BAD_REQUEST.getStatus());
+    assertEquals(
+        "{\n"
+            + "  \"error\": {\n"
+            + "    \"reason\": \"Invalid Query\",\n"
+            + "    \"details\": \"\",\n"
+            + "    \"type\": \"IllegalStateException\"\n"
+            + "  },\n"
+            + "  \"status\": 400\n"
+            + "}",
+        errorMessage.toString());
   }
 
   @Test
   public void testToStringWithEmptyErrorMessage() {
     ErrorMessage errorMessage =
-        new ErrorMessage(new IllegalStateException(),
-            SERVICE_UNAVAILABLE.getStatus());
-    assertEquals("{\n"
-        + "  \"error\": {\n"
-        + "    \"reason\": \"There was internal problem at backend\",\n"
-        + "    \"details\": \"\",\n"
-        + "    \"type\": \"IllegalStateException\"\n"
-        + "  },\n"
-        + "  \"status\": 503\n"
-        + "}", errorMessage.toString());
+        new ErrorMessage(new IllegalStateException(), SERVICE_UNAVAILABLE.getStatus());
+    assertEquals(
+        "{\n"
+            + "  \"error\": {\n"
+            + "    \"reason\": \"There was internal problem at backend\",\n"
+            + "    \"details\": \"\",\n"
+            + "    \"type\": \"IllegalStateException\"\n"
+            + "  },\n"
+            + "  \"status\": 503\n"
+            + "}",
+        errorMessage.toString());
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessageTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessageTest.java
index 91d4a15ef3..f07b5dfdd3 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessageTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessageTest.java
@@ -3,12 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.response.error;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
-import static org.opensearch.rest.RestStatus.SERVICE_UNAVAILABLE;
+import static org.opensearch.core.rest.RestStatus.SERVICE_UNAVAILABLE;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -21,14 +20,11 @@
 @ExtendWith(MockitoExtension.class)
 class OpenSearchErrorMessageTest {
 
-  @Mock
-  private OpenSearchException openSearchException;
+  @Mock private OpenSearchException openSearchException;
 
-  @Mock
-  private SearchPhaseExecutionException searchPhaseExecutionException;
+  @Mock private SearchPhaseExecutionException searchPhaseExecutionException;
 
-  @Mock
-  private ShardSearchFailure shardSearchFailure;
+  @Mock private ShardSearchFailure shardSearchFailure;
 
   @Test
   public void fetchReason() {
@@ -45,7 +41,8 @@ public void fetchDetailsWithOpenSearchException() {
 
     OpenSearchErrorMessage errorMessage =
         new OpenSearchErrorMessage(openSearchException, SERVICE_UNAVAILABLE.getStatus());
-    assertEquals("detail error\n"
+    assertEquals(
+        "detail error\n"
             + "For more details, please send request for "
             + "Json format to see the raw response from OpenSearch engine.",
         errorMessage.fetchDetails());
@@ -59,9 +56,9 @@ public void fetchDetailsWithSearchPhaseExecutionException() {
     when(shardSearchFailure.getCause()).thenReturn(new IllegalStateException("illegal state"));
 
     OpenSearchErrorMessage errorMessage =
-        new OpenSearchErrorMessage(searchPhaseExecutionException,
-            SERVICE_UNAVAILABLE.getStatus());
-    assertEquals("Shard[1]: java.lang.IllegalStateException: illegal state\n"
+        new OpenSearchErrorMessage(searchPhaseExecutionException, SERVICE_UNAVAILABLE.getStatus());
+    assertEquals(
+        "Shard[1]: java.lang.IllegalStateException: illegal state\n"
             + "\n"
             + "For more details, please send request for Json format to see the "
             + "raw response from OpenSearch engine.",
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/setting/OpenSearchSettingsTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/setting/OpenSearchSettingsTest.java
index fb97065099..026f0c6218 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/setting/OpenSearchSettingsTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/setting/OpenSearchSettingsTest.java
@@ -3,24 +3,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.setting;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.AdditionalMatchers.not;
+import static org.mockito.AdditionalMatchers.or;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
 import static org.opensearch.common.unit.TimeValue.timeValueMinutes;
 import static org.opensearch.sql.opensearch.setting.LegacyOpenDistroSettings.legacySettings;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED_SETTING;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL_SETTING;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.METRICS_ROLLING_INTERVAL_SETTING;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.METRICS_ROLLING_WINDOW_SETTING;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.PPL_ENABLED_SETTING;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.QUERY_MEMORY_LIMIT_SETTING;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.QUERY_SIZE_LIMIT_SETTING;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.SPARK_EXECUTION_ENGINE_CONFIG;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.SQL_CURSOR_KEEP_ALIVE_SETTING;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.SQL_ENABLED_SETTING;
+import static org.opensearch.sql.opensearch.setting.OpenSearchSettings.SQL_SLOWLOG_SETTING;
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.cluster.ClusterName;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
-import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.unit.ByteSizeValue;
+import org.opensearch.index.IndexSettings;
 import org.opensearch.monitor.jvm.JvmInfo;
 import org.opensearch.sql.common.setting.LegacySettings;
 import org.opensearch.sql.common.setting.Settings;
@@ -28,17 +44,34 @@
 @ExtendWith(MockitoExtension.class)
 class OpenSearchSettingsTest {
 
-  @Mock
-  private ClusterSettings clusterSettings;
+  @Mock private ClusterSettings clusterSettings;
 
   @Test
   void getSettingValue() {
+    when(clusterSettings.get(ClusterName.CLUSTER_NAME_SETTING)).thenReturn(ClusterName.DEFAULT);
+    when(clusterSettings.get(not((eq(ClusterName.CLUSTER_NAME_SETTING))))).thenReturn(null);
     OpenSearchSettings settings = new OpenSearchSettings(clusterSettings);
     ByteSizeValue sizeValue = settings.getSettingValue(Settings.Key.QUERY_MEMORY_LIMIT);
 
     assertNotNull(sizeValue);
   }
 
+  @Test
+  void getSettingValueWithPresetValuesInYml() {
+    when(clusterSettings.get(ClusterName.CLUSTER_NAME_SETTING)).thenReturn(ClusterName.DEFAULT);
+    when(clusterSettings.get((Setting<ByteSizeValue>) QUERY_MEMORY_LIMIT_SETTING))
+        .thenReturn(new ByteSizeValue(20));
+    when(clusterSettings.get(
+            not(
+                or(
+                    eq(ClusterName.CLUSTER_NAME_SETTING),
+                    eq((Setting<ByteSizeValue>) QUERY_MEMORY_LIMIT_SETTING)))))
+        .thenReturn(null);
+    OpenSearchSettings settings = new OpenSearchSettings(clusterSettings);
+    ByteSizeValue sizeValue = settings.getSettingValue(Settings.Key.QUERY_MEMORY_LIMIT);
+    assertEquals(sizeValue, new ByteSizeValue(20));
+  }
+
   @Test
   void pluginSettings() {
     List<Setting<?>> settings = OpenSearchSettings.pluginSettings();
@@ -46,18 +79,28 @@ void pluginSettings() {
     assertFalse(settings.isEmpty());
   }
 
+  @Test
+  void pluginNonDynamicSettings() {
+    List<Setting<?>> settings = OpenSearchSettings.pluginNonDynamicSettings();
+
+    assertFalse(settings.isEmpty());
+  }
+
   @Test
   void getSettings() {
+    when(clusterSettings.get(ClusterName.CLUSTER_NAME_SETTING)).thenReturn(ClusterName.DEFAULT);
+    when(clusterSettings.get(not((eq(ClusterName.CLUSTER_NAME_SETTING))))).thenReturn(null);
     OpenSearchSettings settings = new OpenSearchSettings(clusterSettings);
     assertFalse(settings.getSettings().isEmpty());
   }
 
   @Test
   void update() {
+    when(clusterSettings.get(ClusterName.CLUSTER_NAME_SETTING)).thenReturn(ClusterName.DEFAULT);
+    when(clusterSettings.get(not((eq(ClusterName.CLUSTER_NAME_SETTING))))).thenReturn(null);
     OpenSearchSettings settings = new OpenSearchSettings(clusterSettings);
     ByteSizeValue oldValue = settings.getSettingValue(Settings.Key.QUERY_MEMORY_LIMIT);
-    OpenSearchSettings.Updater updater =
-        settings.new Updater(Settings.Key.QUERY_MEMORY_LIMIT);
+    OpenSearchSettings.Updater updater = settings.new Updater(Settings.Key.QUERY_MEMORY_LIMIT);
     updater.accept(new ByteSizeValue(0L));
 
     ByteSizeValue newValue = settings.getSettingValue(Settings.Key.QUERY_MEMORY_LIMIT);
@@ -67,6 +110,8 @@ void update() {
 
   @Test
   void settingsFallback() {
+    when(clusterSettings.get(ClusterName.CLUSTER_NAME_SETTING)).thenReturn(ClusterName.DEFAULT);
+    when(clusterSettings.get(not((eq(ClusterName.CLUSTER_NAME_SETTING))))).thenReturn(null);
     OpenSearchSettings settings = new OpenSearchSettings(clusterSettings);
     assertEquals(
         settings.getSettingValue(Settings.Key.SQL_ENABLED),
@@ -90,8 +135,7 @@ void settingsFallback() {
             org.opensearch.common.settings.Settings.EMPTY));
     assertEquals(
         settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT),
-        LegacyOpenDistroSettings.QUERY_SIZE_LIMIT_SETTING.get(
-            org.opensearch.common.settings.Settings.EMPTY));
+        IndexSettings.MAX_RESULT_WINDOW_SETTING.get(org.opensearch.common.settings.Settings.EMPTY));
     assertEquals(
         settings.getSettingValue(Settings.Key.METRICS_ROLLING_WINDOW),
         LegacyOpenDistroSettings.METRICS_ROLLING_WINDOW_SETTING.get(
@@ -116,21 +160,59 @@ public void updateLegacySettingsFallback() {
             .put(LegacySettings.Key.METRICS_ROLLING_INTERVAL.getKeyValue(), 100L)
             .build();
 
-    assertEquals(OpenSearchSettings.SQL_ENABLED_SETTING.get(settings), false);
-    assertEquals(OpenSearchSettings.SQL_SLOWLOG_SETTING.get(settings), 10);
-    assertEquals(OpenSearchSettings.SQL_CURSOR_KEEP_ALIVE_SETTING.get(settings),
-        timeValueMinutes(1));
-    assertEquals(OpenSearchSettings.PPL_ENABLED_SETTING.get(settings), true);
-    assertEquals(OpenSearchSettings.QUERY_MEMORY_LIMIT_SETTING.get(settings),
+    assertEquals(SQL_ENABLED_SETTING.get(settings), false);
+    assertEquals(SQL_SLOWLOG_SETTING.get(settings), 10);
+    assertEquals(SQL_CURSOR_KEEP_ALIVE_SETTING.get(settings), timeValueMinutes(1));
+    assertEquals(PPL_ENABLED_SETTING.get(settings), true);
+    assertEquals(
+        QUERY_MEMORY_LIMIT_SETTING.get(settings),
         new ByteSizeValue((int) (JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.2)));
-    assertEquals(OpenSearchSettings.QUERY_SIZE_LIMIT_SETTING.get(settings), 100);
-    assertEquals(OpenSearchSettings.METRICS_ROLLING_WINDOW_SETTING.get(settings), 2000L);
-    assertEquals(OpenSearchSettings.METRICS_ROLLING_INTERVAL_SETTING.get(settings), 100L);
+    assertEquals(QUERY_SIZE_LIMIT_SETTING.get(settings), 10000);
+    assertEquals(METRICS_ROLLING_WINDOW_SETTING.get(settings), 2000L);
+    assertEquals(METRICS_ROLLING_INTERVAL_SETTING.get(settings), 100L);
   }
 
-
   @Test
   void legacySettingsShouldBeDeprecatedBeforeRemove() {
     assertEquals(15, legacySettings().size());
   }
+
+  @Test
+  void getSparkExecutionEngineConfigSetting() {
+    // Default is empty string
+    assertEquals(
+        "",
+        SPARK_EXECUTION_ENGINE_CONFIG.get(
+            org.opensearch.common.settings.Settings.builder().build()));
+
+    // Configurable at runtime
+    String sparkConfig =
+        "{\n"
+            + "  \"sparkSubmitParameters\": \"--conf spark.dynamicAllocation.enabled=false\"\n"
+            + "}";
+    assertEquals(
+        sparkConfig,
+        SPARK_EXECUTION_ENGINE_CONFIG.get(
+            org.opensearch.common.settings.Settings.builder()
+                .put(SPARK_EXECUTION_ENGINE_CONFIG.getKey(), sparkConfig)
+                .build()));
+  }
+
+  @Test
+  void getAsyncQueryExternalSchedulerEnabledSetting() {
+    // Default is true
+    assertEquals(
+        true,
+        ASYNC_QUERY_EXTERNAL_SCHEDULER_ENABLED_SETTING.get(
+            org.opensearch.common.settings.Settings.builder().build()));
+  }
+
+  @Test
+  void getAsyncQueryExternalSchedulerIntervalSetting() {
+    // Default is empty string
+    assertEquals(
+        "",
+        ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL_SETTING.get(
+            org.opensearch.common.settings.Settings.builder().build()));
+  }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchDefaultImplementorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchDefaultImplementorTest.java
index d7e5955491..85d0a4e94f 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchDefaultImplementorTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchDefaultImplementorTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -19,21 +18,15 @@
 import org.opensearch.sql.planner.logical.LogicalML;
 import org.opensearch.sql.planner.logical.LogicalMLCommons;
 import org.opensearch.sql.planner.logical.LogicalPlan;
-import org.opensearch.sql.storage.Table;
 
 @ExtendWith(MockitoExtension.class)
 public class OpenSearchDefaultImplementorTest {
 
-  @Mock
-  OpenSearchClient client;
-
-  @Mock
-  Table table;
+  @Mock OpenSearchClient client;
 
   @Test
   public void visitMachineLearning() {
-    LogicalMLCommons node = Mockito.mock(LogicalMLCommons.class,
-        Answers.RETURNS_DEEP_STUBS);
+    LogicalMLCommons node = Mockito.mock(LogicalMLCommons.class, Answers.RETURNS_DEEP_STUBS);
     Mockito.when(node.getChild().get(0)).thenReturn(Mockito.mock(LogicalPlan.class));
     OpenSearchIndex.OpenSearchDefaultImplementor implementor =
         new OpenSearchIndex.OpenSearchDefaultImplementor(client);
@@ -42,8 +35,7 @@ public void visitMachineLearning() {
 
   @Test
   public void visitAD() {
-    LogicalAD node = Mockito.mock(LogicalAD.class,
-        Answers.RETURNS_DEEP_STUBS);
+    LogicalAD node = Mockito.mock(LogicalAD.class, Answers.RETURNS_DEEP_STUBS);
     Mockito.when(node.getChild().get(0)).thenReturn(Mockito.mock(LogicalPlan.class));
     OpenSearchIndex.OpenSearchDefaultImplementor implementor =
         new OpenSearchIndex.OpenSearchDefaultImplementor(client);
@@ -52,11 +44,10 @@ public void visitAD() {
 
   @Test
   public void visitML() {
-    LogicalML node = Mockito.mock(LogicalML.class,
-            Answers.RETURNS_DEEP_STUBS);
+    LogicalML node = Mockito.mock(LogicalML.class, Answers.RETURNS_DEEP_STUBS);
     Mockito.when(node.getChild().get(0)).thenReturn(Mockito.mock(LogicalPlan.class));
     OpenSearchIndex.OpenSearchDefaultImplementor implementor =
-            new OpenSearchIndex.OpenSearchDefaultImplementor(client);
+        new OpenSearchIndex.OpenSearchDefaultImplementor(client);
     assertNotNull(implementor.visitML(node, null));
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexScanTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexScanTest.java
deleted file mode 100644
index 9a606750a3..0000000000
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexScanTest.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.sql.opensearch.storage;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.opensearch.search.sort.FieldSortBuilder.DOC_FIELD_NAME;
-import static org.opensearch.search.sort.SortOrder.ASC;
-import static org.opensearch.sql.data.type.ExprCoreType.STRING;
-
-import com.google.common.collect.ImmutableMap;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.stubbing.Answer;
-import org.opensearch.common.bytes.BytesArray;
-import org.opensearch.index.query.QueryBuilder;
-import org.opensearch.index.query.QueryBuilders;
-import org.opensearch.search.SearchHit;
-import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
-import org.opensearch.sql.ast.expression.DataType;
-import org.opensearch.sql.ast.expression.Literal;
-import org.opensearch.sql.common.setting.Settings;
-import org.opensearch.sql.data.model.ExprValue;
-import org.opensearch.sql.data.model.ExprValueUtils;
-import org.opensearch.sql.exception.SemanticCheckException;
-import org.opensearch.sql.opensearch.client.OpenSearchClient;
-import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
-import org.opensearch.sql.opensearch.request.OpenSearchQueryRequest;
-import org.opensearch.sql.opensearch.request.OpenSearchRequest;
-import org.opensearch.sql.opensearch.response.OpenSearchResponse;
-
-@ExtendWith(MockitoExtension.class)
-class OpenSearchIndexScanTest {
-
-  @Mock
-  private OpenSearchClient client;
-
-  @Mock
-  private Settings settings;
-
-  private OpenSearchExprValueFactory exprValueFactory = new OpenSearchExprValueFactory(
-      ImmutableMap.of("name", STRING, "department", STRING));
-
-  @BeforeEach
-  void setup() {
-    when(settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT)).thenReturn(200);
-  }
-
-  @Test
-  void queryEmptyResult() {
-    mockResponse();
-    try (OpenSearchIndexScan indexScan =
-             new OpenSearchIndexScan(client, settings, "test", 3, exprValueFactory)) {
-      indexScan.open();
-      assertFalse(indexScan.hasNext());
-    }
-    verify(client).cleanup(any());
-  }
-
-  @Test
-  void queryAllResultsWithQuery() {
-    mockResponse(new ExprValue[]{
-        employee(1, "John", "IT"),
-        employee(2, "Smith", "HR"),
-        employee(3, "Allen", "IT")});
-
-    try (OpenSearchIndexScan indexScan =
-             new OpenSearchIndexScan(client, settings, "employees", 10, exprValueFactory)) {
-      indexScan.open();
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(1, "John", "IT"), indexScan.next());
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(2, "Smith", "HR"), indexScan.next());
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(3, "Allen", "IT"), indexScan.next());
-
-      assertFalse(indexScan.hasNext());
-    }
-    verify(client).cleanup(any());
-  }
-
-  @Test
-  void queryAllResultsWithScroll() {
-    mockResponse(
-        new ExprValue[]{employee(1, "John", "IT"), employee(2, "Smith", "HR")},
-        new ExprValue[]{employee(3, "Allen", "IT")});
-
-    try (OpenSearchIndexScan indexScan =
-             new OpenSearchIndexScan(client, settings, "employees", 2, exprValueFactory)) {
-      indexScan.open();
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(1, "John", "IT"), indexScan.next());
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(2, "Smith", "HR"), indexScan.next());
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(3, "Allen", "IT"), indexScan.next());
-
-      assertFalse(indexScan.hasNext());
-    }
-    verify(client).cleanup(any());
-  }
-
-  @Test
-  void querySomeResultsWithQuery() {
-    mockResponse(new ExprValue[]{
-        employee(1, "John", "IT"),
-        employee(2, "Smith", "HR"),
-        employee(3, "Allen", "IT"),
-        employee(4, "Bob", "HR")});
-
-    try (OpenSearchIndexScan indexScan =
-             new OpenSearchIndexScan(client, settings, "employees", 10, exprValueFactory)) {
-      indexScan.getRequestBuilder().pushDownLimit(3, 0);
-      indexScan.open();
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(1, "John", "IT"), indexScan.next());
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(2, "Smith", "HR"), indexScan.next());
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(3, "Allen", "IT"), indexScan.next());
-
-      assertFalse(indexScan.hasNext());
-    }
-    verify(client).cleanup(any());
-  }
-
-  @Test
-  void querySomeResultsWithScroll() {
-    mockResponse(
-        new ExprValue[]{employee(1, "John", "IT"), employee(2, "Smith", "HR")},
-        new ExprValue[]{employee(3, "Allen", "IT"), employee(4, "Bob", "HR")});
-
-    try (OpenSearchIndexScan indexScan =
-             new OpenSearchIndexScan(client, settings, "employees", 2, exprValueFactory)) {
-      indexScan.getRequestBuilder().pushDownLimit(3, 0);
-      indexScan.open();
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(1, "John", "IT"), indexScan.next());
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(2, "Smith", "HR"), indexScan.next());
-
-      assertTrue(indexScan.hasNext());
-      assertEquals(employee(3, "Allen", "IT"), indexScan.next());
-
-      assertFalse(indexScan.hasNext());
-    }
-    verify(client).cleanup(any());
-  }
-
-  @Test
-  void pushDownFilters() {
-    assertThat()
-        .pushDown(QueryBuilders.termQuery("name", "John"))
-        .shouldQuery(QueryBuilders.termQuery("name", "John"))
-        .pushDown(QueryBuilders.termQuery("age", 30))
-        .shouldQuery(
-            QueryBuilders.boolQuery()
-                .filter(QueryBuilders.termQuery("name", "John"))
-                .filter(QueryBuilders.termQuery("age", 30)))
-        .pushDown(QueryBuilders.rangeQuery("balance").gte(10000))
-        .shouldQuery(
-            QueryBuilders.boolQuery()
-                .filter(QueryBuilders.termQuery("name", "John"))
-                .filter(QueryBuilders.termQuery("age", 30))
-                .filter(QueryBuilders.rangeQuery("balance").gte(10000)));
-  }
-
-  @Test
-  void pushDownHighlight() {
-    Map<String, Literal> args = new HashMap<>();
-    assertThat()
-        .pushDown(QueryBuilders.termQuery("name", "John"))
-        .pushDownHighlight("Title", args)
-        .pushDownHighlight("Body", args)
-        .shouldQueryHighlight(QueryBuilders.termQuery("name", "John"),
-            new HighlightBuilder().field("Title").field("Body"));
-  }
-
-  @Test
-  void pushDownHighlightWithArguments() {
-    Map<String, Literal> args = new HashMap<>();
-    args.put("pre_tags", new Literal("<mark>", DataType.STRING));
-    args.put("post_tags", new Literal("</mark>", DataType.STRING));
-    HighlightBuilder highlightBuilder = new HighlightBuilder()
-        .field("Title");
-    highlightBuilder.fields().get(0).preTags("<mark>").postTags("</mark>");
-    assertThat()
-        .pushDown(QueryBuilders.termQuery("name", "John"))
-        .pushDownHighlight("Title", args)
-        .shouldQueryHighlight(QueryBuilders.termQuery("name", "John"),
-            highlightBuilder);
-  }
-
-  @Test
-  void pushDownHighlightWithRepeatingFields() {
-    mockResponse(
-        new ExprValue[]{employee(1, "John", "IT"), employee(2, "Smith", "HR")},
-        new ExprValue[]{employee(3, "Allen", "IT"), employee(4, "Bob", "HR")});
-
-    try (OpenSearchIndexScan indexScan =
-             new OpenSearchIndexScan(client, settings, "test", 2, exprValueFactory)) {
-      indexScan.getRequestBuilder().pushDownLimit(3, 0);
-      indexScan.open();
-      Map<String, Literal> args = new HashMap<>();
-      indexScan.getRequestBuilder().pushDownHighlight("name", args);
-      indexScan.getRequestBuilder().pushDownHighlight("name", args);
-    } catch (SemanticCheckException e) {
-      assertTrue(e.getClass().equals(SemanticCheckException.class));
-    }
-    verify(client).cleanup(any());
-  }
-
-  private PushDownAssertion assertThat() {
-    return new PushDownAssertion(client, exprValueFactory, settings);
-  }
-
-  private static class PushDownAssertion {
-    private final OpenSearchClient client;
-    private final OpenSearchIndexScan indexScan;
-    private final OpenSearchResponse response;
-    private final OpenSearchExprValueFactory factory;
-
-    public PushDownAssertion(OpenSearchClient client,
-                             OpenSearchExprValueFactory valueFactory,
-                             Settings settings) {
-      this.client = client;
-      this.indexScan = new OpenSearchIndexScan(client, settings, "test", 10000, valueFactory);
-      this.response = mock(OpenSearchResponse.class);
-      this.factory = valueFactory;
-      when(response.isEmpty()).thenReturn(true);
-    }
-
-    PushDownAssertion pushDown(QueryBuilder query) {
-      indexScan.getRequestBuilder().pushDown(query);
-      return this;
-    }
-
-    PushDownAssertion pushDownHighlight(String query, Map<String, Literal> arguments) {
-      indexScan.getRequestBuilder().pushDownHighlight(query, arguments);
-      return this;
-    }
-
-    PushDownAssertion shouldQueryHighlight(QueryBuilder query, HighlightBuilder highlight) {
-      OpenSearchRequest request = new OpenSearchQueryRequest("test", 200, factory);
-      request.getSourceBuilder()
-          .query(query)
-          .highlighter(highlight)
-          .sort(DOC_FIELD_NAME, ASC);
-      when(client.search(request)).thenReturn(response);
-      indexScan.open();
-      return this;
-    }
-
-    PushDownAssertion shouldQuery(QueryBuilder expected) {
-      OpenSearchRequest request = new OpenSearchQueryRequest("test", 200, factory);
-      request.getSourceBuilder()
-             .query(expected)
-             .sort(DOC_FIELD_NAME, ASC);
-      when(client.search(request)).thenReturn(response);
-      indexScan.open();
-      return this;
-    }
-  }
-
-  private void mockResponse(ExprValue[]... searchHitBatches) {
-    when(client.search(any()))
-        .thenAnswer(
-            new Answer<OpenSearchResponse>() {
-              private int batchNum;
-
-              @Override
-              public OpenSearchResponse answer(InvocationOnMock invocation) {
-                OpenSearchResponse response = mock(OpenSearchResponse.class);
-                int totalBatch = searchHitBatches.length;
-                if (batchNum < totalBatch) {
-                  when(response.isEmpty()).thenReturn(false);
-                  ExprValue[] searchHit = searchHitBatches[batchNum];
-                  when(response.iterator()).thenReturn(Arrays.asList(searchHit).iterator());
-                } else {
-                  when(response.isEmpty()).thenReturn(true);
-                }
-
-                batchNum++;
-                return response;
-              }
-            });
-  }
-
-  protected ExprValue employee(int docId, String name, String department) {
-    SearchHit hit = new SearchHit(docId);
-    hit.sourceRef(
-        new BytesArray("{\"name\":\"" + name + "\",\"department\":\"" + department + "\"}"));
-    return tupleValue(hit);
-  }
-
-  private ExprValue tupleValue(SearchHit hit) {
-    return ExprValueUtils.tupleValue(hit.getSourceAsMap());
-  }
-}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexTest.java
index 74c18f7c3d..3ca566fac6 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -12,27 +11,26 @@
 import static org.hamcrest.Matchers.hasEntry;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opensearch.sql.data.type.ExprCoreType.DOUBLE;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
-import static org.opensearch.sql.expression.DSL.literal;
 import static org.opensearch.sql.expression.DSL.named;
 import static org.opensearch.sql.expression.DSL.ref;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
+import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.MappingType;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.eval;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.project;
-import static org.opensearch.sql.planner.logical.LogicalPlanDSL.relation;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.remove;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.rename;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.sort;
 
 import com.google.common.collect.ImmutableMap;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.BeforeEach;
@@ -40,93 +38,99 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.common.unit.TimeValue;
 import org.opensearch.sql.ast.tree.Sort;
 import org.opensearch.sql.common.setting.Settings;
-import org.opensearch.sql.data.model.ExprBooleanValue;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
-import org.opensearch.sql.expression.aggregation.AvgAggregator;
-import org.opensearch.sql.expression.aggregation.NamedAggregator;
 import org.opensearch.sql.opensearch.client.OpenSearchClient;
 import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
 import org.opensearch.sql.opensearch.mapping.IndexMapping;
+import org.opensearch.sql.opensearch.request.OpenSearchRequest;
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
+import org.opensearch.sql.opensearch.storage.scan.OpenSearchIndexScan;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalPlanDSL;
 import org.opensearch.sql.planner.physical.PhysicalPlanDSL;
-import org.opensearch.sql.storage.Table;
 
 @ExtendWith(MockitoExtension.class)
 class OpenSearchIndexTest {
 
-  private final String indexName = "test";
+  public static final int QUERY_SIZE_LIMIT = 200;
+  public static final TimeValue SCROLL_TIMEOUT = new TimeValue(1);
+  public static final OpenSearchRequest.IndexName INDEX_NAME =
+      new OpenSearchRequest.IndexName("test");
 
-  @Mock
-  private OpenSearchClient client;
+  @Mock private OpenSearchClient client;
 
-  @Mock
-  private OpenSearchExprValueFactory exprValueFactory;
+  @Mock private OpenSearchExprValueFactory exprValueFactory;
 
-  @Mock
-  private Settings settings;
+  @Mock private Settings settings;
 
-  @Mock
-  private Table table;
+  @Mock private IndexMapping mapping;
 
   private OpenSearchIndex index;
 
   @BeforeEach
   void setUp() {
-    this.index = new OpenSearchIndex(client, settings, indexName);
+    this.index = new OpenSearchIndex(client, settings, "test");
   }
 
   @Test
   void isExist() {
-    when(client.exists(indexName)).thenReturn(true);
+    when(client.exists("test")).thenReturn(true);
 
     assertTrue(index.exists());
   }
 
   @Test
   void createIndex() {
-    Map<String, Object> mappings = ImmutableMap.of(
-        "properties",
-        ImmutableMap.of(
-            "name", "text_keyword",
-            "age", "integer"));
-    doNothing().when(client).createIndex(indexName, mappings);
+    Map<String, Object> mappings =
+        Map.of(
+            "properties",
+            Map.of(
+                "name", "text",
+                "age", "integer"));
+    doNothing().when(client).createIndex("test", mappings);
 
     Map<String, ExprType> schema = new HashMap<>();
-    schema.put("name", OPENSEARCH_TEXT_KEYWORD);
+    schema.put(
+        "name",
+        OpenSearchTextType.of(Map.of("keyword", OpenSearchDataType.of(MappingType.Keyword))));
     schema.put("age", INTEGER);
     index.create(schema);
+    verify(client).createIndex(any(), any());
   }
 
   @Test
   void getFieldTypes() {
-    when(client.getIndexMappings("test"))
+    when(mapping.getFieldMappings())
         .thenReturn(
-            ImmutableMap.of(
-                "test",
-                new IndexMapping(
-                    ImmutableMap.<String, String>builder()
-                        .put("name", "keyword")
-                        .put("address", "text")
-                        .put("age", "integer")
-                        .put("account_number", "long")
-                        .put("balance1", "float")
-                        .put("balance2", "double")
-                        .put("gender", "boolean")
-                        .put("family", "nested")
-                        .put("employer", "object")
-                        .put("birthday", "date")
-                        .put("id1", "byte")
-                        .put("id2", "short")
-                        .put("blob", "binary")
-                        .build())));
+            ImmutableMap.<String, MappingType>builder()
+                .put("name", MappingType.Keyword)
+                .put("address", MappingType.Text)
+                .put("age", MappingType.Integer)
+                .put("account_number", MappingType.Long)
+                .put("balance1", MappingType.Float)
+                .put("balance2", MappingType.Double)
+                .put("gender", MappingType.Boolean)
+                .put("family", MappingType.Nested)
+                .put("employer", MappingType.Object)
+                .put("birthday", MappingType.Date)
+                .put("id1", MappingType.Byte)
+                .put("id2", MappingType.Short)
+                .put("blob", MappingType.Binary)
+                .build()
+                .entrySet()
+                .stream()
+                .collect(
+                    Collectors.toMap(Map.Entry::getKey, e -> OpenSearchDataType.of(e.getValue()))));
+    when(client.getIndexMappings("test")).thenReturn(ImmutableMap.of("test", mapping));
 
     // Run more than once to confirm caching logic is covered and can work
     for (int i = 0; i < 2; i++) {
@@ -136,7 +140,7 @@ void getFieldTypes() {
           allOf(
               aMapWithSize(13),
               hasEntry("name", ExprCoreType.STRING),
-              hasEntry("address", (ExprType) OpenSearchDataType.OPENSEARCH_TEXT),
+              hasEntry("address", (ExprType) OpenSearchDataType.of(MappingType.Text)),
               hasEntry("age", ExprCoreType.INTEGER),
               hasEntry("account_number", ExprCoreType.LONG),
               hasEntry("balance1", ExprCoreType.FLOAT),
@@ -144,56 +148,87 @@ void getFieldTypes() {
               hasEntry("gender", ExprCoreType.BOOLEAN),
               hasEntry("family", ExprCoreType.ARRAY),
               hasEntry("employer", ExprCoreType.STRUCT),
-              hasEntry("birthday", ExprCoreType.TIMESTAMP),
+              hasEntry("birthday", (ExprType) OpenSearchDataType.of(MappingType.Date)),
               hasEntry("id1", ExprCoreType.BYTE),
               hasEntry("id2", ExprCoreType.SHORT),
-              hasEntry("blob", (ExprType) OpenSearchDataType.OPENSEARCH_BINARY)
-      ));
+              hasEntry("blob", (ExprType) OpenSearchDataType.of(MappingType.Binary))));
     }
   }
 
+  @Test
+  void checkCacheUsedForFieldMappings() {
+    when(mapping.getFieldMappings())
+        .thenReturn(Map.of("name", OpenSearchDataType.of(MappingType.Keyword)));
+    when(client.getIndexMappings("test")).thenReturn(ImmutableMap.of("test", mapping));
+
+    OpenSearchIndex index = new OpenSearchIndex(client, settings, "test");
+    assertThat(index.getFieldTypes(), allOf(aMapWithSize(1), hasEntry("name", STRING)));
+    assertThat(
+        index.getFieldOpenSearchTypes(),
+        allOf(aMapWithSize(1), hasEntry("name", OpenSearchDataType.of(STRING))));
+
+    lenient()
+        .when(mapping.getFieldMappings())
+        .thenReturn(Map.of("name", OpenSearchDataType.of(MappingType.Integer)));
+
+    assertThat(index.getFieldTypes(), allOf(aMapWithSize(1), hasEntry("name", STRING)));
+    assertThat(
+        index.getFieldOpenSearchTypes(),
+        allOf(aMapWithSize(1), hasEntry("name", OpenSearchDataType.of(STRING))));
+  }
+
+  @Test
+  void getReservedFieldTypes() {
+    Map<String, ExprType> fieldTypes = index.getReservedFieldTypes();
+    assertThat(
+        fieldTypes,
+        allOf(
+            aMapWithSize(6),
+            hasEntry("_id", ExprCoreType.STRING),
+            hasEntry("_index", ExprCoreType.STRING),
+            hasEntry("_routing", ExprCoreType.STRING),
+            hasEntry("_sort", ExprCoreType.LONG),
+            hasEntry("_score", ExprCoreType.FLOAT),
+            hasEntry("_maxscore", ExprCoreType.FLOAT)));
+  }
+
   @Test
   void implementRelationOperatorOnly() {
-    when(settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT)).thenReturn(200);
     when(client.getIndexMaxResultWindows("test")).thenReturn(Map.of("test", 10000));
-
+    when(settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT)).thenReturn(200);
     LogicalPlan plan = index.createScanBuilder();
     Integer maxResultWindow = index.getMaxResultWindow();
+    final var requestBuilder = new OpenSearchRequestBuilder(QUERY_SIZE_LIMIT, exprValueFactory);
     assertEquals(
-        new OpenSearchIndexScan(client, settings, indexName, maxResultWindow, exprValueFactory),
-        index.implement(plan));
+        new OpenSearchIndexScan(
+            client, 200, requestBuilder.build(INDEX_NAME, maxResultWindow, SCROLL_TIMEOUT)),
+        index.implement(index.optimize(plan)));
   }
 
   @Test
   void implementRelationOperatorWithOptimization() {
-    when(settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT)).thenReturn(200);
     when(client.getIndexMaxResultWindows("test")).thenReturn(Map.of("test", 10000));
-
+    when(settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT)).thenReturn(200);
     LogicalPlan plan = index.createScanBuilder();
     Integer maxResultWindow = index.getMaxResultWindow();
+    final var requestBuilder = new OpenSearchRequestBuilder(QUERY_SIZE_LIMIT, exprValueFactory);
     assertEquals(
-        new OpenSearchIndexScan(client, settings, indexName, maxResultWindow, exprValueFactory),
-        index.implement(index.optimize(plan)));
+        new OpenSearchIndexScan(
+            client, 200, requestBuilder.build(INDEX_NAME, maxResultWindow, SCROLL_TIMEOUT)),
+        index.implement(plan));
   }
 
   @Test
   void implementOtherLogicalOperators() {
-    when(settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT)).thenReturn(200);
     when(client.getIndexMaxResultWindows("test")).thenReturn(Map.of("test", 10000));
-
+    when(settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT)).thenReturn(200);
     NamedExpression include = named("age", ref("age", INTEGER));
     ReferenceExpression exclude = ref("name", STRING);
     ReferenceExpression dedupeField = ref("name", STRING);
-    Expression filterExpr = literal(ExprBooleanValue.of(true));
-    List<NamedExpression> groupByExprs = Arrays.asList(named("age", ref("age", INTEGER)));
-    List<NamedAggregator> aggregators =
-        Arrays.asList(named("avg(age)", new AvgAggregator(Arrays.asList(ref("age", INTEGER)),
-            DOUBLE)));
     Map<ReferenceExpression, ReferenceExpression> mappings =
         ImmutableMap.of(ref("name", STRING), ref("lastname", STRING));
     Pair<ReferenceExpression, Expression> newEvalField =
         ImmutablePair.of(ref("name1", STRING), ref("name", STRING));
-    Integer sortCount = 100;
     Pair<Sort.SortOption, Expression> sortField =
         ImmutablePair.of(Sort.SortOption.DEFAULT_ASC, ref("name1", STRING));
 
@@ -202,17 +237,13 @@ void implementOtherLogicalOperators() {
             LogicalPlanDSL.dedupe(
                 sort(
                     eval(
-                        remove(
-                            rename(
-                                index.createScanBuilder(),
-                                mappings),
-                            exclude),
-                        newEvalField),
+                        remove(rename(index.createScanBuilder(), mappings), exclude), newEvalField),
                     sortField),
                 dedupeField),
             include);
 
     Integer maxResultWindow = index.getMaxResultWindow();
+    final var requestBuilder = new OpenSearchRequestBuilder(QUERY_SIZE_LIMIT, exprValueFactory);
     assertEquals(
         PhysicalPlanDSL.project(
             PhysicalPlanDSL.dedupe(
@@ -220,8 +251,11 @@ void implementOtherLogicalOperators() {
                     PhysicalPlanDSL.eval(
                         PhysicalPlanDSL.remove(
                             PhysicalPlanDSL.rename(
-                                new OpenSearchIndexScan(client, settings, indexName,
-                                    maxResultWindow, exprValueFactory),
+                                new OpenSearchIndexScan(
+                                    client,
+                                    QUERY_SIZE_LIMIT,
+                                    requestBuilder.build(
+                                        INDEX_NAME, maxResultWindow, SCROLL_TIMEOUT)),
                                 mappings),
                             exclude),
                         newEvalField),
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngineTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngineTest.java
index ab87f4531c..38f2ae495e 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngineTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchStorageEngineTest.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
@@ -24,26 +24,23 @@
 @ExtendWith(MockitoExtension.class)
 class OpenSearchStorageEngineTest {
 
-  @Mock
-  private OpenSearchClient client;
+  @Mock private OpenSearchClient client;
 
-  @Mock
-  private Settings settings;
+  @Mock private Settings settings;
 
   @Test
   public void getTable() {
     OpenSearchStorageEngine engine = new OpenSearchStorageEngine(client, settings);
-    Table table = engine.getTable(new DataSourceSchemaName(DEFAULT_DATASOURCE_NAME, "default"),
-        "test");
-    assertNotNull(table);
+    Table table =
+        engine.getTable(new DataSourceSchemaName(DEFAULT_DATASOURCE_NAME, "default"), "test");
+    assertAll(() -> assertNotNull(table), () -> assertTrue(table instanceof OpenSearchIndex));
   }
 
   @Test
   public void getSystemTable() {
     OpenSearchStorageEngine engine = new OpenSearchStorageEngine(client, settings);
-    Table table = engine.getTable(new DataSourceSchemaName(DEFAULT_DATASOURCE_NAME, "default"),
-        TABLE_INFO);
-    assertNotNull(table);
-    assertTrue(table instanceof OpenSearchSystemIndex);
+    Table table =
+        engine.getTable(new DataSourceSchemaName(DEFAULT_DATASOURCE_NAME, "default"), TABLE_INFO);
+    assertAll(() -> assertNotNull(table), () -> assertTrue(table instanceof OpenSearchSystemIndex));
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanAggregationBuilderTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanAggregationBuilderTest.java
new file mode 100644
index 0000000000..229d62abdf
--- /dev/null
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanAggregationBuilderTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.storage.scan;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
+import org.opensearch.sql.planner.logical.LogicalAggregation;
+import org.opensearch.sql.planner.logical.LogicalFilter;
+import org.opensearch.sql.planner.logical.LogicalHighlight;
+import org.opensearch.sql.planner.logical.LogicalLimit;
+import org.opensearch.sql.planner.logical.LogicalNested;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
+import org.opensearch.sql.planner.logical.LogicalProject;
+import org.opensearch.sql.planner.logical.LogicalSort;
+
+@ExtendWith(MockitoExtension.class)
+class OpenSearchIndexScanAggregationBuilderTest {
+  @Mock OpenSearchRequestBuilder requestBuilder;
+  @Mock LogicalAggregation logicalAggregation;
+  OpenSearchIndexScanAggregationBuilder builder;
+
+  @BeforeEach
+  void setup() {
+    builder = new OpenSearchIndexScanAggregationBuilder(requestBuilder, logicalAggregation);
+  }
+
+  @Test
+  void pushDownFilter() {
+    assertFalse(builder.pushDownFilter(mock(LogicalFilter.class)));
+  }
+
+  @Test
+  void pushDownSort() {
+    assertTrue(builder.pushDownSort(mock(LogicalSort.class)));
+  }
+
+  @Test
+  void pushDownLimit() {
+    assertFalse(builder.pushDownLimit(mock(LogicalLimit.class)));
+  }
+
+  @Test
+  void pushDownProject() {
+    assertFalse(builder.pushDownProject(mock(LogicalProject.class)));
+  }
+
+  @Test
+  void pushDownHighlight() {
+    assertFalse(builder.pushDownHighlight(mock(LogicalHighlight.class)));
+  }
+
+  @Test
+  void pushDownPageSize() {
+    assertFalse(builder.pushDownPageSize(mock(LogicalPaginate.class)));
+  }
+
+  @Test
+  void pushDownNested() {
+    assertFalse(builder.pushDownNested(mock(LogicalNested.class)));
+  }
+}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanOptimizationTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanOptimizationTest.java
index 363727cbd3..6749f87c5b 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanOptimizationTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanOptimizationTest.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.scan;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -18,10 +18,13 @@
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.LONG;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.expression.DSL.literal;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.aggregation;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.filter;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.highlight;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.limit;
+import static org.opensearch.sql.planner.logical.LogicalPlanDSL.nested;
+import static org.opensearch.sql.planner.logical.LogicalPlanDSL.paginate;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.project;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.relation;
 import static org.opensearch.sql.planner.logical.LogicalPlanDSL.sort;
@@ -29,15 +32,19 @@
 import static org.opensearch.sql.planner.optimizer.rule.read.TableScanPushDown.PUSH_DOWN_FILTER;
 import static org.opensearch.sql.planner.optimizer.rule.read.TableScanPushDown.PUSH_DOWN_HIGHLIGHT;
 import static org.opensearch.sql.planner.optimizer.rule.read.TableScanPushDown.PUSH_DOWN_LIMIT;
+import static org.opensearch.sql.planner.optimizer.rule.read.TableScanPushDown.PUSH_DOWN_NESTED;
 import static org.opensearch.sql.planner.optimizer.rule.read.TableScanPushDown.PUSH_DOWN_PROJECT;
 import static org.opensearch.sql.planner.optimizer.rule.read.TableScanPushDown.PUSH_DOWN_SORT;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import lombok.Builder;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.BeforeEach;
@@ -51,90 +58,184 @@
 import org.opensearch.search.aggregations.AggregationBuilders;
 import org.opensearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.composite.TermsValuesSourceBuilder;
+import org.opensearch.search.sort.NestedSortBuilder;
 import org.opensearch.search.sort.SortBuilder;
 import org.opensearch.search.sort.SortBuilders;
 import org.opensearch.search.sort.SortOrder;
 import org.opensearch.sql.ast.expression.Literal;
 import org.opensearch.sql.ast.tree.Sort.SortOption;
+import org.opensearch.sql.data.model.ExprTupleValue;
+import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.HighlightExpression;
+import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
+import org.opensearch.sql.expression.function.OpenSearchFunctions;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
 import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
 import org.opensearch.sql.opensearch.response.agg.CompositeAggregationParser;
 import org.opensearch.sql.opensearch.response.agg.OpenSearchAggregationResponseParser;
 import org.opensearch.sql.opensearch.response.agg.SingleValueParser;
-import org.opensearch.sql.opensearch.storage.OpenSearchIndexScan;
 import org.opensearch.sql.opensearch.storage.script.aggregation.AggregationQueryBuilder;
+import org.opensearch.sql.planner.logical.LogicalAggregation;
+import org.opensearch.sql.planner.logical.LogicalNested;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.optimizer.LogicalPlanOptimizer;
+import org.opensearch.sql.planner.optimizer.PushDownPageSize;
 import org.opensearch.sql.planner.optimizer.rule.read.CreateTableScanBuilder;
 import org.opensearch.sql.storage.Table;
 
-
 @ExtendWith(MockitoExtension.class)
 class OpenSearchIndexScanOptimizationTest {
 
-  @Mock
-  private Table table;
+  @Mock private Table table;
 
-  @Mock
-  private OpenSearchIndexScan indexScan;
+  @Mock private OpenSearchIndexScan indexScan;
 
   private OpenSearchIndexScanBuilder indexScanBuilder;
 
-  @Mock
-  private OpenSearchRequestBuilder requestBuilder;
+  @Mock private OpenSearchRequestBuilder requestBuilder;
 
   private Runnable[] verifyPushDownCalls = {};
 
   @BeforeEach
   void setUp() {
-    indexScanBuilder = new OpenSearchIndexScanBuilder(indexScan);
+    indexScanBuilder = new OpenSearchIndexScanBuilder(requestBuilder, requestBuilder -> indexScan);
     when(table.createScanBuilder()).thenReturn(indexScanBuilder);
-    when(indexScan.getRequestBuilder()).thenReturn(requestBuilder);
   }
 
   @Test
   void test_project_push_down() {
     assertEqualsAfterOptimization(
         project(
-            indexScanAggBuilder(
-                withProjectPushedDown(DSL.ref("intV", INTEGER))),
-            DSL.named("i", DSL.ref("intV", INTEGER))
-        ),
-        project(
-            relation("schema", table),
-            DSL.named("i", DSL.ref("intV", INTEGER)))
-    );
+            indexScanBuilder(withProjectPushedDown(DSL.ref("intV", INTEGER))),
+            DSL.named("i", DSL.ref("intV", INTEGER))),
+        project(relation("schema", table), DSL.named("i", DSL.ref("intV", INTEGER))));
   }
 
-  /**
-   * SELECT intV as i FROM schema WHERE intV = 1.
-   */
+  /** SELECT intV as i FROM schema WHERE intV = 1. */
   @Test
   void test_filter_push_down() {
     assertEqualsAfterOptimization(
         project(
             indexScanBuilder(
-                //withProjectPushedDown(DSL.ref("intV", INTEGER)),
-                withFilterPushedDown(QueryBuilders.termQuery("intV", 1))
-            ),
-            DSL.named("i", DSL.ref("intV", INTEGER))
-        ),
+                // withProjectPushedDown(DSL.ref("intV", INTEGER)),
+                withFilterPushedDown(QueryBuilders.termQuery("intV", 1))),
+            DSL.named("i", DSL.ref("intV", INTEGER))),
         project(
             filter(
                 relation("schema", table),
-                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))
-            ),
-            DSL.named("i", DSL.ref("intV", INTEGER))
-        )
-    );
+                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))),
+            DSL.named("i", DSL.ref("intV", INTEGER))));
   }
 
-  /**
-   * SELECT avg(intV) FROM schema GROUP BY string_value.
-   */
+  /** SELECT intV as i FROM schema WHERE query_string(["intV^1.5", "QUERY", boost=12.5). */
+  @Test
+  void test_filter_on_opensearchfunction_with_trackedscores_push_down() {
+    LogicalPlan expectedPlan =
+        project(
+            indexScanBuilder(
+                withFilterPushedDown(
+                    QueryBuilders.queryStringQuery("QUERY").field("intV", 1.5F).boost(12.5F)),
+                withTrackedScoresPushedDown(true)),
+            DSL.named("i", DSL.ref("intV", INTEGER)));
+    FunctionExpression queryString =
+        DSL.query_string(
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("intV", ExprValueUtils.floatValue(1.5F)))))),
+            DSL.namedArgument("query", "QUERY"),
+            DSL.namedArgument("boost", "12.5"));
+
+    ((OpenSearchFunctions.OpenSearchFunction) queryString).setScoreTracked(true);
+
+    LogicalPlan logicalPlan =
+        project(
+            filter(relation("schema", table), queryString),
+            DSL.named("i", DSL.ref("intV", INTEGER)));
+    assertEqualsAfterOptimization(expectedPlan, logicalPlan);
+  }
+
+  @Test
+  void test_filter_on_multiple_opensearchfunctions_with_trackedscores_push_down() {
+    LogicalPlan expectedPlan =
+        project(
+            indexScanBuilder(
+                withFilterPushedDown(
+                    QueryBuilders.boolQuery()
+                        .should(
+                            QueryBuilders.queryStringQuery("QUERY")
+                                .field("intV", 1.5F)
+                                .boost(12.5F))
+                        .should(
+                            QueryBuilders.queryStringQuery("QUERY")
+                                .field("intV", 1.5F)
+                                .boost(12.5F))),
+                withTrackedScoresPushedDown(true)),
+            DSL.named("i", DSL.ref("intV", INTEGER)));
+    FunctionExpression firstQueryString =
+        DSL.query_string(
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("intV", ExprValueUtils.floatValue(1.5F)))))),
+            DSL.namedArgument("query", "QUERY"),
+            DSL.namedArgument("boost", "12.5"));
+    ((OpenSearchFunctions.OpenSearchFunction) firstQueryString).setScoreTracked(false);
+    FunctionExpression secondQueryString =
+        DSL.query_string(
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("intV", ExprValueUtils.floatValue(1.5F)))))),
+            DSL.namedArgument("query", "QUERY"),
+            DSL.namedArgument("boost", "12.5"));
+    ((OpenSearchFunctions.OpenSearchFunction) secondQueryString).setScoreTracked(true);
+
+    LogicalPlan logicalPlan =
+        project(
+            filter(relation("schema", table), DSL.or(firstQueryString, secondQueryString)),
+            DSL.named("i", DSL.ref("intV", INTEGER)));
+    assertEqualsAfterOptimization(expectedPlan, logicalPlan);
+  }
+
+  @Test
+  void test_filter_on_opensearchfunction_without_trackedscores_push_down() {
+    LogicalPlan expectedPlan =
+        project(
+            indexScanBuilder(
+                withFilterPushedDown(
+                    QueryBuilders.queryStringQuery("QUERY").field("intV", 1.5F).boost(12.5F)),
+                withTrackedScoresPushedDown(false)),
+            DSL.named("i", DSL.ref("intV", INTEGER)));
+    FunctionExpression queryString =
+        DSL.query_string(
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("intV", ExprValueUtils.floatValue(1.5F)))))),
+            DSL.namedArgument("query", "QUERY"),
+            DSL.namedArgument("boost", "12.5"));
+
+    LogicalPlan logicalPlan =
+        project(
+            filter(relation("schema", table), queryString),
+            DSL.named("i", DSL.ref("intV", INTEGER)));
+    assertEqualsAfterOptimization(expectedPlan, logicalPlan);
+  }
+
+  /** SELECT avg(intV) FROM schema GROUP BY string_value. */
   @Test
   void test_aggregation_push_down() {
     assertEqualsAfterOptimization(
@@ -144,20 +245,17 @@ void test_aggregation_push_down() {
                     aggregate("AVG(intV)")
                         .aggregateBy("intV")
                         .groupBy("longV")
-                        .resultTypes(Map.of(
-                            "AVG(intV)", DOUBLE,
-                            "longV", LONG)))),
+                        .resultTypes(
+                            Map.of(
+                                "AVG(intV)", DOUBLE,
+                                "longV", LONG)))),
             DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))),
         project(
             aggregation(
                 relation("schema", table),
-                ImmutableList
-                    .of(DSL.named("AVG(intV)",
-                        DSL.avg(DSL.ref("intV", INTEGER)))),
+                ImmutableList.of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
                 ImmutableList.of(DSL.named("longV", DSL.ref("longV", LONG)))),
-            DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))
-        )
-    );
+            DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))));
   }
 
   /*
@@ -191,62 +289,79 @@ void aggregation_cant_merge_indexScan_with_project() {
   }
   */
 
-  /**
-   * Sort - Relation --> IndexScan.
-   */
+  /** Sort - Relation --> IndexScan. */
   @Test
   void test_sort_push_down() {
     assertEqualsAfterOptimization(
         indexScanBuilder(
             withSortPushedDown(
-                SortBuilders.fieldSort("intV").order(SortOrder.ASC).missing("_first"))
-        ),
+                SortBuilders.fieldSort("intV").order(SortOrder.ASC).missing("_first"))),
+        sort(relation("schema", table), Pair.of(SortOption.DEFAULT_ASC, DSL.ref("intV", INTEGER))));
+  }
+
+  @Test
+  void test_page_push_down() {
+    assertEqualsAfterOptimization(
+        project(
+            indexScanBuilder(withPageSizePushDown(5)), DSL.named("intV", DSL.ref("intV", INTEGER))),
+        paginate(
+            project(relation("schema", table), DSL.named("intV", DSL.ref("intV", INTEGER))), 5));
+  }
+
+  @Test
+  void test_score_sort_push_down() {
+    assertEqualsAfterOptimization(
+        indexScanBuilder(withSortPushedDown(SortBuilders.scoreSort().order(SortOrder.ASC))),
         sort(
             relation("schema", table),
-            Pair.of(SortOption.DEFAULT_ASC, DSL.ref("intV", INTEGER))
-        )
-    );
+            Pair.of(SortOption.DEFAULT_ASC, DSL.ref("_score", INTEGER))));
   }
 
   @Test
   void test_limit_push_down() {
     assertEqualsAfterOptimization(
         project(
-            indexScanBuilder(
-                withLimitPushedDown(1, 1)),
-            DSL.named("intV", DSL.ref("intV", INTEGER))
-        ),
+            indexScanBuilder(withLimitPushedDown(1, 1)),
+            DSL.named("intV", DSL.ref("intV", INTEGER))),
         project(
-            limit(
-                relation("schema", table),
-                1, 1),
-            DSL.named("intV", DSL.ref("intV", INTEGER))
-        )
-    );
+            limit(relation("schema", table), 1, 1), DSL.named("intV", DSL.ref("intV", INTEGER))));
   }
 
   @Test
   void test_highlight_push_down() {
     assertEqualsAfterOptimization(
         project(
-            indexScanBuilder(
-                withHighlightPushedDown("*", Collections.emptyMap())),
-            DSL.named("highlight(*)",
-                new HighlightExpression(DSL.literal("*")))
-        ),
+            indexScanBuilder(withHighlightPushedDown("*", Collections.emptyMap())),
+            DSL.named("highlight(*)", new HighlightExpression(DSL.literal("*")))),
         project(
-            highlight(
-                relation("schema", table),
-                DSL.literal("*"), Collections.emptyMap()),
-                DSL.named("highlight(*)",
-                    new HighlightExpression(DSL.literal("*")))
-        )
-    );
+            highlight(relation("schema", table), DSL.literal("*"), Collections.emptyMap()),
+            DSL.named("highlight(*)", new HighlightExpression(DSL.literal("*")))));
   }
 
-  /**
-   * SELECT avg(intV) FROM schema WHERE intV = 1 GROUP BY string_value.
-   */
+  @Test
+  void test_nested_push_down() {
+    List<Map<String, ReferenceExpression>> args =
+        List.of(
+            Map.of(
+                "field", new ReferenceExpression("message.info", STRING),
+                "path", new ReferenceExpression("message", STRING)));
+
+    List<NamedExpression> projectList =
+        List.of(
+            new NamedExpression("message.info", DSL.nested(DSL.ref("message.info", STRING)), null));
+
+    LogicalNested nested = new LogicalNested(null, args, projectList);
+
+    assertEqualsAfterOptimization(
+        project(
+            nested(indexScanBuilder(withNestedPushedDown(nested.getFields())), args, projectList),
+            DSL.named("message.info", DSL.nested(DSL.ref("message.info", STRING)))),
+        project(
+            nested(relation("schema", table), args, projectList),
+            DSL.named("message.info", DSL.nested(DSL.ref("message.info", STRING)))));
+  }
+
+  /** SELECT avg(intV) FROM schema WHERE intV = 1 GROUP BY string_value. */
   @Test
   void test_aggregation_filter_push_down() {
     assertEqualsAfterOptimization(
@@ -257,50 +372,37 @@ void test_aggregation_filter_push_down() {
                     aggregate("AVG(intV)")
                         .aggregateBy("intV")
                         .groupBy("longV")
-                        .resultTypes(Map.of(
-                            "AVG(intV)", DOUBLE,
-                            "longV", LONG)))),
-            DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))
-        ),
+                        .resultTypes(
+                            Map.of(
+                                "AVG(intV)", DOUBLE,
+                                "longV", LONG)))),
+            DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))),
         project(
             aggregation(
                 filter(
                     relation("schema", table),
-                    DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))
-                ),
-                ImmutableList
-                    .of(DSL.named("AVG(intV)",
-                        DSL.avg(DSL.ref("intV", INTEGER)))),
+                    DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))),
+                ImmutableList.of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
                 ImmutableList.of(DSL.named("longV", DSL.ref("longV", LONG)))),
-            DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))
-        )
-    );
+            DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))));
   }
 
-  /**
-   * Sort - Filter - Relation --> IndexScan.
-   */
+  /** Sort - Filter - Relation --> IndexScan. */
   @Test
   void test_sort_filter_push_down() {
     assertEqualsAfterOptimization(
         indexScanBuilder(
             withFilterPushedDown(QueryBuilders.termQuery("intV", 1)),
             withSortPushedDown(
-                SortBuilders.fieldSort("longV").order(SortOrder.ASC).missing("_first"))
-        ),
+                SortBuilders.fieldSort("longV").order(SortOrder.ASC).missing("_first"))),
         sort(
             filter(
                 relation("schema", table),
-                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))
-            ),
-            Pair.of(SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))
-        )
-    );
+                DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))),
+            Pair.of(SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))));
   }
 
-  /**
-   * SELECT avg(intV) FROM schema GROUP BY stringV ORDER BY stringV.
-   */
+  /** SELECT avg(intV) FROM schema GROUP BY stringV ORDER BY stringV. */
   @Test
   void test_sort_aggregation_push_down() {
     assertEqualsAfterOptimization(
@@ -311,22 +413,19 @@ void test_sort_aggregation_push_down() {
                         .aggregateBy("intV")
                         .groupBy("stringV")
                         .sortBy(SortOption.DEFAULT_DESC)
-                        .resultTypes(Map.of(
-                            "AVG(intV)", DOUBLE,
-                            "stringV", STRING)))),
+                        .resultTypes(
+                            Map.of(
+                                "AVG(intV)", DOUBLE,
+                                "stringV", STRING)))),
             DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))),
         project(
             sort(
                 aggregation(
                     relation("schema", table),
-                    ImmutableList
-                        .of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
+                    ImmutableList.of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
                     ImmutableList.of(DSL.named("stringV", DSL.ref("stringV", STRING)))),
-                Pair.of(SortOption.DEFAULT_DESC, DSL.ref("stringV", STRING))
-            ),
-            DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))
-        )
-    );
+                Pair.of(SortOption.DEFAULT_DESC, DSL.ref("stringV", STRING))),
+            DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))));
   }
 
   @Test
@@ -338,21 +437,17 @@ void test_limit_sort_filter_push_down() {
                 withSortPushedDown(
                     SortBuilders.fieldSort("longV").order(SortOrder.ASC).missing("_first")),
                 withLimitPushedDown(1, 1)),
-            DSL.named("intV", DSL.ref("intV", INTEGER))
-        ),
+            DSL.named("intV", DSL.ref("intV", INTEGER))),
         project(
             limit(
                 sort(
                     filter(
                         relation("schema", table),
-                        DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))
-                    ),
-                    Pair.of(SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))
-                ), 1, 1
-            ),
-            DSL.named("intV", DSL.ref("intV", INTEGER))
-        )
-    );
+                        DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))),
+                    Pair.of(SortOption.DEFAULT_ASC, DSL.ref("longV", LONG))),
+                1,
+                1),
+            DSL.named("intV", DSL.ref("intV", INTEGER))));
   }
 
   /*
@@ -366,37 +461,69 @@ void only_one_project_should_be_push() {
         project(
             project(
                 indexScanBuilder(
-                    withProjectPushedDown(
-                        DSL.ref("intV", INTEGER),
-                        DSL.ref("stringV", STRING))),
+                    withProjectPushedDown(DSL.ref("intV", INTEGER), DSL.ref("stringV", STRING))),
                 DSL.named("i", DSL.ref("intV", INTEGER)),
-                DSL.named("s", DSL.ref("stringV", STRING))
-            ),
-            DSL.named("i", DSL.ref("intV", INTEGER))
-        ),
+                DSL.named("s", DSL.ref("stringV", STRING))),
+            DSL.named("i", DSL.ref("intV", INTEGER))),
         project(
             project(
                 relation("schema", table),
                 DSL.named("i", DSL.ref("intV", INTEGER)),
-                DSL.named("s", DSL.ref("stringV", STRING))
-            ),
-            DSL.named("i", DSL.ref("intV", INTEGER))
-        )
-    );
+                DSL.named("s", DSL.ref("stringV", STRING))),
+            DSL.named("i", DSL.ref("intV", INTEGER))));
   }
 
   @Test
-  void sort_with_expression_cannot_merge_with_relation() {
+  void test_nested_sort_filter_push_down() {
+    assertEqualsAfterOptimization(
+        project(
+            indexScanBuilder(
+                withFilterPushedDown(QueryBuilders.termQuery("intV", 1)),
+                withSortPushedDown(
+                    SortBuilders.fieldSort("message.info")
+                        .order(SortOrder.ASC)
+                        .setNestedSort(new NestedSortBuilder("message")))),
+            DSL.named("intV", DSL.ref("intV", INTEGER))),
+        project(
+            sort(
+                filter(
+                    relation("schema", table),
+                    DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(integerValue(1)))),
+                Pair.of(SortOption.DEFAULT_ASC, DSL.nested(DSL.ref("message.info", STRING)))),
+            DSL.named("intV", DSL.ref("intV", INTEGER))));
+  }
+
+  @Test
+  void test_function_expression_sort_returns_optimized_logical_sort() {
+    // Invalid use case coverage OpenSearchIndexScanBuilder::sortByFieldsOnly returns false
     assertEqualsAfterOptimization(
         sort(
             indexScanBuilder(),
-            Pair.of(SortOption.DEFAULT_ASC, DSL.abs(DSL.ref("intV", INTEGER)))
-        ),
+            Pair.of(
+                SortOption.DEFAULT_ASC, DSL.match(DSL.namedArgument("field", literal("message"))))),
         sort(
             relation("schema", table),
-            Pair.of(SortOption.DEFAULT_ASC, DSL.abs(DSL.ref("intV", INTEGER)))
-        )
-    );
+            Pair.of(
+                SortOption.DEFAULT_ASC,
+                DSL.match(DSL.namedArgument("field", literal("message"))))));
+  }
+
+  @Test
+  void test_non_field_sort_returns_optimized_logical_sort() {
+    // Invalid use case coverage OpenSearchIndexScanBuilder::sortByFieldsOnly returns false
+    assertEqualsAfterOptimization(
+        sort(indexScanBuilder(), Pair.of(SortOption.DEFAULT_ASC, DSL.literal("field"))),
+        sort(relation("schema", table), Pair.of(SortOption.DEFAULT_ASC, DSL.literal("field"))));
+  }
+
+  @Test
+  void sort_with_expression_cannot_merge_with_relation() {
+    assertEqualsAfterOptimization(
+        sort(
+            indexScanBuilder(), Pair.of(SortOption.DEFAULT_ASC, DSL.abs(DSL.ref("intV", INTEGER)))),
+        sort(
+            relation("schema", table),
+            Pair.of(SortOption.DEFAULT_ASC, DSL.abs(DSL.ref("intV", INTEGER)))));
   }
 
   @Test
@@ -408,20 +535,17 @@ void sort_with_expression_cannot_merge_with_aggregation() {
                     aggregate("AVG(intV)")
                         .aggregateBy("intV")
                         .groupBy("stringV")
-                        .resultTypes(Map.of(
-                            "AVG(intV)", DOUBLE,
-                            "stringV", STRING)))),
-            Pair.of(SortOption.DEFAULT_ASC, DSL.abs(DSL.ref("intV", INTEGER)))
-        ),
+                        .resultTypes(
+                            Map.of(
+                                "AVG(intV)", DOUBLE,
+                                "stringV", STRING)))),
+            Pair.of(SortOption.DEFAULT_ASC, DSL.abs(DSL.ref("intV", INTEGER)))),
         sort(
             aggregation(
                 relation("schema", table),
-                ImmutableList
-                    .of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
+                ImmutableList.of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
                 ImmutableList.of(DSL.named("stringV", DSL.ref("stringV", STRING)))),
-            Pair.of(SortOption.DEFAULT_ASC, DSL.abs(DSL.ref("intV", INTEGER)))
-        )
-    );
+            Pair.of(SortOption.DEFAULT_ASC, DSL.abs(DSL.ref("intV", INTEGER)))));
   }
 
   @Test
@@ -429,30 +553,21 @@ void aggregation_cant_merge_index_scan_with_limit() {
     assertEqualsAfterOptimization(
         project(
             aggregation(
-                indexScanBuilder(
-                    withLimitPushedDown(10, 0)),
-                ImmutableList
-                    .of(DSL.named("AVG(intV)",
-                        DSL.avg(DSL.ref("intV", INTEGER)))),
-                ImmutableList.of(DSL.named("longV",
-                    DSL.abs(DSL.ref("longV", LONG))))),
+                indexScanBuilder(withLimitPushedDown(10, 0)),
+                ImmutableList.of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
+                ImmutableList.of(DSL.named("longV", DSL.abs(DSL.ref("longV", LONG))))),
             DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))),
         project(
             aggregation(
-                limit(
-                    relation("schema", table),
-                    10, 0),
-                ImmutableList
-                    .of(DSL.named("AVG(intV)",
-                        DSL.avg(DSL.ref("intV", INTEGER)))),
-                ImmutableList.of(DSL.named("longV",
-                    DSL.abs(DSL.ref("longV", LONG))))),
+                limit(relation("schema", table), 10, 0),
+                ImmutableList.of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
+                ImmutableList.of(DSL.named("longV", DSL.abs(DSL.ref("longV", LONG))))),
             DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))));
   }
 
   /**
-   * Can't Optimize the following query.
-   * SELECT avg(intV) FROM schema GROUP BY stringV ORDER BY avg(intV).
+   * Can't Optimize the following query. SELECT avg(intV) FROM schema GROUP BY stringV ORDER BY
+   * avg(intV).
    */
   @Test
   void sort_refer_to_aggregator_should_not_merge_with_indexAgg() {
@@ -464,54 +579,45 @@ void sort_refer_to_aggregator_should_not_merge_with_indexAgg() {
                         aggregate("AVG(intV)")
                             .aggregateBy("intV")
                             .groupBy("stringV")
-                            .resultTypes(Map.of(
-                                "AVG(intV)", DOUBLE,
-                                "stringV", STRING)))),
-                Pair.of(SortOption.DEFAULT_ASC, DSL.ref("AVG(intV)", INTEGER))
-            ),
+                            .resultTypes(
+                                Map.of(
+                                    "AVG(intV)", DOUBLE,
+                                    "stringV", STRING)))),
+                Pair.of(SortOption.DEFAULT_ASC, DSL.ref("AVG(intV)", INTEGER))),
             DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))),
         project(
             sort(
                 aggregation(
                     relation("schema", table),
-                    ImmutableList
-                        .of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
+                    ImmutableList.of(DSL.named("AVG(intV)", DSL.avg(DSL.ref("intV", INTEGER)))),
                     ImmutableList.of(DSL.named("stringV", DSL.ref("stringV", STRING)))),
-                Pair.of(SortOption.DEFAULT_ASC, DSL.ref("AVG(intV)", INTEGER))
-            ),
-            DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))
-        )
-    );
+                Pair.of(SortOption.DEFAULT_ASC, DSL.ref("AVG(intV)", INTEGER))),
+            DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))));
   }
 
   @Test
   void project_literal_should_not_be_pushed_down() {
     assertEqualsAfterOptimization(
-        project(
-            indexScanBuilder(),
-            DSL.named("i", DSL.literal("str"))
-        ),
-        optimize(
-            project(
-                relation("schema", table),
-                DSL.named("i", DSL.literal("str"))
-            )
-        )
-    );
+        project(indexScanBuilder(), DSL.named("i", DSL.literal("str"))),
+        optimize(project(relation("schema", table), DSL.named("i", DSL.literal("str")))));
   }
 
   private OpenSearchIndexScanBuilder indexScanBuilder(Runnable... verifyPushDownCalls) {
     this.verifyPushDownCalls = verifyPushDownCalls;
-    return new OpenSearchIndexScanBuilder(new OpenSearchIndexScanQueryBuilder(indexScan));
+    return new OpenSearchIndexScanBuilder(
+        new OpenSearchIndexScanQueryBuilder(requestBuilder), requestBuilder -> indexScan);
   }
 
   private OpenSearchIndexScanBuilder indexScanAggBuilder(Runnable... verifyPushDownCalls) {
     this.verifyPushDownCalls = verifyPushDownCalls;
-    return new OpenSearchIndexScanBuilder(new OpenSearchIndexScanAggregationBuilder(indexScan));
+    var aggregationBuilder =
+        new OpenSearchIndexScanAggregationBuilder(requestBuilder, mock(LogicalAggregation.class));
+    return new OpenSearchIndexScanBuilder(aggregationBuilder, builder -> indexScan);
   }
 
   private void assertEqualsAfterOptimization(LogicalPlan expected, LogicalPlan actual) {
-    assertEquals(expected, optimize(actual));
+    final var optimized = optimize(actual);
+    assertEquals(expected, optimized);
 
     // Trigger build to make sure all push down actually happened in scan builder
     indexScanBuilder.build();
@@ -525,34 +631,39 @@ private void assertEqualsAfterOptimization(LogicalPlan expected, LogicalPlan act
   }
 
   private Runnable withFilterPushedDown(QueryBuilder filteringCondition) {
-    return () -> verify(requestBuilder, times(1)).pushDown(filteringCondition);
+    return () -> verify(requestBuilder, times(1)).pushDownFilter(filteringCondition);
   }
 
   private Runnable withAggregationPushedDown(
       AggregationAssertHelper.AggregationAssertHelperBuilder aggregation) {
 
     // Assume single term bucket and AVG metric in all tests in this suite
-    CompositeAggregationBuilder aggBuilder = AggregationBuilders.composite(
-        "composite_buckets",
-        Collections.singletonList(
-            new TermsValuesSourceBuilder(aggregation.groupBy)
-                .field(aggregation.groupBy)
-                .order(aggregation.sortBy.getSortOrder() == ASC ? "asc" : "desc")
-                .missingOrder(aggregation.sortBy.getNullOrder() == NULL_FIRST ? "first" : "last")
-                .missingBucket(true)))
-        .subAggregation(
-            AggregationBuilders.avg(aggregation.aggregateName)
-                .field(aggregation.aggregateBy))
-        .size(AggregationQueryBuilder.AGGREGATION_BUCKET_SIZE);
+    CompositeAggregationBuilder aggBuilder =
+        AggregationBuilders.composite(
+                "composite_buckets",
+                Collections.singletonList(
+                    new TermsValuesSourceBuilder(aggregation.groupBy)
+                        .field(aggregation.groupBy)
+                        .order(aggregation.sortBy.getSortOrder() == ASC ? "asc" : "desc")
+                        .missingOrder(
+                            aggregation.sortBy.getNullOrder() == NULL_FIRST ? "first" : "last")
+                        .missingBucket(true)))
+            .subAggregation(
+                AggregationBuilders.avg(aggregation.aggregateName).field(aggregation.aggregateBy))
+            .size(AggregationQueryBuilder.AGGREGATION_BUCKET_SIZE);
 
     List<AggregationBuilder> aggBuilders = Collections.singletonList(aggBuilder);
     OpenSearchAggregationResponseParser responseParser =
-        new CompositeAggregationParser(
-            new SingleValueParser(aggregation.aggregateName));
+        new CompositeAggregationParser(new SingleValueParser(aggregation.aggregateName));
 
     return () -> {
       verify(requestBuilder, times(1)).pushDownAggregation(Pair.of(aggBuilders, responseParser));
-      verify(requestBuilder, times(1)).pushTypeMapping(aggregation.resultTypes);
+      verify(requestBuilder, times(1))
+          .pushTypeMapping(
+              aggregation.resultTypes.entrySet().stream()
+                  .collect(
+                      Collectors.toMap(
+                          Map.Entry::getKey, e -> OpenSearchDataType.of(e.getValue()))));
     };
   }
 
@@ -565,14 +676,26 @@ private Runnable withLimitPushedDown(int size, int offset) {
   }
 
   private Runnable withProjectPushedDown(ReferenceExpression... references) {
-    return () -> verify(requestBuilder, times(1)).pushDownProjects(
-        new HashSet<>(Arrays.asList(references)));
+    return () ->
+        verify(requestBuilder, times(1)).pushDownProjects(new HashSet<>(Arrays.asList(references)));
   }
 
   private Runnable withHighlightPushedDown(String field, Map<String, Literal> arguments) {
     return () -> verify(requestBuilder, times(1)).pushDownHighlight(field, arguments);
   }
 
+  private Runnable withNestedPushedDown(List<Map<String, ReferenceExpression>> fields) {
+    return () -> verify(requestBuilder, times(1)).pushDownNested(fields);
+  }
+
+  private Runnable withTrackedScoresPushedDown(boolean trackScores) {
+    return () -> verify(requestBuilder, times(1)).pushDownTrackedScore(trackScores);
+  }
+
+  private Runnable withPageSizePushDown(int pageSize) {
+    return () -> verify(requestBuilder, times(1)).pushDownPageSize(pageSize);
+  }
+
   private static AggregationAssertHelper.AggregationAssertHelperBuilder aggregate(String aggName) {
     var aggBuilder = new AggregationAssertHelper.AggregationAssertHelperBuilder();
     aggBuilder.aggregateName = aggName;
@@ -596,14 +719,18 @@ private static class AggregationAssertHelper {
   }
 
   private LogicalPlan optimize(LogicalPlan plan) {
-    LogicalPlanOptimizer optimizer = new LogicalPlanOptimizer(List.of(
-        new CreateTableScanBuilder(),
-        PUSH_DOWN_FILTER,
-        PUSH_DOWN_AGGREGATION,
-        PUSH_DOWN_SORT,
-        PUSH_DOWN_LIMIT,
-        PUSH_DOWN_HIGHLIGHT,
-        PUSH_DOWN_PROJECT));
+    LogicalPlanOptimizer optimizer =
+        new LogicalPlanOptimizer(
+            List.of(
+                new CreateTableScanBuilder(),
+                new PushDownPageSize(),
+                PUSH_DOWN_FILTER,
+                PUSH_DOWN_AGGREGATION,
+                PUSH_DOWN_SORT,
+                PUSH_DOWN_LIMIT,
+                PUSH_DOWN_HIGHLIGHT,
+                PUSH_DOWN_NESTED,
+                PUSH_DOWN_PROJECT));
     return optimizer.optimize(plan);
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanPaginationTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanPaginationTest.java
new file mode 100644
index 0000000000..2085519b12
--- /dev/null
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanPaginationTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.storage.scan;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.CALLS_REAL_METHODS;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.opensearch.storage.scan.OpenSearchIndexScanTest.QUERY_SIZE;
+import static org.opensearch.sql.opensearch.storage.scan.OpenSearchIndexScanTest.mockResponse;
+
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+import java.util.Map;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.exception.NoCursorException;
+import org.opensearch.sql.opensearch.client.OpenSearchClient;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
+import org.opensearch.sql.opensearch.request.OpenSearchRequest;
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
+import org.opensearch.sql.opensearch.response.OpenSearchResponse;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+public class OpenSearchIndexScanPaginationTest {
+
+  public static final OpenSearchRequest.IndexName INDEX_NAME =
+      new OpenSearchRequest.IndexName("test");
+  public static final int MAX_RESULT_WINDOW = 3;
+  public static final TimeValue SCROLL_TIMEOUT = TimeValue.timeValueMinutes(4);
+  @Mock private Settings settings;
+
+  @BeforeEach
+  void setup() {
+    lenient().when(settings.getSettingValue(Settings.Key.QUERY_SIZE_LIMIT)).thenReturn(QUERY_SIZE);
+    lenient()
+        .when(settings.getSettingValue(Settings.Key.SQL_CURSOR_KEEP_ALIVE))
+        .thenReturn(TimeValue.timeValueMinutes(1));
+  }
+
+  @Mock private OpenSearchClient client;
+
+  private final OpenSearchExprValueFactory exprValueFactory =
+      new OpenSearchExprValueFactory(
+          Map.of(
+              "name", OpenSearchDataType.of(STRING),
+              "department", OpenSearchDataType.of(STRING)));
+
+  @Test
+  void query_empty_result() {
+    mockResponse(client);
+    var builder = new OpenSearchRequestBuilder(QUERY_SIZE, exprValueFactory);
+    try (var indexScan =
+        new OpenSearchIndexScan(
+            client,
+            MAX_RESULT_WINDOW,
+            builder.build(INDEX_NAME, MAX_RESULT_WINDOW, SCROLL_TIMEOUT))) {
+      indexScan.open();
+      assertFalse(indexScan.hasNext());
+    }
+    verify(client).cleanup(any());
+  }
+
+  @Test
+  void explain_not_implemented() {
+    assertThrows(
+        Throwable.class,
+        () ->
+            mock(OpenSearchIndexScan.class, withSettings().defaultAnswer(CALLS_REAL_METHODS))
+                .explain());
+  }
+
+  @Test
+  @SneakyThrows
+  void dont_serialize_if_no_cursor() {
+    OpenSearchRequestBuilder builder = mock();
+    OpenSearchRequest request = mock();
+    OpenSearchResponse response = mock();
+    when(builder.build(any(), anyInt(), any())).thenReturn(request);
+    when(client.search(any())).thenReturn(response);
+    try (var indexScan =
+        new OpenSearchIndexScan(
+            client,
+            MAX_RESULT_WINDOW,
+            builder.build(INDEX_NAME, MAX_RESULT_WINDOW, SCROLL_TIMEOUT))) {
+      indexScan.open();
+
+      when(request.hasAnotherBatch()).thenReturn(false);
+      ByteArrayOutputStream output = new ByteArrayOutputStream();
+      ObjectOutputStream objectOutput = new ObjectOutputStream(output);
+      assertThrows(NoCursorException.class, () -> objectOutput.writeObject(indexScan));
+    }
+  }
+}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanTest.java
new file mode 100644
index 0000000000..f813d8f551
--- /dev/null
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanTest.java
@@ -0,0 +1,472 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.opensearch.storage.scan;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.opensearch.search.sort.FieldSortBuilder.DOC_FIELD_NAME;
+import static org.opensearch.search.sort.SortOrder.ASC;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.Mock;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.stubbing.Answer;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.bytes.BytesArray;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.opensearch.sql.ast.expression.DataType;
+import org.opensearch.sql.ast.expression.Literal;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.model.ExprValueUtils;
+import org.opensearch.sql.exception.NoCursorException;
+import org.opensearch.sql.executor.pagination.PlanSerializer;
+import org.opensearch.sql.opensearch.client.OpenSearchClient;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
+import org.opensearch.sql.opensearch.request.OpenSearchQueryRequest;
+import org.opensearch.sql.opensearch.request.OpenSearchRequest;
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
+import org.opensearch.sql.opensearch.request.OpenSearchScrollRequest;
+import org.opensearch.sql.opensearch.response.OpenSearchResponse;
+import org.opensearch.sql.opensearch.storage.OpenSearchIndex;
+import org.opensearch.sql.opensearch.storage.OpenSearchStorageEngine;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+class OpenSearchIndexScanTest {
+
+  public static final int QUERY_SIZE = 200;
+  public static final OpenSearchRequest.IndexName INDEX_NAME =
+      new OpenSearchRequest.IndexName("employees");
+  public static final int MAX_RESULT_WINDOW = 10000;
+  public static final TimeValue CURSOR_KEEP_ALIVE = TimeValue.timeValueMinutes(1);
+  @Mock private OpenSearchClient client;
+
+  private final OpenSearchExprValueFactory exprValueFactory =
+      new OpenSearchExprValueFactory(
+          Map.of(
+              "name", OpenSearchDataType.of(STRING), "department", OpenSearchDataType.of(STRING)));
+
+  @BeforeEach
+  void setup() {}
+
+  @Test
+  void explain() {
+    var request = mock(OpenSearchRequest.class);
+    when(request.toString()).thenReturn("explain works!");
+    try (var indexScan = new OpenSearchIndexScan(client, QUERY_SIZE, request)) {
+      assertEquals("explain works!", indexScan.explain());
+    }
+  }
+
+  @Test
+  @SneakyThrows
+  void throws_no_cursor_exception() {
+    var request = mock(OpenSearchRequest.class);
+    when(request.hasAnotherBatch()).thenReturn(false);
+    try (var indexScan = new OpenSearchIndexScan(client, QUERY_SIZE, request);
+        var byteStream = new ByteArrayOutputStream();
+        var objectStream = new ObjectOutputStream(byteStream)) {
+      assertThrows(NoCursorException.class, () -> objectStream.writeObject(indexScan));
+    }
+  }
+
+  @SneakyThrows
+  @ParameterizedTest
+  @ValueSource(ints = {0, 150})
+  void serialize(Integer numberOfIncludes) {
+    var searchSourceBuilder = new SearchSourceBuilder().size(4);
+
+    var factory = mock(OpenSearchExprValueFactory.class);
+    var engine = mock(OpenSearchStorageEngine.class);
+    var index = mock(OpenSearchIndex.class);
+    when(engine.getClient()).thenReturn(client);
+    when(engine.getTable(any(), any())).thenReturn(index);
+    var includes =
+        Stream.iterate(1, i -> i + 1)
+            .limit(numberOfIncludes)
+            .map(i -> "column" + i)
+            .collect(Collectors.toList());
+    var request =
+        new OpenSearchScrollRequest(
+            INDEX_NAME, CURSOR_KEEP_ALIVE, searchSourceBuilder, factory, includes);
+    request.setScrollId("valid-id");
+    // make a response, so OpenSearchResponse::isEmpty would return true and unset needClean
+    var response = mock(SearchResponse.class);
+    when(response.getAggregations()).thenReturn(mock());
+    var hits = mock(SearchHits.class);
+    when(response.getHits()).thenReturn(hits);
+    when(response.getScrollId()).thenReturn("valid-id");
+    when(hits.getHits()).thenReturn(new SearchHit[] {mock()});
+    request.search(null, (req) -> response);
+
+    try (var indexScan = new OpenSearchIndexScan(client, QUERY_SIZE, request)) {
+      var planSerializer = new PlanSerializer(engine);
+      var cursor = planSerializer.convertToCursor(indexScan);
+      var newPlan = planSerializer.convertToPlan(cursor.toString());
+      assertEquals(indexScan, newPlan);
+    }
+  }
+
+  @SneakyThrows
+  @Test
+  void throws_io_exception_if_too_short() {
+    var request = mock(OpenSearchRequest.class);
+    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    ObjectOutputStream objectOutput = new ObjectOutputStream(output);
+    objectOutput.writeInt(4);
+    objectOutput.flush();
+    ObjectInputStream objectInput =
+        new ObjectInputStream(new ByteArrayInputStream(output.toByteArray()));
+
+    try (var indexScan = new OpenSearchIndexScan(client, QUERY_SIZE, request)) {
+      assertThrows(IOException.class, () -> indexScan.readExternal(objectInput));
+    }
+  }
+
+  @Test
+  void plan_for_serialization() {
+    var request = mock(OpenSearchRequest.class);
+    try (var indexScan = new OpenSearchIndexScan(client, QUERY_SIZE, request)) {
+      assertEquals(indexScan, indexScan.getPlanForSerialization());
+    }
+  }
+
+  @Test
+  void query_empty_result() {
+    mockResponse(client);
+    final var name = new OpenSearchRequest.IndexName("test");
+    final var requestBuilder = new OpenSearchRequestBuilder(QUERY_SIZE, exprValueFactory);
+    try (OpenSearchIndexScan indexScan =
+        new OpenSearchIndexScan(
+            client, QUERY_SIZE, requestBuilder.build(name, MAX_RESULT_WINDOW, CURSOR_KEEP_ALIVE))) {
+      indexScan.open();
+      assertFalse(indexScan.hasNext());
+    }
+    verify(client).cleanup(any());
+  }
+
+  @Test
+  void query_all_results_with_query() {
+    mockResponse(
+        client,
+        new ExprValue[] {
+          employee(1, "John", "IT"), employee(2, "Smith", "HR"), employee(3, "Allen", "IT")
+        });
+
+    final var requestBuilder = new OpenSearchRequestBuilder(QUERY_SIZE, exprValueFactory);
+    try (OpenSearchIndexScan indexScan =
+        new OpenSearchIndexScan(
+            client, 10, requestBuilder.build(INDEX_NAME, 10000, CURSOR_KEEP_ALIVE))) {
+      indexScan.open();
+
+      assertAll(
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(1, "John", "IT"), indexScan.next()),
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(2, "Smith", "HR"), indexScan.next()),
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(3, "Allen", "IT"), indexScan.next()),
+          () -> assertFalse(indexScan.hasNext()));
+    }
+    verify(client).cleanup(any());
+  }
+
+  static final OpenSearchRequest.IndexName EMPLOYEES_INDEX =
+      new OpenSearchRequest.IndexName("employees");
+
+  @Test
+  void query_all_results_with_scroll() {
+    mockResponse(
+        client,
+        new ExprValue[] {employee(1, "John", "IT"), employee(2, "Smith", "HR")},
+        new ExprValue[] {employee(3, "Allen", "IT")});
+
+    final var requestBuilder = new OpenSearchRequestBuilder(QUERY_SIZE, exprValueFactory);
+    try (OpenSearchIndexScan indexScan =
+        new OpenSearchIndexScan(
+            client, 10, requestBuilder.build(INDEX_NAME, 10000, CURSOR_KEEP_ALIVE))) {
+      indexScan.open();
+
+      assertAll(
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(1, "John", "IT"), indexScan.next()),
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(2, "Smith", "HR"), indexScan.next()),
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(3, "Allen", "IT"), indexScan.next()),
+          () -> assertFalse(indexScan.hasNext()));
+    }
+    verify(client).cleanup(any());
+  }
+
+  @Test
+  void query_some_results_with_query() {
+    mockResponse(
+        client,
+        new ExprValue[] {
+          employee(1, "John", "IT"),
+          employee(2, "Smith", "HR"),
+          employee(3, "Allen", "IT"),
+          employee(4, "Bob", "HR")
+        });
+
+    final int limit = 3;
+    OpenSearchRequestBuilder builder = new OpenSearchRequestBuilder(0, exprValueFactory);
+    try (OpenSearchIndexScan indexScan =
+        new OpenSearchIndexScan(
+            client, limit, builder.build(INDEX_NAME, MAX_RESULT_WINDOW, CURSOR_KEEP_ALIVE))) {
+      indexScan.open();
+
+      assertAll(
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(1, "John", "IT"), indexScan.next()),
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(2, "Smith", "HR"), indexScan.next()),
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(3, "Allen", "IT"), indexScan.next()),
+          () -> assertFalse(indexScan.hasNext()));
+    }
+    verify(client).cleanup(any());
+  }
+
+  @Test
+  void query_some_results_with_scroll() {
+    mockTwoPageResponse(client);
+    final var requestuilder = new OpenSearchRequestBuilder(10, exprValueFactory);
+    try (OpenSearchIndexScan indexScan =
+        new OpenSearchIndexScan(
+            client, 3, requestuilder.build(INDEX_NAME, MAX_RESULT_WINDOW, CURSOR_KEEP_ALIVE))) {
+      indexScan.open();
+
+      assertAll(
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(1, "John", "IT"), indexScan.next()),
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(2, "Smith", "HR"), indexScan.next()),
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(3, "Allen", "IT"), indexScan.next()),
+          () -> assertFalse(indexScan.hasNext()));
+    }
+    verify(client).cleanup(any());
+  }
+
+  static void mockTwoPageResponse(OpenSearchClient client) {
+    mockResponse(
+        client,
+        new ExprValue[] {employee(1, "John", "IT"), employee(2, "Smith", "HR")},
+        new ExprValue[] {employee(3, "Allen", "IT"), employee(4, "Bob", "HR")});
+  }
+
+  @Test
+  void query_results_limited_by_query_size() {
+    mockResponse(
+        client,
+        new ExprValue[] {
+          employee(1, "John", "IT"),
+          employee(2, "Smith", "HR"),
+          employee(3, "Allen", "IT"),
+          employee(4, "Bob", "HR")
+        });
+
+    final int defaultQuerySize = 2;
+    final var requestBuilder = new OpenSearchRequestBuilder(defaultQuerySize, exprValueFactory);
+    try (OpenSearchIndexScan indexScan =
+        new OpenSearchIndexScan(
+            client,
+            defaultQuerySize,
+            requestBuilder.build(INDEX_NAME, QUERY_SIZE, CURSOR_KEEP_ALIVE))) {
+      indexScan.open();
+
+      assertAll(
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(1, "John", "IT"), indexScan.next()),
+          () -> assertTrue(indexScan.hasNext()),
+          () -> assertEquals(employee(2, "Smith", "HR"), indexScan.next()),
+          () -> assertFalse(indexScan.hasNext()));
+    }
+    verify(client).cleanup(any());
+  }
+
+  @Test
+  void push_down_filters() {
+    assertThat()
+        .pushDown(QueryBuilders.termQuery("name", "John"))
+        .shouldQuery(QueryBuilders.termQuery("name", "John"))
+        .pushDown(QueryBuilders.termQuery("age", 30))
+        .shouldQuery(
+            QueryBuilders.boolQuery()
+                .filter(QueryBuilders.termQuery("name", "John"))
+                .filter(QueryBuilders.termQuery("age", 30)))
+        .pushDown(QueryBuilders.rangeQuery("balance").gte(10000))
+        .shouldQuery(
+            QueryBuilders.boolQuery()
+                .filter(QueryBuilders.termQuery("name", "John"))
+                .filter(QueryBuilders.termQuery("age", 30))
+                .filter(QueryBuilders.rangeQuery("balance").gte(10000)));
+  }
+
+  @Test
+  void push_down_highlight() {
+    Map<String, Literal> args = new HashMap<>();
+    assertThat()
+        .pushDown(QueryBuilders.termQuery("name", "John"))
+        .pushDownHighlight("Title", args)
+        .pushDownHighlight("Body", args)
+        .shouldQueryHighlight(
+            QueryBuilders.termQuery("name", "John"),
+            new HighlightBuilder().field("Title").field("Body"));
+  }
+
+  @Test
+  void push_down_highlight_with_arguments() {
+    Map<String, Literal> args = new HashMap<>();
+    args.put("pre_tags", new Literal("<mark>", DataType.STRING));
+    args.put("post_tags", new Literal("</mark>", DataType.STRING));
+    HighlightBuilder highlightBuilder = new HighlightBuilder().field("Title");
+    highlightBuilder.fields().get(0).preTags("<mark>").postTags("</mark>");
+    assertThat()
+        .pushDown(QueryBuilders.termQuery("name", "John"))
+        .pushDownHighlight("Title", args)
+        .shouldQueryHighlight(QueryBuilders.termQuery("name", "John"), highlightBuilder);
+  }
+
+  private PushDownAssertion assertThat() {
+    return new PushDownAssertion(client, exprValueFactory);
+  }
+
+  private static class PushDownAssertion {
+    private final OpenSearchClient client;
+    private final OpenSearchRequestBuilder requestBuilder;
+    private final OpenSearchResponse response;
+    private final OpenSearchExprValueFactory factory;
+
+    public PushDownAssertion(OpenSearchClient client, OpenSearchExprValueFactory valueFactory) {
+      this.client = client;
+      this.requestBuilder = new OpenSearchRequestBuilder(QUERY_SIZE, valueFactory);
+
+      this.response = mock(OpenSearchResponse.class);
+      this.factory = valueFactory;
+      when(response.isEmpty()).thenReturn(true);
+    }
+
+    PushDownAssertion pushDown(QueryBuilder query) {
+      requestBuilder.pushDownFilter(query);
+      return this;
+    }
+
+    PushDownAssertion pushDownHighlight(String query, Map<String, Literal> arguments) {
+      requestBuilder.pushDownHighlight(query, arguments);
+      return this;
+    }
+
+    PushDownAssertion shouldQueryHighlight(QueryBuilder query, HighlightBuilder highlight) {
+      var sourceBuilder =
+          new SearchSourceBuilder()
+              .from(0)
+              .timeout(CURSOR_KEEP_ALIVE)
+              .query(query)
+              .size(QUERY_SIZE)
+              .highlighter(highlight)
+              .sort(DOC_FIELD_NAME, ASC);
+      OpenSearchRequest request =
+          new OpenSearchQueryRequest(EMPLOYEES_INDEX, sourceBuilder, factory, List.of());
+
+      when(client.search(request)).thenReturn(response);
+      var indexScan =
+          new OpenSearchIndexScan(
+              client, QUERY_SIZE, requestBuilder.build(EMPLOYEES_INDEX, 10000, CURSOR_KEEP_ALIVE));
+      indexScan.open();
+      return this;
+    }
+
+    PushDownAssertion shouldQuery(QueryBuilder expected) {
+      var builder =
+          new SearchSourceBuilder()
+              .from(0)
+              .query(expected)
+              .size(QUERY_SIZE)
+              .timeout(CURSOR_KEEP_ALIVE)
+              .sort(DOC_FIELD_NAME, ASC);
+      OpenSearchRequest request =
+          new OpenSearchQueryRequest(EMPLOYEES_INDEX, builder, factory, List.of());
+      when(client.search(request)).thenReturn(response);
+      var indexScan =
+          new OpenSearchIndexScan(
+              client, 10000, requestBuilder.build(EMPLOYEES_INDEX, 10000, CURSOR_KEEP_ALIVE));
+      indexScan.open();
+      return this;
+    }
+  }
+
+  public static void mockResponse(OpenSearchClient client, ExprValue[]... searchHitBatches) {
+    when(client.search(any()))
+        .thenAnswer(
+            new Answer<OpenSearchResponse>() {
+              private int batchNum;
+
+              @Override
+              public OpenSearchResponse answer(InvocationOnMock invocation) {
+                OpenSearchResponse response = mock(OpenSearchResponse.class);
+                int totalBatch = searchHitBatches.length;
+                if (batchNum < totalBatch) {
+                  when(response.isEmpty()).thenReturn(false);
+                  ExprValue[] searchHit = searchHitBatches[batchNum];
+                  when(response.iterator()).thenReturn(Arrays.asList(searchHit).iterator());
+                } else {
+                  when(response.isEmpty()).thenReturn(true);
+                }
+
+                batchNum++;
+                return response;
+              }
+            });
+  }
+
+  public static ExprValue employee(int docId, String name, String department) {
+    SearchHit hit = new SearchHit(docId);
+    hit.sourceRef(
+        new BytesArray("{\"name\":\"" + name + "\",\"department\":\"" + department + "\"}"));
+    return tupleValue(hit);
+  }
+
+  private static ExprValue tupleValue(SearchHit hit) {
+    return ExprValueUtils.tupleValue(hit.getSourceAsMap());
+  }
+}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/PushDownQueryBuilderTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/PushDownQueryBuilderTest.java
new file mode 100644
index 0000000000..5f233d7f45
--- /dev/null
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/PushDownQueryBuilderTest.java
@@ -0,0 +1,39 @@
+package org.opensearch.sql.opensearch.storage.scan;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.mockito.Mockito.mock;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
+import org.opensearch.sql.planner.logical.LogicalFilter;
+import org.opensearch.sql.planner.logical.LogicalHighlight;
+import org.opensearch.sql.planner.logical.LogicalLimit;
+import org.opensearch.sql.planner.logical.LogicalNested;
+import org.opensearch.sql.planner.logical.LogicalPaginate;
+import org.opensearch.sql.planner.logical.LogicalProject;
+import org.opensearch.sql.planner.logical.LogicalSort;
+
+@ExtendWith(MockitoExtension.class)
+class PushDownQueryBuilderTest {
+  @Test
+  void default_implementations() {
+    var sample =
+        new PushDownQueryBuilder() {
+          @Override
+          public OpenSearchRequestBuilder build() {
+            return null;
+          }
+        };
+    assertAll(
+        () -> assertFalse(sample.pushDownFilter(mock(LogicalFilter.class))),
+        () -> assertFalse(sample.pushDownProject(mock(LogicalProject.class))),
+        () -> assertFalse(sample.pushDownHighlight(mock(LogicalHighlight.class))),
+        () -> assertFalse(sample.pushDownSort(mock(LogicalSort.class))),
+        () -> assertFalse(sample.pushDownNested(mock(LogicalNested.class))),
+        () -> assertFalse(sample.pushDownLimit(mock(LogicalLimit.class))),
+        () -> assertFalse(sample.pushDownPageSize(mock(LogicalPaginate.class))));
+  }
+}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/ExpressionScriptEngineTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/ExpressionScriptEngineTest.java
index 3d497c2f5b..63710e57aa 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/ExpressionScriptEngineTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/ExpressionScriptEngineTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script;
 
 import static java.util.Collections.emptyMap;
@@ -34,8 +33,7 @@
 @ExtendWith(MockitoExtension.class)
 class ExpressionScriptEngineTest {
 
-  @Mock
-  private ExpressionSerializer serializer;
+  @Mock private ExpressionSerializer serializer;
 
   private ScriptEngine scriptEngine;
 
@@ -55,19 +53,20 @@ void should_return_custom_script_language_name() {
   void can_initialize_filter_script_factory_by_compiled_script() {
     when(serializer.deserialize("test code")).thenReturn(expression);
 
-    assertThat(scriptEngine.getSupportedContexts(),
+    assertThat(
+        scriptEngine.getSupportedContexts(),
         contains(FilterScript.CONTEXT, AggregationScript.CONTEXT));
 
-    Object actualFactory = scriptEngine.compile(
-        "test", "test code", FilterScript.CONTEXT, emptyMap());
+    Object actualFactory =
+        scriptEngine.compile("test", "test code", FilterScript.CONTEXT, emptyMap());
     assertEquals(new ExpressionFilterScriptFactory(expression), actualFactory);
   }
 
   @Test
   void should_throw_exception_for_unsupported_script_context() {
     ScriptContext<?> unknownCtx = mock(ScriptContext.class);
-    assertThrows(IllegalStateException.class, () ->
-        scriptEngine.compile("test", "test code", unknownCtx, emptyMap()));
+    assertThrows(
+        IllegalStateException.class,
+        () -> scriptEngine.compile("test", "test code", unknownCtx, emptyMap()));
   }
-
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilderTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilderTest.java
index b62d545206..6485dce124 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilderTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/AggregationQueryBuilderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -14,15 +13,16 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.opensearch.sql.common.utils.StringUtils.format;
 import static org.opensearch.sql.data.type.ExprCoreType.DATE;
+import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
 import static org.opensearch.sql.data.type.ExprCoreType.DOUBLE;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.data.type.ExprCoreType.TIME;
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
 import static org.opensearch.sql.expression.DSL.literal;
 import static org.opensearch.sql.expression.DSL.named;
 import static org.opensearch.sql.expression.DSL.ref;
 import static org.opensearch.sql.expression.DSL.span;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
 import static org.opensearch.sql.opensearch.utils.Utils.agg;
 import static org.opensearch.sql.opensearch.utils.Utils.avg;
 import static org.opensearch.sql.opensearch.utils.Utils.group;
@@ -52,13 +52,15 @@
 import org.opensearch.sql.expression.aggregation.AvgAggregator;
 import org.opensearch.sql.expression.aggregation.CountAggregator;
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDateType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.storage.serialization.ExpressionSerializer;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @ExtendWith(MockitoExtension.class)
 class AggregationQueryBuilderTest {
-  @Mock
-  private ExpressionSerializer serializer;
+  @Mock private ExpressionSerializer serializer;
 
   private AggregationQueryBuilder queryBuilder;
 
@@ -69,31 +71,32 @@ void set_up() {
 
   @Test
   void should_build_composite_aggregation_for_field_reference() {
-    assertEquals(format(
-        "{%n"
-            + "  \"composite_buckets\" : {%n"
-            + "    \"composite\" : {%n"
-            + "      \"size\" : 1000,%n"
-            + "      \"sources\" : [ {%n"
-            + "        \"name\" : {%n"
-            + "          \"terms\" : {%n"
-            + "            \"field\" : \"name\",%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"first\",%n"
-            + "            \"order\" : \"asc\"%n"
-            + "          }%n"
-            + "        }%n"
-            + "      } ]%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"avg(age)\" : {%n"
-            + "        \"avg\" : {%n"
-            + "          \"field\" : \"age\"%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"composite_buckets\" : {%n"
+                + "    \"composite\" : {%n"
+                + "      \"size\" : 1000,%n"
+                + "      \"sources\" : [ {%n"
+                + "        \"name\" : {%n"
+                + "          \"terms\" : {%n"
+                + "            \"field\" : \"name\",%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"first\",%n"
+                + "            \"order\" : \"asc\"%n"
+                + "          }%n"
+                + "        }%n"
+                + "      } ]%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"avg(age)\" : {%n"
+                + "        \"avg\" : {%n"
+                + "          \"field\" : \"age\"%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
                 named("avg(age)", new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER))),
@@ -102,335 +105,415 @@ void should_build_composite_aggregation_for_field_reference() {
 
   @Test
   void should_build_composite_aggregation_for_field_reference_with_order() {
-    assertEquals(format(
-        "{%n"
-            + "  \"composite_buckets\" : {%n"
-            + "    \"composite\" : {%n"
-            + "      \"size\" : 1000,%n"
-            + "      \"sources\" : [ {%n"
-            + "        \"name\" : {%n"
-            + "          \"terms\" : {%n"
-            + "            \"field\" : \"name\",%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"last\",%n"
-            + "            \"order\" : \"desc\"%n"
-            + "          }%n"
-            + "        }%n"
-            + "      } ]%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"avg(age)\" : {%n"
-            + "        \"avg\" : {%n"
-            + "          \"field\" : \"age\"%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"composite_buckets\" : {%n"
+                + "    \"composite\" : {%n"
+                + "      \"size\" : 1000,%n"
+                + "      \"sources\" : [ {%n"
+                + "        \"name\" : {%n"
+                + "          \"terms\" : {%n"
+                + "            \"field\" : \"name\",%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"last\",%n"
+                + "            \"order\" : \"desc\"%n"
+                + "          }%n"
+                + "        }%n"
+                + "      } ]%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"avg(age)\" : {%n"
+                + "        \"avg\" : {%n"
+                + "          \"field\" : \"age\"%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
                 named("avg(age)", new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER))),
             Arrays.asList(named("name", ref("name", STRING))),
-            sort(ref("name", STRING), Sort.SortOption.DEFAULT_DESC)
-        ));
+            sort(ref("name", STRING), Sort.SortOption.DEFAULT_DESC)));
   }
 
   @Test
   void should_build_type_mapping_for_field_reference() {
     assertThat(
-        buildTypeMapping(Arrays.asList(
-            named("avg(age)", new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER))),
+        buildTypeMapping(
+            Arrays.asList(
+                named("avg(age)", new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER))),
             Arrays.asList(named("name", ref("name", STRING)))),
         containsInAnyOrder(
-            map("avg(age)", INTEGER),
-            map("name", STRING)
-        ));
+            map("avg(age)", OpenSearchDataType.of(INTEGER)),
+            map("name", OpenSearchDataType.of(STRING))));
+  }
+
+  @Test
+  void should_build_type_mapping_for_datetime_type() {
+    assertThat(
+        buildTypeMapping(
+            Arrays.asList(
+                named(
+                    "avg(datetime)",
+                    new AvgAggregator(Arrays.asList(ref("datetime", DATETIME)), DATETIME))),
+            Arrays.asList(named("datetime", ref("datetime", DATETIME)))),
+        containsInAnyOrder(
+            map("avg(datetime)", OpenSearchDateType.of(DATETIME)),
+            map("datetime", OpenSearchDateType.of(DATETIME))));
+  }
+
+  @Test
+  void should_build_type_mapping_for_timestamp_type() {
+    assertThat(
+        buildTypeMapping(
+            Arrays.asList(
+                named(
+                    "avg(timestamp)",
+                    new AvgAggregator(Arrays.asList(ref("timestamp", TIMESTAMP)), TIMESTAMP))),
+            Arrays.asList(named("timestamp", ref("timestamp", TIMESTAMP)))),
+        containsInAnyOrder(
+            map("avg(timestamp)", OpenSearchDateType.of()),
+            map("timestamp", OpenSearchDateType.of())));
+  }
+
+  @Test
+  void should_build_type_mapping_for_date_type() {
+    assertThat(
+        buildTypeMapping(
+            Arrays.asList(
+                named("avg(date)", new AvgAggregator(Arrays.asList(ref("date", DATE)), DATE))),
+            Arrays.asList(named("date", ref("date", DATE)))),
+        containsInAnyOrder(
+            map("avg(date)", OpenSearchDateType.of(DATE)),
+            map("date", OpenSearchDateType.of(DATE))));
+  }
+
+  @Test
+  void should_build_type_mapping_for_time_type() {
+    assertThat(
+        buildTypeMapping(
+            Arrays.asList(
+                named("avg(time)", new AvgAggregator(Arrays.asList(ref("time", TIME)), TIME))),
+            Arrays.asList(named("time", ref("time", TIME)))),
+        containsInAnyOrder(
+            map("avg(time)", OpenSearchDateType.of(TIME)),
+            map("time", OpenSearchDateType.of(TIME))));
   }
 
   @Test
   void should_build_composite_aggregation_for_field_reference_of_keyword() {
-    assertEquals(format(
-        "{%n"
-            + "  \"composite_buckets\" : {%n"
-            + "    \"composite\" : {%n"
-            + "      \"size\" : 1000,%n"
-            + "      \"sources\" : [ {%n"
-            + "        \"name\" : {%n"
-            + "          \"terms\" : {%n"
-            + "            \"field\" : \"name.keyword\",%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"first\",%n"
-            + "            \"order\" : \"asc\"%n"
-            + "          }%n"
-            + "        }%n"
-            + "      } ]%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"avg(age)\" : {%n"
-            + "        \"avg\" : {%n"
-            + "          \"field\" : \"age\"%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"composite_buckets\" : {%n"
+                + "    \"composite\" : {%n"
+                + "      \"size\" : 1000,%n"
+                + "      \"sources\" : [ {%n"
+                + "        \"name\" : {%n"
+                + "          \"terms\" : {%n"
+                + "            \"field\" : \"name.keyword\",%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"first\",%n"
+                + "            \"order\" : \"asc\"%n"
+                + "          }%n"
+                + "        }%n"
+                + "      } ]%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"avg(age)\" : {%n"
+                + "        \"avg\" : {%n"
+                + "          \"field\" : \"age\"%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
                 named("avg(age)", new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER))),
-            Arrays.asList(named("name", ref("name", OPENSEARCH_TEXT_KEYWORD)))));
+            Arrays.asList(
+                named(
+                    "name",
+                    ref(
+                        "name",
+                        OpenSearchTextType.of(
+                            Map.of(
+                                "words",
+                                OpenSearchDataType.of(
+                                    OpenSearchDataType.MappingType.Keyword))))))));
   }
 
   @Test
   void should_build_type_mapping_for_field_reference_of_keyword() {
     assertThat(
-        buildTypeMapping(Arrays.asList(
-            named("avg(age)", new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER))),
-            Arrays.asList(named("name", ref("name", OPENSEARCH_TEXT_KEYWORD)))),
+        buildTypeMapping(
+            Arrays.asList(
+                named("avg(age)", new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER))),
+            Arrays.asList(named("name", ref("name", STRING)))),
         containsInAnyOrder(
-            map("avg(age)", INTEGER),
-            map("name", OPENSEARCH_TEXT_KEYWORD)
-        ));
+            map("avg(age)", OpenSearchDataType.of(INTEGER)),
+            map("name", OpenSearchDataType.of(STRING))));
   }
 
   @Test
   void should_build_composite_aggregation_for_expression() {
-    doAnswer(invocation -> {
-      Expression expr = invocation.getArgument(0);
-      return expr.toString();
-    }).when(serializer).serialize(any());
-    assertEquals(format(
-        "{%n"
-            + "  \"composite_buckets\" : {%n"
-            + "    \"composite\" : {%n"
-            + "      \"size\" : 1000,%n"
-            + "      \"sources\" : [ {%n"
-            + "        \"age\" : {%n"
-            + "          \"terms\" : {%n"
-            + "            \"script\" : {%n"
-            + "              \"source\" : \"asin(age)\",%n"
-            + "              \"lang\" : \"opensearch_query_expression\"%n"
-            + "            },%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"first\",%n"
-            + "            \"order\" : \"asc\"%n"
-            + "          }%n"
-            + "        }%n"
-            + "      } ]%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"avg(balance)\" : {%n"
-            + "        \"avg\" : {%n"
-            + "          \"script\" : {%n"
-            + "            \"source\" : \"abs(balance)\",%n"
-            + "            \"lang\" : \"opensearch_query_expression\"%n"
-            + "          }%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    doAnswer(
+            invocation -> {
+              Expression expr = invocation.getArgument(0);
+              return expr.toString();
+            })
+        .when(serializer)
+        .serialize(any());
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"composite_buckets\" : {%n"
+                + "    \"composite\" : {%n"
+                + "      \"size\" : 1000,%n"
+                + "      \"sources\" : [ {%n"
+                + "        \"age\" : {%n"
+                + "          \"terms\" : {%n"
+                + "            \"script\" : {%n"
+                + "              \"source\" : \"asin(age)\",%n"
+                + "              \"lang\" : \"opensearch_query_expression\"%n"
+                + "            },%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"first\",%n"
+                + "            \"order\" : \"asc\"%n"
+                + "          }%n"
+                + "        }%n"
+                + "      } ]%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"avg(balance)\" : {%n"
+                + "        \"avg\" : {%n"
+                + "          \"script\" : {%n"
+                + "            \"source\" : \"abs(balance)\",%n"
+                + "            \"lang\" : \"opensearch_query_expression\"%n"
+                + "          }%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("avg(balance)", new AvgAggregator(
-                    Arrays.asList(DSL.abs(ref("balance", INTEGER))), INTEGER))),
+                named(
+                    "avg(balance)",
+                    new AvgAggregator(Arrays.asList(DSL.abs(ref("balance", INTEGER))), INTEGER))),
             Arrays.asList(named("age", DSL.asin(ref("age", INTEGER))))));
   }
 
   @Test
   void should_build_composite_aggregation_follow_with_order_by_position() {
-    assertEquals(format(
-        "{%n"
-            + "  \"composite_buckets\" : {%n"
-            + "    \"composite\" : {%n"
-            + "      \"size\" : 1000,%n"
-            + "      \"sources\" : [ {%n"
-            + "        \"name\" : {%n"
-            + "          \"terms\" : {%n"
-            + "            \"field\" : \"name\",%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"last\",%n"
-            + "            \"order\" : \"desc\"%n"
-            + "          }%n"
-            + "        }%n"
-            + "      }, {%n"
-            + "        \"age\" : {%n"
-            + "          \"terms\" : {%n"
-            + "            \"field\" : \"age\",%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"first\",%n"
-            + "            \"order\" : \"asc\"%n"
-            + "          }%n"
-            + "        }%n"
-            + "      } ]%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"avg(balance)\" : {%n"
-            + "        \"avg\" : {%n"
-            + "          \"field\" : \"balance\"%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"composite_buckets\" : {%n"
+                + "    \"composite\" : {%n"
+                + "      \"size\" : 1000,%n"
+                + "      \"sources\" : [ {%n"
+                + "        \"name\" : {%n"
+                + "          \"terms\" : {%n"
+                + "            \"field\" : \"name\",%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"last\",%n"
+                + "            \"order\" : \"desc\"%n"
+                + "          }%n"
+                + "        }%n"
+                + "      }, {%n"
+                + "        \"age\" : {%n"
+                + "          \"terms\" : {%n"
+                + "            \"field\" : \"age\",%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"first\",%n"
+                + "            \"order\" : \"asc\"%n"
+                + "          }%n"
+                + "        }%n"
+                + "      } ]%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"avg(balance)\" : {%n"
+                + "        \"avg\" : {%n"
+                + "          \"field\" : \"balance\"%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             agg(named("avg(balance)", avg(ref("balance", INTEGER), INTEGER))),
             group(named("age", ref("age", INTEGER)), named("name", ref("name", STRING))),
-            sort(ref("name", STRING), Sort.SortOption.DEFAULT_DESC,
-                ref("age", INTEGER), Sort.SortOption.DEFAULT_ASC)
-        ));
+            sort(
+                ref("name", STRING),
+                Sort.SortOption.DEFAULT_DESC,
+                ref("age", INTEGER),
+                Sort.SortOption.DEFAULT_ASC)));
   }
 
   @Test
   void should_build_type_mapping_for_expression() {
     assertThat(
-        buildTypeMapping(Arrays.asList(
-            named("avg(balance)", new AvgAggregator(
-                Arrays.asList(DSL.abs(ref("balance", INTEGER))), INTEGER))),
+        buildTypeMapping(
+            Arrays.asList(
+                named(
+                    "avg(balance)",
+                    new AvgAggregator(Arrays.asList(DSL.abs(ref("balance", INTEGER))), INTEGER))),
             Arrays.asList(named("age", DSL.asin(ref("age", INTEGER))))),
         containsInAnyOrder(
-            map("avg(balance)", INTEGER),
-            map("age", DOUBLE)
-        ));
+            map("avg(balance)", OpenSearchDataType.of(INTEGER)),
+            map("age", OpenSearchDataType.of(DOUBLE))));
   }
 
   @Test
   void should_build_aggregation_without_bucket() {
-    assertEquals(format(
-        "{%n"
-            + "  \"avg(balance)\" : {%n"
-            + "    \"avg\" : {%n"
-            + "      \"field\" : \"balance\"%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"avg(balance)\" : {%n"
+                + "    \"avg\" : {%n"
+                + "      \"field\" : \"balance\"%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("avg(balance)", new AvgAggregator(
-                    Arrays.asList(ref("balance", INTEGER)), INTEGER))),
+                named(
+                    "avg(balance)",
+                    new AvgAggregator(Arrays.asList(ref("balance", INTEGER)), INTEGER))),
             Collections.emptyList()));
   }
 
   @Test
   void should_build_filter_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"avg(age) filter(where age > 34)\" : {%n"
-            + "    \"filter\" : {%n"
-            + "      \"range\" : {%n"
-            + "        \"age\" : {%n"
-            + "          \"from\" : 20,%n"
-            + "          \"to\" : null,%n"
-            + "          \"include_lower\" : false,%n"
-            + "          \"include_upper\" : true,%n"
-            + "          \"boost\" : 1.0%n"
-            + "        }%n"
-            + "      }%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"avg(age) filter(where age > 34)\" : {%n"
-            + "        \"avg\" : {%n"
-            + "          \"field\" : \"age\"%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"avg(age) filter(where age > 34)\" : {%n"
+                + "    \"filter\" : {%n"
+                + "      \"range\" : {%n"
+                + "        \"age\" : {%n"
+                + "          \"from\" : 20,%n"
+                + "          \"to\" : null,%n"
+                + "          \"include_lower\" : false,%n"
+                + "          \"include_upper\" : true,%n"
+                + "          \"boost\" : 1.0%n"
+                + "        }%n"
+                + "      }%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"avg(age) filter(where age > 34)\" : {%n"
+                + "        \"avg\" : {%n"
+                + "          \"field\" : \"age\"%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
-            Arrays.asList(named("avg(age) filter(where age > 34)",
-                new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)
-                    .condition(DSL.greater(ref("age", INTEGER), literal(20))))),
+            Arrays.asList(
+                named(
+                    "avg(age) filter(where age > 34)",
+                    new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)
+                        .condition(DSL.greater(ref("age", INTEGER), literal(20))))),
             Collections.emptyList()));
   }
 
   @Test
   void should_build_filter_aggregation_group_by() {
-    assertEquals(format(
-        "{%n"
-            + "  \"composite_buckets\" : {%n"
-            + "    \"composite\" : {%n"
-            + "      \"size\" : 1000,%n"
-            + "      \"sources\" : [ {%n"
-            + "        \"gender\" : {%n"
-            + "          \"terms\" : {%n"
-            + "            \"field\" : \"gender\",%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"first\",%n"
-            + "            \"order\" : \"asc\"%n"
-            + "          }%n"
-            + "        }%n"
-            + "      } ]%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"avg(age) filter(where age > 34)\" : {%n"
-            + "        \"filter\" : {%n"
-            + "          \"range\" : {%n"
-            + "            \"age\" : {%n"
-            + "              \"from\" : 20,%n"
-            + "              \"to\" : null,%n"
-            + "              \"include_lower\" : false,%n"
-            + "              \"include_upper\" : true,%n"
-            + "              \"boost\" : 1.0%n"
-            + "            }%n"
-            + "          }%n"
-            + "        },%n"
-            + "        \"aggregations\" : {%n"
-            + "          \"avg(age) filter(where age > 34)\" : {%n"
-            + "            \"avg\" : {%n"
-            + "              \"field\" : \"age\"%n"
-            + "            }%n"
-            + "          }%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"composite_buckets\" : {%n"
+                + "    \"composite\" : {%n"
+                + "      \"size\" : 1000,%n"
+                + "      \"sources\" : [ {%n"
+                + "        \"gender\" : {%n"
+                + "          \"terms\" : {%n"
+                + "            \"field\" : \"gender\",%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"first\",%n"
+                + "            \"order\" : \"asc\"%n"
+                + "          }%n"
+                + "        }%n"
+                + "      } ]%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"avg(age) filter(where age > 34)\" : {%n"
+                + "        \"filter\" : {%n"
+                + "          \"range\" : {%n"
+                + "            \"age\" : {%n"
+                + "              \"from\" : 20,%n"
+                + "              \"to\" : null,%n"
+                + "              \"include_lower\" : false,%n"
+                + "              \"include_upper\" : true,%n"
+                + "              \"boost\" : 1.0%n"
+                + "            }%n"
+                + "          }%n"
+                + "        },%n"
+                + "        \"aggregations\" : {%n"
+                + "          \"avg(age) filter(where age > 34)\" : {%n"
+                + "            \"avg\" : {%n"
+                + "              \"field\" : \"age\"%n"
+                + "            }%n"
+                + "          }%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
-            Arrays.asList(named("avg(age) filter(where age > 34)",
-                new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)
-                    .condition(DSL.greater(ref("age", INTEGER), literal(20))))),
-            Arrays.asList(named(ref("gender", STRING)))));
+            Arrays.asList(
+                named(
+                    "avg(age) filter(where age > 34)",
+                    new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)
+                        .condition(DSL.greater(ref("age", INTEGER), literal(20))))),
+            Arrays.asList(named(ref("gender", OpenSearchDataType.of(STRING))))));
   }
 
   @Test
   void should_build_type_mapping_without_bucket() {
     assertThat(
-        buildTypeMapping(Arrays.asList(
-            named("avg(balance)", new AvgAggregator(
-                Arrays.asList(ref("balance", INTEGER)), INTEGER))),
+        buildTypeMapping(
+            Arrays.asList(
+                named(
+                    "avg(balance)",
+                    new AvgAggregator(Arrays.asList(ref("balance", INTEGER)), INTEGER))),
             Collections.emptyList()),
-        containsInAnyOrder(
-            map("avg(balance)", INTEGER)
-        ));
+        containsInAnyOrder(map("avg(balance)", OpenSearchDataType.of(INTEGER))));
   }
 
   @Test
   void should_build_histogram() {
-    assertEquals(format(
-        "{%n"
-            + "  \"composite_buckets\" : {%n"
-            + "    \"composite\" : {%n"
-            + "      \"size\" : 1000,%n"
-            + "      \"sources\" : [ {%n"
-            + "        \"SpanExpression(field=age, value=10, unit=NONE)\" : {%n"
-            + "          \"histogram\" : {%n"
-            + "            \"field\" : \"age\",%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"first\",%n"
-            + "            \"order\" : \"asc\",%n"
-            + "            \"interval\" : 10.0%n"
-            + "          }%n"
-            + "        }%n"
-            + "      } ]%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"count(a)\" : {%n"
-            + "        \"value_count\" : {%n"
-            + "          \"field\" : \"a\"%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"composite_buckets\" : {%n"
+                + "    \"composite\" : {%n"
+                + "      \"size\" : 1000,%n"
+                + "      \"sources\" : [ {%n"
+                + "        \"SpanExpression(field=age, value=10, unit=NONE)\" : {%n"
+                + "          \"histogram\" : {%n"
+                + "            \"field\" : \"age\",%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"first\",%n"
+                + "            \"order\" : \"asc\",%n"
+                + "            \"interval\" : 10.0%n"
+                + "          }%n"
+                + "        }%n"
+                + "      } ]%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"count(a)\" : {%n"
+                + "        \"value_count\" : {%n"
+                + "          \"field\" : \"a\"%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
                 named("count(a)", new CountAggregator(Arrays.asList(ref("a", INTEGER)), INTEGER))),
@@ -439,37 +522,38 @@ void should_build_histogram() {
 
   @Test
   void should_build_histogram_two_metrics() {
-    assertEquals(format(
-        "{%n"
-            + "  \"composite_buckets\" : {%n"
-            + "    \"composite\" : {%n"
-            + "      \"size\" : 1000,%n"
-            + "      \"sources\" : [ {%n"
-            + "        \"SpanExpression(field=age, value=10, unit=NONE)\" : {%n"
-            + "          \"histogram\" : {%n"
-            + "            \"field\" : \"age\",%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"first\",%n"
-            + "            \"order\" : \"asc\",%n"
-            + "            \"interval\" : 10.0%n"
-            + "          }%n"
-            + "        }%n"
-            + "      } ]%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"count(a)\" : {%n"
-            + "        \"value_count\" : {%n"
-            + "          \"field\" : \"a\"%n"
-            + "        }%n"
-            + "      },%n"
-            + "      \"avg(b)\" : {%n"
-            + "        \"avg\" : {%n"
-            + "          \"field\" : \"b\"%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"composite_buckets\" : {%n"
+                + "    \"composite\" : {%n"
+                + "      \"size\" : 1000,%n"
+                + "      \"sources\" : [ {%n"
+                + "        \"SpanExpression(field=age, value=10, unit=NONE)\" : {%n"
+                + "          \"histogram\" : {%n"
+                + "            \"field\" : \"age\",%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"first\",%n"
+                + "            \"order\" : \"asc\",%n"
+                + "            \"interval\" : 10.0%n"
+                + "          }%n"
+                + "        }%n"
+                + "      } ]%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"count(a)\" : {%n"
+                + "        \"value_count\" : {%n"
+                + "          \"field\" : \"a\"%n"
+                + "        }%n"
+                + "      },%n"
+                + "      \"avg(b)\" : {%n"
+                + "        \"avg\" : {%n"
+                + "          \"field\" : \"b\"%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
                 named("count(a)", new CountAggregator(Arrays.asList(ref("a", INTEGER)), INTEGER)),
@@ -479,32 +563,33 @@ void should_build_histogram_two_metrics() {
 
   @Test
   void fixed_interval_time_span() {
-    assertEquals(format(
-        "{%n"
-            + "  \"composite_buckets\" : {%n"
-            + "    \"composite\" : {%n"
-            + "      \"size\" : 1000,%n"
-            + "      \"sources\" : [ {%n"
-            + "        \"SpanExpression(field=timestamp, value=1, unit=H)\" : {%n"
-            + "          \"date_histogram\" : {%n"
-            + "            \"field\" : \"timestamp\",%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"first\",%n"
-            + "            \"order\" : \"asc\",%n"
-            + "            \"fixed_interval\" : \"1h\"%n"
-            + "          }%n"
-            + "        }%n"
-            + "      } ]%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"count(a)\" : {%n"
-            + "        \"value_count\" : {%n"
-            + "          \"field\" : \"a\"%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"composite_buckets\" : {%n"
+                + "    \"composite\" : {%n"
+                + "      \"size\" : 1000,%n"
+                + "      \"sources\" : [ {%n"
+                + "        \"SpanExpression(field=timestamp, value=1, unit=H)\" : {%n"
+                + "          \"date_histogram\" : {%n"
+                + "            \"field\" : \"timestamp\",%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"first\",%n"
+                + "            \"order\" : \"asc\",%n"
+                + "            \"fixed_interval\" : \"1h\"%n"
+                + "          }%n"
+                + "        }%n"
+                + "      } ]%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"count(a)\" : {%n"
+                + "        \"value_count\" : {%n"
+                + "          \"field\" : \"a\"%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
                 named("count(a)", new CountAggregator(Arrays.asList(ref("a", INTEGER)), INTEGER))),
@@ -513,32 +598,33 @@ void fixed_interval_time_span() {
 
   @Test
   void calendar_interval_time_span() {
-    assertEquals(format(
-        "{%n"
-            + "  \"composite_buckets\" : {%n"
-            + "    \"composite\" : {%n"
-            + "      \"size\" : 1000,%n"
-            + "      \"sources\" : [ {%n"
-            + "        \"SpanExpression(field=date, value=1, unit=W)\" : {%n"
-            + "          \"date_histogram\" : {%n"
-            + "            \"field\" : \"date\",%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"first\",%n"
-            + "            \"order\" : \"asc\",%n"
-            + "            \"calendar_interval\" : \"1w\"%n"
-            + "          }%n"
-            + "        }%n"
-            + "      } ]%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"count(a)\" : {%n"
-            + "        \"value_count\" : {%n"
-            + "          \"field\" : \"a\"%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"composite_buckets\" : {%n"
+                + "    \"composite\" : {%n"
+                + "      \"size\" : 1000,%n"
+                + "      \"sources\" : [ {%n"
+                + "        \"SpanExpression(field=date, value=1, unit=W)\" : {%n"
+                + "          \"date_histogram\" : {%n"
+                + "            \"field\" : \"date\",%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"first\",%n"
+                + "            \"order\" : \"asc\",%n"
+                + "            \"calendar_interval\" : \"1w\"%n"
+                + "          }%n"
+                + "        }%n"
+                + "      } ]%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"count(a)\" : {%n"
+                + "        \"value_count\" : {%n"
+                + "          \"field\" : \"a\"%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
                 named("count(a)", new CountAggregator(Arrays.asList(ref("a", INTEGER)), INTEGER))),
@@ -547,32 +633,33 @@ void calendar_interval_time_span() {
 
   @Test
   void general_span() {
-    assertEquals(format(
-        "{%n"
-            + "  \"composite_buckets\" : {%n"
-            + "    \"composite\" : {%n"
-            + "      \"size\" : 1000,%n"
-            + "      \"sources\" : [ {%n"
-            + "        \"SpanExpression(field=age, value=1, unit=NONE)\" : {%n"
-            + "          \"histogram\" : {%n"
-            + "            \"field\" : \"age\",%n"
-            + "            \"missing_bucket\" : true,%n"
-            + "            \"missing_order\" : \"first\",%n"
-            + "            \"order\" : \"asc\",%n"
-            + "            \"interval\" : 1.0%n"
-            + "          }%n"
-            + "        }%n"
-            + "      } ]%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"count(a)\" : {%n"
-            + "        \"value_count\" : {%n"
-            + "          \"field\" : \"a\"%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"composite_buckets\" : {%n"
+                + "    \"composite\" : {%n"
+                + "      \"size\" : 1000,%n"
+                + "      \"sources\" : [ {%n"
+                + "        \"SpanExpression(field=age, value=1, unit=NONE)\" : {%n"
+                + "          \"histogram\" : {%n"
+                + "            \"field\" : \"age\",%n"
+                + "            \"missing_bucket\" : true,%n"
+                + "            \"missing_order\" : \"first\",%n"
+                + "            \"order\" : \"asc\",%n"
+                + "            \"interval\" : 1.0%n"
+                + "          }%n"
+                + "        }%n"
+                + "      } ]%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"count(a)\" : {%n"
+                + "        \"value_count\" : {%n"
+                + "          \"field\" : \"a\"%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
                 named("count(a)", new CountAggregator(Arrays.asList(ref("a", INTEGER)), INTEGER))),
@@ -581,15 +668,20 @@ void general_span() {
 
   @Test
   void invalid_unit() {
-    assertThrows(IllegalStateException.class, () -> buildQuery(
-        Arrays.asList(
-            named("count(a)", new CountAggregator(Arrays.asList(ref("a", INTEGER)), INTEGER))),
-        Arrays.asList(named(span(ref("age", INTEGER), literal(1), "invalid_unit")))));
+    assertThrows(
+        IllegalStateException.class,
+        () ->
+            buildQuery(
+                Arrays.asList(
+                    named(
+                        "count(a)",
+                        new CountAggregator(Arrays.asList(ref("a", INTEGER)), INTEGER))),
+                Arrays.asList(named(span(ref("age", INTEGER), literal(1), "invalid_unit")))));
   }
 
   @SneakyThrows
-  private String buildQuery(List<NamedAggregator> namedAggregatorList,
-                            List<NamedExpression> groupByList) {
+  private String buildQuery(
+      List<NamedAggregator> namedAggregatorList, List<NamedExpression> groupByList) {
     return buildQuery(namedAggregatorList, groupByList, null);
   }
 
@@ -609,9 +701,8 @@ private String buildQuery(
         .toPrettyString();
   }
 
-  private Set<Map.Entry<String, ExprType>> buildTypeMapping(
-      List<NamedAggregator> namedAggregatorList,
-      List<NamedExpression> groupByList) {
+  private Set<Map.Entry<String, OpenSearchDataType>> buildTypeMapping(
+      List<NamedAggregator> namedAggregatorList, List<NamedExpression> groupByList) {
     return queryBuilder.buildTypeMapping(namedAggregatorList, groupByList).entrySet();
   }
 
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptFactoryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptFactoryTest.java
index 38107934a0..618a9ca77a 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptFactoryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptFactoryTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,14 +30,11 @@
 @ExtendWith(MockitoExtension.class)
 class ExpressionAggregationScriptFactoryTest {
 
-  @Mock
-  private SearchLookup searchLookup;
+  @Mock private SearchLookup searchLookup;
 
-  @Mock
-  private LeafSearchLookup leafSearchLookup;
+  @Mock private LeafSearchLookup leafSearchLookup;
 
-  @Mock
-  private LeafReaderContext leafReaderContext;
+  @Mock private LeafReaderContext leafReaderContext;
 
   private final Expression expression = DSL.literal(true);
 
@@ -63,7 +59,6 @@ void can_initialize_expression_filter_script() throws IOException {
 
     assertEquals(
         new ExpressionAggregationScript(expression, searchLookup, leafReaderContext, params),
-        actualScript
-    );
+        actualScript);
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptTest.java
index 79b6bba712..520e301301 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/ExpressionAggregationScriptTest.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation;
 
+import static java.time.temporal.ChronoUnit.MILLIS;
 import static java.util.Collections.emptyMap;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -16,9 +16,10 @@
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 import static org.opensearch.sql.expression.DSL.literal;
 import static org.opensearch.sql.expression.DSL.ref;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
 
 import com.google.common.collect.ImmutableMap;
+import java.time.LocalDate;
+import java.time.LocalTime;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.apache.lucene.index.LeafReaderContext;
@@ -32,28 +33,29 @@
 import org.opensearch.search.lookup.LeafDocLookup;
 import org.opensearch.search.lookup.LeafSearchLookup;
 import org.opensearch.search.lookup.SearchLookup;
+import org.opensearch.sql.data.model.ExprDateValue;
+import org.opensearch.sql.data.model.ExprDatetimeValue;
+import org.opensearch.sql.data.model.ExprTimestampValue;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @ExtendWith(MockitoExtension.class)
 class ExpressionAggregationScriptTest {
 
-  @Mock
-  private SearchLookup lookup;
+  @Mock private SearchLookup lookup;
 
-  @Mock
-  private LeafSearchLookup leafLookup;
+  @Mock private LeafSearchLookup leafLookup;
 
-  @Mock
-  private LeafReaderContext context;
+  @Mock private LeafReaderContext context;
 
   @Test
   void can_execute_expression_with_integer_field() {
     assertThat()
         .docValues("age", 30L) // DocValue only supports long
-        .evaluate(
-            DSL.abs(ref("age", INTEGER)))
+        .evaluate(DSL.abs(ref("age", INTEGER)))
         .shouldMatch(30);
   }
 
@@ -61,8 +63,7 @@ void can_execute_expression_with_integer_field() {
   void can_execute_expression_with_integer_field_with_boolean_result() {
     assertThat()
         .docValues("age", 30L) // DocValue only supports long
-        .evaluate(
-            DSL.greater(ref("age", INTEGER), literal(20)))
+        .evaluate(DSL.greater(ref("age", INTEGER), literal(20)))
         .shouldMatch(true);
   }
 
@@ -71,35 +72,79 @@ void can_execute_expression_with_text_keyword_field() {
     assertThat()
         .docValues("name.keyword", "John")
         .evaluate(
-            DSL.equal(ref("name", OPENSEARCH_TEXT_KEYWORD), literal("John")))
+            DSL.equal(
+                ref(
+                    "name",
+                    OpenSearchTextType.of(
+                        Map.of(
+                            "words",
+                            OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword)))),
+                literal("John")))
         .shouldMatch(true);
   }
 
   @Test
   void can_execute_expression_with_null_field() {
-    assertThat()
-        .docValues("age", null)
-        .evaluate(ref("age", INTEGER))
-        .shouldMatch(null);
+    assertThat().docValues("age", null).evaluate(ref("age", INTEGER)).shouldMatch(null);
   }
 
   @Test
   void can_execute_expression_with_missing_field() {
-    assertThat()
-        .docValues("age", 30)
-        .evaluate(ref("name", STRING))
-        .shouldMatch(null);
+    assertThat().docValues("age", 30).evaluate(ref("name", STRING)).shouldMatch(null);
   }
 
   @Test
   void can_execute_parse_expression() {
     assertThat()
         .docValues("age_string", "age: 30")
-        .evaluate(DSL.regex(DSL.ref("age_string", STRING), DSL.literal("age: (?<age>\\d+)"),
-            DSL.literal("age")))
+        .evaluate(
+            DSL.regex(
+                DSL.ref("age_string", STRING),
+                DSL.literal("age: (?<age>\\d+)"),
+                DSL.literal("age")))
         .shouldMatch("30");
   }
 
+  @Test
+  void can_execute_expression_interpret_dates_for_aggregation() {
+    assertThat()
+        .docValues("date", "1961-04-12")
+        .evaluate(DSL.date(ref("date", STRING)))
+        .shouldMatch(new ExprDateValue(LocalDate.of(1961, 4, 12)).timestampValue().toEpochMilli());
+  }
+
+  @Test
+  void can_execute_expression_interpret_datetimes_for_aggregation() {
+    assertThat()
+        .docValues("datetime", "1984-03-17 22:16:42")
+        .evaluate(DSL.datetime(ref("datetime", STRING)))
+        .shouldMatch(new ExprDatetimeValue("1984-03-17 22:16:42").timestampValue().toEpochMilli());
+  }
+
+  @Test
+  void can_execute_expression_interpret_times_for_aggregation() {
+    assertThat()
+        .docValues("time", "22:13:42")
+        .evaluate(DSL.time(ref("time", STRING)))
+        .shouldMatch(MILLIS.between(LocalTime.MIN, LocalTime.of(22, 13, 42)));
+  }
+
+  @Test
+  void can_execute_expression_interpret_timestamps_for_aggregation() {
+    assertThat()
+        .docValues("timestamp", "1984-03-17 22:16:42")
+        .evaluate(DSL.timestamp(ref("timestamp", STRING)))
+        .shouldMatch(new ExprTimestampValue("1984-03-17 22:16:42").timestampValue().toEpochMilli());
+  }
+
+  @Test
+  void can_execute_expression_interpret_non_core_type_for_aggregation() {
+    assertThat()
+        .docValues("text", "pewpew")
+        .evaluate(ref("text", OpenSearchTextType.of()))
+        .shouldMatch("pewpew");
+  }
+
   private ExprScriptAssertion assertThat() {
     return new ExprScriptAssertion(lookup, leafLookup, context);
   }
@@ -116,20 +161,20 @@ ExprScriptAssertion docValues() {
     }
 
     ExprScriptAssertion docValues(String name, Object value) {
-      LeafDocLookup leafDocLookup = mockLeafDocLookup(
-          ImmutableMap.of(name, new FakeScriptDocValues<>(value)));
+      LeafDocLookup leafDocLookup =
+          mockLeafDocLookup(ImmutableMap.of(name, new FakeScriptDocValues<>(value)));
 
       when(lookup.getLeafSearchLookup(any())).thenReturn(leafLookup);
       when(leafLookup.doc()).thenReturn(leafDocLookup);
       return this;
     }
 
-    ExprScriptAssertion docValues(String name1, Object value1,
-                                  String name2, Object value2) {
-      LeafDocLookup leafDocLookup = mockLeafDocLookup(
-          ImmutableMap.of(
-              name1, new FakeScriptDocValues<>(value1),
-              name2, new FakeScriptDocValues<>(value2)));
+    ExprScriptAssertion docValues(String name1, Object value1, String name2, Object value2) {
+      LeafDocLookup leafDocLookup =
+          mockLeafDocLookup(
+              ImmutableMap.of(
+                  name1, new FakeScriptDocValues<>(value1),
+                  name2, new FakeScriptDocValues<>(value2)));
 
       when(lookup.getLeafSearchLookup(any())).thenReturn(leafLookup);
       when(leafLookup.doc()).thenReturn(leafDocLookup);
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/GroupSortOrderTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/GroupSortOrderTest.java
index bff04604c1..2ab8a24d68 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/GroupSortOrderTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/GroupSortOrderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -28,10 +27,12 @@ class GroupSortOrderTest {
 
   private final AggregationQueryBuilder.GroupSortOrder groupSortOrder =
       new AggregationQueryBuilder.GroupSortOrder(
-          sort(ref("name", STRING), Sort.SortOption.DEFAULT_DESC,
-              ref("age", INTEGER), Sort.SortOption.DEFAULT_ASC));
-  @Mock
-  private ReferenceExpression ref;
+          sort(
+              ref("name", STRING),
+              Sort.SortOption.DEFAULT_DESC,
+              ref("age", INTEGER),
+              Sort.SortOption.DEFAULT_ASC));
+  @Mock private ReferenceExpression ref;
 
   @Test
   void both_expression_in_sort_list() {
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/BucketAggregationBuilderTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/BucketAggregationBuilderTest.java
index 9f21a145ed..998f0b4f87 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/BucketAggregationBuilderTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/BucketAggregationBuilderTest.java
@@ -3,20 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation.dsl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
-import static org.opensearch.common.xcontent.ToXContent.EMPTY_PARAMS;
+import static org.opensearch.core.xcontent.ToXContent.EMPTY_PARAMS;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.expression.DSL.literal;
 import static org.opensearch.sql.expression.DSL.named;
 import static org.opensearch.sql.expression.DSL.ref;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.tuple.Triple;
 import org.junit.jupiter.api.BeforeEach;
@@ -24,26 +24,31 @@
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.search.aggregations.bucket.composite.CompositeValuesSourceBuilder;
 import org.opensearch.search.aggregations.bucket.missing.MissingOrder;
 import org.opensearch.search.sort.SortOrder;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.parse.ParseExpression;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDateType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.storage.serialization.ExpressionSerializer;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @ExtendWith(MockitoExtension.class)
 class BucketAggregationBuilderTest {
 
-  @Mock
-  private ExpressionSerializer serializer;
+  @Mock private ExpressionSerializer serializer;
 
   private BucketAggregationBuilder aggregationBuilder;
 
@@ -63,9 +68,26 @@ void should_build_bucket_with_field() {
             + "    \"order\" : \"asc\"\n"
             + "  }\n"
             + "}",
-        buildQuery(
-            Arrays.asList(
-                asc(named("age", ref("age", INTEGER))))));
+        buildQuery(Arrays.asList(asc(named("age", ref("age", INTEGER))))));
+  }
+
+  @Test
+  void should_build_bucket_with_literal() {
+    var literal = literal(1);
+    when(serializer.serialize(literal)).thenReturn("mock-serialize");
+    assertEquals(
+        "{\n"
+            + "  \"terms\" : {\n"
+            + "    \"script\" : {\n"
+            + "      \"source\" : \"mock-serialize\",\n"
+            + "      \"lang\" : \"opensearch_query_expression\"\n"
+            + "    },\n"
+            + "    \"missing_bucket\" : true,\n"
+            + "    \"missing_order\" : \"first\",\n"
+            + "    \"order\" : \"asc\"\n"
+            + "  }\n"
+            + "}",
+        buildQuery(Arrays.asList(asc(named(literal)))));
   }
 
   @Test
@@ -81,7 +103,16 @@ void should_build_bucket_with_keyword_field() {
             + "}",
         buildQuery(
             Arrays.asList(
-                asc(named("name", ref("name", OPENSEARCH_TEXT_KEYWORD))))));
+                asc(
+                    named(
+                        "name",
+                        ref(
+                            "name",
+                            OpenSearchTextType.of(
+                                Map.of(
+                                    "words",
+                                    OpenSearchDataType.of(
+                                        OpenSearchDataType.MappingType.Keyword)))))))));
   }
 
   @Test
@@ -101,15 +132,64 @@ void should_build_bucket_with_parse_expression() {
             + "    \"order\" : \"asc\"\n"
             + "  }\n"
             + "}",
-        buildQuery(
-            Arrays.asList(
-                asc(named("name", parseExpression)))));
+        buildQuery(Arrays.asList(asc(named("name", parseExpression)))));
+  }
+
+  @Test
+  void terms_bucket_for_opensearchdate_type_uses_long() {
+    OpenSearchDateType dataType = OpenSearchDateType.of(ExprCoreType.TIMESTAMP);
+
+    assertEquals(
+        "{\n"
+            + "  \"terms\" : {\n"
+            + "    \"field\" : \"date\",\n"
+            + "    \"missing_bucket\" : true,\n"
+            + "    \"value_type\" : \"long\",\n"
+            + "    \"missing_order\" : \"first\",\n"
+            + "    \"order\" : \"asc\"\n"
+            + "  }\n"
+            + "}",
+        buildQuery(Arrays.asList(asc(named("date", ref("date", dataType))))));
+  }
+
+  @Test
+  void terms_bucket_for_opensearchdate_type_uses_long_false() {
+    OpenSearchDateType dataType = OpenSearchDateType.of(STRING);
+
+    assertEquals(
+        "{\n"
+            + "  \"terms\" : {\n"
+            + "    \"field\" : \"date\",\n"
+            + "    \"missing_bucket\" : true,\n"
+            + "    \"missing_order\" : \"first\",\n"
+            + "    \"order\" : \"asc\"\n"
+            + "  }\n"
+            + "}",
+        buildQuery(Arrays.asList(asc(named("date", ref("date", dataType))))));
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @EnumSource(
+      value = ExprCoreType.class,
+      names = {"TIMESTAMP", "TIME", "DATE", "DATETIME"})
+  void terms_bucket_for_datetime_types_uses_long(ExprType dataType) {
+    assertEquals(
+        "{\n"
+            + "  \"terms\" : {\n"
+            + "    \"field\" : \"date\",\n"
+            + "    \"missing_bucket\" : true,\n"
+            + "    \"value_type\" : \"long\",\n"
+            + "    \"missing_order\" : \"first\",\n"
+            + "    \"order\" : \"asc\"\n"
+            + "  }\n"
+            + "}",
+        buildQuery(Arrays.asList(asc(named("date", ref("date", dataType))))));
   }
 
   @SneakyThrows
   private String buildQuery(
       List<Triple<NamedExpression, SortOrder, MissingOrder>> groupByExpressions) {
-    XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON).prettyPrint();
+    XContentBuilder builder = XContentFactory.jsonBuilder().prettyPrint();
     builder.startObject();
     CompositeValuesSourceBuilder<?> sourceBuilder =
         aggregationBuilder.build(groupByExpressions).get(0);
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java
index 94f152f913..6d792dec25 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.aggregation.dsl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -11,6 +10,7 @@
 import static org.mockito.Mockito.when;
 import static org.opensearch.sql.common.utils.StringUtils.format;
 import static org.opensearch.sql.data.type.ExprCoreType.ARRAY;
+import static org.opensearch.sql.data.type.ExprCoreType.DOUBLE;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 import static org.opensearch.sql.expression.DSL.literal;
@@ -40,6 +40,7 @@
 import org.opensearch.sql.expression.aggregation.MaxAggregator;
 import org.opensearch.sql.expression.aggregation.MinAggregator;
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
+import org.opensearch.sql.expression.aggregation.PercentileApproximateAggregator;
 import org.opensearch.sql.expression.aggregation.SumAggregator;
 import org.opensearch.sql.expression.aggregation.TakeAggregator;
 import org.opensearch.sql.expression.function.FunctionName;
@@ -49,11 +50,9 @@
 @ExtendWith(MockitoExtension.class)
 class MetricAggregationBuilderTest {
 
-  @Mock
-  private ExpressionSerializer serializer;
+  @Mock private ExpressionSerializer serializer;
 
-  @Mock
-  private NamedAggregator aggregator;
+  @Mock private NamedAggregator aggregator;
 
   private MetricAggregationBuilder aggregationBuilder;
 
@@ -64,299 +63,420 @@ void set_up() {
 
   @Test
   void should_build_avg_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"avg(age)\" : {%n"
-            + "    \"avg\" : {%n"
-            + "      \"field\" : \"age\"%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"avg(age)\" : {%n"
+                + "    \"avg\" : {%n"
+                + "      \"field\" : \"age\"%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("avg(age)",
-                    new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
+                named(
+                    "avg(age)", new AvgAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
   }
 
   @Test
   void should_build_sum_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"sum(age)\" : {%n"
-            + "    \"sum\" : {%n"
-            + "      \"field\" : \"age\"%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"sum(age)\" : {%n"
+                + "    \"sum\" : {%n"
+                + "      \"field\" : \"age\"%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("sum(age)",
-                    new SumAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
+                named(
+                    "sum(age)", new SumAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
   }
 
   @Test
   void should_build_count_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"count(age)\" : {%n"
-            + "    \"value_count\" : {%n"
-            + "      \"field\" : \"age\"%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"count(age)\" : {%n"
+                + "    \"value_count\" : {%n"
+                + "      \"field\" : \"age\"%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("count(age)",
+                named(
+                    "count(age)",
                     new CountAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
   }
 
   @Test
   void should_build_count_star_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"count(*)\" : {%n"
-            + "    \"value_count\" : {%n"
-            + "      \"field\" : \"_index\"%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"count(*)\" : {%n"
+                + "    \"value_count\" : {%n"
+                + "      \"field\" : \"_index\"%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("count(*)",
-                    new CountAggregator(Arrays.asList(literal("*")), INTEGER)))));
+                named("count(*)", new CountAggregator(Arrays.asList(literal("*")), INTEGER)))));
   }
 
   @Test
   void should_build_count_other_literal_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"count(1)\" : {%n"
-            + "    \"value_count\" : {%n"
-            + "      \"field\" : \"_index\"%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"count(1)\" : {%n"
+                + "    \"value_count\" : {%n"
+                + "      \"field\" : \"_index\"%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("count(1)",
-                    new CountAggregator(Arrays.asList(literal(1)), INTEGER)))));
+                named("count(1)", new CountAggregator(Arrays.asList(literal(1)), INTEGER)))));
   }
 
   @Test
   void should_build_min_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"min(age)\" : {%n"
-            + "    \"min\" : {%n"
-            + "      \"field\" : \"age\"%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"min(age)\" : {%n"
+                + "    \"min\" : {%n"
+                + "      \"field\" : \"age\"%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("min(age)",
-                    new MinAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
+                named(
+                    "min(age)", new MinAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
   }
 
   @Test
   void should_build_max_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"max(age)\" : {%n"
-            + "    \"max\" : {%n"
-            + "      \"field\" : \"age\"%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"max(age)\" : {%n"
+                + "    \"max\" : {%n"
+                + "      \"field\" : \"age\"%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("max(age)",
-                    new MaxAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
+                named(
+                    "max(age)", new MaxAggregator(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
   }
 
   @Test
   void should_build_varPop_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"var_pop(age)\" : {%n"
-            + "    \"extended_stats\" : {%n"
-            + "      \"field\" : \"age\",%n"
-            + "      \"sigma\" : 2.0%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"var_pop(age)\" : {%n"
+                + "    \"extended_stats\" : {%n"
+                + "      \"field\" : \"age\",%n"
+                + "      \"sigma\" : 2.0%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("var_pop(age)",
+                named(
+                    "var_pop(age)",
                     variancePopulation(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
   }
 
   @Test
   void should_build_varSamp_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"var_samp(age)\" : {%n"
-            + "    \"extended_stats\" : {%n"
-            + "      \"field\" : \"age\",%n"
-            + "      \"sigma\" : 2.0%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"var_samp(age)\" : {%n"
+                + "    \"extended_stats\" : {%n"
+                + "      \"field\" : \"age\",%n"
+                + "      \"sigma\" : 2.0%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("var_samp(age)",
+                named(
+                    "var_samp(age)",
                     varianceSample(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
   }
 
+  @Test
+  void should_build_percentile_aggregation() {
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"percentile(age, 50)\" : {%n"
+                + "    \"percentiles\" : {%n"
+                + "      \"field\" : \"age\",%n"
+                + "      \"percents\" : [ 50.0 ],%n"
+                + "      \"keyed\" : true,%n"
+                + "      \"tdigest\" : {%n"
+                + "        \"compression\" : 100.0%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
+        buildQuery(
+            Arrays.asList(
+                named(
+                    "percentile(age, 50)",
+                    new PercentileApproximateAggregator(
+                        Arrays.asList(ref("age", INTEGER), literal(50)), DOUBLE)))));
+  }
+
+  @Test
+  void should_build_percentile_with_compression_aggregation() {
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"percentile(age, 50)\" : {%n"
+                + "    \"percentiles\" : {%n"
+                + "      \"field\" : \"age\",%n"
+                + "      \"percents\" : [ 50.0 ],%n"
+                + "      \"keyed\" : true,%n"
+                + "      \"tdigest\" : {%n"
+                + "        \"compression\" : 0.1%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
+        buildQuery(
+            Arrays.asList(
+                named(
+                    "percentile(age, 50)",
+                    new PercentileApproximateAggregator(
+                        Arrays.asList(ref("age", INTEGER), literal(50), literal(0.1)), DOUBLE)))));
+  }
+
+  @Test
+  void should_build_filtered_percentile_aggregation() {
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"percentile(age, 50)\" : {%n"
+                + "    \"filter\" : {%n"
+                + "      \"range\" : {%n"
+                + "        \"age\" : {%n"
+                + "          \"from\" : 30,%n"
+                + "          \"to\" : null,%n"
+                + "          \"include_lower\" : false,%n"
+                + "          \"include_upper\" : true,%n"
+                + "          \"boost\" : 1.0%n"
+                + "        }%n"
+                + "      }%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"percentile(age, 50)\" : {%n"
+                + "        \"percentiles\" : {%n"
+                + "          \"field\" : \"age\",%n"
+                + "          \"percents\" : [ 50.0 ],%n"
+                + "          \"keyed\" : true,%n"
+                + "          \"tdigest\" : {%n"
+                + "            \"compression\" : 100.0%n"
+                + "          }%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
+        buildQuery(
+            Arrays.asList(
+                named(
+                    "percentile(age, 50)",
+                    new PercentileApproximateAggregator(
+                            Arrays.asList(ref("age", INTEGER), literal(50)), DOUBLE)
+                        .condition(DSL.greater(ref("age", INTEGER), literal(30)))))));
+  }
+
   @Test
   void should_build_stddevPop_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"stddev_pop(age)\" : {%n"
-            + "    \"extended_stats\" : {%n"
-            + "      \"field\" : \"age\",%n"
-            + "      \"sigma\" : 2.0%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"stddev_pop(age)\" : {%n"
+                + "    \"extended_stats\" : {%n"
+                + "      \"field\" : \"age\",%n"
+                + "      \"sigma\" : 2.0%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("stddev_pop(age)",
+                named(
+                    "stddev_pop(age)",
                     stddevPopulation(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
   }
 
   @Test
   void should_build_stddevSamp_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"stddev_samp(age)\" : {%n"
-            + "    \"extended_stats\" : {%n"
-            + "      \"field\" : \"age\",%n"
-            + "      \"sigma\" : 2.0%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"stddev_samp(age)\" : {%n"
+                + "    \"extended_stats\" : {%n"
+                + "      \"field\" : \"age\",%n"
+                + "      \"sigma\" : 2.0%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
             Arrays.asList(
-                named("stddev_samp(age)",
+                named(
+                    "stddev_samp(age)",
                     stddevSample(Arrays.asList(ref("age", INTEGER)), INTEGER)))));
   }
 
   @Test
   void should_build_cardinality_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"count(distinct name)\" : {%n"
-            + "    \"cardinality\" : {%n"
-            + "      \"field\" : \"name\"%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"count(distinct name)\" : {%n"
+                + "    \"cardinality\" : {%n"
+                + "      \"field\" : \"name\"%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
-            Collections.singletonList(named("count(distinct name)", new CountAggregator(
-                Collections.singletonList(ref("name", STRING)), INTEGER).distinct(true)))));
+            Collections.singletonList(
+                named(
+                    "count(distinct name)",
+                    new CountAggregator(Collections.singletonList(ref("name", STRING)), INTEGER)
+                        .distinct(true)))));
   }
 
   @Test
   void should_build_filtered_cardinality_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"count(distinct name) filter(where age > 30)\" : {%n"
-            + "    \"filter\" : {%n"
-            + "      \"range\" : {%n"
-            + "        \"age\" : {%n"
-            + "          \"from\" : 30,%n"
-            + "          \"to\" : null,%n"
-            + "          \"include_lower\" : false,%n"
-            + "          \"include_upper\" : true,%n"
-            + "          \"boost\" : 1.0%n"
-            + "        }%n"
-            + "      }%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"count(distinct name) filter(where age > 30)\" : {%n"
-            + "        \"cardinality\" : {%n"
-            + "          \"field\" : \"name\"%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
-        buildQuery(Collections.singletonList(named(
-            "count(distinct name) filter(where age > 30)",
-            new CountAggregator(Collections.singletonList(ref("name", STRING)), INTEGER)
-                .condition(DSL.greater(ref("age", INTEGER), literal(30)))
-                .distinct(true)))));
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"count(distinct name) filter(where age > 30)\" : {%n"
+                + "    \"filter\" : {%n"
+                + "      \"range\" : {%n"
+                + "        \"age\" : {%n"
+                + "          \"from\" : 30,%n"
+                + "          \"to\" : null,%n"
+                + "          \"include_lower\" : false,%n"
+                + "          \"include_upper\" : true,%n"
+                + "          \"boost\" : 1.0%n"
+                + "        }%n"
+                + "      }%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"count(distinct name) filter(where age > 30)\" : {%n"
+                + "        \"cardinality\" : {%n"
+                + "          \"field\" : \"name\"%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
+        buildQuery(
+            Collections.singletonList(
+                named(
+                    "count(distinct name) filter(where age > 30)",
+                    new CountAggregator(Collections.singletonList(ref("name", STRING)), INTEGER)
+                        .condition(DSL.greater(ref("age", INTEGER), literal(30)))
+                        .distinct(true)))));
   }
 
   @Test
   void should_build_top_hits_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"take(name, 10)\" : {%n"
-            + "    \"top_hits\" : {%n"
-            + "      \"from\" : 0,%n"
-            + "      \"size\" : 10,%n"
-            + "      \"version\" : false,%n"
-            + "      \"seq_no_primary_term\" : false,%n"
-            + "      \"explain\" : false,%n"
-            + "      \"_source\" : {%n"
-            + "        \"includes\" : [ \"name\" ],%n"
-            + "        \"excludes\" : [ ]%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"take(name, 10)\" : {%n"
+                + "    \"top_hits\" : {%n"
+                + "      \"from\" : 0,%n"
+                + "      \"size\" : 10,%n"
+                + "      \"version\" : false,%n"
+                + "      \"seq_no_primary_term\" : false,%n"
+                + "      \"explain\" : false,%n"
+                + "      \"_source\" : {%n"
+                + "        \"includes\" : [ \"name\" ],%n"
+                + "        \"excludes\" : [ ]%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
         buildQuery(
-            Collections.singletonList(named("take(name, 10)", new TakeAggregator(
-                ImmutableList.of(ref("name", STRING), literal(10)), ARRAY)))));
+            Collections.singletonList(
+                named(
+                    "take(name, 10)",
+                    new TakeAggregator(
+                        ImmutableList.of(ref("name", STRING), literal(10)), ARRAY)))));
   }
 
   @Test
   void should_build_filtered_top_hits_aggregation() {
-    assertEquals(format(
-        "{%n"
-            + "  \"take(name, 10) filter(where age > 30)\" : {%n"
-            + "    \"filter\" : {%n"
-            + "      \"range\" : {%n"
-            + "        \"age\" : {%n"
-            + "          \"from\" : 30,%n"
-            + "          \"to\" : null,%n"
-            + "          \"include_lower\" : false,%n"
-            + "          \"include_upper\" : true,%n"
-            + "          \"boost\" : 1.0%n"
-            + "        }%n"
-            + "      }%n"
-            + "    },%n"
-            + "    \"aggregations\" : {%n"
-            + "      \"take(name, 10) filter(where age > 30)\" : {%n"
-            + "        \"top_hits\" : {%n"
-            + "          \"from\" : 0,%n"
-            + "          \"size\" : 10,%n"
-            + "          \"version\" : false,%n"
-            + "          \"seq_no_primary_term\" : false,%n"
-            + "          \"explain\" : false,%n"
-            + "          \"_source\" : {%n"
-            + "            \"includes\" : [ \"name\" ],%n"
-            + "            \"excludes\" : [ ]%n"
-            + "          }%n"
-            + "        }%n"
-            + "      }%n"
-            + "    }%n"
-            + "  }%n"
-            + "}"),
-        buildQuery(Collections.singletonList(named(
-            "take(name, 10) filter(where age > 30)",
-            new TakeAggregator(
-                ImmutableList.of(ref("name", STRING), literal(10)), ARRAY)
-                .condition(DSL.greater(ref("age", INTEGER), literal(30)))))));
+    assertEquals(
+        format(
+            "{%n"
+                + "  \"take(name, 10) filter(where age > 30)\" : {%n"
+                + "    \"filter\" : {%n"
+                + "      \"range\" : {%n"
+                + "        \"age\" : {%n"
+                + "          \"from\" : 30,%n"
+                + "          \"to\" : null,%n"
+                + "          \"include_lower\" : false,%n"
+                + "          \"include_upper\" : true,%n"
+                + "          \"boost\" : 1.0%n"
+                + "        }%n"
+                + "      }%n"
+                + "    },%n"
+                + "    \"aggregations\" : {%n"
+                + "      \"take(name, 10) filter(where age > 30)\" : {%n"
+                + "        \"top_hits\" : {%n"
+                + "          \"from\" : 0,%n"
+                + "          \"size\" : 10,%n"
+                + "          \"version\" : false,%n"
+                + "          \"seq_no_primary_term\" : false,%n"
+                + "          \"explain\" : false,%n"
+                + "          \"_source\" : {%n"
+                + "            \"includes\" : [ \"name\" ],%n"
+                + "            \"excludes\" : [ ]%n"
+                + "          }%n"
+                + "        }%n"
+                + "      }%n"
+                + "    }%n"
+                + "  }%n"
+                + "}"),
+        buildQuery(
+            Collections.singletonList(
+                named(
+                    "take(name, 10) filter(where age > 30)",
+                    new TakeAggregator(ImmutableList.of(ref("name", STRING), literal(10)), ARRAY)
+                        .condition(DSL.greater(ref("age", INTEGER), literal(30)))))));
   }
 
   @Test
   void should_throw_exception_for_unsupported_distinct_aggregator() {
-    assertThrows(IllegalStateException.class,
-        () -> buildQuery(Collections.singletonList(named("avg(distinct age)", new AvgAggregator(
-            Collections.singletonList(ref("name", STRING)), STRING).distinct(true)))),
+    assertThrows(
+        IllegalStateException.class,
+        () ->
+            buildQuery(
+                Collections.singletonList(
+                    named(
+                        "avg(distinct age)",
+                        new AvgAggregator(Collections.singletonList(ref("name", STRING)), STRING)
+                            .distinct(true)))),
         "unsupported distinct aggregator avg");
   }
 
@@ -366,7 +486,8 @@ void should_throw_exception_for_unsupported_aggregator() {
     when(aggregator.getArguments()).thenReturn(Arrays.asList(ref("age", INTEGER)));
 
     IllegalStateException exception =
-        assertThrows(IllegalStateException.class,
+        assertThrows(
+            IllegalStateException.class,
             () -> buildQuery(Arrays.asList(named("unsupported_agg(age)", aggregator))));
     assertEquals("unsupported aggregator unsupported_agg", exception.getMessage());
   }
@@ -374,19 +495,23 @@ void should_throw_exception_for_unsupported_aggregator() {
   @Test
   void should_throw_exception_for_unsupported_exception() {
     IllegalStateException exception =
-        assertThrows(IllegalStateException.class, () -> buildQuery(Arrays.asList(
-            named("count(age)",
-                new CountAggregator(Arrays.asList(named("age", ref("age", INTEGER))), INTEGER)))));
-    assertEquals(
-        "metric aggregation doesn't support expression age",
-        exception.getMessage());
+        assertThrows(
+            IllegalStateException.class,
+            () ->
+                buildQuery(
+                    Arrays.asList(
+                        named(
+                            "count(age)",
+                            new CountAggregator(
+                                Arrays.asList(named("age", ref("age", INTEGER))), INTEGER)))));
+    assertEquals("metric aggregation doesn't support expression age", exception.getMessage());
   }
 
   @SneakyThrows
   private String buildQuery(List<NamedAggregator> namedAggregatorList) {
     ObjectMapper objectMapper = new ObjectMapper();
-    return objectMapper.readTree(
-            aggregationBuilder.build(namedAggregatorList).getLeft().toString())
+    return objectMapper
+        .readTree(aggregationBuilder.build(namedAggregatorList).getLeft().toString())
         .toPrettyString();
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptFactoryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptFactoryTest.java
index 3c927c9a0b..d2d349c14b 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptFactoryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptFactoryTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -30,14 +29,11 @@
 @ExtendWith(MockitoExtension.class)
 class ExpressionFilterScriptFactoryTest {
 
-  @Mock
-  private SearchLookup searchLookup;
+  @Mock private SearchLookup searchLookup;
 
-  @Mock
-  private LeafSearchLookup leafSearchLookup;
+  @Mock private LeafSearchLookup leafSearchLookup;
 
-  @Mock
-  private LeafReaderContext leafReaderContext;
+  @Mock private LeafReaderContext leafReaderContext;
 
   private final Expression expression = DSL.literal(true);
 
@@ -59,8 +55,6 @@ void can_initialize_expression_filter_script() throws IOException {
 
     assertEquals(
         new ExpressionFilterScript(expression, searchLookup, leafReaderContext, params),
-        actualFilterScript
-    );
+        actualFilterScript);
   }
-
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptTest.java
index ee63c2f0c0..cca51c8f4a 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/ExpressionFilterScriptTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter;
 
 import static java.util.Collections.emptyList;
@@ -15,13 +14,15 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.opensearch.sql.data.type.ExprCoreType.DATE;
+import static org.opensearch.sql.data.type.ExprCoreType.DATETIME;
 import static org.opensearch.sql.data.type.ExprCoreType.FLOAT;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.data.type.ExprCoreType.TIME;
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
 import static org.opensearch.sql.expression.DSL.literal;
 import static org.opensearch.sql.expression.DSL.ref;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
 
 import com.google.common.collect.ImmutableMap;
 import java.time.ZonedDateTime;
@@ -40,46 +41,40 @@
 import org.opensearch.search.lookup.LeafDocLookup;
 import org.opensearch.search.lookup.LeafSearchLookup;
 import org.opensearch.search.lookup.SearchLookup;
+import org.opensearch.sql.data.model.ExprDateValue;
+import org.opensearch.sql.data.model.ExprTimeValue;
 import org.opensearch.sql.data.model.ExprTimestampValue;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.LiteralExpression;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @ExtendWith(MockitoExtension.class)
 class ExpressionFilterScriptTest {
 
-  @Mock
-  private SearchLookup lookup;
+  @Mock private SearchLookup lookup;
 
-  @Mock
-  private LeafSearchLookup leafLookup;
+  @Mock private LeafSearchLookup leafLookup;
 
-  @Mock
-  private LeafReaderContext context;
+  @Mock private LeafReaderContext context;
 
   @Test
   void should_match_if_true_literal() {
-    assertThat()
-        .docValues()
-        .filterBy(literal(true))
-        .shouldMatch();
+    assertThat().docValues().filterBy(literal(true)).shouldMatch();
   }
 
   @Test
   void should_not_match_if_false_literal() {
-    assertThat()
-        .docValues()
-        .filterBy(literal(false))
-        .shouldNotMatch();
+    assertThat().docValues().filterBy(literal(false)).shouldNotMatch();
   }
 
   @Test
   void can_execute_expression_with_integer_field() {
     assertThat()
         .docValues("age", 30L) // DocValue only supports long
-        .filterBy(
-            DSL.greater(ref("age", INTEGER), literal(20)))
+        .filterBy(DSL.greater(ref("age", INTEGER), literal(20)))
         .shouldMatch();
   }
 
@@ -88,7 +83,14 @@ void can_execute_expression_with_text_keyword_field() {
     assertThat()
         .docValues("name.keyword", "John")
         .filterBy(
-            DSL.equal(ref("name", OPENSEARCH_TEXT_KEYWORD), literal("John")))
+            DSL.equal(
+                ref(
+                    "name",
+                    OpenSearchTextType.of(
+                        Map.of(
+                            "words",
+                            OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword)))),
+                literal("John")))
         .shouldMatch();
   }
 
@@ -106,7 +108,7 @@ void can_execute_expression_with_float_field() {
   }
 
   @Test
-  void can_execute_expression_with_date_field() {
+  void can_execute_expression_with_timestamp_field() {
     ExprTimestampValue ts = new ExprTimestampValue("2020-08-04 10:00:00");
     assertThat()
         .docValues("birthday", ZonedDateTime.parse("2020-08-04T10:00:00Z"))
@@ -115,35 +117,59 @@ void can_execute_expression_with_date_field() {
   }
 
   @Test
-  void can_execute_expression_with_missing_field() {
+  void can_execute_expression_with_datetime_field() {
+    ExprTimestampValue ts = new ExprTimestampValue("2020-08-04 10:00:00");
     assertThat()
-        .docValues("age", 30)
-        .filterBy(ref("name", STRING))
-        .shouldNotMatch();
+        .docValues("birthday", ZonedDateTime.parse("2020-08-04T10:00:00Z"))
+        .filterBy(DSL.equal(ref("birthday", DATETIME), new LiteralExpression(ts)))
+        .shouldMatch();
   }
 
   @Test
-  void can_execute_expression_with_empty_doc_value() {
+  void can_execute_expression_with_date_field() {
+    ExprDateValue date = new ExprDateValue("2020-08-04");
+    assertThat()
+        .docValues("birthday", "2020-08-04")
+        .filterBy(DSL.equal(ref("birthday", DATE), new LiteralExpression(date)))
+        .shouldMatch();
+  }
+
+  @Test
+  void can_execute_expression_with_time_field() {
+    ExprTimeValue time = new ExprTimeValue("10:00:01");
     assertThat()
-        .docValues("name", emptyList())
-        .filterBy(ref("name", STRING))
-        .shouldNotMatch();
+        .docValues("birthday", "10:00:01")
+        .filterBy(DSL.equal(ref("birthday", TIME), new LiteralExpression(time)))
+        .shouldMatch();
+  }
+
+  @Test
+  void can_execute_expression_with_missing_field() {
+    assertThat().docValues("age", 30).filterBy(ref("name", STRING)).shouldNotMatch();
+  }
+
+  @Test
+  void can_execute_expression_with_empty_doc_value() {
+    assertThat().docValues("name", emptyList()).filterBy(ref("name", STRING)).shouldNotMatch();
   }
 
   @Test
   void can_execute_parse_expression() {
     assertThat()
         .docValues("age_string", "age: 30")
-        .filterBy(DSL.equal(
-            DSL.regex(DSL.ref("age_string", STRING), literal("age: (?<age>\\d+)"), literal("age")),
-            literal("30")))
+        .filterBy(
+            DSL.equal(
+                DSL.regex(
+                    DSL.ref("age_string", STRING), literal("age: (?<age>\\d+)"), literal("age")),
+                literal("30")))
         .shouldMatch();
   }
 
   @Test
   void cannot_execute_non_predicate_expression() {
-    assertThrow(IllegalStateException.class,
-                "Expression has wrong result type instead of boolean: expression [10], result [10]")
+    assertThrow(
+            IllegalStateException.class,
+            "Expression has wrong result type instead of boolean: expression [10], result [10]")
         .docValues()
         .filterBy(literal(10));
   }
@@ -152,8 +178,7 @@ private ExprScriptAssertion assertThat() {
     return new ExprScriptAssertion(lookup, leafLookup, context);
   }
 
-  private <T extends Throwable> ExprScriptAssertion assertThrow(Class<T> clazz,
-                                                                String message) {
+  private <T extends Throwable> ExprScriptAssertion assertThrow(Class<T> clazz, String message) {
     return new ExprScriptAssertion(lookup, leafLookup, context) {
       @Override
       ExprScriptAssertion filterBy(Expression expr) {
@@ -176,20 +201,20 @@ ExprScriptAssertion docValues() {
     }
 
     ExprScriptAssertion docValues(String name, Object value) {
-      LeafDocLookup leafDocLookup = mockLeafDocLookup(
-          ImmutableMap.of(name, new FakeScriptDocValues<>(value)));
+      LeafDocLookup leafDocLookup =
+          mockLeafDocLookup(ImmutableMap.of(name, new FakeScriptDocValues<>(value)));
 
       when(lookup.getLeafSearchLookup(any())).thenReturn(leafLookup);
       when(leafLookup.doc()).thenReturn(leafDocLookup);
       return this;
     }
 
-    ExprScriptAssertion docValues(String name1, Object value1,
-                                  String name2, Object value2) {
-      LeafDocLookup leafDocLookup = mockLeafDocLookup(
-          ImmutableMap.of(
-              name1, new FakeScriptDocValues<>(value1),
-              name2, new FakeScriptDocValues<>(value2)));
+    ExprScriptAssertion docValues(String name1, Object value1, String name2, Object value2) {
+      LeafDocLookup leafDocLookup =
+          mockLeafDocLookup(
+              ImmutableMap.of(
+                  name1, new FakeScriptDocValues<>(value1),
+                  name2, new FakeScriptDocValues<>(value2)));
 
       when(lookup.getLeafSearchLookup(any())).thenReturn(leafLookup);
       when(leafLookup.doc()).thenReturn(leafDocLookup);
@@ -241,5 +266,4 @@ public int size() {
       return values.size();
     }
   }
-
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilderTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilderTest.java
index f3e4fe7afd..60e7e3cb8d 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilderTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,7 +24,6 @@
 import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;
 import static org.opensearch.sql.expression.DSL.literal;
 import static org.opensearch.sql.expression.DSL.ref;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.LinkedHashMap;
@@ -41,6 +39,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.common.utils.StringUtils;
 import org.opensearch.sql.data.model.ExprDateValue;
 import org.opensearch.sql.data.model.ExprDatetimeValue;
@@ -53,6 +52,9 @@
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.LiteralExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.storage.serialization.ExpressionSerializer;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -60,22 +62,42 @@
 class FilterQueryBuilderTest {
 
   private static Stream<LiteralExpression> numericCastSource() {
-    return Stream.of(literal((byte) 1), literal((short) -1), literal(
-        1), literal(21L), literal(3.14F), literal(3.1415D), literal(true), literal("1"));
+    return Stream.of(
+        literal((byte) 1),
+        literal((short) -1),
+        literal(1),
+        literal(21L),
+        literal(3.14F),
+        literal(3.1415D),
+        literal(true),
+        literal("1"));
   }
 
   private static Stream<LiteralExpression> booleanTrueCastSource() {
-    return Stream.of(literal((byte) 1), literal((short) -1), literal(
-        1), literal(42L), literal(3.14F), literal(3.1415D), literal(true), literal("true"));
+    return Stream.of(
+        literal((byte) 1),
+        literal((short) -1),
+        literal(1),
+        literal(42L),
+        literal(3.14F),
+        literal(3.1415D),
+        literal(true),
+        literal("true"));
   }
 
   private static Stream<LiteralExpression> booleanFalseCastSource() {
-    return Stream.of(literal((byte) 0), literal((short) 0), literal(
-        0), literal(0L), literal(0.0F), literal(0.0D), literal(false), literal("false"));
+    return Stream.of(
+        literal((byte) 0),
+        literal((short) 0),
+        literal(0),
+        literal(0L),
+        literal(0.0F),
+        literal(0.0D),
+        literal(false),
+        literal("false"));
   }
 
-  @Mock
-  private ExpressionSerializer serializer;
+  @Mock private ExpressionSerializer serializer;
 
   private FilterQueryBuilder filterQueryBuilder;
 
@@ -95,34 +117,42 @@ void should_build_term_query_for_equality_expression() {
             + "    }\n"
             + "  }\n"
             + "}",
-        buildQuery(
-            DSL.equal(
-                ref("name", STRING), literal("John"))));
+        buildQuery(DSL.equal(ref("name", STRING), literal("John"))));
   }
 
   @Test
   void should_build_range_query_for_comparison_expression() {
     Expression[] params = {ref("age", INTEGER), literal(30)};
-    Map<Expression, Object[]> ranges = ImmutableMap.of(
-        DSL.less(params), new Object[]{null, 30, true, false},
-        DSL.greater(params), new Object[]{30, null, false, true},
-        DSL.lte(params), new Object[]{null, 30, true, true},
-        DSL.gte(params), new Object[]{30, null, true, true});
-
-    ranges.forEach((expr, range) ->
-        assertJsonEquals(
-            "{\n"
-                + "  \"range\" : {\n"
-                + "    \"age\" : {\n"
-                + "      \"from\" : " + range[0] + ",\n"
-                + "      \"to\" : " + range[1] + ",\n"
-                + "      \"include_lower\" : " + range[2] + ",\n"
-                + "      \"include_upper\" : " + range[3] + ",\n"
-                + "      \"boost\" : 1.0\n"
-                + "    }\n"
-                + "  }\n"
-                + "}",
-            buildQuery(expr)));
+    Map<Expression, Object[]> ranges =
+        ImmutableMap.of(
+            DSL.less(params), new Object[] {null, 30, true, false},
+            DSL.greater(params), new Object[] {30, null, false, true},
+            DSL.lte(params), new Object[] {null, 30, true, true},
+            DSL.gte(params), new Object[] {30, null, true, true});
+
+    ranges.forEach(
+        (expr, range) ->
+            assertJsonEquals(
+                "{\n"
+                    + "  \"range\" : {\n"
+                    + "    \"age\" : {\n"
+                    + "      \"from\" : "
+                    + range[0]
+                    + ",\n"
+                    + "      \"to\" : "
+                    + range[1]
+                    + ",\n"
+                    + "      \"include_lower\" : "
+                    + range[2]
+                    + ",\n"
+                    + "      \"include_upper\" : "
+                    + range[3]
+                    + ",\n"
+                    + "      \"boost\" : 1.0\n"
+                    + "    }\n"
+                    + "  }\n"
+                    + "}",
+                buildQuery(expr)));
   }
 
   @Test
@@ -137,9 +167,7 @@ void should_build_wildcard_query_for_like_expression() {
             + "    }\n"
             + "  }\n"
             + "}",
-        buildQuery(
-            DSL.like(
-                ref("name", STRING), literal("%John_"))));
+        buildQuery(DSL.like(ref("name", STRING), literal("%John_"))));
   }
 
   @Test
@@ -155,8 +183,7 @@ void should_build_script_query_for_unsupported_lucene_query() {
             + "    \"boost\" : 1.0\n"
             + "  }\n"
             + "}",
-        buildQuery(
-            DSL.isnotnull(ref("age", INTEGER))));
+        buildQuery(DSL.isnotnull(ref("age", INTEGER))));
   }
 
   @Test
@@ -172,9 +199,7 @@ void should_build_script_query_for_function_expression() {
             + "    \"boost\" : 1.0\n"
             + "  }\n"
             + "}",
-        buildQuery(
-            DSL.equal(
-                DSL.abs(ref("age", INTEGER)), literal(30))));
+        buildQuery(DSL.equal(DSL.abs(ref("age", INTEGER)), literal(30))));
   }
 
   @Test
@@ -190,26 +215,23 @@ void should_build_script_query_for_comparison_between_fields() {
             + "    \"boost\" : 1.0\n"
             + "  }\n"
             + "}",
-        buildQuery(
-            DSL.equal(
-                ref("age1", INTEGER), ref("age2", INTEGER))));
+        buildQuery(DSL.equal(ref("age1", INTEGER), ref("age2", INTEGER))));
   }
 
   @Test
   void should_build_bool_query_for_and_or_expression() {
-    String[] names = { "filter", "should" };
+    String[] names = {"filter", "should"};
     FunctionExpression expr1 = DSL.equal(ref("name", STRING), literal("John"));
     FunctionExpression expr2 = DSL.equal(ref("age", INTEGER), literal(30));
-    Expression[] exprs = {
-        DSL.and(expr1, expr2),
-        DSL.or(expr1, expr2)
-    };
+    Expression[] exprs = {DSL.and(expr1, expr2), DSL.or(expr1, expr2)};
 
     for (int i = 0; i < names.length; i++) {
       assertJsonEquals(
           "{\n"
               + "  \"bool\" : {\n"
-              + "    \"" + names[i] + "\" : [\n"
+              + "    \""
+              + names[i]
+              + "\" : [\n"
               + "      {\n"
               + "        \"term\" : {\n"
               + "          \"name\" : {\n"
@@ -254,10 +276,7 @@ void should_build_bool_query_for_not_expression() {
             + "    \"boost\" : 1.0\n"
             + "  }\n"
             + "}",
-        buildQuery(
-            DSL.not(
-                DSL.equal(
-                    ref("age", INTEGER), literal(30)))));
+        buildQuery(DSL.not(DSL.equal(ref("age", INTEGER), literal(30)))));
   }
 
   @Test
@@ -273,7 +292,13 @@ void should_use_keyword_for_multi_field_in_equality_expression() {
             + "}",
         buildQuery(
             DSL.equal(
-                ref("name", OPENSEARCH_TEXT_KEYWORD), literal("John"))));
+                ref(
+                    "name",
+                    OpenSearchTextType.of(
+                        Map.of(
+                            "words",
+                            OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword)))),
+                literal("John"))));
   }
 
   @Test
@@ -290,7 +315,123 @@ void should_use_keyword_for_multi_field_in_like_expression() {
             + "}",
         buildQuery(
             DSL.like(
-                ref("name", OPENSEARCH_TEXT_KEYWORD), literal("John%"))));
+                ref(
+                    "name",
+                    OpenSearchTextType.of(
+                        Map.of(
+                            "words",
+                            OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword)))),
+                literal("John%"))));
+  }
+
+  @Test
+  void should_build_term_query_predicate_expression_with_nested_function() {
+    assertJsonEquals(
+        "{\n"
+            + "  \"nested\" : {\n"
+            + "    \"query\" : {\n"
+            + "      \"term\" : {\n"
+            + "        \"message.info\" : {\n"
+            + "          \"value\" : \"string_value\",\n"
+            + "          \"boost\" : 1.0\n"
+            + "        }\n"
+            + "      }\n"
+            + "    },\n"
+            + "    \"path\" : \"message\",\n"
+            + "    \"ignore_unmapped\" : false,\n"
+            + "    \"score_mode\" : \"none\",\n"
+            + "    \"boost\" : 1.0\n"
+            + "  }\n"
+            + "}",
+        buildQuery(
+            DSL.equal(
+                DSL.nested(DSL.ref("message.info", STRING), DSL.ref("message", STRING)),
+                literal("string_value"))));
+  }
+
+  @Test
+  void should_build_range_query_predicate_expression_with_nested_function() {
+    assertJsonEquals(
+        "{\n"
+            + "  \"nested\" : {\n"
+            + "    \"query\" : {\n"
+            + "      \"range\" : {\n"
+            + "        \"lottery.number.id\" : {\n"
+            + "          \"from\" : 1234,\n"
+            + "          \"to\" : null,\n"
+            + "          \"include_lower\" : false,\n"
+            + "          \"include_upper\" : true,\n"
+            + "          \"boost\" : 1.0\n"
+            + "        }\n"
+            + "      }\n"
+            + "    },\n"
+            + "    \"path\" : \"lottery.number\",\n"
+            + "    \"ignore_unmapped\" : false,\n"
+            + "    \"score_mode\" : \"none\",\n"
+            + "    \"boost\" : 1.0\n"
+            + "  }\n"
+            + "}",
+        buildQuery(DSL.greater(DSL.nested(DSL.ref("lottery.number.id", INTEGER)), literal(1234))));
+  }
+
+  // TODO remove this test when alternate syntax is implemented for nested
+  //  function in WHERE clause: nested(path, condition)
+  @Test
+  void ensure_alternate_syntax_falls_back_to_legacy_engine() {
+    assertThrows(
+        SyntaxCheckException.class,
+        () ->
+            buildQuery(
+                DSL.nested(
+                    DSL.ref("message", STRING),
+                    DSL.equal(DSL.literal("message.info"), literal("a")))));
+  }
+
+  @Test
+  void nested_filter_wrong_right_side_type_in_predicate_throws_exception() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            buildQuery(
+                DSL.equal(
+                    DSL.nested(DSL.ref("message.info", STRING), DSL.ref("message", STRING)),
+                    DSL.ref("string_value", STRING))));
+  }
+
+  @Test
+  void nested_filter_wrong_first_param_type_throws_exception() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            buildQuery(
+                DSL.equal(
+                    DSL.nested(DSL.namedArgument("field", literal("message"))),
+                    literal("string_value"))));
+  }
+
+  @Test
+  void nested_filter_wrong_second_param_type_throws_exception() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            buildQuery(
+                DSL.equal(
+                    DSL.nested(DSL.ref("message.info", STRING), DSL.literal(2)),
+                    literal("string_value"))));
+  }
+
+  @Test
+  void nested_filter_too_many_params_throws_exception() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            buildQuery(
+                DSL.equal(
+                    DSL.nested(
+                        DSL.ref("message.info", STRING),
+                        DSL.ref("message", STRING),
+                        DSL.ref("message", STRING)),
+                    literal("string_value"))));
   }
 
   @Test
@@ -313,7 +454,8 @@ void should_build_match_query_with_default_parameters() {
             + "}",
         buildQuery(
             DSL.match(
-                DSL.namedArgument("field", literal("message")),
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("message", OpenSearchTextType.of())),
                 DSL.namedArgument("query", literal("search query")))));
   }
 
@@ -341,7 +483,8 @@ void should_build_match_query_with_custom_parameters() {
             + "}",
         buildQuery(
             DSL.match(
-                DSL.namedArgument("field", literal("message")),
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("message", OpenSearchTextType.of())),
                 DSL.namedArgument("query", literal("search query")),
                 DSL.namedArgument("operator", literal("AND")),
                 DSL.namedArgument("analyzer", literal("keyword")),
@@ -359,59 +502,65 @@ void should_build_match_query_with_custom_parameters() {
 
   @Test
   void match_invalid_parameter() {
-    FunctionExpression expr = DSL.match(
-        DSL.namedArgument("field", literal("message")),
-        DSL.namedArgument("query", literal("search query")),
-        DSL.namedArgument("invalid_parameter", literal("invalid_value")));
+    FunctionExpression expr =
+        DSL.match(
+            DSL.namedArgument("field", new ReferenceExpression("message", OpenSearchTextType.of())),
+            DSL.namedArgument("query", literal("search query")),
+            DSL.namedArgument("invalid_parameter", literal("invalid_value")));
     var msg = assertThrows(SemanticCheckException.class, () -> buildQuery(expr)).getMessage();
     assertTrue(msg.startsWith("Parameter invalid_parameter is invalid for match function."));
   }
 
   @Test
   void match_disallow_duplicate_parameter() {
-    FunctionExpression expr = DSL.match(
-        DSL.namedArgument("field", literal("message")),
-        DSL.namedArgument("query", literal("search query")),
-        DSL.namedArgument("analyzer", literal("keyword")),
-        DSL.namedArgument("AnalYzer", literal("english")));
+    FunctionExpression expr =
+        DSL.match(
+            DSL.namedArgument("field", literal("message")),
+            DSL.namedArgument("query", literal("search query")),
+            DSL.namedArgument("analyzer", literal("keyword")),
+            DSL.namedArgument("AnalYzer", literal("english")));
     var msg = assertThrows(SemanticCheckException.class, () -> buildQuery(expr)).getMessage();
     assertEquals("Parameter 'analyzer' can only be specified once.", msg);
   }
 
   @Test
   void match_disallow_duplicate_query() {
-    FunctionExpression expr = DSL.match(
-        DSL.namedArgument("field", literal("message")),
-        DSL.namedArgument("query", literal("search query")),
-        DSL.namedArgument("analyzer", literal("keyword")),
-        DSL.namedArgument("QUERY", literal("something")));
+    FunctionExpression expr =
+        DSL.match(
+            DSL.namedArgument("field", literal("message")),
+            DSL.namedArgument("query", literal("search query")),
+            DSL.namedArgument("analyzer", literal("keyword")),
+            DSL.namedArgument("QUERY", literal("something")));
     var msg = assertThrows(SemanticCheckException.class, () -> buildQuery(expr)).getMessage();
     assertEquals("Parameter 'query' can only be specified once.", msg);
   }
 
   @Test
   void match_disallow_duplicate_field() {
-    FunctionExpression expr = DSL.match(
-        DSL.namedArgument("field", literal("message")),
-        DSL.namedArgument("query", literal("search query")),
-        DSL.namedArgument("analyzer", literal("keyword")),
-        DSL.namedArgument("Field", literal("something")));
+    FunctionExpression expr =
+        DSL.match(
+            DSL.namedArgument("field", literal("message")),
+            DSL.namedArgument("query", literal("search query")),
+            DSL.namedArgument("analyzer", literal("keyword")),
+            DSL.namedArgument("Field", literal("something")));
     var msg = assertThrows(SemanticCheckException.class, () -> buildQuery(expr)).getMessage();
     assertEquals("Parameter 'field' can only be specified once.", msg);
   }
 
   @Test
   void match_missing_field() {
-    FunctionExpression expr = DSL.match(
-        DSL.namedArgument("query", literal("search query")),
-        DSL.namedArgument("analyzer", literal("keyword")));
+    FunctionExpression expr =
+        DSL.match(
+            DSL.namedArgument("query", literal("search query")),
+            DSL.namedArgument("analyzer", literal("keyword")));
     var msg = assertThrows(SemanticCheckException.class, () -> buildQuery(expr)).getMessage();
     assertEquals("'field' parameter is missing.", msg);
   }
 
   @Test
   void match_missing_query() {
-    FunctionExpression expr = DSL.match(
+    FunctionExpression expr =
+        DSL.match(
             DSL.namedArgument("field", literal("field1")),
             DSL.namedArgument("analyzer", literal("keyword")));
     var msg = assertThrows(SemanticCheckException.class, () -> buildQuery(expr)).getMessage();
@@ -421,7 +570,7 @@ void match_missing_query() {
   @Test
   void should_build_match_phrase_query_with_default_parameters() {
     assertJsonEquals(
-            "{\n"
+        "{\n"
             + "  \"match_phrase\" : {\n"
             + "    \"message\" : {\n"
             + "      \"query\" : \"search query\",\n"
@@ -433,13 +582,15 @@ void should_build_match_phrase_query_with_default_parameters() {
             + "}",
         buildQuery(
             DSL.match_phrase(
-                DSL.namedArgument("field", literal("message")),
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("message", OpenSearchTextType.of())),
                 DSL.namedArgument("query", literal("search query")))));
   }
 
   @Test
   void should_build_multi_match_query_with_default_parameters_single_field() {
-    assertJsonEquals("{\n"
+    assertJsonEquals(
+        "{\n"
             + "  \"multi_match\" : {\n"
             + "    \"query\" : \"search query\",\n"
             + "    \"fields\" : [\n"
@@ -456,16 +607,21 @@ void should_build_multi_match_query_with_default_parameters_single_field() {
             + "    \"boost\" : 1.0,\n"
             + "  }\n"
             + "}",
-        buildQuery(DSL.multi_match(
-            DSL.namedArgument("fields", DSL.literal(new ExprTupleValue(
-                new LinkedHashMap<>(ImmutableMap.of(
-                    "field1", ExprValueUtils.floatValue(1.F)))))),
-            DSL.namedArgument("query", literal("search query")))));
+        buildQuery(
+            DSL.multi_match(
+                DSL.namedArgument(
+                    "fields",
+                    DSL.literal(
+                        new ExprTupleValue(
+                            new LinkedHashMap<>(
+                                ImmutableMap.of("field1", ExprValueUtils.floatValue(1.F)))))),
+                DSL.namedArgument("query", literal("search query")))));
   }
 
   @Test
   void should_build_multi_match_query_with_default_parameters_all_fields() {
-    assertJsonEquals("{\n"
+    assertJsonEquals(
+        "{\n"
             + "  \"multi_match\" : {\n"
             + "    \"query\" : \"search query\",\n"
             + "    \"fields\" : [\n"
@@ -482,16 +638,21 @@ void should_build_multi_match_query_with_default_parameters_all_fields() {
             + "    \"boost\" : 1.0,\n"
             + "  }\n"
             + "}",
-        buildQuery(DSL.multi_match(
-            DSL.namedArgument("fields", DSL.literal(new ExprTupleValue(
-                new LinkedHashMap<>(ImmutableMap.of(
-                    "*", ExprValueUtils.floatValue(1.F)))))),
-            DSL.namedArgument("query", literal("search query")))));
+        buildQuery(
+            DSL.multi_match(
+                DSL.namedArgument(
+                    "fields",
+                    DSL.literal(
+                        new ExprTupleValue(
+                            new LinkedHashMap<>(
+                                ImmutableMap.of("*", ExprValueUtils.floatValue(1.F)))))),
+                DSL.namedArgument("query", literal("search query")))));
   }
 
   @Test
   void should_build_multi_match_query_with_default_parameters_no_fields() {
-    assertJsonEquals("{\n"
+    assertJsonEquals(
+        "{\n"
             + "  \"multi_match\" : {\n"
             + "    \"query\" : \"search query\",\n"
             + "    \"fields\" : [],\n"
@@ -506,17 +667,20 @@ void should_build_multi_match_query_with_default_parameters_no_fields() {
             + "    \"boost\" : 1.0,\n"
             + "  }\n"
             + "}",
-        buildQuery(DSL.multi_match(
-            DSL.namedArgument("fields", DSL.literal(new ExprTupleValue(
-                new LinkedHashMap<>(ImmutableMap.of())))),
-            DSL.namedArgument("query", literal("search query")))));
+        buildQuery(
+            DSL.multi_match(
+                DSL.namedArgument(
+                    "fields",
+                    DSL.literal(new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of())))),
+                DSL.namedArgument("query", literal("search query")))));
   }
 
   // Note: we can't test `multi_match` and `simple_query_string` without weight(s)
 
   @Test
   void should_build_multi_match_query_with_default_parameters_multiple_fields() {
-    var expected = "{\n"
+    var expected =
+        "{\n"
             + "  \"multi_match\" : {\n"
             + "    \"query\" : \"search query\",\n"
             + "    \"fields\" : [%s],\n"
@@ -531,23 +695,31 @@ void should_build_multi_match_query_with_default_parameters_multiple_fields() {
             + "    \"boost\" : 1.0,\n"
             + "  }\n"
             + "}";
-    var actual = buildQuery(DSL.multi_match(
-        DSL.namedArgument("fields", DSL.literal(new ExprTupleValue(
-            new LinkedHashMap<>(ImmutableMap.of(
-                "field1", ExprValueUtils.floatValue(1.F),
-                "field2", ExprValueUtils.floatValue(.3F)))))),
-        DSL.namedArgument("query", literal("search query"))));
+    var actual =
+        buildQuery(
+            DSL.multi_match(
+                DSL.namedArgument(
+                    "fields",
+                    DSL.literal(
+                        new ExprTupleValue(
+                            new LinkedHashMap<>(
+                                ImmutableMap.of(
+                                    "field1", ExprValueUtils.floatValue(1.F),
+                                    "field2", ExprValueUtils.floatValue(.3F)))))),
+                DSL.namedArgument("query", literal("search query"))));
 
     var ex1 = String.format(expected, "\"field1^1.0\", \"field2^0.3\"");
     var ex2 = String.format(expected, "\"field2^0.3\", \"field1^1.0\"");
-    assertTrue(new JSONObject(ex1).similar(new JSONObject(actual))
-        || new JSONObject(ex2).similar(new JSONObject(actual)),
+    assertTrue(
+        new JSONObject(ex1).similar(new JSONObject(actual))
+            || new JSONObject(ex2).similar(new JSONObject(actual)),
         StringUtils.format("Actual %s doesn't match neither expected %s nor %s", actual, ex1, ex2));
   }
 
   @Test
   void should_build_multi_match_query_with_custom_parameters() {
-    var expected = "{\n"
+    var expected =
+        "{\n"
             + "  \"multi_match\" : {\n"
             + "    \"query\" : \"search query\",\n"
             + "    \"fields\" : [%s],\n"
@@ -568,10 +740,13 @@ void should_build_multi_match_query_with_custom_parameters() {
             + "    \"boost\" : 2.0\n"
             + "  }\n"
             + "}";
-    var actual = buildQuery(
+    var actual =
+        buildQuery(
             DSL.multi_match(
-                DSL.namedArgument("fields", DSL.literal(
-                    ExprValueUtils.tupleValue(ImmutableMap.of("field1", 1.F, "field2", .3F)))),
+                DSL.namedArgument(
+                    "fields",
+                    DSL.literal(
+                        ExprValueUtils.tupleValue(ImmutableMap.of("field1", 1.F, "field2", .3F)))),
                 DSL.namedArgument("query", literal("search query")),
                 DSL.namedArgument("analyzer", literal("keyword")),
                 DSL.namedArgument("auto_generate_synonyms_phrase_query", literal("false")),
@@ -591,28 +766,36 @@ void should_build_multi_match_query_with_custom_parameters() {
 
     var ex1 = String.format(expected, "\"field1^1.0\", \"field2^0.3\"");
     var ex2 = String.format(expected, "\"field2^0.3\", \"field1^1.0\"");
-    assertTrue(new JSONObject(ex1).similar(new JSONObject(actual))
-        || new JSONObject(ex2).similar(new JSONObject(actual)),
+    assertTrue(
+        new JSONObject(ex1).similar(new JSONObject(actual))
+            || new JSONObject(ex2).similar(new JSONObject(actual)),
         StringUtils.format("Actual %s doesn't match neither expected %s nor %s", actual, ex1, ex2));
   }
 
   @Test
   void multi_match_invalid_parameter() {
-    FunctionExpression expr = DSL.multi_match(
-        DSL.namedArgument("fields", DSL.literal(
-            new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                "field1", ExprValueUtils.floatValue(1.F),
-                "field2", ExprValueUtils.floatValue(.3F)))))),
-        DSL.namedArgument("query", literal("search query")),
-        DSL.namedArgument("invalid_parameter", literal("invalid_value")));
-    assertThrows(SemanticCheckException.class, () -> buildQuery(expr),
+    FunctionExpression expr =
+        DSL.multi_match(
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of(
+                                "field1", ExprValueUtils.floatValue(1.F),
+                                "field2", ExprValueUtils.floatValue(.3F)))))),
+            DSL.namedArgument("query", literal("search query")),
+            DSL.namedArgument("invalid_parameter", literal("invalid_value")));
+    assertThrows(
+        SemanticCheckException.class,
+        () -> buildQuery(expr),
         "Parameter invalid_parameter is invalid for match function.");
   }
 
   @Test
   void should_build_match_phrase_query_with_custom_parameters() {
     assertJsonEquals(
-            "{\n"
+        "{\n"
             + "  \"match_phrase\" : {\n"
             + "    \"message\" : {\n"
             + "      \"query\" : \"search query\",\n"
@@ -625,8 +808,9 @@ void should_build_match_phrase_query_with_custom_parameters() {
             + "}",
         buildQuery(
             DSL.match_phrase(
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("message", OpenSearchTextType.of())),
                 DSL.namedArgument("boost", literal("1.2")),
-                DSL.namedArgument("field", literal("message")),
                 DSL.namedArgument("query", literal("search query")),
                 DSL.namedArgument("analyzer", literal("keyword")),
                 DSL.namedArgument("slop", literal("2")),
@@ -635,141 +819,171 @@ void should_build_match_phrase_query_with_custom_parameters() {
 
   @Test
   void wildcard_query_invalid_parameter() {
-    FunctionExpression expr = DSL.wildcard_query(
-        DSL.namedArgument("field", literal("field")),
-        DSL.namedArgument("query", literal("search query*")),
-        DSL.namedArgument("invalid_parameter", literal("invalid_value")));
-    assertThrows(SemanticCheckException.class, () -> buildQuery(expr),
+    FunctionExpression expr =
+        DSL.wildcard_query(
+            DSL.namedArgument("field", new ReferenceExpression("field", OpenSearchTextType.of())),
+            DSL.namedArgument("query", literal("search query*")),
+            DSL.namedArgument("invalid_parameter", literal("invalid_value")));
+    assertThrows(
+        SemanticCheckException.class,
+        () -> buildQuery(expr),
         "Parameter invalid_parameter is invalid for wildcard_query function.");
   }
 
   @Test
   void wildcard_query_convert_sql_wildcard_to_lucene() {
     // Test conversion of % wildcard to *
-    assertJsonEquals("{\n"
-        + "  \"wildcard\" : {\n"
-        + "    \"field\" : {\n"
-        + "      \"wildcard\" : \"search query*\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}",
-        buildQuery(DSL.wildcard_query(
-            DSL.namedArgument("field", literal("field")),
-            DSL.namedArgument("query", literal("search query%")))));
-
-    assertJsonEquals("{\n"
-        + "  \"wildcard\" : {\n"
-        + "    \"field\" : {\n"
-        + "      \"wildcard\" : \"search query?\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}",
-        buildQuery(DSL.wildcard_query(
-            DSL.namedArgument("field", literal("field")),
-            DSL.namedArgument("query", literal("search query_")))));
+    assertJsonEquals(
+        "{\n"
+            + "  \"wildcard\" : {\n"
+            + "    \"field\" : {\n"
+            + "      \"wildcard\" : \"search query*\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}",
+        buildQuery(
+            DSL.wildcard_query(
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("field", OpenSearchTextType.of())),
+                DSL.namedArgument("query", literal("search query%")))));
+
+    assertJsonEquals(
+        "{\n"
+            + "  \"wildcard\" : {\n"
+            + "    \"field\" : {\n"
+            + "      \"wildcard\" : \"search query?\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}",
+        buildQuery(
+            DSL.wildcard_query(
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("field", OpenSearchTextType.of())),
+                DSL.namedArgument("query", literal("search query_")))));
   }
 
   @Test
   void wildcard_query_escape_wildcards_characters() {
-    assertJsonEquals("{\n"
-        + "  \"wildcard\" : {\n"
-        + "    \"field\" : {\n"
-        + "      \"wildcard\" : \"search query%\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}",
-        buildQuery(DSL.wildcard_query(
-            DSL.namedArgument("field", literal("field")),
-            DSL.namedArgument("query", literal("search query\\%")))));
-
-    assertJsonEquals("{\n"
-        + "  \"wildcard\" : {\n"
-        + "    \"field\" : {\n"
-        + "      \"wildcard\" : \"search query_\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}",
-        buildQuery(DSL.wildcard_query(
-            DSL.namedArgument("field", literal("field")),
-            DSL.namedArgument("query", literal("search query\\_")))));
-
-    assertJsonEquals("{\n"
-        + "  \"wildcard\" : {\n"
-        + "    \"field\" : {\n"
-        + "      \"wildcard\" : \"search query\\\\*\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}",
-        buildQuery(DSL.wildcard_query(
-            DSL.namedArgument("field", literal("field")),
-            DSL.namedArgument("query", literal("search query\\*")))));
-
-    assertJsonEquals("{\n"
-        + "  \"wildcard\" : {\n"
-        + "    \"field\" : {\n"
-        + "      \"wildcard\" : \"search query\\\\?\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}",
-        buildQuery(DSL.wildcard_query(
-            DSL.namedArgument("field", literal("field")),
-            DSL.namedArgument("query", literal("search query\\?")))));
+    assertJsonEquals(
+        "{\n"
+            + "  \"wildcard\" : {\n"
+            + "    \"field\" : {\n"
+            + "      \"wildcard\" : \"search query%\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}",
+        buildQuery(
+            DSL.wildcard_query(
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("field", OpenSearchTextType.of())),
+                DSL.namedArgument("query", literal("search query\\%")))));
+
+    assertJsonEquals(
+        "{\n"
+            + "  \"wildcard\" : {\n"
+            + "    \"field\" : {\n"
+            + "      \"wildcard\" : \"search query_\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}",
+        buildQuery(
+            DSL.wildcard_query(
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("field", OpenSearchTextType.of())),
+                DSL.namedArgument("query", literal("search query\\_")))));
+
+    assertJsonEquals(
+        "{\n"
+            + "  \"wildcard\" : {\n"
+            + "    \"field\" : {\n"
+            + "      \"wildcard\" : \"search query\\\\*\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}",
+        buildQuery(
+            DSL.wildcard_query(
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("field", OpenSearchTextType.of())),
+                DSL.namedArgument("query", literal("search query\\*")))));
+
+    assertJsonEquals(
+        "{\n"
+            + "  \"wildcard\" : {\n"
+            + "    \"field\" : {\n"
+            + "      \"wildcard\" : \"search query\\\\?\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}",
+        buildQuery(
+            DSL.wildcard_query(
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("field", OpenSearchTextType.of())),
+                DSL.namedArgument("query", literal("search query\\?")))));
   }
 
   @Test
   void should_build_wildcard_query_with_default_parameters() {
-    assertJsonEquals("{\n"
-        + "  \"wildcard\" : {\n"
-        + "    \"field\" : {\n"
-        + "      \"wildcard\" : \"search query*\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}",
-        buildQuery(DSL.wildcard_query(
-            DSL.namedArgument("field", literal("field")),
-            DSL.namedArgument("query", literal("search query*")))));
+    assertJsonEquals(
+        "{\n"
+            + "  \"wildcard\" : {\n"
+            + "    \"field\" : {\n"
+            + "      \"wildcard\" : \"search query*\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}",
+        buildQuery(
+            DSL.wildcard_query(
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("field", OpenSearchTextType.of())),
+                DSL.namedArgument("query", literal("search query*")))));
   }
 
   @Test
   void should_build_wildcard_query_query_with_custom_parameters() {
-    assertJsonEquals("{\n"
-        + "  \"wildcard\" : {\n"
-        + "    \"field\" : {\n"
-        + "      \"wildcard\" : \"search query*\",\n"
-        + "      \"boost\" : 0.6,\n"
-        + "      \"case_insensitive\" : true,\n"
-        + "      \"rewrite\" : \"constant_score_boolean\"\n"
-        + "    }\n"
-        + "  }\n"
-        + "}",
-        buildQuery(DSL.wildcard_query(
-            DSL.namedArgument("field", literal("field")),
-            DSL.namedArgument("query", literal("search query*")),
-            DSL.namedArgument("boost", literal("0.6")),
-            DSL.namedArgument("case_insensitive", literal("true")),
-            DSL.namedArgument("rewrite", literal("constant_score_boolean")))));
+    assertJsonEquals(
+        "{\n"
+            + "  \"wildcard\" : {\n"
+            + "    \"field\" : {\n"
+            + "      \"wildcard\" : \"search query*\",\n"
+            + "      \"boost\" : 0.6,\n"
+            + "      \"case_insensitive\" : true,\n"
+            + "      \"rewrite\" : \"constant_score_boolean\"\n"
+            + "    }\n"
+            + "  }\n"
+            + "}",
+        buildQuery(
+            DSL.wildcard_query(
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("field", OpenSearchTextType.of())),
+                DSL.namedArgument("query", literal("search query*")),
+                DSL.namedArgument("boost", literal("0.6")),
+                DSL.namedArgument("case_insensitive", literal("true")),
+                DSL.namedArgument("rewrite", literal("constant_score_boolean")))));
   }
 
   @Test
   void query_invalid_parameter() {
-    FunctionExpression expr = DSL.query(
-            DSL.namedArgument("invalid_parameter", literal("invalid_value")));
-    assertThrows(SemanticCheckException.class, () -> buildQuery(expr),
-            "Parameter invalid_parameter is invalid for query function.");
+    FunctionExpression expr =
+        DSL.query(DSL.namedArgument("invalid_parameter", literal("invalid_value")));
+    assertThrows(
+        SemanticCheckException.class,
+        () -> buildQuery(expr),
+        "Parameter invalid_parameter is invalid for query function.");
   }
 
   @Test
   void query_invalid_fields_parameter_exception_message() {
-    FunctionExpression expr = DSL.query(
-        DSL.namedArgument("fields", literal("field1")),
-        DSL.namedArgument("query", literal("search query")));
+    FunctionExpression expr =
+        DSL.query(
+            DSL.namedArgument("fields", literal("field1")),
+            DSL.namedArgument("query", literal("search query")));
 
     var exception = assertThrows(SemanticCheckException.class, () -> buildQuery(expr));
     assertEquals("Parameter fields is invalid for query function.", exception.getMessage());
@@ -777,7 +991,8 @@ void query_invalid_fields_parameter_exception_message() {
 
   @Test
   void should_build_query_query_with_default_parameters() {
-    var expected = "{\n"
+    var expected =
+        "{\n"
             + "  \"query_string\" : {\n"
             + "    \"query\" : \"field1:query_value\",\n"
             + "    \"fields\" : [],\n"
@@ -796,13 +1011,14 @@ void should_build_query_query_with_default_parameters() {
             + "  }\n"
             + "}";
 
-    assertJsonEquals(expected, buildQuery(DSL.query(
-            DSL.namedArgument("query", literal("field1:query_value")))));
+    assertJsonEquals(
+        expected, buildQuery(DSL.query(DSL.namedArgument("query", literal("field1:query_value")))));
   }
 
   @Test
   void should_build_query_query_with_custom_parameters() {
-    var expected = "{\n"
+    var expected =
+        "{\n"
             + "  \"query_string\" : {\n"
             + "    \"query\" : \"field1:query_value\",\n"
             + "    \"fields\" : [],\n"
@@ -825,125 +1041,147 @@ void should_build_query_query_with_custom_parameters() {
             + "    \"boost\" : 2.0,\n"
             + "  }\n"
             + "}";
-    var actual = buildQuery(
+    var actual =
+        buildQuery(
             DSL.query(
-                    DSL.namedArgument("query", literal("field1:query_value")),
-                    DSL.namedArgument("analyze_wildcard", literal("true")),
-                    DSL.namedArgument("analyzer", literal("keyword")),
-                    DSL.namedArgument("auto_generate_synonyms_phrase_query", literal("false")),
-                    DSL.namedArgument("default_operator", literal("AND")),
-                    DSL.namedArgument("fuzzy_max_expansions", literal("10")),
-                    DSL.namedArgument("fuzzy_prefix_length", literal("2")),
-                    DSL.namedArgument("fuzzy_transpositions", literal("false")),
-                    DSL.namedArgument("lenient", literal("false")),
-                    DSL.namedArgument("minimum_should_match", literal("3")),
-                    DSL.namedArgument("tie_breaker", literal("1.3")),
-                    DSL.namedArgument("type", literal("cross_fields")),
-                    DSL.namedArgument("boost", literal("2.0"))));
+                DSL.namedArgument("query", literal("field1:query_value")),
+                DSL.namedArgument("analyze_wildcard", literal("true")),
+                DSL.namedArgument("analyzer", literal("keyword")),
+                DSL.namedArgument("auto_generate_synonyms_phrase_query", literal("false")),
+                DSL.namedArgument("default_operator", literal("AND")),
+                DSL.namedArgument("fuzzy_max_expansions", literal("10")),
+                DSL.namedArgument("fuzzy_prefix_length", literal("2")),
+                DSL.namedArgument("fuzzy_transpositions", literal("false")),
+                DSL.namedArgument("lenient", literal("false")),
+                DSL.namedArgument("minimum_should_match", literal("3")),
+                DSL.namedArgument("tie_breaker", literal("1.3")),
+                DSL.namedArgument("type", literal("cross_fields")),
+                DSL.namedArgument("boost", literal("2.0"))));
 
     assertJsonEquals(expected, actual);
   }
 
   @Test
   void query_string_invalid_parameter() {
-    FunctionExpression expr = DSL.query_string(
-        DSL.namedArgument("fields", DSL.literal(
-            new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                "field1", ExprValueUtils.floatValue(1.F),
-                "field2", ExprValueUtils.floatValue(.3F)))))),
-        DSL.namedArgument("query", literal("search query")),
-        DSL.namedArgument("invalid_parameter", literal("invalid_value")));
-    assertThrows(SemanticCheckException.class, () -> buildQuery(expr),
+    FunctionExpression expr =
+        DSL.query_string(
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of(
+                                "field1", ExprValueUtils.floatValue(1.F),
+                                "field2", ExprValueUtils.floatValue(.3F)))))),
+            DSL.namedArgument("query", literal("search query")),
+            DSL.namedArgument("invalid_parameter", literal("invalid_value")));
+    assertThrows(
+        SemanticCheckException.class,
+        () -> buildQuery(expr),
         "Parameter invalid_parameter is invalid for match function.");
   }
 
   @Test
   void should_build_query_string_query_with_default_parameters_multiple_fields() {
-    var expected = "{\n"
-        + "  \"query_string\" : {\n"
-        + "    \"query\" : \"query_value\",\n"
-        + "    \"fields\" : [%s],\n"
-        + "    \"type\" : \"best_fields\",\n"
-        + "    \"default_operator\" : \"or\",\n"
-        + "    \"max_determinized_states\" : 10000,\n"
-        + "    \"enable_position_increments\" : true,\n"
-        + "    \"fuzziness\" : \"AUTO\",\n"
-        + "    \"fuzzy_prefix_length\" : 0,\n"
-        + "    \"fuzzy_max_expansions\" : 50,\n"
-        + "    \"phrase_slop\" : 0,\n"
-        + "    \"escape\" : false,\n"
-        + "    \"auto_generate_synonyms_phrase_query\" : true,\n"
-        + "    \"fuzzy_transpositions\" : true,\n"
-        + "    \"boost\" : 1.0\n"
-        + "  }\n"
-        + "}";
-    var actual = buildQuery(DSL.query_string(
-        DSL.namedArgument("fields", DSL.literal(new ExprTupleValue(
-            new LinkedHashMap<>(ImmutableMap.of(
-                "field1", ExprValueUtils.floatValue(1.F),
-                "field2", ExprValueUtils.floatValue(.3F)))))),
-        DSL.namedArgument("query", literal("query_value"))));
+    var expected =
+        "{\n"
+            + "  \"query_string\" : {\n"
+            + "    \"query\" : \"query_value\",\n"
+            + "    \"fields\" : [%s],\n"
+            + "    \"type\" : \"best_fields\",\n"
+            + "    \"default_operator\" : \"or\",\n"
+            + "    \"max_determinized_states\" : 10000,\n"
+            + "    \"enable_position_increments\" : true,\n"
+            + "    \"fuzziness\" : \"AUTO\",\n"
+            + "    \"fuzzy_prefix_length\" : 0,\n"
+            + "    \"fuzzy_max_expansions\" : 50,\n"
+            + "    \"phrase_slop\" : 0,\n"
+            + "    \"escape\" : false,\n"
+            + "    \"auto_generate_synonyms_phrase_query\" : true,\n"
+            + "    \"fuzzy_transpositions\" : true,\n"
+            + "    \"boost\" : 1.0\n"
+            + "  }\n"
+            + "}";
+    var actual =
+        buildQuery(
+            DSL.query_string(
+                DSL.namedArgument(
+                    "fields",
+                    DSL.literal(
+                        new ExprTupleValue(
+                            new LinkedHashMap<>(
+                                ImmutableMap.of(
+                                    "field1", ExprValueUtils.floatValue(1.F),
+                                    "field2", ExprValueUtils.floatValue(.3F)))))),
+                DSL.namedArgument("query", literal("query_value"))));
 
     var ex1 = String.format(expected, "\"field1^1.0\", \"field2^0.3\"");
     var ex2 = String.format(expected, "\"field2^0.3\", \"field1^1.0\"");
-    assertTrue(new JSONObject(ex1).similar(new JSONObject(actual))
+    assertTrue(
+        new JSONObject(ex1).similar(new JSONObject(actual))
             || new JSONObject(ex2).similar(new JSONObject(actual)),
         StringUtils.format("Actual %s doesn't match neither expected %s nor %s", actual, ex1, ex2));
   }
 
   @Test
   void should_build_query_string_query_with_custom_parameters() {
-    var expected = "{\n"
-        + "  \"query_string\" : {\n"
-        + "    \"query\" : \"query_value\",\n"
-        + "    \"fields\" : [%s],\n"
-        + "    \"type\" : \"cross_fields\",\n"
-        + "    \"tie_breaker\" : 1.3,\n"
-        + "    \"default_operator\" : \"and\",\n"
-        + "    \"analyzer\" : \"keyword\",\n"
-        + "    \"max_determinized_states\" : 10000,\n"
-        + "    \"enable_position_increments\" : true,\n"
-        + "    \"fuzziness\" : \"AUTO\",\n"
-        + "    \"fuzzy_prefix_length\" : 2,\n"
-        + "    \"fuzzy_max_expansions\" : 10,\n"
-        + "    \"phrase_slop\" : 0,\n"
-        + "    \"analyze_wildcard\" : true,\n"
-        + "    \"minimum_should_match\" : \"3\",\n"
-        + "    \"lenient\" : false,\n"
-        + "    \"escape\" : false,\n"
-        + "    \"auto_generate_synonyms_phrase_query\" : false,\n"
-        + "    \"fuzzy_transpositions\" : false,\n"
-        + "    \"boost\" : 2.0,\n"
-        + "  }\n"
-        + "}";
-    var actual = buildQuery(
-        DSL.query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                ExprValueUtils.tupleValue(ImmutableMap.of("field1", 1.F, "field2", .3F)))),
-            DSL.namedArgument("query", literal("query_value")),
-            DSL.namedArgument("analyze_wildcard", literal("true")),
-            DSL.namedArgument("analyzer", literal("keyword")),
-            DSL.namedArgument("auto_generate_synonyms_phrase_query", literal("false")),
-            DSL.namedArgument("default_operator", literal("AND")),
-            DSL.namedArgument("fuzzy_max_expansions", literal("10")),
-            DSL.namedArgument("fuzzy_prefix_length", literal("2")),
-            DSL.namedArgument("fuzzy_transpositions", literal("false")),
-            DSL.namedArgument("lenient", literal("false")),
-            DSL.namedArgument("minimum_should_match", literal("3")),
-            DSL.namedArgument("tie_breaker", literal("1.3")),
-            DSL.namedArgument("type", literal("cross_fields")),
-            DSL.namedArgument("boost", literal("2.0"))));
+    var expected =
+        "{\n"
+            + "  \"query_string\" : {\n"
+            + "    \"query\" : \"query_value\",\n"
+            + "    \"fields\" : [%s],\n"
+            + "    \"type\" : \"cross_fields\",\n"
+            + "    \"tie_breaker\" : 1.3,\n"
+            + "    \"default_operator\" : \"and\",\n"
+            + "    \"analyzer\" : \"keyword\",\n"
+            + "    \"max_determinized_states\" : 10000,\n"
+            + "    \"enable_position_increments\" : true,\n"
+            + "    \"fuzziness\" : \"AUTO\",\n"
+            + "    \"fuzzy_prefix_length\" : 2,\n"
+            + "    \"fuzzy_max_expansions\" : 10,\n"
+            + "    \"phrase_slop\" : 0,\n"
+            + "    \"analyze_wildcard\" : true,\n"
+            + "    \"minimum_should_match\" : \"3\",\n"
+            + "    \"lenient\" : false,\n"
+            + "    \"escape\" : false,\n"
+            + "    \"auto_generate_synonyms_phrase_query\" : false,\n"
+            + "    \"fuzzy_transpositions\" : false,\n"
+            + "    \"boost\" : 2.0,\n"
+            + "  }\n"
+            + "}";
+    var actual =
+        buildQuery(
+            DSL.query_string(
+                DSL.namedArgument(
+                    "fields",
+                    DSL.literal(
+                        ExprValueUtils.tupleValue(ImmutableMap.of("field1", 1.F, "field2", .3F)))),
+                DSL.namedArgument("query", literal("query_value")),
+                DSL.namedArgument("analyze_wildcard", literal("true")),
+                DSL.namedArgument("analyzer", literal("keyword")),
+                DSL.namedArgument("auto_generate_synonyms_phrase_query", literal("false")),
+                DSL.namedArgument("default_operator", literal("AND")),
+                DSL.namedArgument("fuzzy_max_expansions", literal("10")),
+                DSL.namedArgument("fuzzy_prefix_length", literal("2")),
+                DSL.namedArgument("fuzzy_transpositions", literal("false")),
+                DSL.namedArgument("lenient", literal("false")),
+                DSL.namedArgument("minimum_should_match", literal("3")),
+                DSL.namedArgument("tie_breaker", literal("1.3")),
+                DSL.namedArgument("type", literal("cross_fields")),
+                DSL.namedArgument("boost", literal("2.0"))));
 
     var ex1 = String.format(expected, "\"field1^1.0\", \"field2^0.3\"");
     var ex2 = String.format(expected, "\"field2^0.3\", \"field1^1.0\"");
-    assertTrue(new JSONObject(ex1).similar(new JSONObject(actual))
+    assertTrue(
+        new JSONObject(ex1).similar(new JSONObject(actual))
             || new JSONObject(ex2).similar(new JSONObject(actual)),
         StringUtils.format("Actual %s doesn't match neither expected %s nor %s", actual, ex1, ex2));
   }
 
   @Test
   void should_build_query_string_query_with_default_parameters_single_field() {
-    assertJsonEquals("{\n"
+    assertJsonEquals(
+        "{\n"
             + "  \"query_string\" : {\n"
             + "    \"query\" : \"query_value\",\n"
             + "    \"fields\" : [\n"
@@ -963,11 +1201,15 @@ void should_build_query_string_query_with_default_parameters_single_field() {
             + "    \"boost\" : 1.0,\n"
             + "  }\n"
             + "}",
-        buildQuery(DSL.query_string(
-            DSL.namedArgument("fields", DSL.literal(new ExprTupleValue(
-                new LinkedHashMap<>(ImmutableMap.of(
-                    "field1", ExprValueUtils.floatValue(1.F)))))),
-            DSL.namedArgument("query", literal("query_value")))));
+        buildQuery(
+            DSL.query_string(
+                DSL.namedArgument(
+                    "fields",
+                    DSL.literal(
+                        new ExprTupleValue(
+                            new LinkedHashMap<>(
+                                ImmutableMap.of("field1", ExprValueUtils.floatValue(1.F)))))),
+                DSL.namedArgument("query", literal("query_value")))));
   }
 
   @Test
@@ -976,7 +1218,8 @@ void should_build_query_string_query_with_default_parameters_single_field() {
   // 2) `flags` are printed by OpenSearch as an integer
   // 3) `minimum_should_match` printed as a string
   void should_build_simple_query_string_query_with_default_parameters_single_field() {
-    assertJsonEquals("{\n"
+    assertJsonEquals(
+        "{\n"
             + "  \"simple_query_string\" : {\n"
             + "    \"query\" : \"search query\",\n"
             + "    \"fields\" : [\n"
@@ -992,16 +1235,21 @@ void should_build_simple_query_string_query_with_default_parameters_single_field
             + "    \"boost\" : 1.0\n"
             + "  }\n"
             + "}",
-        buildQuery(DSL.simple_query_string(
-            DSL.namedArgument("fields", DSL.literal(new ExprTupleValue(
-                new LinkedHashMap<>(ImmutableMap.of(
-                    "field1", ExprValueUtils.floatValue(1.F)))))),
-            DSL.namedArgument("query", literal("search query")))));
+        buildQuery(
+            DSL.simple_query_string(
+                DSL.namedArgument(
+                    "fields",
+                    DSL.literal(
+                        new ExprTupleValue(
+                            new LinkedHashMap<>(
+                                ImmutableMap.of("field1", ExprValueUtils.floatValue(1.F)))))),
+                DSL.namedArgument("query", literal("search query")))));
   }
 
   @Test
   void should_build_simple_query_string_query_with_default_parameters_multiple_fields() {
-    var expected = "{\n"
+    var expected =
+        "{\n"
             + "  \"simple_query_string\" : {\n"
             + "    \"query\" : \"search query\",\n"
             + "    \"fields\" : [%s],\n"
@@ -1015,23 +1263,31 @@ void should_build_simple_query_string_query_with_default_parameters_multiple_fie
             + "    \"boost\" : 1.0\n"
             + "  }\n"
             + "}";
-    var actual = buildQuery(DSL.simple_query_string(
-        DSL.namedArgument("fields", DSL.literal(new ExprTupleValue(
-            new LinkedHashMap<>(ImmutableMap.of(
-                "field1", ExprValueUtils.floatValue(1.F),
-                "field2", ExprValueUtils.floatValue(.3F)))))),
-        DSL.namedArgument("query", literal("search query"))));
+    var actual =
+        buildQuery(
+            DSL.simple_query_string(
+                DSL.namedArgument(
+                    "fields",
+                    DSL.literal(
+                        new ExprTupleValue(
+                            new LinkedHashMap<>(
+                                ImmutableMap.of(
+                                    "field1", ExprValueUtils.floatValue(1.F),
+                                    "field2", ExprValueUtils.floatValue(.3F)))))),
+                DSL.namedArgument("query", literal("search query"))));
 
     var ex1 = String.format(expected, "\"field1^1.0\", \"field2^0.3\"");
     var ex2 = String.format(expected, "\"field2^0.3\", \"field1^1.0\"");
-    assertTrue(new JSONObject(ex1).similar(new JSONObject(actual))
-        || new JSONObject(ex2).similar(new JSONObject(actual)),
+    assertTrue(
+        new JSONObject(ex1).similar(new JSONObject(actual))
+            || new JSONObject(ex2).similar(new JSONObject(actual)),
         StringUtils.format("Actual %s doesn't match neither expected %s nor %s", actual, ex1, ex2));
   }
 
   @Test
   void should_build_simple_query_string_query_with_custom_parameters() {
-    var expected = "{\n"
+    var expected =
+        "{\n"
             + "  \"simple_query_string\" : {\n"
             + "    \"query\" : \"search query\",\n"
             + "    \"fields\" : [%s],\n"
@@ -1048,10 +1304,13 @@ void should_build_simple_query_string_query_with_custom_parameters() {
             + "    \"boost\" : 2.0\n"
             + "  }\n"
             + "}";
-    var actual = buildQuery(
+    var actual =
+        buildQuery(
             DSL.simple_query_string(
-                DSL.namedArgument("fields", DSL.literal(
-                    ExprValueUtils.tupleValue(ImmutableMap.of("field1", 1.F, "field2", .3F)))),
+                DSL.namedArgument(
+                    "fields",
+                    DSL.literal(
+                        ExprValueUtils.tupleValue(ImmutableMap.of("field1", 1.F, "field2", .3F)))),
                 DSL.namedArgument("query", literal("search query")),
                 DSL.namedArgument("analyze_wildcard", literal("true")),
                 DSL.namedArgument("analyzer", literal("keyword")),
@@ -1067,93 +1326,105 @@ void should_build_simple_query_string_query_with_custom_parameters() {
 
     var ex1 = String.format(expected, "\"field1^1.0\", \"field2^0.3\"");
     var ex2 = String.format(expected, "\"field2^0.3\", \"field1^1.0\"");
-    assertTrue(new JSONObject(ex1).similar(new JSONObject(actual))
-        || new JSONObject(ex2).similar(new JSONObject(actual)),
+    assertTrue(
+        new JSONObject(ex1).similar(new JSONObject(actual))
+            || new JSONObject(ex2).similar(new JSONObject(actual)),
         StringUtils.format("Actual %s doesn't match neither expected %s nor %s", actual, ex1, ex2));
   }
 
   @Test
   void simple_query_string_invalid_parameter() {
-    FunctionExpression expr = DSL.simple_query_string(
-        DSL.namedArgument("fields", DSL.literal(
-            new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                "field1", ExprValueUtils.floatValue(1.F),
-                "field2", ExprValueUtils.floatValue(.3F)))))),
-        DSL.namedArgument("query", literal("search query")),
-        DSL.namedArgument("invalid_parameter", literal("invalid_value")));
-    assertThrows(SemanticCheckException.class, () -> buildQuery(expr),
+    FunctionExpression expr =
+        DSL.simple_query_string(
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of(
+                                "field1", ExprValueUtils.floatValue(1.F),
+                                "field2", ExprValueUtils.floatValue(.3F)))))),
+            DSL.namedArgument("query", literal("search query")),
+            DSL.namedArgument("invalid_parameter", literal("invalid_value")));
+    assertThrows(
+        SemanticCheckException.class,
+        () -> buildQuery(expr),
         "Parameter invalid_parameter is invalid for match function.");
   }
 
   @Test
   void match_phrase_invalid_parameter() {
-    FunctionExpression expr = DSL.match_phrase(
-        DSL.namedArgument("field", literal("message")),
-        DSL.namedArgument("query", literal("search query")),
-        DSL.namedArgument("invalid_parameter", literal("invalid_value")));
+    FunctionExpression expr =
+        DSL.match_phrase(
+            DSL.namedArgument("field", new ReferenceExpression("message", OpenSearchTextType.of())),
+            DSL.namedArgument("query", literal("search query")),
+            DSL.namedArgument("invalid_parameter", literal("invalid_value")));
     var msg = assertThrows(SemanticCheckException.class, () -> buildQuery(expr)).getMessage();
     assertTrue(msg.startsWith("Parameter invalid_parameter is invalid for match_phrase function."));
   }
 
   @Test
   void relevancy_func_invalid_arg_values() {
-    final var field = DSL.namedArgument("field", literal("message"));
-    final var fields = DSL.namedArgument("fields", DSL.literal(
-        new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-            "field1", ExprValueUtils.floatValue(1.F),
-            "field2", ExprValueUtils.floatValue(.3F))))));
+    final var field =
+        DSL.namedArgument("field", new ReferenceExpression("message", OpenSearchTextType.of()));
+    final var fields =
+        DSL.namedArgument(
+            "fields",
+            DSL.literal(
+                new ExprTupleValue(
+                    new LinkedHashMap<>(
+                        ImmutableMap.of(
+                            "field1", ExprValueUtils.floatValue(1.F),
+                            "field2", ExprValueUtils.floatValue(.3F))))));
     final var query = DSL.namedArgument("query", literal("search query"));
 
-    var slopTest = DSL.match_phrase(field, query,
-        DSL.namedArgument("slop", literal("1.5")));
+    var slopTest = DSL.match_phrase(field, query, DSL.namedArgument("slop", literal("1.5")));
     var msg = assertThrows(RuntimeException.class, () -> buildQuery(slopTest)).getMessage();
     assertEquals("Invalid slop value: '1.5'. Accepts only integer values.", msg);
 
-    var ztqTest = DSL.match_phrase(field, query,
-        DSL.namedArgument("zero_terms_query", literal("meow")));
+    var ztqTest =
+        DSL.match_phrase(field, query, DSL.namedArgument("zero_terms_query", literal("meow")));
     msg = assertThrows(RuntimeException.class, () -> buildQuery(ztqTest)).getMessage();
     assertEquals(
         "Invalid zero_terms_query value: 'meow'. Available values are: NONE, ALL, NULL.", msg);
 
-    var boostTest = DSL.match(field, query,
-        DSL.namedArgument("boost", literal("pewpew")));
+    var boostTest = DSL.match(field, query, DSL.namedArgument("boost", literal("pewpew")));
     msg = assertThrows(RuntimeException.class, () -> buildQuery(boostTest)).getMessage();
     assertEquals(
         "Invalid boost value: 'pewpew'. Accepts only floating point values greater than 0.", msg);
 
-    var boolTest = DSL.query_string(fields, query,
-        DSL.namedArgument("escape", literal("42")));
+    var boolTest = DSL.query_string(fields, query, DSL.namedArgument("escape", literal("42")));
     msg = assertThrows(RuntimeException.class, () -> buildQuery(boolTest)).getMessage();
     assertEquals(
         "Invalid escape value: '42'. Accepts only boolean values: 'true' or 'false'.", msg);
 
-    var typeTest = DSL.multi_match(fields, query,
-        DSL.namedArgument("type", literal("42")));
+    var typeTest = DSL.multi_match(fields, query, DSL.namedArgument("type", literal("42")));
     msg = assertThrows(RuntimeException.class, () -> buildQuery(typeTest)).getMessage();
     assertTrue(msg.startsWith("Invalid type value: '42'. Available values are:"));
 
-    var operatorTest = DSL.simple_query_string(fields, query,
-        DSL.namedArgument("default_operator", literal("42")));
+    var operatorTest =
+        DSL.simple_query_string(
+            fields, query, DSL.namedArgument("default_operator", literal("42")));
     msg = assertThrows(RuntimeException.class, () -> buildQuery(operatorTest)).getMessage();
     assertTrue(msg.startsWith("Invalid default_operator value: '42'. Available values are:"));
 
-    var flagsTest = DSL.simple_query_string(fields, query,
-        DSL.namedArgument("flags", literal("42")));
+    var flagsTest =
+        DSL.simple_query_string(fields, query, DSL.namedArgument("flags", literal("42")));
     msg = assertThrows(RuntimeException.class, () -> buildQuery(flagsTest)).getMessage();
     assertTrue(msg.startsWith("Invalid flags value: '42'. Available values are:"));
 
-    var fuzzinessTest = DSL.match_bool_prefix(field, query,
-        DSL.namedArgument("fuzziness", literal("AUTO:")));
+    var fuzzinessTest =
+        DSL.match_bool_prefix(field, query, DSL.namedArgument("fuzziness", literal("AUTO:")));
     msg = assertThrows(RuntimeException.class, () -> buildQuery(fuzzinessTest)).getMessage();
     assertTrue(msg.startsWith("Invalid fuzziness value: 'AUTO:'. Available values are:"));
 
-    var rewriteTest = DSL.match_bool_prefix(field, query,
-        DSL.namedArgument("fuzzy_rewrite", literal("42")));
+    var rewriteTest =
+        DSL.match_bool_prefix(field, query, DSL.namedArgument("fuzzy_rewrite", literal("42")));
     msg = assertThrows(RuntimeException.class, () -> buildQuery(rewriteTest)).getMessage();
     assertTrue(msg.startsWith("Invalid fuzzy_rewrite value: '42'. Available values are:"));
 
-    var timezoneTest = DSL.query_string(fields, query,
-        DSL.namedArgument("time_zone", literal("42")));
+    var timezoneTest =
+        DSL.query_string(fields, query, DSL.namedArgument("time_zone", literal("42")));
     msg = assertThrows(RuntimeException.class, () -> buildQuery(timezoneTest)).getMessage();
     assertTrue(msg.startsWith("Invalid time_zone value: '42'."));
   }
@@ -1175,37 +1446,39 @@ void should_build_match_bool_prefix_query_with_default_parameters() {
             + "}",
         buildQuery(
             DSL.match_bool_prefix(
-                DSL.namedArgument("field", literal("message")),
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("message", OpenSearchTextType.of())),
                 DSL.namedArgument("query", literal("search query")))));
   }
 
-  @Test
-  void multi_match_missing_fields() {
-    var msg = assertThrows(SemanticCheckException.class, () ->
-        DSL.multi_match(
-            DSL.namedArgument("query", literal("search query")))).getMessage();
-    assertEquals("Expected type STRUCT instead of STRING for parameter #1", msg);
-  }
-
   @Test
   void multi_match_missing_fields_even_with_struct() {
-    FunctionExpression expr = DSL.multi_match(
-        DSL.namedArgument("something-but-not-fields", DSL.literal(
-            new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                "pewpew", ExprValueUtils.integerValue(42)))))),
-        DSL.namedArgument("query", literal("search query")),
-        DSL.namedArgument("analyzer", literal("keyword")));
+    FunctionExpression expr =
+        DSL.multi_match(
+            DSL.namedArgument(
+                "something-but-not-fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("pewpew", ExprValueUtils.integerValue(42)))))),
+            DSL.namedArgument("query", literal("search query")),
+            DSL.namedArgument("analyzer", literal("keyword")));
     var msg = assertThrows(SemanticCheckException.class, () -> buildQuery(expr)).getMessage();
     assertEquals("'fields' parameter is missing.", msg);
   }
 
   @Test
   void multi_match_missing_query_even_with_struct() {
-    FunctionExpression expr = DSL.multi_match(
-            DSL.namedArgument("fields", DSL.literal(
-                    new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                            "field1", ExprValueUtils.floatValue(1.F),
-                            "field2", ExprValueUtils.floatValue(.3F)))))),
+    FunctionExpression expr =
+        DSL.multi_match(
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of(
+                                "field1", ExprValueUtils.floatValue(1.F),
+                                "field2", ExprValueUtils.floatValue(.3F)))))),
             DSL.namedArgument("analyzer", literal("keyword")));
     var msg = assertThrows(SemanticCheckException.class, () -> buildQuery(expr)).getMessage();
     assertEquals("'query' parameter is missing", msg);
@@ -1227,7 +1500,8 @@ void should_build_match_phrase_prefix_query_with_default_parameters() {
             + "}",
         buildQuery(
             DSL.match_phrase_prefix(
-                DSL.namedArgument("field", literal("message")),
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("message", OpenSearchTextType.of())),
                 DSL.namedArgument("query", literal("search query")))));
   }
 
@@ -1248,7 +1522,8 @@ void should_build_match_phrase_prefix_query_with_non_default_parameters() {
             + "}",
         buildQuery(
             DSL.match_phrase_prefix(
-                DSL.namedArgument("field", literal("message")),
+                DSL.namedArgument(
+                    "field", new ReferenceExpression("message", OpenSearchTextType.of())),
                 DSL.namedArgument("query", literal("search query")),
                 DSL.namedArgument("boost", literal("1.2")),
                 DSL.namedArgument("max_expansions", literal("42")),
@@ -1257,30 +1532,31 @@ void should_build_match_phrase_prefix_query_with_non_default_parameters() {
 
   @Test
   void cast_to_string_in_filter() {
-    String json = "{\n"
-        + "  \"term\" : {\n"
-        + "    \"string_value\" : {\n"
-        + "      \"value\" : \"1\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}";
+    String json =
+        "{\n"
+            + "  \"term\" : {\n"
+            + "    \"string_value\" : {\n"
+            + "      \"value\" : \"1\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
 
-    assertJsonEquals(json, buildQuery(
-        DSL.equal(ref("string_value", STRING), DSL.castString(literal(1)))));
-    assertJsonEquals(json, buildQuery(
-        DSL.equal(ref("string_value", STRING), DSL.castString(literal("1")))));
+    assertJsonEquals(
+        json, buildQuery(DSL.equal(ref("string_value", STRING), DSL.castString(literal(1)))));
+    assertJsonEquals(
+        json, buildQuery(DSL.equal(ref("string_value", STRING), DSL.castString(literal("1")))));
   }
 
   private Float castToFloat(Object o) {
     if (o instanceof Number) {
-      return ((Number)o).floatValue();
+      return ((Number) o).floatValue();
     }
     if (o instanceof String) {
       return Float.parseFloat((String) o);
     }
     if (o instanceof Boolean) {
-      return ((Boolean)o) ? 1F : 0F;
+      return ((Boolean) o) ? 1F : 0F;
     }
     // unreachable code
     throw new IllegalArgumentException();
@@ -1288,13 +1564,13 @@ private Float castToFloat(Object o) {
 
   private Integer castToInteger(Object o) {
     if (o instanceof Number) {
-      return ((Number)o).intValue();
+      return ((Number) o).intValue();
     }
     if (o instanceof String) {
       return Integer.parseInt((String) o);
     }
     if (o instanceof Boolean) {
-      return ((Boolean)o) ? 1 : 0;
+      return ((Boolean) o) ? 1 : 0;
     }
     // unreachable code
     throw new IllegalArgumentException();
@@ -1303,75 +1579,85 @@ private Integer castToInteger(Object o) {
   @ParameterizedTest(name = "castByte({0})")
   @MethodSource({"numericCastSource"})
   void cast_to_byte_in_filter(LiteralExpression expr) {
-    assertJsonEquals(String.format(
-        "{\n"
-            + "  \"term\" : {\n"
-            + "    \"byte_value\" : {\n"
-            + "      \"value\" : %d,\n"
-            + "      \"boost\" : 1.0\n"
-            + "    }\n"
-            + "  }\n"
-            + "}", castToInteger(expr.valueOf().value())),
+    assertJsonEquals(
+        String.format(
+            "{\n"
+                + "  \"term\" : {\n"
+                + "    \"byte_value\" : {\n"
+                + "      \"value\" : %d,\n"
+                + "      \"boost\" : 1.0\n"
+                + "    }\n"
+                + "  }\n"
+                + "}",
+            castToInteger(expr.valueOf().value())),
         buildQuery(DSL.equal(ref("byte_value", BYTE), DSL.castByte(expr))));
   }
 
   @ParameterizedTest(name = "castShort({0})")
   @MethodSource({"numericCastSource"})
   void cast_to_short_in_filter(LiteralExpression expr) {
-    assertJsonEquals(String.format(
-        "{\n"
-            + "  \"term\" : {\n"
-            + "    \"short_value\" : {\n"
-            + "      \"value\" : %d,\n"
-            + "      \"boost\" : 1.0\n"
-            + "    }\n"
-            + "  }\n"
-            + "}", castToInteger(expr.valueOf().value())),
+    assertJsonEquals(
+        String.format(
+            "{\n"
+                + "  \"term\" : {\n"
+                + "    \"short_value\" : {\n"
+                + "      \"value\" : %d,\n"
+                + "      \"boost\" : 1.0\n"
+                + "    }\n"
+                + "  }\n"
+                + "}",
+            castToInteger(expr.valueOf().value())),
         buildQuery(DSL.equal(ref("short_value", SHORT), DSL.castShort(expr))));
   }
 
   @ParameterizedTest(name = "castInt({0})")
   @MethodSource({"numericCastSource"})
   void cast_to_int_in_filter(LiteralExpression expr) {
-    assertJsonEquals(String.format(
-        "{\n"
-            + "  \"term\" : {\n"
-            + "    \"integer_value\" : {\n"
-            + "      \"value\" : %d,\n"
-            + "      \"boost\" : 1.0\n"
-            + "    }\n"
-            + "  }\n"
-            + "}", castToInteger(expr.valueOf().value())),
+    assertJsonEquals(
+        String.format(
+            "{\n"
+                + "  \"term\" : {\n"
+                + "    \"integer_value\" : {\n"
+                + "      \"value\" : %d,\n"
+                + "      \"boost\" : 1.0\n"
+                + "    }\n"
+                + "  }\n"
+                + "}",
+            castToInteger(expr.valueOf().value())),
         buildQuery(DSL.equal(ref("integer_value", INTEGER), DSL.castInt(expr))));
   }
 
   @ParameterizedTest(name = "castLong({0})")
   @MethodSource({"numericCastSource"})
   void cast_to_long_in_filter(LiteralExpression expr) {
-    assertJsonEquals(String.format(
-        "{\n"
-            + "  \"term\" : {\n"
-            + "    \"long_value\" : {\n"
-            + "      \"value\" : %d,\n"
-            + "      \"boost\" : 1.0\n"
-            + "    }\n"
-            + "  }\n"
-            + "}", castToInteger(expr.valueOf().value())),
+    assertJsonEquals(
+        String.format(
+            "{\n"
+                + "  \"term\" : {\n"
+                + "    \"long_value\" : {\n"
+                + "      \"value\" : %d,\n"
+                + "      \"boost\" : 1.0\n"
+                + "    }\n"
+                + "  }\n"
+                + "}",
+            castToInteger(expr.valueOf().value())),
         buildQuery(DSL.equal(ref("long_value", LONG), DSL.castLong(expr))));
   }
 
   @ParameterizedTest(name = "castFloat({0})")
   @MethodSource({"numericCastSource"})
   void cast_to_float_in_filter(LiteralExpression expr) {
-    assertJsonEquals(String.format(
-        "{\n"
-            + "  \"term\" : {\n"
-            + "    \"float_value\" : {\n"
-            + "      \"value\" : %f,\n"
-            + "      \"boost\" : 1.0\n"
-            + "    }\n"
-            + "  }\n"
-            + "}", castToFloat(expr.valueOf().value())),
+    assertJsonEquals(
+        String.format(
+            "{\n"
+                + "  \"term\" : {\n"
+                + "    \"float_value\" : {\n"
+                + "      \"value\" : %f,\n"
+                + "      \"boost\" : 1.0\n"
+                + "    }\n"
+                + "  }\n"
+                + "}",
+            castToFloat(expr.valueOf().value())),
         buildQuery(DSL.equal(ref("float_value", FLOAT), DSL.castFloat(expr))));
   }
 
@@ -1380,32 +1666,35 @@ void cast_to_float_in_filter(LiteralExpression expr) {
   void cast_to_double_in_filter(LiteralExpression expr) {
     // double values affected by floating point imprecision, so we can't compare them in json
     // (Double)(Float)3.14 -> 3.14000010490417
-    assertEquals(castToFloat(expr.valueOf().value()),
-        DSL.castDouble(expr).valueOf().doubleValue(), 0.00001);
+    assertEquals(
+        castToFloat(expr.valueOf().value()), DSL.castDouble(expr).valueOf().doubleValue(), 0.00001);
 
-    assertJsonEquals(String.format(
-        "{\n"
-            + "  \"term\" : {\n"
-            + "    \"double_value\" : {\n"
-            + "      \"value\" : %2.20f,\n"
-            + "      \"boost\" : 1.0\n"
-            + "    }\n"
-            + "  }\n"
-            + "}", DSL.castDouble(expr).valueOf().doubleValue()),
+    assertJsonEquals(
+        String.format(
+            "{\n"
+                + "  \"term\" : {\n"
+                + "    \"double_value\" : {\n"
+                + "      \"value\" : %2.20f,\n"
+                + "      \"boost\" : 1.0\n"
+                + "    }\n"
+                + "  }\n"
+                + "}",
+            DSL.castDouble(expr).valueOf().doubleValue()),
         buildQuery(DSL.equal(ref("double_value", DOUBLE), DSL.castDouble(expr))));
   }
 
   @ParameterizedTest(name = "castBooleanTrue({0})")
   @MethodSource({"booleanTrueCastSource"})
   void cast_to_boolean_true_in_filter(LiteralExpression expr) {
-    String json = "{\n"
-        + "  \"term\" : {\n"
-        + "    \"boolean_value\" : {\n"
-        + "      \"value\" : true,\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}";
+    String json =
+        "{\n"
+            + "  \"term\" : {\n"
+            + "    \"boolean_value\" : {\n"
+            + "      \"value\" : true,\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
 
     assertJsonEquals(
         json, buildQuery(DSL.equal(ref("boolean_value", BOOLEAN), DSL.castBoolean(expr))));
@@ -1414,14 +1703,15 @@ void cast_to_boolean_true_in_filter(LiteralExpression expr) {
   @ParameterizedTest(name = "castBooleanFalse({0})")
   @MethodSource({"booleanFalseCastSource"})
   void cast_to_boolean_false_in_filter(LiteralExpression expr) {
-    String json = "{\n"
-        + "  \"term\" : {\n"
-        + "    \"boolean_value\" : {\n"
-        + "      \"value\" : false,\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}";
+    String json =
+        "{\n"
+            + "  \"term\" : {\n"
+            + "    \"boolean_value\" : {\n"
+            + "      \"value\" : false,\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
 
     assertJsonEquals(
         json, buildQuery(DSL.equal(ref("boolean_value", BOOLEAN), DSL.castBoolean(expr))));
@@ -1430,118 +1720,153 @@ void cast_to_boolean_false_in_filter(LiteralExpression expr) {
   @Test
   void cast_from_boolean() {
     Expression booleanExpr = literal(false);
-    String json = "{\n"
-        + "  \"term\" : {\n"
-        + "    \"my_value\" : {\n"
-        + "      \"value\" : 0,\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}";
-    assertJsonEquals(json, buildQuery(
-        DSL.equal(ref("my_value", BYTE), DSL.castByte(booleanExpr))));
-    assertJsonEquals(json, buildQuery(
-        DSL.equal(ref("my_value", SHORT), DSL.castShort(booleanExpr))));
-    assertJsonEquals(json, buildQuery(
-        DSL.equal(ref("my_value", INTEGER), DSL.castInt(booleanExpr))));
-    assertJsonEquals(json, buildQuery(
-        DSL.equal(ref("my_value", LONG), DSL.castLong(booleanExpr))));
-
-    json = "{\n"
-        + "  \"term\" : {\n"
-        + "    \"my_value\" : {\n"
-        + "      \"value\" : 0.0,\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}";
-    assertJsonEquals(json, buildQuery(
-        DSL.equal(ref("my_value", FLOAT), DSL.castFloat(booleanExpr))));
-    assertJsonEquals(json, buildQuery(
-        DSL.equal(ref("my_value", DOUBLE), DSL.castDouble(booleanExpr))));
-
-    json = "{\n"
-        + "  \"term\" : {\n"
-        + "    \"my_value\" : {\n"
-        + "      \"value\" : \"false\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}";
-    assertJsonEquals(json, buildQuery(
-        DSL.equal(ref("my_value", STRING), DSL.castString(booleanExpr))));
+    String json =
+        "{\n"
+            + "  \"term\" : {\n"
+            + "    \"my_value\" : {\n"
+            + "      \"value\" : 0,\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
+    assertJsonEquals(json, buildQuery(DSL.equal(ref("my_value", BYTE), DSL.castByte(booleanExpr))));
+    assertJsonEquals(
+        json, buildQuery(DSL.equal(ref("my_value", SHORT), DSL.castShort(booleanExpr))));
+    assertJsonEquals(
+        json, buildQuery(DSL.equal(ref("my_value", INTEGER), DSL.castInt(booleanExpr))));
+    assertJsonEquals(json, buildQuery(DSL.equal(ref("my_value", LONG), DSL.castLong(booleanExpr))));
+
+    json =
+        "{\n"
+            + "  \"term\" : {\n"
+            + "    \"my_value\" : {\n"
+            + "      \"value\" : 0.0,\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
+    assertJsonEquals(
+        json, buildQuery(DSL.equal(ref("my_value", FLOAT), DSL.castFloat(booleanExpr))));
+    assertJsonEquals(
+        json, buildQuery(DSL.equal(ref("my_value", DOUBLE), DSL.castDouble(booleanExpr))));
+
+    json =
+        "{\n"
+            + "  \"term\" : {\n"
+            + "    \"my_value\" : {\n"
+            + "      \"value\" : \"false\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
+    assertJsonEquals(
+        json, buildQuery(DSL.equal(ref("my_value", STRING), DSL.castString(booleanExpr))));
   }
 
   @Test
   void cast_to_date_in_filter() {
-    String json = "{\n"
-        + "  \"term\" : {\n"
-        + "    \"date_value\" : {\n"
-        + "      \"value\" : \"2021-11-08\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}";
+    String json =
+        "{\n"
+            + "  \"term\" : {\n"
+            + "    \"date_value\" : {\n"
+            + "      \"value\" : \"2021-11-08\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
+    assertJsonEquals(
+        json, buildQuery(DSL.equal(ref("date_value", DATE), DSL.castDate(literal("2021-11-08")))));
 
-    assertJsonEquals(json, buildQuery(DSL.equal(
-        ref("date_value", DATE), DSL.castDate(literal("2021-11-08")))));
-    assertJsonEquals(json, buildQuery(DSL.equal(
-        ref("date_value", DATE), DSL.castDate(literal(new ExprDateValue("2021-11-08"))))));
-    assertJsonEquals(json, buildQuery(DSL.equal(ref(
-        "date_value", DATE), DSL.castDate(literal(new ExprDatetimeValue("2021-11-08 17:00:00"))))));
+    assertJsonEquals(
+        json,
+        buildQuery(
+            DSL.equal(
+                ref("date_value", DATE), DSL.castDate(literal(new ExprDateValue("2021-11-08"))))));
+    assertJsonEquals(
+        json,
+        buildQuery(
+            DSL.equal(
+                ref("date_value", DATE),
+                DSL.castDate(literal(new ExprDatetimeValue("2021-11-08 17:00:00"))))));
   }
 
   @Test
   void cast_to_time_in_filter() {
-    String json = "{\n"
-        + "  \"term\" : {\n"
-        + "    \"time_value\" : {\n"
-        + "      \"value\" : \"17:00:00\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}";
+    String json =
+        "{\n"
+            + "  \"term\" : {\n"
+            + "    \"time_value\" : {\n"
+            + "      \"value\" : \"17:00:00\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
 
-    assertJsonEquals(json, buildQuery(DSL.equal(
-        ref("time_value", TIME), DSL.castTime(literal("17:00:00")))));
-    assertJsonEquals(json, buildQuery(DSL.equal(
-        ref("time_value", TIME), DSL.castTime(literal(new ExprTimeValue("17:00:00"))))));
-    assertJsonEquals(json, buildQuery(DSL.equal(ref("time_value", TIME), DSL
-        .castTime(literal(new ExprTimestampValue("2021-11-08 17:00:00"))))));
+    assertJsonEquals(
+        json, buildQuery(DSL.equal(ref("time_value", TIME), DSL.castTime(literal("17:00:00")))));
+    assertJsonEquals(
+        json,
+        buildQuery(
+            DSL.equal(
+                ref("time_value", TIME), DSL.castTime(literal(new ExprTimeValue("17:00:00"))))));
+    assertJsonEquals(
+        json,
+        buildQuery(
+            DSL.equal(
+                ref("time_value", TIME),
+                DSL.castTime(literal(new ExprTimestampValue("2021-11-08 17:00:00"))))));
   }
 
   @Test
   void cast_to_datetime_in_filter() {
-    String json = "{\n"
-        + "  \"term\" : {\n"
-        + "    \"datetime_value\" : {\n"
-        + "      \"value\" : \"2021-11-08 17:00:00\",\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}";
+    String json =
+        "{\n"
+            + "  \"term\" : {\n"
+            + "    \"datetime_value\" : {\n"
+            + "      \"value\" : \"2021-11-08 17:00:00\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
 
-    assertJsonEquals(json, buildQuery(DSL.equal(ref("datetime_value", DATETIME), DSL
-        .castDatetime(literal("2021-11-08 17:00:00")))));
-    assertJsonEquals(json, buildQuery(DSL.equal(ref("datetime_value", DATETIME), DSL
-        .castDatetime(literal(new ExprTimestampValue("2021-11-08 17:00:00"))))));
+    assertJsonEquals(
+        json,
+        buildQuery(
+            DSL.equal(
+                ref("datetime_value", DATETIME),
+                DSL.castDatetime(literal("2021-11-08 17:00:00")))));
+    assertJsonEquals(
+        json,
+        buildQuery(
+            DSL.equal(
+                ref("datetime_value", DATETIME),
+                DSL.castDatetime(literal(new ExprTimestampValue("2021-11-08 17:00:00"))))));
   }
 
   @Test
   void cast_to_timestamp_in_filter() {
-    String json = "{\n"
-        + "  \"term\" : {\n"
-        + "    \"timestamp_value\" : {\n"
-        + "      \"value\" : 1636390800000,\n"
-        + "      \"boost\" : 1.0\n"
-        + "    }\n"
-        + "  }\n"
-        + "}";
+    String json =
+        "{\n"
+            + "  \"term\" : {\n"
+            + "    \"timestamp_value\" : {\n"
+            + "      \"value\" : \"2021-11-08 17:00:00\",\n"
+            + "      \"boost\" : 1.0\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
 
-    assertJsonEquals(json, buildQuery(DSL.equal(ref("timestamp_value", TIMESTAMP), DSL
-        .castTimestamp(literal("2021-11-08 17:00:00")))));
-    assertJsonEquals(json, buildQuery(DSL.equal(ref("timestamp_value", TIMESTAMP), DSL
-        .castTimestamp(literal(new ExprTimestampValue("2021-11-08 17:00:00"))))));
+    assertJsonEquals(
+        json,
+        buildQuery(
+            DSL.equal(
+                ref("timestamp_value", TIMESTAMP),
+                DSL.castTimestamp(literal("2021-11-08 17:00:00")))));
+    assertJsonEquals(
+        json,
+        buildQuery(
+            DSL.equal(
+                ref("timestamp_value", TIMESTAMP),
+                DSL.castTimestamp(literal(new ExprTimestampValue("2021-11-08 17:00:00"))))));
   }
 
   @Test
@@ -1550,7 +1875,7 @@ void cast_in_range_query() {
         "{\n"
             + "  \"range\" : {\n"
             + "    \"timestamp_value\" : {\n"
-            + "      \"from\" : 1636390800000,\n"
+            + "      \"from\" : \"2021-11-08 17:00:00\",\n"
             + "      \"to\" : null,"
             + "      \"include_lower\" : false,"
             + "      \"include_upper\" : true,"
@@ -1558,8 +1883,10 @@ void cast_in_range_query() {
             + "    }\n"
             + "  }\n"
             + "}",
-        buildQuery(DSL.greater(ref("timestamp_value", TIMESTAMP), DSL
-            .castTimestamp(literal("2021-11-08 17:00:00")))));
+        buildQuery(
+            DSL.greater(
+                ref("timestamp_value", TIMESTAMP),
+                DSL.castTimestamp(literal("2021-11-08 17:00:00")))));
   }
 
   @Test
@@ -1575,9 +1902,9 @@ void non_literal_in_cast_should_build_script() {
             + "    \"boost\" : 1.0\n"
             + "  }\n"
             + "}",
-        buildQuery(DSL.equal(ref("string_value", STRING), DSL.castString(DSL
-            .add(literal(1), literal(0)))))
-    );
+        buildQuery(
+            DSL.equal(
+                ref("string_value", STRING), DSL.castString(DSL.add(literal(1), literal(0))))));
   }
 
   @Test
@@ -1593,13 +1920,13 @@ void non_cast_nested_function_should_build_script() {
             + "    \"boost\" : 1.0\n"
             + "  }\n"
             + "}",
-        buildQuery(DSL.equal(ref("integer_value", INTEGER), DSL.abs(DSL
-            .add(literal(1), literal(0)))))
-    );
+        buildQuery(
+            DSL.equal(ref("integer_value", INTEGER), DSL.abs(DSL.add(literal(1), literal(0))))));
   }
 
   private static void assertJsonEquals(String expected, String actual) {
-    assertTrue(new JSONObject(expected).similar(new JSONObject(actual)),
+    assertTrue(
+        new JSONObject(expected).similar(new JSONObject(actual)),
         StringUtils.format("Expected: %s, actual: %s", expected, actual));
   }
 
@@ -1608,10 +1935,12 @@ private String buildQuery(Expression expr) {
   }
 
   private void mockToStringSerializer() {
-    doAnswer(invocation -> {
-      Expression expr = invocation.getArgument(0);
-      return expr.toString();
-    }).when(serializer).serialize(any());
+    doAnswer(
+            invocation -> {
+              Expression expr = invocation.getArgument(0);
+              return expr.toString();
+            })
+        .when(serializer)
+        .serialize(any());
   }
-
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LuceneQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LuceneQueryTest.java
index 37b8326ef4..1713d1dd1b 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LuceneQueryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/LuceneQueryTest.java
@@ -3,30 +3,102 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter.lucene;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+import static org.opensearch.sql.expression.DSL.literal;
+import static org.opensearch.sql.expression.DSL.ref;
 
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
+import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDateType;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class LuceneQueryTest {
 
   @Test
   void should_not_support_single_argument_by_default() {
-    assertFalse(new LuceneQuery(){}.canSupport(DSL.abs(DSL.ref("age", INTEGER))));
+    assertFalse(new LuceneQuery() {}.canSupport(DSL.abs(ref("age", INTEGER))));
   }
 
   @Test
   void should_throw_exception_if_not_implemented() {
-    assertThrows(UnsupportedOperationException.class, () ->
-        new LuceneQuery(){}.doBuild(null, null, null));
+    assertThrows(
+        UnsupportedOperationException.class, () -> new LuceneQuery() {}.doBuild(null, null, null));
+  }
+
+  @Test
+  void should_cast_to_time_with_format() {
+    String format = "HH:mm:ss.SSS || HH:mm:ss";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    assertThrows(
+        UnsupportedOperationException.class,
+        () ->
+            new LuceneQuery() {}.build(
+                DSL.equal(ref("time_value", dateType), DSL.castTime(literal("17:00:00")))));
+  }
+
+  @Test
+  void should_cast_to_time_with_no_format() {
+    String format = "HH:mm";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    assertThrows(
+        UnsupportedOperationException.class,
+        () ->
+            new LuceneQuery() {}.build(
+                DSL.equal(ref("time_value", dateType), DSL.castTime(literal("17:00:00")))));
+  }
+
+  @Test
+  void should_cast_to_date_with_format() {
+    String format = "yyyy-MM-dd";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    assertThrows(
+        UnsupportedOperationException.class,
+        () ->
+            new LuceneQuery() {}.build(
+                DSL.equal(ref("date_value", dateType), DSL.castDate(literal("2017-01-02")))));
   }
 
+  @Test
+  void should_cast_to_date_with_no_format() {
+    String format = "yyyy/MM/dd";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    assertThrows(
+        UnsupportedOperationException.class,
+        () ->
+            new LuceneQuery() {}.build(
+                DSL.equal(ref("date_value", dateType), DSL.castDate(literal("2017-01-02")))));
+  }
+
+  @Test
+  void should_cast_to_timestamp_with_format() {
+    String format = "yyyy-MM-dd HH:mm:ss";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    assertThrows(
+        UnsupportedOperationException.class,
+        () ->
+            new LuceneQuery() {}.build(
+                DSL.equal(
+                    ref("timestamp_value", dateType),
+                    DSL.castTimestamp(literal("2021-11-08 17:00:00")))));
+  }
+
+  @Test
+  void should_cast_to_timestamp_with_no_format() {
+    String format = "2021/11/08T17:00:00Z";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    assertThrows(
+        SemanticCheckException.class,
+        () ->
+            new LuceneQuery() {}.build(
+                DSL.equal(
+                    ref("timestamp_value", dateType),
+                    DSL.castTimestamp(literal("2021-11-08 17:00:00 ")))));
+  }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchBoolPrefixQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchBoolPrefixQueryTest.java
index 162c55fcaf..7465bfc5a4 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchBoolPrefixQueryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchBoolPrefixQueryTest.java
@@ -23,8 +23,10 @@
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.NamedArgumentExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.relevance.MatchBoolPrefixQuery;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -33,7 +35,8 @@ public class MatchBoolPrefixQueryTest {
   private final FunctionName matchBoolPrefix = FunctionName.of("match_bool_prefix");
 
   static Stream<List<Expression>> generateValidData() {
-    NamedArgumentExpression field = DSL.namedArgument("field", DSL.literal("field_value"));
+    NamedArgumentExpression field =
+        DSL.namedArgument("field", new ReferenceExpression("field_value", OpenSearchTextType.of()));
     NamedArgumentExpression query = DSL.namedArgument("query", DSL.literal("query_value"));
     return List.of(
             DSL.namedArgument("fuzziness", DSL.literal("AUTO")),
@@ -45,8 +48,9 @@ static Stream<List<Expression>> generateValidData() {
             DSL.namedArgument("boost", DSL.literal("1")),
             DSL.namedArgument("analyzer", DSL.literal("simple")),
             DSL.namedArgument("operator", DSL.literal("Or")),
-            DSL.namedArgument("operator", DSL.literal("and"))
-        ).stream().map(arg -> List.of(field, query, arg));
+            DSL.namedArgument("operator", DSL.literal("and")))
+        .stream()
+        .map(arg -> List.of(field, query, arg));
   }
 
   @ParameterizedTest
@@ -57,33 +61,40 @@ public void test_valid_arguments(List<Expression> validArgs) {
 
   @Test
   public void test_valid_when_two_arguments() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "field_value"),
-        DSL.namedArgument("query", "query_value"));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "query_value"));
     Assertions.assertNotNull(matchBoolPrefixQuery.build(new MatchExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_no_arguments() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> matchBoolPrefixQuery.build(new MatchExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument() {
     List<Expression> arguments = List.of(DSL.namedArgument("field", "field_value"));
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> matchBoolPrefixQuery.build(new MatchExpression(arguments)));
   }
 
   @Test
   public void test_SemanticCheckException_when_invalid_argument() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "field_value"),
-        DSL.namedArgument("query", "query_value"),
-        DSL.namedArgument("unsupported", "unsupported_value"));
-    Assertions.assertThrows(SemanticCheckException.class,
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "query_value"),
+            DSL.namedArgument("unsupported", "unsupported_value"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
         () -> matchBoolPrefixQuery.build(new MatchExpression(arguments)));
   }
 
@@ -94,14 +105,16 @@ public MatchExpression(List<Expression> arguments) {
 
     @Override
     public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "valueOf function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "valueOf function need implementation only to support Expression interface");
     }
 
     @Override
     public ExprType type() {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "type function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "type function need implementation only to support Expression interface");
     }
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhrasePrefixQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhrasePrefixQueryTest.java
index a0b9e5f318..a3cf54bc5f 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhrasePrefixQueryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhrasePrefixQueryTest.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.opensearch.storage.script.filter.lucene;
 
-
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.List;
@@ -20,12 +19,14 @@
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.FunctionExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.relevance.MatchPhrasePrefixQuery;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
-public class MatchPhrasePrefixQueryTest  {
+public class MatchPhrasePrefixQueryTest {
 
   private final MatchPhrasePrefixQuery matchPhrasePrefixQuery = new MatchPhrasePrefixQuery();
   private final FunctionName matchPhrasePrefix = FunctionName.of("match_phrase_prefix");
@@ -33,82 +34,89 @@ public class MatchPhrasePrefixQueryTest  {
   @Test
   public void test_SyntaxCheckException_when_no_arguments() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> matchPhrasePrefixQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument() {
-    List<Expression> arguments = List.of(DSL.namedArgument("field", "test"));
-    assertThrows(SyntaxCheckException.class,
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())));
+    assertThrows(
+        SyntaxCheckException.class,
         () -> matchPhrasePrefixQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_invalid_parameter() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "test"),
-        DSL.namedArgument("query", "test2"),
-        DSL.namedArgument("unsupported", "3"));
-    Assertions.assertThrows(SemanticCheckException.class,
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "test2"),
+            DSL.namedArgument("unsupported", "3"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
         () -> matchPhrasePrefixQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_analyzer_parameter() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("analyzer", "standard")
-    );
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("analyzer", "standard"));
     Assertions.assertNotNull(matchPhrasePrefixQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void build_succeeds_with_two_arguments() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "test"),
-        DSL.namedArgument("query", "test2"));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "test2"));
     Assertions.assertNotNull(matchPhrasePrefixQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_slop_parameter() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("slop", "2")
-    );
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("slop", "2"));
     Assertions.assertNotNull(matchPhrasePrefixQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_zero_terms_query_parameter() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("zero_terms_query", "ALL")
-    );
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("zero_terms_query", "ALL"));
     Assertions.assertNotNull(matchPhrasePrefixQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_zero_terms_query_parameter_lower_case() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("zero_terms_query", "all")
-    );
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("zero_terms_query", "all"));
     Assertions.assertNotNull(matchPhrasePrefixQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_boost_parameter() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("boost", "0.1")
-    );
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("boost", "0.1"));
     Assertions.assertNotNull(matchPhrasePrefixQuery.build(new MatchPhraseExpression(arguments)));
   }
 
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhraseQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhraseQueryTest.java
index 6a298326b7..66c4c00059 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhraseQueryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhraseQueryTest.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.opensearch.storage.script.filter.lucene;
 
-
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.List;
@@ -20,8 +19,10 @@
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.FunctionExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.relevance.MatchPhraseQuery;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -35,235 +36,259 @@ public class MatchPhraseQueryTest {
   @Test
   public void test_SyntaxCheckException_when_no_arguments() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> matchPhraseQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument() {
-    List<Expression> arguments = List.of(DSL.namedArgument("field", "test"));
-    assertThrows(SyntaxCheckException.class,
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())));
+    assertThrows(
+        SyntaxCheckException.class,
         () -> matchPhraseQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_invalid_parameter() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "test"),
-        DSL.namedArgument("query", "test2"),
-        DSL.namedArgument("unsupported", "3"));
-    Assertions.assertThrows(SemanticCheckException.class,
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "test2"),
+            DSL.namedArgument("unsupported", "3"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
         () -> matchPhraseQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_analyzer_parameter() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("analyzer", "standard")
-    );
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("analyzer", "standard"));
     Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void build_succeeds_with_two_arguments() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "test"),
-        DSL.namedArgument("query", "test2"));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "test2"));
     Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_slop_parameter() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("slop", "2")
-    );
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("slop", "2"));
     Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_zero_terms_query_parameter() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("zero_terms_query", "ALL")
-    );
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("zero_terms_query", "ALL"));
     Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_zero_terms_query_parameter_lower_case() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("zero_terms_query", "all")
-    );
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("zero_terms_query", "all"));
     Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_no_arguments_match_phrase_syntax() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
-        () -> matchPhraseQuery.build(new MatchPhraseExpression(
-            arguments, matchPhraseWithUnderscoreName)));
+    assertThrows(
+        SyntaxCheckException.class,
+        () ->
+            matchPhraseQuery.build(
+                new MatchPhraseExpression(arguments, matchPhraseWithUnderscoreName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument_match_phrase_syntax() {
-    List<Expression> arguments = List.of(DSL.namedArgument("field", "test"));
-    assertThrows(SyntaxCheckException.class,
-        () -> matchPhraseQuery.build(new MatchPhraseExpression(
-            arguments, matchPhraseWithUnderscoreName)));
-
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())));
+    assertThrows(
+        SyntaxCheckException.class,
+        () ->
+            matchPhraseQuery.build(
+                new MatchPhraseExpression(arguments, matchPhraseWithUnderscoreName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_invalid_parameter_match_phrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "test"),
-        DSL.namedArgument("query", "test2"),
-        DSL.namedArgument("unsupported", "3"));
-    Assertions.assertThrows(SemanticCheckException.class,
-        () -> matchPhraseQuery.build(new MatchPhraseExpression(
-            arguments, matchPhraseWithUnderscoreName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "test2"),
+            DSL.namedArgument("unsupported", "3"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
+        () ->
+            matchPhraseQuery.build(
+                new MatchPhraseExpression(arguments, matchPhraseWithUnderscoreName)));
   }
 
   @Test
   public void test_analyzer_parameter_match_phrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("analyzer", "standard")
-    );
-    Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(
-            arguments, matchPhraseWithUnderscoreName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("analyzer", "standard"));
+    Assertions.assertNotNull(
+        matchPhraseQuery.build(
+            new MatchPhraseExpression(arguments, matchPhraseWithUnderscoreName)));
   }
 
   @Test
   public void build_succeeds_with_two_arguments_match_phrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "test"),
-        DSL.namedArgument("query", "test2"));
-    Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(
-        arguments, matchPhraseWithUnderscoreName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "test2"));
+    Assertions.assertNotNull(
+        matchPhraseQuery.build(
+            new MatchPhraseExpression(arguments, matchPhraseWithUnderscoreName)));
   }
 
   @Test
   public void test_slop_parameter_match_phrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("slop", "2")
-    );
-    Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(
-        arguments, matchPhraseWithUnderscoreName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("slop", "2"));
+    Assertions.assertNotNull(
+        matchPhraseQuery.build(
+            new MatchPhraseExpression(arguments, matchPhraseWithUnderscoreName)));
   }
 
   @Test
   public void test_zero_terms_query_parameter_match_phrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("zero_terms_query", "ALL")
-    );
-    Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(
-        arguments, matchPhraseWithUnderscoreName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("zero_terms_query", "ALL"));
+    Assertions.assertNotNull(
+        matchPhraseQuery.build(
+            new MatchPhraseExpression(arguments, matchPhraseWithUnderscoreName)));
   }
 
   @Test
   public void test_zero_terms_query_parameter_lower_case_match_phrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("zero_terms_query", "all")
-    );
-    Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(
-        arguments, matchPhraseWithUnderscoreName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("zero_terms_query", "all"));
+    Assertions.assertNotNull(
+        matchPhraseQuery.build(
+            new MatchPhraseExpression(arguments, matchPhraseWithUnderscoreName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_no_arguments_matchphrase_syntax() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
-        () -> matchPhraseQuery.build(new MatchPhraseExpression(
-            arguments, matchPhraseQueryName)));
+    assertThrows(
+        SyntaxCheckException.class,
+        () -> matchPhraseQuery.build(new MatchPhraseExpression(arguments, matchPhraseQueryName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument_matchphrase_syntax() {
-    List<Expression> arguments = List.of(DSL.namedArgument("field", "test"));
-    assertThrows(SyntaxCheckException.class,
-        () -> matchPhraseQuery.build(new MatchPhraseExpression(
-            arguments, matchPhraseQueryName)));
-
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())));
+    assertThrows(
+        SyntaxCheckException.class,
+        () -> matchPhraseQuery.build(new MatchPhraseExpression(arguments, matchPhraseQueryName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_invalid_parameter_matchphrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "test"),
-        DSL.namedArgument("query", "test2"),
-        DSL.namedArgument("unsupported", "3"));
-    Assertions.assertThrows(SemanticCheckException.class,
-        () -> matchPhraseQuery.build(new MatchPhraseExpression(
-            arguments, matchPhraseQueryName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "test2"),
+            DSL.namedArgument("unsupported", "3"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
+        () -> matchPhraseQuery.build(new MatchPhraseExpression(arguments, matchPhraseQueryName)));
   }
 
   @Test
   public void test_analyzer_parameter_matchphrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("analyzer", "standard")
-    );
-    Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(
-        arguments, matchPhraseQueryName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("analyzer", "standard"));
+    Assertions.assertNotNull(
+        matchPhraseQuery.build(new MatchPhraseExpression(arguments, matchPhraseQueryName)));
   }
 
   @Test
   public void build_succeeds_with_two_arguments_matchphrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "test"),
-        DSL.namedArgument("query", "test2"));
-    Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(
-        arguments, matchPhraseQueryName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("test", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "test2"));
+    Assertions.assertNotNull(
+        matchPhraseQuery.build(new MatchPhraseExpression(arguments, matchPhraseQueryName)));
   }
 
   @Test
   public void test_slop_parameter_matchphrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("slop", "2")
-    );
-    Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(
-        arguments, matchPhraseQueryName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("slop", "2"));
+    Assertions.assertNotNull(
+        matchPhraseQuery.build(new MatchPhraseExpression(arguments, matchPhraseQueryName)));
   }
 
   @Test
   public void test_zero_terms_query_parameter_matchphrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("zero_terms_query", "ALL")
-    );
-    Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(
-        arguments, matchPhraseQueryName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("zero_terms_query", "ALL"));
+    Assertions.assertNotNull(
+        matchPhraseQuery.build(new MatchPhraseExpression(arguments, matchPhraseQueryName)));
   }
 
   @Test
   public void test_zero_terms_query_parameter_lower_case_matchphrase_syntax() {
-    List<Expression> arguments = List.of(
-        DSL.namedArgument("field", "t1"),
-        DSL.namedArgument("query", "t2"),
-        DSL.namedArgument("zero_terms_query", "all")
-    );
-    Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(
-        arguments, matchPhraseQueryName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument("field", new ReferenceExpression("t1", OpenSearchTextType.of())),
+            DSL.namedArgument("query", "t2"),
+            DSL.namedArgument("zero_terms_query", "all"));
+    Assertions.assertNotNull(
+        matchPhraseQuery.build(new MatchPhraseExpression(arguments, matchPhraseQueryName)));
   }
 
   private class MatchPhraseExpression extends FunctionExpression {
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchQueryTest.java
index e18b477745..28b7878d63 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchQueryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchQueryTest.java
@@ -23,8 +23,10 @@
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.NamedArgumentExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.relevance.MatchQuery;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -33,81 +35,81 @@ public class MatchQueryTest {
   private final FunctionName matchName = FunctionName.of("match");
   private final FunctionName matchQueryName = FunctionName.of("matchquery");
   private final FunctionName matchQueryWithUnderscoreName = FunctionName.of("match_query");
-  private final FunctionName[] functionNames =
-      {matchName,matchQueryName, matchQueryWithUnderscoreName};
+  private final FunctionName[] functionNames = {
+    matchName, matchQueryName, matchQueryWithUnderscoreName
+  };
 
   static Stream<List<Expression>> generateValidData() {
     return Stream.of(
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
-            DSL.namedArgument("query", DSL.literal("query_value"))
-        ),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
+            DSL.namedArgument("query", DSL.literal("query_value"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("analyzer", DSL.literal("standard"))
-        ),
+            DSL.namedArgument("analyzer", DSL.literal("standard"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("auto_generate_synonyms_phrase_query", DSL.literal("true"))
-        ),
+            DSL.namedArgument("auto_generate_synonyms_phrase_query", DSL.literal("true"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("fuzziness", DSL.literal("AUTO"))
-        ),
+            DSL.namedArgument("fuzziness", DSL.literal("AUTO"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("max_expansions", DSL.literal("50"))
-        ),
+            DSL.namedArgument("max_expansions", DSL.literal("50"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("prefix_length", DSL.literal("0"))
-        ),
+            DSL.namedArgument("prefix_length", DSL.literal("0"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("fuzzy_transpositions", DSL.literal("true"))
-        ),
+            DSL.namedArgument("fuzzy_transpositions", DSL.literal("true"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("fuzzy_rewrite", DSL.literal("constant_score"))
-        ),
+            DSL.namedArgument("fuzzy_rewrite", DSL.literal("constant_score"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("lenient", DSL.literal("false"))
-        ),
+            DSL.namedArgument("lenient", DSL.literal("false"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("operator", DSL.literal("OR"))
-        ),
+            DSL.namedArgument("operator", DSL.literal("OR"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("minimum_should_match", DSL.literal("3"))
-        ),
+            DSL.namedArgument("minimum_should_match", DSL.literal("3"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("zero_terms_query", DSL.literal("NONE"))
-        ),
+            DSL.namedArgument("zero_terms_query", DSL.literal("NONE"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("zero_terms_query", DSL.literal("none"))
-        ),
+            DSL.namedArgument("zero_terms_query", DSL.literal("none"))),
         List.of(
-            DSL.namedArgument("field", DSL.literal("field_value")),
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
             DSL.namedArgument("query", DSL.literal("query_value")),
-            DSL.namedArgument("boost", DSL.literal("1"))
-        )
-    );
+            DSL.namedArgument("boost", DSL.literal("1"))));
   }
 
   @ParameterizedTest
@@ -119,96 +121,108 @@ public void test_valid_parameters(List<Expression> validArgs) {
   @Test
   public void test_SyntaxCheckException_when_no_arguments() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
-        () -> matchQuery.build(new MatchExpression(arguments)));
+    assertThrows(
+        SyntaxCheckException.class, () -> matchQuery.build(new MatchExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument() {
     List<Expression> arguments = List.of(namedArgument("field", "field_value"));
-    assertThrows(SyntaxCheckException.class,
-        () -> matchQuery.build(new MatchExpression(arguments)));
+    assertThrows(
+        SyntaxCheckException.class, () -> matchQuery.build(new MatchExpression(arguments)));
   }
 
   @Test
   public void test_SemanticCheckException_when_invalid_parameter() {
-    List<Expression> arguments = List.of(
-        namedArgument("field", "field_value"),
-        namedArgument("query", "query_value"),
-        namedArgument("unsupported", "unsupported_value"));
-    Assertions.assertThrows(SemanticCheckException.class,
-        () -> matchQuery.build(new MatchExpression(arguments)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
+            namedArgument("query", "query_value"),
+            namedArgument("unsupported", "unsupported_value"));
+    Assertions.assertThrows(
+        SemanticCheckException.class, () -> matchQuery.build(new MatchExpression(arguments)));
   }
 
   @ParameterizedTest
   @MethodSource("generateValidData")
   public void test_valid_parameters_matchquery_syntax(List<Expression> validArgs) {
-    Assertions.assertNotNull(matchQuery.build(
-        new MatchExpression(validArgs, MatchQueryTest.this.matchQueryName)));
+    Assertions.assertNotNull(
+        matchQuery.build(new MatchExpression(validArgs, MatchQueryTest.this.matchQueryName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_no_arguments_matchquery_syntax() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
-        () -> matchQuery.build(
-            new MatchExpression(arguments, MatchQueryTest.this.matchQueryName)));
+    assertThrows(
+        SyntaxCheckException.class,
+        () -> matchQuery.build(new MatchExpression(arguments, MatchQueryTest.this.matchQueryName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument_matchquery_syntax() {
     List<Expression> arguments = List.of(namedArgument("field", "field_value"));
-    assertThrows(SyntaxCheckException.class,
-        () -> matchQuery.build(
-            new MatchExpression(arguments, MatchQueryTest.this.matchQueryName)));
+    assertThrows(
+        SyntaxCheckException.class,
+        () -> matchQuery.build(new MatchExpression(arguments, MatchQueryTest.this.matchQueryName)));
   }
 
   @Test
   public void test_SemanticCheckException_when_invalid_parameter_matchquery_syntax() {
-    List<Expression> arguments = List.of(
-        namedArgument("field", "field_value"),
-        namedArgument("query", "query_value"),
-        namedArgument("unsupported", "unsupported_value"));
-    Assertions.assertThrows(SemanticCheckException.class,
-        () -> matchQuery.build(
-            new MatchExpression(arguments, MatchQueryTest.this.matchQueryName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
+            namedArgument("query", "query_value"),
+            namedArgument("unsupported", "unsupported_value"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
+        () -> matchQuery.build(new MatchExpression(arguments, MatchQueryTest.this.matchQueryName)));
   }
 
   @ParameterizedTest
   @MethodSource("generateValidData")
   public void test_valid_parameters_match_query_syntax(List<Expression> validArgs) {
-    Assertions.assertNotNull(matchQuery.build(
-        new MatchExpression(validArgs, MatchQueryTest.this.matchQueryWithUnderscoreName)));
+    Assertions.assertNotNull(
+        matchQuery.build(
+            new MatchExpression(validArgs, MatchQueryTest.this.matchQueryWithUnderscoreName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_no_arguments_match_query_syntax() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
-        () -> matchQuery.build(
-            new MatchExpression(arguments, MatchQueryTest.this.matchQueryWithUnderscoreName)));
+    assertThrows(
+        SyntaxCheckException.class,
+        () ->
+            matchQuery.build(
+                new MatchExpression(arguments, MatchQueryTest.this.matchQueryWithUnderscoreName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument_match_query_syntax() {
     List<Expression> arguments = List.of(namedArgument("field", "field_value"));
-    assertThrows(SyntaxCheckException.class,
-        () -> matchQuery.build(
-            new MatchExpression(arguments, MatchQueryTest.this.matchQueryWithUnderscoreName)));
+    assertThrows(
+        SyntaxCheckException.class,
+        () ->
+            matchQuery.build(
+                new MatchExpression(arguments, MatchQueryTest.this.matchQueryWithUnderscoreName)));
   }
 
   @Test
   public void test_SemanticCheckException_when_invalid_parameter_match_query_syntax() {
-    List<Expression> arguments = List.of(
-        namedArgument("field", "field_value"),
-        namedArgument("query", "query_value"),
-        namedArgument("unsupported", "unsupported_value"));
-    Assertions.assertThrows(SemanticCheckException.class,
-        () -> matchQuery.build(
-            new MatchExpression(arguments, MatchQueryTest.this.matchQueryWithUnderscoreName)));
+    List<Expression> arguments =
+        List.of(
+            DSL.namedArgument(
+                "field", new ReferenceExpression("field_value", OpenSearchTextType.of())),
+            namedArgument("query", "query_value"),
+            namedArgument("unsupported", "unsupported_value"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
+        () ->
+            matchQuery.build(
+                new MatchExpression(arguments, MatchQueryTest.this.matchQueryWithUnderscoreName)));
   }
 
-
   private NamedArgumentExpression namedArgument(String name, String value) {
     return DSL.namedArgument(name, DSL.literal(value));
   }
@@ -225,14 +239,16 @@ public MatchExpression(List<Expression> arguments, FunctionName funcName) {
 
     @Override
     public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "valueOf function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "valueOf function need implementation only to support Expression interface");
     }
 
     @Override
     public ExprType type() {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "type function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "type function need implementation only to support Expression interface");
     }
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MultiMatchTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MultiMatchTest.java
index 93b0cdbc93..7fcc4a6430 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MultiMatchTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MultiMatchTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter.lucene;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -39,186 +38,181 @@ class MultiMatchTest {
   private final FunctionName multiMatchName = FunctionName.of("multimatch");
   private final FunctionName snakeCaseMultiMatchName = FunctionName.of("multi_match");
   private final FunctionName multiMatchQueryName = FunctionName.of("multimatchquery");
-  private static final LiteralExpression fields_value = DSL.literal(
-      new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-          "title", ExprValueUtils.floatValue(1.F),
-          "body", ExprValueUtils.floatValue(.3F)))));
+  private static final LiteralExpression fields_value =
+      DSL.literal(
+          new ExprTupleValue(
+              new LinkedHashMap<>(
+                  ImmutableMap.of(
+                      "title", ExprValueUtils.floatValue(1.F),
+                      "body", ExprValueUtils.floatValue(.3F)))));
   private static final LiteralExpression query_value = DSL.literal("query_value");
 
   static Stream<List<Expression>> generateValidData() {
     return Stream.of(
-        List.of(
-            DSL.namedArgument("fields", fields_value),
-            DSL.namedArgument("query", query_value)
-        ),
+        List.of(DSL.namedArgument("fields", fields_value), DSL.namedArgument("query", query_value)),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("analyzer", DSL.literal("simple"))
-        ),
+            DSL.namedArgument("analyzer", DSL.literal("simple"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("auto_generate_synonyms_phrase_query", DSL.literal("true"))
-        ),
+            DSL.namedArgument("auto_generate_synonyms_phrase_query", DSL.literal("true"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("boost", DSL.literal("1.3"))
-        ),
+            DSL.namedArgument("boost", DSL.literal("1.3"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("cutoff_frequency", DSL.literal("4.2"))
-        ),
+            DSL.namedArgument("cutoff_frequency", DSL.literal("4.2"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("fuzziness", DSL.literal("AUTO:2,4"))
-        ),
+            DSL.namedArgument("fuzziness", DSL.literal("AUTO:2,4"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("fuzzy_transpositions", DSL.literal("true"))
-        ),
+            DSL.namedArgument("fuzzy_transpositions", DSL.literal("true"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("lenient", DSL.literal("true"))
-        ),
+            DSL.namedArgument("lenient", DSL.literal("true"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("max_expansions", DSL.literal("7"))
-        ),
+            DSL.namedArgument("max_expansions", DSL.literal("7"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("minimum_should_match", DSL.literal("4"))
-        ),
+            DSL.namedArgument("minimum_should_match", DSL.literal("4"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("operator", DSL.literal("AND"))
-        ),
+            DSL.namedArgument("operator", DSL.literal("AND"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("prefix_length", DSL.literal("7"))
-        ),
+            DSL.namedArgument("prefix_length", DSL.literal("7"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("tie_breaker", DSL.literal("0.3"))
-        ),
+            DSL.namedArgument("tie_breaker", DSL.literal("0.3"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("type", DSL.literal("cross_fields"))
-        ),
+            DSL.namedArgument("type", DSL.literal("cross_fields"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("zero_terms_query", DSL.literal("ALL"))
-        ),
+            DSL.namedArgument("zero_terms_query", DSL.literal("ALL"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("zero_terms_query", DSL.literal("all"))
-        )
-      );
+            DSL.namedArgument("zero_terms_query", DSL.literal("all"))));
   }
 
   @ParameterizedTest
   @MethodSource("generateValidData")
   public void test_valid_parameters_multiMatch(List<Expression> validArgs) {
-    Assertions.assertNotNull(multiMatchQuery.build(
-        new MultiMatchExpression(validArgs)));
+    Assertions.assertNotNull(multiMatchQuery.build(new MultiMatchExpression(validArgs)));
   }
 
   @ParameterizedTest
   @MethodSource("generateValidData")
   public void test_valid_parameters_multi_match(List<Expression> validArgs) {
-    Assertions.assertNotNull(multiMatchQuery.build(
-        new MultiMatchExpression(validArgs, snakeCaseMultiMatchName)));
+    Assertions.assertNotNull(
+        multiMatchQuery.build(new MultiMatchExpression(validArgs, snakeCaseMultiMatchName)));
   }
 
   @ParameterizedTest
   @MethodSource("generateValidData")
   public void test_valid_parameters_multiMatchQuery(List<Expression> validArgs) {
-    Assertions.assertNotNull(multiMatchQuery.build(
-        new MultiMatchExpression(validArgs, multiMatchQueryName)));
+    Assertions.assertNotNull(
+        multiMatchQuery.build(new MultiMatchExpression(validArgs, multiMatchQueryName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_no_arguments_multiMatch() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> multiMatchQuery.build(new MultiMatchExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_no_arguments_multi_match() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> multiMatchQuery.build(new MultiMatchExpression(arguments, multiMatchName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_no_arguments_multiMatchQuery() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> multiMatchQuery.build(new MultiMatchExpression(arguments, multiMatchQueryName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument_multiMatch() {
     List<Expression> arguments = List.of(namedArgument("fields", fields_value));
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> multiMatchQuery.build(new MultiMatchExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument_multi_match() {
     List<Expression> arguments = List.of(namedArgument("fields", fields_value));
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> multiMatchQuery.build(new MultiMatchExpression(arguments, snakeCaseMultiMatchName)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument_multiMatchQuery() {
     List<Expression> arguments = List.of(namedArgument("fields", fields_value));
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> multiMatchQuery.build(new MultiMatchExpression(arguments, multiMatchQueryName)));
   }
 
   @Test
   public void test_SemanticCheckException_when_invalid_parameter_multiMatch() {
-    List<Expression> arguments = List.of(
-        namedArgument("fields", fields_value),
-        namedArgument("query", query_value),
-        DSL.namedArgument("unsupported", "unsupported_value"));
-    Assertions.assertThrows(SemanticCheckException.class,
+    List<Expression> arguments =
+        List.of(
+            namedArgument("fields", fields_value),
+            namedArgument("query", query_value),
+            DSL.namedArgument("unsupported", "unsupported_value"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
         () -> multiMatchQuery.build(new MultiMatchExpression(arguments)));
   }
 
   @Test
   public void test_SemanticCheckException_when_invalid_parameter_multi_match() {
-    List<Expression> arguments = List.of(
-        namedArgument("fields", fields_value),
-        namedArgument("query", query_value),
-        DSL.namedArgument("unsupported", "unsupported_value"));
-    Assertions.assertThrows(SemanticCheckException.class,
+    List<Expression> arguments =
+        List.of(
+            namedArgument("fields", fields_value),
+            namedArgument("query", query_value),
+            DSL.namedArgument("unsupported", "unsupported_value"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
         () -> multiMatchQuery.build(new MultiMatchExpression(arguments, snakeCaseMultiMatchName)));
   }
 
   @Test
   public void test_SemanticCheckException_when_invalid_parameter_multiMatchQuery() {
-    List<Expression> arguments = List.of(
-        namedArgument("fields", fields_value),
-        namedArgument("query", query_value),
-        DSL.namedArgument("unsupported", "unsupported_value"));
-    Assertions.assertThrows(SemanticCheckException.class,
+    List<Expression> arguments =
+        List.of(
+            namedArgument("fields", fields_value),
+            namedArgument("query", query_value),
+            DSL.namedArgument("unsupported", "unsupported_value"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
         () -> multiMatchQuery.build(new MultiMatchExpression(arguments, multiMatchQueryName)));
   }
 
@@ -235,17 +229,18 @@ public MultiMatchExpression(List<Expression> arguments, FunctionName funcName) {
       super(funcName, arguments);
     }
 
-
     @Override
     public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "valueOf function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "valueOf function need implementation only to support Expression interface");
     }
 
     @Override
     public ExprType type() {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "type function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "type function need implementation only to support Expression interface");
     }
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryStringTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryStringTest.java
index 32c02959b8..781e27d71a 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryStringTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryStringTest.java
@@ -36,76 +36,82 @@
 class QueryStringTest {
   private final QueryStringQuery queryStringQuery = new QueryStringQuery();
   private final FunctionName queryStringFunc = FunctionName.of("query_string");
-  private static final LiteralExpression fields_value = DSL.literal(
-      new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-          "title", ExprValueUtils.floatValue(1.F),
-          "body", ExprValueUtils.floatValue(.3F)))));
+  private static final LiteralExpression fields_value =
+      DSL.literal(
+          new ExprTupleValue(
+              new LinkedHashMap<>(
+                  ImmutableMap.of(
+                      "title", ExprValueUtils.floatValue(1.F),
+                      "body", ExprValueUtils.floatValue(.3F)))));
   private static final LiteralExpression query_value = DSL.literal("query_value");
 
   static Stream<List<Expression>> generateValidData() {
     Expression field = DSL.namedArgument("fields", fields_value);
     Expression query = DSL.namedArgument("query", query_value);
     return Stream.of(
-        DSL.namedArgument("analyzer", DSL.literal("standard")),
-        DSL.namedArgument("analyze_wildcard", DSL.literal("true")),
-        DSL.namedArgument("allow_leading_wildcard", DSL.literal("true")),
-        DSL.namedArgument("auto_generate_synonyms_phrase_query", DSL.literal("true")),
-        DSL.namedArgument("boost", DSL.literal("1")),
-        DSL.namedArgument("default_operator", DSL.literal("AND")),
-        DSL.namedArgument("default_operator", DSL.literal("and")),
-        DSL.namedArgument("enable_position_increments", DSL.literal("true")),
-        DSL.namedArgument("escape", DSL.literal("false")),
-        DSL.namedArgument("fuzziness", DSL.literal("1")),
-        DSL.namedArgument("fuzzy_rewrite", DSL.literal("constant_score")),
-        DSL.namedArgument("fuzzy_max_expansions", DSL.literal("42")),
-        DSL.namedArgument("fuzzy_prefix_length", DSL.literal("42")),
-        DSL.namedArgument("fuzzy_transpositions", DSL.literal("true")),
-        DSL.namedArgument("lenient", DSL.literal("true")),
-        DSL.namedArgument("max_determinized_states", DSL.literal("10000")),
-        DSL.namedArgument("minimum_should_match", DSL.literal("4")),
-        DSL.namedArgument("quote_analyzer", DSL.literal("standard")),
-        DSL.namedArgument("phrase_slop", DSL.literal("0")),
-        DSL.namedArgument("quote_field_suffix", DSL.literal(".exact")),
-        DSL.namedArgument("rewrite", DSL.literal("constant_score")),
-        DSL.namedArgument("type", DSL.literal("best_fields")),
-        DSL.namedArgument("tie_breaker", DSL.literal("0.3")),
-        DSL.namedArgument("time_zone", DSL.literal("Canada/Pacific")),
-        DSL.namedArgument("ANALYZER", DSL.literal("standard")),
-        DSL.namedArgument("ANALYZE_wildcard", DSL.literal("true")),
-        DSL.namedArgument("Allow_Leading_wildcard", DSL.literal("true")),
-        DSL.namedArgument("Auto_Generate_Synonyms_Phrase_Query", DSL.literal("true")),
-        DSL.namedArgument("Boost", DSL.literal("1"))
-    ).map(arg -> List.of(field, query, arg));
+            DSL.namedArgument("analyzer", DSL.literal("standard")),
+            DSL.namedArgument("analyze_wildcard", DSL.literal("true")),
+            DSL.namedArgument("allow_leading_wildcard", DSL.literal("true")),
+            DSL.namedArgument("auto_generate_synonyms_phrase_query", DSL.literal("true")),
+            DSL.namedArgument("boost", DSL.literal("1")),
+            DSL.namedArgument("default_operator", DSL.literal("AND")),
+            DSL.namedArgument("default_operator", DSL.literal("and")),
+            DSL.namedArgument("enable_position_increments", DSL.literal("true")),
+            DSL.namedArgument("escape", DSL.literal("false")),
+            DSL.namedArgument("fuzziness", DSL.literal("1")),
+            DSL.namedArgument("fuzzy_rewrite", DSL.literal("constant_score")),
+            DSL.namedArgument("fuzzy_max_expansions", DSL.literal("42")),
+            DSL.namedArgument("fuzzy_prefix_length", DSL.literal("42")),
+            DSL.namedArgument("fuzzy_transpositions", DSL.literal("true")),
+            DSL.namedArgument("lenient", DSL.literal("true")),
+            DSL.namedArgument("max_determinized_states", DSL.literal("10000")),
+            DSL.namedArgument("minimum_should_match", DSL.literal("4")),
+            DSL.namedArgument("quote_analyzer", DSL.literal("standard")),
+            DSL.namedArgument("phrase_slop", DSL.literal("0")),
+            DSL.namedArgument("quote_field_suffix", DSL.literal(".exact")),
+            DSL.namedArgument("rewrite", DSL.literal("constant_score")),
+            DSL.namedArgument("type", DSL.literal("best_fields")),
+            DSL.namedArgument("tie_breaker", DSL.literal("0.3")),
+            DSL.namedArgument("time_zone", DSL.literal("Canada/Pacific")),
+            DSL.namedArgument("ANALYZER", DSL.literal("standard")),
+            DSL.namedArgument("ANALYZE_wildcard", DSL.literal("true")),
+            DSL.namedArgument("Allow_Leading_wildcard", DSL.literal("true")),
+            DSL.namedArgument("Auto_Generate_Synonyms_Phrase_Query", DSL.literal("true")),
+            DSL.namedArgument("Boost", DSL.literal("1")))
+        .map(arg -> List.of(field, query, arg));
   }
 
   @ParameterizedTest
   @MethodSource("generateValidData")
   void test_valid_parameters(List<Expression> validArgs) {
-    Assertions.assertNotNull(queryStringQuery.build(
-        new QueryStringExpression(validArgs)));
+    Assertions.assertNotNull(queryStringQuery.build(new QueryStringExpression(validArgs)));
   }
 
   @Test
   void test_SyntaxCheckException_when_no_arguments() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> queryStringQuery.build(new QueryStringExpression(arguments)));
   }
 
   @Test
   void test_SyntaxCheckException_when_one_argument() {
     List<Expression> arguments = List.of(namedArgument("fields", fields_value));
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> queryStringQuery.build(new QueryStringExpression(arguments)));
   }
 
   @Test
   void test_SemanticCheckException_when_invalid_parameter() {
-    List<Expression> arguments = List.of(
-        namedArgument("fields", fields_value),
-        namedArgument("query", query_value),
-        namedArgument("unsupported", "unsupported_value"));
-    Assertions.assertThrows(SemanticCheckException.class,
+    List<Expression> arguments =
+        List.of(
+            namedArgument("fields", fields_value),
+            namedArgument("query", query_value),
+            namedArgument("unsupported", "unsupported_value"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
         () -> queryStringQuery.build(new QueryStringExpression(arguments)));
   }
 
@@ -124,14 +130,16 @@ public QueryStringExpression(List<Expression> arguments) {
 
     @Override
     public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "valueOf function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "valueOf function need implementation only to support Expression interface");
     }
 
     @Override
     public ExprType type() {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "type function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "type function need implementation only to support Expression interface");
     }
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryTest.java
index a61b47b7b1..d81218c0c3 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryTest.java
@@ -37,78 +37,78 @@ class QueryTest {
   static Stream<List<Expression>> generateValidData() {
     Expression query = DSL.namedArgument("query", query_value);
     return List.of(
-        DSL.namedArgument("analyzer", DSL.literal("standard")),
-        DSL.namedArgument("analyze_wildcard", DSL.literal("true")),
-        DSL.namedArgument("allow_leading_wildcard", DSL.literal("true")),
-        DSL.namedArgument("auto_generate_synonyms_phrase_query", DSL.literal("true")),
-        DSL.namedArgument("boost", DSL.literal("1")),
-        DSL.namedArgument("default_operator", DSL.literal("AND")),
-        DSL.namedArgument("default_operator", DSL.literal("and")),
-        DSL.namedArgument("enable_position_increments", DSL.literal("true")),
-        DSL.namedArgument("escape", DSL.literal("false")),
-        DSL.namedArgument("fuzziness", DSL.literal("1")),
-        DSL.namedArgument("fuzzy_rewrite", DSL.literal("constant_score")),
-        DSL.namedArgument("fuzzy_max_expansions", DSL.literal("42")),
-        DSL.namedArgument("fuzzy_prefix_length", DSL.literal("42")),
-        DSL.namedArgument("fuzzy_transpositions", DSL.literal("true")),
-        DSL.namedArgument("lenient", DSL.literal("true")),
-        DSL.namedArgument("max_determinized_states", DSL.literal("10000")),
-        DSL.namedArgument("minimum_should_match", DSL.literal("4")),
-        DSL.namedArgument("quote_analyzer", DSL.literal("standard")),
-        DSL.namedArgument("phrase_slop", DSL.literal("0")),
-        DSL.namedArgument("quote_field_suffix", DSL.literal(".exact")),
-        DSL.namedArgument("rewrite", DSL.literal("constant_score")),
-        DSL.namedArgument("type", DSL.literal("best_fields")),
-        DSL.namedArgument("tie_breaker", DSL.literal("0.3")),
-        DSL.namedArgument("time_zone", DSL.literal("Canada/Pacific")),
-        DSL.namedArgument("ANALYZER", DSL.literal("standard")),
-        DSL.namedArgument("ANALYZE_wildcard", DSL.literal("true")),
-        DSL.namedArgument("Allow_Leading_wildcard", DSL.literal("true")),
-        DSL.namedArgument("Auto_Generate_Synonyms_Phrase_Query", DSL.literal("true")),
-        DSL.namedArgument("Boost", DSL.literal("1"))
-    ).stream().map(arg -> List.of(query, arg));
+            DSL.namedArgument("analyzer", DSL.literal("standard")),
+            DSL.namedArgument("analyze_wildcard", DSL.literal("true")),
+            DSL.namedArgument("allow_leading_wildcard", DSL.literal("true")),
+            DSL.namedArgument("auto_generate_synonyms_phrase_query", DSL.literal("true")),
+            DSL.namedArgument("boost", DSL.literal("1")),
+            DSL.namedArgument("default_operator", DSL.literal("AND")),
+            DSL.namedArgument("default_operator", DSL.literal("and")),
+            DSL.namedArgument("enable_position_increments", DSL.literal("true")),
+            DSL.namedArgument("escape", DSL.literal("false")),
+            DSL.namedArgument("fuzziness", DSL.literal("1")),
+            DSL.namedArgument("fuzzy_rewrite", DSL.literal("constant_score")),
+            DSL.namedArgument("fuzzy_max_expansions", DSL.literal("42")),
+            DSL.namedArgument("fuzzy_prefix_length", DSL.literal("42")),
+            DSL.namedArgument("fuzzy_transpositions", DSL.literal("true")),
+            DSL.namedArgument("lenient", DSL.literal("true")),
+            DSL.namedArgument("max_determinized_states", DSL.literal("10000")),
+            DSL.namedArgument("minimum_should_match", DSL.literal("4")),
+            DSL.namedArgument("quote_analyzer", DSL.literal("standard")),
+            DSL.namedArgument("phrase_slop", DSL.literal("0")),
+            DSL.namedArgument("quote_field_suffix", DSL.literal(".exact")),
+            DSL.namedArgument("rewrite", DSL.literal("constant_score")),
+            DSL.namedArgument("type", DSL.literal("best_fields")),
+            DSL.namedArgument("tie_breaker", DSL.literal("0.3")),
+            DSL.namedArgument("time_zone", DSL.literal("Canada/Pacific")),
+            DSL.namedArgument("ANALYZER", DSL.literal("standard")),
+            DSL.namedArgument("ANALYZE_wildcard", DSL.literal("true")),
+            DSL.namedArgument("Allow_Leading_wildcard", DSL.literal("true")),
+            DSL.namedArgument("Auto_Generate_Synonyms_Phrase_Query", DSL.literal("true")),
+            DSL.namedArgument("Boost", DSL.literal("1")))
+        .stream()
+        .map(arg -> List.of(query, arg));
   }
 
   @ParameterizedTest
   @MethodSource("generateValidData")
   public void test_valid_parameters(List<Expression> validArgs) {
-    Assertions.assertNotNull(queryQuery.build(
-        new QueryExpression(validArgs)));
+    Assertions.assertNotNull(queryQuery.build(new QueryExpression(validArgs)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_no_arguments() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
-        () -> queryQuery.build(new QueryExpression(arguments)));
+    assertThrows(
+        SyntaxCheckException.class, () -> queryQuery.build(new QueryExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_field_argument() {
-    List<Expression> arguments = List.of(
-        namedArgument("fields", "invalid argument"),
-        namedArgument("query", query_value));
-    assertThrows(SemanticCheckException.class,
-        () -> queryQuery.build(new QueryExpression(arguments)));
+    List<Expression> arguments =
+        List.of(namedArgument("fields", "invalid argument"), namedArgument("query", query_value));
+    assertThrows(
+        SemanticCheckException.class, () -> queryQuery.build(new QueryExpression(arguments)));
   }
 
   @Test
   public void test_SemanticCheckException_when_invalid_parameter() {
-    List<Expression> arguments = List.of(
-        namedArgument("query", query_value),
-        namedArgument("unsupported", "unsupported_value"));
-    Assertions.assertThrows(SemanticCheckException.class,
-        () -> queryQuery.build(new QueryExpression(arguments)));
+    List<Expression> arguments =
+        List.of(
+            namedArgument("query", query_value), namedArgument("unsupported", "unsupported_value"));
+    Assertions.assertThrows(
+        SemanticCheckException.class, () -> queryQuery.build(new QueryExpression(arguments)));
   }
 
   @Test
   public void test_SemanticCheckException_when_sending_parameter_multiple_times() {
-    List<Expression> arguments = List.of(
+    List<Expression> arguments =
+        List.of(
             namedArgument("query", query_value),
             namedArgument("allow_leading_wildcard", DSL.literal("true")),
             namedArgument("allow_leading_wildcard", DSL.literal("true")));
-    Assertions.assertThrows(SemanticCheckException.class,
-            () -> queryQuery.build(new QueryExpression(arguments)));
+    Assertions.assertThrows(
+        SemanticCheckException.class, () -> queryQuery.build(new QueryExpression(arguments)));
   }
 
   private NamedArgumentExpression namedArgument(String name, String value) {
@@ -126,14 +126,16 @@ public QueryExpression(List<Expression> arguments) {
 
     @Override
     public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "valueOf function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "valueOf function need implementation only to support Expression interface");
     }
 
     @Override
     public ExprType type() {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "type function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "type function need implementation only to support Expression interface");
     }
   }
 
@@ -141,7 +143,6 @@ public ExprType type() {
   public void test_can_get_query_name() {
     List<Expression> arguments = List.of(namedArgument("query", query_value));
     queryQuery.build(new QueryExpression(arguments));
-    Assertions.assertEquals("query",
-            queryQuery.getQueryName());
+    Assertions.assertEquals("query", queryQuery.getQueryName());
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQueryTest.java
index 208c782593..2f5482171d 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQueryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQueryTest.java
@@ -3,16 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter.lucene;
 
+import static org.junit.Assert.*;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 
+import java.time.*;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.opensearch.sql.data.model.ExprValueUtils;
+import org.opensearch.sql.data.model.*;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDateType;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.RangeQuery.Comparison;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -21,9 +24,71 @@ class RangeQueryTest {
   @Test
   void should_throw_exception_for_unsupported_comparison() {
     // Note that since we do switch check on enum comparison, this should be impossible
-    assertThrows(IllegalStateException.class, () ->
-        new RangeQuery(Comparison.BETWEEN)
-            .doBuild("name", STRING, ExprValueUtils.stringValue("John")));
+    assertThrows(
+        IllegalStateException.class,
+        () ->
+            new RangeQuery(Comparison.BETWEEN)
+                .doBuild("name", STRING, ExprValueUtils.stringValue("John")));
+  }
+
+  @Test
+  void test_timestamp_with_no_format() {
+    OpenSearchDateType openSearchDateType = OpenSearchDateType.of(ExprCoreType.TIMESTAMP);
+    assertNotNull(
+        new RangeQuery(Comparison.LT)
+            .doBuild("time", openSearchDateType, new ExprTimestampValue("2021-11-08 17:00:00")));
   }
 
+  @Test
+  void test_timestamp_has_format() {
+    String timestamp = "2019-03-23 21:34:46";
+    OpenSearchDateType dateType = OpenSearchDateType.of("yyyy-MM-dd HH:mm:ss");
+    ZonedDateTime zonedDateTime = dateType.getParsedDateTime(timestamp);
+    ExprValue literal = ExprValueUtils.timestampValue(zonedDateTime.toInstant());
+    assertNotNull(new RangeQuery(Comparison.LT).doBuild("time_stamp", dateType, literal));
+  }
+
+  @Test
+  void test_time_with_no_format() {
+    OpenSearchDateType openSearchDateType = OpenSearchDateType.of(ExprCoreType.TIME);
+    assertNotNull(
+        new RangeQuery(Comparison.LT)
+            .doBuild("time", openSearchDateType, new ExprTimeValue("17:00:00")));
+  }
+
+  @Test
+  void test_time_has_format() {
+    long epochTimestamp = 1636390800000L; // Corresponds to "2021-11-08T17:00:00Z"
+    String format = "epoch_millis";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    ZonedDateTime zonedDateTime = dateType.getParsedDateTime(String.valueOf(epochTimestamp));
+    ExprValue literal = ExprValueUtils.timeValue(zonedDateTime.toLocalTime());
+    assertNotNull(new RangeQuery(Comparison.LT).doBuild("time", dateType, literal));
+  }
+
+  @Test
+  void test_date_with_no_format() {
+    OpenSearchDateType openSearchDateType = OpenSearchDateType.of(ExprCoreType.DATE);
+    assertNotNull(
+        new RangeQuery(Comparison.LT)
+            .doBuild("date", openSearchDateType, new ExprDateValue("2021-11-08")));
+  }
+
+  @Test
+  void test_date_has_format() {
+    String dateString = "2021-11-08";
+    String format = "yyyy-MM-dd";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    LocalDate parsedDate = dateType.getParsedDateTime(dateString).toLocalDate();
+    ExprValue literal = ExprValueUtils.dateValue(parsedDate);
+    assertNotNull(new RangeQuery(Comparison.LT).doBuild("date", dateType, literal));
+  }
+
+  @Test
+  void test_non_date_field_type() {
+    String dateString = "2021-11-08";
+    OpenSearchDateType dateType = OpenSearchDateType.of(STRING);
+    ExprValue literal = ExprValueUtils.stringValue(dateString);
+    assertNotNull(new RangeQuery(Comparison.LT).doBuild("string_value", dateType, literal));
+  }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/SimpleQueryStringTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/SimpleQueryStringTest.java
index f7129117a1..ea14461521 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/SimpleQueryStringTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/SimpleQueryStringTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.filter.lucene;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -37,148 +36,129 @@
 class SimpleQueryStringTest {
   private final SimpleQueryStringQuery simpleQueryStringQuery = new SimpleQueryStringQuery();
   private final FunctionName simpleQueryString = FunctionName.of("simple_query_string");
-  private static final LiteralExpression fields_value = DSL.literal(
-      new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-          "title", ExprValueUtils.floatValue(1.F),
-          "body", ExprValueUtils.floatValue(.3F)))));
+  private static final LiteralExpression fields_value =
+      DSL.literal(
+          new ExprTupleValue(
+              new LinkedHashMap<>(
+                  ImmutableMap.of(
+                      "title", ExprValueUtils.floatValue(1.F),
+                      "body", ExprValueUtils.floatValue(.3F)))));
   private static final LiteralExpression query_value = DSL.literal("query_value");
 
   static Stream<List<Expression>> generateValidData() {
     return Stream.of(
-        List.of(
-            DSL.namedArgument("fields", fields_value),
-            DSL.namedArgument("query", query_value)
-        ),
+        List.of(DSL.namedArgument("fields", fields_value), DSL.namedArgument("query", query_value)),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("analyze_wildcard", DSL.literal("true"))
-        ),
+            DSL.namedArgument("analyze_wildcard", DSL.literal("true"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("analyzer", DSL.literal("standard"))
-        ),
+            DSL.namedArgument("analyzer", DSL.literal("standard"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("auto_generate_synonyms_phrase_query", DSL.literal("true"))
-        ),
+            DSL.namedArgument("auto_generate_synonyms_phrase_query", DSL.literal("true"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("flags", DSL.literal("PREFIX"))
-        ),
+            DSL.namedArgument("flags", DSL.literal("PREFIX"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("flags", DSL.literal("PREFIX|NOT|AND"))
-        ),
+            DSL.namedArgument("flags", DSL.literal("PREFIX|NOT|AND"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("flags", DSL.literal("NOT|AND"))
-        ),
+            DSL.namedArgument("flags", DSL.literal("NOT|AND"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("flags", DSL.literal("PREFIX|not|AND"))
-        ),
+            DSL.namedArgument("flags", DSL.literal("PREFIX|not|AND"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("flags", DSL.literal("not|and"))
-        ),
+            DSL.namedArgument("flags", DSL.literal("not|and"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("fuzzy_max_expansions", DSL.literal("42"))
-        ),
+            DSL.namedArgument("fuzzy_max_expansions", DSL.literal("42"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("fuzzy_prefix_length", DSL.literal("42"))
-        ),
+            DSL.namedArgument("fuzzy_prefix_length", DSL.literal("42"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("fuzzy_transpositions", DSL.literal("true"))
-        ),
+            DSL.namedArgument("fuzzy_transpositions", DSL.literal("true"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("lenient", DSL.literal("true"))
-        ),
+            DSL.namedArgument("lenient", DSL.literal("true"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("default_operator", DSL.literal("AND"))
-        ),
+            DSL.namedArgument("default_operator", DSL.literal("AND"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("default_operator", DSL.literal("and"))
-        ),
+            DSL.namedArgument("default_operator", DSL.literal("and"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("minimum_should_match", DSL.literal("4"))
-        ),
+            DSL.namedArgument("minimum_should_match", DSL.literal("4"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("quote_field_suffix", DSL.literal(".exact"))
-        ),
+            DSL.namedArgument("quote_field_suffix", DSL.literal(".exact"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("boost", DSL.literal("1"))
-        ),
-        List.of(
-            DSL.namedArgument("FIELDS", fields_value),
-            DSL.namedArgument("QUERY", query_value)
-        ),
+            DSL.namedArgument("boost", DSL.literal("1"))),
+        List.of(DSL.namedArgument("FIELDS", fields_value), DSL.namedArgument("QUERY", query_value)),
         List.of(
             DSL.namedArgument("FIELDS", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("ANALYZE_wildcard", DSL.literal("true"))
-        ),
+            DSL.namedArgument("ANALYZE_wildcard", DSL.literal("true"))),
         List.of(
             DSL.namedArgument("fields", fields_value),
             DSL.namedArgument("query", query_value),
-            DSL.namedArgument("analyZER", DSL.literal("standard"))
-        )
-      );
+            DSL.namedArgument("analyZER", DSL.literal("standard"))));
   }
 
   @ParameterizedTest
   @MethodSource("generateValidData")
   public void test_valid_parameters(List<Expression> validArgs) {
-    Assertions.assertNotNull(simpleQueryStringQuery.build(
-        new SimpleQueryStringExpression(validArgs)));
+    Assertions.assertNotNull(
+        simpleQueryStringQuery.build(new SimpleQueryStringExpression(validArgs)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_no_arguments() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> simpleQueryStringQuery.build(new SimpleQueryStringExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument() {
     List<Expression> arguments = List.of(namedArgument("fields", fields_value));
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> simpleQueryStringQuery.build(new SimpleQueryStringExpression(arguments)));
   }
 
   @Test
   public void test_SemanticCheckException_when_invalid_parameter() {
-    List<Expression> arguments = List.of(
-        namedArgument("fields", fields_value),
-        namedArgument("query", query_value),
-        namedArgument("unsupported", "unsupported_value"));
-    Assertions.assertThrows(SemanticCheckException.class,
+    List<Expression> arguments =
+        List.of(
+            namedArgument("fields", fields_value),
+            namedArgument("query", query_value),
+            namedArgument("unsupported", "unsupported_value"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
         () -> simpleQueryStringQuery.build(new SimpleQueryStringExpression(arguments)));
   }
 
@@ -197,14 +177,16 @@ public SimpleQueryStringExpression(List<Expression> arguments) {
 
     @Override
     public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "valueOf function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "valueOf function need implementation only to support Expression interface");
     }
 
     @Override
     public ExprType type() {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "type function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "type function need implementation only to support Expression interface");
     }
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/TermQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/TermQueryTest.java
new file mode 100644
index 0000000000..def9fafba3
--- /dev/null
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/TermQueryTest.java
@@ -0,0 +1,82 @@
+package org.opensearch.sql.opensearch.storage.script.filter.lucene;
+
+import static org.junit.Assert.*;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+
+import java.time.*;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.data.model.*;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDateType;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+class TermQueryTest {
+
+  @Test
+  void test_timestamp_with_no_format() {
+    OpenSearchDateType openSearchDateType = OpenSearchDateType.of(ExprCoreType.TIMESTAMP);
+    assertNotNull(
+        new TermQuery()
+            .doBuild("time", openSearchDateType, new ExprTimestampValue("2021-11-08 17:00:00")));
+  }
+
+  @Test
+  void test_timestamp_has_format() {
+    String timestamp = "2019-03-23 21:34:46";
+    OpenSearchDateType dateType = OpenSearchDateType.of("yyyy-MM-dd HH:mm:ss");
+    ZonedDateTime zonedDateTime = dateType.getParsedDateTime(timestamp);
+    ExprValue literal = ExprValueUtils.timestampValue(zonedDateTime.toInstant());
+    assertNotNull(new TermQuery().doBuild("time_stamp", dateType, literal));
+  }
+
+  @Test
+  void test_time_with_no_format() {
+    OpenSearchDateType openSearchDateType = OpenSearchDateType.of(ExprCoreType.TIME);
+    assertNotNull(
+        new TermQuery().doBuild("time", openSearchDateType, new ExprTimeValue("17:00:00")));
+  }
+
+  @Test
+  void test_time_has_format() {
+    long epochTimestamp = 1636390800000L; // Corresponds to "2021-11-08T17:00:00Z"
+    String format = "epoch_millis";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    ZonedDateTime zonedDateTime = dateType.getParsedDateTime(String.valueOf(epochTimestamp));
+    ExprValue literal = ExprValueUtils.timeValue(zonedDateTime.toLocalTime());
+    assertNotNull(new TermQuery().doBuild("time", dateType, literal));
+  }
+
+  @Test
+  void test_date_with_no_format() {
+    OpenSearchDateType openSearchDateType = OpenSearchDateType.of(ExprCoreType.DATE);
+    assertNotNull(
+        new TermQuery().doBuild("date", openSearchDateType, new ExprDateValue("2021-11-08")));
+  }
+
+  @Test
+  void test_date_has_format() {
+    String dateString = "2021-11-08";
+    String format = "yyyy-MM-dd";
+    OpenSearchDateType dateType = OpenSearchDateType.of(format);
+    LocalDate parsedDate = dateType.getParsedDateTime(dateString).toLocalDate();
+    ExprValue literal = ExprValueUtils.dateValue(parsedDate);
+    assertNotNull(new TermQuery().doBuild("date", dateType, literal));
+  }
+
+  @Test
+  void test_invalid_date_field_type() {
+    String dateString = "2021-11-08";
+    OpenSearchDateType dateType = OpenSearchDateType.of(STRING);
+    ExprValue literal = ExprValueUtils.stringValue(dateString);
+    assertNotNull(new TermQuery().doBuild("string_value", dateType, literal));
+  }
+
+  @Test
+  void test_string_field_type() {
+    String dateString = "2021-11-08";
+    ExprValue literal = ExprValueUtils.stringValue(dateString);
+    assertNotNull(new TermQuery().doBuild("string_value", STRING, literal));
+  }
+}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/WildcardQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/WildcardQueryTest.java
index ce7a39d91a..7182626c02 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/WildcardQueryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/WildcardQueryTest.java
@@ -22,8 +22,10 @@
 import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.FunctionExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.env.Environment;
 import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.opensearch.storage.script.filter.lucene.relevance.WildcardQuery;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -34,43 +36,45 @@ class WildcardQueryTest {
   static Stream<List<Expression>> generateValidData() {
     return Stream.of(
         List.of(
-            namedArgument("field", "title"),
+            namedArgument("field", new ReferenceExpression("title", OpenSearchTextType.of())),
             namedArgument("query", "query_value*"),
             namedArgument("boost", "0.7"),
             namedArgument("case_insensitive", "false"),
-            namedArgument("rewrite", "constant_score_boolean")
-        )
-    );
+            namedArgument("rewrite", "constant_score_boolean")));
   }
 
   @ParameterizedTest
   @MethodSource("generateValidData")
   public void test_valid_parameters(List<Expression> validArgs) {
-    Assertions.assertNotNull(wildcardQueryQuery.build(
-        new WildcardQueryExpression(validArgs)));
+    Assertions.assertNotNull(wildcardQueryQuery.build(new WildcardQueryExpression(validArgs)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_no_arguments() {
     List<Expression> arguments = List.of();
-    assertThrows(SyntaxCheckException.class,
+    assertThrows(
+        SyntaxCheckException.class,
         () -> wildcardQueryQuery.build(new WildcardQueryExpression(arguments)));
   }
 
   @Test
   public void test_SyntaxCheckException_when_one_argument() {
-    List<Expression> arguments = List.of(namedArgument("field", "title"));
-    assertThrows(SyntaxCheckException.class,
+    List<Expression> arguments =
+        List.of(namedArgument("field", new ReferenceExpression("title", OpenSearchTextType.of())));
+    assertThrows(
+        SyntaxCheckException.class,
         () -> wildcardQueryQuery.build(new WildcardQueryExpression(arguments)));
   }
 
   @Test
   public void test_SemanticCheckException_when_invalid_parameter() {
-    List<Expression> arguments = List.of(
-        namedArgument("field", "title"),
-        namedArgument("query", "query_value*"),
-        namedArgument("unsupported", "unsupported_value"));
-    Assertions.assertThrows(SemanticCheckException.class,
+    List<Expression> arguments =
+        List.of(
+            namedArgument("field", new ReferenceExpression("title", OpenSearchTextType.of())),
+            namedArgument("query", "query_value*"),
+            namedArgument("unsupported", "unsupported_value"));
+    Assertions.assertThrows(
+        SemanticCheckException.class,
         () -> wildcardQueryQuery.build(new WildcardQueryExpression(arguments)));
   }
 
@@ -81,14 +85,16 @@ public WildcardQueryExpression(List<Expression> arguments) {
 
     @Override
     public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "valueOf function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "valueOf function need implementation only to support Expression interface");
     }
 
     @Override
     public ExprType type() {
-      throw new UnsupportedOperationException("Invalid function call, "
-          + "type function need implementation only to support Expression interface");
+      throw new UnsupportedOperationException(
+          "Invalid function call, "
+              + "type function need implementation only to support Expression interface");
     }
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiFieldQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiFieldQueryTest.java
index 01ec85d64d..9518136ff0 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiFieldQueryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiFieldQueryTest.java
@@ -27,14 +27,17 @@
 class MultiFieldQueryTest {
   MultiFieldQuery<?> query;
   private final String testQueryName = "test_query";
-  private final Map<String, RelevanceQuery.QueryBuilderStep<?>> actionMap
-      = ImmutableMap.of("paramA", (o, v) -> o);
+  private final Map<String, RelevanceQuery.QueryBuilderStep<?>> actionMap =
+      ImmutableMap.of("paramA", (o, v) -> o);
 
   @BeforeEach
   public void setUp() {
-    query = mock(MultiFieldQuery.class,
-        Mockito.withSettings().useConstructor(actionMap)
-            .defaultAnswer(Mockito.CALLS_REAL_METHODS));
+    query =
+        mock(
+            MultiFieldQuery.class,
+            Mockito.withSettings()
+                .useConstructor(actionMap)
+                .defaultAnswer(Mockito.CALLS_REAL_METHODS));
     when(query.getQueryName()).thenReturn(testQueryName);
   }
 
@@ -44,17 +47,26 @@ void createQueryBuilderTest() {
     String sampleField = "fieldA";
     float sampleValue = 34f;
 
-    var fieldSpec = ImmutableMap.<String, ExprValue>builder().put(sampleField,
-        ExprValueUtils.floatValue(sampleValue)).build();
+    var fieldSpec =
+        ImmutableMap.<String, ExprValue>builder()
+            .put(sampleField, ExprValueUtils.floatValue(sampleValue))
+            .build();
 
-    query.createQueryBuilder(List.of(DSL.namedArgument("fields",
-        new LiteralExpression(ExprTupleValue.fromExprValueMap(fieldSpec))),
-        DSL.namedArgument("query",
-            new LiteralExpression(ExprValueUtils.stringValue(sampleQuery)))));
+    query.createQueryBuilder(
+        List.of(
+            DSL.namedArgument(
+                "fields", new LiteralExpression(ExprTupleValue.fromExprValueMap(fieldSpec))),
+            DSL.namedArgument(
+                "query", new LiteralExpression(ExprValueUtils.stringValue(sampleQuery)))));
 
-    verify(query).createBuilder(argThat(
-            (ArgumentMatcher<ImmutableMap<String, Float>>) map -> map.size() == 1
-                && map.containsKey(sampleField) && map.containsValue(sampleValue)),
-        eq(sampleQuery));
+    verify(query)
+        .createBuilder(
+            argThat(
+                (ArgumentMatcher<ImmutableMap<String, Float>>)
+                    map ->
+                        map.size() == 1
+                            && map.containsKey(sampleField)
+                            && map.containsValue(sampleValue)),
+            eq(sampleQuery));
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/NoFieldQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/NoFieldQueryTest.java
index c4e4f1242a..17b775fa0b 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/NoFieldQueryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/NoFieldQueryTest.java
@@ -23,14 +23,17 @@
 class NoFieldQueryTest {
   NoFieldQuery query;
   private final String testQueryName = "test_query";
-  private final Map<String, RelevanceQuery.QueryBuilderStep> actionMap
-      = ImmutableMap.of("paramA", (o, v) -> o);
+  private final Map<String, RelevanceQuery.QueryBuilderStep> actionMap =
+      ImmutableMap.of("paramA", (o, v) -> o);
 
   @BeforeEach
   void setUp() {
-    query = mock(NoFieldQuery.class,
-        Mockito.withSettings().useConstructor(actionMap)
-            .defaultAnswer(Mockito.CALLS_REAL_METHODS));
+    query =
+        mock(
+            NoFieldQuery.class,
+            Mockito.withSettings()
+                .useConstructor(actionMap)
+                .defaultAnswer(Mockito.CALLS_REAL_METHODS));
     when(query.getQueryName()).thenReturn(testQueryName);
   }
 
@@ -38,9 +41,10 @@ void setUp() {
   void createQueryBuilderTest() {
     String sampleQuery = "field:query";
 
-    query.createQueryBuilder(List.of(
-        DSL.namedArgument("query",
-            new LiteralExpression(ExprValueUtils.stringValue(sampleQuery)))));
+    query.createQueryBuilder(
+        List.of(
+            DSL.namedArgument(
+                "query", new LiteralExpression(ExprValueUtils.stringValue(sampleQuery)))));
 
     verify(query).createBuilder(eq(sampleQuery));
   }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQueryBuildTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQueryBuildTest.java
index 5406f4cb58..a93a1e5fa4 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQueryBuildTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQueryBuildTest.java
@@ -48,12 +48,17 @@ class RelevanceQueryBuildTest {
   private QueryBuilder queryBuilder;
   private final Map<String, RelevanceQuery.QueryBuilderStep<QueryBuilder>> queryBuildActions =
       ImmutableMap.<String, RelevanceQuery.QueryBuilderStep<QueryBuilder>>builder()
-         .put("boost", (k, v) -> k.boost(Float.parseFloat(v.stringValue()))).build();
+          .put("boost", (k, v) -> k.boost(Float.parseFloat(v.stringValue())))
+          .build();
 
   @BeforeEach
   public void setUp() {
-    query = mock(RelevanceQuery.class, withSettings().useConstructor(queryBuildActions)
-        .defaultAnswer(Mockito.CALLS_REAL_METHODS));
+    query =
+        mock(
+            RelevanceQuery.class,
+            withSettings()
+                .useConstructor(queryBuildActions)
+                .defaultAnswer(Mockito.CALLS_REAL_METHODS));
     queryBuilder = mock(QueryBuilder.class);
     when(query.createQueryBuilder(any())).thenReturn(queryBuilder);
     String queryName = "mock_query";
@@ -64,9 +69,13 @@ public void setUp() {
 
   @Test
   void throws_SemanticCheckException_when_same_argument_twice() {
-    FunctionExpression expr = createCall(List.of(FIELD_ARG, QUERY_ARG,
-        namedArgument("boost", "2.3"),
-        namedArgument("boost", "2.4")));
+    FunctionExpression expr =
+        createCall(
+            List.of(
+                FIELD_ARG,
+                QUERY_ARG,
+                namedArgument("boost", "2.3"),
+                namedArgument("boost", "2.4")));
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class, () -> query.build(expr));
     assertEquals("Parameter 'boost' can only be specified once.", exception.getMessage());
@@ -79,8 +88,7 @@ void throws_SemanticCheckException_when_wrong_argument_name() {
 
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class, () -> query.build(expr));
-    assertEquals("Parameter wrongarg is invalid for mock_query function.",
-        exception.getMessage());
+    assertEquals("Parameter wrongarg is invalid for mock_query function.", exception.getMessage());
   }
 
   @Test
@@ -95,14 +103,13 @@ void calls_action_when_correct_argument_name() {
   @ParameterizedTest
   @MethodSource("insufficientArguments")
   public void throws_SyntaxCheckException_when_no_required_arguments(List<Expression> arguments) {
-    SyntaxCheckException exception = assertThrows(SyntaxCheckException.class,
-        () -> query.build(createCall(arguments)));
+    SyntaxCheckException exception =
+        assertThrows(SyntaxCheckException.class, () -> query.build(createCall(arguments)));
     assertEquals("mock_query requires at least two parameters", exception.getMessage());
   }
 
   public static Stream<List<Expression>> insufficientArguments() {
-    return Stream.of(List.of(),
-        List.of(namedArgument("field", "field_A")));
+    return Stream.of(List.of(), List.of(namedArgument("field", "field_A")));
   }
 
   private static NamedArgumentExpression namedArgument(String field, String fieldValue) {
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SingleFieldQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SingleFieldQueryTest.java
index b2d650602b..7234ee9275 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SingleFieldQueryTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SingleFieldQueryTest.java
@@ -19,32 +19,60 @@
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.LiteralExpression;
+import org.opensearch.sql.expression.ReferenceExpression;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 
 class SingleFieldQueryTest {
   SingleFieldQuery query;
   private final String testQueryName = "test_query";
-  private final Map<String, RelevanceQuery.QueryBuilderStep> actionMap
-      = ImmutableMap.of("paramA", (o, v) -> o);
+  private final Map<String, RelevanceQuery.QueryBuilderStep> actionMap =
+      ImmutableMap.of("paramA", (o, v) -> o);
 
   @BeforeEach
   void setUp() {
-    query = mock(SingleFieldQuery.class,
-        Mockito.withSettings().useConstructor(actionMap)
-        .defaultAnswer(Mockito.CALLS_REAL_METHODS));
+    query =
+        mock(
+            SingleFieldQuery.class,
+            Mockito.withSettings()
+                .useConstructor(actionMap)
+                .defaultAnswer(Mockito.CALLS_REAL_METHODS));
     when(query.getQueryName()).thenReturn(testQueryName);
   }
 
   @Test
-  void createQueryBuilderTest() {
+  void createQueryBuilderTestTypeTextKeyword() {
     String sampleQuery = "sample query";
     String sampleField = "fieldA";
 
-    query.createQueryBuilder(List.of(DSL.namedArgument("field",
-            new LiteralExpression(ExprValueUtils.stringValue(sampleField))),
-        DSL.namedArgument("query",
-            new LiteralExpression(ExprValueUtils.stringValue(sampleQuery)))));
+    query.createQueryBuilder(
+        List.of(
+            DSL.namedArgument(
+                "field",
+                new ReferenceExpression(
+                    sampleField,
+                    OpenSearchTextType.of(
+                        Map.of(
+                            "words",
+                            OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword))))),
+            DSL.namedArgument(
+                "query", new LiteralExpression(ExprValueUtils.stringValue(sampleQuery)))));
 
-    verify(query).createBuilder(eq(sampleField),
-        eq(sampleQuery));
+    verify(query).createBuilder(eq(sampleField), eq(sampleQuery));
+  }
+
+  @Test
+  void createQueryBuilderTestTypeText() {
+    String sampleQuery = "sample query";
+    String sampleField = "fieldA";
+
+    query.createQueryBuilder(
+        List.of(
+            DSL.namedArgument(
+                "field", new ReferenceExpression(sampleField, OpenSearchTextType.of())),
+            DSL.namedArgument(
+                "query", new LiteralExpression(ExprValueUtils.stringValue(sampleQuery)))));
+
+    verify(query).createBuilder(eq(sampleField), eq(sampleQuery));
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/sort/SortQueryBuilderTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/sort/SortQueryBuilderTest.java
index df6cfae78f..89a10ad563 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/sort/SortQueryBuilderTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/sort/SortQueryBuilderTest.java
@@ -3,18 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.script.sort;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.ast.tree.Sort;
+import org.opensearch.sql.data.model.ExprShortValue;
 import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.LiteralExpression;
 
 class SortQueryBuilderTest {
 
@@ -25,11 +27,68 @@ void build_sortbuilder_from_reference() {
     assertNotNull(sortQueryBuilder.build(DSL.ref("intV", INTEGER), Sort.SortOption.DEFAULT_ASC));
   }
 
+  @Test
+  void build_sortbuilder_from_nested_function() {
+    assertNotNull(
+        sortQueryBuilder.build(
+            DSL.nested(DSL.ref("message.info", STRING)), Sort.SortOption.DEFAULT_ASC));
+  }
+
+  @Test
+  void build_sortbuilder_from_nested_function_with_path_param() {
+    assertNotNull(
+        sortQueryBuilder.build(
+            DSL.nested(DSL.ref("message.info", STRING), DSL.ref("message", STRING)),
+            Sort.SortOption.DEFAULT_ASC));
+  }
+
+  @Test
+  void nested_with_too_many_args_throws_exception() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            sortQueryBuilder.build(
+                DSL.nested(
+                    DSL.ref("message.info", STRING),
+                    DSL.ref("message", STRING),
+                    DSL.ref("message", STRING)),
+                Sort.SortOption.DEFAULT_ASC));
+  }
+
+  @Test
+  void nested_with_too_few_args_throws_exception() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> sortQueryBuilder.build(DSL.nested(), Sort.SortOption.DEFAULT_ASC));
+  }
+
+  @Test
+  void nested_with_invalid_arg_type_throws_exception() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> sortQueryBuilder.build(DSL.nested(DSL.literal(1)), Sort.SortOption.DEFAULT_ASC));
+  }
+
+  @Test
+  void build_sortbuilder_from_expression_should_throw_exception() {
+    final IllegalStateException exception =
+        assertThrows(
+            IllegalStateException.class,
+            () ->
+                sortQueryBuilder.build(
+                    new LiteralExpression(new ExprShortValue(1)), Sort.SortOption.DEFAULT_ASC));
+    assertThat(exception.getMessage(), Matchers.containsString("unsupported expression"));
+  }
+
   @Test
   void build_sortbuilder_from_function_should_throw_exception() {
     final IllegalStateException exception =
-        assertThrows(IllegalStateException.class, () -> sortQueryBuilder.build(DSL.equal(DSL.ref(
-            "intV", INTEGER), DSL.literal(1)), Sort.SortOption.DEFAULT_ASC));
+        assertThrows(
+            IllegalStateException.class,
+            () ->
+                sortQueryBuilder.build(
+                    DSL.equal(DSL.ref("intV", INTEGER), DSL.literal(1)),
+                    Sort.SortOption.DEFAULT_ASC));
     assertThat(exception.getMessage(), Matchers.containsString("unsupported expression"));
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/serialization/DefaultExpressionSerializerTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/serialization/DefaultExpressionSerializerTest.java
index 72a319dbfe..b70595c74b 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/serialization/DefaultExpressionSerializerTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/serialization/DefaultExpressionSerializerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.serialization;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -57,23 +56,25 @@ public void can_serialize_and_deserialize_functions() {
 
   @Test
   public void cannot_serialize_illegal_expression() {
-    Expression illegalExpr = new Expression() {
-      private final Object object = new Object(); // non-serializable
-      @Override
-      public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-        return null;
-      }
+    Expression illegalExpr =
+        new Expression() {
+          private final Object object = new Object(); // non-serializable
+
+          @Override
+          public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
+            return null;
+          }
 
-      @Override
-      public ExprType type() {
-        return null;
-      }
+          @Override
+          public ExprType type() {
+            return null;
+          }
 
-      @Override
-      public <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context) {
-        return null;
-      }
-    };
+          @Override
+          public <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context) {
+            return null;
+          }
+        };
     assertThrows(IllegalStateException.class, () -> serializer.serialize(illegalExpr));
   }
 
@@ -81,5 +82,4 @@ public <T, C> T accept(ExpressionNodeVisitor<T, C> visitor, C context) {
   public void cannot_deserialize_illegal_expression_code() {
     assertThrows(IllegalStateException.class, () -> serializer.deserialize("hello world"));
   }
-
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexScanTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexScanTest.java
index 494f3ff2d0..00d1c9ecd1 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexScanTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexScanTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.system;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -21,8 +20,7 @@
 @ExtendWith(MockitoExtension.class)
 class OpenSearchSystemIndexScanTest {
 
-  @Mock
-  private OpenSearchSystemRequest request;
+  @Mock private OpenSearchSystemRequest request;
 
   @Test
   public void queryData() {
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexTest.java
index a483f2dad8..1afcfcdc86 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexTest.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/system/OpenSearchSystemIndexTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.storage.system;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -35,29 +34,23 @@
 @ExtendWith(MockitoExtension.class)
 class OpenSearchSystemIndexTest {
 
-  @Mock
-  private OpenSearchClient client;
+  @Mock private OpenSearchClient client;
 
-  @Mock
-  private Table table;
+  @Mock private Table table;
 
   @Test
   void testGetFieldTypesOfMetaTable() {
     OpenSearchSystemIndex systemIndex = new OpenSearchSystemIndex(client, TABLE_INFO);
     final Map<String, ExprType> fieldTypes = systemIndex.getFieldTypes();
-    assertThat(fieldTypes, anyOf(
-        hasEntry("TABLE_CAT", STRING)
-    ));
+    assertThat(fieldTypes, anyOf(hasEntry("TABLE_CAT", STRING)));
   }
 
   @Test
   void testGetFieldTypesOfMappingTable() {
-    OpenSearchSystemIndex systemIndex = new OpenSearchSystemIndex(client, mappingTable(
-        "test_index"));
+    OpenSearchSystemIndex systemIndex =
+        new OpenSearchSystemIndex(client, mappingTable("test_index"));
     final Map<String, ExprType> fieldTypes = systemIndex.getFieldTypes();
-    assertThat(fieldTypes, anyOf(
-        hasEntry("COLUMN_NAME", STRING)
-    ));
+    assertThat(fieldTypes, anyOf(hasEntry("COLUMN_NAME", STRING)));
   }
 
   @Test
@@ -69,8 +62,7 @@ void testIsExist() {
   @Test
   void testCreateTable() {
     Table systemIndex = new OpenSearchSystemIndex(client, TABLE_INFO);
-    assertThrows(UnsupportedOperationException.class,
-        () -> systemIndex.create(ImmutableMap.of()));
+    assertThrows(UnsupportedOperationException.class, () -> systemIndex.create(ImmutableMap.of()));
   }
 
   @Test
@@ -78,11 +70,8 @@ void implement() {
     OpenSearchSystemIndex systemIndex = new OpenSearchSystemIndex(client, TABLE_INFO);
     NamedExpression projectExpr = named("TABLE_NAME", ref("TABLE_NAME", STRING));
 
-    final PhysicalPlan plan = systemIndex.implement(
-        project(
-            relation(TABLE_INFO, table),
-            projectExpr
-        ));
+    final PhysicalPlan plan =
+        systemIndex.implement(project(relation(TABLE_INFO, table), projectExpr));
     assertTrue(plan instanceof ProjectOperator);
     assertTrue(plan.getChild().get(0) instanceof OpenSearchSystemIndexScan);
   }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/util/RestRequestUtilTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/util/RestRequestUtilTest.java
new file mode 100644
index 0000000000..168fabee74
--- /dev/null
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/util/RestRequestUtilTest.java
@@ -0,0 +1,24 @@
+package org.opensearch.sql.opensearch.util;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.opensearch.rest.RestRequest;
+
+public class RestRequestUtilTest {
+  @Test
+  public void testConsumeAllRequestParameters() {
+    Assertions.assertThrows(
+        NullPointerException.class,
+        () -> {
+          RestRequestUtil.consumeAllRequestParameters(null);
+        });
+
+    RestRequest request = Mockito.mock(RestRequest.class, Mockito.RETURNS_DEEP_STUBS);
+
+    RestRequestUtil.consumeAllRequestParameters(request);
+
+    Mockito.verify(request.params().keySet(), Mockito.times(1)).forEach(ArgumentMatchers.any());
+  }
+}
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/utils/Utils.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/utils/Utils.java
index 85b8889de3..0db87f89d4 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/utils/Utils.java
+++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/utils/Utils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.opensearch.utils;
 
 import com.google.common.collect.ImmutableSet;
@@ -36,15 +35,13 @@ public static List<NamedExpression> group(NamedExpression... exprs) {
     return Arrays.asList(exprs);
   }
 
-  public static List<Pair<Sort.SortOption, Expression>> sort(Expression expr1,
-                                                             Sort.SortOption option1) {
+  public static List<Pair<Sort.SortOption, Expression>> sort(
+      Expression expr1, Sort.SortOption option1) {
     return Collections.singletonList(Pair.of(option1, expr1));
   }
 
-  public static List<Pair<Sort.SortOption, Expression>> sort(Expression expr1,
-                                                             Sort.SortOption option1,
-                                                             Expression expr2,
-                                                             Sort.SortOption option2) {
+  public static List<Pair<Sort.SortOption, Expression>> sort(
+      Expression expr1, Sort.SortOption option1, Expression expr2, Sort.SortOption option2) {
     return Arrays.asList(Pair.of(option1, expr1), Pair.of(option2, expr2));
   }
 
diff --git a/plugin/build.gradle b/plugin/build.gradle
index d689da0f57..17b0ae8573 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -27,6 +27,7 @@ plugins {
     id "io.freefair.lombok"
     id 'jacoco'
     id 'opensearch.opensearchplugin'
+    id 'com.diffplug.spotless' version '6.22.0'
 }
 
 apply plugin: 'opensearch.pluginzip'
@@ -47,6 +48,7 @@ opensearchplugin {
     name 'opensearch-sql'
     description 'OpenSearch SQL'
     classname 'org.opensearch.sql.plugin.SQLPlugin'
+    extendedPlugins = ['opensearch-job-scheduler']
     licenseFile rootProject.file("LICENSE.txt")
     noticeFile rootProject.file("NOTICE")
 }
@@ -73,6 +75,16 @@ publishing {
             }
         }
     }
+    repositories {
+        maven {
+            name = "Snapshots" //  optional target repository name
+            url = "https://aws.oss.sonatype.org/content/repositories/snapshots"
+            credentials {
+                username "$System.env.SONATYPE_USERNAME"
+                password "$System.env.SONATYPE_PASSWORD"
+            }
+        }
+    }
 }
 
 javadoc.enabled = false
@@ -81,25 +93,25 @@ dependencyLicenses.enabled = false
 thirdPartyAudit.enabled = false
 
 configurations.all {
-    resolutionStrategy.force 'junit:junit:4.13.2'
     // conflict with spring-jcl
-    exclude group: "commons-logging", module: "commons-logging"
+    resolutionStrategy.force "commons-logging:commons-logging:1.2"
     // enforce 2.12.6, https://github.com/opensearch-project/sql/issues/424
-    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
+    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
     // enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
     resolutionStrategy.force 'commons-codec:commons-codec:1.13'
-    resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
-    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jackson_version}"
-    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson_version}"
-    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
-    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
-    resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
-    resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
-    resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.9.3"
-    resolutionStrategy.force "org.apache.commons:commons-math3:3.6.1"
-    resolutionStrategy.force "org.apache.commons:commons-lang3:3.12.0"
+    resolutionStrategy.force "com.google.guava:guava:${guava_version}"
+    resolutionStrategy.force 'com.google.guava:failureaccess:1.0.2'
+    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
+    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
+    resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
+    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+    resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.10.0"
+    resolutionStrategy.force "com.squareup.okio:okio:3.4.0"
     resolutionStrategy.force "joda-time:joda-time:2.10.12"
     resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36"
+    resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.15"
+    resolutionStrategy.force "org.apache.httpcomponents:httpclient:4.5.14"
+    resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
 }
 compileJava {
     options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor'])
@@ -110,16 +122,27 @@ compileTestJava {
 }
 
 dependencies {
-    api group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
-    api "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
-    api "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
-    api "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}"
+    compileOnly "org.opensearch:opensearch-job-scheduler-spi:${opensearch_build}"
+    compileOnly "com.google.guava:guava:${guava_version}"
+    compileOnly 'com.google.guava:failureaccess:1.0.2'
+
+    api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
+    api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+    api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
 
     api project(":ppl")
     api project(':legacy')
     api project(':opensearch')
     api project(':prometheus')
-    api project(':filesystem')
+    api project(':datasources')
+    api project(':spark')
+    api project(':async-query')
+
+    testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.14.9'
+    testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: "${versions.mockito}"
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: "${versions.mockito}"
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
 }
 
 test {
@@ -163,12 +186,11 @@ dependencyLicenses.enabled = false
 // enable testingConventions check will cause errors like:  "Classes ending with [Tests] must subclass [LuceneTestCase]"
 testingConventions.enabled = false
 
-// TODO: need to verify the thirdPartyAudi
+// TODO: need to verify the thirdPartyAudit
 // currently it complains missing classes like ibatis, mysql etc, should not be a problem
 thirdPartyAudit.enabled = false
 
-
-apply plugin: 'nebula.ospackage'
+apply plugin: 'com.netflix.nebula.ospackage'
 validateNebulaPom.enabled = false
 
 // This is afterEvaluate because the bundlePlugin ZIP task is updated afterEvaluate and changes the ZIP name to match the plugin name
@@ -210,9 +232,9 @@ afterEvaluate {
         task renameRpm(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.rpm"
-            doLast { delete file("$buildDir/distributions/$archiveName") }
+            include "$archiveFileName"
+            rename "$archiveFileName", "${packageName}-${version}.rpm"
+            doLast { delete file("$buildDir/distributions/$archiveFileName") }
         }
     }
 
@@ -223,15 +245,16 @@ afterEvaluate {
         task renameDeb(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.deb"
-            doLast { delete file("$buildDir/distributions/$archiveName") }
+            include "$archiveFileName"
+            rename "$archiveFileName", "${packageName}-${version}.deb"
+            doLast { delete file("$buildDir/distributions/$archiveFileName") }
         }
     }
 }
 
 testClusters.integTest {
     plugin(project.tasks.bundlePlugin.archiveFile)
+    testDistribution = "ARCHIVE"
 
     // debug with command, ./gradlew opensearch-sql:run -DdebugJVM. --debug-jvm does not work with keystore.
     if (System.getProperty("debugJVM") != null) {
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/SQLPlugin.java b/plugin/src/main/java/org/opensearch/sql/plugin/SQLPlugin.java
index fab14966d8..560c5edadd 100644
--- a/plugin/src/main/java/org/opensearch/sql/plugin/SQLPlugin.java
+++ b/plugin/src/main/java/org/opensearch/sql/plugin/SQLPlugin.java
@@ -5,46 +5,50 @@
 
 package org.opensearch.sql.plugin;
 
+import static java.util.Collections.singletonList;
 import static org.opensearch.sql.datasource.model.DataSourceMetadata.defaultOpenSearchDataSourceMetadata;
+import static org.opensearch.sql.spark.data.constants.SparkConstants.SPARK_REQUEST_BUFFER_INDEX_NAME;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import java.io.IOException;
-import java.io.InputStream;
+import java.time.Clock;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Supplier;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.ActionRequest;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.ActionType;
 import org.opensearch.client.Client;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.common.inject.Injector;
+import org.opensearch.common.inject.ModulesBuilder;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.IndexScopedSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsFilter;
 import org.opensearch.common.util.concurrent.OpenSearchExecutors;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.env.Environment;
 import org.opensearch.env.NodeEnvironment;
+import org.opensearch.indices.SystemIndexDescriptor;
+import org.opensearch.jobscheduler.spi.JobSchedulerExtension;
+import org.opensearch.jobscheduler.spi.ScheduledJobParser;
+import org.opensearch.jobscheduler.spi.ScheduledJobRunner;
 import org.opensearch.plugins.ActionPlugin;
 import org.opensearch.plugins.Plugin;
-import org.opensearch.plugins.ReloadablePlugin;
 import org.opensearch.plugins.ScriptPlugin;
+import org.opensearch.plugins.SystemIndexPlugin;
 import org.opensearch.repositories.RepositoriesService;
 import org.opensearch.rest.RestController;
 import org.opensearch.rest.RestHandler;
@@ -52,55 +56,76 @@
 import org.opensearch.script.ScriptEngine;
 import org.opensearch.script.ScriptService;
 import org.opensearch.sql.datasource.DataSourceService;
-import org.opensearch.sql.datasource.DataSourceServiceImpl;
-import org.opensearch.sql.datasource.model.DataSource;
-import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasources.auth.DataSourceUserAuthorizationHelper;
+import org.opensearch.sql.datasources.auth.DataSourceUserAuthorizationHelperImpl;
+import org.opensearch.sql.datasources.encryptor.EncryptorImpl;
+import org.opensearch.sql.datasources.glue.GlueDataSourceFactory;
+import org.opensearch.sql.datasources.glue.SecurityLakeDataSourceFactory;
+import org.opensearch.sql.datasources.model.transport.*;
+import org.opensearch.sql.datasources.rest.RestDataSourceQueryAction;
+import org.opensearch.sql.datasources.service.DataSourceMetadataStorage;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
+import org.opensearch.sql.datasources.storage.OpenSearchDataSourceMetadataStorage;
+import org.opensearch.sql.datasources.transport.TransportCreateDataSourceAction;
+import org.opensearch.sql.datasources.transport.TransportDeleteDataSourceAction;
+import org.opensearch.sql.datasources.transport.TransportGetDataSourceAction;
+import org.opensearch.sql.datasources.transport.TransportPatchDataSourceAction;
+import org.opensearch.sql.datasources.transport.TransportUpdateDataSourceAction;
 import org.opensearch.sql.legacy.esdomain.LocalClusterState;
 import org.opensearch.sql.legacy.executor.AsyncRestExecutor;
 import org.opensearch.sql.legacy.metrics.Metrics;
 import org.opensearch.sql.legacy.plugin.RestSqlAction;
 import org.opensearch.sql.legacy.plugin.RestSqlStatsAction;
 import org.opensearch.sql.opensearch.client.OpenSearchNodeClient;
-import org.opensearch.sql.opensearch.security.SecurityAccess;
 import org.opensearch.sql.opensearch.setting.LegacyOpenDistroSettings;
 import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
 import org.opensearch.sql.opensearch.storage.OpenSearchDataSourceFactory;
 import org.opensearch.sql.opensearch.storage.script.ExpressionScriptEngine;
 import org.opensearch.sql.opensearch.storage.serialization.DefaultExpressionSerializer;
-import org.opensearch.sql.plugin.config.OpenSearchPluginConfig;
-import org.opensearch.sql.plugin.datasource.DataSourceSettings;
+import org.opensearch.sql.plugin.config.OpenSearchPluginModule;
 import org.opensearch.sql.plugin.rest.RestPPLQueryAction;
 import org.opensearch.sql.plugin.rest.RestPPLStatsAction;
 import org.opensearch.sql.plugin.rest.RestQuerySettingsAction;
 import org.opensearch.sql.plugin.transport.PPLQueryAction;
 import org.opensearch.sql.plugin.transport.TransportPPLQueryAction;
 import org.opensearch.sql.plugin.transport.TransportPPLQueryResponse;
-import org.opensearch.sql.ppl.config.PPLServiceConfig;
 import org.opensearch.sql.prometheus.storage.PrometheusStorageFactory;
-import org.opensearch.sql.sql.config.SQLServiceConfig;
+import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorService;
+import org.opensearch.sql.spark.cluster.ClusterManagerEventListener;
+import org.opensearch.sql.spark.flint.FlintIndexMetadataServiceImpl;
+import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
+import org.opensearch.sql.spark.rest.RestAsyncQueryManagementAction;
+import org.opensearch.sql.spark.scheduler.OpenSearchAsyncQueryScheduler;
+import org.opensearch.sql.spark.scheduler.job.ScheduledAsyncQueryJobRunner;
+import org.opensearch.sql.spark.scheduler.parser.OpenSearchScheduleQueryJobRequestParser;
+import org.opensearch.sql.spark.storage.SparkStorageFactory;
+import org.opensearch.sql.spark.transport.TransportCancelAsyncQueryRequestAction;
+import org.opensearch.sql.spark.transport.TransportCreateAsyncQueryRequestAction;
+import org.opensearch.sql.spark.transport.TransportGetAsyncQueryResultAction;
+import org.opensearch.sql.spark.transport.config.AsyncExecutorServiceModule;
+import org.opensearch.sql.spark.transport.model.CancelAsyncQueryActionResponse;
+import org.opensearch.sql.spark.transport.model.CreateAsyncQueryActionResponse;
+import org.opensearch.sql.spark.transport.model.GetAsyncQueryResultActionResponse;
 import org.opensearch.sql.storage.DataSourceFactory;
 import org.opensearch.threadpool.ExecutorBuilder;
 import org.opensearch.threadpool.FixedExecutorBuilder;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.watcher.ResourceWatcherService;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-public class SQLPlugin extends Plugin implements ActionPlugin, ScriptPlugin, ReloadablePlugin {
+public class SQLPlugin extends Plugin
+    implements ActionPlugin, ScriptPlugin, SystemIndexPlugin, JobSchedulerExtension {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOGGER = LogManager.getLogger(SQLPlugin.class);
 
   private ClusterService clusterService;
 
-  /**
-   * Settings should be inited when bootstrap the plugin.
-   */
+  /** Settings should be inited when bootstrap the plugin. */
   private org.opensearch.sql.common.setting.Settings pluginSettings;
 
   private NodeClient client;
-
-  private AnnotationConfigApplicationContext applicationContext;
-
-  private DataSourceService dataSourceService;
+  private DataSourceServiceImpl dataSourceService;
+  private OpenSearchAsyncQueryScheduler asyncQueryScheduler;
+  private Injector injector;
 
   public String name() {
     return "sql";
@@ -122,26 +147,56 @@ public List<RestHandler> getRestHandlers(
     Objects.requireNonNull(clusterService, "Cluster service is required");
     Objects.requireNonNull(pluginSettings, "Cluster settings is required");
 
-    LocalClusterState.state().setResolver(indexNameExpressionResolver);
     Metrics.getInstance().registerDefaultMetrics();
 
     return Arrays.asList(
-        new RestPPLQueryAction(pluginSettings, settings),
-        new RestSqlAction(settings, applicationContext),
+        new RestPPLQueryAction(),
+        new RestSqlAction(settings, injector),
         new RestSqlStatsAction(settings, restController),
         new RestPPLStatsAction(settings, restController),
-        new RestQuerySettingsAction(settings, restController));
+        new RestQuerySettingsAction(settings, restController),
+        new RestDataSourceQueryAction((OpenSearchSettings) pluginSettings),
+        new RestAsyncQueryManagementAction((OpenSearchSettings) pluginSettings));
   }
 
-  /**
-   * Register action and handler so that transportClient can find proxy for action.
-   */
+  /** Register action and handler so that transportClient can find proxy for action. */
   @Override
   public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
     return Arrays.asList(
         new ActionHandler<>(
             new ActionType<>(PPLQueryAction.NAME, TransportPPLQueryResponse::new),
-            TransportPPLQueryAction.class));
+            TransportPPLQueryAction.class),
+        new ActionHandler<>(
+            new ActionType<>(
+                TransportCreateDataSourceAction.NAME, CreateDataSourceActionResponse::new),
+            TransportCreateDataSourceAction.class),
+        new ActionHandler<>(
+            new ActionType<>(TransportGetDataSourceAction.NAME, GetDataSourceActionResponse::new),
+            TransportGetDataSourceAction.class),
+        new ActionHandler<>(
+            new ActionType<>(
+                TransportUpdateDataSourceAction.NAME, UpdateDataSourceActionResponse::new),
+            TransportUpdateDataSourceAction.class),
+        new ActionHandler<>(
+            new ActionType<>(
+                TransportPatchDataSourceAction.NAME, PatchDataSourceActionResponse::new),
+            TransportPatchDataSourceAction.class),
+        new ActionHandler<>(
+            new ActionType<>(
+                TransportDeleteDataSourceAction.NAME, DeleteDataSourceActionResponse::new),
+            TransportDeleteDataSourceAction.class),
+        new ActionHandler<>(
+            new ActionType<>(
+                TransportCreateAsyncQueryRequestAction.NAME, CreateAsyncQueryActionResponse::new),
+            TransportCreateAsyncQueryRequestAction.class),
+        new ActionHandler<>(
+            new ActionType<>(
+                TransportGetAsyncQueryResultAction.NAME, GetAsyncQueryResultActionResponse::new),
+            TransportGetAsyncQueryResultAction.class),
+        new ActionHandler<>(
+            new ActionType<>(
+                TransportCancelAsyncQueryRequestAction.NAME, CancelAsyncQueryActionResponse::new),
+            TransportCancelAsyncQueryRequestAction.class));
   }
 
   @Override
@@ -160,42 +215,68 @@ public Collection<Object> createComponents(
     this.clusterService = clusterService;
     this.pluginSettings = new OpenSearchSettings(clusterService.getClusterSettings());
     this.client = (NodeClient) client;
-    this.dataSourceService =
-        new DataSourceServiceImpl(
-            new ImmutableSet.Builder<DataSourceFactory>()
-                .add(new OpenSearchDataSourceFactory(
-                        new OpenSearchNodeClient(this.client), pluginSettings))
-                .add(new PrometheusStorageFactory())
-                .build());
-    dataSourceService.addDataSource(defaultOpenSearchDataSourceMetadata());
-    loadDataSources(dataSourceService, clusterService.getSettings());
+    this.dataSourceService = createDataSourceService();
+    dataSourceService.createDataSource(defaultOpenSearchDataSourceMetadata());
     LocalClusterState.state().setClusterService(clusterService);
     LocalClusterState.state().setPluginSettings((OpenSearchSettings) pluginSettings);
-
-    this.applicationContext = new AnnotationConfigApplicationContext();
-    SecurityAccess.doPrivileged(
-        () -> {
-          applicationContext.registerBean(ClusterService.class, () -> clusterService);
-          applicationContext.registerBean(NodeClient.class, () -> (NodeClient) client);
-          applicationContext.registerBean(
-              org.opensearch.sql.common.setting.Settings.class, () -> pluginSettings);
-          applicationContext.registerBean(
-              DataSourceService.class, () -> dataSourceService);
-          applicationContext.register(OpenSearchPluginConfig.class);
-          applicationContext.register(PPLServiceConfig.class);
-          applicationContext.register(SQLServiceConfig.class);
-          applicationContext.refresh();
-          return null;
+    LocalClusterState.state().setClient(client);
+    ModulesBuilder modules = new ModulesBuilder();
+    modules.add(new OpenSearchPluginModule());
+    modules.add(
+        b -> {
+          b.bind(NodeClient.class).toInstance((NodeClient) client);
+          b.bind(org.opensearch.sql.common.setting.Settings.class).toInstance(pluginSettings);
+          b.bind(DataSourceService.class).toInstance(dataSourceService);
+          b.bind(ClusterService.class).toInstance(clusterService);
         });
+    modules.add(new AsyncExecutorServiceModule());
+    injector = modules.createInjector();
+    ClusterManagerEventListener clusterManagerEventListener =
+        new ClusterManagerEventListener(
+            clusterService,
+            threadPool,
+            client,
+            Clock.systemUTC(),
+            OpenSearchSettings.SESSION_INDEX_TTL_SETTING,
+            OpenSearchSettings.RESULT_INDEX_TTL_SETTING,
+            OpenSearchSettings.STREAMING_JOB_HOUSEKEEPER_INTERVAL_SETTING,
+            OpenSearchSettings.AUTO_INDEX_MANAGEMENT_ENABLED_SETTING,
+            environment.settings(),
+            dataSourceService,
+            injector.getInstance(FlintIndexMetadataServiceImpl.class),
+            injector.getInstance(FlintIndexOpFactory.class));
+    AsyncQueryExecutorService asyncQueryExecutorService =
+        injector.getInstance(AsyncQueryExecutorService.class);
+    ScheduledAsyncQueryJobRunner.getJobRunnerInstance()
+        .loadJobResource(client, clusterService, threadPool, asyncQueryExecutorService);
+
+    return ImmutableList.of(
+        dataSourceService, asyncQueryExecutorService, clusterManagerEventListener, pluginSettings);
+  }
 
-    // return objects used by Guice to inject dependencies for e.g.,
-    // transport action handler constructors
-    return ImmutableList.of(applicationContext);
+  @Override
+  public String getJobType() {
+    return OpenSearchAsyncQueryScheduler.SCHEDULER_PLUGIN_JOB_TYPE;
+  }
+
+  @Override
+  public String getJobIndex() {
+    return OpenSearchAsyncQueryScheduler.SCHEDULER_INDEX_NAME;
+  }
+
+  @Override
+  public ScheduledJobRunner getJobRunner() {
+    return ScheduledAsyncQueryJobRunner.getJobRunnerInstance();
+  }
+
+  @Override
+  public ScheduledJobParser getJobParser() {
+    return OpenSearchScheduleQueryJobRequestParser.getJobParser();
   }
 
   @Override
   public List<ExecutorBuilder<?>> getExecutorBuilders(Settings settings) {
-    return Collections.singletonList(
+    return singletonList(
         new FixedExecutorBuilder(
             settings,
             AsyncRestExecutor.SQL_WORKER_THREAD_POOL_NAME,
@@ -209,7 +290,7 @@ public List<Setting<?>> getSettings() {
     return new ImmutableList.Builder<Setting<?>>()
         .addAll(LegacyOpenDistroSettings.legacySettings())
         .addAll(OpenSearchSettings.pluginSettings())
-        .add(DataSourceSettings.DATASOURCE_CONFIG)
+        .addAll(OpenSearchSettings.pluginNonDynamicSettings())
         .build();
   }
 
@@ -218,36 +299,52 @@ public ScriptEngine getScriptEngine(Settings settings, Collection<ScriptContext<
     return new ExpressionScriptEngine(new DefaultExpressionSerializer());
   }
 
-  @Override
-  public void reload(Settings settings) {
-    dataSourceService.clear();
-    dataSourceService.addDataSource(defaultOpenSearchDataSourceMetadata());
-    loadDataSources(dataSourceService, settings);
+  private DataSourceServiceImpl createDataSourceService() {
+    String masterKey =
+        OpenSearchSettings.DATASOURCE_MASTER_SECRET_KEY.get(clusterService.getSettings());
+    if (StringUtils.isEmpty(masterKey)) {
+      LOGGER.warn(
+          "Master key is a required config for using create and update datasource APIs. "
+              + "Please set plugins.query.datasources.encryption.masterkey config "
+              + "in opensearch.yml in all the cluster nodes. "
+              + "More details can be found here: "
+              + "https://github.com/opensearch-project/sql/blob/main/docs/user/ppl/"
+              + "admin/datasources.rst#master-key-config-for-encrypting-credential-information");
+    }
+    DataSourceMetadataStorage dataSourceMetadataStorage =
+        new OpenSearchDataSourceMetadataStorage(
+            client,
+            clusterService,
+            new EncryptorImpl(masterKey),
+            (OpenSearchSettings) pluginSettings);
+    DataSourceUserAuthorizationHelper dataSourceUserAuthorizationHelper =
+        new DataSourceUserAuthorizationHelperImpl(client);
+    return new DataSourceServiceImpl(
+        new ImmutableSet.Builder<DataSourceFactory>()
+            .add(
+                new OpenSearchDataSourceFactory(
+                    new OpenSearchNodeClient(this.client), pluginSettings))
+            .add(new PrometheusStorageFactory(pluginSettings))
+            .add(new SparkStorageFactory(this.client, pluginSettings))
+            .add(new GlueDataSourceFactory(pluginSettings))
+            .add(new SecurityLakeDataSourceFactory(pluginSettings))
+            .build(),
+        dataSourceMetadataStorage,
+        dataSourceUserAuthorizationHelper);
   }
 
-  /**
-   * load {@link DataSource} from settings.
-   */
-  @VisibleForTesting
-  public static void loadDataSources(DataSourceService dataSourceService, Settings settings) {
-    SecurityAccess.doPrivileged(
-        () -> {
-          InputStream inputStream = DataSourceSettings.DATASOURCE_CONFIG.get(settings);
-          if (inputStream != null) {
-            ObjectMapper objectMapper = new ObjectMapper();
-            objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            try {
-              List<DataSourceMetadata> metadataList =
-                  objectMapper.readValue(inputStream, new TypeReference<>() {});
-              dataSourceService.addDataSource(metadataList.toArray(new DataSourceMetadata[0]));
-            } catch (IOException e) {
-              LOG.error(
-                  "DataSource Configuration File uploaded is malformed. Verify and re-upload.", e);
-            } catch (Throwable e) {
-              LOG.error("DataSource construction failed.", e);
-            }
-          }
-          return null;
-        });
+  @Override
+  public Collection<SystemIndexDescriptor> getSystemIndexDescriptors(Settings settings) {
+    List<SystemIndexDescriptor> systemIndexDescriptors = new ArrayList<>();
+    systemIndexDescriptors.add(
+        new SystemIndexDescriptor(
+            OpenSearchDataSourceMetadataStorage.DATASOURCE_INDEX_NAME, "SQL DataSources index"));
+    systemIndexDescriptors.add(
+        new SystemIndexDescriptor(
+            SPARK_REQUEST_BUFFER_INDEX_NAME + "*", "SQL Spark Request Buffer index pattern"));
+    systemIndexDescriptors.add(
+        new SystemIndexDescriptor(
+            OpenSearchAsyncQueryScheduler.SCHEDULER_INDEX_NAME, "SQL Scheduler job index"));
+    return systemIndexDescriptors;
   }
 }
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/config/OpenSearchPluginConfig.java b/plugin/src/main/java/org/opensearch/sql/plugin/config/OpenSearchPluginConfig.java
deleted file mode 100644
index 1a98510aad..0000000000
--- a/plugin/src/main/java/org/opensearch/sql/plugin/config/OpenSearchPluginConfig.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- */
-
-
-package org.opensearch.sql.plugin.config;
-
-import org.opensearch.client.node.NodeClient;
-import org.opensearch.sql.analysis.Analyzer;
-import org.opensearch.sql.analysis.ExpressionAnalyzer;
-import org.opensearch.sql.common.setting.Settings;
-import org.opensearch.sql.datasource.DataSourceService;
-import org.opensearch.sql.executor.ExecutionEngine;
-import org.opensearch.sql.executor.QueryManager;
-import org.opensearch.sql.executor.QueryService;
-import org.opensearch.sql.executor.execution.QueryPlanFactory;
-import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
-import org.opensearch.sql.monitor.ResourceMonitor;
-import org.opensearch.sql.opensearch.client.OpenSearchClient;
-import org.opensearch.sql.opensearch.client.OpenSearchNodeClient;
-import org.opensearch.sql.opensearch.executor.OpenSearchExecutionEngine;
-import org.opensearch.sql.opensearch.executor.OpenSearchQueryManager;
-import org.opensearch.sql.opensearch.executor.protector.ExecutionProtector;
-import org.opensearch.sql.opensearch.executor.protector.OpenSearchExecutionProtector;
-import org.opensearch.sql.opensearch.monitor.OpenSearchMemoryHealthy;
-import org.opensearch.sql.opensearch.monitor.OpenSearchResourceMonitor;
-import org.opensearch.sql.opensearch.storage.OpenSearchStorageEngine;
-import org.opensearch.sql.planner.Planner;
-import org.opensearch.sql.planner.optimizer.LogicalPlanOptimizer;
-import org.opensearch.sql.storage.StorageEngine;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-/**
- * OpenSearch plugin config that injects cluster service and node client from plugin
- * and initialize OpenSearch storage and execution engine.
- */
-@Configuration
-public class OpenSearchPluginConfig {
-
-  @Autowired
-  private NodeClient nodeClient;
-
-  @Autowired
-  private Settings settings;
-
-  @Autowired
-  private DataSourceService dataSourceService;
-
-  @Bean
-  @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-  public OpenSearchClient client() {
-    return new OpenSearchNodeClient(nodeClient);
-  }
-
-  @Bean
-  @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-  public StorageEngine storageEngine() {
-    return new OpenSearchStorageEngine(client(), settings);
-  }
-
-  @Bean
-  @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-  public ExecutionEngine executionEngine() {
-    return new OpenSearchExecutionEngine(client(), protector());
-  }
-
-  @Bean
-  @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-  public ResourceMonitor resourceMonitor() {
-    return new OpenSearchResourceMonitor(settings, new OpenSearchMemoryHealthy());
-  }
-
-  @Bean
-  @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-  public ExecutionProtector protector() {
-    return new OpenSearchExecutionProtector(resourceMonitor());
-  }
-
-  /**
-   * Per node singleton object.
-   */
-  @Bean
-  public QueryManager queryManager() {
-    return new OpenSearchQueryManager(nodeClient);
-  }
-
-  /**
-   * QueryPlanFactory.
-   */
-  @Bean
-  @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-  public QueryPlanFactory queryExecutionFactory() {
-    BuiltinFunctionRepository functionRepository = BuiltinFunctionRepository.getInstance();
-    Analyzer analyzer = new Analyzer(new ExpressionAnalyzer(functionRepository),
-        dataSourceService, functionRepository);
-    Planner planner =
-        new Planner(LogicalPlanOptimizer.create());
-    return new QueryPlanFactory(new QueryService(analyzer, executionEngine(), planner));
-  }
-}
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/config/OpenSearchPluginModule.java b/plugin/src/main/java/org/opensearch/sql/plugin/config/OpenSearchPluginModule.java
new file mode 100644
index 0000000000..33a785c498
--- /dev/null
+++ b/plugin/src/main/java/org/opensearch/sql/plugin/config/OpenSearchPluginModule.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.plugin.config;
+
+import lombok.RequiredArgsConstructor;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.common.inject.AbstractModule;
+import org.opensearch.common.inject.Provides;
+import org.opensearch.common.inject.Singleton;
+import org.opensearch.sql.analysis.Analyzer;
+import org.opensearch.sql.analysis.ExpressionAnalyzer;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.executor.QueryManager;
+import org.opensearch.sql.executor.QueryService;
+import org.opensearch.sql.executor.execution.QueryPlanFactory;
+import org.opensearch.sql.executor.pagination.PlanSerializer;
+import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
+import org.opensearch.sql.monitor.ResourceMonitor;
+import org.opensearch.sql.opensearch.client.OpenSearchClient;
+import org.opensearch.sql.opensearch.client.OpenSearchNodeClient;
+import org.opensearch.sql.opensearch.executor.OpenSearchExecutionEngine;
+import org.opensearch.sql.opensearch.executor.OpenSearchQueryManager;
+import org.opensearch.sql.opensearch.executor.protector.ExecutionProtector;
+import org.opensearch.sql.opensearch.executor.protector.OpenSearchExecutionProtector;
+import org.opensearch.sql.opensearch.monitor.OpenSearchMemoryHealthy;
+import org.opensearch.sql.opensearch.monitor.OpenSearchResourceMonitor;
+import org.opensearch.sql.opensearch.storage.OpenSearchStorageEngine;
+import org.opensearch.sql.planner.Planner;
+import org.opensearch.sql.planner.optimizer.LogicalPlanOptimizer;
+import org.opensearch.sql.ppl.PPLService;
+import org.opensearch.sql.ppl.antlr.PPLSyntaxParser;
+import org.opensearch.sql.sql.SQLService;
+import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
+import org.opensearch.sql.storage.StorageEngine;
+
+@RequiredArgsConstructor
+public class OpenSearchPluginModule extends AbstractModule {
+
+  private final BuiltinFunctionRepository functionRepository =
+      BuiltinFunctionRepository.getInstance();
+
+  @Override
+  protected void configure() {}
+
+  @Provides
+  public OpenSearchClient openSearchClient(NodeClient nodeClient) {
+    return new OpenSearchNodeClient(nodeClient);
+  }
+
+  @Provides
+  public StorageEngine storageEngine(OpenSearchClient client, Settings settings) {
+    return new OpenSearchStorageEngine(client, settings);
+  }
+
+  @Provides
+  public ExecutionEngine executionEngine(
+      OpenSearchClient client, ExecutionProtector protector, PlanSerializer planSerializer) {
+    return new OpenSearchExecutionEngine(client, protector, planSerializer);
+  }
+
+  @Provides
+  public ResourceMonitor resourceMonitor(Settings settings) {
+    return new OpenSearchResourceMonitor(settings, new OpenSearchMemoryHealthy());
+  }
+
+  @Provides
+  public ExecutionProtector protector(ResourceMonitor resourceMonitor) {
+    return new OpenSearchExecutionProtector(resourceMonitor);
+  }
+
+  @Provides
+  public PlanSerializer planSerializer(StorageEngine storageEngine) {
+    return new PlanSerializer(storageEngine);
+  }
+
+  @Provides
+  @Singleton
+  public QueryManager queryManager(NodeClient nodeClient) {
+    return new OpenSearchQueryManager(nodeClient);
+  }
+
+  @Provides
+  public PPLService pplService(QueryManager queryManager, QueryPlanFactory queryPlanFactory) {
+    return new PPLService(new PPLSyntaxParser(), queryManager, queryPlanFactory);
+  }
+
+  @Provides
+  public SQLService sqlService(QueryManager queryManager, QueryPlanFactory queryPlanFactory) {
+    return new SQLService(new SQLSyntaxParser(), queryManager, queryPlanFactory);
+  }
+
+  /** {@link QueryPlanFactory}. */
+  @Provides
+  public QueryPlanFactory queryPlanFactory(
+      DataSourceService dataSourceService, ExecutionEngine executionEngine) {
+    Analyzer analyzer =
+        new Analyzer(
+            new ExpressionAnalyzer(functionRepository), dataSourceService, functionRepository);
+    Planner planner = new Planner(LogicalPlanOptimizer.create());
+    QueryService queryService = new QueryService(analyzer, executionEngine, planner);
+    return new QueryPlanFactory(queryService);
+  }
+}
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/datasource/DataSourceSettings.java b/plugin/src/main/java/org/opensearch/sql/plugin/datasource/DataSourceSettings.java
deleted file mode 100644
index 9a3466df45..0000000000
--- a/plugin/src/main/java/org/opensearch/sql/plugin/datasource/DataSourceSettings.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.plugin.datasource;
-
-import java.io.InputStream;
-import org.opensearch.common.settings.SecureSetting;
-import org.opensearch.common.settings.Setting;
-
-public class DataSourceSettings {
-
-  public static final Setting<InputStream> DATASOURCE_CONFIG = SecureSetting.secureFile(
-      "plugins.query.federation.datasources.config",
-      null);
-}
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/request/PPLQueryRequestFactory.java b/plugin/src/main/java/org/opensearch/sql/plugin/request/PPLQueryRequestFactory.java
index 730da0e923..ad734bf150 100644
--- a/plugin/src/main/java/org/opensearch/sql/plugin/request/PPLQueryRequestFactory.java
+++ b/plugin/src/main/java/org/opensearch/sql/plugin/request/PPLQueryRequestFactory.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.plugin.request;
 
 import java.util.Map;
@@ -15,9 +14,7 @@
 import org.opensearch.sql.protocol.response.format.Format;
 import org.opensearch.sql.protocol.response.format.JsonResponseFormatter;
 
-/**
- * Factory of {@link PPLQueryRequest}.
- */
+/** Factory of {@link PPLQueryRequest}. */
 public class PPLQueryRequestFactory {
   private static final String PPL_URL_PARAM_KEY = "ppl";
   private static final String PPL_FIELD_NAME = "query";
@@ -28,6 +25,7 @@ public class PPLQueryRequestFactory {
 
   /**
    * Build {@link PPLQueryRequest} from {@link RestRequest}.
+   *
    * @param request {@link PPLQueryRequest}
    * @return {@link RestRequest}
    */
@@ -63,8 +61,12 @@ private static PPLQueryRequest parsePPLRequestFromPayload(RestRequest restReques
     } catch (JSONException e) {
       throw new IllegalArgumentException("Failed to parse request payload", e);
     }
-    PPLQueryRequest pplRequest = new PPLQueryRequest(jsonContent.getString(PPL_FIELD_NAME),
-        jsonContent, restRequest.path(), format.getFormatName());
+    PPLQueryRequest pplRequest =
+        new PPLQueryRequest(
+            jsonContent.getString(PPL_FIELD_NAME),
+            jsonContent,
+            restRequest.path(),
+            format.getFormatName());
     // set sanitize option if csv format
     if (format.equals(Format.CSV)) {
       pplRequest.sanitize(getSanitizeOption(restRequest.params()));
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java
index 0f4d2f7d0c..7e6d3c1422 100644
--- a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java
+++ b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java
@@ -5,29 +5,28 @@
 
 package org.opensearch.sql.plugin.rest;
 
-import static org.opensearch.rest.RestStatus.BAD_REQUEST;
-import static org.opensearch.rest.RestStatus.INTERNAL_SERVER_ERROR;
-import static org.opensearch.rest.RestStatus.OK;
-import static org.opensearch.rest.RestStatus.SERVICE_UNAVAILABLE;
+import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
+import static org.opensearch.core.rest.RestStatus.INTERNAL_SERVER_ERROR;
+import static org.opensearch.core.rest.RestStatus.OK;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Supplier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.action.ActionListener;
+import org.opensearch.OpenSearchException;
 import org.opensearch.client.node.NodeClient;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestRequest;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
-import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasources.exceptions.DataSourceClientException;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.exception.QueryEngineException;
 import org.opensearch.sql.exception.SemanticCheckException;
@@ -47,16 +46,9 @@ public class RestPPLQueryAction extends BaseRestHandler {
 
   private static final Logger LOG = LogManager.getLogger();
 
-  private final Supplier<Boolean> pplEnabled;
-
   /** Constructor of RestPPLQueryAction. */
-  public RestPPLQueryAction(
-      Settings pluginSettings, org.opensearch.common.settings.Settings clusterSettings) {
+  public RestPPLQueryAction() {
     super();
-    this.pplEnabled =
-        () ->
-            MULTI_ALLOW_EXPLICIT_INDEX.get(clusterSettings)
-                && (Boolean) pluginSettings.getSettingValue(Settings.Key.PPL_ENABLED);
   }
 
   private static boolean isClientError(Exception e) {
@@ -67,7 +59,9 @@ private static boolean isClientError(Exception e) {
         || e instanceof SemanticCheckException
         || e instanceof ExpressionEvaluationException
         || e instanceof QueryEngineException
-        || e instanceof SyntaxCheckException;
+        || e instanceof SyntaxCheckException
+        || e instanceof DataSourceClientException
+        || e instanceof IllegalAccessException;
   }
 
   @Override
@@ -100,16 +94,8 @@ protected Set<String> responseParams() {
 
   @Override
   protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient nodeClient) {
-    // TODO: need move to transport Action
-    if (!pplEnabled.get()) {
-      return channel -> reportError(channel, new IllegalAccessException(
-          "Either plugins.ppl.enabled or rest.action.multi.allow_explicit_index setting is false"),
-          BAD_REQUEST);
-    }
-
-    TransportPPLQueryRequest transportPPLQueryRequest = new TransportPPLQueryRequest(
-            PPLQueryRequestFactory.getPPLRequest(request)
-    );
+    TransportPPLQueryRequest transportPPLQueryRequest =
+        new TransportPPLQueryRequest(PPLQueryRequestFactory.getPPLRequest(request));
 
     return channel ->
         nodeClient.execute(
@@ -129,8 +115,12 @@ public void onFailure(Exception e) {
                       channel,
                       INTERNAL_SERVER_ERROR,
                       "Failed to explain the query due to error: " + e.getMessage());
-                } else if (e instanceof IllegalAccessException) {
-                  reportError(channel, e, BAD_REQUEST);
+                } else if (e instanceof OpenSearchException) {
+                  Metrics.getInstance()
+                      .getNumericalMetric(MetricName.PPL_FAILED_REQ_COUNT_CUS)
+                      .increment();
+                  OpenSearchException exception = (OpenSearchException) e;
+                  reportError(channel, exception, exception.status());
                 } else {
                   LOG.error("Error happened during query handling", e);
                   if (isClientError(e)) {
@@ -142,7 +132,7 @@ public void onFailure(Exception e) {
                     Metrics.getInstance()
                         .getNumericalMetric(MetricName.PPL_FAILED_REQ_COUNT_SYS)
                         .increment();
-                    reportError(channel, e, SERVICE_UNAVAILABLE);
+                    reportError(channel, e, INTERNAL_SERVER_ERROR);
                   }
                 }
               }
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLStatsAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLStatsAction.java
index 5b9c792c7d..d3d7074b20 100644
--- a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLStatsAction.java
+++ b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLStatsAction.java
@@ -3,10 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.plugin.rest;
 
-import static org.opensearch.rest.RestStatus.SERVICE_UNAVAILABLE;
+import static org.opensearch.core.rest.RestStatus.INTERNAL_SERVER_ERROR;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
@@ -17,26 +16,24 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestController;
 import org.opensearch.rest.RestRequest;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.sql.common.utils.QueryContext;
+import org.opensearch.sql.datasources.utils.Scheduler;
 import org.opensearch.sql.legacy.executor.format.ErrorMessageFactory;
 import org.opensearch.sql.legacy.metrics.Metrics;
 
-/**
- * PPL Node level status.
- */
+/** PPL Node level status. */
 public class RestPPLStatsAction extends BaseRestHandler {
 
   private static final Logger LOG = LogManager.getLogger(RestPPLStatsAction.class);
 
-  /**
-   * API endpoint path.
-   */
+  /** API endpoint path. */
   public static final String PPL_STATS_API_ENDPOINT = "/_plugins/_ppl/stats";
+
   public static final String PPL_LEGACY_STATS_API_ENDPOINT = "/_opendistro/_ppl/stats";
 
   public RestPPLStatsAction(Settings settings, RestController restController) {
@@ -70,13 +67,21 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
     QueryContext.addRequestId();
 
     try {
-      return channel -> channel.sendResponse(new BytesRestResponse(RestStatus.OK,
-          Metrics.getInstance().collectToJSON()));
+      return channel ->
+          Scheduler.schedule(
+              client,
+              () ->
+                  channel.sendResponse(
+                      new BytesRestResponse(RestStatus.OK, Metrics.getInstance().collectToJSON())));
     } catch (Exception e) {
       LOG.error("Failed during Query PPL STATS Action.", e);
 
-      return channel -> channel.sendResponse(new BytesRestResponse(SERVICE_UNAVAILABLE,
-          ErrorMessageFactory.createErrorMessage(e, SERVICE_UNAVAILABLE.getStatus()).toString()));
+      return channel ->
+          channel.sendResponse(
+              new BytesRestResponse(
+                  INTERNAL_SERVER_ERROR,
+                  ErrorMessageFactory.createErrorMessage(e, INTERNAL_SERVER_ERROR.getStatus())
+                      .toString()));
     }
   }
 
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java
index 59518e7a9d..f9080051b4 100644
--- a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java
+++ b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java
@@ -5,7 +5,7 @@
 
 package org.opensearch.sql.plugin.rest;
 
-import static org.opensearch.rest.RestStatus.INTERNAL_SERVER_ERROR;
+import static org.opensearch.core.rest.RestStatus.INTERNAL_SERVER_ERROR;
 
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
@@ -17,12 +17,10 @@
 import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
 import org.opensearch.client.Requests;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestController;
@@ -41,9 +39,19 @@ public class RestQuerySettingsAction extends BaseRestHandler {
   private static final String LEGACY_SQL_SETTINGS_PREFIX = "opendistro.sql.";
   private static final String LEGACY_PPL_SETTINGS_PREFIX = "opendistro.ppl.";
   private static final String LEGACY_COMMON_SETTINGS_PREFIX = "opendistro.query.";
-  private static final List<String> SETTINGS_PREFIX = ImmutableList.of(
-      SQL_SETTINGS_PREFIX, PPL_SETTINGS_PREFIX, COMMON_SETTINGS_PREFIX,
-      LEGACY_SQL_SETTINGS_PREFIX, LEGACY_PPL_SETTINGS_PREFIX, LEGACY_COMMON_SETTINGS_PREFIX);
+  private static final String EXECUTION_ENGINE_SETTINGS_PREFIX = "plugins.query.executionengine";
+  public static final String DATASOURCES_SETTINGS_PREFIX = "plugins.query.datasources";
+  private static final List<String> SETTINGS_PREFIX =
+      ImmutableList.of(
+          SQL_SETTINGS_PREFIX,
+          PPL_SETTINGS_PREFIX,
+          COMMON_SETTINGS_PREFIX,
+          LEGACY_SQL_SETTINGS_PREFIX,
+          LEGACY_PPL_SETTINGS_PREFIX,
+          LEGACY_COMMON_SETTINGS_PREFIX);
+
+  private static final List<String> DENY_LIST_SETTINGS_PREFIX =
+      ImmutableList.of(EXECUTION_ENGINE_SETTINGS_PREFIX, DATASOURCES_SETTINGS_PREFIX);
 
   public static final String SETTINGS_API_ENDPOINT = "/_plugins/_query/settings";
   public static final String LEGACY_SQL_SETTINGS_API_ENDPOINT = "/_opendistro/_sql/settings";
@@ -77,10 +85,11 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
     QueryContext.addRequestId();
     final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest =
         Requests.clusterUpdateSettingsRequest();
-    clusterUpdateSettingsRequest.timeout(request.paramAsTime(
-        "timeout", clusterUpdateSettingsRequest.timeout()));
-    clusterUpdateSettingsRequest.clusterManagerNodeTimeout(request.paramAsTime(
-        "cluster_manager_timeout", clusterUpdateSettingsRequest.clusterManagerNodeTimeout()));
+    clusterUpdateSettingsRequest.timeout(
+        request.paramAsTime("timeout", clusterUpdateSettingsRequest.timeout()));
+    clusterUpdateSettingsRequest.clusterManagerNodeTimeout(
+        request.paramAsTime(
+            "cluster_manager_timeout", clusterUpdateSettingsRequest.clusterManagerNodeTimeout()));
     Map<String, Object> source;
     try (XContentParser parser = request.contentParser()) {
       source = parser.map();
@@ -88,37 +97,51 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
 
     try {
       if (source.containsKey(TRANSIENT)) {
-        clusterUpdateSettingsRequest.transientSettings(getAndFilterSettings(
-            (Map<String, ?>) source.get(TRANSIENT)));
+        clusterUpdateSettingsRequest.transientSettings(
+            getAndFilterSettings((Map<String, ?>) source.get(TRANSIENT)));
       }
       if (source.containsKey(PERSISTENT)) {
-        clusterUpdateSettingsRequest.persistentSettings(getAndFilterSettings(
-            (Map<String, ?>) source.get(PERSISTENT)));
+        clusterUpdateSettingsRequest.persistentSettings(
+            getAndFilterSettings((Map<String, ?>) source.get(PERSISTENT)));
       }
 
-      return channel -> client.admin().cluster().updateSettings(
-          clusterUpdateSettingsRequest, new RestToXContentListener<>(channel));
+      return channel ->
+          client
+              .admin()
+              .cluster()
+              .updateSettings(clusterUpdateSettingsRequest, new RestToXContentListener<>(channel));
     } catch (Exception e) {
       LOG.error("Error changing OpenSearch SQL plugin cluster settings", e);
-      return channel -> channel.sendResponse(new BytesRestResponse(INTERNAL_SERVER_ERROR,
-          ErrorMessageFactory.createErrorMessage(e, INTERNAL_SERVER_ERROR.getStatus()).toString()));
+      return channel ->
+          channel.sendResponse(
+              new BytesRestResponse(
+                  INTERNAL_SERVER_ERROR,
+                  ErrorMessageFactory.createErrorMessage(e, INTERNAL_SERVER_ERROR.getStatus())
+                      .toString()));
     }
   }
 
   private Settings getAndFilterSettings(Map<String, ?> source) {
     try {
-      XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
+      XContentBuilder builder = XContentFactory.jsonBuilder();
       builder.map(source);
-      Settings.Builder settingsBuilder = Settings.builder()
-          .loadFromSource(Strings.toString(builder), builder.contentType());
-      settingsBuilder.keys().removeIf(key -> {
-        for (String prefix : SETTINGS_PREFIX) {
-          if (key.startsWith(prefix)) {
-            return false;
-          }
-        }
-        return true;
-      });
+      Settings.Builder settingsBuilder =
+          Settings.builder().loadFromSource(builder.toString(), builder.contentType());
+      settingsBuilder
+          .keys()
+          .removeIf(
+              key -> {
+                for (String prefix : SETTINGS_PREFIX) {
+                  if (key.startsWith(prefix)) {
+                    return false;
+                  }
+                }
+                return true;
+              });
+      // Applying DenyList Filter.
+      settingsBuilder
+          .keys()
+          .removeIf(key -> DENY_LIST_SETTINGS_PREFIX.stream().anyMatch(key::startsWith));
       return settingsBuilder.build();
     } catch (IOException e) {
       throw new OpenSearchGenerationException("Failed to generate [" + source + "]", e);
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryAction.java
index af57c91e5c..76283ac63a 100644
--- a/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryAction.java
+++ b/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryAction.java
@@ -5,25 +5,32 @@
 
 package org.opensearch.sql.plugin.transport;
 
+import static org.opensearch.rest.BaseRestHandler.MULTI_ALLOW_EXPLICIT_INDEX;
 import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.Style.PRETTY;
 
 import java.util.Locale;
 import java.util.Optional;
-import org.opensearch.action.ActionListener;
+import java.util.function.Supplier;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
+import org.opensearch.common.inject.Injector;
+import org.opensearch.common.inject.ModulesBuilder;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.common.utils.QueryContext;
+import org.opensearch.sql.datasource.DataSourceService;
+import org.opensearch.sql.datasources.service.DataSourceServiceImpl;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.legacy.metrics.MetricName;
 import org.opensearch.sql.legacy.metrics.Metrics;
 import org.opensearch.sql.opensearch.security.SecurityAccess;
 import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
+import org.opensearch.sql.plugin.config.OpenSearchPluginModule;
 import org.opensearch.sql.ppl.PPLService;
 import org.opensearch.sql.ppl.domain.PPLQueryRequest;
 import org.opensearch.sql.protocol.response.QueryResult;
@@ -36,21 +43,14 @@
 import org.opensearch.sql.protocol.response.format.VisualizationResponseFormatter;
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 /** Send PPL query transport action. */
 public class TransportPPLQueryAction
     extends HandledTransportAction<ActionRequest, TransportPPLQueryResponse> {
-  private final NodeClient client;
 
-  /** Cluster service required by bean initialization. */
-  private final ClusterService clusterService;
-
-  /** Settings required by been initialization. */
-  private final Settings pluginSettings;
-
-  private final AnnotationConfigApplicationContext applicationContext;
+  private final Injector injector;
 
+  private final Supplier<Boolean> pplEnabled;
 
   /** Constructor of TransportPPLQueryAction. */
   @Inject
@@ -59,12 +59,27 @@ public TransportPPLQueryAction(
       ActionFilters actionFilters,
       NodeClient client,
       ClusterService clusterService,
-      AnnotationConfigApplicationContext applicationContext) {
+      DataSourceServiceImpl dataSourceService,
+      org.opensearch.common.settings.Settings clusterSettings) {
     super(PPLQueryAction.NAME, transportService, actionFilters, TransportPPLQueryRequest::new);
-    this.client = client;
-    this.clusterService = clusterService;
-    this.pluginSettings = new OpenSearchSettings(clusterService.getClusterSettings());
-    this.applicationContext = applicationContext;
+
+    ModulesBuilder modules = new ModulesBuilder();
+    modules.add(new OpenSearchPluginModule());
+    modules.add(
+        b -> {
+          b.bind(NodeClient.class).toInstance(client);
+          b.bind(org.opensearch.sql.common.setting.Settings.class)
+              .toInstance(new OpenSearchSettings(clusterService.getClusterSettings()));
+          b.bind(DataSourceService.class).toInstance(dataSourceService);
+        });
+    this.injector = modules.createInjector();
+    this.pplEnabled =
+        () ->
+            MULTI_ALLOW_EXPLICIT_INDEX.get(clusterSettings)
+                && (Boolean)
+                    injector
+                        .getInstance(org.opensearch.sql.common.setting.Settings.class)
+                        .getSettingValue(Settings.Key.PPL_ENABLED);
   }
 
   /**
@@ -74,13 +89,20 @@ public TransportPPLQueryAction(
   @Override
   protected void doExecute(
       Task task, ActionRequest request, ActionListener<TransportPPLQueryResponse> listener) {
+    if (!pplEnabled.get()) {
+      listener.onFailure(
+          new IllegalAccessException(
+              "Either plugins.ppl.enabled or rest.action.multi.allow_explicit_index setting is"
+                  + " false"));
+      return;
+    }
     Metrics.getInstance().getNumericalMetric(MetricName.PPL_REQ_TOTAL).increment();
     Metrics.getInstance().getNumericalMetric(MetricName.PPL_REQ_COUNT_TOTAL).increment();
 
     QueryContext.addRequestId();
 
     PPLService pplService =
-        SecurityAccess.doPrivileged(() -> applicationContext.getBean(PPLService.class));
+        SecurityAccess.doPrivileged(() -> injector.getInstance(PPLService.class));
     TransportPPLQueryRequest transportRequest = TransportPPLQueryRequest.fromActionRequest(request);
     // in order to use PPL service, we need to convert TransportPPLQueryRequest to PPLQueryRequest
     PPLQueryRequest transformedRequest = transportRequest.toPPLQueryRequest();
@@ -137,7 +159,8 @@ private ResponseListener<ExecutionEngine.QueryResponse> createListener(
       @Override
       public void onResponse(ExecutionEngine.QueryResponse response) {
         String responseContent =
-            formatter.format(new QueryResult(response.getSchema(), response.getResults()));
+            formatter.format(
+                new QueryResult(response.getSchema(), response.getResults(), response.getCursor()));
         listener.onResponse(new TransportPPLQueryResponse(responseContent));
       }
 
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryRequest.java b/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryRequest.java
index 5ced07c02e..8cdf27ef3c 100644
--- a/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryRequest.java
+++ b/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryRequest.java
@@ -17,10 +17,10 @@
 import org.json.JSONObject;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.common.io.stream.InputStreamStreamInput;
-import org.opensearch.common.io.stream.OutputStreamStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.InputStreamStreamInput;
+import org.opensearch.core.common.io.stream.OutputStreamStreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.sql.ppl.domain.PPLQueryRequest;
 import org.opensearch.sql.protocol.response.format.Format;
 import org.opensearch.sql.protocol.response.format.JsonResponseFormatter;
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryResponse.java b/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryResponse.java
index bfd4994b07..a8d06fa626 100644
--- a/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryResponse.java
+++ b/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryResponse.java
@@ -5,12 +5,17 @@
 
 package org.opensearch.sql.plugin.transport;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.opensearch.action.ActionResponse;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.InputStreamStreamInput;
+import org.opensearch.core.common.io.stream.OutputStreamStreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 
 @RequiredArgsConstructor
 public class TransportPPLQueryResponse extends ActionResponse {
@@ -25,4 +30,22 @@ public TransportPPLQueryResponse(StreamInput in) throws IOException {
   public void writeTo(StreamOutput out) throws IOException {
     out.writeString(result);
   }
+
+  public static TransportPPLQueryResponse fromActionResponse(ActionResponse actionResponse) {
+    if (actionResponse instanceof TransportPPLQueryResponse) {
+      return (TransportPPLQueryResponse) actionResponse;
+    }
+
+    try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        OutputStreamStreamOutput osso = new OutputStreamStreamOutput(baos)) {
+      actionResponse.writeTo(osso);
+      try (StreamInput input =
+          new InputStreamStreamInput(new ByteArrayInputStream(baos.toByteArray()))) {
+        return new TransportPPLQueryResponse(input);
+      }
+    } catch (IOException e) {
+      throw new UncheckedIOException(
+          "failed to parse ActionResponse into TransportPPLQueryResponse", e);
+    }
+  }
 }
diff --git a/plugin/src/main/plugin-metadata/plugin-security.policy b/plugin/src/main/plugin-metadata/plugin-security.policy
index aec517aa84..fcf70c01f9 100644
--- a/plugin/src/main/plugin-metadata/plugin-security.policy
+++ b/plugin/src/main/plugin-metadata/plugin-security.policy
@@ -15,4 +15,13 @@ grant {
 
   // ml-commons client
   permission java.lang.RuntimePermission "setContextClassLoader";
+
+  // aws credentials
+  permission java.io.FilePermission "${user.home}${/}.aws${/}*", "read";
+
+  // Permissions for aws emr servless sdk
+  permission javax.management.MBeanServerPermission "createMBeanServer";
+  permission javax.management.MBeanServerPermission "findMBeanServer";
+  permission javax.management.MBeanPermission "com.amazonaws.metrics.*", "*";
+  permission javax.management.MBeanTrustPermission "register";
 };
diff --git a/plugin/src/main/resources/META-INF/services/org.opensearch.jobscheduler.spi.JobSchedulerExtension b/plugin/src/main/resources/META-INF/services/org.opensearch.jobscheduler.spi.JobSchedulerExtension
new file mode 100644
index 0000000000..5337857c15
--- /dev/null
+++ b/plugin/src/main/resources/META-INF/services/org.opensearch.jobscheduler.spi.JobSchedulerExtension
@@ -0,0 +1,6 @@
+#
+# Copyright OpenSearch Contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+
+org.opensearch.sql.plugin.SQLPlugin
\ No newline at end of file
diff --git a/plugin/src/test/java/org/opensearch/sql/plugin/datasource/DataSourceMetaDataTest.java b/plugin/src/test/java/org/opensearch/sql/plugin/datasource/DataSourceMetaDataTest.java
deleted file mode 100644
index dc6eadbf7e..0000000000
--- a/plugin/src/test/java/org/opensearch/sql/plugin/datasource/DataSourceMetaDataTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.sql.plugin.datasource;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import com.google.common.collect.ImmutableMap;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import lombok.SneakyThrows;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.opensearch.common.settings.MockSecureSettings;
-import org.opensearch.common.settings.Settings;
-import org.opensearch.sql.datasource.DataSourceService;
-import org.opensearch.sql.datasource.model.DataSourceMetadata;
-import org.opensearch.sql.datasource.model.DataSourceType;
-import org.opensearch.sql.plugin.SQLPlugin;
-
-@RunWith(MockitoJUnitRunner.class)
-public class DataSourceMetaDataTest {
-
-  public static final String DATASOURCE_SETTING_METADATA_KEY =
-      "plugins.query.federation.datasources.config";
-
-  @Mock
-  private DataSourceService dataSourceService;
-
-  @SneakyThrows
-  @Test
-  public void testLoadConnectors() {
-    Settings settings = getDataSourceSettings("datasources.json");
-    loadConnectors(settings);
-    List<DataSourceMetadata> expected =
-        new ArrayList<>() {
-          {
-            add(
-                metadata(
-                    "prometheus",
-                    DataSourceType.PROMETHEUS,
-                    ImmutableMap.of(
-                        "prometheus.uri", "http://localhost:9090",
-                        "prometheus.auth.type", "basicauth",
-                        "prometheus.auth.username", "admin",
-                        "prometheus.auth.password", "type")));
-          }
-        };
-
-    verifyAddDataSourceWithMetadata(expected);
-  }
-
-  @SneakyThrows
-  @Test
-  public void testLoadConnectorsWithMultipleDataSources() {
-    Settings settings = getDataSourceSettings("multiple_datasources.json");
-    loadConnectors(settings);
-    List<DataSourceMetadata> expected = new ArrayList<>() {{
-        add(metadata("prometheus", DataSourceType.PROMETHEUS, ImmutableMap.of(
-            "prometheus.uri", "http://localhost:9090",
-            "prometheus.auth.type", "basicauth",
-            "prometheus.auth.username", "admin",
-            "prometheus.auth.password", "type"
-        )));
-        add(metadata("prometheus-1", DataSourceType.PROMETHEUS, ImmutableMap.of(
-            "prometheus.uri", "http://localhost:9090",
-            "prometheus.auth.type", "awssigv4",
-            "prometheus.auth.region", "us-east-1",
-            "prometheus.auth.access_key", "accessKey",
-            "prometheus.auth.secret_key", "secretKey"
-        )));
-      }};
-
-    verifyAddDataSourceWithMetadata(expected);
-  }
-
-  @SneakyThrows
-  @Test
-  public void testLoadConnectorsWithMalformedJson() {
-    Settings settings = getDataSourceSettings("malformed_datasources.json");
-    loadConnectors(settings);
-
-    verify(dataSourceService, never()).addDataSource(any());
-  }
-
-  private Settings getDataSourceSettings(String filename) throws URISyntaxException, IOException {
-    MockSecureSettings mockSecureSettings = new MockSecureSettings();
-    ClassLoader classLoader = getClass().getClassLoader();
-    Path filepath = Paths.get(classLoader.getResource(filename).toURI());
-    mockSecureSettings.setFile(DATASOURCE_SETTING_METADATA_KEY, Files.readAllBytes(filepath));
-    return Settings.builder().setSecureSettings(mockSecureSettings).build();
-  }
-
-  void loadConnectors(Settings settings) {
-    SQLPlugin.loadDataSources(dataSourceService, settings);
-  }
-
-  void verifyAddDataSourceWithMetadata(List<DataSourceMetadata> metadataList) {
-    ArgumentCaptor<DataSourceMetadata> metadataCaptor =
-        ArgumentCaptor.forClass(DataSourceMetadata.class);
-    verify(dataSourceService, times(1)).addDataSource(metadataCaptor.capture());
-    List<DataSourceMetadata> actualValues = metadataCaptor.getAllValues();
-    assertEquals(metadataList.size(), actualValues.size());
-    assertEquals(metadataList, actualValues);
-  }
-
-  DataSourceMetadata metadata(String name, DataSourceType type, Map<String, String> properties) {
-    DataSourceMetadata dataSourceMetadata = new DataSourceMetadata();
-    dataSourceMetadata.setName(name);
-    dataSourceMetadata.setConnector(type);
-    dataSourceMetadata.setProperties(properties);
-    return dataSourceMetadata;
-  }
-}
diff --git a/plugin/src/test/java/org/opensearch/sql/plugin/transport/TransportPPLQueryRequestTest.java b/plugin/src/test/java/org/opensearch/sql/plugin/transport/TransportPPLQueryRequestTest.java
index 6e086f4d4c..286ac20fed 100644
--- a/plugin/src/test/java/org/opensearch/sql/plugin/transport/TransportPPLQueryRequestTest.java
+++ b/plugin/src/test/java/org/opensearch/sql/plugin/transport/TransportPPLQueryRequestTest.java
@@ -16,7 +16,7 @@
 import org.junit.rules.ExpectedException;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 
 public class TransportPPLQueryRequestTest {
 
@@ -59,9 +59,7 @@ public void writeTo(StreamOutput out) throws IOException {
 
   @Test
   public void testCustomizedNullJSONContentActionRequestFromActionRequest() {
-    TransportPPLQueryRequest request = new TransportPPLQueryRequest(
-            "source=t a=1", null, null
-    );
+    TransportPPLQueryRequest request = new TransportPPLQueryRequest("source=t a=1", null, null);
     ActionRequest actionRequest =
         new ActionRequest() {
           @Override
diff --git a/plugin/src/test/java/org/opensearch/sql/plugin/transport/TransportPPLQueryResponseTest.java b/plugin/src/test/java/org/opensearch/sql/plugin/transport/TransportPPLQueryResponseTest.java
new file mode 100644
index 0000000000..ba065c1ebe
--- /dev/null
+++ b/plugin/src/test/java/org/opensearch/sql/plugin/transport/TransportPPLQueryResponseTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.plugin.transport;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.opensearch.core.action.ActionResponse;
+
+public class TransportPPLQueryResponseTest {
+
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
+
+  @Test
+  public void testFromActionResponseSameClassloader() {
+    TransportPPLQueryResponse response1 = new TransportPPLQueryResponse("mock result");
+    TransportPPLQueryResponse response2 = TransportPPLQueryResponse.fromActionResponse(response1);
+    assertEquals(response1.getResult(), response2.getResult());
+  }
+
+  @Test
+  public void testFromActionResponseDifferentClassLoader()
+      throws ClassNotFoundException,
+          InstantiationException,
+          IllegalAccessException,
+          NoSuchMethodException,
+          InvocationTargetException,
+          URISyntaxException {
+    ClassLoader loader = TransportPPLQueryResponseTest.class.getClassLoader();
+    URI resourceURI =
+        loader
+            .getResource("org/opensearch/sql/plugin/transport/TransportPPLQueryResponse.class")
+            .toURI();
+    Path classFilePath = Paths.get(resourceURI);
+    CustomClassLoader classLoader1 = new CustomClassLoader(classFilePath);
+    CustomClassLoader classLoader2 = new CustomClassLoader(classFilePath);
+
+    Class<?> class1 =
+        classLoader1.findClass("org.opensearch.sql.plugin.transport.TransportPPLQueryResponse");
+    Class<?> class2 =
+        classLoader2.findClass("org.opensearch.sql.plugin.transport.TransportPPLQueryResponse");
+
+    assertFalse(class1.isAssignableFrom(class2));
+    String result = "mock result";
+    TransportPPLQueryResponse response2 =
+        TransportPPLQueryResponse.fromActionResponse(
+            (ActionResponse) class1.getDeclaredConstructor(String.class).newInstance(result));
+    assertEquals(result, response2.getResult());
+  }
+}
+
+class CustomClassLoader extends ClassLoader {
+
+  private final Path classFilePath;
+
+  public CustomClassLoader(Path classFilePath) {
+    this.classFilePath = classFilePath;
+  }
+
+  @Override
+  protected Class<?> findClass(String name) throws ClassNotFoundException {
+    try {
+      byte[] classBytes = Files.readAllBytes(classFilePath);
+      return defineClass(name, classBytes, 0, classBytes.length);
+    } catch (IOException e) {
+      throw new ClassNotFoundException("Failed to load class: " + name, e);
+    }
+  }
+}
diff --git a/plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000000..ca6ee9cea8
--- /dev/null
+++ b/plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file
diff --git a/ppl/build.gradle b/ppl/build.gradle
index 1c605f4372..fbf27ba753 100644
--- a/ppl/build.gradle
+++ b/ppl/build.gradle
@@ -27,6 +27,7 @@ plugins {
     id "io.freefair.lombok"
     id 'jacoco'
     id 'antlr'
+    id 'com.diffplug.spotless' version '6.22.0'
 }
 
 generateGrammarSource {
@@ -44,19 +45,19 @@ configurations {
 dependencies {
     antlr "org.antlr:antlr4:4.7.1"
 
+    runtimeOnly group: 'org.reflections', name: 'reflections', version: '0.9.12'
+
     implementation "org.antlr:antlr4-runtime:4.7.1"
-    implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
-    api group: 'org.json', name: 'json', version: '20180813'
-    implementation group: 'org.springframework', name: 'spring-context', version: "${spring_version}"
-    implementation group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
+    implementation group: 'com.google.guava', name: 'guava', version: "${guava_version}"
+    api group: 'org.json', name: 'json', version: '20231013'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version:"${versions.log4j}"
     api project(':common')
     api project(':core')
     api project(':protocol')
 
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
     testImplementation(testFixtures(project(":core")))
 }
 
@@ -69,8 +70,8 @@ test {
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required = true
+        xml.required = true
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {
diff --git a/ppl/src/main/antlr/OpenSearchPPLLexer.g4 b/ppl/src/main/antlr/OpenSearchPPLLexer.g4
index 9282c42308..9f707c13cd 100644
--- a/ppl/src/main/antlr/OpenSearchPPLLexer.g4
+++ b/ppl/src/main/antlr/OpenSearchPPLLexer.g4
@@ -90,30 +90,37 @@ FALSE:                              'FALSE';
 REGEXP:                             'REGEXP';
 
 // DATETIME, INTERVAL AND UNIT KEYWORDS
+CONVERT_TZ:                         'CONVERT_TZ';
 DATETIME:                           'DATETIME';
+DAY:                                'DAY';
+DAY_HOUR:                           'DAY_HOUR';
+DAY_MICROSECOND:                    'DAY_MICROSECOND';
+DAY_MINUTE:                         'DAY_MINUTE';
+DAY_OF_YEAR:                        'DAY_OF_YEAR';
+DAY_SECOND:                         'DAY_SECOND';
+HOUR:                               'HOUR';
+HOUR_MICROSECOND:                   'HOUR_MICROSECOND';
+HOUR_MINUTE:                        'HOUR_MINUTE';
+HOUR_OF_DAY:                        'HOUR_OF_DAY';
+HOUR_SECOND:                        'HOUR_SECOND';
 INTERVAL:                           'INTERVAL';
 MICROSECOND:                        'MICROSECOND';
 MILLISECOND:                        'MILLISECOND';
-SECOND:                             'SECOND';
 MINUTE:                             'MINUTE';
-HOUR:                               'HOUR';
-DAY:                                'DAY';
-WEEK:                               'WEEK';
+MINUTE_MICROSECOND:                 'MINUTE_MICROSECOND';
+MINUTE_OF_DAY:                      'MINUTE_OF_DAY';
+MINUTE_OF_HOUR:                     'MINUTE_OF_HOUR';
+MINUTE_SECOND:                      'MINUTE_SECOND';
 MONTH:                              'MONTH';
+MONTH_OF_YEAR:                      'MONTH_OF_YEAR';
 QUARTER:                            'QUARTER';
-YEAR:                               'YEAR';
+SECOND:                             'SECOND';
 SECOND_MICROSECOND:                 'SECOND_MICROSECOND';
-MINUTE_MICROSECOND:                 'MINUTE_MICROSECOND';
-MINUTE_SECOND:                      'MINUTE_SECOND';
-HOUR_MICROSECOND:                   'HOUR_MICROSECOND';
-HOUR_SECOND:                        'HOUR_SECOND';
-HOUR_MINUTE:                        'HOUR_MINUTE';
-DAY_MICROSECOND:                    'DAY_MICROSECOND';
-DAY_SECOND:                         'DAY_SECOND';
-DAY_MINUTE:                         'DAY_MINUTE';
-DAY_HOUR:                           'DAY_HOUR';
+SECOND_OF_MINUTE:                   'SECOND_OF_MINUTE';
+WEEK:                               'WEEK';
+WEEK_OF_YEAR:                       'WEEK_OF_YEAR';
+YEAR:                               'YEAR';
 YEAR_MONTH:                         'YEAR_MONTH';
-CONVERT_TZ:                         'CONVERT_TZ';
 
 // DATASET TYPES
 DATAMODEL:                          'DATAMODEL';
@@ -181,6 +188,7 @@ VAR_POP:                            'VAR_POP';
 STDDEV_SAMP:                        'STDDEV_SAMP';
 STDDEV_POP:                         'STDDEV_POP';
 PERCENTILE:                         'PERCENTILE';
+PERCENTILE_APPROX:                  'PERCENTILE_APPROX';
 TAKE:                               'TAKE';
 FIRST:                              'FIRST';
 LAST:                               'LAST';
@@ -238,12 +246,14 @@ TAN:                                'TAN';
 
 // DATE AND TIME FUNCTIONS
 ADDDATE:                            'ADDDATE';
+ADDTIME:                            'ADDTIME';
 CURDATE:                            'CURDATE';
 CURRENT_DATE:                       'CURRENT_DATE';
 CURRENT_TIME:                       'CURRENT_TIME';
 CURRENT_TIMESTAMP:                  'CURRENT_TIMESTAMP';
 CURTIME:                            'CURTIME';
 DATE:                               'DATE';
+DATEDIFF:                           'DATEDIFF';
 DATE_ADD:                           'DATE_ADD';
 DATE_FORMAT:                        'DATE_FORMAT';
 DATE_SUB:                           'DATE_SUB';
@@ -251,26 +261,41 @@ DAYNAME:                            'DAYNAME';
 DAYOFMONTH:                         'DAYOFMONTH';
 DAYOFWEEK:                          'DAYOFWEEK';
 DAYOFYEAR:                          'DAYOFYEAR';
+DAY_OF_MONTH:                       'DAY_OF_MONTH';
+DAY_OF_WEEK:                        'DAY_OF_WEEK';
+EXTRACT:                            'EXTRACT';
 FROM_DAYS:                          'FROM_DAYS';
+FROM_UNIXTIME:                      'FROM_UNIXTIME';
+GET_FORMAT:                         'GET_FORMAT';
+LAST_DAY:                           'LAST_DAY';
 LOCALTIME:                          'LOCALTIME';
 LOCALTIMESTAMP:                     'LOCALTIMESTAMP';
-FROM_UNIXTIME:                      'FROM_UNIXTIME';
 MAKEDATE:                           'MAKEDATE';
 MAKETIME:                           'MAKETIME';
 MONTHNAME:                          'MONTHNAME';
 NOW:                                'NOW';
 PERIOD_ADD:                         'PERIOD_ADD';
 PERIOD_DIFF:                        'PERIOD_DIFF';
+SEC_TO_TIME:                        'SEC_TO_TIME';
+STR_TO_DATE:                        'STR_TO_DATE';
 SUBDATE:                            'SUBDATE';
+SUBTIME:                            'SUBTIME';
 SYSDATE:                            'SYSDATE';
 TIME:                               'TIME';
-TIME_TO_SEC:                        'TIME_TO_SEC';
+TIMEDIFF:                           'TIMEDIFF';
 TIMESTAMP:                          'TIMESTAMP';
+TIMESTAMPADD:                       'TIMESTAMPADD';
+TIMESTAMPDIFF:                      'TIMESTAMPDIFF';
+TIME_FORMAT:                        'TIME_FORMAT';
+TIME_TO_SEC:                        'TIME_TO_SEC';
 TO_DAYS:                            'TO_DAYS';
+TO_SECONDS:                         'TO_SECONDS';
+UNIX_TIMESTAMP:                     'UNIX_TIMESTAMP';
 UTC_DATE:                           'UTC_DATE';
 UTC_TIME:                           'UTC_TIME';
 UTC_TIMESTAMP:                      'UTC_TIMESTAMP';
-UNIX_TIMESTAMP:                     'UNIX_TIMESTAMP';
+WEEKDAY:                            'WEEKDAY';
+YEARWEEK:                           'YEARWEEK';
 
 // TEXT FUNCTIONS
 SUBSTR:                             'SUBSTR';
@@ -359,12 +384,14 @@ Y:                                  'Y';
 // LITERALS AND VALUES
 //STRING_LITERAL:                     DQUOTA_STRING | SQUOTA_STRING | BQUOTA_STRING;
 ID:                                 ID_LITERAL;
+CLUSTER:                            CLUSTER_PREFIX_LITERAL;
 INTEGER_LITERAL:                    DEC_DIGIT+;
 DECIMAL_LITERAL:                    (DEC_DIGIT+)? '.' DEC_DIGIT+;
 
-fragment DATE_SUFFIX:               ([\-.][*0-9]+)*;
+fragment DATE_SUFFIX:               ([\-.][*0-9]+)+;
 fragment ID_LITERAL:                [@*A-Z]+?[*A-Z_\-0-9]*;
-ID_DATE_SUFFIX:                     ID_LITERAL DATE_SUFFIX;
+fragment CLUSTER_PREFIX_LITERAL:    [*A-Z]+?[*A-Z_\-0-9]* COLON;
+ID_DATE_SUFFIX:                     CLUSTER_PREFIX_LITERAL? ID_LITERAL DATE_SUFFIX;
 DQUOTA_STRING:                      '"' ( '\\'. | '""' | ~('"'| '\\') )* '"';
 SQUOTA_STRING:                      '\'' ('\\'. | '\'\'' | ~('\'' | '\\'))* '\'';
 BQUOTA_STRING:                      '`' ( '\\'. | '``' | ~('`'|'\\'))* '`';
diff --git a/ppl/src/main/antlr/OpenSearchPPLParser.g4 b/ppl/src/main/antlr/OpenSearchPPLParser.g4
index a0d6553875..4dc223b028 100644
--- a/ppl/src/main/antlr/OpenSearchPPLParser.g4
+++ b/ppl/src/main/antlr/OpenSearchPPLParser.g4
@@ -4,614 +4,925 @@
  */
 
 
-
 parser grammar OpenSearchPPLParser;
-options { tokenVocab=OpenSearchPPLLexer; }
 
+
+options { tokenVocab = OpenSearchPPLLexer; }
 root
-    : pplStatement? EOF
-    ;
+   : pplStatement? EOF
+   ;
 
-/** statement */
+// statement
 pplStatement
-    : dmlStatement
-    ;
+   : dmlStatement
+   ;
 
 dmlStatement
-    : queryStatement
-    ;
+   : queryStatement
+   ;
 
 queryStatement
-    : pplCommands (PIPE commands)*
-    ;
+   : pplCommands (PIPE commands)*
+   ;
 
-/** commands */
+// commands
 pplCommands
-    : searchCommand
-    | describeCommand
-    | showDataSourcesCommand
-    ;
+   : searchCommand
+   | describeCommand
+   | showDataSourcesCommand
+   ;
 
 commands
-    : whereCommand | fieldsCommand | renameCommand | statsCommand | dedupCommand | sortCommand | evalCommand | headCommand
-    | topCommand | rareCommand | grokCommand | parseCommand | patternsCommand | kmeansCommand | adCommand | mlCommand;
+   : whereCommand
+   | fieldsCommand
+   | renameCommand
+   | statsCommand
+   | dedupCommand
+   | sortCommand
+   | evalCommand
+   | headCommand
+   | topCommand
+   | rareCommand
+   | grokCommand
+   | parseCommand
+   | patternsCommand
+   | kmeansCommand
+   | adCommand
+   | mlCommand
+   ;
 
 searchCommand
-    : (SEARCH)? fromClause                                          #searchFrom
-    | (SEARCH)? fromClause logicalExpression                        #searchFromFilter
-    | (SEARCH)? logicalExpression fromClause                        #searchFilterFrom
-    ;
+   : (SEARCH)? fromClause                       # searchFrom
+   | (SEARCH)? fromClause logicalExpression     # searchFromFilter
+   | (SEARCH)? logicalExpression fromClause     # searchFilterFrom
+   ;
 
 describeCommand
-    : DESCRIBE tableSourceClause
-    ;
+   : DESCRIBE tableSourceClause
+   ;
 
 showDataSourcesCommand
-    : SHOW DATASOURCES
-    ;
+   : SHOW DATASOURCES
+   ;
 
 whereCommand
-    : WHERE logicalExpression
-    ;
+   : WHERE logicalExpression
+   ;
 
 fieldsCommand
-    : FIELDS (PLUS | MINUS)? fieldList
-    ;
+   : FIELDS (PLUS | MINUS)? fieldList
+   ;
 
 renameCommand
-    : RENAME renameClasue (COMMA renameClasue)*
-    ;
+   : RENAME renameClasue (COMMA renameClasue)*
+   ;
 
 statsCommand
-    : STATS
-    (PARTITIONS EQUAL partitions=integerLiteral)?
-    (ALLNUM EQUAL allnum=booleanLiteral)?
-    (DELIM EQUAL delim=stringLiteral)?
-    statsAggTerm (COMMA statsAggTerm)*
-    (statsByClause)?
-    (DEDUP_SPLITVALUES EQUAL dedupsplit=booleanLiteral)?
-    ;
+   : STATS (PARTITIONS EQUAL partitions = integerLiteral)? (ALLNUM EQUAL allnum = booleanLiteral)? (DELIM EQUAL delim = stringLiteral)? statsAggTerm (COMMA statsAggTerm)* (statsByClause)? (DEDUP_SPLITVALUES EQUAL dedupsplit = booleanLiteral)?
+   ;
 
 dedupCommand
-    : DEDUP
-    (number=integerLiteral)?
-    fieldList
-    (KEEPEMPTY EQUAL keepempty=booleanLiteral)?
-    (CONSECUTIVE EQUAL consecutive=booleanLiteral)?
-    ;
+   : DEDUP (number = integerLiteral)? fieldList (KEEPEMPTY EQUAL keepempty = booleanLiteral)? (CONSECUTIVE EQUAL consecutive = booleanLiteral)?
+   ;
 
 sortCommand
-    : SORT sortbyClause
-    ;
+   : SORT sortbyClause
+   ;
 
 evalCommand
-    : EVAL evalClause (COMMA evalClause)*
-    ;
+   : EVAL evalClause (COMMA evalClause)*
+   ;
 
 headCommand
-    : HEAD
-    (number=integerLiteral)?
-    (FROM from=integerLiteral)?
-    ;
-    
+   : HEAD (number = integerLiteral)? (FROM from = integerLiteral)?
+   ;
+
 topCommand
-    : TOP
-    (number=integerLiteral)?
-    fieldList
-    (byClause)?
-    ;
+   : TOP (number = integerLiteral)? fieldList (byClause)?
+   ;
 
 rareCommand
-    : RARE
-    fieldList
-    (byClause)?
-    ;
+   : RARE fieldList (byClause)?
+   ;
 
 grokCommand
-    : GROK (source_field=expression) (pattern=stringLiteral)
-    ;
+   : GROK (source_field = expression) (pattern = stringLiteral)
+   ;
 
 parseCommand
-    : PARSE (source_field=expression) (pattern=stringLiteral)
-    ;
+   : PARSE (source_field = expression) (pattern = stringLiteral)
+   ;
 
 patternsCommand
-    : PATTERNS (patternsParameter)* (source_field=expression)
-    ;
+   : PATTERNS (patternsParameter)* (source_field = expression)
+   ;
 
 patternsParameter
-    : (NEW_FIELD EQUAL new_field=stringLiteral)
-    | (PATTERN EQUAL pattern=stringLiteral)
-    ;
+   : (NEW_FIELD EQUAL new_field = stringLiteral)
+   | (PATTERN EQUAL pattern = stringLiteral)
+   ;
 
 patternsMethod
-    : PUNCT | REGEX
-    ;
+   : PUNCT
+   | REGEX
+   ;
 
 kmeansCommand
-    : KMEANS (kmeansParameter)*
-    ;
+   : KMEANS (kmeansParameter)*
+   ;
 
 kmeansParameter
-    : (CENTROIDS EQUAL centroids=integerLiteral)
-    | (ITERATIONS EQUAL iterations=integerLiteral)
-    | (DISTANCE_TYPE EQUAL distance_type=stringLiteral)
-    ;
+   : (CENTROIDS EQUAL centroids = integerLiteral)
+   | (ITERATIONS EQUAL iterations = integerLiteral)
+   | (DISTANCE_TYPE EQUAL distance_type = stringLiteral)
+   ;
 
 adCommand
-    : AD (adParameter)*
-    ;
+   : AD (adParameter)*
+   ;
 
 adParameter
-    : (NUMBER_OF_TREES EQUAL number_of_trees=integerLiteral)
-    | (SHINGLE_SIZE EQUAL shingle_size=integerLiteral)
-    | (SAMPLE_SIZE EQUAL sample_size=integerLiteral)
-    | (OUTPUT_AFTER EQUAL output_after=integerLiteral)
-    | (TIME_DECAY EQUAL time_decay=decimalLiteral)
-    | (ANOMALY_RATE EQUAL anomaly_rate=decimalLiteral)
-    | (CATEGORY_FIELD EQUAL category_field=stringLiteral)
-    | (TIME_FIELD EQUAL time_field=stringLiteral)
-    | (DATE_FORMAT EQUAL date_format=stringLiteral)
-    | (TIME_ZONE EQUAL time_zone=stringLiteral)
-    | (TRAINING_DATA_SIZE EQUAL training_data_size=integerLiteral)
-    | (ANOMALY_SCORE_THRESHOLD EQUAL anomaly_score_threshold=decimalLiteral)
-    ;
+   : (NUMBER_OF_TREES EQUAL number_of_trees = integerLiteral)
+   | (SHINGLE_SIZE EQUAL shingle_size = integerLiteral)
+   | (SAMPLE_SIZE EQUAL sample_size = integerLiteral)
+   | (OUTPUT_AFTER EQUAL output_after = integerLiteral)
+   | (TIME_DECAY EQUAL time_decay = decimalLiteral)
+   | (ANOMALY_RATE EQUAL anomaly_rate = decimalLiteral)
+   | (CATEGORY_FIELD EQUAL category_field = stringLiteral)
+   | (TIME_FIELD EQUAL time_field = stringLiteral)
+   | (DATE_FORMAT EQUAL date_format = stringLiteral)
+   | (TIME_ZONE EQUAL time_zone = stringLiteral)
+   | (TRAINING_DATA_SIZE EQUAL training_data_size = integerLiteral)
+   | (ANOMALY_SCORE_THRESHOLD EQUAL anomaly_score_threshold = decimalLiteral)
+   ;
 
 mlCommand
-    : ML (mlArg)*
-    ;
+   : ML (mlArg)*
+   ;
 
 mlArg
-    : (argName=ident EQUAL argValue=literalValue)
-    ;
+   : (argName = ident EQUAL argValue = literalValue)
+   ;
 
-/** clauses */
+// clauses
 fromClause
-    : SOURCE EQUAL tableSourceClause
-    | INDEX EQUAL tableSourceClause
-    ;
+   : SOURCE EQUAL tableSourceClause
+   | INDEX EQUAL tableSourceClause
+   | SOURCE EQUAL tableFunction
+   | INDEX EQUAL tableFunction
+   ;
 
 tableSourceClause
-    : tableSource (COMMA tableSource)*
-    ;
+   : tableSource (COMMA tableSource)*
+   ;
 
 renameClasue
-    : orignalField=wcFieldExpression AS renamedField=wcFieldExpression
-    ;
+   : orignalField = wcFieldExpression AS renamedField = wcFieldExpression
+   ;
 
 byClause
-    : BY fieldList
-    ;
+   : BY fieldList
+   ;
 
 statsByClause
-    : BY fieldList
-    | BY bySpanClause
-    | BY bySpanClause COMMA fieldList
-    ;
+   : BY fieldList
+   | BY bySpanClause
+   | BY bySpanClause COMMA fieldList
+   | BY fieldList COMMA bySpanClause
+   ;
 
 bySpanClause
-    : spanClause (AS alias=qualifiedName)?
-    ;
+   : spanClause (AS alias = qualifiedName)?
+   ;
 
 spanClause
-    : SPAN LT_PRTHS fieldExpression COMMA value=literalValue (unit=timespanUnit)? RT_PRTHS
-    ;
+   : SPAN LT_PRTHS fieldExpression COMMA value = literalValue (unit = timespanUnit)? RT_PRTHS
+   ;
 
 sortbyClause
-    : sortField (COMMA sortField)*
-    ;
+   : sortField (COMMA sortField)*
+   ;
 
 evalClause
-    : fieldExpression EQUAL expression
-    ;
+   : fieldExpression EQUAL expression
+   ;
 
-/** aggregation terms */
+// aggregation terms
 statsAggTerm
-    : statsFunction (AS alias=wcFieldExpression)?
-    ;
+   : statsFunction (AS alias = wcFieldExpression)?
+   ;
 
-/** aggregation functions */
+// aggregation functions
 statsFunction
-    : statsFunctionName LT_PRTHS valueExpression RT_PRTHS           #statsFunctionCall
-    | COUNT LT_PRTHS RT_PRTHS                                       #countAllFunctionCall
-    | (DISTINCT_COUNT | DC) LT_PRTHS valueExpression RT_PRTHS       #distinctCountFunctionCall
-    | percentileAggFunction                                         #percentileAggFunctionCall
-    | takeAggFunction                                               #takeAggFunctionCall
-    ;
+   : statsFunctionName LT_PRTHS valueExpression RT_PRTHS        # statsFunctionCall
+   | COUNT LT_PRTHS RT_PRTHS                                    # countAllFunctionCall
+   | (DISTINCT_COUNT | DC) LT_PRTHS valueExpression RT_PRTHS    # distinctCountFunctionCall
+   | takeAggFunction                                            # takeAggFunctionCall
+   | percentileApproxFunction                                   # percentileApproxFunctionCall
+   ;
 
 statsFunctionName
-    : AVG | COUNT | SUM | MIN | MAX | VAR_SAMP | VAR_POP | STDDEV_SAMP | STDDEV_POP
-    ;
+   : AVG
+   | COUNT
+   | SUM
+   | MIN
+   | MAX
+   | VAR_SAMP
+   | VAR_POP
+   | STDDEV_SAMP
+   | STDDEV_POP
+   | PERCENTILE
+   ;
 
 takeAggFunction
-    : TAKE LT_PRTHS fieldExpression (COMMA size=integerLiteral)? RT_PRTHS
-    ;
+   : TAKE LT_PRTHS fieldExpression (COMMA size = integerLiteral)? RT_PRTHS
+   ;
 
-percentileAggFunction
-    : PERCENTILE LESS value=integerLiteral GREATER LT_PRTHS aggField=fieldExpression RT_PRTHS
+percentileApproxFunction
+   : (PERCENTILE | PERCENTILE_APPROX) LT_PRTHS aggField = valueExpression
+       COMMA percent = numericLiteral (COMMA compression = numericLiteral)? RT_PRTHS
+   ;
+
+numericLiteral
+    : integerLiteral
+    | decimalLiteral
     ;
 
-/** expressions */
+// expressions
 expression
-    : logicalExpression
-    | comparisonExpression
-    | valueExpression
-    ;
+   : logicalExpression
+   | comparisonExpression
+   | valueExpression
+   ;
 
+// predicates
 logicalExpression
-    : comparisonExpression                                          #comparsion
-    | NOT logicalExpression                                         #logicalNot
-    | left=logicalExpression OR right=logicalExpression             #logicalOr
-    | left=logicalExpression (AND)? right=logicalExpression         #logicalAnd
-    | left=logicalExpression XOR right=logicalExpression            #logicalXor
-    | booleanExpression                                             #booleanExpr
-    | relevanceExpression                                           #relevanceExpr
-    ;
+   : comparisonExpression                                       # comparsion
+   | NOT logicalExpression                                      # logicalNot
+   | left = logicalExpression OR right = logicalExpression      # logicalOr
+   | left = logicalExpression (AND)? right = logicalExpression  # logicalAnd
+   | left = logicalExpression XOR right = logicalExpression     # logicalXor
+   | booleanExpression                                          # booleanExpr
+   | relevanceExpression                                        # relevanceExpr
+   ;
 
 comparisonExpression
-    : left=valueExpression comparisonOperator right=valueExpression #compareExpr
-    | valueExpression IN valueList                                  #inExpr
-    ;
+   : left = valueExpression comparisonOperator right = valueExpression  # compareExpr
+   | valueExpression IN valueList                                       # inExpr
+   ;
 
 valueExpression
-    : left=valueExpression binaryOperator right=valueExpression     #binaryArithmetic
-    | LT_PRTHS left=valueExpression binaryOperator
-    right=valueExpression RT_PRTHS                                  #parentheticBinaryArithmetic
-    | primaryExpression                                             #valueExpressionDefault
-    | positionFunction                                              #positionFunctionCall
-    ;
+   : left = valueExpression binaryOperator = (STAR | DIVIDE | MODULE) right = valueExpression   # binaryArithmetic
+   | left = valueExpression binaryOperator = (PLUS | MINUS) right = valueExpression             # binaryArithmetic
+   | primaryExpression                                                                          # valueExpressionDefault
+   | positionFunction                                                                           # positionFunctionCall
+   | extractFunction                                                                            # extractFunctionCall
+   | getFormatFunction                                                                          # getFormatFunctionCall
+   | timestampFunction                                                                          # timestampFunctionCall
+   | LT_PRTHS valueExpression RT_PRTHS                                                          # parentheticValueExpr
+   ;
 
 primaryExpression
-    : evalFunctionCall
-    | dataTypeFunctionCall
-    | fieldExpression
-    | literalValue
-    ;
+   : evalFunctionCall
+   | dataTypeFunctionCall
+   | fieldExpression
+   | literalValue
+   ;
 
 positionFunction
-    : positionFunctionName LT_PRTHS functionArg IN functionArg RT_PRTHS
-    ;
+   : positionFunctionName LT_PRTHS functionArg IN functionArg RT_PRTHS
+   ;
 
 booleanExpression
-    : booleanFunctionCall
-    ;
+   : booleanFunctionCall
+   ;
 
 relevanceExpression
-    : singleFieldRelevanceFunction | multiFieldRelevanceFunction
-    ;
+   : singleFieldRelevanceFunction
+   | multiFieldRelevanceFunction
+   ;
 
 // Field is a single column
 singleFieldRelevanceFunction
-    : singleFieldRelevanceFunctionName LT_PRTHS
-        field=relevanceField COMMA query=relevanceQuery
-        (COMMA relevanceArg)* RT_PRTHS
-    ;
+   : singleFieldRelevanceFunctionName LT_PRTHS field = relevanceField COMMA query = relevanceQuery (COMMA relevanceArg)* RT_PRTHS
+   ;
 
 // Field is a list of columns
 multiFieldRelevanceFunction
-    : multiFieldRelevanceFunctionName LT_PRTHS
-        LT_SQR_PRTHS field=relevanceFieldAndWeight (COMMA field=relevanceFieldAndWeight)* RT_SQR_PRTHS
-        COMMA query=relevanceQuery (COMMA relevanceArg)* RT_PRTHS
-    ;
+   : multiFieldRelevanceFunctionName LT_PRTHS LT_SQR_PRTHS field = relevanceFieldAndWeight (COMMA field = relevanceFieldAndWeight)* RT_SQR_PRTHS COMMA query = relevanceQuery (COMMA relevanceArg)* RT_PRTHS
+   ;
 
-/** tables */
+// tables
 tableSource
-    : qualifiedName
-    | ID_DATE_SUFFIX
-    ;
+   : tableQualifiedName
+   | ID_DATE_SUFFIX
+   ;
 
 tableFunction
-    : qualifiedName LT_PRTHS functionArgs RT_PRTHS
-    ;
+   : qualifiedName LT_PRTHS functionArgs RT_PRTHS
+   ;
 
-/** fields */
+// fields
 fieldList
-    : fieldExpression (COMMA fieldExpression)*
-    ;
+   : fieldExpression (COMMA fieldExpression)*
+   ;
 
 wcFieldList
-    : wcFieldExpression (COMMA wcFieldExpression)*
-    ;
+   : wcFieldExpression (COMMA wcFieldExpression)*
+   ;
 
 sortField
-    : (PLUS | MINUS)? sortFieldExpression
-    ;
+   : (PLUS | MINUS)? sortFieldExpression
+   ;
 
 sortFieldExpression
-    : fieldExpression
-    | AUTO LT_PRTHS fieldExpression RT_PRTHS
-    | STR LT_PRTHS fieldExpression RT_PRTHS
-    | IP LT_PRTHS fieldExpression RT_PRTHS
-    | NUM LT_PRTHS fieldExpression RT_PRTHS
-    ;
+   : fieldExpression
+   | AUTO LT_PRTHS fieldExpression RT_PRTHS
+   | STR LT_PRTHS fieldExpression RT_PRTHS
+   | IP LT_PRTHS fieldExpression RT_PRTHS
+   | NUM LT_PRTHS fieldExpression RT_PRTHS
+   ;
 
 fieldExpression
-    : qualifiedName
-    ;
+   : qualifiedName
+   ;
 
 wcFieldExpression
-    : wcQualifiedName
-    ;
+   : wcQualifiedName
+   ;
 
-/** functions */
+// functions
 evalFunctionCall
-    : evalFunctionName LT_PRTHS functionArgs RT_PRTHS
-    ;
+   : evalFunctionName LT_PRTHS functionArgs RT_PRTHS
+   ;
 
-/** cast function */
+// cast function
 dataTypeFunctionCall
-    : CAST LT_PRTHS expression AS convertedDataType RT_PRTHS
-    ;
+   : CAST LT_PRTHS expression AS convertedDataType RT_PRTHS
+   ;
 
-/** boolean functions */
+// boolean functions
 booleanFunctionCall
-    : conditionFunctionBase LT_PRTHS functionArgs RT_PRTHS
-    ;
+   : conditionFunctionName LT_PRTHS functionArgs RT_PRTHS
+   ;
 
 convertedDataType
-    : typeName=DATE
-    | typeName=TIME
-    | typeName=TIMESTAMP
-    | typeName=INT
-    | typeName=INTEGER
-    | typeName=DOUBLE
-    | typeName=LONG
-    | typeName=FLOAT
-    | typeName=STRING
-    | typeName=BOOLEAN
-    ;
+   : typeName = DATE
+   | typeName = TIME
+   | typeName = TIMESTAMP
+   | typeName = INT
+   | typeName = INTEGER
+   | typeName = DOUBLE
+   | typeName = LONG
+   | typeName = FLOAT
+   | typeName = STRING
+   | typeName = BOOLEAN
+   ;
 
 evalFunctionName
-    : mathematicalFunctionBase
-    | dateAndTimeFunctionBase
-    | textFunctionBase
-    | conditionFunctionBase
-    | systemFunctionBase
-    | positionFunctionName
-    ;
+   : mathematicalFunctionName
+   | dateTimeFunctionName
+   | textFunctionName
+   | conditionFunctionName
+   | flowControlFunctionName
+   | systemFunctionName
+   | positionFunctionName
+   ;
 
 functionArgs
-    : (functionArg (COMMA functionArg)*)?
-    ;
+   : (functionArg (COMMA functionArg)*)?
+   ;
 
 functionArg
-    : (ident EQUAL)? valueExpression
-    ;
+   : (ident EQUAL)? expression
+   ;
 
 relevanceArg
-    : relevanceArgName EQUAL relevanceArgValue
-    ;
+   : relevanceArgName EQUAL relevanceArgValue
+   ;
 
 relevanceArgName
-    : ALLOW_LEADING_WILDCARD | ANALYZER | ANALYZE_WILDCARD | AUTO_GENERATE_SYNONYMS_PHRASE_QUERY
-    | BOOST | CUTOFF_FREQUENCY | DEFAULT_FIELD | DEFAULT_OPERATOR | ENABLE_POSITION_INCREMENTS
-    | ESCAPE | FIELDS | FLAGS | FUZZINESS | FUZZY_MAX_EXPANSIONS | FUZZY_PREFIX_LENGTH
-    | FUZZY_REWRITE | FUZZY_TRANSPOSITIONS | LENIENT | LOW_FREQ_OPERATOR | MAX_DETERMINIZED_STATES
-    | MAX_EXPANSIONS | MINIMUM_SHOULD_MATCH | OPERATOR | PHRASE_SLOP | PREFIX_LENGTH
-    | QUOTE_ANALYZER | QUOTE_FIELD_SUFFIX | REWRITE | SLOP | TIE_BREAKER | TIME_ZONE | TYPE
-    | ZERO_TERMS_QUERY
-    ;
+   : ALLOW_LEADING_WILDCARD
+   | ANALYZER
+   | ANALYZE_WILDCARD
+   | AUTO_GENERATE_SYNONYMS_PHRASE_QUERY
+   | BOOST
+   | CUTOFF_FREQUENCY
+   | DEFAULT_FIELD
+   | DEFAULT_OPERATOR
+   | ENABLE_POSITION_INCREMENTS
+   | ESCAPE
+   | FIELDS
+   | FLAGS
+   | FUZZINESS
+   | FUZZY_MAX_EXPANSIONS
+   | FUZZY_PREFIX_LENGTH
+   | FUZZY_REWRITE
+   | FUZZY_TRANSPOSITIONS
+   | LENIENT
+   | LOW_FREQ_OPERATOR
+   | MAX_DETERMINIZED_STATES
+   | MAX_EXPANSIONS
+   | MINIMUM_SHOULD_MATCH
+   | OPERATOR
+   | PHRASE_SLOP
+   | PREFIX_LENGTH
+   | QUOTE_ANALYZER
+   | QUOTE_FIELD_SUFFIX
+   | REWRITE
+   | SLOP
+   | TIE_BREAKER
+   | TIME_ZONE
+   | TYPE
+   | ZERO_TERMS_QUERY
+   ;
 
 relevanceFieldAndWeight
-    : field=relevanceField
-    | field=relevanceField weight=relevanceFieldWeight
-    | field=relevanceField BIT_XOR_OP weight=relevanceFieldWeight
-    ;
+   : field = relevanceField
+   | field = relevanceField weight = relevanceFieldWeight
+   | field = relevanceField BIT_XOR_OP weight = relevanceFieldWeight
+   ;
 
 relevanceFieldWeight
-    : integerLiteral
-    | decimalLiteral
-    ;
+   : integerLiteral
+   | decimalLiteral
+   ;
 
 relevanceField
-    : qualifiedName
-    | stringLiteral
-    ;
+   : qualifiedName
+   | stringLiteral
+   ;
 
 relevanceQuery
-    : relevanceArgValue
-    ;
+   : relevanceArgValue
+   ;
 
 relevanceArgValue
-    : qualifiedName
-    | literalValue
-    ;
-
-mathematicalFunctionBase
-    : ABS | CBRT | CEIL | CEILING | CONV | CRC32 | E | EXP | FLOOR | LN | LOG | LOG10 | LOG2 | MOD | PI |POW | POWER
-    | RAND | ROUND | SIGN | SQRT | TRUNCATE
-    | trigonometricFunctionName
-    ;
+   : qualifiedName
+   | literalValue
+   ;
+
+mathematicalFunctionName
+   : ABS
+   | CBRT
+   | CEIL
+   | CEILING
+   | CONV
+   | CRC32
+   | E
+   | EXP
+   | FLOOR
+   | LN
+   | LOG
+   | LOG10
+   | LOG2
+   | MOD
+   | PI
+   | POW
+   | POWER
+   | RAND
+   | ROUND
+   | SIGN
+   | SQRT
+   | TRUNCATE
+   | trigonometricFunctionName
+   ;
 
 trigonometricFunctionName
-    : ACOS | ASIN | ATAN | ATAN2 | COS | COT | DEGREES | RADIANS | SIN | TAN
-    ;
-
-dateAndTimeFunctionBase
-    : ADDDATE
-    | CONVERT_TZ
-    | CURRENT_DATE
-    | CURRENT_TIME
-    | CURRENT_TIMESTAMP
-    | DATE
-    | DATE_ADD
-    | DATE_FORMAT
-    | DATE_SUB
-    | DATETIME
-    | DAY
-    | DAYNAME
-    | DAYOFMONTH
-    | DAYOFWEEK
-    | DAYOFYEAR
-    | CURDATE
-    | CURTIME
-    | FROM_DAYS
-    | FROM_UNIXTIME
-    | HOUR
-    | LOCALTIME
-    | LOCALTIMESTAMP
-    | MAKEDATE
-    | MAKETIME
-    | MICROSECOND
-    | MINUTE
-    | MONTH
-    | MONTHNAME
-    | NOW
-    | PERIOD_ADD
-    | PERIOD_DIFF
-    | QUARTER
-    | SECOND
-    | SUBDATE
-    | SYSDATE
-    | TIME
-    | TIME_TO_SEC
-    | TIMESTAMP
-    | TO_DAYS
-    | UNIX_TIMESTAMP
-    | UTC_DATE
-    | UTC_TIME
-    | UTC_TIMESTAMP
-    | WEEK
-    | YEAR
-    ;
-
-/** condition function return boolean value */
-conditionFunctionBase
-    : LIKE
-    | IF | ISNULL | ISNOTNULL | IFNULL | NULLIF
-    ;
-
-systemFunctionBase
-    : TYPEOF
-    ;
-
-textFunctionBase
-    : SUBSTR | SUBSTRING | TRIM | LTRIM | RTRIM | LOWER | UPPER | CONCAT | CONCAT_WS | LENGTH | STRCMP
-    | RIGHT | LEFT | ASCII | LOCATE | REPLACE | REVERSE
-    ;
+   : ACOS
+   | ASIN
+   | ATAN
+   | ATAN2
+   | COS
+   | COT
+   | DEGREES
+   | RADIANS
+   | SIN
+   | TAN
+   ;
+
+dateTimeFunctionName
+   : ADDDATE
+   | ADDTIME
+   | CONVERT_TZ
+   | CURDATE
+   | CURRENT_DATE
+   | CURRENT_TIME
+   | CURRENT_TIMESTAMP
+   | CURTIME
+   | DATE
+   | DATEDIFF
+   | DATETIME
+   | DATE_ADD
+   | DATE_FORMAT
+   | DATE_SUB
+   | DAY
+   | DAYNAME
+   | DAYOFMONTH
+   | DAYOFWEEK
+   | DAYOFYEAR
+   | DAY_OF_MONTH
+   | DAY_OF_WEEK
+   | DAY_OF_YEAR
+   | FROM_DAYS
+   | FROM_UNIXTIME
+   | HOUR
+   | HOUR_OF_DAY
+   | LAST_DAY
+   | LOCALTIME
+   | LOCALTIMESTAMP
+   | MAKEDATE
+   | MAKETIME
+   | MICROSECOND
+   | MINUTE
+   | MINUTE_OF_DAY
+   | MINUTE_OF_HOUR
+   | MONTH
+   | MONTHNAME
+   | MONTH_OF_YEAR
+   | NOW
+   | PERIOD_ADD
+   | PERIOD_DIFF
+   | QUARTER
+   | SECOND
+   | SECOND_OF_MINUTE
+   | SEC_TO_TIME
+   | STR_TO_DATE
+   | SUBDATE
+   | SUBTIME
+   | SYSDATE
+   | TIME
+   | TIMEDIFF
+   | TIMESTAMP
+   | TIME_FORMAT
+   | TIME_TO_SEC
+   | TO_DAYS
+   | TO_SECONDS
+   | UNIX_TIMESTAMP
+   | UTC_DATE
+   | UTC_TIME
+   | UTC_TIMESTAMP
+   | WEEK
+   | WEEKDAY
+   | WEEK_OF_YEAR
+   | YEAR
+   | YEARWEEK
+   ;
+
+getFormatFunction
+   : GET_FORMAT LT_PRTHS getFormatType COMMA functionArg RT_PRTHS
+   ;
+
+getFormatType
+   : DATE
+   | DATETIME
+   | TIME
+   | TIMESTAMP
+   ;
+
+extractFunction
+   : EXTRACT LT_PRTHS datetimePart FROM functionArg RT_PRTHS
+   ;
+
+simpleDateTimePart
+   : MICROSECOND
+   | SECOND
+   | MINUTE
+   | HOUR
+   | DAY
+   | WEEK
+   | MONTH
+   | QUARTER
+   | YEAR
+   ;
+
+complexDateTimePart
+   : SECOND_MICROSECOND
+   | MINUTE_MICROSECOND
+   | MINUTE_SECOND
+   | HOUR_MICROSECOND
+   | HOUR_SECOND
+   | HOUR_MINUTE
+   | DAY_MICROSECOND
+   | DAY_SECOND
+   | DAY_MINUTE
+   | DAY_HOUR
+   | YEAR_MONTH
+   ;
+
+datetimePart
+   : simpleDateTimePart
+   | complexDateTimePart
+   ;
+
+timestampFunction
+   : timestampFunctionName LT_PRTHS simpleDateTimePart COMMA firstArg = functionArg COMMA secondArg = functionArg RT_PRTHS
+   ;
+
+timestampFunctionName
+   : TIMESTAMPADD
+   | TIMESTAMPDIFF
+   ;
+
+// condition function return boolean value
+conditionFunctionName
+   : LIKE
+   | ISNULL
+   | ISNOTNULL
+   ;
+
+// flow control function return non-boolean value
+flowControlFunctionName
+   : IF
+   | IFNULL
+   | NULLIF
+   ;
+
+systemFunctionName
+   : TYPEOF
+   ;
+
+textFunctionName
+   : SUBSTR
+   | SUBSTRING
+   | TRIM
+   | LTRIM
+   | RTRIM
+   | LOWER
+   | UPPER
+   | CONCAT
+   | CONCAT_WS
+   | LENGTH
+   | STRCMP
+   | RIGHT
+   | LEFT
+   | ASCII
+   | LOCATE
+   | REPLACE
+   | REVERSE
+   ;
 
 positionFunctionName
-    : POSITION
-    ;
-
-/** operators */
-comparisonOperator
-    : EQUAL | NOT_EQUAL | LESS | NOT_LESS | GREATER | NOT_GREATER | REGEXP
-    ;
-
-binaryOperator
-    : PLUS | MINUS | STAR | DIVIDE | MODULE
-    ;
-
+   : POSITION
+   ;
+
+// operators
+ comparisonOperator
+   : EQUAL
+   | NOT_EQUAL
+   | LESS
+   | NOT_LESS
+   | GREATER
+   | NOT_GREATER
+   | REGEXP
+   ;
 
 singleFieldRelevanceFunctionName
-    : MATCH
-    | MATCH_PHRASE
-    | MATCH_BOOL_PREFIX
-    | MATCH_PHRASE_PREFIX
-    ;
+   : MATCH
+   | MATCH_PHRASE
+   | MATCH_BOOL_PREFIX
+   | MATCH_PHRASE_PREFIX
+   ;
 
 multiFieldRelevanceFunctionName
-    : SIMPLE_QUERY_STRING
-    | MULTI_MATCH
-    | QUERY_STRING
-    ;
+   : SIMPLE_QUERY_STRING
+   | MULTI_MATCH
+   | QUERY_STRING
+   ;
 
-/** literals and values*/
+// literals and values
 literalValue
-    : intervalLiteral
-    | stringLiteral
-    | integerLiteral
-    | decimalLiteral
-    | booleanLiteral
-    | datetimeLiteral           //#datetime
-    ;
+   : intervalLiteral
+   | stringLiteral
+   | integerLiteral
+   | decimalLiteral
+   | booleanLiteral
+   | datetimeLiteral //#datetime
+   ;
 
 intervalLiteral
-    : INTERVAL valueExpression intervalUnit
-    ;
+   : INTERVAL valueExpression intervalUnit
+   ;
 
 stringLiteral
-    : DQUOTA_STRING | SQUOTA_STRING
-    ;
+   : DQUOTA_STRING
+   | SQUOTA_STRING
+   ;
 
 integerLiteral
-    : (PLUS | MINUS)? INTEGER_LITERAL
-    ;
+   : (PLUS | MINUS)? INTEGER_LITERAL
+   ;
 
 decimalLiteral
-    : (PLUS | MINUS)? DECIMAL_LITERAL
-    ;
+   : (PLUS | MINUS)? DECIMAL_LITERAL
+   ;
 
 booleanLiteral
-    : TRUE | FALSE
-    ;
+   : TRUE
+   | FALSE
+   ;
 
 // Date and Time Literal, follow ANSI 92
 datetimeLiteral
-    : dateLiteral
-    | timeLiteral
-    | timestampLiteral
-    ;
+   : dateLiteral
+   | timeLiteral
+   | timestampLiteral
+   ;
 
 dateLiteral
-    : DATE date=stringLiteral
-    ;
+   : DATE date = stringLiteral
+   ;
 
 timeLiteral
-    : TIME time=stringLiteral
-    ;
+   : TIME time = stringLiteral
+   ;
 
 timestampLiteral
-    : TIMESTAMP timestamp=stringLiteral
-    ;
+   : TIMESTAMP timestamp = stringLiteral
+   ;
 
 intervalUnit
-    : MICROSECOND | SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR | SECOND_MICROSECOND
-    | MINUTE_MICROSECOND | MINUTE_SECOND | HOUR_MICROSECOND | HOUR_SECOND | HOUR_MINUTE | DAY_MICROSECOND
-    | DAY_SECOND | DAY_MINUTE | DAY_HOUR | YEAR_MONTH
-    ;
+   : MICROSECOND
+   | SECOND
+   | MINUTE
+   | HOUR
+   | DAY
+   | WEEK
+   | MONTH
+   | QUARTER
+   | YEAR
+   | SECOND_MICROSECOND
+   | MINUTE_MICROSECOND
+   | MINUTE_SECOND
+   | HOUR_MICROSECOND
+   | HOUR_SECOND
+   | HOUR_MINUTE
+   | DAY_MICROSECOND
+   | DAY_SECOND
+   | DAY_MINUTE
+   | DAY_HOUR
+   | YEAR_MONTH
+   ;
 
 timespanUnit
-    : MS | S | M | H | D | W | Q | Y
-    | MILLISECOND | SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR
-    ;
-
+   : MS
+   | S
+   | M
+   | H
+   | D
+   | W
+   | Q
+   | Y
+   | MILLISECOND
+   | SECOND
+   | MINUTE
+   | HOUR
+   | DAY
+   | WEEK
+   | MONTH
+   | QUARTER
+   | YEAR
+   ;
 
 valueList
-    : LT_PRTHS literalValue (COMMA literalValue)* RT_PRTHS
-    ;
+   : LT_PRTHS literalValue (COMMA literalValue)* RT_PRTHS
+   ;
 
 qualifiedName
-    : ident (DOT ident)*                             #identsAsQualifiedName
-    ;
+   : ident (DOT ident)* # identsAsQualifiedName
+   ;
+
+tableQualifiedName
+   : tableIdent (DOT ident)* # identsAsTableQualifiedName
+   ;
 
 wcQualifiedName
-    : wildcard (DOT wildcard)*                       #identsAsWildcardQualifiedName
-    ;
+   : wildcard (DOT wildcard)* # identsAsWildcardQualifiedName
+   ;
 
 ident
-    : (DOT)? ID
-    | BACKTICK ident BACKTICK
-    | BQUOTA_STRING
-    | keywordsCanBeId
-    ;
+   : (DOT)? ID
+   | BACKTICK ident BACKTICK
+   | BQUOTA_STRING
+   | keywordsCanBeId
+   ;
+
+tableIdent
+   : (CLUSTER)? ident
+   ;
 
 wildcard
-    : ident (MODULE ident)* (MODULE)?
-    | SINGLE_QUOTE wildcard SINGLE_QUOTE
-    | DOUBLE_QUOTE wildcard DOUBLE_QUOTE
-    | BACKTICK wildcard BACKTICK
-    ;
+   : ident (MODULE ident)* (MODULE)?
+   | SINGLE_QUOTE wildcard SINGLE_QUOTE
+   | DOUBLE_QUOTE wildcard DOUBLE_QUOTE
+   | BACKTICK wildcard BACKTICK
+   ;
 
 keywordsCanBeId
-    : D // OD SQL and ODBC special
-    | statsFunctionName
-    | TIMESTAMP | DATE | TIME
-    | FIRST | LAST
-    | timespanUnit | SPAN
-    | dateAndTimeFunctionBase
-    | textFunctionBase
-    | mathematicalFunctionBase
-    | positionFunctionName
-    ;
+   : D // OD SQL and ODBC special
+   | timespanUnit
+   | SPAN
+   | evalFunctionName
+   | relevanceArgName
+   | intervalUnit
+   | dateTimeFunctionName
+   | textFunctionName
+   | mathematicalFunctionName
+   | positionFunctionName
+   // commands
+   | SEARCH
+   | DESCRIBE
+   | SHOW
+   | FROM
+   | WHERE
+   | FIELDS
+   | RENAME
+   | STATS
+   | DEDUP
+   | SORT
+   | EVAL
+   | HEAD
+   | TOP
+   | RARE
+   | PARSE
+   | METHOD
+   | REGEX
+   | PUNCT
+   | GROK
+   | PATTERN
+   | PATTERNS
+   | NEW_FIELD
+   | KMEANS
+   | AD
+   | ML
+   // commands assist keywords
+   | SOURCE
+   | INDEX
+   | DESC
+   | DATASOURCES
+   // CLAUSEKEYWORDS
+   | SORTBY
+   // FIELDKEYWORDSAUTO
+   | STR
+   | IP
+   | NUM
+   // ARGUMENT KEYWORDS
+   | KEEPEMPTY
+   | CONSECUTIVE
+   | DEDUP_SPLITVALUES
+   | PARTITIONS
+   | ALLNUM
+   | DELIM
+   | CENTROIDS
+   | ITERATIONS
+   | DISTANCE_TYPE
+   | NUMBER_OF_TREES
+   | SHINGLE_SIZE
+   | SAMPLE_SIZE
+   | OUTPUT_AFTER
+   | TIME_DECAY
+   | ANOMALY_RATE
+   | CATEGORY_FIELD
+   | TIME_FIELD
+   | TIME_ZONE
+   | TRAINING_DATA_SIZE
+   | ANOMALY_SCORE_THRESHOLD
+   // AGGREGATIONS
+   | AVG
+   | COUNT
+   | DISTINCT_COUNT
+   | ESTDC
+   | ESTDC_ERROR
+   | MAX
+   | MEAN
+   | MEDIAN
+   | MIN
+   | MODE
+   | RANGE
+   | STDEV
+   | STDEVP
+   | SUM
+   | SUMSQ
+   | VAR_SAMP
+   | VAR_POP
+   | STDDEV_SAMP
+   | STDDEV_POP
+   | PERCENTILE
+   | TAKE
+   | FIRST
+   | LAST
+   | LIST
+   | VALUES
+   | EARLIEST
+   | EARLIEST_TIME
+   | LATEST
+   | LATEST_TIME
+   | PER_DAY
+   | PER_HOUR
+   | PER_MINUTE
+   | PER_SECOND
+   | RATE
+   | SPARKLINE
+   | C
+   | DC
+   ;
diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/PPLService.java b/ppl/src/main/java/org/opensearch/sql/ppl/PPLService.java
index e11edc1646..7769f5dfae 100644
--- a/ppl/src/main/java/org/opensearch/sql/ppl/PPLService.java
+++ b/ppl/src/main/java/org/opensearch/sql/ppl/PPLService.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.opensearch.sql.executor.ExecutionEngine.QueryResponse;
@@ -27,9 +26,7 @@
 import org.opensearch.sql.ppl.parser.AstStatementBuilder;
 import org.opensearch.sql.ppl.utils.PPLQueryDataAnonymizer;
 
-/**
- * PPLService.
- */
+/** PPLService. */
 @RequiredArgsConstructor
 public class PPLService {
   private final PPLSyntaxParser parser;
@@ -45,7 +42,7 @@ public class PPLService {
   /**
    * Execute the {@link PPLQueryRequest}, using {@link ResponseListener} to get response.
    *
-   * @param request  {@link PPLQueryRequest}
+   * @param request {@link PPLQueryRequest}
    * @param listener {@link ResponseListener}
    */
   public void execute(PPLQueryRequest request, ResponseListener<QueryResponse> listener) {
@@ -57,10 +54,10 @@ public void execute(PPLQueryRequest request, ResponseListener<QueryResponse> lis
   }
 
   /**
-   * Explain the query in {@link PPLQueryRequest} using {@link ResponseListener} to
-   * get and format explain response.
+   * Explain the query in {@link PPLQueryRequest} using {@link ResponseListener} to get and format
+   * explain response.
    *
-   * @param request  {@link PPLQueryRequest}
+   * @param request {@link PPLQueryRequest}
    * @param listener {@link ResponseListener} for explain response
    */
   public void explain(PPLQueryRequest request, ResponseListener<ExplainResponse> listener) {
diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParser.java b/ppl/src/main/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParser.java
index 168ba33a8a..1d4485e749 100644
--- a/ppl/src/main/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParser.java
+++ b/ppl/src/main/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParser.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.antlr;
 
 import org.antlr.v4.runtime.CommonTokenStream;
@@ -15,13 +14,9 @@
 import org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLLexer;
 import org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser;
 
-/**
- * PPL Syntax Parser.
- */
+/** PPL Syntax Parser. */
 public class PPLSyntaxParser implements Parser {
-  /**
-   * Analyze the query syntax.
-   */
+  /** Analyze the query syntax. */
   @Override
   public ParseTree parse(String query) {
     OpenSearchPPLParser parser = createParser(createLexer(query));
@@ -30,12 +25,10 @@ public ParseTree parse(String query) {
   }
 
   private OpenSearchPPLParser createParser(Lexer lexer) {
-    return new OpenSearchPPLParser(
-        new CommonTokenStream(lexer));
+    return new OpenSearchPPLParser(new CommonTokenStream(lexer));
   }
 
   private OpenSearchPPLLexer createLexer(String query) {
-    return new OpenSearchPPLLexer(
-        new CaseInsensitiveCharStream(query));
+    return new OpenSearchPPLLexer(new CaseInsensitiveCharStream(query));
   }
 }
diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/config/PPLServiceConfig.java b/ppl/src/main/java/org/opensearch/sql/ppl/config/PPLServiceConfig.java
deleted file mode 100644
index 1067bbaa6b..0000000000
--- a/ppl/src/main/java/org/opensearch/sql/ppl/config/PPLServiceConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.sql.ppl.config;
-
-import org.opensearch.sql.executor.QueryManager;
-import org.opensearch.sql.executor.execution.QueryPlanFactory;
-import org.opensearch.sql.ppl.PPLService;
-import org.opensearch.sql.ppl.antlr.PPLSyntaxParser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-@Configuration
-public class PPLServiceConfig {
-
-  @Autowired
-  private QueryManager queryManager;
-
-  @Autowired
-  private QueryPlanFactory queryPlanFactory;
-
-  /**
-   * The registration of OpenSearch storage engine happens here because
-   * OpenSearchStorageEngine is dependent on NodeClient.
-   *
-   * @return PPLService.
-   */
-  @Bean
-  @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-  public PPLService pplService() {
-    return new PPLService(new PPLSyntaxParser(), queryManager, queryPlanFactory);
-  }
-
-}
diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/domain/PPLQueryRequest.java b/ppl/src/main/java/org/opensearch/sql/ppl/domain/PPLQueryRequest.java
index 87532e01d0..ca351fcc0a 100644
--- a/ppl/src/main/java/org/opensearch/sql/ppl/domain/PPLQueryRequest.java
+++ b/ppl/src/main/java/org/opensearch/sql/ppl/domain/PPLQueryRequest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.domain;
 
 import java.util.Locale;
@@ -22,12 +21,9 @@ public class PPLQueryRequest {
   public static final PPLQueryRequest NULL = new PPLQueryRequest("", null, DEFAULT_PPL_PATH, "");
 
   private final String pplQuery;
-  @Getter
-  private final JSONObject jsonContent;
-  @Getter
-  private final String path;
-  @Getter
-  private String format = "";
+  @Getter private final JSONObject jsonContent;
+  @Getter private final String path;
+  @Getter private String format = "";
 
   @Setter
   @Getter
@@ -43,9 +39,7 @@ public PPLQueryRequest(String pplQuery, JSONObject jsonContent, String path) {
     this(pplQuery, jsonContent, path, "");
   }
 
-  /**
-   * Constructor of PPLQueryRequest.
-   */
+  /** Constructor of PPLQueryRequest. */
   public PPLQueryRequest(String pplQuery, JSONObject jsonContent, String path, String format) {
     this.pplQuery = pplQuery;
     this.jsonContent = jsonContent;
@@ -59,23 +53,21 @@ public String getRequest() {
 
   /**
    * Check if request is to explain rather than execute the query.
-   * @return  true if it is a explain request
+   *
+   * @return true if it is a explain request
    */
   public boolean isExplainRequest() {
     return path.endsWith("/_explain");
   }
 
-  /**
-   * Decide on the formatter by the requested format.
-   */
+  /** Decide on the formatter by the requested format. */
   public Format format() {
     Optional<Format> optionalFormat = Format.of(format);
     if (optionalFormat.isPresent()) {
       return optionalFormat.get();
     } else {
       throw new IllegalArgumentException(
-          String.format(Locale.ROOT,"response in %s format is not supported.", format));
+          String.format(Locale.ROOT, "response in %s format is not supported.", format));
     }
   }
-
 }
diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/domain/PPLQueryResponse.java b/ppl/src/main/java/org/opensearch/sql/ppl/domain/PPLQueryResponse.java
index 483726702a..5cae8e8f06 100644
--- a/ppl/src/main/java/org/opensearch/sql/ppl/domain/PPLQueryResponse.java
+++ b/ppl/src/main/java/org/opensearch/sql/ppl/domain/PPLQueryResponse.java
@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.domain;
 
-public class PPLQueryResponse {
-}
+public class PPLQueryResponse {}
diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java b/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java
index 73c7238624..1bef820399 100644
--- a/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java
+++ b/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.parser;
 
 import static org.opensearch.sql.ast.dsl.AstDSL.qualifiedName;
@@ -20,6 +19,7 @@
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.SearchFromFilterContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.SortCommandContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.StatsCommandContext;
+import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.TableFunctionContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.TableSourceClauseContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.TopCommandContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.WhereCommandContext;
@@ -33,7 +33,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import lombok.Generated;
 import lombok.RequiredArgsConstructor;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.Token;
@@ -46,6 +45,7 @@
 import org.opensearch.sql.ast.expression.Map;
 import org.opensearch.sql.ast.expression.ParseMethod;
 import org.opensearch.sql.ast.expression.QualifiedName;
+import org.opensearch.sql.ast.expression.UnresolvedArgument;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 import org.opensearch.sql.ast.tree.AD;
 import org.opensearch.sql.ast.tree.Aggregation;
@@ -62,6 +62,7 @@
 import org.opensearch.sql.ast.tree.Relation;
 import org.opensearch.sql.ast.tree.Rename;
 import org.opensearch.sql.ast.tree.Sort;
+import org.opensearch.sql.ast.tree.TableFunction;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.common.utils.StringUtils;
 import org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser;
@@ -72,33 +73,25 @@
 import org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParserBaseVisitor;
 import org.opensearch.sql.ppl.utils.ArgumentFactory;
 
-/**
- * Class of building the AST.
- * Refines the visit path and build the AST nodes
- */
+/** Class of building the AST. Refines the visit path and build the AST nodes */
 @RequiredArgsConstructor
 public class AstBuilder extends OpenSearchPPLParserBaseVisitor<UnresolvedPlan> {
 
   private final AstExpressionBuilder expressionBuilder;
 
   /**
-   * PPL query to get original token text. This is necessary because token.getText() returns
-   * text without whitespaces or other characters discarded by lexer.
+   * PPL query to get original token text. This is necessary because token.getText() returns text
+   * without whitespaces or other characters discarded by lexer.
    */
   private final String query;
 
   @Override
   public UnresolvedPlan visitQueryStatement(OpenSearchPPLParser.QueryStatementContext ctx) {
     UnresolvedPlan pplCommand = visit(ctx.pplCommands());
-    return ctx.commands()
-        .stream()
-        .map(this::visit)
-        .reduce(pplCommand, (r, e) -> e.attach(r));
+    return ctx.commands().stream().map(this::visit).reduce(pplCommand, (r, e) -> e.attach(r));
   }
 
-  /**
-   * Search command.
-   */
+  /** Search command. */
   @Override
   public UnresolvedPlan visitSearchFrom(SearchFromContext ctx) {
     return visitFromClause(ctx.fromClause());
@@ -106,23 +99,21 @@ public UnresolvedPlan visitSearchFrom(SearchFromContext ctx) {
 
   @Override
   public UnresolvedPlan visitSearchFromFilter(SearchFromFilterContext ctx) {
-    return new Filter(internalVisitExpression(ctx.logicalExpression())).attach(
-        visit(ctx.fromClause()));
+    return new Filter(internalVisitExpression(ctx.logicalExpression()))
+        .attach(visit(ctx.fromClause()));
   }
 
   @Override
   public UnresolvedPlan visitSearchFilterFrom(SearchFilterFromContext ctx) {
-    return new Filter(internalVisitExpression(ctx.logicalExpression())).attach(
-        visit(ctx.fromClause()));
+    return new Filter(internalVisitExpression(ctx.logicalExpression()))
+        .attach(visit(ctx.fromClause()));
   }
 
   /**
-   * Describe command.
-   * Current logic separates table and metadata info about table by adding
-   * MAPPING_ODFE_SYS_TABLE as suffix.
-   * Even with the introduction of datasource and schema name in fully qualified table name,
-   * we do the same thing by appending MAPPING_ODFE_SYS_TABLE as syffix to the last part
-   * of qualified name.
+   * Describe command. Current logic separates table and metadata info about table by adding
+   * MAPPING_ODFE_SYS_TABLE as suffix. Even with the introduction of datasource and schema name in
+   * fully qualified table name, we do the same thing by appending MAPPING_ODFE_SYS_TABLE as syffix
+   * to the last part of qualified name.
    */
   @Override
   public UnresolvedPlan visitDescribeCommand(DescribeCommandContext ctx) {
@@ -133,63 +124,52 @@ public UnresolvedPlan visitDescribeCommand(DescribeCommandContext ctx) {
     return new Relation(new QualifiedName(parts));
   }
 
-  /**
-   * Show command.
-   */
+  /** Show command. */
   @Override
   public UnresolvedPlan visitShowDataSourcesCommand(
       OpenSearchPPLParser.ShowDataSourcesCommandContext ctx) {
     return new Relation(qualifiedName(DATASOURCES_TABLE_NAME));
   }
 
-
-  /**
-   * Where command.
-   */
+  /** Where command. */
   @Override
   public UnresolvedPlan visitWhereCommand(WhereCommandContext ctx) {
     return new Filter(internalVisitExpression(ctx.logicalExpression()));
   }
 
-  /**
-   * Fields command.
-   */
+  /** Fields command. */
   @Override
   public UnresolvedPlan visitFieldsCommand(FieldsCommandContext ctx) {
     return new Project(
-        ctx.fieldList()
-            .fieldExpression()
-            .stream()
+        ctx.fieldList().fieldExpression().stream()
             .map(this::internalVisitExpression)
             .collect(Collectors.toList()),
-        ArgumentFactory.getArgumentList(ctx)
-    );
+        ArgumentFactory.getArgumentList(ctx));
   }
 
-  /**
-   * Rename command.
-   */
+  /** Rename command. */
   @Override
   public UnresolvedPlan visitRenameCommand(RenameCommandContext ctx) {
     return new Rename(
-        ctx.renameClasue()
-            .stream()
-            .map(ct -> new Map(internalVisitExpression(ct.orignalField),
-                internalVisitExpression(ct.renamedField)))
-            .collect(Collectors.toList())
-    );
+        ctx.renameClasue().stream()
+            .map(
+                ct ->
+                    new Map(
+                        internalVisitExpression(ct.orignalField),
+                        internalVisitExpression(ct.renamedField)))
+            .collect(Collectors.toList()));
   }
 
-  /**
-   * Stats command.
-   */
+  /** Stats command. */
   @Override
   public UnresolvedPlan visitStatsCommand(StatsCommandContext ctx) {
     ImmutableList.Builder<UnresolvedExpression> aggListBuilder = new ImmutableList.Builder<>();
     for (OpenSearchPPLParser.StatsAggTermContext aggCtx : ctx.statsAggTerm()) {
       UnresolvedExpression aggExpression = internalVisitExpression(aggCtx.statsFunction());
-      String name = aggCtx.alias == null ? getTextInQuery(aggCtx) : StringUtils
-          .unquoteIdentifier(aggCtx.alias.getText());
+      String name =
+          aggCtx.alias == null
+              ? getTextInQuery(aggCtx)
+              : StringUtils.unquoteIdentifier(aggCtx.alias.getText());
       Alias alias = new Alias(name, aggExpression);
       aggListBuilder.add(alias);
     }
@@ -197,11 +177,16 @@ public UnresolvedPlan visitStatsCommand(StatsCommandContext ctx) {
     List<UnresolvedExpression> groupList =
         Optional.ofNullable(ctx.statsByClause())
             .map(OpenSearchPPLParser.StatsByClauseContext::fieldList)
-            .map(expr -> expr.fieldExpression().stream()
-                .map(groupCtx ->
-                    (UnresolvedExpression) new Alias(getTextInQuery(groupCtx),
-                        internalVisitExpression(groupCtx)))
-                .collect(Collectors.toList()))
+            .map(
+                expr ->
+                    expr.fieldExpression().stream()
+                        .map(
+                            groupCtx ->
+                                (UnresolvedExpression)
+                                    new Alias(
+                                        StringUtils.unquoteIdentifier(getTextInQuery(groupCtx)),
+                                        internalVisitExpression(groupCtx)))
+                        .collect(Collectors.toList()))
             .orElse(Collections.emptyList());
 
     UnresolvedExpression span =
@@ -210,30 +195,23 @@ public UnresolvedPlan visitStatsCommand(StatsCommandContext ctx) {
             .map(this::internalVisitExpression)
             .orElse(null);
 
-    Aggregation aggregation = new Aggregation(
-        aggListBuilder.build(),
-        Collections.emptyList(),
-        groupList,
-        span,
-        ArgumentFactory.getArgumentList(ctx)
-    );
+    Aggregation aggregation =
+        new Aggregation(
+            aggListBuilder.build(),
+            Collections.emptyList(),
+            groupList,
+            span,
+            ArgumentFactory.getArgumentList(ctx));
     return aggregation;
   }
 
-  /**
-   * Dedup command.
-   */
+  /** Dedup command. */
   @Override
   public UnresolvedPlan visitDedupCommand(DedupCommandContext ctx) {
-    return new Dedupe(
-        ArgumentFactory.getArgumentList(ctx),
-        getFieldList(ctx.fieldList())
-    );
+    return new Dedupe(ArgumentFactory.getArgumentList(ctx), getFieldList(ctx.fieldList()));
   }
 
-  /**
-   * Head command visitor.
-   */
+  /** Head command visitor. */
   @Override
   public UnresolvedPlan visitHeadCommand(HeadCommandContext ctx) {
     Integer size = ctx.number != null ? Integer.parseInt(ctx.number.getText()) : 10;
@@ -241,58 +219,46 @@ public UnresolvedPlan visitHeadCommand(HeadCommandContext ctx) {
     return new Head(size, from);
   }
 
-  /**
-   * Sort command.
-   */
+  /** Sort command. */
   @Override
   public UnresolvedPlan visitSortCommand(SortCommandContext ctx) {
     return new Sort(
-        ctx.sortbyClause()
-            .sortField()
-            .stream()
+        ctx.sortbyClause().sortField().stream()
             .map(sort -> (Field) internalVisitExpression(sort))
-            .collect(Collectors.toList())
-    );
+            .collect(Collectors.toList()));
   }
 
-  /**
-   * Eval command.
-   */
+  /** Eval command. */
   @Override
   public UnresolvedPlan visitEvalCommand(EvalCommandContext ctx) {
     return new Eval(
-        ctx.evalClause()
-            .stream()
+        ctx.evalClause().stream()
             .map(ct -> (Let) internalVisitExpression(ct))
-            .collect(Collectors.toList())
-    );
+            .collect(Collectors.toList()));
   }
 
   private List<UnresolvedExpression> getGroupByList(ByClauseContext ctx) {
-    return ctx.fieldList().fieldExpression().stream().map(this::internalVisitExpression)
+    return ctx.fieldList().fieldExpression().stream()
+        .map(this::internalVisitExpression)
         .collect(Collectors.toList());
   }
 
   private List<Field> getFieldList(FieldListContext ctx) {
-    return ctx.fieldExpression()
-        .stream()
+    return ctx.fieldExpression().stream()
         .map(field -> (Field) internalVisitExpression(field))
         .collect(Collectors.toList());
   }
 
-  /**
-   * Rare command.
-   */
+  /** Rare command. */
   @Override
   public UnresolvedPlan visitRareCommand(RareCommandContext ctx) {
-    List<UnresolvedExpression> groupList = ctx.byClause() == null ? Collections.emptyList() :
-        getGroupByList(ctx.byClause());
+    List<UnresolvedExpression> groupList =
+        ctx.byClause() == null ? Collections.emptyList() : getGroupByList(ctx.byClause());
     return new RareTopN(
         CommandType.RARE,
         ArgumentFactory.getArgumentList(ctx),
         getFieldList(ctx.fieldList()),
-        groupList
-    );
+        groupList);
   }
 
   @Override
@@ -316,63 +282,66 @@ public UnresolvedPlan visitPatternsCommand(OpenSearchPPLParser.PatternsCommandCo
     UnresolvedExpression sourceField = internalVisitExpression(ctx.source_field);
     ImmutableMap.Builder<String, Literal> builder = ImmutableMap.builder();
     ctx.patternsParameter()
-        .forEach(x -> {
-          builder.put(x.children.get(0).toString(),
-              (Literal) internalVisitExpression(x.children.get(2)));
-        });
+        .forEach(
+            x -> {
+              builder.put(
+                  x.children.get(0).toString(),
+                  (Literal) internalVisitExpression(x.children.get(2)));
+            });
     java.util.Map<String, Literal> arguments = builder.build();
     Literal pattern = arguments.getOrDefault("pattern", AstDSL.stringLiteral(""));
 
     return new Parse(ParseMethod.PATTERNS, sourceField, pattern, arguments);
   }
 
-  /**
-   * Top command.
-   */
+  /** Top command. */
   @Override
   public UnresolvedPlan visitTopCommand(TopCommandContext ctx) {
-    List<UnresolvedExpression> groupList = ctx.byClause() == null ? Collections.emptyList() :
-        getGroupByList(ctx.byClause());
+    List<UnresolvedExpression> groupList =
+        ctx.byClause() == null ? Collections.emptyList() : getGroupByList(ctx.byClause());
     return new RareTopN(
         CommandType.TOP,
         ArgumentFactory.getArgumentList(ctx),
         getFieldList(ctx.fieldList()),
-        groupList
-    );
+        groupList);
   }
 
-  /**
-   * From clause.
-   */
+  /** From clause. */
   @Override
   public UnresolvedPlan visitFromClause(FromClauseContext ctx) {
-    return visitTableSourceClause(ctx.tableSourceClause());
+    if (ctx.tableFunction() != null) {
+      return visitTableFunction(ctx.tableFunction());
+    } else {
+      return visitTableSourceClause(ctx.tableSourceClause());
+    }
   }
 
   @Override
   public UnresolvedPlan visitTableSourceClause(TableSourceClauseContext ctx) {
-    return new Relation(ctx.tableSource()
-        .stream().map(this::internalVisitExpression)
-        .collect(Collectors.toList()));
+    return new Relation(
+        ctx.tableSource().stream().map(this::internalVisitExpression).collect(Collectors.toList()));
   }
 
   @Override
-  @Generated //To exclude from jacoco..will remove https://github.com/opensearch-project/sql/issues/1019
-  public UnresolvedPlan visitTableFunction(OpenSearchPPLParser.TableFunctionContext ctx) {
-    //<TODO>
-    return null;
+  public UnresolvedPlan visitTableFunction(TableFunctionContext ctx) {
+    ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
+    ctx.functionArgs()
+        .functionArg()
+        .forEach(
+            arg -> {
+              String argName = (arg.ident() != null) ? arg.ident().getText() : null;
+              builder.add(
+                  new UnresolvedArgument(argName, this.internalVisitExpression(arg.expression())));
+            });
+    return new TableFunction(this.internalVisitExpression(ctx.qualifiedName()), builder.build());
   }
 
-  /**
-   * Navigate to & build AST expression.
-   */
+  /** Navigate to & build AST expression. */
   private UnresolvedExpression internalVisitExpression(ParseTree tree) {
     return expressionBuilder.visit(tree);
   }
 
-  /**
-   * Simply return non-default value for now.
-   */
+  /** Simply return non-default value for now. */
   @Override
   protected UnresolvedPlan aggregateResult(UnresolvedPlan aggregate, UnresolvedPlan nextResult) {
     if (nextResult != defaultResult()) {
@@ -381,52 +350,48 @@ protected UnresolvedPlan aggregateResult(UnresolvedPlan aggregate, UnresolvedPla
     return aggregate;
   }
 
-  /**
-   * Kmeans command.
-   */
+  /** Kmeans command. */
   @Override
   public UnresolvedPlan visitKmeansCommand(KmeansCommandContext ctx) {
     ImmutableMap.Builder<String, Literal> builder = ImmutableMap.builder();
     ctx.kmeansParameter()
-        .forEach(x -> {
-          builder.put(x.children.get(0).toString(),
-              (Literal) internalVisitExpression(x.children.get(2)));
-        });
+        .forEach(
+            x -> {
+              builder.put(
+                  x.children.get(0).toString(),
+                  (Literal) internalVisitExpression(x.children.get(2)));
+            });
     return new Kmeans(builder.build());
   }
 
-  /**
-   * AD command.
-   */
+  /** AD command. */
   @Override
   public UnresolvedPlan visitAdCommand(AdCommandContext ctx) {
     ImmutableMap.Builder<String, Literal> builder = ImmutableMap.builder();
     ctx.adParameter()
-        .forEach(x -> {
-          builder.put(x.children.get(0).toString(),
-              (Literal) internalVisitExpression(x.children.get(2)));
-        });
+        .forEach(
+            x -> {
+              builder.put(
+                  x.children.get(0).toString(),
+                  (Literal) internalVisitExpression(x.children.get(2)));
+            });
 
     return new AD(builder.build());
   }
 
-  /**
-   * ml command.
-   */
+  /** ml command. */
   @Override
   public UnresolvedPlan visitMlCommand(OpenSearchPPLParser.MlCommandContext ctx) {
     ImmutableMap.Builder<String, Literal> builder = ImmutableMap.builder();
     ctx.mlArg()
-            .forEach(x -> {
-              builder.put(x.argName.getText(),
-                      (Literal) internalVisitExpression(x.argValue));
+        .forEach(
+            x -> {
+              builder.put(x.argName.getText(), (Literal) internalVisitExpression(x.argValue));
             });
     return new ML(builder.build());
   }
 
-  /**
-   * Get original text in query.
-   */
+  /** Get original text in query. */
   private String getTextInQuery(ParserRuleContext ctx) {
     Token start = ctx.getStart();
     Token stop = ctx.getStop();
diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java b/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
index 68608e23ad..aec22ac231 100644
--- a/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
+++ b/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.parser;
 
-import static org.opensearch.sql.ast.dsl.AstDSL.qualifiedName;
 import static org.opensearch.sql.expression.function.BuiltinFunctionName.IS_NOT_NULL;
 import static org.opensearch.sql.expression.function.BuiltinFunctionName.IS_NULL;
 import static org.opensearch.sql.expression.function.BuiltinFunctionName.POSITION;
@@ -24,6 +22,7 @@
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.EvalFunctionCallContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.FieldExpressionContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.IdentsAsQualifiedNameContext;
+import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.IdentsAsTableQualifiedNameContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.IdentsAsWildcardQualifiedNameContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.InExprContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.IntegerLiteralContext;
@@ -33,8 +32,7 @@
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.LogicalOrContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.LogicalXorContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.MultiFieldRelevanceFunctionContext;
-import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.ParentheticBinaryArithmeticContext;
-import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.PercentileAggFunctionContext;
+import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.ParentheticValueExprContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.SingleFieldRelevanceFunctionContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.SortFieldContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.SpanClauseContext;
@@ -46,69 +44,38 @@
 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.Map;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.RuleContext;
 import org.opensearch.sql.ast.dsl.AstDSL;
-import org.opensearch.sql.ast.expression.AggregateFunction;
-import org.opensearch.sql.ast.expression.Alias;
-import org.opensearch.sql.ast.expression.AllFields;
-import org.opensearch.sql.ast.expression.And;
-import org.opensearch.sql.ast.expression.Argument;
-import org.opensearch.sql.ast.expression.Cast;
-import org.opensearch.sql.ast.expression.Compare;
-import org.opensearch.sql.ast.expression.DataType;
-import org.opensearch.sql.ast.expression.Field;
-import org.opensearch.sql.ast.expression.Function;
-import org.opensearch.sql.ast.expression.In;
-import org.opensearch.sql.ast.expression.Interval;
-import org.opensearch.sql.ast.expression.IntervalUnit;
-import org.opensearch.sql.ast.expression.Let;
-import org.opensearch.sql.ast.expression.Literal;
-import org.opensearch.sql.ast.expression.Not;
-import org.opensearch.sql.ast.expression.Or;
-import org.opensearch.sql.ast.expression.QualifiedName;
-import org.opensearch.sql.ast.expression.RelevanceFieldList;
-import org.opensearch.sql.ast.expression.Span;
-import org.opensearch.sql.ast.expression.SpanUnit;
-import org.opensearch.sql.ast.expression.UnresolvedArgument;
-import org.opensearch.sql.ast.expression.UnresolvedExpression;
-import org.opensearch.sql.ast.expression.Xor;
+import org.opensearch.sql.ast.expression.*;
 import org.opensearch.sql.common.utils.StringUtils;
 import org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser;
 import org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParserBaseVisitor;
 import org.opensearch.sql.ppl.utils.ArgumentFactory;
 
-/**
- * Class of building AST Expression nodes.
- */
+/** Class of building AST Expression nodes. */
 public class AstExpressionBuilder extends OpenSearchPPLParserBaseVisitor<UnresolvedExpression> {
 
   private static final int DEFAULT_TAKE_FUNCTION_SIZE_VALUE = 10;
 
-  /**
-   * The function name mapping between fronted and core engine.
-   */
+  /** The function name mapping between fronted and core engine. */
   private static Map<String, String> FUNCTION_NAME_MAPPING =
       new ImmutableMap.Builder<String, String>()
           .put("isnull", IS_NULL.getName().getFunctionName())
           .put("isnotnull", IS_NOT_NULL.getName().getFunctionName())
           .build();
 
-  /**
-   * Eval clause.
-   */
+  /** Eval clause. */
   @Override
   public UnresolvedExpression visitEvalClause(EvalClauseContext ctx) {
     return new Let((Field) visit(ctx.fieldExpression()), visit(ctx.expression()));
   }
 
-  /**
-   * Logical expression excluding boolean, comparison.
-   */
+  /** Logical expression excluding boolean, comparison. */
   @Override
   public UnresolvedExpression visitLogicalNot(LogicalNotContext ctx) {
     return new Not(visit(ctx.logicalExpression()));
@@ -129,9 +96,7 @@ public UnresolvedExpression visitLogicalXor(LogicalXorContext ctx) {
     return new Xor(visit(ctx.left), visit(ctx.right));
   }
 
-  /**
-   * Comparison expression.
-   */
+  /** Comparison expression. */
   @Override
   public UnresolvedExpression visitCompareExpr(CompareExprContext ctx) {
     return new Compare(ctx.comparisonOperator().getText(), visit(ctx.left), visit(ctx.right));
@@ -141,36 +106,24 @@ public UnresolvedExpression visitCompareExpr(CompareExprContext ctx) {
   public UnresolvedExpression visitInExpr(InExprContext ctx) {
     return new In(
         visit(ctx.valueExpression()),
-        ctx.valueList()
-            .literalValue()
-            .stream()
+        ctx.valueList().literalValue().stream()
             .map(this::visitLiteralValue)
             .collect(Collectors.toList()));
   }
 
-  /**
-   * Value Expression.
-   */
+  /** Value Expression. */
   @Override
   public UnresolvedExpression visitBinaryArithmetic(BinaryArithmeticContext ctx) {
     return new Function(
-        ctx.binaryOperator().getText(),
-        Arrays.asList(visit(ctx.left), visit(ctx.right))
-    );
+        ctx.binaryOperator.getText(), Arrays.asList(visit(ctx.left), visit(ctx.right)));
   }
 
   @Override
-  public UnresolvedExpression visitParentheticBinaryArithmetic(
-      ParentheticBinaryArithmeticContext ctx) {
-    return new Function(
-        ctx.binaryOperator().getText(),
-        Arrays.asList(visit(ctx.left), visit(ctx.right))
-    );
+  public UnresolvedExpression visitParentheticValueExpr(ParentheticValueExprContext ctx) {
+    return visit(ctx.valueExpression()); // Discard parenthesis around
   }
 
-  /**
-   * Field expression.
-   */
+  /** Field expression. */
   @Override
   public UnresolvedExpression visitFieldExpression(FieldExpressionContext ctx) {
     return new Field((QualifiedName) visit(ctx.qualifiedName()));
@@ -184,14 +137,11 @@ public UnresolvedExpression visitWcFieldExpression(WcFieldExpressionContext ctx)
   @Override
   public UnresolvedExpression visitSortField(SortFieldContext ctx) {
     return new Field(
-        qualifiedName(ctx.sortFieldExpression().fieldExpression().getText()),
-        ArgumentFactory.getArgumentList(ctx)
-    );
+        visit(ctx.sortFieldExpression().fieldExpression().qualifiedName()),
+        ArgumentFactory.getArgumentList(ctx));
   }
 
-  /**
-   * Aggregation function.
-   */
+  /** Aggregation function. */
   @Override
   public UnresolvedExpression visitStatsFunctionCall(StatsFunctionCallContext ctx) {
     return new AggregateFunction(ctx.statsFunctionName().getText(), visit(ctx.valueExpression()));
@@ -208,43 +158,48 @@ public UnresolvedExpression visitDistinctCountFunctionCall(DistinctCountFunction
   }
 
   @Override
-  public UnresolvedExpression visitPercentileAggFunction(PercentileAggFunctionContext ctx) {
-    return new AggregateFunction(ctx.PERCENTILE().getText(), visit(ctx.aggField),
-        Collections.singletonList(new Argument("rank", (Literal) visit(ctx.value))));
+  public UnresolvedExpression visitPercentileApproxFunctionCall(
+      OpenSearchPPLParser.PercentileApproxFunctionCallContext ctx) {
+    ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
+    builder.add(new UnresolvedArgument("percent", visit(ctx.percentileApproxFunction().percent)));
+    if (ctx.percentileApproxFunction().compression != null) {
+      builder.add(
+          new UnresolvedArgument("compression", visit(ctx.percentileApproxFunction().compression)));
+    }
+    return new AggregateFunction(
+        "percentile", visit(ctx.percentileApproxFunction().aggField), builder.build());
   }
 
   @Override
   public UnresolvedExpression visitTakeAggFunctionCall(
       OpenSearchPPLParser.TakeAggFunctionCallContext ctx) {
     ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
-    builder.add(new UnresolvedArgument("size",
-        ctx.takeAggFunction().size != null ? visit(ctx.takeAggFunction().size) :
-            AstDSL.intLiteral(DEFAULT_TAKE_FUNCTION_SIZE_VALUE)));
-    return new AggregateFunction("take", visit(ctx.takeAggFunction().fieldExpression()),
-        builder.build());
+    builder.add(
+        new UnresolvedArgument(
+            "size",
+            ctx.takeAggFunction().size != null
+                ? visit(ctx.takeAggFunction().size)
+                : AstDSL.intLiteral(DEFAULT_TAKE_FUNCTION_SIZE_VALUE)));
+    return new AggregateFunction(
+        "take", visit(ctx.takeAggFunction().fieldExpression()), builder.build());
   }
 
-  /**
-   * Eval function.
-   */
+  /** Eval function. */
   @Override
   public UnresolvedExpression visitBooleanFunctionCall(BooleanFunctionCallContext ctx) {
-    final String functionName = ctx.conditionFunctionBase().getText();
-    return buildFunction(FUNCTION_NAME_MAPPING.getOrDefault(functionName, functionName),
+    final String functionName = ctx.conditionFunctionName().getText().toLowerCase();
+    return buildFunction(
+        FUNCTION_NAME_MAPPING.getOrDefault(functionName, functionName),
         ctx.functionArgs().functionArg());
   }
 
-  /**
-   * Eval function.
-   */
+  /** Eval function. */
   @Override
   public UnresolvedExpression visitEvalFunctionCall(EvalFunctionCallContext ctx) {
     return buildFunction(ctx.evalFunctionName().getText(), ctx.functionArgs().functionArg());
   }
 
-  /**
-   * Cast function.
-   */
+  /** Cast function. */
   @Override
   public UnresolvedExpression visitDataTypeFunctionCall(DataTypeFunctionCallContext ctx) {
     return new Cast(visit(ctx.expression()), visit(ctx.convertedDataType()));
@@ -255,15 +210,10 @@ public UnresolvedExpression visitConvertedDataType(ConvertedDataTypeContext ctx)
     return AstDSL.stringLiteral(ctx.getText());
   }
 
-  private Function buildFunction(String functionName,
-                                 List<OpenSearchPPLParser.FunctionArgContext> args) {
+  private Function buildFunction(
+      String functionName, List<OpenSearchPPLParser.FunctionArgContext> args) {
     return new Function(
-        functionName,
-        args
-            .stream()
-            .map(this::visitFunctionArg)
-            .collect(Collectors.toList())
-    );
+        functionName, args.stream().map(this::visitFunctionArg).collect(Collectors.toList()));
   }
 
   @Override
@@ -284,8 +234,8 @@ public UnresolvedExpression visitMultiFieldRelevanceFunction(
 
   @Override
   public UnresolvedExpression visitTableSource(TableSourceContext ctx) {
-    if (ctx.getChild(0) instanceof IdentsAsQualifiedNameContext) {
-      return visitIdentifiers(((IdentsAsQualifiedNameContext) ctx.getChild(0)).ident());
+    if (ctx.getChild(0) instanceof IdentsAsTableQualifiedNameContext) {
+      return visitIdentsAsTableQualifiedName((IdentsAsTableQualifiedNameContext) ctx.getChild(0));
     } else {
       return visitIdentifiers(Arrays.asList(ctx));
     }
@@ -293,21 +243,75 @@ public UnresolvedExpression visitTableSource(TableSourceContext ctx) {
 
   @Override
   public UnresolvedExpression visitPositionFunction(
-          OpenSearchPPLParser.PositionFunctionContext ctx) {
+      OpenSearchPPLParser.PositionFunctionContext ctx) {
     return new Function(
-            POSITION.getName().getFunctionName(),
-            Arrays.asList(visitFunctionArg(ctx.functionArg(0)),
-                    visitFunctionArg(ctx.functionArg(1))));
+        POSITION.getName().getFunctionName(),
+        Arrays.asList(visitFunctionArg(ctx.functionArg(0)), visitFunctionArg(ctx.functionArg(1))));
   }
 
-  /**
-   * Literal and value.
-   */
+  @Override
+  public UnresolvedExpression visitExtractFunctionCall(
+      OpenSearchPPLParser.ExtractFunctionCallContext ctx) {
+    return new Function(
+        ctx.extractFunction().EXTRACT().toString(), getExtractFunctionArguments(ctx));
+  }
+
+  private List<UnresolvedExpression> getExtractFunctionArguments(
+      OpenSearchPPLParser.ExtractFunctionCallContext ctx) {
+    List<UnresolvedExpression> args =
+        Arrays.asList(
+            new Literal(ctx.extractFunction().datetimePart().getText(), DataType.STRING),
+            visitFunctionArg(ctx.extractFunction().functionArg()));
+    return args;
+  }
+
+  @Override
+  public UnresolvedExpression visitGetFormatFunctionCall(
+      OpenSearchPPLParser.GetFormatFunctionCallContext ctx) {
+    return new Function(
+        ctx.getFormatFunction().GET_FORMAT().toString(), getFormatFunctionArguments(ctx));
+  }
+
+  private List<UnresolvedExpression> getFormatFunctionArguments(
+      OpenSearchPPLParser.GetFormatFunctionCallContext ctx) {
+    List<UnresolvedExpression> args =
+        Arrays.asList(
+            new Literal(ctx.getFormatFunction().getFormatType().getText(), DataType.STRING),
+            visitFunctionArg(ctx.getFormatFunction().functionArg()));
+    return args;
+  }
+
+  @Override
+  public UnresolvedExpression visitTimestampFunctionCall(
+      OpenSearchPPLParser.TimestampFunctionCallContext ctx) {
+    return new Function(
+        ctx.timestampFunction().timestampFunctionName().getText(), timestampFunctionArguments(ctx));
+  }
+
+  private List<UnresolvedExpression> timestampFunctionArguments(
+      OpenSearchPPLParser.TimestampFunctionCallContext ctx) {
+    List<UnresolvedExpression> args =
+        Arrays.asList(
+            new Literal(ctx.timestampFunction().simpleDateTimePart().getText(), DataType.STRING),
+            visitFunctionArg(ctx.timestampFunction().firstArg),
+            visitFunctionArg(ctx.timestampFunction().secondArg));
+    return args;
+  }
+
+  /** Literal and value. */
   @Override
   public UnresolvedExpression visitIdentsAsQualifiedName(IdentsAsQualifiedNameContext ctx) {
     return visitIdentifiers(ctx.ident());
   }
 
+  @Override
+  public UnresolvedExpression visitIdentsAsTableQualifiedName(
+      IdentsAsTableQualifiedNameContext ctx) {
+    return visitIdentifiers(
+        Stream.concat(Stream.of(ctx.tableIdent()), ctx.ident().stream())
+            .collect(Collectors.toList()));
+  }
+
   @Override
   public UnresolvedExpression visitIdentsAsWildcardQualifiedName(
       IdentsAsWildcardQualifiedNameContext ctx) {
@@ -347,8 +351,10 @@ public UnresolvedExpression visitBooleanLiteral(BooleanLiteralContext ctx) {
   @Override
   public UnresolvedExpression visitBySpanClause(BySpanClauseContext ctx) {
     String name = ctx.spanClause().getText();
-    return ctx.alias != null ? new Alias(name, visit(ctx.spanClause()), StringUtils
-        .unquoteIdentifier(ctx.alias.getText())) : new Alias(name, visit(ctx.spanClause()));
+    return ctx.alias != null
+        ? new Alias(
+            name, visit(ctx.spanClause()), StringUtils.unquoteIdentifier(ctx.alias.getText()))
+        : new Alias(name, visit(ctx.spanClause()));
   }
 
   @Override
@@ -362,8 +368,7 @@ private QualifiedName visitIdentifiers(List<? extends ParserRuleContext> ctx) {
         ctx.stream()
             .map(RuleContext::getText)
             .map(StringUtils::unquoteIdentifier)
-            .collect(Collectors.toList())
-    );
+            .collect(Collectors.toList()));
   }
 
   private List<UnresolvedExpression> singleFieldRelevanceArguments(
@@ -371,13 +376,21 @@ private List<UnresolvedExpression> singleFieldRelevanceArguments(
     // all the arguments are defaulted to string values
     // to skip environment resolving and function signature resolving
     ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
-    builder.add(new UnresolvedArgument("field",
-        new Literal(StringUtils.unquoteText(ctx.field.getText()), DataType.STRING)));
-    builder.add(new UnresolvedArgument("query",
-        new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
-    ctx.relevanceArg().forEach(v -> builder.add(new UnresolvedArgument(
-        v.relevanceArgName().getText().toLowerCase(), new Literal(StringUtils.unquoteText(
-        v.relevanceArgValue().getText()), DataType.STRING))));
+    builder.add(
+        new UnresolvedArgument(
+            "field", new QualifiedName(StringUtils.unquoteText(ctx.field.getText()))));
+    builder.add(
+        new UnresolvedArgument(
+            "query", new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
+    ctx.relevanceArg()
+        .forEach(
+            v ->
+                builder.add(
+                    new UnresolvedArgument(
+                        v.relevanceArgName().getText().toLowerCase(),
+                        new Literal(
+                            StringUtils.unquoteText(v.relevanceArgValue().getText()),
+                            DataType.STRING))));
     return builder.build();
   }
 
@@ -386,19 +399,26 @@ private List<UnresolvedExpression> multiFieldRelevanceArguments(
     // all the arguments are defaulted to string values
     // to skip environment resolving and function signature resolving
     ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
-    var fields = new RelevanceFieldList(ctx
-        .getRuleContexts(OpenSearchPPLParser.RelevanceFieldAndWeightContext.class)
-        .stream()
-        .collect(Collectors.toMap(
-            f -> StringUtils.unquoteText(f.field.getText()),
-            f -> (f.weight == null) ? 1F : Float.parseFloat(f.weight.getText()))));
+    var fields =
+        new RelevanceFieldList(
+            ctx.getRuleContexts(OpenSearchPPLParser.RelevanceFieldAndWeightContext.class).stream()
+                .collect(
+                    Collectors.toMap(
+                        f -> StringUtils.unquoteText(f.field.getText()),
+                        f -> (f.weight == null) ? 1F : Float.parseFloat(f.weight.getText()))));
     builder.add(new UnresolvedArgument("fields", fields));
-    builder.add(new UnresolvedArgument("query",
-        new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
-    ctx.relevanceArg().forEach(v -> builder.add(new UnresolvedArgument(
-        v.relevanceArgName().getText().toLowerCase(), new Literal(StringUtils.unquoteText(
-        v.relevanceArgValue().getText()), DataType.STRING))));
+    builder.add(
+        new UnresolvedArgument(
+            "query", new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
+    ctx.relevanceArg()
+        .forEach(
+            v ->
+                builder.add(
+                    new UnresolvedArgument(
+                        v.relevanceArgName().getText().toLowerCase(),
+                        new Literal(
+                            StringUtils.unquoteText(v.relevanceArgValue().getText()),
+                            DataType.STRING))));
     return builder.build();
   }
-
 }
diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstStatementBuilder.java b/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstStatementBuilder.java
index e4f40e9a11..e276e6d523 100644
--- a/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstStatementBuilder.java
+++ b/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstStatementBuilder.java
@@ -21,9 +21,7 @@
 import org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser;
 import org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParserBaseVisitor;
 
-/**
- * Build {@link Statement} from PPL Query.
- */
+/** Build {@link Statement} from PPL Query. */
 @RequiredArgsConstructor
 public class AstStatementBuilder extends OpenSearchPPLParserBaseVisitor<Statement> {
 
@@ -33,7 +31,7 @@ public class AstStatementBuilder extends OpenSearchPPLParserBaseVisitor<Statemen
 
   @Override
   public Statement visitDmlStatement(OpenSearchPPLParser.DmlStatementContext ctx) {
-    Query query = new Query(addSelectAll(astBuilder.visit(ctx)));
+    Query query = new Query(addSelectAll(astBuilder.visit(ctx)), context.getFetchSize());
     return context.isExplain ? new Explain(query) : query;
   }
 
@@ -46,6 +44,7 @@ protected Statement aggregateResult(Statement aggregate, Statement nextResult) {
   @Builder
   public static class StatementBuilderContext {
     private final boolean isExplain;
+    private final int fetchSize;
   }
 
   private UnresolvedPlan addSelectAll(UnresolvedPlan plan) {
diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java b/ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java
index 09afd2075f..f89ecf9c6e 100644
--- a/ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java
+++ b/ppl/src/main/java/org/opensearch/sql/ppl/utils/ArgumentFactory.java
@@ -3,11 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.utils;
 
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.BooleanLiteralContext;
-import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.DecimalLiteralContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.DedupCommandContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.FieldsCommandContext;
 import static org.opensearch.sql.ppl.antlr.parser.OpenSearchPPLParser.IntegerLiteralContext;
@@ -25,9 +23,7 @@
 import org.opensearch.sql.ast.expression.Literal;
 import org.opensearch.sql.common.utils.StringUtils;
 
-/**
- * Util class to get all arguments as a list from the PPL command.
- */
+/** Util class to get all arguments as a list from the PPL command. */
 public class ArgumentFactory {
 
   /**
@@ -40,8 +36,7 @@ public static List<Argument> getArgumentList(FieldsCommandContext ctx) {
     return Collections.singletonList(
         ctx.MINUS() != null
             ? new Argument("exclude", new Literal(true, DataType.BOOLEAN))
-            : new Argument("exclude", new Literal(false, DataType.BOOLEAN))
-    );
+            : new Argument("exclude", new Literal(false, DataType.BOOLEAN)));
   }
 
   /**
@@ -63,8 +58,7 @@ public static List<Argument> getArgumentList(StatsCommandContext ctx) {
             : new Argument("delim", new Literal(" ", DataType.STRING)),
         ctx.dedupsplit != null
             ? new Argument("dedupsplit", getArgumentValue(ctx.dedupsplit))
-            : new Argument("dedupsplit", new Literal(false, DataType.BOOLEAN))
-    );
+            : new Argument("dedupsplit", new Literal(false, DataType.BOOLEAN)));
   }
 
   /**
@@ -83,8 +77,7 @@ public static List<Argument> getArgumentList(DedupCommandContext ctx) {
             : new Argument("keepempty", new Literal(false, DataType.BOOLEAN)),
         ctx.consecutive != null
             ? new Argument("consecutive", getArgumentValue(ctx.consecutive))
-            : new Argument("consecutive", new Literal(false, DataType.BOOLEAN))
-    );
+            : new Argument("consecutive", new Literal(false, DataType.BOOLEAN)));
   }
 
   /**
@@ -101,13 +94,12 @@ public static List<Argument> getArgumentList(SortFieldContext ctx) {
         ctx.sortFieldExpression().AUTO() != null
             ? new Argument("type", new Literal("auto", DataType.STRING))
             : ctx.sortFieldExpression().IP() != null
-            ? new Argument("type", new Literal("ip", DataType.STRING))
-            : ctx.sortFieldExpression().NUM() != null
-            ? new Argument("type", new Literal("num", DataType.STRING))
-            : ctx.sortFieldExpression().STR() != null
-            ? new Argument("type", new Literal("str", DataType.STRING))
-            : new Argument("type", new Literal(null, DataType.NULL))
-    );
+                ? new Argument("type", new Literal("ip", DataType.STRING))
+                : ctx.sortFieldExpression().NUM() != null
+                    ? new Argument("type", new Literal("num", DataType.STRING))
+                    : ctx.sortFieldExpression().STR() != null
+                        ? new Argument("type", new Literal("str", DataType.STRING))
+                        : new Argument("type", new Literal(null, DataType.NULL)));
   }
 
   /**
@@ -120,8 +112,7 @@ public static List<Argument> getArgumentList(TopCommandContext ctx) {
     return Collections.singletonList(
         ctx.number != null
             ? new Argument("noOfResults", getArgumentValue(ctx.number))
-            : new Argument("noOfResults", new Literal(10, DataType.INTEGER))
-    );
+            : new Argument("noOfResults", new Literal(10, DataType.INTEGER)));
   }
 
   /**
@@ -131,21 +122,21 @@ public static List<Argument> getArgumentList(TopCommandContext ctx) {
    * @return the list of argument with default number of results for the rare command
    */
   public static List<Argument> getArgumentList(RareCommandContext ctx) {
-    return Collections
-        .singletonList(new Argument("noOfResults", new Literal(10, DataType.INTEGER)));
+    return Collections.singletonList(
+        new Argument("noOfResults", new Literal(10, DataType.INTEGER)));
   }
 
   /**
    * parse argument value into Literal.
+   *
    * @param ctx ParserRuleContext instance
    * @return Literal
    */
   private static Literal getArgumentValue(ParserRuleContext ctx) {
     return ctx instanceof IntegerLiteralContext
-            ? new Literal(Integer.parseInt(ctx.getText()), DataType.INTEGER)
-            : ctx instanceof BooleanLiteralContext
+        ? new Literal(Integer.parseInt(ctx.getText()), DataType.INTEGER)
+        : ctx instanceof BooleanLiteralContext
             ? new Literal(Boolean.valueOf(ctx.getText()), DataType.BOOLEAN)
             : new Literal(StringUtils.unquoteText(ctx.getText()), DataType.STRING);
   }
-
 }
diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/utils/PPLQueryDataAnonymizer.java b/ppl/src/main/java/org/opensearch/sql/ppl/utils/PPLQueryDataAnonymizer.java
index 504469a4b2..c52c30b182 100644
--- a/ppl/src/main/java/org/opensearch/sql/ppl/utils/PPLQueryDataAnonymizer.java
+++ b/ppl/src/main/java/org/opensearch/sql/ppl/utils/PPLQueryDataAnonymizer.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.utils;
 
 import com.google.common.base.Strings;
@@ -11,7 +10,6 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.List;
 import java.util.stream.Collectors;
-import lombok.Generated;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
@@ -55,9 +53,7 @@
 import org.opensearch.sql.planner.logical.LogicalRename;
 import org.opensearch.sql.planner.logical.LogicalSort;
 
-/**
- * Utility class to mask sensitive information in incoming PPL queries.
- */
+/** Utility class to mask sensitive information in incoming PPL queries. */
 public class PPLQueryDataAnonymizer extends AbstractNodeVisitor<String, String> {
 
   private static final String MASK_LITERAL = "***";
@@ -69,8 +65,8 @@ public PPLQueryDataAnonymizer() {
   }
 
   /**
-   * This method is used to anonymize sensitive data in PPL query.
-   * Sensitive data includes user data.,
+   * This method is used to anonymize sensitive data in PPL query. Sensitive data includes user
+   * data.,
    *
    * @return ppl query string with all user data replace with "***"
    */
@@ -82,9 +78,7 @@ public String anonymizeStatement(Statement plan) {
     return plan.accept(this, null);
   }
 
-  /**
-   * Handle Query Statement.
-   */
+  /** Handle Query Statement. */
   @Override
   public String visitQuery(Query node, String context) {
     return node.getPlan().accept(this, null);
@@ -101,10 +95,14 @@ public String visitRelation(Relation node, String context) {
   }
 
   @Override
-  @Generated //To exclude from jacoco..will remove https://github.com/opensearch-project/sql/issues/1019
   public String visitTableFunction(TableFunction node, String context) {
-    //<TODO>
-    return null;
+    String arguments =
+        node.getArguments().stream()
+            .map(
+                unresolvedExpression ->
+                    this.expressionAnalyzer.analyze(unresolvedExpression, context))
+            .collect(Collectors.joining(","));
+    return StringUtils.format("source=%s(%s)", node.getFunctionName().toString(), arguments);
   }
 
   @Override
@@ -114,37 +112,34 @@ public String visitFilter(Filter node, String context) {
     return StringUtils.format("%s | where %s", child, condition);
   }
 
-  /**
-   * Build {@link LogicalRename}.
-   */
+  /** Build {@link LogicalRename}. */
   @Override
   public String visitRename(Rename node, String context) {
     String child = node.getChild().get(0).accept(this, context);
     ImmutableMap.Builder<String, String> renameMapBuilder = new ImmutableMap.Builder<>();
     for (Map renameMap : node.getRenameList()) {
-      renameMapBuilder.put(visitExpression(renameMap.getOrigin()),
+      renameMapBuilder.put(
+          visitExpression(renameMap.getOrigin()),
           ((Field) renameMap.getTarget()).getField().toString());
     }
     String renames =
-        renameMapBuilder.build().entrySet().stream().map(entry -> StringUtils.format("%s as %s",
-            entry.getKey(), entry.getValue())).collect(Collectors.joining(","));
+        renameMapBuilder.build().entrySet().stream()
+            .map(entry -> StringUtils.format("%s as %s", entry.getKey(), entry.getValue()))
+            .collect(Collectors.joining(","));
     return StringUtils.format("%s | rename %s", child, renames);
   }
 
-  /**
-   * Build {@link LogicalAggregation}.
-   */
+  /** Build {@link LogicalAggregation}. */
   @Override
   public String visitAggregation(Aggregation node, String context) {
     String child = node.getChild().get(0).accept(this, context);
     final String group = visitExpressionList(node.getGroupExprList());
-    return StringUtils.format("%s | stats %s", child,
-        String.join(" ", visitExpressionList(node.getAggExprList()), groupBy(group)).trim());
+    return StringUtils.format(
+        "%s | stats %s",
+        child, String.join(" ", visitExpressionList(node.getAggExprList()), groupBy(group)).trim());
   }
 
-  /**
-   * Build {@link LogicalRareTopN}.
-   */
+  /** Build {@link LogicalRareTopN}. */
   @Override
   public String visitRareTopN(RareTopN node, String context) {
     final String child = node.getChild().get(0).accept(this, context);
@@ -152,16 +147,15 @@ public String visitRareTopN(RareTopN node, String context) {
     Integer noOfResults = (Integer) options.get(0).getValue().getValue();
     String fields = visitFieldList(node.getFields());
     String group = visitExpressionList(node.getGroupExprList());
-    return StringUtils.format("%s | %s %d %s", child,
+    return StringUtils.format(
+        "%s | %s %d %s",
+        child,
         node.getCommandType().name().toLowerCase(),
         noOfResults,
-        String.join(" ", fields, groupBy(group)).trim()
-    );
+        String.join(" ", fields, groupBy(group)).trim());
   }
 
-  /**
-   * Build {@link LogicalProject} or {@link LogicalRemove} from {@link Field}.
-   */
+  /** Build {@link LogicalProject} or {@link LogicalRemove} from {@link Field}. */
   @Override
   public String visitProject(Project node, String context) {
     String child = node.getChild().get(0).accept(this, context);
@@ -178,9 +172,7 @@ public String visitProject(Project node, String context) {
     return StringUtils.format("%s | fields %s %s", child, arg, fields);
   }
 
-  /**
-   * Build {@link LogicalEval}.
-   */
+  /** Build {@link LogicalEval}. */
   @Override
   public String visitEval(Eval node, String context) {
     String child = node.getChild().get(0).accept(this, context);
@@ -190,14 +182,14 @@ public String visitEval(Eval node, String context) {
       String target = let.getVar().getField().toString();
       expressionsBuilder.add(ImmutablePair.of(target, expression));
     }
-    String expressions = expressionsBuilder.build().stream().map(pair -> StringUtils.format("%s"
-        + "=%s", pair.getLeft(), pair.getRight())).collect(Collectors.joining(" "));
+    String expressions =
+        expressionsBuilder.build().stream()
+            .map(pair -> StringUtils.format("%s" + "=%s", pair.getLeft(), pair.getRight()))
+            .collect(Collectors.joining(" "));
     return StringUtils.format("%s | eval %s", child, expressions);
   }
 
-  /**
-   * Build {@link LogicalSort}.
-   */
+  /** Build {@link LogicalSort}. */
   @Override
   public String visitSort(Sort node, String context) {
     String child = node.getChild().get(0).accept(this, context);
@@ -206,9 +198,7 @@ public String visitSort(Sort node, String context) {
     return StringUtils.format("%s | sort %s", child, sortList);
   }
 
-  /**
-   * Build {@link LogicalDedupe}.
-   */
+  /** Build {@link LogicalDedupe}. */
   @Override
   public String visitDedupe(Dedupe node, String context) {
     String child = node.getChild().get(0).accept(this, context);
@@ -218,10 +208,9 @@ public String visitDedupe(Dedupe node, String context) {
     Boolean keepEmpty = (Boolean) options.get(1).getValue().getValue();
     Boolean consecutive = (Boolean) options.get(2).getValue().getValue();
 
-    return StringUtils
-        .format("%s | dedup %s %d keepempty=%b consecutive=%b", child, fields, allowedDuplication,
-            keepEmpty,
-            consecutive);
+    return StringUtils.format(
+        "%s | dedup %s %d keepempty=%b consecutive=%b",
+        child, fields, allowedDuplication, keepEmpty, consecutive);
   }
 
   @Override
@@ -236,8 +225,9 @@ private String visitFieldList(List<Field> fieldList) {
   }
 
   private String visitExpressionList(List<UnresolvedExpression> expressionList) {
-    return expressionList.isEmpty() ? "" :
-        expressionList.stream().map(this::visitExpression).collect(Collectors.joining(","));
+    return expressionList.isEmpty()
+        ? ""
+        : expressionList.stream().map(this::visitExpression).collect(Collectors.joining(","));
   }
 
   private String visitExpression(UnresolvedExpression expression) {
@@ -248,11 +238,8 @@ private String groupBy(String groupBy) {
     return Strings.isNullOrEmpty(groupBy) ? "" : StringUtils.format("by %s", groupBy);
   }
 
-  /**
-   * Expression Anonymizer.
-   */
-  private static class AnonymizerExpressionAnalyzer extends AbstractNodeVisitor<String,
-      String> {
+  /** Expression Anonymizer. */
+  private static class AnonymizerExpressionAnalyzer extends AbstractNodeVisitor<String, String> {
 
     public String analyze(UnresolvedExpression unresolved, String context) {
       return unresolved.accept(this, context);
diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/utils/UnresolvedPlanHelper.java b/ppl/src/main/java/org/opensearch/sql/ppl/utils/UnresolvedPlanHelper.java
index 4fb9eee6a0..a502f2d769 100644
--- a/ppl/src/main/java/org/opensearch/sql/ppl/utils/UnresolvedPlanHelper.java
+++ b/ppl/src/main/java/org/opensearch/sql/ppl/utils/UnresolvedPlanHelper.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.utils;
 
 import com.google.common.collect.ImmutableList;
@@ -12,15 +11,11 @@
 import org.opensearch.sql.ast.tree.Project;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 
-/**
- * The helper to add select to {@link UnresolvedPlan} if needed.
- */
+/** The helper to add select to {@link UnresolvedPlan} if needed. */
 @UtilityClass
 public class UnresolvedPlanHelper {
 
-  /**
-   * Attach Select All to PPL commands if required.
-   */
+  /** Attach Select All to PPL commands if required. */
   public UnresolvedPlan addSelectAll(UnresolvedPlan plan) {
     if ((plan instanceof Project) && !((Project) plan).isExcluded()) {
       return plan;
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java
index a1b1ccaf14..598f6691cb 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/PPLServiceTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -19,20 +18,16 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.sql.common.response.ResponseListener;
-import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.executor.DefaultQueryManager;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.ExecutionEngine.ExplainResponse;
 import org.opensearch.sql.executor.ExecutionEngine.ExplainResponseNode;
 import org.opensearch.sql.executor.ExecutionEngine.QueryResponse;
-import org.opensearch.sql.executor.QueryManager;
 import org.opensearch.sql.executor.QueryService;
 import org.opensearch.sql.executor.execution.QueryPlanFactory;
-import org.opensearch.sql.expression.function.FunctionProperties;
-import org.opensearch.sql.ppl.config.PPLServiceConfig;
+import org.opensearch.sql.executor.pagination.Cursor;
+import org.opensearch.sql.ppl.antlr.PPLSyntaxParser;
 import org.opensearch.sql.ppl.domain.PPLQueryRequest;
-import org.opensearch.sql.storage.StorageEngine;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 @RunWith(MockitoJUnitRunner.class)
 public class PPLServiceTest {
@@ -41,42 +36,21 @@ public class PPLServiceTest {
 
   private static String EXPLAIN = "/_plugins/_ppl/_explain";
 
-  private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-
   private PPLService pplService;
 
-  @Mock
-  private QueryService queryService;
-
-  @Mock
-  private StorageEngine storageEngine;
-
-  @Mock
-  private ExecutionEngine executionEngine;
-
-  @Mock
-  private DataSourceService dataSourceService;
+  private DefaultQueryManager queryManager;
 
-  @Mock
-  private ExecutionEngine.Schema schema;
+  @Mock private QueryService queryService;
 
-  private DefaultQueryManager queryManager;
+  @Mock private ExecutionEngine.Schema schema;
 
-  /**
-   * Setup the test context.
-   */
+  /** Setup the test context. */
   @Before
   public void setUp() {
     queryManager = DefaultQueryManager.defaultQueryManager();
-    context.registerBean(QueryManager.class, () -> queryManager);
-    context.registerBean(QueryPlanFactory.class, () -> new QueryPlanFactory(queryService));
-    context.registerBean(StorageEngine.class, () -> storageEngine);
-    context.registerBean(ExecutionEngine.class, () -> executionEngine);
-    context.registerBean(DataSourceService.class, () -> dataSourceService);
-    context.registerBean(FunctionProperties.class, FunctionProperties::new);
-    context.register(PPLServiceConfig.class);
-    context.refresh();
-    pplService = context.getBean(PPLService.class);
+
+    pplService =
+        new PPLService(new PPLSyntaxParser(), queryManager, new QueryPlanFactory(queryService));
   }
 
   @After
@@ -86,18 +60,20 @@ public void cleanup() throws InterruptedException {
 
   @Test
   public void testExecuteShouldPass() {
-    doAnswer(invocation -> {
-      ResponseListener<QueryResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new QueryResponse(schema, Collections.emptyList()));
-      return null;
-    }).when(queryService).execute(any(), any());
-
-    pplService.execute(new PPLQueryRequest("search source=t a=1", null, QUERY),
+    doAnswer(
+            invocation -> {
+              ResponseListener<QueryResponse> listener = invocation.getArgument(1);
+              listener.onResponse(new QueryResponse(schema, Collections.emptyList(), Cursor.None));
+              return null;
+            })
+        .when(queryService)
+        .execute(any(), any());
+
+    pplService.execute(
+        new PPLQueryRequest("search source=t a=1", null, QUERY),
         new ResponseListener<QueryResponse>() {
           @Override
-          public void onResponse(QueryResponse pplQueryResponse) {
-
-          }
+          public void onResponse(QueryResponse pplQueryResponse) {}
 
           @Override
           public void onFailure(Exception e) {
@@ -108,17 +84,20 @@ public void onFailure(Exception e) {
 
   @Test
   public void testExecuteCsvFormatShouldPass() {
-    doAnswer(invocation -> {
-      ResponseListener<QueryResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new QueryResponse(schema, Collections.emptyList()));
-      return null;
-    }).when(queryService).execute(any(), any());
-
-    pplService.execute(new PPLQueryRequest("search source=t a=1", null, QUERY, "csv"),
+    doAnswer(
+            invocation -> {
+              ResponseListener<QueryResponse> listener = invocation.getArgument(1);
+              listener.onResponse(new QueryResponse(schema, Collections.emptyList(), Cursor.None));
+              return null;
+            })
+        .when(queryService)
+        .execute(any(), any());
+
+    pplService.execute(
+        new PPLQueryRequest("search source=t a=1", null, QUERY, "csv"),
         new ResponseListener<QueryResponse>() {
           @Override
-          public void onResponse(QueryResponse pplQueryResponse) {
-          }
+          public void onResponse(QueryResponse pplQueryResponse) {}
 
           @Override
           public void onFailure(Exception e) {
@@ -129,17 +108,20 @@ public void onFailure(Exception e) {
 
   @Test
   public void testExplainShouldPass() {
-    doAnswer(invocation -> {
-      ResponseListener<ExplainResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new ExplainResponse(new ExplainResponseNode("test")));
-      return null;
-    }).when(queryService).explain(any(), any());
-
-    pplService.explain(new PPLQueryRequest("search source=t a=1", null, EXPLAIN),
+    doAnswer(
+            invocation -> {
+              ResponseListener<ExplainResponse> listener = invocation.getArgument(1);
+              listener.onResponse(new ExplainResponse(new ExplainResponseNode("test")));
+              return null;
+            })
+        .when(queryService)
+        .explain(any(), any());
+
+    pplService.explain(
+        new PPLQueryRequest("search source=t a=1", null, EXPLAIN),
         new ResponseListener<ExplainResponse>() {
           @Override
-          public void onResponse(ExplainResponse pplQueryResponse) {
-          }
+          public void onResponse(ExplainResponse pplQueryResponse) {}
 
           @Override
           public void onFailure(Exception e) {
@@ -150,7 +132,8 @@ public void onFailure(Exception e) {
 
   @Test
   public void testExecuteWithIllegalQueryShouldBeCaughtByHandler() {
-    pplService.execute(new PPLQueryRequest("search", null, QUERY),
+    pplService.execute(
+        new PPLQueryRequest("search", null, QUERY),
         new ResponseListener<QueryResponse>() {
           @Override
           public void onResponse(QueryResponse pplQueryResponse) {
@@ -158,15 +141,14 @@ public void onResponse(QueryResponse pplQueryResponse) {
           }
 
           @Override
-          public void onFailure(Exception e) {
-
-          }
+          public void onFailure(Exception e) {}
         });
   }
 
   @Test
   public void testExplainWithIllegalQueryShouldBeCaughtByHandler() {
-    pplService.explain(new PPLQueryRequest("search", null, QUERY),
+    pplService.explain(
+        new PPLQueryRequest("search", null, QUERY),
         new ResponseListener<>() {
           @Override
           public void onResponse(ExplainResponse pplQueryResponse) {
@@ -174,26 +156,26 @@ public void onResponse(ExplainResponse pplQueryResponse) {
           }
 
           @Override
-          public void onFailure(Exception e) {
-
-          }
+          public void onFailure(Exception e) {}
         });
   }
 
   @Test
   public void testPrometheusQuery() {
-    doAnswer(invocation -> {
-      ResponseListener<QueryResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new QueryResponse(schema, Collections.emptyList()));
-      return null;
-    }).when(queryService).execute(any(), any());
-
-    pplService.execute(new PPLQueryRequest("source = prometheus.http_requests_total", null, QUERY),
+    doAnswer(
+            invocation -> {
+              ResponseListener<QueryResponse> listener = invocation.getArgument(1);
+              listener.onResponse(new QueryResponse(schema, Collections.emptyList(), Cursor.None));
+              return null;
+            })
+        .when(queryService)
+        .execute(any(), any());
+
+    pplService.execute(
+        new PPLQueryRequest("source = prometheus.http_requests_total", null, QUERY),
         new ResponseListener<>() {
           @Override
-          public void onResponse(QueryResponse pplQueryResponse) {
-
-          }
+          public void onResponse(QueryResponse pplQueryResponse) {}
 
           @Override
           public void onFailure(Exception e) {
@@ -204,7 +186,8 @@ public void onFailure(Exception e) {
 
   @Test
   public void testInvalidPPLQuery() {
-    pplService.execute(new PPLQueryRequest("search", null, QUERY),
+    pplService.execute(
+        new PPLQueryRequest("search", null, QUERY),
         new ResponseListener<QueryResponse>() {
           @Override
           public void onResponse(QueryResponse pplQueryResponse) {
@@ -212,9 +195,7 @@ public void onResponse(QueryResponse pplQueryResponse) {
           }
 
           @Override
-          public void onFailure(Exception e) {
-
-          }
+          public void onFailure(Exception e) {}
         });
   }
 }
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/antlr/NowLikeFunctionParserTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/antlr/NowLikeFunctionParserTest.java
index dda404f29a..f6a04983e2 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/antlr/NowLikeFunctionParserTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/antlr/NowLikeFunctionParserTest.java
@@ -1,71 +1,76 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.sql.ppl.antlr;
-
-import static org.junit.Assert.assertNotEquals;
-
-import java.util.List;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class NowLikeFunctionParserTest {
-
-  private final PPLSyntaxParser parser = new PPLSyntaxParser();
-
-  /**
-   * Set parameterized values used in test.
-   * @param name Function name
-   * @param hasFsp Whether function has fsp argument
-   * @param hasShortcut Whether function has shortcut (call without `()`)
-   */
-  public NowLikeFunctionParserTest(String name, Boolean hasFsp, Boolean hasShortcut) {
-    this.name = name;
-    this.hasFsp = hasFsp;
-    this.hasShortcut = hasShortcut;
-  }
-
-  /**
-   * Returns function data to test.
-   * @return An iterable.
-   */
-  @Parameterized.Parameters(name = "{0}")
-  public static Iterable<Object> functionNames() {
-    return List.of(new Object[][]{
-        {"now", true, false},
-        {"current_timestamp", true, true},
-        {"localtimestamp", true, true},
-        {"localtime", true, true},
-        {"sysdate", true, false},
-        {"curtime", true, false},
-        {"current_time", true, true},
-        {"curdate", false, false},
-        {"current_date", false, true}
-    });
-  }
-
-  private final String name;
-  private final Boolean hasFsp;
-  private final Boolean hasShortcut;
-
-  @Test
-  public void test_now_like_functions() {
-    for (var call : hasShortcut ? List.of(name, name + "()") : List.of(name + "()")) {
-      ParseTree tree = parser.parse("source=t | eval r=" + call);
-      assertNotEquals(null, tree);
-
-      tree = parser.parse("search source=t | where a=" + call);
-      assertNotEquals(null, tree);
-    }
-    if (hasFsp) {
-      ParseTree tree = parser.parse("search source=t | where a=" + name + "(0)");
-      assertNotEquals(null, tree);
-    }
-  }
-}
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.ppl.antlr;
+
+import static org.junit.Assert.assertNotEquals;
+
+import java.util.List;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class NowLikeFunctionParserTest {
+
+  private final PPLSyntaxParser parser = new PPLSyntaxParser();
+
+  /**
+   * Set parameterized values used in test.
+   *
+   * @param name Function name
+   * @param hasFsp Whether function has fsp argument
+   * @param hasShortcut Whether function has shortcut (call without `()`)
+   */
+  public NowLikeFunctionParserTest(String name, Boolean hasFsp, Boolean hasShortcut) {
+    this.name = name;
+    this.hasFsp = hasFsp;
+    this.hasShortcut = hasShortcut;
+  }
+
+  /**
+   * Returns function data to test.
+   *
+   * @return An iterable.
+   */
+  @Parameterized.Parameters(name = "{0}")
+  public static Iterable<Object> functionNames() {
+    return List.of(
+        new Object[][] {
+          {"now", true, false},
+          {"current_timestamp", true, true},
+          {"localtimestamp", true, true},
+          {"localtime", true, true},
+          {"sysdate", true, false},
+          {"curtime", true, false},
+          {"current_time", true, true},
+          {"curdate", false, false},
+          {"current_date", false, true},
+          {"utc_date", false, false},
+          {"utc_time", false, false},
+          {"utc_timestamp", false, false}
+        });
+  }
+
+  private final String name;
+  private final Boolean hasFsp;
+  private final Boolean hasShortcut;
+
+  @Test
+  public void test_now_like_functions() {
+    for (var call : hasShortcut ? List.of(name, name + "()") : List.of(name + "()")) {
+      ParseTree tree = parser.parse("source=t | eval r=" + call);
+      assertNotEquals(null, tree);
+
+      tree = parser.parse("search source=t | where a=" + call);
+      assertNotEquals(null, tree);
+    }
+    if (hasFsp) {
+      ParseTree tree = parser.parse("search source=t | where a=" + name + "(0)");
+      assertNotEquals(null, tree);
+    }
+  }
+}
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserMatchBoolPrefixSamplesTests.java b/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserMatchBoolPrefixSamplesTests.java
index dd146ea2cf..7de197028e 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserMatchBoolPrefixSamplesTests.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserMatchBoolPrefixSamplesTests.java
@@ -13,26 +13,24 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-
 @RunWith(Parameterized.class)
 public class PPLSyntaxParserMatchBoolPrefixSamplesTests {
 
-
-  /** Returns sample queries that the PPLSyntaxParser is expected to parse successfully.
+  /**
+   * Returns sample queries that the PPLSyntaxParser is expected to parse successfully.
+   *
    * @return an Iterable of sample queries.
    */
   @Parameterized.Parameters(name = "{0}")
   public static Iterable<Object> sampleQueries() {
     return List.of(
         "source=t a= 1 | where match_bool_prefix(a, 'hello world')",
-        "source=t a = 1 | where match_bool_prefix(a, 'hello world',"
-            + " minimum_should_match = 3)",
+        "source=t a = 1 | where match_bool_prefix(a, 'hello world'," + " minimum_should_match = 3)",
         "source=t a = 1 | where match_bool_prefix(a, 'hello world', fuzziness='AUTO')",
         "source=t a = 1 | where match_bool_prefix(a, 'hello world', fuzziness='AUTO:4,6')",
         "source=t a= 1 | where match_bool_prefix(a, 'hello world', prefix_length=0)",
         "source=t a= 1 | where match_bool_prefix(a, 'hello world', max_expansions=1)",
-        "source=t a= 1 | where match_bool_prefix(a, 'hello world',"
-            + " fuzzy_transpositions=true)",
+        "source=t a= 1 | where match_bool_prefix(a, 'hello world'," + " fuzzy_transpositions=true)",
         "source=t a= 1 | where match_bool_prefix(a, 'hello world',"
             + " fuzzy_rewrite=constant_score)",
         "source=t a= 1 | where match_bool_prefix(a, 'hello world',"
@@ -43,8 +41,7 @@ public static Iterable<Object> sampleQueries() {
             + " fuzzy_rewrite=top_terms_blended_freqs_1)",
         "source=t a= 1 | where match_bool_prefix(a, 'hello world',"
             + " fuzzy_rewrite=top_terms_boost_1)",
-        "source=t a= 1 | where match_bool_prefix(a, 'hello world',"
-            + " fuzzy_rewrite=top_terms_1)",
+        "source=t a= 1 | where match_bool_prefix(a, 'hello world'," + " fuzzy_rewrite=top_terms_1)",
         "source=t a= 1 | where match_bool_prefix(a, 'hello world', boost=1)",
         "source=t a = 1 | where match_bool_prefix(a, 'hello world', analyzer = 'standard',"
             + "prefix_length = '0', boost = 1)");
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserMatchPhraseSamplesTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserMatchPhraseSamplesTest.java
index aef6d1d69e..94222ec103 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserMatchPhraseSamplesTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserMatchPhraseSamplesTest.java
@@ -13,22 +13,22 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-
 @RunWith(Parameterized.class)
 public class PPLSyntaxParserMatchPhraseSamplesTest {
 
-
-  /** Returns sample queries that the PPLSyntaxParser is expected to parse successfully.
+  /**
+   * Returns sample queries that the PPLSyntaxParser is expected to parse successfully.
+   *
    * @return an Iterable of sample queries.
    */
   @Parameterized.Parameters(name = "{0}")
   public static Iterable<Object> sampleQueries() {
     return List.of(
-      "source=t a= 1 | where match_phrase(a, 'hello world')",
-      "source=t a = 1 | where match_phrase(a, 'hello world', slop = 3)",
-      "source=t a = 1 | where match_phrase(a, 'hello world', analyzer = 'standard',"
-        + "zero_terms_query = 'none', slop = 3)",
-      "source=t a = 1 | where match_phrase(a, 'hello world', zero_terms_query = all)");
+        "source=t a= 1 | where match_phrase(a, 'hello world')",
+        "source=t a = 1 | where match_phrase(a, 'hello world', slop = 3)",
+        "source=t a = 1 | where match_phrase(a, 'hello world', analyzer = 'standard',"
+            + "zero_terms_query = 'none', slop = 3)",
+        "source=t a = 1 | where match_phrase(a, 'hello world', zero_terms_query = all)");
   }
 
   private final String query;
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserTest.java
index dcf961dc24..943953d416 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/antlr/PPLSyntaxParserTest.java
@@ -3,20 +3,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.antlr;
 
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
 
+import java.util.List;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.opensearch.sql.common.antlr.SyntaxCheckException;
 
 public class PPLSyntaxParserTest {
 
-  @Rule
-  public ExpectedException exceptionRule = ExpectedException.none();
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
   @Test
   public void testSearchCommandShouldPass() {
@@ -30,12 +32,66 @@ public void testSearchCommandIgnoreSearchKeywordShouldPass() {
     assertNotEquals(null, tree);
   }
 
+  @Test
+  public void testSearchCommandWithMultipleIndicesShouldPass() {
+    ParseTree tree = new PPLSyntaxParser().parse("search source=t,u a=1 b=2");
+    assertNotEquals(null, tree);
+  }
+
+  @Test
+  public void testSearchCommandCrossClusterShouldPass() {
+    ParseTree tree = new PPLSyntaxParser().parse("search source=c:t a=1 b=2");
+    assertNotEquals(null, tree);
+  }
+
+  @Test
+  public void testSearchCommandCrossClusterHiddenShouldPass() {
+    ParseTree tree = new PPLSyntaxParser().parse("search source=c:.t a=1 b=2");
+    assertNotEquals(null, tree);
+  }
+
+  @Test
+  public void testSearchCommandCrossClusterQualifiedShouldPass() {
+    ParseTree tree = new PPLSyntaxParser().parse("search source=c:t.u a=1 b=2");
+    assertNotEquals(null, tree);
+  }
+
+  @Test
+  public void testSearchCommandCrossClusterHiddenQualifiedShouldPass() {
+    ParseTree tree = new PPLSyntaxParser().parse("search source=c:.t.u a=1 b=2");
+    assertNotEquals(null, tree);
+  }
+
+  @Test
+  public void testSearchCommandMatchAllCrossClusterShouldPass() {
+    ParseTree tree = new PPLSyntaxParser().parse("search source=*:t a=1 b=2");
+    assertNotEquals(null, tree);
+  }
+
+  @Test
+  public void testSearchCommandCrossClusterWithMultipleIndicesShouldPass() {
+    ParseTree tree = new PPLSyntaxParser().parse("search source=c:t,d:u,v a=1 b=2");
+    assertNotEquals(null, tree);
+  }
+
+  @Test
+  public void testSearchCommandCrossClusterIgnoreSearchKeywordShouldPass() {
+    ParseTree tree = new PPLSyntaxParser().parse("source=c:t a=1 b=2");
+    assertNotEquals(null, tree);
+  }
+
   @Test
   public void testSearchFieldsCommandShouldPass() {
     ParseTree tree = new PPLSyntaxParser().parse("search source=t a=1 b=2 | fields a,b");
     assertNotEquals(null, tree);
   }
 
+  @Test
+  public void testSearchFieldsCommandCrossClusterShouldPass() {
+    ParseTree tree = new PPLSyntaxParser().parse("search source=c:t a=1 b=2 | fields a,b");
+    assertNotEquals(null, tree);
+  }
+
   @Test
   public void testSearchCommandWithoutSourceShouldFail() {
     exceptionRule.expect(RuntimeException.class);
@@ -81,102 +137,174 @@ public void testTopCommandWithoutNAndGroupByShouldPass() {
   }
 
   @Test
-  public void can_parse_multi_match_relevance_function() {
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match(['address'], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match(['address', 'notes'], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match([\"*\"], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match([\"address\"], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match([`address`], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match([address], 'query')"));
-
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match(['address' ^ 1.0, 'notes' ^ 2.2], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match(['address' ^ 1.1, 'notes'], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match(['address', 'notes' ^ 1.5], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match(['address', 'notes' 3], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match(['address' ^ .3, 'notes' 3], 'query')"));
-
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE multi_match([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query',"
-            + "analyzer=keyword, quote_field_suffix=\".exact\", fuzzy_prefix_length = 4)"));
-  }
-
-  @Test
-  public void can_parse_simple_query_string_relevance_function() {
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string(['address'], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string(['address', 'notes'], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string([\"*\"], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string([\"address\"], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string([`address`], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string([address], 'query')"));
-
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string(['address' ^ 1.0, 'notes' ^ 2.2], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string(['address' ^ 1.1, 'notes'], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string(['address', 'notes' ^ 1.5], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string(['address', 'notes' 3], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string(['address' ^ .3, 'notes' 3], 'query')"));
-
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE simple_query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query',"
-            + "analyzer=keyword, quote_field_suffix=\".exact\", fuzzy_prefix_length = 4)"));
-  }
-
-  @Test
-  public void can_parse_query_string_relevance_function() {
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string(['address'], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string(['address', 'notes'], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string([\"*\"], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string([\"address\"], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string([`address`], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string([address], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string(['address' ^ 1.0, 'notes' ^ 2.2], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string(['address' ^ 1.1, 'notes'], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string(['address', 'notes' ^ 1.5], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string(['address', 'notes' 3], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string(['address' ^ .3, 'notes' 3], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query')"));
-    assertNotEquals(null, new PPLSyntaxParser().parse(
-        "SOURCE=test | WHERE query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query',"
-            + "analyzer=keyword, quote_field_suffix=\".exact\", fuzzy_prefix_length = 4)"));
+  public void testCanParseMultiMatchRelevanceFunction() {
+    assertNotEquals(
+        null, new PPLSyntaxParser().parse("SOURCE=test | WHERE multi_match(['address'], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE multi_match(['address', 'notes'], 'query')"));
+    assertNotEquals(
+        null, new PPLSyntaxParser().parse("SOURCE=test | WHERE multi_match([\"*\"], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser().parse("SOURCE=test | WHERE multi_match([\"address\"], 'query')"));
+    assertNotEquals(
+        null, new PPLSyntaxParser().parse("SOURCE=test | WHERE multi_match([`address`], 'query')"));
+    assertNotEquals(
+        null, new PPLSyntaxParser().parse("SOURCE=test | WHERE multi_match([address], 'query')"));
+
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE multi_match(['address' ^ 1.0, 'notes' ^ 2.2], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE multi_match(['address' ^ 1.1, 'notes'], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE multi_match(['address', 'notes' ^ 1.5], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE multi_match(['address', 'notes' 3], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE multi_match(['address' ^ .3, 'notes' 3], 'query')"));
+
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse(
+                "SOURCE=test | WHERE multi_match([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse(
+                "SOURCE=test | WHERE multi_match([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query',"
+                    + "analyzer=keyword, quote_field_suffix=\".exact\", fuzzy_prefix_length = 4)"));
+  }
+
+  @Test
+  public void testCanParseSimpleQueryStringRelevanceFunction() {
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE simple_query_string(['address'], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE simple_query_string(['address', 'notes'], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser().parse("SOURCE=test | WHERE simple_query_string([\"*\"], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE simple_query_string([\"address\"], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE simple_query_string([`address`], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser().parse("SOURCE=test | WHERE simple_query_string([address], 'query')"));
+
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse(
+                "SOURCE=test | WHERE simple_query_string(['address' ^ 1.0, 'notes' ^ 2.2],"
+                    + " 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE simple_query_string(['address' ^ 1.1, 'notes'], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE simple_query_string(['address', 'notes' ^ 1.5], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE simple_query_string(['address', 'notes' 3], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse(
+                "SOURCE=test | WHERE simple_query_string(['address' ^ .3, 'notes' 3], 'query')"));
+
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse(
+                "SOURCE=test | WHERE simple_query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2],"
+                    + " 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse(
+                "SOURCE=test | WHERE simple_query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2],"
+                    + " 'query',analyzer=keyword, quote_field_suffix=\".exact\","
+                    + " fuzzy_prefix_length = 4)"));
+  }
+
+  @Test
+  public void testCanParseQueryStringRelevanceFunction() {
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser().parse("SOURCE=test | WHERE query_string(['address'], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE query_string(['address', 'notes'], 'query')"));
+    assertNotEquals(
+        null, new PPLSyntaxParser().parse("SOURCE=test | WHERE query_string([\"*\"], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser().parse("SOURCE=test | WHERE query_string([\"address\"], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser().parse("SOURCE=test | WHERE query_string([`address`], 'query')"));
+    assertNotEquals(
+        null, new PPLSyntaxParser().parse("SOURCE=test | WHERE query_string([address], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE query_string(['address' ^ 1.0, 'notes' ^ 2.2], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE query_string(['address' ^ 1.1, 'notes'], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE query_string(['address', 'notes' ^ 1.5], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE query_string(['address', 'notes' 3], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | WHERE query_string(['address' ^ .3, 'notes' 3], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse(
+                "SOURCE=test | WHERE query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query')"));
+    assertNotEquals(
+        null,
+        new PPLSyntaxParser()
+            .parse(
+                "SOURCE=test | WHERE query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query',"
+                    + "analyzer=keyword, quote_field_suffix=\".exact\", fuzzy_prefix_length = 4)"));
   }
 
+  @Test
   public void testDescribeCommandShouldPass() {
     ParseTree tree = new PPLSyntaxParser().parse("describe t");
     assertNotEquals(null, tree);
@@ -188,6 +316,18 @@ public void testDescribeCommandWithMultipleIndicesShouldPass() {
     assertNotEquals(null, tree);
   }
 
+  @Test
+  public void testDescribeCommandCrossClusterShouldPass() {
+    ParseTree tree = new PPLSyntaxParser().parse("describe c:t");
+    assertNotEquals(null, tree);
+  }
+
+  @Test
+  public void testDescribeCommandMatchAllCrossClusterShouldPass() {
+    ParseTree tree = new PPLSyntaxParser().parse("describe *:t");
+    assertNotEquals(null, tree);
+  }
+
   @Test
   public void testDescribeFieldsCommandShouldPass() {
     ParseTree tree = new PPLSyntaxParser().parse("describe t | fields a,b");
@@ -201,5 +341,80 @@ public void testDescribeCommandWithSourceShouldFail() {
 
     new PPLSyntaxParser().parse("describe source=t");
   }
-}
 
+  @Test
+  public void testCanParseExtractFunction() {
+    String[] parts =
+        List.of(
+                "MICROSECOND",
+                "SECOND",
+                "MINUTE",
+                "HOUR",
+                "DAY",
+                "WEEK",
+                "MONTH",
+                "QUARTER",
+                "YEAR",
+                "SECOND_MICROSECOND",
+                "MINUTE_MICROSECOND",
+                "MINUTE_SECOND",
+                "HOUR_MICROSECOND",
+                "HOUR_SECOND",
+                "HOUR_MINUTE",
+                "DAY_MICROSECOND",
+                "DAY_SECOND",
+                "DAY_MINUTE",
+                "DAY_HOUR",
+                "YEAR_MONTH")
+            .toArray(new String[0]);
+
+    for (String part : parts) {
+      assertNotNull(
+          new PPLSyntaxParser()
+              .parse(
+                  String.format("SOURCE=test | eval k = extract(%s FROM \"2023-02-06\")", part)));
+    }
+  }
+
+  @Test
+  public void testCanParseGetFormatFunction() {
+    String[] types = {"DATE", "DATETIME", "TIME", "TIMESTAMP"};
+    String[] formats = {"'USA'", "'JIS'", "'ISO'", "'EUR'", "'INTERNAL'"};
+
+    for (String type : types) {
+      for (String format : formats) {
+        assertNotNull(
+            new PPLSyntaxParser()
+                .parse(String.format("SOURCE=test | eval k = get_format(%s, %s)", type, format)));
+      }
+    }
+  }
+
+  @Test
+  public void testCannotParseGetFormatFunctionWithBadArg() {
+    assertThrows(
+        SyntaxCheckException.class,
+        () ->
+            new PPLSyntaxParser()
+                .parse("SOURCE=test | eval k = GET_FORMAT(NONSENSE_ARG,'INTERNAL')"));
+  }
+
+  @Test
+  public void testCanParseTimestampaddFunction() {
+    assertNotNull(
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | eval k = TIMESTAMPADD(MINUTE, 1, '2003-01-02')"));
+    assertNotNull(
+        new PPLSyntaxParser().parse("SOURCE=test | eval k = TIMESTAMPADD(WEEK,1,'2003-01-02')"));
+  }
+
+  @Test
+  public void testCanParseTimestampdiffFunction() {
+    assertNotNull(
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | eval k = TIMESTAMPDIFF(MINUTE, '2003-01-02', '2003-01-02')"));
+    assertNotNull(
+        new PPLSyntaxParser()
+            .parse("SOURCE=test | eval k = TIMESTAMPDIFF(WEEK,'2003-01-02','2003-01-02')"));
+  }
+}
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/domain/PPLQueryRequestTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/domain/PPLQueryRequestTest.java
index b53656e252..29e6ff3298 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/domain/PPLQueryRequestTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/domain/PPLQueryRequestTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.domain;
 
 import static org.junit.Assert.assertEquals;
@@ -16,8 +15,7 @@
 
 public class PPLQueryRequestTest {
 
-  @Rule
-  public ExpectedException exceptionRule = ExpectedException.none();
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
   @Test
   public void getRequestShouldPass() {
@@ -27,40 +25,34 @@ public void getRequestShouldPass() {
 
   @Test
   public void testExplainRequest() {
-    PPLQueryRequest request = new PPLQueryRequest(
-        "source=t a=1", null, "/_plugins/_ppl/_explain");
+    PPLQueryRequest request = new PPLQueryRequest("source=t a=1", null, "/_plugins/_ppl/_explain");
     assertTrue(request.isExplainRequest());
   }
 
   @Test
   public void testDefaultFormat() {
-    PPLQueryRequest request = new PPLQueryRequest(
-        "source=test", null, "/_plugins/_ppl");
+    PPLQueryRequest request = new PPLQueryRequest("source=test", null, "/_plugins/_ppl");
     assertEquals(request.format(), Format.JDBC);
   }
 
   @Test
   public void testJDBCFormat() {
-    PPLQueryRequest request = new PPLQueryRequest(
-        "source=test", null, "/_plugins/_ppl", "jdbc");
+    PPLQueryRequest request = new PPLQueryRequest("source=test", null, "/_plugins/_ppl", "jdbc");
     assertEquals(request.format(), Format.JDBC);
   }
 
   @Test
   public void testCSVFormat() {
-    PPLQueryRequest request = new PPLQueryRequest(
-        "source=test", null, "/_plugins/_ppl", "csv");
+    PPLQueryRequest request = new PPLQueryRequest("source=test", null, "/_plugins/_ppl", "csv");
     assertEquals(request.format(), Format.CSV);
   }
 
   @Test
   public void testUnsupportedFormat() {
     String format = "notsupport";
-    PPLQueryRequest request = new PPLQueryRequest(
-            "source=test", null, "/_plugins/_ppl", format);
+    PPLQueryRequest request = new PPLQueryRequest("source=test", null, "/_plugins/_ppl", format);
     exceptionRule.expect(IllegalArgumentException.class);
     exceptionRule.expectMessage("response in " + format + " format is not supported.");
     request.format();
   }
-
 }
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/domain/PPLQueryResponseTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/domain/PPLQueryResponseTest.java
index 03eaaf22f4..50be4efa2e 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/domain/PPLQueryResponseTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/domain/PPLQueryResponseTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.domain;
 
 import org.junit.Test;
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstBuilderTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstBuilderTest.java
index 533254a599..ced266ed78 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstBuilderTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstBuilderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.parser;
 
 import static java.util.Collections.emptyList;
@@ -62,325 +61,284 @@
 
 public class AstBuilderTest {
 
-  @Rule
-  public ExpectedException exceptionRule = ExpectedException.none();
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
   private PPLSyntaxParser parser = new PPLSyntaxParser();
 
   @Test
   public void testSearchCommand() {
-    assertEqual("search source=t a=1",
-        filter(
-            relation("t"),
-            compare("=", field("a"), intLiteral(1))
-        )
-    );
+    assertEqual(
+        "search source=t a=1", filter(relation("t"), compare("=", field("a"), intLiteral(1))));
+  }
+
+  @Test
+  public void testSearchCrossClusterCommand() {
+    assertEqual("search source=c:t", relation(qualifiedName("c:t")));
+  }
+
+  @Test
+  public void testSearchMatchAllCrossClusterCommand() {
+    assertEqual("search source=*:t", relation(qualifiedName("*:t")));
   }
 
   @Test
   public void testPrometheusSearchCommand() {
-    assertEqual("search source = prometheus.http_requests_total",
-        relation(qualifiedName("prometheus", "http_requests_total"))
-    );
+    assertEqual(
+        "search source = prometheus.http_requests_total",
+        relation(qualifiedName("prometheus", "http_requests_total")));
   }
 
   @Test
   public void testSearchCommandWithDataSourceEscape() {
-    assertEqual("search source = `prometheus.http_requests_total`",
-        relation("prometheus.http_requests_total")
-    );
+    assertEqual(
+        "search source = `prometheus.http_requests_total`",
+        relation("prometheus.http_requests_total"));
   }
 
   @Test
   public void testSearchCommandWithDotInIndexName() {
-    assertEqual("search source = http_requests_total.test",
-        relation(qualifiedName("http_requests_total","test"))
-    );
+    assertEqual(
+        "search source = http_requests_total.test",
+        relation(qualifiedName("http_requests_total", "test")));
   }
 
-  @Ignore
   @Test
   public void testSearchWithPrometheusQueryRangeWithPositionedArguments() {
-    assertEqual("search source = prometheus.query_range(\"test{code='200'}\",1234, 12345, 3)",
-        tableFunction(Arrays.asList("prometheus", "query_range"),
+    assertEqual(
+        "search source = prometheus.query_range(\"test{code='200'}\",1234, 12345, 3)",
+        tableFunction(
+            Arrays.asList("prometheus", "query_range"),
             unresolvedArg(null, stringLiteral("test{code='200'}")),
             unresolvedArg(null, intLiteral(1234)),
             unresolvedArg(null, intLiteral(12345)),
-            unresolvedArg(null, intLiteral(3))
-    ));
+            unresolvedArg(null, intLiteral(3))));
   }
 
-  @Ignore
   @Test
   public void testSearchWithPrometheusQueryRangeWithNamedArguments() {
-    assertEqual("search source = prometheus.query_range(query = \"test{code='200'}\", "
+    assertEqual(
+        "search source = prometheus.query_range(query = \"test{code='200'}\", "
             + "starttime = 1234, step=3, endtime=12345)",
-        tableFunction(Arrays.asList("prometheus", "query_range"),
+        tableFunction(
+            Arrays.asList("prometheus", "query_range"),
             unresolvedArg("query", stringLiteral("test{code='200'}")),
             unresolvedArg("starttime", intLiteral(1234)),
             unresolvedArg("step", intLiteral(3)),
-            unresolvedArg("endtime", intLiteral(12345))
-        ));
+            unresolvedArg("endtime", intLiteral(12345))));
   }
 
   @Test
   public void testSearchCommandString() {
-    assertEqual("search source=t a=\"a\"",
-        filter(
-            relation("t"),
-            compare("=", field("a"), stringLiteral("a"))
-        )
-    );
+    assertEqual(
+        "search source=t a=\"a\"",
+        filter(relation("t"), compare("=", field("a"), stringLiteral("a"))));
   }
 
   @Test
   public void testSearchCommandWithoutSearch() {
-    assertEqual("source=t a=1",
-        filter(
-            relation("t"),
-            compare("=", field("a"), intLiteral(1))
-        )
-    );
+    assertEqual("source=t a=1", filter(relation("t"), compare("=", field("a"), intLiteral(1))));
   }
 
   @Test
   public void testSearchCommandWithFilterBeforeSource() {
-    assertEqual("search a=1 source=t",
-        filter(
-            relation("t"),
-            compare("=", field("a"), intLiteral(1))
-        ));
+    assertEqual(
+        "search a=1 source=t", filter(relation("t"), compare("=", field("a"), intLiteral(1))));
   }
 
   @Test
   public void testWhereCommand() {
-    assertEqual("search source=t | where a=1",
-        filter(
-            relation("t"),
-            compare("=", field("a"), intLiteral(1))
-        )
-    );
+    assertEqual(
+        "search source=t | where a=1",
+        filter(relation("t"), compare("=", field("a"), intLiteral(1))));
   }
 
   @Test
   public void testWhereCommandWithQualifiedName() {
-    assertEqual("search source=t | where a.v=1",
-        filter(
-            relation("t"),
-            compare("=", field(qualifiedName("a", "v")), intLiteral(1))
-        )
-    );
+    assertEqual(
+        "search source=t | where a.v=1",
+        filter(relation("t"), compare("=", field(qualifiedName("a", "v")), intLiteral(1))));
   }
 
   @Test
   public void testFieldsCommandWithoutArguments() {
-    assertEqual("source=t | fields f, g",
-        projectWithArg(
-            relation("t"),
-            defaultFieldsArgs(),
-            field("f"), field("g")
-        ));
+    assertEqual(
+        "source=t | fields f, g",
+        projectWithArg(relation("t"), defaultFieldsArgs(), field("f"), field("g")));
   }
 
   @Test
   public void testFieldsCommandWithIncludeArguments() {
-    assertEqual("source=t | fields + f, g",
-        projectWithArg(
-            relation("t"),
-            defaultFieldsArgs(),
-            field("f"), field("g")
-        ));
+    assertEqual(
+        "source=t | fields + f, g",
+        projectWithArg(relation("t"), defaultFieldsArgs(), field("f"), field("g")));
   }
 
   @Test
   public void testFieldsCommandWithExcludeArguments() {
-    assertEqual("source=t | fields - f, g",
+    assertEqual(
+        "source=t | fields - f, g",
         projectWithArg(
             relation("t"),
             exprList(argument("exclude", booleanLiteral(true))),
-            field("f"), field("g")
-        ));
+            field("f"),
+            field("g")));
   }
 
   @Test
   public void testSearchCommandWithQualifiedName() {
-    assertEqual("source=t | fields f.v, g.v",
+    assertEqual(
+        "source=t | fields f.v, g.v",
         projectWithArg(
             relation("t"),
             defaultFieldsArgs(),
-            field(qualifiedName("f", "v")), field(qualifiedName("g", "v"))
-        ));
+            field(qualifiedName("f", "v")),
+            field(qualifiedName("g", "v"))));
   }
 
   @Test
   public void testRenameCommand() {
-    assertEqual("source=t | rename f as g",
-        rename(
-            relation("t"),
-            map("f", "g")
-        ));
+    assertEqual("source=t | rename f as g", rename(relation("t"), map("f", "g")));
   }
 
   @Test
   public void testRenameCommandWithMultiFields() {
-    assertEqual("source=t | rename f as g, h as i, j as k",
-        rename(
-            relation("t"),
-            map("f", "g"),
-            map("h", "i"),
-            map("j", "k")
-        ));
+    assertEqual(
+        "source=t | rename f as g, h as i, j as k",
+        rename(relation("t"), map("f", "g"), map("h", "i"), map("j", "k")));
   }
 
   @Test
   public void testStatsCommand() {
-    assertEqual("source=t | stats count(a)",
+    assertEqual(
+        "source=t | stats count(a)",
         agg(
             relation("t"),
-            exprList(
-                alias(
-                    "count(a)",
-                    aggregate("count", field("a"))
-                )
-            ),
+            exprList(alias("count(a)", aggregate("count", field("a")))),
             emptyList(),
             emptyList(),
-            defaultStatsArgs()
-        ));
+            defaultStatsArgs()));
   }
 
   @Test
   public void testStatsCommandWithByClause() {
-    assertEqual("source=t | stats count(a) by b DEDUP_SPLITVALUES=false",
+    assertEqual(
+        "source=t | stats count(a) by b DEDUP_SPLITVALUES=false",
         agg(
             relation("t"),
-            exprList(
-                alias(
-                    "count(a)",
-                    aggregate("count", field("a"))
-                )
-            ),
+            exprList(alias("count(a)", aggregate("count", field("a")))),
             emptyList(),
-            exprList(
-                alias(
-                    "b",
-                    field("b")
-                )),
-            defaultStatsArgs()
-        ));
+            exprList(alias("b", field("b"))),
+            defaultStatsArgs()));
+  }
+
+  @Test
+  public void testStatsCommandWithByClauseInBackticks() {
+    assertEqual(
+        "source=t | stats count(a) by `b` DEDUP_SPLITVALUES=false",
+        agg(
+            relation("t"),
+            exprList(alias("count(a)", aggregate("count", field("a")))),
+            emptyList(),
+            exprList(alias("b", field("b"))),
+            defaultStatsArgs()));
   }
 
   @Test
   public void testStatsCommandWithAlias() {
-    assertEqual("source=t | stats count(a) as alias",
+    assertEqual(
+        "source=t | stats count(a) as alias",
         agg(
             relation("t"),
-            exprList(
-                alias(
-                    "alias",
-                    aggregate("count", field("a"))
-                )
-            ),
+            exprList(alias("alias", aggregate("count", field("a")))),
             emptyList(),
             emptyList(),
-            defaultStatsArgs()
-        )
-    );
+            defaultStatsArgs()));
   }
 
   @Test
   public void testStatsCommandWithNestedFunctions() {
-    assertEqual("source=t | stats sum(a+b)",
+    assertEqual(
+        "source=t | stats sum(a+b)",
         agg(
             relation("t"),
-            exprList(
-                alias(
-                    "sum(a+b)",
-                    aggregate(
-                        "sum",
-                        function("+", field("a"), field("b"))
-                    ))
-            ),
+            exprList(alias("sum(a+b)", aggregate("sum", function("+", field("a"), field("b"))))),
             emptyList(),
             emptyList(),
-            defaultStatsArgs()
-        ));
-    assertEqual("source=t | stats sum(abs(a)/2)",
+            defaultStatsArgs()));
+    assertEqual(
+        "source=t | stats sum(abs(a)/2)",
         agg(
             relation("t"),
             exprList(
                 alias(
                     "sum(abs(a)/2)",
-                    aggregate(
-                        "sum",
-                        function(
-                            "/",
-                            function("abs", field("a")),
-                            intLiteral(2)
-                        )
-                    )
-                )
-            ),
+                    aggregate("sum", function("/", function("abs", field("a")), intLiteral(2))))),
             emptyList(),
             emptyList(),
-            defaultStatsArgs()
-        ));
+            defaultStatsArgs()));
   }
 
   @Test
   public void testStatsCommandWithSpan() {
-    assertEqual("source=t | stats avg(price) by span(timestamp, 1h)",
+    assertEqual(
+        "source=t | stats avg(price) by span(timestamp, 1h)",
         agg(
             relation("t"),
-            exprList(
-                alias("avg(price)", aggregate("avg", field("price")))
-            ),
+            exprList(alias("avg(price)", aggregate("avg", field("price")))),
             emptyList(),
             emptyList(),
             alias("span(timestamp,1h)", span(field("timestamp"), intLiteral(1), SpanUnit.H)),
-            defaultStatsArgs()
-        ));
+            defaultStatsArgs()));
 
-    assertEqual("source=t | stats count(a) by span(age, 10)",
+    assertEqual(
+        "source=t | stats count(a) by span(age, 10)",
         agg(
             relation("t"),
-            exprList(
-                alias("count(a)", aggregate("count", field("a")))
-            ),
+            exprList(alias("count(a)", aggregate("count", field("a")))),
             emptyList(),
             emptyList(),
             alias("span(age,10)", span(field("age"), intLiteral(10), SpanUnit.NONE)),
-            defaultStatsArgs()
-        ));
+            defaultStatsArgs()));
 
-    assertEqual("source=t | stats avg(price) by span(timestamp, 1h), b",
+    assertEqual(
+        "source=t | stats avg(price) by span(timestamp, 1h), b",
         agg(
             relation("t"),
-            exprList(
-                alias("avg(price)", aggregate("avg", field("price")))
-            ),
+            exprList(alias("avg(price)", aggregate("avg", field("price")))),
             emptyList(),
             exprList(alias("b", field("b"))),
             alias("span(timestamp,1h)", span(field("timestamp"), intLiteral(1), SpanUnit.H)),
-            defaultStatsArgs()
-        ));
+            defaultStatsArgs()));
 
-    assertEqual("source=t | stats avg(price) by span(timestamp, 1h), f1, f2",
+    assertEqual(
+        "source=t | stats avg(price) by span(timestamp, 1h), f1, f2",
         agg(
             relation("t"),
-            exprList(
-                alias("avg(price)", aggregate("avg", field("price")))
-            ),
+            exprList(alias("avg(price)", aggregate("avg", field("price")))),
             emptyList(),
             exprList(alias("f1", field("f1")), alias("f2", field("f2"))),
             alias("span(timestamp,1h)", span(field("timestamp"), intLiteral(1), SpanUnit.H)),
-            defaultStatsArgs()
-        ));
-  }
+            defaultStatsArgs()));
 
-  @Test(expected = org.opensearch.sql.common.antlr.SyntaxCheckException.class)
-  public void throwExceptionIfSpanInGroupByList() {
-    plan("source=t | stats avg(price) by f1, f2, span(timestamp, 1h)");
+    assertEqual(
+        "source=t | stats avg(price) by b, span(timestamp, 1h)",
+        agg(
+            relation("t"),
+            exprList(alias("avg(price)", aggregate("avg", field("price")))),
+            emptyList(),
+            exprList(alias("b", field("b"))),
+            alias("span(timestamp,1h)", span(field("timestamp"), intLiteral(1), SpanUnit.H)),
+            defaultStatsArgs()));
+
+    assertEqual(
+        "source=t | stats avg(price) by f1, f2, span(timestamp, 1h)",
+        agg(
+            relation("t"),
+            exprList(alias("avg(price)", aggregate("avg", field("price")))),
+            emptyList(),
+            exprList(alias("f1", field("f1")), alias("f2", field("f2"))),
+            alias("span(timestamp,1h)", span(field("timestamp"), intLiteral(1), SpanUnit.H)),
+            defaultStatsArgs()));
   }
 
   @Test(expected = org.opensearch.sql.common.antlr.SyntaxCheckException.class)
@@ -390,152 +348,128 @@ public void throwExceptionWithEmptyGroupByList() {
 
   @Test
   public void testStatsSpanWithAlias() {
-    assertEqual("source=t | stats avg(price) by span(timestamp, 1h) as time_span",
+    assertEqual(
+        "source=t | stats avg(price) by span(timestamp, 1h) as time_span",
         agg(
             relation("t"),
-            exprList(
-                alias("avg(price)", aggregate("avg", field("price")))
-            ),
+            exprList(alias("avg(price)", aggregate("avg", field("price")))),
             emptyList(),
             emptyList(),
-            alias("span(timestamp,1h)", span(
-                field("timestamp"), intLiteral(1), SpanUnit.H), "time_span"),
-            defaultStatsArgs()
-        ));
+            alias(
+                "span(timestamp,1h)",
+                span(field("timestamp"), intLiteral(1), SpanUnit.H),
+                "time_span"),
+            defaultStatsArgs()));
 
-    assertEqual("source=t | stats count(a) by span(age, 10) as numeric_span",
+    assertEqual(
+        "source=t | stats count(a) by span(age, 10) as numeric_span",
         agg(
             relation("t"),
-            exprList(
-                alias("count(a)", aggregate("count", field("a")))
-            ),
+            exprList(alias("count(a)", aggregate("count", field("a")))),
             emptyList(),
             emptyList(),
-            alias("span(age,10)", span(
-                field("age"), intLiteral(10), SpanUnit.NONE), "numeric_span"),
-            defaultStatsArgs()
-        ));
+            alias(
+                "span(age,10)", span(field("age"), intLiteral(10), SpanUnit.NONE), "numeric_span"),
+            defaultStatsArgs()));
   }
 
   @Test
   public void testDedupCommand() {
-    assertEqual("source=t | dedup f1, f2",
-        dedupe(
-            relation("t"),
-            defaultDedupArgs(),
-            field("f1"), field("f2")
-        ));
+    assertEqual(
+        "source=t | dedup f1, f2",
+        dedupe(relation("t"), defaultDedupArgs(), field("f1"), field("f2")));
   }
 
-  /**
-   * disable sortby from the dedup command syntax.
-   */
+  /** disable sortby from the dedup command syntax. */
   @Ignore(value = "disable sortby from the dedup command syntax")
   public void testDedupCommandWithSortby() {
-    assertEqual("source=t | dedup f1, f2 sortby f3",
+    assertEqual(
+        "source=t | dedup f1, f2 sortby f3",
         agg(
             relation("t"),
             exprList(field("f1"), field("f2")),
             exprList(field("f3", defaultSortFieldArgs())),
             null,
-            defaultDedupArgs()
-        ));
+            defaultDedupArgs()));
   }
 
   @Test
   public void testHeadCommand() {
-    assertEqual("source=t | head",
-        head(relation("t"), 10, 0));
+    assertEqual("source=t | head", head(relation("t"), 10, 0));
   }
 
   @Test
   public void testHeadCommandWithNumber() {
-    assertEqual("source=t | head 3",
-        head(relation("t"), 3, 0));
+    assertEqual("source=t | head 3", head(relation("t"), 3, 0));
   }
 
   @Test
   public void testHeadCommandWithNumberAndOffset() {
-    assertEqual("source=t | head 3 from 4",
-        head(relation("t"), 3, 4));
+    assertEqual("source=t | head 3 from 4", head(relation("t"), 3, 4));
   }
 
   @Test
   public void testSortCommand() {
-    assertEqual("source=t | sort f1, f2",
+    assertEqual(
+        "source=t | sort f1, f2",
         sort(
             relation("t"),
             field("f1", defaultSortFieldArgs()),
-            field("f2", defaultSortFieldArgs())
-        ));
+            field("f2", defaultSortFieldArgs())));
   }
 
   @Test
   public void testSortCommandWithOptions() {
-    assertEqual("source=t | sort - f1, + f2",
+    assertEqual(
+        "source=t | sort - f1, + f2",
         sort(
             relation("t"),
-            field("f1", exprList(argument("asc", booleanLiteral(false)),
-                argument("type", nullLiteral()))),
-            field("f2", defaultSortFieldArgs())
-        ));
+            field(
+                "f1",
+                exprList(argument("asc", booleanLiteral(false)), argument("type", nullLiteral()))),
+            field("f2", defaultSortFieldArgs())));
   }
 
   @Test
   public void testEvalCommand() {
-    assertEqual("source=t | eval r=abs(f)",
-        eval(
-            relation("t"),
-            let(
-                field("r"),
-                function("abs", field("f"))
-            )
-        ));
+    assertEqual(
+        "source=t | eval r=abs(f)",
+        eval(relation("t"), let(field("r"), function("abs", field("f")))));
   }
 
   @Test
   public void testIndexName() {
-    assertEqual("source=`log.2020.04.20.` a=1",
-        filter(
-            relation("log.2020.04.20."),
-            compare("=", field("a"), intLiteral(1))
-        ));
-    assertEqual("describe `log.2020.04.20.`",
-        relation(mappingTable("log.2020.04.20.")));
+    assertEqual(
+        "source=`log.2020.04.20.` a=1",
+        filter(relation("log.2020.04.20."), compare("=", field("a"), intLiteral(1))));
+    assertEqual("describe `log.2020.04.20.`", relation(mappingTable("log.2020.04.20.")));
   }
 
   @Test
   public void testIdentifierAsIndexNameStartWithDot() {
-    assertEqual("source=.opensearch_dashboards",
-        relation(".opensearch_dashboards"));
-    assertEqual("describe .opensearch_dashboards",
-        relation(mappingTable(".opensearch_dashboards")));
+    assertEqual("source=.opensearch_dashboards", relation(".opensearch_dashboards"));
+    assertEqual(
+        "describe .opensearch_dashboards", relation(mappingTable(".opensearch_dashboards")));
   }
 
   @Test
   public void testIdentifierAsIndexNameWithDotInTheMiddle() {
     assertEqual("source=log.2020.10.10", relation("log.2020.10.10"));
     assertEqual("source=log-7.10-2020.10.10", relation("log-7.10-2020.10.10"));
-    assertEqual("describe log.2020.10.10",
-        relation(mappingTable("log.2020.10.10")));
-    assertEqual("describe log-7.10-2020.10.10",
-        relation(mappingTable("log-7.10-2020.10.10")));
+    assertEqual("describe log.2020.10.10", relation(mappingTable("log.2020.10.10")));
+    assertEqual("describe log-7.10-2020.10.10", relation(mappingTable("log-7.10-2020.10.10")));
   }
 
   @Test
   public void testIdentifierAsIndexNameWithSlashInTheMiddle() {
-    assertEqual("source=log-2020",
-        relation("log-2020"));
-    assertEqual("describe log-2020",
-        relation(mappingTable("log-2020")));
+    assertEqual("source=log-2020", relation("log-2020"));
+    assertEqual("describe log-2020", relation(mappingTable("log-2020")));
   }
 
   @Test
   public void testIdentifierAsIndexNameContainStar() {
-    assertEqual("source=log-2020-10-*",
-        relation("log-2020-10-*"));
-    assertEqual("describe log-2020-10-*",
-        relation(mappingTable("log-2020-10-*")));
+    assertEqual("source=log-2020-10-*", relation("log-2020-10-*"));
+    assertEqual("describe log-2020-10-*", relation(mappingTable("log-2020-10-*")));
   }
 
   @Test
@@ -543,138 +477,132 @@ public void testIdentifierAsIndexNameContainStarAndDots() {
     assertEqual("source=log-2020.10.*", relation("log-2020.10.*"));
     assertEqual("source=log-2020.*.01", relation("log-2020.*.01"));
     assertEqual("source=log-2020.*.*", relation("log-2020.*.*"));
-    assertEqual("describe log-2020.10.*",
-        relation(mappingTable("log-2020.10.*")));
-    assertEqual("describe log-2020.*.01",
-        relation(mappingTable("log-2020.*.01")));
-    assertEqual("describe log-2020.*.*",
-        relation(mappingTable("log-2020.*.*")));
+    assertEqual("describe log-2020.10.*", relation(mappingTable("log-2020.10.*")));
+    assertEqual("describe log-2020.*.01", relation(mappingTable("log-2020.*.01")));
+    assertEqual("describe log-2020.*.*", relation(mappingTable("log-2020.*.*")));
   }
 
   @Test
   public void testIdentifierAsFieldNameStartWithAt() {
-    assertEqual("source=log-2020 | fields @timestamp",
-        projectWithArg(
-            relation("log-2020"),
-            defaultFieldsArgs(),
-            field("@timestamp")
-        ));
+    assertEqual(
+        "source=log-2020 | fields @timestamp",
+        projectWithArg(relation("log-2020"), defaultFieldsArgs(), field("@timestamp")));
   }
 
   @Test
   public void testRareCommand() {
-    assertEqual("source=t | rare a",
+    assertEqual(
+        "source=t | rare a",
         rareTopN(
             relation("t"),
             CommandType.RARE,
             exprList(argument("noOfResults", intLiteral(10))),
             emptyList(),
-            field("a")
-        ));
+            field("a")));
   }
 
   @Test
   public void testRareCommandWithGroupBy() {
-    assertEqual("source=t | rare a by b",
+    assertEqual(
+        "source=t | rare a by b",
         rareTopN(
             relation("t"),
             CommandType.RARE,
             exprList(argument("noOfResults", intLiteral(10))),
             exprList(field("b")),
-            field("a")
-        ));
+            field("a")));
   }
 
   @Test
   public void testRareCommandWithMultipleFields() {
-    assertEqual("source=t | rare `a`, `b` by `c`",
+    assertEqual(
+        "source=t | rare `a`, `b` by `c`",
         rareTopN(
             relation("t"),
             CommandType.RARE,
             exprList(argument("noOfResults", intLiteral(10))),
             exprList(field("c")),
             field("a"),
-            field("b")
-        ));
+            field("b")));
   }
 
   @Test
   public void testTopCommandWithN() {
-    assertEqual("source=t | top 1 a",
+    assertEqual(
+        "source=t | top 1 a",
         rareTopN(
             relation("t"),
             CommandType.TOP,
             exprList(argument("noOfResults", intLiteral(1))),
             emptyList(),
-            field("a")
-        ));
+            field("a")));
   }
 
   @Test
   public void testTopCommandWithoutNAndGroupBy() {
-    assertEqual("source=t | top a",
+    assertEqual(
+        "source=t | top a",
         rareTopN(
             relation("t"),
             CommandType.TOP,
             exprList(argument("noOfResults", intLiteral(10))),
             emptyList(),
-            field("a")
-        ));
+            field("a")));
   }
 
   @Test
   public void testTopCommandWithNAndGroupBy() {
-    assertEqual("source=t | top 1 a by b",
+    assertEqual(
+        "source=t | top 1 a by b",
         rareTopN(
             relation("t"),
             CommandType.TOP,
             exprList(argument("noOfResults", intLiteral(1))),
             exprList(field("b")),
-            field("a")
-        ));
+            field("a")));
   }
 
   @Test
   public void testTopCommandWithMultipleFields() {
-    assertEqual("source=t | top 1 `a`, `b` by `c`",
+    assertEqual(
+        "source=t | top 1 `a`, `b` by `c`",
         rareTopN(
             relation("t"),
             CommandType.TOP,
             exprList(argument("noOfResults", intLiteral(1))),
             exprList(field("c")),
             field("a"),
-            field("b")
-        ));
+            field("b")));
   }
 
   @Test
   public void testGrokCommand() {
-    assertEqual("source=t | grok raw \"pattern\"",
+    assertEqual(
+        "source=t | grok raw \"pattern\"",
         parse(
             relation("t"),
             ParseMethod.GROK,
             field("raw"),
             stringLiteral("pattern"),
-            ImmutableMap.of()
-        ));
+            ImmutableMap.of()));
   }
 
   @Test
   public void testParseCommand() {
-    assertEqual("source=t | parse raw \"pattern\"",
+    assertEqual(
+        "source=t | parse raw \"pattern\"",
         parse(
             relation("t"),
             ParseMethod.REGEX,
             field("raw"),
             stringLiteral("pattern"),
-            ImmutableMap.of()
-        ));
+            ImmutableMap.of()));
   }
 
   @Test
   public void testPatternsCommand() {
-    assertEqual("source=t | patterns new_field=\"custom_field\" "
-            + "pattern=\"custom_pattern\" raw",
+    assertEqual(
+        "source=t | patterns new_field=\"custom_field\" " + "pattern=\"custom_pattern\" raw",
         parse(
             relation("t"),
             ParseMethod.PATTERNS,
@@ -683,8 +611,7 @@ public void testPatternsCommand() {
             ImmutableMap.<String, Literal>builder()
                 .put("new_field", stringLiteral("custom_field"))
                 .put("pattern", stringLiteral("custom_pattern"))
-                .build()
-        ));
+                .build()));
   }
 
   @Test
@@ -701,108 +628,118 @@ public void testPatternsCommandWithoutArguments() {
 
   @Test
   public void testKmeansCommand() {
-    assertEqual("source=t | kmeans centroids=3 iterations=2 distance_type='l1'",
-        new Kmeans(relation("t"), ImmutableMap.<String, Literal>builder()
-            .put("centroids", new Literal(3, DataType.INTEGER))
-            .put("iterations", new Literal(2, DataType.INTEGER))
-            .put("distance_type", new Literal("l1", DataType.STRING))
-            .build()
-        ));
+    assertEqual(
+        "source=t | kmeans centroids=3 iterations=2 distance_type='l1'",
+        new Kmeans(
+            relation("t"),
+            ImmutableMap.<String, Literal>builder()
+                .put("centroids", new Literal(3, DataType.INTEGER))
+                .put("iterations", new Literal(2, DataType.INTEGER))
+                .put("distance_type", new Literal("l1", DataType.STRING))
+                .build()));
   }
 
   @Test
   public void testKmeansCommandWithoutParameter() {
-    assertEqual("source=t | kmeans",
-        new Kmeans(relation("t"), ImmutableMap.of()));
+    assertEqual("source=t | kmeans", new Kmeans(relation("t"), ImmutableMap.of()));
   }
 
   @Test
   public void testMLCommand() {
-    assertEqual("source=t | ml action='trainandpredict' "
-                    + "algorithm='kmeans' centroid=3 iteration=2 dist_type='l1'",
-            new ML(relation("t"), ImmutableMap.<String, Literal>builder()
-                    .put("action", new Literal("trainandpredict", DataType.STRING))
-                    .put("algorithm", new Literal("kmeans", DataType.STRING))
-                    .put("centroid", new Literal(3, DataType.INTEGER))
-                    .put("iteration", new Literal(2, DataType.INTEGER))
-                    .put("dist_type", new Literal("l1", DataType.STRING))
-                    .build()
-            ));
+    assertEqual(
+        "source=t | ml action='trainandpredict' "
+            + "algorithm='kmeans' centroid=3 iteration=2 dist_type='l1'",
+        new ML(
+            relation("t"),
+            ImmutableMap.<String, Literal>builder()
+                .put("action", new Literal("trainandpredict", DataType.STRING))
+                .put("algorithm", new Literal("kmeans", DataType.STRING))
+                .put("centroid", new Literal(3, DataType.INTEGER))
+                .put("iteration", new Literal(2, DataType.INTEGER))
+                .put("dist_type", new Literal("l1", DataType.STRING))
+                .build()));
   }
 
   @Test
   public void testDescribeCommand() {
-    assertEqual("describe t",
-        relation(mappingTable("t")));
+    assertEqual("describe t", relation(mappingTable("t")));
+  }
+
+  @Test
+  public void testDescribeMatchAllCrossClusterSearchCommand() {
+    assertEqual("describe *:t", relation(mappingTable("*:t")));
   }
 
   @Test
   public void testDescribeCommandWithMultipleIndices() {
-    assertEqual("describe t,u",
-        relation(mappingTable("t,u")));
+    assertEqual("describe t,u", relation(mappingTable("t,u")));
   }
 
   @Test
   public void testDescribeCommandWithFullyQualifiedTableName() {
-    assertEqual("describe prometheus.http_metric",
+    assertEqual(
+        "describe prometheus.http_metric",
         relation(qualifiedName("prometheus", mappingTable("http_metric"))));
-    assertEqual("describe prometheus.schema.http_metric",
+    assertEqual(
+        "describe prometheus.schema.http_metric",
         relation(qualifiedName("prometheus", "schema", mappingTable("http_metric"))));
   }
 
   @Test
   public void test_fitRCFADCommand_withoutDataFormat() {
-    assertEqual("source=t | AD shingle_size=10 time_decay=0.0001 time_field='timestamp' "
+    assertEqual(
+        "source=t | AD shingle_size=10 time_decay=0.0001 time_field='timestamp' "
             + "anomaly_rate=0.1 anomaly_score_threshold=0.1 sample_size=256 "
             + "number_of_trees=256 time_zone='PST' output_after=256 "
             + "training_data_size=256",
-        new AD(relation("t"), ImmutableMap.<String, Literal>builder()
-            .put("anomaly_rate", new Literal(0.1, DataType.DOUBLE))
-            .put("anomaly_score_threshold", new Literal(0.1, DataType.DOUBLE))
-            .put("sample_size", new Literal(256, DataType.INTEGER))
-            .put("number_of_trees", new Literal(256, DataType.INTEGER))
-            .put("time_zone", new Literal("PST", DataType.STRING))
-            .put("output_after", new Literal(256, DataType.INTEGER))
-            .put("shingle_size", new Literal(10, DataType.INTEGER))
-            .put("time_decay", new Literal(0.0001, DataType.DOUBLE))
-            .put("time_field", new Literal("timestamp", DataType.STRING))
-            .put("training_data_size", new Literal(256, DataType.INTEGER))
-            .build()
-        ));
+        new AD(
+            relation("t"),
+            ImmutableMap.<String, Literal>builder()
+                .put("anomaly_rate", new Literal(0.1, DataType.DOUBLE))
+                .put("anomaly_score_threshold", new Literal(0.1, DataType.DOUBLE))
+                .put("sample_size", new Literal(256, DataType.INTEGER))
+                .put("number_of_trees", new Literal(256, DataType.INTEGER))
+                .put("time_zone", new Literal("PST", DataType.STRING))
+                .put("output_after", new Literal(256, DataType.INTEGER))
+                .put("shingle_size", new Literal(10, DataType.INTEGER))
+                .put("time_decay", new Literal(0.0001, DataType.DOUBLE))
+                .put("time_field", new Literal("timestamp", DataType.STRING))
+                .put("training_data_size", new Literal(256, DataType.INTEGER))
+                .build()));
   }
 
   @Test
   public void test_fitRCFADCommand_withDataFormat() {
-    assertEqual("source=t | AD shingle_size=10 time_decay=0.0001 time_field='timestamp' "
+    assertEqual(
+        "source=t | AD shingle_size=10 time_decay=0.0001 time_field='timestamp' "
             + "anomaly_rate=0.1 anomaly_score_threshold=0.1 sample_size=256 "
             + "number_of_trees=256 time_zone='PST' output_after=256 "
             + "training_data_size=256 date_format='HH:mm:ss yyyy-MM-dd'",
-        new AD(relation("t"), ImmutableMap.<String, Literal>builder()
-            .put("anomaly_rate", new Literal(0.1, DataType.DOUBLE))
-            .put("anomaly_score_threshold", new Literal(0.1, DataType.DOUBLE))
-            .put("sample_size", new Literal(256, DataType.INTEGER))
-            .put("number_of_trees", new Literal(256, DataType.INTEGER))
-            .put("date_format", new Literal("HH:mm:ss yyyy-MM-dd", DataType.STRING))
-            .put("time_zone", new Literal("PST", DataType.STRING))
-            .put("output_after", new Literal(256, DataType.INTEGER))
-            .put("shingle_size", new Literal(10, DataType.INTEGER))
-            .put("time_decay", new Literal(0.0001, DataType.DOUBLE))
-            .put("time_field", new Literal("timestamp", DataType.STRING))
-            .put("training_data_size", new Literal(256, DataType.INTEGER))
-            .build()
-        ));
+        new AD(
+            relation("t"),
+            ImmutableMap.<String, Literal>builder()
+                .put("anomaly_rate", new Literal(0.1, DataType.DOUBLE))
+                .put("anomaly_score_threshold", new Literal(0.1, DataType.DOUBLE))
+                .put("sample_size", new Literal(256, DataType.INTEGER))
+                .put("number_of_trees", new Literal(256, DataType.INTEGER))
+                .put("date_format", new Literal("HH:mm:ss yyyy-MM-dd", DataType.STRING))
+                .put("time_zone", new Literal("PST", DataType.STRING))
+                .put("output_after", new Literal(256, DataType.INTEGER))
+                .put("shingle_size", new Literal(10, DataType.INTEGER))
+                .put("time_decay", new Literal(0.0001, DataType.DOUBLE))
+                .put("time_field", new Literal("timestamp", DataType.STRING))
+                .put("training_data_size", new Literal(256, DataType.INTEGER))
+                .build()));
   }
 
   @Test
   public void test_batchRCFADCommand() {
-    assertEqual("source=t | AD",
-        new AD(relation("t"), ImmutableMap.of()));
+    assertEqual("source=t | AD", new AD(relation("t"), ImmutableMap.of()));
   }
 
   @Test
   public void testShowDataSourcesCommand() {
-    assertEqual("show datasources",
-        relation(DATASOURCES_TABLE_NAME));
+    assertEqual("show datasources", relation(DATASOURCES_TABLE_NAME));
   }
 
   protected void assertEqual(String query, Node expectedPlan) {
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstExpressionBuilderTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstExpressionBuilderTest.java
index dbdfb71aa7..596d8f34be 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstExpressionBuilderTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstExpressionBuilderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.parser;
 
 import static java.util.Collections.emptyList;
@@ -58,431 +57,457 @@ public class AstExpressionBuilderTest extends AstBuilderTest {
 
   @Test
   public void testLogicalNotExpr() {
-    assertEqual("source=t not a=1",
-        filter(
-            relation("t"),
-            not(
-                compare("=", field("a"), intLiteral(1))
-            )
-        ));
+    assertEqual(
+        "source=t not a=1", filter(relation("t"), not(compare("=", field("a"), intLiteral(1)))));
   }
 
   @Test
   public void testLogicalOrExpr() {
-    assertEqual("source=t a=1 or b=2",
+    assertEqual(
+        "source=t a=1 or b=2",
         filter(
             relation("t"),
-            or(
-                compare("=", field("a"), intLiteral(1)),
-                compare("=", field("b"), intLiteral(2))
-            )
-        ));
+            or(compare("=", field("a"), intLiteral(1)), compare("=", field("b"), intLiteral(2)))));
   }
 
   @Test
   public void testLogicalAndExpr() {
-    assertEqual("source=t a=1 and b=2",
+    assertEqual(
+        "source=t a=1 and b=2",
         filter(
             relation("t"),
-            and(
-                compare("=", field("a"), intLiteral(1)),
-                compare("=", field("b"), intLiteral(2))
-            )
-        ));
+            and(compare("=", field("a"), intLiteral(1)), compare("=", field("b"), intLiteral(2)))));
   }
 
   @Test
   public void testLogicalAndExprWithoutKeywordAnd() {
-    assertEqual("source=t a=1 b=2",
+    assertEqual(
+        "source=t a=1 b=2",
         filter(
             relation("t"),
-            and(
-                compare("=", field("a"), intLiteral(1)),
-                compare("=", field("b"), intLiteral(2))
-            )
-        ));
+            and(compare("=", field("a"), intLiteral(1)), compare("=", field("b"), intLiteral(2)))));
   }
 
   @Test
   public void testLogicalXorExpr() {
-    assertEqual("source=t a=1 xor b=2",
+    assertEqual(
+        "source=t a=1 xor b=2",
         filter(
             relation("t"),
-            xor(
-                compare("=", field("a"), intLiteral(1)),
-                compare("=", field("b"), intLiteral(2))
-            )
-        ));
+            xor(compare("=", field("a"), intLiteral(1)), compare("=", field("b"), intLiteral(2)))));
   }
 
   @Test
   public void testLogicalLikeExpr() {
-    assertEqual("source=t like(a, '_a%b%c_d_')",
-        filter(
-            relation("t"),
-            function("like", field("a"), stringLiteral("_a%b%c_d_"))
-        ));
+    assertEqual(
+        "source=t like(a, '_a%b%c_d_')",
+        filter(relation("t"), function("like", field("a"), stringLiteral("_a%b%c_d_"))));
   }
 
   @Test
   public void testBooleanIsNullFunction() {
-    assertEqual("source=t isnull(a)",
-        filter(
-            relation("t"),
-            function("is null", field("a"))
-        ));
+    assertEqual("source=t isnull(a)", filter(relation("t"), function("is null", field("a"))));
+    assertEqual("source=t ISNULL(a)", filter(relation("t"), function("is null", field("a"))));
   }
 
   @Test
   public void testBooleanIsNotNullFunction() {
-    assertEqual("source=t isnotnull(a)",
-        filter(
-            relation("t"),
-            function("is not null", field("a"))
-        ));
+    assertEqual(
+        "source=t isnotnull(a)", filter(relation("t"), function("is not null", field("a"))));
+    assertEqual(
+        "source=t ISNOTNULL(a)", filter(relation("t"), function("is not null", field("a"))));
   }
 
-  /**
-   * Todo. search operator should not include functionCall, need to change antlr.
-   */
+  /** Todo. search operator should not include functionCall, need to change antlr. */
   @Ignore("search operator should not include functionCall, need to change antlr")
   public void testEvalExpr() {
-    assertEqual("source=t f=abs(a)",
-        filter(
-            relation("t"),
-            equalTo(
-                field("f"),
-                function("abs", field("a"))
-            )
-        ));
+    assertEqual(
+        "source=t f=abs(a)",
+        filter(relation("t"), equalTo(field("f"), function("abs", field("a")))));
   }
 
   @Test
   public void testEvalFunctionExpr() {
-    assertEqual("source=t | eval f=abs(a)",
-        eval(
-            relation("t"),
-            let(
-                field("f"),
-                function("abs", field("a"))
-            )
-        ));
+    assertEqual(
+        "source=t | eval f=abs(a)",
+        eval(relation("t"), let(field("f"), function("abs", field("a")))));
   }
 
   @Test
   public void testEvalFunctionExprNoArgs() {
-    assertEqual("source=t | eval f=PI()",
+    assertEqual("source=t | eval f=PI()", eval(relation("t"), let(field("f"), function("PI"))));
+  }
+
+  @Test
+  public void testEvalIfFunctionExpr() {
+    assertEqual(
+        "source=t | eval f=if(true, 1, 0)",
+        eval(
+            relation("t"),
+            let(field("f"), function("if", booleanLiteral(true), intLiteral(1), intLiteral(0)))));
+    assertEqual(
+        "source=t | eval f=if(1>2, 1, 0)",
         eval(
             relation("t"),
             let(
                 field("f"),
-                function("PI")
-            )
-        ));
-  }
-
-  @Test
-  public void testPositionFunctionExpr() {
-    assertEqual("source=t | eval f=position('substr' IN 'str')",
+                function(
+                    "if",
+                    compare(">", intLiteral(1), intLiteral(2)),
+                    intLiteral(1),
+                    intLiteral(0)))));
+    assertEqual(
+        "source=t | eval f=if(1<=2, 1, 0)",
         eval(
             relation("t"),
             let(
                 field("f"),
-                function("position",
-                        stringLiteral("substr"), stringLiteral("str"))
-            )
-        ));
-  }
-
-  @Test
-  public void testEvalBinaryOperationExpr() {
-    assertEqual("source=t | eval f=a+b",
+                function(
+                    "if",
+                    compare("<=", intLiteral(1), intLiteral(2)),
+                    intLiteral(1),
+                    intLiteral(0)))));
+    assertEqual(
+        "source=t | eval f=if(1=2, 1, 0)",
+        eval(
+            relation("t"),
+            let(
+                field("f"),
+                function(
+                    "if",
+                    compare("=", intLiteral(1), intLiteral(2)),
+                    intLiteral(1),
+                    intLiteral(0)))));
+    assertEqual(
+        "source=t | eval f=if(1!=2, 1, 0)",
         eval(
             relation("t"),
             let(
                 field("f"),
-                function("+", field("a"), field("b"))
-            )
-        ));
-    assertEqual("source=t | eval f=(a+b)",
+                function(
+                    "if",
+                    compare("!=", intLiteral(1), intLiteral(2)),
+                    intLiteral(1),
+                    intLiteral(0)))));
+    assertEqual(
+        "source=t | eval f=if(isnull(a), 1, 0)",
+        eval(
+            relation("t"),
+            let(
+                field("f"),
+                function("if", function("is null", field("a")), intLiteral(1), intLiteral(0)))));
+    assertEqual(
+        "source=t | eval f=if(isnotnull(a), 1, 0)",
+        eval(
+            relation("t"),
+            let(
+                field("f"),
+                function(
+                    "if", function("is not null", field("a")), intLiteral(1), intLiteral(0)))));
+    assertEqual(
+        "source=t | eval f=if(not 1>2, 1, 0)",
         eval(
             relation("t"),
             let(
                 field("f"),
-                function("+", field("a"), field("b"))
-            )
-        ));
+                function(
+                    "if",
+                    not(compare(">", intLiteral(1), intLiteral(2))),
+                    intLiteral(1),
+                    intLiteral(0)))));
+    assertEqual(
+        "source=t | eval f=if(not a in (0, 1), 1, 0)",
+        eval(
+            relation("t"),
+            let(
+                field("f"),
+                function(
+                    "if",
+                    not(in(field("a"), intLiteral(0), intLiteral(1))),
+                    intLiteral(1),
+                    intLiteral(0)))));
+    assertEqual(
+        "source=t | eval f=if(not a in (0, 1) OR isnull(a), 1, 0)",
+        eval(
+            relation("t"),
+            let(
+                field("f"),
+                function(
+                    "if",
+                    or(
+                        not(in(field("a"), intLiteral(0), intLiteral(1))),
+                        function("is null", field("a"))),
+                    intLiteral(1),
+                    intLiteral(0)))));
+    assertEqual(
+        "source=t | eval f=if(like(a, '_a%b%c_d_'), 1, 0)",
+        eval(
+            relation("t"),
+            let(
+                field("f"),
+                function(
+                    "if",
+                    function("like", field("a"), stringLiteral("_a%b%c_d_")),
+                    intLiteral(1),
+                    intLiteral(0)))));
   }
 
   @Test
-  public void testLiteralValueBinaryOperationExpr() {
-    assertEqual("source=t | eval f=3+2",
+  public void testPositionFunctionExpr() {
+    assertEqual(
+        "source=t | eval f=position('substr' IN 'str')",
         eval(
             relation("t"),
-            let(
-                field("f"),
-                function("+", intLiteral(3), intLiteral(2))
-            )
-        ));
+            let(field("f"), function("position", stringLiteral("substr"), stringLiteral("str")))));
   }
 
   @Test
-  public void testCompareExpr() {
-    assertEqual("source=t a='b'",
+  public void testEvalBinaryOperationExpr() {
+    assertEqual(
+        "source=t | eval f=a+b",
+        eval(relation("t"), let(field("f"), function("+", field("a"), field("b")))));
+    assertEqual(
+        "source=t | eval f=(a+b)",
+        eval(relation("t"), let(field("f"), function("+", field("a"), field("b")))));
+  }
+
+  @Test
+  public void testLiteralValueBinaryOperationExpr() {
+    assertEqual(
+        "source=t | eval f=3+2",
+        eval(relation("t"), let(field("f"), function("+", intLiteral(3), intLiteral(2)))));
+  }
+
+  @Test
+  public void testBinaryOperationExprWithParentheses() {
+    assertEqual(
+        "source = t | where a = (1 + 2) * 3",
         filter(
             relation("t"),
-            compare("=", field("a"), stringLiteral("b"))
-        ));
+            compare(
+                "=",
+                field("a"),
+                function("*", function("+", intLiteral(1), intLiteral(2)), intLiteral(3)))));
   }
 
   @Test
-  public void testCompareFieldsExpr() {
-    assertEqual("source=t a>b",
+  public void testBinaryOperationExprPrecedence() {
+    assertEqual(
+        "source = t | where a = 1 + 2 * 3",
         filter(
             relation("t"),
-            compare(">", field("a"), field("b"))
-        ));
+            compare(
+                "=",
+                field("a"),
+                function("+", intLiteral(1), function("*", intLiteral(2), intLiteral(3))))));
+  }
+
+  @Test
+  public void testCompareExpr() {
+    assertEqual(
+        "source=t a='b'", filter(relation("t"), compare("=", field("a"), stringLiteral("b"))));
+  }
+
+  @Test
+  public void testCompareFieldsExpr() {
+    assertEqual("source=t a>b", filter(relation("t"), compare(">", field("a"), field("b"))));
   }
 
   @Test
   public void testInExpr() {
-    assertEqual("source=t f in (1, 2, 3)",
-        filter(
-            relation("t"),
-            in(
-                field("f"),
-                intLiteral(1), intLiteral(2), intLiteral(3))
-        ));
+    assertEqual(
+        "source=t f in (1, 2, 3)",
+        filter(relation("t"), in(field("f"), intLiteral(1), intLiteral(2), intLiteral(3))));
   }
 
   @Test
   public void testFieldExpr() {
-    assertEqual("source=t | sort + f",
-        sort(
-            relation("t"),
-            field("f", defaultSortFieldArgs())
-        ));
+    assertEqual("source=t | sort + f", sort(relation("t"), field("f", defaultSortFieldArgs())));
   }
 
   @Test
   public void testSortFieldWithMinusKeyword() {
-    assertEqual("source=t | sort - f",
+    assertEqual(
+        "source=t | sort - f",
         sort(
             relation("t"),
-            field(
-                "f",
-                argument("asc", booleanLiteral(false)),
-                argument("type", nullLiteral())
-            )
-        ));
+            field("f", argument("asc", booleanLiteral(false)), argument("type", nullLiteral()))));
+  }
+
+  @Test
+  public void testSortFieldWithBackticks() {
+    assertEqual("source=t | sort `f`", sort(relation("t"), field("f", defaultSortFieldArgs())));
   }
 
   @Test
   public void testSortFieldWithAutoKeyword() {
-    assertEqual("source=t | sort auto(f)",
+    assertEqual(
+        "source=t | sort auto(f)",
         sort(
             relation("t"),
             field(
                 "f",
                 argument("asc", booleanLiteral(true)),
-                argument("type", stringLiteral("auto"))
-            )
-        ));
+                argument("type", stringLiteral("auto")))));
   }
 
   @Test
   public void testSortFieldWithIpKeyword() {
-    assertEqual("source=t | sort ip(f)",
+    assertEqual(
+        "source=t | sort ip(f)",
         sort(
             relation("t"),
             field(
                 "f",
                 argument("asc", booleanLiteral(true)),
-                argument("type", stringLiteral("ip"))
-            )
-        ));
+                argument("type", stringLiteral("ip")))));
   }
 
   @Test
   public void testSortFieldWithNumKeyword() {
-    assertEqual("source=t | sort num(f)",
+    assertEqual(
+        "source=t | sort num(f)",
         sort(
             relation("t"),
             field(
                 "f",
                 argument("asc", booleanLiteral(true)),
-                argument("type", stringLiteral("num"))
-            )
-        ));
+                argument("type", stringLiteral("num")))));
   }
 
   @Test
   public void testSortFieldWithStrKeyword() {
-    assertEqual("source=t | sort str(f)",
+    assertEqual(
+        "source=t | sort str(f)",
         sort(
             relation("t"),
             field(
                 "f",
                 argument("asc", booleanLiteral(true)),
-                argument("type", stringLiteral("str"))
-            )
-        ));
+                argument("type", stringLiteral("str")))));
   }
 
   @Test
   public void testAggFuncCallExpr() {
-    assertEqual("source=t | stats avg(a) by b",
+    assertEqual(
+        "source=t | stats avg(a) by b",
         agg(
             relation("t"),
-            exprList(
-                alias(
-                    "avg(a)",
-                    aggregate("avg", field("a"))
-                )
-            ),
+            exprList(alias("avg(a)", aggregate("avg", field("a")))),
             emptyList(),
-            exprList(
-                alias(
-                    "b",
-                    field("b")
-                )),
-            defaultStatsArgs()
-        ));
+            exprList(alias("b", field("b"))),
+            defaultStatsArgs()));
   }
 
   @Test
   public void testVarAggregationShouldPass() {
-    assertEqual("source=t | stats var_samp(a) by b",
+    assertEqual(
+        "source=t | stats var_samp(a) by b",
         agg(
             relation("t"),
-            exprList(
-                alias(
-                    "var_samp(a)",
-                    aggregate("var_samp", field("a"))
-                )
-            ),
+            exprList(alias("var_samp(a)", aggregate("var_samp", field("a")))),
             emptyList(),
-            exprList(
-                alias(
-                    "b",
-                    field("b")
-                )),
-            defaultStatsArgs()
-        ));
+            exprList(alias("b", field("b"))),
+            defaultStatsArgs()));
   }
 
   @Test
   public void testVarpAggregationShouldPass() {
-    assertEqual("source=t | stats var_pop(a) by b",
+    assertEqual(
+        "source=t | stats var_pop(a) by b",
         agg(
             relation("t"),
-            exprList(
-                alias(
-                    "var_pop(a)",
-                    aggregate("var_pop", field("a"))
-                )
-            ),
+            exprList(alias("var_pop(a)", aggregate("var_pop", field("a")))),
             emptyList(),
-            exprList(
-                alias(
-                    "b",
-                    field("b")
-                )),
-            defaultStatsArgs()
-        ));
+            exprList(alias("b", field("b"))),
+            defaultStatsArgs()));
   }
 
   @Test
   public void testStdDevAggregationShouldPass() {
-    assertEqual("source=t | stats stddev_samp(a) by b",
+    assertEqual(
+        "source=t | stats stddev_samp(a) by b",
         agg(
             relation("t"),
-            exprList(
-                alias(
-                    "stddev_samp(a)",
-                    aggregate("stddev_samp", field("a"))
-                )
-            ),
+            exprList(alias("stddev_samp(a)", aggregate("stddev_samp", field("a")))),
             emptyList(),
-            exprList(
-                alias(
-                    "b",
-                    field("b")
-                )),
-            defaultStatsArgs()
-        ));
+            exprList(alias("b", field("b"))),
+            defaultStatsArgs()));
   }
 
   @Test
   public void testStdDevPAggregationShouldPass() {
-    assertEqual("source=t | stats stddev_pop(a) by b",
+    assertEqual(
+        "source=t | stats stddev_pop(a) by b",
         agg(
             relation("t"),
-            exprList(
-                alias(
-                    "stddev_pop(a)",
-                    aggregate("stddev_pop", field("a"))
-                )
-            ),
+            exprList(alias("stddev_pop(a)", aggregate("stddev_pop", field("a")))),
             emptyList(),
-            exprList(
-                alias(
-                    "b",
-                    field("b")
-                )),
-            defaultStatsArgs()
-        ));
+            exprList(alias("b", field("b"))),
+            defaultStatsArgs()));
   }
 
   @Test
   public void testPercentileAggFuncExpr() {
-    assertEqual("source=t | stats percentile<1>(a)",
+    assertEqual(
+        "source=t | stats percentile(a, 1)",
+        agg(
+            relation("t"),
+            exprList(
+                alias(
+                    "percentile(a, 1)",
+                    aggregate("percentile", field("a"), unresolvedArg("percent", intLiteral(1))))),
+            emptyList(),
+            emptyList(),
+            defaultStatsArgs()));
+    assertEqual(
+        "source=t | stats percentile(a, 1.0)",
+        agg(
+            relation("t"),
+            exprList(
+                alias(
+                    "percentile(a, 1.0)",
+                    aggregate(
+                        "percentile", field("a"), unresolvedArg("percent", doubleLiteral(1D))))),
+            emptyList(),
+            emptyList(),
+            defaultStatsArgs()));
+    assertEqual(
+        "source=t | stats percentile(a, 1.0, 100)",
         agg(
             relation("t"),
             exprList(
-                alias("percentile<1>(a)",
+                alias(
+                    "percentile(a, 1.0, 100)",
                     aggregate(
                         "percentile",
                         field("a"),
-                        argument("rank", intLiteral(1))
-                    )
-                )
-            ),
+                        unresolvedArg("percent", doubleLiteral(1D)),
+                        unresolvedArg("compression", intLiteral(100))))),
             emptyList(),
             emptyList(),
-            defaultStatsArgs()
-        ));
+            defaultStatsArgs()));
   }
 
   @Test
   public void testCountFuncCallExpr() {
-    assertEqual("source=t | stats count() by b",
+    assertEqual(
+        "source=t | stats count() by b",
         agg(
             relation("t"),
-            exprList(
-                alias(
-                    "count()",
-                    aggregate("count", AllFields.of())
-                )
-            ),
+            exprList(alias("count()", aggregate("count", AllFields.of()))),
             emptyList(),
-            exprList(
-                alias(
-                    "b",
-                    field("b")
-                )),
-            defaultStatsArgs()
-        ));
+            exprList(alias("b", field("b"))),
+            defaultStatsArgs()));
   }
 
   @Test
   public void testDistinctCount() {
-    assertEqual("source=t | stats distinct_count(a)",
+    assertEqual(
+        "source=t | stats distinct_count(a)",
         agg(
             relation("t"),
-            exprList(
-                alias("distinct_count(a)",
-                    distinctAggregate("count", field("a")))),
+            exprList(alias("distinct_count(a)", distinctAggregate("count", field("a")))),
             emptyList(),
             emptyList(),
             defaultStatsArgs()));
@@ -490,168 +515,114 @@ public void testDistinctCount() {
 
   @Test
   public void testTakeAggregationNoArgsShouldPass() {
-    assertEqual("source=t | stats take(a)",
+    assertEqual(
+        "source=t | stats take(a)",
         agg(
             relation("t"),
-            exprList(alias("take(a)",
-                aggregate("take", field("a"), unresolvedArg("size", intLiteral(10))))),
+            exprList(
+                alias(
+                    "take(a)",
+                    aggregate("take", field("a"), unresolvedArg("size", intLiteral(10))))),
             emptyList(),
             emptyList(),
-            defaultStatsArgs()
-        ));
+            defaultStatsArgs()));
   }
 
   @Test
   public void testTakeAggregationWithArgsShouldPass() {
-    assertEqual("source=t | stats take(a, 5)",
+    assertEqual(
+        "source=t | stats take(a, 5)",
         agg(
             relation("t"),
-            exprList(alias("take(a, 5)",
-                aggregate("take", field("a"), unresolvedArg("size", intLiteral(5))))),
+            exprList(
+                alias(
+                    "take(a, 5)",
+                    aggregate("take", field("a"), unresolvedArg("size", intLiteral(5))))),
             emptyList(),
             emptyList(),
-            defaultStatsArgs()
-        ));
+            defaultStatsArgs()));
   }
 
-
   @Test
   public void testEvalFuncCallExpr() {
-    assertEqual("source=t | eval f=abs(a)",
-        eval(
-            relation("t"),
-            let(
-                field("f"),
-                function("abs", field("a"))
-            )
-        ));
+    assertEqual(
+        "source=t | eval f=abs(a)",
+        eval(relation("t"), let(field("f"), function("abs", field("a")))));
   }
 
   @Test
   public void testDataTypeFuncCall() {
-    assertEqual("source=t | eval f=cast(1 as string)",
-        eval(
-            relation("t"),
-            let(
-                field("f"),
-                cast(intLiteral(1), stringLiteral("string"))
-            )
-        ));
+    assertEqual(
+        "source=t | eval f=cast(1 as string)",
+        eval(relation("t"), let(field("f"), cast(intLiteral(1), stringLiteral("string")))));
   }
 
   @Test
   public void testNestedFieldName() {
-    assertEqual("source=t | fields field0.field1.field2",
+    assertEqual(
+        "source=t | fields field0.field1.field2",
         projectWithArg(
             relation("t"),
             defaultFieldsArgs(),
-            field(
-                qualifiedName("field0", "field1", "field2")
-            )
-        ));
+            field(qualifiedName("field0", "field1", "field2"))));
   }
 
   @Test
   public void testFieldNameWithSpecialChars() {
-    assertEqual("source=t | fields `field-0`",
-        projectWithArg(
-            relation("t"),
-            defaultFieldsArgs(),
-            field(
-                qualifiedName("field-0")
-            )
-        ));
+    assertEqual(
+        "source=t | fields `field-0`",
+        projectWithArg(relation("t"), defaultFieldsArgs(), field(qualifiedName("field-0"))));
   }
 
   @Test
   public void testNestedFieldNameWithSpecialChars() {
-    assertEqual("source=t | fields `field-0`.`field#1`.`field*2`",
+    assertEqual(
+        "source=t | fields `field-0`.`field#1`.`field*2`",
         projectWithArg(
             relation("t"),
             defaultFieldsArgs(),
-            field(
-                qualifiedName("field-0", "field#1", "field*2")
-            )
-        ));
+            field(qualifiedName("field-0", "field#1", "field*2"))));
   }
 
   @Test
   public void testStringLiteralExpr() {
-    assertEqual("source=t a=\"string\"",
-        filter(
-            relation("t"),
-            compare(
-                "=",
-                field("a"),
-                stringLiteral("string")
-            )
-        ));
+    assertEqual(
+        "source=t a=\"string\"",
+        filter(relation("t"), compare("=", field("a"), stringLiteral("string"))));
   }
 
   @Test
   public void testIntegerLiteralExpr() {
-    assertEqual("source=t a=1 b=-1",
+    assertEqual(
+        "source=t a=1 b=-1",
         filter(
             relation("t"),
             and(
-                compare(
-                    "=",
-                    field("a"),
-                    intLiteral(1)
-                ),
-                compare(
-                    "=",
-                    field("b"),
-                    intLiteral(-1)
-                )
-            )
-        ));
+                compare("=", field("a"), intLiteral(1)),
+                compare("=", field("b"), intLiteral(-1)))));
   }
 
   @Test
   public void testLongLiteralExpr() {
-    assertEqual("source=t a=1234567890123 b=-1234567890123",
+    assertEqual(
+        "source=t a=1234567890123 b=-1234567890123",
         filter(
             relation("t"),
             and(
-                compare(
-                    "=",
-                    field("a"),
-                    longLiteral(1234567890123L)
-                ),
-                compare(
-                    "=",
-                    field("b"),
-                    longLiteral(-1234567890123L)
-                )
-            )
-        ));
+                compare("=", field("a"), longLiteral(1234567890123L)),
+                compare("=", field("b"), longLiteral(-1234567890123L)))));
   }
 
   @Test
   public void testDoubleLiteralExpr() {
-    assertEqual("source=t b=0.1",
-        filter(
-            relation("t"),
-            compare(
-                "=",
-                field("b"),
-                doubleLiteral(0.1)
-            )
-        ));
+    assertEqual(
+        "source=t b=0.1", filter(relation("t"), compare("=", field("b"), doubleLiteral(0.1))));
   }
 
   @Test
   public void testBooleanLiteralExpr() {
-    assertEqual("source=t a=true",
-        filter(
-            relation("t"),
-            compare(
-                "=",
-                field("a"),
-                booleanLiteral(true)
-            )
-        ));
+    assertEqual(
+        "source=t a=true", filter(relation("t"), compare("=", field("a"), booleanLiteral(true))));
   }
 
   @Test
@@ -659,42 +630,23 @@ public void testIntervalLiteralExpr() {
     assertEqual(
         "source=t a = interval 1 day",
         filter(
-            relation("t"),
-            compare(
-                "=",
-                field("a"),
-                intervalLiteral(1, DataType.INTEGER, "day")
-            )
-        ));
+            relation("t"), compare("=", field("a"), intervalLiteral(1, DataType.INTEGER, "day"))));
   }
 
   @Test
   public void testKeywordsAsIdentifiers() {
-    assertEqual(
-        "source=timestamp",
-        relation("timestamp")
-    );
+    assertEqual("source=timestamp", relation("timestamp"));
 
     assertEqual(
         "source=t | fields timestamp",
-        projectWithArg(
-            relation("t"),
-            defaultFieldsArgs(),
-            field("timestamp")
-        )
-    );
+        projectWithArg(relation("t"), defaultFieldsArgs(), field("timestamp")));
   }
 
   @Test
   public void canBuildKeywordsAsIdentInQualifiedName() {
     assertEqual(
         "source=test | fields timestamp",
-        projectWithArg(
-            relation("test"),
-            defaultFieldsArgs(),
-            field("timestamp")
-        )
-    );
+        projectWithArg(relation("test"), defaultFieldsArgs(), field("timestamp")));
   }
 
   @Test
@@ -705,12 +657,9 @@ public void canBuildMatchRelevanceFunctionWithArguments() {
             relation("test"),
             function(
                 "match",
-                unresolvedArg("field", stringLiteral("message")),
+                unresolvedArg("field", qualifiedName("message")),
                 unresolvedArg("query", stringLiteral("test query")),
-                unresolvedArg("analyzer", stringLiteral("keyword"))
-            )
-        )
-    );
+                unresolvedArg("analyzer", stringLiteral("keyword")))));
   }
 
   @Test
@@ -722,13 +671,11 @@ public void canBuildMulti_matchRelevanceFunctionWithArguments() {
             relation("test"),
             function(
                 "multi_match",
-                unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                    "field1", 1.F, "field2", 3.2F))),
+                unresolvedArg(
+                    "fields",
+                    new RelevanceFieldList(ImmutableMap.of("field1", 1.F, "field2", 3.2F))),
                 unresolvedArg("query", stringLiteral("test query")),
-                unresolvedArg("analyzer", stringLiteral("keyword"))
-            )
-        )
-    );
+                unresolvedArg("analyzer", stringLiteral("keyword")))));
   }
 
   @Test
@@ -740,13 +687,11 @@ public void canBuildSimple_query_stringRelevanceFunctionWithArguments() {
             relation("test"),
             function(
                 "simple_query_string",
-                unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                    "field1", 1.F, "field2", 3.2F))),
+                unresolvedArg(
+                    "fields",
+                    new RelevanceFieldList(ImmutableMap.of("field1", 1.F, "field2", 3.2F))),
                 unresolvedArg("query", stringLiteral("test query")),
-                unresolvedArg("analyzer", stringLiteral("keyword"))
-            )
-        )
-    );
+                unresolvedArg("analyzer", stringLiteral("keyword")))));
   }
 
   @Test
@@ -758,19 +703,18 @@ public void canBuildQuery_stringRelevanceFunctionWithArguments() {
             relation("test"),
             function(
                 "query_string",
-                unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                    "field1", 1.F, "field2", 3.2F))),
+                unresolvedArg(
+                    "fields",
+                    new RelevanceFieldList(ImmutableMap.of("field1", 1.F, "field2", 3.2F))),
                 unresolvedArg("query", stringLiteral("test query")),
-                unresolvedArg("analyzer", stringLiteral("keyword"))
-            )
-        )
-    );
+                unresolvedArg("analyzer", stringLiteral("keyword")))));
   }
 
   @Test
   public void functionNameCanBeUsedAsIdentifier() {
     assertFunctionNameCouldBeId(
-        "AVG | COUNT | SUM | MIN | MAX | VAR_SAMP | VAR_POP | STDDEV_SAMP | STDDEV_POP");
+        "AVG | COUNT | SUM | MIN | MAX | VAR_SAMP | VAR_POP | STDDEV_SAMP | STDDEV_POP |"
+            + " PERCENTILE");
     assertFunctionNameCouldBeId(
         "CURRENT_DATE | CURRENT_TIME | CURRENT_TIMESTAMP | LOCALTIME | LOCALTIMESTAMP | "
             + "UTC_TIMESTAMP | UTC_DATE | UTC_TIME | CURDATE | CURTIME | NOW");
@@ -783,30 +727,93 @@ public void functionNameCanBeUsedAsIdentifier() {
             + "| TIME_TO_SEC | TIMESTAMP | TO_DAYS | UNIX_TIMESTAMP | WEEK | YEAR");
     assertFunctionNameCouldBeId(
         "SUBSTR | SUBSTRING | TRIM | LTRIM | RTRIM | LOWER | UPPER | CONCAT | CONCAT_WS | LENGTH "
-            + "| STRCMP | RIGHT | LEFT | ASCII | LOCATE | REPLACE"
-    );
+            + "| STRCMP | RIGHT | LEFT | ASCII | LOCATE | REPLACE");
     assertFunctionNameCouldBeId(
         "ABS | CEIL | CEILING | CONV | CRC32 | E | EXP | FLOOR | LN | LOG"
-        + " | LOG10 | LOG2 | MOD | PI |POW | POWER | RAND | ROUND | SIGN | SQRT | TRUNCATE "
+            + " | LOG10 | LOG2 | MOD | PI |POW | POWER | RAND | ROUND | SIGN | SQRT | TRUNCATE "
             + "| ACOS | ASIN | ATAN | ATAN2 | COS | COT | DEGREES | RADIANS | SIN | TAN");
+    assertFunctionNameCouldBeId(
+        "SEARCH | DESCRIBE | SHOW | FROM | WHERE | FIELDS | RENAME | STATS "
+            + "| DEDUP | SORT | EVAL | HEAD | TOP | RARE | PARSE | METHOD | REGEX | PUNCT | GROK "
+            + "| PATTERN | PATTERNS | NEW_FIELD | KMEANS | AD | ML | SOURCE | INDEX | D | DESC "
+            + "| DATASOURCES");
   }
 
   void assertFunctionNameCouldBeId(String antlrFunctionName) {
     List<String> functionList =
-        Arrays.stream(antlrFunctionName.split("\\|")).map(String::stripLeading)
-            .map(String::stripTrailing).collect(
-            Collectors.toList());
+        Arrays.stream(antlrFunctionName.split("\\|"))
+            .map(String::stripLeading)
+            .map(String::stripTrailing)
+            .collect(Collectors.toList());
 
     assertFalse(functionList.isEmpty());
     for (String functionName : functionList) {
-      assertEqual(String.format(Locale.ROOT, "source=t | fields %s", functionName),
-          projectWithArg(
-              relation("t"),
-              defaultFieldsArgs(),
-              field(
-                  qualifiedName(functionName)
-              )
-          ));
+      assertEqual(
+          String.format(Locale.ROOT, "source=t | fields %s", functionName),
+          projectWithArg(relation("t"), defaultFieldsArgs(), field(qualifiedName(functionName))));
     }
   }
+
+  // https://github.com/opensearch-project/sql/issues/1318
+  @Test
+  public void indexCanBeId() {
+    assertEqual(
+        "source = index | stats count() by index",
+        agg(
+            relation("index"),
+            exprList(alias("count()", aggregate("count", AllFields.of()))),
+            emptyList(),
+            exprList(alias("index", field("index"))),
+            defaultStatsArgs()));
+  }
+
+  @Test
+  public void testExtractFunctionExpr() {
+    assertEqual(
+        "source=t | eval f=extract(day from '2001-05-07 10:11:12')",
+        eval(
+            relation("t"),
+            let(
+                field("f"),
+                function("extract", stringLiteral("day"), stringLiteral("2001-05-07 10:11:12")))));
+  }
+
+  @Test
+  public void testGet_FormatFunctionExpr() {
+    assertEqual(
+        "source=t | eval f=get_format(DATE,'USA')",
+        eval(
+            relation("t"),
+            let(field("f"), function("get_format", stringLiteral("DATE"), stringLiteral("USA")))));
+  }
+
+  @Test
+  public void testTimeStampAddFunctionExpr() {
+    assertEqual(
+        "source=t | eval f=timestampadd(YEAR, 15, '2001-03-06 00:00:00')",
+        eval(
+            relation("t"),
+            let(
+                field("f"),
+                function(
+                    "timestampadd",
+                    stringLiteral("YEAR"),
+                    intLiteral(15),
+                    stringLiteral("2001-03-06 00:00:00")))));
+  }
+
+  @Test
+  public void testTimeStampDiffFunctionExpr() {
+    assertEqual(
+        "source=t | eval f=timestampdiff(" + "YEAR, '1997-01-01 00:00:00', '2001-03-06 00:00:00')",
+        eval(
+            relation("t"),
+            let(
+                field("f"),
+                function(
+                    "timestampdiff",
+                    stringLiteral("YEAR"),
+                    stringLiteral("1997-01-01 00:00:00"),
+                    stringLiteral("2001-03-06 00:00:00")))));
+  }
 }
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstNowLikeFunctionTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstNowLikeFunctionTest.java
index 711e780f3b..16aa0752e6 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstNowLikeFunctionTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstNowLikeFunctionTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.parser;
 
 import static org.junit.Assert.assertEquals;
@@ -31,6 +30,7 @@ public class AstNowLikeFunctionTest {
 
   /**
    * Set parameterized values used in test.
+   *
    * @param name Function name
    * @param hasFsp Whether function has fsp argument
    * @param hasShortcut Whether function has shortcut (call without `()`)
@@ -43,21 +43,26 @@ public AstNowLikeFunctionTest(String name, Boolean hasFsp, Boolean hasShortcut)
 
   /**
    * Returns function data to test.
+   *
    * @return An iterable.
    */
   @Parameterized.Parameters(name = "{0}")
   public static Iterable<Object> functionNames() {
-    return List.of(new Object[][]{
-        {"now", false, false },
-        {"current_timestamp", false, false},
-        {"localtimestamp", false, false},
-        {"localtime", false, false},
-        {"sysdate", true, false},
-        {"curtime", false, false},
-        {"current_time", false, false},
-        {"curdate", false, false},
-        {"current_date", false, false}
-    });
+    return List.of(
+        new Object[][] {
+          {"now", false, false},
+          {"current_timestamp", false, false},
+          {"localtimestamp", false, false},
+          {"localtime", false, false},
+          {"sysdate", true, false},
+          {"curtime", false, false},
+          {"current_time", false, false},
+          {"curdate", false, false},
+          {"current_date", false, false},
+          {"utc_date", false, false},
+          {"utc_time", false, false},
+          {"utc_timestamp", false, false}
+        });
   }
 
   private final String name;
@@ -67,26 +72,20 @@ public static Iterable<Object> functionNames() {
   @Test
   public void test_function_call_eval() {
     assertEqual(
-        eval(relation("t"), let(field("r"), function(name))),
-        "source=t | eval r=" + name + "()"
-    );
+        eval(relation("t"), let(field("r"), function(name))), "source=t | eval r=" + name + "()");
   }
 
   @Test
   public void test_shortcut_eval() {
     Assume.assumeTrue(hasShortcut);
-    assertEqual(
-        eval(relation("t"), let(field("r"), function(name))),
-        "source=t | eval r=" + name
-    );
+    assertEqual(eval(relation("t"), let(field("r"), function(name))), "source=t | eval r=" + name);
   }
 
   @Test
   public void test_function_call_where() {
     assertEqual(
         filter(relation("t"), compare("=", field("a"), function(name))),
-        "search source=t | where a=" + name + "()"
-    );
+        "search source=t | where a=" + name + "()");
   }
 
   @Test
@@ -94,18 +93,15 @@ public void test_shortcut_where() {
     Assume.assumeTrue(hasShortcut);
     assertEqual(
         filter(relation("t"), compare("=", field("a"), function(name))),
-        "search source=t | where a=" + name
-    );
+        "search source=t | where a=" + name);
   }
 
   @Test
   public void test_function_call_fsp() {
     Assume.assumeTrue(hasFsp);
-    assertEqual(filter(
-            relation("t"),
-            compare("=", field("a"), function(name, intLiteral(0)))
-        ), "search source=t | where a=" + name + "(0)"
-    );
+    assertEqual(
+        filter(relation("t"), compare("=", field("a"), function(name, intLiteral(0)))),
+        "search source=t | where a=" + name + "(0)");
   }
 
   protected void assertEqual(Node expectedPlan, String query) {
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstStatementBuilderTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstStatementBuilderTest.java
index 4760024692..7d7b31e822 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstStatementBuilderTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstStatementBuilderTest.java
@@ -28,8 +28,7 @@
 
 public class AstStatementBuilderTest {
 
-  @Rule
-  public ExpectedException exceptionRule = ExpectedException.none();
+  @Rule public ExpectedException exceptionRule = ExpectedException.none();
 
   private PPLSyntaxParser parser = new PPLSyntaxParser();
 
@@ -38,8 +37,8 @@ public void buildQueryStatement() {
     assertEqual(
         "search source=t a=1",
         new Query(
-            project(
-                filter(relation("t"), compare("=", field("a"), intLiteral(1))), AllFields.of())));
+            project(filter(relation("t"), compare("=", field("a"), intLiteral(1))), AllFields.of()),
+            0));
   }
 
   @Test
@@ -49,8 +48,8 @@ public void buildExplainStatement() {
         new Explain(
             new Query(
                 project(
-                    filter(relation("t"), compare("=", field("a"), intLiteral(1))),
-                    AllFields.of()))));
+                    filter(relation("t"), compare("=", field("a"), intLiteral(1))), AllFields.of()),
+                0)));
   }
 
   private void assertEqual(String query, Statement expectedStatement) {
@@ -65,7 +64,8 @@ private void assertExplainEqual(String query, Statement expectedStatement) {
 
   private Node plan(String query, boolean isExplain) {
     final AstStatementBuilder builder =
-        new AstStatementBuilder(new AstBuilder(new AstExpressionBuilder(), query),
+        new AstStatementBuilder(
+            new AstBuilder(new AstExpressionBuilder(), query),
             AstStatementBuilder.StatementBuilderContext.builder().isExplain(isExplain).build());
     return builder.visit(parser.parse(query));
   }
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/utils/ArgumentFactoryTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/utils/ArgumentFactoryTest.java
index e18dfbd65c..761dbe2997 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/utils/ArgumentFactoryTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/utils/ArgumentFactoryTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.utils;
 
 import static java.util.Collections.emptyList;
@@ -28,12 +27,10 @@ public class ArgumentFactoryTest extends AstBuilderTest {
 
   @Test
   public void testFieldsCommandArgument() {
-    assertEqual("source=t | fields - a",
+    assertEqual(
+        "source=t | fields - a",
         projectWithArg(
-            relation("t"),
-            exprList(argument("exclude", booleanLiteral(true))),
-            field("a")
-        ));
+            relation("t"), exprList(argument("exclude", booleanLiteral(true))), field("a")));
   }
 
   @Test
@@ -47,20 +44,14 @@ public void testStatsCommandArgument() {
         "source=t | stats partitions=1 allnum=false delim=',' avg(a) dedup_splitvalues=true",
         agg(
             relation("t"),
-            exprList(
-                alias(
-                    "avg(a)",
-                    aggregate("avg", field("a")))
-                ),
+            exprList(alias("avg(a)", aggregate("avg", field("a")))),
             emptyList(),
             emptyList(),
             exprList(
                 argument("partitions", intLiteral(1)),
                 argument("allnum", booleanLiteral(false)),
                 argument("delim", stringLiteral(",")),
-                argument("dedupsplit", booleanLiteral(true))
-            )
-        ));
+                argument("dedupsplit", booleanLiteral(true)))));
   }
 
   @Test
@@ -72,52 +63,43 @@ public void testStatsCommandDefaultArgument() {
 
   @Test
   public void testDedupCommandArgument() {
-    assertEqual("source=t | dedup 3 field0 keepempty=false consecutive=true",
+    assertEqual(
+        "source=t | dedup 3 field0 keepempty=false consecutive=true",
         dedupe(
             relation("t"),
             exprList(
                 argument("number", intLiteral(3)),
                 argument("keepempty", booleanLiteral(false)),
-                argument("consecutive", booleanLiteral(true))
-            ),
-            field("field0")
-        ));
+                argument("consecutive", booleanLiteral(true))),
+            field("field0")));
   }
 
   @Test
   public void testDedupCommandDefaultArgument() {
     assertEqual(
-        "source=t | dedup 1 field0 keepempty=false consecutive=false",
-        "source=t | dedup field0"
-    );
+        "source=t | dedup 1 field0 keepempty=false consecutive=false", "source=t | dedup field0");
   }
 
   @Test
   public void testSortCommandDefaultArgument() {
-    assertEqual(
-        "source=t | sort field0",
-        "source=t | sort field0"
-    );
+    assertEqual("source=t | sort field0", "source=t | sort field0");
   }
 
   @Test
   public void testSortFieldArgument() {
-    assertEqual("source=t | sort - auto(field0)",
+    assertEqual(
+        "source=t | sort - auto(field0)",
         sort(
             relation("t"),
             field(
                 "field0",
                 exprList(
                     argument("asc", booleanLiteral(false)),
-                    argument("type", stringLiteral("auto"))
-                )
-            )
-        ));
+                    argument("type", stringLiteral("auto"))))));
   }
 
   @Test
   public void testNoArgConstructorForArgumentFactoryShouldPass() {
     new ArgumentFactory();
   }
-
 }
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/utils/PPLQueryDataAnonymizerTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/utils/PPLQueryDataAnonymizerTest.java
index 1e4af28ecf..cd51ea07df 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/utils/PPLQueryDataAnonymizerTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/utils/PPLQueryDataAnonymizerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.utils;
 
 import static org.junit.Assert.assertEquals;
@@ -12,7 +11,6 @@
 import static org.opensearch.sql.ast.dsl.AstDSL.relation;
 
 import java.util.Collections;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -30,167 +28,140 @@ public class PPLQueryDataAnonymizerTest {
 
   @Test
   public void testSearchCommand() {
-    assertEquals("source=t | where a = ***",
-        anonymize("search source=t a=1")
-    );
+    assertEquals("source=t | where a = ***", anonymize("search source=t a=1"));
   }
 
   @Test
-  @Ignore
   public void testTableFunctionCommand() {
-    assertEquals("source=prometheus.query_range(***,***,***,***)",
-        anonymize("source=prometheus.query_range('afsd',123,123,3)")
-    );
+    assertEquals(
+        "source=prometheus.query_range(***,***,***,***)",
+        anonymize("source=prometheus.query_range('afsd',123,123,3)"));
   }
 
   @Test
   public void testPrometheusPPLCommand() {
-    assertEquals("source=prometheus.http_requests_process",
-        anonymize("source=prometheus.http_requests_process")
-    );
+    assertEquals(
+        "source=prometheus.http_requests_process",
+        anonymize("source=prometheus.http_requests_process"));
   }
 
   @Test
   public void testWhereCommand() {
-    assertEquals("source=t | where a = ***",
-        anonymize("search source=t | where a=1")
-    );
+    assertEquals("source=t | where a = ***", anonymize("search source=t | where a=1"));
   }
 
   @Test
   public void testFieldsCommandWithoutArguments() {
-    assertEquals("source=t | fields + f,g",
-        anonymize("source=t | fields f,g"));
+    assertEquals("source=t | fields + f,g", anonymize("source=t | fields f,g"));
   }
 
   @Test
   public void testFieldsCommandWithIncludeArguments() {
-    assertEquals("source=t | fields + f,g",
-        anonymize("source=t | fields + f,g"));
+    assertEquals("source=t | fields + f,g", anonymize("source=t | fields + f,g"));
   }
 
   @Test
   public void testFieldsCommandWithExcludeArguments() {
-    assertEquals("source=t | fields - f,g",
-        anonymize("source=t | fields - f,g"));
+    assertEquals("source=t | fields - f,g", anonymize("source=t | fields - f,g"));
   }
 
   @Test
   public void testRenameCommandWithMultiFields() {
-    assertEquals("source=t | rename f as g,h as i,j as k",
+    assertEquals(
+        "source=t | rename f as g,h as i,j as k",
         anonymize("source=t | rename f as g,h as i,j as k"));
   }
 
   @Test
   public void testStatsCommandWithByClause() {
-    assertEquals("source=t | stats count(a) by b",
-        anonymize("source=t | stats count(a) by b"));
+    assertEquals("source=t | stats count(a) by b", anonymize("source=t | stats count(a) by b"));
   }
 
   @Test
   public void testStatsCommandWithNestedFunctions() {
-    assertEquals("source=t | stats sum(+(a,b))",
-        anonymize("source=t | stats sum(a+b)"));
+    assertEquals("source=t | stats sum(+(a,b))", anonymize("source=t | stats sum(a+b)"));
   }
 
   @Test
   public void testDedupCommand() {
-    assertEquals("source=t | dedup f1,f2 1 keepempty=false consecutive=false",
+    assertEquals(
+        "source=t | dedup f1,f2 1 keepempty=false consecutive=false",
         anonymize("source=t | dedup f1, f2"));
   }
 
   @Test
   public void testHeadCommandWithNumber() {
-    assertEquals("source=t | head 3",
-        anonymize("source=t | head 3"));
+    assertEquals("source=t | head 3", anonymize("source=t | head 3"));
   }
 
-  //todo, sort order is ignored, it doesn't impact the log analysis.
+  // todo, sort order is ignored, it doesn't impact the log analysis.
   @Test
   public void testSortCommandWithOptions() {
-    assertEquals("source=t | sort f1,f2",
-        anonymize("source=t | sort - f1, + f2"));
+    assertEquals("source=t | sort f1,f2", anonymize("source=t | sort - f1, + f2"));
   }
 
   @Test
   public void testEvalCommand() {
-    assertEquals("source=t | eval r=abs(f)",
-        anonymize("source=t | eval r=abs(f)"));
+    assertEquals("source=t | eval r=abs(f)", anonymize("source=t | eval r=abs(f)"));
   }
 
   @Test
   public void testRareCommandWithGroupBy() {
-    assertEquals("source=t | rare 10 a by b",
-        anonymize("source=t | rare a by b"));
+    assertEquals("source=t | rare 10 a by b", anonymize("source=t | rare a by b"));
   }
 
   @Test
   public void testTopCommandWithNAndGroupBy() {
-    assertEquals("source=t | top 1 a by b",
-        anonymize("source=t | top 1 a by b"));
+    assertEquals("source=t | top 1 a by b", anonymize("source=t | top 1 a by b"));
   }
 
   @Test
   public void testAndExpression() {
-    assertEquals("source=t | where a = *** and b = ***",
-        anonymize("source=t | where a=1 and b=2")
-    );
+    assertEquals("source=t | where a = *** and b = ***", anonymize("source=t | where a=1 and b=2"));
   }
 
   @Test
   public void testOrExpression() {
-    assertEquals("source=t | where a = *** or b = ***",
-        anonymize("source=t | where a=1 or b=2")
-    );
+    assertEquals("source=t | where a = *** or b = ***", anonymize("source=t | where a=1 or b=2"));
   }
 
   @Test
   public void testXorExpression() {
-    assertEquals("source=t | where a = *** xor b = ***",
-        anonymize("source=t | where a=1 xor b=2")
-    );
+    assertEquals("source=t | where a = *** xor b = ***", anonymize("source=t | where a=1 xor b=2"));
   }
 
   @Test
   public void testNotExpression() {
-    assertEquals("source=t | where not a = ***",
-        anonymize("source=t | where not a=1 ")
-    );
+    assertEquals("source=t | where not a = ***", anonymize("source=t | where not a=1 "));
   }
 
   @Test
   public void testQualifiedName() {
-    assertEquals("source=t | fields + field0",
-        anonymize("source=t | fields field0")
-    );
+    assertEquals("source=t | fields + field0", anonymize("source=t | fields field0"));
   }
 
   @Test
   public void testDateFunction() {
-    assertEquals("source=t | eval date=DATE_ADD(DATE(***),INTERVAL *** HOUR)",
-        anonymize("source=t | eval date=DATE_ADD(DATE('2020-08-26'),INTERVAL 1 HOUR)")
-    );
+    assertEquals(
+        "source=t | eval date=DATE_ADD(DATE(***),INTERVAL *** HOUR)",
+        anonymize("source=t | eval date=DATE_ADD(DATE('2020-08-26'),INTERVAL 1 HOUR)"));
   }
 
   @Test
   public void testExplain() {
-    assertEquals("source=t | fields + a",
-        anonymizeStatement("source=t | fields a", true)
-    );
+    assertEquals("source=t | fields + a", anonymizeStatement("source=t | fields a", true));
   }
 
   @Test
   public void testQuery() {
-    assertEquals("source=t | fields + a",
-        anonymizeStatement("source=t | fields a", false)
-    );
+    assertEquals("source=t | fields + a", anonymizeStatement("source=t | fields a", false));
   }
 
   @Test
   public void anonymizeFieldsNoArg() {
-    assertEquals("source=t | fields + f",
-        anonymize(projectWithArg(relation("t"), Collections.emptyList(), field("f")))
-    );
+    assertEquals(
+        "source=t | fields + f",
+        anonymize(projectWithArg(relation("t"), Collections.emptyList(), field("f"))));
   }
 
   private String anonymize(String query) {
diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/utils/UnresolvedPlanHelperTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/utils/UnresolvedPlanHelperTest.java
index d64c8d5db4..7c1264e0b6 100644
--- a/ppl/src/test/java/org/opensearch/sql/ppl/utils/UnresolvedPlanHelperTest.java
+++ b/ppl/src/test/java/org/opensearch/sql/ppl/utils/UnresolvedPlanHelperTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ppl.utils;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/prometheus/build.gradle b/prometheus/build.gradle
index b11c23fd25..7a3b3f7af6 100644
--- a/prometheus/build.gradle
+++ b/prometheus/build.gradle
@@ -11,24 +11,24 @@ plugins {
 
 repositories {
     mavenCentral()
-    maven { url 'https://jitpack.io' }
 }
 
 dependencies {
     api project(':core')
+    implementation project(':datasources')
+
+    implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
     implementation "io.github.resilience4j:resilience4j-retry:1.5.0"
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}"
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_databind_version}"
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}"
-    implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.9.3'
-    implementation 'com.github.babbel:okhttp-aws-signer:1.0.2'
-    implementation group: 'org.json', name: 'json', version: '20180813'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${versions.jackson}"
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${versions.jackson_databind}"
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${versions.jackson}"
+    implementation group: 'org.json', name: 'json', version: '20231013'
 
-    testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
+    testImplementation('org.junit.jupiter:junit-jupiter:5.9.3')
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
-    testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.9.3'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.7.0'
+    testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.12.0'
 }
 
 test {
@@ -40,15 +40,13 @@ test {
 }
 
 configurations.all {
-    resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
-    resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
     resolutionStrategy.force 'junit:junit:4.13.2'
 }
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required = true
+        xml.required = true
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/authinterceptors/AwsSigningInterceptor.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/authinterceptors/AwsSigningInterceptor.java
deleted file mode 100644
index f3d91c55a2..0000000000
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/authinterceptors/AwsSigningInterceptor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.opensearch.sql.prometheus.authinterceptors;
-
-import com.babbel.mobile.android.commons.okhttpawssigner.OkHttpAwsV4Signer;
-import java.io.IOException;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import lombok.NonNull;
-import okhttp3.Interceptor;
-import okhttp3.Request;
-import okhttp3.Response;
-
-public class AwsSigningInterceptor implements Interceptor {
-
-  private OkHttpAwsV4Signer okHttpAwsV4Signer;
-
-  private String accessKey;
-
-  private String secretKey;
-
-  /**
-   * AwsSigningInterceptor which intercepts http requests
-   * and adds required headers for sigv4 authentication.
-   *
-   * @param accessKey accessKey.
-   * @param secretKey secretKey.
-   * @param region region.
-   * @param serviceName serviceName.
-   */
-  public AwsSigningInterceptor(@NonNull String accessKey, @NonNull String secretKey,
-                               @NonNull String region, @NonNull String serviceName) {
-    this.okHttpAwsV4Signer = new OkHttpAwsV4Signer(region, serviceName);
-    this.accessKey = accessKey;
-    this.secretKey = secretKey;
-  }
-
-  @Override
-  public Response intercept(Interceptor.Chain chain) throws IOException {
-    Request request = chain.request();
-
-    DateTimeFormatter timestampFormat = DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss'Z'")
-        .withZone(ZoneId.of("GMT"));
-
-    Request newRequest = request.newBuilder()
-        .addHeader("x-amz-date", timestampFormat.format(ZonedDateTime.now()))
-        .addHeader("host", request.url().host())
-        .build();
-    Request signed = okHttpAwsV4Signer.sign(newRequest, accessKey, secretKey);
-    return chain.proceed(signed);
-  }
-
-}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/client/PrometheusClient.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/client/PrometheusClient.java
index ebc3e2dd39..f58ca56a8c 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/client/PrometheusClient.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/client/PrometheusClient.java
@@ -8,6 +8,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import org.json.JSONArray;
 import org.json.JSONObject;
 import org.opensearch.sql.prometheus.request.system.model.MetricMetadata;
 
@@ -18,4 +19,6 @@ public interface PrometheusClient {
   List<String> getLabels(String metricName) throws IOException;
 
   Map<String, List<MetricMetadata>> getAllMetrics() throws IOException;
+
+  JSONArray queryExemplars(String query, Long start, Long end) throws IOException;
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/client/PrometheusClientImpl.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/client/PrometheusClientImpl.java
index 512c014564..48154964eb 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/client/PrometheusClientImpl.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/client/PrometheusClientImpl.java
@@ -22,7 +22,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
+import org.opensearch.sql.prometheus.exceptions.PrometheusClientException;
 import org.opensearch.sql.prometheus.request.system.model.MetricMetadata;
 
 public class PrometheusClientImpl implements PrometheusClient {
@@ -38,16 +40,18 @@ public PrometheusClientImpl(OkHttpClient okHttpClient, URI uri) {
     this.uri = uri;
   }
 
-
   @Override
   public JSONObject queryRange(String query, Long start, Long end, String step) throws IOException {
-    String queryUrl = String.format("%s/api/v1/query_range?query=%s&start=%s&end=%s&step=%s",
-        uri.toString().replaceAll("/$", ""), URLEncoder.encode(query, StandardCharsets.UTF_8),
-        start, end, step);
+    String queryUrl =
+        String.format(
+            "%s/api/v1/query_range?query=%s&start=%s&end=%s&step=%s",
+            uri.toString().replaceAll("/$", ""),
+            URLEncoder.encode(query, StandardCharsets.UTF_8),
+            start,
+            end,
+            step);
     logger.debug("queryUrl: " + queryUrl);
-    Request request = new Request.Builder()
-        .url(queryUrl)
-        .build();
+    Request request = new Request.Builder().url(queryUrl).build();
     Response response = this.okHttpClient.newCall(request).execute();
     JSONObject jsonObject = readResponse(response);
     return jsonObject.getJSONObject("data");
@@ -55,14 +59,14 @@ public JSONObject queryRange(String query, Long start, Long end, String step) th
 
   @Override
   public List<String> getLabels(String metricName) throws IOException {
-    String queryUrl = String.format("%s/api/v1/labels?%s=%s",
-        uri.toString().replaceAll("/$", ""),
-        URLEncoder.encode("match[]", StandardCharsets.UTF_8),
-        URLEncoder.encode(metricName, StandardCharsets.UTF_8));
+    String queryUrl =
+        String.format(
+            "%s/api/v1/labels?%s=%s",
+            uri.toString().replaceAll("/$", ""),
+            URLEncoder.encode("match[]", StandardCharsets.UTF_8),
+            URLEncoder.encode(metricName, StandardCharsets.UTF_8));
     logger.debug("queryUrl: " + queryUrl);
-    Request request = new Request.Builder()
-        .url(queryUrl)
-        .build();
+    Request request = new Request.Builder().url(queryUrl).build();
     Response response = this.okHttpClient.newCall(request).execute();
     JSONObject jsonObject = readResponse(response);
     return toListOfLabels(jsonObject.getJSONArray("data"));
@@ -70,24 +74,36 @@ public List<String> getLabels(String metricName) throws IOException {
 
   @Override
   public Map<String, List<MetricMetadata>> getAllMetrics() throws IOException {
-    String queryUrl = String.format("%s/api/v1/metadata",
-        uri.toString().replaceAll("/$", ""));
+    String queryUrl = String.format("%s/api/v1/metadata", uri.toString().replaceAll("/$", ""));
     logger.debug("queryUrl: " + queryUrl);
-    Request request = new Request.Builder()
-        .url(queryUrl)
-        .build();
+    Request request = new Request.Builder().url(queryUrl).build();
     Response response = this.okHttpClient.newCall(request).execute();
     JSONObject jsonObject = readResponse(response);
-    TypeReference<HashMap<String, List<MetricMetadata>>> typeRef
-        = new TypeReference<>() {};
+    TypeReference<HashMap<String, List<MetricMetadata>>> typeRef = new TypeReference<>() {};
     return new ObjectMapper().readValue(jsonObject.getJSONObject("data").toString(), typeRef);
   }
 
+  @Override
+  public JSONArray queryExemplars(String query, Long start, Long end) throws IOException {
+    String queryUrl =
+        String.format(
+            "%s/api/v1/query_exemplars?query=%s&start=%s&end=%s",
+            uri.toString().replaceAll("/$", ""),
+            URLEncoder.encode(query, StandardCharsets.UTF_8),
+            start,
+            end);
+    logger.debug("queryUrl: " + queryUrl);
+    Request request = new Request.Builder().url(queryUrl).build();
+    Response response = this.okHttpClient.newCall(request).execute();
+    JSONObject jsonObject = readResponse(response);
+    return jsonObject.getJSONArray("data");
+  }
+
   private List<String> toListOfLabels(JSONArray array) {
     List<String> result = new ArrayList<>();
     for (int i = 0; i < array.length(); i++) {
-      //__name__ is internal label in prometheus representing the metric name.
-      //Exempting this from labels list as it is not required in any of the operations.
+      // __name__ is internal label in prometheus representing the metric name.
+      // Exempting this from labels list as it is not required in any of the operations.
       if (!"__name__".equals(array.optString(i))) {
         result.add(array.optString(i));
       }
@@ -95,21 +111,24 @@ private List<String> toListOfLabels(JSONArray array) {
     return result;
   }
 
-
   private JSONObject readResponse(Response response) throws IOException {
     if (response.isSuccessful()) {
-      JSONObject jsonObject = new JSONObject(Objects.requireNonNull(response.body()).string());
+      JSONObject jsonObject;
+      try {
+        jsonObject = new JSONObject(Objects.requireNonNull(response.body()).string());
+      } catch (JSONException jsonException) {
+        throw new PrometheusClientException(
+            "Prometheus returned unexpected body, "
+                + "please verify your prometheus server setup.");
+      }
       if ("success".equals(jsonObject.getString("status"))) {
         return jsonObject;
       } else {
-        throw new RuntimeException(jsonObject.getString("error"));
+        throw new PrometheusClientException(jsonObject.getString("error"));
       }
     } else {
-      throw new RuntimeException(
-          String.format("Request to Prometheus is Unsuccessful with : %s", Objects.requireNonNull(
-              response.body(), "Response body can't be null").string()));
+      throw new PrometheusClientException(
+          String.format("Request to Prometheus is Unsuccessful with code : %s", response.code()));
     }
   }
-
-
-}
\ No newline at end of file
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/data/constants/PrometheusFieldConstants.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/data/constants/PrometheusFieldConstants.java
index 1afab200b3..0f687b3cd1 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/data/constants/PrometheusFieldConstants.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/data/constants/PrometheusFieldConstants.java
@@ -9,4 +9,15 @@ public class PrometheusFieldConstants {
   public static final String TIMESTAMP = "@timestamp";
   public static final String VALUE = "@value";
   public static final String LABELS = "@labels";
+  public static final String MATRIX_KEY = "matrix";
+  public static final String RESULT_TYPE_KEY = "resultType";
+  public static final String METRIC_KEY = "metric";
+  public static final String RESULT_KEY = "result";
+  public static final String VALUES_KEY = "values";
+  public static final String SERIES_LABELS_KEY = "seriesLabels";
+  public static final String EXEMPLARS_KEY = "exemplars";
+  public static final String TRACE_ID_KEY = "traceID";
+  public static final String LABELS_KEY = "labels";
+  public static final String TIMESTAMP_KEY = "timestamp";
+  public static final String VALUE_KEY = "value";
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/exceptions/PrometheusClientException.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/exceptions/PrometheusClientException.java
new file mode 100644
index 0000000000..4f429e00e4
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/exceptions/PrometheusClientException.java
@@ -0,0 +1,17 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.exceptions;
+
+import org.opensearch.sql.datasources.exceptions.DataSourceClientException;
+
+/** PrometheusClientException. */
+public class PrometheusClientException extends DataSourceClientException {
+  public PrometheusClientException(String message) {
+    super(message);
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/implementation/QueryExemplarFunctionImplementation.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/implementation/QueryExemplarFunctionImplementation.java
new file mode 100644
index 0000000000..bbd3a36f5f
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/implementation/QueryExemplarFunctionImplementation.java
@@ -0,0 +1,110 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.functions.implementation;
+
+import static org.opensearch.sql.prometheus.functions.resolver.QueryRangeTableFunctionResolver.ENDTIME;
+import static org.opensearch.sql.prometheus.functions.resolver.QueryRangeTableFunctionResolver.QUERY;
+import static org.opensearch.sql.prometheus.functions.resolver.QueryRangeTableFunctionResolver.STARTTIME;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.exception.ExpressionEvaluationException;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.FunctionExpression;
+import org.opensearch.sql.expression.NamedArgumentExpression;
+import org.opensearch.sql.expression.env.Environment;
+import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.expression.function.TableFunctionImplementation;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.request.PrometheusQueryExemplarsRequest;
+import org.opensearch.sql.prometheus.storage.QueryExemplarsTable;
+import org.opensearch.sql.storage.Table;
+
+public class QueryExemplarFunctionImplementation extends FunctionExpression
+    implements TableFunctionImplementation {
+
+  private final FunctionName functionName;
+  private final List<Expression> arguments;
+  private final PrometheusClient prometheusClient;
+
+  /**
+   * Required argument constructor.
+   *
+   * @param functionName name of the function
+   * @param arguments a list of arguments provided
+   */
+  public QueryExemplarFunctionImplementation(
+      FunctionName functionName, List<Expression> arguments, PrometheusClient prometheusClient) {
+    super(functionName, arguments);
+    this.functionName = functionName;
+    this.arguments = arguments;
+    this.prometheusClient = prometheusClient;
+  }
+
+  @Override
+  public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
+    throw new UnsupportedOperationException(
+        String.format(
+            "Prometheus defined function [%s] is only "
+                + "supported in SOURCE clause with prometheus connector catalog",
+            functionName));
+  }
+
+  @Override
+  public ExprType type() {
+    return ExprCoreType.STRUCT;
+  }
+
+  @Override
+  public String toString() {
+    List<String> args =
+        arguments.stream()
+            .map(
+                arg ->
+                    String.format(
+                        "%s=%s",
+                        ((NamedArgumentExpression) arg).getArgName(),
+                        ((NamedArgumentExpression) arg).getValue().toString()))
+            .collect(Collectors.toList());
+    return String.format("%s(%s)", functionName, String.join(", ", args));
+  }
+
+  @Override
+  public Table applyArguments() {
+    return new QueryExemplarsTable(prometheusClient, buildExemplarsQueryRequest(arguments));
+  }
+
+  private PrometheusQueryExemplarsRequest buildExemplarsQueryRequest(List<Expression> arguments) {
+
+    PrometheusQueryExemplarsRequest request = new PrometheusQueryExemplarsRequest();
+    arguments.forEach(
+        arg -> {
+          String argName = ((NamedArgumentExpression) arg).getArgName();
+          Expression argValue = ((NamedArgumentExpression) arg).getValue();
+          ExprValue literalValue = argValue.valueOf();
+          switch (argName) {
+            case QUERY:
+              request.setQuery((String) literalValue.value());
+              break;
+            case STARTTIME:
+              request.setStartTime(((Number) literalValue.value()).longValue());
+              break;
+            case ENDTIME:
+              request.setEndTime(((Number) literalValue.value()).longValue());
+              break;
+            default:
+              throw new ExpressionEvaluationException(
+                  String.format("Invalid Function Argument:%s", argName));
+          }
+        });
+    return request;
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/implementation/QueryRangeFunctionImplementation.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/implementation/QueryRangeFunctionImplementation.java
index 2d3710037a..0719bd1525 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/implementation/QueryRangeFunctionImplementation.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/implementation/QueryRangeFunctionImplementation.java
@@ -29,8 +29,8 @@
 import org.opensearch.sql.prometheus.storage.PrometheusMetricTable;
 import org.opensearch.sql.storage.Table;
 
-public class QueryRangeFunctionImplementation extends FunctionExpression implements
-    TableFunctionImplementation {
+public class QueryRangeFunctionImplementation extends FunctionExpression
+    implements TableFunctionImplementation {
 
   private final FunctionName functionName;
   private final List<Expression> arguments;
@@ -40,10 +40,10 @@ public class QueryRangeFunctionImplementation extends FunctionExpression impleme
    * Required argument constructor.
    *
    * @param functionName name of the function
-   * @param arguments    a list of expressions
+   * @param arguments a list of expressions
    */
-  public QueryRangeFunctionImplementation(FunctionName functionName, List<Expression> arguments,
-                                          PrometheusClient prometheusClient) {
+  public QueryRangeFunctionImplementation(
+      FunctionName functionName, List<Expression> arguments, PrometheusClient prometheusClient) {
     super(functionName, arguments);
     this.functionName = functionName;
     this.arguments = arguments;
@@ -52,10 +52,11 @@ public QueryRangeFunctionImplementation(FunctionName functionName, List<Expressi
 
   @Override
   public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
-    throw new UnsupportedOperationException(String.format(
-        "Prometheus defined function [%s] is only "
-            + "supported in SOURCE clause with prometheus connector catalog",
-        functionName));
+    throw new UnsupportedOperationException(
+        String.format(
+            "Prometheus defined function [%s] is only "
+                + "supported in SOURCE clause with prometheus connector catalog",
+            functionName));
   }
 
   @Override
@@ -65,10 +66,15 @@ public ExprType type() {
 
   @Override
   public String toString() {
-    List<String> args = arguments.stream()
-        .map(arg -> String.format("%s=%s", ((NamedArgumentExpression) arg)
-            .getArgName(), ((NamedArgumentExpression) arg).getValue().toString()))
-        .collect(Collectors.toList());
+    List<String> args =
+        arguments.stream()
+            .map(
+                arg ->
+                    String.format(
+                        "%s=%s",
+                        ((NamedArgumentExpression) arg).getArgName(),
+                        ((NamedArgumentExpression) arg).getValue().toString()))
+            .collect(Collectors.toList());
     return String.format("%s(%s)", functionName, String.join(", ", args));
   }
 
@@ -80,30 +86,29 @@ public Table applyArguments() {
   private PrometheusQueryRequest buildQueryFromQueryRangeFunction(List<Expression> arguments) {
 
     PrometheusQueryRequest prometheusQueryRequest = new PrometheusQueryRequest();
-    arguments.forEach(arg -> {
-      String argName = ((NamedArgumentExpression) arg).getArgName();
-      Expression argValue = ((NamedArgumentExpression) arg).getValue();
-      ExprValue literalValue = argValue.valueOf();
-      switch (argName) {
-        case QUERY:
-          prometheusQueryRequest
-              .setPromQl((String) literalValue.value());
-          break;
-        case STARTTIME:
-          prometheusQueryRequest.setStartTime(((Number) literalValue.value()).longValue());
-          break;
-        case ENDTIME:
-          prometheusQueryRequest.setEndTime(((Number) literalValue.value()).longValue());
-          break;
-        case STEP:
-          prometheusQueryRequest.setStep(literalValue.value().toString());
-          break;
-        default:
-          throw new ExpressionEvaluationException(
-              String.format("Invalid Function Argument:%s", argName));
-      }
-    });
+    arguments.forEach(
+        arg -> {
+          String argName = ((NamedArgumentExpression) arg).getArgName();
+          Expression argValue = ((NamedArgumentExpression) arg).getValue();
+          ExprValue literalValue = argValue.valueOf();
+          switch (argName) {
+            case QUERY:
+              prometheusQueryRequest.setPromQl((String) literalValue.value());
+              break;
+            case STARTTIME:
+              prometheusQueryRequest.setStartTime(((Number) literalValue.value()).longValue());
+              break;
+            case ENDTIME:
+              prometheusQueryRequest.setEndTime(((Number) literalValue.value()).longValue());
+              break;
+            case STEP:
+              prometheusQueryRequest.setStep(literalValue.value().toString());
+              break;
+            default:
+              throw new ExpressionEvaluationException(
+                  String.format("Invalid Function Argument:%s", argName));
+          }
+        });
     return prometheusQueryRequest;
   }
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/resolver/QueryExemplarsTableFunctionResolver.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/resolver/QueryExemplarsTableFunctionResolver.java
new file mode 100644
index 0000000000..78d87b0a0b
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/resolver/QueryExemplarsTableFunctionResolver.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.prometheus.functions.resolver;
+
+import static org.opensearch.sql.data.type.ExprCoreType.LONG;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.prometheus.utils.TableFunctionUtils.getNamedArgumentsOfTableFunction;
+import static org.opensearch.sql.prometheus.utils.TableFunctionUtils.validatePrometheusTableFunctionArguments;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.tuple.Pair;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.function.FunctionBuilder;
+import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.expression.function.FunctionResolver;
+import org.opensearch.sql.expression.function.FunctionSignature;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.functions.implementation.QueryExemplarFunctionImplementation;
+
+/**
+ * This class is for query_exemplars table function resolver {@link FunctionResolver}. It takes care
+ * of validating function arguments and also creating required {@link
+ * org.opensearch.sql.expression.function.TableFunctionImplementation} Class.
+ */
+@RequiredArgsConstructor
+public class QueryExemplarsTableFunctionResolver implements FunctionResolver {
+
+  private final PrometheusClient prometheusClient;
+  public static final String QUERY_EXEMPLARS = "query_exemplars";
+
+  public static final String QUERY = "query";
+  public static final String STARTTIME = "starttime";
+  public static final String ENDTIME = "endtime";
+
+  @Override
+  public Pair<FunctionSignature, FunctionBuilder> resolve(FunctionSignature unresolvedSignature) {
+    final FunctionName functionName = FunctionName.of(QUERY_EXEMPLARS);
+    FunctionSignature functionSignature =
+        new FunctionSignature(FunctionName.of(QUERY_EXEMPLARS), List.of(STRING, LONG, LONG));
+    FunctionBuilder functionBuilder =
+        (functionProperties, arguments) -> {
+          final List<String> argumentNames = List.of(QUERY, STARTTIME, ENDTIME);
+          validatePrometheusTableFunctionArguments(arguments, argumentNames);
+          List<Expression> namedArguments =
+              getNamedArgumentsOfTableFunction(arguments, argumentNames);
+          return new QueryExemplarFunctionImplementation(
+              functionName, namedArguments, prometheusClient);
+        };
+    return Pair.of(functionSignature, functionBuilder);
+  }
+
+  @Override
+  public FunctionName getFunctionName() {
+    return FunctionName.of(QUERY_EXEMPLARS);
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/resolver/QueryRangeTableFunctionResolver.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/resolver/QueryRangeTableFunctionResolver.java
index a1d72f98c3..8dfa12134e 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/resolver/QueryRangeTableFunctionResolver.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/resolver/QueryRangeTableFunctionResolver.java
@@ -9,18 +9,13 @@
 
 import static org.opensearch.sql.data.type.ExprCoreType.LONG;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.prometheus.utils.TableFunctionUtils.getNamedArgumentsOfTableFunction;
+import static org.opensearch.sql.prometheus.utils.TableFunctionUtils.validatePrometheusTableFunctionArguments;
 
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.Expression;
-import org.opensearch.sql.expression.NamedArgumentExpression;
 import org.opensearch.sql.expression.function.FunctionBuilder;
 import org.opensearch.sql.expression.function.FunctionName;
 import org.opensearch.sql.expression.function.FunctionResolver;
@@ -32,7 +27,6 @@
 public class QueryRangeTableFunctionResolver implements FunctionResolver {
 
   private final PrometheusClient prometheusClient;
-
   public static final String QUERY_RANGE = "query_range";
   public static final String QUERY = "query";
   public static final String STARTTIME = "starttime";
@@ -43,56 +37,21 @@ public class QueryRangeTableFunctionResolver implements FunctionResolver {
   public Pair<FunctionSignature, FunctionBuilder> resolve(FunctionSignature unresolvedSignature) {
     FunctionName functionName = FunctionName.of(QUERY_RANGE);
     FunctionSignature functionSignature =
-        new FunctionSignature(functionName, List.of(STRING, LONG, LONG, LONG));
+        new FunctionSignature(functionName, List.of(STRING, LONG, LONG, STRING));
     final List<String> argumentNames = List.of(QUERY, STARTTIME, ENDTIME, STEP);
-
-    FunctionBuilder functionBuilder = (functionProperties, arguments) -> {
-      Boolean argumentsPassedByName = arguments.stream()
-          .noneMatch(arg -> StringUtils.isEmpty(((NamedArgumentExpression) arg).getArgName()));
-      Boolean argumentsPassedByPosition = arguments.stream()
-          .allMatch(arg -> StringUtils.isEmpty(((NamedArgumentExpression) arg).getArgName()));
-      if (!(argumentsPassedByName || argumentsPassedByPosition)) {
-        throw new SemanticCheckException("Arguments should be either passed by name or position");
-      }
-
-      if (arguments.size() != argumentNames.size()) {
-        throw new SemanticCheckException(
-            generateErrorMessageForMissingArguments(argumentsPassedByPosition, arguments,
-                argumentNames));
-      }
-
-      if (argumentsPassedByPosition) {
-        List<Expression> namedArguments = new ArrayList<>();
-        for (int i = 0; i < arguments.size(); i++) {
-          namedArguments.add(new NamedArgumentExpression(argumentNames.get(i),
-              ((NamedArgumentExpression) arguments.get(i)).getValue()));
-        }
-        return new QueryRangeFunctionImplementation(functionName, namedArguments, prometheusClient);
-      }
-      return new QueryRangeFunctionImplementation(functionName, arguments, prometheusClient);
-    };
+    FunctionBuilder functionBuilder =
+        (functionProperties, arguments) -> {
+          validatePrometheusTableFunctionArguments(arguments, argumentNames);
+          List<Expression> namedArguments =
+              getNamedArgumentsOfTableFunction(arguments, argumentNames);
+          return new QueryRangeFunctionImplementation(
+              functionName, namedArguments, prometheusClient);
+        };
     return Pair.of(functionSignature, functionBuilder);
   }
 
-  private String generateErrorMessageForMissingArguments(Boolean argumentsPassedByPosition,
-                                                         List<Expression> arguments,
-                                                         List<String> argumentNames) {
-    if (argumentsPassedByPosition) {
-      return String.format("Missing arguments:[%s]",
-          String.join(",", argumentNames.subList(arguments.size(), argumentNames.size())));
-    } else {
-      Set<String> requiredArguments = new HashSet<>(argumentNames);
-      Set<String> providedArguments =
-          arguments.stream().map(expression -> ((NamedArgumentExpression) expression).getArgName())
-              .collect(Collectors.toSet());
-      requiredArguments.removeAll(providedArguments);
-      return String.format("Missing arguments:[%s]", String.join(",", requiredArguments));
-    }
-  }
-
   @Override
   public FunctionName getFunctionName() {
     return FunctionName.of(QUERY_RANGE);
   }
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/response/PrometheusFunctionResponseHandle.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/response/PrometheusFunctionResponseHandle.java
new file mode 100644
index 0000000000..bbc0516df6
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/response/PrometheusFunctionResponseHandle.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.prometheus.functions.response;
+
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.executor.ExecutionEngine;
+
+/** Handle Prometheus response. */
+public interface PrometheusFunctionResponseHandle {
+
+  /** Return true if Prometheus response has more result. */
+  boolean hasNext();
+
+  /**
+   * Return Prometheus response as {@link ExprValue}. Attention, the method must been called when
+   * hasNext return true.
+   */
+  ExprValue next();
+
+  /** Return ExecutionEngine.Schema of the Prometheus response. */
+  ExecutionEngine.Schema schema();
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/response/QueryExemplarsFunctionResponseHandle.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/response/QueryExemplarsFunctionResponseHandle.java
new file mode 100644
index 0000000000..8d1c267a90
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/response/QueryExemplarsFunctionResponseHandle.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.prometheus.functions.response;
+
+import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.EXEMPLARS_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.LABELS_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.SERIES_LABELS_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.TIMESTAMP_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.VALUE_KEY;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.opensearch.sql.data.model.ExprCollectionValue;
+import org.opensearch.sql.data.model.ExprDoubleValue;
+import org.opensearch.sql.data.model.ExprStringValue;
+import org.opensearch.sql.data.model.ExprTimestampValue;
+import org.opensearch.sql.data.model.ExprTupleValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.executor.ExecutionEngine;
+
+public class QueryExemplarsFunctionResponseHandle implements PrometheusFunctionResponseHandle {
+  private Iterator<ExprValue> responseIterator;
+  private ExecutionEngine.Schema schema;
+
+  /**
+   * Constructor.
+   *
+   * @param responseArray Query Exemplars responseObject.
+   */
+  public QueryExemplarsFunctionResponseHandle(JSONArray responseArray) {
+    constructIteratorAndSchema(responseArray);
+  }
+
+  private void constructIteratorAndSchema(JSONArray responseArray) {
+    List<ExecutionEngine.Schema.Column> columnList = new ArrayList<>();
+    columnList.add(new ExecutionEngine.Schema.Column(SERIES_LABELS_KEY, SERIES_LABELS_KEY, STRUCT));
+    columnList.add(
+        new ExecutionEngine.Schema.Column(EXEMPLARS_KEY, EXEMPLARS_KEY, ExprCoreType.ARRAY));
+    this.schema = new ExecutionEngine.Schema(columnList);
+    List<ExprValue> result = new ArrayList<>();
+    for (int i = 0; i < responseArray.length(); i++) {
+      JSONObject rowObject = responseArray.getJSONObject(i);
+      LinkedHashMap<String, ExprValue> rowMap = new LinkedHashMap<>();
+      JSONObject seriesLabels = rowObject.getJSONObject(SERIES_LABELS_KEY);
+      rowMap.put(SERIES_LABELS_KEY, constructSeriesLabels(seriesLabels));
+      JSONArray exemplars = rowObject.getJSONArray(EXEMPLARS_KEY);
+      rowMap.put(EXEMPLARS_KEY, constructExemplarList(exemplars));
+      result.add(new ExprTupleValue(rowMap));
+    }
+    this.responseIterator = result.iterator();
+  }
+
+  private ExprValue constructSeriesLabels(JSONObject seriesLabels) {
+    LinkedHashMap<String, ExprValue> seriesLabelsMap = new LinkedHashMap<>();
+    seriesLabels
+        .keySet()
+        .forEach(key -> seriesLabelsMap.put(key, new ExprStringValue(seriesLabels.getString(key))));
+    return new ExprTupleValue(seriesLabelsMap);
+  }
+
+  private ExprValue constructExemplarList(JSONArray exemplars) {
+    List<ExprValue> exemplarsList = new ArrayList<>();
+    for (int i = 0; i < exemplars.length(); i++) {
+      JSONObject exemplarsJSONObject = exemplars.getJSONObject(i);
+      exemplarsList.add(constructExemplar(exemplarsJSONObject));
+    }
+    return new ExprCollectionValue(exemplarsList);
+  }
+
+  private ExprValue constructExemplar(JSONObject exemplarsJSONObject) {
+    LinkedHashMap<String, ExprValue> exemplarHashMap = new LinkedHashMap<>();
+    exemplarHashMap.put(
+        LABELS_KEY, constructLabelsInExemplar(exemplarsJSONObject.getJSONObject(LABELS_KEY)));
+    exemplarHashMap.put(
+        TIMESTAMP_KEY,
+        new ExprTimestampValue(
+            Instant.ofEpochMilli((long) (exemplarsJSONObject.getDouble(TIMESTAMP_KEY) * 1000))));
+    exemplarHashMap.put(VALUE_KEY, new ExprDoubleValue(exemplarsJSONObject.getDouble(VALUE_KEY)));
+    return new ExprTupleValue(exemplarHashMap);
+  }
+
+  private ExprValue constructLabelsInExemplar(JSONObject labelsObject) {
+    LinkedHashMap<String, ExprValue> labelsMap = new LinkedHashMap<>();
+    for (String key : labelsObject.keySet()) {
+      labelsMap.put(key, new ExprStringValue(labelsObject.getString(key)));
+    }
+    return new ExprTupleValue(labelsMap);
+  }
+
+  @Override
+  public boolean hasNext() {
+    return responseIterator.hasNext();
+  }
+
+  @Override
+  public ExprValue next() {
+    return responseIterator.next();
+  }
+
+  @Override
+  public ExecutionEngine.Schema schema() {
+    return schema;
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/response/QueryRangeFunctionResponseHandle.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/response/QueryRangeFunctionResponseHandle.java
new file mode 100644
index 0000000000..e10c9d7aff
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/response/QueryRangeFunctionResponseHandle.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.prometheus.functions.response;
+
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.LABELS;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.MATRIX_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.METRIC_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.RESULT_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.RESULT_TYPE_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.TIMESTAMP;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.VALUE;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.VALUES_KEY;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.opensearch.sql.data.model.ExprCollectionValue;
+import org.opensearch.sql.data.model.ExprDoubleValue;
+import org.opensearch.sql.data.model.ExprStringValue;
+import org.opensearch.sql.data.model.ExprTimestampValue;
+import org.opensearch.sql.data.model.ExprTupleValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.executor.ExecutionEngine;
+
+/** Default implementation of QueryRangeFunctionResponseHandle. */
+public class QueryRangeFunctionResponseHandle implements PrometheusFunctionResponseHandle {
+
+  private final JSONObject responseObject;
+  private Iterator<ExprValue> responseIterator;
+  private ExecutionEngine.Schema schema;
+
+  /**
+   * Constructor.
+   *
+   * @param responseObject Prometheus responseObject.
+   */
+  public QueryRangeFunctionResponseHandle(JSONObject responseObject) {
+    this.responseObject = responseObject;
+    constructSchema();
+    constructIterator();
+  }
+
+  private void constructIterator() {
+    List<ExprValue> result = new ArrayList<>();
+    if (MATRIX_KEY.equals(responseObject.getString(RESULT_TYPE_KEY))) {
+      JSONArray itemArray = responseObject.getJSONArray(RESULT_KEY);
+      for (int i = 0; i < itemArray.length(); i++) {
+        LinkedHashMap<String, ExprValue> linkedHashMap = new LinkedHashMap<>();
+        JSONObject item = itemArray.getJSONObject(i);
+        linkedHashMap.put(LABELS, extractLabels(item.getJSONObject(METRIC_KEY)));
+        extractTimestampAndValues(item.getJSONArray(VALUES_KEY), linkedHashMap);
+        result.add(new ExprTupleValue(linkedHashMap));
+      }
+    } else {
+      throw new RuntimeException(
+          String.format(
+              "Unexpected Result Type: %s during Prometheus "
+                  + "Response Parsing. 'matrix' resultType is expected",
+              responseObject.getString("resultType")));
+    }
+    this.responseIterator = result.iterator();
+  }
+
+  private static void extractTimestampAndValues(
+      JSONArray values, LinkedHashMap<String, ExprValue> linkedHashMap) {
+    List<ExprValue> timestampList = new ArrayList<>();
+    List<ExprValue> valueList = new ArrayList<>();
+    for (int j = 0; j < values.length(); j++) {
+      JSONArray value = values.getJSONArray(j);
+      timestampList.add(
+          new ExprTimestampValue(Instant.ofEpochMilli((long) (value.getDouble(0) * 1000))));
+      valueList.add(new ExprDoubleValue(value.getDouble(1)));
+    }
+    linkedHashMap.put(TIMESTAMP, new ExprCollectionValue(timestampList));
+    linkedHashMap.put(VALUE, new ExprCollectionValue(valueList));
+  }
+
+  private void constructSchema() {
+    this.schema = new ExecutionEngine.Schema(getColumnList());
+  }
+
+  private ExprValue extractLabels(JSONObject metric) {
+    LinkedHashMap<String, ExprValue> labelsMap = new LinkedHashMap<>();
+    metric.keySet().forEach(key -> labelsMap.put(key, new ExprStringValue(metric.getString(key))));
+    return new ExprTupleValue(labelsMap);
+  }
+
+  private List<ExecutionEngine.Schema.Column> getColumnList() {
+    List<ExecutionEngine.Schema.Column> columnList = new ArrayList<>();
+    columnList.add(new ExecutionEngine.Schema.Column(LABELS, LABELS, ExprCoreType.STRUCT));
+    columnList.add(new ExecutionEngine.Schema.Column(TIMESTAMP, TIMESTAMP, ExprCoreType.ARRAY));
+    columnList.add(new ExecutionEngine.Schema.Column(VALUE, VALUE, ExprCoreType.ARRAY));
+    return columnList;
+  }
+
+  @Override
+  public boolean hasNext() {
+    return responseIterator.hasNext();
+  }
+
+  @Override
+  public ExprValue next() {
+    return responseIterator.next();
+  }
+
+  @Override
+  public ExecutionEngine.Schema schema() {
+    return schema;
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanBuilder.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanBuilder.java
new file mode 100644
index 0000000000..7e779eb77c
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanBuilder.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.prometheus.functions.scan;
+
+import lombok.AllArgsConstructor;
+import org.opensearch.sql.planner.logical.LogicalProject;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.request.PrometheusQueryExemplarsRequest;
+import org.opensearch.sql.storage.TableScanOperator;
+import org.opensearch.sql.storage.read.TableScanBuilder;
+
+/** TableScanBuilder for query_exemplars table function of prometheus connector. */
+@AllArgsConstructor
+public class QueryExemplarsFunctionTableScanBuilder extends TableScanBuilder {
+
+  private final PrometheusClient prometheusClient;
+
+  private final PrometheusQueryExemplarsRequest prometheusQueryExemplarsRequest;
+
+  @Override
+  public TableScanOperator build() {
+    return new QueryExemplarsFunctionTableScanOperator(
+        prometheusClient, prometheusQueryExemplarsRequest);
+  }
+
+  // Since we are determining the schema after table scan,
+  // we are ignoring default Logical Project added in the plan.
+  @Override
+  public boolean pushDownProject(LogicalProject project) {
+    return true;
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanOperator.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanOperator.java
new file mode 100644
index 0000000000..1a58429328
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanOperator.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.prometheus.functions.scan;
+
+import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Locale;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONArray;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.functions.response.QueryExemplarsFunctionResponseHandle;
+import org.opensearch.sql.prometheus.request.PrometheusQueryExemplarsRequest;
+import org.opensearch.sql.storage.TableScanOperator;
+
+/**
+ * This class is for QueryExemplars function {@link TableScanOperator}. This takes care of getting
+ * exemplar data from prometheus by making {@link PrometheusQueryExemplarsRequest}.
+ */
+@RequiredArgsConstructor
+public class QueryExemplarsFunctionTableScanOperator extends TableScanOperator {
+
+  private final PrometheusClient prometheusClient;
+
+  @Getter private final PrometheusQueryExemplarsRequest request;
+  private QueryExemplarsFunctionResponseHandle queryExemplarsFunctionResponseHandle;
+  private static final Logger LOG = LogManager.getLogger();
+
+  @Override
+  public void open() {
+    super.open();
+    this.queryExemplarsFunctionResponseHandle =
+        AccessController.doPrivileged(
+            (PrivilegedAction<QueryExemplarsFunctionResponseHandle>)
+                () -> {
+                  try {
+                    JSONArray responseArray =
+                        prometheusClient.queryExemplars(
+                            request.getQuery(), request.getStartTime(), request.getEndTime());
+                    return new QueryExemplarsFunctionResponseHandle(responseArray);
+                  } catch (IOException e) {
+                    LOG.error(e.getMessage());
+                    throw new RuntimeException(
+                        String.format(
+                            "Error fetching data from prometheus server: %s", e.getMessage()));
+                  }
+                });
+  }
+
+  @Override
+  public void close() {
+    super.close();
+  }
+
+  @Override
+  public boolean hasNext() {
+    return this.queryExemplarsFunctionResponseHandle.hasNext();
+  }
+
+  @Override
+  public ExprValue next() {
+    return this.queryExemplarsFunctionResponseHandle.next();
+  }
+
+  @Override
+  public String explain() {
+    return String.format(
+        Locale.ROOT,
+        "query_exemplars(%s, %s, %s)",
+        request.getQuery(),
+        request.getStartTime(),
+        request.getEndTime());
+  }
+
+  @Override
+  public ExecutionEngine.Schema schema() {
+    return queryExemplarsFunctionResponseHandle.schema();
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanBuilder.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanBuilder.java
new file mode 100644
index 0000000000..2d22c0af69
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanBuilder.java
@@ -0,0 +1,37 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.functions.scan;
+
+import lombok.AllArgsConstructor;
+import org.opensearch.sql.planner.logical.LogicalProject;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.request.PrometheusQueryRequest;
+import org.opensearch.sql.storage.TableScanOperator;
+import org.opensearch.sql.storage.read.TableScanBuilder;
+
+/**
+ * TableScanBuilder for query_range table function of prometheus connector. we can merge this when
+ * we refactor for existing ppl queries based on prometheus connector.
+ */
+@AllArgsConstructor
+public class QueryRangeFunctionTableScanBuilder extends TableScanBuilder {
+
+  private final PrometheusClient prometheusClient;
+
+  private final PrometheusQueryRequest prometheusQueryRequest;
+
+  @Override
+  public TableScanOperator build() {
+    return new QueryRangeFunctionTableScanOperator(prometheusClient, prometheusQueryRequest);
+  }
+
+  @Override
+  public boolean pushDownProject(LogicalProject project) {
+    return true;
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanOperator.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanOperator.java
new file mode 100644
index 0000000000..fc3f9f9a9b
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanOperator.java
@@ -0,0 +1,91 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.functions.scan;
+
+import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Locale;
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONObject;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.functions.response.PrometheusFunctionResponseHandle;
+import org.opensearch.sql.prometheus.functions.response.QueryRangeFunctionResponseHandle;
+import org.opensearch.sql.prometheus.request.PrometheusQueryRequest;
+import org.opensearch.sql.storage.TableScanOperator;
+
+/** This a table scan operator to handle Query Range table function. */
+@RequiredArgsConstructor
+public class QueryRangeFunctionTableScanOperator extends TableScanOperator {
+
+  private final PrometheusClient prometheusClient;
+
+  private final PrometheusQueryRequest request;
+  private PrometheusFunctionResponseHandle prometheusResponseHandle;
+
+  private static final Logger LOG = LogManager.getLogger();
+
+  @Override
+  public void open() {
+    super.open();
+    this.prometheusResponseHandle =
+        AccessController.doPrivileged(
+            (PrivilegedAction<PrometheusFunctionResponseHandle>)
+                () -> {
+                  try {
+                    JSONObject responseObject =
+                        prometheusClient.queryRange(
+                            request.getPromQl(),
+                            request.getStartTime(),
+                            request.getEndTime(),
+                            request.getStep());
+                    return new QueryRangeFunctionResponseHandle(responseObject);
+                  } catch (IOException e) {
+                    LOG.error(e.getMessage());
+                    throw new RuntimeException(
+                        String.format(
+                            "Error fetching data from prometheus server: %s", e.getMessage()));
+                  }
+                });
+  }
+
+  @Override
+  public void close() {
+    super.close();
+  }
+
+  @Override
+  public boolean hasNext() {
+    return this.prometheusResponseHandle.hasNext();
+  }
+
+  @Override
+  public ExprValue next() {
+    return this.prometheusResponseHandle.next();
+  }
+
+  @Override
+  public String explain() {
+    return String.format(
+        Locale.ROOT,
+        "query_range(%s, %s, %s, %s)",
+        request.getPromQl(),
+        request.getStartTime(),
+        request.getEndTime(),
+        request.getStep());
+  }
+
+  @Override
+  public ExecutionEngine.Schema schema() {
+    return this.prometheusResponseHandle.schema();
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalMetricAgg.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalMetricAgg.java
index f348c699a1..f7c45f6ad2 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalMetricAgg.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalMetricAgg.java
@@ -20,10 +20,7 @@
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalPlanNodeVisitor;
 
-
-/**
- * Logical Metric Scan along with aggregation Operation.
- */
+/** Logical Metric Scan along with aggregation Operation. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
@@ -31,37 +28,29 @@ public class PrometheusLogicalMetricAgg extends LogicalPlan {
 
   private final String metricName;
 
-  /**
-   * Filter Condition.
-   */
-  @Setter
-  private Expression filter;
+  /** Filter Condition. */
+  @Setter private Expression filter;
 
-  /**
-   * Aggregation List.
-   */
-  @Setter
-  private List<NamedAggregator> aggregatorList;
+  /** Aggregation List. */
+  @Setter private List<NamedAggregator> aggregatorList;
 
-  /**
-   * Group List.
-   */
-  @Setter
-  private List<NamedExpression> groupByList;
+  /** Group List. */
+  @Setter private List<NamedExpression> groupByList;
 
   /**
    * Constructor for LogicalMetricAgg Logical Plan.
    *
-   * @param metricName     metricName
-   * @param filter         filter
+   * @param metricName metricName
+   * @param filter filter
    * @param aggregatorList aggregatorList
-   * @param groupByList    groupByList.
+   * @param groupByList groupByList.
    */
   @Builder
-  public PrometheusLogicalMetricAgg(String metricName,
-                                    Expression filter,
-                                    List<NamedAggregator> aggregatorList,
-                                    List<NamedExpression> groupByList) {
+  public PrometheusLogicalMetricAgg(
+      String metricName,
+      Expression filter,
+      List<NamedAggregator> aggregatorList,
+      List<NamedExpression> groupByList) {
     super(ImmutableList.of());
     this.metricName = metricName;
     this.filter = filter;
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalMetricScan.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalMetricScan.java
index 5e07d6899f..7b28a8a6c9 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalMetricScan.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalMetricScan.java
@@ -17,8 +17,8 @@
 import org.opensearch.sql.planner.logical.LogicalPlanNodeVisitor;
 
 /**
- * Prometheus Logical Metric Scan Operation.
- * In an optimized plan this node represents both Relation and Filter Operation.
+ * Prometheus Logical Metric Scan Operation. In an optimized plan this node represents both Relation
+ * and Filter Operation.
  */
 @Getter
 @ToString
@@ -27,9 +27,7 @@ public class PrometheusLogicalMetricScan extends LogicalPlan {
 
   private final String metricName;
 
-  /**
-   * Filter Condition.
-   */
+  /** Filter Condition. */
   private final Expression filter;
 
   /**
@@ -39,8 +37,7 @@ public class PrometheusLogicalMetricScan extends LogicalPlan {
    * @param filter filter.
    */
   @Builder
-  public PrometheusLogicalMetricScan(String metricName,
-      Expression filter) {
+  public PrometheusLogicalMetricScan(String metricName, Expression filter) {
     super(ImmutableList.of());
     this.metricName = metricName;
     this.filter = filter;
@@ -50,5 +47,4 @@ public PrometheusLogicalMetricScan(String metricName,
   public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
     return visitor.visitNode(this, context);
   }
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalPlanOptimizerFactory.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalPlanOptimizerFactory.java
index 8a365b2786..ea14be0e0a 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalPlanOptimizerFactory.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicalPlanOptimizerFactory.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.prometheus.planner.logical;
 
-
 import java.util.Arrays;
 import lombok.experimental.UtilityClass;
 import org.opensearch.sql.planner.optimizer.LogicalPlanOptimizer;
@@ -13,20 +12,14 @@
 import org.opensearch.sql.prometheus.planner.logical.rules.MergeAggAndRelation;
 import org.opensearch.sql.prometheus.planner.logical.rules.MergeFilterAndRelation;
 
-/**
- * Prometheus storage engine specified logical plan optimizer.
- */
+/** Prometheus storage engine specified logical plan optimizer. */
 @UtilityClass
 public class PrometheusLogicalPlanOptimizerFactory {
 
-  /**
-   * Create Prometheus storage specified logical plan optimizer.
-   */
+  /** Create Prometheus storage specified logical plan optimizer. */
   public static LogicalPlanOptimizer create() {
-    return new LogicalPlanOptimizer(Arrays.asList(
-        new MergeFilterAndRelation(),
-        new MergeAggAndIndexScan(),
-        new MergeAggAndRelation()
-    ));
+    return new LogicalPlanOptimizer(
+        Arrays.asList(
+            new MergeFilterAndRelation(), new MergeAggAndIndexScan(), new MergeAggAndRelation()));
   }
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeAggAndIndexScan.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeAggAndIndexScan.java
index 76bc6cc840..2594b74eb5 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeAggAndIndexScan.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeAggAndIndexScan.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.prometheus.planner.logical.rules;
 
 import static com.facebook.presto.matching.Pattern.typeOf;
@@ -20,9 +19,7 @@
 import org.opensearch.sql.prometheus.planner.logical.PrometheusLogicalMetricAgg;
 import org.opensearch.sql.prometheus.planner.logical.PrometheusLogicalMetricScan;
 
-/**
- * Merge Aggregation -- Relation to MetricScanAggregation.
- */
+/** Merge Aggregation -- Relation to MetricScanAggregation. */
 public class MergeAggAndIndexScan implements Rule<LogicalAggregation> {
 
   private final Capture<PrometheusLogicalMetricScan> capture;
@@ -31,22 +28,18 @@ public class MergeAggAndIndexScan implements Rule<LogicalAggregation> {
   @Getter
   private final Pattern<LogicalAggregation> pattern;
 
-  /**
-   * Constructor of MergeAggAndIndexScan.
-   */
+  /** Constructor of MergeAggAndIndexScan. */
   public MergeAggAndIndexScan() {
     this.capture = Capture.newCapture();
-    this.pattern = typeOf(LogicalAggregation.class)
-        .with(source().matching(typeOf(PrometheusLogicalMetricScan.class)
-            .capturedAs(capture)));
+    this.pattern =
+        typeOf(LogicalAggregation.class)
+            .with(source().matching(typeOf(PrometheusLogicalMetricScan.class).capturedAs(capture)));
   }
 
   @Override
-  public LogicalPlan apply(LogicalAggregation aggregation,
-                           Captures captures) {
+  public LogicalPlan apply(LogicalAggregation aggregation, Captures captures) {
     PrometheusLogicalMetricScan indexScan = captures.get(capture);
-    return PrometheusLogicalMetricAgg
-        .builder()
+    return PrometheusLogicalMetricAgg.builder()
         .metricName(indexScan.getMetricName())
         .filter(indexScan.getFilter())
         .aggregatorList(aggregation.getAggregatorList())
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeAggAndRelation.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeAggAndRelation.java
index fa9b0c7206..e6170e41f9 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeAggAndRelation.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeAggAndRelation.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.prometheus.planner.logical.rules;
 
 import static com.facebook.presto.matching.Pattern.typeOf;
@@ -20,9 +19,7 @@
 import org.opensearch.sql.planner.optimizer.Rule;
 import org.opensearch.sql.prometheus.planner.logical.PrometheusLogicalMetricAgg;
 
-/**
- * Merge Aggregation -- Relation to IndexScanAggregation.
- */
+/** Merge Aggregation -- Relation to IndexScanAggregation. */
 public class MergeAggAndRelation implements Rule<LogicalAggregation> {
 
   private final Capture<LogicalRelation> relationCapture;
@@ -31,21 +28,18 @@ public class MergeAggAndRelation implements Rule<LogicalAggregation> {
   @Getter
   private final Pattern<LogicalAggregation> pattern;
 
-  /**
-   * Constructor of MergeAggAndRelation.
-   */
+  /** Constructor of MergeAggAndRelation. */
   public MergeAggAndRelation() {
     this.relationCapture = Capture.newCapture();
-    this.pattern = typeOf(LogicalAggregation.class)
-        .with(source().matching(typeOf(LogicalRelation.class).capturedAs(relationCapture)));
+    this.pattern =
+        typeOf(LogicalAggregation.class)
+            .with(source().matching(typeOf(LogicalRelation.class).capturedAs(relationCapture)));
   }
 
   @Override
-  public LogicalPlan apply(LogicalAggregation aggregation,
-                           Captures captures) {
+  public LogicalPlan apply(LogicalAggregation aggregation, Captures captures) {
     LogicalRelation relation = captures.get(relationCapture);
-    return PrometheusLogicalMetricAgg
-        .builder()
+    return PrometheusLogicalMetricAgg.builder()
         .metricName(relation.getRelationName())
         .aggregatorList(aggregation.getAggregatorList())
         .groupByList(aggregation.getGroupByList())
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeFilterAndRelation.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeFilterAndRelation.java
index a99eb695be..2013938d73 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeFilterAndRelation.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/planner/logical/rules/MergeFilterAndRelation.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.prometheus.planner.logical.rules;
 
 import static com.facebook.presto.matching.Pattern.typeOf;
@@ -18,21 +17,18 @@
 import org.opensearch.sql.planner.optimizer.Rule;
 import org.opensearch.sql.prometheus.planner.logical.PrometheusLogicalMetricScan;
 
-/**
- * Merge Filter -- Relation to LogicalMetricScan.
- */
+/** Merge Filter -- Relation to LogicalMetricScan. */
 public class MergeFilterAndRelation implements Rule<LogicalFilter> {
 
   private final Capture<LogicalRelation> relationCapture;
   private final Pattern<LogicalFilter> pattern;
 
-  /**
-   * Constructor of MergeFilterAndRelation.
-   */
+  /** Constructor of MergeFilterAndRelation. */
   public MergeFilterAndRelation() {
     this.relationCapture = Capture.newCapture();
-    this.pattern = typeOf(LogicalFilter.class)
-        .with(source().matching(typeOf(LogicalRelation.class).capturedAs(relationCapture)));
+    this.pattern =
+        typeOf(LogicalFilter.class)
+            .with(source().matching(typeOf(LogicalRelation.class).capturedAs(relationCapture)));
   }
 
   @Override
@@ -41,11 +37,9 @@ public Pattern<LogicalFilter> pattern() {
   }
 
   @Override
-  public LogicalPlan apply(LogicalFilter filter,
-                           Captures captures) {
+  public LogicalPlan apply(LogicalFilter filter, Captures captures) {
     LogicalRelation relation = captures.get(relationCapture);
-    return PrometheusLogicalMetricScan
-        .builder()
+    return PrometheusLogicalMetricScan.builder()
         .metricName(relation.getRelationName())
         .filter(filter.getCondition())
         .build();
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/request/PrometheusQueryExemplarsRequest.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/request/PrometheusQueryExemplarsRequest.java
new file mode 100644
index 0000000000..d4eea97c48
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/request/PrometheusQueryExemplarsRequest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.prometheus.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/** Prometheus metric query request. */
+@EqualsAndHashCode
+@Data
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+public class PrometheusQueryExemplarsRequest {
+
+  /** PromQL. */
+  private String query;
+
+  /** startTime of the query. */
+  private Long startTime;
+
+  /** endTime of the query. */
+  private Long endTime;
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/request/PrometheusQueryRequest.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/request/PrometheusQueryRequest.java
index 176a52a1d9..e24c27c52a 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/request/PrometheusQueryRequest.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/request/PrometheusQueryRequest.java
@@ -3,20 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.prometheus.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import lombok.ToString;
 
-/**
- * Prometheus metric query request.
- */
+/** Prometheus metric query request. */
 @EqualsAndHashCode
 @Data
 @ToString
@@ -24,24 +19,15 @@
 @NoArgsConstructor
 public class PrometheusQueryRequest {
 
-  /**
-   * PromQL.
-   */
+  /** PromQL. */
   private String promQl;
 
-  /**
-   * startTime of the query.
-   */
+  /** startTime of the query. */
   private Long startTime;
 
-  /**
-   * endTime of the query.
-   */
+  /** endTime of the query. */
   private Long endTime;
 
-  /**
-   * step is the resolution required between startTime and endTime.
-   */
+  /** step is the resolution required between startTime and endTime. */
   private String step;
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusDescribeMetricRequest.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusDescribeMetricRequest.java
index 2e0d46b3e8..a5301b1d77 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusDescribeMetricRequest.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusDescribeMetricRequest.java
@@ -5,7 +5,6 @@
  *
  */
 
-
 package org.opensearch.sql.prometheus.request.system;
 
 import static org.opensearch.sql.data.model.ExprValueUtils.stringValue;
@@ -28,63 +27,67 @@
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.exceptions.PrometheusClientException;
 import org.opensearch.sql.prometheus.storage.PrometheusMetricDefaultSchema;
 
 /**
- * Describe Metric metadata request.
- * This is triggered in case of both query range table function and relation.
- * In case of table function metric name is null.
+ * Describe Metric metadata request. This is triggered in case of both query range table function
+ * and relation. In case of table function metric name is null.
  */
 @ToString(onlyExplicitlyIncluded = true)
 public class PrometheusDescribeMetricRequest implements PrometheusSystemRequest {
 
   private final PrometheusClient prometheusClient;
 
-  @ToString.Include
-  private final String metricName;
+  @ToString.Include private final String metricName;
 
   private final DataSourceSchemaName dataSourceSchemaName;
 
   private static final Logger LOG = LogManager.getLogger();
 
   /**
-   * Constructor for Prometheus Describe Metric Request.
-   * In case of pass through queries like query_range function,
-   * metric names are optional.
+   * Constructor for Prometheus Describe Metric Request. In case of pass through queries like
+   * query_range function, metric names are optional.
    *
-   * @param prometheusClient  prometheusClient.
+   * @param prometheusClient prometheusClient.
    * @param dataSourceSchemaName dataSourceSchemaName.
-   * @param metricName        metricName.
+   * @param metricName metricName.
    */
-  public PrometheusDescribeMetricRequest(PrometheusClient prometheusClient,
-                                         DataSourceSchemaName dataSourceSchemaName,
-                                         @NonNull String metricName) {
+  public PrometheusDescribeMetricRequest(
+      PrometheusClient prometheusClient,
+      DataSourceSchemaName dataSourceSchemaName,
+      @NonNull String metricName) {
     this.prometheusClient = prometheusClient;
     this.metricName = metricName;
     this.dataSourceSchemaName = dataSourceSchemaName;
   }
 
-
   /**
-   * Get the mapping of field and type.
-   * Returns labels and default schema fields.
+   * Get the mapping of field and type. Returns labels and default schema fields.
    *
    * @return mapping of field and type.
    */
   public Map<String, ExprType> getFieldTypes() {
     Map<String, ExprType> fieldTypes = new HashMap<>();
-    AccessController.doPrivileged((PrivilegedAction<List<Void>>) () -> {
-      try {
-        prometheusClient.getLabels(metricName)
-            .forEach(label -> fieldTypes.put(label, ExprCoreType.STRING));
-      } catch (IOException e) {
-        LOG.error("Error while fetching labels for {} from prometheus: {}",
-            metricName, e.getMessage());
-        throw new RuntimeException(String.format("Error while fetching labels "
-            + "for %s from prometheus: %s", metricName, e.getMessage()));
-      }
-      return null;
-    });
+    AccessController.doPrivileged(
+        (PrivilegedAction<List<Void>>)
+            () -> {
+              try {
+                prometheusClient
+                    .getLabels(metricName)
+                    .forEach(label -> fieldTypes.put(label, ExprCoreType.STRING));
+              } catch (IOException e) {
+                LOG.error(
+                    "Error while fetching labels for {} from prometheus: {}",
+                    metricName,
+                    e.getMessage());
+                throw new PrometheusClientException(
+                    String.format(
+                        "Error while fetching labels " + "for %s from prometheus: %s",
+                        metricName, e.getMessage()));
+              }
+              return null;
+            });
     fieldTypes.putAll(PrometheusMetricDefaultSchema.DEFAULT_MAPPING.getMapping());
     return fieldTypes;
   }
@@ -93,14 +96,17 @@ public Map<String, ExprType> getFieldTypes() {
   public List<ExprValue> search() {
     List<ExprValue> results = new ArrayList<>();
     for (Map.Entry<String, ExprType> entry : getFieldTypes().entrySet()) {
-      results.add(row(entry.getKey(), entry.getValue().legacyTypeName().toLowerCase(),
-          dataSourceSchemaName));
+      results.add(
+          row(
+              entry.getKey(),
+              entry.getValue().legacyTypeName().toLowerCase(),
+              dataSourceSchemaName));
     }
     return results;
   }
 
-  private ExprTupleValue row(String fieldName, String fieldType,
-                             DataSourceSchemaName dataSourceSchemaName) {
+  private ExprTupleValue row(
+      String fieldName, String fieldType, DataSourceSchemaName dataSourceSchemaName) {
     LinkedHashMap<String, ExprValue> valueMap = new LinkedHashMap<>();
     valueMap.put("TABLE_CATALOG", stringValue(dataSourceSchemaName.getDataSourceName()));
     valueMap.put("TABLE_SCHEMA", stringValue(dataSourceSchemaName.getSchemaName()));
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusListMetricsRequest.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusListMetricsRequest.java
index f5d2a44340..0e6c2bb2c6 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusListMetricsRequest.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusListMetricsRequest.java
@@ -34,28 +34,33 @@ public class PrometheusListMetricsRequest implements PrometheusSystemRequest {
 
   private static final Logger LOG = LogManager.getLogger();
 
-
   @Override
   public List<ExprValue> search() {
-    return AccessController.doPrivileged((PrivilegedAction<List<ExprValue>>) () -> {
-      try {
-        Map<String, List<MetricMetadata>> result = prometheusClient.getAllMetrics();
-        return result.keySet()
-            .stream()
-            .map(x -> {
-              MetricMetadata metricMetadata = result.get(x).get(0);
-              return row(x, metricMetadata.getType(),
-                  metricMetadata.getUnit(), metricMetadata.getHelp());
-            })
-            .collect(Collectors.toList());
-      } catch (IOException e) {
-        LOG.error("Error while fetching metric list for from prometheus: {}",
-            e.getMessage());
-        throw new RuntimeException(String.format("Error while fetching metric list "
-            + "for from prometheus: %s", e.getMessage()));
-      }
-    });
-
+    return AccessController.doPrivileged(
+        (PrivilegedAction<List<ExprValue>>)
+            () -> {
+              try {
+                Map<String, List<MetricMetadata>> result = prometheusClient.getAllMetrics();
+                return result.keySet().stream()
+                    .map(
+                        x -> {
+                          MetricMetadata metricMetadata = result.get(x).get(0);
+                          return row(
+                              x,
+                              metricMetadata.getType(),
+                              metricMetadata.getUnit(),
+                              metricMetadata.getHelp());
+                        })
+                    .collect(Collectors.toList());
+              } catch (IOException e) {
+                LOG.error(
+                    "Error while fetching metric list for from prometheus: {}", e.getMessage());
+                throw new RuntimeException(
+                    String.format(
+                        "Error while fetching metric list " + "for from prometheus: %s",
+                        e.getMessage()));
+              }
+            });
   }
 
   private ExprTupleValue row(String metricName, String tableType, String unit, String help) {
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusSystemRequest.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusSystemRequest.java
index e68ad22c30..6972a9390c 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusSystemRequest.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/request/system/PrometheusSystemRequest.java
@@ -10,9 +10,7 @@
 import java.util.List;
 import org.opensearch.sql.data.model.ExprValue;
 
-/**
- * Prometheus system request query to get metadata Info.
- */
+/** Prometheus system request query to get metadata Info. */
 public interface PrometheusSystemRequest {
 
   /**
@@ -21,5 +19,4 @@ public interface PrometheusSystemRequest {
    * @return list of ExprValue.
    */
   List<ExprValue> search();
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/response/PrometheusResponse.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/response/PrometheusResponse.java
index ef7f19ba2f..339d882f5a 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/response/PrometheusResponse.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/response/PrometheusResponse.java
@@ -7,7 +7,11 @@
 
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.LONG;
-import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.LABELS;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.MATRIX_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.METRIC_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.RESULT_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.RESULT_TYPE_KEY;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.VALUES_KEY;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -15,7 +19,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import lombok.NonNull;
-import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.opensearch.sql.data.model.ExprDoubleValue;
@@ -36,66 +39,48 @@ public class PrometheusResponse implements Iterable<ExprValue> {
 
   private final PrometheusResponseFieldNames prometheusResponseFieldNames;
 
-  private final Boolean isQueryRangeFunctionScan;
-
   /**
    * Constructor.
    *
-   * @param responseObject               Prometheus responseObject.
-   * @param prometheusResponseFieldNames data model which
-   *                                     contains field names for the metric measurement
-   *                                     and timestamp fieldName.
+   * @param responseObject Prometheus responseObject.
+   * @param prometheusResponseFieldNames data model which contains field names for the metric
+   *     measurement and timestamp fieldName.
    */
-  public PrometheusResponse(JSONObject responseObject,
-                            PrometheusResponseFieldNames prometheusResponseFieldNames,
-                            Boolean isQueryRangeFunctionScan) {
+  public PrometheusResponse(
+      JSONObject responseObject, PrometheusResponseFieldNames prometheusResponseFieldNames) {
     this.responseObject = responseObject;
     this.prometheusResponseFieldNames = prometheusResponseFieldNames;
-    this.isQueryRangeFunctionScan = isQueryRangeFunctionScan;
   }
 
   @NonNull
   @Override
   public Iterator<ExprValue> iterator() {
     List<ExprValue> result = new ArrayList<>();
-    if ("matrix".equals(responseObject.getString("resultType"))) {
-      JSONArray itemArray = responseObject.getJSONArray("result");
+    if (MATRIX_KEY.equals(responseObject.getString(RESULT_TYPE_KEY))) {
+      JSONArray itemArray = responseObject.getJSONArray(RESULT_KEY);
       for (int i = 0; i < itemArray.length(); i++) {
         JSONObject item = itemArray.getJSONObject(i);
-        JSONObject metric = item.getJSONObject("metric");
-        JSONArray values = item.getJSONArray("values");
+        JSONObject metric = item.getJSONObject(METRIC_KEY);
+        JSONArray values = item.getJSONArray(VALUES_KEY);
         for (int j = 0; j < values.length(); j++) {
           LinkedHashMap<String, ExprValue> linkedHashMap = new LinkedHashMap<>();
           JSONArray val = values.getJSONArray(j);
-          linkedHashMap.put(prometheusResponseFieldNames.getTimestampFieldName(),
+          linkedHashMap.put(
+              prometheusResponseFieldNames.getTimestampFieldName(),
               new ExprTimestampValue(Instant.ofEpochMilli((long) (val.getDouble(0) * 1000))));
-          linkedHashMap.put(prometheusResponseFieldNames.getValueFieldName(), getValue(val, 1,
-              prometheusResponseFieldNames.getValueType()));
-          // Concept:
-          // {\"instance\":\"localhost:9090\",\"__name__\":\"up\",\"job\":\"prometheus\"}"
-          // This is the label string in the prometheus response.
-          // Q: how do we map this to columns in a table.
-          // For queries like source = prometheus.metric_name | ....
-          // we can get the labels list in prior as we know which metric we are working on.
-          // In case of commands  like source = prometheus.query_range('promQL');
-          // Any arbitrary command can be written and we don't know the labels
-          // in the prometheus response in prior.
-          // So for PPL like commands...output structure is @value, @timestamp
-          // and each label is treated as a separate column where as in case of query_range
-          // function irrespective of promQL, the output structure is
-          // @value, @timestamp, @labels [jsonfied string of all the labels for a data point]
-          if (isQueryRangeFunctionScan) {
-            linkedHashMap.put(LABELS, new ExprStringValue(metric.toString()));
-          } else {
-            insertLabels(linkedHashMap, metric);
-          }
+          linkedHashMap.put(
+              prometheusResponseFieldNames.getValueFieldName(),
+              getValue(val, 1, prometheusResponseFieldNames.getValueType()));
+          insertLabels(linkedHashMap, metric);
           result.add(new ExprTupleValue(linkedHashMap));
         }
       }
     } else {
-      throw new RuntimeException(String.format("Unexpected Result Type: %s during Prometheus "
-              + "Response Parsing. 'matrix' resultType is expected",
-          responseObject.getString("resultType")));
+      throw new RuntimeException(
+          String.format(
+              "Unexpected Result Type: %s during Prometheus "
+                  + "Response Parsing. 'matrix' resultType is expected",
+              responseObject.getString(RESULT_TYPE_KEY)));
     }
     return result.iterator();
   }
@@ -121,12 +106,11 @@ private String getKey(String key) {
     } else {
       return this.prometheusResponseFieldNames.getGroupByList().stream()
           .filter(expression -> expression.getDelegated() instanceof ReferenceExpression)
-          .filter(expression
-              -> ((ReferenceExpression) expression.getDelegated()).getAttr().equals(key))
+          .filter(
+              expression -> ((ReferenceExpression) expression.getDelegated()).getAttr().equals(key))
           .findFirst()
           .map(NamedExpression::getName)
           .orElse(key);
     }
   }
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricDefaultSchema.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricDefaultSchema.java
index 790189d903..f0933eee9d 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricDefaultSchema.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricDefaultSchema.java
@@ -20,12 +20,11 @@
 @Getter
 @RequiredArgsConstructor
 public enum PrometheusMetricDefaultSchema {
-
-  DEFAULT_MAPPING(new ImmutableMap.Builder<String, ExprType>()
-      .put(TIMESTAMP, ExprCoreType.TIMESTAMP)
-      .put(VALUE, ExprCoreType.DOUBLE)
-      .build());
+  DEFAULT_MAPPING(
+      new ImmutableMap.Builder<String, ExprType>()
+          .put(TIMESTAMP, ExprCoreType.TIMESTAMP)
+          .put(VALUE, ExprCoreType.DOUBLE)
+          .build());
 
   private final Map<String, ExprType> mapping;
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricScan.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricScan.java
index 8611ae04f1..598e388914 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricScan.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricScan.java
@@ -23,30 +23,19 @@
 import org.opensearch.sql.prometheus.storage.model.PrometheusResponseFieldNames;
 import org.opensearch.sql.storage.TableScanOperator;
 
-/**
- * Prometheus metric scan operator.
- */
+/** Prometheus metric scan operator. */
 @EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = false)
 @ToString(onlyExplicitlyIncluded = true)
 public class PrometheusMetricScan extends TableScanOperator {
 
   private final PrometheusClient prometheusClient;
 
-  @EqualsAndHashCode.Include
-  @Getter
-  @Setter
-  @ToString.Include
+  @EqualsAndHashCode.Include @Getter @Setter @ToString.Include
   private PrometheusQueryRequest request;
 
   private Iterator<ExprValue> iterator;
 
-  @Setter
-  @Getter
-  private Boolean isQueryRangeFunctionScan = Boolean.FALSE;
-
-  @Setter
-  private PrometheusResponseFieldNames prometheusResponseFieldNames;
-
+  @Setter private PrometheusResponseFieldNames prometheusResponseFieldNames;
 
   private static final Logger LOG = LogManager.getLogger();
 
@@ -64,18 +53,25 @@ public PrometheusMetricScan(PrometheusClient prometheusClient) {
   @Override
   public void open() {
     super.open();
-    this.iterator = AccessController.doPrivileged((PrivilegedAction<Iterator<ExprValue>>) () -> {
-      try {
-        JSONObject responseObject = prometheusClient.queryRange(
-            request.getPromQl(),
-            request.getStartTime(), request.getEndTime(), request.getStep());
-        return new PrometheusResponse(responseObject, prometheusResponseFieldNames,
-            isQueryRangeFunctionScan).iterator();
-      } catch (IOException e) {
-        LOG.error(e.getMessage());
-        throw new RuntimeException("Error fetching data from prometheus server. " + e.getMessage());
-      }
-    });
+    this.iterator =
+        AccessController.doPrivileged(
+            (PrivilegedAction<Iterator<ExprValue>>)
+                () -> {
+                  try {
+                    JSONObject responseObject =
+                        prometheusClient.queryRange(
+                            request.getPromQl(),
+                            request.getStartTime(),
+                            request.getEndTime(),
+                            request.getStep());
+                    return new PrometheusResponse(responseObject, prometheusResponseFieldNames)
+                        .iterator();
+                  } catch (IOException e) {
+                    LOG.error(e.getMessage());
+                    throw new RuntimeException(
+                        "Error fetching data from prometheus server. " + e.getMessage());
+                  }
+                });
   }
 
   @Override
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricTable.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricTable.java
index 83384ff760..1124e93608 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricTable.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusMetricTable.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.prometheus.storage;
 
 import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.LABELS;
@@ -17,47 +16,39 @@
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.functions.scan.QueryRangeFunctionTableScanBuilder;
 import org.opensearch.sql.prometheus.planner.logical.PrometheusLogicalPlanOptimizerFactory;
 import org.opensearch.sql.prometheus.request.PrometheusQueryRequest;
 import org.opensearch.sql.prometheus.request.system.PrometheusDescribeMetricRequest;
 import org.opensearch.sql.prometheus.storage.implementor.PrometheusDefaultImplementor;
 import org.opensearch.sql.storage.Table;
+import org.opensearch.sql.storage.read.TableScanBuilder;
 
 /**
- * Prometheus table (metric) implementation.
- * This can be constructed from  a metric Name
- * or from PrometheusQueryRequest In case of query_range table function.
+ * Prometheus table (metric) implementation. This can be constructed from a metric Name or from
+ * PrometheusQueryRequest In case of query_range table function.
  */
 public class PrometheusMetricTable implements Table {
 
   private final PrometheusClient prometheusClient;
 
-  @Getter
-  private final String metricName;
-
-  @Getter
-  private final PrometheusQueryRequest prometheusQueryRequest;
+  @Getter private final String metricName;
 
+  @Getter private final PrometheusQueryRequest prometheusQueryRequest;
 
-  /**
-   * The cached mapping of field and type in index.
-   */
+  /** The cached mapping of field and type in index. */
   private Map<String, ExprType> cachedFieldTypes = null;
 
-  /**
-   * Constructor only with metric name.
-   */
+  /** Constructor only with metric name. */
   public PrometheusMetricTable(PrometheusClient prometheusService, @Nonnull String metricName) {
     this.prometheusClient = prometheusService;
     this.metricName = metricName;
     this.prometheusQueryRequest = null;
   }
 
-  /**
-   * Constructor for entire promQl Request.
-   */
-  public PrometheusMetricTable(PrometheusClient prometheusService,
-                               @Nonnull PrometheusQueryRequest prometheusQueryRequest) {
+  /** Constructor for entire promQl Request. */
+  public PrometheusMetricTable(
+      PrometheusClient prometheusService, @Nonnull PrometheusQueryRequest prometheusQueryRequest) {
     this.prometheusClient = prometheusService;
     this.metricName = null;
     this.prometheusQueryRequest = prometheusQueryRequest;
@@ -65,14 +56,12 @@ public PrometheusMetricTable(PrometheusClient prometheusService,
 
   @Override
   public boolean exists() {
-    throw new UnsupportedOperationException(
-        "Prometheus metric exists operation is not supported");
+    throw new UnsupportedOperationException("Prometheus metric exists operation is not supported");
   }
 
   @Override
   public void create(Map<String, ExprType> schema) {
-    throw new UnsupportedOperationException(
-        "Prometheus metric create operation is not supported");
+    throw new UnsupportedOperationException("Prometheus metric create operation is not supported");
   }
 
   @Override
@@ -80,11 +69,10 @@ public Map<String, ExprType> getFieldTypes() {
     if (cachedFieldTypes == null) {
       if (metricName != null) {
         cachedFieldTypes =
-            new PrometheusDescribeMetricRequest(prometheusClient, null,
-                metricName).getFieldTypes();
+            new PrometheusDescribeMetricRequest(prometheusClient, null, metricName).getFieldTypes();
       } else {
-        cachedFieldTypes = new HashMap<>(PrometheusMetricDefaultSchema.DEFAULT_MAPPING
-            .getMapping());
+        cachedFieldTypes =
+            new HashMap<>(PrometheusMetricDefaultSchema.DEFAULT_MAPPING.getMapping());
         cachedFieldTypes.put(LABELS, ExprCoreType.STRING);
       }
     }
@@ -93,12 +81,7 @@ public Map<String, ExprType> getFieldTypes() {
 
   @Override
   public PhysicalPlan implement(LogicalPlan plan) {
-    PrometheusMetricScan metricScan =
-        new PrometheusMetricScan(prometheusClient);
-    if (prometheusQueryRequest != null) {
-      metricScan.setRequest(prometheusQueryRequest);
-      metricScan.setIsQueryRangeFunctionScan(Boolean.TRUE);
-    }
+    PrometheusMetricScan metricScan = new PrometheusMetricScan(prometheusClient);
     return plan.accept(new PrometheusDefaultImplementor(), metricScan);
   }
 
@@ -107,4 +90,14 @@ public LogicalPlan optimize(LogicalPlan plan) {
     return PrometheusLogicalPlanOptimizerFactory.create().optimize(plan);
   }
 
-}
\ No newline at end of file
+  // Only handling query_range function for now.
+  // we need to move PPL implementations to ScanBuilder in future.
+  @Override
+  public TableScanBuilder createScanBuilder() {
+    if (metricName == null) {
+      return new QueryRangeFunctionTableScanBuilder(prometheusClient, prometheusQueryRequest);
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageEngine.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageEngine.java
index 4bda60b822..29fc15e2d0 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageEngine.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageEngine.java
@@ -10,23 +10,21 @@
 import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.INFORMATION_SCHEMA_NAME;
 import static org.opensearch.sql.utils.SystemIndexUtils.isSystemIndex;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.DataSourceSchemaName;
 import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.function.FunctionResolver;
 import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.functions.resolver.QueryExemplarsTableFunctionResolver;
 import org.opensearch.sql.prometheus.functions.resolver.QueryRangeTableFunctionResolver;
 import org.opensearch.sql.prometheus.storage.system.PrometheusSystemTable;
 import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.storage.Table;
 import org.opensearch.sql.utils.SystemIndexUtils;
 
-
-/**
- * Prometheus storage engine implementation.
- */
+/** Prometheus storage engine implementation. */
 @RequiredArgsConstructor
 public class PrometheusStorageEngine implements StorageEngine {
 
@@ -34,8 +32,10 @@ public class PrometheusStorageEngine implements StorageEngine {
 
   @Override
   public Collection<FunctionResolver> getFunctions() {
-    return Collections.singletonList(
-        new QueryRangeTableFunctionResolver(prometheusClient));
+    ArrayList<FunctionResolver> functionList = new ArrayList<>();
+    functionList.add(new QueryRangeTableFunctionResolver(prometheusClient));
+    functionList.add(new QueryExemplarsTableFunctionResolver(prometheusClient));
+    return functionList;
   }
 
   @Override
@@ -49,16 +49,14 @@ public Table getTable(DataSourceSchemaName dataSourceSchemaName, String tableNam
     }
   }
 
-  private Table resolveInformationSchemaTable(DataSourceSchemaName dataSourceSchemaName,
-                                              String tableName) {
+  private Table resolveInformationSchemaTable(
+      DataSourceSchemaName dataSourceSchemaName, String tableName) {
     if (SystemIndexUtils.TABLE_NAME_FOR_TABLES_INFO.equals(tableName)) {
-      return new PrometheusSystemTable(prometheusClient,
-          dataSourceSchemaName, SystemIndexUtils.TABLE_INFO);
+      return new PrometheusSystemTable(
+          prometheusClient, dataSourceSchemaName, SystemIndexUtils.TABLE_INFO);
     } else {
       throw new SemanticCheckException(
           String.format("Information Schema doesn't contain %s table", tableName));
     }
   }
-
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactory.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactory.java
index 4e8b30af2f..b9c1b09d60 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactory.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactory.java
@@ -7,24 +7,33 @@
 
 package org.opensearch.sql.prometheus.storage;
 
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.HashSet;
+import java.net.UnknownHostException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import lombok.RequiredArgsConstructor;
 import okhttp3.OkHttpClient;
+import org.opensearch.sql.common.interceptors.AwsSigningInterceptor;
+import org.opensearch.sql.common.interceptors.BasicAuthenticationInterceptor;
+import org.opensearch.sql.common.interceptors.URIValidatorInterceptor;
+import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.datasource.model.DataSourceType;
-import org.opensearch.sql.datasource.model.auth.AuthenticationType;
-import org.opensearch.sql.prometheus.authinterceptors.AwsSigningInterceptor;
-import org.opensearch.sql.prometheus.authinterceptors.BasicAuthenticationInterceptor;
+import org.opensearch.sql.datasources.auth.AuthenticationType;
+import org.opensearch.sql.datasources.utils.DatasourceValidationUtils;
 import org.opensearch.sql.prometheus.client.PrometheusClient;
 import org.opensearch.sql.prometheus.client.PrometheusClientImpl;
 import org.opensearch.sql.storage.DataSourceFactory;
 import org.opensearch.sql.storage.StorageEngine;
 
+@RequiredArgsConstructor
 public class PrometheusStorageFactory implements DataSourceFactory {
 
   public static final String URI = "prometheus.uri";
@@ -35,6 +44,8 @@ public class PrometheusStorageFactory implements DataSourceFactory {
   public static final String ACCESS_KEY = "prometheus.auth.access_key";
   public static final String SECRET_KEY = "prometheus.auth.secret_key";
 
+  private final Settings settings;
+
   @Override
   public DataSourceType getDataSourceType() {
     return DataSourceType.PROMETHEUS;
@@ -43,61 +54,76 @@ public DataSourceType getDataSourceType() {
   @Override
   public DataSource createDataSource(DataSourceMetadata metadata) {
     return new DataSource(
-        metadata.getName(),
-        DataSourceType.PROMETHEUS,
-        getStorageEngine(metadata.getName(), metadata.getProperties()));
+        metadata.getName(), DataSourceType.PROMETHEUS, getStorageEngine(metadata.getProperties()));
   }
 
-  StorageEngine getStorageEngine(String catalogName, Map<String, String> requiredConfig) {
-    validateFieldsInConfig(requiredConfig, Set.of(URI));
-    PrometheusClient prometheusClient;
-    try {
-      prometheusClient = new PrometheusClientImpl(getHttpClient(requiredConfig),
-          new URI(requiredConfig.get(URI)));
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(
-          String.format("Prometheus Client creation failed due to: %s", e.getMessage()));
+  // Need to refactor to a separate Validator class.
+  private void validateDataSourceConfigProperties(Map<String, String> dataSourceMetadataConfig)
+      throws URISyntaxException, UnknownHostException {
+    if (dataSourceMetadataConfig.get(AUTH_TYPE) != null) {
+      AuthenticationType authenticationType =
+          AuthenticationType.get(dataSourceMetadataConfig.get(AUTH_TYPE));
+      if (AuthenticationType.BASICAUTH.equals(authenticationType)) {
+        DatasourceValidationUtils.validateLengthAndRequiredFields(
+            dataSourceMetadataConfig, Set.of(URI, USERNAME, PASSWORD));
+      } else if (AuthenticationType.AWSSIGV4AUTH.equals(authenticationType)) {
+        DatasourceValidationUtils.validateLengthAndRequiredFields(
+            dataSourceMetadataConfig, Set.of(URI, ACCESS_KEY, SECRET_KEY, REGION));
+      }
+    } else {
+      DatasourceValidationUtils.validateLengthAndRequiredFields(
+          dataSourceMetadataConfig, Set.of(URI));
     }
-    return new PrometheusStorageEngine(prometheusClient);
+    DatasourceValidationUtils.validateHost(
+        dataSourceMetadataConfig.get(URI),
+        settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST));
   }
 
+  StorageEngine getStorageEngine(Map<String, String> requiredConfig) {
+    PrometheusClient prometheusClient;
+    prometheusClient =
+        AccessController.doPrivileged(
+            (PrivilegedAction<PrometheusClientImpl>)
+                () -> {
+                  try {
+                    validateDataSourceConfigProperties(requiredConfig);
+                    return new PrometheusClientImpl(
+                        getHttpClient(requiredConfig), new URI(requiredConfig.get(URI)));
+                  } catch (URISyntaxException | UnknownHostException e) {
+                    throw new IllegalArgumentException(
+                        String.format("Invalid URI in prometheus properties: %s", e.getMessage()));
+                  }
+                });
+    return new PrometheusStorageEngine(prometheusClient);
+  }
 
   private OkHttpClient getHttpClient(Map<String, String> config) {
     OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder();
     okHttpClient.callTimeout(1, TimeUnit.MINUTES);
     okHttpClient.connectTimeout(30, TimeUnit.SECONDS);
+    okHttpClient.followRedirects(false);
+    okHttpClient.addInterceptor(
+        new URIValidatorInterceptor(
+            settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST)));
     if (config.get(AUTH_TYPE) != null) {
       AuthenticationType authenticationType = AuthenticationType.get(config.get(AUTH_TYPE));
       if (AuthenticationType.BASICAUTH.equals(authenticationType)) {
-        validateFieldsInConfig(config, Set.of(USERNAME, PASSWORD));
-        okHttpClient.addInterceptor(new BasicAuthenticationInterceptor(config.get(USERNAME),
-            config.get(PASSWORD)));
+        okHttpClient.addInterceptor(
+            new BasicAuthenticationInterceptor(config.get(USERNAME), config.get(PASSWORD)));
       } else if (AuthenticationType.AWSSIGV4AUTH.equals(authenticationType)) {
-        validateFieldsInConfig(config, Set.of(REGION, ACCESS_KEY, SECRET_KEY));
-        okHttpClient.addInterceptor(new AwsSigningInterceptor(
-            config.get(ACCESS_KEY), config.get(SECRET_KEY),
-            config.get(REGION), "aps"));
+        okHttpClient.addInterceptor(
+            new AwsSigningInterceptor(
+                new AWSStaticCredentialsProvider(
+                    new BasicAWSCredentials(config.get(ACCESS_KEY), config.get(SECRET_KEY))),
+                config.get(REGION),
+                "aps"));
       } else {
         throw new IllegalArgumentException(
-            String.format("AUTH Type : %s is not supported with Prometheus Connector",
+            String.format(
+                "AUTH Type : %s is not supported with Prometheus Connector",
                 config.get(AUTH_TYPE)));
       }
     }
     return okHttpClient.build();
   }
-
-  private void validateFieldsInConfig(Map<String, String> config, Set<String> fields) {
-    Set<String> missingFields = new HashSet<>();
-    for (String field : fields) {
-      if (!config.containsKey(field)) {
-        missingFields.add(field);
-      }
-    }
-    if (missingFields.size() > 0) {
-      throw new IllegalArgumentException(String.format(
-          "Missing %s fields in the Prometheus connector properties.", missingFields));
-    }
-  }
-
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/QueryExemplarsTable.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/QueryExemplarsTable.java
new file mode 100644
index 0000000000..9ce8ae85fb
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/QueryExemplarsTable.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.prometheus.storage;
+
+import java.util.Collections;
+import java.util.Map;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.planner.logical.LogicalPlan;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.functions.scan.QueryExemplarsFunctionTableScanBuilder;
+import org.opensearch.sql.prometheus.request.PrometheusQueryExemplarsRequest;
+import org.opensearch.sql.prometheus.storage.implementor.PrometheusDefaultImplementor;
+import org.opensearch.sql.storage.Table;
+import org.opensearch.sql.storage.read.TableScanBuilder;
+
+/**
+ * This is {@link Table} for querying exemplars in prometheus Table. Since {@link
+ * PrometheusMetricTable} is overloaded with query_range and normal PPL metric queries. Created a
+ * separate table for handling {@link PrometheusQueryExemplarsRequest}
+ */
+@RequiredArgsConstructor
+public class QueryExemplarsTable implements Table {
+
+  @Getter private final PrometheusClient prometheusClient;
+
+  @Getter private final PrometheusQueryExemplarsRequest exemplarsRequest;
+
+  @Override
+  public Map<String, ExprType> getFieldTypes() {
+    return Collections.emptyMap();
+  }
+
+  @Override
+  public PhysicalPlan implement(LogicalPlan plan) {
+    return plan.accept(new PrometheusDefaultImplementor(), null);
+  }
+
+  @Override
+  public TableScanBuilder createScanBuilder() {
+    return new QueryExemplarsFunctionTableScanBuilder(prometheusClient, exemplarsRequest);
+  }
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/implementor/PrometheusDefaultImplementor.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/implementor/PrometheusDefaultImplementor.java
index 8cae250e5e..f83a97dc06 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/implementor/PrometheusDefaultImplementor.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/implementor/PrometheusDefaultImplementor.java
@@ -29,13 +29,9 @@
 import org.opensearch.sql.prometheus.storage.querybuilder.StepParameterResolver;
 import org.opensearch.sql.prometheus.storage.querybuilder.TimeRangeParametersResolver;
 
-/**
- * Default Implementor of Logical plan for prometheus.
- */
+/** Default Implementor of Logical plan for prometheus. */
 @RequiredArgsConstructor
-public class PrometheusDefaultImplementor
-    extends DefaultImplementor<PrometheusMetricScan> {
-
+public class PrometheusDefaultImplementor extends DefaultImplementor<PrometheusMetricScan> {
 
   @Override
   public PhysicalPlan visitNode(LogicalPlan plan, PrometheusMetricScan context) {
@@ -44,64 +40,64 @@ public PhysicalPlan visitNode(LogicalPlan plan, PrometheusMetricScan context) {
     } else if (plan instanceof PrometheusLogicalMetricAgg) {
       return visitIndexAggregation((PrometheusLogicalMetricAgg) plan, context);
     } else {
-      throw new IllegalStateException(StringUtils.format("unexpected plan node type %s",
-          plan.getClass()));
+      throw new IllegalStateException(
+          StringUtils.format("unexpected plan node type %s", plan.getClass()));
     }
   }
 
-  /**
-   * Implement PrometheusLogicalMetricScan.
-   */
-  public PhysicalPlan visitIndexScan(PrometheusLogicalMetricScan node,
-                                     PrometheusMetricScan context) {
+  /** Implement PrometheusLogicalMetricScan. */
+  public PhysicalPlan visitIndexScan(
+      PrometheusLogicalMetricScan node, PrometheusMetricScan context) {
     String query = SeriesSelectionQueryBuilder.build(node.getMetricName(), node.getFilter());
 
     context.getRequest().setPromQl(query);
     setTimeRangeParameters(node.getFilter(), context);
-    context.getRequest()
-        .setStep(StepParameterResolver.resolve(context.getRequest().getStartTime(),
-            context.getRequest().getEndTime(), null));
+    context
+        .getRequest()
+        .setStep(
+            StepParameterResolver.resolve(
+                context.getRequest().getStartTime(), context.getRequest().getEndTime(), null));
     return context;
   }
 
-  /**
-   * Implement PrometheusLogicalMetricAgg.
-   */
-  public PhysicalPlan visitIndexAggregation(PrometheusLogicalMetricAgg node,
-                                            PrometheusMetricScan context) {
+  /** Implement PrometheusLogicalMetricAgg. */
+  public PhysicalPlan visitIndexAggregation(
+      PrometheusLogicalMetricAgg node, PrometheusMetricScan context) {
     setTimeRangeParameters(node.getFilter(), context);
-    context.getRequest()
-        .setStep(StepParameterResolver.resolve(context.getRequest().getStartTime(),
-            context.getRequest().getEndTime(), node.getGroupByList()));
+    context
+        .getRequest()
+        .setStep(
+            StepParameterResolver.resolve(
+                context.getRequest().getStartTime(),
+                context.getRequest().getEndTime(),
+                node.getGroupByList()));
     String step = context.getRequest().getStep();
-    String seriesSelectionQuery
-        = SeriesSelectionQueryBuilder.build(node.getMetricName(), node.getFilter());
+    String seriesSelectionQuery =
+        SeriesSelectionQueryBuilder.build(node.getMetricName(), node.getFilter());
 
-    String aggregateQuery
-        = AggregationQueryBuilder.build(node.getAggregatorList(),
-        node.getGroupByList());
+    String aggregateQuery =
+        AggregationQueryBuilder.build(node.getAggregatorList(), node.getGroupByList());
 
     String finalQuery = String.format(aggregateQuery, seriesSelectionQuery + "[" + step + "]");
     context.getRequest().setPromQl(finalQuery);
 
-    //Since prometheus response doesn't have any fieldNames in its output.
-    //the field names are sent to PrometheusResponse constructor via context.
+    // Since prometheus response doesn't have any fieldNames in its output.
+    // the field names are sent to PrometheusResponse constructor via context.
     setPrometheusResponseFieldNames(node, context);
     return context;
   }
 
   @Override
-  public PhysicalPlan visitRelation(LogicalRelation node,
-                                    PrometheusMetricScan context) {
+  public PhysicalPlan visitRelation(LogicalRelation node, PrometheusMetricScan context) {
     PrometheusMetricTable prometheusMetricTable = (PrometheusMetricTable) node.getTable();
-    if (prometheusMetricTable.getMetricName() != null) {
-      String query = SeriesSelectionQueryBuilder.build(node.getRelationName(), null);
-      context.getRequest().setPromQl(query);
-      setTimeRangeParameters(null, context);
-      context.getRequest()
-          .setStep(StepParameterResolver.resolve(context.getRequest().getStartTime(),
-              context.getRequest().getEndTime(), null));
-    }
+    String query = SeriesSelectionQueryBuilder.build(node.getRelationName(), null);
+    context.getRequest().setPromQl(query);
+    setTimeRangeParameters(null, context);
+    context
+        .getRequest()
+        .setStep(
+            StepParameterResolver.resolve(
+                context.getRequest().getStartTime(), context.getRequest().getEndTime(), null));
     return context;
   }
 
@@ -112,8 +108,8 @@ private void setTimeRangeParameters(Expression filter, PrometheusMetricScan cont
     context.getRequest().setEndTime(timeRange.getSecond());
   }
 
-  private void setPrometheusResponseFieldNames(PrometheusLogicalMetricAgg node,
-                                               PrometheusMetricScan context) {
+  private void setPrometheusResponseFieldNames(
+      PrometheusLogicalMetricAgg node, PrometheusMetricScan context) {
     Optional<NamedExpression> spanExpression = getSpanExpression(node.getGroupByList());
     if (spanExpression.isEmpty()) {
       throw new RuntimeException(
@@ -135,6 +131,4 @@ private Optional<NamedExpression> getSpanExpression(List<NamedExpression> namedE
         .filter(expression -> expression.getDelegated() instanceof SpanExpression)
         .findFirst();
   }
-
-
-}
\ No newline at end of file
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/model/PrometheusResponseFieldNames.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/model/PrometheusResponseFieldNames.java
index d3a6ef184f..303ace7906 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/model/PrometheusResponseFieldNames.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/model/PrometheusResponseFieldNames.java
@@ -17,7 +17,6 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.NamedExpression;
 
-
 @Getter
 @Setter
 public class PrometheusResponseFieldNames {
@@ -26,5 +25,4 @@ public class PrometheusResponseFieldNames {
   private ExprType valueType = DOUBLE;
   private String timestampFieldName = TIMESTAMP;
   private List<NamedExpression> groupByList;
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/model/QueryRangeParameters.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/model/QueryRangeParameters.java
index 86ca99cea8..02187c5662 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/model/QueryRangeParameters.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/model/QueryRangeParameters.java
@@ -21,5 +21,4 @@ public class QueryRangeParameters {
   private Long start;
   private Long end;
   private String step;
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/AggregationQueryBuilder.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/AggregationQueryBuilder.java
index 76c8c6872e..540e2d8cf4 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/AggregationQueryBuilder.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/AggregationQueryBuilder.java
@@ -7,12 +7,10 @@
 
 package org.opensearch.sql.prometheus.storage.querybuilder;
 
-import java.sql.Ref;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
 import org.opensearch.sql.expression.aggregation.NamedAggregator;
@@ -20,49 +18,51 @@
 import org.opensearch.sql.expression.span.SpanExpression;
 
 /**
- * This class builds aggregation query for the given stats commands.
- * In the generated query a placeholder(%s) is added in place of metric selection query
- * and later replaced by metric selection query.
+ * This class builds aggregation query for the given stats commands. In the generated query a
+ * placeholder(%s) is added in place of metric selection query and later replaced by metric
+ * selection query.
  */
 @NoArgsConstructor
 public class AggregationQueryBuilder {
 
-  private static final Set<String> allowedStatsFunctions = Set.of(
-      BuiltinFunctionName.MAX.getName().getFunctionName(),
-      BuiltinFunctionName.MIN.getName().getFunctionName(),
-      BuiltinFunctionName.COUNT.getName().getFunctionName(),
-      BuiltinFunctionName.SUM.getName().getFunctionName(),
-      BuiltinFunctionName.AVG.getName().getFunctionName()
-  );
-
+  private static final Set<String> allowedStatsFunctions =
+      Set.of(
+          BuiltinFunctionName.MAX.getName().getFunctionName(),
+          BuiltinFunctionName.MIN.getName().getFunctionName(),
+          BuiltinFunctionName.COUNT.getName().getFunctionName(),
+          BuiltinFunctionName.SUM.getName().getFunctionName(),
+          BuiltinFunctionName.AVG.getName().getFunctionName());
 
   /**
    * Build Aggregation query from series selector query from expression.
    *
    * @return query string.
    */
-  public static String build(List<NamedAggregator> namedAggregatorList,
-                      List<NamedExpression> groupByList) {
+  public static String build(
+      List<NamedAggregator> namedAggregatorList, List<NamedExpression> groupByList) {
 
     if (namedAggregatorList.size() > 1) {
       throw new RuntimeException(
           "Prometheus Catalog doesn't multiple aggregations in stats command");
     }
 
-    if (!allowedStatsFunctions
-        .contains(namedAggregatorList.get(0).getFunctionName().getFunctionName())) {
-      throw new RuntimeException(String.format(
-          "Prometheus Catalog only supports %s aggregations.", allowedStatsFunctions));
+    if (!allowedStatsFunctions.contains(
+        namedAggregatorList.get(0).getFunctionName().getFunctionName())) {
+      throw new RuntimeException(
+          String.format(
+              "Prometheus Catalog only supports %s aggregations.", allowedStatsFunctions));
     }
 
     StringBuilder aggregateQuery = new StringBuilder();
-    aggregateQuery.append(namedAggregatorList.get(0).getFunctionName().getFunctionName())
+    aggregateQuery
+        .append(namedAggregatorList.get(0).getFunctionName().getFunctionName())
         .append(" ");
 
     if (groupByList != null && !groupByList.isEmpty()) {
-      groupByList = groupByList.stream()
-          .filter(expression -> !(expression.getDelegated() instanceof SpanExpression))
-          .collect(Collectors.toList());
+      groupByList =
+          groupByList.stream()
+              .filter(expression -> !(expression.getDelegated() instanceof SpanExpression))
+              .collect(Collectors.toList());
       if (groupByList.size() > 0) {
         aggregateQuery.append("by(");
         aggregateQuery.append(
@@ -80,5 +80,4 @@ public static String build(List<NamedAggregator> namedAggregatorList,
         .append("(%s))");
     return aggregateQuery.toString();
   }
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/SeriesSelectionQueryBuilder.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/SeriesSelectionQueryBuilder.java
index baa235aa89..d824fcb5b3 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/SeriesSelectionQueryBuilder.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/SeriesSelectionQueryBuilder.java
@@ -7,7 +7,6 @@
 
 package org.opensearch.sql.prometheus.storage.querybuilder;
 
-
 import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.TIMESTAMP;
 
 import java.util.stream.Collectors;
@@ -17,15 +16,12 @@
 import org.opensearch.sql.expression.ExpressionNodeVisitor;
 import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
+import org.opensearch.sql.expression.function.BuiltinFunctionName;
 
-/**
- * This class builds metric selection query from the filter condition
- * and metric name.
- */
+/** This class builds metric selection query from the filter condition and metric name. */
 @NoArgsConstructor
 public class SeriesSelectionQueryBuilder {
 
-
   /**
    * Build Prometheus series selector query from expression.
    *
@@ -34,10 +30,12 @@ public class SeriesSelectionQueryBuilder {
    */
   public static String build(String metricName, Expression filterCondition) {
     if (filterCondition != null) {
-      SeriesSelectionExpressionNodeVisitor seriesSelectionExpressionNodeVisitor
-          = new SeriesSelectionExpressionNodeVisitor();
+      SeriesSelectionExpressionNodeVisitor seriesSelectionExpressionNodeVisitor =
+          new SeriesSelectionExpressionNodeVisitor();
       String selectorQuery = filterCondition.accept(seriesSelectionExpressionNodeVisitor, null);
-      return metricName + "{" + selectorQuery + "}";
+      if (selectorQuery != null) {
+        return metricName + "{" + selectorQuery + "}";
+      }
     }
     return metricName;
   }
@@ -45,26 +43,27 @@ public static String build(String metricName, Expression filterCondition) {
   static class SeriesSelectionExpressionNodeVisitor extends ExpressionNodeVisitor<String, Object> {
     @Override
     public String visitFunction(FunctionExpression func, Object context) {
-      if (func.getFunctionName().getFunctionName().equals("and")) {
+      if (BuiltinFunctionName.AND.getName().equals(func.getFunctionName())) {
         return func.getArguments().stream()
             .map(arg -> visitFunction((FunctionExpression) arg, context))
             .filter(StringUtils::isNotEmpty)
             .collect(Collectors.joining(" , "));
-      } else if (func.getFunctionName().getFunctionName().contains("=")) {
-        ReferenceExpression ref = (ReferenceExpression) func.getArguments().get(0);
-        if (!ref.getAttr().equals(TIMESTAMP)) {
-          return func.getArguments().get(0)
-              + func.getFunctionName().getFunctionName()
-              + func.getArguments().get(1);
-        } else {
-          return null;
-        }
+      } else if ((BuiltinFunctionName.LTE.getName().equals(func.getFunctionName())
+              || BuiltinFunctionName.GTE.getName().equals(func.getFunctionName())
+              || BuiltinFunctionName.LESS.getName().equals(func.getFunctionName())
+              || BuiltinFunctionName.GREATER.getName().equals(func.getFunctionName()))
+          && ((ReferenceExpression) func.getArguments().get(0)).getAttr().equals(TIMESTAMP)) {
+        return null;
+      } else if (BuiltinFunctionName.EQUAL.getName().equals(func.getFunctionName())) {
+        return func.getArguments().get(0)
+            + func.getFunctionName().getFunctionName()
+            + func.getArguments().get(1);
       } else {
         throw new RuntimeException(
-            String.format("Prometheus Catalog doesn't support %s in where command.",
+            String.format(
+                "Prometheus Datasource doesn't support %s " + "in where command.",
                 func.getFunctionName().getFunctionName()));
       }
     }
   }
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/StepParameterResolver.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/StepParameterResolver.java
index 54315bb792..4c23ea9086 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/StepParameterResolver.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/StepParameterResolver.java
@@ -15,25 +15,20 @@
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.span.SpanExpression;
 
-/**
- * This class resolves step parameter required for
- * query_range api of prometheus.
- */
+/** This class resolves step parameter required for query_range api of prometheus. */
 @NoArgsConstructor
 public class StepParameterResolver {
 
   /**
-   * Extract step from groupByList or apply heuristic arithmetic
-   * on endTime and startTime.
-   *
+   * Extract step from groupByList or apply heuristic arithmetic on endTime and startTime.
    *
    * @param startTime startTime.
    * @param endTime endTime.
    * @param groupByList groupByList.
    * @return Step String.
    */
-  public static String resolve(@NonNull Long startTime, @NonNull Long endTime,
-                        List<NamedExpression> groupByList) {
+  public static String resolve(
+      @NonNull Long startTime, @NonNull Long endTime, List<NamedExpression> groupByList) {
     Optional<SpanExpression> spanExpression = getSpanExpression(groupByList);
     if (spanExpression.isPresent()) {
       if (StringUtils.isEmpty(spanExpression.get().getUnit().getName())) {
@@ -48,7 +43,7 @@ public static String resolve(@NonNull Long startTime, @NonNull Long endTime,
   }
 
   private static Optional<SpanExpression> getSpanExpression(
-        List<NamedExpression> namedExpressionList) {
+      List<NamedExpression> namedExpressionList) {
     if (namedExpressionList == null) {
       return Optional.empty();
     }
@@ -57,7 +52,4 @@ private static Optional<SpanExpression> getSpanExpression(
         .map(expression -> (SpanExpression) expression.getDelegated())
         .findFirst();
   }
-
-
-
-}
\ No newline at end of file
+}
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/TimeRangeParametersResolver.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/TimeRangeParametersResolver.java
index 810ed71379..c7766f22d6 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/TimeRangeParametersResolver.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/querybuilder/TimeRangeParametersResolver.java
@@ -7,6 +7,8 @@
 
 package org.opensearch.sql.prometheus.storage.querybuilder;
 
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.TIMESTAMP;
+
 import java.util.Date;
 import lombok.NoArgsConstructor;
 import org.apache.commons.math3.util.Pair;
@@ -15,20 +17,19 @@
 import org.opensearch.sql.expression.ExpressionNodeVisitor;
 import org.opensearch.sql.expression.FunctionExpression;
 import org.opensearch.sql.expression.ReferenceExpression;
+import org.opensearch.sql.expression.function.BuiltinFunctionName;
 
 @NoArgsConstructor
 public class TimeRangeParametersResolver extends ExpressionNodeVisitor<Void, Object> {
 
-
   private Long startTime;
   private Long endTime;
 
   /**
-   * Build Range Query Parameters from filter expression.
-   * If the filter condition consists of @timestamp, startTime and
-   * endTime are derived. or else it will be defaulted to now() and now()-1hr.
-   * If one of starttime and endtime are provided, the other will be derived from them
-   * by fixing the time range duration to 1hr.
+   * Build Range Query Parameters from filter expression. If the filter condition consists
+   * of @timestamp, startTime and endTime are derived. or else it will be defaulted to now() and
+   * now()-1hr. If one of starttime and endtime are provided, the other will be derived from them by
+   * fixing the time range duration to 1hr.
    *
    * @param filterCondition expression.
    * @return query string
@@ -53,10 +54,13 @@ public Pair<Long, Long> resolve(Expression filterCondition) {
 
   @Override
   public Void visitFunction(FunctionExpression func, Object context) {
-    if (func.getFunctionName().getFunctionName().contains("=")) {
+    if ((BuiltinFunctionName.LTE.getName().equals(func.getFunctionName())
+        || BuiltinFunctionName.GTE.getName().equals(func.getFunctionName())
+        || BuiltinFunctionName.LESS.getName().equals(func.getFunctionName())
+        || BuiltinFunctionName.GREATER.getName().equals(func.getFunctionName()))) {
       ReferenceExpression ref = (ReferenceExpression) func.getArguments().get(0);
       Expression rightExpr = func.getArguments().get(1);
-      if (ref.getAttr().equals("@timestamp")) {
+      if (ref.getAttr().equals(TIMESTAMP)) {
         ExprValue literalValue = rightExpr.valueOf();
         if (func.getFunctionName().getFunctionName().contains(">")) {
           startTime = literalValue.timestampValue().toEpochMilli() / 1000;
@@ -66,11 +70,10 @@ public Void visitFunction(FunctionExpression func, Object context) {
         }
       }
     } else {
-      func.getArguments()
+      func.getArguments().stream()
+          .filter(arg -> arg instanceof FunctionExpression)
           .forEach(arg -> visitFunction((FunctionExpression) arg, context));
     }
     return null;
   }
-
-
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTable.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTable.java
index dca946da57..b5557e7298 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTable.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTable.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.prometheus.storage.system;
 
-
 import static org.opensearch.sql.utils.SystemIndexUtils.systemTable;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -25,13 +24,9 @@
 import org.opensearch.sql.storage.Table;
 import org.opensearch.sql.utils.SystemIndexUtils;
 
-/**
- * Prometheus System Table Implementation.
- */
+/** Prometheus System Table Implementation. */
 public class PrometheusSystemTable implements Table {
-  /**
-   * System Index Name.
-   */
+  /** System Index Name. */
   private final Pair<PrometheusSystemTableSchema, PrometheusSystemRequest> systemIndexBundle;
 
   private final DataSourceSchemaName dataSourceSchemaName;
@@ -54,8 +49,7 @@ public PhysicalPlan implement(LogicalPlan plan) {
 
   @VisibleForTesting
   @RequiredArgsConstructor
-  public class PrometheusSystemTableDefaultImplementor
-      extends DefaultImplementor<Object> {
+  public class PrometheusSystemTableDefaultImplementor extends DefaultImplementor<Object> {
 
     @Override
     public PhysicalPlan visitRelation(LogicalRelation node, Object context) {
@@ -67,12 +61,14 @@ private Pair<PrometheusSystemTableSchema, PrometheusSystemRequest> buildIndexBun
       PrometheusClient client, String indexName) {
     SystemIndexUtils.SystemTable systemTable = systemTable(indexName);
     if (systemTable.isSystemInfoTable()) {
-      return Pair.of(PrometheusSystemTableSchema.SYS_TABLE_TABLES,
+      return Pair.of(
+          PrometheusSystemTableSchema.SYS_TABLE_TABLES,
           new PrometheusListMetricsRequest(client, dataSourceSchemaName));
     } else {
-      return Pair.of(PrometheusSystemTableSchema.SYS_TABLE_MAPPINGS,
-          new PrometheusDescribeMetricRequest(client,
-              dataSourceSchemaName, systemTable.getTableName()));
+      return Pair.of(
+          PrometheusSystemTableSchema.SYS_TABLE_MAPPINGS,
+          new PrometheusDescribeMetricRequest(
+              client, dataSourceSchemaName, systemTable.getTableName()));
     }
   }
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableScan.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableScan.java
index 5c0bc656fe..907e8a0c15 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableScan.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableScan.java
@@ -13,16 +13,13 @@
 import org.opensearch.sql.prometheus.request.system.PrometheusSystemRequest;
 import org.opensearch.sql.storage.TableScanOperator;
 
-/**
- * Prometheus table scan operator.
- */
+/** Prometheus table scan operator. */
 @RequiredArgsConstructor
 @EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = false)
 @ToString(onlyExplicitlyIncluded = true)
 public class PrometheusSystemTableScan extends TableScanOperator {
 
-  @EqualsAndHashCode.Include
-  private final PrometheusSystemRequest request;
+  @EqualsAndHashCode.Include private final PrometheusSystemRequest request;
 
   private Iterator<ExprValue> iterator;
 
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableSchema.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableSchema.java
index 668a208c79..9272731dce 100644
--- a/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableSchema.java
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableSchema.java
@@ -18,22 +18,23 @@
 @Getter
 @RequiredArgsConstructor
 public enum PrometheusSystemTableSchema {
-
-  SYS_TABLE_TABLES(new ImmutableMap.Builder<String, ExprType>()
-      .put("TABLE_CATALOG", STRING)
-      .put("TABLE_SCHEMA", STRING)
-      .put("TABLE_NAME", STRING)
-      .put("TABLE_TYPE", STRING)
-      .put("UNIT", STRING)
-      .put("REMARKS", STRING)
-      .build()),
-  SYS_TABLE_MAPPINGS(new ImmutableMap.Builder<String, ExprType>()
-      .put("TABLE_CATALOG", STRING)
-      .put("TABLE_SCHEMA", STRING)
-      .put("TABLE_NAME", STRING)
-      .put("COLUMN_NAME", STRING)
-      .put("DATA_TYPE", STRING)
-      .build());
+  SYS_TABLE_TABLES(
+      new ImmutableMap.Builder<String, ExprType>()
+          .put("TABLE_CATALOG", STRING)
+          .put("TABLE_SCHEMA", STRING)
+          .put("TABLE_NAME", STRING)
+          .put("TABLE_TYPE", STRING)
+          .put("UNIT", STRING)
+          .put("REMARKS", STRING)
+          .build()),
+  SYS_TABLE_MAPPINGS(
+      new ImmutableMap.Builder<String, ExprType>()
+          .put("TABLE_CATALOG", STRING)
+          .put("TABLE_SCHEMA", STRING)
+          .put("TABLE_NAME", STRING)
+          .put("COLUMN_NAME", STRING)
+          .put("DATA_TYPE", STRING)
+          .build());
 
   private final Map<String, ExprType> mapping;
 }
diff --git a/prometheus/src/main/java/org/opensearch/sql/prometheus/utils/TableFunctionUtils.java b/prometheus/src/main/java/org/opensearch/sql/prometheus/utils/TableFunctionUtils.java
new file mode 100644
index 0000000000..24bec1ede3
--- /dev/null
+++ b/prometheus/src/main/java/org/opensearch/sql/prometheus/utils/TableFunctionUtils.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.prometheus.utils;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.experimental.UtilityClass;
+import org.apache.commons.lang3.StringUtils;
+import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.NamedArgumentExpression;
+
+/** Utility class for common table function methods. */
+@UtilityClass
+public class TableFunctionUtils {
+
+  /**
+   * Validates if function arguments are valid in both the cases when the arguments are passed by
+   * position or name.
+   *
+   * @param arguments arguments of function provided in the input order.
+   * @param argumentNames ordered argument names of the function.
+   */
+  public static void validatePrometheusTableFunctionArguments(
+      List<Expression> arguments, List<String> argumentNames) {
+    Boolean argumentsPassedByName =
+        arguments.stream()
+            .noneMatch(arg -> StringUtils.isEmpty(((NamedArgumentExpression) arg).getArgName()));
+    Boolean argumentsPassedByPosition =
+        arguments.stream()
+            .allMatch(arg -> StringUtils.isEmpty(((NamedArgumentExpression) arg).getArgName()));
+    if (!(argumentsPassedByName || argumentsPassedByPosition)) {
+      throw new SemanticCheckException("Arguments should be either passed by name or position");
+    }
+
+    if (arguments.size() != argumentNames.size()) {
+      throw new SemanticCheckException(
+          generateErrorMessageForMissingArguments(
+              argumentsPassedByPosition, arguments, argumentNames));
+    }
+  }
+
+  /**
+   * Get Named Arguments of Table Function Arguments. If they are passed by position create new ones
+   * or else return the same arguments passed.
+   *
+   * @param arguments arguments of function provided in the input order.
+   * @param argumentNames ordered argument names of the function.
+   */
+  public static List<Expression> getNamedArgumentsOfTableFunction(
+      List<Expression> arguments, List<String> argumentNames) {
+    boolean argumentsPassedByPosition =
+        arguments.stream()
+            .allMatch(arg -> StringUtils.isEmpty(((NamedArgumentExpression) arg).getArgName()));
+    if (argumentsPassedByPosition) {
+      List<Expression> namedArguments = new ArrayList<>();
+      for (int i = 0; i < arguments.size(); i++) {
+        namedArguments.add(
+            new NamedArgumentExpression(
+                argumentNames.get(i), ((NamedArgumentExpression) arguments.get(i)).getValue()));
+      }
+      return namedArguments;
+    }
+    return arguments;
+  }
+
+  private static String generateErrorMessageForMissingArguments(
+      Boolean areArgumentsPassedByPosition,
+      List<Expression> arguments,
+      List<String> argumentNames) {
+    if (areArgumentsPassedByPosition) {
+      return String.format(
+          "Missing arguments:[%s]",
+          String.join(",", argumentNames.subList(arguments.size(), argumentNames.size())));
+    } else {
+      Set<String> requiredArguments = new HashSet<>(argumentNames);
+      Set<String> providedArguments =
+          arguments.stream()
+              .map(expression -> ((NamedArgumentExpression) expression).getArgName())
+              .collect(Collectors.toSet());
+      requiredArguments.removeAll(providedArguments);
+      return String.format("Missing arguments:[%s]", String.join(",", requiredArguments));
+    }
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/authinterceptors/AwsSigningInterceptorTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/authinterceptors/AwsSigningInterceptorTest.java
deleted file mode 100644
index a9224bf80f..0000000000
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/authinterceptors/AwsSigningInterceptorTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.opensearch.sql.prometheus.authinterceptors;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import lombok.SneakyThrows;
-import okhttp3.Interceptor;
-import okhttp3.Request;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-public class AwsSigningInterceptorTest {
-
-  @Mock
-  private Interceptor.Chain chain;
-
-  @Captor
-  ArgumentCaptor<Request> requestArgumentCaptor;
-
-  @Test
-  void testConstructors() {
-    Assertions.assertThrows(NullPointerException.class, () ->
-        new AwsSigningInterceptor(null, "secretKey", "us-east-1", "aps"));
-    Assertions.assertThrows(NullPointerException.class, () ->
-        new AwsSigningInterceptor("accessKey", null, "us-east-1", "aps"));
-    Assertions.assertThrows(NullPointerException.class, () ->
-        new AwsSigningInterceptor("accessKey", "secretKey", null, "aps"));
-    Assertions.assertThrows(NullPointerException.class, () ->
-        new AwsSigningInterceptor("accessKey", "secretKey", "us-east-1", null));
-  }
-
-  @Test
-  @SneakyThrows
-  void testIntercept() {
-    when(chain.request()).thenReturn(new Request.Builder()
-        .url("http://localhost:9090")
-        .build());
-    AwsSigningInterceptor awsSigningInterceptor
-        = new AwsSigningInterceptor("testAccessKey", "testSecretKey", "us-east-1", "aps");
-    awsSigningInterceptor.intercept(chain);
-    verify(chain).proceed(requestArgumentCaptor.capture());
-    Request request = requestArgumentCaptor.getValue();
-    Assertions.assertNotNull(request.headers("Authorization"));
-    Assertions.assertNotNull(request.headers("x-amz-date"));
-    Assertions.assertNotNull(request.headers("host"));
-  }
-
-}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/authinterceptors/BasicAuthenticationInterceptorTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/authinterceptors/BasicAuthenticationInterceptorTest.java
deleted file mode 100644
index b5b5acd457..0000000000
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/authinterceptors/BasicAuthenticationInterceptorTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.opensearch.sql.prometheus.authinterceptors;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Collections;
-import lombok.SneakyThrows;
-import okhttp3.Credentials;
-import okhttp3.Interceptor;
-import okhttp3.Request;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.internal.matchers.Null;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-public class BasicAuthenticationInterceptorTest {
-
-  @Mock
-  private Interceptor.Chain chain;
-
-  @Captor
-  ArgumentCaptor<Request> requestArgumentCaptor;
-
-  @Test
-  void testConstructors() {
-    Assertions.assertThrows(NullPointerException.class, () ->
-        new BasicAuthenticationInterceptor(null, "test"));
-    Assertions.assertThrows(NullPointerException.class, () ->
-        new BasicAuthenticationInterceptor("testAdmin", null));
-  }
-
-
-  @Test
-  @SneakyThrows
-  void testIntercept() {
-    when(chain.request()).thenReturn(new Request.Builder()
-            .url("http://localhost:9090")
-            .build());
-    BasicAuthenticationInterceptor basicAuthenticationInterceptor
-        = new BasicAuthenticationInterceptor("testAdmin", "testPassword");
-    basicAuthenticationInterceptor.intercept(chain);
-    verify(chain).proceed(requestArgumentCaptor.capture());
-    Request request = requestArgumentCaptor.getValue();
-    Assertions.assertEquals(
-        Collections.singletonList(Credentials.basic("testAdmin", "testPassword")),
-        request.headers("Authorization"));
-  }
-
-}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/client/PrometheusClientImplTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/client/PrometheusClientImplTest.java
index 76abb05751..d6ca25b206 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/client/PrometheusClientImplTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/client/PrometheusClientImplTest.java
@@ -28,12 +28,14 @@
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
+import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.prometheus.exceptions.PrometheusClientException;
 import org.opensearch.sql.prometheus.request.system.model.MetricMetadata;
 
 @ExtendWith(MockitoExtension.class)
@@ -42,7 +44,6 @@ public class PrometheusClientImplTest {
   private MockWebServer mockWebServer;
   private PrometheusClient prometheusClient;
 
-
   @BeforeEach
   void setUp() throws IOException {
     this.mockWebServer = new MockWebServer();
@@ -51,13 +52,13 @@ void setUp() throws IOException {
         new PrometheusClientImpl(new OkHttpClient(), mockWebServer.url("").uri().normalize());
   }
 
-
   @Test
   @SneakyThrows
   void testQueryRange() {
-    MockResponse mockResponse = new MockResponse()
-        .addHeader("Content-Type", "application/json; charset=utf-8")
-        .setBody(getJson("query_range_response.json"));
+    MockResponse mockResponse =
+        new MockResponse()
+            .addHeader("Content-Type", "application/json; charset=utf-8")
+            .setBody(getJson("query_range_response.json"));
     mockWebServer.enqueue(mockResponse);
     JSONObject jsonObject = prometheusClient.queryRange(QUERY, STARTTIME, ENDTIME, STEP);
     assertTrue(new JSONObject(getJson("query_range_result.json")).similar(jsonObject));
@@ -68,14 +69,35 @@ void testQueryRange() {
   @Test
   @SneakyThrows
   void testQueryRangeWith2xxStatusAndError() {
-    MockResponse mockResponse = new MockResponse()
-        .addHeader("Content-Type", "application/json; charset=utf-8")
-        .setBody(getJson("error_response.json"));
+    MockResponse mockResponse =
+        new MockResponse()
+            .addHeader("Content-Type", "application/json; charset=utf-8")
+            .setBody(getJson("error_response.json"));
     mockWebServer.enqueue(mockResponse);
-    RuntimeException runtimeException
-        = assertThrows(RuntimeException.class,
-          () -> prometheusClient.queryRange(QUERY, STARTTIME, ENDTIME, STEP));
-    assertEquals("Error", runtimeException.getMessage());
+    PrometheusClientException prometheusClientException =
+        assertThrows(
+            PrometheusClientException.class,
+            () -> prometheusClient.queryRange(QUERY, STARTTIME, ENDTIME, STEP));
+    assertEquals("Error", prometheusClientException.getMessage());
+    RecordedRequest recordedRequest = mockWebServer.takeRequest();
+    verifyQueryRangeCall(recordedRequest);
+  }
+
+  @Test
+  @SneakyThrows
+  void testQueryRangeWithNonJsonResponse() {
+    MockResponse mockResponse =
+        new MockResponse()
+            .addHeader("Content-Type", "application/json; charset=utf-8")
+            .setBody(getJson("non_json_response.json"));
+    mockWebServer.enqueue(mockResponse);
+    PrometheusClientException prometheusClientException =
+        assertThrows(
+            PrometheusClientException.class,
+            () -> prometheusClient.queryRange(QUERY, STARTTIME, ENDTIME, STEP));
+    assertEquals(
+        "Prometheus returned unexpected body, " + "please verify your prometheus server setup.",
+        prometheusClientException.getMessage());
     RecordedRequest recordedRequest = mockWebServer.takeRequest();
     verifyQueryRangeCall(recordedRequest);
   }
@@ -83,15 +105,18 @@ void testQueryRangeWith2xxStatusAndError() {
   @Test
   @SneakyThrows
   void testQueryRangeWithNon2xxError() {
-    MockResponse mockResponse = new MockResponse()
-        .addHeader("Content-Type", "application/json; charset=utf-8")
-        .setResponseCode(400);
+    MockResponse mockResponse =
+        new MockResponse()
+            .addHeader("Content-Type", "application/json; charset=utf-8")
+            .setResponseCode(400);
     mockWebServer.enqueue(mockResponse);
-    RuntimeException runtimeException
-        = assertThrows(RuntimeException.class,
-          () -> prometheusClient.queryRange(QUERY, STARTTIME, ENDTIME, STEP));
-    assertTrue(
-        runtimeException.getMessage().contains("Request to Prometheus is Unsuccessful with :"));
+    PrometheusClientException prometheusClientException =
+        assertThrows(
+            PrometheusClientException.class,
+            () -> prometheusClient.queryRange(QUERY, STARTTIME, ENDTIME, STEP));
+    assertEquals(
+        "Request to Prometheus is Unsuccessful with code : 400",
+        prometheusClientException.getMessage());
     RecordedRequest recordedRequest = mockWebServer.takeRequest();
     verifyQueryRangeCall(recordedRequest);
   }
@@ -99,16 +124,20 @@ void testQueryRangeWithNon2xxError() {
   @Test
   @SneakyThrows
   void testGetLabel() {
-    MockResponse mockResponse = new MockResponse()
-        .addHeader("Content-Type", "application/json; charset=utf-8")
-        .setBody(getJson("get_labels_response.json"));
+    MockResponse mockResponse =
+        new MockResponse()
+            .addHeader("Content-Type", "application/json; charset=utf-8")
+            .setBody(getJson("get_labels_response.json"));
     mockWebServer.enqueue(mockResponse);
     List<String> response = prometheusClient.getLabels(METRIC_NAME);
-    assertEquals(new ArrayList<String>() {{
-        add("call");
-        add("code");
-      }
-      }, response);
+    assertEquals(
+        new ArrayList<String>() {
+          {
+            add("call");
+            add("code");
+          }
+        },
+        response);
     RecordedRequest recordedRequest = mockWebServer.takeRequest();
     verifyGetLabelsCall(recordedRequest);
   }
@@ -116,23 +145,41 @@ void testGetLabel() {
   @Test
   @SneakyThrows
   void testGetAllMetrics() {
-    MockResponse mockResponse = new MockResponse()
-        .addHeader("Content-Type", "application/json; charset=utf-8")
-        .setBody(getJson("all_metrics_response.json"));
+    MockResponse mockResponse =
+        new MockResponse()
+            .addHeader("Content-Type", "application/json; charset=utf-8")
+            .setBody(getJson("all_metrics_response.json"));
     mockWebServer.enqueue(mockResponse);
     Map<String, List<MetricMetadata>> response = prometheusClient.getAllMetrics();
     Map<String, List<MetricMetadata>> expected = new HashMap<>();
-    expected.put("go_gc_duration_seconds",
-        Collections.singletonList(new MetricMetadata("summary",
-            "A summary of the pause duration of garbage collection cycles.", "")));
-    expected.put("go_goroutines",
-        Collections.singletonList(new MetricMetadata("gauge",
-            "Number of goroutines that currently exist.", "")));
+    expected.put(
+        "go_gc_duration_seconds",
+        Collections.singletonList(
+            new MetricMetadata(
+                "summary", "A summary of the pause duration of garbage collection cycles.", "")));
+    expected.put(
+        "go_goroutines",
+        Collections.singletonList(
+            new MetricMetadata("gauge", "Number of goroutines that currently exist.", "")));
     assertEquals(expected, response);
     RecordedRequest recordedRequest = mockWebServer.takeRequest();
     verifyGetAllMetricsCall(recordedRequest);
   }
 
+  @Test
+  @SneakyThrows
+  void testQueryExemplars() {
+    MockResponse mockResponse =
+        new MockResponse()
+            .addHeader("Content-Type", "application/json; charset=utf-8")
+            .setBody(getJson("query_exemplars_response.json"));
+    mockWebServer.enqueue(mockResponse);
+    JSONArray jsonArray = prometheusClient.queryExemplars(QUERY, STARTTIME, ENDTIME);
+    assertTrue(new JSONArray(getJson("query_exemplars_result.json")).similar(jsonArray));
+    RecordedRequest recordedRequest = mockWebServer.takeRequest();
+    verifyQueryExemplarsCall(recordedRequest);
+  }
+
   @AfterEach
   void tearDown() throws IOException {
     mockWebServer.shutdown();
@@ -164,4 +211,13 @@ private void verifyGetAllMetricsCall(RecordedRequest recordedRequest) {
     assertEquals("/api/v1/metadata", httpUrl.encodedPath());
   }
 
+  private void verifyQueryExemplarsCall(RecordedRequest recordedRequest) {
+    HttpUrl httpUrl = recordedRequest.getRequestUrl();
+    assertEquals("GET", recordedRequest.getMethod());
+    assertNotNull(httpUrl);
+    assertEquals("/api/v1/query_exemplars", httpUrl.encodedPath());
+    assertEquals(QUERY, httpUrl.queryParameter("query"));
+    assertEquals(STARTTIME.toString(), httpUrl.queryParameter("start"));
+    assertEquals(ENDTIME.toString(), httpUrl.queryParameter("end"));
+  }
 }
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/QueryRangeFunctionImplementationTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/QueryRangeFunctionImplementationTest.java
deleted file mode 100644
index 98195eecf7..0000000000
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/QueryRangeFunctionImplementationTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.opensearch.sql.prometheus.functions;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.List;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.sql.data.type.ExprCoreType;
-import org.opensearch.sql.exception.ExpressionEvaluationException;
-import org.opensearch.sql.expression.DSL;
-import org.opensearch.sql.expression.Expression;
-import org.opensearch.sql.expression.function.FunctionName;
-import org.opensearch.sql.prometheus.client.PrometheusClient;
-import org.opensearch.sql.prometheus.functions.implementation.QueryRangeFunctionImplementation;
-import org.opensearch.sql.prometheus.request.PrometheusQueryRequest;
-import org.opensearch.sql.prometheus.storage.PrometheusMetricTable;
-
-
-@ExtendWith(MockitoExtension.class)
-class QueryRangeFunctionImplementationTest {
-
-  @Mock
-  private PrometheusClient client;
-
-
-  @Test
-  void testValueOfAndTypeAndToString() {
-    FunctionName functionName = new FunctionName("query_range");
-    List<Expression> namedArgumentExpressionList
-        = List.of(DSL.namedArgument("query", DSL.literal("http_latency")),
-        DSL.namedArgument("starttime", DSL.literal(12345)),
-        DSL.namedArgument("endtime", DSL.literal(12345)),
-        DSL.namedArgument("step", DSL.literal(14)));
-    QueryRangeFunctionImplementation queryRangeFunctionImplementation
-        = new QueryRangeFunctionImplementation(functionName, namedArgumentExpressionList, client);
-    UnsupportedOperationException exception = assertThrows(UnsupportedOperationException.class,
-        () -> queryRangeFunctionImplementation.valueOf());
-    assertEquals("Prometheus defined function [query_range] is only "
-        + "supported in SOURCE clause with prometheus connector catalog", exception.getMessage());
-    assertEquals("query_range(query=\"http_latency\", starttime=12345, endtime=12345, step=14)",
-        queryRangeFunctionImplementation.toString());
-    assertEquals(ExprCoreType.STRUCT, queryRangeFunctionImplementation.type());
-  }
-
-  @Test
-  void testApplyArguments() {
-    FunctionName functionName = new FunctionName("query_range");
-    List<Expression> namedArgumentExpressionList
-        = List.of(DSL.namedArgument("query", DSL.literal("http_latency")),
-        DSL.namedArgument("starttime", DSL.literal(12345)),
-        DSL.namedArgument("endtime", DSL.literal(1234)),
-        DSL.namedArgument("step", DSL.literal(14)));
-    QueryRangeFunctionImplementation queryRangeFunctionImplementation
-        = new QueryRangeFunctionImplementation(functionName, namedArgumentExpressionList, client);
-    PrometheusMetricTable prometheusMetricTable
-        = (PrometheusMetricTable) queryRangeFunctionImplementation.applyArguments();
-    assertNull(prometheusMetricTable.getMetricName());
-    assertNotNull(prometheusMetricTable.getPrometheusQueryRequest());
-    PrometheusQueryRequest prometheusQueryRequest
-        = prometheusMetricTable.getPrometheusQueryRequest();
-    assertEquals("http_latency", prometheusQueryRequest.getPromQl().toString());
-    assertEquals(12345, prometheusQueryRequest.getStartTime());
-    assertEquals(1234, prometheusQueryRequest.getEndTime());
-    assertEquals("14", prometheusQueryRequest.getStep());
-  }
-
-  @Test
-  void testApplyArgumentsException() {
-    FunctionName functionName = new FunctionName("query_range");
-    List<Expression> namedArgumentExpressionList
-        = List.of(DSL.namedArgument("query", DSL.literal("http_latency")),
-        DSL.namedArgument("starttime", DSL.literal(12345)),
-        DSL.namedArgument("end_time", DSL.literal(1234)),
-        DSL.namedArgument("step", DSL.literal(14)));
-    QueryRangeFunctionImplementation queryRangeFunctionImplementation
-        = new QueryRangeFunctionImplementation(functionName, namedArgumentExpressionList, client);
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> queryRangeFunctionImplementation.applyArguments());
-    assertEquals("Invalid Function Argument:end_time", exception.getMessage());
-  }
-
-
-}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/QueryRangeTableFunctionResolverTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/QueryRangeTableFunctionResolverTest.java
deleted file mode 100644
index 06f003c9b6..0000000000
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/QueryRangeTableFunctionResolverTest.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- *
- *  * Copyright OpenSearch Contributors
- *  * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.opensearch.sql.prometheus.functions;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opensearch.sql.data.type.ExprCoreType.LONG;
-import static org.opensearch.sql.data.type.ExprCoreType.STRING;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import org.apache.commons.lang3.tuple.Pair;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensearch.sql.exception.SemanticCheckException;
-import org.opensearch.sql.expression.DSL;
-import org.opensearch.sql.expression.Expression;
-import org.opensearch.sql.expression.function.FunctionBuilder;
-import org.opensearch.sql.expression.function.FunctionName;
-import org.opensearch.sql.expression.function.FunctionProperties;
-import org.opensearch.sql.expression.function.FunctionSignature;
-import org.opensearch.sql.expression.function.TableFunctionImplementation;
-import org.opensearch.sql.prometheus.client.PrometheusClient;
-import org.opensearch.sql.prometheus.functions.implementation.QueryRangeFunctionImplementation;
-import org.opensearch.sql.prometheus.functions.resolver.QueryRangeTableFunctionResolver;
-import org.opensearch.sql.prometheus.request.PrometheusQueryRequest;
-import org.opensearch.sql.prometheus.storage.PrometheusMetricTable;
-
-@ExtendWith(MockitoExtension.class)
-class QueryRangeTableFunctionResolverTest {
-
-  @Mock
-  private PrometheusClient client;
-
-  @Mock
-  private FunctionProperties functionProperties;
-
-  @Test
-  void testResolve() {
-    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver
-        = new QueryRangeTableFunctionResolver(client);
-    FunctionName functionName = FunctionName.of("query_range");
-    List<Expression> expressions
-        = List.of(DSL.namedArgument("query", DSL.literal("http_latency")),
-        DSL.namedArgument("starttime", DSL.literal(12345)),
-        DSL.namedArgument("endtime", DSL.literal(12345)),
-        DSL.namedArgument("step", DSL.literal(14)));
-    FunctionSignature functionSignature = new FunctionSignature(functionName, expressions
-        .stream().map(Expression::type).collect(Collectors.toList()));
-    Pair<FunctionSignature, FunctionBuilder> resolution
-        = queryRangeTableFunctionResolver.resolve(functionSignature);
-    assertEquals(functionName, resolution.getKey().getFunctionName());
-    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
-    assertEquals(List.of(STRING, LONG, LONG, LONG), resolution.getKey().getParamTypeList());
-    FunctionBuilder functionBuilder = resolution.getValue();
-    TableFunctionImplementation functionImplementation
-        = (TableFunctionImplementation) functionBuilder.apply(functionProperties, expressions);
-    assertTrue(functionImplementation instanceof QueryRangeFunctionImplementation);
-    PrometheusMetricTable prometheusMetricTable
-        = (PrometheusMetricTable) functionImplementation.applyArguments();
-    assertNotNull(prometheusMetricTable.getPrometheusQueryRequest());
-    PrometheusQueryRequest prometheusQueryRequest =
-        prometheusMetricTable.getPrometheusQueryRequest();
-    assertEquals("http_latency", prometheusQueryRequest.getPromQl());
-    assertEquals(12345L, prometheusQueryRequest.getStartTime());
-    assertEquals(12345L, prometheusQueryRequest.getEndTime());
-    assertEquals("14", prometheusQueryRequest.getStep());
-  }
-
-  @Test
-  void testArgumentsPassedByPosition() {
-    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver
-        = new QueryRangeTableFunctionResolver(client);
-    FunctionName functionName = FunctionName.of("query_range");
-    List<Expression> expressions
-        = List.of(DSL.namedArgument(null, DSL.literal("http_latency")),
-        DSL.namedArgument(null, DSL.literal(12345)),
-        DSL.namedArgument(null, DSL.literal(12345)),
-        DSL.namedArgument(null, DSL.literal(14)));
-    FunctionSignature functionSignature = new FunctionSignature(functionName, expressions
-        .stream().map(Expression::type).collect(Collectors.toList()));
-
-    Pair<FunctionSignature, FunctionBuilder> resolution
-        = queryRangeTableFunctionResolver.resolve(functionSignature);
-
-    assertEquals(functionName, resolution.getKey().getFunctionName());
-    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
-    assertEquals(List.of(STRING, LONG, LONG, LONG), resolution.getKey().getParamTypeList());
-    FunctionBuilder functionBuilder = resolution.getValue();
-    TableFunctionImplementation functionImplementation
-        = (TableFunctionImplementation) functionBuilder.apply(functionProperties, expressions);
-    assertTrue(functionImplementation instanceof QueryRangeFunctionImplementation);
-    PrometheusMetricTable prometheusMetricTable
-        = (PrometheusMetricTable) functionImplementation.applyArguments();
-    assertNotNull(prometheusMetricTable.getPrometheusQueryRequest());
-    PrometheusQueryRequest prometheusQueryRequest =
-        prometheusMetricTable.getPrometheusQueryRequest();
-    assertEquals("http_latency", prometheusQueryRequest.getPromQl());
-    assertEquals(12345L, prometheusQueryRequest.getStartTime());
-    assertEquals(12345L, prometheusQueryRequest.getEndTime());
-    assertEquals("14", prometheusQueryRequest.getStep());
-  }
-
-
-  @Test
-  void testArgumentsPassedByNameWithDifferentOrder() {
-    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver
-        = new QueryRangeTableFunctionResolver(client);
-    FunctionName functionName = FunctionName.of("query_range");
-    List<Expression> expressions
-        = List.of(DSL.namedArgument("query", DSL.literal("http_latency")),
-        DSL.namedArgument("endtime", DSL.literal(12345)),
-        DSL.namedArgument("step", DSL.literal(14)),
-        DSL.namedArgument("starttime", DSL.literal(12345)));
-    FunctionSignature functionSignature = new FunctionSignature(functionName, expressions
-        .stream().map(Expression::type).collect(Collectors.toList()));
-
-    Pair<FunctionSignature, FunctionBuilder> resolution
-        = queryRangeTableFunctionResolver.resolve(functionSignature);
-
-    assertEquals(functionName, resolution.getKey().getFunctionName());
-    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
-    assertEquals(List.of(STRING, LONG, LONG, LONG), resolution.getKey().getParamTypeList());
-    FunctionBuilder functionBuilder = resolution.getValue();
-    TableFunctionImplementation functionImplementation
-        = (TableFunctionImplementation) functionBuilder.apply(functionProperties, expressions);
-    assertTrue(functionImplementation instanceof QueryRangeFunctionImplementation);
-    PrometheusMetricTable prometheusMetricTable
-        = (PrometheusMetricTable) functionImplementation.applyArguments();
-    assertNotNull(prometheusMetricTable.getPrometheusQueryRequest());
-    PrometheusQueryRequest prometheusQueryRequest =
-        prometheusMetricTable.getPrometheusQueryRequest();
-    assertEquals("http_latency", prometheusQueryRequest.getPromQl());
-    assertEquals(12345L, prometheusQueryRequest.getStartTime());
-    assertEquals(12345L, prometheusQueryRequest.getEndTime());
-    assertEquals("14", prometheusQueryRequest.getStep());
-  }
-
-  @Test
-  void testMixedArgumentTypes() {
-    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver
-        = new QueryRangeTableFunctionResolver(client);
-    FunctionName functionName = FunctionName.of("query_range");
-    List<Expression> expressions
-        = List.of(DSL.namedArgument("query", DSL.literal("http_latency")),
-        DSL.namedArgument(null, DSL.literal(12345)),
-        DSL.namedArgument(null, DSL.literal(12345)),
-        DSL.namedArgument(null, DSL.literal(14)));
-    FunctionSignature functionSignature = new FunctionSignature(functionName, expressions
-        .stream().map(Expression::type).collect(Collectors.toList()));
-    Pair<FunctionSignature, FunctionBuilder> resolution
-        = queryRangeTableFunctionResolver.resolve(functionSignature);
-
-    assertEquals(functionName, resolution.getKey().getFunctionName());
-    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
-    assertEquals(List.of(STRING, LONG, LONG, LONG), resolution.getKey().getParamTypeList());
-    SemanticCheckException exception = assertThrows(SemanticCheckException.class,
-        () -> resolution.getValue().apply(functionProperties, expressions));
-
-    assertEquals("Arguments should be either passed by name or position", exception.getMessage());
-  }
-
-  @Test
-  void testWrongArgumentsSizeWhenPassedByName() {
-    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver
-        = new QueryRangeTableFunctionResolver(client);
-    FunctionName functionName = FunctionName.of("query_range");
-    List<Expression> expressions
-        = List.of(DSL.namedArgument("query", DSL.literal("http_latency")),
-        DSL.namedArgument("step", DSL.literal(12345)));
-    FunctionSignature functionSignature = new FunctionSignature(functionName, expressions
-        .stream().map(Expression::type).collect(Collectors.toList()));
-    Pair<FunctionSignature, FunctionBuilder> resolution
-        = queryRangeTableFunctionResolver.resolve(functionSignature);
-
-    assertEquals(functionName, resolution.getKey().getFunctionName());
-    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
-    assertEquals(List.of(STRING, LONG, LONG, LONG), resolution.getKey().getParamTypeList());
-    SemanticCheckException exception = assertThrows(SemanticCheckException.class,
-        () -> resolution.getValue().apply(functionProperties, expressions));
-
-    assertEquals("Missing arguments:[endtime,starttime]", exception.getMessage());
-  }
-
-  @Test
-  void testWrongArgumentsSizeWhenPassedByPosition() {
-    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver
-        = new QueryRangeTableFunctionResolver(client);
-    FunctionName functionName = FunctionName.of("query_range");
-    List<Expression> expressions
-        = List.of(DSL.namedArgument(null, DSL.literal("http_latency")),
-        DSL.namedArgument(null, DSL.literal(12345)));
-    FunctionSignature functionSignature = new FunctionSignature(functionName, expressions
-        .stream().map(Expression::type).collect(Collectors.toList()));
-    Pair<FunctionSignature, FunctionBuilder> resolution
-        = queryRangeTableFunctionResolver.resolve(functionSignature);
-
-    assertEquals(functionName, resolution.getKey().getFunctionName());
-    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
-    assertEquals(List.of(STRING, LONG, LONG, LONG), resolution.getKey().getParamTypeList());
-    SemanticCheckException exception = assertThrows(SemanticCheckException.class,
-        () -> resolution.getValue().apply(functionProperties, expressions));
-
-    assertEquals("Missing arguments:[endtime,step]", exception.getMessage());
-  }
-
-}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/implementation/QueryExemplarsFunctionImplementationTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/implementation/QueryExemplarsFunctionImplementationTest.java
new file mode 100644
index 0000000000..6009d3229c
--- /dev/null
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/implementation/QueryExemplarsFunctionImplementationTest.java
@@ -0,0 +1,92 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.functions.implementation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.exception.ExpressionEvaluationException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.request.PrometheusQueryExemplarsRequest;
+import org.opensearch.sql.prometheus.storage.QueryExemplarsTable;
+
+@ExtendWith(MockitoExtension.class)
+class QueryExemplarsFunctionImplementationTest {
+
+  @Mock private PrometheusClient client;
+
+  @Test
+  void testValueOfAndTypeAndToString() {
+    FunctionName functionName = new FunctionName("query_exemplars");
+    List<Expression> namedArgumentExpressionList =
+        List.of(
+            DSL.namedArgument("query", DSL.literal("http_latency")),
+            DSL.namedArgument("starttime", DSL.literal(12345)),
+            DSL.namedArgument("endtime", DSL.literal(12345)));
+    QueryExemplarFunctionImplementation queryExemplarFunctionImplementation =
+        new QueryExemplarFunctionImplementation(functionName, namedArgumentExpressionList, client);
+    UnsupportedOperationException exception =
+        assertThrows(
+            UnsupportedOperationException.class,
+            () -> queryExemplarFunctionImplementation.valueOf());
+    assertEquals(
+        "Prometheus defined function [query_exemplars] is only "
+            + "supported in SOURCE clause with prometheus connector catalog",
+        exception.getMessage());
+    assertEquals(
+        "query_exemplars(query=\"http_latency\", starttime=12345, endtime=12345)",
+        queryExemplarFunctionImplementation.toString());
+    assertEquals(ExprCoreType.STRUCT, queryExemplarFunctionImplementation.type());
+  }
+
+  @Test
+  void testApplyArguments() {
+    FunctionName functionName = new FunctionName("query_exemplars");
+    List<Expression> namedArgumentExpressionList =
+        List.of(
+            DSL.namedArgument("query", DSL.literal("http_latency")),
+            DSL.namedArgument("starttime", DSL.literal(12345)),
+            DSL.namedArgument("endtime", DSL.literal(1234)));
+    QueryExemplarFunctionImplementation queryExemplarFunctionImplementation =
+        new QueryExemplarFunctionImplementation(functionName, namedArgumentExpressionList, client);
+    QueryExemplarsTable queryExemplarsTable =
+        (QueryExemplarsTable) queryExemplarFunctionImplementation.applyArguments();
+    assertNotNull(queryExemplarsTable.getExemplarsRequest());
+    PrometheusQueryExemplarsRequest request = queryExemplarsTable.getExemplarsRequest();
+    assertEquals("http_latency", request.getQuery());
+    assertEquals(12345, request.getStartTime());
+    assertEquals(1234, request.getEndTime());
+  }
+
+  @Test
+  void testApplyArgumentsException() {
+    FunctionName functionName = new FunctionName("query_exemplars");
+    List<Expression> namedArgumentExpressionList =
+        List.of(
+            DSL.namedArgument("query", DSL.literal("http_latency")),
+            DSL.namedArgument("starttime", DSL.literal(12345)),
+            DSL.namedArgument("end_time", DSL.literal(1234)));
+    QueryExemplarFunctionImplementation queryExemplarFunctionImplementation =
+        new QueryExemplarFunctionImplementation(functionName, namedArgumentExpressionList, client);
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> queryExemplarFunctionImplementation.applyArguments());
+    assertEquals("Invalid Function Argument:end_time", exception.getMessage());
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/implementation/QueryRangeFunctionImplementationTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/implementation/QueryRangeFunctionImplementationTest.java
new file mode 100644
index 0000000000..288bc35b0f
--- /dev/null
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/implementation/QueryRangeFunctionImplementationTest.java
@@ -0,0 +1,98 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.functions.implementation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.exception.ExpressionEvaluationException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.request.PrometheusQueryRequest;
+import org.opensearch.sql.prometheus.storage.PrometheusMetricTable;
+
+@ExtendWith(MockitoExtension.class)
+class QueryRangeFunctionImplementationTest {
+
+  @Mock private PrometheusClient client;
+
+  @Test
+  void testValueOfAndTypeAndToString() {
+    FunctionName functionName = new FunctionName("query_range");
+    List<Expression> namedArgumentExpressionList =
+        List.of(
+            DSL.namedArgument("query", DSL.literal("http_latency")),
+            DSL.namedArgument("starttime", DSL.literal(12345)),
+            DSL.namedArgument("endtime", DSL.literal(12345)),
+            DSL.namedArgument("step", DSL.literal(14)));
+    QueryRangeFunctionImplementation queryRangeFunctionImplementation =
+        new QueryRangeFunctionImplementation(functionName, namedArgumentExpressionList, client);
+    UnsupportedOperationException exception =
+        assertThrows(
+            UnsupportedOperationException.class, () -> queryRangeFunctionImplementation.valueOf());
+    assertEquals(
+        "Prometheus defined function [query_range] is only "
+            + "supported in SOURCE clause with prometheus connector catalog",
+        exception.getMessage());
+    assertEquals(
+        "query_range(query=\"http_latency\", starttime=12345, endtime=12345, step=14)",
+        queryRangeFunctionImplementation.toString());
+    assertEquals(ExprCoreType.STRUCT, queryRangeFunctionImplementation.type());
+  }
+
+  @Test
+  void testApplyArguments() {
+    FunctionName functionName = new FunctionName("query_range");
+    List<Expression> namedArgumentExpressionList =
+        List.of(
+            DSL.namedArgument("query", DSL.literal("http_latency")),
+            DSL.namedArgument("starttime", DSL.literal(12345)),
+            DSL.namedArgument("endtime", DSL.literal(1234)),
+            DSL.namedArgument("step", DSL.literal(14)));
+    QueryRangeFunctionImplementation queryRangeFunctionImplementation =
+        new QueryRangeFunctionImplementation(functionName, namedArgumentExpressionList, client);
+    PrometheusMetricTable prometheusMetricTable =
+        (PrometheusMetricTable) queryRangeFunctionImplementation.applyArguments();
+    assertNull(prometheusMetricTable.getMetricName());
+    assertNotNull(prometheusMetricTable.getPrometheusQueryRequest());
+    PrometheusQueryRequest prometheusQueryRequest =
+        prometheusMetricTable.getPrometheusQueryRequest();
+    assertEquals("http_latency", prometheusQueryRequest.getPromQl().toString());
+    assertEquals(12345, prometheusQueryRequest.getStartTime());
+    assertEquals(1234, prometheusQueryRequest.getEndTime());
+    assertEquals("14", prometheusQueryRequest.getStep());
+  }
+
+  @Test
+  void testApplyArgumentsException() {
+    FunctionName functionName = new FunctionName("query_range");
+    List<Expression> namedArgumentExpressionList =
+        List.of(
+            DSL.namedArgument("query", DSL.literal("http_latency")),
+            DSL.namedArgument("starttime", DSL.literal(12345)),
+            DSL.namedArgument("end_time", DSL.literal(1234)),
+            DSL.namedArgument("step", DSL.literal(14)));
+    QueryRangeFunctionImplementation queryRangeFunctionImplementation =
+        new QueryRangeFunctionImplementation(functionName, namedArgumentExpressionList, client);
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> queryRangeFunctionImplementation.applyArguments());
+    assertEquals("Invalid Function Argument:end_time", exception.getMessage());
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/resolver/QueryExemplarsTableFunctionResolverTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/resolver/QueryExemplarsTableFunctionResolverTest.java
new file mode 100644
index 0000000000..af8ebf48e2
--- /dev/null
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/resolver/QueryExemplarsTableFunctionResolverTest.java
@@ -0,0 +1,73 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.functions.resolver;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.opensearch.sql.data.type.ExprCoreType.LONG;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.function.FunctionBuilder;
+import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.expression.function.FunctionProperties;
+import org.opensearch.sql.expression.function.FunctionSignature;
+import org.opensearch.sql.expression.function.TableFunctionImplementation;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.functions.implementation.QueryExemplarFunctionImplementation;
+import org.opensearch.sql.prometheus.request.PrometheusQueryExemplarsRequest;
+import org.opensearch.sql.prometheus.storage.QueryExemplarsTable;
+
+@ExtendWith(MockitoExtension.class)
+class QueryExemplarsTableFunctionResolverTest {
+
+  @Mock private PrometheusClient client;
+
+  @Mock private FunctionProperties functionProperties;
+
+  @Test
+  void testResolve() {
+    QueryExemplarsTableFunctionResolver queryExemplarsTableFunctionResolver =
+        new QueryExemplarsTableFunctionResolver(client);
+    FunctionName functionName = FunctionName.of("query_exemplars");
+    List<Expression> expressions =
+        List.of(
+            DSL.namedArgument("query", DSL.literal("http_latency")),
+            DSL.namedArgument("starttime", DSL.literal(12345)),
+            DSL.namedArgument("endtime", DSL.literal(12345)));
+    FunctionSignature functionSignature =
+        new FunctionSignature(
+            functionName, expressions.stream().map(Expression::type).collect(Collectors.toList()));
+    Pair<FunctionSignature, FunctionBuilder> resolution =
+        queryExemplarsTableFunctionResolver.resolve(functionSignature);
+    assertEquals(functionName, resolution.getKey().getFunctionName());
+    assertEquals(functionName, queryExemplarsTableFunctionResolver.getFunctionName());
+    assertEquals(List.of(STRING, LONG, LONG), resolution.getKey().getParamTypeList());
+    FunctionBuilder functionBuilder = resolution.getValue();
+    TableFunctionImplementation functionImplementation =
+        (TableFunctionImplementation) functionBuilder.apply(functionProperties, expressions);
+    assertTrue(functionImplementation instanceof QueryExemplarFunctionImplementation);
+    QueryExemplarsTable queryExemplarsTable =
+        (QueryExemplarsTable) functionImplementation.applyArguments();
+    assertNotNull(queryExemplarsTable.getExemplarsRequest());
+    PrometheusQueryExemplarsRequest prometheusQueryExemplarsRequest =
+        queryExemplarsTable.getExemplarsRequest();
+    assertEquals("http_latency", prometheusQueryExemplarsRequest.getQuery());
+    assertEquals(12345L, prometheusQueryExemplarsRequest.getStartTime());
+    assertEquals(12345L, prometheusQueryExemplarsRequest.getEndTime());
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/resolver/QueryRangeTableFunctionResolverTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/resolver/QueryRangeTableFunctionResolverTest.java
new file mode 100644
index 0000000000..48050bcb15
--- /dev/null
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/resolver/QueryRangeTableFunctionResolverTest.java
@@ -0,0 +1,229 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.functions.resolver;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.opensearch.sql.data.type.ExprCoreType.LONG;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.function.FunctionBuilder;
+import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.expression.function.FunctionProperties;
+import org.opensearch.sql.expression.function.FunctionSignature;
+import org.opensearch.sql.expression.function.TableFunctionImplementation;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.functions.implementation.QueryRangeFunctionImplementation;
+import org.opensearch.sql.prometheus.request.PrometheusQueryRequest;
+import org.opensearch.sql.prometheus.storage.PrometheusMetricTable;
+
+@ExtendWith(MockitoExtension.class)
+class QueryRangeTableFunctionResolverTest {
+
+  @Mock private PrometheusClient client;
+
+  @Mock private FunctionProperties functionProperties;
+
+  @Test
+  void testResolve() {
+    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver =
+        new QueryRangeTableFunctionResolver(client);
+    FunctionName functionName = FunctionName.of("query_range");
+    List<Expression> expressions =
+        List.of(
+            DSL.namedArgument("query", DSL.literal("http_latency")),
+            DSL.namedArgument("starttime", DSL.literal(12345)),
+            DSL.namedArgument("endtime", DSL.literal(12345)),
+            DSL.namedArgument("step", DSL.literal(14)));
+    FunctionSignature functionSignature =
+        new FunctionSignature(
+            functionName, expressions.stream().map(Expression::type).collect(Collectors.toList()));
+    Pair<FunctionSignature, FunctionBuilder> resolution =
+        queryRangeTableFunctionResolver.resolve(functionSignature);
+    assertEquals(functionName, resolution.getKey().getFunctionName());
+    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
+    assertEquals(List.of(STRING, LONG, LONG, STRING), resolution.getKey().getParamTypeList());
+    FunctionBuilder functionBuilder = resolution.getValue();
+    TableFunctionImplementation functionImplementation =
+        (TableFunctionImplementation) functionBuilder.apply(functionProperties, expressions);
+    assertTrue(functionImplementation instanceof QueryRangeFunctionImplementation);
+    PrometheusMetricTable prometheusMetricTable =
+        (PrometheusMetricTable) functionImplementation.applyArguments();
+    assertNotNull(prometheusMetricTable.getPrometheusQueryRequest());
+    PrometheusQueryRequest prometheusQueryRequest =
+        prometheusMetricTable.getPrometheusQueryRequest();
+    assertEquals("http_latency", prometheusQueryRequest.getPromQl());
+    assertEquals(12345L, prometheusQueryRequest.getStartTime());
+    assertEquals(12345L, prometheusQueryRequest.getEndTime());
+    assertEquals("14", prometheusQueryRequest.getStep());
+  }
+
+  @Test
+  void testArgumentsPassedByPosition() {
+    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver =
+        new QueryRangeTableFunctionResolver(client);
+    FunctionName functionName = FunctionName.of("query_range");
+    List<Expression> expressions =
+        List.of(
+            DSL.namedArgument(null, DSL.literal("http_latency")),
+            DSL.namedArgument(null, DSL.literal(12345)),
+            DSL.namedArgument(null, DSL.literal(12345)),
+            DSL.namedArgument(null, DSL.literal(14)));
+    FunctionSignature functionSignature =
+        new FunctionSignature(
+            functionName, expressions.stream().map(Expression::type).collect(Collectors.toList()));
+
+    Pair<FunctionSignature, FunctionBuilder> resolution =
+        queryRangeTableFunctionResolver.resolve(functionSignature);
+
+    assertEquals(functionName, resolution.getKey().getFunctionName());
+    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
+    assertEquals(List.of(STRING, LONG, LONG, STRING), resolution.getKey().getParamTypeList());
+    FunctionBuilder functionBuilder = resolution.getValue();
+    TableFunctionImplementation functionImplementation =
+        (TableFunctionImplementation) functionBuilder.apply(functionProperties, expressions);
+    assertTrue(functionImplementation instanceof QueryRangeFunctionImplementation);
+    PrometheusMetricTable prometheusMetricTable =
+        (PrometheusMetricTable) functionImplementation.applyArguments();
+    assertNotNull(prometheusMetricTable.getPrometheusQueryRequest());
+    PrometheusQueryRequest prometheusQueryRequest =
+        prometheusMetricTable.getPrometheusQueryRequest();
+    assertEquals("http_latency", prometheusQueryRequest.getPromQl());
+    assertEquals(12345L, prometheusQueryRequest.getStartTime());
+    assertEquals(12345L, prometheusQueryRequest.getEndTime());
+    assertEquals("14", prometheusQueryRequest.getStep());
+  }
+
+  @Test
+  void testArgumentsPassedByNameWithDifferentOrder() {
+    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver =
+        new QueryRangeTableFunctionResolver(client);
+    FunctionName functionName = FunctionName.of("query_range");
+    List<Expression> expressions =
+        List.of(
+            DSL.namedArgument("query", DSL.literal("http_latency")),
+            DSL.namedArgument("endtime", DSL.literal(12345)),
+            DSL.namedArgument("step", DSL.literal(14)),
+            DSL.namedArgument("starttime", DSL.literal(12345)));
+    FunctionSignature functionSignature =
+        new FunctionSignature(
+            functionName, expressions.stream().map(Expression::type).collect(Collectors.toList()));
+
+    Pair<FunctionSignature, FunctionBuilder> resolution =
+        queryRangeTableFunctionResolver.resolve(functionSignature);
+
+    assertEquals(functionName, resolution.getKey().getFunctionName());
+    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
+    assertEquals(List.of(STRING, LONG, LONG, STRING), resolution.getKey().getParamTypeList());
+    FunctionBuilder functionBuilder = resolution.getValue();
+    TableFunctionImplementation functionImplementation =
+        (TableFunctionImplementation) functionBuilder.apply(functionProperties, expressions);
+    assertTrue(functionImplementation instanceof QueryRangeFunctionImplementation);
+    PrometheusMetricTable prometheusMetricTable =
+        (PrometheusMetricTable) functionImplementation.applyArguments();
+    assertNotNull(prometheusMetricTable.getPrometheusQueryRequest());
+    PrometheusQueryRequest prometheusQueryRequest =
+        prometheusMetricTable.getPrometheusQueryRequest();
+    assertEquals("http_latency", prometheusQueryRequest.getPromQl());
+    assertEquals(12345L, prometheusQueryRequest.getStartTime());
+    assertEquals(12345L, prometheusQueryRequest.getEndTime());
+    assertEquals("14", prometheusQueryRequest.getStep());
+  }
+
+  @Test
+  void testMixedArgumentTypes() {
+    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver =
+        new QueryRangeTableFunctionResolver(client);
+    FunctionName functionName = FunctionName.of("query_range");
+    List<Expression> expressions =
+        List.of(
+            DSL.namedArgument("query", DSL.literal("http_latency")),
+            DSL.namedArgument(null, DSL.literal(12345)),
+            DSL.namedArgument(null, DSL.literal(12345)),
+            DSL.namedArgument(null, DSL.literal(14)));
+    FunctionSignature functionSignature =
+        new FunctionSignature(
+            functionName, expressions.stream().map(Expression::type).collect(Collectors.toList()));
+    Pair<FunctionSignature, FunctionBuilder> resolution =
+        queryRangeTableFunctionResolver.resolve(functionSignature);
+
+    assertEquals(functionName, resolution.getKey().getFunctionName());
+    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
+    assertEquals(List.of(STRING, LONG, LONG, STRING), resolution.getKey().getParamTypeList());
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> resolution.getValue().apply(functionProperties, expressions));
+
+    assertEquals("Arguments should be either passed by name or position", exception.getMessage());
+  }
+
+  @Test
+  void testWrongArgumentsSizeWhenPassedByName() {
+    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver =
+        new QueryRangeTableFunctionResolver(client);
+    FunctionName functionName = FunctionName.of("query_range");
+    List<Expression> expressions =
+        List.of(
+            DSL.namedArgument("query", DSL.literal("http_latency")),
+            DSL.namedArgument("step", DSL.literal(12345)));
+    FunctionSignature functionSignature =
+        new FunctionSignature(
+            functionName, expressions.stream().map(Expression::type).collect(Collectors.toList()));
+    Pair<FunctionSignature, FunctionBuilder> resolution =
+        queryRangeTableFunctionResolver.resolve(functionSignature);
+
+    assertEquals(functionName, resolution.getKey().getFunctionName());
+    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
+    assertEquals(List.of(STRING, LONG, LONG, STRING), resolution.getKey().getParamTypeList());
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> resolution.getValue().apply(functionProperties, expressions));
+
+    assertEquals("Missing arguments:[endtime,starttime]", exception.getMessage());
+  }
+
+  @Test
+  void testWrongArgumentsSizeWhenPassedByPosition() {
+    QueryRangeTableFunctionResolver queryRangeTableFunctionResolver =
+        new QueryRangeTableFunctionResolver(client);
+    FunctionName functionName = FunctionName.of("query_range");
+    List<Expression> expressions =
+        List.of(
+            DSL.namedArgument(null, DSL.literal("http_latency")),
+            DSL.namedArgument(null, DSL.literal(12345)));
+    FunctionSignature functionSignature =
+        new FunctionSignature(
+            functionName, expressions.stream().map(Expression::type).collect(Collectors.toList()));
+    Pair<FunctionSignature, FunctionBuilder> resolution =
+        queryRangeTableFunctionResolver.resolve(functionSignature);
+
+    assertEquals(functionName, resolution.getKey().getFunctionName());
+    assertEquals(functionName, queryRangeTableFunctionResolver.getFunctionName());
+    assertEquals(List.of(STRING, LONG, LONG, STRING), resolution.getKey().getParamTypeList());
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> resolution.getValue().apply(functionProperties, expressions));
+
+    assertEquals("Missing arguments:[endtime,step]", exception.getMessage());
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanBuilderTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanBuilderTest.java
new file mode 100644
index 0000000000..bb7806f824
--- /dev/null
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanBuilderTest.java
@@ -0,0 +1,55 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.functions.scan;
+
+import static org.opensearch.sql.prometheus.constants.TestConstants.ENDTIME;
+import static org.opensearch.sql.prometheus.constants.TestConstants.QUERY;
+import static org.opensearch.sql.prometheus.constants.TestConstants.STARTTIME;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.opensearch.sql.planner.logical.LogicalProject;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.request.PrometheusQueryExemplarsRequest;
+import org.opensearch.sql.storage.TableScanOperator;
+
+public class QueryExemplarsFunctionTableScanBuilderTest {
+
+  @Mock private PrometheusClient prometheusClient;
+
+  @Mock private LogicalProject logicalProject;
+
+  @Test
+  void testBuild() {
+    PrometheusQueryExemplarsRequest exemplarsRequest = new PrometheusQueryExemplarsRequest();
+    exemplarsRequest.setQuery(QUERY);
+    exemplarsRequest.setStartTime(STARTTIME);
+    exemplarsRequest.setEndTime(ENDTIME);
+
+    QueryExemplarsFunctionTableScanBuilder queryExemplarsFunctionTableScanBuilder =
+        new QueryExemplarsFunctionTableScanBuilder(prometheusClient, exemplarsRequest);
+    TableScanOperator queryExemplarsFunctionTableScanOperator =
+        queryExemplarsFunctionTableScanBuilder.build();
+    Assertions.assertNotNull(queryExemplarsFunctionTableScanOperator);
+    Assertions.assertTrue(
+        queryExemplarsFunctionTableScanOperator instanceof QueryExemplarsFunctionTableScanOperator);
+  }
+
+  @Test
+  void testPushProject() {
+    PrometheusQueryExemplarsRequest exemplarsRequest = new PrometheusQueryExemplarsRequest();
+    exemplarsRequest.setQuery(QUERY);
+    exemplarsRequest.setStartTime(STARTTIME);
+    exemplarsRequest.setEndTime(ENDTIME);
+
+    QueryExemplarsFunctionTableScanBuilder queryExemplarsFunctionTableScanBuilder =
+        new QueryExemplarsFunctionTableScanBuilder(prometheusClient, exemplarsRequest);
+    Assertions.assertTrue(queryExemplarsFunctionTableScanBuilder.pushDownProject(logicalProject));
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanOperatorTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanOperatorTest.java
new file mode 100644
index 0000000000..5b8cf34fc2
--- /dev/null
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryExemplarsFunctionTableScanOperatorTest.java
@@ -0,0 +1,195 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.functions.scan;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.prometheus.constants.TestConstants.ENDTIME;
+import static org.opensearch.sql.prometheus.constants.TestConstants.QUERY;
+import static org.opensearch.sql.prometheus.constants.TestConstants.STARTTIME;
+import static org.opensearch.sql.prometheus.utils.TestUtils.getJson;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import lombok.SneakyThrows;
+import org.json.JSONArray;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.model.ExprCollectionValue;
+import org.opensearch.sql.data.model.ExprDoubleValue;
+import org.opensearch.sql.data.model.ExprStringValue;
+import org.opensearch.sql.data.model.ExprTimestampValue;
+import org.opensearch.sql.data.model.ExprTupleValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.request.PrometheusQueryExemplarsRequest;
+
+@ExtendWith(MockitoExtension.class)
+public class QueryExemplarsFunctionTableScanOperatorTest {
+  @Mock private PrometheusClient prometheusClient;
+
+  @Test
+  @SneakyThrows
+  void testQueryResponseIterator() {
+
+    PrometheusQueryExemplarsRequest prometheusQueryExemplarsRequest =
+        new PrometheusQueryExemplarsRequest();
+    prometheusQueryExemplarsRequest.setQuery(QUERY);
+    prometheusQueryExemplarsRequest.setStartTime(STARTTIME);
+    prometheusQueryExemplarsRequest.setEndTime(ENDTIME);
+
+    QueryExemplarsFunctionTableScanOperator queryExemplarsFunctionTableScanOperator =
+        new QueryExemplarsFunctionTableScanOperator(
+            prometheusClient, prometheusQueryExemplarsRequest);
+
+    when(prometheusClient.queryExemplars(any(), any(), any()))
+        .thenReturn(new JSONArray(getJson("query_exemplars_result.json")));
+    queryExemplarsFunctionTableScanOperator.open();
+    Assertions.assertTrue(queryExemplarsFunctionTableScanOperator.hasNext());
+    LinkedHashMap<String, ExprValue> seriesLabelsHashMap = new LinkedHashMap<>();
+    seriesLabelsHashMap.put("instance", new ExprStringValue("localhost:8090"));
+    seriesLabelsHashMap.put("__name__", new ExprStringValue("test_exemplar_metric_total"));
+    seriesLabelsHashMap.put("service", new ExprStringValue("bar"));
+    seriesLabelsHashMap.put("job", new ExprStringValue("prometheus"));
+    LinkedHashMap<String, ExprValue> exemplarMap = new LinkedHashMap<>();
+    exemplarMap.put(
+        "labels",
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put("traceID", new ExprStringValue("EpTxMJ40fUus7aGY"));
+              }
+            }));
+    exemplarMap.put("timestamp", new ExprTimestampValue(Instant.ofEpochMilli(1600096945479L)));
+    exemplarMap.put("value", new ExprDoubleValue(6));
+    List<ExprValue> exprValueList = new ArrayList<>();
+    exprValueList.add(new ExprTupleValue(exemplarMap));
+    ExprCollectionValue exemplars = new ExprCollectionValue(exprValueList);
+    ExprTupleValue seriesLabels = new ExprTupleValue(seriesLabelsHashMap);
+    ExprTupleValue firstRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put("seriesLabels", seriesLabels);
+                put("exemplars", exemplars);
+              }
+            });
+
+    assertEquals(firstRow, queryExemplarsFunctionTableScanOperator.next());
+  }
+
+  @Test
+  @SneakyThrows
+  void testEmptyQueryWithNoMatrixKeyInResultJson() {
+    PrometheusQueryExemplarsRequest prometheusQueryExemplarsRequest =
+        new PrometheusQueryExemplarsRequest();
+    prometheusQueryExemplarsRequest.setQuery(QUERY);
+    prometheusQueryExemplarsRequest.setStartTime(STARTTIME);
+    prometheusQueryExemplarsRequest.setEndTime(ENDTIME);
+
+    QueryExemplarsFunctionTableScanOperator queryExemplarsFunctionTableScanOperator =
+        new QueryExemplarsFunctionTableScanOperator(
+            prometheusClient, prometheusQueryExemplarsRequest);
+
+    when(prometheusClient.queryExemplars(any(), any(), any()))
+        .thenReturn(new JSONArray(getJson("query_exemplars_empty_result.json")));
+    queryExemplarsFunctionTableScanOperator.open();
+    Assertions.assertFalse(queryExemplarsFunctionTableScanOperator.hasNext());
+  }
+
+  @Test
+  @SneakyThrows
+  void testQuerySchema() {
+
+    PrometheusQueryExemplarsRequest prometheusQueryExemplarsRequest =
+        new PrometheusQueryExemplarsRequest();
+    prometheusQueryExemplarsRequest.setQuery(QUERY);
+    prometheusQueryExemplarsRequest.setStartTime(STARTTIME);
+    prometheusQueryExemplarsRequest.setEndTime(ENDTIME);
+
+    QueryExemplarsFunctionTableScanOperator queryExemplarsFunctionTableScanOperator =
+        new QueryExemplarsFunctionTableScanOperator(
+            prometheusClient, prometheusQueryExemplarsRequest);
+
+    when(prometheusClient.queryExemplars(any(), any(), any()))
+        .thenReturn(new JSONArray(getJson("query_exemplars_result.json")));
+    queryExemplarsFunctionTableScanOperator.open();
+    Assertions.assertTrue(queryExemplarsFunctionTableScanOperator.hasNext());
+
+    ArrayList<ExecutionEngine.Schema.Column> columns = new ArrayList<>();
+    columns.add(
+        new ExecutionEngine.Schema.Column("seriesLabels", "seriesLabels", ExprCoreType.STRUCT));
+    columns.add(new ExecutionEngine.Schema.Column("exemplars", "exemplars", ExprCoreType.ARRAY));
+    ExecutionEngine.Schema expectedSchema = new ExecutionEngine.Schema(columns);
+    assertEquals(expectedSchema, queryExemplarsFunctionTableScanOperator.schema());
+  }
+
+  @Test
+  @SneakyThrows
+  void testEmptyQueryWithException() {
+
+    PrometheusQueryExemplarsRequest prometheusQueryExemplarsRequest =
+        new PrometheusQueryExemplarsRequest();
+    prometheusQueryExemplarsRequest.setQuery(QUERY);
+    prometheusQueryExemplarsRequest.setStartTime(STARTTIME);
+    prometheusQueryExemplarsRequest.setEndTime(ENDTIME);
+
+    QueryExemplarsFunctionTableScanOperator queryExemplarsFunctionTableScanOperator =
+        new QueryExemplarsFunctionTableScanOperator(
+            prometheusClient, prometheusQueryExemplarsRequest);
+    when(prometheusClient.queryExemplars(any(), any(), any()))
+        .thenThrow(new IOException("Error Message"));
+    RuntimeException runtimeException =
+        assertThrows(RuntimeException.class, queryExemplarsFunctionTableScanOperator::open);
+    assertEquals(
+        "Error fetching data from prometheus server: Error Message", runtimeException.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testExplain() {
+
+    PrometheusQueryExemplarsRequest prometheusQueryExemplarsRequest =
+        new PrometheusQueryExemplarsRequest();
+    prometheusQueryExemplarsRequest.setQuery(QUERY);
+    prometheusQueryExemplarsRequest.setStartTime(STARTTIME);
+    prometheusQueryExemplarsRequest.setEndTime(ENDTIME);
+
+    QueryExemplarsFunctionTableScanOperator queryExemplarsFunctionTableScanOperator =
+        new QueryExemplarsFunctionTableScanOperator(
+            prometheusClient, prometheusQueryExemplarsRequest);
+    Assertions.assertEquals(
+        "query_exemplars(test_query, 1664767694133, 1664771294133)",
+        queryExemplarsFunctionTableScanOperator.explain());
+  }
+
+  @Test
+  @SneakyThrows
+  void testClose() {
+    PrometheusQueryExemplarsRequest prometheusQueryExemplarsRequest =
+        new PrometheusQueryExemplarsRequest();
+    prometheusQueryExemplarsRequest.setQuery(QUERY);
+    prometheusQueryExemplarsRequest.setStartTime(STARTTIME);
+    prometheusQueryExemplarsRequest.setEndTime(ENDTIME);
+
+    QueryExemplarsFunctionTableScanOperator queryExemplarsFunctionTableScanOperator =
+        new QueryExemplarsFunctionTableScanOperator(
+            prometheusClient, prometheusQueryExemplarsRequest);
+    queryExemplarsFunctionTableScanOperator.close();
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanBuilderTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanBuilderTest.java
new file mode 100644
index 0000000000..dca79d6905
--- /dev/null
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanBuilderTest.java
@@ -0,0 +1,58 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.functions.scan;
+
+import static org.opensearch.sql.prometheus.constants.TestConstants.ENDTIME;
+import static org.opensearch.sql.prometheus.constants.TestConstants.QUERY;
+import static org.opensearch.sql.prometheus.constants.TestConstants.STARTTIME;
+import static org.opensearch.sql.prometheus.constants.TestConstants.STEP;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.opensearch.sql.planner.logical.LogicalProject;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.request.PrometheusQueryRequest;
+import org.opensearch.sql.storage.TableScanOperator;
+
+public class QueryRangeFunctionTableScanBuilderTest {
+
+  @Mock private PrometheusClient prometheusClient;
+
+  @Mock private LogicalProject logicalProject;
+
+  @Test
+  void testBuild() {
+    PrometheusQueryRequest prometheusQueryRequest = new PrometheusQueryRequest();
+    prometheusQueryRequest.setPromQl(QUERY);
+    prometheusQueryRequest.setStartTime(STARTTIME);
+    prometheusQueryRequest.setEndTime(ENDTIME);
+    prometheusQueryRequest.setStep(STEP);
+
+    QueryRangeFunctionTableScanBuilder queryRangeFunctionTableScanBuilder =
+        new QueryRangeFunctionTableScanBuilder(prometheusClient, prometheusQueryRequest);
+    TableScanOperator queryRangeFunctionTableScanOperator =
+        queryRangeFunctionTableScanBuilder.build();
+    Assertions.assertNotNull(queryRangeFunctionTableScanOperator);
+    Assertions.assertTrue(
+        queryRangeFunctionTableScanOperator instanceof QueryRangeFunctionTableScanOperator);
+  }
+
+  @Test
+  void testPushProject() {
+    PrometheusQueryRequest prometheusQueryRequest = new PrometheusQueryRequest();
+    prometheusQueryRequest.setPromQl(QUERY);
+    prometheusQueryRequest.setStartTime(STARTTIME);
+    prometheusQueryRequest.setEndTime(ENDTIME);
+    prometheusQueryRequest.setStep(STEP);
+
+    QueryRangeFunctionTableScanBuilder queryRangeFunctionTableScanBuilder =
+        new QueryRangeFunctionTableScanBuilder(prometheusClient, prometheusQueryRequest);
+    Assertions.assertTrue(queryRangeFunctionTableScanBuilder.pushDownProject(logicalProject));
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanOperatorTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanOperatorTest.java
new file mode 100644
index 0000000000..e59a2bf7c4
--- /dev/null
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanOperatorTest.java
@@ -0,0 +1,216 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.functions.scan;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.prometheus.constants.TestConstants.ENDTIME;
+import static org.opensearch.sql.prometheus.constants.TestConstants.QUERY;
+import static org.opensearch.sql.prometheus.constants.TestConstants.STARTTIME;
+import static org.opensearch.sql.prometheus.constants.TestConstants.STEP;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.LABELS;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.TIMESTAMP;
+import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.VALUE;
+import static org.opensearch.sql.prometheus.utils.TestUtils.getJson;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import lombok.SneakyThrows;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.model.ExprCollectionValue;
+import org.opensearch.sql.data.model.ExprDoubleValue;
+import org.opensearch.sql.data.model.ExprStringValue;
+import org.opensearch.sql.data.model.ExprTimestampValue;
+import org.opensearch.sql.data.model.ExprTupleValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.request.PrometheusQueryRequest;
+
+@ExtendWith(MockitoExtension.class)
+class QueryRangeFunctionTableScanOperatorTest {
+  @Mock private PrometheusClient prometheusClient;
+
+  @Test
+  @SneakyThrows
+  void testQueryResponseIterator() {
+
+    PrometheusQueryRequest prometheusQueryRequest = new PrometheusQueryRequest();
+    prometheusQueryRequest.setPromQl(QUERY);
+    prometheusQueryRequest.setStartTime(STARTTIME);
+    prometheusQueryRequest.setEndTime(ENDTIME);
+    prometheusQueryRequest.setStep(STEP);
+
+    QueryRangeFunctionTableScanOperator queryRangeFunctionTableScanOperator =
+        new QueryRangeFunctionTableScanOperator(prometheusClient, prometheusQueryRequest);
+
+    when(prometheusClient.queryRange(any(), any(), any(), any()))
+        .thenReturn(new JSONObject(getJson("query_range_result.json")));
+    queryRangeFunctionTableScanOperator.open();
+    Assertions.assertTrue(queryRangeFunctionTableScanOperator.hasNext());
+    LinkedHashMap<String, ExprValue> labelsMap =
+        new LinkedHashMap<>() {
+          {
+            put("instance", new ExprStringValue("localhost:9090"));
+            put("__name__", new ExprStringValue("up"));
+            put("job", new ExprStringValue("prometheus"));
+          }
+        };
+    ExprTupleValue firstRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put(LABELS, new ExprTupleValue(labelsMap));
+                put(
+                    TIMESTAMP,
+                    new ExprCollectionValue(
+                        Collections.singletonList(
+                            new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)))));
+                put(
+                    VALUE,
+                    new ExprCollectionValue(Collections.singletonList(new ExprDoubleValue(1))));
+              }
+            });
+
+    assertEquals(firstRow, queryRangeFunctionTableScanOperator.next());
+    Assertions.assertTrue(queryRangeFunctionTableScanOperator.hasNext());
+
+    LinkedHashMap<String, ExprValue> labelsMap2 =
+        new LinkedHashMap<>() {
+          {
+            put("instance", new ExprStringValue("localhost:9091"));
+            put("__name__", new ExprStringValue("up"));
+            put("job", new ExprStringValue("node"));
+          }
+        };
+    ExprTupleValue secondRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put(LABELS, new ExprTupleValue(labelsMap2));
+                put(
+                    TIMESTAMP,
+                    new ExprCollectionValue(
+                        Collections.singletonList(
+                            new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)))));
+                put(
+                    VALUE,
+                    new ExprCollectionValue(Collections.singletonList(new ExprDoubleValue(0))));
+              }
+            });
+    assertEquals(secondRow, queryRangeFunctionTableScanOperator.next());
+    Assertions.assertFalse(queryRangeFunctionTableScanOperator.hasNext());
+  }
+
+  @Test
+  @SneakyThrows
+  void testEmptyQueryWithNoMatrixKeyInResultJson() {
+    PrometheusQueryRequest prometheusQueryRequest = new PrometheusQueryRequest();
+    prometheusQueryRequest.setPromQl(QUERY);
+    prometheusQueryRequest.setStartTime(STARTTIME);
+    prometheusQueryRequest.setEndTime(ENDTIME);
+    prometheusQueryRequest.setStep(STEP);
+
+    QueryRangeFunctionTableScanOperator queryRangeFunctionTableScanOperator =
+        new QueryRangeFunctionTableScanOperator(prometheusClient, prometheusQueryRequest);
+
+    when(prometheusClient.queryRange(any(), any(), any(), any()))
+        .thenReturn(new JSONObject(getJson("no_matrix_query_range_result.json")));
+    RuntimeException runtimeException =
+        assertThrows(RuntimeException.class, queryRangeFunctionTableScanOperator::open);
+    assertEquals(
+        "Unexpected Result Type: vector during Prometheus Response Parsing. "
+            + "'matrix' resultType is expected",
+        runtimeException.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testQuerySchema() {
+    PrometheusQueryRequest prometheusQueryRequest = new PrometheusQueryRequest();
+    prometheusQueryRequest.setPromQl(QUERY);
+    prometheusQueryRequest.setStartTime(STARTTIME);
+    prometheusQueryRequest.setEndTime(ENDTIME);
+    prometheusQueryRequest.setStep(STEP);
+
+    QueryRangeFunctionTableScanOperator queryRangeFunctionTableScanOperator =
+        new QueryRangeFunctionTableScanOperator(prometheusClient, prometheusQueryRequest);
+
+    when(prometheusClient.queryRange(any(), any(), any(), any()))
+        .thenReturn(new JSONObject(getJson("query_range_result.json")));
+    queryRangeFunctionTableScanOperator.open();
+    ArrayList<ExecutionEngine.Schema.Column> columns = new ArrayList<>();
+    columns.add(new ExecutionEngine.Schema.Column(LABELS, LABELS, ExprCoreType.STRUCT));
+    columns.add(new ExecutionEngine.Schema.Column(TIMESTAMP, TIMESTAMP, ExprCoreType.ARRAY));
+    columns.add(new ExecutionEngine.Schema.Column(VALUE, VALUE, ExprCoreType.ARRAY));
+    ExecutionEngine.Schema expectedSchema = new ExecutionEngine.Schema(columns);
+    assertEquals(expectedSchema, queryRangeFunctionTableScanOperator.schema());
+  }
+
+  @Test
+  @SneakyThrows
+  void testEmptyQueryWithException() {
+    PrometheusQueryRequest prometheusQueryRequest = new PrometheusQueryRequest();
+    prometheusQueryRequest.setPromQl(QUERY);
+    prometheusQueryRequest.setStartTime(STARTTIME);
+    prometheusQueryRequest.setEndTime(ENDTIME);
+    prometheusQueryRequest.setStep(STEP);
+
+    QueryRangeFunctionTableScanOperator queryRangeFunctionTableScanOperator =
+        new QueryRangeFunctionTableScanOperator(prometheusClient, prometheusQueryRequest);
+
+    when(prometheusClient.queryRange(any(), any(), any(), any()))
+        .thenThrow(new IOException("Error Message"));
+    RuntimeException runtimeException =
+        assertThrows(RuntimeException.class, queryRangeFunctionTableScanOperator::open);
+    assertEquals(
+        "Error fetching data from prometheus server: Error Message", runtimeException.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testExplain() {
+    PrometheusQueryRequest prometheusQueryRequest = new PrometheusQueryRequest();
+    prometheusQueryRequest.setPromQl(QUERY);
+    prometheusQueryRequest.setStartTime(STARTTIME);
+    prometheusQueryRequest.setEndTime(ENDTIME);
+    prometheusQueryRequest.setStep(STEP);
+
+    QueryRangeFunctionTableScanOperator queryRangeFunctionTableScanOperator =
+        new QueryRangeFunctionTableScanOperator(prometheusClient, prometheusQueryRequest);
+
+    Assertions.assertEquals(
+        "query_range(test_query, 1664767694133, 1664771294133, 14)",
+        queryRangeFunctionTableScanOperator.explain());
+  }
+
+  @Test
+  @SneakyThrows
+  void testClose() {
+    PrometheusQueryRequest prometheusQueryRequest = new PrometheusQueryRequest();
+    prometheusQueryRequest.setPromQl(QUERY);
+    prometheusQueryRequest.setStartTime(STARTTIME);
+    prometheusQueryRequest.setEndTime(ENDTIME);
+    prometheusQueryRequest.setStep(STEP);
+
+    QueryRangeFunctionTableScanOperator queryRangeFunctionTableScanOperator =
+        new QueryRangeFunctionTableScanOperator(prometheusClient, prometheusQueryRequest);
+    queryRangeFunctionTableScanOperator.close();
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicOptimizerTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicOptimizerTest.java
index a1d1cef91d..33c48e2f2d 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicOptimizerTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/planner/logical/PrometheusLogicOptimizerTest.java
@@ -32,60 +32,50 @@
 @ExtendWith(MockitoExtension.class)
 public class PrometheusLogicOptimizerTest {
 
-  @Mock
-  private Table table;
+  @Mock private Table table;
 
   @Test
   void project_filter_merge_with_relation() {
     assertEquals(
         project(
-            indexScan("prometheus_http_total_requests",
-                DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))))
-        ),
+            indexScan(
+                "prometheus_http_total_requests",
+                DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))))),
         optimize(
             project(
                 filter(
                     relation("prometheus_http_total_requests", table),
-                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200")))
-                ))
-        )
-    );
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200")))))));
   }
 
   @Test
   void aggregation_merge_relation() {
     assertEquals(
         project(
-            indexScanAgg("prometheus_http_total_requests", ImmutableList
-                    .of(DSL.named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
+            indexScanAgg(
+                "prometheus_http_total_requests",
+                ImmutableList.of(DSL.named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
                 ImmutableList.of(DSL.named("code", DSL.ref("code", STRING)))),
             DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE))),
         optimize(
             project(
                 aggregation(
                     relation("prometheus_http_total_requests", table),
-                    ImmutableList
-                        .of(DSL.named("AVG(@value)",
-                            DSL.avg(DSL.ref("@value", INTEGER)))),
-                    ImmutableList.of(DSL.named("code",
-                        DSL.ref("code", STRING)))),
-                DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE)))
-        )
-    );
+                    ImmutableList.of(DSL.named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                    ImmutableList.of(DSL.named("code", DSL.ref("code", STRING)))),
+                DSL.named("AVG(intV)", DSL.ref("AVG(intV)", DOUBLE)))));
   }
 
-
   @Test
   void aggregation_merge_filter_relation() {
     assertEquals(
         project(
-            indexScanAgg("prometheus_http_total_requests",
-                DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+            indexScanAgg(
+                "prometheus_http_total_requests",
+                DSL.and(
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
                     DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))),
-                ImmutableList
-                    .of(DSL.named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
+                ImmutableList.of(DSL.named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
                 ImmutableList.of(DSL.named("job", DSL.ref("job", STRING)))),
             DSL.named("AVG(@value)", DSL.ref("AVG(@value)", DOUBLE))),
         optimize(
@@ -94,25 +84,16 @@ void aggregation_merge_filter_relation() {
                     filter(
                         relation("prometheus_http_total_requests", table),
                         DSL.and(
-                            DSL.equal(DSL.ref("code", STRING),
-                                DSL.literal(stringValue("200"))),
-                            DSL.equal(DSL.ref("handler", STRING),
-                                DSL.literal(stringValue("/ready/"))))
-                    ),
-                    ImmutableList
-                        .of(DSL.named("AVG(@value)",
-                            DSL.avg(DSL.ref("@value", INTEGER)))),
-                    ImmutableList.of(DSL.named("job",
-                        DSL.ref("job", STRING)))),
-                DSL.named("AVG(@value)", DSL.ref("AVG(@value)", DOUBLE)))
-        )
-    );
+                            DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                            DSL.equal(
+                                DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))))),
+                    ImmutableList.of(DSL.named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                    ImmutableList.of(DSL.named("job", DSL.ref("job", STRING)))),
+                DSL.named("AVG(@value)", DSL.ref("AVG(@value)", DOUBLE)))));
   }
 
-
   private LogicalPlan optimize(LogicalPlan plan) {
     final LogicalPlanOptimizer optimizer = PrometheusLogicalPlanOptimizerFactory.create();
     return optimizer.optimize(plan);
   }
-
 }
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/request/PrometheusDescribeMetricRequestTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/request/PrometheusDescribeMetricRequestTest.java
index dfc9aee7dc..9add7896cf 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/request/PrometheusDescribeMetricRequestTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/request/PrometheusDescribeMetricRequestTest.java
@@ -37,54 +37,61 @@
 @ExtendWith(MockitoExtension.class)
 public class PrometheusDescribeMetricRequestTest {
 
-  @Mock
-  private PrometheusClient prometheusClient;
+  @Mock private PrometheusClient prometheusClient;
 
   @Test
   @SneakyThrows
   void testGetFieldTypes() {
-    when(prometheusClient.getLabels(METRIC_NAME)).thenReturn(new ArrayList<String>() {{
-        add("call");
-        add("code");
-      }
-    });
-    Map<String, ExprType> expected = new HashMap<>() {{
-        put("call", ExprCoreType.STRING);
-        put("code", ExprCoreType.STRING);
-        put(VALUE, ExprCoreType.DOUBLE);
-        put(TIMESTAMP, ExprCoreType.TIMESTAMP);
-      }};
-    PrometheusDescribeMetricRequest prometheusDescribeMetricRequest
-        = new PrometheusDescribeMetricRequest(prometheusClient,
-                new DataSourceSchemaName("prometheus", "default"), METRIC_NAME);
+    when(prometheusClient.getLabels(METRIC_NAME))
+        .thenReturn(
+            new ArrayList<String>() {
+              {
+                add("call");
+                add("code");
+              }
+            });
+    Map<String, ExprType> expected =
+        new HashMap<>() {
+          {
+            put("call", ExprCoreType.STRING);
+            put("code", ExprCoreType.STRING);
+            put(VALUE, ExprCoreType.DOUBLE);
+            put(TIMESTAMP, ExprCoreType.TIMESTAMP);
+          }
+        };
+    PrometheusDescribeMetricRequest prometheusDescribeMetricRequest =
+        new PrometheusDescribeMetricRequest(
+            prometheusClient, new DataSourceSchemaName("prometheus", "default"), METRIC_NAME);
     assertEquals(expected, prometheusDescribeMetricRequest.getFieldTypes());
     verify(prometheusClient, times(1)).getLabels(METRIC_NAME);
   }
 
-
   @Test
   @SneakyThrows
   void testGetFieldTypesWithEmptyMetricName() {
-    Map<String, ExprType> expected = new HashMap<>() {{
-        put(VALUE, ExprCoreType.DOUBLE);
-        put(TIMESTAMP, ExprCoreType.TIMESTAMP);
-      }};
-    assertThrows(NullPointerException.class,
-        () -> new PrometheusDescribeMetricRequest(prometheusClient,
-            new DataSourceSchemaName("prometheus", "default"),
-             null));
+    Map<String, ExprType> expected =
+        new HashMap<>() {
+          {
+            put(VALUE, ExprCoreType.DOUBLE);
+            put(TIMESTAMP, ExprCoreType.TIMESTAMP);
+          }
+        };
+    assertThrows(
+        NullPointerException.class,
+        () ->
+            new PrometheusDescribeMetricRequest(
+                prometheusClient, new DataSourceSchemaName("prometheus", "default"), null));
   }
 
-
   @Test
   @SneakyThrows
   void testGetFieldTypesWhenException() {
     when(prometheusClient.getLabels(METRIC_NAME)).thenThrow(new RuntimeException("ERROR Message"));
-    PrometheusDescribeMetricRequest prometheusDescribeMetricRequest
-        = new PrometheusDescribeMetricRequest(prometheusClient,
-            new DataSourceSchemaName("prometheus", "default"), METRIC_NAME);
-    RuntimeException exception = assertThrows(RuntimeException.class,
-        prometheusDescribeMetricRequest::getFieldTypes);
+    PrometheusDescribeMetricRequest prometheusDescribeMetricRequest =
+        new PrometheusDescribeMetricRequest(
+            prometheusClient, new DataSourceSchemaName("prometheus", "default"), METRIC_NAME);
+    RuntimeException exception =
+        assertThrows(RuntimeException.class, prometheusDescribeMetricRequest::getFieldTypes);
     verify(prometheusClient, times(1)).getLabels(METRIC_NAME);
     assertEquals("ERROR Message", exception.getMessage());
   }
@@ -93,27 +100,30 @@ void testGetFieldTypesWhenException() {
   @SneakyThrows
   void testGetFieldTypesWhenIOException() {
     when(prometheusClient.getLabels(METRIC_NAME)).thenThrow(new IOException("ERROR Message"));
-    PrometheusDescribeMetricRequest prometheusDescribeMetricRequest
-        = new PrometheusDescribeMetricRequest(prometheusClient,
-            new DataSourceSchemaName("prometheus", "default"), METRIC_NAME);
-    RuntimeException exception = assertThrows(RuntimeException.class,
-        prometheusDescribeMetricRequest::getFieldTypes);
-    assertEquals("Error while fetching labels for http_requests_total"
-        + " from prometheus: ERROR Message", exception.getMessage());
+    PrometheusDescribeMetricRequest prometheusDescribeMetricRequest =
+        new PrometheusDescribeMetricRequest(
+            prometheusClient, new DataSourceSchemaName("prometheus", "default"), METRIC_NAME);
+    RuntimeException exception =
+        assertThrows(RuntimeException.class, prometheusDescribeMetricRequest::getFieldTypes);
+    assertEquals(
+        "Error while fetching labels for http_requests_total" + " from prometheus: ERROR Message",
+        exception.getMessage());
     verify(prometheusClient, times(1)).getLabels(METRIC_NAME);
   }
 
   @Test
   @SneakyThrows
   void testSearch() {
-    when(prometheusClient.getLabels(METRIC_NAME)).thenReturn(new ArrayList<>() {
-      {
-        add("call");
-      }
-    });
-    PrometheusDescribeMetricRequest prometheusDescribeMetricRequest
-        = new PrometheusDescribeMetricRequest(prometheusClient,
-            new DataSourceSchemaName("test", "default"), METRIC_NAME);
+    when(prometheusClient.getLabels(METRIC_NAME))
+        .thenReturn(
+            new ArrayList<>() {
+              {
+                add("call");
+              }
+            });
+    PrometheusDescribeMetricRequest prometheusDescribeMetricRequest =
+        new PrometheusDescribeMetricRequest(
+            prometheusClient, new DataSourceSchemaName("test", "default"), METRIC_NAME);
     List<ExprValue> result = prometheusDescribeMetricRequest.search();
     assertEquals(3, result.size());
     assertEquals(expectedRow(), result.get(0));
@@ -129,5 +139,4 @@ private ExprValue expectedRow() {
     valueMap.put("DATA_TYPE", stringValue(ExprCoreType.STRING.legacyTypeName().toLowerCase()));
     return new ExprTupleValue(valueMap);
   }
-
 }
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/request/PrometheusListMetricsRequestTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/request/PrometheusListMetricsRequestTest.java
index bf5bb22e96..09f63463b5 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/request/PrometheusListMetricsRequestTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/request/PrometheusListMetricsRequestTest.java
@@ -35,45 +35,46 @@
 @ExtendWith(MockitoExtension.class)
 public class PrometheusListMetricsRequestTest {
 
-  @Mock
-  private PrometheusClient prometheusClient;
+  @Mock private PrometheusClient prometheusClient;
 
   @Test
   @SneakyThrows
   void testSearch() {
     Map<String, List<MetricMetadata>> metricsResult = new HashMap<>();
-    metricsResult.put("go_gc_duration_seconds",
-        Collections.singletonList(new MetricMetadata("summary",
-            "A summary of the pause duration of garbage collection cycles.", "")));
-    metricsResult.put("go_goroutines",
-        Collections.singletonList(new MetricMetadata("gauge",
-            "Number of goroutines that currently exist.", "")));
+    metricsResult.put(
+        "go_gc_duration_seconds",
+        Collections.singletonList(
+            new MetricMetadata(
+                "summary", "A summary of the pause duration of garbage collection cycles.", "")));
+    metricsResult.put(
+        "go_goroutines",
+        Collections.singletonList(
+            new MetricMetadata("gauge", "Number of goroutines that currently exist.", "")));
     when(prometheusClient.getAllMetrics()).thenReturn(metricsResult);
-    PrometheusListMetricsRequest prometheusListMetricsRequest
-        = new PrometheusListMetricsRequest(prometheusClient,
-            new DataSourceSchemaName("prometheus", "information_schema"));
+    PrometheusListMetricsRequest prometheusListMetricsRequest =
+        new PrometheusListMetricsRequest(
+            prometheusClient, new DataSourceSchemaName("prometheus", "information_schema"));
     List<ExprValue> result = prometheusListMetricsRequest.search();
     assertEquals(expectedRow(), result.get(0));
     assertEquals(2, result.size());
     verify(prometheusClient, times(1)).getAllMetrics();
   }
 
-
   @Test
   @SneakyThrows
   void testSearchWhenIOException() {
     when(prometheusClient.getAllMetrics()).thenThrow(new IOException("ERROR Message"));
-    PrometheusListMetricsRequest prometheusListMetricsRequest
-        = new PrometheusListMetricsRequest(prometheusClient,
-            new DataSourceSchemaName("prometheus", "information_schema"));
-    RuntimeException exception = assertThrows(RuntimeException.class,
-        prometheusListMetricsRequest::search);
-    assertEquals("Error while fetching metric list for from prometheus: ERROR Message",
+    PrometheusListMetricsRequest prometheusListMetricsRequest =
+        new PrometheusListMetricsRequest(
+            prometheusClient, new DataSourceSchemaName("prometheus", "information_schema"));
+    RuntimeException exception =
+        assertThrows(RuntimeException.class, prometheusListMetricsRequest::search);
+    assertEquals(
+        "Error while fetching metric list for from prometheus: ERROR Message",
         exception.getMessage());
     verify(prometheusClient, times(1)).getAllMetrics();
   }
 
-
   private ExprTupleValue expectedRow() {
     LinkedHashMap<String, ExprValue> valueMap = new LinkedHashMap<>();
     valueMap.put("TABLE_CATALOG", stringValue("prometheus"));
@@ -81,9 +82,8 @@ private ExprTupleValue expectedRow() {
     valueMap.put("TABLE_NAME", stringValue("go_gc_duration_seconds"));
     valueMap.put("TABLE_TYPE", stringValue("summary"));
     valueMap.put("UNIT", stringValue(""));
-    valueMap.put("REMARKS",
-        stringValue("A summary of the pause duration of garbage collection cycles."));
+    valueMap.put(
+        "REMARKS", stringValue("A summary of the pause duration of garbage collection cycles."));
     return new ExprTupleValue(valueMap);
   }
-
 }
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusMetricScanTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusMetricScanTest.java
index cb70e9e064..00ddc973bc 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusMetricScanTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusMetricScanTest.java
@@ -16,7 +16,6 @@
 import static org.opensearch.sql.prometheus.constants.TestConstants.QUERY;
 import static org.opensearch.sql.prometheus.constants.TestConstants.STARTTIME;
 import static org.opensearch.sql.prometheus.constants.TestConstants.STEP;
-import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.LABELS;
 import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.TIMESTAMP;
 import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.VALUE;
 import static org.opensearch.sql.prometheus.utils.TestUtils.getJson;
@@ -45,8 +44,7 @@
 @ExtendWith(MockitoExtension.class)
 public class PrometheusMetricScanTest {
 
-  @Mock
-  private PrometheusClient prometheusClient;
+  @Mock private PrometheusClient prometheusClient;
 
   @Test
   @SneakyThrows
@@ -61,24 +59,30 @@ void testQueryResponseIterator() {
         .thenReturn(new JSONObject(getJson("query_range_result.json")));
     prometheusMetricScan.open();
     Assertions.assertTrue(prometheusMetricScan.hasNext());
-    ExprTupleValue firstRow = new ExprTupleValue(new LinkedHashMap<>() {{
-        put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
-        put(VALUE, new ExprDoubleValue(1));
-        put("instance", new ExprStringValue("localhost:9090"));
-        put("__name__", new ExprStringValue("up"));
-        put("job", new ExprStringValue("prometheus"));
-      }
-    });
+    ExprTupleValue firstRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
+                put(VALUE, new ExprDoubleValue(1));
+                put("instance", new ExprStringValue("localhost:9090"));
+                put("__name__", new ExprStringValue("up"));
+                put("job", new ExprStringValue("prometheus"));
+              }
+            });
     assertEquals(firstRow, prometheusMetricScan.next());
     Assertions.assertTrue(prometheusMetricScan.hasNext());
-    ExprTupleValue secondRow = new ExprTupleValue(new LinkedHashMap<>() {{
-        put("@timestamp", new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
-        put("@value", new ExprDoubleValue(0));
-        put("instance", new ExprStringValue("localhost:9091"));
-        put("__name__", new ExprStringValue("up"));
-        put("job", new ExprStringValue("node"));
-      }
-    });
+    ExprTupleValue secondRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put("@timestamp", new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
+                put("@value", new ExprDoubleValue(0));
+                put("instance", new ExprStringValue("localhost:9091"));
+                put("__name__", new ExprStringValue("up"));
+                put("job", new ExprStringValue("node"));
+              }
+            });
     assertEquals(secondRow, prometheusMetricScan.next());
     Assertions.assertFalse(prometheusMetricScan.hasNext());
   }
@@ -86,8 +90,7 @@ void testQueryResponseIterator() {
   @Test
   @SneakyThrows
   void testQueryResponseIteratorWithGivenPrometheusResponseFieldNames() {
-    PrometheusResponseFieldNames prometheusResponseFieldNames
-        = new PrometheusResponseFieldNames();
+    PrometheusResponseFieldNames prometheusResponseFieldNames = new PrometheusResponseFieldNames();
     prometheusResponseFieldNames.setValueFieldName("count()");
     prometheusResponseFieldNames.setValueType(INTEGER);
     prometheusResponseFieldNames.setTimestampFieldName(TIMESTAMP);
@@ -102,34 +105,38 @@ void testQueryResponseIteratorWithGivenPrometheusResponseFieldNames() {
         .thenReturn(new JSONObject(getJson("query_range_result.json")));
     prometheusMetricScan.open();
     Assertions.assertTrue(prometheusMetricScan.hasNext());
-    ExprTupleValue firstRow = new ExprTupleValue(new LinkedHashMap<>() {{
-        put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
-        put("count()", new ExprIntegerValue(1));
-        put("instance", new ExprStringValue("localhost:9090"));
-        put("__name__", new ExprStringValue("up"));
-        put("job", new ExprStringValue("prometheus"));
-      }
-    });
+    ExprTupleValue firstRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
+                put("count()", new ExprIntegerValue(1));
+                put("instance", new ExprStringValue("localhost:9090"));
+                put("__name__", new ExprStringValue("up"));
+                put("job", new ExprStringValue("prometheus"));
+              }
+            });
     assertEquals(firstRow, prometheusMetricScan.next());
     Assertions.assertTrue(prometheusMetricScan.hasNext());
-    ExprTupleValue secondRow = new ExprTupleValue(new LinkedHashMap<>() {{
-        put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
-        put("count()", new ExprIntegerValue(0));
-        put("instance", new ExprStringValue("localhost:9091"));
-        put("__name__", new ExprStringValue("up"));
-        put("job", new ExprStringValue("node"));
-      }
-    });
+    ExprTupleValue secondRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
+                put("count()", new ExprIntegerValue(0));
+                put("instance", new ExprStringValue("localhost:9091"));
+                put("__name__", new ExprStringValue("up"));
+                put("job", new ExprStringValue("node"));
+              }
+            });
     assertEquals(secondRow, prometheusMetricScan.next());
     Assertions.assertFalse(prometheusMetricScan.hasNext());
   }
 
-
   @Test
   @SneakyThrows
   void testQueryResponseIteratorWithGivenPrometheusResponseWithLongInAggType() {
-    PrometheusResponseFieldNames prometheusResponseFieldNames
-        = new PrometheusResponseFieldNames();
+    PrometheusResponseFieldNames prometheusResponseFieldNames = new PrometheusResponseFieldNames();
     prometheusResponseFieldNames.setValueFieldName("testAgg");
     prometheusResponseFieldNames.setValueType(LONG);
     prometheusResponseFieldNames.setTimestampFieldName(TIMESTAMP);
@@ -144,24 +151,30 @@ void testQueryResponseIteratorWithGivenPrometheusResponseWithLongInAggType() {
         .thenReturn(new JSONObject(getJson("query_range_result.json")));
     prometheusMetricScan.open();
     Assertions.assertTrue(prometheusMetricScan.hasNext());
-    ExprTupleValue firstRow = new ExprTupleValue(new LinkedHashMap<>() {{
-        put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
-        put("testAgg", new ExprLongValue(1));
-        put("instance", new ExprStringValue("localhost:9090"));
-        put("__name__", new ExprStringValue("up"));
-        put("job", new ExprStringValue("prometheus"));
-      }
-    });
+    ExprTupleValue firstRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
+                put("testAgg", new ExprLongValue(1));
+                put("instance", new ExprStringValue("localhost:9090"));
+                put("__name__", new ExprStringValue("up"));
+                put("job", new ExprStringValue("prometheus"));
+              }
+            });
     assertEquals(firstRow, prometheusMetricScan.next());
     Assertions.assertTrue(prometheusMetricScan.hasNext());
-    ExprTupleValue secondRow = new ExprTupleValue(new LinkedHashMap<>() {{
-        put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
-        put("testAgg", new ExprLongValue(0));
-        put("instance", new ExprStringValue("localhost:9091"));
-        put("__name__", new ExprStringValue("up"));
-        put("job", new ExprStringValue("node"));
-      }
-    });
+    ExprTupleValue secondRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
+                put("testAgg", new ExprLongValue(0));
+                put("instance", new ExprStringValue("localhost:9091"));
+                put("__name__", new ExprStringValue("up"));
+                put("job", new ExprStringValue("node"));
+              }
+            });
     assertEquals(secondRow, prometheusMetricScan.next());
     Assertions.assertFalse(prometheusMetricScan.hasNext());
   }
@@ -169,8 +182,7 @@ void testQueryResponseIteratorWithGivenPrometheusResponseWithLongInAggType() {
   @Test
   @SneakyThrows
   void testQueryResponseIteratorWithGivenPrometheusResponseWithBackQuotedFieldNames() {
-    PrometheusResponseFieldNames prometheusResponseFieldNames
-        = new PrometheusResponseFieldNames();
+    PrometheusResponseFieldNames prometheusResponseFieldNames = new PrometheusResponseFieldNames();
     prometheusResponseFieldNames.setValueFieldName("testAgg");
     prometheusResponseFieldNames.setValueType(LONG);
     prometheusResponseFieldNames.setTimestampFieldName(TIMESTAMP);
@@ -187,58 +199,30 @@ void testQueryResponseIteratorWithGivenPrometheusResponseWithBackQuotedFieldName
         .thenReturn(new JSONObject(getJson("query_range_result.json")));
     prometheusMetricScan.open();
     Assertions.assertTrue(prometheusMetricScan.hasNext());
-    ExprTupleValue firstRow = new ExprTupleValue(new LinkedHashMap<>() {{
-        put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
-        put("testAgg", new ExprLongValue(1));
-        put("`instance`", new ExprStringValue("localhost:9090"));
-        put("__name__", new ExprStringValue("up"));
-        put("job", new ExprStringValue("prometheus"));
-      }
-    });
-    assertEquals(firstRow, prometheusMetricScan.next());
-    Assertions.assertTrue(prometheusMetricScan.hasNext());
-    ExprTupleValue secondRow = new ExprTupleValue(new LinkedHashMap<>() {{
-        put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
-        put("testAgg", new ExprLongValue(0));
-        put("`instance`", new ExprStringValue("localhost:9091"));
-        put("__name__", new ExprStringValue("up"));
-        put("job", new ExprStringValue("node"));
-      }
-    });
-    assertEquals(secondRow, prometheusMetricScan.next());
-    Assertions.assertFalse(prometheusMetricScan.hasNext());
-  }
-
-  @Test
-  @SneakyThrows
-  void testQueryResponseIteratorForQueryRangeFunction() {
-    PrometheusMetricScan prometheusMetricScan = new PrometheusMetricScan(prometheusClient);
-    prometheusMetricScan.setIsQueryRangeFunctionScan(Boolean.TRUE);
-    prometheusMetricScan.getRequest().setPromQl(QUERY);
-    prometheusMetricScan.getRequest().setStartTime(STARTTIME);
-    prometheusMetricScan.getRequest().setEndTime(ENDTIME);
-    prometheusMetricScan.getRequest().setStep(STEP);
-
-    when(prometheusClient.queryRange(any(), any(), any(), any()))
-        .thenReturn(new JSONObject(getJson("query_range_result.json")));
-    prometheusMetricScan.open();
-    Assertions.assertTrue(prometheusMetricScan.hasNext());
-    ExprTupleValue firstRow = new ExprTupleValue(new LinkedHashMap<>() {{
-        put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
-        put(VALUE, new ExprLongValue(1));
-        put(LABELS, new ExprStringValue(
-            "{\"instance\":\"localhost:9090\",\"__name__\":\"up\",\"job\":\"prometheus\"}"));
-      }
-    });
+    ExprTupleValue firstRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
+                put("testAgg", new ExprLongValue(1));
+                put("`instance`", new ExprStringValue("localhost:9090"));
+                put("__name__", new ExprStringValue("up"));
+                put("job", new ExprStringValue("prometheus"));
+              }
+            });
     assertEquals(firstRow, prometheusMetricScan.next());
     Assertions.assertTrue(prometheusMetricScan.hasNext());
-    ExprTupleValue secondRow = new ExprTupleValue(new LinkedHashMap<>() {{
-        put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
-        put(VALUE, new ExprLongValue(0));
-        put(LABELS, new ExprStringValue(
-            "{\"instance\":\"localhost:9091\",\"__name__\":\"up\",\"job\":\"node\"}"));
-      }
-    });
+    ExprTupleValue secondRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put(TIMESTAMP, new ExprTimestampValue(Instant.ofEpochMilli(1435781430781L)));
+                put("testAgg", new ExprLongValue(0));
+                put("`instance`", new ExprStringValue("localhost:9091"));
+                put("__name__", new ExprStringValue("up"));
+                put("job", new ExprStringValue("node"));
+              }
+            });
     assertEquals(secondRow, prometheusMetricScan.next());
     Assertions.assertFalse(prometheusMetricScan.hasNext());
   }
@@ -269,11 +253,12 @@ void testEmptyQueryWithNoMatrixKeyInResultJson() {
 
     when(prometheusClient.queryRange(any(), any(), any(), any()))
         .thenReturn(new JSONObject(getJson("no_matrix_query_range_result.json")));
-    RuntimeException runtimeException
-        = Assertions.assertThrows(RuntimeException.class, prometheusMetricScan::open);
+    RuntimeException runtimeException =
+        Assertions.assertThrows(RuntimeException.class, prometheusMetricScan::open);
     assertEquals(
         "Unexpected Result Type: vector during Prometheus Response Parsing. "
-            + "'matrix' resultType is expected", runtimeException.getMessage());
+            + "'matrix' resultType is expected",
+        runtimeException.getMessage());
   }
 
   @Test
@@ -287,13 +272,12 @@ void testEmptyQueryWithException() {
 
     when(prometheusClient.queryRange(any(), any(), any(), any()))
         .thenThrow(new IOException("Error Message"));
-    RuntimeException runtimeException
-        = assertThrows(RuntimeException.class, prometheusMetricScan::open);
-    assertEquals("Error fetching data from prometheus server. Error Message",
-        runtimeException.getMessage());
+    RuntimeException runtimeException =
+        assertThrows(RuntimeException.class, prometheusMetricScan::open);
+    assertEquals(
+        "Error fetching data from prometheus server. Error Message", runtimeException.getMessage());
   }
 
-
   @Test
   @SneakyThrows
   void testExplain() {
@@ -307,5 +291,4 @@ void testExplain() {
             + "endTime=1664771294133, step=14)",
         prometheusMetricScan.explain());
   }
-
 }
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusMetricTableTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusMetricTableTest.java
index 7e2de95604..8bdab9244b 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusMetricTableTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusMetricTableTest.java
@@ -55,20 +55,21 @@
 import org.opensearch.sql.planner.physical.ProjectOperator;
 import org.opensearch.sql.prometheus.client.PrometheusClient;
 import org.opensearch.sql.prometheus.constants.TestConstants;
+import org.opensearch.sql.prometheus.functions.scan.QueryRangeFunctionTableScanBuilder;
 import org.opensearch.sql.prometheus.request.PrometheusQueryRequest;
+import org.opensearch.sql.storage.read.TableScanBuilder;
 
 @ExtendWith(MockitoExtension.class)
 class PrometheusMetricTableTest {
 
-  @Mock
-  private PrometheusClient client;
+  @Mock private PrometheusClient client;
 
   @Test
   @SneakyThrows
   void testGetFieldTypesFromMetric() {
     when(client.getLabels(TestConstants.METRIC_NAME)).thenReturn(List.of("label1", "label2"));
-    PrometheusMetricTable prometheusMetricTable
-        = new PrometheusMetricTable(client, TestConstants.METRIC_NAME);
+    PrometheusMetricTable prometheusMetricTable =
+        new PrometheusMetricTable(client, TestConstants.METRIC_NAME);
     Map<String, ExprType> expectedFieldTypes = new HashMap<>();
     expectedFieldTypes.put("label1", ExprCoreType.STRING);
     expectedFieldTypes.put("label2", ExprCoreType.STRING);
@@ -82,7 +83,7 @@ void testGetFieldTypesFromMetric() {
     assertNull(prometheusMetricTable.getPrometheusQueryRequest());
     assertNotNull(prometheusMetricTable.getMetricName());
 
-    //testing Caching
+    // testing Caching
     fieldTypes = prometheusMetricTable.getFieldTypes();
 
     assertEquals(expectedFieldTypes, fieldTypes);
@@ -94,8 +95,8 @@ void testGetFieldTypesFromMetric() {
   @Test
   @SneakyThrows
   void testGetFieldTypesFromPrometheusQueryRequest() {
-    PrometheusMetricTable prometheusMetricTable
-        = new PrometheusMetricTable(client, new PrometheusQueryRequest());
+    PrometheusMetricTable prometheusMetricTable =
+        new PrometheusMetricTable(client, new PrometheusQueryRequest());
     Map<String, ExprType> expectedFieldTypes = new HashMap<>();
     expectedFieldTypes.put(VALUE, ExprCoreType.DOUBLE);
     expectedFieldTypes.put(TIMESTAMP, ExprCoreType.TIMESTAMP);
@@ -109,46 +110,23 @@ void testGetFieldTypesFromPrometheusQueryRequest() {
     assertNull(prometheusMetricTable.getMetricName());
   }
 
-  @Test
-  void testImplementWithQueryRangeFunction() {
-    PrometheusQueryRequest prometheusQueryRequest = new PrometheusQueryRequest();
-    prometheusQueryRequest.setPromQl("test");
-    prometheusQueryRequest.setStep("15m");
-    PrometheusMetricTable prometheusMetricTable =
-        new PrometheusMetricTable(client, prometheusQueryRequest);
-    List<NamedExpression> finalProjectList = new ArrayList<>();
-    finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
-    finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        project(relation("query_range", prometheusMetricTable),
-            finalProjectList, null));
-
-
-    assertTrue(plan instanceof ProjectOperator);
-    List<NamedExpression> projectList = ((ProjectOperator) plan).getProjectList();
-    List<String> outputFields
-        = projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
-    assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
-    assertTrue(((ProjectOperator) plan).getInput() instanceof PrometheusMetricScan);
-    PrometheusMetricScan prometheusMetricScan =
-        (PrometheusMetricScan) ((ProjectOperator) plan).getInput();
-    assertEquals(prometheusQueryRequest, prometheusMetricScan.getRequest());
-  }
-
   @Test
   void testImplementWithBasicMetricQuery() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_requests_total");
     List<NamedExpression> finalProjectList = new ArrayList<>();
     finalProjectList.add(named("@value", ref("@value", ExprCoreType.DOUBLE)));
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        project(relation("prometheus_http_requests_total", prometheusMetricTable),
-            finalProjectList, null));
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            project(
+                relation("prometheus_http_requests_total", prometheusMetricTable),
+                finalProjectList,
+                null));
 
     assertTrue(plan instanceof ProjectOperator);
     List<NamedExpression> projectList = ((ProjectOperator) plan).getProjectList();
-    List<String> outputFields
-        = projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
     assertEquals(List.of(VALUE), outputFields);
     assertTrue(((ProjectOperator) plan).getInput() instanceof PrometheusMetricScan);
     PrometheusMetricScan prometheusMetricScan =
@@ -157,7 +135,6 @@ void testImplementWithBasicMetricQuery() {
     assertEquals(3600 / 250 + "s", prometheusMetricScan.getRequest().getStep());
   }
 
-
   @Test
   void testImplementPrometheusQueryWithStatsQueryAndNoFilter() {
 
@@ -165,16 +142,23 @@ void testImplementPrometheusQueryWithStatsQueryAndNoFilter() {
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
     // IndexScanAgg without Filter
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        filter(
-            indexScanAgg("prometheus_http_total_requests", ImmutableList
-                    .of(named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
-                ImmutableList.of(named("code", DSL.ref("code", STRING)),
-                    named("span", DSL.span(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                    DSL.literal(40), "s")))),
-            DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
-                DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))))));
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            filter(
+                indexScanAgg(
+                    "prometheus_http_total_requests",
+                    ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                    ImmutableList.of(
+                        named("code", DSL.ref("code", STRING)),
+                        named(
+                            "span",
+                            DSL.span(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(40),
+                                "s")))),
+                DSL.and(
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                    DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))))));
 
     assertTrue(plan.getChild().get(0) instanceof PrometheusMetricScan);
     PrometheusQueryRequest prometheusQueryRequest =
@@ -190,28 +174,31 @@ void testImplementPrometheusQueryWithStatsQueryAndFilter() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
-
     // IndexScanAgg with Filter
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        indexScanAgg("prometheus_http_total_requests",
-            DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
-                DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))),
-            ImmutableList
-                .of(named("AVG(@value)",
-                    DSL.avg(DSL.ref("@value", INTEGER)))),
-            ImmutableList.of(named("job", DSL.ref("job", STRING)),
-                named("span", DSL.span(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                    DSL.literal(40), "s")))));
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            indexScanAgg(
+                "prometheus_http_total_requests",
+                DSL.and(
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                    DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))),
+                ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                ImmutableList.of(
+                    named("job", DSL.ref("job", STRING)),
+                    named(
+                        "span",
+                        DSL.span(
+                            DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                            DSL.literal(40),
+                            "s")))));
     assertTrue(plan instanceof PrometheusMetricScan);
     PrometheusQueryRequest prometheusQueryRequest = ((PrometheusMetricScan) plan).getRequest();
     assertEquals(
         "avg by(job) (avg_over_time"
             + "(prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}[40s]))",
         prometheusQueryRequest.getPromQl());
-
   }
 
-
   @Test
   void testImplementPrometheusQueryWithStatsQueryAndFilterAndProject() {
 
@@ -222,77 +209,99 @@ void testImplementPrometheusQueryWithStatsQueryAndFilterAndProject() {
     List<NamedExpression> finalProjectList = new ArrayList<>();
     finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
     finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        project(indexScanAgg("prometheus_http_total_requests",
-                DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
-                    DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))),
-                ImmutableList
-                    .of(DSL.named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
-                ImmutableList.of(DSL.named("job", DSL.ref("job", STRING)),
-                    named("span", DSL.span(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                        DSL.literal(40), "s")))),
-            finalProjectList, null));
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            project(
+                indexScanAgg(
+                    "prometheus_http_total_requests",
+                    DSL.and(
+                        DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                        DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))),
+                    ImmutableList.of(DSL.named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                    ImmutableList.of(
+                        DSL.named("job", DSL.ref("job", STRING)),
+                        named(
+                            "span",
+                            DSL.span(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(40),
+                                "s")))),
+                finalProjectList,
+                null));
     assertTrue(plan instanceof ProjectOperator);
     assertTrue(((ProjectOperator) plan).getInput() instanceof PrometheusMetricScan);
-    PrometheusQueryRequest request
-        = ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
+    PrometheusQueryRequest request =
+        ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
     assertEquals(request.getStep(), "40s");
-    assertEquals("avg by(job) (avg_over_time"
+    assertEquals(
+        "avg by(job) (avg_over_time"
             + "(prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}[40s]))",
         request.getPromQl());
     List<NamedExpression> projectList = ((ProjectOperator) plan).getProjectList();
-    List<String> outputFields
-        = projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
     assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
   }
 
-
   @Test
   void testTimeRangeResolver() {
 
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
-
-    //Both endTime and startTime are set.
+    // Both endTime and startTime are set.
     List<NamedExpression> finalProjectList = new ArrayList<>();
     finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
     finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
     Long endTime = new Date(System.currentTimeMillis()).getTime();
     Long startTime = new Date(System.currentTimeMillis() - 4800 * 1000).getTime();
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        project(indexScanAgg("prometheus_http_total_requests",
-                DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            project(
+                indexScanAgg(
+                    "prometheus_http_total_requests",
                     DSL.and(
-                        DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
-                        DSL.and(DSL.gte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                                DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(startTime)),
-                                        ExprCoreType.TIMESTAMP))),
-                            DSL.lte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                                DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(endTime)),
-                                        ExprCoreType.TIMESTAMP)))))),
-                ImmutableList
-                    .of(named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
-                ImmutableList.of(named("job", DSL.ref("job", STRING)),
-                    named("span", DSL.span(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                        DSL.literal(40), "s")))),
-            finalProjectList, null));
+                        DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                        DSL.and(
+                            DSL.equal(
+                                DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
+                            DSL.and(
+                                DSL.gte(
+                                    DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                    DSL.literal(
+                                        fromObjectValue(
+                                            dateFormat.format(new Date(startTime)),
+                                            ExprCoreType.TIMESTAMP))),
+                                DSL.lte(
+                                    DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                    DSL.literal(
+                                        fromObjectValue(
+                                            dateFormat.format(new Date(endTime)),
+                                            ExprCoreType.TIMESTAMP)))))),
+                    ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                    ImmutableList.of(
+                        named("job", DSL.ref("job", STRING)),
+                        named(
+                            "span",
+                            DSL.span(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(40),
+                                "s")))),
+                finalProjectList,
+                null));
     assertTrue(plan instanceof ProjectOperator);
     assertTrue(((ProjectOperator) plan).getInput() instanceof PrometheusMetricScan);
-    PrometheusQueryRequest request
-        = ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
+    PrometheusQueryRequest request =
+        ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
     assertEquals("40s", request.getStep());
-    assertEquals("avg by(job) (avg_over_time"
+    assertEquals(
+        "avg by(job) (avg_over_time"
             + "(prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}[40s]))",
         request.getPromQl());
     List<NamedExpression> projectList = ((ProjectOperator) plan).getProjectList();
-    List<String> outputFields
-        = projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
     assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
   }
 
@@ -302,40 +311,51 @@ void testTimeRangeResolverWithOutEndTimeInFilter() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
-
-    //Both endTime and startTime are set.
+    // Only endTime is set.
     List<NamedExpression> finalProjectList = new ArrayList<>();
     finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
     finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
     Long startTime = new Date(System.currentTimeMillis() - 4800 * 1000).getTime();
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        project(indexScanAgg("prometheus_http_total_requests",
-                DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            project(
+                indexScanAgg(
+                    "prometheus_http_total_requests",
                     DSL.and(
-                        DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
-                        DSL.gte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                            DSL.literal(
-                                fromObjectValue(dateFormat.format(new Date(startTime)),
-                                    ExprCoreType.TIMESTAMP))))),
-                ImmutableList
-                    .of(named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
-                ImmutableList.of(named("job", DSL.ref("job", STRING)),
-                    named("span", DSL.span(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                        DSL.literal(40), "s")))),
-            finalProjectList, null));
+                        DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                        DSL.and(
+                            DSL.equal(
+                                DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
+                            DSL.gte(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(
+                                    fromObjectValue(
+                                        dateFormat.format(new Date(startTime)),
+                                        ExprCoreType.TIMESTAMP))))),
+                    ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                    ImmutableList.of(
+                        named("job", DSL.ref("job", STRING)),
+                        named(
+                            "span",
+                            DSL.span(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(40),
+                                "s")))),
+                finalProjectList,
+                null));
     assertTrue(plan instanceof ProjectOperator);
     assertTrue(((ProjectOperator) plan).getInput() instanceof PrometheusMetricScan);
-    PrometheusQueryRequest request
-        = ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
+    PrometheusQueryRequest request =
+        ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
     assertEquals("40s", request.getStep());
-    assertEquals("avg by(job) (avg_over_time"
+    assertEquals(
+        "avg by(job) (avg_over_time"
             + "(prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}[40s]))",
         request.getPromQl());
     List<NamedExpression> projectList = ((ProjectOperator) plan).getProjectList();
-    List<String> outputFields
-        = projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
     assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
   }
 
@@ -345,78 +365,95 @@ void testTimeRangeResolverWithOutStartTimeInFilter() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
-
-    //Both endTime and startTime are set.
+    // Both endTime and startTime are set.
     List<NamedExpression> finalProjectList = new ArrayList<>();
     finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
     finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
     Long endTime = new Date(System.currentTimeMillis() - 4800 * 1000).getTime();
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        project(indexScanAgg("prometheus_http_total_requests",
-                DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            project(
+                indexScanAgg(
+                    "prometheus_http_total_requests",
                     DSL.and(
-                        DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
-                        DSL.lte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                            DSL.literal(
-                                fromObjectValue(dateFormat.format(new Date(endTime)),
-                                    ExprCoreType.TIMESTAMP))))),
-                ImmutableList
-                    .of(named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
-                ImmutableList.of(named("job", DSL.ref("job", STRING)),
-                    named("span", DSL.span(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                        DSL.literal(40), "s")))),
-            finalProjectList, null));
+                        DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                        DSL.and(
+                            DSL.equal(
+                                DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
+                            DSL.lte(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(
+                                    fromObjectValue(
+                                        dateFormat.format(new Date(endTime)),
+                                        ExprCoreType.TIMESTAMP))))),
+                    ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                    ImmutableList.of(
+                        named("job", DSL.ref("job", STRING)),
+                        named(
+                            "span",
+                            DSL.span(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(40),
+                                "s")))),
+                finalProjectList,
+                null));
     assertTrue(plan instanceof ProjectOperator);
     assertTrue(((ProjectOperator) plan).getInput() instanceof PrometheusMetricScan);
-    PrometheusQueryRequest request
-        = ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
+    PrometheusQueryRequest request =
+        ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
     assertEquals("40s", request.getStep());
-    assertEquals("avg by(job) (avg_over_time"
+    assertEquals(
+        "avg by(job) (avg_over_time"
             + "(prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}[40s]))",
         request.getPromQl());
     List<NamedExpression> projectList = ((ProjectOperator) plan).getProjectList();
-    List<String> outputFields
-        = projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
     assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
   }
 
-
   @Test
   void testSpanResolverWithoutSpanExpression() {
 
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
-
     List<NamedExpression> finalProjectList = new ArrayList<>();
     finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
     Long endTime = new Date(System.currentTimeMillis()).getTime();
     Long startTime = new Date(System.currentTimeMillis() - 4800 * 1000).getTime();
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    LogicalPlan plan = project(indexScanAgg("prometheus_http_total_requests",
-                DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+    LogicalPlan plan =
+        project(
+            indexScanAgg(
+                "prometheus_http_total_requests",
+                DSL.and(
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
                     DSL.and(
                         DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
-                        DSL.and(DSL.gte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                        DSL.and(
+                            DSL.gte(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
                                 DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(startTime)),
+                                    fromObjectValue(
+                                        dateFormat.format(new Date(startTime)),
                                         ExprCoreType.TIMESTAMP))),
-                            DSL.lte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                            DSL.lte(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
                                 DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(endTime)),
+                                    fromObjectValue(
+                                        dateFormat.format(new Date(endTime)),
                                         ExprCoreType.TIMESTAMP)))))),
-                ImmutableList
-                    .of(named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
+                ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
                 null),
-            finalProjectList, null);
-    RuntimeException runtimeException
-        = Assertions.assertThrows(RuntimeException.class,
-            () -> prometheusMetricTable.implement(plan));
-    Assertions.assertEquals("Prometheus Catalog doesn't support "
-            + "aggregations without span expression",
+            finalProjectList,
+            null);
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class, () -> prometheusMetricTable.implement(plan));
+    Assertions.assertEquals(
+        "Prometheus Catalog doesn't support " + "aggregations without span expression",
         runtimeException.getMessage());
   }
 
@@ -426,34 +463,41 @@ void testSpanResolverWithEmptyGroupByList() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
-
     List<NamedExpression> finalProjectList = new ArrayList<>();
     finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
     Long endTime = new Date(System.currentTimeMillis()).getTime();
     Long startTime = new Date(System.currentTimeMillis() - 4800 * 1000).getTime();
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    LogicalPlan plan = project(indexScanAgg("prometheus_http_total_requests",
-            DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+    LogicalPlan plan =
+        project(
+            indexScanAgg(
+                "prometheus_http_total_requests",
                 DSL.and(
-                    DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
-                    DSL.and(DSL.gte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                            DSL.literal(
-                                fromObjectValue(dateFormat.format(new Date(startTime)),
-                                    ExprCoreType.TIMESTAMP))),
-                        DSL.lte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                            DSL.literal(
-                                fromObjectValue(dateFormat.format(new Date(endTime)),
-                                    ExprCoreType.TIMESTAMP)))))),
-            ImmutableList
-                .of(named("AVG(@value)",
-                    DSL.avg(DSL.ref("@value", INTEGER)))),
-            ImmutableList.of()),
-        finalProjectList, null);
-    RuntimeException runtimeException
-        = Assertions.assertThrows(RuntimeException.class,
-          () -> prometheusMetricTable.implement(plan));
-    Assertions.assertEquals("Prometheus Catalog doesn't support "
-            + "aggregations without span expression",
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                    DSL.and(
+                        DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
+                        DSL.and(
+                            DSL.gte(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(
+                                    fromObjectValue(
+                                        dateFormat.format(new Date(startTime)),
+                                        ExprCoreType.TIMESTAMP))),
+                            DSL.lte(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(
+                                    fromObjectValue(
+                                        dateFormat.format(new Date(endTime)),
+                                        ExprCoreType.TIMESTAMP)))))),
+                ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                ImmutableList.of()),
+            finalProjectList,
+            null);
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class, () -> prometheusMetricTable.implement(plan));
+    Assertions.assertEquals(
+        "Prometheus Catalog doesn't support " + "aggregations without span expression",
         runtimeException.getMessage());
   }
 
@@ -463,44 +507,58 @@ void testSpanResolverWithSpanExpression() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
-
     List<NamedExpression> finalProjectList = new ArrayList<>();
     finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
     finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
     Long endTime = new Date(System.currentTimeMillis()).getTime();
     Long startTime = new Date(System.currentTimeMillis() - 4800 * 1000).getTime();
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        project(indexScanAgg("prometheus_http_total_requests",
-                DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            project(
+                indexScanAgg(
+                    "prometheus_http_total_requests",
                     DSL.and(
-                        DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
-                        DSL.and(DSL.gte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                                DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(startTime)),
-                                        ExprCoreType.TIMESTAMP))),
-                            DSL.lte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                                DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(endTime)),
-                                        ExprCoreType.TIMESTAMP)))))),
-                ImmutableList
-                    .of(named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
-                ImmutableList.of(named("job", DSL.ref("job", STRING)),
-                    named("span", DSL.span(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                        DSL.literal(40), "s")))),
-            finalProjectList, null));
+                        DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                        DSL.and(
+                            DSL.equal(
+                                DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
+                            DSL.and(
+                                DSL.gte(
+                                    DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                    DSL.literal(
+                                        fromObjectValue(
+                                            dateFormat.format(new Date(startTime)),
+                                            ExprCoreType.TIMESTAMP))),
+                                DSL.lte(
+                                    DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                    DSL.literal(
+                                        fromObjectValue(
+                                            dateFormat.format(new Date(endTime)),
+                                            ExprCoreType.TIMESTAMP)))))),
+                    ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                    ImmutableList.of(
+                        named("job", DSL.ref("job", STRING)),
+                        named(
+                            "span",
+                            DSL.span(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(40),
+                                "s")))),
+                finalProjectList,
+                null));
     assertTrue(plan instanceof ProjectOperator);
     assertTrue(((ProjectOperator) plan).getInput() instanceof PrometheusMetricScan);
-    PrometheusQueryRequest request
-        = ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
+    PrometheusQueryRequest request =
+        ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
     assertEquals("40s", request.getStep());
-    assertEquals("avg by(job) (avg_over_time"
+    assertEquals(
+        "avg by(job) (avg_over_time"
             + "(prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}[40s]))",
         request.getPromQl());
     List<NamedExpression> projectList = ((ProjectOperator) plan).getProjectList();
-    List<String> outputFields
-        = projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
     assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
   }
 
@@ -510,35 +568,45 @@ void testExpressionWithMissingTimeUnitInSpanExpression() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
-
     List<NamedExpression> finalProjectList = new ArrayList<>();
     finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
     finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
     Long endTime = new Date(System.currentTimeMillis()).getTime();
     Long startTime = new Date(System.currentTimeMillis() - 4800 * 1000).getTime();
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    LogicalPlan logicalPlan = project(indexScanAgg("prometheus_http_total_requests",
-                DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+    LogicalPlan logicalPlan =
+        project(
+            indexScanAgg(
+                "prometheus_http_total_requests",
+                DSL.and(
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
                     DSL.and(
                         DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
-                        DSL.and(DSL.gte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                        DSL.and(
+                            DSL.gte(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
                                 DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(startTime)),
+                                    fromObjectValue(
+                                        dateFormat.format(new Date(startTime)),
                                         ExprCoreType.TIMESTAMP))),
-                            DSL.lte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                            DSL.lte(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
                                 DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(endTime)),
+                                    fromObjectValue(
+                                        dateFormat.format(new Date(endTime)),
                                         ExprCoreType.TIMESTAMP)))))),
-                ImmutableList
-                    .of(named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
-                ImmutableList.of(named("job", DSL.ref("job", STRING)),
-                    named("span", DSL.span(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                        DSL.literal(40), "")))),
-            finalProjectList, null);
+                ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                ImmutableList.of(
+                    named("job", DSL.ref("job", STRING)),
+                    named(
+                        "span",
+                        DSL.span(
+                            DSL.ref("@timestamp", ExprCoreType.TIMESTAMP), DSL.literal(40), "")))),
+            finalProjectList,
+            null);
     RuntimeException exception =
-        Assertions.assertThrows(RuntimeException.class,
-            () -> prometheusMetricTable.implement(logicalPlan));
+        Assertions.assertThrows(
+            RuntimeException.class, () -> prometheusMetricTable.implement(logicalPlan));
     assertEquals("Missing TimeUnit in the span expression", exception.getMessage());
   }
 
@@ -548,44 +616,57 @@ void testPrometheusQueryWithOnlySpanExpressionInGroupByList() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
-
     List<NamedExpression> finalProjectList = new ArrayList<>();
     finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
     finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
     Long endTime = new Date(System.currentTimeMillis()).getTime();
     Long startTime = new Date(System.currentTimeMillis() - 4800 * 1000).getTime();
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        project(indexScanAgg("prometheus_http_total_requests",
-                DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            project(
+                indexScanAgg(
+                    "prometheus_http_total_requests",
                     DSL.and(
-                        DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
-                        DSL.and(DSL.gte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                                DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(startTime)),
-                                        ExprCoreType.TIMESTAMP))),
-                            DSL.lte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                                DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(endTime)),
-                                        ExprCoreType.TIMESTAMP)))))),
-                ImmutableList
-                    .of(named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
-                ImmutableList.of(
-                    named("span", DSL.span(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                        DSL.literal(40), "s")))),
-            finalProjectList, null));
+                        DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                        DSL.and(
+                            DSL.equal(
+                                DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
+                            DSL.and(
+                                DSL.gte(
+                                    DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                    DSL.literal(
+                                        fromObjectValue(
+                                            dateFormat.format(new Date(startTime)),
+                                            ExprCoreType.TIMESTAMP))),
+                                DSL.lte(
+                                    DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                    DSL.literal(
+                                        fromObjectValue(
+                                            dateFormat.format(new Date(endTime)),
+                                            ExprCoreType.TIMESTAMP)))))),
+                    ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                    ImmutableList.of(
+                        named(
+                            "span",
+                            DSL.span(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(40),
+                                "s")))),
+                finalProjectList,
+                null));
     assertTrue(plan instanceof ProjectOperator);
     assertTrue(((ProjectOperator) plan).getInput() instanceof PrometheusMetricScan);
-    PrometheusQueryRequest request
-        = ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
+    PrometheusQueryRequest request =
+        ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
     assertEquals("40s", request.getStep());
-    assertEquals("avg  (avg_over_time"
+    assertEquals(
+        "avg  (avg_over_time"
             + "(prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}[40s]))",
         request.getPromQl());
     List<NamedExpression> projectList = ((ProjectOperator) plan).getProjectList();
-    List<String> outputFields
-        = projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
     assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
   }
 
@@ -595,44 +676,57 @@ void testStatsWithNoGroupByList() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
-
     List<NamedExpression> finalProjectList = new ArrayList<>();
     finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
     finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
     Long endTime = new Date(System.currentTimeMillis()).getTime();
     Long startTime = new Date(System.currentTimeMillis() - 4800 * 1000).getTime();
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        project(indexScanAgg("prometheus_http_total_requests",
-                DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            project(
+                indexScanAgg(
+                    "prometheus_http_total_requests",
                     DSL.and(
-                        DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
-                        DSL.and(DSL.gte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                                DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(startTime)),
-                                        ExprCoreType.TIMESTAMP))),
-                            DSL.lte(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                                DSL.literal(
-                                    fromObjectValue(dateFormat.format(new Date(endTime)),
-                                        ExprCoreType.TIMESTAMP)))))),
-                ImmutableList
-                    .of(named("AVG(@value)",
-                        DSL.avg(DSL.ref("@value", INTEGER)))),
-                ImmutableList.of(named("span",
-                    DSL.span(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                    DSL.literal(40), "s")))),
-            finalProjectList, null));
+                        DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                        DSL.and(
+                            DSL.equal(
+                                DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))),
+                            DSL.and(
+                                DSL.gte(
+                                    DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                    DSL.literal(
+                                        fromObjectValue(
+                                            dateFormat.format(new Date(startTime)),
+                                            ExprCoreType.TIMESTAMP))),
+                                DSL.lte(
+                                    DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                    DSL.literal(
+                                        fromObjectValue(
+                                            dateFormat.format(new Date(endTime)),
+                                            ExprCoreType.TIMESTAMP)))))),
+                    ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                    ImmutableList.of(
+                        named(
+                            "span",
+                            DSL.span(
+                                DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                                DSL.literal(40),
+                                "s")))),
+                finalProjectList,
+                null));
     assertTrue(plan instanceof ProjectOperator);
     assertTrue(((ProjectOperator) plan).getInput() instanceof PrometheusMetricScan);
-    PrometheusQueryRequest request
-        = ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
+    PrometheusQueryRequest request =
+        ((PrometheusMetricScan) ((ProjectOperator) plan).getInput()).getRequest();
     assertEquals("40s", request.getStep());
-    assertEquals("avg  (avg_over_time"
+    assertEquals(
+        "avg  (avg_over_time"
             + "(prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}[40s]))",
         request.getPromQl());
     List<NamedExpression> projectList = ((ProjectOperator) plan).getProjectList();
-    List<String> outputFields
-        = projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
     assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
   }
 
@@ -641,9 +735,11 @@ void testImplementWithUnexpectedLogicalNode() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
     LogicalPlan plan = project(testLogicalPlanNode());
-    RuntimeException runtimeException = Assertions.assertThrows(RuntimeException.class,
-        () -> prometheusMetricTable.implement(plan));
-    assertEquals("unexpected plan node type class"
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class, () -> prometheusMetricTable.implement(plan));
+    assertEquals(
+        "unexpected plan node type class"
             + " org.opensearch.sql.prometheus.utils.LogicalPlanUtils$TestLogicalPlan",
         runtimeException.getMessage());
   }
@@ -653,37 +749,44 @@ void testMultipleAggregationsThrowsRuntimeException() {
 
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
-    LogicalPlan plan = project(indexScanAgg("prometheus_http_total_requests",
-        DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
-            DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))),
-        ImmutableList
-            .of(named("AVG(@value)",
-                    DSL.avg(DSL.ref("@value", INTEGER))),
-                named("SUM(@value)",
-                    DSL.avg(DSL.ref("@value", INTEGER)))),
-        ImmutableList.of(named("job", DSL.ref("job", STRING)))));
-
-    RuntimeException runtimeException = Assertions.assertThrows(RuntimeException.class,
-        () -> prometheusMetricTable.implement(plan));
-    assertEquals("Prometheus Catalog doesn't multiple aggregations in stats command",
+    LogicalPlan plan =
+        project(
+            indexScanAgg(
+                "prometheus_http_total_requests",
+                DSL.and(
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                    DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))),
+                ImmutableList.of(
+                    named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER))),
+                    named("SUM(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                ImmutableList.of(named("job", DSL.ref("job", STRING)))));
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class, () -> prometheusMetricTable.implement(plan));
+    assertEquals(
+        "Prometheus Catalog doesn't multiple aggregations in stats command",
         runtimeException.getMessage());
   }
 
-
   @Test
   void testUnSupportedAggregation() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
-    LogicalPlan plan = project(indexScanAgg("prometheus_http_total_requests",
-        DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
-            DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))),
-        ImmutableList
-            .of(named("VAR_SAMP(@value)",
-                DSL.varSamp(DSL.ref("@value", INTEGER)))),
-        ImmutableList.of(named("job", DSL.ref("job", STRING)))));
-
-    RuntimeException runtimeException = Assertions.assertThrows(RuntimeException.class,
-        () -> prometheusMetricTable.implement(plan));
+    LogicalPlan plan =
+        project(
+            indexScanAgg(
+                "prometheus_http_total_requests",
+                DSL.and(
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                    DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))),
+                ImmutableList.of(
+                    named("VAR_SAMP(@value)", DSL.varSamp(DSL.ref("@value", INTEGER)))),
+                ImmutableList.of(named("job", DSL.ref("job", STRING)))));
+
+    RuntimeException runtimeException =
+        Assertions.assertThrows(
+            RuntimeException.class, () -> prometheusMetricTable.implement(plan));
     assertTrue(runtimeException.getMessage().contains("Prometheus Catalog only supports"));
   }
 
@@ -691,12 +794,16 @@ void testUnSupportedAggregation() {
   void testImplementWithORConditionInWhereClause() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
-    LogicalPlan plan = indexScan("prometheus_http_total_requests",
-        DSL.or(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
-            DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))));
-    RuntimeException exception
-        = assertThrows(RuntimeException.class, () -> prometheusMetricTable.implement(plan));
-    assertEquals("Prometheus Catalog doesn't support or in where command.", exception.getMessage());
+    LogicalPlan plan =
+        indexScan(
+            "prometheus_http_total_requests",
+            DSL.or(
+                DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))));
+    RuntimeException exception =
+        assertThrows(RuntimeException.class, () -> prometheusMetricTable.implement(plan));
+    assertEquals(
+        "Prometheus Datasource doesn't support or in where command.", exception.getMessage());
   }
 
   @Test
@@ -706,21 +813,125 @@ void testImplementWithRelationAndFilter() {
     finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
-    LogicalPlan logicalPlan = project(indexScan("prometheus_http_total_requests",
-        DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
-            DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))))),
-        finalProjectList, null);
+    LogicalPlan logicalPlan =
+        project(
+            indexScan(
+                "prometheus_http_total_requests",
+                DSL.and(
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                    DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))))),
+            finalProjectList,
+            null);
     PhysicalPlan physicalPlan = prometheusMetricTable.implement(logicalPlan);
     assertTrue(physicalPlan instanceof ProjectOperator);
     assertTrue(((ProjectOperator) physicalPlan).getInput() instanceof PrometheusMetricScan);
-    PrometheusQueryRequest request
-        = ((PrometheusMetricScan) ((ProjectOperator) physicalPlan).getInput()).getRequest();
+    PrometheusQueryRequest request =
+        ((PrometheusMetricScan) ((ProjectOperator) physicalPlan).getInput()).getRequest();
     assertEquals((3600 / 250) + "s", request.getStep());
-    assertEquals("prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}",
-        request.getPromQl());
+    assertEquals(
+        "prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}", request.getPromQl());
+    List<NamedExpression> projectList = ((ProjectOperator) physicalPlan).getProjectList();
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
+  }
+
+  @Test
+  void testImplementWithRelationAndTimestampFilter() {
+    List<NamedExpression> finalProjectList = new ArrayList<>();
+    finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
+    finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
+    DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    Long endTime = new Date(System.currentTimeMillis()).getTime();
+    PrometheusMetricTable prometheusMetricTable =
+        new PrometheusMetricTable(client, "prometheus_http_total_requests");
+    LogicalPlan logicalPlan =
+        project(
+            indexScan(
+                "prometheus_http_total_requests",
+                DSL.lte(
+                    DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                    DSL.literal(
+                        fromObjectValue(
+                            dateFormat.format(new Date(endTime)), ExprCoreType.TIMESTAMP)))),
+            finalProjectList,
+            null);
+    PhysicalPlan physicalPlan = prometheusMetricTable.implement(logicalPlan);
+    assertTrue(physicalPlan instanceof ProjectOperator);
+    assertTrue(((ProjectOperator) physicalPlan).getInput() instanceof PrometheusMetricScan);
+    PrometheusQueryRequest request =
+        ((PrometheusMetricScan) ((ProjectOperator) physicalPlan).getInput()).getRequest();
+    assertEquals((3600 / 250) + "s", request.getStep());
+    assertEquals("prometheus_http_total_requests", request.getPromQl());
+    List<NamedExpression> projectList = ((ProjectOperator) physicalPlan).getProjectList();
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
+  }
+
+  @Test
+  void testImplementWithRelationAndTimestampLTFilter() {
+    List<NamedExpression> finalProjectList = new ArrayList<>();
+    finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
+    finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
+    DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    Long endTime = new Date(System.currentTimeMillis()).getTime();
+    PrometheusMetricTable prometheusMetricTable =
+        new PrometheusMetricTable(client, "prometheus_http_total_requests");
+    LogicalPlan logicalPlan =
+        project(
+            indexScan(
+                "prometheus_http_total_requests",
+                DSL.less(
+                    DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                    DSL.literal(
+                        fromObjectValue(
+                            dateFormat.format(new Date(endTime)), ExprCoreType.TIMESTAMP)))),
+            finalProjectList,
+            null);
+    PhysicalPlan physicalPlan = prometheusMetricTable.implement(logicalPlan);
+    assertTrue(physicalPlan instanceof ProjectOperator);
+    assertTrue(((ProjectOperator) physicalPlan).getInput() instanceof PrometheusMetricScan);
+    PrometheusQueryRequest request =
+        ((PrometheusMetricScan) ((ProjectOperator) physicalPlan).getInput()).getRequest();
+    assertEquals((3600 / 250) + "s", request.getStep());
+    assertEquals("prometheus_http_total_requests", request.getPromQl());
     List<NamedExpression> projectList = ((ProjectOperator) physicalPlan).getProjectList();
-    List<String> outputFields
-        = projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
+    assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
+  }
+
+  @Test
+  void testImplementWithRelationAndTimestampGTFilter() {
+    List<NamedExpression> finalProjectList = new ArrayList<>();
+    finalProjectList.add(DSL.named(VALUE, DSL.ref(VALUE, STRING)));
+    finalProjectList.add(DSL.named(TIMESTAMP, DSL.ref(TIMESTAMP, ExprCoreType.TIMESTAMP)));
+    DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    Long endTime = new Date(System.currentTimeMillis()).getTime();
+    PrometheusMetricTable prometheusMetricTable =
+        new PrometheusMetricTable(client, "prometheus_http_total_requests");
+    LogicalPlan logicalPlan =
+        project(
+            indexScan(
+                "prometheus_http_total_requests",
+                DSL.greater(
+                    DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                    DSL.literal(
+                        fromObjectValue(
+                            dateFormat.format(new Date(endTime)), ExprCoreType.TIMESTAMP)))),
+            finalProjectList,
+            null);
+    PhysicalPlan physicalPlan = prometheusMetricTable.implement(logicalPlan);
+    assertTrue(physicalPlan instanceof ProjectOperator);
+    assertTrue(((ProjectOperator) physicalPlan).getInput() instanceof PrometheusMetricScan);
+    PrometheusQueryRequest request =
+        ((PrometheusMetricScan) ((ProjectOperator) physicalPlan).getInput()).getRequest();
+    assertEquals((3600 / 250) + "s", request.getStep());
+    assertEquals("prometheus_http_total_requests", request.getPromQl());
+    List<NamedExpression> projectList = ((ProjectOperator) physicalPlan).getProjectList();
+    List<String> outputFields =
+        projectList.stream().map(NamedExpression::getName).collect(Collectors.toList());
     assertEquals(List.of(VALUE, TIMESTAMP), outputFields);
   }
 
@@ -730,10 +941,9 @@ void testOptimize() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, prometheusQueryRequest);
     List<NamedExpression> finalProjectList = new ArrayList<>();
-    LogicalPlan inputPlan = project(relation("query_range", prometheusMetricTable),
-        finalProjectList, null);
-    LogicalPlan optimizedPlan = prometheusMetricTable.optimize(
-        inputPlan);
+    LogicalPlan inputPlan =
+        project(relation("query_range", prometheusMetricTable), finalProjectList, null);
+    LogicalPlan optimizedPlan = prometheusMetricTable.optimize(inputPlan);
     assertEquals(inputPlan, optimizedPlan);
   }
 
@@ -744,7 +954,8 @@ void testUnsupportedOperation() {
         new PrometheusMetricTable(client, prometheusQueryRequest);
 
     assertThrows(UnsupportedOperationException.class, prometheusMetricTable::exists);
-    assertThrows(UnsupportedOperationException.class,
+    assertThrows(
+        UnsupportedOperationException.class,
         () -> prometheusMetricTable.create(Collections.emptyMap()));
   }
 
@@ -754,24 +965,92 @@ void testImplementPrometheusQueryWithBackQuotedFieldNamesInStatsQuery() {
     PrometheusMetricTable prometheusMetricTable =
         new PrometheusMetricTable(client, "prometheus_http_total_requests");
 
-
     // IndexScanAgg with Filter
-    PhysicalPlan plan = prometheusMetricTable.implement(
-        indexScanAgg("prometheus_http_total_requests",
-            DSL.and(DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
-                DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))),
-            ImmutableList
-                .of(named("AVG(@value)",
-                    DSL.avg(DSL.ref("@value", INTEGER)))),
-            ImmutableList.of(named("`job`", DSL.ref("job", STRING)),
-                named("span", DSL.span(DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
-                    DSL.literal(40), "s")))));
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            indexScanAgg(
+                "prometheus_http_total_requests",
+                DSL.and(
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                    DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))),
+                ImmutableList.of(named("AVG(@value)", DSL.avg(DSL.ref("@value", INTEGER)))),
+                ImmutableList.of(
+                    named("`job`", DSL.ref("job", STRING)),
+                    named(
+                        "span",
+                        DSL.span(
+                            DSL.ref("@timestamp", ExprCoreType.TIMESTAMP),
+                            DSL.literal(40),
+                            "s")))));
     assertTrue(plan instanceof PrometheusMetricScan);
     PrometheusQueryRequest prometheusQueryRequest = ((PrometheusMetricScan) plan).getRequest();
     assertEquals(
         "avg by(job) (avg_over_time"
             + "(prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}[40s]))",
         prometheusQueryRequest.getPromQl());
+  }
+
+  @Test
+  void testImplementPrometheusQueryWithFilterQuery() {
+
+    PrometheusMetricTable prometheusMetricTable =
+        new PrometheusMetricTable(client, "prometheus_http_total_requests");
+
+    // IndexScanAgg without Filter
+    PhysicalPlan plan =
+        prometheusMetricTable.implement(
+            indexScan(
+                "prometheus_http_total_requests",
+                DSL.and(
+                    DSL.equal(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                    DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/"))))));
 
+    assertTrue(plan instanceof PrometheusMetricScan);
+    PrometheusQueryRequest prometheusQueryRequest = ((PrometheusMetricScan) plan).getRequest();
+    assertEquals(
+        "prometheus_http_total_requests{code=\"200\" , handler=\"/ready/\"}",
+        prometheusQueryRequest.getPromQl());
+  }
+
+  @Test
+  void testImplementPrometheusQueryWithUnsupportedFilterQuery() {
+
+    PrometheusMetricTable prometheusMetricTable =
+        new PrometheusMetricTable(client, "prometheus_http_total_requests");
+
+    RuntimeException exception =
+        assertThrows(
+            RuntimeException.class,
+            () ->
+                prometheusMetricTable.implement(
+                    indexScan(
+                        "prometheus_http_total_requests",
+                        DSL.and(
+                            DSL.lte(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                            DSL.equal(
+                                DSL.ref("handler", STRING),
+                                DSL.literal(stringValue("/ready/")))))));
+    assertEquals(
+        "Prometheus Datasource doesn't support <= in where command.", exception.getMessage());
+  }
+
+  @Test
+  void testCreateScanBuilderWithQueryRangeTableFunction() {
+    PrometheusQueryRequest prometheusQueryRequest = new PrometheusQueryRequest();
+    prometheusQueryRequest.setPromQl("test");
+    prometheusQueryRequest.setStep("15m");
+    PrometheusMetricTable prometheusMetricTable =
+        new PrometheusMetricTable(client, prometheusQueryRequest);
+    TableScanBuilder tableScanBuilder = prometheusMetricTable.createScanBuilder();
+    Assertions.assertNotNull(tableScanBuilder);
+    Assertions.assertTrue(tableScanBuilder instanceof QueryRangeFunctionTableScanBuilder);
+  }
+
+  @Test
+  void testCreateScanBuilderWithPPLQuery() {
+    PrometheusMetricTable prometheusMetricTable =
+        new PrometheusMetricTable(client, TestConstants.METRIC_NAME);
+    TableScanBuilder tableScanBuilder = prometheusMetricTable.createScanBuilder();
+    Assertions.assertNull(tableScanBuilder);
   }
 }
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageEngineTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageEngineTest.java
index f4c9734e15..b925fe6538 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageEngineTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageEngineTest.java
@@ -12,6 +12,7 @@
 import static org.opensearch.sql.utils.SystemIndexUtils.TABLE_INFO;
 
 import java.util.Collection;
+import java.util.Iterator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -20,6 +21,7 @@
 import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.function.FunctionResolver;
 import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.functions.resolver.QueryExemplarsTableFunctionResolver;
 import org.opensearch.sql.prometheus.functions.resolver.QueryRangeTableFunctionResolver;
 import org.opensearch.sql.prometheus.storage.system.PrometheusSystemTable;
 import org.opensearch.sql.storage.Table;
@@ -27,8 +29,7 @@
 @ExtendWith(MockitoExtension.class)
 class PrometheusStorageEngineTest {
 
-  @Mock
-  private PrometheusClient client;
+  @Mock private PrometheusClient client;
 
   @Test
   public void getTable() {
@@ -41,12 +42,12 @@ public void getTable() {
   @Test
   public void getFunctions() {
     PrometheusStorageEngine engine = new PrometheusStorageEngine(client);
-    Collection<FunctionResolver> functionResolverCollection
-        = engine.getFunctions();
+    Collection<FunctionResolver> functionResolverCollection = engine.getFunctions();
     assertNotNull(functionResolverCollection);
-    assertEquals(1, functionResolverCollection.size());
-    assertTrue(
-        functionResolverCollection.iterator().next() instanceof QueryRangeTableFunctionResolver);
+    assertEquals(2, functionResolverCollection.size());
+    Iterator<FunctionResolver> iterator = functionResolverCollection.iterator();
+    assertTrue(iterator.next() instanceof QueryRangeTableFunctionResolver);
+    assertTrue(iterator.next() instanceof QueryExemplarsTableFunctionResolver);
   }
 
   @Test
@@ -60,8 +61,8 @@ public void getSystemTable() {
   @Test
   public void getSystemTableForAllTablesInfo() {
     PrometheusStorageEngine engine = new PrometheusStorageEngine(client);
-    Table table
-        = engine.getTable(new DataSourceSchemaName("prometheus", "information_schema"), "tables");
+    Table table =
+        engine.getTable(new DataSourceSchemaName("prometheus", "information_schema"), "tables");
     assertNotNull(table);
     assertTrue(table instanceof PrometheusSystemTable);
   }
@@ -69,10 +70,12 @@ public void getSystemTableForAllTablesInfo() {
   @Test
   public void getSystemTableWithWrongInformationSchemaTable() {
     PrometheusStorageEngine engine = new PrometheusStorageEngine(client);
-    SemanticCheckException exception = assertThrows(SemanticCheckException.class,
-        () -> engine.getTable(new DataSourceSchemaName("prometheus", "information_schema"),
-            "test"));
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () ->
+                engine.getTable(
+                    new DataSourceSchemaName("prometheus", "information_schema"), "test"));
     assertEquals("Information Schema doesn't contain test table", exception.getMessage());
   }
-
 }
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactoryTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactoryTest.java
index 91cb8df1ea..7b1e2dec0f 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactoryTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactoryTest.java
@@ -7,12 +7,18 @@
 
 package org.opensearch.sql.prometheus.storage;
 
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
 import java.util.HashMap;
 import lombok.SneakyThrows;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.datasource.model.DataSourceType;
@@ -21,9 +27,11 @@
 @ExtendWith(MockitoExtension.class)
 public class PrometheusStorageFactoryTest {
 
+  @Mock private Settings settings;
+
   @Test
   void testGetConnectorType() {
-    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory();
+    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
     Assertions.assertEquals(
         DataSourceType.PROMETHEUS, prometheusStorageFactory.getDataSourceType());
   }
@@ -31,123 +39,204 @@ void testGetConnectorType() {
   @Test
   @SneakyThrows
   void testGetStorageEngineWithBasicAuth() {
-    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory();
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
+    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
     HashMap<String, String> properties = new HashMap<>();
-    properties.put("prometheus.uri", "http://dummyprometheus:9090");
+    properties.put("prometheus.uri", "http://localhost:9090");
     properties.put("prometheus.auth.type", "basicauth");
     properties.put("prometheus.auth.username", "admin");
     properties.put("prometheus.auth.password", "admin");
-    StorageEngine storageEngine
-        = prometheusStorageFactory.getStorageEngine("my_prometheus", properties);
+    StorageEngine storageEngine = prometheusStorageFactory.getStorageEngine(properties);
     Assertions.assertTrue(storageEngine instanceof PrometheusStorageEngine);
   }
 
   @Test
   @SneakyThrows
   void testGetStorageEngineWithAWSSigV4Auth() {
-    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory();
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
+    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
     HashMap<String, String> properties = new HashMap<>();
-    properties.put("prometheus.uri", "http://dummyprometheus:9090");
+    properties.put("prometheus.uri", "http://localhost:9090");
     properties.put("prometheus.auth.type", "awssigv4");
     properties.put("prometheus.auth.region", "us-east-1");
     properties.put("prometheus.auth.secret_key", "accessKey");
     properties.put("prometheus.auth.access_key", "secretKey");
-    StorageEngine storageEngine
-        = prometheusStorageFactory.getStorageEngine("my_prometheus", properties);
+    StorageEngine storageEngine = prometheusStorageFactory.getStorageEngine(properties);
     Assertions.assertTrue(storageEngine instanceof PrometheusStorageEngine);
   }
 
-
   @Test
   @SneakyThrows
   void testGetStorageEngineWithMissingURI() {
-    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory();
+    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
     HashMap<String, String> properties = new HashMap<>();
     properties.put("prometheus.auth.type", "awssigv4");
     properties.put("prometheus.auth.region", "us-east-1");
     properties.put("prometheus.auth.secret_key", "accessKey");
     properties.put("prometheus.auth.access_key", "secretKey");
-    IllegalArgumentException exception = Assertions.assertThrows(IllegalArgumentException.class,
-        () -> prometheusStorageFactory.getStorageEngine("my_prometheus", properties));
-    Assertions.assertEquals("Missing [prometheus.uri] fields "
-            + "in the Prometheus connector properties.",
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () -> prometheusStorageFactory.getStorageEngine(properties));
+    Assertions.assertEquals(
+        "Missing [prometheus.uri] fields " + "in the connector properties.",
         exception.getMessage());
   }
 
   @Test
   @SneakyThrows
   void testGetStorageEngineWithMissingRegionInAWS() {
-    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory();
+    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
     HashMap<String, String> properties = new HashMap<>();
     properties.put("prometheus.uri", "http://dummyprometheus:9090");
     properties.put("prometheus.auth.type", "awssigv4");
     properties.put("prometheus.auth.secret_key", "accessKey");
     properties.put("prometheus.auth.access_key", "secretKey");
-    IllegalArgumentException exception = Assertions.assertThrows(IllegalArgumentException.class,
-        () -> prometheusStorageFactory.getStorageEngine("my_prometheus", properties));
-    Assertions.assertEquals("Missing [prometheus.auth.region] fields in the "
-            + "Prometheus connector properties.",
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () -> prometheusStorageFactory.getStorageEngine(properties));
+    Assertions.assertEquals(
+        "Missing [prometheus.auth.region] fields in the connector properties.",
+        exception.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testGetStorageEngineWithLongConfigProperties() {
+    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("prometheus.uri", RandomStringUtils.random(1001));
+    properties.put("prometheus.auth.type", "awssigv4");
+    properties.put("prometheus.auth.secret_key", "accessKey");
+    properties.put("prometheus.auth.access_key", "secretKey");
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () -> prometheusStorageFactory.getStorageEngine(properties));
+    Assertions.assertEquals(
+        "Missing [prometheus.auth.region] fields in the "
+            + "connector properties."
+            + "Fields [prometheus.uri] exceeds more than 1000 characters.",
         exception.getMessage());
   }
 
   @Test
   @SneakyThrows
   void testGetStorageEngineWithWrongAuthType() {
-    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory();
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
+    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
     HashMap<String, String> properties = new HashMap<>();
     properties.put("prometheus.uri", "https://test.com");
     properties.put("prometheus.auth.type", "random");
     properties.put("prometheus.auth.region", "us-east-1");
     properties.put("prometheus.auth.secret_key", "accessKey");
     properties.put("prometheus.auth.access_key", "secretKey");
-    IllegalArgumentException exception = Assertions.assertThrows(IllegalArgumentException.class,
-        () -> prometheusStorageFactory.getStorageEngine("my_prometheus", properties));
-    Assertions.assertEquals("AUTH Type : random is not supported with Prometheus Connector",
-        exception.getMessage());
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () -> prometheusStorageFactory.getStorageEngine(properties));
+    Assertions.assertEquals(
+        "AUTH Type : random is not supported with Prometheus Connector", exception.getMessage());
   }
 
-
   @Test
   @SneakyThrows
   void testGetStorageEngineWithNONEAuthType() {
-    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory();
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
+    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
     HashMap<String, String> properties = new HashMap<>();
     properties.put("prometheus.uri", "https://test.com");
-    StorageEngine storageEngine
-        = prometheusStorageFactory.getStorageEngine("my_prometheus", properties);
+    StorageEngine storageEngine = prometheusStorageFactory.getStorageEngine(properties);
     Assertions.assertTrue(storageEngine instanceof PrometheusStorageEngine);
   }
 
   @Test
   @SneakyThrows
   void testGetStorageEngineWithInvalidURISyntax() {
-    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory();
+    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
     HashMap<String, String> properties = new HashMap<>();
-    properties.put("prometheus.uri", "http://dummyprometheus:9090? param");
+    properties.put("prometheus.uri", "http://dummyprometheus.com:9090? param");
     properties.put("prometheus.auth.type", "basicauth");
     properties.put("prometheus.auth.username", "admin");
     properties.put("prometheus.auth.password", "admin");
-    RuntimeException exception = Assertions.assertThrows(RuntimeException.class,
-        () -> prometheusStorageFactory.getStorageEngine("my_prometheus", properties));
+    RuntimeException exception =
+        Assertions.assertThrows(
+            RuntimeException.class, () -> prometheusStorageFactory.getStorageEngine(properties));
     Assertions.assertTrue(
-        exception.getMessage().contains("Prometheus Client creation failed due to:"));
+        exception.getMessage().contains("Invalid URI in prometheus properties: "));
   }
 
   @Test
   void createDataSourceSuccess() {
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
     HashMap<String, String> properties = new HashMap<>();
-    properties.put("prometheus.uri", "http://dummyprometheus:9090");
+    properties.put("prometheus.uri", "http://localhost:9090");
     properties.put("prometheus.auth.type", "basicauth");
     properties.put("prometheus.auth.username", "admin");
     properties.put("prometheus.auth.password", "admin");
 
-    DataSourceMetadata metadata = new DataSourceMetadata();
-    metadata.setName("prometheus");
-    metadata.setConnector(DataSourceType.PROMETHEUS);
-    metadata.setProperties(properties);
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("prometheus")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(properties)
+            .build();
 
-    DataSource dataSource = new PrometheusStorageFactory().createDataSource(metadata);
+    DataSource dataSource = new PrometheusStorageFactory(settings).createDataSource(metadata);
+    Assertions.assertTrue(dataSource.getStorageEngine() instanceof PrometheusStorageEngine);
+  }
+
+  @Test
+  void createDataSourceSuccessWithLocalhost() {
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.emptyList());
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("prometheus.uri", "http://localhost:9090");
+    properties.put("prometheus.auth.type", "basicauth");
+    properties.put("prometheus.auth.username", "admin");
+    properties.put("prometheus.auth.password", "admin");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("prometheus")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(properties)
+            .build();
+
+    DataSource dataSource = new PrometheusStorageFactory(settings).createDataSource(metadata);
     Assertions.assertTrue(dataSource.getStorageEngine() instanceof PrometheusStorageEngine);
   }
-}
 
+  @Test
+  void createDataSourceWithHostnameNotMatchingWithAllowHostsConfig() {
+    when(settings.getSettingValue(Settings.Key.DATASOURCES_URI_HOSTS_DENY_LIST))
+        .thenReturn(Collections.singletonList("127.0.0.0/8"));
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("prometheus.uri", "http://localhost:9090");
+    properties.put("prometheus.auth.type", "basicauth");
+    properties.put("prometheus.auth.username", "admin");
+    properties.put("prometheus.auth.password", "admin");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("prometheus")
+            .setConnector(DataSourceType.PROMETHEUS)
+            .setProperties(properties)
+            .build();
+
+    PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
+    RuntimeException exception =
+        Assertions.assertThrows(
+            RuntimeException.class, () -> prometheusStorageFactory.createDataSource(metadata));
+    Assertions.assertEquals(
+        "Disallowed hostname in the uri. "
+            + "Validate with plugins.query.datasources.uri.hosts.denylist config",
+        exception.getMessage());
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/QueryExemplarsTableTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/QueryExemplarsTableTest.java
new file mode 100644
index 0000000000..7f49de981a
--- /dev/null
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/QueryExemplarsTableTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.prometheus.storage;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.opensearch.sql.prometheus.constants.TestConstants.ENDTIME;
+import static org.opensearch.sql.prometheus.constants.TestConstants.QUERY;
+import static org.opensearch.sql.prometheus.constants.TestConstants.STARTTIME;
+
+import java.util.Map;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.planner.logical.LogicalPlan;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+import org.opensearch.sql.prometheus.client.PrometheusClient;
+import org.opensearch.sql.prometheus.functions.scan.QueryExemplarsFunctionTableScanBuilder;
+import org.opensearch.sql.prometheus.functions.scan.QueryExemplarsFunctionTableScanOperator;
+import org.opensearch.sql.prometheus.request.PrometheusQueryExemplarsRequest;
+import org.opensearch.sql.storage.read.TableScanBuilder;
+
+@ExtendWith(MockitoExtension.class)
+class QueryExemplarsTableTest {
+
+  @Mock private PrometheusClient client;
+
+  @Test
+  @SneakyThrows
+  void testGetFieldTypes() {
+    PrometheusQueryExemplarsRequest exemplarsRequest = new PrometheusQueryExemplarsRequest();
+    exemplarsRequest.setQuery(QUERY);
+    exemplarsRequest.setStartTime(STARTTIME);
+    exemplarsRequest.setEndTime(ENDTIME);
+    QueryExemplarsTable queryExemplarsTable = new QueryExemplarsTable(client, exemplarsRequest);
+    Map<String, ExprType> fieldTypes = queryExemplarsTable.getFieldTypes();
+    Assertions.assertNotNull(fieldTypes);
+    assertEquals(0, fieldTypes.size());
+  }
+
+  @Test
+  void testImplementWithBasicMetricQuery() {
+
+    PrometheusQueryExemplarsRequest exemplarsRequest = new PrometheusQueryExemplarsRequest();
+    exemplarsRequest.setQuery(QUERY);
+    exemplarsRequest.setStartTime(STARTTIME);
+    exemplarsRequest.setEndTime(ENDTIME);
+    LogicalPlan logicalPlan = new QueryExemplarsFunctionTableScanBuilder(client, exemplarsRequest);
+    QueryExemplarsTable queryExemplarsTable = new QueryExemplarsTable(client, exemplarsRequest);
+    PhysicalPlan physicalPlan = queryExemplarsTable.implement(logicalPlan);
+
+    assertTrue(physicalPlan instanceof QueryExemplarsFunctionTableScanOperator);
+    QueryExemplarsFunctionTableScanOperator tableScanOperator =
+        (QueryExemplarsFunctionTableScanOperator) physicalPlan;
+    assertEquals("test_query", tableScanOperator.getRequest().getQuery());
+  }
+
+  @Test
+  void testCreateScanBuilderWithQueryRangeTableFunction() {
+    PrometheusQueryExemplarsRequest exemplarsRequest = new PrometheusQueryExemplarsRequest();
+    exemplarsRequest.setQuery(QUERY);
+    exemplarsRequest.setStartTime(STARTTIME);
+    exemplarsRequest.setEndTime(ENDTIME);
+    QueryExemplarsTable queryExemplarsTable = new QueryExemplarsTable(client, exemplarsRequest);
+    TableScanBuilder tableScanBuilder = queryExemplarsTable.createScanBuilder();
+    Assertions.assertNotNull(tableScanBuilder);
+    Assertions.assertTrue(tableScanBuilder instanceof QueryExemplarsFunctionTableScanBuilder);
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/querybuilders/StepParameterResolverTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/querybuilders/StepParameterResolverTest.java
index 37e24a56b5..397b7146f7 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/querybuilders/StepParameterResolverTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/querybuilders/StepParameterResolverTest.java
@@ -18,9 +18,11 @@ public class StepParameterResolverTest {
   @Test
   void testNullChecks() {
     StepParameterResolver stepParameterResolver = new StepParameterResolver();
-    Assertions.assertThrows(NullPointerException.class,
+    Assertions.assertThrows(
+        NullPointerException.class,
         () -> stepParameterResolver.resolve(null, new Date().getTime(), Collections.emptyList()));
-    Assertions.assertThrows(NullPointerException.class,
+    Assertions.assertThrows(
+        NullPointerException.class,
         () -> stepParameterResolver.resolve(new Date().getTime(), null, Collections.emptyList()));
   }
 }
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/querybuilders/TimeRangeParametersResolverTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/querybuilders/TimeRangeParametersResolverTest.java
new file mode 100644
index 0000000000..6a280b7d98
--- /dev/null
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/querybuilders/TimeRangeParametersResolverTest.java
@@ -0,0 +1,32 @@
+/*
+ *
+ *  * Copyright OpenSearch Contributors
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.opensearch.sql.prometheus.storage.querybuilders;
+
+import static org.opensearch.sql.data.model.ExprValueUtils.stringValue;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+
+import org.apache.commons.math3.util.Pair;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.prometheus.storage.querybuilder.TimeRangeParametersResolver;
+
+public class TimeRangeParametersResolverTest {
+
+  @Test
+  void testTimeRangeParametersWithoutTimestampFilter() {
+    TimeRangeParametersResolver timeRangeParametersResolver = new TimeRangeParametersResolver();
+    Pair<Long, Long> result =
+        timeRangeParametersResolver.resolve(
+            DSL.and(
+                DSL.less(DSL.ref("code", STRING), DSL.literal(stringValue("200"))),
+                DSL.equal(DSL.ref("handler", STRING), DSL.literal(stringValue("/ready/")))));
+    Assertions.assertNotNull(result);
+    Assertions.assertEquals(3600, result.getSecond() - result.getFirst());
+  }
+}
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableScanTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableScanTest.java
index 0d7ec4e2cc..ea299b87de 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableScanTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableScanTest.java
@@ -22,8 +22,7 @@
 @ExtendWith(MockitoExtension.class)
 public class PrometheusSystemTableScanTest {
 
-  @Mock
-  private PrometheusSystemRequest request;
+  @Mock private PrometheusSystemRequest request;
 
   @Test
   public void queryData() {
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableTest.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableTest.java
index 0721f82c07..7022ca9657 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableTest.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/storage/system/PrometheusSystemTableTest.java
@@ -35,51 +35,41 @@
 @ExtendWith(MockitoExtension.class)
 public class PrometheusSystemTableTest {
 
-  @Mock
-  private PrometheusClient client;
+  @Mock private PrometheusClient client;
 
-  @Mock
-  private Table table;
+  @Mock private Table table;
 
   @Test
   void testGetFieldTypesOfMetaTable() {
-    PrometheusSystemTable systemIndex = new PrometheusSystemTable(client,
-        new DataSourceSchemaName("prometheus", "information_schema"), TABLE_INFO);
+    PrometheusSystemTable systemIndex =
+        new PrometheusSystemTable(
+            client, new DataSourceSchemaName("prometheus", "information_schema"), TABLE_INFO);
     final Map<String, ExprType> fieldTypes = systemIndex.getFieldTypes();
-    assertThat(fieldTypes, anyOf(
-        hasEntry("TABLE_CATALOG", STRING)
-    ));
-    assertThat(fieldTypes, anyOf(
-        hasEntry("UNIT", STRING)
-    ));
+    assertThat(fieldTypes, anyOf(hasEntry("TABLE_CATALOG", STRING)));
+    assertThat(fieldTypes, anyOf(hasEntry("UNIT", STRING)));
   }
 
   @Test
   void testGetFieldTypesOfMappingTable() {
-    PrometheusSystemTable systemIndex = new PrometheusSystemTable(client,
-        new DataSourceSchemaName("prometheus", "information_schema"), mappingTable(
-        "test_metric"));
+    PrometheusSystemTable systemIndex =
+        new PrometheusSystemTable(
+            client,
+            new DataSourceSchemaName("prometheus", "information_schema"),
+            mappingTable("test_metric"));
     final Map<String, ExprType> fieldTypes = systemIndex.getFieldTypes();
-    assertThat(fieldTypes, anyOf(
-        hasEntry("COLUMN_NAME", STRING)
-    ));
+    assertThat(fieldTypes, anyOf(hasEntry("COLUMN_NAME", STRING)));
   }
 
-
-
   @Test
   void implement() {
-    PrometheusSystemTable systemIndex = new PrometheusSystemTable(client,
-        new DataSourceSchemaName("prometheus", "information_schema"), TABLE_INFO);
+    PrometheusSystemTable systemIndex =
+        new PrometheusSystemTable(
+            client, new DataSourceSchemaName("prometheus", "information_schema"), TABLE_INFO);
     NamedExpression projectExpr = named("TABLE_NAME", ref("TABLE_NAME", STRING));
 
-    final PhysicalPlan plan = systemIndex.implement(
-        project(
-            relation(TABLE_INFO, table),
-            projectExpr
-        ));
+    final PhysicalPlan plan =
+        systemIndex.implement(project(relation(TABLE_INFO, table), projectExpr));
     assertTrue(plan instanceof ProjectOperator);
     assertTrue(plan.getChild().get(0) instanceof PrometheusSystemTableScan);
   }
-
 }
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/utils/LogicalPlanUtils.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/utils/LogicalPlanUtils.java
index 5fcebf52e6..570a987889 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/utils/LogicalPlanUtils.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/utils/LogicalPlanUtils.java
@@ -19,43 +19,36 @@
 
 public class LogicalPlanUtils {
 
-  /**
-   * Build PrometheusLogicalMetricScan.
-   */
+  /** Build PrometheusLogicalMetricScan. */
   public static LogicalPlan indexScan(String metricName, Expression filter) {
-    return PrometheusLogicalMetricScan.builder().metricName(metricName)
-        .filter(filter)
-        .build();
+    return PrometheusLogicalMetricScan.builder().metricName(metricName).filter(filter).build();
   }
 
-  /**
-   * Build PrometheusLogicalMetricAgg.
-   */
-  public static LogicalPlan indexScanAgg(String metricName, Expression filter,
-                                         List<NamedAggregator> aggregators,
-                                         List<NamedExpression> groupByList) {
-    return PrometheusLogicalMetricAgg.builder().metricName(metricName)
+  /** Build PrometheusLogicalMetricAgg. */
+  public static LogicalPlan indexScanAgg(
+      String metricName,
+      Expression filter,
+      List<NamedAggregator> aggregators,
+      List<NamedExpression> groupByList) {
+    return PrometheusLogicalMetricAgg.builder()
+        .metricName(metricName)
         .filter(filter)
         .aggregatorList(aggregators)
         .groupByList(groupByList)
         .build();
   }
 
-  /**
-   * Build PrometheusLogicalMetricAgg.
-   */
-  public static LogicalPlan indexScanAgg(String metricName,
-                                         List<NamedAggregator> aggregators,
-                                         List<NamedExpression> groupByList) {
-    return PrometheusLogicalMetricAgg.builder().metricName(metricName)
+  /** Build PrometheusLogicalMetricAgg. */
+  public static LogicalPlan indexScanAgg(
+      String metricName, List<NamedAggregator> aggregators, List<NamedExpression> groupByList) {
+    return PrometheusLogicalMetricAgg.builder()
+        .metricName(metricName)
         .aggregatorList(aggregators)
         .groupByList(groupByList)
         .build();
   }
 
-  /**
-   * Build PrometheusLogicalMetricAgg.
-   */
+  /** Build PrometheusLogicalMetricAgg. */
   public static LogicalPlan testLogicalPlanNode() {
     return new TestLogicalPlan();
   }
@@ -71,7 +64,4 @@ public <R, C> R accept(LogicalPlanNodeVisitor<R, C> visitor, C context) {
       return visitor.visitNode(this, null);
     }
   }
-
-
-
 }
diff --git a/prometheus/src/test/java/org/opensearch/sql/prometheus/utils/TestUtils.java b/prometheus/src/test/java/org/opensearch/sql/prometheus/utils/TestUtils.java
index 1683858c49..a9fcc26101 100644
--- a/prometheus/src/test/java/org/opensearch/sql/prometheus/utils/TestUtils.java
+++ b/prometheus/src/test/java/org/opensearch/sql/prometheus/utils/TestUtils.java
@@ -12,6 +12,7 @@ public class TestUtils {
 
   /**
    * Get Json document from the files in resources folder.
+   *
    * @param filename filename.
    * @return String.
    * @throws IOException IOException.
@@ -21,5 +22,4 @@ public static String getJson(String filename) throws IOException {
     return new String(
         Objects.requireNonNull(classLoader.getResourceAsStream(filename)).readAllBytes());
   }
-
 }
diff --git a/prometheus/src/test/resources/non_json_response.json b/prometheus/src/test/resources/non_json_response.json
new file mode 100644
index 0000000000..8a2586e7b7
--- /dev/null
+++ b/prometheus/src/test/resources/non_json_response.json
@@ -0,0 +1 @@
+fadsfadsfasdfasdfadsfasdfadsfadsf
\ No newline at end of file
diff --git a/prometheus/src/test/resources/query_exemplars_empty_result.json b/prometheus/src/test/resources/query_exemplars_empty_result.json
new file mode 100644
index 0000000000..c44dc44f37
--- /dev/null
+++ b/prometheus/src/test/resources/query_exemplars_empty_result.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/prometheus/src/test/resources/query_exemplars_response.json b/prometheus/src/test/resources/query_exemplars_response.json
new file mode 100644
index 0000000000..50c078d855
--- /dev/null
+++ b/prometheus/src/test/resources/query_exemplars_response.json
@@ -0,0 +1,46 @@
+{
+    "status": "success",
+    "data": [
+        {
+            "seriesLabels": {
+                "__name__": "test_exemplar_metric_total",
+                "instance": "localhost:8090",
+                "job": "prometheus",
+                "service": "bar"
+            },
+            "exemplars": [
+                {
+                    "labels": {
+                        "traceID": "EpTxMJ40fUus7aGY"
+                    },
+                    "value": "6",
+                    "timestamp": 1600096945.479
+                }
+            ]
+        },
+        {
+            "seriesLabels": {
+                "__name__": "test_exemplar_metric_total",
+                "instance": "localhost:8090",
+                "job": "prometheus",
+                "service": "foo"
+            },
+            "exemplars": [
+                {
+                    "labels": {
+                        "traceID": "Olp9XHlq763ccsfa"
+                    },
+                    "value": "19",
+                    "timestamp": 1600096955.479
+                },
+                {
+                    "labels": {
+                        "traceID": "hCtjygkIHwAN9vs4"
+                    },
+                    "value": "20",
+                    "timestamp": 1600096965.489
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/prometheus/src/test/resources/query_exemplars_result.json b/prometheus/src/test/resources/query_exemplars_result.json
new file mode 100644
index 0000000000..3c1cda5f96
--- /dev/null
+++ b/prometheus/src/test/resources/query_exemplars_result.json
@@ -0,0 +1,43 @@
+[
+  {
+    "seriesLabels": {
+      "__name__": "test_exemplar_metric_total",
+      "instance": "localhost:8090",
+      "job": "prometheus",
+      "service": "bar"
+    },
+    "exemplars": [
+      {
+        "labels": {
+          "traceID": "EpTxMJ40fUus7aGY"
+        },
+        "value": "6",
+        "timestamp": 1600096945.479
+      }
+    ]
+  },
+  {
+    "seriesLabels": {
+      "__name__": "test_exemplar_metric_total",
+      "instance": "localhost:8090",
+      "job": "prometheus",
+      "service": "foo"
+    },
+    "exemplars": [
+      {
+        "labels": {
+          "traceID": "Olp9XHlq763ccsfa"
+        },
+        "value": "19",
+        "timestamp": 1600096955.479
+      },
+      {
+        "labels": {
+          "traceID": "hCtjygkIHwAN9vs4"
+        },
+        "value": "20",
+        "timestamp": 1600096965.489
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/protocol/build.gradle b/protocol/build.gradle
index 9c41fbf101..3da6d56770 100644
--- a/protocol/build.gradle
+++ b/protocol/build.gradle
@@ -26,25 +26,26 @@ plugins {
     id 'java'
     id "io.freefair.lombok"
     id 'jacoco'
+    id 'com.diffplug.spotless' version '6.22.0'
 }
 
 dependencies {
-    implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}"
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_databind_version}"
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}"
+    implementation group: 'com.google.guava', name: 'guava', version: "${guava_version}"
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${versions.jackson}"
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${versions.jackson_databind}"
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${versions.jackson}"
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation project(':core')
     implementation project(':opensearch')
 
-    testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
+    testImplementation('org.junit.jupiter:junit-jupiter:5.9.3')
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.7.0'
 }
 
 configurations.all {
-    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
+    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
 }
 
 test {
@@ -57,8 +58,8 @@ test {
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required = true
+        xml.required = true
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/QueryResult.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/QueryResult.java
index 915a61f361..03be0875cf 100644
--- a/protocol/src/main/java/org/opensearch/sql/protocol/response/QueryResult.java
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/QueryResult.java
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.Locale;
 import java.util.Map;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -16,25 +16,29 @@
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.ExecutionEngine.Schema.Column;
+import org.opensearch.sql.executor.pagination.Cursor;
 
 /**
- * Query response that encapsulates query results and isolate {@link ExprValue}
- * related from formatter implementation.
+ * Query response that encapsulates query results and isolate {@link ExprValue} related from
+ * formatter implementation.
  */
 @RequiredArgsConstructor
 public class QueryResult implements Iterable<Object[]> {
 
-  @Getter
-  private final ExecutionEngine.Schema schema;
+  @Getter private final ExecutionEngine.Schema schema;
 
-  /**
-   * Results which are collection of expression.
-   */
+  /** Results which are collection of expression. */
   private final Collection<ExprValue> exprValues;
 
+  @Getter private final Cursor cursor;
+
+  public QueryResult(ExecutionEngine.Schema schema, Collection<ExprValue> exprValues) {
+    this(schema, exprValues, Cursor.None);
+  }
 
   /**
    * size of results.
+   *
    * @return size of results
    */
   public int size() {
@@ -44,14 +48,18 @@ public int size() {
   /**
    * Parse column name from results.
    *
-   * @return mapping from column names to its expression type.
-   *        note that column name could be original name or its alias if any.
+   * @return mapping from column names to its expression type. note that column name could be
+   *     original name or its alias if any.
    */
   public Map<String, String> columnNameTypes() {
     Map<String, String> colNameTypes = new LinkedHashMap<>();
-    schema.getColumns().forEach(column -> colNameTypes.put(
-        getColumnName(column),
-        column.getExprType().typeName().toLowerCase()));
+    schema
+        .getColumns()
+        .forEach(
+            column ->
+                colNameTypes.put(
+                    getColumnName(column),
+                    column.getExprType().typeName().toLowerCase(Locale.ROOT)));
     return colNameTypes;
   }
 
@@ -70,9 +78,6 @@ private String getColumnName(Column column) {
   }
 
   private Object[] convertExprValuesToValues(Collection<ExprValue> exprValues) {
-    return exprValues
-        .stream()
-        .map(ExprValue::value)
-        .toArray(Object[]::new);
+    return exprValues.stream().map(ExprValue::value).toArray(Object[]::new);
   }
 }
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/CommandResponseFormatter.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/CommandResponseFormatter.java
new file mode 100644
index 0000000000..b781e1dbba
--- /dev/null
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/CommandResponseFormatter.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.protocol.response.format;
+
+import lombok.Getter;
+import org.opensearch.sql.executor.execution.CommandPlan;
+import org.opensearch.sql.protocol.response.QueryResult;
+
+/**
+ * A simple response formatter which contains no data. Supposed to use with {@link CommandPlan}
+ * only.
+ */
+public class CommandResponseFormatter extends JsonResponseFormatter<QueryResult> {
+
+  public CommandResponseFormatter() {
+    super(Style.PRETTY);
+  }
+
+  @Override
+  protected Object buildJsonObject(QueryResult response) {
+    return new NoQueryResponse();
+  }
+
+  @Override
+  public String format(Throwable t) {
+    return new JdbcResponseFormatter(Style.PRETTY).format(t);
+  }
+
+  @Getter
+  public static class NoQueryResponse {
+    // in case of failure an exception is thrown
+    private final boolean succeeded = true;
+  }
+}
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/CsvResponseFormatter.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/CsvResponseFormatter.java
index 5c5b4be048..f5899e88e0 100644
--- a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/CsvResponseFormatter.java
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/CsvResponseFormatter.java
@@ -3,16 +3,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
-public class CsvResponseFormatter extends FlatResponseFormatter {
+import org.opensearch.sql.protocol.response.QueryResult;
+
+/** Response formatter to format response to csv format. */
+public class CsvResponseFormatter implements ResponseFormatter<QueryResult> {
+  public static final String CONTENT_TYPE = "plain/text; charset=UTF-8";
+  private final String separator;
+  private final boolean sanitize;
+
   public CsvResponseFormatter() {
-    super(",", true);
+    this(",", true);
   }
 
   public CsvResponseFormatter(boolean sanitize) {
-    super(",", sanitize);
+    this(",", sanitize);
+  }
+
+  public CsvResponseFormatter(String separator, boolean sanitize) {
+    this.separator = separator;
+    this.sanitize = sanitize;
   }
 
+  @Override
+  public String format(QueryResult response) {
+    FlatResponseBase flatResponse;
+    if (sanitize) {
+      flatResponse = new FlatResponseWithSanitizer(response, separator);
+    } else {
+      flatResponse = new FlatResponseBase(response, separator);
+    }
+    return flatResponse.format();
+  }
+
+  @Override
+  public String format(Throwable t) {
+    return ErrorFormatter.prettyFormat(t);
+  }
+
+  @Override
+  public String contentType() {
+    return CONTENT_TYPE;
+  }
 }
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/ErrorFormatter.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/ErrorFormatter.java
index 40848e959b..2e43cfa6c2 100644
--- a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/ErrorFormatter.java
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/ErrorFormatter.java
@@ -3,49 +3,46 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.UtilityClass;
+import org.opensearch.sql.utils.SerializeUtils;
 
 @UtilityClass
 public class ErrorFormatter {
 
-  private static final Gson PRETTY_PRINT_GSON = AccessController.doPrivileged(
-          (PrivilegedAction<Gson>) () -> new GsonBuilder()
-              .setPrettyPrinting()
-              .disableHtmlEscaping()
-              .create());
-  private static final Gson GSON = AccessController.doPrivileged(
-      (PrivilegedAction<Gson>) () -> new GsonBuilder().disableHtmlEscaping().create());
-
-  /**
-   * Util method to format {@link Throwable} response to JSON string in compact printing.
-   */
+  private static final Gson PRETTY_PRINT_GSON =
+      AccessController.doPrivileged(
+          (PrivilegedAction<Gson>)
+              () ->
+                  SerializeUtils.getGsonBuilder()
+                      .setPrettyPrinting()
+                      .disableHtmlEscaping()
+                      .create());
+  private static final Gson GSON =
+      AccessController.doPrivileged(
+          (PrivilegedAction<Gson>)
+              () -> SerializeUtils.getGsonBuilder().disableHtmlEscaping().create());
+
+  /** Util method to format {@link Throwable} response to JSON string in compact printing. */
   public static String compactFormat(Throwable t) {
-    JsonError error = new ErrorFormatter.JsonError(t.getClass().getSimpleName(),
-        t.getMessage());
+    JsonError error = new ErrorFormatter.JsonError(t.getClass().getSimpleName(), t.getMessage());
     return compactJsonify(error);
   }
 
-  /**
-   * Util method to format {@link Throwable} response to JSON string in pretty printing.
-   */
-  public static  String prettyFormat(Throwable t) {
-    JsonError error = new ErrorFormatter.JsonError(t.getClass().getSimpleName(),
-        t.getMessage());
+  /** Util method to format {@link Throwable} response to JSON string in pretty printing. */
+  public static String prettyFormat(Throwable t) {
+    JsonError error = new ErrorFormatter.JsonError(t.getClass().getSimpleName(), t.getMessage());
     return prettyJsonify(error);
   }
 
   public static String compactJsonify(Object jsonObject) {
-    return AccessController.doPrivileged(
-        (PrivilegedAction<String>) () -> GSON.toJson(jsonObject));
+    return AccessController.doPrivileged((PrivilegedAction<String>) () -> GSON.toJson(jsonObject));
   }
 
   public static String prettyJsonify(Object jsonObject) {
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseBase.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseBase.java
new file mode 100644
index 0000000000..98e79a4048
--- /dev/null
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseBase.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.protocol.response.format;
+
+import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.Getter;
+import org.opensearch.sql.protocol.response.QueryResult;
+
+@Getter
+public class FlatResponseBase {
+  protected static final String INTERLINE_SEPARATOR = System.lineSeparator();
+
+  private final QueryResult response;
+  protected final String separator;
+
+  private final List<String> headers;
+  private final List<List<String>> data;
+
+  FlatResponseBase(QueryResult response, String separator) {
+    this.response = response;
+    this.separator = separator;
+    this.headers = getOriginalHeaders(response);
+    this.data = getOriginalData(response);
+  }
+
+  public String format() {
+    List<String> headersAndData = new ArrayList<>();
+    headersAndData.add(getHeaderLine());
+    headersAndData.addAll(getDataLines());
+    return String.join(INTERLINE_SEPARATOR, headersAndData);
+  }
+
+  protected String getHeaderLine() {
+    return String.join(separator, headers);
+  }
+
+  private List<String> getOriginalHeaders(QueryResult response) {
+    ImmutableList.Builder<String> headers = ImmutableList.builder();
+    response.columnNameTypes().forEach((column, type) -> headers.add(column));
+    List<String> result = headers.build();
+    return formatHeaders(result);
+  }
+
+  protected List<String> getDataLines() {
+    return data.stream().map(v -> String.join(separator, v)).collect(Collectors.toList());
+  }
+
+  private List<List<String>> getOriginalData(QueryResult response) {
+    ImmutableList.Builder<List<String>> dataLines = new ImmutableList.Builder<>();
+    response
+        .iterator()
+        .forEachRemaining(
+            row -> {
+              ImmutableList.Builder<String> line = new ImmutableList.Builder<>();
+              // replace null values with empty string
+              Arrays.asList(row).forEach(val -> line.add(val == null ? "" : val.toString()));
+              dataLines.add(line.build());
+            });
+    List<List<String>> result = dataLines.build();
+    return formatData(result);
+  }
+
+  protected List<String> formatHeaders(List<String> headers) {
+    return headers.stream()
+        .map(cell -> quoteIfRequired(separator, cell))
+        .collect(Collectors.toList());
+  }
+
+  protected List<List<String>> formatData(List<List<String>> lines) {
+    List<List<String>> result = new ArrayList<>();
+    for (List<String> line : lines) {
+      result.add(
+          line.stream().map(cell -> quoteIfRequired(separator, cell)).collect(Collectors.toList()));
+    }
+    return result;
+  }
+
+  protected String quoteIfRequired(String separator, String cell) {
+    final String quote = "\"";
+    return cell.contains(separator) ? quote + cell.replaceAll("\"", "\"\"") + quote : cell;
+  }
+}
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseFormatter.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseFormatter.java
deleted file mode 100644
index d4d00c4535..0000000000
--- a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseFormatter.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.sql.protocol.response.format;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.opensearch.sql.protocol.response.QueryResult;
-
-@RequiredArgsConstructor
-public abstract class FlatResponseFormatter implements ResponseFormatter<QueryResult> {
-  private static String INLINE_SEPARATOR = ",";
-  private static final String INTERLINE_SEPARATOR = System.lineSeparator();
-  private static final Set<String> SENSITIVE_CHAR = ImmutableSet.of("=", "+", "-", "@");
-
-  private boolean sanitize = false;
-
-  public FlatResponseFormatter(String seperator, boolean sanitize) {
-    this.INLINE_SEPARATOR = seperator;
-    this.sanitize = sanitize;
-  }
-
-  @Override
-  public String format(QueryResult response) {
-    FlatResult result = new FlatResult(response, sanitize);
-    return result.getFlat();
-  }
-
-  @Override
-  public String format(Throwable t) {
-    return ErrorFormatter.prettyFormat(t);
-  }
-
-  /**
-   * Sanitize methods are migrated from legacy CSV result.
-   * Sanitize both headers and data lines by:
-   *  1) Second double quote entire cell if any comma is found.
-   */
-  @Getter
-  @RequiredArgsConstructor
-  static class FlatResult {
-    private final QueryResult response;
-    private final boolean sanitize;
-
-    public String getFlat() {
-      List<String> headersAndData = new ArrayList<>();
-      headersAndData.add(getHeaderLine(response, sanitize));
-      headersAndData.addAll(getDataLines(response, sanitize));
-      return String.join(INTERLINE_SEPARATOR, headersAndData);
-    }
-
-    private String getHeaderLine(QueryResult response, boolean sanitize) {
-      List<String> headers = getHeaders(response, sanitize);
-      return String.join(INLINE_SEPARATOR, headers);
-    }
-
-    private List<String> getDataLines(QueryResult response, boolean sanitize) {
-      List<List<String>> data = getData(response, sanitize);
-      return data.stream().map(v -> String.join(INLINE_SEPARATOR, v)).collect(Collectors.toList());
-    }
-
-    private List<String> getHeaders(QueryResult response, boolean sanitize) {
-      ImmutableList.Builder<String> headers = ImmutableList.builder();
-      response.columnNameTypes().forEach((column, type) -> headers.add(column));
-      List<String> result = headers.build();
-      return sanitizeHeaders(result);
-    }
-
-    private List<List<String>> getData(QueryResult response, boolean sanitize) {
-      ImmutableList.Builder<List<String>> dataLines = new ImmutableList.Builder<>();
-      response.iterator().forEachRemaining(row -> {
-        ImmutableList.Builder<String> line = new ImmutableList.Builder<>();
-        // replace null values with empty string
-        Arrays.asList(row).forEach(val -> line.add(val == null ? "" : val.toString()));
-        dataLines.add(line.build());
-      });
-      List<List<String>> result = dataLines.build();
-      return sanitizeData(result);
-    }
-
-    /**
-     * Sanitize headers because OpenSearch allows special character present in field names.
-     */
-    private List<String> sanitizeHeaders(List<String> headers) {
-      if (sanitize) {
-        return headers.stream()
-                .map(this::sanitizeCell)
-                .map(cell -> quoteIfRequired(INLINE_SEPARATOR, cell))
-                .collect(Collectors.toList());
-      } else {
-        return headers.stream()
-                .map(cell -> quoteIfRequired(INLINE_SEPARATOR, cell))
-                .collect(Collectors.toList());
-      }
-    }
-
-    private List<List<String>> sanitizeData(List<List<String>> lines) {
-      List<List<String>> result = new ArrayList<>();
-      if (sanitize) {
-        for (List<String> line : lines) {
-          result.add(line.stream()
-                  .map(this::sanitizeCell)
-                  .map(cell -> quoteIfRequired(INLINE_SEPARATOR, cell))
-                  .collect(Collectors.toList()));
-        }
-      } else {
-        for (List<String> line : lines) {
-          result.add(line.stream()
-                  .map(cell -> quoteIfRequired(INLINE_SEPARATOR, cell))
-                  .collect(Collectors.toList()));
-        }
-      }
-      return result;
-    }
-
-    private String sanitizeCell(String cell) {
-      if (isStartWithSensitiveChar(cell)) {
-        return "'" + cell;
-      }
-      return cell;
-    }
-
-    private String quoteIfRequired(String separator, String cell) {
-      final String quote = "\"";
-      return cell.contains(separator)
-              ? quote + cell.replaceAll("\"", "\"\"") + quote : cell;
-    }
-
-    private boolean isStartWithSensitiveChar(String cell) {
-      return SENSITIVE_CHAR.stream().anyMatch(cell::startsWith);
-    }
-  }
-
-}
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseWithPrettifier.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseWithPrettifier.java
new file mode 100644
index 0000000000..0e2527fbfe
--- /dev/null
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseWithPrettifier.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.protocol.response.format;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.opensearch.sql.protocol.response.QueryResult;
+
+public class FlatResponseWithPrettifier extends FlatResponseBase {
+  private int[] maxWidths;
+
+  FlatResponseWithPrettifier(QueryResult response, String inlineSeparator) {
+    super(response, inlineSeparator);
+    calculateMaxWidths();
+  }
+
+  private void calculateMaxWidths() {
+    int columns = getHeaders().size();
+    maxWidths = new int[columns];
+
+    for (int i = 0; i < columns; i++) {
+      int maxWidth = getHeaders().get(i).length();
+      for (List<String> row : getData()) {
+        maxWidth = Math.max(maxWidth, row.get(i).length());
+      }
+      maxWidths[i] = maxWidth;
+    }
+  }
+
+  @Override
+  protected List<String> getDataLines() {
+    return getData().stream().map(this::prettyFormatLine).collect(Collectors.toList());
+  }
+
+  @Override
+  protected String getHeaderLine() {
+    return prettyFormatLine(getHeaders());
+  }
+
+  private String prettyFormatLine(List<String> line) {
+    return IntStream.range(0, line.size())
+        .mapToObj(i -> padRight(line.get(i), maxWidths[i]))
+        .collect(Collectors.joining(separator));
+  }
+
+  private String padRight(String s, int n) {
+    return String.format("%-" + n + "s", s);
+  }
+}
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseWithSanitizer.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseWithSanitizer.java
new file mode 100644
index 0000000000..69a29c5cce
--- /dev/null
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/FlatResponseWithSanitizer.java
@@ -0,0 +1,53 @@
+package org.opensearch.sql.protocol.response.format;
+
+import com.google.common.collect.ImmutableSet;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.opensearch.sql.protocol.response.QueryResult;
+
+/**
+ * Sanitize methods are migrated from legacy CSV result. Sanitize both headers and data lines by: 1)
+ * Second double quote entire cell if any comma is found.
+ */
+public class FlatResponseWithSanitizer extends FlatResponseBase {
+  private static final Set<String> SENSITIVE_CHAR = ImmutableSet.of("=", "+", "-", "@");
+
+  FlatResponseWithSanitizer(QueryResult response, String inlineSeparator) {
+    super(response, inlineSeparator);
+  }
+
+  /** Sanitize headers because OpenSearch allows special character present in field names. */
+  @Override
+  protected List<String> formatHeaders(List<String> headers) {
+    return headers.stream()
+        .map(this::sanitizeCell)
+        .map(cell -> quoteIfRequired(separator, cell))
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  protected List<List<String>> formatData(List<List<String>> lines) {
+    List<List<String>> result = new ArrayList<>();
+    for (List<String> line : lines) {
+      result.add(
+          line.stream()
+              .map(this::sanitizeCell)
+              .map(cell -> quoteIfRequired(separator, cell))
+              .collect(Collectors.toList()));
+    }
+    return result;
+  }
+
+  private String sanitizeCell(String cell) {
+    if (isStartWithSensitiveChar(cell)) {
+      return "'" + cell;
+    }
+    return cell;
+  }
+
+  private boolean isStartWithSensitiveChar(String cell) {
+    return SENSITIVE_CHAR.stream().anyMatch(cell::startsWith);
+  }
+}
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/Format.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/Format.java
index 4291c09df0..8f22a5380e 100644
--- a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/Format.java
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/Format.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
 import com.google.common.base.Strings;
@@ -20,8 +19,7 @@ public enum Format {
   RAW("raw"),
   VIZ("viz");
 
-  @Getter
-  private final String formatName;
+  @Getter private final String formatName;
 
   private static final Map<String, Format> ALL_FORMATS;
 
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/JdbcResponseFormatter.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/JdbcResponseFormatter.java
index 943287cb62..8be22af532 100644
--- a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/JdbcResponseFormatter.java
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/JdbcResponseFormatter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
 import java.util.List;
@@ -15,6 +14,7 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.exception.QueryEngineException;
 import org.opensearch.sql.executor.ExecutionEngine.Schema;
+import org.opensearch.sql.executor.pagination.Cursor;
 import org.opensearch.sql.opensearch.response.error.ErrorMessage;
 import org.opensearch.sql.opensearch.response.error.ErrorMessageFactory;
 import org.opensearch.sql.protocol.response.QueryResult;
@@ -39,9 +39,10 @@ protected Object buildJsonObject(QueryResult response) {
     json.datarows(fetchDataRows(response));
 
     // Populate other fields
-    json.total(response.size())
-        .size(response.size())
-        .status(200);
+    json.total(response.size()).size(response.size()).status(200);
+    if (!response.getCursor().equals(Cursor.None)) {
+      json.cursor(response.getCursor().toString());
+    }
 
     return json.build();
   }
@@ -50,10 +51,7 @@ protected Object buildJsonObject(QueryResult response) {
   public String format(Throwable t) {
     int status = getStatus(t);
     ErrorMessage message = ErrorMessageFactory.createErrorMessage(t, status);
-    Error error = new Error(
-        message.getType(),
-        message.getReason(),
-        message.getDetails());
+    Error error = new Error(message.getType(), message.getReason(), message.getDetails());
     return jsonify(new JdbcErrorResponse(error, status));
   }
 
@@ -62,8 +60,8 @@ private Column fetchColumn(Schema.Column col) {
   }
 
   /**
-   * Convert type that exists in both legacy and new engine but has different name.
-   * Return old type name to avoid breaking impact on client-side.
+   * Convert type that exists in both legacy and new engine but has different name. Return old type
+   * name to avoid breaking impact on client-side.
    */
   private String convertToLegacyType(ExprType type) {
     return type.legacyTypeName().toLowerCase();
@@ -79,22 +77,22 @@ private Object[][] fetchDataRows(QueryResult response) {
   }
 
   private int getStatus(Throwable t) {
-    return (t instanceof SyntaxCheckException
-        || t instanceof QueryEngineException) ? 400 : 503;
+    return (t instanceof SyntaxCheckException || t instanceof QueryEngineException) ? 400 : 503;
   }
 
-  /**
-   * org.json requires these inner data classes be public (and static)
-   */
+  /** org.json requires these inner data classes be public (and static) */
   @Builder
   @Getter
   public static class JdbcResponse {
     @Singular("column")
     private final List<Column> schema;
+
     private final Object[][] datarows;
     private final long total;
     private final long size;
     private final int status;
+
+    private final String cursor;
   }
 
   @RequiredArgsConstructor
@@ -119,5 +117,4 @@ public static class Error {
     private final String reason;
     private final String details;
   }
-
 }
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/JsonResponseFormatter.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/JsonResponseFormatter.java
index 03e060925d..115ee77b2b 100644
--- a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/JsonResponseFormatter.java
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/JsonResponseFormatter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
 import static org.opensearch.sql.protocol.response.format.ErrorFormatter.compactFormat;
@@ -24,18 +23,17 @@
 @RequiredArgsConstructor
 public abstract class JsonResponseFormatter<R> implements ResponseFormatter<R> {
 
-  /**
-   * JSON format styles: pretty format or compact format without indent and space.
-   */
+  /** JSON format styles: pretty format or compact format without indent and space. */
   public enum Style {
-    PRETTY, COMPACT
+    PRETTY,
+    COMPACT
   }
 
-  /**
-   * JSON format style.
-   */
+  /** JSON format style. */
   private final Style style;
 
+  public static final String CONTENT_TYPE = "application/json; charset=UTF-8";
+
   @Override
   public String format(R response) {
     return jsonify(buildJsonObject(response));
@@ -43,8 +41,12 @@ public String format(R response) {
 
   @Override
   public String format(Throwable t) {
-    return AccessController.doPrivileged((PrivilegedAction<String>) () ->
-        (style == PRETTY) ? prettyFormat(t) : compactFormat(t));
+    return AccessController.doPrivileged(
+        (PrivilegedAction<String>) () -> (style == PRETTY) ? prettyFormat(t) : compactFormat(t));
+  }
+
+  public String contentType() {
+    return CONTENT_TYPE;
   }
 
   /**
@@ -56,7 +58,8 @@ public String format(Throwable t) {
   protected abstract Object buildJsonObject(R response);
 
   protected String jsonify(Object jsonObject) {
-    return AccessController.doPrivileged((PrivilegedAction<String>) () ->
-        (style == PRETTY) ? prettyJsonify(jsonObject) : compactJsonify(jsonObject));
+    return AccessController.doPrivileged(
+        (PrivilegedAction<String>)
+            () -> (style == PRETTY) ? prettyJsonify(jsonObject) : compactJsonify(jsonObject));
   }
 }
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/RawResponseFormatter.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/RawResponseFormatter.java
index 8fe88b2f95..061c2fcb8f 100644
--- a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/RawResponseFormatter.java
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/RawResponseFormatter.java
@@ -3,16 +3,53 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
-/**
- * Response formatter to format response to csv or raw format.
- */
-//@RequiredArgsConstructor
-public class RawResponseFormatter extends FlatResponseFormatter {
+import org.opensearch.sql.protocol.response.QueryResult;
+
+/** Response formatter to format response to raw format. */
+public class RawResponseFormatter implements ResponseFormatter<QueryResult> {
+  public static final String CONTENT_TYPE = "plain/text; charset=UTF-8";
+  private final String separator;
+  private final boolean pretty;
+
   public RawResponseFormatter() {
-    super("|", false);
+    this("|", false);
   }
 
+  public RawResponseFormatter(boolean pretty) {
+    this("|", pretty);
+  }
+
+  /**
+   * Create a raw response formatter with separator and pretty parameter.
+   *
+   * @param pretty if true, display the columns with proper padding. Tracks the maximum width for
+   *     each column to ensure proper formatting.
+   */
+  public RawResponseFormatter(String separator, boolean pretty) {
+    this.separator = separator;
+    this.pretty = pretty;
+  }
+
+  @Override
+  public String format(QueryResult response) {
+    FlatResponseBase flatResponse;
+    if (pretty) {
+      flatResponse = new FlatResponseWithPrettifier(response, separator);
+    } else {
+      flatResponse = new FlatResponseBase(response, separator);
+    }
+    return flatResponse.format();
+  }
+
+  @Override
+  public String format(Throwable t) {
+    return ErrorFormatter.prettyFormat(t);
+  }
+
+  @Override
+  public String contentType() {
+    return CONTENT_TYPE;
+  }
 }
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/ResponseFormatter.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/ResponseFormatter.java
index 4618a4f80d..6738cfbc9c 100644
--- a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/ResponseFormatter.java
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/ResponseFormatter.java
@@ -3,12 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
-/**
- * Response formatter to format response to different formats.
- */
+/** Response formatter to format response to different formats. */
 public interface ResponseFormatter<R> {
 
   /**
@@ -27,4 +24,10 @@ public interface ResponseFormatter<R> {
    */
   String format(Throwable t);
 
+  /**
+   * Getter for the content type header of the response.
+   *
+   * @return string
+   */
+  String contentType();
 }
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/SimpleJsonResponseFormatter.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/SimpleJsonResponseFormatter.java
index ad705ccafa..c00174dc9f 100644
--- a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/SimpleJsonResponseFormatter.java
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/SimpleJsonResponseFormatter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
 import java.util.List;
@@ -43,8 +42,7 @@ public SimpleJsonResponseFormatter(Style style) {
   public Object buildJsonObject(QueryResult response) {
     JsonResponse.JsonResponseBuilder json = JsonResponse.builder();
 
-    json.total(response.size())
-        .size(response.size());
+    json.total(response.size()).size(response.size());
 
     response.columnNameTypes().forEach((name, type) -> json.column(new Column(name, type)));
 
@@ -61,9 +59,7 @@ private Object[][] fetchDataRows(QueryResult response) {
     return rows;
   }
 
-  /**
-   * org.json requires these inner data classes be public (and static)
-   */
+  /** org.json requires these inner data classes be public (and static) */
   @Builder
   @Getter
   public static class JsonResponse {
@@ -82,5 +78,4 @@ public static class Column {
     private final String name;
     private final String type;
   }
-
 }
diff --git a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/VisualizationResponseFormatter.java b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/VisualizationResponseFormatter.java
index 7e971c9099..d5d220dd8d 100644
--- a/protocol/src/main/java/org/opensearch/sql/protocol/response/format/VisualizationResponseFormatter.java
+++ b/protocol/src/main/java/org/opensearch/sql/protocol/response/format/VisualizationResponseFormatter.java
@@ -72,21 +72,20 @@ protected Object buildJsonObject(QueryResult response) {
   public String format(Throwable t) {
     int status = getStatus(t);
     ErrorMessage message = ErrorMessageFactory.createErrorMessage(t, status);
-    VisualizationResponseFormatter.Error error = new Error(
-        message.getType(),
-        message.getReason(),
-        message.getDetails());
+    VisualizationResponseFormatter.Error error =
+        new Error(message.getType(), message.getReason(), message.getDetails());
     return jsonify(new VisualizationErrorResponse(error, status));
   }
 
   private int getStatus(Throwable t) {
-    return (t instanceof SyntaxCheckException
-        || t instanceof QueryEngineException) ? 400 : 503;
+    return (t instanceof SyntaxCheckException || t instanceof QueryEngineException) ? 400 : 503;
   }
 
   private Map<String, List<Object>> fetchData(QueryResult response) {
     Map<String, List<Object>> columnMap = new LinkedHashMap<>();
-    response.getSchema().getColumns()
+    response
+        .getSchema()
+        .getColumns()
         .forEach(column -> columnMap.put(column.getName(), new LinkedList<>()));
 
     for (Object[] dataRow : response) {
@@ -107,16 +106,17 @@ private Metadata constructMetadata(QueryResult response) {
   private List<Field> fetchFields(QueryResult response) {
     List<ExecutionEngine.Schema.Column> columns = response.getSchema().getColumns();
     ImmutableList.Builder<Field> fields = ImmutableList.builder();
-    columns.forEach(column -> {
-      Field field = new Field(column.getName(), convertToLegacyType(column.getExprType()));
-      fields.add(field);
-    });
+    columns.forEach(
+        column -> {
+          Field field = new Field(column.getName(), convertToLegacyType(column.getExprType()));
+          fields.add(field);
+        });
     return fields.build();
   }
 
   /**
-   * Convert type that exists in both legacy and new engine but has different name.
-   * Return old type name to avoid breaking impact on client-side.
+   * Convert type that exists in both legacy and new engine but has different name. Return old type
+   * name to avoid breaking impact on client-side.
    */
   private String convertToLegacyType(ExprType type) {
     return type.legacyTypeName().toLowerCase();
diff --git a/protocol/src/test/java/org/opensearch/sql/protocol/response/QueryResultTest.java b/protocol/src/test/java/org/opensearch/sql/protocol/response/QueryResultTest.java
index 319965e2d0..e03169e9f8 100644
--- a/protocol/src/test/java/org/opensearch/sql/protocol/response/QueryResultTest.java
+++ b/protocol/src/test/java/org/opensearch/sql/protocol/response/QueryResultTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -19,88 +18,81 @@
 import java.util.Collections;
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.executor.pagination.Cursor;
 
 class QueryResultTest {
 
-  private ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-      new ExecutionEngine.Schema.Column("name", null, STRING),
-      new ExecutionEngine.Schema.Column("age", null, INTEGER)));
-
+  private ExecutionEngine.Schema schema =
+      new ExecutionEngine.Schema(
+          ImmutableList.of(
+              new ExecutionEngine.Schema.Column("name", null, STRING),
+              new ExecutionEngine.Schema.Column("age", null, INTEGER)));
 
   @Test
   void size() {
-    QueryResult response = new QueryResult(
-        schema,
-        Arrays.asList(
-            tupleValue(ImmutableMap.of("name", "John", "age", 20)),
-            tupleValue(ImmutableMap.of("name", "Allen", "age", 30)),
-            tupleValue(ImmutableMap.of("name", "Smith", "age", 40))
-        ));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("name", "John", "age", 20)),
+                tupleValue(ImmutableMap.of("name", "Allen", "age", 30)),
+                tupleValue(ImmutableMap.of("name", "Smith", "age", 40))),
+            Cursor.None);
     assertEquals(3, response.size());
   }
 
   @Test
   void columnNameTypes() {
-    QueryResult response = new QueryResult(
-        schema,
-        Collections.singletonList(
-            tupleValue(ImmutableMap.of("name", "John", "age", 20))
-        ));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Collections.singletonList(tupleValue(ImmutableMap.of("name", "John", "age", 20))),
+            Cursor.None);
 
-    assertEquals(
-        ImmutableMap.of("name", "string", "age", "integer"),
-        response.columnNameTypes()
-    );
+    assertEquals(ImmutableMap.of("name", "string", "age", "integer"), response.columnNameTypes());
   }
 
   @Test
   void columnNameTypesWithAlias() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("name", "n", STRING)));
-    QueryResult response = new QueryResult(
-        schema,
-        Collections.singletonList(tupleValue(ImmutableMap.of("n", "John"))));
-
-    assertEquals(
-        ImmutableMap.of("n", "string"),
-        response.columnNameTypes()
-    );
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(new ExecutionEngine.Schema.Column("name", "n", STRING)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Collections.singletonList(tupleValue(ImmutableMap.of("n", "John"))),
+            Cursor.None);
+
+    assertEquals(ImmutableMap.of("n", "string"), response.columnNameTypes());
   }
 
   @Test
   void columnNameTypesFromEmptyExprValues() {
-    QueryResult response = new QueryResult(
-        schema,
-        Collections.emptyList());
-    assertEquals(
-        ImmutableMap.of("name", "string", "age", "integer"),
-        response.columnNameTypes()
-    );
+    QueryResult response = new QueryResult(schema, Collections.emptyList(), Cursor.None);
+    assertEquals(ImmutableMap.of("name", "string", "age", "integer"), response.columnNameTypes());
   }
 
   @Test
   void columnNameTypesFromExprValuesWithMissing() {
-    QueryResult response = new QueryResult(
-        schema,
-        Arrays.asList(
-            tupleValue(ImmutableMap.of("name", "John")),
-            tupleValue(ImmutableMap.of("name", "John", "age", 20))
-        ));
-
-    assertEquals(
-        ImmutableMap.of("name", "string", "age", "integer"),
-        response.columnNameTypes()
-    );
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("name", "John")),
+                tupleValue(ImmutableMap.of("name", "John", "age", 20))));
+
+    assertEquals(ImmutableMap.of("name", "string", "age", "integer"), response.columnNameTypes());
   }
 
   @Test
   void iterate() {
-    QueryResult response = new QueryResult(
-        schema,
-        Arrays.asList(
-            tupleValue(ImmutableMap.of("name", "John", "age", 20)),
-            tupleValue(ImmutableMap.of("name", "Allen", "age", 30))
-        ));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("name", "John", "age", 20)),
+                tupleValue(ImmutableMap.of("name", "Allen", "age", 30))),
+            Cursor.None);
 
     int i = 0;
     for (Object[] objects : response) {
@@ -114,5 +106,4 @@ void iterate() {
       i++;
     }
   }
-
 }
diff --git a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/CommandResponseFormatterTest.java b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/CommandResponseFormatterTest.java
new file mode 100644
index 0000000000..4b20f6b1dc
--- /dev/null
+++ b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/CommandResponseFormatterTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.protocol.response.format;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.opensearch.sql.data.model.ExprValueUtils.tupleValue;
+import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.CONTENT_TYPE;
+import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.Style.PRETTY;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.executor.pagination.Cursor;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
+import org.opensearch.sql.protocol.response.QueryResult;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+public class CommandResponseFormatterTest {
+
+  @Test
+  public void produces_always_same_output_for_any_query_response() {
+    var formatter = new CommandResponseFormatter();
+    assertEquals(
+        formatter.format(mock(QueryResult.class)), formatter.format(mock(QueryResult.class)));
+
+    QueryResult response =
+        new QueryResult(
+            new ExecutionEngine.Schema(
+                ImmutableList.of(
+                    new ExecutionEngine.Schema.Column("name", "name", STRING),
+                    new ExecutionEngine.Schema.Column(
+                        "address", "address", OpenSearchTextType.of()),
+                    new ExecutionEngine.Schema.Column("age", "age", INTEGER))),
+            ImmutableList.of(
+                tupleValue(
+                    ImmutableMap.<String, Object>builder()
+                        .put("name", "John")
+                        .put("address", "Seattle")
+                        .put("age", 20)
+                        .build())),
+            new Cursor("test_cursor"));
+
+    assertEquals("{\n" + "  \"succeeded\": true\n" + "}", formatter.format(response));
+  }
+
+  @Test
+  public void formats_error_as_default_formatter() {
+    var exception = new Exception("pewpew", new RuntimeException("meow meow"));
+    assertEquals(
+        new JdbcResponseFormatter(PRETTY).format(exception),
+        new CommandResponseFormatter().format(exception));
+  }
+
+  @Test
+  void testContentType() {
+    var formatter = new CommandResponseFormatter();
+    assertEquals(formatter.contentType(), CONTENT_TYPE);
+  }
+}
diff --git a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/CsvResponseFormatterTest.java b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/CsvResponseFormatterTest.java
index 7008b51fa6..1436959a9d 100644
--- a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/CsvResponseFormatterTest.java
+++ b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/CsvResponseFormatterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -14,6 +13,7 @@
 import static org.opensearch.sql.data.model.ExprValueUtils.tupleValue;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.protocol.response.format.CsvResponseFormatter.CONTENT_TYPE;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -23,20 +23,23 @@
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.protocol.response.QueryResult;
 
-/**
- * Unit test for {@link CsvResponseFormatter}.
- */
+/** Unit test for {@link CsvResponseFormatter}. */
 public class CsvResponseFormatterTest {
   private static final CsvResponseFormatter formatter = new CsvResponseFormatter();
 
   @Test
   void formatResponse() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("name", "name", STRING),
-        new ExecutionEngine.Schema.Column("age", "age", INTEGER)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-        tupleValue(ImmutableMap.of("name", "John", "age", 20)),
-        tupleValue(ImmutableMap.of("name", "Smith", "age", 30))));
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(
+                new ExecutionEngine.Schema.Column("name", "name", STRING),
+                new ExecutionEngine.Schema.Column("age", "age", INTEGER)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("name", "John", "age", 20)),
+                tupleValue(ImmutableMap.of("name", "Smith", "age", 30))));
     CsvResponseFormatter formatter = new CsvResponseFormatter();
     String expected = "name,age%nJohn,20%nSmith,30";
     assertEquals(format(expected), formatter.format(response));
@@ -44,49 +47,69 @@ void formatResponse() {
 
   @Test
   void sanitizeHeaders() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("=firstname", null, STRING),
-        new ExecutionEngine.Schema.Column("+lastname", null, STRING),
-        new ExecutionEngine.Schema.Column("-city", null, STRING),
-        new ExecutionEngine.Schema.Column("@age", null, INTEGER)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-        tupleValue(ImmutableMap.of(
-            "=firstname", "John", "+lastname", "Smith", "-city", "Seattle", "@age", 20))));
-    String expected = "'=firstname,'+lastname,'-city,'@age%n"
-        + "John,Smith,Seattle,20";
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(
+                new ExecutionEngine.Schema.Column("=firstname", null, STRING),
+                new ExecutionEngine.Schema.Column("+lastname", null, STRING),
+                new ExecutionEngine.Schema.Column("-city", null, STRING),
+                new ExecutionEngine.Schema.Column("@age", null, INTEGER)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(
+                    ImmutableMap.of(
+                        "=firstname",
+                        "John",
+                        "+lastname",
+                        "Smith",
+                        "-city",
+                        "Seattle",
+                        "@age",
+                        20))));
+    String expected = "'=firstname,'+lastname,'-city,'@age%n" + "John,Smith,Seattle,20";
     assertEquals(format(expected), formatter.format(response));
   }
 
   @Test
   void sanitizeData() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("city", "city", STRING)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-        tupleValue(ImmutableMap.of("city", "Seattle")),
-        tupleValue(ImmutableMap.of("city", "=Seattle")),
-        tupleValue(ImmutableMap.of("city", "+Seattle")),
-        tupleValue(ImmutableMap.of("city", "-Seattle")),
-        tupleValue(ImmutableMap.of("city", "@Seattle")),
-        tupleValue(ImmutableMap.of("city", "Seattle="))));
-    String expected = "city%n"
-        + "Seattle%n"
-        + "'=Seattle%n"
-        + "'+Seattle%n"
-        + "'-Seattle%n"
-        + "'@Seattle%n"
-        + "Seattle=";
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(new ExecutionEngine.Schema.Column("city", "city", STRING)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("city", "Seattle")),
+                tupleValue(ImmutableMap.of("city", "=Seattle")),
+                tupleValue(ImmutableMap.of("city", "+Seattle")),
+                tupleValue(ImmutableMap.of("city", "-Seattle")),
+                tupleValue(ImmutableMap.of("city", "@Seattle")),
+                tupleValue(ImmutableMap.of("city", "Seattle="))));
+    String expected =
+        "city%n"
+            + "Seattle%n"
+            + "'=Seattle%n"
+            + "'+Seattle%n"
+            + "'-Seattle%n"
+            + "'@Seattle%n"
+            + "Seattle=";
     assertEquals(format(expected), formatter.format(response));
   }
 
   @Test
   void quoteIfRequired() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("na,me", "na,me", STRING),
-        new ExecutionEngine.Schema.Column(",,age", ",,age", INTEGER)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-        tupleValue(ImmutableMap.of("na,me", "John,Smith", ",,age", "30,,,"))));
-    String expected = "\"na,me\",\",,age\"%n"
-        + "\"John,Smith\",\"30,,,\"";
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(
+                new ExecutionEngine.Schema.Column("na,me", "na,me", STRING),
+                new ExecutionEngine.Schema.Column(",,age", ",,age", INTEGER)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(tupleValue(ImmutableMap.of("na,me", "John,Smith", ",,age", "30,,,"))));
+    String expected = "\"na,me\",\",,age\"%n" + "\"John,Smith\",\"30,,,\"";
     assertEquals(format(expected), formatter.format(response));
   }
 
@@ -101,33 +124,41 @@ void formatError() {
   @Test
   void escapeSanitize() {
     CsvResponseFormatter escapeFormatter = new CsvResponseFormatter(false);
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("city", "city", STRING)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-        tupleValue(ImmutableMap.of("city", "=Seattle")),
-        tupleValue(ImmutableMap.of("city", ",,Seattle"))));
-    String expected = "city%n"
-        + "=Seattle%n"
-        + "\",,Seattle\"";
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(new ExecutionEngine.Schema.Column("city", "city", STRING)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("city", "=Seattle")),
+                tupleValue(ImmutableMap.of("city", ",,Seattle"))));
+    String expected = "city%n" + "=Seattle%n" + "\",,Seattle\"";
     assertEquals(format(expected), escapeFormatter.format(response));
   }
 
   @Test
   void replaceNullValues() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("name", "name", STRING),
-        new ExecutionEngine.Schema.Column("city", "city", STRING)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-        tupleValue(ImmutableMap.of("name", "John","city", "Seattle")),
-        ExprTupleValue.fromExprValueMap(
-            ImmutableMap.of("firstname", LITERAL_NULL, "city", stringValue("Seattle"))),
-        ExprTupleValue.fromExprValueMap(
-            ImmutableMap.of("firstname", stringValue("John"), "city", LITERAL_MISSING))));
-    String expected = "name,city%n"
-        + "John,Seattle%n"
-        + ",Seattle%n"
-        + "John,";
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(
+                new ExecutionEngine.Schema.Column("name", "name", STRING),
+                new ExecutionEngine.Schema.Column("city", "city", STRING)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("name", "John", "city", "Seattle")),
+                ExprTupleValue.fromExprValueMap(
+                    ImmutableMap.of("firstname", LITERAL_NULL, "city", stringValue("Seattle"))),
+                ExprTupleValue.fromExprValueMap(
+                    ImmutableMap.of("firstname", stringValue("John"), "city", LITERAL_MISSING))));
+    String expected = "name,city%n" + "John,Seattle%n" + ",Seattle%n" + "John,";
     assertEquals(format(expected), formatter.format(response));
   }
 
+  @Test
+  void testContentType() {
+    assertEquals(formatter.contentType(), CONTENT_TYPE);
+  }
 }
diff --git a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/FormatTest.java b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/FormatTest.java
index e0e4355a24..7293048916 100644
--- a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/FormatTest.java
+++ b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/FormatTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -13,9 +12,7 @@
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
 
-/**
- * Unit test for {@link Format}.
- */
+/** Unit test for {@link Format}. */
 public class FormatTest {
 
   @Test
@@ -58,5 +55,4 @@ void unsupportedFormat() {
     Optional<Format> format = Format.of("notsupport");
     assertFalse(format.isPresent());
   }
-
 }
diff --git a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/JdbcResponseFormatterTest.java b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/JdbcResponseFormatterTest.java
index 96b383ac0c..16dd1590ee 100644
--- a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/JdbcResponseFormatterTest.java
+++ b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/JdbcResponseFormatterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -17,14 +16,13 @@
 import static org.opensearch.sql.data.type.ExprCoreType.STRUCT;
 import static org.opensearch.sql.executor.ExecutionEngine.Schema;
 import static org.opensearch.sql.executor.ExecutionEngine.Schema.Column;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT;
-import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD;
 import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.Style.COMPACT;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.JsonParser;
 import java.util.Arrays;
+import java.util.Map;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -32,6 +30,9 @@
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.data.model.ExprTupleValue;
 import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.executor.pagination.Cursor;
+import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
+import org.opensearch.sql.opensearch.data.type.OpenSearchTextType;
 import org.opensearch.sql.protocol.response.QueryResult;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -41,25 +42,35 @@ class JdbcResponseFormatterTest {
 
   @Test
   void format_response() {
-    QueryResult response = new QueryResult(
-        new Schema(ImmutableList.of(
-            new Column("name", "name", STRING),
-            new Column("address1", "address1", OPENSEARCH_TEXT),
-            new Column("address2", "address2", OPENSEARCH_TEXT_KEYWORD),
-            new Column("location", "location", STRUCT),
-            new Column("employer", "employer", ARRAY),
-            new Column("age", "age", INTEGER))),
-        ImmutableList.of(
-            tupleValue(ImmutableMap.<String, Object>builder()
-                    .put("name", "John")
-                    .put("address1", "Seattle")
-                    .put("address2", "WA")
-                    .put("location", ImmutableMap.of("x", "1", "y", "2"))
-                    .put("employments", ImmutableList.of(
-                        ImmutableMap.of("name", "Amazon"),
-                        ImmutableMap.of("name", "AWS")))
-                    .put("age", 20)
-                .build())));
+    QueryResult response =
+        new QueryResult(
+            new Schema(
+                ImmutableList.of(
+                    new Column("name", "name", STRING),
+                    new Column("address1", "address1", OpenSearchTextType.of()),
+                    new Column(
+                        "address2",
+                        "address2",
+                        OpenSearchTextType.of(
+                            Map.of(
+                                "words",
+                                OpenSearchDataType.of(OpenSearchDataType.MappingType.Keyword)))),
+                    new Column("location", "location", STRUCT),
+                    new Column("employer", "employer", ARRAY),
+                    new Column("age", "age", INTEGER))),
+            ImmutableList.of(
+                tupleValue(
+                    ImmutableMap.<String, Object>builder()
+                        .put("name", "John")
+                        .put("address1", "Seattle")
+                        .put("address2", "WA")
+                        .put("location", ImmutableMap.of("x", "1", "y", "2"))
+                        .put(
+                            "employments",
+                            ImmutableList.of(
+                                ImmutableMap.of("name", "Amazon"), ImmutableMap.of("name", "AWS")))
+                        .put("age", 20)
+                        .build())));
 
     assertJsonEquals(
         "{"
@@ -73,7 +84,8 @@ void format_response() {
             + "],"
             + "\"datarows\":["
             + "[\"John\",\"Seattle\",\"WA\",{\"x\":\"1\",\"y\":\"2\"},"
-            + "[{\"name\":\"Amazon\"}," + "{\"name\":\"AWS\"}],"
+            + "[{\"name\":\"Amazon\"},"
+            + "{\"name\":\"AWS\"}],"
             + "20]],"
             + "\"total\":1,"
             + "\"size\":1,"
@@ -81,13 +93,47 @@ void format_response() {
         formatter.format(response));
   }
 
+  @Test
+  void format_response_with_cursor() {
+    QueryResult response =
+        new QueryResult(
+            new Schema(
+                ImmutableList.of(
+                    new Column("name", "name", STRING),
+                    new Column("address", "address", OpenSearchTextType.of()),
+                    new Column("age", "age", INTEGER))),
+            ImmutableList.of(
+                tupleValue(
+                    ImmutableMap.<String, Object>builder()
+                        .put("name", "John")
+                        .put("address", "Seattle")
+                        .put("age", 20)
+                        .build())),
+            new Cursor("test_cursor"));
+
+    assertJsonEquals(
+        "{"
+            + "\"schema\":["
+            + "{\"name\":\"name\",\"alias\":\"name\",\"type\":\"keyword\"},"
+            + "{\"name\":\"address\",\"alias\":\"address\",\"type\":\"text\"},"
+            + "{\"name\":\"age\",\"alias\":\"age\",\"type\":\"integer\"}"
+            + "],"
+            + "\"datarows\":["
+            + "[\"John\",\"Seattle\",20]],"
+            + "\"total\":1,"
+            + "\"size\":1,"
+            + "\"cursor\":\"test_cursor\","
+            + "\"status\":200}",
+        formatter.format(response));
+  }
+
   @Test
   void format_response_with_missing_and_null_value() {
     QueryResult response =
         new QueryResult(
-            new Schema(ImmutableList.of(
-                new Column("name", null, STRING),
-                new Column("age", null, INTEGER))),
+            new Schema(
+                ImmutableList.of(
+                    new Column("name", null, STRING), new Column("age", null, INTEGER))),
             Arrays.asList(
                 ExprTupleValue.fromExprValueMap(
                     ImmutableMap.of("name", stringValue("John"), "age", LITERAL_MISSING)),
@@ -113,8 +159,7 @@ void format_client_error_response_due_to_syntax_exception() {
             + "\"details\":\"Invalid query syntax\""
             + "},"
             + "\"status\":400}",
-        formatter.format(new SyntaxCheckException("Invalid query syntax"))
-    );
+        formatter.format(new SyntaxCheckException("Invalid query syntax")));
   }
 
   @Test
@@ -127,8 +172,7 @@ void format_client_error_response_due_to_semantic_exception() {
             + "\"details\":\"Invalid query semantics\""
             + "},"
             + "\"status\":400}",
-        formatter.format(new SemanticCheckException("Invalid query semantics"))
-    );
+        formatter.format(new SemanticCheckException("Invalid query semantics")));
   }
 
   @Test
@@ -141,8 +185,7 @@ void format_server_error_response() {
             + "\"details\":\"Execution error\""
             + "},"
             + "\"status\":503}",
-        formatter.format(new IllegalStateException("Execution error"))
-    );
+        formatter.format(new IllegalStateException("Execution error")));
   }
 
   @Test
@@ -159,15 +202,12 @@ void format_server_error_response_due_to_opensearch() {
             + "from OpenSearch engine.\""
             + "},"
             + "\"status\":503}",
-        formatter.format(new OpenSearchException("all shards failed",
-            new IllegalStateException("Execution error")))
-    );
+        formatter.format(
+            new OpenSearchException(
+                "all shards failed", new IllegalStateException("Execution error"))));
   }
 
   private static void assertJsonEquals(String expected, String actual) {
-    assertEquals(
-        JsonParser.parseString(expected),
-        JsonParser.parseString(actual));
+    assertEquals(JsonParser.parseString(expected), JsonParser.parseString(actual));
   }
-
 }
diff --git a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/RawResponseFormatterTest.java b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/RawResponseFormatterTest.java
index 24b5a4431d..fd057437a0 100644
--- a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/RawResponseFormatterTest.java
+++ b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/RawResponseFormatterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -14,6 +13,7 @@
 import static org.opensearch.sql.data.model.ExprValueUtils.tupleValue;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.protocol.response.format.RawResponseFormatter.CONTENT_TYPE;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -23,70 +23,108 @@
 import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.protocol.response.QueryResult;
 
-/**
- * Unit test for {@link FlatResponseFormatter}.
- */
+/** Unit test for {@link RawResponseFormatter}. */
 public class RawResponseFormatterTest {
-  private FlatResponseFormatter rawFormater = new RawResponseFormatter();
 
   @Test
   void formatResponse() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("name", "name", STRING),
-        new ExecutionEngine.Schema.Column("age", "age", INTEGER)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-        tupleValue(ImmutableMap.of("name", "John", "age", 20)),
-        tupleValue(ImmutableMap.of("name", "Smith", "age", 30))));
-    String expected = "name|age%nJohn|20%nSmith|30";
-    assertEquals(format(expected), rawFormater.format(response));
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(
+                new ExecutionEngine.Schema.Column("name", "name", STRING),
+                new ExecutionEngine.Schema.Column("age", "age", INTEGER)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("name", "John", "age", 20)),
+                tupleValue(ImmutableMap.of("name", "Smith", "age", 30))));
+    String expected = "name|age%n" + "John|20%n" + "Smith|30";
+    assertEquals(format(expected), getRawFormatter().format(response));
+    String expectedPretty = "name |age%n" + "John |20 %n" + "Smith|30 ";
+    assertEquals(format(expectedPretty), getRawFormatterPretty().format(response));
   }
 
   @Test
   void sanitizeHeaders() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("=firstname", null, STRING),
-        new ExecutionEngine.Schema.Column("+lastname", null, STRING),
-        new ExecutionEngine.Schema.Column("-city", null, STRING),
-        new ExecutionEngine.Schema.Column("@age", null, INTEGER)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-        tupleValue(ImmutableMap.of(
-            "=firstname", "John", "+lastname", "Smith", "-city", "Seattle", "@age", 20))));
-    String expected = "=firstname|+lastname|-city|@age%n"
-        + "John|Smith|Seattle|20";
-    assertEquals(format(expected), rawFormater.format(response));
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(
+                new ExecutionEngine.Schema.Column("=firstname", null, STRING),
+                new ExecutionEngine.Schema.Column("+lastname", null, STRING),
+                new ExecutionEngine.Schema.Column("-city", null, STRING),
+                new ExecutionEngine.Schema.Column("@age", null, INTEGER)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(
+                    ImmutableMap.of(
+                        "=firstname",
+                        "John",
+                        "+lastname",
+                        "Smith",
+                        "-city",
+                        "Seattle",
+                        "@age",
+                        20))));
+    String expected = "=firstname|+lastname|-city|@age%n" + "John|Smith|Seattle|20";
+    assertEquals(format(expected), getRawFormatter().format(response));
+    String expectedPretty =
+        "=firstname|+lastname|-city  |@age%n" + "John      |Smith    |Seattle|20  ";
+    assertEquals(format(expectedPretty), getRawFormatterPretty().format(response));
   }
 
   @Test
   void sanitizeData() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("city", "city", STRING)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-        tupleValue(ImmutableMap.of("city", "Seattle")),
-        tupleValue(ImmutableMap.of("city", "=Seattle")),
-        tupleValue(ImmutableMap.of("city", "+Seattle")),
-        tupleValue(ImmutableMap.of("city", "-Seattle")),
-        tupleValue(ImmutableMap.of("city", "@Seattle")),
-        tupleValue(ImmutableMap.of("city", "Seattle="))));
-    String expected = "city%n"
-        + "Seattle%n"
-        + "=Seattle%n"
-        + "+Seattle%n"
-        + "-Seattle%n"
-        + "@Seattle%n"
-        + "Seattle=";
-    assertEquals(format(expected), rawFormater.format(response));
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(new ExecutionEngine.Schema.Column("city", "city", STRING)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("city", "Seattle")),
+                tupleValue(ImmutableMap.of("city", "=Seattle")),
+                tupleValue(ImmutableMap.of("city", "+Seattle")),
+                tupleValue(ImmutableMap.of("city", "-Seattle")),
+                tupleValue(ImmutableMap.of("city", "@Seattle")),
+                tupleValue(ImmutableMap.of("city", "Seattle="))));
+    String expected =
+        "city%n"
+            + "Seattle%n"
+            + "=Seattle%n"
+            + "+Seattle%n"
+            + "-Seattle%n"
+            + "@Seattle%n"
+            + "Seattle=";
+    assertEquals(format(expected), getRawFormatter().format(response));
+    String expectedPretty =
+        "city    %n"
+            + "Seattle %n"
+            + "=Seattle%n"
+            + "+Seattle%n"
+            + "-Seattle%n"
+            + "@Seattle%n"
+            + "Seattle=";
+    assertEquals(format(expectedPretty), getRawFormatterPretty().format(response));
   }
 
   @Test
   void quoteIfRequired() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-            new ExecutionEngine.Schema.Column("na|me", "na|me", STRING),
-            new ExecutionEngine.Schema.Column("||age", "||age", INTEGER)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-            tupleValue(ImmutableMap.of("na|me", "John|Smith", "||age", "30|||"))));
-    String expected = "\"na|me\"|\"||age\"%n"
-            + "\"John|Smith\"|\"30|||\"";
-    assertEquals(format(expected), rawFormater.format(response));
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(
+                new ExecutionEngine.Schema.Column("na|me", "na|me", STRING),
+                new ExecutionEngine.Schema.Column("||age", "||age", INTEGER)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(tupleValue(ImmutableMap.of("na|me", "John|Smith", "||age", "30|||"))));
+    String expected = "\"na|me\"|\"||age\"%n" + "\"John|Smith\"|\"30|||\"";
+    assertEquals(format(expected), getRawFormatter().format(response));
+    String expectedPretty = "\"na|me\"     |\"||age\"%n" + "\"John|Smith\"|\"30|||\"";
+    assertEquals(format(expectedPretty), getRawFormatterPretty().format(response));
   }
 
   @Test
@@ -94,66 +132,94 @@ void formatError() {
     Throwable t = new RuntimeException("This is an exception");
     String expected =
         "{\n  \"type\": \"RuntimeException\",\n  \"reason\": \"This is an exception\"\n}";
-    assertEquals(expected, rawFormater.format(t));
+    assertEquals(expected, getRawFormatter().format(t));
+    assertEquals(expected, getRawFormatterPretty().format(t));
   }
 
   @Test
   void escapeSanitize() {
-    FlatResponseFormatter escapeFormatter = new RawResponseFormatter();
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-            new ExecutionEngine.Schema.Column("city", "city", STRING)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-            tupleValue(ImmutableMap.of("city", "=Seattle")),
-            tupleValue(ImmutableMap.of("city", "||Seattle"))));
-    String expected = "city%n"
-            + "=Seattle%n"
-            + "\"||Seattle\"";
-    assertEquals(format(expected), escapeFormatter.format(response));
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(new ExecutionEngine.Schema.Column("city", "city", STRING)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("city", "=Seattle")),
+                tupleValue(ImmutableMap.of("city", "||Seattle"))));
+    String expected = "city%n" + "=Seattle%n" + "\"||Seattle\"";
+    assertEquals(format(expected), getRawFormatter().format(response));
+    String expectedPretty = "city       %n" + "=Seattle   %n" + "\"||Seattle\"";
+    assertEquals(format(expectedPretty), getRawFormatterPretty().format(response));
   }
 
   @Test
   void senstiveCharater() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-            new ExecutionEngine.Schema.Column("city", "city", STRING)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-            tupleValue(ImmutableMap.of("city", "@Seattle")),
-            tupleValue(ImmutableMap.of("city", "++Seattle"))));
-    String expected = "city%n"
-            + "@Seattle%n"
-            + "++Seattle";
-    assertEquals(format(expected), rawFormater.format(response));
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(new ExecutionEngine.Schema.Column("city", "city", STRING)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("city", "@Seattle")),
+                tupleValue(ImmutableMap.of("city", "++Seattle"))));
+    String expected = "city%n" + "@Seattle%n" + "++Seattle";
+    assertEquals(format(expected), getRawFormatter().format(response));
+    String expectedPretty = "city     %n" + "@Seattle %n" + "++Seattle";
+    assertEquals(format(expectedPretty), getRawFormatterPretty().format(response));
   }
 
   @Test
   void senstiveCharaterWithSanitize() {
-    FlatResponseFormatter testFormater = new RawResponseFormatter();
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-            new ExecutionEngine.Schema.Column("city", "city", STRING)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-            tupleValue(ImmutableMap.of("city", "@Seattle")),
-            tupleValue(ImmutableMap.of("city", "++Seattle|||"))));
-    String expected = "city%n"
-            + "@Seattle%n"
-            + "\"++Seattle|||\"";
-    assertEquals(format(expected), testFormater.format(response));
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(new ExecutionEngine.Schema.Column("city", "city", STRING)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("city", "@Seattle")),
+                tupleValue(ImmutableMap.of("city", "++Seattle|||"))));
+    String expected = "city%n" + "@Seattle%n" + "\"++Seattle|||\"";
+    assertEquals(format(expected), getRawFormatter().format(response));
+    String expectedPretty = "city          %n" + "@Seattle      %n" + "\"++Seattle|||\"";
+    assertEquals(format(expectedPretty), getRawFormatterPretty().format(response));
   }
 
   @Test
   void replaceNullValues() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("name", "name", STRING),
-        new ExecutionEngine.Schema.Column("city", "city", STRING)));
-    QueryResult response = new QueryResult(schema, Arrays.asList(
-        tupleValue(ImmutableMap.of("name", "John","city", "Seattle")),
-        ExprTupleValue.fromExprValueMap(
-            ImmutableMap.of("firstname", LITERAL_NULL, "city", stringValue("Seattle"))),
-        ExprTupleValue.fromExprValueMap(
-            ImmutableMap.of("firstname", stringValue("John"), "city", LITERAL_MISSING))));
-    String expected = "name|city%n"
-        + "John|Seattle%n"
-        + "|Seattle%n"
-        + "John|";
-    assertEquals(format(expected), rawFormater.format(response));
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(
+                new ExecutionEngine.Schema.Column("name", "name", STRING),
+                new ExecutionEngine.Schema.Column("city", "city", STRING)));
+    QueryResult response =
+        new QueryResult(
+            schema,
+            Arrays.asList(
+                tupleValue(ImmutableMap.of("name", "John", "city", "Seattle")),
+                ExprTupleValue.fromExprValueMap(
+                    ImmutableMap.of("firstname", LITERAL_NULL, "city", stringValue("Seattle"))),
+                ExprTupleValue.fromExprValueMap(
+                    ImmutableMap.of("firstname", stringValue("John"), "city", LITERAL_MISSING))));
+    String expected = "name|city%n" + "John|Seattle%n" + "|Seattle%n" + "John|";
+    assertEquals(format(expected), getRawFormatter().format(response));
+    String expectedPretty = "name|city   %n" + "John|Seattle%n" + "    |Seattle%n" + "John|       ";
+    assertEquals(format(expectedPretty), getRawFormatterPretty().format(response));
+  }
+
+  @Test
+  void testContentType() {
+    assertEquals(getRawFormatter().contentType(), CONTENT_TYPE);
+    assertEquals(getRawFormatterPretty().contentType(), CONTENT_TYPE);
+  }
+
+  private RawResponseFormatter getRawFormatter() {
+    return new RawResponseFormatter();
   }
 
+  private RawResponseFormatter getRawFormatterPretty() {
+    return new RawResponseFormatter(true);
+  }
 }
diff --git a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/SimpleJsonResponseFormatterTest.java b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/SimpleJsonResponseFormatterTest.java
index 8b4438cf91..e5eb0f1ac7 100644
--- a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/SimpleJsonResponseFormatterTest.java
+++ b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/SimpleJsonResponseFormatterTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.protocol.response.format;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,9 +24,11 @@
 
 class SimpleJsonResponseFormatterTest {
 
-  private final ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-      new ExecutionEngine.Schema.Column("firstname", null, STRING),
-      new ExecutionEngine.Schema.Column("age", null, INTEGER)));
+  private final ExecutionEngine.Schema schema =
+      new ExecutionEngine.Schema(
+          ImmutableList.of(
+              new ExecutionEngine.Schema.Column("firstname", null, STRING),
+              new ExecutionEngine.Schema.Column("age", null, INTEGER)));
 
   @Test
   void formatResponse() {
@@ -84,12 +85,12 @@ void formatResponsePretty() {
 
   @Test
   void formatResponseSchemaWithAlias() {
-    ExecutionEngine.Schema schema = new ExecutionEngine.Schema(ImmutableList.of(
-        new ExecutionEngine.Schema.Column("firstname", "name", STRING)));
+    ExecutionEngine.Schema schema =
+        new ExecutionEngine.Schema(
+            ImmutableList.of(new ExecutionEngine.Schema.Column("firstname", "name", STRING)));
     QueryResult response =
         new QueryResult(
-            schema,
-            ImmutableList.of(tupleValue(ImmutableMap.of("name", "John", "age", 20))));
+            schema, ImmutableList.of(tupleValue(ImmutableMap.of("name", "John", "age", 20))));
     SimpleJsonResponseFormatter formatter = new SimpleJsonResponseFormatter(COMPACT);
     assertEquals(
         "{\"schema\":[{\"name\":\"name\",\"type\":\"string\"}],"
@@ -120,10 +121,13 @@ void formatResponseWithTupleValue() {
         new QueryResult(
             schema,
             Arrays.asList(
-                tupleValue(ImmutableMap
-                    .of("name", "Smith",
-                        "address", ImmutableMap.of("state", "WA", "street",
-                            ImmutableMap.of("city", "seattle"))))));
+                tupleValue(
+                    ImmutableMap.of(
+                        "name",
+                        "Smith",
+                        "address",
+                        ImmutableMap.of(
+                            "state", "WA", "street", ImmutableMap.of("city", "seattle"))))));
     SimpleJsonResponseFormatter formatter = new SimpleJsonResponseFormatter(COMPACT);
 
     assertEquals(
@@ -140,11 +144,13 @@ void formatResponseWithArrayValue() {
         new QueryResult(
             schema,
             Arrays.asList(
-                tupleValue(ImmutableMap
-                    .of("name", "Smith",
-                        "address", Arrays.asList(
-                            ImmutableMap.of("state", "WA"), ImmutableMap.of("state", "NYC")
-                        )))));
+                tupleValue(
+                    ImmutableMap.of(
+                        "name",
+                        "Smith",
+                        "address",
+                        Arrays.asList(
+                            ImmutableMap.of("state", "WA"), ImmutableMap.of("state", "NYC"))))));
     SimpleJsonResponseFormatter formatter = new SimpleJsonResponseFormatter(COMPACT);
     assertEquals(
         "{\"schema\":[{\"name\":\"firstname\",\"type\":\"string\"},"
diff --git a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/VisualizationResponseFormatterTest.java b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/VisualizationResponseFormatterTest.java
index 88a26aeb6b..a6fdd1e03e 100644
--- a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/VisualizationResponseFormatterTest.java
+++ b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/VisualizationResponseFormatterTest.java
@@ -11,6 +11,7 @@
 import static org.opensearch.sql.data.model.ExprValueUtils.tupleValue;
 import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.CONTENT_TYPE;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -23,18 +24,21 @@
 import org.opensearch.sql.protocol.response.QueryResult;
 
 public class VisualizationResponseFormatterTest {
-  private final VisualizationResponseFormatter formatter = new VisualizationResponseFormatter(
-      JsonResponseFormatter.Style.COMPACT);
+  private final VisualizationResponseFormatter formatter =
+      new VisualizationResponseFormatter(JsonResponseFormatter.Style.COMPACT);
 
   @Test
   void formatResponse() {
-    QueryResult response = new QueryResult(
-        new ExecutionEngine.Schema(ImmutableList.of(
-            new ExecutionEngine.Schema.Column("name", "name", STRING),
-            new ExecutionEngine.Schema.Column("age", "age", INTEGER))),
-        ImmutableList.of(tupleValue(ImmutableMap.of("name", "John", "age", 20)),
-            tupleValue(ImmutableMap.of("name", "Amy", "age", 31)),
-            tupleValue(ImmutableMap.of("name", "Bob", "age", 28))));
+    QueryResult response =
+        new QueryResult(
+            new ExecutionEngine.Schema(
+                ImmutableList.of(
+                    new ExecutionEngine.Schema.Column("name", "name", STRING),
+                    new ExecutionEngine.Schema.Column("age", "age", INTEGER))),
+            ImmutableList.of(
+                tupleValue(ImmutableMap.of("name", "John", "age", 20)),
+                tupleValue(ImmutableMap.of("name", "Amy", "age", 31)),
+                tupleValue(ImmutableMap.of("name", "Bob", "age", 28))));
 
     assertJsonEquals(
         "{\"data\":{"
@@ -54,10 +58,12 @@ void formatResponse() {
   void formatResponseWithNull() {
     QueryResult response =
         new QueryResult(
-            new ExecutionEngine.Schema(ImmutableList.of(
-                new ExecutionEngine.Schema.Column("name", null, STRING),
-                new ExecutionEngine.Schema.Column("age", null, INTEGER))),
-            ImmutableList.of(tupleValue(ImmutableMap.of("name", "John", "age", LITERAL_MISSING)),
+            new ExecutionEngine.Schema(
+                ImmutableList.of(
+                    new ExecutionEngine.Schema.Column("name", null, STRING),
+                    new ExecutionEngine.Schema.Column("age", null, INTEGER))),
+            ImmutableList.of(
+                tupleValue(ImmutableMap.of("name", "John", "age", LITERAL_MISSING)),
                 tupleValue(ImmutableMap.of("name", "Allen", "age", LITERAL_NULL)),
                 tupleValue(ImmutableMap.of("name", "Smith", "age", 30))));
 
@@ -72,8 +78,7 @@ void formatResponseWithNull() {
             + "\"size\":3,"
             + "\"status\":200"
             + "}",
-        formatter.format(response)
-    );
+        formatter.format(response));
   }
 
   @Test
@@ -86,8 +91,7 @@ void clientErrorSyntaxException() {
             + "\"details\":\"Invalid query syntax\""
             + "},"
             + "\"status\":400}",
-        formatter.format(new SyntaxCheckException("Invalid query syntax"))
-    );
+        formatter.format(new SyntaxCheckException("Invalid query syntax")));
   }
 
   @Test
@@ -100,8 +104,7 @@ void clientErrorSemanticException() {
             + "\"details\":\"Invalid query semantics\""
             + "},"
             + "\"status\":400}",
-        formatter.format(new SemanticCheckException("Invalid query semantics"))
-    );
+        formatter.format(new SemanticCheckException("Invalid query semantics")));
   }
 
   @Test
@@ -114,8 +117,7 @@ void serverError() {
             + "\"details\":\"Execution error\""
             + "},"
             + "\"status\":503}",
-        formatter.format(new IllegalStateException("Execution error"))
-    );
+        formatter.format(new IllegalStateException("Execution error")));
   }
 
   @Test
@@ -132,22 +134,25 @@ void opensearchServerError() {
             + "from OpenSearch engine.\""
             + "},"
             + "\"status\":503}",
-        formatter.format(new OpenSearchException("all shards failed",
-            new IllegalStateException("Execution error")))
-    );
+        formatter.format(
+            new OpenSearchException(
+                "all shards failed", new IllegalStateException("Execution error"))));
   }
 
   @Test
   void prettyStyle() {
-    VisualizationResponseFormatter prettyFormatter = new VisualizationResponseFormatter(
-        JsonResponseFormatter.Style.PRETTY);
-    QueryResult response = new QueryResult(
-        new ExecutionEngine.Schema(ImmutableList.of(
-            new ExecutionEngine.Schema.Column("name", "name", STRING),
-            new ExecutionEngine.Schema.Column("age", "age", INTEGER))),
-        ImmutableList.of(tupleValue(ImmutableMap.of("name", "John", "age", 20)),
-            tupleValue(ImmutableMap.of("name", "Amy", "age", 31)),
-            tupleValue(ImmutableMap.of("name", "Bob", "age", 28))));
+    VisualizationResponseFormatter prettyFormatter =
+        new VisualizationResponseFormatter(JsonResponseFormatter.Style.PRETTY);
+    QueryResult response =
+        new QueryResult(
+            new ExecutionEngine.Schema(
+                ImmutableList.of(
+                    new ExecutionEngine.Schema.Column("name", "name", STRING),
+                    new ExecutionEngine.Schema.Column("age", "age", INTEGER))),
+            ImmutableList.of(
+                tupleValue(ImmutableMap.of("name", "John", "age", 20)),
+                tupleValue(ImmutableMap.of("name", "Amy", "age", 31)),
+                tupleValue(ImmutableMap.of("name", "Bob", "age", 28))));
 
     assertJsonEquals(
         "{\n"
@@ -178,13 +183,16 @@ void prettyStyle() {
             + "  \"size\": 3,\n"
             + "  \"status\": 200\n"
             + "}",
-        prettyFormatter.format(response)
-    );
+        prettyFormatter.format(response));
   }
 
   private static void assertJsonEquals(String expected, String actual) {
-    assertEquals(
-        JsonParser.parseString(expected),
-        JsonParser.parseString(actual));
+    assertEquals(JsonParser.parseString(expected), JsonParser.parseString(actual));
+  }
+
+  @Test
+  void testContentType() {
+    var formatter = new CommandResponseFormatter();
+    assertEquals(formatter.contentType(), CONTENT_TYPE);
   }
 }
diff --git a/release-notes/opensearch-sql.release-notes-2.10.0.0.md b/release-notes/opensearch-sql.release-notes-2.10.0.0.md
new file mode 100644
index 0000000000..f1a730ce46
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.10.0.0.md
@@ -0,0 +1,43 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.10.0
+
+### Features
+
+
+### Enhancements
+* [Backport 2.x] Added support of timestamp/date/time using curly brackets by @matthewryanwells in https://github.com/opensearch-project/sql/pull/1908
+
+### Bug Fixes
+* [2.x] bump okhttp to 4.10.0 (#2043) by @joshuali925 in https://github.com/opensearch-project/sql/pull/2044
+* [Backport 2.x] Okio upgrade to 3.5.0 by @opensearch-trigger-bot in https://github.com/opensearch-project/sql/pull/1963
+* [Backport 2.x] Fixed response codes For Requests With security exception. by @opensearch-trigger-bot in https://github.com/opensearch-project/sql/pull/2029
+* [Backport 2.x] Backport breaking changes by @opensearch-trigger-bot in https://github.com/opensearch-project/sql/pull/1920
+* [Manual Backport #1943] Fixing string format change #1943 by @MitchellGale in https://github.com/opensearch-project/sql/pull/1946
+* [Backport 2.x] Fix CVE by @opensearch-trigger-bot in https://github.com/opensearch-project/sql/pull/1944
+* [Backport 2.x] Breaking change OpenSearch main project - Action movement (#1958) by @MitchellGale in https://github.com/opensearch-project/sql/pull/1965
+* [Backport 2.x] Update backport CI, add PR merged condition by @ps48 in https://github.com/opensearch-project/sql/pull/1970
+* [Backport 2.x] Fixed exception when datasource is updated with existing configuration. by @opensearch-trigger-bot in https://github.com/opensearch-project/sql/pull/2008
+
+### Documentation
+* [Backport 2.x] Fix doctest data by @opensearch-trigger-bot in https://github.com/opensearch-project/sql/pull/1998
+
+### Infrastructure
+* [Backport 2.x] Add _primary preference only for segment replication enabled indices by @opensearch-trigger-bot in
+  https://github.com/opensearch-project/sql/pull/2036
+* [Backport 2.x] Revert "Guarantee datasource read api is strong consistent read (#1815)" by @opensearch-trigger-bot in
+* [Backport 2.x] [Spotless] Adds new line at end of java files by @opensearch-trigger-bot in https://github.com/opensearch-project/sql/pull/1925
+* (#1506) Remove reservedSymbolTable and replace with HIDDEN_FIELD_NAME… by @acarbonetto in https://github.com/opensearch-project/sql/pull/1964
+
+### Refactoring
+* [Backport 2.x] Applied formatting improvements to Antlr files based on spotless changes (#2017) by @MitchellGale in
+* [Backport 2.x] Statically init `typeActionMap` in `OpenSearchExprValueFactory`. by @opensearch-trigger-bot in https://github.com/opensearch-project/sql/pull/1901
+* [Backport 2.x] (#1536) Refactor OpenSearchQueryRequest and move includes to builder by @opensearch-trigger-bot in https://github.com/opensearch-project/sql/pull/1948
+* [Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #3 (#1932) by @MitchellGale in https://github.com/opensearch-project/sql/pull/1994
+* [Backport 2.x] Developer guide update with Spotless details by @opensearch-trigger-bot in https://github.com/opensearch-project/sql/pull/2004
+* [Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #4 #1933 by @MitchellGale in https://github.com/opensearch-project/sql/pull/1995
+* [Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #2 #1931 by @MitchellGale in https://github.com/opensearch-project/sql/pull/1993
+* [Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #1 #1930 by @MitchellGale in https://github.com/opensearch-project/sql/pull/1992
+* [Backport 2.x] [Spotless] Applying Google Code Format for core #5 (#1951) by @MitchellGale in https://github.com/opensearch-project/sql/pull/1996
+* [Backport 2.x] [spotless] Removes Checkstyle in favor of spotless by @MitchellGale in https://github.com/opensearch-project/sql/pull/2018
+* [Backport 2.x] [Spotless] Entire project running spotless by @MitchellGale in https://github.com/opensearch-project/sql/pull/2016
+---
+**Full Changelog**: https://github.com/opensearch-project/sql/compare/2.3.0.0...v.2.10.0.0
\ No newline at end of file
diff --git a/release-notes/opensearch-sql.release-notes-2.11.0.0.md b/release-notes/opensearch-sql.release-notes-2.11.0.0.md
new file mode 100644
index 0000000000..a560d5c8dd
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.11.0.0.md
@@ -0,0 +1,55 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.11.0
+
+### Features
+
+### Enhancements
+*  Enable PPL lang and add datasource to async query API in https://github.com/opensearch-project/sql/pull/2195
+*  Refactor Flint Auth in https://github.com/opensearch-project/sql/pull/2201
+*  Add conf for spark structured streaming job in https://github.com/opensearch-project/sql/pull/2203
+*  Submit long running job only when auto_refresh = false in https://github.com/opensearch-project/sql/pull/2209
+*  Bug Fix, handle DESC TABLE response in https://github.com/opensearch-project/sql/pull/2213
+*  Drop Index Implementation in https://github.com/opensearch-project/sql/pull/2217
+*  Enable PPL Queries in https://github.com/opensearch-project/sql/pull/2223
+*  Read extra Spark submit parameters from cluster settings in https://github.com/opensearch-project/sql/pull/2236
+*  Spark Execution Engine Config Refactor in https://github.com/opensearch-project/sql/pull/2266
+*  Provide auth.type and auth.role_arn paramters in GET Datasource API response. in https://github.com/opensearch-project/sql/pull/2283
+*  Add support for `date_nanos` and tests. (#337) in https://github.com/opensearch-project/sql/pull/2020
+*  Applied formatting improvements to Antlr files based on spotless changes (#2017) by @MitchellGale in https://github.com/opensearch-project/sql/pull/2023
+*  Revert "Guarantee datasource read api is strong consistent read (#1815)" in https://github.com/opensearch-project/sql/pull/2031
+*  Add _primary preference only for segment replication enabled indices in https://github.com/opensearch-project/sql/pull/2045
+*  Changed allowlist config to denylist ip config for datasource uri hosts in https://github.com/opensearch-project/sql/pull/2058
+
+### Bug Fixes
+*  fix broken link for connectors doc in https://github.com/opensearch-project/sql/pull/2199
+*  Fix response codes returned by JSON formatting them in https://github.com/opensearch-project/sql/pull/2200
+*  Bug fix, datasource API should be case sensitive in https://github.com/opensearch-project/sql/pull/2202
+*  Minor fix in dropping covering index in https://github.com/opensearch-project/sql/pull/2240
+*  Fix Unit tests for FlintIndexReader in https://github.com/opensearch-project/sql/pull/2242
+*  Bug Fix , delete OpenSearch index when DROP INDEX in https://github.com/opensearch-project/sql/pull/2252
+*  Correctly Set query status in https://github.com/opensearch-project/sql/pull/2232
+*  Exclude generated files from spotless  in https://github.com/opensearch-project/sql/pull/2024
+*  Fix mockito core conflict. in https://github.com/opensearch-project/sql/pull/2131
+*  Fix `ASCII` function and groom UT for text functions. (#301) in https://github.com/opensearch-project/sql/pull/2029
+*  Fixed response codes For Requests With security exception. in https://github.com/opensearch-project/sql/pull/2036
+
+### Documentation
+*  Datasource description in https://github.com/opensearch-project/sql/pull/2138
+*  Add documentation for S3GlueConnector. in https://github.com/opensearch-project/sql/pull/2234
+
+### Infrastructure
+*  bump aws-encryption-sdk-java to 1.71 in https://github.com/opensearch-project/sql/pull/2057
+*  Run IT tests with security plugin (#335) #1986 by @MitchellGale in https://github.com/opensearch-project/sql/pull/2022
+
+### Refactoring
+*  Merging Async Query APIs feature branch into main. in https://github.com/opensearch-project/sql/pull/2163
+*  Removed Domain Validation in https://github.com/opensearch-project/sql/pull/2136
+*  Check for existence of security plugin in https://github.com/opensearch-project/sql/pull/2069
+*  Always use snapshot version for security plugin download in https://github.com/opensearch-project/sql/pull/2061
+*  Add customized result index in data source etc in https://github.com/opensearch-project/sql/pull/2220
+
+### Security
+*  bump okhttp to 4.10.0 (#2043) by @joshuali925 in https://github.com/opensearch-project/sql/pull/2044
+*  bump okio to 3.4.0 by @joshuali925 in https://github.com/opensearch-project/sql/pull/2047
+
+---
+**Full Changelog**: https://github.com/opensearch-project/sql/compare/2.3.0.0...v.2.11.0.0
\ No newline at end of file
diff --git a/release-notes/opensearch-sql.release-notes-2.12.0.0.md b/release-notes/opensearch-sql.release-notes-2.12.0.0.md
new file mode 100644
index 0000000000..1078f5416a
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.12.0.0.md
@@ -0,0 +1,67 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.12.0
+
+### Features
+
+
+### Enhancements
+* add InteractiveSession and SessionManager by @penghuo in https://github.com/opensearch-project/sql/pull/2290
+* Add Statement by @penghuo in https://github.com/opensearch-project/sql/pull/2294
+* Add sessionId parameters for create async query API by @penghuo in https://github.com/opensearch-project/sql/pull/2312
+* Implement patch API for datasources by @derek-ho in https://github.com/opensearch-project/sql/pull/2273
+* Integration with REPL Spark job by @penghuo in https://github.com/opensearch-project/sql/pull/2327
+* Add missing tags and MV support by @vamsi-amazon in https://github.com/opensearch-project/sql/pull/2336
+* Bug Fix, support cancel query in running state by @penghuo in https://github.com/opensearch-project/sql/pull/2351
+* Add Session limitation by @penghuo in https://github.com/opensearch-project/sql/pull/2354
+* Handle Describe,Refresh and Show Queries Properly by @vamsi-amazon in https://github.com/opensearch-project/sql/pull/2357
+* Add where clause support in create statement by @dai-chen in https://github.com/opensearch-project/sql/pull/2366
+* Add Flint Index Purging Logic by @kaituo in https://github.com/opensearch-project/sql/pull/2372
+* add concurrent limit on datasource and sessions by @penghuo in https://github.com/opensearch-project/sql/pull/2390
+* Redefine Drop Index as logical delete by @penghuo in https://github.com/opensearch-project/sql/pull/2386
+* Added session, statement, emrjob metrics to sql stats api by @vamsi-amazon in https://github.com/opensearch-project/sql/pull/2398
+* Add more metrics and handle emr exception message by @vamsi-amazon in https://github.com/opensearch-project/sql/pull/2422
+* Add cluster name in spark submit params by @noCharger in https://github.com/opensearch-project/sql/pull/2467
+* Add setting plugins.query.executionengine.async_query.enabled by @penghuo in https://github.com/opensearch-project/sql/pull/2510
+
+### Bug Fixes
+* Fix bug, using basic instead of basicauth by @penghuo in https://github.com/opensearch-project/sql/pull/2342
+* create new session if current session not ready by @penghuo in https://github.com/opensearch-project/sql/pull/2363
+* Create new session if client provided session is invalid by @penghuo in https://github.com/opensearch-project/sql/pull/2368
+* Enable session by default by @penghuo in https://github.com/opensearch-project/sql/pull/2373
+* Return 429 for ConcurrencyLimitExceededException by @penghuo in https://github.com/opensearch-project/sql/pull/2428
+* Async query get result bug fix by @dai-chen in https://github.com/opensearch-project/sql/pull/2443
+* Validate session with flint datasource passed in async job request by @kaituo in https://github.com/opensearch-project/sql/pull/2448
+* Temporary fixes for build errors by @vamsi-amazon in https://github.com/opensearch-project/sql/pull/2476
+* Add SparkDataType as wrapper for unmapped spark data type by @penghuo in https://github.com/opensearch-project/sql/pull/2492
+* Fix wrong 503 error response code by @vamsi-amazon in https://github.com/opensearch-project/sql/pull/2493
+
+### Documentation
+* [DOC] Configure the Spark metrics properties while creating a s3 Glue Connector by @noCharger in https://github.com/opensearch-project/sql/pull/2504
+
+### Infrastructure
+* Onboard jenkins prod docker images in github actions by @peterzhuamazon in https://github.com/opensearch-project/sql/pull/2404
+* Add publishToMavenLocal to publish plugins in this script by @zane-neo in https://github.com/opensearch-project/sql/pull/2461
+* Update to Gradle 8.4 by @reta in https://github.com/opensearch-project/sql/pull/2433
+* Add JDK-21 to GA worklflows by @reta in https://github.com/opensearch-project/sql/pull/2481
+
+### Refactoring
+* Refactoring in Unit Tests by @vamsi-amazon in https://github.com/opensearch-project/sql/pull/2308
+* deprecated job-metadata-index by @penghuo in https://github.com/opensearch-project/sql/pull/2339
+* Refactoring for tags usage in test files. by @vamsi-amazon in https://github.com/opensearch-project/sql/pull/2383
+* Add seder to TransportPPLQueryResponse by @zane-neo in https://github.com/opensearch-project/sql/pull/2452
+* Move pplenabled to transport by @zane-neo in https://github.com/opensearch-project/sql/pull/2451
+* Async Executor Service Depedencies Refactor by @vamsi-amazon in https://github.com/opensearch-project/sql/pull/2488
+
+### Security
+* Upgrade JSON to 20231013 to fix CVE-2023-5072 by @derek-ho in https://github.com/opensearch-project/sql/pull/2307
+* Block execution engine settings in sql query settings API and add more unit tests by @vamsi-amazon in https://github.com/opensearch-project/sql/pull/2407
+* upgrade okhttp to 4.12.0 by @joshuali925 in https://github.com/opensearch-project/sql/pull/2405
+* Bump aws-java-sdk-core version to 1.12.651 by @penghuo in https://github.com/opensearch-project/sql/pull/2503
+
+## New Contributors
+* @dreamer-89 made their first contribution in https://github.com/opensearch-project/sql/pull/2013
+* @kaituo made their first contribution in https://github.com/opensearch-project/sql/pull/2212
+* @zane-neo made their first contribution in https://github.com/opensearch-project/sql/pull/2452
+* @noCharger made their first contribution in https://github.com/opensearch-project/sql/pull/2467
+
+---
+**Full Changelog**: https://github.com/opensearch-project/sql/compare/2.11.0.0...2.12.0.0
\ No newline at end of file
diff --git a/release-notes/opensearch-sql.release-notes-2.13.0.0.md b/release-notes/opensearch-sql.release-notes-2.13.0.0.md
new file mode 100644
index 0000000000..4b5130a281
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.13.0.0.md
@@ -0,0 +1,25 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.13.0
+
+### Enhancements
+* Datasource disable feature ([#2539](https://github.com/opensearch-project/sql/pull/2539))
+* Handle ALTER Index Queries ([#2554](https://github.com/opensearch-project/sql/pull/2554))
+* Implement vacuum index operation ([#2557](https://github.com/opensearch-project/sql/pull/2557))
+* Stop Streaming Jobs When datasource is disabled/deleted ([#2559](https://github.com/opensearch-project/sql/pull/2559))
+
+### Bug Fixes
+* Fix issue in testSourceMetricCommandWithTimestamp integ test with different timezones and locales ([#2522](https://github.com/opensearch-project/sql/pull/2522))
+* Refactor query param ([#2519](https://github.com/opensearch-project/sql/pull/2519))
+* bump ipaddress to 5.4.2 ([#2544](https://github.com/opensearch-project/sql/pull/2544))
+* Restrict the scope of cancel API ([#2548](https://github.com/opensearch-project/sql/pull/2548))
+* Change async query default setting ([#2561](https://github.com/opensearch-project/sql/pull/2561))
+* Percent encode opensearch index name ([#2564](https://github.com/opensearch-project/sql/pull/2564))
+* [Bugfix] Wrap the query with double quotes ([#2565](https://github.com/opensearch-project/sql/pull/2565))
+* FlintStreamingJobCleanerTask missing event listener ([#2574](https://github.com/opensearch-project/sql/pull/2574))
+
+### Infrastructure
+* bump bwc version ([#2546](https://github.com/opensearch-project/sql/pull/2546))
+* [Backport main] Add release notes for 1.3.15 ([#2538](https://github.com/opensearch-project/sql/pull/2538))
+* Upgrade opensearch-spark jars to 0.3.0 ([#2568](https://github.com/opensearch-project/sql/pull/2568))
+
+### Refactoring
+* Change emr job names based on the query type ([#2543](https://github.com/opensearch-project/sql/pull/2543))
diff --git a/release-notes/opensearch-sql.release-notes-2.14.0.0.md b/release-notes/opensearch-sql.release-notes-2.14.0.0.md
new file mode 100644
index 0000000000..664b303b70
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.14.0.0.md
@@ -0,0 +1,18 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.14.0
+
+### Enhancements
+* Add iceberg support to EMR serverless jobs. ([#2602](https://github.com/opensearch-project/sql/pull/2602))
+* Use EMR serverless bundled iceberg JAR. ([#2646](https://github.com/opensearch-project/sql/pull/2646))
+
+### Bug Fixes
+* Align vacuum statement semantics with Flint Spark ([#2606](https://github.com/opensearch-project/sql/pull/2606))
+* Handle EMRS exception as 400 ([#2612](https://github.com/opensearch-project/sql/pull/2612))
+* Fix pagination for many columns (#2440) ([#2441](https://github.com/opensearch-project/sql/pull/2441))
+* Fix semicolon parsing for async query ([#2631](https://github.com/opensearch-project/sql/pull/2631))
+* Throw OpensearchSecurityException in case of datasource authorization ([#2626](https://github.com/opensearch-project/sql/pull/2626))
+
+### Maintenance
+* Refactoring of SparkQueryDispatcher  ([#2615](https://github.com/opensearch-project/sql/pull/2615))
+
+### Infrastructure
+* Increment version to 2.14.0-SNAPSHOT ([#2585](https://github.com/opensearch-project/sql/pull/2585))
\ No newline at end of file
diff --git a/release-notes/opensearch-sql.release-notes-2.15.0.0.md b/release-notes/opensearch-sql.release-notes-2.15.0.0.md
new file mode 100644
index 0000000000..bde038f5e8
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.15.0.0.md
@@ -0,0 +1,34 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.15.0
+
+### Features
+* Support Percentile in PPL ([#2710](https://github.com/opensearch-project/sql/pull/2710))
+
+### Enhancements
+* Add option to use LakeFormation in S3Glue data source ([#2624](https://github.com/opensearch-project/sql/pull/2624))
+* Remove direct ClusterState access in LocalClusterState ([#2717](https://github.com/opensearch-project/sql/pull/2717))
+
+### Bug Fixes
+* Handle create index with batch FlintJob ([#2734](https://github.com/opensearch-project/sql/pull/2734))
+
+### Maintenance
+* Use EMR serverless bundled iceberg JAR ([#2632](https://github.com/opensearch-project/sql/pull/2632))
+* Update maintainers list ([#2663](https://github.com/opensearch-project/sql/pull/2663))
+
+### Infrastructure
+* Increment version to 2.15.0-SNAPSHOT ([#2650](https://github.com/opensearch-project/sql/pull/2650))
+
+### Refactoring
+* Refactor SparkQueryDispatcher ([#2636](https://github.com/opensearch-project/sql/pull/2636))
+* Refactor IndexDMLHandler and related classes ([#2644](https://github.com/opensearch-project/sql/pull/2644))
+* Introduce FlintIndexStateModelService ([#2658](https://github.com/opensearch-project/sql/pull/2658))
+* Add comments to async query handlers ([#2657](https://github.com/opensearch-project/sql/pull/2657))
+* Extract SessionStorageService and StatementStorageService ([#2665](https://github.com/opensearch-project/sql/pull/2665))
+* Make models free of XContent ([#2677](https://github.com/opensearch-project/sql/pull/2677))
+* Remove unneeded datasourceName parameters ([#2683](https://github.com/opensearch-project/sql/pull/2683))
+* Refactor data models to be generic to data storage ([#2687](https://github.com/opensearch-project/sql/pull/2687))
+* Provide a way to modify spark parameters ([#2691](https://github.com/opensearch-project/sql/pull/2691))
+* Change JobExecutionResponseReader to an interface ([#2693](https://github.com/opensearch-project/sql/pull/2693))
+* Abstract queryId generation ([#2695](https://github.com/opensearch-project/sql/pull/2695))
+* Introduce SessionConfigSupplier to abstract settings ([#2707](https://github.com/opensearch-project/sql/pull/2707))
+* Add accountId to data models ([#2709](https://github.com/opensearch-project/sql/pull/2709))
+* Pass down request context to data accessors ([#2715](https://github.com/opensearch-project/sql/pull/2715))
diff --git a/release-notes/opensearch-sql.release-notes-2.16.0.0.md b/release-notes/opensearch-sql.release-notes-2.16.0.0.md
new file mode 100644
index 0000000000..607d6e14dd
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.16.0.0.md
@@ -0,0 +1,39 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.16.0
+
+### Enhancements
+* Added Setting to Toggle Data Source Management Code Paths ([#2811](https://github.com/opensearch-project/sql/pull/2811))
+* Span in PPL statsByClause could be specified after fields ([#2810](https://github.com/opensearch-project/sql/pull/2810))
+* Updating Grammer changes same as main branch ([#2850](https://github.com/opensearch-project/sql/pull/2850))
+
+### Bug Fixes
+* Temp use of older nodejs version before moving to Almalinux8 ([#2816](https://github.com/opensearch-project/sql/pull/2816))
+* Fix yaml errors causing checks not to be run ([#2823](https://github.com/opensearch-project/sql/pull/2823))
+* Well format the raw response when query parameter "pretty" enabled ([#2829](https://github.com/opensearch-project/sql/pull/2829))
+* Add support for custom date format and openSearch date format for date fields as part of Lucene query ([#2762](https://github.com/opensearch-project/sql/pull/2762))
+* Fix SparkExecutionEngineConfigClusterSetting deserialize issue ([#2838](https://github.com/opensearch-project/sql/pull/2838))
+* Fix SparkSubmitParameterModifier issue ([#2837](https://github.com/opensearch-project/sql/pull/2837))
+
+### Infrastructure
+* Increment version to 2.16.0-SNAPSHOT ([#2743](https://github.com/opensearch-project/sql/pull/2743))
+* Fix checkout action failure ([#2819](https://github.com/opensearch-project/sql/pull/2819))
+* Fix MacOS workflow failure ([#2831](https://github.com/opensearch-project/sql/pull/2831))
+
+### Refactoring
+* Change DataSourceType from enum to class ([#2746](https://github.com/opensearch-project/sql/pull/2746))
+* Fix code style issue ([#2745](https://github.com/opensearch-project/sql/pull/2745))
+* Scaffold async-query-core and async-query module ([#2751](https://github.com/opensearch-project/sql/pull/2751))
+* Move classes from spark to async-query-core and async-query ([#2750](https://github.com/opensearch-project/sql/pull/2750))
+* Exclude integ-test, doctest and download task when built offline ([#2763](https://github.com/opensearch-project/sql/pull/2763))
+* Abstract metrics to reduce dependency to legacy ([#2768](https://github.com/opensearch-project/sql/pull/2768))
+* Remove AsyncQueryId ([#2769](https://github.com/opensearch-project/sql/pull/2769))
+* Add README to async-query-core ([#2770](https://github.com/opensearch-project/sql/pull/2770))
+* Separate build and validateAndBuild method in DataSourceMetadata ([#2752](https://github.com/opensearch-project/sql/pull/2752))
+* Abstract FlintIndex client ([#2771](https://github.com/opensearch-project/sql/pull/2771))
+* Fix statement to store requested langType ([#2779](https://github.com/opensearch-project/sql/pull/2779))
+* Push down OpenSearch specific exception handling ([#2782](https://github.com/opensearch-project/sql/pull/2782))
+* Implement integration test for async-query-core ([#2785](https://github.com/opensearch-project/sql/pull/2785))
+* Fix SQLQueryUtils to extract multiple tables ([#2791](https://github.com/opensearch-project/sql/pull/2791))
+* Eliminate dependency from async-query-core to legacy ([#2792](https://github.com/opensearch-project/sql/pull/2792))
+* Pass accountId to EMRServerlessClientFactory.getClient ([#2822](https://github.com/opensearch-project/sql/pull/2822))
+* Register system index descriptors through SystemIndexPlugin.getSystemIndexDescriptors ([#2817](https://github.com/opensearch-project/sql/pull/2817))
+* Introduce SparkParameterComposerCollection ([#2824](https://github.com/opensearch-project/sql/pull/2824))
diff --git a/release-notes/opensearch-sql.release-notes-2.17.0.0.md b/release-notes/opensearch-sql.release-notes-2.17.0.0.md
new file mode 100644
index 0000000000..2282d71f94
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.17.0.0.md
@@ -0,0 +1,35 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.17.0
+
+### Features
+* Flint query scheduler part1 - integrate job scheduler plugin ([#2889](https://github.com/opensearch-project/sql/pull/2889))
+* Flint query scheduler part 2 ([#2975](https://github.com/opensearch-project/sql/pull/2975))
+* Add feature flag for async query scheduler ([#2989](https://github.com/opensearch-project/sql/pull/2989))
+
+### Enhancements
+* Change the default value of plugins.query.size_limit to MAX_RESULT_WINDOW (10000) ([#2877](https://github.com/opensearch-project/sql/pull/2877))
+* Support common format geo point ([#2896](https://github.com/opensearch-project/sql/pull/2896))
+* Add TakeOrderedOperator ([#2906](https://github.com/opensearch-project/sql/pull/2906))
+* IF function should support complex predicates in PPL ([#2970](https://github.com/opensearch-project/sql/pull/2970))
+* Add flags for Iceberg and Lake Formation and Security Lake as a data source type ([#2978](https://github.com/opensearch-project/sql/pull/2978))
+* Adds validation to allow only flint queries and sql SELECT queries to security lake type datasource ([#2977](https://github.com/opensearch-project/sql/pull/2977))
+* Delegate Flint index vacuum operation to Spark ([#2995](https://github.com/opensearch-project/sql/pull/2995))
+
+### Bug Fixes
+* Restrict UDF functions ([#2884](https://github.com/opensearch-project/sql/pull/2884))
+* Update SqlBaseParser ([#2890](https://github.com/opensearch-project/sql/pull/2890))
+* Boolean function in PPL should be case insensitive ([#2842](https://github.com/opensearch-project/sql/pull/2842))
+* Fix SparkExecutionEngineConfigClusterSetting deserialize issue ([#2972](https://github.com/opensearch-project/sql/pull/2972))
+* Fix jobType for Batch and IndexDML query ([#2982](https://github.com/opensearch-project/sql/pull/2982))
+* Fix handler for existing query ([#2983](https://github.com/opensearch-project/sql/pull/2983))
+
+### Infrastructure
+* Increment version to 2.17.0-SNAPSHOT ([#2892](https://github.com/opensearch-project/sql/pull/2892))
+* Fix :integ-test:sqlBwcCluster#fullRestartClusterTask ([#2996](https://github.com/opensearch-project/sql/pull/2996))
+
+### Refactoring
+* Add RequestContext parameter to verifyDataSourceAccessAndGetRawMetada method ([#2872](https://github.com/opensearch-project/sql/pull/2872))
+* Add AsyncQueryRequestContext to QueryIdProvider parameter ([#2887](https://github.com/opensearch-project/sql/pull/2887))
+* Add AsyncQueryRequestContext to FlintIndexMetadataService/FlintIndexStateModelService ([#2885](https://github.com/opensearch-project/sql/pull/2885))
+* Add mvQuery attribute in IndexQueryDetails ([#2951](https://github.com/opensearch-project/sql/pull/2951))
+* Add AsyncQueryRequestContext to update/get in StatementStorageService ([#2953](https://github.com/opensearch-project/sql/pull/2953))
+* Extract validation logic from FlintIndexMetadataServiceImpl ([#2954](https://github.com/opensearch-project/sql/pull/2954))
diff --git a/release-notes/opensearch-sql.release-notes-2.5.0.0.md b/release-notes/opensearch-sql.release-notes-2.5.0.0.md
new file mode 100644
index 0000000000..69d9fe14fd
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.5.0.0.md
@@ -0,0 +1,91 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.5.0
+
+### Features
+
+### Refactoring
+* The SQL Plugin was rearranged into separate repositories ([#640](https://github.com/opensearch-project/sql/issues/640) [#1263](https://github.com/opensearch-project/sql/issues/1263))
+* Added SQL-Jdbc repository https://github.com/opensearch-project/sql-jdbc ([#964](https://github.com/opensearch-project/sql/issues/964))
+* Added SQL-Jdbc maven artifact as a dependency ([#2692](https://github.com/opensearch-project/opensearch-build/issues/2692))
+* Added SQL-Odbc repository https://github.com/opensearch-project/sql-odbc ([#965](https://github.com/opensearch-project/sql/issues/965))
+* Added SQL-Cli repository  https://github.com/opensearch-project/sql-cli ([#966](https://github.com/opensearch-project/sql/issues/966))
+* Added Workbench repository https://github.com/opensearch-project/dashboards-query-workbench ([#1266](https://github.com/opensearch-project/sql/issues/1266))
+
+### Enhancements
+
+* Add low-level create table and table exists API ([#834](https://github.com/opensearch-project/sql/issues/834))
+* Add time window and window assigner ([#950](https://github.com/opensearch-project/sql/issues/950))
+* Add valueOf() to Expression ([#1055](https://github.com/opensearch-project/sql/issues/1055))
+* Add Statement, QueryExecution and QueryManager ([#845](https://github.com/opensearch-project/sql/issues/845))
+* Add Streaming Source Impl ([#994](https://github.com/opensearch-project/sql/issues/994))
+* Add watermark generator ([#959](https://github.com/opensearch-project/sql/issues/959))
+* Add stream context and window trigger ([#958](https://github.com/opensearch-project/sql/issues/958))
+* Add micro batch streaming execution ([#1044](https://github.com/opensearch-project/sql/pull/1044))
+* Add Streaming Plan Impl ([#1068](https://github.com/opensearch-project/sql/issues/1068))
+* Add CBRT to the V2 engine ([#1081](https://github.com/opensearch-project/sql/issues/1081))
+* Add CBRT function to the PPL ([#1097](https://github.com/opensearch-project/sql/issues/1097))
+* Add timeout option to SQL CLI tool. ([#1076](https://github.com/opensearch-project/sql/issues/1076))
+* Add Day_Of_Year Function To OpenSearch ([#1128](https://github.com/opensearch-project/sql/issues/1128))
+* Add Week_Of_Year Function To OpenSearch ([#1127](https://github.com/opensearch-project/sql/issues/1127))
+* Add Month_Of_Year Function To OpenSearch ([#1129](https://github.com/opensearch-project/sql/issues/1129))
+* Add Minute_Of_Day Function To SQL Plugin ([#1207](https://github.com/opensearch-project/sql/issues/1207) [#1214](https://github.com/opensearch-project/sql/issues/1214))
+* Add Second_Of_Minute Function As An Alias Of The Second Function ([#1231](https://github.com/opensearch-project/sql/issues/1231) [#1237](https://github.com/opensearch-project/sql/issues/1237))
+* Add Support For Legacy Syntax For Match Function In New Engine ([#1090](https://github.com/opensearch-project/sql/issues/1090))
+* Add MatchPhraseQuery As Alternate Syntax for Match_Phrase Function ([#1103](https://github.com/opensearch-project/sql/issues/1103))
+* Use query execution start time as the value of now-like functions. ([#1047](https://github.com/opensearch-project/sql/issues/1047))
+* Add Support for Alternate Legacy MULTIMATCH syntax ([#1102](https://github.com/opensearch-project/sql/issues/1102))
+* Add position() function to V2 engine  ([#1121](https://github.com/opensearch-project/sql/issues/1121))
+* Add position() string function to PPL ([#1147](https://github.com/opensearch-project/sql/issues/1147))
+* Add support for wildcard_query function to the new engine ([#156](https://github.com/opensearch-project/sql/issues/156) [#1108](https://github.com/opensearch-project/sql/issues/1108))
+* Add reverse() string function to V2 SQL Engine([#1154](https://github.com/opensearch-project/sql/issues/1154))
+* Add table write operator and builder ([#1094](https://github.com/opensearch-project/sql/issues/1094))
+* Add BETWEEN expression in v2 engine ([#1163](https://github.com/opensearch-project/sql/issues/1163))
+* Adding UTC_DATE, UTC_TIME, UTC_TIMESTAMP ([#1193](https://github.com/opensearch-project/sql/issues/1193) [#1198](https://github.com/opensearch-project/sql/issues/1198))
+* Validate field and fields parameters in relevance search functions ([#1067](https://github.com/opensearch-project/sql/issues/1067) [#1199](https://github.com/opensearch-project/sql/issues/1199))
+* Add `TIMEDIFF` and `DATEDIFF` functions. ([#131](https://github.com/opensearch-project/sql/issues/131) [#1195](https://github.com/opensearch-project/sql/issues/1195) [#1234](https://github.com/opensearch-project/sql/issues/1234))
+* Add functions `ADDTIME` and `SUBTIME`. ([#132](https://github.com/opensearch-project/sql/issues/132) [#1194](https://github.com/opensearch-project/sql/issues/1194) [#1252](https://github.com/opensearch-project/sql/issues/1252))
+* Add Day_Of_Week Function As An Alias Of DayOfWeek ([#190](https://github.com/opensearch-project/sql/issues/190) [#1228](https://github.com/opensearch-project/sql/issues/1228) [#1239](https://github.com/opensearch-project/sql/issues/1239))
+* Add Minute_Of_Hour Function As An Alias Of Minute Function ([#1253](https://github.com/opensearch-project/sql/issues/1253))
+* Add support for long value return for CEIL, CEILING and FLOOR math functions ([#1205](https://github.com/opensearch-project/sql/issues/1205))
+* Add Alternate Syntax For Match_Query And Other Functions ([#1166](https://github.com/opensearch-project/sql/issues/1166))
+* Add Support For `TIME` Type in DAY_OF_YEAR Functions ([#199](https://github.com/opensearch-project/sql/issues/199) [#1223](https://github.com/opensearch-project/sql/issues/1223) [1#258](https://github.com/opensearch-project/sql/issues/1258))
+* Add Day_Of_Month Function As An Alias Of DayOfMonth ([#1227](https://github.com/opensearch-project/sql/issues/1227) [#1265](https://github.com/opensearch-project/sql/issues/1265))
+* Add security patch for CVE-2020-15250 ([#1095](https://github.com/opensearch-project/sql/issues/1095))
+* Add security patch for CVE-2022-45868 ([#1107](https://github.com/opensearch-project/sql/issues/1107))
+* Add Hour_Of_Day Function As An Alias Of Hour ([#1226](https://github.com/opensearch-project/sql/issues/1226) [#1270](https://github.com/opensearch-project/sql/issues/1270))
+
+### Bug Fixes
+
+* Fix `FLOAT` -> `DOUBLE` cast. ([#1025](https://github.com/opensearch-project/sql/issues/1025))
+* Fix error messaging from prometheus. ([#1029](https://github.com/opensearch-project/sql/issues/1029) [#1037](https://github.com/opensearch-project/sql/issues/1037))
+* Add `query` function as alternate syntax to `query_string` function ([#1010](https://github.com/opensearch-project/sql/issues/1010))
+* Deprecate span collector ([#990](https://github.com/opensearch-project/sql/issues/990))
+* back quote fix ([#1041](https://github.com/opensearch-project/sql/issues/1041) [#1050](https://github.com/opensearch-project/sql/issues/1050))
+* Update DATE and TIME functions to parse string input as datetime ([#991](https://github.com/opensearch-project/sql/issues/991))
+* Integ tests fix for arm64 ([#1069](https://github.com/opensearch-project/sql/issues/1069))
+* Fix history file usage in SQL CLI tool. ([#1077](https://github.com/opensearch-project/sql/issues/1077))
+* Update Jackson to 2.14.1 and fix dependency resolution issues ([#1150](https://github.com/opensearch-project/sql/issues/1150))
+* Change LIKE operator case-insensitive match ([#1160](https://github.com/opensearch-project/sql/issues/1160))
+* Fix arithmetic operator precedence ([#1172](https://github.com/opensearch-project/sql/issues/1172) [#1188](https://github.com/opensearch-project/sql/issues/1188))
+* Fix back quoted alias of FROM subquery ([#1189](https://github.com/opensearch-project/sql/issues/1189) [#1208](https://github.com/opensearch-project/sql/issues/1208))
+* Fix truncate function ([#1197](https://github.com/opensearch-project/sql/issues/1197) [#1213](https://github.com/opensearch-project/sql/issues/1213))
+* Allow common keywords and scalar function name used as identifier ([#1191](https://github.com/opensearch-project/sql/issues/1191) [#1212](https://github.com/opensearch-project/sql/issues/1212))
+* Suppress report uploading failure in CI. ([#1180](https://github.com/opensearch-project/sql/issues/1180) [#1220](https://github.com/opensearch-project/sql/issues/1220))
+* Fixed error with single timestamp query ([#1244](https://github.com/opensearch-project/sql/issues/1244) [#1246](https://github.com/opensearch-project/sql/issues/1246) [#1249](https://github.com/opensearch-project/sql/issues/1249))
+* Support JOIN query on object field with unexpanded name ([#1229](https://github.com/opensearch-project/sql/issues/1229) [#1250](https://github.com/opensearch-project/sql/issues/1250))
+* Bug fix for less than and greater than operators on @timestamp ([#1267](https://github.com/opensearch-project/sql/issues/1267) [#1272](https://github.com/opensearch-project/sql/issues/1267)) 
+
+### Infrastructure
+
+* Change ApplicationContext lifecycle to per node level ([#822](https://github.com/opensearch-project/sql/issues/822))
+* Catalog to Datasource changes ([#1027](https://github.com/opensearch-project/sql/issues/1027) [#1049](https://github.com/opensearch-project/sql/issues/1049) [#1086](https://github.com/opensearch-project/sql/issues/1086))
+* Bump jackson to 2.14.0 ([#1058](https://github.com/opensearch-project/sql/issues/1058))
+* Add metadatalog interface and default in memory implementation ([#974](https://github.com/opensearch-project/sql/issues/974))
+* Decouple function repository and DSL from IoC container for use anywhere ([#1085](https://github.com/opensearch-project/sql/issues/1085))
+* Move DataSourceServiceImpl to core module ([#1084](https://github.com/opensearch-project/sql/issues/1084))
+* Improve pushdown optimization and logical to physical transformation ([#1091](https://github.com/opensearch-project/sql/issues/1091))
+* Using jackson and jackson_databind version defined in OpenSearch ([#1169](https://github.com/opensearch-project/sql/issues/1169) [#1173](https://github.com/opensearch-project/sql/issues/1173))
+* Add BWC tests for running against distribution bundle.  ([#1209](https://github.com/opensearch-project/sql/issues/1209))
+
+### Documentation
+* Support opensearch-sql:run and update developer_guide doc ([#1099](https://github.com/opensearch-project/sql/issues/1099))
+* Updated MAINTAINERS.md to match recommended opensearch-project format. ([#1224](https://github.com/opensearch-project/sql/issues/1224) [#1233](https://github.com/opensearch-project/sql/issues/1233))
diff --git a/release-notes/opensearch-sql.release-notes-2.6.0.0.md b/release-notes/opensearch-sql.release-notes-2.6.0.0.md
new file mode 100644
index 0000000000..9fbf56750d
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.6.0.0.md
@@ -0,0 +1,42 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.6.0
+
+### Enhancements
+
+* Extend comparison methods to accept different datetime types ([#1196](https://github.com/opensearch-project/sql/pull/1196))
+* Enable concat() string function to support multiple string arguments ([#1279](https://github.com/opensearch-project/sql/pull/1279))
+* Add more keywords as identifier in PPL ([#1319](https://github.com/opensearch-project/sql/pull/1319))
+* Update DATE_ADD/ADDDATE and DATE_SUB/SUBDATE functions ([#1182](https://github.com/opensearch-project/sql/pull/1182))
+* Escape character support for string literals ([#1206](https://github.com/opensearch-project/sql/pull/1206))
+* Updated EXPM1() and Tests to New Engine ([#1334](https://github.com/opensearch-project/sql/pull/1334))
+* Update TIMESTAMP function implementation and signatures ([#1254](https://github.com/opensearch-project/sql/pull/1254))
+* Add GET_FORMAT Function To OpenSearch SQL Plugin ([#1299](https://github.com/opensearch-project/sql/pull/1299))
+* Add TIME_FORMAT() Function To SQL Plugin ([#1301](https://github.com/opensearch-project/sql/pull/1301))
+* Support More Formats For GET_FORMAT Function ([#1343](https://github.com/opensearch-project/sql/pull/1343))
+* Add last_day Function To OpenSearch SQL Plugin ([#1344](https://github.com/opensearch-project/sql/pull/1344))
+* Add WeekOfYear Function To OpenSearch ([#1345](https://github.com/opensearch-project/sql/pull/1345))
+
+### Bug Fixes
+
+* Allow literal in aggregation ([#1288](https://github.com/opensearch-project/sql/pull/1288))
+* Datetime aggregation fixes ([#1061](https://github.com/opensearch-project/sql/pull/1061))
+* Modified returning NaN to NULL ([#1341](https://github.com/opensearch-project/sql/pull/1341))
+* Fix index not found reported as server error bug ([#1353](https://github.com/opensearch-project/sql/pull/1353))
+
+### Infrastructure
+
+* Upgrade sqlite to 3.32.3.3 ([#1283](https://github.com/opensearch-project/sql/pull/1283))
+* Add publish snapshots to maven via GHA ([#1359](https://github.com/opensearch-project/sql/pull/1359))
+* Added untriaged issue workflow ([#1338](https://github.com/opensearch-project/sql/pull/1338))
+* Create custom integ test file for sql plugin ([#1330](https://github.com/opensearch-project/sql/pull/1330))
+* Fix IT according to OpenSearch changes ([#1326](https://github.com/opensearch-project/sql/pull/1326))
+* Fix ArgumentCaptor can't capture varargs ([#1320](https://github.com/opensearch-project/sql/pull/1320))
+* Added Correctness Tests For Date And Time Functions ([#1298](https://github.com/opensearch-project/sql/pull/1298))
+* Update usage of Strings.toString ([#1309](https://github.com/opensearch-project/sql/pull/1309))
+* Update link checker CI workflow. ([#1304](https://github.com/opensearch-project/sql/pull/1304))
+* Add micro benchmark by JMH ([#1278](https://github.com/opensearch-project/sql/pull/1278))
+* Move PiTest to a new workflow. ([#1285](https://github.com/opensearch-project/sql/pull/1285))
+* Adding mutation testing to build gradle with PiTest ([#1204](https://github.com/opensearch-project/sql/pull/1204))
+
+### Documentation
+* Reorganize development docs ([#1200](https://github.com/opensearch-project/sql/pull/1200))
+* Remove obsolete links from README ([#1303](https://github.com/opensearch-project/sql/pull/1303))
diff --git a/release-notes/opensearch-sql.release-notes-2.7.0.0.md b/release-notes/opensearch-sql.release-notes-2.7.0.0.md
new file mode 100644
index 0000000000..050ea70e80
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.7.0.0.md
@@ -0,0 +1,50 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.7.0
+
+### Features
+
+* Create datasource API (#1458) ([#1479](https://github.com/opensearch-project/sql/pull/1479))
+* REST API for GET,PUT and DELETE ([#1502](https://github.com/opensearch-project/sql/pull/1502))
+
+### Enhancements
+
+* [main]Changes in DataSourceService and DataSourceMetadataStorage interface ([#1414](https://github.com/opensearch-project/sql/pull/1414))
+* Added SINH function to V2 engine ([#1437](https://github.com/opensearch-project/sql/pull/1437))
+* Added RINT function to V2 engine  ([#1439](https://github.com/opensearch-project/sql/pull/1439))
+* Add `sec_to_time` Function To OpenSearch SQL ([#1438](https://github.com/opensearch-project/sql/pull/1438))
+* Add `WEEKDAY` Function to SQL Plugin ([#1440](https://github.com/opensearch-project/sql/pull/1440))
+* Add `YEARWEEK` Function To OpenSearch SQL ([#1445](https://github.com/opensearch-project/sql/pull/1445))
+* Add `EXTRACT` Function To OpenSearch SQL Plugin ([#1443](https://github.com/opensearch-project/sql/pull/1443))
+* Add `STR_TO_DATE` Function To The SQL Plugin ([#1444](https://github.com/opensearch-project/sql/pull/1444))
+* Add The `TO_SECONDS` Function To The SQL Plugin ([#1447](https://github.com/opensearch-project/sql/pull/1447))
+* Added Arithmetic functions to V2 engine ([#1448](https://github.com/opensearch-project/sql/pull/1448))
+* Added SIGNUM function to V2 engine ([#1442](https://github.com/opensearch-project/sql/pull/1442))
+* Add `TIMESTAMPADD` Function To OpenSearch SQL Plugin ([#1453](https://github.com/opensearch-project/sql/pull/1453))
+* Add `Timestampdiff` Function To OpenSearch SQL ([#1472](https://github.com/opensearch-project/sql/pull/1472))
+* Add Nested Support in Select Clause (#1490) ([#1518](https://github.com/opensearch-project/sql/pull/1518))
+* Fix null response from pow/power and added missing integration testing ([#1459](https://github.com/opensearch-project/sql/pull/1459))
+
+
+### Bug Fixes
+
+* Integ Test Refactoring ([#1383](https://github.com/opensearch-project/sql/pull/1383))
+* Exclude OpenSearch system index when IT cleanup ([#1381](https://github.com/opensearch-project/sql/pull/1381))
+* Ensure Nested Function Falls Back to Legacy Engine Where Not Supported ([#1549](https://github.com/opensearch-project/sql/pull/1549))
+
+### Documentation
+
+* Documentation and other papercuts for datasource api launch ([#1534](https://github.com/opensearch-project/sql/pull/1534))
+
+### Maintenance
+
+* Refactor AWSSigV4 auth to support different AWSCredentialProviders ([#1389](https://github.com/opensearch-project/sql/pull/1389))
+* [AUTO] Increment version to 2.7.0-SNAPSHOT ([#1368](https://github.com/opensearch-project/sql/pull/1368))
+* Update usage of Strings.toString ([#1404](https://github.com/opensearch-project/sql/pull/1404))
+* Deprecated Spring IoC and using Guice instead (#1177) ([#1410](https://github.com/opensearch-project/sql/pull/1410))
+* Bump backport version. ([#1009](https://github.com/opensearch-project/sql/pull/1009))
+* Resolve table function based on StorageEngine provided function resolver ([#1424](https://github.com/opensearch-project/sql/pull/1424))
+* Rework on `OpenSearchDataType`: parse, store and use mapping information ([#1455](https://github.com/opensearch-project/sql/pull/1455))
+* Update to account for XContent refactor in 2.x ([#1485](https://github.com/opensearch-project/sql/pull/1485))
+* Replace non-ASCII characters in code and docs. ([#1486](https://github.com/opensearch-project/sql/pull/1486))
+* Add publish snapshots to maven via GHA ([#1496](https://github.com/opensearch-project/sql/pull/1496))
+* Refactoring datasource changes to a new module. ([#1511](https://github.com/opensearch-project/sql/pull/1511))
+* #639: allow metadata fields and score opensearch function  (#228) ([#1509](https://github.com/opensearch-project/sql/pull/1509))
diff --git a/release-notes/opensearch-sql.release-notes-2.8.0.0.md b/release-notes/opensearch-sql.release-notes-2.8.0.0.md
new file mode 100644
index 0000000000..b7eeff664b
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.8.0.0.md
@@ -0,0 +1,37 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.8.0
+
+### Features
+
+* Support for pagination in v2 engine of SELECT * FROM <table> queries ([#1666](https://github.com/opensearch-project/sql/pull/1666))
+* Support Alternate Datetime Formats ([#1664](https://github.com/opensearch-project/sql/pull/1664))
+* Create new anonymizer for new engine ([#1665](https://github.com/opensearch-project/sql/pull/1665))
+* Add Support for Nested Function Use In WHERE Clause Predicate Expresion ([#1657](https://github.com/opensearch-project/sql/pull/1657))
+* Cross cluster search in PPL ([#1512](https://github.com/opensearch-project/sql/pull/1512))
+* Added COSH to V2 engine ([#1428](https://github.com/opensearch-project/sql/pull/1428))
+* REST API for GET,PUT and DELETE ([#1482](https://github.com/opensearch-project/sql/pull/1482))
+
+### Enhancements
+
+* Minor clean up of datetime and other classes ([#1310](https://github.com/opensearch-project/sql/pull/1310))
+* Add integration JDBC tests for cursor/fetch_size feature ([#1315](https://github.com/opensearch-project/sql/pull/1315))
+* Refactoring datasource changes to a new module. ([#1504](https://github.com/opensearch-project/sql/pull/1504))
+
+### Bug Fixes
+
+* Fixing bug where Nested functions used in WHERE, GROUP BY, HAVING, and ORDER BY clauses don't fallback to legacy engine. ([#1549](https://github.com/opensearch-project/sql/pull/1549))
+
+### Documentation
+
+* Add Nested Documentation for 2.7 Related Features ([#1620](https://github.com/opensearch-project/sql/pull/1620))
+* Update usage example doc for PPL cross-cluster search ([#1610](https://github.com/opensearch-project/sql/pull/1610))
+* Documentation and other papercuts for datasource api launch ([#1530](https://github.com/opensearch-project/sql/pull/1530))
+
+### Maintenance
+
+* Fix IT - address breaking changes from upstream. ([#1659](https://github.com/opensearch-project/sql/pull/1659))
+* Increment version to 2.8.0-SNAPSHOT ([#1552](https://github.com/opensearch-project/sql/pull/1552))
+* Backport maintainer list update to `2.x`. ([#1650](https://github.com/opensearch-project/sql/pull/1650))
+* Backport jackson and gradle update from #1580 to 2.x ([#1596](https://github.com/opensearch-project/sql/pull/1596))
+* adding reflections as a dependency ([#1559](https://github.com/opensearch-project/sql/pull/1596))
+* Bump org.json dependency version ([#1586](https://github.com/opensearch-project/sql/pull/1586))
+* Integ Test Fix ([#1541](https://github.com/opensearch-project/sql/pull/1541))
\ No newline at end of file
diff --git a/release-notes/opensearch-sql.release-notes-2.9.0.0.md b/release-notes/opensearch-sql.release-notes-2.9.0.0.md
new file mode 100644
index 0000000000..6bbdbf453f
--- /dev/null
+++ b/release-notes/opensearch-sql.release-notes-2.9.0.0.md
@@ -0,0 +1,45 @@
+Compatible with OpenSearch and OpenSearch Dashboards Version 2.9.0
+
+### Features
+
+* Enable Table Function and PromQL function ([#1719](https://github.com/opensearch-project/sql/pull/1719))
+* Add Spark connector ([#1780](https://github.com/opensearch-project/sql/pull/1780))
+
+### Enhancements
+
+* Pagination: Support WHERE clause, column list in SELECT clause and for functions and expressions in the query ([#1500](https://github.com/opensearch-project/sql/pull/1500))
+* Pagination: Support ORDER BY clauses and queries without FROM clause ([#1599](https://github.com/opensearch-project/sql/pull/1599))
+* Remove backticks on by field in stats ([#1728](https://github.com/opensearch-project/sql/pull/1728))
+* Support Array and ExprValue Parsing With Inner Hits ([#1737](https://github.com/opensearch-project/sql/pull/1737))
+* Add Support for Nested Function in Order By Clause ([#1789](https://github.com/opensearch-project/sql/pull/1789))
+* Add Support for Field Star in Nested Function ([#1773](https://github.com/opensearch-project/sql/pull/1773))
+* Guarantee datasource read api is strong consistent read (compatibility with segment replication) ([#1815](https://github.com/opensearch-project/sql/pull/1815))
+* Added new datetime functions and aliases to PPL ([#1807](https://github.com/opensearch-project/sql/pull/1807))
+* Support user-defined and incomplete date formats ([#1821](https://github.com/opensearch-project/sql/pull/1821))
+* Add _routing to SQL includes list ([#1771](https://github.com/opensearch-project/sql/pull/1771))
+* Disable read of plugins.query.datasources.encryption.masterkey from cluster settings GET API ([#1825](https://github.com/opensearch-project/sql/pull/1825))
+* Add EMR client to spark connector ([#1790](https://github.com/opensearch-project/sql/pull/1790))
+* Improved error codes in case of data source API security exception ([#1753](https://github.com/opensearch-project/sql/pull/1753))
+* Remove Default master encryption key from settings ([#1851](https://github.com/opensearch-project/sql/pull/1851))
+
+### Bug Fixes
+
+* Fixed bug of byte/short not handling 0 denominator in divide/modulus equations ([#1716](https://github.com/opensearch-project/sql/pull/1716))
+* Fix CSV/RAW output header being application/json rather than plain/text ([#1779](https://github.com/opensearch-project/sql/pull/1779))
+
+### Documentation
+
+* Updated documentation of round function return type ([#1725](https://github.com/opensearch-project/sql/pull/1725))
+* Updated `protocol.rst` with new wording for error message ([#1662](https://github.com/opensearch-project/sql/pull/1662))
+* Updated documentation for temporal data types ([#1826](https://github.com/opensearch-project/sql/pull/1826))
+
+### Infrastructure
+
+* stopPrometheus task in doctest build.gradle now runs upon project failure in startOpenSearch ([#1747](https://github.com/opensearch-project/sql/pull/1747))
+* Bump guava to 32.0.1 ([#1829](https://github.com/opensearch-project/sql/pull/1829))
+* Disable CrossClusterSearchIT test ([#1814](https://github.com/opensearch-project/sql/pull/1814))
+* Fix flakytest when tests.locale=tr ([#1827](https://github.com/opensearch-project/sql/pull/1827))
+
+### Refactoring
+
+* Simplify OpenSearchIndexScanBuilder ([#1738](https://github.com/opensearch-project/sql/pull/1738))
diff --git a/scripts/build.sh b/scripts/build.sh
deleted file mode 100755
index 4b2893f304..0000000000
--- a/scripts/build.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -ex
-
-function usage() {
-    echo "Usage: $0 [args]"
-    echo ""
-    echo "Arguments:"
-    echo -e "-v VERSION\t[Required] OpenSearch version."
-    echo -e "-q QUALIFIER\t[Optional] Version qualifier."
-    echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'."
-    echo -e "-p PLATFORM\t[Optional] Platform, ignored."
-    echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored."
-    echo -e "-o OUTPUT\t[Optional] Output path, default is 'artifacts'."
-    echo -e "-h help"
-}
-
-while getopts ":h:v:q:s:o:p:a:" arg; do
-    case $arg in
-        h)
-            usage
-            exit 1
-            ;;
-        v)
-            VERSION=$OPTARG
-            ;;
-        q)
-            QUALIFIER=$OPTARG
-            ;;
-        s)
-            SNAPSHOT=$OPTARG
-            ;;
-        o)
-            OUTPUT=$OPTARG
-            ;;
-        p)
-            PLATFORM=$OPTARG
-            ;;
-        a)
-            ARCHITECTURE=$OPTARG
-            ;;
-        :)
-            echo "Error: -${OPTARG} requires an argument"
-            usage
-            exit 1
-            ;;
-        ?)
-            echo "Invalid option: -${arg}"
-            exit 1
-            ;;
-    esac
-done
-
-if [ -z "$VERSION" ]; then
-    echo "Error: You must specify the OpenSearch version"
-    usage
-    exit 1
-fi
-
-[[ ! -z "$QUALIFIER" ]] && VERSION=$VERSION-$QUALIFIER
-[[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT
-[ -z "$OUTPUT" ] && OUTPUT=artifacts
-
-mkdir -p $OUTPUT
-
-./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER
-
-zipPath=$(find . -path \*build/distributions/*.zip)
-distributions="$(dirname "${zipPath}")"
-
-echo "COPY ${distributions}/*.zip"
-mkdir -p $OUTPUT/plugins
-cp ${distributions}/*.zip ./$OUTPUT/plugins
-
-./gradlew publishPluginZipPublicationToZipStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER
-mkdir -p $OUTPUT/maven/org/opensearch
-cp -r ./build/local-staging-repo/org/opensearch/. $OUTPUT/maven/org/opensearch
diff --git a/settings.gradle b/settings.gradle
index 7650959451..9cf1715335 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,14 +9,21 @@ rootProject.name = 'opensearch-sql'
 include 'opensearch-sql-plugin'
 project(':opensearch-sql-plugin').projectDir = file('plugin')
 include 'ppl'
-include 'integ-test'
 include 'common'
 include 'opensearch'
 include 'core'
 include 'protocol'
-include 'doctest'
 include 'legacy'
 include 'sql'
 include 'prometheus'
-include 'filesystem'
+include 'benchmarks'
+include 'datasources'
+include 'spark'
+include 'async-query-core'
+include 'async-query'
 
+// exclude integ-test/doctest in case of offline build since they need downloads
+if (!gradle.startParameter.offline) {
+    include 'integ-test'
+    include 'doctest'
+}
diff --git a/spark/build.gradle b/spark/build.gradle
new file mode 100644
index 0000000000..d9d5c96413
--- /dev/null
+++ b/spark/build.gradle
@@ -0,0 +1,88 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+plugins {
+    id 'java-library'
+    id "io.freefair.lombok"
+    id 'jacoco'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    api project(':core')
+    implementation project(':datasources')
+
+    implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
+    implementation group: 'org.json', name: 'json', version: '20231013'
+    api group: 'com.amazonaws', name: 'aws-java-sdk-emr', version: "${aws_java_sdk_version}"
+    api group: 'com.amazonaws', name: 'aws-java-sdk-emrserverless', version: "${aws_java_sdk_version}"
+    implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
+
+    testImplementation(platform("org.junit:junit-bom:5.9.3"))
+
+    testCompileOnly('org.junit.jupiter:junit-jupiter')
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.7.0'
+
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher") {
+        because 'allows tests to run from IDEs that bundle older version of launcher'
+    }
+}
+
+test {
+    useJUnitPlatform {
+        includeEngines("junit-jupiter")
+    }
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+    }
+}
+
+jacocoTestReport {
+    dependsOn test
+    executionData test
+    reports {
+        html.required = true
+        xml.required = true
+    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+        }))
+    }
+}
+
+jacocoTestCoverageVerification {
+    dependsOn test
+    executionData test
+    violationRules {
+        rule {
+            element = 'CLASS'
+            excludes = [
+                    'org.opensearch.sql.spark.data.constants.*',
+            ]
+            limit {
+                counter = 'LINE'
+                minimum = 1.0
+            }
+            limit {
+                counter = 'BRANCH'
+                minimum = 1.0
+            }
+        }
+    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+        }))
+    }
+}
+check.dependsOn jacocoTestCoverageVerification
+jacocoTestCoverageVerification.dependsOn jacocoTestReport
diff --git a/spark/src/main/java/org/opensearch/sql/spark/client/EmrClientImpl.java b/spark/src/main/java/org/opensearch/sql/spark/client/EmrClientImpl.java
new file mode 100644
index 0000000000..3ef911c8d8
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/client/EmrClientImpl.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.client;
+
+import static org.opensearch.sql.datasource.model.DataSourceMetadata.DEFAULT_RESULT_INDEX;
+
+import com.amazonaws.services.elasticmapreduce.AmazonElasticMapReduce;
+import com.amazonaws.services.elasticmapreduce.model.ActionOnFailure;
+import com.amazonaws.services.elasticmapreduce.model.AddJobFlowStepsRequest;
+import com.amazonaws.services.elasticmapreduce.model.AddJobFlowStepsResult;
+import com.amazonaws.services.elasticmapreduce.model.DescribeStepRequest;
+import com.amazonaws.services.elasticmapreduce.model.HadoopJarStepConfig;
+import com.amazonaws.services.elasticmapreduce.model.StepConfig;
+import com.amazonaws.services.elasticmapreduce.model.StepStatus;
+import com.google.common.annotations.VisibleForTesting;
+import java.io.IOException;
+import lombok.SneakyThrows;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONObject;
+import org.opensearch.sql.spark.helper.FlintHelper;
+import org.opensearch.sql.spark.response.SparkResponse;
+
+public class EmrClientImpl implements SparkClient {
+  // EMR-S will download JAR to local maven
+  public static final String SPARK_SQL_APPLICATION_JAR =
+      "file:///home/hadoop/.ivy2/jars/org.opensearch_opensearch-spark-sql-application_2.12-0.3.0-SNAPSHOT.jar";
+
+  private final AmazonElasticMapReduce emr;
+  private final String emrCluster;
+  private final FlintHelper flint;
+  private final String sparkApplicationJar;
+  private static final Logger logger = LogManager.getLogger(EmrClientImpl.class);
+  private SparkResponse sparkResponse;
+
+  /**
+   * Constructor for EMR Client Implementation.
+   *
+   * @param emr EMR helper
+   * @param flint Opensearch args for flint integration jar
+   * @param sparkResponse Response object to help with retrieving results from Opensearch index
+   */
+  public EmrClientImpl(
+      AmazonElasticMapReduce emr,
+      String emrCluster,
+      FlintHelper flint,
+      SparkResponse sparkResponse,
+      String sparkApplicationJar) {
+    this.emr = emr;
+    this.emrCluster = emrCluster;
+    this.flint = flint;
+    this.sparkResponse = sparkResponse;
+    this.sparkApplicationJar =
+        sparkApplicationJar == null ? SPARK_SQL_APPLICATION_JAR : sparkApplicationJar;
+  }
+
+  @Override
+  public JSONObject sql(String query) throws IOException {
+    runEmrApplication(query);
+    return sparkResponse.getResultFromOpensearchIndex();
+  }
+
+  @VisibleForTesting
+  void runEmrApplication(String query) {
+
+    HadoopJarStepConfig stepConfig =
+        new HadoopJarStepConfig()
+            .withJar("command-runner.jar")
+            .withArgs(
+                "spark-submit",
+                "--class",
+                "org.opensearch.sql.SQLJob",
+                "--jars",
+                flint.getFlintIntegrationJar(),
+                sparkApplicationJar,
+                query,
+                DEFAULT_RESULT_INDEX,
+                flint.getFlintHost(),
+                flint.getFlintPort(),
+                flint.getFlintScheme(),
+                flint.getFlintAuth(),
+                flint.getFlintRegion());
+
+    StepConfig emrstep =
+        new StepConfig()
+            .withName("Spark Application")
+            .withActionOnFailure(ActionOnFailure.CONTINUE)
+            .withHadoopJarStep(stepConfig);
+
+    AddJobFlowStepsRequest request =
+        new AddJobFlowStepsRequest().withJobFlowId(emrCluster).withSteps(emrstep);
+
+    AddJobFlowStepsResult result = emr.addJobFlowSteps(request);
+    logger.info("EMR step ID: " + result.getStepIds());
+
+    String stepId = result.getStepIds().get(0);
+    DescribeStepRequest stepRequest =
+        new DescribeStepRequest().withClusterId(emrCluster).withStepId(stepId);
+
+    waitForStepExecution(stepRequest);
+    sparkResponse.setValue(stepId);
+  }
+
+  @SneakyThrows
+  private void waitForStepExecution(DescribeStepRequest stepRequest) {
+    // Wait for the step to complete
+    boolean completed = false;
+    while (!completed) {
+      // Get the step status
+      StepStatus statusDetail = emr.describeStep(stepRequest).getStep().getStatus();
+      // Check if the step has completed
+      if (statusDetail.getState().equals("COMPLETED")) {
+        completed = true;
+        logger.info("EMR step completed successfully.");
+      } else if (statusDetail.getState().equals("FAILED")
+          || statusDetail.getState().equals("CANCELLED")) {
+        logger.error("EMR step failed or cancelled.");
+        throw new RuntimeException("Spark SQL application failed.");
+      } else {
+        // Sleep for some time before checking the status again
+        Thread.sleep(2500);
+      }
+    }
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/client/SparkClient.java b/spark/src/main/java/org/opensearch/sql/spark/client/SparkClient.java
new file mode 100644
index 0000000000..b38f04680b
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/client/SparkClient.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.client;
+
+import java.io.IOException;
+import org.json.JSONObject;
+
+/** Interface class for Spark Client. */
+public interface SparkClient {
+  /**
+   * This method executes spark sql query.
+   *
+   * @param query spark sql query
+   * @return spark query response
+   */
+  JSONObject sql(String query) throws IOException;
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/data/type/SparkDataType.java b/spark/src/main/java/org/opensearch/sql/spark/data/type/SparkDataType.java
new file mode 100644
index 0000000000..5d36492d72
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/data/type/SparkDataType.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.data.type;
+
+import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.data.type.ExprType;
+
+/** Wrapper of spark data type */
+@EqualsAndHashCode
+@RequiredArgsConstructor
+public class SparkDataType implements ExprType {
+
+  /** Spark datatype name. */
+  private final String typeName;
+
+  @Override
+  public String typeName() {
+    return typeName;
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/data/value/SparkExprValue.java b/spark/src/main/java/org/opensearch/sql/spark/data/value/SparkExprValue.java
new file mode 100644
index 0000000000..1d5f6296a7
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/data/value/SparkExprValue.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.data.value;
+
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.data.model.AbstractExprValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.spark.data.type.SparkDataType;
+
+/** SparkExprValue hold spark query response value. */
+@RequiredArgsConstructor
+public class SparkExprValue extends AbstractExprValue {
+
+  private final SparkDataType type;
+  private final Object value;
+
+  @Override
+  public Object value() {
+    return value;
+  }
+
+  @Override
+  public ExprType type() {
+    return type;
+  }
+
+  @Override
+  public int compare(ExprValue other) {
+    throw new UnsupportedOperationException("SparkExprValue is not comparable");
+  }
+
+  @Override
+  public boolean equal(ExprValue other) {
+    return value.equals(other.value());
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/functions/implementation/SparkSqlFunctionImplementation.java b/spark/src/main/java/org/opensearch/sql/spark/functions/implementation/SparkSqlFunctionImplementation.java
new file mode 100644
index 0000000000..914aa80085
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/functions/implementation/SparkSqlFunctionImplementation.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.functions.implementation;
+
+import static org.opensearch.sql.spark.functions.resolver.SparkSqlTableFunctionResolver.QUERY;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.exception.ExpressionEvaluationException;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.FunctionExpression;
+import org.opensearch.sql.expression.NamedArgumentExpression;
+import org.opensearch.sql.expression.env.Environment;
+import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.expression.function.TableFunctionImplementation;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.request.SparkQueryRequest;
+import org.opensearch.sql.spark.storage.SparkTable;
+import org.opensearch.sql.storage.Table;
+
+/** Spark SQL function implementation. */
+public class SparkSqlFunctionImplementation extends FunctionExpression
+    implements TableFunctionImplementation {
+
+  private final FunctionName functionName;
+  private final List<Expression> arguments;
+  private final SparkClient sparkClient;
+
+  /**
+   * Constructor for spark sql function.
+   *
+   * @param functionName name of the function
+   * @param arguments a list of expressions
+   * @param sparkClient spark client
+   */
+  public SparkSqlFunctionImplementation(
+      FunctionName functionName, List<Expression> arguments, SparkClient sparkClient) {
+    super(functionName, arguments);
+    this.functionName = functionName;
+    this.arguments = arguments;
+    this.sparkClient = sparkClient;
+  }
+
+  @Override
+  public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) {
+    throw new UnsupportedOperationException(
+        String.format(
+            "Spark defined function [%s] is only "
+                + "supported in SOURCE clause with spark connector catalog",
+            functionName));
+  }
+
+  @Override
+  public ExprType type() {
+    return ExprCoreType.STRUCT;
+  }
+
+  @Override
+  public String toString() {
+    List<String> args =
+        arguments.stream()
+            .map(
+                arg ->
+                    String.format(
+                        "%s=%s",
+                        ((NamedArgumentExpression) arg).getArgName(),
+                        ((NamedArgumentExpression) arg).getValue().toString()))
+            .collect(Collectors.toList());
+    return String.format("%s(%s)", functionName, String.join(", ", args));
+  }
+
+  @Override
+  public Table applyArguments() {
+    return new SparkTable(sparkClient, buildQueryFromSqlFunction(arguments));
+  }
+
+  /**
+   * This method builds a spark query request.
+   *
+   * @param arguments spark sql function arguments
+   * @return spark query request
+   */
+  private SparkQueryRequest buildQueryFromSqlFunction(List<Expression> arguments) {
+
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    arguments.forEach(
+        arg -> {
+          String argName = ((NamedArgumentExpression) arg).getArgName();
+          Expression argValue = ((NamedArgumentExpression) arg).getValue();
+          ExprValue literalValue = argValue.valueOf();
+          if (argName.equals(QUERY)) {
+            sparkQueryRequest.setSql((String) literalValue.value());
+          } else {
+            throw new ExpressionEvaluationException(
+                String.format("Invalid Function Argument:%s", argName));
+          }
+        });
+    return sparkQueryRequest;
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/functions/resolver/SparkSqlTableFunctionResolver.java b/spark/src/main/java/org/opensearch/sql/spark/functions/resolver/SparkSqlTableFunctionResolver.java
new file mode 100644
index 0000000000..a4f2a6c0fe
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/functions/resolver/SparkSqlTableFunctionResolver.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.functions.resolver;
+
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+
+import java.util.ArrayList;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.NamedArgumentExpression;
+import org.opensearch.sql.expression.function.FunctionBuilder;
+import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.expression.function.FunctionResolver;
+import org.opensearch.sql.expression.function.FunctionSignature;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.functions.implementation.SparkSqlFunctionImplementation;
+
+/** Function resolver for sql function of spark connector. */
+@RequiredArgsConstructor
+public class SparkSqlTableFunctionResolver implements FunctionResolver {
+  private final SparkClient sparkClient;
+
+  public static final String SQL = "sql";
+  public static final String QUERY = "query";
+
+  @Override
+  public Pair<FunctionSignature, FunctionBuilder> resolve(FunctionSignature unresolvedSignature) {
+    FunctionName functionName = FunctionName.of(SQL);
+    FunctionSignature functionSignature = new FunctionSignature(functionName, List.of(STRING));
+    final List<String> argumentNames = List.of(QUERY);
+
+    FunctionBuilder functionBuilder =
+        (functionProperties, arguments) -> {
+          Boolean argumentsPassedByName =
+              arguments.stream()
+                  .noneMatch(
+                      arg -> StringUtils.isEmpty(((NamedArgumentExpression) arg).getArgName()));
+          Boolean argumentsPassedByPosition =
+              arguments.stream()
+                  .allMatch(
+                      arg -> StringUtils.isEmpty(((NamedArgumentExpression) arg).getArgName()));
+          if (!(argumentsPassedByName || argumentsPassedByPosition)) {
+            throw new SemanticCheckException(
+                "Arguments should be either passed by name or position");
+          }
+
+          if (arguments.size() != argumentNames.size()) {
+            throw new SemanticCheckException(
+                String.format(
+                    "Missing arguments:[%s]",
+                    String.join(
+                        ",", argumentNames.subList(arguments.size(), argumentNames.size()))));
+          }
+
+          if (argumentsPassedByPosition) {
+            List<Expression> namedArguments = new ArrayList<>();
+            for (int i = 0; i < arguments.size(); i++) {
+              namedArguments.add(
+                  new NamedArgumentExpression(
+                      argumentNames.get(i),
+                      ((NamedArgumentExpression) arguments.get(i)).getValue()));
+            }
+            return new SparkSqlFunctionImplementation(functionName, namedArguments, sparkClient);
+          }
+          return new SparkSqlFunctionImplementation(functionName, arguments, sparkClient);
+        };
+    return Pair.of(functionSignature, functionBuilder);
+  }
+
+  @Override
+  public FunctionName getFunctionName() {
+    return FunctionName.of(SQL);
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/functions/response/DefaultSparkSqlFunctionResponseHandle.java b/spark/src/main/java/org/opensearch/sql/spark/functions/response/DefaultSparkSqlFunctionResponseHandle.java
new file mode 100644
index 0000000000..8a571d1dda
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/functions/response/DefaultSparkSqlFunctionResponseHandle.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.functions.response;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.opensearch.sql.data.model.ExprBooleanValue;
+import org.opensearch.sql.data.model.ExprByteValue;
+import org.opensearch.sql.data.model.ExprDoubleValue;
+import org.opensearch.sql.data.model.ExprFloatValue;
+import org.opensearch.sql.data.model.ExprIntegerValue;
+import org.opensearch.sql.data.model.ExprLongValue;
+import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprShortValue;
+import org.opensearch.sql.data.model.ExprStringValue;
+import org.opensearch.sql.data.model.ExprTimestampValue;
+import org.opensearch.sql.data.model.ExprTupleValue;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.spark.data.type.SparkDataType;
+import org.opensearch.sql.spark.data.value.SparkExprValue;
+
+/** Default implementation of SparkSqlFunctionResponseHandle. */
+public class DefaultSparkSqlFunctionResponseHandle implements SparkSqlFunctionResponseHandle {
+  private Iterator<ExprValue> responseIterator;
+  private ExecutionEngine.Schema schema;
+  private static final Logger logger =
+      LogManager.getLogger(DefaultSparkSqlFunctionResponseHandle.class);
+
+  /**
+   * Constructor.
+   *
+   * @param responseObject Spark responseObject.
+   */
+  public DefaultSparkSqlFunctionResponseHandle(JSONObject responseObject) {
+    constructIteratorAndSchema(responseObject);
+  }
+
+  private void constructIteratorAndSchema(JSONObject responseObject) {
+    List<ExprValue> result = new ArrayList<>();
+    List<ExecutionEngine.Schema.Column> columnList;
+    JSONObject items = responseObject.getJSONObject("data");
+    columnList = getColumnList(items.getJSONArray("schema"));
+    for (int i = 0; i < items.getJSONArray("result").length(); i++) {
+      JSONObject row =
+          new JSONObject(items.getJSONArray("result").get(i).toString().replace("'", "\""));
+      LinkedHashMap<String, ExprValue> linkedHashMap = extractRow(row, columnList);
+      result.add(new ExprTupleValue(linkedHashMap));
+    }
+    this.schema = new ExecutionEngine.Schema(columnList);
+    this.responseIterator = result.iterator();
+  }
+
+  private static LinkedHashMap<String, ExprValue> extractRow(
+      JSONObject row, List<ExecutionEngine.Schema.Column> columnList) {
+    LinkedHashMap<String, ExprValue> linkedHashMap = new LinkedHashMap<>();
+    for (ExecutionEngine.Schema.Column column : columnList) {
+      ExprType type = column.getExprType();
+      if (!row.has(column.getName())) {
+        linkedHashMap.put(column.getName(), ExprNullValue.of());
+      } else {
+        if (type == ExprCoreType.BOOLEAN) {
+          linkedHashMap.put(
+              column.getName(), ExprBooleanValue.of(row.getBoolean(column.getName())));
+        } else if (type == ExprCoreType.LONG) {
+          linkedHashMap.put(column.getName(), new ExprLongValue(row.getLong(column.getName())));
+        } else if (type == ExprCoreType.INTEGER) {
+          linkedHashMap.put(column.getName(), new ExprIntegerValue(row.getInt(column.getName())));
+        } else if (type == ExprCoreType.SHORT) {
+          linkedHashMap.put(column.getName(), new ExprShortValue(row.getInt(column.getName())));
+        } else if (type == ExprCoreType.BYTE) {
+          linkedHashMap.put(column.getName(), new ExprByteValue(row.getInt(column.getName())));
+        } else if (type == ExprCoreType.DOUBLE) {
+          linkedHashMap.put(column.getName(), new ExprDoubleValue(row.getDouble(column.getName())));
+        } else if (type == ExprCoreType.FLOAT) {
+          linkedHashMap.put(column.getName(), new ExprFloatValue(row.getFloat(column.getName())));
+        } else if (type == ExprCoreType.DATE) {
+          // TODO :: correct this to ExprTimestampValue
+          linkedHashMap.put(column.getName(), new ExprStringValue(row.getString(column.getName())));
+        } else if (type == ExprCoreType.TIMESTAMP) {
+          linkedHashMap.put(
+              column.getName(), new ExprTimestampValue(row.getString(column.getName())));
+        } else if (type == ExprCoreType.STRING) {
+          linkedHashMap.put(column.getName(), new ExprStringValue(row.getString(column.getName())));
+        } else {
+          // SparkDataType
+          Object jsonValue = row.get(column.getName());
+          Object value = jsonValue;
+          if (jsonValue instanceof JSONObject) {
+            value = ((JSONObject) jsonValue).toMap();
+          } else if (jsonValue instanceof JSONArray) {
+            value = ((JSONArray) jsonValue).toList();
+          }
+          linkedHashMap.put(column.getName(), new SparkExprValue((SparkDataType) type, value));
+        }
+      }
+    }
+
+    return linkedHashMap;
+  }
+
+  private List<ExecutionEngine.Schema.Column> getColumnList(JSONArray schema) {
+    List<ExecutionEngine.Schema.Column> columnList = new ArrayList<>();
+    for (int i = 0; i < schema.length(); i++) {
+      JSONObject column = new JSONObject(schema.get(i).toString().replace("'", "\""));
+      columnList.add(
+          new ExecutionEngine.Schema.Column(
+              column.get("column_name").toString(),
+              column.get("column_name").toString(),
+              getDataType(column.get("data_type").toString())));
+    }
+    return columnList;
+  }
+
+  private ExprType getDataType(String sparkType) {
+    switch (sparkType) {
+      case "boolean":
+        return ExprCoreType.BOOLEAN;
+      case "long":
+        return ExprCoreType.LONG;
+      case "integer":
+        return ExprCoreType.INTEGER;
+      case "short":
+        return ExprCoreType.SHORT;
+      case "byte":
+        return ExprCoreType.BYTE;
+      case "double":
+        return ExprCoreType.DOUBLE;
+      case "float":
+        return ExprCoreType.FLOAT;
+      case "timestamp":
+        return ExprCoreType.DATE;
+      case "date":
+        return ExprCoreType.TIMESTAMP;
+      case "string":
+        return ExprCoreType.STRING;
+      default:
+        return new SparkDataType(sparkType);
+    }
+  }
+
+  @Override
+  public boolean hasNext() {
+    return responseIterator.hasNext();
+  }
+
+  @Override
+  public ExprValue next() {
+    return responseIterator.next();
+  }
+
+  @Override
+  public ExecutionEngine.Schema schema() {
+    return schema;
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/functions/response/SparkSqlFunctionResponseHandle.java b/spark/src/main/java/org/opensearch/sql/spark/functions/response/SparkSqlFunctionResponseHandle.java
new file mode 100644
index 0000000000..a9be484712
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/functions/response/SparkSqlFunctionResponseHandle.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.functions.response;
+
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.executor.ExecutionEngine;
+
+/** Handle Spark response. */
+public interface SparkSqlFunctionResponseHandle {
+
+  /** Return true if Spark response has more result. */
+  boolean hasNext();
+
+  /**
+   * Return Spark response as {@link ExprValue}. Attention, the method must been called when hasNext
+   * return true.
+   */
+  ExprValue next();
+
+  /** Return ExecutionEngine.Schema of the Spark response. */
+  ExecutionEngine.Schema schema();
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/functions/scan/SparkSqlFunctionTableScanBuilder.java b/spark/src/main/java/org/opensearch/sql/spark/functions/scan/SparkSqlFunctionTableScanBuilder.java
new file mode 100644
index 0000000000..aea8f72f36
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/functions/scan/SparkSqlFunctionTableScanBuilder.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.functions.scan;
+
+import lombok.AllArgsConstructor;
+import org.opensearch.sql.planner.logical.LogicalProject;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.request.SparkQueryRequest;
+import org.opensearch.sql.storage.TableScanOperator;
+import org.opensearch.sql.storage.read.TableScanBuilder;
+
+/** TableScanBuilder for sql function of spark connector. */
+@AllArgsConstructor
+public class SparkSqlFunctionTableScanBuilder extends TableScanBuilder {
+
+  private final SparkClient sparkClient;
+
+  private final SparkQueryRequest sparkQueryRequest;
+
+  @Override
+  public TableScanOperator build() {
+    return new SparkSqlFunctionTableScanOperator(sparkClient, sparkQueryRequest);
+  }
+
+  @Override
+  public boolean pushDownProject(LogicalProject project) {
+    return true;
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/functions/scan/SparkSqlFunctionTableScanOperator.java b/spark/src/main/java/org/opensearch/sql/spark/functions/scan/SparkSqlFunctionTableScanOperator.java
new file mode 100644
index 0000000000..a2e44affd5
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/functions/scan/SparkSqlFunctionTableScanOperator.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.functions.scan;
+
+import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Locale;
+import lombok.RequiredArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONObject;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.functions.response.DefaultSparkSqlFunctionResponseHandle;
+import org.opensearch.sql.spark.functions.response.SparkSqlFunctionResponseHandle;
+import org.opensearch.sql.spark.request.SparkQueryRequest;
+import org.opensearch.sql.storage.TableScanOperator;
+
+/** This a table scan operator to handle sql table function. */
+@RequiredArgsConstructor
+public class SparkSqlFunctionTableScanOperator extends TableScanOperator {
+  private final SparkClient sparkClient;
+  private final SparkQueryRequest request;
+  private SparkSqlFunctionResponseHandle sparkResponseHandle;
+  private static final Logger LOG = LogManager.getLogger();
+
+  @Override
+  public void open() {
+    super.open();
+    this.sparkResponseHandle =
+        AccessController.doPrivileged(
+            (PrivilegedAction<SparkSqlFunctionResponseHandle>)
+                () -> {
+                  try {
+                    JSONObject responseObject = sparkClient.sql(request.getSql());
+                    return new DefaultSparkSqlFunctionResponseHandle(responseObject);
+                  } catch (IOException e) {
+                    LOG.error(e.getMessage());
+                    throw new RuntimeException(
+                        String.format("Error fetching data from spark server: %s", e.getMessage()));
+                  }
+                });
+  }
+
+  @Override
+  public boolean hasNext() {
+    return this.sparkResponseHandle.hasNext();
+  }
+
+  @Override
+  public ExprValue next() {
+    return this.sparkResponseHandle.next();
+  }
+
+  @Override
+  public String explain() {
+    return String.format(Locale.ROOT, "sql(%s)", request.getSql());
+  }
+
+  @Override
+  public ExecutionEngine.Schema schema() {
+    return this.sparkResponseHandle.schema();
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/helper/FlintHelper.java b/spark/src/main/java/org/opensearch/sql/spark/helper/FlintHelper.java
new file mode 100644
index 0000000000..206ff4aed4
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/helper/FlintHelper.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.helper;
+
+import lombok.Getter;
+
+public class FlintHelper {
+  // TODO should be replaced with mvn jar.
+  public static final String FLINT_INTEGRATION_JAR =
+      "s3://spark-datasource/flint-spark-integration-assembly-0.3.0-SNAPSHOT.jar";
+  public static final String FLINT_DEFAULT_HOST = "localhost";
+  public static final String FLINT_DEFAULT_PORT = "9200";
+  public static final String FLINT_DEFAULT_SCHEME = "http";
+  public static final String FLINT_DEFAULT_AUTH = "noauth";
+  public static final String FLINT_DEFAULT_REGION = "us-west-2";
+
+  @Getter private final String flintIntegrationJar;
+  @Getter private final String flintHost;
+  @Getter private final String flintPort;
+  @Getter private final String flintScheme;
+  @Getter private final String flintAuth;
+  @Getter private final String flintRegion;
+
+  /**
+   * Arguments required to write data to opensearch index using flint integration.
+   *
+   * @param flintHost Opensearch host for flint
+   * @param flintPort Opensearch port for flint integration
+   * @param flintScheme Opensearch scheme for flint integration
+   * @param flintAuth Opensearch auth for flint integration
+   * @param flintRegion Opensearch region for flint integration
+   */
+  public FlintHelper(
+      String flintIntegrationJar,
+      String flintHost,
+      String flintPort,
+      String flintScheme,
+      String flintAuth,
+      String flintRegion) {
+    this.flintIntegrationJar =
+        flintIntegrationJar == null ? FLINT_INTEGRATION_JAR : flintIntegrationJar;
+    this.flintHost = flintHost != null ? flintHost : FLINT_DEFAULT_HOST;
+    this.flintPort = flintPort != null ? flintPort : FLINT_DEFAULT_PORT;
+    this.flintScheme = flintScheme != null ? flintScheme : FLINT_DEFAULT_SCHEME;
+    this.flintAuth = flintAuth != null ? flintAuth : FLINT_DEFAULT_AUTH;
+    this.flintRegion = flintRegion != null ? flintRegion : FLINT_DEFAULT_REGION;
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/request/SparkQueryRequest.java b/spark/src/main/java/org/opensearch/sql/spark/request/SparkQueryRequest.java
new file mode 100644
index 0000000000..94c9795161
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/request/SparkQueryRequest.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.request;
+
+import lombok.Data;
+
+/** Spark query request. */
+@Data
+public class SparkQueryRequest {
+
+  /** SQL. */
+  private String sql;
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/response/SparkResponse.java b/spark/src/main/java/org/opensearch/sql/spark/response/SparkResponse.java
new file mode 100644
index 0000000000..e225804043
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/response/SparkResponse.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.response;
+
+import static org.opensearch.sql.datasource.model.DataSourceMetadata.DEFAULT_RESULT_INDEX;
+
+import com.google.common.annotations.VisibleForTesting;
+import lombok.Data;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONObject;
+import org.opensearch.ResourceNotFoundException;
+import org.opensearch.action.DocWriteResponse;
+import org.opensearch.action.delete.DeleteRequest;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.client.Client;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.builder.SearchSourceBuilder;
+
+@Data
+public class SparkResponse {
+  private final Client client;
+  private String value;
+  private final String field;
+  private static final Logger LOG = LogManager.getLogger();
+
+  /**
+   * Response for spark sql query.
+   *
+   * @param client Opensearch client
+   * @param value Identifier field value
+   * @param field Identifier field name
+   */
+  public SparkResponse(Client client, String value, String field) {
+    this.client = client;
+    this.value = value;
+    this.field = field;
+  }
+
+  public JSONObject getResultFromOpensearchIndex() {
+    return searchInSparkIndex(QueryBuilders.termQuery(field, value));
+  }
+
+  private JSONObject searchInSparkIndex(QueryBuilder query) {
+    SearchRequest searchRequest = new SearchRequest();
+    searchRequest.indices(DEFAULT_RESULT_INDEX);
+    SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+    searchSourceBuilder.query(query);
+    searchRequest.source(searchSourceBuilder);
+    ActionFuture<SearchResponse> searchResponseActionFuture;
+    try {
+      searchResponseActionFuture = client.search(searchRequest);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+    SearchResponse searchResponse = searchResponseActionFuture.actionGet();
+    if (searchResponse.status().getStatus() != 200) {
+      throw new RuntimeException(
+          "Fetching result from "
+              + DEFAULT_RESULT_INDEX
+              + " index failed with status : "
+              + searchResponse.status());
+    } else {
+      JSONObject data = new JSONObject();
+      for (SearchHit searchHit : searchResponse.getHits().getHits()) {
+        data.put("data", searchHit.getSourceAsMap());
+        deleteInSparkIndex(searchHit.getId());
+      }
+      return data;
+    }
+  }
+
+  @VisibleForTesting
+  void deleteInSparkIndex(String id) {
+    DeleteRequest deleteRequest = new DeleteRequest(DEFAULT_RESULT_INDEX);
+    deleteRequest.id(id);
+    ActionFuture<DeleteResponse> deleteResponseActionFuture;
+    try {
+      deleteResponseActionFuture = client.delete(deleteRequest);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+    DeleteResponse deleteResponse = deleteResponseActionFuture.actionGet();
+    if (deleteResponse.getResult().equals(DocWriteResponse.Result.DELETED)) {
+      LOG.debug("Spark result successfully deleted ", id);
+    } else if (deleteResponse.getResult().equals(DocWriteResponse.Result.NOT_FOUND)) {
+      throw new ResourceNotFoundException("Spark result with id " + id + " doesn't exist");
+    } else {
+      throw new RuntimeException(
+          "Deleting spark result information failed with : "
+              + deleteResponse.getResult().getLowercase());
+    }
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/storage/SparkScan.java b/spark/src/main/java/org/opensearch/sql/spark/storage/SparkScan.java
new file mode 100644
index 0000000000..395e1685a6
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/storage/SparkScan.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.storage;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.opensearch.sql.data.model.ExprValue;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.request.SparkQueryRequest;
+import org.opensearch.sql.storage.TableScanOperator;
+
+/** Spark scan operator. */
+@EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = false)
+@ToString(onlyExplicitlyIncluded = true)
+public class SparkScan extends TableScanOperator {
+
+  private final SparkClient sparkClient;
+
+  @EqualsAndHashCode.Include @Getter @Setter @ToString.Include private SparkQueryRequest request;
+
+  /**
+   * Constructor.
+   *
+   * @param sparkClient sparkClient.
+   */
+  public SparkScan(SparkClient sparkClient) {
+    this.sparkClient = sparkClient;
+    this.request = new SparkQueryRequest();
+  }
+
+  @Override
+  public boolean hasNext() {
+    return false;
+  }
+
+  @Override
+  public ExprValue next() {
+    return null;
+  }
+
+  @Override
+  public String explain() {
+    return getRequest().toString();
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/storage/SparkStorageEngine.java b/spark/src/main/java/org/opensearch/sql/spark/storage/SparkStorageEngine.java
new file mode 100644
index 0000000000..84c9c05e79
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/storage/SparkStorageEngine.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.storage;
+
+import java.util.Collection;
+import java.util.Collections;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.sql.DataSourceSchemaName;
+import org.opensearch.sql.expression.function.FunctionResolver;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.functions.resolver.SparkSqlTableFunctionResolver;
+import org.opensearch.sql.storage.StorageEngine;
+import org.opensearch.sql.storage.Table;
+
+/** Spark storage engine implementation. */
+@RequiredArgsConstructor
+public class SparkStorageEngine implements StorageEngine {
+  private final SparkClient sparkClient;
+
+  @Override
+  public Collection<FunctionResolver> getFunctions() {
+    return Collections.singletonList(new SparkSqlTableFunctionResolver(sparkClient));
+  }
+
+  @Override
+  public Table getTable(DataSourceSchemaName dataSourceSchemaName, String tableName) {
+    throw new RuntimeException("Unable to get table from storage engine.");
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/storage/SparkStorageFactory.java b/spark/src/main/java/org/opensearch/sql/spark/storage/SparkStorageFactory.java
new file mode 100644
index 0000000000..4495eb0fac
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/storage/SparkStorageFactory.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.storage;
+
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.elasticmapreduce.AmazonElasticMapReduce;
+import com.amazonaws.services.elasticmapreduce.AmazonElasticMapReduceClientBuilder;
+import java.security.AccessController;
+import java.security.InvalidParameterException;
+import java.security.PrivilegedAction;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.opensearch.client.Client;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.datasources.auth.AuthenticationType;
+import org.opensearch.sql.spark.client.EmrClientImpl;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.helper.FlintHelper;
+import org.opensearch.sql.spark.response.SparkResponse;
+import org.opensearch.sql.storage.DataSourceFactory;
+import org.opensearch.sql.storage.StorageEngine;
+
+/** Storage factory implementation for spark connector. */
+@RequiredArgsConstructor
+public class SparkStorageFactory implements DataSourceFactory {
+  private final Client client;
+  private final Settings settings;
+
+  public static final String EMR = "emr";
+  public static final String STEP_ID_FIELD = "stepId.keyword";
+  // Spark datasource configuration properties
+  public static final String CONNECTOR_TYPE = "spark.connector";
+  public static final String SPARK_SQL_APPLICATION = "spark.sql.application";
+
+  // EMR configuration properties
+  public static final String EMR_CLUSTER = "emr.cluster";
+  public static final String EMR_AUTH_TYPE = "emr.auth.type";
+  public static final String EMR_REGION = "emr.auth.region";
+  public static final String EMR_ACCESS_KEY = "emr.auth.access_key";
+  public static final String EMR_SECRET_KEY = "emr.auth.secret_key";
+
+  // Flint integration jar configuration properties
+  public static final String FLINT_INTEGRATION = "spark.datasource.flint.integration";
+  public static final String FLINT_HOST = "spark.datasource.flint.host";
+  public static final String FLINT_PORT = "spark.datasource.flint.port";
+  public static final String FLINT_SCHEME = "spark.datasource.flint.scheme";
+  public static final String FLINT_AUTH = "spark.datasource.flint.auth";
+  public static final String FLINT_REGION = "spark.datasource.flint.region";
+
+  @Override
+  public DataSourceType getDataSourceType() {
+    return DataSourceType.SPARK;
+  }
+
+  @Override
+  public DataSource createDataSource(DataSourceMetadata metadata) {
+    return new DataSource(
+        metadata.getName(), DataSourceType.SPARK, getStorageEngine(metadata.getProperties()));
+  }
+
+  /**
+   * This function gets spark storage engine.
+   *
+   * @param requiredConfig spark config options
+   * @return spark storage engine object
+   */
+  StorageEngine getStorageEngine(Map<String, String> requiredConfig) {
+    SparkClient sparkClient;
+    if (requiredConfig.get(CONNECTOR_TYPE).equals(EMR)) {
+      sparkClient =
+          AccessController.doPrivileged(
+              (PrivilegedAction<EmrClientImpl>)
+                  () -> {
+                    validateEMRConfigProperties(requiredConfig);
+                    return new EmrClientImpl(
+                        getEMRClient(
+                            requiredConfig.get(EMR_ACCESS_KEY),
+                            requiredConfig.get(EMR_SECRET_KEY),
+                            requiredConfig.get(EMR_REGION)),
+                        requiredConfig.get(EMR_CLUSTER),
+                        new FlintHelper(
+                            requiredConfig.get(FLINT_INTEGRATION),
+                            requiredConfig.get(FLINT_HOST),
+                            requiredConfig.get(FLINT_PORT),
+                            requiredConfig.get(FLINT_SCHEME),
+                            requiredConfig.get(FLINT_AUTH),
+                            requiredConfig.get(FLINT_REGION)),
+                        new SparkResponse(client, null, STEP_ID_FIELD),
+                        requiredConfig.get(SPARK_SQL_APPLICATION));
+                  });
+    } else {
+      throw new InvalidParameterException("Spark connector type is invalid.");
+    }
+    return new SparkStorageEngine(sparkClient);
+  }
+
+  private void validateEMRConfigProperties(Map<String, String> dataSourceMetadataConfig)
+      throws IllegalArgumentException {
+    if (dataSourceMetadataConfig.get(EMR_CLUSTER) == null
+        || dataSourceMetadataConfig.get(EMR_AUTH_TYPE) == null) {
+      throw new IllegalArgumentException("EMR config properties are missing.");
+    } else if (dataSourceMetadataConfig
+            .get(EMR_AUTH_TYPE)
+            .equals(AuthenticationType.AWSSIGV4AUTH.getName())
+        && (dataSourceMetadataConfig.get(EMR_ACCESS_KEY) == null
+            || dataSourceMetadataConfig.get(EMR_SECRET_KEY) == null)) {
+      throw new IllegalArgumentException("EMR auth keys are missing.");
+    } else if (!dataSourceMetadataConfig
+        .get(EMR_AUTH_TYPE)
+        .equals(AuthenticationType.AWSSIGV4AUTH.getName())) {
+      throw new IllegalArgumentException("Invalid auth type.");
+    }
+  }
+
+  private AmazonElasticMapReduce getEMRClient(
+      String emrAccessKey, String emrSecretKey, String emrRegion) {
+    return AmazonElasticMapReduceClientBuilder.standard()
+        .withCredentials(
+            new AWSStaticCredentialsProvider(new BasicAWSCredentials(emrAccessKey, emrSecretKey)))
+        .withRegion(emrRegion)
+        .build();
+  }
+}
diff --git a/spark/src/main/java/org/opensearch/sql/spark/storage/SparkTable.java b/spark/src/main/java/org/opensearch/sql/spark/storage/SparkTable.java
new file mode 100644
index 0000000000..731c3df672
--- /dev/null
+++ b/spark/src/main/java/org/opensearch/sql/spark/storage/SparkTable.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.storage;
+
+import java.util.HashMap;
+import java.util.Map;
+import lombok.Getter;
+import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.planner.DefaultImplementor;
+import org.opensearch.sql.planner.logical.LogicalPlan;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.functions.scan.SparkSqlFunctionTableScanBuilder;
+import org.opensearch.sql.spark.request.SparkQueryRequest;
+import org.opensearch.sql.storage.Table;
+import org.opensearch.sql.storage.read.TableScanBuilder;
+
+/** Spark table implementation. This can be constructed from SparkQueryRequest. */
+public class SparkTable implements Table {
+
+  private final SparkClient sparkClient;
+
+  @Getter private final SparkQueryRequest sparkQueryRequest;
+
+  /** Constructor for entire Sql Request. */
+  public SparkTable(SparkClient sparkService, SparkQueryRequest sparkQueryRequest) {
+    this.sparkClient = sparkService;
+    this.sparkQueryRequest = sparkQueryRequest;
+  }
+
+  @Override
+  public boolean exists() {
+    throw new UnsupportedOperationException(
+        "Exists operation is not supported in spark datasource");
+  }
+
+  @Override
+  public void create(Map<String, ExprType> schema) {
+    throw new UnsupportedOperationException(
+        "Create operation is not supported in spark datasource");
+  }
+
+  @Override
+  public Map<String, ExprType> getFieldTypes() {
+    return new HashMap<>();
+  }
+
+  @Override
+  public PhysicalPlan implement(LogicalPlan plan) {
+    SparkScan metricScan = new SparkScan(sparkClient);
+    metricScan.setRequest(sparkQueryRequest);
+    return plan.accept(new DefaultImplementor<SparkScan>(), metricScan);
+  }
+
+  @Override
+  public TableScanBuilder createScanBuilder() {
+    return new SparkSqlFunctionTableScanBuilder(sparkClient, sparkQueryRequest);
+  }
+}
diff --git a/spark/src/main/resources/query_execution_request_mapping.yml b/spark/src/main/resources/query_execution_request_mapping.yml
new file mode 100644
index 0000000000..682534d338
--- /dev/null
+++ b/spark/src/main/resources/query_execution_request_mapping.yml
@@ -0,0 +1,44 @@
+---
+##
+# Copyright OpenSearch Contributors
+# SPDX-License-Identifier: Apache-2.0
+##
+
+# Schema file for the .ql-job-metadata index
+# Also "dynamic" is set to "false" so that other fields can be added.
+dynamic: false
+properties:
+  version:
+    type: keyword
+  type:
+    type: keyword
+  state:
+    type: keyword
+  statementId:
+    type: keyword
+  applicationId:
+    type: keyword
+  sessionId:
+    type: keyword
+  sessionType:
+    type: keyword
+  error:
+    type: text
+  lang:
+    type: keyword
+  query:
+    type: text
+  dataSourceName:
+    type: keyword
+  submitTime:
+    type: date
+    format: strict_date_time||epoch_millis
+  jobId:
+    type: keyword
+  lastUpdateTime:
+    type: date
+    format: strict_date_time||epoch_millis
+  queryId:
+    type: keyword
+  excludeJobIds:
+    type: keyword
diff --git a/spark/src/main/resources/query_execution_request_settings.yml b/spark/src/main/resources/query_execution_request_settings.yml
new file mode 100644
index 0000000000..da2bf07bf1
--- /dev/null
+++ b/spark/src/main/resources/query_execution_request_settings.yml
@@ -0,0 +1,11 @@
+---
+##
+# Copyright OpenSearch Contributors
+# SPDX-License-Identifier: Apache-2.0
+##
+
+# Settings file for the .ql-job-metadata index
+index:
+  number_of_shards: "1"
+  auto_expand_replicas: "0-2"
+  number_of_replicas: "0"
diff --git a/spark/src/test/java/org/opensearch/sql/spark/client/EmrClientImplTest.java b/spark/src/test/java/org/opensearch/sql/spark/client/EmrClientImplTest.java
new file mode 100644
index 0000000000..93dc0d6bc8
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/client/EmrClientImplTest.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.client;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.spark.constants.TestConstants.EMR_CLUSTER_ID;
+import static org.opensearch.sql.spark.constants.TestConstants.QUERY;
+import static org.opensearch.sql.spark.utils.TestUtils.getJson;
+
+import com.amazonaws.services.elasticmapreduce.AmazonElasticMapReduce;
+import com.amazonaws.services.elasticmapreduce.model.AddJobFlowStepsResult;
+import com.amazonaws.services.elasticmapreduce.model.DescribeStepResult;
+import com.amazonaws.services.elasticmapreduce.model.Step;
+import com.amazonaws.services.elasticmapreduce.model.StepStatus;
+import lombok.SneakyThrows;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.spark.helper.FlintHelper;
+import org.opensearch.sql.spark.response.SparkResponse;
+
+@ExtendWith(MockitoExtension.class)
+public class EmrClientImplTest {
+
+  @Mock private AmazonElasticMapReduce emr;
+  @Mock private FlintHelper flint;
+  @Mock private SparkResponse sparkResponse;
+
+  @Test
+  @SneakyThrows
+  void testRunEmrApplication() {
+    AddJobFlowStepsResult addStepsResult = new AddJobFlowStepsResult().withStepIds(EMR_CLUSTER_ID);
+    when(emr.addJobFlowSteps(any())).thenReturn(addStepsResult);
+
+    StepStatus stepStatus = new StepStatus();
+    stepStatus.setState("COMPLETED");
+    Step step = new Step();
+    step.setStatus(stepStatus);
+    DescribeStepResult describeStepResult = new DescribeStepResult();
+    describeStepResult.setStep(step);
+    when(emr.describeStep(any())).thenReturn(describeStepResult);
+
+    EmrClientImpl emrClientImpl =
+        new EmrClientImpl(emr, EMR_CLUSTER_ID, flint, sparkResponse, null);
+    emrClientImpl.runEmrApplication(QUERY);
+  }
+
+  @Test
+  @SneakyThrows
+  void testRunEmrApplicationFailed() {
+    AddJobFlowStepsResult addStepsResult = new AddJobFlowStepsResult().withStepIds(EMR_CLUSTER_ID);
+    when(emr.addJobFlowSteps(any())).thenReturn(addStepsResult);
+
+    StepStatus stepStatus = new StepStatus();
+    stepStatus.setState("FAILED");
+    Step step = new Step();
+    step.setStatus(stepStatus);
+    DescribeStepResult describeStepResult = new DescribeStepResult();
+    describeStepResult.setStep(step);
+    when(emr.describeStep(any())).thenReturn(describeStepResult);
+
+    EmrClientImpl emrClientImpl =
+        new EmrClientImpl(emr, EMR_CLUSTER_ID, flint, sparkResponse, null);
+    RuntimeException exception =
+        Assertions.assertThrows(
+            RuntimeException.class, () -> emrClientImpl.runEmrApplication(QUERY));
+    Assertions.assertEquals("Spark SQL application failed.", exception.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testRunEmrApplicationCancelled() {
+    AddJobFlowStepsResult addStepsResult = new AddJobFlowStepsResult().withStepIds(EMR_CLUSTER_ID);
+    when(emr.addJobFlowSteps(any())).thenReturn(addStepsResult);
+
+    StepStatus stepStatus = new StepStatus();
+    stepStatus.setState("CANCELLED");
+    Step step = new Step();
+    step.setStatus(stepStatus);
+    DescribeStepResult describeStepResult = new DescribeStepResult();
+    describeStepResult.setStep(step);
+    when(emr.describeStep(any())).thenReturn(describeStepResult);
+
+    EmrClientImpl emrClientImpl =
+        new EmrClientImpl(emr, EMR_CLUSTER_ID, flint, sparkResponse, null);
+    RuntimeException exception =
+        Assertions.assertThrows(
+            RuntimeException.class, () -> emrClientImpl.runEmrApplication(QUERY));
+    Assertions.assertEquals("Spark SQL application failed.", exception.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testRunEmrApplicationRunnning() {
+    AddJobFlowStepsResult addStepsResult = new AddJobFlowStepsResult().withStepIds(EMR_CLUSTER_ID);
+    when(emr.addJobFlowSteps(any())).thenReturn(addStepsResult);
+
+    StepStatus runningStatus = new StepStatus();
+    runningStatus.setState("RUNNING");
+    Step runningStep = new Step();
+    runningStep.setStatus(runningStatus);
+    DescribeStepResult runningDescribeStepResult = new DescribeStepResult();
+    runningDescribeStepResult.setStep(runningStep);
+
+    StepStatus completedStatus = new StepStatus();
+    completedStatus.setState("COMPLETED");
+    Step completedStep = new Step();
+    completedStep.setStatus(completedStatus);
+    DescribeStepResult completedDescribeStepResult = new DescribeStepResult();
+    completedDescribeStepResult.setStep(completedStep);
+
+    when(emr.describeStep(any()))
+        .thenReturn(runningDescribeStepResult)
+        .thenReturn(completedDescribeStepResult);
+
+    EmrClientImpl emrClientImpl =
+        new EmrClientImpl(emr, EMR_CLUSTER_ID, flint, sparkResponse, null);
+    emrClientImpl.runEmrApplication(QUERY);
+  }
+
+  @Test
+  @SneakyThrows
+  void testSql() {
+    AddJobFlowStepsResult addStepsResult = new AddJobFlowStepsResult().withStepIds(EMR_CLUSTER_ID);
+    when(emr.addJobFlowSteps(any())).thenReturn(addStepsResult);
+
+    StepStatus runningStatus = new StepStatus();
+    runningStatus.setState("RUNNING");
+    Step runningStep = new Step();
+    runningStep.setStatus(runningStatus);
+    DescribeStepResult runningDescribeStepResult = new DescribeStepResult();
+    runningDescribeStepResult.setStep(runningStep);
+
+    StepStatus completedStatus = new StepStatus();
+    completedStatus.setState("COMPLETED");
+    Step completedStep = new Step();
+    completedStep.setStatus(completedStatus);
+    DescribeStepResult completedDescribeStepResult = new DescribeStepResult();
+    completedDescribeStepResult.setStep(completedStep);
+
+    when(emr.describeStep(any()))
+        .thenReturn(runningDescribeStepResult)
+        .thenReturn(completedDescribeStepResult);
+    when(sparkResponse.getResultFromOpensearchIndex())
+        .thenReturn(new JSONObject(getJson("select_query_response.json")));
+
+    EmrClientImpl emrClientImpl =
+        new EmrClientImpl(emr, EMR_CLUSTER_ID, flint, sparkResponse, null);
+    emrClientImpl.sql(QUERY);
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/constants/TestConstants.java b/spark/src/test/java/org/opensearch/sql/spark/constants/TestConstants.java
new file mode 100644
index 0000000000..09a3163d98
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/constants/TestConstants.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.constants;
+
+public class TestConstants {
+  public static final String QUERY = "select 1";
+  public static final String TEST_DATASOURCE_NAME = "test_datasource_name";
+  public static final String EMR_CLUSTER_ID = "j-123456789";
+  public static final String EMR_JOB_ID = "job-123xxx";
+  public static final String EMRS_APPLICATION_ID = "app-xxxxx";
+  public static final String EMRS_EXECUTION_ROLE = "execution_role";
+  public static final String EMRS_DATASOURCE_ROLE = "datasource_role";
+  public static final String EMRS_JOB_NAME = "job_name";
+  public static final String SPARK_SUBMIT_PARAMETERS = "--conf org.flint.sql.SQLJob";
+  public static final String TEST_CLUSTER_NAME = "TEST_CLUSTER";
+  public static final String MOCK_SESSION_ID = "s-0123456";
+  public static final String MOCK_STATEMENT_ID = "st-0123456";
+  public static final String ENTRY_POINT_START_JAR =
+      "file:///home/hadoop/.ivy2/jars/org.opensearch_opensearch-spark-sql-application_2.12-0.3.0-SNAPSHOT.jar";
+  public static final String DEFAULT_RESULT_INDEX = "query_execution_result_ds1";
+  public static final String US_EAST_REGION = "us-east-1";
+  public static final String US_WEST_REGION = "us-west-1";
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/data/type/SparkDataTypeTest.java b/spark/src/test/java/org/opensearch/sql/spark/data/type/SparkDataTypeTest.java
new file mode 100644
index 0000000000..ff6cee2a5e
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/data/type/SparkDataTypeTest.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.data.type;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+class SparkDataTypeTest {
+  @Test
+  public void testTypeName() {
+    SparkDataType sparkDataType = new SparkDataType("TYPE_NAME");
+
+    assertEquals("TYPE_NAME", sparkDataType.typeName());
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/data/value/SparkExprValueTest.java b/spark/src/test/java/org/opensearch/sql/spark/data/value/SparkExprValueTest.java
new file mode 100644
index 0000000000..e58f240f5c
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/data/value/SparkExprValueTest.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.data.value;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.spark.data.type.SparkDataType;
+
+class SparkExprValueTest {
+  @Test
+  public void type() {
+    assertEquals(
+        new SparkDataType("char"), new SparkExprValue(new SparkDataType("char"), "str").type());
+  }
+
+  @Test
+  public void unsupportedCompare() {
+    SparkDataType type = new SparkDataType("char");
+
+    assertThrows(
+        UnsupportedOperationException.class,
+        () -> new SparkExprValue(type, "str").compare(new SparkExprValue(type, "str")));
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlFunctionImplementationTest.java b/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlFunctionImplementationTest.java
new file mode 100644
index 0000000000..120747e0d3
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlFunctionImplementationTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.functions;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.opensearch.sql.spark.constants.TestConstants.QUERY;
+
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.exception.ExpressionEvaluationException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.functions.implementation.SparkSqlFunctionImplementation;
+import org.opensearch.sql.spark.request.SparkQueryRequest;
+import org.opensearch.sql.spark.storage.SparkTable;
+
+@ExtendWith(MockitoExtension.class)
+public class SparkSqlFunctionImplementationTest {
+  @Mock private SparkClient client;
+
+  @Test
+  void testValueOfAndTypeToString() {
+    FunctionName functionName = new FunctionName("sql");
+    List<Expression> namedArgumentExpressionList =
+        List.of(DSL.namedArgument("query", DSL.literal(QUERY)));
+    SparkSqlFunctionImplementation sparkSqlFunctionImplementation =
+        new SparkSqlFunctionImplementation(functionName, namedArgumentExpressionList, client);
+    UnsupportedOperationException exception =
+        assertThrows(
+            UnsupportedOperationException.class, () -> sparkSqlFunctionImplementation.valueOf());
+    assertEquals(
+        "Spark defined function [sql] is only "
+            + "supported in SOURCE clause with spark connector catalog",
+        exception.getMessage());
+    assertEquals("sql(query=\"select 1\")", sparkSqlFunctionImplementation.toString());
+    assertEquals(ExprCoreType.STRUCT, sparkSqlFunctionImplementation.type());
+  }
+
+  @Test
+  void testApplyArguments() {
+    FunctionName functionName = new FunctionName("sql");
+    List<Expression> namedArgumentExpressionList =
+        List.of(DSL.namedArgument("query", DSL.literal(QUERY)));
+    SparkSqlFunctionImplementation sparkSqlFunctionImplementation =
+        new SparkSqlFunctionImplementation(functionName, namedArgumentExpressionList, client);
+    SparkTable sparkTable = (SparkTable) sparkSqlFunctionImplementation.applyArguments();
+    assertNotNull(sparkTable.getSparkQueryRequest());
+    SparkQueryRequest sparkQueryRequest = sparkTable.getSparkQueryRequest();
+    assertEquals(QUERY, sparkQueryRequest.getSql());
+  }
+
+  @Test
+  void testApplyArgumentsException() {
+    FunctionName functionName = new FunctionName("sql");
+    List<Expression> namedArgumentExpressionList =
+        List.of(
+            DSL.namedArgument("query", DSL.literal(QUERY)),
+            DSL.namedArgument("tmp", DSL.literal(12345)));
+    SparkSqlFunctionImplementation sparkSqlFunctionImplementation =
+        new SparkSqlFunctionImplementation(functionName, namedArgumentExpressionList, client);
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> sparkSqlFunctionImplementation.applyArguments());
+    assertEquals("Invalid Function Argument:tmp", exception.getMessage());
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlFunctionTableScanBuilderTest.java b/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlFunctionTableScanBuilderTest.java
new file mode 100644
index 0000000000..212056eb15
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlFunctionTableScanBuilderTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.functions;
+
+import static org.opensearch.sql.spark.constants.TestConstants.QUERY;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.opensearch.sql.planner.logical.LogicalProject;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.functions.scan.SparkSqlFunctionTableScanBuilder;
+import org.opensearch.sql.spark.functions.scan.SparkSqlFunctionTableScanOperator;
+import org.opensearch.sql.spark.request.SparkQueryRequest;
+import org.opensearch.sql.storage.TableScanOperator;
+
+public class SparkSqlFunctionTableScanBuilderTest {
+  @Mock private SparkClient sparkClient;
+
+  @Mock private LogicalProject logicalProject;
+
+  @Test
+  void testBuild() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+
+    SparkSqlFunctionTableScanBuilder sparkSqlFunctionTableScanBuilder =
+        new SparkSqlFunctionTableScanBuilder(sparkClient, sparkQueryRequest);
+    TableScanOperator sqlFunctionTableScanOperator = sparkSqlFunctionTableScanBuilder.build();
+    Assertions.assertTrue(
+        sqlFunctionTableScanOperator instanceof SparkSqlFunctionTableScanOperator);
+  }
+
+  @Test
+  void testPushProject() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+
+    SparkSqlFunctionTableScanBuilder sparkSqlFunctionTableScanBuilder =
+        new SparkSqlFunctionTableScanBuilder(sparkClient, sparkQueryRequest);
+    Assertions.assertTrue(sparkSqlFunctionTableScanBuilder.pushDownProject(logicalProject));
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlFunctionTableScanOperatorTest.java b/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlFunctionTableScanOperatorTest.java
new file mode 100644
index 0000000000..d44e3d271a
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlFunctionTableScanOperatorTest.java
@@ -0,0 +1,292 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.functions;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.data.model.ExprValueUtils.nullValue;
+import static org.opensearch.sql.data.model.ExprValueUtils.stringValue;
+import static org.opensearch.sql.spark.constants.TestConstants.QUERY;
+import static org.opensearch.sql.spark.utils.TestUtils.getJson;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import lombok.SneakyThrows;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.model.ExprBooleanValue;
+import org.opensearch.sql.data.model.ExprByteValue;
+import org.opensearch.sql.data.model.ExprDateValue;
+import org.opensearch.sql.data.model.ExprDoubleValue;
+import org.opensearch.sql.data.model.ExprFloatValue;
+import org.opensearch.sql.data.model.ExprIntegerValue;
+import org.opensearch.sql.data.model.ExprLongValue;
+import org.opensearch.sql.data.model.ExprNullValue;
+import org.opensearch.sql.data.model.ExprShortValue;
+import org.opensearch.sql.data.model.ExprStringValue;
+import org.opensearch.sql.data.model.ExprTimestampValue;
+import org.opensearch.sql.data.model.ExprTupleValue;
+import org.opensearch.sql.data.type.ExprCoreType;
+import org.opensearch.sql.executor.ExecutionEngine;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.data.type.SparkDataType;
+import org.opensearch.sql.spark.data.value.SparkExprValue;
+import org.opensearch.sql.spark.functions.scan.SparkSqlFunctionTableScanOperator;
+import org.opensearch.sql.spark.request.SparkQueryRequest;
+
+@ExtendWith(MockitoExtension.class)
+public class SparkSqlFunctionTableScanOperatorTest {
+
+  @Mock private SparkClient sparkClient;
+
+  @Test
+  @SneakyThrows
+  void testEmptyQueryWithException() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+
+    SparkSqlFunctionTableScanOperator sparkSqlFunctionTableScanOperator =
+        new SparkSqlFunctionTableScanOperator(sparkClient, sparkQueryRequest);
+
+    when(sparkClient.sql(any())).thenThrow(new IOException("Error Message"));
+    RuntimeException runtimeException =
+        assertThrows(RuntimeException.class, sparkSqlFunctionTableScanOperator::open);
+    assertEquals(
+        "Error fetching data from spark server: Error Message", runtimeException.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testClose() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+
+    SparkSqlFunctionTableScanOperator sparkSqlFunctionTableScanOperator =
+        new SparkSqlFunctionTableScanOperator(sparkClient, sparkQueryRequest);
+    sparkSqlFunctionTableScanOperator.close();
+  }
+
+  @Test
+  @SneakyThrows
+  void testExplain() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+
+    SparkSqlFunctionTableScanOperator sparkSqlFunctionTableScanOperator =
+        new SparkSqlFunctionTableScanOperator(sparkClient, sparkQueryRequest);
+
+    Assertions.assertEquals("sql(select 1)", sparkSqlFunctionTableScanOperator.explain());
+  }
+
+  @Test
+  @SneakyThrows
+  void testQueryResponseIterator() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+
+    SparkSqlFunctionTableScanOperator sparkSqlFunctionTableScanOperator =
+        new SparkSqlFunctionTableScanOperator(sparkClient, sparkQueryRequest);
+
+    when(sparkClient.sql(any())).thenReturn(new JSONObject(getJson("select_query_response.json")));
+    sparkSqlFunctionTableScanOperator.open();
+    assertTrue(sparkSqlFunctionTableScanOperator.hasNext());
+    ExprTupleValue firstRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put("1", new ExprIntegerValue(1));
+              }
+            });
+    assertEquals(firstRow, sparkSqlFunctionTableScanOperator.next());
+    Assertions.assertFalse(sparkSqlFunctionTableScanOperator.hasNext());
+  }
+
+  @Test
+  @SneakyThrows
+  void testQueryResponseAllTypes() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+
+    SparkSqlFunctionTableScanOperator sparkSqlFunctionTableScanOperator =
+        new SparkSqlFunctionTableScanOperator(sparkClient, sparkQueryRequest);
+
+    when(sparkClient.sql(any())).thenReturn(new JSONObject(getJson("all_data_type.json")));
+    sparkSqlFunctionTableScanOperator.open();
+    assertTrue(sparkSqlFunctionTableScanOperator.hasNext());
+    ExprTupleValue firstRow =
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put("boolean", ExprBooleanValue.of(true));
+                put("long", new ExprLongValue(922337203));
+                put("integer", new ExprIntegerValue(2147483647));
+                put("short", new ExprShortValue(32767));
+                put("byte", new ExprByteValue(127));
+                put("double", new ExprDoubleValue(9223372036854.775807));
+                put("float", new ExprFloatValue(21474.83647));
+                put("timestamp", new ExprDateValue("2023-07-01 10:31:30"));
+                put("date", new ExprTimestampValue("2023-07-01 10:31:30"));
+                put("string", new ExprStringValue("ABC"));
+                put("char", new SparkExprValue(new SparkDataType("char"), "A"));
+              }
+            });
+    assertEquals(firstRow, sparkSqlFunctionTableScanOperator.next());
+    Assertions.assertFalse(sparkSqlFunctionTableScanOperator.hasNext());
+  }
+
+  @Test
+  @SneakyThrows
+  void testQueryResponseSparkDataType() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+
+    SparkSqlFunctionTableScanOperator sparkSqlFunctionTableScanOperator =
+        new SparkSqlFunctionTableScanOperator(sparkClient, sparkQueryRequest);
+
+    when(sparkClient.sql(any())).thenReturn(new JSONObject(getJson("spark_data_type.json")));
+    sparkSqlFunctionTableScanOperator.open();
+    assertEquals(
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put(
+                    "struct_column",
+                    new SparkExprValue(
+                        new SparkDataType("struct"),
+                        new JSONObject("{\"struct_value\":\"value\"}}").toMap()));
+                put(
+                    "array_column",
+                    new SparkExprValue(
+                        new SparkDataType("array"), new JSONArray("[1,2]").toList()));
+              }
+            }),
+        sparkSqlFunctionTableScanOperator.next());
+  }
+
+  @Test
+  @SneakyThrows
+  void testQuerySchema() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+
+    SparkSqlFunctionTableScanOperator sparkSqlFunctionTableScanOperator =
+        new SparkSqlFunctionTableScanOperator(sparkClient, sparkQueryRequest);
+
+    when(sparkClient.sql(any())).thenReturn(new JSONObject(getJson("select_query_response.json")));
+    sparkSqlFunctionTableScanOperator.open();
+    ArrayList<ExecutionEngine.Schema.Column> columns = new ArrayList<>();
+    columns.add(new ExecutionEngine.Schema.Column("1", "1", ExprCoreType.INTEGER));
+    ExecutionEngine.Schema expectedSchema = new ExecutionEngine.Schema(columns);
+    assertEquals(expectedSchema, sparkSqlFunctionTableScanOperator.schema());
+  }
+
+  /** https://github.com/opensearch-project/sql/issues/2210. */
+  @Test
+  @SneakyThrows
+  void issue2210() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+
+    SparkSqlFunctionTableScanOperator sparkSqlFunctionTableScanOperator =
+        new SparkSqlFunctionTableScanOperator(sparkClient, sparkQueryRequest);
+
+    when(sparkClient.sql(any())).thenReturn(new JSONObject(getJson("issue2210.json")));
+    sparkSqlFunctionTableScanOperator.open();
+    assertTrue(sparkSqlFunctionTableScanOperator.hasNext());
+    assertEquals(
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put("col_name", stringValue("day"));
+                put("data_type", stringValue("int"));
+                put("comment", nullValue());
+              }
+            }),
+        sparkSqlFunctionTableScanOperator.next());
+    assertEquals(
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put("col_name", stringValue("# Partition Information"));
+                put("data_type", stringValue(""));
+                put("comment", stringValue(""));
+              }
+            }),
+        sparkSqlFunctionTableScanOperator.next());
+    assertEquals(
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put("col_name", stringValue("# col_name"));
+                put("data_type", stringValue("data_type"));
+                put("comment", stringValue("comment"));
+              }
+            }),
+        sparkSqlFunctionTableScanOperator.next());
+    assertEquals(
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put("col_name", stringValue("day"));
+                put("data_type", stringValue("int"));
+                put("comment", nullValue());
+              }
+            }),
+        sparkSqlFunctionTableScanOperator.next());
+    Assertions.assertFalse(sparkSqlFunctionTableScanOperator.hasNext());
+  }
+
+  @Test
+  @SneakyThrows
+  public void issue2367MissingFields() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+
+    SparkSqlFunctionTableScanOperator sparkSqlFunctionTableScanOperator =
+        new SparkSqlFunctionTableScanOperator(sparkClient, sparkQueryRequest);
+
+    when(sparkClient.sql(any()))
+        .thenReturn(
+            new JSONObject(
+                "{\n"
+                    + "  \"data\": {\n"
+                    + "    \"result\": [\n"
+                    + "      \"{}\",\n"
+                    + "      \"{'srcPort':20641}\"\n"
+                    + "    ],\n"
+                    + "    \"schema\": [\n"
+                    + "      \"{'column_name':'srcPort','data_type':'long'}\"\n"
+                    + "    ]\n"
+                    + "  }\n"
+                    + "}"));
+    sparkSqlFunctionTableScanOperator.open();
+    assertEquals(
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put("srcPort", ExprNullValue.of());
+              }
+            }),
+        sparkSqlFunctionTableScanOperator.next());
+    assertEquals(
+        new ExprTupleValue(
+            new LinkedHashMap<>() {
+              {
+                put("srcPort", new ExprLongValue(20641L));
+              }
+            }),
+        sparkSqlFunctionTableScanOperator.next());
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlTableFunctionResolverTest.java b/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlTableFunctionResolverTest.java
new file mode 100644
index 0000000000..a828ac76c4
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/functions/SparkSqlTableFunctionResolverTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.functions;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.opensearch.sql.data.type.ExprCoreType.STRING;
+import static org.opensearch.sql.spark.constants.TestConstants.QUERY;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.exception.SemanticCheckException;
+import org.opensearch.sql.expression.DSL;
+import org.opensearch.sql.expression.Expression;
+import org.opensearch.sql.expression.function.FunctionBuilder;
+import org.opensearch.sql.expression.function.FunctionName;
+import org.opensearch.sql.expression.function.FunctionProperties;
+import org.opensearch.sql.expression.function.FunctionSignature;
+import org.opensearch.sql.expression.function.TableFunctionImplementation;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.functions.implementation.SparkSqlFunctionImplementation;
+import org.opensearch.sql.spark.functions.resolver.SparkSqlTableFunctionResolver;
+import org.opensearch.sql.spark.request.SparkQueryRequest;
+import org.opensearch.sql.spark.storage.SparkTable;
+
+@ExtendWith(MockitoExtension.class)
+public class SparkSqlTableFunctionResolverTest {
+  @Mock private SparkClient client;
+
+  @Mock private FunctionProperties functionProperties;
+
+  @Test
+  void testResolve() {
+    SparkSqlTableFunctionResolver sqlTableFunctionResolver =
+        new SparkSqlTableFunctionResolver(client);
+    FunctionName functionName = FunctionName.of("sql");
+    List<Expression> expressions = List.of(DSL.namedArgument("query", DSL.literal(QUERY)));
+    FunctionSignature functionSignature =
+        new FunctionSignature(
+            functionName, expressions.stream().map(Expression::type).collect(Collectors.toList()));
+    Pair<FunctionSignature, FunctionBuilder> resolution =
+        sqlTableFunctionResolver.resolve(functionSignature);
+    assertEquals(functionName, resolution.getKey().getFunctionName());
+    assertEquals(functionName, sqlTableFunctionResolver.getFunctionName());
+    assertEquals(List.of(STRING), resolution.getKey().getParamTypeList());
+    FunctionBuilder functionBuilder = resolution.getValue();
+    TableFunctionImplementation functionImplementation =
+        (TableFunctionImplementation) functionBuilder.apply(functionProperties, expressions);
+    assertTrue(functionImplementation instanceof SparkSqlFunctionImplementation);
+    SparkTable sparkTable = (SparkTable) functionImplementation.applyArguments();
+    assertNotNull(sparkTable.getSparkQueryRequest());
+    SparkQueryRequest sparkQueryRequest = sparkTable.getSparkQueryRequest();
+    assertEquals(QUERY, sparkQueryRequest.getSql());
+  }
+
+  @Test
+  void testArgumentsPassedByPosition() {
+    SparkSqlTableFunctionResolver sqlTableFunctionResolver =
+        new SparkSqlTableFunctionResolver(client);
+    FunctionName functionName = FunctionName.of("sql");
+    List<Expression> expressions = List.of(DSL.namedArgument(null, DSL.literal(QUERY)));
+    FunctionSignature functionSignature =
+        new FunctionSignature(
+            functionName, expressions.stream().map(Expression::type).collect(Collectors.toList()));
+
+    Pair<FunctionSignature, FunctionBuilder> resolution =
+        sqlTableFunctionResolver.resolve(functionSignature);
+
+    assertEquals(functionName, resolution.getKey().getFunctionName());
+    assertEquals(functionName, sqlTableFunctionResolver.getFunctionName());
+    assertEquals(List.of(STRING), resolution.getKey().getParamTypeList());
+    FunctionBuilder functionBuilder = resolution.getValue();
+    TableFunctionImplementation functionImplementation =
+        (TableFunctionImplementation) functionBuilder.apply(functionProperties, expressions);
+    assertTrue(functionImplementation instanceof SparkSqlFunctionImplementation);
+    SparkTable sparkTable = (SparkTable) functionImplementation.applyArguments();
+    assertNotNull(sparkTable.getSparkQueryRequest());
+    SparkQueryRequest sparkQueryRequest = sparkTable.getSparkQueryRequest();
+    assertEquals(QUERY, sparkQueryRequest.getSql());
+  }
+
+  @Test
+  void testMixedArgumentTypes() {
+    SparkSqlTableFunctionResolver sqlTableFunctionResolver =
+        new SparkSqlTableFunctionResolver(client);
+    FunctionName functionName = FunctionName.of("sql");
+    List<Expression> expressions =
+        List.of(
+            DSL.namedArgument("query", DSL.literal(QUERY)),
+            DSL.namedArgument(null, DSL.literal(12345)));
+    FunctionSignature functionSignature =
+        new FunctionSignature(
+            functionName, expressions.stream().map(Expression::type).collect(Collectors.toList()));
+    Pair<FunctionSignature, FunctionBuilder> resolution =
+        sqlTableFunctionResolver.resolve(functionSignature);
+
+    assertEquals(functionName, resolution.getKey().getFunctionName());
+    assertEquals(functionName, sqlTableFunctionResolver.getFunctionName());
+    assertEquals(List.of(STRING), resolution.getKey().getParamTypeList());
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> resolution.getValue().apply(functionProperties, expressions));
+
+    assertEquals("Arguments should be either passed by name or position", exception.getMessage());
+  }
+
+  @Test
+  void testWrongArgumentsSizeWhenPassedByName() {
+    SparkSqlTableFunctionResolver sqlTableFunctionResolver =
+        new SparkSqlTableFunctionResolver(client);
+    FunctionName functionName = FunctionName.of("sql");
+    List<Expression> expressions = List.of();
+    FunctionSignature functionSignature =
+        new FunctionSignature(
+            functionName, expressions.stream().map(Expression::type).collect(Collectors.toList()));
+    Pair<FunctionSignature, FunctionBuilder> resolution =
+        sqlTableFunctionResolver.resolve(functionSignature);
+
+    assertEquals(functionName, resolution.getKey().getFunctionName());
+    assertEquals(functionName, sqlTableFunctionResolver.getFunctionName());
+    assertEquals(List.of(STRING), resolution.getKey().getParamTypeList());
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> resolution.getValue().apply(functionProperties, expressions));
+
+    assertEquals("Missing arguments:[query]", exception.getMessage());
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/response/SparkResponseTest.java b/spark/src/test/java/org/opensearch/sql/spark/response/SparkResponseTest.java
new file mode 100644
index 0000000000..bad26a2792
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/response/SparkResponseTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.response;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.opensearch.sql.datasource.model.DataSourceMetadata.DEFAULT_RESULT_INDEX;
+import static org.opensearch.sql.spark.constants.TestConstants.EMR_CLUSTER_ID;
+
+import java.util.Map;
+import org.apache.lucene.search.TotalHits;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.ResourceNotFoundException;
+import org.opensearch.action.DocWriteResponse;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.client.Client;
+import org.opensearch.common.action.ActionFuture;
+import org.opensearch.core.rest.RestStatus;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+
+@ExtendWith(MockitoExtension.class)
+public class SparkResponseTest {
+  @Mock private Client client;
+  @Mock private SearchResponse searchResponse;
+  @Mock private DeleteResponse deleteResponse;
+  @Mock private SearchHit searchHit;
+  @Mock private ActionFuture<SearchResponse> searchResponseActionFuture;
+  @Mock private ActionFuture<DeleteResponse> deleteResponseActionFuture;
+
+  @Test
+  public void testGetResultFromOpensearchIndex() {
+    when(client.search(any())).thenReturn(searchResponseActionFuture);
+    when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    when(searchResponse.status()).thenReturn(RestStatus.OK);
+    when(searchResponse.getHits())
+        .thenReturn(
+            new SearchHits(
+                new SearchHit[] {searchHit}, new TotalHits(1, TotalHits.Relation.EQUAL_TO), 1.0F));
+    Mockito.when(searchHit.getSourceAsMap()).thenReturn(Map.of("stepId", EMR_CLUSTER_ID));
+
+    when(client.delete(any())).thenReturn(deleteResponseActionFuture);
+    when(deleteResponseActionFuture.actionGet()).thenReturn(deleteResponse);
+    when(deleteResponse.getResult()).thenReturn(DocWriteResponse.Result.DELETED);
+
+    SparkResponse sparkResponse = new SparkResponse(client, EMR_CLUSTER_ID, "stepId");
+    assertFalse(sparkResponse.getResultFromOpensearchIndex().isEmpty());
+  }
+
+  @Test
+  public void testInvalidSearchResponse() {
+    when(client.search(any())).thenReturn(searchResponseActionFuture);
+    when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse);
+    when(searchResponse.status()).thenReturn(RestStatus.NO_CONTENT);
+
+    SparkResponse sparkResponse = new SparkResponse(client, EMR_CLUSTER_ID, "stepId");
+    RuntimeException exception =
+        assertThrows(RuntimeException.class, () -> sparkResponse.getResultFromOpensearchIndex());
+    Assertions.assertEquals(
+        "Fetching result from "
+            + DEFAULT_RESULT_INDEX
+            + " index failed with status : "
+            + RestStatus.NO_CONTENT,
+        exception.getMessage());
+  }
+
+  @Test
+  public void testSearchFailure() {
+    when(client.search(any())).thenThrow(RuntimeException.class);
+    SparkResponse sparkResponse = new SparkResponse(client, EMR_CLUSTER_ID, "stepId");
+    assertThrows(RuntimeException.class, () -> sparkResponse.getResultFromOpensearchIndex());
+  }
+
+  @Test
+  public void testDeleteFailure() {
+    when(client.delete(any())).thenThrow(RuntimeException.class);
+    SparkResponse sparkResponse = new SparkResponse(client, EMR_CLUSTER_ID, "stepId");
+    assertThrows(RuntimeException.class, () -> sparkResponse.deleteInSparkIndex("id"));
+  }
+
+  @Test
+  public void testNotFoundDeleteResponse() {
+    when(client.delete(any())).thenReturn(deleteResponseActionFuture);
+    when(deleteResponseActionFuture.actionGet()).thenReturn(deleteResponse);
+    when(deleteResponse.getResult()).thenReturn(DocWriteResponse.Result.NOT_FOUND);
+
+    SparkResponse sparkResponse = new SparkResponse(client, EMR_CLUSTER_ID, "stepId");
+    RuntimeException exception =
+        assertThrows(
+            ResourceNotFoundException.class, () -> sparkResponse.deleteInSparkIndex("123"));
+    Assertions.assertEquals("Spark result with id 123 doesn't exist", exception.getMessage());
+  }
+
+  @Test
+  public void testInvalidDeleteResponse() {
+    when(client.delete(any())).thenReturn(deleteResponseActionFuture);
+    when(deleteResponseActionFuture.actionGet()).thenReturn(deleteResponse);
+    when(deleteResponse.getResult()).thenReturn(DocWriteResponse.Result.NOOP);
+
+    SparkResponse sparkResponse = new SparkResponse(client, EMR_CLUSTER_ID, "stepId");
+    RuntimeException exception =
+        assertThrows(RuntimeException.class, () -> sparkResponse.deleteInSparkIndex("123"));
+    Assertions.assertEquals(
+        "Deleting spark result information failed with : noop", exception.getMessage());
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/storage/SparkScanTest.java b/spark/src/test/java/org/opensearch/sql/spark/storage/SparkScanTest.java
new file mode 100644
index 0000000000..971db3c33c
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/storage/SparkScanTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.storage;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.opensearch.sql.spark.constants.TestConstants.QUERY;
+
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.spark.client.SparkClient;
+
+@ExtendWith(MockitoExtension.class)
+public class SparkScanTest {
+  @Mock private SparkClient sparkClient;
+
+  @Test
+  @SneakyThrows
+  void testQueryResponseIteratorForQueryRangeFunction() {
+    SparkScan sparkScan = new SparkScan(sparkClient);
+    sparkScan.getRequest().setSql(QUERY);
+    Assertions.assertFalse(sparkScan.hasNext());
+    assertNull(sparkScan.next());
+  }
+
+  @Test
+  @SneakyThrows
+  void testExplain() {
+    SparkScan sparkScan = new SparkScan(sparkClient);
+    sparkScan.getRequest().setSql(QUERY);
+    assertEquals("SparkQueryRequest(sql=select 1)", sparkScan.explain());
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/storage/SparkStorageEngineTest.java b/spark/src/test/java/org/opensearch/sql/spark/storage/SparkStorageEngineTest.java
new file mode 100644
index 0000000000..5e7ec76cdb
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/storage/SparkStorageEngineTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.storage;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Collection;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.DataSourceSchemaName;
+import org.opensearch.sql.expression.function.FunctionResolver;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.functions.resolver.SparkSqlTableFunctionResolver;
+
+@ExtendWith(MockitoExtension.class)
+public class SparkStorageEngineTest {
+  @Mock private SparkClient client;
+
+  @Test
+  public void getFunctions() {
+    SparkStorageEngine engine = new SparkStorageEngine(client);
+    Collection<FunctionResolver> functionResolverCollection = engine.getFunctions();
+    assertNotNull(functionResolverCollection);
+    assertEquals(1, functionResolverCollection.size());
+    assertTrue(
+        functionResolverCollection.iterator().next() instanceof SparkSqlTableFunctionResolver);
+  }
+
+  @Test
+  public void getTable() {
+    SparkStorageEngine engine = new SparkStorageEngine(client);
+    RuntimeException exception =
+        assertThrows(
+            RuntimeException.class,
+            () -> engine.getTable(new DataSourceSchemaName("spark", "default"), ""));
+    assertEquals("Unable to get table from storage engine.", exception.getMessage());
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/storage/SparkStorageFactoryTest.java b/spark/src/test/java/org/opensearch/sql/spark/storage/SparkStorageFactoryTest.java
new file mode 100644
index 0000000000..ebe3c8f3a9
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/storage/SparkStorageFactoryTest.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.storage;
+
+import static org.opensearch.sql.spark.constants.TestConstants.EMR_CLUSTER_ID;
+
+import java.security.InvalidParameterException;
+import java.util.HashMap;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.client.Client;
+import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.datasource.model.DataSource;
+import org.opensearch.sql.datasource.model.DataSourceMetadata;
+import org.opensearch.sql.datasource.model.DataSourceType;
+import org.opensearch.sql.storage.StorageEngine;
+
+@ExtendWith(MockitoExtension.class)
+public class SparkStorageFactoryTest {
+  @Mock private Settings settings;
+
+  @Mock private Client client;
+
+  @Test
+  void testGetConnectorType() {
+    SparkStorageFactory sparkStorageFactory = new SparkStorageFactory(client, settings);
+    Assertions.assertEquals(DataSourceType.SPARK, sparkStorageFactory.getDataSourceType());
+  }
+
+  @Test
+  @SneakyThrows
+  void testGetStorageEngine() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("spark.connector", "emr");
+    properties.put("emr.cluster", EMR_CLUSTER_ID);
+    properties.put("emr.auth.type", "awssigv4");
+    properties.put("emr.auth.access_key", "access_key");
+    properties.put("emr.auth.secret_key", "secret_key");
+    properties.put("emr.auth.region", "region");
+    SparkStorageFactory sparkStorageFactory = new SparkStorageFactory(client, settings);
+    StorageEngine storageEngine = sparkStorageFactory.getStorageEngine(properties);
+    Assertions.assertTrue(storageEngine instanceof SparkStorageEngine);
+  }
+
+  @Test
+  @SneakyThrows
+  void testInvalidConnectorType() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("spark.connector", "random");
+    SparkStorageFactory sparkStorageFactory = new SparkStorageFactory(client, settings);
+    InvalidParameterException exception =
+        Assertions.assertThrows(
+            InvalidParameterException.class,
+            () -> sparkStorageFactory.getStorageEngine(properties));
+    Assertions.assertEquals("Spark connector type is invalid.", exception.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testMissingAuth() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("spark.connector", "emr");
+    properties.put("emr.cluster", EMR_CLUSTER_ID);
+    SparkStorageFactory sparkStorageFactory = new SparkStorageFactory(client, settings);
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> sparkStorageFactory.getStorageEngine(properties));
+    Assertions.assertEquals("EMR config properties are missing.", exception.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testUnsupportedEmrAuth() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("spark.connector", "emr");
+    properties.put("emr.cluster", EMR_CLUSTER_ID);
+    properties.put("emr.auth.type", "basic");
+    SparkStorageFactory sparkStorageFactory = new SparkStorageFactory(client, settings);
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> sparkStorageFactory.getStorageEngine(properties));
+    Assertions.assertEquals("Invalid auth type.", exception.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testMissingCluster() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("spark.connector", "emr");
+    properties.put("emr.auth.type", "awssigv4");
+    SparkStorageFactory sparkStorageFactory = new SparkStorageFactory(client, settings);
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> sparkStorageFactory.getStorageEngine(properties));
+    Assertions.assertEquals("EMR config properties are missing.", exception.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testMissingAuthKeys() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("spark.connector", "emr");
+    properties.put("emr.cluster", EMR_CLUSTER_ID);
+    properties.put("emr.auth.type", "awssigv4");
+    SparkStorageFactory sparkStorageFactory = new SparkStorageFactory(client, settings);
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> sparkStorageFactory.getStorageEngine(properties));
+    Assertions.assertEquals("EMR auth keys are missing.", exception.getMessage());
+  }
+
+  @Test
+  @SneakyThrows
+  void testMissingAuthSecretKey() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("spark.connector", "emr");
+    properties.put("emr.cluster", EMR_CLUSTER_ID);
+    properties.put("emr.auth.type", "awssigv4");
+    properties.put("emr.auth.access_key", "test");
+    SparkStorageFactory sparkStorageFactory = new SparkStorageFactory(client, settings);
+    IllegalArgumentException exception =
+        Assertions.assertThrows(
+            IllegalArgumentException.class, () -> sparkStorageFactory.getStorageEngine(properties));
+    Assertions.assertEquals("EMR auth keys are missing.", exception.getMessage());
+  }
+
+  @Test
+  void testCreateDataSourceSuccess() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("spark.connector", "emr");
+    properties.put("emr.cluster", EMR_CLUSTER_ID);
+    properties.put("emr.auth.type", "awssigv4");
+    properties.put("emr.auth.access_key", "access_key");
+    properties.put("emr.auth.secret_key", "secret_key");
+    properties.put("emr.auth.region", "region");
+    properties.put("spark.datasource.flint.host", "localhost");
+    properties.put("spark.datasource.flint.port", "9200");
+    properties.put("spark.datasource.flint.scheme", "http");
+    properties.put("spark.datasource.flint.auth", "false");
+    properties.put("spark.datasource.flint.region", "us-west-2");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("spark")
+            .setConnector(DataSourceType.SPARK)
+            .setProperties(properties)
+            .build();
+
+    DataSource dataSource = new SparkStorageFactory(client, settings).createDataSource(metadata);
+    Assertions.assertTrue(dataSource.getStorageEngine() instanceof SparkStorageEngine);
+  }
+
+  @Test
+  void testSetSparkJars() {
+    HashMap<String, String> properties = new HashMap<>();
+    properties.put("spark.connector", "emr");
+    properties.put("spark.sql.application", "s3://spark/spark-sql-job.jar");
+    properties.put("emr.cluster", EMR_CLUSTER_ID);
+    properties.put("emr.auth.type", "awssigv4");
+    properties.put("emr.auth.access_key", "access_key");
+    properties.put("emr.auth.secret_key", "secret_key");
+    properties.put("emr.auth.region", "region");
+    properties.put("spark.datasource.flint.integration", "s3://spark/flint-spark-integration.jar");
+
+    DataSourceMetadata metadata =
+        new DataSourceMetadata.Builder()
+            .setName("spark")
+            .setConnector(DataSourceType.SPARK)
+            .setProperties(properties)
+            .build();
+
+    DataSource dataSource = new SparkStorageFactory(client, settings).createDataSource(metadata);
+    Assertions.assertTrue(dataSource.getStorageEngine() instanceof SparkStorageEngine);
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/storage/SparkTableTest.java b/spark/src/test/java/org/opensearch/sql/spark/storage/SparkTableTest.java
new file mode 100644
index 0000000000..a70d4ba69e
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/storage/SparkTableTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.storage;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.opensearch.sql.spark.constants.TestConstants.QUERY;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.sql.data.type.ExprType;
+import org.opensearch.sql.planner.physical.PhysicalPlan;
+import org.opensearch.sql.spark.client.SparkClient;
+import org.opensearch.sql.spark.functions.scan.SparkSqlFunctionTableScanBuilder;
+import org.opensearch.sql.spark.functions.scan.SparkSqlFunctionTableScanOperator;
+import org.opensearch.sql.spark.request.SparkQueryRequest;
+import org.opensearch.sql.storage.read.TableScanBuilder;
+
+@ExtendWith(MockitoExtension.class)
+public class SparkTableTest {
+  @Mock private SparkClient client;
+
+  @Test
+  void testUnsupportedOperation() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    SparkTable sparkTable = new SparkTable(client, sparkQueryRequest);
+
+    assertThrows(UnsupportedOperationException.class, sparkTable::exists);
+    assertThrows(
+        UnsupportedOperationException.class, () -> sparkTable.create(Collections.emptyMap()));
+  }
+
+  @Test
+  void testCreateScanBuilderWithSqlTableFunction() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+    SparkTable sparkTable = new SparkTable(client, sparkQueryRequest);
+    TableScanBuilder tableScanBuilder = sparkTable.createScanBuilder();
+    Assertions.assertNotNull(tableScanBuilder);
+    Assertions.assertTrue(tableScanBuilder instanceof SparkSqlFunctionTableScanBuilder);
+  }
+
+  @Test
+  @SneakyThrows
+  void testGetFieldTypesFromSparkQueryRequest() {
+    SparkTable sparkTable = new SparkTable(client, new SparkQueryRequest());
+    Map<String, ExprType> expectedFieldTypes = new HashMap<>();
+    Map<String, ExprType> fieldTypes = sparkTable.getFieldTypes();
+
+    assertEquals(expectedFieldTypes, fieldTypes);
+    verifyNoMoreInteractions(client);
+    assertNotNull(sparkTable.getSparkQueryRequest());
+  }
+
+  @Test
+  void testImplementWithSqlFunction() {
+    SparkQueryRequest sparkQueryRequest = new SparkQueryRequest();
+    sparkQueryRequest.setSql(QUERY);
+    SparkTable sparkMetricTable = new SparkTable(client, sparkQueryRequest);
+    PhysicalPlan plan =
+        sparkMetricTable.implement(new SparkSqlFunctionTableScanBuilder(client, sparkQueryRequest));
+    assertTrue(plan instanceof SparkSqlFunctionTableScanOperator);
+  }
+}
diff --git a/spark/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java b/spark/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java
new file mode 100644
index 0000000000..4336b13aa9
--- /dev/null
+++ b/spark/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.spark.utils;
+
+import java.io.IOException;
+import java.util.Objects;
+
+public class TestUtils {
+  public static String getJson(String filename) throws IOException {
+    ClassLoader classLoader = TestUtils.class.getClassLoader();
+    return new String(
+        Objects.requireNonNull(classLoader.getResourceAsStream(filename)).readAllBytes());
+  }
+}
diff --git a/spark/src/test/resources/all_data_type.json b/spark/src/test/resources/all_data_type.json
new file mode 100644
index 0000000000..a046912319
--- /dev/null
+++ b/spark/src/test/resources/all_data_type.json
@@ -0,0 +1,22 @@
+{
+  "data": {
+    "result": [
+      "{'boolean':true,'long':922337203,'integer':2147483647,'short':32767,'byte':127,'double':9223372036854.775807,'float':21474.83647,'timestamp':'2023-07-01 10:31:30','date':'2023-07-01 10:31:30','string':'ABC','char':'A'}"
+    ],
+    "schema": [
+      "{'column_name':'boolean','data_type':'boolean'}",
+      "{'column_name':'long','data_type':'long'}",
+      "{'column_name':'integer','data_type':'integer'}",
+      "{'column_name':'short','data_type':'short'}",
+      "{'column_name':'byte','data_type':'byte'}",
+      "{'column_name':'double','data_type':'double'}",
+      "{'column_name':'float','data_type':'float'}",
+      "{'column_name':'timestamp','data_type':'timestamp'}",
+      "{'column_name':'date','data_type':'date'}",
+      "{'column_name':'string','data_type':'string'}",
+      "{'column_name':'char','data_type':'char'}"
+    ],
+    "stepId": "s-123456789",
+    "applicationId": "application-abc"
+  }
+}
diff --git a/spark/src/test/resources/issue2210.json b/spark/src/test/resources/issue2210.json
new file mode 100644
index 0000000000..dec24efdc2
--- /dev/null
+++ b/spark/src/test/resources/issue2210.json
@@ -0,0 +1,17 @@
+{
+  "data": {
+    "result": [
+      "{'col_name':'day','data_type':'int'}",
+      "{'col_name':'# Partition Information','data_type':'','comment':''}",
+      "{'col_name':'# col_name','data_type':'data_type','comment':'comment'}",
+      "{'col_name':'day','data_type':'int'}"
+    ],
+    "schema": [
+      "{'column_name':'col_name','data_type':'string'}",
+      "{'column_name':'data_type','data_type':'string'}",
+      "{'column_name':'comment','data_type':'string'}"
+    ],
+    "stepId": "s-123456789",
+    "applicationId": "application-abc"
+  }
+}
diff --git a/spark/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/spark/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000000..ca6ee9cea8
--- /dev/null
+++ b/spark/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file
diff --git a/spark/src/test/resources/select_query_response.json b/spark/src/test/resources/select_query_response.json
new file mode 100644
index 0000000000..24cb06b49e
--- /dev/null
+++ b/spark/src/test/resources/select_query_response.json
@@ -0,0 +1,12 @@
+{
+  "data": {
+    "result": [
+      "{'1':1}"
+    ],
+    "schema": [
+      "{'column_name':'1','data_type':'integer'}"
+    ],
+    "stepId": "s-123456789",
+    "applicationId": "application-abc"
+  }
+}
diff --git a/spark/src/test/resources/spark_data_type.json b/spark/src/test/resources/spark_data_type.json
new file mode 100644
index 0000000000..79bd047f27
--- /dev/null
+++ b/spark/src/test/resources/spark_data_type.json
@@ -0,0 +1,13 @@
+{
+  "data": {
+    "result": [
+      "{'struct_column':{'struct_value':'value'},'array_column':[1,2]}"
+    ],
+    "schema": [
+      "{'column_name':'struct_column','data_type':'struct'}",
+      "{'column_name':'array_column','data_type':'array'}"
+    ],
+    "stepId": "s-123456789",
+    "applicationId": "application-abc"
+  }
+}
diff --git a/sql-cli/.gitignore b/sql-cli/.gitignore
deleted file mode 100644
index 34fb496618..0000000000
--- a/sql-cli/.gitignore
+++ /dev/null
@@ -1,73 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-pyvenv/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-.pytest_cache
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# PyCharm
-.idea/
-*.iml
-
-# Vagrant
-.vagrant/
-
-# Generated Packages
-*.deb
-*.rpm
-
-.vscode/
-venv/
-
-.DS_Store
diff --git a/sql-cli/CODE_OF_CONDUCT.md b/sql-cli/CODE_OF_CONDUCT.md
deleted file mode 100644
index 2e863762fd..0000000000
--- a/sql-cli/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,24 +0,0 @@
-This code of conduct applies to all spaces provided by the OpenSource project including in code, documentation, issue trackers, mailing lists, chat channels, wikis, blogs, social media and any other communication channels used by the project.
-
-
-**Our open source communities endeavor to:**
-
-* Be Inclusive: We are committed to being a community where everyone can join and contribute. This means using inclusive and welcoming language.
-* Be Welcoming: We are committed to maintaining a safe space for everyone to be able to contribute.
-* Be Respectful: We are committed to encouraging differing viewpoints, accepting constructive criticism and work collaboratively towards decisions that help the project grow. Disrespectful and unacceptable behavior will not be tolerated.
-* Be Collaborative: We are committed to supporting what is best for our community and users. When we build anything for the benefit of the project, we should document the work we do and communicate to others on how this affects their work.
-
-
-**Our Responsibility. As contributors, members, or bystanders we each individually have the responsibility to behave professionally and respectfully at all times. Disrespectful and unacceptable behaviors include, but are not limited to:**
-
-* The use of violent threats, abusive, discriminatory, or derogatory language;
-* Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, race, political or religious affiliation;
-* Posting of sexually explicit or violent content;
-* The use of sexualized language and unwelcome sexual attention or advances;
-* Public or private harassment of any kind;
-* Publishing private information, such as physical or electronic address, without permission;
-* Other conduct which could reasonably be considered inappropriate in a professional setting;
-* Advocating for or encouraging any of the above behaviors.
-* Enforcement and Reporting Code of Conduct Issues:
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported. [Contact us](mailto:opensource-codeofconduct@amazon.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
diff --git a/sql-cli/CONTRIBUTING.md b/sql-cli/CONTRIBUTING.md
deleted file mode 100644
index 231b2be86a..0000000000
--- a/sql-cli/CONTRIBUTING.md
+++ /dev/null
@@ -1,116 +0,0 @@
-Contributing to OpenSearch
-=============================
-
-OpenSearch is a community project that is built and maintained by people just like **you**.  We're glad you're interested in helping out.  There are several different ways you can do it, but before we talk about that, let's talk about how to get started.
-
-## Table of Contents:
-- [First Things First](#first-things-first)
-- [Ways to Contribute](#ways-to-contribute)
-- [Developer Certificate of Origin](#developer-certificate-of-origin)
-- [Review Process](#review-process)
-
-
-## First Things First
-
-1. **When in doubt, open an issue** - For almost any type of contribution, the first step is opening an issue.  Even if you think you already know what the solution is, writing down a description of the problem you're trying to solve will help everyone get context when they review your pull request.  If it's truly a trivial change (e.g. spelling error), you can skip this step -- but as the subject says, when it doubt, [open an issue](https://github.com/opensearch-project/OpenSearch/issues).
-
-2. **Only submit your own work**  (or work you have sufficient rights to submit) - Please make sure that any code or documentation you submit is your work or you have the rights to submit. We respect the intellectual property rights of others, and as part of contributing, we'll ask you to sign your contribution with a "Developer Certificate of Origin" (DCO) that states you have the rights to submit this work and you understand we'll
-use your contribution.  There's more information about this topic in the [DCO section](#developer-certificate-of-origin).
-
-## Ways to Contribute
-
-**Please note:**  OpenSearch is a fork of [Elasticsearch 7.10.2](https://github.com/elastic/elasticsearch), and is currently in a pre-alpha state, so it's still very much a work in progress. If you do find references to Elasticsearch (outside of attributions and copyrights!) please [open an issue](https://github.com/opensearch-project/OpenSearch/issues)
-
-### Bug Reports
-
-Ugh!  Bugs!
-
-A bug is when software behaves in a way that you didn't expect and the developer didn't intend.  To help us understand what's going on, we first want to make sure you're working from the latest version.  Please make sure you're testing against the [latest version](https://github.com/opensearch-project/OpenSearch).
-
-Once you've confirmed that the bug still exists in the latest version, you'll want to check to make sure it's not something we already know about on the [open issues GitHub page](https://github.com/opensearch-project/OpenSearch/issues).
-
-If you've upgraded to the latest version and you can't find it in our open issues list, then you'll need to tell us how to reproduce it.  To make the behavior as clear as possible, please provided your steps as `curl` commands which we can copy and paste into a terminal to run it locally, for example:
-
-```sh
-# delete the index
-curl -X DELETE localhost:9200/test
-
-# insert a document
-curl -x PUT localhost:9200/test/test/1 -d '{
- "title": "test document"
-}'
-
-# this should return XXXX but instead returns YYYY
-curl ....
-```
-
-Provide as much information as you can. You may think that the problem lies with your query, when actually it depends on how your data is indexed. The easier it is for us to recreate your problem, the faster it is likely to be fixed.
-
-### Feature Requests
-
-If you've thought of a way that OpenSearch could be better, we want to hear about it.  We track feature requests using GitHub, so please feel free to open an issue which describes the feature you would like to see, why you need it, and how it should work.
-
-### Documentation Changes
-
-//TODO
-
-### Contributing Code
-
-As with other types of contributions, the first step is to [**open an issue on GitHub**](https://github.com/opensearch-project/OpenSearch/issues/new/choose).  Opening an issue before you make changes makes sure that someone else isn't already working on that particular problem.  It also lets us all work together to find the right approach before you spend a bunch of time on a PR.  So again, when in doubt, open an issue.
-
-Once you've opened an issue, check out our [Developer Guide](../DEVELOPER_GUIDE.rst) for instructions on how to get started.
-
-## Developer Certificate of Origin
-
-OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE.txt file](../LICENSE.txt)).  The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software.
-
-We respect intellectual property rights of others and we want to make sure all incoming contributions are correctly attributed and licensed. A Developer Certificate of Origin (DCO) is a lightweight mechanism to do that.
-
-The DCO is a declaration attached to every contribution made by every developer. In the commit message of the contribution, the developer simply adds a `Signed-off-by` statement and thereby agrees to the DCO, which you can find below or at [DeveloperCertificate.org](http://developercertificate.org/).
-
-```
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the
-    best of my knowledge, is covered under an appropriate open
-    source license and I have the right under that license to
-    submit that work with modifications, whether created in whole
-    or in part by me, under the same open source license (unless
-    I am permitted to submit under a different license), as
-    Indicated in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including
-    all personal information I submit with it, including my
-    sign-off) is maintained indefinitely and may be redistributed
-    consistent with this project or the open source license(s)
-    involved.
- ```
-We require that every contribution to OpenSearch is signed with a Developer Certificate of Origin.  Additionally, please use your real name.  We do not accept anonymous contributors nor those utilizing pseudonyms.
-
-Each commit must include a DCO which looks like this
-
-```
-Signed-off-by: Jane Smith <jane.smith@email.com>
-```
-You may type this line on your own when writing your commit messages.  However, if your user.name and user.email are set in your git configs, you can use `-s` or `– – signoff` to add the `Signed-off-by` line to the end of the commit message.
-
-## Review Process
-
-We deeply appreciate everyone who takes the time to make a contribution.  We will review all contributions as quickly as possible.  As a reminder, [opening an issue](https://github.com/opensearch-project/OpenSearch/issues/new/choose) discussing your change before you make it is the best way to smooth the PR process.  This will prevent a rejection because someone else is already working on the problem, or because the solution is incompatible with the architectural direction.
-
-During the PR process, expect that there will be some back-and-forth.  Please try to respond to comments in a timely fashion, and if you don't wish to continue with the PR, let us know.  If a PR takes too many iterations for its complexity or size, we may reject it.  Additionally, if you stop responding we may close the PR as abandoned.  In either case, if you feel this was done in error, please add a comment on the PR.
-
-If we accept the PR, we will merge your change and usually take care of backporting it to appropriate branches ourselves.
-
-If we reject the PR, we will close the pull request with a comment explaining why. This decision isn't always final: if you feel we have misunderstood your intended change or otherwise think that we should reconsider then please continue the conversation with a comment on the PR and we'll do our best to address any further points you raise.
diff --git a/sql-cli/LICENSE.TXT b/sql-cli/LICENSE.TXT
deleted file mode 100644
index 7a4a3ea242..0000000000
--- a/sql-cli/LICENSE.TXT
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
\ No newline at end of file
diff --git a/sql-cli/MAINTAINERS.md b/sql-cli/MAINTAINERS.md
deleted file mode 100644
index 098ae18733..0000000000
--- a/sql-cli/MAINTAINERS.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# OpenSearch Maintainers
-
-## Maintainers
-| Maintainer | GitHub ID | Affiliation |
-| --------------- | --------- | ----------- |
-| Abbas Hussain | [abbashus](https://github.com/abbashus) | Amazon |
-| Alolita Sharma | [alolita](https://github.com/alolita) | Amazon |
-| Anirudha Jadhav | [anirudha](https://github.com/anirudha) | Amazon | 
-| Chloe Zhang | [chloe-zh](https://github.com/chloe-zh) | Amazon |
-| Joshua Li | [joshuali925](https://github.com/joshuali925) | Amazon |
-| Zhongnan Su | [zhongnansu](https://github.com/CEHENKLE) | Amazon |
-
-
diff --git a/sql-cli/NOTICE b/sql-cli/NOTICE
deleted file mode 100644
index d0618dd6a3..0000000000
--- a/sql-cli/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-OpenSearch
-Copyright OpenSearch Contributors
-
-This product includes software developed by
-Elasticsearch (http://www.elastic.co).
-Copyright 2009-2018 Elasticsearch
-
-This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).
-This product includes software developed by
-Joda.org (http://www.joda.org/).
diff --git a/sql-cli/README.md b/sql-cli/README.md
deleted file mode 100644
index f87320dac6..0000000000
--- a/sql-cli/README.md
+++ /dev/null
@@ -1,149 +0,0 @@
-[![SQL CLI Test and Build](https://github.com/opensearch-project/sql/workflows/SQL%20CLI%20Test%20and%20Build/badge.svg)](https://github.com/opensearch-project/sql/actions)
-[![Latest Version](https://img.shields.io/pypi/v/opensearchsql.svg)](https://pypi.python.org/pypi/opensearchsql/)
-[![Documentation](https://img.shields.io/badge/documentation-blue.svg)](https://docs-beta.opensearch.org/docs/sql/cli/)
-[![Chat](https://img.shields.io/badge/chat-on%20forums-blue)](https://forum.opensearch.org/c/plugins/sql)
-![PyPi Downloads](https://img.shields.io/pypi/dm/opensearchsql.svg)
-![PRs welcome!](https://img.shields.io/badge/PRs-welcome!-success)
-
-# OpenSearch SQL CLI
-
-The SQL CLI component in OpenSearch is a stand-alone Python application and can be launched by a 'wake' word `opensearchsql`. 
-
-It only supports [OpenSearch SQL Plugin](https://docs-beta.opensearch.org/search-plugins/sql/index/)
-You must have the OpenSearch SQL plugin installed to your OpenSearch instance to connect. 
-Users can run this CLI from Unix like OS or Windows, and connect to any valid OpenSearch end-point such as Amazon OpenSearch Service.
-
-![](./screenshots/usage.gif)
-
-
-
-## Features
-
-* Multi-line input
-* Autocomplete for SQL syntax and index names
-* Syntax highlighting
-* Formatted output:
-* Tabular format
-* Field names with color
-* Enabled horizontal display (by default) and vertical display when output is too wide for your terminal, for better visualization
-* Pagination for large output
-* Connect to OpenSearch with/without security enabled on either **OpenSearch or Amazon OpenSearch Service domains**.
-* Supports loading configuration files
-* Supports all SQL plugin queries
-
-## Version
-Unlike plugins which use 4-digit version number. SQl-CLI uses `x.x.x` as version number same as other python packages in OpenSearch family. As a client for OpenSearch SQL, it has independent release. 
-SQL-CLI should be compatible to all OpenSearch SQL versions. However since the codebase is in a monorepo, 
-so we'll cut and name sql-cli release branch and tags differently. E.g.
-```
-release branch: sql-cli-1.0
-release tag: sql-cli-v1.0.0 
-```
-
-## Install
-
-Launch your local OpenSearch instance and make sure you have the OpenSearch SQL plugin installed.
-
-To install the SQL CLI:
-
-
-1. We suggest you install and activate a python3 virtual environment to avoid changing your local environment:
-
-    ```
-    pip install virtualenv
-    virtualenv venv
-    cd venv
-    source ./bin/activate
-    ```
-
-
-1. Install the CLI:
-
-    ```
-    pip3 install opensearchsql
-    ```
-
-    The SQL CLI only works with Python 3, since Python 2 is no longer maintained since 01/01/2020. See https://pythonclock.org/
-
-
-1. To launch the CLI, run:
-
-    ```
-    opensearchsql https://localhost:9200 --username admin --password admin
-    ```
-    By default, the `opensearchsql` command connects to [http://localhost:9200](http://localhost:9200/).
-
-
-
-## Configure
-
-When you first launch the SQL CLI, a configuration file is automatically created at `~/.config/opensearchsql-cli/config` (for MacOS and Linux), the configuration is auto-loaded thereafter.
-
-You can also configure the following connection properties:
-
-
-* `endpoint`: You do not need to specify an option, anything that follows the launch command `opensearchsql` is considered as the endpoint. If you do not provide an endpoint, by default, the SQL CLI connects to [http://localhost:9200](http://localhost:9200/).
-* `-u/-w`: Supports username and password for HTTP basic authentication, such as:
-    * OpenSearch with [OpenSearch Security Plugin](https://docs-beta.opensearch.org/security-plugin/index/) installed
-    * Amazon OpenSearch Service domain with [Fine Grained Access Control](https://docs.aws.amazon.com/opensearch-service/latest/developerguide/fgac.html) enabled
-* `--aws-auth`: Turns on AWS sigV4 authentication to connect to an Amazon Elasticsearch Service endpoint. Use with the AWS CLI (`aws configure`) to retrieve the local AWS configuration to authenticate and connect.
-
-For a list of all available configurations, see [clirc](https://github.com/opensearch-project/sql/blob/main/sql-cli/src/opensearch_sql_cli/conf/clirc).
-
-
-
-## Using the CLI
-
-1. Save the sample [accounts test data](https://github.com/opensearch-project/sql/blob/main/integ-test/src/test/resources/accounts.json) file.
-2. Index the sample data.
-
-    ```
-    curl -H "Content-Type: application/x-ndjson" -POST https://localhost:9200/data/_bulk -u admin:admin --insecure --data-binary "@accounts.json"
-    ```
-
-
-1. Run a simple SQL command in OpenSearch SQL CLI:
-
-    ```
-    SELECT * FROM accounts;
-    ```
-
-    By default, you see a maximum output of 200 rows. To show more results, add a `LIMIT` clause with the desired value.
-
-The CLI supports all types of query that OpenSearch SQL supports. Refer to [OpenSearch SQL basic usage documentation.](https://github.com/opensearch-project/sql#basic-usage)
-
-
-## Query options
-
-Run single query from command line with options
-
-
-* `--help`: help page for options
-* `-q`: follow by a single query
-* `-f`: support *jdbc/raw* format output
-* `-v`: display data vertically
-* `-e`: translate sql to DSL
-
-## CLI Options
-
-* `-l`: Query language option. Available options are [sql, ppl]. By default it's using sql.
-* `-p`: always use pager to display output
-* `--clirc`: provide path of config file to load
-
-## Code of Conduct
-
-This project has adopted an [Open Source Code of Conduct](./CODE_OF_CONDUCT.md).
-
-
-## Security issue notifications
-
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue for security bugs you report.
-
-## Licensing
-
-See the [LICENSE](./LICENSE.TXT) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
-
-## Copyright
-
-Copyright OpenSearch Contributors. See [NOTICE](./NOTICE) for details.
-
diff --git a/sql-cli/THIRD-PARTY b/sql-cli/THIRD-PARTY
deleted file mode 100644
index 689a668190..0000000000
--- a/sql-cli/THIRD-PARTY
+++ /dev/null
@@ -1,590 +0,0 @@
-** Boto3; version 1.9.187 -- https://github.com/boto/boto3/
-Copyright 2013-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-** coverage; version 4.5.3 -- https://github.com/nedbat/coveragepy
-Copyright 2001 Gareth Rees.  All rights reserved.
-Copyright 2004-2019 Ned Batchelder.  All rights reserved.
-
-Except where noted otherwise, this software is licensed under the Apache
-License, Version 2.0 (the "License"); you may not use this work except in
-compliance with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-** elasticsearch 6.5.4; version 6.5.4 --
-https://github.com/elastic/elasticsearch/tree/v6.5.4
-Elasticsearch
-Copyright 2009-2018 Elasticsearch
-
-This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).
-** twine; version 1.13.0 -- https://github.com/pypa/twine
-none
-
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND
-DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction, and
-      distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by the
-      copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all other
-      entities that control, are controlled by, or are under common control
-      with that entity. For the purposes of this definition, "control" means
-      (i) the power, direct or indirect, to cause the direction or management
-      of such entity, whether by contract or otherwise, or (ii) ownership of
-      fifty percent (50%) or more of the outstanding shares, or (iii)
-      beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity exercising
-      permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation source,
-      and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but not limited
-      to compiled object code, generated documentation, and conversions to
-      other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or Object
-      form, made available under the License, as indicated by a copyright
-      notice that is included in or attached to the work (an example is
-      provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object form,
-      that is based on (or derived from) the Work and for which the editorial
-      revisions, annotations, elaborations, or other modifications represent,
-      as a whole, an original work of authorship. For the purposes of this
-      License, Derivative Works shall not include works that remain separable
-      from, or merely link (or bind by name) to the interfaces of, the Work and
-      Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including the original
-      version of the Work and any modifications or additions to that Work or
-      Derivative Works thereof, that is intentionally submitted to Licensor for
-      inclusion in the Work by the copyright owner or by an individual or Legal
-      Entity authorized to submit on behalf of the copyright owner. For the
-      purposes of this definition, "submitted" means any form of electronic,
-      verbal, or written communication sent to the Licensor or its
-      representatives, including but not limited to communication on electronic
-      mailing lists, source code control systems, and issue tracking systems
-      that are managed by, or on behalf of, the Licensor for the purpose of
-      discussing and improving the Work, but excluding communication that is
-      conspicuously marked or otherwise designated in writing by the copyright
-      owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity on
-      behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of this
-   License, each Contributor hereby grants to You a perpetual, worldwide,
-   non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-   reproduce, prepare Derivative Works of, publicly display, publicly perform,
-   sublicense, and distribute the Work and such Derivative Works in Source or
-   Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of this
-   License, each Contributor hereby grants to You a perpetual, worldwide,
-   non-exclusive, no-charge, royalty-free, irrevocable (except as stated in
-   this section) patent license to make, have made, use, offer to sell, sell,
-   import, and otherwise transfer the Work, where such license applies only to
-   those patent claims licensable by such Contributor that are necessarily
-   infringed by their Contribution(s) alone or by combination of their
-   Contribution(s) with the Work to which such Contribution(s) was submitted.
-   If You institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-   Contribution incorporated within the Work constitutes direct or contributory
-   patent infringement, then any patent licenses granted to You under this
-   License for that Work shall terminate as of the date such litigation is
-   filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the Work or
-   Derivative Works thereof in any medium, with or without modifications, and
-   in Source or Object form, provided that You meet the following conditions:
-
-      (a) You must give any other recipients of the Work or Derivative Works a
-      copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices stating
-      that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works that You
-      distribute, all copyright, patent, trademark, and attribution notices
-      from the Source form of the Work, excluding those notices that do not
-      pertain to any part of the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-      distribution, then any Derivative Works that You distribute must include
-      a readable copy of the attribution notices contained within such NOTICE
-      file, excluding those notices that do not pertain to any part of the
-      Derivative Works, in at least one of the following places: within a
-      NOTICE text file distributed as part of the Derivative Works; within the
-      Source form or documentation, if provided along with the Derivative
-      Works; or, within a display generated by the Derivative Works, if and
-      wherever such third-party notices normally appear. The contents of the
-      NOTICE file are for informational purposes only and do not modify the
-      License. You may add Your own attribution notices within Derivative Works
-      that You distribute, alongside or as an addendum to the NOTICE text from
-      the Work, provided that such additional attribution notices cannot be
-      construed as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and may
-      provide additional or different license terms and conditions for use,
-      reproduction, or distribution of Your modifications, or for any such
-      Derivative Works as a whole, provided Your use, reproduction, and
-      distribution of the Work otherwise complies with the conditions stated in
-      this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise, any
-   Contribution intentionally submitted for inclusion in the Work by You to the
-   Licensor shall be under the terms and conditions of this License, without
-   any additional terms or conditions. Notwithstanding the above, nothing
-   herein shall supersede or modify the terms of any separate license agreement
-   you may have executed with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor, except
-   as required for reasonable and customary use in describing the origin of the
-   Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or agreed to in
-   writing, Licensor provides the Work (and each Contributor provides its
-   Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied, including, without limitation, any
-   warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or
-   FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining
-   the appropriateness of using or redistributing the Work and assume any risks
-   associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory, whether
-   in tort (including negligence), contract, or otherwise, unless required by
-   applicable law (such as deliberate and grossly negligent acts) or agreed to
-   in writing, shall any Contributor be liable to You for damages, including
-   any direct, indirect, special, incidental, or consequential damages of any
-   character arising as a result of this License or out of the use or inability
-   to use the Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all other
-   commercial damages or losses), even if such Contributor has been advised of
-   the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing the Work
-   or Derivative Works thereof, You may choose to offer, and charge a fee for,
-   acceptance of support, warranty, indemnity, or other liability obligations
-   and/or rights consistent with this License. However, in accepting such
-   obligations, You may act only on Your own behalf and on Your sole
-   responsibility, not on behalf of any other Contributor, and only if You
-   agree to indemnify, defend, and hold each Contributor harmless for any
-   liability incurred by, or claims asserted against, such Contributor by
-   reason of your accepting any such warranty or additional liability. END OF
-   TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification
-within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
-
-* For Boto3 see also this required NOTICE:
-    Copyright 2013-2017 Amazon.com, Inc. or its affiliates. All Rights
-    Reserved.
-* For coverage see also this required NOTICE:
-    Copyright 2001 Gareth Rees.  All rights reserved.
-    Copyright 2004-2019 Ned Batchelder.  All rights reserved.
-
-    Except where noted otherwise, this software is licensed under the Apache
-    License, Version 2.0 (the "License"); you may not use this work except in
-    compliance with the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-* For elasticsearch 6.5.4 see also this required NOTICE:
-    Elasticsearch
-    Copyright 2009-2018 Elasticsearch
-
-    This product includes software developed by The Apache Software
-    Foundation (http://www.apache.org/).
-* For twine see also this required NOTICE:
-    none
-
-------
-
-** mock; version 3.0.5 -- https://github.com/testing-cabal/mock
-Copyright (c) 2003-2013, Michael Foord & the mock team
-All rights reserved.
-
-Copyright (c) 2003-2013, Michael Foord & the mock team
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-------
-
-** cli-helpers; version 1.2.1 -- https://github.com/dbcli/cli_helpers
-Copyright (c) 2017, dbcli
-All rights reserved.
-
-Copyright (c) 2017, dbcli
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of dbcli nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-------
-
-** Pygments; version 2.4.2 --
-https://bitbucket.org/birkenfeld/pygments-main/src/default/
-Copyright (c) 2006-2019 by the respective authors (see AUTHORS file).
-All rights reserved.
-
-Copyright (c) 2006-2019 by the respective authors (see AUTHORS file).
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-------
-
-** prompt-toolkit; version 2 --
-https://github.com/prompt-toolkit/python-prompt-toolkit
-Copyright (c) 2014, Jonathan Slenders
-All rights reserved.
-
-Copyright (c) 2014, Jonathan Slenders
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-* Neither the name of the {organization} nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-------
-
-** click; version 7.0 -- https://click.palletsprojects.com/en/7.x/
-Copyright © 2014 by the Pallets team.
-
-Copyright © 2014 by the Pallets team.
-
-Some rights reserved.
-
-Redistribution and use in source and binary forms of the software as well as
-documentation, with or without modification, are permitted provided that the
-following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-Neither the name of the copyright holder nor the names of its contributors may
-be used to endorse or promote products derived from this software without
-specific prior written permission.
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Click uses parts of optparse written by Gregory P. Ward and maintained by the
-Python Software Foundation. This is limited to code in parser.py.
-
-Copyright © 2001-2006 Gregory P. Ward. All rights reserved. Copyright ©
-2002-2006 Python Software Foundation. All rights reserved.
-
-------
-
-** pexpect; version 3.3 -- https://github.com/pexpect/pexpect
-http://opensource.org/licenses/isc-license.txt
-
-Copyright (c) 2013-2016, Pexpect development team
-Copyright (c) 2012, Noah Spurrier <noah@noah.org>
-
-ISC LICENSE
-
-    This license is approved by the OSI and FSF as GPL-compatible.
-        http://opensource.org/licenses/isc-license.txt
-
-    Copyright (c) 2013-2014, Pexpect development team
-    Copyright (c) 2012, Noah Spurrier <noah@noah.org>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose with or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-------
-
-** pyfiglet; version 0.8.post1 -- https://github.com/pwaller/pyfiglet
-Copyright © 2007-2018
-  Christopher Jones <cjones@insub.org>
-  Stefano Rivera <stefano@rivera.za.net>
-  Peter Waller <p@pwaller.net>
-  And various contributors (see git history)
-
-PyFiglet: An implementation of figlet written in Python
-
-The MIT License (MIT)
-
-Copyright © 2007-2018
-  Christopher Jones <cjones@insub.org>
-  Stefano Rivera <stefano@rivera.za.net>
-  Peter Waller <p@pwaller.net>
-  And various contributors (see git history).
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the “Software”), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-------
-
-** pytest; version 4.6.3 -- https://docs.pytest.org/en/latest/
-Copyright (c) 2004-2017 Holger Krekel and others
-
-The MIT License (MIT)
-
-Copyright (c) 2004-2017 Holger Krekel and others
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-------
-
-** setuptools; version v40.0.0 -- https://github.com/pypa/setuptools
-Copyright (C) 2016 Jason R Coombs <jaraco@jaraco.com>
-
-Copyright (C) 2016 Jason R Coombs <jaraco@jaraco.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-------
-
-** requests-aws4auth; version 0.9 --
-https://github.com/sam-washington/requests-aws4auth
-requests-aws4auth includes the six library.
-
-six License
-===========
-
-This is the MIT license: http://www.opensource.org/licenses/mit-license.php
-
-Copyright (c) 2010-2015 Benjamin Peterson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Sam Washington
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/sql-cli/development_guide.md b/sql-cli/development_guide.md
deleted file mode 100644
index 9d54aa2e09..0000000000
--- a/sql-cli/development_guide.md
+++ /dev/null
@@ -1,61 +0,0 @@
-## Development Guide
-### Development Environment Set Up
-- `pip install virtualenv`
-- `virtualenv venv` to create virtual environment for **Python 3**
-- `source ./venv/bin/activate` activate virtual env.
-- `cd` into project root folder.
-- `pip install --editable .` will install all dependencies from `setup.py`.
-
-### Run CLI
-- Start an OpenSearch instance from either local, Docker with OpenSearch SQL plugin, or AWS Elasticsearch
-- To launch the cli, use 'wake' word `opensearchsql` followed by endpoint of your running OpenSearch instance. If not specifying 
-any endpoint, it uses http://localhost:9200 by default. If not provided with port number, http endpoint uses 9200 and 
-https uses 443 by default.
-
-### Testing
-- Prerequisites
-    - Build the application
-    - Start a local OpenSearch instance with 
-    [OpenSearch SQL plugin](https://docs-beta.opensearch.org/search-plugins/sql/index/) installed
-    and listening at http://localhost:9200.
-- Pytest
-    - `pip install -r requirements-dev.txt` Install test frameworks including Pytest and mock.
-    - `cd` into `tests` and run `pytest`
-- Refer to [test_plan](./tests/test_plan.md) for manual test guidance.
-
-### Style
-- Use [black](https://github.com/psf/black) to format code, with option of `--line-length 120`
-
-## Release guide
-
-- Package Manager: pip
-- Repository of software for Python: PyPI
-
-### Workflow
-
-1. Update version number
-    1. Modify the version number in `__init__.py` under `src` package. It will be used by `setup.py` for release.
-2. Create/Update `setup.py` (if needed)
-    1. For more details refer to https://packaging.python.org/tutorials/packaging-projects/#creating-setup-py 
-3. Update README.md, Legal and copyright files(if needed)
-    1. Update README.md when there is a critical feature added.
-    2. Update `THIRD-PARTY` files if there is a new dependency added.
-4. Generate distribution archives
-    1. Make sure you have the latest versions of `setuptools` and `wheel` installed:  `python3 -m pip install --user --upgrade setuptools wheel`
-    2. Run this command from the same directory where `setup.py` is located: `python3 setup.py sdist bdist_wheel`
-    3. Check artifacts under `sql-cli/dist/`, there should be a `.tar.gz` file and a `.whi` file with correct version. Remove other deprecated artifacts.
-5. Upload the distribution archives to TestPyPI
-    1. Register an account on [testPyPI](https://test.pypi.org/)
-    2. `python3 -m pip install --user --upgrade twine`
-    3. `python3 -m twine upload --repository-url https://test.pypi.org/legacy/ dist/*`
-6. Install your package from TestPyPI and do manual test
-    1. `pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple opensearchsql`
-7. Upload to PyPI
-    1. Register an account on [PyPI](https://pypi.org/), note that these are two separate servers and the credentials from the test server are not shared with the main server.
-    2. Use `twine upload dist/*` to upload your package and enter your credentials for the account you registered on PyPI.You don’t need to specify --repository; the package will upload to https://pypi.org/ by default.
-8. Install your package from PyPI using `pip install [your-package-name]`
-
-### Reference
-- https://medium.com/@joel.barmettler/how-to-upload-your-python-package-to-pypi-65edc5fe9c56
-- https://packaging.python.org/tutorials/packaging-projects/
-- https://packaging.python.org/guides/using-testpypi/
\ No newline at end of file
diff --git a/sql-cli/release-notes/odfe-sql-cli.release-notes-1.7.0.0.md b/sql-cli/release-notes/odfe-sql-cli.release-notes-1.7.0.0.md
deleted file mode 100644
index c6afabf9c4..0000000000
--- a/sql-cli/release-notes/odfe-sql-cli.release-notes-1.7.0.0.md
+++ /dev/null
@@ -1,66 +0,0 @@
-## 2020-05-04 Version 1.7.0.0
-
-This is the first official release of OpenSearch SQL CLI
-
-OpenSearch SQL CLI is a stand alone Python application and can be launched by a wake word `opensearchsql`. It serves as a support only for 
-[OpenSearch SQL plugin](https://opendistro.github.io/for-elasticsearch-docs/docs/sql/). User must have OpenSearch SQL
-plugin installed to the Elasticsearch instance for connection. Usr can run this CLI from MacOS and Linux, and connect to any valid Elasticsearch 
-endpoint such as AWS Elasticsearch.
-
-### Features
-#### CLI Features
-* Feature [#12](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/12): Initial development for SQL CLI
-    * prototype launch: app -> check connection -> take input -> query ES -> serve raw results(format=jdbc)
-    * enrich auto-completion corpus
-    * Convert to vertical output format if fields length is larger than terminal window
-    * Add style to output fields name. Add logic to confirm choice from user for vertical output
-    * Add single query without getting into console. Integrate "_explain" api
-    * Add config base logic. Add pagination for long output
-    * Add nice little welcome banner.
-    * Add params -f for format_output (jdbc/raw/csv), -v for vertical display
-    * Initial implementation of connection to OD cluster and AES with auth
-    * Create test module and write first test
-    * Add fake test data. Add test utils to set up connection
-    * [Test] Add pagination test and query test
-    * Add Test plan and dependency list
-    * [Test] Add test case for ConnectionFailExeption
-    * [Feature] initial implementation of index suggestion during auto-completion
-    * [Feature] display (data retrieved / total hits), and tell user to use "limit" to get more than 200 lines of data
-    * Added legal and copyright files,
-    * Added THIRD PARTY file
-    * Added setup.py for packaging and releasing
-* Feature [#24](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/24): Provide user option to toggle to use AWS sigV4 authentication 
-(issue: [#23](https://github.com/opendistro-for-elasticsearch/sql-cli/issues/23))
-
-#### Testing
-* Feature [#28](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/28) :Added tox scripts for testing automation
-
-#### Documentation
-* Change [#22](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/22): Update documentation and CLI naming 
-(issues: [#21](https://github.com/opendistro-for-elasticsearch/sql-cli/issues/21), [#7](https://github.com/opendistro-for-elasticsearch/sql-cli/issues/17))
-* Change [#32](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/32): Update copyright to 2020
-* Change [#33](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/33): Updated package naming and created folder for release notes
-* Change [#34](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/34): Added CONTRIBUTORS.md
-* Change [#36](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/36): Polish README.md and test_plan.md
-
-
-### Enhancements
-* Enhancement [#31](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/31): Added github action workflow for CI/CD
-(issue: [#20](https://github.com/opendistro-for-elasticsearch/sql-cli/issues/21))
-* Enhancement [#35](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/35): Update github action test and build workflow to spin up ES instance
-
-
-### BugFixes
-* BugFix[#12](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/12): Initial development for SQL CLI
-    * Fix the logic of passing self-constructed settings
-    * [Fix] get rid of unicode warning. Fix meta info display
-    * [fix] Refactor executor code
-    * [Fix] Fix test cases corresponding to fraction display.
-    * [Fix] fix code style using Black, update documentation and comments
-* BugFix[#18](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/18): Fix typos, remove unused dependencies, add .gitignore and legal file
-(issue: [#15](https://github.com/opendistro-for-elasticsearch/sql-cli/issues/15))
-* BugFix[#19](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/19): Fix test failures 
-(issue: [#16](https://github.com/opendistro-for-elasticsearch/sql-cli/issues/16))
-* BugFix[#26](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/26): Update usage gif, fix http/https issue when connect to AWS Elasticsearch (issue: [#25](https://github.com/opendistro-for-elasticsearch/sql-cli/issues/25))
-
-
diff --git a/sql-cli/release-notes/odfe-sql-cli.release-notes-1.8.0.0.md b/sql-cli/release-notes/odfe-sql-cli.release-notes-1.8.0.0.md
deleted file mode 100644
index c5f6a8c985..0000000000
--- a/sql-cli/release-notes/odfe-sql-cli.release-notes-1.8.0.0.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## 2020-05-18 Version 1.8.0.0
-
-### Features
-#### Elasticsearch and OpenSearch SQL Plugin Compatibility
-* Feature [#41](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/41): Elasticsearch 7.7.0 and OpenSearch SQL Plugin 1.8.0 compatibility (issue: [#40](https://github.com/opendistro-for-elasticsearch/sql-cli/issues/40))
diff --git a/sql-cli/release-notes/odfe-sql-cli.release-notes-1.9.0.0.md b/sql-cli/release-notes/odfe-sql-cli.release-notes-1.9.0.0.md
deleted file mode 100644
index b1e50eb7fe..0000000000
--- a/sql-cli/release-notes/odfe-sql-cli.release-notes-1.9.0.0.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## 2020-06-24 Version 1.9.0.0 (Current)
-
-### Features
-#### Elasticsearch and OpenSearch SQL Plugin Compatibility
-* Feature [#55](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/55): Elasticsearch 7.8.0 and OpenSearch SQL Plugin 1.9.0 compatibility
-(issue: [#54](https://github.com/opendistro-for-elasticsearch/sql-cli/issues/54))
-
-#### Documentation
-* Feature [#48](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/48): Added README badges
-
-### Enhancements
-* Enhancement [#45](https://github.com/opendistro-for-elasticsearch/sql-cli/pull/45): Update project layout for better module import
-(issue: [#43](https://github.com/opendistro-for-elasticsearch/sql-cli/issues/43))
diff --git a/sql-cli/requirements-dev.txt b/sql-cli/requirements-dev.txt
deleted file mode 100644
index e9a7532743..0000000000
--- a/sql-cli/requirements-dev.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-pytest==4.6.3
-mock==3.0.5
-pexpect==3.3
-twine==1.13.0
-tox>=1.9.2
\ No newline at end of file
diff --git a/sql-cli/screenshots/usage.gif b/sql-cli/screenshots/usage.gif
deleted file mode 100644
index 20299ddb4d..0000000000
Binary files a/sql-cli/screenshots/usage.gif and /dev/null differ
diff --git a/sql-cli/setup.py b/sql-cli/setup.py
deleted file mode 100644
index b9d06b3763..0000000000
--- a/sql-cli/setup.py
+++ /dev/null
@@ -1,66 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-import re
-import ast
-
-from setuptools import setup, find_packages
-
-install_requirements = [
-    "click == 7.1.1",
-    "prompt_toolkit == 2.0.6",
-    "Pygments == 2.11.1",
-    "cli_helpers[styles] == 1.2.1",
-    "opensearch-py == 1.0.0",
-    "pyfiglet == 0.8.post1",
-    "boto3 == 1.16.29",
-    "requests-aws4auth == 0.9",
-]
-
-_version_re = re.compile(r"__version__\s+=\s+(.*)")
-
-with open("src/opensearch_sql_cli/__init__.py", "rb") as f:
-    version = str(ast.literal_eval(_version_re.search(f.read().decode("utf-8")).group(1)))
-
-description = "OpenSearch SQL CLI with auto-completion and syntax highlighting"
-
-with open("README.md", "r") as fh:
-    long_description = fh.read()
-
-setup(
-    name="opensearchsql",
-    author="OpenSearch",
-    author_email="opensearch-infra@amazon.com",
-    version=version,
-    license="Apache 2.0",
-    url="https://docs-beta.opensearch.org/search-plugins/sql/cli/",
-    packages=find_packages("src"),
-    package_dir={"": "src"},
-    package_data={"opensearch_sql_cli": ["conf/clirc", "opensearch_literals/opensearch_literals.json"]},
-    description=description,
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    install_requires=install_requirements,
-    entry_points={"console_scripts": ["opensearchsql=opensearch_sql_cli.main:cli"]},
-    classifiers=[
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: Apache Software License",
-        "Operating System :: Unix",
-        "Operating System :: POSIX :: Linux",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: SQL",
-        "Topic :: Database",
-        "Topic :: Database :: Front-Ends",
-        "Topic :: Software Development",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-    ],
-    python_requires=">=3.0",
-)
diff --git a/sql-cli/src/opensearch_sql_cli/__init__.py b/sql-cli/src/opensearch_sql_cli/__init__.py
deleted file mode 100644
index 770a0c7f59..0000000000
--- a/sql-cli/src/opensearch_sql_cli/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-__version__ = "1.1.0"
diff --git a/sql-cli/src/opensearch_sql_cli/conf/__init__.py b/sql-cli/src/opensearch_sql_cli/conf/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql-cli/src/opensearch_sql_cli/conf/clirc b/sql-cli/src/opensearch_sql_cli/conf/clirc
deleted file mode 100644
index 83fd0e5d3a..0000000000
--- a/sql-cli/src/opensearch_sql_cli/conf/clirc
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
-# Copyright 2020, Amazon Web Services Inc.
-# 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.
-
-# vi: ft=dosini
-[main]
-
-# Multi-line mode allows breaking up the sql statements into multiple lines. If
-# this is set to True, then the end of the statements must have a semi-colon.
-# If this is set to False then sql statements can't be split into multiple
-# lines. End of line (return) is considered as the end of the statement.
-multi_line = True
-
-# If multi_line_mode is set to "opensearchsql_cli", in multi-line mode, [Enter] will execute
-# the current input if the input ends in a semicolon.
-# If multi_line_mode is set to "safe", in multi-line mode, [Enter] will always
-# insert a newline, and [Esc] [Enter] or [Alt]-[Enter] must be used to execute
-# a command.
-multi_line_mode = opensearchsql_cli
-
-# log_file location.
-# In Unix/Linux: ~/.config/opensearchsql-cli/log
-# In Windows: %USERPROFILE%\AppData\Local\dbcli\opensearchsql-cli\log
-# %USERPROFILE% is typically C:\Users\{username}
-log_file = default
-
-# history_file location.
-# In Unix/Linux: ~/.config/opensearchsql-cli/history
-# In Windows: %USERPROFILE%\AppData\Local\dbcli\opensearchsql-cli\history
-# %USERPROFILE% is typically C:\Users\{username}
-history_file = default
-
-# Default log level. Possible values: "CRITICAL", "ERROR", "WARNING", "INFO"
-# and "DEBUG". "NONE" disables logging.
-log_level = INFO
-
-# Table format. Possible values: psql, plain, simple, grid, fancy_grid, pipe,
-# ascii, double, github, orgtbl, rst, mediawiki, html, latex, latex_booktabs,
-# textile, moinmoin, jira, vertical, tsv, csv.
-# Recommended: psql, fancy_grid and grid.
-table_format = psql
-
-# Syntax Style. Possible values: manni, igor, xcode, vim, autumn, vs, rrt,
-# native, perldoc, borland, tango, emacs, friendly, monokai, paraiso-dark,
-# colorful, murphy, bw, pastie, paraiso-light, trac, default, fruity
-syntax_style = default
-
-# Set threshold for row limit prompt. Use 0 to disable prompt.
-# maybe not now, since OpenSearch sql plugin returns 200 rows of data by default if not
-# using LIMIT.
-row_limit = 1000
-
-# Character used to left pad multi-line queries to match the prompt size.
-multiline_continuation_char = '.'
-
-# The string used in place of a null value.
-null_string = 'null'
-
-# Custom colors for the completion menu, toolbar, etc.
-[colors]
-completion-menu.completion.current = 'bg:#ffffff #000000'
-completion-menu.completion = 'bg:#008888 #ffffff'
-completion-menu.meta.completion.current = 'bg:#44aaaa #000000'
-completion-menu.meta.completion = 'bg:#448888 #ffffff'
-completion-menu.multi-column-meta = 'bg:#aaffff #000000'
-scrollbar.arrow = 'bg:#003333'
-scrollbar = 'bg:#00aaaa'
-selected = '#ffffff bg:#6666aa'
-search = '#ffffff bg:#4444aa'
-search.current = '#ffffff bg:#44aa44'
-bottom-toolbar = 'bg:#222222 #aaaaaa'
-bottom-toolbar.off = 'bg:#222222 #888888'
-bottom-toolbar.on = 'bg:#222222 #ffffff'
-search-toolbar = 'noinherit bold'
-search-toolbar.text = 'nobold'
-system-toolbar = 'noinherit bold'
-arg-toolbar = 'noinherit bold'
-arg-toolbar.text = 'nobold'
-bottom-toolbar.transaction.valid = 'bg:#222222 #00ff5f bold'
-bottom-toolbar.transaction.failed = 'bg:#222222 #ff005f bold'
-
-# style classes for colored table output
-output.header = "#00ff5f bold"
-output.odd-row = ""
-output.even-row = ""
diff --git a/sql-cli/src/opensearch_sql_cli/config.py b/sql-cli/src/opensearch_sql_cli/config.py
deleted file mode 100644
index a00d9568e1..0000000000
--- a/sql-cli/src/opensearch_sql_cli/config.py
+++ /dev/null
@@ -1,76 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-import errno
-import os
-import platform
-import shutil
-
-from os.path import expanduser, exists, dirname
-from configobj import ConfigObj
-
-
-def config_location():
-    """Return absolute conf file path according to different OS."""
-    if "XDG_CONFIG_HOME" in os.environ:
-        return "%s/opensearchsql-cli/" % expanduser(os.environ["XDG_CONFIG_HOME"])
-    elif platform.system() == "Windows":
-        # USERPROFILE is typically C:\Users\{username}
-        return "%s\\AppData\\Local\\dbcli\\opensearchsql-cli\\" % os.getenv("USERPROFILE")
-    else:
-        return expanduser("~/.config/opensearchsql-cli/")
-
-
-def _load_config(user_config, default_config=None):
-    config = ConfigObj()
-    config.merge(ConfigObj(default_config, interpolation=False))
-    config.merge(ConfigObj(expanduser(user_config), interpolation=False, encoding="utf-8"))
-    config.filename = expanduser(user_config)
-
-    return config
-
-
-def ensure_dir_exists(path):
-    """
-    Try to create config file in OS.
-
-    Ignore existing destination. Raise error for other OSError, such as errno.EACCES (Permission denied),
-    errno.ENOSPC (No space left on device)
-    """
-    parent_dir = expanduser(dirname(path))
-    try:
-        os.makedirs(parent_dir)
-    except OSError as exc:
-        if exc.errno != errno.EEXIST:
-            raise
-
-
-def _write_default_config(source, destination, overwrite=False):
-    destination = expanduser(destination)
-    if not overwrite and exists(destination):
-        return
-
-    ensure_dir_exists(destination)
-    shutil.copyfile(source, destination)
-
-
-# https://stackoverflow.com/questions/40193112/python-setuptools-distribute-configuration-files-to-os-specific-directories
-def get_config(clirc_file=None):
-    """
-    Get config for opensearchsql cli.
-
-    This config comes from either existing config in the OS, or create a config file in the OS, and write default config
-    including in the package to it.
-    """
-    from .conf import __file__ as package_root
-
-    package_root = os.path.dirname(package_root)
-
-    clirc_file = clirc_file or "%sconfig" % config_location()
-    default_config = os.path.join(package_root, "clirc")
-
-    _write_default_config(default_config, clirc_file)
-
-    return _load_config(clirc_file, default_config)
diff --git a/sql-cli/src/opensearch_sql_cli/formatter.py b/sql-cli/src/opensearch_sql_cli/formatter.py
deleted file mode 100644
index 2087bb0c1e..0000000000
--- a/sql-cli/src/opensearch_sql_cli/formatter.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-import click
-import itertools
-
-from cli_helpers.tabular_output import TabularOutputFormatter
-from cli_helpers.tabular_output.preprocessors import format_numbers
-from opensearchpy.exceptions import OpenSearchException
-
-click.disable_unicode_literals_warning = True
-
-
-class Formatter:
-    """Formatter instance is used to format the data retrieved from OpenSearch."""
-
-    def __init__(self, settings):
-        """A formatter can be customized by passing settings as a parameter."""
-        self.settings = settings
-        self.table_format = "vertical" if self.settings.is_vertical else self.settings.table_format
-        self.max_width = self.settings.max_width
-
-        def format_array(val):
-            if val is None:
-                return self.settings.missingval
-            if not isinstance(val, list):
-                return val
-            return "[" + ",".join(str(format_array(e)) for e in val) + "]"
-
-        def format_arrays(field_data, headers, **_):
-            field_data = list(field_data)
-            for row in field_data:
-                row[:] = [format_array(val) if isinstance(val, list) else val for val in row]
-
-            return field_data, headers
-
-        self.output_kwargs = {
-            "sep_title": "RECORD {n}",
-            "sep_character": "-",
-            "sep_length": (1, 25),
-            "missing_value": self.settings.missingval,
-            "preprocessors": (format_numbers, format_arrays),
-            "disable_numparse": True,
-            "preserve_whitespace": True,
-            "style": self.settings.style_output,
-        }
-
-    def format_output(self, data):
-        """Format data.
-
-        :param data: raw data get from OpenSearch
-        :return: formatted output, it's either table or vertical format
-        """
-        formatter = TabularOutputFormatter(format_name=self.table_format)
-
-        # parse response data
-        try:
-            datarows = data["datarows"]
-            schema = data["schema"]
-            total_hits = data["total"]
-            cur_size = data["size"]
-        except KeyError:
-            # tmp fix: in case some errors in query engine returns 200 in http response, leading to a parsing error
-            # TODO: remove this after #311 in sql repo is fixed
-            raise OpenSearchException(data)
-
-        # unused data for now,
-        fields = []
-        types = []
-
-        # get header and type as lists, for future usage
-        for i in schema:
-            fields.append(i.get("alias", i["name"]))
-            types.append(i["type"])
-
-        output = formatter.format_output(datarows, fields, **self.output_kwargs)
-        output_message = "fetched rows / total rows = %d/%d" % (cur_size, total_hits)
-
-        # OpenSearch sql has a restriction of retrieving 200 rows of data by default
-        if total_hits > 200 == cur_size:
-            output_message += "\n" + "Attention: Use LIMIT keyword when retrieving more than 200 rows of data"
-
-        # check width overflow, change format_name for better visual effect
-        first_line = next(output)
-        output = itertools.chain([output_message], [first_line], output)
-
-        if len(first_line) > self.max_width:
-            click.secho(message="Output longer than terminal width", fg="red")
-            if click.confirm("Do you want to display data vertically for better visual effect?"):
-                output = formatter.format_output(datarows, fields, format_name="vertical", **self.output_kwargs)
-                output = itertools.chain([output_message], output)
-
-        # TODO: if decided to add row_limit. Refer to pgcli -> main -> line 866.
-
-        return output
diff --git a/sql-cli/src/opensearch_sql_cli/main.py b/sql-cli/src/opensearch_sql_cli/main.py
deleted file mode 100644
index ec2092d51b..0000000000
--- a/sql-cli/src/opensearch_sql_cli/main.py
+++ /dev/null
@@ -1,134 +0,0 @@
-from __future__ import unicode_literals
-
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-
-import click
-import sys
-
-from .config import config_location
-from .opensearch_connection import OpenSearchConnection
-from .utils import OutputSettings
-from .opensearchsql_cli import OpenSearchSqlCli
-from .formatter import Formatter
-
-click.disable_unicode_literals_warning = True
-
-
-@click.command()
-@click.argument("endpoint", default="http://localhost:9200")
-@click.option("-q", "--query", "query", type=click.STRING, help="Run single query in non-interactive mode")
-@click.option("-e", "--explain", "explain", is_flag=True, help="Explain SQL to OpenSearch DSL")
-@click.option(
-    "--clirc",
-    default=config_location() + "config",
-    envvar="CLIRC",
-    help="Location of clirc file.",
-    type=click.Path(dir_okay=False),
-)
-@click.option(
-    "-f",
-    "--format",
-    "result_format",
-    type=click.STRING,
-    default="jdbc",
-    help="Specify format of output, jdbc/csv. By default, it's jdbc",
-)
-@click.option(
-    "-v",
-    "--vertical",
-    "is_vertical",
-    is_flag=True,
-    default=False,
-    help="Convert output from horizontal to vertical. Only used for non-interactive mode",
-)
-@click.option("-u", "--username", help="Username to connect to the OpenSearch")
-@click.option("-w", "--password", help="password corresponding to username")
-@click.option(
-    "-p",
-    "--pager",
-    "always_use_pager",
-    is_flag=True,
-    default=False,
-    help="Always use pager to display output. If not specified, smart pager mode will be used according to the \
-         length/width of output",
-)
-@click.option(
-    "--aws-auth",
-    "use_aws_authentication",
-    is_flag=True,
-    default=False,
-    help="Use AWS sigV4 to connect to AWS OpenSearch domain",
-)
-@click.option(
-    "-l",
-    "--language",
-    "query_language",
-    type=click.STRING,
-    default="sql",
-    help="SQL OR PPL",
-)
-@click.option(
-    "-t",
-    "--timeout",
-    "response_timeout",
-    type=click.INT,
-    default=10,
-    help="Timeout in seconds to await a response from the server"
-)
-def cli(
-    endpoint,
-    query,
-    explain,
-    clirc,
-    result_format,
-    is_vertical,
-    username,
-    password,
-    always_use_pager,
-    use_aws_authentication,
-    query_language,
-    response_timeout
-):
-    """
-    Provide endpoint for OpenSearch client.
-    By default, it uses http://localhost:9200 to connect.
-    """
-
-    if username and password:
-        http_auth = (username, password)
-    else:
-        http_auth = None
-
-    # TODO add validation for endpoint to avoid the cost of connecting to some obviously invalid endpoint
-
-    # handle single query without more interaction with user
-    if query:
-        opensearch_executor = OpenSearchConnection(endpoint, http_auth, use_aws_authentication)
-        opensearch_executor.set_connection()
-        if explain:
-            output = opensearch_executor.execute_query(query, explain=True, use_console=False)
-        else:
-            output = opensearch_executor.execute_query(query, output_format=result_format, use_console=False)
-            if output and result_format == "jdbc":
-                settings = OutputSettings(table_format="psql", is_vertical=is_vertical)
-                formatter = Formatter(settings)
-                output = formatter.format_output(output)
-                output = "\n".join(output)
-
-        click.echo(output)
-        sys.exit(0)
-
-    # use console to interact with user
-    opensearchsql_cli = OpenSearchSqlCli(clirc_file=clirc, always_use_pager=always_use_pager,
-                                         use_aws_authentication=use_aws_authentication, query_language=query_language,
-                                         response_timeout=response_timeout)
-    opensearchsql_cli.connect(endpoint, http_auth)
-    opensearchsql_cli.run_cli()
-
-
-if __name__ == "__main__":
-    cli()
diff --git a/sql-cli/src/opensearch_sql_cli/opensearch_buffer.py b/sql-cli/src/opensearch_sql_cli/opensearch_buffer.py
deleted file mode 100644
index 33f063dbc0..0000000000
--- a/sql-cli/src/opensearch_sql_cli/opensearch_buffer.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from __future__ import unicode_literals
-
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-
-from prompt_toolkit.enums import DEFAULT_BUFFER
-from prompt_toolkit.filters import Condition
-from prompt_toolkit.application import get_app
-
-
-def opensearch_is_multiline(opensearchsql_cli):
-    """Return function that returns boolean to enable/unable multiline mode."""
-
-    @Condition
-    def cond():
-        doc = get_app().layout.get_buffer_by_name(DEFAULT_BUFFER).document
-
-        if not opensearchsql_cli.multi_line:
-            return False
-        if opensearchsql_cli.multiline_mode == "safe":
-            return True
-        else:
-            return not _multiline_exception(doc.text)
-
-    return cond
-
-
-def _is_complete(sql):
-    # A complete command is an sql statement that ends with a semicolon
-    return sql.endswith(";")
-
-
-def _multiline_exception(text):
-    text = text.strip()
-    return _is_complete(text)
diff --git a/sql-cli/src/opensearch_sql_cli/opensearch_connection.py b/sql-cli/src/opensearch_sql_cli/opensearch_connection.py
deleted file mode 100644
index c6c8a7b9d1..0000000000
--- a/sql-cli/src/opensearch_sql_cli/opensearch_connection.py
+++ /dev/null
@@ -1,189 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-import boto3
-import click
-import logging
-import ssl
-import sys
-import urllib3
-
-from opensearchpy import OpenSearch, RequestsHttpConnection
-from opensearchpy.exceptions import ConnectionError, RequestError
-from opensearchpy.connection import create_ssl_context
-from requests_aws4auth import AWS4Auth
-
-
-class OpenSearchConnection:
-    """OpenSearchConnection instances are used to set up and maintain client to OpenSearch cluster,
-    as well as send user's SQL query to OpenSearch.
-    """
-
-    def __init__(
-        self,
-        endpoint=None,
-        http_auth=None,
-        use_aws_authentication=False,
-        query_language="sql",
-        response_timeout=10
-    ):
-        """Initialize an OpenSearchConnection instance.
-
-        Set up client and get indices list.
-
-        :param endpoint: an url in the format of "http://localhost:9200"
-        :param http_auth: a tuple in the format of (username, password)
-        """
-        self.client = None
-        self.ssl_context = None
-        self.opensearch_version = None
-        self.plugins = None
-        self.aws_auth = None
-        self.indices_list = []
-        self.endpoint = endpoint
-        self.http_auth = http_auth
-        self.use_aws_authentication = use_aws_authentication
-        self.query_language = query_language
-        self.response_timeout = response_timeout
-
-    def get_indices(self):
-        if self.client:
-            res = self.client.indices.get_alias().keys()
-            self.indices_list = list(res)
-
-    def get_aes_client(self):
-        service = "es"
-        session = boto3.Session()
-        credentials = session.get_credentials()
-        region = session.region_name
-
-        if credentials is not None:
-            self.aws_auth = AWS4Auth(credentials.access_key, credentials.secret_key, region, service, session_token=credentials.token)
-        else:
-            click.secho(
-                message="Can not retrieve your AWS credentials, check your AWS config",
-                fg="red",
-            )
-
-        aes_client = OpenSearch(
-            hosts=[self.endpoint],
-            http_auth=self.aws_auth,
-            use_ssl=True,
-            verify_certs=True,
-            connection_class=RequestsHttpConnection,
-        )
-
-        return aes_client
-
-    def get_opensearch_client(self):
-        ssl_context = self.ssl_context = create_ssl_context()
-        ssl_context.check_hostname = False
-        ssl_context.verify_mode = ssl.CERT_NONE
-
-        opensearch_client = OpenSearch(
-            [self.endpoint],
-            http_auth=self.http_auth,
-            verify_certs=False,
-            ssl_context=ssl_context,
-            connection_class=RequestsHttpConnection,
-        )
-
-        return opensearch_client
-
-    def is_sql_plugin_installed(self, opensearch_client):
-        self.plugins = opensearch_client.cat.plugins(params={"s": "component", "v": "true"})
-        sql_plugin_name_list = ["opensearch-sql"]
-        return any(x in self.plugins for x in sql_plugin_name_list)
-
-    def set_connection(self, is_reconnect=False):
-        urllib3.disable_warnings()
-        logging.captureWarnings(True)
-
-        if self.http_auth:
-            opensearch_client = self.get_opensearch_client()
-
-        elif self.use_aws_authentication:
-            opensearch_client = self.get_aes_client()
-        else:
-            opensearch_client = OpenSearch([self.endpoint], verify_certs=True)
-
-        # check connection. check OpenSearch SQL plugin availability.
-        try:
-            if not self.is_sql_plugin_installed(opensearch_client):
-                click.secho(
-                    message="Must have OpenSearch SQL plugin installed in your OpenSearch"
-                    "instance!\nCheck this out: https://github.com/opensearch-project/sql",
-                    fg="red",
-                )
-                click.echo(self.plugins)
-                sys.exit()
-
-            # info() may throw ConnectionError, if connection fails to establish
-            info = opensearch_client.info()
-            self.opensearch_version = info["version"]["number"]
-            self.client = opensearch_client
-            self.get_indices()
-
-        except ConnectionError as error:
-            if is_reconnect:
-                # re-throw error
-                raise error
-            else:
-                click.secho(message="Can not connect to endpoint %s" % self.endpoint, fg="red")
-                click.echo(repr(error))
-                sys.exit(0)
-
-    def handle_server_close_connection(self):
-        """Used during CLI execution."""
-        try:
-            click.secho(message="Reconnecting...", fg="green")
-            self.set_connection(is_reconnect=True)
-            click.secho(message="Reconnected! Please run query again", fg="green")
-        except ConnectionError as reconnection_err:
-            click.secho(
-                message="Connection Failed. Check your OpenSearch is running and then come back",
-                fg="red",
-            )
-            click.secho(repr(reconnection_err), err=True, fg="red")
-
-    def execute_query(self, query, output_format="jdbc", explain=False, use_console=True):
-        """
-        Handle user input, send SQL query and get response.
-
-        :param use_console: use console to interact with user, otherwise it's single query
-        :param query: SQL query
-        :param output_format: jdbc/csv
-        :param explain: if True, use _explain API.
-        :return: raw http response
-        """
-
-        # TODO: consider add evaluator/handler to filter obviously-invalid input,
-        #  to save cost of http client.
-        # deal with input
-        final_query = query.strip().strip(";")
-
-        try:
-            if self.query_language == "sql":
-                data = self.client.transport.perform_request(
-                    url="/_plugins/_sql/_explain" if explain else "/_plugins/_sql/",
-                    method="POST",
-                    params=None if explain else {"format": output_format, "request_timeout": self.response_timeout},
-                    body={"query": final_query},
-                )
-            else:
-                data = self.client.transport.perform_request(
-                    url="/_plugins/_ppl/_explain" if explain else "/_plugins/_ppl/",
-                    method="POST",
-                    params=None if explain else {"format": output_format, "request_timeout": self.response_timeout},
-                    body={"query": final_query},
-                )
-            return data
-
-        # handle client lost during execution
-        except ConnectionError:
-            if use_console:
-                self.handle_server_close_connection()
-        except RequestError as error:
-            click.secho(message=str(error.info["error"]), fg="red")
diff --git a/sql-cli/src/opensearch_sql_cli/opensearch_literals/__init__.py b/sql-cli/src/opensearch_sql_cli/opensearch_literals/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql-cli/src/opensearch_sql_cli/opensearch_literals/opensearch_literals.json b/sql-cli/src/opensearch_sql_cli/opensearch_literals/opensearch_literals.json
deleted file mode 100644
index 59f4f45fbf..0000000000
--- a/sql-cli/src/opensearch_sql_cli/opensearch_literals/opensearch_literals.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "keywords": [
-    "ADD",
-    "ALIASES",
-    "ALL",
-    "AND",
-    "AS",
-    "ASC",
-    "BETWEEN",
-    "BY",
-    "DATE",
-    "DELETE",
-    "DESC",
-    "DESCRIBE",
-    "FROM",
-    "FULL",
-    "GROUP BY",
-    "HAVING",
-    "IN",
-    "INTO",
-    "IS",
-    "INNER",
-    "JOIN",
-    "KEY",
-    "LEFT",
-    "LIKE",
-    "LIMIT",
-    "MINUS",
-    "NOT",
-    "NULLS",
-    "ON",
-    "OR",
-    "ORDER BY",
-    "SELECT",
-    "SHOW",
-    "TABLES",
-    "UNION",
-    "WHEN",
-    "WHERE"
-  ],
-  "functions": [
-    "AVG",
-    "CONCAT_WS",
-    "COUNT",
-    "DISTINCT",
-    "FLOOR",
-    "ISNULL",
-    "LOG",
-    "LOG10",
-    "MAX",
-    "MID",
-    "MIN",
-    "ROUND",
-    "SUBSTRING",
-    "SUM",
-    "SQRT"
-  ]
-}
\ No newline at end of file
diff --git a/sql-cli/src/opensearch_sql_cli/opensearch_style.py b/sql-cli/src/opensearch_sql_cli/opensearch_style.py
deleted file mode 100644
index 7cddb83169..0000000000
--- a/sql-cli/src/opensearch_sql_cli/opensearch_style.py
+++ /dev/null
@@ -1,87 +0,0 @@
-from __future__ import unicode_literals
-
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-
-import logging
-
-import pygments.styles
-from pygments.token import string_to_tokentype, Token
-from pygments.style import Style as PygmentsStyle
-from pygments.util import ClassNotFound
-from prompt_toolkit.styles.pygments import style_from_pygments_cls
-from prompt_toolkit.styles import merge_styles, Style
-
-logger = logging.getLogger(__name__)
-
-# map Pygments tokens (ptk 1.0) to class names (ptk 2.0).
-TOKEN_TO_PROMPT_STYLE = {
-    Token.Menu.Completions.Completion.Current: "completion-menu.completion.current",
-    Token.Menu.Completions.Completion: "completion-menu.completion",
-    Token.Menu.Completions.Meta.Current: "completion-menu.meta.completion.current",
-    Token.Menu.Completions.Meta: "completion-menu.meta.completion",
-    Token.Menu.Completions.MultiColumnMeta: "completion-menu.multi-column-meta",
-    Token.Menu.Completions.ProgressButton: "scrollbar.arrow",  # best guess
-    Token.Menu.Completions.ProgressBar: "scrollbar",  # best guess
-    Token.SelectedText: "selected",
-    Token.SearchMatch: "search",
-    Token.SearchMatch.Current: "search.current",
-    Token.Toolbar: "bottom-toolbar",
-    Token.Toolbar.Off: "bottom-toolbar.off",
-    Token.Toolbar.On: "bottom-toolbar.on",
-    Token.Toolbar.Search: "search-toolbar",
-    Token.Toolbar.Search.Text: "search-toolbar.text",
-    Token.Toolbar.System: "system-toolbar",
-    Token.Toolbar.Arg: "arg-toolbar",
-    Token.Toolbar.Arg.Text: "arg-toolbar.text",
-    Token.Toolbar.Transaction.Valid: "bottom-toolbar.transaction.valid",
-    Token.Toolbar.Transaction.Failed: "bottom-toolbar.transaction.failed",
-    Token.Output.Header: "output.header",
-    Token.Output.OddRow: "output.odd-row",
-    Token.Output.EvenRow: "output.even-row",
-}
-
-# reverse dict for cli_helpers, because they still expect Pygments tokens.
-PROMPT_STYLE_TO_TOKEN = {v: k for k, v in TOKEN_TO_PROMPT_STYLE.items()}
-
-
-def style_factory(name, cli_style):
-    try:
-        style = pygments.styles.get_style_by_name(name)
-    except ClassNotFound:
-        style = pygments.styles.get_style_by_name("native")
-
-    prompt_styles = []
-
-    for token in cli_style:
-        # treat as prompt style name (2.0). See default style names here:
-        # https://github.com/jonathanslenders/python-prompt-toolkit/blob/master/prompt_toolkit/styles/defaults.py
-        prompt_styles.append((token, cli_style[token]))
-
-    override_style = Style([("bottom-toolbar", "noreverse")])
-    return merge_styles([style_from_pygments_cls(style), override_style, Style(prompt_styles)])
-
-
-def style_factory_output(name, cli_style):
-    try:
-        style = pygments.styles.get_style_by_name(name).styles
-    except ClassNotFound:
-        style = pygments.styles.get_style_by_name("native").styles
-
-    for token in cli_style:
-
-        if token in PROMPT_STYLE_TO_TOKEN:
-            token_type = PROMPT_STYLE_TO_TOKEN[token]
-            style.update({token_type: cli_style[token]})
-        else:
-            # TODO: cli helpers will have to switch to ptk.Style
-            logger.error("Unhandled style / class name: %s", token)
-
-    class OutputStyle(PygmentsStyle):
-        default_style = ""
-        styles = style
-
-    return OutputStyle
diff --git a/sql-cli/src/opensearch_sql_cli/opensearchsql_cli.py b/sql-cli/src/opensearch_sql_cli/opensearchsql_cli.py
deleted file mode 100644
index 8b14144b0d..0000000000
--- a/sql-cli/src/opensearch_sql_cli/opensearchsql_cli.py
+++ /dev/null
@@ -1,191 +0,0 @@
-from __future__ import unicode_literals
-
-from os.path import expanduser, expandvars
-
-from prompt_toolkit.history import FileHistory
-
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-
-import click
-import re
-import pyfiglet
-import os
-import json
-
-from prompt_toolkit.completion import WordCompleter
-from prompt_toolkit.enums import DEFAULT_BUFFER
-from prompt_toolkit.shortcuts import PromptSession
-from prompt_toolkit.filters import HasFocus, IsDone
-from prompt_toolkit.lexers import PygmentsLexer
-from prompt_toolkit.layout.processors import ConditionalProcessor, HighlightMatchingBracketProcessor
-from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
-from pygments.lexers.sql import SqlLexer
-
-from .config import get_config, config_location
-from .opensearch_connection import OpenSearchConnection
-from .opensearch_buffer import opensearch_is_multiline
-from .opensearch_style import style_factory, style_factory_output
-from .formatter import Formatter
-from .utils import OutputSettings
-from . import __version__
-
-
-# Ref: https://stackoverflow.com/questions/30425105/filter-special-chars-such-as-color-codes-from-shell-output
-COLOR_CODE_REGEX = re.compile(r"\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\))")
-
-click.disable_unicode_literals_warning = True
-
-
-class OpenSearchSqlCli:
-    """OpenSearchSqlCli instance is used to build and run the OpenSearch SQL CLI."""
-
-    def __init__(self, clirc_file=None, always_use_pager=False, use_aws_authentication=False, query_language="sql",
-                 response_timeout=10):
-        # Load conf file
-        config = self.config = get_config(clirc_file)
-        literal = self.literal = self._get_literals()
-
-        self.prompt_app = None
-        self.opensearch_executor = None
-        self.query_language = query_language
-        self.always_use_pager = always_use_pager
-        self.use_aws_authentication = use_aws_authentication
-        self.response_timeout = response_timeout
-        self.keywords_list = literal["keywords"]
-        self.functions_list = literal["functions"]
-        self.syntax_style = config["main"]["syntax_style"]
-        self.cli_style = config["colors"]
-        self.table_format = config["main"]["table_format"]
-        self.multiline_continuation_char = config["main"]["multiline_continuation_char"]
-        self.multi_line = config["main"].as_bool("multi_line")
-        self.multiline_mode = config["main"].get("multi_line_mode", "src")
-        self.history_file = config["main"]["history_file"]
-        self.null_string = config["main"].get("null_string", "null")
-        self.style_output = style_factory_output(self.syntax_style, self.cli_style)
-
-        if self.history_file == "default":
-            self.history_file = os.path.join(config_location(), "history")
-        else:
-            self.history_file = expandvars(expanduser(self.history_file))
-
-    def build_cli(self):
-        # TODO: Optimize index suggestion to serve indices options only at the needed position, such as 'from'
-        indices_list = self.opensearch_executor.indices_list
-        sql_completer = WordCompleter(self.keywords_list + self.functions_list + indices_list, ignore_case=True)
-
-        # https://stackoverflow.com/a/13726418 denote multiple unused arguments of callback in Python
-        def get_continuation(width, *_):
-            continuation = self.multiline_continuation_char * (width - 1) + " "
-            return [("class:continuation", continuation)]
-
-        prompt_app = PromptSession(
-            lexer=PygmentsLexer(SqlLexer),
-            completer=sql_completer,
-            complete_while_typing=True,
-            history=FileHistory(self.history_file),
-            style=style_factory(self.syntax_style, self.cli_style),
-            prompt_continuation=get_continuation,
-            multiline=opensearch_is_multiline(self),
-            auto_suggest=AutoSuggestFromHistory(),
-            input_processors=[
-                ConditionalProcessor(
-                    processor=HighlightMatchingBracketProcessor(chars="[](){}"),
-                    filter=HasFocus(DEFAULT_BUFFER) & ~IsDone(),
-                )
-            ],
-            tempfile_suffix=".sql",
-        )
-
-        return prompt_app
-
-    def run_cli(self):
-        """
-        Print welcome page, goodbye message.
-
-        Run the CLI and keep listening to user's input.
-        """
-        self.prompt_app = self.build_cli()
-
-        settings = OutputSettings(
-            max_width=self.prompt_app.output.get_size().columns,
-            style_output=self.style_output,
-            table_format=self.table_format,
-            missingval=self.null_string,
-        )
-
-        # print Banner
-        banner = pyfiglet.figlet_format("OpenSearch", font="slant")
-        print(banner)
-
-        # print info on the welcome page
-        print("Server: OpenSearch %s" % self.opensearch_executor.opensearch_version)
-        print("CLI Version: %s" % __version__)
-        print("Endpoint: %s" % self.opensearch_executor.endpoint)
-        print("Query Language: %s" % self.query_language)
-
-        while True:
-            try:
-                text = self.prompt_app.prompt(message="opensearchsql> ")
-            except KeyboardInterrupt:
-                continue  # Control-C pressed. Try again.
-            except EOFError:
-                break  # Control-D pressed.
-
-            try:
-                output = self.opensearch_executor.execute_query(text)
-                if output:
-                    formatter = Formatter(settings)
-                    formatted_output = formatter.format_output(output)
-                    self.echo_via_pager("\n".join(formatted_output))
-
-            except Exception as e:
-                print(repr(e))
-
-        print("See you next search!")
-
-    def is_too_wide(self, line):
-        """Will this line be too wide to fit into terminal?"""
-        if not self.prompt_app:
-            return False
-        return len(COLOR_CODE_REGEX.sub("", line)) > self.prompt_app.output.get_size().columns
-
-    def is_too_tall(self, lines):
-        """Are there too many lines to fit into terminal?"""
-        if not self.prompt_app:
-            return False
-        return len(lines) >= (self.prompt_app.output.get_size().rows - 4)
-
-    def echo_via_pager(self, text, color=None):
-        lines = text.split("\n")
-        if self.always_use_pager:
-            click.echo_via_pager(text, color=color)
-
-        elif self.is_too_tall(lines) or any(self.is_too_wide(l) for l in lines):
-            click.echo_via_pager(text, color=color)
-        else:
-            click.echo(text, color=color)
-
-    def connect(self, endpoint, http_auth=None):
-        self.opensearch_executor = OpenSearchConnection(
-            endpoint, http_auth, self.use_aws_authentication, self.query_language, self.response_timeout
-        )
-        self.opensearch_executor.set_connection()
-
-    def _get_literals(self):
-        """Parse "opensearch_literals.json" with literal type of SQL "keywords" and "functions", which
-        are SQL keywords and functions supported by OpenSearch SQL Plugin.
-
-        :return: a dict that is parsed from opensearch_literals.json
-        """
-        from .opensearch_literals import __file__ as package_root
-
-        package_root = os.path.dirname(package_root)
-
-        literal_file = os.path.join(package_root, "opensearch_literals.json")
-        with open(literal_file) as f:
-            literals = json.load(f)
-            return literals
diff --git a/sql-cli/src/opensearch_sql_cli/utils.py b/sql-cli/src/opensearch_sql_cli/utils.py
deleted file mode 100644
index 2451d8d092..0000000000
--- a/sql-cli/src/opensearch_sql_cli/utils.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-import sys
-
-from collections import namedtuple
-
-OutputSettings = namedtuple("OutputSettings", "table_format is_vertical max_width style_output missingval")
-
-OutputSettings.__new__.__defaults__ = (None, False, sys.maxsize, None, "null")
diff --git a/sql-cli/tests/__init__.py b/sql-cli/tests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql-cli/tests/conftest.py b/sql-cli/tests/conftest.py
deleted file mode 100644
index ff9faec284..0000000000
--- a/sql-cli/tests/conftest.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-"""
-We can define the fixture functions in this file to make them
-accessible across multiple test modules.
-"""
-import os
-import pytest
-
-from .utils import create_index, delete_index, get_connection
-
-
-@pytest.fixture(scope="function")
-def connection():
-    test_connection = get_connection()
-    create_index(test_connection)
-
-    yield test_connection
-    delete_index(test_connection)
-
-
-@pytest.fixture(scope="function")
-def default_config_location():
-    from src.opensearch_sql_cli.conf import __file__ as package_root
-
-    package_root = os.path.dirname(package_root)
-    default_config = os.path.join(package_root, "clirc")
-
-    yield default_config
-
-
-@pytest.fixture(scope="session", autouse=True)
-def temp_config(tmpdir_factory):
-    # this function runs on start of test session.
-    # use temporary directory for conf home so user conf will not be used
-    os.environ["XDG_CONFIG_HOME"] = str(tmpdir_factory.mktemp("data"))
diff --git a/sql-cli/tests/pytest.ini b/sql-cli/tests/pytest.ini
deleted file mode 100644
index f78774051e..0000000000
--- a/sql-cli/tests/pytest.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[pytest]
-addopts=--capture=sys --showlocals
\ No newline at end of file
diff --git a/sql-cli/tests/test_config.py b/sql-cli/tests/test_config.py
deleted file mode 100644
index 8541c71b47..0000000000
--- a/sql-cli/tests/test_config.py
+++ /dev/null
@@ -1,33 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-import os
-import stat
-import pytest
-
-from src.opensearch_sql_cli.config import ensure_dir_exists
-
-
-class TestConfig:
-    def test_ensure_file_parent(self, tmpdir):
-        subdir = tmpdir.join("subdir")
-        rcfile = subdir.join("rcfile")
-        ensure_dir_exists(str(rcfile))
-
-    def test_ensure_existing_dir(self, tmpdir):
-        rcfile = str(tmpdir.mkdir("subdir").join("rcfile"))
-
-        # should just not raise
-        ensure_dir_exists(rcfile)
-
-    def test_ensure_other_create_error(self, tmpdir):
-        subdir = tmpdir.join("subdir")
-        rcfile = subdir.join("rcfile")
-
-        # trigger an oserror that isn't "directory already exists"
-        os.chmod(str(tmpdir), stat.S_IREAD)
-
-        with pytest.raises(OSError):
-            ensure_dir_exists(str(rcfile))
diff --git a/sql-cli/tests/test_data/accounts.json b/sql-cli/tests/test_data/accounts.json
deleted file mode 100644
index 22254e3cd6..0000000000
--- a/sql-cli/tests/test_data/accounts.json
+++ /dev/null
@@ -1,1000 +0,0 @@
-{"account_number":1,"balance":39225,"firstname":"Amber","lastname":"Duke","age":32,"gender":"M","address":"880 Holmes Lane","employer":"Pyrami","email":"amberduke@pyrami.com","city":"Brogan","state":"IL"}
-{"account_number":6,"balance":5686,"firstname":"Hattie","lastname":"Bond","age":36,"gender":"M","address":"671 Bristol Street","employer":"Netagy","email":"hattiebond@netagy.com","city":"Dante","state":"TN"}
-{"account_number":13,"balance":32838,"firstname":"Nanette","lastname":"Bates","age":28,"gender":"F","address":"789 Madison Street","employer":"Quility","email":"nanettebates@quility.com","city":"Nogal","state":"VA"}
-{"account_number":18,"balance":4180,"firstname":"Dale","lastname":"Adams","age":33,"gender":"M","address":"467 Hutchinson Court","employer":"Boink","email":"daleadams@boink.com","city":"Orick","state":"MD"}
-{"account_number":20,"balance":16418,"firstname":"Elinor","lastname":"Ratliff","age":36,"gender":"M","address":"282 Kings Place","employer":"Scentric","email":"elinorratliff@scentric.com","city":"Ribera","state":"WA"}
-{"account_number":25,"balance":40540,"firstname":"Virginia","lastname":"Ayala","age":39,"gender":"F","address":"171 Putnam Avenue","employer":"Filodyne","email":"virginiaayala@filodyne.com","city":"Nicholson","state":"PA"}
-{"account_number":32,"balance":48086,"firstname":"Dillard","lastname":"Mcpherson","age":34,"gender":"F","address":"702 Quentin Street","employer":"Quailcom","email":"dillardmcpherson@quailcom.com","city":"Veguita","state":"IN"}
-{"account_number":37,"balance":18612,"firstname":"Mcgee","lastname":"Mooney","age":39,"gender":"M","address":"826 Fillmore Place","employer":"Reversus","email":"mcgeemooney@reversus.com","city":"Tooleville","state":"OK"}
-{"account_number":44,"balance":34487,"firstname":"Aurelia","lastname":"Harding","age":37,"gender":"M","address":"502 Baycliff Terrace","employer":"Orbalix","email":"aureliaharding@orbalix.com","city":"Yardville","state":"DE"}
-{"account_number":49,"balance":29104,"firstname":"Fulton","lastname":"Holt","age":23,"gender":"F","address":"451 Humboldt Street","employer":"Anocha","email":"fultonholt@anocha.com","city":"Sunriver","state":"RI"}
-{"account_number":51,"balance":14097,"firstname":"Burton","lastname":"Meyers","age":31,"gender":"F","address":"334 River Street","employer":"Bezal","email":"burtonmeyers@bezal.com","city":"Jacksonburg","state":"MO"}
-{"account_number":56,"balance":14992,"firstname":"Josie","lastname":"Nelson","age":32,"gender":"M","address":"857 Tabor Court","employer":"Emtrac","email":"josienelson@emtrac.com","city":"Sunnyside","state":"UT"}
-{"account_number":63,"balance":6077,"firstname":"Hughes","lastname":"Owens","age":30,"gender":"F","address":"510 Sedgwick Street","employer":"Valpreal","email":"hughesowens@valpreal.com","city":"Guilford","state":"KS"}
-{"account_number":68,"balance":44214,"firstname":"Hall","lastname":"Key","age":25,"gender":"F","address":"927 Bay Parkway","employer":"Eventex","email":"hallkey@eventex.com","city":"Shawmut","state":"CA"}
-{"account_number":70,"balance":38172,"firstname":"Deidre","lastname":"Thompson","age":33,"gender":"F","address":"685 School Lane","employer":"Netplode","email":"deidrethompson@netplode.com","city":"Chestnut","state":"GA"}
-{"account_number":75,"balance":40500,"firstname":"Sandoval","lastname":"Kramer","age":22,"gender":"F","address":"166 Irvington Place","employer":"Overfork","email":"sandovalkramer@overfork.com","city":"Limestone","state":"NH"}
-{"account_number":82,"balance":41412,"firstname":"Concetta","lastname":"Barnes","age":39,"gender":"F","address":"195 Bayview Place","employer":"Fitcore","email":"concettabarnes@fitcore.com","city":"Summerfield","state":"NC"}
-{"account_number":87,"balance":1133,"firstname":"Hewitt","lastname":"Kidd","age":22,"gender":"M","address":"446 Halleck Street","employer":"Isologics","email":"hewittkidd@isologics.com","city":"Coalmont","state":"ME"}
-{"account_number":94,"balance":41060,"firstname":"Brittany","lastname":"Cabrera","age":30,"gender":"F","address":"183 Kathleen Court","employer":"Mixers","email":"brittanycabrera@mixers.com","city":"Cornucopia","state":"AZ"}
-{"account_number":99,"balance":47159,"firstname":"Ratliff","lastname":"Heath","age":39,"gender":"F","address":"806 Rockwell Place","employer":"Zappix","email":"ratliffheath@zappix.com","city":"Shaft","state":"ND"}
-{"account_number":102,"balance":29712,"firstname":"Dena","lastname":"Olson","age":27,"gender":"F","address":"759 Newkirk Avenue","employer":"Hinway","email":"denaolson@hinway.com","city":"Choctaw","state":"NJ"}
-{"account_number":107,"balance":48844,"firstname":"Randi","lastname":"Rich","age":28,"gender":"M","address":"694 Jefferson Street","employer":"Netplax","email":"randirich@netplax.com","city":"Bellfountain","state":"SC"}
-{"account_number":114,"balance":43045,"firstname":"Josephine","lastname":"Joseph","age":31,"gender":"F","address":"451 Oriental Court","employer":"Turnabout","email":"josephinejoseph@turnabout.com","city":"Sedley","state":"AL"}
-{"account_number":119,"balance":49222,"firstname":"Laverne","lastname":"Johnson","age":28,"gender":"F","address":"302 Howard Place","employer":"Senmei","email":"lavernejohnson@senmei.com","city":"Herlong","state":"DC"}
-{"account_number":121,"balance":19594,"firstname":"Acevedo","lastname":"Dorsey","age":32,"gender":"M","address":"479 Nova Court","employer":"Netropic","email":"acevedodorsey@netropic.com","city":"Islandia","state":"CT"}
-{"account_number":126,"balance":3607,"firstname":"Effie","lastname":"Gates","age":39,"gender":"F","address":"620 National Drive","employer":"Digitalus","email":"effiegates@digitalus.com","city":"Blodgett","state":"MD"}
-{"account_number":133,"balance":26135,"firstname":"Deena","lastname":"Richmond","age":36,"gender":"F","address":"646 Underhill Avenue","employer":"Sunclipse","email":"deenarichmond@sunclipse.com","city":"Austinburg","state":"SC"}
-{"account_number":138,"balance":9006,"firstname":"Daniel","lastname":"Arnold","age":39,"gender":"F","address":"422 Malbone Street","employer":"Ecstasia","email":"danielarnold@ecstasia.com","city":"Gardiner","state":"MO"}
-{"account_number":140,"balance":26696,"firstname":"Cotton","lastname":"Christensen","age":32,"gender":"M","address":"878 Schermerhorn Street","employer":"Prowaste","email":"cottonchristensen@prowaste.com","city":"Mayfair","state":"LA"}
-{"account_number":145,"balance":47406,"firstname":"Rowena","lastname":"Wilkinson","age":32,"gender":"M","address":"891 Elton Street","employer":"Asimiline","email":"rowenawilkinson@asimiline.com","city":"Ripley","state":"NH"}
-{"account_number":152,"balance":8088,"firstname":"Wolfe","lastname":"Rocha","age":21,"gender":"M","address":"457 Guernsey Street","employer":"Hivedom","email":"wolferocha@hivedom.com","city":"Adelino","state":"MS"}
-{"account_number":157,"balance":39868,"firstname":"Claudia","lastname":"Terry","age":20,"gender":"F","address":"132 Gunnison Court","employer":"Lumbrex","email":"claudiaterry@lumbrex.com","city":"Castleton","state":"MD"}
-{"account_number":164,"balance":9101,"firstname":"Cummings","lastname":"Little","age":26,"gender":"F","address":"308 Schaefer Street","employer":"Comtrak","email":"cummingslittle@comtrak.com","city":"Chaparrito","state":"WI"}
-{"account_number":169,"balance":45953,"firstname":"Hollie","lastname":"Osborn","age":34,"gender":"M","address":"671 Seaview Court","employer":"Musaphics","email":"hollieosborn@musaphics.com","city":"Hanover","state":"GA"}
-{"account_number":171,"balance":7091,"firstname":"Nelda","lastname":"Hopper","age":39,"gender":"M","address":"742 Prospect Place","employer":"Equicom","email":"neldahopper@equicom.com","city":"Finderne","state":"SC"}
-{"account_number":176,"balance":18607,"firstname":"Kemp","lastname":"Walters","age":28,"gender":"F","address":"906 Howard Avenue","employer":"Eyewax","email":"kempwalters@eyewax.com","city":"Why","state":"KY"}
-{"account_number":183,"balance":14223,"firstname":"Hudson","lastname":"English","age":26,"gender":"F","address":"823 Herkimer Place","employer":"Xinware","email":"hudsonenglish@xinware.com","city":"Robbins","state":"ND"}
-{"account_number":188,"balance":41504,"firstname":"Tia","lastname":"Miranda","age":24,"gender":"F","address":"583 Ainslie Street","employer":"Jasper","email":"tiamiranda@jasper.com","city":"Summerset","state":"UT"}
-{"account_number":190,"balance":3150,"firstname":"Blake","lastname":"Davidson","age":30,"gender":"F","address":"636 Diamond Street","employer":"Quantasis","email":"blakedavidson@quantasis.com","city":"Crumpler","state":"KY"}
-{"account_number":195,"balance":5025,"firstname":"Kaye","lastname":"Gibson","age":31,"gender":"M","address":"955 Hopkins Street","employer":"Zork","email":"kayegibson@zork.com","city":"Ola","state":"WY"}
-{"account_number":203,"balance":21890,"firstname":"Eve","lastname":"Wyatt","age":33,"gender":"M","address":"435 Furman Street","employer":"Assitia","email":"evewyatt@assitia.com","city":"Jamestown","state":"MN"}
-{"account_number":208,"balance":40760,"firstname":"Garcia","lastname":"Hess","age":26,"gender":"F","address":"810 Nostrand Avenue","employer":"Quiltigen","email":"garciahess@quiltigen.com","city":"Brooktrails","state":"GA"}
-{"account_number":210,"balance":33946,"firstname":"Cherry","lastname":"Carey","age":24,"gender":"M","address":"539 Tiffany Place","employer":"Martgo","email":"cherrycarey@martgo.com","city":"Fairacres","state":"AK"}
-{"account_number":215,"balance":37427,"firstname":"Copeland","lastname":"Solomon","age":20,"gender":"M","address":"741 McDonald Avenue","employer":"Recognia","email":"copelandsolomon@recognia.com","city":"Edmund","state":"ME"}
-{"account_number":222,"balance":14764,"firstname":"Rachelle","lastname":"Rice","age":36,"gender":"M","address":"333 Narrows Avenue","employer":"Enaut","email":"rachellerice@enaut.com","city":"Wright","state":"AZ"}
-{"account_number":227,"balance":19780,"firstname":"Coleman","lastname":"Berg","age":22,"gender":"M","address":"776 Little Street","employer":"Exoteric","email":"colemanberg@exoteric.com","city":"Eagleville","state":"WV"}
-{"account_number":234,"balance":44207,"firstname":"Betty","lastname":"Hall","age":37,"gender":"F","address":"709 Garfield Place","employer":"Miraclis","email":"bettyhall@miraclis.com","city":"Bendon","state":"NY"}
-{"account_number":239,"balance":25719,"firstname":"Chang","lastname":"Boyer","age":36,"gender":"M","address":"895 Brigham Street","employer":"Qaboos","email":"changboyer@qaboos.com","city":"Belgreen","state":"NH"}
-{"account_number":241,"balance":25379,"firstname":"Schroeder","lastname":"Harrington","age":26,"gender":"M","address":"610 Tapscott Avenue","employer":"Otherway","email":"schroederharrington@otherway.com","city":"Ebro","state":"TX"}
-{"account_number":246,"balance":28405,"firstname":"Katheryn","lastname":"Foster","age":21,"gender":"F","address":"259 Kane Street","employer":"Quantalia","email":"katherynfoster@quantalia.com","city":"Bath","state":"TX"}
-{"account_number":253,"balance":20240,"firstname":"Melissa","lastname":"Gould","age":31,"gender":"M","address":"440 Fuller Place","employer":"Buzzopia","email":"melissagould@buzzopia.com","city":"Lumberton","state":"MD"}
-{"account_number":258,"balance":5712,"firstname":"Lindsey","lastname":"Hawkins","age":37,"gender":"M","address":"706 Frost Street","employer":"Enormo","email":"lindseyhawkins@enormo.com","city":"Gardners","state":"AK"}
-{"account_number":260,"balance":2726,"firstname":"Kari","lastname":"Skinner","age":30,"gender":"F","address":"735 Losee Terrace","employer":"Singavera","email":"kariskinner@singavera.com","city":"Rushford","state":"WV"}
-{"account_number":265,"balance":46910,"firstname":"Marion","lastname":"Schneider","age":26,"gender":"F","address":"574 Everett Avenue","employer":"Evidends","email":"marionschneider@evidends.com","city":"Maplewood","state":"WY"}
-{"account_number":272,"balance":19253,"firstname":"Lilly","lastname":"Morgan","age":25,"gender":"F","address":"689 Fleet Street","employer":"Biolive","email":"lillymorgan@biolive.com","city":"Sunbury","state":"OH"}
-{"account_number":277,"balance":29564,"firstname":"Romero","lastname":"Lott","age":31,"gender":"M","address":"456 Danforth Street","employer":"Plasto","email":"romerolott@plasto.com","city":"Vincent","state":"VT"}
-{"account_number":284,"balance":22806,"firstname":"Randolph","lastname":"Banks","age":29,"gender":"M","address":"875 Hamilton Avenue","employer":"Caxt","email":"randolphbanks@caxt.com","city":"Crawfordsville","state":"WA"}
-{"account_number":289,"balance":7798,"firstname":"Blair","lastname":"Church","age":29,"gender":"M","address":"370 Sutton Street","employer":"Cubix","email":"blairchurch@cubix.com","city":"Nile","state":"NH"}
-{"account_number":291,"balance":19955,"firstname":"Lynn","lastname":"Pollard","age":40,"gender":"F","address":"685 Pierrepont Street","employer":"Slambda","email":"lynnpollard@slambda.com","city":"Mappsville","state":"ID"}
-{"account_number":296,"balance":24606,"firstname":"Rosa","lastname":"Oliver","age":34,"gender":"M","address":"168 Woodbine Street","employer":"Idetica","email":"rosaoliver@idetica.com","city":"Robinson","state":"WY"}
-{"account_number":304,"balance":28647,"firstname":"Palmer","lastname":"Clark","age":35,"gender":"M","address":"866 Boulevard Court","employer":"Maximind","email":"palmerclark@maximind.com","city":"Avalon","state":"NH"}
-{"account_number":309,"balance":3830,"firstname":"Rosemarie","lastname":"Nieves","age":30,"gender":"M","address":"206 Alice Court","employer":"Zounds","email":"rosemarienieves@zounds.com","city":"Ferney","state":"AR"}
-{"account_number":311,"balance":13388,"firstname":"Vinson","lastname":"Ballard","age":23,"gender":"F","address":"960 Glendale Court","employer":"Gynk","email":"vinsonballard@gynk.com","city":"Fairforest","state":"WY"}
-{"account_number":316,"balance":8214,"firstname":"Anita","lastname":"Ewing","age":32,"gender":"M","address":"396 Lombardy Street","employer":"Panzent","email":"anitaewing@panzent.com","city":"Neahkahnie","state":"WY"}
-{"account_number":323,"balance":42230,"firstname":"Chelsea","lastname":"Gamble","age":34,"gender":"F","address":"356 Dare Court","employer":"Isosphere","email":"chelseagamble@isosphere.com","city":"Dundee","state":"MD"}
-{"account_number":328,"balance":12523,"firstname":"Good","lastname":"Campbell","age":27,"gender":"F","address":"438 Hicks Street","employer":"Gracker","email":"goodcampbell@gracker.com","city":"Marion","state":"CA"}
-{"account_number":330,"balance":41620,"firstname":"Yvette","lastname":"Browning","age":34,"gender":"F","address":"431 Beekman Place","employer":"Marketoid","email":"yvettebrowning@marketoid.com","city":"Talpa","state":"CO"}
-{"account_number":335,"balance":35433,"firstname":"Vera","lastname":"Hansen","age":24,"gender":"M","address":"252 Bushwick Avenue","employer":"Zanilla","email":"verahansen@zanilla.com","city":"Manila","state":"TN"}
-{"account_number":342,"balance":33670,"firstname":"Vivian","lastname":"Wells","age":36,"gender":"M","address":"570 Cobek Court","employer":"Nutralab","email":"vivianwells@nutralab.com","city":"Fontanelle","state":"OK"}
-{"account_number":347,"balance":36038,"firstname":"Gould","lastname":"Carson","age":24,"gender":"F","address":"784 Pulaski Street","employer":"Mobildata","email":"gouldcarson@mobildata.com","city":"Goochland","state":"MI"}
-{"account_number":354,"balance":21294,"firstname":"Kidd","lastname":"Mclean","age":22,"gender":"M","address":"691 Saratoga Avenue","employer":"Ronbert","email":"kiddmclean@ronbert.com","city":"Tioga","state":"ME"}
-{"account_number":359,"balance":29927,"firstname":"Vanessa","lastname":"Harvey","age":28,"gender":"F","address":"679 Rutledge Street","employer":"Zentime","email":"vanessaharvey@zentime.com","city":"Williston","state":"IL"}
-{"account_number":361,"balance":23659,"firstname":"Noreen","lastname":"Shelton","age":36,"gender":"M","address":"702 Tillary Street","employer":"Medmex","email":"noreenshelton@medmex.com","city":"Derwood","state":"NH"}
-{"account_number":366,"balance":42368,"firstname":"Lydia","lastname":"Cooke","age":31,"gender":"M","address":"470 Coleman Street","employer":"Comstar","email":"lydiacooke@comstar.com","city":"Datil","state":"TN"}
-{"account_number":373,"balance":9671,"firstname":"Simpson","lastname":"Carpenter","age":21,"gender":"M","address":"837 Horace Court","employer":"Snips","email":"simpsoncarpenter@snips.com","city":"Tolu","state":"MA"}
-{"account_number":378,"balance":27100,"firstname":"Watson","lastname":"Simpson","age":36,"gender":"F","address":"644 Thomas Street","employer":"Wrapture","email":"watsonsimpson@wrapture.com","city":"Keller","state":"TX"}
-{"account_number":380,"balance":35628,"firstname":"Fernandez","lastname":"Reid","age":33,"gender":"F","address":"154 Melba Court","employer":"Cosmosis","email":"fernandezreid@cosmosis.com","city":"Boyd","state":"NE"}
-{"account_number":385,"balance":11022,"firstname":"Rosalinda","lastname":"Valencia","age":22,"gender":"M","address":"933 Lloyd Street","employer":"Zoarere","email":"rosalindavalencia@zoarere.com","city":"Waverly","state":"GA"}
-{"account_number":392,"balance":31613,"firstname":"Dotson","lastname":"Dean","age":35,"gender":"M","address":"136 Ford Street","employer":"Petigems","email":"dotsondean@petigems.com","city":"Chical","state":"SD"}
-{"account_number":397,"balance":37418,"firstname":"Leonard","lastname":"Gray","age":36,"gender":"F","address":"840 Morgan Avenue","employer":"Recritube","email":"leonardgray@recritube.com","city":"Edenburg","state":"AL"}
-{"account_number":400,"balance":20685,"firstname":"Kane","lastname":"King","age":21,"gender":"F","address":"405 Cornelia Street","employer":"Tri@Tribalog","email":"kaneking@tri@tribalog.com","city":"Gulf","state":"VT"}
-{"account_number":405,"balance":5679,"firstname":"Strickland","lastname":"Fuller","age":26,"gender":"M","address":"990 Concord Street","employer":"Digique","email":"stricklandfuller@digique.com","city":"Southmont","state":"NV"}
-{"account_number":412,"balance":27436,"firstname":"Ilene","lastname":"Abbott","age":26,"gender":"M","address":"846 Vine Street","employer":"Typhonica","email":"ileneabbott@typhonica.com","city":"Cedarville","state":"VT"}
-{"account_number":417,"balance":1788,"firstname":"Wheeler","lastname":"Ayers","age":35,"gender":"F","address":"677 Hope Street","employer":"Fortean","email":"wheelerayers@fortean.com","city":"Ironton","state":"PA"}
-{"account_number":424,"balance":36818,"firstname":"Tracie","lastname":"Gregory","age":34,"gender":"M","address":"112 Hunterfly Place","employer":"Comstruct","email":"traciegregory@comstruct.com","city":"Onton","state":"TN"}
-{"account_number":429,"balance":46970,"firstname":"Cantu","lastname":"Lindsey","age":31,"gender":"M","address":"404 Willoughby Avenue","employer":"Inquala","email":"cantulindsey@inquala.com","city":"Cowiche","state":"IA"}
-{"account_number":431,"balance":13136,"firstname":"Laurie","lastname":"Shaw","age":26,"gender":"F","address":"263 Aviation Road","employer":"Zillanet","email":"laurieshaw@zillanet.com","city":"Harmon","state":"WV"}
-{"account_number":436,"balance":27585,"firstname":"Alexander","lastname":"Sargent","age":23,"gender":"M","address":"363 Albemarle Road","employer":"Fangold","email":"alexandersargent@fangold.com","city":"Calpine","state":"OR"}
-{"account_number":443,"balance":7588,"firstname":"Huff","lastname":"Thomas","age":23,"gender":"M","address":"538 Erskine Loop","employer":"Accufarm","email":"huffthomas@accufarm.com","city":"Corinne","state":"AL"}
-{"account_number":448,"balance":22776,"firstname":"Adriana","lastname":"Mcfadden","age":35,"gender":"F","address":"984 Woodside Avenue","employer":"Telequiet","email":"adrianamcfadden@telequiet.com","city":"Darrtown","state":"WI"}
-{"account_number":450,"balance":2643,"firstname":"Bradford","lastname":"Nielsen","age":25,"gender":"M","address":"487 Keen Court","employer":"Exovent","email":"bradfordnielsen@exovent.com","city":"Hamilton","state":"DE"}
-{"account_number":455,"balance":39556,"firstname":"Lynn","lastname":"Tran","age":36,"gender":"M","address":"741 Richmond Street","employer":"Optyk","email":"lynntran@optyk.com","city":"Clinton","state":"WV"}
-{"account_number":462,"balance":10871,"firstname":"Calderon","lastname":"Day","age":27,"gender":"M","address":"810 Milford Street","employer":"Cofine","email":"calderonday@cofine.com","city":"Kula","state":"OK"}
-{"account_number":467,"balance":6312,"firstname":"Angelica","lastname":"May","age":32,"gender":"F","address":"384 Karweg Place","employer":"Keeg","email":"angelicamay@keeg.com","city":"Tetherow","state":"IA"}
-{"account_number":474,"balance":35896,"firstname":"Obrien","lastname":"Walton","age":40,"gender":"F","address":"192 Ide Court","employer":"Suremax","email":"obrienwalton@suremax.com","city":"Crucible","state":"UT"}
-{"account_number":479,"balance":31865,"firstname":"Cameron","lastname":"Ross","age":40,"gender":"M","address":"904 Bouck Court","employer":"Telpod","email":"cameronross@telpod.com","city":"Nord","state":"MO"}
-{"account_number":481,"balance":20024,"firstname":"Lina","lastname":"Stanley","age":33,"gender":"M","address":"361 Hanover Place","employer":"Strozen","email":"linastanley@strozen.com","city":"Wyoming","state":"NC"}
-{"account_number":486,"balance":35902,"firstname":"Dixie","lastname":"Fuentes","age":22,"gender":"F","address":"991 Applegate Court","employer":"Portico","email":"dixiefuentes@portico.com","city":"Salix","state":"VA"}
-{"account_number":493,"balance":5871,"firstname":"Campbell","lastname":"Best","age":24,"gender":"M","address":"297 Friel Place","employer":"Fanfare","email":"campbellbest@fanfare.com","city":"Kidder","state":"GA"}
-{"account_number":498,"balance":10516,"firstname":"Stella","lastname":"Hinton","age":39,"gender":"F","address":"649 Columbia Place","employer":"Flyboyz","email":"stellahinton@flyboyz.com","city":"Crenshaw","state":"SC"}
-{"account_number":501,"balance":16572,"firstname":"Kelley","lastname":"Ochoa","age":36,"gender":"M","address":"451 Clifton Place","employer":"Bluplanet","email":"kelleyochoa@bluplanet.com","city":"Gouglersville","state":"CT"}
-{"account_number":506,"balance":43440,"firstname":"Davidson","lastname":"Salas","age":28,"gender":"M","address":"731 Cleveland Street","employer":"Sequitur","email":"davidsonsalas@sequitur.com","city":"Lloyd","state":"ME"}
-{"account_number":513,"balance":30040,"firstname":"Maryellen","lastname":"Rose","age":37,"gender":"F","address":"428 Durland Place","employer":"Waterbaby","email":"maryellenrose@waterbaby.com","city":"Kiskimere","state":"RI"}
-{"account_number":518,"balance":48954,"firstname":"Finch","lastname":"Curtis","age":29,"gender":"F","address":"137 Ryder Street","employer":"Viagrand","email":"finchcurtis@viagrand.com","city":"Riverton","state":"MO"}
-{"account_number":520,"balance":27987,"firstname":"Brandy","lastname":"Calhoun","age":32,"gender":"M","address":"818 Harden Street","employer":"Maxemia","email":"brandycalhoun@maxemia.com","city":"Sidman","state":"OR"}
-{"account_number":525,"balance":23545,"firstname":"Holly","lastname":"Miles","age":25,"gender":"M","address":"746 Ludlam Place","employer":"Xurban","email":"hollymiles@xurban.com","city":"Harold","state":"AR"}
-{"account_number":532,"balance":17207,"firstname":"Hardin","lastname":"Kirk","age":26,"gender":"M","address":"268 Canarsie Road","employer":"Exposa","email":"hardinkirk@exposa.com","city":"Stouchsburg","state":"IL"}
-{"account_number":537,"balance":31069,"firstname":"Morin","lastname":"Frost","age":29,"gender":"M","address":"910 Lake Street","employer":"Primordia","email":"morinfrost@primordia.com","city":"Rivera","state":"DE"}
-{"account_number":544,"balance":41735,"firstname":"Short","lastname":"Dennis","age":21,"gender":"F","address":"908 Glen Street","employer":"Minga","email":"shortdennis@minga.com","city":"Dale","state":"KY"}
-{"account_number":549,"balance":1932,"firstname":"Jacqueline","lastname":"Maxwell","age":40,"gender":"M","address":"444 Schenck Place","employer":"Fuelworks","email":"jacquelinemaxwell@fuelworks.com","city":"Oretta","state":"OR"}
-{"account_number":551,"balance":21732,"firstname":"Milagros","lastname":"Travis","age":27,"gender":"F","address":"380 Murdock Court","employer":"Sloganaut","email":"milagrostravis@sloganaut.com","city":"Homeland","state":"AR"}
-{"account_number":556,"balance":36420,"firstname":"Collier","lastname":"Odonnell","age":35,"gender":"M","address":"591 Nolans Lane","employer":"Sultraxin","email":"collierodonnell@sultraxin.com","city":"Fulford","state":"MD"}
-{"account_number":563,"balance":43403,"firstname":"Morgan","lastname":"Torres","age":30,"gender":"F","address":"672 Belvidere Street","employer":"Quonata","email":"morgantorres@quonata.com","city":"Hollymead","state":"KY"}
-{"account_number":568,"balance":36628,"firstname":"Lesa","lastname":"Maynard","age":29,"gender":"F","address":"295 Whitty Lane","employer":"Coash","email":"lesamaynard@coash.com","city":"Broadlands","state":"VT"}
-{"account_number":570,"balance":26751,"firstname":"Church","lastname":"Mercado","age":24,"gender":"F","address":"892 Wyckoff Street","employer":"Xymonk","email":"churchmercado@xymonk.com","city":"Gloucester","state":"KY"}
-{"account_number":575,"balance":12588,"firstname":"Buchanan","lastname":"Pope","age":39,"gender":"M","address":"581 Sumner Place","employer":"Stucco","email":"buchananpope@stucco.com","city":"Ellerslie","state":"MD"}
-{"account_number":582,"balance":33371,"firstname":"Manning","lastname":"Guthrie","age":24,"gender":"F","address":"271 Jodie Court","employer":"Xerex","email":"manningguthrie@xerex.com","city":"Breinigsville","state":"NM"}
-{"account_number":587,"balance":3468,"firstname":"Carly","lastname":"Johns","age":33,"gender":"M","address":"390 Noll Street","employer":"Gallaxia","email":"carlyjohns@gallaxia.com","city":"Emison","state":"DC"}
-{"account_number":594,"balance":28194,"firstname":"Golden","lastname":"Donovan","age":26,"gender":"M","address":"199 Jewel Street","employer":"Organica","email":"goldendonovan@organica.com","city":"Macdona","state":"RI"}
-{"account_number":599,"balance":11944,"firstname":"Joanna","lastname":"Jennings","age":36,"gender":"F","address":"318 Irving Street","employer":"Extremo","email":"joannajennings@extremo.com","city":"Bartley","state":"MI"}
-{"account_number":602,"balance":38699,"firstname":"Mcgowan","lastname":"Mcclain","age":33,"gender":"M","address":"361 Stoddard Place","employer":"Oatfarm","email":"mcgowanmcclain@oatfarm.com","city":"Kapowsin","state":"MI"}
-{"account_number":607,"balance":38350,"firstname":"White","lastname":"Small","age":38,"gender":"F","address":"736 Judge Street","employer":"Immunics","email":"whitesmall@immunics.com","city":"Fairfield","state":"HI"}
-{"account_number":614,"balance":13157,"firstname":"Salazar","lastname":"Howard","age":35,"gender":"F","address":"847 Imlay Street","employer":"Retrack","email":"salazarhoward@retrack.com","city":"Grill","state":"FL"}
-{"account_number":619,"balance":48755,"firstname":"Grimes","lastname":"Reynolds","age":36,"gender":"M","address":"378 Denton Place","employer":"Frenex","email":"grimesreynolds@frenex.com","city":"Murillo","state":"LA"}
-{"account_number":621,"balance":35480,"firstname":"Leslie","lastname":"Sloan","age":26,"gender":"F","address":"336 Kansas Place","employer":"Dancity","email":"lesliesloan@dancity.com","city":"Corriganville","state":"AR"}
-{"account_number":626,"balance":19498,"firstname":"Ava","lastname":"Richardson","age":31,"gender":"F","address":"666 Nautilus Avenue","employer":"Cinaster","email":"avarichardson@cinaster.com","city":"Sutton","state":"AL"}
-{"account_number":633,"balance":35874,"firstname":"Conner","lastname":"Ramos","age":34,"gender":"M","address":"575 Agate Court","employer":"Insource","email":"connerramos@insource.com","city":"Madaket","state":"OK"}
-{"account_number":638,"balance":2658,"firstname":"Bridget","lastname":"Gallegos","age":31,"gender":"M","address":"383 Wogan Terrace","employer":"Songlines","email":"bridgetgallegos@songlines.com","city":"Linganore","state":"WA"}
-{"account_number":640,"balance":35596,"firstname":"Candace","lastname":"Hancock","age":25,"gender":"M","address":"574 Riverdale Avenue","employer":"Animalia","email":"candacehancock@animalia.com","city":"Blandburg","state":"KY"}
-{"account_number":645,"balance":29362,"firstname":"Edwina","lastname":"Hutchinson","age":26,"gender":"F","address":"892 Pacific Street","employer":"Essensia","email":"edwinahutchinson@essensia.com","city":"Dowling","state":"NE"}
-{"account_number":652,"balance":17363,"firstname":"Bonner","lastname":"Garner","age":26,"gender":"M","address":"219 Grafton Street","employer":"Utarian","email":"bonnergarner@utarian.com","city":"Vandiver","state":"PA"}
-{"account_number":657,"balance":40475,"firstname":"Kathleen","lastname":"Wilder","age":34,"gender":"F","address":"286 Sutter Avenue","employer":"Solgan","email":"kathleenwilder@solgan.com","city":"Graniteville","state":"MI"}
-{"account_number":664,"balance":16163,"firstname":"Hart","lastname":"Mccormick","age":40,"gender":"M","address":"144 Guider Avenue","employer":"Dyno","email":"hartmccormick@dyno.com","city":"Carbonville","state":"ID"}
-{"account_number":669,"balance":16934,"firstname":"Jewel","lastname":"Estrada","age":28,"gender":"M","address":"896 Meeker Avenue","employer":"Zilla","email":"jewelestrada@zilla.com","city":"Goodville","state":"PA"}
-{"account_number":671,"balance":29029,"firstname":"Antoinette","lastname":"Cook","age":34,"gender":"M","address":"375 Cumberland Street","employer":"Harmoney","email":"antoinettecook@harmoney.com","city":"Bergoo","state":"VT"}
-{"account_number":676,"balance":23842,"firstname":"Lisa","lastname":"Dudley","age":34,"gender":"M","address":"506 Vanderveer Street","employer":"Tropoli","email":"lisadudley@tropoli.com","city":"Konterra","state":"NY"}
-{"account_number":683,"balance":4381,"firstname":"Matilda","lastname":"Berger","age":39,"gender":"M","address":"884 Noble Street","employer":"Fibrodyne","email":"matildaberger@fibrodyne.com","city":"Shepardsville","state":"TN"}
-{"account_number":688,"balance":17931,"firstname":"Freeman","lastname":"Zamora","age":22,"gender":"F","address":"114 Herzl Street","employer":"Elemantra","email":"freemanzamora@elemantra.com","city":"Libertytown","state":"NM"}
-{"account_number":690,"balance":18127,"firstname":"Russo","lastname":"Swanson","age":35,"gender":"F","address":"256 Roebling Street","employer":"Zaj","email":"russoswanson@zaj.com","city":"Hoagland","state":"MI"}
-{"account_number":695,"balance":36800,"firstname":"Gonzales","lastname":"Mcfarland","age":26,"gender":"F","address":"647 Louisa Street","employer":"Songbird","email":"gonzalesmcfarland@songbird.com","city":"Crisman","state":"ID"}
-{"account_number":703,"balance":27443,"firstname":"Dona","lastname":"Burton","age":29,"gender":"M","address":"489 Flatlands Avenue","employer":"Cytrex","email":"donaburton@cytrex.com","city":"Reno","state":"VA"}
-{"account_number":708,"balance":34002,"firstname":"May","lastname":"Ortiz","age":28,"gender":"F","address":"244 Chauncey Street","employer":"Syntac","email":"mayortiz@syntac.com","city":"Munjor","state":"ID"}
-{"account_number":710,"balance":33650,"firstname":"Shelton","lastname":"Stark","age":37,"gender":"M","address":"404 Ovington Avenue","employer":"Kraggle","email":"sheltonstark@kraggle.com","city":"Ogema","state":"TN"}
-{"account_number":715,"balance":23734,"firstname":"Tammi","lastname":"Hodge","age":24,"gender":"M","address":"865 Church Lane","employer":"Netur","email":"tammihodge@netur.com","city":"Lacomb","state":"KS"}
-{"account_number":722,"balance":27256,"firstname":"Roberts","lastname":"Beasley","age":34,"gender":"F","address":"305 Kings Hwy","employer":"Quintity","email":"robertsbeasley@quintity.com","city":"Hayden","state":"PA"}
-{"account_number":727,"balance":27263,"firstname":"Natasha","lastname":"Knapp","age":36,"gender":"M","address":"723 Hubbard Street","employer":"Exostream","email":"natashaknapp@exostream.com","city":"Trexlertown","state":"LA"}
-{"account_number":734,"balance":20325,"firstname":"Keri","lastname":"Kinney","age":23,"gender":"M","address":"490 Balfour Place","employer":"Retrotex","email":"kerikinney@retrotex.com","city":"Salunga","state":"PA"}
-{"account_number":739,"balance":39063,"firstname":"Gwen","lastname":"Hardy","age":33,"gender":"F","address":"733 Stuart Street","employer":"Exozent","email":"gwenhardy@exozent.com","city":"Drytown","state":"NY"}
-{"account_number":741,"balance":33074,"firstname":"Nielsen","lastname":"Good","age":22,"gender":"M","address":"404 Norfolk Street","employer":"Kiggle","email":"nielsengood@kiggle.com","city":"Cumberland","state":"WA"}
-{"account_number":746,"balance":15970,"firstname":"Marguerite","lastname":"Wall","age":28,"gender":"F","address":"364 Crosby Avenue","employer":"Aquoavo","email":"margueritewall@aquoavo.com","city":"Jeff","state":"MI"}
-{"account_number":753,"balance":33340,"firstname":"Katina","lastname":"Alford","age":21,"gender":"F","address":"690 Ross Street","employer":"Intrawear","email":"katinaalford@intrawear.com","city":"Grimsley","state":"OK"}
-{"account_number":758,"balance":15739,"firstname":"Berta","lastname":"Short","age":28,"gender":"M","address":"149 Surf Avenue","employer":"Ozean","email":"bertashort@ozean.com","city":"Odessa","state":"UT"}
-{"account_number":760,"balance":40996,"firstname":"Rhea","lastname":"Blair","age":37,"gender":"F","address":"440 Hubbard Place","employer":"Bicol","email":"rheablair@bicol.com","city":"Stockwell","state":"LA"}
-{"account_number":765,"balance":31278,"firstname":"Knowles","lastname":"Cunningham","age":23,"gender":"M","address":"753 Macdougal Street","employer":"Thredz","email":"knowlescunningham@thredz.com","city":"Thomasville","state":"WA"}
-{"account_number":772,"balance":37849,"firstname":"Eloise","lastname":"Sparks","age":21,"gender":"M","address":"608 Willow Street","employer":"Satiance","email":"eloisesparks@satiance.com","city":"Richford","state":"NY"}
-{"account_number":777,"balance":48294,"firstname":"Adkins","lastname":"Mejia","age":32,"gender":"M","address":"186 Oxford Walk","employer":"Datagen","email":"adkinsmejia@datagen.com","city":"Faywood","state":"OK"}
-{"account_number":784,"balance":25291,"firstname":"Mabel","lastname":"Thornton","age":21,"gender":"M","address":"124 Louisiana Avenue","employer":"Zolavo","email":"mabelthornton@zolavo.com","city":"Lynn","state":"AL"}
-{"account_number":789,"balance":8760,"firstname":"Cunningham","lastname":"Kerr","age":27,"gender":"F","address":"154 Sharon Street","employer":"Polarium","email":"cunninghamkerr@polarium.com","city":"Tuskahoma","state":"MS"}
-{"account_number":791,"balance":48249,"firstname":"Janine","lastname":"Huber","age":38,"gender":"F","address":"348 Porter Avenue","employer":"Viocular","email":"janinehuber@viocular.com","city":"Fivepointville","state":"MA"}
-{"account_number":796,"balance":23503,"firstname":"Mona","lastname":"Craft","age":35,"gender":"F","address":"511 Henry Street","employer":"Opticom","email":"monacraft@opticom.com","city":"Websterville","state":"IN"}
-{"account_number":804,"balance":23610,"firstname":"Rojas","lastname":"Oneal","age":27,"gender":"M","address":"669 Sandford Street","employer":"Glukgluk","email":"rojasoneal@glukgluk.com","city":"Wheaton","state":"ME"}
-{"account_number":809,"balance":47812,"firstname":"Christie","lastname":"Strickland","age":30,"gender":"M","address":"346 Bancroft Place","employer":"Anarco","email":"christiestrickland@anarco.com","city":"Baden","state":"NV"}
-{"account_number":811,"balance":26007,"firstname":"Walls","lastname":"Rogers","age":28,"gender":"F","address":"352 Freeman Street","employer":"Geekmosis","email":"wallsrogers@geekmosis.com","city":"Caroleen","state":"NV"}
-{"account_number":816,"balance":9567,"firstname":"Cornelia","lastname":"Lane","age":20,"gender":"F","address":"384 Bainbridge Street","employer":"Sulfax","email":"cornelialane@sulfax.com","city":"Elizaville","state":"MS"}
-{"account_number":823,"balance":48726,"firstname":"Celia","lastname":"Bernard","age":33,"gender":"F","address":"466 Amboy Street","employer":"Mitroc","email":"celiabernard@mitroc.com","city":"Skyland","state":"GA"}
-{"account_number":828,"balance":44890,"firstname":"Blanche","lastname":"Holmes","age":33,"gender":"F","address":"605 Stryker Court","employer":"Motovate","email":"blancheholmes@motovate.com","city":"Loomis","state":"KS"}
-{"account_number":830,"balance":45210,"firstname":"Louella","lastname":"Chan","age":23,"gender":"M","address":"511 Heath Place","employer":"Conferia","email":"louellachan@conferia.com","city":"Brookfield","state":"OK"}
-{"account_number":835,"balance":46558,"firstname":"Glover","lastname":"Rutledge","age":25,"gender":"F","address":"641 Royce Street","employer":"Ginkogene","email":"gloverrutledge@ginkogene.com","city":"Dixonville","state":"VA"}
-{"account_number":842,"balance":49587,"firstname":"Meagan","lastname":"Buckner","age":23,"gender":"F","address":"833 Bushwick Court","employer":"Biospan","email":"meaganbuckner@biospan.com","city":"Craig","state":"TX"}
-{"account_number":847,"balance":8652,"firstname":"Antonia","lastname":"Duncan","age":23,"gender":"M","address":"644 Stryker Street","employer":"Talae","email":"antoniaduncan@talae.com","city":"Dawn","state":"MO"}
-{"account_number":854,"balance":49795,"firstname":"Jimenez","lastname":"Barry","age":25,"gender":"F","address":"603 Cooper Street","employer":"Verton","email":"jimenezbarry@verton.com","city":"Moscow","state":"AL"}
-{"account_number":859,"balance":20734,"firstname":"Beulah","lastname":"Stuart","age":24,"gender":"F","address":"651 Albemarle Terrace","employer":"Hatology","email":"beulahstuart@hatology.com","city":"Waiohinu","state":"RI"}
-{"account_number":861,"balance":44173,"firstname":"Jaime","lastname":"Wilson","age":35,"gender":"M","address":"680 Richardson Street","employer":"Temorak","email":"jaimewilson@temorak.com","city":"Fidelis","state":"FL"}
-{"account_number":866,"balance":45565,"firstname":"Araceli","lastname":"Woodward","age":28,"gender":"M","address":"326 Meadow Street","employer":"Olympix","email":"araceliwoodward@olympix.com","city":"Dana","state":"KS"}
-{"account_number":873,"balance":43931,"firstname":"Tisha","lastname":"Cotton","age":39,"gender":"F","address":"432 Lincoln Road","employer":"Buzzmaker","email":"tishacotton@buzzmaker.com","city":"Bluetown","state":"GA"}
-{"account_number":878,"balance":49159,"firstname":"Battle","lastname":"Blackburn","age":40,"gender":"F","address":"234 Hendrix Street","employer":"Zilphur","email":"battleblackburn@zilphur.com","city":"Wanamie","state":"PA"}
-{"account_number":880,"balance":22575,"firstname":"Christian","lastname":"Myers","age":35,"gender":"M","address":"737 Crown Street","employer":"Combogen","email":"christianmyers@combogen.com","city":"Abrams","state":"OK"}
-{"account_number":885,"balance":31661,"firstname":"Valdez","lastname":"Roberson","age":40,"gender":"F","address":"227 Scholes Street","employer":"Delphide","email":"valdezroberson@delphide.com","city":"Chilton","state":"MT"}
-{"account_number":892,"balance":44974,"firstname":"Hill","lastname":"Hayes","age":29,"gender":"M","address":"721 Dooley Street","employer":"Fuelton","email":"hillhayes@fuelton.com","city":"Orason","state":"MT"}
-{"account_number":897,"balance":45973,"firstname":"Alyson","lastname":"Irwin","age":25,"gender":"M","address":"731 Poplar Street","employer":"Quizka","email":"alysonirwin@quizka.com","city":"Singer","state":"VA"}
-{"account_number":900,"balance":6124,"firstname":"Gonzalez","lastname":"Watson","age":23,"gender":"M","address":"624 Sullivan Street","employer":"Marvane","email":"gonzalezwatson@marvane.com","city":"Wikieup","state":"IL"}
-{"account_number":905,"balance":29438,"firstname":"Schultz","lastname":"Moreno","age":20,"gender":"F","address":"761 Cedar Street","employer":"Paragonia","email":"schultzmoreno@paragonia.com","city":"Glenshaw","state":"SC"}
-{"account_number":912,"balance":13675,"firstname":"Flora","lastname":"Alvarado","age":26,"gender":"M","address":"771 Vandervoort Avenue","employer":"Boilicon","email":"floraalvarado@boilicon.com","city":"Vivian","state":"ID"}
-{"account_number":917,"balance":47782,"firstname":"Parks","lastname":"Hurst","age":24,"gender":"M","address":"933 Cozine Avenue","employer":"Pyramis","email":"parkshurst@pyramis.com","city":"Lindcove","state":"GA"}
-{"account_number":924,"balance":3811,"firstname":"Hilary","lastname":"Leonard","age":24,"gender":"M","address":"235 Hegeman Avenue","employer":"Metroz","email":"hilaryleonard@metroz.com","city":"Roosevelt","state":"ME"}
-{"account_number":929,"balance":34708,"firstname":"Willie","lastname":"Hickman","age":35,"gender":"M","address":"430 Devoe Street","employer":"Apextri","email":"williehickman@apextri.com","city":"Clay","state":"MS"}
-{"account_number":931,"balance":8244,"firstname":"Ingrid","lastname":"Garcia","age":23,"gender":"F","address":"674 Indiana Place","employer":"Balooba","email":"ingridgarcia@balooba.com","city":"Interlochen","state":"AZ"}
-{"account_number":936,"balance":22430,"firstname":"Beth","lastname":"Frye","age":36,"gender":"M","address":"462 Thatford Avenue","employer":"Puria","email":"bethfrye@puria.com","city":"Hiseville","state":"LA"}
-{"account_number":943,"balance":24187,"firstname":"Wagner","lastname":"Griffin","age":23,"gender":"M","address":"489 Ellery Street","employer":"Gazak","email":"wagnergriffin@gazak.com","city":"Lorraine","state":"HI"}
-{"account_number":948,"balance":37074,"firstname":"Sargent","lastname":"Powers","age":40,"gender":"M","address":"532 Fiske Place","employer":"Accuprint","email":"sargentpowers@accuprint.com","city":"Umapine","state":"AK"}
-{"account_number":950,"balance":30916,"firstname":"Sherrie","lastname":"Patel","age":32,"gender":"F","address":"658 Langham Street","employer":"Futurize","email":"sherriepatel@futurize.com","city":"Garfield","state":"OR"}
-{"account_number":955,"balance":41621,"firstname":"Klein","lastname":"Kemp","age":33,"gender":"M","address":"370 Vanderbilt Avenue","employer":"Synkgen","email":"kleinkemp@synkgen.com","city":"Bonanza","state":"FL"}
-{"account_number":962,"balance":32096,"firstname":"Trujillo","lastname":"Wilcox","age":21,"gender":"F","address":"914 Duffield Street","employer":"Extragene","email":"trujillowilcox@extragene.com","city":"Golconda","state":"MA"}
-{"account_number":967,"balance":19161,"firstname":"Carrie","lastname":"Huffman","age":36,"gender":"F","address":"240 Sands Street","employer":"Injoy","email":"carriehuffman@injoy.com","city":"Leroy","state":"CA"}
-{"account_number":974,"balance":38082,"firstname":"Deborah","lastname":"Yang","age":26,"gender":"F","address":"463 Goodwin Place","employer":"Entogrok","email":"deborahyang@entogrok.com","city":"Herald","state":"KY"}
-{"account_number":979,"balance":43130,"firstname":"Vaughn","lastname":"Pittman","age":29,"gender":"M","address":"446 Tompkins Place","employer":"Phormula","email":"vaughnpittman@phormula.com","city":"Fingerville","state":"WI"}
-{"account_number":981,"balance":20278,"firstname":"Nolan","lastname":"Warner","age":29,"gender":"F","address":"753 Channel Avenue","employer":"Interodeo","email":"nolanwarner@interodeo.com","city":"Layhill","state":"MT"}
-{"account_number":986,"balance":35086,"firstname":"Norris","lastname":"Hubbard","age":31,"gender":"M","address":"600 Celeste Court","employer":"Printspan","email":"norrishubbard@printspan.com","city":"Cassel","state":"MI"}
-{"account_number":993,"balance":26487,"firstname":"Campos","lastname":"Olsen","age":37,"gender":"M","address":"873 Covert Street","employer":"Isbol","email":"camposolsen@isbol.com","city":"Glendale","state":"AK"}
-{"account_number":998,"balance":16869,"firstname":"Letha","lastname":"Baker","age":40,"gender":"F","address":"206 Llama Court","employer":"Dognosis","email":"lethabaker@dognosis.com","city":"Dunlo","state":"WV"}
-{"account_number":2,"balance":28838,"firstname":"Roberta","lastname":"Bender","age":22,"gender":"F","address":"560 Kingsway Place","employer":"Chillium","email":"robertabender@chillium.com","city":"Bennett","state":"LA"}
-{"account_number":7,"balance":39121,"firstname":"Levy","lastname":"Richard","age":22,"gender":"M","address":"820 Logan Street","employer":"Teraprene","email":"levyrichard@teraprene.com","city":"Shrewsbury","state":"MO"}
-{"account_number":14,"balance":20480,"firstname":"Erma","lastname":"Kane","age":39,"gender":"F","address":"661 Vista Place","employer":"Stockpost","email":"ermakane@stockpost.com","city":"Chamizal","state":"NY"}
-{"account_number":19,"balance":27894,"firstname":"Schwartz","lastname":"Buchanan","age":28,"gender":"F","address":"449 Mersereau Court","employer":"Sybixtex","email":"schwartzbuchanan@sybixtex.com","city":"Greenwich","state":"KS"}
-{"account_number":21,"balance":7004,"firstname":"Estella","lastname":"Paul","age":38,"gender":"M","address":"859 Portal Street","employer":"Zillatide","email":"estellapaul@zillatide.com","city":"Churchill","state":"WV"}
-{"account_number":26,"balance":14127,"firstname":"Lorraine","lastname":"Mccullough","age":39,"gender":"F","address":"157 Dupont Street","employer":"Zosis","email":"lorrainemccullough@zosis.com","city":"Dennard","state":"NH"}
-{"account_number":33,"balance":35439,"firstname":"Savannah","lastname":"Kirby","age":30,"gender":"F","address":"372 Malta Street","employer":"Musanpoly","email":"savannahkirby@musanpoly.com","city":"Muse","state":"AK"}
-{"account_number":38,"balance":10511,"firstname":"Erna","lastname":"Fields","age":32,"gender":"M","address":"357 Maple Street","employer":"Eweville","email":"ernafields@eweville.com","city":"Twilight","state":"MS"}
-{"account_number":40,"balance":33882,"firstname":"Pace","lastname":"Molina","age":40,"gender":"M","address":"263 Ovington Court","employer":"Cytrak","email":"pacemolina@cytrak.com","city":"Silkworth","state":"OR"}
-{"account_number":45,"balance":44478,"firstname":"Geneva","lastname":"Morin","age":21,"gender":"F","address":"357 Herkimer Street","employer":"Ezent","email":"genevamorin@ezent.com","city":"Blanco","state":"AZ"}
-{"account_number":52,"balance":46425,"firstname":"Kayla","lastname":"Bradshaw","age":31,"gender":"M","address":"449 Barlow Drive","employer":"Magnemo","email":"kaylabradshaw@magnemo.com","city":"Wawona","state":"AZ"}
-{"account_number":57,"balance":8705,"firstname":"Powell","lastname":"Herring","age":21,"gender":"M","address":"263 Merit Court","employer":"Digiprint","email":"powellherring@digiprint.com","city":"Coral","state":"MT"}
-{"account_number":64,"balance":44036,"firstname":"Miles","lastname":"Battle","age":35,"gender":"F","address":"988 Homecrest Avenue","employer":"Koffee","email":"milesbattle@koffee.com","city":"Motley","state":"ID"}
-{"account_number":69,"balance":14253,"firstname":"Desiree","lastname":"Harrison","age":24,"gender":"M","address":"694 Garland Court","employer":"Barkarama","email":"desireeharrison@barkarama.com","city":"Hackneyville","state":"GA"}
-{"account_number":71,"balance":38201,"firstname":"Sharpe","lastname":"Hoffman","age":39,"gender":"F","address":"450 Conklin Avenue","employer":"Centree","email":"sharpehoffman@centree.com","city":"Urbana","state":"WY"}
-{"account_number":76,"balance":38345,"firstname":"Claudette","lastname":"Beard","age":24,"gender":"F","address":"748 Dorset Street","employer":"Repetwire","email":"claudettebeard@repetwire.com","city":"Caln","state":"TX"}
-{"account_number":83,"balance":35928,"firstname":"Mayo","lastname":"Cleveland","age":28,"gender":"M","address":"720 Brooklyn Road","employer":"Indexia","email":"mayocleveland@indexia.com","city":"Roberts","state":"ND"}
-{"account_number":88,"balance":26418,"firstname":"Adela","lastname":"Tyler","age":21,"gender":"F","address":"737 Clove Road","employer":"Surelogic","email":"adelatyler@surelogic.com","city":"Boling","state":"SD"}
-{"account_number":90,"balance":25332,"firstname":"Herman","lastname":"Snyder","age":22,"gender":"F","address":"737 College Place","employer":"Lunchpod","email":"hermansnyder@lunchpod.com","city":"Flintville","state":"IA"}
-{"account_number":95,"balance":1650,"firstname":"Dominguez","lastname":"Le","age":20,"gender":"M","address":"539 Grace Court","employer":"Portica","email":"dominguezle@portica.com","city":"Wollochet","state":"KS"}
-{"account_number":103,"balance":11253,"firstname":"Calhoun","lastname":"Bruce","age":33,"gender":"F","address":"731 Clarkson Avenue","employer":"Automon","email":"calhounbruce@automon.com","city":"Marienthal","state":"IL"}
-{"account_number":108,"balance":19015,"firstname":"Christensen","lastname":"Weaver","age":21,"gender":"M","address":"398 Dearborn Court","employer":"Quilk","email":"christensenweaver@quilk.com","city":"Belvoir","state":"TX"}
-{"account_number":110,"balance":4850,"firstname":"Daphne","lastname":"Byrd","age":23,"gender":"F","address":"239 Conover Street","employer":"Freakin","email":"daphnebyrd@freakin.com","city":"Taft","state":"MN"}
-{"account_number":115,"balance":18750,"firstname":"Nikki","lastname":"Doyle","age":31,"gender":"F","address":"537 Clara Street","employer":"Fossiel","email":"nikkidoyle@fossiel.com","city":"Caron","state":"MS"}
-{"account_number":122,"balance":17128,"firstname":"Aurora","lastname":"Fry","age":31,"gender":"F","address":"227 Knapp Street","employer":"Makingway","email":"aurorafry@makingway.com","city":"Maybell","state":"NE"}
-{"account_number":127,"balance":48734,"firstname":"Diann","lastname":"Mclaughlin","age":33,"gender":"F","address":"340 Clermont Avenue","employer":"Enomen","email":"diannmclaughlin@enomen.com","city":"Rutherford","state":"ND"}
-{"account_number":134,"balance":33829,"firstname":"Madelyn","lastname":"Norris","age":30,"gender":"F","address":"176 Noel Avenue","employer":"Endicil","email":"madelynnorris@endicil.com","city":"Walker","state":"NE"}
-{"account_number":139,"balance":18444,"firstname":"Rios","lastname":"Todd","age":35,"gender":"F","address":"281 Georgia Avenue","employer":"Uberlux","email":"riostodd@uberlux.com","city":"Hannasville","state":"PA"}
-{"account_number":141,"balance":20790,"firstname":"Liliana","lastname":"Caldwell","age":29,"gender":"M","address":"414 Huron Street","employer":"Rubadub","email":"lilianacaldwell@rubadub.com","city":"Hiwasse","state":"OK"}
-{"account_number":146,"balance":39078,"firstname":"Lang","lastname":"Kaufman","age":32,"gender":"F","address":"626 Beverley Road","employer":"Rodeomad","email":"langkaufman@rodeomad.com","city":"Mahtowa","state":"RI"}
-{"account_number":153,"balance":32074,"firstname":"Bird","lastname":"Cochran","age":31,"gender":"F","address":"691 Bokee Court","employer":"Supremia","email":"birdcochran@supremia.com","city":"Barrelville","state":"NE"}
-{"account_number":158,"balance":9380,"firstname":"Natalie","lastname":"Mcdowell","age":27,"gender":"M","address":"953 Roder Avenue","employer":"Myopium","email":"nataliemcdowell@myopium.com","city":"Savage","state":"ND"}
-{"account_number":160,"balance":48974,"firstname":"Hull","lastname":"Cherry","age":23,"gender":"F","address":"275 Beaumont Street","employer":"Noralex","email":"hullcherry@noralex.com","city":"Whipholt","state":"WA"}
-{"account_number":165,"balance":18956,"firstname":"Sims","lastname":"Mckay","age":40,"gender":"F","address":"205 Jackson Street","employer":"Comtour","email":"simsmckay@comtour.com","city":"Tilden","state":"DC"}
-{"account_number":172,"balance":18356,"firstname":"Marie","lastname":"Whitehead","age":20,"gender":"M","address":"704 Monaco Place","employer":"Sultrax","email":"mariewhitehead@sultrax.com","city":"Dragoon","state":"IL"}
-{"account_number":177,"balance":48972,"firstname":"Harris","lastname":"Gross","age":40,"gender":"F","address":"468 Suydam Street","employer":"Kidstock","email":"harrisgross@kidstock.com","city":"Yettem","state":"KY"}
-{"account_number":184,"balance":9157,"firstname":"Cathy","lastname":"Morrison","age":27,"gender":"M","address":"882 Pine Street","employer":"Zytrek","email":"cathymorrison@zytrek.com","city":"Fedora","state":"FL"}
-{"account_number":189,"balance":20167,"firstname":"Ada","lastname":"Cortez","age":38,"gender":"F","address":"700 Forest Place","employer":"Micronaut","email":"adacortez@micronaut.com","city":"Eagletown","state":"TX"}
-{"account_number":191,"balance":26172,"firstname":"Barr","lastname":"Sharpe","age":28,"gender":"M","address":"428 Auburn Place","employer":"Ziggles","email":"barrsharpe@ziggles.com","city":"Springdale","state":"KS"}
-{"account_number":196,"balance":29931,"firstname":"Caldwell","lastname":"Daniel","age":28,"gender":"F","address":"405 Oliver Street","employer":"Furnigeer","email":"caldwelldaniel@furnigeer.com","city":"Zortman","state":"NE"}
-{"account_number":204,"balance":27714,"firstname":"Mavis","lastname":"Deleon","age":39,"gender":"F","address":"400 Waldane Court","employer":"Lotron","email":"mavisdeleon@lotron.com","city":"Stollings","state":"LA"}
-{"account_number":209,"balance":31052,"firstname":"Myers","lastname":"Noel","age":30,"gender":"F","address":"691 Alton Place","employer":"Greeker","email":"myersnoel@greeker.com","city":"Hinsdale","state":"KY"}
-{"account_number":211,"balance":21539,"firstname":"Graciela","lastname":"Vaughan","age":22,"gender":"M","address":"558 Montauk Court","employer":"Fishland","email":"gracielavaughan@fishland.com","city":"Madrid","state":"PA"}
-{"account_number":216,"balance":11422,"firstname":"Price","lastname":"Haley","age":35,"gender":"M","address":"233 Portland Avenue","employer":"Zeam","email":"pricehaley@zeam.com","city":"Titanic","state":"UT"}
-{"account_number":223,"balance":9528,"firstname":"Newton","lastname":"Fletcher","age":26,"gender":"F","address":"654 Dewitt Avenue","employer":"Assistia","email":"newtonfletcher@assistia.com","city":"Nipinnawasee","state":"AK"}
-{"account_number":228,"balance":10543,"firstname":"Rosella","lastname":"Albert","age":20,"gender":"M","address":"185 Gotham Avenue","employer":"Isoplex","email":"rosellaalbert@isoplex.com","city":"Finzel","state":"NY"}
-{"account_number":230,"balance":10829,"firstname":"Chris","lastname":"Raymond","age":28,"gender":"F","address":"464 Remsen Street","employer":"Cogentry","email":"chrisraymond@cogentry.com","city":"Bowmansville","state":"SD"}
-{"account_number":235,"balance":17729,"firstname":"Mcpherson","lastname":"Mueller","age":31,"gender":"M","address":"541 Strong Place","employer":"Tingles","email":"mcphersonmueller@tingles.com","city":"Brantleyville","state":"AR"}
-{"account_number":242,"balance":42318,"firstname":"Berger","lastname":"Roach","age":21,"gender":"M","address":"125 Wakeman Place","employer":"Ovium","email":"bergerroach@ovium.com","city":"Hessville","state":"WI"}
-{"account_number":247,"balance":45123,"firstname":"Mccormick","lastname":"Moon","age":37,"gender":"M","address":"582 Brighton Avenue","employer":"Norsup","email":"mccormickmoon@norsup.com","city":"Forestburg","state":"DE"}
-{"account_number":254,"balance":35104,"firstname":"Yang","lastname":"Dodson","age":21,"gender":"M","address":"531 Lott Street","employer":"Mondicil","email":"yangdodson@mondicil.com","city":"Enoree","state":"UT"}
-{"account_number":259,"balance":41877,"firstname":"Eleanor","lastname":"Gonzalez","age":30,"gender":"M","address":"800 Sumpter Street","employer":"Futuris","email":"eleanorgonzalez@futuris.com","city":"Jenkinsville","state":"ID"}
-{"account_number":261,"balance":39998,"firstname":"Millicent","lastname":"Pickett","age":34,"gender":"F","address":"722 Montieth Street","employer":"Gushkool","email":"millicentpickett@gushkool.com","city":"Norwood","state":"MS"}
-{"account_number":266,"balance":2777,"firstname":"Monique","lastname":"Conner","age":35,"gender":"F","address":"489 Metrotech Courtr","employer":"Flotonic","email":"moniqueconner@flotonic.com","city":"Retsof","state":"MD"}
-{"account_number":273,"balance":11181,"firstname":"Murphy","lastname":"Chandler","age":20,"gender":"F","address":"569 Bradford Street","employer":"Zilch","email":"murphychandler@zilch.com","city":"Vicksburg","state":"FL"}
-{"account_number":278,"balance":22530,"firstname":"Tamra","lastname":"Navarro","age":27,"gender":"F","address":"175 Woodruff Avenue","employer":"Norsul","email":"tamranavarro@norsul.com","city":"Glasgow","state":"VT"}
-{"account_number":280,"balance":3380,"firstname":"Vilma","lastname":"Shields","age":26,"gender":"F","address":"133 Berriman Street","employer":"Applidec","email":"vilmashields@applidec.com","city":"Adamstown","state":"ME"}
-{"account_number":285,"balance":47369,"firstname":"Hilda","lastname":"Phillips","age":28,"gender":"F","address":"618 Nixon Court","employer":"Comcur","email":"hildaphillips@comcur.com","city":"Siglerville","state":"NC"}
-{"account_number":292,"balance":26679,"firstname":"Morrow","lastname":"Greene","age":20,"gender":"F","address":"691 Nassau Street","employer":"Columella","email":"morrowgreene@columella.com","city":"Sanborn","state":"FL"}
-{"account_number":297,"balance":20508,"firstname":"Tucker","lastname":"Patrick","age":35,"gender":"F","address":"978 Whitwell Place","employer":"Valreda","email":"tuckerpatrick@valreda.com","city":"Deseret","state":"CO"}
-{"account_number":300,"balance":25654,"firstname":"Lane","lastname":"Tate","age":26,"gender":"F","address":"632 Kay Court","employer":"Genesynk","email":"lanetate@genesynk.com","city":"Lowell","state":"MO"}
-{"account_number":305,"balance":11655,"firstname":"Augusta","lastname":"Winters","age":29,"gender":"F","address":"377 Paerdegat Avenue","employer":"Vendblend","email":"augustawinters@vendblend.com","city":"Gwynn","state":"MA"}
-{"account_number":312,"balance":8511,"firstname":"Burgess","lastname":"Gentry","age":25,"gender":"F","address":"382 Bergen Court","employer":"Orbixtar","email":"burgessgentry@orbixtar.com","city":"Conestoga","state":"WI"}
-{"account_number":317,"balance":31968,"firstname":"Ruiz","lastname":"Morris","age":31,"gender":"F","address":"972 Dean Street","employer":"Apex","email":"ruizmorris@apex.com","city":"Jacksonwald","state":"WV"}
-{"account_number":324,"balance":44976,"firstname":"Gladys","lastname":"Erickson","age":22,"gender":"M","address":"250 Battery Avenue","employer":"Eternis","email":"gladyserickson@eternis.com","city":"Marne","state":"IA"}
-{"account_number":329,"balance":31138,"firstname":"Nellie","lastname":"Mercer","age":25,"gender":"M","address":"967 Ebony Court","employer":"Scenty","email":"nelliemercer@scenty.com","city":"Jardine","state":"AK"}
-{"account_number":331,"balance":46004,"firstname":"Gibson","lastname":"Potts","age":34,"gender":"F","address":"994 Dahill Road","employer":"Zensus","email":"gibsonpotts@zensus.com","city":"Frizzleburg","state":"CO"}
-{"account_number":336,"balance":40891,"firstname":"Dudley","lastname":"Avery","age":25,"gender":"M","address":"405 Powers Street","employer":"Genmom","email":"dudleyavery@genmom.com","city":"Clarksburg","state":"CO"}
-{"account_number":343,"balance":37684,"firstname":"Robbie","lastname":"Logan","age":29,"gender":"M","address":"488 Linden Boulevard","employer":"Hydrocom","email":"robbielogan@hydrocom.com","city":"Stockdale","state":"TN"}
-{"account_number":348,"balance":1360,"firstname":"Karina","lastname":"Russell","age":37,"gender":"M","address":"797 Moffat Street","employer":"Limozen","email":"karinarussell@limozen.com","city":"Riegelwood","state":"RI"}
-{"account_number":350,"balance":4267,"firstname":"Wyatt","lastname":"Wise","age":22,"gender":"F","address":"896 Bleecker Street","employer":"Rockyard","email":"wyattwise@rockyard.com","city":"Joes","state":"MS"}
-{"account_number":355,"balance":40961,"firstname":"Gregory","lastname":"Delacruz","age":38,"gender":"M","address":"876 Cortelyou Road","employer":"Oulu","email":"gregorydelacruz@oulu.com","city":"Waterloo","state":"WV"}
-{"account_number":362,"balance":14938,"firstname":"Jimmie","lastname":"Dejesus","age":26,"gender":"M","address":"351 Navy Walk","employer":"Ecolight","email":"jimmiedejesus@ecolight.com","city":"Berlin","state":"ME"}
-{"account_number":367,"balance":40458,"firstname":"Elaine","lastname":"Workman","age":20,"gender":"M","address":"188 Ridge Boulevard","employer":"Colaire","email":"elaineworkman@colaire.com","city":"Herbster","state":"AK"}
-{"account_number":374,"balance":19521,"firstname":"Blanchard","lastname":"Stein","age":30,"gender":"M","address":"313 Bartlett Street","employer":"Cujo","email":"blanchardstein@cujo.com","city":"Cascades","state":"OR"}
-{"account_number":379,"balance":12962,"firstname":"Ruthie","lastname":"Lamb","age":21,"gender":"M","address":"796 Rockaway Avenue","employer":"Incubus","email":"ruthielamb@incubus.com","city":"Hickory","state":"TX"}
-{"account_number":381,"balance":40978,"firstname":"Sophie","lastname":"Mays","age":31,"gender":"M","address":"261 Varanda Place","employer":"Uneeq","email":"sophiemays@uneeq.com","city":"Cressey","state":"AR"}
-{"account_number":386,"balance":42588,"firstname":"Wallace","lastname":"Barr","age":39,"gender":"F","address":"246 Beverly Road","employer":"Concility","email":"wallacebarr@concility.com","city":"Durham","state":"IN"}
-{"account_number":393,"balance":43936,"firstname":"William","lastname":"Kelly","age":24,"gender":"M","address":"178 Lawrence Avenue","employer":"Techtrix","email":"williamkelly@techtrix.com","city":"Orin","state":"PA"}
-{"account_number":398,"balance":8543,"firstname":"Leticia","lastname":"Duran","age":35,"gender":"F","address":"305 Senator Street","employer":"Xleen","email":"leticiaduran@xleen.com","city":"Cavalero","state":"PA"}
-{"account_number":401,"balance":29408,"firstname":"Contreras","lastname":"Randolph","age":38,"gender":"M","address":"104 Lewis Avenue","employer":"Inrt","email":"contrerasrandolph@inrt.com","city":"Chesapeake","state":"CT"}
-{"account_number":406,"balance":28127,"firstname":"Mccarthy","lastname":"Dunlap","age":28,"gender":"F","address":"684 Seacoast Terrace","employer":"Canopoly","email":"mccarthydunlap@canopoly.com","city":"Elliott","state":"NC"}
-{"account_number":413,"balance":15631,"firstname":"Pugh","lastname":"Hamilton","age":39,"gender":"F","address":"124 Euclid Avenue","employer":"Techade","email":"pughhamilton@techade.com","city":"Beaulieu","state":"CA"}
-{"account_number":418,"balance":10207,"firstname":"Reed","lastname":"Goff","age":32,"gender":"M","address":"959 Everit Street","employer":"Zillan","email":"reedgoff@zillan.com","city":"Hiko","state":"WV"}
-{"account_number":420,"balance":44699,"firstname":"Brandie","lastname":"Hayden","age":22,"gender":"M","address":"291 Ash Street","employer":"Digifad","email":"brandiehayden@digifad.com","city":"Spelter","state":"NM"}
-{"account_number":425,"balance":41308,"firstname":"Queen","lastname":"Leach","age":30,"gender":"M","address":"105 Fair Street","employer":"Magneato","email":"queenleach@magneato.com","city":"Barronett","state":"NH"}
-{"account_number":432,"balance":28969,"firstname":"Preston","lastname":"Ferguson","age":40,"gender":"F","address":"239 Greenwood Avenue","employer":"Bitendrex","email":"prestonferguson@bitendrex.com","city":"Idledale","state":"ND"}
-{"account_number":437,"balance":41225,"firstname":"Rosales","lastname":"Marquez","age":29,"gender":"M","address":"873 Ryerson Street","employer":"Ronelon","email":"rosalesmarquez@ronelon.com","city":"Allendale","state":"CA"}
-{"account_number":444,"balance":44219,"firstname":"Dolly","lastname":"Finch","age":24,"gender":"F","address":"974 Interborough Parkway","employer":"Zytrac","email":"dollyfinch@zytrac.com","city":"Vowinckel","state":"WY"}
-{"account_number":449,"balance":41950,"firstname":"Barnett","lastname":"Cantrell","age":39,"gender":"F","address":"945 Bedell Lane","employer":"Zentility","email":"barnettcantrell@zentility.com","city":"Swartzville","state":"ND"}
-{"account_number":451,"balance":31950,"firstname":"Mason","lastname":"Mcleod","age":31,"gender":"F","address":"438 Havemeyer Street","employer":"Omatom","email":"masonmcleod@omatom.com","city":"Ryderwood","state":"NE"}
-{"account_number":456,"balance":21419,"firstname":"Solis","lastname":"Kline","age":33,"gender":"M","address":"818 Ashford Street","employer":"Vetron","email":"soliskline@vetron.com","city":"Ruffin","state":"NY"}
-{"account_number":463,"balance":36672,"firstname":"Heidi","lastname":"Acosta","age":20,"gender":"F","address":"692 Kenmore Terrace","employer":"Elpro","email":"heidiacosta@elpro.com","city":"Ezel","state":"SD"}
-{"account_number":468,"balance":18400,"firstname":"Foreman","lastname":"Fowler","age":40,"gender":"M","address":"443 Jackson Court","employer":"Zillactic","email":"foremanfowler@zillactic.com","city":"Wakarusa","state":"WA"}
-{"account_number":470,"balance":20455,"firstname":"Schneider","lastname":"Hull","age":35,"gender":"M","address":"724 Apollo Street","employer":"Exospeed","email":"schneiderhull@exospeed.com","city":"Watchtower","state":"ID"}
-{"account_number":475,"balance":24427,"firstname":"Morales","lastname":"Jacobs","age":22,"gender":"F","address":"225 Desmond Court","employer":"Oronoko","email":"moralesjacobs@oronoko.com","city":"Clayville","state":"CT"}
-{"account_number":482,"balance":14834,"firstname":"Janie","lastname":"Bass","age":39,"gender":"M","address":"781 Grattan Street","employer":"Manglo","email":"janiebass@manglo.com","city":"Kenwood","state":"IA"}
-{"account_number":487,"balance":30718,"firstname":"Sawyer","lastname":"Vincent","age":26,"gender":"F","address":"238 Lancaster Avenue","employer":"Brainquil","email":"sawyervincent@brainquil.com","city":"Galesville","state":"MS"}
-{"account_number":494,"balance":3592,"firstname":"Holden","lastname":"Bowen","age":30,"gender":"M","address":"374 Elmwood Avenue","employer":"Endipine","email":"holdenbowen@endipine.com","city":"Rosine","state":"ID"}
-{"account_number":499,"balance":26060,"firstname":"Lara","lastname":"Perkins","age":26,"gender":"M","address":"703 Monroe Street","employer":"Paprikut","email":"laraperkins@paprikut.com","city":"Barstow","state":"NY"}
-{"account_number":502,"balance":31898,"firstname":"Woodard","lastname":"Bailey","age":31,"gender":"F","address":"585 Albee Square","employer":"Imperium","email":"woodardbailey@imperium.com","city":"Matheny","state":"MT"}
-{"account_number":507,"balance":27675,"firstname":"Blankenship","lastname":"Ramirez","age":31,"gender":"M","address":"630 Graham Avenue","employer":"Bytrex","email":"blankenshipramirez@bytrex.com","city":"Bancroft","state":"CT"}
-{"account_number":514,"balance":30125,"firstname":"Solomon","lastname":"Bush","age":34,"gender":"M","address":"409 Harkness Avenue","employer":"Snacktion","email":"solomonbush@snacktion.com","city":"Grayhawk","state":"TX"}
-{"account_number":519,"balance":3282,"firstname":"Lorna","lastname":"Franco","age":31,"gender":"F","address":"722 Schenck Court","employer":"Zentia","email":"lornafranco@zentia.com","city":"National","state":"FL"}
-{"account_number":521,"balance":16348,"firstname":"Josefa","lastname":"Buckley","age":34,"gender":"F","address":"848 Taylor Street","employer":"Mazuda","email":"josefabuckley@mazuda.com","city":"Saranap","state":"NM"}
-{"account_number":526,"balance":35375,"firstname":"Sweeney","lastname":"Fulton","age":33,"gender":"F","address":"550 Martense Street","employer":"Cormoran","email":"sweeneyfulton@cormoran.com","city":"Chalfant","state":"IA"}
-{"account_number":533,"balance":13761,"firstname":"Margarita","lastname":"Diaz","age":23,"gender":"M","address":"295 Tapscott Street","employer":"Zilodyne","email":"margaritadiaz@zilodyne.com","city":"Hondah","state":"ID"}
-{"account_number":538,"balance":16416,"firstname":"Koch","lastname":"Barker","age":21,"gender":"M","address":"919 Gerry Street","employer":"Xplor","email":"kochbarker@xplor.com","city":"Dixie","state":"WY"}
-{"account_number":540,"balance":40235,"firstname":"Tammy","lastname":"Wiggins","age":32,"gender":"F","address":"186 Schenectady Avenue","employer":"Speedbolt","email":"tammywiggins@speedbolt.com","city":"Salvo","state":"LA"}
-{"account_number":545,"balance":27011,"firstname":"Lena","lastname":"Lucas","age":20,"gender":"M","address":"110 Lamont Court","employer":"Kindaloo","email":"lenalucas@kindaloo.com","city":"Harleigh","state":"KY"}
-{"account_number":552,"balance":14727,"firstname":"Kate","lastname":"Estes","age":39,"gender":"M","address":"785 Willmohr Street","employer":"Rodeocean","email":"kateestes@rodeocean.com","city":"Elfrida","state":"HI"}
-{"account_number":557,"balance":3119,"firstname":"Landry","lastname":"Buck","age":20,"gender":"M","address":"558 Schweikerts Walk","employer":"Protodyne","email":"landrybuck@protodyne.com","city":"Edneyville","state":"AL"}
-{"account_number":564,"balance":43631,"firstname":"Owens","lastname":"Bowers","age":22,"gender":"M","address":"842 Congress Street","employer":"Nspire","email":"owensbowers@nspire.com","city":"Machias","state":"VA"}
-{"account_number":569,"balance":40019,"firstname":"Sherri","lastname":"Rowe","age":39,"gender":"F","address":"591 Arlington Place","employer":"Netility","email":"sherrirowe@netility.com","city":"Bridgetown","state":"SC"}
-{"account_number":571,"balance":3014,"firstname":"Ayers","lastname":"Duffy","age":28,"gender":"F","address":"721 Wortman Avenue","employer":"Aquasseur","email":"ayersduffy@aquasseur.com","city":"Tilleda","state":"MS"}
-{"account_number":576,"balance":29682,"firstname":"Helena","lastname":"Robertson","age":33,"gender":"F","address":"774 Devon Avenue","employer":"Vicon","email":"helenarobertson@vicon.com","city":"Dyckesville","state":"NV"}
-{"account_number":583,"balance":26558,"firstname":"Castro","lastname":"West","age":34,"gender":"F","address":"814 Williams Avenue","employer":"Cipromox","email":"castrowest@cipromox.com","city":"Nescatunga","state":"IL"}
-{"account_number":588,"balance":43531,"firstname":"Martina","lastname":"Collins","age":31,"gender":"M","address":"301 Anna Court","employer":"Geekwagon","email":"martinacollins@geekwagon.com","city":"Oneida","state":"VA"}
-{"account_number":590,"balance":4652,"firstname":"Ladonna","lastname":"Tucker","age":31,"gender":"F","address":"162 Kane Place","employer":"Infotrips","email":"ladonnatucker@infotrips.com","city":"Utting","state":"IA"}
-{"account_number":595,"balance":12478,"firstname":"Mccall","lastname":"Britt","age":36,"gender":"F","address":"823 Hill Street","employer":"Cablam","email":"mccallbritt@cablam.com","city":"Vernon","state":"CA"}
-{"account_number":603,"balance":28145,"firstname":"Janette","lastname":"Guzman","age":31,"gender":"F","address":"976 Kingston Avenue","employer":"Splinx","email":"janetteguzman@splinx.com","city":"Boomer","state":"NC"}
-{"account_number":608,"balance":47091,"firstname":"Carey","lastname":"Whitley","age":32,"gender":"F","address":"976 Lawrence Street","employer":"Poshome","email":"careywhitley@poshome.com","city":"Weogufka","state":"NE"}
-{"account_number":610,"balance":40571,"firstname":"Foster","lastname":"Weber","age":24,"gender":"F","address":"323 Rochester Avenue","employer":"Firewax","email":"fosterweber@firewax.com","city":"Winston","state":"NY"}
-{"account_number":615,"balance":28726,"firstname":"Delgado","lastname":"Curry","age":28,"gender":"F","address":"706 Butler Street","employer":"Zoxy","email":"delgadocurry@zoxy.com","city":"Gracey","state":"SD"}
-{"account_number":622,"balance":9661,"firstname":"Paulette","lastname":"Hartman","age":38,"gender":"M","address":"375 Emerald Street","employer":"Locazone","email":"paulettehartman@locazone.com","city":"Canterwood","state":"OH"}
-{"account_number":627,"balance":47546,"firstname":"Crawford","lastname":"Sears","age":37,"gender":"F","address":"686 Eastern Parkway","employer":"Updat","email":"crawfordsears@updat.com","city":"Bison","state":"VT"}
-{"account_number":634,"balance":29805,"firstname":"Deloris","lastname":"Levy","age":38,"gender":"M","address":"838 Foster Avenue","employer":"Homelux","email":"delorislevy@homelux.com","city":"Kempton","state":"PA"}
-{"account_number":639,"balance":28875,"firstname":"Caitlin","lastname":"Clements","age":32,"gender":"F","address":"627 Aster Court","employer":"Bunga","email":"caitlinclements@bunga.com","city":"Cetronia","state":"SC"}
-{"account_number":641,"balance":18345,"firstname":"Sheppard","lastname":"Everett","age":39,"gender":"F","address":"791 Norwood Avenue","employer":"Roboid","email":"sheppardeverett@roboid.com","city":"Selma","state":"AK"}
-{"account_number":646,"balance":15559,"firstname":"Lavonne","lastname":"Reyes","age":31,"gender":"F","address":"983 Newport Street","employer":"Parcoe","email":"lavonnereyes@parcoe.com","city":"Monument","state":"LA"}
-{"account_number":653,"balance":7606,"firstname":"Marcia","lastname":"Bennett","age":33,"gender":"F","address":"455 Bragg Street","employer":"Opticall","email":"marciabennett@opticall.com","city":"Magnolia","state":"NC"}
-{"account_number":658,"balance":10210,"firstname":"Bass","lastname":"Mcconnell","age":32,"gender":"F","address":"274 Ocean Avenue","employer":"Combot","email":"bassmcconnell@combot.com","city":"Beyerville","state":"OH"}
-{"account_number":660,"balance":46427,"firstname":"Moon","lastname":"Wood","age":33,"gender":"F","address":"916 Amersfort Place","employer":"Olucore","email":"moonwood@olucore.com","city":"Como","state":"VA"}
-{"account_number":665,"balance":15215,"firstname":"Britney","lastname":"Young","age":36,"gender":"M","address":"766 Sackman Street","employer":"Geoforma","email":"britneyyoung@geoforma.com","city":"Tuttle","state":"WI"}
-{"account_number":672,"balance":12621,"firstname":"Camille","lastname":"Munoz","age":36,"gender":"F","address":"959 Lewis Place","employer":"Vantage","email":"camillemunoz@vantage.com","city":"Whitmer","state":"IN"}
-{"account_number":677,"balance":8491,"firstname":"Snider","lastname":"Benton","age":26,"gender":"M","address":"827 Evans Street","employer":"Medicroix","email":"sniderbenton@medicroix.com","city":"Kaka","state":"UT"}
-{"account_number":684,"balance":46091,"firstname":"Warren","lastname":"Snow","age":25,"gender":"M","address":"756 Oakland Place","employer":"Bizmatic","email":"warrensnow@bizmatic.com","city":"Hatteras","state":"NE"}
-{"account_number":689,"balance":14985,"firstname":"Ines","lastname":"Chaney","age":28,"gender":"M","address":"137 Dikeman Street","employer":"Zidant","email":"ineschaney@zidant.com","city":"Nettie","state":"DC"}
-{"account_number":691,"balance":10792,"firstname":"Mclean","lastname":"Colon","age":22,"gender":"M","address":"876 Classon Avenue","employer":"Elentrix","email":"mcleancolon@elentrix.com","city":"Unionville","state":"OK"}
-{"account_number":696,"balance":17568,"firstname":"Crane","lastname":"Matthews","age":32,"gender":"F","address":"721 Gerritsen Avenue","employer":"Intradisk","email":"cranematthews@intradisk.com","city":"Brewster","state":"WV"}
-{"account_number":704,"balance":45347,"firstname":"Peters","lastname":"Kent","age":22,"gender":"F","address":"871 Independence Avenue","employer":"Extragen","email":"peterskent@extragen.com","city":"Morriston","state":"CA"}
-{"account_number":709,"balance":11015,"firstname":"Abbott","lastname":"Odom","age":29,"gender":"M","address":"893 Union Street","employer":"Jimbies","email":"abbottodom@jimbies.com","city":"Leeper","state":"NJ"}
-{"account_number":711,"balance":26939,"firstname":"Villarreal","lastname":"Horton","age":35,"gender":"F","address":"861 Creamer Street","employer":"Lexicondo","email":"villarrealhorton@lexicondo.com","city":"Lydia","state":"MS"}
-{"account_number":716,"balance":19789,"firstname":"Paul","lastname":"Mason","age":34,"gender":"F","address":"618 Nichols Avenue","employer":"Slax","email":"paulmason@slax.com","city":"Snowville","state":"OK"}
-{"account_number":723,"balance":16421,"firstname":"Nixon","lastname":"Moran","age":27,"gender":"M","address":"569 Campus Place","employer":"Cuizine","email":"nixonmoran@cuizine.com","city":"Buxton","state":"DC"}
-{"account_number":728,"balance":44818,"firstname":"Conley","lastname":"Preston","age":28,"gender":"M","address":"450 Coventry Road","employer":"Obones","email":"conleypreston@obones.com","city":"Alden","state":"CO"}
-{"account_number":730,"balance":41299,"firstname":"Moore","lastname":"Lee","age":30,"gender":"M","address":"797 Turner Place","employer":"Orbean","email":"moorelee@orbean.com","city":"Highland","state":"DE"}
-{"account_number":735,"balance":3984,"firstname":"Loraine","lastname":"Willis","age":32,"gender":"F","address":"928 Grove Street","employer":"Gadtron","email":"lorainewillis@gadtron.com","city":"Lowgap","state":"NY"}
-{"account_number":742,"balance":24765,"firstname":"Merle","lastname":"Wooten","age":26,"gender":"M","address":"317 Pooles Lane","employer":"Tropolis","email":"merlewooten@tropolis.com","city":"Bentley","state":"ND"}
-{"account_number":747,"balance":16617,"firstname":"Diaz","lastname":"Austin","age":38,"gender":"M","address":"676 Harway Avenue","employer":"Irack","email":"diazaustin@irack.com","city":"Cliff","state":"HI"}
-{"account_number":754,"balance":10779,"firstname":"Jones","lastname":"Vega","age":25,"gender":"F","address":"795 India Street","employer":"Gluid","email":"jonesvega@gluid.com","city":"Tyhee","state":"FL"}
-{"account_number":759,"balance":38007,"firstname":"Rose","lastname":"Carlson","age":27,"gender":"M","address":"987 Navy Street","employer":"Aquasure","email":"rosecarlson@aquasure.com","city":"Carlton","state":"CT"}
-{"account_number":761,"balance":7663,"firstname":"Rae","lastname":"Juarez","age":34,"gender":"F","address":"560 Gilmore Court","employer":"Entropix","email":"raejuarez@entropix.com","city":"Northchase","state":"ID"}
-{"account_number":766,"balance":21957,"firstname":"Thomas","lastname":"Gillespie","age":38,"gender":"M","address":"993 Williams Place","employer":"Octocore","email":"thomasgillespie@octocore.com","city":"Defiance","state":"MS"}
-{"account_number":773,"balance":31126,"firstname":"Liza","lastname":"Coffey","age":36,"gender":"F","address":"540 Bulwer Place","employer":"Assurity","email":"lizacoffey@assurity.com","city":"Gilgo","state":"WV"}
-{"account_number":778,"balance":46007,"firstname":"Underwood","lastname":"Wheeler","age":28,"gender":"M","address":"477 Provost Street","employer":"Decratex","email":"underwoodwheeler@decratex.com","city":"Sardis","state":"ID"}
-{"account_number":780,"balance":4682,"firstname":"Maryanne","lastname":"Hendricks","age":26,"gender":"F","address":"709 Wolcott Street","employer":"Sarasonic","email":"maryannehendricks@sarasonic.com","city":"Santel","state":"NH"}
-{"account_number":785,"balance":25078,"firstname":"Fields","lastname":"Lester","age":29,"gender":"M","address":"808 Chestnut Avenue","employer":"Visualix","email":"fieldslester@visualix.com","city":"Rowe","state":"PA"}
-{"account_number":792,"balance":13109,"firstname":"Becky","lastname":"Jimenez","age":40,"gender":"F","address":"539 Front Street","employer":"Isologia","email":"beckyjimenez@isologia.com","city":"Summertown","state":"MI"}
-{"account_number":797,"balance":6854,"firstname":"Lindsay","lastname":"Mills","age":26,"gender":"F","address":"919 Quay Street","employer":"Zoinage","email":"lindsaymills@zoinage.com","city":"Elliston","state":"VA"}
-{"account_number":800,"balance":26217,"firstname":"Candy","lastname":"Oconnor","age":28,"gender":"M","address":"200 Newel Street","employer":"Radiantix","email":"candyoconnor@radiantix.com","city":"Sandston","state":"OH"}
-{"account_number":805,"balance":18426,"firstname":"Jackson","lastname":"Sampson","age":27,"gender":"F","address":"722 Kenmore Court","employer":"Daido","email":"jacksonsampson@daido.com","city":"Bellamy","state":"ME"}
-{"account_number":812,"balance":42593,"firstname":"Graves","lastname":"Newman","age":32,"gender":"F","address":"916 Joralemon Street","employer":"Ecrater","email":"gravesnewman@ecrater.com","city":"Crown","state":"PA"}
-{"account_number":817,"balance":36582,"firstname":"Padilla","lastname":"Bauer","age":36,"gender":"F","address":"310 Cadman Plaza","employer":"Exoblue","email":"padillabauer@exoblue.com","city":"Ahwahnee","state":"MN"}
-{"account_number":824,"balance":6053,"firstname":"Dyer","lastname":"Henson","age":33,"gender":"M","address":"650 Seaview Avenue","employer":"Nitracyr","email":"dyerhenson@nitracyr.com","city":"Gibsonia","state":"KS"}
-{"account_number":829,"balance":20263,"firstname":"Althea","lastname":"Bell","age":37,"gender":"M","address":"319 Cook Street","employer":"Hyplex","email":"altheabell@hyplex.com","city":"Wadsworth","state":"DC"}
-{"account_number":831,"balance":25375,"firstname":"Wendy","lastname":"Savage","age":37,"gender":"M","address":"421 Veranda Place","employer":"Neurocell","email":"wendysavage@neurocell.com","city":"Fresno","state":"MS"}
-{"account_number":836,"balance":20797,"firstname":"Lloyd","lastname":"Lindsay","age":25,"gender":"F","address":"953 Dinsmore Place","employer":"Suretech","email":"lloydlindsay@suretech.com","city":"Conway","state":"VA"}
-{"account_number":843,"balance":15555,"firstname":"Patricia","lastname":"Barton","age":34,"gender":"F","address":"406 Seabring Street","employer":"Providco","email":"patriciabarton@providco.com","city":"Avoca","state":"RI"}
-{"account_number":848,"balance":15443,"firstname":"Carmella","lastname":"Cash","age":38,"gender":"M","address":"988 Exeter Street","employer":"Bristo","email":"carmellacash@bristo.com","city":"Northridge","state":"ID"}
-{"account_number":850,"balance":6531,"firstname":"Carlene","lastname":"Gaines","age":37,"gender":"F","address":"753 Monroe Place","employer":"Naxdis","email":"carlenegaines@naxdis.com","city":"Genoa","state":"OR"}
-{"account_number":855,"balance":40170,"firstname":"Mia","lastname":"Stevens","age":31,"gender":"F","address":"326 Driggs Avenue","employer":"Aeora","email":"miastevens@aeora.com","city":"Delwood","state":"IL"}
-{"account_number":862,"balance":38792,"firstname":"Clayton","lastname":"Golden","age":38,"gender":"F","address":"620 Regent Place","employer":"Accusage","email":"claytongolden@accusage.com","city":"Ona","state":"NC"}
-{"account_number":867,"balance":45453,"firstname":"Blanca","lastname":"Ellison","age":23,"gender":"F","address":"593 McKibben Street","employer":"Koogle","email":"blancaellison@koogle.com","city":"Frystown","state":"WY"}
-{"account_number":874,"balance":23079,"firstname":"Lynette","lastname":"Higgins","age":22,"gender":"M","address":"377 McKinley Avenue","employer":"Menbrain","email":"lynettehiggins@menbrain.com","city":"Manitou","state":"TX"}
-{"account_number":879,"balance":48332,"firstname":"Sabrina","lastname":"Lancaster","age":31,"gender":"F","address":"382 Oak Street","employer":"Webiotic","email":"sabrinalancaster@webiotic.com","city":"Lindisfarne","state":"AZ"}
-{"account_number":881,"balance":26684,"firstname":"Barnes","lastname":"Ware","age":38,"gender":"F","address":"666 Hooper Street","employer":"Norali","email":"barnesware@norali.com","city":"Cazadero","state":"GA"}
-{"account_number":886,"balance":14867,"firstname":"Willa","lastname":"Leblanc","age":38,"gender":"F","address":"773 Bergen Street","employer":"Nurali","email":"willaleblanc@nurali.com","city":"Hilltop","state":"NC"}
-{"account_number":893,"balance":42584,"firstname":"Moses","lastname":"Campos","age":38,"gender":"F","address":"991 Bevy Court","employer":"Trollery","email":"mosescampos@trollery.com","city":"Freetown","state":"AK"}
-{"account_number":898,"balance":12019,"firstname":"Lori","lastname":"Stevenson","age":29,"gender":"M","address":"910 Coles Street","employer":"Honotron","email":"loristevenson@honotron.com","city":"Shindler","state":"VT"}
-{"account_number":901,"balance":35038,"firstname":"Irma","lastname":"Dotson","age":23,"gender":"F","address":"245 Mayfair Drive","employer":"Bleeko","email":"irmadotson@bleeko.com","city":"Lodoga","state":"UT"}
-{"account_number":906,"balance":24073,"firstname":"Vicki","lastname":"Suarez","age":36,"gender":"M","address":"829 Roosevelt Place","employer":"Utara","email":"vickisuarez@utara.com","city":"Albrightsville","state":"AR"}
-{"account_number":913,"balance":47657,"firstname":"Margery","lastname":"Monroe","age":25,"gender":"M","address":"941 Fanchon Place","employer":"Exerta","email":"margerymonroe@exerta.com","city":"Bannock","state":"MD"}
-{"account_number":918,"balance":36776,"firstname":"Dianna","lastname":"Hernandez","age":25,"gender":"M","address":"499 Moultrie Street","employer":"Isologica","email":"diannahernandez@isologica.com","city":"Falconaire","state":"ID"}
-{"account_number":920,"balance":41513,"firstname":"Jerri","lastname":"Mitchell","age":26,"gender":"M","address":"831 Kent Street","employer":"Tasmania","email":"jerrimitchell@tasmania.com","city":"Cotopaxi","state":"IA"}
-{"account_number":925,"balance":18295,"firstname":"Rosario","lastname":"Jackson","age":24,"gender":"M","address":"178 Leonora Court","employer":"Progenex","email":"rosariojackson@progenex.com","city":"Rivereno","state":"DE"}
-{"account_number":932,"balance":3111,"firstname":"Summer","lastname":"Porter","age":33,"gender":"F","address":"949 Grand Avenue","employer":"Multiflex","email":"summerporter@multiflex.com","city":"Spokane","state":"OK"}
-{"account_number":937,"balance":43491,"firstname":"Selma","lastname":"Anderson","age":24,"gender":"M","address":"205 Reed Street","employer":"Dadabase","email":"selmaanderson@dadabase.com","city":"Malo","state":"AL"}
-{"account_number":944,"balance":46478,"firstname":"Donaldson","lastname":"Woodard","age":38,"gender":"F","address":"498 Laurel Avenue","employer":"Zogak","email":"donaldsonwoodard@zogak.com","city":"Hasty","state":"ID"}
-{"account_number":949,"balance":48703,"firstname":"Latasha","lastname":"Mullins","age":29,"gender":"F","address":"272 Lefferts Place","employer":"Zenolux","email":"latashamullins@zenolux.com","city":"Kieler","state":"MN"}
-{"account_number":951,"balance":36337,"firstname":"Tran","lastname":"Burris","age":25,"gender":"F","address":"561 Rutland Road","employer":"Geoform","email":"tranburris@geoform.com","city":"Longbranch","state":"IL"}
-{"account_number":956,"balance":19477,"firstname":"Randall","lastname":"Lynch","age":22,"gender":"F","address":"490 Madison Place","employer":"Cosmetex","email":"randalllynch@cosmetex.com","city":"Wells","state":"SD"}
-{"account_number":963,"balance":30461,"firstname":"Griffin","lastname":"Sheppard","age":20,"gender":"M","address":"682 Linden Street","employer":"Zanymax","email":"griffinsheppard@zanymax.com","city":"Fannett","state":"NM"}
-{"account_number":968,"balance":32371,"firstname":"Luella","lastname":"Burch","age":39,"gender":"M","address":"684 Arkansas Drive","employer":"Krag","email":"luellaburch@krag.com","city":"Brambleton","state":"SD"}
-{"account_number":970,"balance":19648,"firstname":"Forbes","lastname":"Wallace","age":28,"gender":"M","address":"990 Mill Road","employer":"Pheast","email":"forbeswallace@pheast.com","city":"Lopezo","state":"AK"}
-{"account_number":975,"balance":5239,"firstname":"Delores","lastname":"Booker","age":27,"gender":"F","address":"328 Conselyea Street","employer":"Centice","email":"deloresbooker@centice.com","city":"Williams","state":"HI"}
-{"account_number":982,"balance":16511,"firstname":"Buck","lastname":"Robinson","age":24,"gender":"M","address":"301 Melrose Street","employer":"Calcu","email":"buckrobinson@calcu.com","city":"Welch","state":"PA"}
-{"account_number":987,"balance":4072,"firstname":"Brock","lastname":"Sandoval","age":20,"gender":"F","address":"977 Gem Street","employer":"Fiberox","email":"brocksandoval@fiberox.com","city":"Celeryville","state":"NY"}
-{"account_number":994,"balance":33298,"firstname":"Madge","lastname":"Holcomb","age":31,"gender":"M","address":"612 Hawthorne Street","employer":"Escenta","email":"madgeholcomb@escenta.com","city":"Alafaya","state":"OR"}
-{"account_number":999,"balance":6087,"firstname":"Dorothy","lastname":"Barron","age":22,"gender":"F","address":"499 Laurel Avenue","employer":"Xurban","email":"dorothybarron@xurban.com","city":"Belvoir","state":"CA"}
-{"account_number":4,"balance":27658,"firstname":"Rodriquez","lastname":"Flores","age":31,"gender":"F","address":"986 Wyckoff Avenue","employer":"Tourmania","email":"rodriquezflores@tourmania.com","city":"Eastvale","state":"HI"}
-{"account_number":9,"balance":24776,"firstname":"Opal","lastname":"Meadows","age":39,"gender":"M","address":"963 Neptune Avenue","employer":"Cedward","email":"opalmeadows@cedward.com","city":"Olney","state":"OH"}
-{"account_number":11,"balance":20203,"firstname":"Jenkins","lastname":"Haney","age":20,"gender":"M","address":"740 Ferry Place","employer":"Qimonk","email":"jenkinshaney@qimonk.com","city":"Steinhatchee","state":"GA"}
-{"account_number":16,"balance":35883,"firstname":"Adrian","lastname":"Pitts","age":34,"gender":"F","address":"963 Fay Court","employer":"Combogene","email":"adrianpitts@combogene.com","city":"Remington","state":"SD"}
-{"account_number":23,"balance":42374,"firstname":"Kirsten","lastname":"Fox","age":20,"gender":"M","address":"330 Dumont Avenue","employer":"Codax","email":"kirstenfox@codax.com","city":"Walton","state":"AK"}
-{"account_number":28,"balance":42112,"firstname":"Vega","lastname":"Flynn","age":20,"gender":"M","address":"647 Hyman Court","employer":"Accupharm","email":"vegaflynn@accupharm.com","city":"Masthope","state":"OH"}
-{"account_number":30,"balance":19087,"firstname":"Lamb","lastname":"Townsend","age":26,"gender":"M","address":"169 Lyme Avenue","employer":"Geeknet","email":"lambtownsend@geeknet.com","city":"Epworth","state":"AL"}
-{"account_number":35,"balance":42039,"firstname":"Darla","lastname":"Bridges","age":27,"gender":"F","address":"315 Central Avenue","employer":"Xeronk","email":"darlabridges@xeronk.com","city":"Woodlake","state":"RI"}
-{"account_number":42,"balance":21137,"firstname":"Harding","lastname":"Hobbs","age":26,"gender":"F","address":"474 Ridgewood Place","employer":"Xth","email":"hardinghobbs@xth.com","city":"Heil","state":"ND"}
-{"account_number":47,"balance":33044,"firstname":"Georgia","lastname":"Wilkerson","age":23,"gender":"M","address":"369 Herbert Street","employer":"Endipin","email":"georgiawilkerson@endipin.com","city":"Dellview","state":"WI"}
-{"account_number":54,"balance":23406,"firstname":"Angel","lastname":"Mann","age":22,"gender":"F","address":"229 Ferris Street","employer":"Amtas","email":"angelmann@amtas.com","city":"Calverton","state":"WA"}
-{"account_number":59,"balance":37728,"firstname":"Malone","lastname":"Justice","age":37,"gender":"F","address":"721 Russell Street","employer":"Emoltra","email":"malonejustice@emoltra.com","city":"Trucksville","state":"HI"}
-{"account_number":61,"balance":6856,"firstname":"Shawn","lastname":"Baird","age":20,"gender":"M","address":"605 Monument Walk","employer":"Moltonic","email":"shawnbaird@moltonic.com","city":"Darlington","state":"MN"}
-{"account_number":66,"balance":25939,"firstname":"Franks","lastname":"Salinas","age":28,"gender":"M","address":"437 Hamilton Walk","employer":"Cowtown","email":"frankssalinas@cowtown.com","city":"Chase","state":"VT"}
-{"account_number":73,"balance":33457,"firstname":"Irene","lastname":"Stephenson","age":32,"gender":"M","address":"684 Miller Avenue","employer":"Hawkster","email":"irenestephenson@hawkster.com","city":"Levant","state":"AR"}
-{"account_number":78,"balance":48656,"firstname":"Elvira","lastname":"Patterson","age":23,"gender":"F","address":"834 Amber Street","employer":"Assistix","email":"elvirapatterson@assistix.com","city":"Dunbar","state":"TN"}
-{"account_number":80,"balance":13445,"firstname":"Lacey","lastname":"Blanchard","age":30,"gender":"F","address":"823 Himrod Street","employer":"Comdom","email":"laceyblanchard@comdom.com","city":"Matthews","state":"MO"}
-{"account_number":85,"balance":48735,"firstname":"Wilcox","lastname":"Sellers","age":20,"gender":"M","address":"212 Irving Avenue","employer":"Confrenzy","email":"wilcoxsellers@confrenzy.com","city":"Kipp","state":"MT"}
-{"account_number":92,"balance":26753,"firstname":"Gay","lastname":"Brewer","age":34,"gender":"M","address":"369 Ditmars Street","employer":"Savvy","email":"gaybrewer@savvy.com","city":"Moquino","state":"HI"}
-{"account_number":97,"balance":49671,"firstname":"Karen","lastname":"Trujillo","age":40,"gender":"F","address":"512 Cumberland Walk","employer":"Tsunamia","email":"karentrujillo@tsunamia.com","city":"Fredericktown","state":"MO"}
-{"account_number":100,"balance":29869,"firstname":"Madden","lastname":"Woods","age":32,"gender":"F","address":"696 Ryder Avenue","employer":"Slumberia","email":"maddenwoods@slumberia.com","city":"Deercroft","state":"ME"}
-{"account_number":105,"balance":29654,"firstname":"Castillo","lastname":"Dickerson","age":33,"gender":"F","address":"673 Oxford Street","employer":"Tellifly","email":"castillodickerson@tellifly.com","city":"Succasunna","state":"NY"}
-{"account_number":112,"balance":38395,"firstname":"Frederick","lastname":"Case","age":30,"gender":"F","address":"580 Lexington Avenue","employer":"Talkalot","email":"frederickcase@talkalot.com","city":"Orovada","state":"MA"}
-{"account_number":117,"balance":48831,"firstname":"Robin","lastname":"Hays","age":38,"gender":"F","address":"347 Hornell Loop","employer":"Pasturia","email":"robinhays@pasturia.com","city":"Sims","state":"WY"}
-{"account_number":124,"balance":16425,"firstname":"Fern","lastname":"Lambert","age":20,"gender":"M","address":"511 Jay Street","employer":"Furnitech","email":"fernlambert@furnitech.com","city":"Cloverdale","state":"FL"}
-{"account_number":129,"balance":42409,"firstname":"Alexandria","lastname":"Sanford","age":33,"gender":"F","address":"934 Ridgecrest Terrace","employer":"Kyagoro","email":"alexandriasanford@kyagoro.com","city":"Concho","state":"UT"}
-{"account_number":131,"balance":28030,"firstname":"Dollie","lastname":"Koch","age":22,"gender":"F","address":"287 Manhattan Avenue","employer":"Skinserve","email":"dolliekoch@skinserve.com","city":"Shasta","state":"PA"}
-{"account_number":136,"balance":45801,"firstname":"Winnie","lastname":"Holland","age":38,"gender":"M","address":"198 Mill Lane","employer":"Neteria","email":"winnieholland@neteria.com","city":"Urie","state":"IL"}
-{"account_number":143,"balance":43093,"firstname":"Cohen","lastname":"Noble","age":39,"gender":"M","address":"454 Nelson Street","employer":"Buzzworks","email":"cohennoble@buzzworks.com","city":"Norvelt","state":"CO"}
-{"account_number":148,"balance":3662,"firstname":"Annmarie","lastname":"Snider","age":34,"gender":"F","address":"857 Lafayette Walk","employer":"Edecine","email":"annmariesnider@edecine.com","city":"Hollins","state":"OH"}
-{"account_number":150,"balance":15306,"firstname":"Ortega","lastname":"Dalton","age":20,"gender":"M","address":"237 Mermaid Avenue","employer":"Rameon","email":"ortegadalton@rameon.com","city":"Maxville","state":"NH"}
-{"account_number":155,"balance":27878,"firstname":"Atkinson","lastname":"Hudson","age":39,"gender":"F","address":"434 Colin Place","employer":"Qualitern","email":"atkinsonhudson@qualitern.com","city":"Hoehne","state":"OH"}
-{"account_number":162,"balance":6302,"firstname":"Griffith","lastname":"Calderon","age":35,"gender":"M","address":"871 Vandervoort Place","employer":"Quotezart","email":"griffithcalderon@quotezart.com","city":"Barclay","state":"FL"}
-{"account_number":167,"balance":42051,"firstname":"Hampton","lastname":"Ryan","age":20,"gender":"M","address":"618 Fleet Place","employer":"Zipak","email":"hamptonryan@zipak.com","city":"Irwin","state":"KS"}
-{"account_number":174,"balance":1464,"firstname":"Gamble","lastname":"Pierce","age":23,"gender":"F","address":"650 Eagle Street","employer":"Matrixity","email":"gamblepierce@matrixity.com","city":"Abiquiu","state":"OR"}
-{"account_number":179,"balance":13265,"firstname":"Elise","lastname":"Drake","age":25,"gender":"M","address":"305 Christopher Avenue","employer":"Turnling","email":"elisedrake@turnling.com","city":"Loretto","state":"LA"}
-{"account_number":181,"balance":27983,"firstname":"Bennett","lastname":"Hampton","age":22,"gender":"F","address":"435 Billings Place","employer":"Voipa","email":"bennetthampton@voipa.com","city":"Rodman","state":"WY"}
-{"account_number":186,"balance":18373,"firstname":"Kline","lastname":"Joyce","age":32,"gender":"M","address":"285 Falmouth Street","employer":"Tetratrex","email":"klinejoyce@tetratrex.com","city":"Klondike","state":"SD"}
-{"account_number":193,"balance":13412,"firstname":"Patty","lastname":"Petty","age":34,"gender":"F","address":"251 Vermont Street","employer":"Kinetica","email":"pattypetty@kinetica.com","city":"Grantville","state":"MS"}
-{"account_number":198,"balance":19686,"firstname":"Rachael","lastname":"Sharp","age":38,"gender":"F","address":"443 Vernon Avenue","employer":"Powernet","email":"rachaelsharp@powernet.com","city":"Canoochee","state":"UT"}
-{"account_number":201,"balance":14586,"firstname":"Ronda","lastname":"Perry","age":25,"gender":"F","address":"856 Downing Street","employer":"Artiq","email":"rondaperry@artiq.com","city":"Colton","state":"WV"}
-{"account_number":206,"balance":47423,"firstname":"Kelli","lastname":"Francis","age":20,"gender":"M","address":"671 George Street","employer":"Exoswitch","email":"kellifrancis@exoswitch.com","city":"Babb","state":"NJ"}
-{"account_number":213,"balance":34172,"firstname":"Bauer","lastname":"Summers","age":27,"gender":"M","address":"257 Boynton Place","employer":"Voratak","email":"bauersummers@voratak.com","city":"Oceola","state":"NC"}
-{"account_number":218,"balance":26702,"firstname":"Garrison","lastname":"Bryan","age":24,"gender":"F","address":"478 Greenpoint Avenue","employer":"Uniworld","email":"garrisonbryan@uniworld.com","city":"Comptche","state":"WI"}
-{"account_number":220,"balance":3086,"firstname":"Tania","lastname":"Middleton","age":22,"gender":"F","address":"541 Gunther Place","employer":"Zerology","email":"taniamiddleton@zerology.com","city":"Linwood","state":"IN"}
-{"account_number":225,"balance":21949,"firstname":"Maryann","lastname":"Murphy","age":24,"gender":"F","address":"894 Bridgewater Street","employer":"Cinesanct","email":"maryannmurphy@cinesanct.com","city":"Cartwright","state":"RI"}
-{"account_number":232,"balance":11984,"firstname":"Carr","lastname":"Jensen","age":34,"gender":"F","address":"995 Micieli Place","employer":"Biohab","email":"carrjensen@biohab.com","city":"Waikele","state":"OH"}
-{"account_number":237,"balance":5603,"firstname":"Kirby","lastname":"Watkins","age":27,"gender":"F","address":"348 Blake Court","employer":"Sonique","email":"kirbywatkins@sonique.com","city":"Freelandville","state":"PA"}
-{"account_number":244,"balance":8048,"firstname":"Judith","lastname":"Riggs","age":27,"gender":"F","address":"590 Kosciusko Street","employer":"Arctiq","email":"judithriggs@arctiq.com","city":"Gorham","state":"DC"}
-{"account_number":249,"balance":16822,"firstname":"Mckinney","lastname":"Gallagher","age":38,"gender":"F","address":"939 Seigel Court","employer":"Premiant","email":"mckinneygallagher@premiant.com","city":"Catharine","state":"NH"}
-{"account_number":251,"balance":13475,"firstname":"Marks","lastname":"Graves","age":39,"gender":"F","address":"427 Lawn Court","employer":"Dentrex","email":"marksgraves@dentrex.com","city":"Waukeenah","state":"IL"}
-{"account_number":256,"balance":48318,"firstname":"Simon","lastname":"Hogan","age":31,"gender":"M","address":"789 Suydam Place","employer":"Dancerity","email":"simonhogan@dancerity.com","city":"Dargan","state":"GA"}
-{"account_number":263,"balance":12837,"firstname":"Thornton","lastname":"Meyer","age":29,"gender":"M","address":"575 Elliott Place","employer":"Peticular","email":"thorntonmeyer@peticular.com","city":"Dotsero","state":"NH"}
-{"account_number":268,"balance":20925,"firstname":"Avis","lastname":"Blackwell","age":36,"gender":"M","address":"569 Jerome Avenue","employer":"Magnina","email":"avisblackwell@magnina.com","city":"Bethany","state":"MD"}
-{"account_number":270,"balance":43951,"firstname":"Moody","lastname":"Harmon","age":39,"gender":"F","address":"233 Vanderbilt Street","employer":"Otherside","email":"moodyharmon@otherside.com","city":"Elwood","state":"MT"}
-{"account_number":275,"balance":2384,"firstname":"Reynolds","lastname":"Barnett","age":31,"gender":"M","address":"394 Stockton Street","employer":"Austex","email":"reynoldsbarnett@austex.com","city":"Grandview","state":"MS"}
-{"account_number":282,"balance":38540,"firstname":"Gay","lastname":"Schultz","age":25,"gender":"F","address":"805 Claver Place","employer":"Handshake","email":"gayschultz@handshake.com","city":"Tampico","state":"MA"}
-{"account_number":287,"balance":10845,"firstname":"Valerie","lastname":"Lang","age":35,"gender":"F","address":"423 Midwood Street","employer":"Quarx","email":"valerielang@quarx.com","city":"Cannondale","state":"VT"}
-{"account_number":294,"balance":29582,"firstname":"Pitts","lastname":"Haynes","age":26,"gender":"M","address":"901 Broome Street","employer":"Aquazure","email":"pittshaynes@aquazure.com","city":"Turah","state":"SD"}
-{"account_number":299,"balance":40825,"firstname":"Angela","lastname":"Talley","age":36,"gender":"F","address":"822 Bills Place","employer":"Remold","email":"angelatalley@remold.com","city":"Bethpage","state":"DC"}
-{"account_number":302,"balance":11298,"firstname":"Isabella","lastname":"Hewitt","age":40,"gender":"M","address":"455 Bedford Avenue","employer":"Cincyr","email":"isabellahewitt@cincyr.com","city":"Blanford","state":"IN"}
-{"account_number":307,"balance":43355,"firstname":"Enid","lastname":"Ashley","age":23,"gender":"M","address":"412 Emerson Place","employer":"Avenetro","email":"enidashley@avenetro.com","city":"Catherine","state":"WI"}
-{"account_number":314,"balance":5848,"firstname":"Norton","lastname":"Norton","age":35,"gender":"M","address":"252 Ditmas Avenue","employer":"Talkola","email":"nortonnorton@talkola.com","city":"Veyo","state":"SC"}
-{"account_number":319,"balance":15430,"firstname":"Ferrell","lastname":"Mckinney","age":36,"gender":"M","address":"874 Cranberry Street","employer":"Portaline","email":"ferrellmckinney@portaline.com","city":"Rose","state":"WV"}
-{"account_number":321,"balance":43370,"firstname":"Marta","lastname":"Larsen","age":35,"gender":"M","address":"617 Williams Court","employer":"Manufact","email":"martalarsen@manufact.com","city":"Sisquoc","state":"MA"}
-{"account_number":326,"balance":9692,"firstname":"Pearl","lastname":"Reese","age":30,"gender":"F","address":"451 Colonial Court","employer":"Accruex","email":"pearlreese@accruex.com","city":"Westmoreland","state":"MD"}
-{"account_number":333,"balance":22778,"firstname":"Trudy","lastname":"Sweet","age":27,"gender":"F","address":"881 Kiely Place","employer":"Acumentor","email":"trudysweet@acumentor.com","city":"Kent","state":"IA"}
-{"account_number":338,"balance":6969,"firstname":"Pierce","lastname":"Lawrence","age":35,"gender":"M","address":"318 Gallatin Place","employer":"Lunchpad","email":"piercelawrence@lunchpad.com","city":"Iola","state":"MD"}
-{"account_number":340,"balance":42072,"firstname":"Juarez","lastname":"Gutierrez","age":40,"gender":"F","address":"802 Seba Avenue","employer":"Billmed","email":"juarezgutierrez@billmed.com","city":"Malott","state":"OH"}
-{"account_number":345,"balance":9812,"firstname":"Parker","lastname":"Hines","age":38,"gender":"M","address":"715 Mill Avenue","employer":"Baluba","email":"parkerhines@baluba.com","city":"Blackgum","state":"KY"}
-{"account_number":352,"balance":20290,"firstname":"Kendra","lastname":"Mcintosh","age":31,"gender":"F","address":"963 Wolf Place","employer":"Orboid","email":"kendramcintosh@orboid.com","city":"Bladensburg","state":"AK"}
-{"account_number":357,"balance":15102,"firstname":"Adele","lastname":"Carroll","age":39,"gender":"F","address":"381 Arion Place","employer":"Aquafire","email":"adelecarroll@aquafire.com","city":"Springville","state":"RI"}
-{"account_number":364,"balance":35247,"firstname":"Felicia","lastname":"Merrill","age":40,"gender":"F","address":"229 Branton Street","employer":"Prosely","email":"feliciamerrill@prosely.com","city":"Dola","state":"MA"}
-{"account_number":369,"balance":17047,"firstname":"Mcfadden","lastname":"Guy","age":28,"gender":"F","address":"445 Lott Avenue","employer":"Kangle","email":"mcfaddenguy@kangle.com","city":"Greenbackville","state":"DE"}
-{"account_number":371,"balance":19751,"firstname":"Barker","lastname":"Allen","age":32,"gender":"F","address":"295 Wallabout Street","employer":"Nexgene","email":"barkerallen@nexgene.com","city":"Nanafalia","state":"NE"}
-{"account_number":376,"balance":44407,"firstname":"Mcmillan","lastname":"Dunn","age":21,"gender":"F","address":"771 Dorchester Road","employer":"Eargo","email":"mcmillandunn@eargo.com","city":"Yogaville","state":"RI"}
-{"account_number":383,"balance":48889,"firstname":"Knox","lastname":"Larson","age":28,"gender":"F","address":"962 Bartlett Place","employer":"Bostonic","email":"knoxlarson@bostonic.com","city":"Smeltertown","state":"TX"}
-{"account_number":388,"balance":9606,"firstname":"Julianne","lastname":"Nicholson","age":26,"gender":"F","address":"338 Crescent Street","employer":"Viasia","email":"juliannenicholson@viasia.com","city":"Alleghenyville","state":"MO"}
-{"account_number":390,"balance":7464,"firstname":"Ramona","lastname":"Roy","age":32,"gender":"M","address":"135 Banner Avenue","employer":"Deminimum","email":"ramonaroy@deminimum.com","city":"Dodge","state":"ID"}
-{"account_number":395,"balance":18679,"firstname":"Juliet","lastname":"Whitaker","age":31,"gender":"M","address":"128 Remsen Avenue","employer":"Toyletry","email":"julietwhitaker@toyletry.com","city":"Yonah","state":"LA"}
-{"account_number":403,"balance":18833,"firstname":"Williamson","lastname":"Horn","age":32,"gender":"M","address":"223 Strickland Avenue","employer":"Nimon","email":"williamsonhorn@nimon.com","city":"Bawcomville","state":"NJ"}
-{"account_number":408,"balance":34666,"firstname":"Lidia","lastname":"Guerrero","age":30,"gender":"M","address":"254 Stratford Road","employer":"Snowpoke","email":"lidiaguerrero@snowpoke.com","city":"Fairlee","state":"LA"}
-{"account_number":410,"balance":31200,"firstname":"Fox","lastname":"Cardenas","age":39,"gender":"M","address":"987 Monitor Street","employer":"Corpulse","email":"foxcardenas@corpulse.com","city":"Southview","state":"NE"}
-{"account_number":415,"balance":19449,"firstname":"Martinez","lastname":"Benson","age":36,"gender":"M","address":"172 Berkeley Place","employer":"Enersol","email":"martinezbenson@enersol.com","city":"Chumuckla","state":"AL"}
-{"account_number":422,"balance":40162,"firstname":"Brigitte","lastname":"Scott","age":26,"gender":"M","address":"662 Vermont Court","employer":"Waretel","email":"brigittescott@waretel.com","city":"Elrama","state":"VA"}
-{"account_number":427,"balance":1463,"firstname":"Rebekah","lastname":"Garrison","age":36,"gender":"F","address":"837 Hampton Avenue","employer":"Niquent","email":"rebekahgarrison@niquent.com","city":"Zarephath","state":"NY"}
-{"account_number":434,"balance":11329,"firstname":"Christa","lastname":"Huff","age":25,"gender":"M","address":"454 Oriental Boulevard","employer":"Earthpure","email":"christahuff@earthpure.com","city":"Stevens","state":"DC"}
-{"account_number":439,"balance":22752,"firstname":"Lula","lastname":"Williams","age":35,"gender":"M","address":"630 Furman Avenue","employer":"Vinch","email":"lulawilliams@vinch.com","city":"Newcastle","state":"ME"}
-{"account_number":441,"balance":47947,"firstname":"Dickson","lastname":"Mcgee","age":29,"gender":"M","address":"478 Knight Court","employer":"Gogol","email":"dicksonmcgee@gogol.com","city":"Laurelton","state":"AR"}
-{"account_number":446,"balance":23071,"firstname":"Lolita","lastname":"Fleming","age":32,"gender":"F","address":"918 Bridge Street","employer":"Vidto","email":"lolitafleming@vidto.com","city":"Brownlee","state":"HI"}
-{"account_number":453,"balance":21520,"firstname":"Hood","lastname":"Powell","age":24,"gender":"F","address":"479 Brevoort Place","employer":"Vortexaco","email":"hoodpowell@vortexaco.com","city":"Alderpoint","state":"CT"}
-{"account_number":458,"balance":8865,"firstname":"Aida","lastname":"Wolf","age":21,"gender":"F","address":"403 Thames Street","employer":"Isis","email":"aidawolf@isis.com","city":"Bordelonville","state":"ME"}
-{"account_number":460,"balance":37734,"firstname":"Aguirre","lastname":"White","age":21,"gender":"F","address":"190 Crooke Avenue","employer":"Unq","email":"aguirrewhite@unq.com","city":"Albany","state":"NJ"}
-{"account_number":465,"balance":10681,"firstname":"Pearlie","lastname":"Holman","age":29,"gender":"M","address":"916 Evergreen Avenue","employer":"Hometown","email":"pearlieholman@hometown.com","city":"Needmore","state":"UT"}
-{"account_number":472,"balance":25571,"firstname":"Lee","lastname":"Long","age":32,"gender":"F","address":"288 Mill Street","employer":"Comverges","email":"leelong@comverges.com","city":"Movico","state":"MT"}
-{"account_number":477,"balance":25892,"firstname":"Holcomb","lastname":"Cobb","age":40,"gender":"M","address":"369 Marconi Place","employer":"Steeltab","email":"holcombcobb@steeltab.com","city":"Byrnedale","state":"CA"}
-{"account_number":484,"balance":3274,"firstname":"Staci","lastname":"Melendez","age":35,"gender":"F","address":"751 Otsego Street","employer":"Namebox","email":"stacimelendez@namebox.com","city":"Harborton","state":"NV"}
-{"account_number":489,"balance":7879,"firstname":"Garrett","lastname":"Langley","age":36,"gender":"M","address":"331 Bowne Street","employer":"Zillidium","email":"garrettlangley@zillidium.com","city":"Riviera","state":"LA"}
-{"account_number":491,"balance":42942,"firstname":"Teresa","lastname":"Owen","age":24,"gender":"F","address":"713 Canton Court","employer":"Plasmos","email":"teresaowen@plasmos.com","city":"Bartonsville","state":"NH"}
-{"account_number":496,"balance":14869,"firstname":"Alison","lastname":"Conrad","age":35,"gender":"F","address":"347 Varet Street","employer":"Perkle","email":"alisonconrad@perkle.com","city":"Cliffside","state":"OH"}
-{"account_number":504,"balance":49205,"firstname":"Shanna","lastname":"Chambers","age":23,"gender":"M","address":"220 Beard Street","employer":"Corporana","email":"shannachambers@corporana.com","city":"Cashtown","state":"AZ"}
-{"account_number":509,"balance":34754,"firstname":"Durham","lastname":"Pacheco","age":40,"gender":"M","address":"129 Plymouth Street","employer":"Datacator","email":"durhampacheco@datacator.com","city":"Loveland","state":"NC"}
-{"account_number":511,"balance":40908,"firstname":"Elba","lastname":"Grant","age":24,"gender":"F","address":"157 Bijou Avenue","employer":"Dognost","email":"elbagrant@dognost.com","city":"Coyote","state":"MT"}
-{"account_number":516,"balance":44940,"firstname":"Roy","lastname":"Smith","age":37,"gender":"M","address":"770 Cherry Street","employer":"Parleynet","email":"roysmith@parleynet.com","city":"Carrsville","state":"RI"}
-{"account_number":523,"balance":28729,"firstname":"Amalia","lastname":"Benjamin","age":40,"gender":"F","address":"173 Bushwick Place","employer":"Sentia","email":"amaliabenjamin@sentia.com","city":"Jacumba","state":"OK"}
-{"account_number":528,"balance":4071,"firstname":"Thompson","lastname":"Hoover","age":27,"gender":"F","address":"580 Garden Street","employer":"Portalis","email":"thompsonhoover@portalis.com","city":"Knowlton","state":"AL"}
-{"account_number":530,"balance":8840,"firstname":"Kathrine","lastname":"Evans","age":37,"gender":"M","address":"422 Division Place","employer":"Spherix","email":"kathrineevans@spherix.com","city":"Biddle","state":"CO"}
-{"account_number":535,"balance":8715,"firstname":"Fry","lastname":"George","age":34,"gender":"M","address":"722 Green Street","employer":"Ewaves","email":"frygeorge@ewaves.com","city":"Kenmar","state":"DE"}
-{"account_number":542,"balance":23285,"firstname":"Michelle","lastname":"Mayo","age":35,"gender":"M","address":"657 Caton Place","employer":"Biflex","email":"michellemayo@biflex.com","city":"Beaverdale","state":"WY"}
-{"account_number":547,"balance":12870,"firstname":"Eaton","lastname":"Rios","age":32,"gender":"M","address":"744 Withers Street","employer":"Podunk","email":"eatonrios@podunk.com","city":"Chelsea","state":"IA"}
-{"account_number":554,"balance":33163,"firstname":"Townsend","lastname":"Atkins","age":39,"gender":"M","address":"566 Ira Court","employer":"Acruex","email":"townsendatkins@acruex.com","city":"Valle","state":"IA"}
-{"account_number":559,"balance":11450,"firstname":"Tonia","lastname":"Schmidt","age":38,"gender":"F","address":"508 Sheffield Avenue","employer":"Extro","email":"toniaschmidt@extro.com","city":"Newry","state":"CT"}
-{"account_number":561,"balance":12370,"firstname":"Sellers","lastname":"Davis","age":30,"gender":"M","address":"860 Madoc Avenue","employer":"Isodrive","email":"sellersdavis@isodrive.com","city":"Trail","state":"KS"}
-{"account_number":566,"balance":6183,"firstname":"Cox","lastname":"Roman","age":37,"gender":"M","address":"349 Winthrop Street","employer":"Medcom","email":"coxroman@medcom.com","city":"Rosewood","state":"WY"}
-{"account_number":573,"balance":32171,"firstname":"Callie","lastname":"Castaneda","age":36,"gender":"M","address":"799 Scott Avenue","employer":"Earthwax","email":"calliecastaneda@earthwax.com","city":"Marshall","state":"NH"}
-{"account_number":578,"balance":34259,"firstname":"Holmes","lastname":"Mcknight","age":37,"gender":"M","address":"969 Metropolitan Avenue","employer":"Cubicide","email":"holmesmcknight@cubicide.com","city":"Aguila","state":"PA"}
-{"account_number":580,"balance":13716,"firstname":"Mcmahon","lastname":"York","age":34,"gender":"M","address":"475 Beacon Court","employer":"Zillar","email":"mcmahonyork@zillar.com","city":"Farmington","state":"MO"}
-{"account_number":585,"balance":26745,"firstname":"Nieves","lastname":"Nolan","age":32,"gender":"M","address":"115 Seagate Terrace","employer":"Jumpstack","email":"nievesnolan@jumpstack.com","city":"Eastmont","state":"UT"}
-{"account_number":592,"balance":32968,"firstname":"Head","lastname":"Webster","age":36,"gender":"F","address":"987 Lefferts Avenue","employer":"Empirica","email":"headwebster@empirica.com","city":"Rockingham","state":"TN"}
-{"account_number":597,"balance":11246,"firstname":"Penny","lastname":"Knowles","age":33,"gender":"M","address":"139 Forbell Street","employer":"Ersum","email":"pennyknowles@ersum.com","city":"Vallonia","state":"IA"}
-{"account_number":600,"balance":10336,"firstname":"Simmons","lastname":"Byers","age":37,"gender":"M","address":"250 Dictum Court","employer":"Qualitex","email":"simmonsbyers@qualitex.com","city":"Wanship","state":"OH"}
-{"account_number":605,"balance":38427,"firstname":"Mcclain","lastname":"Manning","age":24,"gender":"M","address":"832 Leonard Street","employer":"Qiao","email":"mcclainmanning@qiao.com","city":"Calvary","state":"TX"}
-{"account_number":612,"balance":11868,"firstname":"Dunn","lastname":"Cameron","age":32,"gender":"F","address":"156 Lorimer Street","employer":"Isonus","email":"dunncameron@isonus.com","city":"Virgie","state":"ND"}
-{"account_number":617,"balance":35445,"firstname":"Kitty","lastname":"Cooley","age":22,"gender":"M","address":"788 Seagate Avenue","employer":"Ultrimax","email":"kittycooley@ultrimax.com","city":"Clarktown","state":"MD"}
-{"account_number":624,"balance":27538,"firstname":"Roxanne","lastname":"Franklin","age":39,"gender":"F","address":"299 Woodrow Court","employer":"Silodyne","email":"roxannefranklin@silodyne.com","city":"Roulette","state":"VA"}
-{"account_number":629,"balance":32987,"firstname":"Mcclure","lastname":"Rodgers","age":26,"gender":"M","address":"806 Pierrepont Place","employer":"Elita","email":"mcclurerodgers@elita.com","city":"Brownsville","state":"MI"}
-{"account_number":631,"balance":21657,"firstname":"Corrine","lastname":"Barber","age":32,"gender":"F","address":"447 Hunts Lane","employer":"Quarmony","email":"corrinebarber@quarmony.com","city":"Wyano","state":"IL"}
-{"account_number":636,"balance":8036,"firstname":"Agnes","lastname":"Hooper","age":25,"gender":"M","address":"865 Hanson Place","employer":"Digial","email":"agneshooper@digial.com","city":"Sperryville","state":"OK"}
-{"account_number":643,"balance":8057,"firstname":"Hendricks","lastname":"Stokes","age":23,"gender":"F","address":"142 Barbey Street","employer":"Remotion","email":"hendricksstokes@remotion.com","city":"Lewis","state":"MA"}
-{"account_number":648,"balance":11506,"firstname":"Terry","lastname":"Montgomery","age":21,"gender":"F","address":"115 Franklin Avenue","employer":"Enervate","email":"terrymontgomery@enervate.com","city":"Bascom","state":"MA"}
-{"account_number":650,"balance":18091,"firstname":"Benton","lastname":"Knight","age":28,"gender":"F","address":"850 Aitken Place","employer":"Pholio","email":"bentonknight@pholio.com","city":"Cobbtown","state":"AL"}
-{"account_number":655,"balance":22912,"firstname":"Eula","lastname":"Taylor","age":30,"gender":"M","address":"520 Orient Avenue","employer":"Miracula","email":"eulataylor@miracula.com","city":"Wacissa","state":"IN"}
-{"account_number":662,"balance":10138,"firstname":"Daisy","lastname":"Burnett","age":33,"gender":"M","address":"114 Norman Avenue","employer":"Liquicom","email":"daisyburnett@liquicom.com","city":"Grahamtown","state":"MD"}
-{"account_number":667,"balance":22559,"firstname":"Juliana","lastname":"Chase","age":32,"gender":"M","address":"496 Coleridge Street","employer":"Comtract","email":"julianachase@comtract.com","city":"Wilsonia","state":"NJ"}
-{"account_number":674,"balance":36038,"firstname":"Watts","lastname":"Shannon","age":22,"gender":"F","address":"600 Story Street","employer":"Joviold","email":"wattsshannon@joviold.com","city":"Fairhaven","state":"ID"}
-{"account_number":679,"balance":20149,"firstname":"Henrietta","lastname":"Bonner","age":33,"gender":"M","address":"461 Bond Street","employer":"Geekol","email":"henriettabonner@geekol.com","city":"Richville","state":"WA"}
-{"account_number":681,"balance":34244,"firstname":"Velazquez","lastname":"Wolfe","age":33,"gender":"M","address":"773 Eckford Street","employer":"Zisis","email":"velazquezwolfe@zisis.com","city":"Smock","state":"ME"}
-{"account_number":686,"balance":10116,"firstname":"Decker","lastname":"Mcclure","age":30,"gender":"F","address":"236 Commerce Street","employer":"Everest","email":"deckermcclure@everest.com","city":"Gibbsville","state":"TN"}
-{"account_number":693,"balance":31233,"firstname":"Tabatha","lastname":"Zimmerman","age":30,"gender":"F","address":"284 Emmons Avenue","employer":"Pushcart","email":"tabathazimmerman@pushcart.com","city":"Esmont","state":"NC"}
-{"account_number":698,"balance":14965,"firstname":"Baker","lastname":"Armstrong","age":36,"gender":"F","address":"796 Tehama Street","employer":"Nurplex","email":"bakerarmstrong@nurplex.com","city":"Starks","state":"UT"}
-{"account_number":701,"balance":23772,"firstname":"Gardner","lastname":"Griffith","age":27,"gender":"M","address":"187 Moore Place","employer":"Vertide","email":"gardnergriffith@vertide.com","city":"Coventry","state":"NV"}
-{"account_number":706,"balance":5282,"firstname":"Eliza","lastname":"Potter","age":39,"gender":"M","address":"945 Dunham Place","employer":"Playce","email":"elizapotter@playce.com","city":"Woodruff","state":"AK"}
-{"account_number":713,"balance":20054,"firstname":"Iris","lastname":"Mcguire","age":21,"gender":"F","address":"508 Benson Avenue","employer":"Duflex","email":"irismcguire@duflex.com","city":"Hillsboro","state":"MO"}
-{"account_number":718,"balance":13876,"firstname":"Hickman","lastname":"Dillard","age":22,"gender":"F","address":"132 Etna Street","employer":"Genmy","email":"hickmandillard@genmy.com","city":"Curtice","state":"NV"}
-{"account_number":720,"balance":31356,"firstname":"Ruth","lastname":"Vance","age":32,"gender":"F","address":"229 Adams Street","employer":"Zilidium","email":"ruthvance@zilidium.com","city":"Allison","state":"IA"}
-{"account_number":725,"balance":14677,"firstname":"Reeves","lastname":"Tillman","age":26,"gender":"M","address":"674 Ivan Court","employer":"Cemention","email":"reevestillman@cemention.com","city":"Navarre","state":"MA"}
-{"account_number":732,"balance":38445,"firstname":"Delia","lastname":"Cruz","age":37,"gender":"F","address":"870 Cheever Place","employer":"Multron","email":"deliacruz@multron.com","city":"Cresaptown","state":"NH"}
-{"account_number":737,"balance":40431,"firstname":"Sampson","lastname":"Yates","age":23,"gender":"F","address":"214 Cox Place","employer":"Signidyne","email":"sampsonyates@signidyne.com","city":"Brazos","state":"GA"}
-{"account_number":744,"balance":8690,"firstname":"Bernard","lastname":"Martinez","age":21,"gender":"M","address":"148 Dunne Place","employer":"Dragbot","email":"bernardmartinez@dragbot.com","city":"Moraida","state":"MN"}
-{"account_number":749,"balance":1249,"firstname":"Rush","lastname":"Boyle","age":36,"gender":"M","address":"310 Argyle Road","employer":"Sportan","email":"rushboyle@sportan.com","city":"Brady","state":"WA"}
-{"account_number":751,"balance":49252,"firstname":"Patrick","lastname":"Osborne","age":23,"gender":"M","address":"915 Prospect Avenue","employer":"Gynko","email":"patrickosborne@gynko.com","city":"Takilma","state":"MO"}
-{"account_number":756,"balance":40006,"firstname":"Jasmine","lastname":"Howell","age":32,"gender":"M","address":"605 Elliott Walk","employer":"Ecratic","email":"jasminehowell@ecratic.com","city":"Harrodsburg","state":"OH"}
-{"account_number":763,"balance":12091,"firstname":"Liz","lastname":"Bentley","age":22,"gender":"F","address":"933 Debevoise Avenue","employer":"Nipaz","email":"lizbentley@nipaz.com","city":"Glenville","state":"NJ"}
-{"account_number":768,"balance":2213,"firstname":"Sondra","lastname":"Soto","age":21,"gender":"M","address":"625 Colonial Road","employer":"Navir","email":"sondrasoto@navir.com","city":"Benson","state":"VA"}
-{"account_number":770,"balance":39505,"firstname":"Joann","lastname":"Crane","age":26,"gender":"M","address":"798 Farragut Place","employer":"Lingoage","email":"joanncrane@lingoage.com","city":"Kirk","state":"MA"}
-{"account_number":775,"balance":27943,"firstname":"Wilson","lastname":"Merritt","age":33,"gender":"F","address":"288 Thornton Street","employer":"Geeky","email":"wilsonmerritt@geeky.com","city":"Holtville","state":"HI"}
-{"account_number":782,"balance":3960,"firstname":"Maldonado","lastname":"Craig","age":36,"gender":"F","address":"345 Myrtle Avenue","employer":"Zilencio","email":"maldonadocraig@zilencio.com","city":"Yukon","state":"ID"}
-{"account_number":787,"balance":11876,"firstname":"Harper","lastname":"Wynn","age":21,"gender":"F","address":"139 Oceanic Avenue","employer":"Interfind","email":"harperwynn@interfind.com","city":"Gerber","state":"ND"}
-{"account_number":794,"balance":16491,"firstname":"Walker","lastname":"Charles","age":32,"gender":"M","address":"215 Kenilworth Place","employer":"Orbin","email":"walkercharles@orbin.com","city":"Rivers","state":"WI"}
-{"account_number":799,"balance":2889,"firstname":"Myra","lastname":"Guerra","age":28,"gender":"F","address":"625 Dahlgreen Place","employer":"Digigene","email":"myraguerra@digigene.com","city":"Draper","state":"CA"}
-{"account_number":802,"balance":19630,"firstname":"Gracie","lastname":"Foreman","age":40,"gender":"F","address":"219 Kent Avenue","employer":"Supportal","email":"gracieforeman@supportal.com","city":"Westboro","state":"NH"}
-{"account_number":807,"balance":29206,"firstname":"Hatfield","lastname":"Lowe","age":23,"gender":"M","address":"499 Adler Place","employer":"Lovepad","email":"hatfieldlowe@lovepad.com","city":"Wiscon","state":"DC"}
-{"account_number":814,"balance":9838,"firstname":"Morse","lastname":"Mcbride","age":26,"gender":"F","address":"776 Calyer Street","employer":"Inear","email":"morsemcbride@inear.com","city":"Kingstowne","state":"ND"}
-{"account_number":819,"balance":3971,"firstname":"Karyn","lastname":"Medina","age":24,"gender":"F","address":"417 Utica Avenue","employer":"Qnekt","email":"karynmedina@qnekt.com","city":"Kerby","state":"WY"}
-{"account_number":821,"balance":33271,"firstname":"Trisha","lastname":"Blankenship","age":22,"gender":"M","address":"329 Jamaica Avenue","employer":"Chorizon","email":"trishablankenship@chorizon.com","city":"Sexton","state":"VT"}
-{"account_number":826,"balance":11548,"firstname":"Summers","lastname":"Vinson","age":22,"gender":"F","address":"742 Irwin Street","employer":"Globoil","email":"summersvinson@globoil.com","city":"Callaghan","state":"WY"}
-{"account_number":833,"balance":46154,"firstname":"Woodward","lastname":"Hood","age":22,"gender":"M","address":"398 Atkins Avenue","employer":"Zedalis","email":"woodwardhood@zedalis.com","city":"Stonybrook","state":"NE"}
-{"account_number":838,"balance":24629,"firstname":"Latonya","lastname":"Blake","age":37,"gender":"F","address":"531 Milton Street","employer":"Rugstars","email":"latonyablake@rugstars.com","city":"Tedrow","state":"WA"}
-{"account_number":840,"balance":39615,"firstname":"Boone","lastname":"Gomez","age":38,"gender":"M","address":"256 Hampton Place","employer":"Geekular","email":"boonegomez@geekular.com","city":"Westerville","state":"HI"}
-{"account_number":845,"balance":35422,"firstname":"Tracy","lastname":"Vaughn","age":39,"gender":"M","address":"645 Rockaway Parkway","employer":"Andryx","email":"tracyvaughn@andryx.com","city":"Wilmington","state":"ME"}
-{"account_number":852,"balance":6041,"firstname":"Allen","lastname":"Hammond","age":26,"gender":"M","address":"793 Essex Street","employer":"Tersanki","email":"allenhammond@tersanki.com","city":"Osmond","state":"NC"}
-{"account_number":857,"balance":39678,"firstname":"Alyce","lastname":"Douglas","age":23,"gender":"M","address":"326 Robert Street","employer":"Earbang","email":"alycedouglas@earbang.com","city":"Thornport","state":"GA"}
-{"account_number":864,"balance":21804,"firstname":"Duffy","lastname":"Anthony","age":23,"gender":"M","address":"582 Cooke Court","employer":"Schoolio","email":"duffyanthony@schoolio.com","city":"Brenton","state":"CO"}
-{"account_number":869,"balance":43544,"firstname":"Corinne","lastname":"Robbins","age":25,"gender":"F","address":"732 Quentin Road","employer":"Orbaxter","email":"corinnerobbins@orbaxter.com","city":"Roy","state":"TN"}
-{"account_number":871,"balance":35854,"firstname":"Norma","lastname":"Burt","age":32,"gender":"M","address":"934 Cyrus Avenue","employer":"Magnafone","email":"normaburt@magnafone.com","city":"Eden","state":"TN"}
-{"account_number":876,"balance":48568,"firstname":"Brady","lastname":"Glover","age":21,"gender":"F","address":"565 Oceanview Avenue","employer":"Comvex","email":"bradyglover@comvex.com","city":"Noblestown","state":"ID"}
-{"account_number":883,"balance":33679,"firstname":"Austin","lastname":"Jefferson","age":34,"gender":"M","address":"846 Lincoln Avenue","employer":"Polarax","email":"austinjefferson@polarax.com","city":"Savannah","state":"CT"}
-{"account_number":888,"balance":22277,"firstname":"Myrna","lastname":"Herman","age":39,"gender":"F","address":"649 Harwood Place","employer":"Enthaze","email":"myrnaherman@enthaze.com","city":"Idamay","state":"AR"}
-{"account_number":890,"balance":31198,"firstname":"Alvarado","lastname":"Pate","age":25,"gender":"M","address":"269 Ashland Place","employer":"Ovolo","email":"alvaradopate@ovolo.com","city":"Volta","state":"MI"}
-{"account_number":895,"balance":7327,"firstname":"Lara","lastname":"Mcdaniel","age":36,"gender":"M","address":"854 Willow Place","employer":"Acusage","email":"laramcdaniel@acusage.com","city":"Imperial","state":"NC"}
-{"account_number":903,"balance":10238,"firstname":"Wade","lastname":"Page","age":35,"gender":"F","address":"685 Waldorf Court","employer":"Eplosion","email":"wadepage@eplosion.com","city":"Welda","state":"AL"}
-{"account_number":908,"balance":45975,"firstname":"Mosley","lastname":"Holloway","age":31,"gender":"M","address":"929 Eldert Lane","employer":"Anivet","email":"mosleyholloway@anivet.com","city":"Biehle","state":"MS"}
-{"account_number":910,"balance":36831,"firstname":"Esmeralda","lastname":"James","age":23,"gender":"F","address":"535 High Street","employer":"Terrasys","email":"esmeraldajames@terrasys.com","city":"Dubois","state":"IN"}
-{"account_number":915,"balance":19816,"firstname":"Farrell","lastname":"French","age":35,"gender":"F","address":"126 McKibbin Street","employer":"Techmania","email":"farrellfrench@techmania.com","city":"Wescosville","state":"AL"}
-{"account_number":922,"balance":39347,"firstname":"Irwin","lastname":"Pugh","age":32,"gender":"M","address":"463 Shale Street","employer":"Idego","email":"irwinpugh@idego.com","city":"Ivanhoe","state":"ID"}
-{"account_number":927,"balance":19976,"firstname":"Jeanette","lastname":"Acevedo","age":26,"gender":"M","address":"694 Polhemus Place","employer":"Halap","email":"jeanetteacevedo@halap.com","city":"Harrison","state":"MO"}
-{"account_number":934,"balance":43987,"firstname":"Freida","lastname":"Daniels","age":34,"gender":"M","address":"448 Cove Lane","employer":"Vurbo","email":"freidadaniels@vurbo.com","city":"Snelling","state":"NJ"}
-{"account_number":939,"balance":31228,"firstname":"Hodges","lastname":"Massey","age":37,"gender":"F","address":"431 Dahl Court","employer":"Kegular","email":"hodgesmassey@kegular.com","city":"Katonah","state":"MD"}
-{"account_number":941,"balance":38796,"firstname":"Kim","lastname":"Moss","age":28,"gender":"F","address":"105 Onderdonk Avenue","employer":"Digirang","email":"kimmoss@digirang.com","city":"Centerville","state":"TX"}
-{"account_number":946,"balance":42794,"firstname":"Ina","lastname":"Obrien","age":36,"gender":"M","address":"339 Rewe Street","employer":"Eclipsent","email":"inaobrien@eclipsent.com","city":"Soham","state":"RI"}
-{"account_number":953,"balance":1110,"firstname":"Baxter","lastname":"Black","age":27,"gender":"M","address":"720 Stillwell Avenue","employer":"Uplinx","email":"baxterblack@uplinx.com","city":"Drummond","state":"MN"}
-{"account_number":958,"balance":32849,"firstname":"Brown","lastname":"Wilkins","age":40,"gender":"M","address":"686 Delmonico Place","employer":"Medesign","email":"brownwilkins@medesign.com","city":"Shelby","state":"WY"}
-{"account_number":960,"balance":2905,"firstname":"Curry","lastname":"Vargas","age":40,"gender":"M","address":"242 Blake Avenue","employer":"Pearlesex","email":"curryvargas@pearlesex.com","city":"Henrietta","state":"NH"}
-{"account_number":965,"balance":21882,"firstname":"Patrica","lastname":"Melton","age":28,"gender":"M","address":"141 Rodney Street","employer":"Flexigen","email":"patricamelton@flexigen.com","city":"Klagetoh","state":"MD"}
-{"account_number":972,"balance":24719,"firstname":"Leona","lastname":"Christian","age":26,"gender":"F","address":"900 Woodpoint Road","employer":"Extrawear","email":"leonachristian@extrawear.com","city":"Roderfield","state":"MA"}
-{"account_number":977,"balance":6744,"firstname":"Rodgers","lastname":"Mccray","age":21,"gender":"F","address":"612 Duryea Place","employer":"Papricut","email":"rodgersmccray@papricut.com","city":"Marenisco","state":"MD"}
-{"account_number":984,"balance":1904,"firstname":"Viola","lastname":"Crawford","age":35,"gender":"F","address":"354 Linwood Street","employer":"Ginkle","email":"violacrawford@ginkle.com","city":"Witmer","state":"AR"}
-{"account_number":989,"balance":48622,"firstname":"Franklin","lastname":"Frank","age":38,"gender":"M","address":"270 Carlton Avenue","employer":"Shopabout","email":"franklinfrank@shopabout.com","city":"Guthrie","state":"NC"}
-{"account_number":991,"balance":4239,"firstname":"Connie","lastname":"Berry","age":28,"gender":"F","address":"647 Gardner Avenue","employer":"Flumbo","email":"connieberry@flumbo.com","city":"Frierson","state":"MO"}
-{"account_number":996,"balance":17541,"firstname":"Andrews","lastname":"Herrera","age":30,"gender":"F","address":"570 Vandam Street","employer":"Klugger","email":"andrewsherrera@klugger.com","city":"Whitehaven","state":"MN"}
-{"account_number":0,"balance":16623,"firstname":"Bradshaw","lastname":"Mckenzie","age":29,"gender":"F","address":"244 Columbus Place","employer":"Euron","email":"bradshawmckenzie@euron.com","city":"Hobucken","state":"CO"}
-{"account_number":5,"balance":29342,"firstname":"Leola","lastname":"Stewart","age":30,"gender":"F","address":"311 Elm Place","employer":"Diginetic","email":"leolastewart@diginetic.com","city":"Fairview","state":"NJ"}
-{"account_number":12,"balance":37055,"firstname":"Stafford","lastname":"Brock","age":20,"gender":"F","address":"296 Wythe Avenue","employer":"Uncorp","email":"staffordbrock@uncorp.com","city":"Bend","state":"AL"}
-{"account_number":17,"balance":7831,"firstname":"Bessie","lastname":"Orr","age":31,"gender":"F","address":"239 Hinsdale Street","employer":"Skyplex","email":"bessieorr@skyplex.com","city":"Graball","state":"FL"}
-{"account_number":24,"balance":44182,"firstname":"Wood","lastname":"Dale","age":39,"gender":"M","address":"582 Gelston Avenue","employer":"Besto","email":"wooddale@besto.com","city":"Juntura","state":"MI"}
-{"account_number":29,"balance":27323,"firstname":"Leah","lastname":"Santiago","age":33,"gender":"M","address":"193 Schenck Avenue","employer":"Isologix","email":"leahsantiago@isologix.com","city":"Gerton","state":"ND"}
-{"account_number":31,"balance":30443,"firstname":"Kristen","lastname":"Santana","age":22,"gender":"F","address":"130 Middagh Street","employer":"Dogspa","email":"kristensantana@dogspa.com","city":"Vale","state":"MA"}
-{"account_number":36,"balance":15902,"firstname":"Alexandra","lastname":"Nguyen","age":39,"gender":"F","address":"389 Elizabeth Place","employer":"Bittor","email":"alexandranguyen@bittor.com","city":"Hemlock","state":"KY"}
-{"account_number":43,"balance":33474,"firstname":"Ryan","lastname":"Howe","age":25,"gender":"M","address":"660 Huntington Street","employer":"Microluxe","email":"ryanhowe@microluxe.com","city":"Clara","state":"CT"}
-{"account_number":48,"balance":40608,"firstname":"Peck","lastname":"Downs","age":39,"gender":"F","address":"594 Dwight Street","employer":"Ramjob","email":"peckdowns@ramjob.com","city":"Coloma","state":"WA"}
-{"account_number":50,"balance":43695,"firstname":"Sheena","lastname":"Kirkland","age":33,"gender":"M","address":"598 Bank Street","employer":"Zerbina","email":"sheenakirkland@zerbina.com","city":"Walland","state":"IN"}
-{"account_number":55,"balance":22020,"firstname":"Shelia","lastname":"Puckett","age":33,"gender":"M","address":"265 Royce Place","employer":"Izzby","email":"sheliapuckett@izzby.com","city":"Slovan","state":"HI"}
-{"account_number":62,"balance":43065,"firstname":"Lester","lastname":"Stanton","age":37,"gender":"M","address":"969 Doughty Street","employer":"Geekko","email":"lesterstanton@geekko.com","city":"Itmann","state":"DC"}
-{"account_number":67,"balance":39430,"firstname":"Isabelle","lastname":"Spence","age":39,"gender":"M","address":"718 Troy Avenue","employer":"Geeketron","email":"isabellespence@geeketron.com","city":"Camptown","state":"WA"}
-{"account_number":74,"balance":47167,"firstname":"Lauri","lastname":"Saunders","age":38,"gender":"F","address":"768 Lynch Street","employer":"Securia","email":"laurisaunders@securia.com","city":"Caroline","state":"TN"}
-{"account_number":79,"balance":28185,"firstname":"Booker","lastname":"Lowery","age":29,"gender":"M","address":"817 Campus Road","employer":"Sensate","email":"bookerlowery@sensate.com","city":"Carlos","state":"MT"}
-{"account_number":81,"balance":46568,"firstname":"Dennis","lastname":"Gilbert","age":40,"gender":"M","address":"619 Minna Street","employer":"Melbacor","email":"dennisgilbert@melbacor.com","city":"Kersey","state":"ND"}
-{"account_number":86,"balance":15428,"firstname":"Walton","lastname":"Butler","age":36,"gender":"M","address":"999 Schenck Street","employer":"Unisure","email":"waltonbutler@unisure.com","city":"Bentonville","state":"IL"}
-{"account_number":93,"balance":17728,"firstname":"Jeri","lastname":"Booth","age":31,"gender":"M","address":"322 Roosevelt Court","employer":"Geekology","email":"jeribooth@geekology.com","city":"Leming","state":"ND"}
-{"account_number":98,"balance":15085,"firstname":"Cora","lastname":"Barrett","age":24,"gender":"F","address":"555 Neptune Court","employer":"Kiosk","email":"corabarrett@kiosk.com","city":"Independence","state":"MN"}
-{"account_number":101,"balance":43400,"firstname":"Cecelia","lastname":"Grimes","age":31,"gender":"M","address":"972 Lincoln Place","employer":"Ecosys","email":"ceceliagrimes@ecosys.com","city":"Manchester","state":"AR"}
-{"account_number":106,"balance":8212,"firstname":"Josefina","lastname":"Wagner","age":36,"gender":"M","address":"418 Estate Road","employer":"Kyaguru","email":"josefinawagner@kyaguru.com","city":"Darbydale","state":"FL"}
-{"account_number":113,"balance":41652,"firstname":"Burt","lastname":"Moses","age":27,"gender":"M","address":"633 Berry Street","employer":"Uni","email":"burtmoses@uni.com","city":"Russellville","state":"CT"}
-{"account_number":118,"balance":2223,"firstname":"Ballard","lastname":"Vasquez","age":33,"gender":"F","address":"101 Bush Street","employer":"Intergeek","email":"ballardvasquez@intergeek.com","city":"Century","state":"MN"}
-{"account_number":120,"balance":38565,"firstname":"Browning","lastname":"Rodriquez","age":33,"gender":"M","address":"910 Moore Street","employer":"Opportech","email":"browningrodriquez@opportech.com","city":"Cutter","state":"ND"}
-{"account_number":125,"balance":5396,"firstname":"Tanisha","lastname":"Dixon","age":30,"gender":"M","address":"482 Hancock Street","employer":"Junipoor","email":"tanishadixon@junipoor.com","city":"Wauhillau","state":"IA"}
-{"account_number":132,"balance":37707,"firstname":"Horton","lastname":"Romero","age":35,"gender":"M","address":"427 Rutherford Place","employer":"Affluex","email":"hortonromero@affluex.com","city":"Hall","state":"AK"}
-{"account_number":137,"balance":3596,"firstname":"Frost","lastname":"Freeman","age":29,"gender":"F","address":"191 Dennett Place","employer":"Beadzza","email":"frostfreeman@beadzza.com","city":"Sabillasville","state":"HI"}
-{"account_number":144,"balance":43257,"firstname":"Evans","lastname":"Dyer","age":30,"gender":"F","address":"912 Post Court","employer":"Magmina","email":"evansdyer@magmina.com","city":"Gordon","state":"HI"}
-{"account_number":149,"balance":22994,"firstname":"Megan","lastname":"Gonzales","age":21,"gender":"M","address":"836 Tampa Court","employer":"Andershun","email":"megangonzales@andershun.com","city":"Rockhill","state":"AL"}
-{"account_number":151,"balance":34473,"firstname":"Kent","lastname":"Joyner","age":20,"gender":"F","address":"799 Truxton Street","employer":"Kozgene","email":"kentjoyner@kozgene.com","city":"Allamuchy","state":"DC"}
-{"account_number":156,"balance":40185,"firstname":"Sloan","lastname":"Pennington","age":24,"gender":"F","address":"573 Opal Court","employer":"Hopeli","email":"sloanpennington@hopeli.com","city":"Evergreen","state":"CT"}
-{"account_number":163,"balance":43075,"firstname":"Wilda","lastname":"Norman","age":33,"gender":"F","address":"173 Beadel Street","employer":"Kog","email":"wildanorman@kog.com","city":"Bodega","state":"ME"}
-{"account_number":168,"balance":49568,"firstname":"Carissa","lastname":"Simon","age":20,"gender":"M","address":"975 Flatbush Avenue","employer":"Zillacom","email":"carissasimon@zillacom.com","city":"Neibert","state":"IL"}
-{"account_number":170,"balance":6025,"firstname":"Mann","lastname":"Madden","age":36,"gender":"F","address":"161 Radde Place","employer":"Farmex","email":"mannmadden@farmex.com","city":"Thermal","state":"LA"}
-{"account_number":175,"balance":16213,"firstname":"Montoya","lastname":"Donaldson","age":28,"gender":"F","address":"481 Morton Street","employer":"Envire","email":"montoyadonaldson@envire.com","city":"Delco","state":"MA"}
-{"account_number":182,"balance":7803,"firstname":"Manuela","lastname":"Dillon","age":21,"gender":"M","address":"742 Garnet Street","employer":"Moreganic","email":"manueladillon@moreganic.com","city":"Ilchester","state":"TX"}
-{"account_number":187,"balance":26581,"firstname":"Autumn","lastname":"Hodges","age":35,"gender":"M","address":"757 Granite Street","employer":"Ezentia","email":"autumnhodges@ezentia.com","city":"Martinsville","state":"KY"}
-{"account_number":194,"balance":16311,"firstname":"Beck","lastname":"Rosario","age":39,"gender":"M","address":"721 Cambridge Place","employer":"Zoid","email":"beckrosario@zoid.com","city":"Efland","state":"ID"}
-{"account_number":199,"balance":18086,"firstname":"Branch","lastname":"Love","age":26,"gender":"M","address":"458 Commercial Street","employer":"Frolix","email":"branchlove@frolix.com","city":"Caspar","state":"NC"}
-{"account_number":202,"balance":26466,"firstname":"Medina","lastname":"Brown","age":31,"gender":"F","address":"519 Sunnyside Court","employer":"Bleendot","email":"medinabrown@bleendot.com","city":"Winfred","state":"MI"}
-{"account_number":207,"balance":45535,"firstname":"Evelyn","lastname":"Lara","age":35,"gender":"F","address":"636 Chestnut Street","employer":"Ultrasure","email":"evelynlara@ultrasure.com","city":"Logan","state":"MI"}
-{"account_number":214,"balance":24418,"firstname":"Luann","lastname":"Faulkner","age":37,"gender":"F","address":"697 Hazel Court","employer":"Zolar","email":"luannfaulkner@zolar.com","city":"Ticonderoga","state":"TX"}
-{"account_number":219,"balance":17127,"firstname":"Edwards","lastname":"Hurley","age":25,"gender":"M","address":"834 Stockholm Street","employer":"Austech","email":"edwardshurley@austech.com","city":"Bayview","state":"NV"}
-{"account_number":221,"balance":15803,"firstname":"Benjamin","lastname":"Barrera","age":34,"gender":"M","address":"568 Main Street","employer":"Zaphire","email":"benjaminbarrera@zaphire.com","city":"Germanton","state":"WY"}
-{"account_number":226,"balance":37720,"firstname":"Wilkins","lastname":"Brady","age":40,"gender":"F","address":"486 Baltic Street","employer":"Dogtown","email":"wilkinsbrady@dogtown.com","city":"Condon","state":"MT"}
-{"account_number":233,"balance":23020,"firstname":"Washington","lastname":"Walsh","age":27,"gender":"M","address":"366 Church Avenue","employer":"Candecor","email":"washingtonwalsh@candecor.com","city":"Westphalia","state":"MA"}
-{"account_number":238,"balance":21287,"firstname":"Constance","lastname":"Wong","age":28,"gender":"M","address":"496 Brown Street","employer":"Grainspot","email":"constancewong@grainspot.com","city":"Cecilia","state":"IN"}
-{"account_number":240,"balance":49741,"firstname":"Oconnor","lastname":"Clay","age":35,"gender":"F","address":"659 Highland Boulevard","employer":"Franscene","email":"oconnorclay@franscene.com","city":"Kilbourne","state":"NH"}
-{"account_number":245,"balance":22026,"firstname":"Fran","lastname":"Bolton","age":28,"gender":"F","address":"147 Jerome Street","employer":"Solaren","email":"franbolton@solaren.com","city":"Nash","state":"RI"}
-{"account_number":252,"balance":18831,"firstname":"Elvia","lastname":"Poole","age":22,"gender":"F","address":"836 Delevan Street","employer":"Velity","email":"elviapoole@velity.com","city":"Groveville","state":"MI"}
-{"account_number":257,"balance":5318,"firstname":"Olive","lastname":"Oneil","age":35,"gender":"F","address":"457 Decatur Street","employer":"Helixo","email":"oliveoneil@helixo.com","city":"Chicopee","state":"MI"}
-{"account_number":264,"balance":22084,"firstname":"Samantha","lastname":"Ferrell","age":35,"gender":"F","address":"488 Fulton Street","employer":"Flum","email":"samanthaferrell@flum.com","city":"Brandywine","state":"MT"}
-{"account_number":269,"balance":43317,"firstname":"Crosby","lastname":"Figueroa","age":34,"gender":"M","address":"910 Aurelia Court","employer":"Pyramia","email":"crosbyfigueroa@pyramia.com","city":"Leyner","state":"OH"}
-{"account_number":271,"balance":11864,"firstname":"Holt","lastname":"Walter","age":30,"gender":"F","address":"645 Poplar Avenue","employer":"Grupoli","email":"holtwalter@grupoli.com","city":"Mansfield","state":"OR"}
-{"account_number":276,"balance":11606,"firstname":"Pittman","lastname":"Mathis","age":23,"gender":"F","address":"567 Charles Place","employer":"Zuvy","email":"pittmanmathis@zuvy.com","city":"Roeville","state":"KY"}
-{"account_number":283,"balance":24070,"firstname":"Fuentes","lastname":"Foley","age":30,"gender":"M","address":"729 Walker Court","employer":"Knowlysis","email":"fuentesfoley@knowlysis.com","city":"Tryon","state":"TN"}
-{"account_number":288,"balance":27243,"firstname":"Wong","lastname":"Stone","age":39,"gender":"F","address":"440 Willoughby Street","employer":"Zentix","email":"wongstone@zentix.com","city":"Wheatfields","state":"DC"}
-{"account_number":290,"balance":26103,"firstname":"Neva","lastname":"Burgess","age":37,"gender":"F","address":"985 Wyona Street","employer":"Slofast","email":"nevaburgess@slofast.com","city":"Cawood","state":"DC"}
-{"account_number":295,"balance":37358,"firstname":"Howe","lastname":"Nash","age":20,"gender":"M","address":"833 Union Avenue","employer":"Aquacine","email":"howenash@aquacine.com","city":"Indio","state":"MN"}
-{"account_number":303,"balance":21976,"firstname":"Huffman","lastname":"Green","age":24,"gender":"F","address":"455 Colby Court","employer":"Comtest","email":"huffmangreen@comtest.com","city":"Weeksville","state":"UT"}
-{"account_number":308,"balance":33989,"firstname":"Glass","lastname":"Schroeder","age":25,"gender":"F","address":"670 Veterans Avenue","employer":"Realmo","email":"glassschroeder@realmo.com","city":"Gratton","state":"NY"}
-{"account_number":310,"balance":23049,"firstname":"Shannon","lastname":"Morton","age":39,"gender":"F","address":"412 Pleasant Place","employer":"Ovation","email":"shannonmorton@ovation.com","city":"Edgar","state":"AZ"}
-{"account_number":315,"balance":1314,"firstname":"Clare","lastname":"Morrow","age":33,"gender":"F","address":"728 Madeline Court","employer":"Gaptec","email":"claremorrow@gaptec.com","city":"Mapletown","state":"PA"}
-{"account_number":322,"balance":6303,"firstname":"Gilliam","lastname":"Horne","age":27,"gender":"M","address":"414 Florence Avenue","employer":"Shepard","email":"gilliamhorne@shepard.com","city":"Winesburg","state":"WY"}
-{"account_number":327,"balance":29294,"firstname":"Nell","lastname":"Contreras","age":27,"gender":"M","address":"694 Gold Street","employer":"Momentia","email":"nellcontreras@momentia.com","city":"Cumminsville","state":"AL"}
-{"account_number":334,"balance":9178,"firstname":"Cross","lastname":"Floyd","age":21,"gender":"F","address":"815 Herkimer Court","employer":"Maroptic","email":"crossfloyd@maroptic.com","city":"Kraemer","state":"AK"}
-{"account_number":339,"balance":3992,"firstname":"Franco","lastname":"Welch","age":38,"gender":"F","address":"776 Brightwater Court","employer":"Earthplex","email":"francowelch@earthplex.com","city":"Naomi","state":"ME"}
-{"account_number":341,"balance":44367,"firstname":"Alberta","lastname":"Bradford","age":30,"gender":"F","address":"670 Grant Avenue","employer":"Bugsall","email":"albertabradford@bugsall.com","city":"Romeville","state":"MT"}
-{"account_number":346,"balance":26594,"firstname":"Shelby","lastname":"Sanchez","age":36,"gender":"F","address":"257 Fillmore Avenue","employer":"Geekus","email":"shelbysanchez@geekus.com","city":"Seymour","state":"CO"}
-{"account_number":353,"balance":45182,"firstname":"Rivera","lastname":"Sherman","age":37,"gender":"M","address":"603 Garden Place","employer":"Bovis","email":"riverasherman@bovis.com","city":"Otranto","state":"CA"}
-{"account_number":358,"balance":44043,"firstname":"Hale","lastname":"Baldwin","age":40,"gender":"F","address":"845 Menahan Street","employer":"Kidgrease","email":"halebaldwin@kidgrease.com","city":"Day","state":"AK"}
-{"account_number":360,"balance":26651,"firstname":"Ward","lastname":"Hicks","age":34,"gender":"F","address":"592 Brighton Court","employer":"Biotica","email":"wardhicks@biotica.com","city":"Kanauga","state":"VT"}
-{"account_number":365,"balance":3176,"firstname":"Sanders","lastname":"Holder","age":31,"gender":"F","address":"453 Cypress Court","employer":"Geekola","email":"sandersholder@geekola.com","city":"Staples","state":"TN"}
-{"account_number":372,"balance":28566,"firstname":"Alba","lastname":"Forbes","age":24,"gender":"M","address":"814 Meserole Avenue","employer":"Isostream","email":"albaforbes@isostream.com","city":"Clarence","state":"OR"}
-{"account_number":377,"balance":5374,"firstname":"Margo","lastname":"Gay","age":34,"gender":"F","address":"613 Chase Court","employer":"Rotodyne","email":"margogay@rotodyne.com","city":"Waumandee","state":"KS"}
-{"account_number":384,"balance":48758,"firstname":"Sallie","lastname":"Houston","age":31,"gender":"F","address":"836 Polar Street","employer":"Squish","email":"salliehouston@squish.com","city":"Morningside","state":"NC"}
-{"account_number":389,"balance":8839,"firstname":"York","lastname":"Cummings","age":27,"gender":"M","address":"778 Centre Street","employer":"Insurity","email":"yorkcummings@insurity.com","city":"Freeburn","state":"RI"}
-{"account_number":391,"balance":14733,"firstname":"Holman","lastname":"Jordan","age":30,"gender":"M","address":"391 Forrest Street","employer":"Maineland","email":"holmanjordan@maineland.com","city":"Cade","state":"CT"}
-{"account_number":396,"balance":14613,"firstname":"Marsha","lastname":"Elliott","age":38,"gender":"F","address":"297 Liberty Avenue","employer":"Orbiflex","email":"marshaelliott@orbiflex.com","city":"Windsor","state":"TX"}
-{"account_number":404,"balance":34978,"firstname":"Massey","lastname":"Becker","age":26,"gender":"F","address":"930 Pitkin Avenue","employer":"Genekom","email":"masseybecker@genekom.com","city":"Blairstown","state":"OR"}
-{"account_number":409,"balance":36960,"firstname":"Maura","lastname":"Glenn","age":31,"gender":"M","address":"183 Poly Place","employer":"Viagreat","email":"mauraglenn@viagreat.com","city":"Foscoe","state":"DE"}
-{"account_number":411,"balance":1172,"firstname":"Guzman","lastname":"Whitfield","age":22,"gender":"M","address":"181 Perry Terrace","employer":"Springbee","email":"guzmanwhitfield@springbee.com","city":"Balm","state":"IN"}
-{"account_number":416,"balance":27169,"firstname":"Hunt","lastname":"Schwartz","age":28,"gender":"F","address":"461 Havens Place","employer":"Danja","email":"huntschwartz@danja.com","city":"Grenelefe","state":"NV"}
-{"account_number":423,"balance":38852,"firstname":"Hines","lastname":"Underwood","age":21,"gender":"F","address":"284 Louise Terrace","employer":"Namegen","email":"hinesunderwood@namegen.com","city":"Downsville","state":"CO"}
-{"account_number":428,"balance":13925,"firstname":"Stephens","lastname":"Cain","age":20,"gender":"F","address":"189 Summit Street","employer":"Rocklogic","email":"stephenscain@rocklogic.com","city":"Bourg","state":"HI"}
-{"account_number":430,"balance":15251,"firstname":"Alejandra","lastname":"Chavez","age":34,"gender":"M","address":"651 Butler Place","employer":"Gology","email":"alejandrachavez@gology.com","city":"Allensworth","state":"VT"}
-{"account_number":435,"balance":14654,"firstname":"Sue","lastname":"Lopez","age":22,"gender":"F","address":"632 Stone Avenue","employer":"Emergent","email":"suelopez@emergent.com","city":"Waterford","state":"TN"}
-{"account_number":442,"balance":36211,"firstname":"Lawanda","lastname":"Leon","age":27,"gender":"F","address":"126 Canal Avenue","employer":"Xixan","email":"lawandaleon@xixan.com","city":"Berwind","state":"TN"}
-{"account_number":447,"balance":11402,"firstname":"Lucia","lastname":"Livingston","age":35,"gender":"M","address":"773 Lake Avenue","employer":"Soprano","email":"lucialivingston@soprano.com","city":"Edgewater","state":"TN"}
-{"account_number":454,"balance":31687,"firstname":"Alicia","lastname":"Rollins","age":22,"gender":"F","address":"483 Verona Place","employer":"Boilcat","email":"aliciarollins@boilcat.com","city":"Lutsen","state":"MD"}
-{"account_number":459,"balance":18869,"firstname":"Pamela","lastname":"Henry","age":20,"gender":"F","address":"361 Locust Avenue","employer":"Imageflow","email":"pamelahenry@imageflow.com","city":"Greenfields","state":"OH"}
-{"account_number":461,"balance":38807,"firstname":"Mcbride","lastname":"Padilla","age":34,"gender":"F","address":"550 Borinquen Pl","employer":"Zepitope","email":"mcbridepadilla@zepitope.com","city":"Emory","state":"AZ"}
-{"account_number":466,"balance":25109,"firstname":"Marcie","lastname":"Mcmillan","age":30,"gender":"F","address":"947 Gain Court","employer":"Entroflex","email":"marciemcmillan@entroflex.com","city":"Ronco","state":"ND"}
-{"account_number":473,"balance":5391,"firstname":"Susan","lastname":"Luna","age":25,"gender":"F","address":"521 Bogart Street","employer":"Zaya","email":"susanluna@zaya.com","city":"Grazierville","state":"MI"}
-{"account_number":478,"balance":28044,"firstname":"Dana","lastname":"Decker","age":35,"gender":"M","address":"627 Dobbin Street","employer":"Acrodance","email":"danadecker@acrodance.com","city":"Sharon","state":"MN"}
-{"account_number":480,"balance":40807,"firstname":"Anastasia","lastname":"Parker","age":24,"gender":"M","address":"650 Folsom Place","employer":"Zilladyne","email":"anastasiaparker@zilladyne.com","city":"Oberlin","state":"WY"}
-{"account_number":485,"balance":44235,"firstname":"Albert","lastname":"Roberts","age":40,"gender":"M","address":"385 Harman Street","employer":"Stralum","email":"albertroberts@stralum.com","city":"Watrous","state":"NM"}
-{"account_number":492,"balance":31055,"firstname":"Burnett","lastname":"Briggs","age":35,"gender":"M","address":"987 Cass Place","employer":"Pharmex","email":"burnettbriggs@pharmex.com","city":"Cornfields","state":"TX"}
-{"account_number":497,"balance":13493,"firstname":"Doyle","lastname":"Jenkins","age":30,"gender":"M","address":"205 Nevins Street","employer":"Unia","email":"doylejenkins@unia.com","city":"Nicut","state":"DC"}
-{"account_number":500,"balance":39143,"firstname":"Pope","lastname":"Keith","age":28,"gender":"F","address":"537 Fane Court","employer":"Zboo","email":"popekeith@zboo.com","city":"Courtland","state":"AL"}
-{"account_number":505,"balance":45493,"firstname":"Shelley","lastname":"Webb","age":29,"gender":"M","address":"873 Crawford Avenue","employer":"Quadeebo","email":"shelleywebb@quadeebo.com","city":"Topanga","state":"IL"}
-{"account_number":512,"balance":47432,"firstname":"Alisha","lastname":"Morales","age":29,"gender":"M","address":"623 Batchelder Street","employer":"Terragen","email":"alishamorales@terragen.com","city":"Gilmore","state":"VA"}
-{"account_number":517,"balance":3022,"firstname":"Allyson","lastname":"Walls","age":38,"gender":"F","address":"334 Coffey Street","employer":"Gorganic","email":"allysonwalls@gorganic.com","city":"Dahlen","state":"GA"}
-{"account_number":524,"balance":49334,"firstname":"Salas","lastname":"Farley","age":30,"gender":"F","address":"499 Trucklemans Lane","employer":"Xumonk","email":"salasfarley@xumonk.com","city":"Noxen","state":"AL"}
-{"account_number":529,"balance":21788,"firstname":"Deann","lastname":"Fisher","age":23,"gender":"F","address":"511 Buffalo Avenue","employer":"Twiist","email":"deannfisher@twiist.com","city":"Templeton","state":"WA"}
-{"account_number":531,"balance":39770,"firstname":"Janet","lastname":"Pena","age":38,"gender":"M","address":"645 Livonia Avenue","employer":"Corecom","email":"janetpena@corecom.com","city":"Garberville","state":"OK"}
-{"account_number":536,"balance":6255,"firstname":"Emma","lastname":"Adkins","age":33,"gender":"F","address":"971 Calder Place","employer":"Ontagene","email":"emmaadkins@ontagene.com","city":"Ruckersville","state":"GA"}
-{"account_number":543,"balance":48022,"firstname":"Marina","lastname":"Rasmussen","age":31,"gender":"M","address":"446 Love Lane","employer":"Crustatia","email":"marinarasmussen@crustatia.com","city":"Statenville","state":"MD"}
-{"account_number":548,"balance":36930,"firstname":"Sandra","lastname":"Andrews","age":37,"gender":"M","address":"973 Prospect Street","employer":"Datagene","email":"sandraandrews@datagene.com","city":"Inkerman","state":"MO"}
-{"account_number":550,"balance":32238,"firstname":"Walsh","lastname":"Goodwin","age":22,"gender":"M","address":"953 Canda Avenue","employer":"Proflex","email":"walshgoodwin@proflex.com","city":"Ypsilanti","state":"MT"}
-{"account_number":555,"balance":10750,"firstname":"Fannie","lastname":"Slater","age":31,"gender":"M","address":"457 Tech Place","employer":"Kineticut","email":"fannieslater@kineticut.com","city":"Basye","state":"MO"}
-{"account_number":562,"balance":10737,"firstname":"Sarah","lastname":"Strong","age":39,"gender":"F","address":"177 Pioneer Street","employer":"Megall","email":"sarahstrong@megall.com","city":"Ladera","state":"WY"}
-{"account_number":567,"balance":6507,"firstname":"Diana","lastname":"Dominguez","age":40,"gender":"M","address":"419 Albany Avenue","employer":"Ohmnet","email":"dianadominguez@ohmnet.com","city":"Wildwood","state":"TX"}
-{"account_number":574,"balance":32954,"firstname":"Andrea","lastname":"Mosley","age":24,"gender":"M","address":"368 Throop Avenue","employer":"Musix","email":"andreamosley@musix.com","city":"Blende","state":"DC"}
-{"account_number":579,"balance":12044,"firstname":"Banks","lastname":"Sawyer","age":36,"gender":"M","address":"652 Doone Court","employer":"Rooforia","email":"bankssawyer@rooforia.com","city":"Foxworth","state":"ND"}
-{"account_number":581,"balance":16525,"firstname":"Fuller","lastname":"Mcintyre","age":32,"gender":"M","address":"169 Bergen Place","employer":"Applideck","email":"fullermcintyre@applideck.com","city":"Kenvil","state":"NY"}
-{"account_number":586,"balance":13644,"firstname":"Love","lastname":"Velasquez","age":26,"gender":"F","address":"290 Girard Street","employer":"Zomboid","email":"lovevelasquez@zomboid.com","city":"Villarreal","state":"SD"}
-{"account_number":593,"balance":41230,"firstname":"Muriel","lastname":"Vazquez","age":37,"gender":"M","address":"395 Montgomery Street","employer":"Sustenza","email":"murielvazquez@sustenza.com","city":"Strykersville","state":"OK"}
-{"account_number":598,"balance":33251,"firstname":"Morgan","lastname":"Coleman","age":33,"gender":"M","address":"324 McClancy Place","employer":"Aclima","email":"morgancoleman@aclima.com","city":"Bowden","state":"WA"}
-{"account_number":601,"balance":20796,"firstname":"Vickie","lastname":"Valentine","age":34,"gender":"F","address":"432 Bassett Avenue","employer":"Comvene","email":"vickievalentine@comvene.com","city":"Teasdale","state":"UT"}
-{"account_number":606,"balance":28770,"firstname":"Michael","lastname":"Bray","age":31,"gender":"M","address":"935 Lake Place","employer":"Telepark","email":"michaelbray@telepark.com","city":"Lemoyne","state":"CT"}
-{"account_number":613,"balance":39340,"firstname":"Eddie","lastname":"Mccarty","age":34,"gender":"F","address":"971 Richards Street","employer":"Bisba","email":"eddiemccarty@bisba.com","city":"Fruitdale","state":"NY"}
-{"account_number":618,"balance":8976,"firstname":"Cheri","lastname":"Ford","age":30,"gender":"F","address":"803 Ridgewood Avenue","employer":"Zorromop","email":"cheriford@zorromop.com","city":"Gambrills","state":"VT"}
-{"account_number":620,"balance":7224,"firstname":"Coleen","lastname":"Bartlett","age":38,"gender":"M","address":"761 Carroll Street","employer":"Idealis","email":"coleenbartlett@idealis.com","city":"Mathews","state":"DE"}
-{"account_number":625,"balance":46010,"firstname":"Cynthia","lastname":"Johnston","age":23,"gender":"M","address":"142 Box Street","employer":"Zentry","email":"cynthiajohnston@zentry.com","city":"Makena","state":"MA"}
-{"account_number":632,"balance":40470,"firstname":"Kay","lastname":"Warren","age":20,"gender":"F","address":"422 Alabama Avenue","employer":"Realysis","email":"kaywarren@realysis.com","city":"Homestead","state":"HI"}
-{"account_number":637,"balance":3169,"firstname":"Kathy","lastname":"Carter","age":27,"gender":"F","address":"410 Jamison Lane","employer":"Limage","email":"kathycarter@limage.com","city":"Ernstville","state":"WA"}
-{"account_number":644,"balance":44021,"firstname":"Etta","lastname":"Miller","age":21,"gender":"F","address":"376 Lawton Street","employer":"Bluegrain","email":"ettamiller@bluegrain.com","city":"Baker","state":"MD"}
-{"account_number":649,"balance":20275,"firstname":"Jeanine","lastname":"Malone","age":26,"gender":"F","address":"114 Dodworth Street","employer":"Nixelt","email":"jeaninemalone@nixelt.com","city":"Keyport","state":"AK"}
-{"account_number":651,"balance":18360,"firstname":"Young","lastname":"Reeves","age":34,"gender":"M","address":"581 Plaza Street","employer":"Krog","email":"youngreeves@krog.com","city":"Sussex","state":"WY"}
-{"account_number":656,"balance":21632,"firstname":"Olson","lastname":"Hunt","age":36,"gender":"M","address":"342 Jaffray Street","employer":"Volax","email":"olsonhunt@volax.com","city":"Bangor","state":"WA"}
-{"account_number":663,"balance":2456,"firstname":"Rollins","lastname":"Richards","age":37,"gender":"M","address":"129 Sullivan Place","employer":"Geostele","email":"rollinsrichards@geostele.com","city":"Morgandale","state":"FL"}
-{"account_number":668,"balance":45069,"firstname":"Potter","lastname":"Michael","age":27,"gender":"M","address":"803 Glenmore Avenue","employer":"Ontality","email":"pottermichael@ontality.com","city":"Newkirk","state":"KS"}
-{"account_number":670,"balance":10178,"firstname":"Ollie","lastname":"Riley","age":22,"gender":"M","address":"252 Jackson Place","employer":"Adornica","email":"ollieriley@adornica.com","city":"Brethren","state":"WI"}
-{"account_number":675,"balance":36102,"firstname":"Fisher","lastname":"Shepard","age":27,"gender":"F","address":"859 Varick Street","employer":"Qot","email":"fishershepard@qot.com","city":"Diaperville","state":"MD"}
-{"account_number":682,"balance":14168,"firstname":"Anne","lastname":"Hale","age":22,"gender":"F","address":"708 Anthony Street","employer":"Cytrek","email":"annehale@cytrek.com","city":"Beechmont","state":"WV"}
-{"account_number":687,"balance":48630,"firstname":"Caroline","lastname":"Cox","age":31,"gender":"M","address":"626 Hillel Place","employer":"Opticon","email":"carolinecox@opticon.com","city":"Loma","state":"ND"}
-{"account_number":694,"balance":33125,"firstname":"Craig","lastname":"Palmer","age":31,"gender":"F","address":"273 Montrose Avenue","employer":"Comvey","email":"craigpalmer@comvey.com","city":"Cleary","state":"OK"}
-{"account_number":699,"balance":4156,"firstname":"Gallagher","lastname":"Marshall","age":37,"gender":"F","address":"648 Clifford Place","employer":"Exiand","email":"gallaghermarshall@exiand.com","city":"Belfair","state":"KY"}
-{"account_number":702,"balance":46490,"firstname":"Meadows","lastname":"Delgado","age":26,"gender":"M","address":"612 Jardine Place","employer":"Daisu","email":"meadowsdelgado@daisu.com","city":"Venice","state":"AR"}
-{"account_number":707,"balance":30325,"firstname":"Sonya","lastname":"Trevino","age":30,"gender":"F","address":"181 Irving Place","employer":"Atgen","email":"sonyatrevino@atgen.com","city":"Enetai","state":"TN"}
-{"account_number":714,"balance":16602,"firstname":"Socorro","lastname":"Murray","age":34,"gender":"F","address":"810 Manhattan Court","employer":"Isoswitch","email":"socorromurray@isoswitch.com","city":"Jugtown","state":"AZ"}
-{"account_number":719,"balance":33107,"firstname":"Leanna","lastname":"Reed","age":25,"gender":"F","address":"528 Krier Place","employer":"Rodeology","email":"leannareed@rodeology.com","city":"Carrizo","state":"WI"}
-{"account_number":721,"balance":32958,"firstname":"Mara","lastname":"Dickson","age":26,"gender":"M","address":"810 Harrison Avenue","employer":"Comtours","email":"maradickson@comtours.com","city":"Thynedale","state":"DE"}
-{"account_number":726,"balance":44737,"firstname":"Rosemary","lastname":"Salazar","age":21,"gender":"M","address":"290 Croton Loop","employer":"Rockabye","email":"rosemarysalazar@rockabye.com","city":"Helen","state":"IA"}
-{"account_number":733,"balance":15722,"firstname":"Lakeisha","lastname":"Mccarthy","age":37,"gender":"M","address":"782 Turnbull Avenue","employer":"Exosis","email":"lakeishamccarthy@exosis.com","city":"Caberfae","state":"NM"}
-{"account_number":738,"balance":44936,"firstname":"Rosalind","lastname":"Hunter","age":32,"gender":"M","address":"644 Eaton Court","employer":"Zolarity","email":"rosalindhunter@zolarity.com","city":"Cataract","state":"SD"}
-{"account_number":740,"balance":6143,"firstname":"Chambers","lastname":"Hahn","age":22,"gender":"M","address":"937 Windsor Place","employer":"Medalert","email":"chambershahn@medalert.com","city":"Dorneyville","state":"DC"}
-{"account_number":745,"balance":4572,"firstname":"Jacobs","lastname":"Sweeney","age":32,"gender":"M","address":"189 Lott Place","employer":"Comtent","email":"jacobssweeney@comtent.com","city":"Advance","state":"NJ"}
-{"account_number":752,"balance":14039,"firstname":"Jerry","lastname":"Rush","age":31,"gender":"M","address":"632 Dank Court","employer":"Ebidco","email":"jerryrush@ebidco.com","city":"Geyserville","state":"AR"}
-{"account_number":757,"balance":34628,"firstname":"Mccullough","lastname":"Moore","age":30,"gender":"F","address":"304 Hastings Street","employer":"Nikuda","email":"mcculloughmoore@nikuda.com","city":"Charco","state":"DC"}
-{"account_number":764,"balance":3728,"firstname":"Noemi","lastname":"Gill","age":30,"gender":"M","address":"427 Chester Street","employer":"Avit","email":"noemigill@avit.com","city":"Chesterfield","state":"AL"}
-{"account_number":769,"balance":15362,"firstname":"Francis","lastname":"Beck","age":28,"gender":"M","address":"454 Livingston Street","employer":"Furnafix","email":"francisbeck@furnafix.com","city":"Dunnavant","state":"HI"}
-{"account_number":771,"balance":32784,"firstname":"Jocelyn","lastname":"Boone","age":23,"gender":"M","address":"513 Division Avenue","employer":"Collaire","email":"jocelynboone@collaire.com","city":"Lisco","state":"VT"}
-{"account_number":776,"balance":29177,"firstname":"Duke","lastname":"Atkinson","age":24,"gender":"M","address":"520 Doscher Street","employer":"Tripsch","email":"dukeatkinson@tripsch.com","city":"Lafferty","state":"NC"}
-{"account_number":783,"balance":11911,"firstname":"Faith","lastname":"Cooper","age":25,"gender":"F","address":"539 Rapelye Street","employer":"Insuron","email":"faithcooper@insuron.com","city":"Jennings","state":"MN"}
-{"account_number":788,"balance":12473,"firstname":"Marianne","lastname":"Aguilar","age":39,"gender":"F","address":"213 Holly Street","employer":"Marqet","email":"marianneaguilar@marqet.com","city":"Alfarata","state":"HI"}
-{"account_number":790,"balance":29912,"firstname":"Ellis","lastname":"Sullivan","age":39,"gender":"F","address":"877 Coyle Street","employer":"Enersave","email":"ellissullivan@enersave.com","city":"Canby","state":"MS"}
-{"account_number":795,"balance":31450,"firstname":"Bruce","lastname":"Avila","age":34,"gender":"M","address":"865 Newkirk Placez","employer":"Plasmosis","email":"bruceavila@plasmosis.com","city":"Ada","state":"ID"}
-{"account_number":803,"balance":49567,"firstname":"Marissa","lastname":"Spears","age":25,"gender":"M","address":"963 Highland Avenue","employer":"Centregy","email":"marissaspears@centregy.com","city":"Bloomington","state":"MS"}
-{"account_number":808,"balance":11251,"firstname":"Nola","lastname":"Quinn","age":20,"gender":"M","address":"863 Wythe Place","employer":"Iplax","email":"nolaquinn@iplax.com","city":"Cuylerville","state":"NH"}
-{"account_number":810,"balance":10563,"firstname":"Alyssa","lastname":"Ortega","age":40,"gender":"M","address":"977 Clymer Street","employer":"Eventage","email":"alyssaortega@eventage.com","city":"Convent","state":"SC"}
-{"account_number":815,"balance":19336,"firstname":"Guthrie","lastname":"Morse","age":30,"gender":"M","address":"685 Vandalia Avenue","employer":"Gronk","email":"guthriemorse@gronk.com","city":"Fowlerville","state":"OR"}
-{"account_number":822,"balance":13024,"firstname":"Hicks","lastname":"Farrell","age":25,"gender":"M","address":"468 Middleton Street","employer":"Zolarex","email":"hicksfarrell@zolarex.com","city":"Columbus","state":"OR"}
-{"account_number":827,"balance":37536,"firstname":"Naomi","lastname":"Ball","age":29,"gender":"F","address":"319 Stewart Street","employer":"Isotronic","email":"naomiball@isotronic.com","city":"Trona","state":"NM"}
-{"account_number":834,"balance":38049,"firstname":"Sybil","lastname":"Carrillo","age":25,"gender":"M","address":"359 Baughman Place","employer":"Phuel","email":"sybilcarrillo@phuel.com","city":"Kohatk","state":"CT"}
-{"account_number":839,"balance":38292,"firstname":"Langley","lastname":"Neal","age":39,"gender":"F","address":"565 Newton Street","employer":"Liquidoc","email":"langleyneal@liquidoc.com","city":"Osage","state":"AL"}
-{"account_number":841,"balance":28291,"firstname":"Dalton","lastname":"Waters","age":21,"gender":"M","address":"859 Grand Street","employer":"Malathion","email":"daltonwaters@malathion.com","city":"Tonopah","state":"AZ"}
-{"account_number":846,"balance":35099,"firstname":"Maureen","lastname":"Glass","age":22,"gender":"M","address":"140 Amherst Street","employer":"Stelaecor","email":"maureenglass@stelaecor.com","city":"Cucumber","state":"IL"}
-{"account_number":853,"balance":38353,"firstname":"Travis","lastname":"Parks","age":40,"gender":"M","address":"930 Bay Avenue","employer":"Pyramax","email":"travisparks@pyramax.com","city":"Gadsden","state":"ND"}
-{"account_number":858,"balance":23194,"firstname":"Small","lastname":"Hatfield","age":36,"gender":"M","address":"593 Tennis Court","employer":"Letpro","email":"smallhatfield@letpro.com","city":"Haena","state":"KS"}
-{"account_number":860,"balance":23613,"firstname":"Clark","lastname":"Boyd","age":37,"gender":"M","address":"501 Rock Street","employer":"Deepends","email":"clarkboyd@deepends.com","city":"Whitewater","state":"MA"}
-{"account_number":865,"balance":10574,"firstname":"Cook","lastname":"Kelley","age":28,"gender":"F","address":"865 Lincoln Terrace","employer":"Quizmo","email":"cookkelley@quizmo.com","city":"Kansas","state":"KY"}
-{"account_number":872,"balance":26314,"firstname":"Jane","lastname":"Greer","age":36,"gender":"F","address":"717 Hewes Street","employer":"Newcube","email":"janegreer@newcube.com","city":"Delshire","state":"DE"}
-{"account_number":877,"balance":42879,"firstname":"Tracey","lastname":"Ruiz","age":34,"gender":"F","address":"141 Tompkins Avenue","employer":"Waab","email":"traceyruiz@waab.com","city":"Zeba","state":"NM"}
-{"account_number":884,"balance":29316,"firstname":"Reva","lastname":"Rosa","age":40,"gender":"M","address":"784 Greene Avenue","employer":"Urbanshee","email":"revarosa@urbanshee.com","city":"Bakersville","state":"MS"}
-{"account_number":889,"balance":26464,"firstname":"Fischer","lastname":"Klein","age":38,"gender":"F","address":"948 Juliana Place","employer":"Comtext","email":"fischerklein@comtext.com","city":"Jackpot","state":"PA"}
-{"account_number":891,"balance":34829,"firstname":"Jacobson","lastname":"Clemons","age":24,"gender":"F","address":"507 Wilson Street","employer":"Quilm","email":"jacobsonclemons@quilm.com","city":"Muir","state":"TX"}
-{"account_number":896,"balance":31947,"firstname":"Buckley","lastname":"Peterson","age":26,"gender":"M","address":"217 Beayer Place","employer":"Earwax","email":"buckleypeterson@earwax.com","city":"Franklin","state":"DE"}
-{"account_number":904,"balance":27707,"firstname":"Mendez","lastname":"Mcneil","age":26,"gender":"M","address":"431 Halsey Street","employer":"Macronaut","email":"mendezmcneil@macronaut.com","city":"Troy","state":"OK"}
-{"account_number":909,"balance":18421,"firstname":"Stark","lastname":"Lewis","age":36,"gender":"M","address":"409 Tilden Avenue","employer":"Frosnex","email":"starklewis@frosnex.com","city":"Axis","state":"CA"}
-{"account_number":911,"balance":42655,"firstname":"Annie","lastname":"Lyons","age":21,"gender":"M","address":"518 Woods Place","employer":"Enerforce","email":"annielyons@enerforce.com","city":"Stagecoach","state":"MA"}
-{"account_number":916,"balance":47887,"firstname":"Jarvis","lastname":"Alexander","age":40,"gender":"M","address":"406 Bergen Avenue","employer":"Equitax","email":"jarvisalexander@equitax.com","city":"Haring","state":"KY"}
-{"account_number":923,"balance":48466,"firstname":"Mueller","lastname":"Mckee","age":26,"gender":"M","address":"298 Ruby Street","employer":"Luxuria","email":"muellermckee@luxuria.com","city":"Coleville","state":"TN"}
-{"account_number":928,"balance":19611,"firstname":"Hester","lastname":"Copeland","age":22,"gender":"F","address":"425 Cropsey Avenue","employer":"Dymi","email":"hestercopeland@dymi.com","city":"Wolcott","state":"NE"}
-{"account_number":930,"balance":47257,"firstname":"Kinney","lastname":"Lawson","age":39,"gender":"M","address":"501 Raleigh Place","employer":"Neptide","email":"kinneylawson@neptide.com","city":"Deltaville","state":"MD"}
-{"account_number":935,"balance":4959,"firstname":"Flowers","lastname":"Robles","age":30,"gender":"M","address":"201 Hull Street","employer":"Xelegyl","email":"flowersrobles@xelegyl.com","city":"Rehrersburg","state":"AL"}
-{"account_number":942,"balance":21299,"firstname":"Hamilton","lastname":"Clayton","age":26,"gender":"M","address":"413 Debevoise Street","employer":"Architax","email":"hamiltonclayton@architax.com","city":"Terlingua","state":"NM"}
-{"account_number":947,"balance":22039,"firstname":"Virgie","lastname":"Garza","age":30,"gender":"M","address":"903 Matthews Court","employer":"Plasmox","email":"virgiegarza@plasmox.com","city":"Somerset","state":"WY"}
-{"account_number":954,"balance":49404,"firstname":"Jenna","lastname":"Martin","age":22,"gender":"M","address":"688 Hart Street","employer":"Zinca","email":"jennamartin@zinca.com","city":"Oasis","state":"MD"}
-{"account_number":959,"balance":34743,"firstname":"Shaffer","lastname":"Cervantes","age":40,"gender":"M","address":"931 Varick Avenue","employer":"Oceanica","email":"shaffercervantes@oceanica.com","city":"Bowie","state":"AL"}
-{"account_number":961,"balance":43219,"firstname":"Betsy","lastname":"Hyde","age":27,"gender":"F","address":"183 Junius Street","employer":"Tubalum","email":"betsyhyde@tubalum.com","city":"Driftwood","state":"TX"}
-{"account_number":966,"balance":20619,"firstname":"Susanne","lastname":"Rodriguez","age":35,"gender":"F","address":"255 Knickerbocker Avenue","employer":"Comtrek","email":"susannerodriguez@comtrek.com","city":"Trinway","state":"TX"}
-{"account_number":973,"balance":45756,"firstname":"Rice","lastname":"Farmer","age":31,"gender":"M","address":"476 Nassau Avenue","employer":"Photobin","email":"ricefarmer@photobin.com","city":"Suitland","state":"ME"}
-{"account_number":978,"balance":21459,"firstname":"Melanie","lastname":"Rojas","age":33,"gender":"M","address":"991 Java Street","employer":"Kage","email":"melanierojas@kage.com","city":"Greenock","state":"VT"}
-{"account_number":980,"balance":42436,"firstname":"Cash","lastname":"Collier","age":33,"gender":"F","address":"999 Sapphire Street","employer":"Ceprene","email":"cashcollier@ceprene.com","city":"Glidden","state":"AK"}
-{"account_number":985,"balance":20083,"firstname":"Martin","lastname":"Gardner","age":28,"gender":"F","address":"644 Fairview Place","employer":"Golistic","email":"martingardner@golistic.com","city":"Connerton","state":"NJ"}
-{"account_number":992,"balance":11413,"firstname":"Kristie","lastname":"Kennedy","age":33,"gender":"F","address":"750 Hudson Avenue","employer":"Ludak","email":"kristiekennedy@ludak.com","city":"Warsaw","state":"WY"}
-{"account_number":997,"balance":25311,"firstname":"Combs","lastname":"Frederick","age":20,"gender":"M","address":"586 Lloyd Court","employer":"Pathways","email":"combsfrederick@pathways.com","city":"Williamson","state":"CA"}
-{"account_number":3,"balance":44947,"firstname":"Levine","lastname":"Burks","age":26,"gender":"F","address":"328 Wilson Avenue","employer":"Amtap","email":"levineburks@amtap.com","city":"Cochranville","state":"HI"}
-{"account_number":8,"balance":48868,"firstname":"Jan","lastname":"Burns","age":35,"gender":"M","address":"699 Visitation Place","employer":"Glasstep","email":"janburns@glasstep.com","city":"Wakulla","state":"AZ"}
-{"account_number":10,"balance":46170,"firstname":"Dominique","lastname":"Park","age":37,"gender":"F","address":"100 Gatling Place","employer":"Conjurica","email":"dominiquepark@conjurica.com","city":"Omar","state":"NJ"}
-{"account_number":15,"balance":43456,"firstname":"Bobbie","lastname":"Sexton","age":21,"gender":"M","address":"232 Sedgwick Place","employer":"Zytrex","email":"bobbiesexton@zytrex.com","city":"Hendersonville","state":"CA"}
-{"account_number":22,"balance":40283,"firstname":"Barrera","lastname":"Terrell","age":23,"gender":"F","address":"292 Orange Street","employer":"Steelfab","email":"barreraterrell@steelfab.com","city":"Bynum","state":"ME"}
-{"account_number":27,"balance":6176,"firstname":"Meyers","lastname":"Williamson","age":26,"gender":"F","address":"675 Henderson Walk","employer":"Plexia","email":"meyerswilliamson@plexia.com","city":"Richmond","state":"AZ"}
-{"account_number":34,"balance":35379,"firstname":"Ellison","lastname":"Kim","age":30,"gender":"F","address":"986 Revere Place","employer":"Signity","email":"ellisonkim@signity.com","city":"Sehili","state":"IL"}
-{"account_number":39,"balance":38688,"firstname":"Bowers","lastname":"Mendez","age":22,"gender":"F","address":"665 Bennet Court","employer":"Farmage","email":"bowersmendez@farmage.com","city":"Duryea","state":"PA"}
-{"account_number":41,"balance":36060,"firstname":"Hancock","lastname":"Holden","age":20,"gender":"M","address":"625 Gaylord Drive","employer":"Poochies","email":"hancockholden@poochies.com","city":"Alamo","state":"KS"}
-{"account_number":46,"balance":12351,"firstname":"Karla","lastname":"Bowman","age":23,"gender":"M","address":"554 Chapel Street","employer":"Undertap","email":"karlabowman@undertap.com","city":"Sylvanite","state":"DC"}
-{"account_number":53,"balance":28101,"firstname":"Kathryn","lastname":"Payne","age":29,"gender":"F","address":"467 Louis Place","employer":"Katakana","email":"kathrynpayne@katakana.com","city":"Harviell","state":"SD"}
-{"account_number":58,"balance":31697,"firstname":"Marva","lastname":"Cannon","age":40,"gender":"M","address":"993 Highland Place","employer":"Comcubine","email":"marvacannon@comcubine.com","city":"Orviston","state":"MO"}
-{"account_number":60,"balance":45955,"firstname":"Maude","lastname":"Casey","age":31,"gender":"F","address":"566 Strauss Street","employer":"Quilch","email":"maudecasey@quilch.com","city":"Enlow","state":"GA"}
-{"account_number":65,"balance":23282,"firstname":"Leonor","lastname":"Pruitt","age":24,"gender":"M","address":"974 Terrace Place","employer":"Velos","email":"leonorpruitt@velos.com","city":"Devon","state":"WI"}
-{"account_number":72,"balance":9732,"firstname":"Barlow","lastname":"Rhodes","age":25,"gender":"F","address":"891 Clinton Avenue","employer":"Zialactic","email":"barlowrhodes@zialactic.com","city":"Echo","state":"TN"}
-{"account_number":77,"balance":5724,"firstname":"Byrd","lastname":"Conley","age":24,"gender":"F","address":"698 Belmont Avenue","employer":"Zidox","email":"byrdconley@zidox.com","city":"Rockbridge","state":"SC"}
-{"account_number":84,"balance":3001,"firstname":"Hutchinson","lastname":"Newton","age":34,"gender":"F","address":"553 Locust Street","employer":"Zaggles","email":"hutchinsonnewton@zaggles.com","city":"Snyderville","state":"DC"}
-{"account_number":89,"balance":13263,"firstname":"Mcdowell","lastname":"Bradley","age":28,"gender":"M","address":"960 Howard Alley","employer":"Grok","email":"mcdowellbradley@grok.com","city":"Toftrees","state":"TX"}
-{"account_number":91,"balance":29799,"firstname":"Vonda","lastname":"Galloway","age":20,"gender":"M","address":"988 Voorhies Avenue","employer":"Illumity","email":"vondagalloway@illumity.com","city":"Holcombe","state":"HI"}
-{"account_number":96,"balance":15933,"firstname":"Shirley","lastname":"Edwards","age":38,"gender":"M","address":"817 Caton Avenue","employer":"Equitox","email":"shirleyedwards@equitox.com","city":"Nelson","state":"MA"}
-{"account_number":104,"balance":32619,"firstname":"Casey","lastname":"Roth","age":29,"gender":"M","address":"963 Railroad Avenue","employer":"Hotcakes","email":"caseyroth@hotcakes.com","city":"Davenport","state":"OH"}
-{"account_number":109,"balance":25812,"firstname":"Gretchen","lastname":"Dawson","age":31,"gender":"M","address":"610 Bethel Loop","employer":"Tetak","email":"gretchendawson@tetak.com","city":"Hailesboro","state":"CO"}
-{"account_number":111,"balance":1481,"firstname":"Traci","lastname":"Allison","age":35,"gender":"M","address":"922 Bryant Street","employer":"Enjola","email":"traciallison@enjola.com","city":"Robinette","state":"OR"}
-{"account_number":116,"balance":21335,"firstname":"Hobbs","lastname":"Wright","age":24,"gender":"M","address":"965 Temple Court","employer":"Netbook","email":"hobbswright@netbook.com","city":"Strong","state":"CA"}
-{"account_number":123,"balance":3079,"firstname":"Cleo","lastname":"Beach","age":27,"gender":"F","address":"653 Haring Street","employer":"Proxsoft","email":"cleobeach@proxsoft.com","city":"Greensburg","state":"ME"}
-{"account_number":128,"balance":3556,"firstname":"Mack","lastname":"Bullock","age":34,"gender":"F","address":"462 Ingraham Street","employer":"Terascape","email":"mackbullock@terascape.com","city":"Eureka","state":"PA"}
-{"account_number":130,"balance":24171,"firstname":"Roxie","lastname":"Cantu","age":33,"gender":"M","address":"841 Catherine Street","employer":"Skybold","email":"roxiecantu@skybold.com","city":"Deputy","state":"NE"}
-{"account_number":135,"balance":24885,"firstname":"Stevenson","lastname":"Crosby","age":40,"gender":"F","address":"473 Boardwalk ","employer":"Accel","email":"stevensoncrosby@accel.com","city":"Norris","state":"OK"}
-{"account_number":142,"balance":4544,"firstname":"Vang","lastname":"Hughes","age":27,"gender":"M","address":"357 Landis Court","employer":"Bolax","email":"vanghughes@bolax.com","city":"Emerald","state":"WY"}
-{"account_number":147,"balance":35921,"firstname":"Charmaine","lastname":"Whitney","age":28,"gender":"F","address":"484 Seton Place","employer":"Comveyer","email":"charmainewhitney@comveyer.com","city":"Dexter","state":"DC"}
-{"account_number":154,"balance":40945,"firstname":"Burns","lastname":"Solis","age":31,"gender":"M","address":"274 Lorraine Street","employer":"Rodemco","email":"burnssolis@rodemco.com","city":"Ballico","state":"WI"}
-{"account_number":159,"balance":1696,"firstname":"Alvarez","lastname":"Mack","age":22,"gender":"F","address":"897 Manor Court","employer":"Snorus","email":"alvarezmack@snorus.com","city":"Rosedale","state":"CA"}
-{"account_number":161,"balance":4659,"firstname":"Doreen","lastname":"Randall","age":37,"gender":"F","address":"178 Court Street","employer":"Calcula","email":"doreenrandall@calcula.com","city":"Belmont","state":"TX"}
-{"account_number":166,"balance":33847,"firstname":"Rutledge","lastname":"Rivas","age":23,"gender":"M","address":"352 Verona Street","employer":"Virxo","email":"rutledgerivas@virxo.com","city":"Brandermill","state":"NE"}
-{"account_number":173,"balance":5989,"firstname":"Whitley","lastname":"Blevins","age":32,"gender":"M","address":"127 Brooklyn Avenue","employer":"Pawnagra","email":"whitleyblevins@pawnagra.com","city":"Rodanthe","state":"ND"}
-{"account_number":178,"balance":36735,"firstname":"Clements","lastname":"Finley","age":39,"gender":"F","address":"270 Story Court","employer":"Imaginart","email":"clementsfinley@imaginart.com","city":"Lookingglass","state":"MN"}
-{"account_number":180,"balance":34236,"firstname":"Ursula","lastname":"Goodman","age":32,"gender":"F","address":"414 Clinton Street","employer":"Earthmark","email":"ursulagoodman@earthmark.com","city":"Rote","state":"AR"}
-{"account_number":185,"balance":43532,"firstname":"Laurel","lastname":"Cline","age":40,"gender":"M","address":"788 Fenimore Street","employer":"Prismatic","email":"laurelcline@prismatic.com","city":"Frank","state":"UT"}
-{"account_number":192,"balance":23508,"firstname":"Ramsey","lastname":"Carr","age":31,"gender":"F","address":"209 Williamsburg Street","employer":"Strezzo","email":"ramseycarr@strezzo.com","city":"Grapeview","state":"NM"}
-{"account_number":197,"balance":17246,"firstname":"Sweet","lastname":"Sanders","age":33,"gender":"F","address":"712 Homecrest Court","employer":"Isosure","email":"sweetsanders@isosure.com","city":"Sheatown","state":"VT"}
-{"account_number":200,"balance":26210,"firstname":"Teri","lastname":"Hester","age":39,"gender":"M","address":"653 Abbey Court","employer":"Electonic","email":"terihester@electonic.com","city":"Martell","state":"MD"}
-{"account_number":205,"balance":45493,"firstname":"Johnson","lastname":"Chang","age":28,"gender":"F","address":"331 John Street","employer":"Gleamink","email":"johnsonchang@gleamink.com","city":"Sultana","state":"KS"}
-{"account_number":212,"balance":10299,"firstname":"Marisol","lastname":"Fischer","age":39,"gender":"M","address":"362 Prince Street","employer":"Autograte","email":"marisolfischer@autograte.com","city":"Oley","state":"SC"}
-{"account_number":217,"balance":33730,"firstname":"Sally","lastname":"Mccoy","age":38,"gender":"F","address":"854 Corbin Place","employer":"Omnigog","email":"sallymccoy@omnigog.com","city":"Escondida","state":"FL"}
-{"account_number":224,"balance":42708,"firstname":"Billie","lastname":"Nixon","age":28,"gender":"F","address":"241 Kaufman Place","employer":"Xanide","email":"billienixon@xanide.com","city":"Chapin","state":"NY"}
-{"account_number":229,"balance":2740,"firstname":"Jana","lastname":"Hensley","age":30,"gender":"M","address":"176 Erasmus Street","employer":"Isotrack","email":"janahensley@isotrack.com","city":"Caledonia","state":"ME"}
-{"account_number":231,"balance":46180,"firstname":"Essie","lastname":"Clarke","age":34,"gender":"F","address":"308 Harbor Lane","employer":"Pharmacon","email":"essieclarke@pharmacon.com","city":"Fillmore","state":"MS"}
-{"account_number":236,"balance":41200,"firstname":"Suzanne","lastname":"Bird","age":39,"gender":"F","address":"219 Luquer Street","employer":"Imant","email":"suzannebird@imant.com","city":"Bainbridge","state":"NY"}
-{"account_number":243,"balance":29902,"firstname":"Evangelina","lastname":"Perez","age":20,"gender":"M","address":"787 Joval Court","employer":"Keengen","email":"evangelinaperez@keengen.com","city":"Mulberry","state":"SD"}
-{"account_number":248,"balance":49989,"firstname":"West","lastname":"England","age":36,"gender":"M","address":"717 Hendrickson Place","employer":"Obliq","email":"westengland@obliq.com","city":"Maury","state":"WA"}
-{"account_number":250,"balance":27893,"firstname":"Earlene","lastname":"Ellis","age":39,"gender":"F","address":"512 Bay Street","employer":"Codact","email":"earleneellis@codact.com","city":"Sunwest","state":"GA"}
-{"account_number":255,"balance":49339,"firstname":"Iva","lastname":"Rivers","age":38,"gender":"M","address":"470 Rost Place","employer":"Mantrix","email":"ivarivers@mantrix.com","city":"Disautel","state":"MD"}
-{"account_number":262,"balance":30289,"firstname":"Tameka","lastname":"Levine","age":36,"gender":"F","address":"815 Atlantic Avenue","employer":"Acium","email":"tamekalevine@acium.com","city":"Winchester","state":"SD"}
-{"account_number":267,"balance":42753,"firstname":"Weeks","lastname":"Castillo","age":21,"gender":"F","address":"526 Holt Court","employer":"Talendula","email":"weekscastillo@talendula.com","city":"Washington","state":"NV"}
-{"account_number":274,"balance":12104,"firstname":"Frieda","lastname":"House","age":33,"gender":"F","address":"171 Banker Street","employer":"Quonk","email":"friedahouse@quonk.com","city":"Aberdeen","state":"NJ"}
-{"account_number":279,"balance":15904,"firstname":"Chapman","lastname":"Hart","age":32,"gender":"F","address":"902 Bliss Terrace","employer":"Kongene","email":"chapmanhart@kongene.com","city":"Bradenville","state":"NJ"}
-{"account_number":281,"balance":39830,"firstname":"Bean","lastname":"Aguirre","age":20,"gender":"F","address":"133 Pilling Street","employer":"Amril","email":"beanaguirre@amril.com","city":"Waterview","state":"TX"}
-{"account_number":286,"balance":39063,"firstname":"Rosetta","lastname":"Turner","age":35,"gender":"M","address":"169 Jefferson Avenue","employer":"Spacewax","email":"rosettaturner@spacewax.com","city":"Stewart","state":"MO"}
-{"account_number":293,"balance":29867,"firstname":"Cruz","lastname":"Carver","age":28,"gender":"F","address":"465 Boerum Place","employer":"Vitricomp","email":"cruzcarver@vitricomp.com","city":"Crayne","state":"CO"}
-{"account_number":298,"balance":34334,"firstname":"Bullock","lastname":"Marsh","age":20,"gender":"M","address":"589 Virginia Place","employer":"Renovize","email":"bullockmarsh@renovize.com","city":"Coinjock","state":"UT"}
-{"account_number":301,"balance":16782,"firstname":"Minerva","lastname":"Graham","age":35,"gender":"M","address":"532 Harrison Place","employer":"Sureplex","email":"minervagraham@sureplex.com","city":"Belleview","state":"GA"}
-{"account_number":306,"balance":2171,"firstname":"Hensley","lastname":"Hardin","age":40,"gender":"M","address":"196 Maujer Street","employer":"Neocent","email":"hensleyhardin@neocent.com","city":"Reinerton","state":"HI"}
-{"account_number":313,"balance":34108,"firstname":"Alston","lastname":"Henderson","age":36,"gender":"F","address":"132 Prescott Place","employer":"Prosure","email":"alstonhenderson@prosure.com","city":"Worton","state":"IA"}
-{"account_number":318,"balance":8512,"firstname":"Nichole","lastname":"Pearson","age":34,"gender":"F","address":"656 Lacon Court","employer":"Yurture","email":"nicholepearson@yurture.com","city":"Juarez","state":"MO"}
-{"account_number":320,"balance":34521,"firstname":"Patti","lastname":"Brennan","age":37,"gender":"F","address":"870 Degraw Street","employer":"Cognicode","email":"pattibrennan@cognicode.com","city":"Torboy","state":"FL"}
-{"account_number":325,"balance":1956,"firstname":"Magdalena","lastname":"Simmons","age":25,"gender":"F","address":"681 Townsend Street","employer":"Geekosis","email":"magdalenasimmons@geekosis.com","city":"Sterling","state":"CA"}
-{"account_number":332,"balance":37770,"firstname":"Shepherd","lastname":"Davenport","age":28,"gender":"F","address":"586 Montague Terrace","employer":"Ecraze","email":"shepherddavenport@ecraze.com","city":"Accoville","state":"NM"}
-{"account_number":337,"balance":43432,"firstname":"Monroe","lastname":"Stafford","age":37,"gender":"F","address":"183 Seigel Street","employer":"Centuria","email":"monroestafford@centuria.com","city":"Camino","state":"DE"}
-{"account_number":344,"balance":42654,"firstname":"Sasha","lastname":"Baxter","age":35,"gender":"F","address":"700 Bedford Place","employer":"Callflex","email":"sashabaxter@callflex.com","city":"Campo","state":"MI"}
-{"account_number":349,"balance":24180,"firstname":"Allison","lastname":"Fitzpatrick","age":22,"gender":"F","address":"913 Arlington Avenue","employer":"Veraq","email":"allisonfitzpatrick@veraq.com","city":"Marbury","state":"TX"}
-{"account_number":351,"balance":47089,"firstname":"Hendrix","lastname":"Stephens","age":29,"gender":"M","address":"181 Beaver Street","employer":"Recrisys","email":"hendrixstephens@recrisys.com","city":"Denio","state":"OR"}
-{"account_number":356,"balance":34540,"firstname":"Lourdes","lastname":"Valdez","age":20,"gender":"F","address":"700 Anchorage Place","employer":"Interloo","email":"lourdesvaldez@interloo.com","city":"Goldfield","state":"OK"}
-{"account_number":363,"balance":34007,"firstname":"Peggy","lastname":"Bright","age":21,"gender":"M","address":"613 Engert Avenue","employer":"Inventure","email":"peggybright@inventure.com","city":"Chautauqua","state":"ME"}
-{"account_number":368,"balance":23535,"firstname":"Hooper","lastname":"Tyson","age":39,"gender":"M","address":"892 Taaffe Place","employer":"Zaggle","email":"hoopertyson@zaggle.com","city":"Nutrioso","state":"ME"}
-{"account_number":370,"balance":28499,"firstname":"Oneill","lastname":"Carney","age":25,"gender":"F","address":"773 Adelphi Street","employer":"Bedder","email":"oneillcarney@bedder.com","city":"Yorklyn","state":"FL"}
-{"account_number":375,"balance":23860,"firstname":"Phoebe","lastname":"Patton","age":25,"gender":"M","address":"564 Hale Avenue","employer":"Xoggle","email":"phoebepatton@xoggle.com","city":"Brule","state":"NM"}
-{"account_number":382,"balance":42061,"firstname":"Finley","lastname":"Singleton","age":37,"gender":"F","address":"407 Clay Street","employer":"Quarex","email":"finleysingleton@quarex.com","city":"Bedias","state":"LA"}
-{"account_number":387,"balance":35916,"firstname":"April","lastname":"Hill","age":29,"gender":"M","address":"818 Bayard Street","employer":"Kengen","email":"aprilhill@kengen.com","city":"Chloride","state":"NC"}
-{"account_number":394,"balance":6121,"firstname":"Lorrie","lastname":"Nunez","age":38,"gender":"M","address":"221 Ralph Avenue","employer":"Bullzone","email":"lorrienunez@bullzone.com","city":"Longoria","state":"ID"}
-{"account_number":399,"balance":32587,"firstname":"Carmela","lastname":"Franks","age":23,"gender":"M","address":"617 Dewey Place","employer":"Zensure","email":"carmelafranks@zensure.com","city":"Sanders","state":"DC"}
-{"account_number":402,"balance":1282,"firstname":"Pacheco","lastname":"Rosales","age":32,"gender":"M","address":"538 Pershing Loop","employer":"Circum","email":"pachecorosales@circum.com","city":"Elbert","state":"ID"}
-{"account_number":407,"balance":36417,"firstname":"Gilda","lastname":"Jacobson","age":29,"gender":"F","address":"883 Loring Avenue","employer":"Comveyor","email":"gildajacobson@comveyor.com","city":"Topaz","state":"NH"}
-{"account_number":414,"balance":17506,"firstname":"Conway","lastname":"Daugherty","age":37,"gender":"F","address":"643 Kermit Place","employer":"Lyria","email":"conwaydaugherty@lyria.com","city":"Vaughn","state":"NV"}
-{"account_number":419,"balance":34847,"firstname":"Helen","lastname":"Montoya","age":29,"gender":"F","address":"736 Kingsland Avenue","employer":"Hairport","email":"helenmontoya@hairport.com","city":"Edinburg","state":"NE"}
-{"account_number":421,"balance":46868,"firstname":"Tamika","lastname":"Mccall","age":27,"gender":"F","address":"764 Bragg Court","employer":"Eventix","email":"tamikamccall@eventix.com","city":"Tivoli","state":"RI"}
-{"account_number":426,"balance":4499,"firstname":"Julie","lastname":"Parsons","age":31,"gender":"M","address":"768 Keap Street","employer":"Goko","email":"julieparsons@goko.com","city":"Coldiron","state":"VA"}
-{"account_number":433,"balance":19266,"firstname":"Wilkinson","lastname":"Flowers","age":39,"gender":"M","address":"154 Douglass Street","employer":"Xsports","email":"wilkinsonflowers@xsports.com","city":"Coultervillle","state":"MN"}
-{"account_number":438,"balance":16367,"firstname":"Walter","lastname":"Velez","age":27,"gender":"F","address":"931 Farragut Road","employer":"Virva","email":"waltervelez@virva.com","city":"Tyro","state":"WV"}
-{"account_number":440,"balance":41590,"firstname":"Ray","lastname":"Wiley","age":31,"gender":"F","address":"102 Barwell Terrace","employer":"Polaria","email":"raywiley@polaria.com","city":"Hardyville","state":"IA"}
-{"account_number":445,"balance":41178,"firstname":"Rodriguez","lastname":"Macias","age":34,"gender":"M","address":"164 Boerum Street","employer":"Xylar","email":"rodriguezmacias@xylar.com","city":"Riner","state":"AL"}
-{"account_number":452,"balance":3589,"firstname":"Blackwell","lastname":"Delaney","age":39,"gender":"F","address":"443 Sackett Street","employer":"Imkan","email":"blackwelldelaney@imkan.com","city":"Gasquet","state":"DC"}
-{"account_number":457,"balance":14057,"firstname":"Bush","lastname":"Gordon","age":34,"gender":"M","address":"975 Dakota Place","employer":"Softmicro","email":"bushgordon@softmicro.com","city":"Chemung","state":"PA"}
-{"account_number":464,"balance":20504,"firstname":"Cobb","lastname":"Humphrey","age":21,"gender":"M","address":"823 Sunnyside Avenue","employer":"Apexia","email":"cobbhumphrey@apexia.com","city":"Wintersburg","state":"NY"}
-{"account_number":469,"balance":26509,"firstname":"Marci","lastname":"Shepherd","age":26,"gender":"M","address":"565 Hall Street","employer":"Shadease","email":"marcishepherd@shadease.com","city":"Springhill","state":"IL"}
-{"account_number":471,"balance":7629,"firstname":"Juana","lastname":"Silva","age":36,"gender":"M","address":"249 Amity Street","employer":"Artworlds","email":"juanasilva@artworlds.com","city":"Norfolk","state":"TX"}
-{"account_number":476,"balance":33386,"firstname":"Silva","lastname":"Marks","age":31,"gender":"F","address":"183 Eldert Street","employer":"Medifax","email":"silvamarks@medifax.com","city":"Hachita","state":"RI"}
-{"account_number":483,"balance":6344,"firstname":"Kelley","lastname":"Harper","age":29,"gender":"M","address":"758 Preston Court","employer":"Xyqag","email":"kelleyharper@xyqag.com","city":"Healy","state":"IA"}
-{"account_number":488,"balance":6289,"firstname":"Wilma","lastname":"Hopkins","age":38,"gender":"M","address":"428 Lee Avenue","employer":"Entality","email":"wilmahopkins@entality.com","city":"Englevale","state":"WI"}
-{"account_number":490,"balance":1447,"firstname":"Strong","lastname":"Hendrix","age":26,"gender":"F","address":"134 Beach Place","employer":"Duoflex","email":"stronghendrix@duoflex.com","city":"Allentown","state":"ND"}
-{"account_number":495,"balance":13478,"firstname":"Abigail","lastname":"Nichols","age":40,"gender":"F","address":"887 President Street","employer":"Enquility","email":"abigailnichols@enquility.com","city":"Bagtown","state":"NM"}
-{"account_number":503,"balance":42649,"firstname":"Leta","lastname":"Stout","age":39,"gender":"F","address":"518 Bowery Street","employer":"Pivitol","email":"letastout@pivitol.com","city":"Boonville","state":"ND"}
-{"account_number":508,"balance":41300,"firstname":"Lawrence","lastname":"Mathews","age":27,"gender":"F","address":"987 Rose Street","employer":"Deviltoe","email":"lawrencemathews@deviltoe.com","city":"Woodburn","state":"FL"}
-{"account_number":510,"balance":48504,"firstname":"Petty","lastname":"Sykes","age":28,"gender":"M","address":"566 Village Road","employer":"Nebulean","email":"pettysykes@nebulean.com","city":"Wedgewood","state":"MO"}
-{"account_number":515,"balance":18531,"firstname":"Lott","lastname":"Keller","age":27,"gender":"M","address":"827 Miami Court","employer":"Translink","email":"lottkeller@translink.com","city":"Gila","state":"TX"}
-{"account_number":522,"balance":19879,"firstname":"Faulkner","lastname":"Garrett","age":29,"gender":"F","address":"396 Grove Place","employer":"Pigzart","email":"faulknergarrett@pigzart.com","city":"Felt","state":"AR"}
-{"account_number":527,"balance":2028,"firstname":"Carver","lastname":"Peters","age":35,"gender":"M","address":"816 Victor Road","employer":"Housedown","email":"carverpeters@housedown.com","city":"Nadine","state":"MD"}
-{"account_number":534,"balance":20470,"firstname":"Cristina","lastname":"Russo","age":25,"gender":"F","address":"500 Highlawn Avenue","employer":"Cyclonica","email":"cristinarusso@cyclonica.com","city":"Gorst","state":"KS"}
-{"account_number":539,"balance":24560,"firstname":"Tami","lastname":"Maddox","age":23,"gender":"F","address":"741 Pineapple Street","employer":"Accidency","email":"tamimaddox@accidency.com","city":"Kennedyville","state":"OH"}
-{"account_number":541,"balance":42915,"firstname":"Logan","lastname":"Burke","age":32,"gender":"M","address":"904 Clarendon Road","employer":"Overplex","email":"loganburke@overplex.com","city":"Johnsonburg","state":"OH"}
-{"account_number":546,"balance":43242,"firstname":"Bernice","lastname":"Sims","age":33,"gender":"M","address":"382 Columbia Street","employer":"Verbus","email":"bernicesims@verbus.com","city":"Sena","state":"KY"}
-{"account_number":553,"balance":28390,"firstname":"Aimee","lastname":"Cohen","age":28,"gender":"M","address":"396 Lafayette Avenue","employer":"Eplode","email":"aimeecohen@eplode.com","city":"Thatcher","state":"NJ"}
-{"account_number":558,"balance":8922,"firstname":"Horne","lastname":"Valenzuela","age":20,"gender":"F","address":"979 Kensington Street","employer":"Isoternia","email":"hornevalenzuela@isoternia.com","city":"Greenbush","state":"NC"}
-{"account_number":560,"balance":24514,"firstname":"Felecia","lastname":"Oneill","age":26,"gender":"M","address":"995 Autumn Avenue","employer":"Mediot","email":"feleciaoneill@mediot.com","city":"Joppa","state":"IN"}
-{"account_number":565,"balance":15197,"firstname":"Taylor","lastname":"Ingram","age":37,"gender":"F","address":"113 Will Place","employer":"Lyrichord","email":"tayloringram@lyrichord.com","city":"Collins","state":"ME"}
-{"account_number":572,"balance":49355,"firstname":"Therese","lastname":"Espinoza","age":20,"gender":"M","address":"994 Chester Court","employer":"Gonkle","email":"thereseespinoza@gonkle.com","city":"Hayes","state":"UT"}
-{"account_number":577,"balance":21398,"firstname":"Gilbert","lastname":"Serrano","age":38,"gender":"F","address":"294 Troutman Street","employer":"Senmao","email":"gilbertserrano@senmao.com","city":"Greer","state":"MT"}
-{"account_number":584,"balance":5346,"firstname":"Pearson","lastname":"Bryant","age":40,"gender":"F","address":"971 Heyward Street","employer":"Anacho","email":"pearsonbryant@anacho.com","city":"Bluffview","state":"MN"}
-{"account_number":589,"balance":33260,"firstname":"Ericka","lastname":"Cote","age":39,"gender":"F","address":"425 Bath Avenue","employer":"Venoflex","email":"erickacote@venoflex.com","city":"Blue","state":"CT"}
-{"account_number":591,"balance":48997,"firstname":"Rivers","lastname":"Macdonald","age":34,"gender":"F","address":"919 Johnson Street","employer":"Ziore","email":"riversmacdonald@ziore.com","city":"Townsend","state":"IL"}
-{"account_number":596,"balance":4063,"firstname":"Letitia","lastname":"Walker","age":26,"gender":"F","address":"963 Vanderveer Place","employer":"Zizzle","email":"letitiawalker@zizzle.com","city":"Rossmore","state":"ID"}
-{"account_number":604,"balance":10675,"firstname":"Isabel","lastname":"Gilliam","age":23,"gender":"M","address":"854 Broadway ","employer":"Zenthall","email":"isabelgilliam@zenthall.com","city":"Ventress","state":"WI"}
-{"account_number":609,"balance":28586,"firstname":"Montgomery","lastname":"Washington","age":30,"gender":"M","address":"169 Schroeders Avenue","employer":"Kongle","email":"montgomerywashington@kongle.com","city":"Croom","state":"AZ"}
-{"account_number":611,"balance":17528,"firstname":"Katherine","lastname":"Prince","age":33,"gender":"F","address":"705 Elm Avenue","employer":"Zillacon","email":"katherineprince@zillacon.com","city":"Rew","state":"MI"}
-{"account_number":616,"balance":25276,"firstname":"Jessie","lastname":"Mayer","age":35,"gender":"F","address":"683 Chester Avenue","employer":"Emtrak","email":"jessiemayer@emtrak.com","city":"Marysville","state":"HI"}
-{"account_number":623,"balance":20514,"firstname":"Rose","lastname":"Combs","age":32,"gender":"F","address":"312 Grimes Road","employer":"Aquamate","email":"rosecombs@aquamate.com","city":"Fostoria","state":"OH"}
-{"account_number":628,"balance":42736,"firstname":"Buckner","lastname":"Chen","age":37,"gender":"M","address":"863 Rugby Road","employer":"Jamnation","email":"bucknerchen@jamnation.com","city":"Camas","state":"TX"}
-{"account_number":630,"balance":46060,"firstname":"Leanne","lastname":"Jones","age":31,"gender":"M","address":"451 Bayview Avenue","employer":"Wazzu","email":"leannejones@wazzu.com","city":"Kylertown","state":"OK"}
-{"account_number":635,"balance":44705,"firstname":"Norman","lastname":"Gilmore","age":33,"gender":"M","address":"330 Gates Avenue","employer":"Comfirm","email":"normangilmore@comfirm.com","city":"Riceville","state":"TN"}
-{"account_number":642,"balance":32852,"firstname":"Reyna","lastname":"Harris","age":35,"gender":"M","address":"305 Powell Street","employer":"Bedlam","email":"reynaharris@bedlam.com","city":"Florence","state":"KS"}
-{"account_number":647,"balance":10147,"firstname":"Annabelle","lastname":"Velazquez","age":30,"gender":"M","address":"299 Kensington Walk","employer":"Sealoud","email":"annabellevelazquez@sealoud.com","city":"Soudan","state":"ME"}
-{"account_number":654,"balance":38695,"firstname":"Armstrong","lastname":"Frazier","age":25,"gender":"M","address":"899 Seeley Street","employer":"Zensor","email":"armstrongfrazier@zensor.com","city":"Cherokee","state":"UT"}
-{"account_number":659,"balance":29648,"firstname":"Dorsey","lastname":"Sosa","age":40,"gender":"M","address":"270 Aberdeen Street","employer":"Daycore","email":"dorseysosa@daycore.com","city":"Chamberino","state":"SC"}
-{"account_number":661,"balance":3679,"firstname":"Joanne","lastname":"Spencer","age":39,"gender":"F","address":"910 Montauk Avenue","employer":"Visalia","email":"joannespencer@visalia.com","city":"Valmy","state":"NH"}
-{"account_number":666,"balance":13880,"firstname":"Mcguire","lastname":"Lloyd","age":40,"gender":"F","address":"658 Just Court","employer":"Centrexin","email":"mcguirelloyd@centrexin.com","city":"Warren","state":"MT"}
-{"account_number":673,"balance":11303,"firstname":"Mcdaniel","lastname":"Harrell","age":33,"gender":"M","address":"565 Montgomery Place","employer":"Eyeris","email":"mcdanielharrell@eyeris.com","city":"Garnet","state":"NV"}
-{"account_number":678,"balance":43663,"firstname":"Ruby","lastname":"Shaffer","age":28,"gender":"M","address":"350 Clark Street","employer":"Comtrail","email":"rubyshaffer@comtrail.com","city":"Aurora","state":"MA"}
-{"account_number":680,"balance":31561,"firstname":"Melton","lastname":"Camacho","age":32,"gender":"F","address":"771 Montana Place","employer":"Insuresys","email":"meltoncamacho@insuresys.com","city":"Sparkill","state":"IN"}
-{"account_number":685,"balance":22249,"firstname":"Yesenia","lastname":"Rowland","age":24,"gender":"F","address":"193 Dekalb Avenue","employer":"Coriander","email":"yeseniarowland@coriander.com","city":"Lupton","state":"NC"}
-{"account_number":692,"balance":10435,"firstname":"Haney","lastname":"Barlow","age":21,"gender":"F","address":"267 Lenox Road","employer":"Egypto","email":"haneybarlow@egypto.com","city":"Detroit","state":"IN"}
-{"account_number":697,"balance":48745,"firstname":"Mallory","lastname":"Emerson","age":24,"gender":"F","address":"318 Dunne Court","employer":"Exoplode","email":"malloryemerson@exoplode.com","city":"Montura","state":"LA"}
-{"account_number":700,"balance":19164,"firstname":"Patel","lastname":"Durham","age":21,"gender":"F","address":"440 King Street","employer":"Icology","email":"pateldurham@icology.com","city":"Mammoth","state":"IL"}
-{"account_number":705,"balance":28415,"firstname":"Krystal","lastname":"Cross","age":22,"gender":"M","address":"604 Drew Street","employer":"Tubesys","email":"krystalcross@tubesys.com","city":"Dalton","state":"MO"}
-{"account_number":712,"balance":12459,"firstname":"Butler","lastname":"Alston","age":37,"gender":"M","address":"486 Hemlock Street","employer":"Quordate","email":"butleralston@quordate.com","city":"Verdi","state":"MS"}
-{"account_number":717,"balance":29270,"firstname":"Erickson","lastname":"Mcdonald","age":31,"gender":"M","address":"873 Franklin Street","employer":"Exotechno","email":"ericksonmcdonald@exotechno.com","city":"Jessie","state":"MS"}
-{"account_number":724,"balance":12548,"firstname":"Hopper","lastname":"Peck","age":31,"gender":"M","address":"849 Hendrickson Street","employer":"Uxmox","email":"hopperpeck@uxmox.com","city":"Faxon","state":"UT"}
-{"account_number":729,"balance":41812,"firstname":"Katy","lastname":"Rivera","age":36,"gender":"F","address":"791 Olive Street","employer":"Blurrybus","email":"katyrivera@blurrybus.com","city":"Innsbrook","state":"MI"}
-{"account_number":731,"balance":4994,"firstname":"Lorene","lastname":"Weiss","age":35,"gender":"M","address":"990 Ocean Court","employer":"Comvoy","email":"loreneweiss@comvoy.com","city":"Lavalette","state":"WI"}
-{"account_number":736,"balance":28677,"firstname":"Rogers","lastname":"Mcmahon","age":21,"gender":"F","address":"423 Cameron Court","employer":"Brainclip","email":"rogersmcmahon@brainclip.com","city":"Saddlebrooke","state":"FL"}
-{"account_number":743,"balance":14077,"firstname":"Susana","lastname":"Moody","age":23,"gender":"M","address":"842 Fountain Avenue","employer":"Bitrex","email":"susanamoody@bitrex.com","city":"Temperanceville","state":"TN"}
-{"account_number":748,"balance":38060,"firstname":"Ford","lastname":"Branch","age":25,"gender":"M","address":"926 Cypress Avenue","employer":"Buzzness","email":"fordbranch@buzzness.com","city":"Beason","state":"DC"}
-{"account_number":750,"balance":40481,"firstname":"Cherie","lastname":"Brooks","age":20,"gender":"F","address":"601 Woodhull Street","employer":"Kaggle","email":"cheriebrooks@kaggle.com","city":"Groton","state":"MA"}
-{"account_number":755,"balance":43878,"firstname":"Bartlett","lastname":"Conway","age":22,"gender":"M","address":"453 Times Placez","employer":"Konnect","email":"bartlettconway@konnect.com","city":"Belva","state":"VT"}
-{"account_number":762,"balance":10291,"firstname":"Amanda","lastname":"Head","age":20,"gender":"F","address":"990 Ocean Parkway","employer":"Zentury","email":"amandahead@zentury.com","city":"Hegins","state":"AR"}
-{"account_number":767,"balance":26220,"firstname":"Anthony","lastname":"Sutton","age":27,"gender":"F","address":"179 Fayette Street","employer":"Xiix","email":"anthonysutton@xiix.com","city":"Iberia","state":"TN"}
-{"account_number":774,"balance":35287,"firstname":"Lynnette","lastname":"Alvarez","age":38,"gender":"F","address":"991 Brightwater Avenue","employer":"Gink","email":"lynnettealvarez@gink.com","city":"Leola","state":"NC"}
-{"account_number":779,"balance":40983,"firstname":"Maggie","lastname":"Pace","age":32,"gender":"F","address":"104 Harbor Court","employer":"Bulljuice","email":"maggiepace@bulljuice.com","city":"Floris","state":"MA"}
-{"account_number":781,"balance":29961,"firstname":"Sanford","lastname":"Mullen","age":26,"gender":"F","address":"879 Dover Street","employer":"Zanity","email":"sanfordmullen@zanity.com","city":"Martinez","state":"TX"}
-{"account_number":786,"balance":3024,"firstname":"Rene","lastname":"Vang","age":33,"gender":"M","address":"506 Randolph Street","employer":"Isopop","email":"renevang@isopop.com","city":"Vienna","state":"NJ"}
-{"account_number":793,"balance":16911,"firstname":"Alford","lastname":"Compton","age":36,"gender":"M","address":"186 Veronica Place","employer":"Zyple","email":"alfordcompton@zyple.com","city":"Sugartown","state":"AK"}
-{"account_number":798,"balance":3165,"firstname":"Catherine","lastname":"Ward","age":30,"gender":"F","address":"325 Burnett Street","employer":"Dreamia","email":"catherineward@dreamia.com","city":"Glenbrook","state":"SD"}
-{"account_number":801,"balance":14954,"firstname":"Molly","lastname":"Maldonado","age":37,"gender":"M","address":"518 Maple Avenue","employer":"Straloy","email":"mollymaldonado@straloy.com","city":"Hebron","state":"WI"}
-{"account_number":806,"balance":36492,"firstname":"Carson","lastname":"Riddle","age":31,"gender":"M","address":"984 Lois Avenue","employer":"Terrago","email":"carsonriddle@terrago.com","city":"Leland","state":"MN"}
-{"account_number":813,"balance":30833,"firstname":"Ebony","lastname":"Bishop","age":20,"gender":"M","address":"487 Ridge Court","employer":"Optique","email":"ebonybishop@optique.com","city":"Fairmount","state":"WA"}
-{"account_number":818,"balance":24433,"firstname":"Espinoza","lastname":"Petersen","age":26,"gender":"M","address":"641 Glenwood Road","employer":"Futurity","email":"espinozapetersen@futurity.com","city":"Floriston","state":"MD"}
-{"account_number":820,"balance":1011,"firstname":"Shepard","lastname":"Ramsey","age":24,"gender":"F","address":"806 Village Court","employer":"Mantro","email":"shepardramsey@mantro.com","city":"Tibbie","state":"NV"}
-{"account_number":825,"balance":49000,"firstname":"Terra","lastname":"Witt","age":21,"gender":"F","address":"590 Conway Street","employer":"Insectus","email":"terrawitt@insectus.com","city":"Forbestown","state":"AR"}
-{"account_number":832,"balance":8582,"firstname":"Laura","lastname":"Gibbs","age":39,"gender":"F","address":"511 Osborn Street","employer":"Corepan","email":"lauragibbs@corepan.com","city":"Worcester","state":"KS"}
-{"account_number":837,"balance":14485,"firstname":"Amy","lastname":"Villarreal","age":35,"gender":"M","address":"381 Stillwell Place","employer":"Fleetmix","email":"amyvillarreal@fleetmix.com","city":"Sanford","state":"IA"}
-{"account_number":844,"balance":26840,"firstname":"Jill","lastname":"David","age":31,"gender":"M","address":"346 Legion Street","employer":"Zytrax","email":"jilldavid@zytrax.com","city":"Saticoy","state":"SC"}
-{"account_number":849,"balance":16200,"firstname":"Barry","lastname":"Chapman","age":26,"gender":"M","address":"931 Dekoven Court","employer":"Darwinium","email":"barrychapman@darwinium.com","city":"Whitestone","state":"WY"}
-{"account_number":851,"balance":22026,"firstname":"Henderson","lastname":"Price","age":33,"gender":"F","address":"530 Hausman Street","employer":"Plutorque","email":"hendersonprice@plutorque.com","city":"Brutus","state":"RI"}
-{"account_number":856,"balance":27583,"firstname":"Alissa","lastname":"Knox","age":25,"gender":"M","address":"258 Empire Boulevard","employer":"Geologix","email":"alissaknox@geologix.com","city":"Hartsville/Hartley","state":"MN"}
-{"account_number":863,"balance":23165,"firstname":"Melendez","lastname":"Fernandez","age":40,"gender":"M","address":"661 Johnson Avenue","employer":"Vixo","email":"melendezfernandez@vixo.com","city":"Farmers","state":"IL"}
-{"account_number":868,"balance":27624,"firstname":"Polly","lastname":"Barron","age":22,"gender":"M","address":"129 Frank Court","employer":"Geofarm","email":"pollybarron@geofarm.com","city":"Loyalhanna","state":"ND"}
-{"account_number":870,"balance":43882,"firstname":"Goff","lastname":"Phelps","age":21,"gender":"M","address":"164 Montague Street","employer":"Digigen","email":"goffphelps@digigen.com","city":"Weedville","state":"IL"}
-{"account_number":875,"balance":19655,"firstname":"Mercer","lastname":"Pratt","age":24,"gender":"M","address":"608 Perry Place","employer":"Twiggery","email":"mercerpratt@twiggery.com","city":"Eggertsville","state":"MO"}
-{"account_number":882,"balance":10895,"firstname":"Mari","lastname":"Landry","age":39,"gender":"M","address":"963 Gerald Court","employer":"Kenegy","email":"marilandry@kenegy.com","city":"Lithium","state":"NC"}
-{"account_number":887,"balance":31772,"firstname":"Eunice","lastname":"Watts","age":36,"gender":"F","address":"707 Stuyvesant Avenue","employer":"Memora","email":"eunicewatts@memora.com","city":"Westwood","state":"TN"}
-{"account_number":894,"balance":1031,"firstname":"Tyler","lastname":"Fitzgerald","age":32,"gender":"M","address":"787 Meserole Street","employer":"Jetsilk","email":"tylerfitzgerald@jetsilk.com","city":"Woodlands","state":"WV"}
-{"account_number":899,"balance":32953,"firstname":"Carney","lastname":"Callahan","age":23,"gender":"M","address":"724 Kimball Street","employer":"Mangelica","email":"carneycallahan@mangelica.com","city":"Tecolotito","state":"MT"}
-{"account_number":902,"balance":13345,"firstname":"Hallie","lastname":"Jarvis","age":23,"gender":"F","address":"237 Duryea Court","employer":"Anixang","email":"halliejarvis@anixang.com","city":"Boykin","state":"IN"}
-{"account_number":907,"balance":12961,"firstname":"Ingram","lastname":"William","age":36,"gender":"M","address":"826 Overbaugh Place","employer":"Genmex","email":"ingramwilliam@genmex.com","city":"Kimmell","state":"AK"}
-{"account_number":914,"balance":7120,"firstname":"Esther","lastname":"Bean","age":32,"gender":"F","address":"583 Macon Street","employer":"Applica","email":"estherbean@applica.com","city":"Homeworth","state":"MN"}
-{"account_number":919,"balance":39655,"firstname":"Shauna","lastname":"Hanson","age":27,"gender":"M","address":"557 Hart Place","employer":"Exospace","email":"shaunahanson@exospace.com","city":"Outlook","state":"LA"}
-{"account_number":921,"balance":49119,"firstname":"Barbara","lastname":"Wade","age":29,"gender":"M","address":"687 Hoyts Lane","employer":"Roughies","email":"barbarawade@roughies.com","city":"Sattley","state":"CO"}
-{"account_number":926,"balance":49433,"firstname":"Welch","lastname":"Mcgowan","age":21,"gender":"M","address":"833 Quincy Street","employer":"Atomica","email":"welchmcgowan@atomica.com","city":"Hampstead","state":"VT"}
-{"account_number":933,"balance":18071,"firstname":"Tabitha","lastname":"Cole","age":21,"gender":"F","address":"916 Rogers Avenue","employer":"Eclipto","email":"tabithacole@eclipto.com","city":"Lawrence","state":"TX"}
-{"account_number":938,"balance":9597,"firstname":"Sharron","lastname":"Santos","age":40,"gender":"F","address":"215 Matthews Place","employer":"Zenco","email":"sharronsantos@zenco.com","city":"Wattsville","state":"VT"}
-{"account_number":940,"balance":23285,"firstname":"Melinda","lastname":"Mendoza","age":38,"gender":"M","address":"806 Kossuth Place","employer":"Kneedles","email":"melindamendoza@kneedles.com","city":"Coaldale","state":"OK"}
-{"account_number":945,"balance":23085,"firstname":"Hansen","lastname":"Hebert","age":33,"gender":"F","address":"287 Conduit Boulevard","employer":"Capscreen","email":"hansenhebert@capscreen.com","city":"Taycheedah","state":"AK"}
-{"account_number":952,"balance":21430,"firstname":"Angelique","lastname":"Weeks","age":33,"gender":"M","address":"659 Reeve Place","employer":"Exodoc","email":"angeliqueweeks@exodoc.com","city":"Turpin","state":"MD"}
-{"account_number":957,"balance":11373,"firstname":"Michael","lastname":"Giles","age":31,"gender":"M","address":"668 Court Square","employer":"Yogasm","email":"michaelgiles@yogasm.com","city":"Rosburg","state":"WV"}
-{"account_number":964,"balance":26154,"firstname":"Elena","lastname":"Waller","age":34,"gender":"F","address":"618 Crystal Street","employer":"Insurety","email":"elenawaller@insurety.com","city":"Gallina","state":"NY"}
-{"account_number":969,"balance":22214,"firstname":"Briggs","lastname":"Lynn","age":30,"gender":"M","address":"952 Lester Court","employer":"Quinex","email":"briggslynn@quinex.com","city":"Roland","state":"ID"}
-{"account_number":971,"balance":22772,"firstname":"Gabrielle","lastname":"Reilly","age":32,"gender":"F","address":"964 Tudor Terrace","employer":"Blanet","email":"gabriellereilly@blanet.com","city":"Falmouth","state":"AL"}
-{"account_number":976,"balance":31707,"firstname":"Mullen","lastname":"Tanner","age":26,"gender":"M","address":"711 Whitney Avenue","employer":"Pulze","email":"mullentanner@pulze.com","city":"Mooresburg","state":"MA"}
-{"account_number":983,"balance":47205,"firstname":"Mattie","lastname":"Eaton","age":24,"gender":"F","address":"418 Allen Avenue","employer":"Trasola","email":"mattieeaton@trasola.com","city":"Dupuyer","state":"NJ"}
-{"account_number":988,"balance":17803,"firstname":"Lucy","lastname":"Castro","age":34,"gender":"F","address":"425 Fleet Walk","employer":"Geekfarm","email":"lucycastro@geekfarm.com","city":"Mulino","state":"VA"}
-{"account_number":990,"balance":44456,"firstname":"Kelly","lastname":"Steele","age":35,"gender":"M","address":"809 Hoyt Street","employer":"Eschoir","email":"kellysteele@eschoir.com","city":"Stewartville","state":"ID"}
-{"account_number":995,"balance":21153,"firstname":"Phelps","lastname":"Parrish","age":25,"gender":"M","address":"666 Miller Place","employer":"Pearlessa","email":"phelpsparrish@pearlessa.com","city":"Brecon","state":"ME"}
diff --git a/sql-cli/tests/test_formatter.py b/sql-cli/tests/test_formatter.py
deleted file mode 100644
index 7c322b99c8..0000000000
--- a/sql-cli/tests/test_formatter.py
+++ /dev/null
@@ -1,200 +0,0 @@
-from __future__ import unicode_literals, print_function
-
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-
-import mock
-import pytest
-from collections import namedtuple
-
-from src.opensearch_sql_cli.opensearchsql_cli import OpenSearchSqlCli, COLOR_CODE_REGEX
-from src.opensearch_sql_cli.formatter import Formatter
-from src.opensearch_sql_cli.utils import OutputSettings
-
-
-class TestFormatter:
-    @pytest.fixture
-    def pset_pager_mocks(self):
-        cli = OpenSearchSqlCli()
-        with mock.patch("src.opensearch_sql_cli.main.click.echo") as mock_echo, mock.patch(
-            "src.opensearch_sql_cli.main.click.echo_via_pager"
-        ) as mock_echo_via_pager, mock.patch.object(cli, "prompt_app") as mock_app:
-            yield cli, mock_echo, mock_echo_via_pager, mock_app
-
-    termsize = namedtuple("termsize", ["rows", "columns"])
-    test_line = "-" * 10
-    test_data = [
-        (10, 10, "\n".join([test_line] * 7)),
-        (10, 10, "\n".join([test_line] * 6)),
-        (10, 10, "\n".join([test_line] * 5)),
-        (10, 10, "-" * 11),
-        (10, 10, "-" * 10),
-        (10, 10, "-" * 9),
-    ]
-
-    use_pager_when_on = [True, True, False, True, False, False]
-
-    test_ids = [
-        "Output longer than terminal height",
-        "Output equal to terminal height",
-        "Output shorter than terminal height",
-        "Output longer than terminal width",
-        "Output equal to terminal width",
-        "Output shorter than terminal width",
-    ]
-
-    pager_test_data = [l + (r,) for l, r in zip(test_data, use_pager_when_on)]
-
-    def test_format_output(self):
-        settings = OutputSettings(table_format="psql")
-        formatter = Formatter(settings)
-        data = {
-            "schema": [{"name": "name", "type": "text"}, {"name": "age", "type": "long"}],
-            "total": 1,
-            "datarows": [["Tim", 24]],
-            "size": 1,
-            "status": 200,
-        }
-
-        results = formatter.format_output(data)
-
-        expected = [
-            "fetched rows / total rows = 1/1",
-            "+--------+-------+",
-            "| name   | age   |",
-            "|--------+-------|",
-            "| Tim    | 24    |",
-            "+--------+-------+",
-        ]
-        assert list(results) == expected
-
-    def test_format_alias_output(self):
-        settings = OutputSettings(table_format="psql")
-        formatter = Formatter(settings)
-        data = {
-            "schema": [{"name": "name", "alias": "n", "type": "text"}],
-            "total": 1,
-            "datarows": [["Tim"]],
-            "size": 1,
-            "status": 200,
-        }
-
-        results = formatter.format_output(data)
-
-        expected = [
-            "fetched rows / total rows = 1/1",
-            "+-----+",
-            "| n   |",
-            "|-----|",
-            "| Tim |",
-            "+-----+",
-        ]
-        assert list(results) == expected
-
-    def test_format_array_output(self):
-        settings = OutputSettings(table_format="psql")
-        formatter = Formatter(settings)
-        data = {
-            "schema": [{"name": "name", "type": "text"}, {"name": "age", "type": "long"}],
-            "total": 1,
-            "datarows": [["Tim", [24, 25]]],
-            "size": 1,
-            "status": 200,
-        }
-
-        results = formatter.format_output(data)
-
-        expected = [
-            "fetched rows / total rows = 1/1",
-            "+--------+---------+",
-            "| name   | age     |",
-            "|--------+---------|",
-            "| Tim    | [24,25] |",
-            "+--------+---------+",
-        ]
-        assert list(results) == expected
-
-    def test_format_output_vertical(self):
-        settings = OutputSettings(table_format="psql", max_width=1)
-        formatter = Formatter(settings)
-        data = {
-            "schema": [{"name": "name", "type": "text"}, {"name": "age", "type": "long"}],
-            "total": 1,
-            "datarows": [["Tim", 24]],
-            "size": 1,
-            "status": 200,
-        }
-
-        expanded = [
-            "fetched rows / total rows = 1/1",
-            "-[ RECORD 1 ]-------------------------",
-            "name | Tim",
-            "age  | 24",
-        ]
-
-        with mock.patch("src.opensearch_sql_cli.main.click.secho") as mock_secho, mock.patch(
-            "src.opensearch_sql_cli.main.click.confirm"
-        ) as mock_confirm:
-            expanded_results = formatter.format_output(data)
-
-        mock_secho.assert_called_with(message="Output longer than terminal width", fg="red")
-        mock_confirm.assert_called_with("Do you want to display data vertically for better visual effect?")
-
-        assert "\n".join(expanded_results) == "\n".join(expanded)
-
-    def test_fake_large_output(self):
-        settings = OutputSettings(table_format="psql")
-        formatter = Formatter(settings)
-        fake_large_data = {
-            "schema": [{"name": "name", "type": "text"}, {"name": "age", "type": "long"}],
-            "total": 1000,
-            "datarows": [["Tim", [24, 25]]],
-            "size": 200,
-            "status": 200,
-        }
-
-        results = formatter.format_output(fake_large_data)
-
-        expected = [
-            "fetched rows / total rows = 200/1000\n"
-            "Attention: Use LIMIT keyword when retrieving more than 200 rows of data",
-            "+--------+---------+",
-            "| name   | age     |",
-            "|--------+---------|",
-            "| Tim    | [24,25] |",
-            "+--------+---------+",
-        ]
-        assert list(results) == expected
-
-    @pytest.mark.parametrize("term_height,term_width,text,use_pager", pager_test_data, ids=test_ids)
-    def test_pager(self, term_height, term_width, text, use_pager, pset_pager_mocks):
-        cli, mock_echo, mock_echo_via_pager, mock_cli = pset_pager_mocks
-        mock_cli.output.get_size.return_value = self.termsize(rows=term_height, columns=term_width)
-
-        cli.echo_via_pager(text)
-
-        if use_pager:
-            mock_echo.assert_not_called()
-            mock_echo_via_pager.assert_called()
-        else:
-            mock_echo_via_pager.assert_not_called()
-            mock_echo.assert_called()
-
-    @pytest.mark.parametrize(
-        "text,expected_length",
-        [
-            (
-                "22200K .......\u001b[0m\u001b[91m... .......... ...\u001b[0m\u001b[91m.\u001b[0m\u001b[91m...... "
-                ".........\u001b[0m\u001b[91m.\u001b[0m\u001b[91m \u001b[0m\u001b[91m.\u001b[0m\u001b[91m.\u001b["
-                "0m\u001b[91m.\u001b[0m\u001b[91m.\u001b[0m\u001b[91m...... 50% 28.6K 12m55s",
-                78,
-            ),
-            ("=\u001b[m=", 2),
-            ("-\u001b]23\u0007-", 2),
-        ],
-    )
-    def test_color_pattern(self, text, expected_length):
-        assert len(COLOR_CODE_REGEX.sub("", text)) == expected_length
diff --git a/sql-cli/tests/test_main.py b/sql-cli/tests/test_main.py
deleted file mode 100644
index 1e07eef43c..0000000000
--- a/sql-cli/tests/test_main.py
+++ /dev/null
@@ -1,81 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-import mock
-from textwrap import dedent
-
-from click.testing import CliRunner
-
-from .utils import estest, load_data, TEST_INDEX_NAME
-from src.opensearch_sql_cli.main import cli
-from src.opensearch_sql_cli.opensearchsql_cli import OpenSearchSqlCli
-
-INVALID_ENDPOINT = "http://invalid:9200"
-ENDPOINT = "http://localhost:9200"
-QUERY = "select * from %s" % TEST_INDEX_NAME
-
-
-class TestMain:
-    @estest
-    def test_explain(self, connection):
-        doc = {"a": "aws"}
-        load_data(connection, doc)
-
-        err_message = "Can not connect to endpoint %s" % INVALID_ENDPOINT
-        expected_output = {
-            "root": {
-                "name": "ProjectOperator",
-                "description": {"fields": "[a]"},
-                "children": [
-                    {
-                        "name": "OpenSearchIndexScan",
-                        "description": {
-                            "request": 'OpenSearchQueryRequest(indexName=opensearchsql_cli_test, sourceBuilder={"from":0,"size":200,"timeout":"1m","_source":{"includes":["a"],"excludes":[]}}, searchDone=false)'
-                        },
-                        "children": [],
-                    }
-                ],
-            }
-        }
-        expected_tabular_output = dedent(
-            """\
-            fetched rows / total rows = 1/1
-            +-----+
-            | a   |
-            |-----|
-            | aws |
-            +-----+"""
-        )
-
-        with mock.patch("src.opensearch_sql_cli.main.click.echo") as mock_echo, mock.patch(
-            "src.opensearch_sql_cli.main.click.secho"
-        ) as mock_secho:
-            runner = CliRunner()
-
-            # test -q -e
-            result = runner.invoke(cli, [f"-q{QUERY}", "-e"])
-            mock_echo.assert_called_with(expected_output)
-            assert result.exit_code == 0
-
-            # test -q
-            result = runner.invoke(cli, [f"-q{QUERY}"])
-            mock_echo.assert_called_with(expected_tabular_output)
-            assert result.exit_code == 0
-
-            # test invalid endpoint
-            runner.invoke(cli, [INVALID_ENDPOINT, f"-q{QUERY}", "-e"])
-            mock_secho.assert_called_with(message=err_message, fg="red")
-
-    @estest
-    def test_cli(self):
-        with mock.patch.object(OpenSearchSqlCli, "connect") as mock_connect, mock.patch.object(
-            OpenSearchSqlCli, "run_cli"
-        ) as mock_run_cli:
-            runner = CliRunner()
-            result = runner.invoke(cli)
-
-            mock_connect.assert_called_with(ENDPOINT, None)
-            mock_run_cli.asset_called()
-            assert result.exit_code == 0
diff --git a/sql-cli/tests/test_opensearch_connection.py b/sql-cli/tests/test_opensearch_connection.py
deleted file mode 100644
index 75740881c4..0000000000
--- a/sql-cli/tests/test_opensearch_connection.py
+++ /dev/null
@@ -1,146 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-import pytest
-import mock
-from textwrap import dedent
-
-from opensearchpy.exceptions import ConnectionError
-from opensearchpy import OpenSearch, RequestsHttpConnection
-
-from .utils import estest, load_data, run, TEST_INDEX_NAME
-from src.opensearch_sql_cli.opensearch_connection import OpenSearchConnection
-
-INVALID_ENDPOINT = "http://invalid:9200"
-OPENSEARCH_ENDPOINT = "https://opensearch:9200"
-AES_ENDPOINT = "https://fake.es.amazonaws.com"
-AUTH = ("username", "password")
-
-
-class TestExecutor:
-    def load_data_to_es(self, connection):
-        doc = {"a": "aws"}
-        load_data(connection, doc)
-
-    @estest
-    def test_query(self, connection):
-        self.load_data_to_es(connection)
-
-        assert run(connection, "select * from %s" % TEST_INDEX_NAME) == dedent(
-            """\
-            fetched rows / total rows = 1/1
-            +-----+
-            | a   |
-            |-----|
-            | aws |
-            +-----+"""
-        )
-
-    @estest
-    @pytest.mark.skip(reason="Test is not compatible with OpenSearch >= 2.3.0, it returns HTTP/503 instead of HTTP/400")
-    def test_query_nonexistent_index(self, connection):
-        self.load_data_to_es(connection)
-
-        expected = {
-            "reason": "Error occurred in OpenSearch engine: no such index [non-existed]",
-            "details": "org.opensearch.index.IndexNotFoundException: no such index [non-existed]\nFor more "
-            "details, please send request for Json format to see the raw response from OpenSearch "
-            "engine.",
-            "type": "IndexNotFoundException",
-        }
-
-        with mock.patch("src.opensearch_sql_cli.opensearch_connection.click.secho") as mock_secho:
-            run(connection, "select * from non-existed")
-
-        mock_secho.assert_called_with(message=str(expected), fg="red")
-
-    def test_connection_fail(self):
-        test_executor = OpenSearchConnection(endpoint=INVALID_ENDPOINT)
-        err_message = "Can not connect to endpoint %s" % INVALID_ENDPOINT
-
-        with mock.patch("sys.exit") as mock_sys_exit, mock.patch(
-            "src.opensearch_sql_cli.opensearch_connection.click.secho"
-        ) as mock_secho:
-            test_executor.set_connection()
-
-        mock_sys_exit.assert_called()
-        mock_secho.assert_called_with(message=err_message, fg="red")
-
-    def test_lost_connection(self):
-        test_esexecutor = OpenSearchConnection(endpoint=INVALID_ENDPOINT)
-
-        def side_effect_set_connection(is_reconnected):
-            if is_reconnected:
-                pass
-            else:
-                return ConnectionError()
-
-        with mock.patch("src.opensearch_sql_cli.opensearch_connection.click.secho") as mock_secho, mock.patch.object(
-            test_esexecutor, "set_connection"
-        ) as mock_set_connection:
-            # Assume reconnection success
-            mock_set_connection.side_effect = side_effect_set_connection(is_reconnected=True)
-            test_esexecutor.handle_server_close_connection()
-
-            mock_secho.assert_any_call(message="Reconnecting...", fg="green")
-            mock_secho.assert_any_call(message="Reconnected! Please run query again", fg="green")
-            # Assume reconnection fail
-            mock_set_connection.side_effect = side_effect_set_connection(is_reconnected=False)
-            test_esexecutor.handle_server_close_connection()
-
-            mock_secho.assert_any_call(message="Reconnecting...", fg="green")
-            mock_secho.assert_any_call(
-                message="Connection Failed. Check your OpenSearch is running and then come back", fg="red"
-            )
-
-    def test_reconnection_exception(self):
-        test_executor = OpenSearchConnection(endpoint=INVALID_ENDPOINT)
-
-        with pytest.raises(ConnectionError) as error:
-            assert test_executor.set_connection(True)
-
-    def test_select_client(self):
-        od_test_executor = OpenSearchConnection(endpoint=OPENSEARCH_ENDPOINT, http_auth=AUTH)
-        aes_test_executor = OpenSearchConnection(endpoint=AES_ENDPOINT, use_aws_authentication=True)
-
-        with mock.patch.object(od_test_executor, "get_opensearch_client") as mock_od_client, mock.patch.object(
-            OpenSearchConnection, "is_sql_plugin_installed", return_value=True
-        ):
-            od_test_executor.set_connection()
-            mock_od_client.assert_called()
-
-        with mock.patch.object(aes_test_executor, "get_aes_client") as mock_aes_client, mock.patch.object(
-            OpenSearchConnection, "is_sql_plugin_installed", return_value=True
-        ):
-            aes_test_executor.set_connection()
-            mock_aes_client.assert_called()
-
-    def test_get_od_client(self):
-        od_test_executor = OpenSearchConnection(endpoint=OPENSEARCH_ENDPOINT, http_auth=AUTH)
-
-        with mock.patch.object(OpenSearch, "__init__", return_value=None) as mock_es:
-            od_test_executor.get_opensearch_client()
-
-            mock_es.assert_called_with(
-                [OPENSEARCH_ENDPOINT],
-                http_auth=AUTH,
-                verify_certs=False,
-                ssl_context=od_test_executor.ssl_context,
-                connection_class=RequestsHttpConnection,
-            )
-
-    def test_get_aes_client(self):
-        aes_test_executor = OpenSearchConnection(endpoint=AES_ENDPOINT, use_aws_authentication=True)
-
-        with mock.patch.object(OpenSearch, "__init__", return_value=None) as mock_es:
-            aes_test_executor.get_aes_client()
-
-            mock_es.assert_called_with(
-                hosts=[AES_ENDPOINT],
-                http_auth=aes_test_executor.aws_auth,
-                use_ssl=True,
-                verify_certs=True,
-                connection_class=RequestsHttpConnection,
-            )
diff --git a/sql-cli/tests/test_opensearchsql_cli.py b/sql-cli/tests/test_opensearchsql_cli.py
deleted file mode 100644
index 40d22fd87b..0000000000
--- a/sql-cli/tests/test_opensearchsql_cli.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-import mock
-import pytest
-from prompt_toolkit.shortcuts import PromptSession
-from prompt_toolkit.input.defaults import create_pipe_input
-
-from src.opensearch_sql_cli.opensearch_buffer import opensearch_is_multiline
-from .utils import estest, load_data, TEST_INDEX_NAME, ENDPOINT
-from src.opensearch_sql_cli.opensearchsql_cli import OpenSearchSqlCli
-from src.opensearch_sql_cli.opensearch_connection import OpenSearchConnection
-from src.opensearch_sql_cli.opensearch_style import style_factory
-
-AUTH = None
-QUERY_WITH_CTRL_D = "select * from %s;\r\x04\r" % TEST_INDEX_NAME
-USE_AWS_CREDENTIALS = False
-QUERY_LANGUAGE = "sql"
-RESPONSE_TIMEOUT = 10
-
-
-@pytest.fixture()
-def cli(default_config_location):
-    return OpenSearchSqlCli(clirc_file=default_config_location, always_use_pager=False)
-
-
-class TestOpenSearchSqlCli:
-    def test_connect(self, cli):
-        with mock.patch.object(
-            OpenSearchConnection, "__init__", return_value=None
-        ) as mock_OpenSearchConnection, mock.patch.object(
-            OpenSearchConnection, "set_connection"
-        ) as mock_set_connectiuon:
-            cli.connect(endpoint=ENDPOINT)
-
-            mock_OpenSearchConnection.assert_called_with(ENDPOINT, AUTH, USE_AWS_CREDENTIALS, QUERY_LANGUAGE,
-                                                         RESPONSE_TIMEOUT)
-            mock_set_connectiuon.assert_called()
-
-    @estest
-    @pytest.mark.skip(reason="due to prompt_toolkit throwing error, no way of currently testing this")
-    def test_run_cli(self, connection, cli, capsys):
-        doc = {"a": "aws"}
-        load_data(connection, doc)
-
-        # the title is colored by formatter
-        expected = (
-            "fetched rows / total rows = 1/1" "\n+-----+\n| \x1b[38;5;47;01ma\x1b[39;00m   |\n|-----|\n| aws |\n+-----+"
-        )
-
-        with mock.patch.object(OpenSearchSqlCli, "echo_via_pager") as mock_pager, mock.patch.object(
-            cli, "build_cli"
-        ) as mock_prompt:
-            inp = create_pipe_input()
-            inp.send_text(QUERY_WITH_CTRL_D)
-
-            mock_prompt.return_value = PromptSession(
-                input=inp, multiline=opensearch_is_multiline(cli), style=style_factory(cli.syntax_style, cli.cli_style)
-            )
-
-            cli.connect(ENDPOINT)
-            cli.run_cli()
-            out, err = capsys.readouterr()
-            inp.close()
-
-            mock_pager.assert_called_with(expected)
-            assert out.__contains__("Endpoint: %s" % ENDPOINT)
-            assert out.__contains__("See you next search!")
diff --git a/sql-cli/tests/test_plan.md b/sql-cli/tests/test_plan.md
deleted file mode 100644
index a0b1ef9996..0000000000
--- a/sql-cli/tests/test_plan.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# Test Plan
- The purpose of this checklist is to guide you through the basic usage of OpenSearch SQL CLI, as well as a manual test process. 
- 
- 
-## Display
-
-* [ ] Auto-completion
-    * SQL syntax auto-completion
-    * index name auto-completion
-* [ ] Test pagination with different output length / width. 
-    * query for long results to see the pagination activated automatically.
-* [ ] Test table formatted output.
-* [ ] Test successful conversion from horizontal to vertical display with confirmation. 
-    * resize the terminal window before launching sql cli, there will be a warning message if your terminal is too narrow for horizontal output. It will ask if you want to convert to vertical display
-* [ ] Test warning message when output > 200 rows of data. (Limited by OpenSearch SQL syntax)
-    * `SELECT * FROM accounts`
-    * Run above command, you’ll see the max output is 200, and there will be a message at the top of your results telling you how much data was fetched.
-    * If you want to query more than 200 rows of data, try add a `LIMIT` with more than 200.
-
-
-## Connection
-
-* [ ] Test connection to a local OpenSearch instance
-    * [ ] OpenSearch, no authentication
-    * [ ] OpenSearch, install [OpenSearch Security plugin](https://docs-beta.opensearch.org/security-plugin/index/) to enable authentication and SSL
-    * Run command like `opensearchsql <endpoint> -u <username> -w <password>` to connect to instance with authentication.
-* [ ] Test connection to [Amazon Elasticsearch domain](https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-gsg.html) with
-[Fine Grained Access Control](https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/fgac.html) enabled. 
-    * Have your aws credentials correctly configured by `aws configure`
-    * `opensearchsql --aws-auth <endpoint> -u <username> -w <password>`
-* [ ] Test connection fail when connecting to invalid endpoint. 
-    * `opensearchsql invalidendpoint.com`
-
-
-## Execution
-
-* [ ] Test successful execution given a query. e.g.
-    *  `SELECT * FROM bank WHERE age >30 AND gender = 'm'` 
-* [ ] Test unsuccessful execution with an invalid SQL query will give an error message
-* [ ] Test load config file 
-    * `vim .config/opensearchsql-cli/config`
-    * change settings such as `table_format = github`
-    * restart sql cli, check the tabular output change
-
-
-## Query Options
-
-* [ ] Test explain option -e
-    * `opensearchsql -q "SELECT * FROM accounts LIMIT 5;" -e`
-* [ ] Test query and format option -q, -f
-    * `opensearchsql -q "SELECT * FROM accounts LIMIT 5;" -f csv`
-* [ ] Test vertical output option -v
-    * `opensearchsql -q "SELECT * FROM accounts LIMIT 5;" -v`
-
-## OS and Python Version compatibility
-
-* [ ] Manually test on Linux(Ubuntu) and MacOS
-* [ ] Test against python 3.X versions (optional)
-
diff --git a/sql-cli/tests/utils.py b/sql-cli/tests/utils.py
deleted file mode 100644
index e9ecee6400..0000000000
--- a/sql-cli/tests/utils.py
+++ /dev/null
@@ -1,82 +0,0 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
-import json
-import pytest
-from opensearchpy import ConnectionError, helpers, ConnectionPool
-
-from src.opensearch_sql_cli.opensearch_connection import OpenSearchConnection
-from src.opensearch_sql_cli.utils import OutputSettings
-from src.opensearch_sql_cli.formatter import Formatter
-
-TEST_INDEX_NAME = "opensearchsql_cli_test"
-ENDPOINT = "http://localhost:9200"
-
-
-def create_index(test_executor):
-    opensearch = test_executor.client
-    opensearch.indices.create(index=TEST_INDEX_NAME)
-
-
-def delete_index(test_executor):
-    opensearch = test_executor.client
-    opensearch.indices.delete(index=TEST_INDEX_NAME)
-
-
-def close_connection(opensearch):
-    ConnectionPool.close(opensearch)
-
-
-def load_file(test_executor, filename="accounts.json"):
-    opensearch = test_executor.client
-
-    filepath = "./test_data/" + filename
-
-    # generate iterable data
-    def load_json():
-        with open(filepath, "r") as f:
-            for line in f:
-                yield json.loads(line)
-
-    helpers.bulk(opensearch, load_json(), index=TEST_INDEX_NAME)
-
-
-def load_data(test_executor, doc):
-    opensearch = test_executor.client
-    opensearch.index(index=TEST_INDEX_NAME, body=doc)
-    opensearch.indices.refresh(index=TEST_INDEX_NAME)
-
-
-def get_connection():
-    test_es_connection = OpenSearchConnection(endpoint=ENDPOINT)
-    test_es_connection.set_connection(is_reconnect=True)
-
-    return test_es_connection
-
-
-def run(test_executor, query, use_console=True):
-    data = test_executor.execute_query(query=query, use_console=use_console)
-    settings = OutputSettings(table_format="psql")
-    formatter = Formatter(settings)
-
-    if data:
-        res = formatter.format_output(data)
-        res = "\n".join(res)
-
-        return res
-
-
-# build client for testing
-try:
-    connection = get_connection()
-    CAN_CONNECT_TO_ES = True
-
-except ConnectionError:
-    CAN_CONNECT_TO_ES = False
-
-# use @estest annotation to mark test functions
-estest = pytest.mark.skipif(
-    not CAN_CONNECT_TO_ES, reason="Need a OpenSearch server running at localhost:9200 accessible"
-)
diff --git a/sql-cli/tox.ini b/sql-cli/tox.ini
deleted file mode 100644
index f2a00f1598..0000000000
--- a/sql-cli/tox.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[tox]
-envlist = py38
-[testenv]
-deps = pytest==4.6.3
-    mock==3.0.5
-    pexpect==3.3
-commands = pytest
\ No newline at end of file
diff --git a/sql-jdbc/.gitignore b/sql-jdbc/.gitignore
deleted file mode 100644
index 305eeb8cef..0000000000
--- a/sql-jdbc/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.gradle/
-.idea/
-build/
-.DS_Store
-out/
-*.iml
\ No newline at end of file
diff --git a/sql-jdbc/CODE_OF_CONDUCT.md b/sql-jdbc/CODE_OF_CONDUCT.md
deleted file mode 100644
index bd61be433d..0000000000
--- a/sql-jdbc/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,25 +0,0 @@
-
-This code of conduct applies to all spaces provided by the OpenSource project including in code, documentation, issue trackers, mailing lists, chat channels, wikis, blogs, social media and any other communication channels used by the project.
-
-
-**Our open source communities endeavor to:**
-
-* Be Inclusive: We are committed to being a community where everyone can join and contribute. This means using inclusive and welcoming language.
-* Be Welcoming: We are committed to maintaining a safe space for everyone to be able to contribute.
-* Be Respectful: We are committed to encouraging differing viewpoints, accepting constructive criticism and work collaboratively towards decisions that help the project grow. Disrespectful and unacceptable behavior will not be tolerated.
-* Be Collaborative: We are committed to supporting what is best for our community and users. When we build anything for the benefit of the project, we should document the work we do and communicate to others on how this affects their work.
-
-
-**Our Responsibility. As contributors, members, or bystanders we each individually have the responsibility to behave professionally and respectfully at all times. Disrespectful and unacceptable behaviors include, but are not limited to:**
-
-* The use of violent threats, abusive, discriminatory, or derogatory language;
-* Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, race, political or religious affiliation;
-* Posting of sexually explicit or violent content;
-* The use of sexualized language and unwelcome sexual attention or advances;
-* Public or private harassment of any kind;
-* Publishing private information, such as physical or electronic address, without permission;
-* Other conduct which could reasonably be considered inappropriate in a professional setting;
-* Advocating for or encouraging any of the above behaviors.
-* Enforcement and Reporting Code of Conduct Issues:
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported. [Contact us](mailto:opensource-codeofconduct@amazon.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
\ No newline at end of file
diff --git a/sql-jdbc/CONTRIBUTING.md b/sql-jdbc/CONTRIBUTING.md
deleted file mode 100644
index 4fb91b5283..0000000000
--- a/sql-jdbc/CONTRIBUTING.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Contributing Guidelines
-
-Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
-documentation, we greatly value feedback and contributions from our community.
-
-Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
-information to effectively respond to your bug report or contribution.
-
-
-## Reporting Bugs/Feature Requests
-
-We welcome you to use the GitHub issue tracker to report bugs or suggest features.
-
-When filing an issue, please check [existing open](https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3AJDBC), or [recently closed](https://github.com/opensearch-project/sql/issues?q=is%3Aissue+is%3Aclosed+label%3AJDBC), issues to make sure somebody else hasn't already
-reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
-
-* A reproducible test case or series of steps
-* The version of our code being used
-* Any modifications you've made relevant to the bug
-* Anything unusual about your environment or deployment
-
-## Sign your work
-OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE.txt file](../LICENSE.txt)).  The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software.
-
-We respect intellectual property rights of others and we want to make sure all incoming contributions are correctly attributed and licensed. A Developer Certificate of Origin (DCO) is a lightweight mechanism to do that.
-
-The DCO is a declaration attached to every contribution made by every developer. In the commit message of the contribution, the developer simply adds a `Signed-off-by` statement and thereby agrees to the DCO, which you can find below or at [DeveloperCertificate.org](http://developercertificate.org/).
-
-```
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the
-    best of my knowledge, is covered under an appropriate open
-    source license and I have the right under that license to
-    submit that work with modifications, whether created in whole
-    or in part by me, under the same open source license (unless
-    I am permitted to submit under a different license), as
-    Indicated in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including
-    all personal information I submit with it, including my
-    sign-off) is maintained indefinitely and may be redistributed
-    consistent with this project or the open source license(s)
-    involved.
- ```
-We require that every contribution to OpenSearch is signed with a Developer Certificate of Origin.  Additionally, please use your real name.  We do not accept anonymous contributors nor those utilizing pseudonyms.
-
-Each commit must include a DCO which looks like this
-
-```
-Signed-off-by: Jane Smith <jane.smith@email.com>
-```
-You may type this line on your own when writing your commit messages.  However, if your user.name and user.email are set in your git configs, you can use `-s` or `– – signoff` to add the `Signed-off-by` line to the end of the commit message.
-
-## Contributing via Pull Requests
-Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
-
-1. You are working against the latest source on the *develop* branch.
-2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
-3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
-
-To send us a pull request, please:
-
-1. Fork the repository.
-2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
-3. Ensure local tests pass; please add unit tests for all the new code paths introduced by your change.
-4. Commit to your fork using clear commit messages.
-5. Send us a pull request, answering any default questions in the pull request interface.
-6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
-
-GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
-[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
-
-
-## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/opensearch-project/sql/issues?q=is%3Aopen+label%3A%22help+wanted%22+label%3AJDBC) issues is a great place to start.
-
-
-## Code of Conduct
-
-This project has adopted an [Open Source Code of Conduct](./CODE_OF_CONDUCT.md).
-
-
-## Security issue notifications
-
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue.
-
-
-## Licensing
-
-See the [LICENSE](./LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
diff --git a/sql-jdbc/LICENSE b/sql-jdbc/LICENSE
deleted file mode 100644
index f49a4e16e6..0000000000
--- a/sql-jdbc/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
\ No newline at end of file
diff --git a/sql-jdbc/MAINTAINERS.md b/sql-jdbc/MAINTAINERS.md
deleted file mode 100644
index ff390ab74f..0000000000
--- a/sql-jdbc/MAINTAINERS.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# OpenSearch JDBC Maintainers
-
-## Maintainers
-
-| Maintainer | GitHub ID | Affiliation |
-| --------------- | --------- | ----------- |
-| Anirudha (Ani) Jadhav | [anirudha](https://github.com/anirudha) | Amazon |
-| Peng Huo | [penghuo](https://github.com/penghuo) | Amazon |
-| Chloe | [chloe-zh](https://github.com/chloe-zh) | Amazon |
-| Chen Dai | [dai-chen](https://github.com/dai-chen) | Amazon |
-| Harold Wang | [harold-wang](https://github.com/harold-wang) | Amazon |
diff --git a/sql-jdbc/NOTICE b/sql-jdbc/NOTICE
deleted file mode 100644
index 5eb8961489..0000000000
--- a/sql-jdbc/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenSearch
-Copyright OpenSearch Contributors
-
-This product includes software developed by
-Elasticsearch (http://www.elastic.co).
-Copyright 2009-2018 Elasticsearch
-
-This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).
-
-This product includes software developed by
-Joda.org (http://www.joda.org/).
diff --git a/sql-jdbc/README.md b/sql-jdbc/README.md
deleted file mode 100644
index df225bc679..0000000000
--- a/sql-jdbc/README.md
+++ /dev/null
@@ -1,531 +0,0 @@
-## OpenSearch - JDBC
-
-This is the driver for JDBC connectivity to a cluster running with OpenSearch SQL support.
-
-## Specifications
-
-The driver is compatible with JDBC 4.2 specification and requires a minimum of Java 8.
-
-## BI Tool Connectors
-
-* [Power BI Desktop](../bi-connectors/PowerBIConnector/README.md)
-* [Tableau Desktop](../bi-connectors/TableauConnector/README.md)
-
-## Download and Installation
-
-The driver is available for download from [Artifacts page](https://opensearch.org/artifacts) on OpenSearch.org at the very bottom and from [automated CI workflow](https://github.com/opensearch-project/sql/actions/workflows/sql-jdbc-test-and-build-workflow.yml).
-
-## Using the driver
-
-The driver comes in the form of a single jar file. To use it, simply place it on the classpath of the
-Java application that needs to use it.
-
-If using with JDBC compatible BI tools, refer to the tool documentation on configuring a new JDBC driver. Typically,
-all that's required is to make the tool aware of the location of the driver jar and then use it to setup database (i.e
-OpenSearch) connections.
-
-### Connection URL and other settings
-
-To setup a connection, the driver requires a JDBC connection URL. The connection URL is of the form:
-```
-    jdbc:opensearch://[scheme://][host][:port][/context-path]?[property-key=value]&[property-key2=value2]..&[property-keyN=valueN]
-```
-
-
-* scheme
-
-  Can be one of *http* or *https*. Default is *http*.
-
-* host
-
-  Hostname or IP address of the target cluster.  Default is *localhost*.
-
-* port
-
-  Port number on which the cluster's REST interface is listening. Default value depends on the *scheme* selected. For
-  *http*, the default is 9200. For *https*, the default is 443.
-
-* context-path
-
-  The context path at which the cluster REST interface is rooted. Not needed if the REST interface is simply available on the '/' context path.
-
-* property key=value
-
-  The query string portion of the connection URL can contain desired connection settings in the form of one or more
-  *property-key=value* pairs. The possible configuration properties are provided in the table below. The property keys are case sensitive but values are not unless otherwise indicated.
-
-  Note that JDBC provides multiple APIs for specifying connection properties of which specifying them in the connection
-  URL is just one. When directly coding with the driver you can choose any of the other options (refer sample
-  code below). If you are setting up a connection via a tool, it is likely the tool will allow you to specify the
-  connection URL with just the scheme, host, port and context-path components) while the the connection properties are provided separately.
-  For example, you may not wish to place the user and password in the connection URL. Check the tool you are using for
-  such support.
-
-  The configurable connection properties are:
-
-  | Property Key  | Description | Accepted Value(s)    | Default value  |
-  | ------------- |-------------| -----|---------|
-  | user      | Connection username. mandatory if `auth` property selects a authentication scheme that mandates a username value | any string   | `null` |
-  | password      | Connection password. mandatory if `auth` property selects a authentication scheme that mandates a password value | any string     |   `null` |
-  | fetchSize      | Cursor page size | positive integer value. Max value is limited by `index.max_result_window` OpenSearch setting  |   `0` (for non-paginated response) |
-  | logOutput | location where driver logs should be emitted | a valid file path     |    `null` (logs are disabled) |
-  | logLevel | severity level for which driver logs should be emitted | in order from highest(least logging) to lowest(most logging): OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE, ALL  |    OFF (logs are disabled) |
-  | auth     | authentication mechanism to use | `NONE` (no auth), `BASIC` (HTTP Basic), `AWS_SIGV4` (AWS SIGV4) | `basic` if username and/or password is specified, `NONE` otherwise |
-  | awsCredentialsProvider | The AWS credential provider to be used when authentication mechanism is `AWS_SIGV4` (AWS SIGV4). If not set, the driver will use DefaultAWSCredentialsProviderChain to sign the request. Note that the driver renamed the namespaces of its dependencies, so the value has to be an instance of com.amazonaws.opensearch.sql.jdbc.shadow.com.amazonaws.auth.AWSCredentialsProvider| Instance of an AWSCredentialProvider | DefaultAWSCredentialsProviderChain |
-  | region | if authentication type is `aws_sigv4`, then this is the region value to use when signing requests. Only needed if the driver can not determine the region for the host endpoint. The driver will detect the region if the host endpoint matches a known url pattern. | a valid AWS region value e.g. us-east-1 | `null` (auto-detected if possible from the host endpoint) |
-  | requestCompression | whether to indicate acceptance of compressed (gzip) responses when making server requests | `true` or `false` | `false` |
-  | useSSL   | whether to establish the connection over SSL/TLS | `true` or `false` | `false` if scheme is `http`, `true` if scheme is `https` |
-  | trustStoreLocation | location of the SSL/TLS truststore to use | file path or URL as appropriate to the type of truststore | `null` |
-  | trustStoreType     | type of the truststore | valid truststore type recognized by available Java security providers | JKS |
-  | trustStorePassword | password to access the Trust Store | any string | `null` |
-  | keyStoreLocation   | location of the SSL/TLS keystore to use | file path or URL as appropriate to the type of keystore | `null` |
-  | keyStoreType       | type of the keystore | valid keystore type recognized by available Java security providers | JKS |
-  | keyStorePassword   | password to access the keystore | any string | `null` |
-  | trustSelfSigned    | shortcut way to indicate that any self-signed certificate should be accepted. A truststore is not required to be configured. | `true` or `false` | `false` |
-  | hostnameVerification    | indicate whether certificate hostname verification should be performed when using SSL/TLS | `true` or `false` | `true` |
-
-### Connecting using the DriverManager interface
-
-The main Driver class is `org.opensearch.jdbc.Driver`. If the driver jar is on the application classpath, no other configuration is required.
-
-Code samples to open a connection for some typical scenarios are given below:
-
-* Connect to localhost on port 9200 with no authentication over a plain connection
-
-```
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-.
-.
-String url = "jdbc:opensearch://localhost:9200";
-
-Connection con = DriverManager.getConnection(url);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-* Connect to a remote host on default SSL port with no authentication
-
-```
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name";
-
-Connection con = DriverManager.getConnection(url);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-or,
-
-```
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-.
-.
-String url = "jdbc:opensearch://remote-host-name";
-
-Properties properties = new Properties();
-properties.put("useSSL", "true");
-
-Connection con = DriverManager.getConnection(url, properties);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-* Connect to a remote host with HTTP Basic authentication over an SSL/TLS connection on the default SSL/TLS port. Note - if a username and password are provided and `auth` property is not provided, basic auth is implicitly used.
-
-```
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name";
-String user = "username";
-String password = "password";
-
-Connection con = DriverManager.getConnection(url, user, password);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-or,
-
-```
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-.
-.
-String url = "jdbc:opensearch://remote-host-name";
-
-Properties properties = new Properties();
-properties.put("useSSL", "true");
-properties.put("user", "username");
-properties.put("password", "password");
-
-Connection con = DriverManager.getConnection(url, properties);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-* Connect to a remote host with HTTP Basic authentication over an SSL/TLS connection, allowing any self-signed certificate and optionally turning off hostname verification. This may be useful for a dev/test setup.
-
-```
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-.
-.
-String url = "jdbc:opensearch://remote-host-name";
-
-Properties properties = new Properties();
-properties.put("useSSL", "true");
-properties.put("trustSelfSigned", "true");
-
-// uncomment below to turn off hostname verification
-// properties.put("hostnameVerification", "false");
-
-properties.put("user", "username");
-properties.put("password", "password");
-
-Connection con = DriverManager.getConnection(url, properties);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-* Connect to a remote host on default SSL port with AWS Sig V4 authentication. The driver will determine the credentials used to sign the request just like the standard aws-sdk i.e. in standard directories, environment variables etc.
-
-
-```
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name?auth=aws_sigv4";
-
-Connection con = DriverManager.getConnection(url);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-or,
-
-```
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name";
-
-Properties properties = new Properties();
-properties.put("auth", "aws_sigv4");
-
-Connection con = DriverManager.getConnection(url, properties);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-* Connect to a remote host on default SSL port with AWS Sig V4 authentication, explicitly specifying the AWSCredentialProvider to use
-
-```
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name";
-
-Properties properties = new Properties();
-properties.put("awsCredentialsProvider", new EnvironmentVariableCredentialsProvider());
-
-Connection con = DriverManager.getConnection(url, properties);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-* Connect to a remote host on default SSL port with AWS Sig V4 authentication, explicitly specifying the region to use in the request signing.
-
-```
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name?auth=aws_sigv4&region=us-west-1";
-
-Connection con = DriverManager.getConnection(url);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-or,
-
-```
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name";
-
-Properties properties = new Properties();
-properties.put("auth", "aws_sigv4");
-properties.put("region", "us-west-2");
-
-Connection con = DriverManager.getConnection(url, properties);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-### Connecting using the DataSource interface
-
-The driver also provides a javax.sql.DataSource implementation via the `org.opensearch.jdbc.OpenSearchDataSource` class that can be used to obtain a connection. Here are some typical code samples:
-
-
-* Connect to localhost on port 9200 with no authentication over a plain connection
-
-```
-import java.sql.Connection;
-import java.sql.Statement;
-import javax.sql.DataSource;
-
-import org.opensearch.jdbc.OpenSearchDataSource;
-
-.
-.
-String url = "jdbc:opensearch://localhost:9200";
-
-OpenSearchDataSource ds = new OpenSearchDataSource();
-ds.setUrl(url);
-
-Connection con = ds.getConnection(url);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-* Connect to a remote host on default SSL port with no authentication
-
-```
-import java.sql.Connection;
-import java.sql.Statement;
-import javax.sql.DataSource;
-
-import org.opensearch.jdbc.OpenSearchDataSource;
-
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name";
-
-OpenSearchDataSource ds = new OpenSearchDataSource();
-ds.setUrl(url);
-
-Connection con = ds.getConnection(url);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-* Connect to a remote host with HTTP Basic authentication over an SSL/TLS connection on the default SSL/TLS port.
-
-```
-import java.sql.Connection;
-import java.sql.Statement;
-import javax.sql.DataSource;
-
-import org.opensearch.jdbc.OpenSearchDataSource;
-
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name";
-
-OpenSearchDataSource ds = new OpenSearchDataSource();
-ds.setUrl(url);
-
-Connection con = ds.getConnection(url, "user", "password");
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-* Connect to a remote host on default SSL port with AWS Sig V4 authentication. The driver will determine the credentials used to sign the request just like the standard aws-sdk i.e. in standard directories, environment variables etc.
-
-
-```
-import java.sql.Connection;
-import java.sql.Statement;
-import javax.sql.DataSource;
-
-import org.opensearch.jdbc.OpenSearchDataSource;
-
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name?auth=aws_sigv4";
-
-OpenSearchDataSource ds = new OpenSearchDataSource();
-ds.setUrl(url);
-
-Connection con = ds.getConnection(url);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-* Connect to a remote host on default SSL port with AWS Sig V4 authentication, explicitly specifying the AWSCredentialProvider to use
-
-```
-import java.sql.Connection;
-import java.sql.Statement;
-import javax.sql.DataSource;
-
-import org.opensearch.jdbc.OpenSearchDataSource;
-
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name?auth=aws_sigv4&region=us-west-1";
-
-OpenSearchDataSource ds = new OpenSearchDataSource();
-ds.setUrl(url);
-ds.setAwsCredentialProvider(new EnvironmentVariableCredentialsProvider());
-
-Connection con = ds.getConnection(url);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-* Connect to a remote host on default SSL port with AWS Sig V4 authentication, explicitly specifying the region to use in the request signing.
-
-```
-import java.sql.Connection;
-import java.sql.Statement;
-import javax.sql.DataSource;
-
-import org.opensearch.jdbc.OpenSearchDataSource;
-
-.
-.
-String url = "jdbc:opensearch://https://remote-host-name?auth=aws_sigv4&region=us-west-1";
-
-OpenSearchDataSource ds = new OpenSearchDataSource();
-ds.setUrl(url);
-
-Connection con = ds.getConnection(url);
-Statement st = con.createStatement();
-.
-// use the connection
-.
-// close connection
-con.close();
-```
-
-## Building from source
-
-The driver is built as a shadow jar so that its dependencies are bundled within itself. This way no additional libraries besides the driver jar need to be placed on an application classpath for the driver to be used. The namespaces of the bundled dependencies are modified to ensure they do not conflict with other classes on the application classpath.  
-
-### Run unit tests and build the driver jar
-
-```
-./gradlew clean test shadowJar
-```
-
-### Build the driver jar without unit tests
-
-```
-./gradlew shadowJar
-```
-
-### Publish the built driver jar to local maven repo
-
-```
-./gradlew publishToMavenLocal
-```
-
-## Documentation
-
-Please refer to the [documentation](https://docs-beta.opensearch.org/) for detailed information on installing and configuring opendistro-elasticsearch-security plugin.
-
-## Code of Conduct
-
-This project has adopted an [Open Source Code of Conduct](./CODE_OF_CONDUCT.md).
-
-
-## Security issue notifications
-
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue.
-
-
-## Licensing
-
-See the [LICENSE](./LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
-
-## Copyright
-
-Copyright OpenSearch Contributors. See [NOTICE](./NOTICE) for details.
-
diff --git a/sql-jdbc/THIRD-PARTY b/sql-jdbc/THIRD-PARTY
deleted file mode 100644
index c1db99ed7e..0000000000
--- a/sql-jdbc/THIRD-PARTY
+++ /dev/null
@@ -1,341 +0,0 @@
-** Apache-httpComponents-HttpClient; version 4.5.6 -- https://hc.apache.org/httpcomponents-client-ga/
-** Apache-HttpComponents-HttpCore; version 4.4.10 -- https://hc.apache.org/httpcomponents-core-ga/
-** aws-java-sdk-core; version 1.11.452 -- https://aws.amazon.com/sdk-for-java/
-** commons-codec; version 1.10 -- http://commons.apache.org/proper/commons-codec/
-** commons-logging; version 1.2 -- http://commons.apache.org/proper/commons-logging/
-** ion-java; version 1.0.2 -- https://github.com/amzn/ion-java
-** Jackson-annotations; version 2.9.0 -- https://github.com/FasterXML/jackson-annotations/
-** Jackson-core; version 2.9.7 -- https://github.com/FasterXML/jackson-core
-** Jackson-databind; version 2.9.7 -- https://github.com/FasterXML/jackson-databind
-** jackson-dataformat-cbor; version 2.6.7 -- https://github.com/FasterXML/jackson-dataformat-cbor/
-** joda-time; version 2.8.1 -- http://www.joda.org/joda-time/
-
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND
-DISTRIBUTION
-
-1. Definitions.
-
-
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this
-document.
-
-
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such
-entity.
-
-
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and
-configuration files.
-
-
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object
-code, generated documentation, and conversions to other media
-types.
-
-
-
-"Work" shall mean the work of authorship, whether in Source or Object form,
-made available under the License, as indicated by a copyright notice that is
-included in or attached to the work (an example is provided in the Appendix
-below).
-
-
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works
-thereof.
-
-
-
-"Contribution" shall mean any work of authorship, including the original
-version of the Work and any modifications or additions to that Work or
-Derivative Works thereof, that is intentionally submitted to Licensor for
-inclusion in the Work by the copyright owner or by an individual or Legal
-Entity authorized to submit on behalf of the copyright owner. For the purposes
-of this definition, "submitted" means any form of electronic, verbal, or
-written communication sent to the Licensor or its representatives, including
-but not limited to communication on electronic mailing lists, source code
-control systems, and issue tracking systems that are managed by, or on behalf
-of, the Licensor for the purpose of discussing and improving the Work, but
-excluding communication that is conspicuously marked or otherwise designated in
-writing by the copyright owner as "Not a Contribution."
-
-
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-reproduce, prepare Derivative Works of, publicly display, publicly perform,
-sublicense, and distribute the Work and such Derivative Works in Source or
-Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this
-section) patent license to make, have made, use, offer to sell, sell, import,
-and otherwise transfer the Work, where such license applies only to those
-patent claims licensable by such Contributor that are necessarily infringed by
-their Contribution(s) alone or by combination of their Contribution(s) with the
-Work to which such Contribution(s) was submitted. If You institute patent
-litigation against any entity (including a cross-claim or counterclaim in a
-lawsuit) alleging that the Work or a Contribution incorporated within the Work
-constitutes direct or contributory patent infringement, then any patent
-licenses granted to You under this License for that Work shall terminate as of
-the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or
-Derivative Works thereof in any medium, with or without modifications, and in
-Source or Object form, provided that You meet the following conditions:
-
-(a) You must give any other recipients of the Work or Derivative Works a copy
-of this License; and
-
-(b) You must cause any modified files to carry prominent notices stating that
-You changed the files; and
-
-(c) You must retain, in the Source form of any Derivative Works that You
-distribute, all copyright, patent, trademark, and attribution notices from the
-Source form of the Work, excluding those notices that do not pertain to any
-part of the Derivative Works; and
-
-(d) If the Work includes a "NOTICE" text file as part of its distribution, then
-any Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a
-whole, provided Your use, reproduction, and distribution of the Work otherwise
-complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any
-Contribution intentionally submitted for inclusion in the Work by You to the
-Licensor shall be under the terms and conditions of this License, without any
-additional terms or conditions. Notwithstanding the above, nothing herein shall
-supersede or modify the terms of any separate license agreement you may have
-executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor, except as required
-for reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in
-writing, Licensor provides the Work (and each Contributor provides its
-Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied, including, without limitation, any warranties
-or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining the
-appropriateness of using or redistributing the Work and assume any risks
-associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in
-tort (including negligence), contract, or otherwise, unless required by
-applicable law (such as deliberate and grossly negligent acts) or agreed to in
-writing, shall any Contributor be liable to You for damages, including any
-direct, indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or out of the use or inability to
-use the Work (including but not limited to damages for loss of goodwill, work
-stoppage, computer failure or malfunction, or any and all other commercial
-damages or losses), even if such Contributor has been advised of the
-possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or
-Derivative Works thereof, You may choose to offer, and charge a fee for,
-acceptance of support, warranty, indemnity, or other liability obligations
-and/or rights consistent with this License. However, in accepting such
-obligations, You may act only on Your own behalf and on Your sole
-responsibility, not on behalf of any other Contributor, and only if You agree
-to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability. END OF TERMS AND
-CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification
-within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
-
-* For Apache-httpComponents-HttpClient see also this required NOTICE:
-Apache HttpComponents Client
-Copyright 1999-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-* For Apache-HttpComponents-HttpCore see also this required NOTICE:
-Apache HttpComponents Core
-Copyright 2005-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-* For aws-java-sdk-core see also this required NOTICE:
-Copyright 2013-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-* For commons-codec see also this required NOTICE:
-Apache Commons Codec
-Copyright 2002-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
-contains test data from http://aspell.net/test/orig/batch0.tab.
-Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
-
-
-===============================================================================
-
-The content of package org.apache.commons.codec.language.bm has been
-translated
-from the original php source code available at
-http://stevemorse.org/phoneticinfo.htm
-with permission from the original authors.
-Original source copyright:
-Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
-* For commons-logging see also this required NOTICE:
-Apache Commons Logging
-Copyright 2003-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-* For ion-java see also this required NOTICE:
-Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-* For Jackson-annotations see also this required NOTICE:
-Apache 2.0 copyright
-* For Jackson-core see also this required NOTICE:
-# Jackson JSON processor
-
-Jackson is a high-performance, Free/Open Source JSON processing library.
-It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and
-has
-been in development since 2007.
-It is currently developed by a community of developers, as well as
-supported
-commercially by FasterXML.com.
-
-## Licensing
-
-Jackson core and extension components may licensed under different
-licenses.
-To find the details that apply to this artifact see the accompanying LICENSE
-file.
-For more information, including possible other licensing options, contact
-FasterXML.com (http://fasterxml.com).
-
-## Credits
-
-A list of contributors may be found from CREDITS file, which is included
-in some artifacts (usually source distributions); but is always available
-from the source code management (SCM) system project uses.
-* For Jackson-databind see also this required NOTICE:
-# Jackson JSON processor
-
-Jackson is a high-performance, Free/Open Source JSON processing library.
-It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and
-has
-been in development since 2007.
-It is currently developed by a community of developers, as well as
-supported
-commercially by FasterXML.com.
-
-## Licensing
-
-Jackson core and extension components may be licensed under different
-licenses.
-To find the details that apply to this artifact see the accompanying LICENSE
-file.
-For more information, including possible other licensing options, contact
-FasterXML.com (http://fasterxml.com).
-
-## Credits
-
-A list of contributors may be found from CREDITS file, which is included
-in some artifacts (usually source distributions); but is always available
-from the source code management (SCM) system project uses.
-* For jackson-dataformat-cbor see also this required NOTICE:
-This copy of Jackson JSON processor databind module is licensed under the
-Apache (Software) License, version 2.0 ("the License").
-See the License for details about distribution rights, and the
-specific rights regarding derivate works.
-* For joda-time see also this required NOTICE:
-Copyright 2018 Joda.org
-
-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.
\ No newline at end of file
diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle
deleted file mode 100644
index 1aa135af45..0000000000
--- a/sql-jdbc/build.gradle
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-buildscript {
-    repositories {
-        mavenLocal()
-        maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
-        mavenCentral()
-    }
-}
-
-plugins {
-    id 'java'
-    id 'com.github.johnrengelman.shadow' version '4.0.1'
-    id 'jacoco'
-    id 'maven'
-    id 'maven-publish'
-    id 'signing'
-}
-
-group 'org.opensearch.client'
-
-// keep version in sync with version in Driver source
-version '2.0.0.0'
-
-boolean snapshot = "true".equals(System.getProperty("build.snapshot", "false"));
-if (snapshot) {
-    version += "-SNAPSHOT"
-}
-
-jacoco {
-    toolVersion = "0.8.3"
-}
-
-sourceCompatibility = 8
-targetCompatibility = 8
-
-repositories {
-    mavenLocal()
-    maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
-    mavenCentral()
-}
-
-dependencies {
-    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.13.4.2"
-    implementation group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.452'
-
-    testImplementation('org.junit.jupiter:junit-jupiter-api:5.3.1')
-    testImplementation('org.junit.jupiter:junit-jupiter-params:5.3.1')
-    testImplementation('com.github.tomakehurst:wiremock-jre8-standalone:2.34.0')
-    testImplementation('org.mockito:mockito-core:2.23.0')
-    testImplementation('org.junit.jupiter:junit-jupiter-engine:5.3.1')
-    testImplementation('org.junit-pioneer:junit-pioneer:0.3.0')
-    testImplementation('org.eclipse.jetty:jetty-server:9.4.48.v20220622')
-
-    // Enforce wiremock to use latest guava
-    testImplementation('com.google.guava:guava:31.1-jre')
-
-    testRuntimeOnly('org.slf4j:slf4j-simple:1.7.25') // capture WireMock logging
-}
-
-tasks.withType(JavaCompile) {
-    options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
-}
-
-static def getShadowPath(String path) {
-    return 'com.amazonaws.opensearch.sql.jdbc.shadow.' + path
-}
-
-shadowJar {
-    baseName = rootProject.name
-    classifier = ''
-    exclude 'META-INF/maven/commons-*/**'
-    exclude 'META-INF/maven/org.apache.*/**'
-    exclude 'META-INF/maven/joda-time/**'
-    exclude 'META-INF/maven/com.fasterxml.*/**'
-    exclude 'META-INF/services/com.fasterxml.*'
-    exclude 'META-INF/services/org.apache.logging*/**'
-    exclude 'META-INF/maven/com.amazonaws/**'
-    exclude 'META-INF/maven/software.amazon.*/**'
-    exclude 'META-INF/LICENSE*'
-    exclude 'META-INF/NOTICE*'
-    exclude 'META-INF/DEPENDENCIES'
-
-    relocate('com.amazonaws', getShadowPath('com.amazonaws')) {
-        exclude 'com.amazonaws.opensearch.*/**'
-    }
-
-    relocate 'org.apache', getShadowPath('org.apache')
-    relocate 'org.joda', getShadowPath('org.joda')
-    relocate 'com.fasterxml', getShadowPath('com.fasterxml')
-    relocate 'software.amazon', getShadowPath('software.amazon')
-}
-
-test {
-    systemProperty("opensearch_jdbc_version", version);
-    useJUnitPlatform()
-}
-
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from sourceSets.main.allJava
-}
-
-task javadocJar(type: Jar) {
-    classifier "javadoc"
-    from javadoc.destinationDir
-}
-
-publishing {
-    publications {
-        shadow(MavenPublication) { publication ->
-            project.shadow.component(publication)
-            artifact sourcesJar
-            artifact javadocJar
-
-            pom {
-              name = "OpenSearch SQL JDBC Driver"
-              packaging = "jar"
-              url = "https://github.com/opensearch-project/sql"
-              description = "OpenSearch SQL JDBC driver"
-              scm {
-                connection = "scm:git@github.com:opensearch-project/sql.git"
-                developerConnection = "scm:git@github.com:opensearch-project/sql.git"
-                url = "git@github.com:opensearch-project/sql.git"
-              }
-              licenses {
-                license {
-                  name = "The Apache License, Version 2.0"
-                  url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
-                }
-              }
-              developers {
-                developer {
-                  id = "amazonwebservices"
-                  organization = "Amazon Web Services"
-                  organizationUrl = "https://aws.amazon.com"
-                }
-              }
-            }
-        }
-    }
-
-    repositories {
-        maven {
-            name = "internal-snapshots"
-            url = "s3://snapshots.opendistroforelasticsearch.amazon.com/maven"
-            authentication {
-                awsIm(AwsImAuthentication) // load from EC2 role or env var
-            }
-        }
-        maven {
-            name = "internal-releases"
-            url = "s3://artifacts.opendistroforelasticsearch.amazon.com/maven"
-            authentication {
-                awsIm(AwsImAuthentication) // load from EC2 role or env var
-            }
-        }
-        maven {
-            name = "sonatype-staging"
-            url "https://aws.oss.sonatype.org/service/local/staging/deploy/maven2"
-            credentials {
-                username project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : ''
-                password project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : ''
-            }
-        }
-    }
-
-    // TODO - enabled debug logging for the time being, remove this eventually
-    gradle.startParameter.setShowStacktrace(ShowStacktrace.ALWAYS)
-    gradle.startParameter.setLogLevel(LogLevel.DEBUG)
-}
-
-signing {
-    required { gradle.taskGraph.hasTask("publishShadowPublicationToSonatype-stagingRepository") }
-    sign publishing.publications.shadow
-}
-
-jacoco {
-    toolVersion = "0.8.3"
-}
-
-jacocoTestReport {
-    reports {
-        html.enabled true
-    }
-}
-test.finalizedBy(project.tasks.jacocoTestReport)
-
-jacocoTestCoverageVerification {
-    violationRules {
-        rule {
-            limit {
-                minimum = 0.4
-            }
-        }
-    }
-}
-
-check.dependsOn jacocoTestCoverageVerification
diff --git a/sql-jdbc/docs/img/tableau_connection.PNG b/sql-jdbc/docs/img/tableau_connection.PNG
deleted file mode 100644
index 7e11d8c539..0000000000
Binary files a/sql-jdbc/docs/img/tableau_connection.PNG and /dev/null differ
diff --git a/sql-jdbc/docs/img/tableau_database.PNG b/sql-jdbc/docs/img/tableau_database.PNG
deleted file mode 100644
index b62c673b27..0000000000
Binary files a/sql-jdbc/docs/img/tableau_database.PNG and /dev/null differ
diff --git a/sql-jdbc/docs/img/tableau_graph.PNG b/sql-jdbc/docs/img/tableau_graph.PNG
deleted file mode 100644
index 40437a1067..0000000000
Binary files a/sql-jdbc/docs/img/tableau_graph.PNG and /dev/null differ
diff --git a/sql-jdbc/docs/tableau.md b/sql-jdbc/docs/tableau.md
deleted file mode 100644
index 683e0a9370..0000000000
--- a/sql-jdbc/docs/tableau.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# Connecting Tableau with OpenSearch
-
-## Download and Installation
-
-* Download and install [Tableau Desktop](https://www.tableau.com/en-ca/products/desktop/download).
-* Install and configure [OpenSearch](https://docs-beta.opensearch.org/opensearch/install/index/).
-* Download the [OpenSearch JDBC Driver](https://github.com/opensearch-project/sql/blob/main/sql-jdbc/README.md#download-and-installation).
-
-## Setup
-
-### Specify the JDBC driver
-
-Place the `opensearch-sql-jdbc-x.x.x.x.jar` file in the folder for your operating system. (Create the folder if it doesn't already exist.)
-
-| Platform | Driver Path |
-|---|---|
-| Windows | C:\Program Files\Tableau\Drivers |
-| Mac | ~/Library/Tableau/Drivers |
-| Linux | /opt/tableau/tableau_driver/jdbc |
-
-### Create TDC file
-
-TDC file is required to add customization for the data connection. For reference, see the following sample `opensearch.tdc` file.
-```
-<?xml version='1.0' encoding='utf-16' ?>
-<connection-customization class='genericjdbc' enabled='true' version='2019.3'>
-  <vendor name='genericjdbc' />
-  <driver name='opensearch' />
-  <customizations>
-	<customization name='CAP_CREATE_TEMP_TABLES' value='no'/>
-	<customization name='CAP_SUPPRESS_DISCOVERY_QUERIES' value='yes' />
-	<customization name='CAP_SUPPRESS_DISPLAY_LIMITATIONS' value='yes'/>
-	<customization name='CAP_JDBC_SUPPRESS_ENUMERATE_DATABASES' value='yes' />
-	<customization name='CAP_JDBC_SUPPRESS_ENUMERATE_SCHEMAS' value='yes' />
-	<customization name='CAP_JDBC_SUPPRESS_EMPTY_CATALOG_NAME' value='yes' />
-	<customization name='CAP_JDBC_METADATA_READ_PRIMARYKEYS' value='no'/>
-	<customization name='CAP_QUERY_SUBQUERIES_WITH_TOP' value='yes'/>
-  </customizations>
-</connection-customization> 
-```
-* Using a text editor, add `<connection-customization>` section.
-* Name the file `opensearch.tdc` and save it to `My Tableau Repository\Datasources`.
-* Restart Tableau to apply the change.
-
-For futher details check [using a .tdc file with Tableau](https://kb.tableau.com/articles/howto/using-a-tdc-file-with-tableau-server)
-
- ### Connection information
-
-You will need:
-* [JDBC connection string](../../sql-jdbc/README.md#connection-url-and-other-settings) to enter in the URL field when you connect.
-
-  Sample connection string for connecting to localhost: `jdbc:opensearch://localhost:9200`.
-
-* Credentials for signing in to the server (user name and password).
-* (Optional) JDBC properties file to customize the driver behavior. For more details check [Customize JDBC Connections Using a Properties File](https://community.tableau.com/docs/DOC-17978)
-  * Create a properties file called `opensearch.properties`.
-  * Save the file to the `My Tableau Repository\Datasources` directory.
-
-
-## Make the connection
-
-1. Start Tableau and under **Connect**, select **Other Databases (JDBC)**. If not visible, select **More** under **To a Server** to find it in the list.
-2. Enter the JDBC connection string in the **URL** field.
-3. Select the **Dialect** as **MySQL** from the drop-down list.
-4. Enter the user name and password for signing into the server.
-5. (Optional) Browse to the JDBC properties file.
-6. Select **Sign in**
-
-![Image of Tableau Connection](img/tableau_connection.PNG)
-
-### Prepare data
-
-* Select a single table by double-clicking or dragging the required table to the canvas.
-* To add data from two or more tables:
-  1. Double click or drag tables to canvas.
-  2. Select the desired type of join operation. Tableau supports inner join, right join, left join and full outer join. 
-  3. Select columns for join. (For meaningful result, type of column should be the same.)
-
-![Image of Tableau Database](img/tableau_database.PNG)
-
-### Build charts and analyze data
-
-1. Select **Sheet 1** on the bottom left corner. 
-2. Double click or drag desired fields under **Measure**.
-3. Double click or drag desired fields under **Dimensions**.
-4. Select available visualization under **Show Me**.
-
-![Image of Tableau Graph](img/tableau_graph.PNG)
diff --git a/sql-jdbc/gradle/wrapper/gradle-wrapper.jar b/sql-jdbc/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 29953ea141..0000000000
Binary files a/sql-jdbc/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/sql-jdbc/gradle/wrapper/gradle-wrapper.properties b/sql-jdbc/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 91a7af6eda..0000000000
--- a/sql-jdbc/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionSha256Sum=b7aedd369a26b177147bcb715f8b1fc4fe32b0a6ade0d7fd8ee5ed0c6f731f2c
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/sql-jdbc/gradlew b/sql-jdbc/gradlew
deleted file mode 100755
index 4791f7b97d..0000000000
--- a/sql-jdbc/gradlew
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-#
-# The OpenSearch Contributors require contributions made to
-# this file be licensed under the Apache-2.0 license or a
-# compatible open source license.
-#
-# Modifications Copyright OpenSearch Contributors. See
-# GitHub history for details.
-#
-
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/sql-jdbc/gradlew.bat b/sql-jdbc/gradlew.bat
deleted file mode 100644
index 61405db677..0000000000
--- a/sql-jdbc/gradlew.bat
+++ /dev/null
@@ -1,96 +0,0 @@
-@rem
-@rem Copyright OpenSearch Contributors
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-@rem The OpenSearch Contributors require contributions made to
-@rem this file be licensed under the Apache-2.0 license or a
-@rem compatible open source license.
-@rem
-@rem Modifications Copyright OpenSearch Contributors. See
-@rem GitHub history for details.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes-1.7.0.0.md b/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes-1.7.0.0.md
deleted file mode 100644
index 07d7ba095c..0000000000
--- a/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes-1.7.0.0.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 2020-05-07, Version 1.7.0.0
-### Changes
-* Feature [#76](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/76): Cursor integration. (issue: [#74](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/74))
diff --git a/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes-1.8.0.0.md b/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes-1.8.0.0.md
deleted file mode 100644
index b514816571..0000000000
--- a/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes-1.8.0.0.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## 2020-05-18, Version 1.8.0.0 
-### Maintenance
-* [Adds workflow to upload jar to Maven](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/81):
diff --git a/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes-1.9.0.0.md b/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes-1.9.0.0.md
deleted file mode 100644
index e2063c8ca4..0000000000
--- a/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes-1.9.0.0.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## 2020-06-23, Version 1.9.0.0 (Current)
-### Features
-* Feature [#87](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/87): Elasticsearch 7.8.0 compatibility
-(issue: [#86](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/86))
diff --git a/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes.md b/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes.md
deleted file mode 100644
index f9dec0c9e7..0000000000
--- a/sql-jdbc/release-notes/opendistro-elasticsearch-jdbc.release-notes.md
+++ /dev/null
@@ -1,84 +0,0 @@
-## 2020-04-29, Version 1.6.1.0
-### Enhancement
-* Enhancement [#72](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/72): Use default holdability for prepareStatement. (issue: [#63](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/63))
-
-## 2020-03-24, Version 1.6.0.0
-### Enhancement
-* Enhancement [#49](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/49): Implementation of the execute method in the PreparedStatementImpl class (issue: [#62](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/62))
-
-### Bugfix
-* BugFix [#68](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/68): Change the request body encoding to UTF-8 (issues: [#54](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/54), [#66](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/66), [#opendistro for elasticsearch/sql#392](https://github.com/opendistro-for-elasticsearch/sql/issues/392) )
-
-## 2020-1-26, Version 1.4.0
-
-### Features
-
-#### Documentation
-* Feature [#37](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/37): Tableau documentation
-* Feature [#35](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/35): Add documentation for connecting Tableau with OpenSearch using JDBC Driver
-
-### Bugfixes
-* BugFix [#47](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/47): Result set metadata returns Elasticsearch type (issue: [#43](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/43))
-* BugFix [#45](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/45): Add missing Elasticsearch type : object (issue: [#44](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/43))
-* BugFix [#32](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/32): Added IP type and mapped with JDBC type of varchar
-
-## 2019-10-29, Version 1.3.0
-
-### Changes
-
-* Elasticsearch 7.3.2 compatibility
-* BugFix: support negative float
-
-## 2019-08-16, Version 1.2.0
-
-### Changes
-
-* Elasticsearch 7.2.0 compatibility
-* Support for custom AWS Credentials providers
-
-## 2019-06-24, Version 1.1.0 
-
-### Changes
-
-* Elasticsearch 7.1.1 compatibility
-
-## 2019-06-06, Version 1.0.0
-
-### Changes
-
-* Updated the LocalDateTime to Timestamp conversion to support timezone [issue #6]
-* Updated the connection URL template in README.md
-
-## 2019-04-19, Version 0.9.0
-
-No update in this release.
-
-
-## 2019-04-02, Version 0.8.0
-
-### Notable Changes
-
-* Feature [#4](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/4): Add support for Elasticsearch 6.6
-
-
-## 2019-03-11, Version 0.7.0
-
-### Notable Changes
-
-This is the first release of OpenES-JDBC.
-
-OpenES-JDBC provides a driver for JDBC connectivity for OpenES-SQL. The driver has been developed from scratch and offers the following features in this initial release:
-
-* JDBC API implementation as per JDBC 4.2 specifications
-* java.sql.DriverManager and javax.sql.DataSource interface implementation for creating JDBC connections to Elasticsearch clusters running with OpenES-SQL plugin
-* java.sql.Statement implementation to allow creation and submission of SQL queries to OpenES-SQL
-* java.sql.ResultSet and java.sql.ResultSetMetadata implementation for parsing query results
-* java.sql.PreparedStatement implementation for creation and submission of parameterized SQL queries to OpenES-SQL
-* Support for HTTP BASIC and AWS SIGV4 authentication mechanisms
-* Full support for Elasticsearch Datatypes: BOOLEAN, BYTE, SHORT, INTEGER, LONG, HALF_FLOAT, FLOAT, DOUBLE, SCALED_FLOAT, KEYWORD, TEXT
-* Support Elasticsearch DATE data type with some limitations
-
-
-### Commits
-The code has been developed from scratch so their are numerous commits over the course of development work. 
-A single squash commit shall be created for the first release.
diff --git a/sql-jdbc/settings.gradle b/sql-jdbc/settings.gradle
deleted file mode 100644
index c88b36fc26..0000000000
--- a/sql-jdbc/settings.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-rootProject.name = 'opensearch-sql-jdbc'
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java
deleted file mode 100644
index 337365e177..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.internal.JdbcWrapper;
-import org.opensearch.jdbc.internal.Version;
-import org.opensearch.jdbc.internal.util.JavaUtil;
-import org.opensearch.jdbc.logging.Logger;
-import org.opensearch.jdbc.logging.LoggingSource;
-import org.opensearch.jdbc.protocol.ClusterMetadata;
-import org.opensearch.jdbc.protocol.ConnectionResponse;
-import org.opensearch.jdbc.protocol.Protocol;
-import org.opensearch.jdbc.protocol.ProtocolFactory;
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-import org.opensearch.jdbc.protocol.http.JsonHttpProtocolFactory;
-import org.opensearch.jdbc.transport.Transport;
-import org.opensearch.jdbc.transport.TransportException;
-import org.opensearch.jdbc.transport.TransportFactory;
-import org.opensearch.jdbc.transport.http.ApacheHttpTransportFactory;
-
-import java.io.IOException;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.CallableStatement;
-import java.sql.Clob;
-import java.sql.DatabaseMetaData;
-import java.sql.NClob;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLClientInfoException;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.sql.SQLNonTransientException;
-import java.sql.SQLWarning;
-import java.sql.SQLXML;
-import java.sql.Savepoint;
-import java.sql.Statement;
-import java.sql.Struct;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.Executor;
-
-public class ConnectionImpl implements OpenSearchConnection, JdbcWrapper, LoggingSource {
-
-    private String url;
-    private String user;
-    private Logger log;
-    private int fetchSize;
-    private boolean open = false;
-    private Transport transport;
-    private Protocol protocol;
-    private ClusterMetadata clusterMetadata;
-
-    public ConnectionImpl(ConnectionConfig connectionConfig, Logger log) throws SQLException {
-        this(connectionConfig, ApacheHttpTransportFactory.INSTANCE, JsonHttpProtocolFactory.INSTANCE, log);
-    }
-
-    public ConnectionImpl(ConnectionConfig connectionConfig, TransportFactory transportFactory,
-                          ProtocolFactory protocolFactory, Logger log) throws SQLException {
-        this.log = log;
-        this.url = connectionConfig.getUrl();
-        this.user = connectionConfig.getUser();
-        this.fetchSize = connectionConfig.getFetchSize();
-
-        try {
-            this.transport = transportFactory.getTransport(connectionConfig, log, getUserAgent());
-        } catch (TransportException te) {
-            logAndThrowSQLException(
-                    log, new SQLNonTransientException("Could not initialize transport for the connection: "+te.getMessage(), te)
-            );
-        }
-
-        this.protocol = protocolFactory.getProtocol(connectionConfig, this.transport);
-
-        log.debug(() -> logMessage("Initialized Transport: %s, Protocol: %s", transport, protocol));
-
-        try {
-            ConnectionResponse connectionResponse = this.protocol.connect(connectionConfig.getLoginTimeout() * 1000);
-            this.clusterMetadata = connectionResponse.getClusterMetadata();
-            this.open = true;
-        } catch (ResponseException | IOException ex) {
-            logAndThrowSQLException(log, new SQLException("Connection error "+ex.getMessage(), ex));
-        }
-
-    }
-
-    public String getUser() {
-        return user;
-    }
-
-    public int getFetchSize() {
-        return fetchSize;
-    }
-
-    @Override
-    public Statement createStatement() throws SQLException {
-        log.debug(() -> logEntry("createStatement()"));
-        Statement st = createStatementX();
-        log.debug(() -> logExit("createStatement", st));
-        return st;
-    }
-
-    public Statement createStatementX() throws SQLException {
-        return new StatementImpl(this, log);
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql) throws SQLException {
-        log.debug(() -> logEntry("prepareStatment (%s)", sql));
-        checkOpen();
-        PreparedStatement pst = prepareStatementX(sql);
-        log.debug(() -> logExit("prepareStatement", pst));
-        return pst;
-    }
-
-    private PreparedStatement prepareStatementX(String sql) throws SQLException {
-        return new PreparedStatementImpl(this, sql, log);
-    }
-
-    @Override
-    public CallableStatement prepareCall(String sql) throws SQLException {
-        throw new SQLFeatureNotSupportedException("prepareCall is not supported.");
-    }
-
-    @Override
-    public String nativeSQL(String sql) throws SQLException {
-        checkOpen();
-        return sql;
-    }
-
-    @Override
-    public void setAutoCommit(boolean autoCommit) throws SQLException {
-        checkOpen();
-        if (!autoCommit) {
-            throw new SQLNonTransientException("autoCommit can not be disabled.");
-        }
-    }
-
-    @Override
-    public boolean getAutoCommit() throws SQLException {
-        checkOpen();
-        return true;
-    }
-
-    @Override
-    public void commit() throws SQLException {
-        checkOpen();
-        throw new SQLNonTransientException("autoCommit is enabled on the connection.");
-    }
-
-    @Override
-    public void rollback() throws SQLException {
-        checkOpen();
-        throw new SQLNonTransientException("autoCommit is enabled on the connection.");
-    }
-
-    @Override
-    public void close() throws SQLException {
-        log.debug(() -> logEntry("close ()"));
-        closeX();
-    }
-
-    private void closeX() throws SQLException {
-        open = false;
-        try {
-            transport.close();
-        } catch (TransportException te) {
-            log.error(() -> logMessage("Exception closing transport: "+te), te);
-        }
-        log.close();
-    }
-
-    @Override
-    public boolean isClosed() throws SQLException {
-        return isClosedX();
-    }
-
-    protected boolean isClosedX() throws SQLException {
-        return !open;
-    }
-
-    @Override
-    public DatabaseMetaData getMetaData() throws SQLException {
-        log.debug(() -> logEntry("getMetaData()"));
-        DatabaseMetaData dbmd = new DatabaseMetaDataImpl(this, log);
-        log.debug(() -> logExit("getMetaData", dbmd));
-        return dbmd;
-    }
-
-    @Override
-    public void setReadOnly(boolean readOnly) throws SQLException {
-        if (!readOnly)
-            throw new SQLNonTransientException("read-only mode can not be disabled.");
-    }
-
-    @Override
-    public boolean isReadOnly() throws SQLException {
-        checkOpen();
-        return true;
-    }
-
-    @Override
-    public void setCatalog(String catalog) throws SQLException {
-        checkOpen();
-        // no-op
-    }
-
-    @Override
-    public String getCatalog() throws SQLException {
-        return getClusterName();
-    }
-
-    @Override
-    public void setTransactionIsolation(int level) throws SQLException {
-        checkOpen();
-        if (level != TRANSACTION_NONE)
-            throw new SQLNonTransientException("Only TRANSACTION_NONE is supported.");
-    }
-
-    @Override
-    public int getTransactionIsolation() throws SQLException {
-        checkOpen();
-        return TRANSACTION_NONE;
-    }
-
-    @Override
-    public SQLWarning getWarnings() throws SQLException {
-        checkOpen();
-        return null;
-    }
-
-    @Override
-    public void clearWarnings() throws SQLException {
-        checkOpen();
-    }
-
-    @Override
-    public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
-        log.debug(() -> logEntry("createStatement (%d, %d)", resultSetType, resultSetConcurrency));
-        checkOpen();
-        validateResultSetCharacteristics(resultSetType, resultSetConcurrency, ResultSet.HOLD_CURSORS_OVER_COMMIT);
-        Statement st = createStatementX();
-        log.debug(() -> logExit("createStatement", st));
-        return st;
-    }
-
-    private void validateResultSetCharacteristics(
-            int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
-        validateResultSetType(resultSetType);
-        validateResulSetConcurrency(resultSetConcurrency);
-        validateResultSetHoldability(resultSetHoldability);
-    }
-
-    private void validateResultSetType(int resultSetType) throws SQLException {
-        if (resultSetType != ResultSet.TYPE_FORWARD_ONLY)
-            throw new SQLNonTransientException("Only ResultSets of TYPE_FORWARD_ONLY are supported.");
-    }
-
-    private void validateResulSetConcurrency(int resultSetConcurrency) throws SQLException {
-        if (resultSetConcurrency != ResultSet.CONCUR_READ_ONLY)
-            throw new SQLNonTransientException("Only ResultSets with concurrency CONCUR_READ_ONLY are supported.");
-    }
-
-    private void validateResultSetHoldability(int holdability) throws SQLException {
-        if (holdability != ResultSet.HOLD_CURSORS_OVER_COMMIT)
-            throw new SQLNonTransientException("Only HOLD_CURSORS_OVER_COMMIT holdability is supported.");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
-        log.debug(() -> logEntry("prepareStatement (%s, %d, %d)", sql, resultSetType, resultSetConcurrency));
-        checkOpen();
-        validateResultSetCharacteristics(resultSetType, resultSetConcurrency, ResultSet.HOLD_CURSORS_OVER_COMMIT);
-        PreparedStatement pst = prepareStatementX(sql);
-        log.debug(() -> logExit("prepareStatement", pst));
-        return pst;
-    }
-
-    @Override
-    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
-        throw new SQLFeatureNotSupportedException("prepareCall is not supported");
-    }
-
-    @Override
-    public Map<String, Class<?>> getTypeMap() throws SQLException {
-        return null;
-    }
-
-    @Override
-    public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setTypeMap is not supported");
-    }
-
-    @Override
-    public void setHoldability(int holdability) throws SQLException {
-        checkOpen();
-        validateResultSetHoldability(holdability);
-    }
-
-    @Override
-    public int getHoldability() throws SQLException {
-        checkOpen();
-        return ResultSet.HOLD_CURSORS_OVER_COMMIT;
-    }
-
-    @Override
-    public Savepoint setSavepoint() throws SQLException {
-        throw new SQLFeatureNotSupportedException("Transactions and savepoints are not supported.");
-    }
-
-    @Override
-    public Savepoint setSavepoint(String name) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Transactions and savepoints are not supported.");
-    }
-
-    @Override
-    public void rollback(Savepoint savepoint) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Transactions are not supported.");
-    }
-
-    @Override
-    public void releaseSavepoint(Savepoint savepoint) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Transactions and savepoints are not supported.");
-    }
-
-    @Override
-    public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability)
-            throws SQLException {
-        log.debug(() -> logEntry("createStatement (%d, %d, %d)", resultSetType, resultSetConcurrency, resultSetHoldability));
-        checkOpen();
-        validateResultSetCharacteristics(resultSetType, resultSetConcurrency, resultSetHoldability);
-        Statement st = createStatementX();
-        log.debug(() -> logExit("createStatment", st));
-        return st;
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
-        log.debug(() -> logEntry("prepareStatement (%s, %d, %d, %d)", sql, resultSetType, resultSetConcurrency, resultSetHoldability));
-        checkOpen();
-        validateResultSetCharacteristics(resultSetType, resultSetConcurrency, resultSetHoldability);
-        PreparedStatement pst = prepareStatementX(sql);
-        log.debug(() -> logExit("prepareStatement", pst));
-        return pst;
-    }
-
-    @Override
-    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
-        throw new SQLFeatureNotSupportedException("prepareCall is not supported");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
-        log.debug(() -> logEntry("prepareStatement (%s, %d)", sql, autoGeneratedKeys));
-        checkOpen();
-        if (autoGeneratedKeys != Statement.NO_GENERATED_KEYS) {
-            throw new SQLFeatureNotSupportedException("Auto generated keys are not supported.");
-        }
-        PreparedStatement pst = prepareStatementX(sql);
-        log.debug(() -> logExit("prepareStatement", pst));
-        return pst;
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Auto generated keys are not supported.");
-    }
-
-    @Override
-    public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Auto generated keys are not supported.");
-    }
-
-    @Override
-    public Clob createClob() throws SQLException {
-        throw new SQLFeatureNotSupportedException("Clob is not supported.");
-    }
-
-    @Override
-    public Blob createBlob() throws SQLException {
-        throw new SQLFeatureNotSupportedException("Blob is not supported.");
-    }
-
-    @Override
-    public NClob createNClob() throws SQLException {
-        throw new SQLFeatureNotSupportedException("NClob is not supported.");
-    }
-
-    @Override
-    public SQLXML createSQLXML() throws SQLException {
-        throw new SQLFeatureNotSupportedException("SQLXML is not supported.");
-    }
-
-    @Override
-    public boolean isValid(int timeout) throws SQLException {
-        // TODO - implement through a HEAD or a GET to "/", or a dummy SQL?
-        log.debug(() -> logEntry("isValid (%d)", timeout));
-
-        boolean isValid = true;
-
-        log.debug(() -> logExit("isValid", isValid));
-        return isValid;
-    }
-
-    @Override
-    public void setClientInfo(String name, String value) throws SQLClientInfoException {
-        throw new SQLClientInfoException("Client info is not supported.", null);
-    }
-
-    @Override
-    public void setClientInfo(Properties properties) throws SQLClientInfoException {
-        throw new SQLClientInfoException("Client info is not supported.", null);
-    }
-
-    @Override
-    public String getClientInfo(String name) throws SQLException {
-        checkOpen();
-        return null;
-    }
-
-    @Override
-    public Properties getClientInfo() throws SQLException {
-        checkOpen();
-        return null;
-    }
-
-    @Override
-    public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Array is not supported.");
-    }
-
-    @Override
-    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Struct is not supported.");
-    }
-
-    @Override
-    public void setSchema(String schema) throws SQLException {
-        // no-op
-    }
-
-    @Override
-    public String getSchema() throws SQLException {
-        return "";
-    }
-
-    @Override
-    public void abort(Executor executor) throws SQLException {
-        log.debug(() -> logEntry("abort (%s) ", executor));
-        closeX();
-        log.debug(() -> logExit("abort"));
-    }
-
-    @Override
-    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
-        checkOpen();
-        // no-op, not supported yet
-    }
-
-    @Override
-    public int getNetworkTimeout() throws SQLException {
-        return 0;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    private void checkOpen() throws SQLException {
-        if (isClosedX()) {
-            logAndThrowSQLException(log, new SQLException("Connection is closed."));
-        }
-    }
-
-    @Override
-    public String getClusterName() throws SQLException {
-        checkOpen();
-        return clusterMetadata.getClusterName();
-    }
-
-    @Override
-    public String getClusterUUID() throws SQLException {
-        checkOpen();
-        return clusterMetadata.getClusterUUID();
-    }
-
-    public ClusterMetadata getClusterMetadata() throws SQLException {
-        checkOpen();
-        return this.clusterMetadata;
-    }
-
-    public Transport getTransport() {
-        return transport;
-    }
-
-    public Protocol getProtocol() {
-        return protocol;
-    }
-
-    public Logger getLog() {
-        return log;
-    }
-
-    private String getUserAgent() {
-        return String.format("opensearch-jdbc/%s (Java %s)",
-                Version.Current.getFullVersion(), JavaUtil.getJavaVersion());
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/DatabaseMetaDataImpl.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/DatabaseMetaDataImpl.java
deleted file mode 100644
index 8115ff86fd..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/DatabaseMetaDataImpl.java
+++ /dev/null
@@ -1,1279 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.internal.JdbcWrapper;
-import org.opensearch.jdbc.internal.Version;
-import org.opensearch.jdbc.logging.LoggingSource;
-import org.opensearch.jdbc.protocol.ColumnDescriptor;
-import org.opensearch.jdbc.protocol.QueryResponse;
-import org.opensearch.jdbc.types.OpenSearchType;
-import org.opensearch.jdbc.logging.Logger;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.RowIdLifetime;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-
-public class DatabaseMetaDataImpl implements DatabaseMetaData, JdbcWrapper, LoggingSource {
-
-    private ConnectionImpl connection;
-    private Logger log;
-
-    public DatabaseMetaDataImpl(ConnectionImpl connection, Logger log) {
-        this.connection = connection;
-        this.log = log;
-    }
-
-    @Override
-    public boolean allProceduresAreCallable() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean allTablesAreSelectable() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public String getURL() throws SQLException {
-        return connection.getUrl();
-    }
-
-    @Override
-    public String getUserName() throws SQLException {
-        return connection.getUser();
-    }
-
-    @Override
-    public boolean isReadOnly() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean nullsAreSortedHigh() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean nullsAreSortedLow() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean nullsAreSortedAtStart() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean nullsAreSortedAtEnd() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public String getDatabaseProductName() throws SQLException {
-        return "OpenSearch";
-    }
-
-    @Override
-    public String getDatabaseProductVersion() throws SQLException {
-        return connection.getClusterMetadata().getVersion().getFullVersion();
-    }
-
-    @Override
-    public String getDriverName() throws SQLException {
-        return "OpenSearch JDBC Driver";
-    }
-
-    @Override
-    public String getDriverVersion() throws SQLException {
-        return Version.Current.getFullVersion();
-    }
-
-    @Override
-    public int getDriverMajorVersion() {
-        return Version.Current.getMajor();
-    }
-
-    @Override
-    public int getDriverMinorVersion() {
-        return Version.Current.getMinor();
-    }
-
-    @Override
-    public boolean usesLocalFiles() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean usesLocalFilePerTable() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsMixedCaseIdentifiers() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean storesUpperCaseIdentifiers() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean storesLowerCaseIdentifiers() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean storesMixedCaseIdentifiers() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean storesUpperCaseQuotedIdentifiers() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean storesLowerCaseQuotedIdentifiers() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean storesMixedCaseQuotedIdentifiers() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public String getIdentifierQuoteString() throws SQLException {
-        // space to indicate quoting not supported currently
-        return " ";
-    }
-
-    @Override
-    public String getSQLKeywords() throws SQLException {
-        return "";
-    }
-
-    @Override
-    public String getNumericFunctions() throws SQLException {
-        return "";
-    }
-
-    @Override
-    public String getStringFunctions() throws SQLException {
-        return "";
-    }
-
-    @Override
-    public String getSystemFunctions() throws SQLException {
-        return "";
-    }
-
-    @Override
-    public String getTimeDateFunctions() throws SQLException {
-        return "";
-    }
-
-    @Override
-    public String getSearchStringEscape() throws SQLException {
-        return "\\";
-    }
-
-    @Override
-    public String getExtraNameCharacters() throws SQLException {
-        return "";
-    }
-
-    @Override
-    public boolean supportsAlterTableWithAddColumn() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsAlterTableWithDropColumn() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsColumnAliasing() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean nullPlusNonNullIsNull() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsConvert() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsConvert(int fromType, int toType) throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsTableCorrelationNames() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsDifferentTableCorrelationNames() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsExpressionsInOrderBy() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsOrderByUnrelated() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsGroupBy() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsGroupByUnrelated() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsGroupByBeyondSelect() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsLikeEscapeClause() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsMultipleResultSets() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsMultipleTransactions() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsNonNullableColumns() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsMinimumSQLGrammar() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsCoreSQLGrammar() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsExtendedSQLGrammar() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsANSI92EntryLevelSQL() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsANSI92IntermediateSQL() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsANSI92FullSQL() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsIntegrityEnhancementFacility() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsOuterJoins() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsFullOuterJoins() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsLimitedOuterJoins() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public String getSchemaTerm() throws SQLException {
-        return "schema";
-    }
-
-    @Override
-    public String getProcedureTerm() throws SQLException {
-        return "procedure";
-    }
-
-    @Override
-    public String getCatalogTerm() throws SQLException {
-        return "clusterName";
-    }
-
-    @Override
-    public boolean isCatalogAtStart() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public String getCatalogSeparator() throws SQLException {
-        return ".";
-    }
-
-    @Override
-    public boolean supportsSchemasInDataManipulation() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSchemasInProcedureCalls() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSchemasInTableDefinitions() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSchemasInIndexDefinitions() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsCatalogsInDataManipulation() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCatalogsInProcedureCalls() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsCatalogsInTableDefinitions() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsCatalogsInIndexDefinitions() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsPositionedDelete() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsPositionedUpdate() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSelectForUpdate() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsStoredProcedures() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubqueriesInComparisons() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubqueriesInExists() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubqueriesInIns() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSubqueriesInQuantifieds() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCorrelatedSubqueries() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsUnion() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsUnionAll() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsOpenCursorsAcrossCommit() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsOpenCursorsAcrossRollback() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsOpenStatementsAcrossCommit() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsOpenStatementsAcrossRollback() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public int getMaxBinaryLiteralLength() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxCharLiteralLength() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxColumnNameLength() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxColumnsInGroupBy() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxColumnsInIndex() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxColumnsInOrderBy() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxColumnsInSelect() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxColumnsInTable() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxConnections() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxCursorNameLength() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxIndexLength() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxSchemaNameLength() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxProcedureNameLength() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxCatalogNameLength() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxRowSize() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public boolean doesMaxRowSizeIncludeBlobs() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public int getMaxStatementLength() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxStatements() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxTableNameLength() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxTablesInSelect() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getMaxUserNameLength() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public int getDefaultTransactionIsolation() throws SQLException {
-        return Connection.TRANSACTION_NONE;
-    }
-
-    @Override
-    public boolean supportsTransactions() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsTransactionIsolationLevel(int level) throws SQLException {
-        return level == Connection.TRANSACTION_NONE;
-    }
-
-    @Override
-    public boolean supportsDataDefinitionAndDataManipulationTransactions() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsDataManipulationTransactionsOnly() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean dataDefinitionCausesTransactionCommit() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean dataDefinitionIgnoredInTransactions() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public ResultSet getProcedures(String catalog, String schemaPattern, String procedureNamePattern) throws SQLException {
-        return emptyResultSet(log,
-                rscd("PROCEDURE_CAT"),
-                rscd("PROCEDURE_SCHEM"),
-                rscd("PROCEDURE_NAME"),
-                rscd("RESERVED4"),
-                rscd("RESERVED5"),
-                rscd("RESERVED6"),
-                rscd("REMARKS"),
-                rscd("PROCEDURE_TYPE", OpenSearchType.SHORT.getTypeName()),
-                rscd("SPECIFIC_NAME")
-        );
-    }
-
-    @Override
-    public ResultSet getProcedureColumns(String catalog, String schemaPattern, String procedureNamePattern, String columnNamePattern)
-            throws SQLException {
-        return emptyResultSet(log,
-                rscd("PROCEDURE_CAT"),
-                rscd("PROCEDURE_SCHEM"),
-                rscd("PROCEDURE_NAME"),
-                rscd("COLUMN_NAME"),
-                rscd("COLUMN_TYPE", OpenSearchType.SHORT.getTypeName()),
-                rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName()),
-                rscd("TYPE_NAME"),
-                rscd("PRECISION", OpenSearchType.INTEGER.getTypeName()),
-                rscd("LENGTH", OpenSearchType.INTEGER.getTypeName()),
-                rscd("SCALE", OpenSearchType.SHORT.getTypeName()),
-                rscd("RADIX", OpenSearchType.SHORT.getTypeName()),
-                rscd("NULLABLE", OpenSearchType.SHORT.getTypeName()),
-                rscd("REMARKS"),
-                rscd("COLUMN_DEF"),
-                rscd("SQL_DATA_TYPE", OpenSearchType.INTEGER.getTypeName()),
-                rscd("SQL_DATETIME_SUB", OpenSearchType.INTEGER.getTypeName()),
-                rscd("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER.getTypeName()),
-                rscd("ORDINAL_POSITION", OpenSearchType.INTEGER.getTypeName()),
-                rscd("IS_NULLABLE"),
-                rscd("SPECIFIC_NAME")
-        );
-    }
-
-    @Override
-    public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) throws SQLException {
-        // TODO - when server plugin supports PreparedStatement fully, implement this as a preparedStatment with params
-        log.debug(() -> logMessage("getTables(%s, %s, %s, %s)",
-                catalog, schemaPattern, tableNamePattern, Arrays.toString(types)));
-
-        PreparedStatement pst = connection.prepareStatement("SHOW TABLES LIKE " +
-                (tableNamePattern == null ? "%" : tableNamePattern));
-
-        ResultSet resultSet = pst.executeQuery();
-
-        log.debug(() -> logMessage("getTables returning: " + resultSet));
-        return resultSet;
-    }
-
-    @Override
-    public ResultSet getSchemas() throws SQLException {
-        log.debug(() -> logMessage("getSchemas()"));
-
-        ResultSet resultSet = getSchemasX(null, null);
-
-        log.debug(() -> logMessage("getSchemas() returning: " + resultSet));
-        return resultSet;
-    }
-
-    @Override
-    public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException {
-        log.debug(() -> logMessage("getSchemas(%s, %s)", catalog, schemaPattern));
-
-        ResultSet resultSet = getSchemasX(catalog, schemaPattern);
-
-        log.debug(() -> logMessage("getSchemas() returning: %s", resultSet));
-        return resultSet;
-    }
-
-    private ResultSet getSchemasX(String catalog, String schemaPattern) throws SQLException {
-        List<ResultSetColumnDescriptor> columnDescriptors = new ArrayList<>();
-        columnDescriptors.add(rscd("TABLE_SCHEM"));
-        columnDescriptors.add(rscd("TABLE_CATALOG"));
-
-        List<List<Object>> dataRows = new ArrayList<>();
-
-        if (clusterCatalogMatches(catalog) && clusterSchemaMatches(schemaPattern)) {
-            dataRows.add(Arrays.asList("", getClusterCatalogName()));
-        }
-        return new ResultSetImpl(null, columnDescriptors, dataRows, log);
-    }
-
-    public Logger getLog() {
-        return log;
-    }
-
-    @Override
-    public ResultSet getCatalogs() throws SQLException {
-        log.debug(() -> logMessage("getCatalogs()"));
-        ResultSet resultSet;
-
-        List<ResultSetColumnDescriptor> columnDescriptors = new ArrayList<>();
-        columnDescriptors.add(rscd("TABLE_CAT"));
-
-        List<List<Object>> dataRows = new ArrayList<>();
-        dataRows.add(Arrays.asList(getClusterCatalogName()));
-
-        resultSet = new ResultSetImpl(null, columnDescriptors, dataRows, log);
-
-        log.debug(() -> logMessage("getCatalogs() returning: %s", resultSet));
-        return resultSet;
-    }
-
-    @Override
-    public ResultSet getTableTypes() throws SQLException {
-        log.debug(() -> logMessage("getTableTypes()"));
-        ResultSet resultSet;
-
-        List<ResultSetColumnDescriptor> columnDescriptors = new ArrayList<>();
-        columnDescriptors.add(rscd("TABLE_TYPE"));
-
-        List<List<Object>> dataRows = new ArrayList<>();
-        dataRows.add(Arrays.asList("BASE TABLE"));
-
-        resultSet = new ResultSetImpl(null, columnDescriptors, dataRows, log);
-
-        log.debug(() -> logMessage("getTableTypes() returning: %s", resultSet));
-        return resultSet;
-    }
-
-    @Override
-    public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
-            throws SQLException {
-        log.debug(() -> logMessage("getColumns(%s, %s, %s, %s)",
-                catalog, schemaPattern, tableNamePattern, columnNamePattern));
-        ColumnMetadataStatement statement = new ColumnMetadataStatement(connection, tableNamePattern, columnNamePattern, log);
-        ResultSet resultSet = statement.executeQuery();
-        log.debug(() -> logMessage("getColumns() returning: %s", resultSet));
-        return resultSet;
-    }
-
-    @Override
-    public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Privileges are not supported");
-    }
-
-    @Override
-    public ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableNamePattern) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Privileges are not supported");
-    }
-
-    @Override
-    public ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Row identifiers are not supported");
-    }
-
-    @Override
-    public ResultSet getVersionColumns(String catalog, String schema, String table) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Version columns are not supported");
-    }
-
-    @Override
-    public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Primary keys are not supported");
-    }
-
-    @Override
-    public ResultSet getImportedKeys(String catalog, String schema, String table) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Primary and Foreign keys are not supported");
-    }
-
-    @Override
-    public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Primary and Foreign keys are not supported");
-    }
-
-    @Override
-    public ResultSet getCrossReference(String parentCatalog, String parentSchema, String parentTable, String foreignCatalog,
-                                       String foreignSchema, String foreignTable) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Primary and Foreign keys are not supported");
-    }
-
-    @Override
-    public ResultSet getTypeInfo() throws SQLException {
-        log.debug(() -> logMessage("getTypeInfo()"));
-        ResultSet resultSet;
-
-        List<ResultSetColumnDescriptor> columnDescriptors = new ArrayList<>();
-        columnDescriptors.add(rscd("TYPE_NAME"));
-        columnDescriptors.add(rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName()));
-        columnDescriptors.add(rscd("PRECISION", OpenSearchType.INTEGER.getTypeName()));
-        columnDescriptors.add(rscd("LITERAL_PREFIX"));
-        columnDescriptors.add(rscd("LITERAL_SUFFIX"));
-        columnDescriptors.add(rscd("CREATE_PARAMS"));
-        columnDescriptors.add(rscd("NULLABLE", OpenSearchType.SHORT.getTypeName()));
-        columnDescriptors.add(rscd("CASE_SENSITIVE", OpenSearchType.BOOLEAN.getTypeName()));
-        columnDescriptors.add(rscd("SEARCHABLE", OpenSearchType.SHORT.getTypeName()));
-        columnDescriptors.add(rscd("UNSIGNED_ATTRIBUTE", OpenSearchType.BOOLEAN.getTypeName()));
-        columnDescriptors.add(rscd("FIXED_PREC_SCALE", OpenSearchType.BOOLEAN.getTypeName()));
-        columnDescriptors.add(rscd("AUTO_INCREMENT", OpenSearchType.BOOLEAN.getTypeName()));
-        columnDescriptors.add(rscd("LOCAL_TYPE_NAME"));
-        columnDescriptors.add(rscd("MINIMUM_SCALE", OpenSearchType.SHORT.getTypeName()));
-        columnDescriptors.add(rscd("MAXIMUM_SCALE", OpenSearchType.SHORT.getTypeName()));
-        columnDescriptors.add(rscd("SQL_DATA_TYPE", OpenSearchType.INTEGER.getTypeName()));
-        columnDescriptors.add(rscd("SQL_DATETIME_SUB", OpenSearchType.INTEGER.getTypeName()));
-        columnDescriptors.add(rscd("NUM_PREC_RADIX", OpenSearchType.INTEGER.getTypeName()));
-
-        List<List<Object>> dataRows = new ArrayList<>();
-        for (OpenSearchType openSearchType : OpenSearchType.values()) {
-            dataRows.add(Arrays.asList(
-                    openSearchType.name(),
-                    openSearchType.getJdbcType().getVendorTypeNumber(),
-                    openSearchType.getPrecision(),
-                    "'",
-                    "'",
-                    null,
-                    typeNullableUnknown,
-                    (openSearchType == OpenSearchType.TEXT || openSearchType == OpenSearchType.KEYWORD), // case sensitive
-                    typeSearchable,
-                    !openSearchType.isSigned(),
-                    false,
-                    false,
-                    null,
-                    null, // min scale - derive from Java type?
-                    null, // max scale - derive from Java type?
-                    null,
-                    null,
-                    10
-            ));
-        }
-
-        resultSet = new ResultSetImpl(null, columnDescriptors, dataRows, log);
-
-        log.debug(() -> logMessage("getTypeInfo() returning: %s", resultSet));
-        return resultSet;
-    }
-
-    @Override
-    public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Table indices are not supported");
-    }
-
-    @Override
-    public boolean supportsResultSetType(int type) throws SQLException {
-        return type == ResultSet.TYPE_FORWARD_ONLY;
-    }
-
-    @Override
-    public boolean supportsResultSetConcurrency(int type, int concurrency) throws SQLException {
-        return type == ResultSet.TYPE_FORWARD_ONLY && ResultSet.CONCUR_READ_ONLY == concurrency;
-    }
-
-    @Override
-    public boolean ownUpdatesAreVisible(int type) throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean ownDeletesAreVisible(int type) throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean ownInsertsAreVisible(int type) throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean othersUpdatesAreVisible(int type) throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean othersDeletesAreVisible(int type) throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean othersInsertsAreVisible(int type) throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean updatesAreDetected(int type) throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean deletesAreDetected(int type) throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean insertsAreDetected(int type) throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsBatchUpdates() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types) throws SQLException {
-        return emptyResultSet(log,
-                rscd("TYPE_CAT"),
-                rscd("TYPE_SCHEM"),
-                rscd("TYPE_NAME"),
-                rscd("CLASS_NAME"),
-                rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName()),
-                rscd("REMARKS"),
-                rscd("BASE_TYPE", OpenSearchType.SHORT.getTypeName())
-        );
-    }
-
-    @Override
-    public Connection getConnection() throws SQLException {
-        return connection;
-    }
-
-    @Override
-    public boolean supportsSavepoints() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsNamedParameters() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsMultipleOpenResults() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean supportsGetGeneratedKeys() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern) throws SQLException {
-        return emptyResultSet(log,
-                rscd("TYPE_CAT"),
-                rscd("TYPE_SCHEM"),
-                rscd("TYPE_NAME"),
-                rscd("SUPERTYPE_CAT"),
-                rscd("SUPERTYPE_SCHEM"),
-                rscd("SUPERTYPE_NAME")
-        );
-    }
-
-    @Override
-    public ResultSet getSuperTables(String catalog, String schemaPattern, String tableNamePattern) throws SQLException {
-        return emptyResultSet(log,
-                rscd("TABLE_CAT"),
-                rscd("TABLE_SCHEM"),
-                rscd("TABLE_NAME"),
-                rscd("SUPERTABLE_NAME")
-        );
-    }
-
-    @Override
-    public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern, String attributeNamePattern)
-            throws SQLException {
-        return emptyResultSet(log,
-                rscd("TYPE_CAT"),
-                rscd("TYPE_SCHEM"),
-                rscd("TYPE_NAME"),
-                rscd("ATTR_NAME"),
-                rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName()),
-                rscd("ATTR_TYPE_NAME"),
-                rscd("ATTR_SIZE", OpenSearchType.INTEGER.getTypeName()),
-                rscd("DECIMAL_DIGITS", OpenSearchType.INTEGER.getTypeName()),
-                rscd("NUM_PREC_RADIX", OpenSearchType.INTEGER.getTypeName()),
-                rscd("NULLABLE", OpenSearchType.INTEGER.getTypeName()),
-                rscd("REMARKS"),
-                rscd("ATTR_DEF"),
-                rscd("SQL_DATA_TYPE", OpenSearchType.INTEGER.getTypeName()),
-                rscd("SQL_DATETIME_SUB", OpenSearchType.INTEGER.getTypeName()),
-                rscd("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER.getTypeName()),
-                rscd("ORDINAL_POSITION", OpenSearchType.INTEGER.getTypeName()),
-                rscd("IS_NULLABLE"),
-                rscd("SCOPE_CATALOG"),
-                rscd("SCOPE_SCHEMA"),
-                rscd("SCOPE_TABLE"),
-                rscd("SOURCE_DATA_TYPE", OpenSearchType.SHORT.getTypeName())
-        );
-    }
-
-    @Override
-    public boolean supportsResultSetHoldability(int holdability) throws SQLException {
-        return holdability == ResultSet.HOLD_CURSORS_OVER_COMMIT;
-    }
-
-    @Override
-    public int getResultSetHoldability() throws SQLException {
-        return ResultSet.HOLD_CURSORS_OVER_COMMIT;
-    }
-
-    @Override
-    public int getDatabaseMajorVersion() throws SQLException {
-        return connection.getClusterMetadata().getVersion().getMajor();
-    }
-
-    @Override
-    public int getDatabaseMinorVersion() throws SQLException {
-        return connection.getClusterMetadata().getVersion().getMinor();
-    }
-
-    @Override
-    public int getJDBCMajorVersion() throws SQLException {
-        return 4;
-    }
-
-    @Override
-    public int getJDBCMinorVersion() throws SQLException {
-        return 2;
-    }
-
-    @Override
-    public int getSQLStateType() throws SQLException {
-        return DatabaseMetaData.sqlStateSQL;
-    }
-
-    @Override
-    public boolean locatorsUpdateCopy() throws SQLException {
-        return true;
-    }
-
-    @Override
-    public boolean supportsStatementPooling() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public RowIdLifetime getRowIdLifetime() throws SQLException {
-        return RowIdLifetime.ROWID_UNSUPPORTED;
-    }
-
-    @Override
-    public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public ResultSet getClientInfoProperties() throws SQLException {
-        throw new SQLException("Client info not implemented yet");
-    }
-
-    @Override
-    public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) throws SQLException {
-        return emptyResultSet(log,
-                rscd("FUNCTION_CAT"),
-                rscd("FUNCTION_SCHEM"),
-                rscd("FUNCTION_NAME"),
-                rscd("REMARKS"),
-                rscd("FUNCTION_TYPE", OpenSearchType.SHORT.getTypeName()),
-                rscd("SPECIFIC_NAME")
-        );
-    }
-
-    @Override
-    public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern)
-            throws SQLException {
-        return emptyResultSet(log,
-                rscd("FUNCTION_CAT"),
-                rscd("FUNCTION_SCHEM"),
-                rscd("FUNCTION_NAME"),
-                rscd("COLUMN_NAME"),
-                rscd("COLUMN_TYPE", OpenSearchType.SHORT.getTypeName()),
-                rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName()),
-                rscd("TYPE_NAME"),
-                rscd("PRECISION", OpenSearchType.INTEGER.getTypeName()),
-                rscd("LENGTH", OpenSearchType.INTEGER.getTypeName()),
-                rscd("SCALE", OpenSearchType.SHORT.getTypeName()),
-                rscd("RADIX", OpenSearchType.SHORT.getTypeName()),
-                rscd("NULLABLE", OpenSearchType.SHORT.getTypeName()),
-                rscd("REMARKS"),
-                rscd("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER.getTypeName()),
-                rscd("ORDINAL_POSITION", OpenSearchType.INTEGER.getTypeName()),
-                rscd("IS_NULLABLE"),
-                rscd("SPECIFIC_NAME")
-        );
-    }
-
-    @Override
-    public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
-            throws SQLException {
-
-        return emptyResultSet(log,
-                rscd("TABLE_CAT"),
-                rscd("TABLE_SCHEM"),
-                rscd("TABLE_NAME"),
-                rscd("COLUMN_NAME"),
-                rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName()),
-                rscd("COLUMN_SIZE", OpenSearchType.INTEGER.getTypeName()),
-                rscd("DECIMAL_DIGITS", OpenSearchType.INTEGER.getTypeName()),
-                rscd("NUM_PREC_RADIX", OpenSearchType.INTEGER.getTypeName()),
-                rscd("COLUMN_USAGE"),
-                rscd("REMARKS"),
-                rscd("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER.getTypeName()),
-                rscd("IS_NULLABLE")
-        );
-    }
-
-    @Override
-    public boolean generatedKeyAlwaysReturned() throws SQLException {
-        return false;
-    }
-
-    static ResultSetColumnDescriptor rscd(String name) {
-        return rscd(name, OpenSearchType.TEXT.getTypeName(), null);
-    }
-
-    static ResultSetColumnDescriptor rscd(String name, String type) {
-        return rscd(name, type, null);
-    }
-
-    static ResultSetColumnDescriptor rscd(String name, String type, String label) {
-        return new ResultSetColumnDescriptor(name, type, label);
-    }
-
-    private String getClusterCatalogName() throws SQLException {
-        return connection.getClusterMetadata().getClusterName();
-    }
-
-    private boolean clusterCatalogMatches(String catalog) throws SQLException {
-        return catalog == null || "%".equalsIgnoreCase(catalog) || catalog.equalsIgnoreCase(getClusterCatalogName());
-    }
-
-    private boolean clusterSchemaMatches(String schema) {
-        return schema == null || schema.equals("%") || schema.equals("");
-    }
-
-    private static ResultSetImpl emptyResultSet(Logger log, ResultSetColumnDescriptor... resultSetColumnDescriptors)
-            throws SQLException {
-        List<List<Object>> rows = new ArrayList<>(0);
-        return new ResultSetImpl(null, Arrays.asList(resultSetColumnDescriptors), rows, log);
-    }
-
-    public static class ResultSetColumnDescriptor implements ColumnDescriptor {
-
-        private String name;
-        private String type;
-        private String label;
-
-        public ResultSetColumnDescriptor(String name, String type, String label) {
-            this.name = name;
-            this.type = type;
-            this.label = label;
-        }
-
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public String getType() {
-            return type;
-        }
-
-        @Override
-        public String getLabel() {
-            return label;
-        }
-    }
-
-
-    static class ColumnMetadataStatement extends PreparedStatementImpl {
-        // a special statement with custom logic for building the
-        // ResultSet it returns on execution
-
-        ColumnMetadataStatement(ConnectionImpl connection, String tableNamePattern, String columnNamePattern, Logger log)
-                throws SQLException {
-            // TODO - once sql plugin supports PreparedStatement fully, do this through a preparedStatement with params
-            super(connection, "DESCRIBE TABLES LIKE " + tableNamePattern +
-                (columnNamePattern != null ? (" COLUMNS LIKE " + columnNamePattern) : ""),
-                log);
-        }
-
-        static class ColumnMetadataResultSet extends ResultSetImpl {
-
-            ColumnMetadataResultSet(StatementImpl statement, List<? extends ColumnDescriptor> columnDescriptors,
-                                    List<List<Object>> dataRows, Logger log) throws SQLException {
-                super(statement, columnDescriptors, dataRows, log);
-            }
-
-            private int getDataType() {
-                String esDataType = (String) cursor.getColumn(5);
-                return OpenSearchType.fromTypeName(esDataType, false).sqlTypeNumber();
-            }
-
-            private String getDataTypeName() {
-                String esDataType = (String) cursor.getColumn(5);
-                return OpenSearchType.fromTypeName(esDataType, false).name();
-            }
-
-            private int getColumnSize() {
-                String esDataType = (String) cursor.getColumn(5);
-                return OpenSearchType.fromTypeName(esDataType, false).getPrecision();
-            }
-
-            @Override
-            protected Object getColumnFromCursor(int columnIndex) {
-                // override behavior/return value of some of the columns
-                // received from the server
-                Object columnData = null;
-
-                switch (columnIndex) {
-                    case 5:
-                        columnData = getDataType();
-                        break;
-                    case 6:
-                        columnData = getDataTypeName();
-                        break;
-                    case 7:
-                        columnData = getColumnSize();
-                        break;
-                    default:
-                        columnData = super.getColumnFromCursor(columnIndex);
-
-                }
-
-                return columnData;
-            }
-        }
-
-        @Override
-        protected ResultSetImpl buildResultSet(QueryResponse queryResponse) throws SQLException {
-            // enrich/update the resultSet with some JDBC specific data type info
-            List<ResultSetColumnDescriptor> columnDescriptors = new ArrayList<>();
-
-            for (ColumnDescriptor cd : queryResponse.getColumnDescriptors()) {
-                if ("DATA_TYPE".equals(cd.getName()) || "COLUMN_SIZE".equals(cd.getName())) {
-                    columnDescriptors.add(
-                            rscd(cd.getName(), OpenSearchType.INTEGER.getTypeName()));
-                } else {
-                    columnDescriptors.add(rscd(cd.getName(), cd.getType()));
-                }
-            }
-
-            return new ColumnMetadataResultSet(this, columnDescriptors, queryResponse.getDatarows(), log);
-        }
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/Driver.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/Driver.java
deleted file mode 100644
index 6b08224d32..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/Driver.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.internal.util.UrlParser;
-import org.opensearch.jdbc.logging.LoggingSource;
-import org.opensearch.jdbc.internal.Version;
-import org.opensearch.jdbc.logging.LoggerFactory;
-import org.opensearch.jdbc.logging.NoOpLogger;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.DriverPropertyInfo;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-public class Driver implements java.sql.Driver, LoggingSource {
-
-    //
-    // Register with the DriverManager
-    //
-    static {
-        try {
-            java.sql.DriverManager.registerDriver(new Driver());
-        } catch (SQLException E) {
-            throw new RuntimeException("Can't register driver!");
-        }
-    }
-
-    @Override
-    public Connection connect(String url, Properties info) throws SQLException {
-        ConnectionConfig connectionConfig = ConnectionConfig.builder()
-                .setUrl(url)
-                .setProperties(info)
-                .build();
-        org.opensearch.jdbc.logging.Logger log = initLog(connectionConfig);
-        log.debug(() -> logMessage("connect (%s, %s)", url, info == null ? "null" : info.toString()));
-        log.debug(() -> logMessage("Opening connection using config: %s", connectionConfig));
-        return new ConnectionImpl(connectionConfig, log);
-    }
-
-    @Override
-    public boolean acceptsURL(String url) throws SQLException {
-        return UrlParser.isAcceptable(url);
-    }
-
-    @Override
-    public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
-        // TODO - implement this?
-        return new DriverPropertyInfo[0];
-    }
-
-    @Override
-    public int getMajorVersion() {
-        return Version.Current.getMajor();
-    }
-
-    @Override
-    public int getMinorVersion() {
-        return Version.Current.getMinor();
-    }
-
-    @Override
-    public boolean jdbcCompliant() {
-        return false;
-    }
-
-    @Override
-    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-        throw new SQLFeatureNotSupportedException();
-    }
-
-    static org.opensearch.jdbc.logging.Logger initLog(ConnectionConfig connectionConfig) {
-        // precedence:
-        // 1. explicitly supplied logWriter
-        // 2. logOutput property
-        // 3. DriverManager logWriter
-        if (connectionConfig.getLogWriter() != null) {
-
-            return LoggerFactory.getLogger(connectionConfig.getLogWriter(), connectionConfig.getLogLevel());
-
-        } else if (connectionConfig.getLogOutput() != null) {
-
-            return LoggerFactory.getLogger(connectionConfig.getLogOutput(), connectionConfig.getLogLevel());
-
-        } else if (DriverManager.getLogWriter() != null) {
-
-            return LoggerFactory.getLogger(DriverManager.getLogWriter(), connectionConfig.getLogLevel());
-
-        } else {
-
-            return NoOpLogger.INSTANCE;
-        }
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/OpenSearchConnection.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/OpenSearchConnection.java
deleted file mode 100644
index 1871cc9b73..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/OpenSearchConnection.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import java.sql.SQLException;
-
-public interface OpenSearchConnection extends java.sql.Connection {
-
-    String getClusterName() throws SQLException;
-
-    String getClusterUUID() throws SQLException;
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/OpenSearchDataSource.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/OpenSearchDataSource.java
deleted file mode 100644
index c5c1b5f183..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/OpenSearchDataSource.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.config.AwsCredentialsProviderProperty;
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.config.LoginTimeoutConnectionProperty;
-import org.opensearch.jdbc.config.PasswordConnectionProperty;
-import org.opensearch.jdbc.config.UserConnectionProperty;
-import org.opensearch.jdbc.internal.JdbcWrapper;
-import org.opensearch.jdbc.internal.util.UrlParser;
-import org.opensearch.jdbc.logging.LoggingSource;
-import com.amazonaws.auth.AWSCredentialsProvider;
-
-import javax.sql.DataSource;
-import java.io.PrintWriter;
-import java.net.URISyntaxException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-/**
- * OpenSearch {@link DataSource} implementation.
- * <p>
- * Connection properties are expected to be included in a
- * JDBC connection URL and supplied to the DataSource via
- * {@link #setUrl(String)}.
- * <p>
- * Where properties like login timeout
- * have explicit setters in the DataSource API as well, the property
- * value specified directly on the DataSource overrides the
- * corresponding property value in the JDBC URL. Also, getter methods
- * for such properties return the value that was explicitly set on
- * the DataSource, and not the value that might be present on the JDBC URL.
- */
-public class OpenSearchDataSource implements DataSource, JdbcWrapper, LoggingSource {
-
-    private String url;
-
-    // properties that may come from URL as also be directly set on
-    // DataSource are recorded in this map to help maintain the
-    // precedence order of applying properties:
-    // - values directly set on DataSource override values in URL and,
-    // - if no value is explicitly set on the DataSource, then the
-    //  value in the URL is applied.
-    private Map<String, Object> connectionProperties = new HashMap<>();
-    private PrintWriter logWriter;
-
-    @Override
-    public Connection getConnection() throws SQLException {
-        return getConnection(null);
-    }
-
-    @Override
-    public Connection getConnection(String username, String password) throws SQLException {
-        Map<String, Object> overrideProperties = new HashMap<>();
-        overrideProperties.put(UserConnectionProperty.KEY, username);
-        overrideProperties.put(PasswordConnectionProperty.KEY, password);
-
-        return getConnection(overrideProperties);
-    }
-
-    @Override
-    public PrintWriter getLogWriter() throws SQLException {
-        return logWriter;
-    }
-
-    @Override
-    public void setLogWriter(PrintWriter out) throws SQLException {
-        this.logWriter = out;
-    }
-
-    @Override
-    public void setLoginTimeout(int seconds) throws SQLException {
-        // property parsed here to ensure fail-fast behavior with property validation
-        LoginTimeoutConnectionProperty property = new LoginTimeoutConnectionProperty();
-        property.setRawValue(seconds);
-        connectionProperties.put(LoginTimeoutConnectionProperty.KEY, property.getValue());
-    }
-
-    @Override
-    public int getLoginTimeout() throws SQLException {
-        return (Integer) getConnectionProperty(LoginTimeoutConnectionProperty.KEY, -1);
-    }
-
-    @Override
-    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-        throw new SQLFeatureNotSupportedException("DataSource does not use java.util.logging");
-    }
-
-    /**
-     * Sets the JDBC connection URL for the DataSource.
-     *
-     * @param url the jdbc connection url to use for establishing and
-     *         configuring a connection
-     *
-     * @throws SQLException if there is a problem in setting the url
-     */
-    public void setUrl(String url) throws SQLException {
-        this.url = url;
-        try {
-            // fail-fast on invalid url
-            UrlParser.parseProperties(url);
-        } catch (URISyntaxException e) {
-            throw new SQLException("Invalid connection URL", e);
-        }
-    }
-    
-    public void setAwsCredentialProvider(AWSCredentialsProvider awsCredentialProvider) {
-        connectionProperties.put(AwsCredentialsProviderProperty.KEY, awsCredentialProvider);
-    }
-
-    /**
-     * Updates DataSource configuration properties from the specified
-     * {@link Properties} object.
-     * <p>
-     * All properties already set on the DataSource - either from a
-     * prior call to this method or any other setters on this DataSource
-     * are discarded, and the properties passed in the specified
-     * {@link Properties} object are applied. All properties in the
-     * properties object, including any default values get applied on the
-     * DataSource.
-     *
-     * @param properties The property object containing properties to
-     *         apply.
-     *
-     * @throws SQLException if there is a problem in applying the
-     *         specified properties
-     */
-    public void setProperties(Properties properties) throws SQLException {
-        this.connectionProperties.clear();
-
-        if (properties != null) {
-            Enumeration<?> propertyNames = properties.propertyNames();
-            while (propertyNames.hasMoreElements()) {
-                String propertyName = (String) propertyNames.nextElement();
-                this.connectionProperties.put(propertyName, properties.getProperty(propertyName));
-            }
-        }
-    }
-
-    public String getUrl() throws SQLException {
-        return url;
-    }
-
-
-    private Object getConnectionProperty(String key, Object defaultValue) {
-        return connectionProperties.getOrDefault(key, defaultValue);
-    }
-
-    private Connection getConnection(Map<String, Object> overrideProperties)
-            throws SQLException {
-        ConnectionConfig connectionConfig = getConnectionConfig(overrideProperties);
-        org.opensearch.jdbc.logging.Logger log = Driver.initLog(connectionConfig);
-        log.debug(() -> logMessage("Opening connection using config: %s", connectionConfig));
-        return new ConnectionImpl(connectionConfig, log);
-    }
-
-    ConnectionConfig getConnectionConfig(Map<String, Object> overrideProperties)
-            throws SQLException {
-        return ConnectionConfig.builder()
-                .setUrl(url)
-                .setPropertyMap(connectionProperties)
-                .setLogWriter(logWriter)
-                .overrideProperties(overrideProperties)
-                .build();
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/OpenSearchVersion.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/OpenSearchVersion.java
deleted file mode 100644
index f62662b09b..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/OpenSearchVersion.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-public interface OpenSearchVersion {
-    int getMajor();
-
-    int getMinor();
-
-    int getRevision();
-
-    String getFullVersion();
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/PreparedStatementImpl.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/PreparedStatementImpl.java
deleted file mode 100644
index d9e01e7c4b..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/PreparedStatementImpl.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.protocol.JdbcQueryRequest;
-import org.opensearch.jdbc.types.OpenSearchType;
-import org.opensearch.jdbc.types.TypeConverters;
-import org.opensearch.jdbc.internal.util.SqlParser;
-import org.opensearch.jdbc.logging.Logger;
-import org.opensearch.jdbc.protocol.JdbcDateTimeFormatter;
-import org.opensearch.jdbc.protocol.JdbcQueryParam;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.JDBCType;
-import java.sql.NClob;
-import java.sql.ParameterMetaData;
-import java.sql.PreparedStatement;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.RowId;
-import java.sql.SQLDataException;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.sql.SQLNonTransientException;
-import java.sql.SQLXML;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-
-public class PreparedStatementImpl extends StatementImpl implements PreparedStatement {
-    // TODO - support String representations containing Timestamp With Timezone
-    protected String sql;
-    private JdbcQueryParam[] parameters;
-
-    public PreparedStatementImpl(ConnectionImpl connection, String sql, Logger log) throws SQLException {
-        super(connection, log);
-        this.sql = sql;
-
-        try {
-            parameters = new JdbcQueryParam[SqlParser.countParameterMarkers(sql)];
-        } catch (IllegalArgumentException iae) {
-            logAndThrowSQLException(
-                    log,
-                    new SQLNonTransientException( "Error preparing SQL statement: "+iae.getMessage(), iae));
-        }
-    }
-
-    @Override
-    public ResultSet executeQuery() throws SQLException {
-        log.debug(() -> logEntry("executeQuery()"));
-        checkOpen();
-        ResultSet rs = executeQueryX(getFetchSize());
-        log.debug(() -> logExit("executeQuery", rs));
-        return rs;
-    }
-
-    protected ResultSet executeQueryX(int fetchSize) throws SQLException {
-        checkParamsFilled();
-        JdbcQueryRequest jdbcQueryRequest = new JdbcQueryRequest(sql, fetchSize);
-        jdbcQueryRequest.setParameters(Arrays.asList(parameters));
-        return executeQueryRequest(jdbcQueryRequest);
-    }
-
-    @Override
-    public int executeUpdate() throws SQLException {
-        throw new SQLFeatureNotSupportedException("Updates are not supported");
-    }
-
-    @Override
-    public void setNull(int parameterIndex, int sqlType) throws SQLException {
-        log.debug(() -> logEntry("setNull(%d, %d)", parameterIndex, sqlType));
-        checkOpen();
-        setParameter(parameterIndex, OpenSearchType.fromJdbcType(JDBCType.valueOf(sqlType)).getTypeName(), null);
-        log.debug(() -> logExit("setNull"));
-    }
-
-    @Override
-    public void setBoolean(int parameterIndex, boolean x) throws SQLException {
-        log.debug(() -> logEntry("setBoolean(%d, %s)", parameterIndex, x));
-        checkOpen();
-        setObjectX(parameterIndex, x, Types.BOOLEAN);
-        log.debug(() -> logExit("setBoolean"));
-    }
-
-    @Override
-    public void setByte(int parameterIndex, byte x) throws SQLException {
-        log.debug(() -> logEntry("setByte(%d, %d)", parameterIndex, x));
-        checkOpen();
-        setObjectX(parameterIndex, x, Types.TINYINT);
-        log.debug(() -> logExit("setByte"));
-    }
-
-    @Override
-    public void setShort(int parameterIndex, short x) throws SQLException {
-        log.debug(() -> logEntry("setShort(%d, %d)", parameterIndex, x));
-        checkOpen();
-        setObjectX(parameterIndex, x, Types.SMALLINT);
-        log.debug(() -> logExit("setShort"));
-    }
-
-    @Override
-    public void setInt(int parameterIndex, int x) throws SQLException {
-        log.debug(() -> logEntry("setInt(%d, %d)", parameterIndex, x));
-        checkOpen();
-        setObjectX(parameterIndex, x, Types.INTEGER);
-        log.debug(() -> logExit("setInt"));
-    }
-
-    @Override
-    public void setLong(int parameterIndex, long x) throws SQLException {
-        log.debug(() -> logEntry("setLong(%d, %d)", parameterIndex, x));
-        checkOpen();
-        setObjectX(parameterIndex, x, Types.BIGINT);
-        log.debug(() -> logExit("setLong"));
-    }
-
-    @Override
-    public void setFloat(int parameterIndex, float x) throws SQLException {
-        log.debug(() -> logEntry("setFloat(%d, %f)", parameterIndex, x));
-        checkOpen();
-        setObjectX(parameterIndex, x, Types.REAL);
-        log.debug(() -> logExit("setFloat"));
-    }
-
-    @Override
-    public void setDouble(int parameterIndex, double x) throws SQLException {
-        log.debug(() -> logEntry("setDouble(%d, %f)", parameterIndex, x));
-        checkOpen();
-        setObjectX(parameterIndex, x, Types.DOUBLE);
-        log.debug(() -> logExit("setDouble"));
-    }
-
-    @Override
-    public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException {
-        throw new SQLFeatureNotSupportedException("BigDecimal is not supported");
-    }
-
-    @Override
-    public void setString(int parameterIndex, String x) throws SQLException {
-        log.debug(() -> logEntry("setString(%d, %s)", parameterIndex, x));
-        checkOpen();
-        setParameter(parameterIndex, OpenSearchType.fromJdbcType(JDBCType.VARCHAR).getTypeName(), x);
-        log.debug(() -> logExit("setString"));
-    }
-
-    @Override
-    public void setBytes(int parameterIndex, byte[] x) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Setting byte arrays is not supported");
-    }
-
-    @Override
-    public void setDate(int parameterIndex, Date x) throws SQLException {
-        log.debug(() -> logEntry("setDate(%d, %s)", parameterIndex, x));
-        checkOpen();
-        setObjectX(parameterIndex, x, Types.DATE);
-        log.debug(() -> logExit("setDate"));
-    }
-
-    @Override
-    public void setTime(int parameterIndex, Time x) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Setting Time is not supported");
-    }
-
-    @Override
-    public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException {
-        log.debug(() -> logEntry("setTimestamp(%d, %s)", parameterIndex, x));
-        checkOpen();
-        setObjectX(parameterIndex, x, Types.TIMESTAMP);
-        log.debug(() -> logExit("setTimestamp"));
-    }
-
-    @Override
-    public void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Setting ASCII Stream is not supported");
-    }
-
-    @Override
-    public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Setting Unicode Stream is not supported");
-    }
-
-    @Override
-    public void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Setting Binary Stream is not supported");
-    }
-
-    @Override
-    public void clearParameters() throws SQLException {
-        log.debug(() -> logEntry("clearParameters()"));
-        for (int i = 0; i < parameters.length; i++)
-            parameters[i] = null;
-        log.debug(() -> logExit("clearParameters"));
-    }
-
-    @Override
-    public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException {
-        log.debug(() -> logEntry("setObject(%d, %s, %d)", parameterIndex, x, targetSqlType));
-        checkOpen();
-        setObjectX(parameterIndex, x, targetSqlType, null);
-        log.debug(() -> logExit("setObject"));
-    }
-
-    private void setObjectX(int parameterIndex, Object x, int targetSqlType) throws SQLException {
-        setObjectX(parameterIndex, x, targetSqlType, null);
-    }
-
-    private void setObjectX(int parameterIndex, Object x, int targetSqlType, Map<String, Object> conversionParams)
-            throws SQLException {
-        JDBCType jdbcType = JDBCType.valueOf(targetSqlType);
-        OpenSearchType openSearchType = OpenSearchType.fromJdbcType(jdbcType);
-
-        Object value = TypeConverters.getInstance(jdbcType).convert(x, null, conversionParams);
-
-        // flow date/times in JDBC escape format
-        if (jdbcType == JDBCType.TIMESTAMP) {
-            value = JdbcDateTimeFormatter.JDBC_FORMAT.format((Timestamp) value);
-        } else if (jdbcType == JDBCType.DATE) {
-            value = JdbcDateTimeFormatter.JDBC_FORMAT.format((Date) value);
-        }
-
-        setParameter(parameterIndex, openSearchType.getTypeName(), value);
-    }
-
-    @Override
-    public void setObject(int parameterIndex, Object x) throws SQLException {
-        log.debug(() -> logEntry("setObject(%d, %s)", parameterIndex, x));
-        checkOpen();
-        setObjectX(parameterIndex, x, javaToSqlType(x));
-        log.debug(() -> logExit("setObject"));
-    }
-
-    private JDBCType javaToJDBCType(Object x) throws SQLException {
-        // Based on JDBC spec, Table B-4
-        // TODO support java.time.* and JDBCType.TIME_WITH_TIMEZONE/JDBCType.TIMESTAMP_WITH_TIMEZONE
-
-        if (x instanceof String)
-            return JDBCType.VARCHAR;
-        else if (x instanceof Boolean)
-            return JDBCType.BOOLEAN;
-        else if (x instanceof Byte)
-            return JDBCType.TINYINT;
-        else if (x instanceof Short)
-            return JDBCType.SMALLINT;
-        else if (x instanceof Integer)
-            return JDBCType.INTEGER;
-        else if (x instanceof Long)
-            return JDBCType.BIGINT;
-        else if (x instanceof Float)
-            return JDBCType.REAL;
-        else if (x instanceof Double)
-            return JDBCType.DOUBLE;
-        else if (x instanceof byte[])
-            return JDBCType.VARBINARY;
-        else if (x instanceof java.sql.Date)
-            return JDBCType.DATE;
-        else if (x instanceof java.sql.Timestamp)
-            return JDBCType.TIMESTAMP;
-        else
-            throw new SQLDataException("Objects of type " + x.getClass().getName() + " not supported.");
-    }
-
-    private int javaToSqlType(Object x) throws SQLException {
-        return javaToJDBCType(x).getVendorTypeNumber();
-    }
-
-    @Override
-    public boolean execute() throws SQLException {
-        log.debug(() -> logEntry("execute()"));
-        checkOpen();
-        executeQueryX(getFetchSize());
-        log.debug(() -> logExit("execute", true));
-        return true;
-    }
-
-    @Override
-    public void addBatch() throws SQLException {
-        throw new SQLFeatureNotSupportedException("addBatch is not supported");
-    }
-
-    @Override
-    public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setCharacterStream is not supported");
-    }
-
-    @Override
-    public void setRef(int parameterIndex, Ref x) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setRef is not supported");
-    }
-
-    @Override
-    public void setBlob(int parameterIndex, Blob x) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setBlob is not supported");
-    }
-
-    @Override
-    public void setClob(int parameterIndex, Clob x) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setClob is not supported");
-    }
-
-    @Override
-    public void setArray(int parameterIndex, Array x) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setArray is not supported");
-    }
-
-    @Override
-    public ResultSetMetaData getMetaData() throws SQLException {
-        // can only return metadata after query execution
-        log.debug(() -> logEntry("getMetaData ()"));
-        ResultSetMetaData rsmd = resultSet != null ? resultSet.getMetaData() : null;
-        log.debug(() -> logExit("getMetaData", rsmd));
-        return rsmd;
-    }
-
-    @Override
-    public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException {
-        log.debug(() -> logEntry("setDate (%d, %s, %s)", parameterIndex, x,
-                cal == null ? "null" : "Calendar TZ= " + cal.getTimeZone()));
-        checkOpen();
-        Map<String, Object> conversionParams = new HashMap<>();
-        conversionParams.put("calendar", cal);
-
-        setObjectX(parameterIndex, x, Types.DATE, conversionParams);
-        log.debug(() -> logExit("setDate"));
-    }
-
-    @Override
-    public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {
-        // TODO - implement
-    }
-
-    @Override
-    public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException {
-        log.debug(() -> logEntry("setTimestamp (%d, %s, %s)", parameterIndex, x,
-                cal == null ? "null" : "Calendar TZ= " + cal.getTimeZone()));
-        checkOpen();
-        Map<String, Object> conversionParams = new HashMap<>();
-        conversionParams.put("calendar", cal);
-        setObjectX(parameterIndex, x, Types.TIMESTAMP, conversionParams);
-        log.debug(() -> logExit("setTimestamp"));
-    }
-
-    @Override
-    public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException {
-        // TODO - implement?
-    }
-
-    @Override
-    public void setURL(int parameterIndex, URL x) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setURL not supported");
-    }
-
-    @Override
-    public ParameterMetaData getParameterMetaData() throws SQLException {
-        // can't determine parameterMetadata as we don't have a query
-        // "prepare" phase that could return us this info from the server
-        // where the query gets parsed
-        return null;
-    }
-
-    @Override
-    public void setRowId(int parameterIndex, RowId x) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setRowId not supported");
-    }
-
-    @Override
-    public void setNString(int parameterIndex, String value) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setNString not supported");
-    }
-
-    @Override
-    public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setNCharacterStream not supported");
-    }
-
-    @Override
-    public void setNClob(int parameterIndex, NClob value) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setNClob not supported");
-    }
-
-    @Override
-    public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setClob not supported");
-    }
-
-    @Override
-    public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setBlob not supported");
-    }
-
-    @Override
-    public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setNClob not supported");
-    }
-
-    @Override
-    public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setSQLXML not supported");
-    }
-
-    @Override
-    public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException {
-        // currently ignore scaleOrLength
-        setObjectX(parameterIndex, x, targetSqlType);
-    }
-
-    @Override
-    public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setAsciiStream not supported");
-    }
-
-    @Override
-    public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setBinaryStream not supported");
-    }
-
-    @Override
-    public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setCharacterStream not supported");
-    }
-
-    @Override
-    public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setAsciiStream not supported");
-    }
-
-    @Override
-    public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setBinaryStream not supported");
-    }
-
-    @Override
-    public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setCharacterStream not supported");
-    }
-
-    @Override
-    public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setNCharacterStream not supported");
-    }
-
-    @Override
-    public void setClob(int parameterIndex, Reader reader) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setClob not supported");
-    }
-
-    @Override
-    public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setBlob not supported");
-    }
-
-    @Override
-    public void setNClob(int parameterIndex, Reader reader) throws SQLException {
-        throw new SQLFeatureNotSupportedException("setNClob not supported");
-    }
-
-    private void checkParamsFilled() throws SQLException {
-        int filled = 0;
-
-        for (int i = 0; i < parameters.length; i++) {
-            if (parameters[i] != null) {
-                filled++;
-            }
-        }
-
-        if (filled < parameters.length)
-            logAndThrowSQLException(log, new SQLDataException(
-                    String.format("Missing parameter values. The PreparedStatement " +
-                                    "requires %d parameter values but only %d were found.",
-                            parameters.length, filled)));
-    }
-
-    protected void setParameter(int index, String type, Object value) throws SQLException {
-        checkParamIndex(index);
-        parameters[index - 1] = new JdbcQueryParam(type, value);
-    }
-
-    private void checkParamIndex(int index) throws SQLException {
-        if (parameters == null || index < 1 || index > parameters.length)
-            logAndThrowSQLException(log, new SQLDataException("Invalid parameter index " + index));
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/ResultSetImpl.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/ResultSetImpl.java
deleted file mode 100644
index 3cace79694..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/ResultSetImpl.java
+++ /dev/null
@@ -1,1473 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.internal.results.ColumnMetaData;
-import org.opensearch.jdbc.internal.results.Cursor;
-import org.opensearch.jdbc.internal.exceptions.ObjectClosedException;
-import org.opensearch.jdbc.internal.results.Row;
-import org.opensearch.jdbc.internal.results.Schema;
-import org.opensearch.jdbc.logging.LoggingSource;
-import org.opensearch.jdbc.logging.Logger;
-import org.opensearch.jdbc.protocol.ColumnDescriptor;
-import org.opensearch.jdbc.internal.JdbcWrapper;
-import org.opensearch.jdbc.protocol.QueryResponse;
-import org.opensearch.jdbc.protocol.exceptions.InternalServerErrorException;
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-import org.opensearch.jdbc.protocol.http.JdbcCursorQueryRequest;
-import org.opensearch.jdbc.protocol.http.JsonCursorHttpProtocol;
-import org.opensearch.jdbc.protocol.http.JsonCursorHttpProtocolFactory;
-import org.opensearch.jdbc.transport.http.HttpTransport;
-import org.opensearch.jdbc.types.TypeConverter;
-import org.opensearch.jdbc.types.TypeConverters;
-import org.opensearch.jdbc.types.UnrecognizedOpenSearchTypeException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.RowId;
-import java.sql.SQLDataException;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.sql.SQLNonTransientException;
-import java.sql.SQLWarning;
-import java.sql.SQLXML;
-import java.sql.Statement;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * OpenSearch implementaion for a {@link ResultSet}
- * <p>
- * Column names or labels received in APIs are treated in a
- * case-sensitive manner since OpenSearch field names are
- * case-sensitive.
- * </p>
- * The lookup
- */
-public class ResultSetImpl implements ResultSet, JdbcWrapper, LoggingSource {
-
-    private StatementImpl statement;
-    protected Cursor cursor;
-    private String cursorId;
-    private boolean open = false;
-    private boolean wasNull = false;
-    private boolean afterLast = false;
-    private boolean beforeFirst = true;
-    private Logger log;
-
-    public ResultSetImpl(StatementImpl statement, QueryResponse queryResponse, Logger log) throws SQLException {
-        this(statement, queryResponse.getColumnDescriptors(), queryResponse.getDatarows(), queryResponse.getCursor(), log);
-    }
-
-    public ResultSetImpl(StatementImpl statement, List<? extends ColumnDescriptor> columnDescriptors,
-                         List<List<Object>> dataRows, Logger log) throws SQLException {
-        this(statement, columnDescriptors, dataRows, null, log);
-    }
-
-    public ResultSetImpl(StatementImpl statement, List<? extends ColumnDescriptor> columnDescriptors,
-                         List<List<Object>> dataRows, String cursorId, Logger log) throws SQLException {
-        this.statement = statement;
-        this.log = log;
-
-        final Schema schema;
-        try {
-            schema = new Schema(columnDescriptors
-                    .stream()
-                    .map(ColumnMetaData::new)
-                    .collect(Collectors.toList()));
-
-            List<Row> rows = getRowsFromDataRows(dataRows);
-
-            this.cursor = new Cursor(schema, rows);
-            this.cursorId = cursorId;
-            this.open = true;
-
-        } catch (UnrecognizedOpenSearchTypeException ex) {
-            logAndThrowSQLException(log, new SQLException("Exception creating a ResultSet.", ex));
-        }
-
-    }
-
-    @Override
-    public boolean next() throws SQLException {
-        log.debug(() -> logEntry("next()"));
-        checkOpen();
-        boolean next = cursor.next();
-
-        if (!next && this.cursorId != null) {
-            log.debug(() -> logEntry("buildNextPageFromCursorId()"));
-            buildNextPageFromCursorId();
-            log.debug(() -> logExit("buildNextPageFromCursorId()"));
-            next = cursor.next();
-        }
-
-        if (next) {
-            beforeFirst = false;
-        } else {
-            afterLast = true;
-        }
-        boolean finalNext = next;
-        log.debug(() -> logExit("next", finalNext));
-        return next;
-    }
-
-    /**
-     * TODO: Refactor as suggested https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/76#discussion_r421571383
-     *
-     * This method has side effects. It creates a new Cursor to hold rows from new pages.
-     * Ideally fetching next set of rows using cursorId should be delegated to Cursor.
-     * In addition, the cursor should be final.
-     *
-     **/
-    protected void buildNextPageFromCursorId() throws SQLException {
-        try {
-            JdbcCursorQueryRequest jdbcCursorQueryRequest = new JdbcCursorQueryRequest(this.cursorId);
-            JsonCursorHttpProtocolFactory protocolFactory = JsonCursorHttpProtocolFactory.INSTANCE;
-            ConnectionImpl connection = (ConnectionImpl) statement.getConnection();
-
-            JsonCursorHttpProtocol protocol = protocolFactory.getProtocol(null, (HttpTransport) connection.getTransport());
-            QueryResponse queryResponse = protocol.execute(jdbcCursorQueryRequest);
-
-            if (queryResponse.getError() != null) {
-                throw new InternalServerErrorException(
-                        queryResponse.getError().getReason(),
-                        queryResponse.getError().getType(),
-                        queryResponse.getError().getDetails());
-            }
-
-            cursor = new Cursor(cursor.getSchema(), getRowsFromDataRows(queryResponse.getDatarows()));
-            cursorId = queryResponse.getCursor();
-
-        } catch (ResponseException | IOException ex) {
-            logAndThrowSQLException(log, new SQLException("Error executing cursor query", ex));
-        }
-    }
-
-    private List<Row> getRowsFromDataRows(List<List<Object>> dataRows) {
-        return dataRows
-                .parallelStream()
-                .map(Row::new)
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public void close() throws SQLException {
-        log.debug(() -> logEntry("close()"));
-        closeX(true);
-        log.debug(() -> logExit("close"));
-    }
-
-    protected void closeX(boolean closeStatement) throws SQLException {
-        cursor = null;
-        open = false;
-        if (statement != null) {
-            statement.resultSetClosed(this, closeStatement);
-        }
-    }
-
-    @Override
-    public boolean wasNull() throws SQLException {
-        return wasNull;
-    }
-
-    @Override
-    public String getString(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getString (%d)", columnIndex));
-        checkCursorOperationPossible();
-        String value = getStringX(columnIndex);
-        log.debug(() -> logExit("getString", value));
-        return value;
-    }
-
-    private String getStringX(int columnIndex) throws SQLException {
-        return getObjectX(columnIndex, String.class);
-    }
-
-    @Override
-    public boolean getBoolean(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getBoolean (%d)", columnIndex));
-        checkCursorOperationPossible();
-        boolean value = getBooleanX(columnIndex);
-        log.debug(() -> logExit("getBoolean", value));
-        return value;
-    }
-
-    private boolean getBooleanX(int columnIndex) throws SQLException {
-        return getObjectX(columnIndex, Boolean.class);
-    }
-
-    @Override
-    public byte getByte(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getByte (%d)", columnIndex));
-        checkCursorOperationPossible();
-        byte value = getByteX(columnIndex);
-        log.debug(() -> logExit("getByte", value));
-        return value;
-    }
-
-    private byte getByteX(int columnIndex) throws SQLException {
-        return getObjectX(columnIndex, Byte.class);
-    }
-
-    @Override
-    public short getShort(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getShort (%d)", columnIndex));
-        checkCursorOperationPossible();
-        short value = getShortX(columnIndex);
-        log.debug(() -> logExit("getShort", value));
-        return value;
-    }
-
-    private short getShortX(int columnIndex) throws SQLException {
-        return getObjectX(columnIndex, Short.class);
-    }
-
-    @Override
-    public int getInt(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getInt (%d)", columnIndex));
-        checkCursorOperationPossible();
-        int value = getIntX(columnIndex);
-        log.debug(() -> logExit("getInt", value));
-        return value;
-    }
-
-    private int getIntX(int columnIndex) throws SQLException {
-        return getObjectX(columnIndex, Integer.class);
-    }
-
-    @Override
-    public long getLong(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getLong (%d)", columnIndex));
-        checkCursorOperationPossible();
-        long value = getLongX(columnIndex);
-        log.debug(() -> logExit("getLong", value));
-        return value;
-    }
-
-    private long getLongX(int columnIndex) throws SQLException {
-        checkCursorOperationPossible();
-        return getObjectX(columnIndex, Long.class);
-    }
-
-    @Override
-    public float getFloat(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getFloat (%d)", columnIndex));
-        checkCursorOperationPossible();
-        float value = getFloatX(columnIndex);
-        log.debug(() -> logExit("getFloat", value));
-        return value;
-    }
-
-    private float getFloatX(int columnIndex) throws SQLException {
-        return getObjectX(columnIndex, Float.class);
-    }
-
-    @Override
-    public double getDouble(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getDouble (%d)", columnIndex));
-        checkCursorOperationPossible();
-        double value = getDoubleX(columnIndex);
-        log.debug(() -> logExit("getDouble", value));
-        return value;
-    }
-
-    private double getDoubleX(int columnIndex) throws SQLException {
-        return getObjectX(columnIndex, Double.class);
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
-        log.debug(() -> logEntry("getBigDecimal (%d, %d)", columnIndex, scale));
-        checkCursorOperationPossible();
-        BigDecimal value = getBigDecimalX(columnIndex, scale);
-        log.debug(() -> logExit("getBigDecimal", value));
-        return value;
-    }
-
-    private BigDecimal getBigDecimalX(int columnIndex, int scale) throws SQLException {
-        checkOpen();
-        // TODO - add support?
-        throw new SQLFeatureNotSupportedException("BigDecimal is not supported");
-    }
-
-    @Override
-    public byte[] getBytes(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getBytes (%d)", columnIndex));
-        checkCursorOperationPossible();
-        byte[] value = getBytesX(columnIndex);
-        log.debug(() -> logExit("getBytes",
-                String.format("%s, length(%s)", value, value != null ? value.length : 0)));
-        return value;
-    }
-
-    private byte[] getBytesX(int columnIndex) throws SQLException {
-        // TODO - add ByteArrayType support
-        return getObjectX(columnIndex, byte[].class);
-    }
-
-    @Override
-    public Date getDate(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getDate (%d)", columnIndex));
-        checkCursorOperationPossible();
-        Date value = getDateX(columnIndex, null);
-        log.debug(() -> logExit("getDate", value));
-        return value;
-    }
-
-    private Date getDateX(int columnIndex, Calendar calendar) throws SQLException {
-        Map<String, Object> conversionParams = null;
-        if (calendar != null) {
-            conversionParams = new HashMap<>();
-            conversionParams.put("calendar", calendar);
-        }
-        return getObjectX(columnIndex, Date.class, conversionParams);
-    }
-
-    @Override
-    public Time getTime(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getTime (%d)", columnIndex));
-        checkCursorOperationPossible();
-        Time value = getTimeX(columnIndex);
-        log.debug(() -> logExit("getTime", value));
-        return value;
-    }
-
-    private Time getTimeX(int columnIndex) throws SQLException {
-        // TODO - add/check support
-        return getObjectX(columnIndex, Time.class);
-    }
-
-    @Override
-    public Timestamp getTimestamp(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getTimestamp (%d)", columnIndex));
-        checkCursorOperationPossible();
-        Timestamp value = getTimestampX(columnIndex, null);
-        log.debug(() -> logExit("getTimestamp", value));
-        return value;
-    }
-
-    private Timestamp getTimestampX(int columnIndex, Calendar calendar) throws SQLException {
-        Map<String, Object> conversionParams = null;
-        if (calendar != null) {
-            conversionParams = new HashMap<>();
-            conversionParams.put("calendar", calendar);
-        }
-        return getObjectX(columnIndex, Timestamp.class, conversionParams);
-    }
-
-    @Override
-    public InputStream getAsciiStream(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Streams are not supported");
-    }
-
-    @Override
-    public InputStream getUnicodeStream(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Streams are not supported");
-    }
-
-    @Override
-    public InputStream getBinaryStream(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Streams are not supported");
-    }
-
-    @Override
-    public String getString(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getString (%s)", columnLabel));
-        checkCursorOperationPossible();
-        String value = getStringX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getString", value));
-        return value;
-    }
-
-    @Override
-    public boolean getBoolean(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getBoolean (%s)", columnLabel));
-        checkCursorOperationPossible();
-        boolean value = getBooleanX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getBoolean", value));
-        return value;
-    }
-
-    @Override
-    public byte getByte(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getByte (%s)", columnLabel));
-        checkCursorOperationPossible();
-        byte value = getByteX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getByte", value));
-        return value;
-    }
-
-    @Override
-    public short getShort(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getShort (%s)", columnLabel));
-        checkCursorOperationPossible();
-        short value = getShortX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getShort", value));
-        return value;
-    }
-
-    @Override
-    public int getInt(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getInt (%s)", columnLabel));
-        checkCursorOperationPossible();
-        int value = getIntX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getInt", value));
-        return value;
-    }
-
-    @Override
-    public long getLong(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getLong (%s)", columnLabel));
-        checkCursorOperationPossible();
-        long value = getLongX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getLong", value));
-        return value;
-    }
-
-    @Override
-    public float getFloat(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getFloat (%s)", columnLabel));
-        checkCursorOperationPossible();
-        float value = getFloatX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getFloat", value));
-        return value;
-    }
-
-    @Override
-    public double getDouble(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getDouble (%s)", columnLabel));
-        checkCursorOperationPossible();
-        double value = getDoubleX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getDouble", value));
-        return value;
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException {
-        log.debug(() -> logEntry("getBigDecimal (%s, %d)", columnLabel, scale));
-        checkCursorOperationPossible();
-        BigDecimal value = getBigDecimalX(getColumnIndex(columnLabel), scale);
-        log.debug(() -> logExit("getBigDecimal", value));
-        return value;
-    }
-
-    @Override
-    public byte[] getBytes(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getBytes (%s)", columnLabel));
-        checkCursorOperationPossible();
-        byte[] value = getBytesX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getBytes",
-                String.format("%s, length(%s)", value, value != null ? value.length : 0)));
-        return value;
-    }
-
-    @Override
-    public Date getDate(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getDate (%s)", columnLabel));
-        checkCursorOperationPossible();
-        Date value = getDateX(getColumnIndex(columnLabel), null);
-        log.debug(() -> logExit("getDate", value));
-        return value;
-    }
-
-    @Override
-    public Time getTime(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getTime (%s)", columnLabel));
-        checkCursorOperationPossible();
-        Time value = getTimeX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getTime", value));
-        return value;
-    }
-
-    @Override
-    public Timestamp getTimestamp(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getTimestamp (%s)", columnLabel));
-        checkCursorOperationPossible();
-        Timestamp value = getTimestampX(getColumnIndex(columnLabel), null);
-        log.debug(() -> logExit("getTimestamp", value));
-        return value;
-    }
-
-    @Override
-    public InputStream getAsciiStream(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Streams are not supported");
-    }
-
-    @Override
-    public InputStream getUnicodeStream(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Streams are not supported");
-    }
-
-    @Override
-    public InputStream getBinaryStream(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Streams are not supported");
-    }
-
-    @Override
-    public SQLWarning getWarnings() throws SQLException {
-        checkOpen();
-        return null;
-    }
-
-    @Override
-    public void clearWarnings() throws SQLException {
-        checkOpen();
-    }
-
-    @Override
-    public String getCursorName() throws SQLException {
-        throw new SQLFeatureNotSupportedException("Cursor name is not supported");
-    }
-
-    @Override
-    public ResultSetMetaData getMetaData() throws SQLException {
-        checkOpen();
-        return new ResultSetMetaDataImpl(this, cursor.getSchema());
-    }
-
-    @Override
-    public Object getObject(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getObject (%d)", columnIndex));
-        checkCursorOperationPossible();
-        Object value = getObjectX(columnIndex);
-        log.debug(() -> logExit("getObject",
-                value != null ? "(" + value.getClass().getName() + ") " + value : "null"));
-        return value;
-    }
-
-    @Override
-    public Object getObject(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getObject (%s)", columnLabel));
-        checkCursorOperationPossible();
-        Object value = getObjectX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getObject",
-                value != null ? "(" + value.getClass().getName() + ") " + value : "null"));
-        return value;
-    }
-
-    private Object getObjectX(int columnIndex) throws SQLException {
-        return getObjectX(columnIndex, (Class<Object>) null);
-    }
-
-    protected <T> T getObjectX(int columnIndex, Class<T> javaClass) throws SQLException {
-        return getObjectX(columnIndex, javaClass, null);
-    }
-
-    protected <T> T getObjectX(int columnIndex, Class<T> javaClass, Map<String, Object> conversionParams) throws SQLException {
-        final Object value = getColumn(columnIndex);
-        final TypeConverter tc = TypeConverters.getInstance(getColumnMetaData(columnIndex).getOpenSearchType().getJdbcType());
-        if (null == tc) {
-            throw new SQLException("Conversion from " + getColumnMetaData(columnIndex).getOpenSearchType() + " not supported.");
-        }
-        return tc.convert(value, javaClass, conversionParams);
-    }
-
-    @Override
-    public int findColumn(String columnLabel) throws SQLException {
-        checkOpen();
-        return getColumnIndex(columnLabel);
-    }
-
-    @Override
-    public Reader getCharacterStream(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Streams are not supported");
-    }
-
-    @Override
-    public Reader getCharacterStream(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Streams are not supported");
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
-        // TODO - add support?
-        checkOpen();
-        throw new SQLFeatureNotSupportedException("BigDecimal is not supported");
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String columnLabel) throws SQLException {
-        // TODO - add support?
-        checkOpen();
-        throw new SQLFeatureNotSupportedException("BigDecimal is not supported");
-    }
-
-    @Override
-    public boolean isBeforeFirst() throws SQLException {
-        checkOpen();
-        return beforeFirst;
-    }
-
-    @Override
-    public boolean isAfterLast() throws SQLException {
-        checkOpen();
-        return afterLast;
-    }
-
-    private boolean isBeforeFirstX() throws SQLException {
-        return beforeFirst;
-    }
-
-    private boolean isAfterLastX() throws SQLException {
-        return afterLast;
-    }
-
-    @Override
-    public boolean isFirst() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public boolean isLast() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public void beforeFirst() throws SQLException {
-        checkOpen();
-        throw new SQLDataException("Illegal operation on ResultSet of type TYPE_FORWARD_ONLY");
-    }
-
-    @Override
-    public void afterLast() throws SQLException {
-        checkOpen();
-        throw new SQLDataException("Illegal operation on ResultSet of type TYPE_FORWARD_ONLY");
-    }
-
-    @Override
-    public boolean first() throws SQLException {
-        checkOpen();
-        throw new SQLDataException("Illegal operation on ResultSet of type TYPE_FORWARD_ONLY");
-    }
-
-    @Override
-    public boolean last() throws SQLException {
-        checkOpen();
-        throw new SQLDataException("Illegal operation on ResultSet of type TYPE_FORWARD_ONLY");
-    }
-
-    @Override
-    public int getRow() throws SQLException {
-        // not supported yet
-        return 0;
-    }
-
-    @Override
-    public boolean absolute(int row) throws SQLException {
-        checkOpen();
-        throw new SQLDataException("Illegal operation on ResultSet of type TYPE_FORWARD_ONLY");
-    }
-
-    @Override
-    public boolean relative(int rows) throws SQLException {
-        checkOpen();
-        throw new SQLDataException("Illegal operation on ResultSet of type TYPE_FORWARD_ONLY");
-    }
-
-    @Override
-    public boolean previous() throws SQLException {
-        checkOpen();
-        throw new SQLDataException("Illegal operation on ResultSet of type TYPE_FORWARD_ONLY");
-    }
-
-    @Override
-    public void setFetchDirection(int direction) throws SQLException {
-        checkOpen();
-        if (direction != ResultSet.FETCH_FORWARD) {
-            throw new SQLDataException("The ResultSet only supports FETCH_FORWARD direction");
-        }
-    }
-
-    @Override
-    public int getFetchDirection() throws SQLException {
-        checkOpen();
-        return ResultSet.FETCH_FORWARD;
-    }
-
-    @Override
-    public void setFetchSize(int rows) throws SQLException {
-        checkOpen();
-        // no-op
-    }
-
-    @Override
-    public int getFetchSize() throws SQLException {
-        checkOpen();
-        return 0;
-    }
-
-    @Override
-    public int getType() throws SQLException {
-        checkOpen();
-        return ResultSet.TYPE_FORWARD_ONLY;
-    }
-
-    @Override
-    public int getConcurrency() throws SQLException {
-        checkOpen();
-        return ResultSet.CONCUR_READ_ONLY;
-    }
-
-    @Override
-    public boolean rowUpdated() throws SQLException {
-        checkOpen();
-        return false;
-    }
-
-    @Override
-    public boolean rowInserted() throws SQLException {
-        checkOpen();
-        return false;
-    }
-
-    @Override
-    public boolean rowDeleted() throws SQLException {
-        checkOpen();
-        return false;
-    }
-
-    @Override
-    public void updateNull(int columnIndex) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBoolean(int columnIndex, boolean x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateByte(int columnIndex, byte x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateShort(int columnIndex, short x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateInt(int columnIndex, int x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateLong(int columnIndex, long x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateFloat(int columnIndex, float x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateDouble(int columnIndex, double x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateString(int columnIndex, String x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBytes(int columnIndex, byte[] x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateDate(int columnIndex, Date x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateTime(int columnIndex, Time x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateObject(int columnIndex, Object x, int scaleOrLength) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateObject(int columnIndex, Object x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateNull(String columnLabel) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBoolean(String columnLabel, boolean x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateByte(String columnLabel, byte x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateShort(String columnLabel, short x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateInt(String columnLabel, int x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateLong(String columnLabel, long x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateFloat(String columnLabel, float x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateDouble(String columnLabel, double x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBigDecimal(String columnLabel, BigDecimal x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateString(String columnLabel, String x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBytes(String columnLabel, byte[] x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateDate(String columnLabel, Date x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateTime(String columnLabel, Time x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateAsciiStream(String columnLabel, InputStream x, int length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBinaryStream(String columnLabel, InputStream x, int length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateCharacterStream(String columnLabel, Reader reader, int length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateObject(String columnLabel, Object x, int scaleOrLength) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateObject(String columnLabel, Object x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void insertRow() throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateRow() throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void deleteRow() throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void refreshRow() throws SQLException {
-
-    }
-
-    @Override
-    public void cancelRowUpdates() throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void moveToInsertRow() throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void moveToCurrentRow() throws SQLException {
-
-    }
-
-    @Override
-    public Statement getStatement() throws SQLException {
-        return statement;
-    }
-
-    @Override
-    public Object getObject(int columnIndex, Map<String, Class<?>> map) throws SQLException {
-        log.debug(() -> logEntry("getObject (%d, %s)", columnIndex, map));
-
-        Object value = getObjectX(columnIndex, map);
-
-        log.debug(() -> logExit("getObject", value));
-        return value;
-    }
-
-    @Override
-    public Ref getRef(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Ref is not supported");
-    }
-
-    @Override
-    public Blob getBlob(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Blob is not supported");
-    }
-
-    @Override
-    public Clob getClob(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Clob is not supported");
-    }
-
-    @Override
-    public Array getArray(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Array is not supported");
-    }
-
-    @Override
-    public Object getObject(String columnLabel, Map<String, Class<?>> map) throws SQLException {
-        log.debug(() -> logEntry("getObject (%s, %s)", columnLabel, map));
-        Object value = getObjectX(getColumnIndex(columnLabel), map);
-        log.debug(() -> logExit("getObject", value));
-        return value;
-    }
-
-    private Object getObjectX(int columnIndex, Map<String, Class<?>> map) throws SQLException {
-        String columnSQLTypeName = null;
-        Class targetClass = null;
-        if (map != null) {
-            columnSQLTypeName = getColumnMetaData(columnIndex).getOpenSearchType().getJdbcType().getName();
-            targetClass = map.get(columnSQLTypeName);
-        }
-
-        if (log.isDebugEnabled()) {
-            log.debug(logMessage("Column SQL Type is: %s. Target class retrieved from custom mapping: %s",
-                    columnSQLTypeName, targetClass));
-        }
-        return getObjectX(columnIndex, targetClass);
-    }
-
-    @Override
-    public Ref getRef(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Ref is not supported");
-    }
-
-    @Override
-    public Blob getBlob(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Blob is not supported");
-    }
-
-    @Override
-    public Clob getClob(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Clob is not supported");
-    }
-
-    @Override
-    public Array getArray(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Array is not supported");
-    }
-
-    @Override
-    public Date getDate(int columnIndex, Calendar cal) throws SQLException {
-        log.debug(() -> logEntry("getDate (%d, %s)", columnIndex,
-                cal == null ? "null" : "Calendar TZ= " + cal.getTimeZone()));
-        checkCursorOperationPossible();
-        Date value = getDateX(columnIndex, cal);
-        log.debug(() -> logExit("getDate", value));
-        return value;
-    }
-
-    @Override
-    public Date getDate(String columnLabel, Calendar cal) throws SQLException {
-        log.debug(() -> logEntry("getDate (%s, %s)", columnLabel,
-                cal == null ? "null" : "Calendar TZ= " + cal.getTimeZone()));
-        checkCursorOperationPossible();
-        Date value = getDateX(getColumnIndex(columnLabel), cal);
-        log.debug(() -> logExit("getDate", value));
-        return value;
-    }
-
-    @Override
-    public Time getTime(int columnIndex, Calendar cal) throws SQLException {
-        // TODO - implement?
-        return null;
-    }
-
-    @Override
-    public Time getTime(String columnLabel, Calendar cal) throws SQLException {
-        // TODO - implement?
-        return null;
-    }
-
-    @Override
-    public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
-        log.debug(() -> logEntry("getTimestamp (%d, %s)", columnIndex,
-                cal == null ? "null" : "Calendar TZ= " + cal.getTimeZone()));
-        checkCursorOperationPossible();
-        Timestamp value = getTimestampX(columnIndex, cal);
-        log.debug(() -> logExit("getTimestamp", value));
-        return value;
-    }
-
-    @Override
-    public Timestamp getTimestamp(String columnLabel, Calendar cal) throws SQLException {
-        log.debug(() -> logEntry("getTimestamp (%s, %s)", columnLabel,
-                cal == null ? "null" : "Calendar TZ= " + cal.getTimeZone()));
-        checkCursorOperationPossible();
-        Timestamp value = getTimestampX(getColumnIndex(columnLabel), cal);
-        log.debug(() -> logExit("getTimestamp", value));
-        return value;
-    }
-
-    @Override
-    public URL getURL(int columnIndex) throws SQLException {
-        // TODO - implement
-        return null;
-    }
-
-    @Override
-    public URL getURL(String columnLabel) throws SQLException {
-        // TODO - implement
-        return null;
-    }
-
-    @Override
-    public void updateRef(int columnIndex, Ref x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateRef(String columnLabel, Ref x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBlob(int columnIndex, Blob x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBlob(String columnLabel, Blob x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateClob(int columnIndex, Clob x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateClob(String columnLabel, Clob x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateArray(int columnIndex, Array x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateArray(String columnLabel, Array x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public RowId getRowId(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("RowId is not supported");
-    }
-
-    @Override
-    public RowId getRowId(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("RowId is not supported");
-    }
-
-    @Override
-    public void updateRowId(int columnIndex, RowId x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateRowId(String columnLabel, RowId x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public int getHoldability() throws SQLException {
-        checkOpen();
-        return HOLD_CURSORS_OVER_COMMIT;
-    }
-
-    @Override
-    public boolean isClosed() throws SQLException {
-        return !open;
-    }
-
-    @Override
-    public void updateNString(int columnIndex, String nString) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateNString(String columnLabel, String nString) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public NClob getNClob(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("NClob is not supported");
-    }
-
-    @Override
-    public NClob getNClob(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("NClob is not supported");
-    }
-
-    @Override
-    public SQLXML getSQLXML(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("SQLXML is not supported");
-    }
-
-    @Override
-    public SQLXML getSQLXML(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("SQLXML is not supported");
-    }
-
-    @Override
-    public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public String getNString(int columnIndex) throws SQLException {
-        log.debug(() -> logEntry("getNString (%d)", columnIndex));
-        String value = getStringX(columnIndex);
-        log.debug(() -> logExit("getNString", value));
-        return value;
-    }
-
-    @Override
-    public String getNString(String columnLabel) throws SQLException {
-        log.debug(() -> logEntry("getNString (%s)", columnLabel));
-        String value = getStringX(getColumnIndex(columnLabel));
-        log.debug(() -> logExit("getNString", value));
-        return value;
-    }
-
-    @Override
-    public Reader getNCharacterStream(int columnIndex) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Streams are not supported");
-    }
-
-    @Override
-    public Reader getNCharacterStream(String columnLabel) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Streams are not supported");
-    }
-
-    @Override
-    public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateClob(int columnIndex, Reader reader) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateClob(String columnLabel, Reader reader) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateNClob(int columnIndex, Reader reader) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public void updateNClob(String columnLabel, Reader reader) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-        log.debug(() -> logEntry("getObject(%d, %s)", columnIndex, type));
-        T value = getObjectX(columnIndex, type);
-        log.debug(() -> logExit("getObject", value));
-        return value;
-    }
-
-    @Override
-    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
-        log.debug(() -> logEntry("getObject(%d, %s)", columnLabel, type));
-        T value = getObjectX(getColumnIndex(columnLabel), type);
-        log.debug(() -> logExit("getObject", value));
-        return value;
-    }
-
-    private int getColumnIndex(String columnLabel) throws SQLException {
-        Integer index = cursor.findColumn(columnLabel);
-
-        if (index == null)
-            logAndThrowSQLException(log, new SQLDataException("Column '" + columnLabel + "' not found."));
-
-        // +1 to adjust for JDBC indices that start from 1
-        return index + 1;
-    }
-
-    protected Object getColumn(int columnIndex) throws SQLException {
-        checkColumnIndex(columnIndex);
-        Object columnData = getColumnFromCursor(columnIndex);
-
-        wasNull = (columnData == null);
-        return columnData;
-    }
-
-    protected Object getColumnFromCursor(int columnIndex) {
-        return cursor.getColumn(columnIndex - 1);
-    }
-
-    private ColumnMetaData getColumnMetaData(int columnIndex) throws SQLException {
-        checkColumnIndex(columnIndex);
-        return cursor.getSchema().getColumnMetaData(columnIndex - 1);
-    }
-
-    protected void checkColumnIndex(int columnIndex) throws SQLException {
-        if (columnIndex < 1 || columnIndex > cursor.getColumnCount())
-            logAndThrowSQLException(log, new SQLDataException("Column index out of range."));
-    }
-
-    protected void checkCursorOperationPossible() throws SQLException {
-        checkOpen();
-        checkValidCursorPosition();
-    }
-
-    protected void checkOpen() throws SQLException {
-        if (isClosed()) {
-            logAndThrowSQLException(log, new ObjectClosedException("ResultSet closed."));
-        }
-    }
-
-    private void checkValidCursorPosition() throws SQLException {
-        if (isBeforeFirstX())
-            logAndThrowSQLException(log, new SQLNonTransientException("Illegal operation before start of ResultSet."));
-        else if (isAfterLastX())
-            logAndThrowSQLException(log, new SQLNonTransientException("Illegal operation after end of ResultSet."));
-    }
-
-    private SQLException updatesNotSupportedException() {
-        return new SQLFeatureNotSupportedException("Updates are not supported");
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/ResultSetMetaDataImpl.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/ResultSetMetaDataImpl.java
deleted file mode 100644
index 787c6eeacd..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/ResultSetMetaDataImpl.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.internal.JdbcWrapper;
-import org.opensearch.jdbc.internal.results.Schema;
-
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-
-public class ResultSetMetaDataImpl implements ResultSetMetaData, JdbcWrapper {
-
-    private ResultSetImpl resultSet;
-    private Schema schema;
-
-    public ResultSetMetaDataImpl(ResultSetImpl resultSet, Schema schema) {
-        this.resultSet = resultSet;
-        this.schema = schema;
-    }
-
-    @Override
-    public int getColumnCount() throws SQLException {
-        return schema.getNumberOfColumns();
-    }
-
-    @Override
-    public boolean isAutoIncrement(int column) throws SQLException {
-        checkAccessible(column);
-        return false;
-    }
-
-    @Override
-    public boolean isCaseSensitive(int column) throws SQLException {
-        checkColumnIndex(column);
-        return true;
-    }
-
-    @Override
-    public boolean isSearchable(int column) throws SQLException {
-        checkAccessible(column);
-        return true;
-    }
-
-    @Override
-    public boolean isCurrency(int column) throws SQLException {
-        checkAccessible(column);
-        return false;
-    }
-
-    @Override
-    public int isNullable(int column) throws SQLException {
-        checkAccessible(column);
-        return columnNullableUnknown;
-    }
-
-    @Override
-    public boolean isSigned(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getColumnMetaData(column-1).getOpenSearchType().isSigned();
-    }
-
-    @Override
-    public int getColumnDisplaySize(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getColumnMetaData(column-1).getOpenSearchType().getDisplaySize();
-    }
-
-    @Override
-    public String getColumnLabel(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getColumnMetaData(column-1).getLabel();
-    }
-
-    @Override
-    public String getColumnName(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getColumnMetaData(column-1).getName();
-    }
-
-    @Override
-    public String getSchemaName(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getColumnMetaData(column-1).getTableSchemaName();
-    }
-
-    @Override
-    public int getPrecision(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getColumnMetaData(column-1).getPrecision();
-    }
-
-    @Override
-    public int getScale(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getColumnMetaData(column-1).getScale();
-    }
-
-    @Override
-    public String getTableName(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getColumnMetaData(column-1).getTableName();
-    }
-
-    @Override
-    public String getCatalogName(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getColumnMetaData(column-1).getCatalogName();
-    }
-
-    @Override
-    public int getColumnType(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getOpenSearchType(column-1).getJdbcType().getVendorTypeNumber();
-    }
-
-    @Override
-    public String getColumnTypeName(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getOpenSearchType(column-1).getJdbcType().getName();
-    }
-
-    @Override
-    public boolean isReadOnly(int column) throws SQLException {
-        checkAccessible(column);
-        return true;
-    }
-
-    @Override
-    public boolean isWritable(int column) throws SQLException {
-        checkAccessible(column);
-        return false;
-    }
-
-    @Override
-    public boolean isDefinitelyWritable(int column) throws SQLException {
-        checkAccessible(column);
-        return false;
-    }
-
-    @Override
-    public String getColumnClassName(int column) throws SQLException {
-        checkAccessible(column);
-        return schema.getOpenSearchType(column-1).getJavaClassName();
-    }
-
-    private void checkAccessible(int columnIndex) throws SQLException {
-        checkOpen();
-        checkColumnIndex(columnIndex);
-    }
-
-    private void checkOpen() throws SQLException {
-        resultSet.checkOpen();
-    }
-
-    private void checkColumnIndex(int columnIndex) throws SQLException {
-        resultSet.checkColumnIndex(columnIndex);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/StatementImpl.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/StatementImpl.java
deleted file mode 100644
index 1b4b3357ac..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/StatementImpl.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.internal.exceptions.ObjectClosedException;
-import org.opensearch.jdbc.logging.LoggingSource;
-import org.opensearch.jdbc.logging.Logger;
-import org.opensearch.jdbc.protocol.JdbcQueryRequest;
-import org.opensearch.jdbc.internal.JdbcWrapper;
-import org.opensearch.jdbc.protocol.exceptions.InternalServerErrorException;
-import org.opensearch.jdbc.protocol.QueryResponse;
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.sql.SQLNonTransientException;
-import java.sql.SQLWarning;
-import java.sql.Statement;
-
-public class StatementImpl implements Statement, JdbcWrapper, LoggingSource {
-
-    protected ConnectionImpl connection;
-    protected boolean open = false;
-    protected int fetchSize;
-    protected ResultSetImpl resultSet;
-    protected Logger log;
-    private boolean closeOnCompletion;
-
-    public StatementImpl(ConnectionImpl connection, Logger log) {
-        this.connection = connection;
-        this.open = true;
-        this.fetchSize = connection.getFetchSize();
-        this.log = log;
-    }
-
-    @Override
-    public ResultSet executeQuery(String sql) throws SQLException {
-        log.debug(()-> logEntry("executeQuery (%s)", sql));
-        ResultSet rs = executeQueryX(sql, fetchSize);
-        log.debug(()-> logExit("executeQuery", rs));
-        return rs;
-    }
-
-    protected ResultSet executeQueryX(String sql, int fetchSize) throws SQLException {
-        JdbcQueryRequest jdbcQueryRequest = new JdbcQueryRequest(sql, fetchSize);
-        return executeQueryRequest(jdbcQueryRequest);
-    }
-
-    protected ResultSet executeQueryRequest(JdbcQueryRequest jdbcQueryRequest) throws SQLException {
-
-        // JDBC Spec: A ResultSet object is automatically closed when the Statement
-        // object that generated it is closed, re-executed, or used to retrieve the
-        // next result from a sequence of multiple results.
-        closeResultSet(false);
-
-        try {
-            QueryResponse queryResponse = connection.getProtocol().execute(jdbcQueryRequest);
-
-            if (queryResponse.getError() != null) {
-                throw new InternalServerErrorException(
-                        queryResponse.getError().getReason(),
-                        queryResponse.getError().getType(),
-                        queryResponse.getError().getDetails());
-            }
-
-            resultSet = buildResultSet(queryResponse);
-
-        } catch (ResponseException | IOException ex) {
-            logAndThrowSQLException(log, new SQLException("Error executing query", ex));
-        }
-        return resultSet;
-    }
-
-    protected ResultSetImpl buildResultSet(QueryResponse queryResponse) throws SQLException {
-        return new ResultSetImpl(this, queryResponse, log);
-    }
-
-    @Override
-    public int executeUpdate(String sql) throws SQLException {
-        checkOpen();
-        throw new SQLFeatureNotSupportedException("Updates are not supported.");
-    }
-
-    @Override
-    public void close() throws SQLException {
-        log.debug(()->logEntry("close ()"));
-        open = false;
-        log.debug(()->logExit("close"));
-    }
-
-    private void closeX() throws SQLException {
-        open = false;
-    }
-
-    @Override
-    public int getMaxFieldSize() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public void setMaxFieldSize(int max) throws SQLException {
-
-    }
-
-    @Override
-    public int getMaxRows() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public void setMaxRows(int max) throws SQLException {
-
-    }
-
-    @Override
-    public void setEscapeProcessing(boolean enable) throws SQLException {
-        checkOpen();
-    }
-
-    @Override
-    public int getQueryTimeout() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public void setQueryTimeout(int seconds) throws SQLException {
-        // no-op
-    }
-
-    @Override
-    public void cancel() throws SQLException {
-        throw new SQLFeatureNotSupportedException("cancel not supported");
-    }
-
-    @Override
-    public SQLWarning getWarnings() throws SQLException {
-        return null;
-    }
-
-    @Override
-    public void clearWarnings() throws SQLException {
-
-    }
-
-    @Override
-    public void setCursorName(String name) throws SQLException {
-        checkOpen();
-        // no-op
-    }
-
-    @Override
-    public boolean execute(String sql) throws SQLException {
-        log.debug(()->logEntry("execute (%s)", sql));
-        checkOpen();
-        executeQueryX(sql, fetchSize);
-        log.debug(() -> logExit("execute", true));
-        return true;
-    }
-
-    @Override
-    public ResultSet getResultSet() throws SQLException {
-        log.debug(() -> logEntry("getResultSet ()"));
-        checkOpen();
-        log.debug(() -> logExit("getResultSet", resultSet));
-        return resultSet;
-    }
-
-    @Override
-    public int getUpdateCount() throws SQLException {
-        checkOpen();
-        return -1;
-    }
-
-    @Override
-    public boolean getMoreResults() throws SQLException {
-        checkOpen();
-        closeResultSet(true);
-        return false;
-    }
-
-    @Override
-    public void setFetchDirection(int direction) throws SQLException {
-
-    }
-
-    @Override
-    public int getFetchDirection() throws SQLException {
-        return 0;
-    }
-
-    @Override
-    public void setFetchSize(int rows) throws SQLException {
-        fetchSize = rows;
-    }
-
-    @Override
-    public int getFetchSize() throws SQLException {
-        return fetchSize;
-    }
-
-    @Override
-    public int getResultSetConcurrency() throws SQLException {
-        return ResultSet.CONCUR_READ_ONLY;
-    }
-
-    @Override
-    public int getResultSetType() throws SQLException {
-        return ResultSet.TYPE_FORWARD_ONLY;
-    }
-
-    @Override
-    public void addBatch(String sql) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Batch execution is not supported");
-    }
-
-    @Override
-    public void clearBatch() throws SQLException {
-        throw new SQLFeatureNotSupportedException("Batch execution is not supported");
-    }
-
-    @Override
-    public int[] executeBatch() throws SQLException {
-        throw new SQLFeatureNotSupportedException("Batch execution is not supported");
-    }
-
-    @Override
-    public Connection getConnection() throws SQLException {
-        return connection;
-    }
-
-    @Override
-    public boolean getMoreResults(int current) throws SQLException {
-        return false;
-    }
-
-    @Override
-    public ResultSet getGeneratedKeys() throws SQLException {
-        return null;
-    }
-
-    @Override
-    public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public int executeUpdate(String sql, String[] columnNames) throws SQLException {
-        throw updatesNotSupportedException();
-    }
-
-    @Override
-    public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
-        log.debug(()->logEntry("execute (%s, %d)", sql, autoGeneratedKeys));
-        checkOpen();
-        if (autoGeneratedKeys != Statement.NO_GENERATED_KEYS) {
-            throw new SQLNonTransientException("Auto generated keys are not supported");
-        }
-        executeQueryX(sql, fetchSize);
-        log.debug(() -> logExit("execute", true));
-        return true;
-    }
-
-    @Override
-    public boolean execute(String sql, int[] columnIndexes) throws SQLException {
-        throw new SQLNonTransientException("Auto generated keys are not supported");
-    }
-
-    @Override
-    public boolean execute(String sql, String[] columnNames) throws SQLException {
-        throw new SQLNonTransientException("Auto generated keys are not supported");
-    }
-
-    @Override
-    public int getResultSetHoldability() throws SQLException {
-        return ResultSet.HOLD_CURSORS_OVER_COMMIT;
-    }
-
-    @Override
-    public boolean isClosed() throws SQLException {
-        return isClosedX();
-    }
-
-    protected boolean isClosedX() throws SQLException {
-        return !open;
-    }
-
-    @Override
-    public void setPoolable(boolean poolable) throws SQLException {
-        checkOpen();
-        // no-op
-    }
-
-    @Override
-    public boolean isPoolable() throws SQLException {
-        return false;
-    }
-
-    @Override
-    public void closeOnCompletion() throws SQLException {
-        closeOnCompletion = true;
-    }
-
-    @Override
-    public boolean isCloseOnCompletion() throws SQLException {
-        return closeOnCompletion;
-    }
-
-    protected void checkOpen() throws SQLException {
-        if (isClosedX()) {
-            throw new ObjectClosedException("Statement closed.");
-        }
-    }
-
-    protected void closeResultSet(boolean closeStatement) throws SQLException {
-        if (resultSet != null) {
-            resultSet.closeX(closeStatement);
-        }
-    }
-
-    void resultSetClosed(ResultSet rs, boolean closeStatement) throws SQLException {
-        if (closeOnCompletion && closeStatement) {
-            log.debug(() -> logMessage("Child ResultSet closed and closeOnCompletion is enabled. Closing statement."));
-            closeX();
-        }
-    }
-
-    private SQLException updatesNotSupportedException() {
-        return new SQLFeatureNotSupportedException("Updates are not supported");
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/auth/AuthenticationType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/auth/AuthenticationType.java
deleted file mode 100644
index 719fe3141a..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/auth/AuthenticationType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.auth;
-
-/**
- * Enum representing supported authentication methods
- *
- */
-public enum AuthenticationType {
-
-    /**
-     * No authentication
-     */
-    NONE,
-
-    /**
-     * HTTP Basic authentication
-     */
-    BASIC,
-
-    /**
-     * AWS Signature V4
-     */
-    AWS_SIGV4;
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/AuthConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/AuthConnectionProperty.java
deleted file mode 100644
index 18b34bddf3..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/AuthConnectionProperty.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-import org.opensearch.jdbc.auth.AuthenticationType;
-
-import java.util.Locale;
-
-public class AuthConnectionProperty extends ConnectionProperty<AuthenticationType> {
-
-    public static final String KEY = "auth";
-
-    public AuthConnectionProperty() {
-        super(KEY);
-    }
-
-    @Override
-    protected AuthenticationType parseValue(Object rawValue) throws ConnectionPropertyException {
-        if (rawValue == null) {
-            return getDefault();
-        } else if (rawValue instanceof String) {
-            String stringValue = (String) rawValue;
-            try {
-                return AuthenticationType.valueOf(stringValue.toUpperCase(Locale.ROOT));
-            } catch (IllegalArgumentException iae) {
-                throw new ConnectionPropertyException(getKey(),
-                        String.format("Invalid value specified for the property \"%s\". " +
-                                "Unknown authentication type \"%s\".", getKey(), stringValue));
-            }
-        }
-
-        throw new ConnectionPropertyException(getKey(),
-                String.format("Property \"%s\" requires a valid String matching a known authentication type. " +
-                        "Invalid value of type: %s specified.", getKey(), rawValue.getClass().getName()));
-
-    }
-
-    @Override
-    public AuthenticationType getDefault() {
-        return AuthenticationType.NONE;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/AwsCredentialsProviderProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/AwsCredentialsProviderProperty.java
deleted file mode 100644
index eb630af490..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/AwsCredentialsProviderProperty.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.jdbc.config;
-
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
-
-public class AwsCredentialsProviderProperty extends ConnectionProperty<AWSCredentialsProvider> {
-
-    public static final String KEY = "awsCredentialsProvider";
-
-    public AwsCredentialsProviderProperty() {
-        super(KEY);
-    }
-
-    @Override
-    public AWSCredentialsProvider getDefault() {
-        return new DefaultAWSCredentialsProviderChain();
-    }
-
-    @Override
-    protected AWSCredentialsProvider parseValue(Object rawValue) throws ConnectionPropertyException {
-        if (null == rawValue) {
-            return null;
-        } else if (rawValue instanceof AWSCredentialsProvider) {
-            return (AWSCredentialsProvider) rawValue;
-        }
-
-        throw new ConnectionPropertyException(getKey(),
-                String.format("Property \"%s\" requires a valid AWSCredentialsProvider instance. " +
-                        "Invalid value of type: %s specified.", getKey(), rawValue.getClass().getName()));
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/BoolConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/BoolConnectionProperty.java
deleted file mode 100644
index 9be3733832..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/BoolConnectionProperty.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class BoolConnectionProperty extends ConnectionProperty<Boolean> {
-
-    public BoolConnectionProperty(String key) {
-        super(key);
-    }
-
-    @Override
-    protected Boolean parseValue(Object value) throws ConnectionPropertyException {
-
-        if (value == null) {
-            return getDefault();
-        } else if (value instanceof Boolean) {
-            return (Boolean) value;
-        } else if (value instanceof String) {
-            return Boolean.parseBoolean((String) value);
-        }
-
-        throw new ConnectionPropertyException(getKey(),
-                String.format("Property %s requires a valid boolean. Invalid property value of type %s. ",
-                        getKey(), value.getClass().getName()));
-    }
-
-    @Override
-    public Boolean getDefault() {
-        return false;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/ConnectionConfig.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/ConnectionConfig.java
deleted file mode 100644
index b0bbcac19e..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/ConnectionConfig.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-import org.opensearch.jdbc.auth.AuthenticationType;
-import org.opensearch.jdbc.logging.LogLevel;
-import org.opensearch.jdbc.internal.util.AwsHostNameUtil;
-import org.opensearch.jdbc.internal.util.UrlParser;
-import com.amazonaws.auth.AWSCredentialsProvider;
-
-import java.io.PrintWriter;
-import java.net.URISyntaxException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-public class ConnectionConfig {
-
-    private String url;
-    private String host;
-    private int port;
-    private int fetchSize;
-    private String path;
-    private boolean useSSL;
-    private int loginTimeout;
-    private String logOutput;
-    private PrintWriter logWriter;
-    private String user;
-    private String password;
-    private boolean requestCompression;
-    private AuthenticationType authenticationType;
-    private AWSCredentialsProvider awsCredentialsProvider;
-    private String region;
-    private LogLevel logLevel;
-
-    private String keyStoreLocation;
-    private String keyStorePassword;
-    private String keyStoreType;
-    private String trustStoreLocation;
-    private String trustStorePassword;
-    private String trustStoreType;
-    private boolean trustSelfSigned;
-    private boolean hostnameVerification;
-
-    private ConnectionConfig(Builder builder) {
-        this.url = builder.getUrl();
-        this.host = builder.getHostProperty().getValue();
-        this.port = builder.getPortProperty().getValue();
-        this.fetchSize = builder.getFetchSizeProperty().getValue();
-        this.path = builder.getPathProperty().getValue();
-        this.useSSL = builder.getUseSSLProperty().getValue();
-
-        this.logOutput = builder.getLogOutputProperty().getValue();
-        this.logLevel = builder.getLogLevelConnectionProperty().getValue();
-        this.logWriter = builder.getLogWriter();
-
-        this.loginTimeout = builder.getLoginTimeoutProperty().getValue();
-
-        this.user = builder.getUserProperty().getValue();
-        this.password = builder.getPasswordProperty().getValue();
-
-        this.requestCompression = builder.getRequestCompressionProperty().getValue();
-        this.authenticationType = builder.getAuthConnectionProperty().getValue();
-        this.awsCredentialsProvider = builder.getAwsCredentialProvider().getValue();
-        this.region = builder.getRegionConnectionProperty().getValue();
-
-        this.keyStoreLocation = builder.getKeyStoreLocationConnectionProperty().getValue();
-        this.keyStorePassword = builder.getKeyStorePasswordConnectionProperty().getValue();
-        this.keyStoreType = builder.getKeyStoreTypeConnectionProperty().getValue();
-
-        this.trustStoreLocation = builder.getTrustStoreLocationConnectionProperty().getValue();
-        this.trustStorePassword = builder.getTrustStorePasswordConnectionProperty().getValue();
-        this.trustStoreType = builder.getTrustStoreTypeConnectionProperty().getValue();
-
-        this.trustSelfSigned = builder.getTrustSelfSignedConnectionProperty().getValue();
-
-        this.hostnameVerification = builder.getHostnameVerificationConnectionProperty().getValue();
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public int getFetchSize() {
-        return fetchSize;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public boolean isUseSSL() {
-        return useSSL;
-    }
-
-    public boolean requestCompression() {
-        return requestCompression;
-    }
-
-    public int getLoginTimeout() {
-        return loginTimeout;
-    }
-
-    public String getLogOutput() {
-        return logOutput;
-    }
-
-    public LogLevel getLogLevel() {
-        return logLevel;
-    }
-
-    public String getUser() {
-        return user;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public AuthenticationType getAuthenticationType() {
-        return authenticationType;
-    }
-
-    public AWSCredentialsProvider getAwsCredentialsProvider() {
-        return awsCredentialsProvider;
-    }
-
-    public String getRegion() {
-        return region;
-    }
-
-    public PrintWriter getLogWriter() {
-        return logWriter;
-    }
-
-    public String getKeyStoreLocation() {
-        return keyStoreLocation;
-    }
-
-    public String getKeyStorePassword() {
-        return keyStorePassword;
-    }
-
-    public String getKeyStoreType() {
-        return keyStoreType;
-    }
-
-    public String getTrustStoreLocation() {
-        return trustStoreLocation;
-    }
-
-    public String getTrustStorePassword() {
-        return trustStorePassword;
-    }
-
-    public String getTrustStoreType() {
-        return trustStoreType;
-    }
-
-    public boolean trustSelfSigned() {
-        return trustSelfSigned;
-    }
-
-    public boolean hostnameVerification() {
-        return hostnameVerification;
-    }
-
-    @Override
-    public String toString() {
-        return "ConnectionConfig{" +
-                "url='" + url + '\'' +
-                ", host='" + host + '\'' +
-                ", port=" + port +
-                ", fetchSize=" + fetchSize +
-                ", path='" + path + '\'' +
-                ", useSSL=" + useSSL +
-                ", loginTimeout=" + loginTimeout +
-                ", logOutput='" + logOutput + '\'' +
-                ", logWriter=" + logWriter +
-                ", user='" + user + '\'' +
-                ", password='" + mask(password) + '\'' +
-                ", requestCompression=" + requestCompression +
-                ", authenticationType=" + authenticationType +
-                ", awsCredentialsProvider=" + awsCredentialsProvider +
-                ", region='" + region + '\'' +
-                ", logLevel=" + logLevel +
-                ", keyStoreLocation='" + keyStoreLocation + '\'' +
-                ", keyStorePassword='" + mask(keyStorePassword) + '\'' +
-                ", keyStoreType='" + keyStoreType + '\'' +
-                ", trustStoreLocation='" + trustStoreLocation + '\'' +
-                ", trustStorePassword='" + mask(trustStorePassword) + '\'' +
-                ", trustStoreType='" + trustStoreType + '\'' +
-                ", trustSelfSigned='" + trustSelfSigned + '\'' +
-                ", hostnameVerification='" + hostnameVerification + '\'' +
-                '}';
-    }
-
-    private String mask(String string) {
-        return string == null || string.length() == 0 ? "<not set>" : "<set>";
-    }
-
-    public static class Builder {
-
-        private HostConnectionProperty hostProperty = new HostConnectionProperty();
-        private PortConnectionProperty portProperty = new PortConnectionProperty();
-        private FetchSizeProperty fetchSizeProperty = new FetchSizeProperty();
-        private LoginTimeoutConnectionProperty loginTimeoutProperty = new LoginTimeoutConnectionProperty();
-        private UseSSLConnectionProperty useSSLProperty = new UseSSLConnectionProperty();
-        private PathConnectionProperty pathProperty = new PathConnectionProperty();
-        private LogOutputConnectionProperty logOutputProperty = new LogOutputConnectionProperty();
-        private UserConnectionProperty userProperty = new UserConnectionProperty();
-        private PasswordConnectionProperty passwordProperty = new PasswordConnectionProperty();
-        private RequestCompressionConnectionProperty requestCompressionProperty =
-                new RequestCompressionConnectionProperty();
-        private AuthConnectionProperty authConnectionProperty = new AuthConnectionProperty();
-        private RegionConnectionProperty regionConnectionProperty = new RegionConnectionProperty();
-        private LogLevelConnectionProperty logLevelConnectionProperty = new LogLevelConnectionProperty();
-
-        private KeyStoreLocationConnectionProperty keyStoreLocationConnectionProperty
-                = new KeyStoreLocationConnectionProperty();
-        private KeyStorePasswordConnectionProperty keyStorePasswordConnectionProperty
-                = new KeyStorePasswordConnectionProperty();
-        private KeyStoreTypeConnectionProperty keyStoreTypeConnectionProperty
-                = new KeyStoreTypeConnectionProperty();
-
-        private TrustStoreLocationConnectionProperty trustStoreLocationConnectionProperty
-                = new TrustStoreLocationConnectionProperty();
-        private TrustStorePasswordConnectionProperty trustStorePasswordConnectionProperty
-                = new TrustStorePasswordConnectionProperty();
-        private TrustStoreTypeConnectionProperty trustStoreTypeConnectionProperty
-                = new TrustStoreTypeConnectionProperty();
-
-        private TrustSelfSignedConnectionProperty trustSelfSignedConnectionProperty
-                = new TrustSelfSignedConnectionProperty();
-
-        private AwsCredentialsProviderProperty awsCredentialsProviderProperty
-                = new AwsCredentialsProviderProperty();
-
-        private HostnameVerificationConnectionProperty hostnameVerificationConnectionProperty
-                = new HostnameVerificationConnectionProperty();
-
-        ConnectionProperty[] connectionProperties = new ConnectionProperty[]{
-                hostProperty,
-                portProperty,
-                fetchSizeProperty,
-                loginTimeoutProperty,
-                useSSLProperty,
-                pathProperty,
-                logOutputProperty,
-                logLevelConnectionProperty,
-                userProperty,
-                passwordProperty,
-                requestCompressionProperty,
-                authConnectionProperty,
-                awsCredentialsProviderProperty,
-                regionConnectionProperty,
-                keyStoreLocationConnectionProperty,
-                keyStorePasswordConnectionProperty,
-                keyStoreTypeConnectionProperty,
-                trustStoreLocationConnectionProperty,
-                trustStorePasswordConnectionProperty,
-                trustStoreTypeConnectionProperty,
-                trustSelfSignedConnectionProperty,
-                hostnameVerificationConnectionProperty
-        };
-
-        private String url = null;
-        private PrintWriter logWriter = null;
-        private Map<String, Object> propertyMap;
-        private Map<String, Object> overrideMap;
-        private Properties urlProperties;
-        private Properties properties;
-
-
-        public ConnectionProperty[] getConnectionProperties() {
-            return connectionProperties;
-        }
-
-        public HostConnectionProperty getHostProperty() {
-            return hostProperty;
-        }
-
-        public PortConnectionProperty getPortProperty() {
-            return portProperty;
-        }
-
-        public FetchSizeProperty getFetchSizeProperty() {
-            return fetchSizeProperty;
-        }
-
-        public LoginTimeoutConnectionProperty getLoginTimeoutProperty() {
-            return loginTimeoutProperty;
-        }
-
-        public UseSSLConnectionProperty getUseSSLProperty() {
-            return useSSLProperty;
-        }
-
-        public PathConnectionProperty getPathProperty() {
-            return pathProperty;
-        }
-
-        public LogOutputConnectionProperty getLogOutputProperty() {
-            return logOutputProperty;
-        }
-
-        public UserConnectionProperty getUserProperty() {
-            return userProperty;
-        }
-
-        public PasswordConnectionProperty getPasswordProperty() {
-            return passwordProperty;
-        }
-
-        public RequestCompressionConnectionProperty getRequestCompressionProperty() {
-            return requestCompressionProperty;
-        }
-
-        public AuthConnectionProperty getAuthConnectionProperty() {
-            return authConnectionProperty;
-        }
-
-        public AwsCredentialsProviderProperty getAwsCredentialProvider() {
-            return awsCredentialsProviderProperty;
-        }
-
-        public RegionConnectionProperty getRegionConnectionProperty() {
-            return regionConnectionProperty;
-        }
-
-        public LogLevelConnectionProperty getLogLevelConnectionProperty() {
-            return logLevelConnectionProperty;
-        }
-
-        public PrintWriter getLogWriter() {
-            return logWriter;
-        }
-
-        public KeyStoreLocationConnectionProperty getKeyStoreLocationConnectionProperty() {
-            return keyStoreLocationConnectionProperty;
-        }
-
-        public KeyStorePasswordConnectionProperty getKeyStorePasswordConnectionProperty() {
-            return keyStorePasswordConnectionProperty;
-        }
-
-        public KeyStoreTypeConnectionProperty getKeyStoreTypeConnectionProperty() {
-            return keyStoreTypeConnectionProperty;
-        }
-
-        public TrustStoreLocationConnectionProperty getTrustStoreLocationConnectionProperty() {
-            return trustStoreLocationConnectionProperty;
-        }
-
-        public TrustStorePasswordConnectionProperty getTrustStorePasswordConnectionProperty() {
-            return trustStorePasswordConnectionProperty;
-        }
-
-        public TrustStoreTypeConnectionProperty getTrustStoreTypeConnectionProperty() {
-            return trustStoreTypeConnectionProperty;
-        }
-
-        public TrustSelfSignedConnectionProperty getTrustSelfSignedConnectionProperty() {
-            return trustSelfSignedConnectionProperty;
-        }
-
-        public HostnameVerificationConnectionProperty getHostnameVerificationConnectionProperty() {
-            return hostnameVerificationConnectionProperty;
-        }
-
-        public Builder setLogWriter(PrintWriter printWriter) {
-            this.logWriter = printWriter;
-            return this;
-        }
-
-        public String getUrl() {
-            return url;
-        }
-
-        public Builder setUrl(String url) {
-            this.url = url;
-            return this;
-        }
-
-        public Builder setPropertyMap(Map<String, Object> map) {
-            if (map != null) {
-                propertyMap = new HashMap<>();
-                propertyMap.putAll(map);
-            }
-            return this;
-        }
-
-        /**
-         * Accumulates property values to override. Successive calls
-         * are applied in the order they are made i.e. a property value
-         * supplied in the most recent invocation overrides any value
-         * supplied in a prior invocations.
-         *
-         * @param map map containing property key-value pairs
-         *
-         * @return
-         */
-        public Builder overrideProperties(Map<String, Object> map) {
-            if (map != null) {
-                if (overrideMap == null) {
-                    overrideMap = new HashMap<>();
-                }
-                this.overrideMap.putAll(map);
-            }
-            return this;
-        }
-
-        public Builder setProperties(Properties properties) {
-            if (properties != null) {
-                this.properties = new Properties();
-
-                Enumeration<?> enumeration = properties.propertyNames();
-
-                while (enumeration.hasMoreElements()) {
-                    String key = (String) enumeration.nextElement();
-                    this.properties.setProperty(key, properties.getProperty(key));
-                }
-            }
-            return this;
-        }
-
-        public ConnectionConfig build() throws ConnectionPropertyException {
-            if (url != null) {
-                try {
-                    urlProperties = UrlParser.parseProperties(url);
-                } catch (URISyntaxException e) {
-                    throw new ConnectionPropertyException("Invalid connection URL", e);
-                }
-            }
-
-            for (ConnectionProperty connectionProperty : connectionProperties) {
-                setRawValue(connectionProperty);
-            }
-
-            validateConfig();
-
-            return new ConnectionConfig(this);
-        }
-
-//        public DriverPropertyInfo[] buildDriverPropertyInfo() throws ConnectionPropertyException {
-//            // Return connection properties that need more
-//            try {
-//                build();
-//            } catch (ConnectionPropertyException cpe) {
-//
-//            }
-//            validateConfig();
-//
-//            return new ConnectionConfig(this);
-//        }
-
-        private void setRawValue(ConnectionProperty connectionProperty) throws ConnectionPropertyException {
-            Object value = getPropertyValueToSet(connectionProperty.getKey());
-            connectionProperty.setRawValue(value);
-        }
-
-        /**
-         * Validate the overall configuration to be applied.
-         *
-         * @throws ConnectionPropertyException if the configuration attempted
-         *         fails validation checks
-         */
-        private void validateConfig() throws ConnectionPropertyException {
-            AuthenticationType authenticationType = authConnectionProperty.getValue();
-
-            if (authenticationType == AuthenticationType.NONE) {
-
-                // Use Basic auth if it a username is provided but an
-                // explicit auth type is not set
-
-                if (userProperty.getValue() != null) {
-                    authConnectionProperty.setRawValue(AuthenticationType.BASIC.name());
-                }
-
-            } else if (authenticationType == AuthenticationType.BASIC &&
-                    userProperty.getValue() == null) {
-
-                throw new ConnectionPropertyException(authConnectionProperty.getKey(),
-                        "Basic authentication requires a valid username but none was provided.");
-
-            } else if (authenticationType == AuthenticationType.AWS_SIGV4 &&
-                    regionConnectionProperty.getValue() == null) {
-
-                // aws sdk auto-detection does not work for AWS ES endpoints
-                String region = AwsHostNameUtil.parseRegion(hostProperty.getValue());
-
-                if (region == null) {
-                    throw new ConnectionPropertyException(authConnectionProperty.getKey(),
-                            String.format("AWS Signature V4 authentication requires a region to be used, but " +
-                                    "a valid value could not be determined from the specified hostname. " +
-                                    "Provide an explicit region value (e.g. us-east-1) " +
-                                    "via the \"%s\" connection property.", regionConnectionProperty.getKey()));
-                } else {
-                    regionConnectionProperty.setRawValue(region);
-                }
-            }
-
-            if (portProperty.getRawValue() == null && useSSLProperty.getValue() == true) {
-                // port is not explicitly specified, but SSL is enabled
-                // change the default port to use to 443
-                portProperty.setRawValue(443);
-            }
-
-            if (fetchSizeProperty.getValue() < 0) {
-                throw new ConnectionPropertyException(fetchSizeProperty.getKey(),
-                        "Cursor fetch size value should be greater or equal to zero");
-            }
-        }
-
-        /**
-         * Computes the effective value for a connection property
-         * as per the necessary precedence order.
-         * <p>
-         * Properties specified via overrideProperties have the
-         * highest precedence, followed by properties specified via
-         * setPropertyMap, followed by properties specified via
-         * setProperties and finally property values specified via
-         * the connection URL.
-         *
-         * @param key name of the property
-         *
-         * @return effective value
-         */
-        private Object getPropertyValueToSet(String key) {
-            if (overrideMap != null && overrideMap.containsKey(key)) {
-                return overrideMap.get(key);
-            }
-
-            if (propertyMap != null && propertyMap.containsKey(key)) {
-                return propertyMap.get(key);
-            }
-
-            if (properties != null) {
-                Object value = properties.getProperty(key);
-                if (value != null)
-                    return value;
-            }
-
-            if (urlProperties != null) {
-                Object value = urlProperties.getProperty(key);
-                if (value != null)
-                    return value;
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/ConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/ConnectionProperty.java
deleted file mode 100644
index 006f615c7b..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/ConnectionProperty.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-/**
- * Represents a Connection configuration property.
- * <p>
- * A property has an associated raw value and a parsed value.
- * The raw value is any Object that is provided by a user when setting
- * the property, while the parsed value is the effective value computed
- * from the raw value.
- * <p>
- * The raw value and parsed value need not have similar instance types
- * since properties may accept a varied set of input raw values to compute
- * the parsed value e.g a String "true" or "false" may be accepted to
- * compute a Boolean property.
- * <p>
- * During Connection initialization, all defined connection properties
- * are expected to be initialized with the value provided by the user or
- * a null if no value was provided by the user. Each property defines
- * its own behavior of how it gets initialized.
- *
- * @param <T> The type of the parsed value of the property.
- */
-public abstract class ConnectionProperty<T> {
-
-    private final String key;
-    private Object rawValue;
-    private T parsedValue;
-    private boolean parsed = false;
-
-    public ConnectionProperty(final String key) {
-        this.key = key;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    /**
-     * @return the raw value provided to set the property
-     */
-    public Object getRawValue() {
-        return rawValue;
-    }
-
-    /**
-     * Set the property using a specified raw value.
-     *
-     * @param rawValue the raw value to use
-     *
-     * @throws ConnectionPropertyException if the raw input value can not
-     *         be parsed or fails validation constraints applicable on the
-     *         property value.
-     */
-    public void setRawValue(Object rawValue) throws ConnectionPropertyException {
-        this.rawValue = rawValue;
-        this.parsed = false;
-        parse();
-    }
-
-    /**
-     * Returns the computed value of the property after parsing the
-     * raw value provided for the property.
-     *
-     * @return the effective value of the property
-     *
-     * @throws IllegalStateException is a valid  value has not been
-     *         set for this property
-     */
-    public T getValue() {
-        verifyParsed();
-        return parsedValue;
-    }
-
-    /**
-     * @return true if the raw property value has been successfully parsed
-     *         to compute the parsed value, false otherwise
-     */
-    public boolean isParsed() {
-        return parsed;
-    }
-
-    /**
-     * The default value the property should be set to in the absence of
-     * an explicitly configured value.
-     *
-     * @return default value for the property
-     */
-    public abstract T getDefault();
-
-    /**
-     * Method that pre-processes a supplied raw value for a
-     * property prior to it being passed into the property's
-     * parseValue function.
-     * <p>
-     * This function is meant to offload any value pre-processing
-     * like trimming of String input values prior to the value being
-     * used in the parseValue function.
-     * <p>
-     * Currently, the only pre-processing applied is whitespace trimming of
-     * the input in case the raw input is a String. Subclass properties may
-     * override this method to modify or extend the default pre-processing
-     * of their raw input values.
-     *
-     * @param value - The raw value provided for the property
-     *
-     * @return The value that should be used by the parseValue function
-     */
-    protected Object preProcess(Object value) {
-        if (value instanceof String) {
-            return ((String) value).trim();
-        } else {
-            return value;
-        }
-    }
-
-    /**
-     * Given a raw value for a property, the method returns the actual
-     * value that the property should be set to.
-     *
-     * @param rawValue raw property input value
-     *
-     * @return the actual value the property should be set to
-     *
-     * @throws ConnectionPropertyException if the raw input value can not
-     *         be parsed or fails validation constraints applicable on the
-     *         property value.
-     */
-    protected abstract T parseValue(Object rawValue) throws ConnectionPropertyException;
-
-    /**
-     * Execute parsing of the raw value
-     *
-     * @throws ConnectionPropertyException if the raw input value can not
-     *         be parsed or fails validation constraints applicable on the
-     *         property value.
-     */
-    private void parse() throws ConnectionPropertyException {
-        if (!parsed) {
-            this.parsedValue = parseValue(preProcess(rawValue));
-            parsed = true;
-        }
-    }
-
-    /**
-     * Verify if the supplied value for this property was successfully
-     * parsed.
-     *
-     * @throws {@link IllegalStateException} if a valid property value
-     *         has not been provided.
-     */
-    private void verifyParsed() {
-        if (!isParsed()) {
-            throw new IllegalStateException(String.format("Property %s is not yet successfully parsed.", getKey()));
-        }
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/ConnectionPropertyException.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/ConnectionPropertyException.java
deleted file mode 100644
index d7b92c47c4..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/ConnectionPropertyException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-import java.sql.SQLException;
-
-public class ConnectionPropertyException extends SQLException {
-
-    String propertyKey;
-
-    public ConnectionPropertyException(String key) {
-        super();
-        this.propertyKey = key;
-    }
-
-    public ConnectionPropertyException(String key, String message) {
-        super(message);
-        this.propertyKey = key;
-    }
-
-    public ConnectionPropertyException(String key, String message, Throwable cause) {
-        super(message, cause);
-        this.propertyKey = key;
-    }
-
-    public ConnectionPropertyException(String key, Throwable cause) {
-        super(cause);
-        this.propertyKey = key;
-    }
-
-    public String getPropertyKey() {
-        return propertyKey;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/FetchSizeProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/FetchSizeProperty.java
deleted file mode 100644
index b00be55136..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/FetchSizeProperty.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.jdbc.config;
-
-public class FetchSizeProperty extends IntConnectionProperty {
-
-    public static final String KEY = "fetchSize";
-
-    public FetchSizeProperty() {
-        super(KEY);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/HostConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/HostConnectionProperty.java
deleted file mode 100644
index 7c6af4fffa..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/HostConnectionProperty.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class HostConnectionProperty extends StringConnectionProperty {
-    public static final String KEY = "host";
-
-    public HostConnectionProperty() {
-        super(KEY);
-    }
-
-    public String getDefault() {
-        return "localhost";
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/HostnameVerificationConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/HostnameVerificationConnectionProperty.java
deleted file mode 100644
index e1953c55d7..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/HostnameVerificationConnectionProperty.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class HostnameVerificationConnectionProperty extends BoolConnectionProperty {
-
-    public static final String KEY = "hostnameVerification";
-
-    public HostnameVerificationConnectionProperty() {
-        super(KEY);
-    }
-
-    @Override
-    public Boolean getDefault() {
-        return true;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/IntConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/IntConnectionProperty.java
deleted file mode 100644
index 63b3c87cf5..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/IntConnectionProperty.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class IntConnectionProperty extends ConnectionProperty<Integer> {
-
-    public IntConnectionProperty(String key) {
-        super(key);
-    }
-
-    @Override
-    protected Integer parseValue(Object value) throws ConnectionPropertyException {
-
-        if (value == null) {
-            return getDefault();
-        } else if (value instanceof Integer) {
-            return (Integer) value;
-        } else if (value instanceof String) {
-            try {
-                return Integer.parseInt((String) value);
-            } catch (NumberFormatException nfe) {
-                // invalid value
-            }
-        }
-
-        throw new ConnectionPropertyException(getKey(),
-                String.format("Property %s requires a valid integer. Invalid property value %s. ", getKey(), value));
-    }
-
-    @Override
-    public Integer getDefault() {
-        return 0;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/KeyStoreLocationConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/KeyStoreLocationConnectionProperty.java
deleted file mode 100644
index 577bf9d5a1..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/KeyStoreLocationConnectionProperty.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class KeyStoreLocationConnectionProperty extends StringConnectionProperty {
-    public static final String KEY = "keyStoreLocation";
-
-    public KeyStoreLocationConnectionProperty() {
-        super(KEY);
-    }
-
-    public String getDefault() {
-        return null;
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/KeyStorePasswordConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/KeyStorePasswordConnectionProperty.java
deleted file mode 100644
index 351fb59ea9..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/KeyStorePasswordConnectionProperty.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class KeyStorePasswordConnectionProperty extends StringConnectionProperty {
-    public static final String KEY = "keyStorePassword";
-
-    public KeyStorePasswordConnectionProperty() {
-        super(KEY);
-    }
-
-    public String getDefault() {
-        return null;
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/KeyStoreTypeConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/KeyStoreTypeConnectionProperty.java
deleted file mode 100644
index 1b206b8aba..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/KeyStoreTypeConnectionProperty.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class KeyStoreTypeConnectionProperty extends StringConnectionProperty {
-    public static final String KEY = "keyStoreType";
-
-    public KeyStoreTypeConnectionProperty() {
-        super(KEY);
-    }
-
-    public String getDefault() {
-        return "JKS";
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/LogLevelConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/LogLevelConnectionProperty.java
deleted file mode 100644
index c6be823301..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/LogLevelConnectionProperty.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-import org.opensearch.jdbc.logging.LogLevel;
-
-import java.util.Locale;
-
-public class LogLevelConnectionProperty extends ConnectionProperty<LogLevel> {
-
-    public static final String KEY = "logLevel";
-
-    public LogLevelConnectionProperty() {
-        super(KEY);
-    }
-
-    @Override
-    protected LogLevel parseValue(Object rawValue) throws ConnectionPropertyException {
-        if (rawValue == null) {
-            return getDefault();
-        } else if (rawValue instanceof String) {
-            String stringValue = (String) rawValue;
-            try {
-                return LogLevel.valueOf(stringValue.toUpperCase(Locale.ROOT));
-            } catch (IllegalArgumentException iae) {
-                throw new ConnectionPropertyException(getKey(),
-                        String.format("Invalid value specified for the property \"%s\". " +
-                                "Unknown log level \"%s\".", getKey(), stringValue));
-            }
-        }
-
-        throw new ConnectionPropertyException(getKey(),
-                String.format("Property \"%s\" requires a valid String matching a known log level. " +
-                        "Invalid value of type: %s specified.", getKey(), rawValue.getClass().getName()));
-    }
-
-    @Override
-    public LogLevel getDefault() {
-        return LogLevel.OFF;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/LogOutputConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/LogOutputConnectionProperty.java
deleted file mode 100644
index f8413e0876..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/LogOutputConnectionProperty.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class LogOutputConnectionProperty extends StringConnectionProperty {
-
-    public static final String KEY = "logOutput";
-
-    public LogOutputConnectionProperty() {
-        super(KEY);
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/LoginTimeoutConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/LoginTimeoutConnectionProperty.java
deleted file mode 100644
index 6d484acb77..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/LoginTimeoutConnectionProperty.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-/**
- * Login / Read timeout in seconds
- */
-public class LoginTimeoutConnectionProperty extends IntConnectionProperty {
-
-    public static final String KEY = "loginTimeout";
-
-    public LoginTimeoutConnectionProperty() {
-        super(KEY);
-    }
-
-    @Override
-    protected Integer parseValue(Object value) throws ConnectionPropertyException {
-        int intValue = super.parseValue(value);
-
-        if (intValue < 0) {
-            throw new ConnectionPropertyException(getKey(),
-                    String.format("Login timeout property requires a valid integer >=0. Invalid value: %d", intValue));
-        }
-        return intValue;
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/PasswordConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/PasswordConnectionProperty.java
deleted file mode 100644
index b6385295a6..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/PasswordConnectionProperty.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class PasswordConnectionProperty extends StringConnectionProperty {
-
-    public static final String KEY = "password";
-
-    public PasswordConnectionProperty() {
-        super(KEY);
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/PathConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/PathConnectionProperty.java
deleted file mode 100644
index d690050a77..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/PathConnectionProperty.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-/**
- * The Path connection property.
- *
- * A trailing '/' is not expected or required in the
- * input value but is ignored if present.
- *
- */
-public class PathConnectionProperty extends StringConnectionProperty {
-
-    public static final String KEY = "path";
-
-    public PathConnectionProperty() {
-        super(KEY);
-    }
-
-    @Override
-    protected String parseValue(Object value) throws ConnectionPropertyException {
-        String stringValue = super.parseValue(value);
-
-        // Remove the trailing '/' as all internal calls
-        // will implicitly apply this.
-        if (stringValue.length() > 1 && stringValue.endsWith("/")) {
-            stringValue = stringValue.substring(0, stringValue.length()-1);
-        }
-        return stringValue;
-    }
-
-    @Override
-    public String getDefault() {
-        return "";
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/PortConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/PortConnectionProperty.java
deleted file mode 100644
index 2b84d4fec0..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/PortConnectionProperty.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class PortConnectionProperty extends IntConnectionProperty {
-
-    public static final String KEY = "port";
-
-    public PortConnectionProperty() {
-        super(KEY);
-    }
-
-    @Override
-    protected Integer parseValue(Object value) throws ConnectionPropertyException {
-        int intValue = super.parseValue(value);
-
-        if (intValue < 0 || intValue > 65535) {
-            throw new ConnectionPropertyException(getKey(),
-                    String.format("Port number property requires a valid integer (0-65535). Invalid value: %d", intValue));
-        }
-
-        return intValue;
-    }
-
-    @Override
-    public Integer getDefault() {
-        return 9200;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/RegionConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/RegionConnectionProperty.java
deleted file mode 100644
index 0a248f0240..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/RegionConnectionProperty.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class RegionConnectionProperty extends StringConnectionProperty {
-
-    public static final String KEY = "region";
-
-    public RegionConnectionProperty() {
-        super(KEY);
-    }
-
-    public String getDefault() {
-        return null;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/RequestCompressionConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/RequestCompressionConnectionProperty.java
deleted file mode 100644
index 9ff59193ac..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/RequestCompressionConnectionProperty.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class RequestCompressionConnectionProperty extends BoolConnectionProperty {
-
-    public static final String KEY = "requestCompression";
-
-    public RequestCompressionConnectionProperty() {
-        super(KEY);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/StringConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/StringConnectionProperty.java
deleted file mode 100644
index b2716b9637..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/StringConnectionProperty.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class StringConnectionProperty extends ConnectionProperty<String> {
-
-    public StringConnectionProperty(String key) {
-        super(key);
-    }
-
-    @Override
-    protected String parseValue(Object value) throws ConnectionPropertyException {
-        
-        if (value == null) {
-            return getDefault();
-        } else if (value instanceof String) {
-            return (String) value;
-        }
-
-        throw new ConnectionPropertyException(getKey(),
-                String.format("Property %s requires a valid string. " +
-                        "Invalid value of type: %s specified.", getKey(), value.getClass().getName()));
-
-    }
-
-    @Override
-    public String getDefault() {
-        return null;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustSelfSignedConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustSelfSignedConnectionProperty.java
deleted file mode 100644
index cd7b614fcb..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustSelfSignedConnectionProperty.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class TrustSelfSignedConnectionProperty extends BoolConnectionProperty {
-
-    public static final String KEY = "trustSelfSigned";
-
-    public TrustSelfSignedConnectionProperty() {
-        super(KEY);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustStoreLocationConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustStoreLocationConnectionProperty.java
deleted file mode 100644
index b7ec224055..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustStoreLocationConnectionProperty.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class TrustStoreLocationConnectionProperty extends StringConnectionProperty {
-    public static final String KEY = "trustStoreLocation";
-
-    public TrustStoreLocationConnectionProperty() {
-        super(KEY);
-    }
-
-    public String getDefault() {
-        return null;
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustStorePasswordConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustStorePasswordConnectionProperty.java
deleted file mode 100644
index fb54a7b681..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustStorePasswordConnectionProperty.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class TrustStorePasswordConnectionProperty extends StringConnectionProperty {
-    public static final String KEY = "trustStorePassword";
-
-    public TrustStorePasswordConnectionProperty() {
-        super(KEY);
-    }
-
-    public String getDefault() {
-        return null;
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustStoreTypeConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustStoreTypeConnectionProperty.java
deleted file mode 100644
index 0202902ab7..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/TrustStoreTypeConnectionProperty.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class TrustStoreTypeConnectionProperty extends StringConnectionProperty {
-    public static final String KEY = "trustStoreType";
-
-    public TrustStoreTypeConnectionProperty() {
-        super(KEY);
-    }
-
-    public String getDefault() {
-        return "JKS";
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/UseSSLConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/UseSSLConnectionProperty.java
deleted file mode 100644
index 1f1e274c87..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/UseSSLConnectionProperty.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class UseSSLConnectionProperty extends BoolConnectionProperty {
-
-    public static final String KEY = "useSSL";
-
-    public UseSSLConnectionProperty() {
-        super(KEY);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/UserConnectionProperty.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/config/UserConnectionProperty.java
deleted file mode 100644
index 8f705f7391..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/config/UserConnectionProperty.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-public class UserConnectionProperty extends StringConnectionProperty {
-
-    public static final String KEY = "user";
-
-    public UserConnectionProperty() {
-        super(KEY);
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/JdbcWrapper.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/JdbcWrapper.java
deleted file mode 100644
index a520e584ea..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/JdbcWrapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal;
-
-import java.sql.SQLException;
-import java.sql.Wrapper;
-
-public interface JdbcWrapper extends Wrapper {
-
-    @Override
-    default boolean isWrapperFor(Class<?> iface) throws SQLException {
-        return iface != null && iface.isInstance(this);
-    }
-
-    @Override
-    default <T> T unwrap(Class<T> iface) throws SQLException {
-        try {
-            return iface.cast(this);
-        } catch (ClassCastException cce) {
-            throw new SQLException("Unable to unwrap to " + iface.toString(), cce);
-        }
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java
deleted file mode 100644
index 006f0b6962..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal;
-
-public enum Version {
-
-    // keep this in sync with the sql-jdbc/build.gradle file
-    Current(2, 0, 0, 0);
-
-    private int major;
-    private int minor;
-    private int build;
-    private int revision;
-
-    private String fullVersion;
-
-    Version(int major, int minor, int build, int revision) {
-        this.major = major;
-        this.minor = minor;
-        this.build = build;
-        this.revision = revision;
-        this.fullVersion = String.format("%d.%d.%d.%d", major, minor, build, revision);
-    }
-
-    public int getMajor() {
-        return this.major;
-    }
-
-    public int getMinor() {
-        return this.minor;
-    }
-
-    public int getBuild() {
-        return this.build;
-    }
-
-    public int getRevision() {
-        return this.revision;
-    }
-
-    public String getFullVersion() {
-        return this.fullVersion;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/exceptions/ObjectClosedException.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/exceptions/ObjectClosedException.java
deleted file mode 100644
index 10241c1bc3..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/exceptions/ObjectClosedException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.exceptions;
-
-import java.sql.SQLException;
-import java.sql.SQLNonTransientException;
-
-/**
- * Exception indicating JDBC operation can not occur due to the
- * target object being in Closed state
- */
-public class ObjectClosedException extends SQLNonTransientException {
-
-    public ObjectClosedException(String reason, String SQLState, int vendorCode) {
-        super(reason, SQLState, vendorCode);
-    }
-
-    public ObjectClosedException(String reason, String SQLState) {
-        super(reason, SQLState);
-    }
-
-    public ObjectClosedException(String reason) {
-        super(reason);
-    }
-
-    public ObjectClosedException() {
-    }
-
-    public ObjectClosedException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/ColumnMetaData.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/ColumnMetaData.java
deleted file mode 100644
index acbaa6e474..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/ColumnMetaData.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.results;
-
-import org.opensearch.jdbc.types.OpenSearchType;
-import org.opensearch.jdbc.protocol.ColumnDescriptor;
-
-public class ColumnMetaData {
-    private String name;
-    private String label;
-    private String tableSchemaName;
-    private int precision = -1;
-    private int scale = -1;
-    private String tableName;
-    private String catalogName;
-    private String openSearchTypeName;
-    private OpenSearchType openSearchType;
-
-    public ColumnMetaData(ColumnDescriptor descriptor) {
-        this.name = descriptor.getName();
-
-        // if a label isn't specified, the name is the label
-        this.label = descriptor.getLabel() == null ? this.name : descriptor.getLabel();
-
-        this.openSearchTypeName = descriptor.getType();
-        this.openSearchType = OpenSearchType.fromTypeName(openSearchTypeName);
-
-        // use canned values until server can return this
-        this.precision = this.openSearchType.getPrecision();
-        this.scale = 0;
-
-        // JDBC has these, but our protocol does not yet convey these
-        this.tableName = "";
-        this.catalogName = "";
-        this.tableSchemaName = "";
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public String getTableSchemaName() {
-        return tableSchemaName;
-    }
-
-    public int getPrecision() {
-       return  precision;
-    }
-
-    public int getScale() {
-        return scale;
-    }
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    public String getCatalogName() {
-        return catalogName;
-    }
-
-    public OpenSearchType getOpenSearchType() {
-        return openSearchType;
-    }
-
-    public String getOpenSearchTypeName() {
-        return openSearchTypeName;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/Cursor.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/Cursor.java
deleted file mode 100644
index 69d5b9a800..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/Cursor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.results;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class Cursor {
-    private Schema schema;
-    private List<Row> rows;
-    private int currentRow = -1;
-    private Map<String, Integer> labelToIndexMap;
-
-     public Cursor(Schema schema, List<Row> rows) {
-         this.schema = schema;
-         this.rows = rows;
-         initLabelToIndexMap();
-     }
-
-    public Schema getSchema() {
-        return schema;
-    }
-
-    public Object getColumn(int index) {
-        if (index < 0 || index >= getColumnCount())
-            throw new IllegalArgumentException("Column Index out of range: " + index);
-        return rows.get(currentRow).get(index);
-    }
-
-    public int getColumnCount() {
-         return schema.getNumberOfColumns();
-    }
-
-    public boolean next() {
-        if (currentRow < rows.size() - 1) {
-            currentRow++;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public Integer findColumn(String label) {
-         return labelToIndexMap.get(label);
-    }
-
-    private void initLabelToIndexMap() {
-        labelToIndexMap = new HashMap<>();
-        for (int i=0; i < schema.getNumberOfColumns(); i++) {
-            ColumnMetaData columnMetaData = schema.getColumnMetaData(i);
-            labelToIndexMap.put(columnMetaData.getLabel(), i);
-        }
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/Row.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/Row.java
deleted file mode 100644
index eafd2ba00b..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/Row.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.results;
-
-import java.util.List;
-
-public class Row {
-    private List<Object> columnData;
-
-    public Row(List<Object> columnData) {
-        this.columnData = columnData;
-    }
-
-    public Object get(int index) {
-        return columnData.get(index);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/Schema.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/Schema.java
deleted file mode 100644
index c886b40f00..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/results/Schema.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.results;
-
-import org.opensearch.jdbc.types.OpenSearchType;
-
-import java.util.List;
-
-/**
- * Represents the schema for a query result
- */
-public class Schema {
-    private final List<ColumnMetaData> columnMetaDataList;
-    private final int numberOfColumns;
-
-    public Schema(List<ColumnMetaData> columnMetaDataList) {
-        this.columnMetaDataList = columnMetaDataList;
-        this.numberOfColumns = columnMetaDataList != null ? columnMetaDataList.size() : 0;
-    }
-
-    /**
-     * @return Number of columns in result
-     */
-    public int getNumberOfColumns() {
-        return this.numberOfColumns;
-    }
-
-    /**
-     * Returns {@link ColumnMetaData} for a specific column in the result
-     *
-     * @param index the index of the column to return metadata for
-     *
-     * @return {@link ColumnMetaData} for the specified column
-     */
-    public ColumnMetaData getColumnMetaData(int index) {
-        return columnMetaDataList.get(index);
-    }
-
-    /**
-     * Returns the {@link OpenSearchType} corresponding to a specific
-     * column in the result.
-     *
-     * @param index the index of the column to return the type for
-     *
-     * @return {@link OpenSearchType} for the specified column
-     */
-    public OpenSearchType getOpenSearchType(int index) {
-        return columnMetaDataList.get(index).getOpenSearchType();
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/AwsHostNameUtil.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/AwsHostNameUtil.java
deleted file mode 100644
index fa8cb58031..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/AwsHostNameUtil.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.util;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Utility methods to work with AWS format hostnames
- */
-public class AwsHostNameUtil {
-
-    private static final Pattern REGION_PATTERN =
-            Pattern.compile("^(?:.+\\.)?([a-z0-9-]+)$");
-
-    private static final Pattern KNOWN_HOSTNAME_PATTERN =
-            Pattern.compile("^(?:.+)?(\\.es\\.[a-z0-9]+\\.com)$");
-
-    /**
-     * Returns the region name contained in a specified endpoint based
-     * on known conventions for endpoint formats.
-     *
-     * @param hostname the hostname to parse
-     *
-     * @return the region parsed from the hostname, or
-     *         null if region could not be determined.
-     */
-    public static String parseRegion(final String hostname) {
-        if (hostname == null) {
-            throw new IllegalArgumentException("hostname cannot be null");
-        }
-
-        String region = null;
-        int knownSuffixLength = 0;
-
-        Matcher matcher = KNOWN_HOSTNAME_PATTERN.matcher(hostname);
-        if (matcher.matches()) {
-            knownSuffixLength = matcher.group(1).length();
-        }
-
-        if (knownSuffixLength > 0) {
-            // hostname has the format 'ABC.es.XYZ.com'
-            int index = hostname.length() - knownSuffixLength;
-            region = parseStandardRegionName(hostname.substring(0, index));
-        }
-
-        return region;
-    }
-
-    /**
-     * Parses the region name from an endpoint fragment.
-     *
-     * @param fragment the portion of the endpoint up to the region name
-     *
-     * @return the parsed region name (or null if we can't tell for sure)
-     */
-    private static String parseStandardRegionName(final String fragment) {
-        Matcher matcher = REGION_PATTERN.matcher(fragment);
-        if (matcher.matches()) {
-            // fragment is of the form 'domain-name.region'
-            // return the region component
-            return matcher.group(1);
-        } else {
-            return null;
-        }
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/JavaUtil.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/JavaUtil.java
deleted file mode 100644
index f996fff145..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/JavaUtil.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.util;
-
-public class JavaUtil {
-
-    public static String getJavaVersion() {
-        return System.getProperty("java.version");
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/SqlParser.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/SqlParser.java
deleted file mode 100644
index 213bc860fc..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/SqlParser.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.util;
-
-
-/**
- * Rudimentary SQL parser to help with very basic
- * driver side validations.
- */
-public class SqlParser {
-
-    public static int countParameterMarkers(String sql) {
-        if (sql == null)
-            return 0;
-
-        int count = 0;
-
-        for (int i=0; i < sql.length(); i++) {
-
-            char ch = sql.charAt(i);
-
-            switch (ch) {
-                case '\'':
-                case '\"':
-                    i = locateQuoteEnd(sql, ch, i+1);
-                    break;
-                case '?':
-                    count++;
-                    break;
-                case '-':
-                case '/':
-                    i = locateCommentEnd(sql, ch, i);
-            }
-
-        }
-        return count;
-    }
-
-    private static int locateCommentEnd(String s, char commentStartChar, int commentStartIndex) {
-        if (commentStartIndex + 1 > s.length())
-            return commentStartIndex;
-
-        int idx;
-
-        if (commentStartChar == '-' && s.charAt(commentStartIndex + 1) == '-') {
-            // single line comment
-            idx = locateLineEnd(s, commentStartIndex + 2);
-
-        } else if (commentStartChar == '/' && s.charAt(commentStartIndex + 1) == '*') {
-            // multi line comment
-            idx = s.indexOf("*/", commentStartIndex + 2);
-
-        } else {
-            // not on a comment
-            return commentStartIndex;
-        }
-        
-        if (idx == -1)
-            throw new IllegalArgumentException("SQL text contains an unterminated comment.");
-        else
-            return idx;
-    }
-
-    private static int locateQuoteEnd(String s, char ch, int fromIndex) {
-        int idx = s.indexOf(ch, fromIndex);
-        if (idx == -1)
-            throw new IllegalArgumentException("SQL text contains an unterminated string. " +
-                    "This could possibly be due to mismatched quotes in the statement.");
-        return idx;
-    }
-
-
-    private static int locateLineEnd(String s, int fromIndex) {
-        int idx;
-
-        for (idx=fromIndex; idx < s.length(); idx++) {
-            char ch = s.charAt(idx);
-
-            if (ch == '\r' || ch == '\n')
-                break;
-        }
-        return idx;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/UrlParser.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/UrlParser.java
deleted file mode 100644
index 4db9eb8285..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/util/UrlParser.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.util;
-
-import org.opensearch.jdbc.config.ConnectionProperty;
-import org.opensearch.jdbc.config.HostConnectionProperty;
-import org.opensearch.jdbc.config.PathConnectionProperty;
-import org.opensearch.jdbc.config.PortConnectionProperty;
-import org.opensearch.jdbc.config.UseSSLConnectionProperty;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-public class UrlParser {
-
-    public static final String URL_PREFIX = "jdbc:opensearch://";
-    private static final int URL_PREFIX_LEN = URL_PREFIX.length();
-
-    private static final String SCHEME_DELIM = "://";
-
-    public static boolean isAcceptable(String url) {
-        return url != null && url.startsWith(URL_PREFIX);
-    }
-
-    /**
-     * Parses a JDBC url and returns the url's components as a set of
-     * properties.
-     *
-     * URL format expected is:
-     *
-     * <code>[driver prefix]://[scheme]://[host:[port]]/[path][?[propertyKey=value]&]</code>
-     *
-     * scheme, host, port and path are extracted from the url and returned
-     * against the same property keys as their corresponding
-     * {@link ConnectionProperty}
-     * instances.
-     *
-     * Properties specified in the url query string are returned against
-     * the exact property key as is used in the url.
-     *
-     * If any property that is derived from the url format - such as scheme,
-     * host, port etc is also specified in url query string, then the value in
-     * the query string overrides the derived value.
-     *
-     *
-     * @param inputUrl
-     * @return scheme, host, port, path are returned using the same
-     * property key as corresponding ConnectionProperty instance.
-     */
-    public static Properties parseProperties(final String inputUrl) throws URISyntaxException {
-
-        // TODO - support percent encoding for URL reserved characters
-        if (inputUrl == null || inputUrl.indexOf(URL_PREFIX) != 0) {
-            throw new URISyntaxException(inputUrl,
-                    String.format("URL does not begin with the mandatory prefix %s.", URL_PREFIX));
-        }
-
-        final String trimmedUrl = inputUrl.trim();
-        int schemeDelimIdx = trimmedUrl.indexOf(SCHEME_DELIM, URL_PREFIX_LEN);
-
-        URI uri = null;
-
-        if (schemeDelimIdx != -1){
-            // user provided a scheme
-            uri = toURI(extractTargetUrl(trimmedUrl));
-        } else if (URL_PREFIX_LEN < trimmedUrl.length()) {
-            // no scheme provided, but URL has more than just URL_PREFIX,
-            // so assume http:// scheme.
-            uri = toURI("http://"+extractTargetUrl(trimmedUrl));
-        }
-
-        Properties props = new Properties();
-
-        if (uri != null) {
-            String scheme = uri.getScheme();
-            String host = uri.getHost();
-            int port = uri.getPort();
-            String path = uri.getPath();
-
-            if (host != null)
-                props.setProperty(HostConnectionProperty.KEY, host);
-
-            if (port != -1)
-                props.setProperty(PortConnectionProperty.KEY, Integer.toString(port));
-
-            if (path != null && path.length() > 0)
-                props.setProperty(PathConnectionProperty.KEY, path);
-
-            if ("https".equalsIgnoreCase(scheme)) {
-                props.setProperty(UseSSLConnectionProperty.KEY, "true");
-            } else if ("http".equalsIgnoreCase(scheme)) {
-                props.setProperty(UseSSLConnectionProperty.KEY, "false");
-            } else {
-                throw new URISyntaxException(inputUrl, "Invalid scheme:"+scheme+". Only http and https are supported.");
-            }
-
-            String query = uri.getRawQuery();
-            if (query != null) {
-                StringTokenizer tokenizer = new StringTokenizer(query, "&");
-                while(tokenizer.hasMoreElements()) {
-                    String kvp = tokenizer.nextToken();
-
-                    String[] kv = kvp.split("=");
-
-                    if (kv.length != 2)  {
-                        throw new URISyntaxException(inputUrl,
-                                "QueryString format of URL invalid. Found unexpected format at "
-                                        + kv[0]
-                                        + ". Expected key=value pairs");
-                    } else {
-                        props.setProperty(kv[0], kv[1]);
-                    }
-                }
-            }
-        }
-
-        return props;
-    }
-
-    private static String extractTargetUrl(final String url) {
-        return url.substring(URL_PREFIX_LEN);
-    }
-
-    private static URI toURI(final String str) throws URISyntaxException {
-       return new URI(str);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/FilePrintWriterLogger.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/FilePrintWriterLogger.java
deleted file mode 100644
index 183ff6d556..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/FilePrintWriterLogger.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.logging;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-
-public class FilePrintWriterLogger extends PrintWriterLogger {
-
-    public FilePrintWriterLogger(String filePath, LogLevel logLevel, Layout layout) throws IOException {
-        super(new PrintWriter(
-                Files.newBufferedWriter(
-                        Paths.get("").resolve(filePath),
-                        StandardCharsets.UTF_8,
-                        StandardOpenOption.CREATE,
-                        StandardOpenOption.APPEND), true), logLevel, layout);
-    }
-
-    @Override
-    public void close() {
-        super.close();
-        printWriter.close();
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/Layout.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/Layout.java
deleted file mode 100644
index 3f732cf88c..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/Layout.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.logging;
-
-public interface Layout {
-    String formatLogEntry(LogLevel severity, String message);
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/LogLevel.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/LogLevel.java
deleted file mode 100644
index a71c262bd0..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/LogLevel.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.logging;
-
-/**
- * Enumeration of possible Logging levels
- */
-public enum LogLevel {
-
-    /**
-     * Log nothing
-     */
-    OFF(0),
-
-    /**
-     * Log only fatal errors
-     */
-    FATAL(10),
-
-    /**
-     * Log all errors
-     */
-    ERROR(20),
-
-    /**
-     * Log all errors and warnings
-     */
-    WARN(30),
-
-    /**
-     * Log all errors, warnings and info messages
-     */
-    INFO(40),
-
-    /**
-     * Log everything up to INFO and any debug logs
-     */
-    DEBUG(50),
-
-    /**
-     * Log everything up to DEBUG and any additional fine grained
-     * trace logs
-     */
-    TRACE(60),
-
-    /**
-     * Log everything
-     */
-    ALL(100);
-
-    /**
-     * Internal severity level indicator for the log level
-     */
-    private int severity;
-
-    LogLevel(final int severity) {
-        this.severity = severity;
-    }
-
-    /**
-     * @return internal severity level associated with the log level
-     */
-    private int severity() {
-        return severity;
-    }
-
-    /**
-     * Checks if this LogLevel corresponds to a severity level
-     * matching or exceeding the severity level of a specified LogLevel.
-     *
-     * @param level the logging level to compare this log level with
-     *
-     * @return true, if the severity of this log level matches or
-     *         exceeds the severity of the specified log level, false otherwise.
-     */
-    public boolean isGreaterThanOrEqualTo(LogLevel level) {
-        return this.severity() >= level.severity();
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/Logger.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/Logger.java
deleted file mode 100644
index 895b5c427a..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/Logger.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.logging;
-
-import java.util.function.Supplier;
-
-public interface Logger {
-
-    LogLevel getLevel();
-
-    void fatal(String message);
-
-    void fatal(String message, Throwable t);
-
-    default void fatal(Supplier<String> messageSupplier) {
-        if (isFatalEnabled()) {
-            fatal(messageSupplier.get());
-        }
-    }
-
-    default void fatal(Supplier<String> messageSupplier, Throwable t) {
-        if (isFatalEnabled()) {
-            fatal(messageSupplier.get(), t);
-        }
-    }
-
-    void error(String message);
-
-    void error(String message, Throwable t);
-
-    default void error(Supplier<String> messageSupplier) {
-        if (isErrorEnabled()) {
-            error(messageSupplier.get());
-        }
-    }
-
-    default void error(Supplier<String> messageSupplier, Throwable t) {
-        if (isErrorEnabled()) {
-            error(messageSupplier.get(), t);
-        }
-    }
-
-    void warn(String message);
-
-    void warn(String message, Throwable t);
-
-    default void warn(Supplier<String> messageSupplier) {
-        if (isWarnEnabled()) {
-            warn(messageSupplier.get());
-        }
-    }
-
-    default void warn(Supplier<String> messageSupplier, Throwable t) {
-        if (isWarnEnabled()) {
-            warn(messageSupplier.get(), t);
-        }
-    }
-
-    void info(String message);
-
-    void info(String message, Throwable t);
-
-    default void info(Supplier<String> messageSupplier) {
-        if (isInfoEnabled()) {
-            info(messageSupplier.get());
-        }
-    }
-
-    default void info(Supplier<String> messageSupplier, Throwable t) {
-        if (isInfoEnabled()) {
-            info(messageSupplier.get(), t);
-        }
-    }
-
-    void debug(String message);
-
-    void debug(String message, Throwable t);
-
-    default void debug(Supplier<String> messageSupplier) {
-        if (isDebugEnabled()) {
-            debug(messageSupplier.get());
-        }
-    }
-
-    default void debug(Supplier<String> messageSupplier, Throwable t) {
-        if (isDebugEnabled()) {
-            debug(messageSupplier.get(), t);
-        }
-    }
-
-    void trace(String message);
-
-    void trace(String message, Throwable t);
-
-    default void trace(Supplier<String> messageSupplier) {
-        if (isTraceEnabled()) {
-            trace(messageSupplier.get());
-        }
-    }
-
-    default void trace(Supplier<String> messageSupplier, Throwable t) {
-        if (isTraceEnabled()) {
-            trace(messageSupplier.get(), t);
-        }
-    }
-
-    default boolean isDebugEnabled() {
-        return getLevel().isGreaterThanOrEqualTo(LogLevel.DEBUG);
-    }
-
-    default boolean isErrorEnabled() {
-        return isLevelEnabled(LogLevel.ERROR);
-    }
-
-    default boolean isFatalEnabled() {
-        return isLevelEnabled(LogLevel.FATAL);
-    }
-
-    default boolean isInfoEnabled() {
-        return isLevelEnabled(LogLevel.INFO);
-    }
-
-    default boolean isTraceEnabled() {
-        return isLevelEnabled(LogLevel.TRACE);
-    }
-
-    default boolean isWarnEnabled() {
-        return isLevelEnabled(LogLevel.WARN);
-    }
-
-    default boolean isLevelEnabled(LogLevel level) {
-        return getLevel().isGreaterThanOrEqualTo(level);
-    }
-
-    void close();
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/LoggerFactory.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/LoggerFactory.java
deleted file mode 100644
index ff4c9b506b..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/LoggerFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.logging;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-public class LoggerFactory {
-
-    public static Logger getLogger(String filePath, LogLevel logLevel) {
-        return getLogger(filePath, logLevel, StandardLayout.INSTANCE);
-    }
-
-    public static Logger getLogger(String filePath, LogLevel logLevel, Layout layout) {
-        try {
-            return new FilePrintWriterLogger(filePath, logLevel, layout);
-        } catch (IOException ioe) {
-            throw new RuntimeException(ioe);
-        }
-    }
-
-    public static Logger getLogger(PrintWriter printWriter, LogLevel logLevel) {
-        return getLogger(printWriter, logLevel, StandardLayout.INSTANCE);
-    }
-
-    public static Logger getLogger(PrintWriter printWriter, LogLevel logLevel, Layout layout) {
-        return new PrintWriterLogger(printWriter, logLevel, layout);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/LoggingSource.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/LoggingSource.java
deleted file mode 100644
index 71eeec7069..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/LoggingSource.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.logging;
-
-import java.sql.SQLException;
-
-/**
- * An entity that generates log messages containing an identifier for
- * the source of the log message.
- */
-public interface LoggingSource {
-
-    default String logMessage(final String format, final Object... args) {
-        return logMessage(String.format(format, args));
-    }
-
-    default String logMessage(final String message) {
-        return buildMessage(message);
-    }
-
-    default String logEntry(final String format, final Object... args) {
-        return logMessage(String.format(format, args) +" called");
-    }
-
-    default String logExit(final String message, final Object returnValue) {
-        return logMessage(message +" returning: "+returnValue);
-    }
-
-    default String logExit(final String message) {
-        return logMessage(message +" returned");
-    }
-
-    default String getSource() {
-        return this.getClass().getSimpleName() + "@" + Integer.toHexString(this.hashCode());
-    }
-
-    default void logAndThrowSQLException(Logger log, SQLException sqlex) throws SQLException {
-        logAndThrowSQLException(log, LogLevel.ERROR, sqlex);
-    }
-
-    default void logAndThrowSQLException(Logger log, LogLevel severity, SQLException sqlex) throws SQLException {
-        logAndThrowSQLException(log, severity, sqlex.getMessage(), sqlex);
-    }
-
-    default void logAndThrowSQLException(Logger log, LogLevel severity, String message, SQLException sqlex) throws SQLException {
-        if (log.isLevelEnabled(severity)) {
-
-            String logMessage = buildMessage(message);
-
-            switch (severity) {
-                case OFF:
-                    break;
-                case INFO:
-                    log.info(logMessage, sqlex);
-                    break;
-                case WARN:
-                    log.warn(logMessage, sqlex);
-                    break;
-                case DEBUG:
-                    log.debug(logMessage, sqlex);
-                    break;
-                case ERROR:
-                    log.error(logMessage, sqlex);
-                    break;
-                case FATAL:
-                    log.fatal(logMessage, sqlex);
-                    break;
-                case TRACE:
-                    log.trace(logMessage, sqlex);
-                    break;
-                case ALL:
-                    log.error(logMessage, sqlex);
-                    break;
-            }
-        }
-        throw sqlex;
-    }
-
-    default String buildMessage(final  String message) {
-        return "["+ getSource()+"] "+message;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/NoOpLogger.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/NoOpLogger.java
deleted file mode 100644
index fe7577a0fc..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/NoOpLogger.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.logging;
-
-/**
- * An No-Op logger that indicates to a caller that all log levels are
- * disabled and does nothing for any other logging method invocations.
- *
- * Classes that use a Logger would typically need to do a null
- * check on the handle if the handle were to be null when logging is
- * disabled. To avoid having such checks on every use of a logger,
- * this no-op logger can be set as the logger when logging is disabled.
- *
- * The consumer of this logger sees all log levels as disabled and any
- * inadvertent calls to log messages are a no-op.
- */
-public class NoOpLogger implements Logger {
-
-    public static final NoOpLogger INSTANCE = new NoOpLogger();
-
-    private NoOpLogger() {
-        // singleton
-    }
-
-    @Override
-    public LogLevel getLevel() {
-        return LogLevel.OFF;
-    }
-
-    @Override
-    public void debug(String message) {
-
-    }
-
-    @Override
-    public void debug(String message, Throwable t) {
-
-    }
-
-    @Override
-    public void error(String message) {
-
-    }
-
-    @Override
-    public void error(String message, Throwable t) {
-
-    }
-
-    @Override
-    public void fatal(String message) {
-
-    }
-
-    @Override
-    public void fatal(String message, Throwable t) {
-
-    }
-
-    @Override
-    public void info(String message) {
-
-    }
-
-    @Override
-    public void info(String message, Throwable t) {
-
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isErrorEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isFatalEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isInfoEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isTraceEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isWarnEnabled() {
-        return false;
-    }
-
-    @Override
-    public void trace(String message) {
-
-    }
-
-    @Override
-    public void trace(String message, Throwable t) {
-
-    }
-
-    @Override
-    public void warn(String message) {
-
-    }
-
-    @Override
-    public void warn(String message, Throwable t) {
-
-    }
-
-    @Override
-    public void close() {
-
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/PrintWriterLogger.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/PrintWriterLogger.java
deleted file mode 100644
index bda46e9117..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/PrintWriterLogger.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.logging;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-public class PrintWriterLogger implements Logger {
-
-    protected final PrintWriter printWriter;
-    private LogLevel logLevel;
-    private Layout layout;
-
-    public PrintWriterLogger(PrintWriter printWriter, LogLevel logLevel, Layout layout) {
-        this.printWriter = printWriter;
-        this.logLevel = logLevel == null ? LogLevel.OFF : logLevel;
-        this.layout = layout;
-    }
-
-    @Override
-    public void fatal(String message) {
-        printMessage(LogLevel.FATAL, message);
-    }
-
-    @Override
-    public void fatal(String message, Throwable t) {
-        printMessage(LogLevel.FATAL, message, t);
-    }
-
-    @Override
-    public void error(String message) {
-        printMessage(LogLevel.ERROR, message);
-    }
-
-    @Override
-    public void error(String message, Throwable t) {
-        printMessage(LogLevel.ERROR, message, t);
-    }
-
-    @Override
-    public void warn(String message) {
-        printMessage(LogLevel.WARN, message);
-    }
-
-    @Override
-    public void warn(String message, Throwable t) {
-        printMessage(LogLevel.WARN, message, t);
-    }
-
-    private void printMessage(LogLevel severity, String message) {
-        printWriter.println(layout.formatLogEntry(severity, message));
-    }
-
-    private void printMessage(LogLevel severity, String message, Throwable t) {
-        String logMessage = buildMessageWithThrowable(message, t);
-        printWriter.println(layout.formatLogEntry(severity, logMessage));
-    }
-
-    private String buildMessageWithThrowable(String message, Throwable t) {
-        StringWriter stringWriter = new StringWriter();
-        PrintWriter pw = new PrintWriter(stringWriter);
-        pw.println(message);
-        t.printStackTrace(pw);
-        pw.close();
-        return stringWriter.toString();
-    }
-    @Override
-    public void info(String message) {
-        printMessage(LogLevel.INFO, message);
-    }
-
-    @Override
-    public void info(String message, Throwable t) {
-        printMessage(LogLevel.INFO, message, t);
-    }
-
-    @Override
-    public void debug(String message) {
-        printMessage(LogLevel.DEBUG, message);
-    }
-
-    @Override
-    public void debug(String message, Throwable t) {
-        printMessage(LogLevel.DEBUG, message, t);
-    }
-
-    @Override
-    public void trace(String message) {
-        printMessage(LogLevel.TRACE, message);
-    }
-
-    @Override
-    public void trace(String message, Throwable t) {
-        printMessage(LogLevel.TRACE, message, t);
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        return logLevel.isGreaterThanOrEqualTo(LogLevel.DEBUG);
-    }
-
-    @Override
-    public LogLevel getLevel() {
-        return logLevel;
-    }
-
-    @Override
-    public void close() {
-        printWriter.flush();
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/StandardLayout.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/StandardLayout.java
deleted file mode 100644
index 7e7d51b6ec..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/logging/StandardLayout.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.logging;
-
-/**
- * The default log entry layout for driver emitted logs
- *
- * Formats log entries with [timestamp][severity][thread-name] message
- *
- * Timestamp uses ISO format date and a a 24 hour clock value upto
- * milliseconds: [YYYY-mm-dd HH:MM:SS.mmm]
- */
-public class StandardLayout implements Layout {
-    public static final StandardLayout INSTANCE = new StandardLayout();
-
-    private StandardLayout() {
-        // singleton
-    }
-
-    @Override
-    public String formatLogEntry(LogLevel severity, String message)  {
-        long time = System.currentTimeMillis();
-        return String.format("[%tF %tT.%tL][%-5s][Thread-%s]%s",
-                time, time, time, severity, Thread.currentThread().getName(), message);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ClusterMetadata.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ClusterMetadata.java
deleted file mode 100644
index 5cc52d69d4..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ClusterMetadata.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-import org.opensearch.jdbc.OpenSearchVersion;
-
-public interface ClusterMetadata {
-    String getClusterName();
-
-    String getClusterUUID();
-
-    OpenSearchVersion getVersion();
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ColumnDescriptor.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ColumnDescriptor.java
deleted file mode 100644
index 0ccffe898e..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ColumnDescriptor.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-public interface ColumnDescriptor {
-    /**
-     * Column name
-     * @return
-     */
-    String getName();
-
-    /**
-     * Label
-     */
-     String getLabel();
-
-    /**
-     * Column data type
-     * @return
-     */
-    String getType();
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ConnectionResponse.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ConnectionResponse.java
deleted file mode 100644
index f6439abeb7..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ConnectionResponse.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-public interface ConnectionResponse {
-    ClusterMetadata getClusterMetadata();
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/JdbcDateTimeFormatter.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/JdbcDateTimeFormatter.java
deleted file mode 100644
index 9306bd9156..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/JdbcDateTimeFormatter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-import java.sql.Timestamp;
-import java.time.format.DateTimeFormatter;
-import java.sql.Date;
-
-public enum JdbcDateTimeFormatter {
-
-    JDBC_FORMAT("yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss");
-
-    private DateTimeFormatter dateFormatter;
-    private DateTimeFormatter timestampFormatter;
-
-    JdbcDateTimeFormatter(String dateFormat, String timestampFormat) {
-        this.dateFormatter = DateTimeFormatter.ofPattern(dateFormat);
-        this.timestampFormatter = DateTimeFormatter.ofPattern(timestampFormat);
-    }
-
-    public String format(Date date) {
-        return date.toLocalDate().format(dateFormatter);
-    }
-
-    public String format(Timestamp date) {
-        return date.toLocalDateTime().format(timestampFormatter);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/JdbcQueryParam.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/JdbcQueryParam.java
deleted file mode 100644
index ff0c01330a..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/JdbcQueryParam.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-public class JdbcQueryParam implements Parameter {
-    private Object value;
-
-    private String type;
-
-    public JdbcQueryParam(String type, Object value) {
-        this.type = type;
-        this.value = value;
-    }
-
-    @Override
-    public Object getValue() {
-        return value;
-    }
-
-    @Override
-    public String getType() {
-        return type;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/JdbcQueryRequest.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/JdbcQueryRequest.java
deleted file mode 100644
index c1dc47a311..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/JdbcQueryRequest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-import java.util.List;
-import java.util.Objects;
-
-public class JdbcQueryRequest implements QueryRequest {
-
-    private String statement;
-    private int fetchSize;
-    List<JdbcQueryParam> parameters;
-
-    public JdbcQueryRequest(String sql) {
-        this.statement = sql;
-    }
-
-    public JdbcQueryRequest(String sql, int fetchSize) {
-        this.statement = sql;
-        this.fetchSize = fetchSize;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof JdbcQueryRequest)) return false;
-        JdbcQueryRequest that = (JdbcQueryRequest) o;
-        return Objects.equals(statement, that.statement) &&
-                Objects.equals(getParameters(), that.getParameters());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(statement, getParameters());
-    }
-
-    @Override
-    public String getQuery() {
-        return statement;
-    }
-
-    @Override
-    public List<JdbcQueryParam> getParameters() {
-        return parameters;
-    }
-
-    public void setParameters(List<JdbcQueryParam> parameters) {
-        this.parameters = parameters;
-    }
-
-    @Override
-    public int getFetchSize() {
-        return fetchSize;
-    }
-
-    @Override
-    public String toString() {
-        return "JdbcQueryRequest{" +
-                "statement='" + statement + '\'' +
-                ", fetchSize='" + fetchSize + '\'' +
-                ", parameters=" + parameters +
-                '}';
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/Parameter.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/Parameter.java
deleted file mode 100644
index c34a58148e..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/Parameter.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-public interface Parameter {
-
-    Object getValue();
-
-    String getType();
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/Protocol.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/Protocol.java
deleted file mode 100644
index 5bf7e77008..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/Protocol.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-
-import java.io.IOException;
-
-public interface Protocol extends AutoCloseable {
-
-    ConnectionResponse connect(int timeout) throws ResponseException, IOException;
-
-    QueryResponse execute(QueryRequest request) throws ResponseException, IOException;
-
-    void close() throws IOException;
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ProtocolFactory.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ProtocolFactory.java
deleted file mode 100644
index f5d95abb6e..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/ProtocolFactory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.transport.Transport;
-
-public interface ProtocolFactory<P extends Protocol, T extends Transport> {
-    P getProtocol(ConnectionConfig config, T transport);
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/QueryRequest.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/QueryRequest.java
deleted file mode 100644
index cd21db6a7f..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/QueryRequest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-import java.util.List;
-
-public interface QueryRequest {
-
-    String getQuery();
-
-    List<? extends Parameter> getParameters();
-
-    public int getFetchSize();
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/QueryResponse.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/QueryResponse.java
deleted file mode 100644
index 7ae3890acd..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/QueryResponse.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-import java.util.List;
-
-public interface QueryResponse {
-
-    List<? extends ColumnDescriptor> getColumnDescriptors();
-
-    List<List<Object>> getDatarows();
-
-    long getTotal();
-
-    long getSize();
-
-    int getStatus();
-
-    String getCursor();
-
-    RequestError getError();
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/RequestError.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/RequestError.java
deleted file mode 100644
index ac39091dd3..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/RequestError.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-public interface RequestError {
-    String getReason();
-
-    String getDetails();
-
-    String getType();
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/exceptions/InternalServerErrorException.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/exceptions/InternalServerErrorException.java
deleted file mode 100644
index bea8ca1d52..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/exceptions/InternalServerErrorException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.exceptions;
-
-import java.sql.SQLNonTransientException;
-
-public class InternalServerErrorException extends SQLNonTransientException {
-
-    String reason;
-    String type;
-    String details;
-
-    public InternalServerErrorException(String reason, String type, String details) {
-        this.reason = reason;
-        this.type = type;
-        this.details = details;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public String getDetails() {
-        return details;
-    }
-
-    @Override
-    public String toString() {
-        return "Internal Server Error. Reason: "+ reason+". " +
-                "Type: "+ type+". Details: "+ details;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/exceptions/MalformedResponseException.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/exceptions/MalformedResponseException.java
deleted file mode 100644
index bcff33ee52..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/exceptions/MalformedResponseException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.exceptions;
-
-/**
- * Exception thrown when an malformed response is received from the
- * server.
- */
-public class MalformedResponseException extends ResponseException {
-
-    public MalformedResponseException() {
-    }
-
-    public MalformedResponseException(String message) {
-        super(message);
-    }
-
-    public MalformedResponseException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public MalformedResponseException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/exceptions/ResponseException.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/exceptions/ResponseException.java
deleted file mode 100644
index 02ce9af4ce..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/exceptions/ResponseException.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.exceptions;
-
-import java.io.IOException;
-import java.sql.SQLException;
-
-/**
- * Exception thrown when an unexpected server response is received.
- */
-public class ResponseException extends Exception {
-    private String responsePayload = null;
-
-    public ResponseException() {
-    }
-
-    public ResponseException(String message) {
-        super(message);
-    }
-
-    public ResponseException(String message, Throwable cause, String responsePayload) {
-        super(message, cause);
-        this.responsePayload = responsePayload;
-    }
-
-    public ResponseException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ResponseException(Throwable cause) {
-        super(cause);
-    }
-
-    public String getResponsePayload() {
-        return responsePayload;
-    }
-
-    @Override
-    public String getLocalizedMessage() {
-        String localizedMessage = super.getLocalizedMessage();
-
-        if (responsePayload != null) {
-            localizedMessage = (localizedMessage == null ? "" : localizedMessage)
-                    + " Raw response received: " + getResponsePayload();
-        }
-
-        return localizedMessage;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/HttpException.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/HttpException.java
deleted file mode 100644
index d6373c35e0..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/HttpException.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-
-/**
- * Exception thrown when an unexpected HTTP response code is
- * received from the server.
- */
-public class HttpException extends ResponseException {
-
-    private int statusCode;
-
-    /**
-     * @param statusCode HTTP Status code due to which this exception is raised.
-     * @param message Message associated with the exception - can be the HTTP
-     *         reason phrase corresponding to the status code.
-     */
-    public HttpException(int statusCode, String message) {
-        super(message);
-        this.statusCode = statusCode;
-    }
-
-    public HttpException(int statusCode, String message, Throwable cause, String responsePayload) {
-        super(message, cause, responsePayload);
-        this.statusCode = statusCode;
-    }
-
-    /**
-     * Returns the HTTP response status code that resulted in
-     * this exception.
-     *
-     * @return HTTP status code
-     */
-    public int getStatusCode() {
-        return statusCode;
-    }
-
-    @Override
-    public String getLocalizedMessage() {
-        String message = getMessage();
-        String localizedMessage = "HTTP Code: " + statusCode +
-                ". Message: " + (message == null ? "None" : message) + ".";
-
-        if (this.getResponsePayload() != null) {
-            localizedMessage += " Raw response received: " + getResponsePayload();
-        }
-
-        return localizedMessage;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/HttpResponseHandler.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/HttpResponseHandler.java
deleted file mode 100644
index 07f24f843d..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/HttpResponseHandler.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-import org.apache.http.HttpResponse;
-
-public interface HttpResponseHandler<T> {
-
-    T handleResponse(HttpResponse response) throws ResponseException;
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JdbcCursorQueryRequest.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JdbcCursorQueryRequest.java
deleted file mode 100644
index 62da04ccfd..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JdbcCursorQueryRequest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.JdbcQueryParam;;
-import org.opensearch.jdbc.protocol.QueryRequest;
-
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Bean to encapsulate cursor ID
- *
- *  @author abbas hussain
- *  @since 07.05.20
- **/
-public class JdbcCursorQueryRequest implements QueryRequest {
-
-    String cursor;
-
-    public JdbcCursorQueryRequest(String cursor) {
-        this.cursor = cursor;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof JdbcCursorQueryRequest)) return false;
-        JdbcCursorQueryRequest that = (JdbcCursorQueryRequest) o;
-        return Objects.equals(cursor, that.cursor) &&
-                Objects.equals(getParameters(), that.getParameters());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(cursor, getParameters());
-    }
-
-    @Override
-    public String getQuery() {
-        return cursor;
-    }
-
-    @Override
-    public List<JdbcQueryParam> getParameters() {
-        return null;
-    }
-
-    @Override
-    public int getFetchSize() {
-        return 0;
-    }
-
-    @Override
-    public String toString() {
-        return "JdbcQueryRequest{" +
-                "cursor='" + cursor + '\'' +
-                '}';
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonClusterMetadata.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonClusterMetadata.java
deleted file mode 100644
index 920bdc4f8d..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonClusterMetadata.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.ClusterMetadata;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class JsonClusterMetadata implements ClusterMetadata {
-
-    @JsonProperty("cluster_name")
-    private String clusterName;
-
-    @JsonProperty("cluster_uuid")
-    private String clusterUUID;
-
-    @JsonProperty("version")
-    private JsonOpenSearchVersion version;
-
-    @Override
-    public String getClusterName() {
-        return clusterName;
-    }
-
-    @Override
-    public String getClusterUUID() {
-        return clusterUUID;
-    }
-
-    @Override
-    public JsonOpenSearchVersion getVersion() {
-        return version;
-    }
-
-    public void setClusterName(String clusterName) {
-        this.clusterName = clusterName;
-    }
-
-    public void setClusterUUID(String clusterUUID) {
-        this.clusterUUID = clusterUUID;
-    }
-
-    public void setVersion(JsonOpenSearchVersion version) {
-        this.version = version;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonConnectionResponse.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonConnectionResponse.java
deleted file mode 100644
index 78a0377555..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonConnectionResponse.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.ConnectionResponse;
-import org.opensearch.jdbc.protocol.ClusterMetadata;
-
-public class JsonConnectionResponse implements ConnectionResponse {
-    private ClusterMetadata clusterMetadata;
-
-    public JsonConnectionResponse(ClusterMetadata clusterMetadata) {
-        this.clusterMetadata = clusterMetadata;
-    }
-
-    @Override
-    public ClusterMetadata getClusterMetadata() {
-        return clusterMetadata;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonCursorHttpProtocol.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonCursorHttpProtocol.java
deleted file mode 100644
index 8df094eda6..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonCursorHttpProtocol.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.QueryRequest;
-import org.opensearch.jdbc.protocol.QueryResponse;
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-import org.opensearch.jdbc.transport.http.HttpTransport;
-import org.apache.http.client.methods.CloseableHttpResponse;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Http protocol for cursor request and response
- *
- *  @author abbas hussain
- *  @since 07.05.20
- **/
-public class JsonCursorHttpProtocol extends JsonHttpProtocol {
-
-    public JsonCursorHttpProtocol(HttpTransport transport) {
-        this(transport, DEFAULT_SQL_CONTEXT_PATH);
-    }
-
-    public JsonCursorHttpProtocol(HttpTransport transport, String sqlContextPath) {
-        super(transport, sqlContextPath);
-    }
-
-    @Override
-    public QueryResponse execute(QueryRequest request) throws ResponseException, IOException {
-        try (CloseableHttpResponse response = getTransport().doPost(
-                getSqlContextPath(),
-                defaultJsonHeaders,
-                defaultJdbcParams,
-                buildQueryRequestBody(request), 0)) {
-
-            return getJsonHttpResponseHandler().handleResponse(response, this::processQueryResponse);
-
-        }
-    }
-
-    private String buildQueryRequestBody(QueryRequest queryRequest) throws IOException {
-        JsonCursorQueryRequest jsonQueryRequest = new JsonCursorQueryRequest(queryRequest);
-        String requestBody = mapper.writeValueAsString(jsonQueryRequest);
-        return requestBody;
-    }
-
-    private JsonQueryResponse processQueryResponse(InputStream contentStream) throws IOException {
-        return mapper.readValue(contentStream, JsonQueryResponse.class);
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonCursorHttpProtocolFactory.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonCursorHttpProtocolFactory.java
deleted file mode 100644
index 0ae4f1934f..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonCursorHttpProtocolFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.protocol.ProtocolFactory;
-import org.opensearch.jdbc.transport.http.HttpTransport;
-
-/**
- * Factory to create JsonCursorHttpProtocol objects
- *
- *  @author abbas hussain
- *  @since 07.05.20
- */
-public class JsonCursorHttpProtocolFactory implements ProtocolFactory<JsonCursorHttpProtocol, HttpTransport> {
-
-    public static JsonCursorHttpProtocolFactory INSTANCE = new JsonCursorHttpProtocolFactory();
-
-    private JsonCursorHttpProtocolFactory() {
-
-    }
-
-    @Override
-    public JsonCursorHttpProtocol getProtocol(ConnectionConfig connectionConfig, HttpTransport transport) {
-        return new JsonCursorHttpProtocol(transport);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonCursorQueryRequest.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonCursorQueryRequest.java
deleted file mode 100644
index 329e176231..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonCursorQueryRequest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.Parameter;
-import org.opensearch.jdbc.protocol.QueryRequest;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-/**
- * Definition of json cursor request
- *
- *  @author abbas hussain
- *  @since 07.05.20
- **/
-public class JsonCursorQueryRequest implements QueryRequest  {
-
-    private final String cursor;
-
-    public JsonCursorQueryRequest(QueryRequest queryRequest) {
-        this.cursor = queryRequest.getQuery();
-    }
-
-    @JsonProperty("cursor")
-    @Override
-    public String getQuery() {
-        return cursor;
-    }
-
-    @JsonIgnore
-    @Override
-    public List<? extends Parameter> getParameters() {
-        return null;
-    }
-
-    @JsonIgnore
-    @Override
-    public int getFetchSize() {
-        return 0;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonHttpProtocol.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonHttpProtocol.java
deleted file mode 100644
index 4dd46bded6..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonHttpProtocol.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.ClusterMetadata;
-import org.opensearch.jdbc.protocol.ConnectionResponse;
-import org.opensearch.jdbc.protocol.Protocol;
-import org.opensearch.jdbc.protocol.QueryRequest;
-import org.opensearch.jdbc.protocol.QueryResponse;
-import org.opensearch.jdbc.transport.http.HttpParam;
-import org.opensearch.jdbc.transport.http.HttpTransport;
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.http.Header;
-import org.apache.http.HttpHeaders;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.message.BasicHeader;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-public class JsonHttpProtocol implements Protocol {
-
-    // the value is based on the API endpoint the sql plugin sets up,
-    // but this could be made configurable if required
-    public static final String DEFAULT_SQL_CONTEXT_PATH = "/_plugins/_sql";
-
-    private static final Header acceptJson = new BasicHeader(HttpHeaders.ACCEPT, "application/json");
-    private static final Header contentTypeJson = new BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json");
-    private static final HttpParam requestJdbcFormatParam = new HttpParam("format", "jdbc");
-    protected static final Header[] defaultJsonHeaders = new Header[]{acceptJson, contentTypeJson};
-    private static final Header[] defaultEmptyRequestBodyJsonHeaders = new Header[]{acceptJson};
-    protected static final HttpParam[] defaultJdbcParams = new HttpParam[]{requestJdbcFormatParam};
-
-    protected static final ObjectMapper mapper = new ObjectMapper();
-    private String sqlContextPath;
-    private HttpTransport transport;
-    private JsonHttpResponseHandler jsonHttpResponseHandler;
-
-    public JsonHttpProtocol(HttpTransport transport) {
-        this(transport, DEFAULT_SQL_CONTEXT_PATH);
-    }
-
-    public JsonHttpProtocol(HttpTransport transport, String sqlContextPath) {
-        this.transport = transport;
-        this.sqlContextPath = sqlContextPath;
-        this.jsonHttpResponseHandler = new JsonHttpResponseHandler(this);
-    }
-
-    public String getSqlContextPath() {
-        return sqlContextPath;
-    }
-
-    public HttpTransport getTransport() {
-        return this.transport;
-    }
-
-    public JsonHttpResponseHandler getJsonHttpResponseHandler() {
-        return this.jsonHttpResponseHandler;
-    }
-
-    @Override
-    public ConnectionResponse connect(int timeout) throws ResponseException, IOException {
-        try (CloseableHttpResponse response = transport.doGet(
-                "/",
-                defaultEmptyRequestBodyJsonHeaders,
-                null, timeout)) {
-
-            return jsonHttpResponseHandler.handleResponse(response, this::processConnectionResponse);
-
-        }
-    }
-
-    @Override
-    public QueryResponse execute(QueryRequest request) throws ResponseException, IOException {
-        try (CloseableHttpResponse response = transport.doPost(
-                sqlContextPath,
-                defaultJsonHeaders,
-                defaultJdbcParams,
-                buildQueryRequestBody(request), 0)) {
-
-            return jsonHttpResponseHandler.handleResponse(response, this::processQueryResponse);
-
-        }
-    }
-
-    private String buildQueryRequestBody(QueryRequest queryRequest) throws IOException {
-        JsonQueryRequest jsonQueryRequest = new JsonQueryRequest(queryRequest);
-        String requestBody = mapper.writeValueAsString(jsonQueryRequest);
-        return requestBody;
-    }
-
-    @Override
-    public void close() throws IOException {
-        this.transport.close();
-    }
-
-    private JsonConnectionResponse processConnectionResponse(InputStream contentStream) throws IOException {
-        ClusterMetadata clusterMetadata = mapper.readValue(contentStream, JsonClusterMetadata.class);
-        return new JsonConnectionResponse(clusterMetadata);
-    }
-
-    private JsonQueryResponse processQueryResponse(InputStream contentStream) throws IOException {
-        return mapper.readValue(contentStream, JsonQueryResponse.class);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonHttpProtocolFactory.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonHttpProtocolFactory.java
deleted file mode 100644
index 7eb52b7f29..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonHttpProtocolFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.protocol.ProtocolFactory;
-import org.opensearch.jdbc.transport.http.HttpTransport;
-
-
-public class JsonHttpProtocolFactory implements ProtocolFactory<JsonHttpProtocol, HttpTransport> {
-
-    public static JsonHttpProtocolFactory INSTANCE = new JsonHttpProtocolFactory();
-
-    private JsonHttpProtocolFactory() {
-
-    }
-
-    @Override
-    public JsonHttpProtocol getProtocol(ConnectionConfig connectionConfig, HttpTransport transport) {
-        return new JsonHttpProtocol(transport);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonHttpResponseHandler.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonHttpResponseHandler.java
deleted file mode 100644
index 94a55752ac..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonHttpResponseHandler.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.exceptions.MalformedResponseException;
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.util.EntityUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-public class JsonHttpResponseHandler {
-
-    protected JsonHttpProtocol protocol;
-
-    public static final Set<Integer> DEFAULT_ACCEPTABLE_HTTP_CODES =
-            Collections.unmodifiableSet(new HashSet<>(Arrays.asList(HttpStatus.SC_OK)));
-
-    public JsonHttpResponseHandler(JsonHttpProtocol protocol) {
-        this.protocol = protocol;
-    }
-
-    public <R> R handleResponse(HttpResponse response, JsonContentParser<InputStream, R> contentParser) throws ResponseException {
-        return handleResponse(response, null, true, contentParser);
-    }
-
-    public <R> R handleResponse(HttpResponse response, Set<Integer> acceptableHttpStatusCodes,
-                                boolean expectResponseBody, JsonContentParser<InputStream, R> contentParser) throws ResponseException {
-
-        try {
-            checkResponseForErrors(response, acceptableHttpStatusCodes, expectResponseBody);
-
-            try (InputStream responseContent = response.getEntity().getContent()) {
-                return contentParser.apply(responseContent);
-            }
-
-        } catch (JsonProcessingException jpe) {
-            throw new MalformedResponseException("Could not process server response", jpe);
-        } catch (IOException ioe) {
-            throw new ResponseException("Error reading server response", ioe);
-        }
-    }
-
-    /**
-     * Checks if an HttpResponse meets the requirements to be accepted.
-     *
-     * @param response HttpResponse to check
-     *
-     * @throws ResponseException if the HttpResponse fails any of the checks
-     * @throws IOException if there is an I/O exception when reading the
-     *         HttpResponse
-     */
-    protected void checkResponseForErrors(HttpResponse response, Set<Integer> acceptableHttpStatusCodes,
-                                          boolean expectResponseBodyContent) throws ResponseException, IOException {
-        int statusCode = response.getStatusLine().getStatusCode();
-
-        if (!isHttpStatusCodeAcceptable(statusCode, acceptableHttpStatusCodes)) {
-
-            String responseBody = extractResponseBody(response);
-
-            HttpException httpException = new HttpException(statusCode,
-                    response.getStatusLine().getReasonPhrase(), null, responseBody);
-
-            if (statusCode == HttpStatus.SC_METHOD_NOT_ALLOWED) {
-                throw new ResponseException("Could not submit SQL request to the target server. " +
-                        "Make sure the SQL plugin is installed on the server and responding on the " +
-                        "\"/" + protocol.getSqlContextPath() + "\" context path.", httpException);
-            } else {
-                throw httpException;
-            }
-        }
-
-        if (expectResponseBodyContent &&
-                (response.getEntity() == null || response.getEntity().getContent() == null)) {
-            throw new MalformedResponseException("Empty response.");
-        }
-    }
-
-
-    /**
-     * Reads and returns the entire response body content present in an
-     * HttpResponse as a String.
-     * <p>
-     * This is meant to be used only in cases where a request to the
-     * server has failed. In such cases we check the response
-     * body contains any text or json content which could potentially
-     * be helpful for a user to understand why the request failed.
-     * <p>
-     * We expect such content to only contain error messages of a limited
-     * size, so it's ok to read in the entire response body as a String.
-     *
-     * @param response HttpResponse to extract the response body from
-     *
-     * @return the response body as a String or null if no response body
-     *         is present
-     */
-    protected String extractResponseBody(HttpResponse response) {
-        // TODO - limit the amount read from response.getEntity() ?
-        String responseBody = null;
-        try {
-            if (response.getEntity() != null && response.getEntity().getContent() != null &&
-                    response.getEntity().getContentType() != null &&
-                    response.getEntity().getContentType().getValue() != null &&
-                    (response.getEntity().getContentType().getValue().contains("application/json") ||
-                            response.getEntity().getContentType().getValue().contains("text/plain"))) {
-                responseBody = EntityUtils.toString(response.getEntity());
-            }
-
-        } catch (IOException ioe) {
-            // ignore
-        }
-        return responseBody;
-    }
-
-    /**
-     * HTTP Status codes that indicate success for this response
-     * handler
-     *
-     * @return Set of HTTP Status codes that indicate successful requests.
-     */
-    protected Set<Integer> getAcceptableHttpStatusCodes() {
-        return DEFAULT_ACCEPTABLE_HTTP_CODES;
-    }
-
-    private boolean isHttpStatusCodeAcceptable(int statusCode, Set<Integer> acceptableHttpStatusCodes) {
-
-        if (acceptableHttpStatusCodes == null)
-            acceptableHttpStatusCodes = DEFAULT_ACCEPTABLE_HTTP_CODES;
-
-        return acceptableHttpStatusCodes.contains(statusCode);
-    }
-
-    @FunctionalInterface
-    public interface JsonContentParser<T, R> {
-        R apply(T t) throws IOException;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonOpenSearchVersion.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonOpenSearchVersion.java
deleted file mode 100644
index e6487045a9..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonOpenSearchVersion.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.OpenSearchVersion;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class JsonOpenSearchVersion implements OpenSearchVersion {
-
-    private String fullVersion;
-    private int[] version = new int[3];
-
-    public JsonOpenSearchVersion(@JsonProperty("number") String fullVersion) {
-        if (fullVersion == null)
-            return;
-
-        this.fullVersion = fullVersion;
-        String[] versionTokens = fullVersion.split("[.-]");
-
-        for (int i=0; i<versionTokens.length && i < 3; i++) {
-            this.version[i] = parseNumber(versionTokens[i]);
-        }
-    }
-
-    private int parseNumber(String str) {
-        int number = 0;
-        try {
-            number = Integer.parseInt(str);
-        } catch (NumberFormatException nfe) {
-            // eat
-        }
-        return number;
-    }
-
-    @Override
-    public int getMajor() {
-        return version[0];
-    }
-
-    @Override
-    public int getMinor() {
-        return version[1];
-    }
-
-    @Override
-    public int getRevision() {
-        return version[2];
-    }
-
-    @Override
-    public String getFullVersion() {
-        return fullVersion;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonQueryRequest.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonQueryRequest.java
deleted file mode 100644
index db5793cd3d..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonQueryRequest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.Parameter;
-import org.opensearch.jdbc.protocol.QueryRequest;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-public class JsonQueryRequest implements QueryRequest {
-
-    private String query;
-    private int fetchSize;
-    private List<? extends Parameter> parameters;
-
-    public JsonQueryRequest(QueryRequest queryRequest) {
-        this.query = queryRequest.getQuery();
-        this.parameters = queryRequest.getParameters();
-        this.fetchSize = queryRequest.getFetchSize();
-
-    }
-
-    @Override
-    public String getQuery() {
-        return query;
-    }
-
-    @JsonInclude(Include.NON_NULL)
-    @Override
-    public List<? extends Parameter> getParameters() {
-        return parameters;
-    }
-
-    @JsonProperty("fetch_size")
-    @Override
-    public int getFetchSize() {
-        return fetchSize;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonQueryResponse.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonQueryResponse.java
deleted file mode 100644
index ed55850961..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/protocol/http/JsonQueryResponse.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.ColumnDescriptor;
-import org.opensearch.jdbc.protocol.QueryResponse;
-import org.opensearch.jdbc.protocol.RequestError;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * {@link QueryResponse} implementation for the JSON protocol
- */
-public class JsonQueryResponse implements QueryResponse {
-
-    private List<SchemaEntry> schema;
-
-    private List<List<Object>> datarows;
-
-    private int size;
-
-    private int total;
-
-    private int status;
-
-    private String cursor;
-
-    private JsonRequestError error;
-
-    @Override
-    public List<SchemaEntry> getColumnDescriptors() {
-        return schema;
-    }
-
-    @Override
-    public List<List<Object>> getDatarows() {
-        return datarows;
-    }
-
-    public void setSchema(List<SchemaEntry> schema) {
-        this.schema = schema;
-    }
-
-    public void setDatarows(List<List<Object>> datarows) {
-        this.datarows = datarows;
-    }
-
-    public void setSize(int size) {
-        this.size = size;
-    }
-
-    public void setTotal(int total) {
-        this.total = total;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public void setCursor(String cursor) {
-        this.cursor = cursor;
-    }
-
-    public void setError(JsonRequestError error) {
-        this.error = error;
-    }
-
-    @Override
-    public long getTotal() {
-        return total;
-    }
-
-    @Override
-    public long getSize() {
-        return size;
-    }
-
-    @Override
-    public int getStatus() {
-        return status;
-    }
-
-    @Override
-    public String getCursor() {
-        return cursor;
-    }
-
-    @Override
-    public RequestError getError() {
-        return error;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof JsonQueryResponse)) return false;
-        JsonQueryResponse response = (JsonQueryResponse) o;
-        return getSize() == response.getSize() &&
-                getTotal() == response.getTotal() &&
-                getStatus() == response.getStatus() &&
-                getCursor() == response.getCursor() &&
-                Objects.equals(schema, response.schema) &&
-                Objects.equals(getDatarows(), response.getDatarows()) &&
-                Objects.equals(getError(), response.getError());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(schema, getDatarows(), getSize(), getTotal(), getStatus(), getCursor(), getError());
-    }
-
-    @Override
-    public String toString() {
-        return "JsonQueryResponse{" +
-                "schema=" + schema +
-                "cursor=" + cursor +
-                ", datarows=" + datarows +
-                ", size=" + size +
-                ", total=" + total +
-                ", status=" + status +
-                ", error=" + error +
-                '}';
-    }
-
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class SchemaEntry implements ColumnDescriptor {
-        private String name;
-        private String type;
-        private String label;
-
-        @JsonCreator
-        public SchemaEntry(@JsonProperty("name") String name, @JsonProperty("type") String type,
-                           @JsonProperty("alias") String label) {
-            this.name = name;
-            this.type = type;
-            this.label = label;
-        }
-
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public String getType() {
-            return type;
-        }
-
-        @Override
-        public String getLabel() {
-            return label;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof SchemaEntry)) return false;
-            SchemaEntry that = (SchemaEntry) o;
-            return Objects.equals(getName(), that.getName()) &&
-                    Objects.equals(getType(), that.getType()) &&
-                    Objects.equals(getLabel(), that.getLabel());
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(getName(), getType(), getLabel());
-        }
-
-        @Override
-        public String toString() {
-            return "SchemaEntry{" +
-                    "name='" + name + '\'' +
-                    ", type='" + type + '\'' +
-                    ", label='" + label + '\'' +
-                    '}';
-        }
-    }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class JsonRequestError implements RequestError {
-
-        private String reason;
-        private String details;
-        private String type;
-
-        public void setReason(String reason) {
-            this.reason = reason;
-        }
-
-        public void setDetails(String details) {
-            this.details = details;
-        }
-
-        public void setType(String type) {
-            this.type = type;
-        }
-
-        @Override
-        public String getReason() {
-            return reason;
-        }
-
-        @Override
-        public String getDetails() {
-            return details;
-        }
-
-        @Override
-        public String getType() {
-            return type;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof JsonRequestError)) return false;
-            JsonRequestError that = (JsonRequestError) o;
-            return Objects.equals(getReason(), that.getReason()) &&
-                    Objects.equals(getDetails(), that.getDetails()) &&
-                    Objects.equals(getType(), that.getType());
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(getReason(), getDetails(), getType());
-        }
-
-        @Override
-        public String toString() {
-            return "JsonRequestError{" +
-                    "reason='" + reason + '\'' +
-                    ", details='" + Objects.hashCode(details) + '\'' +
-                    ", type='" + type + '\'' +
-                    '}';
-        }
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/Transport.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/Transport.java
deleted file mode 100644
index afd619daa8..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/Transport.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.transport;
-
-public interface Transport {
-
-    void close() throws TransportException;
-
-    void setReadTimeout(int timeout);
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/TransportException.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/TransportException.java
deleted file mode 100644
index 3605ef3e6d..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/TransportException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.transport;
-
-import java.io.IOException;
-
-
-public class TransportException extends IOException {
-
-    public TransportException() {
-        super();
-    }
-
-    public TransportException(String message) {
-        super(message);
-    }
-
-    public TransportException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public TransportException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/TransportFactory.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/TransportFactory.java
deleted file mode 100644
index 2a758faeeb..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/TransportFactory.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.transport;
-
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.logging.Logger;
-
-public interface TransportFactory<T extends Transport> {
-
-    T getTransport(ConnectionConfig config, Logger log, String userAgent) throws TransportException;
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/ApacheHttpClientConnectionFactory.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/ApacheHttpClientConnectionFactory.java
deleted file mode 100644
index 62f0dd1799..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/ApacheHttpClientConnectionFactory.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.opensearch.jdbc.transport.http;
-
-import org.apache.commons.logging.Log;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.annotation.Contract;
-import org.apache.http.annotation.ThreadingBehavior;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.conn.HttpConnectionFactory;
-import org.apache.http.conn.ManagedHttpClientConnection;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.impl.conn.DefaultHttpResponseParserFactory;
-import org.apache.http.impl.entity.LaxContentLengthStrategy;
-import org.apache.http.impl.entity.StrictContentLengthStrategy;
-import org.apache.http.impl.io.DefaultHttpRequestWriterFactory;
-import org.apache.http.io.HttpMessageParserFactory;
-import org.apache.http.io.HttpMessageWriterFactory;
-
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CodingErrorAction;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * Adapted from Apache HttpClient to serve as a Factory for
- * {@link ManagedHttpClientConnection} instances that offer per
- * connection HTTP wire logging.
- *
- */
-@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class ApacheHttpClientConnectionFactory
-        implements HttpConnectionFactory<HttpRoute, ManagedHttpClientConnection> {
-
-    private static final AtomicLong COUNTER = new AtomicLong();
-
-    private Log log;
-
-    private final HttpMessageWriterFactory<HttpRequest> requestWriterFactory;
-    private final HttpMessageParserFactory<HttpResponse> responseParserFactory;
-    private final ContentLengthStrategy incomingContentStrategy;
-    private final ContentLengthStrategy outgoingContentStrategy;
-
-    /**
-     * @since 4.4
-     */
-    public ApacheHttpClientConnectionFactory(
-            final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
-            final HttpMessageParserFactory<HttpResponse> responseParserFactory,
-            final ContentLengthStrategy incomingContentStrategy,
-            final ContentLengthStrategy outgoingContentStrategy) {
-        super();
-        this.requestWriterFactory = requestWriterFactory != null ? requestWriterFactory :
-                DefaultHttpRequestWriterFactory.INSTANCE;
-        this.responseParserFactory = responseParserFactory != null ? responseParserFactory :
-                DefaultHttpResponseParserFactory.INSTANCE;
-        this.incomingContentStrategy = incomingContentStrategy != null ? incomingContentStrategy :
-                LaxContentLengthStrategy.INSTANCE;
-        this.outgoingContentStrategy = outgoingContentStrategy != null ? outgoingContentStrategy :
-                StrictContentLengthStrategy.INSTANCE;
-    }
-
-    public ApacheHttpClientConnectionFactory(
-            final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
-            final HttpMessageParserFactory<HttpResponse> responseParserFactory) {
-        this(requestWriterFactory, responseParserFactory, null, null);
-    }
-
-    public ApacheHttpClientConnectionFactory(
-            final HttpMessageParserFactory<HttpResponse> responseParserFactory) {
-        this(null, responseParserFactory);
-    }
-
-    public ApacheHttpClientConnectionFactory() {
-        this(null, null);
-    }
-
-    public ApacheHttpClientConnectionFactory(Log log) {
-        this(null, null);
-        this.log = log;
-    }
-
-    @Override
-    public ManagedHttpClientConnection create(final HttpRoute route, final ConnectionConfig config) {
-        final ConnectionConfig cconfig = config != null ? config : ConnectionConfig.DEFAULT;
-        CharsetDecoder chardecoder = null;
-        CharsetEncoder charencoder = null;
-        final Charset charset = cconfig.getCharset();
-        final CodingErrorAction malformedInputAction = cconfig.getMalformedInputAction() != null ?
-                cconfig.getMalformedInputAction() : CodingErrorAction.REPORT;
-        final CodingErrorAction unmappableInputAction = cconfig.getUnmappableInputAction() != null ?
-                cconfig.getUnmappableInputAction() : CodingErrorAction.REPORT;
-        if (charset != null) {
-            chardecoder = charset.newDecoder();
-            chardecoder.onMalformedInput(malformedInputAction);
-            chardecoder.onUnmappableCharacter(unmappableInputAction);
-            charencoder = charset.newEncoder();
-            charencoder.onMalformedInput(malformedInputAction);
-            charencoder.onUnmappableCharacter(unmappableInputAction);
-        }
-        final String id = "http-outgoing-" + Long.toString(COUNTER.getAndIncrement());
-        return new LoggingManagedHttpClientConnection(
-                id,
-                log,
-                cconfig.getBufferSize(),
-                cconfig.getFragmentSizeHint(),
-                chardecoder,
-                charencoder,
-                cconfig.getMessageConstraints(),
-                incomingContentStrategy,
-                outgoingContentStrategy,
-                requestWriterFactory,
-                responseParserFactory);
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/ApacheHttpTransport.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/ApacheHttpTransport.java
deleted file mode 100644
index 99d1a26d6f..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/ApacheHttpTransport.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.transport.http;
-
-import org.opensearch.jdbc.auth.AuthenticationType;
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.logging.Logger;
-import org.opensearch.jdbc.logging.LoggingSource;
-import org.opensearch.jdbc.transport.TransportException;
-import org.opensearch.jdbc.transport.http.auth.aws.AWSRequestSigningApacheInterceptor;
-import com.amazonaws.auth.AWS4Signer;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
-import org.apache.http.Header;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.config.SocketConfig;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-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.impl.conn.BasicHttpClientConnectionManager;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.apache.http.ssl.SSLContexts;
-import org.apache.http.ssl.TrustStrategy;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-
-public class ApacheHttpTransport implements HttpTransport, LoggingSource {
-    String scheme;
-    String host;
-    int port;
-    String path;
-    int readTimeout;
-
-    private RequestConfig requestConfig;
-    private CloseableHttpClient httpClient;
-
-    public ApacheHttpTransport(ConnectionConfig connectionConfig, Logger log, String userAgent) throws TransportException {
-        this.host = connectionConfig.getHost();
-        this.port = connectionConfig.getPort();
-        this.scheme = connectionConfig.isUseSSL() ? "https" : "http";
-        this.path = connectionConfig.getPath();
-
-        updateRequestConfig();
-
-        ConnectionSocketFactory sslConnectionSocketFactory = null;
-
-        try {
-            sslConnectionSocketFactory = getSslConnectionSocketFactory(connectionConfig);
-        } catch (Exception e) {
-            throw new TransportException("Exception building SSL/TLS socket factory " + e, e);
-        }
-
-        Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create()
-                .register("http", PlainConnectionSocketFactory.getSocketFactory())
-                .register("https", sslConnectionSocketFactory)
-                .build();
-
-        ApacheHttpClientConnectionFactory connectionFactory =
-                new ApacheHttpClientConnectionFactory(new JclLoggerAdapter(log, getSource()));
-
-        HttpClientBuilder httpClientBuilder = HttpClients.custom()
-                .setConnectionManager(
-                        new BasicHttpClientConnectionManager(socketFactoryRegistry, connectionFactory))
-                .setDefaultSocketConfig(buildDefaultSocketConfig())
-                .setDefaultRequestConfig(getRequestConfig())
-                .setUserAgent(userAgent);
-
-        // request compression
-        if (!connectionConfig.requestCompression())
-            httpClientBuilder.disableContentCompression();
-
-        // setup authentication
-        if (connectionConfig.getAuthenticationType() == AuthenticationType.BASIC) {
-            CredentialsProvider basicCredsProvider = new BasicCredentialsProvider();
-            basicCredsProvider.setCredentials(
-                    AuthScope.ANY,
-                    new UsernamePasswordCredentials(connectionConfig.getUser(), connectionConfig.getPassword()));
-            httpClientBuilder.setDefaultCredentialsProvider(basicCredsProvider);
-
-        } else if (connectionConfig.getAuthenticationType() == AuthenticationType.AWS_SIGV4) {
-            AWS4Signer signer = new AWS4Signer();
-            signer.setServiceName("es");
-            signer.setRegionName(connectionConfig.getRegion());
-
-            AWSCredentialsProvider provider = connectionConfig.getAwsCredentialsProvider() != null ?
-                    connectionConfig.getAwsCredentialsProvider() : new DefaultAWSCredentialsProviderChain();
-            httpClientBuilder.addInterceptorLast(
-                    new AWSRequestSigningApacheInterceptor(
-                            "es",
-                            signer,
-                            provider));
-        }
-
-        // TODO - can apply settings retry & backoff
-        this.httpClient = httpClientBuilder.build();
-    }
-
-    @Override
-    public CloseableHttpResponse doGet(String path, Header[] headers, HttpParam[] params, int timeout) throws TransportException {
-        return doGet(buildRequestURI(path, params), headers, timeout);
-    }
-
-    @Override
-    public CloseableHttpResponse doPost(String path, Header[] headers, HttpParam[] params, String body, int timeout) throws TransportException {
-        return doPost(buildRequestURI(path, params), headers, body, timeout);
-    }
-
-    @Override
-    public void close() throws TransportException {
-        try {
-            this.httpClient.close();
-        } catch (IOException e) {
-            throw new TransportException(e);
-        }
-    }
-
-    private ConnectionSocketFactory getSslConnectionSocketFactory(ConnectionConfig connectionConfig)
-            throws CertificateException, NoSuchAlgorithmException, KeyStoreException, IOException,
-            UnrecoverableKeyException, KeyManagementException {
-
-        TrustStrategy trustStrategy = connectionConfig.trustSelfSigned() ? new TrustSelfSignedStrategy() : null;
-
-        SSLContextBuilder builder = SSLContexts.custom();
-
-        if (connectionConfig.getKeyStoreLocation() != null || connectionConfig.getTrustStoreLocation() != null) {
-            // trust material
-            if (connectionConfig.getTrustStoreLocation() != null) {
-                String trustStorePassword = connectionConfig.getTrustStorePassword();
-                char[] password = trustStorePassword == null ? "".toCharArray() : trustStorePassword.toCharArray();
-
-                builder.loadTrustMaterial(
-                        new File(connectionConfig.getTrustStoreLocation()),
-                        password, trustStrategy);
-            }
-
-            // key material
-            if (connectionConfig.getKeyStoreLocation() != null) {
-                String keyStorePassword = connectionConfig.getKeyStorePassword();
-                char[] password = keyStorePassword == null ? "".toCharArray() : keyStorePassword.toCharArray();
-
-                // TODO - can add alias selection strategy
-                // TODO - can add support for a separate property for key password
-                builder.loadKeyMaterial(new File(connectionConfig.getKeyStoreLocation()), password, password).build();
-            }
-
-        } else {
-
-            builder.loadTrustMaterial(null, trustStrategy);
-        }
-
-        HostnameVerifier hostnameVerifier = connectionConfig.hostnameVerification() ?
-                SSLConnectionSocketFactory.getDefaultHostnameVerifier() : new NoopHostnameVerifier();
-
-        SSLContext sslContext = builder.build();
-        return new SSLConnectionSocketFactory(sslContext, hostnameVerifier);
-    }
-
-    private SocketConfig buildDefaultSocketConfig() {
-        return SocketConfig.custom()
-                .setSoKeepAlive(true)
-                .setSoTimeout(this.readTimeout)
-                .build();
-    }
-
-    private void updateRequestConfig() {
-        this.requestConfig = RequestConfig.custom()
-                .setSocketTimeout(this.readTimeout)
-                .build();
-    }
-
-    private RequestConfig getRequestConfig() {
-        return this.requestConfig;
-    }
-
-    public void setReadTimeout(int readTimeout) {
-        if (readTimeout != this.readTimeout) {
-            this.readTimeout = readTimeout;
-            updateRequestConfig();
-        }
-    }
-
-    private URIBuilder getUriBuilder(String path) {
-        return new URIBuilder()
-                .setScheme(this.scheme)
-                .setHost(this.host)
-                .setPort(this.port)
-                .setPath(this.path + path);
-    }
-
-
-    private URI buildRequestURI(String path, HttpParam... params) throws TransportException {
-        try {
-            URIBuilder uriBuilder = getUriBuilder(path);
-
-            if (params != null) {
-                for (HttpParam param : params)
-                    uriBuilder.setParameter(param.getName(), param.getValue());
-            }
-            return uriBuilder.build();
-        } catch (URISyntaxException e) {
-            throw new TransportException(e);
-        }
-    }
-
-    private CloseableHttpResponse doGet(URI uri, Header[] headers, int readTimeout) throws TransportException {
-        try {
-            setReadTimeout(readTimeout);
-            HttpGet request = new HttpGet(uri);
-            request.setHeaders(headers);
-            request.setConfig(getRequestConfig());
-            return httpClient.execute(request);
-        } catch (IOException e) {
-            throw new TransportException(e);
-        }
-    }
-
-    private CloseableHttpResponse doPost(URI uri, Header[] headers, String body, int readTimeout) throws TransportException {
-        try {
-            setReadTimeout(readTimeout);
-            HttpPost request = new HttpPost(uri);
-            request.setHeaders(headers);
-            request.setEntity(new StringEntity(body, ContentType.APPLICATION_JSON));
-            request.setConfig(getRequestConfig());
-            return httpClient.execute(request);
-        } catch (IOException e) {
-            throw new TransportException(e);
-        }
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/ApacheHttpTransportFactory.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/ApacheHttpTransportFactory.java
deleted file mode 100644
index a2ed4c1bd5..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/ApacheHttpTransportFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.transport.http;
-
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.logging.Logger;
-import org.opensearch.jdbc.transport.TransportException;
-import org.opensearch.jdbc.transport.TransportFactory;
-
-public class ApacheHttpTransportFactory implements TransportFactory<ApacheHttpTransport> {
-
-    public static ApacheHttpTransportFactory INSTANCE = new ApacheHttpTransportFactory();
-
-    private ApacheHttpTransportFactory() {
-
-    }
-
-    @Override
-    public ApacheHttpTransport getTransport(ConnectionConfig config, Logger log, String userAgent) throws TransportException {
-        return new ApacheHttpTransport(config, log, userAgent);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/HttpParam.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/HttpParam.java
deleted file mode 100644
index 9b6fd98e67..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/HttpParam.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.transport.http;
-
-public class HttpParam {
-
-    private String name;
-
-    private String value;
-
-    public HttpParam(String name, String value) {
-        this.name = name;
-        this.value = value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getValue() {
-        return value;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/HttpTransport.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/HttpTransport.java
deleted file mode 100644
index 7639e29eb9..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/HttpTransport.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.transport.http;
-
-import org.opensearch.jdbc.transport.Transport;
-import org.opensearch.jdbc.transport.TransportException;
-import org.apache.http.Header;
-import org.apache.http.client.methods.CloseableHttpResponse;
-
-public interface HttpTransport extends Transport {
-
-    CloseableHttpResponse doGet(String path, Header[] headers, HttpParam[] params, int timeout)
-            throws TransportException;
-
-    CloseableHttpResponse doPost(String path, Header[] headers, HttpParam[] params, String body, int timeout)
-            throws TransportException;
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/JclLoggerAdapter.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/JclLoggerAdapter.java
deleted file mode 100644
index 4123c95af3..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/JclLoggerAdapter.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.transport.http;
-
-import org.opensearch.jdbc.logging.Logger;
-import org.opensearch.jdbc.logging.LoggingSource;
-import org.apache.commons.logging.Log;
-
-public class JclLoggerAdapter implements Log, LoggingSource {
-    private final Logger logger;
-    private String source;
-
-    public JclLoggerAdapter(Logger logger, String source) {
-        this.logger = logger;
-        this.source = source;
-    }
-
-    @Override
-    public void debug(Object message) {
-        logger.debug(() -> logMessage(String.valueOf(message)));
-    }
-
-    @Override
-    public void debug(Object message, Throwable t) {
-        logger.debug(String.valueOf(message), t);
-    }
-
-    @Override
-    public void error(Object message) {
-        logger.error(String.valueOf(message));
-    }
-
-    @Override
-    public void error(Object message, Throwable t) {
-        logger.error(String.valueOf(message), t);
-    }
-
-    @Override
-    public void fatal(Object message) {
-        logger.fatal(String.valueOf(message));
-    }
-
-    @Override
-    public void fatal(Object message, Throwable t) {
-        logger.fatal(String.valueOf(message), t);
-    }
-
-    @Override
-    public void info(Object message) {
-        logger.info(String.valueOf(message));
-    }
-
-    @Override
-    public void info(Object message, Throwable t) {
-        logger.info(String.valueOf(message), t);
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        return logger.isDebugEnabled();
-    }
-
-    @Override
-    public boolean isErrorEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isFatalEnabled() {
-        return logger.isFatalEnabled();
-    }
-
-    @Override
-    public boolean isInfoEnabled() {
-        return logger.isInfoEnabled();
-    }
-
-    @Override
-    public boolean isTraceEnabled() {
-        return logger.isTraceEnabled();
-    }
-
-    @Override
-    public boolean isWarnEnabled() {
-        return logger.isWarnEnabled();
-    }
-
-    @Override
-    public void trace(Object message) {
-        logger.trace(() -> logMessage(String.valueOf(message)));
-    }
-
-    @Override
-    public void trace(Object message, Throwable t) {
-        logger.trace(String.valueOf(message), t);
-    }
-
-    @Override
-    public void warn(Object message) {
-        logger.warn(String.valueOf(message));
-    }
-
-    @Override
-    public void warn(Object message, Throwable t) {
-        logger.warn(String.valueOf(message), t);
-    }
-
-    @Override
-    public String getSource() {
-        return source;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/LoggingInputStream.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/LoggingInputStream.java
deleted file mode 100644
index 337675d4f5..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/LoggingInputStream.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-package org.opensearch.jdbc.transport.http;
-
-import org.apache.http.impl.conn.Wire;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Adapted from Apache HttpClient to offer per connection HTTP wire
- * logging.
- */
-class LoggingInputStream extends InputStream {
-
-    private final InputStream in;
-    private final Wire wire;
-
-    public LoggingInputStream(final InputStream in, final Wire wire) {
-        super();
-        this.in = in;
-        this.wire = wire;
-    }
-
-    @Override
-    public int read() throws IOException {
-        try {
-            final int b = in.read();
-            if (b == -1) {
-                wire.input("end of stream");
-            } else {
-                wire.input(b);
-            }
-            return b;
-        } catch (final IOException ex) {
-            wire.input("[read] I/O error: " + ex.getMessage());
-            throw ex;
-        }
-    }
-
-    @Override
-    public int read(final byte[] b) throws IOException {
-        try {
-            final int bytesRead = in.read(b);
-            if (bytesRead == -1) {
-                wire.input("end of stream");
-            } else if (bytesRead > 0) {
-                wire.input(b, 0, bytesRead);
-            }
-            return bytesRead;
-        } catch (final IOException ex) {
-            wire.input("[read] I/O error: " + ex.getMessage());
-            throw ex;
-        }
-    }
-
-    @Override
-    public int read(final byte[] b, final int off, final int len) throws IOException {
-        try {
-            final int bytesRead = in.read(b, off, len);
-            if (bytesRead == -1) {
-                wire.input("end of stream");
-            } else if (bytesRead > 0) {
-                wire.input(b, off, bytesRead);
-            }
-            return bytesRead;
-        } catch (final IOException ex) {
-            wire.input("[read] I/O error: " + ex.getMessage());
-            throw ex;
-        }
-    }
-
-    @Override
-    public long skip(final long n) throws IOException {
-        try {
-            return super.skip(n);
-        } catch (final IOException ex) {
-            wire.input("[skip] I/O error: " + ex.getMessage());
-            throw ex;
-        }
-    }
-
-    @Override
-    public int available() throws IOException {
-        try {
-            return in.available();
-        } catch (final IOException ex) {
-            wire.input("[available] I/O error : " + ex.getMessage());
-            throw ex;
-        }
-    }
-
-    @Override
-    public void mark(final int readlimit) {
-        super.mark(readlimit);
-    }
-
-    @Override
-    public void reset() throws IOException {
-        super.reset();
-    }
-
-    @Override
-    public boolean markSupported() {
-        return false;
-    }
-
-    @Override
-    public void close() throws IOException {
-        try {
-            in.close();
-        } catch (final IOException ex) {
-            wire.input("[close] I/O error: " + ex.getMessage());
-            throw ex;
-        }
-    }
-
-}
-
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/LoggingManagedHttpClientConnection.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/LoggingManagedHttpClientConnection.java
deleted file mode 100644
index c3ef1496ff..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/LoggingManagedHttpClientConnection.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.opensearch.jdbc.transport.http;
-
-import org.apache.commons.logging.Log;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.impl.conn.DefaultManagedHttpClientConnection;
-import org.apache.http.impl.conn.Wire;
-import org.apache.http.io.HttpMessageParserFactory;
-import org.apache.http.io.HttpMessageWriterFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-
-/**
- * Adapted from Apache HttpClient to offer per connection HTTP wire
- * logging.
- */
-public class LoggingManagedHttpClientConnection extends DefaultManagedHttpClientConnection {
-
-        private final Log log;
-        private final Wire wire;
-
-        public LoggingManagedHttpClientConnection(
-                final String id,
-                final Log log,
-                final int buffersize,
-                final int fragmentSizeHint,
-                final CharsetDecoder chardecoder,
-                final CharsetEncoder charencoder,
-                final MessageConstraints constraints,
-                final ContentLengthStrategy incomingContentStrategy,
-                final ContentLengthStrategy outgoingContentStrategy,
-                final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
-                final HttpMessageParserFactory<HttpResponse> responseParserFactory) {
-            super(id, buffersize, fragmentSizeHint, chardecoder, charencoder,
-                    constraints, incomingContentStrategy, outgoingContentStrategy,
-                    requestWriterFactory, responseParserFactory);
-            this.log = log;
-            this.wire = new Wire(log, id);
-        }
-
-        @Override
-        public void close() throws IOException {
-
-            if (super.isOpen()) {
-                if (this.log.isDebugEnabled()) {
-                    this.log.debug(getId() + ": Close connection");
-                }
-                super.close();
-            }
-        }
-
-        @Override
-        public void setSocketTimeout(final int timeout) {
-            if (this.log.isDebugEnabled()) {
-                this.log.debug(getId() + ": set socket timeout to " + timeout);
-            }
-            super.setSocketTimeout(timeout);
-        }
-
-        @Override
-        public void shutdown() throws IOException {
-            if (this.log.isDebugEnabled()) {
-                this.log.debug(getId() + ": Shutdown connection");
-            }
-            super.shutdown();
-        }
-
-        @Override
-        protected InputStream getSocketInputStream(final Socket socket) throws IOException {
-            InputStream in = super.getSocketInputStream(socket);
-            if (this.wire.enabled()) {
-                in = new LoggingInputStream(in, this.wire);
-            }
-            return in;
-        }
-
-        @Override
-        protected OutputStream getSocketOutputStream(final Socket socket) throws IOException {
-            OutputStream out = super.getSocketOutputStream(socket);
-            if (this.wire.enabled()) {
-                out = new LoggingOutputStream(out, this.wire);
-            }
-            return out;
-        }
-
-    }
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/LoggingOutputStream.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/LoggingOutputStream.java
deleted file mode 100644
index b3b70dc9b6..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/LoggingOutputStream.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.opensearch.jdbc.transport.http;
-
-import org.apache.http.impl.conn.Wire;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Adapted from Apache HttpClient to offer per connection HTTP wire
- * logging.
- */
-class LoggingOutputStream extends OutputStream {
-
-    private final OutputStream out;
-    private final Wire wire;
-
-    public LoggingOutputStream(final OutputStream out, final Wire wire) {
-        super();
-        this.out = out;
-        this.wire = wire;
-    }
-
-    @Override
-    public void write(final int b) throws IOException {
-        try {
-            wire.output(b);
-        } catch (final IOException ex) {
-            wire.output("[write] I/O error: " + ex.getMessage());
-            throw ex;
-        }
-    }
-
-    @Override
-    public void write(final byte[] b) throws IOException {
-        try {
-            wire.output(b);
-            out.write(b);
-        } catch (final IOException ex) {
-            wire.output("[write] I/O error: " + ex.getMessage());
-            throw ex;
-        }
-    }
-
-    @Override
-    public void write(final byte[] b, final int off, final int len) throws IOException {
-        try {
-            wire.output(b, off, len);
-            out.write(b, off, len);
-        } catch (final IOException ex) {
-            wire.output("[write] I/O error: " + ex.getMessage());
-            throw ex;
-        }
-    }
-
-    @Override
-    public void flush() throws IOException {
-        try {
-            out.flush();
-        } catch (final IOException ex) {
-            wire.output("[flush] I/O error: " + ex.getMessage());
-            throw ex;
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        try {
-            out.close();
-        } catch (final IOException ex) {
-            wire.output("[close] I/O error: " + ex.getMessage());
-            throw ex;
-        }
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/auth/aws/AWSRequestSigningApacheInterceptor.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/auth/aws/AWSRequestSigningApacheInterceptor.java
deleted file mode 100644
index 49d8856ea6..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/transport/http/auth/aws/AWSRequestSigningApacheInterceptor.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.transport.http.auth.aws;
-
-import com.amazonaws.DefaultRequest;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.Signer;
-import com.amazonaws.http.HttpMethodName;
-import org.apache.http.Header;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.protocol.HttpContext;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import static org.apache.http.protocol.HttpCoreContext.HTTP_TARGET_HOST;
-
-/**
- * An {@link HttpRequestInterceptor} that signs requests using any AWS {@link Signer}
- * and {@link AWSCredentialsProvider}.
- */
-public class AWSRequestSigningApacheInterceptor implements HttpRequestInterceptor {
-    /**
-     * The service that we're connecting to. Technically not necessary.
-     * Could be used by a future Signer, though.
-     */
-    private final String service;
-
-    /**
-     * The particular signer implementation.
-     */
-    private final Signer signer;
-
-    /**
-     * The source of AWS credentials for signing.
-     */
-    private final AWSCredentialsProvider awsCredentialsProvider;
-
-    /**
-     *
-     * @param service service that we're connecting to
-     * @param signer particular signer implementation
-     * @param awsCredentialsProvider source of AWS credentials for signing
-     */
-    public AWSRequestSigningApacheInterceptor(final String service,
-                                              final Signer signer,
-                                              final AWSCredentialsProvider awsCredentialsProvider) {
-        this.service = service;
-        this.signer = signer;
-        this.awsCredentialsProvider = awsCredentialsProvider;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void process(final HttpRequest request, final HttpContext context)
-            throws HttpException, IOException {
-        URIBuilder uriBuilder;
-        try {
-            uriBuilder = new URIBuilder(request.getRequestLine().getUri());
-        } catch (URISyntaxException e) {
-            throw new IOException("Invalid URI" , e);
-        }
-
-        // Copy Apache HttpRequest to AWS DefaultRequest
-        DefaultRequest<?> signableRequest = new DefaultRequest<>(service);
-
-        HttpHost host = (HttpHost) context.getAttribute(HTTP_TARGET_HOST);
-        if (host != null) {
-            signableRequest.setEndpoint(URI.create(host.toURI()));
-        }
-        final HttpMethodName httpMethod =
-                HttpMethodName.fromValue(request.getRequestLine().getMethod());
-        signableRequest.setHttpMethod(httpMethod);
-        try {
-            signableRequest.setResourcePath(uriBuilder.build().getRawPath());
-        } catch (URISyntaxException e) {
-            throw new IOException("Invalid URI" , e);
-        }
-
-        if (request instanceof HttpEntityEnclosingRequest) {
-            HttpEntityEnclosingRequest httpEntityEnclosingRequest =
-                    (HttpEntityEnclosingRequest) request;
-            if (httpEntityEnclosingRequest.getEntity() != null) {
-                signableRequest.setContent(httpEntityEnclosingRequest.getEntity().getContent());
-            }
-        }
-        signableRequest.setParameters(nvpToMapParams(uriBuilder.getQueryParams()));
-        signableRequest.setHeaders(headerArrayToMap(request.getAllHeaders()));
-
-        // Sign it
-        signer.sign(signableRequest, awsCredentialsProvider.getCredentials());
-
-        // Now copy everything back
-        request.setHeaders(mapToHeaderArray(signableRequest.getHeaders()));
-        if (request instanceof HttpEntityEnclosingRequest) {
-            HttpEntityEnclosingRequest httpEntityEnclosingRequest =
-                    (HttpEntityEnclosingRequest) request;
-            if (httpEntityEnclosingRequest.getEntity() != null) {
-                BasicHttpEntity basicHttpEntity = new BasicHttpEntity();
-                basicHttpEntity.setContent(signableRequest.getContent());
-                httpEntityEnclosingRequest.setEntity(basicHttpEntity);
-            }
-        }
-    }
-
-    /**
-     *
-     * @param params list of HTTP query params as NameValuePairs
-     * @return a multimap of HTTP query params
-     */
-    private static Map<String, List<String>> nvpToMapParams(final List<NameValuePair> params) {
-        Map<String, List<String>> parameterMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-        for (NameValuePair nvp : params) {
-            List<String> argsList =
-                    parameterMap.computeIfAbsent(nvp.getName(), k -> new ArrayList<>());
-            argsList.add(nvp.getValue());
-        }
-        return parameterMap;
-    }
-
-    /**
-     * @param headers modeled Header objects
-     * @return a Map of header entries
-     */
-    private static Map<String, String> headerArrayToMap(final Header[] headers) {
-        Map<String, String> headersMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-        for (Header header : headers) {
-            if (!skipHeader(header)) {
-                headersMap.put(header.getName(), header.getValue());
-            }
-        }
-        return headersMap;
-    }
-
-    /**
-     * @param header header line to check
-     * @return true if the given header should be excluded when signing
-     */
-    private static boolean skipHeader(final Header header) {
-        return ("content-length".equalsIgnoreCase(header.getName())
-                && "0".equals(header.getValue())) // Strip Content-Length: 0
-                || "host".equalsIgnoreCase(header.getName()); // Host comes from endpoint
-    }
-
-    /**
-     * @param mapHeaders Map of header entries
-     * @return modeled Header objects
-     */
-    private static Header[] mapToHeaderArray(final Map<String, String> mapHeaders) {
-        Header[] headers = new Header[mapHeaders.size()];
-        int i = 0;
-        for (Map.Entry<String, String> headerEntry : mapHeaders.entrySet()) {
-            headers[i++] = new BasicHeader(headerEntry.getKey(), headerEntry.getValue());
-        }
-        return headers;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/BaseTypeConverter.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/BaseTypeConverter.java
deleted file mode 100644
index bbc114ab58..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/BaseTypeConverter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.Date;
-import java.sql.SQLException;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-public abstract class BaseTypeConverter implements TypeConverter {
-
-    static final Map<Class, TypeHelper> typeHandlerMap = new HashMap<>();
-
-    static {
-        typeHandlerMap.put(String.class, StringType.INSTANCE);
-
-        typeHandlerMap.put(Byte.class, ByteType.INSTANCE);
-        typeHandlerMap.put(Short.class, ShortType.INSTANCE);
-        typeHandlerMap.put(Integer.class, IntegerType.INSTANCE);
-        typeHandlerMap.put(Long.class, LongType.INSTANCE);
-
-        typeHandlerMap.put(Float.class, FloatType.INSTANCE);
-        typeHandlerMap.put(Double.class, DoubleType.INSTANCE);
-
-        typeHandlerMap.put(Boolean.class, BooleanType.INSTANCE);
-
-        typeHandlerMap.put(Timestamp.class, TimestampType.INSTANCE);
-        typeHandlerMap.put(Date.class, DateType.INSTANCE);
-        typeHandlerMap.put(Time.class, TimeType.INSTANCE);
-
-    }
-
-    @Override
-    public <T> T convert(Object value, Class<T> clazz, Map<String, Object> conversionParams) throws SQLException {
-        if (clazz == null) {
-            clazz = getDefaultJavaClass();
-        }
-
-        if (getSupportedJavaClasses() != null && getSupportedJavaClasses().contains(clazz)) {
-            TypeHelper<T> typeHelper = getTypeHelper(clazz);
-
-            if (typeHelper != null) {
-                return typeHelper.fromValue(value, conversionParams);
-            }
-        }
-        throw objectConversionException(value, clazz);
-    }
-
-    private <T> TypeHelper<T> getTypeHelper(Class<T> clazz) {
-        return typeHandlerMap.get(clazz);
-    }
-
-    public abstract Class getDefaultJavaClass();
-
-    public abstract Set<Class> getSupportedJavaClasses();
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/BinaryType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/BinaryType.java
deleted file mode 100644
index c54830a855..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/BinaryType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLException;
-import java.util.Map;
-
-public class BinaryType implements TypeHelper<String> {
-
-  public static final BinaryType INSTANCE = new BinaryType();
-
-  private BinaryType() {
-
-  }
-
-  @Override
-  public String fromValue(Object value, Map<String, Object> conversionParams) throws SQLException {
-    if (value == null)
-      return null;
-    else
-      return String.valueOf(value);
-  }
-
-  @Override
-  public String getTypeName() {
-    return "Binary";
-  }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/BooleanType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/BooleanType.java
deleted file mode 100644
index 591a876a17..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/BooleanType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLException;
-import java.util.Map;
-
-public class BooleanType implements TypeHelper<Boolean> {
-
-    public static final BooleanType INSTANCE = new BooleanType();
-
-    private BooleanType() {
-
-    }
-    
-    @Override
-    public Boolean fromValue(Object value, Map<String, Object> conversionParams) throws SQLException {
-        if (value == null) {
-            return false;
-        }
-
-        if (value instanceof Boolean) {
-            return (Boolean) value;
-        } else if (value instanceof String) {
-            return asBoolean((String) value);
-        } else {
-            throw objectConversionException(value);
-        }
-    }
-
-    private Boolean asBoolean(String value) throws SQLException {
-        try {
-            return Boolean.valueOf(value);
-        } catch (NumberFormatException nfe) {
-            throw stringConversionException(value, nfe);
-        }
-    }
-
-
-    @Override
-    public String getTypeName() {
-        return "Boolean";
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/ByteType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/ByteType.java
deleted file mode 100644
index 5952867170..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/ByteType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLException;
-import java.util.Map;
-
-public class ByteType extends NumberType<Byte> {
-    public static final ByteType INSTANCE = new ByteType();
-
-    private ByteType() {
-
-    }
-
-    public Byte fromValue(Object value, Map<String, Object> conversionParams) throws SQLException {
-        if (value == null) {
-            return (byte) 0;
-        }
-        if (value instanceof Byte) {
-            return (Byte) value;
-        } else if (value instanceof String) {
-            return asByte((String) value);
-        } else if (value instanceof Number) {
-            return asByte((Number) value);
-        } else {
-            throw objectConversionException(value);
-        }
-    }
-
-    private Byte asByte(String value) throws SQLException {
-        try {
-            return asByte(Double.valueOf(value));
-        } catch (NumberFormatException nfe) {
-            throw stringConversionException(value, nfe);
-        }
-    }
-
-    private Byte asByte(Number value) throws SQLException {
-        return (byte) getDoubleValueWithinBounds(value, Byte.MIN_VALUE, Byte.MAX_VALUE);
-    }
-
-    @Override
-    public String getTypeName() {
-        return "Byte";
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/DateType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/DateType.java
deleted file mode 100644
index 75790d6533..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/DateType.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.Date;
-import java.sql.SQLException;
-import java.time.LocalDate;
-import java.time.format.DateTimeParseException;
-import java.util.Calendar;
-import java.util.Map;
-
-/**
- * Supports returning a java.sql.Date from a String (starting with yyyy-mm-dd)
- * or a Number value indicating epoch time in millis.
- */
-public class DateType implements TypeHelper<Date> {
-
-    public static final DateType INSTANCE = new DateType();
-
-    private DateType() {
-
-    }
-
-    @Override
-    public Date fromValue(Object value, Map<String, Object> conversionParams) throws SQLException {
-        if (value == null) {
-            return null;
-        }
-        Calendar calendar = conversionParams != null ? (Calendar) conversionParams.get("calendar") : null;
-        if (value instanceof Date) {
-            return asDate((Date) value, calendar);
-        } else if (value instanceof String) {
-            return asDate((String) value, calendar);
-        } else if (value instanceof Number) {
-            return asDate((Number) value);
-        } else {
-            throw objectConversionException(value);
-        }
-    }
-
-    public java.sql.Date asDate(Date value, Calendar calendar) throws SQLException {
-        if (calendar == null) {
-            return value;
-        } else {
-            return localDatetoSqlDate(value.toLocalDate(), calendar);
-        }
-    }
-
-    public java.sql.Date asDate(String value, Calendar calendar) throws SQLException {
-        try {
-            if (calendar == null) {
-                return java.sql.Date.valueOf(toLocalDate(value));
-            } else {
-                return localDatetoSqlDate(toLocalDate(value), calendar);
-            }
-        } catch (DateTimeParseException dpe) {
-            throw stringConversionException(value, dpe);
-        }
-    }
-
-    private Date localDatetoSqlDate(LocalDate localDate, Calendar calendar) {
-        calendar.set(localDate.getYear(),
-                localDate.getMonthValue() - 1,
-                localDate.getDayOfMonth(), 0, 0, 0);
-        calendar.set(Calendar.MILLISECOND, 0);
-        return new java.sql.Date(calendar.getTimeInMillis());
-    }
-
-    public java.sql.Date asDate(Number value) {
-        return new java.sql.Date(value.longValue());
-    }
-
-    private LocalDate toLocalDate(String value) throws SQLException {
-        if (value == null || value.length() < 10)
-            throw stringConversionException(value, null);
-        return LocalDate.parse(value.substring(0, 10));
-    }
-
-    @Override
-    public String getTypeName() {
-        return "Date";
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/DoubleType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/DoubleType.java
deleted file mode 100644
index 50fa04bb97..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/DoubleType.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLException;
-import java.util.Map;
-
-public class DoubleType implements TypeHelper<Double> {
-
-    public static final DoubleType INSTANCE = new DoubleType();
-
-    private DoubleType() {
-
-    }
-
-    @Override
-    public Double fromValue(Object value, Map<String, Object> conversionParams) throws SQLException {
-        if (value == null) {
-            return (double) 0;
-        }
-        if (value instanceof Double) {
-            return (Double) value;
-        } else if (value instanceof String) {
-            return asDouble((String) value);
-        } else if (value instanceof Number) {
-            return asDouble((Number) value);
-        } else {
-            throw objectConversionException(value);
-        }
-    }
-
-    private Double asDouble(String value) throws SQLException {
-        try {
-            return Double.valueOf(value);
-        } catch (NumberFormatException nfe) {
-            throw stringConversionException(value, nfe);
-        }
-    }
-
-    private Double asDouble(Number value) throws SQLException {
-        return value.doubleValue();
-    }
-
-    @Override
-    public String getTypeName() {
-        return "Double";
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/FloatType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/FloatType.java
deleted file mode 100644
index 2a2a4a16a1..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/FloatType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLException;
-import java.util.Map;
-
-public class FloatType extends NumberType<Float> {
-
-    public static final FloatType INSTANCE = new FloatType();
-
-    private FloatType() {
-
-    }
-
-    @Override
-    public Float fromValue(Object value, Map<String, Object> conversionParams) throws SQLException {
-        if (value == null) {
-            return (float) 0;
-        }
-        if (value instanceof Float) {
-            return (Float) value;
-        } else if (value instanceof String) {
-            return asFloat((String) value);
-        } else if (value instanceof Number) {
-            return asFloat((Number) value);
-        } else {
-            throw objectConversionException(value);
-        }
-    }
-
-    private Float asFloat(String value) throws SQLException {
-        try {
-            return asFloat(Double.valueOf(value));
-        } catch (NumberFormatException nfe) {
-            throw stringConversionException(value, nfe);
-        }
-    }
-
-    private Float asFloat(Number value) throws SQLException {
-        return (float) getDoubleValueWithinBounds(value, -Float.MAX_VALUE, Float.MAX_VALUE);
-    }
-
-    @Override
-    public String getTypeName() {
-        return "Float";
-    }
-
-    @Override
-    public boolean roundOffValue() {
-        return false;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/IntegerType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/IntegerType.java
deleted file mode 100644
index 69e2eec14b..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/IntegerType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLException;
-import java.util.Map;
-
-public class IntegerType extends NumberType<Integer> {
-
-    public static final IntegerType INSTANCE = new IntegerType();
-
-    private IntegerType() {
-
-    }
-
-    @Override
-    public Integer fromValue(Object value, Map<String, Object> conversionParams) throws SQLException {
-        if (value == null) {
-            return 0;
-        }
-        if (value instanceof Integer) {
-            return (Integer) value;
-        } else if (value instanceof String) {
-            return asInteger((String) value);
-        } else if (value instanceof Number) {
-            return asInteger((Number) value);
-        } else {
-            throw objectConversionException(value);
-        }
-    }
-
-    private Integer asInteger(String value) throws SQLException {
-        try {
-            return asInteger(Double.valueOf(value));
-        } catch (NumberFormatException nfe) {
-            throw stringConversionException(value, nfe);
-        }
-    }
-
-    private Integer asInteger(Number value) throws SQLException {
-        return (int) getDoubleValueWithinBounds(value, Integer.MIN_VALUE, Integer.MAX_VALUE);
-    }
-
-    @Override
-    public String getTypeName() {
-        return "Integer";
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/LongType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/LongType.java
deleted file mode 100644
index 3e8d55873f..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/LongType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.sql.SQLException;
-import java.util.Map;
-
-public class LongType extends NumberType<Long> {
-
-    public static final LongType INSTANCE = new LongType();
-
-    private LongType() {
-
-    }
-
-    @Override
-    public Long fromValue(Object value, Map<String, Object> conversionParams) throws SQLException {
-        if (value == null) {
-            return (long) 0;
-        }
-        if (value instanceof Long) {
-            return (Long) value;
-        } else if (value instanceof String) {
-            return asLong((String) value);
-        } else if (value instanceof Number) {
-            return asLong((Number) value);
-        } else {
-            throw objectConversionException(value);
-        }
-    }
-
-    private Long asLong(String value) throws SQLException {
-        try {
-            if (value.length() > 14) {
-                // more expensive conversion but
-                // needed to preserve precision for such large numbers
-                BigDecimal bd = new BigDecimal(value);
-                bd = bd.setScale(0, RoundingMode.HALF_UP);
-                return bd.longValueExact();
-            } else {
-                return asLong(Double.valueOf(value));
-            }
-
-        } catch (ArithmeticException | NumberFormatException ex) {
-            throw stringConversionException(value, ex);
-        }
-    }
-
-    private Long asLong(Number value) throws SQLException {
-        return (long) getDoubleValueWithinBounds(value, Long.MIN_VALUE, Long.MAX_VALUE);
-    }
-
-    @Override
-    public String getTypeName() {
-        return "Long";
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/NumberType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/NumberType.java
deleted file mode 100644
index da1ffd18b9..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/NumberType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLException;
-
-public abstract class NumberType<T> implements TypeHelper<T> {
-
-    /**
-     * Returns a {@link Number} type value as a {@link Double} if it falls
-     * within a specified min and max range.
-     *
-     * @param value Number value to parse
-     * @param minValue minimum value possible
-     * @param maxValue maximum value possible
-     *
-     * @return The double value corresponding to the specified Number if
-     *         it falls within the specified min and max range.
-     *
-     * @throws SQLException If the double value is outside the possible
-     *         range specified
-     */
-    double getDoubleValueWithinBounds(Number value, double minValue, double maxValue) throws SQLException {
-        double doubleValue = value.doubleValue();
-
-        if (roundOffValue())
-            doubleValue = Math.round(doubleValue);
-
-        if (doubleValue > maxValue || doubleValue < minValue)
-            throw valueOutOfRangeException(value);
-
-        return doubleValue;
-    }
-
-    /**
-     * Whether to round off a fractional value during cross conversion
-     * from a different type to this type.
-     *
-     * @return true, to apply rounding off, false otherwise
-     */
-    public boolean roundOffValue() {
-        return true;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/OpenSearchType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/OpenSearchType.java
deleted file mode 100644
index dd2c19326d..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/OpenSearchType.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.Date;
-import java.sql.JDBCType;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * Enum for OpenSearch Data Types.
- * <p>
- * Each type encapsulates mapping to its corresponding JDBC Type and
- * associated properties.
- * <p>
- * Where required, an OpenSearch data type is mapped to the least
- * precise {@link JDBCType} that can accurately represent it based on
- * the following:
- *
- * <ol>
- * <li>
- * Precision of a {@link JDBCType} is taken to be the
- * precision of the corresponding Java type mentioned in
- * the JDBC Spec - Table B-1: JDBC Types Mapped to Java Types
- * </li>
- * <li>
- * Precision of OpenSearch types is based on
- * OpenSearch Reference > Mapping > Field datatypes
- * </li>
- * </ol>
- */
-public enum OpenSearchType {
-
-    // Precision values based on number of decimal digits supported by Java types
-    // Display size values based on precision plus additional buffer for visual representation
-    // - Java long is a 64-bit integral value ~ 19 decimal digits
-    // - Java double has 53-bit precision ~ 15 decimal digits
-    // - Java float has 24-bit precision ~ 7 decimal digits
-    // - scaled_float is internally an OpenSearch long, but treated as Java Double here
-    // - ISO8601 representation of DateTime values as yyyy-mm-ddThh:mm:ss.mmmZ ~ 24 chars
-
-    // Some Types not fully supported yet: VARBINARY, GEO_POINT, NESTED
-    BOOLEAN(JDBCType.BOOLEAN, Boolean.class, 1, 1, false),
-    BYTE(JDBCType.TINYINT, Byte.class, 3, 5, true),
-    SHORT(JDBCType.SMALLINT, Short.class, 5, 6, true),
-    INTEGER(JDBCType.INTEGER, Integer.class, 10, 11, true),
-    LONG(JDBCType.BIGINT, Long.class, 19, 20, true),
-    HALF_FLOAT(JDBCType.REAL, Float.class, 7, 15, true),
-    FLOAT(JDBCType.REAL, Float.class, 7, 15, true),
-    DOUBLE(JDBCType.DOUBLE, Double.class, 15, 25, true),
-    SCALED_FLOAT(JDBCType.DOUBLE, Double.class, 15, 25, true),
-    KEYWORD(JDBCType.VARCHAR, String.class, 256, 0, false),
-    TEXT(JDBCType.VARCHAR, String.class, Integer.MAX_VALUE, 0, false),
-    STRING(JDBCType.VARCHAR, String.class, Integer.MAX_VALUE, 0, false),
-    IP(JDBCType.VARCHAR, String.class, 15, 0, false),
-    NESTED(JDBCType.STRUCT, null, 0, 0, false),
-    OBJECT(JDBCType.STRUCT, null, 0, 0, false),
-    DATE(JDBCType.DATE, Date.class, 24, 24, false),
-    TIME(JDBCType.TIME, Time.class, 24, 24, false),
-    DATETIME(JDBCType.TIMESTAMP, Timestamp.class, 24, 24, false),
-    TIMESTAMP(JDBCType.TIMESTAMP, Timestamp.class, 24, 24, false),
-    BINARY(JDBCType.VARBINARY, String.class, Integer.MAX_VALUE, 0, false),
-    NULL(JDBCType.NULL, null, 0, 0, false),
-    UNDEFINED(JDBCType.NULL, null, 0, 0, false),
-    UNSUPPORTED(JDBCType.OTHER, null, 0, 0, false);
-
-    private static final Map<JDBCType, OpenSearchType> jdbcTypeToOpenSearchTypeMap;
-
-    static {
-        // Map JDBCType to corresponding ElasticsearchType
-        jdbcTypeToOpenSearchTypeMap = new HashMap<>();
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.NULL, UNDEFINED);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.BOOLEAN, BOOLEAN);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.TINYINT, BYTE);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.SMALLINT, SHORT);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.INTEGER, INTEGER);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.BIGINT, LONG);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.DOUBLE, DOUBLE);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.REAL, FLOAT);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.FLOAT, DOUBLE);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.VARCHAR, KEYWORD);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.TIMESTAMP, TIMESTAMP);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.TIME, TIME);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.DATE, DATE);
-        jdbcTypeToOpenSearchTypeMap.put(JDBCType.VARBINARY, BINARY);
-    }
-
-    /**
-     * OpenSearch designated type name
-     */
-    private final String typeName;
-
-    /**
-     * {@link JDBCType} that this type maps to
-     */
-    private final JDBCType jdbcType;
-
-    /**
-     * Java class that the type maps to
-     */
-    private final String javaClassName;
-
-    /**
-     * Maximum number of characters that may be needed to represent the
-     * values contained by this type. The value is determined based on
-     * description provided in {@link java.sql.ResultSetMetaData#getPrecision(int)}.
-     *
-     * <ul>
-     * <li>
-     * For numeric types the value indicates the max number of
-     * decimal digits that are possible with the corresponding
-     * Java type
-     * </li>
-     * <li>
-     * For character types the value indicates the length of
-     * potential character data in the type
-     * </li>
-     * <li>
-     * Fot Date-Time types the value indicates the characters
-     * needed to represent the value in zero offset (UTC) ISO8601
-     * format with millisecond fractional time i.e.
-     * yyyy-mm-ddThh:mm:ss.mmmZ
-     * </li>
-     *
-     * </ul>
-     */
-    private final int precision;
-
-    /**
-     * Display Size as per {@link java.sql.ResultSetMetaData#getColumnDisplaySize(int)}
-     */
-    private final int displaySize;
-
-    /**
-     * True if the type holds signed numerical values
-     */
-    private final boolean isSigned;
-
-    OpenSearchType(JDBCType jdbcType, Class<?> javaClass, int precision,
-                   int displaySize, boolean isSigned) {
-        this.typeName = name().toLowerCase(Locale.ROOT);
-        this.jdbcType = jdbcType;
-        this.javaClassName = javaClass == null ? null : javaClass.getName();
-        this.precision = precision;
-        this.displaySize = displaySize;
-        this.isSigned = isSigned;
-    }
-
-    public static OpenSearchType fromJdbcType(JDBCType jdbcType) {
-        if (!jdbcTypeToOpenSearchTypeMap.containsKey(jdbcType)) {
-            throw new IllegalArgumentException("Unsupported JDBC type \"" + jdbcType + "\"");
-        }
-        return jdbcTypeToOpenSearchTypeMap.get(jdbcType);
-    }
-
-    /**
-     * Returns the {@link OpenSearchType} for the specified OpenSearch
-     * data type name.
-     */
-    public static OpenSearchType fromTypeName(String typeName) {
-        return fromTypeName(typeName, false);
-    }
-
-    /**
-     * Parses a specified OpenSearch type name to determine
-     * the corresponding {@link OpenSearchType}
-     *
-     * @param typeName The OpenSearch Type name to parse
-     * @param errorOnUnknownType If true, the method throws an
-     *         {@link UnrecognizedOpenSearchTypeException}
-     *         if the type name specified is not recognized.
-     *
-     * @return the {@link OpenSearchType} value corresponding to the
-     *         specified type name
-     */
-    public static OpenSearchType fromTypeName(String typeName, boolean errorOnUnknownType) {
-        try {
-            return OpenSearchType.valueOf(typeName.toUpperCase(Locale.ROOT));
-        } catch (IllegalArgumentException iae) {
-            if (errorOnUnknownType)
-                throw new UnrecognizedOpenSearchTypeException("Unknown Type: \"" + typeName + "\"", iae);
-            else
-                return UNSUPPORTED;
-        }
-    }
-
-    public int sqlTypeNumber() {
-        return jdbcType.getVendorTypeNumber();
-    }
-
-    public boolean isSigned() {
-        return isSigned;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public JDBCType getJdbcType() {
-        return jdbcType;
-    }
-
-    public String getJavaClassName() {
-        return javaClassName;
-    }
-
-    public int getPrecision() {
-        return precision;
-    }
-
-    public int getDisplaySize() {
-        return displaySize;
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/ShortType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/ShortType.java
deleted file mode 100644
index de7e5fa8a8..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/ShortType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLException;
-import java.util.Map;
-
-public class ShortType extends NumberType<Short> {
-
-    public static final ShortType INSTANCE = new ShortType();
-
-    private ShortType() {
-
-    }
-
-    @Override
-    public Short fromValue(Object value, Map<String, Object> conversionParams) throws SQLException {
-        if (value == null) {
-            return (short) 0;
-        }
-        if (value instanceof Short) {
-            return (Short) value;
-        } else if (value instanceof String) {
-            return asShort((String) value);
-        } else if (value instanceof Number) {
-            return asShort((Number) value);
-        } else {
-            throw objectConversionException(value);
-        }
-    }
-
-    private Short asShort(String value) throws SQLException {
-        try {
-            return asShort(Double.valueOf(value));
-        } catch (NumberFormatException nfe) {
-            throw stringConversionException(value, nfe);
-        }
-    }
-
-    private Short asShort(Number value) throws SQLException {
-        return (short) getDoubleValueWithinBounds(value, Short.MIN_VALUE, Short.MAX_VALUE);
-    }
-
-    @Override
-    public String getTypeName() {
-        return "Short";
-    }
-
-    public static void main(String[] args) {
-        Short.valueOf("45.50");
-        System.out.println(Math.round(100.45D));
-        System.out.println(Math.round(100.95f));
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/StringType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/StringType.java
deleted file mode 100644
index cdbbcf8803..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/StringType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.util.Map;
-
-public class StringType implements TypeHelper<String> {
-
-    public static final StringType INSTANCE = new StringType();
-
-    private StringType() {
-
-    }
-
-    @Override
-    public String getTypeName() {
-        return "String";
-    }
-
-    @Override
-    public String fromValue(Object value, Map<String, Object> conversionParams) {
-        if (value == null)
-            return null;
-        else
-            return String.valueOf(value);
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TimeType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TimeType.java
deleted file mode 100644
index ad44c7f1a8..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TimeType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLException;
-import java.sql.Time;
-import java.time.LocalTime;
-import java.util.Map;
-
-public class TimeType implements TypeHelper<Time>{
-
-  public static final TimeType INSTANCE = new TimeType();
-
-  private TimeType() {
-
-  }
-
-  @Override
-  public Time fromValue(Object value, Map<String, Object> conversionParams) throws SQLException {
-    if (value == null) {
-      return null;
-    }
-    if (value instanceof Time) {
-      return asTime((Time) value);
-    } else if (value instanceof String) {
-      return asTime((String) value);
-    } else if (value instanceof Number) {
-      return this.asTime((Number) value);
-    } else {
-      throw objectConversionException(value);
-    }
-  }
-
-  public Time asTime(Time value) {
-    return localTimetoSqlTime(value.toLocalTime());
-  }
-
-  public Time asTime(String value) throws SQLException {
-    return localTimetoSqlTime(toLocalTime(value));
-  }
-
-  private Time localTimetoSqlTime(LocalTime localTime) {
-    return new Time(localTime.getHour(), localTime.getMinute(), localTime.getSecond());
-  }
-
-  public Time asTime(Number value) {
-    return new Time(value.longValue());
-  }
-
-  private LocalTime toLocalTime(String value) throws SQLException {
-    if (value == null)
-      throw stringConversionException(value, null);
-    return LocalTime.parse(value);
-  }
-
-  @Override
-  public String getTypeName() {
-    return "Time";
-  }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TimestampType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TimestampType.java
deleted file mode 100644
index 4dcd94ae74..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TimestampType.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Calendar;
-import java.util.Map;
-import java.util.TimeZone;
-
-/**
- * Supports returning a java.sql.Timestamp from a String in the
- * JDBC escape format, or a Number value indicating epoch time in millis.
- */
-public class TimestampType implements TypeHelper<Timestamp> {
-
-    public static final TimestampType INSTANCE = new TimestampType();
-
-    private TimestampType() {
-
-    }
-
-    @Override
-    public java.sql.Timestamp fromValue(Object value, Map<String, Object> conversionParams) throws SQLException {
-        if (value == null) {
-            return null;
-        }
-        Calendar calendar = conversionParams != null ? (Calendar) conversionParams.get("calendar") : null;
-        if (value instanceof Timestamp) {
-            return asTimestamp((Timestamp) value, calendar);
-        } else if (value instanceof String) {
-            return asTimestamp((String) value, calendar);
-        } else if (value instanceof Number) {
-           return asTimestamp((Number) value);
-        } else {
-            throw objectConversionException(value);
-        }
-    }
-
-    public java.sql.Timestamp asTimestamp(Timestamp value, Calendar calendar) throws SQLException {
-        if (calendar == null) {
-            return value;
-        } else {
-            return localDateTimeToTimestamp(value.toLocalDateTime(), calendar);
-        }
-    }
-
-    private Timestamp localDateTimeToTimestamp(LocalDateTime ldt, Calendar calendar) {
-        calendar.set(ldt.getYear(), ldt.getMonthValue()-1, ldt.getDayOfMonth(),
-                ldt.getHour(), ldt.getMinute(), ldt.getSecond());
-        calendar.set(Calendar.MILLISECOND, ldt.getNano()/1000000);
-
-        return new Timestamp(calendar.getTimeInMillis());
-    }
-
-    public java.sql.Timestamp asTimestamp(String value, Calendar calendar) throws SQLException {
-        try {
-            // Make some effort to understand ISO format
-            if (value.length() > 11 && value.charAt(10) == 'T') {
-                value = value.replace('T', ' ');
-            }
-            // Timestamp.valueOf() does not like timezone information
-            if (value.length() > 23) {
-                if (value.length() == 24 && value.charAt(23) == 'Z') {
-                    value = value.substring(0, 23);
-                }
-                else if (value.charAt(23) == '+' || value.charAt(23) == '-') {
-                    // 'calendar' parameter takes precedence
-                    if (calendar == null) {
-                        calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT" + value.substring(23)));
-                    }
-                    value = value.substring(0, 23);
-                }
-            }
-
-            final Timestamp ts;
-            // 11 to check if the value is in yyyy-MM-dd format
-            if (value.length() < 11) {
-                ts = Timestamp.valueOf(LocalDate.parse(value).atStartOfDay());
-            } else {
-                ts = Timestamp.valueOf(value);
-            }
-
-            if (calendar == null) {
-                return ts;
-            }
-            return localDateTimeToTimestamp(ts.toLocalDateTime(), calendar);
-        } catch (IllegalArgumentException iae) {
-            throw stringConversionException(value, iae);
-        }
-    }
-
-    public java.sql.Timestamp asTimestamp(Number value) throws SQLException {
-        return new java.sql.Timestamp(value.longValue());
-    }
-
-    @Override
-    public String getTypeName() {
-        return "Timestamp";
-    }
-
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TypeConverter.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TypeConverter.java
deleted file mode 100644
index cbfeb5ecdc..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TypeConverter.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLDataException;
-import java.sql.SQLException;
-import java.util.Map;
-
-public interface TypeConverter {
-
-    /**
-     * This method allows retrieving a column value as an instance of
-     * a different class than the default Java class that the column's
-     * JDBCType maps to.
-     * <p>
-     * This implements the aspect of the JDBC spec that specifies
-     * multiple JDBCTypes on which a ResultSet getter method may be called.
-     *
-     * @param <T> Type of the Java Class
-     * @param value Column value
-     * @param clazz Instance of the Class to which the value needs to be
-     *         converted
-     * @param conversionParams Optional conversion parameters to use in
-     *         the conversion
-     *
-     * @return Column value as an instance of type T
-     *
-     * @throws SQLException if the conversion is not supported or the
-     *         conversion operation fails.
-     */
-    <T> T convert(Object value, Class<T> clazz, Map<String, Object> conversionParams) throws SQLException;
-
-    default SQLDataException objectConversionException(Object value, Class clazz) {
-        return new SQLDataException(String.format(
-                "Can not convert object '%s' of type '%s' to type '%s'",
-                value, value.getClass().getName(), clazz.getName()));
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TypeConverters.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TypeConverters.java
deleted file mode 100644
index 2dce3e834d..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TypeConverters.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.Date;
-import java.sql.JDBCType;
-import java.sql.SQLException;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * For columns that are mapped to a certain JDBCType, the
- * TypeConverter instances here provide utility functions
- * to retrieve the values in these columns as instances
- * of specified Java classes.
- *
- * These conversions are needed for example when ResultSet.getString()
- * is invoked on a column that is internally a JDBCType.FLOAT or
- * ResultSet.getFloat() is invoked on a column that is internally a
- * JDBCType.VARCHAR
- */
-public class TypeConverters {
-
-    private static Map<JDBCType, TypeConverter> tcMap = new HashMap<>();
-
-    static {
-        // TODO - JDBCType.VARBINARY - byte[] -> Try OpenSearch data type
-        tcMap.put(JDBCType.TIMESTAMP, new TimestampTypeConverter());
-        tcMap.put(JDBCType.DATE, new DateTypeConverter());
-        tcMap.put(JDBCType.TIME, new TimeTypeConverter());
-
-        tcMap.put(JDBCType.FLOAT, new FloatTypeConverter());
-        tcMap.put(JDBCType.REAL, new RealTypeConverter());
-        tcMap.put(JDBCType.DOUBLE, new DoubleTypeConverter());
-
-        tcMap.put(JDBCType.VARCHAR, new VarcharTypeConverter());
-
-        tcMap.put(JDBCType.BOOLEAN, new BooleanTypeConverter());
-
-        tcMap.put(JDBCType.TINYINT, new TinyIntTypeConverter());
-        tcMap.put(JDBCType.SMALLINT, new SmallIntTypeConverter());
-        tcMap.put(JDBCType.INTEGER, new IntegerTypeConverter());
-        tcMap.put(JDBCType.BIGINT, new BigIntTypeConverter());
-
-        tcMap.put(JDBCType.BINARY, new BinaryTypeConverter());
-
-        tcMap.put(JDBCType.NULL, new NullTypeConverter());
-    }
-
-    public static TypeConverter getInstance(JDBCType jdbcType) {
-        return tcMap.get(jdbcType);
-    }
-
-    public static class TimestampTypeConverter extends BaseTypeConverter {
-
-        private static final Set<Class> supportedJavaClasses = Collections.unmodifiableSet(
-                new HashSet<>(Arrays.asList(
-                        String.class, Timestamp.class
-                )));
-
-        private TimestampTypeConverter() {
-
-        }
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return Timestamp.class;
-        }
-
-        @Override
-        public Set<Class> getSupportedJavaClasses() {
-            return supportedJavaClasses;
-        }
-
-    }
-
-    public static class DateTypeConverter extends BaseTypeConverter {
-
-        private static final Set<Class> supportedJavaClasses = Collections.unmodifiableSet(
-                new HashSet<>(Arrays.asList(
-                        String.class, Date.class
-                )));
-
-        private DateTypeConverter() {
-
-        }
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return Date.class;
-        }
-
-        @Override
-        public Set<Class> getSupportedJavaClasses() {
-            return supportedJavaClasses;
-        }
-
-    }
-
-    public static class TimeTypeConverter extends BaseTypeConverter {
-
-        private static final Set<Class> supportedJavaClasses = Collections.unmodifiableSet(
-            new HashSet<>(Arrays.asList(
-                String.class, Time.class
-            )));
-
-        private TimeTypeConverter() {
-
-        }
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return Time.class;
-        }
-
-        @Override
-        public Set<Class> getSupportedJavaClasses() {
-            return supportedJavaClasses;
-        }
-    }
-
-    public static class VarcharTypeConverter extends BaseTypeConverter {
-
-        private static final Set<Class> supportedJavaClasses = Collections.unmodifiableSet(
-                new HashSet<>(Arrays.asList(
-                        String.class, Timestamp.class, java.sql.Date.class,
-                        Byte.class, Short.class, Integer.class, Long.class,
-                        Boolean.class
-                )));
-
-        VarcharTypeConverter() {
-
-        }
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return String.class;
-        }
-
-        @Override
-        public Set<Class> getSupportedJavaClasses() {
-            return supportedJavaClasses;
-        }
-    }
-
-    public static class DoubleTypeConverter extends BaseTypeConverter {
-
-        private static final Set<Class> supportedJavaClasses = Collections.unmodifiableSet(
-                new HashSet<>(Arrays.asList(
-                        String.class, Float.class, Double.class,
-                        Byte.class, Short.class, Integer.class, Long.class
-                )));
-
-        private DoubleTypeConverter() {
-
-        }
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return Double.class;
-        }
-
-        @Override
-        public Set<Class> getSupportedJavaClasses() {
-            return supportedJavaClasses;
-        }
-    }
-
-    public static class RealTypeConverter extends DoubleTypeConverter {
-
-        RealTypeConverter() {
-
-        }
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return Float.class;
-        }
-    }
-
-    public static class FloatTypeConverter extends DoubleTypeConverter {
-
-        FloatTypeConverter() {
-
-        }
-    }
-
-    public static class BooleanTypeConverter extends BaseTypeConverter {
-
-        private static final Set<Class> supportedJavaClasses = Collections.unmodifiableSet(
-                new HashSet<>(Arrays.asList(
-                        Boolean.class, String.class
-                )));
-
-        BooleanTypeConverter() {
-
-        }
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return Boolean.class;
-        }
-
-        @Override
-        public Set<Class> getSupportedJavaClasses() {
-            return supportedJavaClasses;
-        }
-    }
-
-    public static class BinaryTypeConverter extends BaseTypeConverter {
-
-        private static final Set<Class> supportedJavaClasses = Collections.unmodifiableSet(
-            new HashSet<>(Arrays.asList(
-                String.class
-            )));
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return String.class;
-        }
-
-        @Override
-        public Set<Class> getSupportedJavaClasses() {
-            return supportedJavaClasses;
-        }
-    }
-
-    public static class IntegerTypeConverter extends BaseTypeConverter {
-
-        private static final Set<Class> supportedJavaClasses = Collections.unmodifiableSet(
-                new HashSet<>(Arrays.asList(
-                        Float.class, Double.class,
-                        Byte.class, Short.class, Integer.class, Long.class,
-                        String.class
-                )));
-
-        IntegerTypeConverter() {
-
-        }
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return Integer.class;
-        }
-
-        @Override
-        public Set<Class> getSupportedJavaClasses() {
-            return supportedJavaClasses;
-        }
-    }
-
-    public static class BigIntTypeConverter extends IntegerTypeConverter {
-
-        BigIntTypeConverter() {
-
-        }
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return Long.class;
-        }
-    }
-
-    public static class TinyIntTypeConverter extends IntegerTypeConverter {
-
-        TinyIntTypeConverter() {
-
-        }
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return Byte.class;
-        }
-    }
-
-    public static class SmallIntTypeConverter extends IntegerTypeConverter {
-
-        SmallIntTypeConverter() {
-
-        }
-
-        @Override
-        public Class getDefaultJavaClass() {
-            return Short.class;
-        }
-    }
-
-    public static class NullTypeConverter implements TypeConverter {
-
-        @Override
-        public <T> T convert(Object value, Class<T> clazz, Map<String, Object> conversionParams) {
-            // As Javadoc for ResultSet.getObject() API, a SQL NULL needs to be converted to
-            // a JAVA null here
-            return null;
-        }
-    }
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TypeHelper.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TypeHelper.java
deleted file mode 100644
index 54f97b454b..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/TypeHelper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import java.sql.SQLDataException;
-import java.sql.SQLException;
-import java.util.Map;
-
-/**
- * Provides conversion of Object instances to Java type T where possible.
- * <p>
- * Used by {@link TypeConverter} instances to perform object cross conversions.
- *
- * @param <T> The Java type to which conversion is provided.
- */
-public interface TypeHelper<T> {
-    default SQLDataException stringConversionException(String value, Throwable cause) {
-        if (cause != null)
-            return new SQLDataException(String.format("Can not parse %s as a %s", value, getTypeName()), cause);
-        else
-            return new SQLDataException(String.format("Can not parse %s as a %s", value, getTypeName()));
-    }
-
-    default SQLDataException objectConversionException(Object value) {
-        if (value == null) {
-            return new SQLDataException(
-                    String.format("Can not return null value as a %s", getTypeName()));
-        } else {
-            return new SQLDataException(
-                    String.format("Can not return value of type %s as a %s",
-                            value.getClass().getName(), getTypeName()));
-        }
-    }
-
-    default SQLDataException valueOutOfRangeException(Object value) {
-        return new SQLDataException(
-                String.format("Object value %s out of range for type %s", value, getTypeName()));
-
-    }
-
-    /**
-     * Returns an Object as an equivalent instance of type T
-     *
-     * @param value Object instance to convert
-     * @param conversionParams Optional parameters to use for conversion
-     *
-     * @return instance of type T
-     *
-     * @throws SQLException if there is a problem in carrying out the conversion
-     */
-    T fromValue(Object value, Map<String, Object> conversionParams) throws SQLException;
-
-    /**
-     * Indicative name of the type T
-     *
-     * @return
-     */
-    String getTypeName();
-}
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/UnrecognizedOpenSearchTypeException.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/UnrecognizedOpenSearchTypeException.java
deleted file mode 100644
index f46a9bd438..0000000000
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/UnrecognizedOpenSearchTypeException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-public class UnrecognizedOpenSearchTypeException extends IllegalArgumentException {
-
-    public UnrecognizedOpenSearchTypeException() {
-    }
-
-    public UnrecognizedOpenSearchTypeException(String s) {
-        super(s);
-    }
-
-    public UnrecognizedOpenSearchTypeException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public UnrecognizedOpenSearchTypeException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/sql-jdbc/src/main/resources/META-INF/services/java.sql.Driver b/sql-jdbc/src/main/resources/META-INF/services/java.sql.Driver
deleted file mode 100644
index c3705871a5..0000000000
--- a/sql-jdbc/src/main/resources/META-INF/services/java.sql.Driver
+++ /dev/null
@@ -1 +0,0 @@
-org.opensearch.jdbc.Driver
\ No newline at end of file
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/ConnectionTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/ConnectionTests.java
deleted file mode 100644
index 9247cbf31f..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/ConnectionTests.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.config.AuthConnectionProperty;
-import org.opensearch.jdbc.config.ConnectionPropertyException;
-import org.opensearch.jdbc.config.PasswordConnectionProperty;
-import org.opensearch.jdbc.config.RegionConnectionProperty;
-import org.opensearch.jdbc.config.RequestCompressionConnectionProperty;
-import org.opensearch.jdbc.config.UserConnectionProperty;
-import org.opensearch.jdbc.protocol.http.JsonHttpProtocol;
-import org.opensearch.jdbc.test.PerTestWireMockServerExtension;
-import org.opensearch.jdbc.test.WireMockServerHelpers;
-import org.opensearch.jdbc.test.mocks.MockOpenSearch;
-import org.opensearch.jdbc.test.mocks.QueryMock;
-import com.amazonaws.auth.SdkClock;
-import com.github.tomakehurst.wiremock.WireMockServer;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@ExtendWith(PerTestWireMockServerExtension.class)
-class ConnectionTests implements WireMockServerHelpers {
-
-    @Test
-    void testGetConnection(final WireMockServer mockServer) throws SQLException {
-        mockServer.stubFor(get(urlEqualTo("/"))
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(MockOpenSearch.INSTANCE.getConnectionResponse())));
-
-        Driver driver = new Driver();
-        Connection con = Assertions.assertDoesNotThrow(
-                () -> driver.connect(getBaseURLForMockServer(mockServer), (Properties) null));
-
-        assertConnectionOpen(con);
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-        con.close();
-    }
-
-    @Test
-    void testConnectWithBasicAuth(final WireMockServer mockServer) throws ConnectionPropertyException, SQLException {
-        // HTTP Client Basic Auth is not pre-emptive, set up an Auth Challenge
-        mockServer.stubFor(get(urlEqualTo("/"))
-                .willReturn(aResponse()
-                        .withStatus(401)
-                        .withHeader("WWW-Authenticate", "Basic realm=\"Auth Realm\"")
-                ));
-
-        // Response if request's basic auth matches expectation
-        mockServer.stubFor(get(urlEqualTo("/"))
-                .withBasicAuth("user-name", "password-$#@!*%^123")
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(MockOpenSearch.INSTANCE.getConnectionResponse())));
-
-        Properties props = new Properties();
-        props.put(AuthConnectionProperty.KEY, "basic");
-        props.put(UserConnectionProperty.KEY, "user-name");
-        props.put(PasswordConnectionProperty.KEY, "password-$#@!*%^123");
-
-        Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(getBaseURLForMockServer(mockServer), props));
-
-        mockServer.verify(2, getRequestedFor(urlEqualTo("/"))
-                .withHeader("Accept", equalTo("application/json")));
-
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-        con.close();
-    }
-
-    @Test
-    void testConnectDefaultAuthWithUsername(final WireMockServer mockServer) throws SQLException {
-        // In the absence of explicit auth type, Basic is used if a username/password
-        // is specified
-
-        // HTTP Client Basic Auth is not pre-emptive, set up an Auth Challenge
-        mockServer.stubFor(get(urlEqualTo("/"))
-                .willReturn(aResponse()
-                        .withStatus(401)
-                        .withHeader("WWW-Authenticate", "Basic realm=\"Auth Realm\"")
-                ));
-
-        // Response if request's basic auth matches expectation
-        mockServer.stubFor(get(urlEqualTo("/"))
-                .withBasicAuth("user-name", "password-$#@!*%^123")
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(MockOpenSearch.INSTANCE.getConnectionResponse())));
-
-        Properties props = new Properties();
-        props.put(UserConnectionProperty.KEY, "user-name");
-        props.put(PasswordConnectionProperty.KEY, "password-$#@!*%^123");
-
-        Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(getBaseURLForMockServer(mockServer), props));
-
-        mockServer.verify(2, getRequestedFor(urlEqualTo("/"))
-                .withHeader("Accept", equalTo("application/json")));
-
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-        con.close();
-    }
-
-    @Test
-    void testConnectWithRequestCompression(final WireMockServer mockServer) throws SQLException {
-        // Respond only if request mentions it accepts gzip
-        // i.e. expected behavior when requestCompression is set
-        mockServer.stubFor(
-                get(urlEqualTo("/"))
-                        .withHeader("Accept-Encoding", equalTo("gzip,deflate"))
-                        .willReturn(aResponse()
-                                .withHeader("Content-Type", "application/json")
-                                .withBody(MockOpenSearch.INSTANCE.getConnectionResponse())));
-
-        Properties props = new Properties();
-        props.setProperty(RequestCompressionConnectionProperty.KEY, "true");
-
-        // WireMockServer returns a gzip response by default
-        // if Accept-Enconding: gzip,deflate is present in the request
-        Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(getBaseURLForMockServer(mockServer), props));
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-        con.close();
-    }
-
-    @Test
-    void testConnectWithoutRequestCompression(final WireMockServer mockServer) throws ConnectionPropertyException, SQLException {
-        // Respond successfully only if request does not mention it accepts gzip
-        // i.e. expected behavior when requestCompression is not set
-        mockServer.stubFor(
-                get(urlEqualTo("/"))
-                        .willReturn(aResponse()
-                                .withHeader("Content-Type", "application/json")
-                                .withBody(MockOpenSearch.INSTANCE.getConnectionResponse())));
-
-        mockServer.stubFor(
-                get(urlEqualTo("/"))
-                        .withHeader("Accept-Encoding", equalTo("gzip,deflate"))
-                        .willReturn(aResponse()
-                                .withStatus(400)
-                                .withStatusMessage("Request seeks gzip response")));
-
-        // explicitly disable requestCompression
-        Properties props = new Properties();
-        props.setProperty(RequestCompressionConnectionProperty.KEY, "false");
-
-        // WireMockServer returns a gzip response by default
-        // if Accept-Enconding: gzip,deflate is present in the request
-        Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(getBaseURLForMockServer(mockServer), props));
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-        con.close();
-    }
-
-    @Test
-    void testConnectWithDefaultRequestCompression(final WireMockServer mockServer) throws ConnectionPropertyException, SQLException {
-        // Respond successfully only if request does not mention it accepts gzip
-        // i.e. expected behavior when requestCompression is not set
-        mockServer.stubFor(
-                get(urlEqualTo("/"))
-                        .willReturn(aResponse()
-                                .withHeader("Content-Type", "application/json")
-                                .withBody(MockOpenSearch.INSTANCE.getConnectionResponse())));
-
-        // return HTTP 400 if request contains Accept-Encoding: gzip
-        mockServer.stubFor(
-                get(urlEqualTo("/"))
-                        .withHeader("Accept-Encoding", equalTo("gzip,deflate"))
-                        .willReturn(aResponse()
-                                .withStatus(400)
-                                .withStatusMessage("Request seeks gzip response by default")));
-
-        // empty Properties - expect default behavior is to not set requestCompression
-        Properties props = new Properties();
-
-        Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(getBaseURLForMockServer(mockServer), props));
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-        con.close();
-    }
-
-    // TODO - find a way to test this differently?
-    @Disabled("currently this does not work because Host header value " +
-            "is included in signature which is of 'localhost:port' form " +
-            "and since the port value differs every run of the test, the " +
-            "signature generated is different from the canned response " +
-            "we're testing against")
-    @Test
-    void testConnectWithAwsSigV4Auth(final WireMockServer mockServer) throws SQLException {
-        mockServer.stubFor(get(urlEqualTo("/"))
-                .withHeader("Authorization",
-                        equalTo("AWS4-HMAC-SHA256 " +
-                                "Credential=AKIAJUXF4LQLB55YQ73A/20181119/us-east-1/es/aws4_request, " +
-                                "SignedHeaders=host;user-agent;x-amz-date, " +
-                                "Signature=80088eaaa2e7766ccee12014a5ab80d323635347157ea29935e990d34bcbff12"))
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(MockOpenSearch.INSTANCE.getConnectionResponse())));
-
-
-        Properties props = new Properties();
-        props.setProperty(AuthConnectionProperty.KEY, "aws_sigv4");
-        props.setProperty(RegionConnectionProperty.KEY, "us-east-1");
-
-        // Ensure AWS Signing uses same date/time as was used to generate
-        // the signatures in this test case
-        SdkClock.Instance.set(new SdkClock.MockClock(1542653839129L));
-
-        Connection con = Assertions.assertDoesNotThrow(() ->
-                new Driver().connect(getBaseURLForMockServer(mockServer), props));
-
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-        con.close();
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {
-            "/context/path",
-            "/context/path/",
-            "//context/path",
-            "//context/path/",
-    })
-    void testConnectionWithContextPath(final String userContextPath, final WireMockServer mockServer)
-            throws SQLException, IOException {
-        QueryMock.NycTaxisQueryMock queryMock = new QueryMock.NycTaxisQueryMock();
-        queryMock.setupMockServerStub(mockServer, "/context/path/",
-                "/context/path"+ JsonHttpProtocol.DEFAULT_SQL_CONTEXT_PATH+"?format=jdbc");
-
-        Driver driver = new Driver();
-        Connection con = Assertions.assertDoesNotThrow(
-                () -> driver.connect(getURLForMockServerWithContext(mockServer, userContextPath), (Properties) null));
-
-        assertConnectionOpen(con);
-        queryMock.assertConnectionResponse((OpenSearchConnection) con);
-
-        Statement st = con.createStatement();
-
-        Assertions.assertDoesNotThrow(() -> st.executeQuery(queryMock.getSql()));
-
-        con.close();
-    }
-
-    private void assertConnectionOpen(final Connection con) {
-        boolean closed = assertDoesNotThrow(con::isClosed);
-        assertTrue(!closed, "Connection is closed");
-    }
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/CursorTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/CursorTests.java
deleted file mode 100644
index c70eec89af..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/CursorTests.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.internal.results.ColumnMetaData;
-import org.opensearch.jdbc.internal.results.Cursor;
-import org.opensearch.jdbc.internal.results.Row;
-import org.opensearch.jdbc.internal.results.Schema;
-import org.opensearch.jdbc.protocol.http.JsonQueryResponse;
-import org.opensearch.jdbc.types.OpenSearchType;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class CursorTests {
-
-    @ParameterizedTest
-    @ValueSource(ints = {0, 1, 2, 7, 10, 11})
-    void testCursorNext(final int rowCount) {
-        Schema schema = new Schema(Arrays.asList(
-                toColumnMetaData("rownum", OpenSearchType.INTEGER.getTypeName())));
-
-        List<Row> rows = new ArrayList<>();
-        for (int rowNum = 1; rowNum <= rowCount; rowNum++) {
-            rows.add(toRow(rowNum));
-        }
-
-        Cursor cursor = new Cursor(schema, rows);
-        int cursorRowCount = 0;
-
-        while (cursor.next()) {
-            cursorRowCount++;
-            assertEquals(1, cursor.getColumnCount(), "Unexpected column count. Row number: " + cursorRowCount);
-            assertEquals(cursorRowCount, cursor.getColumn(0), "Unexpected row number indicator");
-        }
-
-        assertEquals(rowCount, cursorRowCount, "Unexpected number of rows retrieved from cursor.");
-    }
-
-    @ParameterizedTest
-    @ValueSource(ints = {0, 1, 2, 7, 10, 11})
-    void testCursorNextWithMultipleColumns(final int rowCount) {
-
-        final String STRINGVAL = "string";
-        final long LONGVAL = 12345678901234567L;
-        final double DOUBLEVAL = 100.25;
-
-        final List<ColumnMetaData> columnMetaDatas = Arrays.asList(
-                toColumnMetaData("rownum", OpenSearchType.INTEGER.getTypeName()),
-                toColumnMetaData("stringval", OpenSearchType.TEXT.getTypeName()),
-                toColumnMetaData("longval", OpenSearchType.LONG.getTypeName()),
-                toColumnMetaData("doubleval", OpenSearchType.DOUBLE.getTypeName())
-        );
-
-        Schema schema = new Schema(columnMetaDatas);
-
-        List<Row> rows = new ArrayList<>();
-        for (int rowNum = 1; rowNum <= rowCount; rowNum++) {
-            rows.add(toRow(rowNum, STRINGVAL, LONGVAL, DOUBLEVAL));
-        }
-
-        Cursor cursor = new Cursor(schema, rows);
-        int cursorRowCount = 0;
-
-        assertEquals(Integer.valueOf(0), cursor.findColumn("rownum"), "Mismatch in locating column 'rownum'");
-        assertEquals(Integer.valueOf(1), cursor.findColumn("stringval"), "Mismatch in locating column 'stringval'");
-        assertEquals(Integer.valueOf(2), cursor.findColumn("longval"), "Mismatch in locating column 'longval'");
-        assertEquals(Integer.valueOf(3), cursor.findColumn("doubleval"), "Mismatch in locating column 'doubleval'");
-        assertNull(cursor.findColumn("unknown"), "Valid index for unknown column label");
-
-        while (cursor.next()) {
-            cursorRowCount++;
-            assertThrows(IllegalArgumentException.class, () -> cursor.getColumn(-1));
-            assertEquals(columnMetaDatas.size(), cursor.getColumnCount(), "Unexpected column count. Row number: " + cursorRowCount);
-            assertEquals(cursorRowCount, cursor.getColumn(0), "Unexpected row number indicator");
-            assertEquals(STRINGVAL, cursor.getColumn(1), "Unexpected column value. Row number: " + cursorRowCount);
-            assertEquals(LONGVAL, cursor.getColumn(2), "Unexpected column value. Row number: " + cursorRowCount);
-            assertEquals(DOUBLEVAL, cursor.getColumn(3), "Unexpected column value. Row number: " + cursorRowCount);
-            assertThrows(IllegalArgumentException.class, () -> cursor.getColumn(4));
-        }
-
-        assertEquals(rowCount, cursorRowCount, "Unexpected number of rows retrieved from cursor.");
-    }
-
-    @ParameterizedTest
-    @ValueSource(ints = {4, 7, 10, 11})
-    void testCursorFindColumn(final int rowCount) {
-        final String STRINGVAL = "string";
-        final long LONGVAL = 12345678901234567L;
-        final double DOUBLEVAL = 100.25;
-
-        final List<ColumnMetaData> columnMetaDatas = Arrays.asList(
-                toColumnMetaData("rownum", OpenSearchType.INTEGER.getTypeName()),
-                toColumnMetaData("stringval", OpenSearchType.TEXT.getTypeName(), "stringlabel"),
-                toColumnMetaData("longval", OpenSearchType.LONG.getTypeName()),
-                toColumnMetaData("doubleval", OpenSearchType.DOUBLE.getTypeName(), "doubleLabel")
-        );
-
-        Schema schema = new Schema(columnMetaDatas);
-
-        List<Row> rows = new ArrayList<>();
-        for (int rowNum = 1; rowNum <= rowCount; rowNum++) {
-            rows.add(toRow(rowNum, STRINGVAL, LONGVAL, DOUBLEVAL));
-        }
-
-        Cursor cursor = new Cursor(schema, rows);
-        int cursorRowCount = 0;
-
-        assertEquals(Integer.valueOf(0), cursor.findColumn("rownum"), "Mismatch in locating column 'rownum'");
-        assertNull(cursor.findColumn("stringval"), "column lookup succeeded by name - doubleval");
-        assertEquals(Integer.valueOf(1), cursor.findColumn("stringlabel"), "Mismatch in locating column 'stringlabel'");
-        assertEquals(Integer.valueOf(2), cursor.findColumn("longval"), "Mismatch in locating column 'longval'");
-        assertEquals(Integer.valueOf(3), cursor.findColumn("doubleLabel"), "Mismatch in locating column 'doubleLabel'");
-        assertNull(cursor.findColumn("doubleval"), "column lookup succeeded by name - doubleval");
-        assertNull(cursor.findColumn("unknown"), "Valid index for unknown column label");
-
-        while (cursor.next()) {
-            cursorRowCount++;
-            assertThrows(IllegalArgumentException.class, () -> cursor.getColumn(-1));
-            assertEquals(columnMetaDatas.size(), cursor.getColumnCount(), "Unexpected column count. Row number: " + cursorRowCount);
-            assertEquals(cursorRowCount, columnObject(cursor, "rownum"), "Unexpected row number indicator");
-            assertEquals(STRINGVAL, columnObject(cursor, "stringlabel"), "Unexpected column value. Row number: " + cursorRowCount);
-            assertEquals(LONGVAL, columnObject(cursor, "longval"), "Unexpected column value. Row number: " + cursorRowCount);
-            assertEquals(DOUBLEVAL, columnObject(cursor, "doubleLabel"), "Unexpected column value. Row number: " + cursorRowCount);
-            assertThrows(IllegalArgumentException.class, () -> cursor.getColumn(4));
-        }
-
-        assertEquals(rowCount, cursorRowCount, "Unexpected number of rows retrieved from cursor.");
-    }
-
-    private Object columnObject(Cursor cursor, String columnLabel) {
-        return cursor.getColumn(cursor.findColumn(columnLabel));
-    }
-
-    private Row toRow(Object... values) {
-        return new Row(Arrays.asList(values));
-    }
-
-    private ColumnMetaData toColumnMetaData(String name, String type) {
-        return toColumnMetaData(name, type, null);
-
-    }
-
-    private ColumnMetaData toColumnMetaData(String name, String type, String label) {
-        return new ColumnMetaData(new JsonQueryResponse.SchemaEntry(name, type, label));
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/DataSourceTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/DataSourceTests.java
deleted file mode 100644
index 91245e1879..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/DataSourceTests.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.auth.AuthenticationType;
-import org.opensearch.jdbc.config.AuthConnectionProperty;
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.config.HostConnectionProperty;
-import org.opensearch.jdbc.config.LoginTimeoutConnectionProperty;
-import org.opensearch.jdbc.config.PasswordConnectionProperty;
-import org.opensearch.jdbc.config.PortConnectionProperty;
-import org.opensearch.jdbc.config.UserConnectionProperty;
-import org.opensearch.jdbc.test.PerTestWireMockServerExtension;
-import org.opensearch.jdbc.test.WireMockServerHelpers;
-import org.opensearch.jdbc.test.mocks.QueryMock;
-import com.github.tomakehurst.wiremock.WireMockServer;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import javax.sql.DataSource;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-@ExtendWith(PerTestWireMockServerExtension.class)
-public class DataSourceTests implements WireMockServerHelpers {
-
-    @Test
-    void testDataSourceConfig() throws SQLException {
-        OpenSearchDataSource eds = new OpenSearchDataSource();
-
-        Properties props = new Properties();
-        props.setProperty(HostConnectionProperty.KEY, "some-host");
-        props.setProperty(PortConnectionProperty.KEY, "1100");
-        props.setProperty(LoginTimeoutConnectionProperty.KEY, "100");
-        eds.setProperties(props);
-
-        ConnectionConfig config = eds.getConnectionConfig(null);
-
-        assertEquals("some-host", config.getHost());
-        assertEquals(1100, config.getPort());
-        assertEquals(100, config.getLoginTimeout());
-        assertNull(config.getUser());
-        assertNull(config.getPassword());
-        Assertions.assertEquals(AuthenticationType.NONE, config.getAuthenticationType());
-        assertNull(config.getAwsCredentialsProvider());
-    }
-
-    @Test
-    void testDataSourceConfigWithDefaults() throws SQLException {
-        OpenSearchDataSource eds = new OpenSearchDataSource();
-
-        Properties defaults = new Properties();
-        defaults.setProperty(UserConnectionProperty.KEY, "default-user");
-        defaults.setProperty(PasswordConnectionProperty.KEY, "default-pass");
-        defaults.setProperty(AuthConnectionProperty.KEY, "basic");
-
-        Properties props = new Properties(defaults);
-        props.setProperty(HostConnectionProperty.KEY, "some-host");
-        props.setProperty(PortConnectionProperty.KEY, "1100");
-        props.setProperty(LoginTimeoutConnectionProperty.KEY, "100");
-
-        eds.setProperties(props);
-
-        ConnectionConfig config = eds.getConnectionConfig(null);
-
-        assertEquals("some-host", config.getHost());
-        assertEquals(1100, config.getPort());
-        assertEquals(100, config.getLoginTimeout());
-        assertEquals("default-user", config.getUser());
-        assertEquals("default-pass", config.getPassword());
-        assertEquals(AuthenticationType.BASIC, config.getAuthenticationType());
-    }
-
-    @Test
-    void testDataSourceConfigUpdate() throws SQLException {
-        OpenSearchDataSource eds = new OpenSearchDataSource();
-        Properties props = new Properties();
-        props.setProperty(HostConnectionProperty.KEY, "some-host");
-        props.setProperty(PortConnectionProperty.KEY, "1100");
-        props.setProperty(LoginTimeoutConnectionProperty.KEY, "100");
-        eds.setProperties(props);
-
-        props = new Properties();
-        props.setProperty(HostConnectionProperty.KEY, "some-host-updated");
-        props.setProperty(PortConnectionProperty.KEY, "2100");
-        eds.setProperties(props);
-
-        ConnectionConfig config = eds.getConnectionConfig(null);
-
-        assertEquals("some-host-updated", config.getHost());
-        assertEquals(2100, config.getPort());
-        assertEquals(0, config.getLoginTimeout());
-        assertNull(config.getUser());
-        assertNull(config.getPassword());
-    }
-
-    @Test
-    void testDataSourceConfigUpdateWithOverrides() throws SQLException {
-        OpenSearchDataSource eds = new OpenSearchDataSource();
-        Properties props = new Properties();
-        props.setProperty(HostConnectionProperty.KEY, "some-host");
-        props.setProperty(PortConnectionProperty.KEY, "2100");
-        eds.setProperties(props);
-
-        Map<String, Object> overrides = new HashMap<>();
-        overrides.put(UserConnectionProperty.KEY, "override-user");
-        overrides.put(PasswordConnectionProperty.KEY, "override-pass");
-        ConnectionConfig config = eds.getConnectionConfig(overrides);
-
-        assertEquals("some-host", config.getHost());
-        assertEquals(2100, config.getPort());
-        assertEquals(0, config.getLoginTimeout());
-        assertEquals("override-user", config.getUser());
-        assertEquals("override-pass", config.getPassword());
-    }
-
-    @Test
-    void testDataSourceConfigUpdateWithOverridesPrecedence() throws SQLException {
-        OpenSearchDataSource eds = new OpenSearchDataSource();
-        Properties props = new Properties();
-        props.setProperty(HostConnectionProperty.KEY, "some-host");
-        props.setProperty(PortConnectionProperty.KEY, "1100");
-        props.setProperty(LoginTimeoutConnectionProperty.KEY, "100");
-        eds.setProperties(props);
-
-        props = new Properties();
-        props.setProperty(HostConnectionProperty.KEY, "some-host-updated");
-        props.setProperty(PortConnectionProperty.KEY, "2100");
-        props.setProperty(UserConnectionProperty.KEY, "user");
-        props.setProperty(PasswordConnectionProperty.KEY, "pass");
-        eds.setProperties(props);
-
-        ConnectionConfig config = eds.getConnectionConfig(null);
-
-        assertEquals("some-host-updated", config.getHost());
-        assertEquals(2100, config.getPort());
-        assertEquals(0, config.getLoginTimeout());
-        assertEquals("user", config.getUser());
-        assertEquals("pass", config.getPassword());
-
-        Map<String, Object> overrides = new HashMap<>();
-        overrides.put(UserConnectionProperty.KEY, "override-user");
-        overrides.put(PasswordConnectionProperty.KEY, "override-pass");
-        config = eds.getConnectionConfig(overrides);
-
-        assertEquals("some-host-updated", config.getHost());
-        assertEquals(2100, config.getPort());
-        assertEquals(0, config.getLoginTimeout());
-        assertEquals("override-user", config.getUser());
-        assertEquals("override-pass", config.getPassword());
-    }
-
-    @Test
-    void testDataSourceFromUrlNycTaxisQuery(WireMockServer mockServer) throws SQLException, IOException {
-        QueryMock queryMock = new QueryMock.NycTaxisQueryMock();
-        queryMock.setupMockServerStub(mockServer);
-
-        DataSource ds = new OpenSearchDataSource();
-        ((OpenSearchDataSource) ds).setUrl(getBaseURLForMockServer(mockServer));
-
-        Connection con = ds.getConnection();
-        Statement st = con.createStatement();
-        ResultSet rs = assertDoesNotThrow(() -> st.executeQuery(queryMock.getSql()));
-
-        assertNotNull(rs);
-        queryMock.getMockResultSet().assertMatches(rs);
-    }
-
-    @Test
-    void testDataSourceFromPropsNycTaxisQuery(WireMockServer mockServer) throws SQLException, IOException {
-        QueryMock queryMock = new QueryMock.NycTaxisQueryMock();
-        queryMock.setupMockServerStub(mockServer);
-
-        DataSource ds = new OpenSearchDataSource();
-        ((OpenSearchDataSource) ds).setProperties(getConnectionPropertiesForMockServer(mockServer));
-
-        Connection con = ds.getConnection();
-        Statement st = con.createStatement();
-        ResultSet rs = assertDoesNotThrow(() -> st.executeQuery(queryMock.getSql()));
-
-        assertNotNull(rs);
-        queryMock.getMockResultSet().assertMatches(rs);
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/DatabaseMetaDataTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/DatabaseMetaDataTests.java
deleted file mode 100644
index ace0bd7dee..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/DatabaseMetaDataTests.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.DatabaseMetaDataImpl.ColumnMetadataStatement;
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.logging.NoOpLogger;
-import org.opensearch.jdbc.protocol.ClusterMetadata;
-import org.opensearch.jdbc.protocol.ConnectionResponse;
-import org.opensearch.jdbc.protocol.Protocol;
-import org.opensearch.jdbc.protocol.ProtocolFactory;
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-import org.opensearch.jdbc.transport.Transport;
-import org.opensearch.jdbc.transport.TransportFactory;
-import org.opensearch.jdbc.types.OpenSearchType;
-import org.opensearch.jdbc.test.mocks.MockResultSet;
-import org.opensearch.jdbc.test.mocks.MockResultSetMetaData;
-import org.opensearch.jdbc.test.mocks.MockResultSetRows;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-public class DatabaseMetaDataTests {
-
-    @Test
-    void testClusterMetaData() throws ResponseException, IOException, SQLException {
-        Connection con = getMockConnection();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        assertEquals("6.3.2", dbmd.getDatabaseProductVersion());
-        assertEquals(6, dbmd.getDatabaseMajorVersion());
-        assertEquals(3, dbmd.getDatabaseMinorVersion());
-        assertEquals("OpenSearch", dbmd.getDatabaseProductName());
-
-        assertFalse(con.isClosed());
-    }
-
-    @Test
-    void testGetAttributes() throws ResponseException, IOException, SQLException {
-        Connection con = getMockConnection();
-
-        MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                .column("TYPE_CAT")
-                .column("TYPE_SCHEM")
-                .column("TYPE_NAME")
-                .column("ATTR_NAME")
-                .column("DATA_TYPE", OpenSearchType.INTEGER)
-                .column("ATTR_TYPE_NAME")
-                .column("ATTR_SIZE", OpenSearchType.INTEGER)
-                .column("DECIMAL_DIGITS", OpenSearchType.INTEGER)
-                .column("NUM_PREC_RADIX", OpenSearchType.INTEGER)
-                .column("NULLABLE", OpenSearchType.INTEGER)
-                .column("REMARKS")
-                .column("ATTR_DEF")
-                .column("SQL_DATA_TYPE", OpenSearchType.INTEGER)
-                .column("SQL_DATETIME_SUB", OpenSearchType.INTEGER)
-                .column("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER)
-                .column("ORDINAL_POSITION", OpenSearchType.INTEGER)
-                .column("IS_NULLABLE")
-                .column("SCOPE_CATALOG")
-                .column("SCOPE_SCHEMA")
-                .column("SCOPE_TABLE")
-                .column("SOURCE_DATA_TYPE", OpenSearchType.SHORT)
-                .build();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        ResultSet rs = dbmd.getAttributes("", null, null, null);
-
-        new MockResultSet(mockResultSetMetaData, MockResultSetRows.emptyResultSetRows()).assertMatches(rs);
-        assertDoesNotThrow(rs::close);
-    }
-
-    @Test
-    void testGetSuperTables() throws ResponseException, IOException, SQLException {
-        Connection con = getMockConnection();
-
-        MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                .column("TABLE_CAT")
-                .column("TABLE_SCHEM")
-                .column("TABLE_NAME")
-                .column("SUPERTABLE_NAME")
-                .build();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        ResultSet rs = dbmd.getSuperTables("", null, null);
-
-        new MockResultSet(mockResultSetMetaData, MockResultSetRows.emptyResultSetRows()).assertMatches(rs);
-        assertDoesNotThrow(rs::close);
-    }
-
-    @Test
-    void testGetSuperTypes() throws ResponseException, IOException, SQLException {
-        Connection con = getMockConnection();
-
-        MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                .column("TYPE_CAT")
-                .column("TYPE_SCHEM")
-                .column("TYPE_NAME")
-                .column("SUPERTYPE_CAT")
-                .column("SUPERTYPE_SCHEM")
-                .column("SUPERTYPE_NAME")
-                .build();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        ResultSet rs = dbmd.getSuperTypes("", null, null);
-
-        new MockResultSet(mockResultSetMetaData, MockResultSetRows.emptyResultSetRows()).assertMatches(rs);
-        assertDoesNotThrow(rs::close);
-    }
-
-    @Test
-    void testGetUDTs() throws ResponseException, IOException, SQLException {
-        Connection con = getMockConnection();
-
-        MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                .column("TYPE_CAT")
-                .column("TYPE_SCHEM")
-                .column("TYPE_NAME")
-                .column("CLASS_NAME")
-                .column("DATA_TYPE", OpenSearchType.INTEGER)
-                .column("REMARKS")
-                .column("BASE_TYPE", OpenSearchType.SHORT)
-                .build();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        ResultSet rs = dbmd.getUDTs("", null, null, null);
-
-        new MockResultSet(mockResultSetMetaData, MockResultSetRows.emptyResultSetRows()).assertMatches(rs);
-        assertDoesNotThrow(rs::close);
-    }
-
-    @Test
-    void testGetProcedures() throws ResponseException, IOException, SQLException {
-        Connection con = getMockConnection();
-
-        MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                .column("PROCEDURE_CAT")
-                .column("PROCEDURE_SCHEM")
-                .column("PROCEDURE_NAME")
-                .column("RESERVED4")
-                .column("RESERVED5")
-                .column("RESERVED6")
-                .column("REMARKS")
-                .column("PROCEDURE_TYPE", OpenSearchType.SHORT)
-                .column("SPECIFIC_NAME")
-                .build();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        ResultSet rs = dbmd.getProcedures(null, null, null);
-
-        new MockResultSet(mockResultSetMetaData, MockResultSetRows.emptyResultSetRows()).assertMatches(rs);
-        assertDoesNotThrow(rs::close);
-    }
-
-    @Test
-    void testGetProcedureColumns() throws ResponseException, IOException, SQLException {
-        Connection con = getMockConnection();
-
-        MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                .column("PROCEDURE_CAT")
-                .column("PROCEDURE_SCHEM")
-                .column("PROCEDURE_NAME")
-                .column("COLUMN_NAME")
-                .column("COLUMN_TYPE", OpenSearchType.SHORT)
-                .column("DATA_TYPE", OpenSearchType.INTEGER)
-                .column("TYPE_NAME")
-                .column("PRECISION", OpenSearchType.INTEGER)
-                .column("LENGTH", OpenSearchType.INTEGER)
-                .column("SCALE", OpenSearchType.SHORT)
-                .column("RADIX", OpenSearchType.SHORT)
-                .column("NULLABLE", OpenSearchType.SHORT)
-                .column("REMARKS")
-                .column("COLUMN_DEF")
-                .column("SQL_DATA_TYPE", OpenSearchType.INTEGER)
-                .column("SQL_DATETIME_SUB", OpenSearchType.INTEGER)
-                .column("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER)
-                .column("ORDINAL_POSITION", OpenSearchType.INTEGER)
-                .column("IS_NULLABLE")
-                .column("SPECIFIC_NAME")
-                .build();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        ResultSet rs = dbmd.getProcedureColumns("", null, null, null);
-
-        new MockResultSet(mockResultSetMetaData, MockResultSetRows.emptyResultSetRows()).assertMatches(rs);
-        assertDoesNotThrow(rs::close);
-    }
-
-    @Test
-    void testGetFunctions() throws ResponseException, IOException, SQLException {
-        Connection con = getMockConnection();
-
-        MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                .column("FUNCTION_CAT")
-                .column("FUNCTION_SCHEM")
-                .column("FUNCTION_NAME")
-                .column("REMARKS")
-                .column("FUNCTION_TYPE", OpenSearchType.SHORT)
-                .column("SPECIFIC_NAME")
-                .build();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        ResultSet rs = dbmd.getFunctions("", null, null);
-
-        new MockResultSet(mockResultSetMetaData, MockResultSetRows.emptyResultSetRows()).assertMatches(rs);
-        assertDoesNotThrow(rs::close);
-    }
-
-
-    @Test
-    void testGetFunctionColumns() throws ResponseException, IOException, SQLException {
-        Connection con = getMockConnection();
-
-        MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                .column("FUNCTION_CAT")
-                .column("FUNCTION_SCHEM")
-                .column("FUNCTION_NAME")
-                .column("COLUMN_NAME")
-                .column("COLUMN_TYPE", OpenSearchType.SHORT)
-                .column("DATA_TYPE", OpenSearchType.INTEGER)
-                .column("TYPE_NAME")
-                .column("PRECISION", OpenSearchType.INTEGER)
-                .column("LENGTH", OpenSearchType.INTEGER)
-                .column("SCALE", OpenSearchType.SHORT)
-                .column("RADIX", OpenSearchType.SHORT)
-                .column("NULLABLE", OpenSearchType.SHORT)
-                .column("REMARKS")
-                .column("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER)
-                .column("ORDINAL_POSITION", OpenSearchType.INTEGER)
-                .column("IS_NULLABLE")
-                .column("SPECIFIC_NAME")
-                .build();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        ResultSet rs = dbmd.getFunctionColumns("", null, null, null);
-
-        new MockResultSet(mockResultSetMetaData, MockResultSetRows.emptyResultSetRows()).assertMatches(rs);
-        assertDoesNotThrow(rs::close);
-    }
-
-    @Test
-    void testPseudoColumns() throws ResponseException, IOException, SQLException {
-        Connection con = getMockConnection();
-
-        MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                .column("TABLE_CAT")
-                .column("TABLE_SCHEM")
-                .column("TABLE_NAME")
-                .column("COLUMN_NAME")
-                .column("DATA_TYPE", OpenSearchType.INTEGER)
-                .column("COLUMN_SIZE", OpenSearchType.INTEGER)
-                .column("DECIMAL_DIGITS", OpenSearchType.INTEGER)
-                .column("NUM_PREC_RADIX", OpenSearchType.INTEGER)
-                .column("COLUMN_USAGE")
-                .column("REMARKS")
-                .column("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER)
-                .column("IS_NULLABLE")
-                .build();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        ResultSet rs = dbmd.getPseudoColumns("", null, null, null);
-
-        new MockResultSet(mockResultSetMetaData, MockResultSetRows.emptyResultSetRows()).assertMatches(rs);
-        assertDoesNotThrow(rs::close);
-    }
-
-    @Test
-    void testGetCatalogs() throws Exception {
-        Connection con = getMockConnection();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        ResultSet rs = dbmd.getCatalogs();
-
-        getExpectedCatalogsResultSet().assertMatches(rs);
-        assertDoesNotThrow(rs::close);
-    }
-
-    @Test
-    void testGetSchemas() throws Exception {
-        Connection con = getMockConnection();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        ResultSet rs = dbmd.getSchemas();
-
-        getExpectedSchemaResultSet().assertMatches(rs);
-        assertDoesNotThrow(rs::close);
-    }
-
-    @Test
-    void testGetSchemasWithValidPatterns() throws Exception {
-        Connection con = getMockConnection();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        assertValidSchemaResultSet(dbmd.getSchemas(null, null));
-        assertValidSchemaResultSet(dbmd.getSchemas(null, "%"));
-        assertValidSchemaResultSet(dbmd.getSchemas(null, ""));
-        assertValidSchemaResultSet(dbmd.getSchemas("mock-cluster", null));
-        assertValidSchemaResultSet(dbmd.getSchemas("mock-cluster", "%"));
-        assertValidSchemaResultSet(dbmd.getSchemas("mock-cluster", ""));
-    }
-
-    @Test
-    void testGetSchemasWithInvalidPatterns() throws Exception {
-        Connection con = getMockConnection();
-
-        DatabaseMetaData dbmd = con.getMetaData();
-        assertNotNull(dbmd, "DatabaseMetaData is null");
-
-        assertEmptySchemaResultSet(dbmd.getSchemas("", null));
-        assertEmptySchemaResultSet(dbmd.getSchemas("some-cat", "%"));
-        assertEmptySchemaResultSet(dbmd.getSchemas("mock-cluster", "some-schema"));
-        assertEmptySchemaResultSet(dbmd.getSchemas(null, "some-schema"));
-    }
-    
-    @Test
-    void testGetColumnsWithoutColumnNamePattern() throws Exception {
-        Connection con = getMockConnection();
-        
-        ColumnMetadataStatement stmt = new ColumnMetadataStatement((ConnectionImpl)con, "TABLE_%", null, NoOpLogger.INSTANCE);
-        assertEquals("DESCRIBE TABLES LIKE TABLE_%", stmt.sql);
-        assertDoesNotThrow(stmt::close);
-    }
-    
-    @Test
-    void testGetColumnsWithColumnNamePattern() throws Exception {
-        Connection con = getMockConnection();
-        
-        ColumnMetadataStatement stmt = new ColumnMetadataStatement((ConnectionImpl)con, "TABLE_%", "COLUMN_%", NoOpLogger.INSTANCE);
-        assertEquals("DESCRIBE TABLES LIKE TABLE_% COLUMNS LIKE COLUMN_%", stmt.sql);
-        assertDoesNotThrow(stmt::close);
-    }
-
-    private void assertValidSchemaResultSet(ResultSet rs) throws SQLException {
-        getExpectedSchemaResultSet().assertMatches(rs);
-    }
-
-    private void assertEmptySchemaResultSet(ResultSet rs) throws SQLException {
-        getEmptySchemaResultSet().assertMatches(rs);
-    }
-
-    private MockResultSet getExpectedCatalogsResultSet() {
-        MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                .column("TABLE_CAT", OpenSearchType.TEXT)
-                .build();
-
-        MockResultSetRows mockResultSetRows = MockResultSetRows.builder()
-                .row()
-                .column("mock-cluster")
-                .build();
-
-        return new MockResultSet(mockResultSetMetaData, mockResultSetRows);
-    }
-
-
-    private MockResultSet getExpectedSchemaResultSet() {
-        MockResultSetRows mockResultSetRows = MockResultSetRows.builder()
-                .row()
-                .column("")
-                .column("mock-cluster")
-                .build();
-
-        return new MockResultSet(getMockSchemaResultSetMetaData(), mockResultSetRows);
-    }
-
-    private MockResultSet getEmptySchemaResultSet() {
-        return new MockResultSet(getMockSchemaResultSetMetaData(), MockResultSetRows.emptyResultSetRows());
-    }
-
-
-    private MockResultSetMetaData getMockSchemaResultSetMetaData() {
-        return MockResultSetMetaData.builder()
-                .column("TABLE_SCHEM", OpenSearchType.TEXT)
-                .column("TABLE_CATALOG", OpenSearchType.TEXT)
-                .build();
-    }
-
-    private Connection getMockConnection() throws ResponseException, IOException, SQLException {
-        TransportFactory mockTransportFactory = mock(TransportFactory.class);
-        when(mockTransportFactory.getTransport(any(), any(), any()))
-                .thenReturn(mock(Transport.class));
-
-        ProtocolFactory mockProtocolFactory = mock(ProtocolFactory.class);
-        Protocol mockProtocol = mock(Protocol.class);
-
-        when(mockProtocolFactory.getProtocol(any(ConnectionConfig.class), any(Transport.class)))
-                .thenReturn(mockProtocol);
-
-        ClusterMetadata mockClusterMetaData = mock(ClusterMetadata.class);
-        OpenSearchVersion mockEV = mock(OpenSearchVersion.class);
-
-        when(mockEV.getFullVersion()).thenReturn("6.3.2");
-        when(mockEV.getMajor()).thenReturn(6);
-        when(mockEV.getMinor()).thenReturn(3);
-        when(mockEV.getRevision()).thenReturn(2);
-
-        when(mockClusterMetaData.getVersion()).thenReturn(mockEV);
-        when(mockClusterMetaData.getClusterName()).thenReturn("mock-cluster");
-        when(mockClusterMetaData.getClusterUUID()).thenReturn("mock-cluster-uuid");
-
-        ConnectionResponse mockConnectionResponse = mock(ConnectionResponse.class);
-        when(mockConnectionResponse.getClusterMetadata()).thenReturn(mockClusterMetaData);
-
-        when(mockProtocol.connect(anyInt())).thenReturn(mockConnectionResponse);
-
-        Connection con = new ConnectionImpl(mock(ConnectionConfig.class),
-                mockTransportFactory, mockProtocolFactory, NoOpLogger.INSTANCE);
-        return con;
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/DriverTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/DriverTests.java
deleted file mode 100644
index ab209b3978..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/DriverTests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.test.PerClassWireMockServerExtension;
-import org.opensearch.jdbc.test.WireMockServerHelpers;
-import org.opensearch.jdbc.test.mocks.MockOpenSearch;
-import com.github.tomakehurst.wiremock.WireMockServer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Properties;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.jupiter.api.Assertions.*;
-
-@ExtendWith(PerClassWireMockServerExtension.class)
-public class DriverTests implements WireMockServerHelpers {
-
-    @Test
-    public void testConnect(WireMockServer mockServer) throws SQLException {
-        mockServer.stubFor(get(urlEqualTo("/"))
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(MockOpenSearch.INSTANCE.getConnectionResponse())));
-
-        Driver driver = new Driver();
-        Connection con = assertDoesNotThrow(() -> driver.connect(
-                getBaseURLForMockServer(mockServer), (Properties) null));
-
-        assertConnectionOpen(con);
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-    }
-
-
-    private void assertConnectionOpen(final Connection con) {
-        boolean closed = assertDoesNotThrow(con::isClosed);
-        assertTrue(!closed, "Connection is closed");
-    }
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/PreparedStatementTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/PreparedStatementTests.java
deleted file mode 100644
index fe27b353bb..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/PreparedStatementTests.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.logging.NoOpLogger;
-import org.opensearch.jdbc.protocol.ConnectionResponse;
-import org.opensearch.jdbc.protocol.Protocol;
-import org.opensearch.jdbc.protocol.ProtocolFactory;
-import org.opensearch.jdbc.protocol.QueryRequest;
-import org.opensearch.jdbc.protocol.QueryResponse;
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-import org.opensearch.jdbc.test.PerTestWireMockServerExtension;
-import org.opensearch.jdbc.transport.Transport;
-import org.opensearch.jdbc.transport.TransportFactory;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLNonTransientException;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.Properties;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-
-/**
- * PreparedStatement tests
- *
- * @author echo
- * @since 12.03.20
- **/
-@ExtendWith(PerTestWireMockServerExtension.class)
-public class PreparedStatementTests {
-
-    final String sql = "select pickup_datetime, trip_type, passenger_count, " +
-            "fare_amount, extra, vendor_id from nyc_taxis LIMIT 5";
-
-    private static Stream<Arguments> getArgumentsStream() {
-        int[] resultSetTypes = new int[]{ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.TYPE_FORWARD_ONLY};
-        int[] resultSetConcurrencyTypes = new int[]{ResultSet.CONCUR_READ_ONLY, ResultSet.CONCUR_UPDATABLE};
-        int[] resultSetHoldabilityTypes = new int[]{ResultSet.HOLD_CURSORS_OVER_COMMIT, ResultSet.CLOSE_CURSORS_AT_COMMIT};
-        Stream.Builder<Arguments> builder = Stream.builder();
-        for (int resultSetType : resultSetTypes) {
-            for (int resultSetConcurrencyType : resultSetConcurrencyTypes) {
-                for (int resultSetHoldabilityType : resultSetHoldabilityTypes) {
-                    builder.add(Arguments.of(resultSetType, resultSetConcurrencyType, resultSetHoldabilityType));
-                }
-            }
-        }
-        return builder.build();
-    }
-
-    private static Stream<Arguments> resultSetParamsNotSupported() {
-        return getArgumentsStream().filter(a -> !Arrays.deepEquals(a.get(), new Object[]{ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT}));
-    }
-
-    private static Stream<Arguments> resultSetParamsSupported() {
-        return getArgumentsStream().filter(a -> Arrays.deepEquals(a.get(), new Object[]{ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT}));
-    }
-
-    private static Stream<Arguments> resultSetParamsNotSupportedHoldability() {
-        return getArgumentsStream().filter(a -> !Objects.equals(a.get()[0], ResultSet.TYPE_FORWARD_ONLY) || !Objects.equals(a.get()[1], ResultSet.CONCUR_READ_ONLY));
-    }
-
-    @Test
-    void testPreparedStatementExecute() throws ResponseException, IOException, SQLException {
-        try (Connection con = getMockConnection()) {
-            try (PreparedStatement pstm = con.prepareStatement(sql)) {
-                assertTrue(pstm.execute());
-                ResultSet rs = assertDoesNotThrow(() -> pstm.getResultSet());
-                rs.close();
-            }
-        }
-    }
-
-    @ParameterizedTest
-    @MethodSource("resultSetParamsNotSupported")
-    void testPrepareStatementNotSupported(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException, IOException, ResponseException {
-        try (Connection con = getMockConnection()) {
-            assertThrows(SQLNonTransientException.class, () -> con.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability));
-            assertThrows(SQLNonTransientException.class, () -> con.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability));
-        }
-    }
-
-    @ParameterizedTest
-    @MethodSource("resultSetParamsNotSupportedHoldability")
-    void testPrepareStatementNotSupported(int resultSetType, int resultSetConcurrency) throws SQLException, IOException, ResponseException {
-        try (Connection con = getMockConnection()) {
-            assertThrows(SQLNonTransientException.class, () -> con.prepareStatement(sql, resultSetType, resultSetConcurrency));
-            assertThrows(SQLNonTransientException.class, () -> con.createStatement(resultSetType, resultSetConcurrency));
-        }
-    }
-
-    @ParameterizedTest
-    @MethodSource("resultSetParamsSupported")
-    void testPrepareStatementSupported(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException, IOException, ResponseException {
-
-        try (Connection con = getMockConnection()) {
-            try (PreparedStatement pstm = con.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability)) {
-                assertTrue(pstm.execute());
-                ResultSet rs = assertDoesNotThrow(() -> pstm.getResultSet());
-                rs.close();
-                assertDoesNotThrow(() -> con.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability)).close();
-                assertDoesNotThrow(() -> con.prepareStatement(sql, resultSetType, resultSetConcurrency)).close();
-                assertDoesNotThrow(() -> con.createStatement(resultSetType, resultSetConcurrency)).close();
-            }
-        }
-    }
-
-    private Connection getMockConnection() throws IOException, ResponseException, SQLException {
-        TransportFactory tf = mock(TransportFactory.class);
-        ProtocolFactory pf = mock(ProtocolFactory.class);
-        Protocol mockProtocol = mock(Protocol.class);
-
-        when(mockProtocol.connect(anyInt())).thenReturn(mock(ConnectionResponse.class));
-
-        when(tf.getTransport(any(), any(), any()))
-                .thenReturn(mock(Transport.class));
-
-        when(pf.getProtocol(any(ConnectionConfig.class), any(Transport.class)))
-                .thenReturn(mockProtocol);
-
-        when(mockProtocol.execute(any(QueryRequest.class)))
-                .thenReturn(mock(QueryResponse.class));
-        Connection con = new ConnectionImpl(ConnectionConfig.builder().build(), tf, pf, NoOpLogger.INSTANCE);
-        return con;
-    }
-
-    @Test
-    void testEffectiveFetchSizeOnPreparedStatement() throws ResponseException, IOException, SQLException {
-
-        TransportFactory tf = mock(TransportFactory.class);
-        ProtocolFactory pf = mock(ProtocolFactory.class);
-        Protocol mockProtocol = mock(Protocol.class);
-
-        when(mockProtocol.connect(anyInt())).thenReturn(mock(ConnectionResponse.class));
-
-        when(tf.getTransport(any(), any(), any()))
-                .thenReturn(mock(Transport.class));
-
-        when(pf.getProtocol(any(ConnectionConfig.class), any(Transport.class)))
-                .thenReturn(mockProtocol);
-
-        when(mockProtocol.execute(any(QueryRequest.class)))
-                .thenReturn(mock(QueryResponse.class));
-
-        String url = "jdbc:opensearch://localhost:9200?fetchSize=400";
-
-        ConnectionConfig connectionConfig = ConnectionConfig.builder().setUrl(url).build();
-        Connection con = new ConnectionImpl(connectionConfig, tf, pf, NoOpLogger.INSTANCE);
-        PreparedStatement st = con.prepareStatement(sql);
-        assertEquals(st.getFetchSize(), 400);
-        st.close();
-        con.close();
-
-        // Properties override connection string fetchSize
-        Properties properties = new Properties();
-        properties.setProperty("fetchSize", "5000");
-        connectionConfig = ConnectionConfig.builder().setUrl(url).setProperties(properties).build();
-        con = new ConnectionImpl(connectionConfig, tf, pf, NoOpLogger.INSTANCE);
-        st = con.prepareStatement(sql);
-        assertEquals(st.getFetchSize(), 5000);
-        st.close();
-        con.close();
-
-
-        // setFetchSize overrides fetchSize set anywhere
-        connectionConfig = ConnectionConfig.builder().setUrl(url).setProperties(properties).build();
-        con = new ConnectionImpl(connectionConfig, tf, pf, NoOpLogger.INSTANCE);
-        st = con.prepareStatement(sql);
-        st.setFetchSize(200);
-        assertEquals(st.getFetchSize(), 200);
-        st.close();
-        con.close();
-
-    }
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/ResultSetMetaDataTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/ResultSetMetaDataTests.java
deleted file mode 100644
index f5bce94da9..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/ResultSetMetaDataTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.DatabaseMetaDataImpl.ResultSetColumnDescriptor;
-import org.opensearch.jdbc.internal.results.ColumnMetaData;
-import org.opensearch.jdbc.internal.results.Schema;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.sql.SQLException;
-import java.util.Arrays;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-
-/**
- * Unit tests for {@link ResultSetMetaDataImpl}
- */
-public class ResultSetMetaDataTests {
-
-    private ResultSetMetaDataImpl metaData;
-
-    @BeforeEach
-    public void setUp() {
-        ResultSetImpl resultSet = mock(ResultSetImpl.class);
-        Schema schema = new Schema(Arrays.asList(
-            new ColumnMetaData(new ResultSetColumnDescriptor("name", "keyword", null)),
-            new ColumnMetaData(new ResultSetColumnDescriptor("address", "text", null)),
-            new ColumnMetaData(new ResultSetColumnDescriptor("age", "long", null)),
-            new ColumnMetaData(new ResultSetColumnDescriptor("balance", "float", null)),
-            new ColumnMetaData(new ResultSetColumnDescriptor("employer", "nested", null)),
-            new ColumnMetaData(new ResultSetColumnDescriptor("birthday", "timestamp", null))
-        ));
-        metaData = new ResultSetMetaDataImpl(resultSet, schema);
-    }
-
-    @Test
-    public void getColumnTypeNameShouldReturnJDBCType() throws SQLException {
-        assertEquals("VARCHAR", metaData.getColumnTypeName(1));
-        assertEquals("VARCHAR", metaData.getColumnTypeName(2));
-        assertEquals("BIGINT", metaData.getColumnTypeName(3));
-        assertEquals("REAL", metaData.getColumnTypeName(4));
-        assertEquals("STRUCT", metaData.getColumnTypeName(5));
-        assertEquals("TIMESTAMP", metaData.getColumnTypeName(6));
-    }
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/ResultSetTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/ResultSetTests.java
deleted file mode 100644
index 0ef175334b..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/ResultSetTests.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.internal.exceptions.ObjectClosedException;
-import org.opensearch.jdbc.logging.NoOpLogger;
-import org.opensearch.jdbc.protocol.QueryResponse;
-import org.opensearch.jdbc.protocol.http.JsonHttpProtocol;
-import org.opensearch.jdbc.test.TestResources;
-import org.opensearch.jdbc.test.mocks.MockOpenSearch;
-import org.opensearch.jdbc.types.OpenSearchType;
-import org.opensearch.jdbc.test.PerTestWireMockServerExtension;
-import org.opensearch.jdbc.test.WireMockServerHelpers;
-import org.opensearch.jdbc.test.mocks.MockResultSet;
-import org.opensearch.jdbc.test.mocks.MockResultSetRows;
-import org.opensearch.jdbc.test.mocks.MockResultSetMetaData;
-import org.opensearch.jdbc.test.mocks.QueryMock;
-import com.github.tomakehurst.wiremock.WireMockServer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.util.stream.Stream;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.matchingJsonPath;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.mock;
-
-@ExtendWith(PerTestWireMockServerExtension.class)
-public class ResultSetTests implements WireMockServerHelpers {
-
-    @ParameterizedTest
-    @MethodSource("queryMockProvider")
-    void testQueryResultSet(QueryMock queryMock, WireMockServer mockServer) throws SQLException, IOException {
-        queryMock.setupMockServerStub(mockServer);
-
-        Connection con = new Driver().connect(getBaseURLForMockServer(mockServer), null);
-        Statement st = con.createStatement();
-        ResultSet rs = assertDoesNotThrow(() -> st.executeQuery(queryMock.getSql()));
-
-        assertNotNull(rs);
-
-        // prior to ResultSet iteration
-        assertTrue(rs.isBeforeFirst(), "isBeforeFirst not True for non-empty ResultSet before the first next()");
-        SQLException ex = assertThrows(SQLException.class, () -> rs.getObject(1));
-        assertTrue(ex.getMessage().contains("Illegal operation before start of ResultSet"));
-
-        // this will consume the resultSet
-        queryMock.getMockResultSet().assertMatches(rs);
-
-        // post ResultSet iteration
-        assertTrue(rs.isAfterLast(), "isAfterLast not True after end of ResultSet.");
-        assertFalse(rs.isBeforeFirst(), "isBeforeFirst True when isAfterLast is True.");
-        ex = assertThrows(SQLException.class, () -> rs.getObject(1));
-        assertTrue(ex.getMessage().contains("Illegal operation after end of ResultSet"));
-
-        rs.close();
-
-        // post ResultSet close
-        assertTrue(rs.isClosed(), "ResultSet isClosed returns False after call to close it.");
-        assertThrows(ObjectClosedException.class, rs::next);
-        assertThrows(ObjectClosedException.class, rs::isAfterLast);
-        assertThrows(ObjectClosedException.class, rs::isBeforeFirst);
-        assertThrows(ObjectClosedException.class, () -> rs.getObject(1));
-
-        st.close();
-        con.close();
-    }
-
-    private static Stream<Arguments> queryMockProvider() {
-        return Stream.of(
-                Arguments.of(new QueryMock.NycTaxisQueryMock()),
-                Arguments.of(new QueryMock.NycTaxisQueryWithAliasMock())
-        );
-    }
-
-
-
-    @Test
-    void testResultSetOnPaginatedResponse(WireMockServer mockServer) throws SQLException, IOException {
-
-        String queryUrl = JsonHttpProtocol.DEFAULT_SQL_CONTEXT_PATH+"?format=jdbc";
-        final String sql = "SELECT firstname, age FROM accounts LIMIT 12";
-
-        // get Connection stub
-        setupStubForConnect(mockServer, "/");
-
-        // query response stub for initial page
-        mockServer.stubFor(post(urlEqualTo(queryUrl))
-                .withHeader("Accept", equalTo("application/json"))
-                .withHeader("Content-Type", equalTo("application/json"))
-                .withRequestBody(matchingJsonPath("$.query", equalTo(sql)))
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(getResponseBodyFromPath("mock/protocol/json/cursor/queryresponse_accounts_00.json"))));
-
-        // query response stub for second page
-        mockServer.stubFor(post(urlEqualTo(queryUrl))
-                .withHeader("Accept", equalTo("application/json"))
-                .withHeader("Content-Type", equalTo("application/json"))
-                .withRequestBody(matchingJsonPath("$.cursor", equalTo("abcde_1")))
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(getResponseBodyFromPath("mock/protocol/json/cursor/queryresponse_accounts_01.json"))));
-
-        // query response stub for third page
-        mockServer.stubFor(post(urlEqualTo(queryUrl))
-                .withHeader("Accept", equalTo("application/json"))
-                .withHeader("Content-Type", equalTo("application/json"))
-                .withRequestBody(matchingJsonPath("$.cursor", equalTo("abcde_2")))
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(getResponseBodyFromPath("mock/protocol/json/cursor/queryresponse_accounts_02.json"))));
-
-        // query response stub for last page
-        mockServer.stubFor(post(urlEqualTo(queryUrl))
-                .withHeader("Accept", equalTo("application/json"))
-                .withHeader("Content-Type", equalTo("application/json"))
-                .withRequestBody(matchingJsonPath("$.cursor", equalTo("abcde_3")))
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(getResponseBodyFromPath("mock/protocol/json/cursor/queryresponse_accounts_03.json"))));
-
-
-        Connection con = new Driver().connect(getBaseURLForMockServer(mockServer), null);
-        Statement st = con.createStatement();
-        st.setFetchSize(3);
-        ResultSet rs = assertDoesNotThrow(() -> st.executeQuery(sql));
-        int cursorRowCount = 0;
-
-        while(rs.next()) {
-            cursorRowCount++;
-        }
-        assertEquals(12, cursorRowCount, "Unexpected number of rows retrieved from cursor.");
-
-        // test for execute method, mostly used by BI tools like Tableau for example.
-        con = new Driver().connect(getBaseURLForMockServer(mockServer), null);
-        Statement statement = con.createStatement();
-        st.setFetchSize(3);
-        boolean executed = assertDoesNotThrow(() -> statement.execute(sql));
-        assertTrue(executed);
-        rs = statement.getResultSet();
-        cursorRowCount = 0;
-
-        while(rs.next()) {
-            cursorRowCount++;
-        }
-        assertEquals(12, cursorRowCount, "Unexpected number of rows retrieved from cursor.");
-    }
-
-
-    @Test
-    void testNullableFieldsQuery(WireMockServer mockServer) throws SQLException, IOException {
-        QueryMock.NullableFieldsQueryMock queryMock = new QueryMock.NullableFieldsQueryMock();
-
-        queryMock.setupMockServerStub(mockServer);
-
-        Connection con = new Driver().connect(getBaseURLForMockServer(mockServer), null);
-        Statement st = con.createStatement();
-        ResultSet rs = assertDoesNotThrow(() -> st.executeQuery(queryMock.getSql()));
-
-        assertNotNull(rs);
-
-        MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                .column("testBoolean", OpenSearchType.BOOLEAN)
-                .column("docId", OpenSearchType.TEXT)
-                .column("testByte", OpenSearchType.BYTE)
-                .column("testFloat", OpenSearchType.FLOAT)
-                .column("testLong", OpenSearchType.LONG)
-                .column("testShort", OpenSearchType.SHORT)
-                .column("testHalfFloat", OpenSearchType.HALF_FLOAT)
-                .column("testTimeStamp", OpenSearchType.TIMESTAMP)
-                .column("testScaledFloat", OpenSearchType.SCALED_FLOAT)
-                .column("testKeyword", OpenSearchType.KEYWORD)
-                .column("testText", OpenSearchType.TEXT)
-                .column("testDouble", OpenSearchType.DOUBLE)
-                .build();
-
-        MockResultSetRows mockResultSetRows = MockResultSetRows.builder()
-                .row()
-                .column(false, true)
-                .column("2", false)
-                .column((byte) 0, true)
-                .column((float) 22.145135459218345, false)
-                .column((long) 0, true)
-                .column((short) 0, true)
-                .column((float) 24.324234543532153, false)
-                .column(Timestamp.valueOf("2015-01-01 12:10:30"), false)
-                .column((double) 24.324234543532153, false)
-                .column("Test String", false)
-                .column("document3", false)
-                .column((double) 0, true)
-                .row()
-                .column(true, false)
-                .column("1", false)
-                .column((byte) 126, false)
-                .column((float) 0, true)
-                .column((long) 32000320003200030L, false)
-                .column((short) 29000, false)
-                .column((float) 0, true)
-                .column(null, true)
-                .column((double) 0, true)
-                .column(null, true)
-                .column(null, true)
-                .column((double) 22.312423148903218, false)
-                .build();
-
-        MockResultSet mockResultSet = new MockResultSet(mockResultSetMetaData, mockResultSetRows);
-
-        mockResultSet.assertMatches(rs);
-
-        rs.close();
-        con.close();
-    }
-
-    @Test
-    void testResultSetWrapper() throws SQLException {
-        ResultSetImpl rsImpl = new ResultSetImpl(mock(StatementImpl.class), mock(QueryResponse.class), NoOpLogger.INSTANCE);
-
-        assertTrue(rsImpl.isWrapperFor(ResultSet.class),
-                "ResultSet impl returns False for isWrapperFor(ResultSet.class)");
-
-        ResultSet unwrapped = assertDoesNotThrow(() -> rsImpl.unwrap(ResultSet.class),
-                "Unexpected exception when unwrapping ResultSet");
-
-        assertNotNull(unwrapped, "Unwrapped ResultSet null");
-
-        assertFalse(rsImpl.isWrapperFor(mock(ResultSet.class).getClass()),
-                "ResultSet impl returns True for isWrapperFor(mockClass)");
-
-        assertFalse(rsImpl.isWrapperFor(null),
-                "ResultSet impl returns True for isWrapperFor(null)");
-
-        SQLException ex = assertThrows(SQLException.class, () -> rsImpl.unwrap(mock(ResultSet.class).getClass()));
-        assertTrue(ex.getMessage().contains("Unable to unwrap"));
-    }
-
-
-    public String getResponseBodyFromPath(String path) throws IOException {
-        return TestResources.readResourceAsString(path);
-    }
-
-    public void setupStubForConnect(final WireMockServer mockServer, final String contextPath) {
-        // get Connection stub
-        mockServer.stubFor(get(urlEqualTo(contextPath))
-                .withHeader("Accept", equalTo("application/json"))
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(MockOpenSearch.INSTANCE.getConnectionResponse())));
-    }
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/SSLClientAuthTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/SSLClientAuthTests.java
deleted file mode 100644
index 5f730a28b7..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/SSLClientAuthTests.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.config.KeyStoreLocationConnectionProperty;
-import org.opensearch.jdbc.config.KeyStorePasswordConnectionProperty;
-import org.opensearch.jdbc.config.TrustStoreLocationConnectionProperty;
-import org.opensearch.jdbc.config.TrustStorePasswordConnectionProperty;
-import org.opensearch.jdbc.test.TLSServer;
-import org.opensearch.jdbc.test.TestResources;
-import org.opensearch.jdbc.test.mocks.MockOpenSearch;
-import org.eclipse.jetty.server.Server;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junitpioneer.jupiter.TempDirectory;
-
-import java.nio.file.Path;
-import java.sql.Connection;
-import java.util.Properties;
-
-@ExtendWith(TempDirectory.class)
-public class SSLClientAuthTests {
-
-    // WireMockServer has a problem initializing server on TLS from
-    // a password protected JKS keystore. If the issue gets fixed,
-    // these tests can use WireMockServer instead.
-
-    static Server jettyServer;
-    static String connectURL;
-
-    @BeforeAll
-    static void beforeAll(@TempDirectory.TempDir Path tempDir) throws Exception {
-
-        // Start server with SSL enabled and requiring client cert auth
-        Path keyStoreFile = tempDir.resolve("server_keystore");
-        Path trustStoreFile = tempDir.resolve("server_truststore");
-        TestResources.copyResourceToPath(TLSServer.SERVER_KEY_JKS_RESOURCE, keyStoreFile);
-        TestResources.copyResourceToPath(TLSServer.TRUST_CLIENT_JKS_RESOURCE, trustStoreFile);
-        System.out.println("Copied server keystore to: " + keyStoreFile.toAbsolutePath().toString());
-        System.out.println("Copied server truststore to: " + trustStoreFile.toAbsolutePath().toString());
-
-        String host = "localhost";
-        jettyServer = TLSServer.startSecureServer(host,
-                keyStoreFile.toAbsolutePath().toString(),
-                "changeit",
-                "JKS",
-                trustStoreFile.toAbsolutePath().toString(),
-                "changeit",
-                "JKS",
-                true,
-                new TLSServer.MockOpenSearchConnectionHandler());
-
-        connectURL = TLSServer.getBaseURLForConnect(jettyServer);
-        System.out.println("Started on: " + connectURL);
-    }
-
-    @AfterAll
-    static void afterAll() throws Exception {
-        System.out.println("Stopping jetty");
-        jettyServer.stop();
-    }
-
-    @Test
-    void testTLSClientAuth(@TempDirectory.TempDir Path tempDir) throws Exception {
-        Path keyStoreFile = tempDir.resolve("client_keystore");
-        TestResources.copyResourceToPath(TLSServer.CLIENT_KEY_JKS_RESOURCE, keyStoreFile);
-
-        Path trustStoreFile = tempDir.resolve("client_truststore");
-        TestResources.copyResourceToPath(TLSServer.TRUST_SERVER_JKS_RESOURCE, trustStoreFile);
-
-        Properties props = new Properties();
-        props.setProperty(TrustStoreLocationConnectionProperty.KEY, trustStoreFile.toAbsolutePath().toString());
-        props.setProperty(TrustStorePasswordConnectionProperty.KEY, "changeit");
-
-        props.setProperty(KeyStoreLocationConnectionProperty.KEY, keyStoreFile.toAbsolutePath().toString());
-        props.setProperty(KeyStorePasswordConnectionProperty.KEY, "changeit");
-
-        Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(connectURL, props));
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-    }
-
-
-}
-
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/SSLConnectionTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/SSLConnectionTests.java
deleted file mode 100644
index 0a40ca464d..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/SSLConnectionTests.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.config.TrustSelfSignedConnectionProperty;
-import org.opensearch.jdbc.config.TrustStoreLocationConnectionProperty;
-import org.opensearch.jdbc.config.TrustStorePasswordConnectionProperty;
-import org.opensearch.jdbc.test.TLSServer;
-import org.opensearch.jdbc.test.TestResources;
-import org.opensearch.jdbc.test.mocks.MockOpenSearch;
-import org.eclipse.jetty.server.Server;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junitpioneer.jupiter.TempDirectory;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Properties;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@ExtendWith(TempDirectory.class)
-public class SSLConnectionTests {
-
-    // WireMockServer has a problem initializing server on TLS from
-    // a password protected JKS keystore. If the issue gets fixed,
-    // these tests can use WireMockServer instead.
-
-    static Server jettyServer;
-    static String connectURL;
-
-    @BeforeAll
-    static void beforeAll(@TempDirectory.TempDir Path tempDir) throws Exception {
-
-        // Start server with SSL enabled
-        Path keyStoreFile = tempDir.resolve("keystore");
-        TestResources.copyResourceToPath(TLSServer.SERVER_KEY_JKS_RESOURCE, keyStoreFile);
-        System.out.println("Copied keystore to: " + keyStoreFile.toAbsolutePath().toString());
-
-        String host = "localhost";
-        jettyServer = TLSServer.startSecureServer(host,
-                keyStoreFile.toAbsolutePath().toString(),
-                "changeit",
-                "JKS",
-                new TLSServer.MockOpenSearchConnectionHandler());
-
-        connectURL = TLSServer.getBaseURLForConnect(jettyServer);
-        System.out.println("Started on: " + connectURL);
-    }
-
-    @AfterAll
-    static void afterAll() throws Exception {
-        System.out.println("Stopping jetty");
-        jettyServer.stop();
-    }
-
-    @Test
-    void testTrustSelfSignedEnabled() throws Exception {
-        Properties props = new Properties();
-        props.setProperty(TrustSelfSignedConnectionProperty.KEY, "true");
-
-        Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(connectURL, props));
-
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-    }
-
-    @Test
-    void testTrustSelfSignedDisabled() {
-        Properties props = new Properties();
-        props.setProperty(TrustSelfSignedConnectionProperty.KEY, "false");
-
-        SQLException sqle = Assertions.assertThrows(SQLException.class, () -> new Driver().connect(connectURL, props));
-
-        assertNotNull(sqle.getMessage());
-        assertTrue(sqle.getMessage().contains("Connection error"));
-    }
-
-
-    @Test
-    void testTrustSelfSignedDefault() {
-        SQLException sqle = Assertions.assertThrows(SQLException.class, () -> new Driver().connect(connectURL, null));
-
-        assertNotNull(sqle.getMessage());
-        assertTrue(sqle.getMessage().contains("Connection error"));
-    }
-
-    @Test
-    void testTrustCustomCert(@TempDirectory.TempDir Path tempDir) throws IOException, SQLException {
-        Path trustStoreFile = tempDir.resolve("truststore");
-        TestResources.copyResourceToPath(TLSServer.TRUST_SERVER_JKS_RESOURCE, trustStoreFile);
-        System.out.println("Copied truststore to: " + trustStoreFile.toAbsolutePath().toString());
-
-        Properties props = new Properties();
-        props.setProperty(TrustStoreLocationConnectionProperty.KEY, trustStoreFile.toAbsolutePath().toString());
-        props.setProperty(TrustStorePasswordConnectionProperty.KEY, "changeit");
-
-        Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(connectURL, props));
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-    }
-
-}
-
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/SSLHostnameVerificationTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/SSLHostnameVerificationTests.java
deleted file mode 100644
index 81882bfa07..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/SSLHostnameVerificationTests.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.config.HostnameVerificationConnectionProperty;
-import org.opensearch.jdbc.config.TrustSelfSignedConnectionProperty;
-import org.opensearch.jdbc.test.TLSServer;
-import org.opensearch.jdbc.test.TestResources;
-import org.opensearch.jdbc.test.mocks.MockOpenSearch;
-import org.eclipse.jetty.server.Server;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junitpioneer.jupiter.TempDirectory;
-
-import java.nio.file.Path;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Properties;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@ExtendWith(TempDirectory.class)
-public class SSLHostnameVerificationTests {
-
-    // WireMockServer has a problem initializing server on TLS from
-    // a password protected JKS keystore. If the issue gets fixed,
-    // these tests can use WireMockServer instead.
-
-    static Server jettyServer;
-    static String connectURL;
-
-    @BeforeAll
-    static void beforeAll(@TempDirectory.TempDir Path tempDir) throws Exception {
-
-        // Start server with SSL enabled
-        Path keyStoreFile = tempDir.resolve("keystore");
-        TestResources.copyResourceToPath(TLSServer.SERVER_KEY_JKS_RESOURCE_NON_LOCALHOST, keyStoreFile);
-        System.out.println("Copied keystore to: " + keyStoreFile.toAbsolutePath().toString());
-
-        String host = "localhost";
-        jettyServer = TLSServer.startSecureServer(host,
-                keyStoreFile.toAbsolutePath().toString(),
-                "changeit",
-                "JKS",
-                new TLSServer.MockOpenSearchConnectionHandler());
-
-        connectURL = TLSServer.getBaseURLForConnect(jettyServer);
-        System.out.println("Started on: " + connectURL);
-    }
-
-    @AfterAll
-    static void afterAll() throws Exception {
-        System.out.println("Stopping jetty");
-        jettyServer.stop();
-    }
-
-    @Test
-    void testTrustSelfSignedEnabledHostnameVerificationDisabled() throws Exception {
-        Properties props = new Properties();
-        props.setProperty(TrustSelfSignedConnectionProperty.KEY, "true");
-        props.setProperty(HostnameVerificationConnectionProperty.KEY, "false");
-
-        Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(connectURL, props));
-
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con);
-    }
-
-    @Test
-    void testTrustSelfSignedEnabledHostnameVerificationEnabled() throws Exception {
-        Properties props = new Properties();
-        props.setProperty(TrustSelfSignedConnectionProperty.KEY, "true");
-        props.setProperty(HostnameVerificationConnectionProperty.KEY, "true");
-
-        SQLException sqe = Assertions.assertThrows(SQLException.class, () -> new Driver().connect(connectURL, props));
-        assertTrue(sqe.getMessage().contains("javax.net.ssl.SSLPeerUnverifiedException"));
-    }
-
-    @Test
-    void testTrustSelfSignedEnabledHostnameVerificationDefault() throws Exception {
-        Properties props = new Properties();
-        props.setProperty(TrustSelfSignedConnectionProperty.KEY, "true");
-
-        SQLException sqe = Assertions.assertThrows(SQLException.class, () -> new Driver().connect(connectURL, props));
-        assertTrue(sqe.getMessage().contains("javax.net.ssl.SSLPeerUnverifiedException"));
-    }
-
-}
-
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/StatementTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/StatementTests.java
deleted file mode 100644
index 91e95737b5..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/StatementTests.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc;
-
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.logging.NoOpLogger;
-import org.opensearch.jdbc.protocol.ConnectionResponse;
-import org.opensearch.jdbc.protocol.JdbcQueryRequest;
-import org.opensearch.jdbc.protocol.Protocol;
-import org.opensearch.jdbc.protocol.ProtocolFactory;
-import org.opensearch.jdbc.protocol.QueryRequest;
-import org.opensearch.jdbc.protocol.QueryResponse;
-import org.opensearch.jdbc.protocol.exceptions.InternalServerErrorException;
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-import org.opensearch.jdbc.test.PerTestWireMockServerExtension;
-import org.opensearch.jdbc.transport.Transport;
-import org.opensearch.jdbc.transport.TransportFactory;
-import org.opensearch.jdbc.test.WireMockServerHelpers;
-import org.opensearch.jdbc.test.mocks.QueryMock;
-import com.github.tomakehurst.wiremock.WireMockServer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(PerTestWireMockServerExtension.class)
-public class StatementTests implements WireMockServerHelpers {
-
-    @Test
-    void testQueryRequest() throws ResponseException, IOException, SQLException {
-
-        final String sql = "select pickup_datetime, trip_type, passenger_count, " +
-                "fare_amount, extra, vendor_id from nyc_taxis LIMIT 5";
-
-        TransportFactory tf = mock(TransportFactory.class);
-        ProtocolFactory pf = mock(ProtocolFactory.class);
-        Protocol mockProtocol = mock(Protocol.class);
-
-        when(mockProtocol.connect(anyInt())).thenReturn(mock(ConnectionResponse.class));
-
-        when(tf.getTransport(any(), any(), any()))
-                .thenReturn(mock(Transport.class));
-
-        when(pf.getProtocol(any(ConnectionConfig.class), any(Transport.class)))
-                .thenReturn(mockProtocol);
-
-        when(mockProtocol.execute(any(QueryRequest.class)))
-                .thenReturn(mock(QueryResponse.class));
-
-        Connection con = new ConnectionImpl(ConnectionConfig.builder().build(), tf, pf, NoOpLogger.INSTANCE);
-
-        Statement st = con.createStatement();
-        ResultSet rs = assertDoesNotThrow(() -> st.executeQuery(sql));
-
-        JdbcQueryRequest request = new JdbcQueryRequest(sql);
-
-        verify(mockProtocol).execute(request);
-
-        // new ResultSetImpl(mock(StatementImpl.class), mock(QueryResponse.class));
-        st.close();
-        rs.close();
-        con.close();
-    }
-
-
-    @Test
-    void testEffectiveFetchSizeOnStatement() throws ResponseException, IOException, SQLException {
-
-        TransportFactory tf = mock(TransportFactory.class);
-        ProtocolFactory pf = mock(ProtocolFactory.class);
-        Protocol mockProtocol = mock(Protocol.class);
-
-        when(mockProtocol.connect(anyInt())).thenReturn(mock(ConnectionResponse.class));
-
-        when(tf.getTransport(any(), any(), any()))
-                .thenReturn(mock(Transport.class));
-
-        when(pf.getProtocol(any(ConnectionConfig.class), any(Transport.class)))
-                .thenReturn(mockProtocol);
-
-        when(mockProtocol.execute(any(QueryRequest.class)))
-                .thenReturn(mock(QueryResponse.class));
-
-        String url = "jdbc:opensearch://localhost:9200?fetchSize=400";
-
-        ConnectionConfig connectionConfig = ConnectionConfig.builder().setUrl(url).build();
-        Connection con = new ConnectionImpl(connectionConfig, tf, pf, NoOpLogger.INSTANCE);
-        Statement st = con.createStatement();
-        assertEquals(st.getFetchSize(), 400);
-        st.close();
-        con.close();
-
-        // Properties override connection string fetchSize
-        Properties properties = new Properties();
-        properties.setProperty("fetchSize", "5000");
-        connectionConfig = ConnectionConfig.builder().setUrl(url).setProperties(properties).build();
-        con = new ConnectionImpl(connectionConfig, tf, pf, NoOpLogger.INSTANCE);
-        st = con.createStatement();
-        assertEquals(st.getFetchSize(), 5000);
-        st.close();
-        con.close();
-
-
-        // setFetchSize overrides fetchSize set anywhere
-        connectionConfig = ConnectionConfig.builder().setUrl(url).setProperties(properties).build();
-        con = new ConnectionImpl(connectionConfig, tf, pf, NoOpLogger.INSTANCE);
-        st = con.createStatement();
-        st.setFetchSize(200);
-        assertEquals(st.getFetchSize(), 200);
-        st.close();
-        con.close();
-
-    }
-
-    @Test
-    void testQueryInternalServerError(WireMockServer mockServer) throws SQLException, IOException {
-        QueryMock queryMock = new QueryMock.NycTaxisQueryInternalErrorMock();
-
-        queryMock.setupMockServerStub(mockServer);
-
-        Connection con = new Driver().connect(getBaseURLForMockServer(mockServer), null);
-        Statement st = con.createStatement();
-        InternalServerErrorException ex = assertThrows(
-                InternalServerErrorException.class, () -> st.executeQuery(queryMock.getSql()));
-
-        String expectedDetails = "java.lang.NullPointerException\n\t" +
-                "at java.base/java.lang.Thread.run(Thread.java:844)\n";
-
-        assertEquals("error reason", ex.getReason());
-        assertEquals("java.lang.NullPointerException", ex.getType());
-        assertEquals(expectedDetails, ex.getDetails());
-
-        st.close();
-        con.close();
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/config/ConnectionConfigTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/config/ConnectionConfigTests.java
deleted file mode 100644
index d7fd3cf084..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/config/ConnectionConfigTests.java
+++ /dev/null
@@ -1,895 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.config;
-
-import org.opensearch.jdbc.auth.AuthenticationType;
-import org.opensearch.jdbc.internal.util.UrlParser;
-import org.opensearch.jdbc.logging.LogLevel;
-import com.amazonaws.auth.EnvironmentVariableCredentialsProvider;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-import java.net.URISyntaxException;
-import java.util.*;
-import java.util.function.Function;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class ConnectionConfigTests {
-
-    @Test
-    void testConnectionConfigBuilderDefaults() {
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder();
-
-        ConnectionProperty[] conProps = conConfigBuilder.getConnectionProperties();
-
-        // properties start out un-parsed
-        assertTrue(Arrays.stream(conProps).noneMatch(ConnectionProperty::isParsed));
-
-        // no exception with all properties set to default
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        // verify defaults
-        verifyDefaults(conConfig);
-    }
-
-    @Test
-    void testConnectionConfigBuilderDefaultsWithEmptyProps() {
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder()
-                .setPropertyMap(new HashMap<>());
-
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        // verify defaults
-        verifyDefaults(conConfig);
-    }
-
-    @Test
-    void testConnectionConfigHost() {
-        Map<String, Object> props = new HashMap<>();
-
-        // exception with invalid values
-        assertPropertyRejects(HostConnectionProperty.KEY,
-                42,
-                true,
-                false);
-
-        // valid value
-        assertPropertyAccepts(HostConnectionProperty.KEY, ConnectionConfig::getHost,
-                "hostvalue",
-                "host.1234567890+&-$-");
-    }
-
-    @Test
-    void testPortConfig() {
-        // exception with invalid values
-        assertPropertyRejects(PortConnectionProperty.KEY,
-                "invalidValue",
-                -1,
-                "-1",
-                65536,
-                "65536");
-
-        // valid values
-        assertPropertyAccepts(PortConnectionProperty.KEY, ConnectionConfig::getPort,
-                9400,
-                65535);
-
-        assertPropertyAcceptsParsedValue(
-                PortConnectionProperty.KEY, ConnectionConfig::getPort, "9400", 9400);
-    }
-
-    @Test
-    void testFetchSizeConfig() {
-        // exception with invalid values
-        assertPropertyRejects(FetchSizeProperty.KEY,
-                "invalidValue",
-                -1,
-                "-1",
-                "3.14");
-
-        // valid values
-        assertPropertyAccepts(FetchSizeProperty.KEY, ConnectionConfig::getFetchSize,
-                500,
-                0);
-
-        assertPropertyAcceptsParsedValue(
-                FetchSizeProperty.KEY, ConnectionConfig::getFetchSize, "25", 25);
-    }
-
-    @Test
-    void testPathConfig() {
-        // exception with invalid values
-        assertPropertyRejects(PathConnectionProperty.KEY, 42, -1, true, false);
-
-        // valid values
-        assertPropertyAccepts(
-                PathConnectionProperty.KEY,
-                ConnectionConfig::getPath,
-                "somepath",
-                "path/value",
-                "long/path/value/here/1234567890+&-$-"
-        );
-
-        // ignore a single trailing '/' in the user specified Path
-        assertPropertyAcceptsValue(PathConnectionProperty.KEY, ConnectionConfig::getPath, "/context/path/", "/context/path");
-    }
-
-    @Test
-    void testLogOutputConfig() {
-        // exception with invalid values
-        assertPropertyRejects(LogOutputConnectionProperty.KEY, 42);
-
-        // valid values
-        assertPropertyAccepts(
-                LogOutputConnectionProperty.KEY,
-                ConnectionConfig::getLogOutput,
-                "AGeneralPlainString",
-                "some/path/value",
-                "long/nix/path/value/here/1234567890+&-$-.log",
-                "c:\\long\\windows-path\\here\\1234567890+&-$-.log"
-        );
-    }
-
-    @Test
-    void testLogLevelConfig() {
-        // exception with invalid values
-        assertPropertyRejects(LogLevelConnectionProperty.KEY, 42, "unknown", "true", true, false);
-
-        // valid values
-        Arrays.stream(LogLevel.values()).forEach(
-                logLevel -> assertPropertyAcceptsValue(
-                        LogLevelConnectionProperty.KEY,
-                        ConnectionConfig::getLogLevel,
-                        logLevel.name().toLowerCase(), logLevel));
-    }
-
-    @Test
-    void testLoginTimeoutConfig() {
-        // exception with invalid values
-        assertPropertyRejects(LoginTimeoutConnectionProperty.KEY, -1, "invalid", "9999999.5");
-
-        // valid values
-        assertPropertyAccepts(LoginTimeoutConnectionProperty.KEY, ConnectionConfig::getLoginTimeout,
-                6000, 0, 9999999);
-        assertPropertyAcceptsParsedValue(LoginTimeoutConnectionProperty.KEY, ConnectionConfig::getLoginTimeout,
-                "0", 0);
-        assertPropertyAcceptsParsedValue(LoginTimeoutConnectionProperty.KEY, ConnectionConfig::getLoginTimeout,
-                "30", 30);
-        assertPropertyAcceptsParsedValue(LoginTimeoutConnectionProperty.KEY, ConnectionConfig::getLoginTimeout,
-                "6000", 6000);
-        assertPropertyAcceptsParsedValue(LoginTimeoutConnectionProperty.KEY, ConnectionConfig::getLoginTimeout,
-                "9999999", 9999999);
-    }
-
-    @Test
-    void testUseSSLConfig() {
-        assertCommonBooleanPropertyTests(UseSSLConnectionProperty.KEY, ConnectionConfig::isUseSSL);
-    }
-
-    @Test
-    void testRequestCompressionConfig() {
-        assertCommonBooleanPropertyTests(RequestCompressionConnectionProperty.KEY, ConnectionConfig::requestCompression);
-    }
-
-    @Test
-    void testAuthConfig() {
-        // exception with invalid values
-        assertPropertyRejects(AuthConnectionProperty.KEY, 42, "unknown", "true", true, false);
-    }
-
-    @Test
-    void testBasicAuthConfigMissingUsername() {
-        ConnectionConfig.Builder builder = ConnectionConfig.builder();
-        Map<String, Object> props = new HashMap<>();
-
-        props.put(AuthConnectionProperty.KEY, "basic");
-
-        builder.setPropertyMap(props);
-        ConnectionPropertyException ex = assertThrows(ConnectionPropertyException.class, builder::build);
-        assertEquals(AuthConnectionProperty.KEY, ex.getPropertyKey());
-        assertTrue(ex.getMessage() != null && ex.getMessage().contains("requires a valid username"));
-    }
-
-    @Test
-    void testBasicAuthConfigWithUsername() {
-        ConnectionConfig.Builder builder = ConnectionConfig.builder();
-        Map<String, Object> props = new HashMap<>();
-
-        props.put(AuthConnectionProperty.KEY, "basic");
-        props.put(UserConnectionProperty.KEY, "user");
-
-        builder.setPropertyMap(props);
-        ConnectionConfig connectionConfig = assertDoesNotThrow(builder::build);
-        Assertions.assertEquals(AuthenticationType.BASIC, connectionConfig.getAuthenticationType());
-    }
-
-    @Test
-    void testDefaultAuthConfigWithUsername() {
-        ConnectionConfig.Builder builder = ConnectionConfig.builder();
-        Map<String, Object> props = new HashMap<>();
-
-        props.put(UserConnectionProperty.KEY, "some_user");
-
-        builder.setPropertyMap(props);
-        ConnectionConfig connectionConfig = assertDoesNotThrow(builder::build);
-        Assertions.assertEquals(AuthenticationType.BASIC, connectionConfig.getAuthenticationType());
-        assertEquals("some_user", connectionConfig.getUser());
-    }
-
-    @Test
-    void testAwsSigV4AuthConfigWithRegion() {
-        ConnectionConfig.Builder builder = ConnectionConfig.builder();
-        Map<String, Object> props = new HashMap<>();
-
-        props.put(AuthConnectionProperty.KEY, "aws_sigv4");
-        props.put(RegionConnectionProperty.KEY, "us-west-2");
-
-        builder.setPropertyMap(props);
-        ConnectionConfig connectionConfig = assertDoesNotThrow(builder::build);
-        Assertions.assertEquals(AuthenticationType.AWS_SIGV4, connectionConfig.getAuthenticationType());
-    }
-
-    @Test
-    void testAwsSigV4AuthConfigWithoutRegion() {
-        ConnectionConfig.Builder builder = ConnectionConfig.builder();
-        Map<String, Object> props = new HashMap<>();
-
-        props.put(AuthConnectionProperty.KEY, "aws_sigv4");
-
-        builder.setPropertyMap(props);
-        ConnectionPropertyException ex = assertThrows(ConnectionPropertyException.class, builder::build);
-        assertEquals(AuthConnectionProperty.KEY, ex.getPropertyKey());
-        assertTrue(ex.getMessage() != null && ex.getMessage().contains("requires a region"));
-    }
-
-    @Test
-    void testAwsSigV4AuthConfigWithDetectedRegion() {
-        ConnectionConfig.Builder builder = ConnectionConfig.builder();
-        Map<String, Object> props = new HashMap<>();
-
-        props.put(AuthConnectionProperty.KEY, "aws_sigv4");
-        props.put(HostConnectionProperty.KEY, "some-hostname.us-west-1.es.amazonaws.com");
-
-        builder.setPropertyMap(props);
-        ConnectionConfig connectionConfig = assertDoesNotThrow(builder::build);
-        Assertions.assertEquals(AuthenticationType.AWS_SIGV4, connectionConfig.getAuthenticationType());
-        assertEquals("us-west-1", connectionConfig.getRegion());
-    }
-
-    @Test
-    void testRegionConfig() {
-        Map<String, Object> props = new HashMap<>();
-
-        // exception with invalid values
-        assertPropertyRejects(RegionConnectionProperty.KEY,
-                42,
-                true,
-                false);
-
-        // valid values
-        assertPropertyAccepts(RegionConnectionProperty.KEY, ConnectionConfig::getRegion,
-                "region-value",
-                "us-gov-west-1",
-                "ap-southeast-2");
-    }
-
-    @Test
-    void testAwsCredentialsProviderConfig() {
-        assertPropertyRejectsValue(AwsCredentialsProviderProperty.KEY, "Invalid AWS Credentials Provider");
-
-        // The property accepts null and valid AWSCredentialProvider
-        assertPropertyAcceptsValue(AwsCredentialsProviderProperty.KEY, ConnectionConfig::getAwsCredentialsProvider,
-                null);
-        assertPropertyAcceptsValue(AwsCredentialsProviderProperty.KEY, ConnectionConfig::getAwsCredentialsProvider,
-                new EnvironmentVariableCredentialsProvider());
-    }
-
-    @Test
-    void testHostnameVerificationConfig() {
-        assertCommonBooleanPropertyTests(HostnameVerificationConnectionProperty.KEY, ConnectionConfig::hostnameVerification);
-    }
-
-    @Test
-    void testConnectionConfigMultipleProps() {
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder();
-
-        Map<String, Object> props = new HashMap<>();
-
-        // exception when any property invalid
-        props.put(HostConnectionProperty.KEY, "es-host");
-        props.put(PortConnectionProperty.KEY, "9300");
-        props.put(UseSSLConnectionProperty.KEY, "True");
-        props.put(PathConnectionProperty.KEY, "valid/path");
-        props.put(LoginTimeoutConnectionProperty.KEY, -1); // invalid
-        conConfigBuilder.setPropertyMap(props);
-        ConnectionPropertyException ex = assertThrows(ConnectionPropertyException.class, conConfigBuilder::build);
-        assertEquals(LoginTimeoutConnectionProperty.KEY, ex.getPropertyKey());
-
-        props.put(HostConnectionProperty.KEY, "es-host");
-        props.put(PortConnectionProperty.KEY, "9300");
-        props.put(UseSSLConnectionProperty.KEY, "True");
-        props.put(PathConnectionProperty.KEY, 100); // invalid
-        props.put(LoginTimeoutConnectionProperty.KEY, "60");
-        conConfigBuilder.setPropertyMap(props);
-        ex = assertThrows(ConnectionPropertyException.class, conConfigBuilder::build);
-        assertEquals(PathConnectionProperty.KEY, ex.getPropertyKey());
-
-        props.put(HostConnectionProperty.KEY, "es-host");
-        props.put(PortConnectionProperty.KEY, "9300");
-        props.put(UseSSLConnectionProperty.KEY, 5); // invalid
-        props.put(PathConnectionProperty.KEY, "path/value");
-        props.put(LoginTimeoutConnectionProperty.KEY, "60");
-        conConfigBuilder.setPropertyMap(props);
-        ex = assertThrows(ConnectionPropertyException.class, conConfigBuilder::build);
-        assertEquals(UseSSLConnectionProperty.KEY, ex.getPropertyKey());
-
-        props.put(HostConnectionProperty.KEY, "es-host");
-        props.put(PortConnectionProperty.KEY, -5); // invalid
-        props.put(UseSSLConnectionProperty.KEY, "true");
-        props.put(PathConnectionProperty.KEY, "path/value");
-        props.put(LoginTimeoutConnectionProperty.KEY, "60");
-        conConfigBuilder.setPropertyMap(props);
-        ex = assertThrows(ConnectionPropertyException.class, conConfigBuilder::build);
-        assertEquals(PortConnectionProperty.KEY, ex.getPropertyKey());
-
-        props.put(HostConnectionProperty.KEY, new Object()); // invalid
-        props.put(PortConnectionProperty.KEY, "9300");
-        props.put(UseSSLConnectionProperty.KEY, "true");
-        props.put(PathConnectionProperty.KEY, "path/value");
-        props.put(LoginTimeoutConnectionProperty.KEY, "60");
-        conConfigBuilder.setPropertyMap(props);
-        ex = assertThrows(ConnectionPropertyException.class, conConfigBuilder::build);
-        assertEquals(HostConnectionProperty.KEY, ex.getPropertyKey());
-
-        // all valid
-        props.put(HostConnectionProperty.KEY, "es-hostname");
-        props.put(PortConnectionProperty.KEY, "9400");
-        props.put(UseSSLConnectionProperty.KEY, "true");
-        props.put(PathConnectionProperty.KEY, "path/value/1");
-        props.put(LoginTimeoutConnectionProperty.KEY, "90");
-        conConfigBuilder.setPropertyMap(props);
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-        assertEquals("es-hostname", conConfig.getHost());
-        assertEquals(9400, conConfig.getPort());
-        assertTrue(conConfig.isUseSSL());
-        assertEquals("path/value/1", conConfig.getPath());
-        assertEquals(90, conConfig.getLoginTimeout());
-    }
-
-    @Test
-    void testBuildWithProperties() {
-        Properties properties = new Properties();
-
-        properties.setProperty(HostConnectionProperty.KEY, "prop-host");
-        properties.setProperty(LogOutputConnectionProperty.KEY, "prop-log-file");
-        properties.setProperty(PathConnectionProperty.KEY, "prop-path");
-        properties.setProperty(LoginTimeoutConnectionProperty.KEY, "3000");
-        properties.setProperty(UseSSLConnectionProperty.KEY, "true");
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder().setProperties(properties);
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        assertEquals(conConfig.getHost(), "prop-host");
-        assertEquals(conConfig.getLogOutput(), "prop-log-file");
-        assertEquals(conConfig.getPath(), "prop-path");
-        assertEquals(conConfig.getLoginTimeout(), 3000);
-        assertTrue(conConfig.isUseSSL());
-
-        // verify unset properties carry expected defaults
-        assertEquals(conConfig.getPort(), 443); // default with useSSL
-        assertFalse(conConfig.requestCompression());
-    }
-
-    @Test
-    void testBuildWithPropertiesWithDefaults() {
-        Properties defaults = new Properties();
-        defaults.setProperty(PortConnectionProperty.KEY, "1080");
-        defaults.setProperty(LogOutputConnectionProperty.KEY, "default-log-file");
-        defaults.setProperty(LoginTimeoutConnectionProperty.KEY, "1000");
-        defaults.setProperty(UseSSLConnectionProperty.KEY, "true");
-
-        Properties properties = new Properties(defaults);
-        properties.setProperty(HostConnectionProperty.KEY, "prop-host");
-        properties.setProperty(LogOutputConnectionProperty.KEY, "prop-log-file");
-        properties.setProperty(PathConnectionProperty.KEY, "prop-path");
-        properties.setProperty(LoginTimeoutConnectionProperty.KEY, "3000");
-
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder().setProperties(properties);
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        assertEquals(conConfig.getHost(), "prop-host");
-        assertEquals(conConfig.getPort(), 1080); // set from defaults
-        assertEquals(conConfig.getLogOutput(), "prop-log-file"); // default overridden
-        assertEquals(conConfig.getPath(), "prop-path"); // no default
-        assertEquals(conConfig.getLoginTimeout(), 3000); // default overridden
-        assertTrue(conConfig.isUseSSL()); // set from defaults
-    }
-
-    @Test
-    void testBuildWithUrl() {
-        final String url = UrlParser.URL_PREFIX + "https://url-host/?logOutput=url-log-file&loginTimeout=2000";
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder()
-                .setUrl(url);
-
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        assertTrue(conConfig.isUseSSL());
-        assertEquals(conConfig.getHost(), "url-host");
-        assertEquals(conConfig.getPath(), "/");
-        assertEquals(conConfig.getLogOutput(), "url-log-file");
-        assertEquals(conConfig.getLoginTimeout(), 2000);
-
-        // verify unset properties carry expected defaults
-        assertEquals(conConfig.getPort(), 443); // default with useSSL
-        assertFalse(conConfig.requestCompression());
-    }
-
-    @Test
-    void testBuildWithInvalidUrl() {
-        final String url = "https://url-host/?logOutput=url-log-file&loginTimeout=2000";
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder()
-                .setUrl(url);
-
-        ConnectionPropertyException ex = assertThrows(ConnectionPropertyException.class, conConfigBuilder::build);
-        assertNotNull(ex.getCause());
-        assertEquals(URISyntaxException.class, ex.getCause().getClass());
-    }
-
-    @Test
-    void testBuildWithUrlAndProperties() {
-        final String url = UrlParser.URL_PREFIX + "https://url-host/?logOutput=url-log-file&loginTimeout=2000";
-        Properties properties = new Properties();
-
-        properties.setProperty(HostConnectionProperty.KEY, "prop-host");
-        properties.setProperty(PathConnectionProperty.KEY, "prop-path");
-        properties.setProperty(LoginTimeoutConnectionProperty.KEY, "3000");
-        properties.setProperty(UseSSLConnectionProperty.KEY, "false");
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder()
-                .setUrl(url)
-                .setProperties(properties);
-
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        // properties overridden by builder.setProperties( )
-        assertFalse(conConfig.isUseSSL());
-        assertEquals(conConfig.getHost(), "prop-host");
-        assertEquals(conConfig.getPath(), "prop-path");
-        assertEquals(conConfig.getLoginTimeout(), 3000);
-
-        // properties from url
-        assertEquals(conConfig.getLogOutput(), "url-log-file");
-
-        // verify unset properties carry expected defaults
-        assertEquals(conConfig.getPort(), 9200);
-    }
-
-    @Test
-    void testBuildWithUrlAndPropertiesWithDefaults() {
-        final String url = UrlParser.URL_PREFIX + "http://url-host/?logOutput=url-log-file&loginTimeout=2000&user=url-user";
-
-        Properties defaults = new Properties();
-        defaults.setProperty(PortConnectionProperty.KEY, "1080");
-        defaults.setProperty(LogOutputConnectionProperty.KEY, "default-log-file");
-        defaults.setProperty(LoginTimeoutConnectionProperty.KEY, "1000");
-        defaults.setProperty(UseSSLConnectionProperty.KEY, "true");
-
-        Properties properties = new Properties(defaults);
-        properties.setProperty(HostConnectionProperty.KEY, "prop-host");
-        properties.setProperty(LogOutputConnectionProperty.KEY, "prop-log-file");
-        properties.setProperty(PathConnectionProperty.KEY, "prop-path");
-        properties.setProperty(LoginTimeoutConnectionProperty.KEY, "3000");
-
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder()
-                .setUrl(url)
-                .setProperties(properties);
-
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        assertTrue(conConfig.isUseSSL()); // set from defaults
-        assertEquals(conConfig.getHost(), "prop-host");
-        assertEquals(conConfig.getPort(), 1080); // set from defaults
-        assertEquals(conConfig.getLogOutput(), "prop-log-file"); // default overridden
-        assertEquals(conConfig.getPath(), "prop-path"); // no default
-        assertEquals(conConfig.getLoginTimeout(), 3000); // default overridden
-
-        assertEquals(conConfig.getUser(), "url-user"); // from url
-    }
-
-    @Test
-    void testBuildWithPropertyMap() {
-        Map<String, Object> propertyMap = new HashMap<>();
-
-        propertyMap.put(RequestCompressionConnectionProperty.KEY, true);
-        propertyMap.put(HostConnectionProperty.KEY, "prop-host");
-        propertyMap.put(LogOutputConnectionProperty.KEY, "prop-log-file");
-        propertyMap.put(PathConnectionProperty.KEY, "prop-path");
-        propertyMap.put(LoginTimeoutConnectionProperty.KEY, 3000);
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder()
-                .setPropertyMap(propertyMap);
-
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        assertTrue(conConfig.requestCompression());
-        assertEquals(conConfig.getHost(), "prop-host");
-        assertEquals(conConfig.getPort(), 9200); // default
-        assertEquals(conConfig.getLogOutput(), "prop-log-file");
-        assertEquals(conConfig.getPath(), "prop-path");
-        assertEquals(conConfig.getLoginTimeout(), 3000);
-    }
-
-    @Test
-    void testBuildWithUrlAndPropertyMap() {
-        final String url = UrlParser.URL_PREFIX + "http://url-host/?logOutput=url-log-file&loginTimeout=2000&user=url-user";
-
-        Map<String, Object> propertyMap = new HashMap<>();
-
-        propertyMap.put(RequestCompressionConnectionProperty.KEY, true);
-        propertyMap.put(HostConnectionProperty.KEY, "prop-host");
-        propertyMap.put(LogOutputConnectionProperty.KEY, "prop-log-file");
-        propertyMap.put(PathConnectionProperty.KEY, "prop-path");
-        propertyMap.put(LoginTimeoutConnectionProperty.KEY, 3000);
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder()
-                .setUrl(url)
-                .setPropertyMap(propertyMap);
-
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        assertTrue(conConfig.requestCompression());
-        assertEquals("prop-host", conConfig.getHost());
-        assertEquals(9200, conConfig.getPort()); // default
-        assertEquals("prop-log-file", conConfig.getLogOutput());
-        assertEquals("prop-path", conConfig.getPath());
-        assertEquals(3000, conConfig.getLoginTimeout());
-        assertEquals(true, conConfig.requestCompression());
-
-        assertEquals("url-user", conConfig.getUser()); // from url
-    }
-
-    @Test
-    void testBuildWithUrlAndOverrideMap() {
-        final String url = UrlParser.URL_PREFIX + "http://url-host/?logOutput=url-log-file&loginTimeout=2000&user=url-user";
-
-        Map<String, Object> propertyMap = new HashMap<>();
-
-        propertyMap.put(UseSSLConnectionProperty.KEY, true);
-        propertyMap.put(HostConnectionProperty.KEY, "prop-host");
-        propertyMap.put(LogOutputConnectionProperty.KEY, "prop-log-file");
-        propertyMap.put(PathConnectionProperty.KEY, "prop-path");
-        propertyMap.put(LoginTimeoutConnectionProperty.KEY, 3000);
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder()
-                .setUrl(url)
-                .overrideProperties(propertyMap);
-
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        assertTrue(conConfig.isUseSSL());
-        assertEquals("prop-host", conConfig.getHost());
-        assertEquals(443, conConfig.getPort()); // default with useSSL
-        assertEquals("prop-log-file", conConfig.getLogOutput());
-        assertEquals("prop-path", conConfig.getPath());
-        assertEquals(3000, conConfig.getLoginTimeout());
-
-        assertEquals("url-user", conConfig.getUser()); // from url
-    }
-
-    @Test
-    void testBuildWithUrlAndPropertyMapAndOverrides() {
-        final String url = UrlParser.URL_PREFIX + "http://url-host/?logOutput=url-log-file" +
-                "&loginTimeout=2000&user=url-user&password=url-password";
-
-        Map<String, Object> propertyMap = new HashMap<>();
-
-        propertyMap.put(UseSSLConnectionProperty.KEY, true);
-        propertyMap.put(HostConnectionProperty.KEY, "prop-host");
-        propertyMap.put(LogOutputConnectionProperty.KEY, "prop-log-file");
-        propertyMap.put(PathConnectionProperty.KEY, "prop-path");
-        propertyMap.put(LoginTimeoutConnectionProperty.KEY, 3000);
-
-        Map<String, Object> overrideMap = new HashMap<>();
-        overrideMap.put(UseSSLConnectionProperty.KEY, false);
-        overrideMap.put(LoginTimeoutConnectionProperty.KEY, 5000);
-        overrideMap.put(UserConnectionProperty.KEY, "override-user");
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder()
-                .setUrl(url)
-                .setPropertyMap(propertyMap)
-                .overrideProperties(overrideMap);
-
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        assertFalse(conConfig.isUseSSL()); // override
-        assertEquals("prop-host", conConfig.getHost());
-        assertEquals(9200, conConfig.getPort()); // default
-        assertEquals("prop-log-file", conConfig.getLogOutput());
-        assertEquals("prop-path", conConfig.getPath());
-        assertEquals(5000, conConfig.getLoginTimeout()); // override
-
-        assertEquals("override-user", conConfig.getUser()); // override
-        assertEquals("url-password", conConfig.getPassword()); // url
-    }
-
-    @Test
-    void testBuildWithUrlAndPropertyMapAndMultipleOverrides() {
-        final String url = UrlParser.URL_PREFIX + "http://url-host/?logOutput=url-log-file" +
-                "&loginTimeout=2000&user=url-user&password=url-password";
-
-        Map<String, Object> propertyMap = new HashMap<>();
-
-        propertyMap.put(UseSSLConnectionProperty.KEY, true);
-        propertyMap.put(HostConnectionProperty.KEY, "prop-host");
-        propertyMap.put(LogOutputConnectionProperty.KEY, "prop-log-file");
-        propertyMap.put(PathConnectionProperty.KEY, "prop-path");
-        propertyMap.put(LoginTimeoutConnectionProperty.KEY, 3000);
-
-        Map<String, Object> overrideMap1 = new HashMap<>();
-        overrideMap1.put(UseSSLConnectionProperty.KEY, false);
-        overrideMap1.put(LoginTimeoutConnectionProperty.KEY, 5000);
-
-        Map<String, Object> overrideMap2 = new HashMap<>();
-        overrideMap2.put(UseSSLConnectionProperty.KEY, true);
-        overrideMap2.put(UserConnectionProperty.KEY, "override-user");
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder()
-                .setUrl(url)
-                .setPropertyMap(propertyMap)
-                .overrideProperties(overrideMap1)
-                .overrideProperties(overrideMap2);
-
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        assertTrue(conConfig.isUseSSL()); // override 2
-        assertEquals("prop-host", conConfig.getHost());
-        assertEquals(443, conConfig.getPort()); // default with useSSL
-        assertEquals("prop-log-file", conConfig.getLogOutput());
-        assertEquals("prop-path", conConfig.getPath());
-        assertEquals(5000, conConfig.getLoginTimeout()); // override 1
-
-        assertEquals("override-user", conConfig.getUser()); // override 2
-        assertEquals("url-password", conConfig.getPassword()); // url
-    }
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "0, 1, 2", "0, 2, 1",
-            "1, 0, 2", "1, 2, 0",
-            "2, 0, 1", "2, 1, 0"
-    })
-    void testBuildWithUrlAndPropertyMapAndOverridesCombinations(int f, int s, int t) {
-        // Verify that order of invoking ConnectionConfig.Builder methods
-        // does not change the effective behavior
-        final String url = UrlParser.URL_PREFIX + "http://url-host/?logOutput=url-log-file" +
-                "&loginTimeout=2000&user=url-user&password=url-password";
-
-        Map<String, Object> propertyMap = new HashMap<>();
-
-        propertyMap.put(UseSSLConnectionProperty.KEY, true);
-        propertyMap.put(HostConnectionProperty.KEY, "prop-host");
-        propertyMap.put(LogOutputConnectionProperty.KEY, "prop-log-file");
-        propertyMap.put(PathConnectionProperty.KEY, "prop-path");
-        propertyMap.put(LoginTimeoutConnectionProperty.KEY, 3000);
-
-        Map<String, Object> overrideMap = new HashMap<>();
-        overrideMap.put(UseSSLConnectionProperty.KEY, false);
-        overrideMap.put(LoginTimeoutConnectionProperty.KEY, 5000);
-        overrideMap.put(UserConnectionProperty.KEY, "override-user");
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder();
-        Integer[] order = new Integer[]{f, s, t};
-
-        for (int m : order) {
-            switch (m) {
-                case 0:
-                    conConfigBuilder.setUrl(url);
-                    break;
-                case 1:
-                    conConfigBuilder.setPropertyMap(propertyMap);
-                    break;
-                case 2:
-                    conConfigBuilder.overrideProperties(overrideMap);
-                    break;
-            }
-        }
-
-        String message = "order: " + Arrays.toString(order);
-
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build, message);
-
-        assertFalse(conConfig.isUseSSL(), message); // override
-        assertEquals("prop-host", conConfig.getHost(), message);
-        assertEquals(9200, conConfig.getPort(), message); // default
-        assertEquals("prop-log-file", conConfig.getLogOutput(), message);
-        assertEquals("prop-path", conConfig.getPath(), message);
-        assertEquals(5000, conConfig.getLoginTimeout(), message); // override
-
-        assertEquals("override-user", conConfig.getUser(), message); // override
-        assertEquals("url-password", conConfig.getPassword(), message); // url
-    }
-
-    @Test
-    void testBuildWithOverrideMap() {
-        Map<String, Object> propertyMap = new HashMap<>();
-
-        propertyMap.put(UseSSLConnectionProperty.KEY, true);
-        propertyMap.put(HostConnectionProperty.KEY, "prop-host");
-        propertyMap.put(LogOutputConnectionProperty.KEY, "prop-log-file");
-        propertyMap.put(PathConnectionProperty.KEY, "prop-path");
-        propertyMap.put(LoginTimeoutConnectionProperty.KEY, 3000);
-
-        ConnectionConfig.Builder conConfigBuilder = ConnectionConfig.builder()
-                .overrideProperties(propertyMap);
-
-        ConnectionConfig conConfig = assertDoesNotThrow(conConfigBuilder::build);
-
-        assertTrue(conConfig.isUseSSL());
-        assertEquals("prop-host", conConfig.getHost());
-        assertEquals(443, conConfig.getPort()); // default with useSSL
-        assertEquals("prop-log-file", conConfig.getLogOutput());
-        assertEquals("prop-path", conConfig.getPath());
-        assertEquals(3000, conConfig.getLoginTimeout());
-    }
-
-    /**
-     * Common assertions that should pass with any Boolean property
-     *
-     * @param propertyKey property key
-     * @param propertyGetter getter function to retrieve the parsed value
-     *         of the property
-     */
-    private void assertCommonBooleanPropertyTests(String propertyKey, Function<ConnectionConfig, Object> propertyGetter) {
-        // exception with invalid values
-        assertPropertyRejects(propertyKey, -1, 0, 100.5);
-
-        // valid values
-        assertPropertyAccepts(propertyKey, propertyGetter, true, false);
-
-        assertPropertyAcceptsParsedValue(propertyKey, propertyGetter, "true", true);
-        assertPropertyAcceptsParsedValue(propertyKey, propertyGetter, "false", false);
-        assertPropertyAcceptsParsedValue(propertyKey, propertyGetter, "any", false);
-    }
-
-    /**
-     * Helper to assert a {@link ConnectionConfig} accepts specified
-     * objects as values for a property and the actual value of the
-     * property is set exactly same as the specified objects.
-     *
-     * @param key key associated with property
-     * @param propertyGetter getter function to retrieve the parsed value of the property
-     * @param values value objects to set the property value with
-     */
-    private void assertPropertyAccepts(
-            final String key, Function<ConnectionConfig, Object> propertyGetter, final Object... values) {
-        Arrays.stream(values).forEach((value) -> assertPropertyAcceptsValue(key, propertyGetter, value));
-    }
-
-    /**
-     * Helper to assert {@link ConnectionConfig} rejects specified
-     * objects as values for a property.
-     *
-     * @param key key associated with property
-     * @param values value objects to set the property value with
-     */
-    private void assertPropertyRejects(final String key, final Object... values) {
-        Arrays.stream(values).forEach((value) -> assertPropertyRejectsValue(key, value));
-    }
-
-    /**
-     * Helper to assert {@link ConnectionConfig} accepts the specified
-     * object as a value for a property.
-     *
-     * @param key
-     * @param propertyGetter
-     * @param specifiedValue
-     */
-    private void assertPropertyAcceptsValue(
-            final String key, Function<ConnectionConfig, Object> propertyGetter, final Object specifiedValue) {
-        assertPropertyAcceptsValue(key, propertyGetter, specifiedValue, specifiedValue);
-    }
-
-    /**
-     * Helper to assert {@link ConnectionConfig} accepts a specified
-     * object as a value and that the resulting value retrieved from
-     * ConnectionConfig matches the expected value.
-     *
-     * @param key Property key to set
-     * @param propertyGetter Function to retrieve property value from ConnectionConfig
-     * @param specifiedValue Property value to specify when building ConnectionConfig
-     * @param expectedValue Expected value returned from ConnectionConfig
-     */
-    private void assertPropertyAcceptsValue(
-            final String key, Function<ConnectionConfig, Object> propertyGetter,
-            final Object specifiedValue, final Object expectedValue) {
-        ConnectionConfig conConfig = assertConnectionConfigIsBuilt(key, specifiedValue);
-        assertEquals(expectedValue, propertyGetter.apply(conConfig));
-    }
-
-    /**
-     * Helper to assert {@link ConnectionConfig} accepts a specified
-     * object as a value for a property and that the actual value set
-     * on the property matches a specific value.
-     *
-     * @param key key associated with property
-     * @param propertyGetter getter function to retrieve the parsed value of the property
-     * @param specifiedValue value object to set the property with
-     * @param parsedValue expected parsed (actual) value of the property
-     */
-    private void assertPropertyAcceptsParsedValue(
-            final String key, Function<ConnectionConfig, Object> propertyGetter,
-            final Object specifiedValue, final Object parsedValue) {
-        ConnectionConfig conConfig = assertConnectionConfigIsBuilt(key, specifiedValue);
-        assertEquals(parsedValue, propertyGetter.apply(conConfig));
-    }
-
-    /**
-     * Helper to assert a {@link ConnectionConfig} can be built successfully
-     * when a specific property is assigned a certain value.
-     *
-     * @param key key associated with a property
-     * @param specifiedValue value to assign the property
-     *
-     * @return {@link ConnectionConfig} object built with specified property
-     */
-    private ConnectionConfig assertConnectionConfigIsBuilt(final String key, final Object specifiedValue) {
-        ConnectionConfig.Builder builder = ConnectionConfig.builder();
-        Map<String, Object> props = new HashMap<>();
-
-        // exception with invalid values
-        props.put(key, specifiedValue);
-        builder.setPropertyMap(props);
-        return assertDoesNotThrow(builder::build);
-    }
-
-    /**
-     * Helper to assert that building a {@link ConnectionConfig} fails with
-     * an exception if the specified property is assigned a certain value.
-     *
-     * @param key key associated with the property
-     * @param value value to assign to the property
-     */
-    private void assertPropertyRejectsValue(final String key, final Object value) {
-        ConnectionConfig.Builder builder = ConnectionConfig.builder();
-        Map<String, Object> props = new HashMap<>();
-
-        // exception with invalid value
-        props.put(key, value);
-        builder.setPropertyMap(props);
-        ConnectionPropertyException ex = assertThrows(ConnectionPropertyException.class, builder::build);
-        assertEquals(key, ex.getPropertyKey());
-    }
-
-    /**
-     * Verifies property values in a {@link ConnectionConfig} instance match
-     * their expected defaults.
-     *
-     * @param connectionConfig {@link ConnectionConfig} instance to inspect
-     */
-    private void verifyDefaults(ConnectionConfig connectionConfig) {
-        // verify defaults
-        assertEquals(9200, connectionConfig.getPort());
-        assertEquals("", connectionConfig.getPath());
-        assertEquals(0, connectionConfig.getFetchSize());
-        assertEquals("localhost", connectionConfig.getHost());
-        assertEquals(0, connectionConfig.getLoginTimeout());
-        assertFalse(connectionConfig.isUseSSL());
-        assertFalse(connectionConfig.requestCompression());
-        assertEquals(AuthenticationType.NONE, connectionConfig.getAuthenticationType());
-        assertNull(connectionConfig.getRegion());
-        assertEquals(LogLevel.OFF, connectionConfig.getLogLevel());
-        assertTrue(connectionConfig.hostnameVerification());
-    }
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/VersionMatchTest.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/VersionMatchTest.java
deleted file mode 100644
index 6c3c3f920b..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/VersionMatchTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import org.junit.jupiter.api.Test;
-import org.opensearch.jdbc.internal.Version;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class VersionMatchTest {
-
-    @Test
-    void testVersionMatchesBuildGradleVersion() {
-        assertEquals(Version.Current.getFullVersion(), System.getProperty("opensearch_jdbc_version"));
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/util/AwsHostnameUtilTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/util/AwsHostnameUtilTests.java
deleted file mode 100644
index 0ae2d5e01e..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/util/AwsHostnameUtilTests.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.util;
-
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-
-public class AwsHostnameUtilTests {
-
-    /**
-     * Test region name extracted from input hostname is as expected
-     * when the input hostname is a known url format.
-     *
-     * @param hostname hostname to parse
-     * @param expectedRegion expected region value
-     */
-    @ParameterizedTest
-    @CsvSource({
-            "search-domain-name.us-east-1.es.amazonaws.com, us-east-1",
-            "search-domain-name.us-gov-west-1.es.amazonaws.com, us-gov-west-1",
-            "search-domain-name.ap-southeast-2.es.a9.com, ap-southeast-2",
-            "search-domain-name.sub-domain.us-west-2.es.amazonaws.com, us-west-2",
-            "search-us-east-1.us-west-2.es.amazonaws.com, us-west-2",
-    })
-    void testNonNullRegionsFromAwsHostnames(String hostname, String expectedRegion) {
-        assertEquals(expectedRegion, AwsHostNameUtil.parseRegion(hostname));
-    }
-
-    /**
-     * Verify that a region value is not extracted from an input hostname
-     *
-     * @param hostname hostname to parse
-     */
-    @ParameterizedTest
-    @ValueSource(strings = {
-            "search-domain-name.us-east-1.es.amazonaws.co",
-            "search-domain-name.us-gov-west-1.es.amazonaws",
-            "search-domain-name.ap-southeast-2.es.com",
-    })
-    void testNullRegions(String hostname) {
-        String region = AwsHostNameUtil.parseRegion(hostname);
-        assertNull(region, () -> hostname + " returned non-null region: " + region);
-    }
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/util/SqlParserTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/util/SqlParserTests.java
deleted file mode 100644
index 60c6b261b6..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/util/SqlParserTests.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.util;
-
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class SqlParserTests {
-
-    @ParameterizedTest
-    @MethodSource("pameterizedValidSqlProvider")
-    void testQueryParamCount(String sql, int expectedCount) {
-        int paramCount = SqlParser.countParameterMarkers(sql);
-        assertEquals(expectedCount, paramCount,
-                () -> String.format("[%s] returned %d parameters. Expected %d.", sql, paramCount, expectedCount));
-    }
-
-
-    private static Stream<Arguments> pameterizedValidSqlProvider() {
-        return Stream.of(
-                Arguments.of("select X from table", 0),
-                Arguments.of("select X from table where Y='?'", 0),
-
-                // single line comments
-                Arguments.of("select X from table -- where Y=?", 0),
-                Arguments.of("select X from table where Y='?'--", 0),
-                Arguments.of("select X from table where Y='?'--?", 0),
-                Arguments.of("select X from table where Y='?'--some comment ?", 0),
-                Arguments.of("select X from table where Y='?'--some comment ?", 0),
-                Arguments.of("select X from table where Y='?'--some comment", 0),
-
-                // multi and single line comments
-                Arguments.of("select X,Y /* ? \n ? */ from table where Y='?'--some comment ?", 0),
-                Arguments.of("select X,Y /* ? \r\n \n? */ from table where Y='?'--some comment ?", 0),
-                Arguments.of("select X,Y /* ? \n ? */ from table where Y='?'--some comment ?", 0),
-                Arguments.of("select X,Y /* ? ? */ from table where Y='?'--some comment ?", 0),
-
-                // double quotes
-                Arguments.of("select X,Y from table where Y=\"?\"--some comment ?", 0),
-
-                // escaped single quotes
-                Arguments.of("select X,Y from table where Y='''?'--some comment ?", 0),
-
-                // 1 param marker
-                Arguments.of("select X from table where Y='?'--some comment \n and Z=?", 1),
-                Arguments.of("select X from table where Y='?'--some comment \r\n and Z=?", 1),
-                Arguments.of("select X from table where Y='?'--some comment \r\n and Z=? /* \n */ -- and P=?", 1),
-
-                // 2 param markers
-                Arguments.of("select X from table where Y='?'--some comment \r\n and Z=? /* \n */ and P=?", 2),
-
-                // Many param markers
-                Arguments.of("select X from table where A=? and B=? and C=? and D=? and (E=? or F=?) ", 6),
-                Arguments.of("select X from table where A=? \n --- \n and B=? /* ? */ and C=? and \n D=? and (E=? or F=?) ", 6)
-
-        );
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {
-            "select X from table /*",
-            "select X,Y /* ? \n ? from table where Y='?'--some comment ?",
-            "select X,Y /*unterminated-comment ? \n ? from table where A='?' and B='unterminated-literal --some comment \n and c=?"
-    })
-    void testUnterminatedCommentQueries(String sql) {
-
-        IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> SqlParser.countParameterMarkers(sql),
-                () -> String.format("[%s] did not throw an exception. Expected unterminated comment exception.", sql));
-
-        assertNotNull(ex.getMessage());
-        assertTrue(ex.getMessage().contains("unterminated comment"));
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {
-            "select X from table where A='unterminated and B=?",
-            "select X,Y from T where A in (?) \n and B=? and C='unterminated --some comment \n and D=?"
-    })
-    void testUnterminatedStringQueries(String sql) {
-
-        IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> SqlParser.countParameterMarkers(sql),
-                () -> String.format("[%s] did not throw an exception. Expected unterminated string exception.", sql));
-
-        assertNotNull(ex.getMessage());
-        assertTrue(ex.getMessage().contains("unterminated string"));
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/util/UrlParserTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/util/UrlParserTests.java
deleted file mode 100644
index 12ba42e8b5..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/util/UrlParserTests.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.internal.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.opensearch.jdbc.config.HostConnectionProperty;
-import org.opensearch.jdbc.config.PasswordConnectionProperty;
-import org.opensearch.jdbc.config.PathConnectionProperty;
-import org.opensearch.jdbc.config.PortConnectionProperty;
-import org.opensearch.jdbc.config.UseSSLConnectionProperty;
-import org.opensearch.jdbc.config.UserConnectionProperty;
-import org.opensearch.jdbc.test.KeyValuePairs;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import java.net.URISyntaxException;
-import java.util.Properties;
-
-class UrlParserTests {
-
-    @ParameterizedTest
-    @ValueSource(strings = {
-            "jdbc:opensearch://host:9200",
-            "jdbc:opensearch://host:9200/path",
-            "jdbc:opensearch://host:9200/path/",
-            "jdbc:opensearch://host:9200/path?option=value",
-            "jdbc:opensearch://host:9200/path?option=value&option2=value2",
-            "jdbc:opensearch://host/path",
-            "jdbc:opensearch://host/path/",
-            "jdbc:opensearch://host/path?option=value&option2=value2",
-    })
-    void testIsAcceptable(String url) {
-        assertTrue(UrlParser.isAcceptable(url), () -> url + " was not accepted");
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = {
-            "jdbc:opensearch:/",
-            "opensearch://host:9200/path",
-            "jdbc:opensearch:",
-            "jdbc:opensearch",
-            "jdbc://host:9200/"
-    })
-    void testIsNotAcceptable(String url) {
-        assertFalse(UrlParser.isAcceptable(url), () -> url + " was accepted");
-    }
-
-    @Test
-    void testNullNotAcceptable() {
-        assertFalse(UrlParser.isAcceptable(null), "null was accepted");
-    }
-
-    @Test
-    void testPropertiesFromURL() throws URISyntaxException {
-
-        propertiesFromUrl("jdbc:opensearch://")
-                .match(); // empty properties
-
-        propertiesFromUrl("jdbc:opensearch://https://localhost:9200/")
-                .match(
-                        KeyValuePairs.skvp(HostConnectionProperty.KEY, "localhost"),
-                        KeyValuePairs.skvp(PortConnectionProperty.KEY, "9200"),
-                        KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "true"),
-                        KeyValuePairs.skvp(PathConnectionProperty.KEY, "/"));
-
-        propertiesFromUrl("jdbc:opensearch://localhost:9200")
-                .match(
-                        KeyValuePairs.skvp(HostConnectionProperty.KEY, "localhost"),
-                        KeyValuePairs.skvp(PortConnectionProperty.KEY, "9200"),
-                        KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "false"));
-
-        propertiesFromUrl("jdbc:opensearch://es-domain-name.sub.hostname.com:1080")
-                .match(
-                        KeyValuePairs.skvp(HostConnectionProperty.KEY, "es-domain-name.sub.hostname.com"),
-                        KeyValuePairs.skvp(PortConnectionProperty.KEY, "1080"),
-                        KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "false"));
-
-        propertiesFromUrl("jdbc:opensearch://es-domain-name.sub.hostname.com:1090/")
-                .match(
-                        KeyValuePairs.skvp(HostConnectionProperty.KEY, "es-domain-name.sub.hostname.com"),
-                        KeyValuePairs.skvp(PortConnectionProperty.KEY, "1090"),
-                        KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "false"),
-                        KeyValuePairs.skvp(PathConnectionProperty.KEY, "/"));
-
-    }
-
-    @Test
-    public void testPropertiesFromLongUrl() {
-        propertiesFromUrl(
-                "jdbc:opensearch://search-opensearch-es23-dedm-za-1-edmwao5g64rlo3hcohapy2jpru.us-east-1.es.a9.com")
-                .match(
-                        KeyValuePairs.skvp(HostConnectionProperty.KEY,
-                                "search-opensearch-es23-dedm-za-1-edmwao5g64rlo3hcohapy2jpru.us-east-1.es.a9.com"),
-                        KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "false"));
-    }
-
-    @Test
-    public void testPropertiesFromUrlInvalidPrefix() {
-        String url = "jdbc:unknown://https://localhost:9200/";
-
-        URISyntaxException ex = assertThrows(URISyntaxException.class, () -> UrlParser.parseProperties(url));
-        assertTrue(ex.getMessage().contains(UrlParser.URL_PREFIX));
-    }
-
-    @Test
-    public void testPropertiesFromUrlInvalidScheme() {
-        String url = "jdbc:opensearch://tcp://domain-name.sub-domain.com:9023";
-
-        URISyntaxException ex = assertThrows(URISyntaxException.class, () -> UrlParser.parseProperties(url));
-        assertTrue(ex.getMessage().contains("Invalid scheme:tcp"));
-    }
-
-    @Test
-    public void testPropertiesFromUrlHttpsScheme() {
-        String url = "jdbc:opensearch://https://domain-name.sub-domain.com:9023";
-
-        propertiesFromUrl("jdbc:opensearch://https://domain-name.sub-domain.com:9023")
-                .match(
-                        KeyValuePairs.skvp(HostConnectionProperty.KEY, "domain-name.sub-domain.com"),
-                        KeyValuePairs.skvp(PortConnectionProperty.KEY, "9023"),
-                        KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "true"));
-    }
-
-    @Test
-    public void testPropertiesFromUrlHttpsSchemeAndPath() {
-        propertiesFromUrl("jdbc:opensearch://https://domain-name.sub-domain.com:9023/context/path")
-                .match(
-                        KeyValuePairs.skvp(HostConnectionProperty.KEY, "domain-name.sub-domain.com"),
-                        KeyValuePairs.skvp(PortConnectionProperty.KEY, "9023"),
-                        KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "true"),
-                        KeyValuePairs.skvp(PathConnectionProperty.KEY, "/context/path"));
-    }
-
-    @Test
-    public void testPropertiesFromUrlAndQueryString() {
-        propertiesFromUrl("jdbc:opensearch://https://domain-name.sub-domain.com:9023/context/path?" +
-                "user=username123&password=pass@$!w0rd")
-                .match(
-                        KeyValuePairs.skvp(HostConnectionProperty.KEY, "domain-name.sub-domain.com"),
-                        KeyValuePairs.skvp(PortConnectionProperty.KEY, "9023"),
-                        KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "true"),
-                        KeyValuePairs.skvp(PathConnectionProperty.KEY, "/context/path"),
-                        KeyValuePairs.skvp(UserConnectionProperty.KEY, "username123"),
-                        KeyValuePairs.skvp(PasswordConnectionProperty.KEY, "pass@$!w0rd"));
-    }
-
-    @Test
-    public void testPropertiesFromUrlWithInvalidQueryString() {
-        final String url = "jdbc:opensearch://https://domain-name.sub-domain.com:9023/context/path?prop=value=3";
-
-        URISyntaxException ex = assertThrows(URISyntaxException.class, () -> UrlParser.parseProperties(url));
-        assertTrue(ex.getMessage().contains("Expected key=value pairs"));
-    }
-
-    private ConnectionPropertyMatcher propertiesFromUrl(String url) {
-        Properties props = Assertions.assertDoesNotThrow(() -> UrlParser.parseProperties(url),
-                () -> "Exception occurred when parsing URL: " + url);
-        return new ConnectionPropertyMatcher(props);
-    }
-
-    private class ConnectionPropertyMatcher {
-        Properties properties;
-
-        public ConnectionPropertyMatcher(Properties props) {
-            this.properties = props;
-        }
-
-        public void match(KeyValuePairs.StringKvp... keyValuePairs) {
-            assertEquals(KeyValuePairs.toProperties(keyValuePairs), properties);
-        }
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/protocol/JsonHttpProtocolTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/protocol/JsonHttpProtocolTests.java
deleted file mode 100644
index 31351dba5a..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/protocol/JsonHttpProtocolTests.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.protocol;
-
-import org.opensearch.jdbc.config.ConnectionConfig;
-import org.opensearch.jdbc.protocol.exceptions.MalformedResponseException;
-import org.opensearch.jdbc.protocol.exceptions.ResponseException;
-import org.opensearch.jdbc.protocol.http.HttpException;
-import org.opensearch.jdbc.protocol.http.JsonHttpProtocol;
-import org.opensearch.jdbc.protocol.http.JsonHttpProtocolFactory;
-import org.opensearch.jdbc.protocol.http.JsonQueryRequest;
-import org.opensearch.jdbc.protocol.http.JsonQueryResponse;
-import org.opensearch.jdbc.test.mocks.MockCloseableHttpResponseBuilder;
-import org.opensearch.jdbc.test.mocks.MockOpenSearch;
-import org.opensearch.jdbc.test.mocks.MockHttpTransport;
-import org.opensearch.jdbc.test.mocks.QueryMock;
-import org.opensearch.jdbc.transport.TransportException;
-import org.opensearch.jdbc.transport.http.HttpTransport;
-import org.apache.http.Header;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.*;
-
-
-public class JsonHttpProtocolTests {
-
-    @Test
-    void testConnect() throws IOException {
-        CloseableHttpResponse mockResponse = new MockCloseableHttpResponseBuilder()
-                .withHttpReturnCode(200)
-                .withResponseBody(MockOpenSearch.INSTANCE.getConnectionResponse())
-                .build();
-
-        HttpTransport mockTransport = mock(HttpTransport.class);
-
-        ArgumentCaptor<Header[]> captor = ArgumentCaptor.forClass(Header[].class);
-        when(mockTransport.doGet(eq("/"), captor.capture(), isNull(), anyInt()))
-                .thenReturn(mockResponse);
-
-        JsonHttpProtocol protocol = JsonHttpProtocolFactory.INSTANCE.getProtocol(
-                mock(ConnectionConfig.class), mockTransport);
-        ConnectionResponse response = assertDoesNotThrow(() -> protocol.connect(0));
-
-        verify(mockTransport, times(1)).doGet(eq("/"), captor.capture(), isNull(), anyInt());
-
-        assertNotNull(captor.getAllValues(), "No headers captured in request");
-        Header[] headers = captor.getAllValues().get(0);
-
-        assertNotNull(headers, "No headers found in request");
-
-        boolean expectedHeadersPresent = Arrays.stream(headers).anyMatch(
-                (header) -> "Accept".equalsIgnoreCase(header.getName()) &&
-                        "application/json".equals(header.getValue()));
-
-        assertTrue(expectedHeadersPresent, "Expected headers not found in request. Headers received: "
-                + Arrays.toString(headers));
-
-        assertNotNull(response.getClusterMetadata());
-        assertEquals("c1", response.getClusterMetadata().getClusterName());
-        assertEquals("JpZSfOJiSLOntGp0zljpVQ", response.getClusterMetadata().getClusterUUID());
-        assertNotNull(response.getClusterMetadata().getVersion());
-        assertEquals("6.3.1", response.getClusterMetadata().getVersion().getFullVersion());
-        assertEquals(6, response.getClusterMetadata().getVersion().getMajor());
-        assertEquals(3, response.getClusterMetadata().getVersion().getMinor());
-        assertEquals(1, response.getClusterMetadata().getVersion().getRevision());
-    }
-
-
-    @Test
-    void testConnectError() throws IOException {
-        HttpTransport mockTransport = mock(HttpTransport.class);
-
-        CloseableHttpResponse mockResponse = new MockCloseableHttpResponseBuilder()
-                .withHttpReturnCode(404)
-                .build();
-
-        MockHttpTransport.setupConnectionResponse(mockTransport, mockResponse);
-
-        JsonHttpProtocol protocol = new JsonHttpProtocol(mockTransport);
-
-        HttpException ex = assertThrows(HttpException.class, () -> protocol.connect(0));
-        assertEquals(404, ex.getStatusCode());
-    }
-
-
-    @Test
-    void testConnectForbiddenError() throws IOException, TransportException {
-        HttpTransport mockTransport = mock(HttpTransport.class);
-        String responseBody = " {\"Message\":\"User: arn:aws:iam::1010001001000:user/UserId " +
-                "is not authorized to perform: es:ESHttpGet\"}";
-        CloseableHttpResponse mockResponse = new MockCloseableHttpResponseBuilder()
-                .withHttpReturnCode(403)
-                .withContentType("application/json")
-                .withResponseBody(responseBody)
-                .build();
-
-        MockHttpTransport.setupConnectionResponse(mockTransport, mockResponse);
-
-        JsonHttpProtocol protocol = new JsonHttpProtocol(mockTransport);
-
-        HttpException httpException = assertThrows(HttpException.class, () -> protocol.connect(0));
-        assertEquals(403, httpException.getStatusCode());
-        assertNotNull(httpException.getLocalizedMessage(), "HttpException message is null");
-        assertTrue(httpException.getLocalizedMessage().contains(responseBody),
-                "HttpException message does not contain response received");
-    }
-
-    @Test
-    void testConnectMalformedResponse() throws IOException {
-        HttpTransport mockTransport = mock(HttpTransport.class);
-
-        CloseableHttpResponse mockResponse = new MockCloseableHttpResponseBuilder()
-                .withHttpReturnCode(200)
-                .withResponseBody("")
-                .build();
-
-        MockHttpTransport.setupConnectionResponse(mockTransport, mockResponse);
-
-        JsonHttpProtocol protocol = JsonHttpProtocolFactory.INSTANCE.getProtocol(
-                mock(ConnectionConfig.class), mockTransport);
-
-        assertThrows(MalformedResponseException.class, () -> protocol.connect(0));
-    }
-
-    @Test
-    void testQueryResponseNycTaxis() throws IOException {
-        QueryMock queryMock = new QueryMock.NycTaxisQueryMock();
-
-        HttpTransport mockTransport = mock(HttpTransport.class);
-
-        CloseableHttpResponse mockResponse = new MockCloseableHttpResponseBuilder()
-                .withHttpReturnCode(200)
-                .withResponseBody(queryMock.getResponseBody())
-                .build();
-
-        JsonHttpProtocol protocol = JsonHttpProtocolFactory.INSTANCE.getProtocol(
-                mock(ConnectionConfig.class), mockTransport);
-
-        MockHttpTransport.setupQueryResponse(protocol, mockTransport, mockResponse);
-
-        QueryResponse response = assertDoesNotThrow(() -> protocol.execute(buildJsonQueryRequest(queryMock)));
-
-        Assertions.assertEquals(
-                buildJsonQueryResponse(
-                        toSchema(
-                                schemaEntry("pickup_datetime", "timestamp"),
-                                schemaEntry("trip_type", "keyword"),
-                                schemaEntry("passenger_count", "integer"),
-                                schemaEntry("fare_amount", "scaled_float"),
-                                schemaEntry("extra", "scaled_float"),
-                                schemaEntry("vendor_id", "keyword")
-                        ),
-                        toDatarows(
-                                toDatarow("2015-01-01 00:34:42", "1", 1, 5, 0.5, "2"),
-                                toDatarow("2015-01-01 00:34:46", "1", 1, 12, 0.5, "2"),
-                                toDatarow("2015-01-01 00:34:44", "1", 1, 5, 0.5, "1"),
-                                toDatarow("2015-01-01 00:34:48", "1", 1, 5, 0.5, "2"),
-                                toDatarow("2015-01-01 00:34:53", "1", 1, 24.5, 0.5, "2")
-                        ),
-                        5, 1000, 200),
-                response);
-    }
-
-    @Test
-    void testQueryResponseWithAliasesNycTaxis() throws IOException {
-        QueryMock queryMock = new QueryMock.NycTaxisQueryWithAliasMock();
-
-        HttpTransport mockTransport = mock(HttpTransport.class);
-
-        CloseableHttpResponse mockResponse = new MockCloseableHttpResponseBuilder()
-                .withHttpReturnCode(200)
-                .withResponseBody(queryMock.getResponseBody())
-                .build();
-
-        JsonHttpProtocol protocol = JsonHttpProtocolFactory.INSTANCE.getProtocol(
-                mock(ConnectionConfig.class), mockTransport);
-
-        MockHttpTransport.setupQueryResponse(protocol, mockTransport, mockResponse);
-
-        QueryResponse response = assertDoesNotThrow(() -> protocol.execute(buildJsonQueryRequest(queryMock)));
-
-        Assertions.assertEquals(
-                buildJsonQueryResponse(
-                        toSchema(
-                                schemaEntry("pickup_datetime", "timestamp", "pdt"),
-                                schemaEntry("trip_type", "keyword"),
-                                schemaEntry("passenger_count", "integer", "pc"),
-                                schemaEntry("fare_amount", "scaled_float"),
-                                schemaEntry("extra", "scaled_float"),
-                                schemaEntry("vendor_id", "keyword")
-                        ),
-                        toDatarows(
-                                toDatarow("2015-01-01 00:34:42", "1", 1, 5, 0.5, "2"),
-                                toDatarow("2015-01-01 00:34:46", "1", 1, 12, 0.5, "2"),
-                                toDatarow("2015-01-01 00:34:44", "1", 1, 5, 0.5, "1"),
-                                toDatarow("2015-01-01 00:34:48", "1", 1, 5, 0.5, "2"),
-                                toDatarow("2015-01-01 00:34:53", "1", 1, 24.5, 0.5, "2")
-                        ),
-                        5, 1000, 200),
-                response);
-    }
-
-    @Test
-    void testQueryResponseSoNested() throws IOException {
-        QueryMock queryMock = new QueryMock.SoNestedQueryMock();
-
-        HttpTransport mockTransport = mock(HttpTransport.class);
-
-        CloseableHttpResponse mockResponse = new MockCloseableHttpResponseBuilder()
-                .withHttpReturnCode(200)
-                .withResponseBody(queryMock.getResponseBody())
-                .build();
-
-        JsonHttpProtocol protocol = JsonHttpProtocolFactory.INSTANCE.getProtocol(
-                mock(ConnectionConfig.class), mockTransport);
-
-        MockHttpTransport.setupQueryResponse(protocol, mockTransport, mockResponse);
-
-        QueryResponse response = assertDoesNotThrow(() -> protocol.execute(buildJsonQueryRequest(queryMock)));
-
-        Assertions.assertEquals(
-                buildJsonQueryResponse(
-                        toSchema(
-                                schemaEntry("user", "keyword"),
-                                schemaEntry("title", "text"),
-                                schemaEntry("qid", "keyword"),
-                                schemaEntry("creationDate", "timestamp")
-                        ),
-                        toDatarows(
-                                toDatarow("Jash",
-                                        "Display Progress Bar at the Time of Processing",
-                                        "1000000",
-                                        "2009-06-16T07:28:42.770"),
-                                toDatarow("Michael Ecklund (804104)",
-                                        "PHP Sort array by field?",
-                                        "10000005",
-                                        "2012-04-03T19:25:46.213"),
-                                toDatarow("farley (1311218)",
-                                        "Arrays in PHP seems to drop elements",
-                                        "10000007",
-                                        "2012-04-03T19:26:05.400"),
-                                toDatarow("John Strickler (292614)",
-                                        "RESTful servlet URLs - servlet-mapping in web.xml",
-                                        "10000008",
-                                        "2012-04-03T19:26:09.137"),
-                                toDatarow("rahulm (123536)",
-                                        "Descriptor conversion problem",
-                                        "1000001",
-                                        "2009-06-16T07:28:52.333")
-                        ),
-                        5, 20000, 200),
-                response);
-    }
-
-    @Test
-    void testQueryResponseInternalServerError() throws IOException {
-        QueryMock queryMock = new QueryMock.NycTaxisQueryInternalErrorMock();
-
-        HttpTransport mockTransport = mock(HttpTransport.class);
-
-        CloseableHttpResponse mockResponse = new MockCloseableHttpResponseBuilder()
-                .withHttpReturnCode(200)
-                .withResponseBody(queryMock.getResponseBody())
-                .build();
-
-        JsonHttpProtocol protocol = JsonHttpProtocolFactory.INSTANCE.getProtocol(
-                mock(ConnectionConfig.class), mockTransport);
-
-        MockHttpTransport.setupQueryResponse(protocol, mockTransport, mockResponse);
-
-        QueryResponse response = assertDoesNotThrow(() -> protocol.execute(buildJsonQueryRequest(queryMock)));
-
-        JsonQueryResponse.JsonRequestError error = new JsonQueryResponse.JsonRequestError();
-        error.setReason("error reason");
-        error.setType("java.lang.NullPointerException");
-        error.setDetails(
-                "java.lang.NullPointerException\n\t" +
-                        "at java.base/java.lang.Thread.run(Thread.java:844)\n"
-        );
-
-        assertEquals(buildJsonQueryResponse(null, null, 0, 0, 500, error), response);
-    }
-
-    @Test
-    void testQueryResponseSqlPluginPossiblyMissing() throws IOException {
-        QueryMock queryMock = new QueryMock.NycTaxisQueryInternalErrorMock();
-
-        HttpTransport mockTransport = mock(HttpTransport.class);
-
-        String responseBody = "{\"error\":\"Incorrect HTTP method for uri [/_sql?format=jdbc] " +
-                "and method [POST], allowed: [PUT, DELETE, GET, HEAD]\",\"status\":405}";
-
-        CloseableHttpResponse mockResponse = new MockCloseableHttpResponseBuilder()
-                .withHttpReturnCode(405)
-                .withContentType("application/json; charset=UTF-8")
-                .withResponseBody(responseBody)
-                .build();
-
-        JsonHttpProtocol protocol = JsonHttpProtocolFactory.INSTANCE.getProtocol(
-                mock(ConnectionConfig.class), mockTransport);
-
-        MockHttpTransport.setupQueryResponse(protocol, mockTransport, mockResponse);
-
-        ResponseException responseException = assertThrows(ResponseException.class,
-                () -> protocol.execute(buildJsonQueryRequest(queryMock)));
-
-        assertNotNull(responseException.getMessage());
-        assertTrue(responseException.getMessage().contains("Make sure the SQL plugin is installed"));
-
-        Throwable cause = responseException.getCause();
-        assertNotNull(cause, "Expected ResponseException cause to be non-null ");
-        assertTrue(responseException.getCause() instanceof HttpException, () -> "ResponseException cause expected to " +
-                "be of type " + HttpException.class + " but was: " + responseException.getCause().getClass());
-
-        HttpException httpException = (HttpException) cause;
-        assertEquals(405, httpException.getStatusCode());
-        assertNotNull(httpException.getLocalizedMessage(), "HttpException message is null");
-        assertTrue(httpException.getLocalizedMessage().contains(responseBody),
-                "HttpException message does not contain response received");
-
-    }
-
-
-    private JsonQueryRequest buildJsonQueryRequest(QueryMock queryMock) {
-        return buildJsonQueryRequest(queryMock.getSql());
-    }
-
-    private JsonQueryRequest buildJsonQueryRequest(String sql) {
-        return new JsonQueryRequest(new JdbcQueryRequest(sql));
-    }
-
-    private JsonQueryResponse buildJsonQueryResponse(
-            List<JsonQueryResponse.SchemaEntry> schema, List<List<Object>> datarows,
-            int size, int total, int status) {
-        return buildJsonQueryResponse(schema, datarows, size, total, status, null);
-    }
-
-    private JsonQueryResponse buildJsonQueryResponse(
-            List<JsonQueryResponse.SchemaEntry> schema, List<List<Object>> datarows,
-            int size, int total, int status, JsonQueryResponse.JsonRequestError error) {
-        JsonQueryResponse response = new JsonQueryResponse();
-
-        response.setSchema(schema);
-        response.setDatarows(datarows);
-        response.setSize(size);
-        response.setTotal(total);
-        response.setStatus(status);
-        response.setError(error);
-
-        return response;
-    }
-
-    private static List<JsonQueryResponse.SchemaEntry> toSchema(JsonQueryResponse.SchemaEntry... schemaEntries) {
-        return Arrays.asList(schemaEntries);
-    }
-
-    private static JsonQueryResponse.SchemaEntry schemaEntry(String name, String type) {
-        return schemaEntry(name, type, null);
-    }
-
-    private static JsonQueryResponse.SchemaEntry schemaEntry(String name, String type, String label) {
-        return new JsonQueryResponse.SchemaEntry(name, type, label);
-    }
-
-    private static List<List<Object>> toDatarows(List<Object>... values) {
-        return Arrays.asList(values);
-    }
-
-    private static List<Object> toDatarow(Object... values) {
-        return Arrays.asList(values);
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/protocol/http/JsonCursorQueryRequestTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/protocol/http/JsonCursorQueryRequestTests.java
deleted file mode 100644
index b654507834..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/protocol/http/JsonCursorQueryRequestTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.jdbc.protocol.http;
-
-import org.opensearch.jdbc.protocol.JdbcQueryRequest;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-
-public class JsonCursorQueryRequestTests {
-
-    @Test
-    public void testCursorRequestBody() {
-        JdbcQueryRequest jdbcQueryRequest = new JdbcQueryRequest("abcde12345");
-        JsonCursorQueryRequest jsonCursorQueryRequest = new JsonCursorQueryRequest(jdbcQueryRequest);
-        ObjectMapper mapper = new ObjectMapper();
-        String expectedRequestBody = "{\"cursor\":\"abcde12345\"}";
-        String actual = assertDoesNotThrow(() -> mapper.writeValueAsString(jsonCursorQueryRequest));
-        assertEquals(expectedRequestBody, actual);
-
-        assertEquals(0, jsonCursorQueryRequest.getFetchSize());
-        assertEquals(null, jsonCursorQueryRequest.getParameters());
-
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/KeyValuePairs.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/KeyValuePairs.java
deleted file mode 100644
index 2955fcd717..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/KeyValuePairs.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test;
-
-import java.util.AbstractMap;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.function.Supplier;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-
-/**
- * A Factory class for building key-value pair objects
- */
-public class KeyValuePairs {
-
-    public static StringKvp skvp(String key, String value) {
-        return new StringKvp(key, value);
-    }
-
-    /**
-     * Models a key-value pair where both key and value are Strings
-     */
-    public static class StringKvp extends AbstractMap.SimpleImmutableEntry<String, String> {
-
-        public StringKvp(String key, String value) {
-            super(key, value);
-        }
-    }
-
-    public static Properties toProperties(final StringKvp... kvps) {
-        Properties props = new Properties();
-        Arrays.stream(kvps).forEach(kvp -> props.setProperty(kvp.getKey(), kvp.getValue()));
-        return props;
-    }
-
-    public static Map<String, String> toMap(final StringKvp... kvps) {
-        return Arrays.stream(kvps).collect(Collectors.toMap(StringKvp::getKey, StringKvp::getValue));
-    }
-}
-
-
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/PerClassWireMockServerExtension.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/PerClassWireMockServerExtension.java
deleted file mode 100644
index 4bc58d6a40..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/PerClassWireMockServerExtension.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test;
-
-
-import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.common.ConsoleNotifier;
-import org.junit.jupiter.api.extension.*;
-
-import java.lang.reflect.Field;
-
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
-
-
-/**
- * JUnit extension to inject a WireMockServer instance into a
- * {@link WireMockServer} parameter for a Test.
- * <p>
- * Use this extension to reuse a single {@link WireMockServer}
- * instance across all Tests in a class.
- * <p>
- * Since the tests operate on a shared mock server instance,
- * thread safety should be considered if any of the tests
- * are expected to be run in parallel.
- * <p>
- * The extension ensures:
- * <p>
- *     <li>
- *        Before any tests run, a mock server is started..
- *     </li>
- *     <li>
- *         Each Test declaring a {@link WireMockServer} parameter receives
- *         the mock server instance in the parameter.
- *     </li>
- *     <li>
- *         After each test, all request Stub mappings are reset - this
- *         ensures request mappings created in one test never leak into
- *         a subsequent test.
- *     </li>
- *     <li>
- *         After all tests, the mock server is stopped.
- *     </li>
- * </p>
- */
-public class PerClassWireMockServerExtension implements BeforeAllCallback, AfterAllCallback,
-        AfterEachCallback, ParameterResolver {
-
-    private WireMockServer mockServer;
-
-    @Override
-    public void beforeAll(ExtensionContext context) throws Exception {
-        createAndStartMockServer();
-    }
-
-    @Override
-    public void afterEach(ExtensionContext context) throws Exception {
-        mockServer.resetToDefaultMappings();
-    }
-
-    @Override
-    public void afterAll(ExtensionContext context) throws Exception {
-        cleanupMockServer(context);
-    }
-
-    private WireMockServer createAndStartMockServer() {
-        System.out.println("Creating mock server");
-        mockServer = new WireMockServer(options()
-                .dynamicPort()
-                .notifier(new ConsoleNotifier(true)
-                ));
-
-        mockServer.start();
-        return mockServer;
-    }
-
-    private void cleanupMockServer(ExtensionContext context) {
-        if (mockServer != null) {
-            System.out.println("Cleaning up mock server");
-            mockServer.stop();
-            mockServer = null;
-        }
-    }
-
-    @Override
-    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-            throws ParameterResolutionException {
-        return parameterContext.getParameter().getType() == WireMockServer.class;
-    }
-
-    @Override
-    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-            throws ParameterResolutionException {
-        return mockServer;
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/PerTestWireMockServerExtension.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/PerTestWireMockServerExtension.java
deleted file mode 100644
index b0ef3d5f5d..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/PerTestWireMockServerExtension.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test;
-
-
-import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.common.ConsoleNotifier;
-import org.junit.jupiter.api.extension.AfterEachCallback;
-import org.junit.jupiter.api.extension.BeforeEachCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.ParameterContext;
-import org.junit.jupiter.api.extension.ParameterResolutionException;
-import org.junit.jupiter.api.extension.ParameterResolver;
-
-import java.lang.reflect.Field;
-
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
-
-
-/**
- * JUnit extension to inject a WireMockServer instance into a
- * {@link WireMockServer} parameter for a Test.
- *
- * Use this extension to create a new {@link WireMockServer}
- * instance for each Test in a class.
- *
- * The extension ensures:
- * <p>
- *     <li>
- *         Before each test, mock server is started and made available to the Test as a parameter.
- *         Note: if a test does not declare a {@link WireMockServer} parameter, no mock server
- *         instance is created.
- *     </li>
- *     <li>
- *         After the test execution, the mock server is stopped.
- *     </li>
- * </p>
- *
- *
- */
-public class PerTestWireMockServerExtension implements AfterEachCallback, ParameterResolver {
-
-    private WireMockServer mockServer;
-
-    @Override
-    public void afterEach(ExtensionContext context) throws Exception {
-       cleanupMockServer(context);
-    }
-
-    private WireMockServer createAndStartMockServer() {
-        System.out.println("Creating mock server");
-        mockServer = new WireMockServer(options()
-                .dynamicPort()
-                .notifier(new ConsoleNotifier(true)
-                ));
-
-        mockServer.start();
-        return mockServer;
-    }
-
-    private void cleanupMockServer(ExtensionContext context) {
-        if (mockServer != null) {
-            System.out.println("Cleaning up mock server");
-            mockServer.stop();
-            mockServer = null;
-        }
-    }
-
-    @Override
-    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-            throws ParameterResolutionException {
-        return parameterContext.getParameter().getType() == WireMockServer.class;
-    }
-
-    @Override
-    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-            throws ParameterResolutionException {
-        return createAndStartMockServer();
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/TLSServer.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/TLSServer.java
deleted file mode 100644
index 0bc5f6dc8c..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/TLSServer.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test;
-
-import org.opensearch.jdbc.internal.util.UrlParser;
-import org.opensearch.jdbc.test.mocks.MockOpenSearch;
-import org.eclipse.jetty.server.ConnectionFactory;
-import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.HttpConfiguration;
-import org.eclipse.jetty.server.NetworkTrafficServerConnector;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.SecureRequestCustomizer;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import java.io.IOException;
-
-public class TLSServer {
-
-    public static final String TRUST_SERVER_JKS_RESOURCE = "mock/jks/truststore_with_server_cert.jks";
-    public static final String TRUST_CLIENT_JKS_RESOURCE = "mock/jks/truststore_with_client_cert.jks";
-
-    public static final String SERVER_KEY_JKS_RESOURCE = "mock/jks/keystore_with_server_key.jks";
-    public static final String SERVER_KEY_JKS_RESOURCE_NON_LOCALHOST = "mock/jks/keystore_with_non_localhost_server_key.jks";
-    public static final String CLIENT_KEY_JKS_RESOURCE = "mock/jks/keystore_with_client_key.jks";
-
-    public static Server startSecureServer(
-            String host,
-            String keyStorePath,
-            String keyStorePassword,
-            String keyStoreType,
-            Handler handler) throws Exception {
-
-        return startSecureServer(
-                host,
-                keyStorePath,
-                keyStorePassword,
-                keyStoreType,
-                null,
-                null,
-                null,
-                false,
-                handler
-        );
-    }
-
-    public static Server startSecureServer(
-            String host,
-            String keyStorePath,
-            String keyStorePassword,
-            String keyStoreType,
-            String trustStorePath,
-            String trustStorePassword,
-            String trustStoreType,
-            boolean needClientAuth,
-            Handler handler) throws Exception {
-        Server jettyServer = new Server();
-        jettyServer.setStopTimeout(0);
-
-        ServerConnector httpsConnector = null;
-
-        // setup ssl
-        SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
-        sslContextFactory.setKeyStorePath(keyStorePath);
-        sslContextFactory.setKeyStorePassword(keyStorePassword);
-        sslContextFactory.setKeyStoreType(keyStoreType);
-
-        if (trustStorePath != null) {
-            sslContextFactory.setTrustStorePath(trustStorePath);
-            sslContextFactory.setTrustStorePassword(trustStorePassword);
-            sslContextFactory.setTrustStoreType(trustStoreType);
-        }
-        sslContextFactory.setNeedClientAuth(needClientAuth);
-
-        HttpConfiguration httpConfig = new HttpConfiguration();
-        httpConfig.addCustomizer(new SecureRequestCustomizer());
-
-        httpsConnector = createServerConnector(
-                jettyServer,
-                host,
-                0,
-                new org.eclipse.jetty.server.SslConnectionFactory(
-                        sslContextFactory,
-                        "http/1.1"
-                ),
-                new org.eclipse.jetty.server.HttpConnectionFactory(httpConfig)
-        );
-
-        jettyServer.addConnector(httpsConnector);
-        jettyServer.setHandler(handler);
-        jettyServer.start();
-
-        return jettyServer;
-    }
-
-    public static class MockOpenSearchConnectionHandler extends AbstractHandler {
-        @Override
-        public void handle(
-                String target,
-                Request baseRequest,
-                HttpServletRequest request,
-                HttpServletResponse response) throws IOException, ServletException {
-            response.setContentType("application/json");
-            response.setStatus(200);
-            baseRequest.setHandled(true);
-            response.getWriter().write(MockOpenSearch.INSTANCE.getConnectionResponse());
-        }
-    }
-
-    private static ServerConnector createServerConnector(
-            Server jettyServer,
-            String bindAddress,
-            int port,
-            ConnectionFactory... connectionFactories) {
-        NetworkTrafficServerConnector connector = new NetworkTrafficServerConnector(
-                jettyServer,
-                null,
-                null,
-                null,
-                2,
-                2,
-                connectionFactories
-        );
-        connector.setPort(port);
-        connector.setHost(bindAddress);
-
-        return connector;
-    }
-
-    public static String getBaseURLForConnect(Server jettyServer) {
-        int port = -1;
-        String host = null;
-
-        for (Connector c : jettyServer.getConnectors()) {
-            if (c instanceof ServerConnector) {
-                port = ((ServerConnector) c).getLocalPort();
-                host = ((ServerConnector) c).getHost();
-            }
-        }
-
-        return UrlParser.URL_PREFIX + "https://" + host + ":" + port;
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/TestResources.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/TestResources.java
deleted file mode 100644
index eceae792a3..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/TestResources.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-
-public class TestResources {
-
-    public static String readResourceAsString(String resourcePath) throws IOException {
-        InputStream is = getResourceAsStream(resourcePath);
-
-        StringBuilder sb = new StringBuilder();
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                sb.append(line);
-            }
-        }
-        return sb.toString();
-    }
-
-    public static InputStream getResourceAsStream(String resourcePath) throws IOException {
-        InputStream is = TestResources.class.getClassLoader().getResourceAsStream(resourcePath);
-
-        if (is == null) {
-            throw new TestResourcesException("Resource with path: " + resourcePath + " not found!");
-        }
-
-        return is;
-    }
-
-    public static void copyResourceToPath(String resourcePath, Path path) throws IOException {
-        InputStream is = getResourceAsStream(resourcePath);
-
-        Files.copy(is, path, StandardCopyOption.REPLACE_EXISTING);
-    }
-
-    public static class TestResourcesException extends RuntimeException {
-
-        public TestResourcesException() {
-        }
-
-        public TestResourcesException(String message) {
-            super(message);
-        }
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/UTCTimeZoneTestExtension.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/UTCTimeZoneTestExtension.java
deleted file mode 100644
index 969ae7bfed..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/UTCTimeZoneTestExtension.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test;
-
-import org.junit.jupiter.api.extension.AfterEachCallback;
-import org.junit.jupiter.api.extension.BeforeEachCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-
-import java.util.TimeZone;
-
-public class UTCTimeZoneTestExtension implements BeforeEachCallback, AfterEachCallback {
-
-    TimeZone jvmDefaultTimeZone;
-
-    @Override
-    public void afterEach(ExtensionContext context) throws Exception {
-        // restore JVM default timezone
-        TimeZone.setDefault(jvmDefaultTimeZone);
-    }
-
-    @Override
-    public void beforeEach(ExtensionContext context) throws Exception {
-        jvmDefaultTimeZone = TimeZone.getDefault();
-
-        // test case inputs assume default TZ is UTC
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/WireMockServerHelpers.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/WireMockServerHelpers.java
deleted file mode 100644
index c4b0d3ff10..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/WireMockServerHelpers.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test;
-
-import org.opensearch.jdbc.config.HostConnectionProperty;
-import org.opensearch.jdbc.config.PortConnectionProperty;
-import org.opensearch.jdbc.internal.util.UrlParser;
-import com.github.tomakehurst.wiremock.WireMockServer;
-
-import java.util.Properties;
-
-/**
- * Adds {@link WireMockServer} related utility methods for
- * to Tests.
- * <p>
- * Useful for Tests that use WireMockServer extensions.
- */
-public interface WireMockServerHelpers {
-
-    /**
-     * Returns a Driver compatible JDBC connection URL that points to
-     * the {@link WireMockServer} instance specified on a specified
-     * context path.
-     *
-     * @param mockServer {@link WireMockServer} instance
-     * @param contextPath context path to place in the URL
-     *
-     * @return connection URL String
-     */
-    default String getURLForMockServerWithContext(WireMockServer mockServer, String contextPath) {
-        return getBaseURLForMockServer(mockServer) + contextPath;
-    }
-
-    /**
-     * Returns a Driver compatible JDBC connection URL that points to
-     * the {@link WireMockServer} instance specified.
-     *
-     * @param mockServer {@link WireMockServer} instance
-     *
-     * @return connection URL String
-     */
-    default String getBaseURLForMockServer(WireMockServer mockServer) {
-        // Change this in case 'localhost' is not ok to use in
-        // all environments
-        return UrlParser.URL_PREFIX + "localhost:" + mockServer.port();
-    }
-
-    /**
-     * Returns a {@link Properties} object populated with connection
-     * properties needed to establish a connection to the
-     * {@link WireMockServer} instance specified.
-     *
-     * @param mockServer {@link WireMockServer} instance
-     *
-     * @return Properties object
-     */
-    default Properties getConnectionPropertiesForMockServer(WireMockServer mockServer) {
-        Properties properties = new Properties();
-
-        properties.setProperty(HostConnectionProperty.KEY, "localhost");
-        properties.setProperty(PortConnectionProperty.KEY, String.valueOf(mockServer.port()));
-
-        return properties;
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockCloseableHttpResponseBuilder.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockCloseableHttpResponseBuilder.java
deleted file mode 100644
index ef96ac39e8..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockCloseableHttpResponseBuilder.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test.mocks;
-
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.StatusLine;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.message.BasicHeader;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class MockCloseableHttpResponseBuilder {
-
-    private int httpCode;
-    private String responseBody;
-    private Header contentTypeHeader;
-
-    public MockCloseableHttpResponseBuilder withHttpReturnCode(int httpCode) {
-        this.httpCode = httpCode;
-        return this;
-    }
-
-    public MockCloseableHttpResponseBuilder withResponseBody(String responseBody) {
-        this.responseBody = responseBody;
-        return this;
-    }
-
-    public MockCloseableHttpResponseBuilder withContentType(String contentType) {
-        this.contentTypeHeader = new BasicHeader("content-type", contentType);
-        return this;
-    }
-
-    public CloseableHttpResponse build() throws IOException {
-        StatusLine mockStatusLine = mock(StatusLine.class);
-        HttpEntity mockEntity = mock(HttpEntity.class);
-
-        CloseableHttpResponse mockResponse = mock(CloseableHttpResponse.class);
-        when(mockResponse.getStatusLine()).thenReturn(mockStatusLine);
-        when(mockStatusLine.getStatusCode()).thenReturn(httpCode);
-        when(mockResponse.getEntity()).thenReturn(mockEntity);
-        when(mockEntity.getContentType()).thenReturn(contentTypeHeader);
-
-        // this mimics a real stream that can be consumed just once
-        // as is the case with a server response. This makes this mock
-        // response object single-use with regards to reading the
-        // response content.
-        when(mockEntity.getContent()).thenReturn(responseBody == null ? null
-                        : new ByteArrayInputStream(responseBody.getBytes("UTF-8")));
-        return mockResponse;
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockHttpTransport.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockHttpTransport.java
deleted file mode 100644
index a9cdcc22cd..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockHttpTransport.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test.mocks;
-
-import org.opensearch.jdbc.protocol.http.JsonHttpProtocol;
-import org.opensearch.jdbc.transport.TransportException;
-import org.opensearch.jdbc.transport.http.HttpParam;
-import org.opensearch.jdbc.transport.http.HttpTransport;
-import org.apache.http.Header;
-import org.apache.http.client.methods.CloseableHttpResponse;
-
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.when;
-
-public class MockHttpTransport {
-
-    public static void setupConnectionResponse(HttpTransport mockTransport, CloseableHttpResponse mockResponse)
-            throws TransportException {
-        when(mockTransport.doGet(eq("/"), any(Header[].class), any(), anyInt()))
-                .thenReturn(mockResponse);
-    }
-
-    public static void setupQueryResponse(JsonHttpProtocol protocol,
-                                          HttpTransport mockTransport, CloseableHttpResponse mockResponse)
-            throws TransportException {
-        when(mockTransport.doPost(
-                eq(protocol.getSqlContextPath()), any(Header[].class), any(HttpParam[].class), anyString(), anyInt()))
-                .thenReturn(mockResponse);
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockOpenSearch.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockOpenSearch.java
deleted file mode 100644
index 3bbd70af70..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockOpenSearch.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test.mocks;
-
-import org.opensearch.jdbc.OpenSearchConnection;
-
-import java.sql.SQLException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-/**
- * Utility class for obtaining mocked OpenSearch responses for tests.
- */
-public class MockOpenSearch {
-    // can be turned into a mock that can serve OpenSearch version specific
-    // responses
-    public static final MockOpenSearch INSTANCE = new MockOpenSearch();
-
-    private MockOpenSearch() {
-
-    }
-
-    public String getConnectionResponse() {
-        return "{\n" +
-                "  \"name\" : \"NniGzjJ\",\n" +
-                "  \"cluster_name\" : \"c1\",\n" +
-                "  \"cluster_uuid\" : \"JpZSfOJiSLOntGp0zljpVQ\",\n" +
-                "  \"version\" : {\n" +
-                "    \"number\" : \"6.3.1\",\n" +
-                "    \"build_flavor\" : \"default\",\n" +
-                "    \"build_type\" : \"zip\",\n" +
-                "    \"build_hash\" : \"4736258\",\n" +
-                "    \"build_date\" : \"2018-10-11T03:50:25.929309Z\",\n" +
-                "    \"build_snapshot\" : true,\n" +
-                "    \"lucene_version\" : \"7.3.1\",\n" +
-                "    \"minimum_wire_compatibility_version\" : \"5.6.0\",\n" +
-                "    \"minimum_index_compatibility_version\" : \"5.0.0\"\n" +
-                "  },\n" +
-                "  \"tagline\" : \"You Know, for Search\"\n" +
-                "}";
-    }
-
-    public void assertMockOpenSearchConnectionResponse(OpenSearchConnection openSearchCon) throws SQLException {
-        assertEquals("c1", openSearchCon.getClusterName());
-        assertEquals("JpZSfOJiSLOntGp0zljpVQ", openSearchCon.getClusterUUID());
-
-        assertNotNull(openSearchCon.getMetaData().getDatabaseProductVersion());
-        assertEquals("6.3.1", openSearchCon.getMetaData().getDatabaseProductVersion());
-        assertEquals(6, openSearchCon.getMetaData().getDatabaseMajorVersion());
-        assertEquals(3, openSearchCon.getMetaData().getDatabaseMinorVersion());
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockResultSet.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockResultSet.java
deleted file mode 100644
index 87851baa1e..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockResultSet.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.jdbc.test.mocks;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class MockResultSet {
-
-    MockResultSetMetaData mockResultSetMetaData;
-    MockResultSetRows mockResultSetRows;
-
-    public MockResultSet(MockResultSetMetaData mockResultSetMetaData, MockResultSetRows mockResultSetRows) {
-        if (mockResultSetMetaData == null || mockResultSetRows == null) {
-            throw new IllegalArgumentException("Neither metadata nor rows can be null");
-        }
-
-        if (!mockResultSetRows.isEmpty() && mockResultSetMetaData.getColumnCount() != mockResultSetRows.getColumnCount()) {
-            throw new IllegalArgumentException(
-                    "Column count mismatch. MetaData has " + mockResultSetMetaData.getColumnCount() +
-                            " columns, but rows have " + mockResultSetRows.getColumnCount());
-        }
-
-        this.mockResultSetMetaData = mockResultSetMetaData;
-        this.mockResultSetRows = mockResultSetRows;
-    }
-
-    public void assertMatches(ResultSet rs) throws SQLException {
-        mockResultSetMetaData.assertMatches(rs.getMetaData());
-        mockResultSetRows.assertMatches(rs);
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockResultSetMetaData.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockResultSetMetaData.java
deleted file mode 100644
index 93faadf391..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockResultSetMetaData.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test.mocks;
-
-import org.opensearch.jdbc.internal.JdbcWrapper;
-import org.opensearch.jdbc.types.OpenSearchType;
-
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class MockResultSetMetaData implements ResultSetMetaData, JdbcWrapper {
-
-    private List<MockColumnRsmd> mockColumnRsmds;
-
-    public MockResultSetMetaData(List<MockColumnRsmd> mockColumnRsmds) {
-        this.mockColumnRsmds = Collections.unmodifiableList(mockColumnRsmds);
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-    @Override
-    public int getColumnCount() {
-        return mockColumnRsmds.size();
-    }
-
-    @Override
-    public boolean isAutoIncrement(int column) throws SQLException {
-        return mockColumnRsmds.get(column - 1).isAutoIncrement;
-    }
-
-    @Override
-    public boolean isCaseSensitive(int column) throws SQLException {
-        return mockColumnRsmds.get(column - 1).isCaseSensitive;
-    }
-
-    @Override
-    public boolean isSearchable(int column) throws SQLException {
-        return mockColumnRsmds.get(column - 1).isSearchable;
-    }
-
-    @Override
-    public boolean isCurrency(int column) throws SQLException {
-        return mockColumnRsmds.get(column - 1).isCurrency;
-    }
-
-    @Override
-    public int isNullable(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).isNullable;
-    }
-
-    @Override
-    public boolean isSigned(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).isSigned;
-    }
-
-    @Override
-    public int getColumnDisplaySize(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).columnDisplaySize;
-    }
-
-    @Override
-    public String getColumnLabel(int column) throws SQLException {
-        String label = mockColumnRsmds.get(column - 1).columnLabel;
-
-        if (label == null) {
-            // expected behavior per JDBC spec
-            label = getColumnName(column);
-        }
-        return label;
-    }
-
-    @Override
-    public String getColumnName(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).columnName;
-    }
-
-    @Override
-    public String getSchemaName(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).schemaName;
-    }
-
-    @Override
-    public int getPrecision(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).precision;
-    }
-
-    @Override
-    public int getScale(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).scale;
-    }
-
-    @Override
-    public String getTableName(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).tableName;
-    }
-
-    @Override
-    public String getCatalogName(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).catalogName;
-    }
-
-    @Override
-    public int getColumnType(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).columnType;
-    }
-
-    @Override
-    public String getColumnTypeName(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).columnTypeName;
-    }
-
-    @Override
-    public boolean isReadOnly(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).isReadOnly;
-    }
-
-    @Override
-    public boolean isWritable(int column) throws SQLException {
-        return  mockColumnRsmds.get(column - 1).isWritable;
-    }
-
-    @Override
-    public boolean isDefinitelyWritable(int column) throws SQLException {
-        return mockColumnRsmds.get(column - 1).isDefinitelyWritable;
-    }
-
-    @Override
-    public String getColumnClassName(int column) throws SQLException {
-        return mockColumnRsmds.get(column - 1).columnClassName;
-    }
-
-    public static class Builder {
-
-        private MockColumnRsmd currentColumnRsmd;
-
-        private List<MockColumnRsmd> columnRsmds = new ArrayList<>();
-
-        private Builder() {
-
-        }
-
-        Builder column() {
-            MockColumnRsmd columnRsmd = new MockColumnRsmd();
-            columnRsmds.add(columnRsmd);
-            currentColumnRsmd = columnRsmd;
-            return this;
-        }
-
-        public Builder column(String columnName) {
-            column(columnName, OpenSearchType.TEXT);
-            return this;
-        }
-
-        public Builder column(String columnName, OpenSearchType columnType) {
-            column();
-            setColumnName(columnName);
-            setColumnOpenSearchType(columnType);
-            return this;
-        }
-
-        public MockResultSetMetaData build() {
-            return new MockResultSetMetaData(columnRsmds);
-        }
-
-
-        public Builder setAutoIncrement(boolean autoIncrement) {
-            currentColumnRsmd.isAutoIncrement = autoIncrement;
-            return this;
-        }
-
-        public Builder setCaseSensitive(boolean caseSensitive) {
-            currentColumnRsmd.isCaseSensitive = caseSensitive;
-            return this;
-        }
-
-        public Builder setSearchable(boolean searchable) {
-            currentColumnRsmd.isSearchable = searchable;
-            return this;
-        }
-
-        public Builder setIsNullable(int isNullable) {
-            currentColumnRsmd.isNullable = isNullable;
-            return this;
-        }
-
-        public Builder setCurrency(boolean currency) {
-            currentColumnRsmd.isCurrency = currency;
-            return this;
-        }
-
-        public Builder setColumnTypeName(String columnTypeName) {
-            currentColumnRsmd.columnTypeName = columnTypeName;
-            return this;
-        }
-
-        public Builder setSigned(boolean signed) {
-            currentColumnRsmd.isSigned = signed;
-            return this;
-        }
-
-        public Builder setColumnDisplaySize(int columnDisplaySize) {
-            currentColumnRsmd.columnDisplaySize = columnDisplaySize;
-            return this;
-        }
-
-        public Builder setColumnLabel(String columnLabel) {
-            currentColumnRsmd.columnLabel = columnLabel;
-            return this;
-        }
-
-        public Builder setColumnName(String columnName) {
-            currentColumnRsmd.columnName = columnName;
-            return this;
-        }
-
-        public Builder setColumnOpenSearchType(final OpenSearchType openSearchType) {
-            setColumnType(openSearchType.getJdbcType().getVendorTypeNumber());
-            setPrecision(openSearchType.getPrecision());
-            setColumnDisplaySize(openSearchType.getDisplaySize());
-            setColumnClassName(openSearchType.getJavaClassName());
-            setColumnTypeName(openSearchType.getJdbcType().getName());
-            setSigned(openSearchType.isSigned());
-            return this;
-        }
-
-        public Builder setSchemaName(String schemaName) {
-            currentColumnRsmd.schemaName = schemaName;
-            return this;
-        }
-
-        public Builder setPrecision(int precision) {
-            currentColumnRsmd.precision = precision;
-            return this;
-        }
-
-        public Builder setScale(int scale) {
-            currentColumnRsmd.scale = scale;
-            return this;
-        }
-
-        public Builder setTableName(String tableName) {
-            currentColumnRsmd.tableName = tableName;
-            return this;
-        }
-
-        public Builder setCatalogName(String catalogName) {
-            currentColumnRsmd.catalogName = catalogName;
-            return this;
-        }
-
-        public Builder setColumnType(int columnType) {
-            currentColumnRsmd.columnType = columnType;
-            return this;
-        }
-
-        public Builder setReadOnly(boolean readOnly) {
-            currentColumnRsmd.isReadOnly = readOnly;
-            return this;
-        }
-
-        public Builder setWritable(boolean writable) {
-            currentColumnRsmd.isWritable = writable;
-            return this;
-        }
-
-        public Builder setDefinitelyWritable(boolean definitelyWritable) {
-            currentColumnRsmd.isDefinitelyWritable = definitelyWritable;
-            return this;
-        }
-
-        public Builder setColumnClassName(String columnClassName) {
-            currentColumnRsmd.columnClassName = columnClassName;
-            return this;
-        }
-
-    }
-
-    public void assertMatches(ResultSetMetaData other) throws SQLException {
-        assertEquals(this.getColumnCount(), other.getColumnCount(), "column count");
-
-        for (int i = 1; i <= this.getColumnCount(); i++) {
-            assertEquals(this.getCatalogName(i), other.getCatalogName(i), "column "+i+" catalog name");
-            assertEquals(this.getColumnClassName(i), other.getColumnClassName(i), "column "+i+" column class name");
-            assertEquals(this.getColumnDisplaySize(i), other.getColumnDisplaySize(i), "column "+i+" column disp size");
-            assertEquals(this.getColumnName(i), other.getColumnName(i), "column "+i+" column name");
-            assertEquals(this.getColumnLabel(i), other.getColumnLabel(i), "column "+i+" column label");
-            assertEquals(this.getColumnType(i), other.getColumnType(i), "column "+i+" column type");
-            assertEquals(this.isAutoIncrement(i), other.isAutoIncrement(i), "column "+i+" auto increment");
-            assertEquals(this.isCaseSensitive(i), other.isCaseSensitive(i), "column "+i+" case sensitive");
-            assertEquals(this.isSearchable(i), other.isSearchable(i), "column "+i+" searchable");
-            assertEquals(this.isNullable(i), other.isNullable(i), "column "+i+" nullable");
-            assertEquals(this.isCurrency(i), other.isCurrency(i), "column "+i+" is currency");
-            assertEquals(this.getColumnTypeName(i), other.getColumnTypeName(i), "column "+i+" column type name");
-            assertEquals(this.isSigned(i), other.isSigned(i), "column "+i+" signed");
-            assertEquals(this.getSchemaName(i), other.getSchemaName(i), "column "+i+" schema name");
-            assertEquals(this.getPrecision(i), other.getPrecision(i), "column "+i+" precision");
-            assertEquals(this.getScale(i), other.getScale(i), "column "+i+" scale");
-            assertEquals(this.getTableName(i), other.getTableName(i), "column "+i+" table name");
-            assertEquals(this.isReadOnly(i), other.isReadOnly(i), "column "+i+" read only");
-            assertEquals(this.isWritable(i), other.isWritable(i), "column "+i+" writable");
-            assertEquals(this.isDefinitelyWritable(i), other.isDefinitelyWritable(i), "column "+i+" definitely writable");
-        }
-    }
-
-    private static class MockColumnRsmd {
-
-        // initialized to defaults used in the implementation
-        private boolean isAutoIncrement = false;
-        private boolean isCaseSensitive = true;
-        private boolean isSearchable = true;
-        private int isNullable = columnNullableUnknown;
-        private boolean isCurrency = false;
-        private String columnTypeName;
-        private boolean isSigned = false;
-        private int columnDisplaySize;
-        private String columnLabel;
-        private String columnName;
-        private String schemaName = "";
-        private int precision;
-        private int scale = 0;
-        private String tableName = "";
-        private String catalogName = "";
-        private int columnType;
-        private boolean isReadOnly = true;
-        private boolean isWritable = false;
-        private boolean isDefinitelyWritable = false;
-        private String columnClassName;
-
-    }
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockResultSetRows.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockResultSetRows.java
deleted file mode 100644
index 27ce683152..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/MockResultSetRows.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test.mocks;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
-public class MockResultSetRows {
-    List<List<ColumnData>> rows;
-
-    private MockResultSetRows(List<List<ColumnData>> rows) {
-        this.rows = rows;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public boolean isEmpty() {
-        return rows.isEmpty();
-    }
-
-    public int getColumnCount() {
-        return isEmpty() ? -1 : rows.get(0).size();
-    }
-
-    public void assertMatches(ResultSet rs) throws SQLException {
-        int rowNum = 0;
-
-        for (List<ColumnData> columnData : rows) {
-            rowNum++;
-            rs.next();
-            int i = 0;
-            for (ColumnData data : columnData) {
-                Object resultSetValue = rs.getObject(++i);
-                assertEquals(data.getValue(), resultSetValue, "Row [" + rowNum + "], column [" + i + "] value mismatch");
-                assertEquals(data.isNull(), rs.wasNull(),
-                        "Row [" + rowNum + "], column [" + i + "] expected to be null: " + data.isNull() +
-                                " but was: " + rs.wasNull());
-            }
-        }
-
-        assertFalse(rs.next(), () -> "ResultSet has more rows than expected. Expected: " + rows.size() + " rows.");
-    }
-
-    public static class Builder {
-        List<List<ColumnData>> rows = new ArrayList<>();
-
-        private ArrayList<ColumnData> currentRow;
-
-        private int rowSize = -1;
-
-        private Builder() {
-
-        }
-
-        public Builder row() {
-            if (rows.size() > 0) {
-                if (rowSize == -1) {
-                    rowSize = currentRow.size();
-                } else {
-                    validateRowSizes();
-                }
-            }
-            currentRow = new ArrayList<>();
-            rows.add(currentRow);
-            return this;
-        }
-
-        public Builder column(Object value) {
-            return column(value, false);
-        }
-
-        public Builder column(Object value, boolean isNull) {
-            currentRow.add(new ColumnData(value, isNull));
-            return this;
-        }
-
-        public MockResultSetRows build() {
-            if (rows.size() > 1)
-                validateRowSizes();
-            return new MockResultSetRows(rows);
-        }
-
-        private void validateRowSizes() {
-            if (rowSize != currentRow.size()) {
-                throw new IllegalArgumentException(
-                        "Expect the row to have " + rowSize + " elements, but only " + currentRow.size() + " were added.");
-
-            }
-        }
-    }
-
-
-    public static class ColumnData {
-        private Object value;
-        private boolean isNull;
-
-        public ColumnData(Object value, boolean isNull) {
-            this.value = value;
-            this.isNull = isNull;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public boolean isNull() {
-            return isNull;
-        }
-    }
-
-    public static MockResultSetRows emptyResultSetRows() {
-        return MockResultSetRows.builder().build();
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/QueryMock.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/QueryMock.java
deleted file mode 100644
index b0ed874bae..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/test/mocks/QueryMock.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.test.mocks;
-
-import org.opensearch.jdbc.OpenSearchConnection;
-import org.opensearch.jdbc.protocol.http.JsonHttpProtocol;
-import org.opensearch.jdbc.test.TestResources;
-import org.opensearch.jdbc.types.OpenSearchType;
-import com.github.tomakehurst.wiremock.WireMockServer;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
-
-public abstract class QueryMock {
-
-    public abstract String getSql();
-
-    public abstract String getResponseResourcePath();
-
-    public MockResultSet getMockResultSet() {
-        // overridden in QueryMocks that intend to vend
-        // a MockResultSet
-        return null;
-    }
-
-    public void setupMockServerStub(final WireMockServer mockServer)
-            throws java.io.IOException {
-        setupMockServerStub(mockServer, "/", JsonHttpProtocol.DEFAULT_SQL_CONTEXT_PATH+"?format=jdbc");
-    }
-
-    public void setupMockServerStub(final WireMockServer mockServer, final String connectionUrl, final String queryUrl)
-            throws java.io.IOException {
-
-        setupStubForConnect(mockServer, connectionUrl);
-
-        // query response stub
-        mockServer.stubFor(post(urlEqualTo(queryUrl))
-                .withHeader("Accept", equalTo("application/json"))
-                .withHeader("Content-Type", equalTo("application/json"))
-                .withRequestBody(matchingJsonPath("$.query", equalTo(getSql())))
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(getResponseBody())));
-    }
-
-    protected void setupStubForConnect(final WireMockServer mockServer, final String contextPath) {
-        // get Connection stub
-        mockServer.stubFor(get(urlEqualTo(contextPath))
-                .withHeader("Accept", equalTo("application/json"))
-                .willReturn(aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(MockOpenSearch.INSTANCE.getConnectionResponse())));
-    }
-
-    public String getResponseBody() throws IOException {
-        return TestResources.readResourceAsString(getResponseResourcePath());
-    }
-
-    public void assertConnectionResponse(OpenSearchConnection esConnection) throws SQLException {
-        MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse(esConnection);
-    }
-
-    public static class NycTaxisQueryMock extends QueryMock {
-        @Override
-        public String getSql() {
-            return "select pickup_datetime, trip_type, passenger_count, " +
-                    "fare_amount, extra, vendor_id from nyc_taxis LIMIT 5";
-        }
-
-        @Override
-        public String getResponseResourcePath() {
-            return "mock/protocol/json/queryresponse_nyctaxis.json";
-        }
-
-        @Override
-        public MockResultSet getMockResultSet() {
-            MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                    .column("pickup_datetime", OpenSearchType.TIMESTAMP)
-                    .column("trip_type", OpenSearchType.KEYWORD)
-                    .column("passenger_count", OpenSearchType.INTEGER)
-                    .column("fare_amount", OpenSearchType.SCALED_FLOAT)
-                    .column("extra", OpenSearchType.SCALED_FLOAT)
-                    .column("vendor_id", OpenSearchType.KEYWORD)
-                    .build();
-
-            MockResultSetRows mockResultSetRows = MockResultSetRows.builder()
-                    .row()
-                    .column(Timestamp.valueOf("2015-01-01 00:34:42"))
-                    .column("1")
-                    .column(1)
-                    .column(5D)
-                    .column(0.5D)
-                    .column("2")
-                    .row()
-                    .column(Timestamp.valueOf("2015-01-01 00:34:46"))
-                    .column("1")
-                    .column(1)
-                    .column(12D)
-                    .column(0.5D)
-                    .column("2")
-                    .row()
-                    .column(Timestamp.valueOf("2015-01-01 00:34:44"))
-                    .column("1")
-                    .column(1)
-                    .column(5D)
-                    .column(0.5D)
-                    .column("1")
-                    .row()
-                    .column(Timestamp.valueOf("2015-01-01 00:34:48"))
-                    .column("1")
-                    .column(1)
-                    .column(5D)
-                    .column(0.5D)
-                    .column("2")
-                    .row()
-                    .column(Timestamp.valueOf("2015-01-01 00:34:53"))
-                    .column("1")
-                    .column(1)
-                    .column(24.5D)
-                    .column(0.5D)
-                    .column("2")
-                    .build();
-
-            return new MockResultSet(mockResultSetMetaData, mockResultSetRows);
-        }
-    }
-
-    public static class NycTaxisQueryWithAliasMock extends QueryMock {
-        @Override
-        public String getSql() {
-            return "select pickup_datetime as pdt, trip_type, passenger_count as pc, " +
-                    "fare_amount, extra, vendor_id from nyc_taxis LIMIT 5";
-        }
-
-        @Override
-        public String getResponseResourcePath() {
-            return "mock/protocol/json/queryresponse_with_alias_nyctaxis.json";
-        }
-
-        @Override
-        public MockResultSet getMockResultSet() {
-            MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder()
-                    .column("pickup_datetime", OpenSearchType.TIMESTAMP)
-                    .setColumnLabel("pdt")
-                    .column("trip_type", OpenSearchType.KEYWORD)
-                    .column("passenger_count", OpenSearchType.INTEGER)
-                    .setColumnLabel("pc")
-                    .column("fare_amount", OpenSearchType.SCALED_FLOAT)
-                    .column("extra", OpenSearchType.SCALED_FLOAT)
-                    .column("vendor_id", OpenSearchType.KEYWORD)
-                    .build();
-
-            MockResultSetRows mockResultSetRows = MockResultSetRows.builder()
-                    .row()
-                    .column(Timestamp.valueOf("2015-01-01 00:34:42"))
-                    .column("1")
-                    .column(1)
-                    .column(5D)
-                    .column(0.5D)
-                    .column("2")
-                    .row()
-                    .column(Timestamp.valueOf("2015-01-01 00:34:46"))
-                    .column("1")
-                    .column(1)
-                    .column(12D)
-                    .column(0.5D)
-                    .column("2")
-                    .row()
-                    .column(Timestamp.valueOf("2015-01-01 00:34:44"))
-                    .column("1")
-                    .column(1)
-                    .column(5D)
-                    .column(0.5D)
-                    .column("1")
-                    .row()
-                    .column(Timestamp.valueOf("2015-01-01 00:34:48"))
-                    .column("1")
-                    .column(1)
-                    .column(5D)
-                    .column(0.5D)
-                    .column("2")
-                    .row()
-                    .column(Timestamp.valueOf("2015-01-01 00:34:53"))
-                    .column("1")
-                    .column(1)
-                    .column(24.5D)
-                    .column(0.5D)
-                    .column("2")
-                    .build();
-
-            return new MockResultSet(mockResultSetMetaData, mockResultSetRows);
-        }
-    }
-
-    public static class SoNestedQueryMock extends QueryMock {
-        @Override
-        public String getSql() {
-            return "select user, title, qid, creation_date from sonested LIMIT 5";
-        }
-
-        @Override
-        public String getResponseResourcePath() {
-            return "mock/protocol/json/queryresponse_sonested.json";
-        }
-    }
-
-    public static class NycTaxisQueryInternalErrorMock extends NycTaxisQueryMock {
-
-        @Override
-        public String getResponseResourcePath() {
-            return "mock/protocol/json/queryresponse_internal_server_error.json";
-        }
-    }
-
-    public static class NullableFieldsQueryMock extends QueryMock {
-        @Override
-        public String getSql() {
-            return "select * from nullablefields";
-        }
-
-        @Override
-        public String getResponseResourcePath() {
-            return "mock/protocol/json/queryresponse_nullablefields.json";
-        }
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/transport/http/auth/aws/AWSRequestSigningApacheInterceptorTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/transport/http/auth/aws/AWSRequestSigningApacheInterceptorTests.java
deleted file mode 100644
index ec39e6f580..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/transport/http/auth/aws/AWSRequestSigningApacheInterceptorTests.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.transport.http.auth.aws;
-
-import com.amazonaws.SignableRequest;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.AnonymousAWSCredentials;
-import com.amazonaws.auth.Signer;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicHttpEntityEnclosingRequest;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpCoreContext;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class AWSRequestSigningApacheInterceptorTests {
-
-    @Test
-    public void testSimpleSigner() throws Exception {
-        HttpEntityEnclosingRequest request =
-                new BasicHttpEntityEnclosingRequest("GET", "/query?a=b");
-        request.setEntity(new StringEntity("I'm an entity"));
-        request.addHeader("foo", "bar");
-        request.addHeader("content-length", "0");
-
-        HttpCoreContext context = new HttpCoreContext();
-        context.setTargetHost(HttpHost.create("localhost"));
-
-        createInterceptor().process(request, context);
-
-        assertEquals("bar", request.getFirstHeader("foo").getValue());
-        assertEquals("wuzzle", request.getFirstHeader("Signature").getValue());
-        assertNull(request.getFirstHeader("content-length"));
-    }
-
-    @Test
-    public void testBadRequest() throws Exception {
-
-        HttpRequest badRequest = new BasicHttpRequest("GET", "?#!@*%");
-        assertThrows(IOException.class,
-                () -> createInterceptor().process(badRequest, new BasicHttpContext()));
-    }
-
-    private static class AddHeaderSigner implements Signer {
-        private final String name;
-        private final String value;
-
-        private AddHeaderSigner(String name, String value) {
-            this.name = name;
-            this.value = value;
-        }
-
-
-        @Override
-        public void sign(SignableRequest<?> request, AWSCredentials credentials) {
-            request.addHeader(name, value);
-            request.addHeader("resourcePath", request.getResourcePath());
-        }
-    }
-
-    @Test
-    public void testEncodedUriSigner() throws Exception {
-        HttpEntityEnclosingRequest request =
-                new BasicHttpEntityEnclosingRequest("GET", "/foo-2017-02-25%2Cfoo-2017-02-26/_search?a=b");
-        request.setEntity(new StringEntity("I'm an entity"));
-        request.addHeader("foo", "bar");
-        request.addHeader("content-length", "0");
-
-        HttpCoreContext context = new HttpCoreContext();
-        context.setTargetHost(HttpHost.create("localhost"));
-
-        createInterceptor().process(request, context);
-
-        assertEquals("bar", request.getFirstHeader("foo").getValue());
-        assertEquals("wuzzle", request.getFirstHeader("Signature").getValue());
-        assertNull(request.getFirstHeader("content-length"));
-        assertEquals("/foo-2017-02-25%2Cfoo-2017-02-26/_search", request.getFirstHeader("resourcePath").getValue());
-    }
-
-    private static AWSRequestSigningApacheInterceptor createInterceptor() {
-        AWSCredentialsProvider anonymousCredentialsProvider =
-                new AWSStaticCredentialsProvider(new AnonymousAWSCredentials());
-        return new AWSRequestSigningApacheInterceptor("servicename",
-                new AddHeaderSigner("Signature", "wuzzle"),
-                anonymousCredentialsProvider);
-
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/BinaryTypeTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/types/BinaryTypeTests.java
deleted file mode 100644
index 0dc12501bf..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/BinaryTypeTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-public class BinaryTypeTests {
-
-  @ParameterizedTest
-  @CsvSource(value = {
-      "U29tZSBiaW5hcnkgYmxvYg==, U29tZSBiaW5hcnkgYmxvYg==",
-      "TWFuIGlzIGRpc3Rpbmd1aXN, TWFuIGlzIGRpc3Rpbmd1aXN",
-      "YW55IGNhcm5hbCBwbGVhc3VyZS4=, YW55IGNhcm5hbCBwbGVhc3VyZS4="
-  })
-  void testTimeFromString(String inputString, String result) {
-    String binary = Assertions.assertDoesNotThrow(
-        () -> BinaryType.INSTANCE.fromValue(inputString, null));
-    assertEquals(result, binary);
-  }
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/ByteTypeTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/types/ByteTypeTests.java
deleted file mode 100644
index e20893e2d0..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/ByteTypeTests.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.sql.SQLDataException;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class ByteTypeTests {
-    @ParameterizedTest
-    @CsvSource(value = {
-            "127, 127", // Byte.MAX_VALUE
-            "-128, -128", // Byte.MIN_VALUE
-            "100, 100",
-            "-94, -94",
-            "45.40, 45",
-            "-100.95, -101",
-            "127.2, 127",
-            "-128.41, -128"
-    })
-    void testByteFromValidString(String stringValue, byte expectedValue) {
-        byte byteValue = Assertions.assertDoesNotThrow(
-                () -> ByteType.INSTANCE.fromValue(stringValue, null));
-        assertEquals(expectedValue, byteValue);
-    }
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "128",
-            "21474836470",
-            "-129",
-            "127.6",
-            "-128.6"
-    })
-    void testByteFromOutOfRangeString(String stringValue) {
-        assertThrows(SQLDataException.class,
-                () -> ByteType.INSTANCE.fromValue(stringValue, null));
-    }
-
-    @ParameterizedTest
-    @MethodSource("validRangeNumberProvider")
-    void testByteFromValidRangeNumber(Number numberValue, byte expectedValue) {
-        byte byteValue = Assertions.assertDoesNotThrow(
-                () -> ByteType.INSTANCE.fromValue(numberValue, null));
-        assertEquals(expectedValue, byteValue);
-    }
-
-
-    @ParameterizedTest
-    @MethodSource("outOfRangeNumberProvider")
-    void testByteFromOutOfRangeNumber(Number numberValue) {
-        SQLDataException ex = assertThrows(SQLDataException.class,
-                () -> ByteType.INSTANCE.fromValue(numberValue, null));
-        assertTrue(ex.getMessage().contains("out of range"));
-    }
-
-    private static Stream<Arguments> outOfRangeNumberProvider() {
-        return Stream.of(
-                // ints
-                Arguments.of(128),
-                Arguments.of(-129),
-
-                // longs
-                Arguments.of(128L),
-                Arguments.of(-129L),
-
-                // doubles
-                Arguments.of(127.6D),
-                Arguments.of(-128.55D)
-        );
-    }
-
-
-    private static Stream<Arguments> validRangeNumberProvider() {
-        return Stream.of(
-                // ints
-                Arguments.of(127, (byte) 127),
-                Arguments.of(-128, (byte) -128),
-
-                // longs
-                Arguments.of(127L, (byte) 127),
-                Arguments.of(125L, (byte) 125),
-                Arguments.of(-128L, (byte) -128),
-
-                // doubles
-                Arguments.of(127.20D, (byte) 127),
-                Arguments.of(-128.20D, (byte) -128),
-                Arguments.of(125D, (byte) 125),
-
-                // floats
-                Arguments.of(127.20f, (byte) 127),
-                Arguments.of(-128.20f, (byte) -128),
-                Arguments.of(125f, (byte) 125)
-        );
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/DateTypeTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/types/DateTypeTests.java
deleted file mode 100644
index 39b45a6390..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/DateTypeTests.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import org.opensearch.jdbc.test.UTCTimeZoneTestExtension;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.sql.Date;
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TimeZone;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-@ExtendWith(UTCTimeZoneTestExtension.class)
-public class DateTypeTests {
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "2015-01-01, 1420070400000",
-            "1972-12-31, 94608000000",
-            "1950-01-01, -631152000000"
-    })
-    void testDateFromStringDefaultTZ(String stringValue, long longValue) {
-        Date date = Assertions.assertDoesNotThrow(
-                () -> DateType.INSTANCE.fromValue(stringValue, null));
-        assertEquals(longValue, date.getTime());
-    }
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "2015-01-01, PST, 1420099200000",
-            "1972-12-31, PST, 94636800000",
-            "1950-01-01, PST, -631123200000"
-    })
-    void testDateFromStringCustomTZ(String stringValue, String timezone, long longValue) {
-        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone(timezone));
-        Map<String, Object> conversionParams = new HashMap<>();
-        conversionParams.put("calendar", calendar);
-
-        Date date = Assertions.assertDoesNotThrow(
-                () -> DateType.INSTANCE.fromValue(stringValue, conversionParams));
-        assertEquals(longValue, date.getTime());
-    }
-
-    @ParameterizedTest
-    @MethodSource("numberProvider")
-    void testDateFromNumber(Number numericValue) {
-        Timestamp timestamp = Assertions.assertDoesNotThrow(
-                () -> TimestampType.INSTANCE.fromValue(numericValue, null));
-        assertEquals(numericValue.longValue(), timestamp.getTime());
-
-        // timestamp does not matter when converting from numeric value
-        Map<String, Object> conversionParams = new HashMap<>();
-        conversionParams.put("calendar", Calendar.getInstance(TimeZone.getTimeZone("PST")));
-        timestamp = Assertions.assertDoesNotThrow(
-                () -> TimestampType.INSTANCE.fromValue(numericValue, conversionParams));
-        assertEquals(numericValue.longValue(), timestamp.getTime());
-    }
-
-    private static Stream<Arguments> numberProvider() {
-        return Stream.of(
-                // longs
-                Arguments.of(1245137332333L),
-                Arguments.of(1420101286778L),
-                Arguments.of(1L),
-                Arguments.of(0L),
-                Arguments.of(-10023456L),
-
-                // ints
-                Arguments.of(1245137332),
-                Arguments.of(1420101286),
-                Arguments.of(1),
-                Arguments.of(0),
-                Arguments.of(-10023456)
-        );
-    }
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/FloatTypeTest.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/types/FloatTypeTest.java
deleted file mode 100644
index 48af3b27b8..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/FloatTypeTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.jdbc.types;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.sql.SQLDataException;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class FloatTypeTest {
-    @ParameterizedTest
-    @CsvSource(value = {
-            "2147483647, 2147483647", // Integer.MAX_VALUE
-            "-2147483648, -2147483648", // Integer.MIN_VALUE
-            "9460800, 9460800",
-            "100, 100",
-            "-9460800, -9460800",
-            "100.25, 100.25",
-            "100.80, 100.80",
-            "-100.80, -100.80",
-            "0, 0",
-            "3.4028234E38, 3.4028234E38"
-    })
-    void testIntegerFromValidString(String stringValue, float expectedValue) {
-        float floatValue = Assertions.assertDoesNotThrow(
-                () -> FloatType.INSTANCE.fromValue(stringValue, null));
-        assertEquals(expectedValue, floatValue);
-    }
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "3.4028235E38",
-            "3.4028235E39",
-            "-3.4028235E38",
-            "-3.4028235E39"
-    })
-    void testIntegerFromOutOfRangeString(String stringValue) {
-        assertThrows(
-                SQLDataException.class,
-                () -> FloatType.INSTANCE.fromValue(stringValue, null));
-    }
-
-    @ParameterizedTest
-    @MethodSource("outOfRangeNumberProvider")
-    void testIntegerFromOutOfRangeNumber(Number numberValue) {
-        SQLDataException ex = assertThrows(SQLDataException.class,
-                                           () -> IntegerType.INSTANCE.fromValue(numberValue, null));
-        assertTrue(ex.getMessage().contains("out of range"));
-    }
-
-    @ParameterizedTest
-    @MethodSource("validRangeNumberProvider")
-    void testIntegerFromValidRangeNumber(Number numberValue, float expectedValue) {
-        float floatValue = Assertions.assertDoesNotThrow(
-                () -> FloatType.INSTANCE.fromValue(numberValue, null));
-        assertEquals(expectedValue, floatValue);
-    }
-
-    private static Stream<Arguments> outOfRangeNumberProvider() {
-        return Stream.of(
-                // floats
-                Arguments.of(Float.MAX_VALUE),
-                Arguments.of(-Float.MAX_VALUE)
-        );
-    }
-
-    private static Stream<Arguments> validRangeNumberProvider() {
-        return Stream.of(
-                // floats
-                Arguments.of(3.14f, 3.14f),
-                Arguments.of(-3.14f, -3.14f),
-                Arguments.of(0, 0),
-                Arguments.of(0x1.fffffdP+127f, 0x1.fffffdP+127f),
-                Arguments.of(-0x1.fffffdP+127f, -0x1.fffffdP+127f)
-        );
-    }
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/IntegerTypeTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/types/IntegerTypeTests.java
deleted file mode 100644
index 37b95dc5aa..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/IntegerTypeTests.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.MethodSource;
-
-
-import java.sql.SQLDataException;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class IntegerTypeTests {
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "2147483647, 2147483647", // Integer.MAX_VALUE
-            "-2147483648, -2147483648", // Integer.MIN_VALUE
-            "9460800, 9460800",
-            "100, 100",
-            "-9460800, -9460800",
-            "100.25, 100",
-            "100.80, 101",
-            "-100.80, -101"
-    })
-    void testIntegerFromValidString(String stringValue, int expectedValue) {
-        int integerValue = Assertions.assertDoesNotThrow(
-                () -> IntegerType.INSTANCE.fromValue(stringValue, null));
-        assertEquals(expectedValue, integerValue);
-    }
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "2147483648",
-            "21474836470",
-            "-2147483649",
-            "2147483647.6"
-    })
-    void testIntegerFromOutOfRangeString(String stringValue) {
-        assertThrows(SQLDataException.class,
-                () -> IntegerType.INSTANCE.fromValue(stringValue, null));
-    }
-
-    @ParameterizedTest
-    @MethodSource("outOfRangeNumberProvider")
-    void testIntegerFromOutOfRangeNumber(Number numberValue) {
-        SQLDataException ex = assertThrows(SQLDataException.class,
-                () -> IntegerType.INSTANCE.fromValue(numberValue, null));
-        assertTrue(ex.getMessage().contains("out of range"));
-    }
-
-    @ParameterizedTest
-    @MethodSource("validRangeNumberProvider")
-    void testIntegerFromValidRangeNumber(Number numberValue, int expectedValue) {
-        int intValue = Assertions.assertDoesNotThrow(
-                () -> IntegerType.INSTANCE.fromValue(numberValue, null));
-        assertEquals(expectedValue, intValue);
-    }
-
-    private static Stream<Arguments> outOfRangeNumberProvider() {
-        return Stream.of(
-                // longs
-                Arguments.of(2147483648L),
-                Arguments.of(-2147483649L),
-
-                // doubles
-                Arguments.of(21474836400D),
-                Arguments.of(-21474836400D),
-                Arguments.of(2147483647.61D)
-        );
-    }
-
-    private static Stream<Arguments> validRangeNumberProvider() {
-        return Stream.of(
-                // longs
-                Arguments.of(2147483647L, 2147483647),
-                Arguments.of(-2147483648L, -2147483648),
-
-                // doubles
-                Arguments.of(2147483647.0D, 2147483647),
-                Arguments.of(-2147483648.0D, -2147483648),
-                Arguments.of(2147483647.21D, 2147483647),
-                Arguments.of(2147483646.81D, 2147483647),
-
-                // shorts
-                Arguments.of((short) 32767, 32767),
-                Arguments.of((short) -32768, -32768),
-                Arguments.of((short) 250, 250)
-        );
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/KeywordTypeTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/types/KeywordTypeTests.java
deleted file mode 100644
index 45776586fa..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/KeywordTypeTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.opensearch.jdbc.types;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class KeywordTypeTests {
-
-    @ParameterizedTest
-    @MethodSource("validIpStringProvider")
-    void testIpFromValidIpString(String stringValue, String expectedValue) {
-        String result = Assertions.assertDoesNotThrow(
-                () -> StringType.INSTANCE.fromValue(stringValue, null));
-        assertEquals(expectedValue, result);
-    }
-
-    private static Stream<Arguments> validIpStringProvider() {
-        return Stream.of(
-                Arguments.of("199.72.81.55", "199.72.81.55"),
-                Arguments.of("205.212.115.106", "205.212.115.106"),
-                Arguments.of("255.255.255.255", "255.255.255.255"),
-                Arguments.of("255.0.0.0", "255.0.0.0")
-        );
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/LongTypeTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/types/LongTypeTests.java
deleted file mode 100644
index 9268c9d4ba..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/LongTypeTests.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.sql.SQLDataException;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class LongTypeTests {
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "9223372036854775807, 9223372036854775807", // Long.MAX_VALUE
-            "-9223372036854775808, -9223372036854775808", // Long.MIN_VALUE
-            "9460800, 9460800",
-            "100, 100",
-            "-9460800, -9460800",
-            "100.25, 100",
-            "100.80, 101",
-            "-100000123456.80, -100000123457",
-            "-100000123456.30, -100000123456"
-    })
-    void testLongFromValidString(String stringValue, long expectedValue) {
-        long longValue = Assertions.assertDoesNotThrow(
-                () -> LongType.INSTANCE.fromValue(stringValue, null));
-        assertEquals(expectedValue, longValue);
-    }
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "9223372036854775809",
-            "9223372036854775807.8",
-            "-9223372036854775809",
-            "-9223372036854775808.6"
-    })
-    void testLongFromOutOfRangeString(String stringValue) {
-        assertThrows(SQLDataException.class,
-                () -> LongType.INSTANCE.fromValue(stringValue, null));
-    }
-
-    @ParameterizedTest
-    @MethodSource("validRangeNumberProvider")
-    void testLongFromValidRangeNumber(Number numberValue, long expectedValue) {
-        long longValue = Assertions.assertDoesNotThrow(
-                () -> LongType.INSTANCE.fromValue(numberValue, null));
-        assertEquals(expectedValue, longValue);
-    }
-
-    private static Stream<Arguments> validRangeNumberProvider() {
-        return Stream.of(
-
-                // doubles
-                Arguments.of(2147483647.0D, 2147483647L),
-                Arguments.of(-2147483648.0D, -2147483648L),
-                Arguments.of(2147483647.21D, 2147483647L),
-                Arguments.of(2147483646.81D, 2147483647L),
-
-                // ints
-                Arguments.of(2147483647, 2147483647L),
-                Arguments.of(-2147483648, -2147483648L),
-                Arguments.of(9999, 9999L),
-
-                // shorts
-                Arguments.of((short) 32767, 32767),
-                Arguments.of((short) -32768, -32768),
-                Arguments.of((short) 250, 250),
-
-                // floats
-                Arguments.of(32767.8f, 32768L),
-                Arguments.of(-32768.2f, -32768L),
-                Arguments.of(250.1f, 250L)
-        );
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/ShortTypeTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/types/ShortTypeTests.java
deleted file mode 100644
index e3182cb581..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/ShortTypeTests.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.sql.SQLDataException;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class ShortTypeTests {
-    @ParameterizedTest
-    @CsvSource(value = {
-            "32767, 32767", // Short.MAX_VALUE
-            "-32768, -32768", // Short.MIN_VALUE
-            "100, 100",
-            "-9460, -9460",
-            "45.40, 45",
-            "100.95, 101"
-    })
-    void testShortFromValidString(String stringValue, short expectedValue) {
-        short shortValue = Assertions.assertDoesNotThrow(
-                () -> ShortType.INSTANCE.fromValue(stringValue, null));
-        assertEquals(expectedValue, shortValue);
-    }
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "32768",
-            "21474836470",
-            "-32769"
-    })
-    void testShortFromOutOfRangeString(String stringValue) {
-        assertThrows(SQLDataException.class,
-                () -> ShortType.INSTANCE.fromValue(stringValue, null));
-    }
-
-    @ParameterizedTest
-    @MethodSource("outOfRangeNumberProvider")
-    void testShortFromOutOfRangeNumber(Number numberValue) {
-        SQLDataException ex = assertThrows(SQLDataException.class,
-                () -> ShortType.INSTANCE.fromValue(numberValue, null));
-        assertTrue(ex.getMessage().contains("out of range"));
-    }
-
-
-    @ParameterizedTest
-    @MethodSource("validRangeNumberProvider")
-    void testShortFromValidRangeNumber(Number numberValue, short expectedValue) {
-        short shortValue = Assertions.assertDoesNotThrow(
-                () -> ShortType.INSTANCE.fromValue(numberValue, null));
-        assertEquals(expectedValue, shortValue);
-    }
-
-    private static Stream<Arguments> outOfRangeNumberProvider() {
-        return Stream.of(
-                // ints
-                Arguments.of(32768),
-                Arguments.of(-32769),
-
-                // longs
-                Arguments.of(2147483648L),
-                Arguments.of(-2147483649L),
-
-                // doubles
-                Arguments.of(21474836400D),
-                Arguments.of(-21474836400D)
-        );
-    }
-
-    private static Stream<Arguments> validRangeNumberProvider() {
-        return Stream.of(
-                // ints
-                Arguments.of(32767, (short) 32767),
-                Arguments.of(-32768, (short) -32768),
-
-                // longs
-                Arguments.of(32767L, (short) 32767),
-                Arguments.of(250L, (short) 250),
-                Arguments.of(-32768L, (short) -32768),
-
-                // doubles
-                Arguments.of(32767.20D, (short) 32767),
-                Arguments.of(-32768.20D, (short) -32768),
-                Arguments.of(250D, (short) 250)
-        );
-    }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/TimeTypeTest.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/types/TimeTypeTest.java
deleted file mode 100644
index 263c1ddc40..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/TimeTypeTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.opensearch.jdbc.test.UTCTimeZoneTestExtension;
-import java.sql.Time;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-@ExtendWith(UTCTimeZoneTestExtension.class)
-public class TimeTypeTest {
-
-  @ParameterizedTest
-  @CsvSource(value = {
-      "00:00:00, 00:00:00",
-      "01:01:01, 01:01:01",
-      "23:59:59, 23:59:59"
-  })
-  void testTimeFromString(String inputString, String resultString) {
-    Time time = Assertions.assertDoesNotThrow(
-        () -> TimeType.INSTANCE.fromValue(inputString, null));
-    assertEquals(resultString, time.toString());
-  }
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/TimestampTypeTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/types/TimestampTypeTests.java
deleted file mode 100644
index fcd3b5d3e1..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/TimestampTypeTests.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import org.opensearch.jdbc.test.UTCTimeZoneTestExtension;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TimeZone;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-@ExtendWith(UTCTimeZoneTestExtension.class)
-public class TimestampTypeTests {
-
-    // Test inputs here assume default JVM TimeZone of UTC.
-    // The UTCTimeZoneTestExtension applied to this class ensures
-    // the tests see behavior consistent with a JVM running under
-    // a UTC TimeZone.
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "2009-06-16T07:28:52.333, 1245137332333",
-            "2015-01-01 00:34:46,     1420072486000",
-            "2015-01-01 00:34:46.778, 1420072486778",
-            "2015-01-01 00:34:46.778+00:00, 1420072486778",
-            "2015-01-01 00:34:46.778Z, 1420072486778",
-            "2015-01-01T00:34:46.778+01:00, 1420068886778",
-            "2015-01-01 00:34:46.778-02, 1420079686778",
-    })
-    void testTimestampFromStringDefaultTZ(String stringValue, long longValue) {
-        Timestamp timestamp = Assertions.assertDoesNotThrow(
-                () -> TimestampType.INSTANCE.fromValue(stringValue, null));
-        assertEquals(longValue, timestamp.getTime());
-    }
-
-    @ParameterizedTest
-    @CsvSource(value = {
-            "2009-06-16T07:28:52.333, UTC, 1245137332333",
-            "2015-01-01 00:34:46,     PST, 1420101286000",
-            "2015-01-01 00:34:46.778, PST, 1420101286778"
-    })
-    void testTimestampFromStringCustomTZ(String stringValue, String timezone, long longValue) {
-        Map<String, Object> conversionParams = new HashMap<>();
-        conversionParams.put("calendar", Calendar.getInstance(TimeZone.getTimeZone(timezone)));
-        Timestamp timestamp = Assertions.assertDoesNotThrow(
-                () -> TimestampType.INSTANCE.fromValue(stringValue, conversionParams));
-        assertEquals(longValue, timestamp.getTime());
-    }
-
-    @ParameterizedTest
-    @MethodSource("numberProvider")
-    void testTimestampFromNumber(Number numericValue) {
-        Timestamp timestamp = Assertions.assertDoesNotThrow(
-                () -> TimestampType.INSTANCE.fromValue(numericValue, null));
-        assertEquals(numericValue.longValue(), timestamp.getTime());
-
-        // timestamp does not matter when converting from numeric value
-        Map<String, Object> conversionParams = new HashMap<>();
-        conversionParams.put("calendar", Calendar.getInstance(TimeZone.getTimeZone("PST")));
-        timestamp = Assertions.assertDoesNotThrow(
-                () -> TimestampType.INSTANCE.fromValue(numericValue, conversionParams));
-        assertEquals(numericValue.longValue(), timestamp.getTime());
-    }
-
-    private static Stream<Arguments> numberProvider() {
-        return Stream.of(
-                // longs
-                Arguments.of(1245137332333L),
-                Arguments.of(1420101286778L),
-                Arguments.of(1L),
-                Arguments.of(0L),
-                Arguments.of(-10023456L),
-
-                // ints
-                Arguments.of(1245137332),
-                Arguments.of(1420101286),
-                Arguments.of(1),
-                Arguments.of(0),
-                Arguments.of(-10023456)
-        );
-    }
-
-    @Test
-    void testTimestampFromNull() {
-        Timestamp timestamp = Assertions.assertDoesNotThrow(
-                () -> TimestampType.INSTANCE.fromValue(null, null));
-        assertNull(timestamp);
-
-        // timestamp does not matter when converting from null value
-        Map<String, Object> conversionParams = new HashMap<>();
-        conversionParams.put("calendar", Calendar.getInstance(TimeZone.getTimeZone("PST")));
-        timestamp = Assertions.assertDoesNotThrow(
-                () -> TimestampType.INSTANCE.fromValue(null, conversionParams));
-        assertNull(timestamp);
-    }
-
-
-}
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/TypesTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/types/TypesTests.java
deleted file mode 100644
index 237cda1edc..0000000000
--- a/sql-jdbc/src/test/java/org/opensearch/jdbc/types/TypesTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.jdbc.types;
-
-import static java.util.Collections.emptyMap;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-import java.sql.JDBCType;
-import java.sql.SQLException;
-import org.junit.jupiter.api.Test;
-
-public class TypesTests {
-
-    @Test
-    public void testNullTypeConverter() throws SQLException {
-        TypeConverter tc = TypeConverters.getInstance(JDBCType.NULL);
-        assertNull(tc.convert(null, Object.class, emptyMap()));
-    }
-}
diff --git a/sql-jdbc/src/test/resources/mock/jks/keystore_with_client_key.jks b/sql-jdbc/src/test/resources/mock/jks/keystore_with_client_key.jks
deleted file mode 100644
index b768b0c504..0000000000
Binary files a/sql-jdbc/src/test/resources/mock/jks/keystore_with_client_key.jks and /dev/null differ
diff --git a/sql-jdbc/src/test/resources/mock/jks/keystore_with_non_localhost_server_key.jks b/sql-jdbc/src/test/resources/mock/jks/keystore_with_non_localhost_server_key.jks
deleted file mode 100644
index 6cd7863663..0000000000
Binary files a/sql-jdbc/src/test/resources/mock/jks/keystore_with_non_localhost_server_key.jks and /dev/null differ
diff --git a/sql-jdbc/src/test/resources/mock/jks/keystore_with_server_key.jks b/sql-jdbc/src/test/resources/mock/jks/keystore_with_server_key.jks
deleted file mode 100644
index c59db29b86..0000000000
Binary files a/sql-jdbc/src/test/resources/mock/jks/keystore_with_server_key.jks and /dev/null differ
diff --git a/sql-jdbc/src/test/resources/mock/jks/truststore_with_client_cert.jks b/sql-jdbc/src/test/resources/mock/jks/truststore_with_client_cert.jks
deleted file mode 100644
index 7a95cafa0e..0000000000
Binary files a/sql-jdbc/src/test/resources/mock/jks/truststore_with_client_cert.jks and /dev/null differ
diff --git a/sql-jdbc/src/test/resources/mock/jks/truststore_with_server_cert.jks b/sql-jdbc/src/test/resources/mock/jks/truststore_with_server_cert.jks
deleted file mode 100644
index a1648dd722..0000000000
Binary files a/sql-jdbc/src/test/resources/mock/jks/truststore_with_server_cert.jks and /dev/null differ
diff --git a/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_00.json b/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_00.json
deleted file mode 100644
index 090cac8eb3..0000000000
--- a/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_00.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "schema": [
-    {
-      "name": "firstname",
-      "type": "text"
-    },
-    {
-      "name": "age",
-      "type": "long"
-    }
-  ],
-  "cursor": "abcde_1",
-  "total": 20,
-  "datarows": [
-    [
-      "Amber",
-      32
-    ],
-    [
-      "Hattie",
-      36
-    ],
-    [
-      "Nanette",
-      28
-    ]
-  ],
-  "size": 3,
-  "status": 200
-}
\ No newline at end of file
diff --git a/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_01.json b/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_01.json
deleted file mode 100644
index 3df9caa1ea..0000000000
--- a/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_01.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "cursor": "abcde_2",
-  "datarows": [
-    [
-      "Dale",
-      33
-    ],
-    [
-      "Elinor",
-      36
-    ],
-    [
-      "Virginia",
-      39
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_02.json b/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_02.json
deleted file mode 100644
index d76d17ade3..0000000000
--- a/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_02.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "cursor": "abcde_3",
-  "datarows": [
-    [
-      "Dillard",
-      34
-    ],
-    [
-      "Mcgee",
-      39
-    ],
-    [
-      "Aurelia",
-      37
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_03.json b/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_03.json
deleted file mode 100644
index 99b4448df7..0000000000
--- a/sql-jdbc/src/test/resources/mock/protocol/json/cursor/queryresponse_accounts_03.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "datarows": [
-    [
-      "Fulton",
-      23
-    ],
-    [
-      "Burton",
-      31
-    ],
-    [
-      "Josie",
-      32
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/sql-jdbc/src/test/resources/mock/protocol/json/nyctaxis_queryrequest.json b/sql-jdbc/src/test/resources/mock/protocol/json/nyctaxis_queryrequest.json
deleted file mode 100644
index 6a3210782e..0000000000
--- a/sql-jdbc/src/test/resources/mock/protocol/json/nyctaxis_queryrequest.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "query": "select pickup_datetime, trip_type, passenger_count, fare_amount, extra, vendor_id from nyc_taxis LIMIT 5"
-}
\ No newline at end of file
diff --git a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_internal_server_error.json b/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_internal_server_error.json
deleted file mode 100644
index 83a21830ec..0000000000
--- a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_internal_server_error.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "error": {
-    "reason": "error reason",
-    "details": "java.lang.NullPointerException\n\tat java.base/java.lang.Thread.run(Thread.java:844)\n",
-    "type": "java.lang.NullPointerException"
-  },
-  "status": 500
-}
\ No newline at end of file
diff --git a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_nullablefields.json b/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_nullablefields.json
deleted file mode 100644
index 1068e6caa6..0000000000
--- a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_nullablefields.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "schema": [
-    {
-      "name": "testBoolean",
-      "type": "boolean"
-    },
-    {
-      "name": "docId",
-      "type": "text"
-    },
-    {
-      "name": "testByte",
-      "type": "byte"
-    },
-    {
-      "name": "testFloat",
-      "type": "float"
-    },
-    {
-      "name": "testLong",
-      "type": "long"
-    },
-    {
-      "name": "testShort",
-      "type": "short"
-    },
-    {
-      "name": "testHalfFloat",
-      "type": "half_float"
-    },
-    {
-      "name": "testTimeStamp",
-      "type": "timestamp"
-    },
-    {
-      "name": "testScaledFloat",
-      "type": "scaled_float"
-    },
-    {
-      "name": "testKeyword",
-      "type": "keyword"
-    },
-    {
-      "name": "testText",
-      "type": "text"
-    },
-    {
-      "name": "testDouble",
-      "type": "double"
-    }
-  ],
-  "total": 2,
-  "datarows": [
-    [
-      null,
-      "2",
-      null,
-      22.145135459218345,
-      null,
-      null,
-      24.324234543532153,
-      "2015-01-01 12:10:30",
-      24.324234543532153,
-      "Test String",
-      "document3",
-      null
-    ],
-    [
-      true,
-      "1",
-      126,
-      null,
-      32000320003200030,
-      29000,
-      null,
-      null,
-      null,
-      null,
-      null,
-      22.312423148903218
-    ]
-  ],
-  "size": 2,
-  "status": 200
-}
\ No newline at end of file
diff --git a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_nyctaxis.json b/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_nyctaxis.json
deleted file mode 100644
index d527d7ea83..0000000000
--- a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_nyctaxis.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "schema": [
-    {
-      "name": "pickup_datetime",
-      "type": "timestamp"
-    },
-    {
-      "name": "trip_type",
-      "type": "keyword"
-    },
-    {
-      "name": "passenger_count",
-      "type": "integer"
-    },
-    {
-      "name": "fare_amount",
-      "type": "scaled_float"
-    },
-    {
-      "name": "extra",
-      "type": "scaled_float"
-    },
-    {
-      "name": "vendor_id",
-      "type": "keyword"
-    }
-  ],
-  "total": 1000,
-  "datarows": [
-    [
-      "2015-01-01 00:34:42",
-      "1",
-      1,
-      5,
-      0.5,
-      "2"
-    ],
-    [
-      "2015-01-01 00:34:46",
-      "1",
-      1,
-      12,
-      0.5,
-      "2"
-    ],
-    [
-      "2015-01-01 00:34:44",
-      "1",
-      1,
-      5,
-      0.5,
-      "1"
-    ],
-    [
-      "2015-01-01 00:34:48",
-      "1",
-      1,
-      5,
-      0.5,
-      "2"
-    ],
-    [
-      "2015-01-01 00:34:53",
-      "1",
-      1,
-      24.5,
-      0.5,
-      "2"
-    ]
-  ],
-  "size": 5,
-  "status": 200
-}
\ No newline at end of file
diff --git a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_sonested.json b/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_sonested.json
deleted file mode 100644
index 24b0c005e4..0000000000
--- a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_sonested.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "schema": [
-    {
-      "name": "user",
-      "type": "keyword"
-    },
-    {
-      "name": "title",
-      "type": "text"
-    },
-    {
-      "name": "qid",
-      "type": "keyword"
-    },
-    {
-      "name": "creationDate",
-      "type": "timestamp"
-    }
-  ],
-  "total": 20000,
-  "datarows": [
-    [
-      "Jash",
-      "Display Progress Bar at the Time of Processing",
-      "1000000",
-      "2009-06-16T07:28:42.770"
-    ],
-    [
-      "Michael Ecklund (804104)",
-      "PHP Sort array by field?",
-      "10000005",
-      "2012-04-03T19:25:46.213"
-    ],
-    [
-      "farley (1311218)",
-      "Arrays in PHP seems to drop elements",
-      "10000007",
-      "2012-04-03T19:26:05.400"
-    ],
-    [
-      "John Strickler (292614)",
-      "RESTful servlet URLs - servlet-mapping in web.xml",
-      "10000008",
-      "2012-04-03T19:26:09.137"
-    ],
-    [
-      "rahulm (123536)",
-      "Descriptor conversion problem",
-      "1000001",
-      "2009-06-16T07:28:52.333"
-    ]
-  ],
-  "size": 5,
-  "status": 200
-}
\ No newline at end of file
diff --git a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_with_alias_nyctaxis.json b/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_with_alias_nyctaxis.json
deleted file mode 100644
index 91777df679..0000000000
--- a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_with_alias_nyctaxis.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "schema": [
-    {
-      "name": "pickup_datetime",
-      "alias": "pdt",
-      "type": "timestamp"
-    },
-    {
-      "name": "trip_type",
-      "type": "keyword"
-    },
-    {
-      "name": "passenger_count",
-      "alias": "pc",
-      "type": "integer"
-    },
-    {
-      "name": "fare_amount",
-      "type": "scaled_float"
-    },
-    {
-      "name": "extra",
-      "type": "scaled_float"
-    },
-    {
-      "name": "vendor_id",
-      "type": "keyword"
-    }
-  ],
-  "total": 1000,
-  "datarows": [
-    [
-      "2015-01-01 00:34:42",
-      "1",
-      1,
-      5,
-      0.5,
-      "2"
-    ],
-    [
-      "2015-01-01 00:34:46",
-      "1",
-      1,
-      12,
-      0.5,
-      "2"
-    ],
-    [
-      "2015-01-01 00:34:44",
-      "1",
-      1,
-      5,
-      0.5,
-      "1"
-    ],
-    [
-      "2015-01-01 00:34:48",
-      "1",
-      1,
-      5,
-      0.5,
-      "2"
-    ],
-    [
-      "2015-01-01 00:34:53",
-      "1",
-      1,
-      24.5,
-      0.5,
-      "2"
-    ]
-  ],
-  "size": 5,
-  "status": 200
-}
\ No newline at end of file
diff --git a/sql-odbc/.clang-format b/sql-odbc/.clang-format
deleted file mode 100644
index b8fd6433b6..0000000000
--- a/sql-odbc/.clang-format
+++ /dev/null
@@ -1,16 +0,0 @@
-# Common settings
-BasedOnStyle: Google
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: 'false'
-AllowShortLoopsOnASingleLine: 'false'
-BreakBeforeBinaryOperators: NonAssignment
-IndentWidth: '4'
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: 'false'
-SpacesInAngles: 'true'
-SpacesInParentheses: 'false'
-SpacesInSquareBrackets: 'false'
-TabWidth: '4'
-UseTab: 'false'
-
-# See https://zed0.co.uk/clang-format-configurator/ for generating this file.
\ No newline at end of file
diff --git a/sql-odbc/.gitignore b/sql-odbc/.gitignore
deleted file mode 100644
index 4202615e96..0000000000
--- a/sql-odbc/.gitignore
+++ /dev/null
@@ -1,64 +0,0 @@
-*.aps
-*.obj
-*.iobj
-*.ipdb
-*.pdb
-*.exp
-*.lib
-*.res
-*.idb
-*.res
-*.db
-*.opendb
-*.suo
-*.ipch
-*.cache
-*.log
-bin32/*
-bin64/*
-lib32/*
-lib64/*
-*.tlog
-include/*
-packages/*
-# Visual Studio 
-.vs/*
-# Visual Studio Code
-.vscode/*
-src/psqlodbc/psqlodbcBuilder/x64_*
-src/*/x64
-src/*/Win32
-src/*/*/x64
-src/*/*/Win32
-src/IntegrationTests/ITODBCResults/test_odbc_results1.cpp
-src/IntegrationTests/ITODBCResults/memory_leak_report.txt
-src/IntegrationTests/ITODBCHelper/ITODBCHelper.vcxproj.user
-src/IntegrationTests/ITODBCExecution/memory_leak_report.txt
-src/IntegrationTests/ITODBCResults/ITODBCResults.vcxproj.user
-LICENSE.txt
-/AWSSDK/
-/sdk-build/
-/CMakeFiles/
-/googletest/
-/installer/
-/IntegrationTests/
-/opensearchenlist/
-/sqlodbc/
-/PerformanceTests/
-/UnitTests/
-*.filters
-*.vcxproj
-*.sln
-cmake_install.cmake
-CMakeCache.txt
-CPackConfig.cmake
-CPackSourceConfig.cmake
-CTestTestfile.cmake
-/build/
-/sdk-build32/
-/sdk-build64/
-/cmake-build32/
-/cmake-build64/
-/src/PowerBIConnector/bin/Debug/
-/src/PowerBIConnector/obj/
-/src/PowerBIConnector/.vs/
diff --git a/sql-odbc/CODE_OF_CONDUCT.md b/sql-odbc/CODE_OF_CONDUCT.md
deleted file mode 100644
index bd61be433d..0000000000
--- a/sql-odbc/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,25 +0,0 @@
-
-This code of conduct applies to all spaces provided by the OpenSource project including in code, documentation, issue trackers, mailing lists, chat channels, wikis, blogs, social media and any other communication channels used by the project.
-
-
-**Our open source communities endeavor to:**
-
-* Be Inclusive: We are committed to being a community where everyone can join and contribute. This means using inclusive and welcoming language.
-* Be Welcoming: We are committed to maintaining a safe space for everyone to be able to contribute.
-* Be Respectful: We are committed to encouraging differing viewpoints, accepting constructive criticism and work collaboratively towards decisions that help the project grow. Disrespectful and unacceptable behavior will not be tolerated.
-* Be Collaborative: We are committed to supporting what is best for our community and users. When we build anything for the benefit of the project, we should document the work we do and communicate to others on how this affects their work.
-
-
-**Our Responsibility. As contributors, members, or bystanders we each individually have the responsibility to behave professionally and respectfully at all times. Disrespectful and unacceptable behaviors include, but are not limited to:**
-
-* The use of violent threats, abusive, discriminatory, or derogatory language;
-* Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, race, political or religious affiliation;
-* Posting of sexually explicit or violent content;
-* The use of sexualized language and unwelcome sexual attention or advances;
-* Public or private harassment of any kind;
-* Publishing private information, such as physical or electronic address, without permission;
-* Other conduct which could reasonably be considered inappropriate in a professional setting;
-* Advocating for or encouraging any of the above behaviors.
-* Enforcement and Reporting Code of Conduct Issues:
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported. [Contact us](mailto:opensource-codeofconduct@amazon.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
\ No newline at end of file
diff --git a/sql-odbc/CONTRIBUTING.md b/sql-odbc/CONTRIBUTING.md
deleted file mode 100644
index 0732ef5743..0000000000
--- a/sql-odbc/CONTRIBUTING.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Contributing Guidelines
-
-Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
-documentation, we greatly value feedback and contributions from our community.
-
-Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
-information to effectively respond to your bug report or contribution.
-
-
-## Reporting Bugs/Feature Requests
-
-We welcome you to use the GitHub issue tracker to report bugs or suggest features.
-
-When filing an issue, please check [existing open](https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3AODBC), or [recently closed](https://github.com/opensearch-project/sql/issues?q=is%3Aissue+is%3Aclosed), issues to make sure somebody else hasn't already
-reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
-
-* A reproducible test case or series of steps
-* The version of our code being used
-* Any modifications you've made relevant to the bug
-* Anything unusual about your environment or deployment
-
-## Sign your work
-OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE.txt file](../LICENSE.txt)).  The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software.
-
-We respect intellectual property rights of others and we want to make sure all incoming contributions are correctly attributed and licensed. A Developer Certificate of Origin (DCO) is a lightweight mechanism to do that.
-
-The DCO is a declaration attached to every contribution made by every developer. In the commit message of the contribution, the developer simply adds a `Signed-off-by` statement and thereby agrees to the DCO, which you can find below or at [DeveloperCertificate.org](http://developercertificate.org/).
-
-```
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the
-    best of my knowledge, is covered under an appropriate open
-    source license and I have the right under that license to
-    submit that work with modifications, whether created in whole
-    or in part by me, under the same open source license (unless
-    I am permitted to submit under a different license), as
-    Indicated in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including
-    all personal information I submit with it, including my
-    sign-off) is maintained indefinitely and may be redistributed
-    consistent with this project or the open source license(s)
-    involved.
- ```
-We require that every contribution to OpenSearch is signed with a Developer Certificate of Origin.  Additionally, please use your real name.  We do not accept anonymous contributors nor those utilizing pseudonyms.
-
-Each commit must include a DCO which looks like this
-
-```
-Signed-off-by: Jane Smith <jane.smith@email.com>
-```
-You may type this line on your own when writing your commit messages.  However, if your user.name and user.email are set in your git configs, you can use `-s` or `– – signoff` to add the `Signed-off-by` line to the end of the commit message.
-
-## Contributing via Pull Requests
-Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
-
-1. You are working against the latest source on the *develop* branch.
-2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
-3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
-
-To send us a pull request, please:
-
-1. Fork the repository.
-2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
-3. Ensure local tests pass.
-4. Commit to your fork using clear commit messages.
-5. Send us a pull request, answering any default questions in the pull request interface.
-6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
-
-GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
-[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
-
-
-## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/opensearch-project/sql/issues?q=is%3Aopen+label%3A%22help+wanted%22+label%3AODBC) issues is a great place to start.
-
-
-## Code of Conduct
-This project has adopted an [Open Source Code of Conduct](./CODE_OF_CONDUCT.md).
-
-
-## Security issue notifications
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
-
-
-## Licensing
-
-See the [LICENSE](./LICENSE.txt) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
-
-We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
diff --git a/sql-odbc/LICENSE.txt b/sql-odbc/LICENSE.txt
deleted file mode 100644
index f2ff00e7d8..0000000000
--- a/sql-odbc/LICENSE.txt
+++ /dev/null
@@ -1,961 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-
-		       Version 2, June 1991
-
-
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-
-                    675 Mass Ave, Cambridge, MA 02139, USA
-
- Everyone is permitted to copy and distribute verbatim copies
-
- of this license document, but changing it is not allowed.
-
-
-
-[This is the first released version of the library GPL.  It is
-
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-
-
-			    Preamble
-
-
-
-  The licenses for most software are designed to take away your
-
-freedom to share and change it.  By contrast, the GNU General Public
-
-Licenses are intended to guarantee your freedom to share and change
-
-free software--to make sure the software is free for all its users.
-
-
-
-  This license, the Library General Public License, applies to some
-
-specially designated Free Software Foundation software, and to any
-
-other libraries whose authors decide to use it.  You can use it for
-
-your libraries, too.
-
-
-
-  When we speak of free software, we are referring to freedom, not
-
-price.  Our General Public Licenses are designed to make sure that you
-
-have the freedom to distribute copies of free software (and charge for
-
-this service if you wish), that you receive source code or can get it
-
-if you want it, that you can change the software or use pieces of it
-
-in new free programs; and that you know you can do these things.
-
-
-
-  To protect your rights, we need to make restrictions that forbid
-
-anyone to deny you these rights or to ask you to surrender the rights.
-
-These restrictions translate to certain responsibilities for you if
-
-you distribute copies of the library, or if you modify it.
-
-
-
-  For example, if you distribute copies of the library, whether gratis
-
-or for a fee, you must give the recipients all the rights that we gave
-
-you.  You must make sure that they, too, receive or can get the source
-
-code.  If you link a program with the library, you must provide
-
-complete object files to the recipients so that they can relink them
-
-with the library, after making changes to the library and recompiling
-
-it.  And you must show them these terms so they know their rights.
-
-
-
-  Our method of protecting your rights has two steps: (1) copyright
-
-the library, and (2) offer you this license which gives you legal
-
-permission to copy, distribute and/or modify the library.
-
-
-
-  Also, for each distributor's protection, we want to make certain
-
-that everyone understands that there is no warranty for this free
-
-library.  If the library is modified by someone else and passed on, we
-
-want its recipients to know that what they have is not the original
-
-version, so that any problems introduced by others will not reflect on
-
-the original authors' reputations.
-
-
-
-  Finally, any free program is threatened constantly by software
-
-patents.  We wish to avoid the danger that companies distributing free
-
-software will individually obtain patent licenses, thus in effect
-
-transforming the program into proprietary software.  To prevent this,
-
-we have made it clear that any patent must be licensed for everyone's
-
-free use or not licensed at all.
-
-
-
-  Most GNU software, including some libraries, is covered by the ordinary
-
-GNU General Public License, which was designed for utility programs.  This
-
-license, the GNU Library General Public License, applies to certain
-
-designated libraries.  This license is quite different from the ordinary
-
-one; be sure to read it in full, and don't assume that anything in it is
-
-the same as in the ordinary license.
-
-
-
-  The reason we have a separate public license for some libraries is that
-
-they blur the distinction we usually make between modifying or adding to a
-
-program and simply using it.  Linking a program with a library, without
-
-changing the library, is in some sense simply using the library, and is
-
-analogous to running a utility program or application program.  However, in
-
-a textual and legal sense, the linked executable is a combined work, a
-
-derivative of the original library, and the ordinary General Public License
-
-treats it as such.
-
-
-
-  Because of this blurred distinction, using the ordinary General
-
-Public License for libraries did not effectively promote software
-
-sharing, because most developers did not use the libraries.  We
-
-concluded that weaker conditions might promote sharing better.
-
-
-
-  However, unrestricted linking of non-free programs would deprive the
-
-users of those programs of all benefit from the free status of the
-
-libraries themselves.  This Library General Public License is intended to
-
-permit developers of non-free programs to use free libraries, while
-
-preserving your freedom as a user of such programs to change the free
-
-libraries that are incorporated in them.  (We have not seen how to achieve
-
-this as regards changes in header files, but we have achieved it as regards
-
-changes in the actual functions of the Library.)  The hope is that this
-
-will lead to faster development of free libraries.
-
-
-
-  The precise terms and conditions for copying, distribution and
-
-modification follow.  Pay close attention to the difference between a
-
-"work based on the library" and a "work that uses the library".  The
-
-former contains code derived from the library, while the latter only
-
-works together with the library.
-
-
-
-  Note that it is possible for a library to be covered by the ordinary
-
-General Public License rather than by this special one.
-
-
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-
-
-  0. This License Agreement applies to any software library which
-
-contains a notice placed by the copyright holder or other authorized
-
-party saying it may be distributed under the terms of this Library
-
-General Public License (also called "this License").  Each licensee is
-
-addressed as "you".
-
-
-
-  A "library" means a collection of software functions and/or data
-
-prepared so as to be conveniently linked with application programs
-
-(which use some of those functions and data) to form executables.
-
-
-
-  The "Library", below, refers to any such software library or work
-
-which has been distributed under these terms.  A "work based on the
-
-Library" means either the Library or any derivative work under
-
-copyright law: that is to say, a work containing the Library or a
-
-portion of it, either verbatim or with modifications and/or translated
-
-straightforwardly into another language.  (Hereinafter, translation is
-
-included without limitation in the term "modification".)
-
-
-
-  "Source code" for a work means the preferred form of the work for
-
-making modifications to it.  For a library, complete source code means
-
-all the source code for all modules it contains, plus any associated
-
-interface definition files, plus the scripts used to control compilation
-
-and installation of the library.
-
-
-
-  Activities other than copying, distribution and modification are not
-
-covered by this License; they are outside its scope.  The act of
-
-running a program using the Library is not restricted, and output from
-
-such a program is covered only if its contents constitute a work based
-
-on the Library (independent of the use of the Library in a tool for
-
-writing it).  Whether that is true depends on what the Library does
-
-and what the program that uses the Library does.
-
-
-
-  1. You may copy and distribute verbatim copies of the Library's
-
-complete source code as you receive it, in any medium, provided that
-
-you conspicuously and appropriately publish on each copy an
-
-appropriate copyright notice and disclaimer of warranty; keep intact
-
-all the notices that refer to this License and to the absence of any
-
-warranty; and distribute a copy of this License along with the
-
-Library.
-
-
-
-  You may charge a fee for the physical act of transferring a copy,
-
-and you may at your option offer warranty protection in exchange for a
-
-fee.
-
-
-
-  2. You may modify your copy or copies of the Library or any portion
-
-of it, thus forming a work based on the Library, and copy and
-
-distribute such modifications or work under the terms of Section 1
-
-above, provided that you also meet all of these conditions:
-
-
-
-    a) The modified work must itself be a software library.
-
-
-
-    b) You must cause the files modified to carry prominent notices
-
-    stating that you changed the files and the date of any change.
-
-
-
-    c) You must cause the whole of the work to be licensed at no
-
-    charge to all third parties under the terms of this License.
-
-
-
-    d) If a facility in the modified Library refers to a function or a
-
-    table of data to be supplied by an application program that uses
-
-    the facility, other than as an argument passed when the facility
-
-    is invoked, then you must make a good faith effort to ensure that,
-
-    in the event an application does not supply such function or
-
-    table, the facility still operates, and performs whatever part of
-
-    its purpose remains meaningful.
-
-
-
-    (For example, a function in a library to compute square roots has
-
-    a purpose that is entirely well-defined independent of the
-
-    application.  Therefore, Subsection 2d requires that any
-
-    application-supplied function or table used by this function must
-
-    be optional: if the application does not supply it, the square
-
-    root function must still compute square roots.)
-
-
-
-These requirements apply to the modified work as a whole.  If
-
-identifiable sections of that work are not derived from the Library,
-
-and can be reasonably considered independent and separate works in
-
-themselves, then this License, and its terms, do not apply to those
-
-sections when you distribute them as separate works.  But when you
-
-distribute the same sections as part of a whole which is a work based
-
-on the Library, the distribution of the whole must be on the terms of
-
-this License, whose permissions for other licensees extend to the
-
-entire whole, and thus to each and every part regardless of who wrote
-
-it.
-
-
-
-Thus, it is not the intent of this section to claim rights or contest
-
-your rights to work written entirely by you; rather, the intent is to
-
-exercise the right to control the distribution of derivative or
-
-collective works based on the Library.
-
-
-
-In addition, mere aggregation of another work not based on the Library
-
-with the Library (or with a work based on the Library) on a volume of
-
-a storage or distribution medium does not bring the other work under
-
-the scope of this License.
-
-
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-
-License instead of this License to a given copy of the Library.  To do
-
-this, you must alter all the notices that refer to this License, so
-
-that they refer to the ordinary GNU General Public License, version 2,
-
-instead of to this License.  (If a newer version than version 2 of the
-
-ordinary GNU General Public License has appeared, then you can specify
-
-that version instead if you wish.)  Do not make any other change in
-
-these notices.
-
-
-
-  Once this change is made in a given copy, it is irreversible for
-
-that copy, so the ordinary GNU General Public License applies to all
-
-subsequent copies and derivative works made from that copy.
-
-
-
-  This option is useful when you wish to copy part of the code of
-
-the Library into a program that is not a library.
-
-
-
-  4. You may copy and distribute the Library (or a portion or
-
-derivative of it, under Section 2) in object code or executable form
-
-under the terms of Sections 1 and 2 above provided that you accompany
-
-it with the complete corresponding machine-readable source code, which
-
-must be distributed under the terms of Sections 1 and 2 above on a
-
-medium customarily used for software interchange.
-
-
-
-  If distribution of object code is made by offering access to copy
-
-from a designated place, then offering equivalent access to copy the
-
-source code from the same place satisfies the requirement to
-
-distribute the source code, even though third parties are not
-
-compelled to copy the source along with the object code.
-
-
-
-  5. A program that contains no derivative of any portion of the
-
-Library, but is designed to work with the Library by being compiled or
-
-linked with it, is called a "work that uses the Library".  Such a
-
-work, in isolation, is not a derivative work of the Library, and
-
-therefore falls outside the scope of this License.
-
-
-
-  However, linking a "work that uses the Library" with the Library
-
-creates an executable that is a derivative of the Library (because it
-
-contains portions of the Library), rather than a "work that uses the
-
-library".  The executable is therefore covered by this License.
-
-Section 6 states terms for distribution of such executables.
-
-
-
-  When a "work that uses the Library" uses material from a header file
-
-that is part of the Library, the object code for the work may be a
-
-derivative work of the Library even though the source code is not.
-
-Whether this is true is especially significant if the work can be
-
-linked without the Library, or if the work is itself a library.  The
-
-threshold for this to be true is not precisely defined by law.
-
-
-
-  If such an object file uses only numerical parameters, data
-
-structure layouts and accessors, and small macros and small inline
-
-functions (ten lines or less in length), then the use of the object
-
-file is unrestricted, regardless of whether it is legally a derivative
-
-work.  (Executables containing this object code plus portions of the
-
-Library will still fall under Section 6.)
-
-
-
-  Otherwise, if the work is a derivative of the Library, you may
-
-distribute the object code for the work under the terms of Section 6.
-
-Any executables containing that work also fall under Section 6,
-
-whether or not they are linked directly with the Library itself.
-
-
-
-  6. As an exception to the Sections above, you may also compile or
-
-link a "work that uses the Library" with the Library to produce a
-
-work containing portions of the Library, and distribute that work
-
-under terms of your choice, provided that the terms permit
-
-modification of the work for the customer's own use and reverse
-
-engineering for debugging such modifications.
-
-
-
-  You must give prominent notice with each copy of the work that the
-
-Library is used in it and that the Library and its use are covered by
-
-this License.  You must supply a copy of this License.  If the work
-
-during execution displays copyright notices, you must include the
-
-copyright notice for the Library among them, as well as a reference
-
-directing the user to the copy of this License.  Also, you must do one
-
-of these things:
-
-
-
-    a) Accompany the work with the complete corresponding
-
-    machine-readable source code for the Library including whatever
-
-    changes were used in the work (which must be distributed under
-
-    Sections 1 and 2 above); and, if the work is an executable linked
-
-    with the Library, with the complete machine-readable "work that
-
-    uses the Library", as object code and/or source code, so that the
-
-    user can modify the Library and then relink to produce a modified
-
-    executable containing the modified Library.  (It is understood
-
-    that the user who changes the contents of definitions files in the
-
-    Library will not necessarily be able to recompile the application
-
-    to use the modified definitions.)
-
-
-
-    b) Accompany the work with a written offer, valid for at
-
-    least three years, to give the same user the materials
-
-    specified in Subsection 6a, above, for a charge no more
-
-    than the cost of performing this distribution.
-
-
-
-    c) If distribution of the work is made by offering access to copy
-
-    from a designated place, offer equivalent access to copy the above
-
-    specified materials from the same place.
-
-
-
-    d) Verify that the user has already received a copy of these
-
-    materials or that you have already sent this user a copy.
-
-
-
-  For an executable, the required form of the "work that uses the
-
-Library" must include any data and utility programs needed for
-
-reproducing the executable from it.  However, as a special exception,
-
-the source code distributed need not include anything that is normally
-
-distributed (in either source or binary form) with the major
-
-components (compiler, kernel, and so on) of the operating system on
-
-which the executable runs, unless that component itself accompanies
-
-the executable.
-
-
-
-  It may happen that this requirement contradicts the license
-
-restrictions of other proprietary libraries that do not normally
-
-accompany the operating system.  Such a contradiction means you cannot
-
-use both them and the Library together in an executable that you
-
-distribute.
-
-
-
-  7. You may place library facilities that are a work based on the
-
-Library side-by-side in a single library together with other library
-
-facilities not covered by this License, and distribute such a combined
-
-library, provided that the separate distribution of the work based on
-
-the Library and of the other library facilities is otherwise
-
-permitted, and provided that you do these two things:
-
-
-
-    a) Accompany the combined library with a copy of the same work
-
-    based on the Library, uncombined with any other library
-
-    facilities.  This must be distributed under the terms of the
-
-    Sections above.
-
-
-
-    b) Give prominent notice with the combined library of the fact
-
-    that part of it is a work based on the Library, and explaining
-
-    where to find the accompanying uncombined form of the same work.
-
-
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-
-the Library except as expressly provided under this License.  Any
-
-attempt otherwise to copy, modify, sublicense, link with, or
-
-distribute the Library is void, and will automatically terminate your
-
-rights under this License.  However, parties who have received copies,
-
-or rights, from you under this License will not have their licenses
-
-terminated so long as such parties remain in full compliance.
-
-
-
-  9. You are not required to accept this License, since you have not
-
-signed it.  However, nothing else grants you permission to modify or
-
-distribute the Library or its derivative works.  These actions are
-
-prohibited by law if you do not accept this License.  Therefore, by
-
-modifying or distributing the Library (or any work based on the
-
-Library), you indicate your acceptance of this License to do so, and
-
-all its terms and conditions for copying, distributing or modifying
-
-the Library or works based on it.
-
-
-
-  10. Each time you redistribute the Library (or any work based on the
-
-Library), the recipient automatically receives a license from the
-
-original licensor to copy, distribute, link with or modify the Library
-
-subject to these terms and conditions.  You may not impose any further
-
-restrictions on the recipients' exercise of the rights granted herein.
-
-You are not responsible for enforcing compliance by third parties to
-
-this License.
-
-
-
-  11. If, as a consequence of a court judgment or allegation of patent
-
-infringement or for any other reason (not limited to patent issues),
-
-conditions are imposed on you (whether by court order, agreement or
-
-otherwise) that contradict the conditions of this License, they do not
-
-excuse you from the conditions of this License.  If you cannot
-
-distribute so as to satisfy simultaneously your obligations under this
-
-License and any other pertinent obligations, then as a consequence you
-
-may not distribute the Library at all.  For example, if a patent
-
-license would not permit royalty-free redistribution of the Library by
-
-all those who receive copies directly or indirectly through you, then
-
-the only way you could satisfy both it and this License would be to
-
-refrain entirely from distribution of the Library.
-
-
-
-If any portion of this section is held invalid or unenforceable under any
-
-particular circumstance, the balance of the section is intended to apply,
-
-and the section as a whole is intended to apply in other circumstances.
-
-
-
-It is not the purpose of this section to induce you to infringe any
-
-patents or other property right claims or to contest validity of any
-
-such claims; this section has the sole purpose of protecting the
-
-integrity of the free software distribution system which is
-
-implemented by public license practices.  Many people have made
-
-generous contributions to the wide range of software distributed
-
-through that system in reliance on consistent application of that
-
-system; it is up to the author/donor to decide if he or she is willing
-
-to distribute software through any other system and a licensee cannot
-
-impose that choice.
-
-
-
-This section is intended to make thoroughly clear what is believed to
-
-be a consequence of the rest of this License.
-
-
-
-  12. If the distribution and/or use of the Library is restricted in
-
-certain countries either by patents or by copyrighted interfaces, the
-
-original copyright holder who places the Library under this License may add
-
-an explicit geographical distribution limitation excluding those countries,
-
-so that distribution is permitted only in or among countries not thus
-
-excluded.  In such case, this License incorporates the limitation as if
-
-written in the body of this License.
-
-
-
-  13. The Free Software Foundation may publish revised and/or new
-
-versions of the Library General Public License from time to time.
-
-Such new versions will be similar in spirit to the present version,
-
-but may differ in detail to address new problems or concerns.
-
-
-
-Each version is given a distinguishing version number.  If the Library
-
-specifies a version number of this License which applies to it and
-
-"any later version", you have the option of following the terms and
-
-conditions either of that version or of any later version published by
-
-the Free Software Foundation.  If the Library does not specify a
-
-license version number, you may choose any version ever published by
-
-the Free Software Foundation.
-
-
-
-  14. If you wish to incorporate parts of the Library into other free
-
-programs whose distribution conditions are incompatible with these,
-
-write to the author to ask for permission.  For software which is
-
-copyrighted by the Free Software Foundation, write to the Free
-
-Software Foundation; we sometimes make exceptions for this.  Our
-
-decision will be guided by the two goals of preserving the free status
-
-of all derivatives of our free software and of promoting the sharing
-
-and reuse of software generally.
-
-
-
-			    NO WARRANTY
-
-
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-
-DAMAGES.
-
-
-
-		     END OF TERMS AND CONDITIONS
-
-
-
-     Appendix: How to Apply These Terms to Your New Libraries
-
-
-
-  If you develop a new library, and you want it to be of the greatest
-
-possible use to the public, we recommend making it free software that
-
-everyone can redistribute and change.  You can do so by permitting
-
-redistribution under these terms (or, alternatively, under the terms of the
-
-ordinary General Public License).
-
-
-
-  To apply these terms, attach the following notices to the library.  It is
-
-safest to attach them to the start of each source file to most effectively
-
-convey the exclusion of warranty; and each file should have at least the
-
-"copyright" line and a pointer to where the full notice is found.
-
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-
-    Copyright (C) <year>  <name of author>
-
-
-
-    This library is free software; you can redistribute it and/or
-
-    modify it under the terms of the GNU Library General Public
-
-    License as published by the Free Software Foundation; either
-
-    version 2 of the License, or (at your option) any later version.
-
-
-
-    This library is distributed in the hope that it will be useful,
-
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-
-    Library General Public License for more details.
-
-
-
-    You should have received a copy of the GNU Library General Public
-
-    License along with this library; if not, write to the Free
-
-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-
-
-You should also get your employer (if you work as a programmer) or your
-
-school, if any, to sign a "copyright disclaimer" for the library, if
-
-necessary.  Here is a sample; alter the names:
-
-
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-
-
-  <signature of Ty Coon>, 1 April 1990
-
-  Ty Coon, President of Vice
-
-
-
-That's all there is to it!
diff --git a/sql-odbc/MAINTAINERS.md b/sql-odbc/MAINTAINERS.md
deleted file mode 100644
index 59838756d9..0000000000
--- a/sql-odbc/MAINTAINERS.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# OpenSearch ODBC Maintainers
-
-## Maintainers
-
-| Maintainer | GitHub ID | Affiliation |
-| --------------- | --------- | ----------- |
-| Anirudha (Ani) Jadhav | [anirudha](https://github.com/anirudha) | Amazon |
-| Peng Huo | [penghuo](https://github.com/penghuo) | Amazon |
-| Chloe | [chloe-zh](https://github.com/chloe-zh) | Amazon |
-| Chen Dai | [dai-chen](https://github.com/dai-chen) | Amazon |
-| Harold Wang | [harold-wang](https://github.com/harold-wang) | Amazon |
diff --git a/sql-odbc/NOTICE b/sql-odbc/NOTICE
deleted file mode 100644
index 5eb8961489..0000000000
--- a/sql-odbc/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenSearch
-Copyright OpenSearch Contributors
-
-This product includes software developed by
-Elasticsearch (http://www.elastic.co).
-Copyright 2009-2018 Elasticsearch
-
-This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).
-
-This product includes software developed by
-Joda.org (http://www.joda.org/).
diff --git a/sql-odbc/README.md b/sql-odbc/README.md
deleted file mode 100644
index 22dd90b9ff..0000000000
--- a/sql-odbc/README.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# OpenSearch ODBC Driver
-
-OpenSearchODBC is a read-only ODBC driver for Windows and Mac for connecting to OpenSearch SQL support.
-
-## Specifications
-
-The driver is compatible with ODBC 3.51.
-
-## Supported Versions
-
-
-  | Operating System  | Version                           | Supported Bitness |
-  | ----------------- |-----------------------------------| ----------------- |
-  |  Windows          |  Windows 10, Windows 11           | 32-bit, 64-bit    |
-  |  MacOS            |  Catalina 10.15.4, Mojave 10.14.6 | 64-bit            |
-
-## BI Tool Connectors
-
-* [Power BI Desktop](../bi-connectors/PowerBIConnector/README.md)
-* [Tableau Desktop](../bi-connectors/TableauConnector/README.md)
-
-## Download and Installation the Driver
-
-You can use the installers generated as part of the most recent release.
-They are available for download from [Artifacts page](https://opensearch.org/artifacts) on OpenSearch.org at the very bottom and from [automated CI workflow](https://github.com/opensearch-project/sql/actions/workflows/sql-odbc-main.yml).
-
-### Windows
-
-1. Run the `.msi` installer to install the OpenSearch SQL ODBC Driver.
-2. [Test connection](./docs/user/windows_configure_dsn.md) using ODBC Data Source Administrator.
-
-To use the driver with Tableau:
-1. Copy the `.tdc` file from `<driver-install-dir>/resources` to `<windows-user-dir>/Documents/My Tableau Repository/Datasources`.
-
-This will customize the connection from Tableau to OpenSearch, ensuring that the correct forms of queries are used. 
-
-### Mac
-
-[iODBC Driver Manager](http://www.iodbc.org/dataspace/doc/iodbc/wiki/iodbcWiki/WelcomeVisitors) should be installed before installing the OpenSearch SQL ODBC Driver on Mac.
-
-1. Run the `.pkg` installer to install the OpenSearch SQL ODBC Driver.
-2. Configure a Driver and DSN entry for the OpenSearch SQL ODBC Driver, following the instructions [here](./docs/user/mac_configure_dsn.md).
-
-To use the driver with Tableau:
-1. Copy the `.tdc` file from `<driver-install-dir>/resources` to `<mac-user-dir>/Documents/My Tableau Repository/Datasources`.
-
-This will customize the connection from Tableau to OpenSearch, ensuring that the correct forms of queries are used.
-
-## Using the Driver
-
-The driver comes in the form of a library file:
-* Windows: `sqlodbc.dll`
-* Mac: `libsqlodbc.dylib`
-
-If using with ODBC compatible BI tools, refer to the tool documentation on configuring a new ODBC driver. In most cases, you will need to make the tool aware of the location of the driver library file and then use it to setup OpenSearch database connections.
-
-### Connection Strings and Configuring the Driver
-
-A list of options available for configuring driver behaviour is available [here](./docs/user/configuration_options.md).
-
-To setup a connection, the driver uses an ODBC connection string. Connection strings are semicolon-delimited strings specifying the set of options to use for a connection. Typically, a connection string will either:
-
-1. specify a Data Source Name containing a pre-configured set of options (`DSN=xxx;User=xxx;Password=xxx;`)
-2. or configure options explicitly using the string (`Host=xxx;Port=xxx;LogLevel=OPENSEARCH_DEBUG;...`)
-
-## Building from source
-
-### Building
-
-Please refer to the [build instructions](./docs/dev/BUILD_INSTRUCTIONS.md) for detailed build instructions on your platform.
-If your PC is already setup to build the library, you can simply invoke cmake using
-
-> cmake ./src
-
-From the projects root directory, then build the project using Visual Studio (Windows) or make (Mac). 
-
-* Visual Studio: Open **./global_make_list.sln**
-* Make: Run `make` from the build root.
-
-### Testing
-
-**NOTE**: Some tests in ITODBCConnection will fail if a test DSN (Data Source Name) is not configured on your system. Refer to "Running Tests" in the [build instructions](./docs/dev/BUILD_INSTRUCTIONS.md) for more information on configuring this.
-
-## Documentation
-
-Please refer to the [documentation](https://docs-beta.opensearch.org/) for detailed information on installing and configuring OpenSearch.
-
-## Code of Conduct
-
-This project has adopted an [Open Source Code of Conduct](./CODE_OF_CONDUCT.md).
-
-## Security issue notifications
-
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue.
-
-## Licensing
-
-See the [LICENSE](./LICENSE.txt) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
-
-## Copyright
-
-Copyright OpenSearch Contributors. See [NOTICE](./NOTICE) for details.
diff --git a/sql-odbc/THIRD-PARTY b/sql-odbc/THIRD-PARTY
deleted file mode 100644
index 767783a6fa..0000000000
--- a/sql-odbc/THIRD-PARTY
+++ /dev/null
@@ -1,1775 +0,0 @@
-** aws-cpp-sdk-core -- https://github.com/aws/aws-sdk-cpp
-** rapidjson -- https://github.com/Tencent/rapidjson
-** rabbit -- https://github.com/mashiro/rabbit
-** Visual Leak Detector -- https://github.com/KindDragon/vld
-** PostgreSQL v12.0 -- https://www.postgresql.org/ftp/source/v12.0/
-** Googletest -- https://github.com/google/googletest
-** StableCoder - code-coverage.cmake -- https://github.com/StableCoder/cmake-scripts/blob/main/code-coverage.cmake
-
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND
-DISTRIBUTION
-
-1. Definitions.
-
-
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this
-document.
-
-
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such
-entity.
-
-
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and
-configuration files.
-
-
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object
-code, generated documentation, and conversions to other media
-types.
-
-
-
-"Work" shall mean the work of authorship, whether in Source or Object form,
-made available under the License, as indicated by a copyright notice that is
-included in or attached to the work (an example is provided in the Appendix
-below).
-
-
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works
-thereof.
-
-
-
-"Contribution" shall mean any work of authorship, including the original
-version of the Work and any modifications or additions to that Work or
-Derivative Works thereof, that is intentionally submitted to Licensor for
-inclusion in the Work by the copyright owner or by an individual or Legal
-Entity authorized to submit on behalf of the copyright owner. For the purposes
-of this definition, "submitted" means any form of electronic, verbal, or
-written communication sent to the Licensor or its representatives, including
-but not limited to communication on electronic mailing lists, source code
-control systems, and issue tracking systems that are managed by, or on behalf
-of, the Licensor for the purpose of discussing and improving the Work, but
-excluding communication that is conspicuously marked or otherwise designated in
-writing by the copyright owner as "Not a Contribution."
-
-
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-reproduce, prepare Derivative Works of, publicly display, publicly perform,
-sublicense, and distribute the Work and such Derivative Works in Source or
-Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this
-section) patent license to make, have made, use, offer to sell, sell, import,
-and otherwise transfer the Work, where such license applies only to those
-patent claims licensable by such Contributor that are necessarily infringed by
-their Contribution(s) alone or by combination of their Contribution(s) with the
-Work to which such Contribution(s) was submitted. If You institute patent
-litigation against any entity (including a cross-claim or counterclaim in a
-lawsuit) alleging that the Work or a Contribution incorporated within the Work
-constitutes direct or contributory patent infringement, then any patent
-licenses granted to You under this License for that Work shall terminate as of
-the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or
-Derivative Works thereof in any medium, with or without modifications, and in
-Source or Object form, provided that You meet the following conditions:
-
-(a) You must give any other recipients of the Work or Derivative Works a copy
-of this License; and
-
-(b) You must cause any modified files to carry prominent notices stating that
-You changed the files; and
-
-(c) You must retain, in the Source form of any Derivative Works that You
-distribute, all copyright, patent, trademark, and attribution notices from the
-Source form of the Work, excluding those notices that do not pertain to any
-part of the Derivative Works; and
-
-(d) If the Work includes a "NOTICE" text file as part of its distribution, then
-any Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a
-whole, provided Your use, reproduction, and distribution of the Work otherwise
-complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any
-Contribution intentionally submitted for inclusion in the Work by You to the
-Licensor shall be under the terms and conditions of this License, without any
-additional terms or conditions. Notwithstanding the above, nothing herein shall
-supersede or modify the terms of any separate license agreement you may have
-executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor, except as required
-for reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in
-writing, Licensor provides the Work (and each Contributor provides its
-Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied, including, without limitation, any warranties
-or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining the
-appropriateness of using or redistributing the Work and assume any risks
-associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in
-tort (including negligence), contract, or otherwise, unless required by
-applicable law (such as deliberate and grossly negligent acts) or agreed to in
-writing, shall any Contributor be liable to You for damages, including any
-direct, indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or out of the use or inability to
-use the Work (including but not limited to damages for loss of goodwill, work
-stoppage, computer failure or malfunction, or any and all other commercial
-damages or losses), even if such Contributor has been advised of the
-possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or
-Derivative Works thereof, You may choose to offer, and charge a fee for,
-acceptance of support, warranty, indemnity, or other liability obligations
-and/or rights consistent with this License. However, in accepting such
-obligations, You may act only on Your own behalf and on Your sole
-responsibility, not on behalf of any other Contributor, and only if You agree
-to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability. END OF TERMS AND
-CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification
-within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
-
-
-* For aws-cpp-sdk-core see also this required NOTICE:
-Copyright 2013-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-===============================================================================
-
-* For rapidjson see also this required NOTICE:
-
-Tencent is pleased to support the open source community by making RapidJSON available. 
- 
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
-
-If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.
-If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON. To avoid the problematic JSON license in your own projects, it's sufficient to exclude the bin/jsonchecker/ directory, as it's the only code under the JSON license.
-A copy of the MIT License is included in this file.
-
-Other dependencies and licenses:
-
-Open Source Software Licensed Under the BSD License:
---------------------------------------------------------------------
-
-The msinttypes r29 
-Copyright (c) 2006-2013 Alexander Chemeris 
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Open Source Software Licensed Under the JSON License:
---------------------------------------------------------------------
-
-json.org 
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-JSON_checker
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-	
-Terms of the JSON License:
----------------------------------------------------
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Terms of the MIT License:
---------------------------------------------------------------------
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-===============================================================================
-
-* For rabbit see also this required NOTICE:
-
-The MIT License (MIT)
-
-Copyright (c) 2013-2014 mashiro
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-===============================================================================
-
-* For Visual Leak Detector see also this required NOTICE:
-
- GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-===============================================================================
-
-* For PostgreSQL v12.0 see also this required NOTICE:
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-
-		       Version 2, June 1991
-
-
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-
-                    675 Mass Ave, Cambridge, MA 02139, USA
-
- Everyone is permitted to copy and distribute verbatim copies
-
- of this license document, but changing it is not allowed.
-
-
-
-[This is the first released version of the library GPL.  It is
-
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-
-
-			    Preamble
-
-
-
-  The licenses for most software are designed to take away your
-
-freedom to share and change it.  By contrast, the GNU General Public
-
-Licenses are intended to guarantee your freedom to share and change
-
-free software--to make sure the software is free for all its users.
-
-
-
-  This license, the Library General Public License, applies to some
-
-specially designated Free Software Foundation software, and to any
-
-other libraries whose authors decide to use it.  You can use it for
-
-your libraries, too.
-
-
-
-  When we speak of free software, we are referring to freedom, not
-
-price.  Our General Public Licenses are designed to make sure that you
-
-have the freedom to distribute copies of free software (and charge for
-
-this service if you wish), that you receive source code or can get it
-
-if you want it, that you can change the software or use pieces of it
-
-in new free programs; and that you know you can do these things.
-
-
-
-  To protect your rights, we need to make restrictions that forbid
-
-anyone to deny you these rights or to ask you to surrender the rights.
-
-These restrictions translate to certain responsibilities for you if
-
-you distribute copies of the library, or if you modify it.
-
-
-
-  For example, if you distribute copies of the library, whether gratis
-
-or for a fee, you must give the recipients all the rights that we gave
-
-you.  You must make sure that they, too, receive or can get the source
-
-code.  If you link a program with the library, you must provide
-
-complete object files to the recipients so that they can relink them
-
-with the library, after making changes to the library and recompiling
-
-it.  And you must show them these terms so they know their rights.
-
-
-
-  Our method of protecting your rights has two steps: (1) copyright
-
-the library, and (2) offer you this license which gives you legal
-
-permission to copy, distribute and/or modify the library.
-
-
-
-  Also, for each distributor's protection, we want to make certain
-
-that everyone understands that there is no warranty for this free
-
-library.  If the library is modified by someone else and passed on, we
-
-want its recipients to know that what they have is not the original
-
-version, so that any problems introduced by others will not reflect on
-
-the original authors' reputations.
-
-
-
-  Finally, any free program is threatened constantly by software
-
-patents.  We wish to avoid the danger that companies distributing free
-
-software will individually obtain patent licenses, thus in effect
-
-transforming the program into proprietary software.  To prevent this,
-
-we have made it clear that any patent must be licensed for everyone's
-
-free use or not licensed at all.
-
-
-
-  Most GNU software, including some libraries, is covered by the ordinary
-
-GNU General Public License, which was designed for utility programs.  This
-
-license, the GNU Library General Public License, applies to certain
-
-designated libraries.  This license is quite different from the ordinary
-
-one; be sure to read it in full, and don't assume that anything in it is
-
-the same as in the ordinary license.
-
-
-
-  The reason we have a separate public license for some libraries is that
-
-they blur the distinction we usually make between modifying or adding to a
-
-program and simply using it.  Linking a program with a library, without
-
-changing the library, is in some sense simply using the library, and is
-
-analogous to running a utility program or application program.  However, in
-
-a textual and legal sense, the linked executable is a combined work, a
-
-derivative of the original library, and the ordinary General Public License
-
-treats it as such.
-
-
-
-  Because of this blurred distinction, using the ordinary General
-
-Public License for libraries did not effectively promote software
-
-sharing, because most developers did not use the libraries.  We
-
-concluded that weaker conditions might promote sharing better.
-
-
-
-  However, unrestricted linking of non-free programs would deprive the
-
-users of those programs of all benefit from the free status of the
-
-libraries themselves.  This Library General Public License is intended to
-
-permit developers of non-free programs to use free libraries, while
-
-preserving your freedom as a user of such programs to change the free
-
-libraries that are incorporated in them.  (We have not seen how to achieve
-
-this as regards changes in header files, but we have achieved it as regards
-
-changes in the actual functions of the Library.)  The hope is that this
-
-will lead to faster development of free libraries.
-
-
-
-  The precise terms and conditions for copying, distribution and
-
-modification follow.  Pay close attention to the difference between a
-
-"work based on the library" and a "work that uses the library".  The
-
-former contains code derived from the library, while the latter only
-
-works together with the library.
-
-
-
-  Note that it is possible for a library to be covered by the ordinary
-
-General Public License rather than by this special one.
-
-
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-
-
-  0. This License Agreement applies to any software library which
-
-contains a notice placed by the copyright holder or other authorized
-
-party saying it may be distributed under the terms of this Library
-
-General Public License (also called "this License").  Each licensee is
-
-addressed as "you".
-
-
-
-  A "library" means a collection of software functions and/or data
-
-prepared so as to be conveniently linked with application programs
-
-(which use some of those functions and data) to form executables.
-
-
-
-  The "Library", below, refers to any such software library or work
-
-which has been distributed under these terms.  A "work based on the
-
-Library" means either the Library or any derivative work under
-
-copyright law: that is to say, a work containing the Library or a
-
-portion of it, either verbatim or with modifications and/or translated
-
-straightforwardly into another language.  (Hereinafter, translation is
-
-included without limitation in the term "modification".)
-
-
-
-  "Source code" for a work means the preferred form of the work for
-
-making modifications to it.  For a library, complete source code means
-
-all the source code for all modules it contains, plus any associated
-
-interface definition files, plus the scripts used to control compilation
-
-and installation of the library.
-
-
-
-  Activities other than copying, distribution and modification are not
-
-covered by this License; they are outside its scope.  The act of
-
-running a program using the Library is not restricted, and output from
-
-such a program is covered only if its contents constitute a work based
-
-on the Library (independent of the use of the Library in a tool for
-
-writing it).  Whether that is true depends on what the Library does
-
-and what the program that uses the Library does.
-
-  
-
-  1. You may copy and distribute verbatim copies of the Library's
-
-complete source code as you receive it, in any medium, provided that
-
-you conspicuously and appropriately publish on each copy an
-
-appropriate copyright notice and disclaimer of warranty; keep intact
-
-all the notices that refer to this License and to the absence of any
-
-warranty; and distribute a copy of this License along with the
-
-Library.
-
-
-
-  You may charge a fee for the physical act of transferring a copy,
-
-and you may at your option offer warranty protection in exchange for a
-
-fee.
-
-
-
-  2. You may modify your copy or copies of the Library or any portion
-
-of it, thus forming a work based on the Library, and copy and
-
-distribute such modifications or work under the terms of Section 1
-
-above, provided that you also meet all of these conditions:
-
-
-
-    a) The modified work must itself be a software library.
-
-
-
-    b) You must cause the files modified to carry prominent notices
-
-    stating that you changed the files and the date of any change.
-
-
-
-    c) You must cause the whole of the work to be licensed at no
-
-    charge to all third parties under the terms of this License.
-
-
-
-    d) If a facility in the modified Library refers to a function or a
-
-    table of data to be supplied by an application program that uses
-
-    the facility, other than as an argument passed when the facility
-
-    is invoked, then you must make a good faith effort to ensure that,
-
-    in the event an application does not supply such function or
-
-    table, the facility still operates, and performs whatever part of
-
-    its purpose remains meaningful.
-
-
-
-    (For example, a function in a library to compute square roots has
-
-    a purpose that is entirely well-defined independent of the
-
-    application.  Therefore, Subsection 2d requires that any
-
-    application-supplied function or table used by this function must
-
-    be optional: if the application does not supply it, the square
-
-    root function must still compute square roots.)
-
-
-
-These requirements apply to the modified work as a whole.  If
-
-identifiable sections of that work are not derived from the Library,
-
-and can be reasonably considered independent and separate works in
-
-themselves, then this License, and its terms, do not apply to those
-
-sections when you distribute them as separate works.  But when you
-
-distribute the same sections as part of a whole which is a work based
-
-on the Library, the distribution of the whole must be on the terms of
-
-this License, whose permissions for other licensees extend to the
-
-entire whole, and thus to each and every part regardless of who wrote
-
-it.
-
-
-
-Thus, it is not the intent of this section to claim rights or contest
-
-your rights to work written entirely by you; rather, the intent is to
-
-exercise the right to control the distribution of derivative or
-
-collective works based on the Library.
-
-
-
-In addition, mere aggregation of another work not based on the Library
-
-with the Library (or with a work based on the Library) on a volume of
-
-a storage or distribution medium does not bring the other work under
-
-the scope of this License.
-
-
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-
-License instead of this License to a given copy of the Library.  To do
-
-this, you must alter all the notices that refer to this License, so
-
-that they refer to the ordinary GNU General Public License, version 2,
-
-instead of to this License.  (If a newer version than version 2 of the
-
-ordinary GNU General Public License has appeared, then you can specify
-
-that version instead if you wish.)  Do not make any other change in
-
-these notices.
-
-
-
-  Once this change is made in a given copy, it is irreversible for
-
-that copy, so the ordinary GNU General Public License applies to all
-
-subsequent copies and derivative works made from that copy.
-
-
-
-  This option is useful when you wish to copy part of the code of
-
-the Library into a program that is not a library.
-
-
-
-  4. You may copy and distribute the Library (or a portion or
-
-derivative of it, under Section 2) in object code or executable form
-
-under the terms of Sections 1 and 2 above provided that you accompany
-
-it with the complete corresponding machine-readable source code, which
-
-must be distributed under the terms of Sections 1 and 2 above on a
-
-medium customarily used for software interchange.
-
-
-
-  If distribution of object code is made by offering access to copy
-
-from a designated place, then offering equivalent access to copy the
-
-source code from the same place satisfies the requirement to
-
-distribute the source code, even though third parties are not
-
-compelled to copy the source along with the object code.
-
-
-
-  5. A program that contains no derivative of any portion of the
-
-Library, but is designed to work with the Library by being compiled or
-
-linked with it, is called a "work that uses the Library".  Such a
-
-work, in isolation, is not a derivative work of the Library, and
-
-therefore falls outside the scope of this License.
-
-
-
-  However, linking a "work that uses the Library" with the Library
-
-creates an executable that is a derivative of the Library (because it
-
-contains portions of the Library), rather than a "work that uses the
-
-library".  The executable is therefore covered by this License.
-
-Section 6 states terms for distribution of such executables.
-
-
-
-  When a "work that uses the Library" uses material from a header file
-
-that is part of the Library, the object code for the work may be a
-
-derivative work of the Library even though the source code is not.
-
-Whether this is true is especially significant if the work can be
-
-linked without the Library, or if the work is itself a library.  The
-
-threshold for this to be true is not precisely defined by law.
-
-
-
-  If such an object file uses only numerical parameters, data
-
-structure layouts and accessors, and small macros and small inline
-
-functions (ten lines or less in length), then the use of the object
-
-file is unrestricted, regardless of whether it is legally a derivative
-
-work.  (Executables containing this object code plus portions of the
-
-Library will still fall under Section 6.)
-
-
-
-  Otherwise, if the work is a derivative of the Library, you may
-
-distribute the object code for the work under the terms of Section 6.
-
-Any executables containing that work also fall under Section 6,
-
-whether or not they are linked directly with the Library itself.
-
-
-
-  6. As an exception to the Sections above, you may also compile or
-
-link a "work that uses the Library" with the Library to produce a
-
-work containing portions of the Library, and distribute that work
-
-under terms of your choice, provided that the terms permit
-
-modification of the work for the customer's own use and reverse
-
-engineering for debugging such modifications.
-
-
-
-  You must give prominent notice with each copy of the work that the
-
-Library is used in it and that the Library and its use are covered by
-
-this License.  You must supply a copy of this License.  If the work
-
-during execution displays copyright notices, you must include the
-
-copyright notice for the Library among them, as well as a reference
-
-directing the user to the copy of this License.  Also, you must do one
-
-of these things:
-
-
-
-    a) Accompany the work with the complete corresponding
-
-    machine-readable source code for the Library including whatever
-
-    changes were used in the work (which must be distributed under
-
-    Sections 1 and 2 above); and, if the work is an executable linked
-
-    with the Library, with the complete machine-readable "work that
-
-    uses the Library", as object code and/or source code, so that the
-
-    user can modify the Library and then relink to produce a modified
-
-    executable containing the modified Library.  (It is understood
-
-    that the user who changes the contents of definitions files in the
-
-    Library will not necessarily be able to recompile the application
-
-    to use the modified definitions.)
-
-
-
-    b) Accompany the work with a written offer, valid for at
-
-    least three years, to give the same user the materials
-
-    specified in Subsection 6a, above, for a charge no more
-
-    than the cost of performing this distribution.
-
-
-
-    c) If distribution of the work is made by offering access to copy
-
-    from a designated place, offer equivalent access to copy the above
-
-    specified materials from the same place.
-
-
-
-    d) Verify that the user has already received a copy of these
-
-    materials or that you have already sent this user a copy.
-
-
-
-  For an executable, the required form of the "work that uses the
-
-Library" must include any data and utility programs needed for
-
-reproducing the executable from it.  However, as a special exception,
-
-the source code distributed need not include anything that is normally
-
-distributed (in either source or binary form) with the major
-
-components (compiler, kernel, and so on) of the operating system on
-
-which the executable runs, unless that component itself accompanies
-
-the executable.
-
-
-
-  It may happen that this requirement contradicts the license
-
-restrictions of other proprietary libraries that do not normally
-
-accompany the operating system.  Such a contradiction means you cannot
-
-use both them and the Library together in an executable that you
-
-distribute.
-
-
-
-  7. You may place library facilities that are a work based on the
-
-Library side-by-side in a single library together with other library
-
-facilities not covered by this License, and distribute such a combined
-
-library, provided that the separate distribution of the work based on
-
-the Library and of the other library facilities is otherwise
-
-permitted, and provided that you do these two things:
-
-
-
-    a) Accompany the combined library with a copy of the same work
-
-    based on the Library, uncombined with any other library
-
-    facilities.  This must be distributed under the terms of the
-
-    Sections above.
-
-
-
-    b) Give prominent notice with the combined library of the fact
-
-    that part of it is a work based on the Library, and explaining
-
-    where to find the accompanying uncombined form of the same work.
-
-
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-
-the Library except as expressly provided under this License.  Any
-
-attempt otherwise to copy, modify, sublicense, link with, or
-
-distribute the Library is void, and will automatically terminate your
-
-rights under this License.  However, parties who have received copies,
-
-or rights, from you under this License will not have their licenses
-
-terminated so long as such parties remain in full compliance.
-
-
-
-  9. You are not required to accept this License, since you have not
-
-signed it.  However, nothing else grants you permission to modify or
-
-distribute the Library or its derivative works.  These actions are
-
-prohibited by law if you do not accept this License.  Therefore, by
-
-modifying or distributing the Library (or any work based on the
-
-Library), you indicate your acceptance of this License to do so, and
-
-all its terms and conditions for copying, distributing or modifying
-
-the Library or works based on it.
-
-
-
-  10. Each time you redistribute the Library (or any work based on the
-
-Library), the recipient automatically receives a license from the
-
-original licensor to copy, distribute, link with or modify the Library
-
-subject to these terms and conditions.  You may not impose any further
-
-restrictions on the recipients' exercise of the rights granted herein.
-
-You are not responsible for enforcing compliance by third parties to
-
-this License.
-
-
-
-  11. If, as a consequence of a court judgment or allegation of patent
-
-infringement or for any other reason (not limited to patent issues),
-
-conditions are imposed on you (whether by court order, agreement or
-
-otherwise) that contradict the conditions of this License, they do not
-
-excuse you from the conditions of this License.  If you cannot
-
-distribute so as to satisfy simultaneously your obligations under this
-
-License and any other pertinent obligations, then as a consequence you
-
-may not distribute the Library at all.  For example, if a patent
-
-license would not permit royalty-free redistribution of the Library by
-
-all those who receive copies directly or indirectly through you, then
-
-the only way you could satisfy both it and this License would be to
-
-refrain entirely from distribution of the Library.
-
-
-
-If any portion of this section is held invalid or unenforceable under any
-
-particular circumstance, the balance of the section is intended to apply,
-
-and the section as a whole is intended to apply in other circumstances.
-
-
-
-It is not the purpose of this section to induce you to infringe any
-
-patents or other property right claims or to contest validity of any
-
-such claims; this section has the sole purpose of protecting the
-
-integrity of the free software distribution system which is
-
-implemented by public license practices.  Many people have made
-
-generous contributions to the wide range of software distributed
-
-through that system in reliance on consistent application of that
-
-system; it is up to the author/donor to decide if he or she is willing
-
-to distribute software through any other system and a licensee cannot
-
-impose that choice.
-
-
-
-This section is intended to make thoroughly clear what is believed to
-
-be a consequence of the rest of this License.
-
-
-
-  12. If the distribution and/or use of the Library is restricted in
-
-certain countries either by patents or by copyrighted interfaces, the
-
-original copyright holder who places the Library under this License may add
-
-an explicit geographical distribution limitation excluding those countries,
-
-so that distribution is permitted only in or among countries not thus
-
-excluded.  In such case, this License incorporates the limitation as if
-
-written in the body of this License.
-
-
-
-  13. The Free Software Foundation may publish revised and/or new
-
-versions of the Library General Public License from time to time.
-
-Such new versions will be similar in spirit to the present version,
-
-but may differ in detail to address new problems or concerns.
-
-
-
-Each version is given a distinguishing version number.  If the Library
-
-specifies a version number of this License which applies to it and
-
-"any later version", you have the option of following the terms and
-
-conditions either of that version or of any later version published by
-
-the Free Software Foundation.  If the Library does not specify a
-
-license version number, you may choose any version ever published by
-
-the Free Software Foundation.
-
-
-
-  14. If you wish to incorporate parts of the Library into other free
-
-programs whose distribution conditions are incompatible with these,
-
-write to the author to ask for permission.  For software which is
-
-copyrighted by the Free Software Foundation, write to the Free
-
-Software Foundation; we sometimes make exceptions for this.  Our
-
-decision will be guided by the two goals of preserving the free status
-
-of all derivatives of our free software and of promoting the sharing
-
-and reuse of software generally.
-
-
-
-			    NO WARRANTY
-
-
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-
-DAMAGES.
-
-
-
-		     END OF TERMS AND CONDITIONS
-
-
-
-     Appendix: How to Apply These Terms to Your New Libraries
-
-
-
-  If you develop a new library, and you want it to be of the greatest
-
-possible use to the public, we recommend making it free software that
-
-everyone can redistribute and change.  You can do so by permitting
-
-redistribution under these terms (or, alternatively, under the terms of the
-
-ordinary General Public License).
-
-
-
-  To apply these terms, attach the following notices to the library.  It is
-
-safest to attach them to the start of each source file to most effectively
-
-convey the exclusion of warranty; and each file should have at least the
-
-"copyright" line and a pointer to where the full notice is found.
-
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-
-    Copyright (C) <year>  <name of author>
-
-
-
-    This library is free software; you can redistribute it and/or
-
-    modify it under the terms of the GNU Library General Public
-
-    License as published by the Free Software Foundation; either
-
-    version 2 of the License, or (at your option) any later version.
-
-
-
-    This library is distributed in the hope that it will be useful,
-
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-
-    Library General Public License for more details.
-
-
-
-    You should have received a copy of the GNU Library General Public
-
-    License along with this library; if not, write to the Free
-
-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-
-
-You should also get your employer (if you work as a programmer) or your
-
-school, if any, to sign a "copyright disclaimer" for the library, if
-
-necessary.  Here is a sample; alter the names:
-
-
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-
-
-  <signature of Ty Coon>, 1 April 1990
-
-  Ty Coon, President of Vice
-
-
-
-That's all there is to it!
-
-===============================================================================
-
-* For Googletest see also this required NOTICE:
-
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/sql-odbc/build_mac_debug64.sh b/sql-odbc/build_mac_debug64.sh
deleted file mode 100755
index 784aeade81..0000000000
--- a/sql-odbc/build_mac_debug64.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-cd src
-vcpkg install
-cd ..
-
-vcpkg_installed_dir='x64-osx'
-if [[ $MACHTYPE == 'arm64-apple-darwin'* ]]; then
-  vcpkg_installed_dir='arm64-osx'
-fi
-
-PREFIX_PATH=$(pwd)
-mkdir cmake-build64
-cd cmake-build64
-cmake ../src -DCMAKE_INSTALL_PREFIX=${PREFIX_PATH}/src/vcpkg_installed/${vcpkg_installed_dir}/ -DCMAKE_BUILD_TYPE=Debug -DBUILD_ONLY="core" -DCUSTOM_MEMORY_MANAGEMENT="OFF" -DENABLE_RTTI="OFF" -DENABLE_TESTING="OFF"
-cd ..
-
-cmake --build cmake-build64 -- -j 4
diff --git a/sql-odbc/build_mac_release64.sh b/sql-odbc/build_mac_release64.sh
deleted file mode 100755
index 8fab73efc3..0000000000
--- a/sql-odbc/build_mac_release64.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-cd src
-vcpkg install
-cd ..
-
-vcpkg_installed_dir='x64-osx'
-if [[ $MACHTYPE == 'arm64-apple-darwin'* ]]; then
-  vcpkg_installed_dir='arm64-osx'
-fi
-
-PREFIX_PATH=$(pwd)
-mkdir cmake-build64
-cd cmake-build64
-cmake ../src -DCMAKE_INSTALL_PREFIX=${PREFIX_PATH}/src/vcpkg_installed/${vcpkg_installed_dir}/ -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY="core" -DCUSTOM_MEMORY_MANAGEMENT="OFF" -DENABLE_RTTI="OFF" -DENABLE_TESTING="OFF"
-cd ..
-
-cmake --build cmake-build64 -- -j 4
diff --git a/sql-odbc/build_win_debug32.ps1 b/sql-odbc/build_win_debug32.ps1
deleted file mode 100644
index 2717064b14..0000000000
--- a/sql-odbc/build_win_debug32.ps1
+++ /dev/null
@@ -1,6 +0,0 @@
-$WORKING_DIR = (Get-Location).Path
-$env:VCPKG_DEFAULT_TRIPLET = 'x86-windows'
-cd src
-vcpkg install
-cd ..
-.\scripts\build_windows.ps1 $WORKING_DIR Debug 32
diff --git a/sql-odbc/build_win_debug64.ps1 b/sql-odbc/build_win_debug64.ps1
deleted file mode 100644
index 98a9a24ff1..0000000000
--- a/sql-odbc/build_win_debug64.ps1
+++ /dev/null
@@ -1,6 +0,0 @@
-$WORKING_DIR = (Get-Location).Path
-$env:VCPKG_DEFAULT_TRIPLET = 'x64-windows'
-cd src
-vcpkg install
-cd ..
-.\scripts\build_windows.ps1 $WORKING_DIR Debug 64
diff --git a/sql-odbc/build_win_release32.ps1 b/sql-odbc/build_win_release32.ps1
deleted file mode 100644
index c7e41da659..0000000000
--- a/sql-odbc/build_win_release32.ps1
+++ /dev/null
@@ -1,6 +0,0 @@
-$WORKING_DIR = (Get-Location).Path
-$env:VCPKG_DEFAULT_TRIPLET = 'x86-windows'
-cd src
-vcpkg install
-cd ..
-.\scripts\build_windows.ps1 $WORKING_DIR Release 32
diff --git a/sql-odbc/build_win_release64.ps1 b/sql-odbc/build_win_release64.ps1
deleted file mode 100644
index a17f4d63f6..0000000000
--- a/sql-odbc/build_win_release64.ps1
+++ /dev/null
@@ -1,6 +0,0 @@
-$WORKING_DIR = (Get-Location).Path
-$env:VCPKG_DEFAULT_TRIPLET = 'x64-windows'
-cd src
-vcpkg install
-cd ..
-.\scripts\build_windows.ps1 $WORKING_DIR Release 64
diff --git a/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md b/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md
deleted file mode 100644
index dfd3d771e0..0000000000
--- a/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md
+++ /dev/null
@@ -1,137 +0,0 @@
-# OpenSearch SQL ODBC Driver Build Instructions
-
-## Windows
-
-### Requirements
-
-* Install [cmake](https://cmake.org/install/)
-* Install [Visual Studio 2019](https://visualstudio.microsoft.com/vs/) 
-  * Other versions may work, but only 2019 has been tested
-
-**NOTE:** All Windows/`.ps1` scripts must be run from a [Developer Powershell](https://devblogs.microsoft.com/visualstudio/the-powershell-you-know-and-love-now-with-a-side-of-visual-studio/).
-
-> A shortcut is installed on your system with Visual Studio (**"Developer Powershell for VS 2019"**)
-
-> Programs launched with this prompt (ex: VS Code) also have access to the Developer shell.
-
-> For more information regarding the Developer Powershell: https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-160
-
-### Build
-
-```
-.\build_win_<config><bitness>.ps1
-```
-
-A Visual Studio 2019 solution will also be generated for building/testing the driver with Visual Studio. (Note: if the build fails, the solution will still be generated.)
-
-Solution file: `<odbc-root>\build\odbc\cmake\global_make_list.sln`.
-
-### Output
-
-```
-build
-└-- odbc
-  └-- bin
-    └-- <Configuration>
-  └-- cmake
-  └-- lib
-└-- aws-sdk
-  └-- build
-  └-- install
-```
-
-* Driver DLL: `.\build\odbc\bin\<Config>\sqlodbc.dll`
-* Test binaries folder: `.\build\odbc\bin\<Config>\`
-
-### Packaging
-
-**Note:** If you make changes to the driver code or CMake project files, re-run the `build_windows_<config><bitness>.sh` script before running the following command.
-
-```
-msbuild .\build\odbc\PACKAGE.vcxproj -p:Configuration=Release
-```
-
-`OpenSearch SQL ODBC Driver-<version>-Windows-<Bitness>-bit.msi` will be generated in the build directory.
-
-### Testing
-See [run_tests.md](./run_tests.md)
-
-## Mac
-
-### Requirements
-
-[Homebrew](https://brew.sh/) is required for installing the following necessary packages.
-```
-brew install curl
-brew install cmake
-brew install libiodbc
-```
-
-### Build
-
-```
-./build_mac_<config><bitness>.sh
-```
-
-### Output
-
-```
-build
-└-- odbc
-  └-- bin
-  └-- lib
-└-- cmake-build64
-  └-- <build files>
-```
-
-* Driver library: `./build/odbc/lib/libsqlodbc.dylib`
-* Test binaries folder: `./build/odbc/bin/`
-
-### Packaging
-
-**Note:** If you make changes to the driver code or CMake project files, re-run the `build_mac_<config><bitness>.sh` script before running the following command.
-
-```
-cd cmake-build64/
-cpack .
-```
-
-`OpenSearch SQL ODBC Driver-<version>-Darwin.pkg` will be generated in the build directory.
-
-### Testing
-See [run_tests.md](./run_tests.md)
-
-## General Build Info
-
-### ODBC Driver CMake Options
-
-**BUILD_WITH_TESTS**
-
-(Defaults to ON) If disabled, all tests and and test dependencies will be excluded from build which will optimize the installer package size. This option can set with the command line (using `-D`).
-
-### Working With SSL/TLS
-
-To disable SSL/TLS in the tests, the main CMakeLists.txt file must be edited. This can be found in the project 'src' directory. In the 'General compiler definitions' in the CMakeLists.txt file, USE_SSL is set. Remove this from the add_compile_definitions function to stop SSL/TLS from being used in the tests.
-
-To enable SSL/TLS on OpenSearch, you must edit the OpenSearch.yml file, found in the config directory of OpenSearch. An example OpenSearch yml file can be found in the dev folder of this project. The certificates specified MUST be in the config directory of the OpenSearch instance. For more information, please refer to the [OpenSearch security settings documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html).
-
-If you plan to use OpenSearch Dashboards, as suggested for this project, you must also edit the OpenSearch Dashboards settings. Notice, when specifying a certificate for OpenSearch Dashboards, you do not need to place it in the OpenSearch Dashboards config directory, but instead must provide the absolute path to it. An example opensearch_dashboards.yml file can be found in the dev folder of this project. For more information, please refer to the [OpenSearch Dashboards settings documentation](https://www.elastic.co/guide/en/kibana/current/settings.html).
-
-### Setting up a DSN
-
-A **D**ata **S**ouce **N**ame is used to store driver information in the system. By storing the information in the system, the information does not need to be specified each time the driver connects.
-
-#### Windows
-
-> To setup DSN, add following keys in the Registry
->
-   >* **HKEY_LOCAL_MACHINE/SOFTWARE/ODBC/ODBC.INI** : Contains a key for each Data Source Name (DSN)
-   >* **HKEY_LOCAL_MACHINE/SOFTWARE/ODBC/ODBC.INI/ODBC Data Sources** : Lists the data sources
-   >* **HKEY_LOCAL_MACHINE/SOFTWARE/ODBC/ODBCINST.INI** :  Define each driver's name and setup location
-   >* **HKEY_LOCAL_MACHINE/SOFTWARE/ODBC/ODBCINST.INI/ODBC Drivers** : Lists the installed drivers.
->
->These keys can be added manually in the Registry Editor (Start > Run > Regedit) one by one. Alternatively, keys can be added together as follows:
->
->1. Modify the appropriate values for these keys in `src/IntegrationTests/ITODBCConnection/test_dsn.reg`
->2. Double click on the `test_dsn.reg` file.
->3. Click `Yes` on the confirmation window to add keys in the registry.
diff --git a/sql-odbc/docs/dev/Pagination.md b/sql-odbc/docs/dev/Pagination.md
deleted file mode 100644
index ff2a862f67..0000000000
--- a/sql-odbc/docs/dev/Pagination.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# OpenSearch ODBC Driver Cursor (Pagination) Support Design Documentation
-
-## Overview
-OpenSearch ODBC Driver supports forward-only cursor. This document illustrates how the cursor(pagination) is handled in the driver. 
-
-For information on how the pagination is supported on OpenSearch server, check [OpenSearch SQL Cursor (Pagination) Support](https://github.com/opensearch-project/sql/blob/main/docs/dev/Pagination.md).
-
-## Data Flow
-<p align="center"> 
-<img src="img/data_flow.png" width="60%">
-</p>
-
-* Steps 3 & 4 will repeatedly get datarows until entire result is retrieved.
-* Step 5 will send a request to close cursor whenever the connection is closed.
-* ODBC Driver will provide an option to define fetch size as a connection parameter.
-  * If fetch size is zero, query will fallback to non-cursor behavior.
-  * If fetch size is not given then the number of rows per request will be as per server-defined [default fetch size](https://github.com/opensearch-project/sql/blob/main/docs/dev/Pagination.md#42-salient-points).
-* ODBC Driver will send the request to close cursor whenever the connection is closed.
-
-## Detailed Design
-
-The ODBC Driver will use std::promise and std::future to retrieve the result asynchronusly.
-
-* Thread to send queries is designed to get the next set of results.
-* Thread to process data is designed to parse the datarows and add the results in the resultset.
-
-<img src="img/async_result_retrieval.png">
-
diff --git a/sql-odbc/docs/dev/datasets/opensearch_dashboards_sample_data_types.md b/sql-odbc/docs/dev/datasets/opensearch_dashboards_sample_data_types.md
deleted file mode 100644
index 5ad09b910e..0000000000
--- a/sql-odbc/docs/dev/datasets/opensearch_dashboards_sample_data_types.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# opensearch_dashboards_sample_data_types 
-
-## Mapping
-
-```json
-PUT /opensearch_dashboards_sample_data_types
-{  
-    "mappings": {  
-        "properties": {  
-        "type_boolean" : { "type": "boolean"},  
-        "type_byte" : { "type": "byte"},  
-        "type_short" : { "type": "short"},  
-        "type_integer" : { "type": "integer"},  
-        "type_long" : { "type": "long"},  
-        "type_half_float" : { "type": "half_float"},  
-        "type_float" : { "type": "float"},  
-        "type_double" : { "type": "double"},  
-        "type_scaled_float" : {
-            "type": "scaled_float",
-            "scaling_factor": 100
-        },  
-        "type_keyword" : { "type": "keyword"},  
-        "type_text" : { "type": "text"},  
-        "type_date" : { "type": "date"},  
-        "type_object" : { "type": "object"},  
-        "type_nested" : { "type": "nested"}  
-        }  
-    }
-}
-```
-
-## Data
-
-```json
-POST /opensearch_dashboards_sample_data_types/_doc
-{
-   "type_boolean": true,
-   "type_byte" : -120,
-   "type_short" : -2000,
-   "type_integer" :-350000000,
-   "type_long" : -8010000000,
-   "type_half_float" : -2.115,
-   "type_float" : -3.1512,
-   "type_double" : -5335.2215,
-   "type_scaled_float" : -100.1,
-   "type_keyword" : "goodbye",
-   "type_text" : "planet",
-   "type_date" : "2016-02-21T12:23:52.803Z",
-   "type_object" : { "foo" : "bar" },
-   "type_nested" : {"foo":"bar"}
-}
-```
-
-```json
-POST /opensearch_dashboards_sample_data_types/_doc  
-{
-   "type_boolean": false,
-   "type_byte" : 100,
-   "type_short" : 1000,
-   "type_integer" : 250000000,
-   "type_long" : 8000000000,
-   "type_half_float" : 1.115,
-   "type_float" : 2.1512,
-   "type_double" : 25235.2215,
-   "type_scaled_float" : 100,
-   "type_keyword" : "hello",
-   "type_text" : "world",
-   "type_date" : "2018-07-22T12:23:52.803Z",
-   "type_object" : { "foo" : "bar" },
-   "type_nested" : {"foo":"bar"}
-}
-```
\ No newline at end of file
diff --git a/sql-odbc/docs/dev/example_config_files/example_tdc_file.tdc b/sql-odbc/docs/dev/example_config_files/example_tdc_file.tdc
deleted file mode 100644
index 9aca123470..0000000000
--- a/sql-odbc/docs/dev/example_config_files/example_tdc_file.tdc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<connection-customization class='genericodbc' enabled='true' version='7.8'>
-<vendor name='OpenSearch' />
-<driver name='<your_driver_name>' />
-	<customizations>
-		<customization name='CAP_CREATE_TEMP_TABLES' value='no' />
-		<customization name='CAP_SUPPRESS_DISCOVERY_QUERIES' value='yes' />
-	</customizations>
-</connection-customization>
\ No newline at end of file
diff --git a/sql-odbc/docs/dev/example_config_files/opensearch.yml b/sql-odbc/docs/dev/example_config_files/opensearch.yml
deleted file mode 100644
index 8f578210e3..0000000000
--- a/sql-odbc/docs/dev/example_config_files/opensearch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-xpack.security.http.ssl.enabled: true
-xpack.security.http.ssl.client_authentication: none
-xpack.security.http.ssl.key_passphrase: password_if_applicable
-xpack.security.http.ssl.certificate: certificate.pem
-xpack.security.http.ssl.key: key.pem
\ No newline at end of file
diff --git a/sql-odbc/docs/dev/example_config_files/opensearch_dashboards.yml b/sql-odbc/docs/dev/example_config_files/opensearch_dashboards.yml
deleted file mode 100644
index 48d2c9b677..0000000000
--- a/sql-odbc/docs/dev/example_config_files/opensearch_dashboards.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# The URLs of the OpenSearch instances to use for all your queries.
-opensearch.hosts: ["https://localhost:9200"]
-
-opensearch.ssl.verificationMode: none
-
-server.ssl.enabled: true
-server.ssl.certificate: <PATH_TO_YOUR_CERT>/certificate.pem
-server.ssl.key:  <PATH_TO_YOUR_CERT>/key.pem
-server.ssl.clientAuthentication: none
diff --git a/sql-odbc/docs/dev/img/async_result_retrieval.png b/sql-odbc/docs/dev/img/async_result_retrieval.png
deleted file mode 100644
index c28087af1e..0000000000
Binary files a/sql-odbc/docs/dev/img/async_result_retrieval.png and /dev/null differ
diff --git a/sql-odbc/docs/dev/img/data_flow.png b/sql-odbc/docs/dev/img/data_flow.png
deleted file mode 100644
index 987e8d830c..0000000000
Binary files a/sql-odbc/docs/dev/img/data_flow.png and /dev/null differ
diff --git a/sql-odbc/docs/dev/run_tests.md b/sql-odbc/docs/dev/run_tests.md
deleted file mode 100644
index 6d7dd149b9..0000000000
--- a/sql-odbc/docs/dev/run_tests.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# OpenSearch SQL ODBC Driver Testing
-
-## Requirements
-
-* Latest version of [OpenSearch](https://docs-beta.opensearch.org/opensearch/install/index/)
-* [Required datasets loaded](#set-up-test-datasets)
-* [DSN configured](#set-up-dsn)
-
-### Set up test datasets
-
-Loading a dataset requires an [OpenSearch](https://docs-beta.opensearch.org/opensearch/install/index/) service running with [OpenSearch Dashboards](https://docs-beta.opensearch.org/dashboards/index/). If either of these are missing, please refer to the documentation on how to set them up.
-
-Note, if you wish to work with SSL/TLS, you need to configure OpenSearch and OpenSearch Dashboards to support it. See the [build instructions](./BUILD_INSTRUCTIONS.md) for more info.
-
-First load the sample datasets provided by OpenSearch Dashboards.
-
-1. Select home (top left corner)
-2. Select 'Load a data set and a OpenSearch Dashboards dashboard'
-3. Select 'Add data' under 'Sample flight data'
-4. Select 'Add data' under 'Sample eCommerce orders'
-5. Select 'Add data' under 'Sample web logs'
-
-Then load the following custom data sets using the OpenSearch Dashboards console.
-Select the wrench on the left control panel. Enter the following commands into the console and hit the play button after each one.
-
-* [opensearch_dashboards_sample_data_types](datasets/opensearch_dashboards_sample_data_types.md)
-
-### Set up DSN
-
-A test DSN named `test_dsn` must be set up in order for certain tests in ITODBCConnection to pass. To configure the DSN, see the instructions below.
-
-### Windows Test DSN Setup
-
-1. Open `src/IntegrationTests/ITODBCConnection/test_dsn.reg`.
-   * This contains the registry entries needed for setting up `test_dsn`.
-2. Do one of the following:
-   * As an Administrator, run a command prompt or Powershell and run `reg import <.reg-file>` to add the entries to your registry.
-   * Manually add the entries to your registry using Registry Editor.
-
-### Mac Test DSN Setup
-
-1. Open `src/IntegrationTests/ITODBCConnection/test_odbc.ini` and `src/IntegrationTests/ITODBCConnection/test_odbcinst.ini`
-   * These contain the minimal configuration necessary for setting up `test_dsn`.
-2. Do one of the following:
-   * Add the following lines to your .bash_profile to point the driver to these files.
-      * `export ODBCINI=<project-dir>/src/IntegrationTests/ITODBCConnection/test_odbc.ini`
-      * `export ODBCINSTINI=<project-dir>/src/IntegrationTests/ITODBCConnection/test_odbcinst.ini`
-   * Manually add the entries to your existing `odbc.ini` and `odbcinst.ini` entries. (normally found at `~/.odbc.ini` and `~/.odbcinst.ini`)
-
-## Running Tests
-Tests can be executed directly, or by using the **Test Runner**.
-
-### Direct
-
-#### Windows
-
-Tests can be executed directly using **Visual Studio** by setting the desired test as a **Start up Project**
-
->* **Right click** the desired test project in the **Solution Explorer**
->* Select **Set as Startup Project**
->* Run the test by selecting **Local Windows Debugger** in the toolbar at the top of the application
-
-For more information, see the [Visual Studio Console Application documentation](https://docs.microsoft.com/en-us/cpp/build/vscpp-step-2-build?view=vs-2019).
-
-#### Mac
-
-Tests can be executed using a command line interface. From the project root directory, enter:
-> **bin64/<test_name>**
-
-### Test Runner
-
-The **Test Runner** requires [python](https://wiki.python.org/moin/BeginnersGuide/Download) to be installed on the system. Running the **Test Runner** will execute all the tests and compile a report with the results. The report indicates the execution status of all tests along with the execution time. To find error details of any failed test, hover over the test.
-
-#### Windows
-
-Open the project's root directory in a command line interface of your choice. Execute
->**.\run_test_runner.bat**
-
-The **Test Runner** has been tried and tested with [Python3.8](https://www.python.org/downloads/release/python-380/) on **Windows systems**. Other versions of Python may work, but are untested.
-
-#### Mac
-
-Open the project's root directory in a command line interface of your choice. Execute
->**./run_test_runner.sh**
-
-The **Test Runner** has been tried and tested with [Python3.7.6](https://www.python.org/downloads/release/python-376/) on **Mac systems**. Other versions of Python may work, but are untested.
-
-### Run with Coverage (Mac only)
-
-(using a CMake script provided by George Cave (StableCoder) under the Apache 2.0 license, found [here](https://github.com/StableCoder/cmake-scripts/blob/main/code-coverage.cmake))
-
-#### Requirements
-* `llvm-cov` in your PATH environment variable
-   * Possible locations for this binary:
-      * `/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin`
-      * `/Library/Developer/CommandLineTools/usr/bin`
-
-To build the tests with code coverage enabled, set the `CODE_COVERAGE` variable to `ON` when preparing your CMake build.
-```bash
-cmake -DBUILD_WITH_TESTS=ON -DCODE_COVERAGE=ON <rest-of-cmake-command>
-```
-
-To get coverage for the driver library, you must use the `ccov-all` target, which runs all test suites and components with coverage.
-```bash
-make ccov-all
-```
-
-This will generate an HTML report at `<cmake-build-dir>/ccov/all-merged/index.html`, which can be opened in a web browser to view a summary of the overall code coverage, as well as line-by-line coverage for individual files.
-
-For more information interpreting this report, see https://clang.llvm.org/docs/SourceBasedCodeCoverage.html#interpreting-reports.
-
diff --git a/sql-odbc/docs/dev/sequence_diagrams/SQLDriverConnect.png b/sql-odbc/docs/dev/sequence_diagrams/SQLDriverConnect.png
deleted file mode 100644
index 6810835abe..0000000000
Binary files a/sql-odbc/docs/dev/sequence_diagrams/SQLDriverConnect.png and /dev/null differ
diff --git a/sql-odbc/docs/dev/sequence_diagrams/SQLDriverConnect.txt b/sql-odbc/docs/dev/sequence_diagrams/SQLDriverConnect.txt
deleted file mode 100644
index 411cc3d9e8..0000000000
--- a/sql-odbc/docs/dev/sequence_diagrams/SQLDriverConnect.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ODBCTest->psqlodbc Driver:SQLDriverConnect or SQLConnect
-psqlodbc Driver->libes (C interface):DB Parameters
-libes (C interface)->Connection Factory:ESConn
-Connection Factory->ESConn:Initialize ESConn
-ESConn->libes (C interface):ESConn object
-libes (C interface)->ESConn:DB Parameters
-ESConn->libes (C interface):DB Parameters Validation Result
-libes (C interface)->ESConn:Connect to DB
-database OpenSearch
-ESConn->OpenSearch:Get
-OpenSearch->ESConn:data
-ESConn->libes (C interface):DB Connection Result
-libes (C interface)->psqlodbc Driver:ESConn object with DB Connection
-psqlodbc Driver->ODBCTest:SQL Code Result
\ No newline at end of file
diff --git a/sql-odbc/docs/dev/sequence_diagrams/SQLExecDirect.png b/sql-odbc/docs/dev/sequence_diagrams/SQLExecDirect.png
deleted file mode 100644
index cbb4ba714b..0000000000
Binary files a/sql-odbc/docs/dev/sequence_diagrams/SQLExecDirect.png and /dev/null differ
diff --git a/sql-odbc/docs/dev/sequence_diagrams/SQLExecDirect.txt b/sql-odbc/docs/dev/sequence_diagrams/SQLExecDirect.txt
deleted file mode 100644
index 1c6a3df3cd..0000000000
--- a/sql-odbc/docs/dev/sequence_diagrams/SQLExecDirect.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Title SQLExecDirect Sequence Diagram
-ODBCTest->psqlodbc Driver:SQLExecDirect
-psqlodbc Driver->libes (C interface):Query
-libes (C interface)->libes (C interface):Active Connection
-libes (C interface)->ESConn:Connection, Query
-ESConn->ESConn:Connection, Query validation
-database OpenSearch
-ESConn->OpenSearch:Post
-OpenSearch->ESConn:Data
-ESConn->libes (C interface):Data
-libes (C interface)->psqlodbc Driver:Data
-psqlodbc Driver->ODBCTest:Query Execution Status
\ No newline at end of file
diff --git a/sql-odbc/docs/test/data_connection_wizard.md b/sql-odbc/docs/test/data_connection_wizard.md
deleted file mode 100644
index 9f6525e7cd..0000000000
--- a/sql-odbc/docs/test/data_connection_wizard.md
+++ /dev/null
@@ -1,34 +0,0 @@
-## Data Connection Wizard 
-
-* Open blank workbook in Microsoft Excel.
-* Click on **Data** > **Get Data** > **Legacy Wizards** > **From Data Connection Wizard (Legacy)**
-
-<img src="img/data_connection_wizard_select.png" width="400">
-
-* Select **ODBC DSN** and Click on **Next**.
-
-<img src="img/data_connection_wizard_dsn.png" width="500">
-
-* Select **OpenSearch SQL ODBC DSN** and Click on **Next**.
-
-<img src="img/data_connection_wizard_select_dsn.png" width="500">
-
-* Select required table and Click on **Next**.
-
-<img src="img/data_connection_wizard_table_list.png" width="500">
-
-* Add the description. Edit file names if required. Select whether to use this connection file while refreshing data. Click on **Finish**.
-
-<img src="img/data_connection_wizard_save_connection_file.png" width="500">
-
-* Select the worksheet to load data. Click on **OK**.
-
-<img src="img/data_connection_wizard_select_worksheet.png" width="300">
-
-* Data will be loaded in the spreadsheet.
-
-<img src="img/data_connection_wizard_load_data.png">
-
-**NOTE**: If **Legacy Wizards** is disabled in Microsoft Excel, It can enabled by **File** > **Options** > **Data** > **Show legacy data import wizards** > Check **From Data Connection Wizard (Legacy)**.
-
-<img src="img/data_connection_wizard_enable.png" width=600>
diff --git a/sql-odbc/docs/test/excel_connection.md b/sql-odbc/docs/test/excel_connection.md
deleted file mode 100644
index 562ac1c694..0000000000
--- a/sql-odbc/docs/test/excel_connection.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Testing Microsoft Excel Connection
-
-## Prerequisites
-* [Download and install](../../README.md) OpenSearch SQL ODBC Driver.
-* [Install and configure](https://docs-beta.opensearch.org/opensearch/install/index/) OpenSearch.
-* Open ODBC Data Source Administrator. Click on **System DSN** > **OpenSearch SQL ODBC DSN** > **Configure**.
-* Set all connection options & Click on **Test**. Connection test should return `Connection Successful`.
-
-## Microsoft Excel Connectivity
-
-There are multiple ways to load data from OpenSearch in Microsoft Excel.
-* [ODBC as Data Source](odbc_data_source_connection.md)
-* [Microsoft Query](microsoft_query_connection.md)
-* [Query Wizard](query_wizard_connection.md)
-* [Data Connection Wizard (Legacy)](data_connection_wizard.md)
-
-## Use Microsoft Excel with data loaded from OpenSearch
-
-* [Refresh the data](refresh_data.md)
-* [Exporting CSV files](exporting_csv_files.md)
diff --git a/sql-odbc/docs/test/exporting_csv_files.md b/sql-odbc/docs/test/exporting_csv_files.md
deleted file mode 100644
index 9a32378f83..0000000000
--- a/sql-odbc/docs/test/exporting_csv_files.md
+++ /dev/null
@@ -1,22 +0,0 @@
-## Exporting CSV files in Microsoft Excel
-
-* Load data from OpenSearch by any using any [connection mode](excel_connection.md).
-
-For this example, [ODBC](odbc_data_source_connection.md) connection with SQL statement `SELECT * FROM opensearch_dashboards_sample_data_flights LIMIT 50` in advanced options is used.
-
-<img src="img/export_loaded_data.png">
-
-* Click on **File** > **Save As**.
-* Select Location to Save file.
-* Type the file name into the **File name** field.
-* Set **Save as type** as **CSV UTF-8(Comma delimited)(*.csv)**.
-
-<img src="img/export_save_as_csv.png" width=600>
-
-* Click **Save**.
-* If you have multiple sheets in the workbook, you will get following message
-
-<img src="img/export_multiple_sheets.png" width=600>
-
-* Click on **OK**.
-* Data should be exported to selected location in CSV format.
diff --git a/sql-odbc/docs/test/img/data_connection_wizard_dsn.png b/sql-odbc/docs/test/img/data_connection_wizard_dsn.png
deleted file mode 100644
index 07f60c18bf..0000000000
Binary files a/sql-odbc/docs/test/img/data_connection_wizard_dsn.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/data_connection_wizard_enable.png b/sql-odbc/docs/test/img/data_connection_wizard_enable.png
deleted file mode 100644
index 865f925523..0000000000
Binary files a/sql-odbc/docs/test/img/data_connection_wizard_enable.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/data_connection_wizard_load_data.png b/sql-odbc/docs/test/img/data_connection_wizard_load_data.png
deleted file mode 100644
index ebf6b543d8..0000000000
Binary files a/sql-odbc/docs/test/img/data_connection_wizard_load_data.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/data_connection_wizard_save_connection_file.png b/sql-odbc/docs/test/img/data_connection_wizard_save_connection_file.png
deleted file mode 100644
index 23becca1c6..0000000000
Binary files a/sql-odbc/docs/test/img/data_connection_wizard_save_connection_file.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/data_connection_wizard_select.png b/sql-odbc/docs/test/img/data_connection_wizard_select.png
deleted file mode 100644
index 43dfe16053..0000000000
Binary files a/sql-odbc/docs/test/img/data_connection_wizard_select.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/data_connection_wizard_select_dsn.png b/sql-odbc/docs/test/img/data_connection_wizard_select_dsn.png
deleted file mode 100644
index 5143f7d0eb..0000000000
Binary files a/sql-odbc/docs/test/img/data_connection_wizard_select_dsn.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/data_connection_wizard_select_worksheet.png b/sql-odbc/docs/test/img/data_connection_wizard_select_worksheet.png
deleted file mode 100644
index bdc3524b0c..0000000000
Binary files a/sql-odbc/docs/test/img/data_connection_wizard_select_worksheet.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/data_connection_wizard_table_list.png b/sql-odbc/docs/test/img/data_connection_wizard_table_list.png
deleted file mode 100644
index 97683afcda..0000000000
Binary files a/sql-odbc/docs/test/img/data_connection_wizard_table_list.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/export_loaded_data.png b/sql-odbc/docs/test/img/export_loaded_data.png
deleted file mode 100644
index 568f96f298..0000000000
Binary files a/sql-odbc/docs/test/img/export_loaded_data.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/export_multiple_sheets.png b/sql-odbc/docs/test/img/export_multiple_sheets.png
deleted file mode 100644
index cb14f1bf09..0000000000
Binary files a/sql-odbc/docs/test/img/export_multiple_sheets.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/export_save_as_csv.png b/sql-odbc/docs/test/img/export_save_as_csv.png
deleted file mode 100644
index c614d0e6b3..0000000000
Binary files a/sql-odbc/docs/test/img/export_save_as_csv.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/from_odbc_advanced_options.png b/sql-odbc/docs/test/img/from_odbc_advanced_options.png
deleted file mode 100644
index b011326bc0..0000000000
Binary files a/sql-odbc/docs/test/img/from_odbc_advanced_options.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/from_odbc_advanced_options_auth.png b/sql-odbc/docs/test/img/from_odbc_advanced_options_auth.png
deleted file mode 100644
index 15496f6e1a..0000000000
Binary files a/sql-odbc/docs/test/img/from_odbc_advanced_options_auth.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/from_odbc_advanced_options_load_data.png b/sql-odbc/docs/test/img/from_odbc_advanced_options_load_data.png
deleted file mode 100644
index 320a9f9122..0000000000
Binary files a/sql-odbc/docs/test/img/from_odbc_advanced_options_load_data.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/from_odbc_auth.png b/sql-odbc/docs/test/img/from_odbc_auth.png
deleted file mode 100644
index c392f8b55a..0000000000
Binary files a/sql-odbc/docs/test/img/from_odbc_auth.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/from_odbc_dsn.png b/sql-odbc/docs/test/img/from_odbc_dsn.png
deleted file mode 100644
index 58598b18a9..0000000000
Binary files a/sql-odbc/docs/test/img/from_odbc_dsn.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/from_odbc_loaded_data.png b/sql-odbc/docs/test/img/from_odbc_loaded_data.png
deleted file mode 100644
index f8a4c98afb..0000000000
Binary files a/sql-odbc/docs/test/img/from_odbc_loaded_data.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/from_odbc_table_list.png b/sql-odbc/docs/test/img/from_odbc_table_list.png
deleted file mode 100644
index 7fea36c26b..0000000000
Binary files a/sql-odbc/docs/test/img/from_odbc_table_list.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/microsoft_query_add_tables.png b/sql-odbc/docs/test/img/microsoft_query_add_tables.png
deleted file mode 100644
index 6bc517f038..0000000000
Binary files a/sql-odbc/docs/test/img/microsoft_query_add_tables.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/microsoft_query_disable_use_the_query_wizard_option.png b/sql-odbc/docs/test/img/microsoft_query_disable_use_the_query_wizard_option.png
deleted file mode 100644
index 737323ce94..0000000000
Binary files a/sql-odbc/docs/test/img/microsoft_query_disable_use_the_query_wizard_option.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/microsoft_query_import_data.png b/sql-odbc/docs/test/img/microsoft_query_import_data.png
deleted file mode 100644
index c9dcdcda09..0000000000
Binary files a/sql-odbc/docs/test/img/microsoft_query_import_data.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/microsoft_query_loaded_data.png b/sql-odbc/docs/test/img/microsoft_query_loaded_data.png
deleted file mode 100644
index de02b5818c..0000000000
Binary files a/sql-odbc/docs/test/img/microsoft_query_loaded_data.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/microsoft_query_select_colums.png b/sql-odbc/docs/test/img/microsoft_query_select_colums.png
deleted file mode 100644
index 164d2c0dc0..0000000000
Binary files a/sql-odbc/docs/test/img/microsoft_query_select_colums.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/microsoft_query_select_tables.png b/sql-odbc/docs/test/img/microsoft_query_select_tables.png
deleted file mode 100644
index 6c4404bb1b..0000000000
Binary files a/sql-odbc/docs/test/img/microsoft_query_select_tables.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/microsoft_query_table_options.png b/sql-odbc/docs/test/img/microsoft_query_table_options.png
deleted file mode 100644
index cd673ac584..0000000000
Binary files a/sql-odbc/docs/test/img/microsoft_query_table_options.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/odbc_data_source.png b/sql-odbc/docs/test/img/odbc_data_source.png
deleted file mode 100644
index 6aeec58cf0..0000000000
Binary files a/sql-odbc/docs/test/img/odbc_data_source.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/query_wizard_choose_coulms.png b/sql-odbc/docs/test/img/query_wizard_choose_coulms.png
deleted file mode 100644
index 073b7b7f00..0000000000
Binary files a/sql-odbc/docs/test/img/query_wizard_choose_coulms.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/query_wizard_enable_use_the_query_wizard_option.png b/sql-odbc/docs/test/img/query_wizard_enable_use_the_query_wizard_option.png
deleted file mode 100644
index 29cda7a355..0000000000
Binary files a/sql-odbc/docs/test/img/query_wizard_enable_use_the_query_wizard_option.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/query_wizard_error_popup.png b/sql-odbc/docs/test/img/query_wizard_error_popup.png
deleted file mode 100644
index 2595bbdcfd..0000000000
Binary files a/sql-odbc/docs/test/img/query_wizard_error_popup.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/query_wizard_filter_data.png b/sql-odbc/docs/test/img/query_wizard_filter_data.png
deleted file mode 100644
index a5a77b65c3..0000000000
Binary files a/sql-odbc/docs/test/img/query_wizard_filter_data.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/query_wizard_finish.png b/sql-odbc/docs/test/img/query_wizard_finish.png
deleted file mode 100644
index 14186f19d4..0000000000
Binary files a/sql-odbc/docs/test/img/query_wizard_finish.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/query_wizard_import_data.png b/sql-odbc/docs/test/img/query_wizard_import_data.png
deleted file mode 100644
index 48c538e0de..0000000000
Binary files a/sql-odbc/docs/test/img/query_wizard_import_data.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/query_wizard_loaded_data.png b/sql-odbc/docs/test/img/query_wizard_loaded_data.png
deleted file mode 100644
index b83c920740..0000000000
Binary files a/sql-odbc/docs/test/img/query_wizard_loaded_data.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/query_wizard_select_tables.png b/sql-odbc/docs/test/img/query_wizard_select_tables.png
deleted file mode 100644
index 830e2d1528..0000000000
Binary files a/sql-odbc/docs/test/img/query_wizard_select_tables.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/query_wizard_sort_order.png b/sql-odbc/docs/test/img/query_wizard_sort_order.png
deleted file mode 100644
index 93670aefdd..0000000000
Binary files a/sql-odbc/docs/test/img/query_wizard_sort_order.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/query_wizard_table_options.png b/sql-odbc/docs/test/img/query_wizard_table_options.png
deleted file mode 100644
index 30a3aa3586..0000000000
Binary files a/sql-odbc/docs/test/img/query_wizard_table_options.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/refresh_add_datarow.png b/sql-odbc/docs/test/img/refresh_add_datarow.png
deleted file mode 100644
index 6f2664d4fe..0000000000
Binary files a/sql-odbc/docs/test/img/refresh_add_datarow.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/refresh_data_preview.png b/sql-odbc/docs/test/img/refresh_data_preview.png
deleted file mode 100644
index d2f6c2e7b0..0000000000
Binary files a/sql-odbc/docs/test/img/refresh_data_preview.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/refresh_load_data.png b/sql-odbc/docs/test/img/refresh_load_data.png
deleted file mode 100644
index fd1078d29a..0000000000
Binary files a/sql-odbc/docs/test/img/refresh_load_data.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/refresh_updated_data.png b/sql-odbc/docs/test/img/refresh_updated_data.png
deleted file mode 100644
index 6f1800753d..0000000000
Binary files a/sql-odbc/docs/test/img/refresh_updated_data.png and /dev/null differ
diff --git a/sql-odbc/docs/test/img/select_microsoft_query.png b/sql-odbc/docs/test/img/select_microsoft_query.png
deleted file mode 100644
index 58e01f0053..0000000000
Binary files a/sql-odbc/docs/test/img/select_microsoft_query.png and /dev/null differ
diff --git a/sql-odbc/docs/test/microsoft_excel_manual_test_plan.xlsx b/sql-odbc/docs/test/microsoft_excel_manual_test_plan.xlsx
deleted file mode 100644
index 76af9295f1..0000000000
Binary files a/sql-odbc/docs/test/microsoft_excel_manual_test_plan.xlsx and /dev/null differ
diff --git a/sql-odbc/docs/test/microsoft_query_connection.md b/sql-odbc/docs/test/microsoft_query_connection.md
deleted file mode 100644
index 3bfcff801d..0000000000
--- a/sql-odbc/docs/test/microsoft_query_connection.md
+++ /dev/null
@@ -1,30 +0,0 @@
-## Microsoft Query Connection
-
-* Open blank workbook in Microsoft Excel.
-* Click on **Data** > **Get Data** > **From Other Sources** > **From Microsoft Query**
-
-<img src="img/select_microsoft_query.png" width="400">
-
-* Select **Databases** > **OpenSearch SQL ODBC DSN**. 
-* Clear the **Use the Query Wizard to create/edit queries** check box, and then click on **OK**.
-
-<img src="img/microsoft_query_disable_use_the_query_wizard_option.png" width="500">
-
-* Select table and click on **Add**.
-
-<img src="img/microsoft_query_select_tables.png" width="300">
- 
-* Click on **Close**.
-
-* Double click on required columns. You can double-click the asterisk (*) to select all the columns from a table.
-
-<img src="img/microsoft_query_select_colums.png" width="600">
-
-* You can select different options to define query here. Ensure the query is supported by the [OpenSearch SQL plugin](https://github.com/opensearch-project/sql). After defining query, click on **Return Data** to retrieve the result set.
-* Select worksheet and click on **OK**.
-
-<img src="img/microsoft_query_import_data.png" width="300">
-
-* Data will be loaded in the spreadsheet
-
-<img src="img/microsoft_query_loaded_data.png" width="350">
diff --git a/sql-odbc/docs/test/odbc_data_source_connection.md b/sql-odbc/docs/test/odbc_data_source_connection.md
deleted file mode 100644
index f52b9f60e5..0000000000
--- a/sql-odbc/docs/test/odbc_data_source_connection.md
+++ /dev/null
@@ -1,41 +0,0 @@
-## ODBC as Data Source Connection
-
-* Open blank workbook in Microsoft Excel.
-* Click on **Data** > **Get Data** > **From Other Sources** > **From ODBC**
-
-<img src="img/odbc_data_source.png" width="400">
-
-* Select **OpenSearch SQL ODBC DSN**. Click **OK**.
-
-<img src="img/from_odbc_dsn.png" width="600">
-
-* Select **Default or Custom** in connection credentials windows and click on **Connect**.
-
-<img src="img/from_odbc_auth.png" width="550">
-
-* Select a table from list to load data preview. Click on **Load**.
-
-<img src="img/from_odbc_table_list.png" width="750">
-
-#### Test Advanced options
-
-* Click on **Advanced options** after selecting DSN.
-* Add some connection options in **Connection string**.
-* Enter any supported **SQL statement**.
-
-<img src="img/from_odbc_advanced_options.png" width="600">
-
-* Click on **OK**. 
-* Select Default option for authentication and Click on **Connect**.
-
-<img src="img/from_odbc_advanced_options_auth.png" width="600">
-
-* Data preview should be available. **Load** data in spreadsheet.
-
-<img src="img/from_odbc_advanced_options_load_data.png" width="750">
-
-* Data will be loaded in the spreadsheet
-
-<img src="img/from_odbc_loaded_data.png">
-
-NOTE: Check driver logs for verify modified connection string options.
diff --git a/sql-odbc/docs/test/power_bi_manual_test_plan.xlsx b/sql-odbc/docs/test/power_bi_manual_test_plan.xlsx
deleted file mode 100644
index a1948253cb..0000000000
Binary files a/sql-odbc/docs/test/power_bi_manual_test_plan.xlsx and /dev/null differ
diff --git a/sql-odbc/docs/test/query_wizard_connection.md b/sql-odbc/docs/test/query_wizard_connection.md
deleted file mode 100644
index eb62ed3787..0000000000
--- a/sql-odbc/docs/test/query_wizard_connection.md
+++ /dev/null
@@ -1,36 +0,0 @@
-## Query Wizard Connection
-
-* Open blank workbook in Microsoft Excel.
-* Click on **Data** > **Get Data** > **From Other Sources** > **From Microsoft Query**
-
-<img src="img/select_microsoft_query.png" width="400">
-
-* Select **Databases** > **OpenSearch SQL ODBC DSN**. 
-* Ensure the **Use the Query Wizard to create/edit queries** check box is selected, and then click **OK**.
-
-<img src="img/query_wizard_enable_use_the_query_wizard_option.png" width="400">
-
-* You will see list of available tables & columns. Select required tables/columns and click on **>**. 
-* After selecting all required columns, Click on **Next**.
-
-<img src="img/query_wizard_select_tables.png" width="500">
-
-* Specify conditions to apply filter if needed. Ensure selected operations are supported by OpenSearch. Click on **Next**.
-
-<img src="img/query_wizard_filter_data.png" width="500">
-
-* Specify sorting options if required. Ensure selected operations are supported by the [OpenSearch SQL plugin](https://github.com/opensearch-project/sql). Click on **Next**.
-
-<img src="img/query_wizard_sort_order.png" width="500">
-
-* Select **Return Data to Microsoft Excel** and click on **Finish**.
-
-<img src="img/query_wizard_finish.png" width="500">
-
-*  Select worksheet and click on **OK**.
-
-<img src="img/query_wizard_import_data.png" width="300">
-
-* Data will be loaded in the spreadsheet
-
-<img src="img/query_wizard_loaded_data.png">
diff --git a/sql-odbc/docs/test/refresh_data.md b/sql-odbc/docs/test/refresh_data.md
deleted file mode 100644
index 3f6be89bf8..0000000000
--- a/sql-odbc/docs/test/refresh_data.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## Refresh the loaded data 
-
-* Load data from OpenSearch by any using any [connection mode](excel_connection.md).
-
-For this example, [ODBC](odbc_data_source_connection.md) connection is used with the table `sample_data_for_excel` which has 3 datarows as shown in picture.
-
-<img src="img/refresh_data_preview.png">
-
-<img src="img/refresh_load_data.png">
-
-* Add a datarow in the table `sample_data_for_excel` using OpenSearch Dashboards.
-
-<img src="img/refresh_add_datarow.png" width=450>
-
-* Click on **Data** > **Refresh All** > **Refresh**.
-
-<img src="img/refresh_updated_data.png">
-
-* Verify the data is updated.
\ No newline at end of file
diff --git a/sql-odbc/docs/user/configuration_options.md b/sql-odbc/docs/user/configuration_options.md
deleted file mode 100644
index 1d2b955ba9..0000000000
--- a/sql-odbc/docs/user/configuration_options.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Configuration Options
-
->**NOTE:** All option names are *case-insensitive*.
-
-#### Basic Options
-
-| Option | Description | Type | Default |
-|--------|-------------|------|---------------|
-| `DSN` | **D**ata **S**ource **N**ame used for configuring the connection. | string | |
-| `Host` / `Server` | Hostname or IP address for the target cluster. | string | |
-| `Port` | Port number on which the cluster's REST interface is listening. | string | |
-
-#### Authentication Options
-
-| Option | Description | Type | Default |
-|--------|-------------|------|---------------|
-| `Auth` | Authentication mechanism to use. | one of `BASIC` (basic HTTP), `AWS_SIGV4` (AWS auth), `NONE` | `NONE`
-| `User` / `UID` | [`Auth=BASIC`] Username for the connection. | string | |
-| `Password` / `PWD` | [`Auth=BASIC`] Password for the connection. | string | |
-| `Region` | [`Auth=AWS_SIGV4`] Region used for signing requests | AWS region (eg. `us-west-1`) | |
-
-**NOTE:** To use `AWS_SIGV4` authentication you need to create `~/.aws/credentials` and add `opensearchodbc` profile with aws access key id and secret key.
-
-#### Advanced Options
-
-| Option | Description | Type | Default |
-|--------|-------------|------|---------------|
-| `UseSSL` | Whether to establish the connection over SSL/TLS | boolean (`0` or `1`) | false (`0`) |
-| `HostnameVerification` | Indicate whether certificate hostname verification should be performed for an SSL/TLS connection. | boolean (`0` or `1`) | true (`1`) |
-| `ResponseTimeout` | The maximum time to wait for responses from the `Host`, in seconds. | integer | `10` |
-| `FetchSize` | The page size for all cursor requests. The default value (-1) uses server-defined page size. Set FetchSize to 0 for non-cursor behavior. | integer | `-1` |
-
-#### Logging Options
-
-| Option | Description | Type | Default |
-|--------|-------------|------|---------------|
-| `LogLevel` | Severity level for driver logs. | one of `OPENSEARCH_OFF`, `OPENSEARCH_FATAL`, `OPENSEARCH_ERROR`, `OPENSEARCH_INFO`, `OPENSEARCH_DEBUG`, `OPENSEARCH_TRACE`, `OPENSEARCH_ALL` | `OPENSEARCH_WARNING` |
-| `LogOutput` | Location for storing driver logs. | string | WIN: `C:\`, MAC: `/tmp` |
-
-**NOTE:** Administrative privileges are required to change the value of logging options on Windows.
diff --git a/sql-odbc/docs/user/img/driver_default_config.png b/sql-odbc/docs/user/img/driver_default_config.png
deleted file mode 100644
index dfc4bbe9a5..0000000000
Binary files a/sql-odbc/docs/user/img/driver_default_config.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/dsn_default_config.png b/sql-odbc/docs/user/img/dsn_default_config.png
deleted file mode 100644
index 465a4adcb5..0000000000
Binary files a/sql-odbc/docs/user/img/dsn_default_config.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_advanced_option.png b/sql-odbc/docs/user/img/excel_advanced_option.png
deleted file mode 100644
index 6e93af330f..0000000000
Binary files a/sql-odbc/docs/user/img/excel_advanced_option.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_auth.png b/sql-odbc/docs/user/img/excel_auth.png
deleted file mode 100644
index c05dcee094..0000000000
Binary files a/sql-odbc/docs/user/img/excel_auth.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_credentials.png b/sql-odbc/docs/user/img/excel_credentials.png
deleted file mode 100644
index ad52f7d8fe..0000000000
Binary files a/sql-odbc/docs/user/img/excel_credentials.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_data_load.png b/sql-odbc/docs/user/img/excel_data_load.png
deleted file mode 100644
index f794aaa2de..0000000000
Binary files a/sql-odbc/docs/user/img/excel_data_load.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_data_preview.png b/sql-odbc/docs/user/img/excel_data_preview.png
deleted file mode 100644
index 8ca234f039..0000000000
Binary files a/sql-odbc/docs/user/img/excel_data_preview.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_data_preview_error.png b/sql-odbc/docs/user/img/excel_data_preview_error.png
deleted file mode 100644
index 84080fbcfb..0000000000
Binary files a/sql-odbc/docs/user/img/excel_data_preview_error.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_data_preview_mac.png b/sql-odbc/docs/user/img/excel_data_preview_mac.png
deleted file mode 100644
index 7d822dee93..0000000000
Binary files a/sql-odbc/docs/user/img/excel_data_preview_mac.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_export.png b/sql-odbc/docs/user/img/excel_export.png
deleted file mode 100644
index 4951bd09e2..0000000000
Binary files a/sql-odbc/docs/user/img/excel_export.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_export_csv.png b/sql-odbc/docs/user/img/excel_export_csv.png
deleted file mode 100644
index 2fa3afa89b..0000000000
Binary files a/sql-odbc/docs/user/img/excel_export_csv.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_iodbc_auth.png b/sql-odbc/docs/user/img/excel_iodbc_auth.png
deleted file mode 100644
index a7d5a65400..0000000000
Binary files a/sql-odbc/docs/user/img/excel_iodbc_auth.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_iodbc_dsn.png b/sql-odbc/docs/user/img/excel_iodbc_dsn.png
deleted file mode 100644
index d175005f1c..0000000000
Binary files a/sql-odbc/docs/user/img/excel_iodbc_dsn.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_iodbc_test_dsn.png b/sql-odbc/docs/user/img/excel_iodbc_test_dsn.png
deleted file mode 100644
index 557f11aea5..0000000000
Binary files a/sql-odbc/docs/user/img/excel_iodbc_test_dsn.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_load_data.png b/sql-odbc/docs/user/img/excel_load_data.png
deleted file mode 100644
index 3546e3769c..0000000000
Binary files a/sql-odbc/docs/user/img/excel_load_data.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_refresh.png b/sql-odbc/docs/user/img/excel_refresh.png
deleted file mode 100644
index e69920b783..0000000000
Binary files a/sql-odbc/docs/user/img/excel_refresh.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_refresh_mac.png b/sql-odbc/docs/user/img/excel_refresh_mac.png
deleted file mode 100644
index d8b3aa8f9e..0000000000
Binary files a/sql-odbc/docs/user/img/excel_refresh_mac.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_select_database.png b/sql-odbc/docs/user/img/excel_select_database.png
deleted file mode 100644
index 59e886c8fb..0000000000
Binary files a/sql-odbc/docs/user/img/excel_select_database.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_select_dsn.png b/sql-odbc/docs/user/img/excel_select_dsn.png
deleted file mode 100644
index b159a47474..0000000000
Binary files a/sql-odbc/docs/user/img/excel_select_dsn.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_select_dsn_mac.png b/sql-odbc/docs/user/img/excel_select_dsn_mac.png
deleted file mode 100644
index 0cb22f2b34..0000000000
Binary files a/sql-odbc/docs/user/img/excel_select_dsn_mac.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_select_odbc.png b/sql-odbc/docs/user/img/excel_select_odbc.png
deleted file mode 100644
index 123e037eb6..0000000000
Binary files a/sql-odbc/docs/user/img/excel_select_odbc.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_select_worksheet.png b/sql-odbc/docs/user/img/excel_select_worksheet.png
deleted file mode 100644
index 825cbecbfd..0000000000
Binary files a/sql-odbc/docs/user/img/excel_select_worksheet.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/excel_table_list.png b/sql-odbc/docs/user/img/excel_table_list.png
deleted file mode 100644
index cbd01583b7..0000000000
Binary files a/sql-odbc/docs/user/img/excel_table_list.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/test_dsn_configure.png b/sql-odbc/docs/user/img/test_dsn_configure.png
deleted file mode 100644
index 2a21e60179..0000000000
Binary files a/sql-odbc/docs/user/img/test_dsn_configure.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/test_dsn_success.png b/sql-odbc/docs/user/img/test_dsn_success.png
deleted file mode 100644
index 98085c0304..0000000000
Binary files a/sql-odbc/docs/user/img/test_dsn_success.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/win_configure_dsn.png b/sql-odbc/docs/user/img/win_configure_dsn.png
deleted file mode 100644
index d9868d6a2f..0000000000
Binary files a/sql-odbc/docs/user/img/win_configure_dsn.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/win_configure_dsn_values.png b/sql-odbc/docs/user/img/win_configure_dsn_values.png
deleted file mode 100644
index 0d87a53b92..0000000000
Binary files a/sql-odbc/docs/user/img/win_configure_dsn_values.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/win_odbc_data_sources.png b/sql-odbc/docs/user/img/win_odbc_data_sources.png
deleted file mode 100644
index e3482205f2..0000000000
Binary files a/sql-odbc/docs/user/img/win_odbc_data_sources.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/win_system_dsn.png b/sql-odbc/docs/user/img/win_system_dsn.png
deleted file mode 100644
index 8b186994f7..0000000000
Binary files a/sql-odbc/docs/user/img/win_system_dsn.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/win_test_dsn.png b/sql-odbc/docs/user/img/win_test_dsn.png
deleted file mode 100644
index df319f8e84..0000000000
Binary files a/sql-odbc/docs/user/img/win_test_dsn.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/win_user_dsn.png b/sql-odbc/docs/user/img/win_user_dsn.png
deleted file mode 100644
index 43f56e7606..0000000000
Binary files a/sql-odbc/docs/user/img/win_user_dsn.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/win_user_dsn_configure_options.png b/sql-odbc/docs/user/img/win_user_dsn_configure_options.png
deleted file mode 100644
index a25b496e1b..0000000000
Binary files a/sql-odbc/docs/user/img/win_user_dsn_configure_options.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/win_user_dsn_list.png b/sql-odbc/docs/user/img/win_user_dsn_list.png
deleted file mode 100644
index fa9d830f18..0000000000
Binary files a/sql-odbc/docs/user/img/win_user_dsn_list.png and /dev/null differ
diff --git a/sql-odbc/docs/user/img/win_user_dsn_select_driver.png b/sql-odbc/docs/user/img/win_user_dsn_select_driver.png
deleted file mode 100644
index 3aa15a76b4..0000000000
Binary files a/sql-odbc/docs/user/img/win_user_dsn_select_driver.png and /dev/null differ
diff --git a/sql-odbc/docs/user/mac_configure_dsn.md b/sql-odbc/docs/user/mac_configure_dsn.md
deleted file mode 100644
index 10c82d3e24..0000000000
--- a/sql-odbc/docs/user/mac_configure_dsn.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# Configuring a DSN on Mac
-
-> NOTE: iODBC Administrator is included with the [iODBC Driver Manager](http://www.iodbc.org/dataspace/doc/iodbc/wiki/iodbcWiki/Downloads), which must be installed in order to use the driver on Mac.
-
-1. Open **iODBC Administrator** using the following command (this gives the application permissions to save the Driver & DSN configurations):
-	1. `sudo /Applications/iODBC/iODBC\ Administrator64.app/Contents/MacOS/iODBC\ Administrator64`
-
-## Adding a Driver Entry
-
-Note: In order to use the OpenSearch SQL ODBC driver with the [Tableau Connector](), the **Description of the Driver** field *must* start with `OpenSearch SQL ODBC`. 
-
-1. Go to the **ODBC Drivers** tab.
-2. Click **Add a Driver**.
-	* **Description of the Driver**: The driver name used for ODBC connections (ex. `OpenSearch SQL ODBC Driver`)
-	* **Driver File Name**: The path to the driver file (default installed path: `/Library/ODBC/opensearch-sql-odbc/bin/libsqlodbc.dylib`)
-	* **Setup File Name**: The path to the driver file (default installed path: `/Library/ODBC/opensearch-sql-odbc/bin/libsqlodbc.dylib`)
-	* Set as a **User** driver
-    * Below is a screenshot of how the final screen should look.
-3. Click **OK** to save the options.
-
-<p align="center"> 
-<img src="img/driver_default_config.png" width="80%">
-</p>
-
-## Adding a DSN Entry
-
-This is not required if you are using the Tableau Connector, but will help with connecting to your data source through other applications.
-
-1. Go to the **User DSN** tab
-2. Select **Add** on the right side of the window.
-	* Choose the Driver you added above.
-	* **Data Source Name (DSN)**: The name of the DSN used to store connection options (ex. `OpenSearch SQL ODBC DSN`)
-	* **Comment**: Not required
-	* Add key-value pairs by using the **'+'** button. Below is a picture of the recommended set of options for a default local OpenSearch installation.
-3. Click **OK** to save the DSN configuration.
-
-<p align="center"> 
-<img src="img/dsn_default_config.png" width="80%">
-</p>
-
-
-## Troubleshooting
-
-### iODBC Administrator: “General installer error” when saving new ODBC Driver
-
-Try the following:
-
-1. Create the folder `~/Library/ODBC`, then try again
-2. Create two files in `~/Library/ODBC`, then open iODBC Administrator and verify the contents of **odbcinst.ini** and **odbc.ini** align with the format below.
-	* **odbcinst.ini** (will be found in **ODBC Drivers**)
-	```ini
-    [ODBC Drivers]
-    <Driver Name> = Installed
-      
-    [<Driver Name>]
-    Driver = <odbc-root>/lib64/libsqlodbc.dylib
-    Setup = <odbc-root>/lib64/libsqlodbc.dylib
-	```
-   * **odbc.ini** (will be found in **User DSNs**)
-	```ini
-	[ODBC Data Sources]  
-    <DSN Name> = <Driver Name>
-    
-    [<DSN Name>]
-    Driver = <odbc-root>/lib64/libsqlodbc.dylib
-    Description =
-    Host = localhost
-    Port = 9200
-    Username = admin
-    Password = admin
-	```
\ No newline at end of file
diff --git a/sql-odbc/docs/user/microsoft_excel_support.md b/sql-odbc/docs/user/microsoft_excel_support.md
deleted file mode 100644
index 1d53c114de..0000000000
--- a/sql-odbc/docs/user/microsoft_excel_support.md
+++ /dev/null
@@ -1,88 +0,0 @@
-#  Connecting OpenSearch to Microsoft Excel on Windows
-
-## Prerequisites
-
-* Microsoft Excel 2016 and higher
-* [OpenSearch](https://docs-beta.opensearch.org/opensearch/install/index/)
-* [OpenSearch SQL ODBC driver](https://docs-beta.opensearch.org/search-plugins/sql/odbc/)
-* A preconfigured [User or System DSN](../../README.md)
-
-## Test Successful Connection
-
-* Open **ODBC Data Source Administrator**.
-* Click on **System DSN**.
-* Select **OpenSearch SQL ODBC DSN**.
-* Click on **Configure**.
-
-<img src="img/test_dsn_configure.png" width=500>
-
-* Modify connection attributes accordingly.
-* Click on **Test**.
-
-<img src="img/test_dsn_success.png" width=300>
-
-* You should get a message as **Connection Successful**.
-
-## Load data 
-
-* Open blank workbook in Microsoft Excel.
-* Click on **Data** > **Get Data** > **From Other Sources** > **From ODBC**
-
-<img src="img/excel_select_odbc.png" width="400">
-
-* Select **OpenSearch SQL ODBC DSN**. Click **OK**.
-
-<img src="img/excel_select_dsn.png" width="400">
-
-* Select **Default or Custom** in connection credentials windows and click on **Connect**.
-
-<img src="img/excel_auth.png" width="500">
-
-* Select a table from list to load data preview. Click on **Load**.
-
-<img src="img/excel_data_preview.png">
-
-* Data will be loaded in the spreadsheet.
-
-<img src="img/excel_load_data.png">
-
-**NOTE**: There are multiple ways to load data in Microsoft Excel. Alternate options are [Data Connection Wizard](../test/data_connection_wizard.md), [Microsoft Query Connection](../test/microsoft_query_connection.md) and [Query Wizard Connection](../test/query_wizard_connection.md). These connection modes will load data relatively faster.
-
-## Refresh Data
-
-To refresh the data click on **Query** > **Refresh**.
-
-<img src="img/excel_refresh.png" width=500>
-
-Alternately, **Data** > **Refresh** option can also be used to refresh the data.
-
-## Export as CSV files
-
-* Click on **File** > **Save As**.
-* Select Location to Save file.
-* Type the file name.
-* Set type as **CSV UTF-8(Comma delimited)(*.csv)**.
-
-<img src="img/excel_export.png" width=750>
-
-* Click **Save**.
-* Data will be exported to selected location in CSV format.
-
-## Troubleshooting
-
-* If the table has large number of datarows, increase [the keepalive](https://github.com/opensearch-project/sql/blob/main/docs/dev/Pagination.md#opendistrosqlcursorkeep_alive) value accordlingly. 
-
-* If the table has nested or object type column, you might get an error as below.
-
-<img src="img/excel_data_preview_error.png" width=500>
-
-If you ignore the error and try to load the data, column name and values might not match.
-
-In this case, please use advanced options while connecting to the data source.
-
-<img src="img/excel_advanced_option.png" width=500>
-
-Also, make sure query doesn't include the name of nested or object type column name. For example, `SELECT products FROM opensearch_dashboards_sample_data_ecommerce` where product is nested type column might have data loss.
-
-This issue will be resolved when [Object field is missing in SELECT result](https://github.com/opendistro-for-elasticsearch/sql/issues/564) is fixed.
-
diff --git a/sql-odbc/docs/user/microsoft_excel_support_mac.md b/sql-odbc/docs/user/microsoft_excel_support_mac.md
deleted file mode 100644
index 7d0e852c54..0000000000
--- a/sql-odbc/docs/user/microsoft_excel_support_mac.md
+++ /dev/null
@@ -1,90 +0,0 @@
-#  Connecting OpenSearch to Micosoft Excel on Mac OS
-
-## Prerequisites
-
-* Microsoft Excel 2016 and higher
-* [OpenSearch](https://docs-beta.opensearch.org/opensearch/install/index/)
-* [OpenSearch SQL ODBC driver](https://docs-beta.opensearch.org/search-plugins/sql/odbc/)
-* A preconfigured [User or System DSN](mac_configure_dsn.md)
-
-## Test Successful Connection
-
-* Open **iODBC Data Source Administrator** using command 
-
-`sudo /Applications/iODBC/iODBC\ Administrator64.app/Contents/MacOS/iODBC\ Administrator64`
-
-* Click on **System DSN**.
-* Select **OpenSearch SQL ODBC DSN**.
-* Click on **Configure**.
-
-<img src="img/excel_iodbc_dsn.png" width="650">
-
-* Modify connection attributes accordingly.
-* Click on **Ok**.
-* Click on **Test**.
-* Enter credentials if required and Click **Ok**.
-
-<img src="img/excel_iodbc_auth.png" width="250">
-
-* You should get a message as `The connection DSN was tested successfully, and can be used at this time.`
-
-<img src="img/excel_iodbc_test_dsn.png" width="350">
-
-## Load data 
-
-* Open blank workbook in Microsoft Excel.
-* Click on **Data** > **New Database Query** > **From Database**.
-
-<img src="img/excel_select_database.png" width="400">
-
-* Select **OpenSearch SQL ODBC DSN**. Click **OK**.
-
-<img src="img/excel_select_dsn_mac.png" width="400">
-
-* Enter credentials if required and click on **OK**.
-
-<img src="img/excel_credentials.png" width="250">
-
-* Select a table from the list. 
-
-<img src="img/excel_table_list.png" width="500">
-
-* Edit SQL statement if required and click on **Run**. Data preview will be loaded.
-> **NOTE**: Excel for Mac currently will not show an error if you provide an incorrect query ([Github issue here](https://github.com/opendistro-for-elasticsearch/sql/issues/601)). If no data appears, check your OpenSearch server logs to see if the query failed.
-
-<img src="img/excel_data_preview_mac.png">
-
-* Click on **Return Data**. Select sheet and click OK.
-
-<img src="img/excel_select_worksheet.png" width="400">
-
-* Data will be loaded in the spreadsheet.
-
-<img src="img/excel_data_load.png">
-
-## Refresh Data
-
-To refresh the data click on **Table** > **Refresh**.
-
-<img src="img/excel_refresh_mac.png" width=500>
-
-Alternately, **Data** > **Refresh** option can also be used to refresh the data.
-
-## Export as CSV files
-
-* Click on **File** > **Save As**.
-* Type the file name.
-* Select Location to Save file.
-* Set File Format to **CSV UTF-8(Comma delimited)(*.csv)**.
-
-<img src="img/excel_export_csv.png" width="450">
-
-* Click **Save**.
-* Data will be exported to selected location in CSV format.
-
-## Troubleshooting
-
-* If the table has large number of datarows, increase [the keepalive](https://github.com/opensearch-project/sql/blob/main/docs/dev/Pagination.md#opendistrosqlcursorkeep_alive) value accordlingly. 
-
-* You might need to remove `;` from SQL statement to load data preview.
-
diff --git a/sql-odbc/docs/user/windows_configure_dsn.md b/sql-odbc/docs/user/windows_configure_dsn.md
deleted file mode 100644
index cf49861b33..0000000000
--- a/sql-odbc/docs/user/windows_configure_dsn.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Configuring a DSN on Windows
-
-## Test Default Connection
-
-1. Open ODBC Data Source Administrator.
-
- <img src="img/win_odbc_data_sources.png" width="30%">
-
-2. Click on the `System DSN` tab. Select `OpenSearch SQL ODBC DSN` and click on `Configure`.
-
- <img src="img/win_system_dsn.png" width="60%">
-
-3. DSN Setup window will open with default values for [configuration options](./configuration_options.md).
-
- <img src="img/win_configure_dsn.png" width="50%">
-
-4. Change values of configuration options accordingly.
-
-For example, if you can connect to server using following curl command
-
- `curl -XGET https://localhost:9200 -u admin:admin`.
-
- The DSN configuration options can be set as shown below
-
- <img src="img/win_configure_dsn_values.png" width="80%">
-
-> **NOTE**: For encrypted connection, the `Host` needs to be prefaced with `https://` and `Enable SSL` in Advanced Options should be checked.
-
-5. Click on `Test` to verify connectivity. You will get a message as `Connection successful`.
-
- <img src="img/win_test_dsn.png" width="20%">
-
-6. Click on `OK` to save DSN values.
-
-
-## Add User DSN
-
-1. Open ODBC Data Source Administrator. Click on `User DSN` > `Add`.
-
- <img src="img/win_user_dsn.png" width="60%">
-
-2. Select `OpenSearch SQL ODBC Driver` and click on `Finish`.
-
- <img src="img/win_user_dsn_select_driver.png" width="50%">
-
-3. The DSN Setup window will open.
-
- <img src="img/win_user_dsn_configure_options.png" width="50%">
-
-4. Update values of configuration options.
-5. Click on `Test` to verify connectivity.
-6. Click on `OK` to save DSN values. 
-7. You will find this newly added DSN in User DSN list.
-
- <img src="img/win_user_dsn_list.png" width="60%">
-    
diff --git a/sql-odbc/libraries/VisualLeakDetector/COPYING.txt b/sql-odbc/libraries/VisualLeakDetector/COPYING.txt
deleted file mode 100644
index 073dd57f8d..0000000000
--- a/sql-odbc/libraries/VisualLeakDetector/COPYING.txt
+++ /dev/null
@@ -1,458 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/sql-odbc/libraries/VisualLeakDetector/bin/Microsoft.DTfW.DHL.manifest b/sql-odbc/libraries/VisualLeakDetector/bin/Microsoft.DTfW.DHL.manifest
deleted file mode 100644
index e61222f007..0000000000
--- a/sql-odbc/libraries/VisualLeakDetector/bin/Microsoft.DTfW.DHL.manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- $Id -->
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <noInheritable />
-    <assemblyIdentity type="win32" name="Microsoft.DTfW.DHL" version="6.11.1.404" processorArchitecture="x86" />
-    <file name="dbghelp.dll" />
-</assembly>
diff --git a/sql-odbc/libraries/VisualLeakDetector/bin/dbghelp.dll b/sql-odbc/libraries/VisualLeakDetector/bin/dbghelp.dll
deleted file mode 100644
index 62d850863e..0000000000
Binary files a/sql-odbc/libraries/VisualLeakDetector/bin/dbghelp.dll and /dev/null differ
diff --git a/sql-odbc/libraries/VisualLeakDetector/bin/vld_x86.dll b/sql-odbc/libraries/VisualLeakDetector/bin/vld_x86.dll
deleted file mode 100644
index 08c6b27a0d..0000000000
Binary files a/sql-odbc/libraries/VisualLeakDetector/bin/vld_x86.dll and /dev/null differ
diff --git a/sql-odbc/libraries/VisualLeakDetector/bin64/Microsoft.DTfW.DHL.manifest b/sql-odbc/libraries/VisualLeakDetector/bin64/Microsoft.DTfW.DHL.manifest
deleted file mode 100644
index 1ea64d5118..0000000000
--- a/sql-odbc/libraries/VisualLeakDetector/bin64/Microsoft.DTfW.DHL.manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- $Id -->
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <noInheritable />
-    <assemblyIdentity type="win32" name="Microsoft.DTfW.DHL" version="6.11.1.404" processorArchitecture="amd64" />
-    <file name="dbghelp.dll" />
-</assembly>
diff --git a/sql-odbc/libraries/VisualLeakDetector/bin64/dbghelp.dll b/sql-odbc/libraries/VisualLeakDetector/bin64/dbghelp.dll
deleted file mode 100644
index 499fa290ae..0000000000
Binary files a/sql-odbc/libraries/VisualLeakDetector/bin64/dbghelp.dll and /dev/null differ
diff --git a/sql-odbc/libraries/VisualLeakDetector/bin64/vld_x64.dll b/sql-odbc/libraries/VisualLeakDetector/bin64/vld_x64.dll
deleted file mode 100644
index 8c12be108d..0000000000
Binary files a/sql-odbc/libraries/VisualLeakDetector/bin64/vld_x64.dll and /dev/null differ
diff --git a/sql-odbc/libraries/VisualLeakDetector/include/vld.h b/sql-odbc/libraries/VisualLeakDetector/include/vld.h
deleted file mode 100644
index b591ff3e2f..0000000000
--- a/sql-odbc/libraries/VisualLeakDetector/include/vld.h
+++ /dev/null
@@ -1,350 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Visual Leak Detector - Import Library Header
-//  Copyright (c) 2005-2014 VLD Team
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-//  See COPYING.txt for the full terms of the GNU Lesser General Public License.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "vld_def.h"
-
-typedef int            VLD_BOOL;
-typedef unsigned int   VLD_UINT;
-typedef size_t         VLD_SIZET;
-typedef void*          VLD_HMODULE;
-
-#if defined _DEBUG || defined VLD_FORCE_ENABLE
-
-#ifdef __AFXWIN_H__
-#error[VLD COMPILE ERROR] '#include <vld.h>' should appear before '#include <afxwin.h>' in file stdafx.h
-#endif
-
-#pragma comment(lib, "vld.lib")
-
-// Force a symbolic reference to the global VisualLeakDetector class object from
-// the DLL. This ensures that the DLL is loaded and linked with the program,
-// even if no code otherwise imports any of the DLL's exports.
-#pragma comment(linker, "/include:__imp_?g_vld@@3VVisualLeakDetector@@A")
-
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Visual Leak Detector APIs
-//
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-// VLDDisable - Disables Visual Leak Detector's memory leak detection at
-//   runtime. If memory leak detection is already disabled, then calling this
-//   function has no effect.
-//
-//  Note: In multithreaded programs, this function operates on a per-thread
-//    basis. In other words, if you call this function from one thread, then
-//    memory leak detection is only disabled for that thread. If memory leak
-//    detection is enabled for other threads, then it will remain enabled for
-//    those other threads. It was designed to work this way to insulate you,
-//    the programmer, from having to ensure thread synchronization when calling
-//    VLDEnable() and VLDDisable(). Without this, calling these two functions
-//    unsynchronized could result in unpredictable and unintended behavior.
-//    But this also means that if you want to disable memory leak detection
-//    process-wide, then you need to call this function from every thread in
-//    the process.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDDisable ();
-
-// VLDEnable - Enables Visual Leak Detector's memory leak detection at runtime.
-//   If memory leak detection is already enabled, which it is by default, then
-//   calling this function has no effect.
-//
-//  Note: In multithreaded programs, this function operates on a per-thread
-//    basis. In other words, if you call this function from one thread, then
-//    memory leak detection is only enabled for that thread. If memory leak
-//    detection is disabled for other threads, then it will remain disabled for
-//    those other threads. It was designed to work this way to insulate you,
-//    the programmer, from having to ensure thread synchronization when calling
-//    VLDEnable() and VLDDisable(). Without this, calling these two functions
-//    unsynchronized could result in unpredictable and unintended behavior.
-//    But this also means that if you want to enable memory leak detection
-//    process-wide, then you need to call this function from every thread in
-//    the process.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDEnable ();
-
-// VLDRestore - Restore Visual Leak Detector's previous state.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDRestore ();
-
-// VLDGlobalDisable - Disables Visual Leak Detector's memory leak detection at
-//   runtime in all threads. If memory leak detection is already disabled,
-//   then calling this function has no effect.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDGlobalDisable ();
-
-// VLDGlobalEnable - Enables Visual Leak Detector's memory leak detection
-//   at runtime in all threads. If memory leak detection is already enabled,
-//   which it is by default, then calling this function has no effect.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDGlobalEnable ();
-
-// VLDReportLeaks - Report leaks up to the execution point.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) VLD_UINT VLDReportLeaks ();
-
-// VLDReportThreadLeaks - Report thread leaks up to the execution point.
-//
-// threadId: thread Id.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) VLD_UINT VLDReportThreadLeaks (VLD_UINT threadId);
-
-// VLDGetLeaksCount - Return memory leaks count to the execution point.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) VLD_UINT VLDGetLeaksCount ();
-
-// VLDGetThreadLeaksCount - Return thread memory leaks count to the execution point.
-//
-// threadId: thread Id.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) VLD_UINT VLDGetThreadLeaksCount (VLD_UINT threadId);
-
-// VLDMarkAllLeaksAsReported - Mark all leaks as reported.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDMarkAllLeaksAsReported ();
-
-// VLDMarkThreadLeaksAsReported - Mark thread leaks as reported.
-//
-// threadId: thread Id.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDMarkThreadLeaksAsReported (VLD_UINT threadId);
-
-
-// VLDRefreshModules - Look for recently loaded DLLs and patch them if necessary.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDRefreshModules();
-
-
-// VLDEnableModule - Enable Memory leak checking on the specified module.
-//
-// module: module handle.
-//
-//  Return Value:
-//
-//    None.
-//
-
-__declspec(dllimport) void VLDEnableModule(VLD_HMODULE module);
-
-
-// VLDDisableModule - Disable Memory leak checking on the specified module.
-//
-// module: module handle.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDDisableModule(VLD_HMODULE module);
-
-// VLDGetOptions - Return all current options.
-//
-//  Return Value:
-//
-//    Mask of current options.
-//
-__declspec(dllimport) VLD_UINT VLDGetOptions();
-
-// VLDGetReportFilename - Return current report filename.
-//
-// filename: current report filename (max characters - MAX_PATH).
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDGetReportFilename(wchar_t *filename);
-
-// VLDSetOptions - Update the report options via function call rather than INI file.
-//
-// option_mask: Only the following flags are checked
-// VLD_OPT_AGGREGATE_DUPLICATES
-// VLD_OPT_MODULE_LIST_INCLUDE
-// VLD_OPT_SAFE_STACK_WALK
-// VLD_OPT_SLOW_DEBUGGER_DUMP
-// VLD_OPT_TRACE_INTERNAL_FRAMES
-// VLD_OPT_START_DISABLED
-// VLD_OPT_SKIP_HEAPFREE_LEAKS
-// VLD_OPT_VALIDATE_HEAPFREE
-//
-// maxDataDump: maximum number of user-data bytes to dump for each leaked block.
-//
-// maxTraceFrames: maximum number of frames per stack trace for each leaked block.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDSetOptions(VLD_UINT option_mask, VLD_SIZET maxDataDump, VLD_UINT maxTraceFrames);
-
-// VLDSetModulesList - Set list of modules included/excluded in leak detection
-// depending on parameter "includeModules".
-//
-// modules: list of modules to be forcefully included/excluded in leak detection.
-//
-// includeModules: include or exclude that modules.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDSetModulesList(const wchar_t *modules, VLD_BOOL includeModules);
-
-// VLDGetModulesList - Return current list of included/excluded modules
-// depending on flag VLD_OPT_TRACE_INTERNAL_FRAMES.
-//
-// modules: destination string for list of included/excluded modules (maximum length 512 characters).
-//
-// size: maximum string size.
-//
-//  Return Value:
-//
-//    VLD_BOOL: TRUE if include modules, otherwise FALSE.
-//
-__declspec(dllimport) VLD_BOOL VLDGetModulesList(wchar_t *modules, VLD_UINT size);
-
-// VLDSetReportOptions - Update the report options via function call rather than INI file.
-//
-// Only the following flags are checked
-// VLD_OPT_REPORT_TO_DEBUGGER
-// VLD_OPT_REPORT_TO_FILE
-// VLD_OPT_REPORT_TO_STDOUT
-// VLD_OPT_UNICODE_REPORT
-//
-// filename is optional and can be NULL.
-//
-//  Return Value:
-//
-//    None.
-//
-__declspec(dllimport) void VLDSetReportOptions(VLD_UINT option_mask, const wchar_t *filename);
-
-// VLDSetReportHook - Installs or uninstalls a client-defined reporting function by hooking it
-//  into the C run-time debug reporting process (debug version only).
-//
-// mode: The action to take: VLD_RPTHOOK_INSTALL or VLD_RPTHOOK_REMOVE.
-//
-// pfnNewHook: Report hook to install or remove.
-//
-//  Return Value:
-//
-//    int: 0 if success.
-//
-__declspec(dllimport) int VLDSetReportHook(int mode,  VLD_REPORT_HOOK pfnNewHook);
-
-// VLDResolveCallstacks - Performs symbol resolution for all saved extent CallStack's that have
-// been tracked by Visual Leak Detector. This function is necessary for applications that
-// dynamically load and unload modules, and through which memory leaks might be included.
-// If this is NOT called, stack traces may have stack frames with no symbol information. This
-// happens because the symbol API's cannot look up symbols for a binary / module that has been unloaded
-// from the process.
-//
-//  Return Value:
-//
-//    int: 0 if successfully resolved all callstacks.
-//
-__declspec(dllexport) int VLDResolveCallstacks();
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
-#else // !_DEBUG
-
-#define VLDEnable()
-#define VLDDisable()
-#define VLDRestore()
-#define VLDGlobalDisable()
-#define VLDGlobalEnable()
-#define VLDReportLeaks() (0)
-#define VLDReportThreadLeaks() (0)
-#define VLDGetLeaksCount() (0)
-#define VLDGetThreadLeaksCount() (0)
-#define VLDMarkAllLeaksAsReported()
-#define VLDMarkThreadLeaksAsReported(a)
-#define VLDRefreshModules()
-#define VLDEnableModule(a)
-#define VLDDisableModule(b)
-#define VLDGetOptions() (0)
-#define VLDGetReportFilename(a)
-#define VLDSetOptions(a, b, c)
-#define VLDSetReportHook(a, b)
-#define VLDSetModulesList(a)
-#define VLDGetModulesList(a, b) (FALSE)
-#define VLDSetReportOptions(a, b)
-#define VLDResolveCallstacks() (0)
-
-#endif // _DEBUG
diff --git a/sql-odbc/libraries/VisualLeakDetector/include/vld_def.h b/sql-odbc/libraries/VisualLeakDetector/include/vld_def.h
deleted file mode 100644
index 265de49c4b..0000000000
--- a/sql-odbc/libraries/VisualLeakDetector/include/vld_def.h
+++ /dev/null
@@ -1,49 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Visual Leak Detector - Import Library Header
-//  Copyright (c) 2005-2014 VLD Team
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-//  See COPYING.txt for the full terms of the GNU Lesser General Public License.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef _WCHAR_T_DEFINED
-#   include <wchar.h>
-#endif
-
-#define VLD_OPT_AGGREGATE_DUPLICATES    0x0001 //   If set, aggregate duplicate leaks in the leak report.
-#define VLD_OPT_MODULE_LIST_INCLUDE     0x0002 //   If set, modules in the module list are included, all others are excluded.
-#define VLD_OPT_REPORT_TO_DEBUGGER      0x0004 //   If set, the memory leak report is sent to the debugger.
-#define VLD_OPT_REPORT_TO_FILE          0x0008 //   If set, the memory leak report is sent to a file.
-#define VLD_OPT_SAFE_STACK_WALK         0x0010 //   If set, the stack is walked using the "safe" method (StackWalk64).
-#define VLD_OPT_SELF_TEST               0x0020 //   If set, perform a self-test to verify memory leak self-checking.
-#define VLD_OPT_SLOW_DEBUGGER_DUMP      0x0040 //   If set, inserts a slight delay between sending output to the debugger.
-#define VLD_OPT_START_DISABLED          0x0080 //   If set, memory leak detection will initially disabled.
-#define VLD_OPT_TRACE_INTERNAL_FRAMES   0x0100 //   If set, include useless frames (e.g. internal to VLD) in call stacks.
-#define VLD_OPT_UNICODE_REPORT          0x0200 //   If set, the leak report will be encoded UTF-16 instead of ASCII.
-#define VLD_OPT_VLDOFF                  0x0400 //   If set, VLD will be completely deactivated. It will not attach to any modules.
-#define VLD_OPT_REPORT_TO_STDOUT        0x0800 //   If set, the memory leak report is sent to stdout.
-#define VLD_OPT_SKIP_HEAPFREE_LEAKS     0x1000 //   If set, VLD skip HeapFree memory leaks.
-#define VLD_OPT_VALIDATE_HEAPFREE       0x2000 //   If set, VLD verifies and reports heap consistency for HeapFree calls.
-#define VLD_OPT_SKIP_CRTSTARTUP_LEAKS   0x4000 //   If set, VLD skip crt srtartup memory leaks.
-
-#define VLD_RPTHOOK_INSTALL  0
-#define VLD_RPTHOOK_REMOVE   1
-
-typedef int (__cdecl * VLD_REPORT_HOOK)(int reportType, wchar_t *message, int *returnValue);
diff --git a/sql-odbc/libraries/VisualLeakDetector/lib/vld.lib b/sql-odbc/libraries/VisualLeakDetector/lib/vld.lib
deleted file mode 100644
index 96339e2724..0000000000
Binary files a/sql-odbc/libraries/VisualLeakDetector/lib/vld.lib and /dev/null differ
diff --git a/sql-odbc/libraries/VisualLeakDetector/lib64/vld.lib b/sql-odbc/libraries/VisualLeakDetector/lib64/vld.lib
deleted file mode 100644
index 878dde2da5..0000000000
Binary files a/sql-odbc/libraries/VisualLeakDetector/lib64/vld.lib and /dev/null differ
diff --git a/sql-odbc/libraries/rabbit/LICENSE b/sql-odbc/libraries/rabbit/LICENSE
deleted file mode 100644
index 4676af6df8..0000000000
--- a/sql-odbc/libraries/rabbit/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013-2014 mashiro
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/sql-odbc/libraries/rabbit/README b/sql-odbc/libraries/rabbit/README
deleted file mode 100644
index 765d927dc0..0000000000
--- a/sql-odbc/libraries/rabbit/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Downloaded on November 18th, 2019 @ 9:40 am
-Master branch
-https://github.com/mashiro/rabbit/tree/master
-
-- lyndonb@bitquilltech.com
\ No newline at end of file
diff --git a/sql-odbc/libraries/rabbit/include/rabbit.hpp b/sql-odbc/libraries/rabbit/include/rabbit.hpp
deleted file mode 100644
index 736de5e1b5..0000000000
--- a/sql-odbc/libraries/rabbit/include/rabbit.hpp
+++ /dev/null
@@ -1,1347 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) 2013-2014 mashiro
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal in
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-// the Software, and to permit persons to whom the Software is furnished to do so,
-// subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// clang-format off
-
-#ifndef RABBIT_HPP_INCLUDED
-#define RABBIT_HPP_INCLUDED
-
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wtautological-constant-out-of-range-compare"
-#endif
-
-#ifndef RABBIT_NAMESPACE
-#define RABBIT_NAMESPACE rabbit
-#endif
-
-#include <string>
-#include <stdexcept>
-#include <iterator>
-#include <algorithm>
-#include <sstream>
-#include <iosfwd>
-#include <rapidjson/document.h>
-#include <rapidjson/writer.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/error/en.h>
-#include <rapidjson/schema.h>
-
-namespace RABBIT_NAMESPACE {
-
-#define RABBIT_TAG_DEF(name, id) \
-  struct name \
-  { \
-    static const rapidjson::Type native_value = id; \
-    static const int value = id; \
-  }; \
-/**/
-RABBIT_TAG_DEF(null_tag, rapidjson::kNullType)
-RABBIT_TAG_DEF(false_tag, rapidjson::kFalseType)
-RABBIT_TAG_DEF(true_tag, rapidjson::kTrueType)
-RABBIT_TAG_DEF(object_tag, rapidjson::kObjectType)
-RABBIT_TAG_DEF(array_tag, rapidjson::kArrayType)
-RABBIT_TAG_DEF(string_tag, rapidjson::kStringType)
-RABBIT_TAG_DEF(number_tag, rapidjson::kNumberType)
-#undef RABBIT_TAG_DEF
-
-class type_mismatch : public std::runtime_error
-{
-public:
-  type_mismatch(const std::string& msg)
-    : std::runtime_error(msg)
-  {}
-};
-
-typedef rapidjson::ParseErrorCode parse_error_code;
-
-class parse_error : public std::runtime_error
-{
-private:
-  parse_error_code code_;
-
-public:
-  parse_error(parse_error_code code)
-    : std::runtime_error(rapidjson::GetParseError_En(code))
-    , code_(code)
-  {}
-
-  parse_error_code code() const { return code_; }
-};
-
-// fwd
-template <typename Traits> class basic_value_ref;
-template <typename Traits, typename DefaultTag> class basic_value;
-template <typename Traits> class basic_object;
-template <typename Traits> class basic_array;
-
-namespace details {
-
-  template <bool C, typename T = void>
-  struct enable_if_c
-  {
-    typedef T type;
-  };
-
-  template <typename T>
-  struct enable_if_c<false, T>
-  {};
-
-  template <typename Cond, typename T = void>
-  struct enable_if : enable_if_c<Cond::value, T>
-  {};
-
-  template <typename Cond, typename T = void>
-  struct disable_if : enable_if_c<!Cond::value, T>
-  {};
-
-
-  template <bool C>
-  struct bool_
-  {
-    static const bool value = C;
-  };
-
-  typedef bool_<true> true_;
-  typedef bool_<false> false_;
-
-
-  template <typename T> struct remove_reference { typedef T type; };
-  template <typename T> struct remove_reference<T&> { typedef T type; };
-
-  template <typename T> struct remove_const { typedef T type; };
-  template <typename T> struct remove_const<const T> { typedef T type; };
-
-
-  template <typename Char, typename Traits = std::char_traits<Char> >
-  class basic_string_ref
-  {
-  public:
-    typedef Char value_type;
-    typedef std::size_t size_type;
-
-  private:
-    const value_type* data_;
-    size_type length_;
-
-  public:
-    basic_string_ref()
-      : data_(0)
-      , length_(0)
-    {}
-
-    basic_string_ref(const basic_string_ref& other)
-      : data_(other.data_)
-      , length_(other.length_)
-    {}
-
-    basic_string_ref(const value_type* str)
-      : data_(str)
-      , length_(Traits::length(str))
-    {}
-
-    basic_string_ref(const value_type* str, size_type length)
-      : data_(str)
-      , length_(length)
-    {}
-
-    template <typename Allocator>
-    basic_string_ref(const std::basic_string<value_type, Allocator>& other)
-      : data_(other.data())
-      , length_(other.length())
-    {}
-
-    size_type size() const     { return length_; }
-    size_type length() const   { return length_; }
-    size_type max_size() const { return length_; }
-    bool empty() const         { return length_ == 0; }
-
-    const value_type* data() const { return data_; }
-  };
-
-
-  // type traits
-  template <typename T> struct is_tag : false_ {};
-  template <> struct is_tag<null_tag> : true_ {};
-  template <> struct is_tag<false_tag> : true_ {};
-  template <> struct is_tag<true_tag> : true_ {};
-  template <> struct is_tag<object_tag> : true_ {};
-  template <> struct is_tag<array_tag> : true_ {};
-  template <> struct is_tag<string_tag> : true_ {};
-  template <> struct is_tag<number_tag> : true_ {};
-
-  template <typename T> struct is_null : false_ {};
-  template <> struct is_null<null_tag> : true_ {};
-
-  template <typename T> struct is_false : false_ {};
-  template <> struct is_false<false_tag> : true_ {};
-
-  template <typename T> struct is_true : false_ {};
-  template <> struct is_true<true_tag> : true_ {};
-
-  template <typename T> struct is_object : false_ {};
-  template <> struct is_object<object_tag> : true_ {};
-  template <typename Traits> struct is_object< basic_object<Traits> > : true_ {};
-
-  template <typename T> struct is_array : false_ {};
-  template <> struct is_array<array_tag> : true_ {};
-  template <typename Traits> struct is_array< basic_array<Traits> > : true_ {};
-
-  template <typename T> struct is_string : false_ {};
-  template <> struct is_string<string_tag> : true_ {};
-  template <typename Char> struct is_string< std::basic_string<Char> > : true_ {};
-  template <typename Char, typename Traits> struct is_string< basic_string_ref<Char, Traits> > : true_ {};
-
-  template <typename T> struct is_number : false_ {};
-  template <> struct is_number<number_tag> : true_ {};
-
-  template <typename T> struct is_bool : false_ {};
-  template <> struct is_bool<bool> : true_ {};
-
-  template <typename T> struct is_int : false_ {};
-  template <> struct is_int<int> : true_ {};
-
-  template <typename T> struct is_uint : false_ {};
-  template <> struct is_uint<unsigned> : true_ {};
-
-  template <typename T> struct is_int64 : false_ {};
-  template <> struct is_int64<int64_t> : true_ {};
-
-  template <typename T> struct is_uint64 : false_ {};
-  template <> struct is_uint64<uint64_t> : true_ {};
-
-  template <typename T> struct is_double : false_ {};
-  template <> struct is_double<double> : true_ {};
-
-  template <typename T> struct is_value_ref : false_ {};
-  template <typename Traits> struct is_value_ref< basic_value_ref<Traits> > : true_ {};
-  template <typename Traits, typename DefaultTag> struct is_value_ref< basic_value<Traits, DefaultTag> > : true_ {};
-  template <typename Traits> struct is_value_ref< basic_object<Traits> > : true_ {};
-  template <typename Traits> struct is_value_ref< basic_array<Traits> > : true_ {};
-
-  // type name
-  template <typename T> const char* type_name(typename enable_if< is_null<T> >::type* = 0)        { return "null"; }
-  template <typename T> const char* type_name(typename enable_if< is_false<T> >::type* = 0)       { return "false"; }
-  template <typename T> const char* type_name(typename enable_if< is_true<T> >::type* = 0)        { return "true"; }
-  template <typename T> const char* type_name(typename enable_if< is_object<T> >::type* = 0)      { return "object"; }
-  template <typename T> const char* type_name(typename enable_if< is_array<T> >::type* = 0)       { return "array"; }
-  template <typename T> const char* type_name(typename enable_if< is_string<T> >::type* = 0)      { return "string"; }
-  template <typename T> const char* type_name(typename enable_if< is_number<T> >::type* = 0)      { return "number"; }
-  template <typename T> const char* type_name(typename enable_if< is_bool<T> >::type* = 0)        { return "bool"; }
-  template <typename T> const char* type_name(typename enable_if< is_int<T> >::type* = 0)         { return "int"; }
-  template <typename T> const char* type_name(typename enable_if< is_uint<T> >::type* = 0)        { return "uint"; }
-  template <typename T> const char* type_name(typename enable_if< is_int64<T> >::type* = 0)       { return "int64"; }
-  template <typename T> const char* type_name(typename enable_if< is_uint64<T> >::type* = 0)      { return "uint64"; }
-  template <typename T> const char* type_name(typename enable_if< is_double<T> >::type* = 0)      { return "double"; }
-  template <typename T> const char* type_name(typename enable_if< is_value_ref<T> >::type* = 0)   { return "value_ref"; }
-
-
-  template <typename PseudoReference>
-  struct operator_arrow_proxy
-  {
-    mutable typename remove_const<PseudoReference>::type value_;
-    operator_arrow_proxy(const PseudoReference& value) : value_(value) {}
-    PseudoReference* operator->() const { return &value_; }
-  };
-
-  template <typename T>
-  struct operator_arrow_proxy<T&>
-  {
-    T& value_;
-    operator_arrow_proxy(T& value) : value_(value) {}
-    T* operator->() const { return &value_; }
-  };
-
-
-  template <typename Function, typename Iterator>
-  class transform_iterator
-  {
-    typedef std::iterator_traits<Iterator> traits_type;
-
-  public:
-    typedef transform_iterator this_type;
-    typedef Function function_type;
-
-    typedef Iterator iterator_type;
-    typedef typename traits_type::iterator_category iterator_category;
-    typedef typename traits_type::difference_type difference_type;
-
-    typedef typename Function::result_type result_type;
-    typedef typename remove_reference<result_type>::type value_type;
-    typedef operator_arrow_proxy<result_type> operator_arrow_proxy_type;
-    typedef operator_arrow_proxy_type pointer;
-    typedef result_type reference;
-
-  private:
-    iterator_type it_;
-    function_type func_;
-
-  public:
-    transform_iterator()
-      : it_()
-      , func_()
-    {}
-
-    explicit transform_iterator(const iterator_type& it)
-      : it_(it)
-      , func_()
-    {}
-
-    transform_iterator(const iterator_type& it, const function_type& func)
-      : it_(it)
-      , func_(func)
-    {}
-
-    template <typename OtherFunction, typename OtherIterator>
-    transform_iterator(const transform_iterator<OtherFunction, OtherIterator>& other)
-      : it_(other.base())
-      , func_(other.functor())
-    {}
-
-    iterator_type& base() { return it_; }
-    const iterator_type& base() const { return it_; }
-
-    function_type& functor() { return func_; }
-    const function_type& functor() const { return func_; }
-
-    result_type dereference() const { return func_(*it_); }
-
-    result_type operator*() const { return dereference(); }
-    operator_arrow_proxy_type operator->() const { return operator_arrow_proxy_type(dereference()); }
-
-    this_type& operator++() { ++it_; return *this; }
-    this_type operator++(int) { return this_type(it_++, func_); }
-    this_type& operator--() { --it_; return *this; }
-    this_type operator--(int) { return this_type(it_--, func_); }
-
-    this_type operator+(difference_type n) const { return this_type(it_ + n, func_); }
-    this_type& operator+=(difference_type n) { it_ += n; return *this; }
-    this_type operator-(difference_type n) const { return this_type(it_ - n, func_); }
-    this_type& operator-=(difference_type n) { it_ -= n; return *this; }
-
-    result_type operator[](difference_type n) const { return func_(it_[n]); }
-	
-	// Subtraction operator overload is required for std::distance
-    template <typename OtherFunction, typename OtherIterator>
-    size_t operator-(const transform_iterator<OtherFunction, OtherIterator>& other) const { return base() - other.base(); }
-
-    template <typename OtherFunction, typename OtherIterator>
-    bool operator==(const transform_iterator<OtherFunction, OtherIterator>& other) const { return base() == other.base(); }
-
-    template <typename OtherFunction, typename OtherIterator>
-    bool operator!=(const transform_iterator<OtherFunction, OtherIterator>& other) const { return base() != other.base(); }
-
-    template <typename OtherFunction, typename OtherIterator>
-    bool operator<(const transform_iterator<OtherFunction, OtherIterator>& other) const { return base() < other.base(); }
-
-    template <typename OtherFunction, typename OtherIterator>
-    bool operator>(const transform_iterator<OtherFunction, OtherIterator>& other) const { return base() > other.base(); }
-
-    template <typename OtherFunction, typename OtherIterator>
-    bool operator<=(const transform_iterator<OtherFunction, OtherIterator>& other) const { return base() <= other.base(); }
-
-    template <typename OtherFunction, typename OtherIterator>
-    bool operator>=(const transform_iterator<OtherFunction, OtherIterator>& other) const { return base() >= other.base(); }
-  };
-
-  template <typename Function, typename Iterator>
-  transform_iterator<Function, Iterator> make_transform_iterator(Iterator it, Function func = Function())
-  {
-    return transform_iterator<Function, Iterator>(it, func);
-  }
-
-
-  template <typename Member, typename ValueRef>
-  class member_wrapper
-  {
-  public:
-    typedef Member wrapped_type;
-    typedef ValueRef value_ref_type;
-    typedef typename ValueRef::string_type string_type;
-    typedef typename ValueRef::allocator_type allocator_type;
-
-    class proxy
-    {
-      wrapped_type& member_;
-      allocator_type* alloc_;
-
-    public:
-      proxy(wrapped_type& member, allocator_type* alloc)
-        : member_(member)
-        , alloc_(alloc)
-      {}
-
-      string_type name() const { return value_ref_type(&(member_.name), alloc_).as_string(); }
-      value_ref_type value() const { return value_ref_type(&(member_.value), alloc_); }
-    };
-
-  private:
-    allocator_type* alloc_;
-
-  public:
-    member_wrapper(allocator_type* alloc)
-      : alloc_(alloc)
-    {}
-
-    template <typename OtherMember, typename OtherValueRef>
-    member_wrapper(const member_wrapper<OtherMember, OtherValueRef>& other)
-      : alloc_(other.get_allocator_pointer())
-    {}
-
-    typedef proxy result_type;
-    result_type operator()(wrapped_type& member) const
-    {
-      return result_type(member, alloc_);
-    }
-
-    allocator_type* get_allocator_pointer() const { return alloc_; }
-  };
-
-  template <typename Value, typename ValueRef>
-  class value_wrapper
-  {
-  public:
-    typedef Value wrapped_type;
-    typedef ValueRef value_ref_type;
-    typedef typename ValueRef::string_type string_type;
-    typedef typename ValueRef::allocator_type allocator_type;
-
-  private:
-    allocator_type* alloc_;
-
-  public:
-    value_wrapper(allocator_type* alloc)
-      : alloc_(alloc)
-    {}
-
-    template <typename OtherValue, typename OtherValueRef>
-    value_wrapper(const value_wrapper<OtherValue, OtherValueRef>& other)
-      : alloc_(other.get_allocator_pointer())
-    {}
-
-    typedef value_ref_type result_type;
-    result_type operator()(wrapped_type& value) const
-    {
-      return result_type(&value, alloc_);
-    }
-
-    allocator_type* get_allocator_pointer() const { return alloc_; }
-  };
-
-  template <typename Encoding> struct value_ref_traits;
-  template <typename Encoding> struct const_value_ref_traits;
-
-  template <typename Encoding>
-  struct value_ref_traits
-  {
-    typedef Encoding                                            encoding_type;
-    typedef rapidjson::Type                                     native_type;
-    typedef rapidjson::GenericDocument<Encoding>                native_document_type;
-    typedef rapidjson::GenericValue<Encoding>                   native_value_type;
-    typedef typename native_document_type::AllocatorType        native_allocator_type;
-    typedef const_value_ref_traits<Encoding>                    const_traits;
-
-    template <typename ValueRef, typename Tag>
-    static void set(ValueRef& ref, Tag tag = Tag())
-    {
-      ref.set(tag);
-    }
-  };
-
-  template <typename Encoding>
-  struct const_value_ref_traits
-  {
-    typedef Encoding                                            encoding_type;
-    typedef const rapidjson::Type                               native_type;
-    typedef const rapidjson::GenericDocument<Encoding>          native_document_type;
-    typedef const rapidjson::GenericValue<Encoding>             native_value_type;
-    typedef const typename native_document_type::AllocatorType  native_allocator_type;
-    typedef const_value_ref_traits<Encoding>                    const_traits;
-
-    template <typename ValueRef, typename Tag>
-    static void set(const ValueRef& ref, Tag tag = Tag())
-    {}
-  };
-
-
-  template <typename T>
-  class scoped_ptr
-  {
-  private:
-    T* p_;
-
-  private:
-    scoped_ptr(const scoped_ptr& other);
-    scoped_ptr& operator=(const scoped_ptr& other);
-
-  public:
-    explicit scoped_ptr(T* p = 0)
-      : p_(p)
-    {}
-
-    ~scoped_ptr()
-    {
-      delete p_;
-    }
-
-    T* operator->() { return p_; }
-    const T* operator->() const { return p_; }
-
-    T& operator*() { return *p_; }
-    const T& operator*() const { return *p_; }
-
-    T* get() { return p_; }
-    const T* get() const { return p_; }
-
-    void swap(scoped_ptr& other) throw()
-    {
-      std::swap(p_, other.p_);
-    }
-  };
-
-} // details
-
-template <typename Traits>
-class basic_value_ref
-{
-public:
-  typedef Traits                                        traits;
-  typedef typename Traits::const_traits                 const_traits;
-
-  typedef typename traits::encoding_type                encoding_type;
-  typedef typename traits::native_type                  native_type;
-  typedef typename traits::native_document_type         native_document_type;
-  typedef typename traits::native_value_type            native_value_type;
-  typedef typename traits::native_allocator_type        native_allocator_type;
-
-  typedef basic_value_ref<traits>                       value_ref_type;
-  typedef const basic_value_ref<const_traits>           const_value_ref_type;
-  typedef typename encoding_type::Ch                    char_type;
-  typedef std::basic_string<char_type>                  string_type;
-  typedef details::basic_string_ref<char_type>          string_ref_type;
-  typedef native_allocator_type                         allocator_type;
-
-private:
-  typedef details::member_wrapper<      typename native_value_type::Member,       value_ref_type> member_wrapper_type;
-  typedef details::member_wrapper<const typename native_value_type::Member, const_value_ref_type> const_member_wrapper_type;
-  typedef details::value_wrapper<      native_value_type,       value_ref_type> value_wrapper_type;
-  typedef details::value_wrapper<const native_value_type, const_value_ref_type> const_value_wrapper_type;
-
-public:
-  typedef details::transform_iterator<      member_wrapper_type, typename native_value_type::MemberIterator> member_iterator;
-  typedef details::transform_iterator<const_member_wrapper_type, typename native_value_type::ConstMemberIterator> const_member_iterator;
-  typedef details::transform_iterator<      value_wrapper_type, typename native_value_type::ValueIterator> value_iterator;
-  typedef details::transform_iterator<const_value_wrapper_type, typename native_value_type::ConstValueIterator> const_value_iterator;
-
-private:
-  native_value_type* value_;
-  allocator_type* alloc_;
-
-public:
-  basic_value_ref(native_value_type* value = 0, allocator_type* alloc = 0)
-    : value_(value)
-    , alloc_(alloc)
-  {}
-
-  template <typename OtherTraits>
-  basic_value_ref(const basic_value_ref<OtherTraits>& other)
-    : value_(other.get_native_value_pointer())
-    , alloc_(other.get_allocator_pointer())
-  {}
-
-  native_value_type* get_native_value_pointer() const { return value_; }
-  allocator_type* get_allocator_pointer() const { return alloc_; }
-  allocator_type& get_allocator() const { return *alloc_; }
-
-  void set(null_tag)                  { value_->SetNull(); }
-  void set(object_tag)                { value_->SetObject(); }
-  void set(array_tag)                 { value_->SetArray(); }
-  void set(bool value)                { value_->SetBool(value); }
-  void set(int value)                 { value_->SetInt(value); }
-  void set(unsigned value)            { value_->SetUint(value); }
-  void set(int64_t value)             { value_->SetInt64(value); }
-  void set(uint64_t value)            { value_->SetUint64(value); }
-  void set(double value)              { value_->SetDouble(value); }
-  void set(const char_type* value)    { value_->SetString(value, *alloc_); }
-  void set(const string_type& value)  { value_->SetString(value.data(), static_cast<rapidjson::SizeType>(value.length()), *alloc_); }
-
-  template <typename T>
-  void set(const T& value, typename details::enable_if< details::is_value_ref<T> >::type* = 0)
-  {
-    if      (value.is_null())   set(null_tag());
-    else if (value.is_bool())   set(value.as_bool());
-    else if (value.is_int())    set(value.as_int());
-    else if (value.is_uint())   set(value.as_uint());
-    else if (value.is_int64())  set(value.as_int64());
-    else if (value.is_uint64()) set(value.as_uint64());
-    else if (value.is_double()) set(value.as_double());
-    else if (value.is_string()) set(value.as_string());
-    else if (value.is_array()) throw std::runtime_error("can not assign array directly. please use insert");
-    else if (value.is_object()) throw std::runtime_error("can not assign object directly. please use insert");
-  }
-
-  template <typename T>
-  value_ref_type& operator=(const T& value)
-  {
-    set(value);
-    return *this;
-  }
-
-
-  template <typename OtherTraits>
-  bool operator==(const basic_value_ref<OtherTraits>& other) const
-  {
-    if (is_null() && other.is_null()) return true;
-    if (is_bool() && other.is_bool() && as_bool() == other.as_bool()) return true;
-    if (is_int() && other.is_int() && as_int() == other.as_int()) return true;
-    if (is_uint() && other.is_uint() && as_uint() == other.as_uint()) return true;
-    if (is_int64() && other.is_int64() && as_int64() == other.as_int64()) return true;
-    if (is_uint64() && other.is_uint64() && as_uint64() == other.as_uint64()) return true;
-    if (is_double() && other.is_double() && as_double() == other.as_double()) return true;
-    if (is_string() && other.is_string() && as_string() == other.as_string()) return true;
-    return false;
-  }
-
-  template <typename OtherTraits>
-  bool operator!=(const basic_value_ref<OtherTraits>& other) const
-  {
-    return !(*this == other);
-  }
-
-
-  int which() const
-  {
-    return static_cast<int>(value_->GetType());
-  }
-
-#define RABBIT_IS_DEF(name, base_name) \
-  template <typename T> \
-  bool is(typename details::enable_if< details::is_##name<T> >::type* = 0) const \
-  { \
-    return value_->Is##base_name(); \
-  } \
-  bool is_##name() const \
-  { \
-    return value_->Is##base_name(); \
-  } \
-/**/
-  RABBIT_IS_DEF(null, Null)
-  RABBIT_IS_DEF(false, False)
-  RABBIT_IS_DEF(true, True)
-  RABBIT_IS_DEF(object, Object)
-  RABBIT_IS_DEF(array, Array)
-  RABBIT_IS_DEF(number, Number)
-  RABBIT_IS_DEF(bool, Bool)
-  RABBIT_IS_DEF(int, Int)
-  RABBIT_IS_DEF(uint, Uint)
-  RABBIT_IS_DEF(int64, Int64)
-  RABBIT_IS_DEF(uint64, Uint64)
-  RABBIT_IS_DEF(double, Double)
-  RABBIT_IS_DEF(string, String)
-#undef RABBIT_IS_DEF
-
-#define RABBIT_AS_DEF(result_type, name, base_name) \
-  template <typename T> \
-  T as(typename details::enable_if< details::is_##name<T> >::type* = 0) const \
-  { \
-    type_check<T>(); \
-    return value_->Get##base_name(); \
-  } \
-  result_type as_##name() const \
-  { \
-    type_check<result_type>(); \
-    return value_->Get##base_name(); \
-  } \
-/**/
-  RABBIT_AS_DEF(bool, bool, Bool)
-  RABBIT_AS_DEF(int, int, Int)
-  RABBIT_AS_DEF(unsigned, uint, Uint)
-  RABBIT_AS_DEF(int64_t, int64, Int64)
-  RABBIT_AS_DEF(uint64_t, uint64, Uint64)
-  RABBIT_AS_DEF(double, double, Double)
-  RABBIT_AS_DEF(string_type, string, String)
-#undef RABBIT_AS_DEF
-
-private:
-  struct as_t
-  {
-    const value_ref_type& ref_;
-    as_t(const value_ref_type& ref) : ref_(ref) {}
-
-    template <typename Result>
-    operator Result() const { return ref_.as<Result>(); }
-  };
-
-public:
-  as_t as() const { return as_t(*this); }
-
-  bool has(const string_ref_type& name) const
-  {
-    type_check<object_tag>();
-    return value_->HasMember(name.data());
-  }
-
-  template <typename T>
-  void insert(const string_ref_type& name, const T& value, typename details::disable_if< details::is_value_ref<T> >::type* = 0)
-  {
-    type_check<object_tag>();
-    native_value_type v(value);
-    value_->AddMember(rapidjson::StringRef(name.data(), name.length()), v, *alloc_);
-  }
-
-  template <typename T>
-  void insert(const string_ref_type& name, const T& value, typename details::enable_if< details::is_value_ref<T> >::type* = 0)
-  {
-    type_check<object_tag>();
-    value_->AddMember(rapidjson::StringRef(name.data(), name.length()), *value.get_native_value_pointer(), *alloc_);
-  }
-
-  bool erase(const string_ref_type& name)
-  {
-    type_check<object_tag>();
-    return value_->RemoveMember(name.data());
-  }
-
-  value_ref_type at(const string_ref_type& name)
-  {
-    type_check<object_tag>();
-
-    if (!has(name))
-    {
-      native_value_type null;
-      value_->AddMember(rapidjson::StringRef(name.data(), name.length()), null, *alloc_);
-    }
-
-    return value_ref_type(&((*value_)[name.data()]), alloc_);
-  }
-
-  const_value_ref_type at(const string_ref_type& name) const
-  {
-    type_check<object_tag>();
-    if (!has(name))
-      throw std::out_of_range("not found");
-    return const_value_ref_type(&((*value_)[name.data()]), alloc_);
-  }
-
-  value_ref_type operator[](const string_ref_type& name) { return at(name); }
-  const_value_ref_type operator[](const string_ref_type& name) const { return at(name); }
-
-  member_iterator member_begin()
-  {
-    type_check<object_tag>();
-    return details::make_transform_iterator(value_->MemberBegin(), member_wrapper_type(alloc_));
-  }
-
-  member_iterator member_end()
-  {
-    type_check<object_tag>();
-    return details::make_transform_iterator(value_->MemberEnd(), member_wrapper_type(alloc_));
-  }
-
-  const_member_iterator member_begin() const
-  {
-    type_check<object_tag>();
-    return details::make_transform_iterator(value_->MemberBegin(), const_member_wrapper_type(alloc_));
-  }
-
-  const_member_iterator member_end() const
-  {
-    type_check<object_tag>();
-    return details::make_transform_iterator(value_->MemberEnd(), const_member_wrapper_type(alloc_));
-  }
-
-  const_member_iterator member_cbegin() const { return member_begin(); }
-  const_member_iterator member_cend() const { return member_end(); }
-
-
-  std::size_t size() const
-  {
-    type_check<array_tag>();
-    return value_->Size();
-  }
-
-  std::size_t capacity() const
-  {
-    type_check<array_tag>();
-    return value_->Capacity();
-  }
-
-  bool empty() const
-  {
-    type_check<array_tag>();
-    return value_->Empty();
-  }
-
-  value_ref_type at(std::size_t index)
-  {
-    type_check<array_tag>();
-    range_check(index);
-    return value_ref_type(&((*value_)[index]), alloc_);
-  }
-
-  const_value_ref_type at(std::size_t index) const
-  {
-    type_check<array_tag>();
-    range_check(index);
-    return const_value_ref_type(&((*value_)[index]), *alloc_);
-  }
-
-  value_ref_type operator[](std::size_t index) { return at(index); }
-  const_value_ref_type operator[](std::size_t index) const { return at(index); }
-
-  template <typename T>
-  void push_back(const T& value, typename details::disable_if< details::is_value_ref<T> >::type* = 0)
-  {
-    type_check<array_tag>();
-    native_value_type v(value);
-    value_->PushBack(v, *alloc_);
-  }
-
-  template <typename T>
-  void push_back(const T& value, typename details::enable_if< details::is_value_ref<T> >::type* = 0)
-  {
-    type_check<array_tag>();
-    value_->PushBack(*value.get_native_value_pointer(), *alloc_);
-  }
-
-  void pop_back()
-  {
-    type_check<array_tag>();
-    value_->PopBack();
-  }
-
-  value_iterator value_begin()
-  {
-    type_check<array_tag>();
-    return details::make_transform_iterator(value_->Begin(), value_wrapper_type(alloc_));
-  }
-
-  value_iterator value_end()
-  {
-    type_check<array_tag>();
-    return details::make_transform_iterator(value_->End(), value_wrapper_type(alloc_));
-  }
-
-  const_value_iterator value_begin() const
-  {
-    type_check<array_tag>();
-    return details::make_transform_iterator(value_->Begin(), const_value_wrapper_type(alloc_));
-  }
-
-  const_value_iterator value_end() const
-  {
-    type_check<array_tag>();
-    return details::make_transform_iterator(value_->End(), const_value_wrapper_type(alloc_));
-  }
-
-  const_value_iterator value_cbegin() const { return value_begin(); }
-  const_value_iterator value_cend() const { return value_end(); }
-
-
-  void swap(value_ref_type& other) throw()
-  {
-    std::swap(value_, other.value_);
-    std::swap(alloc_, other.alloc_);
-  }
-
-  string_type str() const
-  {
-    switch (which())
-    {
-    case null_tag::value:
-      return "null";
-
-    case false_tag::value:
-      return "false";
-
-    case true_tag::value:
-      return "true";
-
-    case string_tag::value:
-      return as_string();
-
-    case number_tag::value:
-      {
-        std::basic_stringstream<char_type> ss;
-        if      (is_int())    ss << as_int();
-        else if (is_uint())   ss << as_uint();
-        else if (is_int64())  ss << as_int64();
-        else if (is_uint64()) ss << as_uint64();
-        else if (is_double()) ss << as_double();
-        return ss.str();
-      }
-
-    default:
-      {
-        typedef rapidjson::GenericStringBuffer<encoding_type> buffer_t;
-        typedef rapidjson::Writer<buffer_t, encoding_type> writer_t;
-        buffer_t buffer;
-        writer_t writer(buffer);
-        value_->Accept(writer);
-        return buffer.GetString();
-      }
-    }
-  }
-
-private:
-  template <typename T>
-  void type_check() const
-  {
-    if (!is<T>())
-    {
-      std::stringstream ss;
-      ss << "value is not ";
-      ss << details::type_name<T>();
-      ss << " (which is " << which() << ")";
-      throw type_mismatch(ss.str());
-    }
-  }
-
-  void range_check(std::size_t index) const
-  {
-    if (index >= size())
-    {
-      std::stringstream ss;
-      ss << "index (which is " << index << ") >= size() (which is " << size() << ")";
-      throw std::out_of_range(ss.str());
-    }
-  }
-};
-
-
-template <typename Traits>
-struct basic_value_base
-{
-  typedef basic_value_ref<Traits>                   base_type;
-  typedef typename base_type::native_value_type     native_value_type;
-  typedef typename base_type::allocator_type        allocator_type;
-
-  details::scoped_ptr<native_value_type> value_impl_;
-  details::scoped_ptr<allocator_type> alloc_impl_;
-
-  explicit basic_value_base(native_value_type* value = 0, allocator_type* alloc = 0)
-    : value_impl_(value)
-    , alloc_impl_(alloc)
-  {}
-};
-
-template <typename Traits, typename DefaultTag = null_tag>
-class basic_value 
-  : private basic_value_base<Traits>
-  , public basic_value_ref<Traits>
-{
-public:
-  typedef Traits                                        traits;
-  typedef typename Traits::const_traits                 const_traits;
-
-  typedef basic_value_base<traits>                      member_type;
-  typedef basic_value_ref<traits>                       base_type;
-
-  typedef typename base_type::encoding_type             encoding_type;
-  typedef typename base_type::native_type               native_type;
-  typedef typename base_type::native_document_type      native_document_type;
-  typedef typename base_type::native_value_type         native_value_type;
-  typedef typename base_type::native_allocator_type     native_allocator_type;
-
-  typedef typename base_type::value_ref_type            value_ref_type;
-  typedef typename base_type::const_value_ref_type      const_value_ref_type;
-  typedef typename base_type::char_type                 char_type;
-  typedef typename base_type::string_type               string_type;
-  typedef typename base_type::string_ref_type           string_ref_type;
-  typedef typename base_type::allocator_type            allocator_type;
-
-  typedef typename base_type::member_iterator           member_iterator;
-  typedef typename base_type::const_member_iterator     const_member_iterator;
-  typedef typename base_type::value_iterator            value_iterator;
-  typedef typename base_type::const_value_iterator      const_value_iterator;
-
-private:
-  typedef DefaultTag default_tag;
-
-public:
-  basic_value()
-    : member_type(new native_value_type(DefaultTag::native_value), new allocator_type())
-    , base_type(member_type::value_impl_.get(), member_type::alloc_impl_.get())
-  {}
-
-  basic_value(allocator_type& alloc)
-    : member_type(new native_value_type(DefaultTag::native_value))
-    , base_type(member_type::value_impl_.get(), &alloc)
-  {}
-
-  template <typename Tag>
-  basic_value(Tag tag, typename details::enable_if< details::is_tag<Tag> >::type* = 0)
-    : member_type(new native_value_type(Tag::native_value), new allocator_type())
-    , base_type(member_type::value_impl_.get(), member_type::alloc_impl_.get())
-  {}
-
-  template <typename Tag>
-  basic_value(Tag tag, allocator_type& alloc, typename details::enable_if< details::is_tag<Tag> >::type* = 0)
-    : member_type(new native_value_type(Tag::native_value), &alloc)
-    , base_type(member_type::value_impl_.get(), member_type::alloc_impl_.get())
-  {}
-
-  template <typename T>
-  basic_value(const T& value, typename details::disable_if< details::is_value_ref<T> >::type* = 0)
-    : member_type(new native_value_type(value), new allocator_type())
-    , base_type(member_type::value_impl_.get(), member_type::alloc_impl_.get())
-  {}
-
-  template <typename T>
-  basic_value(const T& value, allocator_type& alloc, typename details::disable_if< details::is_value_ref<T> >::type* = 0)
-    : member_type(new native_value_type(value))
-    , base_type(member_type::value_impl_.get(), &alloc)
-  {}
-
-
-  basic_value(const basic_value& other)
-    : member_type()
-    , base_type(other)
-  {
-    if (other.is_root_value())
-      throw std::runtime_error("can not copy root value");
-  }
-
-  basic_value& operator=(const basic_value& other)
-  {
-    if (other.is_root_value())
-      throw std::runtime_error("can not copy root value");
-    basic_value(other).swap(*this);
-    return *this;
-  }
-
-  template <typename OtherTraits>
-  basic_value(const basic_value_ref<OtherTraits>& other)
-    : member_type()
-    , base_type(other)
-  {
-    if (base_type::is_null())
-      traits::set(*this, default_tag());
-  }
-
-  template <typename OtherTraits>
-  basic_value& operator=(const basic_value_ref<OtherTraits>& other)
-  {
-    basic_value(other).swap(*this);
-    return *this;
-  }
-
-
-  template <typename T>
-  basic_value& operator=(const T& value)
-  {
-    base_type::set(value);
-    return *this;
-  }
-
-  void clear()
-  {
-    base_type::set(default_tag());
-  }
-
-  void swap(basic_value& other) throw()
-  {
-    base_type::swap(other);
-    member_type::value_impl_.swap(other.value_impl_);
-    member_type::alloc_impl_.swap(other.alloc_impl_);
-  }
-
-private:
-  bool is_root_value() const
-  {
-    return member_type::value_impl_.get() != 0
-        || member_type::alloc_impl_.get() != 0;
-  }
-};
-
-template <typename Traits>
-class basic_object : public basic_value<Traits, object_tag>
-{
-public:
-  typedef basic_value<Traits, object_tag>               base_type;
-
-  typedef typename base_type::encoding_type             encoding_type;
-  typedef typename base_type::native_type               native_type;
-  typedef typename base_type::native_document_type      native_document_type;
-  typedef typename base_type::native_value_type         native_value_type;
-  typedef typename base_type::native_allocator_type     native_allocator_type;
-
-  typedef typename base_type::value_ref_type            value_ref_type;
-  typedef typename base_type::const_value_ref_type      const_value_ref_type;
-  typedef typename base_type::char_type                 char_type;
-  typedef typename base_type::string_type               string_type;
-  typedef typename base_type::string_ref_type           string_ref_type;
-  typedef typename base_type::allocator_type            allocator_type;
-
-  typedef typename base_type::member_iterator           iterator;
-  typedef typename base_type::const_member_iterator     const_iterator;
-
-public:
-  basic_object()
-    : base_type()
-  {}
-
-  basic_object(allocator_type& alloc)
-    : base_type(alloc)
-  {}
-
-  basic_object(const basic_object& other)
-    : base_type(other)
-  {}
-
-  template <typename OtherTraits>
-  basic_object(const basic_value_ref<OtherTraits>& other)
-    : base_type(other)
-  {}
-
-  iterator begin()                { return base_type::member_begin(); }
-  iterator end()                  { return base_type::member_end(); }
-  const_iterator begin() const    { return base_type::member_begin(); }
-  const_iterator end() const      { return base_type::member_end(); }
-  const_iterator cbegin() const   { return base_type::member_begin(); }
-  const_iterator cend() const     { return base_type::member_end(); }
-};
-
-template <typename Traits>
-class basic_array : public basic_value<Traits, array_tag>
-{
-public:
-  typedef basic_value<Traits, array_tag>                base_type;
-
-  typedef typename base_type::encoding_type             encoding_type;
-  typedef typename base_type::native_type               native_type;
-  typedef typename base_type::native_document_type      native_document_type;
-  typedef typename base_type::native_value_type         native_value_type;
-  typedef typename base_type::native_allocator_type     native_allocator_type;
-
-  typedef typename base_type::value_ref_type            value_ref_type;
-  typedef typename base_type::const_value_ref_type      const_value_ref_type;
-  typedef typename base_type::char_type                 char_type;
-  typedef typename base_type::string_type               string_type;
-  typedef typename base_type::string_ref_type           string_ref_type;
-  typedef typename base_type::allocator_type            allocator_type;
-
-  typedef typename base_type::value_iterator            iterator;
-  typedef typename base_type::const_value_iterator      const_iterator;
-
-public:
-  basic_array()
-    : base_type()
-  {}
-
-  basic_array(allocator_type& alloc)
-    : base_type(alloc)
-  {}
-
-  template <typename OtherTraits>
-  basic_array(const basic_value_ref<OtherTraits>& other)
-    : base_type(other)
-  {}
-
-  iterator begin()                { return base_type::value_begin(); }
-  iterator end()                  { return base_type::value_end(); }
-  const_iterator begin() const    { return base_type::value_begin(); }
-  const_iterator end() const      { return base_type::value_end(); }
-  const_iterator cbegin() const   { return base_type::value_begin(); }
-  const_iterator cend() const     { return base_type::value_end(); }
-};
-
-
-template <typename Traits>
-struct basic_document_base
-{
-  typedef basic_value_ref<Traits>                   base_type;
-  typedef typename base_type::native_document_type  native_document_type;
-
-  details::scoped_ptr<native_document_type> document_impl_;
-
-  explicit basic_document_base(native_document_type* document = 0)
-    : document_impl_(document)
-  {}
-};
-
-template <typename Traits>
-class basic_document
-  : private basic_document_base<Traits>
-  , public basic_value_ref<Traits>
-{
-public:
-  typedef basic_document_base<Traits>                   member_type;
-  typedef basic_value_ref<Traits>                       base_type;
-
-  typedef typename base_type::encoding_type             encoding_type;
-  typedef typename base_type::native_type               native_type;
-  typedef typename base_type::native_document_type      native_document_type;
-  typedef typename base_type::native_value_type         native_value_type;
-  typedef typename base_type::native_allocator_type     native_allocator_type;
-
-  typedef typename base_type::value_ref_type            value_ref_type;
-  typedef typename base_type::const_value_ref_type      const_value_ref_type;
-  typedef typename base_type::char_type                 char_type;
-  typedef typename base_type::string_type               string_type;
-  typedef typename base_type::string_ref_type           string_ref_type;
-  typedef typename base_type::allocator_type            allocator_type;
-
-private:
-  basic_document(const basic_document&);
-  basic_document& operator=(const basic_document&);
-
-public:
-  basic_document()
-    : member_type(new native_document_type())
-    , base_type(member_type::document_impl_.get(), &(member_type::document_impl_->GetAllocator()))
-  {}
-
-  void swap(basic_document& other)
-  {
-    base_type::swap(other);
-    member_type::document_impl_.swap(other.document_impl_);
-  }
-
-  void parse(const string_ref_type& str)
-  {
-    parse<0>(str);
-  }
-
-  template <unsigned ParseFlags>
-  void parse(const string_ref_type& str)
-  {
-    member_type::document_impl_->template Parse<ParseFlags>(str.data());
-    if (member_type::document_impl_->HasParseError())
-      throw parse_error(member_type::document_impl_->GetParseError());
-  }
-
-  // Additional functions - not from original port. These are added with the intention of supporting schema validation
-  void parse(const string_ref_type& str, const string_ref_type& schema)
-  {
-    parse<0>(str, schema);
-  }
-
-  template <unsigned ParseFlags>
-  void parse(const string_ref_type& str, const string_ref_type& schema)
-  {
-    // Parse schema 
-    rapidjson::Document doc;
-    doc.Parse(schema.data());
-    if(doc.HasParseError())
-      throw parse_error(doc.GetParseError());
-    
-    // Construct schema validator
-    rapidjson::SchemaDocument schema_document(doc);
-    rapidjson::SchemaValidator schema_validator(schema_document);
-
-    // Parse using rabbit style parse call
-    member_type::document_impl_->template Parse<ParseFlags>(str.data());
-    if (member_type::document_impl_->HasParseError())
-      throw parse_error(member_type::document_impl_->GetParseError());
-
-    // Validate using rapidjson schema validator
-    if(!member_type::document_impl_->Accept(schema_validator)) {
-      if (member_type::document_impl_->HasParseError())
-          throw parse_error(member_type::document_impl_->GetParseError());
-        else 
-          throw parse_error(rapidjson::kParseErrorUnspecificSyntaxError);
-    }
-  }
-};
-
-
-template <typename Traits>
-void swap(basic_value_ref<Traits>& a, basic_value_ref<Traits>& b)
-{
-  a.swap(b);
-}
-
-template <typename Traits>
-void swap(basic_value<Traits>& a, basic_value<Traits>& b)
-{
-  a.swap(b);
-}
-
-template <typename Traits>
-void swap(basic_object<Traits>& a, basic_object<Traits>& b)
-{
-  a.swap(b);
-}
-
-template <typename Traits>
-void swap(basic_array<Traits>& a, basic_array<Traits>& b)
-{
-  a.swap(b);
-}
-
-template <typename Traits>
-void swap(basic_document<Traits>& a, basic_document<Traits>& b)
-{
-  a.swap(b);
-}
-
-
-template <typename Traits>
-typename basic_value_ref<Traits>::string_type str(const basic_value_ref<Traits>& value)
-{
-  return value.str();
-}
-
-template <typename Char, typename Traits>
-std::basic_ostream<Char>& operator<<(std::basic_ostream<Char>& os, const basic_value_ref<Traits>& value)
-{
-  os << str(value);
-  return os;
-}
-
-
-typedef rapidjson::UTF8<> default_encoding;
-
-template <typename Encoding = default_encoding>
-struct types
-{
-  typedef details::value_ref_traits<Encoding>         traits;
-  typedef details::const_value_ref_traits<Encoding>   const_traits;
-
-  typedef basic_value_ref<traits>                     value_ref;
-  typedef const basic_value_ref<const_traits>         const_value_ref;
-  typedef basic_value<traits>                         value;
-  typedef const basic_value<const_traits>             const_value;
-  typedef basic_object<traits>                        object;
-  typedef const basic_object<const_traits>            const_object;
-  typedef basic_array<traits>                         array;
-  typedef const basic_array<const_traits>             const_array;
-  typedef basic_document<traits>                      document;
-  typedef const basic_document<const_traits>          const_document;
-  typedef typename document::allocator_type           allocator;
-};
-
-typedef types<>::value_ref        value_ref;
-typedef types<>::const_value_ref  const_value_ref;
-typedef types<>::value            value;
-typedef types<>::const_value      const_value;
-typedef types<>::object           object;
-typedef types<>::const_object     const_object;
-typedef types<>::array            array;
-typedef types<>::const_array      const_array;
-typedef types<>::document         document;
-typedef types<>::const_document   const_document;
-typedef types<>::allocator        allocator;
-
-}
-
-#endif
-
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/allocators.h b/sql-odbc/libraries/rapidjson/include/rapidjson/allocators.h
deleted file mode 100644
index 98affe03fb..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/allocators.h
+++ /dev/null
@@ -1,271 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ALLOCATORS_H_
-#define RAPIDJSON_ALLOCATORS_H_
-
-#include "rapidjson.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// Allocator
-
-/*! \class rapidjson::Allocator
-    \brief Concept for allocating, resizing and freeing memory block.
-    
-    Note that Malloc() and Realloc() are non-static but Free() is static.
-    
-    So if an allocator need to support Free(), it needs to put its pointer in 
-    the header of memory block.
-
-\code
-concept Allocator {
-    static const bool kNeedFree;    //!< Whether this allocator needs to call Free().
-
-    // Allocate a memory block.
-    // \param size of the memory block in bytes.
-    // \returns pointer to the memory block.
-    void* Malloc(size_t size);
-
-    // Resize a memory block.
-    // \param originalPtr The pointer to current memory block. Null pointer is permitted.
-    // \param originalSize The current size in bytes. (Design issue: since some allocator may not book-keep this, explicitly pass to it can save memory.)
-    // \param newSize the new size in bytes.
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize);
-
-    // Free a memory block.
-    // \param pointer to the memory block. Null pointer is permitted.
-    static void Free(void *ptr);
-};
-\endcode
-*/
-
-///////////////////////////////////////////////////////////////////////////////
-// CrtAllocator
-
-//! C-runtime library allocator.
-/*! This class is just wrapper for standard C library memory routines.
-    \note implements Allocator concept
-*/
-class CrtAllocator {
-public:
-    static const bool kNeedFree = true;
-    void* Malloc(size_t size) { 
-        if (size) //  behavior of malloc(0) is implementation defined.
-            return std::malloc(size);
-        else
-            return NULL; // standardize to returning NULL.
-    }
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
-        (void)originalSize;
-        if (newSize == 0) {
-            std::free(originalPtr);
-            return NULL;
-        }
-        return std::realloc(originalPtr, newSize);
-    }
-    static void Free(void *ptr) { std::free(ptr); }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// MemoryPoolAllocator
-
-//! Default memory allocator used by the parser and DOM.
-/*! This allocator allocate memory blocks from pre-allocated memory chunks. 
-
-    It does not free memory blocks. And Realloc() only allocate new memory.
-
-    The memory chunks are allocated by BaseAllocator, which is CrtAllocator by default.
-
-    User may also supply a buffer as the first chunk.
-
-    If the user-buffer is full then additional chunks are allocated by BaseAllocator.
-
-    The user-buffer is not deallocated by this allocator.
-
-    \tparam BaseAllocator the allocator type for allocating memory chunks. Default is CrtAllocator.
-    \note implements Allocator concept
-*/
-template <typename BaseAllocator = CrtAllocator>
-class MemoryPoolAllocator {
-public:
-    static const bool kNeedFree = false;    //!< Tell users that no need to call Free() with this allocator. (concept Allocator)
-
-    //! Constructor with chunkSize.
-    /*! \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
-        \param baseAllocator The allocator for allocating memory chunks.
-    */
-    MemoryPoolAllocator(size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) : 
-        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(0), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
-    {
-    }
-
-    //! Constructor with user-supplied buffer.
-    /*! The user buffer will be used firstly. When it is full, memory pool allocates new chunk with chunk size.
-
-        The user buffer will not be deallocated when this allocator is destructed.
-
-        \param buffer User supplied buffer.
-        \param size Size of the buffer in bytes. It must at least larger than sizeof(ChunkHeader).
-        \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
-        \param baseAllocator The allocator for allocating memory chunks.
-    */
-    MemoryPoolAllocator(void *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
-        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(buffer), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
-    {
-        RAPIDJSON_ASSERT(buffer != 0);
-        RAPIDJSON_ASSERT(size > sizeof(ChunkHeader));
-        chunkHead_ = reinterpret_cast<ChunkHeader*>(buffer);
-        chunkHead_->capacity = size - sizeof(ChunkHeader);
-        chunkHead_->size = 0;
-        chunkHead_->next = 0;
-    }
-
-    //! Destructor.
-    /*! This deallocates all memory chunks, excluding the user-supplied buffer.
-    */
-    ~MemoryPoolAllocator() {
-        Clear();
-        RAPIDJSON_DELETE(ownBaseAllocator_);
-    }
-
-    //! Deallocates all memory chunks, excluding the user-supplied buffer.
-    void Clear() {
-        while (chunkHead_ && chunkHead_ != userBuffer_) {
-            ChunkHeader* next = chunkHead_->next;
-            baseAllocator_->Free(chunkHead_);
-            chunkHead_ = next;
-        }
-        if (chunkHead_ && chunkHead_ == userBuffer_)
-            chunkHead_->size = 0; // Clear user buffer
-    }
-
-    //! Computes the total capacity of allocated memory chunks.
-    /*! \return total capacity in bytes.
-    */
-    size_t Capacity() const {
-        size_t capacity = 0;
-        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
-            capacity += c->capacity;
-        return capacity;
-    }
-
-    //! Computes the memory blocks allocated.
-    /*! \return total used bytes.
-    */
-    size_t Size() const {
-        size_t size = 0;
-        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
-            size += c->size;
-        return size;
-    }
-
-    //! Allocates a memory block. (concept Allocator)
-    void* Malloc(size_t size) {
-        if (!size)
-            return NULL;
-
-        size = RAPIDJSON_ALIGN(size);
-        if (chunkHead_ == 0 || chunkHead_->size + size > chunkHead_->capacity)
-            if (!AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size))
-                return NULL;
-
-        void *buffer = reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size;
-        chunkHead_->size += size;
-        return buffer;
-    }
-
-    //! Resizes a memory block (concept Allocator)
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
-        if (originalPtr == 0)
-            return Malloc(newSize);
-
-        if (newSize == 0)
-            return NULL;
-
-        originalSize = RAPIDJSON_ALIGN(originalSize);
-        newSize = RAPIDJSON_ALIGN(newSize);
-
-        // Do not shrink if new size is smaller than original
-        if (originalSize >= newSize)
-            return originalPtr;
-
-        // Simply expand it if it is the last allocation and there is sufficient space
-        if (originalPtr == reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size - originalSize) {
-            size_t increment = static_cast<size_t>(newSize - originalSize);
-            if (chunkHead_->size + increment <= chunkHead_->capacity) {
-                chunkHead_->size += increment;
-                return originalPtr;
-            }
-        }
-
-        // Realloc process: allocate and copy memory, do not free original buffer.
-        if (void* newBuffer = Malloc(newSize)) {
-            if (originalSize)
-                std::memcpy(newBuffer, originalPtr, originalSize);
-            return newBuffer;
-        }
-        else
-            return NULL;
-    }
-
-    //! Frees a memory block (concept Allocator)
-    static void Free(void *ptr) { (void)ptr; } // Do nothing
-
-private:
-    //! Copy constructor is not permitted.
-    MemoryPoolAllocator(const MemoryPoolAllocator& rhs) /* = delete */;
-    //! Copy assignment operator is not permitted.
-    MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) /* = delete */;
-
-    //! Creates a new chunk.
-    /*! \param capacity Capacity of the chunk in bytes.
-        \return true if success.
-    */
-    bool AddChunk(size_t capacity) {
-        if (!baseAllocator_)
-            ownBaseAllocator_ = baseAllocator_ = RAPIDJSON_NEW(BaseAllocator());
-        if (ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + capacity))) {
-            chunk->capacity = capacity;
-            chunk->size = 0;
-            chunk->next = chunkHead_;
-            chunkHead_ =  chunk;
-            return true;
-        }
-        else
-            return false;
-    }
-
-    static const int kDefaultChunkCapacity = 64 * 1024; //!< Default chunk capacity.
-
-    //! Chunk header for perpending to each chunk.
-    /*! Chunks are stored as a singly linked list.
-    */
-    struct ChunkHeader {
-        size_t capacity;    //!< Capacity of the chunk in bytes (excluding the header itself).
-        size_t size;        //!< Current size of allocated memory in bytes.
-        ChunkHeader *next;  //!< Next chunk in the linked list.
-    };
-
-    ChunkHeader *chunkHead_;    //!< Head of the chunk linked-list. Only the head chunk serves allocation.
-    size_t chunk_capacity_;     //!< The minimum capacity of chunk when they are allocated.
-    void *userBuffer_;          //!< User supplied buffer.
-    BaseAllocator* baseAllocator_;  //!< base allocator for allocating memory chunks.
-    BaseAllocator* ownBaseAllocator_;   //!< base allocator created by this object.
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_ENCODINGS_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/document.h b/sql-odbc/libraries/rapidjson/include/rapidjson/document.h
deleted file mode 100644
index dda56fdf0c..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/document.h
+++ /dev/null
@@ -1,2575 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_DOCUMENT_H_
-#define RAPIDJSON_DOCUMENT_H_
-
-/*! \file document.h */
-
-#include "reader.h"
-#include "internal/meta.h"
-#include "internal/strfunc.h"
-#include "memorystream.h"
-#include "encodedstream.h"
-#include <new>      // placement new
-#include <limits>
-
-RAPIDJSON_DIAG_PUSH
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
-RAPIDJSON_DIAG_OFF(4244) // conversion from kXxxFlags to 'uint16_t', possible loss of data
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_OFF(padded)
-RAPIDJSON_DIAG_OFF(switch-enum)
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_OFF(effc++)
-#if __GNUC__ >= 6
-RAPIDJSON_DIAG_OFF(terminate) // ignore throwing RAPIDJSON_ASSERT in RAPIDJSON_NOEXCEPT functions
-#endif
-#endif // __GNUC__
-
-#ifndef RAPIDJSON_NOMEMBERITERATORCLASS
-#include <iterator> // std::iterator, std::random_access_iterator_tag
-#endif
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-#include <utility> // std::move
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-// Forward declaration.
-template <typename Encoding, typename Allocator>
-class GenericValue;
-
-template <typename Encoding, typename Allocator, typename StackAllocator>
-class GenericDocument;
-
-//! Name-value pair in a JSON object value.
-/*!
-    This class was internal to GenericValue. It used to be a inner struct.
-    But a compiler (IBM XL C/C++ for AIX) have reported to have problem with that so it moved as a namespace scope struct.
-    https://code.google.com/p/rapidjson/issues/detail?id=64
-*/
-template <typename Encoding, typename Allocator> 
-struct GenericMember { 
-    GenericValue<Encoding, Allocator> name;     //!< name of member (must be a string)
-    GenericValue<Encoding, Allocator> value;    //!< value of member.
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericMemberIterator
-
-#ifndef RAPIDJSON_NOMEMBERITERATORCLASS
-
-//! (Constant) member iterator for a JSON object value
-/*!
-    \tparam Const Is this a constant iterator?
-    \tparam Encoding    Encoding of the value. (Even non-string values need to have the same encoding in a document)
-    \tparam Allocator   Allocator type for allocating memory of object, array and string.
-
-    This class implements a Random Access Iterator for GenericMember elements
-    of a GenericValue, see ISO/IEC 14882:2003(E) C++ standard, 24.1 [lib.iterator.requirements].
-
-    \note This iterator implementation is mainly intended to avoid implicit
-        conversions from iterator values to \c NULL,
-        e.g. from GenericValue::FindMember.
-
-    \note Define \c RAPIDJSON_NOMEMBERITERATORCLASS to fall back to a
-        pointer-based implementation, if your platform doesn't provide
-        the C++ <iterator> header.
-
-    \see GenericMember, GenericValue::MemberIterator, GenericValue::ConstMemberIterator
- */
-template <bool Const, typename Encoding, typename Allocator>
-class GenericMemberIterator
-    : public std::iterator<std::random_access_iterator_tag
-        , typename internal::MaybeAddConst<Const,GenericMember<Encoding,Allocator> >::Type> {
-
-    friend class GenericValue<Encoding,Allocator>;
-    template <bool, typename, typename> friend class GenericMemberIterator;
-
-    typedef GenericMember<Encoding,Allocator> PlainType;
-    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
-    typedef std::iterator<std::random_access_iterator_tag,ValueType> BaseType;
-
-public:
-    //! Iterator type itself
-    typedef GenericMemberIterator Iterator;
-    //! Constant iterator type
-    typedef GenericMemberIterator<true,Encoding,Allocator>  ConstIterator;
-    //! Non-constant iterator type
-    typedef GenericMemberIterator<false,Encoding,Allocator> NonConstIterator;
-
-    //! Pointer to (const) GenericMember
-    typedef typename BaseType::pointer         Pointer;
-    //! Reference to (const) GenericMember
-    typedef typename BaseType::reference       Reference;
-    //! Signed integer type (e.g. \c ptrdiff_t)
-    typedef typename BaseType::difference_type DifferenceType;
-
-    //! Default constructor (singular value)
-    /*! Creates an iterator pointing to no element.
-        \note All operations, except for comparisons, are undefined on such values.
-     */
-    GenericMemberIterator() : ptr_() {}
-
-    //! Iterator conversions to more const
-    /*!
-        \param it (Non-const) iterator to copy from
-
-        Allows the creation of an iterator from another GenericMemberIterator
-        that is "less const".  Especially, creating a non-constant iterator
-        from a constant iterator are disabled:
-        \li const -> non-const (not ok)
-        \li const -> const (ok)
-        \li non-const -> const (ok)
-        \li non-const -> non-const (ok)
-
-        \note If the \c Const template parameter is already \c false, this
-            constructor effectively defines a regular copy-constructor.
-            Otherwise, the copy constructor is implicitly defined.
-    */
-    GenericMemberIterator(const NonConstIterator & it) : ptr_(it.ptr_) {}
-    Iterator& operator=(const NonConstIterator & it) { ptr_ = it.ptr_; return *this; }
-
-    //! @name stepping
-    //@{
-    Iterator& operator++(){ ++ptr_; return *this; }
-    Iterator& operator--(){ --ptr_; return *this; }
-    Iterator  operator++(int){ Iterator old(*this); ++ptr_; return old; }
-    Iterator  operator--(int){ Iterator old(*this); --ptr_; return old; }
-    //@}
-
-    //! @name increment/decrement
-    //@{
-    Iterator operator+(DifferenceType n) const { return Iterator(ptr_+n); }
-    Iterator operator-(DifferenceType n) const { return Iterator(ptr_-n); }
-
-    Iterator& operator+=(DifferenceType n) { ptr_+=n; return *this; }
-    Iterator& operator-=(DifferenceType n) { ptr_-=n; return *this; }
-    //@}
-
-    //! @name relations
-    //@{
-    bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; }
-    bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; }
-    bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; }
-    bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; }
-    bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; }
-    bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; }
-    //@}
-
-    //! @name dereference
-    //@{
-    Reference operator*() const { return *ptr_; }
-    Pointer   operator->() const { return ptr_; }
-    Reference operator[](DifferenceType n) const { return ptr_[n]; }
-    //@}
-
-    //! Distance
-    DifferenceType operator-(ConstIterator that) const { return ptr_-that.ptr_; }
-
-private:
-    //! Internal constructor from plain pointer
-    explicit GenericMemberIterator(Pointer p) : ptr_(p) {}
-
-    Pointer ptr_; //!< raw pointer
-};
-
-#else // RAPIDJSON_NOMEMBERITERATORCLASS
-
-// class-based member iterator implementation disabled, use plain pointers
-
-template <bool Const, typename Encoding, typename Allocator>
-struct GenericMemberIterator;
-
-//! non-const GenericMemberIterator
-template <typename Encoding, typename Allocator>
-struct GenericMemberIterator<false,Encoding,Allocator> {
-    //! use plain pointer as iterator type
-    typedef GenericMember<Encoding,Allocator>* Iterator;
-};
-//! const GenericMemberIterator
-template <typename Encoding, typename Allocator>
-struct GenericMemberIterator<true,Encoding,Allocator> {
-    //! use plain const pointer as iterator type
-    typedef const GenericMember<Encoding,Allocator>* Iterator;
-};
-
-#endif // RAPIDJSON_NOMEMBERITERATORCLASS
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericStringRef
-
-//! Reference to a constant string (not taking a copy)
-/*!
-    \tparam CharType character type of the string
-
-    This helper class is used to automatically infer constant string
-    references for string literals, especially from \c const \b (!)
-    character arrays.
-
-    The main use is for creating JSON string values without copying the
-    source string via an \ref Allocator.  This requires that the referenced
-    string pointers have a sufficient lifetime, which exceeds the lifetime
-    of the associated GenericValue.
-
-    \b Example
-    \code
-    Value v("foo");   // ok, no need to copy & calculate length
-    const char foo[] = "foo";
-    v.SetString(foo); // ok
-
-    const char* bar = foo;
-    // Value x(bar); // not ok, can't rely on bar's lifetime
-    Value x(StringRef(bar)); // lifetime explicitly guaranteed by user
-    Value y(StringRef(bar, 3));  // ok, explicitly pass length
-    \endcode
-
-    \see StringRef, GenericValue::SetString
-*/
-template<typename CharType>
-struct GenericStringRef {
-    typedef CharType Ch; //!< character type of the string
-
-    //! Create string reference from \c const character array
-#ifndef __clang__ // -Wdocumentation
-    /*!
-        This constructor implicitly creates a constant string reference from
-        a \c const character array.  It has better performance than
-        \ref StringRef(const CharType*) by inferring the string \ref length
-        from the array length, and also supports strings containing null
-        characters.
-
-        \tparam N length of the string, automatically inferred
-
-        \param str Constant character array, lifetime assumed to be longer
-            than the use of the string in e.g. a GenericValue
-
-        \post \ref s == str
-
-        \note Constant complexity.
-        \note There is a hidden, private overload to disallow references to
-            non-const character arrays to be created via this constructor.
-            By this, e.g. function-scope arrays used to be filled via
-            \c snprintf are excluded from consideration.
-            In such cases, the referenced string should be \b copied to the
-            GenericValue instead.
-     */
-#endif
-    template<SizeType N>
-    GenericStringRef(const CharType (&str)[N]) RAPIDJSON_NOEXCEPT
-        : s(str), length(N-1) {}
-
-    //! Explicitly create string reference from \c const character pointer
-#ifndef __clang__ // -Wdocumentation
-    /*!
-        This constructor can be used to \b explicitly  create a reference to
-        a constant string pointer.
-
-        \see StringRef(const CharType*)
-
-        \param str Constant character pointer, lifetime assumed to be longer
-            than the use of the string in e.g. a GenericValue
-
-        \post \ref s == str
-
-        \note There is a hidden, private overload to disallow references to
-            non-const character arrays to be created via this constructor.
-            By this, e.g. function-scope arrays used to be filled via
-            \c snprintf are excluded from consideration.
-            In such cases, the referenced string should be \b copied to the
-            GenericValue instead.
-     */
-#endif
-    explicit GenericStringRef(const CharType* str)
-        : s(str), length(internal::StrLen(str)){ RAPIDJSON_ASSERT(s != 0); }
-
-    //! Create constant string reference from pointer and length
-#ifndef __clang__ // -Wdocumentation
-    /*! \param str constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-        \param len length of the string, excluding the trailing NULL terminator
-
-        \post \ref s == str && \ref length == len
-        \note Constant complexity.
-     */
-#endif
-    GenericStringRef(const CharType* str, SizeType len)
-        : s(str), length(len) { RAPIDJSON_ASSERT(s != 0); }
-
-    GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
-
-    GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
-
-    //! implicit conversion to plain CharType pointer
-    operator const Ch *() const { return s; }
-
-    const Ch* const s; //!< plain CharType pointer
-    const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
-
-private:
-    //! Disallow construction from non-const array
-    template<SizeType N>
-    GenericStringRef(CharType (&str)[N]) /* = delete */;
-};
-
-//! Mark a character pointer as constant string
-/*! Mark a plain character pointer as a "string literal".  This function
-    can be used to avoid copying a character string to be referenced as a
-    value in a JSON GenericValue object, if the string's lifetime is known
-    to be valid long enough.
-    \tparam CharType Character type of the string
-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-    \return GenericStringRef string reference object
-    \relatesalso GenericStringRef
-
-    \see GenericValue::GenericValue(StringRefType), GenericValue::operator=(StringRefType), GenericValue::SetString(StringRefType), GenericValue::PushBack(StringRefType, Allocator&), GenericValue::AddMember
-*/
-template<typename CharType>
-inline GenericStringRef<CharType> StringRef(const CharType* str) {
-    return GenericStringRef<CharType>(str, internal::StrLen(str));
-}
-
-//! Mark a character pointer as constant string
-/*! Mark a plain character pointer as a "string literal".  This function
-    can be used to avoid copying a character string to be referenced as a
-    value in a JSON GenericValue object, if the string's lifetime is known
-    to be valid long enough.
-
-    This version has better performance with supplied length, and also
-    supports string containing null characters.
-
-    \tparam CharType character type of the string
-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-    \param length The length of source string.
-    \return GenericStringRef string reference object
-    \relatesalso GenericStringRef
-*/
-template<typename CharType>
-inline GenericStringRef<CharType> StringRef(const CharType* str, size_t length) {
-    return GenericStringRef<CharType>(str, SizeType(length));
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-//! Mark a string object as constant string
-/*! Mark a string object (e.g. \c std::string) as a "string literal".
-    This function can be used to avoid copying a string to be referenced as a
-    value in a JSON GenericValue object, if the string's lifetime is known
-    to be valid long enough.
-
-    \tparam CharType character type of the string
-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-    \return GenericStringRef string reference object
-    \relatesalso GenericStringRef
-    \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
-*/
-template<typename CharType>
-inline GenericStringRef<CharType> StringRef(const std::basic_string<CharType>& str) {
-    return GenericStringRef<CharType>(str.data(), SizeType(str.size()));
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericValue type traits
-namespace internal {
-
-template <typename T, typename Encoding = void, typename Allocator = void>
-struct IsGenericValueImpl : FalseType {};
-
-// select candidates according to nested encoding and allocator types
-template <typename T> struct IsGenericValueImpl<T, typename Void<typename T::EncodingType>::Type, typename Void<typename T::AllocatorType>::Type>
-    : IsBaseOf<GenericValue<typename T::EncodingType, typename T::AllocatorType>, T>::Type {};
-
-// helper to match arbitrary GenericValue instantiations, including derived classes
-template <typename T> struct IsGenericValue : IsGenericValueImpl<T>::Type {};
-
-} // namespace internal
-
-///////////////////////////////////////////////////////////////////////////////
-// TypeHelper
-
-namespace internal {
-
-template <typename ValueType, typename T>
-struct TypeHelper {};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, bool> {
-    static bool Is(const ValueType& v) { return v.IsBool(); }
-    static bool Get(const ValueType& v) { return v.GetBool(); }
-    static ValueType& Set(ValueType& v, bool data) { return v.SetBool(data); }
-    static ValueType& Set(ValueType& v, bool data, typename ValueType::AllocatorType&) { return v.SetBool(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, int> {
-    static bool Is(const ValueType& v) { return v.IsInt(); }
-    static int Get(const ValueType& v) { return v.GetInt(); }
-    static ValueType& Set(ValueType& v, int data) { return v.SetInt(data); }
-    static ValueType& Set(ValueType& v, int data, typename ValueType::AllocatorType&) { return v.SetInt(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, unsigned> {
-    static bool Is(const ValueType& v) { return v.IsUint(); }
-    static unsigned Get(const ValueType& v) { return v.GetUint(); }
-    static ValueType& Set(ValueType& v, unsigned data) { return v.SetUint(data); }
-    static ValueType& Set(ValueType& v, unsigned data, typename ValueType::AllocatorType&) { return v.SetUint(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, int64_t> {
-    static bool Is(const ValueType& v) { return v.IsInt64(); }
-    static int64_t Get(const ValueType& v) { return v.GetInt64(); }
-    static ValueType& Set(ValueType& v, int64_t data) { return v.SetInt64(data); }
-    static ValueType& Set(ValueType& v, int64_t data, typename ValueType::AllocatorType&) { return v.SetInt64(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, uint64_t> {
-    static bool Is(const ValueType& v) { return v.IsUint64(); }
-    static uint64_t Get(const ValueType& v) { return v.GetUint64(); }
-    static ValueType& Set(ValueType& v, uint64_t data) { return v.SetUint64(data); }
-    static ValueType& Set(ValueType& v, uint64_t data, typename ValueType::AllocatorType&) { return v.SetUint64(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, double> {
-    static bool Is(const ValueType& v) { return v.IsDouble(); }
-    static double Get(const ValueType& v) { return v.GetDouble(); }
-    static ValueType& Set(ValueType& v, double data) { return v.SetDouble(data); }
-    static ValueType& Set(ValueType& v, double data, typename ValueType::AllocatorType&) { return v.SetDouble(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, float> {
-    static bool Is(const ValueType& v) { return v.IsFloat(); }
-    static float Get(const ValueType& v) { return v.GetFloat(); }
-    static ValueType& Set(ValueType& v, float data) { return v.SetFloat(data); }
-    static ValueType& Set(ValueType& v, float data, typename ValueType::AllocatorType&) { return v.SetFloat(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, const typename ValueType::Ch*> {
-    typedef const typename ValueType::Ch* StringType;
-    static bool Is(const ValueType& v) { return v.IsString(); }
-    static StringType Get(const ValueType& v) { return v.GetString(); }
-    static ValueType& Set(ValueType& v, const StringType data) { return v.SetString(typename ValueType::StringRefType(data)); }
-    static ValueType& Set(ValueType& v, const StringType data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
-};
-
-#if RAPIDJSON_HAS_STDSTRING
-template<typename ValueType> 
-struct TypeHelper<ValueType, std::basic_string<typename ValueType::Ch> > {
-    typedef std::basic_string<typename ValueType::Ch> StringType;
-    static bool Is(const ValueType& v) { return v.IsString(); }
-    static StringType Get(const ValueType& v) { return StringType(v.GetString(), v.GetStringLength()); }
-    static ValueType& Set(ValueType& v, const StringType& data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
-};
-#endif
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::Array> {
-    typedef typename ValueType::Array ArrayType;
-    static bool Is(const ValueType& v) { return v.IsArray(); }
-    static ArrayType Get(ValueType& v) { return v.GetArray(); }
-    static ValueType& Set(ValueType& v, ArrayType data) { return v = data; }
-    static ValueType& Set(ValueType& v, ArrayType data, typename ValueType::AllocatorType&) { return v = data; }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::ConstArray> {
-    typedef typename ValueType::ConstArray ArrayType;
-    static bool Is(const ValueType& v) { return v.IsArray(); }
-    static ArrayType Get(const ValueType& v) { return v.GetArray(); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::Object> {
-    typedef typename ValueType::Object ObjectType;
-    static bool Is(const ValueType& v) { return v.IsObject(); }
-    static ObjectType Get(ValueType& v) { return v.GetObject(); }
-    static ValueType& Set(ValueType& v, ObjectType data) { return v = data; }
-    static ValueType& Set(ValueType& v, ObjectType data, typename ValueType::AllocatorType&) { v = data; }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::ConstObject> {
-    typedef typename ValueType::ConstObject ObjectType;
-    static bool Is(const ValueType& v) { return v.IsObject(); }
-    static ObjectType Get(const ValueType& v) { return v.GetObject(); }
-};
-
-} // namespace internal
-
-// Forward declarations
-template <bool, typename> class GenericArray;
-template <bool, typename> class GenericObject;
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericValue
-
-//! Represents a JSON value. Use Value for UTF8 encoding and default allocator.
-/*!
-    A JSON value can be one of 7 types. This class is a variant type supporting
-    these types.
-
-    Use the Value if UTF8 and default allocator
-
-    \tparam Encoding    Encoding of the value. (Even non-string values need to have the same encoding in a document)
-    \tparam Allocator   Allocator type for allocating memory of object, array and string.
-*/
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<> > 
-class GenericValue {
-public:
-    //! Name-value pair in an object.
-    typedef GenericMember<Encoding, Allocator> Member;
-    typedef Encoding EncodingType;                  //!< Encoding type from template parameter.
-    typedef Allocator AllocatorType;                //!< Allocator type from template parameter.
-    typedef typename Encoding::Ch Ch;               //!< Character type derived from Encoding.
-    typedef GenericStringRef<Ch> StringRefType;     //!< Reference to a constant string
-    typedef typename GenericMemberIterator<false,Encoding,Allocator>::Iterator MemberIterator;  //!< Member iterator for iterating in object.
-    typedef typename GenericMemberIterator<true,Encoding,Allocator>::Iterator ConstMemberIterator;  //!< Constant member iterator for iterating in object.
-    typedef GenericValue* ValueIterator;            //!< Value iterator for iterating in array.
-    typedef const GenericValue* ConstValueIterator; //!< Constant value iterator for iterating in array.
-    typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of itself.
-    typedef GenericArray<false, ValueType> Array;
-    typedef GenericArray<true, ValueType> ConstArray;
-    typedef GenericObject<false, ValueType> Object;
-    typedef GenericObject<true, ValueType> ConstObject;
-
-    //!@name Constructors and destructor.
-    //@{
-
-    //! Default constructor creates a null value.
-    GenericValue() RAPIDJSON_NOEXCEPT : data_() { data_.f.flags = kNullFlag; }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move constructor in C++11
-    GenericValue(GenericValue&& rhs) RAPIDJSON_NOEXCEPT : data_(rhs.data_) {
-        rhs.data_.f.flags = kNullFlag; // give up contents
-    }
-#endif
-
-private:
-    //! Copy constructor is not permitted.
-    GenericValue(const GenericValue& rhs);
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Moving from a GenericDocument is not permitted.
-    template <typename StackAllocator>
-    GenericValue(GenericDocument<Encoding,Allocator,StackAllocator>&& rhs);
-
-    //! Move assignment from a GenericDocument is not permitted.
-    template <typename StackAllocator>
-    GenericValue& operator=(GenericDocument<Encoding,Allocator,StackAllocator>&& rhs);
-#endif
-
-public:
-
-    //! Constructor with JSON value type.
-    /*! This creates a Value of specified type with default content.
-        \param type Type of the value.
-        \note Default content for number is zero.
-    */
-    explicit GenericValue(Type type) RAPIDJSON_NOEXCEPT : data_() {
-        static const uint16_t defaultFlags[7] = {
-            kNullFlag, kFalseFlag, kTrueFlag, kObjectFlag, kArrayFlag, kShortStringFlag,
-            kNumberAnyFlag
-        };
-        RAPIDJSON_ASSERT(type <= kNumberType);
-        data_.f.flags = defaultFlags[type];
-
-        // Use ShortString to store empty string.
-        if (type == kStringType)
-            data_.ss.SetLength(0);
-    }
-
-    //! Explicit copy constructor (with allocator)
-    /*! Creates a copy of a Value by using the given Allocator
-        \tparam SourceAllocator allocator of \c rhs
-        \param rhs Value to copy from (read-only)
-        \param allocator Allocator for allocating copied elements and buffers. Commonly use GenericDocument::GetAllocator().
-        \see CopyFrom()
-    */
-    template< typename SourceAllocator >
-    GenericValue(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator & allocator);
-
-    //! Constructor for boolean value.
-    /*! \param b Boolean value
-        \note This constructor is limited to \em real boolean values and rejects
-            implicitly converted types like arbitrary pointers.  Use an explicit cast
-            to \c bool, if you want to construct a boolean JSON value in such cases.
-     */
-#ifndef RAPIDJSON_DOXYGEN_RUNNING // hide SFINAE from Doxygen
-    template <typename T>
-    explicit GenericValue(T b, RAPIDJSON_ENABLEIF((internal::IsSame<bool, T>))) RAPIDJSON_NOEXCEPT  // See #472
-#else
-    explicit GenericValue(bool b) RAPIDJSON_NOEXCEPT
-#endif
-        : data_() {
-            // safe-guard against failing SFINAE
-            RAPIDJSON_STATIC_ASSERT((internal::IsSame<bool,T>::Value));
-            data_.f.flags = b ? kTrueFlag : kFalseFlag;
-    }
-
-    //! Constructor for int value.
-    explicit GenericValue(int i) RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.i64 = i;
-        data_.f.flags = (i >= 0) ? (kNumberIntFlag | kUintFlag | kUint64Flag) : kNumberIntFlag;
-    }
-
-    //! Constructor for unsigned value.
-    explicit GenericValue(unsigned u) RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.u64 = u; 
-        data_.f.flags = (u & 0x80000000) ? kNumberUintFlag : (kNumberUintFlag | kIntFlag | kInt64Flag);
-    }
-
-    //! Constructor for int64_t value.
-    explicit GenericValue(int64_t i64) RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.i64 = i64;
-        data_.f.flags = kNumberInt64Flag;
-        if (i64 >= 0) {
-            data_.f.flags |= kNumberUint64Flag;
-            if (!(static_cast<uint64_t>(i64) & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
-                data_.f.flags |= kUintFlag;
-            if (!(static_cast<uint64_t>(i64) & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-                data_.f.flags |= kIntFlag;
-        }
-        else if (i64 >= static_cast<int64_t>(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-            data_.f.flags |= kIntFlag;
-    }
-
-    //! Constructor for uint64_t value.
-    explicit GenericValue(uint64_t u64) RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.u64 = u64;
-        data_.f.flags = kNumberUint64Flag;
-        if (!(u64 & RAPIDJSON_UINT64_C2(0x80000000, 0x00000000)))
-            data_.f.flags |= kInt64Flag;
-        if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
-            data_.f.flags |= kUintFlag;
-        if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-            data_.f.flags |= kIntFlag;
-    }
-
-    //! Constructor for double value.
-    explicit GenericValue(double d) RAPIDJSON_NOEXCEPT : data_() { data_.n.d = d; data_.f.flags = kNumberDoubleFlag; }
-
-    //! Constructor for constant string (i.e. do not make a copy of string)
-    GenericValue(const Ch* s, SizeType length) RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(StringRef(s, length)); }
-
-    //! Constructor for constant string (i.e. do not make a copy of string)
-    explicit GenericValue(StringRefType s) RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(s); }
-
-    //! Constructor for copy-string (i.e. do make a copy of string)
-    GenericValue(const Ch* s, SizeType length, Allocator& allocator) : data_() { SetStringRaw(StringRef(s, length), allocator); }
-
-    //! Constructor for copy-string (i.e. do make a copy of string)
-    GenericValue(const Ch*s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Constructor for copy-string from a string object (i.e. do make a copy of string)
-    /*! \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
-     */
-    GenericValue(const std::basic_string<Ch>& s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
-#endif
-
-    //! Constructor for Array.
-    /*!
-        \param a An array obtained by \c GetArray().
-        \note \c Array is always pass-by-value.
-        \note the source array is moved into this value and the sourec array becomes empty.
-    */
-    GenericValue(Array a) RAPIDJSON_NOEXCEPT : data_(a.value_.data_) {
-        a.value_.data_ = Data();
-        a.value_.data_.f.flags = kArrayFlag;
-    }
-
-    //! Constructor for Object.
-    /*!
-        \param o An object obtained by \c GetObject().
-        \note \c Object is always pass-by-value.
-        \note the source object is moved into this value and the sourec object becomes empty.
-    */
-    GenericValue(Object o) RAPIDJSON_NOEXCEPT : data_(o.value_.data_) {
-        o.value_.data_ = Data();
-        o.value_.data_.f.flags = kObjectFlag;
-    }
-
-    //! Destructor.
-    /*! Need to destruct elements of array, members of object, or copy-string.
-    */
-    ~GenericValue() {
-        if (Allocator::kNeedFree) { // Shortcut by Allocator's trait
-            switch(data_.f.flags) {
-            case kArrayFlag:
-                {
-                    GenericValue* e = GetElementsPointer();
-                    for (GenericValue* v = e; v != e + data_.a.size; ++v)
-                        v->~GenericValue();
-                    Allocator::Free(e);
-                }
-                break;
-
-            case kObjectFlag:
-                for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
-                    m->~Member();
-                Allocator::Free(GetMembersPointer());
-                break;
-
-            case kCopyStringFlag:
-                Allocator::Free(const_cast<Ch*>(GetStringPointer()));
-                break;
-
-            default:
-                break;  // Do nothing for other types.
-            }
-        }
-    }
-
-    //@}
-
-    //!@name Assignment operators
-    //@{
-
-    //! Assignment with move semantics.
-    /*! \param rhs Source of the assignment. It will become a null value after assignment.
-    */
-    GenericValue& operator=(GenericValue& rhs) RAPIDJSON_NOEXCEPT {
-        RAPIDJSON_ASSERT(this != &rhs);
-        this->~GenericValue();
-        RawAssign(rhs);
-        return *this;
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move assignment in C++11
-    GenericValue& operator=(GenericValue&& rhs) RAPIDJSON_NOEXCEPT {
-        return *this = rhs.Move();
-    }
-#endif
-
-    //! Assignment of constant string reference (no copy)
-    /*! \param str Constant string reference to be assigned
-        \note This overload is needed to avoid clashes with the generic primitive type assignment overload below.
-        \see GenericStringRef, operator=(T)
-    */
-    GenericValue& operator=(StringRefType str) RAPIDJSON_NOEXCEPT {
-        GenericValue s(str);
-        return *this = s;
-    }
-
-    //! Assignment with primitive types.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param value The value to be assigned.
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref SetString(const Ch*, Allocator&) (for copying) or
-            \ref StringRef() (to explicitly mark the pointer as constant) instead.
-            All other pointer types would implicitly convert to \c bool,
-            use \ref SetBool() instead.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::IsPointer<T>), (GenericValue&))
-    operator=(T value) {
-        GenericValue v(value);
-        return *this = v;
-    }
-
-    //! Deep-copy assignment from Value
-    /*! Assigns a \b copy of the Value to the current Value object
-        \tparam SourceAllocator Allocator type of \c rhs
-        \param rhs Value to copy from (read-only)
-        \param allocator Allocator to use for copying
-     */
-    template <typename SourceAllocator>
-    GenericValue& CopyFrom(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator& allocator) {
-        RAPIDJSON_ASSERT(static_cast<void*>(this) != static_cast<void const*>(&rhs));
-        this->~GenericValue();
-        new (this) GenericValue(rhs, allocator);
-        return *this;
-    }
-
-    //! Exchange the contents of this value with those of other.
-    /*!
-        \param other Another value.
-        \note Constant complexity.
-    */
-    GenericValue& Swap(GenericValue& other) RAPIDJSON_NOEXCEPT {
-        GenericValue temp;
-        temp.RawAssign(*this);
-        RawAssign(other);
-        other.RawAssign(temp);
-        return *this;
-    }
-
-    //! free-standing swap function helper
-    /*!
-        Helper function to enable support for common swap implementation pattern based on \c std::swap:
-        \code
-        void swap(MyClass& a, MyClass& b) {
-            using std::swap;
-            swap(a.value, b.value);
-            // ...
-        }
-        \endcode
-        \see Swap()
-     */
-    friend inline void swap(GenericValue& a, GenericValue& b) RAPIDJSON_NOEXCEPT { a.Swap(b); }
-
-    //! Prepare Value for move semantics
-    /*! \return *this */
-    GenericValue& Move() RAPIDJSON_NOEXCEPT { return *this; }
-    //@}
-
-    //!@name Equal-to and not-equal-to operators
-    //@{
-    //! Equal-to operator
-    /*!
-        \note If an object contains duplicated named member, comparing equality with any object is always \c false.
-        \note Linear time complexity (number of all values in the subtree and total lengths of all strings).
-    */
-    template <typename SourceAllocator>
-    bool operator==(const GenericValue<Encoding, SourceAllocator>& rhs) const {
-        typedef GenericValue<Encoding, SourceAllocator> RhsType;
-        if (GetType() != rhs.GetType())
-            return false;
-
-        switch (GetType()) {
-        case kObjectType: // Warning: O(n^2) inner-loop
-            if (data_.o.size != rhs.data_.o.size)
-                return false;           
-            for (ConstMemberIterator lhsMemberItr = MemberBegin(); lhsMemberItr != MemberEnd(); ++lhsMemberItr) {
-                typename RhsType::ConstMemberIterator rhsMemberItr = rhs.FindMember(lhsMemberItr->name);
-                if (rhsMemberItr == rhs.MemberEnd() || lhsMemberItr->value != rhsMemberItr->value)
-                    return false;
-            }
-            return true;
-            
-        case kArrayType:
-            if (data_.a.size != rhs.data_.a.size)
-                return false;
-            for (SizeType i = 0; i < data_.a.size; i++)
-                if ((*this)[i] != rhs[i])
-                    return false;
-            return true;
-
-        case kStringType:
-            return StringEqual(rhs);
-
-        case kNumberType:
-            if (IsDouble() || rhs.IsDouble()) {
-                double a = GetDouble();     // May convert from integer to double.
-                double b = rhs.GetDouble(); // Ditto
-                return a >= b && a <= b;    // Prevent -Wfloat-equal
-            }
-            else
-                return data_.n.u64 == rhs.data_.n.u64;
-
-        default:
-            return true;
-        }
-    }
-
-    //! Equal-to operator with const C-string pointer
-    bool operator==(const Ch* rhs) const { return *this == GenericValue(StringRef(rhs)); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Equal-to operator with string object
-    /*! \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
-     */
-    bool operator==(const std::basic_string<Ch>& rhs) const { return *this == GenericValue(StringRef(rhs)); }
-#endif
-
-    //! Equal-to operator with primitive types
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c double, \c true, \c false
-    */
-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>,internal::IsGenericValue<T> >), (bool)) operator==(const T& rhs) const { return *this == GenericValue(rhs); }
-
-    //! Not-equal-to operator
-    /*! \return !(*this == rhs)
-     */
-    template <typename SourceAllocator>
-    bool operator!=(const GenericValue<Encoding, SourceAllocator>& rhs) const { return !(*this == rhs); }
-
-    //! Not-equal-to operator with const C-string pointer
-    bool operator!=(const Ch* rhs) const { return !(*this == rhs); }
-
-    //! Not-equal-to operator with arbitrary types
-    /*! \return !(*this == rhs)
-     */
-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); }
-
-    //! Equal-to operator with arbitrary types (symmetric version)
-    /*! \return (rhs == lhs)
-     */
-    template <typename T> friend RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator==(const T& lhs, const GenericValue& rhs) { return rhs == lhs; }
-
-    //! Not-Equal-to operator with arbitrary types (symmetric version)
-    /*! \return !(rhs == lhs)
-     */
-    template <typename T> friend RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& lhs, const GenericValue& rhs) { return !(rhs == lhs); }
-    //@}
-
-    //!@name Type
-    //@{
-
-    Type GetType()  const { return static_cast<Type>(data_.f.flags & kTypeMask); }
-    bool IsNull()   const { return data_.f.flags == kNullFlag; }
-    bool IsFalse()  const { return data_.f.flags == kFalseFlag; }
-    bool IsTrue()   const { return data_.f.flags == kTrueFlag; }
-    bool IsBool()   const { return (data_.f.flags & kBoolFlag) != 0; }
-    bool IsObject() const { return data_.f.flags == kObjectFlag; }
-    bool IsArray()  const { return data_.f.flags == kArrayFlag; }
-    bool IsNumber() const { return (data_.f.flags & kNumberFlag) != 0; }
-    bool IsInt()    const { return (data_.f.flags & kIntFlag) != 0; }
-    bool IsUint()   const { return (data_.f.flags & kUintFlag) != 0; }
-    bool IsInt64()  const { return (data_.f.flags & kInt64Flag) != 0; }
-    bool IsUint64() const { return (data_.f.flags & kUint64Flag) != 0; }
-    bool IsDouble() const { return (data_.f.flags & kDoubleFlag) != 0; }
-    bool IsString() const { return (data_.f.flags & kStringFlag) != 0; }
-
-    // Checks whether a number can be losslessly converted to a double.
-    bool IsLosslessDouble() const {
-        if (!IsNumber()) return false;
-        if (IsUint64()) {
-            uint64_t u = GetUint64();
-            volatile double d = static_cast<double>(u);
-            return (d >= 0.0)
-                && (d < static_cast<double>((std::numeric_limits<uint64_t>::max)()))
-                && (u == static_cast<uint64_t>(d));
-        }
-        if (IsInt64()) {
-            int64_t i = GetInt64();
-            volatile double d = static_cast<double>(i);
-            return (d >= static_cast<double>((std::numeric_limits<uint64_t>::min)()))
-                && (d < static_cast<double>((std::numeric_limits<uint64_t>::max)()))
-                && (i == static_cast<int64_t>(d));
-        }
-        return true; // double, int, uint are always lossless
-    }
-
-    // Checks whether a number is a float (possible lossy).
-    bool IsFloat() const  {
-        if ((data_.f.flags & kDoubleFlag) == 0)
-            return false;
-        double d = GetDouble();
-        return d >= -3.4028234e38 && d <= 3.4028234e38;
-    }
-    // Checks whether a number can be losslessly converted to a float.
-    bool IsLosslessFloat() const {
-        if (!IsNumber()) return false;
-        double a = GetDouble();
-        if (a < static_cast<double>(-(std::numeric_limits<float>::max)())
-                || a > static_cast<double>((std::numeric_limits<float>::max)()))
-            return false;
-        double b = static_cast<double>(static_cast<float>(a));
-        return a >= b && a <= b;    // Prevent -Wfloat-equal
-    }
-
-    //@}
-
-    //!@name Null
-    //@{
-
-    GenericValue& SetNull() { this->~GenericValue(); new (this) GenericValue(); return *this; }
-
-    //@}
-
-    //!@name Bool
-    //@{
-
-    bool GetBool() const { RAPIDJSON_ASSERT(IsBool()); return data_.f.flags == kTrueFlag; }
-    //!< Set boolean value
-    /*! \post IsBool() == true */
-    GenericValue& SetBool(bool b) { this->~GenericValue(); new (this) GenericValue(b); return *this; }
-
-    //@}
-
-    //!@name Object
-    //@{
-
-    //! Set this value as an empty object.
-    /*! \post IsObject() == true */
-    GenericValue& SetObject() { this->~GenericValue(); new (this) GenericValue(kObjectType); return *this; }
-
-    //! Get the number of members in the object.
-    SizeType MemberCount() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size; }
-
-    //! Check whether the object is empty.
-    bool ObjectEmpty() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size == 0; }
-
-    //! Get a value from an object associated with the name.
-    /*! \pre IsObject() == true
-        \tparam T Either \c Ch or \c const \c Ch (template used for disambiguation with \ref operator[](SizeType))
-        \note In version 0.1x, if the member is not found, this function returns a null value. This makes issue 7.
-        Since 0.2, if the name is not correct, it will assert.
-        If user is unsure whether a member exists, user should use HasMember() first.
-        A better approach is to use FindMember().
-        \note Linear time complexity.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >),(GenericValue&)) operator[](T* name) {
-        GenericValue n(StringRef(name));
-        return (*this)[n];
-    }
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >),(const GenericValue&)) operator[](T* name) const { return const_cast<GenericValue&>(*this)[name]; }
-
-    //! Get a value from an object associated with the name.
-    /*! \pre IsObject() == true
-        \tparam SourceAllocator Allocator of the \c name value
-
-        \note Compared to \ref operator[](T*), this version is faster because it does not need a StrLen().
-        And it can also handle strings with embedded null characters.
-
-        \note Linear time complexity.
-    */
-    template <typename SourceAllocator>
-    GenericValue& operator[](const GenericValue<Encoding, SourceAllocator>& name) {
-        MemberIterator member = FindMember(name);
-        if (member != MemberEnd())
-            return member->value;
-        else {
-            RAPIDJSON_ASSERT(false);    // see above note
-
-            // This will generate -Wexit-time-destructors in clang
-            // static GenericValue NullValue;
-            // return NullValue;
-
-            // Use static buffer and placement-new to prevent destruction
-            static char buffer[sizeof(GenericValue)];
-            return *new (buffer) GenericValue();
-        }
-    }
-    template <typename SourceAllocator>
-    const GenericValue& operator[](const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this)[name]; }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Get a value from an object associated with name (string object).
-    GenericValue& operator[](const std::basic_string<Ch>& name) { return (*this)[GenericValue(StringRef(name))]; }
-    const GenericValue& operator[](const std::basic_string<Ch>& name) const { return (*this)[GenericValue(StringRef(name))]; }
-#endif
-
-    //! Const member iterator
-    /*! \pre IsObject() == true */
-    ConstMemberIterator MemberBegin() const { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer()); }
-    //! Const \em past-the-end member iterator
-    /*! \pre IsObject() == true */
-    ConstMemberIterator MemberEnd() const   { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer() + data_.o.size); }
-    //! Member iterator
-    /*! \pre IsObject() == true */
-    MemberIterator MemberBegin()            { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer()); }
-    //! \em Past-the-end member iterator
-    /*! \pre IsObject() == true */
-    MemberIterator MemberEnd()              { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer() + data_.o.size); }
-
-    //! Check whether a member exists in the object.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Whether a member with that name exists.
-        \note It is better to use FindMember() directly if you need the obtain the value as well.
-        \note Linear time complexity.
-    */
-    bool HasMember(const Ch* name) const { return FindMember(name) != MemberEnd(); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Check whether a member exists in the object with string object.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Whether a member with that name exists.
-        \note It is better to use FindMember() directly if you need the obtain the value as well.
-        \note Linear time complexity.
-    */
-    bool HasMember(const std::basic_string<Ch>& name) const { return FindMember(name) != MemberEnd(); }
-#endif
-
-    //! Check whether a member exists in the object with GenericValue name.
-    /*!
-        This version is faster because it does not need a StrLen(). It can also handle string with null character.
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Whether a member with that name exists.
-        \note It is better to use FindMember() directly if you need the obtain the value as well.
-        \note Linear time complexity.
-    */
-    template <typename SourceAllocator>
-    bool HasMember(const GenericValue<Encoding, SourceAllocator>& name) const { return FindMember(name) != MemberEnd(); }
-
-    //! Find member by name.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Iterator to member, if it exists.
-            Otherwise returns \ref MemberEnd().
-
-        \note Earlier versions of Rapidjson returned a \c NULL pointer, in case
-            the requested member doesn't exist. For consistency with e.g.
-            \c std::map, this has been changed to MemberEnd() now.
-        \note Linear time complexity.
-    */
-    MemberIterator FindMember(const Ch* name) {
-        GenericValue n(StringRef(name));
-        return FindMember(n);
-    }
-
-    ConstMemberIterator FindMember(const Ch* name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
-
-    //! Find member by name.
-    /*!
-        This version is faster because it does not need a StrLen(). It can also handle string with null character.
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Iterator to member, if it exists.
-            Otherwise returns \ref MemberEnd().
-
-        \note Earlier versions of Rapidjson returned a \c NULL pointer, in case
-            the requested member doesn't exist. For consistency with e.g.
-            \c std::map, this has been changed to MemberEnd() now.
-        \note Linear time complexity.
-    */
-    template <typename SourceAllocator>
-    MemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) {
-        RAPIDJSON_ASSERT(IsObject());
-        RAPIDJSON_ASSERT(name.IsString());
-        MemberIterator member = MemberBegin();
-        for ( ; member != MemberEnd(); ++member)
-            if (name.StringEqual(member->name))
-                break;
-        return member;
-    }
-    template <typename SourceAllocator> ConstMemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Find member by string object name.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Iterator to member, if it exists.
-            Otherwise returns \ref MemberEnd().
-    */
-    MemberIterator FindMember(const std::basic_string<Ch>& name) { return FindMember(GenericValue(StringRef(name))); }
-    ConstMemberIterator FindMember(const std::basic_string<Ch>& name) const { return FindMember(GenericValue(StringRef(name))); }
-#endif
-
-    //! Add a member (name-value pair) to the object.
-    /*! \param name A string value as name of member.
-        \param value Value of any type.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \note The ownership of \c name and \c value will be transferred to this object on success.
-        \pre  IsObject() && name.IsString()
-        \post name.IsNull() && value.IsNull()
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(GenericValue& name, GenericValue& value, Allocator& allocator) {
-        RAPIDJSON_ASSERT(IsObject());
-        RAPIDJSON_ASSERT(name.IsString());
-
-        ObjectData& o = data_.o;
-        if (o.size >= o.capacity) {
-            if (o.capacity == 0) {
-                o.capacity = kDefaultObjectCapacity;
-                SetMembersPointer(reinterpret_cast<Member*>(allocator.Malloc(o.capacity * sizeof(Member))));
-            }
-            else {
-                SizeType oldCapacity = o.capacity;
-                o.capacity += (oldCapacity + 1) / 2; // grow by factor 1.5
-                SetMembersPointer(reinterpret_cast<Member*>(allocator.Realloc(GetMembersPointer(), oldCapacity * sizeof(Member), o.capacity * sizeof(Member))));
-            }
-        }
-        Member* members = GetMembersPointer();
-        members[o.size].name.RawAssign(name);
-        members[o.size].value.RawAssign(value);
-        o.size++;
-        return *this;
-    }
-
-    //! Add a constant string value as member (name-value pair) to the object.
-    /*! \param name A string value as name of member.
-        \param value constant string reference as value of member.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-        \note This overload is needed to avoid clashes with the generic primitive type AddMember(GenericValue&,T,Allocator&) overload below.
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(GenericValue& name, StringRefType value, Allocator& allocator) {
-        GenericValue v(value);
-        return AddMember(name, v, allocator);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Add a string object as member (name-value pair) to the object.
-    /*! \param name A string value as name of member.
-        \param value constant string reference as value of member.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-        \note This overload is needed to avoid clashes with the generic primitive type AddMember(GenericValue&,T,Allocator&) overload below.
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(GenericValue& name, std::basic_string<Ch>& value, Allocator& allocator) {
-        GenericValue v(value, allocator);
-        return AddMember(name, v, allocator);
-    }
-#endif
-
-    //! Add any primitive value as member (name-value pair) to the object.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param name A string value as name of member.
-        \param value Value of primitive type \c T as value of member
-        \param allocator Allocator for reallocating memory. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref AddMember(StringRefType, GenericValue&, Allocator&) or \ref
-            AddMember(StringRefType, StringRefType, Allocator&).
-            All other pointer types would implicitly convert to \c bool,
-            use an explicit cast instead, if needed.
-        \note Amortized Constant time complexity.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
-    AddMember(GenericValue& name, T value, Allocator& allocator) {
-        GenericValue v(value);
-        return AddMember(name, v, allocator);
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericValue& AddMember(GenericValue&& name, GenericValue&& value, Allocator& allocator) {
-        return AddMember(name, value, allocator);
-    }
-    GenericValue& AddMember(GenericValue&& name, GenericValue& value, Allocator& allocator) {
-        return AddMember(name, value, allocator);
-    }
-    GenericValue& AddMember(GenericValue& name, GenericValue&& value, Allocator& allocator) {
-        return AddMember(name, value, allocator);
-    }
-    GenericValue& AddMember(StringRefType name, GenericValue&& value, Allocator& allocator) {
-        GenericValue n(name);
-        return AddMember(n, value, allocator);
-    }
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-
-    //! Add a member (name-value pair) to the object.
-    /*! \param name A constant string reference as name of member.
-        \param value Value of any type.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \note The ownership of \c value will be transferred to this object on success.
-        \pre  IsObject()
-        \post value.IsNull()
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(StringRefType name, GenericValue& value, Allocator& allocator) {
-        GenericValue n(name);
-        return AddMember(n, value, allocator);
-    }
-
-    //! Add a constant string value as member (name-value pair) to the object.
-    /*! \param name A constant string reference as name of member.
-        \param value constant string reference as value of member.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-        \note This overload is needed to avoid clashes with the generic primitive type AddMember(StringRefType,T,Allocator&) overload below.
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(StringRefType name, StringRefType value, Allocator& allocator) {
-        GenericValue v(value);
-        return AddMember(name, v, allocator);
-    }
-
-    //! Add any primitive value as member (name-value pair) to the object.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param name A constant string reference as name of member.
-        \param value Value of primitive type \c T as value of member
-        \param allocator Allocator for reallocating memory. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref AddMember(StringRefType, GenericValue&, Allocator&) or \ref
-            AddMember(StringRefType, StringRefType, Allocator&).
-            All other pointer types would implicitly convert to \c bool,
-            use an explicit cast instead, if needed.
-        \note Amortized Constant time complexity.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
-    AddMember(StringRefType name, T value, Allocator& allocator) {
-        GenericValue n(name);
-        return AddMember(n, value, allocator);
-    }
-
-    //! Remove all members in the object.
-    /*! This function do not deallocate memory in the object, i.e. the capacity is unchanged.
-        \note Linear time complexity.
-    */
-    void RemoveAllMembers() {
-        RAPIDJSON_ASSERT(IsObject()); 
-        for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
-            m->~Member();
-        data_.o.size = 0;
-    }
-
-    //! Remove a member in object by its name.
-    /*! \param name Name of member to be removed.
-        \return Whether the member existed.
-        \note This function may reorder the object members. Use \ref
-            EraseMember(ConstMemberIterator) if you need to preserve the
-            relative order of the remaining members.
-        \note Linear time complexity.
-    */
-    bool RemoveMember(const Ch* name) {
-        GenericValue n(StringRef(name));
-        return RemoveMember(n);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    bool RemoveMember(const std::basic_string<Ch>& name) { return RemoveMember(GenericValue(StringRef(name))); }
-#endif
-
-    template <typename SourceAllocator>
-    bool RemoveMember(const GenericValue<Encoding, SourceAllocator>& name) {
-        MemberIterator m = FindMember(name);
-        if (m != MemberEnd()) {
-            RemoveMember(m);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    //! Remove a member in object by iterator.
-    /*! \param m member iterator (obtained by FindMember() or MemberBegin()).
-        \return the new iterator after removal.
-        \note This function may reorder the object members. Use \ref
-            EraseMember(ConstMemberIterator) if you need to preserve the
-            relative order of the remaining members.
-        \note Constant time complexity.
-    */
-    MemberIterator RemoveMember(MemberIterator m) {
-        RAPIDJSON_ASSERT(IsObject());
-        RAPIDJSON_ASSERT(data_.o.size > 0);
-        RAPIDJSON_ASSERT(GetMembersPointer() != 0);
-        RAPIDJSON_ASSERT(m >= MemberBegin() && m < MemberEnd());
-
-        MemberIterator last(GetMembersPointer() + (data_.o.size - 1));
-        if (data_.o.size > 1 && m != last)
-            *m = *last; // Move the last one to this place
-        else
-            m->~Member(); // Only one left, just destroy
-        --data_.o.size;
-        return m;
-    }
-
-    //! Remove a member from an object by iterator.
-    /*! \param pos iterator to the member to remove
-        \pre IsObject() == true && \ref MemberBegin() <= \c pos < \ref MemberEnd()
-        \return Iterator following the removed element.
-            If the iterator \c pos refers to the last element, the \ref MemberEnd() iterator is returned.
-        \note This function preserves the relative order of the remaining object
-            members. If you do not need this, use the more efficient \ref RemoveMember(MemberIterator).
-        \note Linear time complexity.
-    */
-    MemberIterator EraseMember(ConstMemberIterator pos) {
-        return EraseMember(pos, pos +1);
-    }
-
-    //! Remove members in the range [first, last) from an object.
-    /*! \param first iterator to the first member to remove
-        \param last  iterator following the last member to remove
-        \pre IsObject() == true && \ref MemberBegin() <= \c first <= \c last <= \ref MemberEnd()
-        \return Iterator following the last removed element.
-        \note This function preserves the relative order of the remaining object
-            members.
-        \note Linear time complexity.
-    */
-    MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) {
-        RAPIDJSON_ASSERT(IsObject());
-        RAPIDJSON_ASSERT(data_.o.size > 0);
-        RAPIDJSON_ASSERT(GetMembersPointer() != 0);
-        RAPIDJSON_ASSERT(first >= MemberBegin());
-        RAPIDJSON_ASSERT(first <= last);
-        RAPIDJSON_ASSERT(last <= MemberEnd());
-
-        MemberIterator pos = MemberBegin() + (first - MemberBegin());
-        for (MemberIterator itr = pos; itr != last; ++itr)
-            itr->~Member();
-        std::memmove(&*pos, &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
-        data_.o.size -= static_cast<SizeType>(last - first);
-        return pos;
-    }
-
-    //! Erase a member in object by its name.
-    /*! \param name Name of member to be removed.
-        \return Whether the member existed.
-        \note Linear time complexity.
-    */
-    bool EraseMember(const Ch* name) {
-        GenericValue n(StringRef(name));
-        return EraseMember(n);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    bool EraseMember(const std::basic_string<Ch>& name) { return EraseMember(GenericValue(StringRef(name))); }
-#endif
-
-    template <typename SourceAllocator>
-    bool EraseMember(const GenericValue<Encoding, SourceAllocator>& name) {
-        MemberIterator m = FindMember(name);
-        if (m != MemberEnd()) {
-            EraseMember(m);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    Object GetObject() { RAPIDJSON_ASSERT(IsObject()); return Object(*this); }
-    ConstObject GetObject() const { RAPIDJSON_ASSERT(IsObject()); return ConstObject(*this); }
-
-    //@}
-
-    //!@name Array
-    //@{
-
-    //! Set this value as an empty array.
-    /*! \post IsArray == true */
-    GenericValue& SetArray() { this->~GenericValue(); new (this) GenericValue(kArrayType); return *this; }
-
-    //! Get the number of elements in array.
-    SizeType Size() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.size; }
-
-    //! Get the capacity of array.
-    SizeType Capacity() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.capacity; }
-
-    //! Check whether the array is empty.
-    bool Empty() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.size == 0; }
-
-    //! Remove all elements in the array.
-    /*! This function do not deallocate memory in the array, i.e. the capacity is unchanged.
-        \note Linear time complexity.
-    */
-    void Clear() {
-        RAPIDJSON_ASSERT(IsArray()); 
-        GenericValue* e = GetElementsPointer();
-        for (GenericValue* v = e; v != e + data_.a.size; ++v)
-            v->~GenericValue();
-        data_.a.size = 0;
-    }
-
-    //! Get an element from array by index.
-    /*! \pre IsArray() == true
-        \param index Zero-based index of element.
-        \see operator[](T*)
-    */
-    GenericValue& operator[](SizeType index) {
-        RAPIDJSON_ASSERT(IsArray());
-        RAPIDJSON_ASSERT(index < data_.a.size);
-        return GetElementsPointer()[index];
-    }
-    const GenericValue& operator[](SizeType index) const { return const_cast<GenericValue&>(*this)[index]; }
-
-    //! Element iterator
-    /*! \pre IsArray() == true */
-    ValueIterator Begin() { RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer(); }
-    //! \em Past-the-end element iterator
-    /*! \pre IsArray() == true */
-    ValueIterator End() { RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer() + data_.a.size; }
-    //! Constant element iterator
-    /*! \pre IsArray() == true */
-    ConstValueIterator Begin() const { return const_cast<GenericValue&>(*this).Begin(); }
-    //! Constant \em past-the-end element iterator
-    /*! \pre IsArray() == true */
-    ConstValueIterator End() const { return const_cast<GenericValue&>(*this).End(); }
-
-    //! Request the array to have enough capacity to store elements.
-    /*! \param newCapacity  The capacity that the array at least need to have.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \note Linear time complexity.
-    */
-    GenericValue& Reserve(SizeType newCapacity, Allocator &allocator) {
-        RAPIDJSON_ASSERT(IsArray());
-        if (newCapacity > data_.a.capacity) {
-            SetElementsPointer(reinterpret_cast<GenericValue*>(allocator.Realloc(GetElementsPointer(), data_.a.capacity * sizeof(GenericValue), newCapacity * sizeof(GenericValue))));
-            data_.a.capacity = newCapacity;
-        }
-        return *this;
-    }
-
-    //! Append a GenericValue at the end of the array.
-    /*! \param value        Value to be appended.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \pre IsArray() == true
-        \post value.IsNull() == true
-        \return The value itself for fluent API.
-        \note The ownership of \c value will be transferred to this array on success.
-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
-        \note Amortized constant time complexity.
-    */
-    GenericValue& PushBack(GenericValue& value, Allocator& allocator) {
-        RAPIDJSON_ASSERT(IsArray());
-        if (data_.a.size >= data_.a.capacity)
-            Reserve(data_.a.capacity == 0 ? kDefaultArrayCapacity : (data_.a.capacity + (data_.a.capacity + 1) / 2), allocator);
-        GetElementsPointer()[data_.a.size++].RawAssign(value);
-        return *this;
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericValue& PushBack(GenericValue&& value, Allocator& allocator) {
-        return PushBack(value, allocator);
-    }
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-    //! Append a constant string reference at the end of the array.
-    /*! \param value        Constant string reference to be appended.
-        \param allocator    Allocator for reallocating memory. It must be the same one used previously. Commonly use GenericDocument::GetAllocator().
-        \pre IsArray() == true
-        \return The value itself for fluent API.
-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
-        \note Amortized constant time complexity.
-        \see GenericStringRef
-    */
-    GenericValue& PushBack(StringRefType value, Allocator& allocator) {
-        return (*this).template PushBack<StringRefType>(value, allocator);
-    }
-
-    //! Append a primitive value at the end of the array.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param value Value of primitive type T to be appended.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \pre IsArray() == true
-        \return The value itself for fluent API.
-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref PushBack(GenericValue&, Allocator&) or \ref
-            PushBack(StringRefType, Allocator&).
-            All other pointer types would implicitly convert to \c bool,
-            use an explicit cast instead, if needed.
-        \note Amortized constant time complexity.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
-    PushBack(T value, Allocator& allocator) {
-        GenericValue v(value);
-        return PushBack(v, allocator);
-    }
-
-    //! Remove the last element in the array.
-    /*!
-        \note Constant time complexity.
-    */
-    GenericValue& PopBack() {
-        RAPIDJSON_ASSERT(IsArray());
-        RAPIDJSON_ASSERT(!Empty());
-        GetElementsPointer()[--data_.a.size].~GenericValue();
-        return *this;
-    }
-
-    //! Remove an element of array by iterator.
-    /*!
-        \param pos iterator to the element to remove
-        \pre IsArray() == true && \ref Begin() <= \c pos < \ref End()
-        \return Iterator following the removed element. If the iterator pos refers to the last element, the End() iterator is returned.
-        \note Linear time complexity.
-    */
-    ValueIterator Erase(ConstValueIterator pos) {
-        return Erase(pos, pos + 1);
-    }
-
-    //! Remove elements in the range [first, last) of the array.
-    /*!
-        \param first iterator to the first element to remove
-        \param last  iterator following the last element to remove
-        \pre IsArray() == true && \ref Begin() <= \c first <= \c last <= \ref End()
-        \return Iterator following the last removed element.
-        \note Linear time complexity.
-    */
-    ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) {
-        RAPIDJSON_ASSERT(IsArray());
-        RAPIDJSON_ASSERT(data_.a.size > 0);
-        RAPIDJSON_ASSERT(GetElementsPointer() != 0);
-        RAPIDJSON_ASSERT(first >= Begin());
-        RAPIDJSON_ASSERT(first <= last);
-        RAPIDJSON_ASSERT(last <= End());
-        ValueIterator pos = Begin() + (first - Begin());
-        for (ValueIterator itr = pos; itr != last; ++itr)
-            itr->~GenericValue();       
-        std::memmove(pos, last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
-        data_.a.size -= static_cast<SizeType>(last - first);
-        return pos;
-    }
-
-    Array GetArray() { RAPIDJSON_ASSERT(IsArray()); return Array(*this); }
-    ConstArray GetArray() const { RAPIDJSON_ASSERT(IsArray()); return ConstArray(*this); }
-
-    //@}
-
-    //!@name Number
-    //@{
-
-    int GetInt() const          { RAPIDJSON_ASSERT(data_.f.flags & kIntFlag);   return data_.n.i.i;   }
-    unsigned GetUint() const    { RAPIDJSON_ASSERT(data_.f.flags & kUintFlag);  return data_.n.u.u;   }
-    int64_t GetInt64() const    { RAPIDJSON_ASSERT(data_.f.flags & kInt64Flag); return data_.n.i64; }
-    uint64_t GetUint64() const  { RAPIDJSON_ASSERT(data_.f.flags & kUint64Flag); return data_.n.u64; }
-
-    //! Get the value as double type.
-    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessDouble() to check whether the converison is lossless.
-    */
-    double GetDouble() const {
-        RAPIDJSON_ASSERT(IsNumber());
-        if ((data_.f.flags & kDoubleFlag) != 0)                return data_.n.d;   // exact type, no conversion.
-        if ((data_.f.flags & kIntFlag) != 0)                   return data_.n.i.i; // int -> double
-        if ((data_.f.flags & kUintFlag) != 0)                  return data_.n.u.u; // unsigned -> double
-        if ((data_.f.flags & kInt64Flag) != 0)                 return static_cast<double>(data_.n.i64); // int64_t -> double (may lose precision)
-        RAPIDJSON_ASSERT((data_.f.flags & kUint64Flag) != 0);  return static_cast<double>(data_.n.u64); // uint64_t -> double (may lose precision)
-    }
-
-    //! Get the value as float type.
-    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessFloat() to check whether the converison is lossless.
-    */
-    float GetFloat() const {
-        return static_cast<float>(GetDouble());
-    }
-
-    GenericValue& SetInt(int i)             { this->~GenericValue(); new (this) GenericValue(i);    return *this; }
-    GenericValue& SetUint(unsigned u)       { this->~GenericValue(); new (this) GenericValue(u);    return *this; }
-    GenericValue& SetInt64(int64_t i64)     { this->~GenericValue(); new (this) GenericValue(i64);  return *this; }
-    GenericValue& SetUint64(uint64_t u64)   { this->~GenericValue(); new (this) GenericValue(u64);  return *this; }
-    GenericValue& SetDouble(double d)       { this->~GenericValue(); new (this) GenericValue(d);    return *this; }
-    GenericValue& SetFloat(float f)         { this->~GenericValue(); new (this) GenericValue(f);    return *this; }
-
-    //@}
-
-    //!@name String
-    //@{
-
-    const Ch* GetString() const { RAPIDJSON_ASSERT(IsString()); return (data_.f.flags & kInlineStrFlag) ? data_.ss.str : GetStringPointer(); }
-
-    //! Get the length of string.
-    /*! Since rapidjson permits "\\u0000" in the json string, strlen(v.GetString()) may not equal to v.GetStringLength().
-    */
-    SizeType GetStringLength() const { RAPIDJSON_ASSERT(IsString()); return ((data_.f.flags & kInlineStrFlag) ? (data_.ss.GetLength()) : data_.s.length); }
-
-    //! Set this value as a string without copying source string.
-    /*! This version has better performance with supplied length, and also support string containing null character.
-        \param s source string pointer. 
-        \param length The length of source string, excluding the trailing null terminator.
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() == s && GetStringLength() == length
-        \see SetString(StringRefType)
-    */
-    GenericValue& SetString(const Ch* s, SizeType length) { return SetString(StringRef(s, length)); }
-
-    //! Set this value as a string without copying source string.
-    /*! \param s source string reference
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() == s && GetStringLength() == s.length
-    */
-    GenericValue& SetString(StringRefType s) { this->~GenericValue(); SetStringRaw(s); return *this; }
-
-    //! Set this value as a string by copying from source string.
-    /*! This version has better performance with supplied length, and also support string containing null character.
-        \param s source string. 
-        \param length The length of source string, excluding the trailing null terminator.
-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
-    */
-    GenericValue& SetString(const Ch* s, SizeType length, Allocator& allocator) { this->~GenericValue(); SetStringRaw(StringRef(s, length), allocator); return *this; }
-
-    //! Set this value as a string by copying from source string.
-    /*! \param s source string. 
-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
-    */
-    GenericValue& SetString(const Ch* s, Allocator& allocator) { return SetString(s, internal::StrLen(s), allocator); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Set this value as a string by copying from source string.
-    /*! \param s source string.
-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() != s.data() && strcmp(GetString(),s.data() == 0 && GetStringLength() == s.size()
-        \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
-    */
-    GenericValue& SetString(const std::basic_string<Ch>& s, Allocator& allocator) { return SetString(s.data(), SizeType(s.size()), allocator); }
-#endif
-
-    //@}
-
-    //!@name Array
-    //@{
-
-    //! Templated version for checking whether this value is type T.
-    /*!
-        \tparam T Either \c bool, \c int, \c unsigned, \c int64_t, \c uint64_t, \c double, \c float, \c const \c char*, \c std::basic_string<Ch>
-    */
-    template <typename T>
-    bool Is() const { return internal::TypeHelper<ValueType, T>::Is(*this); }
-
-    template <typename T>
-    T Get() const { return internal::TypeHelper<ValueType, T>::Get(*this); }
-
-    template <typename T>
-    T Get() { return internal::TypeHelper<ValueType, T>::Get(*this); }
-
-    template<typename T>
-    ValueType& Set(const T& data) { return internal::TypeHelper<ValueType, T>::Set(*this, data); }
-
-    template<typename T>
-    ValueType& Set(const T& data, AllocatorType& allocator) { return internal::TypeHelper<ValueType, T>::Set(*this, data, allocator); }
-
-    //@}
-
-    //! Generate events of this value to a Handler.
-    /*! This function adopts the GoF visitor pattern.
-        Typical usage is to output this JSON value as JSON text via Writer, which is a Handler.
-        It can also be used to deep clone this value via GenericDocument, which is also a Handler.
-        \tparam Handler type of handler.
-        \param handler An object implementing concept Handler.
-    */
-    template <typename Handler>
-    bool Accept(Handler& handler) const {
-        switch(GetType()) {
-        case kNullType:     return handler.Null();
-        case kFalseType:    return handler.Bool(false);
-        case kTrueType:     return handler.Bool(true);
-
-        case kObjectType:
-            if (RAPIDJSON_UNLIKELY(!handler.StartObject()))
-                return false;
-            for (ConstMemberIterator m = MemberBegin(); m != MemberEnd(); ++m) {
-                RAPIDJSON_ASSERT(m->name.IsString()); // User may change the type of name by MemberIterator.
-                if (RAPIDJSON_UNLIKELY(!handler.Key(m->name.GetString(), m->name.GetStringLength(), (m->name.data_.f.flags & kCopyFlag) != 0)))
-                    return false;
-                if (RAPIDJSON_UNLIKELY(!m->value.Accept(handler)))
-                    return false;
-            }
-            return handler.EndObject(data_.o.size);
-
-        case kArrayType:
-            if (RAPIDJSON_UNLIKELY(!handler.StartArray()))
-                return false;
-            for (const GenericValue* v = Begin(); v != End(); ++v)
-                if (RAPIDJSON_UNLIKELY(!v->Accept(handler)))
-                    return false;
-            return handler.EndArray(data_.a.size);
-    
-        case kStringType:
-            return handler.String(GetString(), GetStringLength(), (data_.f.flags & kCopyFlag) != 0);
-    
-        default:
-            RAPIDJSON_ASSERT(GetType() == kNumberType);
-            if (IsDouble())         return handler.Double(data_.n.d);
-            else if (IsInt())       return handler.Int(data_.n.i.i);
-            else if (IsUint())      return handler.Uint(data_.n.u.u);
-            else if (IsInt64())     return handler.Int64(data_.n.i64);
-            else                    return handler.Uint64(data_.n.u64);
-        }
-    }
-
-private:
-    template <typename, typename> friend class GenericValue;
-    template <typename, typename, typename> friend class GenericDocument;
-
-    enum {
-        kBoolFlag       = 0x0008,
-        kNumberFlag     = 0x0010,
-        kIntFlag        = 0x0020,
-        kUintFlag       = 0x0040,
-        kInt64Flag      = 0x0080,
-        kUint64Flag     = 0x0100,
-        kDoubleFlag     = 0x0200,
-        kStringFlag     = 0x0400,
-        kCopyFlag       = 0x0800,
-        kInlineStrFlag  = 0x1000,
-
-        // Initial flags of different types.
-        kNullFlag = kNullType,
-        kTrueFlag = kTrueType | kBoolFlag,
-        kFalseFlag = kFalseType | kBoolFlag,
-        kNumberIntFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag,
-        kNumberUintFlag = kNumberType | kNumberFlag | kUintFlag | kUint64Flag | kInt64Flag,
-        kNumberInt64Flag = kNumberType | kNumberFlag | kInt64Flag,
-        kNumberUint64Flag = kNumberType | kNumberFlag | kUint64Flag,
-        kNumberDoubleFlag = kNumberType | kNumberFlag | kDoubleFlag,
-        kNumberAnyFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag | kUintFlag | kUint64Flag | kDoubleFlag,
-        kConstStringFlag = kStringType | kStringFlag,
-        kCopyStringFlag = kStringType | kStringFlag | kCopyFlag,
-        kShortStringFlag = kStringType | kStringFlag | kCopyFlag | kInlineStrFlag,
-        kObjectFlag = kObjectType,
-        kArrayFlag = kArrayType,
-
-        kTypeMask = 0x07
-    };
-
-    static const SizeType kDefaultArrayCapacity = 16;
-    static const SizeType kDefaultObjectCapacity = 16;
-
-    struct Flag {
-#if RAPIDJSON_48BITPOINTER_OPTIMIZATION
-        char payload[sizeof(SizeType) * 2 + 6];     // 2 x SizeType + lower 48-bit pointer
-#elif RAPIDJSON_64BIT
-        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 6]; // 6 padding bytes
-#else
-        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 2]; // 2 padding bytes
-#endif
-        uint16_t flags;
-    };
-
-    struct String {
-        SizeType length;
-        SizeType hashcode;  //!< reserved
-        const Ch* str;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    // implementation detail: ShortString can represent zero-terminated strings up to MaxSize chars
-    // (excluding the terminating zero) and store a value to determine the length of the contained
-    // string in the last character str[LenPos] by storing "MaxSize - length" there. If the string
-    // to store has the maximal length of MaxSize then str[LenPos] will be 0 and therefore act as
-    // the string terminator as well. For getting the string length back from that value just use
-    // "MaxSize - str[LenPos]".
-    // This allows to store 13-chars strings in 32-bit mode, 21-chars strings in 64-bit mode,
-    // 13-chars strings for RAPIDJSON_48BITPOINTER_OPTIMIZATION=1 inline (for `UTF8`-encoded strings).
-    struct ShortString {
-        enum { MaxChars = sizeof(static_cast<Flag*>(0)->payload) / sizeof(Ch), MaxSize = MaxChars - 1, LenPos = MaxSize };
-        Ch str[MaxChars];
-
-        inline static bool Usable(SizeType len) { return                       (MaxSize >= len); }
-        inline void     SetLength(SizeType len) { str[LenPos] = static_cast<Ch>(MaxSize -  len); }
-        inline SizeType GetLength() const       { return  static_cast<SizeType>(MaxSize -  str[LenPos]); }
-    };  // at most as many bytes as "String" above => 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    // By using proper binary layout, retrieval of different integer types do not need conversions.
-    union Number {
-#if RAPIDJSON_ENDIAN == RAPIDJSON_LITTLEENDIAN
-        struct I {
-            int i;
-            char padding[4];
-        }i;
-        struct U {
-            unsigned u;
-            char padding2[4];
-        }u;
-#else
-        struct I {
-            char padding[4];
-            int i;
-        }i;
-        struct U {
-            char padding2[4];
-            unsigned u;
-        }u;
-#endif
-        int64_t i64;
-        uint64_t u64;
-        double d;
-    };  // 8 bytes
-
-    struct ObjectData {
-        SizeType size;
-        SizeType capacity;
-        Member* members;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    struct ArrayData {
-        SizeType size;
-        SizeType capacity;
-        GenericValue* elements;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    union Data {
-        String s;
-        ShortString ss;
-        Number n;
-        ObjectData o;
-        ArrayData a;
-        Flag f;
-    };  // 16 bytes in 32-bit mode, 24 bytes in 64-bit mode, 16 bytes in 64-bit with RAPIDJSON_48BITPOINTER_OPTIMIZATION
-
-    RAPIDJSON_FORCEINLINE const Ch* GetStringPointer() const { return RAPIDJSON_GETPOINTER(Ch, data_.s.str); }
-    RAPIDJSON_FORCEINLINE const Ch* SetStringPointer(const Ch* str) { return RAPIDJSON_SETPOINTER(Ch, data_.s.str, str); }
-    RAPIDJSON_FORCEINLINE GenericValue* GetElementsPointer() const { return RAPIDJSON_GETPOINTER(GenericValue, data_.a.elements); }
-    RAPIDJSON_FORCEINLINE GenericValue* SetElementsPointer(GenericValue* elements) { return RAPIDJSON_SETPOINTER(GenericValue, data_.a.elements, elements); }
-    RAPIDJSON_FORCEINLINE Member* GetMembersPointer() const { return RAPIDJSON_GETPOINTER(Member, data_.o.members); }
-    RAPIDJSON_FORCEINLINE Member* SetMembersPointer(Member* members) { return RAPIDJSON_SETPOINTER(Member, data_.o.members, members); }
-
-    // Initialize this value as array with initial data, without calling destructor.
-    void SetArrayRaw(GenericValue* values, SizeType count, Allocator& allocator) {
-        data_.f.flags = kArrayFlag;
-        if (count) {
-            GenericValue* e = static_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
-            SetElementsPointer(e);
-            std::memcpy(e, values, count * sizeof(GenericValue));
-        }
-        else
-            SetElementsPointer(0);
-        data_.a.size = data_.a.capacity = count;
-    }
-
-    //! Initialize this value as object with initial data, without calling destructor.
-    void SetObjectRaw(Member* members, SizeType count, Allocator& allocator) {
-        data_.f.flags = kObjectFlag;
-        if (count) {
-            Member* m = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
-            SetMembersPointer(m);
-            std::memcpy(m, members, count * sizeof(Member));
-        }
-        else
-            SetMembersPointer(0);
-        data_.o.size = data_.o.capacity = count;
-    }
-
-    //! Initialize this value as constant string, without calling destructor.
-    void SetStringRaw(StringRefType s) RAPIDJSON_NOEXCEPT {
-        data_.f.flags = kConstStringFlag;
-        SetStringPointer(s);
-        data_.s.length = s.length;
-    }
-
-    //! Initialize this value as copy string with initial data, without calling destructor.
-    void SetStringRaw(StringRefType s, Allocator& allocator) {
-        Ch* str = 0;
-        if (ShortString::Usable(s.length)) {
-            data_.f.flags = kShortStringFlag;
-            data_.ss.SetLength(s.length);
-            str = data_.ss.str;
-        } else {
-            data_.f.flags = kCopyStringFlag;
-            data_.s.length = s.length;
-            str = static_cast<Ch *>(allocator.Malloc((s.length + 1) * sizeof(Ch)));
-            SetStringPointer(str);
-        }
-        std::memcpy(str, s, s.length * sizeof(Ch));
-        str[s.length] = '\0';
-    }
-
-    //! Assignment without calling destructor
-    void RawAssign(GenericValue& rhs) RAPIDJSON_NOEXCEPT {
-        data_ = rhs.data_;
-        // data_.f.flags = rhs.data_.f.flags;
-        rhs.data_.f.flags = kNullFlag;
-    }
-
-    template <typename SourceAllocator>
-    bool StringEqual(const GenericValue<Encoding, SourceAllocator>& rhs) const {
-        RAPIDJSON_ASSERT(IsString());
-        RAPIDJSON_ASSERT(rhs.IsString());
-
-        const SizeType len1 = GetStringLength();
-        const SizeType len2 = rhs.GetStringLength();
-        if(len1 != len2) { return false; }
-
-        const Ch* const str1 = GetString();
-        const Ch* const str2 = rhs.GetString();
-        if(str1 == str2) { return true; } // fast path for constant string
-
-        return (std::memcmp(str1, str2, sizeof(Ch) * len1) == 0);
-    }
-
-    Data data_;
-};
-
-//! GenericValue with UTF8 encoding
-typedef GenericValue<UTF8<> > Value;
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericDocument 
-
-//! A document for parsing JSON text as DOM.
-/*!
-    \note implements Handler concept
-    \tparam Encoding Encoding for both parsing and string storage.
-    \tparam Allocator Allocator for allocating memory for the DOM
-    \tparam StackAllocator Allocator for allocating memory for stack during parsing.
-    \warning Although GenericDocument inherits from GenericValue, the API does \b not provide any virtual functions, especially no virtual destructor.  To avoid memory leaks, do not \c delete a GenericDocument object via a pointer to a GenericValue.
-*/
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<>, typename StackAllocator = CrtAllocator>
-class GenericDocument : public GenericValue<Encoding, Allocator> {
-public:
-    typedef typename Encoding::Ch Ch;                       //!< Character type derived from Encoding.
-    typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of the document.
-    typedef Allocator AllocatorType;                        //!< Allocator type from template parameter.
-
-    //! Constructor
-    /*! Creates an empty document of specified type.
-        \param type             Mandatory type of object to create.
-        \param allocator        Optional allocator for allocating memory.
-        \param stackCapacity    Optional initial capacity of stack in bytes.
-        \param stackAllocator   Optional allocator for allocating memory for stack.
-    */
-    explicit GenericDocument(Type type, Allocator* allocator = 0, size_t stackCapacity = kDefaultStackCapacity, StackAllocator* stackAllocator = 0) :
-        GenericValue<Encoding, Allocator>(type),  allocator_(allocator), ownAllocator_(0), stack_(stackAllocator, stackCapacity), parseResult_()
-    {
-        if (!allocator_)
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
-    }
-
-    //! Constructor
-    /*! Creates an empty document which type is Null. 
-        \param allocator        Optional allocator for allocating memory.
-        \param stackCapacity    Optional initial capacity of stack in bytes.
-        \param stackAllocator   Optional allocator for allocating memory for stack.
-    */
-    GenericDocument(Allocator* allocator = 0, size_t stackCapacity = kDefaultStackCapacity, StackAllocator* stackAllocator = 0) : 
-        allocator_(allocator), ownAllocator_(0), stack_(stackAllocator, stackCapacity), parseResult_()
-    {
-        if (!allocator_)
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move constructor in C++11
-    GenericDocument(GenericDocument&& rhs) RAPIDJSON_NOEXCEPT
-        : ValueType(std::forward<ValueType>(rhs)), // explicit cast to avoid prohibited move from Document
-          allocator_(rhs.allocator_),
-          ownAllocator_(rhs.ownAllocator_),
-          stack_(std::move(rhs.stack_)),
-          parseResult_(rhs.parseResult_)
-    {
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-        rhs.parseResult_ = ParseResult();
-    }
-#endif
-
-    ~GenericDocument() {
-        Destroy();
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move assignment in C++11
-    GenericDocument& operator=(GenericDocument&& rhs) RAPIDJSON_NOEXCEPT
-    {
-        // The cast to ValueType is necessary here, because otherwise it would
-        // attempt to call GenericValue's templated assignment operator.
-        ValueType::operator=(std::forward<ValueType>(rhs));
-
-        // Calling the destructor here would prematurely call stack_'s destructor
-        Destroy();
-
-        allocator_ = rhs.allocator_;
-        ownAllocator_ = rhs.ownAllocator_;
-        stack_ = std::move(rhs.stack_);
-        parseResult_ = rhs.parseResult_;
-
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-        rhs.parseResult_ = ParseResult();
-
-        return *this;
-    }
-#endif
-
-    //! Exchange the contents of this document with those of another.
-    /*!
-        \param rhs Another document.
-        \note Constant complexity.
-        \see GenericValue::Swap
-    */
-    GenericDocument& Swap(GenericDocument& rhs) RAPIDJSON_NOEXCEPT {
-        ValueType::Swap(rhs);
-        stack_.Swap(rhs.stack_);
-        internal::Swap(allocator_, rhs.allocator_);
-        internal::Swap(ownAllocator_, rhs.ownAllocator_);
-        internal::Swap(parseResult_, rhs.parseResult_);
-        return *this;
-    }
-
-    //! free-standing swap function helper
-    /*!
-        Helper function to enable support for common swap implementation pattern based on \c std::swap:
-        \code
-        void swap(MyClass& a, MyClass& b) {
-            using std::swap;
-            swap(a.doc, b.doc);
-            // ...
-        }
-        \endcode
-        \see Swap()
-     */
-    friend inline void swap(GenericDocument& a, GenericDocument& b) RAPIDJSON_NOEXCEPT { a.Swap(b); }
-
-    //! Populate this document by a generator which produces SAX events.
-    /*! \tparam Generator A functor with <tt>bool f(Handler)</tt> prototype.
-        \param g Generator functor which sends SAX events to the parameter.
-        \return The document itself for fluent API.
-    */
-    template <typename Generator>
-    GenericDocument& Populate(Generator& g) {
-        ClearStackOnExit scope(*this);
-        if (g(*this)) {
-            RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
-            ValueType::operator=(*stack_.template Pop<ValueType>(1));// Move value from stack to document
-        }
-        return *this;
-    }
-
-    //!@name Parse from stream
-    //!@{
-
-    //! Parse JSON text from an input stream (with Encoding conversion)
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \tparam SourceEncoding Encoding of input stream
-        \tparam InputStream Type of input stream, implementing Stream concept
-        \param is Input stream to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <unsigned parseFlags, typename SourceEncoding, typename InputStream>
-    GenericDocument& ParseStream(InputStream& is) {
-        GenericReader<SourceEncoding, Encoding, StackAllocator> reader(
-            stack_.HasAllocator() ? &stack_.GetAllocator() : 0);
-        ClearStackOnExit scope(*this);
-        parseResult_ = reader.template Parse<parseFlags>(is, *this);
-        if (parseResult_) {
-            RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
-            ValueType::operator=(*stack_.template Pop<ValueType>(1));// Move value from stack to document
-        }
-        return *this;
-    }
-
-    //! Parse JSON text from an input stream
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \tparam InputStream Type of input stream, implementing Stream concept
-        \param is Input stream to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <unsigned parseFlags, typename InputStream>
-    GenericDocument& ParseStream(InputStream& is) {
-        return ParseStream<parseFlags, Encoding, InputStream>(is);
-    }
-
-    //! Parse JSON text from an input stream (with \ref kParseDefaultFlags)
-    /*! \tparam InputStream Type of input stream, implementing Stream concept
-        \param is Input stream to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <typename InputStream>
-    GenericDocument& ParseStream(InputStream& is) {
-        return ParseStream<kParseDefaultFlags, Encoding, InputStream>(is);
-    }
-    //!@}
-
-    //!@name Parse in-place from mutable string
-    //!@{
-
-    //! Parse JSON text from a mutable string
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \param str Mutable zero-terminated string to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <unsigned parseFlags>
-    GenericDocument& ParseInsitu(Ch* str) {
-        GenericInsituStringStream<Encoding> s(str);
-        return ParseStream<parseFlags | kParseInsituFlag>(s);
-    }
-
-    //! Parse JSON text from a mutable string (with \ref kParseDefaultFlags)
-    /*! \param str Mutable zero-terminated string to be parsed.
-        \return The document itself for fluent API.
-    */
-    GenericDocument& ParseInsitu(Ch* str) {
-        return ParseInsitu<kParseDefaultFlags>(str);
-    }
-    //!@}
-
-    //!@name Parse from read-only string
-    //!@{
-
-    //! Parse JSON text from a read-only string (with Encoding conversion)
-    /*! \tparam parseFlags Combination of \ref ParseFlag (must not contain \ref kParseInsituFlag).
-        \tparam SourceEncoding Transcoding from input Encoding
-        \param str Read-only zero-terminated string to be parsed.
-    */
-    template <unsigned parseFlags, typename SourceEncoding>
-    GenericDocument& Parse(const typename SourceEncoding::Ch* str) {
-        RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
-        GenericStringStream<SourceEncoding> s(str);
-        return ParseStream<parseFlags, SourceEncoding>(s);
-    }
-
-    //! Parse JSON text from a read-only string
-    /*! \tparam parseFlags Combination of \ref ParseFlag (must not contain \ref kParseInsituFlag).
-        \param str Read-only zero-terminated string to be parsed.
-    */
-    template <unsigned parseFlags>
-    GenericDocument& Parse(const Ch* str) {
-        return Parse<parseFlags, Encoding>(str);
-    }
-
-    //! Parse JSON text from a read-only string (with \ref kParseDefaultFlags)
-    /*! \param str Read-only zero-terminated string to be parsed.
-    */
-    GenericDocument& Parse(const Ch* str) {
-        return Parse<kParseDefaultFlags>(str);
-    }
-
-    template <unsigned parseFlags, typename SourceEncoding>
-    GenericDocument& Parse(const typename SourceEncoding::Ch* str, size_t length) {
-        RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
-        MemoryStream ms(static_cast<const char*>(str), length * sizeof(typename SourceEncoding::Ch));
-        EncodedInputStream<SourceEncoding, MemoryStream> is(ms);
-        ParseStream<parseFlags, SourceEncoding>(is);
-        return *this;
-    }
-
-    template <unsigned parseFlags>
-    GenericDocument& Parse(const Ch* str, size_t length) {
-        return Parse<parseFlags, Encoding>(str, length);
-    }
-    
-    GenericDocument& Parse(const Ch* str, size_t length) {
-        return Parse<kParseDefaultFlags>(str, length);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    template <unsigned parseFlags, typename SourceEncoding>
-    GenericDocument& Parse(const std::basic_string<typename SourceEncoding::Ch>& str) {
-        // c_str() is constant complexity according to standard. Should be faster than Parse(const char*, size_t)
-        return Parse<parseFlags, SourceEncoding>(str.c_str());
-    }
-
-    template <unsigned parseFlags>
-    GenericDocument& Parse(const std::basic_string<Ch>& str) {
-        return Parse<parseFlags, Encoding>(str.c_str());
-    }
-
-    GenericDocument& Parse(const std::basic_string<Ch>& str) {
-        return Parse<kParseDefaultFlags>(str);
-    }
-#endif // RAPIDJSON_HAS_STDSTRING    
-
-    //!@}
-
-    //!@name Handling parse errors
-    //!@{
-
-    //! Whether a parse error has occured in the last parsing.
-    bool HasParseError() const { return parseResult_.IsError(); }
-
-    //! Get the \ref ParseErrorCode of last parsing.
-    ParseErrorCode GetParseError() const { return parseResult_.Code(); }
-
-    //! Get the position of last parsing error in input, 0 otherwise.
-    size_t GetErrorOffset() const { return parseResult_.Offset(); }
-
-    //! Implicit conversion to get the last parse result
-#ifndef __clang // -Wdocumentation
-    /*! \return \ref ParseResult of the last parse operation
-
-        \code
-          Document doc;
-          ParseResult ok = doc.Parse(json);
-          if (!ok)
-            printf( "JSON parse error: %s (%u)\n", GetParseError_En(ok.Code()), ok.Offset());
-        \endcode
-     */
-#endif
-    operator ParseResult() const { return parseResult_; }
-    //!@}
-
-    //! Get the allocator of this document.
-    Allocator& GetAllocator() {
-        RAPIDJSON_ASSERT(allocator_);
-        return *allocator_;
-    }
-
-    //! Get the capacity of stack in bytes.
-    size_t GetStackCapacity() const { return stack_.GetCapacity(); }
-
-private:
-    // clear stack on any exit from ParseStream, e.g. due to exception
-    struct ClearStackOnExit {
-        explicit ClearStackOnExit(GenericDocument& d) : d_(d) {}
-        ~ClearStackOnExit() { d_.ClearStack(); }
-    private:
-        ClearStackOnExit(const ClearStackOnExit&);
-        ClearStackOnExit& operator=(const ClearStackOnExit&);
-        GenericDocument& d_;
-    };
-
-    // callers of the following private Handler functions
-    // template <typename,typename,typename> friend class GenericReader; // for parsing
-    template <typename, typename> friend class GenericValue; // for deep copying
-
-public:
-    // Implementation of Handler
-    bool Null() { new (stack_.template Push<ValueType>()) ValueType(); return true; }
-    bool Bool(bool b) { new (stack_.template Push<ValueType>()) ValueType(b); return true; }
-    bool Int(int i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Uint(unsigned i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Int64(int64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Uint64(uint64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Double(double d) { new (stack_.template Push<ValueType>()) ValueType(d); return true; }
-
-    bool RawNumber(const Ch* str, SizeType length, bool copy) { 
-        if (copy) 
-            new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
-        else
-            new (stack_.template Push<ValueType>()) ValueType(str, length);
-        return true;
-    }
-
-    bool String(const Ch* str, SizeType length, bool copy) { 
-        if (copy) 
-            new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
-        else
-            new (stack_.template Push<ValueType>()) ValueType(str, length);
-        return true;
-    }
-
-    bool StartObject() { new (stack_.template Push<ValueType>()) ValueType(kObjectType); return true; }
-    
-    bool Key(const Ch* str, SizeType length, bool copy) { return String(str, length, copy); }
-
-    bool EndObject(SizeType memberCount) {
-        typename ValueType::Member* members = stack_.template Pop<typename ValueType::Member>(memberCount);
-        stack_.template Top<ValueType>()->SetObjectRaw(members, memberCount, GetAllocator());
-        return true;
-    }
-
-    bool StartArray() { new (stack_.template Push<ValueType>()) ValueType(kArrayType); return true; }
-    
-    bool EndArray(SizeType elementCount) {
-        ValueType* elements = stack_.template Pop<ValueType>(elementCount);
-        stack_.template Top<ValueType>()->SetArrayRaw(elements, elementCount, GetAllocator());
-        return true;
-    }
-
-private:
-    //! Prohibit copying
-    GenericDocument(const GenericDocument&);
-    //! Prohibit assignment
-    GenericDocument& operator=(const GenericDocument&);
-
-    void ClearStack() {
-        if (Allocator::kNeedFree)
-            while (stack_.GetSize() > 0)    // Here assumes all elements in stack array are GenericValue (Member is actually 2 GenericValue objects)
-                (stack_.template Pop<ValueType>(1))->~ValueType();
-        else
-            stack_.Clear();
-        stack_.ShrinkToFit();
-    }
-
-    void Destroy() {
-        RAPIDJSON_DELETE(ownAllocator_);
-    }
-
-    static const size_t kDefaultStackCapacity = 1024;
-    Allocator* allocator_;
-    Allocator* ownAllocator_;
-    internal::Stack<StackAllocator> stack_;
-    ParseResult parseResult_;
-};
-
-//! GenericDocument with UTF8 encoding
-typedef GenericDocument<UTF8<> > Document;
-
-// defined here due to the dependency on GenericDocument
-template <typename Encoding, typename Allocator>
-template <typename SourceAllocator>
-inline
-GenericValue<Encoding,Allocator>::GenericValue(const GenericValue<Encoding,SourceAllocator>& rhs, Allocator& allocator)
-{
-    switch (rhs.GetType()) {
-    case kObjectType:
-    case kArrayType: { // perform deep copy via SAX Handler
-            GenericDocument<Encoding,Allocator> d(&allocator);
-            rhs.Accept(d);
-            RawAssign(*d.stack_.template Pop<GenericValue>(1));
-        }
-        break;
-    case kStringType:
-        if (rhs.data_.f.flags == kConstStringFlag) {
-            data_.f.flags = rhs.data_.f.flags;
-            data_  = *reinterpret_cast<const Data*>(&rhs.data_);
-        } else {
-            SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator);
-        }
-        break;
-    default:
-        data_.f.flags = rhs.data_.f.flags;
-        data_  = *reinterpret_cast<const Data*>(&rhs.data_);
-        break;
-    }
-}
-
-//! Helper class for accessing Value of array type.
-/*!
-    Instance of this helper class is obtained by \c GenericValue::GetArray().
-    In addition to all APIs for array type, it provides range-based for loop if \c RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
-*/
-template <bool Const, typename ValueT>
-class GenericArray {
-public:
-    typedef GenericArray<true, ValueT> ConstArray;
-    typedef GenericArray<false, ValueT> Array;
-    typedef ValueT PlainType;
-    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
-    typedef ValueType* ValueIterator;  // This may be const or non-const iterator
-    typedef const ValueT* ConstValueIterator;
-    typedef typename ValueType::AllocatorType AllocatorType;
-    typedef typename ValueType::StringRefType StringRefType;
-
-    template <typename, typename>
-    friend class GenericValue;
-
-    GenericArray(const GenericArray& rhs) : value_(rhs.value_) {}
-    GenericArray& operator=(const GenericArray& rhs) { value_ = rhs.value_; return *this; }
-    ~GenericArray() {}
-
-    SizeType Size() const { return value_.Size(); }
-    SizeType Capacity() const { return value_.Capacity(); }
-    bool Empty() const { return value_.Empty(); }
-    void Clear() const { value_.Clear(); }
-    ValueType& operator[](SizeType index) const {  return value_[index]; }
-    ValueIterator Begin() const { return value_.Begin(); }
-    ValueIterator End() const { return value_.End(); }
-    GenericArray Reserve(SizeType newCapacity, AllocatorType &allocator) const { value_.Reserve(newCapacity, allocator); return *this; }
-    GenericArray PushBack(ValueType& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericArray PushBack(ValueType&& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericArray PushBack(StringRefType value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (const GenericArray&)) PushBack(T value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-    GenericArray PopBack() const { value_.PopBack(); return *this; }
-    ValueIterator Erase(ConstValueIterator pos) const { return value_.Erase(pos); }
-    ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) const { return value_.Erase(first, last); }
-
-#if RAPIDJSON_HAS_CXX11_RANGE_FOR
-    ValueIterator begin() const { return value_.Begin(); }
-    ValueIterator end() const { return value_.End(); }
-#endif
-
-private:
-    GenericArray();
-    GenericArray(ValueType& value) : value_(value) {}
-    ValueType& value_;
-};
-
-//! Helper class for accessing Value of object type.
-/*!
-    Instance of this helper class is obtained by \c GenericValue::GetObject().
-    In addition to all APIs for array type, it provides range-based for loop if \c RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
-*/
-template <bool Const, typename ValueT>
-class GenericObject {
-public:
-    typedef GenericObject<true, ValueT> ConstObject;
-    typedef GenericObject<false, ValueT> Object;
-    typedef ValueT PlainType;
-    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
-    typedef GenericMemberIterator<Const, typename ValueT::EncodingType, typename ValueT::AllocatorType> MemberIterator;  // This may be const or non-const iterator
-    typedef GenericMemberIterator<true, typename ValueT::EncodingType, typename ValueT::AllocatorType> ConstMemberIterator;
-    typedef typename ValueType::AllocatorType AllocatorType;
-    typedef typename ValueType::StringRefType StringRefType;
-    typedef typename ValueType::EncodingType EncodingType;
-    typedef typename ValueType::Ch Ch;
-
-    template <typename, typename>
-    friend class GenericValue;
-
-    GenericObject(const GenericObject& rhs) : value_(rhs.value_) {}
-    GenericObject& operator=(const GenericObject& rhs) { value_ = rhs.value_; return *this; }
-    ~GenericObject() {}
-
-    SizeType MemberCount() const { return value_.MemberCount(); }
-    bool ObjectEmpty() const { return value_.ObjectEmpty(); }
-    template <typename T> ValueType& operator[](T* name) const { return value_[name]; }
-    template <typename SourceAllocator> ValueType& operator[](const GenericValue<EncodingType, SourceAllocator>& name) const { return value_[name]; }
-#if RAPIDJSON_HAS_STDSTRING
-    ValueType& operator[](const std::basic_string<Ch>& name) const { return value_[name]; }
-#endif
-    MemberIterator MemberBegin() const { return value_.MemberBegin(); }
-    MemberIterator MemberEnd() const { return value_.MemberEnd(); }
-    bool HasMember(const Ch* name) const { return value_.HasMember(name); }
-#if RAPIDJSON_HAS_STDSTRING
-    bool HasMember(const std::basic_string<Ch>& name) const { return value_.HasMember(name); }
-#endif
-    template <typename SourceAllocator> bool HasMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.HasMember(name); }
-    MemberIterator FindMember(const Ch* name) const { return value_.FindMember(name); }
-    template <typename SourceAllocator> MemberIterator FindMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.FindMember(name); }
-#if RAPIDJSON_HAS_STDSTRING
-    MemberIterator FindMember(const std::basic_string<Ch>& name) const { return value_.FindMember(name); }
-#endif
-    GenericObject AddMember(ValueType& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(ValueType& name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#if RAPIDJSON_HAS_STDSTRING
-    GenericObject AddMember(ValueType& name, std::basic_string<Ch>& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#endif
-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&)) AddMember(ValueType& name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericObject AddMember(ValueType&& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(ValueType&& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(ValueType& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(StringRefType name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericObject AddMember(StringRefType name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(StringRefType name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericObject)) AddMember(StringRefType name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    void RemoveAllMembers() { return value_.RemoveAllMembers(); }
-    bool RemoveMember(const Ch* name) const { return value_.RemoveMember(name); }
-#if RAPIDJSON_HAS_STDSTRING
-    bool RemoveMember(const std::basic_string<Ch>& name) const { return value_.RemoveMember(name); }
-#endif
-    template <typename SourceAllocator> bool RemoveMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.RemoveMember(name); }
-    MemberIterator RemoveMember(MemberIterator m) const { return value_.RemoveMember(m); }
-    MemberIterator EraseMember(ConstMemberIterator pos) const { return value_.EraseMember(pos); }
-    MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) const { return value_.EraseMember(first, last); }
-    bool EraseMember(const Ch* name) const { return value_.EraseMember(name); }
-#if RAPIDJSON_HAS_STDSTRING
-    bool EraseMember(const std::basic_string<Ch>& name) const { return EraseMember(ValueType(StringRef(name))); }
-#endif
-    template <typename SourceAllocator> bool EraseMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.EraseMember(name); }
-
-#if RAPIDJSON_HAS_CXX11_RANGE_FOR
-    MemberIterator begin() const { return value_.MemberBegin(); }
-    MemberIterator end() const { return value_.MemberEnd(); }
-#endif
-
-private:
-    GenericObject();
-    GenericObject(ValueType& value) : value_(value) {}
-    ValueType& value_;
-};
-
-RAPIDJSON_NAMESPACE_END
-RAPIDJSON_DIAG_POP
-
-#endif // RAPIDJSON_DOCUMENT_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/encodedstream.h b/sql-odbc/libraries/rapidjson/include/rapidjson/encodedstream.h
deleted file mode 100644
index 145068386a..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/encodedstream.h
+++ /dev/null
@@ -1,299 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ENCODEDSTREAM_H_
-#define RAPIDJSON_ENCODEDSTREAM_H_
-
-#include "stream.h"
-#include "memorystream.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Input byte stream wrapper with a statically bound encoding.
-/*!
-    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
-    \tparam InputByteStream Type of input byte stream. For example, FileReadStream.
-*/
-template <typename Encoding, typename InputByteStream>
-class EncodedInputStream {
-    RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-public:
-    typedef typename Encoding::Ch Ch;
-
-    EncodedInputStream(InputByteStream& is) : is_(is) { 
-        current_ = Encoding::TakeBOM(is_);
-    }
-
-    Ch Peek() const { return current_; }
-    Ch Take() { Ch c = current_; current_ = Encoding::Take(is_); return c; }
-    size_t Tell() const { return is_.Tell(); }
-
-    // Not implemented
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); } 
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    EncodedInputStream(const EncodedInputStream&);
-    EncodedInputStream& operator=(const EncodedInputStream&);
-
-    InputByteStream& is_;
-    Ch current_;
-};
-
-//! Specialized for UTF8 MemoryStream.
-template <>
-class EncodedInputStream<UTF8<>, MemoryStream> {
-public:
-    typedef UTF8<>::Ch Ch;
-
-    EncodedInputStream(MemoryStream& is) : is_(is) {
-        if (static_cast<unsigned char>(is_.Peek()) == 0xEFu) is_.Take();
-        if (static_cast<unsigned char>(is_.Peek()) == 0xBBu) is_.Take();
-        if (static_cast<unsigned char>(is_.Peek()) == 0xBFu) is_.Take();
-    }
-    Ch Peek() const { return is_.Peek(); }
-    Ch Take() { return is_.Take(); }
-    size_t Tell() const { return is_.Tell(); }
-
-    // Not implemented
-    void Put(Ch) {}
-    void Flush() {} 
-    Ch* PutBegin() { return 0; }
-    size_t PutEnd(Ch*) { return 0; }
-
-    MemoryStream& is_;
-
-private:
-    EncodedInputStream(const EncodedInputStream&);
-    EncodedInputStream& operator=(const EncodedInputStream&);
-};
-
-//! Output byte stream wrapper with statically bound encoding.
-/*!
-    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
-    \tparam OutputByteStream Type of input byte stream. For example, FileWriteStream.
-*/
-template <typename Encoding, typename OutputByteStream>
-class EncodedOutputStream {
-    RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-public:
-    typedef typename Encoding::Ch Ch;
-
-    EncodedOutputStream(OutputByteStream& os, bool putBOM = true) : os_(os) { 
-        if (putBOM)
-            Encoding::PutBOM(os_);
-    }
-
-    void Put(Ch c) { Encoding::Put(os_, c);  }
-    void Flush() { os_.Flush(); }
-
-    // Not implemented
-    Ch Peek() const { RAPIDJSON_ASSERT(false); return 0;}
-    Ch Take() { RAPIDJSON_ASSERT(false); return 0;}
-    size_t Tell() const { RAPIDJSON_ASSERT(false);  return 0; }
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    EncodedOutputStream(const EncodedOutputStream&);
-    EncodedOutputStream& operator=(const EncodedOutputStream&);
-
-    OutputByteStream& os_;
-};
-
-#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
-
-//! Input stream wrapper with dynamically bound encoding and automatic encoding detection.
-/*!
-    \tparam CharType Type of character for reading.
-    \tparam InputByteStream type of input byte stream to be wrapped.
-*/
-template <typename CharType, typename InputByteStream>
-class AutoUTFInputStream {
-    RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-public:
-    typedef CharType Ch;
-
-    //! Constructor.
-    /*!
-        \param is input stream to be wrapped.
-        \param type UTF encoding type if it is not detected from the stream.
-    */
-    AutoUTFInputStream(InputByteStream& is, UTFType type = kUTF8) : is_(&is), type_(type), hasBOM_(false) {
-        RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);        
-        DetectType();
-        static const TakeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Take) };
-        takeFunc_ = f[type_];
-        current_ = takeFunc_(*is_);
-    }
-
-    UTFType GetType() const { return type_; }
-    bool HasBOM() const { return hasBOM_; }
-
-    Ch Peek() const { return current_; }
-    Ch Take() { Ch c = current_; current_ = takeFunc_(*is_); return c; }
-    size_t Tell() const { return is_->Tell(); }
-
-    // Not implemented
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); } 
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    AutoUTFInputStream(const AutoUTFInputStream&);
-    AutoUTFInputStream& operator=(const AutoUTFInputStream&);
-
-    // Detect encoding type with BOM or RFC 4627
-    void DetectType() {
-        // BOM (Byte Order Mark):
-        // 00 00 FE FF  UTF-32BE
-        // FF FE 00 00  UTF-32LE
-        // FE FF        UTF-16BE
-        // FF FE        UTF-16LE
-        // EF BB BF     UTF-8
-
-        const unsigned char* c = reinterpret_cast<const unsigned char *>(is_->Peek4());
-        if (!c)
-            return;
-
-        unsigned bom = static_cast<unsigned>(c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24));
-        hasBOM_ = false;
-        if (bom == 0xFFFE0000)                  { type_ = kUTF32BE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
-        else if (bom == 0x0000FEFF)             { type_ = kUTF32LE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
-        else if ((bom & 0xFFFF) == 0xFFFE)      { type_ = kUTF16BE; hasBOM_ = true; is_->Take(); is_->Take();                           }
-        else if ((bom & 0xFFFF) == 0xFEFF)      { type_ = kUTF16LE; hasBOM_ = true; is_->Take(); is_->Take();                           }
-        else if ((bom & 0xFFFFFF) == 0xBFBBEF)  { type_ = kUTF8;    hasBOM_ = true; is_->Take(); is_->Take(); is_->Take();              }
-
-        // RFC 4627: Section 3
-        // "Since the first two characters of a JSON text will always be ASCII
-        // characters [RFC0020], it is possible to determine whether an octet
-        // stream is UTF-8, UTF-16 (BE or LE), or UTF-32 (BE or LE) by looking
-        // at the pattern of nulls in the first four octets."
-        // 00 00 00 xx  UTF-32BE
-        // 00 xx 00 xx  UTF-16BE
-        // xx 00 00 00  UTF-32LE
-        // xx 00 xx 00  UTF-16LE
-        // xx xx xx xx  UTF-8
-
-        if (!hasBOM_) {
-            unsigned pattern = (c[0] ? 1 : 0) | (c[1] ? 2 : 0) | (c[2] ? 4 : 0) | (c[3] ? 8 : 0);
-            switch (pattern) {
-            case 0x08: type_ = kUTF32BE; break;
-            case 0x0A: type_ = kUTF16BE; break;
-            case 0x01: type_ = kUTF32LE; break;
-            case 0x05: type_ = kUTF16LE; break;
-            case 0x0F: type_ = kUTF8;    break;
-            default: break; // Use type defined by user.
-            }
-        }
-
-        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
-        if (type_ == kUTF16LE || type_ == kUTF16BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
-        if (type_ == kUTF32LE || type_ == kUTF32BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
-    }
-
-    typedef Ch (*TakeFunc)(InputByteStream& is);
-    InputByteStream* is_;
-    UTFType type_;
-    Ch current_;
-    TakeFunc takeFunc_;
-    bool hasBOM_;
-};
-
-//! Output stream wrapper with dynamically bound encoding and automatic encoding detection.
-/*!
-    \tparam CharType Type of character for writing.
-    \tparam OutputByteStream type of output byte stream to be wrapped.
-*/
-template <typename CharType, typename OutputByteStream>
-class AutoUTFOutputStream {
-    RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-public:
-    typedef CharType Ch;
-
-    //! Constructor.
-    /*!
-        \param os output stream to be wrapped.
-        \param type UTF encoding type.
-        \param putBOM Whether to write BOM at the beginning of the stream.
-    */
-    AutoUTFOutputStream(OutputByteStream& os, UTFType type, bool putBOM) : os_(&os), type_(type) {
-        RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);
-
-        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
-        if (type_ == kUTF16LE || type_ == kUTF16BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
-        if (type_ == kUTF32LE || type_ == kUTF32BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
-
-        static const PutFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Put) };
-        putFunc_ = f[type_];
-
-        if (putBOM)
-            PutBOM();
-    }
-
-    UTFType GetType() const { return type_; }
-
-    void Put(Ch c) { putFunc_(*os_, c); }
-    void Flush() { os_->Flush(); } 
-
-    // Not implemented
-    Ch Peek() const { RAPIDJSON_ASSERT(false); return 0;}
-    Ch Take() { RAPIDJSON_ASSERT(false); return 0;}
-    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    AutoUTFOutputStream(const AutoUTFOutputStream&);
-    AutoUTFOutputStream& operator=(const AutoUTFOutputStream&);
-
-    void PutBOM() { 
-        typedef void (*PutBOMFunc)(OutputByteStream&);
-        static const PutBOMFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(PutBOM) };
-        f[type_](*os_);
-    }
-
-    typedef void (*PutFunc)(OutputByteStream&, Ch);
-
-    OutputByteStream* os_;
-    UTFType type_;
-    PutFunc putFunc_;
-};
-
-#undef RAPIDJSON_ENCODINGS_FUNC
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_FILESTREAM_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/encodings.h b/sql-odbc/libraries/rapidjson/include/rapidjson/encodings.h
deleted file mode 100644
index baa7c2b17f..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/encodings.h
+++ /dev/null
@@ -1,716 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ENCODINGS_H_
-#define RAPIDJSON_ENCODINGS_H_
-
-#include "rapidjson.h"
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data
-RAPIDJSON_DIAG_OFF(4702)  // unreachable code
-#elif defined(__GNUC__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-RAPIDJSON_DIAG_OFF(overflow)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// Encoding
-
-/*! \class rapidjson::Encoding
-    \brief Concept for encoding of Unicode characters.
-
-\code
-concept Encoding {
-    typename Ch;    //! Type of character. A "character" is actually a code unit in unicode's definition.
-
-    enum { supportUnicode = 1 }; // or 0 if not supporting unicode
-
-    //! \brief Encode a Unicode codepoint to an output stream.
-    //! \param os Output stream.
-    //! \param codepoint An unicode codepoint, ranging from 0x0 to 0x10FFFF inclusively.
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint);
-
-    //! \brief Decode a Unicode codepoint from an input stream.
-    //! \param is Input stream.
-    //! \param codepoint Output of the unicode codepoint.
-    //! \return true if a valid codepoint can be decoded from the stream.
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint);
-
-    //! \brief Validate one Unicode codepoint from an encoded stream.
-    //! \param is Input stream to obtain codepoint.
-    //! \param os Output for copying one codepoint.
-    //! \return true if it is valid.
-    //! \note This function just validating and copying the codepoint without actually decode it.
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os);
-
-    // The following functions are deal with byte streams.
-
-    //! Take a character from input byte stream, skip BOM if exist.
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is);
-
-    //! Take a character from input byte stream.
-    template <typename InputByteStream>
-    static Ch Take(InputByteStream& is);
-
-    //! Put BOM to output byte stream.
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os);
-
-    //! Put a character to output byte stream.
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, Ch c);
-};
-\endcode
-*/
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF8
-
-//! UTF-8 encoding.
-/*! http://en.wikipedia.org/wiki/UTF-8
-    http://tools.ietf.org/html/rfc3629
-    \tparam CharType Code unit for storing 8-bit UTF-8 data. Default is char.
-    \note implements Encoding concept
-*/
-template<typename CharType = char>
-struct UTF8 {
-    typedef CharType Ch;
-
-    enum { supportUnicode = 1 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        if (codepoint <= 0x7F) 
-            os.Put(static_cast<Ch>(codepoint & 0xFF));
-        else if (codepoint <= 0x7FF) {
-            os.Put(static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
-        }
-        else if (codepoint <= 0xFFFF) {
-            os.Put(static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-        else {
-            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            os.Put(static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-    }
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        if (codepoint <= 0x7F) 
-            PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
-        else if (codepoint <= 0x7FF) {
-            PutUnsafe(os, static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
-        }
-        else if (codepoint <= 0xFFFF) {
-            PutUnsafe(os, static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-        else {
-            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            PutUnsafe(os, static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-#define COPY() c = is.Take(); *codepoint = (*codepoint << 6) | (static_cast<unsigned char>(c) & 0x3Fu)
-#define TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
-#define TAIL() COPY(); TRANS(0x70)
-        typename InputStream::Ch c = is.Take();
-        if (!(c & 0x80)) {
-            *codepoint = static_cast<unsigned char>(c);
-            return true;
-        }
-
-        unsigned char type = GetRange(static_cast<unsigned char>(c));
-        if (type >= 32) {
-            *codepoint = 0;
-        } else {
-            *codepoint = (0xFF >> type) & static_cast<unsigned char>(c);
-        }
-        bool result = true;
-        switch (type) {
-        case 2: TAIL(); return result;
-        case 3: TAIL(); TAIL(); return result;
-        case 4: COPY(); TRANS(0x50); TAIL(); return result;
-        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
-        case 6: TAIL(); TAIL(); TAIL(); return result;
-        case 10: COPY(); TRANS(0x20); TAIL(); return result;
-        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
-        default: return false;
-        }
-#undef COPY
-#undef TRANS
-#undef TAIL
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-#define COPY() os.Put(c = is.Take())
-#define TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
-#define TAIL() COPY(); TRANS(0x70)
-        Ch c;
-        COPY();
-        if (!(c & 0x80))
-            return true;
-
-        bool result = true;
-        switch (GetRange(static_cast<unsigned char>(c))) {
-        case 2: TAIL(); return result;
-        case 3: TAIL(); TAIL(); return result;
-        case 4: COPY(); TRANS(0x50); TAIL(); return result;
-        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
-        case 6: TAIL(); TAIL(); TAIL(); return result;
-        case 10: COPY(); TRANS(0x20); TAIL(); return result;
-        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
-        default: return false;
-        }
-#undef COPY
-#undef TRANS
-#undef TAIL
-    }
-
-    static unsigned char GetRange(unsigned char c) {
-        // Referring to DFA of http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
-        // With new mapping 1 -> 0x10, 7 -> 0x20, 9 -> 0x40, such that AND operation can test multiple types.
-        static const unsigned char type[] = {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
-            0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
-            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-            8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-            10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
-        };
-        return type[c];
-    }
-
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        typename InputByteStream::Ch c = Take(is);
-        if (static_cast<unsigned char>(c) != 0xEFu) return c;
-        c = is.Take();
-        if (static_cast<unsigned char>(c) != 0xBBu) return c;
-        c = is.Take();
-        if (static_cast<unsigned char>(c) != 0xBFu) return c;
-        c = is.Take();
-        return c;
-    }
-
-    template <typename InputByteStream>
-    static Ch Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        return static_cast<Ch>(is.Take());
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xEFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xBBu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xBFu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, Ch c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(c));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF16
-
-//! UTF-16 encoding.
-/*! http://en.wikipedia.org/wiki/UTF-16
-    http://tools.ietf.org/html/rfc2781
-    \tparam CharType Type for storing 16-bit UTF-16 data. Default is wchar_t. C++11 may use char16_t instead.
-    \note implements Encoding concept
-
-    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
-    For streaming, use UTF16LE and UTF16BE, which handle endianness.
-*/
-template<typename CharType = wchar_t>
-struct UTF16 {
-    typedef CharType Ch;
-    RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 2);
-
-    enum { supportUnicode = 1 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-        if (codepoint <= 0xFFFF) {
-            RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
-            os.Put(static_cast<typename OutputStream::Ch>(codepoint));
-        }
-        else {
-            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            unsigned v = codepoint - 0x10000;
-            os.Put(static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
-            os.Put((v & 0x3FF) | 0xDC00);
-        }
-    }
-
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-        if (codepoint <= 0xFFFF) {
-            RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
-            PutUnsafe(os, static_cast<typename OutputStream::Ch>(codepoint));
-        }
-        else {
-            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            unsigned v = codepoint - 0x10000;
-            PutUnsafe(os, static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
-            PutUnsafe(os, (v & 0x3FF) | 0xDC00);
-        }
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
-        typename InputStream::Ch c = is.Take();
-        if (c < 0xD800 || c > 0xDFFF) {
-            *codepoint = static_cast<unsigned>(c);
-            return true;
-        }
-        else if (c <= 0xDBFF) {
-            *codepoint = (static_cast<unsigned>(c) & 0x3FF) << 10;
-            c = is.Take();
-            *codepoint |= (static_cast<unsigned>(c) & 0x3FF);
-            *codepoint += 0x10000;
-            return c >= 0xDC00 && c <= 0xDFFF;
-        }
-        return false;
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-        typename InputStream::Ch c;
-        os.Put(static_cast<typename OutputStream::Ch>(c = is.Take()));
-        if (c < 0xD800 || c > 0xDFFF)
-            return true;
-        else if (c <= 0xDBFF) {
-            os.Put(c = is.Take());
-            return c >= 0xDC00 && c <= 0xDFFF;
-        }
-        return false;
-    }
-};
-
-//! UTF-16 little endian encoding.
-template<typename CharType = wchar_t>
-struct UTF16LE : UTF16<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<uint8_t>(is.Take());
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
-    }
-};
-
-//! UTF-16 big endian encoding.
-template<typename CharType = wchar_t>
-struct UTF16BE : UTF16<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        c |= static_cast<uint8_t>(is.Take());
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF32
-
-//! UTF-32 encoding. 
-/*! http://en.wikipedia.org/wiki/UTF-32
-    \tparam CharType Type for storing 32-bit UTF-32 data. Default is unsigned. C++11 may use char32_t instead.
-    \note implements Encoding concept
-
-    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
-    For streaming, use UTF32LE and UTF32BE, which handle endianness.
-*/
-template<typename CharType = unsigned>
-struct UTF32 {
-    typedef CharType Ch;
-    RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 4);
-
-    enum { supportUnicode = 1 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
-        RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-        os.Put(codepoint);
-    }
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
-        RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-        PutUnsafe(os, codepoint);
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
-        Ch c = is.Take();
-        *codepoint = c;
-        return c <= 0x10FFFF;
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
-        Ch c;
-        os.Put(c = is.Take());
-        return c <= 0x10FFFF;
-    }
-};
-
-//! UTF-32 little endian enocoding.
-template<typename CharType = unsigned>
-struct UTF32LE : UTF32<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c;
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<uint8_t>(is.Take());
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
-    }
-};
-
-//! UTF-32 big endian encoding.
-template<typename CharType = unsigned>
-struct UTF32BE : UTF32<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c; 
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take()));
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// ASCII
-
-//! ASCII encoding.
-/*! http://en.wikipedia.org/wiki/ASCII
-    \tparam CharType Code unit for storing 7-bit ASCII data. Default is char.
-    \note implements Encoding concept
-*/
-template<typename CharType = char>
-struct ASCII {
-    typedef CharType Ch;
-
-    enum { supportUnicode = 0 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_ASSERT(codepoint <= 0x7F);
-        os.Put(static_cast<Ch>(codepoint & 0xFF));
-    }
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_ASSERT(codepoint <= 0x7F);
-        PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-        uint8_t c = static_cast<uint8_t>(is.Take());
-        *codepoint = c;
-        return c <= 0X7F;
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-        uint8_t c = static_cast<uint8_t>(is.Take());
-        os.Put(static_cast<typename OutputStream::Ch>(c));
-        return c <= 0x7F;
-    }
-
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        uint8_t c = static_cast<uint8_t>(Take(is));
-        return static_cast<Ch>(c);
-    }
-
-    template <typename InputByteStream>
-    static Ch Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        return static_cast<Ch>(is.Take());
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        (void)os;
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, Ch c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(c));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// AutoUTF
-
-//! Runtime-specified UTF encoding type of a stream.
-enum UTFType {
-    kUTF8 = 0,      //!< UTF-8.
-    kUTF16LE = 1,   //!< UTF-16 little endian.
-    kUTF16BE = 2,   //!< UTF-16 big endian.
-    kUTF32LE = 3,   //!< UTF-32 little endian.
-    kUTF32BE = 4    //!< UTF-32 big endian.
-};
-
-//! Dynamically select encoding according to stream's runtime-specified UTF encoding type.
-/*! \note This class can be used with AutoUTFInputtStream and AutoUTFOutputStream, which provides GetType().
-*/
-template<typename CharType>
-struct AutoUTF {
-    typedef CharType Ch;
-
-    enum { supportUnicode = 1 };
-
-#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
-
-    template<typename OutputStream>
-    RAPIDJSON_FORCEINLINE static void Encode(OutputStream& os, unsigned codepoint) {
-        typedef void (*EncodeFunc)(OutputStream&, unsigned);
-        static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Encode) };
-        (*f[os.GetType()])(os, codepoint);
-    }
-
-    template<typename OutputStream>
-    RAPIDJSON_FORCEINLINE static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        typedef void (*EncodeFunc)(OutputStream&, unsigned);
-        static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(EncodeUnsafe) };
-        (*f[os.GetType()])(os, codepoint);
-    }
-
-    template <typename InputStream>
-    RAPIDJSON_FORCEINLINE static bool Decode(InputStream& is, unsigned* codepoint) {
-        typedef bool (*DecodeFunc)(InputStream&, unsigned*);
-        static const DecodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Decode) };
-        return (*f[is.GetType()])(is, codepoint);
-    }
-
-    template <typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
-        typedef bool (*ValidateFunc)(InputStream&, OutputStream&);
-        static const ValidateFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Validate) };
-        return (*f[is.GetType()])(is, os);
-    }
-
-#undef RAPIDJSON_ENCODINGS_FUNC
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Transcoder
-
-//! Encoding conversion.
-template<typename SourceEncoding, typename TargetEncoding>
-struct Transcoder {
-    //! Take one Unicode codepoint from source encoding, convert it to target encoding and put it to the output stream.
-    template<typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
-        unsigned codepoint;
-        if (!SourceEncoding::Decode(is, &codepoint))
-            return false;
-        TargetEncoding::Encode(os, codepoint);
-        return true;
-    }
-
-    template<typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
-        unsigned codepoint;
-        if (!SourceEncoding::Decode(is, &codepoint))
-            return false;
-        TargetEncoding::EncodeUnsafe(os, codepoint);
-        return true;
-    }
-
-    //! Validate one Unicode codepoint from an encoded stream.
-    template<typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
-        return Transcode(is, os);   // Since source/target encoding is different, must transcode.
-    }
-};
-
-// Forward declaration.
-template<typename Stream>
-inline void PutUnsafe(Stream& stream, typename Stream::Ch c);
-
-//! Specialization of Transcoder with same source and target encoding.
-template<typename Encoding>
-struct Transcoder<Encoding, Encoding> {
-    template<typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
-        os.Put(is.Take());  // Just copy one code unit. This semantic is different from primary template class.
-        return true;
-    }
-    
-    template<typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
-        PutUnsafe(os, is.Take());  // Just copy one code unit. This semantic is different from primary template class.
-        return true;
-    }
-    
-    template<typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
-        return Encoding::Validate(is, os);  // source/target encoding are the same
-    }
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__GNUC__) || defined(_MSC_VER)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_ENCODINGS_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/error/en.h b/sql-odbc/libraries/rapidjson/include/rapidjson/error/en.h
deleted file mode 100644
index 2db838bff2..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/error/en.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ERROR_EN_H_
-#define RAPIDJSON_ERROR_EN_H_
-
-#include "error.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(switch-enum)
-RAPIDJSON_DIAG_OFF(covered-switch-default)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Maps error code of parsing into error message.
-/*!
-    \ingroup RAPIDJSON_ERRORS
-    \param parseErrorCode Error code obtained in parsing.
-    \return the error message.
-    \note User can make a copy of this function for localization.
-        Using switch-case is safer for future modification of error codes.
-*/
-inline const RAPIDJSON_ERROR_CHARTYPE* GetParseError_En(ParseErrorCode parseErrorCode) {
-    switch (parseErrorCode) {
-        case kParseErrorNone:                           return RAPIDJSON_ERROR_STRING("No error.");
-
-        case kParseErrorDocumentEmpty:                  return RAPIDJSON_ERROR_STRING("The document is empty.");
-        case kParseErrorDocumentRootNotSingular:        return RAPIDJSON_ERROR_STRING("The document root must not be followed by other values.");
-    
-        case kParseErrorValueInvalid:                   return RAPIDJSON_ERROR_STRING("Invalid value.");
-    
-        case kParseErrorObjectMissName:                 return RAPIDJSON_ERROR_STRING("Missing a name for object member.");
-        case kParseErrorObjectMissColon:                return RAPIDJSON_ERROR_STRING("Missing a colon after a name of object member.");
-        case kParseErrorObjectMissCommaOrCurlyBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or '}' after an object member.");
-    
-        case kParseErrorArrayMissCommaOrSquareBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or ']' after an array element.");
-
-        case kParseErrorStringUnicodeEscapeInvalidHex:  return RAPIDJSON_ERROR_STRING("Incorrect hex digit after \\u escape in string.");
-        case kParseErrorStringUnicodeSurrogateInvalid:  return RAPIDJSON_ERROR_STRING("The surrogate pair in string is invalid.");
-        case kParseErrorStringEscapeInvalid:            return RAPIDJSON_ERROR_STRING("Invalid escape character in string.");
-        case kParseErrorStringMissQuotationMark:        return RAPIDJSON_ERROR_STRING("Missing a closing quotation mark in string.");
-        case kParseErrorStringInvalidEncoding:          return RAPIDJSON_ERROR_STRING("Invalid encoding in string.");
-
-        case kParseErrorNumberTooBig:                   return RAPIDJSON_ERROR_STRING("Number too big to be stored in double.");
-        case kParseErrorNumberMissFraction:             return RAPIDJSON_ERROR_STRING("Miss fraction part in number.");
-        case kParseErrorNumberMissExponent:             return RAPIDJSON_ERROR_STRING("Miss exponent in number.");
-
-        case kParseErrorTermination:                    return RAPIDJSON_ERROR_STRING("Terminate parsing due to Handler error.");
-        case kParseErrorUnspecificSyntaxError:          return RAPIDJSON_ERROR_STRING("Unspecific syntax error.");
-
-        default:                                        return RAPIDJSON_ERROR_STRING("Unknown error.");
-    }
-}
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_ERROR_EN_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/error/error.h b/sql-odbc/libraries/rapidjson/include/rapidjson/error/error.h
deleted file mode 100644
index 95cb31a72f..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/error/error.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ERROR_ERROR_H_
-#define RAPIDJSON_ERROR_ERROR_H_
-
-#include "../rapidjson.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-/*! \file error.h */
-
-/*! \defgroup RAPIDJSON_ERRORS RapidJSON error handling */
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ERROR_CHARTYPE
-
-//! Character type of error messages.
-/*! \ingroup RAPIDJSON_ERRORS
-    The default character type is \c char.
-    On Windows, user can define this macro as \c TCHAR for supporting both
-    unicode/non-unicode settings.
-*/
-#ifndef RAPIDJSON_ERROR_CHARTYPE
-#define RAPIDJSON_ERROR_CHARTYPE char
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ERROR_STRING
-
-//! Macro for converting string literial to \ref RAPIDJSON_ERROR_CHARTYPE[].
-/*! \ingroup RAPIDJSON_ERRORS
-    By default this conversion macro does nothing.
-    On Windows, user can define this macro as \c _T(x) for supporting both
-    unicode/non-unicode settings.
-*/
-#ifndef RAPIDJSON_ERROR_STRING
-#define RAPIDJSON_ERROR_STRING(x) x
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// ParseErrorCode
-
-//! Error code of parsing.
-/*! \ingroup RAPIDJSON_ERRORS
-    \see GenericReader::Parse, GenericReader::GetParseErrorCode
-*/
-enum ParseErrorCode {
-    kParseErrorNone = 0,                        //!< No error.
-
-    kParseErrorDocumentEmpty,                   //!< The document is empty.
-    kParseErrorDocumentRootNotSingular,         //!< The document root must not follow by other values.
-
-    kParseErrorValueInvalid,                    //!< Invalid value.
-
-    kParseErrorObjectMissName,                  //!< Missing a name for object member.
-    kParseErrorObjectMissColon,                 //!< Missing a colon after a name of object member.
-    kParseErrorObjectMissCommaOrCurlyBracket,   //!< Missing a comma or '}' after an object member.
-
-    kParseErrorArrayMissCommaOrSquareBracket,   //!< Missing a comma or ']' after an array element.
-
-    kParseErrorStringUnicodeEscapeInvalidHex,   //!< Incorrect hex digit after \\u escape in string.
-    kParseErrorStringUnicodeSurrogateInvalid,   //!< The surrogate pair in string is invalid.
-    kParseErrorStringEscapeInvalid,             //!< Invalid escape character in string.
-    kParseErrorStringMissQuotationMark,         //!< Missing a closing quotation mark in string.
-    kParseErrorStringInvalidEncoding,           //!< Invalid encoding in string.
-
-    kParseErrorNumberTooBig,                    //!< Number too big to be stored in double.
-    kParseErrorNumberMissFraction,              //!< Miss fraction part in number.
-    kParseErrorNumberMissExponent,              //!< Miss exponent in number.
-
-    kParseErrorTermination,                     //!< Parsing was terminated.
-    kParseErrorUnspecificSyntaxError            //!< Unspecific syntax error.
-};
-
-//! Result of parsing (wraps ParseErrorCode)
-/*!
-    \ingroup RAPIDJSON_ERRORS
-    \code
-        Document doc;
-        ParseResult ok = doc.Parse("[42]");
-        if (!ok) {
-            fprintf(stderr, "JSON parse error: %s (%u)",
-                    GetParseError_En(ok.Code()), ok.Offset());
-            exit(EXIT_FAILURE);
-        }
-    \endcode
-    \see GenericReader::Parse, GenericDocument::Parse
-*/
-struct ParseResult {
-public:
-    //! Default constructor, no error.
-    ParseResult() : code_(kParseErrorNone), offset_(0) {}
-    //! Constructor to set an error.
-    ParseResult(ParseErrorCode code, size_t offset) : code_(code), offset_(offset) {}
-
-    //! Get the error code.
-    ParseErrorCode Code() const { return code_; }
-    //! Get the error offset, if \ref IsError(), 0 otherwise.
-    size_t Offset() const { return offset_; }
-
-    //! Conversion to \c bool, returns \c true, iff !\ref IsError().
-    operator bool() const { return !IsError(); }
-    //! Whether the result is an error.
-    bool IsError() const { return code_ != kParseErrorNone; }
-
-    bool operator==(const ParseResult& that) const { return code_ == that.code_; }
-    bool operator==(ParseErrorCode code) const { return code_ == code; }
-    friend bool operator==(ParseErrorCode code, const ParseResult & err) { return code == err.code_; }
-
-    //! Reset error code.
-    void Clear() { Set(kParseErrorNone); }
-    //! Update error code and offset.
-    void Set(ParseErrorCode code, size_t offset = 0) { code_ = code; offset_ = offset; }
-
-private:
-    ParseErrorCode code_;
-    size_t offset_;
-};
-
-//! Function pointer type of GetParseError().
-/*! \ingroup RAPIDJSON_ERRORS
-
-    This is the prototype for \c GetParseError_X(), where \c X is a locale.
-    User can dynamically change locale in runtime, e.g.:
-\code
-    GetParseErrorFunc GetParseError = GetParseError_En; // or whatever
-    const RAPIDJSON_ERROR_CHARTYPE* s = GetParseError(document.GetParseErrorCode());
-\endcode
-*/
-typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetParseErrorFunc)(ParseErrorCode);
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_ERROR_ERROR_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/filereadstream.h b/sql-odbc/libraries/rapidjson/include/rapidjson/filereadstream.h
deleted file mode 100644
index b56ea13b34..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/filereadstream.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_FILEREADSTREAM_H_
-#define RAPIDJSON_FILEREADSTREAM_H_
-
-#include "stream.h"
-#include <cstdio>
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-RAPIDJSON_DIAG_OFF(unreachable-code)
-RAPIDJSON_DIAG_OFF(missing-noreturn)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! File byte stream for input using fread().
-/*!
-    \note implements Stream concept
-*/
-class FileReadStream {
-public:
-    typedef char Ch;    //!< Character type (byte).
-
-    //! Constructor.
-    /*!
-        \param fp File pointer opened for read.
-        \param buffer user-supplied buffer.
-        \param bufferSize size of buffer in bytes. Must >=4 bytes.
-    */
-    FileReadStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
-        RAPIDJSON_ASSERT(fp_ != 0);
-        RAPIDJSON_ASSERT(bufferSize >= 4);
-        Read();
-    }
-
-    Ch Peek() const { return *current_; }
-    Ch Take() { Ch c = *current_; Read(); return c; }
-    size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); }
-
-    // Not implemented
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); } 
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-    // For encoding detection only.
-    const Ch* Peek4() const {
-        return (current_ + 4 <= bufferLast_) ? current_ : 0;
-    }
-
-private:
-    void Read() {
-        if (current_ < bufferLast_)
-            ++current_;
-        else if (!eof_) {
-            count_ += readCount_;
-            readCount_ = fread(buffer_, 1, bufferSize_, fp_);
-            bufferLast_ = buffer_ + readCount_ - 1;
-            current_ = buffer_;
-
-            if (readCount_ < bufferSize_) {
-                buffer_[readCount_] = '\0';
-                ++bufferLast_;
-                eof_ = true;
-            }
-        }
-    }
-
-    std::FILE* fp_;
-    Ch *buffer_;
-    size_t bufferSize_;
-    Ch *bufferLast_;
-    Ch *current_;
-    size_t readCount_;
-    size_t count_;  //!< Number of characters read
-    bool eof_;
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_FILESTREAM_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/filewritestream.h b/sql-odbc/libraries/rapidjson/include/rapidjson/filewritestream.h
deleted file mode 100644
index 6378dd60ed..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/filewritestream.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_FILEWRITESTREAM_H_
-#define RAPIDJSON_FILEWRITESTREAM_H_
-
-#include "stream.h"
-#include <cstdio>
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(unreachable-code)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Wrapper of C file stream for input using fread().
-/*!
-    \note implements Stream concept
-*/
-class FileWriteStream {
-public:
-    typedef char Ch;    //!< Character type. Only support char.
-
-    FileWriteStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { 
-        RAPIDJSON_ASSERT(fp_ != 0);
-    }
-
-    void Put(char c) { 
-        if (current_ >= bufferEnd_)
-            Flush();
-
-        *current_++ = c;
-    }
-
-    void PutN(char c, size_t n) {
-        size_t avail = static_cast<size_t>(bufferEnd_ - current_);
-        while (n > avail) {
-            std::memset(current_, c, avail);
-            current_ += avail;
-            Flush();
-            n -= avail;
-            avail = static_cast<size_t>(bufferEnd_ - current_);
-        }
-
-        if (n > 0) {
-            std::memset(current_, c, n);
-            current_ += n;
-        }
-    }
-
-    void Flush() {
-        if (current_ != buffer_) {
-            size_t result = fwrite(buffer_, 1, static_cast<size_t>(current_ - buffer_), fp_);
-            if (result < static_cast<size_t>(current_ - buffer_)) {
-                // failure deliberately ignored at this time
-                // added to avoid warn_unused_result build errors
-            }
-            current_ = buffer_;
-        }
-    }
-
-    // Not implemented
-    char Peek() const { RAPIDJSON_ASSERT(false); return 0; }
-    char Take() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
-    char* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(char*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    FileWriteStream(const FileWriteStream&);
-    FileWriteStream& operator=(const FileWriteStream&);
-
-    std::FILE* fp_;
-    char *buffer_;
-    char *bufferEnd_;
-    char *current_;
-};
-
-//! Implement specialized version of PutN() with memset() for better performance.
-template<>
-inline void PutN(FileWriteStream& stream, char c, size_t n) {
-    stream.PutN(c, n);
-}
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_FILESTREAM_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/fwd.h b/sql-odbc/libraries/rapidjson/include/rapidjson/fwd.h
deleted file mode 100644
index e8104e841b..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/fwd.h
+++ /dev/null
@@ -1,151 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_FWD_H_
-#define RAPIDJSON_FWD_H_
-
-#include "rapidjson.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-// encodings.h
-
-template<typename CharType> struct UTF8;
-template<typename CharType> struct UTF16;
-template<typename CharType> struct UTF16BE;
-template<typename CharType> struct UTF16LE;
-template<typename CharType> struct UTF32;
-template<typename CharType> struct UTF32BE;
-template<typename CharType> struct UTF32LE;
-template<typename CharType> struct ASCII;
-template<typename CharType> struct AutoUTF;
-
-template<typename SourceEncoding, typename TargetEncoding>
-struct Transcoder;
-
-// allocators.h
-
-class CrtAllocator;
-
-template <typename BaseAllocator>
-class MemoryPoolAllocator;
-
-// stream.h
-
-template <typename Encoding>
-struct GenericStringStream;
-
-typedef GenericStringStream<UTF8<char> > StringStream;
-
-template <typename Encoding>
-struct GenericInsituStringStream;
-
-typedef GenericInsituStringStream<UTF8<char> > InsituStringStream;
-
-// stringbuffer.h
-
-template <typename Encoding, typename Allocator>
-class GenericStringBuffer;
-
-typedef GenericStringBuffer<UTF8<char>, CrtAllocator> StringBuffer;
-
-// filereadstream.h
-
-class FileReadStream;
-
-// filewritestream.h
-
-class FileWriteStream;
-
-// memorybuffer.h
-
-template <typename Allocator>
-struct GenericMemoryBuffer;
-
-typedef GenericMemoryBuffer<CrtAllocator> MemoryBuffer;
-
-// memorystream.h
-
-struct MemoryStream;
-
-// reader.h
-
-template<typename Encoding, typename Derived>
-struct BaseReaderHandler;
-
-template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator>
-class GenericReader;
-
-typedef GenericReader<UTF8<char>, UTF8<char>, CrtAllocator> Reader;
-
-// writer.h
-
-template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
-class Writer;
-
-// prettywriter.h
-
-template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
-class PrettyWriter;
-
-// document.h
-
-template <typename Encoding, typename Allocator> 
-struct GenericMember;
-
-template <bool Const, typename Encoding, typename Allocator>
-class GenericMemberIterator;
-
-template<typename CharType>
-struct GenericStringRef;
-
-template <typename Encoding, typename Allocator> 
-class GenericValue;
-
-typedef GenericValue<UTF8<char>, MemoryPoolAllocator<CrtAllocator> > Value;
-
-template <typename Encoding, typename Allocator, typename StackAllocator>
-class GenericDocument;
-
-typedef GenericDocument<UTF8<char>, MemoryPoolAllocator<CrtAllocator>, CrtAllocator> Document;
-
-// pointer.h
-
-template <typename ValueType, typename Allocator>
-class GenericPointer;
-
-typedef GenericPointer<Value, CrtAllocator> Pointer;
-
-// schema.h
-
-template <typename SchemaDocumentType>
-class IGenericRemoteSchemaDocumentProvider;
-
-template <typename ValueT, typename Allocator>
-class GenericSchemaDocument;
-
-typedef GenericSchemaDocument<Value, CrtAllocator> SchemaDocument;
-typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
-
-template <
-    typename SchemaDocumentType,
-    typename OutputHandler,
-    typename StateAllocator>
-class GenericSchemaValidator;
-
-typedef GenericSchemaValidator<SchemaDocument, BaseReaderHandler<UTF8<char>, void>, CrtAllocator> SchemaValidator;
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_RAPIDJSONFWD_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/biginteger.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/biginteger.h
deleted file mode 100644
index 9d3e88c998..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/biginteger.h
+++ /dev/null
@@ -1,290 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_BIGINTEGER_H_
-#define RAPIDJSON_BIGINTEGER_H_
-
-#include "../rapidjson.h"
-
-#if defined(_MSC_VER) && defined(_M_AMD64)
-#include <intrin.h> // for _umul128
-#pragma intrinsic(_umul128)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-class BigInteger {
-public:
-    typedef uint64_t Type;
-
-    BigInteger(const BigInteger& rhs) : count_(rhs.count_) {
-        std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
-    }
-
-    explicit BigInteger(uint64_t u) : count_(1) {
-        digits_[0] = u;
-    }
-
-    BigInteger(const char* decimals, size_t length) : count_(1) {
-        RAPIDJSON_ASSERT(length > 0);
-        digits_[0] = 0;
-        size_t i = 0;
-        const size_t kMaxDigitPerIteration = 19;  // 2^64 = 18446744073709551616 > 10^19
-        while (length >= kMaxDigitPerIteration) {
-            AppendDecimal64(decimals + i, decimals + i + kMaxDigitPerIteration);
-            length -= kMaxDigitPerIteration;
-            i += kMaxDigitPerIteration;
-        }
-
-        if (length > 0)
-            AppendDecimal64(decimals + i, decimals + i + length);
-    }
-    
-    BigInteger& operator=(const BigInteger &rhs)
-    {
-        if (this != &rhs) {
-            count_ = rhs.count_;
-            std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
-        }
-        return *this;
-    }
-    
-    BigInteger& operator=(uint64_t u) {
-        digits_[0] = u;            
-        count_ = 1;
-        return *this;
-    }
-
-    BigInteger& operator+=(uint64_t u) {
-        Type backup = digits_[0];
-        digits_[0] += u;
-        for (size_t i = 0; i < count_ - 1; i++) {
-            if (digits_[i] >= backup)
-                return *this; // no carry
-            backup = digits_[i + 1];
-            digits_[i + 1] += 1;
-        }
-
-        // Last carry
-        if (digits_[count_ - 1] < backup)
-            PushBack(1);
-
-        return *this;
-    }
-
-    BigInteger& operator*=(uint64_t u) {
-        if (u == 0) return *this = 0;
-        if (u == 1) return *this;
-        if (*this == 1) return *this = u;
-
-        uint64_t k = 0;
-        for (size_t i = 0; i < count_; i++) {
-            uint64_t hi;
-            digits_[i] = MulAdd64(digits_[i], u, k, &hi);
-            k = hi;
-        }
-        
-        if (k > 0)
-            PushBack(k);
-
-        return *this;
-    }
-
-    BigInteger& operator*=(uint32_t u) {
-        if (u == 0) return *this = 0;
-        if (u == 1) return *this;
-        if (*this == 1) return *this = u;
-
-        uint64_t k = 0;
-        for (size_t i = 0; i < count_; i++) {
-            const uint64_t c = digits_[i] >> 32;
-            const uint64_t d = digits_[i] & 0xFFFFFFFF;
-            const uint64_t uc = u * c;
-            const uint64_t ud = u * d;
-            const uint64_t p0 = ud + k;
-            const uint64_t p1 = uc + (p0 >> 32);
-            digits_[i] = (p0 & 0xFFFFFFFF) | (p1 << 32);
-            k = p1 >> 32;
-        }
-        
-        if (k > 0)
-            PushBack(k);
-
-        return *this;
-    }
-
-    BigInteger& operator<<=(size_t shift) {
-        if (IsZero() || shift == 0) return *this;
-
-        size_t offset = shift / kTypeBit;
-        size_t interShift = shift % kTypeBit;
-        RAPIDJSON_ASSERT(count_ + offset <= kCapacity);
-
-        if (interShift == 0) {
-            std::memmove(&digits_[count_ - 1 + offset], &digits_[count_ - 1], count_ * sizeof(Type));
-            count_ += offset;
-        }
-        else {
-            digits_[count_] = 0;
-            for (size_t i = count_; i > 0; i--)
-                digits_[i + offset] = (digits_[i] << interShift) | (digits_[i - 1] >> (kTypeBit - interShift));
-            digits_[offset] = digits_[0] << interShift;
-            count_ += offset;
-            if (digits_[count_])
-                count_++;
-        }
-
-        std::memset(digits_, 0, offset * sizeof(Type));
-
-        return *this;
-    }
-
-    bool operator==(const BigInteger& rhs) const {
-        return count_ == rhs.count_ && std::memcmp(digits_, rhs.digits_, count_ * sizeof(Type)) == 0;
-    }
-
-    bool operator==(const Type rhs) const {
-        return count_ == 1 && digits_[0] == rhs;
-    }
-
-    BigInteger& MultiplyPow5(unsigned exp) {
-        static const uint32_t kPow5[12] = {
-            5,
-            5 * 5,
-            5 * 5 * 5,
-            5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5
-        };
-        if (exp == 0) return *this;
-        for (; exp >= 27; exp -= 27) *this *= RAPIDJSON_UINT64_C2(0X6765C793, 0XFA10079D); // 5^27
-        for (; exp >= 13; exp -= 13) *this *= static_cast<uint32_t>(1220703125u); // 5^13
-        if (exp > 0)                 *this *= kPow5[exp - 1];
-        return *this;
-    }
-
-    // Compute absolute difference of this and rhs.
-    // Assume this != rhs
-    bool Difference(const BigInteger& rhs, BigInteger* out) const {
-        int cmp = Compare(rhs);
-        RAPIDJSON_ASSERT(cmp != 0);
-        const BigInteger *a, *b;  // Makes a > b
-        bool ret;
-        if (cmp < 0) { a = &rhs; b = this; ret = true; }
-        else         { a = this; b = &rhs; ret = false; }
-
-        Type borrow = 0;
-        for (size_t i = 0; i < a->count_; i++) {
-            Type d = a->digits_[i] - borrow;
-            if (i < b->count_)
-                d -= b->digits_[i];
-            borrow = (d > a->digits_[i]) ? 1 : 0;
-            out->digits_[i] = d;
-            if (d != 0)
-                out->count_ = i + 1;
-        }
-
-        return ret;
-    }
-
-    int Compare(const BigInteger& rhs) const {
-        if (count_ != rhs.count_)
-            return count_ < rhs.count_ ? -1 : 1;
-
-        for (size_t i = count_; i-- > 0;)
-            if (digits_[i] != rhs.digits_[i])
-                return digits_[i] < rhs.digits_[i] ? -1 : 1;
-
-        return 0;
-    }
-
-    size_t GetCount() const { return count_; }
-    Type GetDigit(size_t index) const { RAPIDJSON_ASSERT(index < count_); return digits_[index]; }
-    bool IsZero() const { return count_ == 1 && digits_[0] == 0; }
-
-private:
-    void AppendDecimal64(const char* begin, const char* end) {
-        uint64_t u = ParseUint64(begin, end);
-        if (IsZero())
-            *this = u;
-        else {
-            unsigned exp = static_cast<unsigned>(end - begin);
-            (MultiplyPow5(exp) <<= exp) += u;   // *this = *this * 10^exp + u
-        }
-    }
-
-    void PushBack(Type digit) {
-        RAPIDJSON_ASSERT(count_ < kCapacity);
-        digits_[count_++] = digit;
-    }
-
-    static uint64_t ParseUint64(const char* begin, const char* end) {
-        uint64_t r = 0;
-        for (const char* p = begin; p != end; ++p) {
-            RAPIDJSON_ASSERT(*p >= '0' && *p <= '9');
-            r = r * 10u + static_cast<unsigned>(*p - '0');
-        }
-        return r;
-    }
-
-    // Assume a * b + k < 2^128
-    static uint64_t MulAdd64(uint64_t a, uint64_t b, uint64_t k, uint64_t* outHigh) {
-#if defined(_MSC_VER) && defined(_M_AMD64)
-        uint64_t low = _umul128(a, b, outHigh) + k;
-        if (low < k)
-            (*outHigh)++;
-        return low;
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
-        __extension__ typedef unsigned __int128 uint128;
-        uint128 p = static_cast<uint128>(a) * static_cast<uint128>(b);
-        p += k;
-        *outHigh = static_cast<uint64_t>(p >> 64);
-        return static_cast<uint64_t>(p);
-#else
-        const uint64_t a0 = a & 0xFFFFFFFF, a1 = a >> 32, b0 = b & 0xFFFFFFFF, b1 = b >> 32;
-        uint64_t x0 = a0 * b0, x1 = a0 * b1, x2 = a1 * b0, x3 = a1 * b1;
-        x1 += (x0 >> 32); // can't give carry
-        x1 += x2;
-        if (x1 < x2)
-            x3 += (static_cast<uint64_t>(1) << 32);
-        uint64_t lo = (x1 << 32) + (x0 & 0xFFFFFFFF);
-        uint64_t hi = x3 + (x1 >> 32);
-
-        lo += k;
-        if (lo < k)
-            hi++;
-        *outHigh = hi;
-        return lo;
-#endif
-    }
-
-    static const size_t kBitCount = 3328;  // 64bit * 54 > 10^1000
-    static const size_t kCapacity = kBitCount / sizeof(Type);
-    static const size_t kTypeBit = sizeof(Type) * 8;
-
-    Type digits_[kCapacity];
-    size_t count_;
-};
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_BIGINTEGER_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/diyfp.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/diyfp.h
deleted file mode 100644
index c9fefdc613..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/diyfp.h
+++ /dev/null
@@ -1,258 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
-// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
-// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
-
-#ifndef RAPIDJSON_DIYFP_H_
-#define RAPIDJSON_DIYFP_H_
-
-#include "../rapidjson.h"
-
-#if defined(_MSC_VER) && defined(_M_AMD64)
-#include <intrin.h>
-#pragma intrinsic(_BitScanReverse64)
-#pragma intrinsic(_umul128)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-struct DiyFp {
-    DiyFp() : f(), e() {}
-
-    DiyFp(uint64_t fp, int exp) : f(fp), e(exp) {}
-
-    explicit DiyFp(double d) {
-        union {
-            double d;
-            uint64_t u64;
-        } u = { d };
-
-        int biased_e = static_cast<int>((u.u64 & kDpExponentMask) >> kDpSignificandSize);
-        uint64_t significand = (u.u64 & kDpSignificandMask);
-        if (biased_e != 0) {
-            f = significand + kDpHiddenBit;
-            e = biased_e - kDpExponentBias;
-        } 
-        else {
-            f = significand;
-            e = kDpMinExponent + 1;
-        }
-    }
-
-    DiyFp operator-(const DiyFp& rhs) const {
-        return DiyFp(f - rhs.f, e);
-    }
-
-    DiyFp operator*(const DiyFp& rhs) const {
-#if defined(_MSC_VER) && defined(_M_AMD64)
-        uint64_t h;
-        uint64_t l = _umul128(f, rhs.f, &h);
-        if (l & (uint64_t(1) << 63)) // rounding
-            h++;
-        return DiyFp(h, e + rhs.e + 64);
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
-        __extension__ typedef unsigned __int128 uint128;
-        uint128 p = static_cast<uint128>(f) * static_cast<uint128>(rhs.f);
-        uint64_t h = static_cast<uint64_t>(p >> 64);
-        uint64_t l = static_cast<uint64_t>(p);
-        if (l & (uint64_t(1) << 63)) // rounding
-            h++;
-        return DiyFp(h, e + rhs.e + 64);
-#else
-        const uint64_t M32 = 0xFFFFFFFF;
-        const uint64_t a = f >> 32;
-        const uint64_t b = f & M32;
-        const uint64_t c = rhs.f >> 32;
-        const uint64_t d = rhs.f & M32;
-        const uint64_t ac = a * c;
-        const uint64_t bc = b * c;
-        const uint64_t ad = a * d;
-        const uint64_t bd = b * d;
-        uint64_t tmp = (bd >> 32) + (ad & M32) + (bc & M32);
-        tmp += 1U << 31;  /// mult_round
-        return DiyFp(ac + (ad >> 32) + (bc >> 32) + (tmp >> 32), e + rhs.e + 64);
-#endif
-    }
-
-    DiyFp Normalize() const {
-#if defined(_MSC_VER) && defined(_M_AMD64)
-        unsigned long index;
-        _BitScanReverse64(&index, f);
-        return DiyFp(f << (63 - index), e - (63 - index));
-#elif defined(__GNUC__) && __GNUC__ >= 4
-        int s = __builtin_clzll(f);
-        return DiyFp(f << s, e - s);
-#else
-        DiyFp res = *this;
-        while (!(res.f & (static_cast<uint64_t>(1) << 63))) {
-            res.f <<= 1;
-            res.e--;
-        }
-        return res;
-#endif
-    }
-
-    DiyFp NormalizeBoundary() const {
-        DiyFp res = *this;
-        while (!(res.f & (kDpHiddenBit << 1))) {
-            res.f <<= 1;
-            res.e--;
-        }
-        res.f <<= (kDiySignificandSize - kDpSignificandSize - 2);
-        res.e = res.e - (kDiySignificandSize - kDpSignificandSize - 2);
-        return res;
-    }
-
-    void NormalizedBoundaries(DiyFp* minus, DiyFp* plus) const {
-        DiyFp pl = DiyFp((f << 1) + 1, e - 1).NormalizeBoundary();
-        DiyFp mi = (f == kDpHiddenBit) ? DiyFp((f << 2) - 1, e - 2) : DiyFp((f << 1) - 1, e - 1);
-        mi.f <<= mi.e - pl.e;
-        mi.e = pl.e;
-        *plus = pl;
-        *minus = mi;
-    }
-
-    double ToDouble() const {
-        union {
-            double d;
-            uint64_t u64;
-        }u;
-        const uint64_t be = (e == kDpDenormalExponent && (f & kDpHiddenBit) == 0) ? 0 : 
-            static_cast<uint64_t>(e + kDpExponentBias);
-        u.u64 = (f & kDpSignificandMask) | (be << kDpSignificandSize);
-        return u.d;
-    }
-
-    static const int kDiySignificandSize = 64;
-    static const int kDpSignificandSize = 52;
-    static const int kDpExponentBias = 0x3FF + kDpSignificandSize;
-    static const int kDpMaxExponent = 0x7FF - kDpExponentBias;
-    static const int kDpMinExponent = -kDpExponentBias;
-    static const int kDpDenormalExponent = -kDpExponentBias + 1;
-    static const uint64_t kDpExponentMask = RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
-    static const uint64_t kDpSignificandMask = RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
-    static const uint64_t kDpHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
-
-    uint64_t f;
-    int e;
-};
-
-inline DiyFp GetCachedPowerByIndex(size_t index) {
-    // 10^-348, 10^-340, ..., 10^340
-    static const uint64_t kCachedPowers_F[] = {
-        RAPIDJSON_UINT64_C2(0xfa8fd5a0, 0x081c0288), RAPIDJSON_UINT64_C2(0xbaaee17f, 0xa23ebf76),
-        RAPIDJSON_UINT64_C2(0x8b16fb20, 0x3055ac76), RAPIDJSON_UINT64_C2(0xcf42894a, 0x5dce35ea),
-        RAPIDJSON_UINT64_C2(0x9a6bb0aa, 0x55653b2d), RAPIDJSON_UINT64_C2(0xe61acf03, 0x3d1a45df),
-        RAPIDJSON_UINT64_C2(0xab70fe17, 0xc79ac6ca), RAPIDJSON_UINT64_C2(0xff77b1fc, 0xbebcdc4f),
-        RAPIDJSON_UINT64_C2(0xbe5691ef, 0x416bd60c), RAPIDJSON_UINT64_C2(0x8dd01fad, 0x907ffc3c),
-        RAPIDJSON_UINT64_C2(0xd3515c28, 0x31559a83), RAPIDJSON_UINT64_C2(0x9d71ac8f, 0xada6c9b5),
-        RAPIDJSON_UINT64_C2(0xea9c2277, 0x23ee8bcb), RAPIDJSON_UINT64_C2(0xaecc4991, 0x4078536d),
-        RAPIDJSON_UINT64_C2(0x823c1279, 0x5db6ce57), RAPIDJSON_UINT64_C2(0xc2109436, 0x4dfb5637),
-        RAPIDJSON_UINT64_C2(0x9096ea6f, 0x3848984f), RAPIDJSON_UINT64_C2(0xd77485cb, 0x25823ac7),
-        RAPIDJSON_UINT64_C2(0xa086cfcd, 0x97bf97f4), RAPIDJSON_UINT64_C2(0xef340a98, 0x172aace5),
-        RAPIDJSON_UINT64_C2(0xb23867fb, 0x2a35b28e), RAPIDJSON_UINT64_C2(0x84c8d4df, 0xd2c63f3b),
-        RAPIDJSON_UINT64_C2(0xc5dd4427, 0x1ad3cdba), RAPIDJSON_UINT64_C2(0x936b9fce, 0xbb25c996),
-        RAPIDJSON_UINT64_C2(0xdbac6c24, 0x7d62a584), RAPIDJSON_UINT64_C2(0xa3ab6658, 0x0d5fdaf6),
-        RAPIDJSON_UINT64_C2(0xf3e2f893, 0xdec3f126), RAPIDJSON_UINT64_C2(0xb5b5ada8, 0xaaff80b8),
-        RAPIDJSON_UINT64_C2(0x87625f05, 0x6c7c4a8b), RAPIDJSON_UINT64_C2(0xc9bcff60, 0x34c13053),
-        RAPIDJSON_UINT64_C2(0x964e858c, 0x91ba2655), RAPIDJSON_UINT64_C2(0xdff97724, 0x70297ebd),
-        RAPIDJSON_UINT64_C2(0xa6dfbd9f, 0xb8e5b88f), RAPIDJSON_UINT64_C2(0xf8a95fcf, 0x88747d94),
-        RAPIDJSON_UINT64_C2(0xb9447093, 0x8fa89bcf), RAPIDJSON_UINT64_C2(0x8a08f0f8, 0xbf0f156b),
-        RAPIDJSON_UINT64_C2(0xcdb02555, 0x653131b6), RAPIDJSON_UINT64_C2(0x993fe2c6, 0xd07b7fac),
-        RAPIDJSON_UINT64_C2(0xe45c10c4, 0x2a2b3b06), RAPIDJSON_UINT64_C2(0xaa242499, 0x697392d3),
-        RAPIDJSON_UINT64_C2(0xfd87b5f2, 0x8300ca0e), RAPIDJSON_UINT64_C2(0xbce50864, 0x92111aeb),
-        RAPIDJSON_UINT64_C2(0x8cbccc09, 0x6f5088cc), RAPIDJSON_UINT64_C2(0xd1b71758, 0xe219652c),
-        RAPIDJSON_UINT64_C2(0x9c400000, 0x00000000), RAPIDJSON_UINT64_C2(0xe8d4a510, 0x00000000),
-        RAPIDJSON_UINT64_C2(0xad78ebc5, 0xac620000), RAPIDJSON_UINT64_C2(0x813f3978, 0xf8940984),
-        RAPIDJSON_UINT64_C2(0xc097ce7b, 0xc90715b3), RAPIDJSON_UINT64_C2(0x8f7e32ce, 0x7bea5c70),
-        RAPIDJSON_UINT64_C2(0xd5d238a4, 0xabe98068), RAPIDJSON_UINT64_C2(0x9f4f2726, 0x179a2245),
-        RAPIDJSON_UINT64_C2(0xed63a231, 0xd4c4fb27), RAPIDJSON_UINT64_C2(0xb0de6538, 0x8cc8ada8),
-        RAPIDJSON_UINT64_C2(0x83c7088e, 0x1aab65db), RAPIDJSON_UINT64_C2(0xc45d1df9, 0x42711d9a),
-        RAPIDJSON_UINT64_C2(0x924d692c, 0xa61be758), RAPIDJSON_UINT64_C2(0xda01ee64, 0x1a708dea),
-        RAPIDJSON_UINT64_C2(0xa26da399, 0x9aef774a), RAPIDJSON_UINT64_C2(0xf209787b, 0xb47d6b85),
-        RAPIDJSON_UINT64_C2(0xb454e4a1, 0x79dd1877), RAPIDJSON_UINT64_C2(0x865b8692, 0x5b9bc5c2),
-        RAPIDJSON_UINT64_C2(0xc83553c5, 0xc8965d3d), RAPIDJSON_UINT64_C2(0x952ab45c, 0xfa97a0b3),
-        RAPIDJSON_UINT64_C2(0xde469fbd, 0x99a05fe3), RAPIDJSON_UINT64_C2(0xa59bc234, 0xdb398c25),
-        RAPIDJSON_UINT64_C2(0xf6c69a72, 0xa3989f5c), RAPIDJSON_UINT64_C2(0xb7dcbf53, 0x54e9bece),
-        RAPIDJSON_UINT64_C2(0x88fcf317, 0xf22241e2), RAPIDJSON_UINT64_C2(0xcc20ce9b, 0xd35c78a5),
-        RAPIDJSON_UINT64_C2(0x98165af3, 0x7b2153df), RAPIDJSON_UINT64_C2(0xe2a0b5dc, 0x971f303a),
-        RAPIDJSON_UINT64_C2(0xa8d9d153, 0x5ce3b396), RAPIDJSON_UINT64_C2(0xfb9b7cd9, 0xa4a7443c),
-        RAPIDJSON_UINT64_C2(0xbb764c4c, 0xa7a44410), RAPIDJSON_UINT64_C2(0x8bab8eef, 0xb6409c1a),
-        RAPIDJSON_UINT64_C2(0xd01fef10, 0xa657842c), RAPIDJSON_UINT64_C2(0x9b10a4e5, 0xe9913129),
-        RAPIDJSON_UINT64_C2(0xe7109bfb, 0xa19c0c9d), RAPIDJSON_UINT64_C2(0xac2820d9, 0x623bf429),
-        RAPIDJSON_UINT64_C2(0x80444b5e, 0x7aa7cf85), RAPIDJSON_UINT64_C2(0xbf21e440, 0x03acdd2d),
-        RAPIDJSON_UINT64_C2(0x8e679c2f, 0x5e44ff8f), RAPIDJSON_UINT64_C2(0xd433179d, 0x9c8cb841),
-        RAPIDJSON_UINT64_C2(0x9e19db92, 0xb4e31ba9), RAPIDJSON_UINT64_C2(0xeb96bf6e, 0xbadf77d9),
-        RAPIDJSON_UINT64_C2(0xaf87023b, 0x9bf0ee6b)
-    };
-    static const int16_t kCachedPowers_E[] = {
-        -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007,  -980,
-        -954,  -927,  -901,  -874,  -847,  -821,  -794,  -768,  -741,  -715,
-        -688,  -661,  -635,  -608,  -582,  -555,  -529,  -502,  -475,  -449,
-        -422,  -396,  -369,  -343,  -316,  -289,  -263,  -236,  -210,  -183,
-        -157,  -130,  -103,   -77,   -50,   -24,     3,    30,    56,    83,
-        109,   136,   162,   189,   216,   242,   269,   295,   322,   348,
-        375,   402,   428,   455,   481,   508,   534,   561,   588,   614,
-        641,   667,   694,   720,   747,   774,   800,   827,   853,   880,
-        907,   933,   960,   986,  1013,  1039,  1066
-    };
-    return DiyFp(kCachedPowers_F[index], kCachedPowers_E[index]);
-}
-    
-inline DiyFp GetCachedPower(int e, int* K) {
-
-    //int k = static_cast<int>(ceil((-61 - e) * 0.30102999566398114)) + 374;
-    double dk = (-61 - e) * 0.30102999566398114 + 347;  // dk must be positive, so can do ceiling in positive
-    int k = static_cast<int>(dk);
-    if (dk - k > 0.0)
-        k++;
-
-    unsigned index = static_cast<unsigned>((k >> 3) + 1);
-    *K = -(-348 + static_cast<int>(index << 3));    // decimal exponent no need lookup table
-
-    return GetCachedPowerByIndex(index);
-}
-
-inline DiyFp GetCachedPower10(int exp, int *outExp) {
-     unsigned index = (static_cast<unsigned>(exp) + 348u) / 8u;
-     *outExp = -348 + static_cast<int>(index) * 8;
-     return GetCachedPowerByIndex(index);
- }
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_DIYFP_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/dtoa.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/dtoa.h
deleted file mode 100644
index 8d6350e626..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/dtoa.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
-// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
-// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
-
-#ifndef RAPIDJSON_DTOA_
-#define RAPIDJSON_DTOA_
-
-#include "itoa.h" // GetDigitsLut()
-#include "diyfp.h"
-#include "ieee754.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-RAPIDJSON_DIAG_OFF(array-bounds) // some gcc versions generate wrong warnings https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59124
-#endif
-
-inline void GrisuRound(char* buffer, int len, uint64_t delta, uint64_t rest, uint64_t ten_kappa, uint64_t wp_w) {
-    while (rest < wp_w && delta - rest >= ten_kappa &&
-           (rest + ten_kappa < wp_w ||  /// closer
-            wp_w - rest > rest + ten_kappa - wp_w)) {
-        buffer[len - 1]--;
-        rest += ten_kappa;
-    }
-}
-
-inline unsigned CountDecimalDigit32(uint32_t n) {
-    // Simple pure C++ implementation was faster than __builtin_clz version in this situation.
-    if (n < 10) return 1;
-    if (n < 100) return 2;
-    if (n < 1000) return 3;
-    if (n < 10000) return 4;
-    if (n < 100000) return 5;
-    if (n < 1000000) return 6;
-    if (n < 10000000) return 7;
-    if (n < 100000000) return 8;
-    // Will not reach 10 digits in DigitGen()
-    //if (n < 1000000000) return 9;
-    //return 10;
-    return 9;
-}
-
-inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buffer, int* len, int* K) {
-    static const uint32_t kPow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };
-    const DiyFp one(uint64_t(1) << -Mp.e, Mp.e);
-    const DiyFp wp_w = Mp - W;
-    uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
-    uint64_t p2 = Mp.f & (one.f - 1);
-    unsigned kappa = CountDecimalDigit32(p1); // kappa in [0, 9]
-    *len = 0;
-
-    while (kappa > 0) {
-        uint32_t d = 0;
-        switch (kappa) {
-            case  9: d = p1 /  100000000; p1 %=  100000000; break;
-            case  8: d = p1 /   10000000; p1 %=   10000000; break;
-            case  7: d = p1 /    1000000; p1 %=    1000000; break;
-            case  6: d = p1 /     100000; p1 %=     100000; break;
-            case  5: d = p1 /      10000; p1 %=      10000; break;
-            case  4: d = p1 /       1000; p1 %=       1000; break;
-            case  3: d = p1 /        100; p1 %=        100; break;
-            case  2: d = p1 /         10; p1 %=         10; break;
-            case  1: d = p1;              p1 =           0; break;
-            default:;
-        }
-        if (d || *len)
-            buffer[(*len)++] = static_cast<char>('0' + static_cast<char>(d));
-        kappa--;
-        uint64_t tmp = (static_cast<uint64_t>(p1) << -one.e) + p2;
-        if (tmp <= delta) {
-            *K += kappa;
-            GrisuRound(buffer, *len, delta, tmp, static_cast<uint64_t>(kPow10[kappa]) << -one.e, wp_w.f);
-            return;
-        }
-    }
-
-    // kappa = 0
-    for (;;) {
-        p2 *= 10;
-        delta *= 10;
-        char d = static_cast<char>(p2 >> -one.e);
-        if (d || *len)
-            buffer[(*len)++] = static_cast<char>('0' + d);
-        p2 &= one.f - 1;
-        kappa--;
-        if (p2 < delta) {
-            *K += kappa;
-            int index = -static_cast<int>(kappa);
-            GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * (index < 9 ? kPow10[-static_cast<int>(kappa)] : 0));
-            return;
-        }
-    }
-}
-
-inline void Grisu2(double value, char* buffer, int* length, int* K) {
-    const DiyFp v(value);
-    DiyFp w_m, w_p;
-    v.NormalizedBoundaries(&w_m, &w_p);
-
-    const DiyFp c_mk = GetCachedPower(w_p.e, K);
-    const DiyFp W = v.Normalize() * c_mk;
-    DiyFp Wp = w_p * c_mk;
-    DiyFp Wm = w_m * c_mk;
-    Wm.f++;
-    Wp.f--;
-    DigitGen(W, Wp, Wp.f - Wm.f, buffer, length, K);
-}
-
-inline char* WriteExponent(int K, char* buffer) {
-    if (K < 0) {
-        *buffer++ = '-';
-        K = -K;
-    }
-
-    if (K >= 100) {
-        *buffer++ = static_cast<char>('0' + static_cast<char>(K / 100));
-        K %= 100;
-        const char* d = GetDigitsLut() + K * 2;
-        *buffer++ = d[0];
-        *buffer++ = d[1];
-    }
-    else if (K >= 10) {
-        const char* d = GetDigitsLut() + K * 2;
-        *buffer++ = d[0];
-        *buffer++ = d[1];
-    }
-    else
-        *buffer++ = static_cast<char>('0' + static_cast<char>(K));
-
-    return buffer;
-}
-
-inline char* Prettify(char* buffer, int length, int k, int maxDecimalPlaces) {
-    const int kk = length + k;  // 10^(kk-1) <= v < 10^kk
-
-    if (0 <= k && kk <= 21) {
-        // 1234e7 -> 12340000000
-        for (int i = length; i < kk; i++)
-            buffer[i] = '0';
-        buffer[kk] = '.';
-        buffer[kk + 1] = '0';
-        return &buffer[kk + 2];
-    }
-    else if (0 < kk && kk <= 21) {
-        // 1234e-2 -> 12.34
-        std::memmove(&buffer[kk + 1], &buffer[kk], static_cast<size_t>(length - kk));
-        buffer[kk] = '.';
-        if (0 > k + maxDecimalPlaces) {
-            // When maxDecimalPlaces = 2, 1.2345 -> 1.23, 1.102 -> 1.1
-            // Remove extra trailing zeros (at least one) after truncation.
-            for (int i = kk + maxDecimalPlaces; i > kk + 1; i--)
-                if (buffer[i] != '0')
-                    return &buffer[i + 1];
-            return &buffer[kk + 2]; // Reserve one zero
-        }
-        else
-            return &buffer[length + 1];
-    }
-    else if (-6 < kk && kk <= 0) {
-        // 1234e-6 -> 0.001234
-        const int offset = 2 - kk;
-        std::memmove(&buffer[offset], &buffer[0], static_cast<size_t>(length));
-        buffer[0] = '0';
-        buffer[1] = '.';
-        for (int i = 2; i < offset; i++)
-            buffer[i] = '0';
-        if (length - kk > maxDecimalPlaces) {
-            // When maxDecimalPlaces = 2, 0.123 -> 0.12, 0.102 -> 0.1
-            // Remove extra trailing zeros (at least one) after truncation.
-            for (int i = maxDecimalPlaces + 1; i > 2; i--)
-                if (buffer[i] != '0')
-                    return &buffer[i + 1];
-            return &buffer[3]; // Reserve one zero
-        }
-        else
-            return &buffer[length + offset];
-    }
-    else if (kk < -maxDecimalPlaces) {
-        // Truncate to zero
-        buffer[0] = '0';
-        buffer[1] = '.';
-        buffer[2] = '0';
-        return &buffer[3];
-    }
-    else if (length == 1) {
-        // 1e30
-        buffer[1] = 'e';
-        return WriteExponent(kk - 1, &buffer[2]);
-    }
-    else {
-        // 1234e30 -> 1.234e33
-        std::memmove(&buffer[2], &buffer[1], static_cast<size_t>(length - 1));
-        buffer[1] = '.';
-        buffer[length + 1] = 'e';
-        return WriteExponent(kk - 1, &buffer[0 + length + 2]);
-    }
-}
-
-inline char* dtoa(double value, char* buffer, int maxDecimalPlaces = 324) {
-    RAPIDJSON_ASSERT(maxDecimalPlaces >= 1);
-    Double d(value);
-    if (d.IsZero()) {
-        if (d.Sign())
-            *buffer++ = '-';     // -0.0, Issue #289
-        buffer[0] = '0';
-        buffer[1] = '.';
-        buffer[2] = '0';
-        return &buffer[3];
-    }
-    else {
-        if (value < 0) {
-            *buffer++ = '-';
-            value = -value;
-        }
-        int length, K;
-        Grisu2(value, buffer, &length, &K);
-        return Prettify(buffer, length, K, maxDecimalPlaces);
-    }
-}
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_DTOA_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/ieee754.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/ieee754.h
deleted file mode 100644
index 82bb0b99e5..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/ieee754.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_IEEE754_
-#define RAPIDJSON_IEEE754_
-
-#include "../rapidjson.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-class Double {
-public:
-    Double() {}
-    Double(double d) : d_(d) {}
-    Double(uint64_t u) : u_(u) {}
-
-    double Value() const { return d_; }
-    uint64_t Uint64Value() const { return u_; }
-
-    double NextPositiveDouble() const {
-        RAPIDJSON_ASSERT(!Sign());
-        return Double(u_ + 1).Value();
-    }
-
-    bool Sign() const { return (u_ & kSignMask) != 0; }
-    uint64_t Significand() const { return u_ & kSignificandMask; }
-    int Exponent() const { return static_cast<int>(((u_ & kExponentMask) >> kSignificandSize) - kExponentBias); }
-
-    bool IsNan() const { return (u_ & kExponentMask) == kExponentMask && Significand() != 0; }
-    bool IsInf() const { return (u_ & kExponentMask) == kExponentMask && Significand() == 0; }
-    bool IsNanOrInf() const { return (u_ & kExponentMask) == kExponentMask; }
-    bool IsNormal() const { return (u_ & kExponentMask) != 0 || Significand() == 0; }
-    bool IsZero() const { return (u_ & (kExponentMask | kSignificandMask)) == 0; }
-
-    uint64_t IntegerSignificand() const { return IsNormal() ? Significand() | kHiddenBit : Significand(); }
-    int IntegerExponent() const { return (IsNormal() ? Exponent() : kDenormalExponent) - kSignificandSize; }
-    uint64_t ToBias() const { return (u_ & kSignMask) ? ~u_ + 1 : u_ | kSignMask; }
-
-    static unsigned EffectiveSignificandSize(int order) {
-        if (order >= -1021)
-            return 53;
-        else if (order <= -1074)
-            return 0;
-        else
-            return static_cast<unsigned>(order) + 1074;
-    }
-
-private:
-    static const int kSignificandSize = 52;
-    static const int kExponentBias = 0x3FF;
-    static const int kDenormalExponent = 1 - kExponentBias;
-    static const uint64_t kSignMask = RAPIDJSON_UINT64_C2(0x80000000, 0x00000000);
-    static const uint64_t kExponentMask = RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
-    static const uint64_t kSignificandMask = RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
-    static const uint64_t kHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
-
-    union {
-        double d_;
-        uint64_t u_;
-    };
-};
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_IEEE754_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/itoa.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/itoa.h
deleted file mode 100644
index 01a4e7e72d..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/itoa.h
+++ /dev/null
@@ -1,304 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ITOA_
-#define RAPIDJSON_ITOA_
-
-#include "../rapidjson.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-inline const char* GetDigitsLut() {
-    static const char cDigitsLut[200] = {
-        '0','0','0','1','0','2','0','3','0','4','0','5','0','6','0','7','0','8','0','9',
-        '1','0','1','1','1','2','1','3','1','4','1','5','1','6','1','7','1','8','1','9',
-        '2','0','2','1','2','2','2','3','2','4','2','5','2','6','2','7','2','8','2','9',
-        '3','0','3','1','3','2','3','3','3','4','3','5','3','6','3','7','3','8','3','9',
-        '4','0','4','1','4','2','4','3','4','4','4','5','4','6','4','7','4','8','4','9',
-        '5','0','5','1','5','2','5','3','5','4','5','5','5','6','5','7','5','8','5','9',
-        '6','0','6','1','6','2','6','3','6','4','6','5','6','6','6','7','6','8','6','9',
-        '7','0','7','1','7','2','7','3','7','4','7','5','7','6','7','7','7','8','7','9',
-        '8','0','8','1','8','2','8','3','8','4','8','5','8','6','8','7','8','8','8','9',
-        '9','0','9','1','9','2','9','3','9','4','9','5','9','6','9','7','9','8','9','9'
-    };
-    return cDigitsLut;
-}
-
-inline char* u32toa(uint32_t value, char* buffer) {
-    const char* cDigitsLut = GetDigitsLut();
-
-    if (value < 10000) {
-        const uint32_t d1 = (value / 100) << 1;
-        const uint32_t d2 = (value % 100) << 1;
-        
-        if (value >= 1000)
-            *buffer++ = cDigitsLut[d1];
-        if (value >= 100)
-            *buffer++ = cDigitsLut[d1 + 1];
-        if (value >= 10)
-            *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-    }
-    else if (value < 100000000) {
-        // value = bbbbcccc
-        const uint32_t b = value / 10000;
-        const uint32_t c = value % 10000;
-        
-        const uint32_t d1 = (b / 100) << 1;
-        const uint32_t d2 = (b % 100) << 1;
-        
-        const uint32_t d3 = (c / 100) << 1;
-        const uint32_t d4 = (c % 100) << 1;
-        
-        if (value >= 10000000)
-            *buffer++ = cDigitsLut[d1];
-        if (value >= 1000000)
-            *buffer++ = cDigitsLut[d1 + 1];
-        if (value >= 100000)
-            *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-        
-        *buffer++ = cDigitsLut[d3];
-        *buffer++ = cDigitsLut[d3 + 1];
-        *buffer++ = cDigitsLut[d4];
-        *buffer++ = cDigitsLut[d4 + 1];
-    }
-    else {
-        // value = aabbbbcccc in decimal
-        
-        const uint32_t a = value / 100000000; // 1 to 42
-        value %= 100000000;
-        
-        if (a >= 10) {
-            const unsigned i = a << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-        }
-        else
-            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
-
-        const uint32_t b = value / 10000; // 0 to 9999
-        const uint32_t c = value % 10000; // 0 to 9999
-        
-        const uint32_t d1 = (b / 100) << 1;
-        const uint32_t d2 = (b % 100) << 1;
-        
-        const uint32_t d3 = (c / 100) << 1;
-        const uint32_t d4 = (c % 100) << 1;
-        
-        *buffer++ = cDigitsLut[d1];
-        *buffer++ = cDigitsLut[d1 + 1];
-        *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-        *buffer++ = cDigitsLut[d3];
-        *buffer++ = cDigitsLut[d3 + 1];
-        *buffer++ = cDigitsLut[d4];
-        *buffer++ = cDigitsLut[d4 + 1];
-    }
-    return buffer;
-}
-
-inline char* i32toa(int32_t value, char* buffer) {
-    uint32_t u = static_cast<uint32_t>(value);
-    if (value < 0) {
-        *buffer++ = '-';
-        u = ~u + 1;
-    }
-
-    return u32toa(u, buffer);
-}
-
-inline char* u64toa(uint64_t value, char* buffer) {
-    const char* cDigitsLut = GetDigitsLut();
-    const uint64_t  kTen8 = 100000000;
-    const uint64_t  kTen9 = kTen8 * 10;
-    const uint64_t kTen10 = kTen8 * 100;
-    const uint64_t kTen11 = kTen8 * 1000;
-    const uint64_t kTen12 = kTen8 * 10000;
-    const uint64_t kTen13 = kTen8 * 100000;
-    const uint64_t kTen14 = kTen8 * 1000000;
-    const uint64_t kTen15 = kTen8 * 10000000;
-    const uint64_t kTen16 = kTen8 * kTen8;
-    
-    if (value < kTen8) {
-        uint32_t v = static_cast<uint32_t>(value);
-        if (v < 10000) {
-            const uint32_t d1 = (v / 100) << 1;
-            const uint32_t d2 = (v % 100) << 1;
-            
-            if (v >= 1000)
-                *buffer++ = cDigitsLut[d1];
-            if (v >= 100)
-                *buffer++ = cDigitsLut[d1 + 1];
-            if (v >= 10)
-                *buffer++ = cDigitsLut[d2];
-            *buffer++ = cDigitsLut[d2 + 1];
-        }
-        else {
-            // value = bbbbcccc
-            const uint32_t b = v / 10000;
-            const uint32_t c = v % 10000;
-            
-            const uint32_t d1 = (b / 100) << 1;
-            const uint32_t d2 = (b % 100) << 1;
-            
-            const uint32_t d3 = (c / 100) << 1;
-            const uint32_t d4 = (c % 100) << 1;
-            
-            if (value >= 10000000)
-                *buffer++ = cDigitsLut[d1];
-            if (value >= 1000000)
-                *buffer++ = cDigitsLut[d1 + 1];
-            if (value >= 100000)
-                *buffer++ = cDigitsLut[d2];
-            *buffer++ = cDigitsLut[d2 + 1];
-            
-            *buffer++ = cDigitsLut[d3];
-            *buffer++ = cDigitsLut[d3 + 1];
-            *buffer++ = cDigitsLut[d4];
-            *buffer++ = cDigitsLut[d4 + 1];
-        }
-    }
-    else if (value < kTen16) {
-        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
-        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
-        
-        const uint32_t b0 = v0 / 10000;
-        const uint32_t c0 = v0 % 10000;
-        
-        const uint32_t d1 = (b0 / 100) << 1;
-        const uint32_t d2 = (b0 % 100) << 1;
-        
-        const uint32_t d3 = (c0 / 100) << 1;
-        const uint32_t d4 = (c0 % 100) << 1;
-
-        const uint32_t b1 = v1 / 10000;
-        const uint32_t c1 = v1 % 10000;
-        
-        const uint32_t d5 = (b1 / 100) << 1;
-        const uint32_t d6 = (b1 % 100) << 1;
-        
-        const uint32_t d7 = (c1 / 100) << 1;
-        const uint32_t d8 = (c1 % 100) << 1;
-
-        if (value >= kTen15)
-            *buffer++ = cDigitsLut[d1];
-        if (value >= kTen14)
-            *buffer++ = cDigitsLut[d1 + 1];
-        if (value >= kTen13)
-            *buffer++ = cDigitsLut[d2];
-        if (value >= kTen12)
-            *buffer++ = cDigitsLut[d2 + 1];
-        if (value >= kTen11)
-            *buffer++ = cDigitsLut[d3];
-        if (value >= kTen10)
-            *buffer++ = cDigitsLut[d3 + 1];
-        if (value >= kTen9)
-            *buffer++ = cDigitsLut[d4];
-        if (value >= kTen8)
-            *buffer++ = cDigitsLut[d4 + 1];
-        
-        *buffer++ = cDigitsLut[d5];
-        *buffer++ = cDigitsLut[d5 + 1];
-        *buffer++ = cDigitsLut[d6];
-        *buffer++ = cDigitsLut[d6 + 1];
-        *buffer++ = cDigitsLut[d7];
-        *buffer++ = cDigitsLut[d7 + 1];
-        *buffer++ = cDigitsLut[d8];
-        *buffer++ = cDigitsLut[d8 + 1];
-    }
-    else {
-        const uint32_t a = static_cast<uint32_t>(value / kTen16); // 1 to 1844
-        value %= kTen16;
-        
-        if (a < 10)
-            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
-        else if (a < 100) {
-            const uint32_t i = a << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-        }
-        else if (a < 1000) {
-            *buffer++ = static_cast<char>('0' + static_cast<char>(a / 100));
-            
-            const uint32_t i = (a % 100) << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-        }
-        else {
-            const uint32_t i = (a / 100) << 1;
-            const uint32_t j = (a % 100) << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-            *buffer++ = cDigitsLut[j];
-            *buffer++ = cDigitsLut[j + 1];
-        }
-        
-        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
-        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
-        
-        const uint32_t b0 = v0 / 10000;
-        const uint32_t c0 = v0 % 10000;
-        
-        const uint32_t d1 = (b0 / 100) << 1;
-        const uint32_t d2 = (b0 % 100) << 1;
-        
-        const uint32_t d3 = (c0 / 100) << 1;
-        const uint32_t d4 = (c0 % 100) << 1;
-        
-        const uint32_t b1 = v1 / 10000;
-        const uint32_t c1 = v1 % 10000;
-        
-        const uint32_t d5 = (b1 / 100) << 1;
-        const uint32_t d6 = (b1 % 100) << 1;
-        
-        const uint32_t d7 = (c1 / 100) << 1;
-        const uint32_t d8 = (c1 % 100) << 1;
-        
-        *buffer++ = cDigitsLut[d1];
-        *buffer++ = cDigitsLut[d1 + 1];
-        *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-        *buffer++ = cDigitsLut[d3];
-        *buffer++ = cDigitsLut[d3 + 1];
-        *buffer++ = cDigitsLut[d4];
-        *buffer++ = cDigitsLut[d4 + 1];
-        *buffer++ = cDigitsLut[d5];
-        *buffer++ = cDigitsLut[d5 + 1];
-        *buffer++ = cDigitsLut[d6];
-        *buffer++ = cDigitsLut[d6 + 1];
-        *buffer++ = cDigitsLut[d7];
-        *buffer++ = cDigitsLut[d7 + 1];
-        *buffer++ = cDigitsLut[d8];
-        *buffer++ = cDigitsLut[d8 + 1];
-    }
-    
-    return buffer;
-}
-
-inline char* i64toa(int64_t value, char* buffer) {
-    uint64_t u = static_cast<uint64_t>(value);
-    if (value < 0) {
-        *buffer++ = '-';
-        u = ~u + 1;
-    }
-
-    return u64toa(u, buffer);
-}
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_ITOA_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/meta.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/meta.h
deleted file mode 100644
index 5a9aaa4286..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/meta.h
+++ /dev/null
@@ -1,181 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_INTERNAL_META_H_
-#define RAPIDJSON_INTERNAL_META_H_
-
-#include "../rapidjson.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-#if defined(_MSC_VER)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(6334)
-#endif
-
-#if RAPIDJSON_HAS_CXX11_TYPETRAITS
-#include <type_traits>
-#endif
-
-//@cond RAPIDJSON_INTERNAL
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-// Helper to wrap/convert arbitrary types to void, useful for arbitrary type matching
-template <typename T> struct Void { typedef void Type; };
-
-///////////////////////////////////////////////////////////////////////////////
-// BoolType, TrueType, FalseType
-//
-template <bool Cond> struct BoolType {
-    static const bool Value = Cond;
-    typedef BoolType Type;
-};
-typedef BoolType<true> TrueType;
-typedef BoolType<false> FalseType;
-
-
-///////////////////////////////////////////////////////////////////////////////
-// SelectIf, BoolExpr, NotExpr, AndExpr, OrExpr
-//
-
-template <bool C> struct SelectIfImpl { template <typename T1, typename T2> struct Apply { typedef T1 Type; }; };
-template <> struct SelectIfImpl<false> { template <typename T1, typename T2> struct Apply { typedef T2 Type; }; };
-template <bool C, typename T1, typename T2> struct SelectIfCond : SelectIfImpl<C>::template Apply<T1,T2> {};
-template <typename C, typename T1, typename T2> struct SelectIf : SelectIfCond<C::Value, T1, T2> {};
-
-template <bool Cond1, bool Cond2> struct AndExprCond : FalseType {};
-template <> struct AndExprCond<true, true> : TrueType {};
-template <bool Cond1, bool Cond2> struct OrExprCond : TrueType {};
-template <> struct OrExprCond<false, false> : FalseType {};
-
-template <typename C> struct BoolExpr : SelectIf<C,TrueType,FalseType>::Type {};
-template <typename C> struct NotExpr  : SelectIf<C,FalseType,TrueType>::Type {};
-template <typename C1, typename C2> struct AndExpr : AndExprCond<C1::Value, C2::Value>::Type {};
-template <typename C1, typename C2> struct OrExpr  : OrExprCond<C1::Value, C2::Value>::Type {};
-
-
-///////////////////////////////////////////////////////////////////////////////
-// AddConst, MaybeAddConst, RemoveConst
-template <typename T> struct AddConst { typedef const T Type; };
-template <bool Constify, typename T> struct MaybeAddConst : SelectIfCond<Constify, const T, T> {};
-template <typename T> struct RemoveConst { typedef T Type; };
-template <typename T> struct RemoveConst<const T> { typedef T Type; };
-
-
-///////////////////////////////////////////////////////////////////////////////
-// IsSame, IsConst, IsMoreConst, IsPointer
-//
-template <typename T, typename U> struct IsSame : FalseType {};
-template <typename T> struct IsSame<T, T> : TrueType {};
-
-template <typename T> struct IsConst : FalseType {};
-template <typename T> struct IsConst<const T> : TrueType {};
-
-template <typename CT, typename T>
-struct IsMoreConst
-    : AndExpr<IsSame<typename RemoveConst<CT>::Type, typename RemoveConst<T>::Type>,
-              BoolType<IsConst<CT>::Value >= IsConst<T>::Value> >::Type {};
-
-template <typename T> struct IsPointer : FalseType {};
-template <typename T> struct IsPointer<T*> : TrueType {};
-
-///////////////////////////////////////////////////////////////////////////////
-// IsBaseOf
-//
-#if RAPIDJSON_HAS_CXX11_TYPETRAITS
-
-template <typename B, typename D> struct IsBaseOf
-    : BoolType< ::std::is_base_of<B,D>::value> {};
-
-#else // simplified version adopted from Boost
-
-template<typename B, typename D> struct IsBaseOfImpl {
-    RAPIDJSON_STATIC_ASSERT(sizeof(B) != 0);
-    RAPIDJSON_STATIC_ASSERT(sizeof(D) != 0);
-
-    typedef char (&Yes)[1];
-    typedef char (&No) [2];
-
-    template <typename T>
-    static Yes Check(const D*, T);
-    static No  Check(const B*, int);
-
-    struct Host {
-        operator const B*() const;
-        operator const D*();
-    };
-
-    enum { Value = (sizeof(Check(Host(), 0)) == sizeof(Yes)) };
-};
-
-template <typename B, typename D> struct IsBaseOf
-    : OrExpr<IsSame<B, D>, BoolExpr<IsBaseOfImpl<B, D> > >::Type {};
-
-#endif // RAPIDJSON_HAS_CXX11_TYPETRAITS
-
-
-//////////////////////////////////////////////////////////////////////////
-// EnableIf / DisableIf
-//
-template <bool Condition, typename T = void> struct EnableIfCond  { typedef T Type; };
-template <typename T> struct EnableIfCond<false, T> { /* empty */ };
-
-template <bool Condition, typename T = void> struct DisableIfCond { typedef T Type; };
-template <typename T> struct DisableIfCond<true, T> { /* empty */ };
-
-template <typename Condition, typename T = void>
-struct EnableIf : EnableIfCond<Condition::Value, T> {};
-
-template <typename Condition, typename T = void>
-struct DisableIf : DisableIfCond<Condition::Value, T> {};
-
-// SFINAE helpers
-struct SfinaeTag {};
-template <typename T> struct RemoveSfinaeTag;
-template <typename T> struct RemoveSfinaeTag<SfinaeTag&(*)(T)> { typedef T Type; };
-
-#define RAPIDJSON_REMOVEFPTR_(type) \
-    typename ::RAPIDJSON_NAMESPACE::internal::RemoveSfinaeTag \
-        < ::RAPIDJSON_NAMESPACE::internal::SfinaeTag&(*) type>::Type
-
-#define RAPIDJSON_ENABLEIF(cond) \
-    typename ::RAPIDJSON_NAMESPACE::internal::EnableIf \
-        <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
-
-#define RAPIDJSON_DISABLEIF(cond) \
-    typename ::RAPIDJSON_NAMESPACE::internal::DisableIf \
-        <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
-
-#define RAPIDJSON_ENABLEIF_RETURN(cond,returntype) \
-    typename ::RAPIDJSON_NAMESPACE::internal::EnableIf \
-        <RAPIDJSON_REMOVEFPTR_(cond), \
-         RAPIDJSON_REMOVEFPTR_(returntype)>::Type
-
-#define RAPIDJSON_DISABLEIF_RETURN(cond,returntype) \
-    typename ::RAPIDJSON_NAMESPACE::internal::DisableIf \
-        <RAPIDJSON_REMOVEFPTR_(cond), \
-         RAPIDJSON_REMOVEFPTR_(returntype)>::Type
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-//@endcond
-
-#if defined(__GNUC__) || defined(_MSC_VER)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_INTERNAL_META_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/pow10.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/pow10.h
deleted file mode 100644
index 02f475d705..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/pow10.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_POW10_
-#define RAPIDJSON_POW10_
-
-#include "../rapidjson.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-//! Computes integer powers of 10 in double (10.0^n).
-/*! This function uses lookup table for fast and accurate results.
-    \param n non-negative exponent. Must <= 308.
-    \return 10.0^n
-*/
-inline double Pow10(int n) {
-    static const double e[] = { // 1e-0...1e308: 309 * 8 bytes = 2472 bytes
-        1e+0,  
-        1e+1,  1e+2,  1e+3,  1e+4,  1e+5,  1e+6,  1e+7,  1e+8,  1e+9,  1e+10, 1e+11, 1e+12, 1e+13, 1e+14, 1e+15, 1e+16, 1e+17, 1e+18, 1e+19, 1e+20, 
-        1e+21, 1e+22, 1e+23, 1e+24, 1e+25, 1e+26, 1e+27, 1e+28, 1e+29, 1e+30, 1e+31, 1e+32, 1e+33, 1e+34, 1e+35, 1e+36, 1e+37, 1e+38, 1e+39, 1e+40,
-        1e+41, 1e+42, 1e+43, 1e+44, 1e+45, 1e+46, 1e+47, 1e+48, 1e+49, 1e+50, 1e+51, 1e+52, 1e+53, 1e+54, 1e+55, 1e+56, 1e+57, 1e+58, 1e+59, 1e+60,
-        1e+61, 1e+62, 1e+63, 1e+64, 1e+65, 1e+66, 1e+67, 1e+68, 1e+69, 1e+70, 1e+71, 1e+72, 1e+73, 1e+74, 1e+75, 1e+76, 1e+77, 1e+78, 1e+79, 1e+80,
-        1e+81, 1e+82, 1e+83, 1e+84, 1e+85, 1e+86, 1e+87, 1e+88, 1e+89, 1e+90, 1e+91, 1e+92, 1e+93, 1e+94, 1e+95, 1e+96, 1e+97, 1e+98, 1e+99, 1e+100,
-        1e+101,1e+102,1e+103,1e+104,1e+105,1e+106,1e+107,1e+108,1e+109,1e+110,1e+111,1e+112,1e+113,1e+114,1e+115,1e+116,1e+117,1e+118,1e+119,1e+120,
-        1e+121,1e+122,1e+123,1e+124,1e+125,1e+126,1e+127,1e+128,1e+129,1e+130,1e+131,1e+132,1e+133,1e+134,1e+135,1e+136,1e+137,1e+138,1e+139,1e+140,
-        1e+141,1e+142,1e+143,1e+144,1e+145,1e+146,1e+147,1e+148,1e+149,1e+150,1e+151,1e+152,1e+153,1e+154,1e+155,1e+156,1e+157,1e+158,1e+159,1e+160,
-        1e+161,1e+162,1e+163,1e+164,1e+165,1e+166,1e+167,1e+168,1e+169,1e+170,1e+171,1e+172,1e+173,1e+174,1e+175,1e+176,1e+177,1e+178,1e+179,1e+180,
-        1e+181,1e+182,1e+183,1e+184,1e+185,1e+186,1e+187,1e+188,1e+189,1e+190,1e+191,1e+192,1e+193,1e+194,1e+195,1e+196,1e+197,1e+198,1e+199,1e+200,
-        1e+201,1e+202,1e+203,1e+204,1e+205,1e+206,1e+207,1e+208,1e+209,1e+210,1e+211,1e+212,1e+213,1e+214,1e+215,1e+216,1e+217,1e+218,1e+219,1e+220,
-        1e+221,1e+222,1e+223,1e+224,1e+225,1e+226,1e+227,1e+228,1e+229,1e+230,1e+231,1e+232,1e+233,1e+234,1e+235,1e+236,1e+237,1e+238,1e+239,1e+240,
-        1e+241,1e+242,1e+243,1e+244,1e+245,1e+246,1e+247,1e+248,1e+249,1e+250,1e+251,1e+252,1e+253,1e+254,1e+255,1e+256,1e+257,1e+258,1e+259,1e+260,
-        1e+261,1e+262,1e+263,1e+264,1e+265,1e+266,1e+267,1e+268,1e+269,1e+270,1e+271,1e+272,1e+273,1e+274,1e+275,1e+276,1e+277,1e+278,1e+279,1e+280,
-        1e+281,1e+282,1e+283,1e+284,1e+285,1e+286,1e+287,1e+288,1e+289,1e+290,1e+291,1e+292,1e+293,1e+294,1e+295,1e+296,1e+297,1e+298,1e+299,1e+300,
-        1e+301,1e+302,1e+303,1e+304,1e+305,1e+306,1e+307,1e+308
-    };
-    RAPIDJSON_ASSERT(n >= 0 && n <= 308);
-    return e[n];
-}
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_POW10_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/regex.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/regex.h
deleted file mode 100644
index 422a5240bf..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/regex.h
+++ /dev/null
@@ -1,701 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_INTERNAL_REGEX_H_
-#define RAPIDJSON_INTERNAL_REGEX_H_
-
-#include "../allocators.h"
-#include "../stream.h"
-#include "stack.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-RAPIDJSON_DIAG_OFF(switch-enum)
-RAPIDJSON_DIAG_OFF(implicit-fallthrough)
-#endif
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
-#endif
-
-#ifndef RAPIDJSON_REGEX_VERBOSE
-#define RAPIDJSON_REGEX_VERBOSE 0
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericRegex
-
-static const SizeType kRegexInvalidState = ~SizeType(0);  //!< Represents an invalid index in GenericRegex::State::out, out1
-static const SizeType kRegexInvalidRange = ~SizeType(0);
-
-//! Regular expression engine with subset of ECMAscript grammar.
-/*!
-    Supported regular expression syntax:
-    - \c ab     Concatenation
-    - \c a|b    Alternation
-    - \c a?     Zero or one
-    - \c a*     Zero or more
-    - \c a+     One or more
-    - \c a{3}   Exactly 3 times
-    - \c a{3,}  At least 3 times
-    - \c a{3,5} 3 to 5 times
-    - \c (ab)   Grouping
-    - \c ^a     At the beginning
-    - \c a$     At the end
-    - \c .      Any character
-    - \c [abc]  Character classes
-    - \c [a-c]  Character class range
-    - \c [a-z0-9_] Character class combination
-    - \c [^abc] Negated character classes
-    - \c [^a-c] Negated character class range
-    - \c [\b]   Backspace (U+0008)
-    - \c \\| \\\\ ...  Escape characters
-    - \c \\f Form feed (U+000C)
-    - \c \\n Line feed (U+000A)
-    - \c \\r Carriage return (U+000D)
-    - \c \\t Tab (U+0009)
-    - \c \\v Vertical tab (U+000B)
-
-    \note This is a Thompson NFA engine, implemented with reference to 
-        Cox, Russ. "Regular Expression Matching Can Be Simple And Fast (but is slow in Java, Perl, PHP, Python, Ruby,...).", 
-        https://swtch.com/~rsc/regexp/regexp1.html 
-*/
-template <typename Encoding, typename Allocator = CrtAllocator>
-class GenericRegex {
-public:
-    typedef typename Encoding::Ch Ch;
-
-    GenericRegex(const Ch* source, Allocator* allocator = 0) : 
-        states_(allocator, 256), ranges_(allocator, 256), root_(kRegexInvalidState), stateCount_(), rangeCount_(), 
-        stateSet_(), state0_(allocator, 0), state1_(allocator, 0), anchorBegin_(), anchorEnd_()
-    {
-        GenericStringStream<Encoding> ss(source);
-        DecodedStream<GenericStringStream<Encoding> > ds(ss);
-        Parse(ds);
-    }
-
-    ~GenericRegex() {
-        Allocator::Free(stateSet_);
-    }
-
-    bool IsValid() const {
-        return root_ != kRegexInvalidState;
-    }
-
-    template <typename InputStream>
-    bool Match(InputStream& is) const {
-        return SearchWithAnchoring(is, true, true);
-    }
-
-    bool Match(const Ch* s) const {
-        GenericStringStream<Encoding> is(s);
-        return Match(is);
-    }
-
-    template <typename InputStream>
-    bool Search(InputStream& is) const {
-        return SearchWithAnchoring(is, anchorBegin_, anchorEnd_);
-    }
-
-    bool Search(const Ch* s) const {
-        GenericStringStream<Encoding> is(s);
-        return Search(is);
-    }
-
-private:
-    enum Operator {
-        kZeroOrOne,
-        kZeroOrMore,
-        kOneOrMore,
-        kConcatenation,
-        kAlternation,
-        kLeftParenthesis
-    };
-
-    static const unsigned kAnyCharacterClass = 0xFFFFFFFF;   //!< For '.'
-    static const unsigned kRangeCharacterClass = 0xFFFFFFFE;
-    static const unsigned kRangeNegationFlag = 0x80000000;
-
-    struct Range {
-        unsigned start; // 
-        unsigned end;
-        SizeType next;
-    };
-
-    struct State {
-        SizeType out;     //!< Equals to kInvalid for matching state
-        SizeType out1;    //!< Equals to non-kInvalid for split
-        SizeType rangeStart;
-        unsigned codepoint;
-    };
-
-    struct Frag {
-        Frag(SizeType s, SizeType o, SizeType m) : start(s), out(o), minIndex(m) {}
-        SizeType start;
-        SizeType out; //!< link-list of all output states
-        SizeType minIndex;
-    };
-
-    template <typename SourceStream>
-    class DecodedStream {
-    public:
-        DecodedStream(SourceStream& ss) : ss_(ss), codepoint_() { Decode(); }
-        unsigned Peek() { return codepoint_; }
-        unsigned Take() {
-            unsigned c = codepoint_;
-            if (c) // No further decoding when '\0'
-                Decode();
-            return c;
-        }
-
-    private:
-        void Decode() {
-            if (!Encoding::Decode(ss_, &codepoint_))
-                codepoint_ = 0;
-        }
-
-        SourceStream& ss_;
-        unsigned codepoint_;
-    };
-
-    State& GetState(SizeType index) {
-        RAPIDJSON_ASSERT(index < stateCount_);
-        return states_.template Bottom<State>()[index];
-    }
-
-    const State& GetState(SizeType index) const {
-        RAPIDJSON_ASSERT(index < stateCount_);
-        return states_.template Bottom<State>()[index];
-    }
-
-    Range& GetRange(SizeType index) {
-        RAPIDJSON_ASSERT(index < rangeCount_);
-        return ranges_.template Bottom<Range>()[index];
-    }
-
-    const Range& GetRange(SizeType index) const {
-        RAPIDJSON_ASSERT(index < rangeCount_);
-        return ranges_.template Bottom<Range>()[index];
-    }
-
-    template <typename InputStream>
-    void Parse(DecodedStream<InputStream>& ds) {
-        Allocator allocator;
-        Stack<Allocator> operandStack(&allocator, 256);     // Frag
-        Stack<Allocator> operatorStack(&allocator, 256);    // Operator
-        Stack<Allocator> atomCountStack(&allocator, 256);   // unsigned (Atom per parenthesis)
-
-        *atomCountStack.template Push<unsigned>() = 0;
-
-        unsigned codepoint;
-        while (ds.Peek() != 0) {
-            switch (codepoint = ds.Take()) {
-                case '^':
-                    anchorBegin_ = true;
-                    break;
-
-                case '$':
-                    anchorEnd_ = true;
-                    break;
-
-                case '|':
-                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() < kAlternation)
-                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
-                            return;
-                    *operatorStack.template Push<Operator>() = kAlternation;
-                    *atomCountStack.template Top<unsigned>() = 0;
-                    break;
-
-                case '(':
-                    *operatorStack.template Push<Operator>() = kLeftParenthesis;
-                    *atomCountStack.template Push<unsigned>() = 0;
-                    break;
-
-                case ')':
-                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() != kLeftParenthesis)
-                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
-                            return;
-                    if (operatorStack.Empty())
-                        return;
-                    operatorStack.template Pop<Operator>(1);
-                    atomCountStack.template Pop<unsigned>(1);
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-                    break;
-
-                case '?':
-                    if (!Eval(operandStack, kZeroOrOne))
-                        return;
-                    break;
-
-                case '*':
-                    if (!Eval(operandStack, kZeroOrMore))
-                        return;
-                    break;
-
-                case '+':
-                    if (!Eval(operandStack, kOneOrMore))
-                        return;
-                    break;
-
-                case '{':
-                    {
-                        unsigned n, m;
-                        if (!ParseUnsigned(ds, &n))
-                            return;
-
-                        if (ds.Peek() == ',') {
-                            ds.Take();
-                            if (ds.Peek() == '}')
-                                m = kInfinityQuantifier;
-                            else if (!ParseUnsigned(ds, &m) || m < n)
-                                return;
-                        }
-                        else
-                            m = n;
-
-                        if (!EvalQuantifier(operandStack, n, m) || ds.Peek() != '}')
-                            return;
-                        ds.Take();
-                    }
-                    break;
-
-                case '.':
-                    PushOperand(operandStack, kAnyCharacterClass);
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-                    break;
-
-                case '[':
-                    {
-                        SizeType range;
-                        if (!ParseRange(ds, &range))
-                            return;
-                        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, kRangeCharacterClass);
-                        GetState(s).rangeStart = range;
-                        *operandStack.template Push<Frag>() = Frag(s, s, s);
-                    }
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-                    break;
-
-                case '\\': // Escape character
-                    if (!CharacterEscape(ds, &codepoint))
-                        return; // Unsupported escape character
-                    // fall through to default
-
-                default: // Pattern character
-                    PushOperand(operandStack, codepoint);
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-            }
-        }
-
-        while (!operatorStack.Empty())
-            if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
-                return;
-
-        // Link the operand to matching state.
-        if (operandStack.GetSize() == sizeof(Frag)) {
-            Frag* e = operandStack.template Pop<Frag>(1);
-            Patch(e->out, NewState(kRegexInvalidState, kRegexInvalidState, 0));
-            root_ = e->start;
-
-#if RAPIDJSON_REGEX_VERBOSE
-            printf("root: %d\n", root_);
-            for (SizeType i = 0; i < stateCount_ ; i++) {
-                State& s = GetState(i);
-                printf("[%2d] out: %2d out1: %2d c: '%c'\n", i, s.out, s.out1, (char)s.codepoint);
-            }
-            printf("\n");
-#endif
-        }
-
-        // Preallocate buffer for SearchWithAnchoring()
-        RAPIDJSON_ASSERT(stateSet_ == 0);
-        if (stateCount_ > 0) {
-            stateSet_ = static_cast<unsigned*>(states_.GetAllocator().Malloc(GetStateSetSize()));
-            state0_.template Reserve<SizeType>(stateCount_);
-            state1_.template Reserve<SizeType>(stateCount_);
-        }
-    }
-
-    SizeType NewState(SizeType out, SizeType out1, unsigned codepoint) {
-        State* s = states_.template Push<State>();
-        s->out = out;
-        s->out1 = out1;
-        s->codepoint = codepoint;
-        s->rangeStart = kRegexInvalidRange;
-        return stateCount_++;
-    }
-
-    void PushOperand(Stack<Allocator>& operandStack, unsigned codepoint) {
-        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, codepoint);
-        *operandStack.template Push<Frag>() = Frag(s, s, s);
-    }
-
-    void ImplicitConcatenation(Stack<Allocator>& atomCountStack, Stack<Allocator>& operatorStack) {
-        if (*atomCountStack.template Top<unsigned>())
-            *operatorStack.template Push<Operator>() = kConcatenation;
-        (*atomCountStack.template Top<unsigned>())++;
-    }
-
-    SizeType Append(SizeType l1, SizeType l2) {
-        SizeType old = l1;
-        while (GetState(l1).out != kRegexInvalidState)
-            l1 = GetState(l1).out;
-        GetState(l1).out = l2;
-        return old;
-    }
-
-    void Patch(SizeType l, SizeType s) {
-        for (SizeType next; l != kRegexInvalidState; l = next) {
-            next = GetState(l).out;
-            GetState(l).out = s;
-        }
-    }
-
-    bool Eval(Stack<Allocator>& operandStack, Operator op) {
-        switch (op) {
-            case kConcatenation:
-                RAPIDJSON_ASSERT(operandStack.GetSize() >= sizeof(Frag) * 2);
-                {
-                    Frag e2 = *operandStack.template Pop<Frag>(1);
-                    Frag e1 = *operandStack.template Pop<Frag>(1);
-                    Patch(e1.out, e2.start);
-                    *operandStack.template Push<Frag>() = Frag(e1.start, e2.out, Min(e1.minIndex, e2.minIndex));
-                }
-                return true;
-
-            case kAlternation:
-                if (operandStack.GetSize() >= sizeof(Frag) * 2) {
-                    Frag e2 = *operandStack.template Pop<Frag>(1);
-                    Frag e1 = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(e1.start, e2.start, 0);
-                    *operandStack.template Push<Frag>() = Frag(s, Append(e1.out, e2.out), Min(e1.minIndex, e2.minIndex));
-                    return true;
-                }
-                return false;
-
-            case kZeroOrOne:
-                if (operandStack.GetSize() >= sizeof(Frag)) {
-                    Frag e = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
-                    *operandStack.template Push<Frag>() = Frag(s, Append(e.out, s), e.minIndex);
-                    return true;
-                }
-                return false;
-
-            case kZeroOrMore:
-                if (operandStack.GetSize() >= sizeof(Frag)) {
-                    Frag e = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
-                    Patch(e.out, s);
-                    *operandStack.template Push<Frag>() = Frag(s, s, e.minIndex);
-                    return true;
-                }
-                return false;
-
-            default: 
-                RAPIDJSON_ASSERT(op == kOneOrMore);
-                if (operandStack.GetSize() >= sizeof(Frag)) {
-                    Frag e = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
-                    Patch(e.out, s);
-                    *operandStack.template Push<Frag>() = Frag(e.start, s, e.minIndex);
-                    return true;
-                }
-                return false;
-        }
-    }
-
-    bool EvalQuantifier(Stack<Allocator>& operandStack, unsigned n, unsigned m) {
-        RAPIDJSON_ASSERT(n <= m);
-        RAPIDJSON_ASSERT(operandStack.GetSize() >= sizeof(Frag));
-
-        if (n == 0) {
-            if (m == 0)                             // a{0} not support
-                return false;
-            else if (m == kInfinityQuantifier)
-                Eval(operandStack, kZeroOrMore);    // a{0,} -> a*
-            else {
-                Eval(operandStack, kZeroOrOne);         // a{0,5} -> a?
-                for (unsigned i = 0; i < m - 1; i++)
-                    CloneTopOperand(operandStack);      // a{0,5} -> a? a? a? a? a?
-                for (unsigned i = 0; i < m - 1; i++)
-                    Eval(operandStack, kConcatenation); // a{0,5} -> a?a?a?a?a?
-            }
-            return true;
-        }
-
-        for (unsigned i = 0; i < n - 1; i++)        // a{3} -> a a a
-            CloneTopOperand(operandStack);
-
-        if (m == kInfinityQuantifier)
-            Eval(operandStack, kOneOrMore);         // a{3,} -> a a a+
-        else if (m > n) {
-            CloneTopOperand(operandStack);          // a{3,5} -> a a a a
-            Eval(operandStack, kZeroOrOne);         // a{3,5} -> a a a a?
-            for (unsigned i = n; i < m - 1; i++)
-                CloneTopOperand(operandStack);      // a{3,5} -> a a a a? a?
-            for (unsigned i = n; i < m; i++)
-                Eval(operandStack, kConcatenation); // a{3,5} -> a a aa?a?
-        }
-
-        for (unsigned i = 0; i < n - 1; i++)
-            Eval(operandStack, kConcatenation);     // a{3} -> aaa, a{3,} -> aaa+, a{3.5} -> aaaa?a?
-
-        return true;
-    }
-
-    static SizeType Min(SizeType a, SizeType b) { return a < b ? a : b; }
-
-    void CloneTopOperand(Stack<Allocator>& operandStack) {
-        const Frag src = *operandStack.template Top<Frag>(); // Copy constructor to prevent invalidation
-        SizeType count = stateCount_ - src.minIndex; // Assumes top operand contains states in [src->minIndex, stateCount_)
-        State* s = states_.template Push<State>(count);
-        memcpy(s, &GetState(src.minIndex), count * sizeof(State));
-        for (SizeType j = 0; j < count; j++) {
-            if (s[j].out != kRegexInvalidState)
-                s[j].out += count;
-            if (s[j].out1 != kRegexInvalidState)
-                s[j].out1 += count;
-        }
-        *operandStack.template Push<Frag>() = Frag(src.start + count, src.out + count, src.minIndex + count);
-        stateCount_ += count;
-    }
-
-    template <typename InputStream>
-    bool ParseUnsigned(DecodedStream<InputStream>& ds, unsigned* u) {
-        unsigned r = 0;
-        if (ds.Peek() < '0' || ds.Peek() > '9')
-            return false;
-        while (ds.Peek() >= '0' && ds.Peek() <= '9') {
-            if (r >= 429496729 && ds.Peek() > '5') // 2^32 - 1 = 4294967295
-                return false; // overflow
-            r = r * 10 + (ds.Take() - '0');
-        }
-        *u = r;
-        return true;
-    }
-
-    template <typename InputStream>
-    bool ParseRange(DecodedStream<InputStream>& ds, SizeType* range) {
-        bool isBegin = true;
-        bool negate = false;
-        int step = 0;
-        SizeType start = kRegexInvalidRange;
-        SizeType current = kRegexInvalidRange;
-        unsigned codepoint;
-        while ((codepoint = ds.Take()) != 0) {
-            if (isBegin) {
-                isBegin = false;
-                if (codepoint == '^') {
-                    negate = true;
-                    continue;
-                }
-            }
-
-            switch (codepoint) {
-            case ']':
-                if (start == kRegexInvalidRange)
-                    return false;   // Error: nothing inside []
-                if (step == 2) { // Add trailing '-'
-                    SizeType r = NewRange('-');
-                    RAPIDJSON_ASSERT(current != kRegexInvalidRange);
-                    GetRange(current).next = r;
-                }
-                if (negate)
-                    GetRange(start).start |= kRangeNegationFlag;
-                *range = start;
-                return true;
-
-            case '\\':
-                if (ds.Peek() == 'b') {
-                    ds.Take();
-                    codepoint = 0x0008; // Escape backspace character
-                }
-                else if (!CharacterEscape(ds, &codepoint))
-                    return false;
-                // fall through to default
-
-            default:
-                switch (step) {
-                case 1:
-                    if (codepoint == '-') {
-                        step++;
-                        break;
-                    }
-                    // fall through to step 0 for other characters
-
-                case 0:
-                    {
-                        SizeType r = NewRange(codepoint);
-                        if (current != kRegexInvalidRange)
-                            GetRange(current).next = r;
-                        if (start == kRegexInvalidRange)
-                            start = r;
-                        current = r;
-                    }
-                    step = 1;
-                    break;
-
-                default:
-                    RAPIDJSON_ASSERT(step == 2);
-                    GetRange(current).end = codepoint;
-                    step = 0;
-                }
-            }
-        }
-        return false;
-    }
-    
-    SizeType NewRange(unsigned codepoint) {
-        Range* r = ranges_.template Push<Range>();
-        r->start = r->end = codepoint;
-        r->next = kRegexInvalidRange;
-        return rangeCount_++;
-    }
-
-    template <typename InputStream>
-    bool CharacterEscape(DecodedStream<InputStream>& ds, unsigned* escapedCodepoint) {
-        unsigned codepoint;
-        switch (codepoint = ds.Take()) {
-            case '^':
-            case '$':
-            case '|':
-            case '(':
-            case ')':
-            case '?':
-            case '*':
-            case '+':
-            case '.':
-            case '[':
-            case ']':
-            case '{':
-            case '}':
-            case '\\':
-                *escapedCodepoint = codepoint; return true;
-            case 'f': *escapedCodepoint = 0x000C; return true;
-            case 'n': *escapedCodepoint = 0x000A; return true;
-            case 'r': *escapedCodepoint = 0x000D; return true;
-            case 't': *escapedCodepoint = 0x0009; return true;
-            case 'v': *escapedCodepoint = 0x000B; return true;
-            default:
-                return false; // Unsupported escape character
-        }
-    }
-
-    template <typename InputStream>
-    bool SearchWithAnchoring(InputStream& is, bool anchorBegin, bool anchorEnd) const {
-        RAPIDJSON_ASSERT(IsValid());
-        DecodedStream<InputStream> ds(is);
-
-        state0_.Clear();
-        Stack<Allocator> *current = &state0_, *next = &state1_;
-        const size_t stateSetSize = GetStateSetSize();
-        std::memset(stateSet_, 0, stateSetSize);
-
-        bool matched = AddState(*current, root_);
-        unsigned codepoint;
-        while (!current->Empty() && (codepoint = ds.Take()) != 0) {
-            std::memset(stateSet_, 0, stateSetSize);
-            next->Clear();
-            matched = false;
-            for (const SizeType* s = current->template Bottom<SizeType>(); s != current->template End<SizeType>(); ++s) {
-                const State& sr = GetState(*s);
-                if (sr.codepoint == codepoint ||
-                    sr.codepoint == kAnyCharacterClass || 
-                    (sr.codepoint == kRangeCharacterClass && MatchRange(sr.rangeStart, codepoint)))
-                {
-                    matched = AddState(*next, sr.out) || matched;
-                    if (!anchorEnd && matched)
-                        return true;
-                }
-                if (!anchorBegin)
-                    AddState(*next, root_);
-            }
-            internal::Swap(current, next);
-        }
-
-        return matched;
-    }
-
-    size_t GetStateSetSize() const {
-        return (stateCount_ + 31) / 32 * 4;
-    }
-
-    // Return whether the added states is a match state
-    bool AddState(Stack<Allocator>& l, SizeType index) const {
-        RAPIDJSON_ASSERT(index != kRegexInvalidState);
-
-        const State& s = GetState(index);
-        if (s.out1 != kRegexInvalidState) { // Split
-            bool matched = AddState(l, s.out);
-            return AddState(l, s.out1) || matched;
-        }
-        else if (!(stateSet_[index >> 5] & (1 << (index & 31)))) {
-            stateSet_[index >> 5] |= (1 << (index & 31));
-            *l.template PushUnsafe<SizeType>() = index;
-        }
-        return s.out == kRegexInvalidState; // by using PushUnsafe() above, we can ensure s is not validated due to reallocation.
-    }
-
-    bool MatchRange(SizeType rangeIndex, unsigned codepoint) const {
-        bool yes = (GetRange(rangeIndex).start & kRangeNegationFlag) == 0;
-        while (rangeIndex != kRegexInvalidRange) {
-            const Range& r = GetRange(rangeIndex);
-            if (codepoint >= (r.start & ~kRangeNegationFlag) && codepoint <= r.end)
-                return yes;
-            rangeIndex = r.next;
-        }
-        return !yes;
-    }
-
-    Stack<Allocator> states_;
-    Stack<Allocator> ranges_;
-    SizeType root_;
-    SizeType stateCount_;
-    SizeType rangeCount_;
-
-    static const unsigned kInfinityQuantifier = ~0u;
-
-    // For SearchWithAnchoring()
-    uint32_t* stateSet_;        // allocated by states_.GetAllocator()
-    mutable Stack<Allocator> state0_;
-    mutable Stack<Allocator> state1_;
-    bool anchorBegin_;
-    bool anchorEnd_;
-};
-
-typedef GenericRegex<UTF8<> > Regex;
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_INTERNAL_REGEX_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/stack.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/stack.h
deleted file mode 100644
index 022c9aab41..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/stack.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_INTERNAL_STACK_H_
-#define RAPIDJSON_INTERNAL_STACK_H_
-
-#include "../allocators.h"
-#include "swap.h"
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-///////////////////////////////////////////////////////////////////////////////
-// Stack
-
-//! A type-unsafe stack for storing different types of data.
-/*! \tparam Allocator Allocator for allocating stack memory.
-*/
-template <typename Allocator>
-class Stack {
-public:
-    // Optimization note: Do not allocate memory for stack_ in constructor.
-    // Do it lazily when first Push() -> Expand() -> Resize().
-    Stack(Allocator* allocator, size_t stackCapacity) : allocator_(allocator), ownAllocator_(0), stack_(0), stackTop_(0), stackEnd_(0), initialCapacity_(stackCapacity) {
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    Stack(Stack&& rhs)
-        : allocator_(rhs.allocator_),
-          ownAllocator_(rhs.ownAllocator_),
-          stack_(rhs.stack_),
-          stackTop_(rhs.stackTop_),
-          stackEnd_(rhs.stackEnd_),
-          initialCapacity_(rhs.initialCapacity_)
-    {
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-        rhs.stack_ = 0;
-        rhs.stackTop_ = 0;
-        rhs.stackEnd_ = 0;
-        rhs.initialCapacity_ = 0;
-    }
-#endif
-
-    ~Stack() {
-        Destroy();
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    Stack& operator=(Stack&& rhs) {
-        if (&rhs != this)
-        {
-            Destroy();
-
-            allocator_ = rhs.allocator_;
-            ownAllocator_ = rhs.ownAllocator_;
-            stack_ = rhs.stack_;
-            stackTop_ = rhs.stackTop_;
-            stackEnd_ = rhs.stackEnd_;
-            initialCapacity_ = rhs.initialCapacity_;
-
-            rhs.allocator_ = 0;
-            rhs.ownAllocator_ = 0;
-            rhs.stack_ = 0;
-            rhs.stackTop_ = 0;
-            rhs.stackEnd_ = 0;
-            rhs.initialCapacity_ = 0;
-        }
-        return *this;
-    }
-#endif
-
-    void Swap(Stack& rhs) RAPIDJSON_NOEXCEPT {
-        internal::Swap(allocator_, rhs.allocator_);
-        internal::Swap(ownAllocator_, rhs.ownAllocator_);
-        internal::Swap(stack_, rhs.stack_);
-        internal::Swap(stackTop_, rhs.stackTop_);
-        internal::Swap(stackEnd_, rhs.stackEnd_);
-        internal::Swap(initialCapacity_, rhs.initialCapacity_);
-    }
-
-    void Clear() { stackTop_ = stack_; }
-
-    void ShrinkToFit() { 
-        if (Empty()) {
-            // If the stack is empty, completely deallocate the memory.
-            Allocator::Free(stack_);
-            stack_ = 0;
-            stackTop_ = 0;
-            stackEnd_ = 0;
-        }
-        else
-            Resize(GetSize());
-    }
-
-    // Optimization note: try to minimize the size of this function for force inline.
-    // Expansion is run very infrequently, so it is moved to another (probably non-inline) function.
-    template<typename T>
-    RAPIDJSON_FORCEINLINE void Reserve(size_t count = 1) {
-         // Expand the stack if needed
-        if (RAPIDJSON_UNLIKELY(stackTop_ + sizeof(T) * count > stackEnd_))
-            Expand<T>(count);
-    }
-
-    template<typename T>
-    RAPIDJSON_FORCEINLINE T* Push(size_t count = 1) {
-        Reserve<T>(count);
-        return PushUnsafe<T>(count);
-    }
-
-    template<typename T>
-    RAPIDJSON_FORCEINLINE T* PushUnsafe(size_t count = 1) {
-        RAPIDJSON_ASSERT(stackTop_ + sizeof(T) * count <= stackEnd_);
-        T* ret = reinterpret_cast<T*>(stackTop_);
-        stackTop_ += sizeof(T) * count;
-        return ret;
-    }
-
-    template<typename T>
-    T* Pop(size_t count) {
-        RAPIDJSON_ASSERT(GetSize() >= count * sizeof(T));
-        stackTop_ -= count * sizeof(T);
-        return reinterpret_cast<T*>(stackTop_);
-    }
-
-    template<typename T>
-    T* Top() { 
-        RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
-        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
-    }
-
-    template<typename T>
-    const T* Top() const {
-        RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
-        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
-    }
-
-    template<typename T>
-    T* End() { return reinterpret_cast<T*>(stackTop_); }
-
-    template<typename T>
-    const T* End() const { return reinterpret_cast<T*>(stackTop_); }
-
-    template<typename T>
-    T* Bottom() { return reinterpret_cast<T*>(stack_); }
-
-    template<typename T>
-    const T* Bottom() const { return reinterpret_cast<T*>(stack_); }
-
-    bool HasAllocator() const {
-        return allocator_ != 0;
-    }
-
-    Allocator& GetAllocator() {
-        RAPIDJSON_ASSERT(allocator_);
-        return *allocator_;
-    }
-
-    bool Empty() const { return stackTop_ == stack_; }
-    size_t GetSize() const { return static_cast<size_t>(stackTop_ - stack_); }
-    size_t GetCapacity() const { return static_cast<size_t>(stackEnd_ - stack_); }
-
-private:
-    template<typename T>
-    void Expand(size_t count) {
-        // Only expand the capacity if the current stack exists. Otherwise just create a stack with initial capacity.
-        size_t newCapacity;
-        if (stack_ == 0) {
-            if (!allocator_)
-                ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
-            newCapacity = initialCapacity_;
-        } else {
-            newCapacity = GetCapacity();
-            newCapacity += (newCapacity + 1) / 2;
-        }
-        size_t newSize = GetSize() + sizeof(T) * count;
-        if (newCapacity < newSize)
-            newCapacity = newSize;
-
-        Resize(newCapacity);
-    }
-
-    void Resize(size_t newCapacity) {
-        const size_t size = GetSize();  // Backup the current size
-        stack_ = static_cast<char*>(allocator_->Realloc(stack_, GetCapacity(), newCapacity));
-        stackTop_ = stack_ + size;
-        stackEnd_ = stack_ + newCapacity;
-    }
-
-    void Destroy() {
-        Allocator::Free(stack_);
-        RAPIDJSON_DELETE(ownAllocator_); // Only delete if it is owned by the stack
-    }
-
-    // Prohibit copy constructor & assignment operator.
-    Stack(const Stack&);
-    Stack& operator=(const Stack&);
-
-    Allocator* allocator_;
-    Allocator* ownAllocator_;
-    char *stack_;
-    char *stackTop_;
-    char *stackEnd_;
-    size_t initialCapacity_;
-};
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_STACK_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/strfunc.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/strfunc.h
deleted file mode 100644
index 2edfae5267..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/strfunc.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_INTERNAL_STRFUNC_H_
-#define RAPIDJSON_INTERNAL_STRFUNC_H_
-
-#include "../stream.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-//! Custom strlen() which works on different character types.
-/*! \tparam Ch Character type (e.g. char, wchar_t, short)
-    \param s Null-terminated input string.
-    \return Number of characters in the string. 
-    \note This has the same semantics as strlen(), the return value is not number of Unicode codepoints.
-*/
-template <typename Ch>
-inline SizeType StrLen(const Ch* s) {
-    const Ch* p = s;
-    while (*p) ++p;
-    return SizeType(p - s);
-}
-
-//! Returns number of code points in a encoded string.
-template<typename Encoding>
-bool CountStringCodePoint(const typename Encoding::Ch* s, SizeType length, SizeType* outCount) {
-    GenericStringStream<Encoding> is(s);
-    const typename Encoding::Ch* end = s + length;
-    SizeType count = 0;
-    while (is.src_ < end) {
-        unsigned codepoint;
-        if (!Encoding::Decode(is, &codepoint))
-            return false;
-        count++;
-    }
-    *outCount = count;
-    return true;
-}
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_INTERNAL_STRFUNC_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/strtod.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/strtod.h
deleted file mode 100644
index 289c413b07..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/strtod.h
+++ /dev/null
@@ -1,269 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_STRTOD_
-#define RAPIDJSON_STRTOD_
-
-#include "ieee754.h"
-#include "biginteger.h"
-#include "diyfp.h"
-#include "pow10.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-inline double FastPath(double significand, int exp) {
-    if (exp < -308)
-        return 0.0;
-    else if (exp >= 0)
-        return significand * internal::Pow10(exp);
-    else
-        return significand / internal::Pow10(-exp);
-}
-
-inline double StrtodNormalPrecision(double d, int p) {
-    if (p < -308) {
-        // Prevent expSum < -308, making Pow10(p) = 0
-        d = FastPath(d, -308);
-        d = FastPath(d, p + 308);
-    }
-    else
-        d = FastPath(d, p);
-    return d;
-}
-
-template <typename T>
-inline T Min3(T a, T b, T c) {
-    T m = a;
-    if (m > b) m = b;
-    if (m > c) m = c;
-    return m;
-}
-
-inline int CheckWithinHalfULP(double b, const BigInteger& d, int dExp) {
-    const Double db(b);
-    const uint64_t bInt = db.IntegerSignificand();
-    const int bExp = db.IntegerExponent();
-    const int hExp = bExp - 1;
-
-    int dS_Exp2 = 0, dS_Exp5 = 0, bS_Exp2 = 0, bS_Exp5 = 0, hS_Exp2 = 0, hS_Exp5 = 0;
-
-    // Adjust for decimal exponent
-    if (dExp >= 0) {
-        dS_Exp2 += dExp;
-        dS_Exp5 += dExp;
-    }
-    else {
-        bS_Exp2 -= dExp;
-        bS_Exp5 -= dExp;
-        hS_Exp2 -= dExp;
-        hS_Exp5 -= dExp;
-    }
-
-    // Adjust for binary exponent
-    if (bExp >= 0)
-        bS_Exp2 += bExp;
-    else {
-        dS_Exp2 -= bExp;
-        hS_Exp2 -= bExp;
-    }
-
-    // Adjust for half ulp exponent
-    if (hExp >= 0)
-        hS_Exp2 += hExp;
-    else {
-        dS_Exp2 -= hExp;
-        bS_Exp2 -= hExp;
-    }
-
-    // Remove common power of two factor from all three scaled values
-    int common_Exp2 = Min3(dS_Exp2, bS_Exp2, hS_Exp2);
-    dS_Exp2 -= common_Exp2;
-    bS_Exp2 -= common_Exp2;
-    hS_Exp2 -= common_Exp2;
-
-    BigInteger dS = d;
-    dS.MultiplyPow5(static_cast<unsigned>(dS_Exp5)) <<= static_cast<unsigned>(dS_Exp2);
-
-    BigInteger bS(bInt);
-    bS.MultiplyPow5(static_cast<unsigned>(bS_Exp5)) <<= static_cast<unsigned>(bS_Exp2);
-
-    BigInteger hS(1);
-    hS.MultiplyPow5(static_cast<unsigned>(hS_Exp5)) <<= static_cast<unsigned>(hS_Exp2);
-
-    BigInteger delta(0);
-    dS.Difference(bS, &delta);
-
-    return delta.Compare(hS);
-}
-
-inline bool StrtodFast(double d, int p, double* result) {
-    // Use fast path for string-to-double conversion if possible
-    // see http://www.exploringbinary.com/fast-path-decimal-to-floating-point-conversion/
-    if (p > 22  && p < 22 + 16) {
-        // Fast Path Cases In Disguise
-        d *= internal::Pow10(p - 22);
-        p = 22;
-    }
-
-    if (p >= -22 && p <= 22 && d <= 9007199254740991.0) { // 2^53 - 1
-        *result = FastPath(d, p);
-        return true;
-    }
-    else
-        return false;
-}
-
-// Compute an approximation and see if it is within 1/2 ULP
-inline bool StrtodDiyFp(const char* decimals, size_t length, size_t decimalPosition, int exp, double* result) {
-    uint64_t significand = 0;
-    size_t i = 0;   // 2^64 - 1 = 18446744073709551615, 1844674407370955161 = 0x1999999999999999    
-    for (; i < length; i++) {
-        if (significand  >  RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) ||
-            (significand == RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) && decimals[i] > '5'))
-            break;
-        significand = significand * 10u + static_cast<unsigned>(decimals[i] - '0');
-    }
-    
-    if (i < length && decimals[i] >= '5') // Rounding
-        significand++;
-
-    size_t remaining = length - i;
-    const unsigned kUlpShift = 3;
-    const unsigned kUlp = 1 << kUlpShift;
-    int64_t error = (remaining == 0) ? 0 : kUlp / 2;
-
-    DiyFp v(significand, 0);
-    v = v.Normalize();
-    error <<= -v.e;
-
-    const int dExp = static_cast<int>(decimalPosition) - static_cast<int>(i) + exp;
-
-    int actualExp;
-    DiyFp cachedPower = GetCachedPower10(dExp, &actualExp);
-    if (actualExp != dExp) {
-        static const DiyFp kPow10[] = {
-            DiyFp(RAPIDJSON_UINT64_C2(0xa0000000, 00000000), -60),  // 10^1
-            DiyFp(RAPIDJSON_UINT64_C2(0xc8000000, 00000000), -57),  // 10^2
-            DiyFp(RAPIDJSON_UINT64_C2(0xfa000000, 00000000), -54),  // 10^3
-            DiyFp(RAPIDJSON_UINT64_C2(0x9c400000, 00000000), -50),  // 10^4
-            DiyFp(RAPIDJSON_UINT64_C2(0xc3500000, 00000000), -47),  // 10^5
-            DiyFp(RAPIDJSON_UINT64_C2(0xf4240000, 00000000), -44),  // 10^6
-            DiyFp(RAPIDJSON_UINT64_C2(0x98968000, 00000000), -40)   // 10^7
-        };
-        int  adjustment = dExp - actualExp - 1;
-        RAPIDJSON_ASSERT(adjustment >= 0 && adjustment < 7);
-        v = v * kPow10[adjustment];
-        if (length + static_cast<unsigned>(adjustment)> 19u) // has more digits than decimal digits in 64-bit
-            error += kUlp / 2;
-    }
-
-    v = v * cachedPower;
-
-    error += kUlp + (error == 0 ? 0 : 1);
-
-    const int oldExp = v.e;
-    v = v.Normalize();
-    error <<= oldExp - v.e;
-
-    const unsigned effectiveSignificandSize = Double::EffectiveSignificandSize(64 + v.e);
-    unsigned precisionSize = 64 - effectiveSignificandSize;
-    if (precisionSize + kUlpShift >= 64) {
-        unsigned scaleExp = (precisionSize + kUlpShift) - 63;
-        v.f >>= scaleExp;
-        v.e += scaleExp; 
-        error = (error >> scaleExp) + 1 + static_cast<int>(kUlp);
-        precisionSize -= scaleExp;
-    }
-
-    DiyFp rounded(v.f >> precisionSize, v.e + static_cast<int>(precisionSize));
-    const uint64_t precisionBits = (v.f & ((uint64_t(1) << precisionSize) - 1)) * kUlp;
-    const uint64_t halfWay = (uint64_t(1) << (precisionSize - 1)) * kUlp;
-    if (precisionBits >= halfWay + static_cast<unsigned>(error)) {
-        rounded.f++;
-        if (rounded.f & (DiyFp::kDpHiddenBit << 1)) { // rounding overflows mantissa (issue #340)
-            rounded.f >>= 1;
-            rounded.e++;
-        }
-    }
-
-    *result = rounded.ToDouble();
-
-    return halfWay - static_cast<unsigned>(error) >= precisionBits || precisionBits >= halfWay + static_cast<unsigned>(error);
-}
-
-inline double StrtodBigInteger(double approx, const char* decimals, size_t length, size_t decimalPosition, int exp) {
-    const BigInteger dInt(decimals, length);
-    const int dExp = static_cast<int>(decimalPosition) - static_cast<int>(length) + exp;
-    Double a(approx);
-    int cmp = CheckWithinHalfULP(a.Value(), dInt, dExp);
-    if (cmp < 0)
-        return a.Value();  // within half ULP
-    else if (cmp == 0) {
-        // Round towards even
-        if (a.Significand() & 1)
-            return a.NextPositiveDouble();
-        else
-            return a.Value();
-    }
-    else // adjustment
-        return a.NextPositiveDouble();
-}
-
-inline double StrtodFullPrecision(double d, int p, const char* decimals, size_t length, size_t decimalPosition, int exp) {
-    RAPIDJSON_ASSERT(d >= 0.0);
-    RAPIDJSON_ASSERT(length >= 1);
-
-    double result;
-    if (StrtodFast(d, p, &result))
-        return result;
-
-    // Trim leading zeros
-    while (*decimals == '0' && length > 1) {
-        length--;
-        decimals++;
-        decimalPosition--;
-    }
-
-    // Trim trailing zeros
-    while (decimals[length - 1] == '0' && length > 1) {
-        length--;
-        decimalPosition--;
-        exp++;
-    }
-
-    // Trim right-most digits
-    const int kMaxDecimalDigit = 780;
-    if (static_cast<int>(length) > kMaxDecimalDigit) {
-        int delta = (static_cast<int>(length) - kMaxDecimalDigit);
-        exp += delta;
-        decimalPosition -= static_cast<unsigned>(delta);
-        length = kMaxDecimalDigit;
-    }
-
-    // If too small, underflow to zero
-    if (int(length) + exp < -324)
-        return 0.0;
-
-    if (StrtodDiyFp(decimals, length, decimalPosition, exp, &result))
-        return result;
-
-    // Use approximation from StrtodDiyFp and make adjustment with BigInteger comparison
-    return StrtodBigInteger(result, decimals, length, decimalPosition, exp);
-}
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_STRTOD_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/swap.h b/sql-odbc/libraries/rapidjson/include/rapidjson/internal/swap.h
deleted file mode 100644
index 666e49f97b..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/internal/swap.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_INTERNAL_SWAP_H_
-#define RAPIDJSON_INTERNAL_SWAP_H_
-
-#include "../rapidjson.h"
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-//! Custom swap() to avoid dependency on C++ <algorithm> header
-/*! \tparam T Type of the arguments to swap, should be instantiated with primitive C++ types only.
-    \note This has the same semantics as std::swap().
-*/
-template <typename T>
-inline void Swap(T& a, T& b) RAPIDJSON_NOEXCEPT {
-    T tmp = a;
-        a = b;
-        b = tmp;
-}
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_INTERNAL_SWAP_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/istreamwrapper.h b/sql-odbc/libraries/rapidjson/include/rapidjson/istreamwrapper.h
deleted file mode 100644
index f5fe28977e..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/istreamwrapper.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ISTREAMWRAPPER_H_
-#define RAPIDJSON_ISTREAMWRAPPER_H_
-
-#include "stream.h"
-#include <iosfwd>
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4351) // new behavior: elements of array 'array' will be default initialized
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Wrapper of \c std::basic_istream into RapidJSON's Stream concept.
-/*!
-    The classes can be wrapped including but not limited to:
-
-    - \c std::istringstream
-    - \c std::stringstream
-    - \c std::wistringstream
-    - \c std::wstringstream
-    - \c std::ifstream
-    - \c std::fstream
-    - \c std::wifstream
-    - \c std::wfstream
-
-    \tparam StreamType Class derived from \c std::basic_istream.
-*/
-   
-template <typename StreamType>
-class BasicIStreamWrapper {
-public:
-    typedef typename StreamType::char_type Ch;
-    BasicIStreamWrapper(StreamType& stream) : stream_(stream), count_(), peekBuffer_() {}
-
-    Ch Peek() const { 
-        typename StreamType::int_type c = stream_.peek();
-        return RAPIDJSON_LIKELY(c != StreamType::traits_type::eof()) ? static_cast<Ch>(c) : '\0';
-    }
-
-    Ch Take() { 
-        typename StreamType::int_type c = stream_.get();
-        if (RAPIDJSON_LIKELY(c != StreamType::traits_type::eof())) {
-            count_++;
-            return static_cast<Ch>(c);
-        }
-        else
-            return '\0';
-    }
-
-    // tellg() may return -1 when failed. So we count by ourself.
-    size_t Tell() const { return count_; }
-
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-    // For encoding detection only.
-    const Ch* Peek4() const {
-        RAPIDJSON_ASSERT(sizeof(Ch) == 1); // Only usable for byte stream.
-        int i;
-        bool hasError = false;
-        for (i = 0; i < 4; ++i) {
-            typename StreamType::int_type c = stream_.get();
-            if (c == StreamType::traits_type::eof()) {
-                hasError = true;
-                stream_.clear();
-                break;
-            }
-            peekBuffer_[i] = static_cast<Ch>(c);
-        }
-        for (--i; i >= 0; --i)
-            stream_.putback(peekBuffer_[i]);
-        return !hasError ? peekBuffer_ : 0;
-    }
-
-private:
-    BasicIStreamWrapper(const BasicIStreamWrapper&);
-    BasicIStreamWrapper& operator=(const BasicIStreamWrapper&);
-
-    StreamType& stream_;
-    size_t count_;  //!< Number of characters read. Note:
-    mutable Ch peekBuffer_[4];
-};
-
-typedef BasicIStreamWrapper<std::istream> IStreamWrapper;
-typedef BasicIStreamWrapper<std::wistream> WIStreamWrapper;
-
-#if defined(__clang__) || defined(_MSC_VER)
-RAPIDJSON_DIAG_POP
-#endif
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_ISTREAMWRAPPER_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/memorybuffer.h b/sql-odbc/libraries/rapidjson/include/rapidjson/memorybuffer.h
deleted file mode 100644
index 39bee1dec1..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/memorybuffer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_MEMORYBUFFER_H_
-#define RAPIDJSON_MEMORYBUFFER_H_
-
-#include "stream.h"
-#include "internal/stack.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Represents an in-memory output byte stream.
-/*!
-    This class is mainly for being wrapped by EncodedOutputStream or AutoUTFOutputStream.
-
-    It is similar to FileWriteBuffer but the destination is an in-memory buffer instead of a file.
-
-    Differences between MemoryBuffer and StringBuffer:
-    1. StringBuffer has Encoding but MemoryBuffer is only a byte buffer. 
-    2. StringBuffer::GetString() returns a null-terminated string. MemoryBuffer::GetBuffer() returns a buffer without terminator.
-
-    \tparam Allocator type for allocating memory buffer.
-    \note implements Stream concept
-*/
-template <typename Allocator = CrtAllocator>
-struct GenericMemoryBuffer {
-    typedef char Ch; // byte
-
-    GenericMemoryBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
-
-    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
-    void Flush() {}
-
-    void Clear() { stack_.Clear(); }
-    void ShrinkToFit() { stack_.ShrinkToFit(); }
-    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
-    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
-
-    const Ch* GetBuffer() const {
-        return stack_.template Bottom<Ch>();
-    }
-
-    size_t GetSize() const { return stack_.GetSize(); }
-
-    static const size_t kDefaultCapacity = 256;
-    mutable internal::Stack<Allocator> stack_;
-};
-
-typedef GenericMemoryBuffer<> MemoryBuffer;
-
-//! Implement specialized version of PutN() with memset() for better performance.
-template<>
-inline void PutN(MemoryBuffer& memoryBuffer, char c, size_t n) {
-    std::memset(memoryBuffer.stack_.Push<char>(n), c, n * sizeof(c));
-}
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_MEMORYBUFFER_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/memorystream.h b/sql-odbc/libraries/rapidjson/include/rapidjson/memorystream.h
deleted file mode 100644
index 1d71d8a4f0..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/memorystream.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_MEMORYSTREAM_H_
-#define RAPIDJSON_MEMORYSTREAM_H_
-
-#include "stream.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(unreachable-code)
-RAPIDJSON_DIAG_OFF(missing-noreturn)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Represents an in-memory input byte stream.
-/*!
-    This class is mainly for being wrapped by EncodedInputStream or AutoUTFInputStream.
-
-    It is similar to FileReadBuffer but the source is an in-memory buffer instead of a file.
-
-    Differences between MemoryStream and StringStream:
-    1. StringStream has encoding but MemoryStream is a byte stream.
-    2. MemoryStream needs size of the source buffer and the buffer don't need to be null terminated. StringStream assume null-terminated string as source.
-    3. MemoryStream supports Peek4() for encoding detection. StringStream is specified with an encoding so it should not have Peek4().
-    \note implements Stream concept
-*/
-struct MemoryStream {
-    typedef char Ch; // byte
-
-    MemoryStream(const Ch *src, size_t size) : src_(src), begin_(src), end_(src + size), size_(size) {}
-
-    Ch Peek() const { return RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_; }
-    Ch Take() { return RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_++; }
-    size_t Tell() const { return static_cast<size_t>(src_ - begin_); }
-
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-    // For encoding detection only.
-    const Ch* Peek4() const {
-        return Tell() + 4 <= size_ ? src_ : 0;
-    }
-
-    const Ch* src_;     //!< Current read position.
-    const Ch* begin_;   //!< Original head of the string.
-    const Ch* end_;     //!< End of stream.
-    size_t size_;       //!< Size of the stream.
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_MEMORYBUFFER_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/msinttypes/inttypes.h b/sql-odbc/libraries/rapidjson/include/rapidjson/msinttypes/inttypes.h
deleted file mode 100644
index 18111286bf..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/msinttypes/inttypes.h
+++ /dev/null
@@ -1,316 +0,0 @@
-// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006-2013 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. Neither the name of the product nor the names of its contributors may
-//      be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-// The above software in this distribution may have been modified by 
-// THL A29 Limited ("Tencent Modifications"). 
-// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_INTTYPES_H_ // [
-#define _MSC_INTTYPES_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include "stdint.h"
-
-// miloyip: VC supports inttypes.h since VC2013
-#if _MSC_VER >= 1800
-#include <inttypes.h>
-#else
-
-// 7.8 Format conversion of integer types
-
-typedef struct {
-   intmax_t quot;
-   intmax_t rem;
-} imaxdiv_t;
-
-// 7.8.1 Macros for format specifiers
-
-#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198
-
-// The fprintf macros for signed integers are:
-#define PRId8       "d"
-#define PRIi8       "i"
-#define PRIdLEAST8  "d"
-#define PRIiLEAST8  "i"
-#define PRIdFAST8   "d"
-#define PRIiFAST8   "i"
-
-#define PRId16       "hd"
-#define PRIi16       "hi"
-#define PRIdLEAST16  "hd"
-#define PRIiLEAST16  "hi"
-#define PRIdFAST16   "hd"
-#define PRIiFAST16   "hi"
-
-#define PRId32       "I32d"
-#define PRIi32       "I32i"
-#define PRIdLEAST32  "I32d"
-#define PRIiLEAST32  "I32i"
-#define PRIdFAST32   "I32d"
-#define PRIiFAST32   "I32i"
-
-#define PRId64       "I64d"
-#define PRIi64       "I64i"
-#define PRIdLEAST64  "I64d"
-#define PRIiLEAST64  "I64i"
-#define PRIdFAST64   "I64d"
-#define PRIiFAST64   "I64i"
-
-#define PRIdMAX     "I64d"
-#define PRIiMAX     "I64i"
-
-#define PRIdPTR     "Id"
-#define PRIiPTR     "Ii"
-
-// The fprintf macros for unsigned integers are:
-#define PRIo8       "o"
-#define PRIu8       "u"
-#define PRIx8       "x"
-#define PRIX8       "X"
-#define PRIoLEAST8  "o"
-#define PRIuLEAST8  "u"
-#define PRIxLEAST8  "x"
-#define PRIXLEAST8  "X"
-#define PRIoFAST8   "o"
-#define PRIuFAST8   "u"
-#define PRIxFAST8   "x"
-#define PRIXFAST8   "X"
-
-#define PRIo16       "ho"
-#define PRIu16       "hu"
-#define PRIx16       "hx"
-#define PRIX16       "hX"
-#define PRIoLEAST16  "ho"
-#define PRIuLEAST16  "hu"
-#define PRIxLEAST16  "hx"
-#define PRIXLEAST16  "hX"
-#define PRIoFAST16   "ho"
-#define PRIuFAST16   "hu"
-#define PRIxFAST16   "hx"
-#define PRIXFAST16   "hX"
-
-#define PRIo32       "I32o"
-#define PRIu32       "I32u"
-#define PRIx32       "I32x"
-#define PRIX32       "I32X"
-#define PRIoLEAST32  "I32o"
-#define PRIuLEAST32  "I32u"
-#define PRIxLEAST32  "I32x"
-#define PRIXLEAST32  "I32X"
-#define PRIoFAST32   "I32o"
-#define PRIuFAST32   "I32u"
-#define PRIxFAST32   "I32x"
-#define PRIXFAST32   "I32X"
-
-#define PRIo64       "I64o"
-#define PRIu64       "I64u"
-#define PRIx64       "I64x"
-#define PRIX64       "I64X"
-#define PRIoLEAST64  "I64o"
-#define PRIuLEAST64  "I64u"
-#define PRIxLEAST64  "I64x"
-#define PRIXLEAST64  "I64X"
-#define PRIoFAST64   "I64o"
-#define PRIuFAST64   "I64u"
-#define PRIxFAST64   "I64x"
-#define PRIXFAST64   "I64X"
-
-#define PRIoMAX     "I64o"
-#define PRIuMAX     "I64u"
-#define PRIxMAX     "I64x"
-#define PRIXMAX     "I64X"
-
-#define PRIoPTR     "Io"
-#define PRIuPTR     "Iu"
-#define PRIxPTR     "Ix"
-#define PRIXPTR     "IX"
-
-// The fscanf macros for signed integers are:
-#define SCNd8       "d"
-#define SCNi8       "i"
-#define SCNdLEAST8  "d"
-#define SCNiLEAST8  "i"
-#define SCNdFAST8   "d"
-#define SCNiFAST8   "i"
-
-#define SCNd16       "hd"
-#define SCNi16       "hi"
-#define SCNdLEAST16  "hd"
-#define SCNiLEAST16  "hi"
-#define SCNdFAST16   "hd"
-#define SCNiFAST16   "hi"
-
-#define SCNd32       "ld"
-#define SCNi32       "li"
-#define SCNdLEAST32  "ld"
-#define SCNiLEAST32  "li"
-#define SCNdFAST32   "ld"
-#define SCNiFAST32   "li"
-
-#define SCNd64       "I64d"
-#define SCNi64       "I64i"
-#define SCNdLEAST64  "I64d"
-#define SCNiLEAST64  "I64i"
-#define SCNdFAST64   "I64d"
-#define SCNiFAST64   "I64i"
-
-#define SCNdMAX     "I64d"
-#define SCNiMAX     "I64i"
-
-#ifdef _WIN64 // [
-#  define SCNdPTR     "I64d"
-#  define SCNiPTR     "I64i"
-#else  // _WIN64 ][
-#  define SCNdPTR     "ld"
-#  define SCNiPTR     "li"
-#endif  // _WIN64 ]
-
-// The fscanf macros for unsigned integers are:
-#define SCNo8       "o"
-#define SCNu8       "u"
-#define SCNx8       "x"
-#define SCNX8       "X"
-#define SCNoLEAST8  "o"
-#define SCNuLEAST8  "u"
-#define SCNxLEAST8  "x"
-#define SCNXLEAST8  "X"
-#define SCNoFAST8   "o"
-#define SCNuFAST8   "u"
-#define SCNxFAST8   "x"
-#define SCNXFAST8   "X"
-
-#define SCNo16       "ho"
-#define SCNu16       "hu"
-#define SCNx16       "hx"
-#define SCNX16       "hX"
-#define SCNoLEAST16  "ho"
-#define SCNuLEAST16  "hu"
-#define SCNxLEAST16  "hx"
-#define SCNXLEAST16  "hX"
-#define SCNoFAST16   "ho"
-#define SCNuFAST16   "hu"
-#define SCNxFAST16   "hx"
-#define SCNXFAST16   "hX"
-
-#define SCNo32       "lo"
-#define SCNu32       "lu"
-#define SCNx32       "lx"
-#define SCNX32       "lX"
-#define SCNoLEAST32  "lo"
-#define SCNuLEAST32  "lu"
-#define SCNxLEAST32  "lx"
-#define SCNXLEAST32  "lX"
-#define SCNoFAST32   "lo"
-#define SCNuFAST32   "lu"
-#define SCNxFAST32   "lx"
-#define SCNXFAST32   "lX"
-
-#define SCNo64       "I64o"
-#define SCNu64       "I64u"
-#define SCNx64       "I64x"
-#define SCNX64       "I64X"
-#define SCNoLEAST64  "I64o"
-#define SCNuLEAST64  "I64u"
-#define SCNxLEAST64  "I64x"
-#define SCNXLEAST64  "I64X"
-#define SCNoFAST64   "I64o"
-#define SCNuFAST64   "I64u"
-#define SCNxFAST64   "I64x"
-#define SCNXFAST64   "I64X"
-
-#define SCNoMAX     "I64o"
-#define SCNuMAX     "I64u"
-#define SCNxMAX     "I64x"
-#define SCNXMAX     "I64X"
-
-#ifdef _WIN64 // [
-#  define SCNoPTR     "I64o"
-#  define SCNuPTR     "I64u"
-#  define SCNxPTR     "I64x"
-#  define SCNXPTR     "I64X"
-#else  // _WIN64 ][
-#  define SCNoPTR     "lo"
-#  define SCNuPTR     "lu"
-#  define SCNxPTR     "lx"
-#  define SCNXPTR     "lX"
-#endif  // _WIN64 ]
-
-#endif // __STDC_FORMAT_MACROS ]
-
-// 7.8.2 Functions for greatest-width integer types
-
-// 7.8.2.1 The imaxabs function
-#define imaxabs _abs64
-
-// 7.8.2.2 The imaxdiv function
-
-// This is modified version of div() function from Microsoft's div.c found
-// in %MSVC.NET%\crt\src\div.c
-#ifdef STATIC_IMAXDIV // [
-static
-#else // STATIC_IMAXDIV ][
-_inline
-#endif // STATIC_IMAXDIV ]
-imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
-{
-   imaxdiv_t result;
-
-   result.quot = numer / denom;
-   result.rem = numer % denom;
-
-   if (numer < 0 && result.rem > 0) {
-      // did division wrong; must fix up
-      ++result.quot;
-      result.rem -= denom;
-   }
-
-   return result;
-}
-
-// 7.8.2.3 The strtoimax and strtoumax functions
-#define strtoimax _strtoi64
-#define strtoumax _strtoui64
-
-// 7.8.2.4 The wcstoimax and wcstoumax functions
-#define wcstoimax _wcstoi64
-#define wcstoumax _wcstoui64
-
-#endif // _MSC_VER >= 1800
-
-#endif // _MSC_INTTYPES_H_ ]
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/msinttypes/stdint.h b/sql-odbc/libraries/rapidjson/include/rapidjson/msinttypes/stdint.h
deleted file mode 100644
index 3d4477b9a0..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/msinttypes/stdint.h
+++ /dev/null
@@ -1,300 +0,0 @@
-// ISO C9x  compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006-2013 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. Neither the name of the product nor the names of its contributors may
-//      be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-// The above software in this distribution may have been modified by 
-// THL A29 Limited ("Tencent Modifications"). 
-// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-// miloyip: Originally Visual Studio 2010 uses its own stdint.h. However it generates warning with INT64_C(), so change to use this file for vs2010.
-#if _MSC_VER >= 1600 // [
-#include <stdint.h>
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-#undef INT8_C
-#undef INT16_C
-#undef INT32_C
-#undef INT64_C
-#undef UINT8_C
-#undef UINT16_C
-#undef UINT32_C
-#undef UINT64_C
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
-// Check out Issue 9 for the details.
-#ifndef INTMAX_C //   [
-#  define INTMAX_C   INT64_C
-#endif // INTMAX_C    ]
-#ifndef UINTMAX_C //  [
-#  define UINTMAX_C  UINT64_C
-#endif // UINTMAX_C   ]
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-#else // ] _MSC_VER >= 1700 [
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
-// compiling for ARM we have to wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler would give many errors like this:
-//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#if defined(__cplusplus) && !defined(_M_ARM)
-extern "C" {
-#endif
-#  include <wchar.h>
-#if defined(__cplusplus) && !defined(_M_ARM)
-}
-#endif
-
-// Define _W64 macros to mark types changing their size, like intptr_t.
-#ifndef _W64
-#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-#     define _W64 __w64
-#  else
-#     define _W64
-#  endif
-#endif
-
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-
-// Visual Studio 6 and Embedded Visual C++ 4 doesn't
-// realize that, e.g. char has the same size as __int8
-// so we give up on __intX for them.
-#if (_MSC_VER < 1300)
-   typedef signed char       int8_t;
-   typedef signed short      int16_t;
-   typedef signed int        int32_t;
-   typedef unsigned char     uint8_t;
-   typedef unsigned short    uint16_t;
-   typedef unsigned int      uint32_t;
-#else
-   typedef signed __int8     int8_t;
-   typedef signed __int16    int16_t;
-   typedef signed __int32    int32_t;
-   typedef unsigned __int8   uint8_t;
-   typedef unsigned __int16  uint16_t;
-   typedef unsigned __int32  uint32_t;
-#endif
-typedef signed __int64       int64_t;
-typedef unsigned __int64     uint64_t;
-
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t    int_least8_t;
-typedef int16_t   int_least16_t;
-typedef int32_t   int_least32_t;
-typedef int64_t   int_least64_t;
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-typedef uint64_t  uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t    int_fast8_t;
-typedef int16_t   int_fast16_t;
-typedef int32_t   int_fast32_t;
-typedef int64_t   int_fast64_t;
-typedef uint8_t   uint_fast8_t;
-typedef uint16_t  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-typedef uint64_t  uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
-   typedef signed __int64    intptr_t;
-   typedef unsigned __int64  uintptr_t;
-#else // _WIN64 ][
-   typedef _W64 signed int   intptr_t;
-   typedef _W64 unsigned int uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN     ((int8_t)_I8_MIN)
-#define INT8_MAX     _I8_MAX
-#define INT16_MIN    ((int16_t)_I16_MIN)
-#define INT16_MAX    _I16_MAX
-#define INT32_MIN    ((int32_t)_I32_MIN)
-#define INT32_MAX    _I32_MAX
-#define INT64_MIN    ((int64_t)_I64_MIN)
-#define INT64_MAX    _I64_MAX
-#define UINT8_MAX    _UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MIN   INT64_MIN
-#define INT_LEAST64_MAX   INT64_MAX
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN    INT8_MIN
-#define INT_FAST8_MAX    INT8_MAX
-#define INT_FAST16_MIN   INT16_MIN
-#define INT_FAST16_MAX   INT16_MAX
-#define INT_FAST32_MIN   INT32_MIN
-#define INT_FAST32_MAX   INT32_MAX
-#define INT_FAST64_MIN   INT64_MIN
-#define INT_FAST64_MAX   INT64_MAX
-#define UINT_FAST8_MAX   UINT8_MAX
-#define UINT_FAST16_MAX  UINT16_MAX
-#define UINT_FAST32_MAX  UINT32_MAX
-#define UINT_FAST64_MAX  UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-#  define INTPTR_MIN   INT64_MIN
-#  define INTPTR_MAX   INT64_MAX
-#  define UINTPTR_MAX  UINT64_MAX
-#else // _WIN64 ][
-#  define INTPTR_MIN   INT32_MIN
-#  define INTPTR_MAX   INT32_MAX
-#  define UINTPTR_MAX  UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN   INT64_MIN
-#define INTMAX_MAX   INT64_MAX
-#define UINTMAX_MAX  UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-#  define PTRDIFF_MIN  _I64_MIN
-#  define PTRDIFF_MAX  _I64_MAX
-#else  // _WIN64 ][
-#  define PTRDIFF_MIN  _I32_MIN
-#  define PTRDIFF_MAX  _I32_MAX
-#endif  // _WIN64 ]
-
-#define SIG_ATOMIC_MIN  INT_MIN
-#define SIG_ATOMIC_MAX  INT_MAX
-
-#ifndef SIZE_MAX // [
-#  ifdef _WIN64 // [
-#     define SIZE_MAX  _UI64_MAX
-#  else // _WIN64 ][
-#     define SIZE_MAX  _UI32_MAX
-#  endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-#  define WCHAR_MIN  0
-#endif  // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-#  define WCHAR_MAX  _UI16_MAX
-#endif  // WCHAR_MAX ]
-
-#define WINT_MIN  0
-#define WINT_MAX  _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
-// Check out Issue 9 for the details.
-#ifndef INTMAX_C //   [
-#  define INTMAX_C   INT64_C
-#endif // INTMAX_C    ]
-#ifndef UINTMAX_C //  [
-#  define UINTMAX_C  UINT64_C
-#endif // UINTMAX_C   ]
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-#endif // _MSC_VER >= 1600 ]
-
-#endif // _MSC_STDINT_H_ ]
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/ostreamwrapper.h b/sql-odbc/libraries/rapidjson/include/rapidjson/ostreamwrapper.h
deleted file mode 100644
index 6f4667c08a..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/ostreamwrapper.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_OSTREAMWRAPPER_H_
-#define RAPIDJSON_OSTREAMWRAPPER_H_
-
-#include "stream.h"
-#include <iosfwd>
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Wrapper of \c std::basic_ostream into RapidJSON's Stream concept.
-/*!
-    The classes can be wrapped including but not limited to:
-
-    - \c std::ostringstream
-    - \c std::stringstream
-    - \c std::wpstringstream
-    - \c std::wstringstream
-    - \c std::ifstream
-    - \c std::fstream
-    - \c std::wofstream
-    - \c std::wfstream
-
-    \tparam StreamType Class derived from \c std::basic_ostream.
-*/
-   
-template <typename StreamType>
-class BasicOStreamWrapper {
-public:
-    typedef typename StreamType::char_type Ch;
-    BasicOStreamWrapper(StreamType& stream) : stream_(stream) {}
-
-    void Put(Ch c) {
-        stream_.put(c);
-    }
-
-    void Flush() {
-        stream_.flush();
-    }
-
-    // Not implemented
-    char Peek() const { RAPIDJSON_ASSERT(false); return 0; }
-    char Take() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
-    char* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(char*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    BasicOStreamWrapper(const BasicOStreamWrapper&);
-    BasicOStreamWrapper& operator=(const BasicOStreamWrapper&);
-
-    StreamType& stream_;
-};
-
-typedef BasicOStreamWrapper<std::ostream> OStreamWrapper;
-typedef BasicOStreamWrapper<std::wostream> WOStreamWrapper;
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_OSTREAMWRAPPER_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/pointer.h b/sql-odbc/libraries/rapidjson/include/rapidjson/pointer.h
deleted file mode 100644
index c680c70506..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/pointer.h
+++ /dev/null
@@ -1,1367 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-// clang-format off
-
-#ifndef RAPIDJSON_POINTER_H_
-#define RAPIDJSON_POINTER_H_
-
-#include "document.h"
-#include "internal/itoa.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(switch-enum)
-#endif
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-static const SizeType kPointerInvalidIndex = ~SizeType(0);  //!< Represents an invalid index in GenericPointer::Token
-
-//! Error code of parsing.
-/*! \ingroup RAPIDJSON_ERRORS
-    \see GenericPointer::GenericPointer, GenericPointer::GetParseErrorCode
-*/
-enum PointerParseErrorCode {
-    kPointerParseErrorNone = 0,                     //!< The parse is successful
-
-    kPointerParseErrorTokenMustBeginWithSolidus,    //!< A token must begin with a '/'
-    kPointerParseErrorInvalidEscape,                //!< Invalid escape
-    kPointerParseErrorInvalidPercentEncoding,       //!< Invalid percent encoding in URI fragment
-    kPointerParseErrorCharacterMustPercentEncode    //!< A character must percent encoded in URI fragment
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericPointer
-
-//! Represents a JSON Pointer. Use Pointer for UTF8 encoding and default allocator.
-/*!
-    This class implements RFC 6901 "JavaScript Object Notation (JSON) Pointer" 
-    (https://tools.ietf.org/html/rfc6901).
-
-    A JSON pointer is for identifying a specific value in a JSON document
-    (GenericDocument). It can simplify coding of DOM tree manipulation, because it
-    can access multiple-level depth of DOM tree with single API call.
-
-    After it parses a string representation (e.g. "/foo/0" or URI fragment 
-    representation (e.g. "#/foo/0") into its internal representation (tokens),
-    it can be used to resolve a specific value in multiple documents, or sub-tree 
-    of documents.
-
-    Contrary to GenericValue, Pointer can be copy constructed and copy assigned.
-    Apart from assignment, a Pointer cannot be modified after construction.
-
-    Although Pointer is very convenient, please aware that constructing Pointer
-    involves parsing and dynamic memory allocation. A special constructor with user-
-    supplied tokens eliminates these.
-
-    GenericPointer depends on GenericDocument and GenericValue.
-    
-    \tparam ValueType The value type of the DOM tree. E.g. GenericValue<UTF8<> >
-    \tparam Allocator The allocator type for allocating memory for internal representation.
-    
-    \note GenericPointer uses same encoding of ValueType.
-    However, Allocator of GenericPointer is independent of Allocator of Value.
-*/
-template <typename ValueType, typename Allocator = CrtAllocator>
-class GenericPointer {
-public:
-    typedef typename ValueType::EncodingType EncodingType;  //!< Encoding type from Value
-    typedef typename ValueType::Ch Ch;                      //!< Character type from Value
-
-    //! A token is the basic units of internal representation.
-    /*!
-        A JSON pointer string representation "/foo/123" is parsed to two tokens: 
-        "foo" and 123. 123 will be represented in both numeric form and string form.
-        They are resolved according to the actual value type (object or array).
-
-        For token that are not numbers, or the numeric value is out of bound
-        (greater than limits of SizeType), they are only treated as string form
-        (i.e. the token's index will be equal to kPointerInvalidIndex).
-
-        This struct is public so that user can create a Pointer without parsing and 
-        allocation, using a special constructor.
-    */
-    struct Token {
-        const Ch* name;             //!< Name of the token. It has null character at the end but it can contain null character.
-        SizeType length;            //!< Length of the name.
-        SizeType index;             //!< A valid array index, if it is not equal to kPointerInvalidIndex.
-    };
-
-    //!@name Constructors and destructor.
-    //@{
-
-    //! Default constructor.
-    GenericPointer(Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
-
-    //! Constructor that parses a string or URI fragment representation.
-    /*!
-        \param source A null-terminated, string or URI fragment representation of JSON pointer.
-        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
-    */
-    explicit GenericPointer(const Ch* source, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        Parse(source, internal::StrLen(source));
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Constructor that parses a string or URI fragment representation.
-    /*!
-        \param source A string or URI fragment representation of JSON pointer.
-        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
-        \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
-    */
-    explicit GenericPointer(const std::basic_string<Ch>& source, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        Parse(source.c_str(), source.size());
-    }
-#endif
-
-    //! Constructor that parses a string or URI fragment representation, with length of the source string.
-    /*!
-        \param source A string or URI fragment representation of JSON pointer.
-        \param length Length of source.
-        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
-        \note Slightly faster than the overload without length.
-    */
-    GenericPointer(const Ch* source, size_t length, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        Parse(source, length);
-    }
-
-    //! Constructor with user-supplied tokens.
-    /*!
-        This constructor let user supplies const array of tokens.
-        This prevents the parsing process and eliminates allocation.
-        This is preferred for memory constrained environments.
-
-        \param tokens An constant array of tokens representing the JSON pointer.
-        \param tokenCount Number of tokens.
-
-        \b Example
-        \code
-        #define NAME(s) { s, sizeof(s) / sizeof(s[0]) - 1, kPointerInvalidIndex }
-        #define INDEX(i) { #i, sizeof(#i) - 1, i }
-
-        static const Pointer::Token kTokens[] = { NAME("foo"), INDEX(123) };
-        static const Pointer p(kTokens, sizeof(kTokens) / sizeof(kTokens[0]));
-        // Equivalent to static const Pointer p("/foo/123");
-
-        #undef NAME
-        #undef INDEX
-        \endcode
-    */
-    GenericPointer(const Token* tokens, size_t tokenCount) : allocator_(), ownAllocator_(), nameBuffer_(), tokens_(const_cast<Token*>(tokens)), tokenCount_(tokenCount), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
-
-    //! Copy constructor.
-    GenericPointer(const GenericPointer& rhs, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        *this = rhs;
-    }
-
-    //! Destructor.
-    ~GenericPointer() {
-        if (nameBuffer_)    // If user-supplied tokens constructor is used, nameBuffer_ is nullptr and tokens_ are not deallocated.
-            Allocator::Free(tokens_);
-        RAPIDJSON_DELETE(ownAllocator_);
-    }
-
-    //! Assignment operator.
-    GenericPointer& operator=(const GenericPointer& rhs) {
-        if (this != &rhs) {
-            // Do not delete ownAllcator
-            if (nameBuffer_)
-                Allocator::Free(tokens_);
-
-            tokenCount_ = rhs.tokenCount_;
-            parseErrorOffset_ = rhs.parseErrorOffset_;
-            parseErrorCode_ = rhs.parseErrorCode_;
-
-            if (rhs.nameBuffer_)
-                CopyFromRaw(rhs); // Normally parsed tokens.
-            else {
-                tokens_ = rhs.tokens_; // User supplied const tokens.
-                nameBuffer_ = 0;
-            }
-        }
-        return *this;
-    }
-
-    //@}
-
-    //!@name Append token
-    //@{
-
-    //! Append a token and return a new Pointer
-    /*!
-        \param token Token to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const Token& token, Allocator* allocator = 0) const {
-        GenericPointer r;
-        r.allocator_ = allocator;
-        Ch *p = r.CopyFromRaw(*this, 1, token.length + 1);
-        std::memcpy(p, token.name, (token.length + 1) * sizeof(Ch));
-        r.tokens_[tokenCount_].name = p;
-        r.tokens_[tokenCount_].length = token.length;
-        r.tokens_[tokenCount_].index = token.index;
-        return r;
-    }
-
-    //! Append a name token with length, and return a new Pointer
-    /*!
-        \param name Name to be appended.
-        \param length Length of name.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const Ch* name, SizeType length, Allocator* allocator = 0) const {
-        Token token = { name, length, kPointerInvalidIndex };
-        return Append(token, allocator);
-    }
-
-    //! Append a name token without length, and return a new Pointer
-    /*!
-        \param name Name (const Ch*) to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >), (GenericPointer))
-    Append(T* name, Allocator* allocator = 0) const {
-        return Append(name, StrLen(name), allocator);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Append a name token, and return a new Pointer
-    /*!
-        \param name Name to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const std::basic_string<Ch>& name, Allocator* allocator = 0) const {
-        return Append(name.c_str(), static_cast<SizeType>(name.size()), allocator);
-    }
-#endif
-
-    //! Append a index token, and return a new Pointer
-    /*!
-        \param index Index to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(SizeType index, Allocator* allocator = 0) const {
-        char buffer[21];
-        char* end = sizeof(SizeType) == 4 ? internal::u32toa(index, buffer) : internal::u64toa(index, buffer);
-        SizeType length = static_cast<SizeType>(end - buffer);
-        buffer[length] = '\0';
-
-        #ifdef WIN32
-        #pragma warning(push)
-        #pragma warning(disable: 4127) // Conditional Expression is Constant
-        #endif // WIN32
-        if (sizeof(Ch) == 1) {
-        #ifdef WIN32
-        #pragma warning(pop)
-        #endif // WIN32
-            Token token = { reinterpret_cast<Ch*>(buffer), length, index };
-            return Append(token, allocator);
-        }
-        else {
-            Ch name[21];
-            for (size_t i = 0; i <= length; i++)
-                name[i] = buffer[i];
-            Token token = { name, length, index };
-            return Append(token, allocator);
-        }
-    }
-
-    //! Append a token by value, and return a new Pointer
-    /*!
-        \param token token to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const ValueType& token, Allocator* allocator = 0) const {
-        if (token.IsString())
-            return Append(token.GetString(), token.GetStringLength(), allocator);
-        else {
-            RAPIDJSON_ASSERT(token.IsUint64());
-            RAPIDJSON_ASSERT(token.GetUint64() <= SizeType(~0));
-            return Append(static_cast<SizeType>(token.GetUint64()), allocator);
-        }
-    }
-
-    //!@name Handling Parse Error
-    //@{
-
-    //! Check whether this is a valid pointer.
-    bool IsValid() const { return parseErrorCode_ == kPointerParseErrorNone; }
-
-    //! Get the parsing error offset in code unit.
-    size_t GetParseErrorOffset() const { return parseErrorOffset_; }
-
-    //! Get the parsing error code.
-    PointerParseErrorCode GetParseErrorCode() const { return parseErrorCode_; }
-
-    //@}
-
-    //! Get the allocator of this pointer.
-    Allocator& GetAllocator() { return *allocator_; }
-
-    //!@name Tokens
-    //@{
-
-    //! Get the token array (const version only).
-    const Token* GetTokens() const { return tokens_; }
-
-    //! Get the number of tokens.
-    size_t GetTokenCount() const { return tokenCount_; }
-
-    //@}
-
-    //!@name Equality/inequality operators
-    //@{
-
-    //! Equality operator.
-    /*!
-        \note When any pointers are invalid, always returns false.
-    */
-    bool operator==(const GenericPointer& rhs) const {
-        if (!IsValid() || !rhs.IsValid() || tokenCount_ != rhs.tokenCount_)
-            return false;
-
-        for (size_t i = 0; i < tokenCount_; i++) {
-            if (tokens_[i].index != rhs.tokens_[i].index ||
-                tokens_[i].length != rhs.tokens_[i].length || 
-                (tokens_[i].length != 0 && std::memcmp(tokens_[i].name, rhs.tokens_[i].name, sizeof(Ch)* tokens_[i].length) != 0))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    //! Inequality operator.
-    /*!
-        \note When any pointers are invalid, always returns true.
-    */
-    bool operator!=(const GenericPointer& rhs) const { return !(*this == rhs); }
-
-    //@}
-
-    //!@name Stringify
-    //@{
-
-    //! Stringify the pointer into string representation.
-    /*!
-        \tparam OutputStream Type of output stream.
-        \param os The output stream.
-    */
-    template<typename OutputStream>
-    bool Stringify(OutputStream& os) const {
-        return Stringify<false, OutputStream>(os);
-    }
-
-    //! Stringify the pointer into URI fragment representation.
-    /*!
-        \tparam OutputStream Type of output stream.
-        \param os The output stream.
-    */
-    template<typename OutputStream>
-    bool StringifyUriFragment(OutputStream& os) const {
-        return Stringify<true, OutputStream>(os);
-    }
-
-    //@}
-
-    //!@name Create value
-    //@{
-
-    //! Create a value in a subtree.
-    /*!
-        If the value is not exist, it creates all parent values and a JSON Null value.
-        So it always succeed and return the newly created or existing value.
-
-        Remind that it may change types of parents according to tokens, so it 
-        potentially removes previously stored values. For example, if a document 
-        was an array, and "/foo" is used to create a value, then the document 
-        will be changed to an object, and all existing array elements are lost.
-
-        \param root Root value of a DOM subtree to be resolved. It can be any value other than document root.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \param alreadyExist If non-null, it stores whether the resolved value is already exist.
-        \return The resolved newly created (a JSON Null value), or already exists value.
-    */
-    ValueType& Create(ValueType& root, typename ValueType::AllocatorType& allocator, bool* alreadyExist = 0) const {
-        RAPIDJSON_ASSERT(IsValid());
-        ValueType* v = &root;
-        bool exist = true;
-        for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
-            if (v->IsArray() && t->name[0] == '-' && t->length == 1) {
-                v->PushBack(ValueType().Move(), allocator);
-                v = &((*v)[v->Size() - 1]);
-                exist = false;
-            }
-            else {
-                if (t->index == kPointerInvalidIndex) { // must be object name
-                    if (!v->IsObject())
-                        v->SetObject(); // Change to Object
-                }
-                else { // object name or array index
-                    if (!v->IsArray() && !v->IsObject())
-                        v->SetArray(); // Change to Array
-                }
-
-                if (v->IsArray()) {
-                    if (t->index >= v->Size()) {
-                        v->Reserve(t->index + 1, allocator);
-                        while (t->index >= v->Size())
-                            v->PushBack(ValueType().Move(), allocator);
-                        exist = false;
-                    }
-                    v = &((*v)[t->index]);
-                }
-                else {
-                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
-                    if (m == v->MemberEnd()) {
-                        v->AddMember(ValueType(t->name, t->length, allocator).Move(), ValueType().Move(), allocator);
-                        v = &(--v->MemberEnd())->value; // Assumes AddMember() appends at the end
-                        exist = false;
-                    }
-                    else
-                        v = &m->value;
-                }
-            }
-        }
-
-        if (alreadyExist)
-            *alreadyExist = exist;
-
-        return *v;
-    }
-
-    //! Creates a value in a document.
-    /*!
-        \param document A document to be resolved.
-        \param alreadyExist If non-null, it stores whether the resolved value is already exist.
-        \return The resolved newly created, or already exists value.
-    */
-    template <typename stackAllocator>
-    ValueType& Create(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, bool* alreadyExist = 0) const {
-        return Create(document, document.GetAllocator(), alreadyExist);
-    }
-
-    //@}
-
-    //!@name Query value
-    //@{
-
-    //! Query a value in a subtree.
-    /*!
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param unresolvedTokenIndex If the pointer cannot resolve a token in the pointer, this parameter can obtain the index of unresolved token.
-        \return Pointer to the value if it can be resolved. Otherwise null.
-
-        \note
-        There are only 3 situations when a value cannot be resolved:
-        1. A value in the path is not an array nor object.
-        2. An object value does not contain the token.
-        3. A token is out of range of an array value.
-
-        Use unresolvedTokenIndex to retrieve the token index.
-    */
-    ValueType* Get(ValueType& root, size_t* unresolvedTokenIndex = 0) const {
-        RAPIDJSON_ASSERT(IsValid());
-        ValueType* v = &root;
-        for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
-            switch (v->GetType()) {
-            case kObjectType:
-                {
-                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
-                    if (m == v->MemberEnd())
-                        break;
-                    v = &m->value;
-                }
-                continue;
-            case kArrayType:
-                if (t->index == kPointerInvalidIndex || t->index >= v->Size())
-                    break;
-                v = &((*v)[t->index]);
-                continue;
-            default:
-                break;
-            }
-
-            // Error: unresolved token
-            if (unresolvedTokenIndex)
-                *unresolvedTokenIndex = static_cast<size_t>(t - tokens_);
-            return 0;
-        }
-        return v;
-    }
-
-    //! Query a const value in a const subtree.
-    /*!
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \return Pointer to the value if it can be resolved. Otherwise null.
-    */
-    const ValueType* Get(const ValueType& root, size_t* unresolvedTokenIndex = 0) const { 
-        return Get(const_cast<ValueType&>(root), unresolvedTokenIndex);
-    }
-
-    //@}
-
-    //!@name Query a value with default
-    //@{
-
-    //! Query a value in a subtree with default value.
-    /*!
-        Similar to Get(), but if the specified value do not exists, it creates all parents and clone the default value.
-        So that this function always succeed.
-
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param defaultValue Default value to be cloned if the value was not exists.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \see Create()
-    */
-    ValueType& GetWithDefault(ValueType& root, const ValueType& defaultValue, typename ValueType::AllocatorType& allocator) const {
-        bool alreadyExist;
-        Value& v = Create(root, allocator, &alreadyExist);
-        return alreadyExist ? v : v.CopyFrom(defaultValue, allocator);
-    }
-
-    //! Query a value in a subtree with default null-terminated string.
-    ValueType& GetWithDefault(ValueType& root, const Ch* defaultValue, typename ValueType::AllocatorType& allocator) const {
-        bool alreadyExist;
-        Value& v = Create(root, allocator, &alreadyExist);
-        return alreadyExist ? v : v.SetString(defaultValue, allocator);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Query a value in a subtree with default std::basic_string.
-    ValueType& GetWithDefault(ValueType& root, const std::basic_string<Ch>& defaultValue, typename ValueType::AllocatorType& allocator) const {
-        bool alreadyExist;
-        Value& v = Create(root, allocator, &alreadyExist);
-        return alreadyExist ? v : v.SetString(defaultValue, allocator);
-    }
-#endif
-
-    //! Query a value in a subtree with default primitive value.
-    /*!
-        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-    GetWithDefault(ValueType& root, T defaultValue, typename ValueType::AllocatorType& allocator) const {
-        return GetWithDefault(root, ValueType(defaultValue).Move(), allocator);
-    }
-
-    //! Query a value in a document with default value.
-    template <typename stackAllocator>
-    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const ValueType& defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-
-    //! Query a value in a document with default null-terminated string.
-    template <typename stackAllocator>
-    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const Ch* defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-    
-#if RAPIDJSON_HAS_STDSTRING
-    //! Query a value in a document with default std::basic_string.
-    template <typename stackAllocator>
-    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const std::basic_string<Ch>& defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-#endif
-
-    //! Query a value in a document with default primitive value.
-    /*!
-        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T, typename stackAllocator>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-    GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, T defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-
-    //@}
-
-    //!@name Set a value
-    //@{
-
-    //! Set a value in a subtree, with move semantics.
-    /*!
-        It creates all parents if they are not exist or types are different to the tokens.
-        So this function always succeeds but potentially remove existing values.
-
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param value Value to be set.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \see Create()
-    */
-    ValueType& Set(ValueType& root, ValueType& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = value;
-    }
-
-    //! Set a value in a subtree, with copy semantics.
-    ValueType& Set(ValueType& root, const ValueType& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator).CopyFrom(value, allocator);
-    }
-
-    //! Set a null-terminated string in a subtree.
-    ValueType& Set(ValueType& root, const Ch* value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = ValueType(value, allocator).Move();
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Set a std::basic_string in a subtree.
-    ValueType& Set(ValueType& root, const std::basic_string<Ch>& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = ValueType(value, allocator).Move();
-    }
-#endif
-
-    //! Set a primitive value in a subtree.
-    /*!
-        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-    Set(ValueType& root, T value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = ValueType(value).Move();
-    }
-
-    //! Set a value in a document, with move semantics.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, ValueType& value) const {
-        return Create(document) = value;
-    }
-
-    //! Set a value in a document, with copy semantics.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const ValueType& value) const {
-        return Create(document).CopyFrom(value, document.GetAllocator());
-    }
-
-    //! Set a null-terminated string in a document.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const Ch* value) const {
-        return Create(document) = ValueType(value, document.GetAllocator()).Move();
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Sets a std::basic_string in a document.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const std::basic_string<Ch>& value) const {
-        return Create(document) = ValueType(value, document.GetAllocator()).Move();
-    }
-#endif
-
-    //! Set a primitive value in a document.
-    /*!
-    \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T, typename stackAllocator>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-        Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, T value) const {
-            return Create(document) = value;
-    }
-
-    //@}
-
-    //!@name Swap a value
-    //@{
-
-    //! Swap a value with a value in a subtree.
-    /*!
-        It creates all parents if they are not exist or types are different to the tokens.
-        So this function always succeeds but potentially remove existing values.
-
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param value Value to be swapped.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \see Create()
-    */
-    ValueType& Swap(ValueType& root, ValueType& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator).Swap(value);
-    }
-
-    //! Swap a value with a value in a document.
-    template <typename stackAllocator>
-    ValueType& Swap(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, ValueType& value) const {
-        return Create(document).Swap(value);
-    }
-
-    //@}
-
-    //! Erase a value in a subtree.
-    /*!
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \return Whether the resolved value is found and erased.
-
-        \note Erasing with an empty pointer \c Pointer(""), i.e. the root, always fail and return false.
-    */
-    bool Erase(ValueType& root) const {
-        RAPIDJSON_ASSERT(IsValid());
-        if (tokenCount_ == 0) // Cannot erase the root
-            return false;
-
-        ValueType* v = &root;
-        const Token* last = tokens_ + (tokenCount_ - 1);
-        for (const Token *t = tokens_; t != last; ++t) {
-            switch (v->GetType()) {
-            case kObjectType:
-                {
-                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
-                    if (m == v->MemberEnd())
-                        return false;
-                    v = &m->value;
-                }
-                break;
-            case kArrayType:
-                if (t->index == kPointerInvalidIndex || t->index >= v->Size())
-                    return false;
-                v = &((*v)[t->index]);
-                break;
-            default:
-                return false;
-            }
-        }
-
-        switch (v->GetType()) {
-        case kObjectType:
-            return v->EraseMember(GenericStringRef<Ch>(last->name, last->length));
-        case kArrayType:
-            if (last->index == kPointerInvalidIndex || last->index >= v->Size())
-                return false;
-            v->Erase(v->Begin() + last->index);
-            return true;
-        default:
-            return false;
-        }
-    }
-
-private:
-    //! Clone the content from rhs to this.
-    /*!
-        \param rhs Source pointer.
-        \param extraToken Extra tokens to be allocated.
-        \param extraNameBufferSize Extra name buffer size (in number of Ch) to be allocated.
-        \return Start of non-occupied name buffer, for storing extra names.
-    */
-    Ch* CopyFromRaw(const GenericPointer& rhs, size_t extraToken = 0, size_t extraNameBufferSize = 0) {
-        if (!allocator_) // allocator is independently owned.
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
-
-        size_t nameBufferSize = rhs.tokenCount_; // null terminators for tokens
-        for (Token *t = rhs.tokens_; t != rhs.tokens_ + rhs.tokenCount_; ++t)
-            nameBufferSize += t->length;
-
-        tokenCount_ = rhs.tokenCount_ + extraToken;
-        tokens_ = static_cast<Token *>(allocator_->Malloc(tokenCount_ * sizeof(Token) + (nameBufferSize + extraNameBufferSize) * sizeof(Ch)));
-        nameBuffer_ = reinterpret_cast<Ch *>(tokens_ + tokenCount_);
-        if (rhs.tokenCount_ > 0) {
-            std::memcpy(tokens_, rhs.tokens_, rhs.tokenCount_ * sizeof(Token));
-        }
-        if (nameBufferSize > 0) {
-            std::memcpy(nameBuffer_, rhs.nameBuffer_, nameBufferSize * sizeof(Ch));
-        }
-
-        // Adjust pointers to name buffer
-        std::ptrdiff_t diff = nameBuffer_ - rhs.nameBuffer_;
-        for (Token *t = tokens_; t != tokens_ + rhs.tokenCount_; ++t)
-            t->name += diff;
-
-        return nameBuffer_ + nameBufferSize;
-    }
-
-    //! Check whether a character should be percent-encoded.
-    /*!
-        According to RFC 3986 2.3 Unreserved Characters.
-        \param c The character (code unit) to be tested.
-    */
-    bool NeedPercentEncode(Ch c) const {
-        return !((c >= '0' && c <= '9') || (c >= 'A' && c <='Z') || (c >= 'a' && c <= 'z') || c == '-' || c == '.' || c == '_' || c =='~');
-    }
-
-    //! Parse a JSON String or its URI fragment representation into tokens.
-#ifndef __clang__ // -Wdocumentation
-    /*!
-        \param source Either a JSON Pointer string, or its URI fragment representation. Not need to be null terminated.
-        \param length Length of the source string.
-        \note Source cannot be JSON String Representation of JSON Pointer, e.g. In "/\u0000", \u0000 will not be unescaped.
-    */
-#endif
-    void Parse(const Ch* source, size_t length) {
-        RAPIDJSON_ASSERT(source != NULL);
-        RAPIDJSON_ASSERT(nameBuffer_ == 0);
-        RAPIDJSON_ASSERT(tokens_ == 0);
-
-        // Create own allocator if user did not supply.
-        if (!allocator_)
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
-
-        // Count number of '/' as tokenCount
-        tokenCount_ = 0;
-        for (const Ch* s = source; s != source + length; s++) 
-            if (*s == '/')
-                tokenCount_++;
-
-        Token* token = tokens_ = static_cast<Token *>(allocator_->Malloc(tokenCount_ * sizeof(Token) + length * sizeof(Ch)));
-        Ch* name = nameBuffer_ = reinterpret_cast<Ch *>(tokens_ + tokenCount_);
-        size_t i = 0;
-
-        // Detect if it is a URI fragment
-        bool uriFragment = false;
-        if (source[i] == '#') {
-            uriFragment = true;
-            i++;
-        }
-
-        if (i != length && source[i] != '/') {
-            parseErrorCode_ = kPointerParseErrorTokenMustBeginWithSolidus;
-            goto error;
-        }
-
-        while (i < length) {
-            RAPIDJSON_ASSERT(source[i] == '/');
-            i++; // consumes '/'
-
-            token->name = name;
-            bool isNumber = true;
-
-            while (i < length && source[i] != '/') {
-                Ch c = source[i];
-                if (uriFragment) {
-                    // Decoding percent-encoding for URI fragment
-                    if (c == '%') {
-                        PercentDecodeStream is(&source[i], source + length);
-                        GenericInsituStringStream<EncodingType> os(name);
-                        Ch* begin = os.PutBegin();
-                        if (!Transcoder<UTF8<>, EncodingType>().Validate(is, os) || !is.IsValid()) {
-                            parseErrorCode_ = kPointerParseErrorInvalidPercentEncoding;
-                            goto error;
-                        }
-                        size_t len = os.PutEnd(begin);
-                        i += is.Tell() - 1;
-                        if (len == 1)
-                            c = *name;
-                        else {
-                            name += len;
-                            isNumber = false;
-                            i++;
-                            continue;
-                        }
-                    }
-                    else if (NeedPercentEncode(c)) {
-                        parseErrorCode_ = kPointerParseErrorCharacterMustPercentEncode;
-                        goto error;
-                    }
-                }
-
-                i++;
-                
-                // Escaping "~0" -> '~', "~1" -> '/'
-                if (c == '~') {
-                    if (i < length) {
-                        c = source[i];
-                        if (c == '0')       c = '~';
-                        else if (c == '1')  c = '/';
-                        else {
-                            parseErrorCode_ = kPointerParseErrorInvalidEscape;
-                            goto error;
-                        }
-                        i++;
-                    }
-                    else {
-                        parseErrorCode_ = kPointerParseErrorInvalidEscape;
-                        goto error;
-                    }
-                }
-
-                // First check for index: all of characters are digit
-                if (c < '0' || c > '9')
-                    isNumber = false;
-
-                *name++ = c;
-            }
-            token->length = static_cast<SizeType>(name - token->name);
-            if (token->length == 0)
-                isNumber = false;
-            *name++ = '\0'; // Null terminator
-
-            // Second check for index: more than one digit cannot have leading zero
-            if (isNumber && token->length > 1 && token->name[0] == '0')
-                isNumber = false;
-
-            // String to SizeType conversion
-            SizeType n = 0;
-            if (isNumber) {
-                for (size_t j = 0; j < token->length; j++) {
-                    SizeType m = n * 10 + static_cast<SizeType>(token->name[j] - '0');
-                    if (m < n) {   // overflow detection
-                        isNumber = false;
-                        break;
-                    }
-                    n = m;
-                }
-            }
-
-            token->index = isNumber ? n : kPointerInvalidIndex;
-            token++;
-        }
-
-        RAPIDJSON_ASSERT(name <= nameBuffer_ + length); // Should not overflow buffer
-        parseErrorCode_ = kPointerParseErrorNone;
-        return;
-
-    error:
-        Allocator::Free(tokens_);
-        nameBuffer_ = 0;
-        tokens_ = 0;
-        tokenCount_ = 0;
-        parseErrorOffset_ = i;
-        return;
-    }
-
-    //! Stringify to string or URI fragment representation.
-    /*!
-        \tparam uriFragment True for stringifying to URI fragment representation. False for string representation.
-        \tparam OutputStream type of output stream.
-        \param os The output stream.
-    */
-    template<bool uriFragment, typename OutputStream>
-    bool Stringify(OutputStream& os) const {
-        RAPIDJSON_ASSERT(IsValid());
-
-        if (uriFragment)
-            os.Put('#');
-
-        for (Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
-            os.Put('/');
-            for (size_t j = 0; j < t->length; j++) {
-                Ch c = t->name[j];
-                if (c == '~') {
-                    os.Put('~');
-                    os.Put('0');
-                }
-                else if (c == '/') {
-                    os.Put('~');
-                    os.Put('1');
-                }
-                else if (uriFragment && NeedPercentEncode(c)) { 
-                    // Transcode to UTF8 sequence
-                    GenericStringStream<typename ValueType::EncodingType> source(&t->name[j]);
-                    PercentEncodeStream<OutputStream> target(os);
-                    if (!Transcoder<EncodingType, UTF8<> >().Validate(source, target))
-                        return false;
-                    j += source.Tell() - 1;
-                }
-                else
-                    os.Put(c);
-            }
-        }
-        return true;
-    }
-
-    //! A helper stream for decoding a percent-encoded sequence into code unit.
-    /*!
-        This stream decodes %XY triplet into code unit (0-255).
-        If it encounters invalid characters, it sets output code unit as 0 and 
-        mark invalid, and to be checked by IsValid().
-    */
-    class PercentDecodeStream {
-    public:
-        typedef typename ValueType::Ch Ch;
-
-        //! Constructor
-        /*!
-            \param source Start of the stream
-            \param end Past-the-end of the stream.
-        */
-        PercentDecodeStream(const Ch* source, const Ch* end) : src_(source), head_(source), end_(end), valid_(true) {}
-
-        Ch Take() {
-            if (*src_ != '%' || src_ + 3 > end_) { // %XY triplet
-                valid_ = false;
-                return 0;
-            }
-            src_++;
-            Ch c = 0;
-            for (int j = 0; j < 2; j++) {
-                c = static_cast<Ch>(c << 4);
-                Ch h = *src_;
-                if      (h >= '0' && h <= '9') c = static_cast<Ch>(c + h - '0');
-                else if (h >= 'A' && h <= 'F') c = static_cast<Ch>(c + h - 'A' + 10);
-                else if (h >= 'a' && h <= 'f') c = static_cast<Ch>(c + h - 'a' + 10);
-                else {
-                    valid_ = false;
-                    return 0;
-                }
-                src_++;
-            }
-            return c;
-        }
-
-        size_t Tell() const { return static_cast<size_t>(src_ - head_); }
-        bool IsValid() const { return valid_; }
-
-    private:
-        const Ch* src_;     //!< Current read position.
-        const Ch* head_;    //!< Original head of the string.
-        const Ch* end_;     //!< Past-the-end position.
-        bool valid_;        //!< Whether the parsing is valid.
-    };
-
-    //! A helper stream to encode character (UTF-8 code unit) into percent-encoded sequence.
-    template <typename OutputStream>
-    class PercentEncodeStream {
-    public:
-        PercentEncodeStream(OutputStream& os) : os_(os) {}
-        void Put(char c) { // UTF-8 must be byte
-            unsigned char u = static_cast<unsigned char>(c);
-            static const char hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-            os_.Put('%');
-            os_.Put(hexDigits[u >> 4]);
-            os_.Put(hexDigits[u & 15]);
-        }
-    private:
-        OutputStream& os_;
-    };
-
-    Allocator* allocator_;                  //!< The current allocator. It is either user-supplied or equal to ownAllocator_.
-    Allocator* ownAllocator_;               //!< Allocator owned by this Pointer.
-    Ch* nameBuffer_;                        //!< A buffer containing all names in tokens.
-    Token* tokens_;                         //!< A list of tokens.
-    size_t tokenCount_;                     //!< Number of tokens in tokens_.
-    size_t parseErrorOffset_;               //!< Offset in code unit when parsing fail.
-    PointerParseErrorCode parseErrorCode_;  //!< Parsing error code.
-};
-
-//! GenericPointer for Value (UTF-8, default allocator).
-typedef GenericPointer<Value> Pointer;
-
-//!@name Helper functions for GenericPointer
-//@{
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& CreateValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::AllocatorType& a) {
-    return pointer.Create(root, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& CreateValueByPointer(T& root, const CharType(&source)[N], typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Create(root, a);
-}
-
-// No allocator parameter
-
-template <typename DocumentType>
-typename DocumentType::ValueType& CreateValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer) {
-    return pointer.Create(document);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& CreateValueByPointer(DocumentType& document, const CharType(&source)[N]) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Create(document);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType* GetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
-    return pointer.Get(root, unresolvedTokenIndex);
-}
-
-template <typename T>
-const typename T::ValueType* GetValueByPointer(const T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
-    return pointer.Get(root, unresolvedTokenIndex);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType* GetValueByPointer(T& root, const CharType (&source)[N], size_t* unresolvedTokenIndex = 0) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
-}
-
-template <typename T, typename CharType, size_t N>
-const typename T::ValueType* GetValueByPointer(const T& root, const CharType(&source)[N], size_t* unresolvedTokenIndex = 0) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::ValueType& defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-
-template <typename T>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::Ch* defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename T>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const std::basic_string<typename T::Ch>& defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-#endif
-
-template <typename T, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, T2 defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const typename T::ValueType& defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const typename T::Ch* defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const std::basic_string<typename T::Ch>& defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-#endif
-
-template <typename T, typename CharType, size_t N, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-GetValueByPointerWithDefault(T& root, const CharType(&source)[N], T2 defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-
-// No allocator parameter
-
-template <typename DocumentType>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::ValueType& defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::Ch* defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const std::basic_string<typename DocumentType::Ch>& defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-#endif
-
-template <typename DocumentType, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, T2 defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const typename DocumentType::ValueType& defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const typename DocumentType::Ch* defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const std::basic_string<typename DocumentType::Ch>& defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-#endif
-
-template <typename DocumentType, typename CharType, size_t N, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], T2 defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::ValueType& value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::ValueType& value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::Ch* value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const std::basic_string<typename T::Ch>& value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-#endif
-
-template <typename T, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, T2 value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], typename T::ValueType& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const typename T::ValueType& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const typename T::Ch* value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const std::basic_string<typename T::Ch>& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-#endif
-
-template <typename T, typename CharType, size_t N, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-SetValueByPointer(T& root, const CharType(&source)[N], T2 value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-// No allocator parameter
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, typename DocumentType::ValueType& value) {
-    return pointer.Set(document, value);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::ValueType& value) {
-    return pointer.Set(document, value);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::Ch* value) {
-    return pointer.Set(document, value);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const std::basic_string<typename DocumentType::Ch>& value) {
-    return pointer.Set(document, value);
-}
-#endif
-
-template <typename DocumentType, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, T2 value) {
-    return pointer.Set(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], typename DocumentType::ValueType& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const typename DocumentType::ValueType& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const typename DocumentType::Ch* value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const std::basic_string<typename DocumentType::Ch>& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-#endif
-
-template <typename DocumentType, typename CharType, size_t N, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-SetValueByPointer(DocumentType& document, const CharType(&source)[N], T2 value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& SwapValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::ValueType& value, typename T::AllocatorType& a) {
-    return pointer.Swap(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SwapValueByPointer(T& root, const CharType(&source)[N], typename T::ValueType& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Swap(root, value, a);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SwapValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, typename DocumentType::ValueType& value) {
-    return pointer.Swap(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SwapValueByPointer(DocumentType& document, const CharType(&source)[N], typename DocumentType::ValueType& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Swap(document, value);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-bool EraseValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer) {
-    return pointer.Erase(root);
-}
-
-template <typename T, typename CharType, size_t N>
-bool EraseValueByPointer(T& root, const CharType(&source)[N]) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Erase(root);
-}
-
-//@}
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_POINTER_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/prettywriter.h b/sql-odbc/libraries/rapidjson/include/rapidjson/prettywriter.h
deleted file mode 100644
index 0dcb0fee92..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/prettywriter.h
+++ /dev/null
@@ -1,255 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_PRETTYWRITER_H_
-#define RAPIDJSON_PRETTYWRITER_H_
-
-#include "writer.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Combination of PrettyWriter format flags.
-/*! \see PrettyWriter::SetFormatOptions
- */
-enum PrettyFormatOptions {
-    kFormatDefault = 0,         //!< Default pretty formatting.
-    kFormatSingleLineArray = 1  //!< Format arrays on a single line.
-};
-
-//! Writer with indentation and spacing.
-/*!
-    \tparam OutputStream Type of ouptut os.
-    \tparam SourceEncoding Encoding of source string.
-    \tparam TargetEncoding Encoding of output stream.
-    \tparam StackAllocator Type of allocator for allocating memory of stack.
-*/
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
-class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {
-public:
-    typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> Base;
-    typedef typename Base::Ch Ch;
-
-    //! Constructor
-    /*! \param os Output stream.
-        \param allocator User supplied allocator. If it is null, it will create a private one.
-        \param levelDepth Initial capacity of stack.
-    */
-    explicit PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
-        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4), formatOptions_(kFormatDefault) {}
-
-
-    explicit PrettyWriter(StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
-        Base(allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
-
-    //! Set custom indentation.
-    /*! \param indentChar       Character for indentation. Must be whitespace character (' ', '\\t', '\\n', '\\r').
-        \param indentCharCount  Number of indent characters for each indentation level.
-        \note The default indentation is 4 spaces.
-    */
-    PrettyWriter& SetIndent(Ch indentChar, unsigned indentCharCount) {
-        RAPIDJSON_ASSERT(indentChar == ' ' || indentChar == '\t' || indentChar == '\n' || indentChar == '\r');
-        indentChar_ = indentChar;
-        indentCharCount_ = indentCharCount;
-        return *this;
-    }
-
-    //! Set pretty writer formatting options.
-    /*! \param options Formatting options.
-    */
-    PrettyWriter& SetFormatOptions(PrettyFormatOptions options) {
-        formatOptions_ = options;
-        return *this;
-    }
-
-    /*! @name Implementation of Handler
-        \see Handler
-    */
-    //@{
-
-    bool Null()                 { PrettyPrefix(kNullType);   return Base::WriteNull(); }
-    bool Bool(bool b)           { PrettyPrefix(b ? kTrueType : kFalseType); return Base::WriteBool(b); }
-    bool Int(int i)             { PrettyPrefix(kNumberType); return Base::WriteInt(i); }
-    bool Uint(unsigned u)       { PrettyPrefix(kNumberType); return Base::WriteUint(u); }
-    bool Int64(int64_t i64)     { PrettyPrefix(kNumberType); return Base::WriteInt64(i64); }
-    bool Uint64(uint64_t u64)   { PrettyPrefix(kNumberType); return Base::WriteUint64(u64);  }
-    bool Double(double d)       { PrettyPrefix(kNumberType); return Base::WriteDouble(d); }
-
-    bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
-        (void)copy;
-        PrettyPrefix(kNumberType);
-        return Base::WriteString(str, length);
-    }
-
-    bool String(const Ch* str, SizeType length, bool copy = false) {
-        (void)copy;
-        PrettyPrefix(kStringType);
-        return Base::WriteString(str, length);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    bool String(const std::basic_string<Ch>& str) {
-        return String(str.data(), SizeType(str.size()));
-    }
-#endif
-
-    bool StartObject() {
-        PrettyPrefix(kObjectType);
-        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(false);
-        return Base::WriteStartObject();
-    }
-
-    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    bool Key(const std::basic_string<Ch>& str) {
-        return Key(str.data(), SizeType(str.size()));
-    }
-#endif
-	
-    bool EndObject(SizeType memberCount = 0) {
-        (void)memberCount;
-        RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
-        RAPIDJSON_ASSERT(!Base::level_stack_.template Top<typename Base::Level>()->inArray);
-        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
-
-        if (!empty) {
-            Base::os_->Put('\n');
-            WriteIndent();
-        }
-        bool ret = Base::WriteEndObject();
-        (void)ret;
-        RAPIDJSON_ASSERT(ret == true);
-        if (Base::level_stack_.Empty()) // end of json text
-            Base::os_->Flush();
-        return true;
-    }
-
-    bool StartArray() {
-        PrettyPrefix(kArrayType);
-        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(true);
-        return Base::WriteStartArray();
-    }
-
-    bool EndArray(SizeType memberCount = 0) {
-        (void)memberCount;
-        RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
-        RAPIDJSON_ASSERT(Base::level_stack_.template Top<typename Base::Level>()->inArray);
-        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
-
-        if (!empty && !(formatOptions_ & kFormatSingleLineArray)) {
-            Base::os_->Put('\n');
-            WriteIndent();
-        }
-        bool ret = Base::WriteEndArray();
-        (void)ret;
-        RAPIDJSON_ASSERT(ret == true);
-        if (Base::level_stack_.Empty()) // end of json text
-            Base::os_->Flush();
-        return true;
-    }
-
-    //@}
-
-    /*! @name Convenience extensions */
-    //@{
-
-    //! Simpler but slower overload.
-    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
-    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
-
-    //@}
-
-    //! Write a raw JSON value.
-    /*!
-        For user to write a stringified JSON as a value.
-
-        \param json A well-formed JSON value. It should not contain null character within [0, length - 1] range.
-        \param length Length of the json.
-        \param type Type of the root of json.
-        \note When using PrettyWriter::RawValue(), the result json may not be indented correctly.
-    */
-    bool RawValue(const Ch* json, size_t length, Type type) { PrettyPrefix(type); return Base::WriteRawValue(json, length); }
-
-protected:
-    void PrettyPrefix(Type type) {
-        (void)type;
-        if (Base::level_stack_.GetSize() != 0) { // this value is not at root
-            typename Base::Level* level = Base::level_stack_.template Top<typename Base::Level>();
-
-            if (level->inArray) {
-                if (level->valueCount > 0) {
-                    Base::os_->Put(','); // add comma if it is not the first element in array
-                    if (formatOptions_ & kFormatSingleLineArray)
-                        Base::os_->Put(' ');
-                }
-
-                if (!(formatOptions_ & kFormatSingleLineArray)) {
-                    Base::os_->Put('\n');
-                    WriteIndent();
-                }
-            }
-            else {  // in object
-                if (level->valueCount > 0) {
-                    if (level->valueCount % 2 == 0) {
-                        Base::os_->Put(',');
-                        Base::os_->Put('\n');
-                    }
-                    else {
-                        Base::os_->Put(':');
-                        Base::os_->Put(' ');
-                    }
-                }
-                else
-                    Base::os_->Put('\n');
-
-                if (level->valueCount % 2 == 0)
-                    WriteIndent();
-            }
-            if (!level->inArray && level->valueCount % 2 == 0)
-                RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
-            level->valueCount++;
-        }
-        else {
-            RAPIDJSON_ASSERT(!Base::hasRoot_);  // Should only has one and only one root.
-            Base::hasRoot_ = true;
-        }
-    }
-
-    void WriteIndent()  {
-        size_t count = (Base::level_stack_.GetSize() / sizeof(typename Base::Level)) * indentCharCount_;
-        PutN(*Base::os_, static_cast<typename TargetEncoding::Ch>(indentChar_), count);
-    }
-
-    Ch indentChar_;
-    unsigned indentCharCount_;
-    PrettyFormatOptions formatOptions_;
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    PrettyWriter(const PrettyWriter&);
-    PrettyWriter& operator=(const PrettyWriter&);
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_RAPIDJSON_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/rapidjson.h b/sql-odbc/libraries/rapidjson/include/rapidjson/rapidjson.h
deleted file mode 100644
index 053b2ce43f..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/rapidjson.h
+++ /dev/null
@@ -1,615 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_RAPIDJSON_H_
-#define RAPIDJSON_RAPIDJSON_H_
-
-/*!\file rapidjson.h
-    \brief common definitions and configuration
-    
-    \see RAPIDJSON_CONFIG
- */
-
-/*! \defgroup RAPIDJSON_CONFIG RapidJSON configuration
-    \brief Configuration macros for library features
-
-    Some RapidJSON features are configurable to adapt the library to a wide
-    variety of platforms, environments and usage scenarios.  Most of the
-    features can be configured in terms of overriden or predefined
-    preprocessor macros at compile-time.
-
-    Some additional customization is available in the \ref RAPIDJSON_ERRORS APIs.
-
-    \note These macros should be given on the compiler command-line
-          (where applicable)  to avoid inconsistent values when compiling
-          different translation units of a single application.
- */
-
-#include <cstdlib>  // malloc(), realloc(), free(), size_t
-#include <cstring>  // memset(), memcpy(), memmove(), memcmp()
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_VERSION_STRING
-//
-// ALWAYS synchronize the following 3 macros with corresponding variables in /CMakeLists.txt.
-//
-
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-// token stringification
-#define RAPIDJSON_STRINGIFY(x) RAPIDJSON_DO_STRINGIFY(x)
-#define RAPIDJSON_DO_STRINGIFY(x) #x
-//!@endcond
-
-/*! \def RAPIDJSON_MAJOR_VERSION
-    \ingroup RAPIDJSON_CONFIG
-    \brief Major version of RapidJSON in integer.
-*/
-/*! \def RAPIDJSON_MINOR_VERSION
-    \ingroup RAPIDJSON_CONFIG
-    \brief Minor version of RapidJSON in integer.
-*/
-/*! \def RAPIDJSON_PATCH_VERSION
-    \ingroup RAPIDJSON_CONFIG
-    \brief Patch version of RapidJSON in integer.
-*/
-/*! \def RAPIDJSON_VERSION_STRING
-    \ingroup RAPIDJSON_CONFIG
-    \brief Version of RapidJSON in "<major>.<minor>.<patch>" string format.
-*/
-#define RAPIDJSON_MAJOR_VERSION 1
-#define RAPIDJSON_MINOR_VERSION 1
-#define RAPIDJSON_PATCH_VERSION 0
-#define RAPIDJSON_VERSION_STRING \
-    RAPIDJSON_STRINGIFY(RAPIDJSON_MAJOR_VERSION.RAPIDJSON_MINOR_VERSION.RAPIDJSON_PATCH_VERSION)
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_NAMESPACE_(BEGIN|END)
-/*! \def RAPIDJSON_NAMESPACE
-    \ingroup RAPIDJSON_CONFIG
-    \brief   provide custom rapidjson namespace
-
-    In order to avoid symbol clashes and/or "One Definition Rule" errors
-    between multiple inclusions of (different versions of) RapidJSON in
-    a single binary, users can customize the name of the main RapidJSON
-    namespace.
-
-    In case of a single nesting level, defining \c RAPIDJSON_NAMESPACE
-    to a custom name (e.g. \c MyRapidJSON) is sufficient.  If multiple
-    levels are needed, both \ref RAPIDJSON_NAMESPACE_BEGIN and \ref
-    RAPIDJSON_NAMESPACE_END need to be defined as well:
-
-    \code
-    // in some .cpp file
-    #define RAPIDJSON_NAMESPACE my::rapidjson
-    #define RAPIDJSON_NAMESPACE_BEGIN namespace my { namespace rapidjson {
-    #define RAPIDJSON_NAMESPACE_END   } }
-    #include "rapidjson/..."
-    \endcode
-
-    \see rapidjson
- */
-/*! \def RAPIDJSON_NAMESPACE_BEGIN
-    \ingroup RAPIDJSON_CONFIG
-    \brief   provide custom rapidjson namespace (opening expression)
-    \see RAPIDJSON_NAMESPACE
-*/
-/*! \def RAPIDJSON_NAMESPACE_END
-    \ingroup RAPIDJSON_CONFIG
-    \brief   provide custom rapidjson namespace (closing expression)
-    \see RAPIDJSON_NAMESPACE
-*/
-#ifndef RAPIDJSON_NAMESPACE
-#define RAPIDJSON_NAMESPACE rapidjson
-#endif
-#ifndef RAPIDJSON_NAMESPACE_BEGIN
-#define RAPIDJSON_NAMESPACE_BEGIN namespace RAPIDJSON_NAMESPACE {
-#endif
-#ifndef RAPIDJSON_NAMESPACE_END
-#define RAPIDJSON_NAMESPACE_END }
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_HAS_STDSTRING
-
-#ifndef RAPIDJSON_HAS_STDSTRING
-#ifdef RAPIDJSON_DOXYGEN_RUNNING
-#define RAPIDJSON_HAS_STDSTRING 1 // force generation of documentation
-#else
-#define RAPIDJSON_HAS_STDSTRING 0 // no std::string support by default
-#endif
-/*! \def RAPIDJSON_HAS_STDSTRING
-    \ingroup RAPIDJSON_CONFIG
-    \brief Enable RapidJSON support for \c std::string
-
-    By defining this preprocessor symbol to \c 1, several convenience functions for using
-    \ref rapidjson::GenericValue with \c std::string are enabled, especially
-    for construction and comparison.
-
-    \hideinitializer
-*/
-#endif // !defined(RAPIDJSON_HAS_STDSTRING)
-
-#if RAPIDJSON_HAS_STDSTRING
-#include <string>
-#endif // RAPIDJSON_HAS_STDSTRING
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_NO_INT64DEFINE
-
-/*! \def RAPIDJSON_NO_INT64DEFINE
-    \ingroup RAPIDJSON_CONFIG
-    \brief Use external 64-bit integer types.
-
-    RapidJSON requires the 64-bit integer types \c int64_t and  \c uint64_t types
-    to be available at global scope.
-
-    If users have their own definition, define RAPIDJSON_NO_INT64DEFINE to
-    prevent RapidJSON from defining its own types.
-*/
-#ifndef RAPIDJSON_NO_INT64DEFINE
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#if defined(_MSC_VER) && (_MSC_VER < 1800)	// Visual Studio 2013
-#include "msinttypes/stdint.h"
-#include "msinttypes/inttypes.h"
-#else
-// Other compilers should have this.
-#include <stdint.h>
-#include <inttypes.h>
-#endif
-//!@endcond
-#ifdef RAPIDJSON_DOXYGEN_RUNNING
-#define RAPIDJSON_NO_INT64DEFINE
-#endif
-#endif // RAPIDJSON_NO_INT64TYPEDEF
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_FORCEINLINE
-
-#ifndef RAPIDJSON_FORCEINLINE
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#if defined(_MSC_VER) && defined(NDEBUG)
-#define RAPIDJSON_FORCEINLINE __forceinline
-#elif defined(__GNUC__) && __GNUC__ >= 4 && defined(NDEBUG)
-#define RAPIDJSON_FORCEINLINE __attribute__((always_inline))
-#else
-#define RAPIDJSON_FORCEINLINE
-#endif
-//!@endcond
-#endif // RAPIDJSON_FORCEINLINE
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ENDIAN
-#define RAPIDJSON_LITTLEENDIAN  0   //!< Little endian machine
-#define RAPIDJSON_BIGENDIAN     1   //!< Big endian machine
-
-//! Endianness of the machine.
-/*!
-    \def RAPIDJSON_ENDIAN
-    \ingroup RAPIDJSON_CONFIG
-
-    GCC 4.6 provided macro for detecting endianness of the target machine. But other
-    compilers may not have this. User can define RAPIDJSON_ENDIAN to either
-    \ref RAPIDJSON_LITTLEENDIAN or \ref RAPIDJSON_BIGENDIAN.
-
-    Default detection implemented with reference to
-    \li https://gcc.gnu.org/onlinedocs/gcc-4.6.0/cpp/Common-Predefined-Macros.html
-    \li http://www.boost.org/doc/libs/1_42_0/boost/detail/endian.hpp
-*/
-#ifndef RAPIDJSON_ENDIAN
-// Detect with GCC 4.6's macro
-#  ifdef __BYTE_ORDER__
-#    if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#      define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#    elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-#    else
-#      error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.
-#    endif // __BYTE_ORDER__
-// Detect with GLIBC's endian.h
-#  elif defined(__GLIBC__)
-#    include <endian.h>
-#    if (__BYTE_ORDER == __LITTLE_ENDIAN)
-#      define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#    elif (__BYTE_ORDER == __BIG_ENDIAN)
-#      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-#    else
-#      error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.
-#   endif // __GLIBC__
-// Detect with _LITTLE_ENDIAN and _BIG_ENDIAN macro
-#  elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
-#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#  elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
-#    define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-// Detect with architecture macros
-#  elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__)
-#    define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-#  elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
-#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#  elif defined(_MSC_VER) && defined(_M_ARM)
-#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#  elif defined(RAPIDJSON_DOXYGEN_RUNNING)
-#    define RAPIDJSON_ENDIAN
-#  else
-#    error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.   
-#  endif
-#endif // RAPIDJSON_ENDIAN
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_64BIT
-
-//! Whether using 64-bit architecture
-#ifndef RAPIDJSON_64BIT
-#if defined(__LP64__) || (defined(__x86_64__) && defined(__ILP32__)) || defined(_WIN64) || defined(__EMSCRIPTEN__)
-#define RAPIDJSON_64BIT 1
-#else
-#define RAPIDJSON_64BIT 0
-#endif
-#endif // RAPIDJSON_64BIT
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ALIGN
-
-//! Data alignment of the machine.
-/*! \ingroup RAPIDJSON_CONFIG
-    \param x pointer to align
-
-    Some machines require strict data alignment. Currently the default uses 4 bytes
-    alignment on 32-bit platforms and 8 bytes alignment for 64-bit platforms.
-    User can customize by defining the RAPIDJSON_ALIGN function macro.
-*/
-#ifndef RAPIDJSON_ALIGN
-#if RAPIDJSON_64BIT == 1
-#define RAPIDJSON_ALIGN(x) (((x) + static_cast<uint64_t>(7u)) & ~static_cast<uint64_t>(7u))
-#else
-#define RAPIDJSON_ALIGN(x) (((x) + 3u) & ~3u)
-#endif
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_UINT64_C2
-
-//! Construct a 64-bit literal by a pair of 32-bit integer.
-/*!
-    64-bit literal with or without ULL suffix is prone to compiler warnings.
-    UINT64_C() is C macro which cause compilation problems.
-    Use this macro to define 64-bit constants by a pair of 32-bit integer.
-*/
-#ifndef RAPIDJSON_UINT64_C2
-#define RAPIDJSON_UINT64_C2(high32, low32) ((static_cast<uint64_t>(high32) << 32) | static_cast<uint64_t>(low32))
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_48BITPOINTER_OPTIMIZATION
-
-//! Use only lower 48-bit address for some pointers.
-/*!
-    \ingroup RAPIDJSON_CONFIG
-
-    This optimization uses the fact that current X86-64 architecture only implement lower 48-bit virtual address.
-    The higher 16-bit can be used for storing other data.
-    \c GenericValue uses this optimization to reduce its size form 24 bytes to 16 bytes in 64-bit architecture.
-*/
-#ifndef RAPIDJSON_48BITPOINTER_OPTIMIZATION
-#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
-#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 1
-#else
-#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 0
-#endif
-#endif // RAPIDJSON_48BITPOINTER_OPTIMIZATION
-
-#if RAPIDJSON_48BITPOINTER_OPTIMIZATION == 1
-#if RAPIDJSON_64BIT != 1
-#error RAPIDJSON_48BITPOINTER_OPTIMIZATION can only be set to 1 when RAPIDJSON_64BIT=1
-#endif
-#define RAPIDJSON_SETPOINTER(type, p, x) (p = reinterpret_cast<type *>((reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(RAPIDJSON_UINT64_C2(0xFFFF0000, 0x00000000))) | reinterpret_cast<uintptr_t>(reinterpret_cast<const void*>(x))))
-#define RAPIDJSON_GETPOINTER(type, p) (reinterpret_cast<type *>(reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(RAPIDJSON_UINT64_C2(0x0000FFFF, 0xFFFFFFFF))))
-#else
-#define RAPIDJSON_SETPOINTER(type, p, x) (p = (x))
-#define RAPIDJSON_GETPOINTER(type, p) (p)
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_SSE2/RAPIDJSON_SSE42/RAPIDJSON_SIMD
-
-/*! \def RAPIDJSON_SIMD
-    \ingroup RAPIDJSON_CONFIG
-    \brief Enable SSE2/SSE4.2 optimization.
-
-    RapidJSON supports optimized implementations for some parsing operations
-    based on the SSE2 or SSE4.2 SIMD extensions on modern Intel-compatible
-    processors.
-
-    To enable these optimizations, two different symbols can be defined;
-    \code
-    // Enable SSE2 optimization.
-    #define RAPIDJSON_SSE2
-
-    // Enable SSE4.2 optimization.
-    #define RAPIDJSON_SSE42
-    \endcode
-
-    \c RAPIDJSON_SSE42 takes precedence, if both are defined.
-
-    If any of these symbols is defined, RapidJSON defines the macro
-    \c RAPIDJSON_SIMD to indicate the availability of the optimized code.
-*/
-#if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42) \
-    || defined(RAPIDJSON_DOXYGEN_RUNNING)
-#define RAPIDJSON_SIMD
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_NO_SIZETYPEDEFINE
-
-#ifndef RAPIDJSON_NO_SIZETYPEDEFINE
-/*! \def RAPIDJSON_NO_SIZETYPEDEFINE
-    \ingroup RAPIDJSON_CONFIG
-    \brief User-provided \c SizeType definition.
-
-    In order to avoid using 32-bit size types for indexing strings and arrays,
-    define this preprocessor symbol and provide the type rapidjson::SizeType
-    before including RapidJSON:
-    \code
-    #define RAPIDJSON_NO_SIZETYPEDEFINE
-    namespace rapidjson { typedef ::std::size_t SizeType; }
-    #include "rapidjson/..."
-    \endcode
-
-    \see rapidjson::SizeType
-*/
-#ifdef RAPIDJSON_DOXYGEN_RUNNING
-#define RAPIDJSON_NO_SIZETYPEDEFINE
-#endif
-RAPIDJSON_NAMESPACE_BEGIN
-//! Size type (for string lengths, array sizes, etc.)
-/*! RapidJSON uses 32-bit array/string indices even on 64-bit platforms,
-    instead of using \c size_t. Users may override the SizeType by defining
-    \ref RAPIDJSON_NO_SIZETYPEDEFINE.
-*/
-typedef unsigned SizeType;
-RAPIDJSON_NAMESPACE_END
-#endif
-
-// always import std::size_t to rapidjson namespace
-RAPIDJSON_NAMESPACE_BEGIN
-using std::size_t;
-RAPIDJSON_NAMESPACE_END
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ASSERT
-
-//! Assertion.
-/*! \ingroup RAPIDJSON_CONFIG
-    By default, rapidjson uses C \c assert() for internal assertions.
-    User can override it by defining RAPIDJSON_ASSERT(x) macro.
-
-    \note Parsing errors are handled and can be customized by the
-          \ref RAPIDJSON_ERRORS APIs.
-*/
-#ifndef RAPIDJSON_ASSERT
-#include <cassert>
-#define RAPIDJSON_ASSERT(x) assert(x)
-#endif // RAPIDJSON_ASSERT
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_STATIC_ASSERT
-
-// Adopt from boost
-#ifndef RAPIDJSON_STATIC_ASSERT
-#ifndef __clang__
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#endif
-RAPIDJSON_NAMESPACE_BEGIN
-template <bool x> struct STATIC_ASSERTION_FAILURE;
-template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
-template<int x> struct StaticAssertTest {};
-RAPIDJSON_NAMESPACE_END
-
-#define RAPIDJSON_JOIN(X, Y) RAPIDJSON_DO_JOIN(X, Y)
-#define RAPIDJSON_DO_JOIN(X, Y) RAPIDJSON_DO_JOIN2(X, Y)
-#define RAPIDJSON_DO_JOIN2(X, Y) X##Y
-
-#if defined(__GNUC__)
-#define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
-#else
-#define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE 
-#endif
-#ifndef __clang__
-//!@endcond
-#endif
-
-/*! \def RAPIDJSON_STATIC_ASSERT
-    \brief (Internal) macro to check for conditions at compile-time
-    \param x compile-time condition
-    \hideinitializer
- */
-#define RAPIDJSON_STATIC_ASSERT(x) \
-    typedef ::RAPIDJSON_NAMESPACE::StaticAssertTest< \
-      sizeof(::RAPIDJSON_NAMESPACE::STATIC_ASSERTION_FAILURE<bool(x) >)> \
-    RAPIDJSON_JOIN(StaticAssertTypedef, __LINE__) RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_LIKELY, RAPIDJSON_UNLIKELY
-
-//! Compiler branching hint for expression with high probability to be true.
-/*!
-    \ingroup RAPIDJSON_CONFIG
-    \param x Boolean expression likely to be true.
-*/
-#ifndef RAPIDJSON_LIKELY
-#if defined(__GNUC__) || defined(__clang__)
-#define RAPIDJSON_LIKELY(x) __builtin_expect(!!(x), 1)
-#else
-#define RAPIDJSON_LIKELY(x) (x)
-#endif
-#endif
-
-//! Compiler branching hint for expression with low probability to be true.
-/*!
-    \ingroup RAPIDJSON_CONFIG
-    \param x Boolean expression unlikely to be true.
-*/
-#ifndef RAPIDJSON_UNLIKELY
-#if defined(__GNUC__) || defined(__clang__)
-#define RAPIDJSON_UNLIKELY(x) __builtin_expect(!!(x), 0)
-#else
-#define RAPIDJSON_UNLIKELY(x) (x)
-#endif
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Helpers
-
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-
-#define RAPIDJSON_MULTILINEMACRO_BEGIN do {  
-#define RAPIDJSON_MULTILINEMACRO_END \
-} while((void)0, 0)
-
-// adopted from Boost
-#define RAPIDJSON_VERSION_CODE(x,y,z) \
-  (((x)*100000) + ((y)*100) + (z))
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_DIAG_PUSH/POP, RAPIDJSON_DIAG_OFF
-
-#if defined(__GNUC__)
-#define RAPIDJSON_GNUC \
-    RAPIDJSON_VERSION_CODE(__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__)
-#endif
-
-#if defined(__clang__) || (defined(RAPIDJSON_GNUC) && RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,2,0))
-
-#define RAPIDJSON_PRAGMA(x) _Pragma(RAPIDJSON_STRINGIFY(x))
-#define RAPIDJSON_DIAG_PRAGMA(x) RAPIDJSON_PRAGMA(GCC diagnostic x)
-#define RAPIDJSON_DIAG_OFF(x) \
-    RAPIDJSON_DIAG_PRAGMA(ignored RAPIDJSON_STRINGIFY(RAPIDJSON_JOIN(-W,x)))
-
-// push/pop support in Clang and GCC>=4.6
-#if defined(__clang__) || (defined(RAPIDJSON_GNUC) && RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0))
-#define RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PRAGMA(push)
-#define RAPIDJSON_DIAG_POP  RAPIDJSON_DIAG_PRAGMA(pop)
-#else // GCC >= 4.2, < 4.6
-#define RAPIDJSON_DIAG_PUSH /* ignored */
-#define RAPIDJSON_DIAG_POP /* ignored */
-#endif
-
-#elif defined(_MSC_VER)
-
-// pragma (MSVC specific)
-#define RAPIDJSON_PRAGMA(x) __pragma(x)
-#define RAPIDJSON_DIAG_PRAGMA(x) RAPIDJSON_PRAGMA(warning(x))
-
-#define RAPIDJSON_DIAG_OFF(x) RAPIDJSON_DIAG_PRAGMA(disable: x)
-#define RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PRAGMA(push)
-#define RAPIDJSON_DIAG_POP  RAPIDJSON_DIAG_PRAGMA(pop)
-
-#else
-
-#define RAPIDJSON_DIAG_OFF(x) /* ignored */
-#define RAPIDJSON_DIAG_PUSH   /* ignored */
-#define RAPIDJSON_DIAG_POP    /* ignored */
-
-#endif // RAPIDJSON_DIAG_*
-
-///////////////////////////////////////////////////////////////////////////////
-// C++11 features
-
-#ifndef RAPIDJSON_HAS_CXX11_RVALUE_REFS
-#if defined(__clang__)
-#if __has_feature(cxx_rvalue_references) && \
-    (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__) && __GLIBCXX__ >= 20080306)
-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
-#else
-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 0
-#endif
-#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
-      (defined(_MSC_VER) && _MSC_VER >= 1600)
-
-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
-#else
-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 0
-#endif
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-#ifndef RAPIDJSON_HAS_CXX11_NOEXCEPT
-#if defined(__clang__)
-#define RAPIDJSON_HAS_CXX11_NOEXCEPT __has_feature(cxx_noexcept)
-#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__))
-//    (defined(_MSC_VER) && _MSC_VER >= ????) // not yet supported
-#define RAPIDJSON_HAS_CXX11_NOEXCEPT 1
-#else
-#define RAPIDJSON_HAS_CXX11_NOEXCEPT 0
-#endif
-#endif
-#if RAPIDJSON_HAS_CXX11_NOEXCEPT
-#define RAPIDJSON_NOEXCEPT noexcept
-#else
-#define RAPIDJSON_NOEXCEPT /* noexcept */
-#endif // RAPIDJSON_HAS_CXX11_NOEXCEPT
-
-// no automatic detection, yet
-#ifndef RAPIDJSON_HAS_CXX11_TYPETRAITS
-#define RAPIDJSON_HAS_CXX11_TYPETRAITS 0
-#endif
-
-#ifndef RAPIDJSON_HAS_CXX11_RANGE_FOR
-#if defined(__clang__)
-#define RAPIDJSON_HAS_CXX11_RANGE_FOR __has_feature(cxx_range_for)
-#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
-      (defined(_MSC_VER) && _MSC_VER >= 1700)
-#define RAPIDJSON_HAS_CXX11_RANGE_FOR 1
-#else
-#define RAPIDJSON_HAS_CXX11_RANGE_FOR 0
-#endif
-#endif // RAPIDJSON_HAS_CXX11_RANGE_FOR
-
-//!@endcond
-
-///////////////////////////////////////////////////////////////////////////////
-// new/delete
-
-#ifndef RAPIDJSON_NEW
-///! customization point for global \c new
-#define RAPIDJSON_NEW(x) new x
-#endif
-#ifndef RAPIDJSON_DELETE
-///! customization point for global \c delete
-#define RAPIDJSON_DELETE(x) delete x
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Type
-
-/*! \namespace rapidjson
-    \brief main RapidJSON namespace
-    \see RAPIDJSON_NAMESPACE
-*/
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Type of JSON value
-enum Type {
-    kNullType = 0,      //!< null
-    kFalseType = 1,     //!< false
-    kTrueType = 2,      //!< true
-    kObjectType = 3,    //!< object
-    kArrayType = 4,     //!< array 
-    kStringType = 5,    //!< string
-    kNumberType = 6     //!< number
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_RAPIDJSON_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/reader.h b/sql-odbc/libraries/rapidjson/include/rapidjson/reader.h
deleted file mode 100644
index 19f8849b14..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/reader.h
+++ /dev/null
@@ -1,1879 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_READER_H_
-#define RAPIDJSON_READER_H_
-
-/*! \file reader.h */
-
-#include "allocators.h"
-#include "stream.h"
-#include "encodedstream.h"
-#include "internal/meta.h"
-#include "internal/stack.h"
-#include "internal/strtod.h"
-#include <limits>
-
-#if defined(RAPIDJSON_SIMD) && defined(_MSC_VER)
-#include <intrin.h>
-#pragma intrinsic(_BitScanForward)
-#endif
-#ifdef RAPIDJSON_SSE42
-#include <nmmintrin.h>
-#elif defined(RAPIDJSON_SSE2)
-#include <emmintrin.h>
-#endif
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4127)  // conditional expression is constant
-RAPIDJSON_DIAG_OFF(4702)  // unreachable code
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(old-style-cast)
-RAPIDJSON_DIAG_OFF(padded)
-RAPIDJSON_DIAG_OFF(switch-enum)
-#endif
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#define RAPIDJSON_NOTHING /* deliberately empty */
-#ifndef RAPIDJSON_PARSE_ERROR_EARLY_RETURN
-#define RAPIDJSON_PARSE_ERROR_EARLY_RETURN(value) \
-    RAPIDJSON_MULTILINEMACRO_BEGIN \
-    if (RAPIDJSON_UNLIKELY(HasParseError())) { return value; } \
-    RAPIDJSON_MULTILINEMACRO_END
-#endif
-#define RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID \
-    RAPIDJSON_PARSE_ERROR_EARLY_RETURN(RAPIDJSON_NOTHING)
-//!@endcond
-
-/*! \def RAPIDJSON_PARSE_ERROR_NORETURN
-    \ingroup RAPIDJSON_ERRORS
-    \brief Macro to indicate a parse error.
-    \param parseErrorCode \ref rapidjson::ParseErrorCode of the error
-    \param offset  position of the error in JSON input (\c size_t)
-
-    This macros can be used as a customization point for the internal
-    error handling mechanism of RapidJSON.
-
-    A common usage model is to throw an exception instead of requiring the
-    caller to explicitly check the \ref rapidjson::GenericReader::Parse's
-    return value:
-
-    \code
-    #define RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode,offset) \
-       throw ParseException(parseErrorCode, #parseErrorCode, offset)
-
-    #include <stdexcept>               // std::runtime_error
-    #include "rapidjson/error/error.h" // rapidjson::ParseResult
-
-    struct ParseException : std::runtime_error, rapidjson::ParseResult {
-      ParseException(rapidjson::ParseErrorCode code, const char* msg, size_t offset)
-        : std::runtime_error(msg), ParseResult(code, offset) {}
-    };
-
-    #include "rapidjson/reader.h"
-    \endcode
-
-    \see RAPIDJSON_PARSE_ERROR, rapidjson::GenericReader::Parse
- */
-#ifndef RAPIDJSON_PARSE_ERROR_NORETURN
-#define RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode, offset) \
-    RAPIDJSON_MULTILINEMACRO_BEGIN \
-    RAPIDJSON_ASSERT(!HasParseError()); /* Error can only be assigned once */ \
-    SetParseError(parseErrorCode, offset); \
-    RAPIDJSON_MULTILINEMACRO_END
-#endif
-
-/*! \def RAPIDJSON_PARSE_ERROR
-    \ingroup RAPIDJSON_ERRORS
-    \brief (Internal) macro to indicate and handle a parse error.
-    \param parseErrorCode \ref rapidjson::ParseErrorCode of the error
-    \param offset  position of the error in JSON input (\c size_t)
-
-    Invokes RAPIDJSON_PARSE_ERROR_NORETURN and stops the parsing.
-
-    \see RAPIDJSON_PARSE_ERROR_NORETURN
-    \hideinitializer
- */
-#ifndef RAPIDJSON_PARSE_ERROR
-#define RAPIDJSON_PARSE_ERROR(parseErrorCode, offset) \
-    RAPIDJSON_MULTILINEMACRO_BEGIN \
-    RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode, offset); \
-    RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID; \
-    RAPIDJSON_MULTILINEMACRO_END
-#endif
-
-#include "error/error.h" // ParseErrorCode, ParseResult
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// ParseFlag
-
-/*! \def RAPIDJSON_PARSE_DEFAULT_FLAGS
-    \ingroup RAPIDJSON_CONFIG
-    \brief User-defined kParseDefaultFlags definition.
-
-    User can define this as any \c ParseFlag combinations.
-*/
-#ifndef RAPIDJSON_PARSE_DEFAULT_FLAGS
-#define RAPIDJSON_PARSE_DEFAULT_FLAGS kParseNoFlags
-#endif
-
-//! Combination of parseFlags
-/*! \see Reader::Parse, Document::Parse, Document::ParseInsitu, Document::ParseStream
- */
-enum ParseFlag {
-    kParseNoFlags = 0,              //!< No flags are set.
-    kParseInsituFlag = 1,           //!< In-situ(destructive) parsing.
-    kParseValidateEncodingFlag = 2, //!< Validate encoding of JSON strings.
-    kParseIterativeFlag = 4,        //!< Iterative(constant complexity in terms of function call stack size) parsing.
-    kParseStopWhenDoneFlag = 8,     //!< After parsing a complete JSON root from stream, stop further processing the rest of stream. When this flag is used, parser will not generate kParseErrorDocumentRootNotSingular error.
-    kParseFullPrecisionFlag = 16,   //!< Parse number in full precision (but slower).
-    kParseCommentsFlag = 32,        //!< Allow one-line (//) and multi-line (/**/) comments.
-    kParseNumbersAsStringsFlag = 64,    //!< Parse all numbers (ints/doubles) as strings.
-    kParseTrailingCommasFlag = 128, //!< Allow trailing commas at the end of objects and arrays.
-    kParseNanAndInfFlag = 256,      //!< Allow parsing NaN, Inf, Infinity, -Inf and -Infinity as doubles.
-    kParseDefaultFlags = RAPIDJSON_PARSE_DEFAULT_FLAGS  //!< Default parse flags. Can be customized by defining RAPIDJSON_PARSE_DEFAULT_FLAGS
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Handler
-
-/*! \class rapidjson::Handler
-    \brief Concept for receiving events from GenericReader upon parsing.
-    The functions return true if no error occurs. If they return false,
-    the event publisher should terminate the process.
-\code
-concept Handler {
-    typename Ch;
-
-    bool Null();
-    bool Bool(bool b);
-    bool Int(int i);
-    bool Uint(unsigned i);
-    bool Int64(int64_t i);
-    bool Uint64(uint64_t i);
-    bool Double(double d);
-    /// enabled via kParseNumbersAsStringsFlag, string is not null-terminated (use length)
-    bool RawNumber(const Ch* str, SizeType length, bool copy);
-    bool String(const Ch* str, SizeType length, bool copy);
-    bool StartObject();
-    bool Key(const Ch* str, SizeType length, bool copy);
-    bool EndObject(SizeType memberCount);
-    bool StartArray();
-    bool EndArray(SizeType elementCount);
-};
-\endcode
-*/
-///////////////////////////////////////////////////////////////////////////////
-// BaseReaderHandler
-
-//! Default implementation of Handler.
-/*! This can be used as base class of any reader handler.
-    \note implements Handler concept
-*/
-template<typename Encoding = UTF8<>, typename Derived = void>
-struct BaseReaderHandler {
-    typedef typename Encoding::Ch Ch;
-
-    typedef typename internal::SelectIf<internal::IsSame<Derived, void>, BaseReaderHandler, Derived>::Type Override;
-
-    bool Default() { return true; }
-    bool Null() { return static_cast<Override&>(*this).Default(); }
-    bool Bool(bool) { return static_cast<Override&>(*this).Default(); }
-    bool Int(int) { return static_cast<Override&>(*this).Default(); }
-    bool Uint(unsigned) { return static_cast<Override&>(*this).Default(); }
-    bool Int64(int64_t) { return static_cast<Override&>(*this).Default(); }
-    bool Uint64(uint64_t) { return static_cast<Override&>(*this).Default(); }
-    bool Double(double) { return static_cast<Override&>(*this).Default(); }
-    /// enabled via kParseNumbersAsStringsFlag, string is not null-terminated (use length)
-    bool RawNumber(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
-    bool String(const Ch*, SizeType, bool) { return static_cast<Override&>(*this).Default(); }
-    bool StartObject() { return static_cast<Override&>(*this).Default(); }
-    bool Key(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
-    bool EndObject(SizeType) { return static_cast<Override&>(*this).Default(); }
-    bool StartArray() { return static_cast<Override&>(*this).Default(); }
-    bool EndArray(SizeType) { return static_cast<Override&>(*this).Default(); }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// StreamLocalCopy
-
-namespace internal {
-
-template<typename Stream, int = StreamTraits<Stream>::copyOptimization>
-class StreamLocalCopy;
-
-//! Do copy optimization.
-template<typename Stream>
-class StreamLocalCopy<Stream, 1> {
-public:
-    StreamLocalCopy(Stream& original) : s(original), original_(original) {}
-    ~StreamLocalCopy() { original_ = s; }
-
-    Stream s;
-
-private:
-    StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
-
-    Stream& original_;
-};
-
-//! Keep reference.
-template<typename Stream>
-class StreamLocalCopy<Stream, 0> {
-public:
-    StreamLocalCopy(Stream& original) : s(original) {}
-
-    Stream& s;
-
-private:
-    StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
-};
-
-} // namespace internal
-
-///////////////////////////////////////////////////////////////////////////////
-// SkipWhitespace
-
-//! Skip the JSON white spaces in a stream.
-/*! \param is A input stream for skipping white spaces.
-    \note This function has SSE2/SSE4.2 specialization.
-*/
-template<typename InputStream>
-void SkipWhitespace(InputStream& is) {
-    internal::StreamLocalCopy<InputStream> copy(is);
-    InputStream& s(copy.s);
-
-    typename InputStream::Ch c;
-    while ((c = s.Peek()) == ' ' || c == '\n' || c == '\r' || c == '\t')
-        s.Take();
-}
-
-inline const char* SkipWhitespace(const char* p, const char* end) {
-    while (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
-        ++p;
-    return p;
-}
-
-#ifdef RAPIDJSON_SSE42
-//! Skip whitespace with SSE 4.2 pcmpistrm instruction, testing 16 8-byte characters at once.
-inline const char *SkipWhitespace_SIMD(const char* p) {
-    // Fast return for single non-whitespace
-    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-        ++p;
-    else
-        return p;
-
-    // 16-byte align to the next boundary
-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-    while (p != nextAligned)
-        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-            ++p;
-        else
-            return p;
-
-    // The rest of string using SIMD
-    static const char whitespace[16] = " \n\r\t";
-    const __m128i w = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespace[0]));
-
-    for (;; p += 16) {
-        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-        const int r = _mm_cvtsi128_si32(_mm_cmpistrm(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_BIT_MASK | _SIDD_NEGATIVE_POLARITY));
-        if (r != 0) {   // some of characters is non-whitespace
-#ifdef _MSC_VER         // Find the index of first non-whitespace
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            return p + offset;
-#else
-            return p + __builtin_ffs(r) - 1;
-#endif
-        }
-    }
-}
-
-inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
-    // Fast return for single non-whitespace
-    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
-        ++p;
-    else
-        return p;
-
-    // The middle of string using SIMD
-    static const char whitespace[16] = " \n\r\t";
-    const __m128i w = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespace[0]));
-
-    for (; p <= end - 16; p += 16) {
-        const __m128i s = _mm_loadu_si128(reinterpret_cast<const __m128i *>(p));
-        const int r = _mm_cvtsi128_si32(_mm_cmpistrm(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_BIT_MASK | _SIDD_NEGATIVE_POLARITY));
-        if (r != 0) {   // some of characters is non-whitespace
-#ifdef _MSC_VER         // Find the index of first non-whitespace
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            return p + offset;
-#else
-            return p + __builtin_ffs(r) - 1;
-#endif
-        }
-    }
-
-    return SkipWhitespace(p, end);
-}
-
-#elif defined(RAPIDJSON_SSE2)
-
-//! Skip whitespace with SSE2 instructions, testing 16 8-byte characters at once.
-inline const char *SkipWhitespace_SIMD(const char* p) {
-    // Fast return for single non-whitespace
-    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-        ++p;
-    else
-        return p;
-
-    // 16-byte align to the next boundary
-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-    while (p != nextAligned)
-        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-            ++p;
-        else
-            return p;
-
-    // The rest of string
-    #define C16(c) { c, c, c, c, c, c, c, c, c, c, c, c, c, c, c, c }
-    static const char whitespaces[4][16] = { C16(' '), C16('\n'), C16('\r'), C16('\t') };
-    #undef C16
-
-    const __m128i w0 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[0][0]));
-    const __m128i w1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[1][0]));
-    const __m128i w2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[2][0]));
-    const __m128i w3 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[3][0]));
-
-    for (;; p += 16) {
-        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-        __m128i x = _mm_cmpeq_epi8(s, w0);
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w1));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w2));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w3));
-        unsigned short r = static_cast<unsigned short>(~_mm_movemask_epi8(x));
-        if (r != 0) {   // some of characters may be non-whitespace
-#ifdef _MSC_VER         // Find the index of first non-whitespace
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            return p + offset;
-#else
-            return p + __builtin_ffs(r) - 1;
-#endif
-        }
-    }
-}
-
-inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
-    // Fast return for single non-whitespace
-    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
-        ++p;
-    else
-        return p;
-
-    // The rest of string
-    #define C16(c) { c, c, c, c, c, c, c, c, c, c, c, c, c, c, c, c }
-    static const char whitespaces[4][16] = { C16(' '), C16('\n'), C16('\r'), C16('\t') };
-    #undef C16
-
-    const __m128i w0 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[0][0]));
-    const __m128i w1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[1][0]));
-    const __m128i w2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[2][0]));
-    const __m128i w3 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[3][0]));
-
-    for (; p <= end - 16; p += 16) {
-        const __m128i s = _mm_loadu_si128(reinterpret_cast<const __m128i *>(p));
-        __m128i x = _mm_cmpeq_epi8(s, w0);
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w1));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w2));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w3));
-        unsigned short r = static_cast<unsigned short>(~_mm_movemask_epi8(x));
-        if (r != 0) {   // some of characters may be non-whitespace
-#ifdef _MSC_VER         // Find the index of first non-whitespace
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            return p + offset;
-#else
-            return p + __builtin_ffs(r) - 1;
-#endif
-        }
-    }
-
-    return SkipWhitespace(p, end);
-}
-
-#endif // RAPIDJSON_SSE2
-
-#ifdef RAPIDJSON_SIMD
-//! Template function specialization for InsituStringStream
-template<> inline void SkipWhitespace(InsituStringStream& is) {
-    is.src_ = const_cast<char*>(SkipWhitespace_SIMD(is.src_));
-}
-
-//! Template function specialization for StringStream
-template<> inline void SkipWhitespace(StringStream& is) {
-    is.src_ = SkipWhitespace_SIMD(is.src_);
-}
-
-template<> inline void SkipWhitespace(EncodedInputStream<UTF8<>, MemoryStream>& is) {
-    is.is_.src_ = SkipWhitespace_SIMD(is.is_.src_, is.is_.end_);
-}
-#endif // RAPIDJSON_SIMD
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericReader
-
-//! SAX-style JSON parser. Use \ref Reader for UTF8 encoding and default allocator.
-/*! GenericReader parses JSON text from a stream, and send events synchronously to an
-    object implementing Handler concept.
-
-    It needs to allocate a stack for storing a single decoded string during
-    non-destructive parsing.
-
-    For in-situ parsing, the decoded string is directly written to the source
-    text string, no temporary buffer is required.
-
-    A GenericReader object can be reused for parsing multiple JSON text.
-
-    \tparam SourceEncoding Encoding of the input stream.
-    \tparam TargetEncoding Encoding of the parse output.
-    \tparam StackAllocator Allocator type for stack.
-*/
-template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator = CrtAllocator>
-class GenericReader {
-public:
-    typedef typename SourceEncoding::Ch Ch; //!< SourceEncoding character type
-
-    //! Constructor.
-    /*! \param stackAllocator Optional allocator for allocating stack memory. (Only use for non-destructive parsing)
-        \param stackCapacity stack capacity in bytes for storing a single decoded string.  (Only use for non-destructive parsing)
-    */
-    GenericReader(StackAllocator* stackAllocator = 0, size_t stackCapacity = kDefaultStackCapacity) : stack_(stackAllocator, stackCapacity), parseResult_() {}
-
-    //! Parse JSON text.
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \tparam InputStream Type of input stream, implementing Stream concept.
-        \tparam Handler Type of handler, implementing Handler concept.
-        \param is Input stream to be parsed.
-        \param handler The handler to receive events.
-        \return Whether the parsing is successful.
-    */
-    template <unsigned parseFlags, typename InputStream, typename Handler>
-    ParseResult Parse(InputStream& is, Handler& handler) {
-        if (parseFlags & kParseIterativeFlag)
-            return IterativeParse<parseFlags>(is, handler);
-
-        parseResult_.Clear();
-
-        ClearStackOnExit scope(*this);
-
-        SkipWhitespaceAndComments<parseFlags>(is);
-        RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-
-        if (RAPIDJSON_UNLIKELY(is.Peek() == '\0')) {
-            RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentEmpty, is.Tell());
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-        }
-        else {
-            ParseValue<parseFlags>(is, handler);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-
-            if (!(parseFlags & kParseStopWhenDoneFlag)) {
-                SkipWhitespaceAndComments<parseFlags>(is);
-                RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-
-                if (RAPIDJSON_UNLIKELY(is.Peek() != '\0')) {
-                    RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentRootNotSingular, is.Tell());
-                    RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-                }
-            }
-        }
-
-        return parseResult_;
-    }
-
-    //! Parse JSON text (with \ref kParseDefaultFlags)
-    /*! \tparam InputStream Type of input stream, implementing Stream concept
-        \tparam Handler Type of handler, implementing Handler concept.
-        \param is Input stream to be parsed.
-        \param handler The handler to receive events.
-        \return Whether the parsing is successful.
-    */
-    template <typename InputStream, typename Handler>
-    ParseResult Parse(InputStream& is, Handler& handler) {
-        return Parse<kParseDefaultFlags>(is, handler);
-    }
-
-    //! Whether a parse error has occured in the last parsing.
-    bool HasParseError() const { return parseResult_.IsError(); }
-
-    //! Get the \ref ParseErrorCode of last parsing.
-    ParseErrorCode GetParseErrorCode() const { return parseResult_.Code(); }
-
-    //! Get the position of last parsing error in input, 0 otherwise.
-    size_t GetErrorOffset() const { return parseResult_.Offset(); }
-
-protected:
-    void SetParseError(ParseErrorCode code, size_t offset) { parseResult_.Set(code, offset); }
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    GenericReader(const GenericReader&);
-    GenericReader& operator=(const GenericReader&);
-
-    void ClearStack() { stack_.Clear(); }
-
-    // clear stack on any exit from ParseStream, e.g. due to exception
-    struct ClearStackOnExit {
-        explicit ClearStackOnExit(GenericReader& r) : r_(r) {}
-        ~ClearStackOnExit() { r_.ClearStack(); }
-    private:
-        GenericReader& r_;
-        ClearStackOnExit(const ClearStackOnExit&);
-        ClearStackOnExit& operator=(const ClearStackOnExit&);
-    };
-
-    template<unsigned parseFlags, typename InputStream>
-    void SkipWhitespaceAndComments(InputStream& is) {
-        SkipWhitespace(is);
-
-        if (parseFlags & kParseCommentsFlag) {
-            while (RAPIDJSON_UNLIKELY(Consume(is, '/'))) {
-                if (Consume(is, '*')) {
-                    while (true) {
-                        if (RAPIDJSON_UNLIKELY(is.Peek() == '\0'))
-                            RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
-                        else if (Consume(is, '*')) {
-                            if (Consume(is, '/'))
-                                break;
-                        }
-                        else
-                            is.Take();
-                    }
-                }
-                else if (RAPIDJSON_LIKELY(Consume(is, '/')))
-                    while (is.Peek() != '\0' && is.Take() != '\n');
-                else
-                    RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
-
-                SkipWhitespace(is);
-            }
-        }
-    }
-
-    // Parse object: { string : value, ... }
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseObject(InputStream& is, Handler& handler) {
-        RAPIDJSON_ASSERT(is.Peek() == '{');
-        is.Take();  // Skip '{'
-
-        if (RAPIDJSON_UNLIKELY(!handler.StartObject()))
-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-
-        SkipWhitespaceAndComments<parseFlags>(is);
-        RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-        if (Consume(is, '}')) {
-            if (RAPIDJSON_UNLIKELY(!handler.EndObject(0)))  // empty object
-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-            return;
-        }
-
-        for (SizeType memberCount = 0;;) {
-            if (RAPIDJSON_UNLIKELY(is.Peek() != '"'))
-                RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell());
-
-            ParseString<parseFlags>(is, handler, true);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            SkipWhitespaceAndComments<parseFlags>(is);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            if (RAPIDJSON_UNLIKELY(!Consume(is, ':')))
-                RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell());
-
-            SkipWhitespaceAndComments<parseFlags>(is);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            ParseValue<parseFlags>(is, handler);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            SkipWhitespaceAndComments<parseFlags>(is);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            ++memberCount;
-
-            switch (is.Peek()) {
-                case ',':
-                    is.Take();
-                    SkipWhitespaceAndComments<parseFlags>(is);
-                    RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-                    break;
-                case '}':
-                    is.Take();
-                    if (RAPIDJSON_UNLIKELY(!handler.EndObject(memberCount)))
-                        RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                    return;
-                default:
-                    RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); break; // This useless break is only for making warning and coverage happy
-            }
-
-            if (parseFlags & kParseTrailingCommasFlag) {
-                if (is.Peek() == '}') {
-                    if (RAPIDJSON_UNLIKELY(!handler.EndObject(memberCount)))
-                        RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                    is.Take();
-                    return;
-                }
-            }
-        }
-    }
-
-    // Parse array: [ value, ... ]
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseArray(InputStream& is, Handler& handler) {
-        RAPIDJSON_ASSERT(is.Peek() == '[');
-        is.Take();  // Skip '['
-
-        if (RAPIDJSON_UNLIKELY(!handler.StartArray()))
-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-
-        SkipWhitespaceAndComments<parseFlags>(is);
-        RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-        if (Consume(is, ']')) {
-            if (RAPIDJSON_UNLIKELY(!handler.EndArray(0))) // empty array
-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-            return;
-        }
-
-        for (SizeType elementCount = 0;;) {
-            ParseValue<parseFlags>(is, handler);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            ++elementCount;
-            SkipWhitespaceAndComments<parseFlags>(is);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            if (Consume(is, ',')) {
-                SkipWhitespaceAndComments<parseFlags>(is);
-                RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-            }
-            else if (Consume(is, ']')) {
-                if (RAPIDJSON_UNLIKELY(!handler.EndArray(elementCount)))
-                    RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                return;
-            }
-            else
-                RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell());
-
-            if (parseFlags & kParseTrailingCommasFlag) {
-                if (is.Peek() == ']') {
-                    if (RAPIDJSON_UNLIKELY(!handler.EndArray(elementCount)))
-                        RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                    is.Take();
-                    return;
-                }
-            }
-        }
-    }
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseNull(InputStream& is, Handler& handler) {
-        RAPIDJSON_ASSERT(is.Peek() == 'n');
-        is.Take();
-
-        if (RAPIDJSON_LIKELY(Consume(is, 'u') && Consume(is, 'l') && Consume(is, 'l'))) {
-            if (RAPIDJSON_UNLIKELY(!handler.Null()))
-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-        }
-        else
-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
-    }
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseTrue(InputStream& is, Handler& handler) {
-        RAPIDJSON_ASSERT(is.Peek() == 't');
-        is.Take();
-
-        if (RAPIDJSON_LIKELY(Consume(is, 'r') && Consume(is, 'u') && Consume(is, 'e'))) {
-            if (RAPIDJSON_UNLIKELY(!handler.Bool(true)))
-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-        }
-        else
-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
-    }
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseFalse(InputStream& is, Handler& handler) {
-        RAPIDJSON_ASSERT(is.Peek() == 'f');
-        is.Take();
-
-        if (RAPIDJSON_LIKELY(Consume(is, 'a') && Consume(is, 'l') && Consume(is, 's') && Consume(is, 'e'))) {
-            if (RAPIDJSON_UNLIKELY(!handler.Bool(false)))
-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-        }
-        else
-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
-    }
-
-    template<typename InputStream>
-    RAPIDJSON_FORCEINLINE static bool Consume(InputStream& is, typename InputStream::Ch expect) {
-        if (RAPIDJSON_LIKELY(is.Peek() == expect)) {
-            is.Take();
-            return true;
-        }
-        else
-            return false;
-    }
-
-    // Helper function to parse four hexidecimal digits in \uXXXX in ParseString().
-    template<typename InputStream>
-    unsigned ParseHex4(InputStream& is, size_t escapeOffset) {
-        unsigned codepoint = 0;
-        for (int i = 0; i < 4; i++) {
-            Ch c = is.Peek();
-            codepoint <<= 4;
-            codepoint += static_cast<unsigned>(c);
-            if (c >= '0' && c <= '9')
-                codepoint -= '0';
-            else if (c >= 'A' && c <= 'F')
-                codepoint -= 'A' - 10;
-            else if (c >= 'a' && c <= 'f')
-                codepoint -= 'a' - 10;
-            else {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorStringUnicodeEscapeInvalidHex, escapeOffset);
-                RAPIDJSON_PARSE_ERROR_EARLY_RETURN(0);
-            }
-            is.Take();
-        }
-        return codepoint;
-    }
-
-    template <typename CharType>
-    class StackStream {
-    public:
-        typedef CharType Ch;
-
-        StackStream(internal::Stack<StackAllocator>& stack) : stack_(stack), length_(0) {}
-        RAPIDJSON_FORCEINLINE void Put(Ch c) {
-            *stack_.template Push<Ch>() = c;
-            ++length_;
-        }
-
-        RAPIDJSON_FORCEINLINE void* Push(SizeType count) {
-            length_ += count;
-            return stack_.template Push<Ch>(count);
-        }
-
-        size_t Length() const { return length_; }
-
-        Ch* Pop() {
-            return stack_.template Pop<Ch>(length_);
-        }
-
-    private:
-        StackStream(const StackStream&);
-        StackStream& operator=(const StackStream&);
-
-        internal::Stack<StackAllocator>& stack_;
-        SizeType length_;
-    };
-
-    // Parse string and generate String event. Different code paths for kParseInsituFlag.
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseString(InputStream& is, Handler& handler, bool isKey = false) {
-        internal::StreamLocalCopy<InputStream> copy(is);
-        InputStream& s(copy.s);
-
-        RAPIDJSON_ASSERT(s.Peek() == '\"');
-        s.Take();  // Skip '\"'
-
-        bool success = false;
-        if (parseFlags & kParseInsituFlag) {
-            typename InputStream::Ch *head = s.PutBegin();
-            ParseStringToStream<parseFlags, SourceEncoding, SourceEncoding>(s, s);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-            size_t length = s.PutEnd(head) - 1;
-            RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
-            const typename TargetEncoding::Ch* const str = reinterpret_cast<typename TargetEncoding::Ch*>(head);
-            success = (isKey ? handler.Key(str, SizeType(length), false) : handler.String(str, SizeType(length), false));
-        }
-        else {
-            StackStream<typename TargetEncoding::Ch> stackStream(stack_);
-            ParseStringToStream<parseFlags, SourceEncoding, TargetEncoding>(s, stackStream);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-            SizeType length = static_cast<SizeType>(stackStream.Length()) - 1;
-            const typename TargetEncoding::Ch* const str = stackStream.Pop();
-            success = (isKey ? handler.Key(str, length, true) : handler.String(str, length, true));
-        }
-        if (RAPIDJSON_UNLIKELY(!success))
-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, s.Tell());
-    }
-
-    // Parse string to an output is
-    // This function handles the prefix/suffix double quotes, escaping, and optional encoding validation.
-    template<unsigned parseFlags, typename SEncoding, typename TEncoding, typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE void ParseStringToStream(InputStream& is, OutputStream& os) {
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        static const char escape[256] = {
-            Z16, Z16, 0, 0,'\"', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'/',
-            Z16, Z16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'\\', 0, 0, 0,
-            0, 0,'\b', 0, 0, 0,'\f', 0, 0, 0, 0, 0, 0, 0,'\n', 0,
-            0, 0,'\r', 0,'\t', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16
-        };
-#undef Z16
-//!@endcond
-
-        for (;;) {
-            // Scan and copy string before "\\\"" or < 0x20. This is an optional optimzation.
-            if (!(parseFlags & kParseValidateEncodingFlag))
-                ScanCopyUnescapedString(is, os);
-
-            Ch c = is.Peek();
-            if (RAPIDJSON_UNLIKELY(c == '\\')) {    // Escape
-                size_t escapeOffset = is.Tell();    // For invalid escaping, report the inital '\\' as error offset
-                is.Take();
-                Ch e = is.Peek();
-                if ((sizeof(Ch) == 1 || unsigned(e) < 256) && RAPIDJSON_LIKELY(escape[static_cast<unsigned char>(e)])) {
-                    is.Take();
-                    os.Put(static_cast<typename TEncoding::Ch>(escape[static_cast<unsigned char>(e)]));
-                }
-                else if (RAPIDJSON_LIKELY(e == 'u')) {    // Unicode
-                    is.Take();
-                    unsigned codepoint = ParseHex4(is, escapeOffset);
-                    RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-                    if (RAPIDJSON_UNLIKELY(codepoint >= 0xD800 && codepoint <= 0xDBFF)) {
-                        // Handle UTF-16 surrogate pair
-                        if (RAPIDJSON_UNLIKELY(!Consume(is, '\\') || !Consume(is, 'u')))
-                            RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, escapeOffset);
-                        unsigned codepoint2 = ParseHex4(is, escapeOffset);
-                        RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-                        if (RAPIDJSON_UNLIKELY(codepoint2 < 0xDC00 || codepoint2 > 0xDFFF))
-                            RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, escapeOffset);
-                        codepoint = (((codepoint - 0xD800) << 10) | (codepoint2 - 0xDC00)) + 0x10000;
-                    }
-                    TEncoding::Encode(os, codepoint);
-                }
-                else
-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, escapeOffset);
-            }
-            else if (RAPIDJSON_UNLIKELY(c == '"')) {    // Closing double quote
-                is.Take();
-                os.Put('\0');   // null-terminate the string
-                return;
-            }
-            else if (RAPIDJSON_UNLIKELY(static_cast<unsigned>(c) < 0x20)) { // RFC 4627: unescaped = %x20-21 / %x23-5B / %x5D-10FFFF
-                if (c == '\0')
-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringMissQuotationMark, is.Tell());
-                else
-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, is.Tell());
-            }
-            else {
-                size_t offset = is.Tell();
-                if (RAPIDJSON_UNLIKELY((parseFlags & kParseValidateEncodingFlag ?
-                    !Transcoder<SEncoding, TEncoding>::Validate(is, os) :
-                    !Transcoder<SEncoding, TEncoding>::Transcode(is, os))))
-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringInvalidEncoding, offset);
-            }
-        }
-    }
-
-    template<typename InputStream, typename OutputStream>
-    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InputStream&, OutputStream&) {
-            // Do nothing for generic version
-    }
-
-#if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42)
-    // StringStream -> StackStream<char>
-    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(StringStream& is, StackStream<char>& os) {
-        const char* p = is.src_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        while (p != nextAligned)
-            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = p;
-                return;
-            }
-            else
-                os.Put(*p++);
-
-        // The rest of string using SIMD
-        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-        static const char space[16]  = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
-        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-        for (;; p += 16) {
-            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
-            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-            if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-                SizeType length;
-    #ifdef _MSC_VER         // Find the index of first escaped
-                unsigned long offset;
-                _BitScanForward(&offset, r);
-                length = offset;
-    #else
-                length = static_cast<SizeType>(__builtin_ffs(r) - 1);
-    #endif
-                char* q = reinterpret_cast<char*>(os.Push(length));
-                for (size_t i = 0; i < length; i++)
-                    q[i] = p[i];
-
-                p += length;
-                break;
-            }
-            _mm_storeu_si128(reinterpret_cast<__m128i *>(os.Push(16)), s);
-        }
-
-        is.src_ = p;
-    }
-
-    // InsituStringStream -> InsituStringStream
-    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InsituStringStream& is, InsituStringStream& os) {
-        RAPIDJSON_ASSERT(&is == &os);
-        (void)os;
-
-        if (is.src_ == is.dst_) {
-            SkipUnescapedString(is);
-            return;
-        }
-
-        char* p = is.src_;
-        char *q = is.dst_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        while (p != nextAligned)
-            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = p;
-                is.dst_ = q;
-                return;
-            }
-            else
-                *q++ = *p++;
-
-        // The rest of string using SIMD
-        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-        static const char space[16] = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
-        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-        for (;; p += 16, q += 16) {
-            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
-            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-            if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-                size_t length;
-#ifdef _MSC_VER         // Find the index of first escaped
-                unsigned long offset;
-                _BitScanForward(&offset, r);
-                length = offset;
-#else
-                length = static_cast<size_t>(__builtin_ffs(r) - 1);
-#endif
-                for (const char* pend = p + length; p != pend; )
-                    *q++ = *p++;
-                break;
-            }
-            _mm_storeu_si128(reinterpret_cast<__m128i *>(q), s);
-        }
-
-        is.src_ = p;
-        is.dst_ = q;
-    }
-
-    // When read/write pointers are the same for insitu stream, just skip unescaped characters
-    static RAPIDJSON_FORCEINLINE void SkipUnescapedString(InsituStringStream& is) {
-        RAPIDJSON_ASSERT(is.src_ == is.dst_);
-        char* p = is.src_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        for (; p != nextAligned; p++)
-            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = is.dst_ = p;
-                return;
-            }
-
-        // The rest of string using SIMD
-        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-        static const char space[16] = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
-        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-        for (;; p += 16) {
-            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
-            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-            if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-                size_t length;
-#ifdef _MSC_VER         // Find the index of first escaped
-                unsigned long offset;
-                _BitScanForward(&offset, r);
-                length = offset;
-#else
-                length = static_cast<size_t>(__builtin_ffs(r) - 1);
-#endif
-                p += length;
-                break;
-            }
-        }
-
-        is.src_ = is.dst_ = p;
-    }
-#endif
-
-    template<typename InputStream, bool backup, bool pushOnTake>
-    class NumberStream;
-
-    template<typename InputStream>
-    class NumberStream<InputStream, false, false> {
-    public:
-        typedef typename InputStream::Ch Ch;
-
-        NumberStream(GenericReader& reader, InputStream& s) : is(s) { (void)reader;  }
-        ~NumberStream() {}
-
-        RAPIDJSON_FORCEINLINE Ch Peek() const { return is.Peek(); }
-        RAPIDJSON_FORCEINLINE Ch TakePush() { return is.Take(); }
-        RAPIDJSON_FORCEINLINE Ch Take() { return is.Take(); }
-		  RAPIDJSON_FORCEINLINE void Push(char) {}
-
-        size_t Tell() { return is.Tell(); }
-        size_t Length() { return 0; }
-        const char* Pop() { return 0; }
-
-    protected:
-        NumberStream& operator=(const NumberStream&);
-
-        InputStream& is;
-    };
-
-    template<typename InputStream>
-    class NumberStream<InputStream, true, false> : public NumberStream<InputStream, false, false> {
-        typedef NumberStream<InputStream, false, false> Base;
-    public:
-        NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is), stackStream(reader.stack_) {}
-        ~NumberStream() {}
-
-        RAPIDJSON_FORCEINLINE Ch TakePush() {
-            stackStream.Put(static_cast<char>(Base::is.Peek()));
-            return Base::is.Take();
-        }
-
-        RAPIDJSON_FORCEINLINE void Push(char c) {
-            stackStream.Put(c);
-        }
-
-        size_t Length() { return stackStream.Length(); }
-
-        const char* Pop() {
-            stackStream.Put('\0');
-            return stackStream.Pop();
-        }
-
-    private:
-        StackStream<char> stackStream;
-    };
-
-    template<typename InputStream>
-    class NumberStream<InputStream, true, true> : public NumberStream<InputStream, true, false> {
-        typedef NumberStream<InputStream, true, false> Base;
-    public:
-        NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is) {}
-        ~NumberStream() {}
-
-        RAPIDJSON_FORCEINLINE Ch Take() { return Base::TakePush(); }
-    };
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseNumber(InputStream& is, Handler& handler) {
-        internal::StreamLocalCopy<InputStream> copy(is);
-        NumberStream<InputStream,
-            ((parseFlags & kParseNumbersAsStringsFlag) != 0) ?
-                ((parseFlags & kParseInsituFlag) == 0) :
-                ((parseFlags & kParseFullPrecisionFlag) != 0),
-            (parseFlags & kParseNumbersAsStringsFlag) != 0 &&
-                (parseFlags & kParseInsituFlag) == 0> s(*this, copy.s);
-
-        size_t startOffset = s.Tell();
-        double d = 0.0;
-        bool useNanOrInf = false;
-
-        // Parse minus
-        bool minus = Consume(s, '-');
-
-        // Parse int: zero / ( digit1-9 *DIGIT )
-        unsigned i = 0;
-        uint64_t i64 = 0;
-        bool use64bit = false;
-        int significandDigit = 0;
-        if (RAPIDJSON_UNLIKELY(s.Peek() == '0')) {
-            i = 0;
-            s.TakePush();
-        }
-        else if (RAPIDJSON_LIKELY(s.Peek() >= '1' && s.Peek() <= '9')) {
-            i = static_cast<unsigned>(s.TakePush() - '0');
-
-            if (minus)
-                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (RAPIDJSON_UNLIKELY(i >= 214748364)) { // 2^31 = 2147483648
-                        if (RAPIDJSON_LIKELY(i != 214748364 || s.Peek() > '8')) {
-                            i64 = i;
-                            use64bit = true;
-                            break;
-                        }
-                    }
-                    i = i * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-            else
-                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (RAPIDJSON_UNLIKELY(i >= 429496729)) { // 2^32 - 1 = 4294967295
-                        if (RAPIDJSON_LIKELY(i != 429496729 || s.Peek() > '5')) {
-                            i64 = i;
-                            use64bit = true;
-                            break;
-                        }
-                    }
-                    i = i * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-        }
-        // Parse NaN or Infinity here
-        else if ((parseFlags & kParseNanAndInfFlag) && RAPIDJSON_LIKELY((s.Peek() == 'I' || s.Peek() == 'N'))) {
-            useNanOrInf = true;
-            if (RAPIDJSON_LIKELY(Consume(s, 'N') && Consume(s, 'a') && Consume(s, 'N'))) {
-                d = std::numeric_limits<double>::quiet_NaN();
-            }
-            else if (RAPIDJSON_LIKELY(Consume(s, 'I') && Consume(s, 'n') && Consume(s, 'f'))) {
-                d = (minus ? -std::numeric_limits<double>::infinity() : std::numeric_limits<double>::infinity());
-                if (RAPIDJSON_UNLIKELY(s.Peek() == 'i' && !(Consume(s, 'i') && Consume(s, 'n')
-                                                            && Consume(s, 'i') && Consume(s, 't') && Consume(s, 'y'))))
-                    RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
-            }
-            else
-                RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
-        }
-        else
-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
-
-        // Parse 64bit int
-        bool useDouble = false;
-        if (use64bit) {
-            if (minus)
-                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                     if (RAPIDJSON_UNLIKELY(i64 >= RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC))) // 2^63 = 9223372036854775808
-                        if (RAPIDJSON_LIKELY(i64 != RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC) || s.Peek() > '8')) {
-                            d = static_cast<double>(i64);
-                            useDouble = true;
-                            break;
-                        }
-                    i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-            else
-                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (RAPIDJSON_UNLIKELY(i64 >= RAPIDJSON_UINT64_C2(0x19999999, 0x99999999))) // 2^64 - 1 = 18446744073709551615
-                        if (RAPIDJSON_LIKELY(i64 != RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) || s.Peek() > '5')) {
-                            d = static_cast<double>(i64);
-                            useDouble = true;
-                            break;
-                        }
-                    i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-        }
-
-        // Force double for big integer
-        if (useDouble) {
-            while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                if (RAPIDJSON_UNLIKELY(d >= 1.7976931348623157e307)) // DBL_MAX / 10.0
-                    RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, startOffset);
-                d = d * 10 + (s.TakePush() - '0');
-            }
-        }
-
-        // Parse frac = decimal-point 1*DIGIT
-        int expFrac = 0;
-        size_t decimalPosition;
-        if (Consume(s, '.')) {
-            decimalPosition = s.Length();
-
-            if (RAPIDJSON_UNLIKELY(!(s.Peek() >= '0' && s.Peek() <= '9')))
-                RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissFraction, s.Tell());
-
-            if (!useDouble) {
-#if RAPIDJSON_64BIT
-                // Use i64 to store significand in 64-bit architecture
-                if (!use64bit)
-                    i64 = i;
-
-                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (i64 > RAPIDJSON_UINT64_C2(0x1FFFFF, 0xFFFFFFFF)) // 2^53 - 1 for fast path
-                        break;
-                    else {
-                        i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                        --expFrac;
-                        if (i64 != 0)
-                            significandDigit++;
-                    }
-                }
-
-                d = static_cast<double>(i64);
-#else
-                // Use double to store significand in 32-bit architecture
-                d = static_cast<double>(use64bit ? i64 : i);
-#endif
-                useDouble = true;
-            }
-
-            while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                if (significandDigit < 17) {
-                    d = d * 10.0 + (s.TakePush() - '0');
-                    --expFrac;
-                    if (RAPIDJSON_LIKELY(d > 0.0))
-                        significandDigit++;
-                }
-                else
-                    s.TakePush();
-            }
-        }
-        else
-            decimalPosition = s.Length(); // decimal position at the end of integer.
-
-        // Parse exp = e [ minus / plus ] 1*DIGIT
-        int exp = 0;
-        if (Consume(s, 'e') || Consume(s, 'E')) {
-            if (!useDouble) {
-                d = static_cast<double>(use64bit ? i64 : i);
-                useDouble = true;
-            }
-
-            bool expMinus = false;
-            if (Consume(s, '+'))
-                ;
-            else if (Consume(s, '-'))
-                expMinus = true;
-
-            if (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                exp = static_cast<int>(s.Take() - '0');
-                if (expMinus) {
-                    while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                        exp = exp * 10 + static_cast<int>(s.Take() - '0');
-                        if (exp >= 214748364) {                         // Issue #313: prevent overflow exponent
-                            while (RAPIDJSON_UNLIKELY(s.Peek() >= '0' && s.Peek() <= '9'))  // Consume the rest of exponent
-                                s.Take();
-                        }
-                    }
-                }
-                else {  // positive exp
-                    int maxExp = 308 - expFrac;
-                    while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                        exp = exp * 10 + static_cast<int>(s.Take() - '0');
-                        if (RAPIDJSON_UNLIKELY(exp > maxExp))
-                            RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, startOffset);
-                    }
-                }
-            }
-            else
-                RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissExponent, s.Tell());
-
-            if (expMinus)
-                exp = -exp;
-        }
-
-        // Finish parsing, call event according to the type of number.
-        bool cont = true;
-
-        if (parseFlags & kParseNumbersAsStringsFlag) {
-            if (parseFlags & kParseInsituFlag) {
-                s.Pop();  // Pop stack no matter if it will be used or not.
-                typename InputStream::Ch* head = is.PutBegin();
-                const size_t length = s.Tell() - startOffset;
-                RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
-                // unable to insert the \0 character here, it will erase the comma after this number
-                const typename TargetEncoding::Ch* const str = reinterpret_cast<typename TargetEncoding::Ch*>(head);
-                cont = handler.RawNumber(str, SizeType(length), false);
-            }
-            else {
-                SizeType numCharsToCopy = static_cast<SizeType>(s.Length());
-                StringStream srcStream(s.Pop());
-                StackStream<typename TargetEncoding::Ch> dstStream(stack_);
-                while (numCharsToCopy--) {
-                    Transcoder<UTF8<>, TargetEncoding>::Transcode(srcStream, dstStream);
-                }
-                dstStream.Put('\0');
-                const typename TargetEncoding::Ch* str = dstStream.Pop();
-                const SizeType length = static_cast<SizeType>(dstStream.Length()) - 1;
-                cont = handler.RawNumber(str, SizeType(length), true);
-            }
-        }
-        else {
-           size_t length = s.Length();
-           const char* decimal = s.Pop();  // Pop stack no matter if it will be used or not.
-
-           if (useDouble) {
-               int p = exp + expFrac;
-               if (parseFlags & kParseFullPrecisionFlag)
-                   d = internal::StrtodFullPrecision(d, p, decimal, length, decimalPosition, exp);
-               else
-                   d = internal::StrtodNormalPrecision(d, p);
-
-               cont = handler.Double(minus ? -d : d);
-           }
-           else if (useNanOrInf) {
-               cont = handler.Double(d);
-           }
-           else {
-               if (use64bit) {
-                   if (minus)
-                       cont = handler.Int64(static_cast<int64_t>(~i64 + 1));
-                   else
-                       cont = handler.Uint64(i64);
-               }
-               else {
-                   if (minus)
-                       cont = handler.Int(static_cast<int32_t>(~i + 1));
-                   else
-                       cont = handler.Uint(i);
-               }
-           }
-        }
-        if (RAPIDJSON_UNLIKELY(!cont))
-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, startOffset);
-    }
-
-    // Parse any JSON value
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseValue(InputStream& is, Handler& handler) {
-        switch (is.Peek()) {
-            case 'n': ParseNull  <parseFlags>(is, handler); break;
-            case 't': ParseTrue  <parseFlags>(is, handler); break;
-            case 'f': ParseFalse <parseFlags>(is, handler); break;
-            case '"': ParseString<parseFlags>(is, handler); break;
-            case '{': ParseObject<parseFlags>(is, handler); break;
-            case '[': ParseArray <parseFlags>(is, handler); break;
-            default :
-                      ParseNumber<parseFlags>(is, handler);
-                      break;
-
-        }
-    }
-
-    // Iterative Parsing
-
-    // States
-    enum IterativeParsingState {
-        IterativeParsingStartState = 0,
-        IterativeParsingFinishState,
-        IterativeParsingErrorState,
-
-        // Object states
-        IterativeParsingObjectInitialState,
-        IterativeParsingMemberKeyState,
-        IterativeParsingKeyValueDelimiterState,
-        IterativeParsingMemberValueState,
-        IterativeParsingMemberDelimiterState,
-        IterativeParsingObjectFinishState,
-
-        // Array states
-        IterativeParsingArrayInitialState,
-        IterativeParsingElementState,
-        IterativeParsingElementDelimiterState,
-        IterativeParsingArrayFinishState,
-
-        // Single value state
-        IterativeParsingValueState
-    };
-
-    enum { cIterativeParsingStateCount = IterativeParsingValueState + 1 };
-
-    // Tokens
-    enum Token {
-        LeftBracketToken = 0,
-        RightBracketToken,
-
-        LeftCurlyBracketToken,
-        RightCurlyBracketToken,
-
-        CommaToken,
-        ColonToken,
-
-        StringToken,
-        FalseToken,
-        TrueToken,
-        NullToken,
-        NumberToken,
-
-        kTokenCount
-    };
-
-    RAPIDJSON_FORCEINLINE Token Tokenize(Ch c) {
-
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#define N NumberToken
-#define N16 N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N
-        // Maps from ASCII to Token
-        static const unsigned char tokenMap[256] = {
-            N16, // 00~0F
-            N16, // 10~1F
-            N, N, StringToken, N, N, N, N, N, N, N, N, N, CommaToken, N, N, N, // 20~2F
-            N, N, N, N, N, N, N, N, N, N, ColonToken, N, N, N, N, N, // 30~3F
-            N16, // 40~4F
-            N, N, N, N, N, N, N, N, N, N, N, LeftBracketToken, N, RightBracketToken, N, N, // 50~5F
-            N, N, N, N, N, N, FalseToken, N, N, N, N, N, N, N, NullToken, N, // 60~6F
-            N, N, N, N, TrueToken, N, N, N, N, N, N, LeftCurlyBracketToken, N, RightCurlyBracketToken, N, N, // 70~7F
-            N16, N16, N16, N16, N16, N16, N16, N16 // 80~FF
-        };
-#undef N
-#undef N16
-//!@endcond
-
-        if (sizeof(Ch) == 1 || static_cast<unsigned>(c) < 256)
-            return static_cast<Token>(tokenMap[static_cast<unsigned char>(c)]);
-        else
-            return NumberToken;
-    }
-
-    RAPIDJSON_FORCEINLINE IterativeParsingState Predict(IterativeParsingState state, Token token) {
-        // current state x one lookahead token -> new state
-        static const char G[cIterativeParsingStateCount][kTokenCount] = {
-            // Start
-            {
-                IterativeParsingArrayInitialState,  // Left bracket
-                IterativeParsingErrorState,         // Right bracket
-                IterativeParsingObjectInitialState, // Left curly bracket
-                IterativeParsingErrorState,         // Right curly bracket
-                IterativeParsingErrorState,         // Comma
-                IterativeParsingErrorState,         // Colon
-                IterativeParsingValueState,         // String
-                IterativeParsingValueState,         // False
-                IterativeParsingValueState,         // True
-                IterativeParsingValueState,         // Null
-                IterativeParsingValueState          // Number
-            },
-            // Finish(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // Error(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // ObjectInitial
-            {
-                IterativeParsingErrorState,         // Left bracket
-                IterativeParsingErrorState,         // Right bracket
-                IterativeParsingErrorState,         // Left curly bracket
-                IterativeParsingObjectFinishState,  // Right curly bracket
-                IterativeParsingErrorState,         // Comma
-                IterativeParsingErrorState,         // Colon
-                IterativeParsingMemberKeyState,     // String
-                IterativeParsingErrorState,         // False
-                IterativeParsingErrorState,         // True
-                IterativeParsingErrorState,         // Null
-                IterativeParsingErrorState          // Number
-            },
-            // MemberKey
-            {
-                IterativeParsingErrorState,             // Left bracket
-                IterativeParsingErrorState,             // Right bracket
-                IterativeParsingErrorState,             // Left curly bracket
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingKeyValueDelimiterState, // Colon
-                IterativeParsingErrorState,             // String
-                IterativeParsingErrorState,             // False
-                IterativeParsingErrorState,             // True
-                IterativeParsingErrorState,             // Null
-                IterativeParsingErrorState              // Number
-            },
-            // KeyValueDelimiter
-            {
-                IterativeParsingArrayInitialState,      // Left bracket(push MemberValue state)
-                IterativeParsingErrorState,             // Right bracket
-                IterativeParsingObjectInitialState,     // Left curly bracket(push MemberValue state)
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingMemberValueState,       // String
-                IterativeParsingMemberValueState,       // False
-                IterativeParsingMemberValueState,       // True
-                IterativeParsingMemberValueState,       // Null
-                IterativeParsingMemberValueState        // Number
-            },
-            // MemberValue
-            {
-                IterativeParsingErrorState,             // Left bracket
-                IterativeParsingErrorState,             // Right bracket
-                IterativeParsingErrorState,             // Left curly bracket
-                IterativeParsingObjectFinishState,      // Right curly bracket
-                IterativeParsingMemberDelimiterState,   // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingErrorState,             // String
-                IterativeParsingErrorState,             // False
-                IterativeParsingErrorState,             // True
-                IterativeParsingErrorState,             // Null
-                IterativeParsingErrorState              // Number
-            },
-            // MemberDelimiter
-            {
-                IterativeParsingErrorState,         // Left bracket
-                IterativeParsingErrorState,         // Right bracket
-                IterativeParsingErrorState,         // Left curly bracket
-                IterativeParsingObjectFinishState,  // Right curly bracket
-                IterativeParsingErrorState,         // Comma
-                IterativeParsingErrorState,         // Colon
-                IterativeParsingMemberKeyState,     // String
-                IterativeParsingErrorState,         // False
-                IterativeParsingErrorState,         // True
-                IterativeParsingErrorState,         // Null
-                IterativeParsingErrorState          // Number
-            },
-            // ObjectFinish(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // ArrayInitial
-            {
-                IterativeParsingArrayInitialState,      // Left bracket(push Element state)
-                IterativeParsingArrayFinishState,       // Right bracket
-                IterativeParsingObjectInitialState,     // Left curly bracket(push Element state)
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingElementState,           // String
-                IterativeParsingElementState,           // False
-                IterativeParsingElementState,           // True
-                IterativeParsingElementState,           // Null
-                IterativeParsingElementState            // Number
-            },
-            // Element
-            {
-                IterativeParsingErrorState,             // Left bracket
-                IterativeParsingArrayFinishState,       // Right bracket
-                IterativeParsingErrorState,             // Left curly bracket
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingElementDelimiterState,  // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingErrorState,             // String
-                IterativeParsingErrorState,             // False
-                IterativeParsingErrorState,             // True
-                IterativeParsingErrorState,             // Null
-                IterativeParsingErrorState              // Number
-            },
-            // ElementDelimiter
-            {
-                IterativeParsingArrayInitialState,      // Left bracket(push Element state)
-                IterativeParsingArrayFinishState,       // Right bracket
-                IterativeParsingObjectInitialState,     // Left curly bracket(push Element state)
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingElementState,           // String
-                IterativeParsingElementState,           // False
-                IterativeParsingElementState,           // True
-                IterativeParsingElementState,           // Null
-                IterativeParsingElementState            // Number
-            },
-            // ArrayFinish(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // Single Value (sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            }
-        }; // End of G
-
-        return static_cast<IterativeParsingState>(G[state][token]);
-    }
-
-    // Make an advance in the token stream and state based on the candidate destination state which was returned by Transit().
-    // May return a new state on state pop.
-    template <unsigned parseFlags, typename InputStream, typename Handler>
-    RAPIDJSON_FORCEINLINE IterativeParsingState Transit(IterativeParsingState src, Token token, IterativeParsingState dst, InputStream& is, Handler& handler) {
-        (void)token;
-
-        switch (dst) {
-        case IterativeParsingErrorState:
-            return dst;
-
-        case IterativeParsingObjectInitialState:
-        case IterativeParsingArrayInitialState:
-        {
-            // Push the state(Element or MemeberValue) if we are nested in another array or value of member.
-            // In this way we can get the correct state on ObjectFinish or ArrayFinish by frame pop.
-            IterativeParsingState n = src;
-            if (src == IterativeParsingArrayInitialState || src == IterativeParsingElementDelimiterState)
-                n = IterativeParsingElementState;
-            else if (src == IterativeParsingKeyValueDelimiterState)
-                n = IterativeParsingMemberValueState;
-            // Push current state.
-            *stack_.template Push<SizeType>(1) = n;
-            // Initialize and push the member/element count.
-            *stack_.template Push<SizeType>(1) = 0;
-            // Call handler
-            bool hr = (dst == IterativeParsingObjectInitialState) ? handler.StartObject() : handler.StartArray();
-            // On handler short circuits the parsing.
-            if (!hr) {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            else {
-                is.Take();
-                return dst;
-            }
-        }
-
-        case IterativeParsingMemberKeyState:
-            ParseString<parseFlags>(is, handler, true);
-            if (HasParseError())
-                return IterativeParsingErrorState;
-            else
-                return dst;
-
-        case IterativeParsingKeyValueDelimiterState:
-            RAPIDJSON_ASSERT(token == ColonToken);
-            is.Take();
-            return dst;
-
-        case IterativeParsingMemberValueState:
-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
-            ParseValue<parseFlags>(is, handler);
-            if (HasParseError()) {
-                return IterativeParsingErrorState;
-            }
-            return dst;
-
-        case IterativeParsingElementState:
-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
-            ParseValue<parseFlags>(is, handler);
-            if (HasParseError()) {
-                return IterativeParsingErrorState;
-            }
-            return dst;
-
-        case IterativeParsingMemberDelimiterState:
-        case IterativeParsingElementDelimiterState:
-            is.Take();
-            // Update member/element count.
-            *stack_.template Top<SizeType>() = *stack_.template Top<SizeType>() + 1;
-            return dst;
-
-        case IterativeParsingObjectFinishState:
-        {
-            // Transit from delimiter is only allowed when trailing commas are enabled
-            if (!(parseFlags & kParseTrailingCommasFlag) && src == IterativeParsingMemberDelimiterState) {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorObjectMissName, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            // Get member count.
-            SizeType c = *stack_.template Pop<SizeType>(1);
-            // If the object is not empty, count the last member.
-            if (src == IterativeParsingMemberValueState)
-                ++c;
-            // Restore the state.
-            IterativeParsingState n = static_cast<IterativeParsingState>(*stack_.template Pop<SizeType>(1));
-            // Transit to Finish state if this is the topmost scope.
-            if (n == IterativeParsingStartState)
-                n = IterativeParsingFinishState;
-            // Call handler
-            bool hr = handler.EndObject(c);
-            // On handler short circuits the parsing.
-            if (!hr) {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            else {
-                is.Take();
-                return n;
-            }
-        }
-
-        case IterativeParsingArrayFinishState:
-        {
-            // Transit from delimiter is only allowed when trailing commas are enabled
-            if (!(parseFlags & kParseTrailingCommasFlag) && src == IterativeParsingElementDelimiterState) {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorValueInvalid, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            // Get element count.
-            SizeType c = *stack_.template Pop<SizeType>(1);
-            // If the array is not empty, count the last element.
-            if (src == IterativeParsingElementState)
-                ++c;
-            // Restore the state.
-            IterativeParsingState n = static_cast<IterativeParsingState>(*stack_.template Pop<SizeType>(1));
-            // Transit to Finish state if this is the topmost scope.
-            if (n == IterativeParsingStartState)
-                n = IterativeParsingFinishState;
-            // Call handler
-            bool hr = handler.EndArray(c);
-            // On handler short circuits the parsing.
-            if (!hr) {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            else {
-                is.Take();
-                return n;
-            }
-        }
-
-        default:
-            // This branch is for IterativeParsingValueState actually.
-            // Use `default:` rather than
-            // `case IterativeParsingValueState:` is for code coverage.
-
-            // The IterativeParsingStartState is not enumerated in this switch-case.
-            // It is impossible for that case. And it can be caught by following assertion.
-
-            // The IterativeParsingFinishState is not enumerated in this switch-case either.
-            // It is a "derivative" state which cannot triggered from Predict() directly.
-            // Therefore it cannot happen here. And it can be caught by following assertion.
-            RAPIDJSON_ASSERT(dst == IterativeParsingValueState);
-
-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
-            ParseValue<parseFlags>(is, handler);
-            if (HasParseError()) {
-                return IterativeParsingErrorState;
-            }
-            return IterativeParsingFinishState;
-        }
-    }
-
-    template <typename InputStream>
-    void HandleError(IterativeParsingState src, InputStream& is) {
-        if (HasParseError()) {
-            // Error flag has been set.
-            return;
-        }
-
-        switch (src) {
-        case IterativeParsingStartState:            RAPIDJSON_PARSE_ERROR(kParseErrorDocumentEmpty, is.Tell()); return;
-        case IterativeParsingFinishState:           RAPIDJSON_PARSE_ERROR(kParseErrorDocumentRootNotSingular, is.Tell()); return;
-        case IterativeParsingObjectInitialState:
-        case IterativeParsingMemberDelimiterState:  RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell()); return;
-        case IterativeParsingMemberKeyState:        RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell()); return;
-        case IterativeParsingMemberValueState:      RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); return;
-        case IterativeParsingKeyValueDelimiterState:
-        case IterativeParsingArrayInitialState:
-        case IterativeParsingElementDelimiterState: RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell()); return;
-        default: RAPIDJSON_ASSERT(src == IterativeParsingElementState); RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell()); return;
-        }
-    }
-
-    template <unsigned parseFlags, typename InputStream, typename Handler>
-    ParseResult IterativeParse(InputStream& is, Handler& handler) {
-        parseResult_.Clear();
-        ClearStackOnExit scope(*this);
-        IterativeParsingState state = IterativeParsingStartState;
-
-        SkipWhitespaceAndComments<parseFlags>(is);
-        RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-        while (is.Peek() != '\0') {
-            Token t = Tokenize(is.Peek());
-            IterativeParsingState n = Predict(state, t);
-            IterativeParsingState d = Transit<parseFlags>(state, t, n, is, handler);
-
-            if (d == IterativeParsingErrorState) {
-                HandleError(state, is);
-                break;
-            }
-
-            state = d;
-
-            // Do not further consume streams if a root JSON has been parsed.
-            if ((parseFlags & kParseStopWhenDoneFlag) && state == IterativeParsingFinishState)
-                break;
-
-            SkipWhitespaceAndComments<parseFlags>(is);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-        }
-
-        // Handle the end of file.
-        if (state != IterativeParsingFinishState)
-            HandleError(state, is);
-
-        return parseResult_;
-    }
-
-    static const size_t kDefaultStackCapacity = 256;    //!< Default stack capacity in bytes for storing a single decoded string.
-    internal::Stack<StackAllocator> stack_;  //!< A stack for storing decoded string temporarily during non-destructive parsing.
-    ParseResult parseResult_;
-}; // class GenericReader
-
-//! Reader with UTF8 encoding and default allocator.
-typedef GenericReader<UTF8<>, UTF8<> > Reader;
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_READER_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/schema.h b/sql-odbc/libraries/rapidjson/include/rapidjson/schema.h
deleted file mode 100644
index 87c667e214..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/schema.h
+++ /dev/null
@@ -1,2015 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available->
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip-> All rights reserved->
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License-> You may obtain a copy of the License at
-//
-// http://opensource->org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied-> See the License for the 
-// specific language governing permissions and limitations under the License->
-
-// clang-format off
-
-#ifndef RAPIDJSON_SCHEMA_H_
-#define RAPIDJSON_SCHEMA_H_
-
-#include "document.h"
-#include "pointer.h"
-#include <cmath> // abs, floor
-
-#if !defined(RAPIDJSON_SCHEMA_USE_INTERNALREGEX)
-#define RAPIDJSON_SCHEMA_USE_INTERNALREGEX 1
-#else
-#define RAPIDJSON_SCHEMA_USE_INTERNALREGEX 0
-#endif
-
-#if !RAPIDJSON_SCHEMA_USE_INTERNALREGEX && !defined(RAPIDJSON_SCHEMA_USE_STDREGEX) && (__cplusplus >=201103L || (defined(_MSC_VER) && _MSC_VER >= 1800))
-#define RAPIDJSON_SCHEMA_USE_STDREGEX 1
-#else
-#define RAPIDJSON_SCHEMA_USE_STDREGEX 0
-#endif
-
-#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
-#include "internal/regex.h"
-#elif RAPIDJSON_SCHEMA_USE_STDREGEX
-#include <regex>
-#endif
-
-#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX || RAPIDJSON_SCHEMA_USE_STDREGEX
-#define RAPIDJSON_SCHEMA_HAS_REGEX 1
-#else
-#define RAPIDJSON_SCHEMA_HAS_REGEX 0
-#endif
-
-#ifndef RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_SCHEMA_VERBOSE 0
-#endif
-
-#if RAPIDJSON_SCHEMA_VERBOSE
-#include "stringbuffer.h"
-#endif
-
-RAPIDJSON_DIAG_PUSH
-
-#if defined(__GNUC__)
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_OFF(weak-vtables)
-RAPIDJSON_DIAG_OFF(exit-time-destructors)
-RAPIDJSON_DIAG_OFF(c++98-compat-pedantic)
-RAPIDJSON_DIAG_OFF(variadic-macros)
-#endif
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// Verbose Utilities
-
-#if RAPIDJSON_SCHEMA_VERBOSE
-
-namespace internal {
-
-inline void PrintInvalidKeyword(const char* keyword) {
-    printf("Fail keyword: %s\n", keyword);
-}
-
-inline void PrintInvalidKeyword(const wchar_t* keyword) {
-    wprintf(L"Fail keyword: %ls\n", keyword);
-}
-
-inline void PrintInvalidDocument(const char* document) {
-    printf("Fail document: %s\n\n", document);
-}
-
-inline void PrintInvalidDocument(const wchar_t* document) {
-    wprintf(L"Fail document: %ls\n\n", document);
-}
-
-inline void PrintValidatorPointers(unsigned depth, const char* s, const char* d) {
-    printf("S: %*s%s\nD: %*s%s\n\n", depth * 4, " ", s, depth * 4, " ", d);
-}
-
-inline void PrintValidatorPointers(unsigned depth, const wchar_t* s, const wchar_t* d) {
-    wprintf(L"S: %*ls%ls\nD: %*ls%ls\n\n", depth * 4, L" ", s, depth * 4, L" ", d);
-}
-
-} // namespace internal
-
-#endif // RAPIDJSON_SCHEMA_VERBOSE
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_INVALID_KEYWORD_RETURN
-
-#if RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword) internal::PrintInvalidKeyword(keyword)
-#else
-#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword)
-#endif
-
-#define RAPIDJSON_INVALID_KEYWORD_RETURN(keyword)\
-RAPIDJSON_MULTILINEMACRO_BEGIN\
-    context.invalidKeyword = keyword.GetString();\
-    RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword.GetString());\
-    return false;\
-RAPIDJSON_MULTILINEMACRO_END
-
-///////////////////////////////////////////////////////////////////////////////
-// Forward declarations
-
-template <typename ValueType, typename Allocator>
-class GenericSchemaDocument;
-
-namespace internal {
-
-template <typename SchemaDocumentType>
-class Schema;
-
-///////////////////////////////////////////////////////////////////////////////
-// ISchemaValidator
-
-class ISchemaValidator {
-public:
-    virtual ~ISchemaValidator() {}
-    virtual bool IsValid() const = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// ISchemaStateFactory
-
-template <typename SchemaType>
-class ISchemaStateFactory {
-public:
-    virtual ~ISchemaStateFactory() {}
-    virtual ISchemaValidator* CreateSchemaValidator(const SchemaType&) = 0;
-    virtual void DestroySchemaValidator(ISchemaValidator* validator) = 0;
-    virtual void* CreateHasher() = 0;
-    virtual uint64_t GetHashCode(void* hasher) = 0;
-    virtual void DestroryHasher(void* hasher) = 0;
-    virtual void* MallocState(size_t size) = 0;
-    virtual void FreeState(void* p) = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Hasher
-
-// For comparison of compound value
-template<typename Encoding, typename Allocator>
-class Hasher {
-public:
-    typedef typename Encoding::Ch Ch;
-
-    Hasher(Allocator* allocator = 0, size_t stackCapacity = kDefaultSize) : stack_(allocator, stackCapacity) {}
-
-    bool Null() { return WriteType(kNullType); }
-    bool Bool(bool b) { return WriteType(b ? kTrueType : kFalseType); }
-    bool Int(int i) { Number n; n.u.i = i; n.d = static_cast<double>(i); return WriteNumber(n); }
-    bool Uint(unsigned u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
-    bool Int64(int64_t i) { Number n; n.u.i = i; n.d = static_cast<double>(i); return WriteNumber(n); }
-    bool Uint64(uint64_t u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
-    bool Double(double d) { 
-        Number n; 
-        if (d < 0) n.u.i = static_cast<int64_t>(d);
-        else       n.u.u = static_cast<uint64_t>(d); 
-        n.d = d;
-        return WriteNumber(n);
-    }
-
-    bool RawNumber(const Ch* str, SizeType len, bool) {
-        WriteBuffer(kNumberType, str, len * sizeof(Ch));
-        return true;
-    }
-
-    bool String(const Ch* str, SizeType len, bool) {
-        WriteBuffer(kStringType, str, len * sizeof(Ch));
-        return true;
-    }
-
-    bool StartObject() { return true; }
-    bool Key(const Ch* str, SizeType len, bool copy) { return String(str, len, copy); }
-    bool EndObject(SizeType memberCount) { 
-        uint64_t h = Hash(0, kObjectType);
-        uint64_t* kv = stack_.template Pop<uint64_t>(memberCount * 2);
-        for (SizeType i = 0; i < memberCount; i++)
-            h ^= Hash(kv[i * 2], kv[i * 2 + 1]);  // Use xor to achieve member order insensitive
-        *stack_.template Push<uint64_t>() = h;
-        return true;
-    }
-    
-    bool StartArray() { return true; }
-    bool EndArray(SizeType elementCount) { 
-        uint64_t h = Hash(0, kArrayType);
-        uint64_t* e = stack_.template Pop<uint64_t>(elementCount);
-        for (SizeType i = 0; i < elementCount; i++)
-            h = Hash(h, e[i]); // Use hash to achieve element order sensitive
-        *stack_.template Push<uint64_t>() = h;
-        return true;
-    }
-
-    bool IsValid() const { return stack_.GetSize() == sizeof(uint64_t); }
-
-    uint64_t GetHashCode() const {
-        RAPIDJSON_ASSERT(IsValid());
-        return *stack_.template Top<uint64_t>();
-    }
-
-private:
-    static const size_t kDefaultSize = 256;
-    struct Number {
-        union U {
-            uint64_t u;
-            int64_t i;
-        }u;
-        double d;
-    };
-
-    bool WriteType(Type type) { return WriteBuffer(type, 0, 0); }
-    
-    bool WriteNumber(const Number& n) { return WriteBuffer(kNumberType, &n, sizeof(n)); }
-    
-    bool WriteBuffer(Type type, const void* data, size_t len) {
-        // FNV-1a from http://isthe.com/chongo/tech/comp/fnv/
-        uint64_t h = Hash(RAPIDJSON_UINT64_C2(0x84222325, 0xcbf29ce4), type);
-        const unsigned char* d = static_cast<const unsigned char*>(data);
-        for (size_t i = 0; i < len; i++)
-            h = Hash(h, d[i]);
-        *stack_.template Push<uint64_t>() = h;
-        return true;
-    }
-
-    static uint64_t Hash(uint64_t h, uint64_t d) {
-        static const uint64_t kPrime = RAPIDJSON_UINT64_C2(0x00000100, 0x000001b3);
-        h ^= d;
-        h *= kPrime;
-        return h;
-    }
-
-    Stack<Allocator> stack_;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// SchemaValidationContext
-
-template <typename SchemaDocumentType>
-struct SchemaValidationContext {
-    typedef Schema<SchemaDocumentType> SchemaType;
-    typedef ISchemaStateFactory<SchemaType> SchemaValidatorFactoryType;
-    typedef typename SchemaType::ValueType ValueType;
-    typedef typename ValueType::Ch Ch;
-
-    enum PatternValidatorType {
-        kPatternValidatorOnly,
-        kPatternValidatorWithProperty,
-        kPatternValidatorWithAdditionalProperty
-    };
-
-    SchemaValidationContext(SchemaValidatorFactoryType& f, const SchemaType* s) :
-        factory(f),
-        schema(s),
-        valueSchema(),
-        invalidKeyword(),
-        hasher(),
-        arrayElementHashCodes(),
-        validators(),
-        validatorCount(),
-        patternPropertiesValidators(),
-        patternPropertiesValidatorCount(),
-        patternPropertiesSchemas(),
-        patternPropertiesSchemaCount(),
-        valuePatternValidatorType(kPatternValidatorOnly),
-        propertyExist(),
-        inArray(false),
-        valueUniqueness(false),
-        arrayUniqueness(false)
-    {
-    }
-
-    ~SchemaValidationContext() {
-        if (hasher)
-            factory.DestroryHasher(hasher);
-        if (validators) {
-            for (SizeType i = 0; i < validatorCount; i++)
-                factory.DestroySchemaValidator(validators[i]);
-            factory.FreeState(validators);
-        }
-        if (patternPropertiesValidators) {
-            for (SizeType i = 0; i < patternPropertiesValidatorCount; i++)
-                factory.DestroySchemaValidator(patternPropertiesValidators[i]);
-            factory.FreeState(patternPropertiesValidators);
-        }
-        if (patternPropertiesSchemas)
-            factory.FreeState(patternPropertiesSchemas);
-        if (propertyExist)
-            factory.FreeState(propertyExist);
-    }
-
-    SchemaValidatorFactoryType& factory;
-    const SchemaType* schema;
-    const SchemaType* valueSchema;
-    const Ch* invalidKeyword;
-    void* hasher; // Only validator access
-    void* arrayElementHashCodes; // Only validator access this
-    ISchemaValidator** validators;
-    SizeType validatorCount;
-    ISchemaValidator** patternPropertiesValidators;
-    SizeType patternPropertiesValidatorCount;
-    const SchemaType** patternPropertiesSchemas;
-    SizeType patternPropertiesSchemaCount;
-    PatternValidatorType valuePatternValidatorType;
-    PatternValidatorType objectPatternValidatorType;
-    SizeType arrayElementIndex;
-    bool* propertyExist;
-    bool inArray;
-    bool valueUniqueness;
-    bool arrayUniqueness;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Schema
-
-template <typename SchemaDocumentType>
-class Schema {
-public:
-    typedef typename SchemaDocumentType::ValueType ValueType;
-    typedef typename SchemaDocumentType::AllocatorType AllocatorType;
-    typedef typename SchemaDocumentType::PointerType PointerType;
-    typedef typename ValueType::EncodingType EncodingType;
-    typedef typename EncodingType::Ch Ch;
-    typedef SchemaValidationContext<SchemaDocumentType> Context;
-    typedef Schema<SchemaDocumentType> SchemaType;
-    typedef GenericValue<EncodingType, AllocatorType> SValue;
-    friend class GenericSchemaDocument<ValueType, AllocatorType>;
-
-    Schema(SchemaDocumentType* schemaDocument, const PointerType& p, const ValueType& value, const ValueType& document, AllocatorType* allocator) :
-        allocator_(allocator),
-        enum_(),
-        enumCount_(),
-        not_(),
-        type_((1 << kTotalSchemaType) - 1), // typeless
-        validatorCount_(),
-        properties_(),
-        additionalPropertiesSchema_(),
-        patternProperties_(),
-        patternPropertyCount_(),
-        propertyCount_(),
-        minProperties_(),
-        maxProperties_(SizeType(~0)),
-        additionalProperties_(true),
-        hasDependencies_(),
-        hasRequired_(),
-        hasSchemaDependencies_(),
-        additionalItemsSchema_(),
-        itemsList_(),
-        itemsTuple_(),
-        itemsTupleCount_(),
-        minItems_(),
-        maxItems_(SizeType(~0)),
-        additionalItems_(true),
-        uniqueItems_(false),
-        pattern_(),
-        minLength_(0),
-        maxLength_(~SizeType(0)),
-        exclusiveMinimum_(false),
-        exclusiveMaximum_(false)
-    {
-        typedef typename SchemaDocumentType::ValueType ValueType;
-        typedef typename ValueType::ConstValueIterator ConstValueIterator;
-        typedef typename ValueType::ConstMemberIterator ConstMemberIterator;
-
-        if (!value.IsObject())
-            return;
-
-        if (const ValueType* v = GetMember(value, GetTypeString())) {
-            type_ = 0;
-            if (v->IsString())
-                AddType(*v);
-            else if (v->IsArray())
-                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr)
-                    AddType(*itr);
-        }
-
-        if (const ValueType* v = GetMember(value, GetEnumString()))
-            if (v->IsArray() && v->Size() > 0) {
-                enum_ = static_cast<uint64_t*>(allocator_->Malloc(sizeof(uint64_t) * v->Size()));
-                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr) {
-                    typedef Hasher<EncodingType, MemoryPoolAllocator<> > EnumHasherType;
-                    char buffer[256 + 24];
-                    MemoryPoolAllocator<> hasherAllocator(buffer, sizeof(buffer));
-                    EnumHasherType h(&hasherAllocator, 256);
-                    itr->Accept(h);
-                    enum_[enumCount_++] = h.GetHashCode();
-                }
-            }
-
-        if (schemaDocument) {
-            AssignIfExist(allOf_, *schemaDocument, p, value, GetAllOfString(), document);
-            AssignIfExist(anyOf_, *schemaDocument, p, value, GetAnyOfString(), document);
-            AssignIfExist(oneOf_, *schemaDocument, p, value, GetOneOfString(), document);
-        }
-
-        if (const ValueType* v = GetMember(value, GetNotString())) {
-            schemaDocument->CreateSchema(&not_, p.Append(GetNotString(), allocator_), *v, document);
-            notValidatorIndex_ = validatorCount_;
-            validatorCount_++;
-        }
-
-        // Object
-
-        const ValueType* properties = GetMember(value, GetPropertiesString());
-        const ValueType* required = GetMember(value, GetRequiredString());
-        const ValueType* dependencies = GetMember(value, GetDependenciesString());
-        {
-            // Gather properties from properties/required/dependencies
-            SValue allProperties(kArrayType);
-
-            if (properties && properties->IsObject())
-                for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr)
-                    AddUniqueElement(allProperties, itr->name);
-            
-            if (required && required->IsArray())
-                for (ConstValueIterator itr = required->Begin(); itr != required->End(); ++itr)
-                    if (itr->IsString())
-                        AddUniqueElement(allProperties, *itr);
-
-            if (dependencies && dependencies->IsObject())
-                for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
-                    AddUniqueElement(allProperties, itr->name);
-                    if (itr->value.IsArray())
-                        for (ConstValueIterator i = itr->value.Begin(); i != itr->value.End(); ++i)
-                            if (i->IsString())
-                                AddUniqueElement(allProperties, *i);
-                }
-
-            if (allProperties.Size() > 0) {
-                propertyCount_ = allProperties.Size();
-                properties_ = static_cast<Property*>(allocator_->Malloc(sizeof(Property) * propertyCount_));
-                for (SizeType i = 0; i < propertyCount_; i++) {
-                    new (&properties_[i]) Property();
-                    properties_[i].name = allProperties[i];
-                    properties_[i].schema = GetTypeless();
-                }
-            }
-        }
-
-        if (properties && properties->IsObject()) {
-            PointerType q = p.Append(GetPropertiesString(), allocator_);
-            for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr) {
-                SizeType index;
-                if (FindPropertyIndex(itr->name, &index))
-                    schemaDocument->CreateSchema(&properties_[index].schema, q.Append(itr->name, allocator_), itr->value, document);
-            }
-        }
-
-        if (const ValueType* v = GetMember(value, GetPatternPropertiesString())) {
-            PointerType q = p.Append(GetPatternPropertiesString(), allocator_);
-            patternProperties_ = static_cast<PatternProperty*>(allocator_->Malloc(sizeof(PatternProperty) * v->MemberCount()));
-            patternPropertyCount_ = 0;
-
-            for (ConstMemberIterator itr = v->MemberBegin(); itr != v->MemberEnd(); ++itr) {
-                new (&patternProperties_[patternPropertyCount_]) PatternProperty();
-                patternProperties_[patternPropertyCount_].pattern = CreatePattern(itr->name);
-                schemaDocument->CreateSchema(&patternProperties_[patternPropertyCount_].schema, q.Append(itr->name, allocator_), itr->value, document);
-                patternPropertyCount_++;
-            }
-        }
-
-        if (required && required->IsArray())
-            for (ConstValueIterator itr = required->Begin(); itr != required->End(); ++itr)
-                if (itr->IsString()) {
-                    SizeType index;
-                    if (FindPropertyIndex(*itr, &index)) {
-                        properties_[index].required = true;
-                        hasRequired_ = true;
-                    }
-                }
-
-        if (dependencies && dependencies->IsObject()) {
-            PointerType q = p.Append(GetDependenciesString(), allocator_);
-            hasDependencies_ = true;
-            for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
-                SizeType sourceIndex;
-                if (FindPropertyIndex(itr->name, &sourceIndex)) {
-                    if (itr->value.IsArray()) {
-                        properties_[sourceIndex].dependencies = static_cast<bool*>(allocator_->Malloc(sizeof(bool) * propertyCount_));
-                        std::memset(properties_[sourceIndex].dependencies, 0, sizeof(bool)* propertyCount_);
-                        for (ConstValueIterator targetItr = itr->value.Begin(); targetItr != itr->value.End(); ++targetItr) {
-                            SizeType targetIndex;
-                            if (FindPropertyIndex(*targetItr, &targetIndex))
-                                properties_[sourceIndex].dependencies[targetIndex] = true;
-                        }
-                    }
-                    else if (itr->value.IsObject()) {
-                        hasSchemaDependencies_ = true;
-                        schemaDocument->CreateSchema(&properties_[sourceIndex].dependenciesSchema, q.Append(itr->name, allocator_), itr->value, document);
-                        properties_[sourceIndex].dependenciesValidatorIndex = validatorCount_;
-                        validatorCount_++;
-                    }
-                }
-            }
-        }
-
-        if (const ValueType* v = GetMember(value, GetAdditionalPropertiesString())) {
-            if (v->IsBool())
-                additionalProperties_ = v->GetBool();
-            else if (v->IsObject())
-                schemaDocument->CreateSchema(&additionalPropertiesSchema_, p.Append(GetAdditionalPropertiesString(), allocator_), *v, document);
-        }
-
-        AssignIfExist(minProperties_, value, GetMinPropertiesString());
-        AssignIfExist(maxProperties_, value, GetMaxPropertiesString());
-
-        // Array
-        if (const ValueType* v = GetMember(value, GetItemsString())) {
-            PointerType q = p.Append(GetItemsString(), allocator_);
-            if (v->IsObject()) // List validation
-                schemaDocument->CreateSchema(&itemsList_, q, *v, document);
-            else if (v->IsArray()) { // Tuple validation
-                itemsTuple_ = static_cast<const Schema**>(allocator_->Malloc(sizeof(const Schema*) * v->Size()));
-                SizeType index = 0;
-                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr, index++)
-                    schemaDocument->CreateSchema(&itemsTuple_[itemsTupleCount_++], q.Append(index, allocator_), *itr, document);
-            }
-        }
-
-        AssignIfExist(minItems_, value, GetMinItemsString());
-        AssignIfExist(maxItems_, value, GetMaxItemsString());
-
-        if (const ValueType* v = GetMember(value, GetAdditionalItemsString())) {
-            if (v->IsBool())
-                additionalItems_ = v->GetBool();
-            else if (v->IsObject())
-                schemaDocument->CreateSchema(&additionalItemsSchema_, p.Append(GetAdditionalItemsString(), allocator_), *v, document);
-        }
-
-        AssignIfExist(uniqueItems_, value, GetUniqueItemsString());
-
-        // String
-        AssignIfExist(minLength_, value, GetMinLengthString());
-        AssignIfExist(maxLength_, value, GetMaxLengthString());
-
-        if (const ValueType* v = GetMember(value, GetPatternString()))
-            pattern_ = CreatePattern(*v);
-
-        // Number
-        if (const ValueType* v = GetMember(value, GetMinimumString()))
-            if (v->IsNumber())
-                minimum_.CopyFrom(*v, *allocator_);
-
-        if (const ValueType* v = GetMember(value, GetMaximumString()))
-            if (v->IsNumber())
-                maximum_.CopyFrom(*v, *allocator_);
-
-        AssignIfExist(exclusiveMinimum_, value, GetExclusiveMinimumString());
-        AssignIfExist(exclusiveMaximum_, value, GetExclusiveMaximumString());
-
-        if (const ValueType* v = GetMember(value, GetMultipleOfString()))
-            if (v->IsNumber() && v->GetDouble() > 0.0)
-                multipleOf_.CopyFrom(*v, *allocator_);
-    }
-
-    ~Schema() {
-        if (allocator_) {
-            allocator_->Free(enum_);
-        }
-        if (properties_) {
-            for (SizeType i = 0; i < propertyCount_; i++)
-                properties_[i].~Property();
-            AllocatorType::Free(properties_);
-        }
-        if (patternProperties_) {
-            for (SizeType i = 0; i < patternPropertyCount_; i++)
-                patternProperties_[i].~PatternProperty();
-            AllocatorType::Free(patternProperties_);
-        }
-        AllocatorType::Free(itemsTuple_);
-#if RAPIDJSON_SCHEMA_HAS_REGEX
-        if (pattern_) {
-            pattern_->~RegexType();
-            allocator_->Free(pattern_);
-        }
-#endif
-    }
-
-    bool BeginValue(Context& context) const {
-        if (context.inArray) {
-            if (uniqueItems_)
-                context.valueUniqueness = true;
-
-            if (itemsList_)
-                context.valueSchema = itemsList_;
-            else if (itemsTuple_) {
-                if (context.arrayElementIndex < itemsTupleCount_)
-                    context.valueSchema = itemsTuple_[context.arrayElementIndex];
-                else if (additionalItemsSchema_)
-                    context.valueSchema = additionalItemsSchema_;
-                else if (additionalItems_)
-                    context.valueSchema = GetTypeless();
-                else
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetItemsString());
-            }
-            else
-                context.valueSchema = GetTypeless();
-
-            context.arrayElementIndex++;
-        }
-        return true;
-    }
-
-    RAPIDJSON_FORCEINLINE bool EndValue(Context& context) const {
-        if (context.patternPropertiesValidatorCount > 0) {
-            bool otherValid = false;
-            SizeType count = context.patternPropertiesValidatorCount;
-            if (context.objectPatternValidatorType != Context::kPatternValidatorOnly)
-                otherValid = context.patternPropertiesValidators[--count]->IsValid();
-
-            bool patternValid = true;
-            for (SizeType i = 0; i < count; i++)
-                if (!context.patternPropertiesValidators[i]->IsValid()) {
-                    patternValid = false;
-                    break;
-                }
-
-            if (context.objectPatternValidatorType == Context::kPatternValidatorOnly) {
-                if (!patternValid)
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
-            }
-            else if (context.objectPatternValidatorType == Context::kPatternValidatorWithProperty) {
-                if (!patternValid || !otherValid)
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
-            }
-            else if (!patternValid && !otherValid) // kPatternValidatorWithAdditionalProperty)
-                RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
-        }
-
-        if (enum_) {
-            const uint64_t h = context.factory.GetHashCode(context.hasher);
-            for (SizeType i = 0; i < enumCount_; i++)
-                if (enum_[i] == h)
-                    goto foundEnum;
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetEnumString());
-            foundEnum:;
-        }
-
-        if (allOf_.schemas)
-            for (SizeType i = allOf_.begin; i < allOf_.begin + allOf_.count; i++)
-                if (!context.validators[i]->IsValid())
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetAllOfString());
-        
-        if (anyOf_.schemas) {
-            for (SizeType i = anyOf_.begin; i < anyOf_.begin + anyOf_.count; i++)
-                if (context.validators[i]->IsValid())
-                    goto foundAny;
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetAnyOfString());
-            foundAny:;
-        }
-
-        if (oneOf_.schemas) {
-            bool oneValid = false;
-            for (SizeType i = oneOf_.begin; i < oneOf_.begin + oneOf_.count; i++)
-                if (context.validators[i]->IsValid()) {
-                    if (oneValid)
-                        RAPIDJSON_INVALID_KEYWORD_RETURN(GetOneOfString());
-                    else
-                        oneValid = true;
-                }
-            if (!oneValid)
-                RAPIDJSON_INVALID_KEYWORD_RETURN(GetOneOfString());
-        }
-
-        if (not_ && context.validators[notValidatorIndex_]->IsValid())
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetNotString());
-
-        return true;
-    }
-
-    bool Null(Context& context) const { 
-        if (!(type_ & (1 << kNullSchemaType)))
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        return CreateParallelValidator(context);
-    }
-    
-    bool Bool(Context& context, bool) const { 
-        if (!(type_ & (1 << kBooleanSchemaType)))
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        return CreateParallelValidator(context);
-    }
-
-    bool Int(Context& context, int i) const {
-        if (!CheckInt(context, i))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Uint(Context& context, unsigned u) const {
-        if (!CheckUint(context, u))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Int64(Context& context, int64_t i) const {
-        if (!CheckInt(context, i))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Uint64(Context& context, uint64_t u) const {
-        if (!CheckUint(context, u))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Double(Context& context, double d) const {
-        if (!(type_ & (1 << kNumberSchemaType)))
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        if (!minimum_.IsNull() && !CheckDoubleMinimum(context, d))
-            return false;
-
-        if (!maximum_.IsNull() && !CheckDoubleMaximum(context, d))
-            return false;
-        
-        if (!multipleOf_.IsNull() && !CheckDoubleMultipleOf(context, d))
-            return false;
-        
-        return CreateParallelValidator(context);
-    }
-    
-    bool String(Context& context, const Ch* str, SizeType length, bool) const {
-        if (!(type_ & (1 << kStringSchemaType)))
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        if (minLength_ != 0 || maxLength_ != SizeType(~0)) {
-            SizeType count;
-            if (internal::CountStringCodePoint<EncodingType>(str, length, &count)) {
-                if (count < minLength_)
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinLengthString());
-                if (count > maxLength_)
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxLengthString());
-            }
-        }
-
-        if (pattern_ && !IsPatternMatch(pattern_, str, length))
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternString());
-
-        return CreateParallelValidator(context);
-    }
-
-    bool StartObject(Context& context) const { 
-        if (!(type_ & (1 << kObjectSchemaType)))
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        if (hasDependencies_ || hasRequired_) {
-            context.propertyExist = static_cast<bool*>(context.factory.MallocState(sizeof(bool) * propertyCount_));
-            std::memset(context.propertyExist, 0, sizeof(bool) * propertyCount_);
-        }
-
-        if (patternProperties_) { // pre-allocate schema array
-            SizeType count = patternPropertyCount_ + 1; // extra for valuePatternValidatorType
-            context.patternPropertiesSchemas = static_cast<const SchemaType**>(context.factory.MallocState(sizeof(const SchemaType*) * count));
-            context.patternPropertiesSchemaCount = 0;
-            std::memset(context.patternPropertiesSchemas, 0, sizeof(SchemaType*) * count);
-        }
-
-        return CreateParallelValidator(context);
-    }
-    
-    bool Key(Context& context, const Ch* str, SizeType len, bool) const {
-        if (patternProperties_) {
-            context.patternPropertiesSchemaCount = 0;
-            for (SizeType i = 0; i < patternPropertyCount_; i++)
-                if (patternProperties_[i].pattern && IsPatternMatch(patternProperties_[i].pattern, str, len))
-                    context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = patternProperties_[i].schema;
-        }
-
-        SizeType index;
-        if (FindPropertyIndex(ValueType(str, len).Move(), &index)) {
-            if (context.patternPropertiesSchemaCount > 0) {
-                context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = properties_[index].schema;
-                context.valueSchema = GetTypeless();
-                context.valuePatternValidatorType = Context::kPatternValidatorWithProperty;
-            }
-            else
-                context.valueSchema = properties_[index].schema;
-
-            if (context.propertyExist)
-                context.propertyExist[index] = true;
-
-            return true;
-        }
-
-        if (additionalPropertiesSchema_) {
-            if (additionalPropertiesSchema_ && context.patternPropertiesSchemaCount > 0) {
-                context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = additionalPropertiesSchema_;
-                context.valueSchema = GetTypeless();
-                context.valuePatternValidatorType = Context::kPatternValidatorWithAdditionalProperty;
-            }
-            else
-                context.valueSchema = additionalPropertiesSchema_;
-            return true;
-        }
-        else if (additionalProperties_) {
-            context.valueSchema = GetTypeless();
-            return true;
-        }
-
-        if (context.patternPropertiesSchemaCount == 0) // patternProperties are not additional properties
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetAdditionalPropertiesString());
-
-        return true;
-    }
-
-    bool EndObject(Context& context, SizeType memberCount) const {
-        if (hasRequired_)
-            for (SizeType index = 0; index < propertyCount_; index++)
-                if (properties_[index].required)
-                    if (!context.propertyExist[index])
-                        RAPIDJSON_INVALID_KEYWORD_RETURN(GetRequiredString());
-
-        if (memberCount < minProperties_)
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinPropertiesString());
-
-        if (memberCount > maxProperties_)
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxPropertiesString());
-
-        if (hasDependencies_) {
-            for (SizeType sourceIndex = 0; sourceIndex < propertyCount_; sourceIndex++)
-                if (context.propertyExist[sourceIndex]) {
-                    if (properties_[sourceIndex].dependencies) {
-                        for (SizeType targetIndex = 0; targetIndex < propertyCount_; targetIndex++)
-                            if (properties_[sourceIndex].dependencies[targetIndex] && !context.propertyExist[targetIndex])
-                                RAPIDJSON_INVALID_KEYWORD_RETURN(GetDependenciesString());
-                    }
-                    else if (properties_[sourceIndex].dependenciesSchema)
-                        if (!context.validators[properties_[sourceIndex].dependenciesValidatorIndex]->IsValid())
-                            RAPIDJSON_INVALID_KEYWORD_RETURN(GetDependenciesString());
-                }
-        }
-
-        return true;
-    }
-
-    bool StartArray(Context& context) const { 
-        if (!(type_ & (1 << kArraySchemaType)))
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        context.arrayElementIndex = 0;
-        context.inArray = true;
-
-        return CreateParallelValidator(context);
-    }
-
-    bool EndArray(Context& context, SizeType elementCount) const { 
-        context.inArray = false;
-        
-        if (elementCount < minItems_)
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinItemsString());
-        
-        if (elementCount > maxItems_)
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxItemsString());
-
-        return true;
-    }
-
-    // Generate functions for string literal according to Ch
-#define RAPIDJSON_STRING_(name, ...) \
-    static const ValueType& Get##name##String() {\
-        static const Ch s[] = { __VA_ARGS__, '\0' };\
-        static const ValueType v(s, sizeof(s) / sizeof(Ch) - 1);\
-        return v;\
-    }
-
-    RAPIDJSON_STRING_(Null, 'n', 'u', 'l', 'l')
-    RAPIDJSON_STRING_(Boolean, 'b', 'o', 'o', 'l', 'e', 'a', 'n')
-    RAPIDJSON_STRING_(Object, 'o', 'b', 'j', 'e', 'c', 't')
-    RAPIDJSON_STRING_(Array, 'a', 'r', 'r', 'a', 'y')
-    RAPIDJSON_STRING_(String, 's', 't', 'r', 'i', 'n', 'g')
-    RAPIDJSON_STRING_(Number, 'n', 'u', 'm', 'b', 'e', 'r')
-    RAPIDJSON_STRING_(Integer, 'i', 'n', 't', 'e', 'g', 'e', 'r')
-    RAPIDJSON_STRING_(Type, 't', 'y', 'p', 'e')
-    RAPIDJSON_STRING_(Enum, 'e', 'n', 'u', 'm')
-    RAPIDJSON_STRING_(AllOf, 'a', 'l', 'l', 'O', 'f')
-    RAPIDJSON_STRING_(AnyOf, 'a', 'n', 'y', 'O', 'f')
-    RAPIDJSON_STRING_(OneOf, 'o', 'n', 'e', 'O', 'f')
-    RAPIDJSON_STRING_(Not, 'n', 'o', 't')
-    RAPIDJSON_STRING_(Properties, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    RAPIDJSON_STRING_(Required, 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'd')
-    RAPIDJSON_STRING_(Dependencies, 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'i', 'e', 's')
-    RAPIDJSON_STRING_(PatternProperties, 'p', 'a', 't', 't', 'e', 'r', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    RAPIDJSON_STRING_(AdditionalProperties, 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    RAPIDJSON_STRING_(MinProperties, 'm', 'i', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    RAPIDJSON_STRING_(MaxProperties, 'm', 'a', 'x', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    RAPIDJSON_STRING_(Items, 'i', 't', 'e', 'm', 's')
-    RAPIDJSON_STRING_(MinItems, 'm', 'i', 'n', 'I', 't', 'e', 'm', 's')
-    RAPIDJSON_STRING_(MaxItems, 'm', 'a', 'x', 'I', 't', 'e', 'm', 's')
-    RAPIDJSON_STRING_(AdditionalItems, 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'I', 't', 'e', 'm', 's')
-    RAPIDJSON_STRING_(UniqueItems, 'u', 'n', 'i', 'q', 'u', 'e', 'I', 't', 'e', 'm', 's')
-    RAPIDJSON_STRING_(MinLength, 'm', 'i', 'n', 'L', 'e', 'n', 'g', 't', 'h')
-    RAPIDJSON_STRING_(MaxLength, 'm', 'a', 'x', 'L', 'e', 'n', 'g', 't', 'h')
-    RAPIDJSON_STRING_(Pattern, 'p', 'a', 't', 't', 'e', 'r', 'n')
-    RAPIDJSON_STRING_(Minimum, 'm', 'i', 'n', 'i', 'm', 'u', 'm')
-    RAPIDJSON_STRING_(Maximum, 'm', 'a', 'x', 'i', 'm', 'u', 'm')
-    RAPIDJSON_STRING_(ExclusiveMinimum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'i', 'n', 'i', 'm', 'u', 'm')
-    RAPIDJSON_STRING_(ExclusiveMaximum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'a', 'x', 'i', 'm', 'u', 'm')
-    RAPIDJSON_STRING_(MultipleOf, 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'O', 'f')
-
-#undef RAPIDJSON_STRING_
-
-private:
-    enum SchemaValueType {
-        kNullSchemaType,
-        kBooleanSchemaType,
-        kObjectSchemaType,
-        kArraySchemaType,
-        kStringSchemaType,
-        kNumberSchemaType,
-        kIntegerSchemaType,
-        kTotalSchemaType
-    };
-
-#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
-        typedef internal::GenericRegex<EncodingType> RegexType;
-#elif RAPIDJSON_SCHEMA_USE_STDREGEX
-        typedef std::basic_regex<Ch> RegexType;
-#else
-        typedef char RegexType;
-#endif
-
-    struct SchemaArray {
-        SchemaArray() : schemas(), count() {}
-        ~SchemaArray() { AllocatorType::Free(schemas); }
-        const SchemaType** schemas;
-        SizeType begin; // begin index of context.validators
-        SizeType count;
-    };
-
-    static const SchemaType* GetTypeless() {
-        static SchemaType typeless(0, PointerType(), ValueType(kObjectType).Move(), ValueType(kObjectType).Move(), 0);
-        return &typeless;
-    }
-
-    template <typename V1, typename V2>
-    void AddUniqueElement(V1& a, const V2& v) {
-        for (typename V1::ConstValueIterator itr = a.Begin(); itr != a.End(); ++itr)
-            if (*itr == v)
-                return;
-        V1 c(v, *allocator_);
-        a.PushBack(c, *allocator_);
-    }
-
-    static const ValueType* GetMember(const ValueType& value, const ValueType& name) {
-        typename ValueType::ConstMemberIterator itr = value.FindMember(name);
-        return itr != value.MemberEnd() ? &(itr->value) : 0;
-    }
-
-    static void AssignIfExist(bool& out, const ValueType& value, const ValueType& name) {
-        if (const ValueType* v = GetMember(value, name))
-            if (v->IsBool())
-                out = v->GetBool();
-    }
-
-    static void AssignIfExist(SizeType& out, const ValueType& value, const ValueType& name) {
-        if (const ValueType* v = GetMember(value, name))
-            if (v->IsUint64() && v->GetUint64() <= SizeType(~0))
-                out = static_cast<SizeType>(v->GetUint64());
-    }
-
-    void AssignIfExist(SchemaArray& out, SchemaDocumentType& schemaDocument, const PointerType& p, const ValueType& value, const ValueType& name, const ValueType& document) {
-        if (const ValueType* v = GetMember(value, name)) {
-            if (v->IsArray() && v->Size() > 0) {
-                PointerType q = p.Append(name, allocator_);
-                out.count = v->Size();
-                out.schemas = static_cast<const Schema**>(allocator_->Malloc(out.count * sizeof(const Schema*)));
-                memset(out.schemas, 0, sizeof(Schema*)* out.count);
-                for (SizeType i = 0; i < out.count; i++)
-                    schemaDocument.CreateSchema(&out.schemas[i], q.Append(i, allocator_), (*v)[i], document);
-                out.begin = validatorCount_;
-                validatorCount_ += out.count;
-            }
-        }
-    }
-
-#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
-    template <typename ValueType>
-    RegexType* CreatePattern(const ValueType& value) {
-        if (value.IsString()) {
-            RegexType* r = new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString());
-            if (!r->IsValid()) {
-                r->~RegexType();
-                AllocatorType::Free(r);
-                r = 0;
-            }
-            return r;
-        }
-        return 0;
-    }
-
-    static bool IsPatternMatch(const RegexType* pattern, const Ch *str, SizeType) {
-        return pattern->Search(str);
-    }
-#elif RAPIDJSON_SCHEMA_USE_STDREGEX
-    template <typename ValueType>
-    RegexType* CreatePattern(const ValueType& value) {
-        if (value.IsString())
-            try {
-                return new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString(), std::size_t(value.GetStringLength()), std::regex_constants::ECMAScript);
-            }
-            catch (const std::regex_error&) {
-            }
-        return 0;
-    }
-
-    static bool IsPatternMatch(const RegexType* pattern, const Ch *str, SizeType length) {
-        std::match_results<const Ch*> r;
-        return std::regex_search(str, str + length, r, *pattern);
-    }
-#else
-    template <typename ValueType>
-    RegexType* CreatePattern(const ValueType&) { return 0; }
-
-    static bool IsPatternMatch(const RegexType*, const Ch *, SizeType) { return true; }
-#endif // RAPIDJSON_SCHEMA_USE_STDREGEX
-
-    void AddType(const ValueType& type) {
-        if      (type == GetNullString()   ) type_ |= 1 << kNullSchemaType;
-        else if (type == GetBooleanString()) type_ |= 1 << kBooleanSchemaType;
-        else if (type == GetObjectString() ) type_ |= 1 << kObjectSchemaType;
-        else if (type == GetArrayString()  ) type_ |= 1 << kArraySchemaType;
-        else if (type == GetStringString() ) type_ |= 1 << kStringSchemaType;
-        else if (type == GetIntegerString()) type_ |= 1 << kIntegerSchemaType;
-        else if (type == GetNumberString() ) type_ |= (1 << kNumberSchemaType) | (1 << kIntegerSchemaType);
-    }
-
-    bool CreateParallelValidator(Context& context) const {
-        if (enum_ || context.arrayUniqueness)
-            context.hasher = context.factory.CreateHasher();
-
-        if (validatorCount_) {
-            RAPIDJSON_ASSERT(context.validators == 0);
-            context.validators = static_cast<ISchemaValidator**>(context.factory.MallocState(sizeof(ISchemaValidator*) * validatorCount_));
-            context.validatorCount = validatorCount_;
-
-            if (allOf_.schemas)
-                CreateSchemaValidators(context, allOf_);
-
-            if (anyOf_.schemas)
-                CreateSchemaValidators(context, anyOf_);
-            
-            if (oneOf_.schemas)
-                CreateSchemaValidators(context, oneOf_);
-            
-            if (not_)
-                context.validators[notValidatorIndex_] = context.factory.CreateSchemaValidator(*not_);
-            
-            if (hasSchemaDependencies_) {
-                for (SizeType i = 0; i < propertyCount_; i++)
-                    if (properties_[i].dependenciesSchema)
-                        context.validators[properties_[i].dependenciesValidatorIndex] = context.factory.CreateSchemaValidator(*properties_[i].dependenciesSchema);
-            }
-        }
-
-        return true;
-    }
-
-    void CreateSchemaValidators(Context& context, const SchemaArray& schemas) const {
-        for (SizeType i = 0; i < schemas.count; i++)
-            context.validators[schemas.begin + i] = context.factory.CreateSchemaValidator(*schemas.schemas[i]);
-    }
-
-    // O(n)
-    bool FindPropertyIndex(const ValueType& name, SizeType* outIndex) const {
-        SizeType len = name.GetStringLength();
-        const Ch* str = name.GetString();
-        for (SizeType index = 0; index < propertyCount_; index++)
-            if (properties_[index].name.GetStringLength() == len && 
-                (std::memcmp(properties_[index].name.GetString(), str, sizeof(Ch) * len) == 0))
-            {
-                *outIndex = index;
-                return true;
-            }
-        return false;
-    }
-
-    bool CheckInt(Context& context, int64_t i) const {
-        if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType))))
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        if (!minimum_.IsNull()) {
-            if (minimum_.IsInt64()) {
-                if (exclusiveMinimum_ ? i <= minimum_.GetInt64() : i < minimum_.GetInt64())
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
-            }
-            else if (minimum_.IsUint64()) {
-                RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString()); // i <= max(int64_t) < minimum.GetUint64()
-            }
-            else if (!CheckDoubleMinimum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!maximum_.IsNull()) {
-            if (maximum_.IsInt64()) {
-                if (exclusiveMaximum_ ? i >= maximum_.GetInt64() : i > maximum_.GetInt64())
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
-            }
-            else if (maximum_.IsUint64())
-                /* do nothing */; // i <= max(int64_t) < maximum_.GetUint64()
-            else if (!CheckDoubleMaximum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!multipleOf_.IsNull()) {
-            if (multipleOf_.IsUint64()) {
-                if (static_cast<uint64_t>(i >= 0 ? i : -i) % multipleOf_.GetUint64() != 0)
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
-            }
-            else if (!CheckDoubleMultipleOf(context, static_cast<double>(i)))
-                return false;
-        }
-
-        return true;
-    }
-
-    bool CheckUint(Context& context, uint64_t i) const {
-        if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType))))
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        if (!minimum_.IsNull()) {
-            if (minimum_.IsUint64()) {
-                if (exclusiveMinimum_ ? i <= minimum_.GetUint64() : i < minimum_.GetUint64())
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
-            }
-            else if (minimum_.IsInt64())
-                /* do nothing */; // i >= 0 > minimum.Getint64()
-            else if (!CheckDoubleMinimum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!maximum_.IsNull()) {
-            if (maximum_.IsUint64()) {
-                if (exclusiveMaximum_ ? i >= maximum_.GetUint64() : i > maximum_.GetUint64())
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
-            }
-            else if (maximum_.IsInt64())
-                RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString()); // i >= 0 > maximum_
-            else if (!CheckDoubleMaximum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!multipleOf_.IsNull()) {
-            if (multipleOf_.IsUint64()) {
-                if (i % multipleOf_.GetUint64() != 0)
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
-            }
-            else if (!CheckDoubleMultipleOf(context, static_cast<double>(i)))
-                return false;
-        }
-
-        return true;
-    }
-
-    bool CheckDoubleMinimum(Context& context, double d) const {
-        if (exclusiveMinimum_ ? d <= minimum_.GetDouble() : d < minimum_.GetDouble())
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
-        return true;
-    }
-
-    bool CheckDoubleMaximum(Context& context, double d) const {
-        if (exclusiveMaximum_ ? d >= maximum_.GetDouble() : d > maximum_.GetDouble())
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
-        return true;
-    }
-
-    bool CheckDoubleMultipleOf(Context& context, double d) const {
-        double a = std::abs(d), b = std::abs(multipleOf_.GetDouble());
-        double q = std::floor(a / b);
-        double r = a - q * b;
-        if (r > 0.0)
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
-        return true;
-    }
-
-    struct Property {
-        Property() : schema(), dependenciesSchema(), dependenciesValidatorIndex(), dependencies(), required(false) {}
-        ~Property() { AllocatorType::Free(dependencies); }
-        SValue name;
-        const SchemaType* schema;
-        const SchemaType* dependenciesSchema;
-        SizeType dependenciesValidatorIndex;
-        bool* dependencies;
-        bool required;
-    };
-
-    struct PatternProperty {
-        PatternProperty() : schema(), pattern() {}
-        ~PatternProperty() { 
-            if (pattern) {
-                pattern->~RegexType();
-                AllocatorType::Free(pattern);
-            }
-        }
-        const SchemaType* schema;
-        RegexType* pattern;
-    };
-
-    AllocatorType* allocator_;
-    uint64_t* enum_;
-    SizeType enumCount_;
-    SchemaArray allOf_;
-    SchemaArray anyOf_;
-    SchemaArray oneOf_;
-    const SchemaType* not_;
-    unsigned type_; // bitmask of kSchemaType
-    SizeType validatorCount_;
-    SizeType notValidatorIndex_;
-
-    Property* properties_;
-    const SchemaType* additionalPropertiesSchema_;
-    PatternProperty* patternProperties_;
-    SizeType patternPropertyCount_;
-    SizeType propertyCount_;
-    SizeType minProperties_;
-    SizeType maxProperties_;
-    bool additionalProperties_;
-    bool hasDependencies_;
-    bool hasRequired_;
-    bool hasSchemaDependencies_;
-
-    const SchemaType* additionalItemsSchema_;
-    const SchemaType* itemsList_;
-    const SchemaType** itemsTuple_;
-    SizeType itemsTupleCount_;
-    SizeType minItems_;
-    SizeType maxItems_;
-    bool additionalItems_;
-    bool uniqueItems_;
-
-    RegexType* pattern_;
-    SizeType minLength_;
-    SizeType maxLength_;
-
-    SValue minimum_;
-    SValue maximum_;
-    SValue multipleOf_;
-    bool exclusiveMinimum_;
-    bool exclusiveMaximum_;
-};
-
-template<typename Stack, typename Ch>
-struct TokenHelper {
-    RAPIDJSON_FORCEINLINE static void AppendIndexToken(Stack& documentStack, SizeType index) {
-        *documentStack.template Push<Ch>() = '/';
-        char buffer[21];
-        size_t length = static_cast<size_t>((sizeof(SizeType) == 4 ? u32toa(index, buffer) : u64toa(index, buffer)) - buffer);
-        for (size_t i = 0; i < length; i++)
-            *documentStack.template Push<Ch>() = buffer[i];
-    }
-};
-
-// Partial specialized version for char to prevent buffer copying.
-template <typename Stack>
-struct TokenHelper<Stack, char> {
-    RAPIDJSON_FORCEINLINE static void AppendIndexToken(Stack& documentStack, SizeType index) {
-        #ifdef WIN32
-        #pragma warning(push)
-        #pragma warning(disable: 4127) // Conditional Expression is Constant
-        #endif // WIN32
-        if (sizeof(SizeType) == 4) {
-        #ifdef WIN32
-        #pragma warning(pop)
-        #endif // WIN32
-            char *buffer = documentStack.template Push<char>(1 + 10); // '/' + uint
-            *buffer++ = '/';
-            const char* end = internal::u32toa(index, buffer);
-             documentStack.template Pop<char>(static_cast<size_t>(10 - (end - buffer)));
-        }
-        else {
-            char *buffer = documentStack.template Push<char>(1 + 20); // '/' + uint64
-            *buffer++ = '/';
-            const char* end = internal::u64toa(index, buffer);
-            documentStack.template Pop<char>(static_cast<size_t>(20 - (end - buffer)));
-        }
-    }
-};
-
-} // namespace internal
-
-///////////////////////////////////////////////////////////////////////////////
-// IGenericRemoteSchemaDocumentProvider
-
-template <typename SchemaDocumentType>
-class IGenericRemoteSchemaDocumentProvider {
-public:
-    typedef typename SchemaDocumentType::Ch Ch;
-
-    virtual ~IGenericRemoteSchemaDocumentProvider() {}
-    virtual const SchemaDocumentType* GetRemoteDocument(const Ch* uri, SizeType length) = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericSchemaDocument
-
-//! JSON schema document.
-/*!
-    A JSON schema document is a compiled version of a JSON schema.
-    It is basically a tree of internal::Schema.
-
-    \note This is an immutable class (i.e. its instance cannot be modified after construction).
-    \tparam ValueT Type of JSON value (e.g. \c Value ), which also determine the encoding.
-    \tparam Allocator Allocator type for allocating memory of this document.
-*/
-template <typename ValueT, typename Allocator = CrtAllocator>
-class GenericSchemaDocument {
-public:
-    typedef ValueT ValueType;
-    typedef IGenericRemoteSchemaDocumentProvider<GenericSchemaDocument> IRemoteSchemaDocumentProviderType;
-    typedef Allocator AllocatorType;
-    typedef typename ValueType::EncodingType EncodingType;
-    typedef typename EncodingType::Ch Ch;
-    typedef internal::Schema<GenericSchemaDocument> SchemaType;
-    typedef GenericPointer<ValueType, Allocator> PointerType;
-    friend class internal::Schema<GenericSchemaDocument>;
-    template <typename, typename, typename>
-    friend class GenericSchemaValidator;
-
-    //! Constructor.
-    /*!
-        Compile a JSON document into schema document.
-
-        \param document A JSON document as source.
-        \param remoteProvider An optional remote schema document provider for resolving remote reference. Can be null.
-        \param allocator An optional allocator instance for allocating memory. Can be null.
-    */
-    explicit GenericSchemaDocument(const ValueType& document, IRemoteSchemaDocumentProviderType* remoteProvider = 0, Allocator* allocator = 0) :
-        remoteProvider_(remoteProvider),
-        allocator_(allocator),
-        ownAllocator_(),
-        root_(),
-        schemaMap_(allocator, kInitialSchemaMapSize),
-        schemaRef_(allocator, kInitialSchemaRefSize)
-    {
-        if (!allocator_)
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
-
-        // Generate root schema, it will call CreateSchema() to create sub-schemas,
-        // And call AddRefSchema() if there are $ref.
-        CreateSchemaRecursive(&root_, PointerType(), document, document);
-
-        // Resolve $ref
-        while (!schemaRef_.Empty()) {
-            SchemaRefEntry* refEntry = schemaRef_.template Pop<SchemaRefEntry>(1);
-            if (const SchemaType* s = GetSchema(refEntry->target)) {
-                if (refEntry->schema)
-                    *refEntry->schema = s;
-
-                // Create entry in map if not exist
-                if (!GetSchema(refEntry->source)) {
-                    new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(refEntry->source, const_cast<SchemaType*>(s), false, allocator_);
-                }
-            }
-            refEntry->~SchemaRefEntry();
-        }
-
-        RAPIDJSON_ASSERT(root_ != 0);
-
-        schemaRef_.ShrinkToFit(); // Deallocate all memory for ref
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move constructor in C++11
-    GenericSchemaDocument(GenericSchemaDocument&& rhs) RAPIDJSON_NOEXCEPT :
-        remoteProvider_(rhs.remoteProvider_),
-        allocator_(rhs.allocator_),
-        ownAllocator_(rhs.ownAllocator_),
-        root_(rhs.root_),
-        schemaMap_(std::move(rhs.schemaMap_)),
-        schemaRef_(std::move(rhs.schemaRef_))
-    {
-        rhs.remoteProvider_ = 0;
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-    }
-#endif
-
-    //! Destructor
-    ~GenericSchemaDocument() {
-        while (!schemaMap_.Empty())
-            schemaMap_.template Pop<SchemaEntry>(1)->~SchemaEntry();
-
-        RAPIDJSON_DELETE(ownAllocator_);
-    }
-
-    //! Get the root schema.
-    const SchemaType& GetRoot() const { return *root_; }
-
-private:
-    //! Prohibit copying
-    GenericSchemaDocument(const GenericSchemaDocument&);
-    //! Prohibit assignment
-    GenericSchemaDocument& operator=(const GenericSchemaDocument&);
-
-    struct SchemaRefEntry {
-        SchemaRefEntry(const PointerType& s, const PointerType& t, const SchemaType** outSchema, Allocator *allocator) : source(s, allocator), target(t, allocator), schema(outSchema) {}
-        PointerType source;
-        PointerType target;
-        const SchemaType** schema;
-    };
-
-    struct SchemaEntry {
-        SchemaEntry(const PointerType& p, SchemaType* s, bool o, Allocator* allocator) : pointer(p, allocator), schema(s), owned(o) {}
-        ~SchemaEntry() {
-            if (owned) {
-                schema->~SchemaType();
-                Allocator::Free(schema);
-            }
-        }
-        PointerType pointer;
-        SchemaType* schema;
-        bool owned;
-    };
-
-    void CreateSchemaRecursive(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
-        if (schema)
-            *schema = SchemaType::GetTypeless();
-
-        if (v.GetType() == kObjectType) {
-            const SchemaType* s = GetSchema(pointer);
-            if (!s)
-                CreateSchema(schema, pointer, v, document);
-
-            for (typename ValueType::ConstMemberIterator itr = v.MemberBegin(); itr != v.MemberEnd(); ++itr)
-                CreateSchemaRecursive(0, pointer.Append(itr->name, allocator_), itr->value, document);
-        }
-        else if (v.GetType() == kArrayType)
-            for (SizeType i = 0; i < v.Size(); i++)
-                CreateSchemaRecursive(0, pointer.Append(i, allocator_), v[i], document);
-    }
-
-    void CreateSchema(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
-        RAPIDJSON_ASSERT(pointer.IsValid());
-        if (v.IsObject()) {
-            if (!HandleRefSchema(pointer, schema, v, document)) {
-                SchemaType* s = new (allocator_->Malloc(sizeof(SchemaType))) SchemaType(this, pointer, v, document, allocator_);
-                new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(pointer, s, true, allocator_);
-                if (schema)
-                    *schema = s;
-            }
-        }
-    }
-
-    bool HandleRefSchema(const PointerType& source, const SchemaType** schema, const ValueType& v, const ValueType& document) {
-        static const Ch kRefString[] = { '$', 'r', 'e', 'f', '\0' };
-        static const ValueType kRefValue(kRefString, 4);
-
-        typename ValueType::ConstMemberIterator itr = v.FindMember(kRefValue);
-        if (itr == v.MemberEnd())
-            return false;
-
-        if (itr->value.IsString()) {
-            SizeType len = itr->value.GetStringLength();
-            if (len > 0) {
-                const Ch* s = itr->value.GetString();
-                SizeType i = 0;
-                while (i < len && s[i] != '#') // Find the first #
-                    i++;
-
-                if (i > 0) { // Remote reference, resolve immediately
-                    if (remoteProvider_) {
-                        if (const GenericSchemaDocument* remoteDocument = remoteProvider_->GetRemoteDocument(s, i - 1)) {
-                            PointerType pointer(&s[i], len - i, allocator_);
-                            if (pointer.IsValid()) {
-                                if (const SchemaType* sc = remoteDocument->GetSchema(pointer)) {
-                                    if (schema)
-                                        *schema = sc;
-                                    return true;
-                                }
-                            }
-                        }
-                    }
-                }
-                else if (s[i] == '#') { // Local reference, defer resolution
-                    PointerType pointer(&s[i], len - i, allocator_);
-                    if (pointer.IsValid()) {
-                        if (const ValueType* nv = pointer.Get(document))
-                            if (HandleRefSchema(source, schema, *nv, document))
-                                return true;
-
-                        new (schemaRef_.template Push<SchemaRefEntry>()) SchemaRefEntry(source, pointer, schema, allocator_);
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    const SchemaType* GetSchema(const PointerType& pointer) const {
-        for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
-            if (pointer == target->pointer)
-                return target->schema;
-        return 0;
-    }
-
-    PointerType GetPointer(const SchemaType* schema) const {
-        for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
-            if (schema == target->schema)
-                return target->pointer;
-        return PointerType();
-    }
-
-    static const size_t kInitialSchemaMapSize = 64;
-    static const size_t kInitialSchemaRefSize = 64;
-
-    IRemoteSchemaDocumentProviderType* remoteProvider_;
-    Allocator *allocator_;
-    Allocator *ownAllocator_;
-    const SchemaType* root_;                //!< Root schema.
-    internal::Stack<Allocator> schemaMap_;  // Stores created Pointer -> Schemas
-    internal::Stack<Allocator> schemaRef_;  // Stores Pointer from $ref and schema which holds the $ref
-};
-
-//! GenericSchemaDocument using Value type.
-typedef GenericSchemaDocument<Value> SchemaDocument;
-//! IGenericRemoteSchemaDocumentProvider using SchemaDocument.
-typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericSchemaValidator
-
-//! JSON Schema Validator.
-/*!
-    A SAX style JSON schema validator.
-    It uses a \c GenericSchemaDocument to validate SAX events.
-    It delegates the incoming SAX events to an output handler.
-    The default output handler does nothing.
-    It can be reused multiple times by calling \c Reset().
-
-    \tparam SchemaDocumentType Type of schema document.
-    \tparam OutputHandler Type of output handler. Default handler does nothing.
-    \tparam StateAllocator Allocator for storing the internal validation states.
-*/
-template <
-    typename SchemaDocumentType,
-    typename OutputHandler = BaseReaderHandler<typename SchemaDocumentType::SchemaType::EncodingType>,
-    typename StateAllocator = CrtAllocator>
-class GenericSchemaValidator :
-    public internal::ISchemaStateFactory<typename SchemaDocumentType::SchemaType>, 
-    public internal::ISchemaValidator
-{
-public:
-    typedef typename SchemaDocumentType::SchemaType SchemaType;
-    typedef typename SchemaDocumentType::PointerType PointerType;
-    typedef typename SchemaType::EncodingType EncodingType;
-    typedef typename EncodingType::Ch Ch;
-
-    //! Constructor without output handler.
-    /*!
-        \param schemaDocument The schema document to conform to.
-        \param allocator Optional allocator for storing internal validation states.
-        \param schemaStackCapacity Optional initial capacity of schema path stack.
-        \param documentStackCapacity Optional initial capacity of document path stack.
-    */
-    GenericSchemaValidator(
-        const SchemaDocumentType& schemaDocument,
-        StateAllocator* allocator = 0, 
-        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
-        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
-        :
-        schemaDocument_(&schemaDocument),
-        root_(schemaDocument.GetRoot()),
-        outputHandler_(GetNullHandler()),
-        stateAllocator_(allocator),
-        ownStateAllocator_(0),
-        schemaStack_(allocator, schemaStackCapacity),
-        documentStack_(allocator, documentStackCapacity),
-        valid_(true)
-#if RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(0)
-#endif
-    {
-    }
-
-    //! Constructor with output handler.
-    /*!
-        \param schemaDocument The schema document to conform to.
-        \param allocator Optional allocator for storing internal validation states.
-        \param schemaStackCapacity Optional initial capacity of schema path stack.
-        \param documentStackCapacity Optional initial capacity of document path stack.
-    */
-    GenericSchemaValidator(
-        const SchemaDocumentType& schemaDocument,
-        OutputHandler& outputHandler,
-        StateAllocator* allocator = 0, 
-        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
-        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
-        :
-        schemaDocument_(&schemaDocument),
-        root_(schemaDocument.GetRoot()),
-        outputHandler_(outputHandler),
-        stateAllocator_(allocator),
-        ownStateAllocator_(0),
-        schemaStack_(allocator, schemaStackCapacity),
-        documentStack_(allocator, documentStackCapacity),
-        valid_(true)
-#if RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(0)
-#endif
-    {
-    }
-
-    //! Destructor.
-    ~GenericSchemaValidator() {
-        Reset();
-        RAPIDJSON_DELETE(ownStateAllocator_);
-    }
-
-    //! Reset the internal states.
-    void Reset() {
-        while (!schemaStack_.Empty())
-            PopSchema();
-        documentStack_.Clear();
-        valid_ = true;
-    }
-
-    //! Checks whether the current state is valid.
-    // Implementation of ISchemaValidator
-    virtual bool IsValid() const { return valid_; }
-
-    //! Gets the JSON pointer pointed to the invalid schema.
-    PointerType GetInvalidSchemaPointer() const {
-        return schemaStack_.Empty() ? PointerType() : schemaDocument_->GetPointer(&CurrentSchema());
-    }
-
-    //! Gets the keyword of invalid schema.
-    const Ch* GetInvalidSchemaKeyword() const {
-        return schemaStack_.Empty() ? 0 : CurrentContext().invalidKeyword;
-    }
-
-    //! Gets the JSON pointer pointed to the invalid value.
-    PointerType GetInvalidDocumentPointer() const {
-        return documentStack_.Empty() ? PointerType() : PointerType(documentStack_.template Bottom<Ch>(), documentStack_.GetSize() / sizeof(Ch));
-    }
-
-#if RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_() \
-RAPIDJSON_MULTILINEMACRO_BEGIN\
-    *documentStack_.template Push<Ch>() = '\0';\
-    documentStack_.template Pop<Ch>(1);\
-    internal::PrintInvalidDocument(documentStack_.template Bottom<Ch>());\
-RAPIDJSON_MULTILINEMACRO_END
-#else
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_()
-#endif
-
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_(method, arg1)\
-    if (!valid_) return false; \
-    if (!BeginValue() || !CurrentSchema().method arg1) {\
-        RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_();\
-        return valid_ = false;\
-    }
-
-#define RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2)\
-    for (Context* context = schemaStack_.template Bottom<Context>(); context != schemaStack_.template End<Context>(); context++) {\
-        if (context->hasher)\
-            static_cast<HasherType*>(context->hasher)->method arg2;\
-        if (context->validators)\
-            for (SizeType i_ = 0; i_ < context->validatorCount; i_++)\
-                static_cast<GenericSchemaValidator*>(context->validators[i_])->method arg2;\
-        if (context->patternPropertiesValidators)\
-            for (SizeType i_ = 0; i_ < context->patternPropertiesValidatorCount; i_++)\
-                static_cast<GenericSchemaValidator*>(context->patternPropertiesValidators[i_])->method arg2;\
-    }
-
-#define RAPIDJSON_SCHEMA_HANDLE_END_(method, arg2)\
-    return valid_ = EndValue() && outputHandler_.method arg2
-
-#define RAPIDJSON_SCHEMA_HANDLE_VALUE_(method, arg1, arg2) \
-    RAPIDJSON_SCHEMA_HANDLE_BEGIN_   (method, arg1);\
-    RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2);\
-    RAPIDJSON_SCHEMA_HANDLE_END_     (method, arg2)
-
-    bool Null()             { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Null,   (CurrentContext()   ), ( )); }
-    bool Bool(bool b)       { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Bool,   (CurrentContext(), b), (b)); }
-    bool Int(int i)         { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Int,    (CurrentContext(), i), (i)); }
-    bool Uint(unsigned u)   { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Uint,   (CurrentContext(), u), (u)); }
-    bool Int64(int64_t i)   { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Int64,  (CurrentContext(), i), (i)); }
-    bool Uint64(uint64_t u) { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Uint64, (CurrentContext(), u), (u)); }
-    bool Double(double d)   { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Double, (CurrentContext(), d), (d)); }
-    bool RawNumber(const Ch* str, SizeType length, bool copy)
-                                    { RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
-    bool String(const Ch* str, SizeType length, bool copy)
-                                    { RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
-
-    bool StartObject() {
-        RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartObject, (CurrentContext()));
-        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartObject, ());
-        return valid_ = outputHandler_.StartObject();
-    }
-    
-    bool Key(const Ch* str, SizeType len, bool copy) {
-        if (!valid_) return false;
-        AppendToken(str, len);
-        if (!CurrentSchema().Key(CurrentContext(), str, len, copy)) return valid_ = false;
-        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(Key, (str, len, copy));
-        return valid_ = outputHandler_.Key(str, len, copy);
-    }
-    
-    bool EndObject(SizeType memberCount) { 
-        if (!valid_) return false;
-        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndObject, (memberCount));
-        if (!CurrentSchema().EndObject(CurrentContext(), memberCount)) return valid_ = false;
-        RAPIDJSON_SCHEMA_HANDLE_END_(EndObject, (memberCount));
-    }
-
-    bool StartArray() {
-        RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartArray, (CurrentContext()));
-        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartArray, ());
-        return valid_ = outputHandler_.StartArray();
-    }
-    
-    bool EndArray(SizeType elementCount) {
-        if (!valid_) return false;
-        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndArray, (elementCount));
-        if (!CurrentSchema().EndArray(CurrentContext(), elementCount)) return valid_ = false;
-        RAPIDJSON_SCHEMA_HANDLE_END_(EndArray, (elementCount));
-    }
-
-#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_
-#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_
-#undef RAPIDJSON_SCHEMA_HANDLE_PARALLEL_
-#undef RAPIDJSON_SCHEMA_HANDLE_VALUE_
-
-    // Implementation of ISchemaStateFactory<SchemaType>
-    virtual ISchemaValidator* CreateSchemaValidator(const SchemaType& root) {
-        return new (GetStateAllocator().Malloc(sizeof(GenericSchemaValidator))) GenericSchemaValidator(*schemaDocument_, root,
-#if RAPIDJSON_SCHEMA_VERBOSE
-        depth_ + 1,
-#endif
-        &GetStateAllocator());
-    }
-
-    virtual void DestroySchemaValidator(ISchemaValidator* validator) {
-        GenericSchemaValidator* v = static_cast<GenericSchemaValidator*>(validator);
-        v->~GenericSchemaValidator();
-        StateAllocator::Free(v);
-    }
-
-    virtual void* CreateHasher() {
-        return new (GetStateAllocator().Malloc(sizeof(HasherType))) HasherType(&GetStateAllocator());
-    }
-
-    virtual uint64_t GetHashCode(void* hasher) {
-        return static_cast<HasherType*>(hasher)->GetHashCode();
-    }
-
-    virtual void DestroryHasher(void* hasher) {
-        HasherType* h = static_cast<HasherType*>(hasher);
-        h->~HasherType();
-        StateAllocator::Free(h);
-    }
-
-    virtual void* MallocState(size_t size) {
-        return GetStateAllocator().Malloc(size);
-    }
-
-    virtual void FreeState(void* p) {
-        return StateAllocator::Free(p);
-    }
-
-private:
-    typedef typename SchemaType::Context Context;
-    typedef GenericValue<UTF8<>, StateAllocator> HashCodeArray;
-    typedef internal::Hasher<EncodingType, StateAllocator> HasherType;
-
-    GenericSchemaValidator( 
-        const SchemaDocumentType& schemaDocument,
-        const SchemaType& root,
-#if RAPIDJSON_SCHEMA_VERBOSE
-        unsigned depth,
-#endif
-        StateAllocator* allocator = 0,
-        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
-        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
-        :
-        schemaDocument_(&schemaDocument),
-        root_(root),
-        outputHandler_(GetNullHandler()),
-        stateAllocator_(allocator),
-        ownStateAllocator_(0),
-        schemaStack_(allocator, schemaStackCapacity),
-        documentStack_(allocator, documentStackCapacity),
-        valid_(true)
-#if RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(depth)
-#endif
-    {
-    }
-
-    StateAllocator& GetStateAllocator() {
-        if (!stateAllocator_)
-            stateAllocator_ = ownStateAllocator_ = RAPIDJSON_NEW(StateAllocator());
-        return *stateAllocator_;
-    }
-
-    bool BeginValue() {
-        if (schemaStack_.Empty())
-            PushSchema(root_);
-        else {
-            if (CurrentContext().inArray)
-                internal::TokenHelper<internal::Stack<StateAllocator>, Ch>::AppendIndexToken(documentStack_, CurrentContext().arrayElementIndex);
-
-            if (!CurrentSchema().BeginValue(CurrentContext()))
-                return false;
-
-            SizeType count = CurrentContext().patternPropertiesSchemaCount;
-            const SchemaType** sa = CurrentContext().patternPropertiesSchemas;
-            typename Context::PatternValidatorType patternValidatorType = CurrentContext().valuePatternValidatorType;
-            bool valueUniqueness = CurrentContext().valueUniqueness;
-            if (CurrentContext().valueSchema)
-                PushSchema(*CurrentContext().valueSchema);
-
-            if (count > 0) {
-                CurrentContext().objectPatternValidatorType = patternValidatorType;
-                ISchemaValidator**& va = CurrentContext().patternPropertiesValidators;
-                SizeType& validatorCount = CurrentContext().patternPropertiesValidatorCount;
-                va = static_cast<ISchemaValidator**>(MallocState(sizeof(ISchemaValidator*) * count));
-                for (SizeType i = 0; i < count; i++)
-                    va[validatorCount++] = CreateSchemaValidator(*sa[i]);
-            }
-
-            CurrentContext().arrayUniqueness = valueUniqueness;
-        }
-        return true;
-    }
-
-    bool EndValue() {
-        if (!CurrentSchema().EndValue(CurrentContext()))
-            return false;
-
-#if RAPIDJSON_SCHEMA_VERBOSE
-        GenericStringBuffer<EncodingType> sb;
-        schemaDocument_->GetPointer(&CurrentSchema()).Stringify(sb);
-
-        *documentStack_.template Push<Ch>() = '\0';
-        documentStack_.template Pop<Ch>(1);
-        internal::PrintValidatorPointers(depth_, sb.GetString(), documentStack_.template Bottom<Ch>());
-#endif
-
-        uint64_t h = CurrentContext().arrayUniqueness ? static_cast<HasherType*>(CurrentContext().hasher)->GetHashCode() : 0;
-        
-        PopSchema();
-
-        if (!schemaStack_.Empty()) {
-            Context& context = CurrentContext();
-            if (context.valueUniqueness) {
-                HashCodeArray* a = static_cast<HashCodeArray*>(context.arrayElementHashCodes);
-                if (!a)
-                    CurrentContext().arrayElementHashCodes = a = new (GetStateAllocator().Malloc(sizeof(HashCodeArray))) HashCodeArray(kArrayType);
-                for (typename HashCodeArray::ConstValueIterator itr = a->Begin(); itr != a->End(); ++itr)
-                    if (itr->GetUint64() == h)
-                        RAPIDJSON_INVALID_KEYWORD_RETURN(SchemaType::GetUniqueItemsString());
-                a->PushBack(h, GetStateAllocator());
-            }
-        }
-
-        // Remove the last token of document pointer
-        while (!documentStack_.Empty() && *documentStack_.template Pop<Ch>(1) != '/')
-            ;
-
-        return true;
-    }
-
-    void AppendToken(const Ch* str, SizeType len) {
-        documentStack_.template Reserve<Ch>(1 + len * 2); // worst case all characters are escaped as two characters
-        *documentStack_.template PushUnsafe<Ch>() = '/';
-        for (SizeType i = 0; i < len; i++) {
-            if (str[i] == '~') {
-                *documentStack_.template PushUnsafe<Ch>() = '~';
-                *documentStack_.template PushUnsafe<Ch>() = '0';
-            }
-            else if (str[i] == '/') {
-                *documentStack_.template PushUnsafe<Ch>() = '~';
-                *documentStack_.template PushUnsafe<Ch>() = '1';
-            }
-            else
-                *documentStack_.template PushUnsafe<Ch>() = str[i];
-        }
-    }
-
-    RAPIDJSON_FORCEINLINE void PushSchema(const SchemaType& schema) { new (schemaStack_.template Push<Context>()) Context(*this, &schema); }
-    
-    RAPIDJSON_FORCEINLINE void PopSchema() {
-        Context* c = schemaStack_.template Pop<Context>(1);
-        if (HashCodeArray* a = static_cast<HashCodeArray*>(c->arrayElementHashCodes)) {
-            a->~HashCodeArray();
-            StateAllocator::Free(a);
-        }
-        c->~Context();
-    }
-
-    const SchemaType& CurrentSchema() const { return *schemaStack_.template Top<Context>()->schema; }
-    Context& CurrentContext() { return *schemaStack_.template Top<Context>(); }
-    const Context& CurrentContext() const { return *schemaStack_.template Top<Context>(); }
-
-    static OutputHandler& GetNullHandler() {
-        static OutputHandler nullHandler;
-        return nullHandler;
-    }
-
-    static const size_t kDefaultSchemaStackCapacity = 1024;
-    static const size_t kDefaultDocumentStackCapacity = 256;
-    const SchemaDocumentType* schemaDocument_;
-    const SchemaType& root_;
-    OutputHandler& outputHandler_;
-    StateAllocator* stateAllocator_;
-    StateAllocator* ownStateAllocator_;
-    internal::Stack<StateAllocator> schemaStack_;    //!< stack to store the current path of schema (BaseSchemaType *)
-    internal::Stack<StateAllocator> documentStack_;  //!< stack to store the current path of validating document (Ch)
-    bool valid_;
-#if RAPIDJSON_SCHEMA_VERBOSE
-    unsigned depth_;
-#endif
-};
-
-typedef GenericSchemaValidator<SchemaDocument> SchemaValidator;
-
-///////////////////////////////////////////////////////////////////////////////
-// SchemaValidatingReader
-
-//! A helper class for parsing with validation.
-/*!
-    This helper class is a functor, designed as a parameter of \ref GenericDocument::Populate().
-
-    \tparam parseFlags Combination of \ref ParseFlag.
-    \tparam InputStream Type of input stream, implementing Stream concept.
-    \tparam SourceEncoding Encoding of the input stream.
-    \tparam SchemaDocumentType Type of schema document.
-    \tparam StackAllocator Allocator type for stack.
-*/
-template <
-    unsigned parseFlags,
-    typename InputStream,
-    typename SourceEncoding,
-    typename SchemaDocumentType = SchemaDocument,
-    typename StackAllocator = CrtAllocator>
-class SchemaValidatingReader {
-public:
-    typedef typename SchemaDocumentType::PointerType PointerType;
-    typedef typename InputStream::Ch Ch;
-
-    //! Constructor
-    /*!
-        \param is Input stream.
-        \param sd Schema document.
-    */
-    SchemaValidatingReader(InputStream& is, const SchemaDocumentType& sd) : is_(is), sd_(sd), invalidSchemaKeyword_(), isValid_(true) {}
-
-    template <typename Handler>
-    bool operator()(Handler& handler) {
-        GenericReader<SourceEncoding, typename SchemaDocumentType::EncodingType, StackAllocator> reader;
-        GenericSchemaValidator<SchemaDocumentType, Handler> validator(sd_, handler);
-        parseResult_ = reader.template Parse<parseFlags>(is_, validator);
-
-        isValid_ = validator.IsValid();
-        if (isValid_) {
-            invalidSchemaPointer_ = PointerType();
-            invalidSchemaKeyword_ = 0;
-            invalidDocumentPointer_ = PointerType();
-        }
-        else {
-            invalidSchemaPointer_ = validator.GetInvalidSchemaPointer();
-            invalidSchemaKeyword_ = validator.GetInvalidSchemaKeyword();
-            invalidDocumentPointer_ = validator.GetInvalidDocumentPointer();
-        }
-
-        return parseResult_;
-    }
-
-    const ParseResult& GetParseResult() const { return parseResult_; }
-    bool IsValid() const { return isValid_; }
-    const PointerType& GetInvalidSchemaPointer() const { return invalidSchemaPointer_; }
-    const Ch* GetInvalidSchemaKeyword() const { return invalidSchemaKeyword_; }
-    const PointerType& GetInvalidDocumentPointer() const { return invalidDocumentPointer_; }
-
-private:
-    InputStream& is_;
-    const SchemaDocumentType& sd_;
-
-    ParseResult parseResult_;
-    PointerType invalidSchemaPointer_;
-    const Ch* invalidSchemaKeyword_;
-    PointerType invalidDocumentPointer_;
-    bool isValid_;
-};
-
-RAPIDJSON_NAMESPACE_END
-RAPIDJSON_DIAG_POP
-
-#endif // RAPIDJSON_SCHEMA_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/stream.h b/sql-odbc/libraries/rapidjson/include/rapidjson/stream.h
deleted file mode 100644
index fef82c252f..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/stream.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "rapidjson.h"
-
-#ifndef RAPIDJSON_STREAM_H_
-#define RAPIDJSON_STREAM_H_
-
-#include "encodings.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-//  Stream
-
-/*! \class rapidjson::Stream
-    \brief Concept for reading and writing characters.
-
-    For read-only stream, no need to implement PutBegin(), Put(), Flush() and PutEnd().
-
-    For write-only stream, only need to implement Put() and Flush().
-
-\code
-concept Stream {
-    typename Ch;    //!< Character type of the stream.
-
-    //! Read the current character from stream without moving the read cursor.
-    Ch Peek() const;
-
-    //! Read the current character from stream and moving the read cursor to next character.
-    Ch Take();
-
-    //! Get the current read cursor.
-    //! \return Number of characters read from start.
-    size_t Tell();
-
-    //! Begin writing operation at the current read pointer.
-    //! \return The begin writer pointer.
-    Ch* PutBegin();
-
-    //! Write a character.
-    void Put(Ch c);
-
-    //! Flush the buffer.
-    void Flush();
-
-    //! End the writing operation.
-    //! \param begin The begin write pointer returned by PutBegin().
-    //! \return Number of characters written.
-    size_t PutEnd(Ch* begin);
-}
-\endcode
-*/
-
-//! Provides additional information for stream.
-/*!
-    By using traits pattern, this type provides a default configuration for stream.
-    For custom stream, this type can be specialized for other configuration.
-    See TEST(Reader, CustomStringStream) in readertest.cpp for example.
-*/
-template<typename Stream>
-struct StreamTraits {
-    //! Whether to make local copy of stream for optimization during parsing.
-    /*!
-        By default, for safety, streams do not use local copy optimization.
-        Stream that can be copied fast should specialize this, like StreamTraits<StringStream>.
-    */
-    enum { copyOptimization = 0 };
-};
-
-//! Reserve n characters for writing to a stream.
-template<typename Stream>
-inline void PutReserve(Stream& stream, size_t count) {
-    (void)stream;
-    (void)count;
-}
-
-//! Write character to a stream, presuming buffer is reserved.
-template<typename Stream>
-inline void PutUnsafe(Stream& stream, typename Stream::Ch c) {
-    stream.Put(c);
-}
-
-//! Put N copies of a character to a stream.
-template<typename Stream, typename Ch>
-inline void PutN(Stream& stream, Ch c, size_t n) {
-    PutReserve(stream, n);
-    for (size_t i = 0; i < n; i++)
-        PutUnsafe(stream, c);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// StringStream
-
-//! Read-only string stream.
-/*! \note implements Stream concept
-*/
-template <typename Encoding>
-struct GenericStringStream {
-    typedef typename Encoding::Ch Ch;
-
-    GenericStringStream(const Ch *src) : src_(src), head_(src) {}
-
-    Ch Peek() const { return *src_; }
-    Ch Take() { return *src_++; }
-    size_t Tell() const { return static_cast<size_t>(src_ - head_); }
-
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-    const Ch* src_;     //!< Current read position.
-    const Ch* head_;    //!< Original head of the string.
-};
-
-template <typename Encoding>
-struct StreamTraits<GenericStringStream<Encoding> > {
-    enum { copyOptimization = 1 };
-};
-
-//! String stream with UTF8 encoding.
-typedef GenericStringStream<UTF8<> > StringStream;
-
-///////////////////////////////////////////////////////////////////////////////
-// InsituStringStream
-
-//! A read-write string stream.
-/*! This string stream is particularly designed for in-situ parsing.
-    \note implements Stream concept
-*/
-template <typename Encoding>
-struct GenericInsituStringStream {
-    typedef typename Encoding::Ch Ch;
-
-    GenericInsituStringStream(Ch *src) : src_(src), dst_(0), head_(src) {}
-
-    // Read
-    Ch Peek() { return *src_; }
-    Ch Take() { return *src_++; }
-    size_t Tell() { return static_cast<size_t>(src_ - head_); }
-
-    // Write
-    void Put(Ch c) { RAPIDJSON_ASSERT(dst_ != 0); *dst_++ = c; }
-
-    Ch* PutBegin() { return dst_ = src_; }
-    size_t PutEnd(Ch* begin) { return static_cast<size_t>(dst_ - begin); }
-    void Flush() {}
-
-    Ch* Push(size_t count) { Ch* begin = dst_; dst_ += count; return begin; }
-    void Pop(size_t count) { dst_ -= count; }
-
-    Ch* src_;
-    Ch* dst_;
-    Ch* head_;
-};
-
-template <typename Encoding>
-struct StreamTraits<GenericInsituStringStream<Encoding> > {
-    enum { copyOptimization = 1 };
-};
-
-//! Insitu string stream with UTF8 encoding.
-typedef GenericInsituStringStream<UTF8<> > InsituStringStream;
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_STREAM_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/stringbuffer.h b/sql-odbc/libraries/rapidjson/include/rapidjson/stringbuffer.h
deleted file mode 100644
index 78f34d2098..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/stringbuffer.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_STRINGBUFFER_H_
-#define RAPIDJSON_STRINGBUFFER_H_
-
-#include "stream.h"
-#include "internal/stack.h"
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-#include <utility> // std::move
-#endif
-
-#include "internal/stack.h"
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Represents an in-memory output stream.
-/*!
-    \tparam Encoding Encoding of the stream.
-    \tparam Allocator type for allocating memory buffer.
-    \note implements Stream concept
-*/
-template <typename Encoding, typename Allocator = CrtAllocator>
-class GenericStringBuffer {
-public:
-    typedef typename Encoding::Ch Ch;
-
-    GenericStringBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericStringBuffer(GenericStringBuffer&& rhs) : stack_(std::move(rhs.stack_)) {}
-    GenericStringBuffer& operator=(GenericStringBuffer&& rhs) {
-        if (&rhs != this)
-            stack_ = std::move(rhs.stack_);
-        return *this;
-    }
-#endif
-
-    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
-    void PutUnsafe(Ch c) { *stack_.template PushUnsafe<Ch>() = c; }
-    void Flush() {}
-
-    void Clear() { stack_.Clear(); }
-    void ShrinkToFit() {
-        // Push and pop a null terminator. This is safe.
-        *stack_.template Push<Ch>() = '\0';
-        stack_.ShrinkToFit();
-        stack_.template Pop<Ch>(1);
-    }
-
-    void Reserve(size_t count) { stack_.template Reserve<Ch>(count); }
-    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
-    Ch* PushUnsafe(size_t count) { return stack_.template PushUnsafe<Ch>(count); }
-    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
-
-    const Ch* GetString() const {
-        // Push and pop a null terminator. This is safe.
-        *stack_.template Push<Ch>() = '\0';
-        stack_.template Pop<Ch>(1);
-
-        return stack_.template Bottom<Ch>();
-    }
-
-    size_t GetSize() const { return stack_.GetSize(); }
-
-    static const size_t kDefaultCapacity = 256;
-    mutable internal::Stack<Allocator> stack_;
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    GenericStringBuffer(const GenericStringBuffer&);
-    GenericStringBuffer& operator=(const GenericStringBuffer&);
-};
-
-//! String buffer with UTF8 encoding
-typedef GenericStringBuffer<UTF8<> > StringBuffer;
-
-template<typename Encoding, typename Allocator>
-inline void PutReserve(GenericStringBuffer<Encoding, Allocator>& stream, size_t count) {
-    stream.Reserve(count);
-}
-
-template<typename Encoding, typename Allocator>
-inline void PutUnsafe(GenericStringBuffer<Encoding, Allocator>& stream, typename Encoding::Ch c) {
-    stream.PutUnsafe(c);
-}
-
-//! Implement specialized version of PutN() with memset() for better performance.
-template<>
-inline void PutN(GenericStringBuffer<UTF8<> >& stream, char c, size_t n) {
-    std::memset(stream.stack_.Push<char>(n), c, n * sizeof(c));
-}
-
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_STRINGBUFFER_H_
diff --git a/sql-odbc/libraries/rapidjson/include/rapidjson/writer.h b/sql-odbc/libraries/rapidjson/include/rapidjson/writer.h
deleted file mode 100644
index 94f22dd5fc..0000000000
--- a/sql-odbc/libraries/rapidjson/include/rapidjson/writer.h
+++ /dev/null
@@ -1,610 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_WRITER_H_
-#define RAPIDJSON_WRITER_H_
-
-#include "stream.h"
-#include "internal/stack.h"
-#include "internal/strfunc.h"
-#include "internal/dtoa.h"
-#include "internal/itoa.h"
-#include "stringbuffer.h"
-#include <new>      // placement new
-
-#if defined(RAPIDJSON_SIMD) && defined(_MSC_VER)
-#include <intrin.h>
-#pragma intrinsic(_BitScanForward)
-#endif
-#ifdef RAPIDJSON_SSE42
-#include <nmmintrin.h>
-#elif defined(RAPIDJSON_SSE2)
-#include <emmintrin.h>
-#endif
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-RAPIDJSON_DIAG_OFF(unreachable-code)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// WriteFlag
-
-/*! \def RAPIDJSON_WRITE_DEFAULT_FLAGS 
-    \ingroup RAPIDJSON_CONFIG
-    \brief User-defined kWriteDefaultFlags definition.
-
-    User can define this as any \c WriteFlag combinations.
-*/
-#ifndef RAPIDJSON_WRITE_DEFAULT_FLAGS
-#define RAPIDJSON_WRITE_DEFAULT_FLAGS kWriteNoFlags
-#endif
-
-//! Combination of writeFlags
-enum WriteFlag {
-    kWriteNoFlags = 0,              //!< No flags are set.
-    kWriteValidateEncodingFlag = 1, //!< Validate encoding of JSON strings.
-    kWriteNanAndInfFlag = 2,        //!< Allow writing of Infinity, -Infinity and NaN.
-    kWriteDefaultFlags = RAPIDJSON_WRITE_DEFAULT_FLAGS  //!< Default write flags. Can be customized by defining RAPIDJSON_WRITE_DEFAULT_FLAGS
-};
-
-//! JSON writer
-/*! Writer implements the concept Handler.
-    It generates JSON text by events to an output os.
-
-    User may programmatically calls the functions of a writer to generate JSON text.
-
-    On the other side, a writer can also be passed to objects that generates events, 
-
-    for example Reader::Parse() and Document::Accept().
-
-    \tparam OutputStream Type of output stream.
-    \tparam SourceEncoding Encoding of source string.
-    \tparam TargetEncoding Encoding of output stream.
-    \tparam StackAllocator Type of allocator for allocating memory of stack.
-    \note implements Handler concept
-*/
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
-class Writer {
-public:
-    typedef typename SourceEncoding::Ch Ch;
-
-    static const int kDefaultMaxDecimalPlaces = 324;
-
-    //! Constructor
-    /*! \param os Output stream.
-        \param stackAllocator User supplied allocator. If it is null, it will create a private one.
-        \param levelDepth Initial capacity of stack.
-    */
-    explicit
-    Writer(OutputStream& os, StackAllocator* stackAllocator = 0, size_t levelDepth = kDefaultLevelDepth) : 
-        os_(&os), level_stack_(stackAllocator, levelDepth * sizeof(Level)), maxDecimalPlaces_(kDefaultMaxDecimalPlaces), hasRoot_(false) {}
-
-    explicit
-    Writer(StackAllocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth) :
-        os_(0), level_stack_(allocator, levelDepth * sizeof(Level)), maxDecimalPlaces_(kDefaultMaxDecimalPlaces), hasRoot_(false) {}
-
-    //! Reset the writer with a new stream.
-    /*!
-        This function reset the writer with a new stream and default settings,
-        in order to make a Writer object reusable for output multiple JSONs.
-
-        \param os New output stream.
-        \code
-        Writer<OutputStream> writer(os1);
-        writer.StartObject();
-        // ...
-        writer.EndObject();
-
-        writer.Reset(os2);
-        writer.StartObject();
-        // ...
-        writer.EndObject();
-        \endcode
-    */
-    void Reset(OutputStream& os) {
-        os_ = &os;
-        hasRoot_ = false;
-        level_stack_.Clear();
-    }
-
-    //! Checks whether the output is a complete JSON.
-    /*!
-        A complete JSON has a complete root object or array.
-    */
-    bool IsComplete() const {
-        return hasRoot_ && level_stack_.Empty();
-    }
-
-    int GetMaxDecimalPlaces() const {
-        return maxDecimalPlaces_;
-    }
-
-    //! Sets the maximum number of decimal places for double output.
-    /*!
-        This setting truncates the output with specified number of decimal places.
-
-        For example, 
-
-        \code
-        writer.SetMaxDecimalPlaces(3);
-        writer.StartArray();
-        writer.Double(0.12345);                 // "0.123"
-        writer.Double(0.0001);                  // "0.0"
-        writer.Double(1.234567890123456e30);    // "1.234567890123456e30" (do not truncate significand for positive exponent)
-        writer.Double(1.23e-4);                 // "0.0"                  (do truncate significand for negative exponent)
-        writer.EndArray();
-        \endcode
-
-        The default setting does not truncate any decimal places. You can restore to this setting by calling
-        \code
-        writer.SetMaxDecimalPlaces(Writer::kDefaultMaxDecimalPlaces);
-        \endcode
-    */
-    void SetMaxDecimalPlaces(int maxDecimalPlaces) {
-        maxDecimalPlaces_ = maxDecimalPlaces;
-    }
-
-    /*!@name Implementation of Handler
-        \see Handler
-    */
-    //@{
-
-    bool Null()                 { Prefix(kNullType);   return EndValue(WriteNull()); }
-    bool Bool(bool b)           { Prefix(b ? kTrueType : kFalseType); return EndValue(WriteBool(b)); }
-    bool Int(int i)             { Prefix(kNumberType); return EndValue(WriteInt(i)); }
-    bool Uint(unsigned u)       { Prefix(kNumberType); return EndValue(WriteUint(u)); }
-    bool Int64(int64_t i64)     { Prefix(kNumberType); return EndValue(WriteInt64(i64)); }
-    bool Uint64(uint64_t u64)   { Prefix(kNumberType); return EndValue(WriteUint64(u64)); }
-
-    //! Writes the given \c double value to the stream
-    /*!
-        \param d The value to be written.
-        \return Whether it is succeed.
-    */
-    bool Double(double d)       { Prefix(kNumberType); return EndValue(WriteDouble(d)); }
-
-    bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
-        (void)copy;
-        Prefix(kNumberType);
-        return EndValue(WriteString(str, length));
-    }
-
-    bool String(const Ch* str, SizeType length, bool copy = false) {
-        (void)copy;
-        Prefix(kStringType);
-        return EndValue(WriteString(str, length));
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    bool String(const std::basic_string<Ch>& str) {
-        return String(str.data(), SizeType(str.size()));
-    }
-#endif
-
-    bool StartObject() {
-        Prefix(kObjectType);
-        new (level_stack_.template Push<Level>()) Level(false);
-        return WriteStartObject();
-    }
-
-    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
-
-    bool EndObject(SizeType memberCount = 0) {
-        (void)memberCount;
-        RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
-        RAPIDJSON_ASSERT(!level_stack_.template Top<Level>()->inArray);
-        level_stack_.template Pop<Level>(1);
-        return EndValue(WriteEndObject());
-    }
-
-    bool StartArray() {
-        Prefix(kArrayType);
-        new (level_stack_.template Push<Level>()) Level(true);
-        return WriteStartArray();
-    }
-
-    bool EndArray(SizeType elementCount = 0) {
-        (void)elementCount;
-        RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
-        RAPIDJSON_ASSERT(level_stack_.template Top<Level>()->inArray);
-        level_stack_.template Pop<Level>(1);
-        return EndValue(WriteEndArray());
-    }
-    //@}
-
-    /*! @name Convenience extensions */
-    //@{
-
-    //! Simpler but slower overload.
-    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
-    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
-
-    //@}
-
-    //! Write a raw JSON value.
-    /*!
-        For user to write a stringified JSON as a value.
-
-        \param json A well-formed JSON value. It should not contain null character within [0, length - 1] range.
-        \param length Length of the json.
-        \param type Type of the root of json.
-    */
-    bool RawValue(const Ch* json, size_t length, Type type) { Prefix(type); return EndValue(WriteRawValue(json, length)); }
-
-protected:
-    //! Information for each nested level
-    struct Level {
-        Level(bool inArray_) : valueCount(0), inArray(inArray_) {}
-        size_t valueCount;  //!< number of values in this level
-        bool inArray;       //!< true if in array, otherwise in object
-    };
-
-    static const size_t kDefaultLevelDepth = 32;
-
-    bool WriteNull()  {
-        PutReserve(*os_, 4);
-        PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 'l'); return true;
-    }
-
-    bool WriteBool(bool b)  {
-        if (b) {
-            PutReserve(*os_, 4);
-            PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'r'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'e');
-        }
-        else {
-            PutReserve(*os_, 5);
-            PutUnsafe(*os_, 'f'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 's'); PutUnsafe(*os_, 'e');
-        }
-        return true;
-    }
-
-    bool WriteInt(int i) {
-        char buffer[11];
-        const char* end = internal::i32toa(i, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (const char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
-        return true;
-    }
-
-    bool WriteUint(unsigned u) {
-        char buffer[10];
-        const char* end = internal::u32toa(u, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (const char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
-        return true;
-    }
-
-    bool WriteInt64(int64_t i64) {
-        char buffer[21];
-        const char* end = internal::i64toa(i64, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (const char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
-        return true;
-    }
-
-    bool WriteUint64(uint64_t u64) {
-        char buffer[20];
-        char* end = internal::u64toa(u64, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
-        return true;
-    }
-
-    bool WriteDouble(double d) {
-        if (internal::Double(d).IsNanOrInf()) {
-            if (!(writeFlags & kWriteNanAndInfFlag))
-                return false;
-            if (internal::Double(d).IsNan()) {
-                PutReserve(*os_, 3);
-                PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
-                return true;
-            }
-            if (internal::Double(d).Sign()) {
-                PutReserve(*os_, 9);
-                PutUnsafe(*os_, '-');
-            }
-            else
-                PutReserve(*os_, 8);
-            PutUnsafe(*os_, 'I'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'f');
-            PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'y');
-            return true;
-        }
-
-        char buffer[25];
-        char* end = internal::dtoa(d, buffer, maxDecimalPlaces_);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
-        return true;
-    }
-
-    bool WriteString(const Ch* str, SizeType length)  {
-        static const typename TargetEncoding::Ch hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-        static const char escape[256] = {
-#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            //0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
-            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'b', 't', 'n', 'u', 'f', 'r', 'u', 'u', // 00
-            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', // 10
-              0,   0, '"',   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 20
-            Z16, Z16,                                                                       // 30~4F
-              0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,'\\',   0,   0,   0, // 50
-            Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16                                // 60~FF
-#undef Z16
-        };
-
-        if (TargetEncoding::supportUnicode)
-            PutReserve(*os_, 2 + length * 6); // "\uxxxx..."
-        else
-            PutReserve(*os_, 2 + length * 12);  // "\uxxxx\uyyyy..."
-
-        PutUnsafe(*os_, '\"');
-        GenericStringStream<SourceEncoding> is(str);
-        while (ScanWriteUnescapedString(is, length)) {
-            const Ch c = is.Peek();
-            if (!TargetEncoding::supportUnicode && static_cast<unsigned>(c) >= 0x80) {
-                // Unicode escaping
-                unsigned codepoint;
-                if (RAPIDJSON_UNLIKELY(!SourceEncoding::Decode(is, &codepoint)))
-                    return false;
-                PutUnsafe(*os_, '\\');
-                PutUnsafe(*os_, 'u');
-                if (codepoint <= 0xD7FF || (codepoint >= 0xE000 && codepoint <= 0xFFFF)) {
-                    PutUnsafe(*os_, hexDigits[(codepoint >> 12) & 15]);
-                    PutUnsafe(*os_, hexDigits[(codepoint >>  8) & 15]);
-                    PutUnsafe(*os_, hexDigits[(codepoint >>  4) & 15]);
-                    PutUnsafe(*os_, hexDigits[(codepoint      ) & 15]);
-                }
-                else {
-                    RAPIDJSON_ASSERT(codepoint >= 0x010000 && codepoint <= 0x10FFFF);
-                    // Surrogate pair
-                    unsigned s = codepoint - 0x010000;
-                    unsigned lead = (s >> 10) + 0xD800;
-                    unsigned trail = (s & 0x3FF) + 0xDC00;
-                    PutUnsafe(*os_, hexDigits[(lead >> 12) & 15]);
-                    PutUnsafe(*os_, hexDigits[(lead >>  8) & 15]);
-                    PutUnsafe(*os_, hexDigits[(lead >>  4) & 15]);
-                    PutUnsafe(*os_, hexDigits[(lead      ) & 15]);
-                    PutUnsafe(*os_, '\\');
-                    PutUnsafe(*os_, 'u');
-                    PutUnsafe(*os_, hexDigits[(trail >> 12) & 15]);
-                    PutUnsafe(*os_, hexDigits[(trail >>  8) & 15]);
-                    PutUnsafe(*os_, hexDigits[(trail >>  4) & 15]);
-                    PutUnsafe(*os_, hexDigits[(trail      ) & 15]);                    
-                }
-            }
-            else if ((sizeof(Ch) == 1 || static_cast<unsigned>(c) < 256) && RAPIDJSON_UNLIKELY(escape[static_cast<unsigned char>(c)]))  {
-                is.Take();
-                PutUnsafe(*os_, '\\');
-                PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(escape[static_cast<unsigned char>(c)]));
-                if (escape[static_cast<unsigned char>(c)] == 'u') {
-                    PutUnsafe(*os_, '0');
-                    PutUnsafe(*os_, '0');
-                    PutUnsafe(*os_, hexDigits[static_cast<unsigned char>(c) >> 4]);
-                    PutUnsafe(*os_, hexDigits[static_cast<unsigned char>(c) & 0xF]);
-                }
-            }
-            else if (RAPIDJSON_UNLIKELY(!(writeFlags & kWriteValidateEncodingFlag ? 
-                Transcoder<SourceEncoding, TargetEncoding>::Validate(is, *os_) :
-                Transcoder<SourceEncoding, TargetEncoding>::TranscodeUnsafe(is, *os_))))
-                return false;
-        }
-        PutUnsafe(*os_, '\"');
-        return true;
-    }
-
-    bool ScanWriteUnescapedString(GenericStringStream<SourceEncoding>& is, size_t length) {
-        return RAPIDJSON_LIKELY(is.Tell() < length);
-    }
-
-    bool WriteStartObject() { os_->Put('{'); return true; }
-    bool WriteEndObject()   { os_->Put('}'); return true; }
-    bool WriteStartArray()  { os_->Put('['); return true; }
-    bool WriteEndArray()    { os_->Put(']'); return true; }
-
-    bool WriteRawValue(const Ch* json, size_t length) {
-        PutReserve(*os_, length);
-        for (size_t i = 0; i < length; i++) {
-            RAPIDJSON_ASSERT(json[i] != '\0');
-            PutUnsafe(*os_, json[i]);
-        }
-        return true;
-    }
-
-    void Prefix(Type type) {
-        (void)type;
-        if (RAPIDJSON_LIKELY(level_stack_.GetSize() != 0)) { // this value is not at root
-            Level* level = level_stack_.template Top<Level>();
-            if (level->valueCount > 0) {
-                if (level->inArray) 
-                    os_->Put(','); // add comma if it is not the first element in array
-                else  // in object
-                    os_->Put((level->valueCount % 2 == 0) ? ',' : ':');
-            }
-            if (!level->inArray && level->valueCount % 2 == 0)
-                RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
-            level->valueCount++;
-        }
-        else {
-            RAPIDJSON_ASSERT(!hasRoot_);    // Should only has one and only one root.
-            hasRoot_ = true;
-        }
-    }
-
-    // Flush the value if it is the top level one.
-    bool EndValue(bool ret) {
-        if (RAPIDJSON_UNLIKELY(level_stack_.Empty()))   // end of json text
-            os_->Flush();
-        return ret;
-    }
-
-    OutputStream* os_;
-    internal::Stack<StackAllocator> level_stack_;
-    int maxDecimalPlaces_;
-    bool hasRoot_;
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    Writer(const Writer&);
-    Writer& operator=(const Writer&);
-};
-
-// Full specialization for StringStream to prevent memory copying
-
-template<>
-inline bool Writer<StringBuffer>::WriteInt(int i) {
-    char *buffer = os_->Push(11);
-    const char* end = internal::i32toa(i, buffer);
-    os_->Pop(static_cast<size_t>(11 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteUint(unsigned u) {
-    char *buffer = os_->Push(10);
-    const char* end = internal::u32toa(u, buffer);
-    os_->Pop(static_cast<size_t>(10 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteInt64(int64_t i64) {
-    char *buffer = os_->Push(21);
-    const char* end = internal::i64toa(i64, buffer);
-    os_->Pop(static_cast<size_t>(21 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteUint64(uint64_t u) {
-    char *buffer = os_->Push(20);
-    const char* end = internal::u64toa(u, buffer);
-    os_->Pop(static_cast<size_t>(20 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteDouble(double d) {
-    if (internal::Double(d).IsNanOrInf()) {
-        // Note: This code path can only be reached if (RAPIDJSON_WRITE_DEFAULT_FLAGS & kWriteNanAndInfFlag).
-        if (!(kWriteDefaultFlags & kWriteNanAndInfFlag))
-            return false;
-        if (internal::Double(d).IsNan()) {
-            PutReserve(*os_, 3);
-            PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
-            return true;
-        }
-        if (internal::Double(d).Sign()) {
-            PutReserve(*os_, 9);
-            PutUnsafe(*os_, '-');
-        }
-        else
-            PutReserve(*os_, 8);
-        PutUnsafe(*os_, 'I'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'f');
-        PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'y');
-        return true;
-    }
-    
-    char *buffer = os_->Push(25);
-    char* end = internal::dtoa(d, buffer, maxDecimalPlaces_);
-    os_->Pop(static_cast<size_t>(25 - (end - buffer)));
-    return true;
-}
-
-#if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42)
-template<>
-inline bool Writer<StringBuffer>::ScanWriteUnescapedString(StringStream& is, size_t length) {
-    if (length < 16)
-        return RAPIDJSON_LIKELY(is.Tell() < length);
-
-    if (!RAPIDJSON_LIKELY(is.Tell() < length))
-        return false;
-
-    const char* p = is.src_;
-    const char* end = is.head_ + length;
-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-    const char* endAligned = reinterpret_cast<const char*>(reinterpret_cast<size_t>(end) & static_cast<size_t>(~15));
-    if (nextAligned > end)
-        return true;
-
-    while (p != nextAligned)
-        if (*p < 0x20 || *p == '\"' || *p == '\\') {
-            is.src_ = p;
-            return RAPIDJSON_LIKELY(is.Tell() < length);
-        }
-        else
-            os_->PutUnsafe(*p++);
-
-    // The rest of string using SIMD
-    static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-    static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-    static const char space[16]  = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
-    const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-    const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-    const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-    for (; p != endAligned; p += 16) {
-        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-        const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-        const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-        const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
-        const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-        unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-        if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-            SizeType len;
-#ifdef _MSC_VER         // Find the index of first escaped
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            len = offset;
-#else
-            len = static_cast<SizeType>(__builtin_ffs(r) - 1);
-#endif
-            char* q = reinterpret_cast<char*>(os_->PushUnsafe(len));
-            for (size_t i = 0; i < len; i++)
-                q[i] = p[i];
-
-            p += len;
-            break;
-        }
-        _mm_storeu_si128(reinterpret_cast<__m128i *>(os_->PushUnsafe(16)), s);
-    }
-
-    is.src_ = p;
-    return RAPIDJSON_LIKELY(is.Tell() < length);
-}
-#endif // defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42)
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef _MSC_VER
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_RAPIDJSON_H_
diff --git a/sql-odbc/libraries/rapidjson/license.txt b/sql-odbc/libraries/rapidjson/license.txt
deleted file mode 100644
index 22ed8e29ba..0000000000
--- a/sql-odbc/libraries/rapidjson/license.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-Tencent is pleased to support the open source community by making RapidJSON available. 
- 
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
-
-If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.
-If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON. To avoid the problematic JSON license in your own projects, it's sufficient to exclude the bin/jsonchecker/ directory, as it's the only code under the JSON license.
-A copy of the MIT License is included in this file.
-
-Other dependencies and licenses:
-
-Open Source Software Licensed Under the BSD License:
---------------------------------------------------------------------
-
-The msinttypes r29 
-Copyright (c) 2006-2013 Alexander Chemeris 
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Open Source Software Licensed Under the JSON License:
---------------------------------------------------------------------
-
-json.org 
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-JSON_checker
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-	
-Terms of the JSON License:
----------------------------------------------------
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Terms of the MIT License:
---------------------------------------------------------------------
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/sql-odbc/opendistro-elasticsearch-odbc.release-notes.md b/sql-odbc/opendistro-elasticsearch-odbc.release-notes.md
deleted file mode 100644
index 540b341a18..0000000000
--- a/sql-odbc/opendistro-elasticsearch-odbc.release-notes.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## 2020-05-05, Version 1.7
-
-### Notable Changes
-
-This is the first release of OpenSearch ODBC driver.
-
-OpenDistro ODBC provides a driver for ODBC connectivity for OpenDistro SQL plugin. The driver has been developed from scratch and offers the following features in this initial release:
-
-* ODBC API implementation as per ODBC 3.51 specifications
-* Support for MacOS and Windows installers
-* Support for HTTP BASIC and AWS SIGV4 authentication mechanisms
-* Full support for Elasticsearch Datatypes: BOOLEAN, BYTE, SHORT, INTEGER, LONG, HALF_FLOAT, FLOAT, DOUBLE, SCALED_FLOAT, KEYWORD, TEXT
-
diff --git a/sql-odbc/release-notes/sql-odbc.release-notes-1.7.0.0.md b/sql-odbc/release-notes/sql-odbc.release-notes-1.7.0.0.md
deleted file mode 100644
index d364e473ca..0000000000
--- a/sql-odbc/release-notes/sql-odbc.release-notes-1.7.0.0.md
+++ /dev/null
@@ -1,48 +0,0 @@
-## 2020-05-05, Version 1.7
-
-This is the first release of OpenDistro For ELasticsearch ODBC driver.
-
-OpenDistro ODBC provides a driver for ODBC connectivity for OpenDistro SQL plugin. The driver has been developed from scratch and offers the following features in this initial release:
-
-* ODBC API implementation as per ODBC 3.51 specifications
-* Support for MacOS and Windows installers
-* Support for HTTP BASIC and AWS SIGV4 authentication mechanisms
-* Full support for Elasticsearch Datatypes: BOOLEAN, BYTE, SHORT, INTEGER, LONG, HALF_FLOAT, FLOAT, DOUBLE, SCALED_FLOAT, KEYWORD, TEXT
-
-### Features
-
-* Feature[#7](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/7): Add support for connection string abbreviations
-
-* Feature[#2](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/2): Connection string refactoring and registry updates
-
-* Feature[#27](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/27): Simple Windows Installer
-
-
-* Feature[#78](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/78): Add fetch_size for pagination support
-
-
-### Documentation
-
-* [Pagination support design document](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/40) 
-* [Update README for authentication & encryption configuration options](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/33) 
-* [Instructions for signing installers](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/84) 
-
-
-
-### BugFixes
-
-* [Fix AWS authentication for Tableau on Mac](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/9) 
-
-* [Mac installer fixes](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/73) 
-
-
-* [Fix General installer components](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/69) 
-
-
-
-
-
-
-
-
-
diff --git a/sql-odbc/release-notes/sql-odbc.release-notes-1.8.0.0.md b/sql-odbc/release-notes/sql-odbc.release-notes-1.8.0.0.md
deleted file mode 100644
index 40911b2fc9..0000000000
--- a/sql-odbc/release-notes/sql-odbc.release-notes-1.8.0.0.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## 2020-05-18, Version 1.8
-
-### Features
-
-* Feature[#81](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/82): Add Tableau connector source files
-
-### Documentation
-
-* [Add supported OS version in README.md](https://github.com/opendistro-for-elasticsearch/sql-odbc/pull/88)
diff --git a/sql-odbc/release-notes/sql-odbc.release-notes-1.9.0.0.md b/sql-odbc/release-notes/sql-odbc.release-notes-1.9.0.0.md
deleted file mode 100644
index c79ca74b1e..0000000000
--- a/sql-odbc/release-notes/sql-odbc.release-notes-1.9.0.0.md
+++ /dev/null
@@ -1,22 +0,0 @@
-## 2020-06-24, Version 1.9
-
-### Features
-
-* Feature [#96](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/96): Updating tableau connector files
-* Feature [#99](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/99): Add 32bit support for driver
-* Feature [#101](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/101): Pagination support
-* Feature [#107](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/107): Add support for building with code coverage
-* Feature [#109](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/109): Remove support for NOW in tableau connector
-* Feature [#112](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/112): Updating SQLRowCount function support
-* Feature [#114](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/114): Remove old driver files before installing Mac driver
-* Feature [#119](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/119): Add CAP_SUPPRESS_GET_SERVER_TIME instead of removing support for NOW() in tableau connector
-* Feature [#120](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/120): Use a queue which is created with a capacity while getting result pages
-
-
-### Documentation
-
-* Documentation [#93](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/93): Update build instructions
-* Documentation [#116](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/116): Update README
-
-### BugFixes
-* BugFix [#118](https:github.com/opendistro-for-elasticsearch/sql-odbc/pull/118): Fix ODBC administrator GUI on windows
diff --git a/sql-odbc/run_cppcheck.bat b/sql-odbc/run_cppcheck.bat
deleted file mode 100644
index 50f076f2ee..0000000000
--- a/sql-odbc/run_cppcheck.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-:: --force: force checks all define combinations (default max is 12)
-:: --suppress=objectIndex: seemingly false-positive (TODO: investigate this further) 
-:: -iaws-sdk-cpp: avoid checking AWS C++ SDK source files in our repo
-cppcheck.exe --force --suppress=objectIndex -iaws-sdk-cpp .\src\ 2> cppcheck-results.log
diff --git a/sql-odbc/run_cppcheck.sh b/sql-odbc/run_cppcheck.sh
deleted file mode 100755
index 5a35fc065a..0000000000
--- a/sql-odbc/run_cppcheck.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-RESULTS_FILE=cppcheck-results.log
-
-# --force: force checks all define combinations (default max is 12)
-# -iaws-sdk-cpp: avoid checking AWS C++ SDK source files in our repo
-# -UWIN32: do not check WIN32-defined codepaths; this would throw errors on Mac
-cppcheck --force -iaws-sdk-cpp -UWIN32 ./src 2> ${RESULTS_FILE}
-
-if [ -s ${RESULTS_FILE} ]; then
-    echo "!! Cppcheck errors found! Check ${RESULTS_FILE} for details."
-    exit 1
-else
-    echo "No Cppcheck errors found."
-fi
diff --git a/sql-odbc/run_test_runner.bat b/sql-odbc/run_test_runner.bat
deleted file mode 100644
index 8a6b9ab31e..0000000000
--- a/sql-odbc/run_test_runner.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-set PROJECT_DIR=%CD%
-set TEST_RUNNER_DIR=%PROJECT_DIR%\src\TestRunner
-set WORKING_DIR=%PROJECT_DIR%\build\Debug64\odbc\bin\Debug
-
-cd %WORKING_DIR%
-
-py -m pip install mako
-
-py %TEST_RUNNER_DIR%\test_runner.py -i %TEST_RUNNER_DIR%\mako_template.html -o test_output.html -e %TEST_RUNNER_DIR%\test_exclude_list.txt
-
-set ERROR_CODE=%ERRORLEVEL%
-
-cd %PROJECT_DIR%
-
-echo %ERROR_CODE%
-
-EXIT /b %ERROR_CODE%
diff --git a/sql-odbc/run_test_runner.sh b/sql-odbc/run_test_runner.sh
deleted file mode 100755
index 49e7f1a399..0000000000
--- a/sql-odbc/run_test_runner.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-PROJECT_DIR=$(pwd)
-TEST_RUNNER_DIR=${PROJECT_DIR}/src/TestRunner
-WORKING_DIR=${PROJECT_DIR}/bin64
-
-cd ${WORKING_DIR}
-
-pip3 install mako
-
-python3 ${TEST_RUNNER_DIR}/test_runner.py -i ${TEST_RUNNER_DIR}/mako_template.html -o ${PROJECT_DIR}/test_output.html -e ${TEST_RUNNER_DIR}/test_exclude_list.txt 
-
-ERROR_CODE=$?
-
-cd ..
-
-exit ${ERROR_CODE}
diff --git a/sql-odbc/scripts/build_driver.ps1 b/sql-odbc/scripts/build_driver.ps1
deleted file mode 100644
index 7f514a08c3..0000000000
--- a/sql-odbc/scripts/build_driver.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-$CONFIGURATION = $args[0]
-$WIN_ARCH = $args[1]
-$SRC_DIR = $args[2]
-$BUILD_DIR = $args[3]
-$VCPKG_INSTALLED_DIR = $args[4]
-
-# aws-sdk-cpp fails compilation with warning:
-# "Various members of std::allocator are deprecated in C++17"
-$env:CL='-D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING'
-
-cmake -S $SRC_DIR `
-    -B $BUILD_DIR `
-    -A $WIN_ARCH `
-    -D CMAKE_BUILD_TYPE=$CONFIGURATION `
-    -D CMAKE_INSTALL_PREFIX=$VCPKG_INSTALLED_DIR `
-    -D BUILD_WITH_TESTS=ON
-
-# # Build Project
-cmake --build $BUILD_DIR --config $CONFIGURATION --parallel 4
diff --git a/sql-odbc/scripts/build_installer.ps1 b/sql-odbc/scripts/build_installer.ps1
deleted file mode 100644
index 63857b4705..0000000000
--- a/sql-odbc/scripts/build_installer.ps1
+++ /dev/null
@@ -1,21 +0,0 @@
-$CONFIGURATION = $args[0]
-$WIN_ARCH = $args[1]
-$SRC_DIR = $args[2]
-$BUILD_DIR = $args[3]
-$INSTALL_DIR = $args[4]
-
-Write-Host $args
-
-# aws-sdk-cpp fails compilation with warning:
-# "Various members of std::allocator are deprecated in C++17"
-$env:CL='-D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING'
-
-cmake -S $SRC_DIR `
-    -B $BUILD_DIR `
-    -A $WIN_ARCH `
-    -D CMAKE_BUILD_TYPE=$CONFIGURATION `
-    -D CMAKE_INSTALL_PREFIX=$INSTALL_DIR `
-    -D BUILD_WITH_TESTS=OFF
-
-# # Build Project
-msbuild $BUILD_DIR\PACKAGE.vcxproj -m -p:Configuration=Release
diff --git a/sql-odbc/scripts/build_windows.ps1 b/sql-odbc/scripts/build_windows.ps1
deleted file mode 100644
index f2090df541..0000000000
--- a/sql-odbc/scripts/build_windows.ps1
+++ /dev/null
@@ -1,39 +0,0 @@
-# Build AWS SDK
-$CURRENT_DIR = Get-Location
-$WORKING_DIR = $args[0]
-$CONFIGURATION = $args[1]
-$BITNESS = $args[2]
-if ($BITNESS -eq "64") {
-    $WIN_ARCH = "x64"
-}
-else {
-    $WIN_ARCH = "Win32"
-}
-
-# Create build directory; remove if exists
-$BUILD_DIR = "${WORKING_DIR}\build"
-New-Item -Path $BUILD_DIR -ItemType Directory -Force | Out-Null
-
-Set-Location $CURRENT_DIR
-
-# Build driver
-$DRIVER_SOURCE_DIR = "${WORKING_DIR}\src"
-$DRIVER_BUILD_DIR = "${BUILD_DIR}\odbc\cmake"
-$VCPKG_INSTALLED_DIR = "${DRIVER_SOURCE_DIR}\vcpkg_installed\$env:VCPKG_DEFAULT_TRIPLET"
-
-.\scripts\build_driver.ps1 `
-    $CONFIGURATION $WIN_ARCH `
-    $DRIVER_SOURCE_DIR $DRIVER_BUILD_DIR $VCPKG_INSTALLED_DIR
-Set-Location $CURRENT_DIR
-
-# Move driver dependencies to bin directory for testing
-$DRIVER_BIN_DIR = "${BUILD_DIR}\odbc\bin\$CONFIGURATION"
-New-Item -Path $DRIVER_BIN_DIR -ItemType Directory -Force | Out-Null
-
-Copy-Item $VCPKG_INSTALLED_DIR\bin\* $DRIVER_BIN_DIR
-if ($BITNESS -eq "32") {
-    # Strip bitness from 32bit VLD DLL dir name
-    $BITNESS = $null
-    $WIN_ARCH = "x86"
-}
-Copy-Item .\libraries\VisualLeakDetector\bin$BITNESS\vld_$WIN_ARCH.dll $DRIVER_BIN_DIR
diff --git a/sql-odbc/scripts/prepare_ci_output.ps1 b/sql-odbc/scripts/prepare_ci_output.ps1
deleted file mode 100644
index 1deafab581..0000000000
--- a/sql-odbc/scripts/prepare_ci_output.ps1
+++ /dev/null
@@ -1,20 +0,0 @@
-$ODBC_BIN_PATH = $args[0]
-$ODBC_LIB_PATH = $args[1]
-$ODBC_BUILD_PATH = $args[2]
-
-Write-Host $args
-
-# Create staging directories for CI artifacts
-$CI_OUTPUT_PATH = ".\ci-output"
-New-Item -Path $CI_OUTPUT_PATH -ItemType Directory -Force | Out-Null
-New-Item -Path $CI_OUTPUT_PATH\build -ItemType Directory -Force | Out-Null
-New-Item -Path $CI_OUTPUT_PATH\installer -ItemType Directory -Force | Out-Null
-
-# Copy CI artifacts to respective directories
-Copy-Item $ODBC_BIN_PATH\*.dll $CI_OUTPUT_PATH\build
-Copy-Item $ODBC_BIN_PATH\*.exe $CI_OUTPUT_PATH\build
-Copy-Item $ODBC_LIB_PATH\*.lib $CI_OUTPUT_PATH\build
-Copy-Item $ODBC_BUILD_PATH\*.msi $CI_OUTPUT_PATH\installer
-#    mkdir $CI_OUTPUT_PATH\test
-#    Copy-Item $ODBC_BIN_PATH\*.log $CI_OUTPUT_PATH\test
-#    Copy-Item $ODBC_BIN_PATH\*.html $CI_OUTPUT_PATH\test
diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt
deleted file mode 100644
index 93838c7cab..0000000000
--- a/sql-odbc/src/CMakeLists.txt
+++ /dev/null
@@ -1,150 +0,0 @@
-# Pre 3.16 versions of Windows set MD/MT incorrectly and cause linker 'warnings' which are actually serious issues
-if(WIN32)
-cmake_minimum_required(VERSION 3.16) 
-else()
-cmake_minimum_required(VERSION 3.13) 
-endif()
-
-project(global_make_list)
-
-include("${CMAKE_CURRENT_SOURCE_DIR}/modules/code-coverage.cmake")
-add_code_coverage_all_targets(EXCLUDE libraries aws-cpp-sdk googletest IntegrationTests)
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	set(BITNESS 64)
-	set(BITNESS_NAME "x64")
-	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../build/odbc/lib")
-	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../build/odbc/lib")
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../build/odbc/bin")
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-	set(BITNESS 32)
-	set(BITNESS_NAME "x86")
-	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../build/odbc/lib")
-	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../build/odbc/lib")
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../build/odbc/bin")
-endif()
-
-# This wasn't being picked up on mac, causes some symbol errors
-if(APPLE)
-	set(CMAKE_CXX_STANDARD 17)
-	add_definitions(-DHAVE_STRLCAT)
-	# Do not use shared libraries for AWS SDK.
-	option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
-	# Set BUILD_WITH_TESTS to OFF before building installer package for size optimization.
-	option(BUILD_WITH_TESTS "Enable testing" ON)
-else()
-	set(CMAKE_CXX_STANDARD 17)
-	# Use shared libraries for AWS SDK.
-	option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-	# Set BUILD_WITH_TESTS to OFF before building installer package for size optimization.
-	option(BUILD_WITH_TESTS "Enable testing" ON)
-endif()
-
-if(MSVC)
-  add_compile_options(/W4 /WX)
-else()
-  add_compile_options(-Wall -Wextra -pedantic -Werror)
-endif()
-
-if(NOT WIN32)
-	# Unix builds require autoconf
-	option(AUTOCONF_ENABLE "Enable autoconf" ON)
-	configure_file(autoconf.h.in generated/autoconf.h @ONLY)
-endif()
-
-# Base directories
-set(PROJECT_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/..")
-set(OPENSEARCHODBC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/sqlodbc")
-set(OPENSEARCHENLIST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/opensearchenlist")
-set(INTEGRATION_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/IntegrationTests")
-set(UNIT_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/UnitTests")
-set(LIBRARY_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../libraries)
-set(INSTALL_SRC "${CMAKE_CURRENT_SOURCE_DIR}/installer")
-set(DSN_INSTALLER_SRC "${CMAKE_CURRENT_SOURCE_DIR}/DSNInstaller")
-
-# ODBC Driver version 
-set(DRIVER_PACKAGE_VERSION "1.4.0.0")
-set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,4,0,0")
-add_compile_definitions( OPENSEARCH_ODBC_VERSION="${DRIVER_PACKAGE_VERSION}"
-                         # Comma separated version is required for odbc administrator's driver file.
-                         OPENSEARCH_ODBC_DRVFILE_VERSION=${DRIVER_PACKAGE_VERSION_COMMA_SEPARATED} )
-
-# Extensions of base directories
-set(PERFORMANCE_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/PerformanceTests")
-set(UT_HELPER "${UNIT_TESTS}/UTHelper")
-set(IT_HELPER "${INTEGRATION_TESTS}/ITODBCHelper")
-set(RABBIT_SRC ${LIBRARY_DIRECTORY}/rabbit/include)
-set(VLD_SRC ${LIBRARY_DIRECTORY}/VisualLeakDetector/include)
-if(WIN32)
-    set(RAPIDJSON_SRC ${LIBRARY_DIRECTORY}/rapidjson/include)
-endif ()
-# Without this symbols will be exporting to Unix but not Windows
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)	
-
-find_package(aws-cpp-sdk-core CONFIG REQUIRED)
-if(APPLE)
-    find_package(ZLIB REQUIRED)
-    find_package(RapidJSON CONFIG REQUIRED)
-endif()
-
-# General compiler definitions
-add_compile_definitions		(	_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-								UNICODE_SUPPORT	
-								DYNAMIC_LOAD	
-								_MBCS
-								_CRT_SECURE_NO_DEPRECATE	
-								_USRDLL	
-								_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING
-								_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
-								# USE_SSL					
-							)
-
-# Platform specific compiler definitions
-if (WIN32 AND BITNESS EQUAL 64)
-	# Windows specific
-	add_compile_definitions	(	_WINDLL						
-								_WIN64			
-								_WINDOWS
-								WIN_EXPORT				
-							)
-elseif (WIN32 AND BITNESS EQUAL 32)
-	# Windows specific
-	add_compile_definitions	(	_WINDLL						
-								_WIN32			
-								_WINDOWS
-								WIN_EXPORT				
-							)
-elseif(APPLE)
-	# macOS specific
-	add_compile_definitions	(	WITH_IODBC	
-								SQLCOLATTRIBUTE_SQLLEN
-							)
-	# iODBC includes
-	include_directories(/usr/local/include)
-elseif(UNIX)
-	# Unix specific
-	add_compile_definitions	(	WITH_UNIXODBC	
-								SQLCOLATTRIBUTE_SQLLEN
-							)
-endif()
-
-if(BUILD_WITH_TESTS)
-	# GTest import
-	enable_testing()
-endif()
-
-# Projects to build
-add_subdirectory(${OPENSEARCHODBC_SRC})
-add_subdirectory(${OPENSEARCHENLIST_SRC})
-add_subdirectory(${INSTALL_SRC})
-
-# Only build & package DSN installer for Mac platforms
-if(APPLE)
-	add_subdirectory(${DSN_INSTALLER_SRC})
-endif()
-
-if(BUILD_WITH_TESTS)
-	add_subdirectory(${INTEGRATION_TESTS})
-	add_subdirectory(${UNIT_TESTS})
-	add_subdirectory(${PERFORMANCE_TESTS})
-endif()
diff --git a/sql-odbc/src/DSNInstaller/CMakeLists.txt b/sql-odbc/src/DSNInstaller/CMakeLists.txt
deleted file mode 100644
index de7a304fbc..0000000000
--- a/sql-odbc/src/DSNInstaller/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-project(dsn_installer)
-
-set(SOURCE_FILES dsn_installer.cpp)
-
-add_executable(dsn_installer ${SOURCE_FILES})
-
-target_link_libraries(dsn_installer iodbcinst)
-target_compile_definitions(dsn_installer PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/DSNInstaller/dsn_installer.cpp b/sql-odbc/src/DSNInstaller/dsn_installer.cpp
deleted file mode 100644
index 94bb4a7327..0000000000
--- a/sql-odbc/src/DSNInstaller/dsn_installer.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-// clang-format off
-#include <sql.h>
-#include <sqlext.h>
-#include <iodbcinst.h>
-#include <codecvt>
-#include <string>
-#include <vector>
-#include <iostream>
-// clang-format on
-
-// Necessary for installing driver, since the driver description needs to
-// maintain null characters.
-using namespace std::string_literals;
-
-std::wstring driver_name = L"OpenSearch SQL ODBC Driver";
-std::wstring driver_filename = L"libsqlodbc.dylib";
-std::wstring dsn_name = L"OpenSearch SQL ODBC DSN";
-std::wstring dsn_ini_filename = L"sqlodbc.ini";
-
-std::wstring driver_name_placeholder = L"%DRIVER_NAME%";
-std::wstring driver_path_placeholder = L"%DRIVER_PATH%";
-std::wstring setup_path_placeholder = L"%SETUP_PATH%";
-
-std::vector< std::pair< std::wstring, std::wstring > > dsn_options = {
-    {L"Driver", driver_path_placeholder},
-    {L"Host", L"localhost"},
-    {L"Port", L"9200"},
-    {L"User", L""},
-    {L"Password", L""},
-    {L"Auth", L"NONE"},
-    {L"UseSSL", L"0"},
-    {L"ResponseTimeout", L"10"}};
-
-void print_error_message(DWORD error_code, wchar_t *error_message) {
-    switch (error_code) {
-        case ODBC_ERROR_GENERAL_ERR:
-            printf("\t[GENERAL_ERR] %S\n", error_message);
-            break;
-        case ODBC_ERROR_INVALID_BUFF_LEN:
-            printf("\t[INVALID_BUFF_LEN] %S\n", error_message);
-            break;
-        case ODBC_ERROR_INVALID_HWND:
-            printf("\t[INVALID_HWND] %S\n", error_message);
-            break;
-        case ODBC_ERROR_INVALID_STR:
-            printf("\t[INVALID_STR] %S\n", error_message);
-            break;
-        case ODBC_ERROR_INVALID_REQUEST_TYPE:
-            printf("\t[INVALID_REQUEST_TYPE] %S\n", error_message);
-            break;
-        case ODBC_ERROR_COMPONENT_NOT_FOUND:
-            printf("\t[COMPONENT_NOT_FOUND] %S\n", error_message);
-            break;
-        case ODBC_ERROR_INVALID_NAME:
-            printf("\t[INVALID_NAME] %S\n", error_message);
-            break;
-        case ODBC_ERROR_INVALID_KEYWORD_VALUE:
-            printf("\t[INVALID_KEYWORD_VALUE] %S\n", error_message);
-            break;
-        case ODBC_ERROR_INVALID_PATH:
-            printf("\t[INVALID_PATH] %S\n", error_message);
-            break;
-        default:
-            printf("\t%d\n", error_code);
-    }
-}
-
-void print_installer_error() {
-    int ret = 0;
-
-    WORD error_message_max_length = SQL_MAX_MESSAGE_LENGTH;
-    DWORD out_error_code;
-    wchar_t error_message[SQL_MAX_MESSAGE_LENGTH];
-    WORD error_message_num_bytes;
-
-    WORD in_error_rec = 0;  // (1-8)
-    do {
-        printf("Error %d:\n", ++in_error_rec);
-        ret = SQLInstallerErrorW(in_error_rec, &out_error_code, error_message,
-                                 error_message_max_length,
-                                 &error_message_num_bytes);
-        print_error_message(out_error_code, error_message);
-    } while (ret != SQL_NO_DATA);
-}
-
-void replace_placeholder(std::wstring &source, std::wstring placeholder,
-                         std::wstring contents) {
-    size_t index = source.find(placeholder);
-    if (index != std::string::npos) {
-        source.replace(index, placeholder.size(), contents);
-    }
-}
-
-bool install_driver(std::wstring install_path) {
-    std::wstring driver_install_str =
-        L"%DRIVER_NAME%\0"
-        L"Driver=%DRIVER_PATH%\0"
-        L"Setup=%SETUP_PATH%\0\0"s;
-    std::wstring driver_path = install_path + driver_filename;
-
-    replace_placeholder(driver_install_str, driver_name_placeholder,
-                        driver_name);
-    replace_placeholder(driver_install_str, driver_path_placeholder,
-                        driver_path);
-    replace_placeholder(driver_install_str, setup_path_placeholder,
-                        driver_path);
-
-    SQLWCHAR out_path[512];
-    WORD out_path_length = 512;
-    WORD num_out_path_bytes;
-    DWORD out_usage_count = 0;
-    bool success =
-        SQLInstallDriverExW(driver_install_str.c_str(), install_path.c_str(),
-                            out_path, out_path_length, &num_out_path_bytes,
-                            ODBC_INSTALL_COMPLETE, &out_usage_count);
-    if (!success) {
-        print_installer_error();
-        return false;
-    }
-
-    return success;
-}
-
-bool install_dsn() {
-    bool success = SQLWriteDSNToIniW(dsn_name.c_str(), driver_name.c_str());
-    if (!success) {
-        print_installer_error();
-        return false;
-    }
-    return success;
-}
-
-bool add_properties_to_dsn(
-    std::vector< std::pair< std::wstring, std::wstring > > options,
-    std::wstring driver_path) {
-    bool success = false;
-    for (auto dsn_config_option : options) {
-        std::wstring key = dsn_config_option.first;
-        std::wstring value = dsn_config_option.second;
-
-        if (value.find(driver_path_placeholder, 0) != std::string::npos) {
-            replace_placeholder(value, driver_path_placeholder, driver_path);
-        }
-
-        success = SQLWritePrivateProfileStringW(dsn_name.c_str(), key.c_str(),
-                                                value.c_str(),
-                                                dsn_ini_filename.c_str());
-        if (!success) {
-            print_installer_error();
-            return false;
-        }
-    }
-    return success;
-}
-
-bool uninstall_driver() {
-    bool remove_dsns = true;
-    DWORD out_usage_count = 0;
-
-    bool success =
-        SQLRemoveDriverW(driver_name.c_str(), remove_dsns, &out_usage_count);
-    if (!success) {
-        print_installer_error();
-        return false;
-    }
-    return success;
-}
-
-int main(int argc, char *argv[]) {
-    // Get install path from args
-    if (!argv || argc != 2) {
-        printf("Error! Driver path not supplied\n");
-        return 1;
-    }
-    std::wstring user_install_path =
-        std::wstring_convert< std::codecvt_utf8_utf16< wchar_t >, wchar_t >{}
-            .from_bytes(argv[1]);
-
-    printf("User install path: %S\n", user_install_path.c_str());
-    if (!user_install_path.compare(L"uninstall")) {
-        bool uninstall_driver_success = uninstall_driver();
-        return uninstall_driver_success;
-    }
-
-    // Install Driver entry
-    printf("Installing Driver entry...\n");
-    bool install_driver_success = install_driver(user_install_path);
-    if (!install_driver_success) {
-        return 1;
-    }
-
-    // Add DSN entry
-    printf("Adding DSN entry...\n");
-    bool install_dsn_success = install_dsn();
-    if (!install_dsn_success) {
-        return 1;
-    }
-
-    // Add DSN properties
-    printf("Adding DSN properties...\n");
-    bool add_properties_success =
-        add_properties_to_dsn(dsn_options, user_install_path + driver_filename);
-    if (!add_properties_success) {
-        return 1;
-    }
-
-    printf("Finished adding DSN!\n");
-    return 0;
-}
diff --git a/sql-odbc/src/IntegrationTests/CMakeLists.txt b/sql-odbc/src/IntegrationTests/CMakeLists.txt
deleted file mode 100644
index bc2dc38872..0000000000
--- a/sql-odbc/src/IntegrationTests/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-project(integration_tests)
-
-set(HELPER_ITEST "${CMAKE_CURRENT_SOURCE_DIR}/ITODBCHelper")
-set(CATALOG_ITEST "${CMAKE_CURRENT_SOURCE_DIR}/ITODBCCatalog")
-set(CONNECTION_ITEST "${CMAKE_CURRENT_SOURCE_DIR}/ITODBCConnection")
-set(DESCRIPTOR_ITEST "${CMAKE_CURRENT_SOURCE_DIR}/ITODBCDescriptors")
-set(EXECUTION_ITEST "${CMAKE_CURRENT_SOURCE_DIR}/ITODBCExecution")
-set(INFO_ITEST "${CMAKE_CURRENT_SOURCE_DIR}/ITODBCInfo")
-set(RESULTS_ITEST "${CMAKE_CURRENT_SOURCE_DIR}/ITODBCResults")
-set(TABLEAU_QUERIES_ITEST "${CMAKE_CURRENT_SOURCE_DIR}/ITODBCTableauQueries")
-set(AWS_AUTH_ITEST "${CMAKE_CURRENT_SOURCE_DIR}/ITODBCAwsAuth")
-set(PAGINATION_ITEST "${CMAKE_CURRENT_SOURCE_DIR}/ITODBCPagination")
-
-# Projects to build
-add_subdirectory(${HELPER_ITEST})
-add_subdirectory(${CATALOG_ITEST})
-add_subdirectory(${CONNECTION_ITEST})
-add_subdirectory(${DESCRIPTOR_ITEST})
-add_subdirectory(${EXECUTION_ITEST})
-add_subdirectory(${INFO_ITEST})
-add_subdirectory(${RESULTS_ITEST})
-add_subdirectory(${TABLEAU_QUERIES_ITEST})
-add_subdirectory(${AWS_AUTH_ITEST})
-add_subdirectory(${PAGINATION_ITEST})
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt
deleted file mode 100644
index adf520e073..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-project(itodbc_aws_auth)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_odbc_aws_auth.cpp)
-include_directories(	${UT_HELPER}
-						${IT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${VLD_SRC}
-						${AWSSDK_INCLUDE_DIR}
-						)
-
-# Generate executable
-add_executable(itodbc_aws_auth ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_link_libraries(itodbc_aws_auth sqlodbc itodbc_helper ut_helper GTest::gtest_main aws-cpp-sdk-core)
-target_compile_definitions(itodbc_aws_auth PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.h b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg
deleted file mode 100644
index 10bd4bee49..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg
+++ /dev/null
@@ -1,17 +0,0 @@
-Windows Registry Editor Version 5.00
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
-"OpenSearchODBC"="Installed"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\OpenSearchODBC]
-"Driver"="<project-root>\\bin64\\Release\\sqlodbc.dll"
-"Setup"="<project-root>\\bin64\\Release\\sqlodbc.dll"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\ODBC Data Sources]
-"test_aws_auth_dsn"="OpenSearchODBC"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\test_aws_auth_dsn]
-"host"="https://search-sept-cdg-david-test-domain-gouok3seqeupz64smuvfxyddui.eu-west-3.es.amazonaws.com"
-"auth"="AWS_SIGV4"
-"region"="eu-west-3"
-"useSSL"="0"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc.ini b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc.ini
deleted file mode 100644
index 61c2516cb0..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[ODBC Data Sources]
-test_aws_auth_dsn = OpenSearchODBC
-
-[test_aws_auth_dsn]
-host              = https://search-sept-cdg-david-test-domain-gouok3seqeupz64smuvfxyddui.eu-west-3.es.amazonaws.com
-auth              = AWS_SIGV4
-region            = eu-west-3
-useSSL            = 0
\ No newline at end of file
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc_aws_auth.cpp b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc_aws_auth.cpp
deleted file mode 100644
index d714a19b39..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc_aws_auth.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "it_odbc_helper.h"
-// clang-format on
-
-std::wstring dsn_name = L"test_aws_auth_dsn";
-std::wstring aws_auth_conn_string =
-    L"Driver={OpenSearch};DataBase=database_name;"
-    L"Host=https://"
-    L"search-bit-quill-cx3hpfoxvasohujxkllmgjwqde.us-west-2."
-    L"es.amazonaws.com;"
-    L"Auth=AWS_SIGV4;Region=us-west-2;LogLevel=1";
-std::wstring aws_auth_conn_string_invalid_region =
-    L"Driver={OpenSearch};DataBase=database_name;"
-    L"Host=https://"
-    L"search-bit-quill-cx3hpfoxvasohujxkllmgjwqde.us-west-2."
-    L"es.amazonaws.com;"
-    L"Auth=AWS_SIGV4;Region=us-west-3;LogLevel=1";
-std::wstring aws_auth_conn_string_invalid_authtype =
-    L"Driver={OpenSearch};DataBase=database_name;"
-    L"Host=https://"
-    L"search-bit-quill-cx3hpfoxvasohujxkllmgjwqde.us-west-2."
-    L"es.amazonaws.com;"
-    L"Auth=AWS;Region=us-west-2;LogLevel=1";
-
-class TestAwsAuthConnection : public testing::Test {
-   public:
-    TestAwsAuthConnection(){
-    }
-
-    void SetUp() override {
-    }
-
-    void AllocConnection() {
-        ASSERT_NO_FATAL_FAILURE(SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &m_env));
-        ASSERT_NO_FATAL_FAILURE(SQLSetEnvAttr(m_env, SQL_ATTR_ODBC_VERSION, (void*)SQL_OV_ODBC3, 0));
-        ASSERT_NO_FATAL_FAILURE(SQLAllocHandle(SQL_HANDLE_DBC, m_env, &m_conn));
-    }
-
-    void TearDown() override {
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_DBC, m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV,m_env);
-    }
-
-    ~TestAwsAuthConnection() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHENV m_env = SQL_NULL_HENV;
-
-	private:
-	void TestBody() override {
-    }
-};
-
-TEST(TestAwsAuthConnection, SqlConnectSuccess) {
-    SQLRETURN ret = SQL_ERROR;
-    TestAwsAuthConnection test;
-    ASSERT_NO_FATAL_FAILURE(test.AllocConnection());
-    ret = SQLConnect(test.m_conn, (SQLTCHAR*)dsn_name.c_str(), SQL_NTS,
-                     (SQLTCHAR*)NULL, 0, (SQLTCHAR*)NULL, 0);
-    EXPECT_TRUE(SQL_SUCCEEDED(ret));
-}
-
-TEST(TestAwsAuthConnection, SqlDriverConnectSuccess) {
-    SQLRETURN ret;
-    TestAwsAuthConnection test;
-    SQLTCHAR out_conn_string[1024];
-    SQLSMALLINT out_conn_string_length;
-    ASSERT_NO_FATAL_FAILURE(test.AllocConnection());
-    ret = SQLDriverConnect(test.m_conn, NULL,
-                           (SQLTCHAR*)aws_auth_conn_string.c_str(), SQL_NTS,
-                            out_conn_string, IT_SIZEOF(out_conn_string),
-                           &out_conn_string_length, SQL_DRIVER_COMPLETE);
-    EXPECT_TRUE(SQL_SUCCEEDED(ret));
-}
-
-TEST(TestAwsAuthConnection, SqlDriverConnectInvalidRegion) {
-    SQLRETURN ret;
-    TestAwsAuthConnection test;
-    SQLTCHAR out_conn_string[1024];
-    SQLSMALLINT out_conn_string_length;
-    ASSERT_NO_FATAL_FAILURE(test.AllocConnection());
-    ret = SQLDriverConnect(test.m_conn, NULL,
-                         (SQLTCHAR*)aws_auth_conn_string_invalid_region.c_str(),
-                         SQL_NTS, out_conn_string, IT_SIZEOF(out_conn_string),
-                         &out_conn_string_length, SQL_DRIVER_COMPLETE);
-    EXPECT_EQ(SQL_ERROR,ret);
-}
-
-TEST(TestAwsAuthConnection, SqlDriverConnectInvalidAuthType) {
-    SQLRETURN ret;
-    TestAwsAuthConnection test;
-    SQLTCHAR out_conn_string[1024];
-    SQLSMALLINT out_conn_string_length;
-    ASSERT_NO_FATAL_FAILURE(test.AllocConnection());
-    ret = SQLDriverConnect(test.m_conn, NULL,
-                         (SQLTCHAR*)aws_auth_conn_string_invalid_authtype.c_str(),
-                         SQL_NTS, out_conn_string, IT_SIZEOF(out_conn_string),
-                         &out_conn_string_length, SQL_DRIVER_COMPLETE);
-    EXPECT_EQ(SQL_ERROR, ret);
-}
-
-int main(int argc, char** argv) {
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-    int failures = RUN_ALL_TESTS();
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-    return failures;
-}
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini
deleted file mode 100644
index bb43dd526e..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[ODBC Drivers]
-OpenSearchODBC = Installed
-
-[OpenSearchODBC]
-Driver = <project-root>/lib64/libsqlodbc.dylib
-Setup  = <project-root>/lib64/libsqlodbc.dylib
\ No newline at end of file
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt
deleted file mode 100644
index f27abdbcfd..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-project(itodbc_catalog)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_odbc_catalog.cpp)
-include_directories(	${UT_HELPER}
-						${IT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${VLD_SRC}  )
-
-# Generate executable
-add_executable(itodbc_catalog ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_code_coverage(itodbc_catalog PUBLIC AUTO ALL)
-target_link_libraries(itodbc_catalog sqlodbc itodbc_helper ut_helper GTest::gtest_main)
-target_compile_definitions(itodbc_catalog PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/packages.config b/sql-odbc/src/IntegrationTests/ITODBCCatalog/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.h b/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp b/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp
deleted file mode 100644
index 68c672a388..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp
+++ /dev/null
@@ -1,663 +0,0 @@
-// clang-format off
-#define NOMINMAX 1
-#include "pch.h"
-#include "unit_test_helper.h"
-#include "it_odbc_helper.h"
-#include <algorithm>
-// clang-format on
-
-// General test constants and structures
-#define BIND_SIZE 512
-typedef struct bind_info {
-    SQLUSMALLINT ordinal;
-    SQLSMALLINT target_type;
-    SQLPOINTER target;
-    SQLLEN buffer_len;
-    SQLLEN out_len;
-    bind_info(SQLUSMALLINT _ordinal, SQLSMALLINT _target_type) {
-        ordinal = _ordinal;
-        target_type = _target_type;
-        out_len = 0;
-        data.resize(BIND_SIZE, '\0');
-        buffer_len = data.size();
-        target = data.data();
-    }
-    std::string AsString() {
-        switch (target_type) {
-            case SQL_C_CHAR:
-                return reinterpret_cast< char* >(data.data());
-                break;
-            case SQL_C_LONG:
-                return std::to_string(
-                    *reinterpret_cast< unsigned long* >(data.data()));
-                break;
-            case SQL_C_SLONG:
-                return std::to_string(
-                    *reinterpret_cast< signed long* >(data.data()));
-                break;
-            case SQL_C_SHORT:
-                return std::to_string(
-                    *reinterpret_cast< signed short* >(data.data()));
-                break;
-            case SQL_C_SSHORT:
-                return std::to_string(
-                    *reinterpret_cast< unsigned short* >(data.data()));
-                break;
-            default:
-                return "Unknown conversion type (" + std::to_string(target_type)
-                       + ")";
-                break;
-        }
-    }
-
-   private:
-    std::vector< SQLCHAR > data;
-} bind_info;
-
-// Column test constants and macro
-const std::vector< std::string > flights_column_name = {
-    "FlightNum",       "Origin",         "FlightDelay",
-    "DistanceMiles",   "FlightTimeMin",  "OriginWeather",
-    "dayOfWeek",       "AvgTicketPrice", "Carrier",
-    "FlightDelayMin",  "OriginRegion",   "DestAirportID",
-    "FlightDelayType", "timestamp",      "Dest",
-    "FlightTimeHour",  "Cancelled",      "DistanceKilometers",
-    "OriginCityName",  "DestWeather",    "OriginCountry",
-    "DestCountry",     "DestRegion",     "DestCityName",
-    "OriginAirportID"};
-const std::vector< std::string > flights_data_type = {
-    "keyword", "keyword", "boolean", "float",   "float",   "keyword", "integer",
-    "float",   "keyword", "integer", "keyword", "keyword", "keyword", "date",
-    "keyword", "keyword", "boolean", "float",   "keyword", "keyword", "keyword",
-    "keyword", "keyword", "keyword", "keyword"};
-const std::vector< short > flights_sql_data_type = {
-    SQL_WVARCHAR, SQL_WVARCHAR, SQL_BIT,      SQL_REAL,           SQL_REAL,
-    SQL_WVARCHAR, SQL_INTEGER,  SQL_REAL,     SQL_WVARCHAR,       SQL_INTEGER,
-    SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_TYPE_TIMESTAMP, SQL_WVARCHAR,
-    SQL_WVARCHAR, SQL_BIT,      SQL_REAL,     SQL_WVARCHAR,       SQL_WVARCHAR,
-    SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR,       SQL_WVARCHAR};
-const std::string flights_catalog_opensearch = "opensearch-cluster";
-const std::string flights_catalog_elas = "opensearch";
-const std::string flights_table_name = "opensearch_dashboards_sample_data_flights";
-const std::string flights_decimal_digits = "10";
-const std::string flights_num_prec_radix = "2";
-
-class TestSQLColumns : public testing::Test {
-   public:
-    TestSQLColumns() {
-    }
-    void SetUp() {
-        AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env, &m_conn,
-                       &m_hstmt, true, true);
-    }
-    void TearDown() {
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-    ~TestSQLColumns() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-#define TEST_SQL_COLUMNS(test_name, catalog_patt, schema_patt, table_patt,   \
-                         column_patt, enable_pattern, empty)                 \
-    TEST_F(TestSQLColumns, test_name) {                                      \
-        EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(m_hstmt, SQL_ATTR_METADATA_ID, \
-                                              (void*)(!enable_pattern), 0)); \
-        SQLColumns(m_hstmt, catalog_patt, SQL_NTS, schema_patt, SQL_NTS,     \
-                   table_patt, SQL_NTS, column_patt, SQL_NTS);               \
-        size_t result_count = 0;                                             \
-        SQLRETURN ret;                                                       \
-        while ((ret = SQLFetch(m_hstmt)) == SQL_SUCCESS)                     \
-            result_count++;                                                  \
-        EXPECT_EQ(ret, SQL_NO_DATA);                                         \
-        if (empty)                                                           \
-            EXPECT_EQ(result_count, static_cast< size_t >(0));               \
-        else                                                                 \
-            EXPECT_FALSE(result_count == 0);                                 \
-    }
-
-// Table test constants and macro
-typedef struct table_data {
-    std::string catalog_name;
-    std::string schema_name;
-    std::string table_name;
-    std::string table_type;
-    std::string remarks;
-} table_data;
-
-const std::vector< table_data > table_data_filtered{
-    {"", "", "opensearch_dashboards_sample_data_ecommerce", "BASE TABLE", ""},
-    {"", "", "opensearch_dashboards_sample_data_flights", "BASE TABLE", ""},
-    {"", "", "opensearch_dashboards_sample_data_types", "BASE TABLE", ""}};
-const std::vector< table_data > table_data_single{
-    {"", "", "opensearch_dashboards_sample_data_flights", "BASE TABLE", ""}};
-const std::vector< table_data > table_data_all{
-    {"", "", "opensearch_dashboards_sample_data_ecommerce", "BASE TABLE", ""},
-    {"", "", "opensearch_dashboards_sample_data_flights", "BASE TABLE", ""},
-    {"", "", "opensearch_dashboards_sample_data_types", "BASE TABLE", ""},
-};
-const std::vector< table_data > excel_table_data_all{
-    {"", "", "opensearch_dashboards_sample_data_ecommerce", "TABLE", ""},
-    {"", "", "opensearch_dashboards_sample_data_flights", "TABLE", ""},
-    {"", "", "opensearch_dashboards_sample_data_types", "TABLE", ""},
-};
-const std::vector< table_data > table_data_types{
-    {"", "", "", "BASE TABLE", ""}};
-
-class TestSQLTables : public testing::Test {
-   public:
-    TestSQLTables() {
-    }
-    void SetUp() {
-        AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env, &m_conn,
-                       &m_hstmt, true, true);
-    }
-    void TearDown() {
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-    ~TestSQLTables() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-void CheckTableData(SQLHSTMT m_hstmt,
-                    const std::vector< table_data >& expected_tables) {
-    std::vector< bind_info > binds;
-    binds.push_back(bind_info(1, SQL_C_CHAR));
-    binds.push_back(bind_info(2, SQL_C_CHAR));
-    binds.push_back(bind_info(3, SQL_C_CHAR));
-    binds.push_back(bind_info(4, SQL_C_CHAR));
-
-    for (auto& it : binds)
-        SQLBindCol(m_hstmt, it.ordinal, it.target_type, it.target,
-                   it.buffer_len, &it.out_len);
-
-    SQLRETURN ret = SQL_ERROR;
-    if (expected_tables.empty()) {
-        // Verify that there is at least one table row.
-        size_t result_count = 0;
-        while ((ret = SQLFetch(m_hstmt)) == SQL_SUCCESS) {
-            result_count++;
-        }
-        EXPECT_TRUE(result_count != 0);
-    } else {
-        // Fetch list of table rows from the Statement.
-        std::vector< table_data > server_tables;
-        while ((ret = SQLFetch(m_hstmt)) == SQL_SUCCESS) {
-            table_data table = {binds[0].AsString(), binds[1].AsString(),
-                                binds[2].AsString(), binds[3].AsString(), ""};
-            server_tables.emplace_back(table);
-        }
-
-        // Make sure that all expected tables are found.
-        for (auto expected_table : expected_tables) {
-            EXPECT_TRUE(std::any_of(server_tables.begin(), server_tables.end(),
-                                    [&](const table_data& d) {
-                                        return d.table_name
-                                               == expected_table.table_name;
-                                    }));
-        }
-    }
-    EXPECT_EQ(ret, SQL_NO_DATA);
-}
-
-#define TEST_SQL_TABLES(test_name, catalog, schema, table, table_type, exp,    \
-                        enable_pattern, empty)                                 \
-    TEST_F(TestSQLTables, test_name) {                                         \
-        EXPECT_EQ(SQL_SUCCESS, SQLSetStmtAttr(m_hstmt, SQL_ATTR_METADATA_ID,   \
-                                              (void*)(!enable_pattern), 0));   \
-        SQLRETURN ret2 = SQLTables(m_hstmt, catalog, SQL_NTS, schema,          \
-                                            SQL_NTS, table, SQL_NTS,           \
-                                            table_type, SQL_NTS);              \
-        LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret2);                     \
-        if (empty) {                                                           \
-            size_t result_count = 0;                                           \
-            SQLRETURN ret;                                                     \
-            while ((ret = SQLFetch(m_hstmt)) == SQL_SUCCESS)                   \
-                result_count++;                                                \
-            EXPECT_EQ(ret, SQL_NO_DATA);                                       \
-            EXPECT_EQ(result_count, static_cast< size_t >(0));                 \
-        } else                                                                 \
-            CheckTableData(m_hstmt, exp);                                      \
-    }
-
-class TestSQLCatalogKeys : public testing::Test {
-   public:
-    TestSQLCatalogKeys() {
-    }
-    void SetUp() {
-        AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env, &m_conn,
-                       &m_hstmt, true, true);
-    }
-    void TearDown() {
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-    ~TestSQLCatalogKeys() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-#define TEST_SQL_KEYS(test_name, test_function, ...)                     \
-    TEST_F(TestSQLCatalogKeys, test_name) {                              \
-        EXPECT_TRUE(SQL_SUCCEEDED(test_function(m_hstmt, __VA_ARGS__))); \
-        size_t result_count = 0;                                         \
-        SQLRETURN ret;                                                   \
-        while ((ret = SQLFetch(m_hstmt)) == SQL_SUCCESS)                 \
-            result_count++;                                              \
-        EXPECT_EQ(ret, SQL_NO_DATA);                                     \
-        EXPECT_EQ(result_count, static_cast< size_t >(0));               \
-    }
-
-// SQL Tables Tests
-// NULL test
-TEST_SQL_TABLES(Null, NULL, NULL, NULL, NULL, table_data_all, true, false);
-
-// Catalog tests (error: catalogs not supported)
-TEST_F(TestSQLTables, WildCatalogs) {
-    SQLRETURN ret = SQLTables(m_hstmt, (SQLTCHAR*)L"%", SQL_NTS, (SQLTCHAR*)L"",
-                              SQL_NTS, (SQLTCHAR*)L"", SQL_NTS, NULL, SQL_NTS);
-    EXPECT_EQ(ret, SQL_ERROR);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-// Schema tests (error: schemas not supported)
-TEST_F(TestSQLTables, WildSchema) {
-    SQLRETURN ret = SQLTables(m_hstmt, (SQLTCHAR*)L"", SQL_NTS, (SQLTCHAR*)L"%",
-                              SQL_NTS, (SQLTCHAR*)L"", SQL_NTS, NULL, SQL_NTS);
-    EXPECT_EQ(ret, SQL_ERROR);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-// Table tests
-TEST_SQL_TABLES(ValidTable, NULL, NULL, (SQLTCHAR*)L"opensearch_dashboards_sample_data%", NULL,
-                table_data_filtered, true, false);
-TEST_SQL_TABLES(SingleTable, NULL, NULL,
-                (SQLTCHAR*)L"opensearch_dashboards_sample_data_flights", NULL,
-                table_data_single, false, false);
-TEST_SQL_TABLES(WildTable, NULL, NULL, (SQLTCHAR*)L"%", NULL, table_data_all,
-                true, false);
-TEST_SQL_TABLES(InvalidTable, NULL, NULL, (SQLTCHAR*)L"invalid_table", NULL, {},
-                false, true);
-
-// Table types tests
-TEST_SQL_TABLES(ValidTableType, (SQLTCHAR*)L"", (SQLTCHAR*)L"", (SQLTCHAR*)L"",
-                (SQLTCHAR*)L"%", table_data_types, false, false)
-TEST_SQL_TABLES(InvalidTableType, (SQLTCHAR*)L"", (SQLTCHAR*)L"",
-                (SQLTCHAR*)L"", (SQLTCHAR*)L"invalid_table_type",
-                table_data_types, false, true)
-
-// Excel SQLTables test
-TEST_SQL_TABLES(ExcelSQLTables, (SQLTCHAR*)L"%", NULL, NULL,
-                (SQLTCHAR*)L"TABLE,VIEW", excel_table_data_all, false, false);
-
-// SQL Columns Tests
-// NULL test
-TEST_SQL_COLUMNS(Null, NULL, NULL, NULL, NULL, true, false)
-
-// Table tests
-TEST_SQL_COLUMNS(ValidTable, NULL, NULL, (SQLTCHAR*)L"opensearch_dashboards_%", NULL, true,
-                 false)
-TEST_SQL_COLUMNS(InvalidTable, NULL, NULL, (SQLTCHAR*)L"invalid_table", NULL,
-                 true, true)
-
-// Column tests
-TEST_SQL_COLUMNS(ValidColumn, NULL, NULL, NULL, (SQLTCHAR*)L"FlightNum", true,
-                 false)
-TEST_SQL_COLUMNS(InvalidColumn, NULL, NULL, NULL, (SQLTCHAR*)L"invalid_column",
-                 true, true)
-
-// Table and column tests
-TEST_SQL_COLUMNS(ValidTable_ValidColumn, NULL, NULL, (SQLTCHAR*)L"opensearch_dashboards_%",
-                 NULL, true, false)
-TEST_SQL_COLUMNS(ValidTable_InvalidColumn, NULL, NULL, (SQLTCHAR*)L"opensearch_dashboards_%",
-                 (SQLTCHAR*)L"invalid_column", true, true)
-TEST_SQL_COLUMNS(InvalidTable_ValidColumn, NULL, NULL,
-                 (SQLTCHAR*)L"invalid_table", (SQLTCHAR*)L"FlightNum", true,
-                 true)
-TEST_SQL_COLUMNS(InvalidTable_InvalidColumn, NULL, NULL,
-                 (SQLTCHAR*)L"invalid_table", (SQLTCHAR*)L"invalid_column",
-                 true, true)
-
-// Data validation
-TEST_F(TestSQLColumns, FlightsValidation) {
-    EXPECT_EQ(SQL_SUCCESS, SQLColumns(m_hstmt, NULL, SQL_NTS, NULL, SQL_NTS,
-                                      (SQLTCHAR*)L"opensearch_dashboards_sample_data_flights",
-                                      SQL_NTS, NULL, SQL_NTS));
-    std::vector< bind_info > binds;
-    binds.push_back(bind_info(1, SQL_C_CHAR));
-    binds.push_back(bind_info(2, SQL_C_CHAR));
-    binds.push_back(bind_info(3, SQL_C_CHAR));
-    binds.push_back(bind_info(4, SQL_C_CHAR));
-    binds.push_back(bind_info(5, SQL_C_SHORT));
-    binds.push_back(bind_info(6, SQL_C_CHAR));
-    binds.push_back(bind_info(7, SQL_C_SLONG));
-    binds.push_back(bind_info(8, SQL_C_SLONG));
-    binds.push_back(bind_info(9, SQL_C_SSHORT));
-    binds.push_back(bind_info(10, SQL_C_SSHORT));
-    binds.push_back(bind_info(11, SQL_C_SSHORT));
-    binds.push_back(bind_info(12, SQL_C_CHAR));
-    binds.push_back(bind_info(13, SQL_C_CHAR));
-    binds.push_back(bind_info(14, SQL_C_SHORT));
-    binds.push_back(bind_info(15, SQL_C_SSHORT));
-    binds.push_back(bind_info(16, SQL_C_SLONG));
-    binds.push_back(bind_info(17, SQL_C_SLONG));
-    binds.push_back(bind_info(18, SQL_C_CHAR));
-
-    for (auto& it : binds)
-        SQLBindCol(m_hstmt, it.ordinal, it.target_type, it.target,
-                   it.buffer_len, &it.out_len);
-
-    size_t column_idx = 0;
-    while ((SQL_SUCCESS == SQLFetch(m_hstmt))
-           && (column_idx < std::min(flights_column_name.size(),
-                                     flights_data_type.size()))) {
-        size_t ordinal = 0;
-        for (auto& it : binds) {
-            ordinal++;
-            switch (ordinal) {
-                case 1:
-                    EXPECT_EQ(it.AsString(), "");
-                    break;
-                case 3:
-                    EXPECT_EQ(it.AsString(), flights_table_name);
-                    break;
-                case 4:
-                    EXPECT_EQ(it.AsString(), flights_column_name[column_idx]);
-                    break;
-                case 5:
-                    EXPECT_EQ(
-                        it.AsString(),
-                        std::to_string(flights_sql_data_type[column_idx]));
-                    break;
-                case 6:
-                    EXPECT_EQ(it.AsString(), flights_data_type[column_idx]);
-                    break;
-                case 10:
-                    EXPECT_EQ(it.AsString(), flights_decimal_digits);
-                    break;
-                case 11:
-                    EXPECT_EQ(it.AsString(), flights_num_prec_radix);
-                    break;
-                case 14:
-                    EXPECT_EQ(
-                        it.AsString(),
-                        std::to_string(flights_sql_data_type[column_idx]));
-                    break;
-                case 17:
-                    EXPECT_EQ(it.AsString(), std::to_string(column_idx + 1));
-                    break;
-                default:
-                    EXPECT_TRUE(
-                        ((it.AsString() == "0") || (it.AsString() == "")));
-                    break;
-            }
-        }
-        column_idx++;
-    }
-    EXPECT_EQ(column_idx, static_cast< size_t >(25));
-}
-
-// We expect an empty result set for PrimaryKeys and ForeignKeys
-// Tableau specified catalog and table
-// NULL args
-TEST_SQL_KEYS(PrimaryKeys_NULL, SQLPrimaryKeys, NULL, SQL_NTS, NULL, SQL_NTS,
-              NULL, SQL_NTS)
-TEST_SQL_KEYS(ForeignKeys_NULL, SQLForeignKeys, NULL, SQL_NTS, NULL, SQL_NTS,
-              NULL, SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS)
-
-// Catalog specified
-TEST_SQL_KEYS(PrimaryKeys_Catalog, SQLPrimaryKeys, NULL, SQL_NTS,
-              (SQLTCHAR*)L"opensearch-cluster", SQL_NTS, NULL, SQL_NTS)
-TEST_SQL_KEYS(ForeignKeys_Catalog, SQLForeignKeys, NULL, SQL_NTS, NULL, SQL_NTS,
-              NULL, SQL_NTS, NULL, SQL_NTS, (SQLTCHAR*)L"opensearch-cluster", SQL_NTS,
-              NULL, SQL_NTS)
-
-// Table specified
-TEST_SQL_KEYS(PrimaryKeys_Table, SQLPrimaryKeys, NULL, SQL_NTS, NULL, SQL_NTS,
-              (SQLTCHAR*)L"opensearch_dashboards_sample_data_flights", SQL_NTS)
-TEST_SQL_KEYS(ForeignKeys_Table, SQLForeignKeys, NULL, SQL_NTS, NULL, SQL_NTS,
-              NULL, SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS,
-              (SQLTCHAR*)L"opensearch_dashboards_sample_data_flights", SQL_NTS)
-
-// Catalog and table specified
-TEST_SQL_KEYS(PrimaryKeys_CatalogTable, SQLPrimaryKeys, NULL, SQL_NTS,
-              (SQLTCHAR*)L"opensearch-cluster", SQL_NTS,
-              (SQLTCHAR*)L"opensearch_dashboards_sample_data_flights", SQL_NTS)
-TEST_SQL_KEYS(ForeignKeys_CatalogTable, SQLForeignKeys, NULL, SQL_NTS, NULL,
-              SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS, (SQLTCHAR*)L"opensearch-cluster",
-              SQL_NTS, (SQLTCHAR*)L"opensearch_dashboards_sample_data_flights", SQL_NTS)
-
-// GetTypeInfo expected output struct
-typedef struct sample_data_getTypeInfo_struct {
-    std::string TYPE_NAME;
-    SQLSMALLINT DATA_TYPE;
-    SQLINTEGER COLUMN_SIZE;
-    std::string LITERAL_PREFIX;
-    std::string LITERAL_SUFFIX;
-    std::string CREATE_PARAMS;
-    SQLSMALLINT NULLABLE;
-    SQLSMALLINT CASE_SENSITIVE;
-    SQLSMALLINT SEARCHABLE;
-    SQLSMALLINT UNSIGNED_ATTRIBUTE;
-    SQLSMALLINT FIXED_PREC_SCALE;
-    SQLSMALLINT AUTO_UNIQUE_VALUE;
-    std::string LOCAL_TYPE_NAME;
-    SQLSMALLINT MINIMUM_SCALE;
-    SQLSMALLINT MAXIMUM_SCALE;
-    SQLSMALLINT SQL_DATA_TYPE;
-    SQLSMALLINT SQL_DATETIME_SUB;
-    SQLINTEGER NUM_PREC_RADIX;
-    SQLSMALLINT INTERVAL_PRECISION;
-} sample_data_getTypeInfo_struct;
-
-// GetTypeInfo expected output
-const std::vector< sample_data_getTypeInfo_struct > sample_data_all_types_info{
-    {"boolean", SQL_BIT, 1, "", "", "", 2, 0, 3, 1, 0, 0, "", 0, 0, SQL_BIT, 0,
-     10, 0},
-    {"byte", SQL_TINYINT, 3, "", "", "", 2, 0, 3, 0, 0, 0, "", 0, 0,
-     SQL_TINYINT, 0, 10, 0},
-    {"short", SQL_SMALLINT, 5, "", "", "", 2, 0, 3, 0, 0, 0, "", 0, 0,
-     SQL_SMALLINT, 0, 10, 0},
-    {"keyword", SQL_WVARCHAR, 256, "\'", "\'", "", 2, 1, 3, 1, 0, 0, "", 0, 0,
-     SQL_WVARCHAR, 0, 10, 0},
-    {"text", SQL_WVARCHAR, 2147483647, "\'", "\'", "", 2, 1, 3, 1, 0, 0, "", 0,
-     0, SQL_WVARCHAR, 0, 10, 0},
-    {"nested", SQL_WVARCHAR, 0, "\'", "\'", "", 2, 0, 3, 1, 0, 0, "", 0, 0,
-     SQL_WVARCHAR, 0, 10, 0},
-    {"object", SQL_WVARCHAR, 0, "\'", "\'", "", 2, 0, 3, 1, 0, 0, "", 0, 0,
-     SQL_WVARCHAR, 0, 10, 0},
-    {"integer", SQL_INTEGER, 10, "", "", "", 2, 0, 3, 0, 0, 0, "", 0, 0,
-     SQL_INTEGER, 0, 10, 0},
-    {"double", SQL_DOUBLE, 15, "", "", "", 2, 0, 3, 0, 0, 0, "", 0, 0,
-     SQL_DOUBLE, 0, 10, 0},
-    {"scaled_float", SQL_DOUBLE, 15, "", "", "", 2, 0, 3, 0, 0, 0, "", 0, 0,
-     SQL_DOUBLE, 0, 10, 0},
-    {"long", SQL_BIGINT, 19, "", "", "", 2, 0, 3, 0, 0, 0, "", 0, 0, SQL_BIGINT,
-     0, 10, 0},
-    {"half_float", SQL_REAL, 7, "", "", "", 2, 0, 3, 0, 0, 0, "", 0, 0,
-     SQL_REAL, 0, 10, 0},
-    {"float", SQL_REAL, 7, "", "", "", 2, 0, 3, 0, 0, 0, "", 0, 0, SQL_REAL, 0,
-     10, 0},
-    {"date", SQL_TYPE_TIMESTAMP, 24, "", "", "", 2, 0, 3, 1, 0, 0, "", 0, 0,
-     SQL_TYPE_TIMESTAMP, 0, 10, 0},
-    {"timestamp", SQL_TYPE_TIMESTAMP, 24, "", "", "", 2, 0, 3, 1, 0, 0, "", 0, 0,
-     SQL_TYPE_TIMESTAMP, 0, 10, 0}};
-
-const std::vector< sample_data_getTypeInfo_struct >
-    sample_data_single_type_multiple_row{
-        {"keyword", SQL_WVARCHAR, 256, "\'", "\'", "", 2, 1, 3, 1, 0, 0, "", 0,
-         0, SQL_WVARCHAR, 0, 10, 0},
-        {"text", SQL_WVARCHAR, 2147483647, "\'", "\'", "", 2, 1, 3, 1, 0, 0, "",
-         0, 0, SQL_WVARCHAR, 0, 10, 0},
-        {"nested", SQL_WVARCHAR, 0, "\'", "\'", "", 2, 0, 3, 1, 0, 0, "", 0, 0,
-         SQL_WVARCHAR, 0, 10, 0},
-        {"object", SQL_WVARCHAR, 0, "\'", "\'", "", 2, 0, 3, 1, 0, 0, "", 0, 0,
-         SQL_WVARCHAR, 0, 10, 0}};
-
-const std::vector< sample_data_getTypeInfo_struct >
-    sample_data_single_type_info{{"boolean", SQL_BIT, 1, "", "", "", 2, 0, 3, 1,
-                                  0, 0, "", 0, 0, SQL_BIT, 0, 10, 0}};
-
-const std::vector< sample_data_getTypeInfo_struct > sample_data_empty{};
-
-void CheckGetTypeInfoData(
-    SQLHSTMT m_hstmt,
-    const std::vector< sample_data_getTypeInfo_struct >& sample_data) {
-    std::vector< bind_info > binds;
-    binds.push_back(bind_info(1, SQL_C_CHAR));
-    binds.push_back(bind_info(2, SQL_C_SHORT));
-    binds.push_back(bind_info(3, SQL_C_LONG));
-    binds.push_back(bind_info(4, SQL_C_CHAR));
-    binds.push_back(bind_info(5, SQL_C_CHAR));
-    binds.push_back(bind_info(6, SQL_C_CHAR));
-    binds.push_back(bind_info(7, SQL_C_SHORT));
-    binds.push_back(bind_info(8, SQL_C_SHORT));
-    binds.push_back(bind_info(9, SQL_C_SHORT));
-    binds.push_back(bind_info(10, SQL_C_SHORT));
-    binds.push_back(bind_info(11, SQL_C_SHORT));
-    binds.push_back(bind_info(12, SQL_C_SHORT));
-    binds.push_back(bind_info(13, SQL_C_CHAR));
-    binds.push_back(bind_info(14, SQL_C_SHORT));
-    binds.push_back(bind_info(15, SQL_C_SHORT));
-    binds.push_back(bind_info(16, SQL_C_SHORT));
-    binds.push_back(bind_info(17, SQL_C_SHORT));
-    binds.push_back(bind_info(18, SQL_C_LONG));
-    binds.push_back(bind_info(19, SQL_C_SHORT));
-
-    for (auto& it : binds)
-        SQLBindCol(m_hstmt, it.ordinal, it.target_type, it.target,
-                   it.buffer_len, &it.out_len);
-
-    SQLRETURN ret = SQL_ERROR;
-    if (sample_data.empty()) {
-        size_t result_count = 0;
-        while ((ret = SQLFetch(m_hstmt)) == SQL_SUCCESS)
-            result_count++;
-        EXPECT_TRUE(result_count != 0);
-    } else {
-        size_t result_count = 0;
-        for (; ((ret = SQLFetch(m_hstmt)) == SQL_SUCCESS)
-               && (result_count < sample_data.size());
-             result_count++) {
-            auto it =
-                std::find_if(sample_data.begin(), sample_data.end(),
-                             [&](const sample_data_getTypeInfo_struct& d) {
-                                 return d.TYPE_NAME == binds[0].AsString();
-                             });
-            ASSERT_NE(it, sample_data.end());
-            EXPECT_EQ(binds[0].AsString(), it->TYPE_NAME);
-            EXPECT_EQ(binds[1].AsString(), std::to_string(it->DATA_TYPE));
-            EXPECT_EQ(binds[2].AsString(), std::to_string(it->COLUMN_SIZE));
-            EXPECT_EQ(binds[3].AsString(), it->LITERAL_PREFIX);
-            EXPECT_EQ(binds[4].AsString(), it->LITERAL_SUFFIX);
-            EXPECT_EQ(binds[5].AsString(), it->CREATE_PARAMS);
-            EXPECT_EQ(binds[6].AsString(), std::to_string(it->NULLABLE));
-            EXPECT_EQ(binds[7].AsString(), std::to_string(it->CASE_SENSITIVE));
-            EXPECT_EQ(binds[8].AsString(), std::to_string(it->SEARCHABLE));
-            EXPECT_EQ(binds[9].AsString(),
-                      std::to_string(it->UNSIGNED_ATTRIBUTE));
-            EXPECT_EQ(binds[10].AsString(),
-                      std::to_string(it->FIXED_PREC_SCALE));
-            EXPECT_EQ(binds[11].AsString(),
-                      std::to_string(it->AUTO_UNIQUE_VALUE));
-            EXPECT_EQ(binds[12].AsString(), it->LOCAL_TYPE_NAME);
-            EXPECT_EQ(binds[13].AsString(), std::to_string(it->MINIMUM_SCALE));
-            EXPECT_EQ(binds[14].AsString(), std::to_string(it->MAXIMUM_SCALE));
-            EXPECT_EQ(binds[15].AsString(), std::to_string(it->SQL_DATA_TYPE));
-            EXPECT_EQ(binds[16].AsString(),
-                      std::to_string(it->SQL_DATETIME_SUB));
-            EXPECT_EQ(binds[17].AsString(), std::to_string(it->NUM_PREC_RADIX));
-            EXPECT_EQ(binds[18].AsString(),
-                      std::to_string(it->INTERVAL_PRECISION));
-        }
-        EXPECT_EQ(result_count, sample_data.size());
-    }
-    EXPECT_EQ(ret, SQL_NO_DATA);
-}
-
-class TestSQLGetTypeInfo : public testing::Test {
-   public:
-    TestSQLGetTypeInfo() {
-    }
-    void SetUp() {
-        AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env, &m_conn,
-                       &m_hstmt, true, true);
-    }
-    void TearDown() {
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-    ~TestSQLGetTypeInfo() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-#define TEST_SQL_GET_TYPE_INFO(test_name, data_type, empty, exp_out)    \
-    TEST_F(TestSQLGetTypeInfo, test_name) {                             \
-        EXPECT_TRUE(SQL_SUCCEEDED(SQLGetTypeInfo(m_hstmt, data_type))); \
-        if (empty) {                                                    \
-            size_t result_count = 0;                                    \
-            SQLRETURN ret;                                              \
-            while ((ret = SQLFetch(m_hstmt)) == SQL_SUCCESS)            \
-                result_count++;                                         \
-            EXPECT_EQ(ret, SQL_NO_DATA);                                \
-            EXPECT_EQ(result_count, static_cast< size_t >(0));          \
-        } else                                                          \
-            CheckGetTypeInfoData(m_hstmt, exp_out);                     \
-    }
-
-TEST_SQL_GET_TYPE_INFO(AllTypes, SQL_ALL_TYPES, 0, sample_data_all_types_info)
-
-TEST_SQL_GET_TYPE_INFO(SingleTypeMultipleRows, SQL_WVARCHAR, 0,
-                       sample_data_single_type_multiple_row)
-
-TEST_SQL_GET_TYPE_INFO(SingleType, SQL_BIT, 0, sample_data_single_type_info)
-
-TEST_SQL_GET_TYPE_INFO(UnsupportedType, SQL_DECIMAL, 1, sample_data_empty)
-
-int main(int argc, char** argv) {
-#ifdef __APPLE__
-    // Enable malloc logging for detecting memory leaks.
-    system("export MallocStackLogging=1");
-#endif
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-
-    int failures = RUN_ALL_TESTS();
-
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-#ifdef __APPLE__
-    // Disable malloc logging and report memory leaks
-    system("unset MallocStackLogging");
-    system("leaks itodbc_catalog > leaks_itodbc_catalog");
-#endif
-    return failures;
-}
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt
deleted file mode 100644
index 81a028b266..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-project(itodbc_connection)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_odbc_connection.cpp)
-include_directories(	${UT_HELPER}
-						${IT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${VLD_SRC}  )
-
-# Generate executable
-add_executable(itodbc_connection ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_code_coverage(itodbc_connection PUBLIC AUTO ALL)
-target_link_libraries(itodbc_connection sqlodbc itodbc_helper ut_helper GTest::gtest_main)
-target_compile_definitions(itodbc_connection PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/packages.config b/sql-odbc/src/IntegrationTests/ITODBCConnection/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.h b/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg
deleted file mode 100644
index 5fbdc93f42..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg
+++ /dev/null
@@ -1,21 +0,0 @@
-Windows Registry Editor Version 5.00
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
-"OpenSearchODBC"="Installed"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\OpenSearchODBC]
-"Driver"="<project-root>\\bin64\\Release\\sqlodbc.dll"
-"Setup"="<project-root>\\bin64\\Release\\sqlodbc.dll"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\ODBC Data Sources]
-"test_dsn"="OpenSearchODBC"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\test_dsn]
-"host"="localhost"
-"port"="9200"
-"user"="admin"
-"password"="admin"
-"auth"="BASIC"
-"useSSL"="0"
-"responseTimeout"="10"
-
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc.ini b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc.ini
deleted file mode 100644
index b514035af9..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[ODBC Data Sources]
-test_dsn        = OpenSearchODBC
-
-[test_dsn]
-host            = localhost
-port            = 9200
-user            = admin
-password        = admin
-auth            = BASIC
-useSSL          = 0
-responseTimeout = 10
\ No newline at end of file
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc_connection.cpp b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc_connection.cpp
deleted file mode 100644
index 3bdd70aa7b..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc_connection.cpp
+++ /dev/null
@@ -1,547 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "unit_test_helper.h"
-#include "it_odbc_helper.h"
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-#include <sql.h>
-#include <sqlext.h>
-#include <iostream>
-#include <chrono>
-// clang-format on
-
-#define IT_SIZEOF(x) (NULL == (x) ? 0 : (sizeof((x)) / sizeof((x)[0])))
-
-// SQLConnect constants
-const SQLCHAR invalid_dsn_charwidth[]{"test_dsn"};
-std::wstring wdsn_name = L"test_dsn";
-std::wstring user = L"admin";
-std::wstring pass = L"admin";
-
-// SQLDriverConnect constants
-std::wstring dsn_conn_string = L"DSN=test_dsn";
-
-class TestSQLConnect : public testing::Test {
-   public:
-    TestSQLConnect() {
-    }
-
-    void SetUp() {
-        AllocConnection(&m_env, &m_conn, true, true);
-    }
-
-    void TearDown() {
-        if (SQL_NULL_HDBC != m_conn) {
-            SQLFreeHandle(SQL_HANDLE_DBC, m_conn);
-            SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-        }
-    }
-
-    ~TestSQLConnect() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-};
-
-TEST_F(TestSQLConnect, SqlSuccess) {
-    SQLRETURN ret = SQLConnect(
-        m_conn, (SQLTCHAR*)wdsn_name.c_str(), SQL_NTS, (SQLTCHAR*)user.c_str(),
-        static_cast< SQLSMALLINT >(user.length()), (SQLTCHAR*)pass.c_str(),
-        static_cast< SQLSMALLINT >(pass.length()));
-
-    LogAnyDiagnostics(SQL_HANDLE_DBC, m_conn, ret);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLConnect, SqlError) {
-    SQLRETURN ret = SQLConnect(
-        m_conn, (SQLTCHAR*)invalid_dsn_charwidth, SQL_NTS,
-        (SQLTCHAR*)user.c_str(), static_cast< SQLSMALLINT >(user.length()),
-        (SQLTCHAR*)pass.c_str(), static_cast< SQLSMALLINT >(pass.length()));
-
-    LogAnyDiagnostics(SQL_HANDLE_DBC, m_conn, ret);
-    EXPECT_EQ(SQL_ERROR, ret);
-}
-
-class TestSQLDriverConnect : public testing::Test {
-   public:
-    TestSQLDriverConnect() {
-    }
-
-    void SetUp() {
-        AllocConnection(&m_env, &m_conn, true, true);
-    }
-
-    void TearDown() {
-        if (SQL_NULL_HDBC != m_conn) {
-            SQLFreeHandle(SQL_HANDLE_DBC, m_conn);
-            SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-        }
-    }
-
-    ~TestSQLDriverConnect() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLTCHAR m_out_conn_string[1024];
-    SQLSMALLINT m_out_conn_string_length;
-};
-
-TEST_F(TestSQLDriverConnect, DSNConnectionString) {
-    SQLRETURN ret = SQLDriverConnect(
-        m_conn, NULL, (SQLTCHAR*)dsn_conn_string.c_str(), SQL_NTS,
-        m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-        &m_out_conn_string_length, SQL_DRIVER_COMPLETE);
-
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLDriverConnect, SqlDriverPrompt) {
-    SQLRETURN ret =
-        SQLDriverConnect(m_conn, NULL, (SQLTCHAR*)conn_string.c_str(), SQL_NTS,
-                         m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                         &m_out_conn_string_length, SQL_DRIVER_PROMPT);
-
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLDriverConnect, SqlDriverComplete) {
-    SQLRETURN ret =
-        SQLDriverConnect(m_conn, NULL, (SQLTCHAR*)conn_string.c_str(), SQL_NTS,
-                         m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                         &m_out_conn_string_length, SQL_DRIVER_COMPLETE);
-
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLDriverConnect, SqlDriverCompleteRequired) {
-    SQLRETURN ret = SQLDriverConnect(
-        m_conn, NULL, (SQLTCHAR*)conn_string.c_str(), SQL_NTS,
-        m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-        &m_out_conn_string_length, SQL_DRIVER_COMPLETE_REQUIRED);
-
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLDriverConnect, SqlDriverNoprompt) {
-    SQLRETURN ret =
-        SQLDriverConnect(m_conn, NULL, (SQLTCHAR*)conn_string.c_str(), SQL_NTS,
-                         m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                         &m_out_conn_string_length, SQL_DRIVER_NOPROMPT);
-
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-// TODO #41 - Revisit when parser code
-// This should return SQL_SUCCESS_WITH_INFO
-TEST_F(TestSQLDriverConnect, InvalidDriver) {
-    std::wstring invalid_driver_conn_string =
-         use_ssl ? L"Driver=xxxx;"
-                   L"host=https://localhost;port=5432;"
-                   L"user=admin;password=admin;auth=BASIC;useSSL=1;"
-                   L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                   L"responseTimeout=10;"
-                 : L"Driver=xxxx;"
-                   L"host=localhost;port=5432;"
-                   L"user=admin;password=admin;auth=BASIC;useSSL=0;"
-                   L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                   L"responseTimeout=10;";
-
-    SQLRETURN ret = SQLDriverConnect(
-        m_conn, NULL, (SQLTCHAR*)invalid_driver_conn_string.c_str(), SQL_NTS,
-        m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-        &m_out_conn_string_length, SQL_DRIVER_COMPLETE);
-    EXPECT_EQ(SQL_ERROR, ret);
- }
-
-TEST_F(TestSQLDriverConnect, InvalidHost) {
-    std::wstring invalid_host_conn_string =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://8.8.8.8;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=1;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=8.8.8.8;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=1;";
-
-    SQLRETURN ret = SQLDriverConnect(
-        m_conn, NULL, (SQLTCHAR*)invalid_host_conn_string.c_str(), SQL_NTS,
-        m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-        &m_out_conn_string_length, SQL_DRIVER_COMPLETE);
-    EXPECT_EQ(SQL_ERROR, ret);
-}
-
-TEST_F(TestSQLDriverConnect, InvalidPort) {
-    std::wstring invalid_port_conn_string =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://localhost;port=5432;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=localhost;port=5432;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;";
-
-    SQLRETURN ret = SQLDriverConnect(
-        m_conn, NULL, (SQLTCHAR*)invalid_port_conn_string.c_str(), SQL_NTS,
-        m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-        &m_out_conn_string_length, SQL_DRIVER_COMPLETE);
-    EXPECT_EQ(SQL_ERROR, ret);
-}
-
-// TODO #41 - Revisit when parser code
-// This should return SQL_SUCCESS_WITH_INFO (SQLSTATE 01S00 - Invalid connection
-// string attribute)
-TEST_F(TestSQLDriverConnect, UnsupportedKeyword) {
-    std::wstring unsupported_keyword_conn_string =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://localhost;port=5432;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;extra=1"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=localhost;port=5432;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;extra=1";
-
-    SQLRETURN ret = SQLDriverConnect(
-        m_conn, NULL, (SQLTCHAR*)unsupported_keyword_conn_string.c_str(),
-        SQL_NTS, m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-        &m_out_conn_string_length, SQL_DRIVER_COMPLETE);
-    EXPECT_EQ(SQL_ERROR, ret);
-}
-
-TEST_F(TestSQLDriverConnect, ConnStringAbbrevsUID) {
-    std::wstring abbrev_str =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://localhost;port=9200;"
-                  L"UID=admin;password=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=localhost;port=9200;"
-                  L"UID=admin;password=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;";
-
-    SQLRETURN ret =
-        SQLDriverConnect(m_conn, NULL, (SQLTCHAR*)abbrev_str.c_str(), SQL_NTS,
-                         m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                         &m_out_conn_string_length, SQL_DRIVER_NOPROMPT);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLDriverConnect, ConnStringAbbrevsPWD) {
-    std::wstring abbrev_str =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://localhost;port=9200;"
-                  L"user=admin;PWD=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=localhost;port=9200;"
-                  L"user=admin;PWD=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;";
-
-    SQLRETURN ret =
-        SQLDriverConnect(m_conn, NULL, (SQLTCHAR*)abbrev_str.c_str(), SQL_NTS,
-                         m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                         &m_out_conn_string_length, SQL_DRIVER_NOPROMPT);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLDriverConnect, ConnStringAbbrevsUIDPWD) {
-    std::wstring abbrev_str =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://localhost;port=9200;"
-                  L"UID=admin;PWD=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=localhost;port=9200;"
-                  L"UID=admin;PWD=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;";
-
-    SQLRETURN ret =
-        SQLDriverConnect(m_conn, NULL, (SQLTCHAR*)abbrev_str.c_str(), SQL_NTS,
-                         m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                         &m_out_conn_string_length, SQL_DRIVER_NOPROMPT);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLDriverConnect, ConnStringAbbrevsHost) {
-    std::wstring abbrev_str =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=localhost;port=9200;"
-                  L"UID=admin;PWD=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=localhost;port=9200;"
-                  L"UID=admin;PWD=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;";
-
-    SQLRETURN ret =
-        SQLDriverConnect(m_conn, NULL, (SQLTCHAR*)abbrev_str.c_str(), SQL_NTS,
-                         m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                         &m_out_conn_string_length, SQL_DRIVER_NOPROMPT);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLDriverConnect, ConnStringAbbrevsHostProtocol) {
-    std::wstring abbrev_str =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://localhost;port=9200;"
-                  L"UID=admin;PWD=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=http://localhost;port=9200;"
-                  L"UID=admin;PWD=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;";
-
-    SQLRETURN ret =
-        SQLDriverConnect(m_conn, NULL, (SQLTCHAR*)abbrev_str.c_str(), SQL_NTS,
-                         m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                         &m_out_conn_string_length, SQL_DRIVER_NOPROMPT);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLDriverConnect, ConnStringAbbrevsServer) {
-    std::wstring abbrev_str =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"server=https://localhost;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"server=localhost;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;";
-
-    SQLRETURN ret =
-        SQLDriverConnect(m_conn, NULL, (SQLTCHAR*)abbrev_str.c_str(), SQL_NTS,
-                         m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                         &m_out_conn_string_length, SQL_DRIVER_NOPROMPT);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLDriverConnect, ConnStringAbbrevsServerUIDPWD) {
-    std::wstring abbrev_str =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"server=https://localhost;port=9200;"
-                  L"UID=admin;PWD=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"server=localhost;port=9200;"
-                  L"UID=admin;PWD=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;";
-
-    SQLRETURN ret =
-        SQLDriverConnect(m_conn, NULL, (SQLTCHAR*)abbrev_str.c_str(), SQL_NTS,
-                         m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                         &m_out_conn_string_length, SQL_DRIVER_NOPROMPT);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-}
-
-TEST_F(TestSQLDriverConnect, Timeout1Second) {
-    std::wstring one_second_timeout =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://8.8.8.8;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=1;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=8.8.8.8;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=1;";
-
-    auto start = std::chrono::steady_clock::now();
-    SQLRETURN ret = SQLDriverConnect(
-        m_conn, NULL, (SQLTCHAR*)one_second_timeout.c_str(), SQL_NTS,
-        m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-        &m_out_conn_string_length, SQL_DRIVER_COMPLETE);
-    auto end = std::chrono::steady_clock::now();
-    auto time =
-        std::chrono::duration_cast< std::chrono::milliseconds >(end - start)
-            .count();
-    std::cout << "TIME: " << time << std::endl;
-    EXPECT_EQ(SQL_ERROR, ret);
-#ifdef WIN32
-    // Windows rounds up to nearest 4s with timeout, another user reported this
-    // issue:
-    // https://social.msdn.microsoft.com/Forums/vstudio/en-US/42ae1b2f-b120-4b46-9417-e594c3d02a5f/does-winhttpsettimeouts-support-small-timeouts?forum=vcgeneral
-    EXPECT_GT(time, 3400);
-    EXPECT_LT(time, 4500);
-#else
-    EXPECT_GT(time, 500);
-    EXPECT_LT(time, 1500);
-#endif
-}
-
-TEST_F(TestSQLDriverConnect, Timeout3Second) {
-    std::wstring one_second_timeout =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://8.8.8.8;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=3;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=8.8.8.8;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=3;";
-
-    auto start = std::chrono::steady_clock::now();
-    SQLRETURN ret = SQLDriverConnect(
-        m_conn, NULL, (SQLTCHAR*)one_second_timeout.c_str(), SQL_NTS,
-        m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-        &m_out_conn_string_length, SQL_DRIVER_COMPLETE);
-    auto end = std::chrono::steady_clock::now();
-    auto time =
-        std::chrono::duration_cast< std::chrono::milliseconds >(end - start)
-            .count();
-    std::cout << "TIME: " << time << std::endl;
-    EXPECT_EQ(SQL_ERROR, ret);
-#ifdef WIN32
-    // Windows rounds up to nearest 4s with timeout, another user reported this
-    // issue:
-    // https://social.msdn.microsoft.com/Forums/vstudio/en-US/42ae1b2f-b120-4b46-9417-e594c3d02a5f/does-winhttpsettimeouts-support-small-timeouts?forum=vcgeneral
-    EXPECT_GT(time, 3500);
-    EXPECT_LT(time, 4500);
-#else
-    EXPECT_GT(time, 2500);
-    EXPECT_LT(time, 3500);
-#endif
-}
-
-TEST_F(TestSQLDriverConnect, Timeout7Second) {
-    std::wstring seven_second_timeout =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://8.8.8.8;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=1;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=7;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=8.8.8.8;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL=0;"
-                  L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=7;";
-
-    auto start = std::chrono::steady_clock::now();
-    SQLRETURN ret = SQLDriverConnect(
-        m_conn, NULL, (SQLTCHAR*)seven_second_timeout.c_str(), SQL_NTS,
-        m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-        &m_out_conn_string_length, SQL_DRIVER_COMPLETE);
-    auto end = std::chrono::steady_clock::now();
-    auto time =
-        std::chrono::duration_cast< std::chrono::milliseconds >(end - start)
-            .count();
-    std::cout << "TIME: " << time << std::endl;
-    EXPECT_EQ(SQL_ERROR, ret);
-#ifdef WIN32
-    // Windows rounds up to nearest 4s with timeout, another user reported this
-    // issue:
-    // https://social.msdn.microsoft.com/Forums/vstudio/en-US/42ae1b2f-b120-4b46-9417-e594c3d02a5f/does-winhttpsettimeouts-support-small-timeouts?forum=vcgeneral
-    EXPECT_GT(time, 7500);
-    EXPECT_LT(time, 8500);
-#else
-    EXPECT_GT(time, 6500);
-    EXPECT_LT(time, 7500);
-#endif
-}
-
-class TestSQLDisconnect : public testing::Test {
-   public:
-    TestSQLDisconnect() {
-    }
-
-    void SetUp() {
-    }
-
-    void TearDown() {
-        if (m_conn != SQL_NULL_HDBC) {
-            SQLFreeHandle(SQL_HANDLE_DBC, m_conn);
-        }
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-
-    ~TestSQLDisconnect() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-};
-
-TEST_F(TestSQLDisconnect, TestSuccess) {
-    ASSERT_NO_THROW(ITDriverConnect((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                    &m_conn, true, true));
-    EXPECT_EQ(SQL_SUCCESS, SQLDisconnect(m_conn));
-}
-
-TEST_F(TestSQLDisconnect, TestReconnectOnce) {
-    for (int i = 0; i <= 1; i++) {
-        ASSERT_NO_THROW((ITDriverConnect((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                         &m_conn, true, true)));
-        EXPECT_EQ(SQL_SUCCESS, SQLDisconnect(m_conn));
-    }
-}
-
-TEST_F(TestSQLDisconnect, TestReconnectMultipleTimes) {
-    for (int i = 0; i <= 10; i++) {
-        ASSERT_NO_THROW((ITDriverConnect((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                         &m_conn, true, true)));
-        EXPECT_EQ(SQL_SUCCESS, SQLDisconnect(m_conn));
-    }
-}
-
-TEST_F(TestSQLDisconnect, TestDisconnectWithoutConnect) {
-    ASSERT_NO_THROW(SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &m_env));
-    ASSERT_NO_THROW(SQLAllocHandle(SQL_HANDLE_DBC, m_env, &m_conn));
-    EXPECT_EQ(SQL_ERROR, SQLDisconnect(m_conn));
-}
-
-int main(int argc, char** argv) {
-#ifdef __APPLE__
-    // Enable malloc logging for detecting memory leaks.
-    system("export MallocStackLogging=1");
-#endif
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-
-    int failures = RUN_ALL_TESTS();
-
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-#ifdef __APPLE__
-    // Disable malloc logging and report memory leaks
-    system("unset MallocStackLogging");
-    system("leaks itodbc_connection > leaks_itodbc_connection");
-#endif
-    return failures;
-}
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbcinst.ini b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbcinst.ini
deleted file mode 100644
index 9b0084a4b1..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbcinst.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[ODBC Drivers]
-OpenSearchODBC = Installed
-
-[OpenSearchODBC]
-Driver = <project-root>/lib64/libsqlodbc.dylib
-Setup  = <project-root>/lib64/libsqlodbc.dylib
-
-[OpenSearch Unicode]
-logOutput = C:\
diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt
deleted file mode 100644
index 8e83be637b..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-project(itodbc_descriptors)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_odbc_descriptors.cpp)
-include_directories(	${UT_HELPER}
-						${IT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${VLD_SRC}  )
-
-# Generate executable
-add_executable(itodbc_descriptors ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_code_coverage(itodbc_descriptors PUBLIC AUTO ALL)
-target_link_libraries(itodbc_descriptors sqlodbc itodbc_helper ut_helper GTest::gtest_main)
-target_compile_definitions(itodbc_descriptors PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/packages.config b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.h b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/test_odbc_descriptors.cpp b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/test_odbc_descriptors.cpp
deleted file mode 100644
index 968690025e..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/test_odbc_descriptors.cpp
+++ /dev/null
@@ -1,605 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "unit_test_helper.h"
-#include "it_odbc_helper.h"
-// clang-format on
-
-const std::wstring data_set = L"opensearch_dashboards_sample_data_flights";
-const std::wstring single_col = L"Origin";
-const std::wstring single_row = L"1";
-const uint64_t multi_row_cnt = 25;
-const uint64_t multi_col_cnt = 25;
-const uint64_t single_col_cnt = 1;
-const std::wstring multi_col = L"*";
-
-inline void ExecuteQuery(const std::wstring& column,
-                         const std::wstring& dataset, const std::wstring& count,
-                         SQLHSTMT* hstmt) {
-    std::wstring statement = QueryBuilder(column, dataset, count);
-    SQLRETURN ret = SQLExecDirect(*hstmt, (SQLTCHAR*)statement.c_str(),
-                                  (SQLINTEGER)statement.length());
-    LogAnyDiagnostics(SQL_HANDLE_STMT, *hstmt, ret);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-}
-
-class TestSQLCopyDesc : public testing::Test {
-   public:
-    TestSQLCopyDesc() {
-    }
-
-    void SetUp() {
-        AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env, &m_conn,
-                       &m_hstmt, true, true);
-        SQLAllocHandle(SQL_HANDLE_STMT, m_conn, &m_hstmt_copy);
-    }
-
-    void TearDown() {
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-
-    ~TestSQLCopyDesc() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-    SQLHSTMT m_hstmt_copy = SQL_NULL_HSTMT;
-    SQLHDESC m_ard_hdesc = SQL_NULL_HDESC;
-    SQLHDESC m_ard_hdesc_copy = SQL_NULL_HDESC;
-    SQLHDESC m_ird_hdesc_copy = SQL_NULL_HDESC;
-};
-
-TEST_F(TestSQLCopyDesc, TestCopyArdToArd) {
-    ExecuteQuery(multi_col, data_set, std::to_wstring(multi_row_cnt), &m_hstmt);
-
-    SQLGetStmtAttr(m_hstmt, SQL_ATTR_APP_ROW_DESC, &m_ard_hdesc, 0, NULL);
-    SQLGetStmtAttr(m_hstmt_copy, SQL_ATTR_APP_ROW_DESC, &m_ard_hdesc_copy, 0,
-                   NULL);
-
-    EXPECT_EQ(SQL_SUCCESS, SQLCopyDesc(m_ard_hdesc, m_ard_hdesc_copy));
-}
-
-TEST_F(TestSQLCopyDesc, TestNotCopyArdToIrd) {
-    ExecuteQuery(multi_col, data_set, std::to_wstring(multi_row_cnt), &m_hstmt);
-
-    SQLGetStmtAttr(m_hstmt, SQL_ATTR_APP_ROW_DESC, &m_ard_hdesc, 0, NULL);
-    SQLGetStmtAttr(m_hstmt_copy, SQL_ATTR_IMP_ROW_DESC, &m_ird_hdesc_copy, 0,
-                   NULL);
-
-    EXPECT_EQ(SQL_ERROR, SQLCopyDesc(m_ard_hdesc, m_ird_hdesc_copy));
-    EXPECT_TRUE(CheckSQLSTATE(SQL_HANDLE_DESC, m_ird_hdesc_copy,
-                              SQLSTATE_GENERAL_ERROR, true));
-}
-
-class TestSQLSetDescField : public testing::Test {
-   public:
-    TestSQLSetDescField() {
-    }
-
-    void SetUp() {
-        AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env, &m_conn,
-                       &m_hstmt, true, true);
-        SQLGetStmtAttr(m_hstmt, SQL_ATTR_APP_ROW_DESC, &m_ard_hdesc, 0, NULL);
-        SQLGetStmtAttr(m_hstmt, SQL_ATTR_IMP_ROW_DESC, &m_ird_hdesc, 0, NULL);
-    }
-
-    void TearDown() {
-        if (m_ard_hdesc != SQL_NULL_HDESC) {
-            SQLFreeHandle(SQL_HANDLE_DESC, m_ard_hdesc);
-        }
-        if (m_ird_hdesc != SQL_NULL_HDESC) {
-            SQLFreeHandle(SQL_HANDLE_DESC, m_ird_hdesc);
-        }
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-
-    ~TestSQLSetDescField() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-    SQLHDESC m_ard_hdesc = SQL_NULL_HDESC;
-    SQLHDESC m_ird_hdesc = SQL_NULL_HDESC;
-    SQLSMALLINT m_rec_number = 0;
-    SQLSMALLINT m_field_identifier;
-    SQLINTEGER m_buffer_length = SQL_NTS;
-};
-
-// Template for tests of SQLSetDescField
-#define TEST_SQL_SET_DESC_FIELD(test_name, identifier, buffer_length, rec_num, \
-                                value_ptr_assignment, expected_val, hdesc,     \
-                                check_state)                                   \
-    TEST_F(TestSQLSetDescField, test_name) {                                   \
-        ExecuteQuery(multi_col, data_set, std::to_wstring(multi_row_cnt),      \
-                     &m_hstmt);                                                \
-        m_field_identifier = identifier;                                       \
-        m_buffer_length = buffer_length;                                       \
-        m_rec_number = rec_num;                                                \
-        value_ptr_assignment;                                                  \
-        EXPECT_EQ(expected_val,                                                \
-                  SQLSetDescField(hdesc, m_rec_number, m_field_identifier,     \
-                                  (SQLPOINTER)m_value_ptr, m_buffer_length));  \
-        if (check_state)                                                       \
-            EXPECT_TRUE(                                                       \
-                CheckSQLSTATE(SQL_HANDLE_DESC, hdesc,                          \
-                              SQLSTATE_INVALID_DESCRIPTOR_FIELD_IDENTIFIER));  \
-    }
-#ifdef WIN32
-#pragma warning(push)
-// This warning detects an attempt to assign a 32-bit value to a 64-bit pointer
-// type
-#pragma warning(disable : 4312)
-#elif defined(__APPLE__)
-// This warning detects casts from integer types to void*.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast"
-#endif  // WIN32
-
-// Descriptor Header Fields Tests
-
-TEST_SQL_SET_DESC_FIELD(Test_SQL_DESC_ALLOC_TYPE, SQL_DESC_ALLOC_TYPE,
-                        SQL_IS_SMALLINT, 0,
-                        SQLSMALLINT m_value_ptr = SQL_DESC_ALLOC_USER;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(Test_SQL_DESC_ARRAY_SIZE, SQL_DESC_ARRAY_SIZE, SQL_NTS,
-                        0, SQLULEN m_value_ptr = single_col_cnt;
-                        , SQL_SUCCESS, m_ard_hdesc, 0);
-
-TEST_SQL_SET_DESC_FIELD(Test_SQL_DESC_ARRAY_STATUS_PTR,
-                        SQL_DESC_ARRAY_STATUS_PTR, SQL_NTS, 0, SQLUSMALLINT foo;
-                        SQLUSMALLINT* m_value_ptr = &foo;
-                        , SQL_SUCCESS, m_ard_hdesc, 0);
-
-TEST_SQL_SET_DESC_FIELD(Test_SQL_DESC_BIND_OFFSET_PTR, SQL_DESC_BIND_OFFSET_PTR,
-                        SQL_NTS, 0, SQLLEN foo;
-                        SQLLEN* m_value_ptr = &foo;
-                        , SQL_SUCCESS, m_ard_hdesc, 0);
-
-TEST_SQL_SET_DESC_FIELD(Test_SQL_DESC_BIND_TYPE, SQL_DESC_BIND_TYPE, SQL_NTS, 0,
-                        SQLINTEGER m_value_ptr = SQL_BIND_BY_COLUMN;
-                        , SQL_SUCCESS, m_ard_hdesc, 0);
-
-TEST_SQL_SET_DESC_FIELD(Test_SQL_DESC_COUNT, SQL_DESC_COUNT, SQL_IS_SMALLINT, 0,
-                        SQLSMALLINT m_value_ptr = 27;
-                        , SQL_SUCCESS, m_ard_hdesc, 0);
-
-TEST_SQL_SET_DESC_FIELD(Test_SQL_DESC_ROWS_PROCESSED_PTR,
-                        SQL_DESC_ROWS_PROCESSED_PTR, SQL_NTS, 0, SQLULEN foo;
-                        SQLULEN* m_value_ptr = &foo;
-                        , SQL_SUCCESS, m_ird_hdesc, 0);
-
-// Descriptor Record Fields Tests
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_AUTO_UNIQUE_VALUE,
-                        SQL_DESC_AUTO_UNIQUE_VALUE, SQL_NTS, 1,
-                        SQLINTEGER m_value_ptr = 0;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_BASE_COLUMN_NAME,
-                        SQL_DESC_BASE_COLUMN_NAME, SQL_NTS, 1,
-                        SQLCHAR m_value_ptr[255] = "Origin";
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_BASE_TABLE_NAME,
-                        SQL_DESC_BASE_TABLE_NAME, SQL_NTS, 1,
-                        SQLCHAR m_value_ptr[255] = "opensearch_dashboards_sample_data_flights";
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_CASE_SENSITIVE,
-                        SQL_DESC_CASE_SENSITIVE, SQL_NTS, 1,
-                        SQLINTEGER m_value_ptr = 1;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_CATALOG_NAME,
-                        SQL_DESC_CATALOG_NAME, SQL_NTS, 1,
-                        SQLCHAR m_value_ptr[255] = "";
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_CONCISE_TYPE,
-                        SQL_DESC_CONCISE_TYPE, SQL_IS_INTEGER, 1,
-                        SQLSMALLINT m_value_ptr = SQL_WLONGVARCHAR;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_DATA_PTR, SQL_DESC_DATA_PTR,
-                        SQL_IS_POINTER, 1, SQLPOINTER m_value_ptr = NULL;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_DATETIME_INTERVAL_CODE,
-                        SQL_DESC_DATETIME_INTERVAL_CODE, SQL_IS_SMALLINT, 1,
-                        SQLSMALLINT m_value_ptr = 0;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_DATETIME_INTERVAL_PRECISION,
-                        SQL_DESC_DATETIME_INTERVAL_PRECISION, SQL_IS_INTEGER, 1,
-                        SQLINTEGER m_value_ptr = 0;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_DISPLAY_SIZE,
-                        SQL_DESC_DISPLAY_SIZE, SQL_IS_POINTER, 1,
-                        SQLLEN m_value_ptr = 32766;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_FIXED_PREC_SCALE,
-                        SQL_DESC_FIXED_PREC_SCALE, SQL_IS_INTEGER, 1,
-                        SQLSMALLINT m_value_ptr = 0;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_INDICATOR_PTR,
-                        SQL_DESC_INDICATOR_PTR, SQL_IS_INTEGER, 1,
-                        SQLLEN m_value_ptr = 0;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_LABEL, SQL_DESC_LABEL,
-                        SQL_NTS, 1, SQLCHAR m_value_ptr[255] = "Origin";
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_LENGTH, SQL_DESC_LENGTH,
-                        SQL_IS_INTEGER, 1, SQLULEN m_value_ptr = 32766;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_LITERAL_PREFIX,
-                        SQL_DESC_LITERAL_PREFIX, SQL_NTS, 1,
-                        SQLCHAR m_value_ptr[255] = "";
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_LITERAL_SUFFIX,
-                        SQL_DESC_LITERAL_SUFFIX, SQL_NTS, 1,
-                        SQLCHAR m_value_ptr[255] = "";
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_LOCAL_TYPE_NAME,
-                        SQL_DESC_LOCAL_TYPE_NAME, SQL_NTS, 1,
-                        SQLCHAR m_value_ptr[255] = "varchar";
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_NAME, SQL_DESC_NAME,
-                        SQL_NTS, 1, SQLCHAR m_value_ptr[255] = "Origin";
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_NULLABLE, SQL_DESC_NULLABLE,
-                        SQL_IS_SMALLINT, 1, SQLSMALLINT m_value_ptr = 1;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_NUM_PREC_RADIX,
-                        SQL_DESC_NUM_PREC_RADIX, SQL_IS_INTEGER, 1,
-                        SQLINTEGER m_value_ptr = 0;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_OCTET_LENGTH,
-                        SQL_DESC_OCTET_LENGTH, SQL_NTS, 1,
-                        SQLLEN m_value_ptr = 0;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_OCTET_LENGTH_PTR,
-                        SQL_DESC_OCTET_LENGTH_PTR, SQL_IS_INTEGER, 1,
-                        SQLLEN m_value_ptr = 0;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_PARAMETER_TYPE,
-                        SQL_DESC_PARAMETER_TYPE, SQL_IS_SMALLINT, 1,
-                        SQLSMALLINT m_value_ptr = 1;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_PRECISION,
-                        SQL_DESC_PRECISION, SQL_IS_SMALLINT, 1,
-                        SQLSMALLINT m_value_ptr = 30585;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_ROWVER, SQL_DESC_ROWVER,
-                        SQL_NTS, 1, SQLSMALLINT m_value_ptr = 1;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_SCALE, SQL_DESC_SCALE,
-                        SQL_IS_SMALLINT, 1, SQLSMALLINT m_value_ptr = 0;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_SCHEMA_NAME,
-                        SQL_DESC_SCHEMA_NAME, SQL_NTS, 1,
-                        SQLCHAR m_value_ptr[255] = "";
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_SEARCHABLE,
-                        SQL_DESC_SEARCHABLE, SQL_IS_SMALLINT, 1,
-                        SQLSMALLINT m_value_ptr = SQL_PRED_SEARCHABLE;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_TABLE_NAME,
-                        SQL_DESC_TABLE_NAME, SQL_NTS, 1,
-                        SQLCHAR m_value_ptr[255] = "opensearch_dashboards_sample_data_flights";
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_TYPE, SQL_DESC_TYPE,
-                        SQL_IS_SMALLINT, 1,
-                        SQLSMALLINT m_value_ptr = SQL_WLONGVARCHAR;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_TYPE_NAME,
-                        SQL_DESC_TYPE_NAME, SQL_NTS, 1,
-                        SQLCHAR m_value_ptr[255] = "varchar";
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_UNNAMED, SQL_DESC_UNNAMED,
-                        SQL_IS_SMALLINT, 1, SQLSMALLINT m_value_ptr = SQL_NAMED;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_UNSIGNED, SQL_DESC_UNSIGNED,
-                        SQL_IS_SMALLINT, 1, SQLSMALLINT m_value_ptr = SQL_TRUE;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-TEST_SQL_SET_DESC_FIELD(TestUndefinedError_SQL_DESC_UPDATABLE,
-                        SQL_DESC_UPDATABLE, SQL_IS_SMALLINT, 1,
-                        SQLSMALLINT m_value_ptr = SQL_ATTR_READONLY;
-                        , SQL_ERROR, m_ird_hdesc, 1);
-
-class TestSQLGetDescField : public testing::Test {
-   public:
-    TestSQLGetDescField() {
-    }
-
-    void SetUp() {
-        AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env, &m_conn,
-                       &m_hstmt, true, true);
-        SQLGetStmtAttr(m_hstmt, SQL_ATTR_APP_ROW_DESC, &m_ard_hdesc, 0, NULL);
-        SQLGetStmtAttr(m_hstmt, SQL_ATTR_IMP_ROW_DESC, &m_ird_hdesc, 0, NULL);
-    }
-
-    void TearDown() {
-        if (m_ard_hdesc != SQL_NULL_HDESC) {
-            SQLFreeHandle(SQL_HANDLE_DESC, m_ard_hdesc);
-        }
-        if (m_ird_hdesc != SQL_NULL_HDESC) {
-            SQLFreeHandle(SQL_HANDLE_DESC, m_ird_hdesc);
-        }
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-
-    ~TestSQLGetDescField() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-    SQLHDESC m_ard_hdesc = SQL_NULL_HDESC;
-    SQLHDESC m_ird_hdesc = SQL_NULL_HDESC;
-    SQLSMALLINT m_rec_number = 0;
-    SQLSMALLINT m_field_identifier;
-    SQLINTEGER m_buffer_length = 0;
-    SQLINTEGER m_string_length_ptr = 0;
-};
-
-// Template for tests of SQLGetDescField
-#define TEST_SQL_GET_DESC_FIELD(test_name, identifier, buffer_length, rec_num, \
-                                value_ptr_assignment, expected_val, hdesc,     \
-                                check_state, check_data, check_data_value)     \
-    TEST_F(TestSQLGetDescField, test_name) {                                   \
-        ExecuteQuery(multi_col, data_set, std::to_wstring(multi_row_cnt),      \
-                     &m_hstmt);                                                \
-        m_field_identifier = identifier;                                       \
-        m_buffer_length = buffer_length;                                       \
-        m_rec_number = rec_num;                                                \
-        value_ptr_assignment;                                                  \
-        EXPECT_EQ(expected_val,                                                \
-                  SQLGetDescField(hdesc, m_rec_number, m_field_identifier,     \
-                                  &m_value_ptr, m_buffer_length,               \
-                                  &m_string_length_ptr));                      \
-        if (check_state)                                                       \
-            EXPECT_TRUE(                                                       \
-                CheckSQLSTATE(SQL_HANDLE_DESC, hdesc,                          \
-                              SQLSTATE_INVALID_DESCRIPTOR_FIELD_IDENTIFIER));  \
-        if (check_data)                                                        \
-            EXPECT_EQ((uint64_t)check_data_value, (uint64_t)m_value_ptr);      \
-    }
-
-// Descriptor Header Fields Tests
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_ALLOC_TYPE, SQL_DESC_ALLOC_TYPE, 0, 0,
-                        SQLSMALLINT m_value_ptr = 0;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 1, SQL_DESC_ALLOC_AUTO);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_ARRAY_SIZE, SQL_DESC_ARRAY_SIZE, 0, 0,
-                        SQLULEN m_value_ptr = 0;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 1, single_col_cnt);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_ARRAY_STATUS_PTR,
-                        SQL_DESC_ARRAY_STATUS_PTR, 0, 0,
-                        SQLUSMALLINT* m_value_ptr;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_BIND_OFFSET_PTR, SQL_DESC_BIND_OFFSET_PTR,
-                        0, 0, SQLLEN* m_value_ptr;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_BIND_TYPE, SQL_DESC_BIND_TYPE, 0, 0,
-                        SQLINTEGER m_value_ptr = 0;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 1, SQL_BIND_BY_COLUMN);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_COUNT, SQL_DESC_COUNT, 0, 0,
-                        SQLSMALLINT m_value_ptr = 0;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 1, multi_col_cnt);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_ROWS_PROCESSED_PTR,
-                        SQL_DESC_ROWS_PROCESSED_PTR, 0, 0, SQLULEN* m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-// Descriptor Record Fields Tests
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_AUTO_UNIQUE_VALUE,
-                        SQL_DESC_AUTO_UNIQUE_VALUE, 0, 1,
-                        SQLINTEGER m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_BASE_COLUMN_NAME,
-                        SQL_DESC_BASE_COLUMN_NAME, 255, 1,
-                        SQLCHAR m_value_ptr[255];
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_BASE_TABLE_NAME, SQL_DESC_BASE_TABLE_NAME,
-                        255, 1, SQLCHAR m_value_ptr[255];
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_CASE_SENSITIVE, SQL_DESC_CASE_SENSITIVE,
-                        0, 1, SQLINTEGER m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_CATALOG_NAME, SQL_DESC_CATALOG_NAME, 255,
-                        1, SQLCHAR m_value_ptr[255];
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_CONCISE_TYPE, SQL_DESC_CONCISE_TYPE, 0, 1,
-                        SQLSMALLINT m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_DATA_PTR, SQL_DESC_DATA_PTR, 0, 1,
-                        SQLPOINTER m_value_ptr;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_DATETIME_INTERVAL_CODE,
-                        SQL_DESC_DATETIME_INTERVAL_CODE, 0, 1,
-                        SQLSMALLINT m_value_ptr;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 0, 0);
-
-// This field contains the interval leading precision if the SQL_DESC_TYPE field
-// is SQL_INTERVAL. As SQL_INTERVAL support is disabled because some
-// applications are unhappy with it, this test should return SQL_ERROR as
-// DESC_INVALID_DESCRIPTOR_IDENTIFIER
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_DATETIME_INTERVAL_PRECISION,
-                        SQL_DESC_DATETIME_INTERVAL_PRECISION, 0, 1,
-                        SQLINTEGER m_value_ptr = 0;
-                        , SQL_ERROR, m_ard_hdesc, 1, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_DISPLAY_SIZE, SQL_DESC_DISPLAY_SIZE, 0, 1,
-                        SQLLEN m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_FIXED_PREC_SCALE,
-                        SQL_DESC_FIXED_PREC_SCALE, 0, 1,
-                        SQLSMALLINT m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_INDICATOR_PTR, SQL_DESC_INDICATOR_PTR, 0,
-                        1, SQLLEN m_value_ptr;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_LABEL, SQL_DESC_LABEL, 255, 1,
-                        SQLCHAR m_value_ptr[255];
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_LENGTH, SQL_DESC_LENGTH, 0, 1,
-                        SQLULEN m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_LITERAL_PREFIX, SQL_DESC_LITERAL_PREFIX,
-                        255, 1, SQLCHAR m_value_ptr[255];
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_LITERAL_SUFFIX, SQL_DESC_LITERAL_SUFFIX,
-                        255, 1, SQLCHAR m_value_ptr[255];
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_LOCAL_TYPE_NAME, SQL_DESC_LOCAL_TYPE_NAME,
-                        255, 1, SQLCHAR m_value_ptr[255];
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_NAME, SQL_DESC_NAME, 255, 1,
-                        SQLCHAR m_value_ptr[255];
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_NULLABLE, SQL_DESC_NULLABLE, 0, 1,
-                        SQLSMALLINT m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_NUM_PREC_RADIX, SQL_DESC_NUM_PREC_RADIX,
-                        0, 1, SQLINTEGER m_value_ptr;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_OCTET_LENGTH, SQL_DESC_OCTET_LENGTH, 0, 1,
-                        SQLLEN m_value_ptr;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_OCTET_LENGTH_PTR,
-                        SQL_DESC_OCTET_LENGTH_PTR, 0, 1, SQLLEN m_value_ptr;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_PRECISION, SQL_DESC_PRECISION, 0, 1,
-                        SQLSMALLINT m_value_ptr;
-                        , SQL_SUCCESS, m_ard_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_ROWVER, SQL_DESC_ROWVER, 0, 1,
-                        SQLSMALLINT m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_SCALE, SQL_DESC_SCALE, 0, 1,
-                        SQLSMALLINT m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_SCHEMA_NAME, SQL_DESC_SCHEMA_NAME, 255, 1,
-                        SQLCHAR m_value_ptr[255];
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_SEARCHABLE, SQL_DESC_SEARCHABLE, 0, 1,
-                        SQLSMALLINT m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_TABLE_NAME, SQL_DESC_TABLE_NAME, 255, 1,
-                        SQLCHAR m_value_ptr[255];
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_TYPE, SQL_DESC_TYPE, 255, 1,
-                        SQLSMALLINT m_value_ptr = 0;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_TYPE_NAME, SQL_DESC_TYPE_NAME, 255, 1,
-                        SQLCHAR m_value_ptr[255];
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_UNNAMED, SQL_DESC_UNNAMED, 0, 1,
-                        SQLSMALLINT m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_UNSIGNED, SQL_DESC_UNSIGNED, 0, 1,
-                        SQLSMALLINT m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-
-TEST_SQL_GET_DESC_FIELD(Test_SQL_DESC_UPDATABLE, SQL_DESC_UPDATABLE, 255, 1,
-                        SQLSMALLINT m_value_ptr;
-                        , SQL_SUCCESS, m_ird_hdesc, 0, 0, 0);
-#ifdef WIN32
-#pragma warning(pop)
-#elif __APPLE__
-#pragma clang diagnostic pop
-#endif
-
-int main(int argc, char** argv) {
-#ifdef __APPLE__
-    // Enable malloc logging for detecting memory leaks.
-    system("export MallocStackLogging=1");
-#endif
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-
-    int failures = RUN_ALL_TESTS();
-
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-#ifdef __APPLE__
-    // Disable malloc logging and report memory leaks
-    system("unset MallocStackLogging");
-    system("leaks itodbc_descriptors > leaks_itodbc_descriptors");
-#endif
-    return failures;
-}
diff --git a/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt
deleted file mode 100644
index 0f3eeec15f..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-project(itodbc_execution)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_odbc_execution.cpp)
-include_directories(	${UT_HELPER}
-						${IT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${VLD_SRC}  )
-
-# Generate executable
-add_executable(itodbc_execution ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_link_libraries(itodbc_execution sqlodbc itodbc_helper ut_helper GTest::gtest_main)
-target_compile_definitions(itodbc_execution PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.h b/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCExecution/test_odbc_execution.cpp b/sql-odbc/src/IntegrationTests/ITODBCExecution/test_odbc_execution.cpp
deleted file mode 100644
index 5c45b095e2..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCExecution/test_odbc_execution.cpp
+++ /dev/null
@@ -1,388 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "unit_test_helper.h"
-#include "it_odbc_helper.h"
-
-#ifdef WIN32
-#include <windows.h>
-#else
-#endif
-#include <sql.h>
-#include <sqlext.h>
-#include <iostream>
-#include <thread>
-#include <chrono>
-// clang-format on
-
-class TestSQLExecute : public testing::Test {
-   public:
-    TestSQLExecute() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        CloseCursor(&m_hstmt, true, true);
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-
-    ~TestSQLExecute() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    std::wstring m_query =
-        L"SELECT Origin FROM opensearch_dashboards_sample_data_flights LIMIT 5";
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-class TestSQLPrepare : public testing::Test {
-   public:
-    TestSQLPrepare() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        CloseCursor(&m_hstmt, true, true);
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-
-    ~TestSQLPrepare() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    std::wstring m_query =
-        L"SELECT Origin FROM opensearch_dashboards_sample_data_flights LIMIT 5";
-    std::wstring m_1_col =
-        L"SELECT Origin FROM opensearch_dashboards_sample_data_flights LIMIT 5";
-    std::wstring m_2_col =
-        L"SELECT Origin, AvgTicketPrice FROM opensearch_dashboards_sample_data_flights LIMIT "
-        L"5";
-    std::wstring m_all_col =
-        L"SELECT * FROM opensearch_dashboards_sample_data_flights LIMIT 5";
-    const SQLSMALLINT m_1_col_cnt = 1;
-    const SQLSMALLINT m_2_col_cnt = 2;
-    const SQLSMALLINT m_all_col_cnt = 25;
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-class TestSQLExecDirect : public testing::Test {
-   public:
-    TestSQLExecDirect() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        CloseCursor(&m_hstmt, true, true);
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-
-    ~TestSQLExecDirect() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    std::wstring m_query =
-        L"SELECT Origin FROM opensearch_dashboards_sample_data_flights LIMIT 5";
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-class TestSQLSetCursorName : public testing::Test {
-   public:
-    TestSQLSetCursorName() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        CloseCursor(&m_hstmt, true, true);
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-
-    ~TestSQLSetCursorName() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    std::wstring m_cursor_name = L"test_cursor";
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-class TestSQLGetCursorName : public testing::Test {
-   public:
-    TestSQLGetCursorName() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-        ASSERT_EQ(SQLSetCursorName(m_hstmt, (SQLTCHAR*)m_cursor_name.c_str(),
-                                   SQL_NTS),
-                  SQL_SUCCESS);
-    }
-
-    void TearDown() {
-        CloseCursor(&m_hstmt, true, true);
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-
-    ~TestSQLGetCursorName() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    std::wstring m_cursor_name = L"test_cursor";
-    SQLSMALLINT m_wrong_buffer_length = 1;
-    SQLTCHAR m_cursor_name_buf[20];
-    SQLSMALLINT m_cursor_name_length;
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-class TestSQLCancel : public testing::Test {
-   public:
-    TestSQLCancel() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        if (m_hstmt != SQL_NULL_HSTMT) {
-            CloseCursor(&m_hstmt, true, true);
-            SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-            SQLDisconnect(m_conn);
-            SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-        }
-    }
-
-    ~TestSQLCancel() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    typedef struct SQLCancelInfo {
-        SQLHDBC hstmt;
-        SQLRETURN ret_code;
-    } SQLCancelInfo;
-
-    const long long m_min_time_diff = 20;
-    std::wstring m_query =
-        L"SELECT * FROM opensearch_dashboards_sample_data_flights AS f WHERE "
-        L"f.Origin=f.Origin";
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-TEST_F(TestSQLExecute, NoPrepareCallError) {
-    SQLRETURN ret = SQLExecute(m_hstmt);
-    EXPECT_EQ(SQL_ERROR, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-TEST_F(TestSQLExecute, Success) {
-    SQLRETURN ret = SQLPrepare(m_hstmt, (SQLTCHAR*)m_query.c_str(), SQL_NTS);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    ASSERT_EQ(SQL_SUCCESS, ret);
-    ret = SQLExecute(m_hstmt);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-TEST_F(TestSQLExecute, ResetPrepareError) {
-    SQLRETURN ret = SQLPrepare(m_hstmt, (SQLTCHAR*)m_query.c_str(), SQL_NTS);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    ASSERT_EQ(SQL_SUCCESS, ret);
-    ret = SQLPrepare(m_hstmt, NULL, SQL_NTS);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    ASSERT_EQ(SQL_ERROR, ret);
-    ret = SQLExecute(m_hstmt);
-    EXPECT_EQ(SQL_ERROR, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-TEST_F(TestSQLPrepare, Success) {
-    SQLRETURN ret = SQLPrepare(m_hstmt, (SQLTCHAR*)m_query.c_str(), SQL_NTS);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-TEST_F(TestSQLPrepare, PrepareMetadata) {
-    SQLRETURN ret = SQLPrepare(m_hstmt, (SQLTCHAR*)m_all_col.c_str(), SQL_NTS);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    SQLSMALLINT column_count = 0;
-    EXPECT_TRUE(SQL_SUCCEEDED(SQLNumResultCols(m_hstmt, &column_count)));
-    EXPECT_EQ(column_count, m_all_col_cnt);
-    EXPECT_TRUE(SQL_SUCCEEDED(SQLFreeStmt(m_hstmt, SQL_CLOSE)));
-
-    ret = SQLPrepare(m_hstmt, (SQLTCHAR*)m_2_col.c_str(), SQL_NTS);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    EXPECT_TRUE(SQL_SUCCEEDED(SQLNumResultCols(m_hstmt, &column_count)));
-    EXPECT_EQ(column_count, m_2_col_cnt);
-    EXPECT_TRUE(SQL_SUCCEEDED(SQLFreeStmt(m_hstmt, SQL_CLOSE)));
-
-    ret = SQLPrepare(m_hstmt, (SQLTCHAR*)m_all_col.c_str(), SQL_NTS);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    EXPECT_TRUE(SQL_SUCCEEDED(SQLNumResultCols(m_hstmt, &column_count)));
-    EXPECT_EQ(column_count, m_all_col_cnt);
-    EXPECT_TRUE(SQL_SUCCEEDED(SQLFreeStmt(m_hstmt, SQL_CLOSE)));
-
-    ret = SQLPrepare(m_hstmt, (SQLTCHAR*)m_1_col.c_str(), SQL_NTS);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    EXPECT_TRUE(SQL_SUCCEEDED(SQLNumResultCols(m_hstmt, &column_count)));
-    EXPECT_EQ(column_count, m_1_col_cnt);
-    EXPECT_TRUE(SQL_SUCCEEDED(SQLFreeStmt(m_hstmt, SQL_CLOSE)));
-}
-
-TEST_F(TestSQLPrepare, NullQueryError) {
-    SQLRETURN ret = SQLPrepare(m_hstmt, NULL, SQL_NTS);
-    EXPECT_EQ(SQL_ERROR, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-TEST_F(TestSQLExecDirect, Success) {
-    SQLRETURN ret = SQLExecDirect(m_hstmt, (SQLTCHAR*)m_query.c_str(), SQL_NTS);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-TEST_F(TestSQLExecDirect, NullQueryError) {
-    SQLRETURN ret = SQLExecDirect(m_hstmt, NULL, SQL_NTS);
-    EXPECT_EQ(SQL_ERROR, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-TEST_F(TestSQLSetCursorName, Success) {
-    SQLRETURN ret =
-        SQLSetCursorName(m_hstmt, (SQLTCHAR*)m_cursor_name.c_str(), SQL_NTS);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-TEST_F(TestSQLGetCursorName, Success) {
-    SQLRETURN ret =
-        SQLGetCursorName(m_hstmt, m_cursor_name_buf,
-                         IT_SIZEOF(m_cursor_name_buf), &m_cursor_name_length);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-TEST_F(TestSQLGetCursorName, WrongLengthForCursorName) {
-    SQLRETURN ret =
-        SQLGetCursorName(m_hstmt, m_cursor_name_buf, m_wrong_buffer_length,
-                         &m_cursor_name_length);
-    EXPECT_EQ(SQL_SUCCESS_WITH_INFO, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-TEST_F(TestSQLCancel, NULLHandle) {
-    SQLRETURN ret_exec = SQLCancel(NULL);
-    EXPECT_EQ(ret_exec, SQL_INVALID_HANDLE);
-}
-
-// This test will fail because we are not cancelling in flight queries at this time. 
-#if 0
-TEST_F(TestSQLCancel, QueryInProgress) {
-    // Create lambda thread
-    auto f = [](SQLCancelInfo* info) {
-        Sleep(10);
-        info->ret_code = SQLCancel(info->hstmt);
-    };
-
-    // Launch cancel thread
-    SQLCancelInfo cancel_info;
-    cancel_info.hstmt = m_hstmt;
-    cancel_info.ret_code = SQL_ERROR;
-    std::thread thread_object(f, &cancel_info);
-
-    // Time ExecDirect execution
-    auto start = std::chrono::steady_clock::now();
-    SQLRETURN ret_exec =
-        SQLExecDirect(m_hstmt, (SQLTCHAR*)m_query.c_str(), SQL_NTS);
-    auto end = std::chrono::steady_clock::now();
-    auto time =
-        std::chrono::duration_cast< std::chrono::milliseconds >(end - start)
-            .count();
-
-    // Join thread
-    thread_object.join();
-
-    // Check return codes and time diff
-    ASSERT_LE(m_min_time_diff, time);
-    EXPECT_EQ(ret_exec, SQL_ERROR);
-    EXPECT_EQ(cancel_info.ret_code, SQL_SUCCESS);
-}
-#endif
-
-TEST_F(TestSQLCancel, QueryNotSent) {
-    SQLRETURN ret_exec = SQLCancel(m_hstmt);
-    EXPECT_EQ(ret_exec, SQL_SUCCESS);
-}
-
-TEST_F(TestSQLCancel, QueryFinished) {
-    SQLRETURN ret_exec =
-        SQLExecDirect(m_hstmt, (SQLTCHAR*)m_query.c_str(), SQL_NTS);
-    ASSERT_EQ(ret_exec, SQL_SUCCESS);
-
-    ret_exec = SQLCancel(m_hstmt);
-    EXPECT_EQ(ret_exec, SQL_SUCCESS);
-}
-
-int main(int argc, char** argv) {
-#ifdef __APPLE__
-    // Enable malloc logging for detecting memory leaks.
-    system("export MallocStackLogging=1");
-#endif
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-
-    int failures = RUN_ALL_TESTS();
-
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-#ifdef __APPLE__
-    // Disable malloc logging and report memory leaks
-    system("unset MallocStackLogging");
-    system("leaks itodbc_execution > leaks_itodbc_execution");
-#endif
-    return failures;
-}
diff --git a/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt
deleted file mode 100644
index 61c97e5df9..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-project(itodbc_helper)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES it_odbc_helper.cpp)
-set(HEADER_FILES it_odbc_helper.h)	
-include_directories(	
-                        ${UT_HELPER}
-                        ${OPENSEARCHODBC_SRC}
-						${VLD_SRC}  
-                    )
-
-# Generate dll (SHARED)
-add_library(itodbc_helper SHARED ${SOURCE_FILES} ${HEADER_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_link_libraries(itodbc_helper sqlodbc ut_helper GTest::gtest_main)
-target_compile_definitions(itodbc_helper PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.cpp b/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.cpp
deleted file mode 100644
index 5344962ff2..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-#include "it_odbc_helper.h"
-
-#include <codecvt>
-#include <locale>
-
-#define EXECUTION_HANDLER(throw_on_error, log_diag, handle_type, handle, \
-                          ret_code, statement, error_msg)                \
-    do {                                                                 \
-        (ret_code) = (statement);                                        \
-        if ((log_diag))                                                  \
-            LogAnyDiagnostics((handle_type), (handle), (ret_code));      \
-        if ((throw_on_error) && !SQL_SUCCEEDED((ret_code)))              \
-            throw std::runtime_error((error_msg));                       \
-    } while (0);
-
-void AllocConnection(SQLHENV* db_environment, SQLHDBC* db_connection,
-                     bool throw_on_error, bool log_diag) {
-    SQLRETURN ret_code;
-    EXECUTION_HANDLER(
-        throw_on_error, log_diag, SQL_HANDLE_ENV, *db_environment, ret_code,
-        SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, db_environment),
-        "Failed to allocate handle for environment.");
-    EXECUTION_HANDLER(throw_on_error, log_diag, SQL_ATTR_ODBC_VERSION,
-                      *db_environment, ret_code,
-                      SQLSetEnvAttr(*db_environment, SQL_ATTR_ODBC_VERSION,
-                                    (void*)SQL_OV_ODBC3, 0),
-                      "Failed to set attributes for environment.");
-    EXECUTION_HANDLER(
-        throw_on_error, log_diag, SQL_HANDLE_DBC, *db_connection, ret_code,
-        SQLAllocHandle(SQL_HANDLE_DBC, *db_environment, db_connection),
-        "Failed to allocate handle for db connection.");
-}
-
-void ITDriverConnect(SQLTCHAR* connection_string, SQLHENV* db_environment,
-                     SQLHDBC* db_connection, bool throw_on_error,
-                     bool log_diag) {
-    SQLRETURN ret_code;
-    EXECUTION_HANDLER(
-        throw_on_error, log_diag, SQL_HANDLE_ENV, *db_environment, ret_code,
-        SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, db_environment),
-        "Failed to allocate handle for environment.");
-    EXECUTION_HANDLER(throw_on_error, log_diag, SQL_ATTR_ODBC_VERSION,
-                      *db_environment, ret_code,
-                      SQLSetEnvAttr(*db_environment, SQL_ATTR_ODBC_VERSION,
-                                    (void*)SQL_OV_ODBC3, 0),
-                      "Failed to set attributes for environment.");
-    EXECUTION_HANDLER(
-        throw_on_error, log_diag, SQL_HANDLE_DBC, *db_connection, ret_code,
-        SQLAllocHandle(SQL_HANDLE_DBC, *db_environment, db_connection),
-        "Failed to allocate handle for db connection.");
-
-    SQLTCHAR out_conn_string[1024];
-    SQLSMALLINT out_conn_string_length;
-
-    EXECUTION_HANDLER(
-        throw_on_error, log_diag, SQL_HANDLE_DBC, *db_connection, ret_code,
-        SQLDriverConnect(*db_connection, NULL, connection_string, SQL_NTS,
-                         out_conn_string, IT_SIZEOF(out_conn_string),
-                         &out_conn_string_length, SQL_DRIVER_COMPLETE),
-        "Failed to connect to driver.");
-}
-
-void AllocStatement(SQLTCHAR* connection_string, SQLHENV* db_environment,
-                    SQLHDBC* db_connection, SQLHSTMT* h_statement,
-                    bool throw_on_error, bool log_diag) {
-    SQLRETURN ret_code;
-    ITDriverConnect(connection_string, db_environment, db_connection,
-                    throw_on_error, log_diag);
-    EXECUTION_HANDLER(
-        throw_on_error, log_diag, SQL_HANDLE_STMT, h_statement, ret_code,
-        SQLAllocHandle(SQL_HANDLE_STMT, *db_connection, h_statement),
-        "Failed to allocate handle for statement.");
-}
-
-void LogAnyDiagnostics(SQLSMALLINT handle_type, SQLHANDLE handle, SQLRETURN ret,
-                       SQLTCHAR* msg_return, const SQLSMALLINT sz) {
-    if (handle == NULL) {
-        printf("Failed to log diagnostics, handle is NULL\n");
-        return;
-    }
-
-    // Only log diagnostics when there's something to log.
-    switch (ret) {
-        case SQL_SUCCESS_WITH_INFO:
-            printf("SQL_SUCCESS_WITH_INFO: ");
-            break;
-        case SQL_ERROR:
-            printf("SQL_ERROR: ");
-            break;
-        default:
-            return;
-    }
-
-    SQLRETURN diag_ret;
-    SQLTCHAR sqlstate[6];
-    SQLINTEGER native_error_code;
-    SQLTCHAR diag_message[SQL_MAX_MESSAGE_LENGTH];
-    SQLSMALLINT message_length;
-
-    SQLSMALLINT rec_number = 0;
-    do {
-        rec_number++;
-        diag_ret = SQLGetDiagRec(
-            handle_type, handle, rec_number, sqlstate, &native_error_code,
-            msg_return == NULL ? diag_message : msg_return,
-            msg_return == NULL ? IT_SIZEOF(diag_message) : sz, &message_length);
-        if (diag_ret == SQL_INVALID_HANDLE)
-            printf("Invalid handle\n");
-        else if (SQL_SUCCEEDED(diag_ret))
-            printf("SQLState: %S: %S\n", sqlstate,
-                   (msg_return == NULL) ? diag_message : msg_return);
-    } while (diag_ret == SQL_SUCCESS);
-
-    if (diag_ret == SQL_NO_DATA && rec_number == 1)
-        printf("No error information\n");
-}
-
-bool CheckSQLSTATE(SQLSMALLINT handle_type, SQLHANDLE handle,
-                   SQLWCHAR* expected_sqlstate, bool log_message) {
-    (void)log_message;
-
-    SQLWCHAR sqlstate[6] = {0};
-    SQLINTEGER native_diag_code;
-    SQLWCHAR diag_message[SQL_MAX_MESSAGE_LENGTH] = {0};
-    SQLSMALLINT message_length;
-
-    SQLSMALLINT record_number = 0;
-    SQLRETURN diag_ret;
-    do {
-        record_number++;
-        diag_ret = SQLGetDiagRec(handle_type, handle, record_number, sqlstate,
-                                 &native_diag_code, diag_message,
-                                 IT_SIZEOF(diag_message), &message_length);
-
-        if (1) {
-            std::wcout << "SQLState " << sqlstate << ": " << diag_message
-                       << std::endl;
-        }
-        // Only return if this SQLSTATE is the expected state, otherwise keep
-        // checking
-        if (std::wstring(sqlstate) == std::wstring(expected_sqlstate)) {
-            return true;
-        }
-    } while (diag_ret == SQL_SUCCESS);
-
-    // Could not find expected SQLSTATE in available diagnostic records
-    return false;
-}
-
-bool CheckSQLSTATE(SQLSMALLINT handle_type, SQLHANDLE handle,
-                   SQLWCHAR* expected_sqlstate) {
-    return CheckSQLSTATE(handle_type, handle, expected_sqlstate, false);
-}
-
-std::wstring QueryBuilder(const std::wstring& column,
-                          const std::wstring& dataset,
-                          const std::wstring& count) {
-    return L"SELECT " + column + L" FROM " + dataset + L" LIMIT " + count;
-}
-
-std::wstring QueryBuilder(const std::wstring& column,
-                          const std::wstring& dataset) {
-    return L"SELECT " + column + L" FROM " + dataset;
-}
-
-void CloseCursor(SQLHSTMT* h_statement, bool throw_on_error, bool log_diag) {
-    SQLRETURN ret_code;
-    EXECUTION_HANDLER(throw_on_error, log_diag, SQL_HANDLE_STMT, *h_statement,
-                      ret_code, SQLCloseCursor(*h_statement),
-                      "Failed to set allocate handle for statement.");
-}
-
-// std::wstring SQLTCHAR_to_string(SQLTCHAR* src) {
-// 	// std::wstring _src = (char16_t*)src;
-// 	return wstring_to_string(_src);
-// }
-
-std::string u16string_to_string(const std::u16string& src) {
-    return std::wstring_convert< std::codecvt_utf8_utf16< char16_t >,
-                                 char16_t >{}
-        .to_bytes(src);
-}
-
-std::u16string string_to_u16string(const std::string& src) {
-    return std::wstring_convert< std::codecvt_utf8_utf16< char16_t >,
-                                 char16_t >{}
-        .from_bytes(src);
-}
diff --git a/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.h b/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.h
deleted file mode 100644
index 8a911d5a28..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef IT_ODBC_HELPER_H
-#define IT_ODBC_HELPER_H
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-#include <sql.h>
-#include <sqlext.h>
-
-#include <iostream>
-#include <vector>
-
-#include "unit_test_helper.h"
-
-// SQLSTATEs
-#define SQLSTATE_STRING_DATA_RIGHT_TRUNCATED (SQLWCHAR*)L"01004"
-#define SQLSTATE_INVALID_DESCRIPTOR_INDEX (SQLWCHAR*)L"07009"
-#define SQLSTATE_GENERAL_ERROR (SQLWCHAR*)L"HY000"
-#define SQLSTATE_INVALID_DESCRIPTOR_FIELD_IDENTIFIER (SQLWCHAR*)L"HY091"
-
-#define IT_SIZEOF(x) (NULL == (x) ? 0 : (sizeof((x)) / sizeof((x)[0])))
-
-std::vector< std::pair< std::wstring, std::wstring > > conn_str_pair = {
-    {L"Driver", L"{OpenSearch ODBC}"},
-    {L"host", (use_ssl ? L"https://localhost" : L"localhost")},
-    {L"port", L"9200"},
-    {L"user", L"admin"},
-    {L"password", L"admin"},
-    {L"auth", L"BASIC"},
-    {L"useSSL", (use_ssl ? L"1" : L"0")},
-    {L"hostnameVerification", L"0"},
-    {L"logLevel", L"0"},
-    {L"logOutput", L"C:\\"},
-    {L"responseTimeout", L"10"},
-    {L"fetchSize", L"0"}};
-
-std::wstring conn_string = []() {
-    std::wstring temp;
-    for (auto it : conn_str_pair)
-        temp += it.first + L"=" + it.second + L";";
-    return temp;
-}();
-
-void AllocConnection(SQLHENV* db_environment, SQLHDBC* db_connection,
-                     bool throw_on_error, bool log_diag);
-void ITDriverConnect(SQLTCHAR* connection_string, SQLHENV* db_environment,
-                     SQLHDBC* db_connection, bool throw_on_error,
-                     bool log_diag);
-void AllocStatement(SQLTCHAR* connection_string, SQLHENV* db_environment,
-                    SQLHDBC* db_connection, SQLHSTMT* h_statement,
-                    bool throw_on_error, bool log_diag);
-void LogAnyDiagnostics(SQLSMALLINT handle_type, SQLHANDLE handle, SQLRETURN ret,
-                       SQLTCHAR* msg_return = NULL, const SQLSMALLINT sz = 0);
-bool CheckSQLSTATE(SQLSMALLINT handle_type, SQLHANDLE handle,
-                   SQLWCHAR* expected_sqlstate, bool log_message);
-bool CheckSQLSTATE(SQLSMALLINT handle_type, SQLHANDLE handle,
-                   SQLWCHAR* expected_sqlstate);
-std::wstring QueryBuilder(const std::wstring& column,
-                          const std::wstring& dataset,
-                          const std::wstring& count);
-std::wstring QueryBuilder(const std::wstring& column,
-                          const std::wstring& dataset);
-void CloseCursor(SQLHSTMT* h_statement, bool throw_on_error, bool log_diag);
-std::string u16string_to_string(const std::u16string& src);
-std::u16string string_to_u16string(const std::string& src);
-
-#endif
diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt
deleted file mode 100644
index 833df41cb2..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-project(itodbc_info)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_odbc_info.cpp)
-include_directories(	${UT_HELPER}
-						${IT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${VLD_SRC}  )
-
-# Generate executable
-add_executable(itodbc_info ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_code_coverage(itodbc_info PUBLIC AUTO ALL)
-target_link_libraries(itodbc_info sqlodbc itodbc_helper ut_helper GTest::gtest_main)
-target_compile_definitions(itodbc_info PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/packages.config b/sql-odbc/src/IntegrationTests/ITODBCInfo/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCInfo/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.h b/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp b/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp
deleted file mode 100644
index 822434bb4d..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "unit_test_helper.h"
-#include "it_odbc_helper.h"
-#include "version.h"
-#include <codecvt>
-#ifndef WIN32
-#include <climits>
-#endif
-// clang-format on
-
-class TestSQLGetInfo : public testing::Test {
-   public:
-    TestSQLGetInfo() {
-    }
-
-    void SetUp() {
-        ITDriverConnect((SQLTCHAR*)conn_string.c_str(), &m_env, &m_conn, true,
-                        true);
-    }
-
-    void TearDown() {
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-
-    ~TestSQLGetInfo() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-};
-
-// 1 for ver1 >= ver2, 0 for ver1 < ver2, -1 for error
-int Ver1GEVer2(std::wstring ver_1_str, std::wstring ver_2_str) {
-    auto VersionSplit = [&](std::vector< unsigned long >& output,
-                            std::wstring& input, std::wstring delim) {
-        try {
-            size_t start = 0;
-            size_t end = input.find(delim);
-            while (end != std::string::npos) {
-                output.push_back(std::stoul(input.substr(start, end - start)));
-                start = end + delim.length();
-                end = input.find(delim, start);
-            }
-            output.push_back(std::stoul(input.substr(start, end)));
-        } catch (...) {
-            output.clear();
-        }
-    };
-
-    std::vector< unsigned long > ver_1;
-    std::vector< unsigned long > ver_2;
-    VersionSplit(ver_1, ver_1_str, L".");
-    VersionSplit(ver_2, ver_2_str, L".");
-    if ((ver_1.size() == 0) || (ver_2.size() == 0))
-        return -1;
-
-    size_t cnt = ((ver_1.size() < ver_2.size()) ? ver_1.size() : ver_2.size());
-    for (size_t i = 0; i < cnt; i++) {
-        if (ver_1[i] != ver_2[i])
-            return (ver_1[i] >= ver_2[i]) ? 1 : 0;
-    }
-    if (ver_1.size() != ver_2.size())
-        return (ver_1.size() > ver_2.size()) ? 1 : 0;
-
-    // They are identical
-    return 1;
-}
-
-// Test template for SQLGetInfo
-#define TEST_SQL_GET_INFO_STRING(test_name, info_type, expected_value)         \
-    TEST_F(TestSQLGetInfo, test_name) {                                        \
-        SQLTCHAR info_value_ptr[1024];                                         \
-        SQLSMALLINT string_length_ptr;                                         \
-        SQLRETURN ret =                                                        \
-            SQLGetInfo(m_conn, info_type, info_value_ptr,                      \
-                       IT_SIZEOF(info_value_ptr), &string_length_ptr);         \
-        LogAnyDiagnostics(SQL_HANDLE_DBC, m_conn, ret);                        \
-        EXPECT_EQ(std::wstring(info_value_ptr), std::wstring(expected_value)); \
-    }
-
-// Test template for SQLGetInfo
-#define TEST_SQL_GET_INFO_VERSION_GE(test_name, info_type, expected_value) \
-    TEST_F(TestSQLGetInfo, test_name) {                                    \
-        SQLTCHAR info_value_ptr[1024];                                     \
-        SQLSMALLINT string_length_ptr;                                     \
-        SQLRETURN ret =                                                    \
-            SQLGetInfo(m_conn, info_type, info_value_ptr,                  \
-                       IT_SIZEOF(info_value_ptr), &string_length_ptr);     \
-        LogAnyDiagnostics(SQL_HANDLE_DBC, m_conn, ret);                    \
-        EXPECT_EQ(Ver1GEVer2(info_value_ptr, expected_value), 1);          \
-    }
-
-// Test template for SQLGetInfo
-#define TEST_SQL_GET_INFO_UINT_MASK(test_name, info_type, expected_value) \
-    TEST_F(TestSQLGetInfo, test_name) {                                   \
-        SQLUINTEGER info_value_ptr;                                       \
-        SQLSMALLINT string_length_ptr;                                    \
-        SQLRETURN ret =                                                   \
-            SQLGetInfo(m_conn, info_type, &info_value_ptr,                \
-                       sizeof(info_value_ptr), &string_length_ptr);       \
-        LogAnyDiagnostics(SQL_HANDLE_DBC, m_conn, ret);                   \
-        EXPECT_EQ((size_t)info_value_ptr, (size_t)expected_value);        \
-    }
-
-// Test template for SQLGetInfo
-#define TEST_SQL_GET_INFO_UINT16(test_name, info_type, expected_value) \
-    TEST_F(TestSQLGetInfo, test_name) {                                \
-        SQLUSMALLINT info_value_ptr;                                   \
-        SQLSMALLINT string_length_ptr;                                 \
-        SQLRETURN ret =                                                \
-            SQLGetInfo(m_conn, info_type, &info_value_ptr,             \
-                       sizeof(info_value_ptr), &string_length_ptr);    \
-        LogAnyDiagnostics(SQL_HANDLE_DBC, m_conn, ret);                \
-        EXPECT_EQ(info_value_ptr, expected_value);                     \
-    }
-
-/////////////////
-// Driver Info //
-/////////////////
-
-#if defined(WIN32)
-TEST_SQL_GET_INFO_STRING(SQLDriverName, SQL_DRIVER_NAME, L"sqlodbc.dll");
-#elif defined(__APPLE__)
-TEST_SQL_GET_INFO_STRING(SQLDriverName, SQL_DRIVER_NAME, L"libsqlodbc.dylib");
-#endif
-TEST_SQL_GET_INFO_STRING(SQLDriverODBCVer, SQL_DRIVER_ODBC_VER, L"03.51");
-
-std::wstring version =
-    std::wstring_convert< std::codecvt_utf8_utf16< wchar_t >, wchar_t >{}
-        .from_bytes(OPENSEARCHDRIVERVERSION);
-TEST_SQL_GET_INFO_STRING(SQLDriverVer, SQL_DRIVER_VER, version);
-
-TEST_SQL_GET_INFO_UINT16(SQLGetDataExtensions, SQL_GETDATA_EXTENSIONS,
-                         (SQL_GD_ANY_COLUMN | SQL_GD_ANY_ORDER | SQL_GD_BOUND
-                          | SQL_GD_BLOCK));
-TEST_SQL_GET_INFO_STRING(SQLSearchPatternEscape, SQL_SEARCH_PATTERN_ESCAPE,
-                         L"");
-
-//////////////////////
-// Data Source Info //
-//////////////////////
-
-TEST_SQL_GET_INFO_UINT16(SQLCursorCommitBehavior, SQL_CURSOR_COMMIT_BEHAVIOR,
-                         SQL_CB_CLOSE);
-TEST_SQL_GET_INFO_UINT16(SQLTxnCapable, SQL_TXN_CAPABLE, SQL_TC_NONE);
-TEST_SQL_GET_INFO_UINT16(SQLConcatNullBehavior, SQL_CONCAT_NULL_BEHAVIOR,
-                         SQL_CB_NULL);
-TEST_SQL_GET_INFO_STRING(SQLSchemaTerm, SQL_SCHEMA_TERM, L"");
-TEST_SQL_GET_INFO_STRING(SQLCatalogTerm, SQL_CATALOG_TERM, L"");
-
-///////////////
-// DBMS Info //
-///////////////
-
-TEST_SQL_GET_INFO_STRING(SQLDBMSName, SQL_DBMS_NAME, L"OpenSearch");
-TEST_SQL_GET_INFO_VERSION_GE(SQLDBMSVer, SQL_DBMS_VER, L"7.1.1");
-
-///////////////////
-// Supported SQL //
-///////////////////
-
-TEST_SQL_GET_INFO_STRING(SQLColumnAlias, SQL_COLUMN_ALIAS, L"Y");
-TEST_SQL_GET_INFO_UINT16(SQLGroupBy, SQL_GROUP_BY,
-                         SQL_GB_GROUP_BY_CONTAINS_SELECT);
-TEST_SQL_GET_INFO_STRING(SQLIdentifierQuoteChar, SQL_IDENTIFIER_QUOTE_CHAR,
-                         L"`");
-TEST_SQL_GET_INFO_UINT_MASK(SQLOJCapabilities, SQL_OJ_CAPABILITIES,
-                            SQL_OJ_LEFT | SQL_OJ_RIGHT | SQL_OJ_NOT_ORDERED
-                                | SQL_OJ_ALL_COMPARISON_OPS);
-TEST_SQL_GET_INFO_UINT_MASK(SQLSchemaUsage, SQL_SCHEMA_USAGE, 0);
-TEST_SQL_GET_INFO_UINT16(SQLQuotedIdentifierCase, SQL_QUOTED_IDENTIFIER_CASE,
-                         SQL_IC_SENSITIVE);
-TEST_SQL_GET_INFO_STRING(SQLSpecialCharacters, SQL_SPECIAL_CHARACTERS, L"_");
-TEST_SQL_GET_INFO_UINT_MASK(SQLODBCInterfaceConformance,
-                            SQL_ODBC_INTERFACE_CONFORMANCE, SQL_OIC_CORE);
-TEST_SQL_GET_INFO_UINT_MASK(SQLSQLConformance, SQL_SQL_CONFORMANCE,
-                            SQL_SC_SQL92_ENTRY);
-TEST_SQL_GET_INFO_UINT_MASK(SQLCatalogUsage, SQL_CATALOG_USAGE, 0);
-TEST_SQL_GET_INFO_UINT16(SQLCatalogLocation, SQL_CATALOG_LOCATION, 0);
-TEST_SQL_GET_INFO_STRING(SQLCatalogNameSeparator, SQL_CATALOG_NAME_SEPARATOR,
-                         L"");
-TEST_SQL_GET_INFO_UINT_MASK(SQLSQL92Predicates, SQL_SQL92_PREDICATES,
-                            SQL_SP_BETWEEN | SQL_SP_COMPARISON | SQL_SP_IN
-                                | SQL_SP_ISNULL | SQL_SP_LIKE);
-TEST_SQL_GET_INFO_UINT_MASK(SQLSQL92RelationalJoinOperators,
-                            SQL_SQL92_RELATIONAL_JOIN_OPERATORS,
-                            SQL_SRJO_CROSS_JOIN | SQL_SRJO_INNER_JOIN
-                                | SQL_SRJO_LEFT_OUTER_JOIN
-                                | SQL_SRJO_RIGHT_OUTER_JOIN);
-TEST_SQL_GET_INFO_UINT_MASK(SQLSQL92ValueExpressions,
-                            SQL_SQL92_VALUE_EXPRESSIONS,
-                            SQL_SVE_CASE | SQL_SVE_CAST);
-TEST_SQL_GET_INFO_UINT_MASK(SQLDatetimeLiterals, SQL_DATETIME_LITERALS, 0);
-TEST_SQL_GET_INFO_STRING(SQLOrderByColumnsInSelect,
-                         SQL_ORDER_BY_COLUMNS_IN_SELECT, L"Y");
-TEST_SQL_GET_INFO_STRING(SQLCatalogName, SQL_CATALOG_NAME, L"N");
-
-////////////////
-// Conversion //
-////////////////
-
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertInteger, SQL_CONVERT_INTEGER, SQL_CVT_INTEGER | SQL_CVT_REAL | SQL_CVT_DOUBLE | SQL_CVT_BIT | SQL_CVT_BIGINT | SQL_CVT_WVARCHAR);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertSmallint, SQL_CONVERT_SMALLINT, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertTinyint, SQL_CONVERT_TINYINT, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertBit, SQL_CONVERT_BIT, SQL_CVT_INTEGER | SQL_CVT_REAL | SQL_CVT_DOUBLE | SQL_CVT_BIT | SQL_CVT_BIGINT | SQL_CVT_WVARCHAR);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertVarchar, SQL_CONVERT_VARCHAR, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertBigint, SQL_CONVERT_BIGINT, SQL_CVT_INTEGER | SQL_CVT_REAL | SQL_CVT_DOUBLE | SQL_CVT_BIT | SQL_CVT_BIGINT | SQL_CVT_WVARCHAR);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertDecimal, SQL_CONVERT_DECIMAL, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertDouble, SQL_CONVERT_DOUBLE, SQL_CVT_INTEGER | SQL_CVT_REAL | SQL_CVT_DOUBLE | SQL_CVT_BIT | SQL_CVT_BIGINT | SQL_CVT_WVARCHAR);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertFloat, SQL_CONVERT_FLOAT, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertNumeric, SQL_CONVERT_NUMERIC, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertReal, SQL_CONVERT_REAL, SQL_CVT_INTEGER | SQL_CVT_REAL | SQL_CVT_DOUBLE | SQL_CVT_BIT | SQL_CVT_BIGINT | SQL_CVT_WVARCHAR);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertDate, SQL_CONVERT_DATE, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertTime, SQL_CONVERT_TIME, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertTimestamp, SQL_CONVERT_TIMESTAMP, SQL_CVT_TIMESTAMP | SQL_CVT_WVARCHAR);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertBinary, SQL_CONVERT_BINARY, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertLongvarbinary, SQL_CONVERT_LONGVARBINARY,
-                            0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertVarbinary, SQL_CONVERT_VARBINARY, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertChar, SQL_CONVERT_CHAR, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertLongVarchar, SQL_CONVERT_LONGVARCHAR, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertWChar, SQL_CONVERT_WCHAR, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertWLongVarchar, SQL_CONVERT_WLONGVARCHAR,
-                            0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertWVarchar, SQL_CONVERT_WVARCHAR, SQL_CVT_INTEGER | SQL_CVT_REAL | SQL_CVT_DOUBLE | SQL_CVT_BIGINT | SQL_CVT_WVARCHAR);
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertGuid, SQL_CONVERT_GUID, 0);
-
-//////////////////////
-// Scalar Functions //
-//////////////////////
-
-TEST_SQL_GET_INFO_UINT_MASK(SQLConvertFunctions, SQL_CONVERT_FUNCTIONS,
-                            SQL_FN_CVT_CAST);
-TEST_SQL_GET_INFO_UINT_MASK(SQLNumericFunctions, SQL_NUMERIC_FUNCTIONS,
-                            SQL_FN_NUM_ABS | SQL_FN_NUM_ATAN | SQL_FN_NUM_ATAN2
-                                | SQL_FN_NUM_COS | SQL_FN_NUM_COT
-                                | SQL_FN_NUM_DEGREES | SQL_FN_NUM_FLOOR
-                                | SQL_FN_NUM_LOG | SQL_FN_NUM_LOG10
-                                | SQL_FN_NUM_PI | SQL_FN_NUM_POWER
-                                | SQL_FN_NUM_RADIANS | SQL_FN_NUM_ROUND
-                                | SQL_FN_NUM_SIGN | SQL_FN_NUM_SIN
-                                | SQL_FN_NUM_SQRT | SQL_FN_NUM_TAN);
-TEST_SQL_GET_INFO_UINT_MASK(SQLStringFunctions, SQL_STRING_FUNCTIONS,
-                            SQL_FN_STR_ASCII | SQL_FN_STR_LENGTH
-                                | SQL_FN_STR_LTRIM | SQL_FN_STR_REPLACE
-                                | SQL_FN_STR_RTRIM | SQL_FN_STR_SUBSTRING);
-TEST_SQL_GET_INFO_UINT_MASK(SQLSystemFunctions, SQL_SYSTEM_FUNCTIONS,
-                            SQL_FN_SYS_IFNULL);
-TEST_SQL_GET_INFO_UINT_MASK(SQLTimedateAddIntervals, SQL_TIMEDATE_ADD_INTERVALS,
-                            0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLTimedateDiffIntervals,
-                            SQL_TIMEDATE_DIFF_INTERVALS, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLTimedateFunctions, SQL_TIMEDATE_FUNCTIONS,
-                            SQL_FN_TD_CURDATE | SQL_FN_TD_DAYOFMONTH
-                                | SQL_FN_TD_MONTH | SQL_FN_TD_MONTHNAME
-                                | SQL_FN_TD_NOW | SQL_FN_TD_YEAR);
-TEST_SQL_GET_INFO_UINT_MASK(SQLSQL92DatetimeFunctions,
-                            SQL_SQL92_DATETIME_FUNCTIONS, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLSQL92NumericValueFunctions,
-                            SQL_SQL92_NUMERIC_VALUE_FUNCTIONS, 0);
-TEST_SQL_GET_INFO_UINT_MASK(SQLSQL92StringFunctions, SQL_SQL92_STRING_FUNCTIONS,
-                            SQL_SSF_LOWER | SQL_SSF_UPPER);
-
-////////////
-// Limits //
-////////////
-
-TEST_SQL_GET_INFO_UINT16(SQLMaxIdentifierLen, SQL_MAX_IDENTIFIER_LEN, SHRT_MAX);
-TEST_SQL_GET_INFO_UINT16(SQLMaxColumnsInGroupBy, SQL_MAX_COLUMNS_IN_GROUP_BY,
-                         0);
-TEST_SQL_GET_INFO_UINT16(SQLMaxColumnsInOrderBy, SQL_MAX_COLUMNS_IN_ORDER_BY,
-                         0);
-TEST_SQL_GET_INFO_UINT16(SQLMaxColumnsInSelect, SQL_MAX_COLUMNS_IN_SELECT, 0);
-
-int main(int argc, char** argv) {
-#ifdef __APPLE__
-    // Enable malloc logging for detecting memory leaks.
-    system("export MallocStackLogging=1");
-#endif
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-
-    int failures = RUN_ALL_TESTS();
-
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-#ifdef __APPLE__
-    // Disable malloc logging and report memory leaks
-    system("unset MallocStackLogging");
-    system("leaks itodbc_info > leaks_itodbc_info");
-#endif
-    return failures;
-}
diff --git a/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt
deleted file mode 100644
index ce452d5131..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-project(itodbc_pagination)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_odbc_pagination.cpp)
-include_directories(	${UT_HELPER} 
-			${IT_HELPER} 
-			${OPENSEARCHODBC_SRC}
-			${VLD_SRC}	)
-
-# Generate executable
-add_executable(itodbc_pagination ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_code_coverage(itodbc_pagination PUBLIC AUTO ALL)
-target_link_libraries(itodbc_pagination sqlodbc itodbc_helper ut_helper GTest::gtest_main)
-target_compile_definitions(itodbc_pagination PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCPagination/packages.config b/sql-odbc/src/IntegrationTests/ITODBCPagination/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCPagination/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.h b/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCPagination/test_odbc_pagination.cpp b/sql-odbc/src/IntegrationTests/ITODBCPagination/test_odbc_pagination.cpp
deleted file mode 100644
index 3e3d605813..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCPagination/test_odbc_pagination.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "unit_test_helper.h"
-#include "it_odbc_helper.h"
-// clang-format on
-
-#define BIND_SIZE 255
-#define SINGLE_ROW 1
-typedef struct Col {
-    SQLLEN data_len;
-    SQLCHAR data_dat[BIND_SIZE];
-} Col;
-
-class TestPagination : public testing::Test {
-   public:
-    TestPagination() {
-    }
-
-    void SetUp() {
-        AllocConnection(&m_env, &m_conn, true, true);
-    }
-
-    void TearDown() {
-        if (SQL_NULL_HDBC != m_conn) {
-            SQLFreeHandle(SQL_HANDLE_DBC, m_conn);
-            SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-        }
-    }
-
-    int GetTotalRowsAfterQueryExecution() {
-        SQLAllocHandle(SQL_HANDLE_STMT, m_conn, &m_hstmt);
-        SQLRETURN ret = SQLExecDirect(m_hstmt, (SQLTCHAR*)m_query.c_str(), SQL_NTS);
-        EXPECT_EQ(SQL_SUCCESS, ret);
-
-        // Get column count
-        SQLSMALLINT total_columns = -1;
-        SQLNumResultCols(m_hstmt, &total_columns);
-        std::vector< std::vector< Col > > cols(total_columns);
-        for (size_t i = 0; i < cols.size(); i++) {
-            cols[i].resize(SINGLE_ROW);
-        }
-
-        // Bind and fetch
-        for (size_t i = 0; i < cols.size(); i++) {
-            ret = SQLBindCol(m_hstmt, (SQLUSMALLINT)i + 1, SQL_C_CHAR,
-                             (SQLPOINTER)&cols[i][0].data_dat[i], 255,
-                             &cols[i][0].data_len);
-        }
-
-        // Get total number of rows
-        int row_count = 0;
-        while (SQLFetch(m_hstmt) == SQL_SUCCESS) {
-            row_count++;
-        }
-        return row_count;
-    }
-
-    ~TestPagination() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-    SQLTCHAR m_out_conn_string[1024];
-    SQLSMALLINT m_out_conn_string_length;
-    std::wstring m_query =
-        L"SELECT Origin FROM opensearch_dashboards_sample_data_flights";
-};
-
-TEST_F(TestPagination, EnablePagination) {
-    // Default fetch size is -1 for driver.
-    // Server default page size for all cursor requests is 1000.
-
-    //Total number of rows in opensearch_dashboards_sample_data_flights table
-    int total_rows = 13059;
-    std::wstring fetch_size_15_conn_string =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://localhost;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL="
-                  L"1;hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=localhost;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL="
-                  L"0;hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;";
-    ASSERT_EQ(SQL_SUCCESS,
-              SQLDriverConnect(
-                  m_conn, NULL, (SQLTCHAR*)fetch_size_15_conn_string.c_str(),
-                  SQL_NTS, m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                  &m_out_conn_string_length, SQL_DRIVER_PROMPT));
-    EXPECT_EQ(total_rows, GetTotalRowsAfterQueryExecution());
-}
-
-TEST_F(TestPagination, DisablePagination) {
-    // Fetch size 0 implies no pagination
-    int total_rows = 200;
-    std::wstring fetch_size_15_conn_string =
-        use_ssl ? L"Driver={OpenSearch ODBC};"
-                  L"host=https://localhost;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL="
-                  L"1;hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;fetchSize=0;"
-                : L"Driver={OpenSearch ODBC};"
-                  L"host=localhost;port=9200;"
-                  L"user=admin;password=admin;auth=BASIC;useSSL="
-                  L"0;hostnameVerification=0;logLevel=0;logOutput=C:\\;"
-                  L"responseTimeout=10;fetchSize=0;";
-    ASSERT_EQ(SQL_SUCCESS,
-              SQLDriverConnect(
-                  m_conn, NULL, (SQLTCHAR*)fetch_size_15_conn_string.c_str(),
-                  SQL_NTS, m_out_conn_string, IT_SIZEOF(m_out_conn_string),
-                  &m_out_conn_string_length, SQL_DRIVER_PROMPT));
-    EXPECT_EQ(total_rows, GetTotalRowsAfterQueryExecution());
-}
-
-int main(int argc, char** argv) {
-#ifdef __APPLE__
-    // Enable malloc logging for detecting memory leaks.
-    system("export MallocStackLogging=1");
-#endif
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-
-    int failures = RUN_ALL_TESTS();
-
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-#ifdef __APPLE__
-    // Disable malloc logging and report memory leaks
-    system("unset MallocStackLogging");
-    system("leaks itodbc_pagination > leaks_itodbc_pagination");
-#endif
-    return failures;
-}
diff --git a/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt
deleted file mode 100644
index 9ea86199b4..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-project(itodbc_results)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_odbc_results.cpp)
-include_directories(	${UT_HELPER}
-						${IT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${VLD_SRC}  )
-
-# Generate executable
-add_executable(itodbc_results ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_code_coverage(itodbc_results PUBLIC AUTO ALL)
-target_link_libraries(itodbc_results sqlodbc itodbc_helper ut_helper GTest::gtest_main)
-target_compile_definitions(itodbc_results PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCResults/packages.config b/sql-odbc/src/IntegrationTests/ITODBCResults/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCResults/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/IntegrationTests/ITODBCResults/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCResults/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCResults/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCResults/pch.h b/sql-odbc/src/IntegrationTests/ITODBCResults/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCResults/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCResults/test_odbc_results.cpp b/sql-odbc/src/IntegrationTests/ITODBCResults/test_odbc_results.cpp
deleted file mode 100644
index 7d0b9b6c05..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCResults/test_odbc_results.cpp
+++ /dev/null
@@ -1,1004 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "unit_test_helper.h"
-#include "it_odbc_helper.h"
-#include <cmath>
-// clang-format on
-
-typedef struct DescribeColumnData {
-    std::wstring column_name;
-    SQLSMALLINT data_type;
-} DescribeColumnData;
-
-const DescribeColumnData column_data[] = {{L"Origin", SQL_WVARCHAR},
-                                          {L"FlightNum", SQL_WVARCHAR},
-                                          {L"FlightDelay", SQL_BIT},
-                                          {L"DistanceMiles", SQL_REAL},
-                                          {L"FlightTimeMin", SQL_REAL},
-                                          {L"OriginWeather", SQL_WVARCHAR},
-                                          {L"dayOfWeek", SQL_INTEGER},
-                                          {L"AvgTicketPrice", SQL_REAL},
-                                          {L"Carrier", SQL_WVARCHAR},
-                                          {L"FlightDelayMin", SQL_INTEGER},
-                                          {L"OriginRegion", SQL_WVARCHAR},
-                                          {L"DestAirportID", SQL_WVARCHAR},
-                                          {L"FlightDelayType", SQL_WVARCHAR},
-                                          {L"timestamp", SQL_TYPE_TIMESTAMP},
-                                          {L"Dest", SQL_WVARCHAR},
-                                          {L"FlightTimeHour", SQL_WVARCHAR},
-                                          {L"Cancelled", SQL_BIT},
-                                          {L"DistanceKilometers", SQL_REAL},
-                                          {L"OriginCityName", SQL_WVARCHAR},
-                                          {L"DestWeather", SQL_WVARCHAR},
-                                          {L"OriginCountry", SQL_WVARCHAR},
-                                          {L"DestCountry", SQL_WVARCHAR},
-                                          {L"DestRegion", SQL_WVARCHAR},
-                                          {L"OriginAirportID", SQL_WVARCHAR},
-                                          {L"DestCityName", SQL_WVARCHAR}};
-const std::wstring flight_data_set = L"opensearch_dashboards_sample_data_flights";
-const std::wstring multi_type_data_set = L"opensearch_dashboards_sample_data_types";
-const std::wstring single_col = L"Origin";
-// TODO (#110): Improve sample data result checks
-const std::wstring m_expected_origin_column_data_1 =
-    L"Frankfurt am Main Airport";
-const std::wstring m_expected_origin_column_data_2 = L"Olenya Air Base";
-const std::wstring single_float_col = L"DistanceMiles";
-const std::wstring single_integer_col = L"FlightDelayMin";
-const std::wstring single_timestamp_col = L"timestamp";
-const std::wstring single_bit_col = L"Cancelled";
-const std::wstring single_row_offset_3 = L"1 OFFSET 3";
-const uint32_t data_cnt = 2;
-const std::wstring single_row_offsets[data_cnt] = {L"1", L"1 OFFSET 1"};
-const std::wstring type_boolean = L"type_boolean";
-const std::vector< bool > type_boolean_vals = {false, true, true};
-const std::wstring type_byte = L"type_byte";
-const std::vector< int16_t > type_byte_vals = {100, -120};
-const std::wstring type_short = L"type_short";
-const std::vector< int16_t > type_short_vals = {1000, -2000};
-const std::wstring type_integer = L"type_integer";
-const std::vector< int32_t > type_integer_vals = {250000000, -350000000};
-const std::wstring type_long = L"type_long";
-const std::vector< int64_t > type_long_vals = {8000000000, -8010000000};
-const std::wstring type_half_float = L"type_half_float";
-const std::vector< float > type_half_float_vals = {1.115f, -2.115f};
-const std::wstring type_float = L"type_float";
-const std::vector< float > type_float_vals = {2.1512f, -3.1512f};
-const std::wstring type_double = L"type_double";
-const std::vector< double > type_double_vals = {25235.2215, -5335.2215};
-const std::wstring type_scaled_float = L"type_scaled_float";
-const std::vector< double > type_scaled_float_vals = {100, -100.1};
-const std::wstring type_keyword = L"type_keyword";
-const std::vector< std::wstring > type_keyword_vals = {L"hello", L"goodbye"};
-const std::wstring type_text = L"type_text";
-const std::vector< std::wstring > type_text_vals = {L"world", L"planet"};
-const std::wstring type_date = L"type_date";
-const std::vector< TIMESTAMP_STRUCT > type_date_vals = {
-    {2016, 02, 21, 12, 23, 52, 803000000},
-    {2018, 07, 22, 12, 23, 52, 803000000}};
-const std::wstring type_object = L"type_object";
-const std::wstring type_nested = L"type_nested";
-// TODO (#110): Improve sample data result checks
-const float distance_miles_1 = 1738.98f;
-const float distance_miles_2 = 10247.90f;
-const int delay_offset_3_1 = 0;
-const int delay_offset_3_2 = 180;
-const SQLSMALLINT single_col_name_length = 6;
-const SQLSMALLINT single_col_data_type = SQL_WVARCHAR;
-const SQLULEN single_col_column_size = 25;
-const SQLSMALLINT single_col_decimal_digit = 0;
-const SQLSMALLINT single_col_nullable = 2;
-const std::wstring single_row = L"1";
-const size_t multi_row_cnt = 25;
-const size_t single_row_cnt = 1;
-const size_t multi_col_cnt = 25;
-const size_t single_col_cnt = 1;
-const size_t single_row_rd_cnt = 1;
-const size_t multi_row_rd_cnt_aligned = 5;
-const size_t multi_row_rd_cnt_misaligned = 3;
-const std::wstring multi_col = L"*";
-const std::wstring multi_row = std::to_wstring(multi_row_cnt);
-typedef struct Col {
-    SQLLEN data_len;
-    SQLCHAR data_dat[255];
-} Col;
-
-template < class T >
-void CheckData(const std::wstring& type_name, const std::wstring& data_set,
-               const std::wstring row, SQLHSTMT* hstmt,
-               const SQLUSMALLINT ordinal_pos, const SQLUSMALLINT type,
-               const std::vector< T >& expected_val, const SQLLEN data_size);
-template < class T >
-inline bool FuzzyEquals(T a, T b, T epsil);
-void BindColumns(std::vector< std::vector< Col > >& cols, SQLHSTMT* hstmt);
-void ExecuteQuery(const std::wstring& column, const std::wstring& dataset,
-                  const std::wstring& count, SQLHSTMT* hstmt);
-void ExtendedFetch(const size_t exp_row_cnt, const size_t exp_read_cnt,
-                   const bool aligned, const size_t total_row_cnt,
-                   SQLHSTMT* hstmt);
-void Fetch(size_t exp_row_cnt, SQLHSTMT* hstmt);
-void QueryBind(const size_t row_cnt, const size_t col_cnt,
-               const size_t row_fetch_cnt, const std::wstring& column_name,
-               std::vector< std::vector< Col > >& cols, SQLHSTMT* hstmt);
-void QueryBindFetch(const size_t row_cnt, const size_t col_cnt,
-                    const std::wstring& column_name, SQLHSTMT* hstmt);
-void QueryFetch(const std::wstring& column, const std::wstring& dataset,
-                const std::wstring& count, SQLHSTMT* hstmt);
-
-template < class T >
-inline bool FuzzyEquals(T a, T b, T epsil) {
-    return std::abs(a - b) <= epsil;
-}
-
-inline void BindColumns(std::vector< std::vector< Col > >& cols,
-                        SQLHSTMT* hstmt) {
-    SQLRETURN ret;
-    for (size_t i = 0; i < cols.size(); i++) {
-        ret = SQLBindCol(*hstmt, (SQLUSMALLINT)i + 1, SQL_C_CHAR,
-                         (SQLPOINTER)&cols[i][0].data_dat[i], 255,
-                         &cols[i][0].data_len);
-        LogAnyDiagnostics(SQL_HANDLE_STMT, *hstmt, ret);
-        ASSERT_TRUE(SQL_SUCCEEDED(ret));
-    }
-}
-
-inline void ExecuteQuery(const std::wstring& column,
-                         const std::wstring& dataset, const std::wstring& count,
-                         SQLHSTMT* hstmt) {
-    std::wstring statement = QueryBuilder(column, dataset, count);
-    SQLRETURN ret = SQLExecDirect(*hstmt, (SQLTCHAR*)statement.c_str(),
-                                  (SQLINTEGER)statement.length());
-    LogAnyDiagnostics(SQL_HANDLE_STMT, *hstmt, ret);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-}
-
-inline void ExtendedFetch(const size_t exp_row_cnt, const size_t exp_read_cnt,
-                          const bool aligned, const size_t total_row_cnt,
-                          SQLHSTMT* hstmt) {
-    SQLULEN row_cnt = 0;
-    SQLUSMALLINT row_stat[10];
-    size_t read_cnt = 0;
-    SQLRETURN ret;
-    while (
-        (ret = SQLExtendedFetch(*hstmt, SQL_FETCH_NEXT, 0, &row_cnt, row_stat))
-        == SQL_SUCCESS) {
-        read_cnt++;
-        if (aligned) {
-            EXPECT_EQ(row_cnt, exp_row_cnt);
-        } else {
-            size_t adj_exp_row_cnt = ((read_cnt * exp_row_cnt) > total_row_cnt)
-                                         ? (total_row_cnt % exp_row_cnt)
-                                         : exp_row_cnt;
-            EXPECT_EQ(row_cnt, adj_exp_row_cnt);
-        }
-    }
-
-    LogAnyDiagnostics(SQL_HANDLE_STMT, *hstmt, ret);
-    EXPECT_EQ(exp_read_cnt, read_cnt);
-}
-
-inline void Fetch(size_t exp_row_cnt, SQLHSTMT* hstmt) {
-    SQLRETURN ret;
-    size_t read_cnt = 0;
-    while ((ret = SQLFetch(*hstmt)) == SQL_SUCCESS) {
-        read_cnt++;
-    }
-
-    LogAnyDiagnostics(SQL_HANDLE_STMT, *hstmt, ret);
-    EXPECT_EQ(exp_row_cnt, read_cnt);
-}
-
-inline void QueryBind(const size_t row_cnt, const size_t col_cnt,
-                      const size_t row_fetch_cnt,
-                      const std::wstring& column_name,
-                      std::vector< std::vector< Col > >& cols,
-                      SQLHSTMT* hstmt) {
-    (void)col_cnt;
-    SQLRETURN ret =
-        SQLSetStmtAttr(*hstmt, SQL_ROWSET_SIZE, (void*)row_fetch_cnt, 0);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, *hstmt, ret);
-    ASSERT_EQ(ret, SQL_SUCCESS);
-
-    std::wstring row_str = std::to_wstring(row_cnt);
-    ExecuteQuery(column_name, flight_data_set, row_str, hstmt);
-
-    for (size_t i = 0; i < cols.size(); i++) {
-        cols[i].resize(row_fetch_cnt);
-    }
-    BindColumns(cols, hstmt);
-}
-
-inline void QueryBindExtendedFetch(const size_t row_cnt, const size_t col_cnt,
-                                   const size_t row_fetch_cnt,
-                                   const std::wstring& column_name,
-                                   SQLHSTMT* hstmt) {
-    std::vector< std::vector< Col > > cols(col_cnt);
-    QueryBind(row_cnt, col_cnt, row_fetch_cnt, column_name, cols, hstmt);
-
-    // Fetch data
-    size_t misaligned = ((row_cnt % row_fetch_cnt) != 0);
-    size_t exp_read_cnt = (row_cnt / row_fetch_cnt) + misaligned;
-    ExtendedFetch(row_fetch_cnt, exp_read_cnt, (bool)!misaligned, row_cnt,
-                  hstmt);
-    CloseCursor(hstmt, true, true);
-}
-
-inline void QueryBindFetch(const size_t row_cnt, const size_t col_cnt,
-                           const std::wstring& column_name, SQLHSTMT* hstmt) {
-    std::vector< std::vector< Col > > cols(col_cnt);
-    QueryBind(row_cnt, col_cnt, 1, column_name, cols, hstmt);
-
-    // Fetch data
-    Fetch(row_cnt, hstmt);
-    CloseCursor(hstmt, true, true);
-}
-
-void QueryFetch(const std::wstring& column, const std::wstring& dataset,
-                const std::wstring& count, SQLHSTMT* hstmt) {
-    ExecuteQuery(column, dataset, count, hstmt);
-    SQLRETURN ret = SQLFetch(*hstmt);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, *hstmt, ret);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-}
-
-template < class T >
-void CheckData(const std::wstring& type_name, const std::wstring& data_set,
-               const std::wstring row, SQLHSTMT* hstmt,
-               const SQLUSMALLINT ordinal_pos, const SQLUSMALLINT type,
-               const std::vector< T >& expected_val, const SQLLEN data_size) {
-    QueryFetch(type_name, data_set, row, hstmt);
-    T val;
-    SQLLEN out_size;
-    const SQLRETURN ret =
-        SQLGetData(*hstmt, ordinal_pos, type, &val, data_size, &out_size);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, *hstmt, ret);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-    bool valid = false;
-    for (size_t i = 0; i < expected_val.size(); i++) {
-        valid |= (val == expected_val[i]);
-        if (valid)
-            break;
-    }
-    EXPECT_TRUE(valid);
-}
-
-template <>
-void CheckData< float >(const std::wstring& type_name,
-                        const std::wstring& data_set, const std::wstring row,
-                        SQLHSTMT* hstmt, const SQLUSMALLINT ordinal_pos,
-                        const SQLUSMALLINT type,
-                        const std::vector< float >& expected_val,
-                        const SQLLEN data_size) {
-    QueryFetch(type_name, data_set, row, hstmt);
-    float val;
-    SQLLEN out_size;
-    const SQLRETURN ret =
-        SQLGetData(*hstmt, ordinal_pos, type, &val, data_size, &out_size);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, *hstmt, ret);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-    bool valid = false;
-    for (auto& it : expected_val) {
-        valid |= FuzzyEquals(val, it, 0.1f);
-        if (valid)
-            break;
-    }
-}
-
-template <>
-void CheckData< double >(const std::wstring& type_name,
-                         const std::wstring& data_set, const std::wstring row,
-                         SQLHSTMT* hstmt, const SQLUSMALLINT ordinal_pos,
-                         const SQLUSMALLINT type,
-                         const std::vector< double >& expected_val,
-                         const SQLLEN data_size) {
-    QueryFetch(type_name, data_set, row, hstmt);
-    double val;
-    SQLLEN out_size;
-    const SQLRETURN ret =
-        SQLGetData(*hstmt, ordinal_pos, type, &val, data_size, &out_size);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, *hstmt, ret);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-    bool valid = false;
-    for (auto& it : expected_val) {
-        valid |= FuzzyEquals(val, it, 0.1);
-        if (valid)
-            break;
-    }
-    EXPECT_TRUE(valid);
-}
-
-template <>
-void CheckData< std::wstring >(const std::wstring& type_name,
-                               const std::wstring& data_set,
-                               const std::wstring row, SQLHSTMT* hstmt,
-                               const SQLUSMALLINT ordinal_pos,
-                               const SQLUSMALLINT type,
-                               const std::vector< std::wstring >& expected_val,
-                               const SQLLEN data_size) {
-    QueryFetch(type_name, data_set, row, hstmt);
-    std::vector< SQLTCHAR > val(data_size);
-    bool valid = false;
-    for (auto& it : expected_val) {
-        std::wstring str;
-        SQLLEN out_size;
-        while (SQLGetData(*hstmt, ordinal_pos, type, val.data(),
-                          data_size * sizeof(SQLTCHAR), &out_size)
-               == SQL_SUCCESS_WITH_INFO) {
-            str += val.data();
-        }
-        valid |= (str == it);
-        if (valid)
-            break;
-    }
-}
-
-template <>
-void CheckData< TIMESTAMP_STRUCT >(
-    const std::wstring& type_name, const std::wstring& data_set,
-    const std::wstring row, SQLHSTMT* hstmt, const SQLUSMALLINT ordinal_pos,
-    const SQLUSMALLINT type,
-    const std::vector< TIMESTAMP_STRUCT >& expected_val,
-    const SQLLEN data_size) {
-    auto compare_ts_struct = [](const TIMESTAMP_STRUCT& x,
-                                const TIMESTAMP_STRUCT& y) {
-        return ((x.year == y.year) && (x.month == y.month) && (x.day == y.day)
-                && (x.hour == y.hour) && (x.minute == y.minute)
-                && (x.second == y.second) && (x.fraction == y.fraction));
-    };
-    QueryFetch(type_name, data_set, row, hstmt);
-    TIMESTAMP_STRUCT val;
-    SQLLEN out_size;
-    const SQLRETURN ret =
-        SQLGetData(*hstmt, ordinal_pos, type, &val, data_size, &out_size);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, *hstmt, ret);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-    bool valid = false;
-    for (size_t i = 0; i < expected_val.size(); i++) {
-        valid |= compare_ts_struct(val, expected_val[i]);
-        if (valid)
-            break;
-    }
-    EXPECT_TRUE(valid);
-}
-
-#define GET_DATA_TEST(type, name, c_type, val_array, sz)                \
-    TEST_F(TestSQLGetData, type) {                                      \
-        for (uint32_t i = 0; i < data_cnt; i++) {                       \
-            CheckData(name, multi_type_data_set, single_row_offsets[i], \
-                      &m_hstmt, m_single_column_ordinal_position,       \
-                      (SQLUSMALLINT)c_type, val_array, sz);             \
-            if (i != (data_cnt - 1))                                    \
-                ASSERT_NO_THROW(CloseCursor(&m_hstmt, true, true));     \
-        }                                                               \
-    }
-
-class TestSQLBindCol : public testing::Test {
-   public:
-    TestSQLBindCol() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        ASSERT_NO_THROW(CloseCursor(&m_hstmt, true, true));
-        SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-        SQLDisconnect(m_conn);
-        SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-    }
-
-    ~TestSQLBindCol() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-class TestSQLFetch : public testing::Test {
-   public:
-    TestSQLFetch() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        if (m_hstmt != SQL_NULL_HSTMT) {
-            ASSERT_NO_THROW(CloseCursor(&m_hstmt, true, true));
-            SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-            SQLDisconnect(m_conn);
-            SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-        }
-    }
-
-    ~TestSQLFetch() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-class TestSQLExtendedFetch : public testing::Test {
-   public:
-    TestSQLExtendedFetch() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        if (m_hstmt != SQL_NULL_HSTMT) {
-            ASSERT_NO_THROW(CloseCursor(&m_hstmt, true, true));
-            SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-            SQLDisconnect(m_conn);
-            SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-        }
-    }
-
-    ~TestSQLExtendedFetch() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-class TestSQLGetData : public testing::Test {
-   public:
-    TestSQLGetData() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-    void TearDown() {
-        if (m_hstmt != SQL_NULL_HSTMT) {
-            ASSERT_NO_THROW(CloseCursor(&m_hstmt, true, true));
-            SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-            SQLDisconnect(m_conn);
-            SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-        }
-    }
-
-    ~TestSQLGetData() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-
-    static const uint16_t m_origin_column_buffer_length = 1024;
-    SQLUSMALLINT m_single_column_ordinal_position = 1;
-
-    SQLTCHAR m_origin_column_data[m_origin_column_buffer_length];
-    SQLLEN m_origin_indicator;
-};
-
-class TestSQLNumResultCols : public testing::Test {
-   public:
-    TestSQLNumResultCols() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        if (m_hstmt != SQL_NULL_HSTMT) {
-            ASSERT_NO_THROW(CloseCursor(&m_hstmt, true, true));
-            SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-            SQLDisconnect(m_conn);
-            SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-        }
-    }
-
-    ~TestSQLNumResultCols() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-    SQLSMALLINT m_column_count;
-};
-
-class TestSQLMoreResults : public testing::Test {
-   public:
-    TestSQLMoreResults() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        if (m_hstmt != SQL_NULL_HSTMT) {
-            ASSERT_NO_THROW(CloseCursor(&m_hstmt, true, true));
-            SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-            SQLDisconnect(m_conn);
-            SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-        }
-    }
-
-    ~TestSQLMoreResults() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-class TestSQLDescribeCol : public testing::Test {
-   public:
-    TestSQLDescribeCol() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        if (m_hstmt != SQL_NULL_HSTMT) {
-            ASSERT_NO_THROW(CloseCursor(&m_hstmt, true, true));
-            SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-            SQLDisconnect(m_conn);
-            SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-        }
-    }
-
-    ~TestSQLDescribeCol() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-    SQLSMALLINT m_column_number;
-    SQLTCHAR m_column_name[50];
-    SQLSMALLINT m_column_name_length;
-    SQLSMALLINT m_data_type;
-    SQLULEN m_column_size;
-    SQLSMALLINT m_decimal_digits;
-    SQLSMALLINT m_nullable;
-};
-
-class TestSQLRowCount : public testing::Test {
-   public:
-    TestSQLRowCount() {
-    }
-
-    void SetUp() {
-        ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env,
-                                       &m_conn, &m_hstmt, true, true));
-    }
-
-    void TearDown() {
-        if (m_hstmt != SQL_NULL_HSTMT) {
-            ASSERT_NO_THROW(CloseCursor(&m_hstmt, true, true));
-            SQLFreeHandle(SQL_HANDLE_STMT, m_hstmt);
-            SQLDisconnect(m_conn);
-            SQLFreeHandle(SQL_HANDLE_ENV, m_env);
-        }
-    }
-
-    ~TestSQLRowCount() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-TEST_F(TestSQLBindCol, SingleColumnSingleBind) {
-    std::vector< std::vector< Col > > cols(single_col_cnt);
-    QueryBind(single_row_cnt, single_col_cnt, 1, single_col, cols, &m_hstmt);
-}
-
-TEST_F(TestSQLBindCol, MultiColumnMultiBind) {
-    std::vector< std::vector< Col > > cols(multi_col_cnt);
-    QueryBind(single_row_cnt, multi_col_cnt, 1, multi_col, cols, &m_hstmt);
-}
-
-// Looked at SQLBindCol - if < requested column are allocated, it will
-// reallocate additional space for that column
-TEST_F(TestSQLBindCol, InvalidColIndex0) {
-    std::vector< std::vector< Col > > cols(single_col_cnt);
-    SQLRETURN ret = SQLSetStmtAttr(m_hstmt, SQL_ROWSET_SIZE, (void*)1, 0);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    ASSERT_EQ(ret, SQL_SUCCESS);
-
-    std::wstring row_str = std::to_wstring(single_row_cnt);
-    ExecuteQuery(single_col, flight_data_set, row_str, &m_hstmt);
-
-    for (size_t i = 0; i < cols.size(); i++) {
-        cols[i].resize(1);
-    }
-    ret = SQLBindCol(m_hstmt, (SQLUSMALLINT)1, SQL_C_CHAR,
-                     (SQLPOINTER)&cols[0][0].data_dat[0], 255,
-                     &cols[0][0].data_len);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-    ret = SQLBindCol(m_hstmt, (SQLUSMALLINT)0, SQL_C_CHAR,
-                     (SQLPOINTER)&cols[0][0].data_dat[0], 255,
-                     &cols[0][0].data_len);
-    EXPECT_FALSE(SQL_SUCCEEDED(ret));
-}
-
-TEST_F(TestSQLBindCol, InsufficientSpace) {
-    SQLRETURN ret = SQLSetStmtAttr(m_hstmt, SQL_ROWSET_SIZE, (void*)1, 0);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    ASSERT_EQ(ret, SQL_SUCCESS);
-
-    std::wstring row_str = std::to_wstring(single_row_cnt);
-    ExecuteQuery(single_col, flight_data_set, row_str, &m_hstmt);
-
-    SQLLEN length = 0;
-    std::vector< SQLTCHAR > data_buffer(2);
-    ret = SQLBindCol(m_hstmt, (SQLUSMALLINT)1, SQL_C_CHAR,
-                     (SQLPOINTER)data_buffer.data(), 2, &length);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-
-    SQLULEN row_cnt = 0;
-    SQLUSMALLINT row_stat = 0;
-    std::vector< SQLTCHAR > msg_buffer(512);
-    ret = SQLExtendedFetch(m_hstmt, SQL_FETCH_NEXT, 0, &row_cnt, &row_stat);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret, msg_buffer.data(), 512);
-    EXPECT_EQ(ret, SQL_SUCCESS_WITH_INFO);
-    EXPECT_STREQ(msg_buffer.data(), L"Fetched item was truncated.");
-    // TODO (#110): Improve sample data result checks
-    const wchar_t* data =
-        reinterpret_cast< const wchar_t* >(data_buffer.data());
-    bool found_expected_data =
-        wcscmp(data, m_expected_origin_column_data_1.substr(0, 1).c_str())
-        || wcscmp(data, m_expected_origin_column_data_2.substr(0, 1).c_str());
-    EXPECT_TRUE(found_expected_data);
-}
-
-TEST_F(TestSQLFetch, SingleCol_SingleRow) {
-    EXPECT_NO_THROW(
-        QueryBindFetch(single_row_cnt, single_col_cnt, single_col, &m_hstmt));
-}
-
-TEST_F(TestSQLFetch, SingleCol_MultiRow) {
-    EXPECT_NO_THROW(
-        QueryBindFetch(multi_row_cnt, single_col_cnt, single_col, &m_hstmt));
-}
-
-TEST_F(TestSQLFetch, MultiCol_SingleRow) {
-    EXPECT_NO_THROW(
-        QueryBindFetch(single_row_cnt, multi_col_cnt, multi_col, &m_hstmt));
-}
-
-TEST_F(TestSQLFetch, MultiCol_MultiRow) {
-    EXPECT_NO_THROW(
-        QueryBindFetch(multi_row_cnt, multi_col_cnt, multi_col, &m_hstmt));
-}
-
-TEST_F(TestSQLExtendedFetch, SingleCol_SingleRow) {
-    EXPECT_NO_THROW(QueryBindExtendedFetch(single_row_cnt, single_col_cnt,
-                                           single_row_rd_cnt, single_col,
-                                           &m_hstmt));
-}
-
-TEST_F(TestSQLExtendedFetch, SingleCol_MultiRow_SingleFetch) {
-    EXPECT_NO_THROW(QueryBindExtendedFetch(multi_row_cnt, single_col_cnt,
-                                           single_row_rd_cnt, single_col,
-                                           &m_hstmt));
-}
-
-TEST_F(TestSQLExtendedFetch, SingleCol_MultiRow_MultiFetch_Aligned) {
-    EXPECT_NO_THROW(QueryBindExtendedFetch(multi_row_cnt, single_col_cnt,
-                                           multi_row_rd_cnt_aligned, single_col,
-                                           &m_hstmt));
-}
-
-TEST_F(TestSQLExtendedFetch, SingleCol_MultiRow_MultiFetch_Misaligned) {
-    EXPECT_NO_THROW(QueryBindExtendedFetch(multi_row_cnt, single_col_cnt,
-                                           multi_row_rd_cnt_misaligned,
-                                           single_col, &m_hstmt));
-}
-
-TEST_F(TestSQLExtendedFetch, MultiCol_SingleRow) {
-    EXPECT_NO_THROW(QueryBindExtendedFetch(
-        single_row_cnt, multi_col_cnt, single_row_rd_cnt, multi_col, &m_hstmt));
-}
-
-TEST_F(TestSQLExtendedFetch, MultiCol_MultiRow_SingleFetch) {
-    EXPECT_NO_THROW(QueryBindExtendedFetch(
-        multi_row_cnt, multi_col_cnt, single_row_rd_cnt, multi_col, &m_hstmt));
-}
-
-TEST_F(TestSQLExtendedFetch, MultiCol_MultiRow_MultiFetch_Aligned) {
-    EXPECT_NO_THROW(QueryBindExtendedFetch(multi_row_cnt, multi_col_cnt,
-                                           multi_row_rd_cnt_aligned, multi_col,
-                                           &m_hstmt));
-}
-
-TEST_F(TestSQLExtendedFetch, MultiCol_MultiRow_MultiFetch_Misaligned) {
-    EXPECT_NO_THROW(QueryBindExtendedFetch(multi_row_cnt, multi_col_cnt,
-                                           multi_row_rd_cnt_misaligned,
-                                           multi_col, &m_hstmt));
-}
-
-TEST_F(TestSQLGetData, GetWVARCHARData) {
-    QueryFetch(single_col, flight_data_set, single_row, &m_hstmt);
-
-    SQLRETURN ret =
-        SQLGetData(m_hstmt, m_single_column_ordinal_position, SQL_C_WCHAR,
-                   m_origin_column_data, m_origin_column_buffer_length,
-                   &m_origin_indicator);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    EXPECT_TRUE(SQL_SUCCEEDED(ret));
-    // TODO (#110): Improve sample data result checks
-    bool found_expected_data =
-        wcscmp(m_origin_column_data, m_expected_origin_column_data_1.c_str())
-        || wcscmp(m_origin_column_data,
-                  m_expected_origin_column_data_2.c_str());
-    EXPECT_TRUE(found_expected_data);
-}
-
-TEST_F(TestSQLGetData, GetFloatData) {
-    QueryFetch(single_float_col, flight_data_set, single_row, &m_hstmt);
-
-    float data = 0.0f;
-    SQLRETURN ret = SQLGetData(m_hstmt, m_single_column_ordinal_position,
-                               SQL_C_FLOAT, &data, 4, &m_origin_indicator);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    EXPECT_TRUE(SQL_SUCCEEDED(ret));
-    // TODO (#110): Improve sample data result checks
-    printf("%f\n", data);
-    bool found_expected_data =
-        (data == distance_miles_1 || data == distance_miles_2);
-    EXPECT_TRUE(found_expected_data);
-}
-
-TEST_F(TestSQLGetData, GetIntegerData) {
-    QueryFetch(single_integer_col, flight_data_set, single_row_offset_3,
-               &m_hstmt);
-
-    int data = 0;
-    SQLRETURN ret =
-        SQLGetData(m_hstmt, m_single_column_ordinal_position, SQL_C_LONG, &data,
-                   sizeof(int), &m_origin_indicator);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    EXPECT_TRUE(SQL_SUCCEEDED(ret));
-    // TODO (#110): Improve sample data result checks
-    bool found_expected_data =
-        (data == delay_offset_3_1 || data == delay_offset_3_2);
-    EXPECT_TRUE(found_expected_data);
-}
-
-TEST_F(TestSQLGetData, GetBitData) {
-    QueryFetch(single_bit_col, flight_data_set, single_row, &m_hstmt);
-
-    bool data_false;
-    SQLRETURN ret = SQLGetData(m_hstmt, m_single_column_ordinal_position,
-                               SQL_C_BIT, &data_false, 1, &m_origin_indicator);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    EXPECT_TRUE(SQL_SUCCEEDED(ret));
-    // TODO (#110): Improve sample data result checks
-    // Since it can return either true or false, will disable check for now
-    // EXPECT_FALSE(data_false);
-
-    // Send another query
-    ASSERT_NO_THROW(CloseCursor(&m_hstmt, true, true));
-    QueryFetch(single_bit_col, flight_data_set, single_row_offset_3, &m_hstmt);
-
-    ret = SQLGetData(m_hstmt, m_single_column_ordinal_position, SQL_C_BIT,
-                     &data_false, 1, &m_origin_indicator);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    EXPECT_TRUE(SQL_SUCCEEDED(ret));
-    // TODO (#110): Improve sample data result checks
-    // Since it can return either true or false, will disable check for now
-    // EXPECT_FALSE(data_false);
-}
-
-GET_DATA_TEST(TypeDataSet_GetBoolData, type_boolean, SQL_C_BIT,
-              type_boolean_vals, 1)
-
-GET_DATA_TEST(TypeDataSet_GetByteData, type_byte, SQL_C_SHORT, type_byte_vals,
-              2)
-
-GET_DATA_TEST(TypeDataSet_GetDateData, type_date, SQL_C_TIMESTAMP,
-              type_date_vals, sizeof(TIMESTAMP_STRUCT))
-
-GET_DATA_TEST(TypeDataSet_GetShortData, type_short, SQL_C_SHORT,
-              type_short_vals, 2)
-
-GET_DATA_TEST(TypeDataSet_GetIntegerData, type_integer, SQL_C_LONG,
-              type_integer_vals, 4)
-
-GET_DATA_TEST(TypeDataSet_GetLongData, type_long, SQL_C_SBIGINT, type_long_vals,
-              8)
-
-GET_DATA_TEST(TypeDataSet_GetHalfFloatData, type_half_float, SQL_C_FLOAT,
-              type_half_float_vals, 4)
-
-GET_DATA_TEST(TypeDataSet_GetFloatData, type_float, SQL_C_FLOAT,
-              type_float_vals, 4)
-
-GET_DATA_TEST(TypeDataSet_GetDoubleData, type_double, SQL_C_DOUBLE,
-              type_double_vals, 8)
-
-GET_DATA_TEST(TypeDataSet_GetScaledFloatData, type_scaled_float, SQL_C_DOUBLE,
-              type_scaled_float_vals, 8)
-
-GET_DATA_TEST(TypeDataSet_GetKeywordData, type_keyword, SQL_C_WCHAR,
-              type_keyword_vals, 512)
-GET_DATA_TEST(TypeDataSet_GetKeywordDataMultiReadSingleByte, type_keyword,
-              SQL_C_WCHAR, type_keyword_vals, 2)
-GET_DATA_TEST(TypeDataSet_GetKeywordDataMultiReadMultiByte, type_keyword,
-              SQL_C_WCHAR, type_keyword_vals, 4)
-
-GET_DATA_TEST(TypeDataSet_GetTextData, type_text, SQL_C_WCHAR, type_text_vals,
-              512)
-GET_DATA_TEST(TypeDataSet_GetTextDataMultiReadSingleByte, type_text,
-              SQL_C_WCHAR, type_text_vals, 2)
-GET_DATA_TEST(TypeDataSet_GetTextDataMultiReadMultiByte, type_text, SQL_C_WCHAR,
-              type_text_vals, 4)
-
-TEST_F(TestSQLGetData, SQLSTATE_01004_StringDataRightTruncated) {
-    SQLRETURN ret;
-    SQLLEN insufficient_buffer_length = 1;
-
-    ExecuteQuery(single_col, flight_data_set, single_row, &m_hstmt);
-
-    ret = SQLFetch(m_hstmt);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-
-    ret = SQLGetData(m_hstmt, m_single_column_ordinal_position, SQL_C_WCHAR,
-                     m_origin_column_data, insufficient_buffer_length,
-                     &m_origin_indicator);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    EXPECT_EQ(ret, SQL_SUCCESS_WITH_INFO);
-    EXPECT_TRUE(CheckSQLSTATE(SQL_HANDLE_STMT, m_hstmt,
-                              SQLSTATE_STRING_DATA_RIGHT_TRUNCATED));
-}
-
-TEST_F(TestSQLGetData, SQLSTATE_07009_InvalidDescriptorIndex) {
-    SQLRETURN ret;
-    SQLUSMALLINT invalid_column_ordinal_position = 2;
-
-    ExecuteQuery(single_col, flight_data_set, single_row, &m_hstmt);
-
-    ret = SQLFetch(m_hstmt);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-
-    ret = SQLGetData(m_hstmt, invalid_column_ordinal_position, SQL_C_WCHAR,
-                     m_origin_column_data, m_origin_column_buffer_length,
-                     &m_origin_indicator);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-    EXPECT_EQ(ret, SQL_ERROR);
-    EXPECT_TRUE(CheckSQLSTATE(SQL_HANDLE_STMT, m_hstmt,
-                              SQLSTATE_INVALID_DESCRIPTOR_INDEX));
-}
-
-TEST_F(TestSQLNumResultCols, SingleColumn) {
-    std::wstring row_str = std::to_wstring(single_row_cnt);
-    ExecuteQuery(single_col, flight_data_set, row_str, &m_hstmt);
-
-    EXPECT_EQ(SQL_SUCCESS, SQLNumResultCols(m_hstmt, &m_column_count));
-    EXPECT_EQ(single_col_cnt, (size_t)m_column_count);
-}
-
-TEST_F(TestSQLNumResultCols, MultiColumn) {
-    std::wstring row_str = std::to_wstring(multi_row_cnt);
-    ExecuteQuery(multi_col, flight_data_set, row_str, &m_hstmt);
-
-    EXPECT_EQ(SQL_SUCCESS, SQLNumResultCols(m_hstmt, &m_column_count));
-    EXPECT_EQ(multi_col_cnt, (size_t)m_column_count);
-}
-
-TEST_F(TestSQLDescribeCol, SingleColumnMetadata) {
-    ExecuteQuery(single_col, flight_data_set, single_row, &m_hstmt);
-
-    EXPECT_EQ(
-        SQL_SUCCESS,
-        SQLDescribeCol(m_hstmt, 1, m_column_name, IT_SIZEOF(m_column_name),
-                       &m_column_name_length, &m_data_type, &m_column_size,
-                       &m_decimal_digits, &m_nullable));
-    EXPECT_EQ(single_col, m_column_name);
-    EXPECT_EQ(single_col_name_length, m_column_name_length);
-    EXPECT_EQ(single_col_data_type, m_data_type);
-    // TODO #628 - Investigate why value differs & fix validation accordingly
-    EXPECT_EQ(single_col_column_size, m_column_size);
-    EXPECT_EQ(single_col_decimal_digit, m_decimal_digits);
-    EXPECT_EQ(single_col_nullable, m_nullable);
-}
-
-TEST_F(TestSQLDescribeCol, MultiColumnMetadata) {
-    ExecuteQuery(multi_col, flight_data_set, multi_row, &m_hstmt);
-
-    for (SQLUSMALLINT i = 1; i <= multi_col_cnt; i++) {
-        EXPECT_EQ(
-            SQL_SUCCESS,
-            SQLDescribeCol(m_hstmt, i, m_column_name, IT_SIZEOF(m_column_name),
-                           &m_column_name_length, &m_data_type, &m_column_size,
-                           &m_decimal_digits, &m_nullable));
-    }
-}
-
-TEST_F(TestSQLDescribeCol, MultiColumnNameLengthType) {
-    ExecuteQuery(multi_col, flight_data_set, multi_row, &m_hstmt);
-
-    for (SQLUSMALLINT i = 1; i <= multi_col_cnt; i++) {
-        EXPECT_EQ(
-            SQL_SUCCESS,
-            SQLDescribeCol(m_hstmt, i, m_column_name, IT_SIZEOF(m_column_name),
-                           &m_column_name_length, &m_data_type, &m_column_size,
-                           &m_decimal_digits, &m_nullable));
-        EXPECT_EQ(column_data[i - 1].column_name, std::wstring(m_column_name));
-        EXPECT_EQ(column_data[i - 1].data_type, m_data_type);
-    }
-}
-
-TEST_F(TestSQLDescribeCol, InvalidColumnMetadata) {
-    ExecuteQuery(multi_col, flight_data_set, multi_row, &m_hstmt);
-
-    EXPECT_EQ(SQL_ERROR,
-              SQLDescribeCol(m_hstmt, multi_col_cnt + 1, m_column_name,
-                             IT_SIZEOF(m_column_name), &m_column_name_length,
-                             &m_data_type, &m_column_size, &m_decimal_digits,
-                             &m_nullable));
-    EXPECT_TRUE(CheckSQLSTATE(SQL_HANDLE_STMT, m_hstmt,
-                              SQLSTATE_INVALID_DESCRIPTOR_INDEX));
-}
-
-TEST_F(TestSQLMoreResults, NoData) {
-    SQLRETURN ret = SQLMoreResults(m_hstmt);
-    EXPECT_EQ(SQL_NO_DATA, ret);
-    LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-}
-
-// Row count is not supported for the driver, so this should return -1,
-// as defined in the ODBC API.
-TEST_F(TestSQLRowCount, RowCountNotAvailable) {
-    SQLLEN row_count;
-    SQLRETURN ret = SQLRowCount(m_hstmt, &row_count);
-    EXPECT_EQ(SQL_SUCCESS, ret);
-    EXPECT_EQ(row_count, -1L);
-}
-
-int main(int argc, char** argv) {
-#ifdef __APPLE__
-    // Enable malloc logging for detecting memory leaks.
-    system("export MallocStackLogging=1");
-#endif
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-
-    int failures = RUN_ALL_TESTS();
-
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-#ifdef __APPLE__
-    // Disable malloc logging and report memory leaks
-    system("unset MallocStackLogging");
-    system("leaks itodbc_results > leaks_itodbc_results");
-#endif
-    return failures;
-}
diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt
deleted file mode 100644
index e8c13d1770..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-project(itodbc_tableau_queries)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_odbc_tableau_queries.cpp)
-include_directories(	${UT_HELPER}
-						${IT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${VLD_SRC}  )
-
-# Generate executable
-add_executable(itodbc_tableau_queries ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_code_coverage(itodbc_tableau_queries PUBLIC AUTO ALL)
-target_link_libraries(itodbc_tableau_queries sqlodbc itodbc_helper ut_helper GTest::gtest_main)
-target_compile_definitions(itodbc_tableau_queries PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/packages.config b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.h b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/queries_all.txt b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/queries_all.txt
deleted file mode 100644
index 721bd26d4f..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/queries_all.txt
+++ /dev/null
@@ -1,216 +0,0 @@
-SELECT SUBSTRING(`opensearch_dashboards_sample_data_flights`.`OriginWeather`, 1, 1024) AS `OriginWeather` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) AS `sum_Offset_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`FlightDelay`) AS `sum_FlightDelay_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`DistanceMiles`) AS `sum_DistanceMiles_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT YEAR(`opensearch_dashboards_sample_data_flights`.`timestamp`) AS `yr_timestamp_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT SUM(ABS(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(ACOS(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252358221825_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(ASIN(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252358545410_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(ATAN(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252358811651_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(ATAN2(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`,`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`)) AS `sum_Calculation_160722252358811651_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(COS(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(COT(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(DEGREES(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM((`opensearch_dashboards_sample_data_flights`.`dayOfWeek` DIV `opensearch_dashboards_sample_data_flights`.`FlightDelayMin`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(EXP(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM((((CASE WHEN (ABS((`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) - (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + SQRT(3.0) * ((ABS((`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) - (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) / 3.0 ), 0 ) * 3.0))) - 1.0) > 0.0 THEN 1.5 ELSE 0.0 END) - (CASE WHEN ((`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) - (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) / 3.0 ), 0 ) * 3.0) < 0.0) AND ((CASE WHEN (ABS((`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) - (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + SQRT(3.0) * ((ABS((`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) - (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) / 3.0 ), 0 ) * 3.0))) - 1.0) > 0.0 THEN SQRT(3.0) / 2.0 ELSE 0.0 END) > 0.0) THEN 3.0 ELSE 0.0 END)) + (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) / 3.0 ), 0 ) * 3.0))) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(ROUND( (((CASE WHEN (ABS((`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) - (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + SQRT(3.0) * ((ABS((`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) - (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) / 3.0 ), 0 ) * 3.0))) - 1.0) > 0.0 THEN SQRT(3.0) / 2.0 ELSE 0.0 END) - (CASE WHEN ((`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) - (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) / SQRT(3.0) ), 0 ) * SQRT(3.0)) < 0.0) AND ((CASE WHEN (ABS((`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) - (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + SQRT(3.0) * ((ABS((`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) - (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) / 3.0 ), 0 ) * 3.0))) - 1.0) > 0.0 THEN SQRT(3.0) / 2.0 ELSE 0.0 END) > 0.0) THEN SQRT(3.0) ELSE 0.0 END)) + (ROUND( ( (`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) / SQRT(3.0) ), 0 ) * SQRT(3.0))), 3)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(LOG(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM((LOG(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)/LOG(10))) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT MAX(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `usr_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT MIN(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `usr_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM((CASE WHEN `opensearch_dashboards_sample_data_flights`.`dayOfWeek` >= 0 OR FLOOR(2) = 2 THEN POWER(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`,2) END)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(RADIANS(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(ROUND(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(SIGN(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(SIN(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(SQRT(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(POWER(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`, 2)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(TAN(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(ASCII(SUBSTRING(`opensearch_dashboards_sample_data_flights`.`OriginWeather`, 1, 1024))) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT `opensearch_dashboards_sample_data_flights`.`Dest` AS `Dest` FROM `opensearch_dashboards_sample_data_flights` WHERE ((`opensearch_dashboards_sample_data_flights`.`Dest` = 'caching_sha2_password') AND (LOCATE('in',LOWER(`opensearch_dashboards_sample_data_flights`.`Dest`)) > 0)) GROUP BY 1
-SELECT SUBSTRING(`opensearch_dashboards_sample_data_flights`.`OriginWeather`, 1, 1024) AS `OriginWeather` FROM `opensearch_dashboards_sample_data_flights` WHERE (RIGHT(RTRIM(LOWER(SUBSTRING(`opensearch_dashboards_sample_data_flights`.`OriginWeather`, 1, 1024))), LENGTH('.')) = '.') GROUP BY 1
-SELECT SUM(IF(ISNULL(1), NULL, LOCATE('Cape',`opensearch_dashboards_sample_data_flights`.`Origin`,GREATEST(1,FLOOR(1))))) AS `sum_Calculation_462181953493630977_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT (CASE WHEN 3 >= 0 THEN LEFT(`opensearch_dashboards_sample_data_flights`.`Origin`,3) ELSE NULL END) AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT LENGTH(`opensearch_dashboards_sample_data_flights`.`Origin`) AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT LOWER(`opensearch_dashboards_sample_data_flights`.`Origin`) AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT LTRIM(`opensearch_dashboards_sample_data_flights`.`Origin`) AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT MAX(`opensearch_dashboards_sample_data_flights`.`Origin`) AS `usr_Calculation_462181953493630977_nk` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT IF(ISNULL(0), NULL, SUBSTRING(`opensearch_dashboards_sample_data_flights`.`Origin`,GREATEST(1,FLOOR(0)),FLOOR(5))) AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT MIN(`opensearch_dashboards_sample_data_flights`.`Origin`) AS `usr_Calculation_462181953493630977_nk` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT REPLACE(`opensearch_dashboards_sample_data_flights`.`Origin`,'Airport','') AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT (CASE WHEN 3 >= 0 THEN RIGHT(`opensearch_dashboards_sample_data_flights`.`Origin`,3) ELSE NULL END) AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT RTRIM(`opensearch_dashboards_sample_data_flights`.`Origin`) AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT IF(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice` >= 0, SPACE(FLOOR(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`)), NULL) AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT TRIM(LEADING '-' FROM TRIM(LEADING SUBSTRING_INDEX(`opensearch_dashboards_sample_data_flights`.`Origin`, '-', (2 - 1)) FROM SUBSTRING_INDEX(`opensearch_dashboards_sample_data_flights`.`Origin`, '-', 2))) AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT SUBSTRING(`opensearch_dashboards_sample_data_flights`.`OriginWeather`, 1, 1024) AS `OriginWeather` FROM `opensearch_dashboards_sample_data_flights` WHERE (LEFT(LTRIM(LOWER(SUBSTRING(`opensearch_dashboards_sample_data_flights`.`OriginWeather`, 1, 1024))), LENGTH('$')) = '$') GROUP BY 1
-SELECT TRIM(`opensearch_dashboards_sample_data_flights`.`Origin`) AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT UPPER(`opensearch_dashboards_sample_data_flights`.`Origin`) AS `Calculation_462181953493630977` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT ADDDATE( DATE_FORMAT( DATE(`opensearch_dashboards_sample_data_flights`.`password_last_changed`), '%Y-01-01 00:00:00' ), INTERVAL 0 SECOND ) AS `tyr_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT YEAR(DATE(`opensearch_dashboards_sample_data_flights`.`timestamp`)) AS `yr_Calculation_462181953481519104_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT (YEAR(`opensearch_dashboards_sample_data_flights`.`timestamp`) - YEAR(DATE('1990-01-01'))) AS `Calculation_1706301351891775489` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT MONTHNAME(`opensearch_dashboards_sample_data_flights`.`timestamp`) AS `Calculation_1706301351891775489` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT YEAR(TIMESTAMP(STR_TO_DATE('5.April.2004', '%d.%i.%Y'))) AS `yr_Calculation_462181953481519104_ok` FROM `opensearch_dashboards_sample_data_flights`
-SELECT YEAR(ADDDATE( CONCAT( DATE_FORMAT( `opensearch_dashboards_sample_data_flights`.`timestamp`, '%Y-' ), (3*(QUARTER(`opensearch_dashboards_sample_data_flights`.`timestamp`)-1)+1), '-01 00:00:00' ), INTERVAL 0 SECOND )) AS `yr_Calculation_1706301351891775489_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT DAYOFMONTH(`opensearch_dashboards_sample_data_flights`.`timestamp`) AS `Calculation_462181953481519104` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT 2019 AS `yr_Calculation_462181953481519104_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT YEAR(ADDTIME(CAST(CAST(`opensearch_dashboards_sample_data_flights`.`timestamp` AS DATE) AS DATETIME), TIME(`opensearch_dashboards_sample_data_flights`.`timestamp`))) AS `yr_Calculation_1706301351891775489_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT YEAR(MAKETIME(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`, `opensearch_dashboards_sample_data_flights`.`dayOfWeek`, `opensearch_dashboards_sample_data_flights`.`dayOfWeek`)) AS `yr_Calculation_1706301351891775489_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT MAX(`opensearch_dashboards_sample_data_flights`.`timestamp`) AS `max_timestamp_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT MIN(`opensearch_dashboards_sample_data_flights`.`timestamp`) AS `min_timestamp_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT MONTH(`opensearch_dashboards_sample_data_flights`.`timestamp`) AS `mn_timestamp_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT YEAR(NOW()) AS `yr_Calculation_462181953481519104_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT YEAR(CURDATE()) AS `yr_Calculation_462181953481519104_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT YEAR(`opensearch_dashboards_sample_data_flights`.`timestamp`) AS `yr_timestamp_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT ((`opensearch_dashboards_sample_data_flights`.`Origin` = 'Frankfurt am Main Airport') AND (`opensearch_dashboards_sample_data_flights`.`Dest` = 'Sydney Kingsford Smith International Airport')) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT (CASE `opensearch_dashboards_sample_data_flights`.`OriginWeather` WHEN 'Sunny' THEN '1' WHEN 'Rain' THEN '0' ELSE 'NA' END) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT (CASE WHEN (`opensearch_dashboards_sample_data_flights`.`FlightDelay` = 0) THEN 'No delay' ELSE CAST(NULL AS CHAR(1)) END) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT (CASE WHEN (`opensearch_dashboards_sample_data_flights`.`FlightDelay` = 0) THEN 'No delay' WHEN (`opensearch_dashboards_sample_data_flights`.`FlightDelay` = 1) THEN 'Delay' ELSE CAST(NULL AS CHAR(1)) END) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT (RIGHT(RTRIM(`opensearch_dashboards_sample_data_flights`.`Origin`), LENGTH('Airport')) = 'Airport') AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT (CASE WHEN (`opensearch_dashboards_sample_data_flights`.`FlightDelay` = 0) THEN 'No delay' ELSE CAST(NULL AS CHAR(1)) END) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT IFNULL(`opensearch_dashboards_sample_data_flights`.`Cancelled`, `opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT (CASE WHEN (`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice` > 500) THEN 'High' WHEN NOT (`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice` > 500) THEN 'Low' ELSE NULL END) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT (NOT ISNULL(DATE_FORMAT(`opensearch_dashboards_sample_data_flights`.`Origin`, '%Y'))) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT ISNULL(`opensearch_dashboards_sample_data_flights`.`FlightNum`) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT MAX(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `max_max_questions_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT MIN(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `min_max_questions_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT (NOT ISNULL(DATE_FORMAT(`opensearch_dashboards_sample_data_flights`.`Origin`, '%Y'))) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT ((`opensearch_dashboards_sample_data_flights`.`Origin` = 'Frankfurt am Main Airport') OR (`opensearch_dashboards_sample_data_flights`.`Dest` = 'Sydney Kingsford Smith International Airport')) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT (CASE WHEN (`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice` > 500) THEN 'High' WHEN NOT (`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice` > 500) THEN 'Low' ELSE NULL END) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT (CASE WHEN (`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice` > 500) THEN 'High' WHEN NOT (`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice` > 500) THEN 'Low' ELSE NULL END) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT IFNULL(`opensearch_dashboards_sample_data_flights`.`FlightDelay`, 0) AS `Calculation_462181953506873347` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT MIN(`opensearch_dashboards_sample_data_flights`.`Origin`) AS `TEMP(Calculation_462181953504628738)(2376748618)(0)`,   MAX(`opensearch_dashboards_sample_data_flights`.`Origin`) AS `TEMP(Calculation_462181953504628738)(2968235173)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT AVG(`opensearch_dashboards_sample_data_flights`.`FlightDelayMin`) AS `avg_max_user_connections_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(1) AS `cnt_max_user_connections_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT MAX(`opensearch_dashboards_sample_data_flights`.`max_questions`) AS `max_max_questions_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT MIN(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `min_max_questions_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM((`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice` * `opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`)) AS `TEMP(Calculation_462181953506873347)(1705728846)(0)`,   SUM(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`) AS `TEMP(Calculation_462181953506873347)(2465277995)(0)`,   COUNT(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`) AS `TEMP(Calculation_462181953506873347)(2633997250)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT COUNT(`opensearch_dashboards_sample_data_flights`.`DistanceMiles`) AS `TEMP(Calculation_462181953506873347)(2070533874)(0)`,   SUM(`opensearch_dashboards_sample_data_flights`.`DistanceMiles`) AS `TEMP(Calculation_462181953506873347)(3496560911)(0)`,   SUM((`opensearch_dashboards_sample_data_flights`.`DistanceMiles` * `opensearch_dashboards_sample_data_flights`.`DistanceMiles`)) AS `TEMP(Calculation_462181953506873347)(3595387140)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `usr_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `TEMP(Calculation_462181953506873347)(105357904)(0)`,   COUNT(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `TEMP(Calculation_462181953506873347)(2584840543)(0)`,   SUM(((`opensearch_dashboards_sample_data_flights`.`dayOfWeek` + 0.0) * (`opensearch_dashboards_sample_data_flights`.`dayOfWeek` + 0.0))) AS `TEMP(Calculation_462181953506873347)(3340567470)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`DistanceKilometers`) AS `TEMP(Calculation_462181953506873347)(1474522238)(0)`,   COUNT(`opensearch_dashboards_sample_data_flights`.`DistanceKilometers`) AS `TEMP(Calculation_462181953506873347)(2841334535)(0)`,   SUM((`opensearch_dashboards_sample_data_flights`.`DistanceKilometers` * `opensearch_dashboards_sample_data_flights`.`DistanceKilometers`)) AS `TEMP(Calculation_462181953506873347)(461715975)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1
-SELECT SUBSTRING(`opensearch_dashboards_sample_data_flights`.`OriginWeather`, 1, 1024) AS `OriginWeather` FROM `opensearch_dashboards_sample_data_flights` WHERE (SUBSTRING(`opensearch_dashboards_sample_data_flights`.`OriginWeather`, 1, 1024) = 'ABC') GROUP BY 1
-SELECT SUM((CASE \tWHEN ISNULL(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) THEN NULL \tWHEN ISNULL(10) THEN NULL \tELSE GREATEST(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`, 10) END)) AS `sum_Calculation_160722252357632000_ok` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT `opensearch_dashboards_sample_data_flights`.`AvgTicketPrice` AS `AvgTicketPrice`,   `opensearch_dashboards_sample_data_flights`.`Cancelled` AS `Cancelled`,   `opensearch_dashboards_sample_data_flights`.`Carrier` AS `Carrier`,   `opensearch_dashboards_sample_data_flights`.`DestAirportID` AS `DestAirportID`,   `opensearch_dashboards_sample_data_flights`.`DestCityName` AS `DestCityName`,   `opensearch_dashboards_sample_data_flights`.`DestCountry` AS `DestCountry`,   `opensearch_dashboards_sample_data_flights`.`DestLocation` AS `DestLocation`,   `opensearch_dashboards_sample_data_flights`.`DestRegion` AS `Dest~~~<<<query-trunc>>>~~~e`.`opensearch_dashboards_sample_data_flights` AS `opensearch_dashboards_sample_data_flights` FROM `opensearch_dashboards_sample_data_ecommerce`   LEFT JOIN `opensearch_dashboards_sample_data_flights` ON (`opensearch_dashboards_sample_data_ecommerce`.`day_of_week_i` = `opensearch_dashboards_sample_data_flights`.`dayOfWeek`) LIMIT 1000
-SELECT `opensearch_dashboards_sample_data_flights`.`AvgTicketPrice` AS `AvgTicketPrice`,   `opensearch_dashboards_sample_data_flights`.`Cancelled` AS `Cancelled`,   `opensearch_dashboards_sample_data_flights`.`Carrier` AS `Carrier`,   `opensearch_dashboards_sample_data_flights`.`DestAirportID` AS `DestAirportID`,   `opensearch_dashboards_sample_data_flights`.`DestCityName` AS `DestCityName`,   `opensearch_dashboards_sample_data_flights`.`DestCountry` AS `DestCountry`,   `opensearch_dashboards_sample_data_flights`.`DestLocation` AS `DestLocation`,   `opensearch_dashboards_sample_data_flights`.`DestRegion` AS `Dest~~~<<<query-trunc>>>~~~`.`opensearch_dashboards_sample_data_flights` AS `opensearch_dashboards_sample_data_flights` FROM `opensearch_dashboards_sample_data_ecommerce`   RIGHT JOIN `opensearch_dashboards_sample_data_flights` ON (`opensearch_dashboards_sample_data_ecommerce`.`day_of_week_i` = `opensearch_dashboards_sample_data_flights`.`dayOfWeek`) LIMIT 1000
-SELECT `opensearch_dashboards_sample_data_flights`.`OriginCityName` AS `OriginCityName` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1 ORDER BY `OriginCityName` ASC
-SELECT `opensearch_dashboards_sample_data_flights`.`OriginCityName` AS `OriginCityName` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1 ORDER BY `OriginCityName` ASC
-SELECT `opensearch_dashboards_sample_data_flights`.`DestCityName` AS `DestCityName`,   SUM(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`) AS `$__alias__0` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1 ORDER BY `$__alias__0` DESC,   `DestCityName` ASC LIMIT 10
-SELECT 'DESKTOP-7APIVOE\\\\Rupal' AS `Calculation_1122522251639717888` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT 0 AS `Calculation_1122522251639717888` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT 0 AS `Calculation_1122522251639717888` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000002
-SELECT 1 AS `Calculation_1122522251639717888` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT 'DESKTOP-7APIVOE' AS `Calculation_1122522251639717888` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT 'ABC' AS `Calculation_1122522251639717888` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT MAX(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`) AS `TEMP(TC_)(3575797393)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `TEMP(TEMP(TC_)(4001152001)(0))(105357904)(0)`,   COUNT(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `TEMP(TEMP(TC_)(4001152001)(0))(2584840543)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT MIN(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`) AS `TEMP(TC_)(2076389572)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`) AS `TEMP(TEMP(TC_)(4079199159)(0))(2465277995)(0)`,   COUNT(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`) AS `TEMP(TEMP(TC_)(4079199159)(0))(2633997250)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`) AS `TEMP(TC_)(2465277995)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT COUNT(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`) AS `TEMP(TC_)(2633997250)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT MAX(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `TEMP(TC_)(718966039)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT MIN(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `TEMP(TC_)(2462140059)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT SUM(`opensearch_dashboards_sample_data_flights`.`dayOfWeek`) AS `TEMP(TC_)(105357904)(0)`,   SUM(`opensearch_dashboards_sample_data_flights`.`AvgTicketPrice`) AS `TEMP(TC_)(2465277995)(0)` FROM `opensearch_dashboards_sample_data_flights` GROUP BY 1.1000000000000001
-SELECT 1 AS `empty` FROM `opensearch_dashboards_sample_data_flights`
-SELECT substring(OriginWeather, 1, 2) AS OriginWeather FROM opensearch_dashboards_sample_data_flights
-SELECT SUM(FlightDelayMin) AS sum_FlightDelayMin_ok FROM opensearch_dashboards_sample_data_flights
-SELECT SUM(FlightDelay) AS sum_FlightDelay_ok FROM opensearch_dashboards_sample_data_flights
-SELECT SUM(DistanceMiles) AS sum_DistanceMiles_ok FROM opensearch_dashboards_sample_data_flights
-SELECT year(timestamp) AS yr_timestamp_ok FROM opensearch_dashboards_sample_data_flights
-SELECT abs(AvgTicketPrice) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT acos(FlightDelayMin) AS sum_Calculation_160722252358221825_ok FROM opensearch_dashboards_sample_data_flights
-SELECT asin(FlightDelayMin) AS sum_Calculation_160722252358545410_ok FROM opensearch_dashboards_sample_data_flights
-SELECT atan(FlightDelayMin) AS sum_Calculation_160722252358811651_ok FROM opensearch_dashboards_sample_data_flights
-SELECT atan2(FlightDelayMin,dayOfWeek) AS sum_Calculation_160722252358811651_ok FROM opensearch_dashboards_sample_data_flights
-SELECT SUM(FlightDelayMin) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT cos(FlightDelayMin) AS sum_Calculation_160722252358221825_ok FROM opensearch_dashboards_sample_data_flights
-SELECT cot(AvgTicketPrice) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT degrees(FlightDelayMin) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT FlightDelayMin div AvgTicketPrice AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT exp(FlightDelayMin) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT SUM(dayOfWeek) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT SUM((((CASE WHEN (ABS((AvgTicketPrice) - (ROUND( ( (AvgTicketPrice) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + SQRT(3.0) * ((ABS((FlightDelayMin) - (ROUND( ( (FlightDelayMin) / 3.0 ), 0 ) * 3.0))) - 1.0) > 0.0 THEN 1.5 ELSE 0.0 END) - (CASE WHEN ((FlightDelayMin) - (ROUND( ( (FlightDelayMin) / 3.0 ), 0 ) * 3.0) < 0.0) AND ((CASE WHEN (ABS((AvgTicketPrice) - (ROUND( ( (AvgTicketPrice) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + SQRT(3.0) * ((ABS((FlightDelayMin) - (ROUND( ( (FlightDelayMin) / 3.0 ), 0 ) * 3.0))) - 1.0) > 0.0 THEN SQRT(3.0) / 2.0 ELSE 0.0 END) > 0.0) THEN 3.0 ELSE 0.0 END)) + (ROUND( ( (FlightDelayMin) / 3.0 ), 0 ) * 3.0))) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT SUM(ROUND( (((CASE WHEN (ABS((AvgTicketPrice) - (ROUND( ( (AvgTicketPrice) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + SQRT(3.0) * ((ABS((FlightDelayMin) - (ROUND( ( (FlightDelayMin) / 3.0 ), 0 ) * 3.0))) - 1.0) > 0.0 THEN SQRT(3.0) / 2.0 ELSE 0.0 END) - (CASE WHEN ((AvgTicketPrice) - (ROUND( ( (AvgTicketPrice) / SQRT(3.0) ), 0 ) * SQRT(3.0)) < 0.0) AND ((CASE WHEN (ABS((AvgTicketPrice) - (ROUND( ( (AvgTicketPrice) / SQRT(3.0) ), 0 ) * SQRT(3.0)))) + SQRT(3.0) * ((ABS((FlightDelayMin) - (ROUND( ( (FlightDelayMin) / 3.0 ), 0 ) * 3.0))) - 1.0) > 0.0 THEN SQRT(3.0) / 2.0 ELSE 0.0 END) > 0.0) THEN SQRT(3.0) ELSE 0.0 END)) + (ROUND( ( (AvgTicketPrice) / SQRT(3.0) ), 0 ) * SQRT(3.0))), 3)) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT log(FlightDelayMin) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT (log(FlightDelayMin)/log(10)) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT MAX(FlightDelayMin) AS usr_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT MIN(FlightDelayMin) AS usr_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT sum((case when dayOfWeek >= 0 or floor(2) = 2 then power(dayOfWeek,2) end)) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT radians(dayOfWeek) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT round(dayOfWeek) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT sign(dayOfWeek) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT sin(dayOfWeek) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT sqrt(dayOfWeek) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT power(dayOfWeek, 2) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT tan(dayOfWeek) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT SUM(dayOfWeek) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT ascii(substring(OriginWeather, 1, 5)) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT Dest, locate('air',Dest) FROM opensearch_dashboards_sample_data_flights
-SELECT substring(OriginWeather, 1, 1024) AS OriginWeather FROM opensearch_dashboards_sample_data_flights WHERE (right(rtrim(lower(substring(OriginWeather, 1, 5))), length('.')) ='.')
-SELECT sum(if(isnull(1), null, locate('Cape',Origin,greatest(1,floor(1))))) AS sum_Calculation_462181953493630977_ok FROM opensearch_dashboards_sample_data_flights
-SELECT (case when 3 >= 0 then left(Origin,3) else null end) AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT length(Origin) AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT lower(Origin) AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT ltrim(Origin) AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT max(Origin) AS usr_Calculation_462181953493630977_nk FROM opensearch_dashboards_sample_data_flights
-SELECT if(isnull(0), null, substring(Origin,greatest(1,floor(0)),floor(5))) AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT min(Origin) AS usr_Calculation_462181953493630977_nk FROM opensearch_dashboards_sample_data_flights
-SELECT replace(Origin,'Airport','') AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT (case when 3 >= 0 then right(Origin,3) else null end) AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT rtrim(Origin) AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT if(AvgTicketPrice >= 0, space(floor(AvgTicketPrice)), null) AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT trim(leading '-' FROM trim(leading substring(Origin, '-', (2 - 1)) FROM substring_index(Origin, '-', 2))) AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT substring(OriginWeather, 1, 5) AS OriginWeather FROM opensearch_dashboards_sample_data_flights where (left(ltrim(lower(substring(OriginWeather, 1, 5))), length('$')) = '$')
-SELECT trim(Origin) AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT upper(Origin) AS Calculation_462181953493630977 FROM opensearch_dashboards_sample_data_flights
-SELECT adddate( date_format( date(timestamp), '%Y-01-01 00:00:00' ), interval 0 second ) AS tyr_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT year(date(timestamp)) AS yr_Calculation_462181953481519104_ok FROM opensearch_dashboards_sample_data_flights
-SELECT year(timestamp(str_to_date('5.April.2004', '%d.%i.%Y'))) AS yr_Calculation_462181953481519104_ok FROM opensearch_dashboards_sample_data_flights
-SELECT dayofmonth(timestamp) AS Calculation_462181953481519104 FROM opensearch_dashboards_sample_data_flights
-SELECT 2019 AS yr_Calculation_462181953481519104_ok FROM opensearch_dashboards_sample_data_flights
-SELECT max(timestamp) AS max_timestamp_ok FROM opensearch_dashboards_sample_data_flights
-SELECT min(timestamp) AS max_timestamp_ok FROM opensearch_dashboards_sample_data_flights
-SELECT month(timestamp) AS mn_timestamp_ok FROM opensearch_dashboards_sample_data_flights
-SELECT year(now()) AS yr_Calculation_462181953481519104_ok FROM opensearch_dashboards_sample_data_flights
-SELECT year(curdate()) AS yr_Calculation_462181953481519104_ok FROM opensearch_dashboards_sample_data_flights
-SELECT year(timestamp) AS yr_timestamp_ok FROM opensearch_dashboards_sample_data_flights
-SELECT ((Origin = 'Frankfurt am Main Airport') and (Dest = 'Sydney Kingsford Smith International Airport')) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT (case OriginWeather when 'Sunny' then '1' when 'Rain' then '0' else 'NA' end) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT (case when (FlightDelay = 0) then 'No delay' else cast(null as char(1)) end) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT (case when (FlightDelay = 0) then 'No delay' when (FlightDelay = 1) then 'Delay' else cast(null as char(1)) end) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT (right(rtrim(Origin), length('Airport')) = 'Airport') AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT (case when (FlightDelay = 0) then 'No delay' else cast(null as char(1)) end) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT ifnull(Cancelled, AvgTicketPrice) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT (case when (AvgTicketPrice > 500) THEN 'High' when not (AvgTicketPrice > 500) then 'Low' else null end) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT (not isnull(date_format(Origin, '%Y'))) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT isnull(FlightNum) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT MAX(AvgTicketPrice) AS max_AvgTicketPrice_ok FROM opensearch_dashboards_sample_data_flights
-SELECT MIN(AvgTicketPrice) AS min_AvgTicketPrice_ok FROM opensearch_dashboards_sample_data_flights
-SELECT (not isnull(date_format(Origin, '%Y'))) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT ((Origin = 'Frankfurt am Main Airport') or (Dest = 'Sydney Kingsford Smith International Airport')) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT (case when (AvgTicketPrice > 500) THEN 'High' when not (AvgTicketPrice > 500) then 'Low' else null end) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT (case when (AvgTicketPrice > 500) THEN 'High' when not (AvgTicketPrice > 500) then 'Low' else null end) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT ifnull(FlightDelay, 0) AS Calculation_462181953506873347 FROM opensearch_dashboards_sample_data_flights
-SELECT min(Origin) AS temp(Calculation_462181953504628738)(2376748618)(0), max(Origin) AS temp(Calculation_462181953504628738)(2968235173)(0) FROM opensearch_dashboards_sample_data_flights
-SELECT AVG(dayOfWeek) AS avg_dayOfWeek_ok FROM opensearch_dashboards_sample_data_flights
-SELECT SUM(1) AS cnt_dayOfWeek_ok FROM opensearch_dashboards_sample_data_flights
-SELECT COUNT(DISTINCT AvgTicketPrice) AS ctd_AvgTicketPrice_ok FROM opensearch_dashboards_sample_data_flights
-SELECT MAX(AvgTicketPrice) AS max_AvgTicketPrice_ok FROM opensearch_dashboards_sample_data_flights
-SELECT MIN(AvgTicketPrice) AS min_AvgTicketPrice_ok FROM opensearch_dashboards_sample_data_flights
-SELECT sum((AvgTicketPrice * AvgTicketPrice)) AS temp(Calculation_462181953506873347)(1705728846)(0),   sum(AvgTicketPrice) AS temp(Calculation_462181953506873347)(2465277995)(0),   count(AvgTicketPrice) AS temp(Calculation_462181953506873347)(2633997250)(0) FROM opensearch_dashboards_sample_data_flights
-SELECT count(DistanceMiles) AS temp(Calculation_462181953506873347)(2070533874)(0),   sum(DistanceMiles) AS temp(Calculation_462181953506873347)(3496560911)(0),   sum((DistanceMiles * DistanceMiles)) AS temp(Calculation_462181953506873347)(3595387140)(0) FROM opensearch_dashboards_sample_data_flights
-SELECT SUM(dayOfWeek) AS usr_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT substring(OriginWeather, 1, 5) AS OriginWeather FROM opensearch_dashboards_sample_data_flights WHERE (substring(OriginWeather, 1, 5) = 'ABC')
-SELECT sum((case when isnull(FlightDelayMin) then null when isnull(10) then null else greatest(FlightDelayMin, 10) end)) AS sum_Calculation_160722252357632000_ok FROM opensearch_dashboards_sample_data_flights
-SELECT AvgTicketPrice AS AvgTicketPrice,   Cancelled AS Cancelled,   Carrier AS Carrier,   DestAirportID AS DestAirportID,   DestCityName AS DestCityName,   DestCountry AS DestCountry,   DestLocation AS DestLocation   FROM opensearch_dashboards_sample_data_ecommerce   INNER JOIN opensearch_dashboards_sample_data_flights ON (opensearch_dashboards_sample_data_ecommerce.day_of_week_i = dayOfWeek) LIMIT 1000
-SELECT AvgTicketPrice AS AvgTicketPrice,   Cancelled AS Cancelled,   Carrier AS Carrier,   DestAirportID AS DestAirportID,   DestCityName AS DestCityName,   DestCountry AS DestCountry,   DestLocation AS DestLocation FROM opensearch_dashboards_sample_data_ecommerce   LEFT JOIN opensearch_dashboards_sample_data_flights ON (opensearch_dashboards_sample_data_ecommerce.day_of_week_i = dayOfWeek) LIMIT 1000
-SELECT AvgTicketPrice AS AvgTicketPrice,   Cancelled AS Cancelled,   Carrier AS Carrier,   DestAirportID AS DestAirportID,   DestCityName AS DestCityName,   DestCountry AS DestCountry,   DestLocation AS DestLocation FROM opensearch_dashboards_sample_data_ecommerce   RIGHT JOIN opensearch_dashboards_sample_data_flights ON (opensearch_dashboards_sample_data_ecommerce.day_of_week_i = dayOfWeek) LIMIT 1000
-SELECT OriginCityName FROM opensearch_dashboards_sample_data_flights ORDER BY OriginCityName ASC
-SELECT OriginCityName FROM opensearch_dashboards_sample_data_flights ORDER BY OriginCityName DESC
-SELECT DestCityName,  SUM(AvgTicketPrice) AS $__alias__0 FROM opensearch_dashboards_sample_data_flights ORDER BY $__alias__0 DESC,  DestCityName ASC LIMIT 10
-SELECT AvgTicketPrice AS AvgTicketPrice,   Cancelled AS Cancelled,   Carrier AS Carrier FROM opensearch_dashboards_sample_data_ecommerce   INNER JOIN opensearch_dashboards_sample_data_flights ON (opensearch_dashboards_sample_data_ecommerce.day_of_week_i = dayOfWeek) LIMIT 1000
-SELECT AvgTicketPrice AS AvgTicketPrice,   Cancelled AS Cancelled,   Carrier AS Carrier FROM opensearch_dashboards_sample_data_ecommerce   LEFT JOIN opensearch_dashboards_sample_data_flights ON (opensearch_dashboards_sample_data_ecommerce.day_of_week_i = dayOfWeek) LIMIT 1000
-SELECT AvgTicketPrice AS AvgTicketPrice,   Cancelled AS Cancelled,   Carrier AS Carrier FROM opensearch_dashboards_sample_data_ecommerce   RIGHT JOIN opensearch_dashboards_sample_data_flights ON (opensearch_dashboards_sample_data_ecommerce.day_of_week_i = dayOfWeek) LIMIT 1000
\ No newline at end of file
diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/test_odbc_tableau_queries.cpp b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/test_odbc_tableau_queries.cpp
deleted file mode 100644
index 2da07197a7..0000000000
--- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/test_odbc_tableau_queries.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "unit_test_helper.h"
-#include "it_odbc_helper.h"
-#include <string>
-#include <fstream>
-#include <locale>
-#include <codecvt>
-#include <fstream>
-// clang-format on
-
-const std::string all_queries_file = "queries_all.txt";
-const std::string output_file = "odbc_result.txt";
-
-inline void GetAllLinesInFile(const std::string file_name,
-                              std::vector< std::string >& lines) {
-    std::ifstream file(file_name);
-    if (file.is_open()) {
-        std::string line;
-        while (getline(file, line)) {
-            lines.push_back(line);
-        }
-        file.close();
-    }
-}
-
-TEST(TableauQuery, IssueQueriesAll) {
-    // Get lines from file
-    std::vector< std::string > lines;
-    GetAllLinesInFile(all_queries_file, lines);
-
-    // Connect to database
-    SQLHENV env = SQL_NULL_HENV;
-    SQLHDBC conn = SQL_NULL_HDBC;
-    SQLHSTMT stmt = SQL_NULL_HSTMT;
-    ASSERT_NO_THROW(AllocStatement((SQLTCHAR*)conn_string.c_str(), &env, &conn,
-                                   &stmt, true, false));
-
-    // Execute queries
-    size_t idx = 1;
-    std::wofstream output(output_file);
-    ASSERT_TRUE(output.is_open());
-
-    for (auto& query : lines) {
-        SQLRETURN ret = SQLExecDirect(stmt, (SQLTCHAR*)query.c_str(), SQL_NTS);
-        output << "\"" << idx++ << "\", \"";
-        output << (SQL_SUCCEEDED(ret) ? "PASS" : "FAIL") << "\", \""
-               << query.c_str() << "\"" << std::endl;
-        if (SQL_SUCCEEDED(ret))
-            SQLCloseCursor(stmt);
-    }
-    output.close();
-
-    SQLFreeHandle(SQL_HANDLE_STMT, stmt);
-    SQLDisconnect(conn);
-    SQLFreeHandle(SQL_HANDLE_ENV, env);
-}
-
-int main(int argc, char** argv) {
-#ifdef __APPLE__
-    // Enable malloc logging for detecting memory leaks.
-    system("export MallocStackLogging=1");
-#endif
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-
-    int failures = RUN_ALL_TESTS();
-
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-#ifdef __APPLE__
-    // Disable malloc logging and report memory leaks
-    system("unset MallocStackLogging");
-    system("leaks itodbc_tableau_queries > leaks_itodbc_tableau_queries");
-#endif
-    return failures;
-}
diff --git a/sql-odbc/src/PerformanceTests/CMakeLists.txt b/sql-odbc/src/PerformanceTests/CMakeLists.txt
deleted file mode 100644
index f27eb1781b..0000000000
--- a/sql-odbc/src/PerformanceTests/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-project(performance_tests)
-
-set(RESULTS_PTESTS "${CMAKE_CURRENT_SOURCE_DIR}/PTODBCResults")
-set(INFO_PTESTS "${CMAKE_CURRENT_SOURCE_DIR}/PTODBCInfo")
-set(EXECUTION_PTESTS "${CMAKE_CURRENT_SOURCE_DIR}/PTODBCExecution")
-
-# Projects to build
-add_subdirectory(${RESULTS_PTESTS})
-add_subdirectory(${INFO_PTESTS})
-add_subdirectory(${EXECUTION_PTESTS})
diff --git a/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt
deleted file mode 100644
index 7ee23c0802..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-project(performance_execution)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES performance_odbc_execution.cpp)
-include_directories(${OPENSEARCHODBC_SRC})
-
-# Generate executable
-add_executable(performance_execution ${SOURCE_FILES})
-
-# Library dependencies
-target_link_libraries(performance_execution sqlodbc)
-target_compile_definitions(performance_execution PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/PerformanceTests/PTODBCExecution/performance_odbc_execution.cpp b/sql-odbc/src/PerformanceTests/PTODBCExecution/performance_odbc_execution.cpp
deleted file mode 100644
index 60433068e4..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCExecution/performance_odbc_execution.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// clang-format off
-#include "chrono"
-#include <opensearch_odbc.h>
-#include <string>
-#include <vector>
-#include <iostream>
-// clang-format on
-#define IT_SIZEOF(x) (NULL == (x) ? 0 : (sizeof((x)) / sizeof((x)[0])))
-#define ITERATION_COUNT 12
-std::wstring dsn_name = L"DSN=test_dsn";
-const wchar_t* const query = L"SELECT * FROM opensearch_dashboards_sample_data_flights limit 10000";
-
-int Setup(SQLHENV* env, SQLHDBC* conn, SQLHSTMT* hstmt) {
-    SQLTCHAR out_conn_string[1024];
-    SQLSMALLINT out_conn_string_length;
-    if (SQL_SUCCEEDED(SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, env))
-        && SQL_SUCCEEDED(SQLSetEnvAttr(*env, SQL_ATTR_ODBC_VERSION, (void*)SQL_OV_ODBC3, 0))
-        && SQL_SUCCEEDED(SQLAllocHandle(SQL_HANDLE_DBC, *env, conn))
-        && SQL_SUCCEEDED(SQLDriverConnect(*conn, NULL, (SQLTCHAR*)dsn_name.c_str(), SQL_NTS,
-                             out_conn_string, IT_SIZEOF(out_conn_string),
-                             &out_conn_string_length, SQL_DRIVER_COMPLETE))
-        && SQL_SUCCEEDED(SQLAllocHandle(SQL_HANDLE_STMT, *conn, hstmt))) {
-        return SQL_SUCCESS;
-    }
-    return SQL_ERROR;
-}
-
-void Teardown(SQLHDBC* conn, SQLHENV* env) {
-    SQLDisconnect(*conn);
-    SQLFreeHandle(SQL_HANDLE_ENV, *env);
-}
-
-int QueryExecutionTime() {
-    SQLRETURN ret = SQL_ERROR;
-    try {
-        SQLHENV env = SQL_NULL_HENV;
-        SQLHDBC conn = SQL_NULL_HDBC;
-        SQLHSTMT hstmt = SQL_NULL_HSTMT;
-        if (SQL_SUCCEEDED(Setup(&env, &conn, &hstmt))) {
-            std::cout << "Time(ms) for query execution:" << std::endl;
-            for (int i = 0; i < ITERATION_COUNT; i++) {
-                // Calculate time(ms) for query execution
-                auto start = std::chrono::steady_clock::now();
-                ret = SQLExecDirect(hstmt, (SQLTCHAR*)query, SQL_NTS);
-                auto end = std::chrono::steady_clock::now();
-                std::cout<< std::chrono::duration_cast< std::chrono::milliseconds >(
-                           end - start).count()<< std::endl;
-                SQLCloseCursor(hstmt);
-            }
-            Teardown(&conn, &env);
-        }
-    } catch (...) {
-        std::cout << "Exception occurred" << std::endl;
-    }
-    return ret;
-}
-
-int main() {
-    return QueryExecutionTime();
-}
diff --git a/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt
deleted file mode 100644
index 319dae7984..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-project(performance_info)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES performance_odbc_info.cpp)
-include_directories(	${UT_HELPER}
-						${IT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${VLD_SRC}  
-						${RABBIT_SRC}
-						${RAPIDJSON_SRC})
-
-# Generate executable
-add_executable(performance_info ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_link_libraries(performance_info sqlodbc itodbc_helper ut_helper GTest::gtest_main)
-target_compile_definitions(performance_info PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/PerformanceTests/PTODBCInfo/packages.config b/sql-odbc/src/PerformanceTests/PTODBCInfo/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCInfo/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.cpp b/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.h b/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/PerformanceTests/PTODBCInfo/performance_odbc_info.cpp b/sql-odbc/src/PerformanceTests/PTODBCInfo/performance_odbc_info.cpp
deleted file mode 100644
index 9ee6e96379..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCInfo/performance_odbc_info.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "opensearch_communication.h"
-#include "unit_test_helper.h"
-#include "it_odbc_helper.h"
-#include "chrono"
-#include <cwctype>
-#include "rabbit.hpp"
-#include <codecvt>
-#include <locale>
-// clang-format on
-
-const std::vector< std::string > base_items = {"name", "cluster_name",
-                                               "cluster_uuid"};
-const std::vector< std::string > version_items = {
-    "number",
-    "build_flavor",
-    "build_type",
-    "build_hash",
-    "build_date",
-    "build_snapshot",
-    "lucene_version",
-    "minimum_wire_compatibility_version",
-    "minimum_index_compatibility_version"};
-const std::string sync_start = "%%__PARSE__SYNC__START__%%";
-const std::string sync_sep = "%%__SEP__%%";
-const std::string sync_end = "%%__PARSE__SYNC__END__%%";
-
-std::string wstring_to_string(const std::wstring& src) {
-    return std::wstring_convert< std::codecvt_utf8_utf16< wchar_t >, wchar_t >{}
-        .to_bytes(src);
-}
-
-runtime_options rt_opts = []() {
-    runtime_options temp_opts;
-    for (auto it : conn_str_pair) {
-        std::wstring tmp = it.first;
-        std::transform(tmp.begin(), tmp.end(), tmp.begin(), towlower);
-        if (tmp == L"host")
-            temp_opts.conn.server = wstring_to_string(it.second);
-        else if (tmp == L"port")
-            temp_opts.conn.port = wstring_to_string(it.second);
-        else if (tmp == L"responsetimeout")
-            temp_opts.conn.timeout = wstring_to_string(it.second);
-        else if (tmp == L"auth")
-            temp_opts.auth.auth_type = wstring_to_string(it.second);
-        else if (tmp == L"user")
-            temp_opts.auth.username = wstring_to_string(it.second);
-        else if (tmp == L"password")
-            temp_opts.auth.password = wstring_to_string(it.second);
-        else if (tmp == L"region")
-            temp_opts.auth.region = wstring_to_string(it.second);
-        else if (tmp == L"usessl")
-            temp_opts.crypt.use_ssl =
-                (std::stoul(it.second, nullptr, 10) ? true : false);
-        else if (tmp == L"")
-            temp_opts.crypt.verify_server =
-                (std::stoul(it.second, nullptr, 10) ? true : false);
-    }
-    return temp_opts;
-}();
-
-void GetVersionInfoString(std::string& version_info) {
-    // Connect to DB
-    OpenSearchCommunication opensearch_comm;
-    opensearch_comm.ConnectionOptions(rt_opts, false, 0, 0);
-    ASSERT_TRUE(opensearch_comm.ConnectDBStart());
-
-    // Issue request
-    std::string endpoint, content_type, query, fetch_size;
-    std::shared_ptr< Aws::Http::HttpResponse > response =
-        opensearch_comm.IssueRequest(endpoint, Aws::Http::HttpMethod::HTTP_GET,
-                             content_type, query, fetch_size);
-
-    // Convert response to string
-    ASSERT_TRUE(response != nullptr);
-    opensearch_comm.AwsHttpResponseToString(response, version_info);
-}
-
-void ParseVersionInfoString(
-    const std::string& input_info,
-    std::vector< std::pair< std::string, std::string > >& output_info) {
-    // Parse input
-    rabbit::document doc;
-    doc.parse(input_info);
-
-    // Populate output with info
-    for (auto& it : base_items) {
-        ASSERT_TRUE(doc.has(it));
-        output_info.push_back(
-            std::pair< std::string, std::string >(it, doc[it].str()));
-    }
-
-    ASSERT_TRUE(doc.has("version"));
-    for (auto& it : version_items) {
-        ASSERT_TRUE(doc["version"].has(it));
-        output_info.push_back(std::pair< std::string, std::string >(
-            it, doc["version"][it].str()));
-    }
-}
-
-TEST(InfoCollect, EndPoint) {
-    // Get version string from endpoint
-    std::string version_info;
-    GetVersionInfoString(version_info);
-
-    // Parse into vector pair
-    std::vector< std::pair< std::string, std::string > > output_info;
-    ParseVersionInfoString(version_info, output_info);
-
-    std::cout << sync_start << std::endl;
-    for (auto& it : output_info) {
-        std::cout << it.first << sync_sep << it.second << std::endl;
-    }
-    std::cout << sync_end << std::endl;
-}
-
-int main(int argc, char** argv) {
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-
-    int failures = RUN_ALL_TESTS();
-
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-    return failures;
-}
diff --git a/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt
deleted file mode 100644
index 589e4eac72..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-project(performance_results)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES performance_odbc_results.cpp)
-include_directories(	${UT_HELPER}
-						${IT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${VLD_SRC}  )
-
-# Generate executable
-add_executable(performance_results ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_link_libraries(performance_results sqlodbc itodbc_helper ut_helper GTest::gtest_main)
-target_compile_definitions(performance_results PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/PerformanceTests/PTODBCResults/packages.config b/sql-odbc/src/PerformanceTests/PTODBCResults/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCResults/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/PerformanceTests/PTODBCResults/pch.cpp b/sql-odbc/src/PerformanceTests/PTODBCResults/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCResults/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/PerformanceTests/PTODBCResults/pch.h b/sql-odbc/src/PerformanceTests/PTODBCResults/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCResults/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/PerformanceTests/PTODBCResults/performance_odbc_results.cpp b/sql-odbc/src/PerformanceTests/PTODBCResults/performance_odbc_results.cpp
deleted file mode 100644
index 95184f8907..0000000000
--- a/sql-odbc/src/PerformanceTests/PTODBCResults/performance_odbc_results.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "unit_test_helper.h"
-#include "it_odbc_helper.h"
-#include "chrono"
-#include <algorithm>
-#include <vector>
-#include <numeric>
-// clang-format on
-
-#define BIND_SIZE 255
-#define ROWSET_SIZE_5 5
-#define ROWSET_SIZE_50 50
-#define SINGLE_ROW 1
-#define ITERATION_COUNT 10
-
-#ifndef WIN32
-typedef SQLULEN SQLROWCOUNT;
-typedef SQLULEN SQLROWSETSIZE;
-typedef SQLULEN SQLTRANSID;
-typedef SQLLEN SQLROWOFFSET;
-#endif
-
-const wchar_t* const m_query =
-    L"SELECT * FROM opensearch_dashboards_sample_data_flights limit 10000";
-
-typedef struct Col {
-    SQLLEN data_len;
-    SQLCHAR data_dat[BIND_SIZE];
-} Col;
-
-class TestPerformance : public testing::Test {
-   public:
-    TestPerformance() {
-    }
-    void SetUp() {
-        AllocStatement((SQLTCHAR*)conn_string.c_str(), &m_env, &m_conn,
-                       &m_hstmt, true, true);
-    }
-    void TearDown() {
-        SQLDisconnect(m_conn);
-    }
-
-   protected:
-    SQLHENV m_env = SQL_NULL_HENV;
-    SQLHDBC m_conn = SQL_NULL_HDBC;
-    SQLHSTMT m_hstmt = SQL_NULL_HSTMT;
-};
-
-const std::string sync_start = "%%__PARSE__SYNC__START__%%";
-const std::string sync_query = "%%__QUERY__%%";
-const std::string sync_case = "%%__CASE__%%";
-const std::string sync_min = "%%__MIN__%%";
-const std::string sync_max = "%%__MAX__%%";
-const std::string sync_mean = "%%__MEAN__%%";
-const std::string sync_median = "%%__MEDIAN__%%";
-const std::string sync_end = "%%__PARSE__SYNC__END__%%";
-
-void ReportTime(const std::string test_case, std::vector< long long > data) {
-    size_t size = data.size();
-    ASSERT_EQ(size, (size_t)ITERATION_COUNT);
-
-    // Get max and min
-    long long time_max = *std::max_element(data.begin(), data.end());
-    long long time_min = *std::min_element(data.begin(), data.end());
-
-    // Get median
-    long long time_mean =
-        std::accumulate(std::begin(data), std::end(data), 0ll) / data.size();
-
-    // Get median
-    std::sort(data.begin(), data.end());
-    long long time_median = (size % 2)
-                                ? data[size / 2]
-                                : ((data[(size / 2) - 1] + data[size / 2]) / 2);
-
-    // Output results
-    std::cout << sync_start << std::endl;
-    std::cout << sync_query;
-    std::wcout << std::wstring(m_query) << std::endl;
-    std::cout << sync_case << test_case << std::endl;
-    std::cout << sync_min << time_min << " ms" << std::endl;
-    std::cout << sync_max << time_max << " ms" << std::endl;
-    std::cout << sync_mean << time_mean << " ms" << std::endl;
-    std::cout << sync_median << time_median << " ms" << std::endl;
-    std::cout << sync_end << std::endl;
-
-    std::cout << "Time dump: ";
-    for (size_t i = 0; i < data.size(); i++) {
-        std::cout << data[i] << " ms";
-        if (i != (data.size() - 1))
-            std::cout << ", ";
-    }
-    std::cout << std::endl;
-}
-
-TEST_F(TestPerformance, Time_Execute) {
-    // Execute a query just to wake the server up in case it has been sleeping
-    // for a while
-    SQLRETURN ret = SQLExecDirect(m_hstmt, (SQLTCHAR*)m_query, SQL_NTS);
-    ASSERT_TRUE(SQL_SUCCEEDED(ret));
-    ASSERT_TRUE(SQL_SUCCEEDED(SQLCloseCursor(m_hstmt)));
-
-    std::vector< long long > times;
-    for (size_t iter = 0; iter < ITERATION_COUNT; iter++) {
-        auto start = std::chrono::steady_clock::now();
-        ret = SQLExecDirect(m_hstmt, (SQLTCHAR*)m_query, SQL_NTS);
-        auto end = std::chrono::steady_clock::now();
-        LogAnyDiagnostics(SQL_HANDLE_STMT, m_hstmt, ret);
-        ASSERT_TRUE(SQL_SUCCEEDED(ret));
-        ASSERT_TRUE(SQL_SUCCEEDED(SQLCloseCursor(m_hstmt)));
-        times.push_back(
-            std::chrono::duration_cast< std::chrono::milliseconds >(end - start)
-                .count());
-    }
-    ReportTime("Execute Query", times);
-}
-
-TEST_F(TestPerformance, Time_BindColumn_FetchSingleRow) {
-    SQLSMALLINT total_columns = 0;
-    int row_count = 0;
-
-    std::vector< long long > times;
-    for (size_t iter = 0; iter < ITERATION_COUNT; iter++) {
-        // Execute query
-        SQLRETURN ret = SQLExecDirect(m_hstmt, (SQLTCHAR*)m_query, SQL_NTS);
-        ASSERT_TRUE(SQL_SUCCEEDED(ret));
-
-        // Get column count
-        SQLNumResultCols(m_hstmt, &total_columns);
-        std::vector< std::vector< Col > > cols(total_columns);
-        for (size_t i = 0; i < cols.size(); i++)
-            cols[i].resize(SINGLE_ROW);
-
-        // Bind and fetch
-        auto start = std::chrono::steady_clock::now();
-        for (size_t i = 0; i < cols.size(); i++)
-            ret = SQLBindCol(m_hstmt, (SQLUSMALLINT)i + 1, SQL_C_CHAR,
-                             (SQLPOINTER)&cols[i][0].data_dat[i], 255,
-                             &cols[i][0].data_len);
-        while (SQLFetch(m_hstmt) == SQL_SUCCESS)
-            row_count++;
-        auto end = std::chrono::steady_clock::now();
-        ASSERT_TRUE(SQL_SUCCEEDED(SQLCloseCursor(m_hstmt)));
-        times.push_back(
-            std::chrono::duration_cast< std::chrono::milliseconds >(end - start)
-                .count());
-    }
-    ReportTime("Bind and (1 row) Fetch", times);
-}
-
-TEST_F(TestPerformance, Time_BindColumn_Fetch5Rows) {
-    SQLSMALLINT total_columns = 0;
-    SQLROWSETSIZE rows_fetched = 0;
-    SQLUSMALLINT row_status[ROWSET_SIZE_5];
-    SQLSetStmtAttr(m_hstmt, SQL_ROWSET_SIZE, (void*)ROWSET_SIZE_5, 0);
-
-    std::vector< long long > times;
-    for (size_t iter = 0; iter < ITERATION_COUNT; iter++) {
-        // Execute query
-        SQLRETURN ret = SQLExecDirect(m_hstmt, (SQLTCHAR*)m_query, SQL_NTS);
-        ASSERT_TRUE(SQL_SUCCEEDED(ret));
-
-        // Get column count
-        SQLNumResultCols(m_hstmt, &total_columns);
-        std::vector< std::vector< Col > > cols(total_columns);
-        for (size_t i = 0; i < cols.size(); i++)
-            cols[i].resize(ROWSET_SIZE_5);
-
-        // Bind and fetch
-        auto start = std::chrono::steady_clock::now();
-        for (size_t i = 0; i < cols.size(); i++)
-            ret = SQLBindCol(m_hstmt, (SQLUSMALLINT)i + 1, SQL_C_CHAR,
-                             (SQLPOINTER)&cols[i][0].data_dat[i], BIND_SIZE,
-                             &cols[i][0].data_len);
-        while (SQLExtendedFetch(m_hstmt, SQL_FETCH_NEXT, 0, &rows_fetched,
-                                row_status)
-               == SQL_SUCCESS) {
-            if (rows_fetched < ROWSET_SIZE_5)
-                break;
-        }
-        auto end = std::chrono::steady_clock::now();
-        ASSERT_TRUE(SQL_SUCCEEDED(SQLCloseCursor(m_hstmt)));
-        times.push_back(
-            std::chrono::duration_cast< std::chrono::milliseconds >(end - start)
-                .count());
-    }
-    ReportTime("Bind and (5 row) Fetch", times);
-}
-
-TEST_F(TestPerformance, Time_BindColumn_Fetch50Rows) {
-    SQLSMALLINT total_columns = 0;
-    SQLROWSETSIZE rows_fetched = 0;
-    SQLUSMALLINT row_status[ROWSET_SIZE_50];
-    SQLSetStmtAttr(m_hstmt, SQL_ROWSET_SIZE, (void*)ROWSET_SIZE_50, 0);
-
-    std::vector< long long > times;
-    for (size_t iter = 0; iter < ITERATION_COUNT; iter++) {
-        // Execute query
-        SQLRETURN ret = SQLExecDirect(m_hstmt, (SQLTCHAR*)m_query, SQL_NTS);
-        ASSERT_TRUE(SQL_SUCCEEDED(ret));
-
-        // Get column count
-        SQLNumResultCols(m_hstmt, &total_columns);
-        std::vector< std::vector< Col > > cols(total_columns);
-        for (size_t i = 0; i < cols.size(); i++)
-            cols[i].resize(ROWSET_SIZE_50);
-
-        // Bind and fetch
-        auto start = std::chrono::steady_clock::now();
-        for (size_t i = 0; i < cols.size(); i++)
-            ret = SQLBindCol(m_hstmt, (SQLUSMALLINT)i + 1, SQL_C_CHAR,
-                             (SQLPOINTER)&cols[i][0].data_dat[i], BIND_SIZE,
-                             &cols[i][0].data_len);
-        while (SQLExtendedFetch(m_hstmt, SQL_FETCH_NEXT, 0, &rows_fetched,
-                                row_status)
-               == SQL_SUCCESS) {
-            if (rows_fetched < ROWSET_SIZE_50)
-                break;
-        }
-
-        auto end = std::chrono::steady_clock::now();
-        ASSERT_TRUE(SQL_SUCCEEDED(SQLCloseCursor(m_hstmt)));
-        times.push_back(
-            std::chrono::duration_cast< std::chrono::milliseconds >(end - start)
-                .count());
-    }
-    ReportTime("Bind and (50 row) Fetch", times);
-}
-
-TEST_F(TestPerformance, Time_Execute_FetchSingleRow) {
-    SQLSMALLINT total_columns = 0;
-    int row_count = 0;
-
-    std::vector< long long > times;
-    for (size_t iter = 0; iter < ITERATION_COUNT; iter++) {
-        // Execute query
-        auto start = std::chrono::steady_clock::now();
-        SQLRETURN ret = SQLExecDirect(m_hstmt, (SQLTCHAR*)m_query, SQL_NTS);
-        ASSERT_TRUE(SQL_SUCCEEDED(ret));
-
-        // Get column count
-        SQLNumResultCols(m_hstmt, &total_columns);
-        std::vector< std::vector< Col > > cols(total_columns);
-        for (size_t i = 0; i < cols.size(); i++)
-            cols[i].resize(SINGLE_ROW);
-
-        // Bind and fetch
-        for (size_t i = 0; i < cols.size(); i++)
-            ret = SQLBindCol(m_hstmt, (SQLUSMALLINT)i + 1, SQL_C_CHAR,
-                             (SQLPOINTER)&cols[i][0].data_dat[i], BIND_SIZE,
-                             &cols[i][0].data_len);
-        while (SQLFetch(m_hstmt) == SQL_SUCCESS)
-            row_count++;
-
-        auto end = std::chrono::steady_clock::now();
-        ASSERT_TRUE(SQL_SUCCEEDED(SQLCloseCursor(m_hstmt)));
-        times.push_back(
-            std::chrono::duration_cast< std::chrono::milliseconds >(end - start)
-                .count());
-    }
-    ReportTime("Execute Query, Bind and (1 row) Fetch", times);
-}
-
-int main(int argc, char** argv) {
-#ifdef __APPLE__
-    // Enable malloc logging for detecting memory leaks.
-    system("export MallocStackLogging=1");
-#endif
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-
-    int failures = RUN_ALL_TESTS();
-
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-#ifdef __APPLE__
-    // Disable malloc logging and report memory leaks
-    system("unset MallocStackLogging");
-    system("leaks performance_results > leaks_performance_results");
-#endif
-    return failures;
-}
diff --git a/sql-odbc/src/TestRunner/mako_template.html b/sql-odbc/src/TestRunner/mako_template.html
deleted file mode 100644
index 2f4078ebcb..0000000000
--- a/sql-odbc/src/TestRunner/mako_template.html
+++ /dev/null
@@ -1,381 +0,0 @@
-<!-- clang-format off -->
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Elastic Search Test Results</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <style>
-        table, td, th {
-          border: 1px solid black;
-        }
-        #fail-info {
-            color: lightcoral;
-        }
-        #pass-info {
-            color: lightgreen;
-        }
-        #info {
-            color: white;
-            border-collapse: collapse;
-            width: 100%;
-        }
-
-        #info-body {
-            background: linear-gradient(27deg, #151515 5px, transparent 5px) 0 5px, linear-gradient(207deg, #151515 5px, transparent 5px) 10px 0px, linear-gradient(27deg, #222 5px, transparent 5px) 0px 10px, linear-gradient(207deg, #222 5px, transparent 5px) 10px 5px, linear-gradient(90deg, #1b1b1b 10px, transparent 10px), linear-gradient(#1d1d1d 25%, #1a1a1a 25%, #1a1a1a 50%, transparent 50%, transparent 75%, #242424 75%, #242424);
-            background-color: #131313;
-            background-size: 20px 20px;
-            font-family: Arial, Helvetica, sans-serif;
-            color: white;
-        }
-        
-        .collapsible {
-            background: inherit;
-            background-color: #131313;
-            background-size: 10px 10px;
-            font-family: Arial, Helvetica, sans-serif;
-            font-size: medium;
-            margin-left: 5%;
-            border: none;
-            padding: 14px 28px;
-            font-size: 16px;
-            cursor: pointer;
-            display: inline-block;
-        }
-
-        .active, .collapsible:hover {
-            background-color: #555;
-        }
-
-        .content {
-            padding: 0 5px;
-            display: none;
-            overflow: hidden;
-            background: linear-gradient(27deg, #151515 5px, transparent 5px) 0 5px, linear-gradient(207deg, #151515 5px, transparent 5px) 10px 0px, linear-gradient(27deg, #222 5px, transparent 5px) 0px 10px, linear-gradient(207deg, #222 5px, transparent 5px) 10px 5px, linear-gradient(90deg, #1b1b1b 10px, transparent 10px), linear-gradient(#1d1d1d 25%, #1a1a1a 25%, #1a1a1a 50%, transparent 50%, transparent 75%, #242424 75%, #242424);
-            background-color: #131313;
-            background-size: 20px 20px;
-            font-family: Arial, Helvetica, sans-serif;
-            color: white;
-        }
-
-        #info-div-table {
-            margin-left: 10%;
-            margin-right: 50%;
-        }
-
-        #info-div-title {
-            margin-left: 7%;
-        }
-
-        #info-div-case {
-            margin-left: 10%;
-            margin-right: 50%;
-        }
-
-        #info td, #info th {
-            padding: 4px;
-        }
-
-        #info tr:hover {
-            background-color: #36486b
-        }
-
-        #info td {
-            padding: 8px;
-            text-align: left;
-            border: 1px, solid#ddd;
-        }
-
-        #info-div-test {
-            margin-left: 8%;
-        }
-
-        #info-div-case {
-            margin-left: 5%;
-        }
-
-        #test-div-test {
-            margin-left: 5%;
-        }
-
-        #test-div-table {
-            margin-left: 10%;
-            margin-right: 40%;
-        }
-
-        #tests-table {
-            color: white;
-            border-collapse: collapse;
-            width: 100%;
-        }
-
-        #tests-table th {
-            background-color: #034f84;
-            text-align: left;
-            padding: 8px;
-        }
-
-        #tests-table tr:hover {
-            background-color: #36486b
-        }
-
-        #tests-table td {
-            padding: 8px;
-            text-align: left;
-        }
-    </style>
-</head>
-<body id="info-body">
-    <header>
-        <h1>Test Results</h1>
-        <h2 style="margin-left: 2%">Unit Tests</h2>
-    </header>
-    <div id="info-div-table">
-        <table id="tests-table">
-            <tr>
-                <th style="background-color: #022140; width: 70%">Unit Test</th>
-                <th style="background-color: #022140; width: 15%">Cases</th>
-                <th style="background-color: #022140; width: 15%">Errors</th>
-            </tr>
-            <colgroup>
-                <col span="1" style="background-color:#034f84; width: 60%" />
-                <col span="1" style="background-color:#034f84; width: 20%" />
-                <col span="1" style="width: 20%" />
-            </colgroup>
-            % for unit_test in data["UT"]:
-            <tr>
-                <td>${unit_test["UnitTest"]}</td>
-                <td>${unit_test["TotalTestCases"]}</td>
-                <td style="background-color:dark${'green' if unit_test['TotalTestCases'] == unit_test['CasePassCount'] else 'red' }">${str(int(unit_test['TotalTestCases']) - int(unit_test['CasePassCount']))}</td>
-            </tr>
-            % endfor
-        </table>
-    </div>
-    % for unit_test in data["UT"]:
-    <%
-    total_cnt = unit_test["TotalTestCases"]
-    pass_cnt = unit_test['CasePassCount']
-    status = ("Passed " + pass_cnt) if (total_cnt == pass_cnt) else ("Failed " + str(int(total_cnt) - int(pass_cnt)))
-    status = status + "/" + total_cnt
-    %>
-    <div id="info-div-case"><h3 id="${'pass-info' if total_cnt == pass_cnt else 'fail-info'}">${unit_test["UnitTest"] + " - " + status} </h3></div>
-    % for test_case in unit_test["TestCases"]:
-    <%
-    total_cnt = test_case["TestCount"]
-    pass_cnt = test_case['PassCount']
-    status = ("Passed " + pass_cnt) if (total_cnt == pass_cnt) else ("Failed " + str(int(total_cnt) - int(pass_cnt)))
-    status = status + "/" + total_cnt
-    %>
-    <div id="info-div-test">
-        <button type="button" class="collapsible" style="color:light${'green' if total_cnt == pass_cnt else 'coral'}">
-            ${test_case["TestCase"] + " - " + status + " - " + test_case["TotalTime"]}
-        </button>
-        <div class="content">
-            <div id="info-div-table">
-                <table id="info">
-                    <tr>
-                        <th style="background-color: #022140; width: 70%">Test Name</th>
-                        <th style="background-color: #022140; width: 15%">Time</th>
-                        <th style="background-color: #022140; width: 15%">Result</th>
-                    </tr>
-                    <colgroup>
-                        <col span="1" style="background-color:#034f84; width: 60%" />
-                        <col span="1" style="background-color:#034f84; width: 20%" />
-                        <col span="1" style="width: 20%" />
-                    </colgroup>
-                    % for test_result in test_case["TestResults"]:
-                    % if "Error" in test_result:
-                    <tr title="${test_result['Error']}">
-                        % else:
-                    <tr>
-                        % endif
-                        <td>${test_result["TestName"]}</td>
-                        <td>${test_result["TestTime"]}</td>
-                        <td style="background-color:dark${'green' if test_result['TestResult']=='OK' else 'red' }">${test_result["TestResult"]}</td>
-                    </tr>
-                    % endfor
-                </table>
-            </div>
-        </div>
-    </div>
-    % endfor
-    % endfor
-    <!-- Integration Tests -->
-    <header>
-        <h2 style="margin-left: 2%">Integration Tests</h2>
-    </header>
-    <div id="info-div-table">
-        <table id="tests-table">
-            <tr>
-                <th style="background-color: #022140; width: 70%">Unit Test</th>
-                <th style="background-color: #022140; width: 15%">Cases</th>
-                <th style="background-color: #022140; width: 15%">Errors</th>
-            </tr>
-            <colgroup>
-                <col span="1" style="background-color:#034f84; width: 60%" />
-                <col span="1" style="background-color:#034f84; width: 20%" />
-                <col span="1" style="width: 20%" />
-            </colgroup>
-            % for integration_test in data["IT"]:
-            <tr>
-                <td>${integration_test["UnitTest"]}</td>
-                <td>${integration_test["TotalTestCases"]}</td>
-                <td style="background-color:dark${'green' if integration_test['TotalTestCases'] == integration_test['CasePassCount'] else 'red' }">${str(int(integration_test['TotalTestCases']) - int(integration_test['CasePassCount']))}</td>
-            </tr>
-            % endfor
-        </table>
-    </div>
-    % for integration_test in data["IT"]:
-    <%
-    total_cnt = integration_test["TotalTestCases"]
-    pass_cnt = integration_test['CasePassCount']
-    status = ("Passed " + pass_cnt) if (total_cnt == pass_cnt) else ("Failed " + str(int(total_cnt) - int(pass_cnt)))
-    status = status + "/" + total_cnt
-    %>
-    <div id="info-div-case"><h3 id="${'pass-info' if total_cnt == pass_cnt else 'fail-info'}">${integration_test["UnitTest"] + " - " + status} </h3></div>
-    % for test_case in integration_test["TestCases"]:
-    <%
-    total_cnt = test_case["TestCount"]
-    pass_cnt = test_case['PassCount']
-    status = ("Passed " + pass_cnt) if (total_cnt == pass_cnt) else ("Failed " + str(int(total_cnt) - int(pass_cnt)))
-    status = status + "/" + total_cnt
-    %>
-    <div id="info-div-test">
-        <button type="button" class="collapsible" style="color:light${'green' if total_cnt == pass_cnt else 'coral'}">
-            ${test_case["TestCase"] + " - " + status + " - " + test_case["TotalTime"]}
-        </button>
-        <div class="content">
-            <div id="info-div-table">
-                <table id="info">
-                    <tr>
-                        <th style="background-color: #022140; width: 70%">Test Name</th>
-                        <th style="background-color: #022140; width: 15%">Time</th>
-                        <th style="background-color: #022140; width: 15%">Result</th>
-                    </tr>
-                    <colgroup>
-                        <col span="1" style="background-color:#034f84; width: 60%" />
-                        <col span="1" style="background-color:#034f84; width: 20%" />
-                        <col span="1" style="width: 20%" />
-                    </colgroup>
-                    % for test_result in test_case["TestResults"]:
-                    % if "Error" in test_result:
-                    <tr title="${test_result['Error']}">
-                        % else:
-                    <tr>
-                        % endif
-                        <td>${test_result["TestName"]}</td>
-                        <td>${test_result["TestTime"]}</td>
-                        <td style="background-color:dark${'green' if test_result['TestResult']=='OK' else 'red' }">${test_result["TestResult"]}</td>
-                    </tr>
-                    % endfor
-                </table>
-            </div>
-        </div>
-    </div>
-    % endfor
-    % endfor
-    <!-- Integration Tests -->
-    <header>
-        <h2 style="margin-left: 2%">Integration Tests</h2>
-    </header>
-    <div id="info-div-table">
-        <table id="tests-table">
-            <tr>
-                <th style="background-color: #022140; width: 70%">Unit Test</th>
-                <th style="background-color: #022140; width: 15%">Cases</th>
-                <th style="background-color: #022140; width: 15%">Errors</th>
-            </tr>
-            <colgroup>
-                <col span="1" style="background-color:#034f84; width: 60%" />
-                <col span="1" style="background-color:#034f84; width: 20%" />
-                <col span="1" style="width: 20%" />
-            </colgroup>
-            % for integration_test in data["IT"]:
-            <tr>
-                <td>${integration_test["UnitTest"]}</td>
-                <td>${integration_test["TotalTestCases"]}</td>
-                <td style="background-color:dark${'green' if integration_test['TotalTestCases'] == integration_test['CasePassCount'] else 'red' }">${str(int(integration_test['TotalTestCases']) - int(integration_test['CasePassCount']))}</td>
-            </tr>
-            % endfor
-        </table>
-    </div>
-    % if "performance" in data.keys():
-    % if "Info" in data["performance"].keys():
-    <!-- Performance Tests -->
-    <header>
-        <h2 style="margin-left: 2%">Performance Info</h2>
-    </header>
-    <div id="info-div-table">
-        <table id="tests-table">
-            <tr>
-                <th style="background-color: #022140; width: 50%">Info</th>
-                <th style="background-color: #022140; width: 50%">Data</th>
-            </tr>
-            <colgroup>
-                <col span="1" style="background-color:#034f84; width: 50%" />
-                <col span="1" style="background-color:#034f84; width: 50%" />
-            </colgroup>
-            % for k,v in data["performance"]["Info"].items():
-            <tr>
-                <td>${k}</td>
-                <td>${v.rstrip()}</td>
-            </tr>
-            % endfor
-        </table>
-    </div>
-    % endif
-    % if "Results" in data["performance"].keys():
-    <!-- Performance Tests -->
-    <header>
-        <h2 style="margin-left: 2%">Performance Results</h2>
-    </header>
-    <div id="info-div-table">
-        <table id="tests-table">
-            <tr>
-                <th style="background-color: #022140; width: 25%">Test Case</th>
-                <th style="background-color: #022140; width: 25%">Query</th>
-                <th style="background-color: #022140; width: 12.5%">Min</th>
-                <th style="background-color: #022140; width: 12.5%">Max</th>
-                <th style="background-color: #022140; width: 12.5%">Mean</th>
-                <th style="background-color: #022140; width: 12.5%">Median</th>
-            </tr>
-            <colgroup>
-                <col span="1" style="background-color:#034f84; width: 25%" />
-                <col span="1" style="background-color:#034f84; width: 25%" />
-                <col span="1" style="background-color:#034f84; width: 12.5%" />
-                <col span="1" style="background-color:#034f84; width: 12.5%" />
-                <col span="1" style="background-color:#034f84; width: 12.5%" />
-                <col span="1" style="background-color:#034f84; width: 12.5%" />
-            </colgroup>
-            % for test_vector in data["performance"]["Results"]:
-            <tr>
-                <td>${test_vector["Case"]}</td>
-                <td>${test_vector["Query"]}</td>
-                <td>${test_vector["Min"]}</td>
-                <td>${test_vector["Max"]}</td>
-                <td>${test_vector["Mean"]}</td>
-                <td>${test_vector["Median"]}</td>
-            </tr>
-            % endfor
-        </table>
-    </div>
-    % endif
-    % endif
-</body>
-<script>
-var coll = document.getElementsByClassName("collapsible");
-var i;
-
-for (i = 0; i < coll.length; i++) {
-  coll[i].addEventListener("click", function() {
-    this.classList.toggle("active");
-    var content = this.nextElementSibling;
-    if (content.style.display === "block") {
-      content.style.display = "none";
-    } else {
-      content.style.display = "block";
-    }
-  });
-}
-</script>
-</html>
diff --git a/sql-odbc/src/TestRunner/test_exclude_list.txt b/sql-odbc/src/TestRunner/test_exclude_list.txt
deleted file mode 100644
index 32a0ca2634..0000000000
--- a/sql-odbc/src/TestRunner/test_exclude_list.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ut_aws_sdk_cpp
-itodbc_aws_auth
\ No newline at end of file
diff --git a/sql-odbc/src/TestRunner/test_runner.py b/sql-odbc/src/TestRunner/test_runner.py
deleted file mode 100644
index ad2c4d9014..0000000000
--- a/sql-odbc/src/TestRunner/test_runner.py
+++ /dev/null
@@ -1,304 +0,0 @@
-import os
-import subprocess
-import json
-import re
-import traceback
-import sys
-import getopt
-import shutil
-from mako.template import Template
-from string import capwords
-
-UT_TYPE = "UT"
-IT_TYPE = "IT"
-PERFORMANCE_TYPE = "performance"
-PERFORMANCE_INFO = "performance_info"
-PERFORMANCE_RESULTS = "performance_results"
-EXCLUDE_EXTENSION_LIST = (
-    ".py", ".c", ".cmake", ".log", 
-    ".pdb", ".dll", ".sln", ".vcxproj", ".user",
-    ".tlog", ".lastbuildstate", ".filters", 
-    ".obj", ".exp", ".lib", ".h", ".cpp", ".ilk")
-total_failures = 0
-SYNC_START = "%%__PARSE__SYNC__START__%%"
-SYNC_SEP = "%%__SEP__%%"
-SYNC_END = "%%__PARSE__SYNC__END__%%"
-SYNC_QUERY = "%%__QUERY__%%";
-SYNC_CASE = "%%__CASE__%%";
-SYNC_MIN = "%%__MIN__%%";
-SYNC_MAX = "%%__MAX__%%";
-SYNC_MEAN = "%%__MEAN__%%";
-SYNC_MEDIAN = "%%__MEDIAN__%%";
-
-def GetTestSuiteExes(test_type, test_suites, exclude_tests_list):
-    test_exes = []
-    for root, dirs, files in os.walk(os.getcwd()):
-        for name in dirs:
-            if name.startswith("bin"):
-                dirs = name
-        for file_name in files:
-            if file_name.endswith(EXCLUDE_EXTENSION_LIST):
-                continue
-            if file_name.startswith(tuple(exclude_tests_list)):
-                continue
-            if test_suites is None and file_name.startswith(test_type.lower()):
-                print(f"Found {test_type} file: {file_name}")
-                test_exes.append(os.path.join(root, file_name))
-            elif test_suites is not None and file_name.startswith(test_type.lower()) and (file_name in test_suites.split(sep=",")):
-                print(f"Found {test_type} file: {file_name}")
-                test_exes.append(os.path.join(root, file_name))
-    return test_exes
-
-def RunTests(tests, test_type):
-    output = []
-    global total_failures
-    for test in tests:
-        print("Running " + test)
-        output_path = test.replace(".exe", "") + ".log"
-        total_failures += subprocess.call([test, "-fout", output_path, "--gtest_color=no"])
-        if test_type == UT_TYPE:
-            with open(output_path, "r+") as f:
-                output.append({"UnitTest" : test.split(os.path.sep)[-1].replace(".exe",""), "Log": f.read()})
-        elif test_type == IT_TYPE:
-            with open(output_path, "r+") as f:
-                output.append({"IntegrationTest" : test.split(os.path.sep)[-1].replace(".exe",""), "Log": f.read()})
-    print("Total Failures :", total_failures)
-    return output
-
-def FindBetween(s, f, l):
-    try:
-        start = s.index(f) + len(f)
-        end = s.index(l,start)
-        return s[start:end]
-    except ValueError:
-        return ""
-
-def GetAndTranslatePerformanceInfo(test):
-    global total_failures
-    output_path = test.replace(".exe", "") + ".log"
-    total_failures += subprocess.call([test, "-fout", output_path, "--gtest_color=no"])
-    output = None
-    with open(output_path, "r+") as f:
-        log = f.readlines()
-    if log == None:
-        raise Exception("Failed to read in performance info test results")
-    reading = False
-    output = {}
-    for line in log:
-        if SYNC_START in line:
-            reading = True
-            continue
-        if SYNC_END in line:
-            reading = False
-            continue
-        if reading:
-            data = line.split(SYNC_SEP)
-            if len(data) != 2:
-                raise Exception(f"Unknown log line format: {line}")
-            if data[0].rstrip() == "number":
-                data[0] = "Version Number"
-            else:
-                data[0] = capwords(data[0].rstrip().replace("_", " "))
-            data[0].replace("Uuid", "UUID")
-            output[data[0]] = data[1]
-        if "Not all tests passed" in line:
-            raise Exception("Performance info test failed")
-    if output == {}:
-        raise Exception("Failed to get any information out of performance info log")
-    return output
-
-def GetAndTranslatePerformanceResults(test):
-    global total_failures
-    output_path = test.replace(".exe", "") + ".log"
-    total_failures += subprocess.call([test, "-fout", output_path, "--gtest_color=no"])
-    output = None
-    with open(output_path, "r+") as f:
-        log = f.readlines()
-    if log == None:
-        raise Exception("Failed to read in performance info test results")
-    reading = False
-    output = []
-    single_case = {}
-    sync_items_line = [SYNC_QUERY, SYNC_CASE, SYNC_MIN, SYNC_MAX, SYNC_MEAN, SYNC_MEDIAN]
-    sync_items_readable = [item.replace("%%","").replace("__","").capitalize() for item in sync_items_line]
-    for line in log:
-        if SYNC_START in line:
-            single_case = {}
-            reading = True
-            continue
-        if SYNC_END in line:
-            if set(sync_items_readable) != set(single_case.keys()):
-                info = f'Missing data in test case: {single_case}. Items {sync_items_readable}. Keys {single_case.keys()}'
-                raise Exception(info)
-            output.append(single_case)
-            reading = False
-            continue
-        if reading:
-            for sync_item in sync_items_line:
-                if sync_item in line:
-                    single_case[sync_item.replace("%%","").replace("__","").capitalize()] = line.replace(sync_item,"").rstrip()
-    return output
-
-def ParseUnitTestCase(log_lines, test_case):
-    start_tag = test_case + "." 
-    test_case_info = { "TestCase" : test_case }
-    tests = []
-    for log_line in log_lines:
-        if start_tag in log_line and "RUN" in log_line:
-            test = log_line.split(start_tag)[1]
-            tests.append(test)
-        if "[----------] " in log_line and (test_case + " ") in log_line and log_line.endswith(" ms total)"):
-            test_case_info["TotalTime"] = FindBetween(log_line, "(", ")").replace(" total","")
-
-    test_infos = []
-    for test in tests:
-        test_tag = start_tag + test
-        test_info = { "TestName" : test }
-        for log_line in log_lines:
-            if test_tag in log_line and log_line.endswith(")"):
-                test_info["TestTime"] = FindBetween(log_line, "(", ")")
-                test_info["TestResult"] = FindBetween(log_line, "[", "]").replace(" ", "")
-
-        if test_info["TestResult"] != "OK":
-            start_error_grab = False
-            error_info = ""
-            for log_line in log_lines:
-                if test_tag in log_line and not log_line.endswith(")"):
-                    start_error_grab = True
-                elif test_tag in log_line and log_line.endswith(")"):
-                    break
-                elif start_error_grab:
-                    if error_info != "":
-                        error_info += os.linesep + log_line
-                    else:
-                        error_info += log_line
-            test_info["Error"] = error_info
-        test_infos.append(test_info)
-    test_case_info["TestCount"] = str(len(test_infos))
-    test_case_info["TestResults"] = test_infos
-    pass_count = 0
-    for test_info in test_infos:
-        if test_info["TestResult"] == "OK":
-            pass_count = pass_count + 1
-    test_case_info["PassCount"] = str(pass_count)
-    return test_case_info
-    
-def ParseUnitTestLog(unit_test, log):
-    log_json = { "UnitTest" : unit_test }
-    log_split = log.splitlines()
-    if len(log) < 8:
-        return {}
-
-    tmp = ""
-    for log in log_split:
-        if log.startswith("[==========] Running"):
-            tmp = log.replace("[==========] Running ", "").replace(" test suites.", "").replace(
-                " test suite.", "").replace("tests from", "").replace("test from", "")
-    if tmp == "":
-        print('!!! FAILED TO FIND LOG WITH RUNNING !!!')
-        log_json["TotalTestCount"] = "0"
-        log_json["TotalTestCases"] = "0"
-    else:
-        log_json["TotalTestCount"] = tmp.split("  ")[0]
-        log_json["TotalTestCases"] = tmp.split("  ")[1]
-    log_json["TestCases"] = []
-    test_cases = []
-    for _line in log_split:
-        tag = { }
-        if re.match(r".*tests? from.*", _line) and "[----------]" in _line and "total" not in _line:
-            test_cases.append(re.split(" tests? from ", _line)[1])
-    case_pass_count = 0
-    test_pass_count = 0
-    for test_case in test_cases:
-        log_json["TestCases"].append(ParseUnitTestCase(log_split, test_case))
-    for test_case in log_json["TestCases"]:
-        if test_case["PassCount"] == test_case["TestCount"]:
-            case_pass_count += 1
-        test_pass_count += int(test_case["PassCount"])
-    log_json["CasePassCount"] = str(case_pass_count)
-    log_json["TestPassCount"] = str(test_pass_count)
-    return log_json
-
-def TranslateTestOutput(test_type, outputs):
-    log_jsons = []
-    if test_type == UT_TYPE:
-        for output in outputs:
-            log_jsons.append(ParseUnitTestLog(output["UnitTest"], output["Log"]))
-    elif test_type == IT_TYPE:
-        for output in outputs:
-            log_jsons.append(ParseUnitTestLog(output["IntegrationTest"], output["Log"]))
-    return log_jsons
-
-def RunAllTests(test_types, test_suites, exclude_test_list):
-    final_output = {}
-
-    for _type in test_types:
-        tests = GetTestSuiteExes(_type, test_suites, exclude_test_list)
-        print("!! Found tests:", *tests, sep="\n")
-        if PERFORMANCE_TYPE == _type:
-            final_output[PERFORMANCE_TYPE] = {}
-            for test in tests:
-                if test.replace(".exe", "").endswith(PERFORMANCE_INFO):
-                    final_output[PERFORMANCE_TYPE]["Info"] = GetAndTranslatePerformanceInfo(test)
-                elif test.replace(".exe", "").endswith(PERFORMANCE_RESULTS):
-                    final_output[PERFORMANCE_TYPE]["Results"] = GetAndTranslatePerformanceResults(test)
-        else:
-            test_outputs = RunTests(tests, _type)
-            final_output[_type] = TranslateTestOutput(_type, test_outputs)
-    return final_output
-
-def ParseCommandLineArguments():
-    infile = None
-    outfile = None
-    suites = None
-    efile = None
-    opts, args = getopt.getopt(sys.argv[1:],"i:o:s:e:",["ifile=","ofile=","suites=","efile="])
-    for opt,arg in opts:
-        if opt in ('-i', '--ifile'):
-            infile = arg
-        elif opt in ('-s', '--suites'):
-            suites = arg
-        elif opt in ('-o', '--ofile'):
-            outfile = arg
-        elif opt in ('-e', '--efile'):
-            efile = arg
-    return (infile, outfile, suites, efile)
-
-def main():
-    try:
-        (infile, outfile, suites, efile) = ParseCommandLineArguments()
-        if infile is None or outfile is None:
-            print("Usage: -i <infile> -o <outfile> [-s <test_suites> -e <efile>]")
-            sys.exit(1)
-        exclude_test_list = []
-        global total_failures
-        total_failures = 0
-        if efile is not None:
-            with open(efile) as ef:
-                exclude_test_list = ef.readlines()
-                exclude_test_list = [l.strip() for l in exclude_test_list if l.strip() != ""]
-            if len(exclude_test_list) == 0:
-                print('== Exclude list empty. Running all available tests ==')
-            else:
-                print(f'== Excluding tests {exclude_test_list} ==')
-        else:
-            print('== No exclude list. Running all available tests ==')
-        print(f'== Using template file {infile} ==')
-        template = Template(filename=infile)
-
-        if suites is not None: 
-            print(f'== Using suites {suites} ==')
-        with open(os.path.join(os.getcwd(), outfile), 'w+') as results_file:
-            data = RunAllTests([UT_TYPE, IT_TYPE, PERFORMANCE_TYPE], suites, exclude_test_list)
-            os.chmod(outfile, 0o744)
-            results_file.write(template.render(data = data))
-
-        print(f"== Finished generating results file {outfile} ==")
-        os._exit(total_failures)
-
-    except:
-        print(traceback.format_exc())
-        os._exit(255)
-
-if __name__ == "__main__":
-    main()
diff --git a/sql-odbc/src/UnitTests/CMakeLists.txt b/sql-odbc/src/UnitTests/CMakeLists.txt
deleted file mode 100644
index 825c0c1770..0000000000
--- a/sql-odbc/src/UnitTests/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-project(unit_tests)
-
-set(HELPER_UTEST "${CMAKE_CURRENT_SOURCE_DIR}/UTHelper")
-set(CONN_UTEST "${CMAKE_CURRENT_SOURCE_DIR}/UTConn")
-set(RABBIT_UTEST "${CMAKE_CURRENT_SOURCE_DIR}/UTRabbit")
-set(CRITICALSECTION_UTEST "${CMAKE_CURRENT_SOURCE_DIR}/UTCriticalSection")
-set(AWSSDKCPP_UTEST "${CMAKE_CURRENT_SOURCE_DIR}/UTAwsSdkCpp")
-
-# Projects to build
-add_subdirectory(${HELPER_UTEST})
-add_subdirectory(${CONN_UTEST})
-add_subdirectory(${RABBIT_UTEST})
-add_subdirectory(${CRITICALSECTION_UTEST})
-add_subdirectory(${AWSSDKCPP_UTEST})
diff --git a/sql-odbc/src/UnitTests/GoogleTest.LICENSE b/sql-odbc/src/UnitTests/GoogleTest.LICENSE
deleted file mode 100644
index 65c76c50ce..0000000000
--- a/sql-odbc/src/UnitTests/GoogleTest.LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/sql-odbc/src/UnitTests/UTAwsSdkCpp/CMakeLists.txt b/sql-odbc/src/UnitTests/UTAwsSdkCpp/CMakeLists.txt
deleted file mode 100644
index 05f665aabf..0000000000
--- a/sql-odbc/src/UnitTests/UTAwsSdkCpp/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-project(ut_aws_sdk_cpp)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_aws_sdk_cpp.cpp)
-include_directories(	${UT_HELPER}
-						${AWSSDK_INCLUDE_DIR}
-						${VLD_SRC})
-
-# Generate executable
-add_executable(ut_aws_sdk_cpp ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_link_libraries(ut_aws_sdk_cpp ut_helper GTest::gtest_main aws-cpp-sdk-core ${VLD})
-target_compile_definitions(ut_aws_sdk_cpp PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/UnitTests/UTAwsSdkCpp/packages.config b/sql-odbc/src/UnitTests/UTAwsSdkCpp/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/UnitTests/UTAwsSdkCpp/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.cpp b/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.h b/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/UnitTests/UTAwsSdkCpp/test_aws_sdk_cpp.cpp b/sql-odbc/src/UnitTests/UTAwsSdkCpp/test_aws_sdk_cpp.cpp
deleted file mode 100644
index 4952c70fc2..0000000000
--- a/sql-odbc/src/UnitTests/UTAwsSdkCpp/test_aws_sdk_cpp.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// clang-format off
-#include "pch.h"
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#endif  // __APPLE__
-#include <aws/core/Aws.h>
-#include <aws/core/auth/AWSAuthSigner.h>
-#include <aws/core/auth/AWSCredentialsProvider.h>
-#include <aws/core/http/HttpClient.h>
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-#include "unit_test_helper.h"
-
-using namespace Aws::Auth;
-using namespace Aws::Client;
-using namespace Aws::Http;
-
-static const char service_name[] = "es";
-static const char allocation_tag[] = "AWS_SIGV4_Test";
-static const char host[] = "https://search-bit-quill-cx3hpfoxvasohujxkllmgjwqde.us-west-2.es.amazonaws.com";
-static const char region[] = "us-west-2";
-
-TEST(AWS_SIGV4, EnvironmentAWSCredentials) {
-	Aws::SDKOptions options;
-	EXPECT_NO_THROW(Aws::InitAPI(options));
-
-	auto request = CreateHttpRequest(Aws::String(host), HttpMethod::HTTP_GET, Aws::Utils::Stream::DefaultResponseStreamFactoryMethod);
-
-	std::shared_ptr<EnvironmentAWSCredentialsProvider> credential_provider =  Aws::MakeShared<Aws::Auth::EnvironmentAWSCredentialsProvider>(allocation_tag);
-
-	AWSAuthV4Signer signer(credential_provider, service_name, region);
-	ASSERT_TRUE(signer.SignRequest(*request));
-
-	auto http_client = CreateHttpClient(Aws::Client::ClientConfiguration());
-
-	auto response = http_client->MakeRequest(request);
-	ASSERT_NE(response, nullptr);
-	EXPECT_EQ(Aws::Http::HttpResponseCode::OK, response->GetResponseCode());
-	
-	EXPECT_NO_THROW(Aws::ShutdownAPI(options));
-}
-
-TEST(SettingSDKOptions, TurnLoggingOn) {
-    Aws::SDKOptions options;
-	options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Info;
-    EXPECT_NO_THROW(Aws::InitAPI(options));
-    EXPECT_NO_THROW(Aws::ShutdownAPI(options));
-}
-
-int main(int argc, char** argv) {
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-    int failures = RUN_ALL_TESTS();
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed") << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-    return failures;
-}
diff --git a/sql-odbc/src/UnitTests/UTConn/CMakeLists.txt b/sql-odbc/src/UnitTests/UTConn/CMakeLists.txt
deleted file mode 100644
index 0e90d8f4d6..0000000000
--- a/sql-odbc/src/UnitTests/UTConn/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-project(ut_conn)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_conn.cpp test_query_execution.cpp)
-include_directories(	${UT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${RAPIDJSON_SRC} 
-						${RABBIT_SRC}		
-						${LIBCURL_SRC}
-						${VLD_SRC} )
-
-# Generate executable
-add_executable(ut_conn ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_link_libraries(ut_conn sqlodbc ut_helper GTest::gtest_main)
-target_compile_definitions(ut_conn PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/UnitTests/UTConn/packages.config b/sql-odbc/src/UnitTests/UTConn/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/UnitTests/UTConn/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/UnitTests/UTConn/pch.cpp b/sql-odbc/src/UnitTests/UTConn/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/UnitTests/UTConn/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/UnitTests/UTConn/pch.h b/sql-odbc/src/UnitTests/UTConn/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/UnitTests/UTConn/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/UnitTests/UTConn/test_conn.cpp b/sql-odbc/src/UnitTests/UTConn/test_conn.cpp
deleted file mode 100644
index a93962a0f7..0000000000
--- a/sql-odbc/src/UnitTests/UTConn/test_conn.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "unit_test_helper.h"
-#include "opensearch_communication.h"
-// clang-format on
-
-const size_t valid_option_count = 4;
-const size_t invalid_option_count = 4;
-const size_t missing_option_count = 3;
-const std::string valid_host = (use_ssl ? "https://localhost" : "localhost");
-const std::string valid_port = "9200";
-const std::string valid_user = "admin";
-const std::string valid_pw = "admin";
-const std::string valid_region = "us-west-3";
-const std::string invalid_host = "10.1.1.189";
-const std::string invalid_port = "920";
-const std::string invalid_user = "amin";
-const std::string invalid_pw = "amin";
-const std::string invalid_region = "bad-region";
-runtime_options valid_opt_val = {{valid_host, valid_port, "1", "0"},
-                                 {"BASIC", valid_user, valid_pw, valid_region},
-                                 {use_ssl, false, "", "", "", ""}};
-runtime_options invalid_opt_val = {
-    {invalid_host, invalid_port, "1", "0"},
-    {"BASIC", invalid_user, invalid_pw, valid_region},
-    {use_ssl, false, "", "", "", ""}};
-runtime_options missing_opt_val = {{"", "", "1", "0"},
-                                   {"BASIC", "", invalid_pw, valid_region},
-                                   {use_ssl, false, "", "", "", ""}};
-
-TEST(TestOpenSearchConnConnectionOptions, ValidParameters) {
-    OpenSearchCommunication conn;
-    EXPECT_EQ(true,
-              conn.ConnectionOptions(valid_opt_val, 1, 1, valid_option_count));
-}
-
-TEST(TestOpenSearchConnConnectionOptions, MissingParameters) {
-    OpenSearchCommunication conn;
-    EXPECT_EQ(false, conn.ConnectionOptions(missing_opt_val, 1, 1,
-                                            missing_option_count));
-}
-
-class TestOpenSearchConnConnectDBStart : public testing::Test {
-   public:
-    TestOpenSearchConnConnectDBStart() {
-    }
-
-    void SetUp() {
-    }
-
-    void TearDown() {
-        m_conn.DropDBConnection();
-    }
-
-    ~TestOpenSearchConnConnectDBStart() {
-        // cleanup any pending stuff, but no exceptions allowed
-    }
-
-    OpenSearchCommunication m_conn;
-};
-
-TEST_F(TestOpenSearchConnConnectDBStart, ValidParameters) {
-    ASSERT_NE(false, m_conn.ConnectionOptions(valid_opt_val, 1, 1,
-                                              valid_option_count));
-    EXPECT_EQ(true, m_conn.ConnectDBStart());
-    EXPECT_EQ(CONNECTION_OK, m_conn.GetConnectionStatus());
-}
-
-TEST_F(TestOpenSearchConnConnectDBStart, InvalidParameters) {
-    ASSERT_TRUE(
-        m_conn.ConnectionOptions(invalid_opt_val, 1, 1, invalid_option_count));
-    EXPECT_EQ(false, m_conn.ConnectDBStart());
-    EXPECT_EQ(CONNECTION_BAD, m_conn.GetConnectionStatus());
-}
-
-TEST_F(TestOpenSearchConnConnectDBStart, MissingParameters) {
-    ASSERT_NE(true, m_conn.ConnectionOptions(missing_opt_val, 1, 1,
-                                             missing_option_count));
-    EXPECT_EQ(false, m_conn.ConnectDBStart());
-    EXPECT_EQ(CONNECTION_BAD, m_conn.GetConnectionStatus());
-}
-
-TEST(TestOpenSearchConnDropDBConnection, InvalidParameters) {
-    OpenSearchCommunication conn;
-    ASSERT_EQ(CONNECTION_BAD, conn.GetConnectionStatus());
-    ASSERT_TRUE(
-        conn.ConnectionOptions(invalid_opt_val, 1, 1, invalid_option_count));
-    ASSERT_NE(true, conn.ConnectDBStart());
-    ASSERT_EQ(CONNECTION_BAD, conn.GetConnectionStatus());
-    conn.DropDBConnection();
-    EXPECT_EQ(CONNECTION_BAD, conn.GetConnectionStatus());
-}
-
-TEST(TestOpenSearchConnDropDBConnection, MissingParameters) {
-    OpenSearchCommunication conn;
-    ASSERT_EQ(CONNECTION_BAD, conn.GetConnectionStatus());
-    ASSERT_NE(true, conn.ConnectionOptions(missing_opt_val, 1, 1,
-                                           missing_option_count));
-    ASSERT_NE(true, conn.ConnectDBStart());
-    ASSERT_EQ(CONNECTION_BAD, conn.GetConnectionStatus());
-    conn.DropDBConnection();
-    EXPECT_EQ(CONNECTION_BAD, conn.GetConnectionStatus());
-}
-
-TEST(TestOpenSearchConnDropDBConnection, ValidParameters) {
-    OpenSearchCommunication conn;
-    ASSERT_NE(false,
-              conn.ConnectionOptions(valid_opt_val, 1, 1, valid_option_count));
-    ASSERT_NE(false, conn.ConnectDBStart());
-    ASSERT_EQ(CONNECTION_OK, conn.GetConnectionStatus());
-    conn.DropDBConnection();
-    EXPECT_EQ(CONNECTION_BAD, conn.GetConnectionStatus());
-}
-
-int main(int argc, char** argv) {
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-
-    int failures = RUN_ALL_TESTS();
-
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-    return failures;
-}
diff --git a/sql-odbc/src/UnitTests/UTConn/test_query_execution.cpp b/sql-odbc/src/UnitTests/UTConn/test_query_execution.cpp
deleted file mode 100644
index f3899123dd..0000000000
--- a/sql-odbc/src/UnitTests/UTConn/test_query_execution.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-// clang-format off
-#include "pch.h"
-#include "unit_test_helper.h"
-#include "opensearch_communication.h"
-#include "opensearch_helper.h"
-// clang-format on
-
-const std::string valid_host = (use_ssl ? "https://localhost" : "localhost");
-const std::string valid_port = "9200";
-const std::string valid_user = "admin";
-const std::string valid_pw = "admin";
-const std::string valid_region = "us-west-3";
-const std::string query =
-    "SELECT Origin FROM opensearch_dashboards_sample_data_flights LIMIT 5";
-const std::string all_columns_flights_query =
-    "SELECT * FROM opensearch_dashboards_sample_data_flights LIMIT 5";
-const std::string some_columns_flights_query =
-    "SELECT Origin, OriginWeather FROM opensearch_dashboards_sample_data_flights LIMIT 5";
-const std::string invalid_query = "SELECT";
-const int EXECUTION_SUCCESS = 0;
-const int EXECUTION_ERROR = -1;
-const std::string fetch_size = "0";
-const int all_columns_flights_count = 25;
-const int some_columns_flights_count = 2;
-runtime_options valid_conn_opt_val = {
-    {valid_host, valid_port, "1", "0"},
-    {"BASIC", valid_user, valid_pw, valid_region},
-    {use_ssl, false, "", "", "", ""}};
-
-TEST(TestOpenSearchExecDirect, ValidQuery) {
-    OpenSearchCommunication conn;
-    ASSERT_TRUE(conn.ConnectionOptions(valid_conn_opt_val, false, 0, 0));
-    ASSERT_TRUE(conn.ConnectDBStart());
-    EXPECT_EQ(EXECUTION_SUCCESS,
-              OpenSearchExecDirect(&conn, some_columns_flights_query.c_str(), fetch_size.c_str()));
-}
-
-TEST(TestOpenSearchExecDirect, MissingQuery) {
-    OpenSearchCommunication conn;
-    ASSERT_TRUE(conn.ConnectionOptions(valid_conn_opt_val, false, 0, 0));
-    ASSERT_TRUE(conn.ConnectDBStart());
-    EXPECT_EQ(EXECUTION_ERROR,
-              OpenSearchExecDirect(&conn, NULL, fetch_size.c_str()));
-}
-
-TEST(TestOpenSearchExecDirect, MissingConnection) {
-    EXPECT_EQ(EXECUTION_ERROR,
-              OpenSearchExecDirect(NULL, query.c_str(), fetch_size.c_str()));
-}
-
-// Conn::ExecDirect
-
-TEST(TestConnExecDirect, ValidQueryAllColumns) {
-    OpenSearchCommunication conn;
-    ASSERT_TRUE(conn.ConnectionOptions(valid_conn_opt_val, false, 0, 0));
-    ASSERT_TRUE(conn.ConnectDBStart());
-
-    conn.ExecDirect(all_columns_flights_query.c_str(), fetch_size.c_str());
-    OpenSearchResult* result = conn.PopResult();
-    EXPECT_EQ("SELECT", result->command_type);
-    EXPECT_FALSE(result->result_json.empty());
-    EXPECT_EQ(all_columns_flights_count, result->num_fields);
-    EXPECT_EQ((size_t)all_columns_flights_count, result->column_info.size());
-}
-
-TEST(TestConnExecDirect, ValidQuerySomeColumns) {
-    OpenSearchCommunication conn;
-    ASSERT_TRUE(conn.ConnectionOptions(valid_conn_opt_val, false, 0, 0));
-    ASSERT_TRUE(conn.ConnectDBStart());
-
-    conn.ExecDirect(some_columns_flights_query.c_str(), fetch_size.c_str());
-    OpenSearchResult* result = conn.PopResult();
-    EXPECT_EQ("SELECT", result->command_type);
-    EXPECT_FALSE(result->result_json.empty());
-    EXPECT_EQ(some_columns_flights_count, result->num_fields);
-    EXPECT_EQ((size_t)some_columns_flights_count, result->column_info.size());
-}
-
-TEST(TestConnExecDirect, InvalidQuery) {
-    OpenSearchCommunication conn;
-    ASSERT_TRUE(conn.ConnectionOptions(valid_conn_opt_val, false, 0, 0));
-    ASSERT_TRUE(conn.ConnectDBStart());
-
-    conn.ExecDirect(invalid_query.c_str(), fetch_size.c_str());
-    OpenSearchResult* result = conn.PopResult();
-    EXPECT_EQ(NULL, (void*)result);
-}
-
-// Conn::PopResult
-
-TEST(TestConnPopResult, PopEmptyQueue) {
-    OpenSearchCommunication conn;
-    ASSERT_TRUE(conn.ConnectionOptions(valid_conn_opt_val, false, 0, 0));
-    ASSERT_TRUE(conn.ConnectDBStart());
-
-    OpenSearchResult* result = conn.PopResult();
-    EXPECT_EQ(NULL, (void*)result);
-}
-
-TEST(TestConnPopResult, PopTwoQueryResults) {
-    OpenSearchCommunication conn;
-    ASSERT_TRUE(conn.ConnectionOptions(valid_conn_opt_val, false, 0, 0));
-    ASSERT_TRUE(conn.ConnectDBStart());
-
-    conn.ExecDirect(some_columns_flights_query.c_str(), fetch_size.c_str());
-    conn.ExecDirect(all_columns_flights_query.c_str(), fetch_size.c_str());
-
-    // Pop some_columns
-    OpenSearchResult* result = conn.PopResult();
-    EXPECT_EQ(some_columns_flights_count, result->num_fields);
-
-    // Pop all_columns
-    result = conn.PopResult();
-    EXPECT_EQ(all_columns_flights_count, result->num_fields);
-}
diff --git a/sql-odbc/src/UnitTests/UTCriticalSection/CMakeLists.txt b/sql-odbc/src/UnitTests/UTCriticalSection/CMakeLists.txt
deleted file mode 100644
index e806ef9f4b..0000000000
--- a/sql-odbc/src/UnitTests/UTCriticalSection/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-project(ut_critical_section)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_critical_section.cpp)
-include_directories(	${UT_HELPER}
-						${OPENSEARCHODBC_SRC}
-						${RAPIDJSON_SRC}
-						${VLD_SRC}
-						${RABBIT_SRC}  )
-
-# Generate executable
-add_executable(ut_critical_section ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_link_libraries(ut_critical_section sqlodbc ut_helper GTest::gtest_main)
-target_compile_definitions(ut_critical_section PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/UnitTests/UTCriticalSection/packages.config b/sql-odbc/src/UnitTests/UTCriticalSection/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/UnitTests/UTCriticalSection/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/UnitTests/UTCriticalSection/pch.cpp b/sql-odbc/src/UnitTests/UTCriticalSection/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/UnitTests/UTCriticalSection/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/UnitTests/UTCriticalSection/pch.h b/sql-odbc/src/UnitTests/UTCriticalSection/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/UnitTests/UTCriticalSection/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/UnitTests/UTCriticalSection/test_critical_section.cpp b/sql-odbc/src/UnitTests/UTCriticalSection/test_critical_section.cpp
deleted file mode 100644
index 31a3f7ea2b..0000000000
--- a/sql-odbc/src/UnitTests/UTCriticalSection/test_critical_section.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-#include <stdio.h>
-
-#include <iostream>
-#include <string>
-#include <thread>
-
-#include "opensearch_helper.h"
-#include "pch.h"
-#include "unit_test_helper.h"
-
-const size_t loop_count = 10;
-const size_t thread_count = 1000;
-
-#define INIT_CS(x) XPlatformInitializeCriticalSection(&(x))
-#define ENTER_CS(x) XPlatformEnterCriticalSection((x))
-#define LEAVE_CS(x) XPlatformLeaveCriticalSection((x))
-#define DELETE_CS(x) XPlatformDeleteCriticalSection(&(x))
-
-class TestCriticalSection : public testing::Test {
-   public:
-    TestCriticalSection() : m_lock(NULL) {
-    }
-
-    void SetUp() {
-        INIT_CS(m_lock);
-    }
-
-    void TearDown() {
-        DELETE_CS(m_lock);
-    }
-
-    ~TestCriticalSection() {
-    }
-    void* m_lock;
-
-    typedef struct CriticalInfo {
-        volatile size_t* shared_mem;
-        void* lock;
-    } CriticalInfo;
-};
-
-TEST_F(TestCriticalSection, SingleEnterExit) {
-    ENTER_CS(m_lock);
-    LEAVE_CS(m_lock);
-}
-
-TEST_F(TestCriticalSection, MultipleEntersMultipleExits) {
-    for (size_t i = 0; i < loop_count; i++)
-        ENTER_CS(m_lock);
-    for (size_t i = 0; i < loop_count; i++)
-        LEAVE_CS(m_lock);
-}
-
-TEST_F(TestCriticalSection, MultipleEnterExit) {
-    for (size_t i = 0; i < loop_count; i++) {
-        ENTER_CS(m_lock);
-        LEAVE_CS(m_lock);
-    }
-}
-
-TEST_F(TestCriticalSection, MultiThreadSingleLock) {
-    auto f = [](CriticalInfo* info) {
-        *info->shared_mem = static_cast< size_t >(1);
-        ENTER_CS(info->lock);
-        *info->shared_mem = static_cast< size_t >(2);
-        LEAVE_CS(info->lock);
-    };
-
-    volatile size_t shared_mem = 0;
-    CriticalInfo crit_info;
-    crit_info.shared_mem = &shared_mem;
-    crit_info.lock = m_lock;
-
-    ENTER_CS(m_lock);
-    std::thread thread_object(f, &crit_info);
-#ifdef WIN32
-    Sleep(1000);
-#else
-    usleep(1000 * 1000);
-#endif
-    EXPECT_EQ(shared_mem, static_cast< size_t >(1));
-    LEAVE_CS(m_lock);
-#ifdef WIN32
-    Sleep(1000);
-#else
-    usleep(1000 * 1000);
-#endif
-    EXPECT_EQ(shared_mem, static_cast< size_t >(2));
-    thread_object.join();
-}
-
-// Make many threads to see if multiple simultaneous attempts at locking cause
-// any issues
-TEST_F(TestCriticalSection, RaceConditions) {
-    auto f = [](CriticalInfo* info) {
-        std::stringstream ss_thread_id;
-        ss_thread_id << std::this_thread::get_id();
-        size_t thread_id = static_cast< size_t >(
-            strtoull(ss_thread_id.str().c_str(), NULL, 10));
-        ENTER_CS(info->lock);
-        // Update shared memory, release thread priority, then check if memory
-        // is still the same
-        *info->shared_mem = static_cast< size_t >(thread_id);
-#ifdef WIN32
-        Sleep(0);
-#else
-        usleep(0);
-#endif
-        EXPECT_EQ(thread_id, *info->shared_mem);
-        LEAVE_CS(info->lock);
-    };
-
-    volatile size_t shared_mem = 0;
-    CriticalInfo crit_info;
-    crit_info.shared_mem = &shared_mem;
-    crit_info.lock = m_lock;
-    std::vector< std::thread > threads;
-    threads.reserve(thread_count);
-
-    for (size_t i = 0; i < thread_count; i++)
-        threads.emplace_back(std::thread(f, &crit_info));
-
-    for (auto& it : threads)
-        it.join();
-}
-
-int main(int argc, char** argv) {
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-    int failures = RUN_ALL_TESTS();
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-}
diff --git a/sql-odbc/src/UnitTests/UTHelper/CMakeLists.txt b/sql-odbc/src/UnitTests/UTHelper/CMakeLists.txt
deleted file mode 100644
index 1bfad42485..0000000000
--- a/sql-odbc/src/UnitTests/UTHelper/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-project(ut_helper)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES unit_test_helper.cpp)	
-set(HEADER_FILES unit_test_helper.h)
-include_directories(${OPENSEARCHODBC_SRC} ${VLD_SRC})
-
-# Generate dll (SHARED)
-add_library(ut_helper SHARED ${SOURCE_FILES} ${HEADER_FILES})
-
-if (WIN32 AND BITNESS EQUAL 64)
-find_library(   VLD
-				vld	
-				HINTS "${LIBRARY_DIRECTORY}/VisualLeakDetector/lib64"
-			)
-target_link_libraries(ut_helper ${VLD})
-elseif (WIN32 AND BITNESS EQUAL 32)
-find_library(   VLD
-				vld	
-				HINTS "${LIBRARY_DIRECTORY}/VisualLeakDetector/lib"
-			)
-target_link_libraries(ut_helper ${VLD})
-endif()
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-# Library dependencies
-target_link_libraries(ut_helper sqlodbc GTest::gtest_main)
-target_compile_definitions(ut_helper PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.cpp b/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.cpp
deleted file mode 100644
index 9f8fbd7508..0000000000
--- a/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "unit_test_helper.h"
-
-#include <fstream>
-#include <iostream>
-
-void WriteFileIfSpecified(char** begin, char** end, const std::string& option,
-                          std::string& output) {
-    char** itr = std::find(begin, end, option);
-    if (itr != end && ++itr != end) {
-        std::ofstream out_file(*itr);
-        if (out_file.good())
-            out_file << output;
-    }
-    return;
-}
diff --git a/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.h b/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.h
deleted file mode 100644
index fcdbfa95b2..0000000000
--- a/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef UNIT_TEST_HELPER
-#define UNIT_TEST_HELPER
-
-#if defined(WIN32) || defined (WIN64)
-#ifdef _DEBUG
-#define VLD_FORCE_ENABLE 1
-#include <vld.h>
-#endif
-#endif
-
-#include <string>
-#ifdef USE_SSL
-const bool use_ssl = true;
-#else
-const bool use_ssl = false;
-#endif
-
-void WriteFileIfSpecified(char** begin, char** end, const std::string& option,
-                          std::string& output);
-
-#endif
diff --git a/sql-odbc/src/UnitTests/UTRabbit/CMakeLists.txt b/sql-odbc/src/UnitTests/UTRabbit/CMakeLists.txt
deleted file mode 100644
index b5f638fe01..0000000000
--- a/sql-odbc/src/UnitTests/UTRabbit/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-project(ut_rabbit)
-
-# Source, headers, and include dirs
-set(SOURCE_FILES test_rabbit.cpp)
-include_directories(	${UT_HELPER}
-						${RAPIDJSON_SRC} 
-						${RABBIT_SRC} 
-						${VLD_SRC} )
-
-# Generate executable
-add_executable(ut_rabbit ${SOURCE_FILES})
-
-# Find packages from vcpkg
-find_package(GTest CONFIG REQUIRED)
-
-target_link_libraries(ut_rabbit ut_helper GTest::gtest_main ${VLD})
-target_compile_definitions(ut_rabbit PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/UnitTests/UTRabbit/packages.config b/sql-odbc/src/UnitTests/UTRabbit/packages.config
deleted file mode 100644
index 3c6fe17f54..0000000000
--- a/sql-odbc/src/UnitTests/UTRabbit/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/sql-odbc/src/UnitTests/UTRabbit/pch.cpp b/sql-odbc/src/UnitTests/UTRabbit/pch.cpp
deleted file mode 100644
index 97b544ec11..0000000000
--- a/sql-odbc/src/UnitTests/UTRabbit/pch.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// pch.cpp
-// Include the standard header and generate the precompiled header.
-//
-
-#include "pch.h"
diff --git a/sql-odbc/src/UnitTests/UTRabbit/pch.h b/sql-odbc/src/UnitTests/UTRabbit/pch.h
deleted file mode 100644
index 29c81fffa1..0000000000
--- a/sql-odbc/src/UnitTests/UTRabbit/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// pch.h
-// Header for standard system include files.
-//
-
-#pragma once
-
-#include "gtest/gtest.h"
diff --git a/sql-odbc/src/UnitTests/UTRabbit/test_rabbit.cpp b/sql-odbc/src/UnitTests/UTRabbit/test_rabbit.cpp
deleted file mode 100644
index 84f53605a7..0000000000
--- a/sql-odbc/src/UnitTests/UTRabbit/test_rabbit.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-// clang-format off
-#include "pch.h"
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#endif  // __APPLE__
-#include "rabbit.hpp"
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-#include "unit_test_helper.h"
-
-const std::string invalid_json_schema = "{ invalid schema }";
-const std::string valid_json_schema = "{" // This was generated from the example OpenSearch data
-  "\"type\": \"object\","
-  "\"properties\": {"
-    "\"schema\": {"
-      "\"type\": \"array\","
-      "\"items\": [{"
-          "\"type\": \"object\","
-          "\"properties\": {"
-            "\"name\": { \"type\": \"string\" },"
-            "\"type\": { \"type\": \"string\" }"
-          "},"
-          "\"required\": [ \"name\", \"type\" ]"
-      "}]"
-    "},"
-    "\"total\": { \"type\": \"integer\" },"
-    "\"datarows\": {"
-      "\"type\": \"array\","
-      "\"items\": {}"
-    "},"
-    "\"size\": { \"type\": \"integer\" },"
-    "\"status\": { \"type\": \"integer\" }"
-  "},"
-  "\"required\": [\"schema\", \"total\", \"datarows\", \"size\", \"status\"]"
-"}";
-const std::string valid_json_for_schema = "{" // This was taken from the example OpenSearch data
-  "\"schema\": [{"
-	"\"name\": \"valid_name1\","
-	"\"type\": \"valid_type1\"},{"
-	"\"name\": \"valid_name2\","
-	"\"type\": \"valid_type2\"},{"
-	"\"name\": \"valid_name3\","
-	"\"type\": \"valid_type3\"}],"
-  "\"total\": 10,"
-  "\"datarows\": [],"
-  "\"size\": 3,"
-  "\"status\": 200"
-"}";
-const std::string invalid_json_for_schema = "{"
-  "\"schema\": [{"
-	"\"name\": 1,"
-	"\"type\": \"valid_type1\"},{"
-	"\"name\": 2,"
-	"\"type\": \"valid_type2\"},{"
-	"\"name\": 3,"
-	"\"type\": \"valid_type3\"}],"
-  "\"total\": \"10\","
-  "\"datarows\": {},"
-  "\"size\": \"string_size\","
-  "\"status\": 200"
-"}";
-const std::string invalid_json = "invalid json";
-const std::string valid_json_int = "{ \"value\" : 123 }";
-const std::string invalid_json_int = "{ \"value\" : invalid }";
-const std::string valid_json_str = "{ \"value\" : \"123\"}";
-const std::string invalid_json_str = "{ \"value\" : \"123}";
-const std::string valid_json_arr = "{ \"value\" : [ 1, \"2\", true] }";
-const std::string invalid_json_arr = "{ \"value\" : [ 1, 2 3] }";
-const std::string valid_json_obj = "{"
-	"\"value\" : {"
-		"\"subval_str\" : \"1\","
-		"\"subval_int\" : 2,"
-		"\"subval_bool\" : true,"
-		"\"subval_flt\" : 3.4"
-	"}"
-"}";
-const std::string invalid_json_obj = "{"
-	"\"value\" : {"
-		"\"subval_str\" : \"1\""
-		"\"subval_int\" : 2,"
-		"\"subval_bool\" : true,"
-		"\"subval_flt\" : 3.4"
-	"}"
-"}";
-// Intentionally serialized because it will be compared to a str parsed by rabbit, which is serialized by default
-const std::string valid_sub_obj_for_conversion = "{\"subval_obj\":{\"subval_str\":\"1\",\"subval_int\":2,\"subval_bool\":true,\"subval_flt\":3.4}}";
-const std::string valid_obj_for_conversion = "{ \"value\" : " + valid_sub_obj_for_conversion + "}";
-// clang-format on
-
-const std::vector< size_t > distances = {0, 1, 5, 30};
-
-TEST(StandardDistance, ValidIterator) {
-    rabbit::array arr;
-    for (size_t i = 0; i < distances.size(); i++) {
-        rabbit::array sub_array;
-        for (size_t j = 0; j < distances[i]; j++) {
-            sub_array.push_back(static_cast< uint64_t >(j));
-        }
-        arr.push_back(sub_array);
-    }
-
-    ASSERT_EQ(static_cast< size_t >(std::distance(arr.begin(), arr.end())),
-              distances.size());
-    size_t i = 0;
-    for (auto it = arr.begin(); it < arr.end(); it++, i++) {
-        EXPECT_EQ(static_cast< size_t >(
-                      std::distance(it->value_begin(), it->value_end())),
-                  distances[i]);
-    }
-}
-
-TEST(ConvertObjectToString, IteratorAtStringConvert) {
-    rabbit::document doc;
-    ASSERT_NO_THROW(doc.parse(valid_json_for_schema));
-    rabbit::array arr;
-    ASSERT_NO_THROW(arr = doc["schema"]);
-    size_t i = 1;
-    std::string valid_name = "valid_name";
-    std::string valid_type = "valid_type";
-    for (auto it = arr.begin(); it < arr.end(); ++it, ++i) {
-        std::string name, type;
-        ASSERT_NO_THROW(name = it->at("name").as_string());
-        ASSERT_NO_THROW(type = it->at("type").as_string());
-        EXPECT_EQ(name, valid_name + std::to_string(i));
-        EXPECT_EQ(type, valid_type + std::to_string(i));
-    }
-}
-
-TEST(ConvertObjectToString, ValidObject) {
-    rabbit::document doc;
-    EXPECT_NO_THROW(doc.parse(valid_obj_for_conversion));
-    ASSERT_TRUE(doc.is_object());
-    ASSERT_TRUE(doc.has("value"));
-    ASSERT_TRUE(doc["value"].is_object());
-    std::string value_str = doc["value"].str();
-    EXPECT_EQ(value_str, valid_sub_obj_for_conversion);
-}
-
-TEST(ParseSchema, ValidSchemaValidDoc) {
-    rabbit::document doc;
-    EXPECT_NO_THROW(doc.parse(valid_json_for_schema, valid_json_schema));
-}
-
-TEST(ParseSchema, InvalidSchemaValidDoc) {
-    rabbit::document doc;
-    EXPECT_THROW(doc.parse(valid_json_for_schema, invalid_json_schema),
-                 rabbit::parse_error);
-}
-
-TEST(ParseSchema, ValidSchemaInvalidDoc) {
-    rabbit::document doc;
-    EXPECT_THROW(doc.parse(invalid_json_for_schema, valid_json_schema),
-                 rabbit::parse_error);
-}
-
-TEST(ParseSchema, InvalidSchemaInvalidDoc) {
-    rabbit::document doc;
-    EXPECT_THROW(doc.parse(invalid_json, invalid_json_schema),
-                 rabbit::parse_error);
-}
-
-TEST(ParseObj, ValidObj) {
-    rabbit::document doc;
-    EXPECT_NO_THROW(doc.parse(valid_json_obj));
-    ASSERT_TRUE(doc.is_object());
-    ASSERT_TRUE(doc.has("value"));
-    ASSERT_TRUE(doc["value"].is_object());
-    ASSERT_TRUE(doc["value"].has("subval_str"));
-    ASSERT_TRUE(doc["value"].has("subval_int"));
-    ASSERT_TRUE(doc["value"].has("subval_bool"));
-    ASSERT_TRUE(doc["value"].has("subval_flt"));
-    ASSERT_TRUE(doc["value"]["subval_str"].is_string());
-    ASSERT_TRUE(doc["value"]["subval_int"].is_int());
-    ASSERT_TRUE(doc["value"]["subval_bool"].is_bool());
-    ASSERT_TRUE(doc["value"]["subval_flt"].is_number());
-    EXPECT_EQ("1", doc["value"]["subval_str"].as_string());
-    EXPECT_EQ(2, doc["value"]["subval_int"].as_int());
-    EXPECT_EQ(true, doc["value"]["subval_bool"].as_bool());
-    EXPECT_EQ(3.4, doc["value"]["subval_flt"].as_double());
-}
-
-TEST(ParseObj, InvalidObj) {
-    rabbit::document doc;
-    EXPECT_THROW(doc.parse(invalid_json_obj), rabbit::parse_error);
-}
-
-TEST(ParseArr, ValidArr) {
-    rabbit::document doc;
-    ASSERT_NO_THROW(doc.parse(valid_json_arr));
-    ASSERT_TRUE(doc.is_object());
-    ASSERT_TRUE(doc.has("value"));
-    ASSERT_TRUE(doc["value"].is_array());
-
-    rabbit::array arr;
-    ASSERT_NO_THROW(arr = doc["value"]);
-    size_t i = 0;
-    for (rabbit::array::iterator it = arr.begin(); it != arr.end(); ++it, ++i) {
-        switch (i) {
-            case 0:
-                ASSERT_TRUE(it->is_int());
-                EXPECT_EQ(1, it->as_int());
-                break;
-            case 1:
-                ASSERT_TRUE(it->is_string());
-                EXPECT_EQ("2", it->as_string());
-                break;
-            case 2:
-                ASSERT_TRUE(it->is_bool());
-                EXPECT_EQ(true, it->as_bool());
-                break;
-            default:
-                FAIL() << "Array iterator exceeded bounds";
-                return;
-        }
-    }
-}
-TEST(ParseArr, InvalidArr) {
-    rabbit::document doc;
-    EXPECT_THROW(doc.parse(invalid_json_arr), rabbit::parse_error);
-}
-
-TEST(ParseStr, ValidStr) {
-    rabbit::document doc;
-    ASSERT_NO_THROW(doc.parse(valid_json_str));
-    ASSERT_TRUE(doc.is_object());
-    ASSERT_TRUE(doc.has("value"));
-    ASSERT_TRUE(doc["value"].is_string());
-    EXPECT_EQ("123", doc["value"].as_string());
-}
-
-TEST(ParseStr, InvalidStr) {
-    rabbit::document doc;
-    EXPECT_THROW(doc.parse(invalid_json_str), rabbit::parse_error);
-}
-
-TEST(ParseInt, ValidInt) {
-    rabbit::document doc;
-    ASSERT_NO_THROW(doc.parse(valid_json_int));
-    ASSERT_TRUE(doc.is_object());
-    ASSERT_TRUE(doc.has("value"));
-    ASSERT_TRUE(doc["value"].is_int());
-    EXPECT_EQ(123, doc["value"].as_int());
-}
-
-TEST(ParseInt, InvalidInt) {
-    rabbit::document doc;
-    EXPECT_THROW(doc.parse(invalid_json_int), rabbit::parse_error);
-}
-
-TEST(Parse, InvalidJson) {
-    rabbit::document doc;
-    EXPECT_THROW(doc.parse(invalid_json), rabbit::parse_error);
-}
-
-int main(int argc, char** argv) {
-    testing::internal::CaptureStdout();
-    ::testing::InitGoogleTest(&argc, argv);
-    int failures = RUN_ALL_TESTS();
-    std::string output = testing::internal::GetCapturedStdout();
-    std::cout << output << std::endl;
-    std::cout << (failures ? "Not all tests passed." : "All tests passed")
-              << std::endl;
-    WriteFileIfSpecified(argv, argv + argc, "-fout", output);
-
-    return failures;
-}
diff --git a/sql-odbc/src/autoconf.h.in b/sql-odbc/src/autoconf.h.in
deleted file mode 100644
index 5abb4109e0..0000000000
--- a/sql-odbc/src/autoconf.h.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#cmakedefine AUTOCONF_ENABLE
-#cmakedefine AUTOCONF_STRING "@AUTOCONF_STRING@"
diff --git a/sql-odbc/src/installer/CMakeLists.txt b/sql-odbc/src/installer/CMakeLists.txt
deleted file mode 100644
index d172b91ac0..0000000000
--- a/sql-odbc/src/installer/CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-include(InstallRequiredSystemLibraries)
-include(CPackComponent)
-
-set(CMAKE_INSTALL_PREFIX ${INSTALL_ROOT})
-
-# General package info
-set(CPACK_PACKAGE_NAME "OpenSearch SQL ODBC Driver ${BITNESS}-bit")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenSearch SQL ODBC Driver ${BITNESS}-bit")
-set(CPACK_PACKAGE_VENDOR "Amazon")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
-set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}")
-set(CPACK_PACKAGE_VERSION "${DRIVER_PACKAGE_VERSION}")
-
-# OS-specific package info
-if(WIN32)
-    # Set generator to WIX
-    set(CPACK_GENERATOR "WIX")
-
-    # This is a unique id for the installer - required for Windows
-    # Generated at https://www.guidgen.com/
-    set(CPACK_WIX_UPGRADE_GUID "2D325BD7-1176-40E8-8AB8-C52DD2F7B792")
-	
-    # The Icon shown next to the program name in Add/Remove programs
-    set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icon.ico")
-	
-    # The bitmap will appear at the top of all installer pages other than the welcome and completion dialogs
-    set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/banner.bmp")
-	
-    # Background bitmap used on the welcome and completion dialogs
-    set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/dialog.bmp")
-
-    # This XML file is used for registry setup
-    set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_SOURCE_DIR}/patch.xml")
-
-    # Add license file
-    set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_ROOT}/LICENSE.txt")
-else()
-    set(CPACK_GENERATOR "productbuild")
-
-    # This script will be run once the Driver component has finished installing.
-    set(CPACK_POSTFLIGHT_DRIVER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/postinstall")
-
-    # The productbuild generator copies files from this directory
-    set(CPACK_PRODUCTBUILD_RESOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Resources")
-
-    # Background setup to Distribution XML
-    set(CPACK_PRODUCTBUILD_BACKGROUND "background.bmp")
-    set(CPACK_PRODUCTBUILD_BACKGROUND_ALIGNMENT "bottomleft")
-    set(CPACK_PRODUCTBUILD_BACKGROUND_SCALING "none")
-
-    # Background setup for the Dark Aqua theme to Distribution XML
-    set(CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA "background_darkaqua.bmp")
-    set(CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA_ALIGNMENT "bottomleft")
-    set(CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA_SCALING "none")
-
-    # Add license file
-    set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_ROOT}/LICENSE.txt")
-    set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/Resources/README.txt")
-    set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/Resources/Welcome.txt")
-endif()
-
-# Set up components for installer
-cpack_add_component(Docs
-	DISPLAY_NAME "Documentation"
-	DESCRIPTION "Documentation about OpenSearch SQL ODBC Driver"
-)
-cpack_add_component(Driver
-	DISPLAY_NAME "Driver"
-	DESCRIPTION "Library files for running the OpenSearch SQL ODBC Driver"
-    REQUIRED 
-)
-cpack_add_component(Resources
-	DISPLAY_NAME "Resources"
-	DESCRIPTION "Resources for OpenSearch SQL ODBC Driver"
-)
-# Install driver files
-install(TARGETS sqlodbc DESTINATION bin COMPONENT "Driver")
-
-# TODO: look into DSN Installer failure
-# if(APPLE)
-#     install(FILES "${PROJECT_ROOT}/bin64/dsn_installer" DESTINATION bin COMPONENT "Driver")
-#     install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/remove-opensearch-dsn.sh" DESTINATION bin COMPONENT "Driver")
-# endif()
-
-# Install documentation files
-install(FILES "${PROJECT_ROOT}/README.md" DESTINATION doc COMPONENT "Docs")
-install(FILES "${PROJECT_ROOT}/LICENSE.txt" DESTINATION doc COMPONENT "Docs")
-install(FILES "${PROJECT_ROOT}/THIRD-PARTY" DESTINATION doc COMPONENT "Docs")
-
-# Install resource files
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/Resources/opensearch_sql_odbc.tdc" DESTINATION resources COMPONENT "Resources")
-
-include(CPack)
diff --git a/sql-odbc/src/installer/Resources/README.txt b/sql-odbc/src/installer/Resources/README.txt
deleted file mode 100644
index 86ec3cd375..0000000000
--- a/sql-odbc/src/installer/Resources/README.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-All files are available in '/Library/ODBC/opensearch-sql-odbc' after installation.
-
-To setup a connection, you can use DSN to store your data source connection information,
-1. Open 'iODBC Data Source Administrator'.
-2. Go to 'User DSN'.
-3. Select 'OpenSearch SQL ODBC DSN' and click on 'Configure'.
-4. Update the connection string values. For the list of all supported options, check '/Library/ODBC/opensearch-sql-odbc/doc/README.md'.
-5. Click 'Ok' to save changes.
-
-If using with ODBC compatible BI tools, refer to the tool documentation on configuring a new ODBC driver. The typical requirement is to make the tool aware of the location of the driver library file and then use it to setup database (i.e OpenSearch) connections.
-
-For example, if you want to use Tableau with OpenSearch Server,
-1. Open 'Tableau'.
-2. Click on 'Other Databases (ODBC)'.
-3. Select 'OpenSearch SQL ODBC DSN' from the DSN list or 'OpenSearch SQL ODBC Driver' from the driver list. If using driver, you need to enter connection string values.
-4. Click on 'Connect'. All connection attributes will be retrived.
-5. Click on 'Sign In'. You will be successfully connected to OpenSearch server.
-
-For more details, check 'https://github.com/opensearch-project/sql/tree/main/sql-odbc'.
\ No newline at end of file
diff --git a/sql-odbc/src/installer/Resources/Welcome.txt b/sql-odbc/src/installer/Resources/Welcome.txt
deleted file mode 100644
index b4412f3294..0000000000
--- a/sql-odbc/src/installer/Resources/Welcome.txt
+++ /dev/null
@@ -1 +0,0 @@
-OpenSearch SQL ODBC is a read-only ODBC driver for connecting to OpenSearch SQL support.
\ No newline at end of file
diff --git a/sql-odbc/src/installer/Resources/background.bmp b/sql-odbc/src/installer/Resources/background.bmp
deleted file mode 100644
index 7ddbfeecd7..0000000000
Binary files a/sql-odbc/src/installer/Resources/background.bmp and /dev/null differ
diff --git a/sql-odbc/src/installer/Resources/background_darkaqua.bmp b/sql-odbc/src/installer/Resources/background_darkaqua.bmp
deleted file mode 100644
index dbd5fc3e50..0000000000
Binary files a/sql-odbc/src/installer/Resources/background_darkaqua.bmp and /dev/null differ
diff --git a/sql-odbc/src/installer/Resources/opensearch_sql_odbc.tdc b/sql-odbc/src/installer/Resources/opensearch_sql_odbc.tdc
deleted file mode 100644
index 3574dfdbff..0000000000
--- a/sql-odbc/src/installer/Resources/opensearch_sql_odbc.tdc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<connection-customization class='genericodbc' enabled='true' version='7.8'>
-<vendor name='OpenSearch' />
-<driver name='OpenSearch SQL ODBC Driver' />
-    <customizations>
-        <customization name='CAP_CREATE_TEMP_TABLES' value='no' />
-        <customization name='CAP_SUPPRESS_DISCOVERY_QUERIES' value='yes' />
-    </customizations>
-</connection-customization>
\ No newline at end of file
diff --git a/sql-odbc/src/installer/banner.bmp b/sql-odbc/src/installer/banner.bmp
deleted file mode 100644
index c0e4b9506f..0000000000
Binary files a/sql-odbc/src/installer/banner.bmp and /dev/null differ
diff --git a/sql-odbc/src/installer/dialog.bmp b/sql-odbc/src/installer/dialog.bmp
deleted file mode 100644
index 72d7858622..0000000000
Binary files a/sql-odbc/src/installer/dialog.bmp and /dev/null differ
diff --git a/sql-odbc/src/installer/icon.ico b/sql-odbc/src/installer/icon.ico
deleted file mode 100644
index 10fc89a562..0000000000
Binary files a/sql-odbc/src/installer/icon.ico and /dev/null differ
diff --git a/sql-odbc/src/installer/patch.xml b/sql-odbc/src/installer/patch.xml
deleted file mode 100644
index 869b624ab5..0000000000
--- a/sql-odbc/src/installer/patch.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<CPackWiXPatch>
-	<CPackWiXFragment Id="CM_CP_Driver.bin.sqlodbc.dll">
-		<!-- Add driver entry in Software -->
-		<RegistryKey Root="HKLM" Key="SOFTWARE\Amazon\OpenSearch SQL ODBC Driver\Driver" >
-			<RegistryValue Type="string" Name="InstallPath" Value="[INSTALL_ROOT]" />
-			<RegistryValue Type="string" Name="LogLevel" Value="" />
-			<RegistryValue Type="string" Name="LogOutput" Value="" />
-		</RegistryKey>
-		
-		<!-- Add driver entry in ODBC Drivers -->
-		<RegistryKey Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" >
-			<RegistryValue Type="string" Name="OpenSearch SQL ODBC Driver" Value="Installed" />
-		</RegistryKey>
-		
-		<!-- Set driver attributes -->
-		<RegistryKey Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\OpenSearch SQL ODBC Driver" >
-			<RegistryValue Type="string" Name="Driver" Value="[INSTALL_ROOT]bin\sqlodbc.dll" />
-			<RegistryValue Type="string" Name="Setup" Value="[INSTALL_ROOT]bin\sqlodbc.dll" />
-		</RegistryKey>
-		
-		<!-- Add DSN entry in ODBC Data Sources -->
-		<RegistryKey Root="HKLM" Key="SOFTWARE\ODBC\ODBC.INI\ODBC Data Sources">
-			<RegistryValue Type="string" Name="OpenSearch SQL ODBC DSN" Value="OpenSearch SQL ODBC Driver" />
-		</RegistryKey>
-		
-		<!-- Set DSN attributes -->
-		<RegistryKey Root="HKLM" Key="SOFTWARE\ODBC\ODBC.INI\OpenSearch SQL ODBC DSN"  >
-			<RegistryValue Type="string" Name="Driver" Value="OpenSearch SQL ODBC Driver" />
-			<RegistryValue Type="string" Name="Host" Value="localhost" />
-			<RegistryValue Type="string" Name="Port" Value="9200" />
-			<RegistryValue Type="string" Name="HostnameVerification" Value="0" />
-			<RegistryValue Type="string" Name="UseSSL" Value="0" />
-			<RegistryValue Type="string" Name="ResponseTimeout" Value="10" />
-			<RegistryValue Type="string" Name="Auth" Value="NONE" />
-			<RegistryValue Type="string" Name="User" Value="" />
-			<RegistryValue Type="string" Name="Password" Value="" />
-			<RegistryValue Type="string" Name="Region" Value="" />
-			<RegistryValue Type="string" Name="LogLevel" Value="0" />
-			<RegistryValue Type="string" Name="LogOutput" Value="C:\" />
-		</RegistryKey>
-
-	</CPackWiXFragment>
-</CPackWiXPatch>
\ No newline at end of file
diff --git a/sql-odbc/src/installer/postinstall b/sql-odbc/src/installer/postinstall
deleted file mode 100644
index c95783c053..0000000000
--- a/sql-odbc/src/installer/postinstall
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-PKG_INSTALL_DIR=/Applications
-FINAL_INSTALL_DIR=/Library/ODBC/opensearch-sql-odbc
-
-# Remove install directory if it already exists
-if [ -d "${FINAL_INSTALL_DIR}" ]; then
-    # Fail if FINAL_INSTALL_DIR is not set for whatever reason
-    if [ -z ${FINAL_INSTALL_DIR} ]; then exit 1; fi
-    rm -rf ${FINAL_INSTALL_DIR}
-fi
-
-# Move PKG installed folders to intended install directory
-mkdir -p ${FINAL_INSTALL_DIR}
-mv ${PKG_INSTALL_DIR}/bin ${FINAL_INSTALL_DIR}/bin
-mv ${PKG_INSTALL_DIR}/doc ${FINAL_INSTALL_DIR}/doc
-mv ${PKG_INSTALL_DIR}/resources ${FINAL_INSTALL_DIR}/resources
-
-# TODO: look into why DSN installer is not working for fresh Mac install
-#   Current issue: "General installer error" when adding driver entry
-
-# Run DSN installer to configurate driver and DSN for system for easy setup.
-# chmod a+x ${FINAL_INSTALL_DIR}/bin/dsn_installer
-# chmod a+x ${FINAL_INSTALL_DIR}/bin/remove-opensearch-dsn.sh
-# echo "I can write to this file" > /tmp/dsn_installer.log
-# ${FINAL_INSTALL_DIR}/bin/dsn_installer ${FINAL_INSTALL_DIR}/bin/ >> /tmp/dsn_installer.log
-# echo "After DSN Installer finishes" >> /tmp/dsn_installer.log
diff --git a/sql-odbc/src/installer/remove-opensearch-dsn.sh b/sql-odbc/src/installer/remove-opensearch-dsn.sh
deleted file mode 100644
index ecf7121f5f..0000000000
--- a/sql-odbc/src/installer/remove-opensearch-dsn.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-echo "This script will only remove the default DSN and Driver entries from your ODBC configuration."
-echo "You will be responsible for removing installed files from the system."
-if [[ $EUID -ne 0 ]]; then
-   echo "ERROR: This script must be run as root"
-   exit 1
-fi
-
-# check for "Yes"
-while true; do
-    read -p "Do you want to continue? (Y/y) " yn
-    case $yn in
-        [Yy]* ) break;;
-        [Nn]* ) exit;;
-        * ) echo "Please answer yes or no.";;
-    esac
-done
-
-# Run dsn_installer uninstall
-${BASH_SOURCE%/*}/dsn_installer uninstall
-if [ $? -ne 0 ]; then
-    echo "Error while removing DSN and Driver entries."
-else
-    echo "DSN and Driver entries have been removed successfully."
-fi
diff --git a/sql-odbc/src/modules/code-coverage.cmake b/sql-odbc/src/modules/code-coverage.cmake
deleted file mode 100644
index 0d24190c5d..0000000000
--- a/sql-odbc/src/modules/code-coverage.cmake
+++ /dev/null
@@ -1,610 +0,0 @@
-#
-# Copyright (C) 2018-2020 by George Cave - gcave@stablecoder.ca
-#
-# 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.
-
-# USAGE: To enable any code coverage instrumentation/targets, the single CMake
-# option of `CODE_COVERAGE` needs to be set to 'ON', either by GUI, ccmake, or
-# on the command line.
-#
-# From this point, there are two primary methods for adding instrumentation to
-# targets: 1 - A blanket instrumentation by calling `add_code_coverage()`, where
-# all targets in that directory and all subdirectories are automatically
-# instrumented. 2 - Per-target instrumentation by calling
-# `target_code_coverage(<TARGET_NAME>)`, where the target is given and thus only
-# that target is instrumented. This applies to both libraries and executables.
-#
-# To add coverage targets, such as calling `make ccov` to generate the actual
-# coverage information for perusal or consumption, call
-# `target_code_coverage(<TARGET_NAME>)` on an *executable* target.
-#
-# Example 1: All targets instrumented
-#
-# In this case, the coverage information reported will will be that of the
-# `theLib` library target and `theExe` executable.
-#
-# 1a: Via global command
-#
-# ~~~
-# add_code_coverage() # Adds instrumentation to all targets
-#
-# add_library(theLib lib.cpp)
-#
-# add_executable(theExe main.cpp)
-# target_link_libraries(theExe PRIVATE theLib)
-# target_code_coverage(theExe) # As an executable target, adds the 'ccov-theExe' target (instrumentation already added via global anyways) for generating code coverage reports.
-# ~~~
-#
-# 1b: Via target commands
-#
-# ~~~
-# add_library(theLib lib.cpp)
-# target_code_coverage(theLib) # As a library target, adds coverage instrumentation but no targets.
-#
-# add_executable(theExe main.cpp)
-# target_link_libraries(theExe PRIVATE theLib)
-# target_code_coverage(theExe) # As an executable target, adds the 'ccov-theExe' target and instrumentation for generating code coverage reports.
-# ~~~
-#
-# Example 2: Target instrumented, but with regex pattern of files to be excluded
-# from report
-#
-# ~~~
-# add_executable(theExe main.cpp non_covered.cpp)
-# target_code_coverage(theExe EXCLUDE non_covered.cpp test/*) # As an executable target, the reports will exclude the non-covered.cpp file, and any files in a test/ folder.
-# ~~~
-#
-# Example 3: Target added to the 'ccov' and 'ccov-all' targets
-#
-# ~~~
-# add_code_coverage_all_targets(EXCLUDE test/*) # Adds the 'ccov-all' target set and sets it to exclude all files in test/ folders.
-#
-# add_executable(theExe main.cpp non_covered.cpp)
-# target_code_coverage(theExe AUTO ALL EXCLUDE non_covered.cpp test/*) # As an executable target, adds to the 'ccov' and ccov-all' targets, and the reports will exclude the non-covered.cpp file, and any files in a test/ folder.
-# ~~~
-
-# Options
-option(
-  CODE_COVERAGE
-  "Builds targets with code coverage instrumentation. (Requires GCC or Clang)"
-  OFF)
-
-# Programs
-find_program(LLVM_COV_PATH llvm-cov)
-find_program(LLVM_PROFDATA_PATH llvm-profdata)
-find_program(LCOV_PATH lcov)
-find_program(GENHTML_PATH genhtml)
-# Hide behind the 'advanced' mode flag for GUI/ccmake
-mark_as_advanced(
-  FORCE
-  LLVM_COV_PATH
-  LLVM_PROFDATA_PATH
-  LCOV_PATH
-  GENHTML_PATH)
-
-# Variables
-set(CMAKE_COVERAGE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/ccov)
-
-# Common initialization/checks
-if(CODE_COVERAGE AND NOT CODE_COVERAGE_ADDED)
-  set(CODE_COVERAGE_ADDED ON)
-
-  # Common Targets
-  add_custom_target(
-    ccov-preprocessing
-    COMMAND ${CMAKE_COMMAND} -E make_directory
-            ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}
-    DEPENDS ccov-clean)
-
-  if(CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
-     OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
-    # Messages
-    message(STATUS "Building with llvm Code Coverage Tools")
-
-    if(NOT LLVM_COV_PATH)
-      message(FATAL_ERROR "llvm-cov not found! Aborting.")
-    else()
-      # Version number checking for 'EXCLUDE' compatibility
-      execute_process(COMMAND ${LLVM_COV_PATH} --version
-                      OUTPUT_VARIABLE LLVM_COV_VERSION_CALL_OUTPUT)
-      string(
-        REGEX MATCH
-              "[0-9]+\\.[0-9]+\\.[0-9]+"
-              LLVM_COV_VERSION
-              ${LLVM_COV_VERSION_CALL_OUTPUT})
-
-      if(LLVM_COV_VERSION VERSION_LESS "7.0.0")
-        message(
-          WARNING
-            "target_code_coverage()/add_code_coverage_all_targets() 'EXCLUDE' option only available on llvm-cov >= 7.0.0"
-        )
-      endif()
-    endif()
-
-    # Targets
-    add_custom_target(
-      ccov-clean
-      COMMAND rm -f ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list
-      COMMAND rm -f ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/profraw.list)
-
-    # Used to get the shared object file list before doing the main all-
-    # processing
-    add_custom_target(
-      ccov-libs
-      COMMAND ;
-      COMMENT "libs ready for coverage report.")
-
-  elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" 
-          OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    # Messages
-    message(STATUS "Building with lcov Code Coverage Tools")
-
-    if(CMAKE_BUILD_TYPE)
-      string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type)
-      if(NOT
-         ${upper_build_type}
-         STREQUAL
-         "DEBUG")
-        message(
-          WARNING
-            "Code coverage results with an optimized (non-Debug) build may be misleading"
-        )
-      endif()
-    else()
-      message(
-        WARNING
-          "Code coverage results with an optimized (non-Debug) build may be misleading"
-      )
-    endif()
-    if(NOT LCOV_PATH)
-      message(FATAL_ERROR "lcov not found! Aborting...")
-    endif()
-    if(NOT GENHTML_PATH)
-      message(FATAL_ERROR "genhtml not found! Aborting...")
-    endif()
-
-    # Targets
-    add_custom_target(ccov-clean COMMAND ${LCOV_PATH} --directory
-                                         ${CMAKE_BINARY_DIR} --zerocounters)
-
-  else()
-    message(FATAL_ERROR "Code coverage requires Clang or GCC. Aborting.")
-  endif()
-endif()
-
-# Adds code coverage instrumentation to a library, or instrumentation/targets
-# for an executable target.
-# ~~~
-# EXECUTABLE ADDED TARGETS:
-# GCOV/LCOV:
-# ccov : Generates HTML code coverage report for every target added with 'AUTO' parameter.
-# ccov-${TARGET_NAME} : Generates HTML code coverage report for the associated named target.
-# ccov-all : Generates HTML code coverage report, merging every target added with 'ALL' parameter into a single detailed report.
-#
-# LLVM-COV:
-# ccov : Generates HTML code coverage report for every target added with 'AUTO' parameter.
-# ccov-report : Generates HTML code coverage report for every target added with 'AUTO' parameter.
-# ccov-${TARGET_NAME} : Generates HTML code coverage report.
-# ccov-report-${TARGET_NAME} : Prints to command line summary per-file coverage information.
-# ccov-show-${TARGET_NAME} : Prints to command line detailed per-line coverage information.
-# ccov-all : Generates HTML code coverage report, merging every target added with 'ALL' parameter into a single detailed report.
-# ccov-all-report : Prints summary per-file coverage information for every target added with ALL' parameter to the command line.
-#
-# Required:
-# TARGET_NAME - Name of the target to generate code coverage for.
-# Optional:
-# PUBLIC - Sets the visibility for added compile options to targets to PUBLIC instead of the default of PRIVATE.
-# PUBLIC - Sets the visibility for added compile options to targets to INTERFACE instead of the default of PRIVATE.
-# AUTO - Adds the target to the 'ccov' target so that it can be run in a batch with others easily. Effective on executable targets.
-# ALL - Adds the target to the 'ccov-all' and 'ccov-all-report' targets, which merge several executable targets coverage data to a single report. Effective on executable targets.
-# EXTERNAL - For GCC's lcov, allows the profiling of 'external' files from the processing directory
-# COVERAGE_TARGET_NAME - For executables ONLY, changes the outgoing target name so instead of `ccov-${TARGET_NAME}` it becomes `ccov-${COVERAGE_TARGET_NAME}`.
-# EXCLUDE <REGEX_PATTERNS> - Excludes files of the patterns provided from coverage. **These do not copy to the 'all' targets.**
-# OBJECTS <TARGETS> - For executables ONLY, if the provided targets are shared libraries, adds coverage information to the output
-# ARGS <ARGUMENTS> - For executables ONLY, appends the given arguments to the associated ccov-* executable call
-# ~~~
-function(target_code_coverage TARGET_NAME)
-  # Argument parsing
-  set(options
-      AUTO
-      ALL
-      EXTERNAL
-      PUBLIC
-      INTERFACE)
-  set(single_value_keywords COVERAGE_TARGET_NAME)
-  set(multi_value_keywords EXCLUDE OBJECTS ARGS)
-  cmake_parse_arguments(
-    target_code_coverage
-    "${options}"
-    "${single_value_keywords}"
-    "${multi_value_keywords}"
-    ${ARGN})
-
-  # Set the visibility of target functions to PUBLIC, INTERFACE or default to
-  # PRIVATE.
-  if(target_code_coverage_PUBLIC)
-    set(TARGET_VISIBILITY PUBLIC)
-  elseif(target_code_coverage_INTERFACE)
-    set(TARGET_VISIBILITY INTERFACE)
-  else()
-    set(TARGET_VISIBILITY PRIVATE)
-  endif()
-
-  if(NOT target_code_coverage_COVERAGE_TARGET_NAME)
-    # If a specific name was given, use that instead.
-    set(target_code_coverage_COVERAGE_TARGET_NAME ${TARGET_NAME})
-  endif()
-
-  if(CODE_COVERAGE)
-
-    # Add code coverage instrumentation to the target's linker command
-    if(CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
-       OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
-      target_compile_options(
-        ${TARGET_NAME}
-        ${TARGET_VISIBILITY}
-        -fprofile-instr-generate
-        -fcoverage-mapping)
-      target_link_options(
-        ${TARGET_NAME}
-        ${TARGET_VISIBILITY}
-        -fprofile-instr-generate
-        -fcoverage-mapping)
-    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" 
-            OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-      target_compile_options(
-        ${TARGET_NAME}
-        ${TARGET_VISIBILITY}
-        -fprofile-arcs
-        -ftest-coverage)
-      target_link_libraries(${TARGET_NAME} ${TARGET_VISIBILITY} gcov)
-    endif()
-
-    # Targets
-    get_target_property(target_type ${TARGET_NAME} TYPE)
-
-    # Add shared library to processing for 'all' targets
-    if(target_type STREQUAL "SHARED_LIBRARY" AND target_code_coverage_ALL)
-      if(CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
-         OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
-        add_custom_target(
-          ccov-run-${target_code_coverage_COVERAGE_TARGET_NAME}
-          COMMAND echo "-object=$<TARGET_FILE:${TARGET_NAME}>" >>
-                  ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list
-          DEPENDS ccov-preprocessing ${TARGET_NAME})
-
-        if(NOT TARGET ccov-libs)
-          message(
-            FATAL_ERROR
-              "Calling target_code_coverage with 'ALL' must be after a call to 'add_code_coverage_all_targets'."
-          )
-        endif()
-
-        add_dependencies(ccov-libs
-                         ccov-run-${target_code_coverage_COVERAGE_TARGET_NAME})
-      endif()
-    endif()
-
-    # For executables add targets to run and produce output
-    if(target_type STREQUAL "EXECUTABLE")
-      if(CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
-         OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
-
-        # If there are shared objects to also work with, generate the string to
-        # add them here
-        foreach(SO_TARGET ${target_code_coverage_OBJECTS})
-          # Check to see if the target is a shared object
-          if(TARGET ${SO_TARGET})
-            get_target_property(SO_TARGET_TYPE ${SO_TARGET} TYPE)
-            if(${SO_TARGET_TYPE} STREQUAL "SHARED_LIBRARY")
-              set(SO_OBJECTS ${SO_OBJECTS} -object=$<TARGET_FILE:${SO_TARGET}>)
-            endif()
-          endif()
-        endforeach()
-
-        # Run the executable, generating raw profile data
-        add_custom_target(
-          ccov-run-${target_code_coverage_COVERAGE_TARGET_NAME}
-          COMMAND
-            LLVM_PROFILE_FILE=${target_code_coverage_COVERAGE_TARGET_NAME}.profraw
-            $<TARGET_FILE:${TARGET_NAME}> ${target_code_coverage_ARGS}
-          COMMAND echo "-object=$<TARGET_FILE:${TARGET_NAME}>" >>
-                  ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list
-          COMMAND
-            echo
-            "${CMAKE_CURRENT_BINARY_DIR}/${target_code_coverage_COVERAGE_TARGET_NAME}.profraw "
-            >> ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/profraw.list
-          DEPENDS ccov-preprocessing ccov-libs ${TARGET_NAME})
-
-        # Merge the generated profile data so llvm-cov can process it
-        add_custom_target(
-          ccov-processing-${target_code_coverage_COVERAGE_TARGET_NAME}
-          COMMAND
-            ${LLVM_PROFDATA_PATH} merge -sparse
-            ${target_code_coverage_COVERAGE_TARGET_NAME}.profraw -o
-            ${target_code_coverage_COVERAGE_TARGET_NAME}.profdata
-          DEPENDS ccov-run-${target_code_coverage_COVERAGE_TARGET_NAME})
-
-        # Ignore regex only works on LLVM >= 7
-        if(LLVM_COV_VERSION VERSION_GREATER_EQUAL "7.0.0")
-          foreach(EXCLUDE_ITEM ${target_code_coverage_EXCLUDE})
-            set(EXCLUDE_REGEX ${EXCLUDE_REGEX}
-                              -ignore-filename-regex='${EXCLUDE_ITEM}')
-          endforeach()
-        endif()
-
-        # Print out details of the coverage information to the command line
-        add_custom_target(
-          ccov-show-${target_code_coverage_COVERAGE_TARGET_NAME}
-          COMMAND
-            ${LLVM_COV_PATH} show $<TARGET_FILE:${TARGET_NAME}> ${SO_OBJECTS}
-            -instr-profile=${target_code_coverage_COVERAGE_TARGET_NAME}.profdata
-            -show-line-counts-or-regions ${EXCLUDE_REGEX}
-          DEPENDS ccov-processing-${target_code_coverage_COVERAGE_TARGET_NAME})
-
-        # Print out a summary of the coverage information to the command line
-        add_custom_target(
-          ccov-report-${target_code_coverage_COVERAGE_TARGET_NAME}
-          COMMAND
-            ${LLVM_COV_PATH} report $<TARGET_FILE:${TARGET_NAME}> ${SO_OBJECTS}
-            -instr-profile=${target_code_coverage_COVERAGE_TARGET_NAME}.profdata
-            ${EXCLUDE_REGEX}
-          DEPENDS ccov-processing-${target_code_coverage_COVERAGE_TARGET_NAME})
-
-        # Generates HTML output of the coverage information for perusal
-        add_custom_target(
-          ccov-${target_code_coverage_COVERAGE_TARGET_NAME}
-          COMMAND
-            ${LLVM_COV_PATH} show $<TARGET_FILE:${TARGET_NAME}> ${SO_OBJECTS}
-            -instr-profile=${target_code_coverage_COVERAGE_TARGET_NAME}.profdata
-            -show-line-counts-or-regions
-            -output-dir=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${target_code_coverage_COVERAGE_TARGET_NAME}
-            -format="html" ${EXCLUDE_REGEX}
-          DEPENDS ccov-processing-${target_code_coverage_COVERAGE_TARGET_NAME})
-
-      elseif(CMAKE_C_COMPILER_ID MATCHES "GNU"
-              OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-        set(COVERAGE_INFO
-            "${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${target_code_coverage_COVERAGE_TARGET_NAME}.info"
-        )
-
-        # Run the executable, generating coverage information
-        add_custom_target(
-          ccov-run-${target_code_coverage_COVERAGE_TARGET_NAME}
-          COMMAND $<TARGET_FILE:${TARGET_NAME}> ${target_code_coverage_ARGS}
-          DEPENDS ccov-preprocessing ${TARGET_NAME})
-
-        # Generate exclusion string for use
-        foreach(EXCLUDE_ITEM ${target_code_coverage_EXCLUDE})
-          set(EXCLUDE_REGEX
-              ${EXCLUDE_REGEX}
-              --remove
-              ${COVERAGE_INFO}
-              '${EXCLUDE_ITEM}')
-        endforeach()
-
-        if(EXCLUDE_REGEX)
-          set(EXCLUDE_COMMAND ${LCOV_PATH} ${EXCLUDE_REGEX} --output-file
-                              ${COVERAGE_INFO})
-        else()
-          set(EXCLUDE_COMMAND ;)
-        endif()
-
-        if(NOT ${target_code_coverage_EXTERNAL})
-          set(EXTERNAL_OPTION --no-external)
-        endif()
-
-        # Capture coverage data
-        add_custom_target(
-          ccov-capture-${target_code_coverage_COVERAGE_TARGET_NAME}
-          COMMAND ${CMAKE_COMMAND} -E remove ${COVERAGE_INFO}
-          COMMAND ${LCOV_PATH} --directory ${CMAKE_BINARY_DIR} --zerocounters
-          COMMAND $<TARGET_FILE:${TARGET_NAME}> ${target_code_coverage_ARGS}
-          COMMAND
-            ${LCOV_PATH} --directory ${CMAKE_BINARY_DIR} --base-directory
-            ${CMAKE_SOURCE_DIR} --capture ${EXTERNAL_OPTION} --output-file
-            ${COVERAGE_INFO}
-          COMMAND ${EXCLUDE_COMMAND}
-          DEPENDS ccov-preprocessing ${TARGET_NAME})
-
-        # Generates HTML output of the coverage information for perusal
-        add_custom_target(
-          ccov-${target_code_coverage_COVERAGE_TARGET_NAME}
-          COMMAND
-            ${GENHTML_PATH} -o
-            ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${target_code_coverage_COVERAGE_TARGET_NAME}
-            ${COVERAGE_INFO}
-          DEPENDS ccov-capture-${target_code_coverage_COVERAGE_TARGET_NAME})
-      endif()
-
-      add_custom_command(
-        TARGET ccov-${target_code_coverage_COVERAGE_TARGET_NAME}
-        POST_BUILD
-        COMMAND ;
-        COMMENT
-          "Open ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${target_code_coverage_COVERAGE_TARGET_NAME}/index.html in your browser to view the coverage report."
-      )
-
-      # AUTO
-      if(target_code_coverage_AUTO)
-        if(NOT TARGET ccov)
-          add_custom_target(ccov)
-        endif()
-        add_dependencies(ccov ccov-${target_code_coverage_COVERAGE_TARGET_NAME})
-
-        if(NOT CMAKE_C_COMPILER_ID MATCHES "GNU"
-           OR NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-          if(NOT TARGET ccov-report)
-            add_custom_target(ccov-report)
-          endif()
-          add_dependencies(
-            ccov-report
-            ccov-report-${target_code_coverage_COVERAGE_TARGET_NAME})
-        endif()
-      endif()
-
-      # ALL
-      if(target_code_coverage_ALL)
-        if(NOT TARGET ccov-all-processing)
-          message(
-            FATAL_ERROR
-              "Calling target_code_coverage with 'ALL' must be after a call to 'add_code_coverage_all_targets'."
-          )
-        endif()
-
-        add_dependencies(ccov-all-processing
-                         ccov-run-${target_code_coverage_COVERAGE_TARGET_NAME})
-      endif()
-    endif()
-  endif()
-endfunction()
-
-# Adds code coverage instrumentation to all targets in the current directory and
-# any subdirectories. To add coverage instrumentation to only specific targets,
-# use `target_code_coverage`.
-function(add_code_coverage)
-  if(CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
-     OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
-    add_compile_options(-fprofile-instr-generate -fcoverage-mapping)
-    add_link_options(-fprofile-instr-generate -fcoverage-mapping)
-  elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" 
-          OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    add_compile_options(-fprofile-arcs -ftest-coverage)
-    link_libraries(gcov)
-  endif()
-endfunction()
-
-# Adds the 'ccov-all' type targets that calls all targets added via
-# `target_code_coverage` with the `ALL` parameter, but merges all the coverage
-# data from them into a single large report  instead of the numerous smaller
-# reports. Also adds the ccov-all-capture Generates an all-merged.info file, for
-# use with coverage dashboards (e.g. codecov.io, coveralls).
-# ~~~
-# Optional:
-# EXCLUDE <REGEX_PATTERNS> - Excludes files of the regex patterns provided from coverage.
-# ~~~
-function(add_code_coverage_all_targets)
-  # Argument parsing
-  set(multi_value_keywords EXCLUDE)
-  cmake_parse_arguments(
-    add_code_coverage_all_targets
-    ""
-    ""
-    "${multi_value_keywords}"
-    ${ARGN})
-
-  if(CODE_COVERAGE)
-    if(CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
-       OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
-
-      # Merge the profile data for all of the run executables
-      add_custom_target(
-        ccov-all-processing
-        COMMAND
-          ${LLVM_PROFDATA_PATH} merge -o
-          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata -sparse `cat
-          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/profraw.list`)
-
-      # Regex exclude only available for LLVM >= 7
-      if(LLVM_COV_VERSION VERSION_GREATER_EQUAL "7.0.0")
-        foreach(EXCLUDE_ITEM ${add_code_coverage_all_targets_EXCLUDE})
-          set(EXCLUDE_REGEX ${EXCLUDE_REGEX}
-                            -ignore-filename-regex='${EXCLUDE_ITEM}')
-        endforeach()
-      endif()
-
-      # Print summary of the code coverage information to the command line
-      add_custom_target(
-        ccov-all-report
-        COMMAND
-          ${LLVM_COV_PATH} report `cat
-          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list`
-          -instr-profile=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata
-          ${EXCLUDE_REGEX}
-        DEPENDS ccov-all-processing)
-
-      # Export coverage information so continuous integration tools (e.g.
-      # Jenkins) can consume it
-      add_custom_target(
-        ccov-all-export
-        COMMAND
-          ${LLVM_COV_PATH} export `cat
-          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list`
-          -instr-profile=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata
-          -format="text" ${EXCLUDE_REGEX} >
-          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/coverage.json
-        DEPENDS ccov-all-processing)
-
-      # Generate HTML output of all added targets for perusal
-      add_custom_target(
-        ccov-all
-        COMMAND
-          ${LLVM_COV_PATH} show `cat
-          ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/binaries.list`
-          -instr-profile=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.profdata
-          -show-line-counts-or-regions
-          -output-dir=${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged
-          -format="html" ${EXCLUDE_REGEX}
-        DEPENDS ccov-all-processing)
-
-    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" 
-            OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-      set(COVERAGE_INFO "${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.info")
-
-      # Nothing required for gcov
-      add_custom_target(ccov-all-processing COMMAND ;)
-
-      # Exclusion regex string creation
-      set(EXCLUDE_REGEX)
-      foreach(EXCLUDE_ITEM ${add_code_coverage_all_targets_EXCLUDE})
-        set(EXCLUDE_REGEX
-            ${EXCLUDE_REGEX}
-            --remove
-            ${COVERAGE_INFO}
-            '${EXCLUDE_ITEM}')
-      endforeach()
-
-      if(EXCLUDE_REGEX)
-        set(EXCLUDE_COMMAND ${LCOV_PATH} ${EXCLUDE_REGEX} --output-file
-                            ${COVERAGE_INFO})
-      else()
-        set(EXCLUDE_COMMAND ;)
-      endif()
-
-      # Capture coverage data
-      add_custom_target(
-        ccov-all-capture
-        COMMAND ${CMAKE_COMMAND} -E remove ${COVERAGE_INFO}
-        COMMAND ${LCOV_PATH} --directory ${CMAKE_BINARY_DIR} --capture
-                --output-file ${COVERAGE_INFO}
-        COMMAND ${EXCLUDE_COMMAND}
-        DEPENDS ccov-all-processing)
-
-      # Generates HTML output of all targets for perusal
-      add_custom_target(
-        ccov-all
-        COMMAND ${GENHTML_PATH} -o ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged
-                ${COVERAGE_INFO}
-        DEPENDS ccov-all-capture)
-
-    endif()
-
-    add_custom_command(
-      TARGET ccov-all
-      POST_BUILD
-      COMMAND ;
-      COMMENT
-        "Open ${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged/index.html in your browser to view the coverage report."
-    )
-  endif()
-endfunction()
diff --git a/sql-odbc/src/opensearchenlist/CMakeLists.txt b/sql-odbc/src/opensearchenlist/CMakeLists.txt
deleted file mode 100644
index 6e4c00524d..0000000000
--- a/sql-odbc/src/opensearchenlist/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-project(opensearchenlist)
-
-# Source files for opensearchenlist
-set(SOURCE_FILES msdtc_enlist.cpp)
-set(HEADER_FILES opensearch_enlist.h)
-
-# Generate static lib
-add_library(opensearchenlist STATIC ${SOURCE_FILES} ${HEADER_FILES})
- 		
-# Library dependencies
-target_link_libraries(opensearchenlist kernel32 advapi32 Delayimp XOleHlp)
-
-# Platform specific library dependencies
-if(WIN32)
-	# Windows specifiec 
-	target_link_libraries(opensearchenlist wsock32 winspool user32 gdi32 comdlg32 shell32 uuid)
-else()
-	# Unix specific
-endif()
diff --git a/sql-odbc/src/opensearchenlist/msdtc_enlist.cpp b/sql-odbc/src/opensearchenlist/msdtc_enlist.cpp
deleted file mode 100644
index f427d837ad..0000000000
--- a/sql-odbc/src/opensearchenlist/msdtc_enlist.cpp
+++ /dev/null
@@ -1,1279 +0,0 @@
-#ifdef _HANDLE_ENLIST_IN_DTC_
-
-#undef _MEMORY_DEBUG_
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif /* _WIN32_WINNT */
-
-#define WIN32_LEAN_AND_MEAN
-#include <XOLEHLP.h>
-#include <oleTx2xa.h>
-/*#include <Txdtc.h>*/
-#define _ESDTC_FUNCS_IMPORT_
-#include "connexp.h"
-
-/*#define	_SLEEP_FOR_TEST_*/
-#include <ctype.h>
-#include <process.h>
-#include <stdio.h>
-#include <string.h>
-#include <map>
-#ifndef WIN32
-#include <errno.h>
-#endif /* WIN32 */
-
-#include <sql.h>
-#define _MYLOG_FUNCS_IMPORT_
-#include "mylog.h"
-#define _OPENSEARCH_ENLIST_FUNCS_IMPLEMENT_
-#include "opensearch_enlist.h"
-#include "xalibname.h"
-
-#ifdef WIN32
-#ifndef snprintf
-#define snprintf _snprintf
-#endif /* snprintf */
-#endif /* WIN32 */
-
-/* Define a type for defining a constant string expression */
-#ifndef CSTR
-#define CSTR static const char *const
-#endif /* CSTR */
-
-EXTERN_C {
-    HINSTANCE s_hModule; /* Saved module handle. */
-}
-/*      This is where the Driver Manager attaches to this Driver */
-BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) {
-    switch (ul_reason_for_call) {
-        case DLL_PROCESS_ATTACH:
-            s_hModule = (HINSTANCE)hInst; /* Save for dialog boxes */
-            break;
-        case DLL_PROCESS_DETACH:
-            mylog("DETACHING opensearch_enlist\n");
-            break;
-    }
-    return TRUE;
-}
-
-/*
- *	A comment About locks used in this module
- *
- *	  the locks should be acquired with stronger to weaker order.
- *
- *	1:ELOCK -- the strongest per IAsyncES object lock
- *	  When the *isolated* or *dtcconn* member of an IAsyncES object
- *	  is changed, this lock should be held.
- *	  While an IAsyncES object accesses a es_odbc connection,
- *	  this lock should be held.
- *
- *	2:[CONN_CS] -- per es_odbc connection lock
- *	  This lock would be held for a pretty long time while accessing
- *	  the es_odbc connection assigned to an IAsyncES object. You
- *	  can use the connecion safely by holding a ELOCK for the
- *	  IAsyncES object because the assignment is ensured to be
- *	  fixed while the ELOCK is held.
- *
- *	3:LIFELOCK -- a global lock to ensure the lives of IAsyncES objects
- *	  While this lock is held, IAsyncES objects would never die.
- *
- *	4:SLOCK -- the short term per IAsyncES object lock
- *	  When any member of an IAsyncES object is changed, this lock
- *	  should be held.
- */
-
-// #define	_LOCK_DEBUG_
-static class INIT_CRIT {
-   public:
-    CRITICAL_SECTION life_cs; /* for asdum member of ConnectionClass */
-    INIT_CRIT() {
-        InitializeCriticalSection(&life_cs);
-    }
-    ~INIT_CRIT() {
-        DeleteCriticalSection(&life_cs);
-    }
-} init_crit;
-#define LIFELOCK_ACQUIRE EnterCriticalSection(&init_crit.life_cs)
-#define LIFELOCK_RELEASE LeaveCriticalSection(&init_crit.life_cs)
-
-/*
- *	Some helper macros about connection handling.
- */
-#define CONN_CS_ACQUIRE(conn) EsDtc_lock_cntrl((conn), TRUE, FALSE)
-#define TRY_CONN_CS_ACQUIRE(conn) EsDtc_lock_cntrl((conn), TRUE, TRUE)
-#define CONN_CS_RELEASE(conn) EsDtc_lock_cntrl((conn), FALSE, FALSE)
-
-#define CONN_IS_IN_TRANS(conn) EsDtc_get_property((conn), inTrans)
-
-static const char *XidToText(const XID &xid, char *rtext) {
-    int glen = xid.gtrid_length, blen = xid.bqual_length;
-    int i, j;
-
-    for (i = 0, j = 0; i < glen; i++, j += 2)
-        sprintf(rtext + j, "%02x", (unsigned char)xid.data[i]);
-    strcat(rtext, "-");
-    j++;
-    for (; i < glen + blen; i++, j += 2)
-        sprintf(rtext + j, "%02x", (unsigned char)xid.data[i]);
-    return rtext;
-}
-
-static LONG g_cComponents = 0;
-static LONG g_cServerLocks = 0;
-
-//
-//	�ȉ���ITransactionResourceAsync�I�u�W�F�N�g�͔C�ӂ̃X���b�h����
-//	���R�ɃA�N�Z�X�”\�Ȃ悤�Ɏ�������B�eRequest�̌��ʂ�Ԃ����߂�
-//	�g�p����ITransactionEnlistmentAsync�C���^�[�t�F�C�X�����̂悤��
-//	��������Ă���i�Ǝv����A���L�Q�Ɓj�̂ŌĂяo����COM�̃A�p�[
-//	�g�����g���ӎ�����(CoMarshalInterThreadInterfaceInStream/CoGetIn
-//	terfaceAndReleaseStream���g�p����j�K�v�͂Ȃ��B
-//	����DLL���Ŏg�p����ITransactionResourceAsync��ITransactionEnlist
-//	mentAsync�̃C���^�[�t�F�C�X�|�C���^�[�͔C�ӂ̃X���b�h���璼�ڎg�p
-//	���邱�Ƃ��ł���B
-//
-
-// OLE Transactions Standard
-//
-// OLE Transactions is the Microsoft interface standard for transaction
-// management. Applications use OLE Transactions-compliant interfaces to
-// initiate, commit, abort, and inquire about transactions. Resource
-// managers use OLE Transactions-compliant interfaces to enlist in
-// transactions, to propagate transactions to other resource managers,
-// to propagate transactions from process to process or from system to
-// system, and to participate in the two-phase commit protocol.
-//
-// The Microsoft DTC system implements most OLE Transactions-compliant
-// objects, interfaces, and methods. Resource managers that wish to use
-// OLE Transactions must implement some OLE Transactions-compliant objects,
-// interfaces, and methods.
-//
-// The OLE Transactions specification is based on COM but it differs in the
-// following respects:
-//
-// OLE Transactions objects cannot be created using the COM CoCreate APIs.
-// References to OLE Transactions objects are always direct. Therefore,
-// no proxies or stubs are created for inter-apartment, inter-process,
-// or inter-node calls and OLE Transactions references cannot be marshaled
-// using standard COM marshaling.
-// All references to OLE Transactions objects and their sinks are completely
-// free threaded and cannot rely upon COM concurrency control models.
-// For example, you cannot pass a reference to an IResourceManagerSink
-// interface on a single-threaded apartment and expect the callback to occur
-// only on the same single-threaded apartment.
-
-class IAsyncES : public ITransactionResourceAsync {
-   private:
-    IDtcToXaHelperSinglePipe *helper;
-    DWORD RMCookie;
-    void *dtcconn;
-    LONG refcnt;
-    CRITICAL_SECTION as_spin;  // to make this object Both
-    CRITICAL_SECTION as_exec;  // to make this object Both
-    XID xid;
-    bool isolated;
-    bool prepared;
-    bool done;
-    bool abort;
-    HANDLE eThread[3];
-    bool eFin[3];
-    bool requestAccepted;
-    HRESULT prepare_result;
-    HRESULT commit_result;
-#ifdef _LOCK_DEBUG_
-    int spin_cnt;
-    int cs_cnt;
-#endif /* _LOCK_DEBUG_ */
-
-   public:
-    enum { PrepareExec = 0, CommitExec, AbortExec };
-
-    ITransactionEnlistmentAsync *enlist;
-
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject);
-    ULONG STDMETHODCALLTYPE AddRef(void);
-    ULONG STDMETHODCALLTYPE Release(void);
-
-    HRESULT STDMETHODCALLTYPE PrepareRequest(BOOL fRetaining, DWORD grfRM,
-                                             BOOL fWantMoniker,
-                                             BOOL fSinglePhase);
-    HRESULT STDMETHODCALLTYPE CommitRequest(DWORD grfRM, XACTUOW *pNewUOW);
-    HRESULT STDMETHODCALLTYPE AbortRequest(BOID *pboidReason, BOOL fRetaining,
-                                           XACTUOW *pNewUOW);
-    HRESULT STDMETHODCALLTYPE TMDown(void);
-
-    IAsyncES();
-    void SetHelper(IDtcToXaHelperSinglePipe *pHelper, DWORD dwRMCookie) {
-        helper = pHelper;
-        RMCookie = dwRMCookie;
-    }
-
-    HRESULT RequestExec(DWORD type, HRESULT res);
-    HRESULT ReleaseConnection(void);
-    void SetConnection(void *sconn) {
-        SLOCK_ACQUIRE();
-        dtcconn = sconn;
-        SLOCK_RELEASE();
-    }
-    void SetXid(const XID *ixid) {
-        SLOCK_ACQUIRE();
-        xid = *ixid;
-        SLOCK_RELEASE();
-    }
-    void *separateXAConn(bool spinAcquired, bool continueConnection);
-    bool CloseThread(DWORD type);
-
-   private:
-    ~IAsyncES();
-    void SLOCK_ACQUIRE() {
-        EnterCriticalSection(&as_spin);
-    }
-    void SLOCK_RELEASE() {
-        LeaveCriticalSection(&as_spin);
-    }
-    void ELOCK_ACQUIRE() {
-        EnterCriticalSection(&as_exec);
-    }
-    void ELOCK_RELEASE() {
-        LeaveCriticalSection(&as_exec);
-    }
-    void *getLockedXAConn(void);
-    void *generateXAConn(bool spinAcquired);
-    void *isolateXAConn(bool spinAcquired, bool continueConnection);
-    void SetPrepareResult(HRESULT res) {
-        SLOCK_ACQUIRE();
-        prepared = true;
-        prepare_result = res;
-        SLOCK_RELEASE();
-    }
-    void SetDone(HRESULT);
-    void Wait_pThread(bool slock_hold);
-    void Wait_cThread(bool slock_hold, bool once);
-};
-
-IAsyncES::IAsyncES(void)
-    : helper(NULL),
-      RMCookie(0),
-      enlist(NULL),
-      dtcconn(NULL),
-      refcnt(1),
-      isolated(false),
-      done(false),
-      abort(false),
-      prepared(false),
-      requestAccepted(false) {
-    InterlockedIncrement(&g_cComponents);
-    InitializeCriticalSection(&as_spin);
-    InitializeCriticalSection(&as_exec);
-    eThread[0] = eThread[1] = eThread[2] = NULL;
-    eFin[0] = eFin[1] = eFin[2] = false;
-    memset(&xid, 0, sizeof(xid));
-#ifdef _LOCK_DEBUG_
-    spin_cnt = 0;
-    cs_cnt = 0;
-#endif /* _LOCK_DEBUG_ */
-}
-
-//
-//	invoked from *delete*.
-//	When entered ELOCK -> LIFELOCK -> SLOCK are held
-//	and they are released.
-//
-IAsyncES::~IAsyncES(void) {
-    void *fconn = NULL;
-
-    if (dtcconn) {
-        if (isolated)
-            fconn = dtcconn;
-        EsDtc_set_async(dtcconn, NULL);
-        dtcconn = NULL;
-    }
-    SLOCK_RELEASE();
-    LIFELOCK_RELEASE;
-    if (fconn) {
-        mylog("IAsyncES Destructor is freeing the connection\n");
-        EsDtc_free_connect(fconn);
-    }
-    DeleteCriticalSection(&as_spin);
-    ELOCK_RELEASE();
-    DeleteCriticalSection(&as_exec);
-    InterlockedDecrement(&g_cComponents);
-}
-HRESULT STDMETHODCALLTYPE IAsyncES::QueryInterface(REFIID riid,
-                                                   void **ppvObject) {
-    mylog("%p QueryInterface called\n", this);
-    if (riid == IID_IUnknown || riid == IID_ITransactionResourceAsync) {
-        *ppvObject = this;
-        AddRef();
-        return S_OK;
-    }
-    *ppvObject = NULL;
-    return E_NOINTERFACE;
-}
-//
-//	acquire/releases SLOCK.
-//
-ULONG STDMETHODCALLTYPE IAsyncES::AddRef(void) {
-    mylog("%p->AddRef called\n", this);
-    SLOCK_ACQUIRE();
-    refcnt++;
-    SLOCK_RELEASE();
-    return refcnt;
-}
-//
-//	acquire/releases [ELOCK -> LIFELOCK -> ] SLOCK.
-//
-ULONG STDMETHODCALLTYPE IAsyncES::Release(void) {
-    mylog("%p->Release called refcnt=%d\n", this, refcnt);
-    SLOCK_ACQUIRE();
-    refcnt--;
-    if (refcnt <= 0) {
-        SLOCK_RELEASE();
-        ELOCK_ACQUIRE();
-        LIFELOCK_ACQUIRE;
-        SLOCK_ACQUIRE();
-        if (refcnt <= 0) {
-            const int refcnt_copy = refcnt;
-            mylog("delete %p\n", this);
-            delete this;
-            return refcnt_copy;
-        } else {
-            SLOCK_RELEASE();
-            LIFELOCK_RELEASE;
-            ELOCK_RELEASE();
-        }
-    } else
-        SLOCK_RELEASE();
-    return refcnt;
-}
-
-//
-//	Acquire/release SLOCK.
-//
-void IAsyncES::Wait_pThread(bool slock_hold) {
-    mylog("Wait_pThread %d in\n", slock_hold);
-    HANDLE wThread;
-    int wait_idx = PrepareExec;
-    DWORD ret;
-
-    if (!slock_hold)
-        SLOCK_ACQUIRE();
-    while (NULL != (wThread = eThread[wait_idx]) && !eFin[wait_idx]) {
-        SLOCK_RELEASE();
-        ret = WaitForSingleObject(wThread, 2000);
-        SLOCK_ACQUIRE();
-        if (WAIT_TIMEOUT != ret)
-            eFin[wait_idx] = true;
-    }
-    if (!slock_hold)
-        SLOCK_RELEASE();
-    mylog("Wait_pThread out\n");
-}
-
-//
-//	Acquire/releases SLOCK.
-//
-void IAsyncES::Wait_cThread(bool slock_hold, bool once) {
-    HANDLE wThread;
-    int wait_idx;
-    DWORD ret;
-
-    mylog("Wait_cThread %d,%d in\n", slock_hold, once);
-    if (!slock_hold)
-        SLOCK_ACQUIRE();
-    if (NULL != eThread[CommitExec])
-        wait_idx = CommitExec;
-    else
-        wait_idx = AbortExec;
-    while (NULL != (wThread = eThread[wait_idx]) && !eFin[wait_idx]) {
-        SLOCK_RELEASE();
-        ret = WaitForSingleObject(wThread, 2000);
-        SLOCK_ACQUIRE();
-        if (WAIT_TIMEOUT != ret)
-            eFin[wait_idx] = true;
-        else if (once)
-            break;
-    }
-    if (!slock_hold)
-        SLOCK_RELEASE();
-    mylog("Wait_cThread out\n");
-}
-
-/* Processing Prepare/Commit Request */
-typedef struct RequestPara {
-    DWORD type;
-    LPVOID lpr;
-    HRESULT res;
-} RequestPara;
-
-//
-//	Acquire/releases LIFELOCK -> SLOCK.
-//	may acquire/release ELOCK.
-//
-void IAsyncES::SetDone(HRESULT res) {
-    LIFELOCK_ACQUIRE;
-    SLOCK_ACQUIRE();
-    done = true;
-    if (E_FAIL == res || E_UNEXPECTED == res)
-        abort = true;
-    requestAccepted = true;
-    commit_result = res;
-    if (dtcconn) {
-        EsDtc_set_async(dtcconn, NULL);
-        if (isolated) {
-            SLOCK_RELEASE();
-            LIFELOCK_RELEASE;
-            ELOCK_ACQUIRE();
-            if (dtcconn) {
-                mylog("Freeing isolated connection=%p\n", dtcconn);
-                EsDtc_free_connect(dtcconn);
-                SetConnection(NULL);
-            }
-            ELOCK_RELEASE();
-        } else {
-            dtcconn = NULL;
-            SLOCK_RELEASE();
-            LIFELOCK_RELEASE;
-        }
-    } else {
-        SLOCK_RELEASE();
-        LIFELOCK_RELEASE;
-    }
-}
-
-//
-//	Acquire/releases [ELOCK -> LIFELOCK -> ] SLOCK.
-//
-void *IAsyncES::generateXAConn(bool spinAcquired) {
-    mylog("generateXAConn isolated=%d dtcconn=%p\n", isolated, dtcconn);
-    if (!spinAcquired)
-        SLOCK_ACQUIRE();
-    if (isolated || done) {
-        SLOCK_RELEASE();
-        return dtcconn;
-    }
-    SLOCK_RELEASE();
-    ELOCK_ACQUIRE();
-    LIFELOCK_ACQUIRE;
-    SLOCK_ACQUIRE();
-    if (dtcconn && !isolated && !done && prepared) {
-        void *sconn = dtcconn;
-
-        dtcconn = EsDtc_isolate(sconn, useAnotherRoom);
-        isolated = true;
-        SLOCK_RELEASE();
-        LIFELOCK_RELEASE;
-        // EsDtc_connect(dtcconn); may be called in getLockedXAConn
-    } else {
-        SLOCK_RELEASE();
-        LIFELOCK_RELEASE;
-    }
-    ELOCK_RELEASE();
-    return dtcconn;
-}
-
-//
-//	Acquire/releases [ELOCK -> LIFELOCK -> ] SLOCK.
-//
-void *IAsyncES::isolateXAConn(bool spinAcquired, bool continueConnection) {
-    void *sconn;
-
-    mylog("isolateXAConn isolated=%d dtcconn=%p\n", isolated, dtcconn);
-    if (!spinAcquired)
-        SLOCK_ACQUIRE();
-    if (isolated || done || NULL == dtcconn) {
-        SLOCK_RELEASE();
-        return dtcconn;
-    }
-    SLOCK_RELEASE();
-    ELOCK_ACQUIRE();
-    LIFELOCK_ACQUIRE;
-    SLOCK_ACQUIRE();
-    if (isolated || done || NULL == dtcconn) {
-        SLOCK_RELEASE();
-        LIFELOCK_RELEASE;
-        ELOCK_RELEASE();
-        return dtcconn;
-    }
-    sconn = dtcconn;
-
-    dtcconn =
-        EsDtc_isolate(sconn, continueConnection ? 0 : disposingConnection);
-
-    isolated = true;
-    SLOCK_RELEASE();
-    LIFELOCK_RELEASE;
-    if (continueConnection) {
-        EsDtc_connect(sconn);
-    }
-    ELOCK_RELEASE();
-    return dtcconn;
-}
-
-//
-//	Acquire/releases [ELOCK -> LIFELOCK -> ] SLOCK.
-//
-void *IAsyncES::separateXAConn(bool spinAcquired, bool continueConnection) {
-    mylog("%s isolated=%d dtcconn=%p\n", __FUNCTION__, isolated, dtcconn);
-    if (!spinAcquired)
-        SLOCK_ACQUIRE();
-    if (prepared)
-        return generateXAConn(true);
-    else
-        return isolateXAConn(true, continueConnection);
-}
-
-//
-//	[when entered]
-//	ELOCK is held.
-//
-//	Acquire/releases SLOCK.
-//	Try to acquire CONN_CS also.
-//
-//	[on exit]
-//	ELOCK is kept held.
-//	If the return connection != NULL
-//		the CONN_CS lock for the connection is held.
-//
-void *IAsyncES::getLockedXAConn() {
-    SLOCK_ACQUIRE();
-    while (!done && !isolated && NULL != dtcconn) {
-        /*
-         * Note that COMMIT/ROLLBACK PREPARED command should be
-         * issued outside the transaction.
-         */
-        if (!prepared || !CONN_IS_IN_TRANS(dtcconn)) {
-            if (TRY_CONN_CS_ACQUIRE(dtcconn)) {
-                if (prepared && CONN_IS_IN_TRANS(dtcconn)) {
-                    CONN_CS_RELEASE(dtcconn);
-                } else
-                    break;
-            }
-        }
-        separateXAConn(true, true);
-        SLOCK_ACQUIRE();  // SLOCK was released by separateXAConn()
-    }
-    SLOCK_RELEASE();
-    if (isolated && NULL != dtcconn) {
-        CONN_CS_ACQUIRE(dtcconn);
-        if (!EsDtc_get_property(dtcconn, connected))
-            EsDtc_connect(dtcconn);
-    }
-    return dtcconn;
-}
-
-//
-//	Acquire/release ELOCK -> SLOCK.
-//
-HRESULT IAsyncES::RequestExec(DWORD type, HRESULT res) {
-    HRESULT ret;
-    bool bReleaseEnlist = false;
-    void *econn;
-    char esxid[258];
-
-    mylog("%p->RequestExec type=%d conn=%p\n", this, type, dtcconn);
-    XidToText(xid, esxid);
-#ifdef _SLEEP_FOR_TEST_
-    /*Sleep(2000);*/
-#endif /* _SLEEP_FOR_TEST_ */
-    ELOCK_ACQUIRE();
-    switch (type) {
-        case PrepareExec:
-            if (done || NULL == dtcconn) {
-                res = E_UNEXPECTED;
-                break;
-            }
-            if (econn = getLockedXAConn(), NULL != econn) {
-                EsDtc_set_property(econn, inprogress, (void *)1);
-                if (E_FAIL == res)
-                    EsDtc_one_phase_operation(econn, ABORT_GLOBAL_TRANSACTION);
-                else if (XACT_S_SINGLEPHASE == res) {
-                    if (!EsDtc_one_phase_operation(econn, ONE_PHASE_COMMIT))
-                        res = E_FAIL;
-                } else {
-                    if (!EsDtc_two_phase_operation(econn, PREPARE_TRANSACTION,
-                                                   esxid))
-                        res = E_FAIL;
-                }
-                EsDtc_set_property(econn, inprogress, (void *)0);
-                CONN_CS_RELEASE(econn);
-            }
-            if (S_OK != res) {
-                SetDone(res);
-                bReleaseEnlist = true;
-            }
-            ret = enlist->PrepareRequestDone(res, NULL, NULL);
-            SetPrepareResult(res);
-            break;
-        case CommitExec:
-            Wait_pThread(false);
-            if (E_FAIL != res) {
-                econn = getLockedXAConn();
-                if (econn) {
-                    EsDtc_set_property(econn, inprogress, (void *)1);
-                    if (!EsDtc_two_phase_operation(econn, COMMIT_PREPARED,
-                                                   esxid))
-                        res = E_FAIL;
-                    EsDtc_set_property(econn, inprogress, (void *)0);
-                    CONN_CS_RELEASE(econn);
-                }
-            }
-            SetDone(res);
-            ret = enlist->CommitRequestDone(res);
-            bReleaseEnlist = true;
-            break;
-        case AbortExec:
-            Wait_pThread(false);
-            if (prepared && !done) {
-                econn = getLockedXAConn();
-                if (econn) {
-                    EsDtc_set_property(econn, inprogress, (void *)1);
-                    if (!EsDtc_two_phase_operation(econn, ROLLBACK_PREPARED,
-                                                   esxid))
-                        res = E_FAIL;
-                    EsDtc_set_property(econn, inprogress, (void *)0);
-                    CONN_CS_RELEASE(econn);
-                }
-            }
-            SetDone(res);
-            ret = enlist->AbortRequestDone(res);
-            bReleaseEnlist = true;
-            break;
-        default:
-            ret = -1;
-    }
-    if (bReleaseEnlist) {
-        helper->ReleaseRMCookie(RMCookie, TRUE);
-        enlist->Release();
-    }
-    ELOCK_RELEASE();
-    mylog("%p->Done ret=%d\n", this, ret);
-    return ret;
-}
-
-//
-//	Acquire/releses SLOCK
-//	 	or 	[ELOCK -> LIFELOCK -> ] SLOCK.
-//
-HRESULT IAsyncES::ReleaseConnection(void) {
-    mylog("%p->ReleaseConnection\n", this);
-
-    SLOCK_ACQUIRE();
-    if (isolated || NULL == dtcconn) {
-        SLOCK_RELEASE();
-        return SQL_SUCCESS;
-    }
-    Wait_pThread(true);
-    if (NULL != eThread[CommitExec] || NULL != eThread[AbortExec]
-        || requestAccepted) {
-        if (!done)
-            Wait_cThread(true, true);
-    }
-    if (!isolated && !done && dtcconn
-        && EsDtc_get_property(dtcconn, connected)) {
-        isolateXAConn(true, false);
-    } else
-        SLOCK_RELEASE();
-    mylog("%p->ReleaseConnection exit\n", this);
-    return SQL_SUCCESS;
-}
-
-EXTERN_C static unsigned WINAPI DtcRequestExec(LPVOID para);
-EXTERN_C static void __cdecl ClosePrepareThread(LPVOID para);
-EXTERN_C static void __cdecl CloseCommitThread(LPVOID para);
-EXTERN_C static void __cdecl CloseAbortThread(LPVOID para);
-
-//
-//	Acquire/release [ELOCK -> ] SLOCK.
-//
-HRESULT STDMETHODCALLTYPE IAsyncES::PrepareRequest(BOOL fRetaining, DWORD grfRM,
-                                                   BOOL fWantMoniker,
-                                                   BOOL fSinglePhase) {
-    HRESULT ret, res;
-    RequestPara *reqp;
-    const DWORD reqtype = PrepareExec;
-
-    mylog("%p PrepareRequest called grhRM=%d enl=%p\n", this, grfRM, enlist);
-    SLOCK_ACQUIRE();
-    if (dtcconn && 0 != EsDtc_get_property(dtcconn, errorNumber))
-        res = ret = E_FAIL;
-    else {
-        ret = S_OK;
-        if (fSinglePhase) {
-            res = XACT_S_SINGLEPHASE;
-            mylog("XACT is singlePhase\n");
-        } else
-            res = S_OK;
-    }
-    SLOCK_RELEASE();
-    ELOCK_ACQUIRE();
-#ifdef _SLEEP_FOR_TEST_
-    Sleep(2000);
-#endif /* _SLEEP_FOR_TEST_ */
-    reqp = new RequestPara;
-    reqp->type = reqtype;
-    reqp->lpr = (LPVOID)this;
-    reqp->res = res;
-#define DONT_CALL_RETURN_FROM_HERE ? ? ?
-    AddRef();
-    HANDLE hThread =
-        (HANDLE)_beginthreadex(NULL, 0, DtcRequestExec, reqp, 0, NULL);
-    if (NULL == hThread) {
-        delete (reqp);
-        ret = E_FAIL;
-    } else {
-        SLOCK_ACQUIRE();
-        eThread[reqtype] = hThread;
-        SLOCK_RELEASE();
-        /*
-         * We call here _beginthread not _beginthreadex
-         * so as not to call CloseHandle() to clean up
-         * the thread.
-         */
-        _beginthread(ClosePrepareThread, 0, (void *)this);
-    }
-    ELOCK_RELEASE();
-    Release();
-#undef return
-    return ret;
-}
-//
-//	Acquire/release [ELOCK -> ] SLOCK.
-//
-HRESULT STDMETHODCALLTYPE IAsyncES::CommitRequest(DWORD grfRM,
-                                                  XACTUOW *pNewUOW) {
-    HRESULT res = S_OK, ret = S_OK;
-    RequestPara *reqp;
-    const DWORD reqtype = CommitExec;
-
-    mylog("%p CommitRequest called grfRM=%d enl=%p\n", this, grfRM, enlist);
-
-    SLOCK_ACQUIRE();
-    if (!prepared || done)
-        ret = E_UNEXPECTED;
-    else if (S_OK != prepare_result)
-        ret = E_UNEXPECTED;
-    SLOCK_RELEASE();
-    if (S_OK != ret)
-        return ret;
-#define DONT_CALL_RETURN_FROM_HERE ? ? ?
-    AddRef();
-    ELOCK_ACQUIRE();
-#ifdef _SLEEP_FOR_TEST_
-    Sleep(1000);
-#endif /* _SLEEP_FOR_TEST_ */
-    reqp = new RequestPara;
-    reqp->type = reqtype;
-    reqp->lpr = (LPVOID)this;
-    reqp->res = res;
-    enlist->AddRef();
-    HANDLE hThread =
-        (HANDLE)_beginthreadex(NULL, 0, DtcRequestExec, reqp, 0, NULL);
-    if (NULL == hThread) {
-        delete (reqp);
-        enlist->Release();
-        ret = E_FAIL;
-    } else {
-        SLOCK_ACQUIRE();
-        eThread[reqtype] = hThread;
-        SLOCK_RELEASE();
-        /*
-         * We call here _beginthread not _beginthreadex
-         * so as not to call CloseHandle() to clean up
-         * the thread.
-         */
-        _beginthread(CloseCommitThread, 0, (void *)this);
-    }
-    mylog("CommitRequest ret=%d\n", ret);
-    requestAccepted = true;
-    ELOCK_RELEASE();
-    Release();
-#undef return
-    return ret;
-}
-//
-//	Acquire/release [ELOCK -> ] SLOCK.
-//
-HRESULT STDMETHODCALLTYPE IAsyncES::AbortRequest(BOID *pboidReason,
-                                                 BOOL fRetaining,
-                                                 XACTUOW *pNewUOW) {
-    HRESULT res = S_OK, ret = S_OK;
-    RequestPara *reqp;
-    const DWORD reqtype = AbortExec;
-
-    mylog("%p AbortRequest called\n", this);
-    SLOCK_ACQUIRE();
-    if (done)
-        ret = E_UNEXPECTED;
-    else if (prepared && S_OK != prepare_result)
-        ret = E_UNEXPECTED;
-    SLOCK_RELEASE();
-    if (S_OK != ret)
-        return ret;
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wkeyword-macro"
-#endif  // __APPLE__
-#define return DONT_CALL_RETURN_FROM_HERE ? ? ?
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-    AddRef();
-    ELOCK_ACQUIRE();
-    if (!prepared && dtcconn) {
-        EsDtc_set_property(dtcconn, inprogress, (void *)1);
-        EsDtc_one_phase_operation(dtcconn, ONE_PHASE_ROLLBACK);
-        EsDtc_set_property(dtcconn, inprogress, (void *)0);
-    }
-    reqp = new RequestPara;
-    reqp->type = reqtype;
-    reqp->lpr = (LPVOID)this;
-    reqp->res = res;
-    enlist->AddRef();
-    HANDLE hThread =
-        (HANDLE)_beginthreadex(NULL, 0, DtcRequestExec, reqp, 0, NULL);
-    if (NULL == hThread) {
-        delete (reqp);
-        enlist->Release();
-        ret = E_FAIL;
-    } else {
-        SLOCK_ACQUIRE();
-        eThread[reqtype] = hThread;
-        SLOCK_RELEASE();
-        /*
-         * We call here _beginthread not _beginthreadex
-         * so as not to call CloseHandle() to clean up
-         * the thread.
-         */
-        _beginthread(CloseAbortThread, 0, (void *)this);
-    }
-    mylog("AbortRequest ret=%d\n", ret);
-    requestAccepted = true;
-    ELOCK_RELEASE();
-    Release();
-#undef return
-    return ret;
-}
-HRESULT STDMETHODCALLTYPE IAsyncES::TMDown(void) {
-    mylog("%p TMDown called\n", this);
-    return S_OK;
-}
-
-bool IAsyncES::CloseThread(DWORD type) {
-    CSTR func = "CloseThread";
-    HANDLE th;
-    DWORD ret, excode = S_OK;
-    bool rls_async = false;
-
-    mylog("%s for %p thread=%d\n", func, this, eThread[type]);
-    if (th = eThread[type], NULL == th || eFin[type])
-        return false;
-    ret = WaitForSingleObject(th, INFINITE);
-    if (WAIT_OBJECT_0 == ret) {
-        switch (type) {
-            case IAsyncES::AbortExec:
-            case IAsyncES::CommitExec:
-                rls_async = true;
-                break;
-            default:
-                GetExitCodeThread(th, &excode);
-                if (S_OK != excode)
-                    rls_async = true;
-        }
-        SLOCK_ACQUIRE();
-        eThread[type] = NULL;
-        eFin[type] = true;
-        SLOCK_RELEASE();
-        CloseHandle(th);
-    }
-    mylog("%s ret=%d\n", func, ret);
-    return rls_async;
-}
-
-EXTERN_C static void __cdecl ClosePrepareThread(LPVOID para) {
-    CSTR func = "ClosePrepareThread";
-    IAsyncES *async = (IAsyncES *)para;
-    bool release;
-
-    mylog("%s for %p", func, async);
-    if (release = async->CloseThread(IAsyncES::PrepareExec), release)
-        async->Release();
-    mylog("%s release=%d\n", func, release);
-}
-
-EXTERN_C static void __cdecl CloseCommitThread(LPVOID para) {
-    CSTR func = "CloseCommitThread";
-    IAsyncES *async = (IAsyncES *)para;
-    bool release;
-
-    mylog("%s for %p", func, async);
-    if (release = async->CloseThread(IAsyncES::CommitExec), release)
-        async->Release();
-    mylog("%s release=%d\n", func, release);
-}
-
-EXTERN_C static void __cdecl CloseAbortThread(LPVOID para) {
-    CSTR func = "CloseAbortThread";
-    IAsyncES *async = (IAsyncES *)para;
-    bool release;
-
-    mylog("%s for %p", func, async);
-    if (release = async->CloseThread(IAsyncES::AbortExec), release)
-        async->Release();
-    mylog("%s release=%d\n", func, release);
-}
-
-EXTERN_C static unsigned WINAPI DtcRequestExec(LPVOID para) {
-    RequestPara *reqp = (RequestPara *)para;
-    DWORD type = reqp->type;
-    IAsyncES *async = (IAsyncES *)reqp->lpr;
-    HRESULT res = reqp->res, ret;
-
-    mylog("DtcRequestExec type=%d", reqp->type);
-    delete (reqp);
-    ret = async->RequestExec(type, res);
-    mylog(" Done ret=%d\n", ret);
-    return ret;
-}
-
-CSTR regKey = "SOFTWARE\\Microsoft\\MSDTC\\XADLL";
-
-static int regkeyCheck(const char *xalibname, const char *xalibpath) {
-    int retcode = 0;
-    LONG ret;
-    HKEY sKey;
-    DWORD rSize;
-
-    ret = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, regKey, 0,
-                         KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_WOW64_64KEY,
-                         &sKey);
-    switch (ret) {
-        case ERROR_SUCCESS:
-            break;
-        case ERROR_FILE_NOT_FOUND:
-            ret = ::RegCreateKeyEx(HKEY_LOCAL_MACHINE, regKey, 0, NULL,
-                                   REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS,
-                                   NULL, &sKey, NULL);
-            mylog("%s:CreateKeyEx ret=%d\n", __FUNCTION__, ret);
-            break;
-        default:
-            mylog("%s:OpenKeyEx ret=%d\n", __FUNCTION__, ret);
-    }
-    if (ERROR_SUCCESS != ret)
-        return -1;
-    else {
-        char keyval[1024];
-
-        rSize = sizeof(keyval);
-        switch (ret = ::RegQueryValueEx(sKey, xalibname, NULL, NULL,
-                                        (LPBYTE)keyval, &rSize)) {
-            case ERROR_SUCCESS:
-                if (rSize > 0) {
-                    if (0 == _stricmp(keyval, xalibpath))
-                        break;
-                    mylog("%s:XADLL value %s is different from %s\n",
-                          __FUNCTION__, keyval, xalibpath);
-                    if (IsWow64()) {
-                        mylog(
-                            "%s:avoid RegSetValue operation from wow64 "
-                            "process\n",
-                            __FUNCTION__);
-                        break;
-                    }
-                }
-            case ERROR_FILE_NOT_FOUND:
-                mylog("%s:Setting value %s\n", __FUNCTION__, xalibpath);
-                ret = ::RegSetValueEx(sKey, xalibname, 0, REG_SZ,
-                                      (CONST BYTE *)xalibpath,
-                                      (DWORD)strlen(xalibpath) + 1);
-                if (ERROR_SUCCESS == ret)
-                    retcode = 1;
-                else {
-                    retcode = -1;
-                    mylog("%s:SetValuEx ret=%d\n", __FUNCTION__, ret);
-                }
-                break;
-            default:
-                retcode = -1;
-                mylog("%s:QueryValuEx ret=%d\n", __FUNCTION__, ret);
-                break;
-        }
-        ::RegCloseKey(sKey);
-    }
-    return retcode;
-}
-
-RETCODE static EnlistInDtc_1pipe(void *conn, ITransaction *pTra,
-                                 ITransactionDispenser *pDtc, int method) {
-    CSTR func = "EnlistInDtc_1pipe";
-    static IDtcToXaHelperSinglePipe *pHelper = NULL;
-    ITransactionResourceAsync *pRes = NULL;
-    IAsyncES *asdum;
-    HRESULT res;
-    DWORD dwRMCookie;
-    XID xid;
-    const char *xalibname = GetXaLibName();
-    const char *xalibpath = GetXaLibPath();
-
-    int recovLvl;
-    char errmsg[256];
-    char reason[128];
-
-    if (!pHelper) {
-        res = pDtc->QueryInterface(IID_IDtcToXaHelperSinglePipe,
-                                   (void **)&pHelper);
-        if (res != S_OK || !pHelper) {
-            mylog("DtcToXaHelperSingelPipe get error %d\n", res);
-            pHelper = NULL;
-            return SQL_ERROR;
-        }
-    }
-    res = (NULL != (asdum = new IAsyncES)) ? S_OK : E_FAIL;
-    if (S_OK != res) {
-        mylog("CoCreateInstance error %d\n", res);
-        return SQL_ERROR;
-    }
-
-    recovLvl = EsDtc_is_recovery_available(conn, reason, sizeof(reason));
-    switch (method) {
-        case DTC_CHECK_BEFORE_LINK:
-            if (0 == recovLvl) {
-                snprintf(errmsg, sizeof(errmsg),
-                         "%s is unavailable in distributed transactions",
-                         reason);
-                EsDtc_set_error(conn, errmsg, func);
-                return SQL_ERROR;
-            }
-    }
-    /*mylog("dllname=%s dsn=%s\n", xalibname, conn->connInfo.dsn); res = 0;*/
-    char dtcname[1024];
-    EsDtc_create_connect_string(conn, dtcname, sizeof(dtcname));
-
-    bool confirmedRegkey = false, confirmingLink = false, xarmerr = false;
-    char error_header[64];
-    while (true) {
-        res = pHelper->XARMCreate(dtcname, (char *)xalibname, &dwRMCookie);
-
-        mylog("XARMcreate error code=%x (%d %d)\n", res, confirmedRegkey,
-              confirmingLink);
-        xarmerr = true;
-        if (!confirmingLink)
-            snprintf(error_header, sizeof(error_header),
-                     "XARMcreate error code=%x", res);
-        switch (res) {
-            case S_OK:
-                if (confirmingLink) {
-                    switch (recovLvl) {
-                        case 0:
-                            snprintf(errmsg, sizeof(errmsg),
-                                     "%s:%s is currently unavailable in "
-                                     "distributed transactions",
-                                     error_header, reason);
-                            break;
-                        case -1:
-                            snprintf(
-                                errmsg, sizeof(errmsg),
-                                "%s:Possibly you connect to the database whose "
-                                "authentication method is %s or ident",
-                                error_header, reason);
-                            break;
-                        case 1:
-                            snprintf(
-                                errmsg, sizeof(errmsg),
-                                "%s:Are you trying to connect to the database "
-                                "whose authentication method is ident?",
-                                error_header);
-                            break;
-                    }
-                } else
-                    xarmerr = false;
-                break;
-            case XACT_E_XA_TX_DISABLED:
-                snprintf(errmsg, sizeof(errmsg),
-                         "%s:Please enable XA transaction in MSDTC security "
-                         "configuration",
-                         error_header);
-                break;
-            case XACT_E_TMNOTAVAILABLE:
-                snprintf(errmsg, sizeof(errmsg),
-                         "%s:Please start Distributed Transaction Coordinator "
-                         "service",
-                         error_header);
-                break;
-            case E_FAIL:
-                if (!confirmedRegkey) {
-                    int retcode = regkeyCheck(xalibname, xalibpath);
-                    confirmedRegkey = true;
-                    if (retcode > 0)
-                        continue;
-                }
-                switch (method) {
-                    case DTC_CHECK_RM_CONNECTION:
-                        if (!confirmingLink) {
-                            confirmingLink = true;
-                            strcat(dtcname, ";" KEYWORD_DTC_CHECK "=0");
-                            continue;
-                        }
-                    default:
-                        snprintf(errmsg, sizeof(errmsg),
-                                 "%s:Failed to link with DTC service. Please "
-                                 "look at the log of Event Viewer etc.",
-                                 error_header);
-                }
-                break;
-            case XACT_E_CONNECTION_DOWN:
-                snprintf(errmsg, sizeof(errmsg),
-                         "%s:Lost connection with DTC transaction "
-                         "manager\nMSDTC has some trouble?",
-                         error_header);
-                break;
-            default:
-                snprintf(errmsg, sizeof(errmsg), "%s\n", error_header);
-                break;
-        }
-        break;
-    }
-    if (xarmerr) {
-        EsDtc_set_error(conn, errmsg, func);
-        return SQL_ERROR;
-    }
-
-    res = pHelper->ConvertTridToXID((DWORD *)pTra, dwRMCookie, &xid);
-    if (res != S_OK) {
-        mylog("ConvertTridToXid error %d\n", res);
-        return SQL_ERROR;
-    }
-    {
-        char esxid[258];
-        XidToText(xid, esxid);
-        mylog("ConvertTridToXID -> %s\n", esxid);
-    }
-    asdum->SetXid(&xid);
-    /* Create an IAsyncES instance by myself */
-    /* DLLGetClassObject(GUID_IAsyncES, IID_ITransactionResourceAsync, (void **)
-     * &asdum); */
-
-    asdum->SetHelper(pHelper, dwRMCookie);
-    res = pHelper->EnlistWithRM(dwRMCookie, pTra, asdum, &asdum->enlist);
-    if (res != S_OK) {
-        mylog("EnlistWithRM error %d\n", res);
-        pHelper->ReleaseRMCookie(dwRMCookie, TRUE);
-        return SQL_ERROR;
-    }
-
-    mylog("asdum=%p start transaction\n", asdum);
-    asdum->SetConnection(conn);
-    LIFELOCK_ACQUIRE;
-    EsDtc_set_async(conn, asdum);
-    LIFELOCK_RELEASE;
-
-    return SQL_SUCCESS;
-}
-
-EXTERN_C RETCODE IsolateDtcConn(void *conn, BOOL continueConnection) {
-    IAsyncES *async;
-
-    LIFELOCK_ACQUIRE;
-    if (async = (IAsyncES *)EsDtc_get_async(conn), NULL != async) {
-        if (EsDtc_get_property(conn, idleInGlobalTransaction)) {
-            async->AddRef();
-            LIFELOCK_RELEASE;
-            async->separateXAConn(false, continueConnection ? true : false);
-            async->Release();
-        } else
-            LIFELOCK_RELEASE;
-    } else
-        LIFELOCK_RELEASE;
-    return SQL_SUCCESS;
-}
-
-static ITransactionDispenser *getITransactionDispenser(DWORD grfOptions,
-                                                       HRESULT *hres) {
-    static ITransactionDispenser *pDtc = NULL;
-    HRESULT res = S_OK;
-
-    if (!pDtc) {
-        res = DtcGetTransactionManagerEx(NULL, NULL, IID_ITransactionDispenser,
-
-                                         grfOptions, NULL, (void **)&pDtc);
-        if (FAILED(res)) {
-            mylog("DtcGetTransactionManager error %x\n", res);
-            pDtc = NULL;
-        }
-    }
-    if (hres)
-        *hres = res;
-
-    return pDtc;
-}
-
-EXTERN_C void *GetTransactionObject(HRESULT *hres) {
-    ITransaction *pTra = NULL;
-    ITransactionDispenser *pDtc = NULL;
-
-    if (pDtc = getITransactionDispenser(OLE_TM_FLAG_NONE, hres), NULL == pDtc)
-        return pTra;
-    HRESULT res = pDtc->BeginTransaction(NULL, ISOLATIONLEVEL_READCOMMITTED, 0,
-                                         NULL, &pTra);
-    switch (res) {
-        case S_OK:
-            break;
-        default:
-            pTra = NULL;
-    }
-    if (hres)
-        *hres = res;
-    return pTra;
-}
-
-EXTERN_C void ReleaseTransactionObject(void *pObj) {
-    ITransaction *pTra = (ITransaction *)pObj;
-
-    if (!pTra)
-        return;
-    pTra->Release();
-}
-
-EXTERN_C RETCODE EnlistInDtc(void *conn, void *pTra, int method) {
-    ITransactionDispenser *pDtc = NULL;
-    RETCODE ret;
-
-    if (!pTra) {
-        IAsyncES *asdum = (IAsyncES *)EsDtc_get_async(conn);
-        EsDtc_set_property(conn, enlisted, (void *)0);
-        return SQL_SUCCESS;
-    }
-    if (CONN_IS_IN_TRANS(conn)) {
-        EsDtc_one_phase_operation(conn, SHUTDOWN_LOCAL_TRANSACTION);
-    }
-    HRESULT hres;
-    pDtc = getITransactionDispenser(OLE_TM_FLAG_NODEMANDSTART, &hres);
-    if (!pDtc) {
-        char errmsg[128];
-        snprintf(errmsg, sizeof(errmsg),
-                 "enlistment error:DtcGetTransactionManager error code=%x",
-                 hres);
-        EsDtc_set_error(conn, errmsg, __FUNCTION__);
-        return SQL_ERROR;
-    }
-    ret = EnlistInDtc_1pipe(conn, (ITransaction *)pTra, pDtc, method);
-    if (SQL_SUCCEEDED(ret))
-        EsDtc_set_property(conn, enlisted, (void *)1);
-    return ret;
-}
-
-EXTERN_C RETCODE DtcOnDisconnect(void *conn) {
-    mylog("DtcOnDisconnect\n");
-    LIFELOCK_ACQUIRE;
-    IAsyncES *asdum = (IAsyncES *)EsDtc_get_async(conn);
-    if (asdum) {
-        asdum->AddRef();
-        LIFELOCK_RELEASE;
-        asdum->ReleaseConnection();
-        asdum->Release();
-    } else
-        LIFELOCK_RELEASE;
-    return SQL_SUCCESS;
-}
-
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
diff --git a/sql-odbc/src/opensearchenlist/opensearch_enlist.h b/sql-odbc/src/opensearchenlist/opensearch_enlist.h
deleted file mode 100644
index a87d402bd6..0000000000
--- a/sql-odbc/src/opensearchenlist/opensearch_enlist.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __OPENSEARCH_ENLIST_H__
-#define __OPENSEARCH_ENLIST_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef WIN32
-#ifdef _HANDLE_ENLIST_IN_DTC_
-
-#undef DLL_DECLARE
-#ifdef _OPENSEARCH_ENLIST_FUNCS_IMPLEMENT_
-#define DLL_DECLARE _declspec(dllexport)
-#else
-#ifdef _OPENSEARCH_ENLIST_FUNCS_IMPORT_
-#define DLL_DECLARE _declspec(dllimport)
-#else
-#define DLL_DECLARE
-#endif /* _OPENSEARCH_ENLIST_FUNCS_IMPORT_ */
-#endif /* _OPENSEARCH_ENLIST_FUNCS_IMPLEMENT_ */
-
-RETCODE EnlistInDtc(void *conn, void *pTra, int method);
-RETCODE DtcOnDisconnect(void *);
-RETCODE IsolateDtcConn(void *, BOOL continueConnection);
-//	for testing
-DLL_DECLARE void *GetTransactionObject(HRESULT *hres);
-DLL_DECLARE void ReleaseTransactionObject(void *);
-
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
-#endif /* WIN32 */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __OPENSEARCH_ENLIST_H__ */
diff --git a/sql-odbc/src/sqlodbc/CMakeLists.txt b/sql-odbc/src/sqlodbc/CMakeLists.txt
deleted file mode 100644
index f926dfe644..0000000000
--- a/sql-odbc/src/sqlodbc/CMakeLists.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-project(sqlodbc)
-
-# Source files for sqlodbc
-set(					SOURCE_FILES 
-							bind.c					columninfo.c			connection.c 				convert.c
-							descriptor.c			dlg_specific.c			drvconn.c					options.c	
-							environ.c				execute.c				info.c						loadlib.c
-							misc.c					multibyte.c				mylog.c						tuple.c
-							parse.c					results.c				statement.c					odbcapi30.c	
-							qresult.c				odbcapi30w.c opensearch_api30.c opensearch_types.c
-		opensearch_utility.cpp opensearch_communication.cpp opensearch_connection.cpp opensearch_odbc.c
-        opensearch_driver_connect.cpp opensearch_helper.cpp opensearch_info.cpp opensearch_parse_result.cpp
-		opensearch_semaphore.cpp opensearch_statement.cpp win_unicode.c				odbcapi.c
-							odbcapiw.c opensearch_result_queue.cpp
-	)
-if(WIN32)
-set(SOURCE_FILES ${SOURCE_FILES} dlg_wingui.c setup.c)
-endif()
-
-set(					HEADER_FILES 
-							bind.h					catfunc.h				columninfo.h
-							convert.h				descriptor.h			dlg_specific.h		drvconn.h
-							environ.h opensearch_apifunc.h opensearch_communication.h opensearch_parse_result.h
-        opensearch_connection.h opensearch_driver_connect.h opensearch_helper.h opensearch_info.h
-        opensearch_statement.h opensearch_types.h loadlib.h
-							misc.h					multibyte.h				mylog.h opensearch_utility.h
-							resource.h				statement.h				tuple.h				unicode_support.h
-		opensearch_apifunc.h opensearch_odbc.h opensearch_semaphore.h qresult.h
-							version.h				win_setup.h opensearch_result_queue.h
-	)
-
-# Generate dll (SHARED)
-if(WIN32)
-set(RESOURCE_FILES opensearch_odbc.rc)
-add_library(sqlodbc SHARED ${SOURCE_FILES} ${HEADER_FILES} ${RESOURCE_FILES} ${AWSSDK_LIB_DIR})
-else()
-add_library(sqlodbc SHARED ${SOURCE_FILES} ${HEADER_FILES})
-endif()
-
-include_directories(
-						${LIBRARY_DIRECTORY}/../src
-						${CMAKE_CURRENT_SOURCE_DIR}
-						${OPENSEARCHENLIST_SRC}
-						${RABBIT_SRC}
-						${RAPIDJSON_SRC}
-						${AWSSDK_INCLUDE_DIR}
-					)
-
-# Platform specific library dependencies
-if(WIN32)
-	# Windows specifiec
-	target_link_libraries(sqlodbc wsock32 ws2_32 winmm user32 gdi32 legacy_stdio_definitions aws-cpp-sdk-core kernel32 advapi32 secur32 XOleHlp Wldap32 crypt32 Normaliz odbccp32 odbc32)
-	target_link_libraries(sqlodbc debug msvcrtd)
-	target_link_libraries(sqlodbc optimized msvcrt)
-elseif(APPLE)
-	# Apple specific
-	target_link_libraries(sqlodbc iodbc iodbcinst aws-cpp-sdk-core)
-elseif(UNIX)
-	# Unix specific
-	include_directories(/usr/src/linux-headers-5.0.0-27/include)
-	target_link_libraries(sqlodbc aws-cpp-sdk-core odbc odbcinst)
-endif()
diff --git a/sql-odbc/src/sqlodbc/LICENSE.txt b/sql-odbc/src/sqlodbc/LICENSE.txt
deleted file mode 100644
index f2ff00e7d8..0000000000
--- a/sql-odbc/src/sqlodbc/LICENSE.txt
+++ /dev/null
@@ -1,961 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-
-		       Version 2, June 1991
-
-
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-
-                    675 Mass Ave, Cambridge, MA 02139, USA
-
- Everyone is permitted to copy and distribute verbatim copies
-
- of this license document, but changing it is not allowed.
-
-
-
-[This is the first released version of the library GPL.  It is
-
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-
-
-			    Preamble
-
-
-
-  The licenses for most software are designed to take away your
-
-freedom to share and change it.  By contrast, the GNU General Public
-
-Licenses are intended to guarantee your freedom to share and change
-
-free software--to make sure the software is free for all its users.
-
-
-
-  This license, the Library General Public License, applies to some
-
-specially designated Free Software Foundation software, and to any
-
-other libraries whose authors decide to use it.  You can use it for
-
-your libraries, too.
-
-
-
-  When we speak of free software, we are referring to freedom, not
-
-price.  Our General Public Licenses are designed to make sure that you
-
-have the freedom to distribute copies of free software (and charge for
-
-this service if you wish), that you receive source code or can get it
-
-if you want it, that you can change the software or use pieces of it
-
-in new free programs; and that you know you can do these things.
-
-
-
-  To protect your rights, we need to make restrictions that forbid
-
-anyone to deny you these rights or to ask you to surrender the rights.
-
-These restrictions translate to certain responsibilities for you if
-
-you distribute copies of the library, or if you modify it.
-
-
-
-  For example, if you distribute copies of the library, whether gratis
-
-or for a fee, you must give the recipients all the rights that we gave
-
-you.  You must make sure that they, too, receive or can get the source
-
-code.  If you link a program with the library, you must provide
-
-complete object files to the recipients so that they can relink them
-
-with the library, after making changes to the library and recompiling
-
-it.  And you must show them these terms so they know their rights.
-
-
-
-  Our method of protecting your rights has two steps: (1) copyright
-
-the library, and (2) offer you this license which gives you legal
-
-permission to copy, distribute and/or modify the library.
-
-
-
-  Also, for each distributor's protection, we want to make certain
-
-that everyone understands that there is no warranty for this free
-
-library.  If the library is modified by someone else and passed on, we
-
-want its recipients to know that what they have is not the original
-
-version, so that any problems introduced by others will not reflect on
-
-the original authors' reputations.
-
-
-
-  Finally, any free program is threatened constantly by software
-
-patents.  We wish to avoid the danger that companies distributing free
-
-software will individually obtain patent licenses, thus in effect
-
-transforming the program into proprietary software.  To prevent this,
-
-we have made it clear that any patent must be licensed for everyone's
-
-free use or not licensed at all.
-
-
-
-  Most GNU software, including some libraries, is covered by the ordinary
-
-GNU General Public License, which was designed for utility programs.  This
-
-license, the GNU Library General Public License, applies to certain
-
-designated libraries.  This license is quite different from the ordinary
-
-one; be sure to read it in full, and don't assume that anything in it is
-
-the same as in the ordinary license.
-
-
-
-  The reason we have a separate public license for some libraries is that
-
-they blur the distinction we usually make between modifying or adding to a
-
-program and simply using it.  Linking a program with a library, without
-
-changing the library, is in some sense simply using the library, and is
-
-analogous to running a utility program or application program.  However, in
-
-a textual and legal sense, the linked executable is a combined work, a
-
-derivative of the original library, and the ordinary General Public License
-
-treats it as such.
-
-
-
-  Because of this blurred distinction, using the ordinary General
-
-Public License for libraries did not effectively promote software
-
-sharing, because most developers did not use the libraries.  We
-
-concluded that weaker conditions might promote sharing better.
-
-
-
-  However, unrestricted linking of non-free programs would deprive the
-
-users of those programs of all benefit from the free status of the
-
-libraries themselves.  This Library General Public License is intended to
-
-permit developers of non-free programs to use free libraries, while
-
-preserving your freedom as a user of such programs to change the free
-
-libraries that are incorporated in them.  (We have not seen how to achieve
-
-this as regards changes in header files, but we have achieved it as regards
-
-changes in the actual functions of the Library.)  The hope is that this
-
-will lead to faster development of free libraries.
-
-
-
-  The precise terms and conditions for copying, distribution and
-
-modification follow.  Pay close attention to the difference between a
-
-"work based on the library" and a "work that uses the library".  The
-
-former contains code derived from the library, while the latter only
-
-works together with the library.
-
-
-
-  Note that it is possible for a library to be covered by the ordinary
-
-General Public License rather than by this special one.
-
-
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-
-
-  0. This License Agreement applies to any software library which
-
-contains a notice placed by the copyright holder or other authorized
-
-party saying it may be distributed under the terms of this Library
-
-General Public License (also called "this License").  Each licensee is
-
-addressed as "you".
-
-
-
-  A "library" means a collection of software functions and/or data
-
-prepared so as to be conveniently linked with application programs
-
-(which use some of those functions and data) to form executables.
-
-
-
-  The "Library", below, refers to any such software library or work
-
-which has been distributed under these terms.  A "work based on the
-
-Library" means either the Library or any derivative work under
-
-copyright law: that is to say, a work containing the Library or a
-
-portion of it, either verbatim or with modifications and/or translated
-
-straightforwardly into another language.  (Hereinafter, translation is
-
-included without limitation in the term "modification".)
-
-
-
-  "Source code" for a work means the preferred form of the work for
-
-making modifications to it.  For a library, complete source code means
-
-all the source code for all modules it contains, plus any associated
-
-interface definition files, plus the scripts used to control compilation
-
-and installation of the library.
-
-
-
-  Activities other than copying, distribution and modification are not
-
-covered by this License; they are outside its scope.  The act of
-
-running a program using the Library is not restricted, and output from
-
-such a program is covered only if its contents constitute a work based
-
-on the Library (independent of the use of the Library in a tool for
-
-writing it).  Whether that is true depends on what the Library does
-
-and what the program that uses the Library does.
-
-
-
-  1. You may copy and distribute verbatim copies of the Library's
-
-complete source code as you receive it, in any medium, provided that
-
-you conspicuously and appropriately publish on each copy an
-
-appropriate copyright notice and disclaimer of warranty; keep intact
-
-all the notices that refer to this License and to the absence of any
-
-warranty; and distribute a copy of this License along with the
-
-Library.
-
-
-
-  You may charge a fee for the physical act of transferring a copy,
-
-and you may at your option offer warranty protection in exchange for a
-
-fee.
-
-
-
-  2. You may modify your copy or copies of the Library or any portion
-
-of it, thus forming a work based on the Library, and copy and
-
-distribute such modifications or work under the terms of Section 1
-
-above, provided that you also meet all of these conditions:
-
-
-
-    a) The modified work must itself be a software library.
-
-
-
-    b) You must cause the files modified to carry prominent notices
-
-    stating that you changed the files and the date of any change.
-
-
-
-    c) You must cause the whole of the work to be licensed at no
-
-    charge to all third parties under the terms of this License.
-
-
-
-    d) If a facility in the modified Library refers to a function or a
-
-    table of data to be supplied by an application program that uses
-
-    the facility, other than as an argument passed when the facility
-
-    is invoked, then you must make a good faith effort to ensure that,
-
-    in the event an application does not supply such function or
-
-    table, the facility still operates, and performs whatever part of
-
-    its purpose remains meaningful.
-
-
-
-    (For example, a function in a library to compute square roots has
-
-    a purpose that is entirely well-defined independent of the
-
-    application.  Therefore, Subsection 2d requires that any
-
-    application-supplied function or table used by this function must
-
-    be optional: if the application does not supply it, the square
-
-    root function must still compute square roots.)
-
-
-
-These requirements apply to the modified work as a whole.  If
-
-identifiable sections of that work are not derived from the Library,
-
-and can be reasonably considered independent and separate works in
-
-themselves, then this License, and its terms, do not apply to those
-
-sections when you distribute them as separate works.  But when you
-
-distribute the same sections as part of a whole which is a work based
-
-on the Library, the distribution of the whole must be on the terms of
-
-this License, whose permissions for other licensees extend to the
-
-entire whole, and thus to each and every part regardless of who wrote
-
-it.
-
-
-
-Thus, it is not the intent of this section to claim rights or contest
-
-your rights to work written entirely by you; rather, the intent is to
-
-exercise the right to control the distribution of derivative or
-
-collective works based on the Library.
-
-
-
-In addition, mere aggregation of another work not based on the Library
-
-with the Library (or with a work based on the Library) on a volume of
-
-a storage or distribution medium does not bring the other work under
-
-the scope of this License.
-
-
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-
-License instead of this License to a given copy of the Library.  To do
-
-this, you must alter all the notices that refer to this License, so
-
-that they refer to the ordinary GNU General Public License, version 2,
-
-instead of to this License.  (If a newer version than version 2 of the
-
-ordinary GNU General Public License has appeared, then you can specify
-
-that version instead if you wish.)  Do not make any other change in
-
-these notices.
-
-
-
-  Once this change is made in a given copy, it is irreversible for
-
-that copy, so the ordinary GNU General Public License applies to all
-
-subsequent copies and derivative works made from that copy.
-
-
-
-  This option is useful when you wish to copy part of the code of
-
-the Library into a program that is not a library.
-
-
-
-  4. You may copy and distribute the Library (or a portion or
-
-derivative of it, under Section 2) in object code or executable form
-
-under the terms of Sections 1 and 2 above provided that you accompany
-
-it with the complete corresponding machine-readable source code, which
-
-must be distributed under the terms of Sections 1 and 2 above on a
-
-medium customarily used for software interchange.
-
-
-
-  If distribution of object code is made by offering access to copy
-
-from a designated place, then offering equivalent access to copy the
-
-source code from the same place satisfies the requirement to
-
-distribute the source code, even though third parties are not
-
-compelled to copy the source along with the object code.
-
-
-
-  5. A program that contains no derivative of any portion of the
-
-Library, but is designed to work with the Library by being compiled or
-
-linked with it, is called a "work that uses the Library".  Such a
-
-work, in isolation, is not a derivative work of the Library, and
-
-therefore falls outside the scope of this License.
-
-
-
-  However, linking a "work that uses the Library" with the Library
-
-creates an executable that is a derivative of the Library (because it
-
-contains portions of the Library), rather than a "work that uses the
-
-library".  The executable is therefore covered by this License.
-
-Section 6 states terms for distribution of such executables.
-
-
-
-  When a "work that uses the Library" uses material from a header file
-
-that is part of the Library, the object code for the work may be a
-
-derivative work of the Library even though the source code is not.
-
-Whether this is true is especially significant if the work can be
-
-linked without the Library, or if the work is itself a library.  The
-
-threshold for this to be true is not precisely defined by law.
-
-
-
-  If such an object file uses only numerical parameters, data
-
-structure layouts and accessors, and small macros and small inline
-
-functions (ten lines or less in length), then the use of the object
-
-file is unrestricted, regardless of whether it is legally a derivative
-
-work.  (Executables containing this object code plus portions of the
-
-Library will still fall under Section 6.)
-
-
-
-  Otherwise, if the work is a derivative of the Library, you may
-
-distribute the object code for the work under the terms of Section 6.
-
-Any executables containing that work also fall under Section 6,
-
-whether or not they are linked directly with the Library itself.
-
-
-
-  6. As an exception to the Sections above, you may also compile or
-
-link a "work that uses the Library" with the Library to produce a
-
-work containing portions of the Library, and distribute that work
-
-under terms of your choice, provided that the terms permit
-
-modification of the work for the customer's own use and reverse
-
-engineering for debugging such modifications.
-
-
-
-  You must give prominent notice with each copy of the work that the
-
-Library is used in it and that the Library and its use are covered by
-
-this License.  You must supply a copy of this License.  If the work
-
-during execution displays copyright notices, you must include the
-
-copyright notice for the Library among them, as well as a reference
-
-directing the user to the copy of this License.  Also, you must do one
-
-of these things:
-
-
-
-    a) Accompany the work with the complete corresponding
-
-    machine-readable source code for the Library including whatever
-
-    changes were used in the work (which must be distributed under
-
-    Sections 1 and 2 above); and, if the work is an executable linked
-
-    with the Library, with the complete machine-readable "work that
-
-    uses the Library", as object code and/or source code, so that the
-
-    user can modify the Library and then relink to produce a modified
-
-    executable containing the modified Library.  (It is understood
-
-    that the user who changes the contents of definitions files in the
-
-    Library will not necessarily be able to recompile the application
-
-    to use the modified definitions.)
-
-
-
-    b) Accompany the work with a written offer, valid for at
-
-    least three years, to give the same user the materials
-
-    specified in Subsection 6a, above, for a charge no more
-
-    than the cost of performing this distribution.
-
-
-
-    c) If distribution of the work is made by offering access to copy
-
-    from a designated place, offer equivalent access to copy the above
-
-    specified materials from the same place.
-
-
-
-    d) Verify that the user has already received a copy of these
-
-    materials or that you have already sent this user a copy.
-
-
-
-  For an executable, the required form of the "work that uses the
-
-Library" must include any data and utility programs needed for
-
-reproducing the executable from it.  However, as a special exception,
-
-the source code distributed need not include anything that is normally
-
-distributed (in either source or binary form) with the major
-
-components (compiler, kernel, and so on) of the operating system on
-
-which the executable runs, unless that component itself accompanies
-
-the executable.
-
-
-
-  It may happen that this requirement contradicts the license
-
-restrictions of other proprietary libraries that do not normally
-
-accompany the operating system.  Such a contradiction means you cannot
-
-use both them and the Library together in an executable that you
-
-distribute.
-
-
-
-  7. You may place library facilities that are a work based on the
-
-Library side-by-side in a single library together with other library
-
-facilities not covered by this License, and distribute such a combined
-
-library, provided that the separate distribution of the work based on
-
-the Library and of the other library facilities is otherwise
-
-permitted, and provided that you do these two things:
-
-
-
-    a) Accompany the combined library with a copy of the same work
-
-    based on the Library, uncombined with any other library
-
-    facilities.  This must be distributed under the terms of the
-
-    Sections above.
-
-
-
-    b) Give prominent notice with the combined library of the fact
-
-    that part of it is a work based on the Library, and explaining
-
-    where to find the accompanying uncombined form of the same work.
-
-
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-
-the Library except as expressly provided under this License.  Any
-
-attempt otherwise to copy, modify, sublicense, link with, or
-
-distribute the Library is void, and will automatically terminate your
-
-rights under this License.  However, parties who have received copies,
-
-or rights, from you under this License will not have their licenses
-
-terminated so long as such parties remain in full compliance.
-
-
-
-  9. You are not required to accept this License, since you have not
-
-signed it.  However, nothing else grants you permission to modify or
-
-distribute the Library or its derivative works.  These actions are
-
-prohibited by law if you do not accept this License.  Therefore, by
-
-modifying or distributing the Library (or any work based on the
-
-Library), you indicate your acceptance of this License to do so, and
-
-all its terms and conditions for copying, distributing or modifying
-
-the Library or works based on it.
-
-
-
-  10. Each time you redistribute the Library (or any work based on the
-
-Library), the recipient automatically receives a license from the
-
-original licensor to copy, distribute, link with or modify the Library
-
-subject to these terms and conditions.  You may not impose any further
-
-restrictions on the recipients' exercise of the rights granted herein.
-
-You are not responsible for enforcing compliance by third parties to
-
-this License.
-
-
-
-  11. If, as a consequence of a court judgment or allegation of patent
-
-infringement or for any other reason (not limited to patent issues),
-
-conditions are imposed on you (whether by court order, agreement or
-
-otherwise) that contradict the conditions of this License, they do not
-
-excuse you from the conditions of this License.  If you cannot
-
-distribute so as to satisfy simultaneously your obligations under this
-
-License and any other pertinent obligations, then as a consequence you
-
-may not distribute the Library at all.  For example, if a patent
-
-license would not permit royalty-free redistribution of the Library by
-
-all those who receive copies directly or indirectly through you, then
-
-the only way you could satisfy both it and this License would be to
-
-refrain entirely from distribution of the Library.
-
-
-
-If any portion of this section is held invalid or unenforceable under any
-
-particular circumstance, the balance of the section is intended to apply,
-
-and the section as a whole is intended to apply in other circumstances.
-
-
-
-It is not the purpose of this section to induce you to infringe any
-
-patents or other property right claims or to contest validity of any
-
-such claims; this section has the sole purpose of protecting the
-
-integrity of the free software distribution system which is
-
-implemented by public license practices.  Many people have made
-
-generous contributions to the wide range of software distributed
-
-through that system in reliance on consistent application of that
-
-system; it is up to the author/donor to decide if he or she is willing
-
-to distribute software through any other system and a licensee cannot
-
-impose that choice.
-
-
-
-This section is intended to make thoroughly clear what is believed to
-
-be a consequence of the rest of this License.
-
-
-
-  12. If the distribution and/or use of the Library is restricted in
-
-certain countries either by patents or by copyrighted interfaces, the
-
-original copyright holder who places the Library under this License may add
-
-an explicit geographical distribution limitation excluding those countries,
-
-so that distribution is permitted only in or among countries not thus
-
-excluded.  In such case, this License incorporates the limitation as if
-
-written in the body of this License.
-
-
-
-  13. The Free Software Foundation may publish revised and/or new
-
-versions of the Library General Public License from time to time.
-
-Such new versions will be similar in spirit to the present version,
-
-but may differ in detail to address new problems or concerns.
-
-
-
-Each version is given a distinguishing version number.  If the Library
-
-specifies a version number of this License which applies to it and
-
-"any later version", you have the option of following the terms and
-
-conditions either of that version or of any later version published by
-
-the Free Software Foundation.  If the Library does not specify a
-
-license version number, you may choose any version ever published by
-
-the Free Software Foundation.
-
-
-
-  14. If you wish to incorporate parts of the Library into other free
-
-programs whose distribution conditions are incompatible with these,
-
-write to the author to ask for permission.  For software which is
-
-copyrighted by the Free Software Foundation, write to the Free
-
-Software Foundation; we sometimes make exceptions for this.  Our
-
-decision will be guided by the two goals of preserving the free status
-
-of all derivatives of our free software and of promoting the sharing
-
-and reuse of software generally.
-
-
-
-			    NO WARRANTY
-
-
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-
-DAMAGES.
-
-
-
-		     END OF TERMS AND CONDITIONS
-
-
-
-     Appendix: How to Apply These Terms to Your New Libraries
-
-
-
-  If you develop a new library, and you want it to be of the greatest
-
-possible use to the public, we recommend making it free software that
-
-everyone can redistribute and change.  You can do so by permitting
-
-redistribution under these terms (or, alternatively, under the terms of the
-
-ordinary General Public License).
-
-
-
-  To apply these terms, attach the following notices to the library.  It is
-
-safest to attach them to the start of each source file to most effectively
-
-convey the exclusion of warranty; and each file should have at least the
-
-"copyright" line and a pointer to where the full notice is found.
-
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-
-    Copyright (C) <year>  <name of author>
-
-
-
-    This library is free software; you can redistribute it and/or
-
-    modify it under the terms of the GNU Library General Public
-
-    License as published by the Free Software Foundation; either
-
-    version 2 of the License, or (at your option) any later version.
-
-
-
-    This library is distributed in the hope that it will be useful,
-
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-
-    Library General Public License for more details.
-
-
-
-    You should have received a copy of the GNU Library General Public
-
-    License along with this library; if not, write to the Free
-
-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-
-
-You should also get your employer (if you work as a programmer) or your
-
-school, if any, to sign a "copyright disclaimer" for the library, if
-
-necessary.  Here is a sample; alter the names:
-
-
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-
-
-  <signature of Ty Coon>, 1 April 1990
-
-  Ty Coon, President of Vice
-
-
-
-That's all there is to it!
diff --git a/sql-odbc/src/sqlodbc/bind.c b/sql-odbc/src/sqlodbc/bind.c
deleted file mode 100644
index 889c4c66c1..0000000000
--- a/sql-odbc/src/sqlodbc/bind.c
+++ /dev/null
@@ -1,687 +0,0 @@
-#include "bind.h"
-
-#include <ctype.h>
-#include <string.h>
-
-#include "descriptor.h"
-#include "environ.h"
-#include "misc.h"
-#include "multibyte.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_types.h"
-#include "qresult.h"
-#include "statement.h"
-
-/*	Associate a user-supplied buffer with a database column. */
-RETCODE SQL_API OPENSEARCHAPI_BindCol(HSTMT hstmt, SQLUSMALLINT icol,
-                              SQLSMALLINT fCType, PTR rgbValue,
-                              SQLLEN cbValueMax, SQLLEN *pcbValue) {
-    StatementClass *stmt = (StatementClass *)hstmt;
-    CSTR func = "OPENSEARCHAPI_BindCol";
-    ARDFields *opts;
-    GetDataInfo *gdata_info;
-    BindInfoClass *bookmark;
-    RETCODE ret = SQL_SUCCESS;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-
-    MYLOG(OPENSEARCH_DEBUG, "**** : stmt = %p, icol = %d\n", stmt, icol);
-    MYLOG(OPENSEARCH_DEBUG, "**** : fCType=%d rgb=%p valusMax=" FORMAT_LEN " pcb=%p\n",
-          fCType, rgbValue, cbValueMax, pcbValue);
-
-    if (!stmt) {
-        SC_log_error(func, "", NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    opts = SC_get_ARDF(stmt);
-    if (stmt->status == STMT_EXECUTING) {
-        SC_set_error(stmt, STMT_SEQUENCE_ERROR,
-                     "Can't bind columns while statement is still executing.",
-                     func);
-        return SQL_ERROR;
-    }
-
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wkeyword-macro"
-#endif  // __APPLE__
-#define return DONT_CALL_RETURN_FROM_HERE ? ? ?
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-    SC_clear_error(stmt);
-    /* If the bookmark column is being bound, then just save it */
-    if (icol == 0) {
-        bookmark = opts->bookmark;
-        if (rgbValue == NULL) {
-            if (bookmark) {
-                bookmark->buffer = NULL;
-                bookmark->used = bookmark->indicator = NULL;
-            }
-        } else {
-            /* Make sure it is the bookmark data type */
-            switch (fCType) {
-                case SQL_C_BOOKMARK:
-                case SQL_C_VARBOOKMARK:
-                    break;
-                default:
-                    SC_set_error(stmt, STMT_PROGRAM_TYPE_OUT_OF_RANGE,
-                                 "Bind column 0 is not of type SQL_C_BOOKMARK",
-                                 func);
-                    MYLOG(
-                        OPENSEARCH_ERROR,
-                        "Bind column 0 is type %d not of type SQL_C_BOOKMARK\n",
-                        fCType);
-                    ret = SQL_ERROR;
-                    goto cleanup;
-            }
-
-            bookmark = ARD_AllocBookmark(opts);
-            bookmark->buffer = rgbValue;
-            bookmark->used = bookmark->indicator = pcbValue;
-            bookmark->buflen = cbValueMax;
-            bookmark->returntype = fCType;
-        }
-        goto cleanup;
-    }
-
-    /*
-     * Allocate enough bindings if not already done. Most likely,
-     * execution of a statement would have setup the necessary bindings.
-     * But some apps call BindCol before any statement is executed.
-     */
-    if (icol > opts->allocated)
-        extend_column_bindings(opts, icol);
-    gdata_info = SC_get_GDTI(stmt);
-    if (icol > gdata_info->allocated)
-        extend_getdata_info(gdata_info, icol, FALSE);
-
-    /* check to see if the bindings were allocated */
-    if (!opts->bindings || !gdata_info->gdata) {
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                     "Could not allocate memory for bindings.", func);
-        ret = SQL_ERROR;
-        goto cleanup;
-    }
-
-    /* use zero based col numbers from here out */
-    icol--;
-
-    /* Reset for SQLGetData */
-    GETDATA_RESET(gdata_info->gdata[icol]);
-
-    if (rgbValue == NULL) {
-        /* we have to unbind the column */
-        opts->bindings[icol].buflen = 0;
-        opts->bindings[icol].buffer = NULL;
-        opts->bindings[icol].used = opts->bindings[icol].indicator = NULL;
-        opts->bindings[icol].returntype = SQL_C_CHAR;
-        opts->bindings[icol].precision = 0;
-        opts->bindings[icol].scale = 0;
-        if (gdata_info->gdata[icol].ttlbuf)
-            free(gdata_info->gdata[icol].ttlbuf);
-        gdata_info->gdata[icol].ttlbuf = NULL;
-        gdata_info->gdata[icol].ttlbuflen = 0;
-        gdata_info->gdata[icol].ttlbufused = 0;
-    } else {
-        /* ok, bind that column */
-        opts->bindings[icol].buflen = cbValueMax;
-        opts->bindings[icol].buffer = rgbValue;
-        opts->bindings[icol].used = opts->bindings[icol].indicator = pcbValue;
-        opts->bindings[icol].returntype = fCType;
-        opts->bindings[icol].precision = 0;
-        switch (fCType) {
-            case SQL_C_NUMERIC:
-                opts->bindings[icol].precision = 32;
-                break;
-            case SQL_C_TIMESTAMP:
-            case SQL_C_INTERVAL_DAY_TO_SECOND:
-            case SQL_C_INTERVAL_HOUR_TO_SECOND:
-            case SQL_C_INTERVAL_MINUTE_TO_SECOND:
-            case SQL_C_INTERVAL_SECOND:
-                opts->bindings[icol].precision = 6;
-                break;
-        }
-        opts->bindings[icol].scale = 0;
-
-        MYLOG(OPENSEARCH_DEBUG, "       bound buffer[%d] = %p\n", icol,
-              opts->bindings[icol].buffer);
-    }
-
-cleanup:
-#undef return
-    return ret;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_NumParams(HSTMT hstmt, SQLSMALLINT *pcpar) {
-    StatementClass *stmt = (StatementClass *)hstmt;
-    if (pcpar != NULL) {
-        *pcpar = 0;
-    } else {
-        SC_set_error(stmt, STMT_EXEC_ERROR, "Parameter count address is null",
-                     "OPENSEARCHAPI_NumParams");
-        return SQL_ERROR;
-    }
-    return SQL_SUCCESS;
-}
-
-/*
- *	 Bindings Implementation
- */
-static BindInfoClass *create_empty_bindings(int num_columns) {
-    BindInfoClass *new_bindings;
-    int i;
-
-    new_bindings = (BindInfoClass *)malloc(num_columns * sizeof(BindInfoClass));
-    if (!new_bindings)
-        return NULL;
-
-    for (i = 0; i < num_columns; i++) {
-        new_bindings[i].buflen = 0;
-        new_bindings[i].buffer = NULL;
-        new_bindings[i].used = new_bindings[i].indicator = NULL;
-    }
-
-    return new_bindings;
-}
-
-void extend_parameter_bindings(APDFields *self, SQLSMALLINT num_params) {
-    ParameterInfoClass *new_bindings;
-
-    MYLOG(OPENSEARCH_TRACE,
-          "entering ... self=%p, parameters_allocated=%d, num_params=%d,%p\n",
-          self, self->allocated, num_params, self->parameters);
-
-    /*
-     * if we have too few, allocate room for more, and copy the old
-     * entries into the new structure
-     */
-    if (self->allocated < num_params) {
-        new_bindings = (ParameterInfoClass *)realloc(
-            self->parameters, sizeof(ParameterInfoClass) * num_params);
-        if (!new_bindings) {
-            MYLOG(OPENSEARCH_DEBUG,
-                  "unable to create %d new bindings from %d old bindings\n",
-                  num_params, self->allocated);
-
-            if (self->parameters)
-                free(self->parameters);
-            self->parameters = NULL;
-            self->allocated = 0;
-            return;
-        }
-        memset(&new_bindings[self->allocated], 0,
-               sizeof(ParameterInfoClass) * (num_params - self->allocated));
-
-        self->parameters = new_bindings;
-        self->allocated = num_params;
-    }
-
-    MYLOG(OPENSEARCH_TRACE, "leaving %p\n", self->parameters);
-}
-
-void extend_iparameter_bindings(IPDFields *self, SQLSMALLINT num_params) {
-    ParameterImplClass *new_bindings;
-
-    MYLOG(OPENSEARCH_TRACE,
-          "entering ... self=%p, parameters_allocated=%d, num_params=%d\n",
-          self, self->allocated, num_params);
-
-    /*
-     * if we have too few, allocate room for more, and copy the old
-     * entries into the new structure
-     */
-    if (self->allocated < num_params) {
-        new_bindings = (ParameterImplClass *)realloc(
-            self->parameters, sizeof(ParameterImplClass) * num_params);
-        if (!new_bindings) {
-            MYLOG(OPENSEARCH_DEBUG,
-                  "unable to create %d new bindings from %d old bindings\n",
-                  num_params, self->allocated);
-
-            if (self->parameters)
-                free(self->parameters);
-            self->parameters = NULL;
-            self->allocated = 0;
-            return;
-        }
-        memset(&new_bindings[self->allocated], 0,
-               sizeof(ParameterImplClass) * (num_params - self->allocated));
-
-        self->parameters = new_bindings;
-        self->allocated = num_params;
-    }
-
-    MYLOG(OPENSEARCH_TRACE, "leaving %p\n", self->parameters);
-}
-
-void reset_a_parameter_binding(APDFields *self, int ipar) {
-    MYLOG(OPENSEARCH_TRACE, "entering ... self=%p, parameters_allocated=%d, ipar=%d\n",
-          self, self->allocated, ipar);
-
-    if (ipar < 1 || ipar > self->allocated)
-        return;
-
-    ipar--;
-    self->parameters[ipar].buflen = 0;
-    self->parameters[ipar].buffer = NULL;
-    self->parameters[ipar].used = self->parameters[ipar].indicator = NULL;
-    self->parameters[ipar].CType = 0;
-    self->parameters[ipar].data_at_exec = FALSE;
-    self->parameters[ipar].precision = 0;
-    self->parameters[ipar].scale = 0;
-}
-
-void reset_a_iparameter_binding(IPDFields *self, int ipar) {
-    MYLOG(OPENSEARCH_TRACE, "entering ... self=%p, parameters_allocated=%d, ipar=%d\n",
-          self, self->allocated, ipar);
-
-    if (ipar < 1 || ipar > self->allocated)
-        return;
-
-    ipar--;
-    NULL_THE_NAME(self->parameters[ipar].paramName);
-    self->parameters[ipar].paramType = 0;
-    self->parameters[ipar].SQLType = 0;
-    self->parameters[ipar].column_size = 0;
-    self->parameters[ipar].decimal_digits = 0;
-    self->parameters[ipar].precision = 0;
-    self->parameters[ipar].scale = 0;
-    PIC_set_opensearch_type(self->parameters[ipar], 0);
-}
-
-int CountParameters(const StatementClass *self, Int2 *inputCount, Int2 *ioCount,
-                    Int2 *outputCount) {
-    IPDFields *ipdopts = SC_get_IPDF(self);
-    int i, num_params, valid_count;
-
-    if (inputCount)
-        *inputCount = 0;
-    if (ioCount)
-        *ioCount = 0;
-    if (outputCount)
-        *outputCount = 0;
-    if (!ipdopts)
-        return -1;
-    num_params = self->num_params;
-    if (ipdopts->allocated < num_params)
-        num_params = ipdopts->allocated;
-    for (i = 0, valid_count = 0; i < num_params; i++) {
-        if (SQL_PARAM_OUTPUT == ipdopts->parameters[i].paramType) {
-            if (outputCount) {
-                (*outputCount)++;
-                valid_count++;
-            }
-        } else if (SQL_PARAM_INPUT_OUTPUT == ipdopts->parameters[i].paramType) {
-            if (ioCount) {
-                (*ioCount)++;
-                valid_count++;
-            }
-        } else if (inputCount) {
-            (*inputCount)++;
-            valid_count++;
-        }
-    }
-    return valid_count;
-}
-
-/*
- *	Free parameters and free the memory.
- */
-void APD_free_params(APDFields *apdopts, char option) {
-    MYLOG(OPENSEARCH_TRACE, "entering self=%p\n", apdopts);
-
-    if (!apdopts->parameters)
-        return;
-
-    if (option == STMT_FREE_PARAMS_ALL) {
-        free(apdopts->parameters);
-        apdopts->parameters = NULL;
-        apdopts->allocated = 0;
-    }
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-}
-
-void PDATA_free_params(PutDataInfo *pdata, char option) {
-    int i;
-
-    MYLOG(OPENSEARCH_TRACE, "entering self=%p\n", pdata);
-
-    if (!pdata->pdata)
-        return;
-
-    for (i = 0; i < pdata->allocated; i++) {
-        if (pdata->pdata[i].EXEC_used) {
-            free(pdata->pdata[i].EXEC_used);
-            pdata->pdata[i].EXEC_used = NULL;
-        }
-        if (pdata->pdata[i].EXEC_buffer) {
-            free(pdata->pdata[i].EXEC_buffer);
-            pdata->pdata[i].EXEC_buffer = NULL;
-        }
-    }
-
-    if (option == STMT_FREE_PARAMS_ALL) {
-        free(pdata->pdata);
-        pdata->pdata = NULL;
-        pdata->allocated = 0;
-    }
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-}
-
-/*
- *	Free parameters and free the memory.
- */
-void IPD_free_params(IPDFields *ipdopts, char option) {
-    MYLOG(OPENSEARCH_TRACE, "entering self=%p\n", ipdopts);
-
-    if (!ipdopts->parameters)
-        return;
-    if (option == STMT_FREE_PARAMS_ALL) {
-        free(ipdopts->parameters);
-        ipdopts->parameters = NULL;
-        ipdopts->allocated = 0;
-    }
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-}
-
-void extend_column_bindings(ARDFields *self, SQLSMALLINT num_columns) {
-    BindInfoClass *new_bindings;
-    SQLSMALLINT i;
-
-    MYLOG(OPENSEARCH_TRACE,
-          "entering ... self=%p, bindings_allocated=%d, num_columns=%d\n", self,
-          self->allocated, num_columns);
-
-    /*
-     * if we have too few, allocate room for more, and copy the old
-     * entries into the new structure
-     */
-    if (self->allocated < num_columns) {
-        new_bindings = create_empty_bindings(num_columns);
-        if (!new_bindings) {
-            MYLOG(OPENSEARCH_DEBUG,
-                  "unable to create %d new bindings from %d old bindings\n",
-                  num_columns, self->allocated);
-
-            if (self->bindings) {
-                free(self->bindings);
-                self->bindings = NULL;
-            }
-            self->allocated = 0;
-            return;
-        }
-
-        if (self->bindings) {
-            for (i = 0; i < self->allocated; i++)
-                new_bindings[i] = self->bindings[i];
-
-            free(self->bindings);
-        }
-
-        self->bindings = new_bindings;
-        self->allocated = num_columns;
-    }
-
-    /*
-     * There is no reason to zero out extra bindings if there are more
-     * than needed.  If an app has allocated extra bindings, let it worry
-     * about it by unbinding those columns.
-     */
-
-    /* SQLBindCol(1..) ... SQLBindCol(10...)   # got 10 bindings */
-    /* SQLExecDirect(...)  # returns 5 cols */
-    /* SQLExecDirect(...)  # returns 10 cols  (now OK) */
-
-    MYLOG(OPENSEARCH_TRACE, "leaving %p\n", self->bindings);
-}
-
-void reset_a_column_binding(ARDFields *self, int icol) {
-    BindInfoClass *bookmark;
-
-    MYLOG(OPENSEARCH_TRACE, "entering ... self=%p, bindings_allocated=%d, icol=%d\n",
-          self, self->allocated, icol);
-
-    if (icol > self->allocated)
-        return;
-
-    /* use zero based col numbers from here out */
-    if (0 == icol) {
-        if (bookmark = self->bookmark, bookmark != NULL) {
-            bookmark->buffer = NULL;
-            bookmark->used = bookmark->indicator = NULL;
-        }
-    } else {
-        icol--;
-
-        /* we have to unbind the column */
-        self->bindings[icol].buflen = 0;
-        self->bindings[icol].buffer = NULL;
-        self->bindings[icol].used = self->bindings[icol].indicator = NULL;
-        self->bindings[icol].returntype = SQL_C_CHAR;
-    }
-}
-
-void ARD_unbind_cols(ARDFields *self, BOOL freeall) {
-    Int2 lf;
-
-    MYLOG(OPENSEARCH_ALL, "freeall=%d allocated=%d bindings=%p\n", freeall,
-          self->allocated, self->bindings);
-    for (lf = 1; lf <= self->allocated; lf++)
-        reset_a_column_binding(self, lf);
-    if (freeall) {
-        if (self->bindings)
-            free(self->bindings);
-        self->bindings = NULL;
-        self->allocated = 0;
-    }
-}
-void GDATA_unbind_cols(GetDataInfo *self, BOOL freeall) {
-    Int2 lf;
-
-    MYLOG(OPENSEARCH_ALL, "freeall=%d allocated=%d gdata=%p\n", freeall,
-          self->allocated, self->gdata);
-    if (self->fdata.ttlbuf) {
-        free(self->fdata.ttlbuf);
-        self->fdata.ttlbuf = NULL;
-    }
-    self->fdata.ttlbuflen = self->fdata.ttlbufused = 0;
-    GETDATA_RESET(self->fdata);
-    for (lf = 1; lf <= self->allocated; lf++)
-        reset_a_getdata_info(self, lf);
-    if (freeall) {
-        if (self->gdata)
-            free(self->gdata);
-        self->gdata = NULL;
-        self->allocated = 0;
-    }
-}
-
-void GetDataInfoInitialize(GetDataInfo *gdata_info) {
-    GETDATA_RESET(gdata_info->fdata);
-    gdata_info->fdata.ttlbuf = NULL;
-    gdata_info->fdata.ttlbuflen = gdata_info->fdata.ttlbufused = 0;
-    gdata_info->allocated = 0;
-    gdata_info->gdata = NULL;
-}
-static GetDataClass *create_empty_gdata(int num_columns) {
-    GetDataClass *new_gdata;
-    int i;
-
-    new_gdata = (GetDataClass *)malloc(num_columns * sizeof(GetDataClass));
-    if (!new_gdata)
-        return NULL;
-    for (i = 0; i < num_columns; i++) {
-        GETDATA_RESET(new_gdata[i]);
-        new_gdata[i].ttlbuf = NULL;
-        new_gdata[i].ttlbuflen = 0;
-        new_gdata[i].ttlbufused = 0;
-    }
-
-    return new_gdata;
-}
-void extend_getdata_info(GetDataInfo *self, SQLSMALLINT num_columns,
-                         BOOL shrink) {
-    GetDataClass *new_gdata;
-
-    MYLOG(OPENSEARCH_TRACE,
-          "entering ... self=%p, gdata_allocated=%d, num_columns=%d\n", self,
-          self->allocated, num_columns);
-
-    /*
-     * if we have too few, allocate room for more, and copy the old
-     * entries into the new structure
-     */
-    if (self->allocated < num_columns) {
-        new_gdata = create_empty_gdata(num_columns);
-        if (!new_gdata) {
-            MYLOG(OPENSEARCH_DEBUG, "unable to create %d new gdata from %d old gdata\n",
-                  num_columns, self->allocated);
-
-            if (self->gdata) {
-                free(self->gdata);
-                self->gdata = NULL;
-            }
-            self->allocated = 0;
-            return;
-        }
-        if (self->gdata) {
-            SQLSMALLINT i;
-
-            for (i = 0; i < self->allocated; i++)
-                new_gdata[i] = self->gdata[i];
-            free(self->gdata);
-        }
-        self->gdata = new_gdata;
-        self->allocated = num_columns;
-    } else if (shrink && self->allocated > num_columns) {
-        int i;
-
-        for (i = self->allocated; i > num_columns; i--)
-            reset_a_getdata_info(self, i);
-        self->allocated = num_columns;
-        if (0 == num_columns) {
-            free(self->gdata);
-            self->gdata = NULL;
-        }
-    }
-
-    /*
-     * There is no reason to zero out extra gdata if there are more
-     * than needed.  If an app has allocated extra gdata, let it worry
-     * about it by unbinding those columns.
-     */
-
-    MYLOG(OPENSEARCH_TRACE, "leaving %p\n", self->gdata);
-}
-void reset_a_getdata_info(GetDataInfo *gdata_info, int icol) {
-    if (icol < 1 || icol > gdata_info->allocated)
-        return;
-    icol--;
-    if (gdata_info->gdata[icol].ttlbuf) {
-        free(gdata_info->gdata[icol].ttlbuf);
-        gdata_info->gdata[icol].ttlbuf = NULL;
-    }
-    gdata_info->gdata[icol].ttlbuflen = gdata_info->gdata[icol].ttlbufused = 0;
-    GETDATA_RESET(gdata_info->gdata[icol]);
-}
-
-void PutDataInfoInitialize(PutDataInfo *pdata_info) {
-    pdata_info->allocated = 0;
-    pdata_info->pdata = NULL;
-}
-void extend_putdata_info(PutDataInfo *self, SQLSMALLINT num_params,
-                         BOOL shrink) {
-    PutDataClass *new_pdata;
-
-    MYLOG(OPENSEARCH_TRACE,
-          "entering ... self=%p, parameters_allocated=%d, num_params=%d\n",
-          self, self->allocated, num_params);
-
-    /*
-     * if we have too few, allocate room for more, and copy the old
-     * entries into the new structure
-     */
-    if (self->allocated < num_params) {
-        if (self->allocated <= 0 && self->pdata) {
-            MYLOG(OPENSEARCH_DEBUG, "??? pdata is not null while allocated == 0\n");
-            self->pdata = NULL;
-        }
-        new_pdata = (PutDataClass *)realloc(self->pdata,
-                                            sizeof(PutDataClass) * num_params);
-        if (!new_pdata) {
-            MYLOG(OPENSEARCH_DEBUG, "unable to create %d new pdata from %d old pdata\n",
-                  num_params, self->allocated);
-
-            self->pdata = NULL;
-            self->allocated = 0;
-            return;
-        }
-        memset(&new_pdata[self->allocated], 0,
-               sizeof(PutDataClass) * (num_params - self->allocated));
-
-        self->pdata = new_pdata;
-        self->allocated = num_params;
-    } else if (shrink && self->allocated > num_params) {
-        int i;
-
-        for (i = self->allocated; i > num_params; i--)
-            reset_a_putdata_info(self, i);
-        self->allocated = num_params;
-        if (0 == num_params) {
-            free(self->pdata);
-            self->pdata = NULL;
-        }
-    }
-
-    MYLOG(OPENSEARCH_TRACE, "leaving %p\n", self->pdata);
-}
-void reset_a_putdata_info(PutDataInfo *pdata_info, int ipar) {
-    if (ipar < 1 || ipar > pdata_info->allocated)
-        return;
-    ipar--;
-    if (pdata_info->pdata[ipar].EXEC_used) {
-        free(pdata_info->pdata[ipar].EXEC_used);
-        pdata_info->pdata[ipar].EXEC_used = NULL;
-    }
-    if (pdata_info->pdata[ipar].EXEC_buffer) {
-        free(pdata_info->pdata[ipar].EXEC_buffer);
-        pdata_info->pdata[ipar].EXEC_buffer = NULL;
-    }
-    pdata_info->pdata[ipar].lobj_oid = 0;
-}
-
-void SC_param_next(const StatementClass *stmt, int *param_number,
-                   ParameterInfoClass **apara, ParameterImplClass **ipara) {
-    int next;
-    IPDFields *ipdopts = SC_get_IPDF(stmt);
-
-    if (*param_number < 0)
-        next = stmt->proc_return;
-    else
-        next = *param_number + 1;
-    if (stmt->discard_output_params) {
-        for (; next < ipdopts->allocated
-               && SQL_PARAM_OUTPUT == ipdopts->parameters[next].paramType;
-             next++)
-            ;
-    }
-    *param_number = next;
-    if (ipara) {
-        if (next < ipdopts->allocated)
-            *ipara = ipdopts->parameters + next;
-        else
-            *ipara = NULL;
-    }
-    if (apara) {
-        APDFields *apdopts = SC_get_APDF(stmt);
-        if (next < apdopts->allocated)
-            *apara = apdopts->parameters + next;
-        else
-            *apara = NULL;
-    }
-}
diff --git a/sql-odbc/src/sqlodbc/bind.h b/sql-odbc/src/sqlodbc/bind.h
deleted file mode 100644
index adcdb66999..0000000000
--- a/sql-odbc/src/sqlodbc/bind.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#ifndef __BIND_H__
-#define __BIND_H__
-
-#include "descriptor.h"
-#include "opensearch_odbc.h"
-
-// C Interface
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * BindInfoClass -- stores information about a bound column
- */
-struct BindInfoClass_ {
-    SQLLEN buflen;          /* size of buffer */
-    char *buffer;           /* pointer to the buffer */
-    SQLLEN *used;           /* used space in the buffer (for strings
-                             * not counting the '\0') */
-    SQLLEN *indicator;      /* indicator == used in many cases ? */
-    SQLSMALLINT returntype; /* kind of conversion to be applied when
-                             * returning (SQL_C_DEFAULT,
-                             * SQL_C_CHAR... etc) */
-    SQLSMALLINT precision;  /* the precision for numeric or timestamp type */
-    SQLSMALLINT scale;      /* the scale for numeric type */
-    /* area for work variables */
-    char dummy_data; /* currently not used */
-};
-
-/* struct for SQLGetData */
-typedef struct {
-    /* for BLOBs which don't hold the data */
-    struct GetBlobDataClass {
-        Int8 data_left64; /* amount of large object data
-                 left to read before conversion */
-    } blob;
-    /* for non-BLOBs which hold the data in ttlbuf after conversion */
-    char *ttlbuf;      /* to save the large result */
-    SQLLEN ttlbuflen;  /* the buffer length */
-    SQLLEN ttlbufused; /* used length of the buffer */
-    SQLLEN data_left;  /* amount of data left to read */
-} GetDataClass;
-#define GETDATA_RESET(gdc) ((gdc).blob.data_left64 = (gdc).data_left = -1)
-
-/*
- * ParameterInfoClass -- stores information about a bound parameter
- */
-struct ParameterInfoClass_ {
-    SQLLEN buflen;
-    char *buffer;
-    SQLLEN *used;
-    SQLLEN *indicator; /* indicator == used in many cases ? */
-    SQLSMALLINT CType;
-    SQLSMALLINT precision; /* the precision for numeric or timestamp type */
-    SQLSMALLINT scale;     /* the scale for numeric type */
-    /* area for work variables */
-    char data_at_exec;
-};
-
-typedef struct {
-    SQLLEN *EXEC_used; /* amount of data */
-    char *EXEC_buffer; /* the data */
-    OID lobj_oid;
-} PutDataClass;
-
-/*
- * ParameterImplClass -- stores implementation information about a parameter
- */
-struct ParameterImplClass_ {
-    opensearchNAME paramName; /* this is unavailable even in 8.1 */
-    SQLSMALLINT paramType;
-    SQLSMALLINT SQLType;
-    OID OpenSearchType;
-    SQLULEN column_size;
-    SQLSMALLINT decimal_digits;
-    SQLSMALLINT precision; /* the precision for numeric or timestamp type */
-    SQLSMALLINT scale;     /* the scale for numeric type */
-};
-
-typedef struct {
-    GetDataClass fdata;
-    SQLSMALLINT allocated;
-    GetDataClass *gdata;
-} GetDataInfo;
-typedef struct {
-    SQLSMALLINT allocated;
-    PutDataClass *pdata;
-} PutDataInfo;
-
-#define PARSE_PARAM_CAST FALSE
-#define EXEC_PARAM_CAST TRUE
-#define SIMPLE_PARAM_CAST TRUE
-
-#define CALC_BOOKMARK_ADDR(book, offset, bind_size, index)             \
-    (book->buffer + offset                                             \
-     + (bind_size > 0                                                  \
-            ? bind_size                                                \
-            : (SQL_C_VARBOOKMARK == book->returntype ? book->buflen    \
-                                                     : sizeof(UInt4))) \
-           * index)
-
-/* Macros to handle opensearch type of parameters */
-#define PIC_get_opensearch_type(pari) ((pari).OpenSearchType)
-#define PIC_set_opensearch_type(pari, type) ((pari).OpenSearchType = (type))
-#define PIC_dsp_opensearch_type(conn, pari) \
-    ((pari).OpenSearchType ? (pari).OpenSearchType : sqltype_to_opensearchtype(conn, (pari).SQLType))
-
-void extend_column_bindings(ARDFields *opts, SQLSMALLINT num_columns);
-void reset_a_column_binding(ARDFields *opts, int icol);
-void extend_parameter_bindings(APDFields *opts, SQLSMALLINT num_params);
-void extend_iparameter_bindings(IPDFields *opts, SQLSMALLINT num_params);
-void reset_a_parameter_binding(APDFields *opts, int ipar);
-void reset_a_iparameter_binding(IPDFields *opts, int ipar);
-int CountParameters(const StatementClass *stmt, Int2 *inCount, Int2 *ioCount,
-                    Int2 *outputCount);
-void GetDataInfoInitialize(GetDataInfo *gdata);
-void extend_getdata_info(GetDataInfo *gdata, SQLSMALLINT num_columns,
-                         BOOL shrink);
-void reset_a_getdata_info(GetDataInfo *gdata, int icol);
-void GDATA_unbind_cols(GetDataInfo *gdata, BOOL freeall);
-void PutDataInfoInitialize(PutDataInfo *pdata);
-void extend_putdata_info(PutDataInfo *pdata, SQLSMALLINT num_params,
-                         BOOL shrink);
-void reset_a_putdata_info(PutDataInfo *pdata, int ipar);
-void PDATA_free_params(PutDataInfo *pdata, char option);
-void SC_param_next(const StatementClass *, int *param_number,
-                   ParameterInfoClass **, ParameterImplClass **);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/sql-odbc/src/sqlodbc/catfunc.h b/sql-odbc/src/sqlodbc/catfunc.h
deleted file mode 100644
index 8378454256..0000000000
--- a/sql-odbc/src/sqlodbc/catfunc.h
+++ /dev/null
@@ -1,220 +0,0 @@
-#ifndef __CATFUNC_H__
-#define __CATFUNC_H__
-
-#include "opensearch_odbc.h"
-
-/*	SQLTables field position	*/
-enum {
-    TABLES_CATALOG_NAME = 0,
-    TABLES_SCHEMA_NAME,
-    TABLES_TABLE_NAME,
-    TABLES_TABLE_TYPE,
-    TABLES_REMARKS,
-    NUM_OF_TABLES_FIELDS
-};
-
-/*	SQLColumns field position	*/
-enum {
-    COLUMNS_CATALOG_NAME = 0,
-    COLUMNS_SCHEMA_NAME,
-    COLUMNS_TABLE_NAME,
-    COLUMNS_COLUMN_NAME,
-    COLUMNS_DATA_TYPE,
-    COLUMNS_TYPE_NAME,
-    COLUMNS_PRECISION,
-    COLUMNS_LENGTH,
-    COLUMNS_SCALE,
-    COLUMNS_RADIX,
-    COLUMNS_NULLABLE,
-    COLUMNS_REMARKS,
-    COLUMNS_COLUMN_DEF /* ODBC 3.0 but always use it */
-    ,
-    COLUMNS_SQL_DATA_TYPE,
-    COLUMNS_SQL_DATETIME_SUB,
-    COLUMNS_CHAR_OCTET_LENGTH,
-    COLUMNS_ORDINAL_POSITION,
-    COLUMNS_IS_NULLABLE,
-    COLUMNS_DISPLAY_SIZE,
-    COLUMNS_FIELD_TYPE,
-    COLUMNS_AUTO_INCREMENT,
-    COLUMNS_PHYSICAL_NUMBER,
-    COLUMNS_TABLE_OID,
-    COLUMNS_BASE_TYPEID,
-    COLUMNS_ATTTYPMOD,
-    COLUMNS_TABLE_INFO,
-    NUM_OF_COLUMNS_FIELDS
-};
-/*	SQLPrimaryKeys field position	*/
-enum {
-    PKS_TABLE_CAT = 0,
-    PKS_TABLE_SCHEM,
-    PKS_TABLE_NAME,
-    PKS_COLUMN_NAME,
-    PKS_KEY_SQ,
-    PKS_PK_NAME,
-    NUM_OF_PKS_FIELDS
-};
-/*	SQLForeignKeys field position	*/
-enum {
-    FKS_PKTABLE_CAT = 0,
-    FKS_PKTABLE_SCHEM,
-    FKS_PKTABLE_NAME,
-    FKS_PKCOLUMN_NAME,
-    FKS_FKTABLE_CAT,
-    FKS_FKTABLE_SCHEM,
-    FKS_FKTABLE_NAME,
-    FKS_FKCOLUMN_NAME,
-    FKS_KEY_SEQ,
-    FKS_UPDATE_RULE,
-    FKS_DELETE_RULE,
-    FKS_FK_NAME,
-    FKS_PK_NAME,
-    FKS_DEFERRABILITY,
-    FKS_TRIGGER_NAME,
-    NUM_OF_FKS_FIELDS
-};
-/* SQLColAttribute */
-enum {
-    COLATTR_DESC_COUNT = -1,
-    COLATTR_DESC_AUTO_UNIQUE_VALUE = 0,
-    COLATTR_DESC_BASE_COLUMN_NAME,
-    COLATTR_DESC_BASE_TABLE_NAME,
-    COLATTR_DESC_CASE_SENSITIVE,
-    COLATTR_DESC_CATALOG_NAME,
-    COLATTR_DESC_CONCISE_TYPE,
-    COLATTR_DESC_DISPLAY_SIZE,
-    COLATTR_DESC_FIXED_PREC_SCALE,
-    COLATTR_DESC_LABEL,
-    COLATTR_DESC_LENGTH,
-    COLATTR_DESC_LITERAL_PREFIX,
-    COLATTR_DESC_LITERAL_SUFFIX,
-    COLATTR_DESC_LOCAL_TYPE_NAME,
-    COLATTR_DESC_NAME,
-    COLATTR_DESC_NULLABLE,
-    COLATTR_DESC_NUM_PREX_RADIX,
-    COLATTR_DESC_OCTET_LENGTH,
-    COLATTR_DESC_PRECISION,
-    COLATTR_DESC_SCALE,
-    COLATTR_DESC_SCHEMA_NAME,
-    COLATTR_DESC_SEARCHABLE,
-    COLATTR_DESC_TABLE_NAME,
-    COLATTR_DESC_TYPE,
-    COLATTR_DESC_TYPE_NAME,
-    COLATTR_DESC_UNNAMED,
-    COLATTR_DESC_UNSIGNED,
-    COLATTR_DESC_UPDATABLE
-};
-
-/*	SQLStatistics field position	*/
-enum {
-    STATS_CATALOG_NAME = 0,
-    STATS_SCHEMA_NAME,
-    STATS_TABLE_NAME,
-    STATS_NON_UNIQUE,
-    STATS_INDEX_QUALIFIER,
-    STATS_INDEX_NAME,
-    STATS_TYPE,
-    STATS_SEQ_IN_INDEX,
-    STATS_COLUMN_NAME,
-    STATS_COLLATION,
-    STATS_CARDINALITY,
-    STATS_PAGES,
-    STATS_FILTER_CONDITION,
-    NUM_OF_STATS_FIELDS
-};
-
-/*	SQLProcedure field position	*/
-enum {
-    PRO_PROCEDURE_CAT = 0,
-    PRO_PROCEDURE_SCHEM,
-    PRO_PROCEDURE_NAME,
-    PRO_NUM_INPUT_PARAMS,
-    PRO_NUM_OUTPUT_PARAMS,
-    PRO_RESULT_SETS,
-    PRO_REMARKS,
-    PRO_PROCEDURE_TYPE,
-    NUM_OF_PRO_FIELDS
-};
-
-/*	SQLProcedureColumns field position	*/
-enum {
-    PROCOLS_PROCEDURE_CAT = 0,
-    PROCOLS_PROCEDURE_SCHEM,
-    PROCOLS_PROCEDURE_NAME,
-    PROCOLS_COLUMN_NAME,
-    PROCOLS_COLUMN_TYPE,
-    PROCOLS_DATA_TYPE,
-    PROCOLS_TYPE_NAME,
-    PROCOLS_COLUMN_SIZE,
-    PROCOLS_BUFFER_LENGTH,
-    PROCOLS_DECIMAL_DIGITS,
-    PROCOLS_NUM_PREC_RADIX,
-    PROCOLS_NULLABLE,
-    PROCOLS_REMARKS,
-    PROCOLS_COLUMN_DEF,
-    PROCOLS_SQL_DATA_TYPE,
-    PROCOLS_SQL_DATETIME_SUB,
-    PROCOLS_CHAR_OCTET_LENGTH,
-    PROCOLS_ORDINAL_POSITION,
-    PROCOLS_IS_NULLABLE,
-    NUM_OF_PROCOLS_FIELDS
-};
-/*	SQLGetTypeInfo field position	*/
-enum {
-    GETTYPE_TYPE_NAME = 0,
-    GETTYPE_DATA_TYPE,
-    GETTYPE_COLUMN_SIZE,
-    GETTYPE_LITERAL_PREFIX,
-    GETTYPE_LITERAL_SUFFIX,
-    GETTYPE_CREATE_PARAMS,
-    GETTYPE_NULLABLE,
-    GETTYPE_CASE_SENSITIVE,
-    GETTYPE_SEARCHABLE,
-    GETTYPE_UNSIGNED_ATTRIBUTE,
-    GETTYPE_FIXED_PREC_SCALE,
-    GETTYPE_AUTO_UNIQUE_VALUE,
-    GETTYPE_LOCAL_TYPE_NAME,
-    GETTYPE_MINIMUM_SCALE,
-    GETTYPE_MAXIMUM_SCALE,
-    GETTYPE_SQL_DATA_TYPE,
-    GETTYPE_SQL_DATETIME_SUB,
-    GETTYPE_NUM_PREC_RADIX,
-    GETTYPE_INTERVAL_PRECISION,
-    NUM_OF_GETTYPE_FIELDS
-};
-/*	SQLSpecialColumns field position	*/
-enum {
-    SPECOLS_SCOPE = 0,
-    SPECOLS_COLUMN_NAME,
-    SPECOLS_DATA_TYPE,
-    SPECOLS_TYPE_NAME,
-    SPECOLS_COLUMN_SIZE,
-    SPECOLS_BUFFER_LENGTH,
-    SPECOLS_DECIMAL_DIGITS,
-    SPECOLS_PSEUDO_COLUMN,
-    NUM_OF_SPECOLS_FIELDS
-};
-/*	SQLColumnPrivileges field position	*/
-enum {
-    COLPRIV_TABLE_CAT = 0,
-    COLPRIV_TABLE_SCHEM,
-    COLPRIV_TABLE_NAME,
-    COLPRIV_COLUMN_NAME,
-    COLPRIV_GRANTOR,
-    COLPRIV_GRANTEE,
-    COLPRIV_PRIVILEGE,
-    COLPRIV_IS_GRANTABLE,
-    NUM_OF_COLPRIV_FIELDS
-};
-/*	SQLTablePrivileges field position	*/
-enum {
-    TABPRIV_TABLE_CAT = 0,
-    TABPRIV_TABLE_SCHEM,
-    TABPRIV_TABLE_NAME,
-    TABPRIV_GRANTOR,
-    TABPRIV_GRANTEE,
-    TABPRIV_PRIVILEGE,
-    TABPRIV_IS_GRANTABLE,
-    NUM_OF_TABPRIV_FIELDS
-};
-#endif /* __CARFUNC_H__ */
diff --git a/sql-odbc/src/sqlodbc/columninfo.c b/sql-odbc/src/sqlodbc/columninfo.c
deleted file mode 100644
index 8c31901b2d..0000000000
--- a/sql-odbc/src/sqlodbc/columninfo.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#include "columninfo.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "opensearch_types.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-
-ColumnInfoClass *CI_Constructor(void) {
-    ColumnInfoClass *rv;
-
-    rv = (ColumnInfoClass *)malloc(sizeof(ColumnInfoClass));
-
-    if (rv) {
-        rv->refcount = 0;
-        rv->num_fields = 0;
-        rv->coli_array = NULL;
-    }
-
-    return rv;
-}
-
-void CI_Destructor(ColumnInfoClass *self) {
-    CI_free_memory(self);
-
-    free(self);
-}
-
-void CI_free_memory(ColumnInfoClass *self) {
-    register Int2 lf;
-    int num_fields = self->num_fields;
-
-    /* Safe to call even if null */
-    self->num_fields = 0;
-    if (self->coli_array) {
-        for (lf = 0; lf < num_fields; lf++) {
-            if (self->coli_array[lf].name) {
-                free(self->coli_array[lf].name);
-                self->coli_array[lf].name = NULL;
-            }
-        }
-        free(self->coli_array);
-        self->coli_array = NULL;
-    }
-}
-
-void CI_set_num_fields(ColumnInfoClass *self, SQLSMALLINT new_num_fields) {
-    CI_free_memory(self); /* always safe to call */
-
-    self->num_fields = new_num_fields;
-
-    self->coli_array =
-        (struct srvr_info *)calloc(sizeof(struct srvr_info), self->num_fields);
-}
-
-void CI_set_field_info(ColumnInfoClass *self, int field_num,
-                       const char *new_name, OID new_adtid, Int2 new_adtsize,
-                       Int4 new_atttypmod, OID new_relid, OID new_attid) {
-    /* check bounds */
-    if ((field_num < 0) || (field_num >= self->num_fields))
-        return;
-
-    /* store the info */
-    self->coli_array[field_num].name = strdup(new_name);
-    self->coli_array[field_num].adtid = new_adtid;
-    self->coli_array[field_num].adtsize = new_adtsize;
-    self->coli_array[field_num].atttypmod = new_atttypmod;
-
-    self->coli_array[field_num].display_size = OPENSEARCH_ADT_UNSET;
-    self->coli_array[field_num].relid = new_relid;
-    self->coli_array[field_num].attid = (short)new_attid;
-}
diff --git a/sql-odbc/src/sqlodbc/columninfo.h b/sql-odbc/src/sqlodbc/columninfo.h
deleted file mode 100644
index 01afe68db4..0000000000
--- a/sql-odbc/src/sqlodbc/columninfo.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef __COLUMNINFO_H__
-#define __COLUMNINFO_H__
-
-#include "opensearch_odbc.h"
-
-struct ColumnInfoClass_ {
-    UInt4 refcount; /* reference count. A ColumnInfo can be shared by
-                     * several qresults. */
-    Int2 num_fields;
-    struct srvr_info {
-        char *name;        /* field name */
-        OID adtid;         /* type oid */
-        Int2 adtsize;      /* type size */
-        Int4 display_size; /* the display size (longest row) */
-        Int4 atttypmod;    /* the length of bpchar/varchar */
-        OID relid;         /* the relation id */
-        Int2 attid;        /* the attribute number */
-    } * coli_array;
-};
-
-#define CI_get_num_fields(self) (self->num_fields)
-#define CI_get_oid(self, col) (self->coli_array[col].adtid)
-#define CI_get_fieldname(self, col) (self->coli_array[col].name)
-#define CI_get_fieldsize(self, col) (self->coli_array[col].adtsize)
-#define CI_get_display_size(self, col) (self->coli_array[col].display_size)
-#define CI_get_atttypmod(self, col) (self->coli_array[col].atttypmod)
-#define CI_get_relid(self, col) (self->coli_array[col].relid)
-#define CI_get_attid(self, col) (self->coli_array[col].attid)
-
-ColumnInfoClass *CI_Constructor(void);
-void CI_Destructor(ColumnInfoClass *self);
-void CI_free_memory(ColumnInfoClass *self);
-
-/* functions for setting up the fields from within the program, */
-/* without reading from a socket */
-void CI_set_num_fields(ColumnInfoClass *self, SQLSMALLINT new_num_fields);
-
-// Used in opensearch_parse_results.cpp
-#ifdef __cplusplus
-extern "C" {
-#endif
-void CI_set_field_info(ColumnInfoClass *self, int field_num,
-                       const char *new_name, OID new_adtid, Int2 new_adtsize,
-                       Int4 atttypmod, OID new_relid, OID new_attid);
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/sql-odbc/src/sqlodbc/connection.c b/sql-odbc/src/sqlodbc/connection.c
deleted file mode 100644
index 597ab12b4d..0000000000
--- a/sql-odbc/src/sqlodbc/connection.c
+++ /dev/null
@@ -1,696 +0,0 @@
-/*	TryEnterCritiaclSection needs the following #define */
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif /* _WIN32_WINNT */
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "opensearch_connection.h"
-#include "misc.h"
-
-/* for htonl */
-#ifdef WIN32
-#include <Winsock2.h>
-#else
-#include <arpa/inet.h>
-#endif
-
-#include "dlg_specific.h"
-#include "environ.h"
-#include "loadlib.h"
-#include "multibyte.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "opensearch_helper.h"
-#include "qresult.h"
-#include "statement.h"
-#ifndef WIN32
-#include <limits.h>
-#endif
-#define SAFE_STR(s) (NULL != (s) ? (s) : "(null)")
-
-#define ELASTIC_MAXIMUM_ID_LEN SHRT_MAX  // Max 16-bit signed int
-#define ELASTIC_TRANSACTION_SUPPORT 0    // Not supported
-#define STMT_INCREMENT                             \
-    16 /* how many statement holders to allocate \ \
-        * at a time */
-
-#define PROTOCOL3_OPTS_MAX 30
-
-RETCODE SQL_API OPENSEARCHAPI_AllocConnect(HENV henv, HDBC *phdbc) {
-    EnvironmentClass *env = (EnvironmentClass *)henv;
-    ConnectionClass *conn;
-    CSTR func = "OPENSEARCHAPI_AllocConnect";
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-
-    conn = CC_Constructor();
-    MYLOG(OPENSEARCH_DEBUG, "**** henv = %p, conn = %p\n", henv, conn);
-
-    if (!conn) {
-        env->errormsg = "Couldn't allocate memory for Connection object.";
-        env->errornumber = ENV_ALLOC_ERROR;
-        *phdbc = SQL_NULL_HDBC;
-        EN_log_error(func, "", env);
-        return SQL_ERROR;
-    }
-
-    if (!EN_add_connection(env, conn)) {
-        env->errormsg = "Maximum number of connections exceeded.";
-        env->errornumber = ENV_ALLOC_ERROR;
-        CC_Destructor(conn);
-        *phdbc = SQL_NULL_HDBC;
-        EN_log_error(func, "", env);
-        return SQL_ERROR;
-    }
-
-    if (phdbc)
-        *phdbc = (HDBC)conn;
-
-    return SQL_SUCCESS;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_Connect(HDBC hdbc, const SQLCHAR *szDSN,
-                              SQLSMALLINT cbDSN, const SQLCHAR *szUID,
-                              SQLSMALLINT cbUID, const SQLCHAR *szAuthStr,
-                              SQLSMALLINT cbAuthStr) {
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-    ConnInfo *ci;
-    CSTR func = "OPENSEARCHAPI_Connect";
-    RETCODE ret = SQL_SUCCESS;
-    char fchar, *tmpstr;
-
-    MYLOG(OPENSEARCH_TRACE, "entering..cbDSN=%hi.\n", cbDSN);
-
-    if (!conn) {
-        CC_log_error(func, "", NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    ci = &conn->connInfo;
-    CC_conninfo_init(ci, INIT_GLOBALS);
-
-    make_string(szDSN, cbDSN, ci->dsn, sizeof(ci->dsn));
-
-    /* get the values for the DSN from the registry */
-    getDSNinfo(ci, NULL);
-
-    logs_on_off(1, ci->drivers.loglevel, ci->drivers.loglevel);
-    /* initialize opensearch_version from connInfo.protocol    */
-    CC_initialize_opensearch_version(conn);
-
-    /*
-     * override values from DSN info with UID and authStr(pwd) This only
-     * occurs if the values are actually there.
-     */
-    fchar = ci->username[0]; /* save the first byte */
-    make_string(szUID, cbUID, ci->username, sizeof(ci->username));
-    if ('\0' == ci->username[0]) /* an empty string is specified */
-        ci->username[0] = fchar; /* restore the original username */
-    tmpstr = make_string(szAuthStr, cbAuthStr, NULL, 0);
-    if (tmpstr) {
-        if (tmpstr[0]) /* non-empty string is specified */
-            STR_TO_NAME(ci->password, tmpstr);
-        free(tmpstr);
-    }
-
-    MYLOG(OPENSEARCH_DEBUG, "conn = %p (DSN='%s', UID='%s', PWD='%s')\n", conn, ci->dsn,
-          ci->username, NAME_IS_VALID(ci->password) ? "xxxxx" : "");
-
-    if ((fchar = CC_connect(conn)) <= 0) {
-        /* Error messages are filled in */
-        CC_log_error(func, "Error on CC_connect", conn);
-        ret = SQL_ERROR;
-    }
-    if (SQL_SUCCESS == ret && 2 == fchar)
-        ret = SQL_SUCCESS_WITH_INFO;
-
-    MYLOG(OPENSEARCH_TRACE, "leaving..%d.\n", ret);
-
-    return ret;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_BrowseConnect(HDBC hdbc, const SQLCHAR *szConnStrIn,
-                                    SQLSMALLINT cbConnStrIn,
-                                    SQLCHAR *szConnStrOut,
-                                    SQLSMALLINT cbConnStrOutMax,
-                                    SQLSMALLINT *pcbConnStrOut) {
-    UNUSED(szConnStrIn, cbConnStrIn, szConnStrOut, cbConnStrOutMax,
-           cbConnStrOutMax, pcbConnStrOut);
-    CSTR func = "OPENSEARCHAPI_BrowseConnect";
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-
-    CC_set_error(conn, CONN_NOT_IMPLEMENTED_ERROR, "Function not implemented",
-                 func);
-    return SQL_ERROR;
-}
-
-/* Drop any hstmts open on hdbc and disconnect from database */
-RETCODE SQL_API OPENSEARCHAPI_Disconnect(HDBC hdbc) {
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-    CSTR func = "OPENSEARCHAPI_Disconnect";
-    RETCODE ret = SQL_SUCCESS;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-
-    if (!conn) {
-        CC_log_error(func, "", NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    if (conn->status == CONN_EXECUTING) {
-        // This should only be possible if transactions are supported, but they
-        // are not. Return an error regardless
-        CC_set_error(conn, CONN_IN_USE, "Connection is currently in use!",
-                     func);
-        return SQL_ERROR;
-    }
-
-    logs_on_off(-1, conn->connInfo.drivers.loglevel,
-                conn->connInfo.drivers.loglevel);
-    MYLOG(OPENSEARCH_DEBUG, "about to CC_cleanup\n");
-
-    /* Close the connection and free statements */
-    ret = CC_cleanup(conn, FALSE);
-
-    MYLOG(OPENSEARCH_DEBUG, "done CC_cleanup\n");
-    MYLOG(OPENSEARCH_TRACE, "leaving...\n");
-
-    return ret;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_FreeConnect(HDBC hdbc) {
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-    CSTR func = "OPENSEARCHAPI_FreeConnect";
-    EnvironmentClass *env;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...hdbc=%p\n", hdbc);
-
-    if (!conn) {
-        CC_log_error(func, "", NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    /* Remove the connection from the environment */
-    if (NULL != (env = CC_get_env(conn)) && !EN_remove_connection(env, conn)) {
-        // This should only be possible if transactions are supported, but they
-        // are not. Return an error regardless
-        CC_set_error(conn, CONN_IN_USE, "Connection is currently in use!",
-                     func);
-        return SQL_ERROR;
-    }
-
-    CC_Destructor(conn);
-
-    MYLOG(OPENSEARCH_TRACE, "leaving...\n");
-
-    return SQL_SUCCESS;
-}
-
-/*
- *		IMPLEMENTATION CONNECTION CLASS
- */
-
-static void reset_current_schema(ConnectionClass *self) {
-    if (self->current_schema) {
-        free(self->current_schema);
-        self->current_schema = NULL;
-    }
-    self->current_schema_valid = FALSE;
-}
-
-static ConnectionClass *CC_alloc(void) {
-    return (ConnectionClass *)calloc(sizeof(ConnectionClass), 1);
-}
-
-static void CC_lockinit(ConnectionClass *self) {
-    UNUSED(self);
-    INIT_CONNLOCK(self);
-    INIT_CONN_CS(self);
-}
-
-static ConnectionClass *CC_initialize(ConnectionClass *rv, BOOL lockinit) {
-    size_t clear_size;
-
-    clear_size = (char *)&(rv->cs) - (char *)rv;
-
-    memset(rv, 0, clear_size);
-    rv->status = CONN_NOT_CONNECTED;
-    rv->transact_status = CONN_IN_AUTOCOMMIT; /* autocommit by default */
-    rv->unnamed_prepared_stmt = NULL;
-
-    rv->stmts =
-        (StatementClass **)malloc(sizeof(StatementClass *) * STMT_INCREMENT);
-    if (!rv->stmts)
-        goto cleanup;
-    memset(rv->stmts, 0, sizeof(StatementClass *) * STMT_INCREMENT);
-
-    rv->num_stmts = STMT_INCREMENT;
-    rv->descs =
-        (DescriptorClass **)malloc(sizeof(DescriptorClass *) * STMT_INCREMENT);
-    if (!rv->descs)
-        goto cleanup;
-    memset(rv->descs, 0, sizeof(DescriptorClass *) * STMT_INCREMENT);
-
-    rv->num_descs = STMT_INCREMENT;
-
-    rv->lobj_type = OPENSEARCH_TYPE_LO_UNDEFINED;
-    if (isMsAccess())
-        rv->ms_jet = 1;
-    rv->isolation = 0;  // means initially unknown server's default isolation
-    rv->mb_maxbyte_per_char = 1;
-    rv->max_identifier_length = ELASTIC_MAXIMUM_ID_LEN;
-    rv->autocommit_public = SQL_AUTOCOMMIT_ON;
-
-    /* Initialize statement options to defaults */
-    /* Statements under this conn will inherit these options */
-
-    InitializeStatementOptions(&rv->stmtOptions);
-    InitializeARDFields(&rv->ardOptions);
-    InitializeAPDFields(&rv->apdOptions);
-#ifdef _HANDLE_ENLIST_IN_DTC_
-    rv->asdum = NULL;
-    rv->gTranInfo = 0;
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
-    if (lockinit)
-        CC_lockinit(rv);
-
-    return rv;
-
-cleanup:
-    CC_Destructor(rv);
-    return NULL;
-}
-
-ConnectionClass *CC_Constructor() {
-    ConnectionClass *rv, *retrv = NULL;
-
-    if (rv = CC_alloc(), NULL != rv)
-        retrv = CC_initialize(rv, TRUE);
-    return retrv;
-}
-
-char CC_Destructor(ConnectionClass *self) {
-    MYLOG(OPENSEARCH_TRACE, "entering self=%p\n", self);
-
-    if (self->status == CONN_EXECUTING)
-        return 0;
-
-    CC_cleanup(self, FALSE); /* cleanup socket and statements */
-
-    MYLOG(OPENSEARCH_DEBUG, "after CC_Cleanup\n");
-
-    /* Free up statement holders */
-    if (self->stmts) {
-        free(self->stmts);
-        self->stmts = NULL;
-    }
-    if (self->descs) {
-        free(self->descs);
-        self->descs = NULL;
-    }
-    MYLOG(OPENSEARCH_DEBUG, "after free statement holders\n");
-
-    NULL_THE_NAME(self->schemaIns);
-    NULL_THE_NAME(self->tableIns);
-    CC_conninfo_release(&self->connInfo);
-    if (self->__error_message)
-        free(self->__error_message);
-    DELETE_CONN_CS(self);
-    DELETE_CONNLOCK(self);
-    free(self);
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-
-    return 1;
-}
-
-void CC_clear_error(ConnectionClass *self) {
-    if (!self)
-        return;
-    CONNLOCK_ACQUIRE(self);
-    self->__error_number = 0;
-    if (self->__error_message) {
-        free(self->__error_message);
-        self->__error_message = NULL;
-    }
-    self->sqlstate[0] = '\0';
-    CONNLOCK_RELEASE(self);
-}
-
-/* This is called by SQLSetConnectOption etc also */
-BOOL CC_set_autocommit(ConnectionClass *self, BOOL on) {
-    BOOL currsts = CC_is_in_autocommit(self);
-
-    if ((on && currsts) || (!on && !currsts))
-        return on;
-    MYLOG(OPENSEARCH_DEBUG, " %d->%d\n", currsts, on);
-    if (on)
-        self->transact_status |= CONN_IN_AUTOCOMMIT;
-    else
-        self->transact_status &= ~CONN_IN_AUTOCOMMIT;
-
-    return on;
-}
-
-/* Clear cached table info */
-static void CC_clear_col_info(ConnectionClass *self, BOOL destroy) {
-    if (self->col_info) {
-        int i;
-        COL_INFO *coli;
-
-        for (i = 0; i < self->ntables; i++) {
-            if (coli = self->col_info[i], NULL != coli) {
-                if (destroy || coli->refcnt == 0) {
-                    free_col_info_contents(coli);
-                    free(coli);
-                    self->col_info[i] = NULL;
-                } else
-                    coli->acc_time = 0;
-            }
-        }
-        self->ntables = 0;
-        if (destroy) {
-            free(self->col_info);
-            self->col_info = NULL;
-            self->coli_allocated = 0;
-        }
-    }
-}
-
-/* This is called by SQLDisconnect also */
-RETCODE
-CC_cleanup(ConnectionClass *self, BOOL keepCommunication) {
-    int i;
-    StatementClass *stmt;
-    DescriptorClass *desc;
-    RETCODE ret = SQL_SUCCESS;
-    CSTR func = "CC_cleanup";
-
-    if (self->status == CONN_EXECUTING)
-        return FALSE;
-
-    MYLOG(OPENSEARCH_TRACE, "entering self=%p\n", self);
-
-    ENTER_CONN_CS(self);
-    /* Cancel an ongoing transaction */
-    /* We are always in the middle of a transaction, */
-    /* even if we are in auto commit. */
-    if (self->opensearchconn) {
-        QLOG(0, "LIBOPENSEARCH_disconnect: %p\n", self->opensearchconn);
-        LIBOPENSEARCH_disconnect(self->opensearchconn);
-        self->opensearchconn = NULL;
-    } else {
-        ret = SQL_ERROR;
-        CC_set_error(self, CC_not_connected(self), "Connection not open", func);
-    }
-
-    MYLOG(OPENSEARCH_DEBUG, "after LIBOPENSEARCH_disconnect\n");
-
-    /* Free all the stmts on this connection */
-    for (i = 0; i < self->num_stmts; i++) {
-        stmt = self->stmts[i];
-        if (stmt) {
-            stmt->hdbc = NULL; /* prevent any more dbase interactions */
-
-            SC_Destructor(stmt);
-
-            self->stmts[i] = NULL;
-        }
-    }
-    /* Free all the descs on this connection */
-    for (i = 0; i < self->num_descs; i++) {
-        desc = self->descs[i];
-        if (desc) {
-            DC_get_conn(desc) = NULL; /* prevent any more dbase interactions */
-            DC_Destructor(desc);
-            free(desc);
-            self->descs[i] = NULL;
-        }
-    }
-
-    /* Check for translation dll */
-#ifdef WIN32
-    if (!keepCommunication && self->translation_handle) {
-        FreeLibrary(self->translation_handle);
-        self->translation_handle = NULL;
-    }
-#endif
-
-    if (!keepCommunication) {
-        self->status = CONN_NOT_CONNECTED;
-        self->transact_status = CONN_IN_AUTOCOMMIT;
-        self->unnamed_prepared_stmt = NULL;
-    }
-    if (!keepCommunication) {
-        CC_conninfo_init(&(self->connInfo), CLEANUP_FOR_REUSE);
-        if (self->original_client_encoding) {
-            free(self->original_client_encoding);
-            self->original_client_encoding = NULL;
-        }
-        if (self->locale_encoding) {
-            free(self->locale_encoding);
-            self->locale_encoding = NULL;
-        }
-        if (self->server_encoding) {
-            free(self->server_encoding);
-            self->server_encoding = NULL;
-        }
-        reset_current_schema(self);
-    }
-    /* Free cached table info */
-    CC_clear_col_info(self, TRUE);
-    if (self->num_discardp > 0 && self->discardp) {
-        for (i = 0; i < self->num_discardp; i++)
-            free(self->discardp[i]);
-        self->num_discardp = 0;
-    }
-    if (self->discardp) {
-        free(self->discardp);
-        self->discardp = NULL;
-    }
-
-    LEAVE_CONN_CS(self);
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-    return ret;
-}
-
-#ifndef OPENSEARCH_DIAG_SEVERITY_NONLOCALIZED
-#define OPENSEARCH_DIAG_SEVERITY_NONLOCALIZED 'V'
-#endif
-
-#define TRANSACTION_ISOLATION "transaction_isolation"
-#define ISOLATION_SHOW_QUERY "show " TRANSACTION_ISOLATION
-
-char CC_add_statement(ConnectionClass *self, StatementClass *stmt) {
-    int i;
-    char ret = TRUE;
-
-    MYLOG(OPENSEARCH_DEBUG, "self=%p, stmt=%p\n", self, stmt);
-
-    CONNLOCK_ACQUIRE(self);
-    for (i = 0; i < self->num_stmts; i++) {
-        if (!self->stmts[i]) {
-            stmt->hdbc = self;
-            self->stmts[i] = stmt;
-            break;
-        }
-    }
-
-    if (i >= self->num_stmts) /* no more room -- allocate more memory */
-    {
-        StatementClass **newstmts;
-        Int2 new_num_stmts;
-
-        new_num_stmts = STMT_INCREMENT + self->num_stmts;
-
-        if (new_num_stmts > 0)
-            newstmts = (StatementClass **)realloc(
-                self->stmts, sizeof(StatementClass *) * new_num_stmts);
-        else
-            newstmts = NULL; /* num_stmts overflowed */
-        if (!newstmts)
-            ret = FALSE;
-        else {
-            self->stmts = newstmts;
-            memset(&self->stmts[self->num_stmts], 0,
-                   sizeof(StatementClass *) * STMT_INCREMENT);
-
-            stmt->hdbc = self;
-            self->stmts[self->num_stmts] = stmt;
-
-            self->num_stmts = new_num_stmts;
-        }
-    }
-    CONNLOCK_RELEASE(self);
-
-    return ret;
-}
-
-static void CC_set_error_statements(ConnectionClass *self) {
-    int i;
-
-    MYLOG(OPENSEARCH_TRACE, "entering self=%p\n", self);
-
-    for (i = 0; i < self->num_stmts; i++) {
-        if (NULL != self->stmts[i])
-            SC_ref_CC_error(self->stmts[i]);
-    }
-}
-
-char CC_remove_statement(ConnectionClass *self, StatementClass *stmt) {
-    int i;
-    char ret = FALSE;
-
-    CONNLOCK_ACQUIRE(self);
-    for (i = 0; i < self->num_stmts; i++) {
-        if (self->stmts[i] == stmt && stmt->status != STMT_EXECUTING) {
-            self->stmts[i] = NULL;
-            ret = TRUE;
-            break;
-        }
-    }
-    CONNLOCK_RELEASE(self);
-
-    return ret;
-}
-
-char CC_get_escape(const ConnectionClass *self) {
-    UNUSED(self);
-    return ESCAPE_IN_LITERAL;
-}
-
-int CC_get_max_idlen(ConnectionClass *self) {
-    UNUSED(self);
-    return self->max_identifier_length;
-}
-
-SQLUINTEGER CC_get_isolation(ConnectionClass *self) {
-    UNUSED(self);
-    return ELASTIC_TRANSACTION_SUPPORT;
-}
-
-void CC_set_error(ConnectionClass *self, int number, const char *message,
-                  const char *func) {
-    CONNLOCK_ACQUIRE(self);
-    if (self->__error_message)
-        free(self->__error_message);
-    self->__error_number = number;
-    self->__error_message = message ? strdup(message) : NULL;
-    if (0 != number)
-        CC_set_error_statements(self);
-    if (func && number != 0)
-        CC_log_error(func, "", self);
-    CONNLOCK_RELEASE(self);
-}
-
-void CC_set_errormsg(ConnectionClass *self, const char *message) {
-    CONNLOCK_ACQUIRE(self);
-    if (self->__error_message)
-        free(self->__error_message);
-    self->__error_message = message ? strdup(message) : NULL;
-    CONNLOCK_RELEASE(self);
-}
-
-int CC_get_error(ConnectionClass *self, int *number, char **message) {
-    int rv;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-
-    CONNLOCK_ACQUIRE(self);
-
-    if (CC_get_errornumber(self)) {
-        *number = CC_get_errornumber(self);
-        *message = CC_get_errormsg(self);
-    }
-    rv = (CC_get_errornumber(self) != 0);
-
-    CONNLOCK_RELEASE(self);
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-
-    return rv;
-}
-void CC_log_error(const char *func, const char *desc,
-                  const ConnectionClass *self) {
-#define NULLCHECK(a) (a ? a : "(NULL)")
-
-    if (self) {
-        MYLOG(OPENSEARCH_ERROR,
-              "CONN ERROR: func=%s, desc='%s', errnum=%d, errmsg='%s'\n", func,
-              desc, self->__error_number, NULLCHECK(self->__error_message));
-        MYLOG(OPENSEARCH_ERROR,
-              "            "
-              "------------------------------------------------------------\n");
-        MYLOG(OPENSEARCH_ERROR,
-              "            henv=%p, conn=%p, status=%u, num_stmts=%d\n",
-              self->henv, self, self->status, self->num_stmts);
-        MYLOG(OPENSEARCH_ERROR, "            opensearchconn=%p, stmts=%p, lobj_type=%d\n",
-              self->opensearchconn, self->stmts, self->lobj_type);
-    } else {
-        MYLOG(OPENSEARCH_ERROR, "INVALID CONNECTION HANDLE ERROR: func=%s, desc='%s'\n",
-              func, desc);
-    }
-}
-
-const char *CurrCat(const ConnectionClass *conn) {
-    UNUSED(conn);
-    return NULL;
-}
-
-const char *CurrCatString(const ConnectionClass *conn) {
-    const char *cat = CurrCat(conn);
-
-    if (!cat)
-        cat = NULL_STRING;
-    return cat;
-}
-
-/*------
- *	Create a null terminated lower-case string if the
- *	original string contains upper-case characters.
- *	The SQL_NTS length is considered.
- *------
- */
-SQLCHAR *make_lstring_ifneeded(ConnectionClass *conn, const SQLCHAR *s,
-                               ssize_t len, BOOL ifallupper) {
-    ssize_t length = len;
-    char *str = NULL;
-    const char *ccs = (const char *)s;
-
-    if (s && (len > 0 || (len == SQL_NTS && (length = strlen(ccs)) > 0))) {
-        int i;
-        int tchar;
-        encoded_str encstr;
-
-        make_encoded_str(&encstr, conn, ccs);
-        for (i = 0; i < length; i++) {
-            tchar = encoded_nextchar(&encstr);
-            if (MBCS_NON_ASCII(encstr))
-                continue;
-            if (ifallupper && islower(tchar)) {
-                if (str) {
-                    free(str);
-                    str = NULL;
-                }
-                break;
-            }
-            if (tolower(tchar) != tchar) {
-                if (!str) {
-                    str = malloc(length + 1);
-                    if (!str)
-                        return NULL;
-                    memcpy(str, s, length);
-                    str[length] = '\0';
-                }
-                str[i] = (char)tolower(tchar);
-            }
-        }
-    }
-
-    return (SQLCHAR *)str;
-}
diff --git a/sql-odbc/src/sqlodbc/convert.c b/sql-odbc/src/sqlodbc/convert.c
deleted file mode 100644
index 8cc686aaed..0000000000
--- a/sql-odbc/src/sqlodbc/convert.c
+++ /dev/null
@@ -1,2282 +0,0 @@
-#include "convert.h"
-
-#include "misc.h"
-#include "unicode_support.h"
-#ifdef WIN32
-#include <float.h>
-#define HAVE_LOCALE_H
-#endif /* WIN32 */
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#include "multibyte.h"
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-#include <limits.h>
-#include <math.h>
-#include <stdlib.h>
-
-#include "bind.h"
-#include "catfunc.h"
-#include "opensearch_types.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "qresult.h"
-#include "statement.h"
-
-CSTR NAN_STRING = "NaN";
-CSTR INFINITY_STRING = "Infinity";
-CSTR MINFINITY_STRING = "-Infinity";
-
-#if defined(WIN32) || defined(__CYGWIN__)
-#define TIMEZONE_GLOBAL _timezone
-#define TZNAME_GLOBAL _tzname
-#define DAYLIGHT_GLOBAL _daylight
-#elif defined(HAVE_INT_TIMEZONE)
-#define TIMEZONE_GLOBAL timezone
-#define TZNAME_GLOBAL tzname
-#define DAYLIGHT_GLOBAL daylight
-#endif
-
-typedef struct {
-    int infinity;
-    int m;
-    int d;
-    int y;
-    int hh;
-    int mm;
-    int ss;
-    int fr;
-} SIMPLE_TIME;
-
-static BOOL convert_money(const char *s, char *sout, size_t soutmax);
-size_t convert_linefeeds(const char *s, char *dst, size_t max, BOOL convlf,
-                         BOOL *changed);
-static size_t convert_from_opensearchbinary(const char *value, char *rgbValue,
-                                    SQLLEN cbValueMax);
-static int convert_lo(StatementClass *stmt, const void *value,
-                      SQLSMALLINT fCType, PTR rgbValue, SQLLEN cbValueMax,
-                      SQLLEN *pcbValue);
-static int conv_from_octal(const char *s);
-static SQLLEN opensearch_bin2hex(const char *src, char *dst, SQLLEN length);
-#ifdef UNICODE_SUPPORT
-static SQLLEN es_bin2whex(const char *src, SQLWCHAR *dst, SQLLEN length);
-#endif /* UNICODE_SUPPORT */
-
-/*---------
- *			A Guide for date/time/timestamp conversions
- *
- *			field_type		fCType				Output
- *			----------		------				----------
- *			OPENSEARCH_TYPE_DATE	SQL_C_DEFAULT		SQL_C_DATE
- *			OPENSEARCH_TYPE_DATE	SQL_C_DATE			SQL_C_DATE
- *			OPENSEARCH_TYPE_DATE	SQL_C_TIMESTAMP		SQL_C_TIMESTAMP		(time = 0
- *(midnight)) OPENSEARCH_TYPE_TIME	SQL_C_DEFAULT		SQL_C_TIME OPENSEARCH_TYPE_TIME
- *SQL_C_TIME			SQL_C_TIME
- *			OPENSEARCH_TYPE_TIME	SQL_C_TIMESTAMP		SQL_C_TIMESTAMP		(date =
- *current date) OPENSEARCH_TYPE_ABSTIME SQL_C_DEFAULT		SQL_C_TIMESTAMP
- *OPENSEARCH_TYPE_ABSTIME SQL_C_DATE			SQL_C_DATE			(time is truncated)
- *OPENSEARCH_TYPE_ABSTIME SQL_C_TIME			SQL_C_TIME			(date is truncated)
- *OPENSEARCH_TYPE_ABSTIME SQL_C_TIMESTAMP		SQL_C_TIMESTAMP
- *---------
- */
-
-/*
- *	Macros for unsigned long handling.
- */
-#ifdef WIN32
-#define ATOI32U(val) strtoul(val, NULL, 10)
-#elif defined(HAVE_STRTOUL)
-#define ATOI32U(val) strtoul(val, NULL, 10)
-#else /* HAVE_STRTOUL */
-#define ATOI32U atol
-#endif /* WIN32 */
-
-/*
- *	Macros for BIGINT handling.
- */
-#ifdef ODBCINT64
-#ifdef WIN32
-#define ATOI64(val) _strtoi64(val, NULL, 10)
-#define ATOI64U(val) _strtoui64(val, NULL, 10)
-#elif (SIZEOF_LONG == 8)
-#define ATOI64(val) strtol(val, NULL, 10)
-#define ATOI64U(val) strtoul(val, NULL, 10)
-#else
-#if defined(HAVE_STRTOLL)
-#define ATOI64(val) strtoll(val, NULL, 10)
-#define ATOI64U(val) strtoull(val, NULL, 10)
-#else
-static ODBCINT64 ATOI64(const char *val) {
-    ODBCINT64 ll;
-    sscanf(val, "%lld", &ll);
-    return ll;
-}
-static unsigned ODBCINT64 ATOI64U(const char *val) {
-    unsigned ODBCINT64 ll;
-    sscanf(val, "%llu", &ll);
-    return ll;
-}
-#endif /* HAVE_STRTOLL */
-#endif /* WIN32 */
-#endif /* ODBCINT64 */
-
-static void parse_to_numeric_struct(const char *wv, SQL_NUMERIC_STRUCT *ns,
-                                    BOOL *overflow);
-
-/*
- *	TIMESTAMP <-----> SIMPLE_TIME
- *		precision support since 7.2.
- *		time zone support is unavailable(the stuff is unreliable)
- */
-static BOOL timestamp2stime(const char *str, SIMPLE_TIME *st, BOOL *bZone,
-                            int *zone) {
-    char rest[64], bc[16], *ptr;
-    int scnt, i;
-    int y, m, d, hh, mm, ss;
-#ifdef TIMEZONE_GLOBAL
-    long timediff;
-#endif
-    BOOL withZone = *bZone;
-
-    *bZone = FALSE;
-    *zone = 0;
-    st->fr = 0;
-    st->infinity = 0;
-    rest[0] = '\0';
-    bc[0] = '\0';
-    if ((scnt = sscanf(str, "%4d-%2d-%2d %2d:%2d:%2d%31s %15s", &y, &m, &d, &hh,
-                       &mm, &ss, rest, bc))
-        < 6) {
-        if (scnt == 3) /* date */
-        {
-            st->y = y;
-            st->m = m;
-            st->d = d;
-            st->hh = 0;
-            st->mm = 0;
-            st->ss = 0;
-            return TRUE;
-        }
-        if ((scnt =
-                 sscanf(str, "%2d:%2d:%2d%31s %15s", &hh, &mm, &ss, rest, bc))
-            < 3)
-            return FALSE;
-        else {
-            st->hh = hh;
-            st->mm = mm;
-            st->ss = ss;
-            if (scnt == 3) /* time */
-                return TRUE;
-        }
-    } else {
-        st->y = y;
-        st->m = m;
-        st->d = d;
-        st->hh = hh;
-        st->mm = mm;
-        st->ss = ss;
-        if (scnt == 6)
-            return TRUE;
-    }
-    switch (rest[0]) {
-        case '+':
-            *bZone = TRUE;
-            *zone = atoi(&rest[1]);
-            break;
-        case '-':
-            *bZone = TRUE;
-            *zone = -atoi(&rest[1]);
-            break;
-        case '.':
-            if ((ptr = strchr(rest, '+')) != NULL) {
-                *bZone = TRUE;
-                *zone = atoi(&ptr[1]);
-                *ptr = '\0';
-            } else if ((ptr = strchr(rest, '-')) != NULL) {
-                *bZone = TRUE;
-                *zone = -atoi(&ptr[1]);
-                *ptr = '\0';
-            }
-            for (i = 1; i < 10; i++) {
-                if (!isdigit((UCHAR)rest[i]))
-                    break;
-            }
-            for (; i < 10; i++)
-                rest[i] = '0';
-            rest[i] = '\0';
-            st->fr = atoi(&rest[1]);
-            break;
-        case 'B':
-            if (stricmp(rest, "BC") == 0)
-                st->y *= -1;
-            return TRUE;
-        default:
-            return TRUE;
-    }
-    if (stricmp(bc, "BC") == 0) {
-        st->y *= -1;
-    }
-    if (!withZone || !*bZone || st->y < 1970)
-        return TRUE;
-#ifdef TIMEZONE_GLOBAL
-    if (!TZNAME_GLOBAL[0] || !TZNAME_GLOBAL[0][0]) {
-        *bZone = FALSE;
-        return TRUE;
-    }
-    timediff = TIMEZONE_GLOBAL + (*zone) * 3600;
-    if (!DAYLIGHT_GLOBAL && timediff == 0) /* the same timezone */
-        return TRUE;
-    else {
-        struct tm tm, *tm2;
-        time_t time0;
-
-        *bZone = FALSE;
-        tm.tm_year = st->y - 1900;
-        tm.tm_mon = st->m - 1;
-        tm.tm_mday = st->d;
-        tm.tm_hour = st->hh;
-        tm.tm_min = st->mm;
-        tm.tm_sec = st->ss;
-        tm.tm_isdst = -1;
-        time0 = mktime(&tm);
-        if (time0 < 0)
-            return TRUE;
-        if (tm.tm_isdst > 0)
-            timediff -= 3600;
-        if (timediff == 0) /* the same time zone */
-            return TRUE;
-        time0 -= timediff;
-#ifdef HAVE_LOCALTIME_R
-        if (time0 >= 0 && (tm2 = localtime_r(&time0, &tm)) != NULL)
-#else
-        if (time0 >= 0 && (tm2 = localtime(&time0)) != NULL)
-#endif /* HAVE_LOCALTIME_R */
-        {
-            st->y = tm2->tm_year + 1900;
-            st->m = tm2->tm_mon + 1;
-            st->d = tm2->tm_mday;
-            st->hh = tm2->tm_hour;
-            st->mm = tm2->tm_min;
-            st->ss = tm2->tm_sec;
-            *bZone = TRUE;
-        }
-    }
-#endif /* TIMEZONE_GLOBAL */
-    return TRUE;
-}
-
-static int stime2timestamp(const SIMPLE_TIME *st, char *str, size_t bufsize,
-                           BOOL bZone, int precision) {
-    UNUSED(bZone);
-    char precstr[16], zonestr[16];
-    int i;
-
-    precstr[0] = '\0';
-    if (st->infinity > 0) {
-        return snprintf(str, bufsize, "%s", INFINITY_STRING);
-    } else if (st->infinity < 0) {
-        return snprintf(str, bufsize, "%s", MINFINITY_STRING);
-    }
-    if (precision > 0 && st->fr) {
-        SPRINTF_FIXED(precstr, ".%09d", st->fr);
-        if (precision < 9)
-            precstr[precision + 1] = '\0';
-        else if (precision > 9)
-            precision = 9;
-        for (i = precision; i > 0; i--) {
-            if (precstr[i] != '0')
-                break;
-            precstr[i] = '\0';
-        }
-        if (i == 0)
-            precstr[i] = '\0';
-    }
-    zonestr[0] = '\0';
-#ifdef TIMEZONE_GLOBAL
-    if (bZone && TZNAME_GLOBAL[0] && TZNAME_GLOBAL[0][0] && st->y >= 1970) {
-        long zoneint;
-        struct tm tm;
-        time_t time0;
-
-        zoneint = TIMEZONE_GLOBAL;
-        if (DAYLIGHT_GLOBAL && st->y >= 1900) {
-            tm.tm_year = st->y - 1900;
-            tm.tm_mon = st->m - 1;
-            tm.tm_mday = st->d;
-            tm.tm_hour = st->hh;
-            tm.tm_min = st->mm;
-            tm.tm_sec = st->ss;
-            tm.tm_isdst = -1;
-            time0 = mktime(&tm);
-            if (time0 >= 0 && tm.tm_isdst > 0)
-                zoneint -= 3600;
-        }
-        if (zoneint > 0)
-            SPRINTF_FIXED(zonestr, "-%02d", (int)zoneint / 3600);
-        else
-            SPRINTF_FIXED(zonestr, "+%02d", -(int)zoneint / 3600);
-    }
-#endif /* TIMEZONE_GLOBAL */
-    if (st->y < 0)
-        return snprintf(str, bufsize, "%.4d-%.2d-%.2d %.2d:%.2d:%.2d%s%s BC",
-                        -st->y, st->m, st->d, st->hh, st->mm, st->ss, precstr,
-                        zonestr);
-    else
-        return snprintf(str, bufsize, "%.4d-%.2d-%.2d %.2d:%.2d:%.2d%s%s",
-                        st->y, st->m, st->d, st->hh, st->mm, st->ss, precstr,
-                        zonestr);
-}
-
-static SQLINTERVAL interval2itype(SQLSMALLINT ctype) {
-    SQLINTERVAL sqlitv = 0;
-
-    switch (ctype) {
-        case SQL_C_INTERVAL_YEAR:
-            sqlitv = SQL_IS_YEAR;
-            break;
-        case SQL_C_INTERVAL_MONTH:
-            sqlitv = SQL_IS_MONTH;
-            break;
-        case SQL_C_INTERVAL_YEAR_TO_MONTH:
-            sqlitv = SQL_IS_YEAR_TO_MONTH;
-            break;
-        case SQL_C_INTERVAL_DAY:
-            sqlitv = SQL_IS_DAY;
-            break;
-        case SQL_C_INTERVAL_HOUR:
-            sqlitv = SQL_IS_HOUR;
-            break;
-        case SQL_C_INTERVAL_DAY_TO_HOUR:
-            sqlitv = SQL_IS_DAY_TO_HOUR;
-            break;
-        case SQL_C_INTERVAL_MINUTE:
-            sqlitv = SQL_IS_MINUTE;
-            break;
-        case SQL_C_INTERVAL_DAY_TO_MINUTE:
-            sqlitv = SQL_IS_DAY_TO_MINUTE;
-            break;
-        case SQL_C_INTERVAL_HOUR_TO_MINUTE:
-            sqlitv = SQL_IS_HOUR_TO_MINUTE;
-            break;
-        case SQL_C_INTERVAL_SECOND:
-            sqlitv = SQL_IS_SECOND;
-            break;
-        case SQL_C_INTERVAL_DAY_TO_SECOND:
-            sqlitv = SQL_IS_DAY_TO_SECOND;
-            break;
-        case SQL_C_INTERVAL_HOUR_TO_SECOND:
-            sqlitv = SQL_IS_HOUR_TO_SECOND;
-            break;
-        case SQL_C_INTERVAL_MINUTE_TO_SECOND:
-            sqlitv = SQL_IS_MINUTE_TO_SECOND;
-            break;
-    }
-    return sqlitv;
-}
-
-/*
- *	Interval data <-----> SQL_INTERVAL_STRUCT
- */
-
-static int getPrecisionPart(int precision, const char *precPart) {
-    char fraction[] = "000000000";
-    size_t fracs = (size_t)(sizeof(fraction) - 1);
-    size_t cpys;
-
-    if (precision < 0)
-        precision = 6; /* default */
-    if (precision == 0)
-        return 0;
-    cpys = strlen(precPart);
-    if (cpys > fracs)
-        cpys = fracs;
-    memcpy(fraction, precPart, cpys);
-    fraction[precision] = '\0';
-
-    return atoi(fraction);
-}
-
-static BOOL interval2istruct(SQLSMALLINT ctype, int precision, const char *str,
-                             SQL_INTERVAL_STRUCT *st) {
-    char lit1[64], lit2[64];
-    int scnt, years, mons, days, hours, minutes, seconds;
-    SQLSMALLINT sign;
-    SQLINTERVAL itype = interval2itype(ctype);
-
-    memset(st, 0, sizeof(SQL_INTERVAL_STRUCT));
-    if ((scnt = sscanf(str, "%d-%d", &years, &mons)) >= 2) {
-        if (SQL_IS_YEAR_TO_MONTH == itype) {
-            sign = years < 0 ? SQL_TRUE : SQL_FALSE;
-            st->interval_type = itype;
-            st->interval_sign = sign;
-            st->intval.year_month.year = sign ? (-years) : years;
-            st->intval.year_month.month = mons;
-            return TRUE;
-        }
-        return FALSE;
-    } else if (scnt = sscanf(str, "%d %02d:%02d:%02d.%09s", &days, &hours,
-                             &minutes, &seconds, lit2),
-               5 == scnt || 4 == scnt) {
-        sign = days < 0 ? SQL_TRUE : SQL_FALSE;
-        st->interval_type = itype;
-        st->interval_sign = sign;
-        st->intval.day_second.day = sign ? (-days) : days;
-        st->intval.day_second.hour = hours;
-        st->intval.day_second.minute = minutes;
-        st->intval.day_second.second = seconds;
-        if (scnt > 4)
-            st->intval.day_second.fraction = getPrecisionPart(precision, lit2);
-        return TRUE;
-    } else if ((scnt =
-                    sscanf(str, "%d %10s %d %10s", &years, lit1, &mons, lit2))
-               >= 4) {
-        if (strnicmp(lit1, "year", 4) == 0 && strnicmp(lit2, "mon", 2) == 0
-            && (SQL_IS_MONTH == itype || SQL_IS_YEAR_TO_MONTH == itype)) {
-            sign = years < 0 ? SQL_TRUE : SQL_FALSE;
-            st->interval_type = itype;
-            st->interval_sign = sign;
-            st->intval.year_month.year = sign ? (-years) : years;
-            st->intval.year_month.month = sign ? (-mons) : mons;
-            return TRUE;
-        }
-        return FALSE;
-    }
-    if ((scnt = sscanf(str, "%d %10s %d", &years, lit1, &days)) == 2) {
-        sign = years < 0 ? SQL_TRUE : SQL_FALSE;
-        if (SQL_IS_YEAR == itype
-            && (stricmp(lit1, "year") == 0 || stricmp(lit1, "years") == 0)) {
-            st->interval_type = itype;
-            st->interval_sign = sign;
-            st->intval.year_month.year = sign ? (-years) : years;
-            return TRUE;
-        }
-        if (SQL_IS_MONTH == itype
-            && (stricmp(lit1, "mon") == 0 || stricmp(lit1, "mons") == 0)) {
-            st->interval_type = itype;
-            st->interval_sign = sign;
-            st->intval.year_month.month = sign ? (-years) : years;
-            return TRUE;
-        }
-        if (SQL_IS_DAY == itype
-            && (stricmp(lit1, "day") == 0 || stricmp(lit1, "days") == 0)) {
-            st->interval_type = itype;
-            st->interval_sign = sign;
-            st->intval.day_second.day = sign ? (-years) : years;
-            return TRUE;
-        }
-        return FALSE;
-    }
-    if (itype == SQL_IS_YEAR || itype == SQL_IS_MONTH
-        || itype == SQL_IS_YEAR_TO_MONTH) {
-        /* these formats should've been handled above already */
-        return FALSE;
-    }
-    scnt = sscanf(str, "%d %10s %02d:%02d:%02d.%09s", &days, lit1, &hours,
-                  &minutes, &seconds, lit2);
-    if (scnt == 5 || scnt == 6) {
-        if (strnicmp(lit1, "day", 3) != 0)
-            return FALSE;
-        sign = days < 0 ? SQL_TRUE : SQL_FALSE;
-
-        st->interval_type = itype;
-        st->interval_sign = sign;
-        st->intval.day_second.day = sign ? (-days) : days;
-        st->intval.day_second.hour = sign ? (-hours) : hours;
-        st->intval.day_second.minute = minutes;
-        st->intval.day_second.second = seconds;
-        if (scnt > 5)
-            st->intval.day_second.fraction = getPrecisionPart(precision, lit2);
-        return TRUE;
-    }
-    scnt = sscanf(str, "%02d:%02d:%02d.%09s", &hours, &minutes, &seconds, lit2);
-    if (scnt == 3 || scnt == 4) {
-        sign = hours < 0 ? SQL_TRUE : SQL_FALSE;
-
-        st->interval_type = itype;
-        st->interval_sign = sign;
-        st->intval.day_second.hour = sign ? (-hours) : hours;
-        st->intval.day_second.minute = minutes;
-        st->intval.day_second.second = seconds;
-        if (scnt > 3)
-            st->intval.day_second.fraction = getPrecisionPart(precision, lit2);
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-#ifdef HAVE_LOCALE_H
-/*
- * Get the decimal point of the current locale.
- *
- * XXX: This isn't thread-safe, if another thread changes the locale with
- * setlocale() concurrently. There are two problems with that:
- *
- * 1. The pointer returned by localeconv(), or the lc->decimal_point string,
- * might be invalidated by calls in other threads. Until someone comes up
- * with a thread-safe version of localeconv(), there isn't much we can do
- * about that. (libc implementations that return a static buffer (like glibc)
- * happen to be safe from the lconv struct being invalidated, but the
- * decimal_point string might still not point to a static buffer).
- *
- * 2. The between the call to sprintf() and get_current_decimal_point(), the
- * decimal point might change. That would cause set_server_decimal_point()
- * to fail to recognize a decimal separator, and we might send a numeric
- * string to the server that the server won't recognize. This would cause
- * the query to fail in the server.
- *
- * XXX: we only take into account the first byte of the decimal separator.
- */
-static char get_current_decimal_point(void) {
-    struct lconv *lc = localeconv();
-
-    return lc->decimal_point[0];
-}
-
-/*
- * Inverse of set_server_decimal_point.
- */
-static void set_client_decimal_point(char *num) {
-    char current_decimal_point = get_current_decimal_point();
-    char *str;
-
-    if ('.' == current_decimal_point)
-        return;
-    for (str = num; '\0' != *str; str++) {
-        if (*str == '.') {
-            *str = current_decimal_point;
-            break;
-        }
-    }
-}
-#else
-static void set_client_decimal_point(char *num) {
-    UNUSED(num);
-}
-#endif /* HAVE_LOCALE_H */
-
-/*	This is called by SQLFetch() */
-int copy_and_convert_field_bindinfo(StatementClass *stmt, OID field_type,
-                                    int atttypmod, void *value, int col) {
-    ARDFields *opts = SC_get_ARDF(stmt);
-    BindInfoClass *bic;
-    SQLULEN offset = opts->row_offset_ptr ? *opts->row_offset_ptr : 0;
-
-    if (opts->allocated <= col)
-        extend_column_bindings(opts, (SQLSMALLINT)(col + 1));
-    bic = &(opts->bindings[col]);
-    SC_set_current_col(stmt, -1);
-    return copy_and_convert_field(stmt, field_type, atttypmod, value,
-                                  bic->returntype, bic->precision,
-                                  (PTR)(bic->buffer + offset), bic->buflen,
-                                  LENADDR_SHIFT(bic->used, offset),
-                                  LENADDR_SHIFT(bic->indicator, offset));
-}
-
-static double get_double_value(const char *str) {
-    if (stricmp(str, NAN_STRING) == 0)
-#ifdef NAN
-        return (double)NAN;
-#else
-    {
-        double a = .0;
-        return .0 / a;
-    }
-#endif /* NAN */
-    else if (stricmp(str, INFINITY_STRING) == 0)
-#ifdef INFINITY
-        return (double)INFINITY;
-#else
-        return (double)(HUGE_VAL * HUGE_VAL);
-#endif /* INFINITY */
-    else if (stricmp(str, MINFINITY_STRING) == 0)
-#ifdef INFINITY
-        return (double)-INFINITY;
-#else
-        return (double)-(HUGE_VAL * HUGE_VAL);
-#endif /* INFINITY */
-    return atof(str);
-}
-
-static int char2guid(const char *str, SQLGUID *g) {
-    /*
-     * SQLGUID.Data1 is an "unsigned long" on some platforms, and
-     * "unsigned int" on others. For format "%08X", it should be an
-     * "unsigned int", so use a temporary variable for it.
-     */
-    unsigned int Data1;
-    if (sscanf(str,
-               "%08X-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%"
-               "02hhX",
-               &Data1, &g->Data2, &g->Data3, &g->Data4[0], &g->Data4[1],
-               &g->Data4[2], &g->Data4[3], &g->Data4[4], &g->Data4[5],
-               &g->Data4[6], &g->Data4[7])
-        < 11)
-        return COPY_GENERAL_ERROR;
-    g->Data1 = Data1;
-    return COPY_OK;
-}
-
-static int effective_fraction(int fraction, int *width) {
-    for (*width = 9; fraction % 10 == 0; (*width)--, fraction /= 10)
-        ;
-    return fraction;
-}
-
-static int get_terminator_len(SQLSMALLINT fCType) {
-    switch (fCType) {
-#ifdef UNICODE_SUPPORT
-        case SQL_C_WCHAR:
-            return WCLEN;
-#endif /* UNICODE_SUPPORT */
-        case SQL_C_BINARY:
-            return 0;
-    }
-
-    /* SQL_C_CHAR or INTERNAL_ASIS_TYPE */
-    return 1;
-}
-
-static SQLLEN get_adjust_len(SQLSMALLINT fCType, SQLLEN len) {
-    switch (fCType) {
-#ifdef UNICODE_SUPPORT
-        case SQL_C_WCHAR:
-            return (len / WCLEN) * WCLEN;
-#endif /* UNICODE_SUPPORT */
-    }
-
-    return len;
-}
-
-#define BYTEA_PROCESS_ESCAPE 1
-#define BYTEA_PROCESS_BINARY 2
-
-static int setup_getdataclass(SQLLEN *const length_return,
-                              const char **const ptr_return,
-                              int *needbuflen_return, GetDataClass *const esdc,
-                              const char *neut_str, const OID field_type,
-                              const SQLSMALLINT fCType, const SQLLEN cbValueMax,
-                              const ConnectionClass *const conn) {
-    SQLLEN len = (-2);
-    const char *ptr = NULL;
-    int needbuflen = 0;
-    int result = COPY_OK;
-
-    BOOL lf_conv = 0;
-    int bytea_process_kind = 0;
-    BOOL already_processed = FALSE;
-    BOOL changed = FALSE;
-    int len_for_wcs_term = 0;
-
-#ifdef UNICODE_SUPPORT
-    char *allocbuf = NULL;
-    int unicode_count = -1;
-    BOOL localize_needed = FALSE;
-    BOOL hybrid = FALSE;
-#endif /* UNICODE_SUPPORT */
-
-    if (OPENSEARCH_TYPE_BYTEA == field_type) {
-        if (SQL_C_BINARY == fCType)
-            bytea_process_kind = BYTEA_PROCESS_BINARY;
-        else if (0 == strnicmp(neut_str, "\\x", 2)) /* hex format */
-            neut_str += 2;
-        else
-            bytea_process_kind = BYTEA_PROCESS_ESCAPE;
-    }
-
-#ifdef UNICODE_SUPPORT
-    if (0 == bytea_process_kind) {
-        if (get_convtype()
-            > 0) /* coversion between the current locale is available */
-        {
-            BOOL wcs_debug = 0;
-            BOOL same_encoding =
-                (conn->ccsc == opensearch_CS_code(conn->locale_encoding));
-            BOOL is_utf8 = (UTF8 == conn->ccsc);
-
-            switch (field_type) {
-                case OPENSEARCH_TYPE_UNKNOWN:
-                case OPENSEARCH_TYPE_BPCHAR:
-                case OPENSEARCH_TYPE_VARCHAR:
-                case OPENSEARCH_TYPE_TEXT:
-                case OPENSEARCH_TYPE_BPCHARARRAY:
-                case OPENSEARCH_TYPE_VARCHARARRAY:
-                case OPENSEARCH_TYPE_TEXTARRAY:
-                    if (SQL_C_CHAR == fCType || SQL_C_BINARY == fCType)
-                        localize_needed = (!same_encoding || wcs_debug);
-                    if (SQL_C_WCHAR == fCType)
-                        hybrid = (!is_utf8 || (same_encoding && wcs_debug));
-            }
-            MYLOG(OPENSEARCH_DEBUG,
-                  "localize=%d hybrid=%d is_utf8=%d same_encoding=%d "
-                  "wcs_debug=%d\n",
-                  localize_needed, hybrid, is_utf8, same_encoding, wcs_debug);
-        }
-    }
-    if (fCType == SQL_C_WCHAR) {
-        if (BYTEA_PROCESS_ESCAPE == bytea_process_kind)
-            unicode_count = (int)convert_from_opensearchbinary(neut_str, NULL, 0) * 2;
-        else if (hybrid) {
-            MYLOG(OPENSEARCH_DEBUG, "hybrid estimate\n");
-            if ((unicode_count =
-                     (int)bindcol_hybrid_estimate(neut_str, lf_conv, &allocbuf))
-                < 0) {
-                result = COPY_INVALID_STRING_CONVERSION;
-                goto cleanup;
-            }
-        } else /* normally */
-        {
-            unicode_count = (int)utf8_to_ucs2_lf(neut_str, SQL_NTS, lf_conv,
-                                                 NULL, 0, FALSE);
-        }
-        len = WCLEN * unicode_count;
-        already_processed = changed = TRUE;
-    } else if (localize_needed) {
-        if ((len = bindcol_localize_estimate(neut_str, lf_conv, &allocbuf))
-            < 0) {
-            result = COPY_INVALID_STRING_CONVERSION;
-            goto cleanup;
-        }
-        already_processed = changed = TRUE;
-    }
-#endif /* UNICODE_SUPPORT */
-
-    if (already_processed) /* skip */
-        ;
-    else if (0 != bytea_process_kind) {
-        len = convert_from_opensearchbinary(neut_str, NULL, 0);
-        if (BYTEA_PROCESS_BINARY != bytea_process_kind)
-            len *= 2;
-        changed = TRUE;
-    } else
-        /* convert linefeeds to carriage-return/linefeed */
-        len = convert_linefeeds(neut_str, NULL, 0, lf_conv, &changed);
-
-    /* just returns length info */
-    if (cbValueMax == 0) {
-        result = COPY_RESULT_TRUNCATED;
-        goto cleanup;
-    }
-
-    if (!esdc->ttlbuf)
-        esdc->ttlbuflen = 0;
-    needbuflen = (int)len + get_terminator_len(fCType);
-    if (SQL_C_BINARY == fCType) {
-        /*
-         * Though Binary doesn't have NULL terminator,
-         * bindcol_localize_exec() needs output buffer
-         * for NULL terminator.
-         */
-        len_for_wcs_term = 1;
-    }
-    if (changed || needbuflen > cbValueMax) {
-        if (needbuflen > (SQLLEN)esdc->ttlbuflen) {
-            esdc->ttlbuf = realloc(esdc->ttlbuf, needbuflen + len_for_wcs_term);
-            esdc->ttlbuflen = needbuflen;
-        }
-
-        already_processed = FALSE;
-#ifdef UNICODE_SUPPORT
-        if (fCType == SQL_C_WCHAR) {
-            if (BYTEA_PROCESS_ESCAPE == bytea_process_kind) {
-                len = convert_from_opensearchbinary(neut_str, esdc->ttlbuf,
-                                            esdc->ttlbuflen);
-                len = es_bin2whex(esdc->ttlbuf, (SQLWCHAR *)esdc->ttlbuf, len);
-            } else {
-                if (!hybrid) /* normally */
-                    utf8_to_ucs2_lf(neut_str, SQL_NTS, lf_conv,
-                                    (SQLWCHAR *)esdc->ttlbuf, unicode_count,
-                                    FALSE);
-                else /* hybrid */
-                {
-                    MYLOG(OPENSEARCH_DEBUG, "hybrid convert\n");
-                    if (bindcol_hybrid_exec((SQLWCHAR *)esdc->ttlbuf, neut_str,
-                                            unicode_count + 1, lf_conv,
-                                            &allocbuf)
-                        < 0) {
-                        result = COPY_INVALID_STRING_CONVERSION;
-                        goto cleanup;
-                    }
-                }
-            }
-            already_processed = TRUE;
-        } else if (localize_needed) {
-            if (bindcol_localize_exec(esdc->ttlbuf, len + 1, lf_conv, &allocbuf)
-                < 0) {
-                result = COPY_INVALID_STRING_CONVERSION;
-                goto cleanup;
-            }
-            already_processed = TRUE;
-        }
-#endif /* UNICODE_SUPPORT */
-
-        if (already_processed)
-            ;
-        else if (0 != bytea_process_kind) {
-            len = convert_from_opensearchbinary(neut_str, esdc->ttlbuf,
-                                                esdc->ttlbuflen);
-            if (BYTEA_PROCESS_ESCAPE == bytea_process_kind)
-                len = opensearch_bin2hex(esdc->ttlbuf, esdc->ttlbuf, len);
-        } else
-            convert_linefeeds(neut_str, esdc->ttlbuf, esdc->ttlbuflen, lf_conv,
-                              &changed);
-        ptr = esdc->ttlbuf;
-        esdc->ttlbufused = len;
-    } else {
-        if (esdc->ttlbuf) {
-            free(esdc->ttlbuf);
-            esdc->ttlbuf = NULL;
-        }
-        ptr = neut_str;
-    }
-cleanup:
-#ifdef UNICODE_SUPPORT
-    if (allocbuf)
-        free(allocbuf);
-#endif /* UNICODE_SUPPORT */
-
-    *length_return = len;
-    *ptr_return = ptr;
-    *needbuflen_return = needbuflen;
-
-    return result;
-}
-
-/*
-    gdata		SC_get_GDTI(stmt)
-    current_col	stmt->current_col
- */
-
-/*
- *	fCType treated in the following function is
- *
- *	SQL_C_CHAR, SQL_C_BINARY, SQL_C_WCHAR or INTERNAL_ASIS_TYPE
- */
-static int convert_text_field_to_sql_c(
-    GetDataInfo *const gdata, const int current_col, const char *const neut_str,
-    const OID field_type, const SQLSMALLINT fCType, char *const rgbValueBindRow,
-    const SQLLEN cbValueMax, const ConnectionClass *const conn,
-    SQLLEN *const length_return) {
-    int result = COPY_OK;
-    SQLLEN len = (-2);
-    GetDataClass *esdc;
-    int copy_len = 0, needbuflen = 0, i;
-    const char *ptr;
-
-    MYLOG(OPENSEARCH_DEBUG, "field_type=%u type=%d\n", field_type, fCType);
-
-    switch (field_type) {
-        case OPENSEARCH_TYPE_FLOAT4:
-        case OPENSEARCH_TYPE_FLOAT8:
-        case OPENSEARCH_TYPE_NUMERIC:
-            set_client_decimal_point((char *)neut_str);
-            break;
-    }
-
-    if (current_col < 0) {
-        esdc = &(gdata->fdata);
-        esdc->data_left = -1;
-    } else
-        esdc = &gdata->gdata[current_col];
-    if (esdc->data_left < 0) {
-        if (COPY_OK
-            != (result =
-                    setup_getdataclass(&len, &ptr, &needbuflen, esdc, neut_str,
-                                       field_type, fCType, cbValueMax, conn)))
-            goto cleanup;
-    } else {
-        ptr = esdc->ttlbuf;
-        len = esdc->ttlbufused;
-    }
-
-    MYLOG(OPENSEARCH_DEBUG, "DEFAULT: len = " FORMAT_LEN ", ptr = '%.*s'\n", len,
-          (int)len, ptr);
-
-    if (current_col >= 0) {
-        if (esdc->data_left > 0) {
-            ptr += (len - esdc->data_left);
-            len = esdc->data_left;
-            needbuflen = (int)len + (int)(esdc->ttlbuflen - esdc->ttlbufused);
-        } else
-            esdc->data_left = len;
-    }
-
-    if (cbValueMax > 0) {
-        BOOL already_copied = FALSE;
-        int terminatorlen;
-
-        terminatorlen = get_terminator_len(fCType);
-        if (terminatorlen >= cbValueMax)
-            copy_len = 0;
-        else if (len + terminatorlen > cbValueMax)
-            copy_len = (int)get_adjust_len(fCType, cbValueMax - terminatorlen);
-        else
-            copy_len = (int)len;
-
-        if (!already_copied) {
-            /* Copy the data */
-            if (copy_len > 0)
-                memcpy(rgbValueBindRow, ptr, copy_len);
-            /* Add null terminator */
-            for (i = 0; i < terminatorlen && copy_len + i < cbValueMax; i++)
-                rgbValueBindRow[copy_len + i] = '\0';
-        }
-        /* Adjust data_left for next time */
-        if (current_col >= 0)
-            esdc->data_left -= copy_len;
-    }
-
-    /*
-     * Finally, check for truncation so that proper status can
-     * be returned
-     */
-    if (cbValueMax > 0 && needbuflen > cbValueMax)
-        result = COPY_RESULT_TRUNCATED;
-    else {
-        if (esdc->ttlbuf != NULL) {
-            free(esdc->ttlbuf);
-            esdc->ttlbuf = NULL;
-        }
-    }
-
-#ifdef UNICODE_SUPPORT
-    if (SQL_C_WCHAR == fCType)
-        MYLOG(OPENSEARCH_DEBUG,
-              "    SQL_C_WCHAR, default: len = " FORMAT_LEN
-              ", cbValueMax = " FORMAT_LEN ", rgbValueBindRow = '%s'\n",
-              len, cbValueMax, rgbValueBindRow);
-    else
-#endif /* UNICODE_SUPPORT */
-        if (SQL_C_BINARY == fCType)
-        MYLOG(OPENSEARCH_DEBUG,
-              "    SQL_C_BINARY, default: len = " FORMAT_LEN
-              ", cbValueMax = " FORMAT_LEN ", rgbValueBindRow = '%.*s'\n",
-              len, cbValueMax, copy_len, rgbValueBindRow);
-    else
-        MYLOG(OPENSEARCH_DEBUG,
-              "    SQL_C_CHAR, default: len = " FORMAT_LEN
-              ", cbValueMax = " FORMAT_LEN ", rgbValueBindRow = '%s'\n",
-              len, cbValueMax, rgbValueBindRow);
-
-cleanup:
-    *length_return = len;
-
-    return result;
-}
-
-/*	This is called by SQLGetData() */
-int copy_and_convert_field(StatementClass *stmt, OID field_type, int atttypmod,
-                           void *valuei, SQLSMALLINT fCType, int precision,
-                           PTR rgbValue, SQLLEN cbValueMax, SQLLEN *pcbValue,
-                           SQLLEN *pIndicator) {
-    CSTR func = "copy_and_convert_field";
-    const char *value = valuei;
-    ARDFields *opts = SC_get_ARDF(stmt);
-    GetDataInfo *gdata = SC_get_GDTI(stmt);
-    SQLLEN len = 0;
-    SIMPLE_TIME std_time;
-#ifdef HAVE_LOCALTIME_R
-    struct tm tm;
-#endif /* HAVE_LOCALTIME_R */
-    SQLLEN pcbValueOffset, rgbValueOffset;
-    char *rgbValueBindRow = NULL;
-    SQLLEN *pcbValueBindRow = NULL, *pIndicatorBindRow = NULL;
-    SQLSETPOSIROW bind_row = stmt->bind_row;
-    int bind_size = opts->bind_size;
-    int result = COPY_OK;
-    const ConnectionClass *conn = SC_get_conn(stmt);
-    BOOL text_bin_handling;
-    const char *neut_str = value;
-    char booltemp[3];
-    char midtemp[64];
-    GetDataClass *esdc;
-
-    if (stmt->current_col >= 0) {
-        if (stmt->current_col >= opts->allocated) {
-            return SQL_ERROR;
-        }
-        if (gdata->allocated != opts->allocated)
-            extend_getdata_info(gdata, opts->allocated, TRUE);
-        esdc = &gdata->gdata[stmt->current_col];
-        if (esdc->data_left == -2)
-            esdc->data_left = (cbValueMax > 0) ? 0 : -1; /* This seems to be *
-                                                          * needed by ADO ? */
-        if (esdc->data_left == 0) {
-            if (esdc->ttlbuf != NULL) {
-                free(esdc->ttlbuf);
-                esdc->ttlbuf = NULL;
-                esdc->ttlbuflen = 0;
-            }
-            esdc->data_left = -2; /* needed by ADO ? */
-            return COPY_NO_DATA_FOUND;
-        }
-    }
-    /*---------
-     *	rgbValueOffset is *ONLY* for character and binary data.
-     *	pcbValueOffset is for computing any pcbValue location
-     *---------
-     */
-
-    if (bind_size > 0)
-        pcbValueOffset = rgbValueOffset = (bind_size * bind_row);
-    else {
-        pcbValueOffset = bind_row * sizeof(SQLLEN);
-        rgbValueOffset = bind_row * cbValueMax;
-    }
-    /*
-     *	The following is applicable in case bind_size > 0
-     *	or the fCType is of variable length.
-     */
-    if (rgbValue)
-        rgbValueBindRow = (char *)rgbValue + rgbValueOffset;
-    if (pcbValue)
-        pcbValueBindRow = LENADDR_SHIFT(pcbValue, pcbValueOffset);
-    if (pIndicator) {
-        pIndicatorBindRow = (SQLLEN *)((char *)pIndicator + pcbValueOffset);
-        *pIndicatorBindRow = 0;
-    }
-
-    memset(&std_time, 0, sizeof(SIMPLE_TIME));
-
-    MYLOG(OPENSEARCH_DEBUG,
-          "field_type = %d, fctype = %d, value = '%s', cbValueMax=" FORMAT_LEN
-          "\n",
-          field_type, fCType, (value == NULL) ? "<NULL>" : value, cbValueMax);
-
-    if (!value) {
-        /*
-         * handle a null just by returning SQL_NULL_DATA in pcbValue, and
-         * doing nothing to the buffer.
-         */
-        if (pIndicator) {
-            *pIndicatorBindRow = SQL_NULL_DATA;
-            return COPY_OK;
-        } else {
-            SC_set_error(stmt, STMT_RETURN_NULL_WITHOUT_INDICATOR,
-                         "StrLen_or_IndPtr was a null pointer and NULL data "
-                         "was retrieved",
-                         func);
-            return SQL_ERROR;
-        }
-    }
-
-    if (stmt->hdbc->DataSourceToDriver != NULL) {
-        size_t length = strlen(value);
-
-        stmt->hdbc->DataSourceToDriver(stmt->hdbc->translation_option, SQL_CHAR,
-                                       valuei, (SDWORD)length, valuei,
-                                       (SDWORD)length, NULL, NULL, 0, NULL);
-    }
-
-    /*
-     * First convert any specific OpenSearch types into more useable data.
-     *
-     * NOTE: Conversions from ES char/varchar of a date/time/timestamp value
-     * to SQL_C_DATE,SQL_C_TIME, SQL_C_TIMESTAMP not supported
-     */
-    switch (field_type) {
-            /*
-             * $$$ need to add parsing for date/time/timestamp strings in
-             * OPENSEARCH_TYPE_CHAR,VARCHAR $$$
-             */
-        case OPENSEARCH_TYPE_DATE:
-            sscanf(value, "%4d-%2d-%2d", &std_time.y, &std_time.m, &std_time.d);
-            break;
-
-        case OPENSEARCH_TYPE_TIME: {
-            BOOL bZone = FALSE; /* time zone stuff is unreliable */
-            int zone;
-            timestamp2stime(value, &std_time, &bZone, &zone);
-        } break;
-
-        case OPENSEARCH_TYPE_ABSTIME:
-        case OPENSEARCH_TYPE_DATETIME:
-        case OPENSEARCH_TYPE_TIMESTAMP_NO_TMZONE:
-        case OPENSEARCH_TYPE_TIMESTAMP:
-            std_time.fr = 0;
-            std_time.infinity = 0;
-            if (strnicmp(value, INFINITY_STRING, 8) == 0) {
-                std_time.infinity = 1;
-                std_time.m = 12;
-                std_time.d = 31;
-                std_time.y = 9999;
-                std_time.hh = 23;
-                std_time.mm = 59;
-                std_time.ss = 59;
-            }
-            if (strnicmp(value, MINFINITY_STRING, 9) == 0) {
-                std_time.infinity = -1;
-                std_time.m = 1;
-                std_time.d = 1;
-                // std_time.y = -4713;
-                std_time.y = -9999;
-                std_time.hh = 0;
-                std_time.mm = 0;
-                std_time.ss = 0;
-            }
-            if (strnicmp(value, "invalid", 7) != 0) {
-                BOOL bZone = field_type != OPENSEARCH_TYPE_TIMESTAMP_NO_TMZONE;
-                int zone;
-
-                /*
-                 * sscanf(value, "%4d-%2d-%2d %2d:%2d:%2d", &std_time.y,
-                 * &std_time.m, &std_time.d, &std_time.hh, &std_time.mm,
-                 * &std_time.ss);
-                 */
-                bZone = FALSE; /* time zone stuff is unreliable */
-                timestamp2stime(value, &std_time, &bZone, &zone);
-                MYLOG(OPENSEARCH_ALL, "2stime fr=%d\n", std_time.fr);
-            } else {
-                /*
-                 * The timestamp is invalid so set something conspicuous,
-                 * like the epoch
-                 */
-                struct tm *tim;
-                time_t t = 0;
-#ifdef HAVE_LOCALTIME_R
-                tim = localtime_r(&t, &tm);
-#else
-                tim = localtime(&t);
-#endif /* HAVE_LOCALTIME_R */
-                std_time.m = tim->tm_mon + 1;
-                std_time.d = tim->tm_mday;
-                std_time.y = tim->tm_year + 1900;
-                std_time.hh = tim->tm_hour;
-                std_time.mm = tim->tm_min;
-                std_time.ss = tim->tm_sec;
-            }
-            break;
-
-        case OPENSEARCH_TYPE_BOOL: { /* change T/F to 1/0 */
-            switch (((char *)value)[0]) {
-                case 'f':
-                case 'F':
-                case 'n':
-                case 'N':
-                case '0':
-                    STRCPY_FIXED(booltemp, "0");
-                    break;
-                default:
-                    STRCPY_FIXED(booltemp, "1");
-            }
-            neut_str = booltemp;
-        } break;
-
-            /* This is for internal use by SQLStatistics() */
-        case OPENSEARCH_TYPE_INT2VECTOR:
-            if (SQL_C_DEFAULT == fCType) {
-                int i, nval, maxc;
-                const char *vp;
-                /* this is an array of eight integers */
-                short *short_array = (short *)rgbValueBindRow, shortv;
-
-                maxc = 0;
-                if (NULL != short_array)
-                    maxc = (int)cbValueMax / sizeof(short);
-                vp = value;
-                nval = 0;
-                MYLOG(OPENSEARCH_DEBUG, "index=(");
-                for (i = 0;; i++) {
-                    if (sscanf(vp, "%hi", &shortv) != 1)
-                        break;
-                    MYPRINTF(0, " %hi", shortv);
-                    nval++;
-                    if (nval < maxc)
-                        short_array[i + 1] = shortv;
-
-                    /* skip the current token */
-                    while (IS_NOT_SPACE(*vp))
-                        vp++;
-                    /* and skip the space to the next token */
-                    while ((*vp != '\0') && (isspace(*vp)))
-                        vp++;
-                    if (*vp == '\0')
-                        break;
-                }
-                MYPRINTF(0, ") nval = %i\n", nval);
-                if (maxc > 0)
-                    short_array[0] = (short)nval;
-
-                /* There is no corresponding fCType for this. */
-                len = (nval + 1) * sizeof(short);
-                if (pcbValue)
-                    *pcbValueBindRow = len;
-
-                if (len <= cbValueMax)
-                    return COPY_OK; /* dont go any further or the data will be
-                                     * trashed */
-                else
-                    return COPY_RESULT_TRUNCATED;
-            }
-            break;
-
-            /*
-             * This is a large object OID, which is used to store
-             * LONGVARBINARY objects.
-             */
-        case OPENSEARCH_TYPE_LO_UNDEFINED:
-
-            return convert_lo(stmt, value, fCType, rgbValueBindRow, cbValueMax,
-                              pcbValueBindRow);
-
-        case 0:
-            break;
-
-        default:
-            if (field_type
-                    == (OID)stmt->hdbc
-                           ->lobj_type /* hack until permanent type available */
-                || (OPENSEARCH_TYPE_OID == field_type && SQL_C_BINARY == fCType
-                    && conn->lo_is_domain))
-                return convert_lo(stmt, value, fCType, rgbValueBindRow,
-                                  cbValueMax, pcbValueBindRow);
-    }
-
-    /* Change default into something useable */
-    if (fCType == SQL_C_DEFAULT) {
-        fCType = opensearchtype_attr_to_ctype(conn, field_type, atttypmod);
-#ifdef UNICODE_SUPPORT
-        if (fCType == SQL_C_WCHAR && CC_default_is_c(conn))
-            fCType = SQL_C_CHAR;
-#endif
-
-        MYLOG(OPENSEARCH_DEBUG, ", SQL_C_DEFAULT: fCType = %d\n", fCType);
-    }
-
-    text_bin_handling = FALSE;
-    switch (fCType) {
-        case INTERNAL_ASIS_TYPE:
-#ifdef UNICODE_SUPPORT
-        case SQL_C_WCHAR:
-#endif /* UNICODE_SUPPORT */
-        case SQL_C_CHAR:
-            text_bin_handling = TRUE;
-            break;
-        case SQL_C_BINARY:
-            switch (field_type) {
-                case OPENSEARCH_TYPE_UNKNOWN:
-                case OPENSEARCH_TYPE_BPCHAR:
-                case OPENSEARCH_TYPE_VARCHAR:
-                case OPENSEARCH_TYPE_TEXT:
-                case OPENSEARCH_TYPE_XML:
-                case OPENSEARCH_TYPE_BPCHARARRAY:
-                case OPENSEARCH_TYPE_VARCHARARRAY:
-                case OPENSEARCH_TYPE_TEXTARRAY:
-                case OPENSEARCH_TYPE_XMLARRAY:
-                case OPENSEARCH_TYPE_BYTEA:
-                    text_bin_handling = TRUE;
-                    break;
-            }
-            break;
-    }
-
-    if (text_bin_handling) {
-        BOOL pre_convert = TRUE;
-        int midsize = sizeof(midtemp);
-        int i;
-
-        /* Special character formatting as required */
-
-        /*
-         * These really should return error if cbValueMax is not big
-         * enough.
-         */
-        switch (field_type) {
-            case OPENSEARCH_TYPE_DATE:
-                len = SPRINTF_FIXED(midtemp, "%.4d-%.2d-%.2d", std_time.y,
-                                    std_time.m, std_time.d);
-                break;
-
-            case OPENSEARCH_TYPE_TIME:
-                len = SPRINTF_FIXED(midtemp, "%.2d:%.2d:%.2d", std_time.hh,
-                                    std_time.mm, std_time.ss);
-                if (std_time.fr > 0) {
-                    int wdt;
-                    int fr = effective_fraction(std_time.fr, &wdt);
-
-                    char *fraction = NULL;
-                    len = sprintf(fraction, ".%0*d", wdt, fr);
-                    strcat(midtemp, fraction);
-                }
-                break;
-
-            case OPENSEARCH_TYPE_ABSTIME:
-            case OPENSEARCH_TYPE_DATETIME:
-            case OPENSEARCH_TYPE_TIMESTAMP_NO_TMZONE:
-            case OPENSEARCH_TYPE_TIMESTAMP:
-                len = stime2timestamp(&std_time, midtemp, midsize, FALSE,
-                                      (int)(midsize - 19 - 2));
-                break;
-
-            case OPENSEARCH_TYPE_UUID:
-                len = strlen(neut_str);
-                for (i = 0; i < len && i < midsize - 2; i++)
-                    midtemp[i] = (char)toupper((UCHAR)neut_str[i]);
-                midtemp[i] = '\0';
-                MYLOG(OPENSEARCH_DEBUG, "OPENSEARCH_TYPE_UUID: rgbValueBindRow = '%s'\n",
-                      rgbValueBindRow);
-                break;
-
-                /*
-                 * Currently, data is SILENTLY TRUNCATED for BYTEA and
-                 * character data types if there is not enough room in
-                 * cbValueMax because the driver can't handle multiple
-                 * calls to SQLGetData for these, yet.	Most likely, the
-                 * buffer passed in will be big enough to handle the
-                 * maximum limit of OpenSearch, anyway.
-                 *
-                 * LongVarBinary types are handled correctly above, observing
-                 * truncation and all that stuff since there is
-                 * essentially no limit on the large object used to store
-                 * those.
-                 */
-            case OPENSEARCH_TYPE_BYTEA: /* convert binary data to hex strings
-                                 * (i.e, 255 = "FF") */
-
-            default:
-                pre_convert = FALSE;
-        }
-        if (pre_convert)
-            neut_str = midtemp;
-        result = convert_text_field_to_sql_c(
-            gdata, stmt->current_col, neut_str, field_type, fCType,
-            rgbValueBindRow, cbValueMax, conn, &len);
-    } else {
-        SQLGUID g;
-
-        /*
-         * for SQL_C_CHAR, it's probably ok to leave currency symbols in.
-         * But to convert to numeric types, it is necessary to get rid of
-         * those.
-         */
-        if (field_type == OPENSEARCH_TYPE_MONEY) {
-            if (convert_money(neut_str, midtemp, sizeof(midtemp)))
-                neut_str = midtemp;
-            else {
-                MYLOG(OPENSEARCH_DEBUG, "couldn't convert money type to %d\n", fCType);
-                return COPY_UNSUPPORTED_TYPE;
-            }
-        }
-
-        switch (fCType) {
-            case SQL_C_DATE:
-            case SQL_C_TYPE_DATE: /* 91 */
-                len = 6;
-                {
-                    DATE_STRUCT *ds;
-                    struct tm *tim;
-
-                    if (bind_size > 0)
-                        ds = (DATE_STRUCT *)rgbValueBindRow;
-                    else
-                        ds = (DATE_STRUCT *)rgbValue + bind_row;
-
-                    /*
-                     * Initialize date in case conversion destination
-                     * expects date part from this source time data.
-                     * A value may be partially set here, so do some
-                     * sanity checks on the existing values before
-                     * setting them.
-                     */
-                    tim = SC_get_localtime(stmt);
-                    if (std_time.m == 0)
-                        std_time.m = tim->tm_mon + 1;
-                    if (std_time.d == 0)
-                        std_time.d = tim->tm_mday;
-                    if (std_time.y == 0)
-                        std_time.y = tim->tm_year + 1900;
-                    ds->year = (SQLSMALLINT)std_time.y;
-                    ds->month = (SQLUSMALLINT)std_time.m;
-                    ds->day = (SQLUSMALLINT)std_time.d;
-                }
-                break;
-
-            case SQL_C_TIME:
-            case SQL_C_TYPE_TIME: /* 92 */
-                len = 6;
-                {
-                    TIME_STRUCT *ts;
-
-                    if (bind_size > 0)
-                        ts = (TIME_STRUCT *)rgbValueBindRow;
-                    else
-                        ts = (TIME_STRUCT *)rgbValue + bind_row;
-                    ts->hour = (SQLUSMALLINT)std_time.hh;
-                    ts->minute = (SQLUSMALLINT)std_time.mm;
-                    ts->second = (SQLUSMALLINT)std_time.ss;
-                }
-                break;
-
-            case SQL_C_TIMESTAMP:
-            case SQL_C_TYPE_TIMESTAMP: /* 93 */
-                len = 16;
-                {
-                    struct tm *tim;
-                    TIMESTAMP_STRUCT *ts;
-
-                    if (bind_size > 0)
-                        ts = (TIMESTAMP_STRUCT *)rgbValueBindRow;
-                    else
-                        ts = (TIMESTAMP_STRUCT *)rgbValue + bind_row;
-
-                    /*
-                     * Initialize date in case conversion destination
-                     * expects date part from this source time data.
-                     * A value may be partially set here, so do some
-                     * sanity checks on the existing values before
-                     * setting them.
-                     */
-                    tim = SC_get_localtime(stmt);
-                    if (std_time.m == 0)
-                        std_time.m = tim->tm_mon + 1;
-                    if (std_time.d == 0)
-                        std_time.d = tim->tm_mday;
-                    if (std_time.y == 0)
-                        std_time.y = tim->tm_year + 1900;
-
-                    ts->year = (SQLSMALLINT)std_time.y;
-                    ts->month = (SQLUSMALLINT)std_time.m;
-                    ts->day = (SQLUSMALLINT)std_time.d;
-                    ts->hour = (SQLUSMALLINT)std_time.hh;
-                    ts->minute = (SQLUSMALLINT)std_time.mm;
-                    ts->second = (SQLUSMALLINT)std_time.ss;
-                    ts->fraction = (SQLUINTEGER)std_time.fr;
-                }
-                break;
-
-            case SQL_C_BIT:
-                len = 1;
-                if (bind_size > 0)
-                    *((UCHAR *)rgbValueBindRow) = (UCHAR)atoi(neut_str);
-                else
-                    *((UCHAR *)rgbValue + bind_row) = (UCHAR)atoi(neut_str);
-
-                MYLOG(99,
-                      "SQL_C_BIT: bind_row = " FORMAT_POSIROW
-                      " val = %d, cb = " FORMAT_LEN ", rgb=%d\n",
-                      bind_row, atoi(neut_str), cbValueMax,
-                      *((UCHAR *)rgbValue));
-                break;
-
-            case SQL_C_STINYINT:
-            case SQL_C_TINYINT:
-                len = 1;
-                if (bind_size > 0)
-                    *((SCHAR *)rgbValueBindRow) = (SCHAR)atoi(neut_str);
-                else
-                    *((SCHAR *)rgbValue + bind_row) = (SCHAR)atoi(neut_str);
-                break;
-
-            case SQL_C_UTINYINT:
-                len = 1;
-                if (bind_size > 0)
-                    *((UCHAR *)rgbValueBindRow) = (UCHAR)atoi(neut_str);
-                else
-                    *((UCHAR *)rgbValue + bind_row) = (UCHAR)atoi(neut_str);
-                break;
-
-            case SQL_C_FLOAT:
-                set_client_decimal_point((char *)neut_str);
-                len = 4;
-                if (bind_size > 0)
-                    *((SFLOAT *)rgbValueBindRow) =
-                        (SFLOAT)get_double_value(neut_str);
-                else
-                    *((SFLOAT *)rgbValue + bind_row) =
-                        (SFLOAT)get_double_value(neut_str);
-                break;
-
-            case SQL_C_DOUBLE:
-                set_client_decimal_point((char *)neut_str);
-                len = 8;
-                if (bind_size > 0)
-                    *((SDOUBLE *)rgbValueBindRow) =
-                        (SDOUBLE)get_double_value(neut_str);
-                else
-                    *((SDOUBLE *)rgbValue + bind_row) =
-                        (SDOUBLE)get_double_value(neut_str);
-                break;
-
-            case SQL_C_NUMERIC: {
-                SQL_NUMERIC_STRUCT *ns;
-                BOOL overflowed;
-
-                if (bind_size > 0)
-                    ns = (SQL_NUMERIC_STRUCT *)rgbValueBindRow;
-                else
-                    ns = (SQL_NUMERIC_STRUCT *)rgbValue + bind_row;
-
-                parse_to_numeric_struct(neut_str, ns, &overflowed);
-                if (overflowed)
-                    result = COPY_RESULT_TRUNCATED;
-            } break;
-
-            case SQL_C_SSHORT:
-            case SQL_C_SHORT:
-                len = 2;
-                if (bind_size > 0)
-                    *((SQLSMALLINT *)rgbValueBindRow) =
-                        (SQLSMALLINT)atoi(neut_str);
-                else
-                    *((SQLSMALLINT *)rgbValue + bind_row) =
-                        (SQLSMALLINT)atoi(neut_str);
-                break;
-
-            case SQL_C_USHORT:
-                len = 2;
-                if (bind_size > 0)
-                    *((SQLUSMALLINT *)rgbValueBindRow) =
-                        (SQLUSMALLINT)atoi(neut_str);
-                else
-                    *((SQLUSMALLINT *)rgbValue + bind_row) =
-                        (SQLUSMALLINT)atoi(neut_str);
-                break;
-
-            case SQL_C_SLONG:
-            case SQL_C_LONG:
-                len = 4;
-                if (bind_size > 0)
-                    *((SQLINTEGER *)rgbValueBindRow) = atol(neut_str);
-                else
-                    *((SQLINTEGER *)rgbValue + bind_row) = atol(neut_str);
-                break;
-
-            case SQL_C_ULONG:
-                len = 4;
-                if (bind_size > 0)
-                    *((SQLUINTEGER *)rgbValueBindRow) = ATOI32U(neut_str);
-                else
-                    *((SQLUINTEGER *)rgbValue + bind_row) = ATOI32U(neut_str);
-                break;
-
-#ifdef ODBCINT64
-            case SQL_C_SBIGINT:
-                len = 8;
-                if (bind_size > 0)
-                    *((SQLBIGINT *)rgbValueBindRow) = ATOI64(neut_str);
-                else
-                    *((SQLBIGINT *)rgbValue + bind_row) = ATOI64(neut_str);
-                break;
-
-            case SQL_C_UBIGINT:
-                len = 8;
-                if (bind_size > 0)
-                    *((SQLUBIGINT *)rgbValueBindRow) = ATOI64U(neut_str);
-                else
-                    *((SQLUBIGINT *)rgbValue + bind_row) = ATOI64U(neut_str);
-                break;
-
-#endif /* ODBCINT64 */
-            case SQL_C_BINARY:
-                /* The following is for SQL_C_VARBOOKMARK */
-                if (OPENSEARCH_TYPE_INT4 == field_type) {
-                    UInt4 ival = ATOI32U(neut_str);
-
-                    MYLOG(OPENSEARCH_ALL, "SQL_C_VARBOOKMARK value=%d\n", ival);
-                    if (pcbValue)
-                        *pcbValueBindRow = sizeof(ival);
-                    if (cbValueMax >= (SQLLEN)sizeof(ival)) {
-                        memcpy(rgbValueBindRow, &ival, sizeof(ival));
-                        return COPY_OK;
-                    } else
-                        return COPY_RESULT_TRUNCATED;
-                } else if (OPENSEARCH_TYPE_UUID == field_type) {
-                    int rtn = char2guid(neut_str, &g);
-
-                    if (COPY_OK != rtn)
-                        return rtn;
-                    if (pcbValue)
-                        *pcbValueBindRow = sizeof(g);
-                    if (cbValueMax >= (SQLLEN)sizeof(g)) {
-                        memcpy(rgbValueBindRow, &g, sizeof(g));
-                        return COPY_OK;
-                    } else
-                        return COPY_RESULT_TRUNCATED;
-                } else {
-                    MYLOG(OPENSEARCH_DEBUG,
-                          "couldn't convert the type %d to SQL_C_BINARY\n",
-                          field_type);
-                    return COPY_UNSUPPORTED_TYPE;
-                }
-                break;
-            case SQL_C_GUID:
-
-                result = char2guid(neut_str, &g);
-                if (COPY_OK != result) {
-                    MYLOG(OPENSEARCH_DEBUG, "Could not convert to SQL_C_GUID\n");
-                    return COPY_UNSUPPORTED_TYPE;
-                }
-                len = sizeof(g);
-                if (bind_size > 0)
-                    *((SQLGUID *)rgbValueBindRow) = g;
-                else
-                    *((SQLGUID *)rgbValue + bind_row) = g;
-                break;
-            case SQL_C_INTERVAL_YEAR:
-            case SQL_C_INTERVAL_MONTH:
-            case SQL_C_INTERVAL_YEAR_TO_MONTH:
-            case SQL_C_INTERVAL_DAY:
-            case SQL_C_INTERVAL_HOUR:
-            case SQL_C_INTERVAL_DAY_TO_HOUR:
-            case SQL_C_INTERVAL_MINUTE:
-            case SQL_C_INTERVAL_HOUR_TO_MINUTE:
-            case SQL_C_INTERVAL_SECOND:
-            case SQL_C_INTERVAL_DAY_TO_SECOND:
-            case SQL_C_INTERVAL_HOUR_TO_SECOND:
-            case SQL_C_INTERVAL_MINUTE_TO_SECOND:
-                interval2istruct(
-                    fCType, precision, neut_str,
-                    bind_size > 0 ? (SQL_INTERVAL_STRUCT *)rgbValueBindRow
-                                  : (SQL_INTERVAL_STRUCT *)rgbValue + bind_row);
-                break;
-
-            default:
-                MYLOG(OPENSEARCH_DEBUG, "conversion to the type %d isn't supported\n",
-                      fCType);
-                return COPY_UNSUPPORTED_TYPE;
-        }
-    }
-
-    /* store the length of what was copied, if there's a place for it */
-    if (pcbValue)
-        *pcbValueBindRow = len;
-
-    if (result == COPY_OK && stmt->current_col >= 0)
-        gdata->gdata[stmt->current_col].data_left = 0;
-    return result;
-}
-
-/*--------------------------------------------------------------------
- *	Functions/Macros to get rid of query size limit.
- *
- *	I always used the follwoing macros to convert from
- *	old_statement to new_statement.  Please improve it
- *	if you have a better way.	Hiroshi 2001/05/22
- *--------------------------------------------------------------------
- */
-
-#define FLGP_USING_CURSOR (1L << 1)
-#define FLGP_SELECT_INTO (1L << 2)
-#define FLGP_SELECT_FOR_UPDATE_OR_SHARE (1L << 3)
-#define FLGP_MULTIPLE_STATEMENT (1L << 5)
-#define FLGP_SELECT_FOR_READONLY (1L << 6)
-typedef struct _QueryParse {
-    const char *statement;
-    int statement_type;
-    size_t opos;
-    ssize_t from_pos;
-    ssize_t where_pos;
-    ssize_t stmt_len;
-    int in_status;
-    char escape_in_literal, prev_token_end;
-    const char *dollar_tag;
-    ssize_t taglen;
-    char token_curr[64];
-    int token_len;
-    size_t declare_pos;
-    UInt4 flags, comment_level;
-    encoded_str encstr;
-} QueryParse;
-
-enum {
-    QP_IN_IDENT_KEYWORD = 1L /* identifier or keyword */
-    ,
-    QP_IN_DQUOTE_IDENTIFIER = (1L << 1) /* "" */
-    ,
-    QP_IN_LITERAL = (1L << 2) /* '' */
-    ,
-    QP_IN_ESCAPE = (1L << 3) /* \ in literal */
-    ,
-    QP_IN_DOLLAR_QUOTE = (1L << 4) /* $...$    $...$ */
-    ,
-    QP_IN_COMMENT_BLOCK = (1L << 5) /* slash asterisk */
-    ,
-    QP_IN_LINE_COMMENT = (1L << 6) /* -- */
-};
-
-#define QP_in_idle_status(qp) ((qp)->in_status == 0)
-
-#define QP_is_in(qp, status) (((qp)->in_status & status) != 0)
-#define QP_enter(qp, status) ((qp)->in_status |= status)
-#define QP_exit(qp, status) ((qp)->in_status &= (~status))
-
-typedef enum {
-    RPM_REPLACE_PARAMS,
-    RPM_FAKE_PARAMS,
-    RPM_BUILDING_PREPARE_STATEMENT,
-    RPM_BUILDING_BIND_REQUEST
-} ResolveParamMode;
-
-#define FLGB_INACCURATE_RESULT (1L << 4)
-#define FLGB_CREATE_KEYSET (1L << 5)
-#define FLGB_KEYSET_DRIVEN (1L << 6)
-#define FLGB_CONVERT_LF (1L << 7)
-#define FLGB_DISCARD_OUTPUT (1L << 8)
-#define FLGB_BINARY_AS_POSSIBLE (1L << 9)
-#define FLGB_LITERAL_EXTENSION (1L << 10)
-#define FLGB_HEX_BIN_FORMAT (1L << 11)
-#define FLGB_PARAM_CAST (1L << 12)
-typedef struct _QueryBuild {
-    char *query_statement;
-    size_t str_alsize;
-    size_t npos;
-    SQLLEN current_row;
-    Int2 param_number;
-    Int2 dollar_number;
-    Int2 num_io_params;
-    Int2 num_output_params;
-    Int2 num_discard_params;
-    Int2 proc_return;
-    Int2 brace_level;
-    char parenthesize_the_first;
-    APDFields *apdopts;
-    IPDFields *ipdopts;
-    PutDataInfo *pdata;
-    size_t load_stmt_len;
-    size_t load_from_pos;
-    ResolveParamMode param_mode;
-    UInt4 flags;
-    int ccsc;
-    int errornumber;
-    const char *errormsg;
-
-    ConnectionClass *conn; /* mainly needed for LO handling */
-    StatementClass *stmt;  /* needed to set error info in ENLARGE_.. */
-} QueryBuild;
-
-#define INIT_MIN_ALLOC 4096
-
-/*
- * New macros (Aceto)
- *--------------------
- */
-
-#define F_OldChar(qp) ((qp)->statement[(qp)->opos])
-
-#define F_OldPtr(qp) ((qp)->statement + (qp)->opos)
-
-#define F_OldNext(qp) (++(qp)->opos)
-
-#define F_OldPrior(qp) (--(qp)->opos)
-
-#define F_OldPos(qp) (qp)->opos
-
-#define F_ExtractOldTo(qp, buf, ch, maxsize)         \
-    do {                                             \
-        size_t c = 0;                                \
-        while ((qp)->statement[qp->opos] != '\0'     \
-               && (qp)->statement[qp->opos] != ch) { \
-            if (c >= maxsize)                        \
-                break;                               \
-            buf[c++] = (qp)->statement[qp->opos++];  \
-        }                                            \
-        if ((qp)->statement[qp->opos] == '\0') {     \
-            retval = SQL_ERROR;                      \
-            goto cleanup;                            \
-        }                                            \
-        buf[c] = '\0';                               \
-    } while (0)
-
-#define F_NewChar(qb) (qb->query_statement[(qb)->npos])
-
-#define F_NewPtr(qb) ((qb)->query_statement + (qb)->npos)
-
-#define F_NewNext(qb) (++(qb)->npos)
-
-#define F_NewPos(qb) ((qb)->npos)
-
-/*----------
- *	Terminate the stmt_with_params string with NULL.
- *----------
- */
-#define CVT_TERMINATE(qb)                         \
-    do {                                          \
-        if (NULL == (qb)->query_statement) {      \
-            retval = SQL_ERROR;                   \
-            goto cleanup;                         \
-        }                                         \
-        (qb)->query_statement[(qb)->npos] = '\0'; \
-    } while (0)
-
-/*----------
- *	Append a data.
- *----------
- */
-#define CVT_APPEND_DATA(qb, s, len)                         \
-    do {                                                    \
-        size_t newpos = (qb)->npos + len;                   \
-        ENLARGE_NEWSTATEMENT((qb), newpos);                 \
-        memcpy(&(qb)->query_statement[(qb)->npos], s, len); \
-        (qb)->npos = newpos;                                \
-        (qb)->query_statement[newpos] = '\0';               \
-    } while (0)
-
-/*----------
- *	Append a string.
- *----------
- */
-#define CVT_APPEND_STR(qb, s)        \
-    do {                             \
-        size_t len = strlen(s);      \
-        CVT_APPEND_DATA(qb, s, len); \
-    } while (0)
-
-/*----------
- *	Append a char.
- *----------
- */
-#define CVT_APPEND_CHAR(qb, c)                    \
-    do {                                          \
-        ENLARGE_NEWSTATEMENT(qb, (qb)->npos + 1); \
-        (qb)->query_statement[(qb)->npos++] = c;  \
-    } while (0)
-
-int findIdentifier(const UCHAR *str, int ccsc, const UCHAR **next_token) {
-    int slen = -1;
-    encoded_str encstr;
-    UCHAR tchar;
-    BOOL dquote = FALSE;
-
-    *next_token = NULL;
-    encoded_str_constr(&encstr, ccsc, (const char *)str);
-    for (tchar = (UCHAR)encoded_nextchar(&encstr); tchar;
-         tchar = (UCHAR)encoded_nextchar(&encstr)) {
-        if (MBCS_NON_ASCII(encstr))
-            continue;
-        if (encstr.pos == 0) /* the first character */
-        {
-            if (dquote = (IDENTIFIER_QUOTE == tchar), dquote)
-                continue;
-            if (!isalpha(tchar)) {
-                slen = 0;
-                if (IS_NOT_SPACE(tchar))
-                    *next_token = ENCODE_PTR(encstr);
-                break;
-            }
-        }
-        if (dquote) {
-            if (IDENTIFIER_QUOTE == tchar) {
-                tchar = (UCHAR)encoded_nextchar(&encstr);
-                if (IDENTIFIER_QUOTE == tchar)
-                    continue;
-                slen = (int)encstr.pos;
-                break;
-            }
-        } else {
-            if (isalnum(tchar))
-                continue;
-            switch (tchar) {
-                case '_':
-                case DOLLAR_QUOTE:
-                    continue;
-            }
-            slen = (int)encstr.pos;
-            if (IS_NOT_SPACE(tchar))
-                *next_token = ENCODE_PTR(encstr);
-            break;
-        }
-    }
-    if (slen < 0 && !dquote)
-        slen = (int)encstr.pos;
-    if (NULL == *next_token) {
-        for (; tchar; tchar = (UCHAR)encoded_nextchar(&encstr)) {
-            if (IS_NOT_SPACE((UCHAR)tchar)) {
-                *next_token = ENCODE_PTR(encstr);
-                break;
-            }
-        }
-    }
-    return slen;
-}
-
-static opensearchNAME lower_or_remove_dquote(opensearchNAME nm, const UCHAR *src, int srclen,
-                                     int ccsc) {
-    int i, outlen;
-    char *tc;
-    UCHAR tchar;
-    BOOL idQuote;
-    encoded_str encstr;
-
-    if (nm.name)
-        tc = realloc(nm.name, srclen + 1);
-    else
-        tc = malloc(srclen + 1);
-    if (!tc) {
-        NULL_THE_NAME(nm);
-        return nm;
-    }
-    nm.name = tc;
-    idQuote = (src[0] == IDENTIFIER_QUOTE);
-    encoded_str_constr(&encstr, ccsc, (const char *)src);
-    for (i = 0, tchar = (UCHAR)encoded_nextchar(&encstr), outlen = 0;
-         i < srclen; i++, tchar = (UCHAR)encoded_nextchar(&encstr)) {
-        if (MBCS_NON_ASCII(encstr)) {
-            tc[outlen++] = tchar;
-            continue;
-        }
-        if (idQuote) {
-            if (IDENTIFIER_QUOTE == tchar) {
-                if (0 == i)
-                    continue;
-                if (i == srclen - 1)
-                    continue;
-                i++;
-                tchar = (UCHAR)encoded_nextchar(&encstr);
-            }
-            tc[outlen++] = tchar;
-        } else {
-            tc[outlen++] = (char)tolower(tchar);
-        }
-    }
-    tc[outlen] = '\0';
-    return nm;
-}
-
-int eatTableIdentifiers(const UCHAR *str, int ccsc, opensearchNAME *table,
-                        opensearchNAME *schema) {
-    int len;
-    const UCHAR *next_token;
-    const UCHAR *tstr = str;
-
-    while (isspace(*tstr))
-        tstr++;
-
-    if ((len = findIdentifier(tstr, ccsc, &next_token)) <= 0)
-        return len; /* table name doesn't exist */
-    if (table) {
-        if (IDENTIFIER_QUOTE == *tstr)
-            *table = lower_or_remove_dquote(*table, tstr, len, ccsc);
-        else
-            STRN_TO_NAME(*table, tstr, len);
-    }
-    if (!next_token || '.' != *next_token || (int)(next_token - tstr) != len)
-        return (int)(next_token - str); /* table only */
-    tstr = next_token + 1;
-    if ((len = findIdentifier(tstr, ccsc, &next_token)) <= 0)
-        return -1;
-    if (table) {
-        if (schema)
-            MOVE_NAME(*schema, *table);
-        *table = lower_or_remove_dquote(*table, tstr, len, ccsc);
-    }
-    if (!next_token || '.' != *next_token || (int)(next_token - tstr) != len)
-        return (int)(next_token - str); /* schema.table */
-    tstr = next_token + 1;
-    if ((len = findIdentifier(tstr, ccsc, &next_token)) <= 0)
-        return -1;
-    if (table) {
-        if (schema)
-            MOVE_NAME(*schema, *table);
-        *table = lower_or_remove_dquote(*table, tstr, len, ccsc);
-    }
-    return (int)(next_token - str); /* catalog.schema.table */
-}
-
-#define PT_TOKEN_IGNORE(pt) ((pt)->curchar_processed = TRUE)
-
-#define MIN_ALC_SIZE 128
-
-/*
- * With SQL_MAX_NUMERIC_LEN = 16, the highest representable number is
- * 2^128 - 1, which fits in 39 digits.
- */
-#define MAX_NUMERIC_DIGITS 39
-
-/*
- * Convert a string representation of a numeric into SQL_NUMERIC_STRUCT.
- */
-static void parse_to_numeric_struct(const char *wv, SQL_NUMERIC_STRUCT *ns,
-                                    BOOL *overflow) {
-    int i, nlen, dig;
-    char calv[SQL_MAX_NUMERIC_LEN * 3];
-    BOOL dot_exist;
-
-    *overflow = FALSE;
-
-    /* skip leading space */
-    while (*wv && isspace((unsigned char)*wv))
-        wv++;
-
-    /* sign */
-    ns->sign = 1;
-    if (*wv == '-') {
-        ns->sign = 0;
-        wv++;
-    } else if (*wv == '+')
-        wv++;
-
-    /* skip leading zeros */
-    while (*wv == '0')
-        wv++;
-
-    /* read the digits into calv */
-    ns->precision = 0;
-    ns->scale = 0;
-    for (nlen = 0, dot_exist = FALSE;; wv++) {
-        if (*wv == '.') {
-            if (dot_exist)
-                break;
-            dot_exist = TRUE;
-        } else if (*wv == '\0' || !isdigit((unsigned char)*wv))
-            break;
-        else {
-            if (nlen >= (int)sizeof(calv)) {
-                if (dot_exist)
-                    break;
-                else {
-                    ns->scale--;
-                    *overflow = TRUE;
-                    continue;
-                }
-            }
-            if (dot_exist)
-                ns->scale++;
-            calv[nlen++] = *wv;
-        }
-    }
-    ns->precision = (SQLCHAR)nlen;
-
-    /* Convert the decimal digits to binary */
-    memset(ns->val, 0, sizeof(ns->val));
-    for (dig = 0; dig < nlen; dig++) {
-        UInt4 carry;
-
-        /* multiply the current value by 10, and add the next digit */
-        carry = calv[dig] - '0';
-        for (i = 0; i < (int)sizeof(ns->val); i++) {
-            UInt4 t;
-
-            t = ((UInt4)ns->val[i]) * 10 + carry;
-            ns->val[i] = (unsigned char)(t & 0xFF);
-            carry = (t >> 8);
-        }
-
-        if (carry != 0)
-            *overflow = TRUE;
-    }
-}
-
-static BOOL convert_money(const char *s, char *sout, size_t soutmax) {
-    char in, decp = 0;
-    size_t i = 0, out = 0;
-    int num_in = -1, period_in = -1, comma_in = -1;
-
-    for (i = 0; s[i]; i++) {
-        switch (in = s[i]) {
-            case '.':
-                if (period_in < 0)
-                    period_in = (int)i;
-                break;
-            case ',':
-                if (comma_in < 0)
-                    comma_in = (int)i;
-                break;
-            default:
-                if ('0' <= in && '9' >= in)
-                    num_in = (int)i;
-                break;
-        }
-    }
-    if (period_in > comma_in) {
-        if (period_in >= num_in - 2)
-            decp = '.';
-    } else if (comma_in >= 0 && comma_in >= num_in - 2)
-        decp = ',';
-    for (i = 0; s[i] && out + 1 < soutmax; i++) {
-        switch (in = s[i]) {
-            case '(':
-            case '-':
-                sout[out++] = '-';
-                break;
-            default:
-                if (in >= '0' && in <= '9')
-                    sout[out++] = in;
-                else if (in == decp)
-                    sout[out++] = '.';
-        }
-    }
-    sout[out] = '\0';
-    return TRUE;
-}
-
-/*	Change linefeed to carriage-return/linefeed */
-size_t convert_linefeeds(const char *si, char *dst, size_t max, BOOL convlf,
-                         BOOL *changed) {
-    size_t i = 0, out = 0;
-
-    if (max == 0)
-        max = 0xffffffff;
-    *changed = FALSE;
-    for (i = 0; si[i] && out < max - 1; i++) {
-        if (convlf && si[i] == '\n') {
-            /* Only add the carriage-return if needed */
-            if (i > 0 && OPENSEARCH_CARRIAGE_RETURN == si[i - 1]) {
-                if (dst)
-                    dst[out++] = si[i];
-                else
-                    out++;
-                continue;
-            }
-            *changed = TRUE;
-
-            if (dst) {
-                dst[out++] = OPENSEARCH_CARRIAGE_RETURN;
-                dst[out++] = '\n';
-            } else
-                out += 2;
-        } else {
-            if (dst)
-                dst[out++] = si[i];
-            else
-                out++;
-        }
-    }
-    if (dst)
-        dst[out] = '\0';
-    return out;
-}
-
-static int conv_from_octal(const char *s) {
-    ssize_t i;
-    int y = 0;
-
-    for (i = 1; i <= 3; i++)
-        y += (s[i] - '0') << (3 * (3 - i));
-
-    return y;
-}
-
-/*	convert octal escapes to bytes */
-static size_t convert_from_opensearchbinary(const char *value, char *rgbValue,
-                                    SQLLEN cbValueMax) {
-    UNUSED(cbValueMax);
-    size_t i, ilen = strlen(value);
-    size_t o = 0;
-
-    for (i = 0; i < ilen;) {
-        if (value[i] == BYTEA_ESCAPE_CHAR) {
-            if (value[i + 1] == BYTEA_ESCAPE_CHAR) {
-                if (rgbValue)
-                    rgbValue[o] = value[i];
-                o++;
-                i += 2;
-            } else if (value[i + 1] == 'x') {
-                i += 2;
-                if (i < ilen) {
-                    ilen -= i;
-                    if (rgbValue)
-                        opensearch_hex2bin(value + i, rgbValue + o, ilen);
-                    o += ilen / 2;
-                }
-                break;
-            } else {
-                if (rgbValue)
-                    rgbValue[o] = (char)conv_from_octal(&value[i]);
-                o++;
-                i += 4;
-            }
-        } else {
-            if (rgbValue)
-                rgbValue[o] = value[i];
-            o++;
-            i++;
-        }
-        /** if (rgbValue)
-            MYLOG(OPENSEARCH_DEBUG, "i=%d, rgbValue[%d] = %d, %c\n", i, o, rgbValue[o],
-           rgbValue[o]); ***/
-    }
-
-    if (rgbValue)
-        rgbValue[o] = '\0'; /* extra protection */
-
-    MYLOG(OPENSEARCH_DEBUG, "in=" FORMAT_SIZE_T ", out = " FORMAT_SIZE_T "\n", ilen, o);
-
-    return o;
-}
-
-static const char *hextbl = "0123456789ABCDEF";
-
-#define def_bin2hex(type)                                            \
-    (const char *src, type *dst, SQLLEN length) {                    \
-        const char *src_wk;                                          \
-        UCHAR chr;                                                   \
-        type *dst_wk;                                                \
-        BOOL backwards;                                              \
-        int i;                                                       \
-                                                                     \
-        backwards = FALSE;                                           \
-        if ((char *)dst < src) {                                     \
-            if ((char *)(dst + 2 * (length - 1)) > src + length - 1) \
-                return -1;                                           \
-        } else if ((char *)dst < src + length)                       \
-            backwards = TRUE;                                        \
-        if (backwards) {                                             \
-            for (i = 0, src_wk = src + length - 1,                   \
-                dst_wk = dst + 2 * length - 1;                       \
-                 i < length; i++, src_wk--) {                        \
-                chr = *src_wk;                                       \
-                *dst_wk-- = hextbl[chr % 16];                        \
-                *dst_wk-- = hextbl[chr >> 4];                        \
-            }                                                        \
-        } else {                                                     \
-            for (i = 0, src_wk = src, dst_wk = dst; i < length;      \
-                 i++, src_wk++) {                                    \
-                chr = *src_wk;                                       \
-                *dst_wk++ = hextbl[chr >> 4];                        \
-                *dst_wk++ = hextbl[chr % 16];                        \
-            }                                                        \
-        }                                                            \
-        dst[2 * length] = '\0';                                      \
-        return 2 * length * sizeof(type);                            \
-    }
-#ifdef UNICODE_SUPPORT
-static SQLLEN es_bin2whex def_bin2hex(SQLWCHAR)
-#endif /* UNICODE_SUPPORT */
-
-    static SQLLEN opensearch_bin2hex def_bin2hex(char)
-
-        SQLLEN opensearch_hex2bin(const char *in, char *out, SQLLEN len) {
-    UCHAR chr;
-    const char *src_wk;
-    char *dst_wk;
-    SQLLEN i;
-    int val;
-    BOOL HByte = TRUE;
-
-    for (i = 0, src_wk = in, dst_wk = out; i < len; i++, src_wk++) {
-        chr = *src_wk;
-        if (!chr)
-            break;
-        if (chr >= 'a' && chr <= 'f')
-            val = chr - 'a' + 10;
-        else if (chr >= 'A' && chr <= 'F')
-            val = chr - 'A' + 10;
-        else
-            val = chr - '0';
-        if (HByte)
-            *dst_wk = (char)(val << 4);
-        else {
-            *dst_wk += (char)val;
-            dst_wk++;
-        }
-        HByte = !HByte;
-    }
-    *dst_wk = '\0';
-    return len;
-}
-
-static int convert_lo(StatementClass *stmt, const void *value,
-                      SQLSMALLINT fCType, PTR rgbValue, SQLLEN cbValueMax,
-                      SQLLEN *pcbValue) {
-    UNUSED(cbValueMax, pcbValue, rgbValue, fCType, value);
-    SC_set_error(stmt, STMT_EXEC_ERROR,
-                 "Could not convert large object to c-type (large objects are "
-                 "not supported).",
-                 "convert_lo");
-    return COPY_GENERAL_ERROR;
-}
diff --git a/sql-odbc/src/sqlodbc/convert.h b/sql-odbc/src/sqlodbc/convert.h
deleted file mode 100644
index c833f46720..0000000000
--- a/sql-odbc/src/sqlodbc/convert.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __CONVERT_H__
-#define __CONVERT_H__
-
-#include "opensearch_odbc.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* copy_and_convert results */
-#define COPY_OK 0
-#define COPY_UNSUPPORTED_TYPE 1
-#define COPY_UNSUPPORTED_CONVERSION 2
-#define COPY_RESULT_TRUNCATED 3
-#define COPY_GENERAL_ERROR 4
-#define COPY_NO_DATA_FOUND 5
-#define COPY_INVALID_STRING_CONVERSION 6
-
-int copy_and_convert_field_bindinfo(StatementClass *stmt, OID field_type,
-                                    int atttypmod, void *value, int col);
-int copy_and_convert_field(StatementClass *stmt, OID field_type, int atttypmod,
-                           void *value, SQLSMALLINT fCType, int precision,
-                           PTR rgbValue, SQLLEN cbValueMax, SQLLEN *pcbValue,
-                           SQLLEN *pIndicator);
-
-SQLLEN opensearch_hex2bin(const char *in, char *out, SQLLEN len);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/sql-odbc/src/sqlodbc/descriptor.c b/sql-odbc/src/sqlodbc/descriptor.c
deleted file mode 100644
index 3c668f24dc..0000000000
--- a/sql-odbc/src/sqlodbc/descriptor.c
+++ /dev/null
@@ -1,574 +0,0 @@
-#include "descriptor.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "environ.h"
-#include "misc.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "qresult.h"
-#include "statement.h"
-
-void TI_Destructor(TABLE_INFO **ti, int count) {
-    int i;
-
-    MYLOG(OPENSEARCH_TRACE, "entering count=%d\n", count);
-    if (ti) {
-        for (i = 0; i < count; i++) {
-            if (ti[i]) {
-                COL_INFO *coli = ti[i]->col_info;
-                if (coli) {
-                    MYLOG(OPENSEARCH_ALL, "!!!refcnt %p:%d -> %d\n", coli, coli->refcnt,
-                          coli->refcnt - 1);
-                    coli->refcnt--;
-                    if (coli->refcnt <= 0
-                        && 0 == coli->acc_time) /* acc_time == 0 means the table
-                                                   is dropped */
-                        free_col_info_contents(coli);
-                }
-                NULL_THE_NAME(ti[i]->schema_name);
-                NULL_THE_NAME(ti[i]->table_name);
-                NULL_THE_NAME(ti[i]->table_alias);
-                NULL_THE_NAME(ti[i]->bestitem);
-                NULL_THE_NAME(ti[i]->bestqual);
-                TI_Destroy_IH(ti[i]);
-                free(ti[i]);
-                ti[i] = NULL;
-            }
-        }
-    }
-}
-
-void FI_Destructor(FIELD_INFO **fi, int count, BOOL freeFI) {
-    int i;
-
-    MYLOG(OPENSEARCH_TRACE, "entering count=%d\n", count);
-    if (fi) {
-        for (i = 0; i < count; i++) {
-            if (fi[i]) {
-                NULL_THE_NAME(fi[i]->column_name);
-                NULL_THE_NAME(fi[i]->column_alias);
-                NULL_THE_NAME(fi[i]->schema_name);
-                NULL_THE_NAME(fi[i]->before_dot);
-                if (freeFI) {
-                    free(fi[i]);
-                    fi[i] = NULL;
-                }
-            }
-        }
-        if (freeFI)
-            free(fi);
-    }
-}
-
-#define INIT_IH 32
-
-void TI_Destroy_IH(TABLE_INFO *ti) {
-    InheritanceClass *ih;
-    unsigned int i;
-
-    if (NULL == (ih = ti->ih))
-        return;
-    for (i = 0; i < ih->count; i++) {
-        NULL_THE_NAME(ih->inf[i].fullTable);
-    }
-    free(ih);
-    ti->ih = NULL;
-}
-
-void DC_Constructor(DescriptorClass *self, BOOL embedded,
-                    StatementClass *stmt) {
-    UNUSED(stmt);
-    memset(self, 0, sizeof(DescriptorClass));
-    self->deschd.embedded = (char)embedded;
-}
-
-static void ARDFields_free(ARDFields *self) {
-    MYLOG(OPENSEARCH_TRACE, "entering %p bookmark=%p\n", self, self->bookmark);
-    if (self->bookmark) {
-        free(self->bookmark);
-        self->bookmark = NULL;
-    }
-    /*
-     * the memory pointed to by the bindings is not deallocated by the
-     * driver but by the application that uses that driver, so we don't
-     * have to care
-     */
-    ARD_unbind_cols(self, TRUE);
-}
-
-static void APDFields_free(APDFields *self) {
-    if (self->bookmark) {
-        free(self->bookmark);
-        self->bookmark = NULL;
-    }
-    /* param bindings */
-    APD_free_params(self, STMT_FREE_PARAMS_ALL);
-}
-
-static void IRDFields_free(IRDFields *self) {
-    /* Free the parsed field information */
-    if (self->fi) {
-        FI_Destructor(self->fi, self->allocated, TRUE);
-        self->fi = NULL;
-    }
-    self->allocated = 0;
-    self->nfields = 0;
-}
-
-static void IPDFields_free(IPDFields *self) {
-    /* param bindings */
-    IPD_free_params(self, STMT_FREE_PARAMS_ALL);
-}
-
-void DC_Destructor(DescriptorClass *self) {
-    DescriptorHeader *deschd = &(self->deschd);
-    if (deschd->__error_message) {
-        free(deschd->__error_message);
-        deschd->__error_message = NULL;
-    }
-    if (deschd->opensearch_error) {
-        ER_Destructor(deschd->opensearch_error);
-        deschd->opensearch_error = NULL;
-    }
-    if (deschd->type_defined) {
-        switch (deschd->desc_type) {
-            case SQL_ATTR_APP_ROW_DESC:
-                ARDFields_free(&(self->ardf));
-                break;
-            case SQL_ATTR_APP_PARAM_DESC:
-                APDFields_free(&(self->apdf));
-                break;
-            case SQL_ATTR_IMP_ROW_DESC:
-                IRDFields_free(&(self->irdf));
-                break;
-            case SQL_ATTR_IMP_PARAM_DESC:
-                IPDFields_free(&(self->ipdf));
-                break;
-        }
-    }
-}
-
-void InitializeEmbeddedDescriptor(DescriptorClass *self, StatementClass *stmt,
-                                  UInt4 desc_type) {
-    DescriptorHeader *deschd = &(self->deschd);
-    DC_Constructor(self, TRUE, stmt);
-    DC_get_conn(self) = SC_get_conn(stmt);
-    deschd->type_defined = TRUE;
-    deschd->desc_type = desc_type;
-    switch (desc_type) {
-        case SQL_ATTR_APP_ROW_DESC:
-            memset(&(self->ardf), 0, sizeof(ARDFields));
-            stmt->ard = self;
-            break;
-        case SQL_ATTR_APP_PARAM_DESC:
-            memset(&(self->apdf), 0, sizeof(APDFields));
-            stmt->apd = self;
-            break;
-        case SQL_ATTR_IMP_ROW_DESC:
-            memset(&(self->irdf), 0, sizeof(IRDFields));
-            stmt->ird = self;
-            stmt->ird->irdf.stmt = stmt;
-            break;
-        case SQL_ATTR_IMP_PARAM_DESC:
-            memset(&(self->ipdf), 0, sizeof(IPDFields));
-            stmt->ipd = self;
-            break;
-    }
-}
-
-/*
- * ARDFields initialize
- */
-void InitializeARDFields(ARDFields *opt) {
-    memset(opt, 0, sizeof(ARDFields));
-    opt->size_of_rowset = 1;
-    opt->bind_size = 0; /* default is to bind by column */
-    opt->size_of_rowset_odbc2 = 1;
-}
-/*
- * APDFields initialize
- */
-void InitializeAPDFields(APDFields *opt) {
-    memset(opt, 0, sizeof(APDFields));
-    opt->paramset_size = 1;
-    opt->param_bind_type = 0;     /* default is to bind by column */
-    opt->paramset_size_dummy = 1; /* dummy setting */
-}
-
-BindInfoClass *ARD_AllocBookmark(ARDFields *ardopts) {
-    if (!ardopts->bookmark) {
-        ardopts->bookmark = (BindInfoClass *)malloc(sizeof(BindInfoClass));
-        memset(ardopts->bookmark, 0, sizeof(BindInfoClass));
-    }
-    return ardopts->bookmark;
-}
-
-#define DESC_INCREMENT 10
-char CC_add_descriptor(ConnectionClass *self, DescriptorClass *desc) {
-    int i;
-    int new_num_descs;
-    DescriptorClass **descs;
-
-    MYLOG(OPENSEARCH_TRACE, "entering self=%p, desc=%p\n", self, desc);
-
-    for (i = 0; i < self->num_descs; i++) {
-        if (!self->descs[i]) {
-            DC_get_conn(desc) = self;
-            self->descs[i] = desc;
-            return TRUE;
-        }
-    }
-    /* no more room -- allocate more memory */
-    new_num_descs = DESC_INCREMENT + self->num_descs;
-    descs = (DescriptorClass **)realloc(
-        self->descs, sizeof(DescriptorClass *) * new_num_descs);
-    if (!descs)
-        return FALSE;
-    self->descs = descs;
-
-    memset(&self->descs[self->num_descs], 0,
-           sizeof(DescriptorClass *) * DESC_INCREMENT);
-    DC_get_conn(desc) = self;
-    self->descs[self->num_descs] = desc;
-    self->num_descs = new_num_descs;
-
-    return TRUE;
-}
-
-/*
- *	This API allocates a Application descriptor.
- */
-RETCODE SQL_API OPENSEARCHAPI_AllocDesc(HDBC ConnectionHandle,
-                                SQLHDESC *DescriptorHandle) {
-    CSTR func = "OPENSEARCHAPI_AllocDesc";
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-    RETCODE ret = SQL_SUCCESS;
-    DescriptorClass *desc;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-
-    desc = (DescriptorClass *)malloc(sizeof(DescriptorClass));
-    if (desc) {
-        memset(desc, 0, sizeof(DescriptorClass));
-        DC_get_conn(desc) = conn;
-        if (CC_add_descriptor(conn, desc))
-            *DescriptorHandle = desc;
-        else {
-            free(desc);
-            CC_set_error(conn, CONN_STMT_ALLOC_ERROR,
-                         "Maximum number of descriptors exceeded", func);
-            ret = SQL_ERROR;
-        }
-    } else {
-        CC_set_error(conn, CONN_STMT_ALLOC_ERROR,
-                     "No more memory ti allocate a further descriptor", func);
-        ret = SQL_ERROR;
-    }
-    return ret;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_FreeDesc(SQLHDESC DescriptorHandle) {
-    DescriptorClass *desc = (DescriptorClass *)DescriptorHandle;
-    RETCODE ret = SQL_SUCCESS;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-    DC_Destructor(desc);
-    if (!desc->deschd.embedded) {
-        int i;
-        ConnectionClass *conn = DC_get_conn(desc);
-
-        for (i = 0; i < conn->num_descs; i++) {
-            if (conn->descs[i] == desc) {
-                conn->descs[i] = NULL;
-                break;
-            }
-        }
-        free(desc);
-    }
-    return ret;
-}
-
-static void BindInfoClass_copy(const BindInfoClass *src,
-                               BindInfoClass *target) {
-    memcpy(target, src, sizeof(BindInfoClass));
-}
-static void ARDFields_copy(const ARDFields *src, ARDFields *target) {
-    memcpy(target, src, sizeof(ARDFields));
-    target->bookmark = NULL;
-    if (src->bookmark) {
-        BindInfoClass *bookmark = ARD_AllocBookmark(target);
-        if (bookmark)
-            BindInfoClass_copy(src->bookmark, bookmark);
-    }
-    if (src->allocated <= 0) {
-        target->allocated = 0;
-        target->bindings = NULL;
-    } else {
-        int i;
-
-        target->bindings = malloc(target->allocated * sizeof(BindInfoClass));
-        if (!target->bindings)
-            target->allocated = 0;
-        for (i = 0; i < target->allocated; i++)
-            BindInfoClass_copy(&src->bindings[i], &target->bindings[i]);
-    }
-}
-
-static void ParameterInfoClass_copy(const ParameterInfoClass *src,
-                                    ParameterInfoClass *target) {
-    memcpy(target, src, sizeof(ParameterInfoClass));
-}
-static void APDFields_copy(const APDFields *src, APDFields *target) {
-    memcpy(target, src, sizeof(APDFields));
-    if (src->bookmark) {
-        target->bookmark = malloc(sizeof(ParameterInfoClass));
-        if (target->bookmark)
-            ParameterInfoClass_copy(src->bookmark, target->bookmark);
-    }
-    if (src->allocated <= 0) {
-        target->allocated = 0;
-        target->parameters = NULL;
-    } else {
-        int i;
-
-        target->parameters =
-            malloc(target->allocated * sizeof(ParameterInfoClass));
-        if (!target->parameters)
-            target->allocated = 0;
-        for (i = 0; i < target->allocated; i++)
-            ParameterInfoClass_copy(&src->parameters[i],
-                                    &target->parameters[i]);
-    }
-}
-
-static void ParameterImplClass_copy(const ParameterImplClass *src,
-                                    ParameterImplClass *target) {
-    memcpy(target, src, sizeof(ParameterImplClass));
-}
-static void IPDFields_copy(const IPDFields *src, IPDFields *target) {
-    memcpy(target, src, sizeof(IPDFields));
-    if (src->allocated <= 0) {
-        target->allocated = 0;
-        target->parameters = NULL;
-    } else {
-        int i;
-
-        target->parameters = (ParameterImplClass *)malloc(
-            target->allocated * sizeof(ParameterImplClass));
-        if (!target->parameters)
-            target->allocated = 0;
-        for (i = 0; i < target->allocated; i++)
-            ParameterImplClass_copy(&src->parameters[i],
-                                    &target->parameters[i]);
-    }
-}
-
-RETCODE SQL_API OPENSEARCHAPI_CopyDesc(SQLHDESC SourceDescHandle,
-                               SQLHDESC TargetDescHandle) {
-    RETCODE ret = SQL_ERROR;
-    DescriptorClass *src, *target;
-    DescriptorHeader *srchd, *targethd;
-    ARDFields *ard_src, *ard_tgt;
-    APDFields *apd_src, *apd_tgt;
-    IPDFields *ipd_src, *ipd_tgt;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-    src = (DescriptorClass *)SourceDescHandle;
-    target = (DescriptorClass *)TargetDescHandle;
-    srchd = &(src->deschd);
-    targethd = &(target->deschd);
-    if (!srchd->type_defined) {
-        MYLOG(OPENSEARCH_ERROR, "source type undefined\n");
-        DC_set_error(target, DESC_EXEC_ERROR, "source handle type undefined");
-        return ret;
-    }
-    if (targethd->type_defined) {
-        MYLOG(OPENSEARCH_DEBUG, "source type=%d -> target type=%d\n", srchd->desc_type,
-              targethd->desc_type);
-        if (SQL_ATTR_IMP_ROW_DESC == targethd->desc_type) {
-            MYLOG(OPENSEARCH_DEBUG, "can't modify IRD\n");
-            DC_set_error(target, DESC_EXEC_ERROR, "can't copy to IRD");
-            return ret;
-        } else if (targethd->desc_type != srchd->desc_type) {
-            if (targethd->embedded) {
-                MYLOG(OPENSEARCH_DEBUG, "src type != target type\n");
-                DC_set_error(
-                    target, DESC_EXEC_ERROR,
-                    "copying different type descriptor to embedded one");
-                return ret;
-            }
-        }
-        DC_Destructor(target);
-    }
-    ret = SQL_SUCCESS;
-    switch (srchd->desc_type) {
-        case SQL_ATTR_APP_ROW_DESC:
-            MYLOG(OPENSEARCH_DEBUG, "src=%p target=%p type=%d", src, target,
-                  srchd->desc_type);
-            if (!targethd->type_defined) {
-                targethd->desc_type = srchd->desc_type;
-            }
-            ard_src = &(src->ardf);
-            MYPRINTF(OPENSEARCH_DEBUG,
-                     " rowset_size=" FORMAT_LEN " bind_size=" FORMAT_UINTEGER
-                     " ope_ptr=%p off_ptr=%p\n",
-                     ard_src->size_of_rowset, ard_src->bind_size,
-                     ard_src->row_operation_ptr, ard_src->row_offset_ptr);
-            ard_tgt = &(target->ardf);
-            MYPRINTF(OPENSEARCH_DEBUG, " target=%p", ard_tgt);
-            ARDFields_copy(ard_src, ard_tgt);
-            MYPRINTF(OPENSEARCH_DEBUG, " offset_ptr=%p\n", ard_tgt->row_offset_ptr);
-            break;
-        case SQL_ATTR_APP_PARAM_DESC:
-            if (!targethd->type_defined) {
-                targethd->desc_type = srchd->desc_type;
-            }
-            apd_src = &(src->apdf);
-            apd_tgt = &(target->apdf);
-            APDFields_copy(apd_src, apd_tgt);
-            break;
-        case SQL_ATTR_IMP_PARAM_DESC:
-            if (!targethd->type_defined) {
-                targethd->desc_type = srchd->desc_type;
-            }
-            ipd_src = &(src->ipdf);
-            ipd_tgt = &(target->ipdf);
-            IPDFields_copy(ipd_src, ipd_tgt);
-            break;
-        default:
-            MYLOG(OPENSEARCH_DEBUG, "invalid descriptor handle type=%d\n",
-                  srchd->desc_type);
-            DC_set_error(target, DESC_EXEC_ERROR, "invalid descriptor type");
-            ret = SQL_ERROR;
-    }
-
-    if (SQL_SUCCESS == ret)
-        targethd->type_defined = TRUE;
-    return ret;
-}
-
-void DC_set_error(DescriptorClass *self, int errornumber,
-                  const char *errormsg) {
-    DescriptorHeader *deschd = &(self->deschd);
-    if (deschd->__error_message)
-        free(deschd->__error_message);
-    deschd->__error_number = errornumber;
-    deschd->__error_message = errormsg ? strdup(errormsg) : NULL;
-}
-void DC_set_errormsg(DescriptorClass *self, const char *errormsg) {
-    DescriptorHeader *deschd = &(self->deschd);
-    if (deschd->__error_message)
-        free(deschd->__error_message);
-    deschd->__error_message = errormsg ? strdup(errormsg) : NULL;
-}
-const char *DC_get_errormsg(const DescriptorClass *desc) {
-    return desc->deschd.__error_message;
-}
-int DC_get_errornumber(const DescriptorClass *desc) {
-    return desc->deschd.__error_number;
-}
-
-/*	Map sql commands to statement types */
-static const struct {
-    int number;
-    const char ver3str[6];
-    const char ver2str[6];
-} Descriptor_sqlstate[] =
-
-    {
-        {DESC_ERROR_IN_ROW, "01S01", "01S01"},
-        {DESC_OPTION_VALUE_CHANGED, "01S02", "01S02"},
-        {DESC_OK, "00000", "00000"},         /* OK */
-        {DESC_EXEC_ERROR, "HY000", "S1000"}, /* also a general error */
-        {DESC_STATUS_ERROR, "HY010", "S1010"},
-        {DESC_SEQUENCE_ERROR, "HY010", "S1010"}, /* Function sequence error */
-        {DESC_NO_MEMORY_ERROR, "HY001",
-         "S1001"},                             /* memory allocation failure */
-        {DESC_COLNUM_ERROR, "07009", "S1002"}, /* invalid column number */
-        {DESC_NO_STMTSTRING, "HY001",
-         "S1001"}, /* having no stmtstring is also a malloc problem */
-        {DESC_ERROR_TAKEN_FROM_BACKEND, "HY000", "S1000"}, /* general error */
-        {DESC_INTERNAL_ERROR, "HY000", "S1000"},           /* general error */
-        {DESC_STILL_EXECUTING, "HY010", "S1010"},
-        {DESC_NOT_IMPLEMENTED_ERROR, "HYC00", "S1C00"}, /* == 'driver not
-                                                         * capable' */
-        {DESC_BAD_PARAMETER_NUMBER_ERROR, "07009", "S1093"},
-        {DESC_OPTION_OUT_OF_RANGE_ERROR, "HY092", "S1092"},
-        {DESC_INVALID_COLUMN_NUMBER_ERROR, "07009", "S1002"},
-        {DESC_RESTRICTED_DATA_TYPE_ERROR, "07006", "07006"},
-        {DESC_INVALID_CURSOR_STATE_ERROR, "07005", "24000"},
-        {DESC_CREATE_TABLE_ERROR, "42S01", "S0001"}, /* table already exists */
-        {DESC_NO_CURSOR_NAME, "S1015", "S1015"},
-        {DESC_INVALID_CURSOR_NAME, "34000", "34000"},
-        {DESC_INVALID_ARGUMENT_NO, "HY024",
-         "S1009"}, /* invalid argument value */
-        {DESC_ROW_OUT_OF_RANGE, "HY107", "S1107"},
-        {DESC_OPERATION_CANCELLED, "HY008", "S1008"},
-        {DESC_INVALID_CURSOR_POSITION, "HY109", "S1109"},
-        {DESC_VALUE_OUT_OF_RANGE, "HY019", "22003"},
-        {DESC_OPERATION_INVALID, "HY011", "S1011"},
-        {DESC_PROGRAM_TYPE_OUT_OF_RANGE, "?????", "?????"},
-        {DESC_BAD_ERROR, "08S01", "08S01"}, /* communication link failure */
-        {DESC_INVALID_OPTION_IDENTIFIER, "HY092", "HY092"},
-        {DESC_RETURN_NULL_WITHOUT_INDICATOR, "22002", "22002"},
-        {DESC_INVALID_DESCRIPTOR_IDENTIFIER, "HY091", "HY091"},
-        {DESC_OPTION_NOT_FOR_THE_DRIVER, "HYC00", "HYC00"},
-        {DESC_FETCH_OUT_OF_RANGE, "HY106", "S1106"},
-        {DESC_COUNT_FIELD_INCORRECT, "07002", "07002"},
-};
-
-static OpenSearch_ErrorInfo *DC_create_errorinfo(const DescriptorClass *self) {
-    const DescriptorHeader *deschd = &(self->deschd);
-    OpenSearch_ErrorInfo *error;
-    ConnectionClass *conn;
-    EnvironmentClass *env;
-    Int4 errornum;
-    BOOL env_is_odbc3 = TRUE;
-
-    if (deschd->opensearch_error)
-        return deschd->opensearch_error;
-    errornum = deschd->__error_number;
-    error = ER_Constructor(errornum, deschd->__error_message);
-    if (!error)
-        return error;
-    conn = DC_get_conn(self);
-    if (conn && (env = (EnvironmentClass *)conn->henv, env))
-        env_is_odbc3 = EN_is_odbc3(env);
-    errornum -= LOWEST_DESC_ERROR;
-    if (errornum < 0
-        || errornum >= (int)(sizeof(Descriptor_sqlstate)
-                             / sizeof(Descriptor_sqlstate[0])))
-        errornum = 1 - LOWEST_DESC_ERROR;
-    STRCPY_FIXED(error->sqlstate, env_is_odbc3
-                                      ? Descriptor_sqlstate[errornum].ver3str
-                                      : Descriptor_sqlstate[errornum].ver2str);
-    return error;
-}
-void DC_log_error(const char *func, const char *desc,
-                  const DescriptorClass *self) {
-#define nullcheck(a) (a ? a : "(NULL)")
-    if (self) {
-        MYLOG(OPENSEARCH_DEBUG,
-              "DESCRIPTOR ERROR: func=%s, desc='%s', errnum=%d, errmsg='%s'\n",
-              func, desc, self->deschd.__error_number,
-              nullcheck(self->deschd.__error_message));
-    }
-}
-
-/*		Returns the next SQL error information. */
-RETCODE SQL_API OPENSEARCHAPI_DescError(SQLHDESC hdesc, SQLSMALLINT RecNumber,
-                                SQLCHAR *szSqlState, SQLINTEGER *pfNativeError,
-                                SQLCHAR *szErrorMsg, SQLSMALLINT cbErrorMsgMax,
-                                SQLSMALLINT *pcbErrorMsg, UWORD flag) {
-    /* CC: return an error of a hdesc  */
-    DescriptorClass *desc = (DescriptorClass *)hdesc;
-    DescriptorHeader *deschd = &(desc->deschd);
-
-    MYLOG(OPENSEARCH_TRACE, "entering RecN=%hd\n", RecNumber);
-    deschd->opensearch_error = DC_create_errorinfo(desc);
-    return ER_ReturnError(deschd->opensearch_error, RecNumber, szSqlState, pfNativeError,
-                          szErrorMsg, cbErrorMsgMax, pcbErrorMsg, flag);
-}
diff --git a/sql-odbc/src/sqlodbc/descriptor.h b/sql-odbc/src/sqlodbc/descriptor.h
deleted file mode 100644
index 59831d8d97..0000000000
--- a/sql-odbc/src/sqlodbc/descriptor.h
+++ /dev/null
@@ -1,254 +0,0 @@
-#ifndef __DESCRIPTOR_H__
-#define __DESCRIPTOR_H__
-
-#include "opensearch_odbc.h"
-
-#ifdef WIN32
-#pragma warning(push)
-#pragma warning(disable : 4201)  // nonstandard extension used: nameless
-                                 // struct/union warning
-#endif                           // WIN32
-
-typedef struct InheritanceClass {
-    UInt4 allocated;
-    UInt4 count;
-    OID cur_tableoid;
-    opensearchNAME cur_fullTable;
-    struct {
-        OID tableoid;
-        opensearchNAME fullTable;
-    } inf[1];
-} InheritanceClass;
-
-enum {
-    TI_UPDATABLE = 1L,
-    TI_HASOIDS_CHECKED = (1L << 1),
-    TI_HASOIDS = (1L << 2),
-    TI_COLATTRIBUTE = (1L << 3),
-    TI_HASSUBCLASS = (1L << 4)
-};
-typedef struct {
-    OID table_oid;
-    COL_INFO *col_info; /* cached SQLColumns info for this table */
-    opensearchNAME schema_name;
-    opensearchNAME table_name;
-    opensearchNAME table_alias;
-    opensearchNAME bestitem;
-    opensearchNAME bestqual;
-    UInt4 flags;
-    InheritanceClass *ih;
-} TABLE_INFO;
-#define TI_set_updatable(ti) (ti->flags |= TI_UPDATABLE)
-#define TI_is_updatable(ti) (0 != (ti->flags & TI_UPDATABLE))
-#define TI_no_updatable(ti) (ti->flags &= (~TI_UPDATABLE))
-#define TI_set_hasoids_checked(ti) (ti->flags |= TI_HASOIDS_CHECKED)
-#define TI_checked_hasoids(ti) (0 != (ti->flags & TI_HASOIDS))
-#define TI_set_hasoids(ti) (ti->flags |= TI_HASOIDS)
-#define TI_has_oids(ti) (0 != (ti->flags & TI_HASOIDS))
-#define TI_set_has_no_oids(ti) (ti->flags &= (~TI_HASOIDS))
-#define TI_set_hassubclass(ti) (ti->flags |= TI_HASSUBCLASS)
-#define TI_has_subclass(ti) (0 != (ti->flags & TI_HASSUBCLASS))
-#define TI_set_has_no_subclass(ti) (ti->flags &= (~TI_HASSUBCLASS))
-void TI_Destructor(TABLE_INFO **, int);
-void TI_Destroy_IH(TABLE_INFO *ti);
-
-enum {
-    FIELD_INITIALIZED = 0,
-    FIELD_PARSING = 1L,
-    FIELD_TEMP_SET = (1L << 1),
-    FIELD_COL_ATTRIBUTE = (1L << 2),
-    FIELD_PARSED_OK = (1L << 3),
-    FIELD_PARSED_INCOMPLETE = (1L << 4)
-};
-typedef struct {
-    char flag;
-    char updatable;
-    Int2 attnum;
-    opensearchNAME schema_name;
-    TABLE_INFO *ti; /* to resolve explicit table names */
-    opensearchNAME column_name;
-    opensearchNAME column_alias;
-    char nullable;
-    char auto_increment;
-    char func;
-    char columnkey;
-    int column_size;    /* precision in 2.x */
-    int decimal_digits; /* scale in 2.x */
-    int display_size;
-    SQLLEN length;
-    OID columntype;
-    OID basetype; /* may be the basetype when the column type is a domain */
-    int typmod;
-    char expr;
-    char quote;
-    char dquote;
-    char numeric;
-    opensearchNAME before_dot;
-} FIELD_INFO;
-Int4 FI_precision(const FIELD_INFO *);
-void FI_Destructor(FIELD_INFO **, int, BOOL freeFI);
-#define FI_is_applicable(fi) \
-    (NULL != fi && (fi->flag & (FIELD_PARSED_OK | FIELD_COL_ATTRIBUTE)) != 0)
-#define FI_type(fi) (0 == (fi)->basetype ? (fi)->columntype : (fi)->basetype)
-
-typedef struct DescriptorHeader_ {
-    ConnectionClass *conn_conn;
-    char embedded;
-    char type_defined;
-    UInt4 desc_type;
-    UInt4 error_row;   /* 1-based row */
-    UInt4 error_index; /* 1-based index */
-    Int4 __error_number;
-    char *__error_message;
-    OpenSearch_ErrorInfo *opensearch_error;
-} DescriptorHeader;
-
-/*
- *	ARD and APD are(must be) of the same format
- */
-struct ARDFields_ {
-    SQLLEN size_of_rowset; /* for ODBC3 fetch operation */
-    SQLUINTEGER bind_size; /* size of each structure if using
-                            * Row-wise Binding */
-    SQLUSMALLINT *row_operation_ptr;
-    SQLULEN *row_offset_ptr;
-    BindInfoClass *bookmark;
-    BindInfoClass *bindings;
-    SQLSMALLINT allocated;
-    SQLLEN size_of_rowset_odbc2; /* for SQLExtendedFetch */
-};
-
-/*
- *	APD must be of the same format as ARD
- */
-struct APDFields_ {
-    SQLLEN paramset_size;        /* really an SQLINTEGER type */
-    SQLUINTEGER param_bind_type; /* size of each structure if using
-                                  * Row-wise Parameter Binding */
-    SQLUSMALLINT *param_operation_ptr;
-    SQLULEN *param_offset_ptr;
-    ParameterInfoClass *bookmark; /* dummy item to fit APD to ARD */
-    ParameterInfoClass *parameters;
-    SQLSMALLINT allocated;
-    SQLLEN paramset_size_dummy; /* dummy item to fit APD to ARD */
-};
-
-struct IRDFields_ {
-    StatementClass *stmt;
-    SQLULEN *rowsFetched;
-    SQLUSMALLINT *rowStatusArray;
-    UInt4 nfields;
-    SQLSMALLINT allocated;
-    FIELD_INFO **fi;
-};
-
-struct IPDFields_ {
-    SQLULEN *param_processed_ptr;
-    SQLUSMALLINT *param_status_ptr;
-    SQLSMALLINT allocated;
-    ParameterImplClass *parameters;
-};
-
-/***
-typedef struct
-{
-    DescriptorHeader	deschd;
-    ARDFields		ardopts;
-}	ARDClass;
-typedef struct
-{
-    DescriptorHeader	deschd;
-    APDFields		apdopts;
-}	APDClass;
-typedef struct
-{
-    DescriptorHeader	deschd;
-    IRDFields		irdopts;
-}	IRDClass;
-typedef struct
-{
-    DescriptorHeader	deschd;
-    IPDFields		ipdopts;
-}	IPDClass;
-***/
-typedef struct {
-    DescriptorHeader deschd;
-    union {
-        ARDFields ardf;
-        APDFields apdf;
-        IRDFields irdf;
-        IPDFields ipdf;
-    };
-} DescriptorClass;
-
-#define DC_get_conn(a) ((a)->deschd.conn_conn)
-#define DC_get_desc_type(a) ((a)->deschd.desc_type)
-#define DC_get_embedded(a) ((a)->deschd.embedded)
-
-void InitializeEmbeddedDescriptor(DescriptorClass *, StatementClass *stmt,
-                                  UInt4 desc_type);
-void DC_Destructor(DescriptorClass *desc);
-void InitializeARDFields(ARDFields *self);
-void InitializeAPDFields(APDFields *self);
-/* void	InitializeIRDFields(IRDFields *self);
-void	InitializeIPDFiedls(IPDFields *self); */
-BindInfoClass *ARD_AllocBookmark(ARDFields *self);
-void ARD_unbind_cols(ARDFields *self, BOOL freeall);
-void APD_free_params(APDFields *self, char option);
-void IPD_free_params(IPDFields *self, char option);
-RETCODE DC_set_stmt(DescriptorClass *desc, StatementClass *stmt);
-void DC_set_error(DescriptorClass *desc, int errornumber, const char *errormsg);
-void DC_set_errormsg(DescriptorClass *desc, const char *errormsg);
-OpenSearch_ErrorInfo *DC_get_error(DescriptorClass *self);
-int DC_get_errornumber(const DescriptorClass *self);
-const char *DC_get_errormsg(const DescriptorClass *self);
-void DC_log_error(const char *func, const char *desc,
-                  const DescriptorClass *self);
-
-/*	Error numbers about descriptor handle */
-enum {
-    LOWEST_DESC_ERROR = -2
-    /* minus means warning/notice message */
-    ,
-    DESC_ERROR_IN_ROW = -2,
-    DESC_OPTION_VALUE_CHANGED = -1,
-    DESC_OK = 0,
-    DESC_EXEC_ERROR,
-    DESC_STATUS_ERROR,
-    DESC_SEQUENCE_ERROR,
-    DESC_NO_MEMORY_ERROR,
-    DESC_COLNUM_ERROR,
-    DESC_NO_STMTSTRING,
-    DESC_ERROR_TAKEN_FROM_BACKEND,
-    DESC_INTERNAL_ERROR,
-    DESC_STILL_EXECUTING,
-    DESC_NOT_IMPLEMENTED_ERROR,
-    DESC_BAD_PARAMETER_NUMBER_ERROR,
-    DESC_OPTION_OUT_OF_RANGE_ERROR,
-    DESC_INVALID_COLUMN_NUMBER_ERROR,
-    DESC_RESTRICTED_DATA_TYPE_ERROR,
-    DESC_INVALID_CURSOR_STATE_ERROR,
-    DESC_CREATE_TABLE_ERROR,
-    DESC_NO_CURSOR_NAME,
-    DESC_INVALID_CURSOR_NAME,
-    DESC_INVALID_ARGUMENT_NO,
-    DESC_ROW_OUT_OF_RANGE,
-    DESC_OPERATION_CANCELLED,
-    DESC_INVALID_CURSOR_POSITION,
-    DESC_VALUE_OUT_OF_RANGE,
-    DESC_OPERATION_INVALID,
-    DESC_PROGRAM_TYPE_OUT_OF_RANGE,
-    DESC_BAD_ERROR,
-    DESC_INVALID_OPTION_IDENTIFIER,
-    DESC_RETURN_NULL_WITHOUT_INDICATOR,
-    DESC_INVALID_DESCRIPTOR_IDENTIFIER,
-    DESC_OPTION_NOT_FOR_THE_DRIVER,
-    DESC_FETCH_OUT_OF_RANGE,
-    DESC_COUNT_FIELD_INCORRECT
-};
-
-#ifdef WIN32
-#pragma warning(pop)
-#endif  // WIN32
-
-#endif /* __DESCRIPTOR_H__ */
diff --git a/sql-odbc/src/sqlodbc/dlg_specific.c b/sql-odbc/src/sqlodbc/dlg_specific.c
deleted file mode 100644
index f210bf0257..0000000000
--- a/sql-odbc/src/sqlodbc/dlg_specific.c
+++ /dev/null
@@ -1,506 +0,0 @@
-#include "dlg_specific.h"
-
-#include <ctype.h>
-
-#include "misc.h"
-#include "opensearch_apifunc.h"
-
-#define NULL_IF_NULL(a) ((a) ? ((const char *)(a)) : "(null)")
-
-static void encode(const opensearchNAME, char *out, int outlen);
-static opensearchNAME decode(const char *in);
-static opensearchNAME decode_or_remove_braces(const char *in);
-
-#define OVR_EXTRA_BITS                                                      \
-    (BIT_FORCEABBREVCONNSTR | BIT_FAKE_MSS | BIT_BDE_ENVIRONMENT            \
-     | BIT_CVT_NULL_DATE | BIT_ACCESSIBLE_ONLY | BIT_IGNORE_ROUND_TRIP_TIME \
-     | BIT_DISABLE_KEEPALIVE)
-
-#define OPENING_BRACKET '{'
-#define CLOSING_BRACKET '}'
-
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wembedded-directive"
-#endif  // __APPLE__
-void makeConnectString(char *connect_string, const ConnInfo *ci, UWORD len) {
-    UNUSED(len);
-    char got_dsn = (ci->dsn[0] != '\0');
-    char encoded_item[LARGE_REGISTRY_LEN];
-    char *connsetStr = NULL;
-    char *esoptStr = NULL;
-#ifdef _HANDLE_ENLIST_IN_DTC_
-    char xaOptStr[16];
-#endif
-    ssize_t hlen, nlen, olen;
-
-    encode(ci->password, encoded_item, sizeof(encoded_item));
-    /* fundamental info */
-    nlen = MAX_CONNECT_STRING;
-    olen = snprintf(
-        connect_string, nlen,
-        "%s=%s;" INI_SERVER
-        "=%s;"
-        "database=OpenSearch;" INI_PORT "=%s;" INI_USERNAME_ABBR
-        "=%s;" INI_PASSWORD_ABBR "=%s;" INI_AUTH_MODE "=%s;" INI_REGION
-        "=%s;" INI_SSL_USE "=%d;" INI_SSL_HOST_VERIFY "=%d;" INI_LOG_LEVEL
-        "=%d;" INI_LOG_OUTPUT "=%s;" INI_TIMEOUT "=%s;" INI_FETCH_SIZE "=%s;",
-        got_dsn ? "DSN" : "DRIVER", got_dsn ? ci->dsn : ci->drivername,
-        ci->server, ci->port, ci->username, encoded_item, ci->authtype,
-        ci->region, (int)ci->use_ssl, (int)ci->verify_server,
-        (int)ci->drivers.loglevel, ci->drivers.output_dir,
-        ci->response_timeout, ci->fetch_size);
-    if (olen < 0 || olen >= nlen) {
-        connect_string[0] = '\0';
-        return;
-    }
-
-    /* extra info */
-    hlen = strlen(connect_string);
-    nlen = MAX_CONNECT_STRING - hlen;
-    if (olen < 0 || olen >= nlen) /* failed */
-        connect_string[0] = '\0';
-
-    if (NULL != connsetStr)
-        free(connsetStr);
-    if (NULL != esoptStr)
-        free(esoptStr);
-}
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-
-BOOL get_DSN_or_Driver(ConnInfo *ci, const char *attribute, const char *value) {
-    BOOL found = TRUE;
-
-    if (stricmp(attribute, "DSN") == 0)
-        STRCPY_FIXED(ci->dsn, value);
-    else if (stricmp(attribute, "driver") == 0)
-        STRCPY_FIXED(ci->drivername, value);
-    else
-        found = FALSE;
-
-    return found;
-}
-
-BOOL copyConnAttributes(ConnInfo *ci, const char *attribute,
-                        const char *value) {
-    BOOL found = TRUE, printed = FALSE;
-    if (stricmp(attribute, "DSN") == 0)
-        STRCPY_FIXED(ci->dsn, value);
-    else if (stricmp(attribute, "driver") == 0)
-        STRCPY_FIXED(ci->drivername, value);
-    else if ((stricmp(attribute, INI_HOST) == 0)
-             || (stricmp(attribute, INI_SERVER) == 0))
-        STRCPY_FIXED(ci->server, value);
-    else if (stricmp(attribute, INI_PORT) == 0)
-        STRCPY_FIXED(ci->port, value);
-    else if ((stricmp(attribute, INI_USERNAME) == 0)
-             || (stricmp(attribute, INI_USERNAME_ABBR) == 0))
-        STRCPY_FIXED(ci->username, value);
-    else if ((stricmp(attribute, INI_PASSWORD) == 0)
-             || (stricmp(attribute, INI_PASSWORD_ABBR) == 0)) {
-        ci->password = decode_or_remove_braces(value);
-#ifndef FORCE_PASSWORDE_DISPLAY
-        MYLOG(OPENSEARCH_DEBUG, "key='%s' value='xxxxxxxx'\n", attribute);
-        printed = TRUE;
-#endif
-    } else if (stricmp(attribute, INI_AUTH_MODE) == 0)
-        STRCPY_FIXED(ci->authtype, value);
-    else if (stricmp(attribute, INI_REGION) == 0)
-        STRCPY_FIXED(ci->region, value);
-    else if (stricmp(attribute, INI_SSL_USE) == 0)
-        ci->use_ssl = (char)atoi(value);
-    else if (stricmp(attribute, INI_SSL_HOST_VERIFY) == 0)
-        ci->verify_server = (char)atoi(value);
-    else if (stricmp(attribute, INI_LOG_LEVEL) == 0)
-        ci->drivers.loglevel = (char)atoi(value);
-    else if (stricmp(attribute, INI_LOG_OUTPUT) == 0)
-        STRCPY_FIXED(ci->drivers.output_dir, value);
-    else if (stricmp(attribute, INI_TIMEOUT) == 0)
-        STRCPY_FIXED(ci->response_timeout, value);
-    else if (stricmp(attribute, INI_FETCH_SIZE) == 0)
-        STRCPY_FIXED(ci->fetch_size, value);
-    else
-        found = FALSE;
-
-    if (!printed)
-        MYLOG(OPENSEARCH_DEBUG, "key='%s' value='%s'%s\n", attribute, value,
-              found ? NULL_STRING : " not found");
-
-    return found;
-}
-
-static void getCiDefaults(ConnInfo *ci) {
-    strncpy(ci->desc, DEFAULT_DESC, MEDIUM_REGISTRY_LEN);
-    strncpy(ci->drivername, DEFAULT_DRIVERNAME, MEDIUM_REGISTRY_LEN);
-    strncpy(ci->server, DEFAULT_HOST, MEDIUM_REGISTRY_LEN);
-    strncpy(ci->port, DEFAULT_PORT, SMALL_REGISTRY_LEN);
-    strncpy(ci->response_timeout, DEFAULT_RESPONSE_TIMEOUT_STR,
-            SMALL_REGISTRY_LEN);
-    strncpy(ci->fetch_size, DEFAULT_FETCH_SIZE_STR,
-            SMALL_REGISTRY_LEN);
-    strncpy(ci->authtype, DEFAULT_AUTHTYPE, MEDIUM_REGISTRY_LEN);
-    if (ci->password.name != NULL)
-        free(ci->password.name);
-    ci->password.name = NULL;
-    strncpy(ci->username, DEFAULT_USERNAME, MEDIUM_REGISTRY_LEN);
-    strncpy(ci->region, DEFAULT_REGION, MEDIUM_REGISTRY_LEN);
-    ci->use_ssl = DEFAULT_USE_SSL;
-    ci->verify_server = DEFAULT_VERIFY_SERVER;
-    strcpy(ci->drivers.output_dir, "C:\\");
-}
-
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wembedded-directive"
-#endif  // __APPLE__
-int getDriverNameFromDSN(const char *dsn, char *driver_name, int namelen) {
-#ifdef WIN32
-    return SQLGetPrivateProfileString(ODBC_DATASOURCES, dsn, NULL_STRING,
-                                      driver_name, namelen, ODBC_INI);
-#else  /* WIN32 */
-    int cnt;
-
-    cnt = SQLGetPrivateProfileString(dsn, "Driver", NULL_STRING, driver_name,
-                                     namelen, ODBC_INI);
-    if (!driver_name[0])
-        return cnt;
-    if (strchr(driver_name, '/') || /* path to the driver */
-        strchr(driver_name, '.')) {
-        driver_name[0] = '\0';
-        return 0;
-    }
-    return cnt;
-#endif /* WIN32 */
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-}
-
-void getDriversDefaults(const char *drivername, GLOBAL_VALUES *comval) {
-    if (NULL != drivername)
-        STR_TO_NAME(comval->drivername, drivername);
-}
-
-void getDSNinfo(ConnInfo *ci, const char *configDrvrname) {
-    char *DSN = ci->dsn;
-    char temp[LARGE_REGISTRY_LEN];
-    const char *drivername;
-    getCiDefaults(ci);
-    drivername = ci->drivername;
-    if (DSN[0] == '\0') {
-        if (drivername[0] == '\0') /* adding new DSN via configDSN */
-        {
-            if (configDrvrname)
-                drivername = configDrvrname;
-            strncpy_null(DSN, INI_DSN, sizeof(ci->dsn));
-        }
-        /* else dns-less connections */
-    }
-
-    /* brute-force chop off trailing blanks... */
-    while (*(DSN + strlen(DSN) - 1) == ' ')
-        *(DSN + strlen(DSN) - 1) = '\0';
-
-    if (!drivername[0] && DSN[0])
-        getDriverNameFromDSN(DSN, (char *)drivername, sizeof(ci->drivername));
-    MYLOG(OPENSEARCH_DEBUG, "drivername=%s\n", drivername);
-    if (!drivername[0])
-        drivername = INVALID_DRIVER;
-    getDriversDefaults(drivername, &(ci->drivers));
-
-    if (DSN[0] == '\0')
-        return;
-
-    /* Proceed with getting info for the given DSN. */
-    if (SQLGetPrivateProfileString(DSN, INI_SERVER, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        STRCPY_FIXED(ci->server, temp);
-    if (SQLGetPrivateProfileString(DSN, INI_HOST, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        STRCPY_FIXED(ci->server, temp);
-    if (SQLGetPrivateProfileString(DSN, INI_PORT, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        STRCPY_FIXED(ci->port, temp);
-    if (SQLGetPrivateProfileString(DSN, INI_USERNAME, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        STRCPY_FIXED(ci->username, temp);
-    if (SQLGetPrivateProfileString(DSN, INI_USERNAME_ABBR, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        STRCPY_FIXED(ci->username, temp);
-    if (SQLGetPrivateProfileString(DSN, INI_PASSWORD, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        ci->password = decode(temp);
-    if (SQLGetPrivateProfileString(DSN, INI_PASSWORD_ABBR, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        ci->password = decode(temp);
-    if (SQLGetPrivateProfileString(DSN, INI_AUTH_MODE, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        STRCPY_FIXED(ci->authtype, temp);
-    if (SQLGetPrivateProfileString(DSN, INI_REGION, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        STRCPY_FIXED(ci->region, temp);
-    if (SQLGetPrivateProfileString(DSN, INI_SSL_USE, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        ci->use_ssl = (char)atoi(temp);
-    if (SQLGetPrivateProfileString(DSN, INI_SSL_HOST_VERIFY, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        ci->verify_server = (char)atoi(temp);
-    if (SQLGetPrivateProfileString(DSN, INI_LOG_LEVEL, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        ci->drivers.loglevel = (char)atoi(temp);
-    if (SQLGetPrivateProfileString(DSN, INI_LOG_OUTPUT, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        STRCPY_FIXED(ci->drivers.output_dir, temp);
-    if (SQLGetPrivateProfileString(DSN, INI_TIMEOUT, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        STRCPY_FIXED(ci->response_timeout, temp);
-    if (SQLGetPrivateProfileString(DSN, INI_FETCH_SIZE, NULL_STRING, temp,
-                                   sizeof(temp), ODBC_INI)
-        > 0)
-        STRCPY_FIXED(ci->fetch_size, temp);
-    STR_TO_NAME(ci->drivers.drivername, drivername);
-}
-/*
- *	This function writes any global parameters (that can be manipulated)
- *	to the ODBCINST.INI portion of the registry
- */
-int write_Ci_Drivers(const char *fileName, const char *sectionName,
-                     const GLOBAL_VALUES *comval) {
-    UNUSED(comval, fileName, sectionName);
-
-    // We don't need anything here
-    return 0;
-}
-
-int writeDriversDefaults(const char *drivername, const GLOBAL_VALUES *comval) {
-    return write_Ci_Drivers(ODBCINST_INI, drivername, comval);
-}
-
-/*	This is for datasource based options only */
-void writeDSNinfo(const ConnInfo *ci) {
-    const char *DSN = ci->dsn;
-    char encoded_item[MEDIUM_REGISTRY_LEN], temp[SMALL_REGISTRY_LEN];
-
-    SQLWritePrivateProfileString(DSN, INI_HOST, ci->server, ODBC_INI);
-    SQLWritePrivateProfileString(DSN, INI_PORT, ci->port, ODBC_INI);
-    SQLWritePrivateProfileString(DSN, INI_USERNAME, ci->username, ODBC_INI);
-    encode(ci->password, encoded_item, sizeof(encoded_item));
-    SQLWritePrivateProfileString(DSN, INI_PASSWORD, encoded_item, ODBC_INI);
-    SQLWritePrivateProfileString(DSN, INI_AUTH_MODE, ci->authtype, ODBC_INI);
-    SQLWritePrivateProfileString(DSN, INI_REGION, ci->region, ODBC_INI);
-    ITOA_FIXED(temp, ci->use_ssl);
-    SQLWritePrivateProfileString(DSN, INI_SSL_USE, temp, ODBC_INI);
-    ITOA_FIXED(temp, ci->verify_server);
-    SQLWritePrivateProfileString(DSN, INI_SSL_HOST_VERIFY, temp, ODBC_INI);
-    ITOA_FIXED(temp, ci->drivers.loglevel);
-    SQLWritePrivateProfileString(DSN, INI_LOG_LEVEL, temp, ODBC_INI);
-    SQLWritePrivateProfileString(DSN, INI_LOG_OUTPUT, ci->drivers.output_dir,
-                                 ODBC_INI);
-    SQLWritePrivateProfileString(DSN, INI_TIMEOUT, ci->response_timeout,
-                                 ODBC_INI);
-    SQLWritePrivateProfileString(DSN, INI_FETCH_SIZE, ci->fetch_size,
-                                 ODBC_INI);
-
-}
-
-static void encode(const opensearchNAME in, char *out, int outlen) {
-    size_t i, ilen = 0;
-    int o = 0;
-    char inc, *ins;
-
-    if (NAME_IS_NULL(in)) {
-        out[0] = '\0';
-        return;
-    }
-    ins = GET_NAME(in);
-    ilen = strlen(ins);
-    for (i = 0; i < ilen && o < outlen - 1; i++) {
-        inc = ins[i];
-        if (inc == '+') {
-            if (o + 2 >= outlen)
-                break;
-            snprintf(&out[o], outlen - o, "%%2B");
-            o += 3;
-        } else if (isspace((unsigned char)inc))
-            out[o++] = '+';
-        else if (!isalnum((unsigned char)inc)) {
-            if (o + 2 >= outlen)
-                break;
-            snprintf(&out[o], outlen - o, "%%%02x", inc);
-            o += 3;
-        } else
-            out[o++] = inc;
-    }
-    out[o++] = '\0';
-}
-
-static unsigned int conv_from_hex(const char *s) {
-    int i, y = 0, val;
-
-    for (i = 1; i <= 2; i++) {
-        if (s[i] >= 'a' && s[i] <= 'f')
-            val = s[i] - 'a' + 10;
-        else if (s[i] >= 'A' && s[i] <= 'F')
-            val = s[i] - 'A' + 10;
-        else
-            val = s[i] - '0';
-
-        y += val << (4 * (2 - i));
-    }
-
-    return y;
-}
-
-static opensearchNAME decode(const char *in) {
-    size_t i, ilen = strlen(in), o = 0;
-    char inc, *outs;
-    opensearchNAME out;
-
-    INIT_NAME(out);
-    if (0 == ilen) {
-        return out;
-    }
-    outs = (char *)malloc(ilen + 1);
-    if (!outs)
-        return out;
-    for (i = 0; i < ilen; i++) {
-        inc = in[i];
-        if (inc == '+')
-            outs[o++] = ' ';
-        else if (inc == '%') {
-            snprintf(&outs[o], ilen + 1 - o, "%c", conv_from_hex(&in[i]));
-            o++;
-            i += 2;
-        } else
-            outs[o++] = inc;
-    }
-    outs[o++] = '\0';
-    STR_TO_NAME(out, outs);
-    free(outs);
-    return out;
-}
-
-/*
- *	Remove braces if the input value is enclosed by braces({}).
- *	Othewise decode the input value.
- */
-static opensearchNAME decode_or_remove_braces(const char *in) {
-    if (OPENING_BRACKET == in[0]) {
-        size_t inlen = strlen(in);
-        if (CLOSING_BRACKET == in[inlen - 1]) /* enclosed with braces */
-        {
-            int i;
-            const char *istr, *eptr;
-            char *ostr;
-            opensearchNAME out;
-
-            INIT_NAME(out);
-            if (NULL == (ostr = (char *)malloc(inlen)))
-                return out;
-            eptr = in + inlen - 1;
-            for (istr = in + 1, i = 0; *istr && istr < eptr; i++) {
-                if (CLOSING_BRACKET == istr[0] && CLOSING_BRACKET == istr[1])
-                    istr++;
-                ostr[i] = *(istr++);
-            }
-            ostr[i] = '\0';
-            SET_NAME_DIRECTLY(out, ostr);
-            return out;
-        }
-    }
-    return decode(in);
-}
-
-void CC_conninfo_release(ConnInfo *conninfo) {
-    NULL_THE_NAME(conninfo->password);
-    finalize_globals(&conninfo->drivers);
-}
-
-void CC_conninfo_init(ConnInfo *conninfo, UInt4 option) {
-    MYLOG(OPENSEARCH_TRACE, "entering opt=%d\n", option);
-
-    if (0 != (CLEANUP_FOR_REUSE & option))
-        CC_conninfo_release(conninfo);
-    memset(conninfo, 0, sizeof(ConnInfo));
-
-    strncpy(conninfo->dsn, DEFAULT_DSN, MEDIUM_REGISTRY_LEN);
-    strncpy(conninfo->desc, DEFAULT_DESC, MEDIUM_REGISTRY_LEN);
-    strncpy(conninfo->drivername, DEFAULT_DRIVERNAME, MEDIUM_REGISTRY_LEN);
-    strncpy(conninfo->server, DEFAULT_HOST, MEDIUM_REGISTRY_LEN);
-    strncpy(conninfo->port, DEFAULT_PORT, SMALL_REGISTRY_LEN);
-    strncpy(conninfo->response_timeout, DEFAULT_RESPONSE_TIMEOUT_STR,
-            SMALL_REGISTRY_LEN);
-    strncpy(conninfo->fetch_size, DEFAULT_FETCH_SIZE_STR,
-            SMALL_REGISTRY_LEN);
-    strncpy(conninfo->authtype, DEFAULT_AUTHTYPE, MEDIUM_REGISTRY_LEN);
-    if (conninfo->password.name != NULL)
-        free(conninfo->password.name);
-    conninfo->password.name = NULL;
-    strncpy(conninfo->username, DEFAULT_USERNAME, MEDIUM_REGISTRY_LEN);
-    strncpy(conninfo->region, DEFAULT_REGION, MEDIUM_REGISTRY_LEN);
-    conninfo->use_ssl = DEFAULT_USE_SSL;
-    conninfo->verify_server = DEFAULT_VERIFY_SERVER;
-
-    if (0 != (INIT_GLOBALS & option))
-        init_globals(&(conninfo->drivers));
-}
-
-void init_globals(GLOBAL_VALUES *glbv) {
-    memset(glbv, 0, sizeof(*glbv));
-    glbv->loglevel = DEFAULT_LOGLEVEL;
-    glbv->output_dir[0] = '\0';
-}
-
-#define CORR_STRCPY(item) strncpy_null(to->item, from->item, sizeof(to->item))
-#define CORR_VALCPY(item) (to->item = from->item)
-
-void copy_globals(GLOBAL_VALUES *to, const GLOBAL_VALUES *from) {
-    memset(to, 0, sizeof(*to));
-    NAME_TO_NAME(to->drivername, from->drivername);
-    CORR_VALCPY(loglevel);
-}
-
-void finalize_globals(GLOBAL_VALUES *glbv) {
-    NULL_THE_NAME(glbv->drivername);
-}
-
-#undef CORR_STRCPY
-#undef CORR_VALCPY
-#define CORR_STRCPY(item) strncpy_null(ci->item, sci->item, sizeof(ci->item))
-#define CORR_VALCPY(item) (ci->item = sci->item)
-
-void CC_copy_conninfo(ConnInfo *ci, const ConnInfo *sci) {
-    memset(ci, 0, sizeof(ConnInfo));
-    CORR_STRCPY(dsn);
-    CORR_STRCPY(desc);
-    CORR_STRCPY(drivername);
-    CORR_STRCPY(server);
-    CORR_STRCPY(username);
-    CORR_STRCPY(authtype);
-    CORR_STRCPY(region);
-    NAME_TO_NAME(ci->password, sci->password);
-    CORR_VALCPY(use_ssl);
-    CORR_VALCPY(verify_server);
-    CORR_STRCPY(port);
-    CORR_STRCPY(response_timeout);
-    CORR_STRCPY(fetch_size);
-    copy_globals(&(ci->drivers), &(sci->drivers));
-}
-#undef CORR_STRCPY
-#undef CORR_VALCPY
diff --git a/sql-odbc/src/sqlodbc/dlg_specific.h b/sql-odbc/src/sqlodbc/dlg_specific.h
deleted file mode 100644
index 9b67d84cd5..0000000000
--- a/sql-odbc/src/sqlodbc/dlg_specific.h
+++ /dev/null
@@ -1,198 +0,0 @@
-#ifndef __DLG_SPECIFIC_H__
-#define __DLG_SPECIFIC_H__
-
-#include "opensearch_odbc.h"
-
-#ifdef WIN32
-#include <windowsx.h>
-
-#include "resource.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-/*	Unknown data type sizes */
-#define UNKNOWNS_AS_MAX 0
-#define UNKNOWNS_AS_DONTKNOW 1
-#define UNKNOWNS_AS_LONGEST 2
-
-/* ODBC initialization files */
-#ifndef WIN32
-#define ODBC_INI ".odbc.ini"
-#define ODBCINST_INI "odbcinst.ini"
-#else
-#define ODBC_INI "ODBC.INI"
-#define ODBCINST_INI "ODBCINST.INI"
-#endif
-
-#define ODBC_DATASOURCES "ODBC Data Sources"
-#define INVALID_DRIVER " @@driver not exist@@ "
-
-#ifdef UNICODE_SUPPORT
-#define INI_DSN "OpenSearch35W"
-#else
-#define INI_DSN "OpenSearch30"
-#endif /* UNICODE_SUPPORT */
-    
-#define INI_HOST "host"
-#define INI_SERVER "server"
-#define INI_PORT "port"
-#define INI_USERNAME "user"    
-#define INI_USERNAME_ABBR "UID"        
-#define INI_PASSWORD "password"        
-#define INI_PASSWORD_ABBR "PWD"  
-#define INI_AUTH_MODE "auth"
-#define INI_REGION "region" 
-#define INI_SSL_USE "useSSL"  
-#define INI_SSL_HOST_VERIFY "hostnameVerification"
-#define INI_LOG_LEVEL "logLevel"
-#define INI_LOG_OUTPUT "logOutput"
-#define INI_TIMEOUT "responseTimeout"
-#define INI_FETCH_SIZE "fetchSize"
-
-#define DEFAULT_FETCH_SIZE -1
-#define DEFAULT_FETCH_SIZE_STR "-1"
-#define DEFAULT_RESPONSE_TIMEOUT 10  // Seconds
-#define DEFAULT_RESPONSE_TIMEOUT_STR "10"
-#define DEFAULT_AUTHTYPE "NONE"
-#define DEFAULT_HOST ""
-#define DEFAULT_PORT ""
-#define DEFAULT_USERNAME ""
-#define DEFAULT_PASSWORD ""
-#define DEFAULT_DRIVERNAME "opensearchodbc"
-#define DEFAULT_DESC ""
-#define DEFAULT_DSN ""
-#define DEFAULT_REGION ""
-#define DEFAULT_VERIFY_SERVER 1
-
-#define AUTHTYPE_NONE "NONE"
-#define AUTHTYPE_BASIC "BASIC"
-#define AUTHTYPE_IAM "AWS_SIGV4"  
-
-#ifdef _HANDLE_ENLIST_IN_DTC_
-#define INI_XAOPT "XaOpt"
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
-/* Bit representation for abbreviated connection strings */
-#define BIT_LFCONVERSION (1L)
-#define BIT_UPDATABLECURSORS (1L << 1)
-/* #define BIT_DISALLOWPREMATURE                  (1L<<2) */
-#define BIT_UNIQUEINDEX (1L << 3)
-#define BIT_UNKNOWN_DONTKNOW (1L << 6)
-#define BIT_UNKNOWN_ASMAX (1L << 7)
-#define BIT_COMMLOG (1L << 10)
-#define BIT_DEBUG (1L << 11)
-#define BIT_PARSE (1L << 12)
-#define BIT_CANCELASFREESTMT (1L << 13)
-#define BIT_USEDECLAREFETCH (1L << 14)
-#define BIT_READONLY (1L << 15)
-#define BIT_TEXTASLONGVARCHAR (1L << 16)
-#define BIT_UNKNOWNSASLONGVARCHAR (1L << 17)
-#define BIT_BOOLSASCHAR (1L << 18)
-#define BIT_ROWVERSIONING (1L << 19)
-#define BIT_SHOWSYSTEMTABLES (1L << 20)
-#define BIT_SHOWOIDCOLUMN (1L << 21)
-#define BIT_FAKEOIDINDEX (1L << 22)
-#define BIT_TRUEISMINUS1 (1L << 23)
-#define BIT_BYTEAASLONGVARBINARY (1L << 24)
-#define BIT_USESERVERSIDEPREPARE (1L << 25)
-#define BIT_LOWERCASEIDENTIFIER (1L << 26)
-
-#define EFFECTIVE_BIT_COUNT 28
-
-/*	Mask for extra options	*/
-#define BIT_FORCEABBREVCONNSTR 1L
-#define BIT_FAKE_MSS (1L << 1)
-#define BIT_BDE_ENVIRONMENT (1L << 2)
-#define BIT_CVT_NULL_DATE (1L << 3)
-#define BIT_ACCESSIBLE_ONLY (1L << 4)
-#define BIT_IGNORE_ROUND_TRIP_TIME (1L << 5)
-#define BIT_DISABLE_KEEPALIVE (1L << 6)
-
-/*	Connection Defaults */
-#define DEFAULT_READONLY 1
-#define DEFAULT_PROTOCOL              \
-    "7.4" /* the latest protocol is \ \
-           * the default */
-#define DEFAULT_USEDECLAREFETCH 0
-#define DEFAULT_TEXTASLONGVARCHAR 0
-#define DEFAULT_UNKNOWNSASLONGVARCHAR 0
-#define DEFAULT_BOOLSASCHAR 0
-#define DEFAULT_UNIQUEINDEX 1 /* dont recognize */
-#define DEFAULT_LOGLEVEL OPENSEARCH_WARNING
-#define DEFAULT_USE_SSL 0
-#define DEFAULT_TRUST_SELF_SIGNED 0
-#define DEFAULT_AUTH_MODE "NONE"
-#define DEFAULT_REGION ""
-#define DEFAULT_CERTIFICATE ""
-#define DEFAULT_KEY ""
-#define DEFAULT_UNKNOWNSIZES UNKNOWNS_AS_MAX
-
-#define DEFAULT_FAKEOIDINDEX 0
-#define DEFAULT_SHOWOIDCOLUMN 0
-#define DEFAULT_ROWVERSIONING 0
-#define DEFAULT_SHOWSYSTEMTABLES 0 /* dont show system tables */
-#define DEFAULT_LIE 0
-#define DEFAULT_PARSE 0
-
-#define DEFAULT_CANCELASFREESTMT 0
-
-#define DEFAULT_EXTRASYSTABLEPREFIXES ""
-
-#define DEFAULT_TRUEISMINUS1 0
-#define DEFAULT_UPDATABLECURSORS 1
-#ifdef WIN32
-#define DEFAULT_LFCONVERSION 1
-#else
-#define DEFAULT_LFCONVERSION 0
-#endif /* WIN32 */
-#define DEFAULT_INT8AS 0
-#define DEFAULT_BYTEAASLONGVARBINARY 0
-#define DEFAULT_USESERVERSIDEPREPARE 1
-#define DEFAULT_LOWERCASEIDENTIFIER 0
-#define DEFAULT_NUMERIC_AS (-101)
-
-#ifdef _HANDLE_ENLIST_IN_DTC_
-#define DEFAULT_XAOPT 1
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
-
-/*	for CC_DSN_info */
-#define CONN_DONT_OVERWRITE 0
-#define CONN_OVERWRITE 1
-
-struct authmode {
-    int authtype_id;
-    const char *authtype_str;
-};
-const struct authmode *GetAuthModes();
-
-/*	prototypes */
-
-#ifdef WIN32
-void SetDlgStuff(HWND hdlg, const ConnInfo *ci);
-void GetDlgStuff(HWND hdlg, ConnInfo *ci);
-INT_PTR CALLBACK advancedOptionsProc(HWND hdlg, UINT wMsg, WPARAM wParam,
-                                 LPARAM lParam);
-INT_PTR CALLBACK logOptionsProc(HWND hdlg, UINT wMsg, WPARAM wParam, LPARAM lParam);
-#endif /* WIN32 */
-
-int write_Ci_Drivers(const char *fileName, const char *sectionName,
-                     const GLOBAL_VALUES *);
-int writeDriversDefaults(const char *drivername, const GLOBAL_VALUES *);
-void writeDSNinfo(const ConnInfo *ci);
-void getDriversDefaults(const char *drivername, GLOBAL_VALUES *);
-void getDSNinfo(ConnInfo *ci, const char *configDrvrname);
-void makeConnectString(char *connect_string, const ConnInfo *ci, UWORD);
-BOOL get_DSN_or_Driver(ConnInfo *ci, const char *attribute, const char *value);
-BOOL copyConnAttributes(ConnInfo *ci, const char *attribute, const char *value);
-int getDriverNameFromDSN(const char *dsn, char *driver_name, int namelen);
-UInt4 getExtraOptions(const ConnInfo *);
-void SetAuthenticationVisibility(HWND hdlg, const struct authmode *am);
-const struct authmode *GetCurrentAuthMode(HWND hdlg);
-int *GetLogLevels();
-int GetCurrentLogLevel(HWND hdlg);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __DLG_SPECIFIC_H__ */
diff --git a/sql-odbc/src/sqlodbc/dlg_wingui.c b/sql-odbc/src/sqlodbc/dlg_wingui.c
deleted file mode 100644
index 376a1438aa..0000000000
--- a/sql-odbc/src/sqlodbc/dlg_wingui.c
+++ /dev/null
@@ -1,278 +0,0 @@
-#ifdef WIN32
-
-#include "dlg_specific.h"
-#include "opensearch_apifunc.h"
-#include "loadlib.h"
-#include "misc.h"  // strncpy_null
-#include "win_setup.h"
-#ifdef _HANDLE_ENLIST_IN_DTC_
-#include "connexp.h"
-#include "xalibname.h"
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
-
-#define HTTP_PREFIX   "http://"
-#define HTTPS_PREFIX  "https://"
-
-#define AUTHMODE_CNT 3
-#define LOGLEVEL_CNT 8
-extern HINSTANCE s_hModule;
-
-int loglevels[LOGLEVEL_CNT] = {
-    {IDS_LOGTYPE_OFF},
-    {IDS_LOGTYPE_FATAL},
-    {IDS_LOGTYPE_ERROR},
-    {IDS_LOGTYPE_WARNING},
-    {IDS_LOGTYPE_INFO},
-    {IDS_LOGTYPE_DEBUG}, 
-    {IDS_LOGTYPE_TRACE},
-    {IDS_LOGTYPE_ALL}};
-
-static const struct authmode authmodes[AUTHMODE_CNT] = {
-    {IDS_AUTHTYPE_NONE, AUTHTYPE_IAM},
-    {IDS_AUTHTYPE_BASIC, AUTHTYPE_BASIC},
-    {IDS_AUTHTYPE_IAM, AUTHTYPE_NONE}};
-
-const struct authmode *GetCurrentAuthMode(HWND hdlg) {
-    unsigned int ams_cnt = 0;
-    const struct authmode *ams = GetAuthModes(&ams_cnt);
-    unsigned int authtype_selection_idx = (unsigned int)(DWORD)SendMessage(
-        GetDlgItem(hdlg, IDC_AUTHTYPE), CB_GETCURSEL, 0L, 0L);
-    if (authtype_selection_idx >= ams_cnt)
-        authtype_selection_idx = 0;
-    return &ams[authtype_selection_idx];
-}
-
-int *GetLogLevels(unsigned int *count) {
-    *count = LOGLEVEL_CNT;
-    return loglevels;
-}
-
-int GetCurrentLogLevel(HWND hdlg) {
-    unsigned int log_cnt = 0;
-    int *log = GetLogLevels(&log_cnt);
-    unsigned int loglevel_selection_idx = (unsigned int)(DWORD)SendMessage(
-        GetDlgItem(hdlg, IDC_LOG_LEVEL), CB_GETCURSEL, 0L, 0L);
-    if (loglevel_selection_idx >= log_cnt)
-        loglevel_selection_idx = 0;
-    return log[loglevel_selection_idx];
-}
-
-
-void SetAuthenticationVisibility(HWND hdlg, const struct authmode *am) {
-    if (strcmp(am->authtype_str, AUTHTYPE_BASIC) == 0) {
-        EnableWindow(GetDlgItem(hdlg, IDC_USER), TRUE);
-        EnableWindow(GetDlgItem(hdlg, IDC_PASSWORD), TRUE);
-        EnableWindow(GetDlgItem(hdlg, IDC_REGION), FALSE);
-    } else if (strcmp(am->authtype_str, AUTHTYPE_IAM) == 0) {
-        EnableWindow(GetDlgItem(hdlg, IDC_USER), FALSE);
-        EnableWindow(GetDlgItem(hdlg, IDC_PASSWORD), FALSE);
-        EnableWindow(GetDlgItem(hdlg, IDC_REGION), TRUE);
-    } else {
-        EnableWindow(GetDlgItem(hdlg, IDC_USER), FALSE);
-        EnableWindow(GetDlgItem(hdlg, IDC_PASSWORD), FALSE);
-        EnableWindow(GetDlgItem(hdlg, IDC_REGION), FALSE);
-    } 
-}
-
-void SetDlgStuff(HWND hdlg, const ConnInfo *ci) {
-    // Connection
-    SetDlgItemText(hdlg, IDC_DRIVER_VERSION, "V."OPENSEARCHDRIVERVERSION);
-    SetDlgItemText(hdlg, IDC_DSNAME, ci->dsn);
-    SetDlgItemText(hdlg, IDC_SERVER, ci->server);
-    SetDlgItemText(hdlg, IDC_PORT, ci->port);
-
-    // Authentication
-    int authtype_selection_idx = 0;
-    unsigned int ams_cnt = 0;
-    const struct authmode *ams = GetAuthModes(&ams_cnt);
-    char buff[MEDIUM_REGISTRY_LEN + 1];
-    for (unsigned int i = 0; i < ams_cnt; i++) {
-        LoadString(GetWindowInstance(hdlg), ams[i].authtype_id, buff,
-                   MEDIUM_REGISTRY_LEN);
-        SendDlgItemMessage(hdlg, IDC_AUTHTYPE, CB_ADDSTRING, 0, (WPARAM)buff);
-        if (!stricmp(ci->authtype, ams[i].authtype_str)) {
-            authtype_selection_idx = i;
-        }
-    }
-    SendDlgItemMessage(hdlg, IDC_AUTHTYPE, CB_SETCURSEL,
-                       ams[authtype_selection_idx].authtype_id, (WPARAM)0);
-    SetDlgItemText(hdlg, IDC_USER, ci->username);
-    SetDlgItemText(hdlg, IDC_PASSWORD, SAFE_NAME(ci->password));
-    SetDlgItemText(hdlg, IDC_REGION, ci->region);
-}
-
-static void GetNameField(HWND hdlg, int item, opensearchNAME *name) {
-    char medium_buf[MEDIUM_REGISTRY_LEN + 1];
-    GetDlgItemText(hdlg, item, medium_buf, sizeof(medium_buf));
-    STR_TO_NAME((*name), medium_buf);
-}
-
-void GetDlgStuff(HWND hdlg, ConnInfo *ci) {
-    // Connection
-    GetDlgItemText(hdlg, IDC_DESC, ci->desc, sizeof(ci->desc));
-    GetDlgItemText(hdlg, IDC_SERVER, ci->server, sizeof(ci->server));
-    GetDlgItemText(hdlg, IDC_PORT, ci->port, sizeof(ci->port));
-
-    // Authentication
-    GetDlgItemText(hdlg, IDC_USER, ci->username, sizeof(ci->username));
-    GetNameField(hdlg, IDC_PASSWORD, &ci->password);
-    GetDlgItemText(hdlg, IDC_REGION, ci->region, sizeof(ci->region));
-    const struct authmode *am = GetCurrentAuthMode(hdlg);
-    SetAuthenticationVisibility(hdlg, am);
-    STRCPY_FIXED(ci->authtype, am->authtype_str);
-
-}
-
-const struct authmode *GetAuthModes(unsigned int *count) {
-    *count = AUTHMODE_CNT;
-    return authmodes;
-}
-static void getDriversDefaultsOfCi(const ConnInfo *ci, GLOBAL_VALUES *glbv) {
-    const char *drivername = NULL;
-
-    if (ci->drivername[0])
-        drivername = ci->drivername;
-    else if (NAME_IS_VALID(ci->drivers.drivername))
-        drivername = SAFE_NAME(ci->drivers.drivername);
-    if (drivername && drivername[0])
-        getDriversDefaults(drivername, glbv);
-    else
-        getDriversDefaults(INVALID_DRIVER, glbv);
-}
-
-/**
- * @brief Initializes and closes the advanced dialog box.
- * 
- * @param hdlg : Handle to dialog box
- * @param wMsg : Dialog box command message
- * @param wParam : Handle to the control to receive keyboard focus
- * @param lParam : Dialog connection data
- * @return INT_PTR : Returns true on successful command of advanced dialog box
- */
-INT_PTR CALLBACK advancedOptionsProc(HWND hdlg, UINT wMsg, WPARAM wParam,
-                                     LPARAM lParam) {
-    switch (wMsg) {
-        case WM_INITDIALOG: {
-            SetWindowLongPtr(hdlg, DWLP_USER, lParam);
-            ConnInfo *ci = (ConnInfo *)lParam;
-
-            // To avoid cases in which the "UseSSL" flag is different from a specified server protocol
-            if (strncmp(HTTP_PREFIX, ci->server, strlen(HTTP_PREFIX)) == 0) {
-                CheckDlgButton(hdlg, IDC_USESSL, FALSE);
-                CheckDlgButton(hdlg, IDC_HOST_VER, FALSE);
-                EnableWindow(GetDlgItem(hdlg, IDC_USESSL), FALSE);
-                EnableWindow(GetDlgItem(hdlg, IDC_HOST_VER), FALSE);
-            } else if (strncmp(HTTPS_PREFIX, ci->server, strlen(HTTPS_PREFIX)) == 0) {
-                CheckDlgButton(hdlg, IDC_USESSL, TRUE);
-                CheckDlgButton(hdlg, IDC_HOST_VER, ci->verify_server);
-                EnableWindow(GetDlgItem(hdlg, IDC_USESSL), FALSE);
-            } else {
-                CheckDlgButton(hdlg, IDC_USESSL, ci->use_ssl);
-                CheckDlgButton(hdlg, IDC_HOST_VER, ci->verify_server);
-            }
-
-            SetDlgItemText(hdlg, IDC_CONNTIMEOUT, ci->response_timeout);
-            SetDlgItemText(hdlg, IDC_FETCH_SIZE, ci->fetch_size);
-            break;
-        }
-
-        case WM_COMMAND: {
-            ConnInfo *ci = (ConnInfo *)GetWindowLongPtr(hdlg, DWLP_USER);
-            switch (GET_WM_COMMAND_ID(wParam, lParam)) {
-                case IDOK:
-                    // Get Dialog Values 
-                    ci->use_ssl = (IsDlgButtonChecked(hdlg, IDC_USESSL) ? 1 : 0);
-                    ci->verify_server = (IsDlgButtonChecked(hdlg, IDC_HOST_VER) ? 1 : 0);
-                    GetDlgItemText(hdlg, IDC_CONNTIMEOUT, ci->response_timeout,
-                                   sizeof(ci->response_timeout));
-                    GetDlgItemText(hdlg, IDC_FETCH_SIZE, ci->fetch_size,
-                                   sizeof(ci->fetch_size));
-                case IDCANCEL:
-                    EndDialog(hdlg, FALSE);
-                    return TRUE;
-            }
-        }
-    }
-    return FALSE;
-}
-
-INT_PTR CALLBACK logOptionsProc(HWND hdlg, UINT wMsg, WPARAM wParam,
-                                LPARAM lParam) {
-    switch (wMsg) {
-        case WM_INITDIALOG: {
-            ConnInfo *ci = (ConnInfo *)lParam;
-            SetWindowLongPtr(hdlg, DWLP_USER, lParam);
-
-            // Logging
-            int loglevel_selection_idx = 0;
-            unsigned int log_cnt = 0;
-            int *log = GetLogLevels(&log_cnt);
-            char buff[MEDIUM_REGISTRY_LEN + 1];
-            for (unsigned int i = 0; i < log_cnt; i++) {
-                LoadString(GetWindowInstance(hdlg), log[i], buff,
-                           MEDIUM_REGISTRY_LEN);
-                SendDlgItemMessage(hdlg, IDC_LOG_LEVEL, CB_ADDSTRING, 0,
-                                   (WPARAM)buff);
-                if ((unsigned int)ci->drivers.loglevel == i) {
-                    loglevel_selection_idx = i;
-                }
-            }
-            SendDlgItemMessage(hdlg, IDC_LOG_LEVEL, CB_SETCURSEL,
-                               loglevel_selection_idx, (WPARAM)0);
-            SetDlgItemText(hdlg, IDC_LOG_PATH, ci->drivers.output_dir);
-            break;
-        }
-
-        case WM_COMMAND: {
-            ConnInfo *ci = (ConnInfo *)GetWindowLongPtr(hdlg, DWLP_USER);
-            switch (GET_WM_COMMAND_ID(wParam, lParam)) {
-                case IDOK: {
-                    // Get Dialog Values
-                    int log = GetCurrentLogLevel(hdlg);
-                    switch (log) {
-                        case IDS_LOGTYPE_OFF:
-                            ci->drivers.loglevel = (char)OPENSEARCH_OFF;
-                            break;
-                        case IDS_LOGTYPE_FATAL:
-                            ci->drivers.loglevel = (char)OPENSEARCH_FATAL;
-                            break;
-                        case IDS_LOGTYPE_ERROR:
-                            ci->drivers.loglevel = (char)OPENSEARCH_ERROR;
-                            break;
-                        case IDS_LOGTYPE_WARNING:
-                            ci->drivers.loglevel = (char)OPENSEARCH_WARNING;
-                            break;
-                        case IDS_LOGTYPE_INFO:
-                            ci->drivers.loglevel = (char)OPENSEARCH_INFO;
-                            break;
-                        case IDS_LOGTYPE_DEBUG:
-                            ci->drivers.loglevel = (char)OPENSEARCH_DEBUG;
-                            break;
-                        case IDS_LOGTYPE_TRACE:
-                            ci->drivers.loglevel = (char)OPENSEARCH_TRACE;
-                            break;
-                        case IDS_LOGTYPE_ALL:
-                            ci->drivers.loglevel = (char)OPENSEARCH_ALL;
-                            break;
-                        default:
-                            ci->drivers.loglevel = (char)OPENSEARCH_OFF;
-                            break;
-                    }
-                    setGlobalCommlog(ci->drivers.loglevel);
-                    setGlobalDebug(ci->drivers.loglevel);
-                    writeGlobalLogs();
-                    GetDlgItemText(hdlg, IDC_LOG_PATH, ci->drivers.output_dir,
-                                   sizeof(ci->drivers.output_dir));
-                    setLogDir(ci->drivers.output_dir);
-                }
-
-                case IDCANCEL:
-                    EndDialog(hdlg, FALSE);
-                    return TRUE;
-                }
-            }
-    }
-    return FALSE;
-}
-
-#endif /* WIN32 */
diff --git a/sql-odbc/src/sqlodbc/drvconn.c b/sql-odbc/src/sqlodbc/drvconn.c
deleted file mode 100644
index e4e53def22..0000000000
--- a/sql-odbc/src/sqlodbc/drvconn.c
+++ /dev/null
@@ -1,320 +0,0 @@
-#include "drvconn.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "opensearch_odbc.h"
-#include "misc.h"
-#include "opensearch_connection.h"
-
-#ifndef WIN32
-#include <sys/socket.h>
-#include <sys/types.h>
-#else
-#include <winsock2.h>
-#endif
-
-#include <string.h>
-
-#ifdef WIN32
-#include <windowsx.h>
-
-#include "resource.h"
-#include "win_setup.h"
-#endif
-#include "dlg_specific.h"
-#include "opensearch_apifunc.h"
-
-#ifdef WIN32
-INT_PTR CALLBACK dconn_FDriverConnectProc(HWND hdlg, UINT wMsg, WPARAM wParam,
-                                          LPARAM lParam);
-extern HINSTANCE s_hModule; /* Saved module handle. */
-#endif
-
-char *hide_password(const char *str) {
-    char *outstr, *pwdp;
-
-    if (!str)
-        return NULL;
-    outstr = strdup(str);
-    if (!outstr)
-        return NULL;
-    if (pwdp = strstr(outstr, "PWD="), !pwdp)
-        pwdp = strstr(outstr, "pwd=");
-    if (pwdp) {
-        char *p;
-
-        for (p = pwdp + 4; *p && *p != ';'; p++)
-            *p = 'x';
-    }
-    return outstr;
-}
-
-int paramRequired(const ConnInfo *ci, int reqs) {
-    int required = 0;
-    const char *pw = SAFE_NAME(ci->password);
-
-    /* Password is not necessarily a required parameter. */
-    if ((reqs & PASSWORD_IS_REQUIRED) != 0)
-        if ('\0' == pw[0])
-            required |= PASSWORD_IS_REQUIRED;
-
-    return required;
-}
-
-#ifdef WIN32
-RETCODE
-dconn_DoDialog(HWND hwnd, ConnInfo *ci) {
-    INT_PTR dialog_result;
-
-    MYLOG(OPENSEARCH_TRACE, "entering ci = %p\n", ci);
-
-    if (hwnd) {
-        dialog_result =
-            DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_CONFIG), hwnd,
-                           dconn_FDriverConnectProc, (LPARAM)ci);
-        if (-1 == dialog_result) {
-            int errc = GetLastError();
-            MYLOG(OPENSEARCH_DEBUG, " LastError=%d\n", errc);
-        }
-        if (!dialog_result || (dialog_result == -1))
-            return SQL_NO_DATA_FOUND;
-        else
-            return SQL_SUCCESS;
-    }
-
-    MYLOG(OPENSEARCH_DEBUG, " No window specified\n");
-    return SQL_ERROR;
-}
-
-INT_PTR CALLBACK dconn_FDriverConnectProc(HWND hdlg, UINT wMsg, WPARAM wParam,
-                                          LPARAM lParam) {
-    MYLOG(OPENSEARCH_DEBUG, "dconn_FDriverConnectProc\n");
-    ConnInfo *ci;
-
-    switch (wMsg) {
-        case WM_INITDIALOG:
-            ci = (ConnInfo *)lParam;
-
-            /* Change the caption for the setup dialog */
-            SetWindowText(hdlg, "OpenSearch Connection");
-
-            /* Hide the DSN and description fields */
-            ShowWindow(GetDlgItem(hdlg, IDC_DSNAMETEXT), SW_HIDE);
-            ShowWindow(GetDlgItem(hdlg, IDC_DSNAME), SW_HIDE);
-
-            SetWindowLongPtr(hdlg, DWLP_USER,
-                             lParam); /* Save the ConnInfo for the "OK" */
-            SetDlgStuff(hdlg, ci);
-
-            if (ci->server[0] == '\0')
-                SetFocus(GetDlgItem(hdlg, IDC_SERVER));
-            else if (ci->port[0] == '\0')
-                SetFocus(GetDlgItem(hdlg, IDC_PORT));
-            else if (ci->username[0] == '\0')
-                SetFocus(GetDlgItem(hdlg, IDC_USER));
-            else if (ci->region[0] == '\0')
-                SetFocus(GetDlgItem(hdlg, IDC_REGION));
-
-            SendDlgItemMessage(hdlg, IDC_AUTHTYPE, CB_SETCURSEL, 2, (WPARAM)0);
-
-            // Encryption
-            ci->use_ssl = (IsDlgButtonChecked(hdlg, IDC_USESSL) ? 1 : 0);
-            break;
-
-        case WM_COMMAND:
-            switch (GET_WM_COMMAND_ID(wParam, lParam)) {
-                case IDOK:
-                    ci = (ConnInfo *)GetWindowLongPtr(hdlg, DWLP_USER);
-                    GetDlgStuff(hdlg, ci);
-                case IDCANCEL:
-                    EndDialog(hdlg, GET_WM_COMMAND_ID(wParam, lParam) == IDOK);
-                    return TRUE;
-
-                case IDOK2:  // <== TEST button
-                {
-                    ConnInfo tmp_info;
-                    ci = (ConnInfo *)GetWindowLongPtr(hdlg, DWLP_USER);
-                    GetDlgStuff(hdlg, ci);
-                    CC_copy_conninfo(&tmp_info, ci);
-                    test_connection(hdlg, &tmp_info, FALSE);
-                    CC_conninfo_release(&tmp_info);
-                    break;
-                }
-                case ID_ADVANCED_OPTIONS: {
-                    ci = (ConnInfo *)GetWindowLongPtr(hdlg, DWLP_USER);
-                    DialogBoxParam(s_hModule,
-                                   MAKEINTRESOURCE(DLG_ADVANCED_OPTIONS), hdlg,
-                                   advancedOptionsProc, (LPARAM)ci);
-                    break;
-                }
-                case ID_LOG_OPTIONS: {
-                    ci = (ConnInfo *)GetWindowLongPtr(hdlg, DWLP_USER);
-                    DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_LOG_OPTIONS),
-                                   hdlg, logOptionsProc, (LPARAM)ci);
-                    break;
-                }
-                case IDC_AUTHTYPE: {
-                    ci = (ConnInfo *)GetWindowLongPtr(hdlg, DWLP_USER);
-                    const struct authmode *am = GetCurrentAuthMode(hdlg);
-                    SetAuthenticationVisibility(hdlg, am);
-                    break;
-                }
-            }
-            break;
-        case WM_CTLCOLORSTATIC:
-            if (lParam == (LPARAM)GetDlgItem(hdlg, IDC_NOTICE_USER)) {
-                HBRUSH hBrush = (HBRUSH)GetStockObject(WHITE_BRUSH);
-                SetTextColor((HDC)wParam, RGB(255, 0, 0));
-                return (INT_PTR)hBrush;
-            }
-            break;
-    }
-
-    return FALSE;
-}
-#endif /* WIN32 */
-
-#define ATTRIBUTE_DELIMITER ';'
-#define OPENING_BRACKET '{'
-#define CLOSING_BRACKET '}'
-
-typedef BOOL (*copyfunc)(ConnInfo *, const char *attribute, const char *value);
-BOOL dconn_get_attributes(copyfunc func, const char *connect_string,
-                          ConnInfo *ci) {
-    BOOL ret = TRUE;
-    char *our_connect_string;
-    const char *pair, *attribute, *value, *termp;
-    BOOL eoftok;
-    char *equals, *delp;
-    char *strtok_arg;
-#ifdef HAVE_STRTOK_R
-    char *last = NULL;
-#endif /* HAVE_STRTOK_R */
-
-    if (our_connect_string = strdup(connect_string), NULL == our_connect_string) {
-        ret = FALSE;
-        goto cleanup;
-    }
-    strtok_arg = our_connect_string;
-
-#ifdef FORCE_PASSWORD_DISPLAY
-    MYLOG(OPENSEARCH_DEBUG, "our_connect_string = '%s'\n", our_connect_string);
-#else
-    if (get_mylog()) {
-        char *hide_str = hide_password(our_connect_string);
-
-        MYLOG(OPENSEARCH_DEBUG, "our_connect_string = '%s'\n", hide_str);
-        free(hide_str);
-    }
-#endif /* FORCE_PASSWORD_DISPLAY */
-
-    termp = strchr(our_connect_string, '\0');
-    eoftok = FALSE;
-    while (!eoftok) {
-        if (strtok_arg != NULL && strtok_arg >= termp) /* for safety */
-            break;
-#ifdef HAVE_STRTOK_R
-        pair = strtok_r(strtok_arg, ";", &last);
-#else
-        pair = strtok(strtok_arg, ";");
-#endif /* HAVE_STRTOK_R */
-        if (strtok_arg)
-            strtok_arg = NULL;
-        if (!pair)
-            break;
-
-        equals = strchr(pair, '=');
-        if (!equals)
-            continue;
-
-        *equals = '\0';
-        attribute = pair;   /* ex. DSN */
-        value = equals + 1; /* ex. 'CEO co1' */
-        /*
-         * Values enclosed with braces({}) can contain ; etc
-         * We don't remove the braces here because
-         * decode_or_remove_braces() in dlg_specifi.c
-         * would remove them later.
-         * Just correct the misdetected delimter(;).
-         */
-        switch (*value) {
-            const char *valuen, *closep;
-
-            case OPENING_BRACKET:
-                delp = strchr(value, '\0');
-                if (delp >= termp) {
-                    eoftok = TRUE;
-                    break;
-                }
-                /* Where's a corresponding closing bracket? */
-                closep = strchr(value, CLOSING_BRACKET);
-                if (NULL != closep && closep[1] == '\0')
-                    break;
-
-                for (valuen = value; valuen < termp;
-                     closep = strchr(valuen, CLOSING_BRACKET)) {
-                    if (NULL == closep) {
-                        if (!delp) /* error */
-                        {
-                            MYLOG(OPENSEARCH_DEBUG,
-                                  "closing bracket doesn't exist 1\n");
-                            ret = FALSE;
-                            goto cleanup;
-                        }
-                        closep = strchr(delp + 1, CLOSING_BRACKET);
-                        if (!closep) /* error */
-                        {
-                            MYLOG(OPENSEARCH_DEBUG,
-                                  "closing bracket doesn't exist 2\n");
-                            ret = FALSE;
-                            goto cleanup;
-                        }
-                        *delp = ATTRIBUTE_DELIMITER; /* restore delimiter */
-                        delp = NULL;
-                    }
-                    if (CLOSING_BRACKET == closep[1]) {
-                        valuen = closep + 2;
-                        if (valuen >= termp)
-                            break;
-                        else if (valuen == delp) {
-                            *delp = ATTRIBUTE_DELIMITER;
-                            delp = NULL;
-                        }
-                        continue;
-                    } else if (ATTRIBUTE_DELIMITER == closep[1]
-                               || '\0' == closep[1] || delp == closep + 1) {
-                        delp = (char *)(closep + 1);
-                        *delp = '\0';
-                        strtok_arg = delp + 1;
-                        if (strtok_arg + 1 >= termp)
-                            eoftok = TRUE;
-                        break;
-                    }
-                    MYLOG(OPENSEARCH_DEBUG,
-                          "subsequent char to the closing bracket is %c "
-                          "value=%s\n",
-                          closep[1], value);
-                    ret = FALSE;
-                    goto cleanup;
-                }
-        }
-
-        /* Copy the appropriate value to the conninfo  */
-        (*func)(ci, attribute, value);
-    }
-
-cleanup:
-    free(our_connect_string);
-
-    return ret;
-}
-
-BOOL dconn_get_DSN_or_Driver(const char *connect_string, ConnInfo *ci) {
-    CC_conninfo_init(ci, INIT_GLOBALS);
-    return dconn_get_attributes(get_DSN_or_Driver, connect_string, ci);
-}
-
-BOOL dconn_get_connect_attributes(const char *connect_string, ConnInfo *ci) {
-    return dconn_get_attributes(copyConnAttributes, connect_string, ci);
-}
diff --git a/sql-odbc/src/sqlodbc/drvconn.h b/sql-odbc/src/sqlodbc/drvconn.h
deleted file mode 100644
index 3a00957b8b..0000000000
--- a/sql-odbc/src/sqlodbc/drvconn.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _DRVCONN_H_
-#define _DRVCONN_H_
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "opensearch_odbc.h"
-#include "misc.h"
-#include "opensearch_connection.h"
-
-#ifndef WIN32
-#include <sys/socket.h>
-#include <sys/types.h>
-#else
-#include <winsock2.h>
-#endif
-
-#include <string.h>
-
-#ifdef WIN32
-#include <windowsx.h>
-
-#include "resource.h"
-#endif
-#include "dlg_specific.h"
-#include "opensearch_apifunc.h"
-
-#define PASSWORD_IS_REQUIRED 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-char *hide_password(const char *str);
-BOOL dconn_get_connect_attributes(const char *connect_string, ConnInfo *ci);
-BOOL dconn_get_DSN_or_Driver(const char *connect_string, ConnInfo *ci);
-int paramRequired(const ConnInfo *ci, int reqs);
-#ifdef WIN32
-RETCODE dconn_DoDialog(HWND hwnd, ConnInfo *ci);
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/sql-odbc/src/sqlodbc/environ.c b/sql-odbc/src/sqlodbc/environ.c
deleted file mode 100644
index c12dc085a7..0000000000
--- a/sql-odbc/src/sqlodbc/environ.c
+++ /dev/null
@@ -1,547 +0,0 @@
-#include "environ.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "dlg_specific.h"
-#include "misc.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "statement.h"
-#ifdef WIN32
-#include <winsock2.h>
-#endif /* WIN32 */
-#include "loadlib.h"
-
-/* The one instance of the handles */
-static int conns_count = 0;
-static ConnectionClass **conns = NULL;
-
-void *conns_cs = NULL;
-void *common_cs = NULL;
-void *common_lcs = NULL;
-
-RETCODE SQL_API OPENSEARCHAPI_AllocEnv(HENV *phenv) {
-    CSTR func = "OPENSEARCHAPI_AllocEnv";
-    SQLRETURN ret = SQL_SUCCESS;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-
-    /*
-     * For systems on which none of the constructor-making
-     * techniques in elasticodbc.c work:
-     * It's ok to call initialize_global_cs() twice.
-     */
-    { initialize_global_cs(); }
-
-    *phenv = (HENV)EN_Constructor();
-    if (!*phenv) {
-        *phenv = SQL_NULL_HENV;
-        EN_log_error(func, "Error allocating environment", NULL);
-        ret = SQL_ERROR;
-    }
-
-    MYLOG(OPENSEARCH_TRACE, "leaving phenv=%p\n", *phenv);
-    return ret;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_FreeEnv(HENV henv) {
-    CSTR func = "OPENSEARCHAPI_FreeEnv";
-    SQLRETURN ret = SQL_SUCCESS;
-    EnvironmentClass *env = (EnvironmentClass *)henv;
-
-    MYLOG(OPENSEARCH_TRACE, "entering env=%p\n", env);
-
-    if (env && EN_Destructor(env)) {
-        MYLOG(OPENSEARCH_DEBUG, "   ok\n");
-        goto cleanup;
-    }
-
-    ret = SQL_ERROR;
-    EN_log_error(func, "Error freeing environment", NULL);
-cleanup:
-    return ret;
-}
-
-#define SIZEOF_SQLSTATE 6
-
-static void opensearch_sqlstate_set(const EnvironmentClass *env, UCHAR *szSqlState,
-                            const char *ver3str, const char *ver2str) {
-    strncpy_null((char *)szSqlState, EN_is_odbc3(env) ? ver3str : ver2str,
-                 SIZEOF_SQLSTATE);
-}
-
-OpenSearch_ErrorInfo *ER_Constructor(SDWORD errnumber, const char *msg) {
-    OpenSearch_ErrorInfo *error;
-    ssize_t aladd, errsize;
-
-    if (DESC_OK == errnumber)
-        return NULL;
-    if (msg) {
-        errsize = strlen(msg);
-        aladd = errsize - sizeof(error->__error_message) + 1;
-        if (aladd < 0)
-            aladd = 0;
-    } else {
-        errsize = -1;
-        aladd = 0;
-    }
-    error = (OpenSearch_ErrorInfo *)malloc(sizeof(OpenSearch_ErrorInfo) + aladd);
-    if (error) {
-        memset(error, 0, sizeof(OpenSearch_ErrorInfo));
-        error->status = errnumber;
-        error->errorsize = (Int2)errsize;
-        if (errsize > 0)
-            memcpy(error->__error_message, msg, errsize);
-        error->__error_message[errsize] = '\0';
-        error->recsize = -1;
-    }
-    return error;
-}
-
-void ER_Destructor(OpenSearch_ErrorInfo *self) {
-    free(self);
-}
-
-OpenSearch_ErrorInfo *ER_Dup(const OpenSearch_ErrorInfo *self) {
-    OpenSearch_ErrorInfo *new;
-    Int4 alsize;
-
-    if (!self)
-        return NULL;
-    alsize = sizeof(OpenSearch_ErrorInfo);
-    if (self->errorsize > 0)
-        alsize += self->errorsize;
-    new = (OpenSearch_ErrorInfo *)malloc(alsize);
-    if (new)
-        memcpy(new, self, alsize);
-
-    return new;
-}
-
-#define DRVMNGRDIV 511
-/*		Returns the next SQL error information. */
-RETCODE SQL_API ER_ReturnError(OpenSearch_ErrorInfo *openSearchError, SQLSMALLINT RecNumber,
-                               SQLCHAR *szSqlState, SQLINTEGER *pfNativeError,
-                               SQLCHAR *szErrorMsg, SQLSMALLINT cbErrorMsgMax,
-                               SQLSMALLINT *pcbErrorMsg, UWORD flag) {
-    /* CC: return an error of a hstmt  */
-    OpenSearch_ErrorInfo *error;
-    BOOL partial_ok = ((flag & PODBC_ALLOW_PARTIAL_EXTRACT) != 0);
-    const char *msg;
-    SWORD msglen, stapos, wrtlen, pcblen;
-
-    if (!openSearchError)
-        return SQL_NO_DATA_FOUND;
-    error = openSearchError;
-    msg = error->__error_message;
-    MYLOG(OPENSEARCH_TRACE, "entering status = %d, msg = #%s#\n", error->status, msg);
-    msglen = (SQLSMALLINT)strlen(msg);
-    /*
-     *	Even though an application specifies a larger error message
-     *	buffer, the driver manager changes it silently.
-     *	Therefore we divide the error message into ...
-     */
-    if (error->recsize < 0) {
-        if (cbErrorMsgMax > 0)
-            error->recsize = cbErrorMsgMax - 1; /* apply the first request */
-        else
-            error->recsize = DRVMNGRDIV;
-    } else if (1 == RecNumber && cbErrorMsgMax > 0)
-        error->recsize = cbErrorMsgMax - 1;
-    if (RecNumber < 0) {
-        if (0 == error->errorpos)
-            RecNumber = 1;
-        else
-            RecNumber = 2 + (error->errorpos - 1) / error->recsize;
-    }
-    stapos = (RecNumber - 1) * error->recsize;
-    if (stapos > msglen)
-        return SQL_NO_DATA_FOUND;
-    pcblen = wrtlen = msglen - stapos;
-    if (pcblen > error->recsize)
-        pcblen = error->recsize;
-    if (0 == cbErrorMsgMax)
-        wrtlen = 0;
-    else if (wrtlen >= cbErrorMsgMax) {
-        if (partial_ok)
-            wrtlen = cbErrorMsgMax - 1;
-        else if (cbErrorMsgMax <= error->recsize)
-            wrtlen = cbErrorMsgMax - 1;
-        else
-            wrtlen = error->recsize;
-    }
-    if (wrtlen > pcblen)
-        wrtlen = pcblen;
-    if (NULL != pcbErrorMsg)
-        *pcbErrorMsg = pcblen;
-
-    if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0)) {
-        memcpy(szErrorMsg, msg + stapos, wrtlen);
-        szErrorMsg[wrtlen] = '\0';
-    }
-
-    if (NULL != pfNativeError)
-        *pfNativeError = error->status;
-
-    if (NULL != szSqlState)
-        strncpy_null((char *)szSqlState, error->sqlstate, 6);
-
-    MYLOG(OPENSEARCH_DEBUG, "	     szSqlState = '%s',len=%d, szError='%s'\n",
-          szSqlState, pcblen, szErrorMsg);
-    if (wrtlen < pcblen)
-        return SQL_SUCCESS_WITH_INFO;
-    else
-        return SQL_SUCCESS;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_ConnectError(HDBC hdbc, SQLSMALLINT RecNumber,
-                                   SQLCHAR *szSqlState,
-                                   SQLINTEGER *pfNativeError,
-                                   SQLCHAR *szErrorMsg,
-                                   SQLSMALLINT cbErrorMsgMax,
-                                   SQLSMALLINT *pcbErrorMsg, UWORD flag) {
-    UNUSED(flag);
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-    EnvironmentClass *env = (EnvironmentClass *)conn->henv;
-    char *msg;
-    int status;
-    BOOL once_again = FALSE;
-    ssize_t msglen;
-
-    MYLOG(OPENSEARCH_ERROR, "entering hdbc=%p <%d>\n", hdbc, cbErrorMsgMax);
-    if (RecNumber != 1 && RecNumber != -1)
-        return SQL_NO_DATA_FOUND;
-    if (cbErrorMsgMax < 0)
-        return SQL_ERROR;
-    if (CONN_EXECUTING == conn->status || !CC_get_error(conn, &status, &msg)
-        || NULL == msg) {
-        MYLOG(OPENSEARCH_ERROR, "CC_Get_error returned nothing.\n");
-        if (NULL != szSqlState)
-            strncpy_null((char *)szSqlState, "00000", SIZEOF_SQLSTATE);
-        if (NULL != pcbErrorMsg)
-            *pcbErrorMsg = 0;
-        if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
-            szErrorMsg[0] = '\0';
-
-        return SQL_NO_DATA_FOUND;
-    }
-    MYLOG(OPENSEARCH_ERROR, "CC_get_error: status = %d, msg = #%s#\n", status, msg);
-
-    msglen = strlen(msg);
-    if (NULL != pcbErrorMsg) {
-        *pcbErrorMsg = (SQLSMALLINT)msglen;
-        if (cbErrorMsgMax == 0)
-            once_again = TRUE;
-        else if (msglen >= cbErrorMsgMax)
-            *pcbErrorMsg = cbErrorMsgMax - 1;
-    }
-    if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
-        strncpy_null((char *)szErrorMsg, msg, cbErrorMsgMax);
-    if (NULL != pfNativeError)
-        *pfNativeError = status;
-
-    if (NULL != szSqlState) {
-        if (conn->sqlstate[0])
-            strncpy_null((char *)szSqlState, conn->sqlstate, SIZEOF_SQLSTATE);
-        else
-            switch (status) {
-                case CONN_OPTION_VALUE_CHANGED:
-                    opensearch_sqlstate_set(env, szSqlState, "01S02", "01S02");
-                    break;
-                case CONN_TRUNCATED:
-                    opensearch_sqlstate_set(env, szSqlState, "01004", "01004");
-                    /* data truncated */
-                    break;
-                case CONN_INIREAD_ERROR:
-                    opensearch_sqlstate_set(env, szSqlState, "IM002", "IM002");
-                    /* data source not found */
-                    break;
-                case CONNECTION_SERVER_NOT_REACHED:
-                case CONN_OPENDB_ERROR:
-                    opensearch_sqlstate_set(env, szSqlState, "08001", "08001");
-                    /* unable to connect to data source */
-                    break;
-                case CONN_INVALID_AUTHENTICATION:
-                case CONN_AUTH_TYPE_UNSUPPORTED:
-                    opensearch_sqlstate_set(env, szSqlState, "28000", "28000");
-                    break;
-                case CONN_STMT_ALLOC_ERROR:
-                    opensearch_sqlstate_set(env, szSqlState, "HY001", "S1001");
-                    /* memory allocation failure */
-                    break;
-                case CONN_IN_USE:
-                    opensearch_sqlstate_set(env, szSqlState, "HY000", "S1000");
-                    /* general error */
-                    break;
-                case CONN_UNSUPPORTED_OPTION:
-                    opensearch_sqlstate_set(env, szSqlState, "HYC00", "IM001");
-                    /* driver does not support this function */
-                    break;
-                case CONN_INVALID_ARGUMENT_NO:
-                    opensearch_sqlstate_set(env, szSqlState, "HY009", "S1009");
-                    /* invalid argument value */
-                    break;
-                case CONN_TRANSACT_IN_PROGRES:
-                    opensearch_sqlstate_set(env, szSqlState, "HY011", "S1011");
-                    break;
-                case CONN_NO_MEMORY_ERROR:
-                    opensearch_sqlstate_set(env, szSqlState, "HY001", "S1001");
-                    break;
-                case CONN_NOT_IMPLEMENTED_ERROR:
-                    opensearch_sqlstate_set(env, szSqlState, "HYC00", "S1C00");
-                    break;
-                case CONN_ILLEGAL_TRANSACT_STATE:
-                    opensearch_sqlstate_set(env, szSqlState, "25000", "S1010");
-                    break;
-                case CONN_VALUE_OUT_OF_RANGE:
-                    opensearch_sqlstate_set(env, szSqlState, "HY019", "22003");
-                    break;
-                case CONNECTION_COULD_NOT_SEND:
-                case CONNECTION_COULD_NOT_RECEIVE:
-                case CONNECTION_COMMUNICATION_ERROR:
-                case CONNECTION_NO_RESPONSE:
-                    opensearch_sqlstate_set(env, szSqlState, "08S01", "08S01");
-                    break;
-                default:
-                    opensearch_sqlstate_set(env, szSqlState, "HY000", "S1000");
-                    /* general error */
-                    break;
-            }
-    }
-
-    MYLOG(OPENSEARCH_DEBUG,
-          "	     szSqlState = '%s',len=" FORMAT_SSIZE_T ", szError='%s'\n",
-          szSqlState ? (char *)szSqlState : PRINT_NULL, msglen,
-          szErrorMsg ? (char *)szErrorMsg : PRINT_NULL);
-    if (once_again) {
-        CC_set_errornumber(conn, status);
-        return SQL_SUCCESS_WITH_INFO;
-    } else
-        return SQL_SUCCESS;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_EnvError(HENV henv, SQLSMALLINT RecNumber,
-                               SQLCHAR *szSqlState, SQLINTEGER *pfNativeError,
-                               SQLCHAR *szErrorMsg, SQLSMALLINT cbErrorMsgMax,
-                               SQLSMALLINT *pcbErrorMsg, UWORD flag) {
-    UNUSED(flag);
-    EnvironmentClass *env = (EnvironmentClass *)henv;
-    char *msg = NULL;
-    int status;
-
-    MYLOG(OPENSEARCH_ERROR, "entering henv=%p <%d>\n", henv, cbErrorMsgMax);
-    if (RecNumber != 1 && RecNumber != -1)
-        return SQL_NO_DATA_FOUND;
-    if (cbErrorMsgMax < 0)
-        return SQL_ERROR;
-    if (!EN_get_error(env, &status, &msg) || NULL == msg) {
-        MYLOG(OPENSEARCH_ERROR, "EN_get_error: msg = #%s#\n", msg);
-
-        if (NULL != szSqlState)
-            opensearch_sqlstate_set(env, szSqlState, "00000", "00000");
-        if (NULL != pcbErrorMsg)
-            *pcbErrorMsg = 0;
-        if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
-            szErrorMsg[0] = '\0';
-
-        return SQL_NO_DATA_FOUND;
-    }
-    MYLOG(OPENSEARCH_ERROR, "EN_get_error: status = %d, msg = #%s#\n", status, msg);
-
-    if (NULL != pcbErrorMsg)
-        *pcbErrorMsg = (SQLSMALLINT)strlen(msg);
-    if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
-        strncpy_null((char *)szErrorMsg, msg, cbErrorMsgMax);
-    if (NULL != pfNativeError)
-        *pfNativeError = status;
-
-    if (szSqlState) {
-        switch (status) {
-            case ENV_ALLOC_ERROR:
-                /* memory allocation failure */
-                opensearch_sqlstate_set(env, szSqlState, "HY001", "S1001");
-                break;
-            default:
-                opensearch_sqlstate_set(env, szSqlState, "HY000", "S1000");
-                /* general error */
-                break;
-        }
-    }
-
-    return SQL_SUCCESS;
-}
-
-/*
- * EnvironmentClass implementation
- */
-EnvironmentClass *EN_Constructor(void) {
-    EnvironmentClass *rv = NULL;
-#ifdef WIN32
-    WORD wVersionRequested;
-    WSADATA wsaData;
-    const int major = 2, minor = 2;
-
-    /* Load the WinSock Library */
-    wVersionRequested = MAKEWORD(major, minor);
-
-    if (WSAStartup(wVersionRequested, &wsaData)) {
-        MYLOG(OPENSEARCH_ERROR, " WSAStartup error\n");
-        return rv;
-    }
-    /* Verify that this is the minimum version of WinSock */
-    if (LOBYTE(wsaData.wVersion) >= 1
-        && (LOBYTE(wsaData.wVersion) >= 2 || HIBYTE(wsaData.wVersion) >= 1))
-        ;
-    else {
-        MYLOG(OPENSEARCH_DEBUG, " WSAStartup version=(%d,%d)\n",
-              LOBYTE(wsaData.wVersion), HIBYTE(wsaData.wVersion));
-        goto cleanup;
-    }
-#endif /* WIN32 */
-
-    rv = (EnvironmentClass *)malloc(sizeof(EnvironmentClass));
-    if (NULL == rv) {
-        MYLOG(OPENSEARCH_ERROR, " malloc error\n");
-        goto cleanup;
-    }
-    rv->errormsg = 0;
-    rv->errornumber = 0;
-    rv->flag = 0;
-    INIT_ENV_CS(rv);
-cleanup:
-#ifdef WIN32
-    if (NULL == rv) {
-        WSACleanup();
-    }
-#endif /* WIN32 */
-
-    return rv;
-}
-
-char EN_Destructor(EnvironmentClass *self) {
-    int lf, nullcnt;
-    char rv = 1;
-
-    MYLOG(OPENSEARCH_TRACE, "entering self=%p\n", self);
-    if (!self)
-        return 0;
-
-    /*
-     * the error messages are static strings distributed throughout the
-     * source--they should not be freed
-     */
-
-    /* Free any connections belonging to this environment */
-    ENTER_CONNS_CS;
-    for (lf = 0, nullcnt = 0; lf < conns_count; lf++) {
-        if (NULL == conns[lf])
-            nullcnt++;
-        else if (conns[lf]->henv == self) {
-            if (CC_Destructor(conns[lf]))
-                conns[lf] = NULL;
-            else
-                rv = 0;
-            nullcnt++;
-        }
-    }
-    if (conns && nullcnt >= conns_count) {
-        MYLOG(OPENSEARCH_DEBUG, "clearing conns count=%d\n", conns_count);
-        free(conns);
-        conns = NULL;
-        conns_count = 0;
-    }
-    LEAVE_CONNS_CS;
-    DELETE_ENV_CS(self);
-    free(self);
-
-#ifdef WIN32
-    WSACleanup();
-#endif
-    MYLOG(OPENSEARCH_TRACE, "leaving rv=%d\n", rv);
-#ifdef _MEMORY_DEBUG_
-    debug_memory_check();
-#endif /* _MEMORY_DEBUG_ */
-    return rv;
-}
-
-char EN_get_error(EnvironmentClass *self, int *number, char **message) {
-    if (self && self->errormsg && self->errornumber) {
-        *message = self->errormsg;
-        *number = self->errornumber;
-        self->errormsg = 0;
-        self->errornumber = 0;
-        return 1;
-    } else
-        return 0;
-}
-
-#define INIT_CONN_COUNT 128
-
-char EN_add_connection(EnvironmentClass *self, ConnectionClass *conn) {
-    int i, alloc;
-    ConnectionClass **newa;
-    char ret = FALSE;
-
-    MYLOG(OPENSEARCH_TRACE, "entering self = %p, conn = %p\n", self, conn);
-
-    ENTER_CONNS_CS;
-    for (i = 0; i < conns_count; i++) {
-        if (!conns[i]) {
-            conn->henv = self;
-            conns[i] = conn;
-            ret = TRUE;
-            MYLOG(
-                0,
-                "       added at i=%d, conn->henv = %p, conns[i]->henv = %p\n",
-                i, conn->henv, conns[i]->henv);
-            goto cleanup;
-        }
-    }
-    if (conns_count > 0)
-        alloc = 2 * conns_count;
-    else
-        alloc = INIT_CONN_COUNT;
-    if (newa = (ConnectionClass **)realloc(conns,
-                                           alloc * sizeof(ConnectionClass *)),
-        NULL == newa)
-        goto cleanup;
-    conn->henv = self;
-    newa[conns_count] = conn;
-    conns = newa;
-    ret = TRUE;
-    MYLOG(OPENSEARCH_DEBUG,
-          "       added at %d, conn->henv = %p, conns[%d]->henv = %p\n",
-          conns_count, conn->henv, conns_count, conns[conns_count]->henv);
-    for (i = conns_count + 1; i < alloc; i++)
-        conns[i] = NULL;
-    conns_count = alloc;
-cleanup:
-    LEAVE_CONNS_CS;
-    return ret;
-}
-
-char EN_remove_connection(EnvironmentClass *self, ConnectionClass *conn) {
-    UNUSED(self);
-    int i;
-
-    for (i = 0; i < conns_count; i++)
-        if (conns[i] == conn && conns[i]->status != CONN_EXECUTING) {
-            ENTER_CONNS_CS;
-            conns[i] = NULL;
-            LEAVE_CONNS_CS;
-            return TRUE;
-        }
-
-    return FALSE;
-}
-
-void EN_log_error(const char *func, char *desc, EnvironmentClass *self) {
-    if (self)
-        MYLOG(OPENSEARCH_ERROR,
-              "ENVIRON ERROR: func=%s, desc='%s', errnum=%d, errmsg='%s'\n",
-              func, desc, self->errornumber, self->errormsg);
-    else
-        MYLOG(OPENSEARCH_ERROR, "INVALID ENVIRON HANDLE ERROR: func=%s, desc='%s'\n",
-              func, desc);
-}
diff --git a/sql-odbc/src/sqlodbc/environ.h b/sql-odbc/src/sqlodbc/environ.h
deleted file mode 100644
index bcbb04b78a..0000000000
--- a/sql-odbc/src/sqlodbc/environ.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef __ENVIRON_H__
-#define __ENVIRON_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "opensearch_helper.h"
-#include "opensearch_odbc.h"
-
-#define ENV_ALLOC_ERROR 1
-
-/**********		Environment Handle	*************/
-struct EnvironmentClass_ {
-    char *errormsg;
-    int errornumber;
-    Int4 flag;
-    void *cs;
-};
-
-/*	Environment prototypes */
-EnvironmentClass *EN_Constructor(void);
-char EN_Destructor(EnvironmentClass *self);
-char EN_get_error(EnvironmentClass *self, int *number, char **message);
-char EN_add_connection(EnvironmentClass *self, ConnectionClass *conn);
-char EN_remove_connection(EnvironmentClass *self, ConnectionClass *conn);
-void EN_log_error(const char *func, char *desc, EnvironmentClass *self);
-
-#define EN_OV_ODBC2 1L
-#define EN_CONN_POOLING (1L << 1)
-#define EN_is_odbc2(env) ((env->flag & EN_OV_ODBC2) != 0)
-#define EN_is_odbc3(env) (env && (env->flag & EN_OV_ODBC2) == 0)
-#define EN_set_odbc2(env) (env->flag |= EN_OV_ODBC2)
-#define EN_set_odbc3(env) (env->flag &= ~EN_OV_ODBC2)
-#define EN_is_pooling(env) (env && (env->flag & EN_CONN_POOLING) != 0)
-#define EN_set_pooling(env) (env->flag |= EN_CONN_POOLING)
-#define EN_unset_pooling(env) (env->flag &= ~EN_CONN_POOLING)
-
-/* For Multi-thread */
-#define INIT_CONNS_CS XPlatformInitializeCriticalSection(&conns_cs)
-#define ENTER_CONNS_CS XPlatformEnterCriticalSection(conns_cs)
-#define LEAVE_CONNS_CS XPlatformLeaveCriticalSection(conns_cs)
-#define DELETE_CONNS_CS XPlatformDeleteCriticalSection(&conns_cs)
-#define INIT_ENV_CS(x) XPlatformInitializeCriticalSection(&((x)->cs))
-#define ENTER_ENV_CS(x) XPlatformEnterCriticalSection(((x)->cs))
-#define LEAVE_ENV_CS(x) XPlatformLeaveCriticalSection(((x)->cs))
-#define DELETE_ENV_CS(x) XPlatformDeleteCriticalSection(&((x)->cs))
-#define INIT_COMMON_CS XPlatformInitializeCriticalSection(&common_cs)
-#define ENTER_COMMON_CS XPlatformEnterCriticalSection(common_cs)
-#define LEAVE_COMMON_CS XPlatformLeaveCriticalSection(common_cs)
-#define DELETE_COMMON_CS XPlatformDeleteCriticalSection(&common_cs)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __ENVIRON_H_ */
diff --git a/sql-odbc/src/sqlodbc/execute.c b/sql-odbc/src/sqlodbc/execute.c
deleted file mode 100644
index f2f2cd24e3..0000000000
--- a/sql-odbc/src/sqlodbc/execute.c
+++ /dev/null
@@ -1,134 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "opensearch_odbc.h"
-#include "misc.h"
-
-#ifndef WIN32
-#include <ctype.h>
-#endif /* WIN32 */
-
-#include "bind.h"
-#include "convert.h"
-#include "environ.h"
-#include "opensearch_types.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "opensearch_statement.h"
-#include "qresult.h"
-#include "statement.h"
-
-RETCODE SQL_API OPENSEARCHAPI_Prepare(HSTMT hstmt, const SQLCHAR *stmt_str,
-                              SQLINTEGER stmt_sz) {
-    if (hstmt == NULL)
-        return SQL_ERROR;
-
-    // We know cursor is not open at this point
-    StatementClass *stmt = (StatementClass *)hstmt;
-
-    // PrepareStatement deallocates memory if necessary
-    RETCODE ret = PrepareStatement(stmt, stmt_str, stmt_sz);
-    if (ret != SQL_SUCCESS)
-        return ret;
-
-    // Execute the statement
-    ret = ExecuteStatement(stmt, FALSE);
-    if (ret == SQL_SUCCESS)
-        stmt->prepared = PREPARED;
-
-    return ret;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_Execute(HSTMT hstmt) {
-    if (hstmt == NULL)
-        return SQL_ERROR;
-
-    // We know cursor is not open at this point
-    StatementClass *stmt = (StatementClass *)hstmt;
-    RETCODE ret = SQL_ERROR;
-    switch (stmt->prepared) {
-        case PREPARED:
-            ret = AssignResult(stmt);
-            stmt->prepared = EXECUTED;
-            break;
-        case EXECUTED:
-            ret = RePrepareStatement(stmt);
-            if (ret != SQL_SUCCESS)
-                break;
-            ret = ExecuteStatement(stmt, TRUE);
-            if (ret != SQL_SUCCESS)
-                break;
-            stmt->prepared = EXECUTED;
-            break;
-        case NOT_PREPARED:
-            ret = SQL_ERROR;
-            break;
-        default:
-            break;
-    }
-    return ret;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_ExecDirect(HSTMT hstmt, const SQLCHAR *stmt_str,
-                                 SQLINTEGER stmt_sz, BOOL commit) {
-    if (hstmt == NULL)
-        return SQL_ERROR;
-
-    // We know cursor is not open at this point
-    StatementClass *stmt = (StatementClass *)hstmt;
-    RETCODE ret = PrepareStatement(stmt, stmt_str, stmt_sz);
-    if (ret != SQL_SUCCESS)
-        return ret;
-
-    // Execute statement
-    ret = ExecuteStatement(hstmt, commit);
-    if (ret != SQL_SUCCESS)
-        return ret;
-    stmt->prepared = NOT_PREPARED;
-    return ret;
-}
-
-/*
- *	Returns the SQL string as modified by the driver.
- *	Currently, just copy the input string without modification
- *	observing buffer limits and truncation.
- */
-RETCODE SQL_API OPENSEARCHAPI_NativeSql(HDBC hdbc, const SQLCHAR *szSqlStrIn,
-                                SQLINTEGER cbSqlStrIn, SQLCHAR *szSqlStr,
-                                SQLINTEGER cbSqlStrMax, SQLINTEGER *pcbSqlStr) {
-    CSTR func = "OPENSEARCHAPI_NativeSql";
-    size_t len = 0;
-    char *ptr;
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-    RETCODE result;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...cbSqlStrIn=" FORMAT_INTEGER "\n", cbSqlStrIn);
-
-    ptr = (cbSqlStrIn == 0) ? "" : make_string(szSqlStrIn, cbSqlStrIn, NULL, 0);
-    if (!ptr) {
-        CC_set_error(conn, CONN_NO_MEMORY_ERROR,
-                     "No memory available to store native sql string", func);
-        return SQL_ERROR;
-    }
-
-    result = SQL_SUCCESS;
-    len = strlen(ptr);
-
-    if (szSqlStr) {
-        strncpy_null((char *)szSqlStr, ptr, cbSqlStrMax);
-
-        if (len >= (size_t)cbSqlStrMax) {
-            result = SQL_SUCCESS_WITH_INFO;
-            CC_set_error(conn, CONN_TRUNCATED,
-                         "The buffer was too small for the NativeSQL.", func);
-        }
-    }
-
-    if (pcbSqlStr)
-        *pcbSqlStr = (SQLINTEGER)len;
-
-    if (cbSqlStrIn)
-        free(ptr);
-
-    return result;
-}
diff --git a/sql-odbc/src/sqlodbc/info.c b/sql-odbc/src/sqlodbc/info.c
deleted file mode 100644
index c40f783a55..0000000000
--- a/sql-odbc/src/sqlodbc/info.c
+++ /dev/null
@@ -1,1897 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "opensearch_odbc.h"
-#include "unicode_support.h"
-
-#ifndef WIN32
-#include <ctype.h>
-#endif
-
-#include "bind.h"
-#include "catfunc.h"
-#include "dlg_specific.h"
-#include "environ.h"
-#include "opensearch_types.h"
-#include "misc.h"
-#include "multibyte.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "opensearch_info.h"
-#include "qresult.h"
-#include "statement.h"
-#include "tuple.h"
-
-/*	Trigger related stuff for SQLForeign Keys */
-#define TRIGGER_SHIFT 3
-#define TRIGGER_MASK 0x03
-#define TRIGGER_DELETE 0x01
-#define TRIGGER_UPDATE 0x02
-
-RETCODE SQL_API OPENSEARCHAPI_GetInfo(HDBC hdbc, SQLUSMALLINT fInfoType,
-                              PTR rgbInfoValue, SQLSMALLINT cbInfoValueMax,
-                              SQLSMALLINT *pcbInfoValue) {
-    CSTR func = "OPENSEARCHAPI_GetInfo";
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-    const char *p = NULL;
-    char tmp[MAX_INFO_STRING];
-    SQLULEN len = 0, value = 0;
-    RETCODE ret = SQL_ERROR;
-    char odbcver[16];
-
-    MYLOG(OPENSEARCH_TRACE, "entering...fInfoType=%d\n", fInfoType);
-
-    if (!conn) {
-        CC_log_error(func, NULL_STRING, NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    switch (fInfoType) {
-        case SQL_ACCESSIBLE_PROCEDURES: /* ODBC 1.0 */
-            p = "N";
-            break;
-
-        case SQL_ACCESSIBLE_TABLES: /* ODBC 1.0 */
-            p = "N";
-            break;
-
-        case SQL_ACTIVE_CONNECTIONS: /* ODBC 1.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_ACTIVE_STATEMENTS: /* ODBC 1.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_ALTER_TABLE: /* ODBC 2.0 */
-            len = 4;
-            value = SQL_AT_ADD_COLUMN | SQL_AT_DROP_COLUMN
-                    | SQL_AT_ADD_COLUMN_SINGLE | SQL_AT_ADD_CONSTRAINT
-                    | SQL_AT_ADD_TABLE_CONSTRAINT
-                    | SQL_AT_CONSTRAINT_INITIALLY_DEFERRED
-                    | SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE
-                    | SQL_AT_CONSTRAINT_DEFERRABLE
-                    | SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT
-                    | SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE
-                    | SQL_AT_DROP_COLUMN_RESTRICT | SQL_AT_DROP_COLUMN_CASCADE;
-            break;
-
-        case SQL_BOOKMARK_PERSISTENCE: /* ODBC 2.0 */
-            /* very simple bookmark support */
-            len = 4;
-            value = SQL_BP_SCROLL | SQL_BP_DELETE | SQL_BP_UPDATE
-                    | SQL_BP_TRANSACTION;
-            break;
-
-        case SQL_COLUMN_ALIAS: /* ODBC 2.0 */
-            p = "Y";
-            break;
-
-        case SQL_CONCAT_NULL_BEHAVIOR: /* ODBC 1.0 */
-            len = 2;
-            value = SQL_CB_NULL;
-            break;
-
-        case SQL_CONVERT_GUID:
-        case SQL_CONVERT_SMALLINT:
-        case SQL_CONVERT_TINYINT:
-        case SQL_CONVERT_VARCHAR:
-        case SQL_CONVERT_DECIMAL:
-        case SQL_CONVERT_FLOAT:
-        case SQL_CONVERT_NUMERIC:
-        case SQL_CONVERT_DATE:
-        case SQL_CONVERT_TIME:
-        case SQL_CONVERT_BINARY:
-        case SQL_CONVERT_LONGVARBINARY:
-        case SQL_CONVERT_VARBINARY: /* ODBC 1.0 */
-        case SQL_CONVERT_CHAR:
-        case SQL_CONVERT_LONGVARCHAR:
-#ifdef UNICODE_SUPPORT
-        case SQL_CONVERT_WCHAR:
-        case SQL_CONVERT_WLONGVARCHAR:
-#endif /* UNICODE_SUPPORT */
-            len = sizeof(SQLUINTEGER);
-            value = 0; /* CONVERT is unavailable */
-            break;
-
-        case SQL_CONVERT_INTEGER: /* ODBC 1.0 */
-            len = sizeof(SQLUINTEGER);
-            value = SQL_CVT_INTEGER | SQL_CVT_BIT | SQL_CVT_WVARCHAR | SQL_CVT_DOUBLE | SQL_CVT_BIGINT | SQL_CVT_REAL;
-            break;
-
-        case SQL_CONVERT_BIT: /* ODBC 1.0 */
-            len = sizeof(SQLUINTEGER);
-            value = SQL_CVT_BIT | SQL_CVT_INTEGER | SQL_CVT_WVARCHAR | SQL_CVT_DOUBLE | SQL_CVT_BIGINT | SQL_CVT_REAL;
-            break;
-
-        case SQL_CONVERT_WVARCHAR: /* ODBC 1.0 */
-            len = sizeof(SQLUINTEGER);
-            value = SQL_CVT_WVARCHAR | SQL_CVT_INTEGER | SQL_CVT_DOUBLE | SQL_CVT_BIGINT | SQL_CVT_REAL;
-            break;
-
-        case SQL_CONVERT_DOUBLE: /* ODBC 1.0 */
-            len = sizeof(SQLUINTEGER);
-            value = SQL_CVT_DOUBLE | SQL_CVT_INTEGER | SQL_CVT_BIT | SQL_CVT_WVARCHAR | SQL_CVT_BIGINT | SQL_CVT_REAL;
-            break;
-
-        case SQL_CONVERT_BIGINT: /* ODBC 1.0 */
-            len = sizeof(SQLUINTEGER);
-            value = SQL_CVT_BIGINT | SQL_CVT_INTEGER | SQL_CVT_BIT | SQL_CVT_WVARCHAR | SQL_CVT_DOUBLE | SQL_CVT_REAL;
-            break;
-
-        case SQL_CONVERT_REAL: /* ODBC 1.0 */
-            len = sizeof(SQLUINTEGER);
-            value = SQL_CVT_REAL | SQL_CVT_INTEGER | SQL_CVT_BIT | SQL_CVT_WVARCHAR | SQL_CVT_DOUBLE | SQL_CVT_BIGINT;
-            break;
-
-        case SQL_CONVERT_TIMESTAMP: /* ODBC 1.0 */
-            len = sizeof(SQLUINTEGER);
-            value = SQL_CVT_TIMESTAMP | SQL_CVT_WVARCHAR;
-            break;
-
-        case SQL_CONVERT_FUNCTIONS: /* ODBC 1.0 */
-            len = sizeof(SQLUINTEGER);
-            value = SQL_FN_CVT_CAST;
-            MYLOG(OPENSEARCH_DEBUG, "CONVERT_FUNCTIONS=" FORMAT_ULEN "\n", value);
-            break;
-
-        case SQL_CORRELATION_NAME: /* ODBC 1.0 */
-
-            /*
-             * Saying no correlation name makes Query not work right.
-             * value = SQL_CN_NONE;
-             */
-            len = 2;
-            value = SQL_CN_ANY;
-            break;
-
-        case SQL_CURSOR_COMMIT_BEHAVIOR: /* ODBC 1.0 */
-            len = 2;
-            value = SQL_CB_CLOSE;
-            break;
-
-        case SQL_CURSOR_ROLLBACK_BEHAVIOR: /* ODBC 1.0 */
-            len = 2;
-            value = SQL_CB_PRESERVE;
-            break;
-
-        case SQL_DATA_SOURCE_NAME: /* ODBC 1.0 */
-            p = CC_get_DSN(conn);
-            break;
-
-        case SQL_DATA_SOURCE_READ_ONLY: /* ODBC 1.0 */
-            p = "Y";
-            break;
-
-        case SQL_DATABASE_NAME: /* Support for old ODBC 1.0 Apps */
-
-            /*
-             * Returning the database name causes problems in MS Query. It
-             * generates query like: "SELECT DISTINCT a FROM byronnbad3
-             * bad3"
-             *
-             * p = CC_get_database(conn);
-             */
-            p = CurrCatString(conn);
-            break;
-
-        case SQL_DBMS_NAME: /* ODBC 1.0 */
-            p = "OpenSearch";
-            break;
-
-        case SQL_DBMS_VER: /* ODBC 1.0 */
-            STRCPY_FIXED(tmp, conn->opensearch_version);
-            p = tmp;
-            break;
-
-        case SQL_DEFAULT_TXN_ISOLATION: /* ODBC 1.0 */
-            len = 4;
-            if (0 == conn->default_isolation)
-                conn->isolation = CC_get_isolation(conn);
-            value = conn->default_isolation;
-            break;
-
-        case SQL_DRIVER_NAME: /* ODBC 1.0 */
-            p = DRIVER_FILE_NAME;
-            break;
-
-        case SQL_DRIVER_ODBC_VER:
-            SPRINTF_FIXED(odbcver, "%02x.%02x", ODBCVER / 256, ODBCVER % 256);
-            /* p = DRIVER_ODBC_VER; */
-            p = odbcver;
-            break;
-
-        case SQL_DRIVER_VER: /* ODBC 1.0 */
-            p = OPENSEARCHDRIVERVERSION;
-            break;
-
-        case SQL_EXPRESSIONS_IN_ORDERBY: /* ODBC 1.0 */
-            p = "Y";
-            break;
-
-        case SQL_FETCH_DIRECTION: /* ODBC 1.0 */
-            len = 4;
-            value = (SQL_FD_FETCH_NEXT | SQL_FD_FETCH_FIRST | SQL_FD_FETCH_LAST
-                     | SQL_FD_FETCH_PRIOR | SQL_FD_FETCH_ABSOLUTE
-                     | SQL_FD_FETCH_RELATIVE | SQL_FD_FETCH_BOOKMARK);
-            break;
-
-        case SQL_FILE_USAGE: /* ODBC 2.0 */
-            len = 2;
-            value = SQL_FILE_NOT_SUPPORTED;
-            break;
-
-        case SQL_GETDATA_EXTENSIONS: /* ODBC 2.0 */
-            len = 4;
-            value = (SQL_GD_ANY_COLUMN | SQL_GD_ANY_ORDER | SQL_GD_BOUND
-                     | SQL_GD_BLOCK);
-            break;
-
-        case SQL_GROUP_BY: /* ODBC 2.0 */
-            len = 2;
-            value = SQL_GB_GROUP_BY_CONTAINS_SELECT;
-            break;
-
-        case SQL_IDENTIFIER_CASE: /* ODBC 1.0 */
-
-            /*
-             * are identifiers case-sensitive (yes, but only when quoted.
-             * If not quoted, they default to lowercase)
-             */
-            len = 2;
-            value = SQL_IC_LOWER;
-            break;
-
-        case SQL_IDENTIFIER_QUOTE_CHAR: /* ODBC 1.0 */
-            /* the character used to quote "identifiers" */
-            p = "`";
-            break;
-
-        case SQL_KEYWORDS: /* ODBC 2.0 */
-            p = NULL_STRING;
-            break;
-
-        case SQL_LIKE_ESCAPE_CLAUSE: /* ODBC 2.0 */
-            p = "Y";
-            break;
-
-        case SQL_LOCK_TYPES: /* ODBC 2.0 */
-            len = 4;
-            value = SQL_LCK_NO_CHANGE;
-            break;
-
-        case SQL_MAX_BINARY_LITERAL_LEN: /* ODBC 2.0 */
-            len = 4;
-            value = 0;
-            break;
-
-        case SQL_MAX_CHAR_LITERAL_LEN: /* ODBC 2.0 */
-            len = 4;
-            value = 0;
-            break;
-
-        case SQL_MAX_COLUMN_NAME_LEN: /* ODBC 1.0 */
-            len = 2;
-            value = CC_get_max_idlen(conn);
-            if (0 == value)
-                value = NAMEDATALEN_V73 - 1;
-            break;
-
-        case SQL_MAX_COLUMNS_IN_GROUP_BY: /* ODBC 2.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_MAX_COLUMNS_IN_INDEX: /* ODBC 2.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_MAX_COLUMNS_IN_ORDER_BY: /* ODBC 2.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_MAX_COLUMNS_IN_SELECT: /* ODBC 2.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_MAX_COLUMNS_IN_TABLE: /* ODBC 2.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_MAX_CURSOR_NAME_LEN: /* ODBC 1.0 */
-            len = 2;
-            value = MAX_CURSOR_LEN;
-            break;
-
-        case SQL_MAX_INDEX_SIZE: /* ODBC 2.0 */
-            len = 4;
-            value = 0;
-            break;
-
-        case SQL_MAX_OWNER_NAME_LEN: /* ODBC 1.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_MAX_PROCEDURE_NAME_LEN: /* ODBC 1.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_MAX_QUALIFIER_NAME_LEN: /* ODBC 1.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_MAX_ROW_SIZE: /* ODBC 2.0 */
-            len = 4;
-            /* No limit with tuptoaster in 7.1+ */
-            value = 0;
-            break;
-
-        case SQL_MAX_STATEMENT_LEN: /* ODBC 2.0 */
-            len = 4;
-            value = 0;
-            break;
-
-        case SQL_MAX_TABLE_NAME_LEN: /* ODBC 1.0 */
-            len = 2;
-            if (OPENSEARCH_VERSION_GT(conn, 7.4))
-                value = CC_get_max_idlen(conn);
-#ifdef MAX_TABLE_LEN
-            else
-                value = MAX_TABLE_LEN;
-#endif /* MAX_TABLE_LEN */
-            if (0 == value)
-                value = NAMEDATALEN_V73 - 1;
-            break;
-
-        case SQL_MAX_TABLES_IN_SELECT: /* ODBC 2.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_MAX_USER_NAME_LEN:
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_MULT_RESULT_SETS: /* ODBC 1.0 */
-            /* Don't support multiple result sets but say yes anyway? */
-            p = "Y";
-            break;
-
-        case SQL_MULTIPLE_ACTIVE_TXN: /* ODBC 1.0 */
-            p = "Y";
-            break;
-
-        case SQL_NEED_LONG_DATA_LEN: /* ODBC 2.0 */
-
-            /*
-             * Don't need the length, SQLPutData can handle any size and
-             * multiple calls
-             */
-            p = "N";
-            break;
-
-        case SQL_NON_NULLABLE_COLUMNS: /* ODBC 1.0 */
-            len = 2;
-            value = SQL_NNC_NON_NULL;
-            break;
-
-        case SQL_NULL_COLLATION: /* ODBC 2.0 */
-            /* where are nulls sorted? */
-            len = 2;
-            value = SQL_NC_HIGH;
-            break;
-
-        case SQL_NUMERIC_FUNCTIONS: /* ODBC 1.0 */
-            len = 4;
-            value = SQL_FN_NUM_ABS | SQL_FN_NUM_ATAN | SQL_FN_NUM_ATAN2
-                    | SQL_FN_NUM_COS | SQL_FN_NUM_COT | SQL_FN_NUM_DEGREES
-                    | SQL_FN_NUM_FLOOR | SQL_FN_NUM_LOG | SQL_FN_NUM_LOG10
-                    | SQL_FN_NUM_PI | SQL_FN_NUM_POWER | SQL_FN_NUM_RADIANS
-                    | SQL_FN_NUM_ROUND | SQL_FN_NUM_SIGN | SQL_FN_NUM_SIN
-                    | SQL_FN_NUM_SQRT | SQL_FN_NUM_TAN;
-            break;
-
-        case SQL_ODBC_API_CONFORMANCE: /* ODBC 1.0 */
-            len = 2;
-            value = SQL_OAC_LEVEL1;
-            break;
-
-        case SQL_ODBC_SAG_CLI_CONFORMANCE: /* ODBC 1.0 */
-            len = 2;
-            value = SQL_OSCC_NOT_COMPLIANT;
-            break;
-
-        case SQL_ODBC_SQL_CONFORMANCE: /* ODBC 1.0 */
-            len = 2;
-            value = SQL_OSC_CORE;
-            break;
-
-        case SQL_ODBC_SQL_OPT_IEF: /* ODBC 1.0 */
-            p = "N";
-            break;
-
-        case SQL_OJ_CAPABILITIES: /* ODBC 2.01 */
-            len = 4;
-            value = SQL_OJ_LEFT | SQL_OJ_RIGHT | SQL_OJ_NOT_ORDERED
-                    | SQL_OJ_ALL_COMPARISON_OPS;
-            break;
-
-        case SQL_ORDER_BY_COLUMNS_IN_SELECT: /* ODBC 2.0 */
-            p = "Y";
-            break;
-
-        case SQL_OUTER_JOINS: /* ODBC 1.0 */
-            p = "Y";
-            break;
-
-        case SQL_OWNER_TERM: /* ODBC 1.0 */
-            p = "";
-            break;
-
-        case SQL_OWNER_USAGE: /* ODBC 2.0 */
-            // OpenSearch does not support schemas.
-            // This will disable showing an empty schema box in Tableau.
-            len = 4;
-            value = 0;
-            break;
-
-        case SQL_POS_OPERATIONS: /* ODBC 2.0 */
-            len = 4;
-            value = (SQL_POS_POSITION | SQL_POS_REFRESH);
-            break;
-
-        case SQL_POSITIONED_STATEMENTS: /* ODBC 2.0 */
-            len = 4;
-            value = 0;
-            break;
-
-        case SQL_PROCEDURE_TERM: /* ODBC 1.0 */
-            p = "procedure";
-            break;
-
-        case SQL_PROCEDURES: /* ODBC 1.0 */
-            p = "Y";
-            break;
-
-        case SQL_QUALIFIER_LOCATION: /* ODBC 2.0 */
-            len = 2;
-            value = 0;
-            break;
-
-        case SQL_QUALIFIER_NAME_SEPARATOR: /* ODBC 1.0 */
-            p = "";
-            break;
-
-        case SQL_QUALIFIER_TERM: /* ODBC 1.0 */
-            p = "";
-            break;
-
-        case SQL_QUALIFIER_USAGE: /* ODBC 2.0 */
-            len = 4;
-            value = 0;
-            break;
-
-        case SQL_QUOTED_IDENTIFIER_CASE: /* ODBC 2.0 */
-            /* are "quoted" identifiers case-sensitive?  YES! */
-            len = 2;
-            value = SQL_IC_SENSITIVE;
-            break;
-
-        case SQL_ROW_UPDATES: /* ODBC 1.0 */
-
-            /*
-             * Driver doesn't support keyset-driven or mixed cursors, so
-             * not much point in saying row updates are supported
-             */
-            p = "N";
-            break;
-
-        case SQL_SCROLL_CONCURRENCY: /* ODBC 1.0 */
-            len = 4;
-            value = SQL_SCCO_READ_ONLY;
-            break;
-
-        case SQL_SCROLL_OPTIONS: /* ODBC 1.0 */
-            len = 4;
-            value = SQL_SO_FORWARD_ONLY | SQL_SO_STATIC;
-            break;
-
-        case SQL_SEARCH_PATTERN_ESCAPE: /* ODBC 1.0 */
-            p = "";
-            break;
-
-        case SQL_SERVER_NAME: /* ODBC 1.0 */
-            p = CC_get_server(conn);
-            break;
-
-        case SQL_SPECIAL_CHARACTERS: /* ODBC 2.0 */
-            p = "_";
-            break;
-
-        case SQL_STATIC_SENSITIVITY: /* ODBC 2.0 */
-            len = 4;
-            value = 0;
-            break;
-
-        case SQL_STRING_FUNCTIONS: /* ODBC 1.0 */
-            len = 4;
-            value = SQL_FN_STR_ASCII | SQL_FN_STR_LENGTH | SQL_FN_STR_LTRIM
-                    | SQL_FN_STR_REPLACE | SQL_FN_STR_RTRIM
-                    | SQL_FN_STR_SUBSTRING;
-            break;
-
-        case SQL_SUBQUERIES: /* ODBC 2.0 */
-            len = 4;
-            value = (SQL_SQ_QUANTIFIED | SQL_SQ_IN | SQL_SQ_EXISTS
-                     | SQL_SQ_COMPARISON);
-            break;
-
-        case SQL_SYSTEM_FUNCTIONS: /* ODBC 1.0 */
-            len = 4;
-            value = SQL_FN_SYS_IFNULL;
-            break;
-
-        case SQL_TABLE_TERM: /* ODBC 1.0 */
-            p = "table";
-            break;
-
-        case SQL_TIMEDATE_ADD_INTERVALS: /* ODBC 2.0 */
-            len = 4;
-            value = 0;
-            break;
-
-        case SQL_TIMEDATE_DIFF_INTERVALS: /* ODBC 2.0 */
-            len = 4;
-            value = 0;
-            break;
-
-        case SQL_TIMEDATE_FUNCTIONS: /* ODBC 1.0 */
-            len = 4;
-            value = SQL_FN_TD_CURDATE | SQL_FN_TD_DAYOFMONTH | SQL_FN_TD_MONTH
-                    | SQL_FN_TD_MONTHNAME | SQL_FN_TD_NOW | SQL_FN_TD_YEAR;
-            break;
-
-        case SQL_TXN_CAPABLE: /* ODBC 1.0 */
-            /*
-             * OpenSearch does not support transactions.
-             */
-            len = 2;
-            value = SQL_TC_NONE;
-            break;
-
-        case SQL_TXN_ISOLATION_OPTION: /* ODBC 1.0 */
-            len = 4;
-            value = SQL_TXN_READ_UNCOMMITTED | SQL_TXN_READ_COMMITTED
-                    | SQL_TXN_REPEATABLE_READ | SQL_TXN_SERIALIZABLE;
-            break;
-
-        case SQL_UNION: /* ODBC 2.0 */
-            len = 4;
-            value = (SQL_U_UNION | SQL_U_UNION_ALL);
-            break;
-
-        case SQL_USER_NAME: /* ODBC 1.0 */
-            p = CC_get_username(conn);
-            break;
-
-        /* Keys for ODBC 3.0 */
-        case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_DYNAMIC_CURSOR_ATTRIBUTES2:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1:
-            len = 4;
-            value = SQL_CA1_NEXT; /* others aren't allowed in ODBC spec */
-            break;
-        case SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2:
-            len = 4;
-            value = SQL_CA2_READ_ONLY_CONCURRENCY | SQL_CA2_CRC_EXACT;
-            break;
-        case SQL_KEYSET_CURSOR_ATTRIBUTES1:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_KEYSET_CURSOR_ATTRIBUTES2:
-            len = 4;
-            value = 0;
-            break;
-
-        case SQL_STATIC_CURSOR_ATTRIBUTES1:
-            len = 4;
-            value = SQL_CA1_NEXT | SQL_CA1_ABSOLUTE | SQL_CA1_RELATIVE
-                    | SQL_CA1_BOOKMARK | SQL_CA1_LOCK_NO_CHANGE
-                    | SQL_CA1_POS_POSITION | SQL_CA1_POS_REFRESH;
-            break;
-        case SQL_STATIC_CURSOR_ATTRIBUTES2:
-            len = 4;
-            value = SQL_CA2_READ_ONLY_CONCURRENCY | SQL_CA2_CRC_EXACT;
-            break;
-
-        case SQL_ODBC_INTERFACE_CONFORMANCE:
-            len = 4;
-            value = SQL_OIC_CORE;
-            break;
-        case SQL_ACTIVE_ENVIRONMENTS:
-            len = 2;
-            value = 0;
-            break;
-        case SQL_AGGREGATE_FUNCTIONS:
-            len = 4;
-            value = SQL_AF_ALL;
-            break;
-        case SQL_ALTER_DOMAIN:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_ASYNC_MODE:
-            len = 4;
-            value = SQL_AM_NONE;
-            break;
-        case SQL_BATCH_ROW_COUNT:
-            len = 4;
-            value = SQL_BRC_EXPLICIT;
-            break;
-        case SQL_BATCH_SUPPORT:
-            len = 4;
-            value = SQL_BS_SELECT_EXPLICIT | SQL_BS_ROW_COUNT_EXPLICIT;
-            break;
-        case SQL_CATALOG_NAME:
-            p = "N";
-            break;
-        case SQL_COLLATION_SEQ:
-            p = "";
-            break;
-        case SQL_CREATE_ASSERTION:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_CREATE_CHARACTER_SET:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_CREATE_COLLATION:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_CREATE_DOMAIN:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_CREATE_SCHEMA:
-            len = 4;
-            value = SQL_CS_CREATE_SCHEMA | SQL_CS_AUTHORIZATION;
-            break;
-        case SQL_CREATE_TABLE:
-            len = 4;
-            value = SQL_CT_CREATE_TABLE | SQL_CT_COLUMN_CONSTRAINT
-                    | SQL_CT_COLUMN_DEFAULT | SQL_CT_GLOBAL_TEMPORARY
-                    | SQL_CT_TABLE_CONSTRAINT
-                    | SQL_CT_CONSTRAINT_NAME_DEFINITION
-                    | SQL_CT_CONSTRAINT_INITIALLY_DEFERRED
-                    | SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE
-                    | SQL_CT_CONSTRAINT_DEFERRABLE;
-            break;
-        case SQL_CREATE_TRANSLATION:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_CREATE_VIEW:
-            len = 4;
-            value = SQL_CV_CREATE_VIEW;
-            break;
-        case SQL_DDL_INDEX:
-            len = 4;
-            value = SQL_DI_CREATE_INDEX | SQL_DI_DROP_INDEX;
-            break;
-        case SQL_DESCRIBE_PARAMETER:
-            p = "N";
-            break;
-        case SQL_DROP_ASSERTION:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_DROP_CHARACTER_SET:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_DROP_COLLATION:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_DROP_DOMAIN:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_DROP_SCHEMA:
-            len = 4;
-            value = SQL_DS_DROP_SCHEMA | SQL_DS_RESTRICT | SQL_DS_CASCADE;
-            break;
-        case SQL_DROP_TABLE:
-            len = 4;
-            value = SQL_DT_DROP_TABLE;
-            value |= (SQL_DT_RESTRICT | SQL_DT_CASCADE);
-            break;
-        case SQL_DROP_TRANSLATION:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_DROP_VIEW:
-            len = 4;
-            value = SQL_DV_DROP_VIEW;
-            value |= (SQL_DV_RESTRICT | SQL_DV_CASCADE);
-            break;
-        case SQL_INDEX_KEYWORDS:
-            len = 4;
-            value = SQL_IK_NONE;
-            break;
-        case SQL_INFO_SCHEMA_VIEWS:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_INSERT_STATEMENT:
-            len = 4;
-            value = SQL_IS_INSERT_LITERALS | SQL_IS_INSERT_SEARCHED
-                    | SQL_IS_SELECT_INTO;
-            break;
-        case SQL_MAX_IDENTIFIER_LEN:
-            len = 2;
-            value = CC_get_max_idlen(conn);
-            if (0 == value)
-                value = NAMEDATALEN_V73 - 1;
-            break;
-        case SQL_MAX_ROW_SIZE_INCLUDES_LONG:
-            p = "Y";
-            break;
-        case SQL_PARAM_ARRAY_ROW_COUNTS:
-            len = 4;
-            value = SQL_PARC_BATCH;
-            break;
-        case SQL_PARAM_ARRAY_SELECTS:
-            len = 4;
-            value = SQL_PAS_BATCH;
-            break;
-        case SQL_SQL_CONFORMANCE:
-            // SQL plugin currently does not support this level,
-            // but Tableau requires at least Entry level reported for retrieving
-            // row data
-            len = 4;
-            value = SQL_SC_SQL92_ENTRY;
-            break;
-        case SQL_SQL92_DATETIME_FUNCTIONS:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_SQL92_FOREIGN_KEY_DELETE_RULE:
-            len = 4;
-            value = SQL_SFKD_CASCADE | SQL_SFKD_NO_ACTION | SQL_SFKD_SET_DEFAULT
-                    | SQL_SFKD_SET_NULL;
-            break;
-        case SQL_SQL92_FOREIGN_KEY_UPDATE_RULE:
-            len = 4;
-            value = SQL_SFKU_CASCADE | SQL_SFKU_NO_ACTION | SQL_SFKU_SET_DEFAULT
-                    | SQL_SFKU_SET_NULL;
-            break;
-        case SQL_SQL92_GRANT:
-            len = 4;
-            value = SQL_SG_DELETE_TABLE | SQL_SG_INSERT_TABLE
-                    | SQL_SG_REFERENCES_TABLE | SQL_SG_SELECT_TABLE
-                    | SQL_SG_UPDATE_TABLE;
-            break;
-        case SQL_SQL92_NUMERIC_VALUE_FUNCTIONS:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_SQL92_PREDICATES:
-            len = 4;
-            value = SQL_SP_BETWEEN | SQL_SP_COMPARISON | SQL_SP_IN
-                    | SQL_SP_ISNULL | SQL_SP_LIKE;
-            break;
-        case SQL_SQL92_RELATIONAL_JOIN_OPERATORS:
-            len = 4;
-            value = SQL_SRJO_CROSS_JOIN | SQL_SRJO_INNER_JOIN
-                    | SQL_SRJO_LEFT_OUTER_JOIN | SQL_SRJO_RIGHT_OUTER_JOIN;
-            break;
-        case SQL_SQL92_REVOKE:
-            len = 4;
-            value = SQL_SR_DELETE_TABLE | SQL_SR_INSERT_TABLE
-                    | SQL_SR_REFERENCES_TABLE | SQL_SR_SELECT_TABLE
-                    | SQL_SR_UPDATE_TABLE;
-            break;
-        case SQL_SQL92_ROW_VALUE_CONSTRUCTOR:
-            len = 4;
-            value = SQL_SRVC_VALUE_EXPRESSION | SQL_SRVC_NULL;
-            break;
-        case SQL_SQL92_STRING_FUNCTIONS:
-            len = 4;
-            value = SQL_SSF_LOWER | SQL_SSF_UPPER;
-            break;
-        case SQL_SQL92_VALUE_EXPRESSIONS:
-            len = 4;
-            value = SQL_SVE_CASE | SQL_SVE_CAST;
-            break;
-#ifdef SQL_DTC_TRANSACTION_COST
-        case SQL_DTC_TRANSACTION_COST:
-#else
-        case 1750:
-#endif
-            len = 4;
-            break;
-        case SQL_DATETIME_LITERALS:
-        case SQL_DRIVER_HDESC:
-        case SQL_MAX_ASYNC_CONCURRENT_STATEMENTS:
-        case SQL_STANDARD_CLI_CONFORMANCE:
-        case SQL_CONVERT_INTERVAL_DAY_TIME:
-            len = 4;
-            value = 0;
-            break;
-        case SQL_DM_VER:
-        case SQL_XOPEN_CLI_YEAR:
-            len = 0;
-            value = 0;
-            break;
-
-        default:
-            /* unrecognized key */
-            CC_set_error(conn, CONN_NOT_IMPLEMENTED_ERROR,
-                         "Unrecognized key passed to OPENSEARCHAPI_GetInfo.", NULL);
-            goto cleanup;
-    }
-
-    ret = SQL_SUCCESS;
-
-    MYLOG(OPENSEARCH_DEBUG, "p='%s', len=" FORMAT_ULEN ", value=" FORMAT_ULEN ", cbMax=%d\n",
-          p ? p : "<NULL>", len, value, cbInfoValueMax);
-
-    /*
-     * NOTE, that if rgbInfoValue is NULL, then no warnings or errors
-     * should result and just pcbInfoValue is returned, which indicates
-     * what length would be required if a real buffer had been passed in.
-     */
-    if (p) {
-        /* char/binary data */
-        len = strlen(p);
-
-        if (rgbInfoValue) {
-#ifdef UNICODE_SUPPORT
-            if (CC_is_in_unicode_driver(conn)) {
-                len = utf8_to_ucs2(p, len, (SQLWCHAR *)rgbInfoValue,
-                                   cbInfoValueMax / WCLEN);
-                len *= WCLEN;
-            } else
-#endif /* UNICODE_SUPPORT */
-                strncpy_null((char *)rgbInfoValue, p, (size_t)cbInfoValueMax);
-
-            if (len >= (SQLULEN)cbInfoValueMax) {
-                ret = SQL_SUCCESS_WITH_INFO;
-                CC_set_error(conn, CONN_TRUNCATED,
-                             "The buffer was too small for the InfoValue.",
-                             func);
-            }
-        }
-#ifdef UNICODE_SUPPORT
-        else if (CC_is_in_unicode_driver(conn))
-            len *= WCLEN;
-#endif /* UNICODE_SUPPORT */
-    } else {
-        /* numeric data */
-        if (rgbInfoValue) {
-            if (len == sizeof(SQLSMALLINT))
-                *((SQLUSMALLINT *)rgbInfoValue) = (SQLUSMALLINT)value;
-            else if (len == sizeof(SQLINTEGER))
-                *((SQLUINTEGER *)rgbInfoValue) = (SQLUINTEGER)value;
-        }
-    }
-
-    if (pcbInfoValue)
-        *pcbInfoValue = (SQLSMALLINT)len;
-cleanup:
-
-    return ret;
-}
-
-/*
- *	macros for opensearchtype_xxxx() calls which have OPENSEARCH_ATP_UNSET parameters
- */
-#define OPENSEARCHTYPE_COLUMN_SIZE(conn, openSearchType)                              \
-    opensearchtype_attr_column_size(conn, openSearchType, OPENSEARCH_ATP_UNSET, \
-                            OPENSEARCH_ADT_UNSET, OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_TO_CONCISE_TYPE(conn, openSearchType)                              \
-    opensearchtype_attr_to_concise_type(conn, openSearchType, OPENSEARCH_ATP_UNSET, \
-                                OPENSEARCH_ADT_UNSET,               \
-                                OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_TO_SQLDESCTYPE(conn, openSearchType)                              \
-    opensearchtype_attr_to_sqldesctype(conn, openSearchType, OPENSEARCH_ATP_UNSET, \
-                               OPENSEARCH_ADT_UNSET,               \
-                               OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_BUFFER_LENGTH(conn, openSearchType)                              \
-    opensearchtype_attr_buffer_length(conn, openSearchType, OPENSEARCH_ATP_UNSET, \
-                              OPENSEARCH_ADT_UNSET, OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_DECIMAL_DIGITS(conn, openSearchType)                              \
-    opensearchtype_attr_decimal_digits(conn, openSearchType, OPENSEARCH_ATP_UNSET, \
-                               OPENSEARCH_ADT_UNSET,               \
-                               OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_TRANSFER_OCTET_LENGTH(conn, openSearchType)                \
-    opensearchtype_attr_transfer_octet_length(conn, openSearchType, OPENSEARCH_ATP_UNSET, \
-                                      OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_TO_NAME(conn, openSearchType, auto_increment) \
-    opensearchtype_attr_to_name(conn, openSearchType, OPENSEARCH_ATP_UNSET, auto_increment)
-
-RETCODE SQL_API OPENSEARCHAPI_GetFunctions(HDBC hdbc, SQLUSMALLINT fFunction,
-                                   SQLUSMALLINT *pfExists) {
-    UNUSED(hdbc);
-    MYLOG(OPENSEARCH_TRACE, "entering...%u\n", fFunction);
-
-    if (fFunction == SQL_API_ALL_FUNCTIONS) {
-        memset(pfExists, 0, sizeof(pfExists[0]) * 100);
-
-        /* ODBC core functions */
-        pfExists[SQL_API_SQLALLOCCONNECT] = TRUE;
-        pfExists[SQL_API_SQLALLOCENV] = TRUE;
-        pfExists[SQL_API_SQLALLOCSTMT] = TRUE;
-        pfExists[SQL_API_SQLBINDCOL] = TRUE;
-        pfExists[SQL_API_SQLCANCEL] = TRUE;
-        pfExists[SQL_API_SQLCOLATTRIBUTES] = TRUE;
-        pfExists[SQL_API_SQLCONNECT] = TRUE;
-        pfExists[SQL_API_SQLDESCRIBECOL] = TRUE; /* partial */
-        pfExists[SQL_API_SQLDISCONNECT] = TRUE;
-        pfExists[SQL_API_SQLERROR] = TRUE;
-        pfExists[SQL_API_SQLEXECDIRECT] = TRUE;
-        pfExists[SQL_API_SQLEXECUTE] = TRUE;
-        pfExists[SQL_API_SQLFETCH] = TRUE;
-        pfExists[SQL_API_SQLFREECONNECT] = TRUE;
-        pfExists[SQL_API_SQLFREEENV] = TRUE;
-        pfExists[SQL_API_SQLFREESTMT] = TRUE;
-        pfExists[SQL_API_SQLGETCURSORNAME] = TRUE;
-        pfExists[SQL_API_SQLNUMRESULTCOLS] = TRUE;
-        pfExists[SQL_API_SQLPREPARE] = TRUE; /* complete? */
-        pfExists[SQL_API_SQLROWCOUNT] = TRUE;
-        pfExists[SQL_API_SQLSETCURSORNAME] = TRUE;
-        pfExists[SQL_API_SQLSETPARAM] = FALSE; /* odbc 1.0 */
-        pfExists[SQL_API_SQLTRANSACT] = TRUE;
-
-        /* ODBC level 1 functions */
-        pfExists[SQL_API_SQLBINDPARAMETER] = TRUE;
-        pfExists[SQL_API_SQLCOLUMNS] = TRUE;
-        pfExists[SQL_API_SQLDRIVERCONNECT] = TRUE;
-        pfExists[SQL_API_SQLGETCONNECTOPTION] = TRUE; /* partial */
-        pfExists[SQL_API_SQLGETDATA] = TRUE;
-        pfExists[SQL_API_SQLGETFUNCTIONS] = TRUE;
-        pfExists[SQL_API_SQLGETINFO] = TRUE;
-        pfExists[SQL_API_SQLGETSTMTOPTION] = TRUE; /* partial */
-        pfExists[SQL_API_SQLGETTYPEINFO] = TRUE;
-        pfExists[SQL_API_SQLPARAMDATA] = TRUE;
-        pfExists[SQL_API_SQLPUTDATA] = TRUE;
-        pfExists[SQL_API_SQLSETCONNECTOPTION] = TRUE; /* partial */
-        pfExists[SQL_API_SQLSETSTMTOPTION] = TRUE;
-        pfExists[SQL_API_SQLSPECIALCOLUMNS] = TRUE;
-        pfExists[SQL_API_SQLSTATISTICS] = TRUE;
-        pfExists[SQL_API_SQLTABLES] = TRUE;
-
-        /* ODBC level 2 functions */
-        pfExists[SQL_API_SQLBROWSECONNECT] = FALSE;
-        pfExists[SQL_API_SQLCOLUMNPRIVILEGES] = FALSE;
-        pfExists[SQL_API_SQLDATASOURCES] = FALSE; /* only implemented by
-                                                   * DM */
-        if (SUPPORT_DESCRIBE_PARAM(ci))
-            pfExists[SQL_API_SQLDESCRIBEPARAM] = TRUE;
-        else
-            pfExists[SQL_API_SQLDESCRIBEPARAM] = FALSE; /* not properly
-                                                         * implemented */
-        pfExists[SQL_API_SQLDRIVERS] = FALSE;           /* only implemented by
-                                                         * DM */
-        pfExists[SQL_API_SQLEXTENDEDFETCH] = TRUE;
-        pfExists[SQL_API_SQLFOREIGNKEYS] = TRUE;
-        pfExists[SQL_API_SQLMORERESULTS] = TRUE;
-        pfExists[SQL_API_SQLNATIVESQL] = TRUE;
-        pfExists[SQL_API_SQLNUMPARAMS] = TRUE;
-        pfExists[SQL_API_SQLPARAMOPTIONS] = TRUE;
-        pfExists[SQL_API_SQLPRIMARYKEYS] = TRUE;
-        pfExists[SQL_API_SQLPROCEDURECOLUMNS] = TRUE;
-        pfExists[SQL_API_SQLPROCEDURES] = TRUE;
-        pfExists[SQL_API_SQLSETPOS] = TRUE;
-        pfExists[SQL_API_SQLSETSCROLLOPTIONS] = TRUE; /* odbc 1.0 */
-        pfExists[SQL_API_SQLTABLEPRIVILEGES] = TRUE;
-        pfExists[SQL_API_SQLBULKOPERATIONS] = FALSE;
-    } else {
-        switch (fFunction) {
-            case SQL_API_SQLBINDCOL:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLCANCEL:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLCOLATTRIBUTE:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLCONNECT:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLDESCRIBECOL:
-                *pfExists = TRUE;
-                break; /* partial */
-            case SQL_API_SQLDISCONNECT:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLEXECDIRECT:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLEXECUTE:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLFETCH:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLFREESTMT:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLGETCURSORNAME:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLNUMRESULTCOLS:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLPREPARE:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLROWCOUNT:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLSETCURSORNAME:
-                *pfExists = TRUE;
-                break;
-
-                /* ODBC level 1 functions */
-            case SQL_API_SQLBINDPARAMETER:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLCOLUMNS:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLDRIVERCONNECT:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLGETDATA:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLGETFUNCTIONS:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLGETINFO:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLGETTYPEINFO:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLPARAMDATA:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLPUTDATA:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLSPECIALCOLUMNS:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLSTATISTICS:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLTABLES:
-                *pfExists = TRUE;
-                break;
-
-                /* ODBC level 2 functions */
-            case SQL_API_SQLBROWSECONNECT:
-                *pfExists = FALSE;
-                break;
-            case SQL_API_SQLCOLUMNPRIVILEGES:
-                *pfExists = FALSE;
-                break;
-            case SQL_API_SQLDATASOURCES:
-                *pfExists = FALSE;
-                break; /* only implemented by DM */
-            case SQL_API_SQLDESCRIBEPARAM:
-                if (SUPPORT_DESCRIBE_PARAM(ci))
-                    *pfExists = TRUE;
-                else
-                    *pfExists = FALSE;
-                break; /* not properly implemented */
-            case SQL_API_SQLDRIVERS:
-                *pfExists = FALSE;
-                break; /* only implemented by DM */
-            case SQL_API_SQLEXTENDEDFETCH:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLFOREIGNKEYS:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLMORERESULTS:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLNATIVESQL:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLNUMPARAMS:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLPRIMARYKEYS:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLPROCEDURECOLUMNS:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLPROCEDURES:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLSETPOS:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLTABLEPRIVILEGES:
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLBULKOPERATIONS: /* 24 */
-            case SQL_API_SQLALLOCHANDLE:    /* 1001 */
-            case SQL_API_SQLBINDPARAM:      /* 1002 */
-            case SQL_API_SQLCLOSECURSOR:    /* 1003 */
-            case SQL_API_SQLENDTRAN:        /* 1005 */
-            case SQL_API_SQLFETCHSCROLL:    /* 1021 */
-            case SQL_API_SQLFREEHANDLE:     /* 1006 */
-            case SQL_API_SQLGETCONNECTATTR: /* 1007 */
-            case SQL_API_SQLGETDESCFIELD:   /* 1008 */
-            case SQL_API_SQLGETDIAGFIELD:   /* 1010 */
-            case SQL_API_SQLGETDIAGREC:     /* 1011 */
-            case SQL_API_SQLGETENVATTR:     /* 1012 */
-            case SQL_API_SQLGETSTMTATTR:    /* 1014 */
-            case SQL_API_SQLSETCONNECTATTR: /* 1016 */
-            case SQL_API_SQLSETDESCFIELD:   /* 1017 */
-            case SQL_API_SQLSETENVATTR:     /* 1019 */
-            case SQL_API_SQLSETSTMTATTR:    /* 1020 */
-                *pfExists = TRUE;
-                break;
-            case SQL_API_SQLGETDESCREC: /* 1009 */
-            case SQL_API_SQLSETDESCREC: /* 1018 */
-            case SQL_API_SQLCOPYDESC:   /* 1004 */
-                *pfExists = FALSE;
-                break;
-            default:
-                *pfExists = FALSE;
-                break;
-        }
-    }
-    return SQL_SUCCESS;
-}
-
-char *identifierEscape(const SQLCHAR *src, SQLLEN srclen,
-                       const ConnectionClass *conn, char *buf, size_t bufsize,
-                       BOOL double_quote) {
-    int i;
-    size_t outlen;
-    UCHAR tchar;
-    char *dest = NULL, escape_ch = CC_get_escape(conn);
-    encoded_str encstr;
-
-    if (!src || srclen == SQL_NULL_DATA)
-        return dest;
-    else if (srclen == SQL_NTS)
-        srclen = (SQLLEN)strlen((char *)src);
-    if (srclen <= 0)
-        return dest;
-    MYLOG(OPENSEARCH_TRACE, "entering in=%s(" FORMAT_LEN ")\n", src, srclen);
-    if (NULL != buf && bufsize > 0)
-        dest = buf;
-    else {
-        bufsize = 2 * srclen + 1;
-        dest = malloc(bufsize);
-    }
-    if (!dest)
-        return NULL;
-    encoded_str_constr(&encstr, conn->ccsc, (char *)src);
-    outlen = 0;
-    if (double_quote)
-        dest[outlen++] = IDENTIFIER_QUOTE;
-    for (i = 0, tchar = (UCHAR)encoded_nextchar(&encstr);
-         i < srclen && outlen < bufsize - 1;
-         i++, tchar = (UCHAR)encoded_nextchar(&encstr)) {
-        if (MBCS_NON_ASCII(encstr)) {
-            dest[outlen++] = tchar;
-            continue;
-        }
-        if (LITERAL_QUOTE == tchar || escape_ch == tchar)
-            dest[outlen++] = tchar;
-        else if (double_quote && IDENTIFIER_QUOTE == tchar)
-            dest[outlen++] = tchar;
-        dest[outlen++] = tchar;
-    }
-    if (double_quote)
-        dest[outlen++] = IDENTIFIER_QUOTE;
-    dest[outlen] = '\0';
-    MYLOG(OPENSEARCH_TRACE, "leaving output=%s(%d)\n", dest, (int)outlen);
-    return dest;
-}
-
-#define CSTR_SYS_TABLE "SYSTEM TABLE"
-#define CSTR_TABLE "TABLE"
-#define CSTR_VIEW "VIEW"
-#define CSTR_FOREIGN_TABLE "FOREIGN TABLE"
-#define CSTR_MATVIEW "MATVIEW"
-
-#define IS_VALID_NAME(str) ((str) && (str)[0])
-#define TABLE_IN_RELKIND "('r', 'v', 'm', 'f', 'p')"
-
-/*
- *	macros for opensearchtype_attr_xxxx() calls which have
- *		OPENSEARCH_ADT_UNSET or OPENSEARCH_UNKNOWNS_UNSET parameters
- */
-#define OPENSEARCHTYPE_ATTR_COLUMN_SIZE(conn, openSearchType, atttypmod)           \
-    opensearchtype_attr_column_size(conn, openSearchType, atttypmod, OPENSEARCH_ADT_UNSET, \
-                            OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_ATTR_TO_CONCISE_TYPE(conn, openSearchType, atttypmod)           \
-    opensearchtype_attr_to_concise_type(conn, openSearchType, atttypmod, OPENSEARCH_ADT_UNSET, \
-                                OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_ATTR_TO_SQLDESCTYPE(conn, openSearchType, atttypmod)           \
-    opensearchtype_attr_to_sqldesctype(conn, openSearchType, atttypmod, OPENSEARCH_ADT_UNSET, \
-                               OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_ATTR_DISPLAY_SIZE(conn, openSearchType, atttypmod)           \
-    opensearchtype_attr_display_size(conn, openSearchType, atttypmod, OPENSEARCH_ADT_UNSET, \
-                             OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_ATTR_BUFFER_LENGTH(conn, openSearchType, atttypmod)           \
-    opensearchtype_attr_buffer_length(conn, openSearchType, atttypmod, OPENSEARCH_ADT_UNSET, \
-                              OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_ATTR_DECIMAL_DIGITS(conn, openSearchType, atttypmod)           \
-    opensearchtype_attr_decimal_digits(conn, openSearchType, atttypmod, OPENSEARCH_ADT_UNSET, \
-                               OPENSEARCH_UNKNOWNS_UNSET)
-#define OPENSEARCHTYPE_ATTR_TRANSFER_OCTET_LENGTH(conn, openSearchType, atttypmod) \
-    opensearchtype_attr_transfer_octet_length(conn, openSearchType, atttypmod,     \
-                                      OPENSEARCH_UNKNOWNS_UNSET)
-
-RETCODE SQL_API OPENSEARCHAPI_SpecialColumns(
-    HSTMT hstmt, SQLUSMALLINT fColType, const SQLCHAR *szTableQualifier,
-    SQLSMALLINT cbTableQualifier, const SQLCHAR *szTableOwner, /* OA E*/
-    SQLSMALLINT cbTableOwner, const SQLCHAR *szTableName,      /* OA(R) E*/
-    SQLSMALLINT cbTableName, SQLUSMALLINT fScope, SQLUSMALLINT fNullable) {
-    UNUSED(fColType, szTableQualifier, cbTableQualifier, szTableOwner,
-           cbTableOwner, szTableName, cbTableName, fScope, fNullable);
-    CSTR func = "OPENSEARCHAPI_SpecialColumns";
-
-    // Initialize Statement
-    StatementClass *stmt = (StatementClass *)hstmt;
-    RETCODE result;
-    if (result = SC_initialize_and_recycle(stmt), SQL_SUCCESS != result)
-        return result;
-
-    // Initialize QResultClass
-    QResultClass *res = QR_Constructor();
-    if (!res) {
-        SC_set_error(
-            stmt, STMT_NO_MEMORY_ERROR,
-            "Couldn't allocate memory for OPENSEARCHAPI_SpecialColumns result.", func);
-        return SQL_ERROR;
-    }
-
-    // Link QResultClass to statement and connection
-    QR_set_conn(res, SC_get_conn(stmt));
-    SC_set_Result(stmt, res);
-
-    // Set number of fields and declare as catalog result
-    extend_column_bindings(SC_get_ARDF(stmt), NUM_OF_SPECOLS_FIELDS);
-    stmt->catalog_result = TRUE;
-
-    // Setup fields
-    QR_set_num_fields(res, NUM_OF_SPECOLS_FIELDS);
-    QR_set_field_info_v(res, SPECOLS_SCOPE, "SCOPE", OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, SPECOLS_COLUMN_NAME, "COLUMN_NAME",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, SPECOLS_DATA_TYPE, "DATA_TYPE",
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, SPECOLS_TYPE_NAME, "TYPE_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, SPECOLS_COLUMN_SIZE, "COLUMN_SIZE",
-                        OPENSEARCH_TYPE_INT4,
-                        4);
-    QR_set_field_info_v(res, SPECOLS_BUFFER_LENGTH, "BUFFER_LENGTH",
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, SPECOLS_DECIMAL_DIGITS, "DECIMAL_DIGITS",
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, SPECOLS_PSEUDO_COLUMN, "PSEUDO_COLUMN",
-                        OPENSEARCH_TYPE_INT2, 2);
-
-    // Set result to okay and adjust fields if keys exist
-    QR_set_rstatus(res, PORES_FIELDS_OK);
-    res->num_fields = CI_get_num_fields(QR_get_fields(res));
-    if (QR_haskeyset(res))
-        res->num_fields -= res->num_key_fields;
-
-    // Finalize data
-    stmt->status = STMT_FINISHED;
-    stmt->currTuple = -1;
-    SC_set_rowset_start(stmt, -1, FALSE);
-    SC_set_current_col(stmt, -1);
-
-    return SQL_SUCCESS;
-}
-
-#define INDOPTION_DESC 0x0001 /* values are in reverse order */
-RETCODE SQL_API OPENSEARCHAPI_Statistics(
-    HSTMT hstmt, const SQLCHAR *szTableQualifier,              /* OA X*/
-    SQLSMALLINT cbTableQualifier, const SQLCHAR *szTableOwner, /* OA E*/
-    SQLSMALLINT cbTableOwner, const SQLCHAR *szTableName,      /* OA(R) E*/
-    SQLSMALLINT cbTableName, SQLUSMALLINT fUnique, SQLUSMALLINT fAccuracy) {
-    UNUSED(szTableQualifier, cbTableQualifier, szTableOwner, cbTableOwner,
-           szTableName, cbTableName, fUnique, fAccuracy);
-    CSTR func = "OPENSEARCHAPI_Statistics";
-
-    // Initialize Statement
-    StatementClass *stmt = (StatementClass *)hstmt;
-    RETCODE result;
-    if (result = SC_initialize_and_recycle(stmt), SQL_SUCCESS != result)
-        return result;
-
-    // Initialize QResultClass
-    QResultClass *res = QR_Constructor();
-    if (!res) {
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                     "Couldn't allocate memory for OPENSEARCHAPI_Statistics result.",
-                     func);
-        return SQL_ERROR;
-    }
-
-    // Link QResultClass to statement and connection
-    QR_set_conn(res, SC_get_conn(stmt));
-    SC_set_Result(stmt, res);
-
-    // Set number of fields and declare as catalog result
-    extend_column_bindings(SC_get_ARDF(stmt), NUM_OF_STATS_FIELDS);
-    stmt->catalog_result = TRUE;
-
-    // Setup fields
-    QR_set_num_fields(res, NUM_OF_STATS_FIELDS);
-    QR_set_field_info_v(res, STATS_CATALOG_NAME, "TABLE_QUALIFIER",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, STATS_SCHEMA_NAME, "TABLE_OWNER",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, STATS_TABLE_NAME, "TABLE_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, STATS_NON_UNIQUE, "NON_UNIQUE",
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, STATS_INDEX_QUALIFIER, "INDEX_QUALIFIER",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, STATS_INDEX_NAME, "INDEX_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, STATS_TYPE, "TYPE", OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, STATS_SEQ_IN_INDEX, "SEQ_IN_INDEX",
-                        OPENSEARCH_TYPE_INT2,
-                        2);
-    QR_set_field_info_v(res, STATS_COLUMN_NAME, "COLUMN_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, STATS_COLLATION, "COLLATION", OPENSEARCH_TYPE_CHAR, 1);
-    QR_set_field_info_v(res, STATS_CARDINALITY, "CARDINALITY",
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, STATS_PAGES, "PAGES", OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, STATS_FILTER_CONDITION, "FILTER_CONDITION",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-
-    // Set result to okay and adjust fields if keys exist
-    QR_set_rstatus(res, PORES_FIELDS_OK);
-    res->num_fields = CI_get_num_fields(QR_get_fields(res));
-    if (QR_haskeyset(res))
-        res->num_fields -= res->num_key_fields;
-
-    // Finalize data
-    stmt->status = STMT_FINISHED;
-    stmt->currTuple = -1;
-    SC_set_rowset_start(stmt, -1, FALSE);
-    SC_set_current_col(stmt, -1);
-
-    return SQL_SUCCESS;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_ColumnPrivileges(
-    HSTMT hstmt, const SQLCHAR *szTableQualifier,              /* OA X*/
-    SQLSMALLINT cbTableQualifier, const SQLCHAR *szTableOwner, /* OA E*/
-    SQLSMALLINT cbTableOwner, const SQLCHAR *szTableName,      /* OA(R) E*/
-    SQLSMALLINT cbTableName, const SQLCHAR *szColumnName,      /* PV E*/
-    SQLSMALLINT cbColumnName, UWORD flag) {
-    UNUSED(szTableQualifier, cbTableQualifier, szTableOwner, cbTableOwner,
-           szTableName, cbTableName, szColumnName, cbColumnName, flag);
-    CSTR func = "OPENSEARCHAPI_ColumnPrivileges";
-
-    // Initialize Statement
-    StatementClass *stmt = (StatementClass *)hstmt;
-    RETCODE result;
-    if (result = SC_initialize_and_recycle(stmt), SQL_SUCCESS != result)
-        return result;
-
-    // Initialize QResultClass
-    QResultClass *res = QR_Constructor();
-    if (!res) {
-        SC_set_error(
-            stmt, STMT_NO_MEMORY_ERROR,
-            "Couldn't allocate memory for OPENSEARCHAPI_ColumnPrivileges result.",
-            func);
-        return SQL_ERROR;
-    }
-
-    // Link QResultClass to statement and connection
-    QR_set_conn(res, SC_get_conn(stmt));
-    SC_set_Result(stmt, res);
-
-    // Set number of fields and declare as catalog result
-    extend_column_bindings(SC_get_ARDF(stmt), NUM_OF_COLPRIV_FIELDS);
-    stmt->catalog_result = TRUE;
-
-    // Setup fields
-    QR_set_num_fields(res, NUM_OF_COLPRIV_FIELDS);
-    QR_set_field_info_v(res, COLPRIV_TABLE_CAT, "TABLE_CAT",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLPRIV_TABLE_SCHEM, "TABLE_SCHEM",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLPRIV_TABLE_NAME, "TABLE_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLPRIV_COLUMN_NAME, "COLUMN_NAME",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLPRIV_GRANTOR, "GRANTOR",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLPRIV_GRANTEE, "GRANTEE",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLPRIV_PRIVILEGE, "PRIVILEGE",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLPRIV_IS_GRANTABLE, "IS_GRANTABLE",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-
-    // Set result to okay and adjust fields if keys exist
-    QR_set_rstatus(res, PORES_FIELDS_OK);
-    res->num_fields = CI_get_num_fields(QR_get_fields(res));
-    if (QR_haskeyset(res))
-        res->num_fields -= res->num_key_fields;
-
-    // Finalize data
-    stmt->status = STMT_FINISHED;
-    stmt->currTuple = -1;
-    SC_set_rowset_start(stmt, -1, FALSE);
-    SC_set_current_col(stmt, -1);
-
-    return SQL_SUCCESS;
-}
-
-/*
- *	SQLPrimaryKeys()
- *
- *	Retrieve the primary key columns for the specified table.
- */
-RETCODE SQL_API OPENSEARCHAPI_PrimaryKeys(HSTMT hstmt,
-                                  const SQLCHAR *szTableQualifier, /* OA X*/
-                                  SQLSMALLINT cbTableQualifier,
-                                  const SQLCHAR *szTableOwner, /* OA E*/
-                                  SQLSMALLINT cbTableOwner,
-                                  const SQLCHAR *szTableName, /* OA(R) E*/
-                                  SQLSMALLINT cbTableName, OID reloid) {
-    UNUSED(szTableQualifier, cbTableQualifier, szTableOwner, cbTableOwner,
-           szTableName, cbTableName, reloid);
-    CSTR func = "OPENSEARCHAPI_PrimaryKeys";
-
-    // Initialize Statement
-    StatementClass *stmt = (StatementClass *)hstmt;
-    RETCODE ret = SC_initialize_and_recycle(stmt);
-    if (ret != SQL_SUCCESS)
-        return ret;
-
-    // Initialize QResultClass
-    QResultClass *res = QR_Constructor();
-    if (res == NULL) {
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                     "Couldn't allocate memory for OPENSEARCHAPI_PrimaryKeys result.",
-                     func);
-        return SQL_ERROR;
-    }
-
-    // Link QResultClass to statement and cnnection
-    QR_set_conn(res, SC_get_conn(stmt));
-    SC_set_Result(stmt, res);
-
-    // Set number of fields and declare as catalog result
-    extend_column_bindings(SC_get_ARDF(stmt), NUM_OF_PKS_FIELDS);
-    stmt->catalog_result = TRUE;
-
-    // Setup fields
-    QR_set_num_fields(res, NUM_OF_PKS_FIELDS);
-    QR_set_field_info_v(res, PKS_TABLE_CAT, "TABLE_QUALIFIER",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, PKS_TABLE_SCHEM, "TABLE_OWNER",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, PKS_TABLE_NAME, "TABLE_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, PKS_COLUMN_NAME, "COLUMN_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, PKS_KEY_SQ, "KEY_SEQ", OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, PKS_PK_NAME, "PK_NAME", OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-
-    // Set result to okay and adjust fields if keys exist
-    QR_set_rstatus(res, PORES_FIELDS_OK);
-    res->num_fields = CI_get_num_fields(QR_get_fields(res));
-    if (QR_haskeyset(res))
-        res->num_fields -= res->num_key_fields;
-
-    // Finalize data
-    stmt->currTuple = -1;
-    stmt->status = STMT_FINISHED;
-    SC_set_rowset_start(stmt, -1, FALSE);
-    SC_set_current_col(stmt, -1);
-
-    return ret;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_ForeignKeys(
-    HSTMT hstmt, const SQLCHAR *szPkTableQualifier,                /* OA X*/
-    SQLSMALLINT cbPkTableQualifier, const SQLCHAR *szPkTableOwner, /* OA E*/
-    SQLSMALLINT cbPkTableOwner, const SQLCHAR *szPkTableName,      /* OA(R) E*/
-    SQLSMALLINT cbPkTableName, const SQLCHAR *szFkTableQualifier,  /* OA X*/
-    SQLSMALLINT cbFkTableQualifier, const SQLCHAR *szFkTableOwner, /* OA E*/
-    SQLSMALLINT cbFkTableOwner, const SQLCHAR *szFkTableName,      /* OA(R) E*/
-    SQLSMALLINT cbFkTableName) {
-    UNUSED(szPkTableQualifier, cbPkTableQualifier, szPkTableOwner,
-           cbPkTableOwner, szPkTableName, cbPkTableName, szFkTableQualifier,
-           cbFkTableQualifier, szFkTableOwner, cbFkTableOwner, szFkTableName,
-           cbFkTableName);
-    CSTR func = "OPENSEARCHAPI_ForeignKeys";
-
-    // Initialize Statement
-    StatementClass *stmt = (StatementClass *)hstmt;
-    RETCODE result;
-    if (result = SC_initialize_and_recycle(stmt), SQL_SUCCESS != result)
-        return result;
-
-    // Initialize QResultClass
-    QResultClass *res = QR_Constructor();
-    if (!res) {
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                     "Couldn't allocate memory for OPENSEARCHAPI_ForeignKeys result.",
-                     func);
-        return SQL_ERROR;
-    }
-
-    // Link QResultClass to statement and connection
-    QR_set_conn(res, SC_get_conn(stmt));
-    SC_set_Result(stmt, res);
-
-    // Set number of fields and declare as catalog result
-    extend_column_bindings(SC_get_ARDF(stmt), NUM_OF_FKS_FIELDS);
-    stmt->catalog_result = TRUE;
-
-    // Setup fields
-    QR_set_num_fields(res, NUM_OF_FKS_FIELDS);
-    QR_set_field_info_v(res, FKS_PKTABLE_CAT, "PKTABLE_QUALIFIER",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, FKS_PKTABLE_SCHEM, "PKTABLE_OWNER",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, FKS_PKTABLE_NAME, "PKTABLE_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, FKS_PKCOLUMN_NAME, "PKCOLUMN_NAME",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, FKS_FKTABLE_CAT, "FKTABLE_QUALIFIER",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, FKS_FKTABLE_SCHEM, "FKTABLE_OWNER",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, FKS_FKTABLE_NAME, "FKTABLE_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, FKS_FKCOLUMN_NAME, "FKCOLUMN_NAME",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, FKS_KEY_SEQ, "KEY_SEQ", OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, FKS_UPDATE_RULE, "UPDATE_RULE",
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, FKS_DELETE_RULE, "DELETE_RULE",
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, FKS_FK_NAME, "FK_NAME", OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, FKS_PK_NAME, "PK_NAME", OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, FKS_DEFERRABILITY, "DEFERRABILITY",
-                        OPENSEARCH_TYPE_INT2,
-                        2);
-    QR_set_field_info_v(res, FKS_TRIGGER_NAME, "TRIGGER_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-
-    // Set result to okay and adjust fields if keys exist
-    QR_set_rstatus(res, PORES_FIELDS_OK);
-    res->num_fields = CI_get_num_fields(QR_get_fields(res));
-    if (QR_haskeyset(res))
-        res->num_fields -= res->num_key_fields;
-
-    // Finalize data
-    stmt->status = STMT_FINISHED;
-    stmt->currTuple = -1;
-    SC_set_rowset_start(stmt, -1, FALSE);
-    SC_set_current_col(stmt, -1);
-
-    return SQL_SUCCESS;
-}
-
-#define PRORET_COUNT
-#define DISPLAY_ARGNAME
-
-RETCODE SQL_API OPENSEARCHAPI_ProcedureColumns(
-    HSTMT hstmt, const SQLCHAR *szProcQualifier,             /* OA X*/
-    SQLSMALLINT cbProcQualifier, const SQLCHAR *szProcOwner, /* PV E*/
-    SQLSMALLINT cbProcOwner, const SQLCHAR *szProcName,      /* PV E*/
-    SQLSMALLINT cbProcName, const SQLCHAR *szColumnName,     /* PV X*/
-    SQLSMALLINT cbColumnName, UWORD flag) {
-    UNUSED(szProcQualifier, cbProcQualifier, szProcOwner, cbProcOwner,
-           szProcName, cbProcName, szColumnName, cbColumnName, flag);
-    CSTR func = "OPENSEARCHAPI_ProcedureColumns";
-
-    // Initialize Statement
-    StatementClass *stmt = (StatementClass *)hstmt;
-    RETCODE ret = SC_initialize_and_recycle(stmt);
-    if (ret != SQL_SUCCESS)
-        return ret;
-
-    // Initialize QResultClass
-    QResultClass *res = QR_Constructor();
-    if (res == NULL) {
-        SC_set_error(
-            stmt, STMT_NO_MEMORY_ERROR,
-            "Couldn't allocate memory for OPENSEARCHAPI_ProcedureColumns result.",
-            func);
-        return SQL_ERROR;
-    }
-
-    // Link QResultClass to statement and cnnection
-    QR_set_conn(res, SC_get_conn(stmt));
-    SC_set_Result(stmt, res);
-
-    // Set number of fields and declare as catalog result
-    extend_column_bindings(SC_get_ARDF(stmt), NUM_OF_PROCOLS_FIELDS);
-    stmt->catalog_result = TRUE;
-
-    // Setup fields
-    QR_set_num_fields(res, NUM_OF_PROCOLS_FIELDS);
-    QR_set_field_info_v(res, PROCOLS_PROCEDURE_CAT, "PROCEDURE_CAT",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, PROCOLS_PROCEDURE_SCHEM, "PROCEDUR_SCHEM",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, PROCOLS_PROCEDURE_NAME, "PROCEDURE_NAME",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, PROCOLS_COLUMN_NAME, "COLUMN_NAME",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, PROCOLS_COLUMN_TYPE, "COLUMN_TYPE",
-                        OPENSEARCH_TYPE_INT2,
-                        2);
-    QR_set_field_info_v(res, PROCOLS_DATA_TYPE, "DATA_TYPE",
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, PROCOLS_TYPE_NAME, "TYPE_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, PROCOLS_COLUMN_SIZE, "COLUMN_SIZE",
-                        OPENSEARCH_TYPE_INT4,
-                        4);
-    QR_set_field_info_v(res, PROCOLS_BUFFER_LENGTH, "BUFFER_LENGTH",
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, PROCOLS_DECIMAL_DIGITS, "DECIMAL_DIGITS",
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, PROCOLS_NUM_PREC_RADIX, "NUM_PREC_RADIX",
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, PROCOLS_NULLABLE, "NULLABLE", OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, PROCOLS_REMARKS, "REMARKS",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, PROCOLS_COLUMN_DEF, "COLUMN_DEF",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, PROCOLS_SQL_DATA_TYPE, "SQL_DATA_TYPE",
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, PROCOLS_SQL_DATETIME_SUB, "SQL_DATETIME_SUB",
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, PROCOLS_CHAR_OCTET_LENGTH, "CHAR_OCTET_LENGTH",
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, PROCOLS_ORDINAL_POSITION, "ORDINAL_POSITION",
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, PROCOLS_IS_NULLABLE, "IS_NULLABLE",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-
-    // Set result to okay and adjust fields if keys exist
-    QR_set_rstatus(res, PORES_FIELDS_OK);
-    res->num_fields = CI_get_num_fields(QR_get_fields(res));
-    if (QR_haskeyset(res))
-        res->num_fields -= res->num_key_fields;
-
-    // Finalize data
-    stmt->currTuple = -1;
-    stmt->status = STMT_FINISHED;
-    SC_set_rowset_start(stmt, -1, FALSE);
-    SC_set_current_col(stmt, -1);
-
-    return ret;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_Procedures(HSTMT hstmt,
-                                 const SQLCHAR *szProcQualifier, /* OA X*/
-                                 SQLSMALLINT cbProcQualifier,
-                                 const SQLCHAR *szProcOwner, /* PV E*/
-                                 SQLSMALLINT cbProcOwner,
-                                 const SQLCHAR *szProcName, /* PV E*/
-                                 SQLSMALLINT cbProcName, UWORD flag) {
-    UNUSED(szProcQualifier, cbProcQualifier, szProcOwner, cbProcOwner,
-           szProcName, cbProcName, flag);
-    CSTR func = "OPENSEARCHAPI_Procedures";
-
-    // Initialize Statement
-    StatementClass *stmt = (StatementClass *)hstmt;
-    RETCODE ret = SC_initialize_and_recycle(stmt);
-    if (ret != SQL_SUCCESS)
-        return ret;
-
-    // Initialize QResultClass
-    QResultClass *res = QR_Constructor();
-    if (res == NULL) {
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                     "Couldn't allocate memory for OPENSEARCHAPI_Procedures result.",
-                     func);
-        return SQL_ERROR;
-    }
-
-    // Link QResultClass to statement and cnnection
-    QR_set_conn(res, SC_get_conn(stmt));
-    SC_set_Result(stmt, res);
-
-    // Set number of fields and declare as catalog result
-    extend_column_bindings(SC_get_ARDF(stmt), NUM_OF_PRO_FIELDS);
-    stmt->catalog_result = TRUE;
-
-    // Setup fields
-    QR_set_num_fields(res, NUM_OF_PRO_FIELDS);
-    QR_set_field_info_v(res, PRO_PROCEDURE_CAT, "PRO_PROCEDURE_CAT",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, PRO_PROCEDURE_SCHEM, "PRO_PROCEDURE_SCHEM",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, PRO_PROCEDURE_NAME, "PRO_PROCEDURE_NAME",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, PRO_NUM_INPUT_PARAMS, "PRO_NUM_INPUT_PARAMS",
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, PRO_NUM_OUTPUT_PARAMS, "PRO_NUM_OUTPUT_PARAMS",
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, PRO_RESULT_SETS, "PRO_RESULT_SETS",
-                        OPENSEARCH_TYPE_INT4,
-                        4);
-    QR_set_field_info_v(res, PRO_REMARKS, "PRO_REMARKS",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, PRO_PROCEDURE_TYPE, "PRO_PROCEDURE_TYPE",
-                        OPENSEARCH_TYPE_INT2, 2);
-
-    // Set result to okay and adjust fields if keys exist
-    QR_set_rstatus(res, PORES_FIELDS_OK);
-    res->num_fields = CI_get_num_fields(QR_get_fields(res));
-    if (QR_haskeyset(res))
-        res->num_fields -= res->num_key_fields;
-
-    // Finalize data
-    stmt->currTuple = -1;
-    stmt->status = STMT_FINISHED;
-    SC_set_rowset_start(stmt, -1, FALSE);
-    SC_set_current_col(stmt, -1);
-
-    return ret;
-}
-
-#define ACLMAX 8
-#define ALL_PRIVILIGES "arwdRxt"
-
-RETCODE SQL_API OPENSEARCHAPI_TablePrivileges(HSTMT hstmt,
-                                      const SQLCHAR *szTableQualifier, /* OA X*/
-                                      SQLSMALLINT cbTableQualifier,
-                                      const SQLCHAR *szTableOwner, /* PV E*/
-                                      SQLSMALLINT cbTableOwner,
-                                      const SQLCHAR *szTableName, /* PV E*/
-                                      SQLSMALLINT cbTableName, UWORD flag) {
-    UNUSED(szTableQualifier, cbTableQualifier, szTableOwner, cbTableOwner,
-           szTableName, cbTableName, flag);
-    CSTR func = "OPENSEARCHAPI_TablePrivileges";
-
-    // Initialize Statement
-    StatementClass *stmt = (StatementClass *)hstmt;
-    RETCODE result;
-    if (result = SC_initialize_and_recycle(stmt), SQL_SUCCESS != result)
-        return result;
-
-    // Initialize QResultClass
-    QResultClass *res = QR_Constructor();
-    if (!res) {
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                     "Couldn't allocate memory for OPENSEARCHAPI_Statistics result.",
-                     func);
-        return SQL_ERROR;
-    }
-
-    // Link QResultClass to statement and connection
-    QR_set_conn(res, SC_get_conn(stmt));
-    SC_set_Result(stmt, res);
-
-    // Set number of fields and declare as catalog result
-    extend_column_bindings(SC_get_ARDF(stmt), NUM_OF_TABPRIV_FIELDS);
-    stmt->catalog_result = TRUE;
-
-    // Setup fields
-    QR_set_num_fields(res, NUM_OF_TABPRIV_FIELDS);
-    QR_set_field_info_v(res, TABPRIV_TABLE_CAT, "TABLE_CAT",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, TABPRIV_TABLE_SCHEM, "TABLE_SCHEM",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, TABPRIV_TABLE_NAME, "TABLE_NAME",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, TABPRIV_GRANTOR, "GRANTOR",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, TABPRIV_GRANTEE, "GRANTEE",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, TABPRIV_PRIVILEGE, "PRIVILEGE",
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, TABPRIV_IS_GRANTABLE, "IS_GRANTABLE",
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-
-    // Set result to okay and adjust fields if keys exist
-    QR_set_rstatus(res, PORES_FIELDS_OK);
-    res->num_fields = CI_get_num_fields(QR_get_fields(res));
-    if (QR_haskeyset(res))
-        res->num_fields -= res->num_key_fields;
-
-    // Finalize data
-    stmt->status = STMT_FINISHED;
-    stmt->currTuple = -1;
-    SC_set_rowset_start(stmt, -1, FALSE);
-    SC_set_current_col(stmt, -1);
-
-    return SQL_SUCCESS;
-}
diff --git a/sql-odbc/src/sqlodbc/loadlib.c b/sql-odbc/src/sqlodbc/loadlib.c
deleted file mode 100644
index 78015e63fa..0000000000
--- a/sql-odbc/src/sqlodbc/loadlib.c
+++ /dev/null
@@ -1,258 +0,0 @@
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#ifndef WIN32
-#include <errno.h>
-#endif /* WIN32 */
-
-#include "opensearch_enlist.h"
-#include "loadlib.h"
-#include "misc.h"
-
-#ifdef WIN32
-#ifdef _MSC_VER
-#pragma comment(lib, "Delayimp")
-#ifdef _HANDLE_ENLIST_IN_DTC_
-#ifdef UNICODE_SUPPORT
-#pragma comment(lib, "opensearch_enlist")
-#else
-#pragma comment(lib, "opensearch_enlista")
-#endif /* UNICODE_SUPPORT */
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
-// The followings works under VC++6.0 but doesn't work under VC++7.0.
-// Please add the equivalent linker options using command line etc.
-#if (_MSC_VER == 1200) && defined(DYNAMIC_LOAD)  // VC6.0
-#ifdef UNICODE_SUPPORT
-#pragma comment(linker, "/Delayload:opensearch_enlist.dll")
-#else
-#pragma comment(linker, "/Delayload:opensearch_enlista.dll")
-#endif /* UNICODE_SUPPORT */
-#pragma comment(linker, "/Delay:UNLOAD")
-#endif /* _MSC_VER */
-#endif /* _MSC_VER */
-
-#if defined(DYNAMIC_LOAD)
-#define WIN_DYN_LOAD
-#ifdef UNICODE_SUPPORT
-CSTR opensearch_enlist = "opensearch_enlist";
-CSTR opensearch_enlistdll = "opensearch_enlist.dll";
-CSTR elasticodbc = "sqlodbc35w";
-CSTR elasticodbcdll = "sqlodbc35w.dll";
-#else
-CSTR opensearch_enlist = "opensearch_enlista";
-CSTR opensearch_enlistdll = "opensearch_enlista.dll";
-CSTR elasticodbc = "sqlodbc30a";
-CSTR elasticodbcdll = "sqlodbc30a.dll";
-#endif /* UNICODE_SUPPORT */
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#define _MSC_DELAY_LOAD_IMPORT
-#endif /* MSC_VER */
-#endif /* DYNAMIC_LOAD */
-#endif /* WIN32 */
-
-#if defined(_MSC_DELAY_LOAD_IMPORT)
-/*
- *	Error hook function for delay load import.
- *	Try to load a DLL based on elasticodbc path.
- */
-#if (_MSC_VER >= 1900) /* vc14 or later */
-#define TRY_DLI_HOOK __try {
-#define RELEASE_NOTIFY_HOOK
-#elif (_MSC_VER < 1300) /* vc6 */
-extern PfnDliHook __pfnDliFailureHook;
-extern PfnDliHook __pfnDliNotifyHook;
-#define TRY_DLI_HOOK                        \
-    __try {                                 \
-        __pfnDliFailureHook = DliErrorHook; \
-        __pfnDliNotifyHook = DliErrorHook;
-#define RELEASE_NOTIFY_HOOK __pfnDliNotifyHook = NULL;
-#else /* vc7 ~ 12 */
-extern PfnDliHook __pfnDliFailureHook2;
-extern PfnDliHook __pfnDliNotifyHook2;
-#define TRY_DLI_HOOK                         \
-    __try {                                  \
-        __pfnDliFailureHook2 = DliErrorHook; \
-        __pfnDliNotifyHook2 = DliErrorHook;
-#define RELEASE_NOTIFY_HOOK __pfnDliNotifyHook2 = NULL;
-#endif /* _MSC_VER */
-#else
-#define TRY_DLI_HOOK __try {
-#define RELEASE_NOTIFY_HOOK
-#endif /* _MSC_DELAY_LOAD_IMPORT */
-
-#if defined(_MSC_DELAY_LOAD_IMPORT)
-static BOOL loaded_opensearch_enlist = FALSE;
-static HMODULE enlist_module = NULL;
-static BOOL loaded_elasticodbc = FALSE;
-/*
- *	Load a DLL based on elasticodbc path.
- */
-HMODULE MODULE_load_from_elasticodbc_path(const char *module_name) {
-    extern HINSTANCE s_hModule;
-    HMODULE hmodule = NULL;
-    char szFileName[MAX_PATH];
-
-    if (GetModuleFileName(s_hModule, szFileName, sizeof(szFileName)) > 0) {
-        char drive[_MAX_DRIVE], dir[_MAX_DIR], sysdir[MAX_PATH];
-
-        _splitpath(szFileName, drive, dir, NULL, NULL);
-        GetSystemDirectory(sysdir, MAX_PATH);
-        SPRINTF_FIXED(szFileName, "%s%s%s.dll", drive, dir, module_name);
-        if (_strnicmp(szFileName, sysdir, strlen(sysdir)) != 0) {
-            hmodule =
-                LoadLibraryEx(szFileName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-            MYLOG(OPENSEARCH_DEBUG, "elasticodbc path based %s loaded module=%p\n",
-                  module_name, hmodule);
-        }
-    }
-    return hmodule;
-}
-
-static FARPROC WINAPI DliErrorHook(unsigned dliNotify, PDelayLoadInfo pdli) {
-    HMODULE hmodule = NULL;
-    const char *call_module = NULL;
-
-    MYLOG(OPENSEARCH_DEBUG, "Dli%sHook %s Notify=%d\n",
-          (dliFailLoadLib == dliNotify || dliFailGetProc == dliNotify)
-              ? "Error"
-              : "Notify",
-          NULL != pdli->szDll ? pdli->szDll : pdli->dlp.szProcName, dliNotify);
-    switch (dliNotify) {
-        case dliNotePreLoadLibrary:
-        case dliFailLoadLib:
-            RELEASE_NOTIFY_HOOK
-            if (_strnicmp(pdli->szDll, elasticodbc, strlen(elasticodbc)) == 0)
-                call_module = elasticodbc;
-            if (call_module) {
-                if (hmodule = MODULE_load_from_elasticodbc_path(call_module),
-                    NULL == hmodule)
-                    hmodule = LoadLibrary(call_module);
-                if (NULL != hmodule) {
-                    if (opensearch_enlist == call_module)
-                        loaded_opensearch_enlist = TRUE;
-                    else if (elasticodbc == call_module)
-                        loaded_elasticodbc = TRUE;
-                }
-            }
-            break;
-    }
-    return (FARPROC)hmodule;
-}
-
-void AlreadyLoadedOpenSearchodbc(void) {
-    loaded_elasticodbc = TRUE;
-}
-
-/*
- *	unload delay loaded libraries.
- */
-
-typedef BOOL(WINAPI *UnloadFunc)(LPCSTR);
-void CleanupDelayLoadedDLLs(void) {
-    BOOL success;
-#if (_MSC_VER < 1300) /* VC6 DELAYLOAD IMPORT */
-    UnloadFunc func = __FUnloadDelayLoadedDLL;
-#else
-    UnloadFunc func = __FUnloadDelayLoadedDLL2;
-#endif
-    /* The dll names are case sensitive for the unload helper */
-    if (loaded_opensearch_enlist) {
-        if (enlist_module != NULL) {
-            MYLOG(OPENSEARCH_DEBUG, "Freeing Library %s\n", opensearch_enlistdll);
-            FreeLibrary(enlist_module);
-        }
-        MYLOG(OPENSEARCH_DEBUG, "%s unloading\n", opensearch_enlistdll);
-        success = (*func)(opensearch_enlistdll);
-        MYLOG(OPENSEARCH_DEBUG, "%s unloaded success=%d\n", opensearch_enlistdll, success);
-        loaded_opensearch_enlist = FALSE;
-    }
-    if (loaded_elasticodbc) {
-        MYLOG(OPENSEARCH_DEBUG, "%s unloading\n", elasticodbcdll);
-        success = (*func)(elasticodbcdll);
-        MYLOG(OPENSEARCH_DEBUG, "%s unloaded success=%d\n", elasticodbcdll, success);
-        loaded_elasticodbc = FALSE;
-    }
-    return;
-}
-#else
-void CleanupDelayLoadedDLLs(void) {
-    return;
-}
-#endif /* _MSC_DELAY_LOAD_IMPORT */
-
-#ifdef _HANDLE_ENLIST_IN_DTC_
-RETCODE CALL_EnlistInDtc(ConnectionClass *conn, void *pTra, int method) {
-    RETCODE ret;
-    BOOL loaded = TRUE;
-
-#if defined(_MSC_DELAY_LOAD_IMPORT)
-    if (!loaded_opensearch_enlist) {
-        TRY_DLI_HOOK
-        ret = EnlistInDtc(conn, pTra, method);
-    }
-    __except ((GetExceptionCode() & 0xffff) == ERROR_MOD_NOT_FOUND
-                  ? EXCEPTION_EXECUTE_HANDLER
-                  : EXCEPTION_CONTINUE_SEARCH) {
-        if (enlist_module = MODULE_load_from_elasticodbc_path(opensearch_enlist),
-            NULL == enlist_module)
-            loaded = FALSE;
-        else
-            ret = EnlistInDtc(conn, pTra, method);
-    }
-    if (loaded)
-        loaded_opensearch_enlist = TRUE;
-    RELEASE_NOTIFY_HOOK
-}
-else ret = EnlistInDtc(conn, pTra, method);
-#else
-    ret = EnlistInDtc(conn, pTra, method);
-    loaded_opensearch_enlist = TRUE;
-#endif /* _MSC_DELAY_LOAD_IMPORT */
-return ret;
-}
-RETCODE CALL_DtcOnDisconnect(ConnectionClass *conn) {
-    if (loaded_opensearch_enlist)
-        return DtcOnDisconnect(conn);
-    return FALSE;
-}
-RETCODE CALL_IsolateDtcConn(ConnectionClass *conn, BOOL continueConnection) {
-    if (loaded_opensearch_enlist)
-        return IsolateDtcConn(conn, continueConnection);
-    return FALSE;
-}
-
-void *CALL_GetTransactionObject(HRESULT *hres) {
-    void *ret = NULL;
-    BOOL loaded = TRUE;
-
-#if defined(_MSC_DELAY_LOAD_IMPORT)
-    if (!loaded_opensearch_enlist) {
-        TRY_DLI_HOOK
-        ret = GetTransactionObject(hres);
-    }
-    __except ((GetExceptionCode() & 0xffff) == ERROR_MOD_NOT_FOUND
-                  ? EXCEPTION_EXECUTE_HANDLER
-                  : EXCEPTION_CONTINUE_SEARCH) {
-        if (enlist_module = MODULE_load_from_elasticodbc_path(opensearch_enlist),
-            NULL == enlist_module)
-            loaded = FALSE;
-        else
-            ret = GetTransactionObject(hres);
-    }
-    if (loaded)
-        loaded_opensearch_enlist = TRUE;
-    RELEASE_NOTIFY_HOOK
-}
-else ret = GetTransactionObject(hres);
-#else
-    ret = GetTransactionObject(hres);
-    loaded_opensearch_enlist = TRUE;
-#endif /* _MSC_DELAY_LOAD_IMPORT */
-return ret;
-}
-void CALL_ReleaseTransactionObject(void *pObj) {
-    if (loaded_opensearch_enlist)
-        ReleaseTransactionObject(pObj);
-    return;
-}
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
diff --git a/sql-odbc/src/sqlodbc/loadlib.h b/sql-odbc/src/sqlodbc/loadlib.h
deleted file mode 100644
index 16a6c03937..0000000000
--- a/sql-odbc/src/sqlodbc/loadlib.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef __LOADLIB_H__
-#define __LOADLIB_H__
-
-#include "opensearch_odbc.h"
-#ifdef HAVE_LIBLTDL
-#include <ltdl.h>
-#else
-#ifdef HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif /* HAVE_DLFCN_H */
-#endif /* HAVE_LIBLTDL */
-
-#include <stdlib.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef _HANDLE_ENLIST_IN_DTC_
-RETCODE CALL_EnlistInDtc(ConnectionClass *conn, void *pTra, int method);
-RETCODE CALL_DtcOnDisconnect(ConnectionClass *);
-RETCODE CALL_IsolateDtcConn(ConnectionClass *, BOOL);
-void *CALL_GetTransactionObject(HRESULT *);
-void CALL_ReleaseTransactionObject(void *);
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
-/* void	UnloadDelayLoadedDLLs(BOOL); */
-void CleanupDelayLoadedDLLs(void);
-#ifdef WIN32
-HMODULE MODULE_load_from_elasticodbc_path(const char *module_name);
-void AlreadyLoadedOpenSearchodbc(void);
-#endif /* WIN32 */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __LOADLIB_H__ */
diff --git a/sql-odbc/src/sqlodbc/misc.c b/sql-odbc/src/sqlodbc/misc.c
deleted file mode 100644
index 867c7744fe..0000000000
--- a/sql-odbc/src/sqlodbc/misc.c
+++ /dev/null
@@ -1,201 +0,0 @@
-// clang-format off
-#include "opensearch_odbc.h"
-#include "misc.h"
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
-#include <time.h>
-// clang-format on
-
-#ifndef WIN32
-#include <pwd.h>
-#include <sys/types.h>
-#include <unistd.h>
-#else
-#include <process.h> /* Byron: is this where Windows keeps def.
-								 * of getpid ? */
-#endif
-
-/*
- *	returns STRCPY_FAIL, STRCPY_TRUNCATED, or #bytes copied
- *	(not including null term)
- */
-ssize_t my_strcpy(char *dst, ssize_t dst_len, const char *src,
-                  ssize_t src_len) {
-    if (dst_len <= 0)
-        return STRCPY_FAIL;
-
-    if (src_len == SQL_NULL_DATA) {
-        dst[0] = '\0';
-        return STRCPY_NULL;
-    } else if (src_len == SQL_NTS)
-        src_len = strlen(src);
-
-    if (src_len <= 0)
-        return STRCPY_FAIL;
-    else {
-        if (src_len < dst_len) {
-            memcpy(dst, src, src_len);
-            dst[src_len] = '\0';
-        } else {
-            memcpy(dst, src, dst_len - 1);
-            dst[dst_len - 1] = '\0'; /* truncated */
-            return STRCPY_TRUNCATED;
-        }
-    }
-
-    return strlen(dst);
-}
-
-/*
- * strncpy copies up to len characters, and doesn't terminate
- * the destination string if src has len characters or more.
- * instead, I want it to copy up to len-1 characters and always
- * terminate the destination string.
- */
-size_t strncpy_null(char *dst, const char *src, ssize_t len) {
-    int i;
-
-    if (NULL != dst && len > 0) {
-        for (i = 0; src[i] && i < len - 1; i++)
-            dst[i] = src[i];
-
-        dst[i] = '\0';
-    } else
-        return 0;
-    if (src[i])
-        return strlen(src);
-    return i;
-}
-
-/*------
- *	Create a null terminated string (handling the SQL_NTS thing):
- *		1. If buf is supplied, place the string in there
- *		   (assumes enough space) and return buf.
- *		2. If buf is not supplied, malloc space and return this string
- *------
- */
-char *make_string(const SQLCHAR *s, SQLINTEGER len, char *buf, size_t bufsize) {
-    size_t length;
-    char *str;
-
-    if (!s || SQL_NULL_DATA == len)
-        return NULL;
-    if (len >= 0)
-        length = len;
-    else if (SQL_NTS == len)
-        length = strlen((char *)s);
-    else {
-        MYLOG(OPENSEARCH_DEBUG, "invalid length=" FORMAT_INTEGER "\n", len);
-        return NULL;
-    }
-    if (buf) {
-        strncpy_null(buf, (char *)s, bufsize > length ? length + 1 : bufsize);
-        return buf;
-    }
-
-    MYLOG(OPENSEARCH_DEBUG, "malloc size=" FORMAT_SIZE_T "\n", length);
-    str = malloc(length + 1);
-    MYLOG(OPENSEARCH_DEBUG, "str=%p\n", str);
-    if (!str)
-        return NULL;
-
-    strncpy_null(str, (char *)s, length + 1);
-    return str;
-}
-
-/*
- * snprintfcat is a extension to snprintf
- * It add format to buf at given pos
- */
-#ifdef POSIX_SNPRINTF_REQUIRED
-static posix_vsnprintf(char *str, size_t size, const char *format, va_list ap);
-#define vsnprintf posix_vsnprintf
-#endif /* POSIX_SNPRINTF_REQUIRED */
-
-int snprintfcat(char *buf, size_t size, const char *format, ...) {
-    int len;
-    size_t pos = strlen(buf);
-    va_list arglist;
-
-    va_start(arglist, format);
-    len = vsnprintf(buf + pos, size - pos, format, arglist);
-    va_end(arglist);
-    return len + (int)pos;
-}
-
-/*
- * Windows doesn't have snprintf(). It has _snprintf() which is similar,
- * but it behaves differently wrt. truncation. This is a compatibility
- * function that uses _snprintf() to provide POSIX snprintf() behavior.
- *
- * Our strategy, if the output doesn't fit, is to create a temporary buffer
- * and call _snprintf() on that. If it still doesn't fit, enlarge the buffer
- * and repeat.
- */
-#ifdef POSIX_SNPRINTF_REQUIRED
-static int posix_vsnprintf(char *str, size_t size, const char *format,
-                           va_list ap) {
-    int len;
-    char *tmp;
-    size_t newsize;
-
-    len = _vsnprintf(str, size, format, ap);
-    if (len < 0) {
-        if (size == 0)
-            newsize = 100;
-        else
-            newsize = size;
-        do {
-            newsize *= 2;
-            tmp = malloc(newsize);
-            if (!tmp)
-                return -1;
-            len = _vsnprintf(tmp, newsize, format, ap);
-            if (len >= 0)
-                memcpy(str, tmp, size);
-            free(tmp);
-        } while (len < 0);
-    }
-    if (len >= size && size > 0) {
-        /* Ensure the buffer is NULL-terminated */
-        str[size - 1] = '\0';
-    }
-    return len;
-}
-
-int posix_snprintf(char *buf, size_t size, const char *format, ...) {
-    int len;
-    va_list arglist;
-
-    va_start(arglist, format);
-    len = posix_vsnprintf(buf, size, format, arglist);
-    va_end(arglist);
-    return len;
-}
-#endif /* POSIX_SNPRINTF_REQUIRED */
-
-#ifndef HAVE_STRLCAT
-size_t strlcat(char *dst, const char *src, size_t size) {
-    size_t ttllen;
-    char *pd = dst;
-    const char *ps = src;
-
-    for (ttllen = 0; ttllen < size; ttllen++, pd++) {
-        if (0 == *pd)
-            break;
-    }
-    if (ttllen >= size - 1)
-        return ttllen + strlen(src);
-    for (; ttllen < size - 1; ttllen++, pd++, ps++) {
-        if (0 == (*pd = *ps))
-            return ttllen;
-    }
-    *pd = 0;
-    for (; *ps; ttllen++, ps++)
-        ;
-    return ttllen;
-}
-#endif /* HAVE_STRLCAT */
diff --git a/sql-odbc/src/sqlodbc/misc.h b/sql-odbc/src/sqlodbc/misc.h
deleted file mode 100644
index f589cbcb98..0000000000
--- a/sql-odbc/src/sqlodbc/misc.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef __MISC_H__
-#define __MISC_H__
-
-#include <stdio.h>
-#ifndef WIN32
-#include <unistd.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-size_t strncpy_null(char *dst, const char *src, ssize_t len);
-#ifndef HAVE_STRLCAT
-size_t strlcat(char *, const char *, size_t);
-#endif /* HAVE_STRLCAT */
-int snprintfcat(char *buf, size_t size, const char *format, ...)
-    __attribute__((format(OPENSEARCH_PRINTF_ATTRIBUTE, 3, 4)));
-
-char *make_string(const SQLCHAR *s, SQLINTEGER len, char *buf, size_t bufsize);
-/* #define	GET_SCHEMA_NAME(nspname) 	(stricmp(nspname, "public") ? nspname :
- * "") */
-
-#define GET_SCHEMA_NAME(nspname) (nspname)
-
-/* defines for return value of my_strcpy */
-#define STRCPY_SUCCESS 1
-#define STRCPY_FAIL 0
-#define STRCPY_TRUNCATED (-1)
-#define STRCPY_NULL (-2)
-
-ssize_t my_strcpy(char *dst, ssize_t dst_len, const char *src, ssize_t src_len);
-
-/*
- *	Macros to safely strcpy, strcat or sprintf to fixed arrays.
- *
- */
-
-/*
- *	With GCC, the macro CHECK_NOT_CHAR_P() causes a compilation error
- *		when the target is pointer not a fixed array.
- */
-#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
-#define FUNCTION_BEGIN_MACRO ({
-#define FUNCTION_END_MACRO \
-    ;                      \
-    })
-#define CHECK_NOT_CHAR_P(t)                                              \
-    _Pragma("GCC diagnostic push")                                       \
-        _Pragma("GCC diagnostic ignored \"-Wunused-variable\"") if (0) { \
-        typeof(t) dummy_for_check = {};                                  \
-    }                                                                    \
-    _Pragma("GCC diagnostic pop")
-#else
-#define FUNCTION_BEGIN_MACRO
-#define FUNCTION_END_MACRO
-#define CHECK_NOT_CHAR_P(t)
-#endif
-
-/* macro to safely strcpy() to fixed arrays. */
-#define STRCPY_FIXED(to, from) \
-    FUNCTION_BEGIN_MACRO       \
-    CHECK_NOT_CHAR_P(to)       \
-    strncpy_null((to), (from), sizeof(to)) FUNCTION_END_MACRO
-
-/* macro to safely strcat() to fixed arrays. */
-#define STRCAT_FIXED(to, from) \
-    FUNCTION_BEGIN_MACRO       \
-    CHECK_NOT_CHAR_P(to)       \
-    strlcat((to), (from), sizeof(to)) FUNCTION_END_MACRO
-
-/* macro to safely sprintf() to fixed arrays. */
-#define SPRINTF_FIXED(to, ...) \
-    FUNCTION_BEGIN_MACRO       \
-    CHECK_NOT_CHAR_P(to)       \
-    snprintf((to), sizeof(to), __VA_ARGS__) FUNCTION_END_MACRO
-
-/* macro to safely sprintf() & cat to fixed arrays. */
-#define SPRINTFCAT_FIXED(to, ...) \
-    FUNCTION_BEGIN_MACRO          \
-    CHECK_NOT_CHAR_P(to)          \
-    snprintfcat((to), sizeof(to), __VA_ARGS__) FUNCTION_END_MACRO
-
-#define ITOA_FIXED(to, from) \
-    FUNCTION_BEGIN_MACRO     \
-    CHECK_NOT_CHAR_P(to)     \
-    snprintf((to), sizeof(to), "%d", from) FUNCTION_END_MACRO
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MISC_H__ */
diff --git a/sql-odbc/src/sqlodbc/multibyte.c b/sql-odbc/src/sqlodbc/multibyte.c
deleted file mode 100644
index 4c5fb0d465..0000000000
--- a/sql-odbc/src/sqlodbc/multibyte.c
+++ /dev/null
@@ -1,357 +0,0 @@
-#include "multibyte.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "misc.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#ifndef WIN32
-#include <locale.h>
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-typedef struct OPENSEARCH_CS {
-    char *name;
-    int code;
-} OPENSEARCH_CS;
-
-static OPENSEARCH_CS CS_Table[] = {
-    {"SQL_ASCII", SQL_ASCII},
-    {"EUC_JP", EUC_JP},
-    {"EUC_CN", EUC_CN},
-    {"EUC_KR", EUC_KR},
-    {"EUC_TW", EUC_TW},
-    {"JOHAB", JOHAB}, /* since 7.3 */
-    {"UTF8", UTF8},   /* since 7.2 */
-    {"MULE_INTERNAL", MULE_INTERNAL},
-    {"LATIN1", LATIN1},
-    {"LATIN2", LATIN2},
-    {"LATIN3", LATIN3},
-    {"LATIN4", LATIN4},
-    {"LATIN5", LATIN5},
-    {"LATIN6", LATIN6},
-    {"LATIN7", LATIN7},
-    {"LATIN8", LATIN8},
-    {"LATIN9", LATIN9},
-    {"LATIN10", LATIN10},
-    {"WIN1256", WIN1256}, /* Arabic since 7.3 */
-    {"WIN1258", WIN1258}, /* Vietnamese since 8.1 */
-    {"WIN866", WIN866},   /* since 8.1 */
-    {"WIN874", WIN874},   /* Thai since 7.3 */
-    {"KOI8", KOI8R},
-    {"WIN1251", WIN1251}, /* Cyrillic */
-    {"WIN1252", WIN1252}, /* Western Europe since 8.1 */
-    {"ISO_8859_5", ISO_8859_5},
-    {"ISO_8859_6", ISO_8859_6},
-    {"ISO_8859_7", ISO_8859_7},
-    {"ISO_8859_8", ISO_8859_8},
-    {"WIN1250", WIN1250}, /* Central Europe */
-    {"WIN1253", WIN1253}, /* Greek since 8.2 */
-    {"WIN1254", WIN1254}, /* Turkish since 8.2 */
-    {"WIN1255", WIN1255}, /* Hebrew since 8.2 */
-    {"WIN1257", WIN1257}, /* Baltic(North Europe) since 8.2 */
-
-    {"EUC_JIS_2004",
-     EUC_JIS_2004}, /* EUC for SHIFT-JIS-2004 Japanese, since 8.3 */
-    {"SJIS", SJIS},
-    {"BIG5", BIG5},
-    {"GBK", GBK},                       /* since 7.3 */
-    {"UHC", UHC},                       /* since 7.3 */
-    {"GB18030", GB18030},               /* since 7.3 */
-    {"SHIFT_JIS_2004", SHIFT_JIS_2004}, /* SHIFT-JIS-2004 Japanese, standard JIS
-                                           X 0213, since 8.3 */
-    {"OTHER", OTHER}};
-
-static OPENSEARCH_CS CS_Alias[] = {{"UNICODE", UTF8}, {"TCVN", WIN1258},
-                           {"ALT", WIN866},   {"WIN", WIN1251},
-                           {"KOI8R", KOI8R},  {"OTHER", OTHER}};
-
-int opensearch_CS_code(const char *characterset_string) {
-    int i, c = -1;
-
-    for (i = 0; CS_Table[i].code != OTHER; i++) {
-        if (0 == stricmp(characterset_string, CS_Table[i].name)) {
-            c = CS_Table[i].code;
-            break;
-        }
-    }
-    if (c < 0) {
-        for (i = 0; CS_Alias[i].code != OTHER; i++) {
-            if (0 == stricmp(characterset_string, CS_Alias[i].name)) {
-                c = CS_Alias[i].code;
-                break;
-            }
-        }
-    }
-    if (c < 0)
-        c = OTHER;
-    return (c);
-}
-
-int opensearch_mb_maxlen(int characterset_code) {
-    switch (characterset_code) {
-        case UTF8:
-            return 4;
-        case EUC_TW:
-            return 4;
-        case EUC_JIS_2004:
-        case EUC_JP:
-        case GB18030:
-            return 3;
-        case SHIFT_JIS_2004:
-        case SJIS:
-        case BIG5:
-        case GBK:
-        case UHC:
-        case EUC_CN:
-        case EUC_KR:
-        case JOHAB:
-            return 2;
-        default:
-            return 1;
-    }
-}
-
-static int opensearch_CS_stat(int stat, unsigned int character, int characterset_code) {
-    if (character == 0)
-        stat = 0;
-    switch (characterset_code) {
-        case UTF8: {
-            if (stat < 2 && character >= 0x80) {
-                if (character >= 0xfc)
-                    stat = 6;
-                else if (character >= 0xf8)
-                    stat = 5;
-                else if (character >= 0xf0)
-                    stat = 4;
-                else if (character >= 0xe0)
-                    stat = 3;
-                else if (character >= 0xc0)
-                    stat = 2;
-            } else if (stat >= 2 && character > 0x7f)
-                stat--;
-            else
-                stat = 0;
-        } break;
-            /* SHIFT_JIS_2004 Support. */
-        case SHIFT_JIS_2004: {
-            if (stat < 2 && character >= 0x81 && character <= 0x9f)
-                stat = 2;
-            else if (stat < 2 && character >= 0xe0 && character <= 0xef)
-                stat = 2;
-            else if (stat < 2 && character >= 0xf0 && character <= 0xfc)
-                stat = 2;
-            else if (stat == 2)
-                stat = 1;
-            else
-                stat = 0;
-        } break;
-            /* Shift-JIS Support. */
-        case SJIS: {
-            if (stat < 2 && character > 0x80
-                && !(character > 0x9f && character < 0xe0))
-                stat = 2;
-            else if (stat == 2)
-                stat = 1;
-            else
-                stat = 0;
-        } break;
-            /* Chinese Big5 Support. */
-        case BIG5: {
-            if (stat < 2 && character > 0xA0)
-                stat = 2;
-            else if (stat == 2)
-                stat = 1;
-            else
-                stat = 0;
-        } break;
-            /* Chinese GBK Support. */
-        case GBK: {
-            if (stat < 2 && character > 0x7F)
-                stat = 2;
-            else if (stat == 2)
-                stat = 1;
-            else
-                stat = 0;
-        } break;
-
-            /* Korian UHC Support. */
-        case UHC: {
-            if (stat < 2 && character > 0x7F)
-                stat = 2;
-            else if (stat == 2)
-                stat = 1;
-            else
-                stat = 0;
-        } break;
-
-        case EUC_JIS_2004:
-            /* 0x8f is JIS X 0212 + JIS X 0213(2) 3 byte */
-            /* 0x8e is JIS X 0201 2 byte */
-            /* 0xa0-0xff is JIS X 0213(1) 2 byte */
-        case EUC_JP:
-            /* 0x8f is JIS X 0212 3 byte */
-            /* 0x8e is JIS X 0201 2 byte */
-            /* 0xa0-0xff is JIS X 0208 2 byte */
-            {
-                if (stat < 3 && character == 0x8f) /* JIS X 0212 */
-                    stat = 3;
-                else if (stat != 2
-                         && (character == 0x8e
-                             || character > 0xa0)) /* Half Katakana HighByte &
-                                                      Kanji HighByte */
-                    stat = 2;
-                else if (stat == 2)
-                    stat = 1;
-                else
-                    stat = 0;
-            }
-            break;
-
-            /* EUC_CN, EUC_KR, JOHAB Support */
-        case EUC_CN:
-        case EUC_KR:
-        case JOHAB: {
-            if (stat < 2 && character > 0xa0)
-                stat = 2;
-            else if (stat == 2)
-                stat = 1;
-            else
-                stat = 0;
-        } break;
-        case EUC_TW: {
-            if (stat < 4 && character == 0x8e)
-                stat = 4;
-            else if (stat == 4 && character > 0xa0)
-                stat = 3;
-            else if ((stat == 3 || stat < 2) && character > 0xa0)
-                stat = 2;
-            else if (stat == 2)
-                stat = 1;
-            else
-                stat = 0;
-        } break;
-            /*Chinese GB18030 support.Added by Bill Huang <bhuang@redhat.com>
-             * <bill_huanghb@ybb.ne.jp>*/
-        case GB18030: {
-            if (stat < 2 && character > 0x80)
-                stat = 2;
-            else if (stat == 2) {
-                if (character >= 0x30 && character <= 0x39)
-                    stat = 3;
-                else
-                    stat = 1;
-            } else if (stat == 3) {
-                if (character >= 0x30 && character <= 0x39)
-                    stat = 1;
-                else
-                    stat = 3;
-            } else
-                stat = 0;
-        } break;
-        default: {
-            stat = 0;
-        } break;
-    }
-    return stat;
-}
-
-/*
- *	This function is used to know the encoding corresponding to
- *	the current locale.
- */
-const char *derive_locale_encoding(const char *dbencoding) {
-    UNUSED(dbencoding);
-    const char *wenc = NULL;
-#ifdef WIN32
-    int acp;
-#endif /* WIN32 */
-
-    if (wenc = getenv("ESCLIENTENCODING"),
-        NULL != wenc) /* environmnt variable */
-        return wenc;
-#ifdef WIN32
-    acp = GetACP();
-    if (acp >= 1251 && acp <= 1258) {
-        if (stricmp(dbencoding, "SQL_ASCII") == 0)
-            return wenc;
-    }
-    switch (acp) {
-        case 932:
-            wenc = "SJIS";
-            break;
-        case 936:
-            wenc = "GBK";
-            break;
-        case 949:
-            wenc = "UHC";
-            break;
-        case 950:
-            wenc = "BIG5";
-            break;
-        case 1250:
-            wenc = "WIN1250";
-            break;
-        case 1251:
-            wenc = "WIN1251";
-            break;
-        case 1256:
-            wenc = "WIN1256";
-            break;
-        case 1252:
-            if (strnicmp(dbencoding, "LATIN", 5) == 0)
-                break;
-            wenc = "WIN1252";
-            break;
-        case 1258:
-            wenc = "WIN1258";
-            break;
-        case 1253:
-            wenc = "WIN1253";
-            break;
-        case 1254:
-            wenc = "WIN1254";
-            break;
-        case 1255:
-            wenc = "WIN1255";
-            break;
-        case 1257:
-            wenc = "WIN1257";
-            break;
-    }
-#else
-        // TODO #34 - Investigate locale handling on Mac 
-#endif /* WIN32 */
-    return wenc;
-}
-
-void encoded_str_constr(encoded_str *encstr, int ccsc, const char *str) {
-    encstr->ccsc = ccsc;
-    encstr->encstr = (const UCHAR *)str;
-    encstr->pos = -1;
-    encstr->ccst = 0;
-}
-int encoded_nextchar(encoded_str *encstr) {
-    int chr;
-
-    if (encstr->pos >= 0 && !encstr->encstr[encstr->pos])
-        return 0;
-    chr = encstr->encstr[++encstr->pos];
-    encstr->ccst =
-        opensearch_CS_stat(encstr->ccst, (unsigned int)chr, encstr->ccsc);
-    return chr;
-}
-
-int encoded_byte_check(encoded_str *encstr, size_t abspos) {
-    int chr;
-
-    chr = encstr->encstr[encstr->pos = abspos];
-    encstr->ccst =
-        opensearch_CS_stat(encstr->ccst, (unsigned int)chr, encstr->ccsc);
-    return chr;
-}
diff --git a/sql-odbc/src/sqlodbc/multibyte.h b/sql-odbc/src/sqlodbc/multibyte.h
deleted file mode 100644
index 26bfb6f061..0000000000
--- a/sql-odbc/src/sqlodbc/multibyte.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef __MULTIBUYTE_H__
-#define __MULTIBUYTE_H__
-
-/*
- *
- * Multibyte library header
- *
- */
-#include "opensearch_odbc.h"
-#include "qresult.h"
-
-/* Elastic client encoding */
-enum {
-    SQL_ASCII = 0 /* SQL/ASCII */
-    ,
-    EUC_JP /* EUC for Japanese */
-    ,
-    EUC_CN /* EUC for Chinese */
-    ,
-    EUC_KR /* EUC for Korean */
-    ,
-    EUC_TW /* EUC for Taiwan */
-    ,
-    JOHAB,
-    UTF8 /* Unicode UTF-8 */
-    ,
-    MULE_INTERNAL /* Mule internal code */
-    ,
-    LATIN1 /* ISO-8859 Latin 1 */
-    ,
-    LATIN2 /* ISO-8859 Latin 2 */
-    ,
-    LATIN3 /* ISO-8859 Latin 3 */
-    ,
-    LATIN4 /* ISO-8859 Latin 4 */
-    ,
-    LATIN5 /* ISO-8859 Latin 5 */
-    ,
-    LATIN6 /* ISO-8859 Latin 6 */
-    ,
-    LATIN7 /* ISO-8859 Latin 7 */
-    ,
-    LATIN8 /* ISO-8859 Latin 8 */
-    ,
-    LATIN9 /* ISO-8859 Latin 9 */
-    ,
-    LATIN10 /* ISO-8859 Latin 10 */
-    ,
-    WIN1256 /* Arabic Windows */
-    ,
-    WIN1258 /* Vietnamese Windows */
-    ,
-    WIN866 /* Alternativny Variant (MS-DOS CP866) */
-    ,
-    WIN874 /* Thai Windows */
-    ,
-    KOI8R /* KOI8-R/U */
-    ,
-    WIN1251 /* Cyrillic Windows */
-    ,
-    WIN1252 /* Western Europe Windows */
-    ,
-    ISO_8859_5 /* ISO-8859-5 */
-    ,
-    ISO_8859_6 /* ISO-8859-6 */
-    ,
-    ISO_8859_7 /* ISO-8859-7 */
-    ,
-    ISO_8859_8 /* ISO-8859-8 */
-    ,
-    WIN1250 /* Central Europe Windows */
-    ,
-    WIN1253 /* Greek Windows */
-    ,
-    WIN1254 /* Turkish Windows */
-    ,
-    WIN1255 /* Hebrew Windows */
-    ,
-    WIN1257 /* Baltic(North Europe) Windows */
-    ,
-    EUC_JIS_2004 /* EUC for SHIFT-JIS-2004 Japanese */
-    ,
-    SJIS /* Shift JIS */
-    ,
-    BIG5 /* Big5 */
-    ,
-    GBK /* GBK */
-    ,
-    UHC /* UHC */
-    ,
-    GB18030 /* GB18030 */
-    ,
-    SHIFT_JIS_2004 /* SHIFT-JIS-2004 Japanese, JIS X 0213 */
-    ,
-    OTHER = -1
-};
-
-/* Old Type Compatible */
-typedef struct {
-    int ccsc;
-    const UCHAR *encstr;
-    ssize_t pos;
-    int ccst;
-} encoded_str;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-int opensearch_CS_code(const char *stat_string);
-int encoded_nextchar(encoded_str *encstr);
-int encoded_byte_check(encoded_str *encstr, size_t abspos);
-const char *derive_locale_encoding(const char *dbencoding);
-int opensearch_mb_maxlen(int characterset_code);
-#ifdef __cplusplus
-}
-#endif
-#define ENCODE_STATUS(enc) ((enc).ccst)
-#define ENCODE_PTR(enc) ((enc).encstr + (enc).pos)
-#define MBCS_NON_ASCII(enc) (0 != (enc).ccst || (enc).encstr[(enc).pos] >= 0x80)
-
-void encoded_str_constr(encoded_str *encstr, int ccsc, const char *str);
-#define make_encoded_str(encstr, conn, str) \
-    encoded_str_constr(encstr, conn->ccsc, str)
-#endif /* __MULTIBUYTE_H__ */
diff --git a/sql-odbc/src/sqlodbc/mylog.c b/sql-odbc/src/sqlodbc/mylog.c
deleted file mode 100644
index 2933a1cab0..0000000000
--- a/sql-odbc/src/sqlodbc/mylog.c
+++ /dev/null
@@ -1,527 +0,0 @@
-#define _MYLOG_FUNCS_IMPLEMENT_
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "dlg_specific.h"
-#include "opensearch_odbc.h"
-#include "misc.h"
-#include "opensearch_helper.h"
-
-#ifndef WIN32
-#include <errno.h>
-#include <pwd.h>
-#include <sys/types.h>
-#include <unistd.h>
-#define GENERAL_ERRNO (errno)
-#define GENERAL_ERRNO_SET(e) (errno = e)
-#else
-#define GENERAL_ERRNO (GetLastError())
-#define GENERAL_ERRNO_SET(e) SetLastError(e)
-#include <process.h> /* Byron: is this where Windows keeps def.
-								 * of getpid ? */
-#endif
-
-#ifdef WIN32
-#define DIRSEPARATOR "\\"
-#define OPENSEARCH_BINARY O_BINARY
-#define OPENSEARCH_BINARY_R "rb"
-#define OPENSEARCH_BINARY_W "wb"
-#define OPENSEARCH_BINARY_A "ab"
-#else
-#define DIRSEPARATOR "/"
-#define OPENSEARCH_BINARY 0
-#define OPENSEARCH_BINARY_R "r"
-#define OPENSEARCH_BINARY_W "w"
-#define OPENSEARCH_BINARY_A "a"
-#endif /* WIN32 */
-
-static char *logdir = NULL;
-
-void generate_filename(const char *dirname, const char *prefix, char *filename,
-                       size_t filenamelen) {
-    const char *exename = GetExeProgramName();
-#ifdef WIN32
-    int pid;
-
-    pid = _getpid();
-#else
-    pid_t pid;
-    struct passwd *ptr;
-
-    ptr = getpwuid(getuid());
-    pid = getpid();
-#endif
-    if (dirname == 0 || filename == 0)
-        return;
-
-    snprintf(filename, filenamelen, "%s%s", dirname, DIRSEPARATOR);
-    if (prefix != 0)
-        strlcat(filename, prefix, filenamelen);
-    if (exename[0])
-        snprintfcat(filename, filenamelen, "%s_", exename);
-#ifndef WIN32
-    if (ptr)
-        strlcat(filename, ptr->pw_name, filenamelen);
-#endif
-    snprintfcat(filename, filenamelen, "%u%s", pid, ".log");
-    return;
-}
-
-static void generate_homefile(const char *prefix, char *filename,
-                              size_t filenamelen) {
-    char dir[PATH_MAX];
-#ifdef WIN32
-    const char *ptr;
-
-    dir[0] = '\0';
-    if (ptr = getenv("HOMEDRIVE"), NULL != ptr)
-        strlcat(dir, ptr, filenamelen);
-    if (ptr = getenv("HOMEPATH"), NULL != ptr)
-        strlcat(dir, ptr, filenamelen);
-#else
-    STRCPY_FIXED(dir, "~");
-#endif /* WIN32 */
-    generate_filename(dir, prefix, filename, filenamelen);
-
-    return;
-}
-
-#ifdef WIN32
-static char exename[_MAX_FNAME];
-#elif defined MAXNAMELEN
-static char exename[MAXNAMELEN];
-#else
-static char exename[256];
-#endif
-
-const char *GetExeProgramName() {
-    static int init = 1;
-
-    if (init) {
-        UCHAR *p;
-#ifdef WIN32
-        char pathname[_MAX_PATH];
-
-        if (GetModuleFileName(NULL, pathname, sizeof(pathname)) > 0)
-            _splitpath(pathname, NULL, NULL, exename, NULL);
-#else
-        CSTR flist[] = {"/proc/self/exe", "/proc/curproc/file",
-                        "/proc/curproc/exe"};
-        unsigned long i;
-        char path_name[256];
-
-        for (i = 0; i < sizeof(flist) / sizeof(flist[0]); i++) {
-            if (readlink(flist[i], path_name, sizeof(path_name)) > 0) {
-                /* fprintf(stderr, "i=%d pathname=%s\n", i, path_name); */
-                STRCPY_FIXED(exename, po_basename(path_name));
-                break;
-            }
-        }
-#endif /* WIN32 */
-        for (p = (UCHAR *)exename; '\0' != *p; p++) {
-            if (isalnum(*p))
-                continue;
-            switch (*p) {
-                case '_':
-                case '-':
-                    continue;
-            }
-            *p = '\0'; /* avoid multi bytes for safety */
-            break;
-        }
-        init = 0;
-    }
-    return exename;
-}
-
-static void *qlog_cs, *mylog_cs;
-
-static int mylog_on = OPENSEARCH_WARNING, qlog_on = OPENSEARCH_WARNING;
-
-#define INIT_QLOG_CS XPlatformInitializeCriticalSection(&qlog_cs)
-#define ENTER_QLOG_CS XPlatformEnterCriticalSection(qlog_cs)
-#define LEAVE_QLOG_CS XPlatformLeaveCriticalSection(qlog_cs)
-#define DELETE_QLOG_CS XPlatformDeleteCriticalSection(&qlog_cs)
-#define INIT_MYLOG_CS XPlatformInitializeCriticalSection(&mylog_cs)
-#define ENTER_MYLOG_CS XPlatformEnterCriticalSection(mylog_cs)
-#define LEAVE_MYLOG_CS XPlatformLeaveCriticalSection(mylog_cs)
-#define DELETE_MYLOG_CS XPlatformDeleteCriticalSection(&mylog_cs)
-
-#define MYLOGFILE "mylog_"
-#ifndef WIN32
-#define MYLOGDIR "/tmp"
-#else
-#define MYLOGDIR "c:"
-#endif /* WIN32 */
-
-#define QLOGFILE "elasticodbc_"
-#ifndef WIN32
-#define QLOGDIR "/tmp"
-#else
-#define QLOGDIR "c:"
-#endif /* WIN32 */
-
-int get_mylog(void) {
-    return mylog_on;
-}
-int get_qlog(void) {
-    return qlog_on;
-}
-
-const char *po_basename(const char *path) {
-    char *p;
-
-    if (p = strrchr(path, DIRSEPARATOR[0]), NULL != p)
-        return p + 1;
-    return path;
-}
-
-void logs_on_off(int cnopen, int mylog_onoff, int qlog_onoff) {
-    static int mylog_on_count = 0, mylog_off_count = 0, qlog_on_count = 0,
-               qlog_off_count = 0;
-
-    ENTER_MYLOG_CS;
-    if (mylog_onoff)
-        mylog_on_count += cnopen;
-    else
-        mylog_off_count += cnopen;
-    if (mylog_on_count > 0) {
-        if (mylog_onoff > mylog_on)
-            mylog_on = mylog_onoff;
-        else if (mylog_on < 1)
-            mylog_on = 1;
-    } else if (mylog_off_count > 0)
-        mylog_on = 0;
-    else if (getGlobalDebug() > 0)
-        mylog_on = getGlobalDebug();
-    LEAVE_MYLOG_CS;
-
-    ENTER_QLOG_CS;
-    if (qlog_onoff)
-        qlog_on_count += cnopen;
-    else
-        qlog_off_count += cnopen;
-    if (qlog_on_count > 0) {
-        if (qlog_onoff > qlog_on)
-            qlog_on = qlog_onoff;
-        else if (qlog_on < 1)
-            qlog_on = 1;
-    } else if (qlog_off_count > 0)
-        qlog_on = 0;
-    else if (getGlobalCommlog() > 0)
-        qlog_on = getGlobalCommlog();
-    LEAVE_QLOG_CS;
-    MYLOG(OPENSEARCH_DEBUG, "mylog_on=%d qlog_on=%d\n", mylog_on, qlog_on);
-}
-
-#ifdef WIN32
-#define LOGGING_PROCESS_TIME
-#include <direct.h>
-#endif /* WIN32 */
-#ifdef LOGGING_PROCESS_TIME
-#include <mmsystem.h>
-static DWORD start_time = 0;
-#endif /* LOGGING_PROCESS_TIME */
-static FILE *MLOGFP = NULL;
-
-static void MLOG_open() {
-    char filebuf[80], errbuf[160];
-    BOOL open_error = FALSE;
-
-    // TODO (#585): Add option to log to stderr stream
-    // MLOGFP = stderr;
-    if (MLOGFP)
-        return;
-
-    generate_filename(logdir ? logdir : MYLOGDIR, MYLOGFILE, filebuf,
-                      sizeof(filebuf));
-    MLOGFP = fopen(filebuf, OPENSEARCH_BINARY_A);
-    if (!MLOGFP) {
-        int lasterror = GENERAL_ERRNO;
-
-        open_error = TRUE;
-        SPRINTF_FIXED(errbuf, "%s open error %d\n", filebuf, lasterror);
-        generate_homefile(MYLOGFILE, filebuf, sizeof(filebuf));
-        MLOGFP = fopen(filebuf, OPENSEARCH_BINARY_A);
-    }
-    if (MLOGFP) {
-        if (open_error)
-            fputs(errbuf, MLOGFP);
-    }
-}
-
-static int mylog_misc(unsigned int option, const char *fmt, va_list args) {
-    // va_list		args;
-    int gerrno;
-    BOOL log_threadid = option;
-
-    gerrno = GENERAL_ERRNO;
-    ENTER_MYLOG_CS;
-#ifdef LOGGING_PROCESS_TIME
-    if (!start_time)
-        start_time = timeGetTime();
-#endif /* LOGGING_PROCESS_TIME */
-    // va_start(args, fmt);
-
-    if (!MLOGFP) {
-        MLOG_open();
-        if (!MLOGFP)
-            mylog_on = 0;
-    }
-
-    if (MLOGFP) {
-        if (log_threadid) {
-#ifdef WIN_MULTITHREAD_SUPPORT
-#ifdef LOGGING_PROCESS_TIME
-            DWORD proc_time = timeGetTime() - start_time;
-            fprintf(MLOGFP, "[%u-%d.%03d]", GetCurrentThreadId(),
-                    proc_time / 1000, proc_time % 1000);
-#else
-            fprintf(MLOGFP, "[%u]", GetCurrentThreadId());
-#endif /* LOGGING_PROCESS_TIME */
-#endif /* WIN_MULTITHREAD_SUPPORT */
-#if defined(POSIX_MULTITHREAD_SUPPORT)
-            fprintf(MLOGFP, "[%lx]", (unsigned long int)pthread_self());
-#endif /* POSIX_MULTITHREAD_SUPPORT */
-        }
-        vfprintf(MLOGFP, fmt, args);
-        fflush(MLOGFP);
-    }
-
-    // va_end(args);
-    LEAVE_MYLOG_CS;
-    GENERAL_ERRNO_SET(gerrno);
-
-    return 1;
-}
-
-DLL_DECLARE int mylog(const char *fmt, ...) {
-    int ret = 0;
-    unsigned int option = 1;
-    va_list args;
-
-    if (!mylog_on)
-        return ret;
-
-    va_start(args, fmt);
-    ret = mylog_misc(option, fmt, args);
-    va_end(args);
-    return ret;
-}
-
-DLL_DECLARE int myprintf(const char *fmt, ...) {
-    int ret = 0;
-    va_list args;
-
-    va_start(args, fmt);
-    ret = mylog_misc(0, fmt, args);
-    va_end(args);
-    return ret;
-}
-
-static void mylog_initialize(void) {
-    INIT_MYLOG_CS;
-}
-static void mylog_finalize(void) {
-    mylog_on = 0;
-    if (MLOGFP) {
-        fclose(MLOGFP);
-        MLOGFP = NULL;
-    }
-    DELETE_MYLOG_CS;
-}
-
-static FILE *QLOGFP = NULL;
-
-static int qlog_misc(unsigned int option, const char *fmt, va_list args) {
-    char filebuf[80];
-    int gerrno;
-
-    if (!qlog_on)
-        return 0;
-
-    gerrno = GENERAL_ERRNO;
-    ENTER_QLOG_CS;
-#ifdef LOGGING_PROCESS_TIME
-    if (!start_time)
-        start_time = timeGetTime();
-#endif /* LOGGING_PROCESS_TIME */
-
-    if (!QLOGFP) {
-        generate_filename(logdir ? logdir : QLOGDIR, QLOGFILE, filebuf,
-                          sizeof(filebuf));
-        QLOGFP = fopen(filebuf, OPENSEARCH_BINARY_A);
-        if (!QLOGFP) {
-            generate_homefile(QLOGFILE, filebuf, sizeof(filebuf));
-            QLOGFP = fopen(filebuf, OPENSEARCH_BINARY_A);
-        }
-        if (!QLOGFP)
-            qlog_on = 0;
-    }
-
-    if (QLOGFP) {
-        if (option) {
-#ifdef LOGGING_PROCESS_TIME
-            DWORD proc_time = timeGetTime() - start_time;
-            fprintf(QLOGFP, "[%d.%03d]", proc_time / 1000, proc_time % 1000);
-#endif /* LOGGING_PROCESS_TIME */
-        }
-        vfprintf(QLOGFP, fmt, args);
-        fflush(QLOGFP);
-    }
-
-    LEAVE_QLOG_CS;
-    GENERAL_ERRNO_SET(gerrno);
-
-    return 1;
-}
-int qlog(const char *fmt, ...) {
-    int ret = 0;
-    unsigned int option = 1;
-    va_list args;
-
-    if (!qlog_on)
-        return ret;
-
-    va_start(args, fmt);
-    ret = qlog_misc(option, fmt, args);
-    va_end(args);
-    return ret;
-}
-int qprintf(char *fmt, ...) {
-    int ret = 0;
-    va_list args;
-
-    va_start(args, fmt);
-    ret = qlog_misc(0, fmt, args);
-    va_end(args);
-    return ret;
-}
-
-static void qlog_initialize(void) {
-    INIT_QLOG_CS;
-}
-static void qlog_finalize(void) {
-    qlog_on = 0;
-    if (QLOGFP) {
-        fclose(QLOGFP);
-        QLOGFP = NULL;
-    }
-    DELETE_QLOG_CS;
-}
-
-static int globalDebug = -1;
-int getGlobalDebug() {
-    char temp[16];
-
-    if (globalDebug >= 0)
-        return globalDebug;
-    /* Debug is stored in the driver section */
-    SQLGetPrivateProfileString(DBMS_NAME, INI_LOG_LEVEL, "", temp, sizeof(temp),
-                               ODBCINST_INI);
-    if (temp[0])
-        globalDebug = atoi(temp);
-    else
-        globalDebug = DEFAULT_LOGLEVEL;
-
-    return globalDebug;
-}
-
-int setGlobalDebug(int val) {
-    return (globalDebug = val);
-}
-
-static int globalCommlog = -1;
-int getGlobalCommlog() {
-    char temp[16];
-
-    if (globalCommlog >= 0)
-        return globalCommlog;
-    /* Commlog is stored in the driver section */
-    SQLGetPrivateProfileString(DBMS_NAME, INI_LOG_LEVEL, "", temp, sizeof(temp),
-                               ODBCINST_INI);
-    if (temp[0])
-        globalCommlog = atoi(temp);
-    else
-        globalCommlog = DEFAULT_LOGLEVEL;
-
-    return globalCommlog;
-}
-
-int setGlobalCommlog(int val) {
-    return (globalCommlog = val);
-}
-
-int writeGlobalLogs() {
-    char temp[10];
-
-    ITOA_FIXED(temp, globalDebug);
-    SQLWritePrivateProfileString(DBMS_NAME, INI_LOG_LEVEL, temp, ODBCINST_INI);
-    ITOA_FIXED(temp, globalCommlog);
-    SQLWritePrivateProfileString(DBMS_NAME, INI_LOG_LEVEL, temp, ODBCINST_INI);
-    return 0;
-}
-
-void logInstallerError(int ret, const char *dir) {
-    DWORD err = (DWORD)ret;
-    char msg[SQL_MAX_MESSAGE_LENGTH] = "";
-    msg[0] = '\0';
-    ret = SQLInstallerError(1, &err, msg, sizeof(msg), NULL);
-    if (msg[0] != '\0')
-        MYLOG(OPENSEARCH_DEBUG, "Dir= %s ErrorMsg = %s\n", dir, msg);
-}
-
-int getLogDir(char *dir, int dirmax) {
-    int ret = SQLGetPrivateProfileString(DBMS_NAME, INI_LOG_OUTPUT, "",
-                                                dir, dirmax, ODBCINST_INI);
-    if (!ret)
-        logInstallerError(ret, dir);
-    return ret;
-}
-
-int setLogDir(const char *dir) {
-    int ret = SQLWritePrivateProfileString(DBMS_NAME, INI_LOG_OUTPUT, dir,
-                                           ODBCINST_INI);
-    if (!ret) 
-        logInstallerError(ret, dir);
-    return ret;
-}
-
-/*
- *	This function starts a logging out of connections according the ODBCINST.INI
- *	portion of the DBMS_NAME registry.
- */
-static void start_logging() {
-    /*
-     * GlobalDebug or GlobalCommlog means whether take mylog or commlog
-     * out of the connection time or not but doesn't mean the default of
-     * ci->drivers.debug(commlog).
-     */
-    logs_on_off(0, 0, 0);
-    mylog("\t%s:Global.debug&commlog=%d&%d\n", __FUNCTION__, getGlobalDebug(),
-          getGlobalCommlog());
-}
-
-void InitializeLogging(void) {
-    char dir[PATH_MAX];
-    getLogDir(dir, sizeof(dir));
-    if (dir[0])
-        logdir = strdup(dir);
-    mylog_initialize();
-    qlog_initialize();
-    start_logging();
-    MYLOG(OPENSEARCH_DEBUG, "Log Output Dir: %s\n", logdir);
-}
-
-void FinalizeLogging(void) {
-    mylog_finalize();
-    qlog_finalize();
-    if (logdir) {
-        free(logdir);
-        logdir = NULL;
-    }
-}
diff --git a/sql-odbc/src/sqlodbc/mylog.h b/sql-odbc/src/sqlodbc/mylog.h
deleted file mode 100644
index c7ee6710c7..0000000000
--- a/sql-odbc/src/sqlodbc/mylog.h
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef __MYLOG_H__
-#define __MYLOG_H__
-
-#undef DLL_DECLARE
-#ifdef WIN32
-#ifdef _MYLOG_FUNCS_IMPLEMENT_
-#define DLL_DECLARE _declspec(dllexport)
-#else
-#ifdef _MYLOG_FUNCS_IMPORT_
-#define DLL_DECLARE _declspec(dllimport)
-#else
-#define DLL_DECLARE
-#endif /* _MYLOG_FUNCS_IMPORT_ */
-#endif /* _MYLOG_FUNCS_IMPLEMENT_ */
-#else
-#define DLL_DECLARE
-#endif /* WIN32 */
-
-#include <stdio.h>
-#ifndef WIN32
-#include <unistd.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __GNUC__
-#define __attribute__(x)
-#endif
-
-DLL_DECLARE int mylog(const char *fmt, ...)
-    __attribute__((format(OPENSEARCH_PRINTF_ATTRIBUTE, 1, 2)));
-DLL_DECLARE int myprintf(const char *fmt, ...)
-    __attribute__((format(OPENSEARCH_PRINTF_ATTRIBUTE, 1, 2)));
-
-extern int qlog(const char *fmt, ...)
-    __attribute__((format(OPENSEARCH_PRINTF_ATTRIBUTE, 1, 2)));
-extern int qprintf(char *fmt, ...)
-    __attribute__((format(OPENSEARCH_PRINTF_ATTRIBUTE, 1, 2)));
-
-const char *po_basename(const char *path);
-
-#define PREPEND_FMT "%10.10s[%s]%d: "
-#define PREPEND_ITEMS , po_basename(__FILE__), __FUNCTION__, __LINE__
-#define QLOG_MARK "[QLOG]"
-
-#if defined(__GNUC__) && !defined(__APPLE__)
-#define MYLOG(level, fmt, ...)                                                 \
-    (level < get_mylog() ? mylog(PREPEND_FMT fmt PREPEND_ITEMS, ##__VA_ARGS__) \
-                         : 0)
-#define MYPRINTF(level, fmt, ...) \
-    (level < get_mylog() ? myprintf((fmt), ##__VA_ARGS__) : 0)
-#define QLOG(level, fmt, ...)                               \
-    ((level < get_qlog() ? qlog((fmt), ##__VA_ARGS__) : 0), \
-     MYLOG(level, QLOG_MARK fmt, ##__VA_ARGS__))
-#define QPRINTF(level, fmt, ...)                               \
-    ((level < get_qlog() ? qprintf((fmt), ##__VA_ARGS__) : 0), \
-     MYPRINTF(level, (fmt), ##__VA_ARGS__))
-#elif defined WIN32 /* && _MSC_VER > 1800 */
-#define MYLOG(level, fmt, ...)                               \
-    ((int)level <= get_mylog()                               \
-         ? mylog(PREPEND_FMT fmt PREPEND_ITEMS, __VA_ARGS__) \
-         : (printf || printf((fmt), __VA_ARGS__)))
-#define MYPRINTF(level, fmt, ...)                           \
-    ((int)level <= get_mylog() ? myprintf(fmt, __VA_ARGS__) \
-                               : (printf || printf((fmt), __VA_ARGS__)))
-#define QLOG(level, fmt, ...)                                           \
-    (((int)level <= get_qlog() ? qlog((fmt), __VA_ARGS__)               \
-                               : (printf || printf(fmt, __VA_ARGS__))), \
-     MYLOG(level, QLOG_MARK fmt, __VA_ARGS__))
-#define QPRINTF(level, fmt, ...)                                          \
-    (((int)level <= get_qlog() ? qprintf(fmt, __VA_ARGS__)                \
-                               : (printf || printf((fmt), __VA_ARGS__))), \
-     MYPRINTF(level, (fmt), __VA_ARGS__))
-#else
-#define MYLOG(level, ...)                                                \
-    do {                                                                 \
-        _Pragma("clang diagnostic push");                                \
-        _Pragma("clang diagnostic ignored \"-Wformat-pedantic\"");       \
-        (level < get_mylog()                                             \
-             ? (mylog(PREPEND_FMT PREPEND_ITEMS), myprintf(__VA_ARGS__)) \
-             : 0);                                                       \
-        _Pragma("clang diagnostic pop");                                 \
-    } while (0)
-#define MYPRINTF(level, ...)                                       \
-    do {                                                           \
-        _Pragma("clang diagnostic push");                          \
-        _Pragma("clang diagnostic ignored \"-Wformat-pedantic\""); \
-        (level < get_mylog() ? myprintf(__VA_ARGS__) : 0);         \
-        _Pragma("clang diagnostic pop");                           \
-    } while (0)
-#define QLOG(level, ...)                                           \
-    do {                                                           \
-        _Pragma("clang diagnostic push");                          \
-        _Pragma("clang diagnostic ignored \"-Wformat-pedantic\""); \
-        (level < get_qlog() ? qlog(__VA_ARGS__) : 0);              \
-        MYLOG(level, QLOG_MARK);                                   \
-        MYPRINTF(level, __VA_ARGS__);                              \
-        _Pragma("clang diagnostic pop");                           \
-    } while (0)
-#define QPRINTF(level, ...)                                        \
-    do {                                                           \
-        _Pragma("clang diagnostic push");                          \
-        _Pragma("clang diagnostic ignored \"-Wformat-pedantic\""); \
-        (level < get_qlog() ? qprintf(__VA_ARGS__) : 0);           \
-        MYPRINTF(level, __VA_ARGS__);                              \
-        _Pragma("clang diagnostic pop");                           \
-    } while (0)
-#endif /* __GNUC__ */
-
-enum OpenSearchLogLevel {
-    // Prefixing with OPENSEARCH_ because C does not support namespaces and we may get a
-    // collision, given how common these names are
-    OPENSEARCH_OFF,
-    OPENSEARCH_FATAL,
-    OPENSEARCH_ERROR,
-    OPENSEARCH_WARNING,
-    OPENSEARCH_INFO,
-    OPENSEARCH_DEBUG,
-    OPENSEARCH_TRACE,
-    OPENSEARCH_ALL
-};
-
-int get_qlog(void);
-int get_mylog(void);
-
-int getGlobalDebug();
-int setGlobalDebug(int val);
-int getGlobalCommlog();
-int setGlobalCommlog(int val);
-int writeGlobalLogs();
-int getLogDir(char *dir, int dirmax);
-int setLogDir(const char *dir);
-
-void InitializeLogging(void);
-void FinalizeLogging(void);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __MYLOG_H__ */
diff --git a/sql-odbc/src/sqlodbc/odbcapi.c b/sql-odbc/src/sqlodbc/odbcapi.c
deleted file mode 100644
index 58cd9dff5d..0000000000
--- a/sql-odbc/src/sqlodbc/odbcapi.c
+++ /dev/null
@@ -1,1383 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "environ.h"
-#include "opensearch_odbc.h"
-#include "loadlib.h"
-#include "misc.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "opensearch_driver_connect.h"
-#include "opensearch_info.h"
-#include "opensearch_statement.h"
-#include "qresult.h"
-#include "statement.h"
-
-BOOL SC_connection_lost_check(StatementClass *stmt, const char *funcname) {
-    ConnectionClass *conn = SC_get_conn(stmt);
-    char message[64];
-
-    if (NULL != conn->opensearchconn)
-        return FALSE;
-    SC_clear_error(stmt);
-    SPRINTF_FIXED(message, "%s unable due to the connection lost", funcname);
-    SC_set_error(stmt, STMT_COMMUNICATION_ERROR, message, funcname);
-    return TRUE;
-}
-
-RETCODE SQL_API SQLBindCol(HSTMT StatementHandle, SQLUSMALLINT ColumnNumber,
-                           SQLSMALLINT TargetType, PTR TargetValue,
-                           SQLLEN BufferLength, SQLLEN *StrLen_or_Ind) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_BindCol(StatementHandle, ColumnNumber, TargetType, TargetValue,
-                        BufferLength, StrLen_or_Ind);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLCancel(HSTMT StatementHandle) {
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (!StatementHandle)
-        return SQL_INVALID_HANDLE;
-    if (SC_connection_lost_check((StatementClass *)StatementHandle,
-                                 __FUNCTION__))
-        return SQL_ERROR;
-    return OPENSEARCHAPI_Cancel(StatementHandle);
-}
-
-static BOOL theResultIsEmpty(const StatementClass *stmt) {
-    QResultClass *res = SC_get_Result(stmt);
-    if (NULL == res)
-        return FALSE;
-    return (0 == QR_get_num_total_tuples(res));
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLColumns(HSTMT StatementHandle, SQLCHAR *CatalogName,
-                           SQLSMALLINT NameLength1, SQLCHAR *SchemaName,
-                           SQLSMALLINT NameLength2, SQLCHAR *TableName,
-                           SQLSMALLINT NameLength3, SQLCHAR *ColumnName,
-                           SQLSMALLINT NameLength4) {
-    CSTR func = "SQLColumns";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    SQLCHAR *ctName = CatalogName, *scName = SchemaName, *tbName = TableName,
-            *clName = ColumnName;
-    UWORD flag = PODBC_SEARCH_PUBLIC_SCHEMA;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_Columns(StatementHandle, ctName, NameLength1, scName,
-                            NameLength2, tbName, NameLength3, clName,
-                            NameLength4, flag, 0, 0);
-    if (SQL_SUCCESS == ret && theResultIsEmpty(stmt)) {
-        BOOL ifallupper = TRUE, reexec = FALSE;
-        SQLCHAR *newCt = NULL, *newSc = NULL, *newTb = NULL, *newCl = NULL;
-        ConnectionClass *conn = SC_get_conn(stmt);
-
-        if (newCt = make_lstring_ifneeded(conn, CatalogName, NameLength1,
-                                          ifallupper),
-            NULL != newCt) {
-            ctName = newCt;
-            reexec = TRUE;
-        }
-        if (newSc = make_lstring_ifneeded(conn, SchemaName, NameLength2,
-                                          ifallupper),
-            NULL != newSc) {
-            scName = newSc;
-            reexec = TRUE;
-        }
-        if (newTb =
-                make_lstring_ifneeded(conn, TableName, NameLength3, ifallupper),
-            NULL != newTb) {
-            tbName = newTb;
-            reexec = TRUE;
-        }
-        if (newCl = make_lstring_ifneeded(conn, ColumnName, NameLength4,
-                                          ifallupper),
-            NULL != newCl) {
-            clName = newCl;
-            reexec = TRUE;
-        }
-        if (reexec) {
-            ret = OPENSEARCHAPI_Columns(StatementHandle, ctName, NameLength1, scName,
-                                NameLength2, tbName, NameLength3, clName,
-                                NameLength4, flag, 0, 0);
-            if (newCt)
-                free(newCt);
-            if (newSc)
-                free(newSc);
-            if (newTb)
-                free(newTb);
-            if (newCl)
-                free(newCl);
-        }
-    }
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLConnect(HDBC ConnectionHandle, SQLCHAR *ServerName,
-                           SQLSMALLINT NameLength1, SQLCHAR *UserName,
-                           SQLSMALLINT NameLength2, SQLCHAR *Authentication,
-                           SQLSMALLINT NameLength3) {
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    ret = OPENSEARCHAPI_Connect(ConnectionHandle, ServerName, NameLength1, UserName,
-                        NameLength2, Authentication, NameLength3);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-
-RETCODE SQL_API SQLDriverConnect(HDBC hdbc, HWND hwnd, SQLCHAR *szConnStrIn,
-                                 SQLSMALLINT cbConnStrIn, SQLCHAR *szConnStrOut,
-                                 SQLSMALLINT cbConnStrOutMax,
-                                 SQLSMALLINT *pcbConnStrOut,
-                                 SQLUSMALLINT fDriverCompletion) {
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    ret =
-        OPENSEARCHAPI_DriverConnect(hdbc, hwnd, szConnStrIn, cbConnStrIn, szConnStrOut,
-                            cbConnStrOutMax, pcbConnStrOut, fDriverCompletion);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-RETCODE SQL_API SQLBrowseConnect(HDBC hdbc, SQLCHAR *szConnStrIn,
-                                 SQLSMALLINT cbConnStrIn, SQLCHAR *szConnStrOut,
-                                 SQLSMALLINT cbConnStrOutMax,
-                                 SQLSMALLINT *pcbConnStrOut) {
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    ret = OPENSEARCHAPI_BrowseConnect(hdbc, szConnStrIn, cbConnStrIn, szConnStrOut,
-                              cbConnStrOutMax, pcbConnStrOut);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-
-RETCODE SQL_API SQLDataSources(HENV EnvironmentHandle, SQLUSMALLINT Direction,
-                               SQLCHAR *ServerName, SQLSMALLINT BufferLength1,
-                               SQLSMALLINT *NameLength1, SQLCHAR *Description,
-                               SQLSMALLINT BufferLength2,
-                               SQLSMALLINT *NameLength2) {
-    UNUSED(EnvironmentHandle, Direction, ServerName, BufferLength1, NameLength1,
-           Description, BufferLength2, NameLength2);
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    return SQL_ERROR;
-}
-
-RETCODE SQL_API SQLDescribeCol(HSTMT StatementHandle, SQLUSMALLINT ColumnNumber,
-                               SQLCHAR *ColumnName, SQLSMALLINT BufferLength,
-                               SQLSMALLINT *NameLength, SQLSMALLINT *DataType,
-                               SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits,
-                               SQLSMALLINT *Nullable) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_DescribeCol(StatementHandle, ColumnNumber, ColumnName,
-                            BufferLength, NameLength, DataType, ColumnSize,
-                            DecimalDigits, Nullable);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-RETCODE SQL_API SQLDisconnect(HDBC ConnectionHandle) {
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering for %p\n", ConnectionHandle);
-#ifdef _HANDLE_ENLIST_IN_DTC_
-    if (CC_is_in_global_trans(conn))
-        CALL_DtcOnDisconnect(conn);
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    ret = OPENSEARCHAPI_Disconnect(ConnectionHandle);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLExecDirect(HSTMT StatementHandle, SQLCHAR *StatementText,
-                              SQLINTEGER TextLength) {
-    if (StatementHandle == NULL)
-        return SQL_ERROR;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    // Enter critical
-    ENTER_STMT_CS(stmt);
-
-    // Clear error and rollback
-    SC_clear_error(stmt);
-
-    // Execute statement if statement is ready
-    RETCODE ret = SQL_ERROR;
-    if (!SC_opencheck(stmt, "SQLExecDirect"))
-        ret = OPENSEARCHAPI_ExecDirect(StatementHandle, StatementText, TextLength, 1);
-
-    // Exit critical
-    LEAVE_STMT_CS(stmt);
-
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-RETCODE SQL_API SQLExecute(HSTMT StatementHandle) {
-    if (StatementHandle == NULL)
-        return SQL_ERROR;
-
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    // Enter critical
-    ENTER_STMT_CS(stmt);
-
-    // Clear error and rollback
-    SC_clear_error(stmt);
-    RETCODE ret = SQL_ERROR;
-    if (!SC_opencheck(stmt, "SQLExecute"))
-        ret = OPENSEARCHAPI_Execute(StatementHandle);
-
-    // Exit critical
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLFetch(HSTMT StatementHandle) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    IRDFields *irdopts = SC_get_IRDF(stmt);
-    ARDFields *ardopts = SC_get_ARDF(stmt);
-    SQLUSMALLINT *rowStatusArray = irdopts->rowStatusArray;
-    SQLULEN *pcRow = irdopts->rowsFetched;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_ExtendedFetch(StatementHandle, SQL_FETCH_NEXT, 0, pcRow,
-                              rowStatusArray, 0, ardopts->size_of_rowset);
-    stmt->transition_status = STMT_TRANSITION_FETCH_SCROLL;
-
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLFreeStmt(HSTMT StatementHandle, SQLUSMALLINT Option) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    ConnectionClass *conn = NULL;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-
-    if (stmt) {
-        if (Option == SQL_DROP) {
-            conn = stmt->hdbc;
-            if (conn)
-                ENTER_CONN_CS(conn);
-        } else
-            ENTER_STMT_CS(stmt);
-    }
-
-    ret = OPENSEARCHAPI_FreeStmt(StatementHandle, Option);
-
-    if (stmt) {
-        if (Option == SQL_DROP) {
-            if (conn)
-                LEAVE_CONN_CS(conn);
-        } else
-            LEAVE_STMT_CS(stmt);
-    }
-
-    return ret;
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLGetCursorName(HSTMT StatementHandle, SQLCHAR *CursorName,
-                                 SQLSMALLINT BufferLength,
-                                 SQLSMALLINT *NameLength) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_GetCursorName(StatementHandle, CursorName, BufferLength,
-                              NameLength);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-RETCODE SQL_API SQLGetData(HSTMT StatementHandle, SQLUSMALLINT ColumnNumber,
-                           SQLSMALLINT TargetType, PTR TargetValue,
-                           SQLLEN BufferLength, SQLLEN *StrLen_or_Ind) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_GetData(StatementHandle, ColumnNumber, TargetType, TargetValue,
-                        BufferLength, StrLen_or_Ind);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLGetFunctions(HDBC ConnectionHandle, SQLUSMALLINT FunctionId,
-                                SQLUSMALLINT *Supported) {
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    if (FunctionId == SQL_API_ODBC3_ALL_FUNCTIONS)
-        ret = OPENSEARCHAPI_GetFunctions30(ConnectionHandle, FunctionId, Supported);
-    else
-        ret = OPENSEARCHAPI_GetFunctions(ConnectionHandle, FunctionId, Supported);
-
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLGetInfo(HDBC ConnectionHandle, SQLUSMALLINT InfoType,
-                           PTR InfoValue, SQLSMALLINT BufferLength,
-                           SQLSMALLINT *StringLength) {
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if ((ret = OPENSEARCHAPI_GetInfo(ConnectionHandle, InfoType, InfoValue,
-                             BufferLength, StringLength))
-        == SQL_ERROR)
-        CC_log_error("SQLGetInfo(30)", "", conn);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-
-RETCODE SQL_API SQLGetTypeInfo(HSTMT StatementHandle, SQLSMALLINT DataType) {
-    CSTR func = "SQLGetTypeInfo";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check((StatementClass *)StatementHandle,
-                                 __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_GetTypeInfo(StatementHandle, DataType);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-RETCODE SQL_API SQLNumResultCols(HSTMT StatementHandle,
-                                 SQLSMALLINT *ColumnCount) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_NumResultCols(StatementHandle, ColumnCount);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLParamData(HSTMT StatementHandle, PTR *Value) {
-    UNUSED(Value);
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    if (stmt == NULL)
-        return SQL_ERROR;
-    SC_clear_error(stmt);
-    SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                 "OpenSearch does not support parameters.", "SQLParamData");
-    return SQL_ERROR;
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLPrepare(HSTMT StatementHandle, SQLCHAR *StatementText,
-                           SQLINTEGER TextLength) {
-    if (StatementHandle == NULL)
-        return SQL_ERROR;
-
-    CSTR func = "SQLPrepare";
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    // Enter critical
-    ENTER_STMT_CS(stmt);
-
-    // Clear error and rollback
-    SC_clear_error(stmt);
-
-    // Prepare statement if statement is ready
-    RETCODE ret = SQL_ERROR;
-    if (!SC_opencheck(stmt, func))
-        ret = OPENSEARCHAPI_Prepare(StatementHandle, StatementText, TextLength);
-
-    // Exit critical
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-RETCODE SQL_API SQLPutData(HSTMT StatementHandle, PTR Data,
-                           SQLLEN StrLen_or_Ind) {
-    UNUSED(Data, StrLen_or_Ind);
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    if (stmt == NULL)
-        return SQL_ERROR;
-    SC_clear_error(stmt);
-    SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                 "OpenSearch does not support parameters.", "SQLPutData");
-    return SQL_ERROR;
-}
-
-RETCODE SQL_API SQLRowCount(HSTMT StatementHandle, SQLLEN *RowCount) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_RowCount(StatementHandle, RowCount);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLSetCursorName(HSTMT StatementHandle, SQLCHAR *CursorName,
-                                 SQLSMALLINT NameLength) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_SetCursorName(StatementHandle, CursorName, NameLength);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-RETCODE SQL_API SQLSetParam(HSTMT StatementHandle, SQLUSMALLINT ParameterNumber,
-                            SQLSMALLINT ValueType, SQLSMALLINT ParameterType,
-                            SQLULEN LengthPrecision, SQLSMALLINT ParameterScale,
-                            PTR ParameterValue, SQLLEN *StrLen_or_Ind) {
-    UNUSED(ParameterNumber, ValueType, ParameterType, LengthPrecision,
-           ParameterScale, ParameterValue, StrLen_or_Ind);
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    if (stmt == NULL)
-        return SQL_ERROR;
-    SC_clear_error(stmt);
-    SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                 "OpenSearch does not support parameters.", "SQLSetParam");
-    return SQL_ERROR;
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLSpecialColumns(HSTMT StatementHandle,
-                                  SQLUSMALLINT IdentifierType,
-                                  SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-                                  SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-                                  SQLCHAR *TableName, SQLSMALLINT NameLength3,
-                                  SQLUSMALLINT Scope, SQLUSMALLINT Nullable) {
-    CSTR func = "SQLSpecialColumns";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    SQLCHAR *ctName = CatalogName, *scName = SchemaName, *tbName = TableName;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_SpecialColumns(StatementHandle, IdentifierType, ctName,
-                                   NameLength1, scName, NameLength2, tbName,
-                                   NameLength3, Scope, Nullable);
-    if (SQL_SUCCESS == ret && theResultIsEmpty(stmt)) {
-        BOOL ifallupper = TRUE, reexec = FALSE;
-        SQLCHAR *newCt = NULL, *newSc = NULL, *newTb = NULL;
-        ConnectionClass *conn = SC_get_conn(stmt);
-
-        if (newCt = make_lstring_ifneeded(conn, CatalogName, NameLength1,
-                                          ifallupper),
-            NULL != newCt) {
-            ctName = newCt;
-            reexec = TRUE;
-        }
-        if (newSc = make_lstring_ifneeded(conn, SchemaName, NameLength2,
-                                          ifallupper),
-            NULL != newSc) {
-            scName = newSc;
-            reexec = TRUE;
-        }
-        if (newTb =
-                make_lstring_ifneeded(conn, TableName, NameLength3, ifallupper),
-            NULL != newTb) {
-            tbName = newTb;
-            reexec = TRUE;
-        }
-        if (reexec) {
-            ret = OPENSEARCHAPI_SpecialColumns(StatementHandle, IdentifierType, ctName,
-                                       NameLength1, scName, NameLength2, tbName,
-                                       NameLength3, Scope, Nullable);
-            if (newCt)
-                free(newCt);
-            if (newSc)
-                free(newSc);
-            if (newTb)
-                free(newTb);
-        }
-    }
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLStatistics(HSTMT StatementHandle, SQLCHAR *CatalogName,
-                              SQLSMALLINT NameLength1, SQLCHAR *SchemaName,
-                              SQLSMALLINT NameLength2, SQLCHAR *TableName,
-                              SQLSMALLINT NameLength3, SQLUSMALLINT Unique,
-                              SQLUSMALLINT Reserved) {
-    CSTR func = "SQLStatistics";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    SQLCHAR *ctName = CatalogName, *scName = SchemaName, *tbName = TableName;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_Statistics(StatementHandle, ctName, NameLength1, scName,
-                               NameLength2, tbName, NameLength3, Unique,
-                               Reserved);
-    if (SQL_SUCCESS == ret && theResultIsEmpty(stmt)) {
-        BOOL ifallupper = TRUE, reexec = FALSE;
-        SQLCHAR *newCt = NULL, *newSc = NULL, *newTb = NULL;
-        ConnectionClass *conn = SC_get_conn(stmt);
-
-        if (newCt = make_lstring_ifneeded(conn, CatalogName, NameLength1,
-                                          ifallupper),
-            NULL != newCt) {
-            ctName = newCt;
-            reexec = TRUE;
-        }
-        if (newSc = make_lstring_ifneeded(conn, SchemaName, NameLength2,
-                                          ifallupper),
-            NULL != newSc) {
-            scName = newSc;
-            reexec = TRUE;
-        }
-        if (newTb =
-                make_lstring_ifneeded(conn, TableName, NameLength3, ifallupper),
-            NULL != newTb) {
-            tbName = newTb;
-            reexec = TRUE;
-        }
-        if (reexec) {
-            ret = OPENSEARCHAPI_Statistics(StatementHandle, ctName, NameLength1, scName,
-                                   NameLength2, tbName, NameLength3, Unique,
-                                   Reserved);
-            if (newCt)
-                free(newCt);
-            if (newSc)
-                free(newSc);
-            if (newTb)
-                free(newTb);
-        }
-    }
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLTables(HSTMT StatementHandle, SQLCHAR *CatalogName,
-                          SQLSMALLINT NameLength1, SQLCHAR *SchemaName,
-                          SQLSMALLINT NameLength2, SQLCHAR *TableName,
-                          SQLSMALLINT NameLength3, SQLCHAR *TableType,
-                          SQLSMALLINT NameLength4) {
-    CSTR func = "SQLTables";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    SQLCHAR *ctName = CatalogName, *scName = SchemaName, *tbName = TableName;
-    UWORD flag = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_Tables(StatementHandle, ctName, NameLength1, scName,
-                           NameLength2, tbName, NameLength3, TableType,
-                           NameLength4, flag);
-    if (SQL_SUCCESS == ret && theResultIsEmpty(stmt)) {
-        BOOL ifallupper = TRUE, reexec = FALSE;
-        SQLCHAR *newCt = NULL, *newSc = NULL, *newTb = NULL;
-        ConnectionClass *conn = SC_get_conn(stmt);
-
-        if (newCt = make_lstring_ifneeded(conn, CatalogName, NameLength1,
-                                          ifallupper),
-            NULL != newCt) {
-            ctName = newCt;
-            reexec = TRUE;
-        }
-        if (newSc = make_lstring_ifneeded(conn, SchemaName, NameLength2,
-                                          ifallupper),
-            NULL != newSc) {
-            scName = newSc;
-            reexec = TRUE;
-        }
-        if (newTb =
-                make_lstring_ifneeded(conn, TableName, NameLength3, ifallupper),
-            NULL != newTb) {
-            tbName = newTb;
-            reexec = TRUE;
-        }
-        if (reexec) {
-            ret = OPENSEARCHAPI_Tables(StatementHandle, ctName, NameLength1, scName,
-                               NameLength2, tbName, NameLength3, TableType,
-                               NameLength4, flag);
-            if (newCt)
-                free(newCt);
-            if (newSc)
-                free(newSc);
-            if (newTb)
-                free(newTb);
-        }
-    }
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLColumnPrivileges(
-    HSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName,
-    SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLCHAR *szTableName,
-    SQLSMALLINT cbTableName, SQLCHAR *szColumnName, SQLSMALLINT cbColumnName) {
-    CSTR func = "SQLColumnPrivileges";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    SQLCHAR *ctName = szCatalogName, *scName = szSchemaName,
-            *tbName = szTableName, *clName = szColumnName;
-    UWORD flag = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_ColumnPrivileges(hstmt, ctName, cbCatalogName, scName,
-                                     cbSchemaName, tbName, cbTableName, clName,
-                                     cbColumnName, flag);
-    if (SQL_SUCCESS == ret && theResultIsEmpty(stmt)) {
-        BOOL ifallupper = TRUE, reexec = FALSE;
-        SQLCHAR *newCt = NULL, *newSc = NULL, *newTb = NULL, *newCl = NULL;
-        ConnectionClass *conn = SC_get_conn(stmt);
-
-        if (newCt = make_lstring_ifneeded(conn, szCatalogName, cbCatalogName,
-                                          ifallupper),
-            NULL != newCt) {
-            ctName = newCt;
-            reexec = TRUE;
-        }
-        if (newSc = make_lstring_ifneeded(conn, szSchemaName, cbSchemaName,
-                                          ifallupper),
-            NULL != newSc) {
-            scName = newSc;
-            reexec = TRUE;
-        }
-        if (newTb = make_lstring_ifneeded(conn, szTableName, cbTableName,
-                                          ifallupper),
-            NULL != newTb) {
-            tbName = newTb;
-            reexec = TRUE;
-        }
-        if (newCl = make_lstring_ifneeded(conn, szColumnName, cbColumnName,
-                                          ifallupper),
-            NULL != newCl) {
-            clName = newCl;
-            reexec = TRUE;
-        }
-        if (reexec) {
-            ret = OPENSEARCHAPI_ColumnPrivileges(hstmt, ctName, cbCatalogName, scName,
-                                         cbSchemaName, tbName, cbTableName,
-                                         clName, cbColumnName, flag);
-            if (newCt)
-                free(newCt);
-            if (newSc)
-                free(newSc);
-            if (newTb)
-                free(newTb);
-            if (newCl)
-                free(newCl);
-        }
-    }
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-RETCODE SQL_API SQLDescribeParam(HSTMT hstmt, SQLUSMALLINT ipar,
-                                 SQLSMALLINT *pfSqlType, SQLULEN *pcbParamDef,
-                                 SQLSMALLINT *pibScale,
-                                 SQLSMALLINT *pfNullable) {
-    UNUSED(ipar, pfSqlType, pcbParamDef, pibScale, pfNullable);
-    StatementClass *stmt = (StatementClass *)hstmt;
-    SC_clear_error(stmt);
-
-    // COLNUM_ERROR translates to 'invalid descriptor index'
-    SC_set_error(stmt, STMT_COLNUM_ERROR,
-                 "OpenSearch does not support parameters.", "SQLNumParams");
-    return SQL_ERROR;
-}
-
-RETCODE SQL_API SQLExtendedFetch(HSTMT hstmt, SQLUSMALLINT fFetchType,
-                                 SQLLEN irow,
-#if defined(WITH_UNIXODBC) && (SIZEOF_LONG_INT != 8)
-                                 SQLROWSETSIZE *pcrow,
-#else
-                                 SQLULEN *pcrow,
-#endif /* WITH_UNIXODBC */
-                                 SQLUSMALLINT *rgfRowStatus) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)hstmt;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-#ifdef WITH_UNIXODBC
-    {
-        SQLULEN retrieved;
-
-        ret = OPENSEARCHAPI_ExtendedFetch(hstmt, fFetchType, irow, &retrieved,
-                                  rgfRowStatus, 0,
-                                  SC_get_ARDF(stmt)->size_of_rowset_odbc2);
-        if (pcrow)
-            *pcrow = retrieved;
-    }
-#else
-    ret = OPENSEARCHAPI_ExtendedFetch(hstmt, fFetchType, irow, pcrow, rgfRowStatus, 0,
-                              SC_get_ARDF(stmt)->size_of_rowset_odbc2);
-#endif /* WITH_UNIXODBC */
-    stmt->transition_status = STMT_TRANSITION_EXTENDED_FETCH;
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLForeignKeys(
-    HSTMT hstmt, SQLCHAR *szPkCatalogName, SQLSMALLINT cbPkCatalogName,
-    SQLCHAR *szPkSchemaName, SQLSMALLINT cbPkSchemaName, SQLCHAR *szPkTableName,
-    SQLSMALLINT cbPkTableName, SQLCHAR *szFkCatalogName,
-    SQLSMALLINT cbFkCatalogName, SQLCHAR *szFkSchemaName,
-    SQLSMALLINT cbFkSchemaName, SQLCHAR *szFkTableName,
-    SQLSMALLINT cbFkTableName) {
-    CSTR func = "SQLForeignKeys";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    SQLCHAR *pkctName = szPkCatalogName, *pkscName = szPkSchemaName,
-            *pktbName = szPkTableName, *fkctName = szFkCatalogName,
-            *fkscName = szFkSchemaName, *fktbName = szFkTableName;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_ForeignKeys(hstmt, pkctName, cbPkCatalogName, pkscName,
-                                cbPkSchemaName, pktbName, cbPkTableName,
-                                fkctName, cbFkCatalogName, fkscName,
-                                cbFkSchemaName, fktbName, cbFkTableName);
-    if (SQL_SUCCESS == ret && theResultIsEmpty(stmt)) {
-        BOOL ifallupper = TRUE, reexec = FALSE;
-        SQLCHAR *newPkct = NULL, *newPksc = NULL, *newPktb = NULL,
-                *newFkct = NULL, *newFksc = NULL, *newFktb = NULL;
-        ConnectionClass *conn = SC_get_conn(stmt);
-
-        if (newPkct = make_lstring_ifneeded(conn, szPkCatalogName,
-                                            cbPkCatalogName, ifallupper),
-            NULL != newPkct) {
-            pkctName = newPkct;
-            reexec = TRUE;
-        }
-        if (newPksc = make_lstring_ifneeded(conn, szPkSchemaName,
-                                            cbPkSchemaName, ifallupper),
-            NULL != newPksc) {
-            pkscName = newPksc;
-            reexec = TRUE;
-        }
-        if (newPktb = make_lstring_ifneeded(conn, szPkTableName, cbPkTableName,
-                                            ifallupper),
-            NULL != newPktb) {
-            pktbName = newPktb;
-            reexec = TRUE;
-        }
-        if (newFkct = make_lstring_ifneeded(conn, szFkCatalogName,
-                                            cbFkCatalogName, ifallupper),
-            NULL != newFkct) {
-            fkctName = newFkct;
-            reexec = TRUE;
-        }
-        if (newFksc = make_lstring_ifneeded(conn, szFkSchemaName,
-                                            cbFkSchemaName, ifallupper),
-            NULL != newFksc) {
-            fkscName = newFksc;
-            reexec = TRUE;
-        }
-        if (newFktb = make_lstring_ifneeded(conn, szFkTableName, cbFkTableName,
-                                            ifallupper),
-            NULL != newFktb) {
-            fktbName = newFktb;
-            reexec = TRUE;
-        }
-        if (reexec) {
-            ret = OPENSEARCHAPI_ForeignKeys(hstmt, pkctName, cbPkCatalogName, pkscName,
-                                    cbPkSchemaName, pktbName, cbPkTableName,
-                                    fkctName, cbFkCatalogName, fkscName,
-                                    cbFkSchemaName, fktbName, cbFkTableName);
-            if (newPkct)
-                free(newPkct);
-            if (newPksc)
-                free(newPksc);
-            if (newPktb)
-                free(newPktb);
-            if (newFkct)
-                free(newFkct);
-            if (newFksc)
-                free(newFksc);
-            if (newFktb)
-                free(newFktb);
-        }
-    }
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-RETCODE SQL_API SQLMoreResults(HSTMT hstmt) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)hstmt;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_MoreResults(hstmt);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLNativeSql(HDBC hdbc, SQLCHAR *szSqlStrIn,
-                             SQLINTEGER cbSqlStrIn, SQLCHAR *szSqlStr,
-                             SQLINTEGER cbSqlStrMax, SQLINTEGER *pcbSqlStr) {
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    ret = OPENSEARCHAPI_NativeSql(hdbc, szSqlStrIn, cbSqlStrIn, szSqlStr, cbSqlStrMax,
-                          pcbSqlStr);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-RETCODE SQL_API SQLNumParams(HSTMT hstmt, SQLSMALLINT *pcpar) {
-    if (pcpar != NULL)
-        *pcpar = 0;
-
-    StatementClass *stmt = (StatementClass *)hstmt;
-    if (stmt == NULL)
-        return SQL_ERROR;
-    SC_clear_error(stmt);
-    SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                 "OpenSearch does not support parameters.", "SQLNumParams");
-    return SQL_SUCCESS_WITH_INFO;
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLPrimaryKeys(HSTMT hstmt, SQLCHAR *szCatalogName,
-                               SQLSMALLINT cbCatalogName, SQLCHAR *szSchemaName,
-                               SQLSMALLINT cbSchemaName, SQLCHAR *szTableName,
-                               SQLSMALLINT cbTableName) {
-    CSTR func = "SQLPrimaryKeys";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    SQLCHAR *ctName = szCatalogName, *scName = szSchemaName,
-            *tbName = szTableName;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_PrimaryKeys(hstmt, ctName, cbCatalogName, scName,
-                                cbSchemaName, tbName, cbTableName, 0);
-    if (SQL_SUCCESS == ret && theResultIsEmpty(stmt)) {
-        BOOL ifallupper = TRUE, reexec = FALSE;
-        SQLCHAR *newCt = NULL, *newSc = NULL, *newTb = NULL;
-        ConnectionClass *conn = SC_get_conn(stmt);
-
-        if (newCt = make_lstring_ifneeded(conn, szCatalogName, cbCatalogName,
-                                          ifallupper),
-            NULL != newCt) {
-            ctName = newCt;
-            reexec = TRUE;
-        }
-        if (newSc = make_lstring_ifneeded(conn, szSchemaName, cbSchemaName,
-                                          ifallupper),
-            NULL != newSc) {
-            scName = newSc;
-            reexec = TRUE;
-        }
-        if (newTb = make_lstring_ifneeded(conn, szTableName, cbTableName,
-                                          ifallupper),
-            NULL != newTb) {
-            tbName = newTb;
-            reexec = TRUE;
-        }
-        if (reexec) {
-            ret = OPENSEARCHAPI_PrimaryKeys(hstmt, ctName, cbCatalogName, scName,
-                                    cbSchemaName, tbName, cbTableName, 0);
-            if (newCt)
-                free(newCt);
-            if (newSc)
-                free(newSc);
-            if (newTb)
-                free(newTb);
-        }
-    }
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLProcedureColumns(
-    HSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName,
-    SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLCHAR *szProcName,
-    SQLSMALLINT cbProcName, SQLCHAR *szColumnName, SQLSMALLINT cbColumnName) {
-    CSTR func = "SQLProcedureColumns";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    SQLCHAR *ctName = szCatalogName, *scName = szSchemaName,
-            *prName = szProcName, *clName = szColumnName;
-    UWORD flag = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_ProcedureColumns(hstmt, ctName, cbCatalogName, scName,
-                                     cbSchemaName, prName, cbProcName, clName,
-                                     cbColumnName, flag);
-    if (SQL_SUCCESS == ret && theResultIsEmpty(stmt)) {
-        BOOL ifallupper = TRUE, reexec = FALSE;
-        SQLCHAR *newCt = NULL, *newSc = NULL, *newPr = NULL, *newCl = NULL;
-        ConnectionClass *conn = SC_get_conn(stmt);
-
-        if (newCt = make_lstring_ifneeded(conn, szCatalogName, cbCatalogName,
-                                          ifallupper),
-            NULL != newCt) {
-            ctName = newCt;
-            reexec = TRUE;
-        }
-        if (newSc = make_lstring_ifneeded(conn, szSchemaName, cbSchemaName,
-                                          ifallupper),
-            NULL != newSc) {
-            scName = newSc;
-            reexec = TRUE;
-        }
-        if (newPr =
-                make_lstring_ifneeded(conn, szProcName, cbProcName, ifallupper),
-            NULL != newPr) {
-            prName = newPr;
-            reexec = TRUE;
-        }
-        if (newCl = make_lstring_ifneeded(conn, szColumnName, cbColumnName,
-                                          ifallupper),
-            NULL != newCl) {
-            clName = newCl;
-            reexec = TRUE;
-        }
-        if (reexec) {
-            ret = OPENSEARCHAPI_ProcedureColumns(hstmt, ctName, cbCatalogName, scName,
-                                         cbSchemaName, prName, cbProcName,
-                                         clName, cbColumnName, flag);
-            if (newCt)
-                free(newCt);
-            if (newSc)
-                free(newSc);
-            if (newPr)
-                free(newPr);
-            if (newCl)
-                free(newCl);
-        }
-    }
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLProcedures(HSTMT hstmt, SQLCHAR *szCatalogName,
-                              SQLSMALLINT cbCatalogName, SQLCHAR *szSchemaName,
-                              SQLSMALLINT cbSchemaName, SQLCHAR *szProcName,
-                              SQLSMALLINT cbProcName) {
-    CSTR func = "SQLProcedures";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    SQLCHAR *ctName = szCatalogName, *scName = szSchemaName,
-            *prName = szProcName;
-    UWORD flag = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_Procedures(hstmt, ctName, cbCatalogName, scName,
-                               cbSchemaName, prName, cbProcName, flag);
-    if (SQL_SUCCESS == ret && theResultIsEmpty(stmt)) {
-        BOOL ifallupper = TRUE, reexec = FALSE;
-        SQLCHAR *newCt = NULL, *newSc = NULL, *newPr = NULL;
-        ConnectionClass *conn = SC_get_conn(stmt);
-
-        if (newCt = make_lstring_ifneeded(conn, szCatalogName, cbCatalogName,
-                                          ifallupper),
-            NULL != newCt) {
-            ctName = newCt;
-            reexec = TRUE;
-        }
-        if (newSc = make_lstring_ifneeded(conn, szSchemaName, cbSchemaName,
-                                          ifallupper),
-            NULL != newSc) {
-            scName = newSc;
-            reexec = TRUE;
-        }
-        if (newPr =
-                make_lstring_ifneeded(conn, szProcName, cbProcName, ifallupper),
-            NULL != newPr) {
-            prName = newPr;
-            reexec = TRUE;
-        }
-        if (reexec) {
-            ret = OPENSEARCHAPI_Procedures(hstmt, ctName, cbCatalogName, scName,
-                                   cbSchemaName, prName, cbProcName, flag);
-            if (newCt)
-                free(newCt);
-            if (newSc)
-                free(newSc);
-            if (newPr)
-                free(newPr);
-        }
-    }
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-RETCODE SQL_API SQLSetPos(HSTMT hstmt, SQLSETPOSIROW irow, SQLUSMALLINT fOption,
-                          SQLUSMALLINT fLock) {
-    UNUSED(irow, fOption, fLock);
-    StatementClass *stmt = (StatementClass *)hstmt;
-    if (stmt == NULL)
-        return SQL_ERROR;
-    SC_clear_error(stmt);
-    SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                 "SQLSetPos is not supported.", "SQLSetPos");
-    return SQL_ERROR;
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLTablePrivileges(HSTMT hstmt, SQLCHAR *szCatalogName,
-                                   SQLSMALLINT cbCatalogName,
-                                   SQLCHAR *szSchemaName,
-                                   SQLSMALLINT cbSchemaName,
-                                   SQLCHAR *szTableName,
-                                   SQLSMALLINT cbTableName) {
-    CSTR func = "SQLTablePrivileges";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    SQLCHAR *ctName = szCatalogName, *scName = szSchemaName,
-            *tbName = szTableName;
-    UWORD flag = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_TablePrivileges(hstmt, ctName, cbCatalogName, scName,
-                                    cbSchemaName, tbName, cbTableName, flag);
-    if (SQL_SUCCESS == ret && theResultIsEmpty(stmt)) {
-        BOOL ifallupper = TRUE, reexec = FALSE;
-        SQLCHAR *newCt = NULL, *newSc = NULL, *newTb = NULL;
-        ConnectionClass *conn = SC_get_conn(stmt);
-
-        if (newCt = make_lstring_ifneeded(conn, szCatalogName, cbCatalogName,
-                                          ifallupper),
-            NULL != newCt) {
-            ctName = newCt;
-            reexec = TRUE;
-        }
-        if (newSc = make_lstring_ifneeded(conn, szSchemaName, cbSchemaName,
-                                          ifallupper),
-            NULL != newSc) {
-            scName = newSc;
-            reexec = TRUE;
-        }
-        if (newTb = make_lstring_ifneeded(conn, szTableName, cbTableName,
-                                          ifallupper),
-            NULL != newTb) {
-            tbName = newTb;
-            reexec = TRUE;
-        }
-        if (reexec) {
-            ret = OPENSEARCHAPI_TablePrivileges(hstmt, ctName, cbCatalogName, scName,
-                                        cbSchemaName, tbName, cbTableName, 0);
-            if (newCt)
-                free(newCt);
-            if (newSc)
-                free(newSc);
-            if (newTb)
-                free(newTb);
-        }
-    }
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-RETCODE SQL_API SQLBindParameter(HSTMT hstmt, SQLUSMALLINT ipar,
-                                 SQLSMALLINT fParamType, SQLSMALLINT fCType,
-                                 SQLSMALLINT fSqlType, SQLULEN cbColDef,
-                                 SQLSMALLINT ibScale, PTR rgbValue,
-                                 SQLLEN cbValueMax, SQLLEN *pcbValue) {
-    UNUSED(ipar, fParamType, fCType, fSqlType, cbColDef, ibScale, rgbValue,
-           cbValueMax, pcbValue);
-    StatementClass *stmt = (StatementClass *)hstmt;
-    if (stmt == NULL)
-        return SQL_ERROR;
-    SC_clear_error(stmt);
-    SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                 "OpenSearch does not support parameters.",
-                 "SQLBindParameter");
-    return SQL_ERROR;
-}
-
-/* ODBC 2.x-specific functions */
-// TODO (#590): Add implementations for remaining ODBC 2.x function
-
-RETCODE SQL_API SQLAllocStmt(SQLHDBC InputHandle, SQLHSTMT *OutputHandle) {
-    RETCODE ret;
-    ConnectionClass *conn;
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-
-    conn = (ConnectionClass *)InputHandle;
-    ENTER_CONN_CS(conn);
-    ret = OPENSEARCHAPI_AllocStmt(
-        InputHandle, OutputHandle,
-        PODBC_EXTERNAL_STATEMENT | PODBC_INHERIT_CONNECT_OPTIONS);
-    if (*OutputHandle)
-        ((StatementClass *)(*OutputHandle))->external = 1;
-    LEAVE_CONN_CS(conn);
-
-    return ret;
-}
-
-#ifndef UNICODE_SUPPORTXX
-RETCODE SQL_API SQLGetConnectOption(HDBC ConnectionHandle, SQLUSMALLINT Option,
-                                    PTR Value) {
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering " FORMAT_UINTEGER "\n", Option);
-    ENTER_CONN_CS((ConnectionClass *)ConnectionHandle);
-    CC_clear_error((ConnectionClass *)ConnectionHandle);
-    ret = OPENSEARCHAPI_GetConnectOption(ConnectionHandle, Option, Value, NULL, 0);
-    LEAVE_CONN_CS((ConnectionClass *)ConnectionHandle);
-    return ret;
-}
-
-/*	SQLSetConnectOption -> SQLSetConnectAttr */
-RETCODE SQL_API SQLSetConnectOption(HDBC ConnectionHandle, SQLUSMALLINT Option,
-                                    SQLULEN Value) {
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering " FORMAT_INTEGER "\n", Option);
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    ret = OPENSEARCHAPI_SetConnectOption(ConnectionHandle, Option, Value);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-
-/*	SQLColAttributes -> SQLColAttribute */
-SQLRETURN SQL_API SQLColAttributes(SQLHSTMT StatementHandle,
-                                   SQLUSMALLINT ColumnNumber,
-                                   SQLUSMALLINT FieldIdentifier,
-                                   SQLPOINTER CharacterAttribute,
-                                   SQLSMALLINT BufferLength,
-                                   SQLSMALLINT *StringLength,
-#if defined(_WIN64) || defined(_WIN32) || defined(SQLCOLATTRIBUTE_SQLLEN)
-                                   SQLLEN *NumericAttribute
-#else
-                                   SQLPOINTER NumericAttribute
-#endif
-) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_ColAttributes(StatementHandle, ColumnNumber, FieldIdentifier,
-                              CharacterAttribute, BufferLength, StringLength,
-                              NumericAttribute);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-/*	SQLError -> SQLDiagRec */
-RETCODE SQL_API SQLError(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
-                         SQLHSTMT StatementHandle, SQLCHAR *Sqlstate,
-                         SQLINTEGER *NativeError, SQLCHAR *MessageText,
-                         SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) {
-    RETCODE ret;
-    SQLSMALLINT RecNumber = 1;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-
-    if (StatementHandle) {
-        ret =
-            OPENSEARCHAPI_StmtError(StatementHandle, RecNumber, Sqlstate, NativeError,
-                           MessageText, BufferLength, TextLength, 0);
-    } else if (ConnectionHandle) {
-        ret = OPENSEARCHAPI_ConnectError(ConnectionHandle, RecNumber, Sqlstate,
-                                 NativeError, MessageText, BufferLength,
-                                 TextLength, 0);
-    } else if (EnvironmentHandle) {
-        ret = OPENSEARCHAPI_EnvError(EnvironmentHandle, RecNumber, Sqlstate, NativeError,
-                              MessageText, BufferLength, TextLength, 0);
-    } else {
-        ret = SQL_ERROR;
-    }
-
-    MYLOG(OPENSEARCH_TRACE, "leaving %d\n", ret);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
diff --git a/sql-odbc/src/sqlodbc/odbcapi30.c b/sql-odbc/src/sqlodbc/odbcapi30.c
deleted file mode 100644
index 83b249015d..0000000000
--- a/sql-odbc/src/sqlodbc/odbcapi30.c
+++ /dev/null
@@ -1,589 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "environ.h"
-#include "opensearch_odbc.h"
-#include "misc.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "statement.h"
-
-/*	SQLAllocConnect/SQLAllocEnv/SQLAllocStmt -> SQLAllocHandle */
-RETCODE SQL_API SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle,
-                               SQLHANDLE *OutputHandle) {
-    RETCODE ret;
-    ConnectionClass *conn;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    switch (HandleType) {
-        case SQL_HANDLE_ENV:
-            ret = OPENSEARCHAPI_AllocEnv(OutputHandle);
-            break;
-        case SQL_HANDLE_DBC:
-            ENTER_ENV_CS((EnvironmentClass *)InputHandle);
-            ret = OPENSEARCHAPI_AllocConnect(InputHandle, OutputHandle);
-            LEAVE_ENV_CS((EnvironmentClass *)InputHandle);
-            break;
-        case SQL_HANDLE_STMT:
-            conn = (ConnectionClass *)InputHandle;
-            ENTER_CONN_CS(conn);
-            ret = OPENSEARCHAPI_AllocStmt(
-                InputHandle, OutputHandle,
-                PODBC_EXTERNAL_STATEMENT | PODBC_INHERIT_CONNECT_OPTIONS);
-            if (*OutputHandle)
-                ((StatementClass *)(*OutputHandle))->external = 1;
-            LEAVE_CONN_CS(conn);
-            break;
-        case SQL_HANDLE_DESC:
-            conn = (ConnectionClass *)InputHandle;
-            ENTER_CONN_CS(conn);
-            ret = OPENSEARCHAPI_AllocDesc(InputHandle, OutputHandle);
-            LEAVE_CONN_CS(conn);
-            MYLOG(OPENSEARCH_DEBUG, "OutputHandle=%p\n", *OutputHandle);
-            break;
-        default:
-            ret = SQL_ERROR;
-            break;
-    }
-    return ret;
-}
-
-/*	SQLBindParameter/SQLSetParam -> SQLBindParam */
-RETCODE SQL_API SQLBindParam(HSTMT StatementHandle,
-                             SQLUSMALLINT ParameterNumber,
-                             SQLSMALLINT ValueType, SQLSMALLINT ParameterType,
-                             SQLULEN LengthPrecision,
-                             SQLSMALLINT ParameterScale, PTR ParameterValue,
-                             SQLLEN *StrLen_or_Ind) {
-    UNUSED(ParameterNumber, ValueType, ParameterType, LengthPrecision,
-           ParameterScale, ParameterValue, StrLen_or_Ind);
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    if (stmt == NULL)
-        return SQL_ERROR;
-    SC_clear_error(stmt);
-    SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                 "OpenSearch does not support parameters.", "SQLBindParam");
-    return SQL_ERROR;
-}
-
-/*	New function */
-RETCODE SQL_API SQLCloseCursor(HSTMT StatementHandle) {
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    if(stmt == NULL)
-        return SQL_ERROR;
-
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_FreeStmt(StatementHandle, SQL_CLOSE);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-#ifndef UNICODE_SUPPORTXX
-/*	SQLColAttributes -> SQLColAttribute */
-SQLRETURN SQL_API SQLColAttribute(SQLHSTMT StatementHandle,
-                                  SQLUSMALLINT ColumnNumber,
-                                  SQLUSMALLINT FieldIdentifier,
-                                  SQLPOINTER CharacterAttribute,
-                                  SQLSMALLINT BufferLength,
-                                  SQLSMALLINT *StringLength,
-#if defined(_WIN64) || defined(SQLCOLATTRIBUTE_SQLLEN)
-                                  SQLLEN *NumericAttribute
-#else
-                                  SQLPOINTER NumericAttribute
-#endif
-) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_ColAttributes(StatementHandle, ColumnNumber, FieldIdentifier,
-                              CharacterAttribute, BufferLength, StringLength,
-                              NumericAttribute);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-/*	new function */
-RETCODE SQL_API SQLCopyDesc(SQLHDESC SourceDescHandle,
-                            SQLHDESC TargetDescHandle) {
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ret = OPENSEARCHAPI_CopyDesc(SourceDescHandle, TargetDescHandle);
-    return ret;
-}
-
-/*	SQLTransact -> SQLEndTran */
-RETCODE SQL_API SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle,
-                           SQLSMALLINT CompletionType) {
-    UNUSED(CompletionType);
-    if (HandleType == SQL_HANDLE_STMT) {
-        StatementClass *stmt = (StatementClass *)Handle;
-        if (stmt == NULL)
-            return SQL_ERROR;
-        SC_clear_error(stmt);
-        SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                     "Transactions are not supported.", "SQLEndTran");
-    } else if (HandleType == SQL_HANDLE_DBC) {
-        ConnectionClass *conn = (ConnectionClass *)Handle;
-        if (conn == NULL)
-            return SQL_ERROR;
-        CC_clear_error(conn);
-        CC_set_error(conn, CONN_NOT_IMPLEMENTED_ERROR,
-                     "Transactions are not supported.", "SQLEndTran");
-    }
-    return SQL_ERROR;
-}
-
-/*	SQLExtendedFetch -> SQLFetchScroll */
-RETCODE SQL_API SQLFetchScroll(HSTMT StatementHandle,
-                               SQLSMALLINT FetchOrientation,
-                               SQLLEN FetchOffset) {
-    CSTR func = "SQLFetchScroll";
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    RETCODE ret = SQL_SUCCESS;
-    IRDFields *irdopts = SC_get_IRDF(stmt);
-    SQLUSMALLINT *rowStatusArray = irdopts->rowStatusArray;
-    SQLULEN *pcRow = irdopts->rowsFetched;
-    SQLLEN bkmarkoff = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering %d," FORMAT_LEN "\n", FetchOrientation,
-          FetchOffset);
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (FetchOrientation == SQL_FETCH_BOOKMARK) {
-        if (stmt->options.bookmark_ptr) {
-            bkmarkoff = FetchOffset;
-            FetchOffset = *((Int4 *)stmt->options.bookmark_ptr);
-            MYLOG(OPENSEARCH_DEBUG,
-                  "bookmark=" FORMAT_LEN " FetchOffset = " FORMAT_LEN "\n",
-                  FetchOffset, bkmarkoff);
-        } else {
-            SC_set_error(stmt, STMT_SEQUENCE_ERROR,
-                         "Bookmark isn't specifed yet", func);
-            ret = SQL_ERROR;
-        }
-    }
-    if (SQL_SUCCESS == ret) {
-        ARDFields *opts = SC_get_ARDF(stmt);
-
-        ret = OPENSEARCHAPI_ExtendedFetch(StatementHandle, FetchOrientation,
-                                  FetchOffset, pcRow, rowStatusArray, bkmarkoff,
-                                  opts->size_of_rowset);
-        stmt->transition_status = STMT_TRANSITION_FETCH_SCROLL;
-    }
-    LEAVE_STMT_CS(stmt);
-    if (ret != SQL_SUCCESS)
-        MYLOG(OPENSEARCH_TRACE, "leaving return = %d\n", ret);
-    return ret;
-}
-
-/*	SQLFree(Connect/Env/Stmt) -> SQLFreeHandle */
-RETCODE SQL_API SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle) {
-    RETCODE ret;
-    StatementClass *stmt;
-    ConnectionClass *conn = NULL;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-
-    switch (HandleType) {
-        case SQL_HANDLE_ENV:
-            ret = OPENSEARCHAPI_FreeEnv(Handle);
-            break;
-        case SQL_HANDLE_DBC:
-            ret = OPENSEARCHAPI_FreeConnect(Handle);
-            break;
-        case SQL_HANDLE_STMT:
-            stmt = (StatementClass *)Handle;
-
-            if (stmt) {
-                conn = stmt->hdbc;
-                if (conn)
-                    ENTER_CONN_CS(conn);
-            }
-
-            ret = OPENSEARCHAPI_FreeStmt(Handle, SQL_DROP);
-
-            if (conn)
-                LEAVE_CONN_CS(conn);
-
-            break;
-        case SQL_HANDLE_DESC:
-            ret = OPENSEARCHAPI_FreeDesc(Handle);
-            break;
-        default:
-            ret = SQL_ERROR;
-            break;
-    }
-    return ret;
-}
-
-#ifndef UNICODE_SUPPORTXX
-/*	new function */
-RETCODE SQL_API SQLGetDescField(SQLHDESC DescriptorHandle,
-                                SQLSMALLINT RecNumber,
-                                SQLSMALLINT FieldIdentifier, PTR Value,
-                                SQLINTEGER BufferLength,
-                                SQLINTEGER *StringLength) {
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ret = OPENSEARCHAPI_GetDescField(DescriptorHandle, RecNumber, FieldIdentifier,
-                             Value, BufferLength, StringLength);
-    return ret;
-}
-
-/*	new function */
-RETCODE SQL_API SQLGetDescRec(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber,
-                              SQLCHAR *Name, SQLSMALLINT BufferLength,
-                              SQLSMALLINT *StringLength, SQLSMALLINT *Type,
-                              SQLSMALLINT *SubType, SQLLEN *Length,
-                              SQLSMALLINT *Precision, SQLSMALLINT *Scale,
-                              SQLSMALLINT *Nullable) {
-    UNUSED(DescriptorHandle, RecNumber, Name, BufferLength, StringLength, Type,
-           SubType, Length, Precision, Scale, Nullable);
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    MYLOG(OPENSEARCH_DEBUG, "Error not implemented\n");
-    return SQL_ERROR;
-}
-
-/*	new function */
-RETCODE SQL_API SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
-                                SQLSMALLINT RecNumber,
-                                SQLSMALLINT DiagIdentifier, PTR DiagInfo,
-                                SQLSMALLINT BufferLength,
-                                SQLSMALLINT *StringLength) {
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering Handle=(%u,%p) Rec=%d Id=%d info=(%p,%d)\n",
-          HandleType, Handle, RecNumber, DiagIdentifier, DiagInfo,
-          BufferLength);
-    ret = OPENSEARCHAPI_GetDiagField(HandleType, Handle, RecNumber, DiagIdentifier,
-                             DiagInfo, BufferLength, StringLength);
-    return ret;
-}
-
-/*	SQLError -> SQLDiagRec */
-RETCODE SQL_API SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle,
-                              SQLSMALLINT RecNumber, SQLCHAR *Sqlstate,
-                              SQLINTEGER *NativeError, SQLCHAR *MessageText,
-                              SQLSMALLINT BufferLength,
-                              SQLSMALLINT *TextLength) {
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ret = OPENSEARCHAPI_GetDiagRec(HandleType, Handle, RecNumber, Sqlstate, NativeError,
-                           MessageText, BufferLength, TextLength);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-/*	new function */
-RETCODE SQL_API SQLGetEnvAttr(HENV EnvironmentHandle, SQLINTEGER Attribute,
-                              PTR Value, SQLINTEGER BufferLength,
-                              SQLINTEGER *StringLength) {
-    UNUSED(BufferLength, StringLength);
-    RETCODE ret;
-    EnvironmentClass *env = (EnvironmentClass *)EnvironmentHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering " FORMAT_INTEGER "\n", Attribute);
-    ENTER_ENV_CS(env);
-    ret = SQL_SUCCESS;
-    switch (Attribute) {
-        case SQL_ATTR_CONNECTION_POOLING:
-            *((unsigned int *)Value) =
-                EN_is_pooling(env) ? SQL_CP_ONE_PER_DRIVER : SQL_CP_OFF;
-            break;
-        case SQL_ATTR_CP_MATCH:
-            *((unsigned int *)Value) = SQL_CP_RELAXED_MATCH;
-            break;
-        case SQL_ATTR_ODBC_VERSION:
-            *((unsigned int *)Value) =
-                EN_is_odbc2(env) ? SQL_OV_ODBC2 : SQL_OV_ODBC3;
-            break;
-        case SQL_ATTR_OUTPUT_NTS:
-            *((unsigned int *)Value) = SQL_TRUE;
-            break;
-        default:
-            env->errornumber = CONN_INVALID_ARGUMENT_NO;
-            ret = SQL_ERROR;
-    }
-    LEAVE_ENV_CS(env);
-    return ret;
-}
-
-#ifndef UNICODE_SUPPORTXX
-/*	SQLGetConnectOption -> SQLGetconnectAttr */
-RETCODE SQL_API SQLGetConnectAttr(HDBC ConnectionHandle, SQLINTEGER Attribute,
-                                  PTR Value, SQLINTEGER BufferLength,
-                                  SQLINTEGER *StringLength) {
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering " FORMAT_UINTEGER "\n", Attribute);
-    ENTER_CONN_CS((ConnectionClass *)ConnectionHandle);
-    CC_clear_error((ConnectionClass *)ConnectionHandle);
-    ret = OPENSEARCHAPI_GetConnectAttr(ConnectionHandle, Attribute, Value, BufferLength,
-                               StringLength);
-    LEAVE_CONN_CS((ConnectionClass *)ConnectionHandle);
-    return ret;
-}
-
-/*	SQLGetStmtOption -> SQLGetStmtAttr */
-RETCODE SQL_API SQLGetStmtAttr(HSTMT StatementHandle, SQLINTEGER Attribute,
-                               PTR Value, SQLINTEGER BufferLength,
-                               SQLINTEGER *StringLength) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering Handle=%p " FORMAT_INTEGER "\n", StatementHandle,
-          Attribute);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_GetStmtAttr(StatementHandle, Attribute, Value, BufferLength,
-                            StringLength);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-/*	SQLSetConnectOption -> SQLSetConnectAttr */
-RETCODE SQL_API SQLSetConnectAttr(HDBC ConnectionHandle, SQLINTEGER Attribute,
-                                  PTR Value, SQLINTEGER StringLength) {
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering " FORMAT_INTEGER "\n", Attribute);
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    ret =
-        OPENSEARCHAPI_SetConnectAttr(ConnectionHandle, Attribute, Value, StringLength);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-
-/*	new function */
-RETCODE SQL_API SQLSetDescField(SQLHDESC DescriptorHandle,
-                                SQLSMALLINT RecNumber,
-                                SQLSMALLINT FieldIdentifier, PTR Value,
-                                SQLINTEGER BufferLength) {
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering h=%p rec=%d field=%d val=%p\n", DescriptorHandle,
-          RecNumber, FieldIdentifier, Value);
-    ret = OPENSEARCHAPI_SetDescField(DescriptorHandle, RecNumber, FieldIdentifier,
-                             Value, BufferLength);
-    return ret;
-}
-
-/*	new fucntion */
-RETCODE SQL_API SQLSetDescRec(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber,
-                              SQLSMALLINT Type, SQLSMALLINT SubType,
-                              SQLLEN Length, SQLSMALLINT Precision,
-                              SQLSMALLINT Scale, PTR Data, SQLLEN *StringLength,
-                              SQLLEN *Indicator) {
-    UNUSED(DescriptorHandle, RecNumber, Type, SubType, Length, Precision, Scale,
-           Data, StringLength, Indicator);
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    MYLOG(OPENSEARCH_DEBUG, "Error not implemented\n");
-    return SQL_ERROR;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-/*	new function */
-RETCODE SQL_API SQLSetEnvAttr(HENV EnvironmentHandle, SQLINTEGER Attribute,
-                              PTR Value, SQLINTEGER StringLength) {
-    UNUSED(StringLength);
-    RETCODE ret;
-    EnvironmentClass *env = (EnvironmentClass *)EnvironmentHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering att=" FORMAT_INTEGER "," FORMAT_ULEN "\n",
-          Attribute, (SQLULEN)Value);
-    ENTER_ENV_CS(env);
-    switch (Attribute) {
-        case SQL_ATTR_CONNECTION_POOLING:
-            switch ((ULONG_PTR)Value) {
-                case SQL_CP_OFF:
-                    EN_unset_pooling(env);
-                    ret = SQL_SUCCESS;
-                    break;
-                case SQL_CP_ONE_PER_DRIVER:
-                    EN_set_pooling(env);
-                    ret = SQL_SUCCESS;
-                    break;
-                default:
-                    ret = SQL_SUCCESS_WITH_INFO;
-            }
-            break;
-        case SQL_ATTR_CP_MATCH:
-            /* *((unsigned int *) Value) = SQL_CP_RELAXED_MATCH; */
-            ret = SQL_SUCCESS;
-            break;
-        case SQL_ATTR_ODBC_VERSION:
-            if (SQL_OV_ODBC2 == CAST_UPTR(SQLUINTEGER, Value))
-                EN_set_odbc2(env);
-            else
-                EN_set_odbc3(env);
-            ret = SQL_SUCCESS;
-            break;
-        case SQL_ATTR_OUTPUT_NTS:
-            if (SQL_TRUE == CAST_UPTR(SQLUINTEGER, Value))
-                ret = SQL_SUCCESS;
-            else
-                ret = SQL_SUCCESS_WITH_INFO;
-            break;
-        default:
-            env->errornumber = CONN_INVALID_ARGUMENT_NO;
-            ret = SQL_ERROR;
-    }
-    if (SQL_SUCCESS_WITH_INFO == ret) {
-        env->errornumber = CONN_OPTION_VALUE_CHANGED;
-        env->errormsg = "SetEnv changed to ";
-    }
-    LEAVE_ENV_CS(env);
-    return ret;
-}
-
-#ifndef UNICODE_SUPPORTXX
-/*	SQLSet(Param/Scroll/Stmt)Option -> SQLSetStmtAttr */
-RETCODE SQL_API SQLSetStmtAttr(HSTMT StatementHandle, SQLINTEGER Attribute,
-                               PTR Value, SQLINTEGER StringLength) {
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering Handle=%p " FORMAT_INTEGER "," FORMAT_ULEN "\n",
-          StatementHandle, Attribute, (SQLULEN)Value);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_SetStmtAttr(StatementHandle, Attribute, Value, StringLength);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-#endif /* UNICODE_SUPPORTXX */
-
-#define SQL_FUNC_ESET(pfExists, uwAPI) \
-    (*(((UWORD *)(pfExists)) + ((uwAPI) >> 4)) |= (1 << ((uwAPI)&0x000F)))
-RETCODE SQL_API OPENSEARCHAPI_GetFunctions30(HDBC hdbc, SQLUSMALLINT fFunction,
-                                     SQLUSMALLINT FAR *pfExists) {
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-    CC_clear_error(conn);
-    if (fFunction != SQL_API_ODBC3_ALL_FUNCTIONS)
-        return SQL_ERROR;
-    memset(pfExists, 0, sizeof(UWORD) * SQL_API_ODBC3_ALL_FUNCTIONS_SIZE);
-
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLALLOCCONNECT); 1 deprecated */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLALLOCENV); 2 deprecated */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLALLOCSTMT); 3 deprecated */
-
-    /*
-     * for (i = SQL_API_SQLBINDCOL; i <= 23; i++) SQL_FUNC_ESET(pfExists,
-     * i);
-     */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLBINDCOL);      /* 4 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLCANCEL);       /* 5 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLCOLATTRIBUTE); /* 6 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLCONNECT);      /* 7 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLDESCRIBECOL);  /* 8 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLDISCONNECT);   /* 9 */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLERROR);  10 deprecated */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLEXECDIRECT); /* 11 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLEXECUTE);    /* 12 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLFETCH);      /* 13 */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLFREECONNECT); 14 deprecated */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLFREEENV); 15 deprecated */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLFREESTMT);      /* 16 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLGETCURSORNAME); /* 17 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLNUMRESULTCOLS); /* 18 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLPREPARE);       /* 19 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLROWCOUNT);      /* 20 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLSETCURSORNAME); /* 21 */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLSETPARAM); 22 deprecated */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLTRANSACT); 23 deprecated */
-
-    /*
-     * for (i = 40; i < SQL_API_SQLEXTENDEDFETCH; i++)
-     * SQL_FUNC_ESET(pfExists, i);
-     */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLCOLUMNS);       /* 40 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLDRIVERCONNECT); /* 41 */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLGETCONNECTOPTION); 42 deprecated */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLGETDATA);      /* 43 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLGETFUNCTIONS); /* 44 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLGETINFO);      /* 45 */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLGETSTMTOPTION); 46 deprecated */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLGETTYPEINFO); /* 47 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLPARAMDATA);   /* 48 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLPUTDATA);     /* 49 */
-
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLSETCONNECTIONOPTION); 50 deprecated */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLSETSTMTOPTION); 51 deprecated */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLSPECIALCOLUMNS); /* 52 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLSTATISTICS);     /* 53 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLTABLES);         /* 54 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLDATASOURCES);    /* 57 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLDESCRIBEPARAM);  /* 58 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLEXTENDEDFETCH);  /* 59 deprecated ? */
-
-    /*
-     * for (++i; i < SQL_API_SQLBINDPARAMETER; i++)
-     * SQL_FUNC_ESET(pfExists, i);
-     */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLFOREIGNKEYS); /* 60 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLMORERESULTS); /* 61 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLNATIVESQL);   /* 62 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLNUMPARAMS);   /* 63 */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLPARAMOPTIONS); 64 deprecated */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLPRIMARYKEYS);      /* 65 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLPROCEDURECOLUMNS); /* 66 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLPROCEDURES);       /* 67 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLSETPOS);           /* 68 */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLSETSCROLLOPTIONS); 69 deprecated */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLTABLEPRIVILEGES); /* 70 */
-    /* SQL_FUNC_ESET(pfExists, SQL_API_SQLDRIVERS); */   /* 71 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLBINDPARAMETER);   /* 72 */
-
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLALLOCHANDLE);    /* 1001 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLBINDPARAM);      /* 1002 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLCLOSECURSOR);    /* 1003 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLCOPYDESC);       /* 1004 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLENDTRAN);        /* 1005 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLFREEHANDLE);     /* 1006 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLGETCONNECTATTR); /* 1007 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLGETDESCFIELD);   /* 1008 */
-    SQL_FUNC_ESET(pfExists,
-                  SQL_API_SQLGETDIAGFIELD); /* 1010 minimal implementation */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLGETDIAGREC);     /* 1011 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLGETENVATTR);     /* 1012 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLGETSTMTATTR);    /* 1014 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLSETCONNECTATTR); /* 1016 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLSETDESCFIELD);   /* 1017 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLSETENVATTR);     /* 1019 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLSETSTMTATTR);    /* 1020 */
-    SQL_FUNC_ESET(pfExists, SQL_API_SQLFETCHSCROLL);    /* 1021 */
-    return SQL_SUCCESS;
-}
-
-RETCODE SQL_API SQLBulkOperations(HSTMT hstmt, SQLSMALLINT operation) {
-    UNUSED(operation);
-    StatementClass *stmt = (StatementClass *)hstmt;
-    if (stmt == NULL)
-        return SQL_ERROR;
-    SC_clear_error(stmt);
-    SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                 "Bulk operations are not supported.", "SQLBulkOperations");
-    return SQL_ERROR;
-}
diff --git a/sql-odbc/src/sqlodbc/odbcapi30w.c b/sql-odbc/src/sqlodbc/odbcapi30w.c
deleted file mode 100644
index dd8cf0d3a0..0000000000
--- a/sql-odbc/src/sqlodbc/odbcapi30w.c
+++ /dev/null
@@ -1,387 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "opensearch_odbc.h"
-#include "misc.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "statement.h"
-#include "unicode_support.h"
-
-RETCODE SQL_API SQLGetStmtAttrW(SQLHSTMT hstmt, SQLINTEGER fAttribute,
-                                PTR rgbValue, SQLINTEGER cbValueMax,
-                                SQLINTEGER *pcbValue) {
-    UNUSED(hstmt, fAttribute, rgbValue, cbValueMax, pcbValue);
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_STMT_CS((StatementClass *)hstmt);
-    SC_clear_error((StatementClass *)hstmt);
-    ret = OPENSEARCHAPI_GetStmtAttr(hstmt, fAttribute, rgbValue, cbValueMax, pcbValue);
-    LEAVE_STMT_CS((StatementClass *)hstmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLSetStmtAttrW(SQLHSTMT hstmt, SQLINTEGER fAttribute,
-                                PTR rgbValue, SQLINTEGER cbValueMax) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)hstmt;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_SetStmtAttr(hstmt, fAttribute, rgbValue, cbValueMax);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-RETCODE SQL_API SQLGetConnectAttrW(HDBC hdbc, SQLINTEGER fAttribute,
-                                   PTR rgbValue, SQLINTEGER cbValueMax,
-                                   SQLINTEGER *pcbValue) {
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_CONN_CS((ConnectionClass *)hdbc);
-    CC_clear_error((ConnectionClass *)hdbc);
-    ret =
-        OPENSEARCHAPI_GetConnectAttr(hdbc, fAttribute, rgbValue, cbValueMax, pcbValue);
-    LEAVE_CONN_CS((ConnectionClass *)hdbc);
-    return ret;
-}
-
-RETCODE SQL_API SQLSetConnectAttrW(HDBC hdbc, SQLINTEGER fAttribute,
-                                   PTR rgbValue, SQLINTEGER cbValue) {
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    CC_set_in_unicode_driver(conn);
-    ret = OPENSEARCHAPI_SetConnectAttr(hdbc, fAttribute, rgbValue, cbValue);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-
-/*      new function */
-RETCODE SQL_API SQLSetDescFieldW(SQLHDESC DescriptorHandle,
-                                 SQLSMALLINT RecNumber,
-                                 SQLSMALLINT FieldIdentifier, PTR Value,
-                                 SQLINTEGER BufferLength) {
-    RETCODE ret;
-    SQLLEN vallen;
-    char *uval = NULL;
-    BOOL val_alloced = FALSE;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (BufferLength > 0 || SQL_NTS == BufferLength) {
-        switch (FieldIdentifier) {
-            case SQL_DESC_BASE_COLUMN_NAME:
-            case SQL_DESC_BASE_TABLE_NAME:
-            case SQL_DESC_CATALOG_NAME:
-            case SQL_DESC_LABEL:
-            case SQL_DESC_LITERAL_PREFIX:
-            case SQL_DESC_LITERAL_SUFFIX:
-            case SQL_DESC_LOCAL_TYPE_NAME:
-            case SQL_DESC_NAME:
-            case SQL_DESC_SCHEMA_NAME:
-            case SQL_DESC_TABLE_NAME:
-            case SQL_DESC_TYPE_NAME:
-                uval = ucs2_to_utf8(
-                    Value,
-                    BufferLength > 0 ? BufferLength / WCLEN : BufferLength,
-                    &vallen, FALSE);
-                val_alloced = TRUE;
-                break;
-            default:
-                vallen = BufferLength;
-                uval = Value;
-                break;
-        }
-    } else {
-        vallen = BufferLength;
-        uval = Value;
-    }
-    ret = OPENSEARCHAPI_SetDescField(DescriptorHandle, RecNumber, FieldIdentifier, uval,
-                             (SQLINTEGER)vallen);
-    if (val_alloced)
-        free(uval);
-    return ret;
-}
-
-RETCODE SQL_API SQLGetDescFieldW(SQLHDESC hdesc, SQLSMALLINT iRecord,
-                                 SQLSMALLINT iField, PTR rgbValue,
-                                 SQLINTEGER cbValueMax, SQLINTEGER *pcbValue) {
-    RETCODE ret;
-    SQLINTEGER blen = 0, bMax, *pcbV;
-    char *rgbV = NULL, *rgbVt;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    switch (iField) {
-        case SQL_DESC_BASE_COLUMN_NAME:
-        case SQL_DESC_BASE_TABLE_NAME:
-        case SQL_DESC_CATALOG_NAME:
-        case SQL_DESC_LABEL:
-        case SQL_DESC_LITERAL_PREFIX:
-        case SQL_DESC_LITERAL_SUFFIX:
-        case SQL_DESC_LOCAL_TYPE_NAME:
-        case SQL_DESC_NAME:
-        case SQL_DESC_SCHEMA_NAME:
-        case SQL_DESC_TABLE_NAME:
-        case SQL_DESC_TYPE_NAME:
-            bMax = cbValueMax * 3 / WCLEN;
-            rgbV = malloc(bMax + 1);
-            pcbV = &blen;
-            for (rgbVt = rgbV;; bMax = blen + 1, rgbVt = realloc(rgbV, bMax)) {
-                if (!rgbVt) {
-                    ret = SQL_ERROR;
-                    break;
-                }
-                rgbV = rgbVt;
-                ret = OPENSEARCHAPI_GetDescField(hdesc, iRecord, iField, rgbV, bMax,
-                                         pcbV);
-                if (SQL_SUCCESS_WITH_INFO != ret || blen < bMax)
-                    break;
-            }
-            if (SQL_SUCCEEDED(ret)) {
-                blen = (SQLINTEGER)utf8_to_ucs2(
-                    rgbV, blen, (SQLWCHAR *)rgbValue, cbValueMax / WCLEN);
-                if (SQL_SUCCESS == ret
-                    && blen * WCLEN >= (unsigned long)cbValueMax) {
-                    ret = SQL_SUCCESS_WITH_INFO;
-                    DC_set_error(hdesc, STMT_TRUNCATED,
-                                 "The buffer was too small for the rgbDesc.");
-                }
-                if (pcbValue)
-                    *pcbValue = blen * WCLEN;
-            }
-            if (rgbV)
-                free(rgbV);
-            break;
-        default:
-            rgbV = rgbValue;
-            bMax = cbValueMax;
-            pcbV = pcbValue;
-            ret = OPENSEARCHAPI_GetDescField(hdesc, iRecord, iField, rgbV, bMax, pcbV);
-            break;
-    }
-
-    return ret;
-}
-
-RETCODE SQL_API SQLGetDiagRecW(SQLSMALLINT fHandleType, SQLHANDLE handle,
-                               SQLSMALLINT iRecord, SQLWCHAR *szSqlState,
-                               SQLINTEGER *pfNativeError, SQLWCHAR *szErrorMsg,
-                               SQLSMALLINT cbErrorMsgMax,
-                               SQLSMALLINT *pcbErrorMsg) {
-    RETCODE ret;
-    SQLSMALLINT buflen, tlen;
-    char qstr_ansi[8], *mtxt = NULL;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    buflen = 0;
-    if (szErrorMsg && cbErrorMsgMax > 0) {
-        buflen = cbErrorMsgMax;
-        mtxt = malloc(buflen);
-    }
-    ret = OPENSEARCHAPI_GetDiagRec(fHandleType, handle, iRecord, (SQLCHAR *)qstr_ansi,
-                           pfNativeError, (SQLCHAR *)mtxt, buflen, &tlen);
-    if (SQL_SUCCEEDED(ret)) {
-        if (szSqlState)
-            utf8_to_ucs2(qstr_ansi, -1, szSqlState, 6);
-        if (mtxt && tlen <= cbErrorMsgMax) {
-            SQLULEN ulen = utf8_to_ucs2_lf(mtxt, tlen, FALSE, szErrorMsg,
-                                           cbErrorMsgMax, TRUE);
-            if (ulen == (SQLULEN)-1)
-                tlen = (SQLSMALLINT)locale_to_sqlwchar(
-                    (SQLWCHAR *)szErrorMsg, mtxt, cbErrorMsgMax, FALSE);
-            else
-                tlen = (SQLSMALLINT)ulen;
-            if (tlen >= cbErrorMsgMax)
-                ret = SQL_SUCCESS_WITH_INFO;
-            else if (tlen < 0) {
-                char errc[32];
-
-                SPRINTF_FIXED(errc, "Error: SqlState=%s", qstr_ansi);
-                tlen = (SQLSMALLINT)utf8_to_ucs2(errc, -1, szErrorMsg,
-                                                 cbErrorMsgMax);
-            }
-        }
-        if (pcbErrorMsg)
-            *pcbErrorMsg = tlen;
-    }
-    if (mtxt)
-        free(mtxt);
-    return ret;
-}
-
-SQLRETURN SQL_API SQLColAttributeW(SQLHSTMT hstmt, SQLUSMALLINT iCol,
-                                   SQLUSMALLINT iField, SQLPOINTER pCharAttr,
-                                   SQLSMALLINT cbCharAttrMax,
-                                   SQLSMALLINT *pcbCharAttr,
-#if defined(_WIN64) || defined(SQLCOLATTRIBUTE_SQLLEN)
-                                   SQLLEN *pNumAttr
-#else
-                                   SQLPOINTER pNumAttr
-#endif
-) {
-    CSTR func = "SQLColAttributeW";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    SQLSMALLINT *rgbL, blen = 0, bMax;
-    char *rgbD = NULL, *rgbDt;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    switch (iField) {
-        case SQL_DESC_BASE_COLUMN_NAME:
-        case SQL_DESC_BASE_TABLE_NAME:
-        case SQL_DESC_CATALOG_NAME:
-        case SQL_DESC_LABEL:
-        case SQL_DESC_LITERAL_PREFIX:
-        case SQL_DESC_LITERAL_SUFFIX:
-        case SQL_DESC_LOCAL_TYPE_NAME:
-        case SQL_DESC_NAME:
-        case SQL_DESC_SCHEMA_NAME:
-        case SQL_DESC_TABLE_NAME:
-        case SQL_DESC_TYPE_NAME:
-        case SQL_COLUMN_NAME:
-            bMax = cbCharAttrMax * 3 / WCLEN;
-            rgbD = malloc(bMax);
-            rgbL = &blen;
-            for (rgbDt = rgbD;; bMax = blen + 1, rgbDt = realloc(rgbD, bMax)) {
-                if (!rgbDt) {
-                    ret = SQL_ERROR;
-                    break;
-                }
-                rgbD = rgbDt;
-                ret = OPENSEARCHAPI_ColAttributes(hstmt, iCol, iField, rgbD, bMax, rgbL,
-                                          pNumAttr);
-                if (SQL_SUCCESS_WITH_INFO != ret || blen < bMax)
-                    break;
-            }
-            if (SQL_SUCCEEDED(ret)) {
-                blen = (SQLSMALLINT)utf8_to_ucs2(
-                    rgbD, blen, (SQLWCHAR *)pCharAttr, cbCharAttrMax / WCLEN);
-                if (SQL_SUCCESS == ret
-                    && blen * WCLEN >= (unsigned long)cbCharAttrMax) {
-                    ret = SQL_SUCCESS_WITH_INFO;
-                    SC_set_error(stmt, STMT_TRUNCATED,
-                                 "The buffer was too small for the pCharAttr.",
-                                 func);
-                }
-                if (pcbCharAttr)
-                    *pcbCharAttr = blen * WCLEN;
-            }
-            if (rgbD)
-                free(rgbD);
-            break;
-        default:
-            rgbD = pCharAttr;
-            bMax = cbCharAttrMax;
-            rgbL = pcbCharAttr;
-            ret = OPENSEARCHAPI_ColAttributes(hstmt, iCol, iField, rgbD, bMax, rgbL,
-                                      pNumAttr);
-            break;
-    }
-    LEAVE_STMT_CS(stmt);
-
-    return ret;
-}
-
-RETCODE SQL_API SQLGetDiagFieldW(SQLSMALLINT fHandleType, SQLHANDLE handle,
-                                 SQLSMALLINT iRecord, SQLSMALLINT fDiagField,
-                                 SQLPOINTER rgbDiagInfo,
-                                 SQLSMALLINT cbDiagInfoMax,
-                                 SQLSMALLINT *pcbDiagInfo) {
-    RETCODE ret;
-    SQLSMALLINT *rgbL, blen = 0, bMax;
-    char *rgbD = NULL, *rgbDt;
-
-    MYLOG(OPENSEARCH_TRACE, "entering Handle=(%u,%p) Rec=%d Id=%d info=(%p,%d)\n", fHandleType,
-          handle, iRecord, fDiagField, rgbDiagInfo, cbDiagInfoMax);
-    switch (fDiagField) {
-        case SQL_DIAG_DYNAMIC_FUNCTION:
-        case SQL_DIAG_CLASS_ORIGIN:
-        case SQL_DIAG_CONNECTION_NAME:
-        case SQL_DIAG_MESSAGE_TEXT:
-        case SQL_DIAG_SERVER_NAME:
-        case SQL_DIAG_SQLSTATE:
-        case SQL_DIAG_SUBCLASS_ORIGIN:
-            bMax = cbDiagInfoMax * 3 / WCLEN + 1;
-            if (rgbD = malloc(bMax), !rgbD)
-                return SQL_ERROR;
-            rgbL = &blen;
-            for (rgbDt = rgbD;; bMax = blen + 1, rgbDt = realloc(rgbD, bMax)) {
-                if (!rgbDt) {
-                    free(rgbD);
-                    return SQL_ERROR;
-                }
-                rgbD = rgbDt;
-                ret = OPENSEARCHAPI_GetDiagField(fHandleType, handle, iRecord,
-                                         fDiagField, rgbD, bMax, rgbL);
-                if (SQL_SUCCESS_WITH_INFO != ret || blen < bMax)
-                    break;
-            }
-            if (SQL_SUCCEEDED(ret)) {
-                SQLULEN ulen = (SQLSMALLINT)utf8_to_ucs2_lf(
-                    rgbD, blen, FALSE, (SQLWCHAR *)rgbDiagInfo,
-                    cbDiagInfoMax / WCLEN, TRUE);
-                if (ulen == (SQLULEN)-1)
-                    blen = (SQLSMALLINT)locale_to_sqlwchar(
-                        (SQLWCHAR *)rgbDiagInfo, rgbD, cbDiagInfoMax / WCLEN,
-                        FALSE);
-                else
-                    blen = (SQLSMALLINT)ulen;
-                if (SQL_SUCCESS == ret
-                    && blen * WCLEN >= (unsigned long)cbDiagInfoMax)
-                    ret = SQL_SUCCESS_WITH_INFO;
-                if (pcbDiagInfo) {
-                    *pcbDiagInfo = blen * WCLEN;
-                }
-            }
-            if (rgbD)
-                free(rgbD);
-            break;
-        default:
-            rgbD = rgbDiagInfo;
-            bMax = cbDiagInfoMax;
-            rgbL = pcbDiagInfo;
-            ret = OPENSEARCHAPI_GetDiagField(fHandleType, handle, iRecord, fDiagField,
-                                     rgbD, bMax, rgbL);
-            break;
-    }
-
-    return ret;
-}
-
-/*	new function */
-RETCODE SQL_API SQLGetDescRecW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber,
-                               SQLWCHAR *Name, SQLSMALLINT BufferLength,
-                               SQLSMALLINT *StringLength, SQLSMALLINT *Type,
-                               SQLSMALLINT *SubType, SQLLEN *Length,
-                               SQLSMALLINT *Precision, SQLSMALLINT *Scale,
-                               SQLSMALLINT *Nullable) {
-    UNUSED(DescriptorHandle, RecNumber, Name, BufferLength, StringLength, Type,
-           SubType, Length, Precision, Scale, Nullable);
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    MYLOG(OPENSEARCH_DEBUG, "Error not implemented\n");
-    return SQL_ERROR;
-}
-
-/*	new fucntion */
-RETCODE SQL_API SQLSetDescRecW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber,
-                               SQLSMALLINT Type, SQLSMALLINT SubType,
-                               SQLLEN Length, SQLSMALLINT Precision,
-                               SQLSMALLINT Scale, PTR Data,
-                               SQLLEN *StringLength, SQLLEN *Indicator) {
-    UNUSED(DescriptorHandle, RecNumber, Type, SubType, Length, Precision, Scale,
-           Data, StringLength, Indicator);
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    MYLOG(OPENSEARCH_DEBUG, "Error not implemented\n");
-    return SQL_ERROR;
-}
diff --git a/sql-odbc/src/sqlodbc/odbcapiw.c b/sql-odbc/src/sqlodbc/odbcapiw.c
deleted file mode 100644
index 7577e0577c..0000000000
--- a/sql-odbc/src/sqlodbc/odbcapiw.c
+++ /dev/null
@@ -1,1031 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "opensearch_odbc.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "opensearch_driver_connect.h"
-#include "opensearch_info.h"
-#include "statement.h"
-#include "unicode_support.h"
-
-RETCODE SQL_API SQLColumnsW(HSTMT StatementHandle, SQLWCHAR *CatalogName,
-                            SQLSMALLINT NameLength1, SQLWCHAR *SchemaName,
-                            SQLSMALLINT NameLength2, SQLWCHAR *TableName,
-                            SQLSMALLINT NameLength3, SQLWCHAR *ColumnName,
-                            SQLSMALLINT NameLength4) {
-    CSTR func = "SQLColumnsW";
-    RETCODE ret;
-    char *ctName, *scName, *tbName, *clName;
-    SQLLEN nmlen1, nmlen2, nmlen3, nmlen4;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    BOOL lower_id;
-    UWORD flag = PODBC_SEARCH_PUBLIC_SCHEMA;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    lower_id = DEFAULT_LOWERCASEIDENTIFIER;
-    ctName = ucs2_to_utf8(CatalogName, NameLength1, &nmlen1, lower_id);
-    scName = ucs2_to_utf8(SchemaName, NameLength2, &nmlen2, lower_id);
-    tbName = ucs2_to_utf8(TableName, NameLength3, &nmlen3, lower_id);
-    clName = ucs2_to_utf8(ColumnName, NameLength4, &nmlen4, lower_id);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_Columns(StatementHandle, (SQLCHAR *)ctName,
-                            (SQLSMALLINT)nmlen1, (SQLCHAR *)scName,
-                            (SQLSMALLINT)nmlen2, (SQLCHAR *)tbName,
-                            (SQLSMALLINT)nmlen3, (SQLCHAR *)clName,
-                            (SQLSMALLINT)nmlen4, flag, 0, 0);
-    LEAVE_STMT_CS(stmt);
-    if (ctName)
-        free(ctName);
-    if (scName)
-        free(scName);
-    if (tbName)
-        free(tbName);
-    if (clName)
-        free(clName);
-    return ret;
-}
-
-RETCODE SQL_API SQLConnectW(HDBC ConnectionHandle, SQLWCHAR *ServerName,
-                            SQLSMALLINT NameLength1, SQLWCHAR *UserName,
-                            SQLSMALLINT NameLength2, SQLWCHAR *Authentication,
-                            SQLSMALLINT NameLength3) {
-    char *svName, *usName, *auth;
-    SQLLEN nmlen1, nmlen2, nmlen3;
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    CC_set_in_unicode_driver(conn);
-    svName = ucs2_to_utf8(ServerName, NameLength1, &nmlen1, FALSE);
-    usName = ucs2_to_utf8(UserName, NameLength2, &nmlen2, FALSE);
-    auth = ucs2_to_utf8(Authentication, NameLength3, &nmlen3, FALSE);
-    ret =
-        OPENSEARCHAPI_Connect(ConnectionHandle, (SQLCHAR *)svName, (SQLSMALLINT)nmlen1,
-                      (SQLCHAR *)usName, (SQLSMALLINT)nmlen2, (SQLCHAR *)auth,
-                      (SQLSMALLINT)nmlen3);
-    LEAVE_CONN_CS(conn);
-    if (svName)
-        free(svName);
-    if (usName)
-        free(usName);
-    if (auth)
-        free(auth);
-    return ret;
-}
-
-RETCODE SQL_API SQLDriverConnectW(HDBC hdbc, HWND hwnd, SQLWCHAR *szConnStrIn,
-                                  SQLSMALLINT cbConnStrIn,
-                                  SQLWCHAR *szConnStrOut,
-                                  SQLSMALLINT cbConnStrOutMax,
-                                  SQLSMALLINT *pcbConnStrOut,
-                                  SQLUSMALLINT fDriverCompletion) {
-    CSTR func = "SQLDriverConnectW";
-    char *szIn, *szOut = NULL;
-    SQLSMALLINT maxlen, obuflen = 0;
-    SQLLEN inlen;
-    SQLSMALLINT olen, *pCSO;
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    CC_set_in_unicode_driver(conn);
-    szIn = ucs2_to_utf8(szConnStrIn, cbConnStrIn, &inlen, FALSE);
-    maxlen = cbConnStrOutMax;
-    pCSO = NULL;
-    olen = 0;
-    if (maxlen > 0) {
-        obuflen = maxlen + 1;
-        szOut = malloc(obuflen);
-        if (!szOut) {
-            CC_set_error(conn, CONN_NO_MEMORY_ERROR,
-                         "Could not allocate memory for output buffer", func);
-            ret = SQL_ERROR;
-            goto cleanup;
-        }
-        pCSO = &olen;
-    } else if (pcbConnStrOut)
-        pCSO = &olen;
-    ret =
-        OPENSEARCHAPI_DriverConnect(hdbc, hwnd, (SQLCHAR *)szIn, (SQLSMALLINT)inlen,
-                            (SQLCHAR *)szOut, maxlen, pCSO, fDriverCompletion);
-    if (ret != SQL_ERROR && NULL != pCSO) {
-        SQLLEN outlen = olen;
-
-        if (olen < obuflen)
-            outlen = utf8_to_ucs2(szOut, olen, szConnStrOut, cbConnStrOutMax);
-        else
-            utf8_to_ucs2(szOut, maxlen, szConnStrOut, cbConnStrOutMax);
-        if (outlen >= cbConnStrOutMax && NULL != szConnStrOut
-            && NULL != pcbConnStrOut) {
-            MYLOG(OPENSEARCH_ALL, "cbConnstrOutMax=%d pcb=%p\n", cbConnStrOutMax,
-                  pcbConnStrOut);
-            if (SQL_SUCCESS == ret) {
-                CC_set_error(conn, CONN_TRUNCATED,
-                             "the ConnStrOut is too small", func);
-                ret = SQL_SUCCESS_WITH_INFO;
-            }
-        }
-        if (pcbConnStrOut)
-            *pcbConnStrOut = (SQLSMALLINT)outlen;
-    }
-cleanup:
-    LEAVE_CONN_CS(conn);
-    if (szOut)
-        free(szOut);
-    if (szIn)
-        free(szIn);
-    return ret;
-}
-RETCODE SQL_API SQLBrowseConnectW(HDBC hdbc, SQLWCHAR *szConnStrIn,
-                                  SQLSMALLINT cbConnStrIn,
-                                  SQLWCHAR *szConnStrOut,
-                                  SQLSMALLINT cbConnStrOutMax,
-                                  SQLSMALLINT *pcbConnStrOut) {
-    CSTR func = "SQLBrowseConnectW";
-    char *szIn, *szOut;
-    SQLLEN inlen;
-    SQLUSMALLINT obuflen;
-    SQLSMALLINT olen = 0;
-    RETCODE ret;
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    CC_set_in_unicode_driver(conn);
-    szIn = ucs2_to_utf8(szConnStrIn, cbConnStrIn, &inlen, FALSE);
-    obuflen = cbConnStrOutMax + 1;
-    szOut = malloc(obuflen);
-    if (szOut)
-        ret = OPENSEARCHAPI_BrowseConnect(hdbc, (SQLCHAR *)szIn, (SQLSMALLINT)inlen,
-                                  (SQLCHAR *)szOut, cbConnStrOutMax, &olen);
-    else {
-        CC_set_error(conn, CONN_NO_MEMORY_ERROR,
-                     "Could not allocate memory for output buffer", func);
-        ret = SQL_ERROR;
-    }
-    LEAVE_CONN_CS(conn);
-    if (ret != SQL_ERROR) {
-        SQLLEN outlen =
-            utf8_to_ucs2(szOut, olen, szConnStrOut, cbConnStrOutMax);
-        if (pcbConnStrOut)
-            *pcbConnStrOut = (SQLSMALLINT)outlen;
-    }
-    free(szOut);
-    if (szIn)
-        free(szIn);
-    return ret;
-}
-
-RETCODE SQL_API SQLDataSourcesW(HENV EnvironmentHandle, SQLUSMALLINT Direction,
-                                SQLWCHAR *ServerName, SQLSMALLINT BufferLength1,
-                                SQLSMALLINT *NameLength1, SQLWCHAR *Description,
-                                SQLSMALLINT BufferLength2,
-                                SQLSMALLINT *NameLength2) {
-    UNUSED(EnvironmentHandle, Direction, ServerName, BufferLength1, NameLength1,
-           Description, BufferLength2, NameLength2);
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    return SQL_ERROR;
-}
-
-RETCODE SQL_API SQLDescribeColW(HSTMT StatementHandle,
-                                SQLUSMALLINT ColumnNumber, SQLWCHAR *ColumnName,
-                                SQLSMALLINT BufferLength,
-                                SQLSMALLINT *NameLength, SQLSMALLINT *DataType,
-                                SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits,
-                                SQLSMALLINT *Nullable) {
-    CSTR func = "SQLDescribeColW";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    SQLSMALLINT buflen, nmlen = 0;
-    char *clName = NULL, *clNamet = NULL;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    buflen = 0;
-    if (BufferLength > 0)
-        buflen = BufferLength * 3;
-    else if (NameLength)
-        buflen = 32;
-    if (buflen > 0)
-        clNamet = malloc(buflen);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    for (;; buflen = nmlen + 1, clNamet = realloc(clName, buflen)) {
-        if (!clNamet) {
-            SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                         "Could not allocate memory for column name", func);
-            ret = SQL_ERROR;
-            break;
-        }
-        clName = clNamet;
-        ret = OPENSEARCHAPI_DescribeCol(StatementHandle, ColumnNumber,
-                                (SQLCHAR *)clName, buflen, &nmlen, DataType,
-                                ColumnSize, DecimalDigits, Nullable);
-        if (SQL_SUCCESS_WITH_INFO != ret || nmlen < buflen)
-            break;
-    }
-    if (SQL_SUCCEEDED(ret)) {
-        SQLLEN nmcount = nmlen;
-
-        if (nmlen < buflen)
-            nmcount = utf8_to_ucs2(clName, nmlen, ColumnName, BufferLength);
-        if (SQL_SUCCESS == ret && BufferLength > 0 && nmcount > BufferLength) {
-            ret = SQL_SUCCESS_WITH_INFO;
-            SC_set_error(stmt, STMT_TRUNCATED, "Column name too large", func);
-        }
-        if (NameLength)
-            *NameLength = (SQLSMALLINT)nmcount;
-    }
-    LEAVE_STMT_CS(stmt);
-    if (clName)
-        free(clName);
-    return ret;
-}
-
-RETCODE SQL_API SQLExecDirectW(HSTMT StatementHandle, SQLWCHAR *StatementText,
-                               SQLINTEGER TextLength) {
-    if (StatementHandle == NULL)
-        return SQL_ERROR;
-
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    // Get query string
-    SQLLEN slen = 0;
-    char *stxt = ucs2_to_utf8(StatementText, TextLength, &slen, FALSE);
-
-    // Enter critical
-    ENTER_STMT_CS(stmt);
-
-    // Clear error and rollback
-    SC_clear_error(stmt);
-
-    // Execute statement if statement is ready
-    RETCODE ret = SQL_ERROR;
-    if (!SC_opencheck(stmt, "SQLExecDirectW"))
-        ret = OPENSEARCHAPI_ExecDirect(StatementHandle, (const SQLCHAR *)stxt,
-                               (SQLINTEGER)slen, 1);
-
-    // Exit critical
-    LEAVE_STMT_CS(stmt);
-
-    if (stxt)
-        free(stxt);
-    return ret;
-}
-
-RETCODE SQL_API SQLGetCursorNameW(HSTMT StatementHandle, SQLWCHAR *CursorName,
-                                  SQLSMALLINT BufferLength,
-                                  SQLSMALLINT *NameLength) {
-    CSTR func = "SQLGetCursorNameW";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    char *crName = NULL, *crNamet;
-    SQLSMALLINT clen = 0, buflen;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (BufferLength > 0)
-        buflen = BufferLength * 3;
-    else
-        buflen = 32;
-    crNamet = malloc(buflen);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    for (;; buflen = clen + 1, crNamet = realloc(crName, buflen)) {
-        if (!crNamet) {
-            SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                         "Could not allocate memory for cursor name", func);
-            ret = SQL_ERROR;
-            break;
-        }
-        crName = crNamet;
-        ret = OPENSEARCHAPI_GetCursorName(StatementHandle, (SQLCHAR *)crName, buflen,
-                                  &clen);
-        if (SQL_SUCCESS_WITH_INFO != ret || clen < buflen)
-            break;
-    }
-    if (SQL_SUCCEEDED(ret)) {
-        SQLLEN nmcount = clen;
-
-        if (clen < buflen)
-            nmcount = utf8_to_ucs2(crName, clen, CursorName, BufferLength);
-        if (SQL_SUCCESS == ret && nmcount > BufferLength) {
-            ret = SQL_SUCCESS_WITH_INFO;
-            SC_set_error(stmt, STMT_TRUNCATED, "Cursor name too large", func);
-        }
-        if (NameLength)
-            *NameLength = (SQLSMALLINT)nmcount;
-    }
-    LEAVE_STMT_CS(stmt);
-    free(crName);
-    return ret;
-}
-
-RETCODE SQL_API SQLGetInfoW(HDBC ConnectionHandle, SQLUSMALLINT InfoType,
-                            PTR InfoValue, SQLSMALLINT BufferLength,
-                            SQLSMALLINT *StringLength) {
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-    RETCODE ret;
-
-    ENTER_CONN_CS(conn);
-    CC_set_in_unicode_driver(conn);
-    CC_clear_error(conn);
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if ((ret = OPENSEARCHAPI_GetInfo(ConnectionHandle, InfoType, InfoValue,
-                             BufferLength, StringLength))
-        == SQL_ERROR)
-        CC_log_error("SQLGetInfoW", "", conn);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-
-RETCODE SQL_API SQLPrepareW(HSTMT StatementHandle, SQLWCHAR *StatementText,
-                            SQLINTEGER TextLength) {
-    if (StatementHandle == NULL)
-        return SQL_ERROR;
-
-    CSTR func = "SQLPrepareW";
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    SQLLEN slen;
-    char *stxt = ucs2_to_utf8(StatementText, TextLength, &slen, FALSE);
-
-    // Enter critical
-    ENTER_STMT_CS(stmt);
-
-    // Clear error and rollback
-    SC_clear_error(stmt);
-
-    // Prepare statement if statement is ready
-    RETCODE ret = SQL_ERROR;
-    if (!SC_opencheck(stmt, func))
-        ret = OPENSEARCHAPI_Prepare(StatementHandle, (const SQLCHAR *)stxt,
-                            (SQLINTEGER)slen);
-
-    // Exit critical
-    LEAVE_STMT_CS(stmt);
-
-    // Release memory
-    if (stxt)
-        free(stxt);
-    return ret;
-}
-
-RETCODE SQL_API SQLSetCursorNameW(HSTMT StatementHandle, SQLWCHAR *CursorName,
-                                  SQLSMALLINT NameLength) {
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    char *crName;
-    SQLLEN nlen;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    crName = ucs2_to_utf8(CursorName, NameLength, &nlen, FALSE);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    ret = OPENSEARCHAPI_SetCursorName(StatementHandle, (SQLCHAR *)crName,
-                              (SQLSMALLINT)nlen);
-    LEAVE_STMT_CS(stmt);
-    if (crName)
-        free(crName);
-    return ret;
-}
-
-RETCODE SQL_API SQLSpecialColumnsW(
-    HSTMT StatementHandle, SQLUSMALLINT IdentifierType, SQLWCHAR *CatalogName,
-    SQLSMALLINT NameLength1, SQLWCHAR *SchemaName, SQLSMALLINT NameLength2,
-    SQLWCHAR *TableName, SQLSMALLINT NameLength3, SQLUSMALLINT Scope,
-    SQLUSMALLINT Nullable) {
-    CSTR func = "SQLSpecialColumnsW";
-    RETCODE ret;
-    char *ctName, *scName, *tbName;
-    SQLLEN nmlen1, nmlen2, nmlen3;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    BOOL lower_id;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    lower_id = DEFAULT_LOWERCASEIDENTIFIER;
-    ctName = ucs2_to_utf8(CatalogName, NameLength1, &nmlen1, lower_id);
-    scName = ucs2_to_utf8(SchemaName, NameLength2, &nmlen2, lower_id);
-    tbName = ucs2_to_utf8(TableName, NameLength3, &nmlen3, lower_id);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_SpecialColumns(
-            StatementHandle, IdentifierType, (SQLCHAR *)ctName,
-            (SQLSMALLINT)nmlen1, (SQLCHAR *)scName, (SQLSMALLINT)nmlen2,
-            (SQLCHAR *)tbName, (SQLSMALLINT)nmlen3, Scope, Nullable);
-    LEAVE_STMT_CS(stmt);
-    if (ctName)
-        free(ctName);
-    if (scName)
-        free(scName);
-    if (tbName)
-        free(tbName);
-    return ret;
-}
-
-RETCODE SQL_API SQLStatisticsW(HSTMT StatementHandle, SQLWCHAR *CatalogName,
-                               SQLSMALLINT NameLength1, SQLWCHAR *SchemaName,
-                               SQLSMALLINT NameLength2, SQLWCHAR *TableName,
-                               SQLSMALLINT NameLength3, SQLUSMALLINT Unique,
-                               SQLUSMALLINT Reserved) {
-    CSTR func = "SQLStatisticsW";
-    RETCODE ret;
-    char *ctName, *scName, *tbName;
-    SQLLEN nmlen1, nmlen2, nmlen3;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    BOOL lower_id;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    lower_id = DEFAULT_LOWERCASEIDENTIFIER;
-    ctName = ucs2_to_utf8(CatalogName, NameLength1, &nmlen1, lower_id);
-    scName = ucs2_to_utf8(SchemaName, NameLength2, &nmlen2, lower_id);
-    tbName = ucs2_to_utf8(TableName, NameLength3, &nmlen3, lower_id);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_Statistics(StatementHandle, (SQLCHAR *)ctName,
-                               (SQLSMALLINT)nmlen1, (SQLCHAR *)scName,
-                               (SQLSMALLINT)nmlen2, (SQLCHAR *)tbName,
-                               (SQLSMALLINT)nmlen3, Unique, Reserved);
-    LEAVE_STMT_CS(stmt);
-    if (ctName)
-        free(ctName);
-    if (scName)
-        free(scName);
-    if (tbName)
-        free(tbName);
-    return ret;
-}
-
-RETCODE SQL_API SQLTablesW(HSTMT StatementHandle, SQLWCHAR *CatalogName,
-                           SQLSMALLINT NameLength1, SQLWCHAR *SchemaName,
-                           SQLSMALLINT NameLength2, SQLWCHAR *TableName,
-                           SQLSMALLINT NameLength3, SQLWCHAR *TableType,
-                           SQLSMALLINT NameLength4) {
-    CSTR func = "SQLTablesW";
-    RETCODE ret;
-    char *ctName, *scName, *tbName, *tbType;
-    SQLLEN nmlen1, nmlen2, nmlen3, nmlen4;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    BOOL lower_id;
-    UWORD flag = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    lower_id = DEFAULT_LOWERCASEIDENTIFIER;
-    ctName = ucs2_to_utf8(CatalogName, NameLength1, &nmlen1, lower_id);
-    scName = ucs2_to_utf8(SchemaName, NameLength2, &nmlen2, lower_id);
-    tbName = ucs2_to_utf8(TableName, NameLength3, &nmlen3, lower_id);
-    tbType = ucs2_to_utf8(TableType, NameLength4, &nmlen4, FALSE);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_Tables(
-            StatementHandle, (SQLCHAR *)ctName, (SQLSMALLINT)nmlen1,
-            (SQLCHAR *)scName, (SQLSMALLINT)nmlen2, (SQLCHAR *)tbName,
-            (SQLSMALLINT)nmlen3, (SQLCHAR *)tbType, (SQLSMALLINT)nmlen4, flag);
-    LEAVE_STMT_CS(stmt);
-    if (ctName)
-        free(ctName);
-    if (scName)
-        free(scName);
-    if (tbName)
-        free(tbName);
-    if (tbType)
-        free(tbType);
-    return ret;
-}
-
-RETCODE SQL_API SQLColumnPrivilegesW(
-    HSTMT hstmt, SQLWCHAR *szCatalogName, SQLSMALLINT cbCatalogName,
-    SQLWCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLWCHAR *szTableName,
-    SQLSMALLINT cbTableName, SQLWCHAR *szColumnName, SQLSMALLINT cbColumnName) {
-    CSTR func = "SQLColumnPrivilegesW";
-    RETCODE ret;
-    char *ctName, *scName, *tbName, *clName;
-    SQLLEN nmlen1, nmlen2, nmlen3, nmlen4;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    BOOL lower_id;
-    UWORD flag = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    lower_id = DEFAULT_LOWERCASEIDENTIFIER;
-    ctName = ucs2_to_utf8(szCatalogName, cbCatalogName, &nmlen1, lower_id);
-    scName = ucs2_to_utf8(szSchemaName, cbSchemaName, &nmlen2, lower_id);
-    tbName = ucs2_to_utf8(szTableName, cbTableName, &nmlen3, lower_id);
-    clName = ucs2_to_utf8(szColumnName, cbColumnName, &nmlen4, lower_id);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_ColumnPrivileges(
-            hstmt, (SQLCHAR *)ctName, (SQLSMALLINT)nmlen1, (SQLCHAR *)scName,
-            (SQLSMALLINT)nmlen2, (SQLCHAR *)tbName, (SQLSMALLINT)nmlen3,
-            (SQLCHAR *)clName, (SQLSMALLINT)nmlen4, flag);
-    LEAVE_STMT_CS(stmt);
-    if (ctName)
-        free(ctName);
-    if (scName)
-        free(scName);
-    if (tbName)
-        free(tbName);
-    if (clName)
-        free(clName);
-    return ret;
-}
-
-RETCODE SQL_API SQLForeignKeysW(
-    HSTMT hstmt, SQLWCHAR *szPkCatalogName, SQLSMALLINT cbPkCatalogName,
-    SQLWCHAR *szPkSchemaName, SQLSMALLINT cbPkSchemaName,
-    SQLWCHAR *szPkTableName, SQLSMALLINT cbPkTableName,
-    SQLWCHAR *szFkCatalogName, SQLSMALLINT cbFkCatalogName,
-    SQLWCHAR *szFkSchemaName, SQLSMALLINT cbFkSchemaName,
-    SQLWCHAR *szFkTableName, SQLSMALLINT cbFkTableName) {
-    CSTR func = "SQLForeignKeysW";
-    RETCODE ret;
-    char *ctName, *scName, *tbName, *fkctName, *fkscName, *fktbName;
-    SQLLEN nmlen1, nmlen2, nmlen3, nmlen4, nmlen5, nmlen6;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    BOOL lower_id;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    lower_id = DEFAULT_LOWERCASEIDENTIFIER;
-    ctName = ucs2_to_utf8(szPkCatalogName, cbPkCatalogName, &nmlen1, lower_id);
-    scName = ucs2_to_utf8(szPkSchemaName, cbPkSchemaName, &nmlen2, lower_id);
-    tbName = ucs2_to_utf8(szPkTableName, cbPkTableName, &nmlen3, lower_id);
-    fkctName =
-        ucs2_to_utf8(szFkCatalogName, cbFkCatalogName, &nmlen4, lower_id);
-    fkscName = ucs2_to_utf8(szFkSchemaName, cbFkSchemaName, &nmlen5, lower_id);
-    fktbName = ucs2_to_utf8(szFkTableName, cbFkTableName, &nmlen6, lower_id);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_ForeignKeys(
-            hstmt, (SQLCHAR *)ctName, (SQLSMALLINT)nmlen1, (SQLCHAR *)scName,
-            (SQLSMALLINT)nmlen2, (SQLCHAR *)tbName, (SQLSMALLINT)nmlen3,
-            (SQLCHAR *)fkctName, (SQLSMALLINT)nmlen4, (SQLCHAR *)fkscName,
-            (SQLSMALLINT)nmlen5, (SQLCHAR *)fktbName, (SQLSMALLINT)nmlen6);
-    LEAVE_STMT_CS(stmt);
-    if (ctName)
-        free(ctName);
-    if (scName)
-        free(scName);
-    if (tbName)
-        free(tbName);
-    if (fkctName)
-        free(fkctName);
-    if (fkscName)
-        free(fkscName);
-    if (fktbName)
-        free(fktbName);
-    return ret;
-}
-
-RETCODE SQL_API SQLNativeSqlW(HDBC hdbc, SQLWCHAR *szSqlStrIn,
-                              SQLINTEGER cbSqlStrIn, SQLWCHAR *szSqlStr,
-                              SQLINTEGER cbSqlStrMax, SQLINTEGER *pcbSqlStr) {
-    CSTR func = "SQLNativeSqlW";
-    RETCODE ret;
-    char *szIn, *szOut = NULL, *szOutt = NULL;
-    SQLLEN slen;
-    SQLINTEGER buflen, olen = 0;
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    CC_set_in_unicode_driver(conn);
-    szIn = ucs2_to_utf8(szSqlStrIn, cbSqlStrIn, &slen, FALSE);
-    buflen = 3 * cbSqlStrMax;
-    if (buflen > 0)
-        szOutt = malloc(buflen);
-    for (;; buflen = olen + 1, szOutt = realloc(szOut, buflen)) {
-        if (!szOutt) {
-            CC_set_error(conn, CONN_NO_MEMORY_ERROR,
-                         "Could not allocate memory for output buffer", func);
-            ret = SQL_ERROR;
-            break;
-        }
-        szOut = szOutt;
-        ret = OPENSEARCHAPI_NativeSql(hdbc, (SQLCHAR *)szIn, (SQLINTEGER)slen,
-                              (SQLCHAR *)szOut, buflen, &olen);
-        if (SQL_SUCCESS_WITH_INFO != ret || olen < buflen)
-            break;
-    }
-    if (szIn)
-        free(szIn);
-    if (SQL_SUCCEEDED(ret)) {
-        SQLLEN szcount = olen;
-
-        if (olen < buflen)
-            szcount = utf8_to_ucs2(szOut, olen, szSqlStr, cbSqlStrMax);
-        if (SQL_SUCCESS == ret && szcount > cbSqlStrMax) {
-            ret = SQL_SUCCESS_WITH_INFO;
-            CC_set_error(conn, CONN_TRUNCATED, "Sql string too large", func);
-        }
-        if (pcbSqlStr)
-            *pcbSqlStr = (SQLINTEGER)szcount;
-    }
-    LEAVE_CONN_CS(conn);
-    free(szOut);
-    return ret;
-}
-
-RETCODE SQL_API SQLPrimaryKeysW(HSTMT hstmt, SQLWCHAR *szCatalogName,
-                                SQLSMALLINT cbCatalogName,
-                                SQLWCHAR *szSchemaName,
-                                SQLSMALLINT cbSchemaName, SQLWCHAR *szTableName,
-                                SQLSMALLINT cbTableName) {
-    CSTR func = "SQLPrimaryKeysW";
-    RETCODE ret;
-    char *ctName, *scName, *tbName;
-    SQLLEN nmlen1, nmlen2, nmlen3;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    BOOL lower_id;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    lower_id = DEFAULT_LOWERCASEIDENTIFIER;
-    ctName = ucs2_to_utf8(szCatalogName, cbCatalogName, &nmlen1, lower_id);
-    scName = ucs2_to_utf8(szSchemaName, cbSchemaName, &nmlen2, lower_id);
-    tbName = ucs2_to_utf8(szTableName, cbTableName, &nmlen3, lower_id);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_PrimaryKeys(hstmt, (SQLCHAR *)ctName, (SQLSMALLINT)nmlen1,
-                                (SQLCHAR *)scName, (SQLSMALLINT)nmlen2,
-                                (SQLCHAR *)tbName, (SQLSMALLINT)nmlen3, 0);
-    LEAVE_STMT_CS(stmt);
-    if (ctName)
-        free(ctName);
-    if (scName)
-        free(scName);
-    if (tbName)
-        free(tbName);
-    return ret;
-}
-
-RETCODE SQL_API SQLProcedureColumnsW(
-    HSTMT hstmt, SQLWCHAR *szCatalogName, SQLSMALLINT cbCatalogName,
-    SQLWCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLWCHAR *szProcName,
-    SQLSMALLINT cbProcName, SQLWCHAR *szColumnName, SQLSMALLINT cbColumnName) {
-    CSTR func = "SQLProcedureColumnsW";
-    RETCODE ret;
-    char *ctName, *scName, *prName, *clName;
-    SQLLEN nmlen1, nmlen2, nmlen3, nmlen4;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    BOOL lower_id;
-    UWORD flag = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    lower_id = DEFAULT_LOWERCASEIDENTIFIER;
-    ctName = ucs2_to_utf8(szCatalogName, cbCatalogName, &nmlen1, lower_id);
-    scName = ucs2_to_utf8(szSchemaName, cbSchemaName, &nmlen2, lower_id);
-    prName = ucs2_to_utf8(szProcName, cbProcName, &nmlen3, lower_id);
-    clName = ucs2_to_utf8(szColumnName, cbColumnName, &nmlen4, lower_id);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_ProcedureColumns(
-            hstmt, (SQLCHAR *)ctName, (SQLSMALLINT)nmlen1, (SQLCHAR *)scName,
-            (SQLSMALLINT)nmlen2, (SQLCHAR *)prName, (SQLSMALLINT)nmlen3,
-            (SQLCHAR *)clName, (SQLSMALLINT)nmlen4, flag);
-    LEAVE_STMT_CS(stmt);
-    if (ctName)
-        free(ctName);
-    if (scName)
-        free(scName);
-    if (prName)
-        free(prName);
-    if (clName)
-        free(clName);
-    return ret;
-}
-
-RETCODE SQL_API SQLProceduresW(HSTMT hstmt, SQLWCHAR *szCatalogName,
-                               SQLSMALLINT cbCatalogName,
-                               SQLWCHAR *szSchemaName, SQLSMALLINT cbSchemaName,
-                               SQLWCHAR *szProcName, SQLSMALLINT cbProcName) {
-    CSTR func = "SQLProceduresW";
-    RETCODE ret;
-    char *ctName, *scName, *prName;
-    SQLLEN nmlen1, nmlen2, nmlen3;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    BOOL lower_id;
-    UWORD flag = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    lower_id = DEFAULT_LOWERCASEIDENTIFIER;
-    ctName = ucs2_to_utf8(szCatalogName, cbCatalogName, &nmlen1, lower_id);
-    scName = ucs2_to_utf8(szSchemaName, cbSchemaName, &nmlen2, lower_id);
-    prName = ucs2_to_utf8(szProcName, cbProcName, &nmlen3, lower_id);
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_Procedures(hstmt, (SQLCHAR *)ctName, (SQLSMALLINT)nmlen1,
-                               (SQLCHAR *)scName, (SQLSMALLINT)nmlen2,
-                               (SQLCHAR *)prName, (SQLSMALLINT)nmlen3, flag);
-    LEAVE_STMT_CS(stmt);
-    if (ctName)
-        free(ctName);
-    if (scName)
-        free(scName);
-    if (prName)
-        free(prName);
-    return ret;
-}
-
-RETCODE SQL_API SQLTablePrivilegesW(HSTMT hstmt, SQLWCHAR *szCatalogName,
-                                    SQLSMALLINT cbCatalogName,
-                                    SQLWCHAR *szSchemaName,
-                                    SQLSMALLINT cbSchemaName,
-                                    SQLWCHAR *szTableName,
-                                    SQLSMALLINT cbTableName) {
-    CSTR func = "SQLTablePrivilegesW";
-    RETCODE ret;
-    char *ctName, *scName, *tbName;
-    SQLLEN nmlen1, nmlen2, nmlen3;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    BOOL lower_id;
-    UWORD flag = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    lower_id = DEFAULT_LOWERCASEIDENTIFIER;
-    ctName = ucs2_to_utf8(szCatalogName, cbCatalogName, &nmlen1, lower_id);
-    scName = ucs2_to_utf8(szSchemaName, cbSchemaName, &nmlen2, lower_id);
-    tbName = ucs2_to_utf8(szTableName, cbTableName, &nmlen3, lower_id);
-    ENTER_STMT_CS((StatementClass *)hstmt);
-    SC_clear_error(stmt);
-    if (stmt->options.metadata_id)
-        flag |= PODBC_NOT_SEARCH_PATTERN;
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_TablePrivileges(
-            hstmt, (SQLCHAR *)ctName, (SQLSMALLINT)nmlen1, (SQLCHAR *)scName,
-            (SQLSMALLINT)nmlen2, (SQLCHAR *)tbName, (SQLSMALLINT)nmlen3, flag);
-    LEAVE_STMT_CS((StatementClass *)hstmt);
-    if (ctName)
-        free(ctName);
-    if (scName)
-        free(scName);
-    if (tbName)
-        free(tbName);
-    return ret;
-}
-
-RETCODE SQL_API SQLGetTypeInfoW(SQLHSTMT StatementHandle,
-                                SQLSMALLINT DataType) {
-    CSTR func = "SQLGetTypeInfoW";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    if (SC_opencheck(stmt, func))
-        ret = SQL_ERROR;
-    else
-        ret = OPENSEARCHAPI_GetTypeInfo(StatementHandle, DataType);
-    LEAVE_STMT_CS(stmt);
-    return ret;
-}
-
-/* ODBC 2.x-specific functions */
-// TODO (#590): Add implementations for remaining ODBC 2.x function
-
-SQLRETURN SQL_API SQLColAttributesW(SQLHSTMT hstmt, SQLUSMALLINT iCol,
-                                    SQLUSMALLINT iField, SQLPOINTER pCharAttr,
-                                    SQLSMALLINT cbCharAttrMax,
-                                    SQLSMALLINT *pcbCharAttr,
-#if defined(_WIN64) || defined(_WIN32) || defined(SQLCOLATTRIBUTE_SQLLEN)
-                                    SQLLEN *pNumAttr
-#else
-                                    SQLPOINTER pNumAttr
-#endif
-) {
-    CSTR func = "SQLColAttributeW";
-    RETCODE ret;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    SQLSMALLINT *rgbL, blen = 0, bMax;
-    char *rgbD = NULL, *rgbDt;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (SC_connection_lost_check(stmt, __FUNCTION__))
-        return SQL_ERROR;
-
-    ENTER_STMT_CS(stmt);
-    SC_clear_error(stmt);
-    switch (iField) {
-        case SQL_DESC_BASE_COLUMN_NAME:
-        case SQL_DESC_BASE_TABLE_NAME:
-        case SQL_DESC_CATALOG_NAME:
-        case SQL_DESC_LABEL:
-        case SQL_DESC_LITERAL_PREFIX:
-        case SQL_DESC_LITERAL_SUFFIX:
-        case SQL_DESC_LOCAL_TYPE_NAME:
-        case SQL_DESC_NAME:
-        case SQL_DESC_SCHEMA_NAME:
-        case SQL_DESC_TABLE_NAME:
-        case SQL_DESC_TYPE_NAME:
-        case SQL_COLUMN_NAME:
-            bMax = cbCharAttrMax * 3 / WCLEN;
-            rgbD = malloc(bMax);
-            rgbL = &blen;
-            for (rgbDt = rgbD;; bMax = blen + 1, rgbDt = realloc(rgbD, bMax)) {
-                if (!rgbDt) {
-                    ret = SQL_ERROR;
-                    break;
-                }
-                rgbD = rgbDt;
-                ret = OPENSEARCHAPI_ColAttributes(hstmt, iCol, iField, rgbD, bMax, rgbL,
-                                          pNumAttr);
-                if (SQL_SUCCESS_WITH_INFO != ret || blen < bMax)
-                    break;
-            }
-            if (SQL_SUCCEEDED(ret)) {
-                blen = (SQLSMALLINT)utf8_to_ucs2(
-                    rgbD, blen, (SQLWCHAR *)pCharAttr, cbCharAttrMax / WCLEN);
-                if (SQL_SUCCESS == ret
-                    && blen * WCLEN >= (unsigned long)cbCharAttrMax) {
-                    ret = SQL_SUCCESS_WITH_INFO;
-                    SC_set_error(stmt, STMT_TRUNCATED,
-                                 "The buffer was too small for the pCharAttr.",
-                                 func);
-                }
-                if (pcbCharAttr)
-                    *pcbCharAttr = blen * WCLEN;
-            }
-            if (rgbD)
-                free(rgbD);
-            break;
-        default:
-            rgbD = pCharAttr;
-            bMax = cbCharAttrMax;
-            rgbL = pcbCharAttr;
-            ret = OPENSEARCHAPI_ColAttributes(hstmt, iCol, iField, rgbD, bMax, rgbL,
-                                      pNumAttr);
-            break;
-    }
-    LEAVE_STMT_CS(stmt);
-
-    return ret;
-}
-
-RETCODE SQL_API SQLGetConnectOptionW(HDBC ConnectionHandle, SQLUSMALLINT Option,
-                                     PTR Value) {
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-    RETCODE ret;
-
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    MYLOG(OPENSEARCH_TRACE, "entering " FORMAT_UINTEGER "\n", Option);
-    ret = OPENSEARCHAPI_GetConnectOption(ConnectionHandle, Option, Value, NULL, 0);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-
-RETCODE SQL_API SQLSetConnectOptionW(HDBC ConnectionHandle, SQLUSMALLINT Option,
-                                     SQLULEN Value) {
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering " FORMAT_INTEGER "\n", Option);
-    ENTER_CONN_CS(conn);
-    CC_clear_error(conn);
-    ret = OPENSEARCHAPI_SetConnectOption(ConnectionHandle, Option, Value);
-    LEAVE_CONN_CS(conn);
-    return ret;
-}
-
-RETCODE SQL_API SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
-                          SQLHSTMT StatementHandle, SQLWCHAR *Sqlstate,
-                          SQLINTEGER *NativeError, SQLWCHAR *MessageText,
-                          SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) {
-    RETCODE ret;
-    SQLSMALLINT buflen;
-    SQLSMALLINT tlen = 0;
-    SQLSMALLINT RecNumber = 1;
-    char qstr_ansi[8], *mtxt = NULL;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    buflen = 0;
-    if (MessageText && BufferLength > 0) {
-        buflen = BufferLength;
-        mtxt = malloc(buflen);
-    }
-
-    if (StatementHandle) {
-        ret = OPENSEARCHAPI_StmtError(StatementHandle, RecNumber, (SQLCHAR *)qstr_ansi,
-                              NativeError, (SQLCHAR *)mtxt, buflen, &tlen, 0);
-    } else if (ConnectionHandle) {
-        ret = OPENSEARCHAPI_ConnectError(ConnectionHandle, RecNumber,
-                                 (SQLCHAR *)qstr_ansi, NativeError,
-                                 (SQLCHAR *)mtxt, buflen, &tlen, 0);
-    } else if (EnvironmentHandle) {
-        ret = OPENSEARCHAPI_EnvError(EnvironmentHandle, RecNumber, (SQLCHAR *)qstr_ansi,
-                             NativeError, (SQLCHAR *)mtxt, buflen, &tlen, 0);
-    } else {
-        ret = SQL_ERROR;
-    }
-
-    if (SQL_SUCCEEDED(ret)) {
-        if (Sqlstate)
-            utf8_to_ucs2(qstr_ansi, -1, Sqlstate, 6);
-        if (mtxt && tlen <= BufferLength) {
-            // TODO (#612): Verify wide character conversion
-            SQLULEN ulen = utf8_to_ucs2_lf(mtxt, tlen, FALSE, MessageText,
-                                           BufferLength, TRUE);
-            if (ulen == (SQLULEN)-1)
-                tlen = (SQLSMALLINT)locale_to_sqlwchar(
-                    (SQLWCHAR *)MessageText, mtxt, BufferLength, FALSE);
-            else
-                tlen = (SQLSMALLINT)ulen;
-            if (tlen >= BufferLength)
-                ret = SQL_SUCCESS_WITH_INFO;
-            else if (tlen < 0) {
-                char errc[32];
-
-                SPRINTF_FIXED(errc, "Error: SqlState=%s", qstr_ansi);
-                tlen = (SQLSMALLINT)utf8_to_ucs2(errc, -1, MessageText,
-                                                 BufferLength);
-            }
-        }
-        if (TextLength)
-            *TextLength = tlen;
-    }
-    if (mtxt)
-        free(mtxt);
-    return ret;
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_api30.c b/sql-odbc/src/sqlodbc/opensearch_api30.c
deleted file mode 100644
index 25baeb7915..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_api30.c
+++ /dev/null
@@ -1,1842 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "descriptor.h"
-#include "dlg_specific.h"
-#include "environ.h"
-#include "opensearch_odbc.h"
-#include "loadlib.h"
-#include "misc.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "qresult.h"
-#include "statement.h"
-
-/*	SQLError -> SQLDiagRec */
-RETCODE SQL_API OPENSEARCHAPI_GetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle,
-                                 SQLSMALLINT RecNumber, SQLCHAR *Sqlstate,
-                                 SQLINTEGER *NativeError, SQLCHAR *MessageText,
-                                 SQLSMALLINT BufferLength,
-                                 SQLSMALLINT *TextLength) {
-    RETCODE ret;
-
-    MYLOG(OPENSEARCH_TRACE, "entering type=%d rec=%d\n", HandleType, RecNumber);
-    switch (HandleType) {
-        case SQL_HANDLE_ENV:
-            ret = OPENSEARCHAPI_EnvError(Handle, RecNumber, Sqlstate, NativeError,
-                                 MessageText, BufferLength, TextLength, 0);
-            break;
-        case SQL_HANDLE_DBC:
-            ret = OPENSEARCHAPI_ConnectError(Handle, RecNumber, Sqlstate, NativeError,
-                                     MessageText, BufferLength, TextLength, 0);
-            break;
-        case SQL_HANDLE_STMT:
-            ret = OPENSEARCHAPI_StmtError(Handle, RecNumber, Sqlstate, NativeError,
-                                  MessageText, BufferLength, TextLength, 0);
-            break;
-        case SQL_HANDLE_DESC:
-            ret = OPENSEARCHAPI_DescError(Handle, RecNumber, Sqlstate, NativeError,
-                                  MessageText, BufferLength, TextLength, 0);
-            break;
-        default:
-            ret = SQL_ERROR;
-    }
-    MYLOG(OPENSEARCH_TRACE, "leaving %d\n", ret);
-    return ret;
-}
-
-/*
- *	Minimal implementation.
- *
- */
-RETCODE SQL_API OPENSEARCHAPI_GetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
-                                   SQLSMALLINT RecNumber,
-                                   SQLSMALLINT DiagIdentifier, PTR DiagInfoPtr,
-                                   SQLSMALLINT BufferLength,
-                                   SQLSMALLINT *StringLengthPtr) {
-    RETCODE ret = SQL_ERROR, rtn;
-    ConnectionClass *conn;
-    StatementClass *stmt;
-    SQLLEN rc;
-    SQLSMALLINT pcbErrm;
-    ssize_t rtnlen = -1;
-    int rtnctype = SQL_C_CHAR;
-
-    MYLOG(OPENSEARCH_TRACE, "entering rec=%d\n", RecNumber);
-    switch (HandleType) {
-        case SQL_HANDLE_ENV:
-            switch (DiagIdentifier) {
-                case SQL_DIAG_CLASS_ORIGIN:
-                case SQL_DIAG_SUBCLASS_ORIGIN:
-                case SQL_DIAG_CONNECTION_NAME:
-                case SQL_DIAG_SERVER_NAME:
-                    rtnlen = 0;
-                    if (DiagInfoPtr && BufferLength > rtnlen) {
-                        ret = SQL_SUCCESS;
-                        *((char *)DiagInfoPtr) = '\0';
-                    } else
-                        ret = SQL_SUCCESS_WITH_INFO;
-                    break;
-                case SQL_DIAG_MESSAGE_TEXT:
-                    ret = OPENSEARCHAPI_EnvError(Handle, RecNumber, NULL, NULL,
-                                         DiagInfoPtr, BufferLength,
-                                         StringLengthPtr, 0);
-                    break;
-                case SQL_DIAG_NATIVE:
-                    rtnctype = SQL_C_LONG;
-                    ret = OPENSEARCHAPI_EnvError(Handle, RecNumber, NULL,
-                                         (SQLINTEGER *)DiagInfoPtr, NULL, 0,
-                                         NULL, 0);
-                    break;
-                case SQL_DIAG_NUMBER:
-                    rtnctype = SQL_C_LONG;
-                    ret = OPENSEARCHAPI_EnvError(Handle, RecNumber, NULL, NULL, NULL, 0,
-                                         NULL, 0);
-                    if (SQL_SUCCEEDED(ret)) {
-                        *((SQLINTEGER *)DiagInfoPtr) = 1;
-                    }
-                    break;
-                case SQL_DIAG_SQLSTATE:
-                    rtnlen = 5;
-                    ret = OPENSEARCHAPI_EnvError(Handle, RecNumber, DiagInfoPtr, NULL,
-                                         NULL, 0, NULL, 0);
-                    if (SQL_SUCCESS_WITH_INFO == ret)
-                        ret = SQL_SUCCESS;
-                    break;
-                case SQL_DIAG_RETURNCODE: /* driver manager returns */
-                    break;
-                case SQL_DIAG_CURSOR_ROW_COUNT:
-                case SQL_DIAG_ROW_COUNT:
-                case SQL_DIAG_DYNAMIC_FUNCTION:
-                case SQL_DIAG_DYNAMIC_FUNCTION_CODE:
-                    /* options for statement type only */
-                    break;
-            }
-            break;
-        case SQL_HANDLE_DBC:
-            conn = (ConnectionClass *)Handle;
-            switch (DiagIdentifier) {
-                case SQL_DIAG_CLASS_ORIGIN:
-                case SQL_DIAG_SUBCLASS_ORIGIN:
-                case SQL_DIAG_CONNECTION_NAME:
-                    rtnlen = 0;
-                    if (DiagInfoPtr && BufferLength > rtnlen) {
-                        ret = SQL_SUCCESS;
-                        *((char *)DiagInfoPtr) = '\0';
-                    } else
-                        ret = SQL_SUCCESS_WITH_INFO;
-                    break;
-                case SQL_DIAG_SERVER_NAME:
-                    rtnlen = strlen(CC_get_DSN(conn));
-                    if (DiagInfoPtr) {
-                        strncpy_null(DiagInfoPtr, CC_get_DSN(conn),
-                                     BufferLength);
-                        ret = (BufferLength > rtnlen ? SQL_SUCCESS
-                                                     : SQL_SUCCESS_WITH_INFO);
-                    } else
-                        ret = SQL_SUCCESS_WITH_INFO;
-                    break;
-                case SQL_DIAG_MESSAGE_TEXT:
-                    ret = OPENSEARCHAPI_ConnectError(Handle, RecNumber, NULL, NULL,
-                                             DiagInfoPtr, BufferLength,
-                                             StringLengthPtr, 0);
-                    break;
-                case SQL_DIAG_NATIVE:
-                    rtnctype = SQL_C_LONG;
-                    ret = OPENSEARCHAPI_ConnectError(Handle, RecNumber, NULL,
-                                             (SQLINTEGER *)DiagInfoPtr, NULL, 0,
-                                             NULL, 0);
-                    break;
-                case SQL_DIAG_NUMBER:
-                    rtnctype = SQL_C_LONG;
-                    ret = OPENSEARCHAPI_ConnectError(Handle, RecNumber, NULL, NULL,
-                                             NULL, 0, NULL, 0);
-                    if (SQL_SUCCEEDED(ret)) {
-                        *((SQLINTEGER *)DiagInfoPtr) = 1;
-                    }
-                    break;
-                case SQL_DIAG_SQLSTATE:
-                    rtnlen = 5;
-                    ret = OPENSEARCHAPI_ConnectError(Handle, RecNumber, DiagInfoPtr,
-                                             NULL, NULL, 0, NULL, 0);
-                    if (SQL_SUCCESS_WITH_INFO == ret)
-                        ret = SQL_SUCCESS;
-                    break;
-                case SQL_DIAG_RETURNCODE: /* driver manager returns */
-                    break;
-                case SQL_DIAG_CURSOR_ROW_COUNT:
-                case SQL_DIAG_ROW_COUNT:
-                case SQL_DIAG_DYNAMIC_FUNCTION:
-                case SQL_DIAG_DYNAMIC_FUNCTION_CODE:
-                    /* options for statement type only */
-                    break;
-            }
-            break;
-        case SQL_HANDLE_STMT:
-            conn = (ConnectionClass *)SC_get_conn(((StatementClass *)Handle));
-            switch (DiagIdentifier) {
-                case SQL_DIAG_CLASS_ORIGIN:
-                case SQL_DIAG_SUBCLASS_ORIGIN:
-                case SQL_DIAG_CONNECTION_NAME:
-                    rtnlen = 0;
-                    if (DiagInfoPtr && BufferLength > rtnlen) {
-                        ret = SQL_SUCCESS;
-                        *((char *)DiagInfoPtr) = '\0';
-                    } else
-                        ret = SQL_SUCCESS_WITH_INFO;
-                    break;
-                case SQL_DIAG_SERVER_NAME:
-                    rtnlen = strlen(CC_get_DSN(conn));
-                    if (DiagInfoPtr) {
-                        strncpy_null(DiagInfoPtr, CC_get_DSN(conn),
-                                     BufferLength);
-                        ret = (BufferLength > rtnlen ? SQL_SUCCESS
-                                                     : SQL_SUCCESS_WITH_INFO);
-                    } else
-                        ret = SQL_SUCCESS_WITH_INFO;
-                    break;
-                case SQL_DIAG_MESSAGE_TEXT:
-                    ret = OPENSEARCHAPI_StmtError(Handle, RecNumber, NULL, NULL,
-                                          DiagInfoPtr, BufferLength,
-                                          StringLengthPtr, 0);
-                    break;
-                case SQL_DIAG_NATIVE:
-                    rtnctype = SQL_C_LONG;
-                    ret = OPENSEARCHAPI_StmtError(Handle, RecNumber, NULL,
-                                          (SQLINTEGER *)DiagInfoPtr, NULL, 0,
-                                          NULL, 0);
-                    break;
-                case SQL_DIAG_NUMBER:
-                    rtnctype = SQL_C_LONG;
-                    *((SQLINTEGER *)DiagInfoPtr) = 0;
-                    ret = SQL_NO_DATA_FOUND;
-                    stmt = (StatementClass *)Handle;
-                    rtn = OPENSEARCHAPI_StmtError(Handle, -1, NULL, NULL, NULL, 0,
-                                          &pcbErrm, 0);
-                    switch (rtn) {
-                        case SQL_SUCCESS:
-                        case SQL_SUCCESS_WITH_INFO:
-                            ret = SQL_SUCCESS;
-                            if (pcbErrm > 0 && stmt->opensearch_error)
-
-                                *((SQLINTEGER *)DiagInfoPtr) =
-                                    (pcbErrm - 1) / stmt->opensearch_error->recsize + 1;
-                            break;
-                        default:
-                            break;
-                    }
-                    break;
-                case SQL_DIAG_SQLSTATE:
-                    rtnlen = 5;
-                    ret = OPENSEARCHAPI_StmtError(Handle, RecNumber, DiagInfoPtr, NULL,
-                                          NULL, 0, NULL, 0);
-                    if (SQL_SUCCESS_WITH_INFO == ret)
-                        ret = SQL_SUCCESS;
-                    break;
-                case SQL_DIAG_CURSOR_ROW_COUNT:
-                    rtnctype = SQL_C_LONG;
-                    stmt = (StatementClass *)Handle;
-                    rc = -1;
-                    if (stmt->status == STMT_FINISHED) {
-                        QResultClass *res = SC_get_Curres(stmt);
-
-                        /*if (!res)
-                            return SQL_ERROR;*/
-                        if (stmt->proc_return > 0)
-                            rc = 0;
-                        else if (res && QR_NumResultCols(res) > 0
-                                 && !SC_is_fetchcursor(stmt))
-                            rc = QR_get_num_total_tuples(res) - res->dl_count;
-                    }
-                    *((SQLLEN *)DiagInfoPtr) = rc;
-                    MYLOG(OPENSEARCH_ALL, "rc=" FORMAT_LEN "\n", rc);
-                    ret = SQL_SUCCESS;
-                    break;
-                case SQL_DIAG_ROW_COUNT:
-                    rtnctype = SQL_C_LONG;
-                    stmt = (StatementClass *)Handle;
-                    *((SQLLEN *)DiagInfoPtr) = stmt->diag_row_count;
-                    ret = SQL_SUCCESS;
-                    break;
-                case SQL_DIAG_ROW_NUMBER:
-                    rtnctype = SQL_C_LONG;
-                    *((SQLLEN *)DiagInfoPtr) = SQL_ROW_NUMBER_UNKNOWN;
-                    ret = SQL_SUCCESS;
-                    break;
-                case SQL_DIAG_COLUMN_NUMBER:
-                    rtnctype = SQL_C_LONG;
-                    *((SQLINTEGER *)DiagInfoPtr) = SQL_COLUMN_NUMBER_UNKNOWN;
-                    ret = SQL_SUCCESS;
-                    break;
-                case SQL_DIAG_RETURNCODE: /* driver manager returns */
-                    break;
-            }
-            break;
-        case SQL_HANDLE_DESC:
-            conn = DC_get_conn(((DescriptorClass *)Handle));
-            switch (DiagIdentifier) {
-                case SQL_DIAG_CLASS_ORIGIN:
-                case SQL_DIAG_SUBCLASS_ORIGIN:
-                case SQL_DIAG_CONNECTION_NAME:
-                    rtnlen = 0;
-                    if (DiagInfoPtr && BufferLength > rtnlen) {
-                        ret = SQL_SUCCESS;
-                        *((char *)DiagInfoPtr) = '\0';
-                    } else
-                        ret = SQL_SUCCESS_WITH_INFO;
-                    break;
-                case SQL_DIAG_SERVER_NAME:
-                    rtnlen = strlen(CC_get_DSN(conn));
-                    if (DiagInfoPtr) {
-                        strncpy_null(DiagInfoPtr, CC_get_DSN(conn),
-                                     BufferLength);
-                        ret = (BufferLength > rtnlen ? SQL_SUCCESS
-                                                     : SQL_SUCCESS_WITH_INFO);
-                    } else
-                        ret = SQL_SUCCESS_WITH_INFO;
-                    break;
-                case SQL_DIAG_MESSAGE_TEXT:
-                case SQL_DIAG_NATIVE:
-                case SQL_DIAG_NUMBER:
-                    break;
-                case SQL_DIAG_SQLSTATE:
-                    rtnlen = 5;
-                    ret = OPENSEARCHAPI_DescError(Handle, RecNumber, DiagInfoPtr, NULL,
-                                          NULL, 0, NULL, 0);
-                    if (SQL_SUCCESS_WITH_INFO == ret)
-                        ret = SQL_SUCCESS;
-                    break;
-                case SQL_DIAG_RETURNCODE: /* driver manager returns */
-                    break;
-                case SQL_DIAG_CURSOR_ROW_COUNT:
-                case SQL_DIAG_ROW_COUNT:
-                case SQL_DIAG_DYNAMIC_FUNCTION:
-                case SQL_DIAG_DYNAMIC_FUNCTION_CODE:
-                    rtnctype = SQL_C_LONG;
-                    /* options for statement type only */
-                    break;
-            }
-            break;
-        default:
-            ret = SQL_ERROR;
-    }
-    if (SQL_C_LONG == rtnctype) {
-        if (SQL_SUCCESS_WITH_INFO == ret)
-            ret = SQL_SUCCESS;
-        if (StringLengthPtr)
-            *StringLengthPtr = sizeof(SQLINTEGER);
-    } else if (rtnlen >= 0) {
-        if (rtnlen >= BufferLength) {
-            if (SQL_SUCCESS == ret)
-                ret = SQL_SUCCESS_WITH_INFO;
-            if (BufferLength > 0)
-                ((char *)DiagInfoPtr)[BufferLength - 1] = '\0';
-        }
-        if (StringLengthPtr)
-            *StringLengthPtr = (SQLSMALLINT)rtnlen;
-    }
-    MYLOG(OPENSEARCH_TRACE, "leaving %d\n", ret);
-    return ret;
-}
-
-/*	SQLGetConnectOption -> SQLGetconnectAttr */
-RETCODE SQL_API OPENSEARCHAPI_GetConnectAttr(HDBC ConnectionHandle,
-                                     SQLINTEGER Attribute, PTR Value,
-                                     SQLINTEGER BufferLength,
-                                     SQLINTEGER *StringLength) {
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-    RETCODE ret = SQL_SUCCESS;
-    SQLINTEGER len = 4;
-
-    MYLOG(OPENSEARCH_TRACE, "entering " FORMAT_INTEGER "\n", Attribute);
-    switch (Attribute) {
-        case SQL_ATTR_ASYNC_ENABLE:
-            *((SQLINTEGER *)Value) = SQL_ASYNC_ENABLE_OFF;
-            break;
-        case SQL_ATTR_AUTO_IPD:
-            *((SQLINTEGER *)Value) = SQL_FALSE;
-            break;
-        case SQL_ATTR_CONNECTION_DEAD:
-            *((SQLUINTEGER *)Value) = CC_not_connected(conn);
-            break;
-        case SQL_ATTR_CONNECTION_TIMEOUT:
-            *((SQLUINTEGER *)Value) = 0;
-            break;
-        case SQL_ATTR_METADATA_ID:
-            *((SQLUINTEGER *)Value) = conn->stmtOptions.metadata_id;
-            break;
-        case SQL_ATTR_ESOPT_DEBUG:
-            *((SQLINTEGER *)Value) = conn->connInfo.drivers.loglevel;
-            break;
-        case SQL_ATTR_ESOPT_COMMLOG:
-            *((SQLINTEGER *)Value) = conn->connInfo.drivers.loglevel;
-            break;
-        default:
-            ret = OPENSEARCHAPI_GetConnectOption(ConnectionHandle, (UWORD)Attribute,
-                                         Value, &len, BufferLength);
-    }
-    if (StringLength)
-        *StringLength = len;
-    return ret;
-}
-
-static SQLHDESC descHandleFromStatementHandle(HSTMT StatementHandle,
-                                              SQLINTEGER descType) {
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    switch (descType) {
-        case SQL_ATTR_APP_ROW_DESC: /* 10010 */
-            return (HSTMT)stmt->ard;
-        case SQL_ATTR_APP_PARAM_DESC: /* 10011 */
-            return (HSTMT)stmt->apd;
-        case SQL_ATTR_IMP_ROW_DESC: /* 10012 */
-            return (HSTMT)stmt->ird;
-        case SQL_ATTR_IMP_PARAM_DESC: /* 10013 */
-            return (HSTMT)stmt->ipd;
-    }
-    return (HSTMT)0;
-}
-
-static void column_bindings_set(ARDFields *opts, SQLSMALLINT cols,
-                                BOOL maxset) {
-    int i;
-
-    if (cols == opts->allocated)
-        return;
-    if (cols > opts->allocated) {
-        extend_column_bindings(opts, cols);
-        return;
-    }
-    if (maxset)
-        return;
-
-    for (i = opts->allocated; i > cols; i--)
-        reset_a_column_binding(opts, i);
-    opts->allocated = cols;
-    if (0 == cols) {
-        free(opts->bindings);
-        opts->bindings = NULL;
-    }
-}
-
-static RETCODE SQL_API ARDSetField(DescriptorClass *desc, SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength) {
-    UNUSED(BufferLength);
-    RETCODE ret = SQL_SUCCESS;
-    ARDFields *opts = &(desc->ardf);
-    SQLSMALLINT row_idx;
-    BOOL unbind = TRUE;
-
-    switch (FieldIdentifier) {
-        case SQL_DESC_ARRAY_SIZE:
-            opts->size_of_rowset = CAST_UPTR(SQLULEN, Value);
-            return ret;
-        case SQL_DESC_ARRAY_STATUS_PTR:
-            opts->row_operation_ptr = Value;
-            return ret;
-        case SQL_DESC_BIND_OFFSET_PTR:
-            opts->row_offset_ptr = Value;
-            return ret;
-        case SQL_DESC_BIND_TYPE:
-            opts->bind_size = CAST_UPTR(SQLUINTEGER, Value);
-            return ret;
-        case SQL_DESC_COUNT:
-            column_bindings_set(opts, CAST_PTR(SQLSMALLINT, Value), FALSE);
-            return ret;
-
-        case SQL_DESC_TYPE:
-        case SQL_DESC_DATETIME_INTERVAL_CODE:
-        case SQL_DESC_CONCISE_TYPE:
-            column_bindings_set(opts, RecNumber, TRUE);
-            break;
-    }
-    if (RecNumber < 0 || RecNumber > opts->allocated) {
-        DC_set_error(desc, DESC_INVALID_COLUMN_NUMBER_ERROR,
-                     "invalid column number");
-        return SQL_ERROR;
-    }
-    if (0 == RecNumber) /* bookmark column */
-    {
-        BindInfoClass *bookmark = ARD_AllocBookmark(opts);
-
-        switch (FieldIdentifier) {
-            case SQL_DESC_DATA_PTR:
-                bookmark->buffer = Value;
-                break;
-            case SQL_DESC_INDICATOR_PTR:
-                bookmark->indicator = Value;
-                break;
-            case SQL_DESC_OCTET_LENGTH_PTR:
-                bookmark->used = Value;
-                break;
-            default:
-                DC_set_error(desc, DESC_INVALID_COLUMN_NUMBER_ERROR,
-                             "invalid column number");
-                ret = SQL_ERROR;
-        }
-        return ret;
-    }
-    row_idx = RecNumber - 1;
-    switch (FieldIdentifier) {
-        case SQL_DESC_TYPE:
-            opts->bindings[row_idx].returntype = CAST_PTR(SQLSMALLINT, Value);
-            break;
-        case SQL_DESC_DATETIME_INTERVAL_CODE:
-            switch (opts->bindings[row_idx].returntype) {
-                case SQL_DATETIME:
-                case SQL_C_TYPE_DATE:
-                case SQL_C_TYPE_TIME:
-                case SQL_C_TYPE_TIMESTAMP:
-                    switch ((LONG_PTR)Value) {
-                        case SQL_CODE_DATE:
-                            opts->bindings[row_idx].returntype =
-                                SQL_C_TYPE_DATE;
-                            break;
-                        case SQL_CODE_TIME:
-                            opts->bindings[row_idx].returntype =
-                                SQL_C_TYPE_TIME;
-                            break;
-                        case SQL_CODE_TIMESTAMP:
-                            opts->bindings[row_idx].returntype =
-                                SQL_C_TYPE_TIMESTAMP;
-                            break;
-                    }
-                    break;
-            }
-            break;
-        case SQL_DESC_CONCISE_TYPE:
-            opts->bindings[row_idx].returntype = CAST_PTR(SQLSMALLINT, Value);
-            break;
-        case SQL_DESC_DATA_PTR:
-            unbind = FALSE;
-            opts->bindings[row_idx].buffer = Value;
-            break;
-        case SQL_DESC_INDICATOR_PTR:
-            unbind = FALSE;
-            opts->bindings[row_idx].indicator = Value;
-            break;
-        case SQL_DESC_OCTET_LENGTH_PTR:
-            unbind = FALSE;
-            opts->bindings[row_idx].used = Value;
-            break;
-        case SQL_DESC_OCTET_LENGTH:
-            opts->bindings[row_idx].buflen = CAST_PTR(SQLLEN, Value);
-            break;
-        case SQL_DESC_PRECISION:
-            opts->bindings[row_idx].precision = CAST_PTR(SQLSMALLINT, Value);
-            break;
-        case SQL_DESC_SCALE:
-            opts->bindings[row_idx].scale = CAST_PTR(SQLSMALLINT, Value);
-            break;
-        case SQL_DESC_ALLOC_TYPE: /* read-only */
-        case SQL_DESC_DATETIME_INTERVAL_PRECISION:
-        case SQL_DESC_LENGTH:
-        case SQL_DESC_NUM_PREC_RADIX:
-        default:
-            ret = SQL_ERROR;
-            DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
-                         "invalid descriptor identifier");
-    }
-    if (unbind)
-        opts->bindings[row_idx].buffer = NULL;
-    return ret;
-}
-
-static void parameter_bindings_set(APDFields *opts, SQLSMALLINT params,
-                                   BOOL maxset) {
-    int i;
-
-    if (params == opts->allocated)
-        return;
-    if (params > opts->allocated) {
-        extend_parameter_bindings(opts, params);
-        return;
-    }
-    if (maxset)
-        return;
-
-    for (i = opts->allocated; i > params; i--)
-        reset_a_parameter_binding(opts, i);
-    opts->allocated = params;
-    if (0 == params) {
-        free(opts->parameters);
-        opts->parameters = NULL;
-    }
-}
-
-static void parameter_ibindings_set(IPDFields *opts, SQLSMALLINT params,
-                                    BOOL maxset) {
-    int i;
-
-    if (params == opts->allocated)
-        return;
-    if (params > opts->allocated) {
-        extend_iparameter_bindings(opts, params);
-        return;
-    }
-    if (maxset)
-        return;
-
-    for (i = opts->allocated; i > params; i--)
-        reset_a_iparameter_binding(opts, i);
-    opts->allocated = params;
-    if (0 == params) {
-        free(opts->parameters);
-        opts->parameters = NULL;
-    }
-}
-
-static RETCODE SQL_API APDSetField(DescriptorClass *desc, SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength) {
-    UNUSED(BufferLength);
-    RETCODE ret = SQL_SUCCESS;
-    APDFields *opts = &(desc->apdf);
-    SQLSMALLINT para_idx;
-    BOOL unbind = TRUE;
-
-    switch (FieldIdentifier) {
-        case SQL_DESC_ARRAY_SIZE:
-            opts->paramset_size = CAST_UPTR(SQLUINTEGER, Value);
-            return ret;
-        case SQL_DESC_ARRAY_STATUS_PTR:
-            opts->param_operation_ptr = Value;
-            return ret;
-        case SQL_DESC_BIND_OFFSET_PTR:
-            opts->param_offset_ptr = Value;
-            return ret;
-        case SQL_DESC_BIND_TYPE:
-            opts->param_bind_type = CAST_UPTR(SQLUINTEGER, Value);
-            return ret;
-        case SQL_DESC_COUNT:
-            parameter_bindings_set(opts, CAST_PTR(SQLSMALLINT, Value), FALSE);
-            return ret;
-
-        case SQL_DESC_TYPE:
-        case SQL_DESC_DATETIME_INTERVAL_CODE:
-        case SQL_DESC_CONCISE_TYPE:
-            parameter_bindings_set(opts, RecNumber, TRUE);
-            break;
-    }
-    if (RecNumber <= 0) {
-        MYLOG(OPENSEARCH_ALL, "RecN=%d allocated=%d\n", RecNumber, opts->allocated);
-        DC_set_error(desc, DESC_BAD_PARAMETER_NUMBER_ERROR,
-                     "bad parameter number");
-        return SQL_ERROR;
-    }
-    if (RecNumber > opts->allocated) {
-        MYLOG(OPENSEARCH_ALL, "RecN=%d allocated=%d\n", RecNumber, opts->allocated);
-        parameter_bindings_set(opts, RecNumber, TRUE);
-        /* DC_set_error(desc, DESC_BAD_PARAMETER_NUMBER_ERROR,
-                "bad parameter number");
-        return SQL_ERROR;*/
-    }
-    para_idx = RecNumber - 1;
-    switch (FieldIdentifier) {
-        case SQL_DESC_TYPE:
-            opts->parameters[para_idx].CType = CAST_PTR(SQLSMALLINT, Value);
-            break;
-        case SQL_DESC_DATETIME_INTERVAL_CODE:
-            switch (opts->parameters[para_idx].CType) {
-                case SQL_DATETIME:
-                case SQL_C_TYPE_DATE:
-                case SQL_C_TYPE_TIME:
-                case SQL_C_TYPE_TIMESTAMP:
-                    switch ((LONG_PTR)Value) {
-                        case SQL_CODE_DATE:
-                            opts->parameters[para_idx].CType = SQL_C_TYPE_DATE;
-                            break;
-                        case SQL_CODE_TIME:
-                            opts->parameters[para_idx].CType = SQL_C_TYPE_TIME;
-                            break;
-                        case SQL_CODE_TIMESTAMP:
-                            opts->parameters[para_idx].CType =
-                                SQL_C_TYPE_TIMESTAMP;
-                            break;
-                    }
-                    break;
-            }
-            break;
-        case SQL_DESC_CONCISE_TYPE:
-            opts->parameters[para_idx].CType = CAST_PTR(SQLSMALLINT, Value);
-            break;
-        case SQL_DESC_DATA_PTR:
-            unbind = FALSE;
-            opts->parameters[para_idx].buffer = Value;
-            break;
-        case SQL_DESC_INDICATOR_PTR:
-            unbind = FALSE;
-            opts->parameters[para_idx].indicator = Value;
-            break;
-        case SQL_DESC_OCTET_LENGTH:
-            opts->parameters[para_idx].buflen = CAST_PTR(Int4, Value);
-            break;
-        case SQL_DESC_OCTET_LENGTH_PTR:
-            unbind = FALSE;
-            opts->parameters[para_idx].used = Value;
-            break;
-        case SQL_DESC_PRECISION:
-            opts->parameters[para_idx].precision = CAST_PTR(SQLSMALLINT, Value);
-            break;
-        case SQL_DESC_SCALE:
-            opts->parameters[para_idx].scale = CAST_PTR(SQLSMALLINT, Value);
-            break;
-        case SQL_DESC_ALLOC_TYPE: /* read-only */
-        case SQL_DESC_DATETIME_INTERVAL_PRECISION:
-        case SQL_DESC_LENGTH:
-        case SQL_DESC_NUM_PREC_RADIX:
-        default:
-            ret = SQL_ERROR;
-            DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
-                         "invaid descriptor identifier");
-    }
-    if (unbind)
-        opts->parameters[para_idx].buffer = NULL;
-
-    return ret;
-}
-
-static RETCODE SQL_API IRDSetField(DescriptorClass *desc, SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength) {
-    UNUSED(BufferLength, RecNumber);
-    RETCODE ret = SQL_SUCCESS;
-    IRDFields *opts = &(desc->irdf);
-
-    switch (FieldIdentifier) {
-        case SQL_DESC_ARRAY_STATUS_PTR:
-            opts->rowStatusArray = (SQLUSMALLINT *)Value;
-            break;
-        case SQL_DESC_ROWS_PROCESSED_PTR:
-            opts->rowsFetched = (SQLULEN *)Value;
-            break;
-        case SQL_DESC_ALLOC_TYPE:                  /* read-only */
-        case SQL_DESC_COUNT:                       /* read-only */
-        case SQL_DESC_AUTO_UNIQUE_VALUE:           /* read-only */
-        case SQL_DESC_BASE_COLUMN_NAME:            /* read-only */
-        case SQL_DESC_BASE_TABLE_NAME:             /* read-only */
-        case SQL_DESC_CASE_SENSITIVE:              /* read-only */
-        case SQL_DESC_CATALOG_NAME:                /* read-only */
-        case SQL_DESC_CONCISE_TYPE:                /* read-only */
-        case SQL_DESC_DATETIME_INTERVAL_CODE:      /* read-only */
-        case SQL_DESC_DATETIME_INTERVAL_PRECISION: /* read-only */
-        case SQL_DESC_DISPLAY_SIZE:                /* read-only */
-        case SQL_DESC_FIXED_PREC_SCALE:            /* read-only */
-        case SQL_DESC_LABEL:                       /* read-only */
-        case SQL_DESC_LENGTH:                      /* read-only */
-        case SQL_DESC_LITERAL_PREFIX:              /* read-only */
-        case SQL_DESC_LITERAL_SUFFIX:              /* read-only */
-        case SQL_DESC_LOCAL_TYPE_NAME:             /* read-only */
-        case SQL_DESC_NAME:                        /* read-only */
-        case SQL_DESC_NULLABLE:                    /* read-only */
-        case SQL_DESC_NUM_PREC_RADIX:              /* read-only */
-        case SQL_DESC_OCTET_LENGTH:                /* read-only */
-        case SQL_DESC_PRECISION:                   /* read-only */
-        case SQL_DESC_ROWVER:                      /* read-only */
-        case SQL_DESC_SCALE:                       /* read-only */
-        case SQL_DESC_SCHEMA_NAME:                 /* read-only */
-        case SQL_DESC_SEARCHABLE:                  /* read-only */
-        case SQL_DESC_TABLE_NAME:                  /* read-only */
-        case SQL_DESC_TYPE:                        /* read-only */
-        case SQL_DESC_TYPE_NAME:                   /* read-only */
-        case SQL_DESC_UNNAMED:                     /* read-only */
-        case SQL_DESC_UNSIGNED:                    /* read-only */
-        case SQL_DESC_UPDATABLE:                   /* read-only */
-        default:
-            ret = SQL_ERROR;
-            DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
-                         "invalid descriptor identifier");
-    }
-    return ret;
-}
-
-static RETCODE SQL_API IPDSetField(DescriptorClass *desc, SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength) {
-    UNUSED(BufferLength);
-    RETCODE ret = SQL_SUCCESS;
-    IPDFields *ipdopts = &(desc->ipdf);
-    SQLSMALLINT para_idx;
-
-    switch (FieldIdentifier) {
-        case SQL_DESC_ARRAY_STATUS_PTR:
-            ipdopts->param_status_ptr = (SQLUSMALLINT *)Value;
-            return ret;
-        case SQL_DESC_ROWS_PROCESSED_PTR:
-            ipdopts->param_processed_ptr = (SQLULEN *)Value;
-            return ret;
-        case SQL_DESC_COUNT:
-            parameter_ibindings_set(ipdopts, CAST_PTR(SQLSMALLINT, Value),
-                                    FALSE);
-            return ret;
-        case SQL_DESC_UNNAMED: /* only SQL_UNNAMED is allowed */
-            if (SQL_UNNAMED != CAST_PTR(SQLSMALLINT, Value)) {
-                ret = SQL_ERROR;
-                DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
-                             "invalid descriptor identifier");
-                return ret;
-            }
-        case SQL_DESC_NAME:
-        case SQL_DESC_TYPE:
-        case SQL_DESC_DATETIME_INTERVAL_CODE:
-        case SQL_DESC_CONCISE_TYPE:
-            parameter_ibindings_set(ipdopts, RecNumber, TRUE);
-            break;
-    }
-    if (RecNumber <= 0 || RecNumber > ipdopts->allocated) {
-        MYLOG(OPENSEARCH_ALL, "RecN=%d allocated=%d\n", RecNumber, ipdopts->allocated);
-        DC_set_error(desc, DESC_BAD_PARAMETER_NUMBER_ERROR,
-                     "bad parameter number");
-        return SQL_ERROR;
-    }
-    para_idx = RecNumber - 1;
-    switch (FieldIdentifier) {
-        case SQL_DESC_TYPE:
-            if (ipdopts->parameters[para_idx].SQLType
-                != CAST_PTR(SQLSMALLINT, Value)) {
-                reset_a_iparameter_binding(ipdopts, RecNumber);
-                ipdopts->parameters[para_idx].SQLType =
-                    CAST_PTR(SQLSMALLINT, Value);
-            }
-            break;
-        case SQL_DESC_DATETIME_INTERVAL_CODE:
-            switch (ipdopts->parameters[para_idx].SQLType) {
-                case SQL_DATETIME:
-                case SQL_TYPE_DATE:
-                case SQL_TYPE_TIME:
-                case SQL_TYPE_TIMESTAMP:
-                    switch ((LONG_PTR)Value) {
-                        case SQL_CODE_DATE:
-                            ipdopts->parameters[para_idx].SQLType =
-                                SQL_TYPE_DATE;
-                            break;
-                        case SQL_CODE_TIME:
-                            ipdopts->parameters[para_idx].SQLType =
-                                SQL_TYPE_TIME;
-                            break;
-                        case SQL_CODE_TIMESTAMP:
-                            ipdopts->parameters[para_idx].SQLType =
-                                SQL_TYPE_TIMESTAMP;
-                            break;
-                    }
-                    break;
-            }
-            break;
-        case SQL_DESC_CONCISE_TYPE:
-            ipdopts->parameters[para_idx].SQLType =
-                CAST_PTR(SQLSMALLINT, Value);
-            break;
-        case SQL_DESC_NAME:
-            if (Value)
-                STR_TO_NAME(ipdopts->parameters[para_idx].paramName, Value);
-            else
-                NULL_THE_NAME(ipdopts->parameters[para_idx].paramName);
-            break;
-        case SQL_DESC_PARAMETER_TYPE:
-            ipdopts->parameters[para_idx].paramType =
-                CAST_PTR(SQLSMALLINT, Value);
-            break;
-        case SQL_DESC_SCALE:
-            ipdopts->parameters[para_idx].decimal_digits =
-                CAST_PTR(SQLSMALLINT, Value);
-            break;
-        case SQL_DESC_UNNAMED: /* only SQL_UNNAMED is allowed */
-            if (SQL_UNNAMED != CAST_PTR(SQLSMALLINT, Value)) {
-                ret = SQL_ERROR;
-                DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
-                             "invalid descriptor identifier");
-            } else
-                NULL_THE_NAME(ipdopts->parameters[para_idx].paramName);
-            break;
-        case SQL_DESC_ALLOC_TYPE:     /* read-only */
-        case SQL_DESC_CASE_SENSITIVE: /* read-only */
-        case SQL_DESC_DATETIME_INTERVAL_PRECISION:
-        case SQL_DESC_FIXED_PREC_SCALE: /* read-only */
-        case SQL_DESC_LENGTH:
-        case SQL_DESC_LOCAL_TYPE_NAME: /* read-only */
-        case SQL_DESC_NULLABLE:        /* read-only */
-        case SQL_DESC_NUM_PREC_RADIX:
-        case SQL_DESC_OCTET_LENGTH:
-        case SQL_DESC_PRECISION:
-        case SQL_DESC_ROWVER:    /* read-only */
-        case SQL_DESC_TYPE_NAME: /* read-only */
-        case SQL_DESC_UNSIGNED:  /* read-only */
-        default:
-            ret = SQL_ERROR;
-            DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
-                         "invalid descriptor identifier");
-    }
-    return ret;
-}
-
-static RETCODE SQL_API ARDGetField(DescriptorClass *desc, SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength,
-                                   SQLINTEGER *StringLength) {
-    UNUSED(BufferLength);
-    RETCODE ret = SQL_SUCCESS;
-    SQLLEN ival = 0;
-    SQLINTEGER len, rettype = 0;
-    PTR ptr = NULL;
-    const ARDFields *opts = &(desc->ardf);
-    SQLSMALLINT row_idx;
-
-    len = sizeof(SQLINTEGER);
-    if (0 == RecNumber) /* bookmark */
-    {
-        BindInfoClass *bookmark = opts->bookmark;
-        switch (FieldIdentifier) {
-            case SQL_DESC_DATA_PTR:
-                rettype = SQL_IS_POINTER;
-                ptr = bookmark ? bookmark->buffer : NULL;
-                break;
-            case SQL_DESC_INDICATOR_PTR:
-                rettype = SQL_IS_POINTER;
-                ptr = bookmark ? bookmark->indicator : NULL;
-                break;
-            case SQL_DESC_OCTET_LENGTH_PTR:
-                rettype = SQL_IS_POINTER;
-                ptr = bookmark ? bookmark->used : NULL;
-                break;
-        }
-        if (ptr) {
-            *((void **)Value) = ptr;
-            if (StringLength)
-                *StringLength = len;
-            return ret;
-        }
-    }
-    switch (FieldIdentifier) {
-        case SQL_DESC_ARRAY_SIZE:
-        case SQL_DESC_ARRAY_STATUS_PTR:
-        case SQL_DESC_BIND_OFFSET_PTR:
-        case SQL_DESC_BIND_TYPE:
-        case SQL_DESC_COUNT:
-            break;
-        default:
-            if (RecNumber <= 0 || RecNumber > opts->allocated) {
-                DC_set_error(desc, DESC_INVALID_COLUMN_NUMBER_ERROR,
-                             "invalid column number");
-                return SQL_ERROR;
-            }
-    }
-    row_idx = RecNumber - 1;
-    switch (FieldIdentifier) {
-        case SQL_DESC_ARRAY_SIZE:
-            ival = opts->size_of_rowset;
-            break;
-        case SQL_DESC_ARRAY_STATUS_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->row_operation_ptr;
-            break;
-        case SQL_DESC_BIND_OFFSET_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->row_offset_ptr;
-            break;
-        case SQL_DESC_BIND_TYPE:
-            ival = opts->bind_size;
-            break;
-        case SQL_DESC_TYPE:
-            rettype = SQL_IS_SMALLINT;
-            switch (opts->bindings[row_idx].returntype) {
-                case SQL_C_TYPE_DATE:
-                case SQL_C_TYPE_TIME:
-                case SQL_C_TYPE_TIMESTAMP:
-                    ival = SQL_DATETIME;
-                    break;
-                default:
-                    ival = opts->bindings[row_idx].returntype;
-            }
-            break;
-        case SQL_DESC_DATETIME_INTERVAL_CODE:
-            rettype = SQL_IS_SMALLINT;
-            switch (opts->bindings[row_idx].returntype) {
-                case SQL_C_TYPE_DATE:
-                    ival = SQL_CODE_DATE;
-                    break;
-                case SQL_C_TYPE_TIME:
-                    ival = SQL_CODE_TIME;
-                    break;
-                case SQL_C_TYPE_TIMESTAMP:
-                    ival = SQL_CODE_TIMESTAMP;
-                    break;
-                default:
-                    ival = 0;
-                    break;
-            }
-            break;
-        case SQL_DESC_CONCISE_TYPE:
-            rettype = SQL_IS_SMALLINT;
-            ival = opts->bindings[row_idx].returntype;
-            break;
-        case SQL_DESC_DATA_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->bindings[row_idx].buffer;
-            break;
-        case SQL_DESC_INDICATOR_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->bindings[row_idx].indicator;
-            break;
-        case SQL_DESC_OCTET_LENGTH_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->bindings[row_idx].used;
-            break;
-        case SQL_DESC_COUNT:
-            rettype = SQL_IS_SMALLINT;
-            ival = opts->allocated;
-            break;
-        case SQL_DESC_OCTET_LENGTH:
-            ival = opts->bindings[row_idx].buflen;
-            break;
-        case SQL_DESC_ALLOC_TYPE: /* read-only */
-            rettype = SQL_IS_SMALLINT;
-            if (DC_get_embedded(desc))
-                ival = SQL_DESC_ALLOC_AUTO;
-            else
-                ival = SQL_DESC_ALLOC_USER;
-            break;
-        case SQL_DESC_PRECISION:
-            rettype = SQL_IS_SMALLINT;
-            ival = opts->bindings[row_idx].precision;
-            break;
-        case SQL_DESC_SCALE:
-            rettype = SQL_IS_SMALLINT;
-            ival = opts->bindings[row_idx].scale;
-            break;
-        case SQL_DESC_NUM_PREC_RADIX:
-            ival = 10;
-            break;
-        case SQL_DESC_DATETIME_INTERVAL_PRECISION:
-        case SQL_DESC_LENGTH:
-        default:
-            ret = SQL_ERROR;
-            DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
-                         "invalid descriptor identifier");
-    }
-    switch (rettype) {
-        case 0:
-        case SQL_IS_INTEGER:
-            len = sizeof(SQLINTEGER);
-            *((SQLINTEGER *)Value) = (SQLINTEGER)ival;
-            break;
-        case SQL_IS_SMALLINT:
-            len = sizeof(SQLSMALLINT);
-            *((SQLSMALLINT *)Value) = (SQLSMALLINT)ival;
-            break;
-        case SQL_IS_POINTER:
-            len = sizeof(SQLPOINTER);
-            *((void **)Value) = ptr;
-            break;
-    }
-
-    if (StringLength)
-        *StringLength = len;
-    return ret;
-}
-
-static RETCODE SQL_API APDGetField(DescriptorClass *desc, SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength,
-                                   SQLINTEGER *StringLength) {
-    UNUSED(BufferLength);
-    RETCODE ret = SQL_SUCCESS;
-    SQLLEN ival = 0;
-    SQLINTEGER len, rettype = 0;
-    PTR ptr = NULL;
-    const APDFields *opts = (const APDFields *)&(desc->apdf);
-    SQLSMALLINT para_idx;
-
-    len = sizeof(SQLINTEGER);
-    switch (FieldIdentifier) {
-        case SQL_DESC_ARRAY_SIZE:
-        case SQL_DESC_ARRAY_STATUS_PTR:
-        case SQL_DESC_BIND_OFFSET_PTR:
-        case SQL_DESC_BIND_TYPE:
-        case SQL_DESC_COUNT:
-            break;
-        default:
-            if (RecNumber <= 0 || RecNumber > opts->allocated) {
-                MYLOG(OPENSEARCH_ALL, "RecN=%d allocated=%d\n", RecNumber,
-                      opts->allocated);
-                DC_set_error(desc, DESC_BAD_PARAMETER_NUMBER_ERROR,
-                             "bad parameter number");
-                return SQL_ERROR;
-            }
-    }
-    para_idx = RecNumber - 1;
-    switch (FieldIdentifier) {
-        case SQL_DESC_ARRAY_SIZE:
-            rettype = SQL_IS_LEN;
-            ival = opts->paramset_size;
-            break;
-        case SQL_DESC_ARRAY_STATUS_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->param_operation_ptr;
-            break;
-        case SQL_DESC_BIND_OFFSET_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->param_offset_ptr;
-            break;
-        case SQL_DESC_BIND_TYPE:
-            ival = opts->param_bind_type;
-            break;
-
-        case SQL_DESC_TYPE:
-            rettype = SQL_IS_SMALLINT;
-            switch (opts->parameters[para_idx].CType) {
-                case SQL_C_TYPE_DATE:
-                case SQL_C_TYPE_TIME:
-                case SQL_C_TYPE_TIMESTAMP:
-                    ival = SQL_DATETIME;
-                    break;
-                default:
-                    ival = opts->parameters[para_idx].CType;
-            }
-            break;
-        case SQL_DESC_DATETIME_INTERVAL_CODE:
-            rettype = SQL_IS_SMALLINT;
-            switch (opts->parameters[para_idx].CType) {
-                case SQL_C_TYPE_DATE:
-                    ival = SQL_CODE_DATE;
-                    break;
-                case SQL_C_TYPE_TIME:
-                    ival = SQL_CODE_TIME;
-                    break;
-                case SQL_C_TYPE_TIMESTAMP:
-                    ival = SQL_CODE_TIMESTAMP;
-                    break;
-                default:
-                    ival = 0;
-                    break;
-            }
-            break;
-        case SQL_DESC_CONCISE_TYPE:
-            rettype = SQL_IS_SMALLINT;
-            ival = opts->parameters[para_idx].CType;
-            break;
-        case SQL_DESC_DATA_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->parameters[para_idx].buffer;
-            break;
-        case SQL_DESC_INDICATOR_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->parameters[para_idx].indicator;
-            break;
-        case SQL_DESC_OCTET_LENGTH:
-            ival = opts->parameters[para_idx].buflen;
-            break;
-        case SQL_DESC_OCTET_LENGTH_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->parameters[para_idx].used;
-            break;
-        case SQL_DESC_COUNT:
-            rettype = SQL_IS_SMALLINT;
-            ival = opts->allocated;
-            break;
-        case SQL_DESC_ALLOC_TYPE: /* read-only */
-            rettype = SQL_IS_SMALLINT;
-            if (DC_get_embedded(desc))
-                ival = SQL_DESC_ALLOC_AUTO;
-            else
-                ival = SQL_DESC_ALLOC_USER;
-            break;
-        case SQL_DESC_NUM_PREC_RADIX:
-            ival = 10;
-            break;
-        case SQL_DESC_PRECISION:
-            rettype = SQL_IS_SMALLINT;
-            ival = opts->parameters[para_idx].precision;
-            break;
-        case SQL_DESC_SCALE:
-            rettype = SQL_IS_SMALLINT;
-            ival = opts->parameters[para_idx].scale;
-            break;
-        case SQL_DESC_DATETIME_INTERVAL_PRECISION:
-        case SQL_DESC_LENGTH:
-        default:
-            ret = SQL_ERROR;
-            DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
-                         "invalid descriptor identifer");
-    }
-    switch (rettype) {
-        case SQL_IS_LEN:
-            len = sizeof(SQLLEN);
-            *((SQLLEN *)Value) = ival;
-            break;
-        case 0:
-        case SQL_IS_INTEGER:
-            len = sizeof(SQLINTEGER);
-            *((SQLINTEGER *)Value) = (SQLINTEGER)ival;
-            break;
-        case SQL_IS_SMALLINT:
-            len = sizeof(SQLSMALLINT);
-            *((SQLSMALLINT *)Value) = (SQLSMALLINT)ival;
-            break;
-        case SQL_IS_POINTER:
-            len = sizeof(SQLPOINTER);
-            *((void **)Value) = ptr;
-            break;
-    }
-
-    if (StringLength)
-        *StringLength = len;
-    return ret;
-}
-
-static RETCODE SQL_API IRDGetField(DescriptorClass *desc, SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength,
-                                   SQLINTEGER *StringLength) {
-    RETCODE ret = SQL_SUCCESS;
-    SQLLEN ival = 0;
-    SQLINTEGER len = 0, rettype = 0;
-    PTR ptr = NULL;
-    BOOL bCallColAtt = FALSE;
-    const IRDFields *opts = &(desc->irdf);
-
-    switch (FieldIdentifier) {
-        case SQL_DESC_ROWVER: /* read-only */
-            // Database is read-only, and does not support transactions
-            rettype = SQL_IS_SMALLINT;
-            ival = SQL_FALSE;
-            break;
-        case SQL_DESC_ARRAY_STATUS_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->rowStatusArray;
-            break;
-        case SQL_DESC_ROWS_PROCESSED_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = opts->rowsFetched;
-            break;
-        case SQL_DESC_ALLOC_TYPE: /* read-only */
-            rettype = SQL_IS_SMALLINT;
-            ival = SQL_DESC_ALLOC_AUTO;
-            break;
-        case SQL_DESC_AUTO_UNIQUE_VALUE:           /* read-only */
-        case SQL_DESC_CASE_SENSITIVE:              /* read-only */
-        case SQL_DESC_DATETIME_INTERVAL_PRECISION: /* read-only */
-        case SQL_DESC_NUM_PREC_RADIX:              /* read-only */
-            rettype = SQL_IS_INTEGER;
-            bCallColAtt = TRUE;
-            break;
-        case SQL_DESC_DISPLAY_SIZE:                /* read-only */
-        case SQL_DESC_LENGTH:                      /* read-only */
-        case SQL_DESC_OCTET_LENGTH:                /* read-only */
-            rettype = SQL_IS_LEN;
-            bCallColAtt = TRUE;
-            break;
-        case SQL_DESC_NULLABLE:                    /* read-only */
-        case SQL_DESC_FIXED_PREC_SCALE:            /* read-only */
-        case SQL_DESC_DATETIME_INTERVAL_CODE:      /* read-only */
-        case SQL_DESC_CONCISE_TYPE:                /* read-only */
-        case SQL_DESC_COUNT:                       /* read-only */
-        case SQL_DESC_PRECISION:                   /* read-only */
-        case SQL_DESC_SCALE:                       /* read-only */
-        case SQL_DESC_SEARCHABLE:                  /* read-only */
-        case SQL_DESC_TYPE:                        /* read-only */
-        case SQL_DESC_UNNAMED:                     /* read-only */
-        case SQL_DESC_UNSIGNED:                    /* read-only */
-        case SQL_DESC_UPDATABLE:                   /* read-only */
-            rettype = SQL_IS_SMALLINT;
-            bCallColAtt = TRUE;
-            break;
-        case SQL_DESC_BASE_COLUMN_NAME: /* read-only */
-        case SQL_DESC_BASE_TABLE_NAME:  /* read-only */
-        case SQL_DESC_CATALOG_NAME:     /* read-only */
-        case SQL_DESC_LABEL:            /* read-only */
-        case SQL_DESC_LITERAL_PREFIX:   /* read-only */
-        case SQL_DESC_LITERAL_SUFFIX:   /* read-only */
-        case SQL_DESC_LOCAL_TYPE_NAME:  /* read-only */
-        case SQL_DESC_NAME:             /* read-only */
-        case SQL_DESC_SCHEMA_NAME:      /* read-only */
-        case SQL_DESC_TABLE_NAME:       /* read-only */
-        case SQL_DESC_TYPE_NAME:        /* read-only */
-            rettype = SQL_NTS;
-            bCallColAtt = TRUE;
-            break;
-        default:
-            ret = SQL_ERROR;
-            DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
-                         "invalid descriptor identifier");
-    }
-    if (bCallColAtt) {
-        SQLSMALLINT pcbL;
-        StatementClass *stmt;
-
-        stmt = opts->stmt;
-        ret = OPENSEARCHAPI_ColAttributes(stmt, RecNumber, FieldIdentifier, Value,
-                                  (SQLSMALLINT)BufferLength, &pcbL, &ival);
-        len = pcbL;
-    }
-    switch (rettype) {
-        case 0:
-        case SQL_IS_INTEGER:
-            len = sizeof(SQLINTEGER);
-            *((SQLINTEGER *)Value) = (SQLINTEGER)ival;
-            break;
-        case SQL_IS_UINTEGER:
-            len = sizeof(SQLUINTEGER);
-            *((SQLUINTEGER *)Value) = (SQLUINTEGER)ival;
-            break;
-        case SQL_IS_SMALLINT:
-            len = sizeof(SQLSMALLINT);
-            *((SQLSMALLINT *)Value) = (SQLSMALLINT)ival;
-            break;
-        case SQL_IS_POINTER:
-            len = sizeof(SQLPOINTER);
-            *((void **)Value) = ptr;
-            break;
-        case SQL_NTS:
-            break;
-    }
-
-    if (StringLength)
-        *StringLength = len;
-    return ret;
-}
-
-static RETCODE SQL_API IPDGetField(DescriptorClass *desc, SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength,
-                                   SQLINTEGER *StringLength) {
-    UNUSED(BufferLength);
-    RETCODE ret = SQL_SUCCESS;
-    SQLINTEGER ival = 0, len = 0, rettype = 0;
-    PTR ptr = NULL;
-    const IPDFields *ipdopts = (const IPDFields *)&(desc->ipdf);
-    SQLSMALLINT para_idx;
-
-    switch (FieldIdentifier) {
-        case SQL_DESC_ARRAY_STATUS_PTR:
-        case SQL_DESC_ROWS_PROCESSED_PTR:
-        case SQL_DESC_COUNT:
-            break;
-        default:
-            if (RecNumber <= 0 || RecNumber > ipdopts->allocated) {
-                MYLOG(OPENSEARCH_ALL, "RecN=%d allocated=%d\n", RecNumber,
-                      ipdopts->allocated);
-                DC_set_error(desc, DESC_BAD_PARAMETER_NUMBER_ERROR,
-                             "bad parameter number");
-                return SQL_ERROR;
-            }
-    }
-    para_idx = RecNumber - 1;
-    switch (FieldIdentifier) {
-        case SQL_DESC_ARRAY_STATUS_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = ipdopts->param_status_ptr;
-            break;
-        case SQL_DESC_ROWS_PROCESSED_PTR:
-            rettype = SQL_IS_POINTER;
-            ptr = ipdopts->param_processed_ptr;
-            break;
-        case SQL_DESC_UNNAMED:
-            rettype = SQL_IS_SMALLINT;
-            ival = NAME_IS_NULL(ipdopts->parameters[para_idx].paramName)
-                       ? SQL_UNNAMED
-                       : SQL_NAMED;
-            break;
-        case SQL_DESC_TYPE:
-            rettype = SQL_IS_SMALLINT;
-            switch (ipdopts->parameters[para_idx].SQLType) {
-                case SQL_TYPE_DATE:
-                case SQL_TYPE_TIME:
-                case SQL_TYPE_TIMESTAMP:
-                    ival = SQL_DATETIME;
-                    break;
-                default:
-                    ival = ipdopts->parameters[para_idx].SQLType;
-            }
-            break;
-        case SQL_DESC_DATETIME_INTERVAL_CODE:
-            rettype = SQL_IS_SMALLINT;
-            switch (ipdopts->parameters[para_idx].SQLType) {
-                case SQL_TYPE_DATE:
-                    ival = SQL_CODE_DATE;
-                    break;
-                case SQL_TYPE_TIME:
-                    ival = SQL_CODE_TIME;
-                    break;
-                case SQL_TYPE_TIMESTAMP:
-                    ival = SQL_CODE_TIMESTAMP;
-                    break;
-                default:
-                    ival = 0;
-            }
-            break;
-        case SQL_DESC_CONCISE_TYPE:
-            rettype = SQL_IS_SMALLINT;
-            ival = ipdopts->parameters[para_idx].SQLType;
-            break;
-        case SQL_DESC_COUNT:
-            rettype = SQL_IS_SMALLINT;
-            ival = ipdopts->allocated;
-            break;
-        case SQL_DESC_PARAMETER_TYPE:
-            rettype = SQL_IS_SMALLINT;
-            ival = ipdopts->parameters[para_idx].paramType;
-            break;
-        case SQL_DESC_PRECISION:
-            rettype = SQL_IS_SMALLINT;
-            switch (ipdopts->parameters[para_idx].SQLType) {
-                case SQL_TYPE_DATE:
-                case SQL_TYPE_TIME:
-                case SQL_TYPE_TIMESTAMP:
-                case SQL_DATETIME:
-                    ival = ipdopts->parameters[para_idx].decimal_digits;
-                    break;
-            }
-            break;
-        case SQL_DESC_SCALE:
-            rettype = SQL_IS_SMALLINT;
-            switch (ipdopts->parameters[para_idx].SQLType) {
-                case SQL_NUMERIC:
-                    ival = ipdopts->parameters[para_idx].decimal_digits;
-                    break;
-            }
-            break;
-        case SQL_DESC_ALLOC_TYPE: /* read-only */
-            rettype = SQL_IS_SMALLINT;
-            ival = SQL_DESC_ALLOC_AUTO;
-            break;
-        case SQL_DESC_CASE_SENSITIVE: /* read-only */
-        case SQL_DESC_DATETIME_INTERVAL_PRECISION:
-        case SQL_DESC_FIXED_PREC_SCALE: /* read-only */
-        case SQL_DESC_LENGTH:
-        case SQL_DESC_LOCAL_TYPE_NAME: /* read-only */
-        case SQL_DESC_NAME:
-        case SQL_DESC_NULLABLE: /* read-only */
-        case SQL_DESC_NUM_PREC_RADIX:
-        case SQL_DESC_OCTET_LENGTH:
-        case SQL_DESC_ROWVER:    /* read-only */
-        case SQL_DESC_TYPE_NAME: /* read-only */
-        case SQL_DESC_UNSIGNED:  /* read-only */
-        default:
-            ret = SQL_ERROR;
-            DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
-                         "invalid descriptor identifier");
-    }
-    switch (rettype) {
-        case 0:
-        case SQL_IS_INTEGER:
-            len = sizeof(SQLINTEGER);
-            *((SQLINTEGER *)Value) = ival;
-            break;
-        case SQL_IS_SMALLINT:
-            len = sizeof(SQLSMALLINT);
-            *((SQLSMALLINT *)Value) = (SQLSMALLINT)ival;
-            break;
-        case SQL_IS_POINTER:
-            len = sizeof(SQLPOINTER);
-            *((void **)Value) = ptr;
-            break;
-    }
-
-    if (StringLength)
-        *StringLength = len;
-    return ret;
-}
-
-/*	SQLGetStmtOption -> SQLGetStmtAttr */
-RETCODE SQL_API OPENSEARCHAPI_GetStmtAttr(HSTMT StatementHandle, SQLINTEGER Attribute,
-                                  PTR Value, SQLINTEGER BufferLength,
-                                  SQLINTEGER *StringLength) {
-    CSTR func = "OPENSEARCHAPI_GetStmtAttr";
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-    RETCODE ret = SQL_SUCCESS;
-    SQLINTEGER len = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "entering Handle=%p " FORMAT_INTEGER "\n", StatementHandle,
-          Attribute);
-    switch (Attribute) {
-        case SQL_ATTR_FETCH_BOOKMARK_PTR: /* 16 */
-            *((void **)Value) = stmt->options.bookmark_ptr;
-            len = sizeof(SQLPOINTER);
-            break;
-        case SQL_ATTR_PARAM_BIND_OFFSET_PTR: /* 17 */
-            *((SQLULEN **)Value) = SC_get_APDF(stmt)->param_offset_ptr;
-            len = sizeof(SQLPOINTER);
-            break;
-        case SQL_ATTR_PARAM_BIND_TYPE: /* 18 */
-            *((SQLUINTEGER *)Value) = SC_get_APDF(stmt)->param_bind_type;
-            len = sizeof(SQLUINTEGER);
-            break;
-        case SQL_ATTR_PARAM_OPERATION_PTR: /* 19 */
-            *((SQLUSMALLINT **)Value) = SC_get_APDF(stmt)->param_operation_ptr;
-            len = sizeof(SQLPOINTER);
-            break;
-        case SQL_ATTR_PARAM_STATUS_PTR: /* 20 */
-            *((SQLUSMALLINT **)Value) = SC_get_IPDF(stmt)->param_status_ptr;
-            len = sizeof(SQLPOINTER);
-            break;
-        case SQL_ATTR_PARAMS_PROCESSED_PTR: /* 21 */
-            *((SQLULEN **)Value) = SC_get_IPDF(stmt)->param_processed_ptr;
-            len = sizeof(SQLPOINTER);
-            break;
-        case SQL_ATTR_PARAMSET_SIZE: /* 22 */
-            *((SQLULEN *)Value) = SC_get_APDF(stmt)->paramset_size;
-            len = sizeof(SQLUINTEGER);
-            break;
-        case SQL_ATTR_ROW_BIND_OFFSET_PTR: /* 23 */
-            *((SQLULEN **)Value) = SC_get_ARDF(stmt)->row_offset_ptr;
-            len = 4;
-            break;
-        case SQL_ATTR_ROW_OPERATION_PTR: /* 24 */
-            *((SQLUSMALLINT **)Value) = SC_get_ARDF(stmt)->row_operation_ptr;
-            len = 4;
-            break;
-        case SQL_ATTR_ROW_STATUS_PTR: /* 25 */
-            *((SQLUSMALLINT **)Value) = SC_get_IRDF(stmt)->rowStatusArray;
-            len = 4;
-            break;
-        case SQL_ATTR_ROWS_FETCHED_PTR: /* 26 */
-            *((SQLULEN **)Value) = SC_get_IRDF(stmt)->rowsFetched;
-            len = 4;
-            break;
-        case SQL_ATTR_ROW_ARRAY_SIZE: /* 27 */
-            *((SQLULEN *)Value) = SC_get_ARDF(stmt)->size_of_rowset;
-            len = 4;
-            break;
-        case SQL_ATTR_APP_ROW_DESC:   /* 10010 */
-        case SQL_ATTR_APP_PARAM_DESC: /* 10011 */
-        case SQL_ATTR_IMP_ROW_DESC:   /* 10012 */
-        case SQL_ATTR_IMP_PARAM_DESC: /* 10013 */
-            len = 4;
-            *((HSTMT *)Value) =
-                descHandleFromStatementHandle(StatementHandle, Attribute);
-            break;
-
-        case SQL_ATTR_CURSOR_SCROLLABLE: /* -1 */
-            len = 4;
-            if (SQL_CURSOR_FORWARD_ONLY == stmt->options.cursor_type)
-                *((SQLUINTEGER *)Value) = SQL_NONSCROLLABLE;
-            else
-                *((SQLUINTEGER *)Value) = SQL_SCROLLABLE;
-            break;
-        case SQL_ATTR_CURSOR_SENSITIVITY: /* -2 */
-            len = 4;
-            if (SQL_CONCUR_READ_ONLY == stmt->options.scroll_concurrency)
-                *((SQLUINTEGER *)Value) = SQL_INSENSITIVE;
-            else
-                *((SQLUINTEGER *)Value) = SQL_UNSPECIFIED;
-            break;
-        case SQL_ATTR_METADATA_ID: /* 10014 */
-            *((SQLUINTEGER *)Value) = stmt->options.metadata_id;
-            break;
-        case SQL_ATTR_ENABLE_AUTO_IPD: /* 15 */
-            *((SQLUINTEGER *)Value) = SQL_FALSE;
-            break;
-        case SQL_ATTR_AUTO_IPD: /* 10001 */
-            /* case SQL_ATTR_ROW_BIND_TYPE: ** == SQL_BIND_TYPE(ODBC2.0) */
-            SC_set_error(stmt, DESC_INVALID_OPTION_IDENTIFIER,
-                         "Unsupported statement option (Get)", func);
-            return SQL_ERROR;
-        default:
-            ret = OPENSEARCHAPI_GetStmtOption(StatementHandle, (SQLSMALLINT)Attribute,
-                                      Value, &len, BufferLength);
-    }
-    if (ret == SQL_SUCCESS && StringLength)
-        *StringLength = len;
-    return ret;
-}
-
-/*	SQLSetConnectOption -> SQLSetConnectAttr */
-RETCODE SQL_API OPENSEARCHAPI_SetConnectAttr(HDBC ConnectionHandle,
-                                     SQLINTEGER Attribute, PTR Value,
-                                     SQLINTEGER StringLength) {
-    UNUSED(StringLength);
-    CSTR func = "OPENSEARCHAPI_SetConnectAttr";
-    ConnectionClass *conn = (ConnectionClass *)ConnectionHandle;
-    RETCODE ret = SQL_SUCCESS;
-    BOOL unsupported = FALSE;
-    int newValue;
-
-    MYLOG(OPENSEARCH_TRACE, "entering for %p: " FORMAT_INTEGER " %p\n",
-          ConnectionHandle, Attribute, Value);
-    switch (Attribute) {
-        case SQL_ATTR_METADATA_ID:
-            conn->stmtOptions.metadata_id = CAST_UPTR(SQLUINTEGER, Value);
-            break;
-        case SQL_ATTR_ANSI_APP:
-            if (SQL_AA_FALSE != CAST_PTR(SQLINTEGER, Value)) {
-                MYLOG(OPENSEARCH_DEBUG, "the application is ansi\n");
-                if (CC_is_in_unicode_driver(conn)) /* the driver is unicode */
-                    CC_set_in_ansi_app(conn);      /* but the app is ansi */
-            } else {
-                MYLOG(OPENSEARCH_DEBUG, "the application is unicode\n");
-            }
-            /*return SQL_ERROR;*/
-            return SQL_SUCCESS;
-        case SQL_ATTR_ENLIST_IN_DTC:
-            unsupported = TRUE;
-            break;
-        case SQL_ATTR_AUTO_IPD:
-            if (SQL_FALSE != Value)
-                unsupported = TRUE;
-            break;
-        case SQL_ATTR_ASYNC_ENABLE:
-        case SQL_ATTR_CONNECTION_DEAD:
-        case SQL_ATTR_CONNECTION_TIMEOUT:
-            unsupported = TRUE;
-            break;
-        case SQL_ATTR_ESOPT_DEBUG:
-            newValue = CAST_UPTR(SQLCHAR, Value);
-            if (newValue > 0) {
-                logs_on_off(-1, conn->connInfo.drivers.loglevel, 0);
-                conn->connInfo.drivers.loglevel = (char)newValue;
-                logs_on_off(1, conn->connInfo.drivers.loglevel, 0);
-                MYLOG(OPENSEARCH_DEBUG, "debug => %d\n",
-                      conn->connInfo.drivers.loglevel);
-            } else if (newValue == 0 && conn->connInfo.drivers.loglevel > 0) {
-                MYLOG(OPENSEARCH_DEBUG, "debug => %d\n", newValue);
-                logs_on_off(-1, conn->connInfo.drivers.loglevel, 0);
-                conn->connInfo.drivers.loglevel = (char)newValue;
-                logs_on_off(1, 0, 0);
-            }
-            break;
-        case SQL_ATTR_ESOPT_COMMLOG:
-            newValue = CAST_UPTR(SQLCHAR, Value);
-            if (newValue > 0) {
-                logs_on_off(-1, 0, conn->connInfo.drivers.loglevel);
-                conn->connInfo.drivers.loglevel = (char)newValue;
-                logs_on_off(1, 0, conn->connInfo.drivers.loglevel);
-                MYLOG(OPENSEARCH_DEBUG, "commlog => %d\n",
-                      conn->connInfo.drivers.loglevel);
-            } else if (newValue == 0 && conn->connInfo.drivers.loglevel > 0) {
-                MYLOG(OPENSEARCH_DEBUG, "commlog => %d\n", newValue);
-                logs_on_off(-1, 0, conn->connInfo.drivers.loglevel);
-                conn->connInfo.drivers.loglevel = (char)newValue;
-                logs_on_off(1, 0, 0);
-            }
-            break;
-        default:
-            if (Attribute < 65536)
-                ret = OPENSEARCHAPI_SetConnectOption(
-                    ConnectionHandle, (SQLUSMALLINT)Attribute, (SQLLEN)Value);
-            else
-                unsupported = TRUE;
-    }
-    if (unsupported) {
-        char msg[64];
-        SPRINTF_FIXED(
-            msg, "Couldn't set unsupported connect attribute " FORMAT_INTEGER,
-            Attribute);
-        CC_set_error(conn, CONN_OPTION_NOT_FOR_THE_DRIVER, msg, func);
-        return SQL_ERROR;
-    }
-    return ret;
-}
-
-/*	new function */
-RETCODE SQL_API OPENSEARCHAPI_GetDescField(SQLHDESC DescriptorHandle,
-                                   SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength,
-                                   SQLINTEGER *StringLength) {
-    CSTR func = "OPENSEARCHAPI_GetDescField";
-    RETCODE ret = SQL_SUCCESS;
-    DescriptorClass *desc = (DescriptorClass *)DescriptorHandle;
-
-    MYLOG(OPENSEARCH_TRACE,
-          "entering h=%p rec=" FORMAT_SMALLI " field=" FORMAT_SMALLI
-          " blen=" FORMAT_INTEGER "\n",
-          DescriptorHandle, RecNumber, FieldIdentifier, BufferLength);
-    switch (DC_get_desc_type(desc)) {
-        case SQL_ATTR_APP_ROW_DESC:
-            ret = ARDGetField(desc, RecNumber, FieldIdentifier, Value,
-                              BufferLength, StringLength);
-            break;
-        case SQL_ATTR_APP_PARAM_DESC:
-            ret = APDGetField(desc, RecNumber, FieldIdentifier, Value,
-                              BufferLength, StringLength);
-            break;
-        case SQL_ATTR_IMP_ROW_DESC:
-            ret = IRDGetField(desc, RecNumber, FieldIdentifier, Value,
-                              BufferLength, StringLength);
-            break;
-        case SQL_ATTR_IMP_PARAM_DESC:
-            ret = IPDGetField(desc, RecNumber, FieldIdentifier, Value,
-                              BufferLength, StringLength);
-            break;
-        default:
-            ret = SQL_ERROR;
-            DC_set_error(desc, DESC_INTERNAL_ERROR, "Error not implemented");
-    }
-    if (ret == SQL_ERROR) {
-        if (!DC_get_errormsg(desc)) {
-            switch (DC_get_errornumber(desc)) {
-                case DESC_INVALID_DESCRIPTOR_IDENTIFIER:
-                    DC_set_errormsg(
-                        desc,
-                        "can't SQLGetDescField for this descriptor identifier");
-                    break;
-                case DESC_INVALID_COLUMN_NUMBER_ERROR:
-                    DC_set_errormsg(
-                        desc, "can't SQLGetDescField for this column number");
-                    break;
-                case DESC_BAD_PARAMETER_NUMBER_ERROR:
-                    DC_set_errormsg(
-                        desc,
-                        "can't SQLGetDescField for this parameter number");
-                    break;
-            }
-        }
-        DC_log_error(func, "", desc);
-    }
-    return ret;
-}
-
-/*	new function */
-RETCODE SQL_API OPENSEARCHAPI_SetDescField(SQLHDESC DescriptorHandle,
-                                   SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength) {
-    CSTR func = "OPENSEARCHAPI_SetDescField";
-    RETCODE ret = SQL_SUCCESS;
-    DescriptorClass *desc = (DescriptorClass *)DescriptorHandle;
-
-    MYLOG(OPENSEARCH_TRACE,
-          "entering h=%p(%d) rec=" FORMAT_SMALLI " field=" FORMAT_SMALLI
-          " val=%p," FORMAT_INTEGER "\n",
-          DescriptorHandle, DC_get_desc_type(desc), RecNumber, FieldIdentifier,
-          Value, BufferLength);
-    switch (DC_get_desc_type(desc)) {
-        case SQL_ATTR_APP_ROW_DESC:
-            ret = ARDSetField(desc, RecNumber, FieldIdentifier, Value,
-                              BufferLength);
-            break;
-        case SQL_ATTR_APP_PARAM_DESC:
-            ret = APDSetField(desc, RecNumber, FieldIdentifier, Value,
-                              BufferLength);
-            break;
-        case SQL_ATTR_IMP_ROW_DESC:
-            ret = IRDSetField(desc, RecNumber, FieldIdentifier, Value,
-                              BufferLength);
-            break;
-        case SQL_ATTR_IMP_PARAM_DESC:
-            ret = IPDSetField(desc, RecNumber, FieldIdentifier, Value,
-                              BufferLength);
-            break;
-        default:
-            ret = SQL_ERROR;
-            DC_set_error(desc, DESC_INTERNAL_ERROR, "Error not implemented");
-    }
-    if (ret == SQL_ERROR) {
-        if (!DC_get_errormsg(desc)) {
-            switch (DC_get_errornumber(desc)) {
-                case DESC_INVALID_DESCRIPTOR_IDENTIFIER:
-                    DC_set_errormsg(
-                        desc,
-                        "can't SQLSetDescField for this descriptor identifier");
-                    break;
-                case DESC_INVALID_COLUMN_NUMBER_ERROR:
-                    DC_set_errormsg(
-                        desc, "can't SQLSetDescField for this column number");
-                    break;
-                case DESC_BAD_PARAMETER_NUMBER_ERROR:
-                    DC_set_errormsg(
-                        desc,
-                        "can't SQLSetDescField for this parameter number");
-                    break;
-                    break;
-            }
-        }
-        DC_log_error(func, "", desc);
-    }
-    return ret;
-}
-
-/*	SQLSet(Param/Scroll/Stmt)Option -> SQLSetStmtAttr */
-RETCODE SQL_API OPENSEARCHAPI_SetStmtAttr(HSTMT StatementHandle, SQLINTEGER Attribute,
-                                  PTR Value, SQLINTEGER StringLength) {
-    UNUSED(StringLength);
-    RETCODE ret = SQL_SUCCESS;
-    CSTR func = "OPENSEARCHAPI_SetStmtAttr";
-    StatementClass *stmt = (StatementClass *)StatementHandle;
-
-    MYLOG(OPENSEARCH_TRACE,
-          "entering Handle=%p " FORMAT_INTEGER "," FORMAT_ULEN "(%p)\n",
-          StatementHandle, Attribute, (SQLULEN)Value, Value);
-    switch (Attribute) {
-        case SQL_ATTR_ENABLE_AUTO_IPD: /* 15 */
-            if (SQL_FALSE == Value)
-                break;
-        case SQL_ATTR_CURSOR_SCROLLABLE:  /* -1 */
-        case SQL_ATTR_CURSOR_SENSITIVITY: /* -2 */
-        case SQL_ATTR_AUTO_IPD:           /* 10001 */
-            SC_set_error(stmt, DESC_OPTION_NOT_FOR_THE_DRIVER,
-                         "Unsupported statement option (Set)", func);
-            return SQL_ERROR;
-        /* case SQL_ATTR_ROW_BIND_TYPE: ** == SQL_BIND_TYPE(ODBC2.0) */
-        case SQL_ATTR_IMP_ROW_DESC:   /* 10012 (read-only) */
-        case SQL_ATTR_IMP_PARAM_DESC: /* 10013 (read-only) */
-
-            /*
-             * case SQL_ATTR_PREDICATE_PTR: case
-             * SQL_ATTR_PREDICATE_OCTET_LENGTH_PTR:
-             */
-            SC_set_error(stmt, DESC_INVALID_OPTION_IDENTIFIER,
-                         "Unsupported statement option (Set)", func);
-            return SQL_ERROR;
-
-        case SQL_ATTR_METADATA_ID: /* 10014 */
-            stmt->options.metadata_id = CAST_UPTR(SQLUINTEGER, Value);
-            break;
-        case SQL_ATTR_APP_ROW_DESC: /* 10010 */
-            if (SQL_NULL_HDESC == Value) {
-                stmt->ard = &(stmt->ardi);
-            } else {
-                stmt->ard = (DescriptorClass *)Value;
-                MYLOG(OPENSEARCH_ALL, "set ard=%p\n", stmt->ard);
-            }
-            break;
-        case SQL_ATTR_APP_PARAM_DESC: /* 10011 */
-            if (SQL_NULL_HDESC == Value) {
-                stmt->apd = &(stmt->apdi);
-            } else {
-                stmt->apd = (DescriptorClass *)Value;
-            }
-            break;
-        case SQL_ATTR_FETCH_BOOKMARK_PTR: /* 16 */
-            stmt->options.bookmark_ptr = Value;
-            break;
-        case SQL_ATTR_PARAM_BIND_OFFSET_PTR: /* 17 */
-            SC_get_APDF(stmt)->param_offset_ptr = (SQLULEN *)Value;
-            break;
-        case SQL_ATTR_PARAM_BIND_TYPE: /* 18 */
-            SC_get_APDF(stmt)->param_bind_type = CAST_UPTR(SQLUINTEGER, Value);
-            break;
-        case SQL_ATTR_PARAM_OPERATION_PTR: /* 19 */
-            SC_get_APDF(stmt)->param_operation_ptr = Value;
-            break;
-        case SQL_ATTR_PARAM_STATUS_PTR: /* 20 */
-            SC_get_IPDF(stmt)->param_status_ptr = (SQLUSMALLINT *)Value;
-            break;
-        case SQL_ATTR_PARAMS_PROCESSED_PTR: /* 21 */
-            SC_get_IPDF(stmt)->param_processed_ptr = (SQLULEN *)Value;
-            break;
-        case SQL_ATTR_PARAMSET_SIZE: /* 22 */
-            SC_get_APDF(stmt)->paramset_size = CAST_UPTR(SQLULEN, Value);
-            break;
-        case SQL_ATTR_ROW_BIND_OFFSET_PTR: /* 23 */
-            SC_get_ARDF(stmt)->row_offset_ptr = (SQLULEN *)Value;
-            break;
-        case SQL_ATTR_ROW_OPERATION_PTR: /* 24 */
-            SC_get_ARDF(stmt)->row_operation_ptr = Value;
-            break;
-        case SQL_ATTR_ROW_STATUS_PTR: /* 25 */
-            SC_get_IRDF(stmt)->rowStatusArray = (SQLUSMALLINT *)Value;
-            break;
-        case SQL_ATTR_ROWS_FETCHED_PTR: /* 26 */
-            SC_get_IRDF(stmt)->rowsFetched = (SQLULEN *)Value;
-            break;
-        case SQL_ATTR_ROW_ARRAY_SIZE: /* 27 */
-            SC_get_ARDF(stmt)->size_of_rowset = CAST_UPTR(SQLULEN, Value);
-            break;
-        default:
-            return OPENSEARCHAPI_SetStmtOption(StatementHandle, (SQLUSMALLINT)Attribute,
-                                       (SQLULEN)Value);
-    }
-    return ret;
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_apifunc.h b/sql-odbc/src/sqlodbc/opensearch_apifunc.h
deleted file mode 100644
index 1901fe8cd0..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_apifunc.h
+++ /dev/null
@@ -1,228 +0,0 @@
-#ifndef _OPENSEARCH_API_FUNC_H__
-#define _OPENSEARCH_API_FUNC_H__
-
-#include <stdio.h>
-#include <string.h>
-
-#include "opensearch_odbc.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*	Internal flags for catalog functions */
-#define PODBC_NOT_SEARCH_PATTERN 1L
-#define PODBC_SEARCH_PUBLIC_SCHEMA (1L << 1)
-#define PODBC_SEARCH_BY_IDS (1L << 2)
-#define PODBC_SHOW_OID_COLUMN (1L << 3)
-#define PODBC_ROW_VERSIONING (1L << 4)
-/*	Internal flags for OPENSEARCHAPI_AllocStmt functions */
-#define PODBC_EXTERNAL_STATEMENT 1L /* visible to the driver manager */
-#define PODBC_INHERIT_CONNECT_OPTIONS (1L << 1)
-/*	Internal flags for OPENSEARCHAPI_Exec... functions */
-/*	Flags for the error handling */
-#define PODBC_ALLOW_PARTIAL_EXTRACT 1L
-/* #define	PODBC_ERROR_CLEAR		(1L << 1) 	no longer used */
-
-RETCODE SQL_API OPENSEARCHAPI_AllocConnect(HENV EnvironmentHandle,
-                                   HDBC *ConnectionHandle);
-RETCODE SQL_API OPENSEARCHAPI_AllocEnv(HENV *EnvironmentHandle);
-RETCODE SQL_API OPENSEARCHAPI_AllocStmt(HDBC ConnectionHandle, HSTMT *StatementHandle,
-                                UDWORD flag);
-RETCODE SQL_API OPENSEARCHAPI_BindCol(HSTMT StatementHandle, SQLUSMALLINT ColumnNumber,
-                              SQLSMALLINT TargetType, PTR TargetValue,
-                              SQLLEN BufferLength, SQLLEN *StrLen_or_Ind);
-RETCODE SQL_API OPENSEARCHAPI_Connect(HDBC ConnectionHandle, const SQLCHAR *ServerName,
-                              SQLSMALLINT NameLength1, const SQLCHAR *UserName,
-                              SQLSMALLINT NameLength2,
-                              const SQLCHAR *Authentication,
-                              SQLSMALLINT NameLength3);
-RETCODE SQL_API OPENSEARCHAPI_BrowseConnect(HDBC hdbc, const SQLCHAR *szConnStrIn,
-                                    SQLSMALLINT cbConnStrIn,
-                                    SQLCHAR *szConnStrOut,
-                                    SQLSMALLINT cbConnStrOutMax,
-                                    SQLSMALLINT *pcbConnStrOut);
-RETCODE SQL_API OPENSEARCHAPI_DescribeCol(
-    HSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName,
-    SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, SQLSMALLINT *DataType,
-    SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable);
-RETCODE SQL_API OPENSEARCHAPI_Disconnect(HDBC ConnectionHandle);
-/* Helper functions for Error handling */
-RETCODE SQL_API OPENSEARCHAPI_EnvError(HENV EnvironmentHandle, SQLSMALLINT RecNumber,
-                               SQLCHAR *Sqlstate, SQLINTEGER *NativeError,
-                               SQLCHAR *MessageText, SQLSMALLINT BufferLength,
-                               SQLSMALLINT *TextLength, UWORD flag);
-RETCODE SQL_API OPENSEARCHAPI_ConnectError(HDBC ConnectionHandle, SQLSMALLINT RecNumber,
-                                   SQLCHAR *Sqlstate, SQLINTEGER *NativeError,
-                                   SQLCHAR *MessageText,
-                                   SQLSMALLINT BufferLength,
-                                   SQLSMALLINT *TextLength, UWORD flag);
-RETCODE SQL_API OPENSEARCHAPI_StmtError(HSTMT StatementHandle, SQLSMALLINT RecNumber,
-                                SQLCHAR *Sqlstate, SQLINTEGER *NativeError,
-                                SQLCHAR *MessageText, SQLSMALLINT BufferLength,
-                                SQLSMALLINT *TextLength, UWORD flag);
-RETCODE SQL_API OPENSEARCHAPI_ExecDirect(HSTMT StatementHandle,
-                                 const SQLCHAR *StatementText,
-                                 SQLINTEGER TextLength, BOOL commit);
-RETCODE SQL_API OPENSEARCHAPI_Execute(HSTMT StatementHandle);
-RETCODE SQL_API OPENSEARCHAPI_Fetch(HSTMT StatementHandle);
-RETCODE SQL_API OPENSEARCHAPI_FreeConnect(HDBC ConnectionHandle);
-RETCODE SQL_API OPENSEARCHAPI_FreeEnv(HENV EnvironmentHandle);
-RETCODE SQL_API OPENSEARCHAPI_FreeStmt(HSTMT StatementHandle, SQLUSMALLINT Option);
-RETCODE SQL_API OPENSEARCHAPI_GetConnectOption(HDBC ConnectionHandle,
-                                       SQLUSMALLINT Option, PTR Value,
-                                       SQLINTEGER *StringLength,
-                                       SQLINTEGER BufferLength);
-RETCODE SQL_API OPENSEARCHAPI_GetCursorName(HSTMT StatementHandle, SQLCHAR *CursorName,
-                                    SQLSMALLINT BufferLength,
-                                    SQLSMALLINT *NameLength);
-RETCODE SQL_API OPENSEARCHAPI_GetData(HSTMT StatementHandle, SQLUSMALLINT ColumnNumber,
-                              SQLSMALLINT TargetType, PTR TargetValue,
-                              SQLLEN BufferLength, SQLLEN *StrLen_or_Ind);
-RETCODE SQL_API OPENSEARCHAPI_GetFunctions(HDBC ConnectionHandle,
-                                   SQLUSMALLINT FunctionId,
-                                   SQLUSMALLINT *Supported);
-RETCODE SQL_API OPENSEARCHAPI_GetFunctions30(HDBC ConnectionHandle,
-                                     SQLUSMALLINT FunctionId,
-                                     SQLUSMALLINT *Supported);
-RETCODE SQL_API OPENSEARCHAPI_GetInfo(HDBC ConnectionHandle, SQLUSMALLINT InfoType,
-                              PTR InfoValue, SQLSMALLINT BufferLength,
-                              SQLSMALLINT *StringLength);
-RETCODE SQL_API OPENSEARCHAPI_GetStmtOption(HSTMT StatementHandle, SQLUSMALLINT Option,
-                                    PTR Value, SQLINTEGER *StringLength,
-                                    SQLINTEGER BufferLength);
-RETCODE SQL_API OPENSEARCHAPI_NumResultCols(HSTMT StatementHandle,
-                                    SQLSMALLINT *ColumnCount);
-RETCODE SQL_API OPENSEARCHAPI_RowCount(HSTMT StatementHandle, SQLLEN *RowCount);
-RETCODE SQL_API OPENSEARCHAPI_SetConnectOption(HDBC ConnectionHandle,
-                                       SQLUSMALLINT Option, SQLULEN Value);
-RETCODE SQL_API OPENSEARCHAPI_SetCursorName(HSTMT StatementHandle,
-                                    const SQLCHAR *CursorName,
-                                    SQLSMALLINT NameLength);
-RETCODE SQL_API OPENSEARCHAPI_SetStmtOption(HSTMT StatementHandle, SQLUSMALLINT Option,
-                                    SQLULEN Value);
-RETCODE SQL_API
-OPENSEARCHAPI_SpecialColumns(HSTMT StatementHandle, SQLUSMALLINT IdentifierType,
-                     const SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-                     const SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-                     const SQLCHAR *TableName, SQLSMALLINT NameLength3,
-                     SQLUSMALLINT Scope, SQLUSMALLINT Nullable);
-RETCODE SQL_API OPENSEARCHAPI_Statistics(
-    HSTMT StatementHandle, const SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-    const SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-    const SQLCHAR *TableName, SQLSMALLINT NameLength3, SQLUSMALLINT Unique,
-    SQLUSMALLINT Reserved);
-RETCODE SQL_API OPENSEARCHAPI_ColAttributes(HSTMT hstmt, SQLUSMALLINT icol,
-                                    SQLUSMALLINT fDescType, PTR rgbDesc,
-                                    SQLSMALLINT cbDescMax, SQLSMALLINT *pcbDesc,
-                                    SQLLEN *pfDesc);
-RETCODE SQL_API OPENSEARCHAPI_Prepare(HSTMT hstmt, const SQLCHAR *szSqlStr,
-                              SQLINTEGER cbSqlStr);
-RETCODE SQL_API OPENSEARCHAPI_ColumnPrivileges(
-    HSTMT hstmt, const SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName,
-    const SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName,
-    const SQLCHAR *szTableName, SQLSMALLINT cbTableName,
-    const SQLCHAR *szColumnName, SQLSMALLINT cbColumnName, UWORD flag);
-RETCODE SQL_API OPENSEARCHAPI_ExtendedFetch(HSTMT hstmt, SQLUSMALLINT fFetchType,
-                                    SQLLEN irow, SQLULEN *pcrow,
-                                    SQLUSMALLINT *rgfRowStatus,
-                                    SQLLEN FetchOffset, SQLLEN rowsetSize);
-RETCODE SQL_API OPENSEARCHAPI_ForeignKeys(
-    HSTMT hstmt, const SQLCHAR *szPkCatalogName, SQLSMALLINT cbPkCatalogName,
-    const SQLCHAR *szPkSchemaName, SQLSMALLINT cbPkSchemaName,
-    const SQLCHAR *szPkTableName, SQLSMALLINT cbPkTableName,
-    const SQLCHAR *szFkCatalogName, SQLSMALLINT cbFkCatalogName,
-    const SQLCHAR *szFkSchemaName, SQLSMALLINT cbFkSchemaName,
-    const SQLCHAR *szFkTableName, SQLSMALLINT cbFkTableName);
-RETCODE SQL_API OPENSEARCHAPI_MoreResults(HSTMT hstmt);
-RETCODE SQL_API OPENSEARCHAPI_NativeSql(HDBC hdbc, const SQLCHAR *szSqlStrIn,
-                                SQLINTEGER cbSqlStrIn, SQLCHAR *szSqlStr,
-                                SQLINTEGER cbSqlStrMax, SQLINTEGER *pcbSqlStr);
-RETCODE SQL_API OPENSEARCHAPI_NumParams(HSTMT hstmt, SQLSMALLINT *pcpar);
-RETCODE SQL_API OPENSEARCHAPI_PrimaryKeys(HSTMT hstmt, const SQLCHAR *szCatalogName,
-                                  SQLSMALLINT cbCatalogName,
-                                  const SQLCHAR *szSchemaName,
-                                  SQLSMALLINT cbSchemaName,
-                                  const SQLCHAR *szTableName,
-                                  SQLSMALLINT cbTableName, OID reloid);
-RETCODE SQL_API OPENSEARCHAPI_ProcedureColumns(
-    HSTMT hstmt, const SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName,
-    const SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName,
-    const SQLCHAR *szProcName, SQLSMALLINT cbProcName,
-    const SQLCHAR *szColumnName, SQLSMALLINT cbColumnName, UWORD flag);
-RETCODE SQL_API OPENSEARCHAPI_Procedures(HSTMT hstmt, const SQLCHAR *szCatalogName,
-                                 SQLSMALLINT cbCatalogName,
-                                 const SQLCHAR *szSchemaName,
-                                 SQLSMALLINT cbSchemaName,
-                                 const SQLCHAR *szProcName,
-                                 SQLSMALLINT cbProcName, UWORD flag);
-RETCODE SQL_API OPENSEARCHAPI_TablePrivileges(HSTMT hstmt, const SQLCHAR *szCatalogName,
-                                      SQLSMALLINT cbCatalogName,
-                                      const SQLCHAR *szSchemaName,
-                                      SQLSMALLINT cbSchemaName,
-                                      const SQLCHAR *szTableName,
-                                      SQLSMALLINT cbTableName, UWORD flag);
-RETCODE SQL_API OPENSEARCHAPI_GetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle,
-                                 SQLSMALLINT RecNumber, SQLCHAR *Sqlstate,
-                                 SQLINTEGER *NativeError, SQLCHAR *MessageText,
-                                 SQLSMALLINT BufferLength,
-                                 SQLSMALLINT *TextLength);
-RETCODE SQL_API OPENSEARCHAPI_GetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
-                                   SQLSMALLINT RecNumber,
-                                   SQLSMALLINT DiagIdentifier, PTR DiagInfoPtr,
-                                   SQLSMALLINT BufferLength,
-                                   SQLSMALLINT *StringLengthPtr);
-RETCODE SQL_API OPENSEARCHAPI_GetConnectAttr(HDBC ConnectionHandle,
-                                     SQLINTEGER Attribute, PTR Value,
-                                     SQLINTEGER BufferLength,
-                                     SQLINTEGER *StringLength);
-RETCODE SQL_API OPENSEARCHAPI_GetStmtAttr(HSTMT StatementHandle, SQLINTEGER Attribute,
-                                  PTR Value, SQLINTEGER BufferLength,
-                                  SQLINTEGER *StringLength);
-
-/* Driver-specific connection attributes, for SQLSet/GetConnectAttr() */
-enum {
-    SQL_ATTR_ESOPT_DEBUG = 65536,
-    SQL_ATTR_ESOPT_COMMLOG = 65537,
-    SQL_ATTR_ESOPT_PARSE = 65538,
-    SQL_ATTR_ESOPT_USE_DECLAREFETCH = 65539,
-    SQL_ATTR_ESOPT_SERVER_SIDE_PREPARE = 65540,
-    SQL_ATTR_ESOPT_FETCH = 65541,
-    SQL_ATTR_ESOPT_UNKNOWNSIZES = 65542,
-    SQL_ATTR_ESOPT_TEXTASLONGVARCHAR = 65543,
-    SQL_ATTR_ESOPT_UNKNOWNSASLONGVARCHAR = 65544,
-    SQL_ATTR_ESOPT_BOOLSASCHAR = 65545,
-    SQL_ATTR_ESOPT_MAXVARCHARSIZE = 65546,
-    SQL_ATTR_ESOPT_MAXLONGVARCHARSIZE = 65547,
-    SQL_ATTR_ESOPT_WCSDEBUG = 65548,
-    SQL_ATTR_ESOPT_MSJET = 65549
-};
-RETCODE SQL_API OPENSEARCHAPI_SetConnectAttr(HDBC ConnectionHandle,
-                                     SQLINTEGER Attribute, PTR Value,
-                                     SQLINTEGER StringLength);
-RETCODE SQL_API OPENSEARCHAPI_SetStmtAttr(HSTMT StatementHandle, SQLINTEGER Attribute,
-                                  PTR Value, SQLINTEGER StringLength);
-RETCODE SQL_API OPENSEARCHAPI_AllocDesc(HDBC ConnectionHandle,
-                                SQLHDESC *DescriptorHandle);
-RETCODE SQL_API OPENSEARCHAPI_FreeDesc(SQLHDESC DescriptorHandle);
-RETCODE SQL_API OPENSEARCHAPI_CopyDesc(SQLHDESC SourceDescHandle,
-                               SQLHDESC TargetDescHandle);
-RETCODE SQL_API OPENSEARCHAPI_SetDescField(SQLHDESC DescriptorHandle,
-                                   SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength);
-RETCODE SQL_API OPENSEARCHAPI_GetDescField(SQLHDESC DescriptorHandle,
-                                   SQLSMALLINT RecNumber,
-                                   SQLSMALLINT FieldIdentifier, PTR Value,
-                                   SQLINTEGER BufferLength,
-                                   SQLINTEGER *StringLength);
-RETCODE SQL_API OPENSEARCHAPI_DescError(SQLHDESC DescriptorHandle,
-                                SQLSMALLINT RecNumber, SQLCHAR *Sqlstate,
-                                SQLINTEGER *NativeError, SQLCHAR *MessageText,
-                                SQLSMALLINT BufferLength,
-                                SQLSMALLINT *TextLength, UWORD flag);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* define_OPENSEARCH_API_FUNC_H__ */
diff --git a/sql-odbc/src/sqlodbc/opensearch_communication.cpp b/sql-odbc/src/sqlodbc/opensearch_communication.cpp
deleted file mode 100644
index dab46cb1fa..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_communication.cpp
+++ /dev/null
@@ -1,1039 +0,0 @@
-#include "opensearch_communication.h"
-
-// sqlodbc needs to be included before mylog, otherwise mylog will generate
-// compiler warnings
-// clang-format off
-#include "opensearch_odbc.h"
-#include "mylog.h"
-#include <atomic>
-#include <mutex>
-#include <aws/core/utils/StringUtils.h>
-#include <aws/core/client/RetryStrategy.h>
-#include <aws/core/client/AWSClient.h>
-#include <aws/core/utils/HashingUtils.h>
-#include <aws/core/auth/AWSAuthSigner.h>
-#include <aws/core/auth/AWSCredentialsProvider.h>
-#include <aws/core/http/HttpClient.h>
-// clang-format on
-
-#define SQL_ENDPOINT_ERROR_STR "Error"
-
-static const std::string ctype = "application/json";
-static const std::string ALLOCATION_TAG = "AWS_SIGV4_AUTH";
-static const std::string SERVICE_NAME = "es";
-static const std::string ESODBC_PROFILE_NAME = "opensearchodbc";
-static const std::string ERROR_MSG_PREFIX =
-    "[OpenSearch][SQL ODBC Driver][SQL Plugin] ";
-static const std::string JSON_SCHEMA =
-    "{"  // This was generated from the example OpenSearch data
-    "\"type\": \"object\","
-    "\"properties\": {"
-    "\"schema\": {"
-    "\"type\": \"array\","
-    "\"items\": [{"
-    "\"type\": \"object\","
-    "\"properties\": {"
-    "\"name\": { \"type\": \"string\" },"
-    "\"type\": { \"type\": \"string\" }"
-    "},"
-    "\"required\": [ \"name\", \"type\" ]"
-    "}]"
-    "},"
-    "\"cursor\": { \"type\": \"string\" },"
-    "\"total\": { \"type\": \"integer\" },"
-    "\"datarows\": {"
-    "\"type\": \"array\","
-    "\"items\": {}"
-    "},"
-    "\"size\": { \"type\": \"integer\" },"
-    "\"status\": { \"type\": \"integer\" }"
-    "},"
-    "\"required\": [\"schema\", \"total\", \"datarows\", \"size\", \"status\"]"
-    "}";
-static const std::string CURSOR_JSON_SCHEMA =
-    "{"  // This was generated from the example OpenSearch data
-    "\"type\": \"object\","
-    "\"properties\": {"
-    "\"cursor\": { \"type\": \"string\" },"
-    "\"datarows\": {"
-    "\"type\": \"array\","
-    "\"items\": {}"
-    "},"
-    "\"status\": { \"type\": \"integer\" }"
-    "},"
-    "\"required\":  [\"datarows\"]"
-    "}";
-static const std::string ERROR_RESPONSE_SCHEMA = R"EOF(
-{
-    "type": "object",
-    "properties": {
-        "error": {
-            "type": "object",
-            "properties": {
-                "reason": { "type": "string" },
-                "details": { "type": "string" },
-                "type": { "type": "string" }
-            },
-            "required": [
-                "reason",
-                "details",
-                "type"
-            ]
-        },
-        "status": {
-            "type": "integer"
-        }
-    },
-    "required": [
-        "error",
-        "status"
-    ]
-}
-)EOF";
-
-namespace {
-    /**
-     * A helper class to initialize/shutdown AWS API once per DLL load/unload.
-     */
-    class AwsSdkHelper {
-      public:
-        AwsSdkHelper() :
-          m_reference_count(0) {
-        }
-
-        AwsSdkHelper& operator++() {
-          if (1 == ++m_reference_count) {
-            std::scoped_lock lock(m_mutex);
-            Aws::InitAPI(m_sdk_options);
-          }
-          return *this;
-        }
-
-        AwsSdkHelper& operator--() {
-          if (0 == --m_reference_count) {
-            std::scoped_lock lock(m_mutex);
-            Aws::ShutdownAPI(m_sdk_options);
-          }
-          return *this;
-        }
-
-        Aws::SDKOptions m_sdk_options;
-        std::atomic<int> m_reference_count;
-        std::mutex m_mutex;
-    };
-
-    AwsSdkHelper AWS_SDK_HELPER;
-}
-
-void OpenSearchCommunication::AwsHttpResponseToString(
-    std::shared_ptr< Aws::Http::HttpResponse > response, std::string& output) {
-    // This function has some unconventional stream operations because we need
-    // performance over readability here. Equivalent code done in conventional
-    // ways (using stringstream operators) takes ~30x longer than this code
-    // below and bottlenecks our query performance
-
-    // Get streambuffer from response and set position to start
-    std::streambuf* stream_buffer = response->GetResponseBody().rdbuf();
-    stream_buffer->pubseekpos(0);
-
-    // Get size of streambuffer and reserver that much space in the output
-    size_t avail = static_cast< size_t >(stream_buffer->in_avail());
-    std::vector< char > buf(avail, '\0');
-    output.clear();
-    output.reserve(avail);
-
-    // Directly copy memory from buffer into our string buffer
-    stream_buffer->sgetn(buf.data(), avail);
-    output.assign(buf.data(), avail);
-}
-
-void OpenSearchCommunication::PrepareCursorResult(OpenSearchResult& opensearch_result) {
-    // Prepare document and validate result
-    try {
-        LogMsg(OPENSEARCH_DEBUG, "Parsing result JSON with cursor.");
-        opensearch_result.opensearch_result_doc.parse(
-            opensearch_result.result_json,
-                                      CURSOR_JSON_SCHEMA);
-    } catch (const rabbit::parse_error& e) {
-        // The exception rabbit gives is quite useless - providing the json
-        // will aid debugging for users
-        std::string str = "Exception obtained '" + std::string(e.what())
-                          + "' when parsing json string '"
-                          + opensearch_result.result_json + "'.";
-        throw std::runtime_error(str.c_str());
-    }
-}
-
-std::shared_ptr< ErrorDetails > OpenSearchCommunication::ParseErrorResponse(
-    OpenSearchResult& opensearch_result) {
-    // Prepare document and validate schema
-    try {
-        LogMsg(OPENSEARCH_DEBUG, "Parsing error response (with schema validation)");
-        opensearch_result.opensearch_result_doc.parse(
-            opensearch_result.result_json,
-                                      ERROR_RESPONSE_SCHEMA);
-
-        auto error_details = std::make_shared< ErrorDetails >();
-        error_details->reason =
-            opensearch_result.opensearch_result_doc["error"]["reason"].as_string();
-        error_details->details =
-            opensearch_result.opensearch_result_doc["error"]["details"].as_string();
-        error_details->source_type =
-            opensearch_result.opensearch_result_doc["error"]["type"].as_string();
-        return error_details;
-    } catch (const rabbit::parse_error& e) {
-        // The exception rabbit gives is quite useless - providing the json
-        // will aid debugging for users
-        std::string str = "Exception obtained '" + std::string(e.what())
-                          + "' when parsing json string '"
-                          + opensearch_result.result_json + "'.";
-        throw std::runtime_error(str.c_str());
-    }
-}
-
-void OpenSearchCommunication::SetErrorDetails(std::string reason, std::string message,
-                                      ConnErrorType error_type) {
-    // Prepare document and validate schema
-    auto error_details = std::make_shared< ErrorDetails >();
-    error_details->reason = reason;
-    error_details->details = message;
-    error_details->source_type = "Dummy type";
-    error_details->type = error_type;
-    m_error_details = error_details;
-}
-
-void OpenSearchCommunication::SetErrorDetails(ErrorDetails details) {
-    // Prepare document and validate schema
-    auto error_details = std::make_shared< ErrorDetails >(details);
-    m_error_details = error_details;
-}
-
-void OpenSearchCommunication::GetJsonSchema(OpenSearchResult& opensearch_result) {
-    // Prepare document and validate schema
-    try {
-        LogMsg(OPENSEARCH_DEBUG, "Parsing result JSON with schema.");
-        opensearch_result.opensearch_result_doc.parse(
-            opensearch_result.result_json, JSON_SCHEMA);
-    } catch (const rabbit::parse_error& e) {
-        // The exception rabbit gives is quite useless - providing the json
-        // will aid debugging for users
-        std::string str = "Exception obtained '" + std::string(e.what())
-                          + "' when parsing json string '"
-                          + opensearch_result.result_json + "'.";
-        throw std::runtime_error(str.c_str());
-    }
-}
-
-OpenSearchCommunication::OpenSearchCommunication()
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wreorder"
-#endif  // __APPLE__
-    : m_status(ConnStatusType::CONNECTION_BAD),
-      m_error_type(ConnErrorType::CONN_ERROR_SUCCESS),
-      m_valid_connection_options(false),
-      m_is_retrieving(false),
-      m_error_message(""),
-      m_result_queue(2),
-      m_client_encoding(m_supported_client_encodings[0]),
-      m_error_message_to_user("")
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-{
-    ++AWS_SDK_HELPER;
-}
-
-OpenSearchCommunication::~OpenSearchCommunication() {
-    // Release the HTTP client instance to free its resources before releasing AWS SDK.
-    // Changing order of these actions would cause crash on disconnect.
-    m_http_client.reset();
-    --AWS_SDK_HELPER;
-}
-
-std::string OpenSearchCommunication::GetErrorMessage() {
-    // TODO #35 - Check if they expect NULL or "" when there is no error.
-    if (m_error_details) {
-        m_error_details->details = std::regex_replace(
-            m_error_details->details, std::regex("\\n"), "\\\\n");
-        return ERROR_MSG_PREFIX + m_error_details->reason + ": "
-               + m_error_details->details;
-    } else {
-        return ERROR_MSG_PREFIX
-               + "No error details available; check the driver logs.";
-    }
-}
-
-ConnErrorType OpenSearchCommunication::GetErrorType() {
-    return m_error_type;
-}
-
-bool OpenSearchCommunication::ConnectionOptions(runtime_options& rt_opts,
-                                        bool use_defaults, int expand_dbname,
-                                        unsigned int option_count) {
-    (void)(expand_dbname);
-    (void)(option_count);
-    (void)(use_defaults);
-    m_rt_opts = rt_opts;
-    return CheckConnectionOptions();
-}
-
-bool OpenSearchCommunication::ConnectionOptions2() {
-    return true;
-}
-
-bool OpenSearchCommunication::ConnectDBStart() {
-    LogMsg(OPENSEARCH_ALL, "Starting DB connection.");
-    m_status = ConnStatusType::CONNECTION_BAD;
-    if (!m_valid_connection_options) {
-        // TODO: get error message from CheckConnectionOptions
-        m_error_message =
-            "Invalid connection options, unable to connect to DB.";
-        SetErrorDetails("Invalid connection options", m_error_message,
-                        ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        DropDBConnection();
-        return false;
-    }
-
-    m_status = ConnStatusType::CONNECTION_NEEDED;
-    if (!EstablishConnection()) {
-        m_error_message = m_error_message_to_user.empty()
-                              ? "Failed to establish connection to DB."
-                              : m_error_message_to_user;
-        SetErrorDetails("Connection error", m_error_message,
-                        ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        DropDBConnection();
-        return false;
-    }
-
-    LogMsg(OPENSEARCH_DEBUG, "Connection established.");
-    m_status = ConnStatusType::CONNECTION_OK;
-    return true;
-}
-
-ConnStatusType OpenSearchCommunication::GetConnectionStatus() {
-    return m_status;
-}
-
-void OpenSearchCommunication::DropDBConnection() {
-    LogMsg(OPENSEARCH_ALL, "Dropping DB connection.");
-    if (m_http_client) {
-        m_http_client.reset();
-    }
-
-    m_status = ConnStatusType::CONNECTION_BAD;
-    StopResultRetrieval();
-}
-
-bool OpenSearchCommunication::CheckConnectionOptions() {
-    LogMsg(OPENSEARCH_ALL, "Verifying connection options.");
-    m_error_message = "";
-    if (m_rt_opts.auth.auth_type != AUTHTYPE_NONE
-        && m_rt_opts.auth.auth_type != AUTHTYPE_IAM) {
-        if (m_rt_opts.auth.auth_type == AUTHTYPE_BASIC) {
-            if (m_rt_opts.auth.username.empty()
-                || m_rt_opts.auth.password.empty()) {
-                m_error_message = AUTHTYPE_BASIC
-                    " authentication requires a username and password.";
-                SetErrorDetails("Auth error", m_error_message,
-                                ConnErrorType::CONN_ERROR_INVALID_AUTH);
-            }
-        } else {
-            m_error_message = "Unknown authentication type: '"
-                              + m_rt_opts.auth.auth_type + "'";
-            SetErrorDetails("Auth error", m_error_message,
-                            ConnErrorType::CONN_ERROR_INVALID_AUTH);
-        }
-    } else if (m_rt_opts.conn.server == "") {
-        m_error_message = "Host connection option was not specified.";
-        SetErrorDetails("Connection error", m_error_message,
-                        ConnErrorType::CONN_ERROR_UNABLE_TO_ESTABLISH);
-    }
-
-    if (m_error_message != "") {
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        m_valid_connection_options = false;
-        return false;
-    } else {
-        LogMsg(OPENSEARCH_DEBUG, "Required connection option are valid.");
-        m_valid_connection_options = true;
-    }
-    return m_valid_connection_options;
-}
-
-void OpenSearchCommunication::InitializeConnection() {
-    Aws::Client::ClientConfiguration config;
-    config.scheme = (m_rt_opts.crypt.use_ssl ? Aws::Http::Scheme::HTTPS
-                                             : Aws::Http::Scheme::HTTP);
-    config.verifySSL = m_rt_opts.crypt.verify_server;
-    long response_timeout =
-        static_cast< long >(DEFAULT_RESPONSE_TIMEOUT) * 1000L;
-    try {
-        response_timeout =
-            std::stol(m_rt_opts.conn.timeout, nullptr, 10) * 1000L;
-    } catch (...) {
-    }
-    config.connectTimeoutMs = response_timeout;
-    config.httpRequestTimeoutMs = response_timeout;
-    config.requestTimeoutMs = response_timeout;
-    m_http_client = Aws::Http::CreateHttpClient(config);
-}
-
-std::shared_ptr< Aws::Http::HttpResponse >
-OpenSearchCommunication::IssueRequest(
-    const std::string& endpoint, const Aws::Http::HttpMethod request_type,
-    const std::string& content_type, const std::string& query,
-    const std::string& fetch_size, const std::string& cursor) {
-    // Generate http request
-    std::shared_ptr< Aws::Http::HttpRequest > request =
-        Aws::Http::CreateHttpRequest(
-            Aws::String(
-                m_rt_opts.conn.server
-                + (m_rt_opts.conn.port.empty() ? "" : ":" + m_rt_opts.conn.port)
-                + endpoint),
-            request_type,
-            Aws::Utils::Stream::DefaultResponseStreamFactoryMethod);
-
-    // Set header type
-    if (!content_type.empty())
-        request->SetHeaderValue(Aws::Http::CONTENT_TYPE_HEADER, Aws::String(ctype.c_str(), ctype.size()));
-
-    // Set body
-    if (!query.empty() || !cursor.empty()) {
-        rabbit::object body;
-        if (!query.empty()) {
-            body["query"] = query;
-            if (!fetch_size.empty() && fetch_size != "-1")
-                body["fetch_size"] = fetch_size;
-        } else if (!cursor.empty()) {
-            body["cursor"] = cursor;
-        }
-        std::shared_ptr< Aws::StringStream > aws_ss =
-            Aws::MakeShared< Aws::StringStream >("RabbitStream");
-        *aws_ss << std::string(body.str());
-        request->AddContentBody(aws_ss);
-        request->SetContentLength(Aws::Utils::StringUtils::to_string(body.str().size()));
-    }
-
-    // Handle authentication
-    if (m_rt_opts.auth.auth_type == AUTHTYPE_BASIC) {
-        std::string userpw_str =
-            m_rt_opts.auth.username + ":" + m_rt_opts.auth.password;
-        Aws::Utils::Array< unsigned char > userpw_arr(
-            reinterpret_cast< const unsigned char* >(userpw_str.c_str()),
-            userpw_str.length());
-        Aws::String hashed_userpw =
-            Aws::Utils::HashingUtils::Base64Encode(userpw_arr);
-        request->SetAuthorization("Basic " + hashed_userpw);
-    } else if (m_rt_opts.auth.auth_type == AUTHTYPE_IAM) {
-        std::shared_ptr< Aws::Auth::ProfileConfigFileAWSCredentialsProvider >
-            credential_provider = Aws::MakeShared<
-                Aws::Auth::ProfileConfigFileAWSCredentialsProvider >(
-                ALLOCATION_TAG.c_str(), ESODBC_PROFILE_NAME.c_str());
-        Aws::Client::AWSAuthV4Signer signer(credential_provider,
-                                            SERVICE_NAME.c_str(),
-                                            m_rt_opts.auth.region.c_str());
-        signer.SignRequest(*request);
-    }
-
-    // Issue request and return response
-    return m_http_client->MakeRequest(request);
-}
-
-bool OpenSearchCommunication::IsSQLPluginEnabled(std::shared_ptr< ErrorDetails > error_details) {
-    std::string error_type = error_details->source_type;
-    if (error_type =="SQLFeatureDisabledException") {
-        return false;
-    }
-    return true;
-}
-
-/**
- * @brief Queries server to determine SQL plugin availability.
- * 
- * @return true : Successfully queried server for SQL plugin
- * @return false : Failed to query server, no plugin available, exception was caught
- */
-bool OpenSearchCommunication::CheckSQLPluginAvailability() {
-    LogMsg(OPENSEARCH_ALL, "Checking for SQL plugin status.");
-    std::string test_query = "SHOW TABLES LIKE %";
-    try {
-        std::shared_ptr< Aws::Http::HttpResponse > response =
-            IssueRequest(sql_endpoint,
-                         Aws::Http::HttpMethod::HTTP_POST, ctype, test_query);
-        if (response == nullptr) {
-            m_error_message =
-                "Failed to receive response."
-                "Received NULL response.";
-            SetErrorDetails("Execution error", m_error_message,
-                            ConnErrorType::CONN_ERROR_QUERY_SYNTAX);
-            LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-            return false;
-        }
-
-        AwsHttpResponseToString(response, m_response_str);
-        if (response->GetResponseCode() == Aws::Http::HttpResponseCode::OK) {
-            return true;
-        }
-        else {
-            std::unique_ptr< OpenSearchResult > result =
-                std::make_unique< OpenSearchResult >();
-            AwsHttpResponseToString(response, result->result_json);
-            std::shared_ptr< ErrorDetails > error_details =
-                ParseErrorResponse(*result);
-
-            if(!IsSQLPluginEnabled(error_details)) {
-                m_error_message_to_user =
-                    "SQL plugin is disabled, please enable the plugin "
-                    "to use this driver.";
-                m_error_message +=
-                    "The SQL plugin is disabled. The SQL plugin must be "
-                    "enabled in order to use this driver. Response body: '"
-                    + m_response_str + "'";
-                SetErrorDetails("Connection error", m_error_message,
-                                ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            }
-
-            if (response->HasClientError()) {
-                m_error_message += " Client error: '"
-                                   + response->GetClientErrorMessage() + "'.";
-                SetErrorDetails("HTTP client error", m_error_message,
-                                ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            }
-
-            if (!m_response_str.empty()) {
-                m_error_message += " Response error: '" + m_response_str + "'.";
-                SetErrorDetails("Connection error", m_error_message,
-                                ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            }
-        }
-    } catch (...) {
-        m_error_message_to_user =
-            "SQL plugin is not available at url: " +
-            (m_rt_opts.conn.server + (m_rt_opts.conn.port.empty() ?
-            "" : ":" + m_rt_opts.conn.port)) +
-            ", please install the SQL plugin to use this driver.";
-        m_error_message +=
-            "Unexpected exception thrown from the server, "
-            "the SQL plugin is not installed or in unhealthy status.";
-        SetErrorDetails("Server error", m_error_message,
-                        ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-    }
-    return false;
-}
-
-bool OpenSearchCommunication::EstablishConnection() {
-    // Generate HttpClient Connection class if it does not exist
-    LogMsg(OPENSEARCH_ALL, "Attempting to establish DB connection.");
-    if (!m_http_client) {
-        InitializeConnection();
-    }
-
-    // check if the endpoint is initialized
-    if (sql_endpoint.empty()) {
-        SetSqlEndpoint();
-    }
-
-    // Check whether SQL plugin has been installed and enabled in the
-    // OpenSearch server since the SQL plugin is a prerequisite to
-    // use this driver.
-    if((sql_endpoint != SQL_ENDPOINT_ERROR_STR) && CheckSQLPluginAvailability()) {
-        return true;
-    }
-
-    LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-    return false;
-}
-
-std::vector< std::string > OpenSearchCommunication::GetColumnsWithSelectQuery(
-    const std::string table_name) {
-    std::vector< std::string > list_of_column;
-    if (table_name.empty()) {
-        m_error_type = ConnErrorType::CONN_ERROR_INVALID_NULL_PTR;
-        m_error_message = "Query is NULL";
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        return list_of_column;
-    }
-
-    // Prepare query
-    std::string query = "SELECT * FROM " + table_name + " LIMIT 0";
-    std::string msg = "Attempting to execute a query \"" + query + "\"";
-    LogMsg(OPENSEARCH_DEBUG, msg.c_str());
-
-    // Issue request
-    std::shared_ptr< Aws::Http::HttpResponse > response =
-        IssueRequest(sql_endpoint, Aws::Http::HttpMethod::HTTP_POST,
-                     ctype, query);
-
-    // Validate response
-    if (response == nullptr) {
-        m_error_message =
-            "Failed to receive response from query. "
-            "Received NULL response.";
-        SetErrorDetails("HTTP client error", m_error_message,
-                        ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        return list_of_column;
-    }
-
-    // Convert body from Aws IOStream to string
-    std::unique_ptr< OpenSearchResult > result = std::make_unique< OpenSearchResult >();
-    AwsHttpResponseToString(response, result->result_json);
-
-    // If response was not valid, set error
-    if (response->GetResponseCode() != Aws::Http::HttpResponseCode::OK) {
-        m_error_type = ConnErrorType::CONN_ERROR_QUERY_SYNTAX;
-        m_error_message =
-            "Http response code was not OK. Code received: "
-            + std::to_string(static_cast< long >(response->GetResponseCode()))
-            + ".";
-        if (response->HasClientError())
-            m_error_message +=
-                " Client error: '" + response->GetClientErrorMessage() + "'.";
-        if (!result->result_json.empty()) {
-            m_error_message +=
-                " Response error: '" + result->result_json + "'.";
-        }
-        SetErrorDetails("Connection error", m_error_message,
-                        ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        return list_of_column;
-    }
-
-    GetJsonSchema(*result);
-
-    rabbit::array schema_array = result->opensearch_result_doc["schema"];
-    for (rabbit::array::iterator it = schema_array.begin();
-         it != schema_array.end(); ++it) {
-        std::string column_name = it->at("name").as_string();
-        list_of_column.push_back(column_name);
-    }
-
-    return list_of_column;
-}
-
-int OpenSearchCommunication::ExecDirect(const char* query, const char* fetch_size_) {
-    m_error_details.reset();
-    if (!query) {
-        m_error_message = "Query is NULL";
-        SetErrorDetails("Execution error", m_error_message,
-                        ConnErrorType::CONN_ERROR_INVALID_NULL_PTR);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        return -1;
-    } else if (!m_http_client) {
-        m_error_message = "Unable to connect. Please try connecting again.";
-        SetErrorDetails("Execution error", m_error_message,
-                        ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        return -1;
-    }
-
-    // Prepare statement
-    std::string statement(query);
-    std::string fetch_size(fetch_size_);
-    std::string msg = "Attempting to execute a query \"" + statement + "\"";
-    LogMsg(OPENSEARCH_DEBUG, msg.c_str());
-
-    // Issue request
-    std::shared_ptr< Aws::Http::HttpResponse > response =
-        IssueRequest(sql_endpoint, Aws::Http::HttpMethod::HTTP_POST,
-                     ctype, statement, fetch_size);
-
-    // Validate response
-    if (response == nullptr) {
-        m_error_message =
-            "Failed to receive response from query. "
-            "Received NULL response.";
-        SetErrorDetails("Execution error", m_error_message,
-                        ConnErrorType::CONN_ERROR_QUERY_SYNTAX);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        return -1;
-    }
-
-    // Convert body from Aws IOStream to string
-    std::unique_ptr< OpenSearchResult > result = std::make_unique< OpenSearchResult >();
-    AwsHttpResponseToString(response, result->result_json);
-
-    // If response was not valid, set error
-    if (response->GetResponseCode() != Aws::Http::HttpResponseCode::OK) {
-        m_error_type = ConnErrorType::CONN_ERROR_QUERY_SYNTAX;
-        m_error_message =
-            "Http response code was not OK. Code received: "
-            + std::to_string(static_cast< long >(response->GetResponseCode()))
-            + ".";
-        if (response->HasClientError())
-            m_error_message +=
-                " Client error: '" + response->GetClientErrorMessage() + "'.";
-        if (!result->result_json.empty()) {
-            m_error_details = ParseErrorResponse(*result.get());
-            m_error_message +=
-                " Response error: '" + result->result_json + "'.";
-        }
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        return -1;
-    }
-
-    // Add to result queue and return
-    try {
-        ConstructOpenSearchResult(*result);
-    } catch (std::runtime_error& e) {
-        m_error_message =
-            "Received runtime exception: " + std::string(e.what());
-        if (!result->result_json.empty()) {
-            m_error_message += " Result body: " + result->result_json;
-        }
-        SetErrorDetails("Execution error", m_error_message,
-                        ConnErrorType::CONN_ERROR_QUERY_SYNTAX);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        return -1;
-    }
-
-    const std::string cursor = result->cursor;
-    while (!m_result_queue.push(QUEUE_TIMEOUT, result.get())) {
-        if (ConnStatusType::CONNECTION_OK == m_status) {
-            return -1;
-        }
-    }
-
-    result.release();
-
-    if (!cursor.empty()) {
-        // If the response has a cursor, this thread will retrieve more result
-        // pages asynchronously.
-        std::thread([&, cursor]() { SendCursorQueries(cursor); }).detach();
-    }
-
-    return 0;
-}
-
-void OpenSearchCommunication::SendCursorQueries(std::string cursor) {
-    if (cursor.empty()) {
-        return;
-    }
-    m_is_retrieving = true;
-
-    try {
-        while (!cursor.empty() && m_is_retrieving) {
-            std::shared_ptr< Aws::Http::HttpResponse > response = IssueRequest(
-                sql_endpoint, Aws::Http::HttpMethod::HTTP_POST,
-                ctype, "", "", cursor);
-            if (response == nullptr) {
-                m_error_message =
-                    "Failed to receive response from cursor. "
-                    "Received NULL response.";
-                SetErrorDetails("Cursor error", m_error_message,
-                                ConnErrorType::CONN_ERROR_QUERY_SYNTAX);
-                LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-                return;
-            }
-
-            std::unique_ptr< OpenSearchResult > result = std::make_unique< OpenSearchResult >();
-            AwsHttpResponseToString(response, result->result_json);
-            PrepareCursorResult(*result);
-
-            if (result->opensearch_result_doc.has("cursor")) {
-                cursor = result->opensearch_result_doc["cursor"].as_string();
-                result->cursor = result->opensearch_result_doc["cursor"].as_string();
-            } else {
-                SendCloseCursorRequest(cursor);
-                cursor.clear();
-            }
-
-            while (m_is_retrieving
-                   && !m_result_queue.push(QUEUE_TIMEOUT, result.get())) {
-            }
-
-            // Don't release when attempting to push to the queue as it may take
-            // multiple tries.
-            result.release();
-        }
-    } catch (std::runtime_error& e) {
-        m_error_message =
-            "Received runtime exception: " + std::string(e.what());
-        SetErrorDetails("Cursor error", m_error_message,
-                        ConnErrorType::CONN_ERROR_QUERY_SYNTAX);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-    }
-
-    if (!m_is_retrieving) {
-        m_result_queue.clear();
-    } else {
-        m_is_retrieving = false;
-    }
-}
-
-void OpenSearchCommunication::SendCloseCursorRequest(const std::string& cursor) {
-    std::shared_ptr< Aws::Http::HttpResponse > response =
-        IssueRequest(sql_endpoint + "/close",
-                     Aws::Http::HttpMethod::HTTP_POST, ctype, "", "", cursor);
-    if (response == nullptr) {
-        m_error_message =
-            "Failed to receive response from cursor close request. "
-            "Received NULL response.";
-        SetErrorDetails("Cursor error", m_error_message,
-                        ConnErrorType::CONN_ERROR_QUERY_SYNTAX);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-    }
-}
-
-void OpenSearchCommunication::StopResultRetrieval() {
-    m_is_retrieving = false;
-    m_result_queue.clear();
-}
-
-void OpenSearchCommunication::ConstructOpenSearchResult(OpenSearchResult& result) {
-    GetJsonSchema(result);
-    rabbit::array schema_array = result.opensearch_result_doc["schema"];
-    for (rabbit::array::iterator it = schema_array.begin();
-         it != schema_array.end(); ++it) {
-        std::string column_name = it->at("name").as_string();
-
-        ColumnInfo col_info;
-        col_info.field_name = column_name;
-        col_info.type_oid = KEYWORD_TYPE_OID;
-        col_info.type_size = KEYWORD_TYPE_SIZE;
-        col_info.display_size = KEYWORD_DISPLAY_SIZE;
-        col_info.length_of_str = KEYWORD_TYPE_SIZE;
-        col_info.relation_id = 0;
-        col_info.attribute_number = 0;
-
-        result.column_info.push_back(col_info);
-    }
-    if (result.opensearch_result_doc.has("cursor")) {
-        result.cursor = result.opensearch_result_doc["cursor"].as_string();
-    }
-    result.command_type = "SELECT";
-    result.num_fields = (uint16_t)schema_array.size();
-}
-
-inline void OpenSearchCommunication::LogMsg(OpenSearchLogLevel level, const char* msg) {
-#if WIN32
-#pragma warning(push)
-#pragma warning(disable : 4551)
-#endif  // WIN32
-    // cppcheck outputs an erroneous missing argument error which breaks build.
-    // Disable for this function call
-    MYLOG(level, "%s\n", msg);
-#if WIN32
-#pragma warning(pop)
-#endif  // WIN32
-}
-
-OpenSearchResult* OpenSearchCommunication::PopResult() {
-    OpenSearchResult* result = NULL;
-    while (!m_result_queue.pop(QUEUE_TIMEOUT, result) && m_is_retrieving) {
-    }
-
-    return result;
-}
-
-// TODO #36 - Send query to database to get encoding
-std::string OpenSearchCommunication::GetClientEncoding() {
-    return m_client_encoding;
-}
-
-// TODO #36 - Send query to database to set encoding
-bool OpenSearchCommunication::SetClientEncoding(std::string& encoding) {
-    if (std::find(m_supported_client_encodings.begin(),
-                  m_supported_client_encodings.end(), encoding)
-        != m_supported_client_encodings.end()) {
-        m_client_encoding = encoding;
-        return true;
-    }
-    LogMsg(OPENSEARCH_ERROR,
-           std::string("Failed to find encoding " + encoding).c_str());
-    return false;
-}
-
-std::string OpenSearchCommunication::GetServerVersion() {
-    if (!m_http_client) {
-        InitializeConnection();
-    }
-
-    // Issue request
-    std::shared_ptr< Aws::Http::HttpResponse > response =
-        IssueRequest("", Aws::Http::HttpMethod::HTTP_GET, "", "", "");
-    if (response == nullptr) {
-        m_error_message =
-            "Failed to receive response from server version query. "
-            "Received NULL response.";
-        SetErrorDetails("Connection error", m_error_message,
-                        ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        return "";
-    }
-
-    // Parse server version
-    if (response->GetResponseCode() == Aws::Http::HttpResponseCode::OK) {
-        try {
-            AwsHttpResponseToString(response, m_response_str);
-            rabbit::document doc;
-            doc.parse(m_response_str);
-            if (doc.has("version") && doc["version"].has("number")) {
-                return doc["version"]["number"].as_string();
-            }
-
-        } catch (const rabbit::type_mismatch& e) {
-            m_error_message = "Error parsing main endpoint response: "
-                              + std::string(e.what());
-            SetErrorDetails("Connection error", m_error_message,
-                            ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        } catch (const rabbit::parse_error& e) {
-            m_error_message = "Error parsing main endpoint response: "
-                              + std::string(e.what());
-            SetErrorDetails("Connection error", m_error_message,
-                            ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        } catch (const std::exception& e) {
-            m_error_message = "Error parsing main endpoint response: "
-                              + std::string(e.what());
-            SetErrorDetails("Connection error", m_error_message,
-                            ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        } catch (...) {
-            LogMsg(OPENSEARCH_ERROR,
-                   "Unknown exception thrown when parsing main endpoint "
-                   "response.");
-        }
-    }
-    LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-    return "";
-}
-
-/**
- * @brief Queries supplied URL to validate Server Distribution. Maintains
- * backwards compatibility with opendistro distribution.
- * 
- * @return std::string : Server distribution name, returns "" on error
- */
-std::string OpenSearchCommunication::GetServerDistribution() {
-    if (!m_http_client) {
-        InitializeConnection();
-    }
-
-    std::shared_ptr< Aws::Http::HttpResponse > response =
-        IssueRequest("", Aws::Http::HttpMethod::HTTP_GET, "", "", "");
-    if (response == nullptr || response->GetResponseCode() == Aws::Http::HttpResponseCode::REQUEST_NOT_MADE) {
-        m_error_message =
-            "Failed to receive response from server version query. "
-            "Received no response from url: "
-            + (m_rt_opts.conn.server + (m_rt_opts.conn.port.empty() ?
-            "" : ":" + m_rt_opts.conn.port));
-        SetErrorDetails("Connection error", m_error_message,
-                        ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        m_error_message_to_user = m_error_message;
-        return "";
-    }
-
-    // Parse server version distribution
-    if (response->GetResponseCode() == Aws::Http::HttpResponseCode::OK) {
-        try {
-            AwsHttpResponseToString(response, m_response_str);
-            rabbit::document doc;
-            doc.parse(m_response_str);
-            if (doc.has("version") && doc["version"].has("distribution")) {
-                return doc["version"]["distribution"].as_string();
-            }
-        } catch (const rabbit::type_mismatch& e) {
-            m_error_message = "Error parsing main endpoint response: "
-                              + std::string(e.what());
-            SetErrorDetails("Connection error", m_error_message,
-                            ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        } catch (const rabbit::parse_error& e) {
-            m_error_message = "Error parsing main endpoint response: "
-                              + std::string(e.what());
-            SetErrorDetails("Connection error", m_error_message,
-                            ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        } catch (const std::exception& e) {
-            m_error_message = "Error parsing main endpoint response: "
-                              + std::string(e.what());
-            SetErrorDetails("Connection error", m_error_message,
-                            ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        } catch (...) {
-            LogMsg(OPENSEARCH_ERROR,
-                   "Unknown exception thrown when parsing main endpoint "
-                   "response.");
-        }
-    }
-    LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-    return "";
-}
-
-std::string OpenSearchCommunication::GetClusterName() {
-    if (!m_http_client) {
-        InitializeConnection();
-    }
-
-    // Issue request
-    std::shared_ptr< Aws::Http::HttpResponse > response =
-        IssueRequest("", Aws::Http::HttpMethod::HTTP_GET, "", "", "");
-    if (response == nullptr) {
-        m_error_message =
-            "Failed to receive response from cluster name query. "
-            "Received NULL response.";
-        SetErrorDetails("Connection error", m_error_message,
-                        ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-        LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        return "";
-    }
-
-    // Parse cluster name
-    if (response->GetResponseCode() == Aws::Http::HttpResponseCode::OK) {
-        try {
-            AwsHttpResponseToString(response, m_response_str);
-            rabbit::document doc;
-            doc.parse(m_response_str);
-            if (doc.has("cluster_name")) {
-                return doc["cluster_name"].as_string();
-            }
-
-        } catch (const rabbit::type_mismatch& e) {
-            m_error_message = "Error parsing main endpoint response: "
-                              + std::string(e.what());
-            SetErrorDetails("Connection error", m_error_message,
-                            ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        } catch (const rabbit::parse_error& e) {
-            m_error_message = "Error parsing main endpoint response: "
-                              + std::string(e.what());
-            SetErrorDetails("Connection error", m_error_message,
-                            ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        } catch (const std::exception& e) {
-            m_error_message = "Error parsing main endpoint response: "
-                              + std::string(e.what());
-            SetErrorDetails("Connection error", m_error_message,
-                            ConnErrorType::CONN_ERROR_COMM_LINK_FAILURE);
-            LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-        } catch (...) {
-            LogMsg(OPENSEARCH_ERROR,
-                   "Unknown exception thrown when parsing main endpoint "
-                   "response.");
-        }
-    }
-    LogMsg(OPENSEARCH_ERROR, m_error_message.c_str());
-    return "";
-}
-
-/**
- * @brief Sets URL endpoint for SQL plugin. On failure to
- * determine appropriate endpoint, value is set to SQL_ENDPOINT_ERROR_STR
- * 
- */
-void OpenSearchCommunication::SetSqlEndpoint() {
-    std::string distribution = GetServerDistribution();
-    if (distribution.empty()) {
-        sql_endpoint = SQL_ENDPOINT_ERROR_STR;
-    } else if (distribution.compare("opensearch") == 0) {
-        sql_endpoint = "/_plugins/_sql";
-    } else {
-        sql_endpoint = "/_opendistro/_sql";
-    }
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_communication.h b/sql-odbc/src/sqlodbc/opensearch_communication.h
deleted file mode 100644
index b37ccc3535..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_communication.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef OPENSEARCH_COMMUNICATION
-#define OPENSEARCH_COMMUNICATION
-
-// clang-format off
-#include <memory>
-#include <queue>
-#include <future>
-#include <regex>
-#include "opensearch_types.h"
-#include "opensearch_result_queue.h"
-
-//Keep rabbit at top otherwise it gives build error because of some variable names like max, min
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#endif // __APPLE__
-#include "rabbit.hpp"
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif // __APPLE__
-#include <map>
-#include <string>
-#include <aws/core/Aws.h>
-#include <aws/core/http/HttpRequest.h>
-#include <aws/core/http/HttpResponse.h>
-#include <aws/core/http/HttpClientFactory.h>
-#include <aws/core/http/HttpClient.h>
-#include <aws/core/client/ClientConfiguration.h>
-// clang-format on
-
-class OpenSearchCommunication {
-   public:
-    OpenSearchCommunication();
-    ~OpenSearchCommunication();
-
-    // Create function for factory
-    std::string GetErrorMessage();
-    ConnErrorType GetErrorType();
-    bool ConnectionOptions(runtime_options& rt_opts, bool use_defaults,
-                           int expand_dbname, unsigned int option_count);
-    bool ConnectionOptions2();
-    bool ConnectDBStart();
-    ConnStatusType GetConnectionStatus();
-    void DropDBConnection();
-    void LogMsg(OpenSearchLogLevel level, const char* msg);
-    int ExecDirect(const char* query, const char* fetch_size_);
-    void SendCursorQueries(std::string cursor);
-    OpenSearchResult* PopResult();
-    std::string GetClientEncoding();
-    bool SetClientEncoding(std::string& encoding);
-    static bool IsSQLPluginEnabled(std::shared_ptr< ErrorDetails > error_details);
-    bool CheckSQLPluginAvailability();
-    std::string GetServerVersion();
-    std::string GetServerDistribution();
-    std::string GetClusterName();
-    std::shared_ptr< Aws::Http::HttpResponse > IssueRequest(
-        const std::string& endpoint, const Aws::Http::HttpMethod request_type,
-        const std::string& content_type, const std::string& query,
-        const std::string& fetch_size = "", const std::string& cursor = "");
-    void AwsHttpResponseToString(
-        std::shared_ptr< Aws::Http::HttpResponse > response,
-        std::string& output);
-    void SendCloseCursorRequest(const std::string& cursor);
-    void StopResultRetrieval();
-    std::vector< std::string > GetColumnsWithSelectQuery(
-        const std::string table_name);
-    void SetSqlEndpoint();
-
-    // the endpoint is set according to distribution (ES/OpenSearch)
-    std::string sql_endpoint;
-
-   private:
-    void InitializeConnection();
-    bool CheckConnectionOptions();
-    bool EstablishConnection();
-    void ConstructOpenSearchResult(OpenSearchResult& result);
-    void GetJsonSchema(OpenSearchResult& opensearch_result);
-    void PrepareCursorResult(OpenSearchResult& opensearch_result);
-    std::shared_ptr< ErrorDetails > ParseErrorResponse(
-        OpenSearchResult& opensearch_result);
-    void SetErrorDetails(std::string reason, std::string message,
-                         ConnErrorType error_type);
-    void SetErrorDetails(ErrorDetails details);
-
-    // TODO #35 - Go through and add error messages on exit conditions
-    std::string m_error_message;
-    const std::vector< std::string > m_supported_client_encodings = {"UTF8"};
-
-    ConnStatusType m_status;
-    ConnErrorType m_error_type;
-    std::shared_ptr< ErrorDetails > m_error_details;
-    bool m_valid_connection_options;
-    bool m_is_retrieving;
-    OpenSearchResultQueue m_result_queue;
-    runtime_options m_rt_opts;
-    std::string m_client_encoding;
-    std::string m_response_str;
-    std::shared_ptr< Aws::Http::HttpClient > m_http_client;
-    std::string m_error_message_to_user;
-};
-
-#endif
diff --git a/sql-odbc/src/sqlodbc/opensearch_connection.cpp b/sql-odbc/src/sqlodbc/opensearch_connection.cpp
deleted file mode 100644
index de9bb5038a..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_connection.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/*	TryEnterCriticalSection needs the following #define */
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif /* _WIN32_WINNT */
-
-#include "opensearch_connection.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "misc.h"
-
-/* for htonl */
-#ifdef WIN32
-#include <Winsock2.h>
-#else
-#include <arpa/inet.h>
-#endif
-
-#include <map>
-#include <string>
-#include <string_view>
-
-#include "dlg_specific.h"
-#include "environ.h"
-#include "loadlib.h"
-#include "multibyte.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_helper.h"
-#include "qresult.h"
-#include "statement.h"
-
-#define PROTOCOL3_OPTS_MAX 30
-#define ERROR_BUFF_SIZE 200
-#define OPTION_COUNT 4
-#if OPTION_COUNT > PROTOCOL3_OPTS_MAX
-#error("Option count (OPTION_COUNT) is greater than max option count allow (PROTOCOL3_OPTS_MAX).")
-#endif
-
-void CC_determine_locale_encoding(ConnectionClass *self);
-
-char CC_connect(ConnectionClass *self) {
-    if (self == NULL)
-        return 0;
-
-    // Attempt to connect to OpenSearch
-    int conn_code = LIBOPENSEARCH_connect(self);
-    if (conn_code <= 0)
-        return static_cast< char >(conn_code);
-
-    // Set encodings
-    CC_determine_locale_encoding(self);
-#ifdef UNICODE_SUPPORT
-    if (CC_is_in_unicode_driver(self)) {
-        if (!SQL_SUCCEEDED(CC_send_client_encoding(self, "UTF8"))) {
-            return 0;
-        }
-    } else
-#endif
-    {
-        if (!SQL_SUCCEEDED(
-                CC_send_client_encoding(self, self->locale_encoding))) {
-            return 0;
-        }
-    }
-
-    // Set cursor parameters based on connection info
-    self->status = CONN_CONNECTED;
-    if ((CC_is_in_unicode_driver(self)) && (CC_is_in_ansi_app(self)))
-        self->unicode |= CONN_DISALLOW_WCHAR;
-
-    // 1 is SQL_SUCCESS and 2 is SQL_SCCUESS_WITH_INFO
-    return 1;
-}
-
-/**
- * @brief Prepends the appropriate protocol to the user supplied server url
- * when necessary. With no protocol speciefied, the use_ssl flag determines
- * returned value.
- * 
- * @param self : Supplied connection input data
- * @return std::string : Valid server URL with prepended protocol
- */
-std::string generateValidServerUrl(ConnectionClass *self) {
-    std::string valid_server_url = "";
-    std::string_view server_url = self->connInfo.server;
-    std::string_view http_prefix = "http://";
-    std::string_view https_prefix = "https://";
-    if(server_url.empty()) {
-        return valid_server_url;
-    }
-
-    bool http_prefix_prepended = (server_url.size() > http_prefix.size() && (server_url.substr(0, http_prefix.size()) == http_prefix));
-    bool https_prefix_prepended = (server_url.size() > https_prefix.size() && (server_url.substr(0, https_prefix.size()) == https_prefix));
-    if (!http_prefix_prepended && !https_prefix_prepended) {
-        valid_server_url = self->connInfo.use_ssl ?
-            std::string(https_prefix) + std::string(server_url) :
-            std::string(http_prefix) + std::string(server_url);
-    } else {
-        valid_server_url = server_url;
-    }
-    return valid_server_url;
-}
-
-int LIBOPENSEARCH_connect(ConnectionClass *self) {
-    if (self == NULL)
-        return 0;
-
-    // Setup options
-    runtime_options rt_opts;
-
-    // Connection
-    rt_opts.conn.server.assign(generateValidServerUrl(self));
-    if(rt_opts.conn.server.empty()) {
-        return 0;
-    }
-    rt_opts.conn.port.assign(self->connInfo.port);
-    rt_opts.conn.timeout.assign(self->connInfo.response_timeout);
-
-    // Authentication
-    rt_opts.auth.auth_type.assign(self->connInfo.authtype);
-    rt_opts.auth.username.assign(self->connInfo.username);
-    rt_opts.auth.password.assign(SAFE_NAME(self->connInfo.password));
-    rt_opts.auth.region.assign(self->connInfo.region);
-
-    // Encryption
-    rt_opts.crypt.verify_server = (self->connInfo.verify_server == 1);
-    rt_opts.crypt.use_ssl = (self->connInfo.use_ssl == 1);
-
-    void *opensearchconn = OpenSearchConnectDBParams(rt_opts, FALSE, OPTION_COUNT);
-    if (opensearchconn == NULL) {
-        std::string err = GetErrorMsg(opensearchconn);
-        CC_set_error(self, CONN_OPENDB_ERROR,
-                     (err.empty()) ? "OpenSearchConnectDBParams error" : err.c_str(),
-                     "LIBOPENSEARCH_connect");
-        return 0;
-    }
-
-    // Check connection status
-    if (OpenSearchStatus(opensearchconn) != CONNECTION_OK) {
-        std::string msg = GetErrorMsg(opensearchconn);
-        char error_message_out[ERROR_BUFF_SIZE] = "";
-        if (!msg.empty())
-            SPRINTF_FIXED(error_message_out, "Connection error: %s",
-                          msg.c_str());
-        else
-            STRCPY_FIXED(error_message_out,
-                         "Connection error: No message available.");
-        CC_set_error(self, CONN_OPENDB_ERROR, error_message_out,
-                     "LIBOPENSEARCH_connect");
-        OpenSearchDisconnect(opensearchconn);
-        return 0;
-    }
-
-    // Set server version
-    std::string server_version = GetServerVersion(opensearchconn);
-    STRCPY_FIXED(self->opensearch_version, server_version.c_str());
-
-    std::string cluster_name = GetClusterName(opensearchconn);
-    STRCPY_FIXED(self->cluster_name, cluster_name.c_str());
-
-    self->opensearchconn = (void *)opensearchconn;
-    return 1;
-}
-
-// TODO #36 - When we fix encoding, we should look into returning a code here.
-// This is called in connection.c and the return code isn't checked
-void CC_set_locale_encoding(ConnectionClass *self, const char *encoding) {
-    if (self == NULL)
-        return;
-
-    // Set encoding
-    char *prev_encoding = self->locale_encoding;
-    self->locale_encoding = (encoding == NULL) ? NULL : strdup(encoding);
-    if (prev_encoding)
-        free(prev_encoding);
-}
-
-// TODO #36 - Add return code - see above function comment
-void CC_determine_locale_encoding(ConnectionClass *self) {
-    // Don't update if it's already set
-    if ((self == NULL) || (self->locale_encoding != NULL))
-        return;
-
-    // Get current db encoding and derive the locale encoding
-    // TODO #34 - Investigate locale
-    CC_set_locale_encoding(self, "SQL_ASCII");
-}
-
-int CC_send_client_encoding(ConnectionClass *self, const char *encoding) {
-    if ((self == NULL) || (encoding == NULL))
-        return SQL_ERROR;
-
-    // Update client encoding
-    std::string des_db_encoding(encoding);
-    std::string cur_db_encoding = OpenSearchGetClientEncoding(self->opensearchconn);
-    if (des_db_encoding != cur_db_encoding) {
-        if (!OpenSearchSetClientEncoding(self->opensearchconn, des_db_encoding)) {
-            return SQL_ERROR;
-        }
-    }
-
-    // Update connection class to reflect updated client encoding
-    char *prev_encoding = self->original_client_encoding;
-    self->original_client_encoding = strdup(des_db_encoding.c_str());
-    self->ccsc = static_cast< short >(opensearch_CS_code(des_db_encoding.c_str()));
-    self->mb_maxbyte_per_char = static_cast< short >(opensearch_mb_maxlen(self->ccsc));
-    if (prev_encoding != NULL)
-        free(prev_encoding);
-
-    return SQL_SUCCESS;
-}
-
-void CC_initialize_opensearch_version(ConnectionClass *self) {
-    STRCPY_FIXED(self->opensearch_version, "7.4");
-    self->opensearch_version_major = 7;
-    self->opensearch_version_minor = 4;
-}
-
-void LIBOPENSEARCH_disconnect(void *conn) {
-    OpenSearchDisconnect(conn);
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_connection.h b/sql-odbc/src/sqlodbc/opensearch_connection.h
deleted file mode 100644
index bc4a699c97..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_connection.h
+++ /dev/null
@@ -1,456 +0,0 @@
-#ifndef __OPENSEARCHCONNECTION_H__
-#define __OPENSEARCHCONNECTION_H__
-
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "descriptor.h"
-#include "opensearch_helper.h"
-#include "opensearch_odbc.h"
-#include "opensearch_utility.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef enum {
-    CONN_NOT_CONNECTED, /* Connection has not been established */
-    CONN_CONNECTED,     /* Connection is up and has been established */
-    CONN_DOWN,          /* Connection is broken */
-    CONN_EXECUTING      /* the connection is currently executing a
-                         * statement */
-} CONN_Status;
-
-/*	These errors have general sql error state */
-#define CONNECTION_SERVER_NOT_REACHED 101
-#define CONNECTION_MSG_TOO_LONG 103
-#define CONNECTION_COULD_NOT_SEND 104
-#define CONNECTION_NO_SUCH_DATABASE 105
-#define CONNECTION_BACKEND_CRAZY 106
-#define CONNECTION_NO_RESPONSE 107
-#define CONNECTION_SERVER_REPORTED_SEVERITY_FATAL 108
-#define CONNECTION_COULD_NOT_RECEIVE 109
-#define CONNECTION_SERVER_REPORTED_SEVERITY_ERROR 110
-#define CONNECTION_NEED_PASSWORD 112
-#define CONNECTION_COMMUNICATION_ERROR 113
-
-#define CONN_ERROR_IGNORED (-3)
-#define CONN_TRUNCATED (-2)
-#define CONN_OPTION_VALUE_CHANGED (-1)
-/*	These errors correspond to specific SQL states */
-#define CONN_INIREAD_ERROR 201
-#define CONN_OPENDB_ERROR 202
-#define CONN_STMT_ALLOC_ERROR 203
-#define CONN_IN_USE 204
-#define CONN_UNSUPPORTED_OPTION 205
-/* Used by SetConnectoption to indicate unsupported options */
-#define CONN_INVALID_ARGUMENT_NO 206
-/* SetConnectOption: corresponds to ODBC--"S1009" */
-#define CONN_TRANSACT_IN_PROGRES 207
-#define CONN_NO_MEMORY_ERROR 208
-#define CONN_NOT_IMPLEMENTED_ERROR 209
-#define CONN_INVALID_AUTHENTICATION 210
-#define CONN_AUTH_TYPE_UNSUPPORTED 211
-#define CONN_UNABLE_TO_LOAD_DLL 212
-#define CONN_ILLEGAL_TRANSACT_STATE 213
-#define CONN_VALUE_OUT_OF_RANGE 214
-
-#define CONN_OPTION_NOT_FOR_THE_DRIVER 216
-#define CONN_EXEC_ERROR 217
-
-/* Conn_status defines */
-#define CONN_IN_AUTOCOMMIT 1L
-#define CONN_IN_TRANSACTION (1L << 1)
-#define CONN_IN_MANUAL_TRANSACTION (1L << 2)
-#define CONN_IN_ERROR_BEFORE_IDLE (1L << 3)
-
-/* not connected yet || already disconnected */
-#define CC_not_connected(x) \
-    (!(x) || CONN_DOWN == (x)->status || CONN_NOT_CONNECTED == (x)->status)
-
-/* AutoCommit functions */
-#define CC_is_in_autocommit(x) (x->transact_status & CONN_IN_AUTOCOMMIT)
-#define CC_does_autocommit(x) \
-    (CONN_IN_AUTOCOMMIT       \
-     == ((x)->transact_status \
-         & (CONN_IN_AUTOCOMMIT | CONN_IN_MANUAL_TRANSACTION)))
-#define CC_loves_visible_trans(x)                       \
-    ((0 == ((x)->transact_status & CONN_IN_AUTOCOMMIT)) \
-     || (0 != ((x)->transact_status & CONN_IN_MANUAL_TRANSACTION)))
-
-/* Transaction in/not functions */
-#define CC_set_in_trans(x) (x->transact_status |= CONN_IN_TRANSACTION)
-#define CC_set_no_trans(x) \
-    (x->transact_status &= ~(CONN_IN_TRANSACTION | CONN_IN_ERROR_BEFORE_IDLE))
-#define CC_is_in_trans(x) (0 != (x->transact_status & CONN_IN_TRANSACTION))
-
-/* Manual transaction in/not functions */
-#define CC_set_in_manual_trans(x) \
-    (x->transact_status |= CONN_IN_MANUAL_TRANSACTION)
-#define CC_set_no_manual_trans(x) \
-    (x->transact_status &= ~CONN_IN_MANUAL_TRANSACTION)
-#define CC_is_in_manual_trans(x) \
-    (0 != (x->transact_status & CONN_IN_MANUAL_TRANSACTION))
-
-/* Error waiting for ROLLBACK */
-#define CC_set_in_error_trans(x) \
-    (x->transact_status |= CONN_IN_ERROR_BEFORE_IDLE)
-#define CC_set_no_error_trans(x) \
-    (x->transact_status &= ~CONN_IN_ERROR_BEFORE_IDLE)
-#define CC_is_in_error_trans(x) (x->transact_status & CONN_IN_ERROR_BEFORE_IDLE)
-
-#define CC_get_errornumber(x) (x->__error_number)
-#define CC_get_errormsg(x) (x->__error_message)
-#define CC_set_errornumber(x, n) (x->__error_number = n)
-
-/* Unicode handling */
-#define CONN_UNICODE_DRIVER (1L)
-#define CONN_ANSI_APP (1L << 1)
-#define CONN_DISALLOW_WCHAR (1L << 2)
-#define CC_set_in_unicode_driver(x) (x->unicode |= CONN_UNICODE_DRIVER)
-#define CC_set_in_ansi_app(x) (x->unicode |= CONN_ANSI_APP)
-#define CC_is_in_unicode_driver(x) (0 != (x->unicode & CONN_UNICODE_DRIVER))
-#define CC_is_in_ansi_app(x) (0 != (x->unicode & CONN_ANSI_APP))
-#define CC_is_in_global_trans(x) (NULL != (x)->asdum)
-#define ALLOW_WCHAR(x)                       \
-    (0 != (x->unicode & CONN_UNICODE_DRIVER) \
-     && 0 == (x->unicode & CONN_DISALLOW_WCHAR))
-
-#define CC_MALLOC_return_with_error(t, tp, s, x, m, ret)  \
-    do {                                                  \
-        if (t = malloc(s), NULL == t) {                   \
-            CC_set_error(x, CONN_NO_MEMORY_ERROR, m, ""); \
-            return ret;                                   \
-        }                                                 \
-    } while (0)
-#define CC_REALLOC_return_with_error(t, tp, s, x, m, ret) \
-    do {                                                  \
-        tp *tmp;                                          \
-        if (tmp = (tp *)realloc(t, s), NULL == tmp) {     \
-            CC_set_error(x, CONN_NO_MEMORY_ERROR, m, ""); \
-            return ret;                                   \
-        }                                                 \
-        t = tmp;                                          \
-    } while (0)
-
-/* For Multi-thread */
-#define INIT_CONN_CS(x) XPlatformInitializeCriticalSection(&((x)->cs))
-#define INIT_CONNLOCK(x) XPlatformInitializeCriticalSection(&((x)->slock))
-#define ENTER_CONN_CS(x) XPlatformEnterCriticalSection(((x)->cs))
-#define CONNLOCK_ACQUIRE(x) XPlatformEnterCriticalSection(((x)->slock))
-#define LEAVE_CONN_CS(x) XPlatformLeaveCriticalSection(((x)->cs))
-#define CONNLOCK_RELEASE(x) XPlatformLeaveCriticalSection(((x)->slock))
-#define DELETE_CONN_CS(x) XPlatformDeleteCriticalSection(&((x)->cs))
-#define DELETE_CONNLOCK(x) XPlatformDeleteCriticalSection(&((x)->slock))
-
-#define ENTER_INNER_CONN_CS(conn, entered) \
-    do {                                   \
-        ENTER_CONN_CS(conn);               \
-        entered++;                         \
-    } while (0)
-
-#define LEAVE_INNER_CONN_CS(entered, conn) \
-    do {                                   \
-        if (entered > 0) {                 \
-            LEAVE_CONN_CS(conn);           \
-            entered--;                     \
-        }                                  \
-    } while (0)
-
-#define CLEANUP_FUNC_CONN_CS(entered, conn) \
-    do {                                    \
-        while (entered > 0) {               \
-            LEAVE_CONN_CS(conn);            \
-            entered--;                      \
-        }                                   \
-    } while (0)
-
-/*
- *	Macros to compare the server's version with a specified version
- *		1st parameter: pointer to a ConnectionClass object
- *		2nd parameter: major version number
- *		3rd parameter: minor version number
- */
-#define SERVER_VERSION_GT(conn, major, minor) \
-    ((conn)->opensearch_version_major > major         \
-     || ((conn)->opensearch_version_major == major    \
-         && (conn)->opensearch_version_minor > minor))
-#define SERVER_VERSION_GE(conn, major, minor) \
-    ((conn)->opensearch_version_major > major         \
-     || ((conn)->opensearch_version_major == major    \
-         && (conn)->opensearch_version_minor >= minor))
-#define SERVER_VERSION_EQ(conn, major, minor) \
-    ((conn)->opensearch_version_major == major && (conn)->opensearch_version_minor == minor)
-#define STRING_AFTER_DOT(string) (strchr(#string, '.') + 1)
-
-/*
- *	Simplified macros to compare the server's version with a
- *		specified version
- *	Note: Never pass a variable as the second parameter.
- *		  It must be a decimal constant of the form %d.%d .
- */
-#define OPENSEARCH_VERSION_GT(conn, ver) \
-    (SERVER_VERSION_GT(conn, (int)ver, atoi(STRING_AFTER_DOT(ver))))
-#define OPENSEARCH_VERSION_GE(conn, ver) \
-    (SERVER_VERSION_GE(conn, (int)ver, atoi(STRING_AFTER_DOT(ver))))
-#define OPENSEARCH_VERSION_EQ(conn, ver) \
-    (SERVER_VERSION_EQ(conn, (int)ver, atoi(STRING_AFTER_DOT(ver))))
-#define OPENSEARCH_VERSION_LE(conn, ver) (!OPENSEARCH_VERSION_GT(conn, ver))
-#define OPENSEARCH_VERSION_LT(conn, ver) (!OPENSEARCH_VERSION_GE(conn, ver))
-
-/*	This is used to store cached table information in the connection */
-struct col_info {
-    Int2 refcnt;
-    QResultClass *result;
-    opensearchNAME schema_name;
-    opensearchNAME table_name;
-    OID table_oid;
-    int table_info;
-    time_t acc_time;
-};
-enum { TBINFO_HASOIDS = 1L, TBINFO_HASSUBCLASS = (1L << 1) };
-#define free_col_info_contents(coli)      \
-    {                                     \
-        if (NULL != coli->result)         \
-            QR_Destructor(coli->result);  \
-        coli->result = NULL;              \
-        NULL_THE_NAME(coli->schema_name); \
-        NULL_THE_NAME(coli->table_name);  \
-        coli->table_oid = 0;              \
-        coli->refcnt = 0;                 \
-        coli->acc_time = 0;               \
-    }
-#define col_info_initialize(coli) (memset(coli, 0, sizeof(COL_INFO)))
-
-/* Translation DLL entry points */
-#ifdef WIN32
-#define DLLHANDLE HINSTANCE
-#else
-#define WINAPI CALLBACK
-#define DLLHANDLE void *
-#define HINSTANCE void *
-#endif
-
-typedef BOOL(WINAPI *DataSourceToDriverProc)(UDWORD, SWORD, PTR, SDWORD, PTR,
-                                             SDWORD, SDWORD *, UCHAR *, SWORD,
-                                             SWORD *);
-typedef BOOL(WINAPI *DriverToDataSourceProc)(UDWORD, SWORD, PTR, SDWORD, PTR,
-                                             SDWORD, SDWORD *, UCHAR *, SWORD,
-                                             SWORD *);
-
-/*******	The Connection handle	************/
-struct ConnectionClass_ {
-    HENV henv; /* environment this connection was
-                * created on */
-    SQLUINTEGER login_timeout;
-    signed char autocommit_public;
-    StatementOptions stmtOptions;
-    ARDFields ardOptions;
-    APDFields apdOptions;
-    char *__error_message;
-    int __error_number;
-    char sqlstate[8];
-    CONN_Status status;
-    ConnInfo connInfo;
-    StatementClass **stmts;
-    Int2 num_stmts;
-    Int2 ncursors;
-    void *opensearchconn;
-    Int4 lobj_type;
-    Int2 coli_allocated;
-    Int2 ntables;
-    COL_INFO **col_info;
-    long translation_option;
-    HINSTANCE translation_handle;
-    DataSourceToDriverProc DataSourceToDriver;
-    DriverToDataSourceProc DriverToDataSource;
-    char transact_status;             /* Is a transaction is currently
-                                       * in progress */
-    char cluster_name[MAX_INFO_STRING];
-    char opensearch_version[MAX_INFO_STRING]; /* Version of OpenSearch driver
-                                       * we're connected to -
-                                       * DJP 25-1-2001 */
-    Int2 opensearch_version_major;
-    Int2 opensearch_version_minor;
-    char ms_jet;
-    char unicode;
-    char result_uncommitted;
-    char lo_is_domain;
-    char current_schema_valid; /* is current_schema valid? TRUE when
-                                * current_schema == NULL means it's
-                                * really NULL, while FALSE means it's
-                                * unknown */
-    unsigned char on_commit_in_progress;
-    /* for per statement rollback */
-    char internal_svp; /* is set? */
-    char internal_op;  /* operation being executed as to internal savepoint */
-    unsigned char rbonerr;
-    unsigned char opt_in_progress;
-    unsigned char opt_previous;
-
-    char *original_client_encoding;
-    char *locale_encoding;
-    char *server_encoding;
-    Int2 ccsc;
-    Int2 mb_maxbyte_per_char;
-    SQLUINTEGER isolation;        /* isolation level initially unknown */
-    SQLUINTEGER server_isolation; /* isolation at server initially unknown */
-    char *current_schema;
-    StatementClass *unnamed_prepared_stmt;
-    Int2 max_identifier_length;
-    Int2 num_discardp;
-    char **discardp;
-    int num_descs;
-    SQLUINTEGER
-    default_isolation; /* server's default isolation initially unkown */
-    DescriptorClass **descs;
-    opensearchNAME schemaIns;
-    opensearchNAME tableIns;
-    SQLULEN stmt_timeout_in_effect;
-    void *cs;
-    void *slock;
-#ifdef _HANDLE_ENLIST_IN_DTC_
-    UInt4 gTranInfo;
-    void *asdum;
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
-};
-
-/* Accessor functions */
-#define CC_get_env(x) ((x)->henv)
-#define CC_get_database(x) (x->connInfo.database)
-#define CC_get_server(x) (x->connInfo.server)
-#define CC_get_DSN(x) (x->connInfo.dsn)
-#define CC_get_username(x) (x->connInfo.username)
-#define CC_is_onlyread(x) (x->connInfo.onlyread[0] == '1')
-#define CC_fake_mss(x) (/* 0 != (x)->ms_jet && */ 0 < (x)->connInfo.fake_mss)
-#define CC_accessible_only(x) (0 < (x)->connInfo.accessible_only)
-#define CC_default_is_c(x) \
-    (CC_is_in_ansi_app(x)  \
-     || x->ms_jet /* not only */ || TRUE /* but for any other ? */)
-
-#ifdef _HANDLE_ENLIST_IN_DTC_
-enum {
-    DTC_IN_PROGRESS = 1L,
-    DTC_ENLISTED = (1L << 1),
-    DTC_REQUEST_EXECUTING = (1L << 2),
-    DTC_ISOLATED = (1L << 3),
-    DTC_PREPARE_REQUESTED = (1L << 4)
-};
-#define CC_set_dtc_clear(x) ((x)->gTranInfo = 0)
-#define CC_set_dtc_enlisted(x) \
-    ((x)->gTranInfo |= (DTC_IN_PROGRESS | DTC_ENLISTED))
-#define CC_no_dtc_enlisted(x) ((x)->gTranInfo &= (~DTC_ENLISTED))
-#define CC_is_dtc_enlisted(x) (0 != ((x)->gTranInfo & DTC_ENLISTED))
-#define CC_set_dtc_executing(x) ((x)->gTranInfo |= DTC_REQUEST_EXECUTING)
-#define CC_no_dtc_executing(x) ((x)->gTranInfo &= (~DTC_REQUEST_EXECUTING))
-#define CC_is_dtc_executing(x) (0 != ((x)->gTranInfo & DTC_REQUEST_EXECUTING))
-#define CC_set_dtc_prepareRequested(x) \
-    ((x)->gTranInfo |= (DTC_PREPARE_REQUESTED))
-#define CC_no_dtc_prepareRequested(x) \
-    ((x)->gTranInfo &= (~DTC_PREPARE_REQUESTED))
-#define CC_is_dtc_prepareRequested(x) \
-    (0 != ((x)->gTranInfo & DTC_PREPARE_REQUESTED))
-#define CC_is_dtc_executing(x) (0 != ((x)->gTranInfo & DTC_REQUEST_EXECUTING))
-#define CC_set_dtc_isolated(x) ((x)->gTranInfo |= DTC_ISOLATED)
-#define CC_is_idle_in_global_transaction(x)        \
-    (0 != ((x)->gTranInfo & DTC_PREPARE_REQUESTED) \
-     || (x)->gTranInfo == DTC_IN_PROGRESS)
-#endif /* _HANDLE_ENLIST_IN_DTC_ */
-/* statement callback */
-#define CC_start_stmt(a) ((a)->rbonerr = 0)
-#define CC_start_tc_stmt(a) ((a)->rbonerr = (1L << 1))
-#define CC_is_tc_stmt(a) (((a)->rbonerr & (1L << 1)) != 0)
-#define CC_start_rb_stmt(a) ((a)->rbonerr = (1L << 2))
-#define CC_is_rb_stmt(a) (((a)->rbonerr & (1L << 2)) != 0)
-#define CC_set_accessed_db(a) ((a)->rbonerr |= (1L << 3))
-#define CC_accessed_db(a) (((a)->rbonerr & (1L << 3)) != 0)
-#define CC_start_rbpoint(a) ((a)->rbonerr |= (1L << 4), (a)->internal_svp = 1)
-#define CC_started_rbpoint(a) (((a)->rbonerr & (1L << 4)) != 0)
-
-/*	prototypes */
-ConnectionClass *CC_Constructor(void);
-char CC_Destructor(ConnectionClass *self);
-RETCODE CC_cleanup(ConnectionClass *self, BOOL keepCommunication);
-BOOL CC_set_autocommit(ConnectionClass *self, BOOL on);
-char CC_add_statement(ConnectionClass *self, StatementClass *stmt);
-char CC_remove_statement(ConnectionClass *self, StatementClass *stmt);
-char CC_add_descriptor(ConnectionClass *self, DescriptorClass *desc);
-void CC_set_error(ConnectionClass *self, int number, const char *message,
-                  const char *func);
-void CC_set_errormsg(ConnectionClass *self, const char *message);
-int CC_get_error(ConnectionClass *self, int *number, char **message);
-void CC_clear_error(ConnectionClass *self);
-void CC_log_error(const char *func, const char *desc,
-                  const ConnectionClass *self);
-
-int CC_get_max_idlen(ConnectionClass *self);
-char CC_get_escape(const ConnectionClass *self);
-char *identifierEscape(const SQLCHAR *src, SQLLEN srclen,
-                       const ConnectionClass *conn, char *buf, size_t bufsize,
-                       BOOL double_quote);
-int findIdentifier(const UCHAR *str, int ccsc, const UCHAR **next_token);
-int eatTableIdentifiers(const UCHAR *str, int ccsc, opensearchNAME *table,
-                        opensearchNAME *schema);
-
-char CC_connect(ConnectionClass *self);
-int LIBOPENSEARCH_connect(ConnectionClass *self);
-void LIBOPENSEARCH_disconnect(void *conn);
-int CC_send_client_encoding(ConnectionClass *self, const char *encoding);
-void CC_set_locale_encoding(ConnectionClass *self, const char *encoding);
-void CC_initialize_opensearch_version(ConnectionClass *self);
-
-const char *CurrCat(const ConnectionClass *self);
-const char *CurrCatString(const ConnectionClass *self);
-SQLUINTEGER CC_get_isolation(ConnectionClass *self);
-
-SQLCHAR *make_lstring_ifneeded(ConnectionClass *, const SQLCHAR *s, ssize_t len,
-                               BOOL);
-
-#define TABLE_IS_VALID(tbname, tblen) \
-    ((tbname) && (tblen > 0 || SQL_NTS == tblen))
-
-/* CC_send_query options */
-enum {
-    IGNORE_ABORT_ON_CONN = 1L /* not set the error result even when  */
-    ,
-    CREATE_KEYSET = (1L << 1) /* create keyset for updatable cursors */
-    ,
-    GO_INTO_TRANSACTION = (1L << 2) /* issue BEGIN in advance */
-    ,
-    ROLLBACK_ON_ERROR = (1L << 3) /* rollback the query when an error occurs */
-    ,
-    END_WITH_COMMIT = (1L << 4) /* the query ends with COMMIT command */
-    ,
-    READ_ONLY_QUERY = (1L << 5) /* the query is read-only */
-};
-/* CC_on_abort options */
-#define NO_TRANS 1L
-#define CONN_DEAD (1L << 1) /* connection is no longer valid */
-
-/*
- *	internal savepoint related
- */
-
-#define _RELEASE_INTERNAL_SAVEPOINT
-
-/*      Internal rollback */
-enum { PER_STATEMENT_ROLLBACK = 1, PER_QUERY_ROLLBACK };
-
-/*     Commands generated */
-enum { INTERNAL_SAVEPOINT_OPERATION = 1, INTERNAL_ROLLBACK_OPERATION };
-
-/*      Operations in progress */
-enum { SAVEPOINT_IN_PROGRESS = 1, PREPEND_IN_PROGRESS };
-/*      StatementSvp entry option */
-enum { SVPOPT_RDONLY = 1L, SVPOPT_REDUCE_ROUNDTRIP = (1L << 1) };
-#define INIT_SVPOPT (SVPOPT_RDONLY)
-#define CC_svp_init(a)                         \
-    ((a)->internal_svp = (a)->internal_op = 0, \
-     (a)->opt_in_progress = (a)->opt_previous = INIT_SVPOPT)
-#define CC_init_opt_in_progress(a) ((a)->opt_in_progress = INIT_SVPOPT)
-#define CC_init_opt_previous(a) ((a)->opt_previous = INIT_SVPOPT)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __OPENSEARCHCONNECTION_H__ */
diff --git a/sql-odbc/src/sqlodbc/opensearch_driver_connect.cpp b/sql-odbc/src/sqlodbc/opensearch_driver_connect.cpp
deleted file mode 100644
index 29e3f3c012..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_driver_connect.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-#include "opensearch_driver_connect.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "opensearch_odbc.h"
-#include "misc.h"
-
-#ifndef WIN32
-#include <sys/socket.h>
-#include <sys/types.h>
-#else
-#include <winsock2.h>
-#endif
-
-#include <string.h>
-
-#ifdef WIN32
-#include <windowsx.h>
-
-#include "resource.h"
-#endif
-#include <memory>
-#include <string>
-
-#include "dlg_specific.h"
-#include "drvconn.h"
-#include "opensearch_apifunc.h"
-
-static RETCODE CheckDriverComplete(const SQLUSMALLINT driver_completion,
-                                   const HWND hwnd, ConnInfo *ci,
-                                   const int reqs) {
-    (void)(ci);
-    (void)(reqs);
-    if (hwnd == NULL)
-        return SQL_SUCCESS;
-    switch (driver_completion) {
-#ifdef WIN32
-        case SQL_DRIVER_COMPLETE_REQUIRED:
-        case SQL_DRIVER_COMPLETE:
-            if (!paramRequired(ci, reqs))
-                break;
-        case SQL_DRIVER_PROMPT: {
-            const RETCODE dialog_result = dconn_DoDialog(hwnd, ci);
-            if (dialog_result != SQL_SUCCESS)
-                return dialog_result;
-            break;
-        }
-#endif  // WIN32
-        default:
-            break;
-    }
-    return SQL_SUCCESS;
-}
-
-static RETCODE GetRequirementsAndConnect(const SQLUSMALLINT driver_completion,
-                                         const HWND hwnd, ConnInfo *ci,
-                                         int &reqs, ConnectionClass *conn,
-                                         int &ret_val) {
-    const RETCODE res = CheckDriverComplete(driver_completion, hwnd, ci, reqs);
-    if (res != SQL_SUCCESS)
-        return res;
-
-    // Password is not a required parameter unless authentication asks for it.
-    // Let the application ask over and over until a password is entered (the
-    // user can always hit Cancel to get out)
-    if (paramRequired(ci, reqs)) {
-        CC_set_error(conn, CONN_OPENDB_ERROR, "Please supply password",
-                     "OPENSEARCHAPI_DriverConnect->GetRequirements");
-        return SQL_ERROR;
-    }
-    ret_val = CC_connect(conn);
-    return SQL_SUCCESS;
-}
-
-static RETCODE CreateOutputConnectionString(ssize_t &len, ConnectionClass *conn,
-                                            const ConnInfo *ci,
-                                            const SQLSMALLINT conn_str_out_len,
-                                            SQLCHAR *conn_str_out,
-                                            const int retval) {
-    // Create the output connection string
-    SQLSMALLINT len_str_out = conn_str_out_len;
-    if (conn->ms_jet && len_str_out > 255)
-        len_str_out = 255;
-    char conn_str[MAX_CONNECT_STRING];
-    makeConnectString(conn_str, ci, len_str_out);
-
-    // Set result and check connection string
-    RETCODE result = ((retval == 1) ? SQL_SUCCESS : SQL_SUCCESS_WITH_INFO);
-    len = strlen(conn_str);
-    if (conn_str_out) {
-        //  Return the completed string to the caller. The correct method is to
-        //  only construct the connect string if a dialog was put up, otherwise,
-        //  it should just copy the connection input string to the output.
-        //  However, it seems ok to just always construct an output string.
-        //  There are possible bad side effects on working applications (Access)
-        //  by implementing the correct behavior
-        strncpy((char *)conn_str_out, conn_str, conn_str_out_len);
-        if (len >= conn_str_out_len) {
-            for (int clen = conn_str_out_len - 1;
-                 clen >= 0 && conn_str_out[clen] != ';'; clen--)
-                conn_str_out[clen] = '\0';
-            result = SQL_SUCCESS_WITH_INFO;
-            CC_set_error(conn, CONN_TRUNCATED,
-                         "Buffer is too small for output conn str.",
-                         "CreateOutputConnectionString");
-        }
-    }
-    return result;
-}
-
-static std::string CheckRetVal(const int retval, const HWND hwnd,
-                               const SQLUSMALLINT driver_completion,
-                               const int reqs, const ConnInfo *ci) {
-    (void)(ci);
-    (void)(reqs);
-    (void)(hwnd);
-    if (retval > 0)
-        return "";
-    // Error attempting to connect
-    else if (retval == 0)
-        return "Error from CC_Connect";
-    // More info is required
-    else if (retval < 0) {
-        // Not allowed to prompt, but PW is required - Error
-        if (driver_completion == SQL_DRIVER_NOPROMPT) {
-            return "Need password but Driver_NoPrompt is set";
-        } else {
-#ifdef WIN32
-            if (!(hwnd && paramRequired(ci, reqs)))
-                return "Unable to prompt for required parameter";
-#else
-            return "Driver prompt only supported on Windows";
-#endif
-        }
-    }
-    return "";
-}
-
-static SQLRETURN SetupConnString(const SQLCHAR *conn_str_in,
-                                 const SQLSMALLINT conn_str_in_len,
-                                 ConnInfo *ci, ConnectionClass *conn) {
-    CSTR func = "SetupConnString";
-
-    // make_string uses malloc, need to overwrite delete operator to use free
-    // for unique_ptr
-    struct free_delete {
-        void operator()(void *x) {
-            if (x != NULL) {
-                free(x);
-                x = NULL;
-            }
-        }
-    };
-
-    // Make connection string and get DSN
-    std::unique_ptr< char, free_delete > conn_str(
-        make_string(conn_str_in, conn_str_in_len, NULL, 0));
-    
-    if (!dconn_get_DSN_or_Driver(conn_str.get(), ci)) {
-        CC_set_error(conn, CONN_OPENDB_ERROR, "Connection string parse error",
-                     func);
-        return SQL_ERROR;
-    }
-
-    //This will be used to restore the log output dir fetched from connection string
-    //Since getDSNinfo overrides all available connection attributes
-    std::string conn_string_log_dir(ci->drivers.output_dir);
-
-    // If the ConnInfo in the hdbc is missing anything, this function will fill
-    // them in from the registry (assuming of course there is a DSN given -- if
-    // not, it does nothing!)
-    getDSNinfo(ci, NULL);
-
-    // Parse the connect string and fill in conninfo
-    if (!dconn_get_connect_attributes(conn_str.get(), ci)) {
-        CC_set_error(conn, CONN_OPENDB_ERROR, "Connection string parse error",
-                     func);
-        return SQL_ERROR;
-    }
-    logs_on_off(1, ci->drivers.loglevel, ci->drivers.loglevel);
-
-    //Sets log output dir to path retrived from connection string
-    //If connection string doesn't have log path then takes value from DSN
-    //If connection string & DSN both doesn't include log path then takes default value
-    if (!conn_string_log_dir.empty()) {
-        setLogDir(conn_string_log_dir.c_str());
-        conn_string_log_dir.clear();
-    } else {
-        setLogDir(ci->drivers.output_dir);
-    }
-    InitializeLogging();
-    return SQL_SUCCESS;
-}
-
-RETCODE OPENSEARCHAPI_DriverConnect(HDBC hdbc, HWND hwnd, SQLCHAR *conn_str_in,
-                            SQLSMALLINT conn_str_in_len, SQLCHAR *conn_str_out,
-                            SQLSMALLINT conn_str_out_len,
-                            SQLSMALLINT *pcb_conn_str_out,
-                            SQLUSMALLINT driver_completion) {
-    CSTR func = "OPENSEARCHAPI_DriverConnect";
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-
-    if (!conn) {
-        CC_log_error(func, "ConnectionClass handle is NULL", NULL);
-        return SQL_INVALID_HANDLE;
-    }
-    ConnInfo *ci = &(conn->connInfo);
-
-    // Setup connection string
-    {
-        const SQLRETURN return_code =
-            SetupConnString(conn_str_in, conn_str_in_len, ci, conn);
-        if (return_code != SQL_SUCCESS)
-            return return_code;
-    }
-
-    // Initialize opensearch_version
-    CC_initialize_opensearch_version(conn);
-
-    int reqs = 0;
-    int retval = 0;
-    do {
-        const SQLRETURN return_code = GetRequirementsAndConnect(
-            driver_completion, hwnd, ci, reqs, conn, retval);
-        if (return_code != SQL_SUCCESS)
-            return return_code;
-
-        // Check for errors
-        const std::string error_msg =
-            CheckRetVal(retval, hwnd, driver_completion, reqs, ci);
-
-        // If we have an error, log it and exit
-        if (error_msg != "") {
-            CC_log_error(func, error_msg.c_str(), conn);
-            return SQL_ERROR;
-        }
-    } while (retval <= 0);
-
-    ssize_t len = 0;
-    const RETCODE result = CreateOutputConnectionString(
-        len, conn, ci, conn_str_out_len, conn_str_out, retval);
-    if (pcb_conn_str_out)
-        *pcb_conn_str_out = static_cast< SQLSMALLINT >(len);
-    return result;
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_driver_connect.h b/sql-odbc/src/sqlodbc/opensearch_driver_connect.h
deleted file mode 100644
index f5683e057b..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_driver_connect.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __OPENSEARCH_DRIVER_CONNECT_H__
-#define __OPENSEARCH_DRIVER_CONNECT_H__
-#include "opensearch_connection.h"
-
-// C Interface
-#ifdef __cplusplus
-extern "C" {
-#endif
-RETCODE OPENSEARCHAPI_DriverConnect(HDBC hdbc, HWND hwnd, SQLCHAR *conn_str_in,
-                            SQLSMALLINT conn_str_in_len, SQLCHAR *conn_str_out,
-                            SQLSMALLINT conn_str_out_len,
-                            SQLSMALLINT *pcb_conn_str_out,
-                            SQLUSMALLINT driver_completion);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __OPENSEARCH_DRIVER_CONNECT_H__ */
diff --git a/sql-odbc/src/sqlodbc/opensearch_helper.cpp b/sql-odbc/src/sqlodbc/opensearch_helper.cpp
deleted file mode 100644
index 9b50aff6cc..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_helper.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-#include "opensearch_helper.h"
-
-#include <atomic>
-#include <mutex>
-#include <thread>
-
-#include "opensearch_communication.h"
-
-void* OpenSearchConnectDBParams(runtime_options& rt_opts, int expand_dbname,
-                        unsigned int option_count) {
-    // Initialize Connection
-    OpenSearchCommunication* conn = static_cast< OpenSearchCommunication* >(InitializeOpenSearchConn());
-    if (!conn)
-        return NULL;
-
-    // Set user defined connection options
-    if (!conn->ConnectionOptions(rt_opts, true, expand_dbname, option_count))
-        return conn;
-
-    // Set user derived connection options
-    if (!conn->ConnectionOptions2())
-        return conn;
-
-    // Connect to DB
-    if (!conn->ConnectDBStart())
-        return conn;
-
-    // Technically this is always the result, so we could remove the above or
-    // make 1 large if statement, but I think this is more legible
-    return conn;
-}
-
-ConnStatusType OpenSearchStatus(void* opensearch_conn) {
-    return opensearch_conn
-               ? static_cast< OpenSearchCommunication* >(opensearch_conn)->GetConnectionStatus()
-               : ConnStatusType::CONNECTION_BAD;
-}
-
-std::string GetErrorMsg(void* opensearch_conn) {
-    return opensearch_conn
-               ? static_cast< OpenSearchCommunication* >(opensearch_conn)->GetErrorMessage()
-                   : NULL;
-}
-
-ConnErrorType GetErrorType(void* opensearch_conn) {
-    return opensearch_conn
-               ? static_cast< OpenSearchCommunication* >(opensearch_conn)->GetErrorType()
-                   : ConnErrorType::CONN_ERROR_SUCCESS;
-}
-
-std::string GetServerVersion(void* opensearch_conn) {
-    return opensearch_conn
-               ? static_cast< OpenSearchCommunication* >(opensearch_conn)->GetServerVersion()
-               : "";
-}
-
-std::string GetClusterName(void* opensearch_conn) {
-    return opensearch_conn
-               ? static_cast< OpenSearchCommunication* >(opensearch_conn)->GetClusterName()
-                   : "";
-}
-
-void* InitializeOpenSearchConn() {
-    return new OpenSearchCommunication();
-}
-
-int OpenSearchExecDirect(void* opensearch_conn, const char* statement, const char* fetch_size) {
-    return (opensearch_conn && statement)
-               ? static_cast< OpenSearchCommunication* >(opensearch_conn)->ExecDirect(
-                   statement, fetch_size)
-               : -1;
-}
-
-void OpenSearchSendCursorQueries(void* opensearch_conn, const char* cursor) {
-    static_cast< OpenSearchCommunication* >(opensearch_conn)->SendCursorQueries(cursor);
-}
-
-OpenSearchResult* OpenSearchGetResult(void* opensearch_conn) {
-    return opensearch_conn
-               ? static_cast< OpenSearchCommunication* >(opensearch_conn)->PopResult()
-                   : NULL;
-}
-
-std::string OpenSearchGetClientEncoding(void* opensearch_conn) {
-    return opensearch_conn
-               ? static_cast< OpenSearchCommunication* >(opensearch_conn)->GetClientEncoding()
-               : "";
-}
-
-bool OpenSearchSetClientEncoding(void* opensearch_conn, std::string& encoding) {
-    return opensearch_conn
-               ? static_cast< OpenSearchCommunication* >(opensearch_conn)->SetClientEncoding(
-                   encoding)
-               : false;
-}
-
-void OpenSearchDisconnect(void* opensearch_conn) {
-    delete static_cast< OpenSearchCommunication* >(opensearch_conn);
-}
-
-void OpenSearchClearResult(OpenSearchResult* opensearch_result) {
-    delete opensearch_result;
-}
-
-void OpenSearchStopRetrieval(void* opensearch_conn) {
-    static_cast< OpenSearchCommunication* >(opensearch_conn)->StopResultRetrieval();
-}
-
-std::vector< std::string > OpenSearchGetColumnsWithSelectQuery(
-    void* opensearch_conn, const std::string table_name) {
-    return static_cast< OpenSearchCommunication* >(opensearch_conn)->GetColumnsWithSelectQuery(
-        table_name);
-}
-
-// This class provides a cross platform way of entering critical sections
-class CriticalSectionHelper {
-   public:
-    // Don't need to initialize lock owner because default constructor sets it
-    // to thread id 0, which is invalid
-    CriticalSectionHelper() : m_lock_count(0) {
-    }
-    ~CriticalSectionHelper() {
-    }
-
-    void EnterCritical() {
-        // Get current thread id, if it's the lock owner, increment lock count,
-        // otherwise lock and take ownership
-        std::thread::id current_thread = std::this_thread::get_id();
-        if (m_lock_owner == current_thread) {
-            m_lock_count++;
-        } else {
-            m_lock.lock();
-            m_lock_owner = current_thread;
-            m_lock_count = 1;
-        }
-    }
-
-    void ExitCritical() {
-        // Get current thread id, if it's the owner, decerement and unlock if
-        // the lock count is 0. Otherwise, log critical warning because we
-        // should only allow the lock owner to unlock
-        std::thread::id current_thread = std::this_thread::get_id();
-        if (m_lock_owner == current_thread) {
-            if (m_lock_count == 0) {
-// This should never happen. Log critical warning
-#ifdef WIN32
-#pragma warning(push)
-#pragma warning(disable : 4551)  // MYLOG complains 'function call missing
-                                 // argument list' on Windows, which is isn't
-#endif
-                MYLOG(OPENSEARCH_ERROR, "%s\n",
-                      "CRITICAL WARNING: ExitCritical section called when lock "
-                      "count was already 0!");
-#ifdef WIN32
-#pragma warning(pop)
-#endif
-            } else if (--m_lock_count == 0) {
-                // Reset lock owner to invalid thread id (0)
-                m_lock_owner = std::thread::id();
-                m_lock.unlock();
-            }
-        } else {
-// This should never happen. Log critical warning
-#ifdef WIN32
-#pragma warning(push)
-#pragma warning(disable : 4551)  // MYLOG complains 'function call missing
-                                 // argument list' on Windows, which is isn't
-#endif
-            MYLOG(OPENSEARCH_ERROR, "%s\n",
-                  "CRITICAL WARNING: ExitCritical section called by thread "
-                  "that does not own the lock!");
-#ifdef WIN32
-#pragma warning(pop)
-#endif
-        }
-    }
-
-   private:
-    size_t m_lock_count;
-    std::atomic< std::thread::id > m_lock_owner;
-    std::mutex m_lock;
-};
-
-// Initialize pointer to point to our helper class
-void XPlatformInitializeCriticalSection(void** critical_section_helper) {
-    if (critical_section_helper != NULL) {
-        try {
-            *critical_section_helper = new CriticalSectionHelper();
-        } catch (...) {
-            *critical_section_helper = NULL;
-        }
-    }
-}
-
-// Call enter critical section
-void XPlatformEnterCriticalSection(void* critical_section_helper) {
-    if (critical_section_helper != NULL) {
-        static_cast< CriticalSectionHelper* >(critical_section_helper)
-            ->EnterCritical();
-    }
-}
-
-// Call exit critical section
-void XPlatformLeaveCriticalSection(void* critical_section_helper) {
-    if (critical_section_helper != NULL) {
-        static_cast< CriticalSectionHelper* >(critical_section_helper)
-            ->ExitCritical();
-    }
-}
-
-// Delete our helper class
-void XPlatformDeleteCriticalSection(void** critical_section_helper) {
-    if (critical_section_helper != NULL) {
-        delete static_cast< CriticalSectionHelper* >(*critical_section_helper);
-        *critical_section_helper = NULL;
-    }
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_helper.h b/sql-odbc/src/sqlodbc/opensearch_helper.h
deleted file mode 100644
index 0433c0a7b8..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_helper.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef __OPENSEARCH_HELPER_H__
-#define __OPENSEARCH_HELPER_H__
-
-#include "opensearch_types.h"
-
-#ifdef __cplusplus
-// C++ interface
-std::string OpenSearchGetClientEncoding(void* opensearch_conn);
-bool OpenSearchSetClientEncoding(void* opensearch_conn, std::string& encoding);
-OpenSearchResult* OpenSearchGetResult(void* opensearch_conn);
-void OpenSearchClearResult(OpenSearchResult* opensearch_result);
-void* OpenSearchConnectDBParams(runtime_options& rt_opts, int expand_dbname,
-                        unsigned int option_count);
-std::string GetServerVersion(void* opensearch_conn);
-std::string GetClusterName(void* opensearch_conn);
-std::string GetErrorMsg(void* opensearch_conn);
-ConnErrorType GetErrorType(void* opensearch_conn);
-std::vector< std::string > OpenSearchGetColumnsWithSelectQuery(
-    void* opensearch_conn, const std::string table_name);
-
-// C Interface
-extern "C" {
-#endif
-void XPlatformInitializeCriticalSection(void** critical_section_helper);
-void XPlatformEnterCriticalSection(void* critical_section_helper);
-void XPlatformLeaveCriticalSection(void* critical_section_helper);
-void XPlatformDeleteCriticalSection(void** critical_section_helper);
-ConnStatusType OpenSearchStatus(void* opensearch_conn);
-int OpenSearchExecDirect(void* opensearch_conn, const char* statement, const char* fetch_size);
-void OpenSearchSendCursorQueries(void* opensearch_conn, const char* cursor);
-void OpenSearchDisconnect(void* opensearch_conn);
-void OpenSearchStopRetrieval(void* opensearch_conn);
-#ifdef __cplusplus
-}
-#endif
-
-void* InitializeOpenSearchConn();
-
-#endif  // __OPENSEARCH_HELPER_H__
diff --git a/sql-odbc/src/sqlodbc/opensearch_info.cpp b/sql-odbc/src/sqlodbc/opensearch_info.cpp
deleted file mode 100644
index ab3700eb1b..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_info.cpp
+++ /dev/null
@@ -1,1046 +0,0 @@
-#include "opensearch_info.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include <algorithm>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-// TODO #324 (SQL Plugin)- Update if OpenSearch extends support for multiple
-// tables
-#define DEFAULT_TYPE_STR \
-    { 'k', 'e', 'y', 'w', 'o', 'r', 'd', '\0' }
-#define DEFAULT_TYPE_INT (SQL_WVARCHAR)
-#define EMPTY_VARCHAR \
-    { '\0' }
-#define OPENSEARCH_UNINITIALIZED (-2)
-#define COLUMN_TEMPLATE_COUNT 18
-#define TABLE_TEMPLATE_COUNT 5
-
-#define TABLE_CAT "TABLE_CAT"
-#define TABLE_SCHEM "TABLE_SCHEM"
-#define TABLE_NAME "TABLE_NAME"
-#define COLUMN_NAME "COLUMN_NAME"
-#define DATA_TYPE "DATA_TYPE"
-#define TYPE_NAME "TYPE_NAME"
-#define COLUMN_SIZE "COLUMN_SIZE"
-#define BUFFER_LENGTH "BUFFER_LENGTH"
-#define DECIMAL_DIGITS "DECIMAL_DIGITS"
-#define NUM_PREC_RADIX "NUM_PREC_RADIX"
-#define NULLABLE "NULLABLE"
-#define REMARKS "REMARKS"
-#define COLUMN_DEF "COLUMN_DEF"
-#define SQL_DATA_TYPE "SQL_DATA_TYPE"
-#define SQL_DATETIME_SUB "SQL_DATETIME_SUB"
-#define CHAR_OCTET_LENGTH "CHAR_OCTET_LENGTH"
-#define ORDINAL_POSITION "ORDINAL_POSITION"
-#define IS_NULLABLE "IS_NULLABLE"
-#define TABLE_QUALIFIER "TABLE_QUALIFIER"
-#define TABLE_OWNER "TABLE_OWNER"
-#define TABLE_TYPE "TABLE_TYPE"
-#define PRECISION "PRECISION"
-#define LITERAL_PREFIX "LITERAL_PREFIX"
-#define LITERAL_SUFFIX "LITERAL_SUFFIX"
-#define CREATE_PARAMS "CREATE_PARAMS"
-#define CASE_SENSITIVE "CASE_SENSITIVE"
-#define SEARCHABLE "SEARCHABLE"
-#define UNSIGNED_ATTRIBUTE "UNSIGNED_ATTRIBUTE"
-#define FIXED_PREC_SCALE "FIXED_PREC_SCALE"
-#define AUTO_INCREMENT "AUTO_INCREMENT"
-#define LOCAL_TYPE_NAME "LOCAL_TYPE_NAME"
-#define MINIMUM_SCALE "MINIMUM_SCALE"
-#define MAXIMUM_SCALE "MAXIMUM_SCALE"
-#define INTERVAL_PRECISION "INTERVAL_PRECISION"
-
-const std::unordered_map< int, std::vector< int > > sql_opensearch_type_map = {
-    {SQL_BIT, {OPENSEARCH_TYPE_BOOL}},
-    {SQL_TINYINT, {OPENSEARCH_TYPE_INT1}},
-    {SQL_SMALLINT, {OPENSEARCH_TYPE_INT2}},
-    {SQL_INTEGER, {OPENSEARCH_TYPE_INT4}},
-    {SQL_BIGINT, {OPENSEARCH_TYPE_INT8}},
-    {SQL_REAL, {OPENSEARCH_TYPE_HALF_FLOAT, OPENSEARCH_TYPE_FLOAT4}},
-    {SQL_DOUBLE, {OPENSEARCH_TYPE_FLOAT8, OPENSEARCH_TYPE_SCALED_FLOAT}},
-    {SQL_WVARCHAR,
-     {OPENSEARCH_TYPE_KEYWORD, OPENSEARCH_TYPE_TEXT, OPENSEARCH_TYPE_NESTED,
-      OPENSEARCH_TYPE_OBJECT}},
-    {SQL_TYPE_TIMESTAMP, {OPENSEARCH_TYPE_DATETIME, OPENSEARCH_TYPE_TIMESTAMP}}};
-
-const std::unordered_map< std::string, int > data_name_data_type_map = {
-    {OPENSEARCH_TYPE_NAME_BOOLEAN, SQL_BIT},
-    {OPENSEARCH_TYPE_NAME_BYTE, SQL_TINYINT},
-    {OPENSEARCH_TYPE_NAME_SHORT, SQL_SMALLINT},
-    {OPENSEARCH_TYPE_NAME_INTEGER, SQL_INTEGER},
-    {OPENSEARCH_TYPE_NAME_LONG, SQL_BIGINT},
-    {OPENSEARCH_TYPE_NAME_HALF_FLOAT, SQL_REAL},
-    {OPENSEARCH_TYPE_NAME_FLOAT, SQL_REAL},
-    {OPENSEARCH_TYPE_NAME_DOUBLE, SQL_DOUBLE},
-    {OPENSEARCH_TYPE_NAME_SCALED_FLOAT, SQL_DOUBLE},
-    {OPENSEARCH_TYPE_NAME_KEYWORD, SQL_WVARCHAR},
-    {OPENSEARCH_TYPE_NAME_TEXT, SQL_WVARCHAR},
-    {OPENSEARCH_TYPE_NAME_DATE, SQL_TYPE_TIMESTAMP},
-    {OPENSEARCH_TYPE_NAME_TIMESTAMP, SQL_TYPE_TIMESTAMP},
-    {OPENSEARCH_TYPE_NAME_OBJECT, SQL_WVARCHAR},
-    {OPENSEARCH_TYPE_NAME_NESTED, SQL_WVARCHAR}};
-
-// Boilerplate code for easy column bind handling
-class BindTemplate {
-   public:
-    BindTemplate(const bool can_be_null, const SQLUSMALLINT ordinal)
-        : m_len(OPENSEARCH_UNINITIALIZED), m_ordinal(ordinal) {
-        if (!can_be_null)
-            throw std::runtime_error(
-                "Do not use this constructor for values that can be NULL. A "
-                "constructor with "
-                "supplied default value must be used if value can be NULL.");
-    }
-    BindTemplate(const bool can_be_null, const SQLUSMALLINT ordinal, const Int2)
-        : m_len(OPENSEARCH_UNINITIALIZED), m_ordinal(ordinal) {
-        (void)(can_be_null);
-    }
-    BindTemplate(const bool can_be_null, const SQLUSMALLINT ordinal, const Int4)
-        : m_len(OPENSEARCH_UNINITIALIZED), m_ordinal(ordinal) {
-        (void)(can_be_null);
-    }
-    BindTemplate(const bool can_be_null, const SQLUSMALLINT ordinal,
-                 const std::vector< SQLCHAR > &)
-        : m_len(OPENSEARCH_UNINITIALIZED), m_ordinal(ordinal) {
-        (void)(can_be_null);
-    }
-    virtual ~BindTemplate() {
-    }
-
-    SQLPOINTER GetData() {
-        if (m_len == OPENSEARCH_UNINITIALIZED)
-            throw std::runtime_error(
-                "Length is uninitialized - Fetch must be executed before data "
-                "is retreived.");
-        return (m_len == SQL_NULL_DATA) ? NULL : GetDataForBind();
-    }
-
-    void BindColumn(StatementClass *stmt) {
-        RETCODE err = OPENSEARCHAPI_BindCol(stmt, m_ordinal, GetType(),
-                                    GetDataForBind(), GetSize(), &m_len);
-        if (!SQL_SUCCEEDED(err)) {
-            std::string error_msg =
-                "Failed to bind column with ordinal "
-                + std::to_string(m_ordinal)
-                + ". SQL Error code: " + std::to_string(err);
-            throw std::runtime_error(error_msg.c_str());
-        }
-    }
-    void AssignData(TupleField *tuple) {
-        SQLPOINTER data = GetData();
-        if ((data == NULL) || (m_len == SQL_NULL_DATA)) {
-            set_tuplefield_null(tuple);
-            return;
-        }
-        switch (GetType()) {
-            case SQL_C_LONG:
-                set_tuplefield_int4(tuple, *static_cast< Int4 * >(data));
-                break;
-            case SQL_C_SHORT:
-                set_tuplefield_int2(tuple, *static_cast< Int2 * >(data));
-                break;
-            case SQL_C_CHAR:
-                set_tuplefield_string(tuple, static_cast< const char * >(data));
-                break;
-            default:
-                throw std::runtime_error(
-                    std::string(
-                        "Cannot convert unknown data type to tuplefield: "
-                        + std::to_string(GetType()))
-                        .c_str());
-        }
-    }
-    BindTemplate(const BindTemplate &) = default;
-    BindTemplate &operator=(const BindTemplate &) = default;
-    virtual std::string AsString() = 0;
-    virtual void UpdateData(SQLPOINTER new_data, size_t size) = 0;
-
-   private:
-    SQLLEN m_len;
-    SQLUSMALLINT m_ordinal;
-
-   protected:
-    virtual SQLSMALLINT GetType() = 0;
-    virtual SQLLEN GetSize() = 0;
-    virtual SQLPOINTER GetDataForBind() = 0;
-};
-
-// 4 byte integer column
-class BindTemplateInt4 : public BindTemplate {
-   public:
-    BindTemplateInt4(const bool nullable, const SQLUSMALLINT ordinal)
-        : BindTemplate(nullable, ordinal), m_data(0) {
-    }
-    BindTemplateInt4(const bool nullable, const SQLUSMALLINT ordinal,
-                     const Int4 data)
-        : BindTemplate(nullable, ordinal, data), m_data(data) {
-    }
-    ~BindTemplateInt4() {
-    }
-    std::string AsString() {
-        return std::to_string(*static_cast< Int4 * >(GetData()));
-    }
-    void UpdateData(SQLPOINTER new_data, size_t size) {
-        (void)size;
-        m_data = *(Int4 *)new_data;
-    }
-
-   private:
-    Int4 m_data;
-
-   protected:
-    SQLPOINTER GetDataForBind() {
-        return &m_data;
-    }
-    SQLSMALLINT GetType() {
-        return SQL_C_LONG;
-    }
-    SQLLEN GetSize() {
-        return static_cast< SQLLEN >(sizeof(Int4));
-    }
-};
-
-// 2 byte integer column
-class BindTemplateInt2 : public BindTemplate {
-   public:
-    BindTemplateInt2(const bool nullable, const SQLUSMALLINT ordinal)
-        : BindTemplate(nullable, ordinal), m_data(0) {
-    }
-    BindTemplateInt2(const bool nullable, const SQLUSMALLINT ordinal,
-                     const Int2 data)
-        : BindTemplate(nullable, ordinal, data), m_data(data) {
-    }
-    ~BindTemplateInt2() {
-    }
-    std::string AsString() {
-        return std::to_string(*static_cast< Int2 * >(GetData()));
-    }
-    void UpdateData(SQLPOINTER new_data, size_t size) {
-        (void)size;
-        m_data = *(Int2 *)new_data;
-    }
-
-   private:
-    Int2 m_data;
-
-   protected:
-    SQLPOINTER GetDataForBind() {
-        return &m_data;
-    }
-    SQLSMALLINT GetType() {
-        return SQL_C_SHORT;
-    }
-    SQLLEN GetSize() {
-        return static_cast< SQLLEN >(sizeof(Int2));
-    }
-};
-
-// Varchar data
-class BindTemplateSQLCHAR : public BindTemplate {
-   public:
-    BindTemplateSQLCHAR(const bool nullable, const SQLUSMALLINT ordinal)
-        : BindTemplate(nullable, ordinal), m_data(MAX_INFO_STRING, '\0') {
-    }
-    BindTemplateSQLCHAR(const bool nullable, const SQLUSMALLINT ordinal,
-                        const std::vector< SQLCHAR > &data)
-        : BindTemplate(nullable, ordinal, data), m_data(MAX_INFO_STRING, '\0') {
-        if (data.size() >= m_data.size()) {
-            throw std::runtime_error(
-                "Default data size exceeds max info string size.");
-        } else {
-            m_data.insert(m_data.begin(), data.begin(), data.end());
-        }
-    }
-    ~BindTemplateSQLCHAR() {
-    }
-    std::string AsString() {
-        char *bind_tbl_data_char = static_cast< char * >(GetData());
-        return (bind_tbl_data_char == NULL) ? "" : bind_tbl_data_char;
-    }
-    void UpdateData(SQLPOINTER new_data, size_t size) {
-        m_data.clear();
-        SQLCHAR *data = reinterpret_cast< SQLCHAR * >(new_data);
-        for (size_t i = 0; i < size; i++) {
-            m_data.push_back(*data++);
-        }
-        m_data.push_back(0);
-    }
-
-   private:
-    std::vector< SQLCHAR > m_data;
-
-   protected:
-    SQLPOINTER GetDataForBind() {
-        return m_data.data();
-    }
-    SQLSMALLINT GetType() {
-        return SQL_C_CHAR;
-    }
-    SQLLEN GetSize() {
-        return static_cast< SQLLEN >(m_data.size());
-    }
-};
-
-// Typedefs and macros to ease creation of BindTemplates
-typedef std::unique_ptr< BindTemplate > bind_ptr;
-typedef std::vector< bind_ptr > bind_vector;
-#define _SQLCHAR_(...) \
-    (std::make_unique< BindTemplateSQLCHAR >(BindTemplateSQLCHAR(__VA_ARGS__)))
-#define _SQLINT2_(...) \
-    (std::make_unique< BindTemplateInt2 >(BindTemplateInt2(__VA_ARGS__)))
-#define _SQLINT4_(...) \
-    (std::make_unique< BindTemplateInt4 >(BindTemplateInt4(__VA_ARGS__)))
-
-// Common function definitions
-enum class TableResultSet { Catalog, Schema, TableTypes, TableLookUp, All };
-void ConvertToString(std::string &out, bool &valid, const SQLCHAR *sql_char,
-                     const SQLSMALLINT sz);
-QResultClass *SetupQResult(const bind_vector &cols, StatementClass *stmt,
-                           StatementClass *col_stmt, const int col_cnt);
-void CleanUp(StatementClass *stmt, StatementClass *sub_stmt, const RETCODE ret);
-void ExecuteQuery(ConnectionClass *conn, HSTMT *stmt, const std::string &query);
-void GetCatalogData(const std::string &query, StatementClass *stmt,
-                    StatementClass *sub_stmt, const TableResultSet res_type,
-                    std::string &table_type,
-                    void (*populate_binds)(bind_vector &),
-                    void (*setup_qres_info)(QResultClass *, EnvironmentClass *),
-                    std::vector< std::string > *list_of_columns = NULL);
-
-// Common function declarations
-void ConvertToString(std::string &out, bool &valid, const SQLCHAR *sql_char,
-                     const SQLSMALLINT sz) {
-    valid = (sql_char != NULL);
-    if (!valid) {
-        out = "%";
-    } else if (sz == SQL_NTS) {
-        out.assign(reinterpret_cast< const char * >(sql_char));
-    } else if (sz <= 0) {
-        out = "";
-    } else {
-        out.assign(reinterpret_cast< const char * >(sql_char),
-                   static_cast< size_t >(sz));
-    }
-}
-
-QResultClass *SetupQResult(const bind_vector &cols, StatementClass *stmt,
-                           StatementClass *col_stmt, const int col_cnt) {
-    (void)(cols);
-    (void)(col_stmt);
-
-    // Initialize memory for data retreival
-    QResultClass *res = NULL;
-    if ((res = QR_Constructor()) == NULL) {
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                     "Couldn't allocate memory for Tables or Columns result.",
-                     "FetchResults");
-        throw std::runtime_error(
-            "Couldn't allocate memory for Tables or Columns result.");
-    }
-    SC_set_Result(stmt, res);
-
-    // The binding structure for a statement is not set up until a statement is
-    // actually executed, so we'll have to do this ourselves
-    extend_column_bindings(SC_get_ARDF(stmt),
-                           static_cast< SQLSMALLINT >(col_cnt));
-    QR_set_num_fields(res, col_cnt);
-
-    return res;
-}
-
-void CleanUp(StatementClass *stmt, StatementClass *sub_stmt,
-             const RETCODE ret = SQL_ERROR) {
-    stmt->status = STMT_FINISHED;
-    stmt->catalog_result = TRUE;
-
-    if (!SQL_SUCCEEDED(ret) && 0 >= SC_get_errornumber(stmt))
-        SC_error_copy(stmt, sub_stmt, TRUE);
-
-    // set up the current tuple pointer for
-    stmt->currTuple = -1;
-    SC_set_rowset_start(stmt, -1, FALSE);
-    SC_set_current_col(stmt, -1);
-
-    if (sub_stmt)
-        OPENSEARCHAPI_FreeStmt(sub_stmt, SQL_DROP);
-}
-
-void ExecuteQuery(ConnectionClass *conn, HSTMT *stmt,
-                  const std::string &query) {
-    // Prepare statement
-    if (!SQL_SUCCEEDED(OPENSEARCHAPI_AllocStmt(conn, stmt, 0))) {
-        throw std::runtime_error("Failed to allocate memory for statement.");
-    }
-
-    // Execute query
-    if (!SQL_SUCCEEDED(OPENSEARCHAPI_ExecDirect(
-            *stmt, reinterpret_cast< const SQLCHAR * >(query.c_str()), SQL_NTS,
-            1))) {
-        std::string error_msg = "Failed to execute query '" + query + "'.";
-        throw std::runtime_error(error_msg.c_str());
-    }
-}
-
-// Table specific function definitions
-void split(const std::string &input, const std::string &delim,
-           std::vector< std::string > &output);
-void GenerateTableQuery(std::string &tables_query, const UWORD flag,
-                        const std::string &table_name_value,
-                        const TableResultSet result_type,
-                        const bool table_valid);
-void AssignTableBindTemplates(bind_vector &tabs);
-void SetupTableQResInfo(QResultClass *res, EnvironmentClass *env);
-void SetTableTuples(QResultClass *res, const TableResultSet res_type,
-                    const bind_vector &bind_tbl, std::string &table_type,
-                    StatementClass *stmt, StatementClass *tbl_stmt,
-                    std::vector< std::string > *list_of_columns = NULL);
-
-// Table specific function declarations
-void split(const std::string &input, const std::string &delim,
-           std::vector< std::string > &output) {
-    size_t start = 0;
-    size_t end = input.find(delim);
-    while (end != std::string::npos) {
-        output.push_back(input.substr(start, end - start));
-        start = end + delim.length();
-        end = input.find(delim, start);
-    }
-    output.push_back(input.substr(start, end));
-}
-
-// TODO #324 (SQL Plugin)- Fix patterns and escape characters for this
-void GenerateTableQuery(std::string &tables_query, const UWORD flag,
-                        const std::string &table_name_value,
-                        const TableResultSet result_type,
-                        const bool table_valid) {
-    bool search_pattern = (~flag & PODBC_NOT_SEARCH_PATTERN);
-    tables_query = "SHOW TABLES LIKE ";
-    if (table_valid && (table_name_value != "")
-        && (result_type == TableResultSet::All))
-        tables_query +=
-            search_pattern ? table_name_value : "^" + table_name_value + "$";
-    else
-        tables_query += "%";
-}
-
-// In case of unique_ptr's, using push_back (over emplace_back) is preferred in
-// C++14 and higher
-void AssignTableBindTemplates(bind_vector &tabs) {
-    tabs.reserve(TABLE_TEMPLATE_COUNT);
-    tabs.push_back(_SQLCHAR_(false, 1, EMPTY_VARCHAR));  // TABLE_CAT		1
-    tabs.push_back(_SQLCHAR_(false, 2, EMPTY_VARCHAR));  // TABLE_SCHEM		2
-    tabs.push_back(_SQLCHAR_(false, 3, EMPTY_VARCHAR));  // TABLE_NAME		3
-    tabs.push_back(_SQLCHAR_(false, 4, EMPTY_VARCHAR));  // TABLE_TYPE		4
-    tabs.push_back(_SQLCHAR_(true, 5));                  // REMARKS			5
-}
-
-void SetupTableQResInfo(QResultClass *res, EnvironmentClass *env) {
-    if (EN_is_odbc3(env)) {
-        QR_set_field_info_v(res, TABLES_CATALOG_NAME, TABLE_CAT,
-                            OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-        QR_set_field_info_v(res, TABLES_SCHEMA_NAME, TABLE_SCHEM,
-                            OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    } else {
-        QR_set_field_info_v(res, TABLES_CATALOG_NAME, TABLE_QUALIFIER,
-                            OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-        QR_set_field_info_v(res, TABLES_SCHEMA_NAME, TABLE_OWNER,
-                            OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    }
-    QR_set_field_info_v(res, TABLES_TABLE_NAME, TABLE_NAME,
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, TABLES_TABLE_TYPE, TABLE_TYPE,
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, TABLES_REMARKS, REMARKS, OPENSEARCH_TYPE_VARCHAR,
-                        INFO_VARCHAR_SIZE);
-}
-
-void SetTableTuples(QResultClass *res, const TableResultSet res_type,
-                    const bind_vector &bind_tbl, std::string &table_type,
-                    StatementClass *stmt, StatementClass *tbl_stmt,
-                    std::vector< std::string > *list_of_columns) {
-    auto CheckResult = [&](const auto &res) {
-        if (res != SQL_NO_DATA_FOUND) {
-            SC_full_error_copy(stmt, tbl_stmt, FALSE);
-            throw std::runtime_error(
-                std::string("Failed to fetch data after query. Error code :"
-                            + std::to_string(res))
-                    .c_str());
-        }
-    };
-    auto AssignData = [&](auto *res, const auto &binds) {
-        TupleField *tuple = QR_AddNew(res);
-        // Since we do not support catalogs, we will return an empty string for
-        // catalog names. This is required for Excel for Mac, which uses this
-        // information for its Data Preview window.
-        std::string catalog("");
-        bind_tbl[TABLES_CATALOG_NAME]->UpdateData((void *)catalog.c_str(), 0);
-
-        // TODO #630 - Revisit logic of adding tuples for SQLTables & SQLColumns
-        for (size_t i = 0; i < binds.size(); i++) {
-            // Add tuples for SQLColumns
-            if (binds.size() > COLUMNS_SQL_DATA_TYPE) {
-                // Add data type for data loading issue in Power BI Desktop
-                auto data_type = data_name_data_type_map
-                        .find(bind_tbl[COLUMNS_TYPE_NAME]->AsString())->second;
-                if (i == COLUMNS_DATA_TYPE) {
-                    set_tuplefield_int2(&tuple[COLUMNS_DATA_TYPE],
-                                        static_cast< short >(data_type));
-                } else if (i == COLUMNS_SQL_DATA_TYPE) {
-                    set_tuplefield_int2(&tuple[COLUMNS_SQL_DATA_TYPE],
-                                        static_cast< short >(data_type));
-                } else {
-                    binds[i]->AssignData(&tuple[i]);
-                }
-            }
-            // Add tuples for SQLTables
-            else {
-                binds[i]->AssignData(&tuple[i]);
-            }
-        }
-    };
-
-    // General case
-    if (res_type == TableResultSet::All) {
-        RETCODE result = SQL_NO_DATA_FOUND;
-        int ordinal_position = 0;
-        while (SQL_SUCCEEDED(result = OPENSEARCHAPI_Fetch(tbl_stmt))) {
-            if (bind_tbl[TABLES_TABLE_TYPE]->AsString() == "BASE TABLE") {
-                std::string table("TABLE");
-                bind_tbl[TABLES_TABLE_TYPE]->UpdateData((void *)table.c_str(),
-                                                        table.length());
-            }
-            if (list_of_columns != NULL && !list_of_columns->empty()) {
-                if (std::find(list_of_columns->begin(), list_of_columns->end(),
-                              bind_tbl[COLUMNS_COLUMN_NAME]->AsString())
-                    != list_of_columns->end()) {
-                    ordinal_position++;
-                    bind_tbl[COLUMNS_ORDINAL_POSITION]->UpdateData(
-                        &ordinal_position, 0);
-                    AssignData(res, bind_tbl);
-                }
-            } else {
-                AssignData(res, bind_tbl);
-            }
-        }
-        CheckResult(result);
-    } else if (res_type == TableResultSet::TableLookUp) {
-        // Get accepted table types
-        std::vector< std::string > table_types;
-        table_type.erase(
-            std::remove(table_type.begin(), table_type.end(), '\''),
-            table_type.end());
-        split(table_type, ",", table_types);
-
-        // Loop through all data
-        RETCODE result = SQL_NO_DATA_FOUND;
-        while (SQL_SUCCEEDED(result = OPENSEARCHAPI_Fetch(tbl_stmt))) {
-            // Replace BASE TABLE with TABLE for Excel & Power BI SQLTables call
-            if (bind_tbl[TABLES_TABLE_TYPE]->AsString() == "BASE TABLE") {
-                std::string table("TABLE");
-                bind_tbl[TABLES_TABLE_TYPE]->UpdateData((void *)table.c_str(),
-                                                        table.length());
-            }
-            if (std::find(table_types.begin(), table_types.end(),
-                          bind_tbl[TABLES_TABLE_TYPE]->AsString())
-                != table_types.end()) {
-                AssignData(res, bind_tbl);
-            }
-        }
-
-        CheckResult(result);
-
-    }
-    // Special cases - only need single grab for this one
-    else {
-        RETCODE result;
-        if (!SQL_SUCCEEDED(result = OPENSEARCHAPI_Fetch(tbl_stmt))) {
-            SC_full_error_copy(stmt, tbl_stmt, FALSE);
-            throw std::runtime_error(
-                std::string("Failed to fetch data after query. Error code :"
-                            + std::to_string(result))
-                    .c_str());
-        }
-
-        // Get index of result type of interest
-        size_t idx = NUM_OF_TABLES_FIELDS;
-        switch (res_type) {
-            case TableResultSet::TableTypes:
-                idx = TABLES_TABLE_TYPE;
-                break;
-            default:
-                // This should not be possible, handle it anyway
-                throw std::runtime_error(
-                    "Result type is not an expected type.");
-        }
-
-        // Get new tuple and assign index of interest (NULL others)
-        // TODO #324 (SQL Plugin)- Should these be unique?
-        TupleField *tuple = QR_AddNew(res);
-        for (size_t i = 0; i < bind_tbl.size(); i++) {
-            if (i == idx)
-                bind_tbl[i]->AssignData(&tuple[i]);
-            else
-                set_tuplefield_string(&tuple[i], NULL_STRING);
-        }
-    }
-}
-
-// Column specific function definitions
-void SetupColumnQResInfo(QResultClass *res, EnvironmentClass *unused);
-void GenerateColumnQuery(std::string &query, const std::string &table_name,
-                         const std::string &column_name, const bool table_valid,
-                         const bool column_valid, const UWORD flag);
-void AssignColumnBindTemplates(bind_vector &cols);
-
-// Column Specific function declarations
-void SetupColumnQResInfo(QResultClass *res, EnvironmentClass *unused) {
-    (void)(unused);
-
-    QR_set_field_info_v(res, COLUMNS_CATALOG_NAME, TABLE_CAT,
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLUMNS_SCHEMA_NAME, TABLE_SCHEM,
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLUMNS_TABLE_NAME, TABLE_NAME,
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLUMNS_COLUMN_NAME, COLUMN_NAME,
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLUMNS_DATA_TYPE, DATA_TYPE, OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, COLUMNS_TYPE_NAME, TYPE_NAME,
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, COLUMNS_PRECISION, COLUMN_SIZE,
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, COLUMNS_LENGTH, BUFFER_LENGTH,
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, COLUMNS_SCALE, DECIMAL_DIGITS,
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, COLUMNS_RADIX, NUM_PREC_RADIX,
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, COLUMNS_NULLABLE, NULLABLE, OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, COLUMNS_REMARKS, REMARKS, OPENSEARCH_TYPE_VARCHAR,
-                        INFO_VARCHAR_SIZE);
-    QR_set_field_info_v(res, COLUMNS_COLUMN_DEF, COLUMN_DEF,
-                        OPENSEARCH_TYPE_VARCHAR,
-                        INFO_VARCHAR_SIZE);
-    QR_set_field_info_v(res, COLUMNS_SQL_DATA_TYPE, SQL_DATA_TYPE,
-                        OPENSEARCH_TYPE_INT2,
-                        2);
-    QR_set_field_info_v(res, COLUMNS_SQL_DATETIME_SUB, SQL_DATETIME_SUB,
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, COLUMNS_CHAR_OCTET_LENGTH, CHAR_OCTET_LENGTH,
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, COLUMNS_ORDINAL_POSITION, ORDINAL_POSITION,
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, COLUMNS_IS_NULLABLE, IS_NULLABLE,
-                        OPENSEARCH_TYPE_VARCHAR,
-                        INFO_VARCHAR_SIZE);
-}
-
-// TODO #325 (SQL Plugin)- Fix patterns and escape characters for this
-void GenerateColumnQuery(std::string &query, const std::string &table_name,
-                         const std::string &column_name, const bool table_valid,
-                         const bool column_valid, const UWORD flag) {
-    bool search_pattern = (~flag & PODBC_NOT_SEARCH_PATTERN);
-    query = "DESCRIBE TABLES LIKE ";
-    query += table_valid
-                 ? (search_pattern ? table_name : "^" + table_name + "$")
-                 : "%";
-    if (column_valid)
-        query += " COLUMNS LIKE " + column_name;
-}
-
-// In case of unique_ptr's, using push_back (over emplace_back) is preferred in
-// C++14 and higher
-void AssignColumnBindTemplates(bind_vector &cols) {
-    cols.reserve(COLUMN_TEMPLATE_COUNT);
-    cols.push_back(_SQLCHAR_(true, 1));                  // TABLE_CAT			1
-    cols.push_back(_SQLCHAR_(true, 2));                  // TABLE_SCHEM			2
-    cols.push_back(_SQLCHAR_(false, 3, EMPTY_VARCHAR));  // TABLE_NAME 3
-    cols.push_back(_SQLCHAR_(false, 4, EMPTY_VARCHAR));  // COLUMN_NAME 4
-    cols.push_back(
-        _SQLINT2_(false, 5, DEFAULT_TYPE_INT));  // DATA_TYPE			5
-    cols.push_back(
-        _SQLCHAR_(false, 6, DEFAULT_TYPE_STR));  // TYPE_NAME			6
-    cols.push_back(_SQLINT4_(true, 7));          // COLUMN_SIZE			7
-    cols.push_back(_SQLINT4_(true, 8));          // BUFFER_LENGTH		8
-    cols.push_back(_SQLINT2_(true, 9));          // DECIMAL_DIGITS		9
-    cols.push_back(_SQLINT2_(true, 10));         // NUM_PREC_RADIX		10
-    cols.push_back(
-        _SQLINT2_(false, 11, SQL_NULLABLE_UNKNOWN));  // NULLABLE			11
-    cols.push_back(_SQLCHAR_(true, 12));              // REMARKS				12
-    cols.push_back(_SQLCHAR_(true, 13));              // COLUMN_DEF			13
-    cols.push_back(
-        _SQLINT2_(false, 14, DEFAULT_TYPE_INT));  // SQL_DATA_TYPE		14
-    cols.push_back(_SQLINT2_(true, 15));          // SQL_DATETIME_SUB	15
-    cols.push_back(_SQLINT4_(true, 16));          // CHAR_OCTET_LENGTH	16
-    cols.push_back(_SQLINT4_(false, 17, -1));     // ORDINAL_POSITION	17
-    cols.push_back(_SQLCHAR_(true, 18));          // IS_NULLABLE			18
-}
-
-void GetCatalogData(const std::string &query, StatementClass *stmt,
-                    StatementClass *sub_stmt, const TableResultSet res_type,
-                    std::string &table_type,
-                    void (*populate_binds)(bind_vector &),
-                    void (*setup_qres_info)(QResultClass *, EnvironmentClass *),
-                    std::vector< std::string > *list_of_columns) {
-    // Execute query
-    ExecuteQuery(SC_get_conn(stmt), reinterpret_cast< HSTMT * >(&sub_stmt),
-                 query);
-
-    // Bind Columns
-    bind_vector binds;
-    (*populate_binds)(binds);
-    std::for_each(binds.begin(), binds.end(),
-                  [&](const auto &b) { b->BindColumn(sub_stmt); });
-    QResultClass *res =
-        SetupQResult(binds, stmt, sub_stmt, static_cast< int >(binds.size()));
-
-    // Setup QResultClass
-    (*setup_qres_info)(
-        res, static_cast< EnvironmentClass * >(CC_get_env(SC_get_conn(stmt))));
-    SetTableTuples(res, res_type, binds, table_type, stmt, sub_stmt,
-                   list_of_columns);
-    CleanUp(stmt, sub_stmt, SQL_SUCCESS);
-}
-
-RETCODE SQL_API
-OPENSEARCHAPI_Tables(HSTMT hstmt, const SQLCHAR *catalog_name_sql,
-             const SQLSMALLINT catalog_name_sz, const SQLCHAR *schema_name_sql,
-             const SQLSMALLINT schema_name_sz, const SQLCHAR *table_name_sql,
-             const SQLSMALLINT table_name_sz, const SQLCHAR *table_type_sql,
-             const SQLSMALLINT table_type_sz, const UWORD flag) {
-    CSTR func = "OPENSEARCHAPI_Tables";
-    StatementClass *stmt = (StatementClass *)hstmt;
-    StatementClass *tbl_stmt = NULL;
-    RETCODE result = SQL_ERROR;
-    if ((result = SC_initialize_and_recycle(stmt)) != SQL_SUCCESS)
-        return result;
-
-    try {
-        // Convert const SQLCHAR*'s to c++ strings
-        std::string catalog_name, schema_name, table_name, table_type;
-        bool catalog_valid, schema_valid, table_valid, table_type_valid;
-        ConvertToString(catalog_name, catalog_valid, catalog_name_sql,
-                        catalog_name_sz);
-        ConvertToString(schema_name, schema_valid, schema_name_sql,
-                        schema_name_sz);
-        ConvertToString(table_name, table_valid, table_name_sql, table_name_sz);
-        ConvertToString(table_type, table_type_valid, table_type_sql,
-                        table_type_sz);
-
-        //  Special semantics for the CatalogName, SchemaName, and TableType
-        //  arguments
-        TableResultSet result_type = TableResultSet::All;
-
-        if (catalog_name == SQL_ALL_CATALOGS) {
-            if (schema_valid && table_valid && (table_name == "")
-                && (schema_name == "")) {
-                std::string error_msg("Catalogs not supported.");
-                SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                             error_msg.c_str(), func);
-                CleanUp(stmt, tbl_stmt);
-                return SQL_ERROR;
-            }
-            // result_type = TableResultSet::Catalog;
-        }
-        if (schema_name == SQL_ALL_SCHEMAS) {
-            if (catalog_valid && table_valid && (table_name == "")
-                && (catalog_name == "")) {
-                std::string error_msg("Schemas not supported.");
-                SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                             error_msg.c_str(), func);
-                CleanUp(stmt, tbl_stmt);
-                return SQL_ERROR;
-            }
-            // result_type = TableResultSet::Schema;
-        }
-        if (table_type_valid && (table_type == SQL_ALL_TABLE_TYPES)) {
-            if (catalog_valid && table_valid && schema_valid
-                && (table_name == "") && (catalog_name == "")
-                && (schema_name == ""))
-                result_type = TableResultSet::TableTypes;
-        }
-        if (table_type_valid && (table_type != SQL_ALL_TABLE_TYPES)) {
-            result_type = TableResultSet::TableLookUp;
-        }
-
-        // Create query to find out list
-        std::string query;
-        GenerateTableQuery(query, flag, table_name, result_type, table_valid);
-
-        // TODO #324 (SQL Plugin)- evaluate catalog & schema support
-        GetCatalogData(query, stmt, tbl_stmt, result_type, table_type,
-                       AssignTableBindTemplates, SetupTableQResInfo);
-        return SQL_SUCCESS;
-    } catch (std::bad_alloc &e) {
-        std::string error_msg = std::string("Bad allocation exception: '")
-                                + e.what() + std::string("'.");
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR, error_msg.c_str(), func);
-    } catch (std::exception &e) {
-        std::string error_msg =
-            std::string("Generic exception: '") + e.what() + std::string("'.");
-        SC_set_error(stmt, STMT_INTERNAL_ERROR, error_msg.c_str(), func);
-    } catch (...) {
-        std::string error_msg = std::string("Unknown exception raised.");
-        SC_set_error(stmt, STMT_INTERNAL_ERROR, error_msg.c_str(), func);
-    }
-    CleanUp(stmt, tbl_stmt);
-    return SQL_ERROR;
-}
-
-RETCODE SQL_API
-OPENSEARCHAPI_Columns(HSTMT hstmt, const SQLCHAR *catalog_name_sql,
-              const SQLSMALLINT catalog_name_sz, const SQLCHAR *schema_name_sql,
-              const SQLSMALLINT schema_name_sz, const SQLCHAR *table_name_sql,
-              const SQLSMALLINT table_name_sz, const SQLCHAR *column_name_sql,
-              const SQLSMALLINT column_name_sz, const UWORD flag,
-              const OID reloid, const Int2 attnum) {
-    (void)(reloid);
-    (void)(attnum);
-
-    CSTR func = "OPENSEARCHAPI_Columns";
-
-    // Declare outside of try so we can clean them up properly if an exception
-    // occurs
-    StatementClass *stmt = (StatementClass *)hstmt;
-    StatementClass *col_stmt = NULL;
-    RETCODE result = SQL_ERROR;
-    if ((result = SC_initialize_and_recycle(stmt)) != SQL_SUCCESS)
-        return result;
-
-    try {
-        // Convert const SQLCHAR *'s to strings
-        std::string catalog_name, schema_name, table_name, column_name;
-        bool catalog_valid, schema_valid, table_valid, column_valid;
-        ConvertToString(catalog_name, catalog_valid, catalog_name_sql,
-                        catalog_name_sz);
-        ConvertToString(schema_name, schema_valid, schema_name_sql,
-                        schema_name_sz);
-        ConvertToString(table_name, table_valid, table_name_sql, table_name_sz);
-        ConvertToString(column_name, column_valid, column_name_sql,
-                        column_name_sz);
-
-        // Generate query
-        std::string query;
-        GenerateColumnQuery(query, table_name, column_name, table_valid,
-                            column_valid, flag);
-
-        // Get list of columns with SELECT * query since columns doesn't match
-        // with DESCRIBE & SELECT * query
-        std::vector< std::string > list_of_columns;
-        if (table_valid) {
-            ConnectionClass *conn = SC_get_conn(stmt);
-            list_of_columns =
-                OpenSearchGetColumnsWithSelectQuery(conn->opensearchconn, table_name);
-        }
-
-        // TODO #324 (SQL Plugin)- evaluate catalog & schema support
-
-        // Execute query
-        std::string table_type = "";
-        GetCatalogData(query, stmt, col_stmt, TableResultSet::All, table_type,
-                       AssignColumnBindTemplates, SetupColumnQResInfo,
-                       &list_of_columns);
-        return SQL_SUCCESS;
-    } catch (std::bad_alloc &e) {
-        std::string error_msg = std::string("Bad allocation exception: '")
-                                + e.what() + std::string("'.");
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR, error_msg.c_str(), func);
-    } catch (std::exception &e) {
-        std::string error_msg =
-            std::string("Generic exception: '") + e.what() + std::string("'.");
-        SC_set_error(stmt, STMT_INTERNAL_ERROR, error_msg.c_str(), func);
-    } catch (...) {
-        std::string error_msg("Unknown exception raised.");
-        SC_set_error(stmt, STMT_INTERNAL_ERROR, error_msg.c_str(), func);
-    }
-    CleanUp(stmt, col_stmt);
-    return SQL_ERROR;
-}
-void CleanUp_GetTypeInfo(StatementClass *stmt, const RETCODE ret = SQL_ERROR) {
-    stmt->status = STMT_FINISHED;
-    stmt->currTuple = -1;
-    if (SQL_SUCCEEDED(ret))
-        SC_set_rowset_start(stmt, -1, FALSE);
-    else
-        SC_set_Result(stmt, NULL);
-    SC_set_current_col(stmt, -1);
-}
-
-void SetupTypeQResInfo(QResultClass *res) {
-    QR_set_field_info_v(res, GETTYPE_TYPE_NAME, TYPE_NAME,
-                        OPENSEARCH_TYPE_VARCHAR,
-                        MAX_INFO_STRING);
-    QR_set_field_info_v(res, GETTYPE_DATA_TYPE, DATA_TYPE, OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, GETTYPE_COLUMN_SIZE, PRECISION,
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, GETTYPE_LITERAL_PREFIX, LITERAL_PREFIX,
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, GETTYPE_LITERAL_SUFFIX, LITERAL_SUFFIX,
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, GETTYPE_CREATE_PARAMS, CREATE_PARAMS,
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, GETTYPE_NULLABLE, NULLABLE, OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, GETTYPE_CASE_SENSITIVE, CASE_SENSITIVE,
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, GETTYPE_SEARCHABLE, SEARCHABLE,
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, GETTYPE_UNSIGNED_ATTRIBUTE, UNSIGNED_ATTRIBUTE,
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, GETTYPE_FIXED_PREC_SCALE, FIXED_PREC_SCALE,
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, GETTYPE_AUTO_UNIQUE_VALUE, AUTO_INCREMENT,
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, GETTYPE_LOCAL_TYPE_NAME, LOCAL_TYPE_NAME,
-                        OPENSEARCH_TYPE_VARCHAR, MAX_INFO_STRING);
-    QR_set_field_info_v(res, GETTYPE_MINIMUM_SCALE, MINIMUM_SCALE,
-                        OPENSEARCH_TYPE_INT2,
-                        2);
-    QR_set_field_info_v(res, GETTYPE_MAXIMUM_SCALE, MAXIMUM_SCALE,
-                        OPENSEARCH_TYPE_INT2,
-                        2);
-    QR_set_field_info_v(res, GETTYPE_SQL_DATA_TYPE, SQL_DATA_TYPE,
-                        OPENSEARCH_TYPE_INT2,
-                        2);
-    QR_set_field_info_v(res, GETTYPE_SQL_DATETIME_SUB, SQL_DATETIME_SUB,
-                        OPENSEARCH_TYPE_INT2, 2);
-    QR_set_field_info_v(res, GETTYPE_NUM_PREC_RADIX, NUM_PREC_RADIX,
-                        OPENSEARCH_TYPE_INT4, 4);
-    QR_set_field_info_v(res, GETTYPE_INTERVAL_PRECISION, INTERVAL_PRECISION,
-                        OPENSEARCH_TYPE_INT2, 2);
-}
-
-RETCODE SetTypeResult(ConnectionClass *conn, StatementClass *stmt,
-                      QResultClass *res, int esType, int sqlType) {
-    TupleField *tuple;
-
-    if (tuple = QR_AddNew(res), NULL == tuple) {
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR, "Couldn't QR_AddNew.",
-                     "SetTypeResult");
-        CleanUp_GetTypeInfo(stmt, SQL_ERROR);
-        return SQL_ERROR;
-    }
-
-    set_tuplefield_string(&tuple[GETTYPE_TYPE_NAME],
-                          opensearchtype_attr_to_name(conn, esType, -1, FALSE));
-    set_tuplefield_int2(&tuple[GETTYPE_NULLABLE],
-                        opensearchtype_nullable(conn, esType));
-
-    set_tuplefield_int2(&tuple[GETTYPE_DATA_TYPE],
-                        static_cast< short >(sqlType));
-    set_tuplefield_int2(&tuple[GETTYPE_CASE_SENSITIVE],
-                        opensearchtype_case_sensitive(conn, esType));
-    set_tuplefield_int2(&tuple[GETTYPE_SEARCHABLE],
-                        opensearchtype_searchable(conn, esType));
-    set_tuplefield_int2(&tuple[GETTYPE_FIXED_PREC_SCALE],
-                        opensearchtype_money(conn, esType));
-
-    //  Localized data-source dependent data type name (always NULL)
-    set_tuplefield_null(&tuple[GETTYPE_LOCAL_TYPE_NAME]);
-
-    // These values can be NULL
-    set_nullfield_int4(
-        &tuple[GETTYPE_COLUMN_SIZE],
-                       opensearchtype_attr_column_size(
-                           conn, esType, OPENSEARCH_ATP_UNSET,
-                           OPENSEARCH_ADT_UNSET, OPENSEARCH_UNKNOWNS_UNSET));
-    set_nullfield_string(&tuple[GETTYPE_LITERAL_PREFIX],
-                         opensearchtype_literal_prefix(conn, esType));
-    set_nullfield_string(&tuple[GETTYPE_LITERAL_SUFFIX],
-                         opensearchtype_literal_suffix(conn, esType));
-    set_nullfield_string(&tuple[GETTYPE_CREATE_PARAMS],
-                         opensearchtype_create_params(conn, esType));
-    set_nullfield_int2(&tuple[GETTYPE_UNSIGNED_ATTRIBUTE],
-                       opensearchtype_unsigned(conn, esType));
-    set_nullfield_int2(&tuple[GETTYPE_AUTO_UNIQUE_VALUE],
-                       opensearchtype_auto_increment(conn, esType));
-    set_nullfield_int2(&tuple[GETTYPE_MINIMUM_SCALE],
-                       opensearchtype_min_decimal_digits(conn, esType));
-    set_nullfield_int2(&tuple[GETTYPE_MAXIMUM_SCALE],
-                       opensearchtype_max_decimal_digits(conn, esType));
-    set_tuplefield_int2(&tuple[GETTYPE_SQL_DATA_TYPE],
-                        static_cast< short >(sqlType));
-    set_nullfield_int2(&tuple[GETTYPE_SQL_DATETIME_SUB],
-                       opensearchtype_attr_to_datetime_sub(
-                           conn, esType, OPENSEARCH_ATP_UNSET));
-    set_nullfield_int4(&tuple[GETTYPE_NUM_PREC_RADIX],
-                       opensearchtype_radix(conn, esType));
-    set_nullfield_int4(&tuple[GETTYPE_INTERVAL_PRECISION], 0);
-
-    return SQL_SUCCESS;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_GetTypeInfo(HSTMT hstmt, SQLSMALLINT fSqlType) {
-    CSTR func = "OPENSEARCHAPI_GetTypeInfo";
-    StatementClass *stmt = (StatementClass *)hstmt;
-    ConnectionClass *conn;
-    conn = SC_get_conn(stmt);
-    QResultClass *res = NULL;
-
-    int result_cols;
-    RETCODE result = SQL_ERROR;
-
-    if (result = SC_initialize_and_recycle(stmt), SQL_SUCCESS != result)
-        return result;
-
-    try {
-        if (res = QR_Constructor(), !res) {
-            SC_set_error(stmt, STMT_INTERNAL_ERROR, "Error creating result.",
-                         func);
-            return SQL_ERROR;
-        }
-        SC_set_Result(stmt, res);
-
-        result_cols = NUM_OF_GETTYPE_FIELDS;
-        extend_column_bindings(SC_get_ARDF(stmt),
-                               static_cast< SQLSMALLINT >(result_cols));
-
-        stmt->catalog_result = TRUE;
-        QR_set_num_fields(res, result_cols);
-        SetupTypeQResInfo(res);
-
-        if (fSqlType == SQL_ALL_TYPES) {
-            for (std::pair< int, std::vector< int > > sqlType :
-                 sql_opensearch_type_map) {
-                for (auto const &openSearchType : sqlType.second) {
-                    result =
-                        SetTypeResult(conn, stmt, res, openSearchType, sqlType.first);
-                }
-            }
-        } else {
-            if (sql_opensearch_type_map.count(fSqlType) > 0) {
-                for (auto openSearchType :
-                     sql_opensearch_type_map.at(fSqlType)) {
-                    result = SetTypeResult(conn, stmt, res, openSearchType, fSqlType);
-                }
-            }
-        }
-        result = SQL_SUCCESS;
-
-    } catch (std::bad_alloc &e) {
-        std::string error_msg = std::string("Bad allocation exception: '")
-                                + e.what() + std::string("'.");
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR, error_msg.c_str(), func);
-    } catch (std::exception &e) {
-        std::string error_msg =
-            std::string("Generic exception: '") + e.what() + std::string("'.");
-        SC_set_error(stmt, STMT_INTERNAL_ERROR, error_msg.c_str(), func);
-    } catch (...) {
-        std::string error_msg("Unknown exception raised.");
-        SC_set_error(stmt, STMT_INTERNAL_ERROR, error_msg.c_str(), func);
-    }
-
-    CleanUp_GetTypeInfo(stmt, result);
-    return result;
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_info.h b/sql-odbc/src/sqlodbc/opensearch_info.h
deleted file mode 100644
index bbe1906518..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_info.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef __OPENSEARCH_INFO_H__
-#define __OPENSEARCH_INFO_H__
-#include "opensearch_helper.h"
-#include "opensearch_odbc.h"
-#include "unicode_support.h"
-
-#ifndef WIN32
-#include <ctype.h>
-#endif
-
-#include "bind.h"
-#include "catfunc.h"
-#include "dlg_specific.h"
-#include "environ.h"
-#include "misc.h"
-#include "multibyte.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "opensearch_types.h"
-#include "qresult.h"
-#include "statement.h"
-#include "tuple.h"
-
-// C Interface
-#ifdef __cplusplus
-extern "C" {
-#endif
-RETCODE SQL_API OPENSEARCHAPI_Tables(HSTMT hstmt, const SQLCHAR* catalog_name_sql,
-                             const SQLSMALLINT catalog_name_sz,
-                             const SQLCHAR* schema_name_sql,
-                             const SQLSMALLINT schema_name_sz,
-                             const SQLCHAR* table_name_sql,
-                             const SQLSMALLINT table_name_sz,
-                             const SQLCHAR* table_type_sql,
-                             const SQLSMALLINT table_type_sz, const UWORD flag);
-RETCODE SQL_API
-OPENSEARCHAPI_Columns(HSTMT hstmt, const SQLCHAR* catalog_name_sql,
-              const SQLSMALLINT catalog_name_sz, const SQLCHAR* schema_name_sql,
-              const SQLSMALLINT schema_name_sz, const SQLCHAR* table_name_sql,
-              const SQLSMALLINT table_name_sz, const SQLCHAR* column_name_sql,
-              const SQLSMALLINT column_name_sz, const UWORD flag,
-              const OID reloid, const Int2 attnum);
-
-RETCODE SQL_API OPENSEARCHAPI_GetTypeInfo(HSTMT hstmt, SQLSMALLINT fSqlType);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __OPENSEARCH_INFO_H__ */
diff --git a/sql-odbc/src/sqlodbc/opensearch_odbc.c b/sql-odbc/src/sqlodbc/opensearch_odbc.c
deleted file mode 100644
index ce753eb3d6..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_odbc.c
+++ /dev/null
@@ -1,159 +0,0 @@
-#ifdef WIN32
-#ifdef _DEBUG
-#include <crtdbg.h>
-#endif /* _DEBUG */
-#endif /* WIN32 */
-#include <string.h>
-
-#include "dlg_specific.h"
-#include "environ.h"
-#include "opensearch_odbc.h"
-#include "misc.h"
-
-#ifdef WIN32
-#include "loadlib.h"
-#else
-#include <libgen.h>
-#endif
-
-void unused_vargs(int cnt, ...) {
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-value"
-#endif  // __APPLE__
-    (void)(cnt);
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-}
-
-static int exeesm = 0;
-BOOL isMsAccess(void) {
-    return 1 == exeesm;
-}
-BOOL isMsQuery(void) {
-    return 2 == exeesm;
-}
-BOOL isSqlServr(void) {
-    return 3 == exeesm;
-}
-
-RETCODE SQL_API SQLDummyOrdinal(void);
-
-extern void *conns_cs, *common_cs;
-
-int initialize_global_cs(void) {
-    static int init = 1;
-
-    if (!init)
-        return 0;
-    init = 0;
-#ifdef WIN32
-#ifdef _DEBUG
-#ifdef _MEMORY_DEBUG_
-    _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
-#endif /* _MEMORY_DEBUG_ */
-#endif /* _DEBUG */
-#endif /* WIN32 */
-#ifdef POSIX_THREADMUTEX_SUPPORT
-    getMutexAttr();
-#endif /* POSIX_THREADMUTEX_SUPPORT */
-    InitializeLogging();
-    INIT_CONNS_CS;
-    INIT_COMMON_CS;
-
-    return 0;
-}
-
-static void finalize_global_cs(void) {
-    DELETE_COMMON_CS;
-    DELETE_CONNS_CS;
-    FinalizeLogging();
-#ifdef _DEBUG
-#ifdef _MEMORY_DEBUG_
-    // _CrtDumpMemoryLeaks();
-#endif /* _MEMORY_DEBUG_ */
-#endif /* _DEBUG */
-}
-
-#ifdef WIN32
-HINSTANCE s_hModule; /* Saved module handle. */
-/*	This is where the Driver Manager attaches to this Driver */
-BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) {
-    const char *exename = GetExeProgramName();
-
-    switch (ul_reason_for_call) {
-        case DLL_PROCESS_ATTACH:
-            s_hModule = hInst; /* Save for dialog boxes */
-
-            if (stricmp(exename, "msaccess") == 0)
-                exeesm = 1;
-            else if (strnicmp(exename, "msqry", 5) == 0)
-                exeesm = 2;
-            else if (strnicmp(exename, "sqlservr", 8) == 0)
-                exeesm = 3;
-            initialize_global_cs();
-            MYLOG(OPENSEARCH_DEBUG, "exe name=%s\n", exename);
-            break;
-
-        case DLL_THREAD_ATTACH:
-            break;
-
-        case DLL_PROCESS_DETACH:
-            MYLOG(OPENSEARCH_DEBUG, "DETACHING %s\n", DRIVER_FILE_NAME);
-            CleanupDelayLoadedDLLs();
-            /* my(q)log is unavailable from here */
-            finalize_global_cs();
-            return TRUE;
-
-        case DLL_THREAD_DETACH:
-            break;
-
-        default:
-            break;
-    }
-
-    return TRUE;
-
-    UNREFERENCED_PARAMETER(lpReserved);
-}
-
-#else /* not WIN32 */
-
-#if defined(__GNUC__) || defined(__SUNPRO_C)
-
-/* Shared library initializer and destructor, using gcc's attributes */
-
-static void __attribute__((constructor)) elasticodbc_init(void) {
-    initialize_global_cs();
-}
-
-static void __attribute__((destructor)) elasticodbc_fini(void) {
-    finalize_global_cs();
-}
-
-#else  /* not __GNUC__ */
-
-/* Shared library initialization on non-gcc systems. */
-BOOL _init(void) {
-    initialize_global_cs();
-    return TRUE;
-}
-
-BOOL _fini(void) {
-    finalize_global_cs();
-    return TRUE;
-}
-#endif /* not __GNUC__ */
-#endif /* not WIN32 */
-
-/*
- *	This function is used to cause the Driver Manager to
- *	call functions by number rather than name, which is faster.
- *	The ordinal value of this function must be 199 to have the
- *	Driver Manager do this.  Also, the ordinal values of the
- *	functions must match the value of fFunction in SQLGetFunctions()
- */
-RETCODE SQL_API SQLDummyOrdinal(void) {
-    return SQL_SUCCESS;
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_odbc.h b/sql-odbc/src/sqlodbc/opensearch_odbc.h
deleted file mode 100644
index 23ba2c3f68..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_odbc.h
+++ /dev/null
@@ -1,663 +0,0 @@
-#ifndef __OPENSEARCHODBC_H__
-#define __OPENSEARCHODBC_H__
-#include <stdarg.h>
-
-/* #define	__MS_REPORTS_ANSI_CHAR__ */
-void unused_vargs(int cnt, ...);
-#define UNUSED(...) unused_vargs(0, __VA_ARGS__)
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#elif __APPLE__
-
-#elif __linux__
-#include "linux/kconfig.h"
-#endif
-
-#include <stdio.h> /* for FILE* pointers: see GLOBAL_VALUES */
-
-#include "version.h"
-
-#ifdef WIN32
-#ifdef _DEBUG
-#ifndef _MEMORY_DEBUG_
-#include <stdlib.h>
-#if (_MSC_VER < 1400) /* in case of VC7 or under */
-#include <malloc.h>
-#endif /* _MSC_VER */
-#define _CRTDBG_MAP_ALLOC
-#include <crtdbg.h>
-#endif /* _MEMORY_DEBUG_ */
-#else  /* _DEBUG */
-#include <stdlib.h>
-#endif /* _DEBUG */
-#else  /* WIN32 */
-#include <stdlib.h>
-#endif /* WIN32 */
-
-#if defined(__GNUC__) || defined(__IBMC__)
-#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 404
-#define OPENSEARCH_PRINTF_ATTRIBUTE gnu_printf
-#else
-#define OPENSEARCH_PRINTF_ATTRIBUTE printf
-#endif
-#define opensearch_attribute_printf(f, a) \
-    __attribute__((format(OPENSEARCH_PRINTF_ATTRIBUTE, f, a)))
-#else
-#define __attribute__(x)
-#define opensearch_attribute_printf(f, a)
-#endif /* __GNUC__ || __IBMC__ */
-
-#ifdef _MEMORY_DEBUG_
-void *esdebug_alloc(size_t);
-void *esdebug_calloc(size_t, size_t);
-void *esdebug_realloc(void *, size_t);
-char *esdebug_strdup(const char *);
-void *esdebug_memcpy(void *, const void *, size_t);
-void *esdebug_memset(void *, int c, size_t);
-char *esdebug_strcpy(char *, const char *);
-char *esdebug_strncpy(char *, const char *, size_t);
-char *esdebug_strncpy_null(char *, const char *, size_t);
-void esdebug_free(void *);
-void debug_memory_check(void);
-
-#ifdef WIN32
-#undef strdup
-#endif /* WIN32 */
-#define malloc esdebug_alloc
-#define realloc esdebug_realloc
-#define calloc esdebug_calloc
-#define strdup esdebug_strdup
-#define free esdebug_free
-#define strcpy esdebug_strcpy
-#define strncpy esdebug_strncpy
-/* #define strncpy_null	esdebug_strncpy_null */
-#define memcpy esdebug_memcpy
-#define memset esdebug_memset
-#endif /* _MEMORY_DEBUG_ */
-
-#ifdef WIN32
-#pragma warning(push)
-#pragma warning(disable : 4201)  // nonstandard extension used: nameless
-                                 // struct/union warning
-#include <delayimp.h>
-#pragma warning(pop)
-#endif /* WIN32 */
-/* Must come before sql.h */
-#define ODBCVER 0x0351
-
-/*
- * Default NAMEDATALEN value in the server. The server can be compiled with
- * a different value, but this will do.
- */
-#define NAMEDATALEN_V73 64
-
-#ifndef NAMESTORAGELEN
-#define NAMESTORAGELEN 64
-#endif /* NAMESTORAGELEN */
-
-#if defined(WIN32) || defined(WITH_UNIXODBC) || defined(WITH_IODBC)
-#ifdef WIN32
-#pragma warning(push)
-#pragma warning(disable : 4201)  // nonstandard extension used: nameless
-                                 // struct/union warning
-#endif                           // WIN32
-#include <sql.h>
-#include <sqlext.h>
-#include <sqltypes.h>
-#if WIN32
-#pragma warning(pop)
-#endif                                  // WIN32
-#if defined(WIN32) && (_MSC_VER < 1300) /* in case of VC6 or under */
-#define SQLLEN SQLINTEGER
-#define SQLULEN SQLUINTEGER
-#define SQLSETPOSIROW SQLUSMALLINT
-/* VC6 bypasses 64bit mode. */
-#define DWLP_USER DWL_USER
-#define ULONG_PTR ULONG
-#define LONG_PTR LONG
-#define SetWindowLongPtr(hdlg, DWLP_USER, lParam) \
-    SetWindowLong(hdlg, DWLP_USER, lParam)
-#define GetWindowLongPtr(hdlg, DWLP_USER) GetWindowLong(hdlg, DWLP_USER);
-#endif
-#else
-#include "iodbc.h"
-#include "isql.h"
-#include "isqlext.h"
-#endif /* WIN32 */
-
-#if defined(WIN32)
-#include <odbcinst.h>
-#elif defined(WITH_UNIXODBC)
-#include <odbcinst.h>
-#elif defined(WITH_IODBC)
-#include <iodbcinst.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define Int4 int
-#define UInt4 unsigned int
-#define Int2 short
-#define UInt2 unsigned short
-typedef SQLBIGINT Int8;
-typedef UInt4 OID;
-
-#ifndef SQL_TRUE
-#define SQL_TRUE TRUE
-#endif /* SQL_TRUE */
-#ifndef SQL_FALSE
-#define SQL_FALSE FALSE
-#endif /* SQL_FALSE */
-
-#define FORMAT_SMALLI "%d"  /* SQLSMALLINT */
-#define FORMAT_USMALLI "%u" /* SQLUSMALLINT */
-#ifdef WIN32
-#ifndef SSIZE_T_DEFINED
-#define ssize_t SSIZE_T
-#define SSIZE_T_DEFINED
-#endif                        /* SSIZE_T */
-#define FORMAT_SIZE_T "%Iu"   /* size_t */
-#define FORMAT_SSIZE_T "%Id"  /* ssize_t */
-#define FORMAT_INTEGER "%ld"  /* SQLINTEGER */
-#define FORMAT_UINTEGER "%lu" /* SQLUINTEGER */
-#define FORMATI64 "%I64d"     /* SQLBIGINT */
-#define FORMATI64U "%I64u"    /* SQLUBIGINT */
-#ifdef _WIN64
-#define FORMAT_LEN "%I64d"  /* SQLLEN */
-#define FORMAT_ULEN "%I64u" /* SQLULEN */
-#define FORMAT_POSIROW "%I64u"
-#else                     /* _WIN64 */
-#define FORMAT_LEN "%ld"  /* SQLLEN */
-#define FORMAT_ULEN "%lu" /* SQLULEN */
-#define FORMAT_POSIROW "%hu"
-#endif                       /* _WIN64 */
-#else                        /* WIN32 */
-#define FORMAT_SIZE_T "%zu"  /* size_t */
-#define FORMAT_SSIZE_T "%zd" /* ssize_t */
-#ifndef HAVE_SSIZE_T
-typedef long ssize_t;
-#endif /* HAVE_SSIZE_T */
-
-#ifndef SIZEOF_VOID_P
-#ifdef __APPLE__
-#define SIZEOF_VOID_P 8
-#else
-#error "SIZEOF_VOID_P must be defined"
-#endif  // __APPLE__
-#endif  // SIZEOF_VOID_P
-
-#ifndef SIZEOF_LONG
-#ifdef __APPLE__
-#define SIZEOF_LONG 8
-#else
-#error "SIZEOF_LONG must be defined"
-#endif  // __APPLE__
-#endif  // SIZEOF_LONG
-
-#if (SIZEOF_VOID_P == SIZEOF_LONG) /* ILP32 or LP64 */
-typedef long LONG_PTR;
-typedef unsigned long ULONG_PTR;
-#elif defined(HAVE_LONG_LONG)      /* LLP64 */
-typedef long long LONG_PTR;
-typedef unsigned long long ULONG_PTR;
-#else                              /* SIZEOF_VOID_P */
-#error appropriate long pointer type not found
-#endif                       /* SIZEOF_VOID_P */
-#if (SIZEOF_LONG == 8)       /* LP64 */
-#define FORMAT_INTEGER "%d"  /* SQLINTEGER */
-#define FORMAT_UINTEGER "%u" /* SQLUINTEGER */
-#define FORMATI64 "%ld"      /* SQLBIGINT */
-#define FORMATI64U "%lu"     /* SQLUBIGINT */
-#if defined(WITH_UNIXODBC) && defined(BUILD_LEGACY_64_BIT_MODE)
-#define FORMAT_LEN "%d"       /* SQLLEN */
-#define FORMAT_ULEN "%u"      /* SQLULEN */
-#else                         /* WITH_UNIXODBC */
-#define FORMAT_LEN "%ld"      /* SQLLEN */
-#define FORMAT_ULEN "%lu"     /* SQLULEN */
-#endif                        /* WITH_UNIXODBC */
-#else                         /* SIZEOF_LONG */
-#define FORMAT_INTEGER "%ld"  /* SQLINTEGER */
-#define FORMAT_UINTEGER "%lu" /* SQLUINTEGER */
-#if defined(HAVE_LONG_LONG)
-#define FORMATI64 "%lld"   /* SQLBIGINT */
-#define FORMATI64U "%llu"  /* SQLUBIGINT */
-#if (SIZEOF_VOID_P == 8)   /* LLP64 */
-#define FORMAT_LEN "%lld"  /* SQLLEN */
-#define FORMAT_ULEN "%llu" /* SQLULEN */
-#else                      /* SIZEOF_VOID_P ILP32 */
-#define FORMAT_LEN "%ld"   /* SQLLEN */
-#define FORMAT_ULEN "%lu"  /* SQLULEN */
-#endif                     /* SIZEOF_VOID_P */
-#else                      /* HAVE_LONG_LONG */
-#define FORMAT_LEN "%ld"   /* SQLLEN */
-#define FORMAT_ULEN "%lu"  /* SQLULEN */
-#endif                     /* HAVE_LONG_LONG */
-#endif                     /* SIZEOF_LONG */
-
-#if (SIZEOF_VOID_P == 8) && !defined(WITH_IODBC)
-#define FORMAT_POSIROW FORMAT_ULEN
-#else
-#define FORMAT_POSIROW "%u"
-#endif
-
-#endif /* WIN32 */
-
-#define CAST_PTR(type, ptr) (type)((LONG_PTR)(ptr))
-#define CAST_UPTR(type, ptr) (type)((ULONG_PTR)(ptr))
-#ifndef SQL_IS_LEN
-#define SQL_IS_LEN (-1000)
-#endif /* SQL_IS_LEN */
-#ifdef HAVE_SIGNED_CHAR
-typedef signed char po_ind_t;
-#else
-typedef char po_ind_t;
-#endif /* HAVE_SIGNED_CHAR */
-
-#ifndef WIN32
-#if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC)
-typedef float SFLOAT;
-typedef double SDOUBLE;
-#endif /* WITH_UNIXODBC */
-
-#ifndef CALLBACK
-#define CALLBACK
-#endif /* CALLBACK */
-#endif /* WIN32 */
-
-#ifndef WIN32
-#define stricmp strcasecmp
-#define strnicmp strncasecmp
-#ifndef TRUE
-#define TRUE (BOOL)1
-#endif /* TRUE */
-#ifndef FALSE
-#define FALSE (BOOL)0
-#endif /* FALSE */
-#else
-
-#if (_MSC_VER < 1900) /* vc12 or under */
-#define POSIX_SNPRINTF_REQUIRED
-#define snprintf posix_snprintf
-extern int posix_snprintf(char *buf, size_t size, const char *format, ...);
-#endif /* _MSC_VER */
-#ifndef strdup
-#define strdup _strdup
-#endif /* strdup */
-#define strnicmp _strnicmp
-#define stricmp _stricmp
-#endif /* WIN32 */
-
-#define IS_NOT_SPACE(c) ((c) && !isspace((UCHAR)c))
-
-#ifndef SQL_ATTR_APP_ROW_DESC
-#define SQL_ATTR_APP_ROW_DESC 10010
-#endif
-#ifndef SQL_ATTR_APP_PARAM_DESC
-#define SQL_ATTR_APP_PARAM_DESC 10011
-#endif
-#ifndef SQL_ATTR_IMP_ROW_DESC
-#define SQL_ATTR_IMP_ROW_DESC 10012
-#endif
-#ifndef SQL_ATTR_IMP_PARAM_DESC
-#define SQL_ATTR_IMP_PARAM_DESC 10013
-#endif
-
-/* Driver stuff */
-
-#define DRIVERNAME "OpenSearch ODBC"
-
-#define DBMS_NAME_UNICODE "OpenSearch Unicode"
-#define DBMS_NAME_ANSI "OpenSearch ANSI"
-
-#define DRIVER_ODBC_VER "03.51"
-
-#ifdef UNICODE_SUPPORT
-#define WCLEN sizeof(SQLWCHAR)
-SQLULEN ucs2strlen(const SQLWCHAR *);
-#else
-#undef SQL_WCHAR
-#undef SQL_WVARCHAR
-#undef SQL_WLONGVARCHAR
-#undef SQL_C_WCHAR
-#define SQL_WCHAR SQL_WCHAR_IS_INHIBITED
-#define SQL_WVARCHAR SQL_WVARCHAR_IS_INHIBITED
-#define SQL_WLONGVARCHAR SQL_WLONGVARCHAR_IS_INHIBITED
-#define SQL_C_WCHAR SQL_C_WCHAR_IS_INHIBITED
-#endif
-
-#ifndef DBMS_NAME
-#ifdef _WIN64
-#ifdef UNICODE_SUPPORT
-#define DBMS_NAME DBMS_NAME_UNICODE "(x64)"
-#else
-#define DBMS_NAME DBMS_NAME_ANSI "(x64)"
-#endif /* UNICODE_SUPPORT */
-#else  /* _WIN64 */
-#ifdef UNICODE_SUPPORT
-#define DBMS_NAME DBMS_NAME_UNICODE
-#else
-#define DBMS_NAME DBMS_NAME_ANSI
-#endif /* UNICODE_SUPPORT */
-#endif /* _WIN64 */
-#endif /* DBMS_NAME */
-
-#ifndef DBMS_NAME
-#define DBMS_NAME "OpenSearch Legacy"
-#endif /* DBMS_NAME */
-#ifdef WIN32
-#ifdef UNICODE_SUPPORT
-#define DRIVER_FILE_NAME "sqlodbc.dll"
-#else
-#define DRIVER_FILE_NAME "sqlodbc.dll"
-#endif /* UNICODE_SUPPORT */
-#else
-#ifdef UNICODE_SUPPORT
-#define DRIVER_FILE_NAME "libsqlodbc.dylib"
-#else
-#define DRIVER_FILE_NAME "libsqlodbc.dylib"
-#endif
-#endif /* WIN32 */
-BOOL isMsAccess(void);
-BOOL isMsQuery(void);
-BOOL isSqlServr(void);
-
-/* ESCAPEs */
-#define ESCAPE_IN_LITERAL '\\'
-#define BYTEA_ESCAPE_CHAR '\\'
-#define SEARCH_PATTERN_ESCAPE '\\'
-#define LITERAL_QUOTE '\''
-#define IDENTIFIER_QUOTE '\"'
-#define ODBC_ESCAPE_START '{'
-#define ODBC_ESCAPE_END '}'
-#define DOLLAR_QUOTE '$'
-#define LITERAL_EXT 'E'
-#define OPENSEARCH_CARRIAGE_RETURN '\r'
-#define OPENSEARCH_LINEFEED '\n'
-
-/* Limits */
-#define MAXESPATH 1024
-
-/* see an easy way round this - DJP 24-1-2001 */
-#define MAX_CONNECT_STRING 4096
-#define FETCH_MAX                            \
-    100 /* default number of rows to cache \ \
-         * for declare/fetch */
-#define TUPLE_MALLOC_INC 100
-#define MAX_CONNECTIONS            \
-    128 /* conns per environment \ \
-         * (arbitrary)	*/
-
-#ifdef NAMEDATALEN
-#define MAX_SCHEMA_LEN NAMEDATALEN
-#define MAX_TABLE_LEN NAMEDATALEN
-#define MAX_COLUMN_LEN NAMEDATALEN
-#define NAME_FIELD_SIZE NAMEDATALEN /* size of name fields */
-#if (NAMEDATALEN > NAMESTORAGELEN)
-#undef NAMESTORAGELEN
-#define NAMESTORAGELEN NAMEDATALEN
-#endif
-#endif /* NAMEDATALEN */
-#define MAX_CURSOR_LEN 32
-
-#define SCHEMA_NAME_STORAGE_LEN NAMESTORAGELEN
-#define TABLE_NAME_STORAGE_LEN NAMESTORAGELEN
-#define COLUMN_NAME_STORAGE_LEN NAMESTORAGELEN
-#define INDEX_KEYS_STORAGE_COUNT 32
-
-/*	Registry length limits */
-#define LARGE_REGISTRY_LEN 4096 /* used for special cases */
-#define MEDIUM_REGISTRY_LEN                        \
-    256                       /* normal size for \ \
-                               * user,database,etc. */
-#define SMALL_REGISTRY_LEN 10 /* for 1/0 settings */
-
-/*	These prefixes denote system tables */
-#define ELASTIC_SYS_PREFIX "es_"
-
-/*	Info limits */
-#define MAX_INFO_STRING 128
-
-/* POSIX defines a PATH_MAX.( wondows is _MAX_PATH ..) */
-#ifndef PATH_MAX
-#ifdef _MAX_PATH
-#define PATH_MAX _MAX_PATH
-#else
-#define PATH_MAX 1024
-#endif /* _MAX_PATH */
-#endif /* PATH_MAX */
-
-typedef struct ConnectionClass_ ConnectionClass;
-typedef struct StatementClass_ StatementClass;
-typedef struct QResultClass_ QResultClass;
-typedef struct BindInfoClass_ BindInfoClass;
-typedef struct ParameterInfoClass_ ParameterInfoClass;
-typedef struct ParameterImplClass_ ParameterImplClass;
-typedef struct ColumnInfoClass_ ColumnInfoClass;
-typedef struct EnvironmentClass_ EnvironmentClass;
-typedef struct TupleField_ TupleField;
-typedef struct KeySet_ KeySet;
-typedef struct Rollback_ Rollback;
-typedef struct ARDFields_ ARDFields;
-typedef struct APDFields_ APDFields;
-typedef struct IRDFields_ IRDFields;
-typedef struct IPDFields_ IPDFields;
-
-typedef struct col_info COL_INFO;
-typedef struct lo_arg LO_ARG;
-
-/*	opensearchNAME type define */
-typedef struct {
-    char *name;
-} opensearchNAME;
-#define GET_NAME(the_name) ((the_name).name)
-#define SAFE_NAME(the_name) ((the_name).name ? (the_name).name : NULL_STRING)
-#define PRINT_NAME(the_name) ((the_name).name ? (the_name).name : PRINT_NULL)
-#define NAME_IS_NULL(the_name) (NULL == (the_name).name)
-#define NAME_IS_VALID(the_name) (NULL != (the_name).name)
-#define INIT_NAME(the_name) ((the_name).name = NULL)
-#define NULL_THE_NAME(the_name)    \
-    do {                           \
-        if ((the_name).name)       \
-            free((the_name).name); \
-        (the_name).name = NULL;    \
-    } while (0)
-#define STR_TO_NAME(the_name, str)                      \
-    do {                                                \
-        if ((the_name).name)                            \
-            free((the_name).name);                      \
-        (the_name).name = (str ? strdup((str)) : NULL); \
-    } while (0)
-#define STRX_TO_NAME(the_name, str)      \
-    do {                                 \
-        if ((the_name).name)             \
-            free((the_name).name);       \
-        (the_name).name = strdup((str)); \
-    } while (0)
-#define STRN_TO_NAME(the_name, str, n)             \
-    do {                                           \
-        if ((the_name).name)                       \
-            free((the_name).name);                 \
-        if (str) {                                 \
-            (the_name).name = malloc((n) + 1);     \
-            if ((the_name).name) {                 \
-                memcpy((the_name).name, str, (n)); \
-                (the_name).name[(n)] = '\0';       \
-            }                                      \
-        } else                                     \
-            (the_name).name = NULL;                \
-    } while (0)
-#define NAME_TO_NAME(to, from)             \
-    do {                                   \
-        if ((to).name)                     \
-            free((to).name);               \
-        if ((from).name)                   \
-            (to).name = strdup(from.name); \
-        else                               \
-            (to).name = NULL;              \
-    } while (0)
-#define MOVE_NAME(to, from)      \
-    do {                         \
-        if ((to).name)           \
-            free((to).name);     \
-        (to).name = (from).name; \
-        (from).name = NULL;      \
-    } while (0)
-#define SET_NAME_DIRECTLY(the_name, str) ((the_name).name = (str))
-
-#define NAMECMP(name1, name2) (strcmp(SAFE_NAME(name1), SAFE_NAME(name2)))
-#define NAMEICMP(name1, name2) (stricmp(SAFE_NAME(name1), SAFE_NAME(name2)))
-/*	opensearchNAME define end */
-
-typedef struct GlobalValues_ {
-    opensearchNAME drivername;
-    char output_dir[LARGE_REGISTRY_LEN];
-    int loglevel;
-} GLOBAL_VALUES;
-
-void copy_globals(GLOBAL_VALUES *to, const GLOBAL_VALUES *from);
-void init_globals(GLOBAL_VALUES *glbv);
-void finalize_globals(GLOBAL_VALUES *glbv);
-
-typedef struct StatementOptions_ {
-    SQLLEN maxRows;
-    SQLLEN maxLength;
-    SQLLEN keyset_size;
-    SQLUINTEGER cursor_type;
-    SQLUINTEGER scroll_concurrency;
-    SQLUINTEGER retrieve_data;
-    SQLUINTEGER use_bookmarks;
-    void *bookmark_ptr;
-    SQLUINTEGER metadata_id;
-    SQLULEN stmt_timeout;
-} StatementOptions;
-
-/*	Used to pass extra query info to send_query */
-typedef struct QueryInfo_ {
-    SQLLEN row_size;
-    SQLLEN fetch_size;
-    QResultClass *result_in;
-    const char *cursor;
-} QueryInfo;
-
-/*	Used to save the error information */
-typedef struct {
-    UInt4 status;
-    Int2 errorsize;
-    Int2 recsize;
-    Int2 errorpos;
-    char sqlstate[6];
-    SQLLEN diag_row_count;
-    char __error_message[40];
-} OpenSearch_ErrorInfo;
-OpenSearch_ErrorInfo *ER_Constructor(SDWORD errornumber, const char *errormsg);
-OpenSearch_ErrorInfo *ER_Dup(const OpenSearch_ErrorInfo *from);
-void ER_Destructor(OpenSearch_ErrorInfo *);
-RETCODE SQL_API ER_ReturnError(OpenSearch_ErrorInfo *, SQLSMALLINT, UCHAR *,
-                               SQLINTEGER *, UCHAR *, SQLSMALLINT,
-                               SQLSMALLINT *, UWORD);
-
-void logs_on_off(int cnopen, int, int);
-
-#define OPENSEARCH_TYPE_LO_UNDEFINED \
-    (-999) /* hack until permanent \ \
-            * type available */
-#define OPENSEARCH_TYPE_LO_NAME "lo"
-#define CTID_ATTNUM (-1) /* the attnum of ctid */
-#define OID_ATTNUM (-2)  /* the attnum of oid */
-#define XMIN_ATTNUM (-3) /* the attnum of xmin */
-
-/* sizes */
-#define TEXT_FIELD_SIZE                   \
-    8190 /* size of default text fields \ \
-          * (not including null term) */
-#define MAX_VARCHAR_SIZE             \
-    512 /* default maximum size of \ \
-         * varchar fields (not including null term) */
-#define INFO_VARCHAR_SIZE       \
-    254 /* varchar field size \ \
-         * used in info.c */
-
-#define OPENSEARCH_NUMERIC_MAX_PRECISION 1000
-#define OPENSEARCH_NUMERIC_MAX_SCALE 1000
-
-/* Sufficient digits to recover original float values */
-#define OPENSEARCH_REAL_DIGITS 9
-#define OPENSEARCH_DOUBLE_DIGITS 17
-
-#define INFO_INQUIRY_LEN                                                  \
-    8192                             /* this seems sufficiently big for \ \
-                                      * queries used in info.c inoue    \ \
-                                      * 2001/05/17 */
-#define LENADDR_SHIFT(x, sft) ((x) ? (SQLLEN *)((char *)(x) + (sft)) : NULL)
-
-/*	Structure to hold all the connection attributes for a specific
-    connection (used for both registry and file, DSN and DRIVER)
-*/
-typedef struct {
-    // Connection
-    char dsn[MEDIUM_REGISTRY_LEN];
-    char desc[MEDIUM_REGISTRY_LEN];
-    char drivername[MEDIUM_REGISTRY_LEN];
-    char server[MEDIUM_REGISTRY_LEN];
-    char port[SMALL_REGISTRY_LEN];
-    char response_timeout[SMALL_REGISTRY_LEN];
-    char fetch_size[SMALL_REGISTRY_LEN];
-
-    // Authentication
-    char authtype[MEDIUM_REGISTRY_LEN];
-    char username[MEDIUM_REGISTRY_LEN];
-    opensearchNAME password;
-    char region[MEDIUM_REGISTRY_LEN];
-
-    // Encryption
-    char use_ssl;
-    char verify_server;
-
-    GLOBAL_VALUES drivers; /* moved from driver's option */
-} ConnInfo;
-
-#define SUPPORT_DESCRIBE_PARAM(conninfo_) (1)
-
-int initialize_global_cs(void);
-enum {                        /* CC_conninfo_init option */
-       CLEANUP_FOR_REUSE = 1L /* reuse the info */
-       ,
-       INIT_GLOBALS = (1L << 1) /* init globals memebers */
-};
-void CC_conninfo_init(ConnInfo *conninfo, UInt4 option);
-void CC_conninfo_release(ConnInfo *conninfo);
-void CC_copy_conninfo(ConnInfo *ci, const ConnInfo *sci);
-const char *GetExeProgramName();
-
-/* Define a type for defining a constant string expression */
-#ifndef CSTR
-#define CSTR static const char *const
-#endif /* CSTR */
-
-CSTR NULL_STRING = "";
-CSTR PRINT_NULL = "(null)";
-#define OID_NAME "oid"
-#define XMIN_NAME "xmin"
-#define TABLEOID_NAME "tableoid"
-
-enum {
-    DISALLOW_UPDATABLE_CURSORS = 0, /* No cursors are updatable */
-    ALLOW_STATIC_CURSORS = 1L,      /* Static cursors are updatable */
-    ALLOW_KEYSET_DRIVEN_CURSORS =
-        (1L << 1),                     /* Keyset-driven cursors are updatable */
-    ALLOW_DYNAMIC_CURSORS = (1L << 2), /* Dynamic cursors are updatable */
-    ALLOW_BULK_OPERATIONS = (1L << 3), /* Bulk operations available */
-    SENSE_SELF_OPERATIONS = (1L << 4), /* Sense self update/delete/add */
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#include "mylog.h"
-
-#endif /* __OPENSEARCHODBC_H__ */
diff --git a/sql-odbc/src/sqlodbc/opensearch_odbc.rc b/sql-odbc/src/sqlodbc/opensearch_odbc.rc
deleted file mode 100644
index 30cf00e849..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_odbc.rc
+++ /dev/null
@@ -1,257 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Japanese (Japan) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-#pragma code_page(932)
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "#include ""version.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Japanese (Japan) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-DLG_CONFIG DIALOGEX 65, 43, 275, 250
-STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "OpenSearch ODBC Driver DSN Setup"
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    LTEXT           "Data Source Name",IDC_DSNAMETEXT,23,7,77,12,NOT WS_GROUP
-    EDITTEXT        IDC_DSNAME,108,6,120,12,ES_AUTOHSCROLL | WS_DISABLED
-    GROUPBOX        "Connection Settings",IDC_CONN_SETTINGS,7,28,261,56
-    LTEXT           "Host",IDC_STATIC,20,46,20,8,NOT WS_GROUP
-    EDITTEXT        IDC_SERVER,60,44,192,12,ES_AUTOHSCROLL
-    LTEXT           "&Port",IDC_STATIC,20,66,19,8
-    EDITTEXT        IDC_PORT,60,64,192,13,ES_AUTOHSCROLL
-    GROUPBOX        "Authentication Settings",IDC_AUTH_SETTINGS,7,93,260,92,BS_FLAT
-    LTEXT           "Auth",IDC_AUTH_STATIC,21,110,19,8
-    COMBOBOX        IDC_AUTHTYPE,61,108,192,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "User",IDC_USERNAME_STATIC,20,129,19,8
-    EDITTEXT        IDC_USER,61,127,191,12,ES_AUTOHSCROLL | WS_DISABLED
-    LTEXT           "Password",IDC_PASSWORD_STATIC,20,149,41,12
-    EDITTEXT        IDC_PASSWORD,61,147,191,12,ES_PASSWORD | ES_AUTOHSCROLL | WS_DISABLED
-    LTEXT           "Region",IDC_REGION_STATIC,20,170,28,8
-    EDITTEXT        IDC_REGION,61,168,191,12,ES_AUTOHSCROLL | WS_DISABLED
-    PUSHBUTTON      "Advanced Options",ID_ADVANCED_OPTIONS,21,195,111,15,WS_GROUP
-    PUSHBUTTON      "Logging Options",ID_LOG_OPTIONS,144,195,108,15,WS_GROUP
-    LTEXT           "V.N.N.N",IDC_DRIVER_VERSION,10,228,108,8
-    DEFPUSHBUTTON   "OK",IDOK,119,224,44,15,WS_GROUP
-    DEFPUSHBUTTON   "Test",IDOK2,167,224,44,15,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,215,224,44,15
-END
-
-DLG_ADVANCED_OPTIONS DIALOGEX 0, 0, 157, 113
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Advanced Options"
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    GROUPBOX        "",IDC_STATIC,12,4,133,85
-    CONTROL         "SSL",IDC_USESSL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,12,10,11
-    LTEXT           "Enable SSL",IDC_SSL_STATIC,37,14,39,8
-    CONTROL         "Host Verification",IDC_HOST_VER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,32,10,9
-    LTEXT           "Hostname Verification",IDC_HOST_VER_STATIC,37,32,71,8
-    LTEXT           "Response Timeout (s)",IDC_CONNTIMEOUT_STATIC,19,51,70,8
-    EDITTEXT        IDC_CONNTIMEOUT,96,50,43,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "OK",IDOK,49,94,44,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,98,93,47,15
-    LTEXT           "Fetch Size",IDC_FETCH_SIZE_STATIC,19,71,35,8
-    EDITTEXT        IDC_FETCH_SIZE,96,70,43,12,ES_AUTOHSCROLL
-END
-
-DLG_LOG_OPTIONS DIALOGEX 0, 0, 251, 79
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Logging Options"
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    GROUPBOX        "",IDC_STATIC,10,4,230,51
-    LTEXT           "Log Level",IDC_STATIC,22,15,31,8
-    COMBOBOX        IDC_LOG_LEVEL,71,13,149,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Log Path",IDC_STATIC,22,38,29,8
-    EDITTEXT        IDC_LOG_PATH,71,36,149,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "OK",IDOK,144,60,44,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,193,59,47,15
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    DLG_CONFIG, DIALOG
-    BEGIN
-        RIGHTMARGIN, 270
-        TOPMARGIN, 1
-        BOTTOMMARGIN, 200
-    END
-
-    DLG_ADVANCED_OPTIONS, DIALOG
-    BEGIN
-        LEFTMARGIN, 5
-        RIGHTMARGIN, 152
-        TOPMARGIN, 5
-        BOTTOMMARGIN, 108
-    END
-
-    DLG_LOG_OPTIONS, DIALOG
-    BEGIN
-        LEFTMARGIN, 5
-        RIGHTMARGIN, 246
-        TOPMARGIN, 5
-        BOTTOMMARGIN, 74
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION OPENSEARCH_DRVFILE_VERSION
- PRODUCTVERSION OPENSEARCH_DRVFILE_VERSION
- FILEFLAGSMASK 0x3L
-#ifdef _DEBUG
- FILEFLAGS 0x9L
-#else
- FILEFLAGS 0x8L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "Comments", "OpenSearch ANSI ODBC driver"
-            VALUE "CompanyName", "Amazon"
-            VALUE "FileDescription", "OpenSearch ODBC Driver (English)"
-            VALUE "FileVersion", OPENSEARCH_ODBC_VERSION
-            VALUE "InternalName", "sqlodbc"
-            VALUE "LegalCopyright", "Copyright"
-            VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation.  Microsoft? is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation."
-            VALUE "OriginalFilename", "sqlodbc.dll"
-            VALUE "ProductName", "OpenSearch"
-            VALUE "ProductVersion", OPENSEARCH_ODBC_VERSION
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// AFX_DIALOG_LAYOUT
-//
-
-DLG_CONFIG AFX_DIALOG_LAYOUT
-BEGIN
-    0
-END
-
-DLG_ADVANCED_OPTIONS AFX_DIALOG_LAYOUT
-BEGIN
-    0
-END
-
-DLG_LOG_OPTIONS AFX_DIALOG_LAYOUT
-BEGIN
-    0
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE
-BEGIN
-    IDS_AUTHTYPE_NONE       "NONE"
-    IDS_AUTHTYPE_BASIC      "BASIC"
-    IDS_AUTHTYPE_IAM        "AWS_SIGV4"
-    IDS_LOGTYPE_OFF         "LOG_OFF"
-    IDS_LOGTYPE_FATAL       "LOG_FATAL"
-    IDS_LOGTYPE_ERROR       "LOG_ERROR"
-    IDS_LOGTYPE_WARNING     "LOG_WARNING"
-    IDS_LOGTYPE_INFO        "LOG_INFO"
-    IDS_LOGTYPE_DEBUG       "LOG_DEBUG"
-    IDS_LOGTYPE_TRACE       "LOG_TRACE"
-    IDS_LOGTYPE_ALL         "LOG_ALL"
-END
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/sql-odbc/src/sqlodbc/opensearch_parse_result.cpp b/sql-odbc/src/sqlodbc/opensearch_parse_result.cpp
deleted file mode 100644
index aa77d718b9..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_parse_result.cpp
+++ /dev/null
@@ -1,461 +0,0 @@
-#include "opensearch_parse_result.h"
-
-#include <unordered_map>
-
-#include "opensearch_types.h"
-#include "opensearch_helper.h"
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#endif  // __APPLE__
-#include "rabbit.hpp"
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-#include "statement.h"
-
-typedef std::vector< std::pair< std::string, OID > > schema_type;
-typedef rabbit::array json_arr;
-typedef json_arr::iterator::result_type json_arr_it;
-
-bool _CC_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                       const char *cursor,
-                               OpenSearchResult &opensearch_result);
-bool _CC_Metadata_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                                const char *cursor,
-                                        OpenSearchResult &opensearch_result);
-bool _CC_No_Metadata_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                                   const char *cursor,
-                                           OpenSearchResult &opensearch_result);
-void GetSchemaInfo(schema_type &schema, json_doc &opensearch_result_doc);
-bool AssignColumnHeaders(const schema_type &doc_schema, QResultClass *q_res,
-                         const OpenSearchResult &opensearch_result);
-bool AssignTableData(json_doc &opensearch_result_doc, QResultClass *q_res,
-                     size_t doc_schema_size, ColumnInfoClass &fields);
-bool AssignRowData(const json_arr_it &row, size_t row_schema_size,
-                   QResultClass *q_res, ColumnInfoClass &fields,
-                   const size_t &row_size);
-void UpdateResultFields(QResultClass *q_res, const ConnectionClass *conn,
-                        const SQLULEN starting_cached_rows, const char *cursor,
-                        std::string &command_type);
-bool QR_prepare_for_tupledata(QResultClass *q_res);
-void SetError(const char *err);
-void ClearError();
-
-// clang-format off
-// Not all of these are being used at the moment, but these are the keywords in the json
-static const std::string JSON_KW_SCHEMA = "schema";
-static const std::string JSON_KW_NAME = "name";
-static const std::string JSON_KW_TYPE = "type";
-static const std::string JSON_KW_TOTAL = "total";
-static const std::string JSON_KW_SIZE = "size";
-static const std::string JSON_KW_STATUS = "status";
-static const std::string JSON_KW_DATAROWS = "datarows";
-static const std::string JSON_KW_ERROR = "error";
-static const std::string JSON_KW_CURSOR = "cursor";
-
-// clang-format on
-const std::unordered_map< std::string, OID > type_to_oid_map = {
-    {OPENSEARCH_TYPE_NAME_BOOLEAN, OPENSEARCH_TYPE_BOOL},
-    {OPENSEARCH_TYPE_NAME_BYTE, OPENSEARCH_TYPE_INT2},
-    {OPENSEARCH_TYPE_NAME_SHORT, OPENSEARCH_TYPE_INT2},
-    {OPENSEARCH_TYPE_NAME_INTEGER, OPENSEARCH_TYPE_INT4},
-    {OPENSEARCH_TYPE_NAME_LONG, OPENSEARCH_TYPE_INT8},
-    {OPENSEARCH_TYPE_NAME_HALF_FLOAT, OPENSEARCH_TYPE_FLOAT4},
-    {OPENSEARCH_TYPE_NAME_FLOAT, OPENSEARCH_TYPE_FLOAT4},
-    {OPENSEARCH_TYPE_NAME_DOUBLE, OPENSEARCH_TYPE_FLOAT8},
-    {OPENSEARCH_TYPE_NAME_SCALED_FLOAT, OPENSEARCH_TYPE_FLOAT8},
-    {OPENSEARCH_TYPE_NAME_KEYWORD, OPENSEARCH_TYPE_VARCHAR},
-    {OPENSEARCH_TYPE_NAME_TEXT, OPENSEARCH_TYPE_VARCHAR},
-    {OPENSEARCH_TYPE_NAME_DATE, OPENSEARCH_TYPE_TIMESTAMP},
-    {OPENSEARCH_TYPE_NAME_OBJECT, OPENSEARCH_TYPE_VARCHAR},
-    {OPENSEARCH_TYPE_NAME_VARCHAR, OPENSEARCH_TYPE_VARCHAR},
-    {OPENSEARCH_TYPE_NAME_DATE, OPENSEARCH_TYPE_DATE}};
-
-#define OPENSEARCH_VARCHAR_SIZE (-2)
-const std::unordered_map< OID, int16_t > oid_to_size_map = {
-    {OPENSEARCH_TYPE_BOOL, (int16_t)1},
-    {OPENSEARCH_TYPE_INT2, (int16_t)2},
-    {OPENSEARCH_TYPE_INT4, (int16_t)4},
-    {OPENSEARCH_TYPE_INT8, (int16_t)8},
-    {OPENSEARCH_TYPE_FLOAT4, (int16_t)4},
-    {OPENSEARCH_TYPE_FLOAT8, (int16_t)8},
-    {OPENSEARCH_TYPE_VARCHAR, (int16_t)OPENSEARCH_VARCHAR_SIZE},
-    {OPENSEARCH_TYPE_DATE, (int16_t)OPENSEARCH_VARCHAR_SIZE},
-    {OPENSEARCH_TYPE_TIMESTAMP, (int16_t)1}};
-
-// Using global variable here so that the error message can be propagated
-// without going otu of scope
-std::string error_msg;
-
-void SetError(const char *err) {
-    error_msg = err;
-}
-void ClearError() {
-    error_msg = "";
-}
-std::string GetResultParserError() {
-    return error_msg;
-}
-
-BOOL CC_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                      const char *cursor,
-                              OpenSearchResult &opensearch_result) {
-    ClearError();
-    return _CC_from_OpenSearchResult(q_res, conn, cursor, opensearch_result) ? TRUE : FALSE;
-}
-
-BOOL CC_Metadata_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                               const char *cursor,
-                                       OpenSearchResult &opensearch_result) {
-    ClearError();
-    return _CC_Metadata_from_OpenSearchResult(q_res, conn, cursor,
-                                              opensearch_result) ? TRUE : FALSE;
-}
-
-BOOL CC_No_Metadata_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                                  const char *cursor,
-                                          OpenSearchResult &opensearch_result) {
-    ClearError();
-    return _CC_No_Metadata_from_OpenSearchResult(q_res, conn, cursor,
-                                                 opensearch_result)
-               ? TRUE
-               : FALSE;
-}
-
-BOOL CC_Append_Table_Data(json_doc &opensearch_result_doc, QResultClass *q_res,
-                          size_t doc_schema_size, ColumnInfoClass &fields) {
-    ClearError();
-    return AssignTableData(opensearch_result_doc, q_res, doc_schema_size, fields)
-               ? TRUE
-               : FALSE;
-}
-
-bool _CC_No_Metadata_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                                   const char *cursor,
-    OpenSearchResult &opensearch_result) {
-    // Note - NULL conn and/or cursor is valid
-    if (q_res == NULL)
-        return false;
-
-    try {
-        schema_type doc_schema;
-        GetSchemaInfo(doc_schema, opensearch_result.opensearch_result_doc);
-
-        SQLULEN starting_cached_rows = q_res->num_cached_rows;
-
-        // Assign table data and column headers
-        if (!AssignTableData(opensearch_result.opensearch_result_doc, q_res, doc_schema.size(),
-                             *(q_res->fields)))
-            return false;
-
-        // Update fields of QResult to reflect data written
-        UpdateResultFields(q_res, conn, starting_cached_rows, cursor,
-                           opensearch_result.command_type);
-
-        // Return true (success)
-        return true;
-    } catch (const rabbit::type_mismatch &e) {
-        SetError(e.what());
-    } catch (const rabbit::parse_error &e) {
-        SetError(e.what());
-    } catch (const std::exception &e) {
-        SetError(e.what());
-    } catch (...) {
-        SetError("Unknown exception thrown in _CC_No_Metadata_from_OpenSearchResult.");
-    }
-
-    // Exception occurred, return false (error)
-    return false;
-}
-
-bool _CC_Metadata_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                                const char *cursor,
-                                        OpenSearchResult &opensearch_result) {
-    // Note - NULL conn and/or cursor is valid
-    if (q_res == NULL)
-        return false;
-
-    QR_set_conn(q_res, conn);
-    try {
-        schema_type doc_schema;
-        GetSchemaInfo(doc_schema, opensearch_result.opensearch_result_doc);
-
-        // Assign table data and column headers
-        if (!AssignColumnHeaders(doc_schema, q_res, opensearch_result))
-            return false;
-
-        // Set command type and cursor name
-        QR_set_command(q_res, opensearch_result.command_type.c_str());
-        QR_set_cursor(q_res, cursor);
-        if (cursor == NULL)
-            QR_set_reached_eof(q_res);
-
-        // Return true (success)
-        return true;
-    } catch (const rabbit::type_mismatch &e) {
-        SetError(e.what());
-    } catch (const rabbit::parse_error &e) {
-        SetError(e.what());
-    } catch (const std::exception &e) {
-        SetError(e.what());
-    } catch (...) {
-        SetError("Unknown exception thrown in _CC_Metadata_from_OpenSearchResult.");
-    }
-
-    // Exception occurred, return false (error)
-    return false;
-}
-
-bool _CC_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                       const char *cursor,
-                               OpenSearchResult &opensearch_result) {
-    // Note - NULL conn and/or cursor is valid
-    if (q_res == NULL)
-        return false;
-
-    QR_set_conn(q_res, conn);
-    try {
-        schema_type doc_schema;
-        GetSchemaInfo(doc_schema, opensearch_result.opensearch_result_doc);
-        SQLULEN starting_cached_rows = q_res->num_cached_rows;
-
-        // Assign table data and column headers
-        if ((!AssignColumnHeaders(doc_schema, q_res, opensearch_result))
-            || (!AssignTableData(opensearch_result.opensearch_result_doc, q_res, doc_schema.size(),
-                                 *(q_res->fields))))
-            return false;
-
-        // Update fields of QResult to reflect data written
-        UpdateResultFields(q_res, conn, starting_cached_rows, cursor,
-                           opensearch_result.command_type);
-
-        // Return true (success)
-        return true;
-    } catch (const rabbit::type_mismatch &e) {
-        SetError(e.what());
-    } catch (const rabbit::parse_error &e) {
-        SetError(e.what());
-    } catch (const std::exception &e) {
-        SetError(e.what());
-    } catch (...) {
-        SetError("Unknown exception thrown in CC_from_OpenSearchResult.");
-    }
-
-    // Exception occurred, return false (error)
-    return false;
-}
-
-void GetSchemaInfo(schema_type &schema, json_doc &opensearch_result_doc) {
-    json_arr schema_arr = opensearch_result_doc[JSON_KW_SCHEMA];
-    for (auto it : schema_arr) {
-        auto mapped_oid = type_to_oid_map.find(it[JSON_KW_TYPE].as_string());
-        OID type_oid = (mapped_oid == type_to_oid_map.end())
-                           ? SQL_WVARCHAR
-                           : mapped_oid->second;
-        schema.push_back(
-            std::make_pair(it[JSON_KW_NAME].as_string(), type_oid));
-    }
-}
-
-bool AssignColumnHeaders(const schema_type &doc_schema, QResultClass *q_res,
-                         const OpenSearchResult &opensearch_result) {
-    // Verify server_info size matches the schema size
-    if (opensearch_result.column_info.size() != doc_schema.size())
-        return false;
-
-    // Allocte memory for column fields
-    QR_set_num_fields(q_res, (uint16_t)opensearch_result.column_info.size());
-    if (QR_get_fields(q_res)->coli_array == NULL)
-        return false;
-
-    // Assign column info
-    for (size_t i = 0; i < doc_schema.size(); i++) {
-        auto type_size_ptr = oid_to_size_map.find(doc_schema[i].second);
-        int16_t type_size = (type_size_ptr == oid_to_size_map.end())
-                                ? OPENSEARCH_ADT_UNSET
-                                : type_size_ptr->second;
-        CI_set_field_info(QR_get_fields(q_res), (int)i,
-                          doc_schema[i].first.c_str(), doc_schema[i].second,
-                          type_size,
-                          opensearch_result.column_info[i].length_of_str,
-                          opensearch_result.column_info[i].relation_id,
-                          opensearch_result.column_info[i].attribute_number);
-        QR_set_rstatus(q_res, PORES_FIELDS_OK);
-    }
-    q_res->num_fields = CI_get_num_fields(QR_get_fields(q_res));
-
-    return true;
-}
-
-// Responsible for looping through rows, allocating tuples and passing rows for
-// assignment
-bool AssignTableData(json_doc &opensearch_result_doc, QResultClass *q_res,
-                     size_t doc_schema_size, ColumnInfoClass &fields) {
-    // Assign row info
-    json_arr opensearch_result_data = opensearch_result_doc[JSON_KW_DATAROWS];
-    if (opensearch_result_data.size() == 0)
-        return true;
-
-    // Figure out number of columns are in a row and make schema is not bigger
-    // than it
-    size_t row_size = std::distance(opensearch_result_data.begin()->value_begin(),
-                      opensearch_result_data.begin()->value_end());
-    if (row_size < doc_schema_size) {
-        return false;
-    }
-    for (auto it : opensearch_result_data) {
-        // Setup memory to receive tuple
-        if (!QR_prepare_for_tupledata(q_res))
-            return false;
-
-        // Assign row data
-        if (!AssignRowData(it, doc_schema_size, q_res, fields, row_size))
-            return false;
-    }
-
-    return true;
-}
-
-// Responsible for assigning row data to tuples
-bool AssignRowData(const json_arr_it &row, size_t row_schema_size,
-                   QResultClass *q_res, ColumnInfoClass &fields,
-                   const size_t &row_size) {
-    TupleField *tuple =
-        q_res->backend_tuples + (q_res->num_cached_rows * row_size);
-
-    // Setup keyset if present
-    KeySet *ks = NULL;
-    if (QR_haskeyset(q_res)) {
-        ks = q_res->keyset + q_res->num_cached_keys;
-        ks->status = 0;
-    }
-
-    // Loop through and assign data
-    size_t i = 0;
-    for (auto row_column = row.value_begin(); i < row_schema_size;
-         ++row_column, ++i) {
-        if (row_column->is_null()) {
-            tuple[i].len = SQL_NULL_DATA;
-            tuple[i].value = NULL;
-        } else {
-            // Copy string over to tuple
-            const std::string data = row_column->str();
-            tuple[i].len = static_cast< int >(data.length());
-            QR_MALLOC_return_with_error(
-                tuple[i].value, char, data.length() + 1, q_res,
-                "Out of memory in allocating item buffer.", false);
-            strcpy((char *)tuple[i].value, data.c_str());
-
-            // If data length exceeds current display size, set display size
-            if (fields.coli_array[i].display_size < tuple[i].len)
-                fields.coli_array[i].display_size = tuple[i].len;
-        }
-    }
-
-    // If there are more rows than schema suggests, we have Keyset data
-    if (row_size > row_schema_size) {
-        if (ks == NULL) {
-            QR_set_rstatus(q_res, PORES_INTERNAL_ERROR);
-            QR_set_message(q_res,
-                           "Keyset was NULL, but Keyset data was expected.");
-            return false;
-        }
-
-        auto row_column = row.value_begin() + row_schema_size;
-        if (sscanf(row_column->str().c_str(), "(%u,%hu)", &ks->blocknum,
-                   &ks->offset)
-            != 2) {
-            QR_set_rstatus(q_res, PORES_INTERNAL_ERROR);
-            QR_set_message(q_res, "Failed to assign Keyset.");
-            return false;
-        }
-        row_column++;
-        ks->oid = std::stoul(row_column->str(), nullptr, 10);
-    }
-
-    // Increment relevant data
-    q_res->cursTuple++;
-    if (q_res->num_fields > 0)
-        QR_inc_num_cache(q_res);
-    else if (QR_haskeyset(q_res))
-        q_res->num_cached_keys++;
-
-    if ((SQLULEN)q_res->cursTuple >= q_res->num_total_read)
-        q_res->num_total_read = q_res->cursTuple + 1;
-    return true;
-}
-
-void UpdateResultFields(QResultClass *q_res, const ConnectionClass *conn,
-                        const SQLULEN starting_cached_rows, const char *cursor,
-                        std::string &command_type) {
-    // Adjust total read
-    if (!QR_once_reached_eof(q_res)
-        && q_res->cursTuple >= (Int4)q_res->num_total_read)
-        q_res->num_total_read = q_res->cursTuple + 1;
-
-    // Adjust eof and tuple cursor
-    if (q_res->num_cached_rows - starting_cached_rows < q_res->cmd_fetch_size) {
-        QR_set_reached_eof(q_res);
-        if (q_res->cursTuple < (Int4)q_res->num_total_read)
-            q_res->cursTuple = q_res->num_total_read;
-    }
-
-    // Handle NULL connection
-    if (conn != NULL) {
-        q_res->fetch_number = static_cast< SQLLEN >(0);
-        QR_set_rowstart_in_cache(q_res, 0);
-        q_res->key_base = 0;
-    }
-
-    // Set command type and cursor name
-    QR_set_command(q_res, command_type.c_str());
-    QR_set_cursor(q_res, cursor);
-    if (cursor == NULL)
-        QR_set_reached_eof(q_res);
-
-    // Set flags, adjust pointers, and return true (success)
-    q_res->dataFilled = true;
-    q_res->tupleField =
-        q_res->backend_tuples + (q_res->fetch_number * q_res->num_fields);
-    QR_set_rstatus(q_res, PORES_TUPLES_OK);
-}
-
-bool QR_prepare_for_tupledata(QResultClass *q_res) {
-    if (QR_get_cursor(q_res)) {
-        return true;
-    }
-
-    // If total tuples > allocated tuples, need to reallocate
-    if (q_res->num_fields > 0
-        && QR_get_num_total_tuples(q_res) >= q_res->count_backend_allocated) {
-        SQLLEN tuple_size = (q_res->count_backend_allocated < 1)
-                                ? TUPLE_MALLOC_INC
-                                : q_res->count_backend_allocated * 2;
-
-        // Will return false if allocation fails
-        QR_REALLOC_return_with_error(
-            q_res->backend_tuples, TupleField,
-            tuple_size * q_res->num_fields * sizeof(TupleField), q_res,
-            "Out of memory while reading tuples.", false);
-        q_res->count_backend_allocated = tuple_size;
-    }
-
-    // If total keyset > allocated keyset, need to reallocate
-    if (QR_haskeyset(q_res)
-        && q_res->num_cached_keys >= q_res->count_keyset_allocated) {
-        SQLLEN keyset_size = (q_res->count_keyset_allocated < 1)
-                                 ? TUPLE_MALLOC_INC
-                                 : q_res->count_keyset_allocated * 2;
-
-        // Will return false if macro fails
-        QR_REALLOC_return_with_error(
-            q_res->keyset, KeySet, sizeof(KeySet) * keyset_size, q_res,
-            "Out of memory while allocating keyset", false);
-        memset(&q_res->keyset[q_res->count_keyset_allocated], 0,
-               (keyset_size - q_res->count_keyset_allocated) * sizeof(KeySet));
-        q_res->count_keyset_allocated = keyset_size;
-    }
-
-    return true;
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_parse_result.h b/sql-odbc/src/sqlodbc/opensearch_parse_result.h
deleted file mode 100644
index b74f180901..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_parse_result.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _OPENSEARCH_PARSE_RESULT_H_
-#define _OPENSEARCH_PARSE_RESULT_H_
-#include "qresult.h"
-
-#ifdef __cplusplus
-std::string GetResultParserError();
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-#include "opensearch_helper.h"
-typedef rabbit::document json_doc;
-// const char* is used instead of string for the cursor, because a NULL cursor
-// is sometimes used Cannot pass q_res as reference because it breaks qresult.h
-// macros that expect to use -> operator
-BOOL CC_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                      const char *cursor,
-                              OpenSearchResult &opensearch_result);
-BOOL CC_Metadata_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                               const char *cursor,
-                                       OpenSearchResult &opensearch_result);
-BOOL CC_No_Metadata_from_OpenSearchResult(QResultClass *q_res, ConnectionClass *conn,
-                                  const char *cursor,
-                                          OpenSearchResult &opensearch_result);
-BOOL CC_Append_Table_Data(json_doc &opensearch_result_doc, QResultClass *q_res,
-                          size_t doc_schema_size, ColumnInfoClass &fields);
-#endif
-#endif
diff --git a/sql-odbc/src/sqlodbc/opensearch_result_queue.cpp b/sql-odbc/src/sqlodbc/opensearch_result_queue.cpp
deleted file mode 100644
index dc6d3ddd7a..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_result_queue.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "opensearch_result_queue.h"
-
-#include "opensearch_types.h"
-
-OpenSearchResultQueue::OpenSearchResultQueue(unsigned int capacity)
-    : m_push_semaphore(capacity, capacity),
-      m_pop_semaphore(0, capacity) {
-}
-
-OpenSearchResultQueue::~OpenSearchResultQueue() {
-    while (!m_queue.empty()) {
-        delete m_queue.front();
-        m_queue.pop();
-    }
-}
-
-void OpenSearchResultQueue::clear() {
-    std::scoped_lock lock(m_queue_mutex);
-    while (!m_queue.empty()) {
-        delete m_queue.front();
-        m_queue.pop();
-        m_push_semaphore.release();
-        m_pop_semaphore.lock();
-    }
-}
-
-bool OpenSearchResultQueue::pop(unsigned int timeout_ms, OpenSearchResult*& result) {
-    if (m_pop_semaphore.try_lock_for(timeout_ms)) {
-        std::scoped_lock lock(m_queue_mutex);
-        result = m_queue.front();
-        m_queue.pop();
-        m_push_semaphore.release();
-        return true;
-    }
-
-    return false;
-}
-
-bool OpenSearchResultQueue::push(unsigned int timeout_ms, OpenSearchResult* result) {
-    if (m_push_semaphore.try_lock_for(timeout_ms)) {
-        std::scoped_lock lock(m_queue_mutex);
-        m_queue.push(result);
-        m_pop_semaphore.release();
-        return true;
-    }
-
-    return false;
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_result_queue.h b/sql-odbc/src/sqlodbc/opensearch_result_queue.h
deleted file mode 100644
index fef33da401..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_result_queue.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef OPENSEARCH_RESULT_QUEUE
-#define OPENSEARCH_RESULT_QUEUE
-
-#include <mutex>
-#include <queue>
-
-#include "opensearch_semaphore.h"
-
-#define QUEUE_TIMEOUT 20 // milliseconds
-
-struct OpenSearchResult;
-
-class OpenSearchResultQueue {
-    public:
-        OpenSearchResultQueue(unsigned int capacity);
-        ~OpenSearchResultQueue();
-
-        void clear();
-        bool pop(unsigned int timeout_ms, OpenSearchResult*& result);
-        bool push(unsigned int timeout_ms, OpenSearchResult* result);
-
-    private:
-        std::queue< OpenSearchResult*> m_queue;
-        std::mutex m_queue_mutex;
-        opensearch_semaphore m_push_semaphore;
-        opensearch_semaphore m_pop_semaphore;
-};
-
-#endif
diff --git a/sql-odbc/src/sqlodbc/opensearch_semaphore.cpp b/sql-odbc/src/sqlodbc/opensearch_semaphore.cpp
deleted file mode 100644
index c35ac77461..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_semaphore.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "opensearch_semaphore.h"
-
-#include <string>
-
-#ifdef WIN32
-namespace {
-HANDLE createSemaphore(unsigned int initial, unsigned int capacity) {
-    HANDLE semaphore = NULL;
-    std::string semName;
-    while (NULL == semaphore) {
-        semName = "es_sem_" + std::to_string(rand() * 1000);
-        semaphore = CreateSemaphore(NULL, initial, capacity, semName.c_str());
-    }
-
-    return semaphore;
-}
-}  // namespace
-#else
-#include <time.h>
-#endif
-
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#endif  // __APPLE__
-opensearch_semaphore::opensearch_semaphore(unsigned int initial, unsigned int capacity)
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-    :
-#ifdef WIN32
-      m_semaphore(createSemaphore(initial, capacity))
-#elif defined(__APPLE__)
-      m_semaphore(dispatch_semaphore_create(initial))
-#endif
-{
-#if !defined(WIN32) && !defined(__APPLE__)
-    sem_init(&m_semaphore, 0, capacity);
-#endif
-}
-
-opensearch_semaphore::~opensearch_semaphore() {
-#ifdef WIN32
-    CloseHandle(m_semaphore);
-#elif defined(__APPLE__)
-#else
-    sem_destroy(&m_semaphore);
-#endif
-}
-
-void opensearch_semaphore::lock() {
-#ifdef WIN32
-    WaitForSingleObject(m_semaphore, INFINITE);
-#elif defined(__APPLE__)
-    dispatch_semaphore_wait(m_semaphore, DISPATCH_TIME_FOREVER);
-#else
-    sem_wait(&m_semaphore);
-#endif
-}
-
-void opensearch_semaphore::release() {
-#ifdef WIN32
-    ReleaseSemaphore(m_semaphore, 1, NULL);
-#elif defined(__APPLE__)
-    dispatch_semaphore_signal(m_semaphore);
-#else
-    sem_post(&m_semaphore);
-#endif
-}
-
-bool opensearch_semaphore::try_lock_for(unsigned int timeout_ms) {
-#ifdef WIN32
-    return WaitForSingleObject(m_semaphore, timeout_ms) == WAIT_OBJECT_0;
-#elif defined(__APPLE__)
-    return 0
-           == dispatch_semaphore_wait(
-               m_semaphore, dispatch_time(DISPATCH_TIME_NOW,
-                                          static_cast< int64_t >(
-                                              timeout_ms * NSEC_PER_MSEC)));
-#else
-    struct timespec ts;
-    if (-1 == clock_gettime(CLOCK_REALTIME, &ts)) {
-        return false;
-    }
-
-    ts.tv_nsec += timeout_ms * 1000000;
-    return 0 == sem_timedwait(&m_semaphore & ts);
-#endif
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_semaphore.h b/sql-odbc/src/sqlodbc/opensearch_semaphore.h
deleted file mode 100644
index a5ffdbfc0e..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_semaphore.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef OPENSEARCH_SEMAPHORE
-#define OPENSEARCH_SEMAPHORE
-
-#ifdef WIN32
-  #include <windows.h>
-#elif defined(__APPLE__)
-  #include <dispatch/dispatch.h>
-#else 
-  #include <semaphore.h>
-#endif
-
-class opensearch_semaphore {
-    public:
-     opensearch_semaphore(unsigned int initial, unsigned int capacity);
-        ~opensearch_semaphore();
-
-        void lock();
-        void release();
-        bool try_lock_for(unsigned int timeout_ms);
-
-    private:
-#ifdef WIN32
-        HANDLE m_semaphore;
-#elif defined(__APPLE__)
-        dispatch_semaphore_t m_semaphore;
-#else 
-        sem_t m_semaphore;
-#endif
-};
-
-#endif
diff --git a/sql-odbc/src/sqlodbc/opensearch_statement.cpp b/sql-odbc/src/sqlodbc/opensearch_statement.cpp
deleted file mode 100644
index 94a91d0f77..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_statement.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-#include "opensearch_statement.h"
-
-#include "environ.h"  // Critical section for statment
-#include "misc.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_helper.h"
-#include "statement.h"
-
-extern "C" void *common_cs;
-
-RETCODE ExecuteStatement(StatementClass *stmt, BOOL commit) {
-    CSTR func = "ExecuteStatement";
-    int func_cs_count = 0;
-    ConnectionClass *conn = SC_get_conn(stmt);
-    CONN_Status oldstatus = conn->status;
-
-    auto CleanUp = [&]() -> RETCODE {
-        SC_SetExecuting(stmt, FALSE);
-        CLEANUP_FUNC_CONN_CS(func_cs_count, conn);
-        if (conn->status != CONN_DOWN)
-            conn->status = oldstatus;
-        if (SC_get_errornumber(stmt) == STMT_OK)
-            return SQL_SUCCESS;
-        else if (SC_get_errornumber(stmt) < STMT_OK)
-            return SQL_SUCCESS_WITH_INFO;
-        else {
-            if (!SC_get_errormsg(stmt) || !SC_get_errormsg(stmt)[0]) {
-                if (STMT_NO_MEMORY_ERROR != SC_get_errornumber(stmt))
-                    SC_set_errormsg(stmt, "Error while executing the query");
-                SC_log_error(func, NULL, stmt);
-            }
-            return SQL_ERROR;
-        }
-    };
-
-    ENTER_INNER_CONN_CS(conn, func_cs_count);
-
-    if (conn->status == CONN_EXECUTING) {
-        SC_set_error(stmt, STMT_SEQUENCE_ERROR, "Connection is already in use.",
-                     func);
-        return CleanUp();
-    }
-
-    if (!SC_SetExecuting(stmt, TRUE)) {
-        SC_set_error(stmt, STMT_OPERATION_CANCELLED, "Cancel Request Accepted",
-                     func);
-        return CleanUp();
-    }
-
-    conn->status = CONN_EXECUTING;
-
-    QResultClass *res = SendQueryGetResult(stmt, commit);
-    if (!res) {
-        std::string es_conn_err = GetErrorMsg(SC_get_conn(stmt)->opensearchconn);
-        ConnErrorType es_err_type = GetErrorType(SC_get_conn(stmt)->opensearchconn);
-        std::string es_parse_err = GetResultParserError();
-        if (!es_conn_err.empty()) {
-            if (es_err_type == ConnErrorType::CONN_ERROR_QUERY_SYNTAX) {
-                SC_set_error(stmt, STMT_QUERY_SYNTAX_ERROR, es_conn_err.c_str(),
-                             func);
-            } else {
-                SC_set_error(stmt, STMT_NO_RESPONSE, es_conn_err.c_str(), func);
-            }
-        } else if (!es_parse_err.empty()) {
-            SC_set_error(stmt, STMT_EXEC_ERROR, es_parse_err.c_str(), func);
-        } else if (SC_get_errornumber(stmt) <= 0) {
-            SC_set_error(stmt, STMT_NO_RESPONSE,
-                         "Failed to retrieve error message from result. "
-                         "Connection may be down.",
-                         func);
-        }
-        return CleanUp();
-    }
-
-    if (CONN_DOWN != conn->status)
-        conn->status = oldstatus;
-    stmt->status = STMT_FINISHED;
-    LEAVE_INNER_CONN_CS(func_cs_count, conn);
-
-    // Check the status of the result
-    if (SC_get_errornumber(stmt) < 0) {
-        if (QR_command_successful(res))
-            SC_set_errornumber(stmt, STMT_OK);
-        else if (QR_command_nonfatal(res))
-            SC_set_errornumber(stmt, STMT_INFO_ONLY);
-        else
-            SC_set_errorinfo(stmt, res, 0);
-    }
-
-    // Set cursor before the first tuple in the list
-    stmt->currTuple = -1;
-    SC_set_current_col(stmt, static_cast< int >(stmt->currTuple));
-    SC_set_rowset_start(stmt, stmt->currTuple, FALSE);
-
-    // Only perform if query was not aborted
-    if (!QR_get_aborted(res)) {
-        // Check if result columns were obtained from query
-        for (QResultClass *tres = res; tres; tres = tres->next) {
-            Int2 numcols = QR_NumResultCols(tres);
-            if (numcols <= 0)
-                continue;
-            ARDFields *opts = SC_get_ARDF(stmt);
-            extend_column_bindings(opts, numcols);
-            if (opts->bindings)
-                break;
-
-            // Failed to allocate
-            QR_Destructor(res);
-            SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                         "Could not get enough free memory to store "
-                         "the binding information",
-                         func);
-            return CleanUp();
-        }
-    }
-
-    QResultClass *last = SC_get_Result(stmt);
-    if (last) {
-        // Statement already contains a result
-        // Append to end if this hasn't happened
-        while (last->next != NULL) {
-            if (last == res)
-                break;
-            last = last->next;
-        }
-        if (last != res)
-            last->next = res;
-    } else {
-        // Statement does not contain a result
-        // Assign directly
-        SC_set_Result(stmt, res);
-    }
-
-    // This will commit results for SQLExecDirect and will not commit
-    // results for SQLPrepare since only metadata is required for SQLPrepare
-    if (commit) {
-        GetNextResultSet(stmt);
-    }
-
-    stmt->diag_row_count = res->recent_processed_row_count;
-
-    return CleanUp();
-}
-
-SQLRETURN GetNextResultSet(StatementClass *stmt) {
-    ConnectionClass *conn = SC_get_conn(stmt);
-    QResultClass *q_res = SC_get_Result(stmt);
-    if ((q_res == NULL) && (conn == NULL)) {
-        return SQL_ERROR;
-    }
-
-    SQLSMALLINT total_columns = -1;
-    if (!SQL_SUCCEEDED(SQLNumResultCols(stmt, &total_columns))
-        || (total_columns == -1)) {
-        return SQL_ERROR;
-    }
-
-    OpenSearchResult *es_res = OpenSearchGetResult(conn->opensearchconn);
-    if (es_res != NULL) {
-        // Save server cursor id to fetch more pages later
-        if (es_res->opensearch_result_doc.has("cursor")) {
-            QR_set_server_cursor_id(
-                q_res, es_res->opensearch_result_doc["cursor"].as_string().c_str());
-        } else {
-            QR_set_server_cursor_id(q_res, NULL);
-        }
-
-        // Responsible for looping through rows, allocating tuples and
-        // appending these rows in q_result
-        CC_Append_Table_Data(es_res->opensearch_result_doc, q_res, total_columns,
-                             *(q_res->fields));
-    }
-
-    return SQL_SUCCESS;
-}
-
-RETCODE RePrepareStatement(StatementClass *stmt) {
-    CSTR func = "RePrepareStatement";
-    RETCODE result = SC_initialize_and_recycle(stmt);
-    if (result != SQL_SUCCESS)
-        return result;
-    if (!stmt->statement) {
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                     "Expected statement to be allocated.", func);
-        return SQL_ERROR;
-    }
-
-    // If an SQLPrepare was performed prior to this, but was left in the
-    // described state because an error prior to SQLExecute then set the
-    // statement to finished so it can be recycled.
-    if (stmt->status == STMT_DESCRIBED)
-        stmt->status = STMT_FINISHED;
-
-    return SQL_SUCCESS;
-}
-
-RETCODE PrepareStatement(StatementClass *stmt, const SQLCHAR *stmt_str,
-                         SQLINTEGER stmt_sz) {
-    CSTR func = "PrepareStatement";
-    RETCODE result = SC_initialize_and_recycle(stmt);
-    if (result != SQL_SUCCESS)
-        return result;
-
-    stmt->statement = make_string(stmt_str, stmt_sz, NULL, 0);
-    if (!stmt->statement) {
-        SC_set_error(stmt, STMT_NO_MEMORY_ERROR,
-                     "No memory available to store statement", func);
-        return SQL_ERROR;
-    }
-
-    // If an SQLPrepare was performed prior to this, but was left in the
-    // described state because an error prior to SQLExecute then set the
-    // statement to finished so it can be recycled.
-    if (stmt->status == STMT_DESCRIBED)
-        stmt->status = STMT_FINISHED;
-    stmt->statement_type = (short)statement_type(stmt->statement);
-
-    return SQL_SUCCESS;
-}
-
-QResultClass *SendQueryGetResult(StatementClass *stmt, BOOL commit) {
-    if (stmt == NULL)
-        return NULL;
-
-    // Allocate QResultClass
-    QResultClass *res = QR_Constructor();
-    if (res == NULL)
-        return NULL;
-
-    // Send command
-    ConnectionClass *conn = SC_get_conn(stmt);
-    if (OpenSearchExecDirect(conn->opensearchconn, stmt->statement,
-                             conn->connInfo.fetch_size)
-        != 0) {
-        QR_Destructor(res);
-        return NULL;
-    }
-    res->rstatus = PORES_COMMAND_OK;
-
-    // Get OpenSearchResult
-    OpenSearchResult *es_res = OpenSearchGetResult(conn->opensearchconn);
-    if (es_res == NULL) {
-        QR_Destructor(res);
-        return NULL;
-    }
-
-    BOOL success =
-        commit
-            ? CC_from_OpenSearchResult(res, conn, res->cursor_name, *es_res)
-            : CC_Metadata_from_OpenSearchResult(res, conn, res->cursor_name,
-                                                   *es_res);
-
-    // Convert result to QResultClass
-    if (!success) {
-        QR_Destructor(res);
-        res = NULL;
-    }
-
-    if (commit) {
-        // Deallocate OpenSearchResult
-        OpenSearchClearResult(es_res);
-        res->opensearch_result = NULL;
-    } else {
-        // Set OpenSearchResult into connection class so it can be used later
-        res->opensearch_result = es_res;
-    }
-    return res;
-}
-
-RETCODE AssignResult(StatementClass *stmt) {
-    if (stmt == NULL)
-        return SQL_ERROR;
-
-    QResultClass *res = SC_get_Result(stmt);
-    if (!res || !res->opensearch_result) {
-        return SQL_ERROR;
-    }
-
-    // Commit result to QResultClass
-    OpenSearchResult *es_res = static_cast< OpenSearchResult * >(res->opensearch_result);
-    ConnectionClass *conn = SC_get_conn(stmt);
-    if (!CC_No_Metadata_from_OpenSearchResult(res, conn, res->cursor_name,
-                                              *es_res)) {
-        QR_Destructor(res);
-        return SQL_ERROR;
-    }
-    GetNextResultSet(stmt);
-
-    // Deallocate and return result
-    OpenSearchClearResult(es_res);
-    res->opensearch_result = NULL;
-    return SQL_SUCCESS;
-}
-
-void ClearOpenSearchResult(void *opensearch_result) {
-    if (opensearch_result != NULL) {
-        OpenSearchResult *es_res = static_cast< OpenSearchResult * >(opensearch_result);
-        OpenSearchClearResult(es_res);
-    }
-}
-
-SQLRETURN OPENSEARCHAPI_Cancel(HSTMT hstmt) {
-    // Verify pointer validity and convert to StatementClass
-    if (hstmt == NULL)
-        return SQL_INVALID_HANDLE;
-    StatementClass *stmt = (StatementClass *)hstmt;
-
-    // Get execution delegate (if applicable) and initialize return code
-    StatementClass *opensearchtmt =
-        (stmt->execute_delegate == NULL) ? stmt : stmt->execute_delegate;
-    SQLRETURN ret = SQL_SUCCESS;
-
-    // Entry common critical section
-    ENTER_COMMON_CS;
-
-    // Waiting for more data from SQLParamData/SQLPutData - cancel statement
-    if (opensearchtmt->data_at_exec >= 0) {
-        // Enter statement critical section
-        ENTER_STMT_CS(stmt);
-
-        // Clear info and cancel need data
-        SC_clear_error(stmt);
-        opensearchtmt->data_at_exec = -1;
-        opensearchtmt->put_data = FALSE;
-        cancelNeedDataState(opensearchtmt);
-
-        // Leave statement critical section
-        LEAVE_STMT_CS(stmt);
-    }
-
-    // Leave common critical section
-    LEAVE_COMMON_CS;
-
-    return ret;
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_statement.h b/sql-odbc/src/sqlodbc/opensearch_statement.h
deleted file mode 100644
index 620e0802e1..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_statement.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _OPENSEARCH_STATEMENT_H_
-#define _OPENSEARCH_STATEMENT_H_
-
-#include "opensearch_parse_result.h"
-#include "qresult.h"
-#include "statement.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-RETCODE RePrepareStatement(StatementClass *stmt);
-RETCODE PrepareStatement(StatementClass* stmt, const SQLCHAR *stmt_str, SQLINTEGER stmt_sz);
-RETCODE ExecuteStatement(StatementClass *stmt, BOOL commit);
-QResultClass *SendQueryGetResult(StatementClass *stmt, BOOL commit);
-RETCODE AssignResult(StatementClass *stmt);
-SQLRETURN OPENSEARCHAPI_Cancel(HSTMT hstmt);
-SQLRETURN GetNextResultSet(StatementClass *stmt);
-void ClearOpenSearchResult(void *opensearch_result);
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/sql-odbc/src/sqlodbc/opensearch_types.c b/sql-odbc/src/sqlodbc/opensearch_types.c
deleted file mode 100644
index 8f5107b715..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_types.c
+++ /dev/null
@@ -1,1515 +0,0 @@
-#include "opensearch_types.h"
-
-#include "dlg_specific.h"
-#include "environ.h"
-#include "opensearch_connection.h"
-#include "qresult.h"
-#include "statement.h"
-#ifndef WIN32
-#include <limits.h>
-#endif
-
-#define EXPERIMENTAL_CURRENTLY
-
-SQLSMALLINT ansi_to_wtype(const ConnectionClass *self, SQLSMALLINT ansitype) {
-#ifndef UNICODE_SUPPORT
-    return ansitype;
-#else
-    if (!ALLOW_WCHAR(self))
-        return ansitype;
-    switch (ansitype) {
-        case SQL_CHAR:
-            return SQL_WCHAR;
-        case SQL_VARCHAR:
-            return SQL_WVARCHAR;
-        case SQL_LONGVARCHAR:
-            return SQL_WLONGVARCHAR;
-    }
-    return ansitype;
-#endif /* UNICODE_SUPPORT */
-}
-
-/*	These are NOW the SQL Types reported in SQLGetTypeInfo.  */
-SQLSMALLINT sqlTypes[] = {
-    SQL_BIGINT,
-    /* SQL_BINARY, -- Commented out because VarBinary is more correct. */
-    SQL_BIT, SQL_CHAR, SQL_TYPE_DATE, SQL_DATE, SQL_DECIMAL, SQL_DOUBLE,
-    SQL_FLOAT, SQL_INTEGER, SQL_LONGVARBINARY, SQL_LONGVARCHAR, SQL_NUMERIC,
-    SQL_REAL, SQL_SMALLINT, SQL_TYPE_TIME, SQL_TYPE_TIMESTAMP, SQL_TIME,
-    SQL_TIMESTAMP, SQL_TINYINT, SQL_VARBINARY, SQL_VARCHAR,
-#ifdef UNICODE_SUPPORT
-    SQL_WCHAR, SQL_WVARCHAR, SQL_WLONGVARCHAR,
-#endif /* UNICODE_SUPPORT */
-    SQL_GUID,
-/* AFAIK SQL_INTERVAL types cause troubles in some spplications */
-#ifdef ES_INTERVAL_AS_SQL_INTERVAL
-    SQL_INTERVAL_MONTH, SQL_INTERVAL_YEAR, SQL_INTERVAL_YEAR_TO_MONTH,
-    SQL_INTERVAL_DAY, SQL_INTERVAL_HOUR, SQL_INTERVAL_MINUTE,
-    SQL_INTERVAL_SECOND, SQL_INTERVAL_DAY_TO_HOUR, SQL_INTERVAL_DAY_TO_MINUTE,
-    SQL_INTERVAL_DAY_TO_SECOND, SQL_INTERVAL_HOUR_TO_MINUTE,
-    SQL_INTERVAL_HOUR_TO_SECOND, SQL_INTERVAL_MINUTE_TO_SECOND,
-#endif /* ES_INTERVAL_AS_SQL_INTERVAL */
-    0};
-
-#ifdef ODBCINT64
-#define ALLOWED_C_BIGINT SQL_C_SBIGINT
-/* #define	ALLOWED_C_BIGINT	SQL_C_CHAR */ /* Delphi should be either ? */
-#else
-#define ALLOWED_C_BIGINT SQL_C_CHAR
-#endif
-
-OID opensearch_true_type(const ConnectionClass *conn, OID type, OID basetype) {
-    if (0 == basetype)
-        return type;
-    else if (0 == type)
-        return basetype;
-    else if (type == (OID)conn->lobj_type)
-        return type;
-    return basetype;
-}
-
-#define MONTH_BIT (1 << 17)
-#define YEAR_BIT (1 << 18)
-#define DAY_BIT (1 << 19)
-#define HOUR_BIT (1 << 26)
-#define MINUTE_BIT (1 << 27)
-#define SECOND_BIT (1 << 28)
-
-static Int4 getCharColumnSizeX(const ConnectionClass *conn, OID type,
-                               int atttypmod, int adtsize_or_longestlen,
-                               int handle_unknown_size_as) {
-    int p = -1, maxsize;
-    MYLOG(OPENSEARCH_TRACE,
-          "entering type=%d, atttypmod=%d, adtsize_or=%d, unknown = %d\n", type,
-          atttypmod, adtsize_or_longestlen, handle_unknown_size_as);
-
-    maxsize = MAX_VARCHAR_SIZE;
-#ifdef UNICODE_SUPPORT
-    if (CC_is_in_unicode_driver(conn) && isSqlServr() && maxsize > 4000)
-        maxsize = 4000;
-#endif /* UNICODE_SUPPORT */
-
-    if (maxsize == TEXT_FIELD_SIZE + 1) /* magic length for testing */
-        maxsize = 0;
-
-    /*
-     * Static ColumnSize (i.e., the Maximum ColumnSize of the datatype) This
-     * has nothing to do with a result set.
-     */
-    MYLOG(OPENSEARCH_DEBUG, "!!! atttypmod  < 0 ?\n");
-    if (atttypmod < 0 && adtsize_or_longestlen < 0)
-        return maxsize;
-
-    MYLOG(OPENSEARCH_DEBUG, "!!! adtsize_or_logngest=%d\n", adtsize_or_longestlen);
-    p = adtsize_or_longestlen; /* longest */
-                               /*
-                                * Catalog Result Sets -- use assigned column width (i.e., from
-                                * set_tuplefield_string)
-                                */
-    MYLOG(OPENSEARCH_DEBUG, "!!! catalog_result=%d\n", handle_unknown_size_as);
-    if (UNKNOWNS_AS_LONGEST == handle_unknown_size_as) {
-        MYLOG(OPENSEARCH_DEBUG, "LONGEST: p = %d\n", p);
-        if (p > 0 && (atttypmod < 0 || atttypmod > p))
-            return p;
-    }
-    if (TYPE_MAY_BE_ARRAY(type)) {
-        if (p > 0)
-            return p;
-        return maxsize;
-    }
-
-    /* Size is unknown -- handle according to parameter */
-    if (atttypmod > 0) /* maybe the length is known */
-    {
-        return atttypmod;
-    }
-
-    /* The type is really unknown */
-    switch (handle_unknown_size_as) {
-        case UNKNOWNS_AS_DONTKNOW:
-            return -1;
-        case UNKNOWNS_AS_LONGEST:
-        case UNKNOWNS_AS_MAX:
-            break;
-        default:
-            return -1;
-    }
-    if (maxsize <= 0)
-        return maxsize;
-    switch (type) {
-        case OPENSEARCH_TYPE_BPCHAR:
-        case OPENSEARCH_TYPE_VARCHAR:
-        case OPENSEARCH_TYPE_TEXT:
-            return maxsize;
-    }
-
-    if (p > maxsize)
-        maxsize = p;
-    return maxsize;
-}
-
-/*
- *	Specify when handle_unknown_size_as parameter is unused
- */
-#define UNUSED_HANDLE_UNKNOWN_SIZE_AS (-2)
-
-static SQLSMALLINT getNumericDecimalDigitsX(const ConnectionClass *conn,
-                                            OID type, int atttypmod,
-                                            int adtsize_or_longest,
-                                            int handle_unknown_size_as) {
-    UNUSED(conn, handle_unknown_size_as);
-    SQLSMALLINT default_decimal_digits = 6;
-
-    MYLOG(OPENSEARCH_TRACE, "entering type=%d, atttypmod=%d\n", type, atttypmod);
-
-    if (atttypmod < 0 && adtsize_or_longest < 0)
-        return default_decimal_digits;
-
-    if (atttypmod > -1)
-        return (SQLSMALLINT)(atttypmod & 0xffff);
-    if (adtsize_or_longest <= 0)
-        return default_decimal_digits;
-    adtsize_or_longest >>= 16; /* extract the scale part */
-    return (SQLSMALLINT)adtsize_or_longest;
-}
-
-static Int4 /* OpenSearch restritiction */
-getNumericColumnSizeX(const ConnectionClass *conn, OID type, int atttypmod,
-                      int adtsize_or_longest, int handle_unknown_size_as) {
-    UNUSED(conn);
-    Int4 default_column_size = 28;
-    MYLOG(OPENSEARCH_TRACE, "entering type=%d, typmod=%d\n", type, atttypmod);
-
-    if (atttypmod > -1)
-        return (atttypmod >> 16) & 0xffff;
-    switch (handle_unknown_size_as) {
-        case UNKNOWNS_AS_DONTKNOW:
-            return SQL_NO_TOTAL;
-    }
-    if (adtsize_or_longest <= 0)
-        return default_column_size;
-    adtsize_or_longest %= (1 << 16); /* extract the precision part */
-    switch (handle_unknown_size_as) {
-        case UNKNOWNS_AS_MAX:
-            return adtsize_or_longest > default_column_size
-                       ? adtsize_or_longest
-                       : default_column_size;
-        default:
-            if (adtsize_or_longest < 10)
-                adtsize_or_longest = 10;
-    }
-    return adtsize_or_longest;
-}
-
-static SQLSMALLINT getTimestampDecimalDigitsX(const ConnectionClass *conn,
-                                              OID type, int atttypmod) {
-    UNUSED(conn);
-    MYLOG(OPENSEARCH_DEBUG, "type=%d, atttypmod=%d\n", type, atttypmod);
-    return (SQLSMALLINT)(atttypmod > -1 ? atttypmod : 6);
-}
-
-#ifdef ES_INTERVAL_AS_SQL_INTERVAL
-static SQLSMALLINT getIntervalDecimalDigits(OID type, int atttypmod) {
-    Int4 prec;
-
-    MYLOG(OPENSEARCH_TRACE, "entering type=%d, atttypmod=%d\n", type, atttypmod);
-
-    if ((atttypmod & SECOND_BIT) == 0)
-        return 0;
-    return (SQLSMALLINT)((prec = atttypmod & 0xffff) == 0xffff ? 6 : prec);
-}
-#endif  // ES_INTERVAL_AS_SQL_INTERVAL
-
-SQLSMALLINT
-opensearchtype_attr_to_concise_type(const ConnectionClass *conn, OID type,
-                            int typmod, int adtsize_or_longestlen,
-                            int handle_unknown_size_as) {
-    EnvironmentClass *env = (EnvironmentClass *)CC_get_env(conn);
-#ifdef ES_INTERVAL_AS_SQL_INTERVAL
-    SQLSMALLINT sqltype;
-#endif /* ES_INTERVAL_AS_SQL_INTERVAL */
-    BOOL bLongVarchar, bFixed = FALSE;
-
-    switch (type) {
-        case OPENSEARCH_TYPE_CHAR:
-            return ansi_to_wtype(conn, SQL_CHAR);
-        case OPENSEARCH_TYPE_NAME:
-        case OPENSEARCH_TYPE_REFCURSOR:
-            return ansi_to_wtype(conn, SQL_VARCHAR);
-
-        case OPENSEARCH_TYPE_BPCHAR:
-            bFixed = TRUE;
-        case OPENSEARCH_TYPE_VARCHAR:
-            if (getCharColumnSizeX(conn, type, typmod, adtsize_or_longestlen,
-                                   handle_unknown_size_as)
-                > MAX_VARCHAR_SIZE)
-                bLongVarchar = TRUE;
-            else
-                bLongVarchar = FALSE;
-            return ansi_to_wtype(conn, bLongVarchar
-                                           ? SQL_LONGVARCHAR
-                                           : (bFixed ? SQL_CHAR : SQL_VARCHAR));
-        case OPENSEARCH_TYPE_TEXT:
-            bLongVarchar = DEFAULT_TEXTASLONGVARCHAR;
-            if (bLongVarchar) {
-                int column_size = getCharColumnSizeX(conn, type, typmod,
-                                                     adtsize_or_longestlen,
-                                                     handle_unknown_size_as);
-                if (column_size > 0 && column_size <= MAX_VARCHAR_SIZE)
-                    bLongVarchar = FALSE;
-            }
-            return ansi_to_wtype(conn,
-                                 bLongVarchar ? SQL_LONGVARCHAR : SQL_VARCHAR);
-
-        case OPENSEARCH_TYPE_BYTEA:
-            return SQL_VARBINARY;
-        case OPENSEARCH_TYPE_LO_UNDEFINED:
-            return SQL_LONGVARBINARY;
-
-        case OPENSEARCH_TYPE_INT2:
-            return SQL_SMALLINT;
-
-        case OPENSEARCH_TYPE_OID:
-        case OPENSEARCH_TYPE_XID:
-        case OPENSEARCH_TYPE_INT4:
-            return SQL_INTEGER;
-
-            /* Change this to SQL_BIGINT for ODBC v3 bjm 2001-01-23 */
-        case OPENSEARCH_TYPE_INT8:
-            if (conn->ms_jet)
-                return SQL_NUMERIC; /* maybe a little better than SQL_VARCHAR */
-            return SQL_BIGINT;
-
-        case OPENSEARCH_TYPE_NUMERIC:
-            return SQL_NUMERIC;
-
-        case OPENSEARCH_TYPE_FLOAT4:
-            return SQL_REAL;
-        case OPENSEARCH_TYPE_FLOAT8:
-            return SQL_FLOAT;
-        case OPENSEARCH_TYPE_DATE:
-            if (EN_is_odbc3(env))
-                return SQL_TYPE_DATE;
-            return SQL_DATE;
-        case OPENSEARCH_TYPE_TIME:
-            if (EN_is_odbc3(env))
-                return SQL_TYPE_TIME;
-            return SQL_TIME;
-        case OPENSEARCH_TYPE_ABSTIME:
-        case OPENSEARCH_TYPE_DATETIME:
-        case OPENSEARCH_TYPE_TIMESTAMP_NO_TMZONE:
-        case OPENSEARCH_TYPE_TIMESTAMP:
-            if (EN_is_odbc3(env))
-                return SQL_TYPE_TIMESTAMP;
-            return SQL_TIMESTAMP;
-        case OPENSEARCH_TYPE_MONEY:
-            return SQL_FLOAT;
-        case OPENSEARCH_TYPE_BOOL:
-            return SQL_BIT;
-        case OPENSEARCH_TYPE_XML:
-            return ansi_to_wtype(conn, SQL_LONGVARCHAR);
-        case OPENSEARCH_TYPE_INET:
-        case OPENSEARCH_TYPE_CIDR:
-        case OPENSEARCH_TYPE_MACADDR:
-            return ansi_to_wtype(conn, SQL_VARCHAR);
-        case OPENSEARCH_TYPE_UUID:
-            return SQL_GUID;
-
-        case OPENSEARCH_TYPE_INTERVAL:
-#ifdef ES_INTERVAL_AS_SQL_INTERVAL
-            if (sqltype = get_interval_type(atttypmod, NULL), 0 != sqltype)
-                return sqltype;
-#endif /* ES_INTERVAL_AS_SQL_INTERVAL */
-            return ansi_to_wtype(conn, SQL_VARCHAR);
-
-        default:
-
-            /*
-             * first, check to see if 'type' is in list.  If not, look up
-             * with query. Add oid, name to list.  If it's already in
-             * list, just return.
-             */
-            /* hack until permanent type is available */
-            if (type == (OID)conn->lobj_type)
-                return SQL_LONGVARBINARY;
-
-            bLongVarchar = DEFAULT_UNKNOWNSASLONGVARCHAR;
-            if (bLongVarchar) {
-                int column_size = getCharColumnSizeX(conn, type, typmod,
-                                                     adtsize_or_longestlen,
-                                                     handle_unknown_size_as);
-                if (column_size > 0 && column_size <= MAX_VARCHAR_SIZE)
-                    bLongVarchar = FALSE;
-            }
-#ifdef EXPERIMENTAL_CURRENTLY
-            return ansi_to_wtype(conn,
-                                 bLongVarchar ? SQL_LONGVARCHAR : SQL_VARCHAR);
-#else
-            return bLongVarchar ? SQL_LONGVARCHAR : SQL_VARCHAR;
-#endif /* EXPERIMENTAL_CURRENTLY */
-    }
-}
-
-SQLSMALLINT
-opensearchtype_attr_to_sqldesctype(const ConnectionClass *conn, OID type, int typmod,
-                           int adtsize_or_longestlen,
-                           int handle_unknown_size_as) {
-    SQLSMALLINT rettype;
-
-#ifdef ES_INTERVAL_AS_SQL_INTERVAL
-    if (OPENSEARCH_TYPE_INTERVAL == type)
-        return SQL_INTERVAL;
-#endif /* ES_INTERVAL_AS_SQL_INTERVAL */
-    switch (rettype = opensearchtype_attr_to_concise_type(
-                conn, type, typmod, adtsize_or_longestlen,
-                handle_unknown_size_as)) {
-        case SQL_TYPE_DATE:
-        case SQL_TYPE_TIME:
-        case SQL_TYPE_TIMESTAMP:
-            return SQL_DATETIME;
-    }
-    return rettype;
-}
-
-SQLSMALLINT
-opensearchtype_attr_to_datetime_sub(const ConnectionClass *conn, OID type,
-                            int typmod) {
-    UNUSED(conn, type, typmod);
-    return -1;
-}
-
-SQLSMALLINT
-opensearchtype_attr_to_ctype(const ConnectionClass *conn, OID type, int typmod) {
-    UNUSED(typmod);
-    EnvironmentClass *env = (EnvironmentClass *)CC_get_env(conn);
-#ifdef ES_INTERVAL_AS_SQL_INTERVAL
-    SQLSMALLINT ctype;
-#endif /* ES_INTERVAL_A_SQL_INTERVAL */
-
-    switch (type) {
-        case OPENSEARCH_TYPE_INT8:
-            if (!conn->ms_jet)
-                return ALLOWED_C_BIGINT;
-            return SQL_C_CHAR;
-        case OPENSEARCH_TYPE_NUMERIC:
-            return SQL_C_CHAR;
-        case OPENSEARCH_TYPE_INT2:
-            return SQL_C_SSHORT;
-        case OPENSEARCH_TYPE_OID:
-        case OPENSEARCH_TYPE_XID:
-            return SQL_C_ULONG;
-        case OPENSEARCH_TYPE_INT4:
-            return SQL_C_SLONG;
-        case OPENSEARCH_TYPE_FLOAT4:
-            return SQL_C_FLOAT;
-        case OPENSEARCH_TYPE_FLOAT8:
-            return SQL_C_DOUBLE;
-        case OPENSEARCH_TYPE_DATE:
-            if (EN_is_odbc3(env))
-                return SQL_C_TYPE_DATE;
-            return SQL_C_DATE;
-        case OPENSEARCH_TYPE_TIME:
-            if (EN_is_odbc3(env))
-                return SQL_C_TYPE_TIME;
-            return SQL_C_TIME;
-        case OPENSEARCH_TYPE_ABSTIME:
-        case OPENSEARCH_TYPE_DATETIME:
-        case OPENSEARCH_TYPE_TIMESTAMP_NO_TMZONE:
-        case OPENSEARCH_TYPE_TIMESTAMP:
-            if (EN_is_odbc3(env))
-                return SQL_C_TYPE_TIMESTAMP;
-            return SQL_C_TIMESTAMP;
-        case OPENSEARCH_TYPE_MONEY:
-            return SQL_C_FLOAT;
-        case OPENSEARCH_TYPE_BOOL:
-            return SQL_C_BIT;
-
-        case OPENSEARCH_TYPE_BYTEA:
-            return SQL_C_BINARY;
-        case OPENSEARCH_TYPE_LO_UNDEFINED:
-            return SQL_C_BINARY;
-        case OPENSEARCH_TYPE_BPCHAR:
-        case OPENSEARCH_TYPE_VARCHAR:
-        case OPENSEARCH_TYPE_TEXT:
-            return ansi_to_wtype(conn, SQL_C_CHAR);
-        case OPENSEARCH_TYPE_UUID:
-            if (!conn->ms_jet)
-                return SQL_C_GUID;
-            return ansi_to_wtype(conn, SQL_C_CHAR);
-
-        case OPENSEARCH_TYPE_INTERVAL:
-#ifdef ES_INTERVAL_AS_SQL_INTERVAL
-            if (ctype = get_interval_type(atttypmod, NULL), 0 != ctype)
-                return ctype;
-#endif /* ES_INTERVAL_AS_SQL_INTERVAL */
-            return ansi_to_wtype(conn, SQL_CHAR);
-
-        default:
-            /* hack until permanent type is available */
-            if (type == (OID)conn->lobj_type)
-                return SQL_C_BINARY;
-
-                /* Experimental, Does this work ? */
-#ifdef EXPERIMENTAL_CURRENTLY
-            return ansi_to_wtype(conn, SQL_C_CHAR);
-#else
-            return SQL_C_CHAR;
-#endif /* EXPERIMENTAL_CURRENTLY */
-    }
-}
-
-const char *opensearchtype_attr_to_name(const ConnectionClass *conn, OID type,
-                                int typmod, BOOL auto_increment) {
-    UNUSED(conn, typmod, conn, auto_increment);
-    switch (type) {
-        case OPENSEARCH_TYPE_BOOL:
-            return OPENSEARCH_TYPE_NAME_BOOLEAN;
-        case OPENSEARCH_TYPE_INT1:
-            return OPENSEARCH_TYPE_NAME_BYTE;
-        case OPENSEARCH_TYPE_INT2:
-            return OPENSEARCH_TYPE_NAME_SHORT;
-        case OPENSEARCH_TYPE_INT4:
-            return OPENSEARCH_TYPE_NAME_INTEGER;
-        case OPENSEARCH_TYPE_INT8:
-            return OPENSEARCH_TYPE_NAME_LONG;
-        case OPENSEARCH_TYPE_HALF_FLOAT:
-            return OPENSEARCH_TYPE_NAME_HALF_FLOAT;
-        case OPENSEARCH_TYPE_FLOAT4:
-            return OPENSEARCH_TYPE_NAME_FLOAT;
-        case OPENSEARCH_TYPE_FLOAT8:
-            return OPENSEARCH_TYPE_NAME_DOUBLE;
-        case OPENSEARCH_TYPE_SCALED_FLOAT:
-            return OPENSEARCH_TYPE_NAME_SCALED_FLOAT;
-        case OPENSEARCH_TYPE_KEYWORD:
-            return OPENSEARCH_TYPE_NAME_KEYWORD;
-        case OPENSEARCH_TYPE_TEXT:
-            return OPENSEARCH_TYPE_NAME_TEXT;
-        case OPENSEARCH_TYPE_NESTED:
-            return OPENSEARCH_TYPE_NAME_NESTED;
-        case OPENSEARCH_TYPE_DATETIME:
-            return OPENSEARCH_TYPE_NAME_DATE;
-        case OPENSEARCH_TYPE_TIMESTAMP:
-            return OPENSEARCH_TYPE_NAME_TIMESTAMP;
-        case OPENSEARCH_TYPE_OBJECT:
-            return OPENSEARCH_TYPE_NAME_OBJECT;
-        case OPENSEARCH_TYPE_VARCHAR:
-            return OPENSEARCH_TYPE_NAME_VARCHAR;
-        default:
-            return OPENSEARCH_TYPE_NAME_UNSUPPORTED;
-    }
-}
-
-Int4 /* OpenSearch restriction */
-opensearchtype_attr_column_size(const ConnectionClass *conn, OID type, int atttypmod,
-                        int adtsize_or_longest, int handle_unknown_size_as) {
-    UNUSED(handle_unknown_size_as, adtsize_or_longest, atttypmod, conn);
-    switch (type) {
-        case OPENSEARCH_TYPE_BOOL:
-            return 1;
-        case OPENSEARCH_TYPE_INT1:
-            return 3;
-        case OPENSEARCH_TYPE_INT2:
-            return 5;
-        case OPENSEARCH_TYPE_INT4:
-            return 10;
-        case OPENSEARCH_TYPE_INT8:
-            return 19;
-        case OPENSEARCH_TYPE_HALF_FLOAT:
-            return 7;
-        case OPENSEARCH_TYPE_FLOAT4:
-            return 7;
-        case OPENSEARCH_TYPE_FLOAT8:
-            return 15;
-        case OPENSEARCH_TYPE_SCALED_FLOAT:
-            return 15;
-        case OPENSEARCH_TYPE_KEYWORD:
-            return 256;
-        case OPENSEARCH_TYPE_TEXT:
-            return INT_MAX;
-        case OPENSEARCH_TYPE_NESTED:
-            return 0;
-        case OPENSEARCH_TYPE_DATETIME:
-            return 24;
-        case OPENSEARCH_TYPE_TIMESTAMP:
-            return 24;
-        case OPENSEARCH_TYPE_OBJECT:
-            return 0;
-        default:
-            return adtsize_or_longest;
-    }
-}
-
-SQLSMALLINT
-opensearchtype_attr_precision(const ConnectionClass *conn, OID type, int atttypmod,
-                      int adtsize_or_longest, int handle_unknown_size_as) {
-    switch (type) {
-        case OPENSEARCH_TYPE_NUMERIC:
-            return (SQLSMALLINT)getNumericColumnSizeX(conn, type, atttypmod,
-                                                      adtsize_or_longest,
-                                                      handle_unknown_size_as);
-        case OPENSEARCH_TYPE_TIME:
-        case OPENSEARCH_TYPE_DATETIME:
-        case OPENSEARCH_TYPE_TIMESTAMP_NO_TMZONE:
-            return getTimestampDecimalDigitsX(conn, type, atttypmod);
-#ifdef ES_INTERVAL_AS_SQL_INTERVAL
-        case OPENSEARCH_TYPE_INTERVAL:
-            return getIntervalDecimalDigits(type, atttypmod);
-#endif /* ES_INTERVAL_AS_SQL_INTERVAL */
-    }
-    return -1;
-}
-
-Int4 opensearchtype_attr_display_size(const ConnectionClass *conn, OID type,
-                              int atttypmod, int adtsize_or_longestlen,
-                              int handle_unknown_size_as) {
-    int dsize;
-
-    switch (type) {
-        case OPENSEARCH_TYPE_INT2:
-            return 6;
-
-        case OPENSEARCH_TYPE_OID:
-        case OPENSEARCH_TYPE_XID:
-            return 10;
-
-        case OPENSEARCH_TYPE_INT4:
-            return 11;
-
-        case OPENSEARCH_TYPE_INT8:
-            return 20; /* signed: 19 digits + sign */
-
-        case OPENSEARCH_TYPE_NUMERIC:
-            dsize = getNumericColumnSizeX(conn, type, atttypmod,
-                                          adtsize_or_longestlen,
-                                          handle_unknown_size_as);
-            return dsize <= 0 ? dsize : dsize + 2;
-
-        case OPENSEARCH_TYPE_MONEY:
-            return 15; /* ($9,999,999.99) */
-
-        case OPENSEARCH_TYPE_FLOAT4: /* a sign, OPENSEARCH_REAL_DIGITS digits, a decimal point,
-                                the letter E, a sign, and 2 digits */
-            return (1 + OPENSEARCH_REAL_DIGITS + 1 + 1 + 3);
-
-        case OPENSEARCH_TYPE_FLOAT8: /* a sign, OPENSEARCH_DOUBLE_DIGITS digits, a decimal
-                                point, the letter E, a sign, and 3 digits */
-            return (1 + OPENSEARCH_DOUBLE_DIGITS + 1 + 1 + 1 + 3);
-
-        case OPENSEARCH_TYPE_MACADDR:
-            return 17;
-        case OPENSEARCH_TYPE_INET:
-        case OPENSEARCH_TYPE_CIDR:
-            return sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255/128");
-        case OPENSEARCH_TYPE_UUID:
-            return 36;
-        case OPENSEARCH_TYPE_INTERVAL:
-            return 30;
-
-            /* Character types use regular precision */
-        default:
-            return opensearchtype_attr_column_size(conn, type, atttypmod,
-                                                   adtsize_or_longestlen,
-                                                   handle_unknown_size_as);
-    }
-}
-
-Int4 opensearchtype_attr_buffer_length(const ConnectionClass *conn, OID type,
-                               int atttypmod, int adtsize_or_longestlen,
-                               int handle_unknown_size_as) {
-    int dsize;
-
-    switch (type) {
-        case OPENSEARCH_TYPE_INT2:
-            return 2; /* sizeof(SQLSMALLINT) */
-
-        case OPENSEARCH_TYPE_OID:
-        case OPENSEARCH_TYPE_XID:
-        case OPENSEARCH_TYPE_INT4:
-            return 4; /* sizeof(SQLINTEGER) */
-
-        case OPENSEARCH_TYPE_INT8:
-            if (SQL_C_CHAR == opensearchtype_attr_to_ctype(conn, type, atttypmod))
-                return 20; /* signed: 19 digits + sign */
-            return 8;      /* sizeof(SQLSBININT) */
-
-        case OPENSEARCH_TYPE_NUMERIC:
-            dsize = getNumericColumnSizeX(conn, type, atttypmod,
-                                          adtsize_or_longestlen,
-                                          handle_unknown_size_as);
-            return dsize <= 0 ? dsize : dsize + 2;
-
-        case OPENSEARCH_TYPE_FLOAT4:
-        case OPENSEARCH_TYPE_MONEY:
-            return 4; /* sizeof(SQLREAL) */
-
-        case OPENSEARCH_TYPE_FLOAT8:
-            return 8; /* sizeof(SQLFLOAT) */
-
-        case OPENSEARCH_TYPE_DATE:
-        case OPENSEARCH_TYPE_TIME:
-            return 6; /* sizeof(DATE(TIME)_STRUCT) */
-
-        case OPENSEARCH_TYPE_ABSTIME:
-        case OPENSEARCH_TYPE_DATETIME:
-        case OPENSEARCH_TYPE_TIMESTAMP:
-        case OPENSEARCH_TYPE_TIMESTAMP_NO_TMZONE:
-            return 16; /* sizeof(TIMESTAMP_STRUCT) */
-
-        case OPENSEARCH_TYPE_MACADDR:
-            return 17;
-        case OPENSEARCH_TYPE_INET:
-        case OPENSEARCH_TYPE_CIDR:
-            return sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255/128");
-        case OPENSEARCH_TYPE_UUID:
-            return 16; /* sizeof(SQLGUID) */
-
-            /* Character types use the default precision */
-        case OPENSEARCH_TYPE_VARCHAR:
-        case OPENSEARCH_TYPE_BPCHAR: {
-            int coef = 1;
-            Int4 prec = opensearchtype_attr_column_size(conn, type, atttypmod,
-                                                        adtsize_or_longestlen,
-                                                        handle_unknown_size_as),
-                 maxvarc;
-            if (SQL_NO_TOTAL == prec)
-                return prec;
-#ifdef UNICODE_SUPPORT
-            if (CC_is_in_unicode_driver(conn))
-                return prec * WCLEN;
-#endif /* UNICODE_SUPPORT */
-            coef = conn->mb_maxbyte_per_char;
-            if (coef < 2)
-                /* CR -> CR/LF */
-                coef = 2;
-            if (coef == 1)
-                return prec;
-            maxvarc = MAX_VARCHAR_SIZE;
-            if (prec <= maxvarc && prec * coef > maxvarc)
-                return maxvarc;
-            return coef * prec;
-        }
-#ifdef ES_INTERVAL_AS_SQL_INTERVAL
-        case OPENSEARCH_TYPE_INTERVAL:
-            return sizeof(SQL_INTERVAL_STRUCT);
-#endif /* ES_INTERVAL_AS_SQL_INTERVAL */
-
-        default:
-            return opensearchtype_attr_column_size(conn, type, atttypmod,
-                                                   adtsize_or_longestlen,
-                                                   handle_unknown_size_as);
-    }
-}
-
-/*
- */
-Int4 opensearchtype_attr_desclength(const ConnectionClass *conn, OID type,
-                            int atttypmod, int adtsize_or_longestlen,
-                            int handle_unknown_size_as) {
-    int dsize;
-
-    switch (type) {
-        case OPENSEARCH_TYPE_INT2:
-            return 2;
-
-        case OPENSEARCH_TYPE_OID:
-        case OPENSEARCH_TYPE_XID:
-        case OPENSEARCH_TYPE_INT4:
-            return 4;
-
-        case OPENSEARCH_TYPE_INT8:
-            return 20; /* signed: 19 digits + sign */
-
-        case OPENSEARCH_TYPE_NUMERIC:
-            dsize = getNumericColumnSizeX(conn, type, atttypmod,
-                                          adtsize_or_longestlen,
-                                          handle_unknown_size_as);
-            return dsize <= 0 ? dsize : dsize + 2;
-
-        case OPENSEARCH_TYPE_FLOAT4:
-        case OPENSEARCH_TYPE_MONEY:
-            return 4;
-
-        case OPENSEARCH_TYPE_FLOAT8:
-            return 8;
-
-        case OPENSEARCH_TYPE_DATE:
-        case OPENSEARCH_TYPE_TIME:
-        case OPENSEARCH_TYPE_ABSTIME:
-        case OPENSEARCH_TYPE_DATETIME:
-        case OPENSEARCH_TYPE_TIMESTAMP_NO_TMZONE:
-        case OPENSEARCH_TYPE_TIMESTAMP:
-        case OPENSEARCH_TYPE_VARCHAR:
-        case OPENSEARCH_TYPE_BPCHAR:
-            return opensearchtype_attr_column_size(conn, type, atttypmod,
-                                                   adtsize_or_longestlen,
-                                                   handle_unknown_size_as);
-        default:
-            return opensearchtype_attr_column_size(conn, type, atttypmod,
-                                                   adtsize_or_longestlen,
-                                                   handle_unknown_size_as);
-    }
-}
-
-Int2 opensearchtype_attr_decimal_digits(const ConnectionClass *conn, OID type,
-                                int atttypmod, int adtsize_or_longestlen,
-                                int handle_unknown_size_as) {
-    switch (type) {
-        case OPENSEARCH_TYPE_INT2:
-        case OPENSEARCH_TYPE_OID:
-        case OPENSEARCH_TYPE_XID:
-        case OPENSEARCH_TYPE_INT4:
-        case OPENSEARCH_TYPE_INT8:
-        case OPENSEARCH_TYPE_FLOAT4:
-        case OPENSEARCH_TYPE_FLOAT8:
-        case OPENSEARCH_TYPE_MONEY:
-        case OPENSEARCH_TYPE_BOOL:
-
-            /*
-             * Number of digits to the right of the decimal point in
-             * "yyyy-mm=dd hh:mm:ss[.f...]"
-             */
-        case OPENSEARCH_TYPE_ABSTIME:
-        case OPENSEARCH_TYPE_TIMESTAMP:
-            return 0;
-        case OPENSEARCH_TYPE_TIME:
-        case OPENSEARCH_TYPE_DATETIME:
-        case OPENSEARCH_TYPE_TIMESTAMP_NO_TMZONE:
-            /* return 0; */
-            return getTimestampDecimalDigitsX(conn, type, atttypmod);
-
-        case OPENSEARCH_TYPE_NUMERIC:
-            return getNumericDecimalDigitsX(conn, type, atttypmod,
-                                            adtsize_or_longestlen,
-                                            handle_unknown_size_as);
-
-#ifdef ES_INTERVAL_AS_SQL_INTERVAL
-        case OPENSEARCH_TYPE_INTERVAL:
-            return getIntervalDecimalDigits(type, atttypmod);
-#endif /* ES_INTERVAL_AS_SQL_INTERVAL */
-
-        default:
-            return -1;
-    }
-}
-
-Int2 opensearchtype_attr_scale(const ConnectionClass *conn, OID type, int atttypmod,
-                       int adtsize_or_longestlen,
-                       int handle_unknown_size_as) {
-    switch (type) {
-        case OPENSEARCH_TYPE_NUMERIC:
-            return getNumericDecimalDigitsX(conn, type, atttypmod,
-                                            adtsize_or_longestlen,
-                                            handle_unknown_size_as);
-    }
-    return -1;
-}
-
-Int4 opensearchtype_attr_transfer_octet_length(const ConnectionClass *conn, OID type,
-                                       int atttypmod,
-                                       int handle_unknown_size_as) {
-    int coef = 1;
-    Int4 maxvarc, column_size;
-
-    switch (type) {
-        case OPENSEARCH_TYPE_VARCHAR:
-        case OPENSEARCH_TYPE_BPCHAR:
-        case OPENSEARCH_TYPE_TEXT:
-        case OPENSEARCH_TYPE_UNKNOWN:
-            column_size = opensearchtype_attr_column_size(
-                conn, type, atttypmod, OPENSEARCH_ADT_UNSET,
-                handle_unknown_size_as);
-            if (SQL_NO_TOTAL == column_size)
-                return column_size;
-#ifdef UNICODE_SUPPORT
-            if (CC_is_in_unicode_driver(conn))
-                return column_size * WCLEN;
-#endif /* UNICODE_SUPPORT */
-            coef = conn->mb_maxbyte_per_char;
-            if (coef < 2)
-                /* CR -> CR/LF */
-                coef = 2;
-            if (coef == 1)
-                return column_size;
-            maxvarc = MAX_VARCHAR_SIZE;
-            if (column_size <= maxvarc && column_size * coef > maxvarc)
-                return maxvarc;
-            return coef * column_size;
-        case OPENSEARCH_TYPE_BYTEA:
-            return opensearchtype_attr_column_size(conn, type, atttypmod,
-                                                   OPENSEARCH_ADT_UNSET,
-                                                   handle_unknown_size_as);
-        default:
-            if (type == (OID)conn->lobj_type)
-                return opensearchtype_attr_column_size(conn, type, atttypmod,
-                                                       OPENSEARCH_ADT_UNSET,
-                                                       handle_unknown_size_as);
-    }
-    return -1;
-}
-
-/*
- * Casting parameters e.g. ?::timestamp is much more flexible
- * than specifying parameter datatype oids determined by
- * sqltype_to_bind_opensearchtype() via parse message.
- */
-const char *sqltype_to_opensearchcast(const ConnectionClass *conn,
-                              SQLSMALLINT fSqlType) {
-    const char *openSearchCast = NULL_STRING;
-
-    switch (fSqlType) {
-        case SQL_BINARY:
-        case SQL_VARBINARY:
-            openSearchCast = "::bytea";
-            break;
-        case SQL_TYPE_DATE:
-        case SQL_DATE:
-            openSearchCast = "::date";
-            break;
-        case SQL_DECIMAL:
-        case SQL_NUMERIC:
-            openSearchCast = "::numeric";
-            break;
-        case SQL_BIGINT:
-            openSearchCast = "::int8";
-            break;
-        case SQL_INTEGER:
-            openSearchCast = "::int4";
-            break;
-        case SQL_REAL:
-            openSearchCast = "::float4";
-            break;
-        case SQL_SMALLINT:
-        case SQL_TINYINT:
-            openSearchCast = "::int2";
-            break;
-        case SQL_TIME:
-        case SQL_TYPE_TIME:
-            openSearchCast = "::time";
-            break;
-        case SQL_TIMESTAMP:
-        case SQL_TYPE_TIMESTAMP:
-            openSearchCast = "::timestamp";
-            break;
-        case SQL_GUID:
-            if (OPENSEARCH_VERSION_GE(conn, 8.3))
-                openSearchCast = "::uuid";
-            break;
-        case SQL_INTERVAL_MONTH:
-        case SQL_INTERVAL_YEAR:
-        case SQL_INTERVAL_YEAR_TO_MONTH:
-        case SQL_INTERVAL_DAY:
-        case SQL_INTERVAL_HOUR:
-        case SQL_INTERVAL_MINUTE:
-        case SQL_INTERVAL_SECOND:
-        case SQL_INTERVAL_DAY_TO_HOUR:
-        case SQL_INTERVAL_DAY_TO_MINUTE:
-        case SQL_INTERVAL_DAY_TO_SECOND:
-        case SQL_INTERVAL_HOUR_TO_MINUTE:
-        case SQL_INTERVAL_HOUR_TO_SECOND:
-        case SQL_INTERVAL_MINUTE_TO_SECOND:
-            openSearchCast = "::interval";
-            break;
-    }
-
-    return openSearchCast;
-}
-
-OID sqltype_to_opensearchtype(const ConnectionClass *conn, SQLSMALLINT fSqlType) {
-    OID openSearchType = 0;
-    switch (fSqlType) {
-        case SQL_BINARY:
-            openSearchType = OPENSEARCH_TYPE_BYTEA;
-            break;
-
-        case SQL_CHAR:
-            openSearchType = OPENSEARCH_TYPE_BPCHAR;
-            break;
-
-#ifdef UNICODE_SUPPORT
-        case SQL_WCHAR:
-            openSearchType = OPENSEARCH_TYPE_BPCHAR;
-            break;
-#endif /* UNICODE_SUPPORT */
-
-        case SQL_BIT:
-            openSearchType = OPENSEARCH_TYPE_BOOL;
-            break;
-
-        case SQL_TYPE_DATE:
-        case SQL_DATE:
-            openSearchType = OPENSEARCH_TYPE_DATE;
-            break;
-
-        case SQL_DOUBLE:
-        case SQL_FLOAT:
-            openSearchType = OPENSEARCH_TYPE_FLOAT8;
-            break;
-
-        case SQL_DECIMAL:
-        case SQL_NUMERIC:
-            openSearchType = OPENSEARCH_TYPE_NUMERIC;
-            break;
-
-        case SQL_BIGINT:
-            openSearchType = OPENSEARCH_TYPE_INT8;
-            break;
-
-        case SQL_INTEGER:
-            openSearchType = OPENSEARCH_TYPE_INT4;
-            break;
-
-        case SQL_LONGVARBINARY:
-            openSearchType = conn->lobj_type;
-            break;
-
-        case SQL_LONGVARCHAR:
-            openSearchType = OPENSEARCH_TYPE_VARCHAR;
-            break;
-
-#ifdef UNICODE_SUPPORT
-        case SQL_WLONGVARCHAR:
-            openSearchType = OPENSEARCH_TYPE_VARCHAR;
-            break;
-#endif /* UNICODE_SUPPORT */
-
-        case SQL_REAL:
-            openSearchType = OPENSEARCH_TYPE_FLOAT4;
-            break;
-
-        case SQL_SMALLINT:
-        case SQL_TINYINT:
-            openSearchType = OPENSEARCH_TYPE_INT2;
-            break;
-
-        case SQL_TIME:
-        case SQL_TYPE_TIME:
-            openSearchType = OPENSEARCH_TYPE_TIME;
-            break;
-
-        case SQL_TIMESTAMP:
-        case SQL_TYPE_TIMESTAMP:
-            openSearchType = OPENSEARCH_TYPE_TIMESTAMP;
-            break;
-
-        case SQL_VARBINARY:
-            openSearchType = OPENSEARCH_TYPE_BYTEA;
-            break;
-
-        case SQL_VARCHAR:
-            openSearchType = OPENSEARCH_TYPE_VARCHAR;
-            break;
-
-#ifdef UNICODE_SUPPORT
-        case SQL_WVARCHAR:
-            openSearchType = OPENSEARCH_TYPE_VARCHAR;
-            break;
-#endif /* UNICODE_SUPPORT */
-
-        case SQL_GUID:
-            if (OPENSEARCH_VERSION_GE(conn, 8.3))
-                openSearchType = OPENSEARCH_TYPE_UUID;
-            break;
-
-        case SQL_INTERVAL_MONTH:
-        case SQL_INTERVAL_YEAR:
-        case SQL_INTERVAL_YEAR_TO_MONTH:
-        case SQL_INTERVAL_DAY:
-        case SQL_INTERVAL_HOUR:
-        case SQL_INTERVAL_MINUTE:
-        case SQL_INTERVAL_SECOND:
-        case SQL_INTERVAL_DAY_TO_HOUR:
-        case SQL_INTERVAL_DAY_TO_MINUTE:
-        case SQL_INTERVAL_DAY_TO_SECOND:
-        case SQL_INTERVAL_HOUR_TO_MINUTE:
-        case SQL_INTERVAL_HOUR_TO_SECOND:
-        case SQL_INTERVAL_MINUTE_TO_SECOND:
-            openSearchType = OPENSEARCH_TYPE_INTERVAL;
-            break;
-    }
-
-    return openSearchType;
-}
-
-static int getAtttypmodEtc(const StatementClass *stmt, int col,
-                           int *adtsize_or_longestlen) {
-    int atttypmod = -1;
-
-    if (NULL != adtsize_or_longestlen)
-        *adtsize_or_longestlen = OPENSEARCH_ADT_UNSET;
-    if (col >= 0) {
-        const QResultClass *res;
-
-        if (res = SC_get_Curres(stmt), NULL != res) {
-            atttypmod = QR_get_atttypmod(res, col);
-            if (NULL != adtsize_or_longestlen) {
-                if (stmt->catalog_result)
-                    *adtsize_or_longestlen = QR_get_fieldsize(res, col);
-                else {
-                    *adtsize_or_longestlen = QR_get_display_size(res, col);
-                    if (OPENSEARCH_TYPE_NUMERIC == QR_get_field_type(res, col)
-                        && atttypmod < 0 && *adtsize_or_longestlen > 0) {
-                        SQLULEN i;
-                        size_t sval, maxscale = 0;
-                        const char *tval, *sptr;
-
-                        for (i = 0; i < res->num_cached_rows; i++) {
-                            tval = QR_get_value_backend_text(res, i, col);
-                            if (NULL != tval) {
-                                sptr = strchr(tval, '.');
-                                if (NULL != sptr) {
-                                    sval = strlen(tval) - (sptr + 1 - tval);
-                                    if (sval > maxscale)
-                                        maxscale = sval;
-                                }
-                            }
-                        }
-                        *adtsize_or_longestlen += (int)(maxscale << 16);
-                    }
-                }
-            }
-        }
-    }
-    return atttypmod;
-}
-
-/*
- *	There are two ways of calling this function:
- *
- *	1.	When going through the supported ES types (SQLGetTypeInfo)
- *
- *	2.	When taking any type id (SQLColumns, SQLGetData)
- *
- *	The first type will always work because all the types defined are returned
- *here. The second type will return a default based on global parameter when it
- *does not know.	This allows for supporting types that are unknown.  All
- *other es routines in here return a suitable default.
- */
-SQLSMALLINT
-opensearchtype_to_concise_type(const StatementClass *stmt, OID type, int col,
-                       int handle_unknown_size_as) {
-    int atttypmod, adtsize_or_longestlen;
-
-    atttypmod = getAtttypmodEtc(stmt, col, &adtsize_or_longestlen);
-    return opensearchtype_attr_to_concise_type(SC_get_conn(stmt), type,
-                                               atttypmod, adtsize_or_longestlen,
-                                               handle_unknown_size_as);
-}
-
-SQLSMALLINT
-opensearchtype_to_sqldesctype(const StatementClass *stmt, OID type, int col,
-                      int handle_unknown_size_as) {
-    int adtsize_or_longestlen;
-    int atttypmod = getAtttypmodEtc(stmt, col, &adtsize_or_longestlen);
-
-    return opensearchtype_attr_to_sqldesctype(SC_get_conn(stmt), type,
-                                              atttypmod, adtsize_or_longestlen,
-                                              handle_unknown_size_as);
-}
-
-const char *opensearchtype_to_name(const StatementClass *stmt, OID type, int col,
-                           BOOL auto_increment) {
-    int atttypmod = getAtttypmodEtc(stmt, col, NULL);
-
-    return opensearchtype_attr_to_name(SC_get_conn(stmt), type, atttypmod,
-                                       auto_increment);
-}
-
-/*
- *	This corresponds to "precision" in ODBC 2.x.
- *
- *	For OPENSEARCH_TYPE_VARCHAR, OPENSEARCH_TYPE_BPCHAR, OPENSEARCH_TYPE_NUMERIC, SQLColumns will
- *	override this length with the atttypmod length from es_attribute .
- *
- *	If col >= 0, then will attempt to get the info from the result set.
- *	This is used for functions SQLDescribeCol and SQLColAttributes.
- */
-Int4 /* OpenSearch restriction */
-opensearchtype_column_size(const StatementClass *stmt, OID type, int col,
-                   int handle_unknown_size_as) {
-    int atttypmod, adtsize_or_longestlen;
-
-    atttypmod = getAtttypmodEtc(stmt, col, &adtsize_or_longestlen);
-    return opensearchtype_attr_column_size(
-        SC_get_conn(stmt), type, atttypmod, adtsize_or_longestlen,
-        stmt->catalog_result ? UNKNOWNS_AS_LONGEST : handle_unknown_size_as);
-}
-
-/*
- *	precision in ODBC 3.x.
- */
-SQLSMALLINT
-opensearchtype_precision(const StatementClass *stmt, OID type, int col,
-                 int handle_unknown_size_as) {
-    int atttypmod, adtsize_or_longestlen;
-
-    atttypmod = getAtttypmodEtc(stmt, col, &adtsize_or_longestlen);
-    return opensearchtype_attr_precision(
-        SC_get_conn(stmt), type, atttypmod, adtsize_or_longestlen,
-        stmt->catalog_result ? UNKNOWNS_AS_LONGEST : handle_unknown_size_as);
-}
-
-Int4 opensearchtype_display_size(const StatementClass *stmt, OID type, int col,
-                         int handle_unknown_size_as) {
-    int atttypmod, adtsize_or_longestlen;
-
-    atttypmod = getAtttypmodEtc(stmt, col, &adtsize_or_longestlen);
-    return opensearchtype_attr_display_size(
-        SC_get_conn(stmt), type, atttypmod, adtsize_or_longestlen,
-        stmt->catalog_result ? UNKNOWNS_AS_LONGEST : handle_unknown_size_as);
-}
-
-/*
- *	The length in bytes of data transferred on an SQLGetData, SQLFetch,
- *	or SQLFetchScroll operation if SQL_C_DEFAULT is specified.
- */
-Int4 opensearchtype_buffer_length(const StatementClass *stmt, OID type, int col,
-                          int handle_unknown_size_as) {
-    int atttypmod, adtsize_or_longestlen;
-
-    atttypmod = getAtttypmodEtc(stmt, col, &adtsize_or_longestlen);
-    return opensearchtype_attr_buffer_length(
-        SC_get_conn(stmt), type, atttypmod, adtsize_or_longestlen,
-        stmt->catalog_result ? UNKNOWNS_AS_LONGEST : handle_unknown_size_as);
-}
-
-/*
- */
-Int4 opensearchtype_desclength(const StatementClass *stmt, OID type, int col,
-                       int handle_unknown_size_as) {
-    int atttypmod, adtsize_or_longestlen;
-
-    atttypmod = getAtttypmodEtc(stmt, col, &adtsize_or_longestlen);
-    return opensearchtype_attr_desclength(
-        SC_get_conn(stmt), type, atttypmod, adtsize_or_longestlen,
-        stmt->catalog_result ? UNKNOWNS_AS_LONGEST : handle_unknown_size_as);
-}
-
-#ifdef NOT_USED
-/*
- *	Transfer octet length.
- */
-Int4 opensearchtype_transfer_octet_length(const StatementClass *stmt, OID type,
-                                  int column_size) {
-    ConnectionClass *conn = SC_get_conn(stmt);
-
-    int coef = 1;
-    Int4 maxvarc;
-    switch (type) {
-        case OPENSEARCH_TYPE_VARCHAR:
-        case OPENSEARCH_TYPE_BPCHAR:
-        case OPENSEARCH_TYPE_TEXT:
-            if (SQL_NO_TOTAL == column_size)
-                return column_size;
-#ifdef UNICODE_SUPPORT
-            if (CC_is_in_unicode_driver(conn))
-                return column_size * WCLEN;
-#endif /* UNICODE_SUPPORT */
-            coef = conn->mb_maxbyte_per_char;
-            if (coef < 2 && (conn->connInfo).lf_conversion)
-                /* CR -> CR/LF */
-                coef = 2;
-            if (coef == 1)
-                return column_size;
-            maxvarc = conn->connInfo.drivers.max_varchar_size;
-            if (column_size <= maxvarc && column_size * coef > maxvarc)
-                return maxvarc;
-            return coef * column_size;
-        case OPENSEARCH_TYPE_BYTEA:
-            return column_size;
-        default:
-            if (type == conn->lobj_type)
-                return column_size;
-    }
-    return -1;
-}
-#endif /* NOT_USED */
-
-/*
- *	corrsponds to "min_scale" in ODBC 2.x.
- */
-Int2 opensearchtype_min_decimal_digits(const ConnectionClass *conn, OID type) {
-    UNUSED(conn, type);
-    return -1;
-}
-
-/*
- *	corrsponds to "max_scale" in ODBC 2.x.
- */
-Int2 opensearchtype_max_decimal_digits(const ConnectionClass *conn, OID type) {
-    UNUSED(conn, type);
-    return -1;
-}
-
-/*
- *	corrsponds to "scale" in ODBC 2.x.
- */
-Int2 opensearchtype_decimal_digits(const StatementClass *stmt, OID type, int col) {
-    int atttypmod, adtsize_or_longestlen;
-
-    atttypmod = getAtttypmodEtc(stmt, col, &adtsize_or_longestlen);
-    return opensearchtype_attr_decimal_digits(SC_get_conn(stmt), type,
-                                              atttypmod, adtsize_or_longestlen,
-                                              UNUSED_HANDLE_UNKNOWN_SIZE_AS);
-}
-
-/*
- *	"scale" in ODBC 3.x.
- */
-Int2 opensearchtype_scale(const StatementClass *stmt, OID type, int col) {
-    int atttypmod, adtsize_or_longestlen;
-
-    atttypmod = getAtttypmodEtc(stmt, col, &adtsize_or_longestlen);
-    return opensearchtype_attr_scale(SC_get_conn(stmt), type, atttypmod,
-                                     adtsize_or_longestlen,
-                                     UNUSED_HANDLE_UNKNOWN_SIZE_AS);
-}
-
-Int2 opensearchtype_radix(const ConnectionClass *conn, OID type) {
-    UNUSED(conn, type);
-    return 10;
-}
-
-Int2 opensearchtype_nullable(const ConnectionClass *conn, OID type) {
-    UNUSED(conn, type);
-    return SQL_NULLABLE_UNKNOWN; /* everything should be nullable unknown */
-}
-
-Int2 opensearchtype_auto_increment(const ConnectionClass *conn, OID type) {
-    UNUSED(conn, type);
-    return SQL_FALSE;
-}
-
-Int2 opensearchtype_case_sensitive(const ConnectionClass *conn, OID type) {
-    UNUSED(conn, type);
-    switch (type) {
-        case OPENSEARCH_TYPE_KEYWORD:
-        case OPENSEARCH_TYPE_TEXT:
-            return SQL_TRUE;
-
-        default:
-            return SQL_FALSE;
-    }
-}
-
-Int2 opensearchtype_money(const ConnectionClass *conn, OID type) {
-    UNUSED(conn, type);
-    return SQL_FALSE;
-}
-
-Int2 opensearchtype_searchable(const ConnectionClass *conn, OID type) {
-    UNUSED(conn, type);
-    return SQL_SEARCHABLE;
-}
-
-Int2 opensearchtype_unsigned(const ConnectionClass *conn, OID type) {
-    UNUSED(conn);
-    switch (type) {
-        case OPENSEARCH_TYPE_BOOL:
-        case OPENSEARCH_TYPE_KEYWORD:
-        case OPENSEARCH_TYPE_TEXT:
-        case OPENSEARCH_TYPE_NESTED:
-        case OPENSEARCH_TYPE_DATETIME:
-        case OPENSEARCH_TYPE_TIMESTAMP:
-        case OPENSEARCH_TYPE_OBJECT:
-            return SQL_TRUE;
-
-        case OPENSEARCH_TYPE_INT1:
-        case OPENSEARCH_TYPE_INT2:
-        case OPENSEARCH_TYPE_INT4:
-        case OPENSEARCH_TYPE_INT8:
-        case OPENSEARCH_TYPE_HALF_FLOAT:
-        case OPENSEARCH_TYPE_FLOAT4:
-        case OPENSEARCH_TYPE_FLOAT8:
-        case OPENSEARCH_TYPE_SCALED_FLOAT:
-            return SQL_FALSE;
-
-        default:
-            return -1;
-    }
-}
-
-const char *opensearchtype_literal_prefix(const ConnectionClass *conn, OID type) {
-    UNUSED(conn);
-    switch (type) {
-        case OPENSEARCH_TYPE_KEYWORD:
-        case OPENSEARCH_TYPE_TEXT:
-        case OPENSEARCH_TYPE_NESTED:
-        case OPENSEARCH_TYPE_OBJECT:
-            return "\'";
-        default:
-            return "";
-    }
-}
-
-const char *opensearchtype_literal_suffix(const ConnectionClass *conn, OID type) {
-    UNUSED(conn);
-    switch (type) {
-        case OPENSEARCH_TYPE_KEYWORD:
-        case OPENSEARCH_TYPE_TEXT:
-        case OPENSEARCH_TYPE_NESTED:
-        case OPENSEARCH_TYPE_OBJECT:
-            return "\'";
-        default:
-            return "";
-    }
-}
-
-const char *opensearchtype_create_params(const ConnectionClass *conn, OID type) {
-    UNUSED(conn, type);
-    return NULL;
-}
-
-SQLSMALLINT
-sqltype_to_default_ctype(const ConnectionClass *conn, SQLSMALLINT sqltype) {
-    /*
-     * from the table on page 623 of ODBC 2.0 Programmer's Reference
-     * (Appendix D)
-     */
-    switch (sqltype) {
-        case SQL_CHAR:
-        case SQL_VARCHAR:
-        case SQL_LONGVARCHAR:
-        case SQL_DECIMAL:
-        case SQL_NUMERIC:
-            return SQL_C_CHAR;
-        case SQL_BIGINT:
-            return ALLOWED_C_BIGINT;
-
-#ifdef UNICODE_SUPPORT
-        case SQL_WCHAR:
-        case SQL_WVARCHAR:
-        case SQL_WLONGVARCHAR:
-            return ansi_to_wtype(conn, SQL_C_CHAR);
-#endif /* UNICODE_SUPPORT */
-
-        case SQL_BIT:
-            return SQL_C_BIT;
-
-        case SQL_TINYINT:
-            return SQL_C_STINYINT;
-
-        case SQL_SMALLINT:
-            return SQL_C_SSHORT;
-
-        case SQL_INTEGER:
-            return SQL_C_SLONG;
-
-        case SQL_REAL:
-            return SQL_C_FLOAT;
-
-        case SQL_FLOAT:
-        case SQL_DOUBLE:
-            return SQL_C_DOUBLE;
-
-        case SQL_BINARY:
-        case SQL_VARBINARY:
-        case SQL_LONGVARBINARY:
-            return SQL_C_BINARY;
-
-        case SQL_DATE:
-            return SQL_C_DATE;
-
-        case SQL_TIME:
-            return SQL_C_TIME;
-
-        case SQL_TIMESTAMP:
-            return SQL_C_TIMESTAMP;
-
-        case SQL_TYPE_DATE:
-            return SQL_C_TYPE_DATE;
-
-        case SQL_TYPE_TIME:
-            return SQL_C_TYPE_TIME;
-
-        case SQL_TYPE_TIMESTAMP:
-            return SQL_C_TYPE_TIMESTAMP;
-
-        case SQL_GUID:
-            if (conn->ms_jet)
-                return SQL_C_CHAR;
-            else
-                return SQL_C_GUID;
-
-        default:
-            /* should never happen */
-            return SQL_C_CHAR;
-    }
-}
-
-Int4 ctype_length(SQLSMALLINT ctype) {
-    switch (ctype) {
-        case SQL_C_SSHORT:
-        case SQL_C_SHORT:
-            return sizeof(SWORD);
-
-        case SQL_C_USHORT:
-            return sizeof(UWORD);
-
-        case SQL_C_SLONG:
-        case SQL_C_LONG:
-            return sizeof(SDWORD);
-
-        case SQL_C_ULONG:
-            return sizeof(UDWORD);
-
-        case SQL_C_FLOAT:
-            return sizeof(SFLOAT);
-
-        case SQL_C_DOUBLE:
-            return sizeof(SDOUBLE);
-
-        case SQL_C_BIT:
-            return sizeof(UCHAR);
-
-        case SQL_C_STINYINT:
-        case SQL_C_TINYINT:
-            return sizeof(SCHAR);
-
-        case SQL_C_UTINYINT:
-            return sizeof(UCHAR);
-
-        case SQL_C_DATE:
-        case SQL_C_TYPE_DATE:
-            return sizeof(DATE_STRUCT);
-
-        case SQL_C_TIME:
-        case SQL_C_TYPE_TIME:
-            return sizeof(TIME_STRUCT);
-
-        case SQL_C_TIMESTAMP:
-        case SQL_C_TYPE_TIMESTAMP:
-            return sizeof(TIMESTAMP_STRUCT);
-
-        case SQL_C_GUID:
-            return sizeof(SQLGUID);
-        case SQL_C_INTERVAL_YEAR:
-        case SQL_C_INTERVAL_MONTH:
-        case SQL_C_INTERVAL_YEAR_TO_MONTH:
-        case SQL_C_INTERVAL_DAY:
-        case SQL_C_INTERVAL_HOUR:
-        case SQL_C_INTERVAL_DAY_TO_HOUR:
-        case SQL_C_INTERVAL_MINUTE:
-        case SQL_C_INTERVAL_DAY_TO_MINUTE:
-        case SQL_C_INTERVAL_HOUR_TO_MINUTE:
-        case SQL_C_INTERVAL_SECOND:
-        case SQL_C_INTERVAL_DAY_TO_SECOND:
-        case SQL_C_INTERVAL_HOUR_TO_SECOND:
-        case SQL_C_INTERVAL_MINUTE_TO_SECOND:
-            return sizeof(SQL_INTERVAL_STRUCT);
-        case SQL_C_NUMERIC:
-            return sizeof(SQL_NUMERIC_STRUCT);
-        case SQL_C_SBIGINT:
-        case SQL_C_UBIGINT:
-            return sizeof(SQLBIGINT);
-
-        case SQL_C_BINARY:
-        case SQL_C_CHAR:
-#ifdef UNICODE_SUPPORT
-        case SQL_C_WCHAR:
-#endif /* UNICODE_SUPPORT */
-            return 0;
-
-        default: /* should never happen */
-            return 0;
-    }
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_types.h b/sql-odbc/src/sqlodbc/opensearch_types.h
deleted file mode 100644
index 8c7dee2d74..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_types.h
+++ /dev/null
@@ -1,340 +0,0 @@
-#ifndef OPENSEARCH_TYPES
-#define OPENSEARCH_TYPES
-
-#include "dlg_specific.h"
-#include "opensearch_odbc.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* the type numbers are defined by the OID's of the types' rows */
-/* in table opensearch_type */
-
-#ifdef NOT_USED
-#define ES_TYPE_LO ? ? ? ? /* waiting for permanent type */
-#endif
-
-#define OPENSEARCH_TYPE_NAME_BOOLEAN "boolean"
-#define OPENSEARCH_TYPE_NAME_BYTE "byte"
-#define OPENSEARCH_TYPE_NAME_SHORT "short"
-#define OPENSEARCH_TYPE_NAME_INTEGER "integer"
-#define OPENSEARCH_TYPE_NAME_LONG "long"
-#define OPENSEARCH_TYPE_NAME_HALF_FLOAT "half_float"
-#define OPENSEARCH_TYPE_NAME_FLOAT "float"
-#define OPENSEARCH_TYPE_NAME_DOUBLE "double"
-#define OPENSEARCH_TYPE_NAME_SCALED_FLOAT "scaled_float"
-#define OPENSEARCH_TYPE_NAME_KEYWORD "keyword"
-#define OPENSEARCH_TYPE_NAME_TEXT "text"
-#define OPENSEARCH_TYPE_NAME_NESTED "nested"
-#define OPENSEARCH_TYPE_NAME_DATE "date"
-#define OPENSEARCH_TYPE_NAME_TIMESTAMP "timestamp"
-#define OPENSEARCH_TYPE_NAME_OBJECT "object"
-#define OPENSEARCH_TYPE_NAME_VARCHAR "varchar"
-#define OPENSEARCH_TYPE_NAME_UNSUPPORTED "unsupported"
-
-#define MS_ACCESS_SERIAL "int identity"
-#define OPENSEARCH_TYPE_BOOL 16
-#define OPENSEARCH_TYPE_BYTEA 17
-#define OPENSEARCH_TYPE_CHAR 18
-#define OPENSEARCH_TYPE_NAME 19
-#define OPENSEARCH_TYPE_INT8 20
-#define OPENSEARCH_TYPE_INT2 21
-#define OPENSEARCH_TYPE_INT2VECTOR 22
-#define OPENSEARCH_TYPE_INT4 23
-#define OPENSEARCH_TYPE_REGPROC 24
-#define OPENSEARCH_TYPE_TEXT 25
-#define OPENSEARCH_TYPE_OID 26
-#define OPENSEARCH_TYPE_TID 27
-#define OPENSEARCH_TYPE_XID 28
-#define OPENSEARCH_TYPE_CID 29
-#define OPENSEARCH_TYPE_OIDVECTOR 30
-#define OPENSEARCH_TYPE_INT1 31
-#define OPENSEARCH_TYPE_HALF_FLOAT 32
-#define OPENSEARCH_TYPE_SCALED_FLOAT 33
-#define OPENSEARCH_TYPE_KEYWORD 34
-#define OPENSEARCH_TYPE_NESTED 35
-#define OPENSEARCH_TYPE_OBJECT 36
-#define OPENSEARCH_TYPE_XML 142
-#define OPENSEARCH_TYPE_XMLARRAY 143
-#define OPENSEARCH_TYPE_CIDR 650
-#define OPENSEARCH_TYPE_FLOAT4 700
-#define OPENSEARCH_TYPE_FLOAT8 701
-#define OPENSEARCH_TYPE_ABSTIME 702
-#define OPENSEARCH_TYPE_UNKNOWN 705
-#define OPENSEARCH_TYPE_MONEY 790
-#define OPENSEARCH_TYPE_MACADDR 829
-#define OPENSEARCH_TYPE_INET 869
-#define OPENSEARCH_TYPE_TEXTARRAY 1009
-#define OPENSEARCH_TYPE_BPCHARARRAY 1014
-#define OPENSEARCH_TYPE_VARCHARARRAY 1015
-#define OPENSEARCH_TYPE_BPCHAR 1042
-#define OPENSEARCH_TYPE_VARCHAR 1043
-#define OPENSEARCH_TYPE_DATE 1082
-#define OPENSEARCH_TYPE_TIME 1083
-#define OPENSEARCH_TYPE_TIMESTAMP_NO_TMZONE 1114 /* since 7.2 */
-#define OPENSEARCH_TYPE_DATETIME 1184            /* timestamptz */
-#define OPENSEARCH_TYPE_INTERVAL 1186
-#define OPENSEARCH_TYPE_TIME_WITH_TMZONE 1266 /* since 7.1 */
-#define OPENSEARCH_TYPE_TIMESTAMP 1296        /* deprecated since 7.0 */
-#define OPENSEARCH_TYPE_BIT 1560
-#define OPENSEARCH_TYPE_NUMERIC 1700
-#define OPENSEARCH_TYPE_REFCURSOR 1790
-#define OPENSEARCH_TYPE_RECORD 2249
-#define OPENSEARCH_TYPE_ANY 2276
-#define OPENSEARCH_TYPE_VOID 2278
-#define OPENSEARCH_TYPE_UUID 2950
-#define INTERNAL_ASIS_TYPE (-9999)
-
-#define TYPE_MAY_BE_ARRAY(type) \
-    ((type) == OPENSEARCH_TYPE_XMLARRAY || ((type) >= 1000 && (type) <= 1041))
-/* extern Int4 opensearch_types_defined[]; */
-extern SQLSMALLINT sqlTypes[];
-
-/*	Defines for opensearchtype_precision */
-#define OPENSEARCH_ATP_UNSET (-3)   /* atttypmod */
-#define OPENSEARCH_ADT_UNSET (-3)   /* adtsize_or_longestlen */
-#define OPENSEARCH_UNKNOWNS_UNSET 0 /* UNKNOWNS_AS_MAX */
-#define OPENSEARCH_WIDTH_OF_BOOLS_AS_CHAR 5
-
-/*
- *	SQL_INTERVAL support is disabled because I found
- *	some applications which are unhappy with it.
- *
-#define	OPENSEARCH_INTERVAL_AS_SQL_INTERVAL
- */
-
-OID opensearch_true_type(const ConnectionClass *, OID, OID);
-OID sqltype_to_opensearchtype(const ConnectionClass *conn, SQLSMALLINT fSqlType);
-const char *sqltype_to_opensearchcast(const ConnectionClass *conn,
-                              SQLSMALLINT fSqlType);
-
-SQLSMALLINT opensearchtype_to_concise_type(const StatementClass *stmt, OID type,
-                                   int col, int handle_unknown_size_as);
-SQLSMALLINT opensearchtype_to_sqldesctype(const StatementClass *stmt, OID type, int col,
-                                  int handle_unknown_size_as);
-const char *opensearchtype_to_name(const StatementClass *stmt, OID type, int col,
-                           BOOL auto_increment);
-
-SQLSMALLINT opensearchtype_attr_to_concise_type(const ConnectionClass *conn, OID type,
-                                        int typmod, int adtsize_or_longestlen,
-                                        int handle_unknown_size_as);
-SQLSMALLINT opensearchtype_attr_to_sqldesctype(const ConnectionClass *conn, OID type,
-                                       int typmod, int adtsize_or_longestlen,
-                                       int handle_unknown_size_as);
-SQLSMALLINT opensearchtype_attr_to_datetime_sub(const ConnectionClass *conn, OID type,
-                                        int typmod);
-SQLSMALLINT opensearchtype_attr_to_ctype(const ConnectionClass *conn, OID type,
-                                 int typmod);
-const char *opensearchtype_attr_to_name(const ConnectionClass *conn, OID type,
-                                int typmod, BOOL auto_increment);
-Int4 opensearchtype_attr_column_size(const ConnectionClass *conn, OID type,
-                             int atttypmod, int adtsize_or_longest,
-                             int handle_unknown_size_as);
-Int4 opensearchtype_attr_buffer_length(const ConnectionClass *conn, OID type,
-                               int atttypmod, int adtsize_or_longestlen,
-                               int handle_unknown_size_as);
-Int4 opensearchtype_attr_display_size(const ConnectionClass *conn, OID type,
-                              int atttypmod, int adtsize_or_longestlen,
-                              int handle_unknown_size_as);
-Int2 opensearchtype_attr_decimal_digits(const ConnectionClass *conn, OID type,
-                                int atttypmod, int adtsize_or_longestlen,
-                                int handle_unknown_size_as);
-Int4 opensearchtype_attr_transfer_octet_length(const ConnectionClass *conn, OID type,
-                                       int atttypmod,
-                                       int handle_unknown_size_as);
-SQLSMALLINT opensearchtype_attr_precision(const ConnectionClass *conn, OID type,
-                                  int atttypmod, int adtsize_or_longest,
-                                  int handle_unknown_size_as);
-Int4 opensearchtype_attr_desclength(const ConnectionClass *conn, OID type,
-                            int atttypmod, int adtsize_or_longestlen,
-                            int handle_unknown_size_as);
-Int2 opensearchtype_attr_scale(const ConnectionClass *conn, OID type, int atttypmod,
-                       int adtsize_or_longestlen, int handle_unknown_size_as);
-
-/*	These functions can use static numbers or result sets(col parameter) */
-Int4 opensearchtype_column_size(
-    const StatementClass *stmt, OID type, int col,
-    int handle_unknown_size_as); /* corresponds to "precision" in ODBC 2.x */
-SQLSMALLINT opensearchtype_precision(
-    const StatementClass *stmt, OID type, int col,
-    int handle_unknown_size_as); /* "precsion in ODBC 3.x */
-/* the following size/length are of Int4 due to ES restriction */
-Int4 opensearchtype_display_size(const StatementClass *stmt, OID type, int col,
-                         int handle_unknown_size_as);
-Int4 opensearchtype_buffer_length(const StatementClass *stmt, OID type, int col,
-                          int handle_unknown_size_as);
-Int4 opensearchtype_desclength(const StatementClass *stmt, OID type, int col,
-                       int handle_unknown_size_as);
-// Int4		opensearchtype_transfer_octet_length(const ConnectionClass *conn, OID type,
-// int column_size);
-
-SQLSMALLINT opensearchtype_decimal_digits(
-    const StatementClass *stmt, OID type,
-    int col); /* corresponds to "scale" in ODBC 2.x */
-SQLSMALLINT opensearchtype_min_decimal_digits(
-    const ConnectionClass *conn,
-    OID type); /* corresponds to "min_scale" in ODBC 2.x */
-SQLSMALLINT opensearchtype_max_decimal_digits(
-    const ConnectionClass *conn,
-    OID type); /* corresponds to "max_scale" in ODBC 2.x */
-SQLSMALLINT opensearchtype_scale(const StatementClass *stmt, OID type,
-                         int col); /* ODBC 3.x " */
-Int2 opensearchtype_radix(const ConnectionClass *conn, OID type);
-Int2 opensearchtype_nullable(const ConnectionClass *conn, OID type);
-Int2 opensearchtype_auto_increment(const ConnectionClass *conn, OID type);
-Int2 opensearchtype_case_sensitive(const ConnectionClass *conn, OID type);
-Int2 opensearchtype_money(const ConnectionClass *conn, OID type);
-Int2 opensearchtype_searchable(const ConnectionClass *conn, OID type);
-Int2 opensearchtype_unsigned(const ConnectionClass *conn, OID type);
-const char *opensearchtype_literal_prefix(const ConnectionClass *conn, OID type);
-const char *opensearchtype_literal_suffix(const ConnectionClass *conn, OID type);
-const char *opensearchtype_create_params(const ConnectionClass *conn, OID type);
-
-SQLSMALLINT sqltype_to_default_ctype(const ConnectionClass *stmt,
-                                     SQLSMALLINT sqltype);
-Int4 ctype_length(SQLSMALLINT ctype);
-
-SQLSMALLINT ansi_to_wtype(const ConnectionClass *self, SQLSMALLINT ansitype);
-
-#ifdef __cplusplus
-}
-#endif
-
-typedef enum {
-    CONNECTION_OK,
-    CONNECTION_BAD,
-    /* Non-blocking mode only below here */
-
-    /*
-     * The existence of these should never be relied upon - they should only
-     * be used for user feedback or similar purposes.
-     */
-    CONNECTION_STARTED,           /* Waiting for connection to be made.  */
-    CONNECTION_MADE,              /* Connection OK; waiting to send.     */
-    CONNECTION_AWAITING_RESPONSE, /* Waiting for a response from the postmaster.
-                                   */
-    CONNECTION_AUTH_OK, /* Received authentication; waiting for backend startup.
-                         */
-    CONNECTION_SETENV,  /* Negotiating environment. */
-    CONNECTION_SSL_STARTUP,    /* Negotiating SSL. */
-    CONNECTION_NEEDED,         /* Internal state: connect() needed */
-    CONNECTION_CHECK_WRITABLE, /* Check if we could make a writable connection.
-                                */
-    CONNECTION_CONSUME,    /* Wait for any pending message and consume them. */
-    CONNECTION_GSS_STARTUP /* Negotiating GSSAPI. */
-} ConnStatusType;
-
-typedef enum {
-    CONN_ERROR_SUCCESS,             // 0
-    CONN_ERROR_QUERY_SYNTAX,        // 42000
-    CONN_ERROR_COMM_LINK_FAILURE,   // 08S01
-    CONN_ERROR_INVALID_NULL_PTR,    // HY009
-    CONN_ERROR_INVALID_AUTH,        // 28000
-    CONN_ERROR_UNABLE_TO_ESTABLISH  // 08001
-} ConnErrorType;
-
-// Only expose this to C++ code, this will be passed through the C interface as
-// a void*
-#ifdef __cplusplus
-#include <stdint.h>
-
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#endif  // __APPLE__
-#include "rabbit.hpp"
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-
-#include <string>
-#include <vector>
-
-typedef struct authentication_options {
-    std::string auth_type;
-    std::string username;
-    std::string password;
-    std::string region;
-} authentication_options;
-
-typedef struct encryption_options {
-    bool use_ssl;
-    bool verify_server;
-    std::string certificate_type;
-    std::string certificate;
-    std::string key;
-    std::string key_pw;
-} encryption_options;
-
-typedef struct connection_options {
-    std::string server;
-    std::string port;
-    std::string timeout;
-    std::string fetch_size;
-} connection_options;
-
-typedef struct runtime_options {
-    connection_options conn;
-    authentication_options auth;
-    encryption_options crypt;
-} runtime_options;
-
-typedef struct ErrorDetails {
-    std::string reason;
-    std::string details;
-    std::string source_type;
-    ConnErrorType type;
-    ErrorDetails() {
-        reason = "";
-        details = "";
-        source_type = "";
-        type = ConnErrorType::CONN_ERROR_SUCCESS;
-    }
-} ErrorDetails;
-
-#define INVALID_OID 0
-#define KEYWORD_TYPE_OID 1043
-#define KEYWORD_TYPE_SIZE 255
-#define KEYWORD_DISPLAY_SIZE 255
-#define KEYWORD_LENGTH_OF_STR 255
-
-// Copied from ColumnInfoClass's 'srvr_info' struct. Comments are the relevant
-// name in 'srvr_info'
-typedef struct ColumnInfo {
-    std::string field_name;    // name
-    uint32_t type_oid;         // adtid
-    int16_t type_size;         // adtsize
-    int32_t display_size;      // longest row
-    int32_t length_of_str;     // the length of bpchar/varchar
-    uint32_t relation_id;      // relid
-    int16_t attribute_number;  // attid
-    ColumnInfo() {
-        field_name = "";
-        type_oid = INVALID_OID;
-        type_size = 0;      // ?
-        display_size = 0;   // ?
-        length_of_str = 0;  // ?
-        relation_id = INVALID_OID;
-        attribute_number = INVALID_OID;
-    }
-} ColumnInfo;
-
-typedef struct OpenSearchResult {
-    uint32_t ref_count;  // reference count. A ColumnInfo can be shared by
-                         // several qresults.
-    uint16_t num_fields;
-    std::vector< ColumnInfo > column_info;
-    std::string cursor;
-    std::string result_json;
-    std::string command_type;  // SELECT / FETCH / etc
-    rabbit::document opensearch_result_doc;
-    OpenSearchResult() {
-        ref_count = 0;
-        num_fields = 0;
-        result_json = "";
-        command_type = "";
-    }
-} OpenSearchResult;
-
-#endif
-#endif
diff --git a/sql-odbc/src/sqlodbc/opensearch_utility.cpp b/sql-odbc/src/sqlodbc/opensearch_utility.cpp
deleted file mode 100644
index faac8f389e..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_utility.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "opensearch_utility.h"
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <climits>
-
-// Used in the event that we run out of memory. This way we have a way of
-// settings the buffer to point at an empty char array (because the buffer
-// itself isn't const, we can't set this to const without having to later cast
-// it away)
-static char oom_buffer[1] = "";
-static char *oom_buffer_ptr = oom_buffer;
-
-static void MarkOpenSearchExpBufferBroken(OpenSearchExpBuffer str) {
-    if (str->data != oom_buffer)
-        free(str->data);
-    str->data = oom_buffer_ptr;
-    str->len = 0;
-    str->maxlen = 0;
-}
-
-static bool EnlargeOpenSearchExpBuffer(OpenSearchExpBuffer str, size_t needed) {
-    if (OpenSearchExpBufferBroken(str))
-        return 0;
-
-    if (needed >= ((size_t)INT_MAX - str->len)) {
-        MarkOpenSearchExpBufferBroken(str);
-        return false;
-    }
-
-    needed += str->len + 1;
-    if (needed <= str->maxlen)
-        return true;
-
-    size_t newlen = (str->maxlen > 0) ? (2 * str->maxlen) : 64;
-    while (needed > newlen)
-        newlen = 2 * newlen;
-
-    if (newlen > (size_t)INT_MAX)
-        newlen = (size_t)INT_MAX;
-
-    char *newdata = (char *)realloc(str->data, newlen);
-    if (newdata != NULL) {
-        str->data = newdata;
-        str->maxlen = newlen;
-        return true;
-    }
-
-    MarkOpenSearchExpBufferBroken(str);
-    return false;
-}
-
-static bool AppendOpenSearchExpBufferVA(OpenSearchExpBuffer str, const char *fmt,
-                                va_list args) {
-    size_t needed = 32;
-    if (str->maxlen > (str->len + 16)) {
-        size_t avail = str->maxlen - str->len;
-
-        int nprinted = vsnprintf(str->data + str->len, avail, fmt, args);
-        if ((nprinted < 0) || (nprinted > (INT_MAX - 1))) {
-            MarkOpenSearchExpBufferBroken(str);
-            return true;
-        } else if ((size_t)nprinted < avail) {
-            str->len += nprinted;
-            return true;
-        }
-        needed = nprinted + 1;
-    }
-    return !EnlargeOpenSearchExpBuffer(str, needed);
-}
-
-void InitOpenSearchExpBuffer(OpenSearchExpBuffer str) {
-    str->data = (char *)malloc(INITIAL_EXPBUFFER_SIZE);
-    if (str->data == NULL) {
-        str->data = oom_buffer_ptr;
-        str->maxlen = 0;
-    } else {
-        str->maxlen = INITIAL_EXPBUFFER_SIZE;
-        str->data[0] = '\0';
-    }
-    str->len = 0;
-}
-
-void AppendOpenSearchExpBuffer(OpenSearchExpBuffer str, const char *fmt, ...) {
-    if (OpenSearchExpBufferBroken(str))
-        return;
-
-    va_list args;
-    bool done = false;
-    int save_errno = errno;
-    do {
-        errno = save_errno;
-        va_start(args, fmt);
-        done = AppendOpenSearchExpBufferVA(str, fmt, args);
-        va_end(args);
-    } while (!done);
-}
-
-void TermOpenSearchExpBuffer(OpenSearchExpBuffer str) {
-    if (str->data != oom_buffer)
-        free(str->data);
-    str->data = oom_buffer_ptr;
-    str->maxlen = 0;
-    str->len = 0;
-}
diff --git a/sql-odbc/src/sqlodbc/opensearch_utility.h b/sql-odbc/src/sqlodbc/opensearch_utility.h
deleted file mode 100644
index bd5d3463c6..0000000000
--- a/sql-odbc/src/sqlodbc/opensearch_utility.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef OPENSEARCH_UTILITY_H
-#define OPENSEARCH_UTILITY_H
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct OpenSearchExpBufferData {
-    char *data;
-    size_t len;
-    size_t maxlen;
-} OpenSearchExpBufferData;
-
-typedef OpenSearchExpBufferData *OpenSearchExpBuffer;
-
-#define OpenSearchExpBufferBroken(str) ((str) == NULL || (str)->maxlen == 0)
-#define OpenSearchExpBufferDataBroken(buf) ((buf).maxlen == 0)
-#define INITIAL_EXPBUFFER_SIZE 256
-
-void InitOpenSearchExpBuffer(OpenSearchExpBuffer str);
-void AppendOpenSearchExpBuffer(OpenSearchExpBuffer str, const char *fmt, ...);
-void TermOpenSearchExpBuffer(OpenSearchExpBuffer str);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OPENSEARCH_UTILITY_H */
diff --git a/sql-odbc/src/sqlodbc/options.c b/sql-odbc/src/sqlodbc/options.c
deleted file mode 100644
index fd100c0ea7..0000000000
--- a/sql-odbc/src/sqlodbc/options.c
+++ /dev/null
@@ -1,705 +0,0 @@
-#include <string.h>
-
-#include "environ.h"
-#include "opensearch_odbc.h"
-#include "misc.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "qresult.h"
-#include "statement.h"
-#include "unicode_support.h"
-
-static RETCODE set_statement_option(ConnectionClass *conn, StatementClass *stmt,
-                                    SQLUSMALLINT fOption, SQLULEN vParam) {
-    CSTR func = "set_statement_option";
-    char changed = FALSE;
-    SQLULEN setval;
-
-    switch (fOption) {
-        case SQL_ASYNC_ENABLE: /* ignored */
-            break;
-
-        case SQL_BIND_TYPE:
-            /* now support multi-column and multi-row binding */
-            if (conn)
-                conn->ardOptions.bind_size = (SQLUINTEGER)vParam;
-            if (stmt)
-                SC_get_ARDF(stmt)->bind_size = (SQLUINTEGER)vParam;
-            break;
-
-        case SQL_CONCURRENCY:
-            /*
-             * positioned update isn't supported so cursor concurrency is
-             * read-only
-             */
-            MYLOG(OPENSEARCH_DEBUG, "SQL_CONCURRENCY = " FORMAT_LEN " ", vParam);
-            setval = SQL_CONCUR_READ_ONLY;
-            if (conn)
-                conn->stmtOptions.scroll_concurrency = (SQLUINTEGER)setval;
-            else if (stmt) {
-                if (SC_get_Result(stmt)) {
-                    SC_set_error(
-                        stmt, STMT_INVALID_CURSOR_STATE_ERROR,
-                        "The attr can't be changed because the cursor is open.",
-                        func);
-                    return SQL_ERROR;
-                }
-                stmt->options.scroll_concurrency =
-                    stmt->options_orig.scroll_concurrency = (SQLUINTEGER)setval;
-            }
-            if (setval != vParam)
-                changed = TRUE;
-            MYPRINTF(0, "-> " FORMAT_LEN "\n", setval);
-            break;
-
-        case SQL_CURSOR_TYPE:
-            /*
-             * if declare/fetch, then type can only be forward. otherwise,
-             * it can only be forward or static.
-             */
-            MYLOG(OPENSEARCH_DEBUG, "SQL_CURSOR_TYPE = " FORMAT_LEN " ", vParam);
-            setval = SQL_CURSOR_FORWARD_ONLY;
-            if (SQL_CURSOR_STATIC == vParam)
-                setval = vParam;
-            else if (SQL_CURSOR_KEYSET_DRIVEN == vParam) {
-                setval = SQL_CURSOR_STATIC; /* at least scrollable */
-            } else if (SQL_CURSOR_DYNAMIC == vParam) {
-                setval = SQL_CURSOR_STATIC; /* at least scrollable */
-            }
-            if (conn)
-                conn->stmtOptions.cursor_type = (SQLUINTEGER)setval;
-            else if (stmt) {
-                if (SC_get_Result(stmt)) {
-                    SC_set_error(
-                        stmt, STMT_INVALID_CURSOR_STATE_ERROR,
-                        "The attr can't be changed because the cursor is open.",
-                        func);
-                    return SQL_ERROR;
-                }
-                stmt->options_orig.cursor_type = stmt->options.cursor_type =
-                    (SQLUINTEGER)setval;
-            }
-            if (setval != vParam)
-                changed = TRUE;
-            MYPRINTF(0, "-> " FORMAT_LEN "\n", setval);
-            break;
-
-        case SQL_KEYSET_SIZE: /* ignored, but saved and returned	*/
-            MYLOG(OPENSEARCH_DEBUG, "SQL_KEYSET_SIZE, vParam = " FORMAT_LEN "\n",
-                  vParam);
-
-            if (conn)
-                conn->stmtOptions.keyset_size = vParam;
-            if (stmt) {
-                stmt->options_orig.keyset_size = vParam;
-                if (!SC_get_Result(stmt))
-                    stmt->options.keyset_size = vParam;
-                if (stmt->options.keyset_size != (SQLLEN)vParam)
-                    changed = TRUE;
-            }
-
-            break;
-
-        case SQL_MAX_LENGTH: /* ignored, but saved */
-            MYLOG(OPENSEARCH_DEBUG, "SQL_MAX_LENGTH, vParam = " FORMAT_LEN "\n",
-                  vParam);
-            if (conn)
-                conn->stmtOptions.maxLength = vParam;
-            if (stmt) {
-                stmt->options_orig.maxLength = vParam;
-                if (!SC_get_Result(stmt))
-                    stmt->options.maxLength = vParam;
-                if (stmt->options.maxLength != (SQLLEN)vParam)
-                    changed = TRUE;
-            }
-            break;
-
-        case SQL_MAX_ROWS: /* ignored, but saved */
-            MYLOG(OPENSEARCH_DEBUG, "SQL_MAX_ROWS, vParam = " FORMAT_LEN "\n", vParam);
-            if (conn)
-                conn->stmtOptions.maxRows = vParam;
-            if (stmt) {
-                stmt->options_orig.maxRows = vParam;
-                if (!SC_get_Result(stmt))
-                    stmt->options.maxRows = vParam;
-                if (stmt->options.maxRows != (SQLLEN)vParam)
-                    changed = TRUE;
-            }
-            break;
-
-        case SQL_NOSCAN: /* ignored */
-            MYLOG(OPENSEARCH_DEBUG, "SQL_NOSCAN, vParam = " FORMAT_LEN "\n", vParam);
-            break;
-
-        case SQL_QUERY_TIMEOUT: /* ignored */
-            MYLOG(OPENSEARCH_DEBUG, "SQL_QUERY_TIMEOUT, vParam = " FORMAT_LEN "\n",
-                  vParam);
-            if (conn)
-                conn->stmtOptions.stmt_timeout = (SQLULEN)vParam;
-            if (stmt)
-                stmt->options.stmt_timeout = (SQLULEN)vParam;
-            break;
-
-        case SQL_RETRIEVE_DATA:
-            MYLOG(OPENSEARCH_DEBUG, "SQL_RETRIEVE_DATA, vParam = " FORMAT_LEN "\n",
-                  vParam);
-            if (conn)
-                conn->stmtOptions.retrieve_data = (SQLUINTEGER)vParam;
-            if (stmt)
-                stmt->options.retrieve_data = (SQLUINTEGER)vParam;
-            break;
-
-        case SQL_ROWSET_SIZE:
-            MYLOG(OPENSEARCH_DEBUG, "SQL_ROWSET_SIZE, vParam = " FORMAT_LEN "\n",
-                  vParam);
-
-            if (vParam < 1) {
-                vParam = 1;
-                changed = TRUE;
-            }
-
-            if (conn)
-                conn->ardOptions.size_of_rowset_odbc2 = vParam;
-            if (stmt)
-                SC_get_ARDF(stmt)->size_of_rowset_odbc2 = vParam;
-            break;
-
-        case SQL_SIMULATE_CURSOR: /* NOT SUPPORTED */
-            if (stmt) {
-                SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                             "Simulated positioned update/delete not "
-                             "supported.  Use the cursor library.",
-                             func);
-            }
-            if (conn) {
-                CC_set_error(conn, CONN_NOT_IMPLEMENTED_ERROR,
-                             "Simulated positioned update/delete not "
-                             "supported.  Use the cursor library.",
-                             func);
-            }
-            return SQL_ERROR;
-
-        case SQL_USE_BOOKMARKS:
-            if (stmt) {
-                MYLOG(
-                    OPENSEARCH_DEBUG, "USE_BOOKMARKS %s\n",
-                    (vParam == SQL_UB_OFF)
-                        ? "off"
-                        : ((vParam == SQL_UB_VARIABLE) ? "variable" : "fixed"));
-                setval = vParam;
-                stmt->options.use_bookmarks = (SQLUINTEGER)setval;
-            }
-            if (conn)
-                conn->stmtOptions.use_bookmarks = (SQLUINTEGER)vParam;
-            break;
-
-        case 1204: /* SQL_COPT_SS_PRESERVE_CURSORS ? */
-            if (stmt) {
-                SC_set_error(stmt, STMT_OPTION_NOT_FOR_THE_DRIVER,
-                             "The option may be for MS SQL Server(Set)", func);
-            } else if (conn) {
-                CC_set_error(conn, CONN_OPTION_NOT_FOR_THE_DRIVER,
-                             "The option may be for MS SQL Server(Set)", func);
-            }
-            return SQL_ERROR;
-        case 1227: /* SQL_SOPT_SS_HIDDEN_COLUMNS ? */
-        case 1228: /* SQL_SOPT_SS_NOBROWSETABLE ? */
-            if (stmt) {
-#ifndef NOT_USED
-                if (0 != vParam)
-                    changed = TRUE;
-                break;
-#else
-                SC_set_error(stmt, STMT_OPTION_NOT_FOR_THE_DRIVER,
-                             "The option may be for MS SQL Server(Set)", func);
-#endif /* NOT_USED */
-            } else if (conn) {
-                CC_set_error(conn, CONN_OPTION_NOT_FOR_THE_DRIVER,
-                             "The option may be for MS SQL Server(Set)", func);
-            }
-            return SQL_ERROR;
-        default: {
-            char option[64];
-
-            if (stmt) {
-                SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                             "Unknown statement option (Set)", func);
-                SPRINTF_FIXED(option, "fOption=%d, vParam=" FORMAT_ULEN,
-                              fOption, vParam);
-                SC_log_error(func, option, stmt);
-            }
-            if (conn) {
-                CC_set_error(conn, CONN_NOT_IMPLEMENTED_ERROR,
-                             "Unknown statement option (Set)", func);
-                SPRINTF_FIXED(option, "fOption=%d, vParam=" FORMAT_ULEN,
-                              fOption, vParam);
-                CC_log_error(func, option, conn);
-            }
-
-            return SQL_ERROR;
-        }
-    }
-
-    if (changed) {
-        if (stmt) {
-            SC_set_error(stmt, STMT_OPTION_VALUE_CHANGED,
-                         "Requested value changed.", func);
-        }
-        if (conn) {
-            CC_set_error(conn, CONN_OPTION_VALUE_CHANGED,
-                         "Requested value changed.", func);
-        }
-        return SQL_SUCCESS_WITH_INFO;
-    } else
-        return SQL_SUCCESS;
-}
-
-/* Implements only SQL_AUTOCOMMIT */
-RETCODE SQL_API OPENSEARCHAPI_SetConnectOption(HDBC hdbc, SQLUSMALLINT fOption,
-                                       SQLULEN vParam) {
-    CSTR func = "OPENSEARCHAPI_SetConnectOption";
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-    char changed = FALSE;
-    RETCODE retval;
-    BOOL autocomm_on;
-
-    MYLOG(OPENSEARCH_TRACE, "entering fOption = %d vParam = " FORMAT_LEN "\n", fOption,
-          vParam);
-    if (!conn) {
-        CC_log_error(func, "", NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    switch (fOption) {
-        /*
-         * Statement Options (apply to all stmts on the connection and
-         * become defaults for new stmts)
-         */
-        case SQL_ASYNC_ENABLE:
-        case SQL_BIND_TYPE:
-        case SQL_CONCURRENCY:
-        case SQL_CURSOR_TYPE:
-        case SQL_KEYSET_SIZE:
-        case SQL_MAX_LENGTH:
-        case SQL_MAX_ROWS:
-        case SQL_NOSCAN:
-        case SQL_QUERY_TIMEOUT:
-        case SQL_RETRIEVE_DATA:
-        case SQL_ROWSET_SIZE:
-        case SQL_SIMULATE_CURSOR:
-        case SQL_USE_BOOKMARKS:
-            /*
-             * Become the default for all future statements on this
-             * connection
-             */
-            retval = set_statement_option(conn, NULL, fOption, vParam);
-
-            if (retval == SQL_SUCCESS_WITH_INFO)
-                changed = TRUE;
-            else if (retval == SQL_ERROR)
-                return SQL_ERROR;
-
-            break;
-
-            /*
-             * Connection Options
-             */
-
-        case SQL_ACCESS_MODE: /* ignored */
-            break;
-
-        case SQL_AUTOCOMMIT:
-            switch (vParam) {
-                case SQL_AUTOCOMMIT_ON:
-                    autocomm_on = TRUE;
-                    break;
-                default:
-                    CC_set_error(conn, CONN_INVALID_ARGUMENT_NO,
-                                 "Illegal parameter value for SQL_AUTOCOMMIT. "
-                                 "Turning SQL_AUTOCOMMIT off requires "
-                                 "transactions, which are not supported.",
-                                 func);
-                    return SQL_ERROR;
-            }
-            if (autocomm_on && SQL_AUTOCOMMIT_OFF != conn->autocommit_public)
-                break;
-            else if (!autocomm_on
-                     && SQL_AUTOCOMMIT_OFF == conn->autocommit_public)
-                break;
-            conn->autocommit_public =
-                (autocomm_on ? SQL_AUTOCOMMIT_ON : SQL_AUTOCOMMIT_OFF);
-            MYLOG(OPENSEARCH_DEBUG,
-                  "AUTOCOMMIT: transact_status=%d, vparam=" FORMAT_LEN "\n",
-                  conn->transact_status, vParam);
-
-            CC_set_autocommit(conn, autocomm_on);
-            break;
-
-        case SQL_CURRENT_QUALIFIER: /* ignored */
-            break;
-
-        case SQL_LOGIN_TIMEOUT:
-            conn->login_timeout = (SQLUINTEGER)vParam;
-            break;
-
-        case SQL_PACKET_SIZE: /* ignored */
-            break;
-
-        case SQL_QUIET_MODE: /* ignored */
-            break;
-
-        case SQL_TXN_ISOLATION:
-            if (conn->isolation == vParam)
-                break;
-            /*
-             * If the connection is not established, just record the setting to
-             * reflect it upon connection.
-             */
-            if (CC_not_connected(conn)) {
-                conn->isolation = (UInt4)vParam;
-                break;
-            }
-
-            conn->isolation = (UInt4)vParam;
-            break;
-
-        /* These options should be handled by driver manager */
-        case SQL_ODBC_CURSORS:
-        case SQL_OPT_TRACE:
-        case SQL_OPT_TRACEFILE:
-        case SQL_TRANSLATE_DLL:
-        case SQL_TRANSLATE_OPTION:
-            CC_log_error(
-                func,
-                "This connect option (Set) is only used by the Driver Manager",
-                conn);
-            break;
-
-        default: {
-            char option[64];
-
-            CC_set_error(conn, CONN_UNSUPPORTED_OPTION,
-                         "Unknown connect option (Set)", func);
-            SPRINTF_FIXED(option, "fOption=%d, vParam=" FORMAT_LEN, fOption,
-                          vParam);
-#ifdef WIN32
-            if (fOption == 30002 && vParam) {
-                int cmp;
-#ifdef UNICODE_SUPPORT
-                if (CC_is_in_unicode_driver(conn)) {
-                    char *asPara =
-                        ucs2_to_utf8((SQLWCHAR *)vParam, SQL_NTS, NULL, FALSE);
-                    cmp = strcmp(asPara, "Microsoft Jet");
-                    free(asPara);
-                } else
-#endif /* UNICODE_SUPPORT */
-                    cmp = strncmp((char *)vParam, "Microsoft Jet", 13);
-                if (0 == cmp) {
-                    MYLOG(OPENSEARCH_DEBUG, "Microsoft Jet !!!!\n");
-                    CC_set_errornumber(conn, 0);
-                    conn->ms_jet = 1;
-                    return SQL_SUCCESS;
-                }
-            }
-#endif /* WIN32 */
-            CC_log_error(func, option, conn);
-            return SQL_ERROR;
-        }
-    }
-
-    if (changed) {
-        CC_set_error(conn, CONN_OPTION_VALUE_CHANGED,
-                     "Requested value changed.", func);
-        return SQL_SUCCESS_WITH_INFO;
-    } else
-        return SQL_SUCCESS;
-}
-
-/* This function just can tell you whether you are in Autcommit mode or not */
-RETCODE SQL_API OPENSEARCHAPI_GetConnectOption(HDBC hdbc, SQLUSMALLINT fOption,
-                                       PTR pvParam, SQLINTEGER *StringLength,
-                                       SQLINTEGER BufferLength) {
-    CSTR func = "OPENSEARCHAPI_GetConnectOption";
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-    const char *p = NULL;
-    SQLLEN len = sizeof(SQLINTEGER);
-    SQLRETURN result = SQL_SUCCESS;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-
-    if (!conn) {
-        CC_log_error(func, "", NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    switch (fOption) {
-        case SQL_ACCESS_MODE: /* NOT SUPPORTED */
-            *((SQLUINTEGER *)pvParam) = SQL_MODE_READ_WRITE;
-            break;
-
-        case SQL_AUTOCOMMIT:
-            *((SQLUINTEGER *)pvParam) = conn->autocommit_public;
-            break;
-
-        case SQL_CURRENT_QUALIFIER: /* don't use qualifiers */
-            len = 0;
-            p = CurrCatString(conn);
-            break;
-
-        case SQL_LOGIN_TIMEOUT:
-            *((SQLUINTEGER *)pvParam) = conn->login_timeout;
-            break;
-
-        case SQL_PACKET_SIZE: /* NOT SUPPORTED */
-            *((SQLUINTEGER *)pvParam) = 4096;
-            break;
-
-        case SQL_QUERY_TIMEOUT:
-            *((SQLULEN *)pvParam) = conn->stmtOptions.stmt_timeout;
-            break;
-
-        case SQL_QUIET_MODE: /* NOT SUPPORTED */
-            *((SQLULEN *)pvParam) = 0;
-            break;
-
-        case SQL_TXN_ISOLATION:
-            if (conn->isolation == 0) {
-                if (CC_not_connected(conn))
-                    return SQL_NO_DATA;
-                conn->isolation = CC_get_isolation(conn);
-            }
-            *((SQLUINTEGER *)pvParam) = conn->isolation;
-            break;
-
-#ifdef SQL_ATTR_CONNECTION_DEAD
-        case SQL_ATTR_CONNECTION_DEAD:
-#else
-        case 1209:
-#endif /* SQL_ATTR_CONNECTION_DEAD */
-            MYLOG(OPENSEARCH_DEBUG, "CONNECTION_DEAD status=%d", conn->status);
-            *((SQLUINTEGER *)pvParam) = CC_not_connected(conn);
-            MYPRINTF(0, " val=" FORMAT_UINTEGER "\n",
-                     *((SQLUINTEGER *)pvParam));
-            break;
-
-        case SQL_ATTR_ANSI_APP:
-            *((SQLUINTEGER *)pvParam) = CC_is_in_ansi_app(conn);
-            MYLOG(OPENSEARCH_DEBUG, "ANSI_APP val=" FORMAT_UINTEGER "\n",
-                  *((SQLUINTEGER *)pvParam));
-            break;
-
-            /* These options should be handled by driver manager */
-        case SQL_ODBC_CURSORS:
-        case SQL_OPT_TRACE:
-        case SQL_OPT_TRACEFILE:
-        case SQL_TRANSLATE_DLL:
-        case SQL_TRANSLATE_OPTION:
-            CC_log_error(
-                func,
-                "This connect option (Get) is only used by the Driver Manager",
-                conn);
-            break;
-
-        default: {
-            char option[64];
-
-            CC_set_error(conn, CONN_UNSUPPORTED_OPTION,
-                         "Unknown connect option (Get)", func);
-            SPRINTF_FIXED(option, "fOption=%d", fOption);
-            CC_log_error(func, option, conn);
-            return SQL_ERROR;
-            break;
-        }
-    }
-
-    if (NULL != p && 0 == len) {
-        /* char/binary data */
-        len = strlen(p);
-
-        if (pvParam) {
-#ifdef UNICODE_SUPPORT
-            if (CC_is_in_unicode_driver(conn)) {
-                len = utf8_to_ucs2(p, len, (SQLWCHAR *)pvParam,
-                                   BufferLength / WCLEN);
-                len *= WCLEN;
-            } else
-#endif /* UNICODE_SUPPORT */
-                strncpy_null((char *)pvParam, p, (size_t)BufferLength);
-
-            if (len >= BufferLength) {
-                result = SQL_SUCCESS_WITH_INFO;
-                CC_set_error(conn, CONN_TRUNCATED,
-                             "The buffer was too small for the pvParam.", func);
-            }
-        }
-    }
-    if (StringLength)
-        *StringLength = (SQLINTEGER)len;
-    return result;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_SetStmtOption(HSTMT hstmt, SQLUSMALLINT fOption,
-                                    SQLULEN vParam) {
-    CSTR func = "OPENSEARCHAPI_SetStmtOption";
-    StatementClass *stmt = (StatementClass *)hstmt;
-    RETCODE retval;
-
-    MYLOG(OPENSEARCH_DEBUG, " entering...\n");
-
-    /*
-     * Though we could fake Access out by just returning SQL_SUCCESS all
-     * the time, but it tries to set a huge value for SQL_MAX_LENGTH and
-     * expects the driver to reduce it to the real value.
-     */
-    if (!stmt) {
-        SC_log_error(func, "", NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    retval = set_statement_option(NULL, stmt, fOption, vParam);
-    return retval;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_GetStmtOption(HSTMT hstmt, SQLUSMALLINT fOption,
-                                    PTR pvParam, SQLINTEGER *StringLength,
-                                    SQLINTEGER BufferLength) {
-    UNUSED(BufferLength);
-    CSTR func = "OPENSEARCHAPI_GetStmtOption";
-    StatementClass *stmt = (StatementClass *)hstmt;
-    QResultClass *res;
-    SQLLEN ridx;
-    SQLINTEGER len = sizeof(SQLINTEGER);
-    Int4 bookmark;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-
-    /*
-     * thought we could fake Access out by just returning SQL_SUCCESS all
-     * the time, but it tries to set a huge value for SQL_MAX_LENGTH and
-     * expects the driver to reduce it to the real value
-     */
-    if (!stmt) {
-        SC_log_error(func, "", NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    switch (fOption) {
-        case SQL_GET_BOOKMARK:
-        case SQL_ROW_NUMBER:
-
-            res = SC_get_Curres(stmt);
-            if (!res) {
-                SC_set_error(stmt, STMT_INVALID_CURSOR_STATE_ERROR,
-                             "The cursor has no result.", func);
-                return SQL_ERROR;
-            }
-
-            ridx = GIdx2CacheIdx(stmt->currTuple, stmt, res);
-            if (!SC_is_fetchcursor(stmt)) {
-                /* make sure we're positioned on a valid row */
-                if ((ridx < 0)
-                    || (((SQLULEN)ridx) >= QR_get_num_cached_tuples(res))) {
-                    SC_set_error(stmt, STMT_INVALID_CURSOR_STATE_ERROR,
-                                 "Not positioned on a valid row.", func);
-                    return SQL_ERROR;
-                }
-            } else {
-                if (stmt->currTuple < 0 || !res->tupleField) {
-                    SC_set_error(stmt, STMT_INVALID_CURSOR_STATE_ERROR,
-                                 "Not positioned on a valid row.", func);
-                    return SQL_ERROR;
-                }
-            }
-
-            if (fOption == SQL_GET_BOOKMARK
-                && stmt->options.use_bookmarks == SQL_UB_OFF) {
-                SC_set_error(
-                    stmt, STMT_OPERATION_INVALID,
-                    "Operation invalid because use bookmarks not enabled.",
-                    func);
-                return SQL_ERROR;
-            }
-
-            bookmark = (int)SC_make_int4_bookmark(stmt->currTuple);
-            memcpy(pvParam, &bookmark, sizeof(UInt4));
-
-            break;
-
-        case SQL_ASYNC_ENABLE: /* NOT SUPPORTED */
-            *((SQLINTEGER *)pvParam) = SQL_ASYNC_ENABLE_OFF;
-            break;
-
-        case SQL_BIND_TYPE:
-            *((SQLINTEGER *)pvParam) = SC_get_ARDF(stmt)->bind_size;
-            break;
-
-        case SQL_CONCURRENCY: /* NOT REALLY SUPPORTED */
-            MYLOG(OPENSEARCH_DEBUG, "SQL_CONCURRENCY " FORMAT_INTEGER "\n",
-                  stmt->options.scroll_concurrency);
-            *((SQLINTEGER *)pvParam) = stmt->options.scroll_concurrency;
-            break;
-
-        case SQL_CURSOR_TYPE: /* PARTIAL SUPPORT */
-            MYLOG(OPENSEARCH_DEBUG, "SQL_CURSOR_TYPE " FORMAT_INTEGER "\n",
-                  stmt->options.cursor_type);
-            *((SQLINTEGER *)pvParam) = stmt->options.cursor_type;
-            break;
-
-        case SQL_KEYSET_SIZE: /* NOT SUPPORTED, but saved */
-            MYLOG(OPENSEARCH_DEBUG, "SQL_KEYSET_SIZE\n");
-            *((SQLLEN *)pvParam) = stmt->options.keyset_size;
-            break;
-
-        case SQL_MAX_LENGTH: /* NOT SUPPORTED, but saved */
-            *((SQLLEN *)pvParam) = stmt->options.maxLength;
-            break;
-
-        case SQL_MAX_ROWS: /* NOT SUPPORTED, but saved */
-            *((SQLLEN *)pvParam) = stmt->options.maxRows;
-            MYLOG(OPENSEARCH_DEBUG, "MAX_ROWS, returning " FORMAT_LEN "\n",
-                  stmt->options.maxRows);
-            break;
-
-        case SQL_NOSCAN: /* NOT SUPPORTED */
-            *((SQLINTEGER *)pvParam) = SQL_NOSCAN_ON;
-            break;
-
-        case SQL_QUERY_TIMEOUT: /* NOT SUPPORTED */
-            *((SQLULEN *)pvParam) = stmt->options.stmt_timeout;
-            break;
-
-        case SQL_RETRIEVE_DATA:
-            *((SQLINTEGER *)pvParam) = stmt->options.retrieve_data;
-            break;
-
-        case SQL_ROWSET_SIZE:
-            *((SQLLEN *)pvParam) = SC_get_ARDF(stmt)->size_of_rowset_odbc2;
-            break;
-
-        case SQL_SIMULATE_CURSOR: /* NOT SUPPORTED */
-            *((SQLINTEGER *)pvParam) = SQL_SC_NON_UNIQUE;
-            break;
-
-        case SQL_USE_BOOKMARKS:
-            *((SQLINTEGER *)pvParam) = stmt->options.use_bookmarks;
-            break;
-        case 1227: /* SQL_SOPT_SS_HIDDEN_COLUMNS ? */
-        case 1228: /* SQL_SOPT_SS_NOBROWSETABLE ? */
-            *((SQLINTEGER *)pvParam) = 0;
-            break;
-
-        default: {
-            char option[64];
-
-            SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR,
-                         "Unknown statement option (Get)", func);
-            SPRINTF_FIXED(option, "fOption=%d", fOption);
-            SC_log_error(func, option, stmt);
-            return SQL_ERROR;
-        }
-    }
-    if (StringLength)
-        *StringLength = len;
-
-    return SQL_SUCCESS;
-}
diff --git a/sql-odbc/src/sqlodbc/parse.c b/sql-odbc/src/sqlodbc/parse.c
deleted file mode 100644
index 670a61a6cd..0000000000
--- a/sql-odbc/src/sqlodbc/parse.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "catfunc.h"
-#include "opensearch_odbc.h"
-#include "opensearch_types.h"
-#include "misc.h"
-#include "multibyte.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "opensearch_info.h"
-#include "qresult.h"
-#include "statement.h"
-
-Int4 FI_precision(const FIELD_INFO *fi) {
-    OID ftype;
-
-    if (!fi)
-        return -1;
-    ftype = FI_type(fi);
-    switch (ftype) {
-        case OPENSEARCH_TYPE_NUMERIC:
-            return fi->column_size;
-        case OPENSEARCH_TYPE_DATETIME:
-        case OPENSEARCH_TYPE_TIMESTAMP_NO_TMZONE:
-            return fi->decimal_digits;
-    }
-    return 0;
-}
-
-static void setNumFields(IRDFields *irdflds, size_t numFields) {
-    FIELD_INFO **fi = irdflds->fi;
-    size_t nfields = irdflds->nfields;
-
-    if (numFields < nfields) {
-        int i;
-
-        for (i = (int)numFields; i < (int)nfields; i++) {
-            if (fi[i])
-                fi[i]->flag = 0;
-        }
-    }
-    irdflds->nfields = (UInt4)numFields;
-}
-
-void SC_initialize_cols_info(StatementClass *stmt, BOOL DCdestroy,
-                             BOOL parseReset) {
-    IRDFields *irdflds = SC_get_IRDF(stmt);
-
-    /* Free the parsed table information */
-    if (stmt->ti) {
-        TI_Destructor(stmt->ti, stmt->ntab);
-        free(stmt->ti);
-        stmt->ti = NULL;
-    }
-    stmt->ntab = 0;
-    if (DCdestroy) /* Free the parsed field information */
-        DC_Destructor((DescriptorClass *)SC_get_IRD(stmt));
-    else
-        setNumFields(irdflds, 0);
-    if (parseReset) {
-        stmt->parse_status = STMT_PARSE_NONE;
-        SC_reset_updatable(stmt);
-    }
-}
diff --git a/sql-odbc/src/sqlodbc/qresult.c b/sql-odbc/src/sqlodbc/qresult.c
deleted file mode 100644
index 27c299098a..0000000000
--- a/sql-odbc/src/sqlodbc/qresult.c
+++ /dev/null
@@ -1,469 +0,0 @@
-#include "qresult.h"
-
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "misc.h"
-#include "opensearch_statement.h"
-#include "statement.h"
-
-/*
- *	Used for building a Manual Result only
- *	All info functions call this function to create the manual result set.
- */
-void QR_set_num_fields(QResultClass *self, int new_num_fields) {
-    if (!self)
-        return;
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-
-    CI_set_num_fields(QR_get_fields(self), (SQLSMALLINT)new_num_fields);
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-}
-
-void QR_set_position(QResultClass *self, SQLLEN pos) {
-    self->tupleField =
-        self->backend_tuples
-        + ((QR_get_rowstart_in_cache(self) + pos) * self->num_fields);
-}
-
-void QR_set_reqsize(QResultClass *self, Int4 reqsize) {
-    self->rowset_size_include_ommitted = reqsize;
-}
-
-void QR_set_cursor(QResultClass *self, const char *name) {
-    ConnectionClass *conn = QR_get_conn(self);
-
-    if (self->cursor_name) {
-        if (name && 0 == strcmp(name, self->cursor_name))
-            return;
-        free(self->cursor_name);
-        if (conn) {
-            CONNLOCK_ACQUIRE(conn);
-            conn->ncursors--;
-            CONNLOCK_RELEASE(conn);
-        }
-        self->cursTuple = -1;
-        QR_set_no_cursor(self);
-    } else if (NULL == name)
-        return;
-    if (name) {
-        self->cursor_name = strdup(name);
-        if (conn) {
-            CONNLOCK_ACQUIRE(conn);
-            conn->ncursors++;
-            CONNLOCK_RELEASE(conn);
-        }
-    } else {
-        QResultClass *res;
-
-        self->cursor_name = NULL;
-        for (res = self->next; NULL != res; res = res->next) {
-            if (NULL != res->cursor_name)
-                free(res->cursor_name);
-            res->cursor_name = NULL;
-        }
-    }
-}
-
-void QR_set_rowstart_in_cache(QResultClass *self, SQLLEN start) {
-    if (QR_synchronize_keys(self))
-        self->key_base = start;
-    self->base = start;
-}
-
-void QR_inc_rowstart_in_cache(QResultClass *self, SQLLEN base_inc) {
-    if (!QR_has_valid_base(self))
-        MYLOG(OPENSEARCH_DEBUG, " called while the cache is not ready\n");
-    self->base += base_inc;
-    if (QR_synchronize_keys(self))
-        self->key_base = self->base;
-}
-
-void QR_set_fields(QResultClass *self, ColumnInfoClass *fields) {
-    ColumnInfoClass *curfields = QR_get_fields(self);
-
-    if (curfields == fields)
-        return;
-
-    /*
-     * Unlink the old columninfo from this result set, freeing it if this
-     * was the last reference.
-     */
-    if (NULL != curfields) {
-        if (curfields->refcount > 1)
-            curfields->refcount--;
-        else
-            CI_Destructor(curfields);
-    }
-    self->fields = fields;
-    if (NULL != fields)
-        fields->refcount++;
-}
-
-/*
- * CLASS QResult
- */
-QResultClass *QR_Constructor(void) {
-    QResultClass *rv;
-
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    rv = (QResultClass *)malloc(sizeof(QResultClass));
-
-    if (rv != NULL) {
-        ColumnInfoClass *fields;
-
-        rv->rstatus = PORES_EMPTY_QUERY;
-        rv->pstatus = 0;
-
-        /* construct the column info */
-        rv->fields = NULL;
-        if (fields = CI_Constructor(), NULL == fields) {
-            free(rv);
-            return NULL;
-        }
-        QR_set_fields(rv, fields);
-        rv->backend_tuples = NULL;
-        rv->sqlstate[0] = '\0';
-        rv->message = NULL;
-        rv->messageref = NULL;
-        rv->command = NULL;
-        rv->notice = NULL;
-        rv->conn = NULL;
-        rv->next = NULL;
-        rv->count_backend_allocated = 0;
-        rv->count_keyset_allocated = 0;
-        rv->num_total_read = 0;
-        rv->num_cached_rows = 0;
-        rv->num_cached_keys = 0;
-        rv->fetch_number = 0;
-        rv->flags =
-            0; /* must be cleared before calling QR_set_rowstart_in_cache() */
-        QR_set_rowstart_in_cache(rv, -1);
-        rv->key_base = -1;
-        rv->recent_processed_row_count = -1;
-        rv->cursTuple = -1;
-        rv->move_offset = 0;
-        rv->num_fields = 0;
-        rv->num_key_fields = OPENSEARCH_NUM_NORMAL_KEYS; /* CTID + OID */
-        rv->tupleField = NULL;
-        rv->cursor_name = NULL;
-        rv->aborted = FALSE;
-
-        rv->cache_size = 0;
-        rv->cmd_fetch_size = 0;
-        rv->rowset_size_include_ommitted = 1;
-        rv->move_direction = 0;
-        rv->keyset = NULL;
-        rv->reload_count = 0;
-        rv->rb_alloc = 0;
-        rv->rb_count = 0;
-        rv->dataFilled = FALSE;
-        rv->rollback = NULL;
-        rv->ad_alloc = 0;
-        rv->ad_count = 0;
-        rv->added_keyset = NULL;
-        rv->added_tuples = NULL;
-        rv->up_alloc = 0;
-        rv->up_count = 0;
-        rv->updated = NULL;
-        rv->updated_keyset = NULL;
-        rv->updated_tuples = NULL;
-        rv->dl_alloc = 0;
-        rv->dl_count = 0;
-        rv->deleted = NULL;
-        rv->deleted_keyset = NULL;
-        rv->opensearch_result = NULL;
-        rv->server_cursor_id = NULL;
-    }
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-    return rv;
-}
-
-void QR_close_result(QResultClass *self, BOOL destroy) {
-    UNUSED(self);
-    QResultClass *next;
-    BOOL top = TRUE;
-
-    if (!self)
-        return;
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-
-    while (self) {
-        QR_free_memory(self); /* safe to call anyway */
-
-        /*
-         * Should have been freed in the close() but just in case...
-         * QR_set_cursor clears the cursor name of all the chained results too,
-         * so we only need to do this for the first result in the chain.
-         */
-        if (top)
-            QR_set_cursor(self, NULL);
-
-        /* Free up column info */
-        if (destroy)
-            QR_set_fields(self, NULL);
-
-        /* Free command info (this is from strdup()) */
-        if (self->command) {
-            free(self->command);
-            self->command = NULL;
-        }
-
-        /* Free message info (this is from strdup()) */
-        if (self->message) {
-            free(self->message);
-            self->message = NULL;
-        }
-
-        /* Free notice info (this is from strdup()) */
-        if (self->notice) {
-            free(self->notice);
-            self->notice = NULL;
-        }
-
-        /* Free server_cursor_id (this is from strdup()) */
-        if (self->server_cursor_id) {
-            free(self->server_cursor_id);
-            self->server_cursor_id = NULL;
-        }
-
-        /* Destruct the result object in the chain */
-        next = self->next;
-        self->next = NULL;
-        if (destroy)
-            free(self);
-
-        /* Repeat for the next result in the chain */
-        self = next;
-        destroy = TRUE; /* always destroy chained results */
-        top = FALSE;
-    }
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-}
-
-void QR_reset_for_re_execute(QResultClass *self) {
-    MYLOG(OPENSEARCH_TRACE, "entering for %p\n", self);
-    if (!self)
-        return;
-    QR_close_result(self, FALSE);
-    /* reset flags etc */
-    self->flags = 0;
-    QR_set_rowstart_in_cache(self, -1);
-    self->recent_processed_row_count = -1;
-    /* clear error info etc */
-    self->rstatus = PORES_EMPTY_QUERY;
-    self->aborted = FALSE;
-    self->sqlstate[0] = '\0';
-    self->messageref = NULL;
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-}
-
-void QR_Destructor(QResultClass *self) {
-    MYLOG(OPENSEARCH_TRACE, "entering\n");
-    if (!self)
-        return;
-    QR_close_result(self, TRUE);
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-}
-
-void QR_set_command(QResultClass *self, const char *msg) {
-    if (self->command)
-        free(self->command);
-
-    self->command = msg ? strdup(msg) : NULL;
-}
-
-void QR_set_message(QResultClass *self, const char *msg) {
-    if (self->message)
-        free(self->message);
-    self->messageref = NULL;
-
-    self->message = msg ? strdup(msg) : NULL;
-}
-
-void QR_set_server_cursor_id(QResultClass *self, const char *server_cursor_id) {
-    if (self->server_cursor_id) {
-        free(self->server_cursor_id);
-    }
-
-    self->server_cursor_id = server_cursor_id ? strdup(server_cursor_id) : NULL;
-}
-
-void QR_add_message(QResultClass *self, const char *msg) {
-    char *message = self->message;
-    size_t alsize, pos, addlen;
-
-    if (!msg || !msg[0])
-        return;
-    addlen = strlen(msg);
-    if (message) {
-        pos = strlen(message) + 1;
-        alsize = pos + addlen + 1;
-    } else {
-        pos = 0;
-        alsize = addlen + 1;
-    }
-    char *message_tmp = realloc(message, alsize);
-    if (message_tmp) {
-        message = message_tmp;
-        if (pos > 0)
-            message[pos - 1] = ';';
-        strncpy_null(message + pos, msg, addlen + 1);
-        self->message = message;
-    }
-}
-
-void QR_set_notice(QResultClass *self, const char *msg) {
-    if (self->notice)
-        free(self->notice);
-
-    self->notice = msg ? strdup(msg) : NULL;
-}
-
-void QR_add_notice(QResultClass *self, const char *msg) {
-    char *message = self->notice;
-    size_t alsize, pos, addlen;
-
-    if (!msg || !msg[0])
-        return;
-    addlen = strlen(msg);
-    if (message) {
-        pos = strlen(message) + 1;
-        alsize = pos + addlen + 1;
-    } else {
-        pos = 0;
-        alsize = addlen + 1;
-    }
-    char *message_tmp = realloc(message, alsize);
-    if (message_tmp) {
-        message = message_tmp;
-        if (pos > 0)
-            message[pos - 1] = ';';
-        strncpy_null(message + pos, msg, addlen + 1);
-        self->notice = message;
-    }
-}
-
-TupleField *QR_AddNew(QResultClass *self) {
-    size_t alloc;
-    UInt4 num_fields;
-
-    if (!self)
-        return NULL;
-    MYLOG(OPENSEARCH_ALL, FORMAT_ULEN "th row(%d fields) alloc=" FORMAT_LEN "\n",
-          self->num_cached_rows, QR_NumResultCols(self),
-          self->count_backend_allocated);
-    if (num_fields = QR_NumResultCols(self), !num_fields)
-        return NULL;
-    if (self->num_fields <= 0) {
-        self->num_fields = (unsigned short)num_fields;
-        QR_set_reached_eof(self);
-    }
-    alloc = self->count_backend_allocated;
-    if (!self->backend_tuples) {
-        self->num_cached_rows = 0;
-        alloc = TUPLE_MALLOC_INC;
-        QR_MALLOC_return_with_error(self->backend_tuples, TupleField,
-                                    alloc * sizeof(TupleField) * num_fields,
-                                    self, "Out of memory in QR_AddNew.", NULL);
-    } else if (self->num_cached_rows >= self->count_backend_allocated) {
-        alloc = self->count_backend_allocated * 2;
-        QR_REALLOC_return_with_error(self->backend_tuples, TupleField,
-                                     alloc * sizeof(TupleField) * num_fields,
-                                     self, "Out of memory in QR_AddNew.", NULL);
-    }
-    self->count_backend_allocated = alloc;
-
-    if (self->backend_tuples) {
-        memset(self->backend_tuples + num_fields * self->num_cached_rows, 0,
-               num_fields * sizeof(TupleField));
-        self->num_cached_rows++;
-        self->ad_count++;
-    }
-    return self->backend_tuples + num_fields * (self->num_cached_rows - 1);
-}
-
-void QR_free_memory(QResultClass *self) {
-    SQLLEN num_backend_rows = self->num_cached_rows;
-    int num_fields = self->num_fields;
-
-    MYLOG(OPENSEARCH_TRACE, "entering fcount=" FORMAT_LEN "\n", num_backend_rows);
-
-    if (self->backend_tuples) {
-        ClearCachedRows(self->backend_tuples, num_fields, num_backend_rows);
-        free(self->backend_tuples);
-        self->count_backend_allocated = 0;
-        self->backend_tuples = NULL;
-        self->dataFilled = FALSE;
-        self->tupleField = NULL;
-    }
-    if (self->keyset) {
-        free(self->keyset);
-        self->keyset = NULL;
-        self->count_keyset_allocated = 0;
-        self->reload_count = 0;
-    }
-    if (self->rollback) {
-        free(self->rollback);
-        self->rb_alloc = 0;
-        self->rb_count = 0;
-        self->rollback = NULL;
-    }
-    if (self->deleted) {
-        free(self->deleted);
-        self->deleted = NULL;
-    }
-    if (self->deleted_keyset) {
-        free(self->deleted_keyset);
-        self->deleted_keyset = NULL;
-    }
-    self->dl_alloc = 0;
-    self->dl_count = 0;
-    /* clear added info */
-    if (self->added_keyset) {
-        free(self->added_keyset);
-        self->added_keyset = NULL;
-    }
-    if (self->added_tuples) {
-        ClearCachedRows(self->added_tuples, num_fields, self->ad_count);
-        free(self->added_tuples);
-        self->added_tuples = NULL;
-    }
-    self->ad_alloc = 0;
-    self->ad_count = 0;
-    /* clear updated info */
-    if (self->updated) {
-        free(self->updated);
-        self->updated = NULL;
-    }
-    if (self->updated_keyset) {
-        free(self->updated_keyset);
-        self->updated_keyset = NULL;
-    }
-    if (self->updated_tuples) {
-        ClearCachedRows(self->updated_tuples, num_fields, self->up_count);
-        free(self->updated_tuples);
-        self->updated_tuples = NULL;
-    }
-    if (self->opensearch_result) {
-        ClearOpenSearchResult(self->opensearch_result);
-        self->opensearch_result = NULL;
-    }
-
-    self->up_alloc = 0;
-    self->up_count = 0;
-
-    self->num_total_read = 0;
-    self->num_cached_rows = 0;
-    self->num_cached_keys = 0;
-    self->cursTuple = -1;
-    self->pstatus = 0;
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-}
diff --git a/sql-odbc/src/sqlodbc/qresult.h b/sql-odbc/src/sqlodbc/qresult.h
deleted file mode 100644
index 4e44c24638..0000000000
--- a/sql-odbc/src/sqlodbc/qresult.h
+++ /dev/null
@@ -1,292 +0,0 @@
-#ifndef __QRESULT_H__
-#define __QRESULT_H__
-
-#include "columninfo.h"
-#include "opensearch_connection.h"
-#include "opensearch_odbc.h"
-#include "tuple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum QueryResultCode_ {
-    PORES_EMPTY_QUERY = 0,
-    PORES_COMMAND_OK, /* a query command that doesn't return
-                       * anything was executed properly by the backend */
-    PORES_TUPLES_OK,  /* a query command that returns tuples
-                       * was executed properly by the backend, OpenSearchResult
-                       * contains the resulttuples */
-    PORES_COPY_OUT,
-    PORES_COPY_IN,
-    PORES_BAD_RESPONSE, /* an unexpected response was recv'd from
-                         * the backend */
-    PORES_NONFATAL_ERROR,
-    PORES_FATAL_ERROR,
-    PORES_NO_MEMORY_ERROR,
-    PORES_FIELDS_OK = 100, /* field information from a query was
-                            * successful */
-    /* PORES_END_TUPLES, */
-    PORES_INTERNAL_ERROR
-} QueryResultCode;
-
-enum {
-    FQR_REACHED_EOF = (1L << 1) /* reached eof */
-    ,
-    FQR_HAS_VALID_BASE = (1L << 2),
-    FQR_NEEDS_SURVIVAL_CHECK = (1L << 3) /* check if the cursor is open */
-};
-
-struct QResultClass_ {
-    ColumnInfoClass *fields; /* the Column information */
-    ConnectionClass *conn;   /* the connection this result is using
-                              * (backend) */
-    QResultClass *next;      /* the following result class */
-
-    /* Stuff for declare/fetch tuples */
-    SQLULEN num_total_read; /* the highest absolute position ever read in + 1 */
-    SQLULEN count_backend_allocated; /* m(re)alloced count */
-    SQLULEN num_cached_rows; /* count of tuples kept in backend_tuples member */
-    SQLLEN fetch_number;     /* 0-based index to the tuple to read next */
-    SQLLEN cursTuple; /* absolute current position in the servr's cursor used to
-                         retrieve tuples from the DB */
-    SQLULEN move_offset;
-    SQLLEN base; /* relative position of rowset start in the current data
-                    cache(backend_tuples) */
-
-    UInt2 num_fields;                   /* number of fields in the result */
-    UInt2 num_key_fields;               /* number of key fields in the result */
-    UInt4 rowset_size_include_ommitted; /* ES restriction */
-    SQLLEN recent_processed_row_count;
-    SQLULEN cache_size;
-    SQLULEN cmd_fetch_size;
-
-    QueryResultCode rstatus; /* result status */
-
-    char sqlstate[8];
-    char *message;
-    const char *messageref;
-    char *cursor_name; /* The name of the cursor for select statements */
-    char *command;
-    char *notice;
-
-    TupleField *backend_tuples; /* data from the backend (the tuple cache) */
-    TupleField *tupleField;     /* current backend tuple being retrieved */
-
-    char pstatus;                   /* processing status */
-    char aborted;                   /* was aborted ? */
-    char flags;                     /* this result contains keyset etc ? */
-    po_ind_t move_direction;        /* must move before fetching this
-                            result set */
-    SQLULEN count_keyset_allocated; /* m(re)alloced count */
-    SQLULEN num_cached_keys; /* count of keys kept in backend_keys member */
-    KeySet *keyset;
-    SQLLEN key_base; /* relative position of rowset start in the current keyset
-                        cache */
-    UInt2 reload_count;
-    UInt2 rb_alloc;  /* count of allocated rollback info */
-    UInt2 rb_count;  /* count of rollback info */
-    char dataFilled; /* Cache is filled with data ? */
-    Rollback *rollback;
-    UInt4 ad_alloc;             /* count of allocated added info */
-    UInt4 ad_count;             /* count of newly added rows */
-    KeySet *added_keyset;       /* added keyset info */
-    TupleField *added_tuples;   /* added data by myself */
-    UInt2 dl_alloc;             /* count of allocated deleted info */
-    UInt2 dl_count;             /* count of deleted info */
-    SQLLEN *deleted;            /* deleted index info */
-    KeySet *deleted_keyset;     /* deleted keyset info */
-    UInt2 up_alloc;             /* count of allocated updated info */
-    UInt2 up_count;             /* count of updated info */
-    SQLLEN *updated;            /* updated index info */
-    KeySet *updated_keyset;     /* uddated keyset info */
-    TupleField *updated_tuples; /* uddated data by myself */
-    void *opensearch_result;
-    char *server_cursor_id;
-};
-
-enum {
-    FQR_HASKEYSET = 1L,
-    FQR_WITHHOLD = (1L << 1),
-    FQR_HOLDPERMANENT = (1L << 2) /* the cursor is alive across transactions */
-    ,
-    FQR_SYNCHRONIZEKEYS =
-        (1L
-         << 3) /* synchronize the keyset range with that of cthe tuples cache */
-};
-
-#define QR_haskeyset(self) (0 != (self->flags & FQR_HASKEYSET))
-#define QR_is_withhold(self) (0 != (self->flags & FQR_WITHHOLD))
-#define QR_is_permanent(self) (0 != (self->flags & FQR_HOLDPERMANENT))
-#define QR_synchronize_keys(self) (0 != (self->flags & FQR_SYNCHRONIZEKEYS))
-#define QR_get_fields(self) (self->fields)
-
-/*	These functions are for retrieving data from the qresult */
-#define QR_get_value_backend(self, fieldno) (self->tupleField[fieldno].value)
-#define QR_get_value_backend_row(self, tupleno, fieldno) \
-    ((self->backend_tuples + (tupleno * self->num_fields))[fieldno].value)
-#define QR_get_value_backend_text(self, tupleno, fieldno) \
-    QR_get_value_backend_row(self, tupleno, fieldno)
-#define QR_get_value_backend_int(self, tupleno, fieldno, isNull) \
-    atoi(QR_get_value_backend_row(self, tupleno, fieldno))
-
-/*	These functions are used by both manual and backend results */
-#define QR_NumResultCols(self) (CI_get_num_fields(self->fields))
-#define QR_NumPublicResultCols(self)                                \
-    (QR_haskeyset(self)                                             \
-         ? (CI_get_num_fields(self->fields) - self->num_key_fields) \
-         : CI_get_num_fields(self->fields))
-#define QR_get_fieldname(self, fieldno_) \
-    (CI_get_fieldname(self->fields, fieldno_))
-#define QR_get_fieldsize(self, fieldno_) \
-    (CI_get_fieldsize(self->fields, fieldno_))
-#define QR_get_display_size(self, fieldno_) \
-    (CI_get_display_size(self->fields, fieldno_))
-#define QR_get_atttypmod(self, fieldno_) \
-    (CI_get_atttypmod(self->fields, fieldno_))
-#define QR_get_field_type(self, fieldno_) (CI_get_oid(self->fields, fieldno_))
-#define QR_get_relid(self, fieldno_) (CI_get_relid(self->fields, fieldno_))
-#define QR_get_attid(self, fieldno_) (CI_get_attid(self->fields, fieldno_))
-
-/*	These functions are used only for manual result sets */
-#define QR_get_num_total_tuples(self)                                    \
-    (QR_once_reached_eof(self) ? (self->num_total_read + self->ad_count) \
-                               : self->num_total_read)
-#define QR_get_num_total_read(self) (self->num_total_read)
-#define QR_get_num_cached_tuples(self) (self->num_cached_rows)
-#define QR_set_field_info(self, field_num, name, adtid, adtsize, relid, attid) \
-    (CI_set_field_info(self->fields, field_num, name, adtid, adtsize, -1,      \
-                       relid, attid))
-#define QR_set_field_info_v(self, field_num, name, adtid, adtsize) \
-    (CI_set_field_info(self->fields, field_num, name, adtid, adtsize, -1, 0, 0))
-
-/* status macros */
-#define QR_command_successful(self)                \
-    (self                                          \
-     && !(self->rstatus == PORES_BAD_RESPONSE      \
-          || self->rstatus == PORES_NONFATAL_ERROR \
-          || self->rstatus == PORES_FATAL_ERROR    \
-          || self->rstatus == PORES_NO_MEMORY_ERROR))
-#define QR_command_maybe_successful(self)       \
-    (self                                       \
-     && !(self->rstatus == PORES_BAD_RESPONSE   \
-          || self->rstatus == PORES_FATAL_ERROR \
-          || self->rstatus == PORES_NO_MEMORY_ERROR))
-#define QR_command_nonfatal(self) (self->rstatus == PORES_NONFATAL_ERROR)
-#define QR_set_conn(self, conn_) (self->conn = conn_)
-#define QR_set_rstatus(self, condition) (self->rstatus = condition)
-#define QR_set_sqlstatus(self, status) strcpy(self->sqlstatus, status)
-#define QR_set_messageref(self, m) ((self)->messageref = m)
-#define QR_set_aborted(self, aborted_) (self->aborted = aborted_)
-#define QR_set_haskeyset(self) (self->flags |= FQR_HASKEYSET)
-#define QR_set_synchronize_keys(self) (self->flags |= FQR_SYNCHRONIZEKEYS)
-#define QR_set_no_cursor(self)                             \
-    ((self)->flags &= ~(FQR_WITHHOLD | FQR_HOLDPERMANENT), \
-     (self)->pstatus &= ~FQR_NEEDS_SURVIVAL_CHECK)
-#define QR_set_withhold(self) (self->flags |= FQR_WITHHOLD)
-#define QR_set_permanent(self) (self->flags |= FQR_HOLDPERMANENT)
-#define QR_set_reached_eof(self) (self->pstatus |= FQR_REACHED_EOF)
-#define QR_set_has_valid_base(self) (self->pstatus |= FQR_HAS_VALID_BASE)
-#define QR_set_no_valid_base(self) (self->pstatus &= ~FQR_HAS_VALID_BASE)
-#define QR_set_survival_check(self) (self->pstatus |= FQR_NEEDS_SURVIVAL_CHECK)
-#define QR_set_no_survival_check(self) \
-    (self->pstatus &= ~FQR_NEEDS_SURVIVAL_CHECK)
-#define QR_inc_num_cache(self)       \
-    do {                             \
-        self->num_cached_rows++;     \
-        if (QR_haskeyset(self))      \
-            self->num_cached_keys++; \
-    } while (0)
-#define QR_set_next_in_cache(self, number)                               \
-    do {                                                                 \
-        MYLOG(OPENSEARCH_ALL, "set the number to " FORMAT_LEN " to read next\n", \
-              number);                                                   \
-        self->fetch_number = number;                                     \
-    } while (0)
-#define QR_inc_next_in_cache(self)                                             \
-    do {                                                                       \
-        MYLOG(OPENSEARCH_ALL, "increased the number " FORMAT_LEN, self->fetch_number); \
-        self->fetch_number++;                                                  \
-        MYLOG(OPENSEARCH_ALL, "to " FORMAT_LEN " to next read\n", self->fetch_number); \
-    } while (0)
-
-#define QR_get_message(self) \
-    ((self)->message ? (self)->message : (self)->messageref)
-#define QR_get_command(self) (self->command)
-#define QR_get_notice(self) (self->notice)
-#define QR_get_rstatus(self) (self->rstatus)
-#define QR_get_aborted(self) (self->aborted)
-#define QR_get_conn(self) (self->conn)
-#define QR_get_cursor(self) (self->cursor_name)
-#define QR_get_rowstart_in_cache(self) (self->base)
-#define QR_once_reached_eof(self) ((self->pstatus & FQR_REACHED_EOF) != 0)
-#define QR_has_valid_base(self) (0 != (self->pstatus & FQR_HAS_VALID_BASE))
-#define QR_needs_survival_check(self) \
-    (0 != (self->pstatus & FQR_NEEDS_SURVIVAL_CHECK))
-
-#define QR_aborted(self) (!self || self->aborted)
-#define QR_get_reqsize(self) (self->rowset_size_include_ommitted)
-
-#define QR_stop_movement(self) (self->move_direction = 0)
-#define QR_is_moving(self) (0 != self->move_direction)
-#define QR_is_not_moving(self) (0 == self->move_direction)
-#define QR_set_move_forward(self) (self->move_direction = 1)
-#define QR_is_moving_forward(self) (1 == self->move_direction)
-#define QR_set_move_backward(self) (self->move_direction = -1)
-#define QR_is_moving_backward(self) (-1 == self->move_direction)
-#define QR_set_move_from_the_last(self) (self->move_direction = 2)
-#define QR_is_moving_from_the_last(self) (2 == self->move_direction)
-#define QR_is_moving_not_backward(self) (0 < self->move_direction)
-
-/*	Core Functions */
-QResultClass *QR_Constructor(void);
-void QR_Destructor(QResultClass *self);
-TupleField *QR_AddNew(QResultClass *self);
-void QR_close_result(QResultClass *self, BOOL destroy);
-void QR_reset_for_re_execute(QResultClass *self);
-void QR_free_memory(QResultClass *self);
-void QR_set_command(QResultClass *self, const char *msg);
-void QR_set_message(QResultClass *self, const char *msg);
-void QR_add_message(QResultClass *self, const char *msg);
-void QR_set_notice(QResultClass *self, const char *msg);
-void QR_add_notice(QResultClass *self, const char *msg);
-
-void QR_set_num_fields(QResultClass *self,
-                       int new_num_fields); /* catalog functions' result only */
-void QR_set_fields(QResultClass *self, ColumnInfoClass *);
-
-void QR_set_rowstart_in_cache(QResultClass *, SQLLEN);
-void QR_inc_rowstart_in_cache(QResultClass *self, SQLLEN base_inc);
-void QR_set_reqsize(QResultClass *self, Int4 reqsize);
-void QR_set_position(QResultClass *self, SQLLEN pos);
-void QR_set_cursor(QResultClass *self, const char *name);
-SQLLEN getNthValid(const QResultClass *self, SQLLEN sta, UWORD orientation,
-                   SQLULEN nth, SQLLEN *nearest);
-void QR_set_server_cursor_id(QResultClass *self, const char *server_cursor_id);
-#define QR_MALLOC_return_with_error(t, tp, s, a, m, r) \
-    do {                                               \
-        if (t = (tp *)malloc(s), NULL == t) {          \
-            QR_set_rstatus(a, PORES_NO_MEMORY_ERROR);  \
-            qlog("QR_MALLOC_error\n");                 \
-            QR_free_memory(a);                         \
-            QR_set_messageref(a, m);                   \
-            return r;                                  \
-        }                                              \
-    } while (0)
-#define QR_REALLOC_return_with_error(t, tp, s, a, m, r) \
-    do {                                                \
-        tp *tmp;                                        \
-        if (tmp = (tp *)realloc(t, s), NULL == tmp) {   \
-            QR_set_rstatus(a, PORES_NO_MEMORY_ERROR);   \
-            qlog("QR_REALLOC_error\n");                 \
-            QR_free_memory(a);                          \
-            QR_set_messageref(a, m);                    \
-            return r;                                   \
-        }                                               \
-        t = tmp;                                        \
-    } while (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __QRESULT_H__ */
diff --git a/sql-odbc/src/sqlodbc/resource.h b/sql-odbc/src/sqlodbc/resource.h
deleted file mode 100644
index ff5fc59c8d..0000000000
--- a/sql-odbc/src/sqlodbc/resource.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by opensearch_odbc.rc
-//
-#define IDS_BADDSN                      1
-#define IDS_MSGTITLE                    2
-#define IDOK2                           3
-#define IDC_TEST                        4
-#define IDC_PASSWORD_STATIC             4
-#define IDC_SSL_STATIC                  4
-#define IDC_HOST_VER_STATIC             5
-#define IDC_DSNAME                      400
-#define IDC_DSNAMETEXT                  401
-#define IDC_DESC                        404
-#define IDC_FETCH_SIZE_STATIC           404
-#define IDC_SERVER                      407
-#define IDC_NOTICE_USER                 414
-#define IDS_AUTHTYPE_NONE               417
-#define IDS_AUTHTYPE_BASIC              418
-#define IDS_AUTHTYPE_IAM                419
-#define IDS_LOGTYPE_OFF                 420
-#define IDS_LOGTYPE_FATAL               421
-#define IDS_LOGTYPE_ERROR               422
-#define IDS_LOGTYPE_WARNING             423
-#define IDS_LOGTYPE_INFO                424
-#define IDS_LOGTYPE_DEBUG               425
-#define IDS_LOGTYPE_TRACE               426
-#define IDS_LOGTYPE_ALL                 427
-#define DLG_CONFIG                      1001
-#define IDC_PORT                        1002
-#define IDC_USER                        1006
-#define IDC_PASSWORD                    1009
-#define IDC_MANAGEDSN                   1077
-#define IDC_EDIT1                       1112
-#define IDC_CONNTIMEOUT_STATIC          1112
-#define IDC_CHECK1                      1113
-#define IDC_CHECK2                      1114
-#define IDC_USESSL                      1114
-#define IDC_COMBO1                      1115
-#define IDC_AUTHTYPE                    1115
-#define IDC_HOST_VER                    1115
-#define IDC_USERNAME_STATIC             1116
-#define IDC_REGION                      1121
-#define IDC_REGION_STATIC               1122
-#define IDC_AUTH_STATIC                 1123
-#define ID_ADVANCED_OPTIONS             1124
-#define ID_LOG_OPTIONS                  1125
-#define IDC_DRIVER_VERSION              1126
-#define IDC_AUTH_SETTINGS               1127
-#define IDC_CONN_SETTINGS               1128
-#define DLG_ADVANCED_OPTIONS            1129
-#define IDC_CONNTIMEOUT                 1130
-#define DLG_LOG_OPTIONS                 1131
-#define IDC_FETCH_SIZE                  1131
-#define IDC_LOG_LEVEL                   1132
-#define IDC_LOG_PATH                    1133
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        113
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1135
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/sql-odbc/src/sqlodbc/results.c b/sql-odbc/src/sqlodbc/results.c
deleted file mode 100644
index 18f1cd1a72..0000000000
--- a/sql-odbc/src/sqlodbc/results.c
+++ /dev/null
@@ -1,1651 +0,0 @@
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "bind.h"
-#include "convert.h"
-#include "dlg_specific.h"
-#include "environ.h"
-#include "opensearch_odbc.h"
-#include "opensearch_types.h"
-#include "misc.h"
-#include "opensearch_apifunc.h"
-#include "opensearch_connection.h"
-#include "opensearch_statement.h"
-#include "qresult.h"
-#include "statement.h"
-
-/*	Helper macro */
-#define getEffectiveOid(conn, fi) \
-    opensearch_true_type((conn), (fi)->columntype, FI_type(fi))
-#define NULL_IF_NULL(a) ((a) ? ((const char *)(a)) : "(null)")
-
-RETCODE SQL_API OPENSEARCHAPI_RowCount(HSTMT hstmt, SQLLEN *pcrow) {
-    CSTR func = "OPENSEARCHAPI_RowCount";
-    StatementClass *stmt = (StatementClass *)hstmt;
-    QResultClass *res;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-    if (!stmt) {
-        SC_log_error(func, NULL_STRING, NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    res = SC_get_Curres(stmt);
-    if (res) {
-        if (stmt->status != STMT_FINISHED) {
-            SC_set_error(
-                stmt, STMT_SEQUENCE_ERROR,
-                "Can't get row count while statement is still executing.",
-                func);
-            return SQL_ERROR;
-        }
-    }
-
-    // Row count is not supported by this driver, so we will always report -1,
-    // as defined by the ODBC API for SQLRowCount.
-    *pcrow = -1;
-
-    return SQL_SUCCESS;
-}
-
-/*
- *	This returns the number of columns associated with the database
- *	attached to "hstmt".
- */
-RETCODE SQL_API OPENSEARCHAPI_NumResultCols(HSTMT hstmt, SQLSMALLINT *pccol) {
-    CSTR func = "OPENSEARCHAPI_NumResultCols";
-    StatementClass *stmt = (StatementClass *)hstmt;
-    QResultClass *result;
-    RETCODE ret = SQL_SUCCESS;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-    if (!stmt) {
-        SC_log_error(func, NULL_STRING, NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    SC_clear_error(stmt);
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wkeyword-macro"
-#endif  // __APPLE__
-#define return DONT_CALL_RETURN_FROM_HERE ? ? ?
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-    if (stmt->proc_return > 0) {
-        *pccol = 0;
-        goto cleanup;
-    }
-
-    result = SC_get_Curres(stmt);
-    *pccol = QR_NumPublicResultCols(result);
-
-cleanup:
-#undef return
-    return ret;
-}
-
-#define USE_FI(fi, unknown) (fi && UNKNOWNS_AS_LONGEST != unknown)
-
-/*
- *	Return information about the database column the user wants
- *	information about.
- */
-RETCODE SQL_API OPENSEARCHAPI_DescribeCol(HSTMT hstmt, SQLUSMALLINT icol,
-                                  SQLCHAR *szColName, SQLSMALLINT cbColNameMax,
-                                  SQLSMALLINT *pcbColName,
-                                  SQLSMALLINT *pfSqlType, SQLULEN *pcbColDef,
-                                  SQLSMALLINT *pibScale,
-                                  SQLSMALLINT *pfNullable) {
-    CSTR func = "OPENSEARCHAPI_DescribeCol";
-
-    /* gets all the information about a specific column */
-    StatementClass *stmt = (StatementClass *)hstmt;
-    ConnectionClass *conn;
-    IRDFields *irdflds;
-    QResultClass *res = NULL;
-    char *col_name = NULL;
-    OID fieldtype = 0;
-    SQLLEN column_size = 0;
-    int unknown_sizes;
-    SQLINTEGER decimal_digits = 0;
-    FIELD_INFO *fi;
-    char buf[255];
-    int len = 0;
-    RETCODE result = SQL_SUCCESS;
-
-    MYLOG(OPENSEARCH_TRACE, "entering.%d..\n", icol);
-
-    if (!stmt) {
-        SC_log_error(func, NULL_STRING, NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    conn = SC_get_conn(stmt);
-    unknown_sizes = DEFAULT_UNKNOWNSIZES;
-
-    SC_clear_error(stmt);
-
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wkeyword-macro"
-#endif  // __APPLE__
-#define return DONT_CALL_RETURN_FROM_HERE ? ? ?
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-    irdflds = SC_get_IRDF(stmt);
-    if (0 == icol) /* bookmark column */
-    {
-        SQLSMALLINT fType = stmt->options.use_bookmarks == SQL_UB_VARIABLE
-                                ? SQL_BINARY
-                                : SQL_INTEGER;
-
-        MYLOG(OPENSEARCH_ALL, "answering bookmark info\n");
-        if (szColName && cbColNameMax > 0)
-            *szColName = '\0';
-        if (pcbColName)
-            *pcbColName = 0;
-        if (pfSqlType)
-            *pfSqlType = fType;
-        if (pcbColDef)
-            *pcbColDef = 10;
-        if (pibScale)
-            *pibScale = 0;
-        if (pfNullable)
-            *pfNullable = SQL_NO_NULLS;
-        result = SQL_SUCCESS;
-        goto cleanup;
-    }
-
-    /*
-     * Dont check for bookmark column. This is the responsibility of the
-     * driver manager.
-     */
-
-    icol--; /* use zero based column numbers */
-
-    fi = NULL;
-    if (icol < irdflds->nfields && irdflds->fi)
-        fi = irdflds->fi[icol];
-
-    if (!FI_is_applicable(fi)) {
-        fi = NULL;
-
-        res = SC_get_Curres(stmt);
-        if (icol >= QR_NumPublicResultCols(res)) {
-            SC_set_error(stmt, STMT_INVALID_COLUMN_NUMBER_ERROR,
-                         "Invalid column number in DescribeCol.", func);
-            SPRINTF_FIXED(buf, "Col#=%d, #Cols=%d,%d keys=%d", icol,
-                          QR_NumResultCols(res), QR_NumPublicResultCols(res),
-                          res->num_key_fields);
-            SC_log_error(func, buf, stmt);
-            result = SQL_ERROR;
-            goto cleanup;
-        }
-        if (icol < irdflds->nfields && irdflds->fi)
-            fi = irdflds->fi[icol];
-    }
-    res = SC_get_Curres(stmt);
-#ifdef SUPPRESS_LONGEST_ON_CURSORS
-    if (UNKNOWNS_AS_LONGEST == unknown_sizes) {
-        if (QR_once_reached_eof(res))
-            unknown_sizes = UNKNOWNS_AS_LONGEST;
-        else
-            unknown_sizes = UNKNOWNS_AS_MAX;
-    }
-#endif /* SUPPRESS_LONGEST_ON_CURSORS */
-    /* handle constants */
-    if (res && -2 == QR_get_fieldsize(res, icol))
-        unknown_sizes = UNKNOWNS_AS_LONGEST;
-
-    if (FI_is_applicable(fi)) {
-        fieldtype = getEffectiveOid(conn, fi);
-        if (NAME_IS_VALID(fi->column_alias))
-            col_name = GET_NAME(fi->column_alias);
-        else
-            col_name = GET_NAME(fi->column_name);
-        if (USE_FI(fi, unknown_sizes)) {
-            column_size = fi->column_size;
-            decimal_digits = fi->decimal_digits;
-        } else {
-            column_size = opensearchtype_column_size(stmt, fieldtype, icol,
-                                                     unknown_sizes);
-            decimal_digits =
-                opensearchtype_decimal_digits(stmt, fieldtype, icol);
-        }
-
-        MYLOG(OPENSEARCH_DEBUG,
-              "PARSE: fieldtype=%u, col_name='%s', column_size=" FORMAT_LEN
-              "\n",
-              fieldtype, NULL_IF_NULL(col_name), column_size);
-    } else {
-        col_name = QR_get_fieldname(res, icol);
-        fieldtype = QR_get_field_type(res, icol);
-
-        column_size =
-            opensearchtype_column_size(stmt, fieldtype, icol, unknown_sizes);
-        decimal_digits = opensearchtype_decimal_digits(stmt, fieldtype, icol);
-    }
-
-    MYLOG(OPENSEARCH_DEBUG, "col %d fieldname = '%s'\n", icol, NULL_IF_NULL(col_name));
-    MYLOG(OPENSEARCH_DEBUG, "col %d fieldtype = %d\n", icol, fieldtype);
-    MYLOG(OPENSEARCH_DEBUG, "col %d column_size = " FORMAT_LEN "\n", icol, column_size);
-
-    result = SQL_SUCCESS;
-
-    /*
-     * COLUMN NAME
-     */
-    len = col_name ? (int)strlen(col_name) : 0;
-
-    if (pcbColName)
-        *pcbColName = (SQLSMALLINT)len;
-
-    if (szColName && cbColNameMax > 0) {
-        if (NULL != col_name)
-            strncpy_null((char *)szColName, col_name, cbColNameMax);
-        else
-            szColName[0] = '\0';
-
-        if (len >= cbColNameMax) {
-            result = SQL_SUCCESS_WITH_INFO;
-            SC_set_error(stmt, STMT_TRUNCATED,
-                         "The buffer was too small for the colName.", func);
-        }
-    }
-
-    /*
-     * CONCISE(SQL) TYPE
-     */
-    if (pfSqlType) {
-        *pfSqlType = opensearchtype_to_concise_type(stmt, fieldtype, icol,
-                                                    unknown_sizes);
-
-        MYLOG(OPENSEARCH_DEBUG, "col %d *pfSqlType = %d\n", icol, *pfSqlType);
-    }
-
-    /*
-     * COLUMN SIZE(PRECISION in 2.x)
-     */
-    if (pcbColDef) {
-        if (column_size < 0)
-            column_size = 0; /* "I dont know" */
-
-        *pcbColDef = column_size;
-
-        MYLOG(OPENSEARCH_DEBUG, "Col: col %d  *pcbColDef = " FORMAT_ULEN "\n", icol,
-              *pcbColDef);
-    }
-
-    /*
-     * DECIMAL DIGITS(SCALE in 2.x)
-     */
-    if (pibScale) {
-        if (decimal_digits < 0)
-            decimal_digits = 0;
-
-        *pibScale = (SQLSMALLINT)decimal_digits;
-        MYLOG(OPENSEARCH_DEBUG, "col %d  *pibScale = %d\n", icol, *pibScale);
-    }
-
-    /*
-     * NULLABILITY
-     */
-    if (pfNullable) {
-        if (SC_has_outer_join(stmt))
-            *pfNullable = TRUE;
-        else
-            *pfNullable = fi ? fi->nullable : opensearchtype_nullable(conn, fieldtype);
-
-        MYLOG(OPENSEARCH_DEBUG, "col %d  *pfNullable = %d\n", icol, *pfNullable);
-    }
-
-cleanup:
-#undef return
-    return result;
-}
-
-/*		Returns result column descriptor information for a result set. */
-RETCODE SQL_API OPENSEARCHAPI_ColAttributes(HSTMT hstmt, SQLUSMALLINT icol,
-                                    SQLUSMALLINT fDescType, PTR rgbDesc,
-                                    SQLSMALLINT cbDescMax, SQLSMALLINT *pcbDesc,
-                                    SQLLEN *pfDesc) {
-    CSTR func = "OPENSEARCHAPI_ColAttributes";
-    StatementClass *stmt = (StatementClass *)hstmt;
-    IRDFields *irdflds;
-    OID field_type = 0;
-    Int2 col_idx;
-    ConnectionClass *conn;
-    int column_size, unknown_sizes;
-    int cols = 0;
-    RETCODE result;
-    const char *p = NULL;
-    SQLLEN value = 0;
-    const FIELD_INFO *fi = NULL;
-    const TABLE_INFO *ti = NULL;
-    QResultClass *res;
-    BOOL stmt_updatable;
-
-    MYLOG(OPENSEARCH_TRACE, "entering..col=%d %d len=%d.\n", icol, fDescType,
-          cbDescMax);
-
-    if (!stmt) {
-        SC_log_error(func, NULL_STRING, NULL);
-        return SQL_INVALID_HANDLE;
-    }
-    stmt_updatable = SC_is_updatable(stmt)
-        /* The following doesn't seem appropriate for client side cursors
-          && stmt->options.scroll_concurrency != SQL_CONCUR_READ_ONLY
-         */
-        ;
-
-    if (pcbDesc)
-        *pcbDesc = 0;
-    irdflds = SC_get_IRDF(stmt);
-    conn = SC_get_conn(stmt);
-
-    /*
-     * Dont check for bookmark column.	This is the responsibility of the
-     * driver manager.	For certain types of arguments, the column number
-     * is ignored anyway, so it may be 0.
-     */
-
-    res = SC_get_Curres(stmt);
-    if (0 == icol && SQL_DESC_COUNT != fDescType) /* bookmark column */
-    {
-        MYLOG(OPENSEARCH_ALL, "answering bookmark info\n");
-        switch (fDescType) {
-            case SQL_DESC_OCTET_LENGTH:
-                if (pfDesc)
-                    *pfDesc = 4;
-                break;
-            case SQL_DESC_TYPE:
-                if (pfDesc)
-                    *pfDesc = stmt->options.use_bookmarks == SQL_UB_VARIABLE
-                                  ? SQL_BINARY
-                                  : SQL_INTEGER;
-                break;
-        }
-        return SQL_SUCCESS;
-    }
-
-    col_idx = icol - 1;
-
-    unknown_sizes = DEFAULT_UNKNOWNSIZES;
-
-    /* not appropriate for SQLColAttributes() */
-    if (stmt->catalog_result)
-        unknown_sizes = UNKNOWNS_AS_LONGEST;
-    else if (unknown_sizes == UNKNOWNS_AS_DONTKNOW)
-        unknown_sizes = UNKNOWNS_AS_MAX;
-
-    if (!stmt->catalog_result && SC_is_parse_forced(stmt)
-        && SC_can_parse_statement(stmt)) {
-        cols = irdflds->nfields;
-
-        /*
-         * Column Count is a special case.	The Column number is ignored
-         * in this case.
-         */
-        if (fDescType == SQL_DESC_COUNT) {
-            if (pfDesc)
-                *pfDesc = cols;
-
-            return SQL_SUCCESS;
-        }
-
-        if (SC_parsed_status(stmt) != STMT_PARSE_FATAL && irdflds->fi) {
-            if (col_idx >= cols) {
-                SC_set_error(stmt, STMT_INVALID_COLUMN_NUMBER_ERROR,
-                             "Invalid column number in ColAttributes.", func);
-                return SQL_ERROR;
-            }
-        }
-    }
-
-    if ((unsigned int)col_idx < irdflds->nfields && irdflds->fi)
-        fi = irdflds->fi[col_idx];
-    if (FI_is_applicable(fi))
-        field_type = getEffectiveOid(conn, fi);
-    else {
-        fi = NULL;
-        switch (fDescType) {
-            case SQL_COLUMN_OWNER_NAME:
-            case SQL_COLUMN_TABLE_NAME:
-            case SQL_COLUMN_TYPE:
-            case SQL_COLUMN_TYPE_NAME:
-            case SQL_COLUMN_AUTO_INCREMENT:
-            case SQL_DESC_NULLABLE:
-            case SQL_DESC_BASE_TABLE_NAME:
-            case SQL_DESC_BASE_COLUMN_NAME:
-            case SQL_COLUMN_UPDATABLE:
-            case 1212: /* SQL_CA_SS_COLUMN_KEY ? */
-                break;
-        }
-
-        res = SC_get_Curres(stmt);
-        cols = QR_NumPublicResultCols(res);
-
-        /*
-         * Column Count is a special case.	The Column number is ignored
-         * in this case.
-         */
-        if (fDescType == SQL_DESC_COUNT) {
-            if (pfDesc)
-                *pfDesc = cols;
-
-            return SQL_SUCCESS;
-        }
-
-        if (col_idx >= cols) {
-            SC_set_error(stmt, STMT_INVALID_COLUMN_NUMBER_ERROR,
-                         "Invalid column number in ColAttributes.", func);
-            return SQL_ERROR;
-        }
-
-        field_type = QR_get_field_type(res, col_idx);
-        if ((unsigned int)col_idx < irdflds->nfields && irdflds->fi)
-            fi = irdflds->fi[col_idx];
-    }
-    if (FI_is_applicable(fi)) {
-        ti = fi->ti;
-        field_type = getEffectiveOid(conn, fi);
-    }
-
-    MYLOG(OPENSEARCH_DEBUG, "col %d field_type=%d fi,ti=%p,%p\n", col_idx, field_type,
-          fi, ti);
-
-#ifdef SUPPRESS_LONGEST_ON_CURSORS
-    if (UNKNOWNS_AS_LONGEST == unknown_sizes) {
-        if (QR_once_reached_eof(res))
-            unknown_sizes = UNKNOWNS_AS_LONGEST;
-        else
-            unknown_sizes = UNKNOWNS_AS_MAX;
-    }
-#endif /* SUPPRESS_LONGEST_ON_CURSORS */
-    /* handle constants */
-    if (res && -2 == QR_get_fieldsize(res, col_idx))
-        unknown_sizes = UNKNOWNS_AS_LONGEST;
-
-    column_size =
-        (USE_FI(fi, unknown_sizes) && fi->column_size > 0)
-            ? fi->column_size
-            : opensearchtype_column_size(stmt, field_type, col_idx,
-                                                   unknown_sizes);
-    switch (fDescType) {
-        case SQL_COLUMN_AUTO_INCREMENT: /* == SQL_DESC_AUTO_UNIQUE_VALUE */
-            if (fi && fi->auto_increment)
-                value = TRUE;
-            else
-                value = opensearchtype_auto_increment(conn, field_type);
-            if (value == -1) /* non-numeric becomes FALSE (ODBC Doc) */
-                value = FALSE;
-            MYLOG(OPENSEARCH_DEBUG, "AUTO_INCREMENT=" FORMAT_LEN "\n", value);
-
-            break;
-
-        case SQL_COLUMN_CASE_SENSITIVE: /* == SQL_DESC_CASE_SENSITIVE */
-            value = opensearchtype_case_sensitive(conn, field_type);
-            break;
-
-            /*
-             * This special case is handled above.
-             *
-             * case SQL_COLUMN_COUNT:
-             */
-        case SQL_COLUMN_DISPLAY_SIZE: /* == SQL_DESC_DISPLAY_SIZE */
-            value = (USE_FI(fi, unknown_sizes) && 0 != fi->display_size)
-                        ? fi->display_size
-                        : opensearchtype_display_size(stmt, field_type, col_idx,
-                                                      unknown_sizes);
-
-            MYLOG(OPENSEARCH_DEBUG, "col %d, display_size= " FORMAT_LEN "\n", col_idx,
-                  value);
-
-            break;
-
-        case SQL_COLUMN_LABEL: /* == SQL_DESC_LABEL */
-            if (fi && (NAME_IS_VALID(fi->column_alias))) {
-                p = GET_NAME(fi->column_alias);
-
-                MYLOG(OPENSEARCH_DEBUG, "COLUMN_LABEL = '%s'\n", p);
-                break;
-            }
-            /* otherwise same as column name -- FALL THROUGH!!! */
-
-        case SQL_DESC_NAME:
-            MYLOG(OPENSEARCH_ALL, "fi=%p (alias, name)=", fi);
-            if (fi)
-                MYPRINTF(OPENSEARCH_DEBUG, "(%s,%s)\n", PRINT_NAME(fi->column_alias),
-                         PRINT_NAME(fi->column_name));
-            else
-                MYPRINTF(OPENSEARCH_DEBUG, "NULL\n");
-            p = fi ? (NAME_IS_NULL(fi->column_alias)
-                          ? SAFE_NAME(fi->column_name)
-                          : GET_NAME(fi->column_alias))
-                   : QR_get_fieldname(res, col_idx);
-
-            MYLOG(OPENSEARCH_DEBUG, "COLUMN_NAME = '%s'\n", p);
-            break;
-
-        case SQL_COLUMN_LENGTH:
-            value = (USE_FI(fi, unknown_sizes) && fi->length > 0)
-                        ? fi->length
-                        : opensearchtype_buffer_length(stmt, field_type,
-                                                       col_idx, unknown_sizes);
-            if (0 > value)
-                /* if (-1 == value)  I'm not sure which is right */
-                value = 0;
-
-            MYLOG(OPENSEARCH_DEBUG, "col %d, column_length = " FORMAT_LEN "\n", col_idx,
-                  value);
-            break;
-
-        case SQL_COLUMN_MONEY: /* == SQL_DESC_FIXED_PREC_SCALE */
-            value = opensearchtype_money(conn, field_type);
-            MYLOG(OPENSEARCH_ALL, "COLUMN_MONEY=" FORMAT_LEN "\n", value);
-            break;
-
-        case SQL_DESC_NULLABLE:
-            if (SC_has_outer_join(stmt))
-                value = TRUE;
-            else
-                value = fi ? fi->nullable : opensearchtype_nullable(conn, field_type);
-            MYLOG(OPENSEARCH_ALL, "COLUMN_NULLABLE=" FORMAT_LEN "\n", value);
-            break;
-
-        case SQL_COLUMN_OWNER_NAME: /* == SQL_DESC_SCHEMA_NAME */
-            p = ti ? SAFE_NAME(ti->schema_name) : NULL_STRING;
-            MYLOG(OPENSEARCH_DEBUG, "SCHEMA_NAME = '%s'\n", p);
-            break;
-
-        case SQL_COLUMN_PRECISION: /* in 2.x */
-            value = column_size;
-            if (value < 0)
-                value = 0;
-
-            MYLOG(OPENSEARCH_DEBUG, "col %d, column_size = " FORMAT_LEN "\n", col_idx,
-                  value);
-            break;
-
-        case SQL_COLUMN_QUALIFIER_NAME: /* == SQL_DESC_CATALOG_NAME */
-            p = ti ? CurrCatString(conn)
-                   : NULL_STRING; /* empty string means *not supported* */
-            break;
-
-        case SQL_COLUMN_SCALE: /* in 2.x */
-            value = opensearchtype_decimal_digits(stmt, field_type, col_idx);
-            MYLOG(OPENSEARCH_ALL, "COLUMN_SCALE=" FORMAT_LEN "\n", value);
-            if (value < 0)
-                value = 0;
-            break;
-
-        case SQL_COLUMN_SEARCHABLE: /* == SQL_DESC_SEARCHABLE */
-            value = opensearchtype_searchable(conn, field_type);
-            break;
-
-        case SQL_COLUMN_TABLE_NAME: /* == SQL_DESC_TABLE_NAME */
-            p = ti ? SAFE_NAME(ti->table_name) : NULL_STRING;
-
-            MYLOG(OPENSEARCH_DEBUG, "TABLE_NAME = '%s'\n", p);
-            break;
-
-        case SQL_COLUMN_TYPE: /* == SQL_DESC_CONCISE_TYPE */
-            value = opensearchtype_to_concise_type(stmt, field_type, col_idx,
-                                                   unknown_sizes);
-            MYLOG(OPENSEARCH_DEBUG, "COLUMN_TYPE=" FORMAT_LEN "\n", value);
-            break;
-
-        case SQL_COLUMN_TYPE_NAME: /* == SQL_DESC_TYPE_NAME */
-            p = opensearchtype_to_name(stmt, field_type, col_idx,
-                                       fi && fi->auto_increment);
-            break;
-
-        case SQL_COLUMN_UNSIGNED: /* == SQL_DESC_UNSINGED */
-            value = opensearchtype_unsigned(conn, field_type);
-            if (value == -1) /* non-numeric becomes TRUE (ODBC Doc) */
-                value = SQL_TRUE;
-
-            break;
-
-        case SQL_COLUMN_UPDATABLE: /* == SQL_DESC_UPDATABLE */
-
-            /*
-             * Neither Access or Borland care about this.
-             *
-             * if (field_type == OPENSEARCH_TYPE_OID) pfDesc = SQL_ATTR_READONLY;
-             * else
-             */
-            if (!stmt_updatable)
-                value = SQL_ATTR_READONLY;
-            else
-                value =
-                    fi ? (fi->updatable ? SQL_ATTR_WRITE : SQL_ATTR_READONLY)
-                       : (QR_get_attid(res, col_idx) > 0 ? SQL_ATTR_WRITE
-                                                         : SQL_ATTR_READONLY);
-            if (SQL_ATTR_READONLY != value) {
-                const char *name = fi ? SAFE_NAME(fi->column_name)
-                                      : QR_get_fieldname(res, col_idx);
-                if (stricmp(name, OID_NAME) == 0 || stricmp(name, "ctid") == 0
-                    || stricmp(name, XMIN_NAME) == 0)
-                    value = SQL_ATTR_READONLY;
-                else if (conn->ms_jet && fi && fi->auto_increment)
-                    value = SQL_ATTR_READONLY;
-            }
-
-            MYLOG(OPENSEARCH_DEBUG, "%s: UPDATEABLE = " FORMAT_LEN "\n", func, value);
-            break;
-        case SQL_DESC_BASE_COLUMN_NAME:
-
-            p = fi ? SAFE_NAME(fi->column_name)
-                   : QR_get_fieldname(res, col_idx);
-
-            MYLOG(OPENSEARCH_DEBUG, "BASE_COLUMN_NAME = '%s'\n", p);
-            break;
-        case SQL_DESC_BASE_TABLE_NAME: /* the same as TABLE_NAME ok ? */
-            p = ti ? SAFE_NAME(ti->table_name) : NULL_STRING;
-
-            MYLOG(OPENSEARCH_DEBUG, "BASE_TABLE_NAME = '%s'\n", p);
-            break;
-        case SQL_DESC_LENGTH: /* different from SQL_COLUMN_LENGTH */
-            value = (fi && column_size > 0)
-                        ? column_size
-                        : opensearchtype_desclength(stmt, field_type, col_idx,
-                                                    unknown_sizes);
-            if (-1 == value)
-                value = 0;
-
-            MYLOG(OPENSEARCH_DEBUG, "col %d, desc_length = " FORMAT_LEN "\n", col_idx,
-                  value);
-            break;
-        case SQL_DESC_OCTET_LENGTH:
-            value = (USE_FI(fi, unknown_sizes) && fi->length > 0)
-                        ? fi->length
-                        : opensearchtype_attr_transfer_octet_length(
-                            conn, field_type, column_size, unknown_sizes);
-            if (-1 == value)
-                value = 0;
-            MYLOG(OPENSEARCH_DEBUG, "col %d, octet_length = " FORMAT_LEN "\n", col_idx,
-                  value);
-            break;
-        case SQL_DESC_PRECISION: /* different from SQL_COLUMN_PRECISION */
-            if (value = FI_precision(fi), value <= 0)
-                value = opensearchtype_precision(stmt, field_type, col_idx,
-                                                 unknown_sizes);
-            if (value < 0)
-                value = 0;
-
-            MYLOG(OPENSEARCH_DEBUG, "col %d, desc_precision = " FORMAT_LEN "\n",
-                  col_idx, value);
-            break;
-        case SQL_DESC_SCALE: /* different from SQL_COLUMN_SCALE */
-            value = opensearchtype_scale(stmt, field_type, col_idx);
-            if (value < 0)
-                value = 0;
-            break;
-        case SQL_DESC_LOCAL_TYPE_NAME:
-            p = opensearchtype_to_name(stmt, field_type, col_idx,
-                                       fi && fi->auto_increment);
-            break;
-        case SQL_DESC_TYPE:
-            value = opensearchtype_to_sqldesctype(stmt, field_type, col_idx,
-                                                  unknown_sizes);
-            break;
-        case SQL_DESC_NUM_PREC_RADIX:
-            value = opensearchtype_radix(conn, field_type);
-            break;
-        case SQL_DESC_LITERAL_PREFIX:
-            p = opensearchtype_literal_prefix(conn, field_type);
-            break;
-        case SQL_DESC_LITERAL_SUFFIX:
-            p = opensearchtype_literal_suffix(conn, field_type);
-            break;
-        case SQL_DESC_UNNAMED:
-            value = (fi && NAME_IS_NULL(fi->column_name)
-                     && NAME_IS_NULL(fi->column_alias))
-                        ? SQL_UNNAMED
-                        : SQL_NAMED;
-            break;
-        case 1211: /* SQL_CA_SS_COLUMN_HIDDEN ? */
-            value = 0;
-            break;
-        case 1212: /* SQL_CA_SS_COLUMN_KEY ? */
-            SC_set_error(stmt, STMT_OPTION_NOT_FOR_THE_DRIVER,
-                         "this request may be for MS SQL Server", func);
-            return SQL_ERROR;
-        default:
-            SC_set_error(stmt, STMT_INVALID_OPTION_IDENTIFIER,
-                         "ColAttribute for this type not implemented yet",
-                         func);
-            return SQL_ERROR;
-    }
-
-    result = SQL_SUCCESS;
-
-    if (p) { /* char/binary data */
-        size_t len = strlen(p);
-
-        if (rgbDesc) {
-            strncpy_null((char *)rgbDesc, p, (size_t)cbDescMax);
-
-            if (len >= (size_t)cbDescMax) {
-                result = SQL_SUCCESS_WITH_INFO;
-                SC_set_error(stmt, STMT_TRUNCATED,
-                             "The buffer was too small for the rgbDesc.", func);
-            }
-        }
-
-        if (pcbDesc)
-            *pcbDesc = (SQLSMALLINT)len;
-    } else {
-        /* numeric data */
-        if (pfDesc)
-            *pfDesc = value;
-    }
-
-    return result;
-}
-
-/*	Returns result data for a single column in the current row. */
-RETCODE SQL_API OPENSEARCHAPI_GetData(HSTMT hstmt, SQLUSMALLINT icol,
-                              SQLSMALLINT fCType, PTR rgbValue,
-                              SQLLEN cbValueMax, SQLLEN *pcbValue) {
-    CSTR func = "OPENSEARCHAPI_GetData";
-    QResultClass *res;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    UInt2 num_cols;
-    SQLLEN num_rows;
-    OID field_type;
-    int atttypmod;
-    void *value = NULL;
-    RETCODE result = SQL_SUCCESS;
-    char get_bookmark = FALSE;
-    SQLSMALLINT target_type;
-    int precision = -1;
-#ifdef WITH_UNIXODBC
-    SQLCHAR dum_rgb[2] = "\0\0";
-#endif /* WITH_UNIXODBC */
-
-    MYLOG(OPENSEARCH_TRACE, "entering stmt=%p icol=%d\n", stmt, icol);
-
-    if (!stmt) {
-        SC_log_error(func, NULL_STRING, NULL);
-        return SQL_INVALID_HANDLE;
-    }
-    res = SC_get_Curres(stmt);
-
-    if (STMT_EXECUTING == stmt->status) {
-        SC_set_error(stmt, STMT_SEQUENCE_ERROR,
-                     "Can't get data while statement is still executing.",
-                     func);
-        return SQL_ERROR;
-    }
-
-    if (stmt->status != STMT_FINISHED) {
-        SC_set_error(stmt, STMT_STATUS_ERROR,
-                     "GetData can only be called after the successful "
-                     "execution on a SQL statement",
-                     func);
-        return SQL_ERROR;
-    }
-
-#ifdef WITH_UNIXODBC
-    if (NULL == rgbValue) /* unixODBC allows rgbValue is NULL? */
-    {
-        cbValueMax = 0;
-        rgbValue = dum_rgb; /* to avoid a crash */
-    }
-#endif /* WITH_UNIXODBC */
-    if (SQL_ARD_TYPE == fCType) {
-        ARDFields *opts;
-        BindInfoClass *binfo = NULL;
-
-        opts = SC_get_ARDF(stmt);
-        if (0 == icol)
-            binfo = opts->bookmark;
-        else if (icol <= opts->allocated && opts->bindings)
-            binfo = &opts->bindings[icol - 1];
-        if (binfo) {
-            target_type = binfo->returntype;
-            MYLOG(OPENSEARCH_DEBUG, "SQL_ARD_TYPE=%d\n", target_type);
-            precision = binfo->precision;
-        } else {
-            SC_set_error(stmt, STMT_STATUS_ERROR,
-                         "GetData can't determine the type via ARD", func);
-            return SQL_ERROR;
-        }
-    } else
-        target_type = fCType;
-    if (icol == 0) {
-        if (stmt->options.use_bookmarks == SQL_UB_OFF) {
-            SC_set_error(
-                stmt, STMT_COLNUM_ERROR,
-                "Attempt to retrieve bookmark with bookmark usage disabled",
-                func);
-            return SQL_ERROR;
-        }
-
-        /* Make sure it is the bookmark data type */
-        switch (target_type) {
-            case SQL_C_BOOKMARK:
-            case SQL_C_VARBOOKMARK:
-                break;
-            default:
-                MYLOG(
-                    OPENSEARCH_ALL,
-                    "GetData Column 0 is type %d not of type SQL_C_BOOKMARK\n",
-                    target_type);
-                SC_set_error(stmt, STMT_PROGRAM_TYPE_OUT_OF_RANGE,
-                             "Column 0 is not of type SQL_C_BOOKMARK", func);
-                return SQL_ERROR;
-        }
-
-        get_bookmark = TRUE;
-    } else {
-        /* use zero-based column numbers */
-        icol--;
-
-        /* make sure the column number is valid */
-        num_cols = QR_NumPublicResultCols(res);
-        if (icol >= num_cols) {
-            SC_set_error(stmt, STMT_INVALID_COLUMN_NUMBER_ERROR,
-                         "Invalid column number.", func);
-            return SQL_ERROR;
-        }
-    }
-
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wkeyword-macro"
-#endif  // __APPLE__
-#define return DONT_CALL_RETURN_FROM_HERE ? ? ?
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-    if (!SC_is_fetchcursor(stmt)) {
-        /* make sure we're positioned on a valid row */
-        num_rows = QR_get_num_total_tuples(res);
-        if ((stmt->currTuple < 0) || (stmt->currTuple >= num_rows)) {
-            SC_set_error(stmt, STMT_INVALID_CURSOR_STATE_ERROR,
-                         "Not positioned on a valid row for GetData.", func);
-            result = SQL_ERROR;
-            goto cleanup;
-        }
-        MYLOG(OPENSEARCH_DEBUG, "     num_rows = " FORMAT_LEN "\n", num_rows);
-
-        if (!get_bookmark) {
-            SQLLEN curt = GIdx2CacheIdx(stmt->currTuple, stmt, res);
-            value = QR_get_value_backend_row(res, curt, icol);
-            MYLOG(OPENSEARCH_DEBUG,
-                  "currT=" FORMAT_LEN " base=" FORMAT_LEN " rowset=" FORMAT_LEN
-                  "\n",
-                  stmt->currTuple, QR_get_rowstart_in_cache(res),
-                  SC_get_rowset_start(stmt));
-            MYLOG(OPENSEARCH_DEBUG, "     value = '%s'\n", NULL_IF_NULL(value));
-        }
-    } else {
-        /* it's a SOCKET result (backend data) */
-        if (stmt->currTuple == -1 || !res || !res->tupleField) {
-            SC_set_error(stmt, STMT_INVALID_CURSOR_STATE_ERROR,
-                         "Not positioned on a valid row for GetData.", func);
-            result = SQL_ERROR;
-            goto cleanup;
-        }
-
-        if (!get_bookmark) {
-            /** value = QR_get_value_backend(res, icol); maybe thiw doesn't work
-             */
-            SQLLEN curt = GIdx2CacheIdx(stmt->currTuple, stmt, res);
-            value = QR_get_value_backend_row(res, curt, icol);
-        }
-        MYLOG(OPENSEARCH_DEBUG, "  socket: value = '%s'\n", NULL_IF_NULL(value));
-    }
-
-    if (get_bookmark) {
-        BOOL contents_get = FALSE;
-
-        if (rgbValue) {
-            if (SQL_C_BOOKMARK == target_type
-                || (SQLLEN)sizeof(UInt4) <= cbValueMax) {
-                Int4 bookmark = (int)SC_make_int4_bookmark(stmt->currTuple);
-                contents_get = TRUE;
-                memcpy(rgbValue, &bookmark, sizeof(bookmark));
-            }
-        }
-        if (pcbValue)
-            *pcbValue = sizeof(Int4);
-
-        if (contents_get)
-            result = SQL_SUCCESS;
-        else {
-            SC_set_error(stmt, STMT_TRUNCATED,
-                         "The buffer was too small for the GetData.", func);
-            result = SQL_SUCCESS_WITH_INFO;
-        }
-        goto cleanup;
-    }
-
-    field_type = QR_get_field_type(res, icol);
-    atttypmod = QR_get_atttypmod(res, icol);
-
-    MYLOG(OPENSEARCH_DEBUG,
-          "**** icol = %d, target_type = %d, field_type = %d, value = '%s'\n",
-          icol, target_type, field_type, NULL_IF_NULL(value));
-
-    SC_set_current_col(stmt, icol);
-
-    result = (RETCODE)copy_and_convert_field(stmt, field_type, atttypmod, value,
-                                             target_type, precision, rgbValue,
-                                             cbValueMax, pcbValue, pcbValue);
-
-    switch (result) {
-        case COPY_OK:
-            result = SQL_SUCCESS;
-            break;
-
-        case COPY_UNSUPPORTED_TYPE:
-            SC_set_error(stmt, STMT_RESTRICTED_DATA_TYPE_ERROR,
-                         "Received an unsupported type from OpenSearch.",
-                         func);
-            result = SQL_ERROR;
-            break;
-
-        case COPY_UNSUPPORTED_CONVERSION:
-            SC_set_error(stmt, STMT_RESTRICTED_DATA_TYPE_ERROR,
-                         "Couldn't handle the necessary data type conversion.",
-                         func);
-            result = SQL_ERROR;
-            break;
-
-        case COPY_RESULT_TRUNCATED:
-            SC_set_error(stmt, STMT_TRUNCATED,
-                         "The buffer was too small for the GetData.", func);
-            result = SQL_SUCCESS_WITH_INFO;
-            break;
-
-        case COPY_INVALID_STRING_CONVERSION: /* invalid string */
-            SC_set_error(stmt, STMT_STRING_CONVERSION_ERROR,
-                         "invalid string conversion occured.", func);
-            result = SQL_ERROR;
-            break;
-
-        case COPY_GENERAL_ERROR: /* error msg already filled in */
-            result = SQL_ERROR;
-            break;
-
-        case COPY_NO_DATA_FOUND:
-            /* SC_log_error(func, "no data found", stmt); */
-            result = SQL_NO_DATA_FOUND;
-            break;
-
-        default:
-            SC_set_error(
-                stmt, STMT_INTERNAL_ERROR,
-                "Unrecognized return value from copy_and_convert_field.", func);
-            result = SQL_ERROR;
-            break;
-    }
-
-cleanup:
-#undef return
-    MYLOG(OPENSEARCH_TRACE, "leaving %d\n", result);
-    return result;
-}
-
-/*
- *		Returns data for bound columns in the current row ("hstmt->iCursor"),
- *		advances the cursor.
- */
-RETCODE SQL_API OPENSEARCHAPI_Fetch(HSTMT hstmt) {
-    CSTR func = "OPENSEARCHAPI_Fetch";
-    StatementClass *stmt = (StatementClass *)hstmt;
-    ARDFields *opts;
-    QResultClass *res;
-    BindInfoClass *bookmark;
-    RETCODE retval = SQL_SUCCESS;
-
-    MYLOG(OPENSEARCH_TRACE, "entering stmt = %p, stmt->result= %p\n", stmt,
-          stmt ? SC_get_Curres(stmt) : NULL);
-
-    if (!stmt) {
-        SC_log_error(func, NULL_STRING, NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    SC_clear_error(stmt);
-
-    if (!(res = SC_get_Curres(stmt), res)) {
-        SC_set_error(stmt, STMT_INVALID_CURSOR_STATE_ERROR,
-                     "Null statement result in OPENSEARCHAPI_Fetch.", func);
-        return SQL_ERROR;
-    }
-
-    /* Not allowed to bind a bookmark column when using SQLFetch. */
-    opts = SC_get_ARDF(stmt);
-    if ((bookmark = opts->bookmark, bookmark) && bookmark->buffer) {
-        SC_set_error(
-            stmt, STMT_COLNUM_ERROR,
-            "Not allowed to bind a bookmark column when using OPENSEARCHAPI_Fetch",
-            func);
-        return SQL_ERROR;
-    }
-
-    if (stmt->status == STMT_EXECUTING) {
-        SC_set_error(stmt, STMT_SEQUENCE_ERROR,
-                     "Can't fetch while statement is still executing.", func);
-        return SQL_ERROR;
-    }
-
-    if (stmt->status != STMT_FINISHED) {
-        SC_set_error(stmt, STMT_SEQUENCE_ERROR,
-                     "Fetch can only be called after the successful execution "
-                     "on a SQL statement",
-                     func);
-        return SQL_ERROR;
-    }
-
-    if (opts->bindings == NULL) {
-        if (!SC_may_fetch_rows(stmt))
-            return SQL_NO_DATA_FOUND;
-        /* just to avoid a crash if the user insists on calling this */
-        /* function even if SQL_ExecDirect has reported an Error */
-        SC_set_error(stmt, STMT_INVALID_CURSOR_STATE_ERROR,
-                     "Bindings were not allocated properly.", func);
-        return SQL_ERROR;
-    }
-
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wkeyword-macro"
-#endif  // __APPLE__
-#define return DONT_CALL_RETURN_FROM_HERE ? ? ?
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-    if (stmt->rowset_start < 0)
-        SC_set_rowset_start(stmt, 0, TRUE);
-    QR_set_reqsize(res, 1);
-    /* QR_inc_rowstart_in_cache(res, stmt->last_fetch_count_include_ommitted);
-     */
-    SC_inc_rowset_start(stmt, stmt->last_fetch_count_include_ommitted);
-
-    retval = SC_fetch(stmt);
-#undef return
-    return retval;
-}
-
-SQLLEN
-getNthValid(const QResultClass *res, SQLLEN sta, UWORD orientation, SQLULEN nth,
-            SQLLEN *nearest) {
-    SQLLEN i, num_tuples = QR_get_num_total_tuples(res), nearp;
-    SQLULEN count;
-    KeySet *keyset;
-
-    if (!QR_once_reached_eof(res))
-        num_tuples = INT_MAX;
-    /* Note that the parameter nth is 1-based */
-    MYLOG(OPENSEARCH_DEBUG,
-          "get " FORMAT_ULEN "th Valid data from " FORMAT_LEN " to %s [dlt=%d]",
-          nth, sta, orientation == SQL_FETCH_PRIOR ? "backward" : "forward",
-          res->dl_count);
-    if (0 == res->dl_count) {
-        MYPRINTF(OPENSEARCH_DEBUG, "\n");
-        if (SQL_FETCH_PRIOR == orientation) {
-            if (sta + 1 >= (SQLLEN)nth) {
-                *nearest = sta + 1 - nth;
-                return nth;
-            }
-            *nearest = -1;
-            return -(SQLLEN)(sta + 1);
-        } else {
-            nearp = sta - 1 + nth;
-            if (nearp < num_tuples) {
-                *nearest = nearp;
-                return nth;
-            }
-            *nearest = num_tuples;
-            return -(SQLLEN)(num_tuples - sta);
-        }
-    }
-    count = 0;
-    if (QR_get_cursor(res)) {
-        SQLLEN *deleted = res->deleted;
-        SQLLEN delsta;
-
-        if (SQL_FETCH_PRIOR == orientation) {
-            *nearest = sta + 1 - nth;
-            delsta = (-1);
-            MYPRINTF(OPENSEARCH_DEBUG, "deleted ");
-            for (i = res->dl_count - 1; i >= 0 && *nearest <= deleted[i]; i--) {
-                MYPRINTF(OPENSEARCH_DEBUG, "[" FORMAT_LEN "]=" FORMAT_LEN " ", i,
-                         deleted[i]);
-                if (sta >= deleted[i]) {
-                    (*nearest)--;
-                    if (i > delsta)
-                        delsta = i;
-                }
-            }
-            MYPRINTF(OPENSEARCH_DEBUG, "nearest=" FORMAT_LEN "\n", *nearest);
-            if (*nearest < 0) {
-                *nearest = -1;
-                count = sta - delsta;
-            } else
-                return nth;
-        } else {
-            MYPRINTF(OPENSEARCH_DEBUG, "\n");
-            *nearest = sta - 1 + nth;
-            delsta = res->dl_count;
-            if (!QR_once_reached_eof(res))
-                num_tuples = INT_MAX;
-            for (i = 0; i < res->dl_count && *nearest >= deleted[i]; i++) {
-                if (sta <= deleted[i]) {
-                    (*nearest)++;
-                    if (i < delsta)
-                        delsta = i;
-                }
-            }
-            if (*nearest >= num_tuples) {
-                *nearest = num_tuples;
-                count = *nearest - sta + delsta - res->dl_count;
-            } else
-                return nth;
-        }
-    } else if (SQL_FETCH_PRIOR == orientation) {
-        for (i = sta, keyset = res->keyset + sta; i >= 0; i--, keyset--) {
-            if (0
-                == (keyset->status
-                    & (CURS_SELF_DELETING | CURS_SELF_DELETED
-                       | CURS_OTHER_DELETED))) {
-                *nearest = i;
-                MYPRINTF(OPENSEARCH_DEBUG, " nearest=" FORMAT_LEN "\n", *nearest);
-                if (++count == nth)
-                    return count;
-            }
-        }
-        *nearest = -1;
-    } else {
-        for (i = sta, keyset = res->keyset + sta; i < num_tuples;
-             i++, keyset++) {
-            if (0
-                == (keyset->status
-                    & (CURS_SELF_DELETING | CURS_SELF_DELETED
-                       | CURS_OTHER_DELETED))) {
-                *nearest = i;
-                MYPRINTF(OPENSEARCH_DEBUG, " nearest=" FORMAT_LEN "\n", *nearest);
-                if (++count == nth)
-                    return count;
-            }
-        }
-        *nearest = num_tuples;
-    }
-    MYPRINTF(OPENSEARCH_DEBUG, " nearest not found\n");
-    return -(SQLLEN)count;
-}
-
-/*
- *	return NO_DATA_FOUND macros
- *	  save_rowset_start or num_tuples must be defined
- */
-#define EXTFETCH_RETURN_BOF(stmt, res)                   \
-    {                                                    \
-        MYLOG(OPENSEARCH_ALL, "RETURN_BOF\n");           \
-        SC_set_rowset_start(stmt, -1, TRUE);             \
-        stmt->currTuple = -1;                            \
-        /* move_cursor_position_if_needed(stmt, res); */ \
-        return SQL_NO_DATA_FOUND;                        \
-    }
-#define EXTFETCH_RETURN_EOF(stmt, res)                   \
-    {                                                    \
-        MYLOG(OPENSEARCH_ALL, "RETURN_EOF\n");           \
-        SC_set_rowset_start(stmt, num_tuples, TRUE);     \
-        stmt->currTuple = -1;                            \
-        /* move_cursor_position_if_needed(stmt, res); */ \
-        return SQL_NO_DATA_FOUND;                        \
-    }
-
-/*	This fetchs a block of data (rowset). */
-RETCODE SQL_API OPENSEARCHAPI_ExtendedFetch(HSTMT hstmt, SQLUSMALLINT fFetchType,
-                                    SQLLEN irow, SQLULEN *pcrow,
-                                    SQLUSMALLINT *rgfRowStatus,
-                                    SQLLEN bookmark_offset, SQLLEN rowsetSize) {
-    UNUSED(bookmark_offset, irow);
-    CSTR func = "OPENSEARCHAPI_ExtendedFetch";
-    StatementClass *stmt = (StatementClass *)hstmt;
-    ARDFields *opts;
-    QResultClass *res;
-    BindInfoClass *bookmark;
-    SQLLEN num_tuples, i, fc_io;
-    SQLLEN save_rowset_size, progress_size;
-    SQLLEN rowset_start, rowset_end = (-1);
-    RETCODE result = SQL_SUCCESS;
-    char truncated, error, should_set_rowset_start = FALSE;
-    SQLLEN currp;
-    UWORD pstatus;
-    BOOL currp_is_valid, reached_eof, useCursor;
-    SQLLEN reqsize = rowsetSize;
-
-    MYLOG(OPENSEARCH_TRACE, "entering stmt=%p rowsetSize=" FORMAT_LEN "\n", stmt,
-          rowsetSize);
-
-    if (!stmt) {
-        SC_log_error(func, NULL_STRING, NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    /* if (SC_is_fetchcursor(stmt) && !stmt->manual_result) */
-    if ((SQL_CURSOR_FORWARD_ONLY != stmt->options.cursor_type)
-        || (fFetchType != SQL_FETCH_NEXT)) {
-        SC_set_error(stmt, STMT_FETCH_OUT_OF_RANGE,
-                     "Only SQL_CURSOR_FORWARD_ONLY with SQL_FETCH_NEXT "
-                     "cursor's are supported.",
-                     func);
-        return SQL_ERROR;
-    }
-
-    SC_clear_error(stmt);
-
-    if (!(res = SC_get_Curres(stmt), res)) {
-        SC_set_error(stmt, STMT_INVALID_CURSOR_STATE_ERROR,
-                     "Null statement result in OPENSEARCHAPI_ExtendedFetch.", func);
-        return SQL_ERROR;
-    }
-
-    opts = SC_get_ARDF(stmt);
-    /*
-     * If a bookmark column is bound but bookmark usage is off, then error.
-     */
-    if ((bookmark = opts->bookmark, bookmark) && bookmark->buffer
-        && stmt->options.use_bookmarks == SQL_UB_OFF) {
-        SC_set_error(
-            stmt, STMT_COLNUM_ERROR,
-            "Attempt to retrieve bookmark with bookmark usage disabled", func);
-        return SQL_ERROR;
-    }
-
-    if (stmt->status == STMT_EXECUTING) {
-        SC_set_error(stmt, STMT_SEQUENCE_ERROR,
-                     "Can't fetch while statement is still executing.", func);
-        return SQL_ERROR;
-    }
-
-    if (stmt->status != STMT_FINISHED) {
-        SC_set_error(stmt, STMT_STATUS_ERROR,
-                     "ExtendedFetch can only be called after the successful "
-                     "execution on a SQL statement",
-                     func);
-        return SQL_ERROR;
-    }
-
-    if (opts->bindings == NULL) {
-        if (!SC_may_fetch_rows(stmt))
-            return SQL_NO_DATA_FOUND;
-        /* just to avoid a crash if the user insists on calling this */
-        /* function even if SQL_ExecDirect has reported an Error */
-        SC_set_error(stmt, STMT_INVALID_CURSOR_STATE_ERROR,
-                     "Bindings were not allocated properly.", func);
-        return SQL_ERROR;
-    }
-
-    /* Initialize to no rows fetched */
-    if (rgfRowStatus)
-        for (i = 0; i < rowsetSize; i++)
-            *(rgfRowStatus + i) = SQL_ROW_NOROW;
-
-    if (pcrow)
-        *pcrow = 0;
-
-    useCursor = (SC_is_fetchcursor(stmt) && NULL != QR_get_cursor(res));
-    num_tuples = QR_get_num_total_tuples(res);
-    reached_eof = QR_once_reached_eof(res) && QR_get_cursor(res);
-    if (useCursor && !reached_eof)
-        num_tuples = INT_MAX;
-
-    MYLOG(OPENSEARCH_ALL, "num_tuples=" FORMAT_LEN "\n", num_tuples);
-    /* Save and discard the saved rowset size */
-    save_rowset_size = stmt->save_rowset_size;
-    stmt->save_rowset_size = -1;
-    rowset_start = SC_get_rowset_start(stmt);
-
-    QR_stop_movement(res);
-    res->move_offset = 0;
-    switch (fFetchType) {
-        case SQL_FETCH_NEXT:
-            progress_size =
-                (save_rowset_size > 0 ? save_rowset_size : rowsetSize);
-            if (rowset_start < 0)
-                SC_set_rowset_start(stmt, 0, TRUE);
-            else if (res->keyset) {
-                if (stmt->last_fetch_count <= progress_size) {
-                    SC_inc_rowset_start(
-                        stmt, stmt->last_fetch_count_include_ommitted);
-                    progress_size -= stmt->last_fetch_count;
-                }
-                if (progress_size > 0) {
-                    if (getNthValid(res, SC_get_rowset_start(stmt),
-                                    SQL_FETCH_NEXT, progress_size + 1,
-                                    &rowset_start)
-                        <= 0) {
-                        EXTFETCH_RETURN_EOF(stmt, res)
-                    } else
-                        should_set_rowset_start = TRUE;
-                }
-            } else
-                SC_inc_rowset_start(stmt, progress_size);
-            MYLOG(OPENSEARCH_DEBUG,
-                  "SQL_FETCH_NEXT: num_tuples=" FORMAT_LEN
-                  ", currtuple=" FORMAT_LEN ", rowst=" FORMAT_LEN "\n",
-                  num_tuples, stmt->currTuple, rowset_start);
-            break;
-        default:
-            SC_set_error(stmt, STMT_FETCH_OUT_OF_RANGE,
-                         "Unsupported OPENSEARCHAPI_ExtendedFetch Direction", func);
-            return SQL_ERROR;
-    }
-
-    /*
-     * CHECK FOR PROPER CURSOR STATE
-     */
-
-    /*
-     * Handle Declare Fetch style specially because the end is not really
-     * the end...
-     */
-    if (!should_set_rowset_start)
-        rowset_start = SC_get_rowset_start(stmt);
-
-    // Get more results when cursor reaches end 
-    { 
-        ConnectionClass *conn = SC_get_conn(stmt);
-        if (conn != NULL) {
-            const SQLLEN end_rowset_size = rowset_start + rowsetSize;
-            while ((end_rowset_size >= num_tuples)
-                   && (NULL != res->server_cursor_id)) {
-                GetNextResultSet(stmt);
-                num_tuples = QR_get_num_total_tuples(res);
-            }
-        }
-    }
-
-    if (useCursor) {
-        if (reached_eof && rowset_start >= num_tuples) {
-            EXTFETCH_RETURN_EOF(stmt, res)
-        }
-    } else {
-        /* If *new* rowset is after the result_set, return no data found */
-        if (rowset_start >= num_tuples) {
-            EXTFETCH_RETURN_EOF(stmt, res)
-        }
-    }
-    /* If *new* rowset is prior to result_set, return no data found */
-    if (rowset_start < 0) {
-        if (rowset_start + rowsetSize <= 0) {
-            EXTFETCH_RETURN_BOF(stmt, res)
-        } else { /* overlap with beginning of result set,
-                  * so get first rowset */
-            SC_set_rowset_start(stmt, 0, TRUE);
-        }
-        should_set_rowset_start = FALSE;
-    }
-
-#ifdef __APPLE__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wkeyword-macro"
-#endif  // __APPLE__
-#define return DONT_CALL_RETURN_FROM_HERE ? ? ?
-#ifdef __APPLE__
-#pragma clang diagnostic pop
-#endif  // __APPLE__
-    /* set the rowset_start if needed */
-    if (should_set_rowset_start)
-        SC_set_rowset_start(stmt, rowset_start, TRUE);
-    if (rowset_end < 0 && QR_haskeyset(res)) {
-        getNthValid(res, rowset_start, SQL_FETCH_NEXT, rowsetSize, &rowset_end);
-        reqsize = rowset_end - rowset_start + 1;
-    }
-    QR_set_reqsize(res, (Int4)reqsize);
-    /* currTuple is always 1 row prior to the rowset start */
-    stmt->currTuple = RowIdx2GIdx(-1, stmt);
-    QR_set_rowstart_in_cache(res, SC_get_rowset_start(stmt));
-
-    /* Physical Row advancement occurs for each row fetched below */
-
-    MYLOG(OPENSEARCH_DEBUG, "new currTuple = " FORMAT_LEN "\n", stmt->currTuple);
-
-    truncated = error = FALSE;
-
-    currp = -1;
-    stmt->bind_row = 0; /* set the binding location */
-    result = SC_fetch(stmt);
-    if (SQL_ERROR == result)
-        goto cleanup;
-    if (SQL_NO_DATA_FOUND != result && res->keyset) {
-        currp = GIdx2KResIdx(SC_get_rowset_start(stmt), stmt, res);
-        MYLOG(OPENSEARCH_ALL, "currp=" FORMAT_LEN "\n", currp);
-        if (currp < 0) {
-            result = SQL_ERROR;
-            MYLOG(OPENSEARCH_DEBUG,
-                  "rowset_start=" FORMAT_LEN " but currp=" FORMAT_LEN "\n",
-                  SC_get_rowset_start(stmt), currp);
-            SC_set_error(stmt, STMT_INTERNAL_ERROR,
-                         "rowset_start not in the keyset", func);
-            goto cleanup;
-        }
-    }
-    for (i = 0, fc_io = 0; SQL_NO_DATA_FOUND != result && SQL_ERROR != result;
-         currp++) {
-        fc_io++;
-        currp_is_valid = FALSE;
-        if (res->keyset) {
-            if ((SQLULEN)currp < res->num_cached_keys) {
-                currp_is_valid = TRUE;
-                res->keyset[currp].status &=
-                    ~CURS_IN_ROWSET; /* Off the flag first */
-            } else {
-                MYLOG(OPENSEARCH_DEBUG, "Umm current row is out of keyset\n");
-                break;
-            }
-        }
-        MYLOG(OPENSEARCH_ALL, "ExtFetch result=%d\n", result);
-        if (currp_is_valid && SQL_SUCCESS_WITH_INFO == result
-            && 0 == stmt->last_fetch_count) {
-            MYLOG(OPENSEARCH_ALL, "just skipping deleted row " FORMAT_LEN "\n", currp);
-            if (rowsetSize - i + fc_io > reqsize)
-                QR_set_reqsize(res, (Int4)(rowsetSize - i + fc_io));
-            result = SC_fetch(stmt);
-            if (SQL_ERROR == result)
-                break;
-            continue;
-        }
-
-        /* Determine Function status */
-        if (result == SQL_SUCCESS_WITH_INFO)
-            truncated = TRUE;
-        else if (result == SQL_ERROR)
-            error = TRUE;
-
-        /* Determine Row Status */
-        if (rgfRowStatus) {
-            if (result == SQL_ERROR)
-                *(rgfRowStatus + i) = SQL_ROW_ERROR;
-            else if (currp_is_valid) {
-                pstatus = (res->keyset[currp].status & KEYSET_INFO_PUBLIC);
-                if (pstatus != 0 && pstatus != SQL_ROW_ADDED) {
-                    rgfRowStatus[i] = pstatus;
-                } else
-                    rgfRowStatus[i] = SQL_ROW_SUCCESS;
-                /* refresh the status */
-                /* if (SQL_ROW_DELETED != pstatus) */
-                res->keyset[currp].status &= (~KEYSET_INFO_PUBLIC);
-            } else
-                *(rgfRowStatus + i) = SQL_ROW_SUCCESS;
-        }
-        if (SQL_ERROR != result && currp_is_valid)
-            res->keyset[currp].status |=
-                CURS_IN_ROWSET; /* This is the unique place where the
-                                   CURS_IN_ROWSET bit is turned on */
-        i++;
-        if (i >= rowsetSize)
-            break;
-        stmt->bind_row = (SQLSETPOSIROW)i; /* set the binding location */
-        result = SC_fetch(stmt);
-    }
-    if (SQL_ERROR == result)
-        goto cleanup;
-
-    /* Save the fetch count for SQLSetPos */
-    stmt->last_fetch_count = i;
-    stmt->save_rowset_size = rowsetSize;
-    /*
-    currp = KResIdx2GIdx(currp, stmt, res);
-    stmt->last_fetch_count_include_ommitted = GIdx2RowIdx(currp, stmt);
-    */
-    stmt->last_fetch_count_include_ommitted = fc_io;
-
-    /* Reset next binding row */
-    stmt->bind_row = 0;
-
-    /* Move the cursor position to the first row in the result set. */
-    stmt->currTuple = RowIdx2GIdx(0, stmt);
-
-    /* For declare/fetch, need to reset cursor to beginning of rowset */
-    if (useCursor)
-        QR_set_position(res, 0);
-
-    /* Set the number of rows retrieved */
-    if (pcrow)
-        *pcrow = i;
-    MYLOG(OPENSEARCH_ALL, "pcrow=" FORMAT_LEN "\n", i);
-
-    if (i == 0)
-        /* Only DeclareFetch should wind up here */
-        result = SQL_NO_DATA_FOUND;
-    else if (error)
-        result = SQL_ERROR;
-    else if (truncated)
-        result = SQL_SUCCESS_WITH_INFO;
-    else if (SC_get_errornumber(stmt) == STMT_POS_BEFORE_RECORDSET)
-        result = SQL_SUCCESS_WITH_INFO;
-    else
-        result = SQL_SUCCESS;
-
-cleanup:
-#undef return
-    return result;
-}
-
-/*
- *		This determines whether there are more results sets available for
- *		the "hstmt".
- */
-/* CC: return SQL_NO_DATA_FOUND since we do not support multiple result sets */
-RETCODE SQL_API OPENSEARCHAPI_MoreResults(HSTMT hstmt) {
-    StatementClass *stmt = (StatementClass *)hstmt;
-    QResultClass *res;
-    RETCODE ret = SQL_SUCCESS;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-    res = SC_get_Curres(stmt);
-    if (res) {
-        res = res->next;
-        SC_set_Curres(stmt, res);
-    }
-    if (res) {
-        SQLSMALLINT num_p;
-
-        if (stmt->multi_statement < 0)
-            OPENSEARCHAPI_NumParams(stmt, &num_p);
-        if (stmt->multi_statement > 0) {
-            const char *cmdstr;
-
-            SC_initialize_cols_info(stmt, FALSE, TRUE);
-            stmt->statement_type = STMT_TYPE_UNKNOWN;
-            if (cmdstr = QR_get_command(res), NULL != cmdstr)
-                stmt->statement_type = (short)statement_type(cmdstr);
-            stmt->join_info = 0;
-            SC_clear_parse_method(stmt);
-        }
-        stmt->diag_row_count = res->recent_processed_row_count;
-        SC_set_rowset_start(stmt, -1, FALSE);
-        stmt->currTuple = -1;
-    } else {
-        OPENSEARCHAPI_FreeStmt(hstmt, SQL_CLOSE);
-        ret = SQL_NO_DATA_FOUND;
-    }
-    MYLOG(OPENSEARCH_DEBUG, "leaving %d\n", ret);
-    return ret;
-}
-
-SQLLEN ClearCachedRows(TupleField *tuple, int num_fields, SQLLEN num_rows) {
-    SQLLEN i;
-
-    for (i = 0; i < num_fields * num_rows; i++, tuple++) {
-        if (tuple->value) {
-            MYLOG(OPENSEARCH_ALL,
-                  "freeing tuple[" FORMAT_LEN "][" FORMAT_LEN "].value=%p\n",
-                  i / num_fields, i % num_fields, tuple->value);
-            free(tuple->value);
-            tuple->value = NULL;
-        }
-        tuple->len = -1;
-    }
-    return i;
-}
-
-/*	Set the cursor name on a statement handle */
-RETCODE SQL_API OPENSEARCHAPI_SetCursorName(HSTMT hstmt, const SQLCHAR *szCursor,
-                                    SQLSMALLINT cbCursor) {
-    CSTR func = "OPENSEARCHAPI_SetCursorName";
-    StatementClass *stmt = (StatementClass *)hstmt;
-
-    MYLOG(OPENSEARCH_TRACE, "entering hstmt=%p, szCursor=%p, cbCursorMax=%d\n", hstmt,
-          szCursor, cbCursor);
-
-    if (!stmt) {
-        SC_log_error(func, NULL_STRING, NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    SET_NAME_DIRECTLY(stmt->cursor_name,
-                      make_string(szCursor, cbCursor, NULL, 0));
-    return SQL_SUCCESS;
-}
-
-/*	Return the cursor name for a statement handle */
-RETCODE SQL_API OPENSEARCHAPI_GetCursorName(HSTMT hstmt, SQLCHAR *szCursor,
-                                    SQLSMALLINT cbCursorMax,
-                                    SQLSMALLINT *pcbCursor) {
-    CSTR func = "OPENSEARCHAPI_GetCursorName";
-    StatementClass *stmt = (StatementClass *)hstmt;
-    size_t len = 0;
-    RETCODE result;
-
-    MYLOG(OPENSEARCH_DEBUG,
-          "entering hstmt=%p, szCursor=%p, cbCursorMax=%d, pcbCursor=%p\n",
-          hstmt, szCursor, cbCursorMax, pcbCursor);
-
-    if (!stmt) {
-        SC_log_error(func, NULL_STRING, NULL);
-        return SQL_INVALID_HANDLE;
-    }
-    result = SQL_SUCCESS;
-    len = strlen(SC_cursor_name(stmt));
-
-    if (szCursor) {
-        strncpy_null((char *)szCursor, SC_cursor_name(stmt), cbCursorMax);
-
-        if (len >= (size_t)cbCursorMax) {
-            result = SQL_SUCCESS_WITH_INFO;
-            SC_set_error(stmt, STMT_TRUNCATED,
-                         "The buffer was too small for the GetCursorName.",
-                         func);
-        }
-    }
-
-    if (pcbCursor)
-        *pcbCursor = (SQLSMALLINT)len;
-
-    return result;
-}
diff --git a/sql-odbc/src/sqlodbc/setup.c b/sql-odbc/src/sqlodbc/setup.c
deleted file mode 100644
index 89cc0dc957..0000000000
--- a/sql-odbc/src/sqlodbc/setup.c
+++ /dev/null
@@ -1,698 +0,0 @@
-#ifdef WIN32
-#include "opensearch_enlist.h"
-#include "opensearch_odbc.h"
-#include "loadlib.h"
-#include "misc.h"  // strncpy_null
-
-//#include  "environ.h"
-#ifdef WIN32
-#include <windowsx.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-#include "dlg_specific.h"
-#include "opensearch_apifunc.h"
-#include "resource.h"
-#include "win_setup.h"
-
-#define INTFUNC __stdcall
-
-extern HINSTANCE s_hModule; /* Saved module handle. */
-
-/* Constants */
-#define MIN(x, y) ((x) < (y) ? (x) : (y))
-
-#define MAXKEYLEN (32 + 1) /* Max keyword length */
-#define MAXDESC (255 + 1)  /* Max description length */
-#define MAXDSNAME (32 + 1) /* Max data source name length */
-
-static void ParseAttributes(LPCSTR lpszAttributes, LPSETUPDLG lpsetupdlg);
-static BOOL SetDSNAttributes(HWND hwndParent, LPSETUPDLG lpsetupdlg,
-                             DWORD *errcode);
-static BOOL SetDriverAttributes(LPCSTR lpszDriver, DWORD *pErrorCode,
-                                LPSTR pErrorMessage, WORD cbMessage);
-static void CenterDialog(HWND hdlg);
-
-/*--------
- *	ConfigDSN
- *
- *	Description:	ODBC Setup entry point
- *				This entry point is called by the ODBC Installer
- *				(see file header for more details)
- *	Input	 :	hwnd ----------- Parent window handle
- *				fRequest ------- Request type (i.e., add, config, or remove)
- *				lpszDriver ----- Driver name
- *				lpszAttributes - data source attribute string
- *	Output	 :	TRUE success, FALSE otherwise
- *--------
- */
-BOOL CALLBACK ConfigDSN(HWND hwnd, WORD fRequest, LPCSTR lpszDriver,
-                        LPCSTR lpszAttributes) {
-    BOOL fSuccess; /* Success/fail flag */
-    GLOBALHANDLE hglbAttr;
-    LPSETUPDLG lpsetupdlg;
-
-    /* Allocate attribute array */
-    hglbAttr = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, sizeof(SETUPDLG));
-    if (!hglbAttr)
-        return FALSE;
-    lpsetupdlg = (LPSETUPDLG)GlobalLock(hglbAttr);
-
-    /* First of all, parse attribute string only for DSN entry */
-    CC_conninfo_init(&(lpsetupdlg->ci), INIT_GLOBALS);
-    if (lpszAttributes)
-        ParseAttributes(lpszAttributes, lpsetupdlg);
-
-    /* Save original data source name */
-    if (lpsetupdlg->ci.dsn[0])
-        STRCPY_FIXED(lpsetupdlg->szDSN, lpsetupdlg->ci.dsn);
-    else
-        lpsetupdlg->szDSN[0] = '\0';
-
-    /* Remove data source */
-    if (ODBC_REMOVE_DSN == fRequest) {
-        /* Fail if no data source name was supplied */
-        if (!lpsetupdlg->ci.dsn[0])
-            fSuccess = FALSE;
-
-        /* Otherwise remove data source from ODBC.INI */
-        else
-            fSuccess = SQLRemoveDSNFromIni(lpsetupdlg->ci.dsn);
-    }
-    /* Add or Configure data source */
-    else {
-        /* Save passed variables for global access (e.g., dialog access) */
-        lpsetupdlg->hwndParent = hwnd;
-        lpsetupdlg->lpszDrvr = lpszDriver;
-        lpsetupdlg->fNewDSN = (ODBC_ADD_DSN == fRequest);
-        lpsetupdlg->fDefault = !lstrcmpi(lpsetupdlg->ci.dsn, INI_DSN);
-
-        /* Cleanup conninfo and restore data source name */
-        CC_conninfo_init(&(lpsetupdlg->ci), CLEANUP_FOR_REUSE | INIT_GLOBALS);
-        STRCPY_FIXED(lpsetupdlg->ci.dsn, lpsetupdlg->szDSN);
-        /* Get common attributes of Data Source */
-        getDSNinfo(&(lpsetupdlg->ci), lpsetupdlg->lpszDrvr);
-        /*
-         * Parse attribute string again
-         *
-         * NOTE: Values supplied in the attribute string will always
-         *	 override settings in ODBC.INI
-         */
-        if (lpszAttributes)
-            ParseAttributes(lpszAttributes, lpsetupdlg);
-
-        /*
-         * Display the appropriate dialog (if parent window handle
-         * supplied)
-         */
-        if (hwnd) {
-            /* Display dialog(s) */
-            fSuccess =
-                (IDOK
-                 == DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_CONFIG), hwnd,
-                                   ConfigDlgProc, (LPARAM)lpsetupdlg));
-        } else if (lpsetupdlg->ci.dsn[0]) {
-            MYLOG(OPENSEARCH_DEBUG, "SetDSNAttributes\n");
-            fSuccess = SetDSNAttributes(hwnd, lpsetupdlg, NULL);
-        } else
-            fSuccess = FALSE;
-    }
-
-    CC_conninfo_release(&(lpsetupdlg->ci));
-    GlobalUnlock(hglbAttr);
-    GlobalFree(hglbAttr);
-
-    return fSuccess;
-}
-
-/*--------
- *	ConfigDriver
- *
- *	Description:	ODBC Setup entry point
- *			This entry point is called by the ODBC Installer
- *			(see file header for more details)
- *	Arguments :	hwnd ----------- Parent window handle
- *			fRequest ------- Request type (i.e., add, config, or remove)
- *			lpszDriver ----- Driver name
- *			lpszArgs ------- A null-terminated string containing
-                arguments for a driver specific fRequest
- *			lpszMsg -------- A null-terimated string containing
-                an output message from the driver setup
- *			cnMsgMax ------- Length of lpszMSg
- *			pcbMsgOut ------ Total number of bytes available to
-                return in lpszMsg
- *	Returns :	TRUE success, FALSE otherwise
- *--------
- */
-BOOL CALLBACK ConfigDriver(HWND hwnd, WORD fRequest, LPCSTR lpszDriver,
-                           LPCSTR lpszArgs, LPSTR lpszMsg, WORD cbMsgMax,
-                           WORD *pcbMsgOut) {
-    UNUSED(lpszArgs, hwnd);
-    DWORD errorCode = 0;
-    BOOL fSuccess = TRUE; /* Success/fail flag */
-
-    if (cbMsgMax > 0 && NULL != lpszMsg)
-        *lpszMsg = '\0';
-    if (NULL != pcbMsgOut)
-        *pcbMsgOut = 0;
-
-    /* Add the driver */
-    switch (fRequest) {
-        case ODBC_INSTALL_DRIVER:
-            fSuccess =
-                SetDriverAttributes(lpszDriver, &errorCode, lpszMsg, cbMsgMax);
-            if (cbMsgMax > 0 && NULL != lpszMsg)
-                *pcbMsgOut = (WORD)strlen(lpszMsg);
-            break;
-        case ODBC_REMOVE_DRIVER:
-            break;
-        default:
-            errorCode = ODBC_ERROR_INVALID_REQUEST_TYPE;
-            fSuccess = FALSE;
-    }
-
-    if (!fSuccess)
-        SQLPostInstallerError(errorCode, lpszMsg);
-    return fSuccess;
-}
-
-/*-------
- * CenterDialog
- *
- *		Description:  Center the dialog over the frame window
- *		Input	   :  hdlg -- Dialog window handle
- *		Output	   :  None
- *-------
- */
-static void CenterDialog(HWND hdlg) {
-    HWND hwndFrame;
-    RECT rcDlg, rcScr, rcFrame;
-    int cx, cy;
-
-    hwndFrame = GetParent(hdlg);
-
-    GetWindowRect(hdlg, &rcDlg);
-    cx = rcDlg.right - rcDlg.left;
-    cy = rcDlg.bottom - rcDlg.top;
-
-    GetClientRect(hwndFrame, &rcFrame);
-    ClientToScreen(hwndFrame, (LPPOINT)(&rcFrame.left));
-    ClientToScreen(hwndFrame, (LPPOINT)(&rcFrame.right));
-    rcDlg.top = rcFrame.top + (((rcFrame.bottom - rcFrame.top) - cy) >> 1);
-    rcDlg.left = rcFrame.left + (((rcFrame.right - rcFrame.left) - cx) >> 1);
-    rcDlg.bottom = rcDlg.top + cy;
-    rcDlg.right = rcDlg.left + cx;
-
-    GetWindowRect(GetDesktopWindow(), &rcScr);
-    if (rcDlg.bottom > rcScr.bottom) {
-        rcDlg.bottom = rcScr.bottom;
-        rcDlg.top = rcDlg.bottom - cy;
-    }
-    if (rcDlg.right > rcScr.right) {
-        rcDlg.right = rcScr.right;
-        rcDlg.left = rcDlg.right - cx;
-    }
-
-    if (rcDlg.left < 0)
-        rcDlg.left = 0;
-    if (rcDlg.top < 0)
-        rcDlg.top = 0;
-
-    MoveWindow(hdlg, rcDlg.left, rcDlg.top, cx, cy, TRUE);
-    return;
-}
-
-/*-------
- * ConfigDlgProc
- *	Description:	Manage add data source name dialog
- *	Input	 :	hdlg --- Dialog window handle
- *				wMsg --- Message
- *				wParam - Message parameter
- *				lParam - Message parameter
- *	Output	 :	TRUE if message processed, FALSE otherwise
- *-------
- */
-INT_PTR CALLBACK ConfigDlgProc(HWND hdlg, UINT wMsg, WPARAM wParam,
-                               LPARAM lParam) {
-    LPSETUPDLG lpsetupdlg;
-    ConnInfo *ci;
-    DWORD cmd;
-
-    switch (wMsg) {
-            /* Initialize the dialog */
-        case WM_INITDIALOG:
-            lpsetupdlg = (LPSETUPDLG)lParam;
-            ci = &lpsetupdlg->ci;
-
-            SetWindowLongPtr(hdlg, DWLP_USER, lParam);
-            CenterDialog(hdlg); /* Center dialog */
-
-            /* Initialize dialog fields */
-            SetDlgStuff(hdlg, ci);
-
-            /* Save drivername */
-            if (!(lpsetupdlg->ci.drivername[0]))
-                STRCPY_FIXED(lpsetupdlg->ci.drivername, lpsetupdlg->lpszDrvr);
-
-            if (lpsetupdlg->fNewDSN || !ci->dsn[0])
-                EnableWindow(GetDlgItem(hdlg, IDC_DSNAME), TRUE);
-            if (lpsetupdlg->fDefault) {
-                EnableWindow(GetDlgItem(hdlg, IDC_DSNAME), FALSE);
-            } else
-                SendDlgItemMessage(hdlg, IDC_DSNAME, EM_LIMITTEXT,
-                                   (WPARAM)(MAXDSNAME - 1), 0L);
-
-            SendDlgItemMessage(hdlg, IDC_DESC, EM_LIMITTEXT,
-                               (WPARAM)(MAXDESC - 1), 0L);
-
-            if (!stricmp(ci->authtype, AUTHTYPE_IAM)) {
-                SendDlgItemMessage(hdlg, IDC_AUTHTYPE, CB_SETCURSEL, 0,
-                                   (WPARAM)0);
-            } else if (!stricmp(ci->authtype, AUTHTYPE_BASIC)) {
-                SendDlgItemMessage(hdlg, IDC_AUTHTYPE, CB_SETCURSEL, 1,
-                                   (WPARAM)0);
-            } else { // AUTHTYPE_NONE
-                SendDlgItemMessage(hdlg, IDC_AUTHTYPE, CB_SETCURSEL, 2,
-                                   (WPARAM)0);
-            }
-            
-            return TRUE; /* Focus was not set */
-
-            /* Process buttons */
-        case WM_COMMAND:
-            lpsetupdlg = (LPSETUPDLG)GetWindowLongPtr(hdlg, DWLP_USER);
-            switch (cmd = GET_WM_COMMAND_ID(wParam, lParam)) {
-                    /*
-                     * Ensure the OK button is enabled only when a data
-                     * source name
-                     */
-                    /* is entered */
-                case IDC_DSNAME:
-                    if (GET_WM_COMMAND_CMD(wParam, lParam) == EN_CHANGE) {
-                        char szItem[MAXDSNAME]; /* Edit control text */
-
-                        /* Enable/disable the OK button */
-                        EnableWindow(GetDlgItem(hdlg, IDOK),
-                                     GetDlgItemText(hdlg, IDC_DSNAME, szItem,
-                                                    sizeof(szItem)));
-                        return TRUE;
-                    }
-                    break;
-
-                    /* Accept results */
-                case IDOK:
-                    /* Retrieve dialog values */
-                    if (!lpsetupdlg->fDefault)
-                        GetDlgItemText(hdlg, IDC_DSNAME, lpsetupdlg->ci.dsn,
-                                       sizeof(lpsetupdlg->ci.dsn));
-
-                    /* Get Dialog Values */
-                    GetDlgStuff(hdlg, &lpsetupdlg->ci);
-                    /* Update ODBC.INI */
-                    SetDSNAttributes(hdlg, lpsetupdlg, NULL);
-
-                case IDCANCEL:
-                    EndDialog(hdlg, wParam);
-                    return TRUE;
-
-                case IDOK2:  // <== TEST butter
-                {
-                    /* Get Dialog Values */
-                    GetDlgStuff(hdlg, &lpsetupdlg->ci);
-                    test_connection(lpsetupdlg->hwndParent, &lpsetupdlg->ci,
-                                    FALSE);
-                    return TRUE;
-                    break;
-                }
-                case ID_ADVANCED_OPTIONS: {
-                    GetDlgStuff(hdlg, &lpsetupdlg->ci);
-                    if (DialogBoxParam(
-                            s_hModule, MAKEINTRESOURCE(DLG_ADVANCED_OPTIONS),
-                            hdlg, advancedOptionsProc, (LPARAM)&lpsetupdlg->ci) > 0)
-                        EndDialog(hdlg, 0);
-                    break;
-                }
-                case ID_LOG_OPTIONS: {
-                    if (DialogBoxParam(
-                            s_hModule, MAKEINTRESOURCE(DLG_LOG_OPTIONS), hdlg,
-                                       logOptionsProc, (LPARAM)&lpsetupdlg->ci) > 0)
-                        EndDialog(hdlg, 0);
-                    break;
-                }
-                case IDC_AUTHTYPE: {
-                    SetAuthenticationVisibility(hdlg, GetCurrentAuthMode(hdlg));
-                }
-            }
-            break;
-        case WM_CTLCOLORSTATIC:
-            if (lParam == (LPARAM)GetDlgItem(hdlg, IDC_NOTICE_USER)) {
-                HBRUSH hBrush = (HBRUSH)GetStockObject(LTGRAY_BRUSH);
-                SetTextColor((HDC)wParam, RGB(255, 0, 0));
-                return (LRESULT)hBrush;
-            }
-            break;
-    }
-
-    /* Message not processed */
-    return FALSE;
-}
-
-#ifdef USE_PROC_ADDRESS
-#define SQLALLOCHANDLEFUNC sqlallochandle
-#define SQLSETENVATTRFUNC sqlsetenvattr
-#define SQLDISCONNECTFUNC sqldisconnect
-#define SQLFREEHANDLEFUNC sqlfreehandle
-#ifdef UNICODE_SUPPORT
-#define SQLGETDIAGRECFUNC sqlgetdiagrecw
-#define SQLDRIVERCONNECTFUNC sqldriverconnectw
-#define SQLSETCONNECTATTRFUNC sqlsetconnectattrw
-#else
-#define SQLGETDIAGRECFUNC sqlgetdiagrec
-#define SQLDRIVERCONNECTFUNC sqldriverconnect
-#define SQLSETCONNECTATTRFUNC sqlsetconnectAttr
-#endif /* UNICODE_SUPPORT */
-#else
-#define SQLALLOCHANDLEFUNC SQLAllocHandle
-#define SQLSETENVATTRFUNC SQLSetEnvAttr
-#define SQLDISCONNECTFUNC SQLDisconnect
-#define SQLFREEHANDLEFUNC SQLFreeHandle
-#ifdef UNICODE_SUPPORT
-#define SQLGETDIAGRECFUNC SQLGetDiagRecW
-#define SQLDRIVERCONNECTFUNC SQLDriverConnectW
-#define SQLSETCONNECTATTRFUNC SQLSetConnectAttrW
-#else
-#define SQLGETDIAGRECFUNC SQLGetDiagRec
-#define SQLDRIVERCONNECTFUNC SQLDriverConnect
-#define SQLSETCONNECTATTRFUNC SQLSetConnectAttr
-#endif /* UNICODE_SUPPORT */
-#endif /* USE_PROC_ADDRESS */
-
-#define MAX_CONNECT_STRING_LEN 2048
-#ifdef UNICODE_SUPPORT
-#define MESSAGEBOXFUNC MessageBoxW
-#define _T(str) L##str
-#define SNTPRINTF _snwprintf
-#else
-#define MESSAGEBOXFUNC MessageBoxA
-#define _T(str) str
-#define SNTPRINTF snprintf
-#endif /* UNICODE_SUPPORT */
-
-void test_connection(HANDLE hwnd, ConnInfo *ci, BOOL withDTC) {
-    SQLINTEGER errnum;
-    char out_conn[MAX_CONNECT_STRING_LEN];
-    SQLRETURN ret;
-    SQLHENV env = SQL_NULL_HANDLE;
-    SQLHDBC conn = SQL_NULL_HANDLE;
-    SQLSMALLINT str_len;
-    char dsn_1st;
-    BOOL connected = FALSE;
-#ifdef UNICODE_SUPPORT
-    SQLWCHAR wout_conn[MAX_CONNECT_STRING_LEN];
-    SQLWCHAR szMsg[SQL_MAX_MESSAGE_LENGTH];
-    const SQLWCHAR *ermsg = NULL;
-    SQLWCHAR *conn_str;
-#else
-    SQLCHAR szMsg[SQL_MAX_MESSAGE_LENGTH];
-    const SQLCHAR *ermsg = NULL;
-    SQLCHAR *conn_str;
-#endif /* UNICODE_SUPPORT */
-
-    dsn_1st = ci->dsn[0];
-    ci->dsn[0] = '\0';
-    makeConnectString(out_conn, ci, sizeof(out_conn));
-#ifdef UNICODE_SUPPORT
-    MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, out_conn, -1, wout_conn,
-                        sizeof(wout_conn) / sizeof(wout_conn[0]));
-    conn_str = wout_conn;
-#else
-    conn_str = out_conn;
-#endif /* UNICODE_SUPPORT */
-    ci->dsn[0] = dsn_1st;
-    if (!SQL_SUCCEEDED(
-            ret = SQLALLOCHANDLEFUNC(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &env))) {
-        ermsg = _T("SQLAllocHandle for env error");
-        goto cleanup;
-    }
-    if (!SQL_SUCCEEDED(ret = SQLSETENVATTRFUNC(env, SQL_ATTR_ODBC_VERSION,
-                                               (SQLPOINTER)SQL_OV_ODBC3, 0))) {
-        SNTPRINTF(szMsg, _countof(szMsg), _T("SQLAllocHandle for env error=%d"),
-                  ret);
-        goto cleanup;
-    }
-    if (!SQL_SUCCEEDED(ret = SQLALLOCHANDLEFUNC(SQL_HANDLE_DBC, env, &conn))) {
-        SQLGETDIAGRECFUNC(SQL_HANDLE_ENV, env, 1, NULL, &errnum, szMsg,
-                          _countof(szMsg), &str_len);
-        ermsg = szMsg;
-        goto cleanup;
-    }
-    if (!SQL_SUCCEEDED(ret = SQLDRIVERCONNECTFUNC(conn, hwnd, conn_str, SQL_NTS,
-                                                  NULL, MAX_CONNECT_STRING_LEN,
-                                                  &str_len,
-                                                  SQL_DRIVER_NOPROMPT))) {
-        SQLGETDIAGRECFUNC(SQL_HANDLE_DBC, conn, 1, NULL, &errnum, szMsg,
-                          _countof(szMsg), &str_len);
-        ermsg = szMsg;
-        goto cleanup;
-    }
-    connected = TRUE;
-    ermsg = _T("Connection successful");
-
-    if (withDTC) {
-#ifdef _HANDLE_ENLIST_IN_DTC_
-        HRESULT res;
-        void *pObj = NULL;
-
-        pObj = CALL_GetTransactionObject(&res);
-        if (NULL != pObj) {
-            SQLRETURN ret = SQLSETCONNECTATTRFUNC(conn, SQL_ATTR_ENLIST_IN_DTC,
-                                                  (SQLPOINTER)pObj, 0);
-            if (SQL_SUCCEEDED(ret)) {
-                SQLSETCONNECTATTRFUNC(conn, SQL_ATTR_ENLIST_IN_DTC,
-                                      SQL_DTC_DONE, 0);
-                SNTPRINTF(szMsg, _countof(szMsg),
-                          _T("%s\nenlistment was successful\n"), ermsg);
-                ermsg = szMsg;
-            } else {
-                int strl;
-
-                SNTPRINTF(szMsg, _countof(szMsg), _T("%s\nMSDTC error:"),
-                          ermsg);
-                for (strl = 0; strl < SQL_MAX_MESSAGE_LENGTH; strl++) {
-                    if (!szMsg[strl])
-                        break;
-                }
-                SQLGETDIAGRECFUNC(
-                    SQL_HANDLE_DBC, conn, 1, NULL, &errnum, szMsg + strl,
-                    (SQLSMALLINT)(_countof(szMsg) - strl), &str_len);
-                ermsg = szMsg;
-            }
-            CALL_ReleaseTransactionObject(pObj);
-        } else if (FAILED(res)) {
-            SNTPRINTF(szMsg, _countof(szMsg),
-                      _T("%s\nDistibuted Transaction enlistment error %x"),
-                      ermsg, res);
-            ermsg = szMsg;
-        }
-#else /* _HANDLE_ENLIST_IN_DTC_ */
-        SNTPRINTF(szMsg, _countof(szMsg),
-                  _T("%s\nDistibuted Transaction enlistment not supported by ")
-                  _T("this driver"),
-                  ermsg);
-        ermsg = szMsg;
-#endif
-    }
-
-cleanup:
-    if (NULL != ermsg && NULL != hwnd) {
-        MESSAGEBOXFUNC(hwnd, ermsg, _T("Connection Test"),
-                       MB_ICONEXCLAMATION | MB_OK);
-    }
-
-#undef _T
-
-    if (NULL != conn) {
-        if (connected)
-            SQLDISCONNECTFUNC(conn);
-        SQLFREEHANDLEFUNC(SQL_HANDLE_DBC, conn);
-    }
-    if (env)
-        SQLFREEHANDLEFUNC(SQL_HANDLE_ENV, env);
-
-    return;
-}
-
-/*-------
- * ParseAttributes
- *
- *	Description:	Parse attribute string moving values into the aAttr array
- *	Input	 :	lpszAttributes - Pointer to attribute string
- *	Output	 :	None (global aAttr normally updated)
- *-------
- */
-static void ParseAttributes(LPCSTR lpszAttributes, LPSETUPDLG lpsetupdlg) {
-    LPCSTR lpsz;
-    LPCSTR lpszStart;
-    char aszKey[MAXKEYLEN];
-    size_t cbKey;
-    char value[MAXESPATH];
-
-    for (lpsz = lpszAttributes; *lpsz; lpsz++) {
-        /*
-         * Extract key name (e.g., DSN), it must be terminated by an
-         * equals
-         */
-        lpszStart = lpsz;
-        for (;; lpsz++) {
-            if (!*lpsz)
-                return; /* No key was found */
-            else if (*lpsz == '=')
-                break; /* Valid key found */
-        }
-        /* Determine the key's index in the key table (-1 if not found) */
-        cbKey = lpsz - lpszStart;
-        if (cbKey < sizeof(aszKey)) {
-            memcpy(aszKey, lpszStart, cbKey);
-            aszKey[cbKey] = '\0';
-        }
-
-        /* Locate end of key value */
-        lpszStart = ++lpsz;
-        for (; *lpsz; lpsz++)
-            ;
-
-        /* lpsetupdlg->aAttr[iElement].fSupplied = TRUE; */
-        memcpy(value, lpszStart, MIN(lpsz - lpszStart + 1, MAXESPATH));
-
-        MYLOG(OPENSEARCH_DEBUG, "aszKey='%s', value='%s'\n", aszKey, value);
-
-        /* Copy the appropriate value to the conninfo  */
-        copyConnAttributes(&lpsetupdlg->ci, aszKey, value);
-    }
-    return;
-}
-
-/*--------
- * SetDSNAttributes
- *
- *	Description:	Write data source attributes to ODBC.INI
- *	Input	 :	hwnd - Parent window handle (plus globals)
- *	Output	 :	TRUE if successful, FALSE otherwise
- *--------
- */
-static BOOL SetDSNAttributes(HWND hwndParent, LPSETUPDLG lpsetupdlg,
-                             DWORD *errcode) {
-    LPCSTR lpszDSN; /* Pointer to data source name */
-
-    lpszDSN = lpsetupdlg->ci.dsn;
-
-    if (errcode)
-        *errcode = 0;
-    /* Validate arguments */
-    if (lpsetupdlg->fNewDSN && !*lpsetupdlg->ci.dsn)
-        return FALSE;
-
-    /* Write the data source name */
-    if (!SQLWriteDSNToIni(lpszDSN, lpsetupdlg->lpszDrvr)) {
-        RETCODE ret = SQL_ERROR;
-        DWORD err = (DWORD)SQL_ERROR;
-        char szMsg[SQL_MAX_MESSAGE_LENGTH];
-
-        ret = SQLInstallerError(1, &err, szMsg, sizeof(szMsg), NULL);
-        if (hwndParent) {
-            char szBuf[MAXESPATH];
-
-            if (SQL_SUCCESS != ret) {
-                LoadString(s_hModule, IDS_BADDSN, szBuf, sizeof(szBuf));
-                SPRINTF_FIXED(szMsg, szBuf, lpszDSN);
-            }
-            LoadString(s_hModule, IDS_MSGTITLE, szBuf, sizeof(szBuf));
-            MessageBox(hwndParent, szMsg, szBuf, MB_ICONEXCLAMATION | MB_OK);
-        }
-        if (errcode)
-            *errcode = err;
-        return FALSE;
-    }
-
-    /* Update ODBC.INI */
-    write_Ci_Drivers(ODBC_INI, lpsetupdlg->ci.dsn, &(lpsetupdlg->ci.drivers));
-    writeDSNinfo(&lpsetupdlg->ci);
-
-    /* If the data source name has changed, remove the old name */
-    if (lstrcmpi(lpsetupdlg->szDSN, lpsetupdlg->ci.dsn))
-        SQLRemoveDSNFromIni(lpsetupdlg->szDSN);
-    return TRUE;
-}
-
-/*--------
- * SetDriverAttributes
- *
- *	Description:	Write driver information attributes to ODBCINST.INI
- *	Input	 :	lpszDriver - The driver name
- *	Output	 :	TRUE if successful, FALSE otherwise
- *--------
- */
-static BOOL SetDriverAttributes(LPCSTR lpszDriver, DWORD *pErrorCode,
-                                LPSTR message, WORD cbMessage) {
-    BOOL ret = FALSE;
-    char ver_string[8];
-
-    /* Validate arguments */
-    if (!lpszDriver || !lpszDriver[0]) {
-        if (pErrorCode)
-            *pErrorCode = ODBC_ERROR_INVALID_NAME;
-        strncpy_null(message, "Driver name not specified", cbMessage);
-        return FALSE;
-    }
-
-    if (!SQLWritePrivateProfileString(lpszDriver, "APILevel", "1",
-                                      ODBCINST_INI))
-        goto cleanup;
-    if (!SQLWritePrivateProfileString(lpszDriver, "ConnectFunctions", "YYN",
-                                      ODBCINST_INI))
-        goto cleanup;
-    SPRINTF_FIXED(ver_string, "%02x.%02x", ODBCVER / 256, ODBCVER % 256);
-    if (!SQLWritePrivateProfileString(lpszDriver, "DriverODBCVer", ver_string,
-                                      ODBCINST_INI))
-        goto cleanup;
-    if (!SQLWritePrivateProfileString(lpszDriver, "FileUsage", "0",
-                                      ODBCINST_INI))
-        goto cleanup;
-    if (!SQLWritePrivateProfileString(lpszDriver, "SQLLevel", "1",
-                                      ODBCINST_INI))
-        goto cleanup;
-
-    ret = TRUE;
-cleanup:
-    if (!ret) {
-        if (pErrorCode)
-            *pErrorCode = ODBC_ERROR_REQUEST_FAILED;
-        strncpy_null(message, "Failed to WritePrivateProfileString", cbMessage);
-    }
-    return ret;
-}
-
-BOOL INTFUNC ChangeDriverName(HWND hwndParent, LPSETUPDLG lpsetupdlg,
-                              LPCSTR driver_name) {
-    DWORD err = 0;
-    ConnInfo *ci = &lpsetupdlg->ci;
-
-    if (!ci->dsn[0]) {
-        err = IDS_BADDSN;
-    } else if (!driver_name || strnicmp(driver_name, "opensearch", 10)) {
-        err = IDS_BADDSN;
-    } else {
-        LPCSTR lpszDrvr = lpsetupdlg->lpszDrvr;
-
-        lpsetupdlg->lpszDrvr = driver_name;
-        if (!SetDSNAttributes(hwndParent, lpsetupdlg, &err)) {
-            if (!err)
-                err = IDS_BADDSN;
-            lpsetupdlg->lpszDrvr = lpszDrvr;
-        }
-    }
-    return (err == 0);
-}
-
-#endif /* WIN32 */
diff --git a/sql-odbc/src/sqlodbc/statement.c b/sql-odbc/src/sqlodbc/statement.c
deleted file mode 100644
index ea4ece9d98..0000000000
--- a/sql-odbc/src/sqlodbc/statement.c
+++ /dev/null
@@ -1,1465 +0,0 @@
-// clang-format off
-#include "statement.h"
-#include "misc.h" // strncpy_null
-
-#include "bind.h"
-#include "opensearch_connection.h"
-#include "multibyte.h"
-#include "qresult.h"
-#include "convert.h"
-#include "environ.h"
-#include "loadlib.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "opensearch_apifunc.h"
-#include "opensearch_helper.h"
-#include "opensearch_statement.h"
-// clang-format on
-
-/*	Map sql commands to statement types */
-static const struct {
-    int type;
-    char *s;
-} Statement_Type[] =
-
-    {{STMT_TYPE_SELECT, "SELECT"},
-     {STMT_TYPE_INSERT, "INSERT"},
-     {STMT_TYPE_UPDATE, "UPDATE"},
-     {STMT_TYPE_DELETE, "DELETE"},
-     {STMT_TYPE_PROCCALL, "{"},
-     {STMT_TYPE_SET, "SET"},
-     {STMT_TYPE_RESET, "RESET"},
-     {STMT_TYPE_CREATE, "CREATE"},
-     {STMT_TYPE_DECLARE, "DECLARE"},
-     {STMT_TYPE_FETCH, "FETCH"},
-     {STMT_TYPE_MOVE, "MOVE"},
-     {STMT_TYPE_CLOSE, "CLOSE"},
-     {STMT_TYPE_PREPARE, "PREPARE"},
-     {STMT_TYPE_EXECUTE, "EXECUTE"},
-     {STMT_TYPE_DEALLOCATE, "DEALLOCATE"},
-     {STMT_TYPE_DROP, "DROP"},
-     {STMT_TYPE_START, "BEGIN"},
-     {STMT_TYPE_START, "START"},
-     {STMT_TYPE_TRANSACTION, "SAVEPOINT"},
-     {STMT_TYPE_TRANSACTION, "RELEASE"},
-     {STMT_TYPE_TRANSACTION, "COMMIT"},
-     {STMT_TYPE_TRANSACTION, "END"},
-     {STMT_TYPE_TRANSACTION, "ROLLBACK"},
-     {STMT_TYPE_TRANSACTION, "ABORT"},
-     {STMT_TYPE_LOCK, "LOCK"},
-     {STMT_TYPE_ALTER, "ALTER"},
-     {STMT_TYPE_GRANT, "GRANT"},
-     {STMT_TYPE_REVOKE, "REVOKE"},
-     {STMT_TYPE_COPY, "COPY"},
-     {STMT_TYPE_ANALYZE, "ANALYZE"},
-     {STMT_TYPE_NOTIFY, "NOTIFY"},
-     {STMT_TYPE_EXPLAIN, "EXPLAIN"}
-
-     /*
-      * Special-commands that cannot be run in a transaction block. This isn't
-      * as granular as it could be. VACUUM can never be run in a transaction
-      * block, but some variants of REINDEX and CLUSTER can be. CHECKPOINT
-      * doesn't throw an error if you do, but it cannot be rolled back so
-      * there's no point in beginning a new transaction for it.
-      */
-     ,
-     {STMT_TYPE_SPECIAL, "VACUUM"},
-     {STMT_TYPE_SPECIAL, "REINDEX"},
-     {STMT_TYPE_SPECIAL, "CLUSTER"},
-     {STMT_TYPE_SPECIAL, "CHECKPOINT"}
-
-     ,
-     {STMT_TYPE_WITH, "WITH"},
-     {0, NULL}};
-
-static void SC_set_error_if_not_set(StatementClass *self, int errornumber,
-                                    const char *errmsg, const char *func);
-
-RETCODE SQL_API OPENSEARCHAPI_AllocStmt(HDBC hdbc, HSTMT *phstmt, UDWORD flag) {
-    CSTR func = "OPENSEARCHAPI_AllocStmt";
-    ConnectionClass *conn = (ConnectionClass *)hdbc;
-    StatementClass *stmt;
-    ARDFields *ardopts;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...\n");
-
-    if (!conn) {
-        CC_log_error(func, "", NULL);
-        return SQL_INVALID_HANDLE;
-    }
-
-    stmt = SC_Constructor(conn);
-
-    MYLOG(OPENSEARCH_DEBUG, "**** : hdbc = %p, stmt = %p\n", hdbc, stmt);
-
-    if (!stmt) {
-        CC_set_error(conn, CONN_STMT_ALLOC_ERROR,
-                     "No more memory to allocate a further SQL-statement",
-                     func);
-        *phstmt = SQL_NULL_HSTMT;
-        return SQL_ERROR;
-    }
-
-    if (!CC_add_statement(conn, stmt)) {
-        CC_set_error(conn, CONN_STMT_ALLOC_ERROR,
-                     "Maximum number of statements exceeded.", func);
-        SC_Destructor(stmt);
-        *phstmt = SQL_NULL_HSTMT;
-        return SQL_ERROR;
-    }
-
-    *phstmt = (HSTMT)stmt;
-
-    stmt->iflag = flag;
-    /* Copy default statement options based from Connection options */
-    if (0 != (PODBC_INHERIT_CONNECT_OPTIONS & flag)) {
-        stmt->options = stmt->options_orig = conn->stmtOptions;
-        stmt->ardi.ardf = conn->ardOptions;
-    } else {
-        InitializeStatementOptions(&stmt->options_orig);
-        stmt->options = stmt->options_orig;
-        InitializeARDFields(&stmt->ardi.ardf);
-    }
-    ardopts = SC_get_ARDF(stmt);
-    ARD_AllocBookmark(ardopts);
-
-    /* Save the handle for later */
-    stmt->phstmt = phstmt;
-
-    return SQL_SUCCESS;
-}
-
-RETCODE SQL_API OPENSEARCHAPI_FreeStmt(HSTMT hstmt, SQLUSMALLINT fOption) {
-    CSTR func = "OPENSEARCHAPI_FreeStmt";
-    StatementClass *stmt = (StatementClass *)hstmt;
-
-    MYLOG(OPENSEARCH_TRACE, "entering...hstmt=%p, fOption=%hi\n", hstmt, fOption);
-
-    if (!stmt) {
-        SC_log_error(func, "", NULL);
-        return SQL_INVALID_HANDLE;
-    }
-    SC_clear_error(stmt);
-
-    if (fOption == SQL_DROP) {
-        ConnectionClass *conn = stmt->hdbc;
-
-        OpenSearchStopRetrieval(conn->opensearchconn);
-
-        /* Remove the statement from the connection's statement list */
-        if (conn) {
-            QResultClass *res;
-
-            if (STMT_EXECUTING == stmt->status) {
-                SC_set_error(stmt, STMT_SEQUENCE_ERROR,
-                             "Statement is currently executing a transaction.",
-                             func);
-                return SQL_ERROR; /* stmt may be executing a transaction */
-            }
-            if (conn->unnamed_prepared_stmt == stmt)
-                conn->unnamed_prepared_stmt = NULL;
-
-            res = SC_get_Result(stmt);
-            QR_Destructor(res);
-            SC_init_Result(stmt);
-            if (!CC_remove_statement(conn, stmt)) {
-                SC_set_error(stmt, STMT_SEQUENCE_ERROR,
-                             "Statement is currently executing a transaction.",
-                             func);
-                return SQL_ERROR; /* stmt may be executing a
-                                   * transaction */
-            }
-        }
-
-        if (stmt->execute_delegate) {
-            OPENSEARCHAPI_FreeStmt(stmt->execute_delegate, SQL_DROP);
-            stmt->execute_delegate = NULL;
-        }
-        if (stmt->execute_parent)
-            stmt->execute_parent->execute_delegate = NULL;
-        /* Destroy the statement and free any results, cursors, etc. */
-        SC_Destructor(stmt);
-    } else if (fOption == SQL_UNBIND)
-        SC_unbind_cols(stmt);
-    else if (fOption == SQL_CLOSE) {
-        OpenSearchStopRetrieval(stmt->hdbc->opensearchconn);
-
-        /*
-         * this should discard all the results, but leave the statement
-         * itself in place (it can be executed again)
-         */
-        stmt->transition_status = STMT_TRANSITION_ALLOCATED;
-        if (stmt->execute_delegate) {
-            OPENSEARCHAPI_FreeStmt(stmt->execute_delegate, SQL_DROP);
-            stmt->execute_delegate = NULL;
-        }
-        if (!SC_recycle_statement(stmt)) {
-            return SQL_ERROR;
-        }
-        SC_set_Curres(stmt, NULL);
-    } else if (fOption == SQL_RESET_PARAMS)
-        ;
-    else {
-        SC_set_error(stmt, STMT_OPTION_OUT_OF_RANGE_ERROR,
-                     "Invalid option passed to OPENSEARCHAPI_FreeStmt.", func);
-        return SQL_ERROR;
-    }
-
-    return SQL_SUCCESS;
-}
-
-/*
- * StatementClass implementation
- */
-void InitializeStatementOptions(StatementOptions *opt) {
-    memset(opt, 0, sizeof(StatementOptions));
-    opt->scroll_concurrency = SQL_CONCUR_READ_ONLY;
-    opt->cursor_type = SQL_CURSOR_FORWARD_ONLY;
-    opt->retrieve_data = SQL_RD_ON;
-    opt->use_bookmarks = SQL_UB_OFF;
-    opt->metadata_id = SQL_FALSE;
-}
-
-static void SC_clear_parse_status(StatementClass *self, ConnectionClass *conn) {
-    UNUSED(self, conn);
-    self->parse_status = STMT_PARSE_NONE;
-}
-
-static void SC_init_discard_output_params(StatementClass *self) {
-    ConnectionClass *conn = SC_get_conn(self);
-
-    if (!conn)
-        return;
-    self->discard_output_params = 0;
-}
-
-static void SC_init_parse_method(StatementClass *self) {
-    ConnectionClass *conn = SC_get_conn(self);
-
-    self->parse_method = 0;
-    if (!conn)
-        return;
-    if (0 == (PODBC_EXTERNAL_STATEMENT & self->iflag))
-        return;
-    if (self->catalog_result)
-        return;
-}
-
-StatementClass *SC_Constructor(ConnectionClass *conn) {
-    StatementClass *rv;
-
-    rv = (StatementClass *)malloc(sizeof(StatementClass));
-    if (rv) {
-        rv->hdbc = conn;
-        rv->phstmt = NULL;
-        rv->result = NULL;
-        rv->curres = NULL;
-        rv->catalog_result = FALSE;
-        rv->prepare = NON_PREPARE_STATEMENT;
-        rv->prepared = NOT_PREPARED;
-        rv->status = STMT_ALLOCATED;
-        rv->external = FALSE;
-        rv->iflag = 0;
-        rv->plan_name = NULL;
-        rv->transition_status = STMT_TRANSITION_UNALLOCATED;
-        rv->multi_statement = -1; /* unknown */
-        rv->num_params = -1;      /* unknown */
-        rv->processed_statements = NULL;
-
-        rv->__error_message = NULL;
-        rv->__error_number = 0;
-        rv->opensearch_error = NULL;
-
-        rv->statement = NULL;
-        rv->load_statement = NULL;
-        rv->statement_type = STMT_TYPE_UNKNOWN;
-
-        rv->currTuple = -1;
-        rv->rowset_start = 0;
-        SC_set_rowset_start(rv, -1, FALSE);
-        rv->current_col = -1;
-        rv->bind_row = 0;
-        rv->from_pos = rv->load_from_pos = rv->where_pos = -1;
-        rv->last_fetch_count = rv->last_fetch_count_include_ommitted = 0;
-        rv->save_rowset_size = -1;
-
-        rv->data_at_exec = -1;
-        rv->put_data = FALSE;
-        rv->ref_CC_error = FALSE;
-        rv->join_info = 0;
-        SC_init_parse_method(rv);
-
-        rv->lobj_fd = -1;
-        INIT_NAME(rv->cursor_name);
-
-        /* Parse Stuff */
-        rv->ti = NULL;
-        rv->ntab = 0;
-        rv->num_key_fields = -1; /* unknown */
-        SC_clear_parse_status(rv, conn);
-        rv->proc_return = -1;
-        SC_init_discard_output_params(rv);
-        rv->cancel_info = 0;
-
-        /* Clear Statement Options -- defaults will be set in AllocStmt */
-        memset(&rv->options, 0, sizeof(StatementOptions));
-        InitializeEmbeddedDescriptor((DescriptorClass *)&(rv->ardi), rv,
-                                     SQL_ATTR_APP_ROW_DESC);
-        InitializeEmbeddedDescriptor((DescriptorClass *)&(rv->apdi), rv,
-                                     SQL_ATTR_APP_PARAM_DESC);
-        InitializeEmbeddedDescriptor((DescriptorClass *)&(rv->irdi), rv,
-                                     SQL_ATTR_IMP_ROW_DESC);
-        InitializeEmbeddedDescriptor((DescriptorClass *)&(rv->ipdi), rv,
-                                     SQL_ATTR_IMP_PARAM_DESC);
-
-        rv->miscinfo = 0;
-        rv->execinfo = 0;
-        rv->rb_or_tc = 0;
-        SC_reset_updatable(rv);
-        rv->diag_row_count = 0;
-        rv->stmt_time = 0;
-        rv->execute_delegate = NULL;
-        rv->execute_parent = NULL;
-        rv->allocated_callbacks = 0;
-        rv->num_callbacks = 0;
-        rv->callbacks = NULL;
-        GetDataInfoInitialize(SC_get_GDTI(rv));
-        PutDataInfoInitialize(SC_get_PDTI(rv));
-        rv->lock_CC_for_rb = FALSE;
-        INIT_STMT_CS(rv);
-    }
-    return rv;
-}
-
-char SC_Destructor(StatementClass *self) {
-    CSTR func = "SC_Destructor";
-    QResultClass *res = SC_get_Result(self);
-
-    MYLOG(OPENSEARCH_TRACE, "entering self=%p, self->result=%p, self->hdbc=%p\n", self,
-          res, self->hdbc);
-    SC_clear_error(self);
-    if (STMT_EXECUTING == self->status) {
-        SC_set_error(self, STMT_SEQUENCE_ERROR,
-                     "Statement is currently executing a transaction.", func);
-        return FALSE;
-    }
-
-    if (res) {
-        if (!self->hdbc)
-            res->conn = NULL; /* prevent any dbase activity */
-
-        QR_Destructor(res);
-    }
-
-    SC_initialize_stmts(self, TRUE);
-
-    /* Free the parsed table information */
-    SC_initialize_cols_info(self, FALSE, TRUE);
-
-    NULL_THE_NAME(self->cursor_name);
-    /* Free the parsed field information */
-    DC_Destructor((DescriptorClass *)SC_get_ARDi(self));
-    DC_Destructor((DescriptorClass *)SC_get_APDi(self));
-    DC_Destructor((DescriptorClass *)SC_get_IRDi(self));
-    DC_Destructor((DescriptorClass *)SC_get_IPDi(self));
-    GDATA_unbind_cols(SC_get_GDTI(self), TRUE);
-    PDATA_free_params(SC_get_PDTI(self), STMT_FREE_PARAMS_ALL);
-
-    if (self->__error_message)
-        free(self->__error_message);
-    if (self->opensearch_error)
-        ER_Destructor(self->opensearch_error);
-    cancelNeedDataState(self);
-    if (self->callbacks)
-        free(self->callbacks);
-
-    DELETE_STMT_CS(self);
-    free(self);
-
-    MYLOG(OPENSEARCH_TRACE, "leaving\n");
-
-    return TRUE;
-}
-
-void SC_init_Result(StatementClass *self) {
-    self->result = self->curres = NULL;
-    MYLOG(OPENSEARCH_TRACE, "leaving(%p)\n", self);
-}
-
-void SC_set_Result(StatementClass *self, QResultClass *res) {
-    if (res != self->result) {
-        MYLOG(OPENSEARCH_DEBUG, "(%p, %p)\n", self, res);
-        QR_Destructor(self->result);
-        self->result = self->curres = res;
-    }
-}
-
-int statement_type(const char *statement) {
-    int i;
-
-    /* ignore leading whitespace in query string */
-    while (*statement && (isspace((UCHAR)*statement) || *statement == '('))
-        statement++;
-
-    for (i = 0; Statement_Type[i].s; i++)
-        if (!strnicmp(statement, Statement_Type[i].s,
-                      strlen(Statement_Type[i].s)))
-            return Statement_Type[i].type;
-
-    return STMT_TYPE_OTHER;
-}
-
-void SC_set_planname(StatementClass *stmt, const char *plan_name) {
-    if (stmt->plan_name)
-        free(stmt->plan_name);
-    if (plan_name && plan_name[0])
-        stmt->plan_name = strdup(plan_name);
-    else
-        stmt->plan_name = NULL;
-}
-
-void SC_set_rowset_start(StatementClass *stmt, SQLLEN start, BOOL valid_base) {
-    QResultClass *res = SC_get_Curres(stmt);
-    SQLLEN incr = start - stmt->rowset_start;
-
-    MYLOG(OPENSEARCH_DEBUG, "%p->SC_set_rowstart " FORMAT_LEN "->" FORMAT_LEN "(%s) ",
-          stmt, stmt->rowset_start, start, valid_base ? "valid" : "unknown");
-    if (res != NULL) {
-        BOOL valid = QR_has_valid_base(res);
-        MYPRINTF(OPENSEARCH_DEBUG, ":(%p)QR is %s", res,
-                 QR_has_valid_base(res) ? "valid" : "unknown");
-
-        if (valid) {
-            if (valid_base)
-                QR_inc_rowstart_in_cache(res, incr);
-            else
-                QR_set_no_valid_base(res);
-        } else if (valid_base) {
-            QR_set_has_valid_base(res);
-            if (start < 0)
-                QR_set_rowstart_in_cache(res, -1);
-            else
-                QR_set_rowstart_in_cache(res, start);
-        }
-        if (!QR_get_cursor(res))
-            res->key_base = start;
-        MYPRINTF(OPENSEARCH_DEBUG, ":(%p)QR result=" FORMAT_LEN "(%s)", res,
-                 QR_get_rowstart_in_cache(res),
-                 QR_has_valid_base(res) ? "valid" : "unknown");
-    }
-    stmt->rowset_start = start;
-    MYPRINTF(OPENSEARCH_DEBUG, ":stmt result=" FORMAT_LEN "\n", stmt->rowset_start);
-}
-void SC_inc_rowset_start(StatementClass *stmt, SQLLEN inc) {
-    SQLLEN start = stmt->rowset_start + inc;
-
-    SC_set_rowset_start(stmt, start, TRUE);
-}
-int SC_set_current_col(StatementClass *stmt, int col) {
-    if (col == stmt->current_col)
-        return col;
-    if (col >= 0)
-        reset_a_getdata_info(SC_get_GDTI(stmt), col + 1);
-    stmt->current_col = (short)col;
-
-    return stmt->current_col;
-}
-
-void SC_set_prepared(StatementClass *stmt, int prepared) {
-    if (NOT_PREPARED == prepared)
-        SC_set_planname(stmt, NULL);
-
-    // po_ind_t -> char
-    stmt->prepared = (po_ind_t)prepared;
-}
-
-/*
- * Initialize stmt_with_params and load_statement member pointer
- * deallocating corresponding prepared plan. Also initialize
- * statement member pointer if specified.
- */
-RETCODE
-SC_initialize_stmts(StatementClass *self, BOOL initializeOriginal) {
-    ProcessedStmt *pstmt;
-    ProcessedStmt *next_pstmt;
-
-    if (self->lock_CC_for_rb) {
-        LEAVE_CONN_CS(SC_get_conn(self));
-        self->lock_CC_for_rb = FALSE;
-    }
-    if (initializeOriginal) {
-        if (self->statement) {
-            free(self->statement);
-            self->statement = NULL;
-        }
-
-        pstmt = self->processed_statements;
-        while (pstmt) {
-            if (pstmt->query)
-                free(pstmt->query);
-            next_pstmt = pstmt->next;
-            free(pstmt);
-            pstmt = next_pstmt;
-        }
-        self->processed_statements = NULL;
-
-        self->prepare = NON_PREPARE_STATEMENT;
-        SC_set_prepared(self, NOT_PREPARED);
-        self->statement_type = STMT_TYPE_UNKNOWN; /* unknown */
-        self->multi_statement = -1;               /* unknown */
-        self->num_params = -1;                    /* unknown */
-        self->proc_return = -1;                   /* unknown */
-        self->join_info = 0;
-        SC_init_parse_method(self);
-        SC_init_discard_output_params(self);
-    }
-    if (self->load_statement) {
-        free(self->load_statement);
-        self->load_statement = NULL;
-    }
-
-    return 0;
-}
-
-BOOL SC_opencheck(StatementClass *self, const char *func) {
-    QResultClass *res;
-
-    if (!self)
-        return FALSE;
-    if (self->status == STMT_EXECUTING) {
-        SC_set_error(self, STMT_SEQUENCE_ERROR,
-                     "Statement is currently executing a transaction.", func);
-        return TRUE;
-    }
-    /*
-     * We can dispose the result of Describe-only any time.
-     */
-    if (self->prepare && self->status == STMT_DESCRIBED) {
-        MYLOG(OPENSEARCH_DEBUG, "self->prepare && self->status == STMT_DESCRIBED\n");
-        return FALSE;
-    }
-    if (res = SC_get_Curres(self), NULL != res) {
-        if (QR_command_maybe_successful(res) && res->backend_tuples) {
-            SC_set_error(self, STMT_SEQUENCE_ERROR, "The cursor is open.",
-                         func);
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
-RETCODE
-SC_initialize_and_recycle(StatementClass *self) {
-    SC_initialize_stmts(self, TRUE);
-    if (!SC_recycle_statement(self))
-        return SQL_ERROR;
-
-    return SQL_SUCCESS;
-}
-
-void SC_reset_result_for_rerun(StatementClass *self) {
-    QResultClass *res;
-    ColumnInfoClass *flds;
-
-    if (!self)
-        return;
-    if (res = SC_get_Result(self), NULL == res)
-        return;
-    flds = QR_get_fields(res);
-    if (NULL == flds || 0 == CI_get_num_fields(flds))
-        SC_set_Result(self, NULL);
-    else {
-        QR_reset_for_re_execute(res);
-        SC_set_Curres(self, NULL);
-    }
-}
-
-/*
- *	Called from SQLPrepare if STMT_PREMATURE, or
- *	from SQLExecute if STMT_FINISHED, or
- *	from SQLFreeStmt(SQL_CLOSE)
- */
-char SC_recycle_statement(StatementClass *self) {
-    CSTR func = "SC_recycle_statement";
-    ConnectionClass *conn;
-
-    MYLOG(OPENSEARCH_TRACE, "entering self=%p\n", self);
-
-    SC_clear_error(self);
-    /* This would not happen */
-    if (self->status == STMT_EXECUTING) {
-        SC_set_error(self, STMT_SEQUENCE_ERROR,
-                     "Statement is currently executing a transaction.", func);
-        return FALSE;
-    }
-
-    if (SC_get_conn(self)->unnamed_prepared_stmt == self)
-        SC_get_conn(self)->unnamed_prepared_stmt = NULL;
-
-    conn = SC_get_conn(self);
-    switch (self->status) {
-        case STMT_ALLOCATED:
-            /* this statement does not need to be recycled */
-            return TRUE;
-
-        case STMT_READY:
-            break;
-
-        case STMT_DESCRIBED:
-            break;
-
-        case STMT_FINISHED:
-            break;
-
-        default:
-            SC_set_error(self, STMT_INTERNAL_ERROR,
-                         "An internal error occured while recycling statements",
-                         func);
-            return FALSE;
-    }
-
-    switch (self->prepared) {
-        case NOT_PREPARED:
-            /* Free the parsed table/field information */
-            SC_initialize_cols_info(self, TRUE, TRUE);
-
-            MYLOG(OPENSEARCH_DEBUG, "SC_clear_parse_status\n");
-            SC_clear_parse_status(self, conn);
-            break;
-    }
-
-    /* Free any cursors */
-    if (SC_get_Result(self))
-        SC_set_Result(self, NULL);
-    self->miscinfo = 0;
-    self->execinfo = 0;
-    /* self->rbonerr = 0; Never clear the bits here */
-
-    /*
-     * Reset only parameters that have anything to do with results
-     */
-    self->status = STMT_READY;
-    self->catalog_result = FALSE; /* not very important */
-
-    self->currTuple = -1;
-    SC_set_rowset_start(self, -1, FALSE);
-    SC_set_current_col(self, -1);
-    self->bind_row = 0;
-    MYLOG(OPENSEARCH_DEBUG, "statement=%p ommitted=0\n", self);
-    self->last_fetch_count = self->last_fetch_count_include_ommitted = 0;
-
-    self->__error_message = NULL;
-    self->__error_number = 0;
-
-    self->lobj_fd = -1;
-
-    SC_initialize_stmts(self, FALSE);
-    cancelNeedDataState(self);
-    self->cancel_info = 0;
-    /*
-     *	reset the current attr setting to the original one.
-     */
-    self->options.scroll_concurrency = self->options_orig.scroll_concurrency;
-    self->options.cursor_type = self->options_orig.cursor_type;
-    self->options.keyset_size = self->options_orig.keyset_size;
-    self->options.maxLength = self->options_orig.maxLength;
-    self->options.maxRows = self->options_orig.maxRows;
-
-    return TRUE;
-}
-
-/* This is only called from SQLFreeStmt(SQL_UNBIND) */
-char SC_unbind_cols(StatementClass *self) {
-    ARDFields *opts = SC_get_ARDF(self);
-    GetDataInfo *gdata = SC_get_GDTI(self);
-    BindInfoClass *bookmark;
-
-    ARD_unbind_cols(opts, FALSE);
-    GDATA_unbind_cols(gdata, FALSE);
-    if (bookmark = opts->bookmark, bookmark != NULL) {
-        bookmark->buffer = NULL;
-        bookmark->used = NULL;
-    }
-
-    return 1;
-}
-
-void SC_clear_error(StatementClass *self) {
-    QResultClass *res;
-
-    self->__error_number = 0;
-    if (self->__error_message) {
-        free(self->__error_message);
-        self->__error_message = NULL;
-    }
-    if (self->opensearch_error) {
-        ER_Destructor(self->opensearch_error);
-        self->opensearch_error = NULL;
-    }
-    self->diag_row_count = 0;
-    if (res = SC_get_Curres(self), res) {
-        QR_set_message(res, NULL);
-        QR_set_notice(res, NULL);
-        res->sqlstate[0] = '\0';
-    }
-    self->stmt_time = 0;
-    memset(&self->localtime, 0, sizeof(self->localtime));
-    self->localtime.tm_sec = -1;
-    SC_unref_CC_error(self);
-}
-
-/*
- *	This function creates an error info which is the concatenation
- *	of the result, statement, connection, and socket messages.
- */
-
-/*	Map sql commands to statement types */
-static const struct {
-    int number;
-    const char ver3str[6];
-    const char ver2str[6];
-} Statement_sqlstate[] =
-
-    {{STMT_ERROR_IN_ROW, "01S01", "01S01"},
-     {STMT_OPTION_VALUE_CHANGED, "01S02", "01S02"},
-     {STMT_ROW_VERSION_CHANGED, "01001", "01001"}, /* data changed */
-     {STMT_POS_BEFORE_RECORDSET, "01S06", "01S06"},
-     {STMT_TRUNCATED, "01004", "01004"}, /* data truncated */
-     {STMT_INFO_ONLY, "00000",
-      "00000"}, /* just an information that is returned, no error */
-
-     {STMT_OK, "00000", "00000"},         /* OK */
-     {STMT_EXEC_ERROR, "HY000", "S1000"}, /* also a general error */
-     {STMT_STATUS_ERROR, "HY010", "S1010"},
-     {STMT_SEQUENCE_ERROR, "HY010", "S1010"},  /* Function sequence error */
-     {STMT_NO_MEMORY_ERROR, "HY001", "S1001"}, /* memory allocation failure */
-     {STMT_COLNUM_ERROR, "07009", "S1002"},    /* invalid column number */
-     {STMT_NO_STMTSTRING, "HY001",
-      "S1001"}, /* having no stmtstring is also a malloc problem */
-     {STMT_ERROR_TAKEN_FROM_BACKEND, "HY000", "S1000"}, /* general error */
-     {STMT_INTERNAL_ERROR, "HY000", "S1000"},           /* general error */
-     {STMT_STILL_EXECUTING, "HY010", "S1010"},
-     {STMT_NOT_IMPLEMENTED_ERROR, "HYC00", "S1C00"}, /* == 'driver not
-                                                      * capable' */
-     {STMT_BAD_PARAMETER_NUMBER_ERROR, "07009", "S1093"},
-     {STMT_OPTION_OUT_OF_RANGE_ERROR, "HY092", "S1092"},
-     {STMT_INVALID_COLUMN_NUMBER_ERROR, "07009", "S1002"},
-     {STMT_RESTRICTED_DATA_TYPE_ERROR, "07006", "07006"},
-     {STMT_INVALID_CURSOR_STATE_ERROR, "07005", "24000"},
-     {STMT_CREATE_TABLE_ERROR, "42S01", "S0001"}, /* table already exists */
-     {STMT_QUERY_SYNTAX_ERROR, "42000", "42000"}, /* query syntax error */
-     {STMT_NO_CURSOR_NAME, "S1015", "S1015"},
-     {STMT_INVALID_CURSOR_NAME, "34000", "34000"},
-     {STMT_INVALID_ARGUMENT_NO, "HY024", "S1009"}, /* invalid argument value */
-     {STMT_ROW_OUT_OF_RANGE, "HY107", "S1107"},
-     {STMT_OPERATION_CANCELLED, "HY008", "S1008"},
-     {STMT_INVALID_CURSOR_POSITION, "HY109", "S1109"},
-     {STMT_VALUE_OUT_OF_RANGE, "HY019", "22003"},
-     {STMT_OPERATION_INVALID, "HY011", "S1011"},
-     {STMT_PROGRAM_TYPE_OUT_OF_RANGE, "?????", "?????"},
-     {STMT_BAD_ERROR, "08S01", "08S01"}, /* communication link failure */
-     {STMT_INVALID_OPTION_IDENTIFIER, "HY092", "HY092"},
-     {STMT_RETURN_NULL_WITHOUT_INDICATOR, "22002", "22002"},
-     {STMT_INVALID_DESCRIPTOR_IDENTIFIER, "HY091", "HY091"},
-     {STMT_OPTION_NOT_FOR_THE_DRIVER, "HYC00", "HYC00"},
-     {STMT_FETCH_OUT_OF_RANGE, "HY106", "S1106"},
-     {STMT_COUNT_FIELD_INCORRECT, "07002", "07002"},
-     {STMT_INVALID_NULL_ARG, "HY009", "S1009"},
-     {STMT_NO_RESPONSE, "08S01", "08S01"},
-     {STMT_COMMUNICATION_ERROR, "08S01", "08S01"}};
-
-static OpenSearch_ErrorInfo *SC_create_errorinfo(const StatementClass *self, OpenSearch_ErrorInfo *opensearch_error_fail_safe) {
-    QResultClass *res = SC_get_Curres(self);
-    ConnectionClass *conn = SC_get_conn(self);
-    Int4 errornum;
-    size_t pos;
-    BOOL resmsg = FALSE, detailmsg = FALSE, msgend = FALSE;
-    BOOL looponce, loopend;
-    char msg[4096], *wmsg;
-    char *ermsg = NULL, *sqlstate = NULL;
-    OpenSearch_ErrorInfo *opensearch_error;
-
-    if (self->opensearch_error)
-        return self->opensearch_error;
-    errornum = self->__error_number;
-    if (errornum == 0)
-        return NULL;
-
-    looponce = (SC_get_Result(self) != res);
-    msg[0] = '\0';
-    for (loopend = FALSE; (NULL != res) && !loopend; res = res->next) {
-        if (looponce)
-            loopend = TRUE;
-        if ('\0' != res->sqlstate[0]) {
-            if (NULL != sqlstate && strnicmp(res->sqlstate, "00", 2) == 0)
-                continue;
-            sqlstate = res->sqlstate;
-            if ('0' != sqlstate[0] || '1' < sqlstate[1])
-                loopend = TRUE;
-        }
-        if (NULL != res->message) {
-            STRCPY_FIXED(msg, res->message);
-            detailmsg = resmsg = TRUE;
-        } else if (NULL != res->messageref) {
-            STRCPY_FIXED(msg, res->messageref);
-            detailmsg = resmsg = TRUE;
-        }
-        if (msg[0])
-            ermsg = msg;
-        else if (QR_get_notice(res)) {
-            char *notice = QR_get_notice(res);
-            size_t len = strlen(notice);
-            if (len < sizeof(msg)) {
-                memcpy(msg, notice, len);
-                msg[len] = '\0';
-                ermsg = msg;
-            } else {
-                ermsg = notice;
-                msgend = TRUE;
-            }
-        }
-    }
-    if (!msgend && (wmsg = SC_get_errormsg(self), wmsg) && wmsg[0]) {
-        pos = strlen(msg);
-
-        snprintf(&msg[pos], sizeof(msg) - pos, "%s%s", detailmsg ? ";\n" : "",
-                 wmsg);
-        ermsg = msg;
-        detailmsg = TRUE;
-    }
-    if (!self->ref_CC_error)
-        msgend = TRUE;
-
-    if (conn && !msgend) {
-        if (!resmsg && (wmsg = CC_get_errormsg(conn), wmsg)
-            && wmsg[0] != '\0') {
-            pos = strlen(msg);
-            snprintf(&msg[pos], sizeof(msg) - pos, ";\n%s",
-                     CC_get_errormsg(conn));
-        }
-
-        ermsg = msg;
-    }
-    opensearch_error = ER_Constructor(self->__error_number, ermsg);
-    if (!opensearch_error) {
-        if (opensearch_error_fail_safe) {
-            memset(opensearch_error_fail_safe, 0, sizeof(*opensearch_error_fail_safe));
-            opensearch_error = opensearch_error_fail_safe;
-            opensearch_error->status = self->__error_number;
-            opensearch_error->errorsize = sizeof(opensearch_error->__error_message);
-            STRCPY_FIXED(opensearch_error->__error_message, ermsg);
-            opensearch_error->recsize = -1;
-        } else
-            return NULL;
-    }
-    if (sqlstate)
-        STRCPY_FIXED(opensearch_error->sqlstate, sqlstate);
-    else if (conn) {
-        if (!msgend && conn->sqlstate[0])
-            STRCPY_FIXED(opensearch_error->sqlstate, conn->sqlstate);
-        else {
-            EnvironmentClass *env = (EnvironmentClass *)CC_get_env(conn);
-
-            errornum -= LOWEST_STMT_ERROR;
-            if (errornum < 0
-                || (unsigned long long)errornum
-                       >= sizeof(Statement_sqlstate)
-                              / sizeof(Statement_sqlstate[0])) {
-                errornum = 1 - LOWEST_STMT_ERROR;
-            }
-            STRCPY_FIXED(opensearch_error->sqlstate,
-                         EN_is_odbc3(env)
-                             ? Statement_sqlstate[errornum].ver3str
-                             : Statement_sqlstate[errornum].ver2str);
-        }
-    }
-
-    return opensearch_error;
-}
-
-void SC_reset_delegate(RETCODE retcode, StatementClass *stmt) {
-    UNUSED(retcode);
-    StatementClass *delegate = stmt->execute_delegate;
-
-    if (!delegate)
-        return;
-    OPENSEARCHAPI_FreeStmt(delegate, SQL_DROP);
-}
-
-void SC_set_error(StatementClass *self, int number, const char *message,
-                  const char *func) {
-    if (self->__error_message)
-        free(self->__error_message);
-    self->__error_number = number;
-    self->__error_message = message ? strdup(message) : NULL;
-    if (func && number != STMT_OK && number != STMT_INFO_ONLY)
-        SC_log_error(func, "", self);
-}
-
-void SC_set_errormsg(StatementClass *self, const char *message) {
-    if (self->__error_message)
-        free(self->__error_message);
-    self->__error_message = message ? strdup(message) : NULL;
-}
-
-void SC_error_copy(StatementClass *self, const StatementClass *from,
-                   BOOL check) {
-    QResultClass *self_res, *from_res;
-    BOOL repstate;
-
-    MYLOG(OPENSEARCH_TRACE, "entering %p->%p check=%i\n", from, self, check);
-    if (!from)
-        return; /* for safety */
-    if (self == from)
-        return; /* for safety */
-    if (check) {
-        if (0 == from->__error_number) /* SQL_SUCCESS */
-            return;
-        if (0 > from->__error_number && /* SQL_SUCCESS_WITH_INFO */
-            0 < self->__error_number)
-            return;
-    }
-    self->__error_number = from->__error_number;
-    if (!check || from->__error_message) {
-        if (self->__error_message)
-            free(self->__error_message);
-        self->__error_message =
-            from->__error_message ? strdup(from->__error_message) : NULL;
-    }
-    if (self->opensearch_error) {
-        ER_Destructor(self->opensearch_error);
-        self->opensearch_error = NULL;
-    }
-    self_res = SC_get_Curres(self);
-    from_res = SC_get_Curres(from);
-    if (!self_res || !from_res)
-        return;
-    QR_add_message(self_res, QR_get_message(from_res));
-    QR_add_notice(self_res, QR_get_notice(from_res));
-    repstate = FALSE;
-    if (!check)
-        repstate = TRUE;
-    else if (from_res->sqlstate[0]) {
-        if (!self_res->sqlstate[0] || strncmp(self_res->sqlstate, "00", 2) == 0)
-            repstate = TRUE;
-        else if (strncmp(from_res->sqlstate, "01", 2) >= 0)
-            repstate = TRUE;
-    }
-    if (repstate)
-        STRCPY_FIXED(self_res->sqlstate, from_res->sqlstate);
-}
-
-void SC_full_error_copy(StatementClass *self, const StatementClass *from,
-                        BOOL allres) {
-    OpenSearch_ErrorInfo *opensearch_error;
-
-    MYLOG(OPENSEARCH_TRACE, "entering %p->%p\n", from, self);
-    if (!from)
-        return; /* for safety */
-    if (self == from)
-        return; /* for safety */
-    if (self->__error_message) {
-        free(self->__error_message);
-        self->__error_message = NULL;
-    }
-    if (from->__error_message)
-        self->__error_message = strdup(from->__error_message);
-    self->__error_number = from->__error_number;
-    if (from->opensearch_error) {
-        if (self->opensearch_error)
-            ER_Destructor(self->opensearch_error);
-        self->opensearch_error = ER_Dup(from->opensearch_error);
-        return;
-    } else if (!allres)
-        return;
-    opensearch_error = SC_create_errorinfo(from, NULL);
-    if (!opensearch_error || !opensearch_error->__error_message[0]) {
-        ER_Destructor(opensearch_error);
-        return;
-    }
-    if (self->opensearch_error)
-        ER_Destructor(self->opensearch_error);
-    self->opensearch_error = opensearch_error;
-}
-
-/* Returns the next SQL error information. */
-RETCODE SQL_API OPENSEARCHAPI_StmtError(SQLHSTMT hstmt, SQLSMALLINT RecNumber,
-                                SQLCHAR *szSqlState, SQLINTEGER *pfNativeError,
-                                SQLCHAR *szErrorMsg, SQLSMALLINT cbErrorMsgMax,
-                                SQLSMALLINT *pcbErrorMsg, UWORD flag) {
-    /* CC: return an error of a hdesc  */
-    OpenSearch_ErrorInfo *opensearch_error, error;
-    StatementClass *stmt = (StatementClass *)hstmt;
-    int errnum = SC_get_errornumber(stmt);
-
-    if (opensearch_error = SC_create_errorinfo(stmt, &error), NULL == opensearch_error)
-        return SQL_NO_DATA_FOUND;
-    if (opensearch_error != &error)
-        stmt->opensearch_error = opensearch_error;
-    if (STMT_NO_MEMORY_ERROR == errnum && !opensearch_error->__error_message[0])
-        STRCPY_FIXED(opensearch_error->__error_message, "Memory Allocation Error??");
-    return ER_ReturnError(opensearch_error, RecNumber, szSqlState, pfNativeError,
-                          szErrorMsg, cbErrorMsgMax, pcbErrorMsg, flag);
-}
-
-time_t SC_get_time(StatementClass *stmt) {
-    if (!stmt)
-        return time(NULL);
-    if (0 == stmt->stmt_time)
-        stmt->stmt_time = time(NULL);
-    return stmt->stmt_time;
-}
-
-struct tm *SC_get_localtime(StatementClass *stmt) {
-#ifndef HAVE_LOCALTIME_R
-    struct tm *tim;
-#endif /* HAVE_LOCALTIME_R */
-
-    if (stmt->localtime.tm_sec < 0) {
-        SC_get_time(stmt);
-#ifdef HAVE_LOCALTIME_R
-        localtime_r(&stmt->stmt_time, &(stmt->localtime));
-#else
-        tim = localtime(&stmt->stmt_time);
-        stmt->localtime = *tim;
-#endif /* HAVE_LOCALTIME_R */
-    }
-
-    return &(stmt->localtime);
-}
-
-RETCODE
-SC_fetch(StatementClass *self) {
-    CSTR func = "SC_fetch";
-    QResultClass *res = SC_get_Curres(self);
-    ARDFields *opts;
-    GetDataInfo *gdata;
-    int retval;
-    RETCODE result;
-
-    Int2 num_cols, lf;
-    OID type;
-    int atttypmod;
-    char *value;
-    ColumnInfoClass *coli;
-    BindInfoClass *bookmark;
-    BOOL useCursor = FALSE;
-    KeySet *keyset = NULL;
-
-    /* TupleField *tupleField; */
-
-    MYLOG(OPENSEARCH_TRACE, "entering statement=%p res=%p ommitted=0\n", self, res);
-    self->last_fetch_count = self->last_fetch_count_include_ommitted = 0;
-    if (!res)
-        return SQL_ERROR;
-    coli = QR_get_fields(res); /* the column info */
-
-    MYLOG(OPENSEARCH_DEBUG, "fetch_cursor=%d, %p->total_read=" FORMAT_LEN "\n",
-          SC_is_fetchcursor(self), res, res->num_total_read);
-
-    if (self->currTuple >= (Int4)QR_get_num_total_tuples(res) - 1
-        || (self->options.maxRows > 0
-            && self->currTuple == self->options.maxRows - 1)) {
-        /*
-         * if at the end of the tuples, return "no data found" and set
-         * the cursor past the end of the result set
-         */
-        self->currTuple = QR_get_num_total_tuples(res);
-        return SQL_NO_DATA_FOUND;
-    }
-
-    MYLOG(OPENSEARCH_DEBUG, "**** : non-cursor_result\n");
-    (self->currTuple)++;
-
-    num_cols = QR_NumPublicResultCols(res);
-
-    result = SQL_SUCCESS;
-    self->last_fetch_count++;
-    MYLOG(OPENSEARCH_DEBUG, "stmt=%p ommitted++\n", self);
-    self->last_fetch_count_include_ommitted++;
-
-    opts = SC_get_ARDF(self);
-    /*
-     * If the bookmark column was bound then return a bookmark. Since this
-     * is used with SQLExtendedFetch, and the rowset size may be greater
-     * than 1, and an application can use row or column wise binding, use
-     * the code in copy_and_convert_field() to handle that.
-     */
-    if ((bookmark = opts->bookmark, bookmark) && bookmark->buffer) {
-        SC_set_current_col(self, -1);
-        SC_Create_bookmark(self, bookmark, (int)self->bind_row,
-                           (int)self->currTuple, keyset);
-    }
-
-    if (self->options.retrieve_data == SQL_RD_OFF) /* data isn't required */
-        return SQL_SUCCESS;
-    /* The following adjustment would be needed after SQLMoreResults() */
-    if (opts->allocated < num_cols)
-        extend_column_bindings(opts, num_cols);
-    gdata = SC_get_GDTI(self);
-    if (gdata->allocated != opts->allocated)
-        extend_getdata_info(gdata, opts->allocated, TRUE);
-    for (lf = 0; lf < num_cols; lf++) {
-        MYLOG(OPENSEARCH_DEBUG,
-              "fetch: cols=%d, lf=%d, opts = %p, opts->bindings = %p, buffer[] "
-              "= %p\n",
-              num_cols, lf, opts, opts->bindings, opts->bindings[lf].buffer);
-
-        /* reset for SQLGetData */
-        GETDATA_RESET(gdata->gdata[lf]);
-
-        if (NULL == opts->bindings)
-            continue;
-        if (opts->bindings[lf].buffer != NULL) {
-            /* this column has a binding */
-
-            /* type = QR_get_field_type(res, lf); */
-            type = CI_get_oid(coli, lf);            /* speed things up */
-            atttypmod = CI_get_atttypmod(coli, lf); /* speed things up */
-
-            MYLOG(OPENSEARCH_DEBUG, "type = %d, atttypmod = %d\n", type, atttypmod);
-
-            if (useCursor)
-                value = QR_get_value_backend(res, lf);
-            else {
-                SQLLEN curt = GIdx2CacheIdx(self->currTuple, self, res);
-                MYLOG(OPENSEARCH_DEBUG,
-                      "%p->base=" FORMAT_LEN " curr=" FORMAT_LEN
-                      " st=" FORMAT_LEN " valid=%d\n",
-                      res, QR_get_rowstart_in_cache(res), self->currTuple,
-                      SC_get_rowset_start(self), QR_has_valid_base(res));
-                MYLOG(OPENSEARCH_DEBUG, "curt=" FORMAT_LEN "\n", curt);
-                value = QR_get_value_backend_row(res, curt, lf);
-            }
-
-            MYLOG(OPENSEARCH_DEBUG, "value = '%s'\n",
-                  (value == NULL) ? "<NULL>" : value);
-
-            retval = copy_and_convert_field_bindinfo(self, type, atttypmod,
-                                                     value, lf);
-
-            MYLOG(OPENSEARCH_DEBUG, "copy_and_convert: retval = %d\n", retval);
-
-            switch (retval) {
-                case COPY_OK:
-                    break; /* OK, do next bound column */
-
-                case COPY_UNSUPPORTED_TYPE:
-                    SC_set_error(
-                        self, STMT_RESTRICTED_DATA_TYPE_ERROR,
-                        "Received an unsupported type from OpenSearch.",
-                        func);
-                    result = SQL_ERROR;
-                    break;
-
-                case COPY_UNSUPPORTED_CONVERSION:
-                    SC_set_error(
-                        self, STMT_RESTRICTED_DATA_TYPE_ERROR,
-                        "Couldn't handle the necessary data type conversion.",
-                        func);
-                    result = SQL_ERROR;
-                    break;
-
-                case COPY_RESULT_TRUNCATED:
-                    SC_set_error(self, STMT_TRUNCATED,
-                                 "Fetched item was truncated.", func);
-                    MYLOG(OPENSEARCH_DEBUG, "The %dth item was truncated\n", lf + 1);
-                    MYLOG(OPENSEARCH_DEBUG, "The buffer size = " FORMAT_LEN,
-                          opts->bindings[lf].buflen);
-                    MYLOG(OPENSEARCH_DEBUG, " and the value is '%s'\n", value);
-                    result = SQL_SUCCESS_WITH_INFO;
-                    break;
-
-                case COPY_INVALID_STRING_CONVERSION: /* invalid string */
-                    SC_set_error(self, STMT_STRING_CONVERSION_ERROR,
-                                 "invalid string conversion occured.", func);
-                    result = SQL_ERROR;
-                    break;
-
-                    /* error msg already filled in */
-                case COPY_GENERAL_ERROR:
-                    result = SQL_ERROR;
-                    break;
-
-                    /* This would not be meaningful in SQLFetch. */
-                case COPY_NO_DATA_FOUND:
-                    break;
-
-                default:
-                    SC_set_error(self, STMT_INTERNAL_ERROR,
-                                 "Unrecognized return value from "
-                                 "copy_and_convert_field.",
-                                 func);
-                    result = SQL_ERROR;
-                    break;
-            }
-        }
-    }
-
-    return result;
-}
-
-#include "dlg_specific.h"
-
-#define CALLBACK_ALLOC_ONCE 4
-
-RETCODE dequeueNeedDataCallback(RETCODE retcode, StatementClass *stmt) {
-    RETCODE ret;
-    NeedDataCallfunc func;
-    void *data;
-    int i, cnt;
-
-    MYLOG(OPENSEARCH_TRACE, "entering ret=%d count=%d\n", retcode, stmt->num_callbacks);
-    if (SQL_NEED_DATA == retcode)
-        return retcode;
-    if (stmt->num_callbacks <= 0)
-        return retcode;
-    func = stmt->callbacks[0].func;
-    data = stmt->callbacks[0].data;
-    for (i = 1; i < stmt->num_callbacks; i++)
-        stmt->callbacks[i - 1] = stmt->callbacks[i];
-    cnt = --stmt->num_callbacks;
-    ret = (*func)(retcode, data);
-    free(data);
-    if (SQL_NEED_DATA != ret && cnt > 0)
-        ret = dequeueNeedDataCallback(ret, stmt);
-    return ret;
-}
-
-void cancelNeedDataState(StatementClass *stmt) {
-    int cnt = stmt->num_callbacks, i;
-
-    stmt->num_callbacks = 0;
-    for (i = 0; i < cnt; i++) {
-        if (stmt->callbacks[i].data)
-            free(stmt->callbacks[i].data);
-    }
-    SC_reset_delegate(SQL_ERROR, stmt);
-}
-
-void SC_log_error(const char *func, const char *desc,
-                  const StatementClass *self) {
-    const char *head;
-#define NULLCHECK(a) (a ? a : "(NULL)")
-    if (self) {
-        QResultClass *res = SC_get_Result(self);
-        const ARDFields *opts = SC_get_ARDF(self);
-        const APDFields *apdopts = SC_get_APDF(self);
-        SQLLEN rowsetSize;
-        const int level = 9;
-
-        rowsetSize = (STMT_TRANSITION_EXTENDED_FETCH == self->transition_status
-                          ? opts->size_of_rowset_odbc2
-                          : opts->size_of_rowset);
-        if (SC_get_errornumber(self) <= 0)
-            head = "STATEMENT WARNING";
-        else {
-            head = "STATEMENT ERROR";
-            QLOG(level, "%s: func=%s, desc='%s', errnum=%d, errmsg='%s'\n",
-                 head, func, desc, self->__error_number,
-                 NULLCHECK(self->__error_message));
-        }
-        MYLOG(OPENSEARCH_DEBUG, "%s: func=%s, desc='%s', errnum=%d, errmsg='%s'\n",
-              head, func, desc, self->__error_number,
-              NULLCHECK(self->__error_message));
-        if (SC_get_errornumber(self) > 0) {
-            QLOG(level,
-                 "                 "
-                 "------------------------------------------------------------"
-                 "\n");
-            QLOG(level, "                 hdbc=%p, stmt=%p, result=%p\n",
-                 self->hdbc, self, res);
-            QLOG(level, "                 prepare=%d, external=%d\n",
-                 self->prepare, self->external);
-            QLOG(level, "                 bindings=%p, bindings_allocated=%d\n",
-                 opts->bindings, opts->allocated);
-            QLOG(level,
-                 "                 parameters=%p, parameters_allocated=%d\n",
-                 apdopts->parameters, apdopts->allocated);
-            QLOG(level, "                 statement_type=%d, statement='%s'\n",
-                 self->statement_type, NULLCHECK(self->statement));
-            QLOG(level,
-                 "                 currTuple=" FORMAT_LEN
-                 ", current_col=%d, lobj_fd=%d\n",
-                 self->currTuple, self->current_col, self->lobj_fd);
-            QLOG(level,
-                 "                 maxRows=" FORMAT_LEN
-                 ", rowset_size=" FORMAT_LEN ", keyset_size=" FORMAT_LEN
-                 ", cursor_type=" FORMAT_UINTEGER
-                 ", scroll_concurrency=" FORMAT_UINTEGER "\n",
-                 self->options.maxRows, rowsetSize, self->options.keyset_size,
-                 self->options.cursor_type, self->options.scroll_concurrency);
-            QLOG(level, "                 cursor_name='%s'\n",
-                 SC_cursor_name(self));
-
-            QLOG(level,
-                 "                 ----------------QResult Info "
-                 "-------------------------------\n");
-
-            if (res) {
-                QLOG(level,
-                     "                 fields=%p, backend_tuples=%p, "
-                     "tupleField=%p, conn=%p\n",
-                     QR_get_fields(res), res->backend_tuples, res->tupleField,
-                     res->conn);
-                QLOG(level,
-                     "                 fetch_count=" FORMAT_LEN
-                     ", num_total_rows=" FORMAT_ULEN
-                     ", num_fields=%d, cursor='%s'\n",
-                     res->fetch_number, QR_get_num_total_tuples(res),
-                     res->num_fields, NULLCHECK(QR_get_cursor(res)));
-                QLOG(level,
-                     "                 message='%s', command='%s', "
-                     "notice='%s'\n",
-                     NULLCHECK(QR_get_message(res)), NULLCHECK(res->command),
-                     NULLCHECK(res->notice));
-                QLOG(level, "                 status=%d\n",
-                     QR_get_rstatus(res));
-            }
-
-            /* Log the connection error if there is one */
-            CC_log_error(func, desc, self->hdbc);
-        }
-    } else {
-        MYLOG(OPENSEARCH_DEBUG, "INVALID STATEMENT HANDLE ERROR: func=%s, desc='%s'\n",
-              func, desc);
-    }
-}
-
-extern void *common_cs;
-
-BOOL SC_SetExecuting(StatementClass *self, BOOL on) {
-    BOOL exeSet = FALSE;
-    ENTER_COMMON_CS; /* short time blocking */
-    if (on) {
-        if (0 == (self->cancel_info & CancelRequestSet)) {
-            self->status = STMT_EXECUTING;
-            exeSet = TRUE;
-        }
-    } else {
-        self->cancel_info = 0;
-        self->status = STMT_FINISHED;
-        exeSet = TRUE;
-    }
-    LEAVE_COMMON_CS;
-    return exeSet;
-}
-
-#ifdef NOT_USED
-BOOL SC_SetCancelRequest(StatementClass *self) {
-    BOOL enteredCS = FALSE;
-
-    ENTER_COMMON_CS;
-    if (0 != (self->cancel_info & CancelCompleted))
-        ;
-    else if (STMT_EXECUTING == self->status) {
-        self->cancel_info |= CancelRequestSet;
-    } else {
-        /* try to acquire */
-        if (TRY_ENTER_STMT_CS(self))
-            enteredCS = TRUE;
-        else
-            self->cancel_info |= CancelRequestSet;
-    }
-    LEAVE_COMMON_CS;
-    return enteredCS;
-}
-#endif /* NOT_USED */
-
-static void SC_set_error_if_not_set(StatementClass *self, int errornumber,
-                                    const char *errmsg, const char *func) {
-    int errnum = SC_get_errornumber(self);
-
-    if (errnum <= 0) {
-        const char *emsg = SC_get_errormsg(self);
-
-        if (emsg && 0 == errnum)
-            SC_set_errornumber(self, errornumber);
-        else
-            SC_set_error(self, errornumber, errmsg, func);
-    }
-}
-
-void SC_set_errorinfo(StatementClass *self, QResultClass *res, int errkind) {
-    ConnectionClass *conn = SC_get_conn(self);
-
-    if (CC_not_connected(conn)) {
-        SC_set_error_if_not_set(self, STMT_COMMUNICATION_ERROR,
-                                "The connection has been lost", __FUNCTION__);
-        return;
-    }
-
-    switch (QR_get_rstatus(res)) {
-        case PORES_NO_MEMORY_ERROR:
-            SC_set_error_if_not_set(self, STMT_NO_MEMORY_ERROR,
-                                    "memory allocation error???", __FUNCTION__);
-            break;
-        case PORES_BAD_RESPONSE:
-            SC_set_error_if_not_set(self, STMT_COMMUNICATION_ERROR,
-                                    "communication error occured",
-                                    __FUNCTION__);
-            break;
-        case PORES_INTERNAL_ERROR:
-            SC_set_error_if_not_set(self, STMT_INTERNAL_ERROR,
-                                    "Internal error fetching next row",
-                                    __FUNCTION__);
-            break;
-        default:
-            switch (errkind) {
-                case 1:
-                    SC_set_error_if_not_set(
-                        self, STMT_EXEC_ERROR,
-                        "Error while fetching the next result", __FUNCTION__);
-                    break;
-                default:
-                    SC_set_error_if_not_set(self, STMT_EXEC_ERROR,
-                                            "Error while executing the query",
-                                            __FUNCTION__);
-                    break;
-            }
-            break;
-    }
-}
-
-int SC_Create_bookmark(StatementClass *self, BindInfoClass *bookmark,
-                       Int4 bind_row, Int4 currTuple, const KeySet *keyset) {
-    ARDFields *opts = SC_get_ARDF(self);
-    SQLUINTEGER bind_size = opts->bind_size;
-    SQLULEN offset = opts->row_offset_ptr ? *opts->row_offset_ptr : 0;
-    size_t cvtlen = sizeof(Int4);
-    OPENSEARCH_BM opensearch_bm;
-
-    MYLOG(OPENSEARCH_TRACE, "entering type=%d buflen=" FORMAT_LEN " buf=%p\n",
-          bookmark->returntype, bookmark->buflen, bookmark->buffer);
-    memset(&opensearch_bm, 0, sizeof(opensearch_bm));
-    if (SQL_C_BOOKMARK == bookmark->returntype)
-        ;
-    else if (bookmark->buflen >= (SQLLEN)sizeof(opensearch_bm))
-        cvtlen = sizeof(opensearch_bm);
-    else if (bookmark->buflen >= 12)
-        cvtlen = 12;
-    opensearch_bm.index = SC_make_int4_bookmark(currTuple);
-    if (keyset)
-        opensearch_bm.keys = *keyset;
-    memcpy(CALC_BOOKMARK_ADDR(bookmark, offset, bind_size, bind_row), &opensearch_bm,
-           cvtlen);
-    if (bookmark->used) {
-        SQLLEN *used = LENADDR_SHIFT(bookmark->used, offset);
-
-        if (bind_size > 0)
-            used = (SQLLEN *)((char *)used + (bind_row * bind_size));
-        else
-            used = (SQLLEN *)((char *)used + (bind_row * sizeof(SQLLEN)));
-        *used = cvtlen;
-    }
-    MYLOG(OPENSEARCH_TRACE, "leaving cvtlen=" FORMAT_SIZE_T " ix(bl,of)=%d(%d,%d)\n",
-          cvtlen,
-          opensearch_bm.index, opensearch_bm.keys.blocknum,
-          opensearch_bm.keys.offset);
-
-    return COPY_OK;
-}
diff --git a/sql-odbc/src/sqlodbc/statement.h b/sql-odbc/src/sqlodbc/statement.h
deleted file mode 100644
index 7dc57ff05c..0000000000
--- a/sql-odbc/src/sqlodbc/statement.h
+++ /dev/null
@@ -1,504 +0,0 @@
-#ifndef __STATEMENT_H__
-#define __STATEMENT_H__
-
-#include <time.h>
-
-#include "bind.h"
-#include "descriptor.h"
-#include "opensearch_helper.h"
-#include "opensearch_odbc.h"
-#include "opensearch_types.h"
-#include "tuple.h"
-
-// C Interface
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
-    CancelRequestSet = 1L,
-    CancelRequestAccepted = (1L << 1),
-    CancelCompleted = (1L << 2)
-};
-
-typedef enum {
-    STMT_ALLOCATED, /* The statement handle is allocated, but
-                     * not used so far */
-    STMT_READY,     /* the statement is waiting to be executed */
-    STMT_DESCRIBED, /* ODBC states that it is legal to call
-                     * e.g. SQLDescribeCol before a call to
-                     * SQLExecute, but after SQLPrepare. To
-                     * get all the necessary information in
-                     * such a case, we parse the query _before_
-                     * the actual call to SQLExecute, and the
-                     * result set contains only column information,
-                     * but no actual data. */
-    STMT_FINISHED,  /* statement execution has finished */
-    STMT_EXECUTING  /* statement execution is still going on */
-} STMT_Status;
-/*
- *		ERROR status code
- *
- *		The code for warnings must be minus
- *		and  LOWEST_STMT_ERROR must be set to
- *		the least code number.
- *		The code for STMT_OK is 0 and error
- *		codes follow after it.
- */
-enum {
-    LOWEST_STMT_ERROR = (-6)
-    /* minus values mean warning returns */
-    ,
-    STMT_ERROR_IN_ROW = (-6),
-    STMT_OPTION_VALUE_CHANGED = (-5),
-    STMT_ROW_VERSION_CHANGED = (-4),
-    STMT_POS_BEFORE_RECORDSET = (-3),
-    STMT_TRUNCATED = (-2),
-    STMT_INFO_ONLY = (-1)
-    /* not an error message,
-     * just a notification
-     * to be returned by
-     * SQLError
-     */
-    ,
-    STMT_OK = 0,
-    STMT_EXEC_ERROR,
-    STMT_STATUS_ERROR,
-    STMT_SEQUENCE_ERROR,
-    STMT_NO_MEMORY_ERROR,
-    STMT_COLNUM_ERROR,
-    STMT_NO_STMTSTRING,
-    STMT_ERROR_TAKEN_FROM_BACKEND,
-    STMT_INTERNAL_ERROR,
-    STMT_STILL_EXECUTING,
-    STMT_NOT_IMPLEMENTED_ERROR,
-    STMT_BAD_PARAMETER_NUMBER_ERROR,
-    STMT_OPTION_OUT_OF_RANGE_ERROR,
-    STMT_INVALID_COLUMN_NUMBER_ERROR,
-    STMT_RESTRICTED_DATA_TYPE_ERROR,
-    STMT_INVALID_CURSOR_STATE_ERROR,
-    STMT_CREATE_TABLE_ERROR,
-    STMT_QUERY_SYNTAX_ERROR,
-    STMT_NO_CURSOR_NAME,
-    STMT_INVALID_CURSOR_NAME,
-    STMT_INVALID_ARGUMENT_NO,
-    STMT_ROW_OUT_OF_RANGE,
-    STMT_OPERATION_CANCELLED,
-    STMT_INVALID_CURSOR_POSITION,
-    STMT_VALUE_OUT_OF_RANGE,
-    STMT_OPERATION_INVALID,
-    STMT_PROGRAM_TYPE_OUT_OF_RANGE,
-    STMT_BAD_ERROR,
-    STMT_INVALID_OPTION_IDENTIFIER,
-    STMT_RETURN_NULL_WITHOUT_INDICATOR,
-    STMT_INVALID_DESCRIPTOR_IDENTIFIER,
-    STMT_OPTION_NOT_FOR_THE_DRIVER,
-    STMT_FETCH_OUT_OF_RANGE,
-    STMT_COUNT_FIELD_INCORRECT,
-    STMT_INVALID_NULL_ARG,
-    STMT_NO_RESPONSE,
-    STMT_COMMUNICATION_ERROR,
-    STMT_STRING_CONVERSION_ERROR
-};
-
-/* statement types */
-enum {
-    STMT_TYPE_UNKNOWN = -2,
-    STMT_TYPE_OTHER = -1,
-    STMT_TYPE_SELECT = 0,
-    STMT_TYPE_WITH,
-    STMT_TYPE_PROCCALL,
-    STMT_TYPE_TRANSACTION,
-    STMT_TYPE_DECLARE,
-    STMT_TYPE_FETCH,
-    STMT_TYPE_CLOSE,
-    STMT_TYPE_INSERT,
-    STMT_TYPE_UPDATE,
-    STMT_TYPE_DELETE,
-    STMT_TYPE_CREATE,
-    STMT_TYPE_ALTER,
-    STMT_TYPE_DROP,
-    STMT_TYPE_GRANT,
-    STMT_TYPE_REVOKE,
-    STMT_TYPE_LOCK,
-    STMT_TYPE_PREPARE,
-    STMT_TYPE_EXECUTE,
-    STMT_TYPE_DEALLOCATE,
-    STMT_TYPE_ANALYZE,
-    STMT_TYPE_NOTIFY,
-    STMT_TYPE_EXPLAIN,
-    STMT_TYPE_SET,
-    STMT_TYPE_RESET,
-    STMT_TYPE_MOVE,
-    STMT_TYPE_COPY,
-    STMT_TYPE_START,
-    STMT_TYPE_SPECIAL
-};
-
-#define STMT_UPDATE(stmt) ((stmt)->statement_type > STMT_TYPE_PROCCALL)
-
-/*	Parsing status */
-enum {
-    STMT_PARSE_NONE = 0,
-    STMT_PARSE_COMPLETE /* the driver parsed the statement */
-    ,
-    STMT_PARSE_INCOMPLETE,
-    STMT_PARSE_FATAL,
-    STMT_PARSE_MASK = 3L,
-    STMT_PARSED_OIDS = (1L << 2),
-    STMT_FOUND_KEY = (1L << 3),
-    STMT_HAS_ROW_DESCRIPTION = (1L << 4) /* already got the col info */
-    ,
-    STMT_REFLECTED_ROW_DESCRIPTION = (1L << 5)
-};
-
-/*	transition status */
-enum {
-    STMT_TRANSITION_UNALLOCATED = 0,
-    STMT_TRANSITION_ALLOCATED = 1,
-    STMT_TRANSITION_FETCH_SCROLL = 6,
-    STMT_TRANSITION_EXTENDED_FETCH = 7
-};
-
-/*	Result style */
-enum { STMT_FETCH_NONE = 0, STMT_FETCH_NORMAL, STMT_FETCH_EXTENDED };
-
-#define OPENSEARCH_NUM_NORMAL_KEYS 2
-
-typedef RETCODE (*NeedDataCallfunc)(RETCODE, void *);
-typedef struct {
-    NeedDataCallfunc func;
-    void *data;
-} NeedDataCallback;
-
-/*
- * ProcessedStmt represents a fragment of the original SQL query, after
- * converting ? markers to $n style, processing ODBC escapes, and splitting
- * a multi-statement into individual statements. Each individual statement
- * is represented by one ProcessedStmt struct.
- */
-struct ProcessedStmt {
-    struct ProcessedStmt *next;
-    char *query;
-    int num_params; /* number of parameter markers in this,
-                     * fragment or -1 if not known */
-};
-typedef struct ProcessedStmt ProcessedStmt;
-
-/********	Statement Handle	***********/
-struct StatementClass_ {
-    ConnectionClass *hdbc; /* pointer to ConnectionClass this
-                            * statement belongs to */
-    QResultClass *result;  /* result of the current statement */
-    QResultClass *curres;  /* the current result in the chain */
-    HSTMT *phstmt;
-    StatementOptions options;
-    StatementOptions options_orig;
-    /* attached descriptor handles */
-    DescriptorClass *ard;
-    DescriptorClass *apd;
-    DescriptorClass *ird;
-    DescriptorClass *ipd;
-    /* implicit descriptor handles */
-    DescriptorClass ardi;
-    DescriptorClass irdi;
-    DescriptorClass apdi;
-    DescriptorClass ipdi;
-
-    STMT_Status status;
-    char *__error_message;
-    int __error_number;
-    OpenSearch_ErrorInfo *opensearch_error;
-
-    SQLLEN currTuple; /* current absolute row number (GetData,
-                       * SetPos, SQLFetch) */
-    GetDataInfo gdata_info;
-    SQLLEN save_rowset_size; /* saved rowset size in case of
-                              * change/FETCH_NEXT */
-    SQLLEN rowset_start;     /* start of rowset (an absolute row
-                              * number) */
-    SQLSETPOSIROW bind_row;  /* current offset for Multiple row/column
-                              * binding */
-    Int2 current_col;        /* current column for GetData -- used to
-                              * handle multiple calls */
-    SQLLEN last_fetch_count; /* number of rows retrieved in
-                              * last fetch/extended fetch */
-    int lobj_fd;             /* fd of the current large object */
-
-    char *statement; /* if non--null pointer to the SQL
-                      * statement that has been executed */
-    /*
-     * processed_statements is the SQL after splitting multi-statement into
-     * parts, and replacing ? markers with $n style markers, or injecting the
-     * values in UseServerSidePrepare=0 mode.
-     */
-    ProcessedStmt *processed_statements;
-
-    TABLE_INFO **ti;
-    Int2 ntab;
-    Int2 num_key_fields;
-    Int2 statement_type; /* According to the defines above */
-    Int2 num_params;
-    Int2 data_at_exec; /* Number of params needing SQLPutData */
-    UDWORD iflag;      /* OPENSEARCHAPI_AllocStmt parameter */
-    PutDataInfo pdata_info;
-    po_ind_t parse_status;
-    po_ind_t proc_return;
-    po_ind_t put_data;          /* Has SQLPutData been called ? */
-    po_ind_t catalog_result;    /* Is this a result of catalog function ? */
-    po_ind_t prepare;           /* is this a prepared statement ? */
-    po_ind_t prepared;          /* is this statement already
-                                 * prepared at the server ? */
-    po_ind_t external;          /* Allocated via SQLAllocHandle() */
-    po_ind_t transition_status; /* Transition status */
-    po_ind_t multi_statement;   /* -1:unknown 0:single 1:multi */
-    po_ind_t rb_or_tc;          /* rollback on error */
-    po_ind_t
-        discard_output_params; /* discard output parameters on parse stage */
-    po_ind_t cancel_info;      /* cancel information */
-    po_ind_t ref_CC_error;     /* refer to CC_error ? */
-    po_ind_t lock_CC_for_rb;   /* lock CC for statement rollback ? */
-    po_ind_t join_info;        /* have joins ? */
-    po_ind_t parse_method;     /* parse_statement is forced or ? */
-    opensearchNAME cursor_name;
-    char *plan_name;
-    unsigned char miscinfo;
-    unsigned char execinfo;
-    po_ind_t updatable;
-    SQLLEN diag_row_count;
-    char *load_statement; /* to (re)load updatable individual rows */
-    ssize_t from_pos;
-    ssize_t load_from_pos;
-    ssize_t where_pos;
-    SQLLEN last_fetch_count_include_ommitted;
-    time_t stmt_time;
-    struct tm localtime;
-    /* SQL_NEED_DATA Callback list */
-    StatementClass *execute_delegate;
-    StatementClass *execute_parent;
-    UInt2 allocated_callbacks;
-    UInt2 num_callbacks;
-    NeedDataCallback *callbacks;
-    void *cs;
-};
-
-#define SC_get_conn(a) ((a)->hdbc)
-void SC_init_Result(StatementClass *self);
-void SC_set_Result(StatementClass *self, QResultClass *res);
-#define SC_get_Result(a) ((a)->result)
-#define SC_set_Curres(a, b) ((a)->curres = b)
-#define SC_get_Curres(a) ((a)->curres)
-#define SC_get_ARD(a) ((a)->ard)
-#define SC_get_APD(a) ((a)->apd)
-#define SC_get_IRD(a) ((a)->ird)
-#define SC_get_IPD(a) ((a)->ipd)
-#define SC_get_ARDF(a) (&(SC_get_ARD(a)->ardf))
-#define SC_get_APDF(a) (&(SC_get_APD(a)->apdf))
-#define SC_get_IRDF(a) (&(SC_get_IRD(a)->irdf))
-#define SC_get_IPDF(a) (&(SC_get_IPD(a)->ipdf))
-#define SC_get_ARDi(a) (&((a)->ardi))
-#define SC_get_APDi(a) (&((a)->apdi))
-#define SC_get_IRDi(a) (&((a)->irdi))
-#define SC_get_IPDi(a) (&((a)->ipdi))
-#define SC_get_GDTI(a) (&((a)->gdata_info))
-#define SC_get_PDTI(a) (&((a)->pdata_info))
-
-#define SC_get_errornumber(a) ((a)->__error_number)
-#define SC_set_errornumber(a, n) ((a)->__error_number = n)
-#define SC_get_errormsg(a) ((a)->__error_message)
-#define SC_is_prepare_statement(a) (0 != ((a)->prepare & PREPARE_STATEMENT))
-#define SC_get_prepare_method(a) ((a)->prepare & (~PREPARE_STATEMENT))
-
-#define SC_parsed_status(a) ((a)->parse_status & STMT_PARSE_MASK)
-#define SC_set_parse_status(a, s) ((a)->parse_status |= s)
-#define SC_update_not_ready(a)              \
-    (SC_parsed_status(a) == STMT_PARSE_NONE \
-     || 0 == ((a)->parse_status & STMT_PARSED_OIDS))
-#define SC_update_ready(a)                      \
-    (SC_parsed_status(a) == STMT_PARSE_COMPLETE \
-     && 0 != ((a)->parse_status & STMT_FOUND_KEY) && (a)->updatable)
-#define SC_set_checked_hasoids(a, b) \
-    ((a)->parse_status |= (STMT_PARSED_OIDS | (b ? STMT_FOUND_KEY : 0)))
-#define SC_checked_hasoids(a) (0 != ((a)->parse_status & STMT_PARSED_OIDS))
-#define SC_set_delegate(p, c) \
-    ((p)->execute_delegate = c, (c)->execute_parent = p)
-
-#define SC_is_updatable(s) (0 < ((s)->updatable))
-#define SC_reset_updatable(s) ((s)->updatable = -1)
-#define SC_set_updatable(s, b) ((s)->updatable = (b))
-#define SC_clear_parse_method(s) ((s)->parse_method = 0)
-#define SC_is_parse_forced(s) (0 != ((s)->parse_method & 1L))
-#define SC_set_parse_forced(s) ((s)->parse_method |= 1L)
-
-#define SC_cursor_is_valid(s) (NAME_IS_VALID((s)->cursor_name))
-#define SC_cursor_name(s) (SAFE_NAME((s)->cursor_name))
-
-void SC_reset_delegate(RETCODE, StatementClass *);
-
-#define SC_is_lower_case(a, b) \
-    ((a)->options.metadata_id || (b)->connInfo.lower_case_identifier)
-
-#define SC_MALLOC_return_with_error(t, tp, s, a, m, r)             \
-    do {                                                           \
-        if (t = (tp *)malloc(s), NULL == t) {                      \
-            SC_set_error(a, STMT_NO_MEMORY_ERROR, m, "SC_MALLOC"); \
-            return r;                                              \
-        }                                                          \
-    } while (0)
-#define SC_MALLOC_gexit_with_error(t, tp, s, a, m, r)              \
-    do {                                                           \
-        if (t = (tp *)malloc(s), NULL == t) {                      \
-            SC_set_error(a, STMT_NO_MEMORY_ERROR, m, "SC_MALLOC"); \
-            r;                                                     \
-            goto cleanup;                                          \
-        }                                                          \
-    } while (0)
-#define SC_REALLOC_return_with_error(t, tp, s, a, m, r)             \
-    do {                                                            \
-        tp *tmp;                                                    \
-        if (tmp = (tp *)realloc(t, s), NULL == tmp) {               \
-            SC_set_error(a, STMT_NO_MEMORY_ERROR, m, "SC_REALLOC"); \
-            return r;                                               \
-        }                                                           \
-        t = tmp;                                                    \
-    } while (0)
-#define SC_REALLOC_gexit_with_error(t, tp, s, a, m, r)              \
-    do {                                                            \
-        tp *tmp;                                                    \
-        if (tmp = (tp *)realloc(t, s), NULL == tmp) {               \
-            SC_set_error(a, STMT_NO_MEMORY_ERROR, m, __FUNCTION__); \
-            r;                                                      \
-            goto cleanup;                                           \
-        }                                                           \
-        t = tmp;                                                    \
-    } while (0)
-
-/*	options for SC_free_params() */
-#define STMT_FREE_PARAMS_ALL 0
-#define STMT_FREE_PARAMS_DATA_AT_EXEC_ONLY 1
-
-/*	prepare state */
-enum {
-    NON_PREPARE_STATEMENT = 0,
-    PREPARE_STATEMENT = 1,
-    PREPARE_BY_THE_DRIVER = (1L << 1),
-    NAMED_PARSE_REQUEST = (3L << 1),
-    PARSE_TO_EXEC_ONCE = (4L << 1),
-    PARSE_REQ_FOR_INFO = (5L << 1)
-};
-
-/*	prepared state */
-enum { NOT_PREPARED = 0, PREPARED, EXECUTED };
-
-/*	misc info */
-#define SC_set_fetchcursor(a) ((a)->miscinfo |= (1L << 1))
-#define SC_no_fetchcursor(a) ((a)->miscinfo &= ~(1L << 1))
-#define SC_is_fetchcursor(a) (((a)->miscinfo & (1L << 1)) != 0)
-#define SC_miscinfo_clear(a) ((a)->miscinfo = 0)
-#define SC_set_with_hold(a) ((a)->execinfo |= 1L)
-#define SC_set_without_hold(a) ((a)->execinfo &= (~1L))
-#define SC_is_with_hold(a) (((a)->execinfo & 1L) != 0)
-#define SC_set_readonly(a) ((a)->execinfo |= (1L << 1))
-#define SC_set_no_readonly(a) ((a)->execinfo &= ~(1L << 1))
-#define SC_is_readonly(a) (((a)->execinfo & (1L << 1)) != 0)
-#define SC_execinfo_clear(a)	(((a)->execinfo = 0)
-#define STMT_HAS_OUTER_JOIN 1L
-#define STMT_HAS_INNER_JOIN (1L << 1)
-#define SC_has_join(a) (0 != (a)->join_info)
-#define SC_has_outer_join(a) (0 != (STMT_HAS_OUTER_JOIN & (a)->join_info))
-#define SC_has_inner_join(a) (0 != (STMT_HAS_INNER_JOIN & (a)->join_info))
-#define SC_set_outer_join(a) ((a)->join_info |= STMT_HAS_OUTER_JOIN)
-#define SC_set_inner_join(a) ((a)->join_info |= STMT_HAS_INNER_JOIN)
-
-#define SC_start_tc_stmt(a) ((a)->rb_or_tc = (1L << 1))
-#define SC_is_tc_stmt(a) (((a)->rb_or_tc & (1L << 1)) != 0)
-#define SC_start_rb_stmt(a) ((a)->rb_or_tc = (1L << 2))
-#define SC_is_rb_stmt(a) (((a)->rb_or_tc & (1L << 2)) != 0)
-#define SC_unref_CC_error(a) (((a)->ref_CC_error) = FALSE)
-#define SC_ref_CC_error(a) (((a)->ref_CC_error) = TRUE)
-#define SC_can_parse_statement(a) (STMT_TYPE_SELECT == (a)->statement_type)
-/*
- * DECLARE CURSOR + FETCH can only be used with SELECT-type queries. And
- * it's not currently supported with array-bound parameters.
- */
-#define SC_may_use_cursor(a)                     \
-    (SC_get_APDF(a)->paramset_size <= 1          \
-     && (STMT_TYPE_SELECT == (a)->statement_type \
-         || STMT_TYPE_WITH == (a)->statement_type))
-#define SC_may_fetch_rows(a)                 \
-    (STMT_TYPE_SELECT == (a)->statement_type \
-     || STMT_TYPE_WITH == (a)->statement_type)
-
-/* For Multi-thread */
-#define INIT_STMT_CS(x) XPlatformInitializeCriticalSection(&((x)->cs))
-#define ENTER_STMT_CS(x) XPlatformEnterCriticalSection(((x)->cs))
-#define TRY_ENTER_STMT_CS(x) XPlatformTryEnterCriticalSection(&((x)->cs))
-#define LEAVE_STMT_CS(x) XPlatformLeaveCriticalSection(((x)->cs))
-#define DELETE_STMT_CS(x) XPlatformDeleteCriticalSection(&((x)->cs))
-
-/*	Statement prototypes */
-StatementClass *SC_Constructor(ConnectionClass *);
-void InitializeStatementOptions(StatementOptions *opt);
-char SC_Destructor(StatementClass *self);
-BOOL SC_opencheck(StatementClass *self, const char *func);
-RETCODE SC_initialize_and_recycle(StatementClass *self);
-void SC_initialize_cols_info(StatementClass *self, BOOL DCdestroy,
-                             BOOL parseReset);
-void SC_reset_result_for_rerun(StatementClass *self);
-int statement_type(const char *statement);
-char SC_unbind_cols(StatementClass *self);
-char SC_recycle_statement(StatementClass *self);
-void SC_clear_error(StatementClass *self);
-void SC_set_error(StatementClass *self, int errnum, const char *msg,
-                  const char *func);
-void SC_set_errormsg(StatementClass *self, const char *msg);
-void SC_error_copy(StatementClass *self, const StatementClass *from, BOOL);
-void SC_full_error_copy(StatementClass *self, const StatementClass *from, BOOL);
-void SC_set_prepared(StatementClass *self, int);
-void SC_set_planname(StatementClass *self, const char *plan_name);
-void SC_set_rowset_start(StatementClass *self, SQLLEN, BOOL);
-void SC_inc_rowset_start(StatementClass *self, SQLLEN);
-RETCODE SC_initialize_stmts(StatementClass *self, BOOL);
-RETCODE SC_fetch(StatementClass *self);
-void SC_log_error(const char *func, const char *desc,
-                  const StatementClass *self);
-time_t SC_get_time(StatementClass *self);
-struct tm *SC_get_localtime(StatementClass *self);
-int SC_Create_bookmark(StatementClass *stmt, BindInfoClass *bookmark,
-                       Int4 row_pos, Int4 currTuple, const KeySet *keyset);
-int SC_set_current_col(StatementClass *self, int col);
-BOOL SC_SetExecuting(StatementClass *self, BOOL on);
-BOOL SC_SetCancelRequest(StatementClass *self);
-
-BOOL SC_connection_lost_check(StatementClass *stmt, const char *funcname);
-void SC_set_errorinfo(StatementClass *self, QResultClass *res, int errkind);
-RETCODE dequeueNeedDataCallback(RETCODE, StatementClass *self);
-void cancelNeedDataState(StatementClass *self);
-
-/*
- *	Macros to convert global index <-> relative index in resultset/rowset
- */
-/* a global index to the relative index in a rowset */
-#define SC_get_rowset_start(stmt) ((stmt)->rowset_start)
-#define GIdx2RowIdx(gidx, stmt) (gidx - (stmt)->rowset_start)
-/* a global index to the relative index in a resultset(not a rowset) */
-#define GIdx2CacheIdx(gidx, s, r) \
-    (gidx - (QR_has_valid_base(r) ? ((s)->rowset_start - (r)->base) : 0))
-#define GIdx2KResIdx(gidx, s, r) \
-    (gidx - (QR_has_valid_base(r) ? ((s)->rowset_start - (r)->key_base) : 0))
-/* a relative index in a rowset to the global index */
-#define RowIdx2GIdx(ridx, stmt) (ridx + (stmt)->rowset_start)
-/* a relative index in a resultset to the global index */
-#define CacheIdx2GIdx(ridx, stmt, res) \
-    (ridx - (res)->base + (stmt)->rowset_start)
-#define KResIdx2GIdx(ridx, stmt, res) \
-    (ridx - (res)->key_base + (stmt)->rowset_start)
-
-#define BOOKMARK_SHIFT 1
-#define SC_make_int4_bookmark(b) ((b < 0) ? (b) : (b + BOOKMARK_SHIFT))
-#define SC_resolve_int4_bookmark(b) ((b < 0) ? (b) : (b - BOOKMARK_SHIFT))
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __STATEMENT_H__ */
diff --git a/sql-odbc/src/sqlodbc/tuple.c b/sql-odbc/src/sqlodbc/tuple.c
deleted file mode 100644
index d8a7c06126..0000000000
--- a/sql-odbc/src/sqlodbc/tuple.c
+++ /dev/null
@@ -1,43 +0,0 @@
-// clang-format off
-#include "tuple.h"
-#include "misc.h"
-
-#include <string.h>
-#include <stdlib.h>
-// clang-format on
-
-void set_tuplefield_null(TupleField *tuple_field) {
-    tuple_field->len = 0;
-    // Changing value to strdup("") from NULL to fix error 
-    // "Object cannot be cast from DBNull to other types" in Excel & Power BI
-    tuple_field->value = strdup(""); /* NULL; */
-}
-
-void set_tuplefield_string(TupleField *tuple_field, const char *string) {
-    if (string) {
-        tuple_field->len = (Int4)strlen(string); /* ES restriction */
-        tuple_field->value = strdup(string);
-    }
-    if (!tuple_field->value)
-        set_tuplefield_null(tuple_field);
-}
-
-void set_tuplefield_int2(TupleField *tuple_field, Int2 value) {
-    char buffer[10];
-
-    ITOA_FIXED(buffer, value);
-
-    tuple_field->len = (Int4)(strlen(buffer) + 1);
-    /* +1 ... is this correct (better be on the save side-...) */
-    tuple_field->value = strdup(buffer);
-}
-
-void set_tuplefield_int4(TupleField *tuple_field, Int4 value) {
-    char buffer[15];
-
-    ITOA_FIXED(buffer, value);
-
-    tuple_field->len = (Int4)(strlen(buffer) + 1);
-    /* +1 ... is this correct (better be on the save side-...) */
-    tuple_field->value = strdup(buffer);
-}
diff --git a/sql-odbc/src/sqlodbc/tuple.h b/sql-odbc/src/sqlodbc/tuple.h
deleted file mode 100644
index cc5a29eec1..0000000000
--- a/sql-odbc/src/sqlodbc/tuple.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef __TUPLE_H__
-#define __TUPLE_H__
-
-#include "opensearch_odbc.h"
-
-// C Interface
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*	Used by backend data AND manual result sets */
-struct TupleField_ {
-    Int4 len;    /* ES length of the current Tuple */
-    void *value; /* an array representing the value */
-};
-
-/*	keyset(TID + OID) info */
-struct KeySet_ {
-    UWORD status;
-    UInt2 offset;
-    UInt4 blocknum;
-    OID oid;
-};
-/*	Rollback(index + original TID) info */
-struct Rollback_ {
-    SQLLEN index;
-    UInt4 blocknum;
-    UInt2 offset;
-    OID oid;
-    UWORD option;
-};
-#define KEYSET_INFO_PUBLIC 0x07
-#define CURS_SELF_ADDING (1L << 3)
-#define CURS_SELF_DELETING (1L << 4)
-#define CURS_SELF_UPDATING (1L << 5)
-#define CURS_SELF_ADDED (1L << 6)
-#define CURS_SELF_DELETED (1L << 7)
-#define CURS_SELF_UPDATED (1L << 8)
-#define CURS_NEEDS_REREAD (1L << 9)
-#define CURS_IN_ROWSET (1L << 10)
-#define CURS_OTHER_DELETED (1L << 11)
-
-/*	These macros are wrappers for the corresponding set_tuplefield functions
-    but these handle automatic NULL determination and call set_tuplefield_null()
-    if appropriate for the datatype (used by SQLGetTypeInfo).
-*/
-#define set_nullfield_string(FLD, VAL) \
-    ((VAL) ? set_tuplefield_string(FLD, (VAL)) : set_tuplefield_null(FLD))
-#define set_nullfield_int2(FLD, VAL) \
-    ((VAL) != -1 ? set_tuplefield_int2(FLD, (VAL)) : set_tuplefield_null(FLD))
-#define set_nullfield_int4(FLD, VAL) \
-    ((VAL) != -1 ? set_tuplefield_int4(FLD, (VAL)) : set_tuplefield_null(FLD))
-
-void set_tuplefield_null(TupleField *tuple_field);
-void set_tuplefield_string(TupleField *tuple_field, const char *string);
-void set_tuplefield_int2(TupleField *tuple_field, Int2 value);
-void set_tuplefield_int4(TupleField *tuple_field, Int4 value);
-SQLLEN ClearCachedRows(TupleField *tuple, int num_fields, SQLLEN num_rows);
-
-typedef struct _OPENSEARCH_BM_ {
-    Int4 index;
-    KeySet keys;
-} OPENSEARCH_BM;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/sql-odbc/src/sqlodbc/unicode_support.h b/sql-odbc/src/sqlodbc/unicode_support.h
deleted file mode 100644
index e2b2a63521..0000000000
--- a/sql-odbc/src/sqlodbc/unicode_support.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __UNICODE_SUPPORT_H__
-#define __UNICODE_SUPPORT_H__
-
-#include "opensearch_odbc.h"
-
-#ifdef UNICODE_SUPPORT
-#define WCLEN sizeof(SQLWCHAR)
-enum { CONVTYPE_UNKNOWN, WCSTYPE_UTF16_LE, WCSTYPE_UTF32_LE, C16TYPE_UTF16_LE };
-char *ucs2_to_utf8(const SQLWCHAR *ucs2str, SQLLEN ilen, SQLLEN *olen,
-                   BOOL tolower);
-SQLULEN utf8_to_ucs2_lf(const char *utf8str, SQLLEN ilen, BOOL lfconv,
-                        SQLWCHAR *ucs2str, SQLULEN buflen, BOOL errcheck);
-int get_convtype(void);
-#define utf8_to_ucs2(utf8str, ilen, ucs2str, buflen) \
-    utf8_to_ucs2_lf(utf8str, ilen, FALSE, ucs2str, buflen, FALSE)
-
-SQLLEN bindcol_hybrid_estimate(const char *ldt, BOOL lf_conv, char **wcsbuf);
-SQLLEN bindcol_hybrid_exec(SQLWCHAR *utf16, const char *ldt, size_t n,
-                           BOOL lf_conv, char **wcsbuf);
-SQLLEN bindcol_localize_estimate(const char *utf8dt, BOOL lf_conv,
-                                 char **wcsbuf);
-SQLLEN bindcol_localize_exec(char *ldt, size_t n, BOOL lf_conv, char **wcsbuf);
-SQLLEN bindpara_wchar_to_msg(const SQLWCHAR *utf16, char **wcsbuf, SQLLEN used);
-
-SQLLEN locale_to_sqlwchar(SQLWCHAR *utf16, const char *ldt, size_t n,
-                          BOOL lf_conv);
-#endif /* UNICODE_SUPPORT */
-
-#endif /* __UNICODE_SUPPORT_H__ */
diff --git a/sql-odbc/src/sqlodbc/version.h b/sql-odbc/src/sqlodbc/version.h
deleted file mode 100644
index baf7e67abc..0000000000
--- a/sql-odbc/src/sqlodbc/version.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __VERSION_H__
-#define __VERSION_H__
-
-/*
- *	BuildAll may pass ELASTICDRIVERVERSION, ELASTIC_RESOURCE_VERSION
- *	and OPENSEARCH_DRVFILE_VERSION via winbuild/elasticodbc.vcxproj.
- */
-#ifdef OPENSEARCH_ODBC_VERSION
-
-#ifndef OPENSEARCHDRIVERVERSION
-#define OPENSEARCHDRIVERVERSION OPENSEARCH_ODBC_VERSION
-#endif
-#ifndef OPENSEARCH_RESOURCE_VERSION
-#define OPENSEARCH_RESOURCE_VERSION OPENSEARCHDRIVERVERSION
-#endif
-#ifndef OPENSEARCH_DRVFILE_VERSION
-#define OPENSEARCH_DRVFILE_VERSION OPENSEARCH_ODBC_DRVFILE_VERSION
-#endif
-
-#endif  // OPENSEARCH_ODBC_VERSION
-
-#endif
diff --git a/sql-odbc/src/sqlodbc/win_setup.h b/sql-odbc/src/sqlodbc/win_setup.h
deleted file mode 100644
index 9abae27d30..0000000000
--- a/sql-odbc/src/sqlodbc/win_setup.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _WIN_SETUP_H__
-#define _WIN_SETUP_H__
-
-#ifndef INTFUNC
-#define INTFUNC __stdcall
-#endif                     /* INTFUNC */
-#define MAXDSNAME (32 + 1) /* Max data source name length */
-/* Globals */
-/* NOTE:  All these are used by the dialog procedures */
-typedef struct tagSETUPDLG {
-    HWND hwndParent; /* Parent window handle */
-    LPCSTR lpszDrvr; /* Driver description */
-    ConnInfo ci;
-    char szDSN[MAXDSNAME]; /* Original data source name */
-    BOOL fNewDSN;          /* New data source flag */
-    BOOL fDefault;         /* Default data source flag */
-
-} SETUPDLG, *LPSETUPDLG;
-
-/* Prototypes */
-INT_PTR CALLBACK ConfigDlgProc(HWND hdlg, UINT wMsg, WPARAM wParam,
-                               LPARAM lParam);
-BOOL INTFUNC ChangeDriverName(HWND hwnd, LPSETUPDLG lpsetupdlg,
-                              LPCSTR driver_name);
-
-void test_connection(HANDLE hwnd, ConnInfo *ci, BOOL withDTC);
-
-#endif /* _WIN_SETUP_H__ */
diff --git a/sql-odbc/src/sqlodbc/win_unicode.c b/sql-odbc/src/sqlodbc/win_unicode.c
deleted file mode 100644
index 706e86e53c..0000000000
--- a/sql-odbc/src/sqlodbc/win_unicode.c
+++ /dev/null
@@ -1,1091 +0,0 @@
-#ifdef UNICODE_SUPPORT
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include "unicode_support.h"
-
-#ifdef WIN32
-#define FORMAT_SIZE_T "%Iu"
-#else
-#define FORMAT_SIZE_T "%zu"
-#endif
-
-#if (defined(__STDC_ISO_10646__) && defined(HAVE_MBSTOWCS) \
-     && defined(HAVE_WCSTOMBS))                            \
-    || defined(WIN32)
-#define __WCS_ISO10646__
-static BOOL use_wcs = FALSE;
-#endif
-
-#if (defined(__STDC_UTF_16__) && defined(HAVE_UCHAR_H) \
-     && defined(HAVE_MBRTOC16) && defined(HAVE_C16RTOMB))
-#define __CHAR16_UTF_16__
-#include <uchar.h>
-static BOOL use_c16 = FALSE;
-#endif
-
-static int convtype = -1;
-
-int get_convtype(void) {
-    const UCHAR *cdt;
-    (void)(cdt);
-#if defined(__WCS_ISO10646__)
-    if (convtype < 0) {
-        wchar_t *wdt = L"a";
-        int sizeof_w = sizeof(wchar_t);
-
-        cdt = (UCHAR *)wdt;
-        switch (sizeof_w) {
-            case 2:
-                if ('a' == cdt[0] && '\0' == cdt[1] && '\0' == cdt[2]
-                    && '\0' == cdt[3]) {
-                    MYLOG(OPENSEARCH_DEBUG, " UTF-16LE detected\n");
-                    convtype = WCSTYPE_UTF16_LE;
-                    use_wcs = TRUE;
-                }
-                break;
-            case 4:
-                if ('a' == cdt[0] && '\0' == cdt[1] && '\0' == cdt[2]
-                    && '\0' == cdt[3] && '\0' == cdt[4] && '\0' == cdt[5]
-                    && '\0' == cdt[6] && '\0' == cdt[7]) {
-                    MYLOG(OPENSEARCH_DEBUG, " UTF32-LE detected\n");
-                    convtype = WCSTYPE_UTF32_LE;
-                    use_wcs = TRUE;
-                }
-                break;
-        }
-    }
-#endif /* __WCS_ISO10646__ */
-#ifdef __CHAR16_UTF_16__
-    if (convtype < 0) {
-        char16_t *c16dt = u"a";
-
-        cdt = (UCHAR *)c16dt;
-        if ('a' == cdt[0] && '\0' == cdt[1] && '\0' == cdt[2]
-            && '\0' == cdt[3]) {
-            MYLOG(OPENSEARCH_DEBUG, " C16_UTF-16LE detected\n");
-            convtype = C16TYPE_UTF16_LE;
-            use_c16 = TRUE;
-        }
-    }
-#endif /* __CHAR16_UTF_16__ */
-    if (convtype < 0)
-        convtype = CONVTYPE_UNKNOWN; /* unknown */
-    return convtype;
-}
-
-#define byte3check 0xfffff800
-#define byte2_base 0x80c0
-#define byte2_mask1 0x07c0
-#define byte2_mask2 0x003f
-#define byte3_base 0x8080e0
-#define byte3_mask1 0xf000
-#define byte3_mask2 0x0fc0
-#define byte3_mask3 0x003f
-
-#define surrog_check 0xfc00
-#define surrog1_bits 0xd800
-#define surrog2_bits 0xdc00
-#define byte4_base 0x808080f0
-#define byte4_sr1_mask1 0x0700
-#define byte4_sr1_mask2 0x00fc
-#define byte4_sr1_mask3 0x0003
-#define byte4_sr2_mask1 0x03c0
-#define byte4_sr2_mask2 0x003f
-#define surrogate_adjust (0x10000 >> 10)
-
-static int little_endian = -1;
-
-SQLULEN ucs2strlen(const SQLWCHAR *ucs2str) {
-    SQLULEN len;
-    for (len = 0; ucs2str[len]; len++)
-        ;
-    return len;
-}
-char *ucs2_to_utf8(const SQLWCHAR *ucs2str, SQLLEN ilen, SQLLEN *olen,
-                   BOOL lower_identifier) {
-    char *utf8str;
-    int len = 0;
-    MYLOG(OPENSEARCH_DEBUG, "%p ilen=" FORMAT_LEN " ", ucs2str, ilen);
-
-    if (!ucs2str) {
-        if (olen)
-            *olen = SQL_NULL_DATA;
-        return NULL;
-    }
-    if (little_endian < 0) {
-        int crt = 1;
-        little_endian = (0 != ((char *)&crt)[0]);
-    }
-    if (ilen < 0)
-        ilen = ucs2strlen(ucs2str);
-    MYPRINTF(0, " newlen=" FORMAT_LEN, ilen);
-    utf8str = (char *)malloc(ilen * 4 + 1);
-    if (utf8str) {
-        int i = 0;
-        UInt2 byte2code;
-        Int4 byte4code, surrd1, surrd2;
-        const SQLWCHAR *wstr;
-
-        for (i = 0, wstr = ucs2str; i < ilen; i++, wstr++) {
-            if (!*wstr)
-                break;
-            else if (0 == (*wstr & 0xffffff80)) /* ASCII */
-            {
-                if (lower_identifier)
-                    utf8str[len++] = (char)tolower(*wstr);
-                else
-                    utf8str[len++] = (char)*wstr;
-            } else if ((*wstr & byte3check) == 0) {
-                byte2code = byte2_base | ((byte2_mask1 & *wstr) >> 6)
-                            | ((byte2_mask2 & *wstr) << 8);
-                if (little_endian)
-                    memcpy(utf8str + len, (char *)&byte2code,
-                           sizeof(byte2code));
-                else {
-                    utf8str[len] = ((char *)&byte2code)[1];
-                    utf8str[len + 1] = ((char *)&byte2code)[0];
-                }
-                len += sizeof(byte2code);
-            }
-            /* surrogate pair check for non ucs-2 code */
-            else if (surrog1_bits == (*wstr & surrog_check)) {
-                surrd1 = (*wstr & ~surrog_check) + surrogate_adjust;
-                wstr++;
-                i++;
-                surrd2 = (*wstr & ~surrog_check);
-                byte4code = byte4_base | ((byte4_sr1_mask1 & surrd1) >> 8)
-                            | ((byte4_sr1_mask2 & surrd1) << 6)
-                            | ((byte4_sr1_mask3 & surrd1) << 20)
-                            | ((byte4_sr2_mask1 & surrd2) << 10)
-                            | ((byte4_sr2_mask2 & surrd2) << 24);
-                if (little_endian)
-                    memcpy(utf8str + len, (char *)&byte4code,
-                           sizeof(byte4code));
-                else {
-                    utf8str[len] = ((char *)&byte4code)[3];
-                    utf8str[len + 1] = ((char *)&byte4code)[2];
-                    utf8str[len + 2] = ((char *)&byte4code)[1];
-                    utf8str[len + 3] = ((char *)&byte4code)[0];
-                }
-                len += sizeof(byte4code);
-            } else {
-                byte4code = byte3_base | ((byte3_mask1 & *wstr) >> 12)
-                            | ((byte3_mask2 & *wstr) << 2)
-                            | ((byte3_mask3 & *wstr) << 16);
-                if (little_endian)
-                    memcpy(utf8str + len, (char *)&byte4code, 3);
-                else {
-                    utf8str[len] = ((char *)&byte4code)[3];
-                    utf8str[len + 1] = ((char *)&byte4code)[2];
-                    utf8str[len + 2] = ((char *)&byte4code)[1];
-                }
-                len += 3;
-            }
-        }
-        utf8str[len] = '\0';
-        if (olen)
-            *olen = len;
-    }
-    return utf8str;
-}
-
-#define byte3_m1 0x0f
-#define byte3_m2 0x3f
-#define byte3_m3 0x3f
-#define byte2_m1 0x1f
-#define byte2_m2 0x3f
-#define byte4_m1 0x07
-#define byte4_m2 0x3f
-#define byte4_m31 0x30
-#define byte4_m32 0x0f
-#define byte4_m4 0x3f
-
-/*
- * Convert a string from UTF-8 encoding to UCS-2.
- *
- * utf8str		- input string in UTF-8
- * ilen			- length of input string in bytes  (or minus)
- * lfconv		- TRUE if line feeds (LF) should be converted to CR + LF
- * ucs2str		- output buffer
- * bufcount		- size of output buffer
- * errcheck		- if TRUE, check for invalidly encoded input characters
- *
- * Returns the number of SQLWCHARs copied to output buffer. If the output
- * buffer is too small, the output is truncated. The output string is
- * NULL-terminated, except when the output is truncated.
- */
-SQLULEN
-utf8_to_ucs2_lf(const char *utf8str, SQLLEN ilen, BOOL lfconv,
-                SQLWCHAR *ucs2str, SQLULEN bufcount, BOOL errcheck) {
-    int i;
-    SQLULEN rtn, ocount, wcode;
-    const UCHAR *str;
-
-    MYLOG(OPENSEARCH_DEBUG, "ilen=" FORMAT_LEN " bufcount=" FORMAT_ULEN, ilen,
-          bufcount);
-    if (!utf8str)
-        return 0;
-
-    if (!bufcount)
-        ucs2str = NULL;
-    else if (!ucs2str)
-        bufcount = 0;
-    if (ilen < 0)
-        ilen = strlen(utf8str);
-    for (i = 0, ocount = 0, str = (SQLCHAR *)utf8str; i < ilen && *str;) {
-        if ((*str & 0x80) == 0) {
-            if (lfconv && OPENSEARCH_LINEFEED == *str
-                && (i == 0 || OPENSEARCH_CARRIAGE_RETURN != str[-1])) {
-                if (ocount < bufcount)
-                    ucs2str[ocount] = OPENSEARCH_CARRIAGE_RETURN;
-                ocount++;
-            }
-            if (ocount < bufcount)
-                ucs2str[ocount] = *str;
-            ocount++;
-            i++;
-            str++;
-        } else if (0xf8 == (*str & 0xf8)) /* more than 5 byte code */
-        {
-            ocount = (SQLULEN)-1;
-            goto cleanup;
-        } else if (0xf0 == (*str & 0xf8)) /* 4 byte code */
-        {
-            if (errcheck) {
-                if (i + 4 > ilen || 0 == (str[1] & 0x80) || 0 == (str[2] & 0x80)
-                    || 0 == (str[3] & 0x80)) {
-                    ocount = (SQLULEN)-1;
-                    goto cleanup;
-                }
-            }
-            if (ocount < bufcount) {
-                wcode = (surrog1_bits | ((((UInt4)*str) & byte4_m1) << 8)
-                         | ((((UInt4)str[1]) & byte4_m2) << 2)
-                         | ((((UInt4)str[2]) & byte4_m31) >> 4))
-                        - surrogate_adjust;
-                ucs2str[ocount] = (SQLWCHAR)wcode;
-            }
-            ocount++;
-            if (ocount < bufcount) {
-                wcode = surrog2_bits | ((((UInt4)str[2]) & byte4_m32) << 6)
-                        | (((UInt4)str[3]) & byte4_m4);
-                ucs2str[ocount] = (SQLWCHAR)wcode;
-            }
-            ocount++;
-            i += 4;
-            str += 4;
-        } else if (0xe0 == (*str & 0xf0)) /* 3 byte code */
-        {
-            if (errcheck) {
-                if (i + 3 > ilen || 0 == (str[1] & 0x80)
-                    || 0 == (str[2] & 0x80)) {
-                    ocount = (SQLULEN)-1;
-                    goto cleanup;
-                }
-            }
-            if (ocount < bufcount) {
-                wcode = ((((UInt4)*str) & byte3_m1) << 12)
-                        | ((((UInt4)str[1]) & byte3_m2) << 6)
-                        | (((UInt4)str[2]) & byte3_m3);
-                ucs2str[ocount] = (SQLWCHAR)wcode;
-            }
-            ocount++;
-            i += 3;
-            str += 3;
-        } else if (0xc0 == (*str & 0xe0)) /* 2 byte code */
-        {
-            if (errcheck) {
-                if (i + 2 > ilen || 0 == (str[1] & 0x80)) {
-                    ocount = (SQLULEN)-1;
-                    goto cleanup;
-                }
-            }
-            if (ocount < bufcount) {
-                wcode = ((((UInt4)*str) & byte2_m1) << 6)
-                        | (((UInt4)str[1]) & byte2_m2);
-                ucs2str[ocount] = (SQLWCHAR)wcode;
-            }
-            ocount++;
-            i += 2;
-            str += 2;
-        } else {
-            ocount = (SQLULEN)-1;
-            goto cleanup;
-        }
-    }
-cleanup:
-    rtn = ocount;
-    if (ocount == (SQLULEN)-1) {
-        if (!errcheck)
-            rtn = 0;
-        ocount = 0;
-    }
-    if (ocount < bufcount && ucs2str)
-        ucs2str[ocount] = 0;
-    MYPRINTF(OPENSEARCH_ALL, " ocount=" FORMAT_ULEN "\n", ocount);
-    return rtn;
-}
-
-#ifdef __WCS_ISO10646__
-
-/* UCS4 => utf8 */
-#define byte4check 0xffff0000
-#define byte4_check 0x10000
-#define byte4_mask1 0x1c0000
-#define byte4_mask2 0x3f000
-#define byte4_mask3 0x0fc0
-#define byte4_mask4 0x003f
-
-#define byte4_m3 0x3f
-
-static SQLULEN ucs4strlen(const UInt4 *ucs4str) {
-    SQLULEN len;
-    for (len = 0; ucs4str[len]; len++)
-        ;
-    return len;
-}
-
-static char *ucs4_to_utf8(const UInt4 *ucs4str, SQLLEN ilen, SQLLEN *olen,
-                          BOOL lower_identifier) {
-    char *utf8str;
-    int len = 0;
-    MYLOG(OPENSEARCH_DEBUG, " %p ilen=" FORMAT_LEN "\n", ucs4str, ilen);
-
-    if (!ucs4str) {
-        if (olen)
-            *olen = SQL_NULL_DATA;
-        return NULL;
-    }
-    if (little_endian < 0) {
-        int crt = 1;
-        little_endian = (0 != ((char *)&crt)[0]);
-    }
-    if (ilen < 0)
-        ilen = ucs4strlen(ucs4str);
-    MYLOG(OPENSEARCH_DEBUG, " newlen=" FORMAT_LEN "\n", ilen);
-    utf8str = (char *)malloc(ilen * 4 + 1);
-    if (utf8str) {
-        int i;
-        UInt2 byte2code;
-        Int4 byte4code;
-        const UInt4 *wstr;
-
-        for (i = 0, wstr = ucs4str; i < ilen; i++, wstr++) {
-            if (!*wstr)
-                break;
-            else if (0 == (*wstr & 0xffffff80)) /* ASCII */
-            {
-                if (lower_identifier)
-                    utf8str[len++] = (char)tolower(*wstr);
-                else
-                    utf8str[len++] = (char)*wstr;
-            } else if ((*wstr & byte3check) == 0) {
-                byte2code = byte2_base | ((byte2_mask1 & *wstr) >> 6)
-                            | ((byte2_mask2 & *wstr) << 8);
-                if (little_endian)
-                    memcpy(utf8str + len, (char *)&byte2code,
-                           sizeof(byte2code));
-                else {
-                    utf8str[len] = ((char *)&byte2code)[1];
-                    utf8str[len + 1] = ((char *)&byte2code)[0];
-                }
-                len += sizeof(byte2code);
-            } else if ((*wstr & byte4check) == 0) {
-                byte4code = byte3_base | ((byte3_mask1 & *wstr) >> 12)
-                            | ((byte3_mask2 & *wstr) << 2)
-                            | ((byte3_mask3 & *wstr) << 16);
-                if (little_endian)
-                    memcpy(utf8str + len, (char *)&byte4code, 3);
-                else {
-                    utf8str[len] = ((char *)&byte4code)[3];
-                    utf8str[len + 1] = ((char *)&byte4code)[2];
-                    utf8str[len + 2] = ((char *)&byte4code)[1];
-                }
-                len += 3;
-            } else {
-                byte4code = byte4_base | ((byte4_mask1 & *wstr) >> 18)
-                            | ((byte4_mask2 & *wstr) >> 4)
-                            | ((byte4_mask3 & *wstr) << 10)
-                            | ((byte4_mask4 & *wstr) << 24);
-                /* MYLOG(OPENSEARCH_DEBUG, " %08x->%08x\n", *wstr, byte4code); */
-                if (little_endian)
-                    memcpy(utf8str + len, (char *)&byte4code,
-                           sizeof(byte4code));
-                else {
-                    utf8str[len] = ((char *)&byte4code)[3];
-                    utf8str[len + 1] = ((char *)&byte4code)[2];
-                    utf8str[len + 2] = ((char *)&byte4code)[1];
-                    utf8str[len + 3] = ((char *)&byte4code)[0];
-                }
-                len += sizeof(byte4code);
-            }
-        }
-        utf8str[len] = '\0';
-        if (olen)
-            *olen = len;
-    }
-    return utf8str;
-}
-
-/*
- * Convert a string from UTF-8 encoding to UTF-32.
- *
- * utf8str		- input string in UTF-8
- * ilen			- length of input string in bytes  (or minus)
- * lfconv		- TRUE if line feeds (LF) should be converted to CR + LF
- * ucs4str		- output buffer
- * bufcount		- size of output buffer
- * errcheck		- if TRUE, check for invalidly encoded input characters
- *
- * Returns the number of UInt4s copied to output buffer. If the output
- * buffer is too small, the output is truncated. The output string is
- * NULL-terminated, except when the output is truncated.
- */
-static SQLULEN utf8_to_ucs4_lf(const char *utf8str, SQLLEN ilen, BOOL lfconv,
-                               UInt4 *ucs4str, SQLULEN bufcount,
-                               BOOL errcheck) {
-    int i;
-    SQLULEN rtn, ocount, wcode;
-    const UCHAR *str;
-
-    MYLOG(OPENSEARCH_DEBUG, " ilen=" FORMAT_LEN " bufcount=" FORMAT_ULEN "\n", ilen, bufcount);
-    if (!utf8str)
-        return 0;
-
-    if (!bufcount)
-        ucs4str = NULL;
-    else if (!ucs4str)
-        bufcount = 0;
-    if (ilen < 0)
-        ilen = strlen(utf8str);
-    for (i = 0, ocount = 0, str = (SQLCHAR *)utf8str; i < ilen && *str;) {
-        if ((*str & 0x80) == 0) {
-            if (lfconv && OPENSEARCH_LINEFEED == *str
-                && (i == 0 || OPENSEARCH_CARRIAGE_RETURN != str[-1])) {
-                if (ocount < bufcount)
-                    ucs4str[ocount] = OPENSEARCH_CARRIAGE_RETURN;
-                ocount++;
-            }
-            if (ocount < bufcount)
-                ucs4str[ocount] = *str;
-            ocount++;
-            i++;
-            str++;
-        } else if (0xf8 == (*str & 0xf8)) /* more than 5 byte code */
-        {
-            ocount = (SQLULEN)-1;
-            goto cleanup;
-        } else if (0xf0 == (*str & 0xf8)) /* 4 byte code */
-        {
-            if (errcheck) {
-                if (i + 4 > ilen || 0 == (str[1] & 0x80) || 0 == (str[2] & 0x80)
-                    || 0 == (str[3] & 0x80)) {
-                    ocount = (SQLULEN)-1;
-                    goto cleanup;
-                }
-            }
-            if (ocount < bufcount) {
-                wcode = (((((UInt4)*str) & byte4_m1) << 18)
-                         | ((((UInt4)str[1]) & byte4_m2) << 12)
-                         | ((((UInt4)str[2]) & byte4_m3) << 6))
-                        | (((UInt4)str[3]) & byte4_m4);
-                ucs4str[ocount] = (unsigned int)wcode;
-            }
-            ocount++;
-            i += 4;
-            str += 4;
-        } else if (0xe0 == (*str & 0xf0)) /* 3 byte code */
-        {
-            if (errcheck) {
-                if (i + 3 > ilen || 0 == (str[1] & 0x80)
-                    || 0 == (str[2] & 0x80)) {
-                    ocount = (SQLULEN)-1;
-                    goto cleanup;
-                }
-            }
-            if (ocount < bufcount) {
-                wcode = ((((UInt4)*str) & byte3_m1) << 12)
-                        | ((((UInt4)str[1]) & byte3_m2) << 6)
-                        | (((UInt4)str[2]) & byte3_m3);
-                ucs4str[ocount] = (unsigned int)wcode;
-            }
-            ocount++;
-            i += 3;
-            str += 3;
-        } else if (0xc0 == (*str & 0xe0)) /* 2 byte code */
-        {
-            if (errcheck) {
-                if (i + 2 > ilen || 0 == (str[1] & 0x80)) {
-                    ocount = (SQLULEN)-1;
-                    goto cleanup;
-                }
-            }
-            if (ocount < bufcount) {
-                wcode = ((((UInt4)*str) & byte2_m1) << 6)
-                        | (((UInt4)str[1]) & byte2_m2);
-                ucs4str[ocount] = (SQLWCHAR)wcode;
-            }
-            ocount++;
-            i += 2;
-            str += 2;
-        } else {
-            ocount = (SQLULEN)-1;
-            goto cleanup;
-        }
-    }
-cleanup:
-    rtn = ocount;
-    if (ocount == (SQLULEN)-1) {
-        if (!errcheck)
-            rtn = 0;
-        ocount = 0;
-    }
-    if (ocount < bufcount && ucs4str)
-        ucs4str[ocount] = 0;
-    MYLOG(OPENSEARCH_DEBUG, " ocount=" FORMAT_ULEN "\n", ocount);
-    return rtn;
-}
-
-#define SURROGATE_CHECK 0xfc
-#define SURROG1_BYTE 0xd8
-#define SURROG2_BYTE 0xdc
-
-static int ucs4_to_ucs2_lf(const unsigned int *ucs4str, SQLLEN ilen,
-                           SQLWCHAR *ucs2str, int bufcount, BOOL lfconv) {
-    int outlen = 0, i;
-    UCHAR *ucdt;
-    SQLWCHAR *sqlwdt, dmy_wchar;
-    UCHAR *const udt = (UCHAR *)&dmy_wchar;
-    unsigned int uintdt;
-
-    MYLOG(OPENSEARCH_DEBUG, " ilen=" FORMAT_LEN " bufcount=%d\n", ilen, bufcount);
-    if (ilen < 0)
-        ilen = ucs4strlen(ucs4str);
-    for (i = 0; i < ilen && (uintdt = ucs4str[i], uintdt); i++) {
-        sqlwdt = (SQLWCHAR *)&uintdt;
-        ucdt = (UCHAR *)&uintdt;
-        if (0 == sqlwdt[1]) {
-            if (lfconv && OPENSEARCH_LINEFEED == ucdt[0]
-                && (i == 0
-                    || OPENSEARCH_CARRIAGE_RETURN != *((UCHAR *)&ucs4str[i - 1]))) {
-                if (outlen < bufcount) {
-                    udt[0] = OPENSEARCH_CARRIAGE_RETURN;
-                    udt[1] = 0;
-                    ucs2str[outlen] = *((SQLWCHAR *)udt);
-                }
-                outlen++;
-            }
-            if (outlen < bufcount)
-                ucs2str[outlen] = sqlwdt[0];
-            outlen++;
-            continue;
-        }
-        sqlwdt[1]--;
-        udt[0] = ((0xfc & ucdt[1]) >> 2) | ((0x3 & ucdt[2]) << 6);
-        //	printf("%02x", udt[0]);
-        udt[1] = SURROG1_BYTE | ((0xc & ucdt[2]) >> 2);
-        //	printf("%02x", udt[1]);
-        if (outlen < bufcount)
-            ucs2str[outlen] = *((SQLWCHAR *)udt);
-        outlen++;
-        udt[0] = ucdt[0];
-        //	printf("%02x", udt[0]);
-        udt[1] = SURROG2_BYTE | (0x3 & ucdt[1]);
-        //	printf("%02x\n", udt[1]);
-        if (outlen < bufcount)
-            ucs2str[outlen] = *((SQLWCHAR *)udt);
-        outlen++;
-    }
-    if (outlen < bufcount)
-        ucs2str[outlen] = 0;
-
-    return outlen;
-}
-static int ucs2_to_ucs4(const SQLWCHAR *ucs2str, SQLLEN ilen,
-                        unsigned int *ucs4str, int bufcount) {
-    int outlen = 0, i;
-    UCHAR *ucdt;
-    SQLWCHAR sqlwdt;
-    unsigned int dmy_uint;
-    UCHAR *const udt = (UCHAR *)&dmy_uint;
-
-    MYLOG(OPENSEARCH_DEBUG, " ilen=" FORMAT_LEN " bufcount=%d\n", ilen, bufcount);
-    if (ilen < 0)
-        ilen = ucs2strlen(ucs2str);
-    udt[3] = 0; /* always */
-    for (i = 0; i < ilen && (sqlwdt = ucs2str[i], sqlwdt); i++) {
-        ucdt = (UCHAR *)(ucs2str + i);
-        //	printf("IN=%x\n", sqlwdt);
-        if ((ucdt[1] & SURROGATE_CHECK) != SURROG1_BYTE) {
-            //	printf("SURROG1=%2x\n", ucdt[1] & SURROG1_BYTE);
-            if (outlen < bufcount) {
-                udt[0] = ucdt[0];
-                udt[1] = ucdt[1];
-                udt[2] = 0;
-                ucs4str[outlen] = *((unsigned int *)udt);
-            }
-            outlen++;
-            continue;
-        }
-        /* surrogate pair */
-        udt[0] = ucdt[2];
-        udt[1] = (ucdt[3] & 0x3) | ((ucdt[0] & 0x3f) << 2);
-        udt[2] = (((ucdt[0] & 0xc0) >> 6) | ((ucdt[1] & 0x3) << 2)) + 1;
-        // udt[3] = 0; needless
-        if (outlen < bufcount)
-            ucs4str[outlen] = *((unsigned int *)udt);
-        outlen++;
-        i++;
-    }
-    if (outlen < bufcount)
-        ucs4str[outlen] = 0;
-
-    return outlen;
-}
-#endif /* __WCS_ISO10646__ */
-
-#if defined(__WCS_ISO10646__)
-
-static SQLULEN utf8_to_wcs_lf(const char *utf8str, SQLLEN ilen, BOOL lfconv,
-                              wchar_t *wcsstr, SQLULEN bufcount,
-                              BOOL errcheck) {
-    switch (get_convtype()) {
-        case WCSTYPE_UTF16_LE:
-            return utf8_to_ucs2_lf(utf8str, ilen, lfconv, (SQLWCHAR *)wcsstr,
-                                   bufcount, errcheck);
-        case WCSTYPE_UTF32_LE:
-            return utf8_to_ucs4_lf(utf8str, ilen, lfconv, (UInt4 *)wcsstr,
-                                   bufcount, errcheck);
-    }
-    return (SQLULEN)~0;
-}
-
-static char *wcs_to_utf8(const wchar_t *wcsstr, SQLLEN ilen, SQLLEN *olen,
-                         BOOL lower_identifier) {
-    switch (get_convtype()) {
-        case WCSTYPE_UTF16_LE:
-            return ucs2_to_utf8((const SQLWCHAR *)wcsstr, ilen, olen,
-                                lower_identifier);
-        case WCSTYPE_UTF32_LE:
-            return ucs4_to_utf8((const UInt4 *)wcsstr, ilen, olen,
-                                lower_identifier);
-    }
-
-    return NULL;
-}
-
-/*
- *	Input strings must be NULL terminated.
- *	Output wide character strings would be NULL terminated. The result
- *	outmsg would be truncated when the buflen is small.
- *
- *	The output NULL terminator is counted as buflen.
- *	if outmsg is NULL or buflen is 0, only output length is returned.
- *	As for return values, NULL terminators aren't counted.
- */
-static int msgtowstr(const char *inmsg, wchar_t *outmsg, int buflen) {
-    int outlen = -1;
-
-    MYLOG(OPENSEARCH_DEBUG, " inmsg=%p buflen=%d\n", inmsg, buflen);
-#ifdef WIN32
-    if (NULL == outmsg)
-        buflen = 0;
-    if ((outlen =
-             MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS,
-                                 inmsg, -1, outmsg, buflen))
-        > 0)
-        outlen--;
-    else if (ERROR_INSUFFICIENT_BUFFER == GetLastError())
-        outlen =
-            MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS,
-                                inmsg, -1, NULL, 0)
-            - 1;
-    else
-        outlen = -1;
-#else
-    if (0 == buflen)
-        outmsg = NULL;
-    outlen = mbstowcs((wchar_t *)outmsg, inmsg, buflen);
-#endif /* WIN32 */
-    if (outmsg && outlen >= buflen) {
-        outmsg[buflen - 1] = 0;
-        MYLOG(OPENSEARCH_DEBUG, " out=%dchars truncated to %d\n", outlen, buflen - 1);
-    }
-    MYLOG(OPENSEARCH_DEBUG, " buf=%dchars out=%dchars\n", buflen, outlen);
-
-    return outlen;
-}
-
-/*
- *	Input wide character strings must be NULL terminated.
- *	Output strings would be NULL terminated. The result outmsg would be
- *	truncated when the buflen is small.
- *
- *	The output NULL terminator is counted as buflen.
- *	if outmsg is NULL or buflen is 0, only output length is returned.
- *	As for return values, NULL terminators aren't counted.
- */
-static int wstrtomsg(const wchar_t *wstr, char *outmsg, int buflen) {
-    int outlen = -1;
-
-    MYLOG(OPENSEARCH_DEBUG, " wstr=%p buflen=%d\n", wstr, buflen);
-#ifdef WIN32
-    if (NULL == outmsg)
-        buflen = 0;
-    if ((outlen = WideCharToMultiByte(CP_ACP, 0, wstr, -1, outmsg, buflen, NULL,
-                                      NULL))
-        > 0)
-        outlen--;
-    else if (ERROR_INSUFFICIENT_BUFFER == GetLastError())
-        outlen =
-            WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL) - 1;
-    else
-        outlen = -1;
-#else
-    if (0 == buflen)
-        outmsg = NULL;
-    outlen = wcstombs(outmsg, wstr, buflen);
-#endif /* WIN32 */
-    if (outmsg && outlen >= buflen) {
-        outmsg[buflen - 1] = 0;
-        MYLOG(OPENSEARCH_DEBUG, " out=%dbytes truncated to %d\n", outlen, buflen - 1);
-    }
-    MYLOG(OPENSEARCH_DEBUG, " buf=%dbytes outlen=%dbytes\n", buflen, outlen);
-
-    return outlen;
-}
-#endif /* __WCS_ISO10646__ */
-
-#if defined(__CHAR16_UTF_16__)
-
-static mbstate_t initial_state;
-
-static SQLLEN mbstoc16_lf(char16_t *c16dt, const char *c8dt, size_t n,
-                          BOOL lf_conv) {
-    int i;
-    size_t brtn;
-    const char *cdt;
-    mbstate_t mbst = initial_state;
-
-    MYLOG(OPENSEARCH_DEBUG, " c16dt=%p size=" FORMAT_SIZE_T "\n", c16dt, n);
-    for (i = 0, cdt = c8dt; i < n || (!c16dt); i++) {
-        if (lf_conv && OPENSEARCH_LINEFEED == *cdt && i > 0
-            && OPENSEARCH_CARRIAGE_RETURN != cdt[-1]) {
-            if (c16dt)
-                c16dt[i] = OPENSEARCH_CARRIAGE_RETURN;
-            i++;
-        }
-        brtn = mbrtoc16(c16dt ? c16dt + i : NULL, cdt, 4, &mbst);
-        if (0 == brtn)
-            break;
-        if (brtn == (size_t)-1 || brtn == (size_t)-2)
-            return -1;
-        if (brtn == (size_t)-3)
-            continue;
-        cdt += brtn;
-    }
-    if (c16dt && i >= n)
-        c16dt[n - 1] = 0;
-
-    return i;
-}
-
-static SQLLEN c16tombs(char *c8dt, const char16_t *c16dt, size_t n) {
-    int i;
-    SQLLEN result = 0;
-    size_t brtn;
-    char *cdt, c4byte[4];
-    mbstate_t mbst = initial_state;
-
-    MYLOG(OPENSEARCH_DEBUG, " c8dt=%p size=" FORMAT_SIZE_T "u\n", c8dt, n);
-    if (!c8dt)
-        n = 0;
-    for (i = 0, cdt = c8dt; c16dt[i] && (result < n || (!cdt)); i++) {
-        if (NULL != cdt && result + 4 < n)
-            brtn = c16rtomb(cdt, c16dt[i], &mbst);
-        else {
-            brtn = c16rtomb(c4byte, c16dt[i], &mbst);
-            if (brtn < 5) {
-                SQLLEN result_n = result + brtn;
-
-                if (result_n < n)
-                    memcpy(cdt, c4byte, brtn);
-                else {
-                    if (cdt && n > 0) {
-                        c8dt[result] = '\0'; /* truncate */
-                        return result_n;
-                    }
-                }
-            }
-        }
-        /*
-        printf("c16dt=%04X brtn=%lu result=%ld cdt=%02X%02X%02X%02X\n",
-            c16dt[i], brtn, result, (UCHAR) cdt[0], (UCHAR) cdt[1], (UCHAR)
-        cdt[2], (UCHAR) cdt[3]);
-        */
-        if (brtn == (size_t)-1) {
-            if (n > 0)
-                c8dt[n - 1] = '\0';
-            return -1;
-        }
-        if (cdt)
-            cdt += brtn;
-        result += brtn;
-    }
-    if (cdt)
-        *cdt = '\0';
-
-    return result;
-}
-#endif /* __CHAR16_UTF_16__ */
-
-
-//
-//	SQLBindParameter	hybrid case
-//		SQLWCHAR(UTF-16) => the current locale
-//
-SQLLEN bindpara_wchar_to_msg(const SQLWCHAR *utf16, char **wcsbuf,
-                             SQLLEN used) {
-    SQLLEN l = (-2);
-    char *ldt = NULL;
-    SQLWCHAR *utf16_nts, *alloc_nts = NULL, ntsbuf[128];
-    int count;
-
-    if (SQL_NTS == used) {
-        count = (int)ucs2strlen(utf16);
-        utf16_nts = (SQLWCHAR *)utf16;
-    } else if (used < 0)
-        return -1;
-    else {
-        count = (int)(used / WCLEN);
-        if (used + WCLEN <= sizeof(ntsbuf))
-            utf16_nts = ntsbuf;
-        else {
-            if (NULL == (alloc_nts = (SQLWCHAR *)malloc(used + WCLEN)))
-                return l;
-            utf16_nts = alloc_nts;
-        }
-        memcpy(utf16_nts, utf16, used);
-        utf16_nts[count] = 0;
-    }
-
-    get_convtype();
-    MYLOG(OPENSEARCH_DEBUG, "\n");
-#if defined(__WCS_ISO10646__)
-    if (use_wcs) {
-#pragma warning(push)
-#pragma warning(disable : 4127)
-        if (sizeof(SQLWCHAR) == sizeof(wchar_t))
-#pragma warning(pop)
-        {
-            ldt = (char *)malloc(2 * count + 1);
-            l = wstrtomsg((wchar_t *)utf16_nts, ldt, 2 * count + 1);
-        } else {
-            unsigned int *utf32 =
-                (unsigned int *)malloc((count + 1) * sizeof(unsigned int));
-
-            l = ucs2_to_ucs4(utf16_nts, -1, utf32, count + 1);
-            if ((l = wstrtomsg((wchar_t *)utf32, NULL, 0)) >= 0) {
-                ldt = (char *)malloc(l + 1);
-                l = wstrtomsg((wchar_t *)utf32, ldt, (int)l + 1);
-            }
-            free(utf32);
-        }
-    }
-#endif /* __WCS_ISO10646__ */
-#ifdef __CHAR16_UTF_16__
-    if (use_c16) {
-        ldt = (char *)malloc(4 * count + 1);
-        l = c16tombs(ldt, (const char16_t *)utf16_nts, 4 * count + 1);
-    }
-#endif /* __CHAR16_UTF_16__ */
-    if (l < 0 && NULL != ldt)
-        free(ldt);
-    else
-        *wcsbuf = ldt;
-
-    if (NULL != alloc_nts)
-        free(alloc_nts);
-    return l;
-}
-
-size_t convert_linefeeds(const char *s, char *dst, size_t max, BOOL convlf,
-                         BOOL *changed);
-//
-//	SQLBindCol	hybrid case
-//		the current locale => SQLWCHAR(UTF-16)
-//
-SQLLEN bindcol_hybrid_estimate(const char *ldt, BOOL lf_conv, char **wcsbuf) {
-    UNUSED(ldt, wcsbuf);
-    SQLLEN l = (-2);
-
-    get_convtype();
-    MYLOG(OPENSEARCH_DEBUG, " lf_conv=%d\n", lf_conv);
-#if defined(__WCS_ISO10646__)
-    if (use_wcs) {
-        unsigned int *utf32 = NULL;
-
-#pragma warning(push)
-#pragma warning(disable : 4127)
-        if (sizeof(SQLWCHAR) == sizeof(wchar_t))
-#pragma warning(pop)
-        {
-            l = msgtowstr(ldt, (wchar_t *)NULL, 0);
-            if (l >= 0 && lf_conv) {
-                BOOL changed;
-                size_t len;
-
-                len = convert_linefeeds(ldt, NULL, 0, TRUE, &changed);
-                if (changed) {
-                    l += (len - strlen(ldt));
-                    *wcsbuf = (char *)malloc(len + 1);
-                    convert_linefeeds(ldt, *wcsbuf, len + 1, TRUE, NULL);
-                }
-            }
-        } else {
-            int count = (int)strlen(ldt);
-
-            utf32 = (unsigned int *)malloc((count + 1) * sizeof(unsigned int));
-            if ((l = msgtowstr(ldt, (wchar_t *)utf32, count + 1)) >= 0) {
-                l = ucs4_to_ucs2_lf(utf32, -1, NULL, 0, lf_conv);
-                *wcsbuf = (char *)utf32;
-            }
-        }
-        if (l < 0 && NULL != utf32)
-            free(utf32);
-    }
-#endif /* __WCS_ISO10646__ */
-#ifdef __CHAR16_UTF_16__
-    if (use_c16)
-        l = mbstoc16_lf((char16_t *)NULL, ldt, 0, lf_conv);
-#endif /* __CHAR16_UTF_16__ */
-
-    return l;
-}
-
-SQLLEN bindcol_hybrid_exec(SQLWCHAR *utf16, const char *ldt, size_t n,
-                           BOOL lf_conv, char **wcsbuf) {
-    UNUSED(ldt, utf16, wcsbuf);
-    SQLLEN l = (-2);
-
-    get_convtype();
-    MYLOG(OPENSEARCH_DEBUG, " size=" FORMAT_SIZE_T " lf_conv=%d\n", n, lf_conv);
-#if defined(__WCS_ISO10646__)
-    if (use_wcs) {
-        unsigned int *utf32 = NULL;
-        BOOL midbuf = (wcsbuf && *wcsbuf);
-
-#pragma warning(push)
-#pragma warning(disable : 4127)
-        if (sizeof(SQLWCHAR) == sizeof(wchar_t))
-#pragma warning(pop)
-        {
-            if (midbuf)
-                l = msgtowstr(*wcsbuf, (wchar_t *)utf16, (int)n);
-            else
-                l = msgtowstr(ldt, (wchar_t *)utf16, (int)n);
-        } else if (midbuf) {
-            utf32 = (unsigned int *)*wcsbuf;
-            l = ucs4_to_ucs2_lf(utf32, -1, utf16, (int)n, lf_conv);
-        } else {
-            int count = (int)strlen(ldt);
-
-            utf32 = (unsigned int *)malloc((count + 1) * sizeof(unsigned int));
-            if ((l = msgtowstr(ldt, (wchar_t *)utf32, count + 1)) >= 0) {
-                l = ucs4_to_ucs2_lf(utf32, -1, utf16, (int)n, lf_conv);
-            }
-            free(utf32);
-        }
-        if (midbuf) {
-            free(*wcsbuf);
-            *wcsbuf = NULL;
-        }
-    }
-#endif /* __WCS_ISO10646__ */
-#ifdef __CHAR16_UTF_16__
-    if (use_c16) {
-        l = mbstoc16_lf((char16_t *)utf16, ldt, n, lf_conv);
-    }
-#endif /* __CHAR16_UTF_16__ */
-
-    return l;
-}
-
-SQLLEN locale_to_sqlwchar(SQLWCHAR *utf16, const char *ldt, size_t n,
-                          BOOL lf_conv) {
-    return bindcol_hybrid_exec(utf16, ldt, n, lf_conv, NULL);
-}
-
-//
-//	SQLBindCol	localize case
-//		UTF-8 => the current locale
-//
-SQLLEN bindcol_localize_estimate(const char *utf8dt, BOOL lf_conv,
-                                 char **wcsbuf) {
-    UNUSED(utf8dt);
-    SQLLEN l = (-2);
-    char *convalc = NULL;
-
-    get_convtype();
-    MYLOG(OPENSEARCH_DEBUG, " lf_conv=%d\n", lf_conv);
-#if defined(__WCS_ISO10646__)
-    if (use_wcs) {
-        wchar_t *wcsalc = NULL;
-
-        l = utf8_to_wcs_lf(utf8dt, -1, lf_conv, NULL, 0, FALSE);
-        wcsalc = (wchar_t *)malloc(sizeof(wchar_t) * (l + 1));
-        convalc = (char *)wcsalc;
-        l = utf8_to_wcs_lf(utf8dt, -1, lf_conv, wcsalc, l + 1, FALSE);
-        l = wstrtomsg(wcsalc, NULL, 0);
-    }
-#endif /* __WCS_ISO10646__ */
-#ifdef __CHAR16_UTF_16__
-    if (use_c16) {
-        SQLWCHAR *wcsalc = NULL;
-
-        l = utf8_to_ucs2_lf(utf8dt, -1, lf_conv, (SQLWCHAR *)NULL, 0, FALSE);
-        wcsalc = (SQLWCHAR *)malloc(sizeof(SQLWCHAR) * (l + 1));
-        convalc = (char *)wcsalc;
-        l = utf8_to_ucs2_lf(utf8dt, -1, lf_conv, wcsalc, l + 1, FALSE);
-        l = c16tombs(NULL, (char16_t *)wcsalc, 0);
-    }
-#endif /* __CHAR16_UTF_16__ */
-    if (l < 0 && NULL != convalc)
-        free(convalc);
-    else if (NULL != convalc)
-        *wcsbuf = (char *)convalc;
-
-    MYLOG(OPENSEARCH_DEBUG, " return=" FORMAT_LEN "\n", l);
-    return l;
-}
-
-SQLLEN bindcol_localize_exec(char *ldt, size_t n, BOOL lf_conv, char **wcsbuf) {
-    UNUSED(ldt, lf_conv);
-    SQLLEN l = (-2);
-
-    get_convtype();
-    MYLOG(OPENSEARCH_DEBUG, " size=" FORMAT_SIZE_T "\n", n);
-#if defined(__WCS_ISO10646__)
-    if (use_wcs) {
-        wchar_t *wcsalc = (wchar_t *)*wcsbuf;
-
-        l = wstrtomsg(wcsalc, ldt, (int)n);
-    }
-#endif /* __WCS_ISO10646__ */
-#ifdef __CHAR16_UTF_16__
-    if (use_c16) {
-        char16_t *wcsalc = (char16_t *)*wcsbuf;
-
-        l = c16tombs(ldt, (char16_t *)wcsalc, n);
-    }
-#endif /* __CHAR16_UTF_16__ */
-    free(*wcsbuf);
-    *wcsbuf = NULL;
-
-    MYLOG(OPENSEARCH_DEBUG, " return=" FORMAT_LEN "\n", l);
-    return l;
-}
-
-#endif /* UNICODE_SUPPORT */
diff --git a/sql-odbc/src/vcpkg.json b/sql-odbc/src/vcpkg.json
deleted file mode 100644
index a5903fbb85..0000000000
--- a/sql-odbc/src/vcpkg.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "name": "sql-odbc",
-    "version-string": "1.1.0.1",
-    "dependencies": ["aws-sdk-cpp", "rapidjson", "zlib", "gtest", "curl"],
-    "builtin-baseline": "6ca56aeb457f033d344a7106cb3f9f1abf8f4e98",
-    "overrides": [
-        { "name": "aws-sdk-cpp", "version": "1.8.83#2" },
-        { "name": "rapidjson", "version": "2022-06-28#1" },
-        { "name": "zlib", "version": "1.2.12#1" },
-        { "name": "gtest", "version": "1.11.0" }
-    ]
-}
diff --git a/sql/build.gradle b/sql/build.gradle
index 13a7ceba53..d7509db099 100644
--- a/sql/build.gradle
+++ b/sql/build.gradle
@@ -27,6 +27,7 @@ plugins {
     id "io.freefair.lombok"
     id 'jacoco'
     id 'antlr'
+    id 'com.diffplug.spotless' version '6.22.0'
 }
 
 generateGrammarSource {
@@ -45,18 +46,16 @@ dependencies {
     antlr "org.antlr:antlr4:4.7.1"
 
     implementation "org.antlr:antlr4-runtime:4.7.1"
-    implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
-    implementation group: 'org.json', name: 'json', version:'20180813'
-    implementation group: 'org.springframework', name: 'spring-context', version: "${spring_version}"
-    implementation group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
+    implementation group: 'com.google.guava', name: 'guava', version: "${guava_version}"
+    implementation group: 'org.json', name: 'json', version:'20231013'
     implementation project(':common')
     implementation project(':core')
     api project(':protocol')
 
-    testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
+    testImplementation('org.junit.jupiter:junit-jupiter:5.9.3')
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.7.0'
     testImplementation(testFixtures(project(":core")))
 }
 
@@ -70,8 +69,8 @@ test {
 
 jacocoTestReport {
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required = true
+        xml.required = true
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {
diff --git a/sql/src/main/antlr/OpenSearchSQLIdentifierParser.g4 b/sql/src/main/antlr/OpenSearchSQLIdentifierParser.g4
deleted file mode 100644
index cd65e5066c..0000000000
--- a/sql/src/main/antlr/OpenSearchSQLIdentifierParser.g4
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
-MySQL (Positive Technologies) grammar
-The MIT License (MIT).
-Copyright (c) 2015-2017, Ivan Kochurkin (kvanttt@gmail.com), Positive Technologies.
-Copyright (c) 2017, Ivan Khudyashev (IHudyashov@ptsecurity.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-parser grammar OpenSearchSQLIdentifierParser;
-
-options { tokenVocab=OpenSearchSQLLexer; }
-
-
-//    Identifiers
-
-tableName
-    : qualifiedName
-    ;
-
-columnName
-    : qualifiedName
-    ;
-
-alias
-    : ident
-    ;
-
-qualifiedName
-    : ident (DOT ident)*
-    ;
-
-ident
-    : DOT? ID
-    | BACKTICK_QUOTE_ID
-    | keywordsCanBeId
-    ;
-
-keywordsCanBeId
-    : FULL
-    | FIELD | D | T | TS // OD SQL and ODBC special
-    | COUNT | SUM | AVG | MAX | MIN
-    | TIMESTAMP | DATE | TIME | DAYOFWEEK
-    | FIRST | LAST
-    | CURRENT_DATE | CURRENT_TIME | CURRENT_TIMESTAMP | LOCALTIME | LOCALTIMESTAMP | UTC_TIMESTAMP | UTC_DATE | UTC_TIME
-    | CURDATE | CURTIME | NOW
-    ;
diff --git a/sql/src/main/antlr/OpenSearchSQLLexer.g4 b/sql/src/main/antlr/OpenSearchSQLLexer.g4
index a359f48be3..ba7c5be85a 100644
--- a/sql/src/main/antlr/OpenSearchSQLLexer.g4
+++ b/sql/src/main/antlr/OpenSearchSQLLexer.g4
@@ -134,7 +134,6 @@ STDDEV_SAMP:                        'STDDEV_SAMP';
 SUBSTRING:                          'SUBSTRING';
 TRIM:                               'TRIM';
 
-
 // Keywords, but can be ID
 // Common Keywords, but can be ID
 
@@ -176,6 +175,7 @@ TABLES:                             'TABLES';
 ABS:                                'ABS';
 ACOS:                               'ACOS';
 ADD:                                'ADD';
+ADDTIME:                            'ADDTIME';
 ASCII:                              'ASCII';
 ASIN:                               'ASIN';
 ATAN:                               'ATAN';
@@ -200,20 +200,25 @@ DATE:                               'DATE';
 DATE_ADD:                           'DATE_ADD';
 DATE_FORMAT:                        'DATE_FORMAT';
 DATE_SUB:                           'DATE_SUB';
+DATEDIFF:                           'DATEDIFF';
 DAYNAME:                            'DAYNAME';
 DAYOFMONTH:                         'DAYOFMONTH';
 DAYOFWEEK:                          'DAYOFWEEK';
 DAYOFYEAR:                          'DAYOFYEAR';
 DEGREES:                            'DEGREES';
+DIVIDE:                             'DIVIDE';
 E:                                  'E';
 EXP:                                'EXP';
 EXPM1:                              'EXPM1';
+EXTRACT:                            'EXTRACT';
 FLOOR:                              'FLOOR';
 FROM_DAYS:                          'FROM_DAYS';
 FROM_UNIXTIME:                      'FROM_UNIXTIME';
+GET_FORMAT:                         'GET_FORMAT';
 IF:                                 'IF';
 IFNULL:                             'IFNULL';
 ISNULL:                             'ISNULL';
+LAST_DAY:                           'LAST_DAY';
 LENGTH:                             'LENGTH';
 LN:                                 'LN';
 LOCALTIME:                          'LOCALTIME';
@@ -244,23 +249,29 @@ RINT:                               'RINT';
 ROUND:                              'ROUND';
 RTRIM:                              'RTRIM';
 REVERSE:                            'REVERSE';
+SEC_TO_TIME:                        'SEC_TO_TIME';
 SIGN:                               'SIGN';
 SIGNUM:                             'SIGNUM';
 SIN:                                'SIN';
 SINH:                               'SINH';
 SQRT:                               'SQRT';
+STR_TO_DATE:                        'STR_TO_DATE';
 SUBDATE:                            'SUBDATE';
+SUBTIME:                            'SUBTIME';
 SUBTRACT:                           'SUBTRACT';
 SYSDATE:                            'SYSDATE';
 TAN:                                'TAN';
 TIME:                               'TIME';
+TIMEDIFF:                           'TIMEDIFF';
+TIME_FORMAT:                        'TIME_FORMAT';
 TIME_TO_SEC:                        'TIME_TO_SEC';
 TIMESTAMP:                          'TIMESTAMP';
 TRUNCATE:                           'TRUNCATE';
 TO_DAYS:                            'TO_DAYS';
-UTC_DATE:                           'UTC_DATE';
+TO_SECONDS:                         'TO_SECONDS';
 UNIX_TIMESTAMP:                     'UNIX_TIMESTAMP';
 UPPER:                              'UPPER';
+UTC_DATE:                           'UTC_DATE';
 UTC_TIME:                           'UTC_TIME';
 UTC_TIMESTAMP:                      'UTC_TIMESTAMP';
 
@@ -311,18 +322,26 @@ MULTI_MATCH:                        'MULTI_MATCH';
 MULTIMATCHQUERY:                    'MULTIMATCHQUERY';
 NESTED:                             'NESTED';
 PERCENTILES:                        'PERCENTILES';
+PERCENTILE:                         'PERCENTILE';
+PERCENTILE_APPROX:                  'PERCENTILE_APPROX';
 REGEXP_QUERY:                       'REGEXP_QUERY';
 REVERSE_NESTED:                     'REVERSE_NESTED';
 QUERY:                              'QUERY';
 RANGE:                              'RANGE';
 SCORE:                              'SCORE';
+SCOREQUERY:                         'SCOREQUERY';
+SCORE_QUERY:                        'SCORE_QUERY';
 SECOND_OF_MINUTE:                   'SECOND_OF_MINUTE';
 STATS:                              'STATS';
 TERM:                               'TERM';
 TERMS:                              'TERMS';
+TIMESTAMPADD:                       'TIMESTAMPADD';
+TIMESTAMPDIFF:                      'TIMESTAMPDIFF';
 TOPHITS:                            'TOPHITS';
 TYPEOF:                             'TYPEOF';
 WEEK_OF_YEAR:                       'WEEK_OF_YEAR';
+WEEKOFYEAR:                         'WEEKOFYEAR';
+WEEKDAY:                            'WEEKDAY';
 WILDCARDQUERY:                      'WILDCARDQUERY';
 WILDCARD_QUERY:                     'WILDCARD_QUERY';
 
@@ -332,6 +351,7 @@ STRCMP:                             'STRCMP';
 
 // DATE AND TIME FUNCTIONS
 ADDDATE:                            'ADDDATE';
+YEARWEEK:                           'YEARWEEK';
 
 // RELEVANCE FUNCTIONS AND PARAMETERS
 ALLOW_LEADING_WILDCARD:             'ALLOW_LEADING_WILDCARD';
@@ -379,7 +399,7 @@ MATCH_BOOL_PREFIX:                  'MATCH_BOOL_PREFIX';
 // Operators. Arithmetics
 
 STAR:                               '*';
-DIVIDE:                             '/';
+SLASH:                              '/';
 MODULE:                             '%';
 PLUS:                               '+';
 MINUS:                              '-';
@@ -448,7 +468,6 @@ BACKTICK_QUOTE_ID:                  BQUOTA_STRING;
 
 // Fragments for Literal primitives
 fragment EXPONENT_NUM_PART:         'E' [-+]? DEC_DIGIT+;
-fragment ID_LITERAL:                [@*A-Z]+?[*A-Z_\-0-9]*;
 fragment DQUOTA_STRING:             '"' ( '\\'. | '""' | ~('"'| '\\') )* '"';
 fragment SQUOTA_STRING:             '\'' ('\\'. | '\'\'' | ~('\'' | '\\'))* '\'';
 fragment BQUOTA_STRING:             '`' ( '\\'. | '``' | ~('`'|'\\'))* '`';
@@ -456,6 +475,10 @@ fragment HEX_DIGIT:                 [0-9A-F];
 fragment DEC_DIGIT:                 [0-9];
 fragment BIT_STRING_L:              'B' '\'' [01]+ '\'';
 
+// Identifiers cannot start with a single '_' since this an OpenSearch reserved
+// metadata field.  Two underscores (or more) is acceptable, such as '__field'.
+fragment ID_LITERAL:                ([@*A-Z_])+?[*A-Z_\-0-9]*;
+
 // Last tokens must generate Errors
 
 ERROR_RECOGNITION:                  .    -> channel(ERRORCHANNEL);
diff --git a/sql/src/main/antlr/OpenSearchSQLParser.g4 b/sql/src/main/antlr/OpenSearchSQLParser.g4
index 58d4be1813..4f67cc82c0 100644
--- a/sql/src/main/antlr/OpenSearchSQLParser.g4
+++ b/sql/src/main/antlr/OpenSearchSQLParser.g4
@@ -30,532 +30,820 @@ THE SOFTWARE.
 
 parser grammar OpenSearchSQLParser;
 
-import OpenSearchSQLIdentifierParser;
-
-options { tokenVocab=OpenSearchSQLLexer; }
-
 
+options { tokenVocab = OpenSearchSQLLexer; }
 // Top Level Description
 
 //    Root rule
+
 root
-    : sqlStatement? SEMI? EOF
-    ;
+   : sqlStatement? SEMI? EOF
+   ;
 
-//    Only SELECT
+// Only SELECT
 sqlStatement
-    : dmlStatement | adminStatement
-    ;
+   : dmlStatement
+   | adminStatement
+   ;
 
 dmlStatement
-    : selectStatement
-    ;
-
+   : selectStatement
+   ;
 
 // Data Manipulation Language
 
-//    Primary DML Statements
-
+// Primary DML Statements
 selectStatement
-    : querySpecification                                 #simpleSelect
-    ;
+   : querySpecification # simpleSelect
+   ;
 
 adminStatement
-    : showStatement
-    | describeStatement
-    ;
+   : showStatement
+   | describeStatement
+   ;
 
 showStatement
-    : SHOW TABLES tableFilter
-    ;
+   : SHOW TABLES tableFilter
+   ;
 
 describeStatement
-    : DESCRIBE TABLES tableFilter columnFilter?
-    ;
+   : DESCRIBE TABLES tableFilter columnFilter?
+   ;
 
 columnFilter
-    : COLUMNS LIKE showDescribePattern
-    ;
+   : COLUMNS LIKE showDescribePattern
+   ;
 
 tableFilter
-    : LIKE showDescribePattern
-    ;
+   : LIKE showDescribePattern
+   ;
 
 showDescribePattern
-    : oldID=compatibleID | stringLiteral
-    ;
+   : oldID=compatibleID | stringLiteral
+   ;
 
 compatibleID
-    : (MODULE | ID)+?
-    ;
+   : (MODULE | ID)+?
+   ;
 
-//    Select Statement's Details
 
+// Select Statement's Details
 querySpecification
-    : selectClause
-      fromClause?
-      limitClause?
-    ;
+   : selectClause fromClause? limitClause?
+   ;
 
 selectClause
-    : SELECT selectSpec? selectElements
-    ;
+   : SELECT selectSpec? selectElements
+   ;
 
 selectSpec
-    : (ALL | DISTINCT)
-    ;
+   : (ALL | DISTINCT)
+   ;
 
 selectElements
-    : (star=STAR | selectElement) (COMMA selectElement)*
-    ;
+   : (star = STAR | selectElement) (COMMA selectElement)*
+   ;
 
 selectElement
-    : expression (AS? alias)?
-    ;
+   : expression (AS? alias)?
+   ;
 
 fromClause
-    : FROM relation
-      (whereClause)?
-      (groupByClause)?
-      (havingClause)?
-      (orderByClause)? // Place it under FROM for now but actually not necessary ex. A UNION B ORDER BY
-    ;
+   : FROM relation (whereClause)? (groupByClause)? (havingClause)? (orderByClause)? // Place it under FROM for now but actually not necessary ex. A UNION B ORDER BY
+   
+   ;
 
 relation
-    : tableName (AS? alias)?                                                #tableAsRelation
-    | LR_BRACKET subquery=querySpecification RR_BRACKET AS? alias           #subqueryAsRelation
-    ;
+   : tableName (AS? alias)?                                         # tableAsRelation
+   | LR_BRACKET subquery = querySpecification RR_BRACKET AS? alias  # subqueryAsRelation
+   ;
 
 whereClause
-    : WHERE expression
-    ;
+   : WHERE expression
+   ;
 
 groupByClause
-    : GROUP BY groupByElements
-    ;
+   : GROUP BY groupByElements
+   ;
 
 groupByElements
-    : groupByElement (COMMA groupByElement)*
-    ;
+   : groupByElement (COMMA groupByElement)*
+   ;
 
 groupByElement
-    : expression
-    ;
+   : expression
+   ;
 
 havingClause
-    : HAVING expression
-    ;
+   : HAVING expression
+   ;
 
 orderByClause
-    : ORDER BY orderByElement (COMMA orderByElement)*
-    ;
+   : ORDER BY orderByElement (COMMA orderByElement)*
+   ;
 
 orderByElement
-    : expression order=(ASC | DESC)? (NULLS (FIRST | LAST))?
-    ;
+   : expression order = (ASC | DESC)? (NULLS (FIRST | LAST))?
+   ;
 
 limitClause
-    : LIMIT (offset=decimalLiteral COMMA)? limit=decimalLiteral
-    | LIMIT limit=decimalLiteral OFFSET offset=decimalLiteral
-    ;
+   : LIMIT (offset = decimalLiteral COMMA)? limit = decimalLiteral
+   | LIMIT limit = decimalLiteral OFFSET offset = decimalLiteral
+   ;
 
 //  Window Function's Details
 windowFunctionClause
-    : function=windowFunction overClause
-    ;
+   : function = windowFunction overClause
+   ;
 
 windowFunction
-    : functionName=(ROW_NUMBER | RANK | DENSE_RANK)
-        LR_BRACKET functionArgs? RR_BRACKET              #scalarWindowFunction
-    | aggregateFunction                                  #aggregateWindowFunction
-    ;
+   : functionName = (ROW_NUMBER | RANK | DENSE_RANK) LR_BRACKET functionArgs? RR_BRACKET    # scalarWindowFunction
+   | aggregateFunction                                                                      # aggregateWindowFunction
+   ;
 
 overClause
-    : OVER LR_BRACKET partitionByClause? orderByClause? RR_BRACKET
-    ;
+   : OVER LR_BRACKET partitionByClause? orderByClause? RR_BRACKET
+   ;
 
 partitionByClause
-    : PARTITION BY expression (COMMA expression)*
-    ;
-
-
-//    Literals
+   : PARTITION BY expression (COMMA expression)*
+   ;
 
+// Literals
 constant
-    : stringLiteral             #string
-    | sign? decimalLiteral      #signedDecimal
-    | sign? realLiteral         #signedReal
-    | booleanLiteral            #boolean
-    | datetimeLiteral           #datetime
-    | intervalLiteral           #interval
-    | nullLiteral               #null
-    // Doesn't support the following types for now
-    //| BIT_STRING
-    //| NOT? nullLiteral=(NULL_LITERAL | NULL_SPEC_LITERAL)
-    //| LEFT_BRACE dateType=(D | T | TS | DATE | TIME | TIMESTAMP) stringLiteral RIGHT_BRACE
-    ;
+   : stringLiteral          # string
+   | sign? decimalLiteral   # signedDecimal
+   | sign? realLiteral      # signedReal
+   | booleanLiteral         # boolean
+   | datetimeLiteral        # datetime
+   | intervalLiteral        # interval
+   | nullLiteral            # null
+   // Doesn't support the following types for now
+   //| BIT_STRING
+   //| NOT? nullLiteral=(NULL_LITERAL | NULL_SPEC_LITERAL)
+   ;
 
 decimalLiteral
-    : DECIMAL_LITERAL | ZERO_DECIMAL | ONE_DECIMAL | TWO_DECIMAL
-    ;
+   : DECIMAL_LITERAL
+   | ZERO_DECIMAL
+   | ONE_DECIMAL
+   | TWO_DECIMAL
+   ;
+
+numericLiteral
+   : decimalLiteral
+   | realLiteral
+   ;
 
 stringLiteral
-    : STRING_LITERAL
-    | DOUBLE_QUOTE_ID
-    ;
+   : STRING_LITERAL
+   | DOUBLE_QUOTE_ID
+   ;
 
 booleanLiteral
-    : TRUE | FALSE
-    ;
+   : TRUE
+   | FALSE
+   ;
 
 realLiteral
-    : REAL_LITERAL
-    ;
+   : REAL_LITERAL
+   ;
 
 sign
-    : PLUS | MINUS
-    ;
+   : PLUS
+   | MINUS
+   ;
 
 nullLiteral
-    : NULL_LITERAL
-    ;
+   : NULL_LITERAL
+   ;
 
 // Date and Time Literal, follow ANSI 92
 datetimeLiteral
-    : dateLiteral
-    | timeLiteral
-    | timestampLiteral
-    ;
+   : dateLiteral
+   | timeLiteral
+   | timestampLiteral
+   ;
 
 dateLiteral
-    : DATE date=stringLiteral
-    ;
+   : DATE date = stringLiteral
+   | LEFT_BRACE (DATE | D) date = stringLiteral RIGHT_BRACE
+   ;
 
 timeLiteral
-    : TIME time=stringLiteral
-    ;
+   : TIME time = stringLiteral
+   | LEFT_BRACE (TIME | T) time = stringLiteral RIGHT_BRACE
+   ;
 
 timestampLiteral
-    : TIMESTAMP timestamp=stringLiteral
-    ;
+   : TIMESTAMP timestamp = stringLiteral
+   | LEFT_BRACE (TIMESTAMP | TS) timestamp = stringLiteral RIGHT_BRACE
+   ;
 
 // Actually, these constants are shortcuts to the corresponding functions
 datetimeConstantLiteral
-    : CURRENT_DATE
-    | CURRENT_TIME
-    | CURRENT_TIMESTAMP
-    | DAY_OF_YEAR
-    | LOCALTIME
-    | LOCALTIMESTAMP
-    | MONTH_OF_YEAR
-    | UTC_TIMESTAMP
-    | UTC_DATE
-    | UTC_TIME
-    | WEEK_OF_YEAR
-    ;
+   : CURRENT_DATE
+   | CURRENT_TIME
+   | CURRENT_TIMESTAMP
+   | LOCALTIME
+   | LOCALTIMESTAMP
+   | UTC_TIMESTAMP
+   | UTC_DATE
+   | UTC_TIME
+   ;
 
 intervalLiteral
-    : INTERVAL expression intervalUnit
-    ;
+   : INTERVAL expression intervalUnit
+   ;
 
 intervalUnit
-    : MICROSECOND | SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR | SECOND_MICROSECOND
-    | MINUTE_MICROSECOND | MINUTE_SECOND | HOUR_MICROSECOND | HOUR_SECOND | HOUR_MINUTE | DAY_MICROSECOND
-    | DAY_SECOND | DAY_MINUTE | DAY_HOUR | YEAR_MONTH
-    ;
+   : MICROSECOND
+   | SECOND
+   | MINUTE
+   | HOUR
+   | DAY
+   | WEEK
+   | MONTH
+   | QUARTER
+   | YEAR
+   | SECOND_MICROSECOND
+   | MINUTE_MICROSECOND
+   | MINUTE_SECOND
+   | HOUR_MICROSECOND
+   | HOUR_SECOND
+   | HOUR_MINUTE
+   | DAY_MICROSECOND
+   | DAY_SECOND
+   | DAY_MINUTE
+   | DAY_HOUR
+   | YEAR_MONTH
+   ;
 
 // predicates
 
 // Simplified approach for expression
 expression
-    : NOT expression                                                #notExpression
-    | left=expression AND right=expression                          #andExpression
-    | left=expression OR right=expression                           #orExpression
-    | predicate                                                     #predicateExpression
-    ;
+   : NOT expression                             # notExpression
+   | left = expression AND right = expression   # andExpression
+   | left = expression OR right = expression    # orExpression
+   | predicate                                  # predicateExpression
+   ;
 
 predicate
-    : expressionAtom                                                #expressionAtomPredicate
-    | left=predicate comparisonOperator right=predicate             #binaryComparisonPredicate
-    | predicate IS nullNotnull                                      #isNullPredicate
-    | left=predicate NOT? LIKE right=predicate                      #likePredicate
-    | left=predicate REGEXP right=predicate                         #regexpPredicate
-    | predicate NOT? IN '(' expressions ')'                         #inPredicate
-    ;
+   : expressionAtom                                         # expressionAtomPredicate
+   | left = predicate comparisonOperator right = predicate  # binaryComparisonPredicate
+   | predicate IS nullNotnull                               # isNullPredicate
+   | predicate NOT? BETWEEN predicate AND predicate         # betweenPredicate
+   | left = predicate NOT? LIKE right = predicate           # likePredicate
+   | left = predicate REGEXP right = predicate              # regexpPredicate
+   | predicate NOT? IN '(' expressions ')'                  # inPredicate
+   ;
 
 expressions
-    : expression (',' expression)*
-    ;
+   : expression (',' expression)*
+   ;
 
 expressionAtom
-    : constant                                                      #constantExpressionAtom
-    | columnName                                                    #fullColumnNameExpressionAtom
-    | functionCall                                                  #functionCallExpressionAtom
-    | LR_BRACKET expression RR_BRACKET                              #nestedExpressionAtom
-    | left=expressionAtom mathOperator right=expressionAtom         #mathExpressionAtom
-    ;
-
-mathOperator
-    : PLUS | MINUS | STAR | DIVIDE | MODULE
-    ;
+   : constant                                                                               # constantExpressionAtom
+   | columnName                                                                             # fullColumnNameExpressionAtom
+   | functionCall                                                                           # functionCallExpressionAtom
+   | LR_BRACKET expression RR_BRACKET                                                       # nestedExpressionAtom
+   | left = expressionAtom mathOperator = (STAR | SLASH | MODULE) right = expressionAtom    # mathExpressionAtom
+   | left = expressionAtom mathOperator = (PLUS | MINUS) right = expressionAtom             # mathExpressionAtom
+   ;
 
 comparisonOperator
-    : '=' | '>' | '<' | '<' '=' | '>' '='
-    | '<' '>' | '!' '='
-    ;
+   : '='
+   | '>'
+   | '<'
+   | '<' '='
+   | '>' '='
+   | '<' '>'
+   | '!' '='
+   ;
 
 nullNotnull
-    : NOT? NULL_LITERAL
-    ;
+   : NOT? NULL_LITERAL
+   ;
 
 functionCall
-    : scalarFunctionName LR_BRACKET functionArgs RR_BRACKET         #scalarFunctionCall
-    | specificFunction                                              #specificFunctionCall
-    | windowFunctionClause                                          #windowFunctionCall
-    | aggregateFunction                                             #aggregateFunctionCall
-    | aggregateFunction (orderByClause)? filterClause               #filteredAggregationFunctionCall
-    | relevanceFunction                                             #relevanceFunctionCall
-    | highlightFunction                                             #highlightFunctionCall
-    | positionFunction                                              #positionFunctionCall
-    ;
-
+   : nestedFunctionName LR_BRACKET allTupleFields RR_BRACKET    # nestedAllFunctionCall
+   | scalarFunctionName LR_BRACKET functionArgs RR_BRACKET      # scalarFunctionCall
+   | specificFunction                                           # specificFunctionCall
+   | windowFunctionClause                                       # windowFunctionCall
+   | aggregateFunction                                          # aggregateFunctionCall
+   | aggregateFunction (orderByClause)? filterClause            # filteredAggregationFunctionCall
+   | scoreRelevanceFunction                                     # scoreRelevanceFunctionCall
+   | relevanceFunction                                          # relevanceFunctionCall
+   | highlightFunction                                          # highlightFunctionCall
+   | positionFunction                                           # positionFunctionCall
+   | extractFunction                                            # extractFunctionCall
+   | getFormatFunction                                          # getFormatFunctionCall
+   | timestampFunction                                          # timestampFunctionCall
+   ;
+
+timestampFunction
+   : timestampFunctionName LR_BRACKET simpleDateTimePart COMMA firstArg = functionArg COMMA secondArg = functionArg RR_BRACKET
+   ;
+
+timestampFunctionName
+   : TIMESTAMPADD
+   | TIMESTAMPDIFF
+   ;
+
+getFormatFunction
+   : GET_FORMAT LR_BRACKET getFormatType COMMA functionArg RR_BRACKET
+   ;
+
+getFormatType
+   : DATE
+   | DATETIME
+   | TIME
+   | TIMESTAMP
+   ;
+
+extractFunction
+   : EXTRACT LR_BRACKET datetimePart FROM functionArg RR_BRACKET
+   ;
+
+simpleDateTimePart
+   : MICROSECOND
+   | SECOND
+   | MINUTE
+   | HOUR
+   | DAY
+   | WEEK
+   | MONTH
+   | QUARTER
+   | YEAR
+   ;
+
+complexDateTimePart
+   : SECOND_MICROSECOND
+   | MINUTE_MICROSECOND
+   | MINUTE_SECOND
+   | HOUR_MICROSECOND
+   | HOUR_SECOND
+   | HOUR_MINUTE
+   | DAY_MICROSECOND
+   | DAY_SECOND
+   | DAY_MINUTE
+   | DAY_HOUR
+   | YEAR_MONTH
+   ;
+
+datetimePart
+   : simpleDateTimePart
+   | complexDateTimePart
+   ;
 
 highlightFunction
-    : HIGHLIGHT LR_BRACKET relevanceField (COMMA highlightArg)* RR_BRACKET
-    ;
+   : HIGHLIGHT LR_BRACKET relevanceField (COMMA highlightArg)* RR_BRACKET
+   ;
 
 positionFunction
-    : POSITION LR_BRACKET functionArg IN functionArg RR_BRACKET
-    ;
+   : POSITION LR_BRACKET functionArg IN functionArg RR_BRACKET
+   ;
+
+matchQueryAltSyntaxFunction
+   : field = relevanceField EQUAL_SYMBOL MATCH_QUERY LR_BRACKET query = relevanceQuery RR_BRACKET
+   ;
 
 scalarFunctionName
-    : mathematicalFunctionName
-    | dateTimeFunctionName
-    | textFunctionName
-    | flowControlFunctionName
-    | systemFunctionName
-    ;
+   : mathematicalFunctionName
+   | dateTimeFunctionName
+   | textFunctionName
+   | flowControlFunctionName
+   | systemFunctionName
+   | nestedFunctionName
+   ;
 
 specificFunction
-    : CASE expression caseFuncAlternative+
-        (ELSE elseArg=functionArg)? END                               #caseFunctionCall
-    | CASE caseFuncAlternative+
-        (ELSE elseArg=functionArg)? END                               #caseFunctionCall
-    | CAST '(' expression AS convertedDataType ')'                    #dataTypeFunctionCall
-    ;
+   : CASE expression caseFuncAlternative+ (ELSE elseArg = functionArg)? END     # caseFunctionCall
+   | CASE caseFuncAlternative+ (ELSE elseArg = functionArg)? END                # caseFunctionCall
+   | CAST '(' expression AS convertedDataType ')'                               # dataTypeFunctionCall
+   ;
 
 relevanceFunction
-    : noFieldRelevanceFunction | singleFieldRelevanceFunction | multiFieldRelevanceFunction
-    ;
+   : noFieldRelevanceFunction
+   | singleFieldRelevanceFunction
+   | multiFieldRelevanceFunction
+   | altSingleFieldRelevanceFunction
+   | altMultiFieldRelevanceFunction
+   ;
+
+scoreRelevanceFunction
+   : scoreRelevanceFunctionName LR_BRACKET relevanceFunction (COMMA weight = relevanceFieldWeight)? RR_BRACKET
+   ;
 
 noFieldRelevanceFunction
-    : noFieldRelevanceFunctionName LR_BRACKET query=relevanceQuery (COMMA relevanceArg)* RR_BRACKET
-    ;
+   : noFieldRelevanceFunctionName LR_BRACKET query = relevanceQuery (COMMA relevanceArg)* RR_BRACKET
+   ;
 
 // Field is a single column
 singleFieldRelevanceFunction
-    : singleFieldRelevanceFunctionName LR_BRACKET
-        field=relevanceField COMMA query=relevanceQuery
-        (COMMA relevanceArg)* RR_BRACKET;
+   : singleFieldRelevanceFunctionName LR_BRACKET field = relevanceField COMMA query = relevanceQuery (COMMA relevanceArg)* RR_BRACKET
+   ;
 
 // Field is a list of columns
 multiFieldRelevanceFunction
-    : multiFieldRelevanceFunctionName LR_BRACKET
-        LT_SQR_PRTHS field=relevanceFieldAndWeight (COMMA field=relevanceFieldAndWeight)* RT_SQR_PRTHS
-        COMMA query=relevanceQuery (COMMA relevanceArg)* RR_BRACKET
-    | multiFieldRelevanceFunctionName LR_BRACKET
-        alternateMultiMatchQuery  COMMA alternateMultiMatchField (COMMA relevanceArg)* RR_BRACKET
-    ;
+   : multiFieldRelevanceFunctionName LR_BRACKET LT_SQR_PRTHS field = relevanceFieldAndWeight (COMMA field = relevanceFieldAndWeight)* RT_SQR_PRTHS COMMA query = relevanceQuery (COMMA relevanceArg)* RR_BRACKET
+   | multiFieldRelevanceFunctionName LR_BRACKET alternateMultiMatchQuery COMMA alternateMultiMatchField (COMMA relevanceArg)* RR_BRACKET
+   ;
+
+altSingleFieldRelevanceFunction
+   : field = relevanceField EQUAL_SYMBOL altSyntaxFunctionName = altSingleFieldRelevanceFunctionName LR_BRACKET query = relevanceQuery (COMMA relevanceArg)* RR_BRACKET
+   ;
+
+altMultiFieldRelevanceFunction
+   : field = relevanceField EQUAL_SYMBOL altSyntaxFunctionName = altMultiFieldRelevanceFunctionName LR_BRACKET query = relevanceQuery (COMMA relevanceArg)* RR_BRACKET
+   ;
 
 convertedDataType
-    : typeName=DATE
-    | typeName=TIME
-    | typeName=TIMESTAMP
-    | typeName=INT
-    | typeName=INTEGER
-    | typeName=DOUBLE
-    | typeName=LONG
-    | typeName=FLOAT
-    | typeName=STRING
-    | typeName=BOOLEAN
-    ;
+   : typeName = DATE
+   | typeName = TIME
+   | typeName = TIMESTAMP
+   | typeName = INT
+   | typeName = INTEGER
+   | typeName = DOUBLE
+   | typeName = LONG
+   | typeName = FLOAT
+   | typeName = STRING
+   | typeName = BOOLEAN
+   ;
 
 caseFuncAlternative
-    : WHEN condition=functionArg
-      THEN consequent=functionArg
-    ;
+   : WHEN condition = functionArg THEN consequent = functionArg
+   ;
 
 aggregateFunction
-    : functionName=aggregationFunctionName LR_BRACKET functionArg RR_BRACKET
-                                                                    #regularAggregateFunctionCall
-    | COUNT LR_BRACKET STAR RR_BRACKET                              #countStarFunctionCall
-    | COUNT LR_BRACKET DISTINCT functionArg RR_BRACKET              #distinctCountFunctionCall
-    ;
+   : functionName = aggregationFunctionName LR_BRACKET functionArg RR_BRACKET   # regularAggregateFunctionCall
+   | COUNT LR_BRACKET STAR RR_BRACKET                                           # countStarFunctionCall
+   | COUNT LR_BRACKET DISTINCT functionArg RR_BRACKET                           # distinctCountFunctionCall
+   | percentileApproxFunction                                                   # percentileApproxFunctionCall
+   ;
+
+percentileApproxFunction
+   : (PERCENTILE | PERCENTILE_APPROX) LR_BRACKET aggField = functionArg
+       COMMA percent = numericLiteral (COMMA compression = numericLiteral)? RR_BRACKET
+   ;
 
 filterClause
-    : FILTER LR_BRACKET WHERE expression RR_BRACKET
-    ;
+   : FILTER LR_BRACKET WHERE expression RR_BRACKET
+   ;
 
 aggregationFunctionName
-    : AVG | COUNT | SUM | MIN | MAX | VAR_POP | VAR_SAMP | VARIANCE | STD | STDDEV | STDDEV_POP | STDDEV_SAMP
-    ;
+   : AVG
+   | COUNT
+   | SUM
+   | MIN
+   | MAX
+   | VAR_POP
+   | VAR_SAMP
+   | VARIANCE
+   | STD
+   | STDDEV
+   | STDDEV_POP
+   | STDDEV_SAMP
+   ;
 
 mathematicalFunctionName
-    : ABS | CBRT | CEIL | CEILING | CONV | CRC32 | E | EXP | FLOOR | LN | LOG | LOG10 | LOG2 | MOD | PI | POW | POWER
-    | RAND | ROUND | SIGN | SQRT | TRUNCATE
-    | trigonometricFunctionName
-    ;
+   : ABS
+   | CBRT
+   | CEIL
+   | CEILING
+   | CONV
+   | CRC32
+   | E
+   | EXP
+   | EXPM1
+   | FLOOR
+   | LN
+   | LOG
+   | LOG10
+   | LOG2
+   | MOD
+   | PI
+   | POW
+   | POWER
+   | RAND
+   | RINT
+   | ROUND
+   | SIGN
+   | SIGNUM
+   | SQRT
+   | TRUNCATE
+   | trigonometricFunctionName
+   | arithmeticFunctionName
+   ;
 
 trigonometricFunctionName
-    : ACOS | ASIN | ATAN | ATAN2 | COS | COT | DEGREES | RADIANS | SIN | TAN
-    ;
+   : ACOS
+   | ASIN
+   | ATAN
+   | ATAN2
+   | COS
+   | COSH
+   | COT
+   | DEGREES
+   | RADIANS
+   | SIN
+   | SINH
+   | TAN
+   ;
+
+arithmeticFunctionName
+   : ADD
+   | SUBTRACT
+   | MULTIPLY
+   | DIVIDE
+   | MOD
+   | MODULUS
+   ;
 
 dateTimeFunctionName
-    : datetimeConstantLiteral
-    | ADDDATE
-    | CONVERT_TZ
-    | CURDATE
-    | CURTIME
-    | DATE
-    | DATE_ADD
-    | DATE_FORMAT
-    | DATE_SUB
-    | DATETIME
-    | DAY
-    | DAYNAME
-    | DAYOFMONTH
-    | DAYOFWEEK
-    | DAYOFYEAR
-    | FROM_DAYS
-    | FROM_UNIXTIME
-    | HOUR
-    | MAKEDATE
-    | MAKETIME
-    | MICROSECOND
-    | MINUTE
-    | MONTH
-    | MONTHNAME
-    | NOW
-    | PERIOD_ADD
-    | PERIOD_DIFF
-    | QUARTER
-    | SECOND
-    | SUBDATE
-    | SYSDATE
-    | TIME
-    | TIME_TO_SEC
-    | TIMESTAMP
-    | TO_DAYS
-    | UNIX_TIMESTAMP
-    | WEEK
-    | YEAR
-    ;
+   : datetimeConstantLiteral
+   | ADDDATE
+   | ADDTIME
+   | CONVERT_TZ
+   | CURDATE
+   | CURTIME
+   | DATE
+   | DATE_ADD
+   | DATE_FORMAT
+   | DATE_SUB
+   | DATEDIFF
+   | DATETIME
+   | DAY
+   | DAYNAME
+   | DAYOFMONTH
+   | DAY_OF_MONTH
+   | DAYOFWEEK
+   | DAYOFYEAR
+   | DAY_OF_YEAR
+   | DAY_OF_WEEK
+   | FROM_DAYS
+   | FROM_UNIXTIME
+   | HOUR
+   | HOUR_OF_DAY
+   | LAST_DAY
+   | MAKEDATE
+   | MAKETIME
+   | MICROSECOND
+   | MINUTE
+   | MINUTE_OF_DAY
+   | MINUTE_OF_HOUR
+   | MONTH
+   | MONTHNAME
+   | MONTH_OF_YEAR
+   | NOW
+   | PERIOD_ADD
+   | PERIOD_DIFF
+   | QUARTER
+   | SEC_TO_TIME
+   | SECOND
+   | SECOND_OF_MINUTE
+   | SUBDATE
+   | SUBTIME
+   | SYSDATE
+   | STR_TO_DATE
+   | TIME
+   | TIME_FORMAT
+   | TIME_TO_SEC
+   | TIMEDIFF
+   | TIMESTAMP
+   | TO_DAYS
+   | TO_SECONDS
+   | UNIX_TIMESTAMP
+   | WEEK
+   | WEEKDAY
+   | WEEK_OF_YEAR
+   | WEEKOFYEAR
+   | YEAR
+   | YEARWEEK
+   ;
 
 textFunctionName
-    : SUBSTR | SUBSTRING | TRIM | LTRIM | RTRIM | LOWER | UPPER
-    | CONCAT | CONCAT_WS | SUBSTR | LENGTH | STRCMP | RIGHT | LEFT
-    | ASCII | LOCATE | REPLACE | REVERSE
-    ;
+   : SUBSTR
+   | SUBSTRING
+   | TRIM
+   | LTRIM
+   | RTRIM
+   | LOWER
+   | UPPER
+   | CONCAT
+   | CONCAT_WS
+   | SUBSTR
+   | LENGTH
+   | STRCMP
+   | RIGHT
+   | LEFT
+   | ASCII
+   | LOCATE
+   | REPLACE
+   | REVERSE
+   ;
 
 flowControlFunctionName
-    : IF | IFNULL | NULLIF | ISNULL
-    ;
+   : IF
+   | IFNULL
+   | NULLIF
+   | ISNULL
+   ;
 
 noFieldRelevanceFunctionName
-    : QUERY
-    ;
+   : QUERY
+   ;
 
 systemFunctionName
-    : TYPEOF
-    ;
+   : TYPEOF
+   ;
+
+nestedFunctionName
+   : NESTED
+   ;
+
+scoreRelevanceFunctionName
+   : SCORE
+   | SCOREQUERY
+   | SCORE_QUERY
+   ;
 
 singleFieldRelevanceFunctionName
-    : MATCH | MATCHQUERY | MATCH_QUERY
-    | MATCH_PHRASE | MATCHPHRASE | MATCHPHRASEQUERY
-    | MATCH_BOOL_PREFIX | MATCH_PHRASE_PREFIX
-    | WILDCARD_QUERY | WILDCARDQUERY
-    ;
+   : MATCH
+   | MATCHQUERY
+   | MATCH_QUERY
+   | MATCH_PHRASE
+   | MATCHPHRASE
+   | MATCHPHRASEQUERY
+   | MATCH_BOOL_PREFIX
+   | MATCH_PHRASE_PREFIX
+   | WILDCARD_QUERY
+   | WILDCARDQUERY
+   ;
 
 multiFieldRelevanceFunctionName
-    : MULTI_MATCH
-    | MULTIMATCH
-    | MULTIMATCHQUERY
-    | SIMPLE_QUERY_STRING
-    | QUERY_STRING
-    ;
+   : MULTI_MATCH
+   | MULTIMATCH
+   | MULTIMATCHQUERY
+   | SIMPLE_QUERY_STRING
+   | QUERY_STRING
+   ;
+
+altSingleFieldRelevanceFunctionName
+   : MATCH_QUERY
+   | MATCHQUERY
+   | MATCH_PHRASE
+   | MATCHPHRASE
+   ;
+
+altMultiFieldRelevanceFunctionName
+   : MULTI_MATCH
+   | MULTIMATCH
+   ;
 
 functionArgs
-    : (functionArg (COMMA functionArg)*)?
-    ;
+   : (functionArg (COMMA functionArg)*)?
+   ;
 
 functionArg
-    : expression
-    ;
+   : expression
+   ;
 
 relevanceArg
-    : relevanceArgName EQUAL_SYMBOL relevanceArgValue
-    | argName=stringLiteral EQUAL_SYMBOL argVal=relevanceArgValue
-    ;
+   : relevanceArgName EQUAL_SYMBOL relevanceArgValue
+   | argName = stringLiteral EQUAL_SYMBOL argVal = relevanceArgValue
+   ;
 
 highlightArg
-    : highlightArgName EQUAL_SYMBOL highlightArgValue
-    ;
+   : highlightArgName EQUAL_SYMBOL highlightArgValue
+   ;
 
 relevanceArgName
-    : ALLOW_LEADING_WILDCARD | ANALYZER | ANALYZE_WILDCARD | AUTO_GENERATE_SYNONYMS_PHRASE_QUERY
-    | BOOST | CASE_INSENSITIVE | CUTOFF_FREQUENCY | DEFAULT_FIELD | DEFAULT_OPERATOR | ENABLE_POSITION_INCREMENTS
-    | ESCAPE | FIELDS | FLAGS | FUZZINESS | FUZZY_MAX_EXPANSIONS | FUZZY_PREFIX_LENGTH
-    | FUZZY_REWRITE | FUZZY_TRANSPOSITIONS | LENIENT | LOW_FREQ_OPERATOR | MAX_DETERMINIZED_STATES
-    | MAX_EXPANSIONS | MINIMUM_SHOULD_MATCH | OPERATOR | PHRASE_SLOP | PREFIX_LENGTH
-    | QUOTE_ANALYZER | QUOTE_FIELD_SUFFIX | REWRITE | SLOP | TIE_BREAKER | TIME_ZONE | TYPE
-    | ZERO_TERMS_QUERY
-    ;
+   : ALLOW_LEADING_WILDCARD
+   | ANALYZER
+   | ANALYZE_WILDCARD
+   | AUTO_GENERATE_SYNONYMS_PHRASE_QUERY
+   | BOOST
+   | CASE_INSENSITIVE
+   | CUTOFF_FREQUENCY
+   | DEFAULT_FIELD
+   | DEFAULT_OPERATOR
+   | ENABLE_POSITION_INCREMENTS
+   | ESCAPE
+   | FIELDS
+   | FLAGS
+   | FUZZINESS
+   | FUZZY_MAX_EXPANSIONS
+   | FUZZY_PREFIX_LENGTH
+   | FUZZY_REWRITE
+   | FUZZY_TRANSPOSITIONS
+   | LENIENT
+   | LOW_FREQ_OPERATOR
+   | MAX_DETERMINIZED_STATES
+   | MAX_EXPANSIONS
+   | MINIMUM_SHOULD_MATCH
+   | OPERATOR
+   | PHRASE_SLOP
+   | PREFIX_LENGTH
+   | QUOTE_ANALYZER
+   | QUOTE_FIELD_SUFFIX
+   | REWRITE
+   | SLOP
+   | TIE_BREAKER
+   | TIME_ZONE
+   | TYPE
+   | ZERO_TERMS_QUERY
+   ;
 
 highlightArgName
-    : HIGHLIGHT_POST_TAGS | HIGHLIGHT_PRE_TAGS
-    ;
+   : HIGHLIGHT_POST_TAGS
+   | HIGHLIGHT_PRE_TAGS
+   ;
 
 relevanceFieldAndWeight
-    : field=relevanceField
-    | field=relevanceField weight=relevanceFieldWeight
-    | field=relevanceField BIT_XOR_OP weight=relevanceFieldWeight
-    ;
+   : field = relevanceField
+   | field = relevanceField weight = relevanceFieldWeight
+   | field = relevanceField BIT_XOR_OP weight = relevanceFieldWeight
+   ;
 
 relevanceFieldWeight
-    : realLiteral
-    | decimalLiteral
-    ;
+   : numericLiteral
+   ;
 
 relevanceField
-    : qualifiedName
-    | stringLiteral
-    ;
+   : qualifiedName
+   | stringLiteral
+   ;
 
 relevanceQuery
-    : relevanceArgValue
-    ;
+   : relevanceArgValue
+   ;
 
 relevanceArgValue
-    : qualifiedName
-    | constant
-    ;
+   : qualifiedName
+   | constant
+   ;
 
 highlightArgValue
-    : stringLiteral
-    ;
+   : stringLiteral
+   ;
 
 alternateMultiMatchArgName
-    : FIELDS
-    | QUERY
-    | stringLiteral
-    ;
+   : FIELDS
+   | QUERY
+   | stringLiteral
+   ;
 
 alternateMultiMatchQuery
-    : argName=alternateMultiMatchArgName EQUAL_SYMBOL argVal=relevanceArgValue
-    ;
+   : argName = alternateMultiMatchArgName EQUAL_SYMBOL argVal = relevanceArgValue
+   ;
 
 alternateMultiMatchField
-    : argName=alternateMultiMatchArgName EQUAL_SYMBOL argVal=relevanceArgValue
-    | argName=alternateMultiMatchArgName EQUAL_SYMBOL
-    LT_SQR_PRTHS argVal=relevanceArgValue RT_SQR_PRTHS
-    ;
+   : argName = alternateMultiMatchArgName EQUAL_SYMBOL argVal = relevanceArgValue
+   | argName = alternateMultiMatchArgName EQUAL_SYMBOL LT_SQR_PRTHS argVal = relevanceArgValue RT_SQR_PRTHS
+   ;
+
+// Identifiers
+tableName
+   : qualifiedName
+   ;
+
+columnName
+   : qualifiedName
+   ;
+
+allTupleFields
+   : path = qualifiedName DOT STAR
+   ;
+
+alias
+   : ident
+   ;
+
+qualifiedName
+   : ident (DOT ident)*
+   ;
+
+ident
+   : DOT? ID
+   | BACKTICK_QUOTE_ID
+   | keywordsCanBeId
+   | scalarFunctionName
+   ;
+
+keywordsCanBeId
+   : FULL
+   | FIELD
+   | D
+   | T
+   | TS // OD SQL and ODBC special
+   | COUNT
+   | SUM
+   | AVG
+   | MAX
+   | MIN
+   | FIRST
+   | LAST
+   | TYPE // TODO: Type is keyword required by relevancy function. Remove this when relevancy functions moved out
+   ;
diff --git a/sql/src/main/java/org/opensearch/sql/sql/SQLService.java b/sql/src/main/java/org/opensearch/sql/sql/SQLService.java
index 082a3e9581..e1ca778453 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/SQLService.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/SQLService.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
 import java.util.Optional;
@@ -21,9 +20,7 @@
 import org.opensearch.sql.sql.parser.AstBuilder;
 import org.opensearch.sql.sql.parser.AstStatementBuilder;
 
-/**
- * SQL service.
- */
+/** SQL service. */
 @RequiredArgsConstructor
 public class SQLService {
 
@@ -65,16 +62,36 @@ private AbstractPlan plan(
       SQLQueryRequest request,
       Optional<ResponseListener<QueryResponse>> queryListener,
       Optional<ResponseListener<ExplainResponse>> explainListener) {
-    // 1.Parse query and convert parse tree (CST) to abstract syntax tree (AST)
-    ParseTree cst = parser.parse(request.getQuery());
-    Statement statement =
-        cst.accept(
-            new AstStatementBuilder(
-                new AstBuilder(request.getQuery()),
-                AstStatementBuilder.StatementBuilderContext.builder()
-                    .isExplain(request.isExplainRequest())
-                    .build()));
+    boolean isExplainRequest = request.isExplainRequest();
+    if (request.getCursor().isPresent()) {
+      // Handle v2 cursor here -- legacy cursor was handled earlier.
+      if (isExplainRequest) {
+        throw new UnsupportedOperationException(
+            "Explain of a paged query continuation "
+                + "is not supported. Use `explain` for the initial query request.");
+      }
+      if (request.isCursorCloseRequest()) {
+        return queryExecutionFactory.createCloseCursor(
+            request.getCursor().get(), queryListener.orElse(null));
+      }
+      return queryExecutionFactory.create(
+          request.getCursor().get(),
+          isExplainRequest,
+          queryListener.orElse(null),
+          explainListener.orElse(null));
+    } else {
+      // 1.Parse query and convert parse tree (CST) to abstract syntax tree (AST)
+      ParseTree cst = parser.parse(request.getQuery());
+      Statement statement =
+          cst.accept(
+              new AstStatementBuilder(
+                  new AstBuilder(request.getQuery()),
+                  AstStatementBuilder.StatementBuilderContext.builder()
+                      .isExplain(isExplainRequest)
+                      .fetchSize(request.getFetchSize())
+                      .build()));
 
-    return queryExecutionFactory.create(statement, queryListener, explainListener);
+      return queryExecutionFactory.create(statement, queryListener, explainListener);
+    }
   }
 }
diff --git a/sql/src/main/java/org/opensearch/sql/sql/antlr/AnonymizerListener.java b/sql/src/main/java/org/opensearch/sql/sql/antlr/AnonymizerListener.java
new file mode 100644
index 0000000000..0d1b89f7a9
--- /dev/null
+++ b/sql/src/main/java/org/opensearch/sql/sql/antlr/AnonymizerListener.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql.antlr;
+
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.BACKTICK_QUOTE_ID;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.BOOLEAN;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.COMMA;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.DECIMAL_LITERAL;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.DOT;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.EQUAL_SYMBOL;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.EXCLAMATION_SYMBOL;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.FALSE;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.FROM;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.GREATER_SYMBOL;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.ID;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.LESS_SYMBOL;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.ONE_DECIMAL;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.REAL_LITERAL;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.STRING_LITERAL;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.TIMESTAMP;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.TRUE;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.TWO_DECIMAL;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer.ZERO_DECIMAL;
+
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ErrorNode;
+import org.antlr.v4.runtime.tree.ParseTreeListener;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+/** Parse tree listener for anonymizing SQL requests. */
+public class AnonymizerListener implements ParseTreeListener {
+  private String anonymizedQueryString = "";
+  private static final int NO_TYPE = -1;
+  private int previousType = NO_TYPE;
+
+  @Override
+  public void enterEveryRule(ParserRuleContext ctx) {}
+
+  @Override
+  public void exitEveryRule(ParserRuleContext ctx) {}
+
+  @Override
+  public void visitTerminal(TerminalNode node) {
+    // In these situations don't add a space prior:
+    // 1. a DOT between two identifiers
+    // 2. before a comma
+    // 3. between equal comparison tokens: e.g <=
+    // 4.  between alt not equals: <>
+    int token = node.getSymbol().getType();
+    boolean isDotIdentifiers = token == DOT || previousType == DOT;
+    boolean isComma = token == COMMA;
+    boolean isEqualComparison =
+        ((token == EQUAL_SYMBOL)
+            && (previousType == LESS_SYMBOL
+                || previousType == GREATER_SYMBOL
+                || previousType == EXCLAMATION_SYMBOL));
+    boolean isNotEqualComparisonAlternative =
+        previousType == LESS_SYMBOL && token == GREATER_SYMBOL;
+    if (!isDotIdentifiers && !isComma && !isEqualComparison && !isNotEqualComparisonAlternative) {
+      anonymizedQueryString += " ";
+    }
+
+    // anonymize the following tokens
+    switch (node.getSymbol().getType()) {
+      case ID:
+      case TIMESTAMP:
+      case BACKTICK_QUOTE_ID:
+        if (previousType == FROM) {
+          anonymizedQueryString += "table";
+        } else {
+          anonymizedQueryString += "identifier";
+        }
+        break;
+      case ZERO_DECIMAL:
+      case ONE_DECIMAL:
+      case TWO_DECIMAL:
+      case DECIMAL_LITERAL:
+      case REAL_LITERAL:
+        anonymizedQueryString += "number";
+        break;
+      case STRING_LITERAL:
+        anonymizedQueryString += "'string_literal'";
+        break;
+      case BOOLEAN:
+      case TRUE:
+      case FALSE:
+        anonymizedQueryString += "boolean_literal";
+        break;
+      case NO_TYPE:
+        // end of file
+        break;
+      default:
+        anonymizedQueryString += node.getText().toUpperCase();
+    }
+    previousType = node.getSymbol().getType();
+  }
+
+  @Override
+  public void visitErrorNode(ErrorNode node) {}
+
+  public String getAnonymizedQueryString() {
+    return "(" + anonymizedQueryString + ")";
+  }
+}
diff --git a/sql/src/main/java/org/opensearch/sql/sql/antlr/SQLSyntaxParser.java b/sql/src/main/java/org/opensearch/sql/sql/antlr/SQLSyntaxParser.java
index ee1e991bd4..d1a6adc236 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/antlr/SQLSyntaxParser.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/antlr/SQLSyntaxParser.java
@@ -3,33 +3,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.antlr;
 
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.opensearch.sql.common.antlr.CaseInsensitiveCharStream;
 import org.opensearch.sql.common.antlr.Parser;
 import org.opensearch.sql.common.antlr.SyntaxAnalysisErrorListener;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser;
 
-/**
- * SQL syntax parser which encapsulates an ANTLR parser.
- */
+/** SQL syntax parser which encapsulates an ANTLR parser. */
 public class SQLSyntaxParser implements Parser {
+  private static final Logger LOG = LogManager.getLogger(SQLSyntaxParser.class);
 
   /**
    * Parse a SQL query by ANTLR parser.
-   * @param query   a SQL query
-   * @return        parse tree root
+   *
+   * @param query a SQL query
+   * @return parse tree root
    */
   @Override
   public ParseTree parse(String query) {
+    AnonymizerListener anonymizer = new AnonymizerListener();
+
     OpenSearchSQLLexer lexer = new OpenSearchSQLLexer(new CaseInsensitiveCharStream(query));
     OpenSearchSQLParser parser = new OpenSearchSQLParser(new CommonTokenStream(lexer));
     parser.addErrorListener(new SyntaxAnalysisErrorListener());
-    return parser.root();
-  }
+    parser.addParseListener(anonymizer);
+
+    ParseTree parseTree = parser.root();
+    LOG.info("New Engine Request Query: {}", anonymizer.getAnonymizedQueryString());
 
+    return parseTree;
+  }
 }
diff --git a/sql/src/main/java/org/opensearch/sql/sql/config/SQLServiceConfig.java b/sql/src/main/java/org/opensearch/sql/sql/config/SQLServiceConfig.java
deleted file mode 100644
index 4287883c34..0000000000
--- a/sql/src/main/java/org/opensearch/sql/sql/config/SQLServiceConfig.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.opensearch.sql.sql.config;
-
-import org.opensearch.sql.executor.QueryManager;
-import org.opensearch.sql.executor.execution.QueryPlanFactory;
-import org.opensearch.sql.sql.SQLService;
-import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-/**
- * SQL service configuration for Spring container initialization.
- */
-@Configuration
-public class SQLServiceConfig {
-
-  @Autowired
-  private QueryManager queryManager;
-
-  @Autowired
-  private QueryPlanFactory queryExecutionFactory;
-
-  /**
-   * The registration of OpenSearch storage engine happens here because
-   * OpenSearchStorageEngine is dependent on NodeClient.
-   *
-   * @return SQLService.
-   */
-  @Bean
-  @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-  public SQLService sqlService() {
-    return new SQLService(
-        new SQLSyntaxParser(),
-        queryManager,
-        queryExecutionFactory);
-  }
-
-}
-
diff --git a/sql/src/main/java/org/opensearch/sql/sql/domain/SQLQueryRequest.java b/sql/src/main/java/org/opensearch/sql/sql/domain/SQLQueryRequest.java
index 508f80cee4..8b7c450a87 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/domain/SQLQueryRequest.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/domain/SQLQueryRequest.java
@@ -3,16 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.domain;
 
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableSet;
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -21,115 +19,129 @@
 import org.json.JSONObject;
 import org.opensearch.sql.protocol.response.format.Format;
 
-/**
- * SQL query request.
- */
+/** SQL query request. */
 @ToString
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class SQLQueryRequest {
-
-  private static final Set<String> SUPPORTED_FIELDS = ImmutableSet.of(
-      "query", "fetch_size", "parameters");
+  private static final String QUERY_FIELD_CURSOR = "cursor";
+  private static final Set<String> SUPPORTED_FIELDS =
+      Set.of("query", "fetch_size", "parameters", QUERY_FIELD_CURSOR);
   private static final String QUERY_PARAMS_FORMAT = "format";
   private static final String QUERY_PARAMS_SANITIZE = "sanitize";
+  private static final String QUERY_PARAMS_PRETTY = "pretty";
 
-  /**
-   * JSON payload in REST request.
-   */
+  /** JSON payload in REST request. */
   private final JSONObject jsonContent;
 
-  /**
-   * SQL query.
-   */
-  @Getter
-  private final String query;
+  /** SQL query. */
+  @Getter private final String query;
 
-  /**
-   * Request path.
-   */
+  /** Request path. */
   private final String path;
 
-  /**
-   * Request format.
-   */
+  /** Request format. */
   private final String format;
 
-  /**
-   * Request params.
-   */
+  /** Request params. */
   private Map<String, String> params = Collections.emptyMap();
 
   @Getter
   @Accessors(fluent = true)
   private boolean sanitize = true;
 
-  /**
-   * Constructor of SQLQueryRequest that passes request params.
-   */
+  @Getter
+  @Accessors(fluent = true)
+  private boolean pretty = false;
+
+  private String cursor;
+
+  /** Constructor of SQLQueryRequest that passes request params. */
   public SQLQueryRequest(
-      JSONObject jsonContent, String query, String path, Map<String, String> params) {
+      JSONObject jsonContent,
+      String query,
+      String path,
+      Map<String, String> params,
+      String cursor) {
     this.jsonContent = jsonContent;
     this.query = query;
     this.path = path;
     this.params = params;
     this.format = getFormat(params);
     this.sanitize = shouldSanitize(params);
+    this.pretty = shouldPretty(params);
+    this.cursor = cursor;
   }
 
   /**
-   * Pre-check if the request can be supported by meeting ALL the following criteria:
-   *  1.Only supported fields present in request body, ex. "filter" and "cursor" are not supported
-   *  2.No fetch_size or "fetch_size=0". In other word, it's not a cursor request
-   *  3.Response format is default or can be supported.
+   * Pre-check if the request can be supported by meeting ALL the following criteria: 1.Only
+   * supported fields present in request body, ex. "filter" and "cursor" are not supported
+   * 2.Response format is default or can be supported.
    *
-   * @return  true if supported.
+   * @return true if supported.
    */
   public boolean isSupported() {
-    return isOnlySupportedFieldInPayload()
-        && isFetchSizeZeroIfPresent()
-        && isSupportedFormat();
+    var noCursor = !isCursor();
+    var noQuery = query == null;
+    var noUnsupportedParams =
+        params.isEmpty() || (params.size() == 1 && params.containsKey(QUERY_PARAMS_FORMAT));
+    var noContent = jsonContent == null || jsonContent.isEmpty();
+
+    return ((!noCursor
+                && noQuery
+                && noUnsupportedParams
+                && noContent) // if cursor is given, but other things
+            || (noCursor && !noQuery)) // or if cursor is not given, but query
+        && isOnlySupportedFieldInPayload() // and request has supported fields only
+        && isSupportedFormat(); // and request is in supported format
+  }
+
+  private boolean isCursor() {
+    return cursor != null && !cursor.isEmpty();
   }
 
   /**
    * Check if request is to explain rather than execute the query.
-   * @return  true if it is a explain request
+   *
+   * @return true if it is an explain request
    */
   public boolean isExplainRequest() {
     return path.endsWith("/_explain");
   }
 
-  /**
-   * Decide on the formatter by the requested format.
-   */
+  public boolean isCursorCloseRequest() {
+    return path.endsWith("/close");
+  }
+
+  /** Decide on the formatter by the requested format. */
   public Format format() {
     Optional<Format> optionalFormat = Format.of(format);
     if (optionalFormat.isPresent()) {
       return optionalFormat.get();
     } else {
       throw new IllegalArgumentException(
-          String.format(Locale.ROOT,"response in %s format is not supported.", format));
+          String.format(Locale.ROOT, "response in %s format is not supported.", format));
     }
   }
 
   private boolean isOnlySupportedFieldInPayload() {
-    return SUPPORTED_FIELDS.containsAll(jsonContent.keySet());
+    return jsonContent == null || SUPPORTED_FIELDS.containsAll(jsonContent.keySet());
+  }
+
+  public Optional<String> getCursor() {
+    return Optional.ofNullable(cursor);
   }
 
-  private boolean isFetchSizeZeroIfPresent() {
-    return (jsonContent.optInt("fetch_size") == 0);
+  public int getFetchSize() {
+    return jsonContent.optInt("fetch_size");
   }
 
   private boolean isSupportedFormat() {
-    return Strings.isNullOrEmpty(format) || "jdbc".equalsIgnoreCase(format)
-        || "csv".equalsIgnoreCase(format) || "raw".equalsIgnoreCase(format);
+    return Stream.of("csv", "jdbc", "raw").anyMatch(format::equalsIgnoreCase);
   }
 
   private String getFormat(Map<String, String> params) {
-    if (params.containsKey(QUERY_PARAMS_FORMAT)) {
-      return params.get(QUERY_PARAMS_FORMAT);
-    }
-    return "jdbc";
+    return params.getOrDefault(QUERY_PARAMS_FORMAT, "jdbc");
   }
 
   private boolean shouldSanitize(Map<String, String> params) {
@@ -139,4 +151,10 @@ private boolean shouldSanitize(Map<String, String> params) {
     return true;
   }
 
+  private boolean shouldPretty(Map<String, String> params) {
+    if (params.containsKey(QUERY_PARAMS_PRETTY)) {
+      return Boolean.parseBoolean(params.get(QUERY_PARAMS_PRETTY));
+    }
+    return false;
+  }
 }
diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/AstAggregationBuilder.java b/sql/src/main/java/org/opensearch/sql/sql/parser/AstAggregationBuilder.java
index bd4464d00e..e46147b7a3 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/parser/AstAggregationBuilder.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/parser/AstAggregationBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
 import static java.util.Collections.emptyList;
@@ -27,6 +26,8 @@
 import org.opensearch.sql.sql.parser.context.QuerySpecification;
 
 /**
+ *
+ *
  * <pre>SelectExpressionAnalyzerTest
  * AST aggregation builder that builds AST aggregation node for the following scenarios:
  *
@@ -59,9 +60,7 @@
 @RequiredArgsConstructor
 public class AstAggregationBuilder extends OpenSearchSQLParserBaseVisitor<UnresolvedPlan> {
 
-  /**
-   * Query specification that contains info collected beforehand.
-   */
+  /** Query specification that contains info collected beforehand. */
   private final QuerySpecification querySpec;
 
   @Override
@@ -78,10 +77,7 @@ public UnresolvedPlan visit(ParseTree groupByClause) {
 
   private UnresolvedPlan buildExplicitAggregation() {
     List<UnresolvedExpression> groupByItems = replaceGroupByItemIfAliasOrOrdinal();
-    return new Aggregation(
-        new ArrayList<>(querySpec.getAggregators()),
-        emptyList(),
-        groupByItems);
+    return new Aggregation(new ArrayList<>(querySpec.getAggregators()), emptyList(), groupByItems);
   }
 
   private UnresolvedPlan buildImplicitAggregation() {
@@ -89,33 +85,32 @@ private UnresolvedPlan buildImplicitAggregation() {
 
     if (invalidSelectItem.isPresent()) {
       // Report semantic error to avoid fall back to old engine again
-      throw new SemanticCheckException(StringUtils.format(
-          "Explicit GROUP BY clause is required because expression [%s] "
-              + "contains non-aggregated column", invalidSelectItem.get()));
+      throw new SemanticCheckException(
+          StringUtils.format(
+              "Explicit GROUP BY clause is required because expression [%s] "
+                  + "contains non-aggregated column",
+              invalidSelectItem.get()));
     }
 
     return new Aggregation(
-        new ArrayList<>(querySpec.getAggregators()),
-        emptyList(),
-        querySpec.getGroupByItems());
+        new ArrayList<>(querySpec.getAggregators()), emptyList(), querySpec.getGroupByItems());
   }
 
   private List<UnresolvedExpression> replaceGroupByItemIfAliasOrOrdinal() {
-    return querySpec.getGroupByItems()
-                    .stream()
-                    .map(querySpec::replaceIfAliasOrOrdinal)
-                    .map(expr -> new Alias(expr.toString(), expr))
-                    .collect(Collectors.toList());
+    return querySpec.getGroupByItems().stream()
+        .map(querySpec::replaceIfAliasOrOrdinal)
+        .map(expr -> new Alias(expr.toString(), expr))
+        .collect(Collectors.toList());
   }
 
   /**
-   * Find non-aggregate item in SELECT clause. Note that literal is special which is not required
-   * to be applied by aggregate function.
+   * Find non-aggregate item in SELECT clause. Note that literal is special which is not required to
+   * be applied by aggregate function.
    */
   private Optional<UnresolvedExpression> findNonAggregatedItemInSelect() {
     return querySpec.getSelectItems().stream()
-                                     .filter(this::isNonAggregateOrLiteralExpression)
-                                     .findFirst();
+        .filter(this::isNonAggregateOrLiteralExpression)
+        .findFirst();
   }
 
   private boolean isAggregatorNotFoundAnywhere() {
@@ -132,8 +127,7 @@ private boolean isNonAggregateOrLiteralExpression(UnresolvedExpression expr) {
     }
 
     List<? extends Node> children = expr.getChild();
-    return children.stream().anyMatch(child ->
-        isNonAggregateOrLiteralExpression((UnresolvedExpression) child));
+    return children.stream()
+        .anyMatch(child -> isNonAggregateOrLiteralExpression((UnresolvedExpression) child));
   }
-
 }
diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/AstBuilder.java b/sql/src/main/java/org/opensearch/sql/sql/parser/AstBuilder.java
index 6edce6eb15..ab96f16263 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/parser/AstBuilder.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/parser/AstBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
 import static java.util.Collections.emptyList;
@@ -37,27 +36,24 @@
 import org.opensearch.sql.ast.tree.Values;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.common.utils.StringUtils;
+import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.QuerySpecificationContext;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParserBaseVisitor;
 import org.opensearch.sql.sql.parser.context.ParsingContext;
 
-/**
- * Abstract syntax tree (AST) builder.
- */
+/** Abstract syntax tree (AST) builder. */
 @RequiredArgsConstructor
 public class AstBuilder extends OpenSearchSQLParserBaseVisitor<UnresolvedPlan> {
 
   private final AstExpressionBuilder expressionBuilder = new AstExpressionBuilder();
 
-  /**
-   * Parsing context stack that contains context for current query parsing.
-   */
+  /** Parsing context stack that contains context for current query parsing. */
   private final ParsingContext context = new ParsingContext();
 
   /**
-   * SQL query to get original token text. This is necessary because token.getText() returns
-   * text without whitespaces or other characters discarded by lexer.
+   * SQL query to get original token text. This is necessary because token.getText() returns text
+   * without whitespaces or other characters discarded by lexer.
    */
   private final String query;
 
@@ -90,8 +86,7 @@ public UnresolvedPlan visitQuerySpecification(QuerySpecificationContext queryCon
 
     if (queryContext.fromClause() == null) {
       Optional<UnresolvedExpression> allFields =
-          project.getProjectList().stream().filter(node -> node instanceof AllFields)
-              .findFirst();
+          project.getProjectList().stream().filter(node -> node instanceof AllFields).findFirst();
       if (allFields.isPresent()) {
         throw new SyntaxCheckException("No FROM clause found for select all");
       }
@@ -118,9 +113,8 @@ public UnresolvedPlan visitQuerySpecification(QuerySpecificationContext queryCon
 
   @Override
   public UnresolvedPlan visitSelectClause(SelectClauseContext ctx) {
-    ImmutableList.Builder<UnresolvedExpression> builder =
-        new ImmutableList.Builder<>();
-    if (ctx.selectElements().star != null) { //TODO: project operator should be required?
+    ImmutableList.Builder<UnresolvedExpression> builder = new ImmutableList.Builder<>();
+    if (ctx.selectElements().star != null) { // TODO: project operator should be required?
       builder.add(AllFields.of());
     }
     ctx.selectElements().selectElement().forEach(field -> builder.add(visitSelectItem(field)));
@@ -131,8 +125,7 @@ public UnresolvedPlan visitSelectClause(SelectClauseContext ctx) {
   public UnresolvedPlan visitLimitClause(OpenSearchSQLParser.LimitClauseContext ctx) {
     return new Limit(
         Integer.parseInt(ctx.limit.getText()),
-        ctx.offset == null ? 0 : Integer.parseInt(ctx.offset.getText())
-    );
+        ctx.offset == null ? 0 : Integer.parseInt(ctx.offset.getText()));
   }
 
   @Override
@@ -151,6 +144,8 @@ public UnresolvedPlan visitFromClause(FromClauseContext ctx) {
     }
 
     if (ctx.havingClause() != null) {
+      UnresolvedPlan havingPlan = visit(ctx.havingClause());
+      verifySupportsCondition(((Filter) havingPlan).getCondition());
       result = visit(ctx.havingClause()).attach(result);
     }
 
@@ -161,16 +156,34 @@ public UnresolvedPlan visitFromClause(FromClauseContext ctx) {
     return result;
   }
 
+  /**
+   * Ensure NESTED function is not used in HAVING clause and fallback to legacy engine. Can remove
+   * when support is added for NESTED function in HAVING clause.
+   *
+   * @param func : Function in HAVING clause
+   */
+  private void verifySupportsCondition(UnresolvedExpression func) {
+    if (func instanceof Function) {
+      if (((Function) func).getFuncName().equalsIgnoreCase(BuiltinFunctionName.NESTED.name())) {
+        throw new SyntaxCheckException(
+            "Falling back to legacy engine. Nested function is not supported in the HAVING"
+                + " clause.");
+      }
+      ((Function) func).getFuncArgs().stream().forEach(e -> verifySupportsCondition(e));
+    }
+  }
+
   @Override
   public UnresolvedPlan visitTableAsRelation(TableAsRelationContext ctx) {
-    String tableAlias = (ctx.alias() == null) ? null
-        : StringUtils.unquoteIdentifier(ctx.alias().getText());
+    String tableAlias =
+        (ctx.alias() == null) ? null : StringUtils.unquoteIdentifier(ctx.alias().getText());
     return new Relation(visitAstExpression(ctx.tableName()), tableAlias);
   }
 
   @Override
   public UnresolvedPlan visitSubqueryAsRelation(SubqueryAsRelationContext ctx) {
-    return new RelationSubquery(visit(ctx.subquery), ctx.alias().getText());
+    String subqueryAlias = StringUtils.unquoteIdentifier(ctx.alias().getText());
+    return new RelationSubquery(visit(ctx.subquery), subqueryAlias);
   }
 
   @Override
@@ -204,5 +217,4 @@ private UnresolvedExpression visitSelectItem(SelectElementContext ctx) {
       return new Alias(name, expr, alias);
     }
   }
-
 }
diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java b/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java
index bae22595ca..59de306966 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java
@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
+import static org.opensearch.sql.ast.dsl.AstDSL.between;
+import static org.opensearch.sql.ast.dsl.AstDSL.not;
 import static org.opensearch.sql.ast.dsl.AstDSL.qualifiedName;
 import static org.opensearch.sql.ast.dsl.AstDSL.stringLiteral;
 import static org.opensearch.sql.expression.function.BuiltinFunctionName.IS_NOT_NULL;
@@ -14,6 +15,10 @@
 import static org.opensearch.sql.expression.function.BuiltinFunctionName.NOT_LIKE;
 import static org.opensearch.sql.expression.function.BuiltinFunctionName.POSITION;
 import static org.opensearch.sql.expression.function.BuiltinFunctionName.REGEXP;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AltMultiFieldRelevanceFunctionContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AltSingleFieldRelevanceFunctionContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AlternateMultiMatchFieldContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.BetweenPredicateContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.BinaryComparisonPredicateContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.BooleanContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.CaseFuncAlternativeContext;
@@ -24,18 +29,31 @@
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.DataTypeFunctionCallContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.DateLiteralContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.DistinctCountFunctionCallContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.ExtractFunctionCallContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.FilterClauseContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.FilteredAggregationFunctionCallContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.FunctionArgContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.GetFormatFunctionCallContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.HighlightFunctionCallContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.InPredicateContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.IsNullPredicateContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.LikePredicateContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.MathExpressionAtomContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.MultiFieldRelevanceFunctionContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.NestedAllFunctionCallContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.NoFieldRelevanceFunctionContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.NotExpressionContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.NullLiteralContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.OverClauseContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.PositionFunctionContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.QualifiedNameContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.RegexpPredicateContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.RegularAggregateFunctionCallContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.RelevanceArgContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.RelevanceFieldAndWeightContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.ScalarFunctionCallContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.ScalarWindowFunctionContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.ScoreRelevanceFunctionContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.ShowDescribePatternContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.SignedDecimalContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.SignedRealContext;
@@ -44,6 +62,7 @@
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.StringLiteralContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.TableFilterContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.TimeLiteralContext;
+import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.TimestampFunctionCallContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.TimestampLiteralContext;
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.WindowFunctionClauseContext;
 import static org.opensearch.sql.sql.parser.ParserUtils.createSortOption;
@@ -60,29 +79,12 @@
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.ast.dsl.AstDSL;
-import org.opensearch.sql.ast.expression.AggregateFunction;
-import org.opensearch.sql.ast.expression.AllFields;
-import org.opensearch.sql.ast.expression.And;
-import org.opensearch.sql.ast.expression.Case;
-import org.opensearch.sql.ast.expression.Cast;
-import org.opensearch.sql.ast.expression.DataType;
-import org.opensearch.sql.ast.expression.Function;
-import org.opensearch.sql.ast.expression.HighlightFunction;
-import org.opensearch.sql.ast.expression.Interval;
-import org.opensearch.sql.ast.expression.IntervalUnit;
-import org.opensearch.sql.ast.expression.Literal;
-import org.opensearch.sql.ast.expression.Not;
-import org.opensearch.sql.ast.expression.Or;
-import org.opensearch.sql.ast.expression.QualifiedName;
-import org.opensearch.sql.ast.expression.RelevanceFieldList;
-import org.opensearch.sql.ast.expression.UnresolvedArgument;
-import org.opensearch.sql.ast.expression.UnresolvedExpression;
-import org.opensearch.sql.ast.expression.When;
-import org.opensearch.sql.ast.expression.WindowFunction;
+import org.opensearch.sql.ast.expression.*;
 import org.opensearch.sql.ast.tree.Sort.SortOption;
 import org.opensearch.sql.common.utils.StringUtils;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser;
+import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AlternateMultiMatchQueryContext;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AndExpressionContext;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.ColumnNameContext;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.IdentContext;
@@ -92,9 +94,7 @@
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.TableNameContext;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParserBaseVisitor;
 
-/**
- * Expression builder to parse text to expression in AST.
- */
+/** Expression builder to parse text to expression in AST. */
 public class AstExpressionBuilder extends OpenSearchSQLParserBaseVisitor<UnresolvedExpression> {
 
   @Override
@@ -120,9 +120,7 @@ public UnresolvedExpression visitQualifiedName(QualifiedNameContext ctx) {
   @Override
   public UnresolvedExpression visitMathExpressionAtom(MathExpressionAtomContext ctx) {
     return new Function(
-        ctx.mathOperator().getText(),
-        Arrays.asList(visit(ctx.left), visit(ctx.right))
-    );
+        ctx.mathOperator.getText(), Arrays.asList(visit(ctx.left), visit(ctx.right)));
   }
 
   @Override
@@ -130,32 +128,49 @@ public UnresolvedExpression visitNestedExpressionAtom(NestedExpressionAtomContex
     return visit(ctx.expression()); // Discard parenthesis around
   }
 
+  @Override
+  public UnresolvedExpression visitNestedAllFunctionCall(NestedAllFunctionCallContext ctx) {
+    return new NestedAllTupleFields(visitQualifiedName(ctx.allTupleFields().path).toString());
+  }
+
   @Override
   public UnresolvedExpression visitScalarFunctionCall(ScalarFunctionCallContext ctx) {
     return buildFunction(ctx.scalarFunctionName().getText(), ctx.functionArgs().functionArg());
   }
 
   @Override
-  public UnresolvedExpression visitHighlightFunctionCall(
-      OpenSearchSQLParser.HighlightFunctionCallContext ctx) {
+  public UnresolvedExpression visitGetFormatFunctionCall(GetFormatFunctionCallContext ctx) {
+    return new Function(
+        ctx.getFormatFunction().GET_FORMAT().toString(), getFormatFunctionArguments(ctx));
+  }
+
+  @Override
+  public UnresolvedExpression visitHighlightFunctionCall(HighlightFunctionCallContext ctx) {
     ImmutableMap.Builder<String, Literal> builder = ImmutableMap.builder();
-    ctx.highlightFunction().highlightArg().forEach(v -> builder.put(
-        v.highlightArgName().getText().toLowerCase(),
-        new Literal(StringUtils.unquoteText(v.highlightArgValue().getText()),
-            DataType.STRING))
-    );
+    ctx.highlightFunction()
+        .highlightArg()
+        .forEach(
+            v ->
+                builder.put(
+                    v.highlightArgName().getText().toLowerCase(),
+                    new Literal(
+                        StringUtils.unquoteText(v.highlightArgValue().getText()),
+                        DataType.STRING)));
 
-    return new HighlightFunction(visit(ctx.highlightFunction().relevanceField()),
-        builder.build());
+    return new HighlightFunction(visit(ctx.highlightFunction().relevanceField()), builder.build());
   }
 
   @Override
-  public UnresolvedExpression visitPositionFunction(
-          OpenSearchSQLParser.PositionFunctionContext ctx) {
+  public UnresolvedExpression visitTimestampFunctionCall(TimestampFunctionCallContext ctx) {
     return new Function(
-            POSITION.getName().getFunctionName(),
-            Arrays.asList(visitFunctionArg(ctx.functionArg(0)),
-                    visitFunctionArg(ctx.functionArg(1))));
+        ctx.timestampFunction().timestampFunctionName().getText(), timestampFunctionArguments(ctx));
+  }
+
+  @Override
+  public UnresolvedExpression visitPositionFunction(PositionFunctionContext ctx) {
+    return new Function(
+        POSITION.getName().getFunctionName(),
+        Arrays.asList(visitFunctionArg(ctx.functionArg(0)), visitFunctionArg(ctx.functionArg(1))));
   }
 
   @Override
@@ -173,8 +188,7 @@ public UnresolvedExpression visitColumnFilter(ColumnFilterContext ctx) {
   }
 
   @Override
-  public UnresolvedExpression visitShowDescribePattern(
-      ShowDescribePatternContext ctx) {
+  public UnresolvedExpression visitShowDescribePattern(ShowDescribePatternContext ctx) {
     if (ctx.compatibleID() != null) {
       return stringLiteral(ctx.compatibleID().getText());
     } else {
@@ -184,7 +198,7 @@ public UnresolvedExpression visitShowDescribePattern(
 
   @Override
   public UnresolvedExpression visitFilteredAggregationFunctionCall(
-      OpenSearchSQLParser.FilteredAggregationFunctionCallContext ctx) {
+      FilteredAggregationFunctionCallContext ctx) {
     AggregateFunction agg = (AggregateFunction) visit(ctx.aggregateFunction());
     return agg.condition(visit(ctx.filterClause()));
   }
@@ -195,21 +209,18 @@ public UnresolvedExpression visitWindowFunctionClause(WindowFunctionClauseContex
 
     List<UnresolvedExpression> partitionByList = Collections.emptyList();
     if (overClause.partitionByClause() != null) {
-      partitionByList = overClause.partitionByClause()
-                                  .expression()
-                                  .stream()
-                                  .map(this::visit)
-                                  .collect(Collectors.toList());
+      partitionByList =
+          overClause.partitionByClause().expression().stream()
+              .map(this::visit)
+              .collect(Collectors.toList());
     }
 
     List<Pair<SortOption, UnresolvedExpression>> sortList = Collections.emptyList();
     if (overClause.orderByClause() != null) {
-      sortList = overClause.orderByClause()
-                           .orderByElement()
-                           .stream()
-                           .map(item -> ImmutablePair.of(
-                               createSortOption(item), visit(item.expression())))
-                           .collect(Collectors.toList());
+      sortList =
+          overClause.orderByClause().orderByElement().stream()
+              .map(item -> ImmutablePair.of(createSortOption(item), visit(item.expression())))
+              .collect(Collectors.toList());
     }
     return new WindowFunction(visit(ctx.function), partitionByList, sortList);
   }
@@ -222,17 +233,12 @@ public UnresolvedExpression visitScalarWindowFunction(ScalarWindowFunctionContex
   @Override
   public UnresolvedExpression visitRegularAggregateFunctionCall(
       RegularAggregateFunctionCallContext ctx) {
-    return new AggregateFunction(
-        ctx.functionName.getText(),
-        visitFunctionArg(ctx.functionArg()));
+    return new AggregateFunction(ctx.functionName.getText(), visitFunctionArg(ctx.functionArg()));
   }
 
   @Override
   public UnresolvedExpression visitDistinctCountFunctionCall(DistinctCountFunctionCallContext ctx) {
-    return new AggregateFunction(
-        ctx.COUNT().getText(),
-        visitFunctionArg(ctx.functionArg()),
-        true);
+    return new AggregateFunction(ctx.COUNT().getText(), visitFunctionArg(ctx.functionArg()), true);
   }
 
   @Override
@@ -241,41 +247,48 @@ public UnresolvedExpression visitCountStarFunctionCall(CountStarFunctionCallCont
   }
 
   @Override
-  public UnresolvedExpression visitFilterClause(OpenSearchSQLParser.FilterClauseContext ctx) {
+  public UnresolvedExpression visitFilterClause(FilterClauseContext ctx) {
     return visit(ctx.expression());
   }
 
   @Override
   public UnresolvedExpression visitIsNullPredicate(IsNullPredicateContext ctx) {
     return new Function(
-        ctx.nullNotnull().NOT() == null ? IS_NULL.getName().getFunctionName() :
-            IS_NOT_NULL.getName().getFunctionName(),
+        ctx.nullNotnull().NOT() == null
+            ? IS_NULL.getName().getFunctionName()
+            : IS_NOT_NULL.getName().getFunctionName(),
         Arrays.asList(visit(ctx.predicate())));
   }
 
+  @Override
+  public UnresolvedExpression visitBetweenPredicate(BetweenPredicateContext ctx) {
+    UnresolvedExpression func =
+        between(visit(ctx.predicate(0)), visit(ctx.predicate(1)), visit(ctx.predicate(2)));
+
+    if (ctx.NOT() != null) {
+      func = not(func);
+    }
+    return func;
+  }
+
   @Override
   public UnresolvedExpression visitLikePredicate(LikePredicateContext ctx) {
     return new Function(
-        ctx.NOT() == null ? LIKE.getName().getFunctionName() :
-            NOT_LIKE.getName().getFunctionName(),
+        ctx.NOT() == null ? LIKE.getName().getFunctionName() : NOT_LIKE.getName().getFunctionName(),
         Arrays.asList(visit(ctx.left), visit(ctx.right)));
   }
 
   @Override
   public UnresolvedExpression visitRegexpPredicate(RegexpPredicateContext ctx) {
-    return new Function(REGEXP.getName().getFunctionName(),
-            Arrays.asList(visit(ctx.left), visit(ctx.right)));
+    return new Function(
+        REGEXP.getName().getFunctionName(), Arrays.asList(visit(ctx.left), visit(ctx.right)));
   }
 
   @Override
-  public UnresolvedExpression visitInPredicate(OpenSearchSQLParser.InPredicateContext ctx) {
+  public UnresolvedExpression visitInPredicate(InPredicateContext ctx) {
     UnresolvedExpression field = visit(ctx.predicate());
-    List<UnresolvedExpression> inLists = ctx
-        .expressions()
-        .expression()
-        .stream()
-        .map(this::visit)
-        .collect(Collectors.toList());
+    List<UnresolvedExpression> inLists =
+        ctx.expressions().expression().stream().map(this::visit).collect(Collectors.toList());
     UnresolvedExpression in = AstDSL.in(field, inLists);
     return ctx.NOT() != null ? AstDSL.not(in) : in;
   }
@@ -340,34 +353,30 @@ public UnresolvedExpression visitTimeLiteral(TimeLiteralContext ctx) {
   }
 
   @Override
-  public UnresolvedExpression visitTimestampLiteral(
-      TimestampLiteralContext ctx) {
+  public UnresolvedExpression visitTimestampLiteral(TimestampLiteralContext ctx) {
     return AstDSL.timestampLiteral(StringUtils.unquoteText(ctx.timestamp.getText()));
   }
 
   @Override
   public UnresolvedExpression visitIntervalLiteral(IntervalLiteralContext ctx) {
-    return new Interval(
-        visit(ctx.expression()), IntervalUnit.of(ctx.intervalUnit().getText()));
+    return new Interval(visit(ctx.expression()), IntervalUnit.of(ctx.intervalUnit().getText()));
   }
 
   @Override
-  public UnresolvedExpression visitBinaryComparisonPredicate(
-      BinaryComparisonPredicateContext ctx) {
+  public UnresolvedExpression visitBinaryComparisonPredicate(BinaryComparisonPredicateContext ctx) {
     String functionName = ctx.comparisonOperator().getText();
     return new Function(
         functionName.equals("<>") ? "!=" : functionName,
-        Arrays.asList(visit(ctx.left), visit(ctx.right))
-    );
+        Arrays.asList(visit(ctx.left), visit(ctx.right)));
   }
 
   @Override
   public UnresolvedExpression visitCaseFunctionCall(CaseFunctionCallContext ctx) {
     UnresolvedExpression caseValue = (ctx.expression() == null) ? null : visit(ctx.expression());
-    List<When> whenStatements = ctx.caseFuncAlternative()
-                                   .stream()
-                                   .map(when -> (When) visit(when))
-                                   .collect(Collectors.toList());
+    List<When> whenStatements =
+        ctx.caseFuncAlternative().stream()
+            .map(when -> (When) visit(when))
+            .collect(Collectors.toList());
     UnresolvedExpression elseStatement = (ctx.elseArg == null) ? null : visit(ctx.elseArg);
 
     return new Case(caseValue, whenStatements, elseStatement);
@@ -379,23 +388,39 @@ public UnresolvedExpression visitCaseFuncAlternative(CaseFuncAlternativeContext
   }
 
   @Override
-  public UnresolvedExpression visitDataTypeFunctionCall(
-      DataTypeFunctionCallContext ctx) {
+  public UnresolvedExpression visitDataTypeFunctionCall(DataTypeFunctionCallContext ctx) {
     return new Cast(visit(ctx.expression()), visit(ctx.convertedDataType()));
   }
 
   @Override
-  public UnresolvedExpression visitConvertedDataType(
-      ConvertedDataTypeContext ctx) {
+  public UnresolvedExpression visitConvertedDataType(ConvertedDataTypeContext ctx) {
     return AstDSL.stringLiteral(ctx.getText());
   }
 
   @Override
-  public UnresolvedExpression visitNoFieldRelevanceFunction(
-          OpenSearchSQLParser.NoFieldRelevanceFunctionContext ctx) {
+  public UnresolvedExpression visitPercentileApproxFunctionCall(
+      OpenSearchSQLParser.PercentileApproxFunctionCallContext ctx) {
+    ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
+    builder.add(
+        new UnresolvedArgument(
+            "percent",
+            AstDSL.doubleLiteral(
+                Double.valueOf(ctx.percentileApproxFunction().percent.getText()))));
+    if (ctx.percentileApproxFunction().compression != null) {
+      builder.add(
+          new UnresolvedArgument(
+              "compression",
+              AstDSL.doubleLiteral(
+                  Double.valueOf(ctx.percentileApproxFunction().compression.getText()))));
+    }
+    return new AggregateFunction(
+        "percentile", visit(ctx.percentileApproxFunction().aggField), builder.build());
+  }
+
+  @Override
+  public UnresolvedExpression visitNoFieldRelevanceFunction(NoFieldRelevanceFunctionContext ctx) {
     return new Function(
-            ctx.noFieldRelevanceFunctionName().getText().toLowerCase(),
-            noFieldRelevanceArguments(ctx));
+        ctx.noFieldRelevanceFunctionName().getText().toLowerCase(), noFieldRelevanceArguments(ctx));
   }
 
   @Override
@@ -406,6 +431,14 @@ public UnresolvedExpression visitSingleFieldRelevanceFunction(
         singleFieldRelevanceArguments(ctx));
   }
 
+  @Override
+  public UnresolvedExpression visitAltSingleFieldRelevanceFunction(
+      AltSingleFieldRelevanceFunctionContext ctx) {
+    return new Function(
+        ctx.altSyntaxFunctionName.getText().toLowerCase(),
+        altSingleFieldRelevanceFunctionArguments(ctx));
+  }
+
   @Override
   public UnresolvedExpression visitMultiFieldRelevanceFunction(
       MultiFieldRelevanceFunctionContext ctx) {
@@ -413,10 +446,9 @@ public UnresolvedExpression visitMultiFieldRelevanceFunction(
     // 'MULTI_MATCH('query'='query_val', 'fields'='*fields_val')'
     String funcName = StringUtils.unquoteText(ctx.multiFieldRelevanceFunctionName().getText());
     if ((funcName.equalsIgnoreCase(BuiltinFunctionName.MULTI_MATCH.toString())
-        || funcName.equalsIgnoreCase(BuiltinFunctionName.MULTIMATCH.toString())
-        || funcName.equalsIgnoreCase(BuiltinFunctionName.MULTIMATCHQUERY.toString()))
-        && ! ctx.getRuleContexts(OpenSearchSQLParser.AlternateMultiMatchQueryContext.class)
-        .isEmpty()) {
+            || funcName.equalsIgnoreCase(BuiltinFunctionName.MULTIMATCH.toString())
+            || funcName.equalsIgnoreCase(BuiltinFunctionName.MULTIMATCHQUERY.toString()))
+        && !ctx.getRuleContexts(AlternateMultiMatchQueryContext.class).isEmpty()) {
       return new Function(
           ctx.multiFieldRelevanceFunctionName().getText().toLowerCase(),
           alternateMultiMatchArguments(ctx));
@@ -427,115 +459,211 @@ public UnresolvedExpression visitMultiFieldRelevanceFunction(
     }
   }
 
-  private Function buildFunction(String functionName,
-                                 List<OpenSearchSQLParser.FunctionArgContext> arg) {
+  @Override
+  public UnresolvedExpression visitAltMultiFieldRelevanceFunction(
+      AltMultiFieldRelevanceFunctionContext ctx) {
     return new Function(
-        functionName,
-        arg
-            .stream()
-            .map(this::visitFunctionArg)
-            .collect(Collectors.toList())
-    );
+        ctx.altSyntaxFunctionName.getText().toLowerCase(),
+        altMultiFieldRelevanceFunctionArguments(ctx));
+  }
+
+  /**
+   * Visit score-relevance function and collect children.
+   *
+   * @param ctx the parse tree
+   * @return children
+   */
+  public UnresolvedExpression visitScoreRelevanceFunction(ScoreRelevanceFunctionContext ctx) {
+    Literal weight =
+        ctx.weight == null
+            ? new Literal(Double.valueOf(1.0), DataType.DOUBLE)
+            : new Literal(Double.parseDouble(ctx.weight.getText()), DataType.DOUBLE);
+    return new ScoreFunction(visit(ctx.relevanceFunction()), weight);
+  }
+
+  private Function buildFunction(String functionName, List<FunctionArgContext> arg) {
+    return new Function(
+        functionName, arg.stream().map(this::visitFunctionArg).collect(Collectors.toList()));
+  }
+
+  @Override
+  public UnresolvedExpression visitExtractFunctionCall(ExtractFunctionCallContext ctx) {
+    return new Function(
+        ctx.extractFunction().EXTRACT().toString(), getExtractFunctionArguments(ctx));
   }
 
   private QualifiedName visitIdentifiers(List<IdentContext> identifiers) {
     return new QualifiedName(
         identifiers.stream()
-                   .map(RuleContext::getText)
-                   .map(StringUtils::unquoteIdentifier)
-                   .collect(Collectors.toList())
-    );
+            .map(RuleContext::getText)
+            .map(StringUtils::unquoteIdentifier)
+            .collect(Collectors.toList()));
   }
 
-  private void fillRelevanceArgs(List<OpenSearchSQLParser.RelevanceArgContext> args,
-                                 ImmutableList.Builder<UnresolvedExpression> builder) {
+  private void fillRelevanceArgs(
+      List<RelevanceArgContext> args, ImmutableList.Builder<UnresolvedExpression> builder) {
     // To support old syntax we must support argument keys as quoted strings.
-    args.forEach(v -> builder.add(v.argName == null
-        ? new UnresolvedArgument(v.relevanceArgName().getText().toLowerCase(),
-            new Literal(StringUtils.unquoteText(v.relevanceArgValue().getText()),
-            DataType.STRING))
-        : new UnresolvedArgument(StringUtils.unquoteText(v.argName.getText()).toLowerCase(),
-            new Literal(StringUtils.unquoteText(v.argVal.getText()), DataType.STRING))));
+    args.forEach(
+        v ->
+            builder.add(
+                v.argName == null
+                    ? new UnresolvedArgument(
+                        v.relevanceArgName().getText().toLowerCase(),
+                        new Literal(
+                            StringUtils.unquoteText(v.relevanceArgValue().getText()),
+                            DataType.STRING))
+                    : new UnresolvedArgument(
+                        StringUtils.unquoteText(v.argName.getText()).toLowerCase(),
+                        new Literal(
+                            StringUtils.unquoteText(v.argVal.getText()), DataType.STRING))));
   }
 
   private List<UnresolvedExpression> noFieldRelevanceArguments(
-          OpenSearchSQLParser.NoFieldRelevanceFunctionContext ctx) {
+      NoFieldRelevanceFunctionContext ctx) {
     // all the arguments are defaulted to string values
     // to skip environment resolving and function signature resolving
     ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
-    builder.add(new UnresolvedArgument("query",
-            new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
+    builder.add(
+        new UnresolvedArgument(
+            "query", new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
     fillRelevanceArgs(ctx.relevanceArg(), builder);
     return builder.build();
   }
 
   private List<UnresolvedExpression> singleFieldRelevanceArguments(
-        OpenSearchSQLParser.SingleFieldRelevanceFunctionContext ctx) {
+      SingleFieldRelevanceFunctionContext ctx) {
     // all the arguments are defaulted to string values
     // to skip environment resolving and function signature resolving
     ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
-    builder.add(new UnresolvedArgument("field",
-        new Literal(StringUtils.unquoteText(ctx.field.getText()), DataType.STRING)));
-    builder.add(new UnresolvedArgument("query",
-        new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
+    builder.add(
+        new UnresolvedArgument(
+            "field", new QualifiedName(StringUtils.unquoteText(ctx.field.getText()))));
+    builder.add(
+        new UnresolvedArgument(
+            "query", new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
     fillRelevanceArgs(ctx.relevanceArg(), builder);
     return builder.build();
   }
 
-
+  private List<UnresolvedExpression> altSingleFieldRelevanceFunctionArguments(
+      AltSingleFieldRelevanceFunctionContext ctx) {
+    // all the arguments are defaulted to string values
+    // to skip environment resolving and function signature resolving
+    ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
+    builder.add(
+        new UnresolvedArgument(
+            "field", new QualifiedName(StringUtils.unquoteText(ctx.field.getText()))));
+    builder.add(
+        new UnresolvedArgument(
+            "query", new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
+    fillRelevanceArgs(ctx.relevanceArg(), builder);
+    return builder.build();
+  }
 
   private List<UnresolvedExpression> multiFieldRelevanceArguments(
-      OpenSearchSQLParser.MultiFieldRelevanceFunctionContext ctx) {
+      MultiFieldRelevanceFunctionContext ctx) {
     // all the arguments are defaulted to string values
     // to skip environment resolving and function signature resolving
     ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
-    var fields = new RelevanceFieldList(ctx
-        .getRuleContexts(OpenSearchSQLParser.RelevanceFieldAndWeightContext.class)
-        .stream()
-        .collect(Collectors.toMap(
-            f -> StringUtils.unquoteText(f.field.getText()),
-            f -> (f.weight == null) ? 1F : Float.parseFloat(f.weight.getText()))));
+    var fields =
+        new RelevanceFieldList(
+            ctx.getRuleContexts(RelevanceFieldAndWeightContext.class).stream()
+                .collect(
+                    Collectors.toMap(
+                        f -> StringUtils.unquoteText(f.field.getText()),
+                        f -> (f.weight == null) ? 1F : Float.parseFloat(f.weight.getText()))));
     builder.add(new UnresolvedArgument("fields", fields));
-    builder.add(new UnresolvedArgument("query",
-        new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
+    builder.add(
+        new UnresolvedArgument(
+            "query", new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
     fillRelevanceArgs(ctx.relevanceArg(), builder);
     return builder.build();
   }
 
+  private List<UnresolvedExpression> getFormatFunctionArguments(GetFormatFunctionCallContext ctx) {
+    List<UnresolvedExpression> args =
+        Arrays.asList(
+            new Literal(ctx.getFormatFunction().getFormatType().getText(), DataType.STRING),
+            visitFunctionArg(ctx.getFormatFunction().functionArg()));
+    return args;
+  }
+
+  private List<UnresolvedExpression> timestampFunctionArguments(TimestampFunctionCallContext ctx) {
+    List<UnresolvedExpression> args =
+        Arrays.asList(
+            new Literal(ctx.timestampFunction().simpleDateTimePart().getText(), DataType.STRING),
+            visitFunctionArg(ctx.timestampFunction().firstArg),
+            visitFunctionArg(ctx.timestampFunction().secondArg));
+    return args;
+  }
+
   /**
-   * Adds support for multi_match alternate syntax like
-   * MULTI_MATCH('query'='Dale', 'fields'='*name').
+   * Adds support for multi_match alternate syntax like MULTI_MATCH('query'='Dale',
+   * 'fields'='*name').
+   *
    * @param ctx : Context for multi field relevance function.
    * @return : Returns list of all arguments for relevance function.
    */
   private List<UnresolvedExpression> alternateMultiMatchArguments(
-      OpenSearchSQLParser.MultiFieldRelevanceFunctionContext ctx) {
+      MultiFieldRelevanceFunctionContext ctx) {
     // all the arguments are defaulted to string values
     // to skip environment resolving and function signature resolving
     ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
     Map<String, Float> fieldAndWeightMap = new HashMap<>();
 
-    String[] fieldAndWeights = StringUtils.unquoteText(
-        ctx.getRuleContexts(OpenSearchSQLParser.AlternateMultiMatchFieldContext.class)
-        .stream().findFirst().get().argVal.getText()).split(",");
+    String[] fieldAndWeights =
+        StringUtils.unquoteText(
+                ctx.getRuleContexts(AlternateMultiMatchFieldContext.class).stream()
+                    .findFirst()
+                    .get()
+                    .argVal
+                    .getText())
+            .split(",");
 
     for (var fieldAndWeight : fieldAndWeights) {
       String[] splitFieldAndWeights = fieldAndWeight.split("\\^");
-      fieldAndWeightMap.put(splitFieldAndWeights[0],
+      fieldAndWeightMap.put(
+          splitFieldAndWeights[0],
           splitFieldAndWeights.length > 1 ? Float.parseFloat(splitFieldAndWeights[1]) : 1F);
     }
-    builder.add(new UnresolvedArgument("fields",
-        new RelevanceFieldList(fieldAndWeightMap)));
-
-    ctx.getRuleContexts(OpenSearchSQLParser.AlternateMultiMatchQueryContext.class)
-        .stream().findFirst().ifPresent(
-          arg ->
-            builder.add(new UnresolvedArgument("query",
-                new Literal(StringUtils.unquoteText(arg.argVal.getText()), DataType.STRING)))
-        );
+    builder.add(new UnresolvedArgument("fields", new RelevanceFieldList(fieldAndWeightMap)));
+
+    ctx.getRuleContexts(AlternateMultiMatchQueryContext.class).stream()
+        .findFirst()
+        .ifPresent(
+            arg ->
+                builder.add(
+                    new UnresolvedArgument(
+                        "query",
+                        new Literal(
+                            StringUtils.unquoteText(arg.argVal.getText()), DataType.STRING))));
 
     fillRelevanceArgs(ctx.relevanceArg(), builder);
 
     return builder.build();
   }
+
+  private List<UnresolvedExpression> altMultiFieldRelevanceFunctionArguments(
+      AltMultiFieldRelevanceFunctionContext ctx) {
+    // all the arguments are defaulted to string values
+    // to skip environment resolving and function signature resolving
+    var map = new HashMap<String, Float>();
+    map.put(ctx.field.getText(), 1F);
+    ImmutableList.Builder<UnresolvedExpression> builder = ImmutableList.builder();
+    var fields = new RelevanceFieldList(map);
+    builder.add(new UnresolvedArgument("fields", fields));
+    builder.add(
+        new UnresolvedArgument(
+            "query", new Literal(StringUtils.unquoteText(ctx.query.getText()), DataType.STRING)));
+    fillRelevanceArgs(ctx.relevanceArg(), builder);
+    return builder.build();
+  }
+
+  private List<UnresolvedExpression> getExtractFunctionArguments(ExtractFunctionCallContext ctx) {
+    List<UnresolvedExpression> args =
+        Arrays.asList(
+            new Literal(ctx.extractFunction().datetimePart().getText(), DataType.STRING),
+            visitFunctionArg(ctx.extractFunction().functionArg()));
+    return args;
+  }
 }
diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/AstHavingFilterBuilder.java b/sql/src/main/java/org/opensearch/sql/sql/parser/AstHavingFilterBuilder.java
index f90ea2f991..94c11d05af 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/parser/AstHavingFilterBuilder.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/parser/AstHavingFilterBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.QualifiedNameContext;
@@ -13,10 +12,9 @@
 import org.opensearch.sql.sql.parser.context.QuerySpecification;
 
 /**
- * AST Having filter builder that builds HAVING clause condition expressions
- * and replace alias by original expression in SELECT clause.
- * The reason for this is it's hard to replace afterwards since UnresolvedExpression
- * is immutable.
+ * AST Having filter builder that builds HAVING clause condition expressions and replace alias by
+ * original expression in SELECT clause. The reason for this is it's hard to replace afterwards
+ * since UnresolvedExpression is immutable.
  */
 @RequiredArgsConstructor
 public class AstHavingFilterBuilder extends AstExpressionBuilder {
@@ -34,5 +32,4 @@ private UnresolvedExpression replaceAlias(UnresolvedExpression expr) {
     }
     return expr;
   }
-
 }
diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/AstSortBuilder.java b/sql/src/main/java/org/opensearch/sql/sql/parser/AstSortBuilder.java
index 1b872dce54..2594709f4f 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/parser/AstSortBuilder.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/parser/AstSortBuilder.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
 import static org.opensearch.sql.ast.dsl.AstDSL.booleanLiteral;
@@ -27,8 +26,8 @@
 import org.opensearch.sql.sql.parser.context.QuerySpecification;
 
 /**
- * AST sort builder that builds Sort AST node from ORDER BY clause. During this process, the item
- * in order by may be replaced by item in project list if it's an alias or ordinal. This is same as
+ * AST sort builder that builds Sort AST node from ORDER BY clause. During this process, the item in
+ * order by may be replaced by item in project list if it's an alias or ordinal. This is same as
  * GROUP BY building process.
  */
 @RequiredArgsConstructor
@@ -38,9 +37,7 @@ public class AstSortBuilder extends OpenSearchSQLParserBaseVisitor<UnresolvedPla
 
   @Override
   public UnresolvedPlan visitOrderByClause(OrderByClauseContext ctx) {
-    return new Sort(
-        createSortFields()
-    );
+    return new Sort(createSortFields());
   }
 
   private List<Field> createSortFields() {
@@ -57,8 +54,8 @@ private List<Field> createSortFields() {
   }
 
   /**
-   * Argument "asc" is required.
-   * Argument "nullFirst" is optional and determined by Analyzer later if absent.
+   * Argument "asc" is required. Argument "nullFirst" is optional and determined by Analyzer later
+   * if absent.
    */
   private List<Argument> createSortArguments(SortOption option) {
     SortOrder sortOrder = option.getSortOrder();
@@ -71,5 +68,4 @@ private List<Argument> createSortArguments(SortOption option) {
     }
     return args.build();
   }
-
 }
diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/AstStatementBuilder.java b/sql/src/main/java/org/opensearch/sql/sql/parser/AstStatementBuilder.java
index 40d549764a..593e7b51ff 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/parser/AstStatementBuilder.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/parser/AstStatementBuilder.java
@@ -26,7 +26,7 @@ public class AstStatementBuilder extends OpenSearchSQLParserBaseVisitor<Statemen
 
   @Override
   public Statement visitSqlStatement(OpenSearchSQLParser.SqlStatementContext ctx) {
-    Query query = new Query(astBuilder.visit(ctx));
+    Query query = new Query(astBuilder.visit(ctx), context.fetchSize);
     return context.isExplain ? new Explain(query) : query;
   }
 
@@ -39,5 +39,6 @@ protected Statement aggregateResult(Statement aggregate, Statement nextResult) {
   @Builder
   public static class StatementBuilderContext {
     private final boolean isExplain;
+    private final int fetchSize;
   }
 }
diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/ParserUtils.java b/sql/src/main/java/org/opensearch/sql/sql/parser/ParserUtils.java
index 947dca51b9..3c60d43733 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/parser/ParserUtils.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/parser/ParserUtils.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
 import static org.opensearch.sql.ast.tree.Sort.NullOrder;
@@ -16,33 +15,24 @@
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
-/**
- * Parser Utils Class.
- */
+/** Parser Utils Class. */
 @UtilityClass
 public class ParserUtils {
 
-  /**
-   * Get original text in query.
-   */
+  /** Get original text in query. */
   public static String getTextInQuery(ParserRuleContext ctx, String queryString) {
     Token start = ctx.getStart();
     Token stop = ctx.getStop();
     return queryString.substring(start.getStartIndex(), stop.getStopIndex() + 1);
   }
 
-  /**
-   * Create sort option from syntax tree node.
-   */
+  /** Create sort option from syntax tree node. */
   public static SortOption createSortOption(OrderByElementContext orderBy) {
     return new SortOption(
-        createSortOrder(orderBy.order),
-        createNullOrder(orderBy.FIRST(), orderBy.LAST()));
+        createSortOrder(orderBy.order), createNullOrder(orderBy.FIRST(), orderBy.LAST()));
   }
 
-  /**
-   * Create sort order for sort option use from ASC/DESC token.
-   */
+  /** Create sort order for sort option use from ASC/DESC token. */
   public static SortOrder createSortOrder(Token ctx) {
     if (ctx == null) {
       return null;
@@ -50,9 +40,7 @@ public static SortOrder createSortOrder(Token ctx) {
     return SortOrder.valueOf(ctx.getText().toUpperCase());
   }
 
-  /**
-   * Create null order for sort option use from FIRST/LAST token.
-   */
+  /** Create null order for sort option use from FIRST/LAST token. */
   public static NullOrder createNullOrder(TerminalNode first, TerminalNode last) {
     if (first != null) {
       return NullOrder.NULL_FIRST;
@@ -62,5 +50,4 @@ public static NullOrder createNullOrder(TerminalNode first, TerminalNode last) {
       return null;
     }
   }
-
 }
diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/context/ParsingContext.java b/sql/src/main/java/org/opensearch/sql/sql/parser/context/ParsingContext.java
index 33b313367d..297fdfd749 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/parser/context/ParsingContext.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/parser/context/ParsingContext.java
@@ -3,21 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser.context;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 
 /**
- * SQL parsing context that maintains stack of query specifications for nested queries.
- * Currently this is just a thin wrapper by a stack.
+ * SQL parsing context that maintains stack of query specifications for nested queries. Currently
+ * this is just a thin wrapper by a stack.
  */
 public class ParsingContext {
 
   /**
-   * Use stack rather than linked query specification because there is no need
-   * to look up through the stack.
+   * Use stack rather than linked query specification because there is no need to look up through
+   * the stack.
    */
   private final Deque<QuerySpecification> contexts = new ArrayDeque<>();
 
@@ -31,10 +30,10 @@ public QuerySpecification peek() {
 
   /**
    * Pop up query context.
-   * @return  query context after popup.
+   *
+   * @return query context after popup.
    */
   public QuerySpecification pop() {
     return contexts.pop();
   }
-
 }
diff --git a/sql/src/main/java/org/opensearch/sql/sql/parser/context/QuerySpecification.java b/sql/src/main/java/org/opensearch/sql/sql/parser/context/QuerySpecification.java
index 21dddde2b9..abcd4f2073 100644
--- a/sql/src/main/java/org/opensearch/sql/sql/parser/context/QuerySpecification.java
+++ b/sql/src/main/java/org/opensearch/sql/sql/parser/context/QuerySpecification.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser.context;
 
 import static org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.FilteredAggregationFunctionCallContext;
@@ -42,6 +41,7 @@
 
 /**
  * Query specification domain that collects basic info for a simple query.
+ *
  * <pre>
  * (I) What is the impact of this new abstraction?
  *  This abstraction and collecting process turns AST building process into two phases:
@@ -61,10 +61,9 @@
 @ToString
 public class QuerySpecification {
 
-  /**
-   * Items in SELECT clause and mapping from alias to select item.
-   */
+  /** Items in SELECT clause and mapping from alias to select item. */
   private final List<UnresolvedExpression> selectItems = new ArrayList<>();
+
   private final Map<String, UnresolvedExpression> selectItemsByAlias = new HashMap<>();
 
   /**
@@ -74,31 +73,30 @@ public class QuerySpecification {
   private final Set<UnresolvedExpression> aggregators = new LinkedHashSet<>();
 
   /**
-   * Items in GROUP BY clause that may be:
-   *  1) Simple field name
-   *  2) Field nested in scalar function call
-   *  3) Ordinal that points to expression in SELECT
-   *  4) Alias that points to expression in SELECT.
+   * Items in GROUP BY clause that may be: 1) Simple field name 2) Field nested in scalar function
+   * call 3) Ordinal that points to expression in SELECT 4) Alias that points to expression in
+   * SELECT.
    */
   private final List<UnresolvedExpression> groupByItems = new ArrayList<>();
 
-  /**
-   * Items in ORDER BY clause that may be different forms as above and its options.
-   */
+  /** Items in ORDER BY clause that may be different forms as above and its options. */
   private final List<UnresolvedExpression> orderByItems = new ArrayList<>();
+
   private final List<SortOption> orderByOptions = new ArrayList<>();
 
   /**
    * Collect all query information in the parse tree excluding info in sub-query).
-   * @param query   query spec node in parse tree
+   *
+   * @param query query spec node in parse tree
    */
   public void collect(QuerySpecificationContext query, String queryString) {
     query.accept(new QuerySpecificationCollector(queryString));
   }
 
   /**
-   * Replace unresolved expression if it's an alias or ordinal that represents
-   * an actual expression in SELECT list.
+   * Replace unresolved expression if it's an alias or ordinal that represents an actual expression
+   * in SELECT list.
+   *
    * @param expr item to be replaced
    * @return select item that the given expr represents
    */
@@ -118,8 +116,8 @@ private boolean isIntegerLiteral(UnresolvedExpression expr) {
     }
 
     if (((Literal) expr).getType() != DataType.INTEGER) {
-      throw new SemanticCheckException(StringUtils.format(
-          "Non-integer constant [%s] found in ordinal", expr));
+      throw new SemanticCheckException(
+          StringUtils.format("Non-integer constant [%s] found in ordinal", expr));
     }
     return true;
   }
@@ -127,25 +125,26 @@ private boolean isIntegerLiteral(UnresolvedExpression expr) {
   private UnresolvedExpression getSelectItemByOrdinal(UnresolvedExpression expr) {
     int ordinal = (Integer) ((Literal) expr).getValue();
     if (ordinal <= 0 || ordinal > selectItems.size()) {
-      throw new SemanticCheckException(StringUtils.format(
-          "Ordinal [%d] is out of bound of select item list", ordinal));
+      throw new SemanticCheckException(
+          StringUtils.format("Ordinal [%d] is out of bound of select item list", ordinal));
     }
     return selectItems.get(ordinal - 1);
   }
 
   /**
    * Check if an expression is a select alias.
-   * @param expr  expression
+   *
+   * @param expr expression
    * @return true if it's an alias
    */
   public boolean isSelectAlias(UnresolvedExpression expr) {
-    return (expr instanceof QualifiedName)
-        && (selectItemsByAlias.containsKey(expr.toString()));
+    return (expr instanceof QualifiedName) && (selectItemsByAlias.containsKey(expr.toString()));
   }
 
   /**
    * Get original expression aliased in SELECT clause.
-   * @param expr  alias
+   *
+   * @param expr alias
    * @return expression in SELECT
    */
   public UnresolvedExpression getSelectItemByAlias(UnresolvedExpression expr) {
@@ -223,8 +222,7 @@ public Void visitAggregateFunctionCall(AggregateFunctionCallContext ctx) {
     @Override
     public Void visitFilteredAggregationFunctionCall(FilteredAggregationFunctionCallContext ctx) {
       UnresolvedExpression aggregateFunction = visitAstExpression(ctx);
-      aggregators.add(
-          AstDSL.alias(getTextInQuery(ctx, queryString), aggregateFunction));
+      aggregators.add(AstDSL.alias(getTextInQuery(ctx, queryString), aggregateFunction));
       return super.visitFilteredAggregationFunctionCall(ctx);
     }
 
@@ -236,5 +234,4 @@ private UnresolvedExpression visitAstExpression(ParseTree tree) {
       return expressionBuilder.visit(tree);
     }
   }
-
 }
diff --git a/sql/src/test/java/org/opensearch/sql/common/antlr/SyntaxParserTestBase.java b/sql/src/test/java/org/opensearch/sql/common/antlr/SyntaxParserTestBase.java
index 526dc4e816..87f2083774 100644
--- a/sql/src/test/java/org/opensearch/sql/common/antlr/SyntaxParserTestBase.java
+++ b/sql/src/test/java/org/opensearch/sql/common/antlr/SyntaxParserTestBase.java
@@ -1,24 +1,20 @@
 package org.opensearch.sql.common.antlr;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
 
-/**
- * A base class for tests for SQL or PPL parser.
- */
+/** A base class for tests for SQL or PPL parser. */
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public abstract class SyntaxParserTestBase {
-  @Getter
-  private final Parser parser;
+  @Getter private final Parser parser;
 
   /**
    * A helper function that fails a test if the parser rejects a given query.
+   *
    * @param query Query to test.
    */
   protected void acceptQuery(String query) {
@@ -27,6 +23,7 @@ protected void acceptQuery(String query) {
 
   /**
    * A helper function that fails a test if the parser accepts a given query.
+   *
    * @param query Query to test.
    */
   protected void rejectQuery(String query) {
diff --git a/sql/src/test/java/org/opensearch/sql/sql/SQLServiceTest.java b/sql/src/test/java/org/opensearch/sql/sql/SQLServiceTest.java
index 9abe37cd06..b124757069 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/SQLServiceTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/SQLServiceTest.java
@@ -3,63 +3,54 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.opensearch.sql.executor.ExecutionEngine.QueryResponse;
 
-import java.util.Collections;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import org.json.JSONObject;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.executor.DefaultQueryManager;
-import org.opensearch.sql.executor.ExecutionEngine;
 import org.opensearch.sql.executor.ExecutionEngine.ExplainResponse;
 import org.opensearch.sql.executor.ExecutionEngine.ExplainResponseNode;
-import org.opensearch.sql.executor.QueryManager;
 import org.opensearch.sql.executor.QueryService;
 import org.opensearch.sql.executor.execution.QueryPlanFactory;
-import org.opensearch.sql.sql.config.SQLServiceConfig;
+import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
 import org.opensearch.sql.sql.domain.SQLQueryRequest;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 @ExtendWith(MockitoExtension.class)
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class SQLServiceTest {
 
   private static String QUERY = "/_plugins/_sql";
 
   private static String EXPLAIN = "/_plugins/_sql/_explain";
 
-  private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-
   private SQLService sqlService;
 
   private DefaultQueryManager queryManager;
 
-  @Mock
-  private QueryService queryService;
-
-  @Mock
-  private ExecutionEngine.Schema schema;
+  @Mock private QueryService queryService;
 
   @BeforeEach
   public void setUp() {
     queryManager = DefaultQueryManager.defaultQueryManager();
-    context.registerBean(QueryManager.class, () -> queryManager);
-    context.registerBean(QueryPlanFactory.class, () -> new QueryPlanFactory(queryService));
-    context.register(SQLServiceConfig.class);
-    context.refresh();
-    sqlService = context.getBean(SQLService.class);
+    sqlService =
+        new SQLService(new SQLSyntaxParser(), queryManager, new QueryPlanFactory(queryService));
   }
 
   @AfterEach
@@ -68,16 +59,10 @@ public void cleanup() throws InterruptedException {
   }
 
   @Test
-  public void canExecuteSqlQuery() {
-    doAnswer(invocation -> {
-      ResponseListener<QueryResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new QueryResponse(schema, Collections.emptyList()));
-      return null;
-    }).when(queryService).execute(any(), any());
-
+  public void can_execute_sql_query() {
     sqlService.execute(
         new SQLQueryRequest(new JSONObject(), "SELECT 123", QUERY, "jdbc"),
-        new ResponseListener<QueryResponse>() {
+        new ResponseListener<>() {
           @Override
           public void onResponse(QueryResponse response) {
             assertNotNull(response);
@@ -91,13 +76,42 @@ public void onFailure(Exception e) {
   }
 
   @Test
-  public void canExecuteCsvFormatRequest() {
-    doAnswer(invocation -> {
-      ResponseListener<QueryResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new QueryResponse(schema, Collections.emptyList()));
-      return null;
-    }).when(queryService).execute(any(), any());
+  public void can_execute_cursor_query() {
+    sqlService.execute(
+        new SQLQueryRequest(new JSONObject(), null, QUERY, Map.of("format", "jdbc"), "n:cursor"),
+        new ResponseListener<>() {
+          @Override
+          public void onResponse(QueryResponse response) {
+            assertNotNull(response);
+          }
 
+          @Override
+          public void onFailure(Exception e) {
+            fail(e);
+          }
+        });
+  }
+
+  @Test
+  public void can_execute_close_cursor_query() {
+    sqlService.execute(
+        new SQLQueryRequest(
+            new JSONObject(), null, QUERY + "/close", Map.of("format", "jdbc"), "n:cursor"),
+        new ResponseListener<>() {
+          @Override
+          public void onResponse(QueryResponse response) {
+            assertNotNull(response);
+          }
+
+          @Override
+          public void onFailure(Exception e) {
+            fail(e);
+          }
+        });
+  }
+
+  @Test
+  public void can_execute_csv_format_request() {
     sqlService.execute(
         new SQLQueryRequest(new JSONObject(), "SELECT 123", QUERY, "csv"),
         new ResponseListener<QueryResponse>() {
@@ -114,14 +128,57 @@ public void onFailure(Exception e) {
   }
 
   @Test
-  public void canExplainSqlQuery() {
-    doAnswer(invocation -> {
-      ResponseListener<ExplainResponse> listener = invocation.getArgument(1);
-      listener.onResponse(new ExplainResponse(new ExplainResponseNode("Test")));
-      return null;
-    }).when(queryService).explain(any(), any());
-
-    sqlService.explain(new SQLQueryRequest(new JSONObject(), "SELECT 123", EXPLAIN, "csv"),
+  public void can_execute_raw_format_request() {
+    sqlService.execute(
+        new SQLQueryRequest(new JSONObject(), "SELECT 123", QUERY, "raw"),
+        new ResponseListener<QueryResponse>() {
+          @Override
+          public void onResponse(QueryResponse response) {
+            assertNotNull(response);
+          }
+
+          @Override
+          public void onFailure(Exception e) {
+            fail(e);
+          }
+        });
+  }
+
+  @Test
+  public void can_execute_pretty_raw_format_request() {
+    sqlService.execute(
+        new SQLQueryRequest(
+            new JSONObject(),
+            "SELECT 123",
+            QUERY,
+            Map.of("format", "jdbc", "pretty", "true"),
+            "n:cursor"),
+        new ResponseListener<QueryResponse>() {
+          @Override
+          public void onResponse(QueryResponse response) {
+            assertNotNull(response);
+          }
+
+          @Override
+          public void onFailure(Exception e) {
+            fail(e);
+          }
+        });
+  }
+
+  @Test
+  public void can_explain_sql_query() {
+    doAnswer(
+            invocation -> {
+              ResponseListener<ExplainResponse> listener = invocation.getArgument(1);
+              listener.onResponse(new ExplainResponse(new ExplainResponseNode("Test")));
+              return null;
+            })
+        .when(queryService)
+        .explain(any(), any());
+
+    sqlService.explain(
+        new SQLQueryRequest(new JSONObject(), "SELECT 123", EXPLAIN, "csv"),
         new ResponseListener<ExplainResponse>() {
           @Override
           public void onResponse(ExplainResponse response) {
@@ -136,7 +193,27 @@ public void onFailure(Exception e) {
   }
 
   @Test
-  public void canCaptureErrorDuringExecution() {
+  public void cannot_explain_cursor_query() {
+    sqlService.explain(
+        new SQLQueryRequest(new JSONObject(), null, EXPLAIN, Map.of("format", "jdbc"), "n:cursor"),
+        new ResponseListener<ExplainResponse>() {
+          @Override
+          public void onResponse(ExplainResponse response) {
+            fail(response.toString());
+          }
+
+          @Override
+          public void onFailure(Exception e) {
+            assertEquals(
+                "Explain of a paged query continuation is not supported."
+                    + " Use `explain` for the initial query request.",
+                e.getMessage());
+          }
+        });
+  }
+
+  @Test
+  public void can_capture_error_during_execution() {
     sqlService.execute(
         new SQLQueryRequest(new JSONObject(), "SELECT", QUERY, ""),
         new ResponseListener<QueryResponse>() {
@@ -153,7 +230,7 @@ public void onFailure(Exception e) {
   }
 
   @Test
-  public void canCaptureErrorDuringExplain() {
+  public void can_capture_error_during_explain() {
     sqlService.explain(
         new SQLQueryRequest(new JSONObject(), "SELECT", EXPLAIN, ""),
         new ResponseListener<ExplainResponse>() {
@@ -168,5 +245,4 @@ public void onFailure(Exception e) {
           }
         });
   }
-
 }
diff --git a/sql/src/test/java/org/opensearch/sql/sql/antlr/BracketedTimestampTest.java b/sql/src/test/java/org/opensearch/sql/sql/antlr/BracketedTimestampTest.java
new file mode 100644
index 0000000000..120cd233fc
--- /dev/null
+++ b/sql/src/test/java/org/opensearch/sql/sql/antlr/BracketedTimestampTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql.antlr;
+
+import org.junit.jupiter.api.Test;
+
+public class BracketedTimestampTest extends SQLParserTest {
+  @Test
+  void date_shortened_test() {
+    acceptQuery("SELECT {d '2001-05-07'}");
+  }
+
+  @Test
+  void date_test() {
+    acceptQuery("SELECT {date '2001-05-07'}");
+  }
+
+  @Test
+  void time_shortened_test() {
+    acceptQuery("SELECT {t '10:11:12'}");
+  }
+
+  @Test
+  void time_test() {
+    acceptQuery("SELECT {time '10:11:12'}");
+  }
+
+  @Test
+  void timestamp_shortened_test() {
+    acceptQuery("SELECT {ts '2001-05-07 10:11:12'}");
+  }
+
+  @Test
+  void timestamp_test() {
+    acceptQuery("SELECT {timestamp '2001-05-07 10:11:12'}");
+  }
+}
diff --git a/sql/src/test/java/org/opensearch/sql/sql/antlr/HighlightTest.java b/sql/src/test/java/org/opensearch/sql/sql/antlr/HighlightTest.java
index 6826a37c0b..ae1e418357 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/antlr/HighlightTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/antlr/HighlightTest.java
@@ -15,14 +15,14 @@ void single_field_test() {
 
   @Test
   void multiple_highlights_test() {
-    acceptQuery("SELECT HIGHLIGHT(Tags), HIGHLIGHT(Body) FROM Index "
-        + "WHERE MULTI_MATCH([Tags, Body], 'Time')");
+    acceptQuery(
+        "SELECT HIGHLIGHT(Tags), HIGHLIGHT(Body) FROM Index "
+            + "WHERE MULTI_MATCH([Tags, Body], 'Time')");
   }
 
   @Test
   void wildcard_test() {
-    acceptQuery("SELECT HIGHLIGHT('T*') FROM Index "
-        + "WHERE MULTI_MATCH([Tags, Body], 'Time')");
+    acceptQuery("SELECT HIGHLIGHT('T*') FROM Index " + "WHERE MULTI_MATCH([Tags, Body], 'Time')");
   }
 
   @Test
@@ -33,13 +33,12 @@ void highlight_all_test() {
 
   @Test
   void multiple_parameters_failure_test() {
-    rejectQuery("SELECT HIGHLIGHT(Tags1, Tags2) FROM Index "
-        + "WHERE MULTI_MATCH([Tags, Body], 'Time')");
+    rejectQuery(
+        "SELECT HIGHLIGHT(Tags1, Tags2) FROM Index " + "WHERE MULTI_MATCH([Tags, Body], 'Time')");
   }
 
   @Test
   void no_parameters_failure_test() {
-    rejectQuery("SELECT HIGHLIGHT() FROM Index "
-        + "WHERE MULTI_MATCH([Tags, Body], 'Time')");
+    rejectQuery("SELECT HIGHLIGHT() FROM Index " + "WHERE MULTI_MATCH([Tags, Body], 'Time')");
   }
 }
diff --git a/sql/src/test/java/org/opensearch/sql/sql/antlr/MatchBoolPrefixParserTest.java b/sql/src/test/java/org/opensearch/sql/sql/antlr/MatchBoolPrefixParserTest.java
index 66c4d5be9d..db5ce18edb 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/antlr/MatchBoolPrefixParserTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/antlr/MatchBoolPrefixParserTest.java
@@ -25,14 +25,13 @@ static Stream<String> generateValidArguments() {
         new String("max_expansions=50"),
         new String("fuzzy_transpositions=true"),
         new String("fuzzy_rewrite=constant_score"),
-        new String("boost=1")
-    );
+        new String("boost=1"));
   }
 
   @ParameterizedTest
   @MethodSource("generateValidArguments")
   public void testValidArguments(String arg) {
-    acceptQuery("SELECT * FROM T WHERE MATCH_BOOL_PREFIX(message, 'query', " + arg  + ")");
+    acceptQuery("SELECT * FROM T WHERE MATCH_BOOL_PREFIX(message, 'query', " + arg + ")");
   }
 
   @Test
diff --git a/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLParserTest.java b/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLParserTest.java
index 7b8b415ee7..db091a4932 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLParserTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLParserTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package org.opensearch.sql.sql.antlr;
 
 import org.opensearch.sql.common.antlr.SyntaxParserTestBase;
diff --git a/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLSyntaxParserTest.java b/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLSyntaxParserTest.java
index bfd0f93ec9..2fff7ff21c 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLSyntaxParserTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLSyntaxParserTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.antlr;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -72,8 +71,7 @@ public void canParseHiddenIndexName() {
 
   @Test
   public void canNotParseIndexNameWithSpecialChar() {
-    assertThrows(SyntaxCheckException.class,
-        () -> parser.parse("SELECT * FROM hello+world"));
+    assertThrows(SyntaxCheckException.class, () -> parser.parse("SELECT * FROM hello+world"));
   }
 
   @Test
@@ -83,14 +81,12 @@ public void canParseIndexNameWithSpecialCharQuoted() {
 
   @Test
   public void canNotParseIndexNameStartingWithNumber() {
-    assertThrows(SyntaxCheckException.class,
-        () -> parser.parse("SELECT * FROM 123test"));
+    assertThrows(SyntaxCheckException.class, () -> parser.parse("SELECT * FROM 123test"));
   }
 
   @Test
   public void canNotParseIndexNameSingleQuoted() {
-    assertThrows(SyntaxCheckException.class,
-        () -> parser.parse("SELECT * FROM 'test'"));
+    assertThrows(SyntaxCheckException.class, () -> parser.parse("SELECT * FROM 'test'"));
   }
 
   @Test
@@ -100,14 +96,15 @@ public void canParseWhereClause() {
 
   @Test
   public void canParseSelectClauseWithLogicalOperator() {
-    assertNotNull(parser.parse(
-        "SELECT age = 10 AND name = 'John' OR NOT (balance > 1000) FROM test"));
+    assertNotNull(
+        parser.parse("SELECT age = 10 AND name = 'John' OR NOT (balance > 1000) FROM test"));
   }
 
   @Test
   public void canParseWhereClauseWithLogicalOperator() {
-    assertNotNull(parser.parse("SELECT name FROM test "
-        + "WHERE age = 10 AND name = 'John' OR NOT (balance > 1000)"));
+    assertNotNull(
+        parser.parse(
+            "SELECT name FROM test " + "WHERE age = 10 AND name = 'John' OR NOT (balance > 1000)"));
   }
 
   @Test
@@ -127,9 +124,11 @@ public void canParseDistinctClause() {
   @Test
   public void canParseCaseStatement() {
     assertNotNull(parser.parse("SELECT CASE WHEN age > 30 THEN 'age1' ELSE 'age2' END FROM test"));
-    assertNotNull(parser.parse("SELECT CASE WHEN age > 30 THEN 'age1' "
-                                        + " WHEN age < 50 THEN 'age2' "
-                                        + " ELSE 'age3' END FROM test"));
+    assertNotNull(
+        parser.parse(
+            "SELECT CASE WHEN age > 30 THEN 'age1' "
+                + " WHEN age < 50 THEN 'age2' "
+                + " ELSE 'age3' END FROM test"));
     assertNotNull(parser.parse("SELECT CASE age WHEN 30 THEN 'age1' ELSE 'age2' END FROM test"));
     assertNotNull(parser.parse("SELECT CASE age WHEN 30 THEN 'age1' END FROM test"));
   }
@@ -146,10 +145,11 @@ public void canNotParseAggregateFunctionWithWrongArgument() {
   public void canParseOrderByClause() {
     assertNotNull(parser.parse("SELECT name, age FROM test ORDER BY name, age"));
     assertNotNull(parser.parse("SELECT name, age FROM test ORDER BY name ASC, age DESC"));
-    assertNotNull(parser.parse(
-        "SELECT name, age FROM test ORDER BY name NULLS LAST, age NULLS FIRST"));
-    assertNotNull(parser.parse(
-        "SELECT name, age FROM test ORDER BY name ASC NULLS FIRST, age DESC NULLS LAST"));
+    assertNotNull(
+        parser.parse("SELECT name, age FROM test ORDER BY name NULLS LAST, age NULLS FIRST"));
+    assertNotNull(
+        parser.parse(
+            "SELECT name, age FROM test ORDER BY name ASC NULLS FIRST, age DESC NULLS LAST"));
   }
 
   @Test
@@ -167,16 +167,69 @@ private static Stream<Arguments> nowLikeFunctionsData() {
         Arguments.of("curtime", true, false),
         Arguments.of("current_time", true, true),
         Arguments.of("curdate", false, false),
-        Arguments.of("current_date", false, true)
-    );
+        Arguments.of("current_date", false, true),
+        Arguments.of("utc_date", false, true),
+        Arguments.of("utc_time", false, true),
+        Arguments.of("utc_timestamp", false, true));
+  }
+
+  private static Stream<Arguments> getPartForExtractFunction() {
+    return Stream.of(
+        Arguments.of("MICROSECOND"),
+        Arguments.of("SECOND"),
+        Arguments.of("MINUTE"),
+        Arguments.of("HOUR"),
+        Arguments.of("DAY"),
+        Arguments.of("WEEK"),
+        Arguments.of("MONTH"),
+        Arguments.of("QUARTER"),
+        Arguments.of("YEAR"),
+        Arguments.of("SECOND_MICROSECOND"),
+        Arguments.of("MINUTE_MICROSECOND"),
+        Arguments.of("MINUTE_SECOND"),
+        Arguments.of("HOUR_MICROSECOND"),
+        Arguments.of("HOUR_SECOND"),
+        Arguments.of("HOUR_MINUTE"),
+        Arguments.of("DAY_MICROSECOND"),
+        Arguments.of("DAY_SECOND"),
+        Arguments.of("DAY_MINUTE"),
+        Arguments.of("DAY_HOUR"),
+        Arguments.of("YEAR_MONTH"));
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("getPartForExtractFunction")
+  public void can_parse_extract_function(String part) {
+    assertNotNull(parser.parse(String.format("SELECT extract(%s FROM \"2023-02-06\")", part)));
+  }
+
+  private static Stream<Arguments> getInvalidPartForExtractFunction() {
+    return Stream.of(Arguments.of("INVALID"), Arguments.of("\"SECOND\""), Arguments.of("123"));
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("getInvalidPartForExtractFunction")
+  public void cannot_parse_extract_function_invalid_part(String part) {
+    assertThrows(
+        SyntaxCheckException.class,
+        () -> parser.parse(String.format("SELECT extract(%s FROM \"2023-02-06\")", part)));
+  }
+
+  @Test
+  public void can_parse_weekday_function() {
+    assertNotNull(parser.parse("SELECT weekday('2022-11-18')"));
+    assertNotNull(parser.parse("SELECT day_of_week('2022-11-18')"));
   }
 
   @ParameterizedTest(name = "{0}")
   @MethodSource("nowLikeFunctionsData")
   public void can_parse_now_like_functions(String name, Boolean hasFsp, Boolean hasShortcut) {
-    var calls = new ArrayList<String>() {{
-        add(name + "()");
-      }};
+    var calls =
+        new ArrayList<String>() {
+          {
+            add(name + "()");
+          }
+        };
     if (hasShortcut) {
       calls.add(name);
     }
@@ -190,6 +243,37 @@ public void can_parse_now_like_functions(String name, Boolean hasFsp, Boolean ha
     assertNotNull(parser.parse("SELECT id FROM test WHERE " + String.join(" AND ", calls)));
   }
 
+  private static Stream<Arguments> get_format_arguments() {
+    Stream.Builder<Arguments> args = Stream.builder();
+    String[] types = {"DATE", "DATETIME", "TIME", "TIMESTAMP"};
+    String[] formats = {"'USA'", "'JIS'", "'ISO'", "'EUR'", "'INTERNAL'"};
+
+    for (String type : types) {
+      for (String format : formats) {
+        args.add(Arguments.of(type, format));
+      }
+    }
+
+    return args.build();
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("get_format_arguments")
+  public void can_parse_get_format_function(String type, String format) {
+    assertNotNull(parser.parse(String.format("SELECT GET_FORMAT(%s, %s)", type, format)));
+  }
+
+  @Test
+  public void cannot_parse_get_format_function_with_bad_arg() {
+    assertThrows(
+        SyntaxCheckException.class, () -> parser.parse("GET_FORMAT(NONSENSE_ARG,'INTERNAL')"));
+  }
+
+  @Test
+  public void can_parse_hour_functions() {
+    assertNotNull(parser.parse("SELECT hour('2022-11-18 12:23:34')"));
+    assertNotNull(parser.parse("SELECT hour_of_day('12:23:34')"));
+  }
 
   @Test
   public void can_parse_week_of_year_functions() {
@@ -197,12 +281,33 @@ public void can_parse_week_of_year_functions() {
     assertNotNull(parser.parse("SELECT week_of_year('2022-11-18')"));
   }
 
+  @Test
+  public void can_parse_dayofmonth_functions() {
+    assertNotNull(parser.parse("SELECT dayofmonth('2022-11-18')"));
+    assertNotNull(parser.parse("SELECT day_of_month('2022-11-18')"));
+  }
+
+  @Test
+  public void can_parse_day_of_week_functions() {
+    assertNotNull(parser.parse("SELECT dayofweek('2022-11-18')"));
+    assertNotNull(parser.parse("SELECT day_of_week('2022-11-18')"));
+  }
+
   @Test
   public void can_parse_dayofyear_functions() {
     assertNotNull(parser.parse("SELECT dayofyear('2022-11-18')"));
     assertNotNull(parser.parse("SELECT day_of_year('2022-11-18')"));
   }
 
+  @Test
+  public void can_parse_minute_functions() {
+    assertNotNull(parser.parse("SELECT minute('12:23:34')"));
+    assertNotNull(parser.parse("SELECT minute_of_hour('12:23:34')"));
+
+    assertNotNull(parser.parse("SELECT minute('2022-12-20 12:23:34')"));
+    assertNotNull(parser.parse("SELECT minute_of_hour('2022-12-20 12:23:34')"));
+  }
+
   @Test
   public void can_parse_month_of_year_function() {
     assertNotNull(parser.parse("SELECT month('2022-11-18')"));
@@ -216,196 +321,198 @@ public void can_parse_month_of_year_function() {
 
     assertNotNull(parser.parse("SELECT month(timestamp('2022-11-18 00:00:00'))"));
     assertNotNull(parser.parse("SELECT month_of_year(timestamp('2022-11-18 00:00:00'))"));
-
   }
 
   @Test
   public void can_parse_multi_match_relevance_function() {
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multimatch(\"fields\"=\"field\", query=\"query\")"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multimatchquery(fields=\"field\", \"query\"=\"query\")"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match(\"fields\"=\"field\", \"query\"=\"query\")"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match(\'fields\'=\'field\', \'query\'=\'query\')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match(fields=\'field\', query=\'query\')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match(['address'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match(['address', 'notes'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match([\"*\"], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match([\"address\"], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match([`address`], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match([address], 'query')"));
-
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE"
-            + " multi_match(['address' ^ 1.0, 'notes' ^ 2.2], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match(['address' ^ 1.1, 'notes'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match(['address', 'notes' ^ 1.5], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match(['address', 'notes' 3], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE multi_match(['address' ^ .3, 'notes' 3], 'query')"));
-
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE"
-            + " multi_match([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE"
-            + " multi_match([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query', analyzer=keyword,"
-            + "operator='AND', tie_breaker=0.3, type = \"most_fields\", fuzziness = \"AUTO\")"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE multimatch(\"fields\"=\"field\", query=\"query\")"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE multimatchquery(fields=\"field\", \"query\"=\"query\")"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE multi_match(\"fields\"=\"field\", \"query\"=\"query\")"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE multi_match(\'fields\'=\'field\', \'query\'=\'query\')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE multi_match(fields=\'field\', query=\'query\')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE multi_match(['address'], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE multi_match(['address', 'notes'], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE multi_match([\"*\"], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE multi_match([\"address\"], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE multi_match([`address`], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE multi_match([address], 'query')"));
+
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE"
+                + " multi_match(['address' ^ 1.0, 'notes' ^ 2.2], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE multi_match(['address' ^ 1.1, 'notes'], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE multi_match(['address', 'notes' ^ 1.5], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE multi_match(['address', 'notes' 3], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE multi_match(['address' ^ .3, 'notes' 3], 'query')"));
+
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE"
+                + " multi_match([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE multi_match([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query',"
+                + " analyzer=keyword,operator='AND', tie_breaker=0.3, type = \"most_fields\","
+                + " fuzziness = \"AUTO\")"));
+  }
+
+  @Test
+  public void can_parse_second_functions() {
+    assertNotNull(parser.parse("SELECT second('12:23:34')"));
+    assertNotNull(parser.parse("SELECT second_of_minute('2022-11-18')"));
+    assertNotNull(parser.parse("SELECT second('2022-11-18 12:23:34')"));
+    assertNotNull(parser.parse("SELECT second_of_minute('2022-11-18 12:23:34')"));
   }
 
   @Test
   public void can_parse_simple_query_string_relevance_function() {
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE simple_query_string(['address'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE simple_query_string(['address', 'notes'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE simple_query_string([\"*\"], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE simple_query_string([\"address\"], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE simple_query_string([`address`], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE simple_query_string([address], 'query')"));
-
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE"
-            + " simple_query_string(['address' ^ 1.0, 'notes' ^ 2.2], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE simple_query_string(['address' ^ 1.1, 'notes'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE simple_query_string(['address', 'notes' ^ 1.5], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE simple_query_string(['address', 'notes' 3], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE simple_query_string(['address' ^ .3, 'notes' 3], 'query')"));
-
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE"
-            + " simple_query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE"
-            + " simple_query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query', analyzer=keyword,"
-            + "flags='AND', quote_field_suffix=\".exact\", fuzzy_prefix_length = 4)"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE simple_query_string(['address'], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE simple_query_string(['address', 'notes'], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE simple_query_string([\"*\"], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE simple_query_string([\"address\"], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE simple_query_string([`address`], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE simple_query_string([address], 'query')"));
+
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE"
+                + " simple_query_string(['address' ^ 1.0, 'notes' ^ 2.2], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE simple_query_string(['address' ^ 1.1, 'notes'], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE simple_query_string(['address', 'notes' ^ 1.5], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE simple_query_string(['address', 'notes' 3], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE simple_query_string(['address' ^ .3, 'notes' 3], 'query')"));
+
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE"
+                + " simple_query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE simple_query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2],"
+                + " 'query', analyzer=keyword,flags='AND', quote_field_suffix=\".exact\","
+                + " fuzzy_prefix_length = 4)"));
   }
 
   @Test
-  public void can_parse_query_string_relevance_function() {
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string(['*'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string(['address'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string(['add*'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string(['*ess'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string(['address', 'notes'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([\"*\"], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([\"address\"], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([\"ad*\"], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([\"*s\"], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([\"address\", \"notes\"], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([`*`], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([`address`], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([`ad*`], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([`*ss`], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([`address`, `notes`], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([address], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([addr*], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([*ss], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([address, notes], 'query')"));
-
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE"
-            + " query_string(['address' ^ 1.0, 'notes' ^ 2.2], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string(['address' ^ 1.1, 'notes'], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string(['address', 'notes' ^ 1.5], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string(['address', 'notes' 3], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string(['address' ^ .3, 'notes' 3], 'query')"));
-
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE"
-            + " query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query')"));
-    assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE"
-            + " query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query', analyzer=keyword,"
-            + "operator='AND', tie_breaker=0.3, type = \"most_fields\", fuzziness = 4)"));
+  public void can_parse_str_to_date() {
+    assertNotNull(parser.parse("SELECT STR_TO_DATE('01,5,2013','%d,%m,%Y')"));
+
+    assertNotNull(parser.parse("SELECT STR_TO_DATE('a09:30:17','a%h:%i:%s')"));
+
+    assertNotNull(parser.parse("SELECT STR_TO_DATE('abc','abc');"));
   }
 
+  @Test
+  public void can_parse_query_string_relevance_function() {
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string(['*'], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string(['address'], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string(['add*'], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string(['*ess'], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE query_string(['address', 'notes'], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string([\"*\"], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string([\"address\"], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string([\"ad*\"], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string([\"*s\"], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE query_string([\"address\", \"notes\"], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string([`*`], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string([`address`], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string([`ad*`], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string([`*ss`], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE query_string([`address`, `notes`], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string([address], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string([addr*], 'query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query_string([*ss], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE query_string([address, notes], 'query')"));
+
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE"
+                + " query_string(['address' ^ 1.0, 'notes' ^ 2.2], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE query_string(['address' ^ 1.1, 'notes'], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE query_string(['address', 'notes' ^ 1.5], 'query')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE query_string(['address', 'notes' 3], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE query_string(['address' ^ .3, 'notes' 3], 'query')"));
+
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE"
+                + " query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query')"));
+    assertNotNull(
+        parser.parse(
+            "SELECT id FROM test WHERE"
+                + " query_string([\"Tags\" ^ 1.5, Title, `Body` 4.2], 'query', analyzer=keyword,"
+                + "operator='AND', tie_breaker=0.3, type = \"most_fields\", fuzziness = 4)"));
+  }
 
   @Test
   public void can_parse_query_relevance_function() {
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query('address:query')"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query('address:query OR notes:query')"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query(\"address:query\")"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query(\"address:query OR notes:query\")"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query(`address:query`)"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query(`address:query OR notes:query`)"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query('*:query')"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query(\"*:query\")"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query(`*:query`)"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query('address:*uery OR notes:?uery')"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query(\"address:*uery OR notes:?uery\")"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query(`address:*uery OR notes:?uery`)"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query('address:qu*ry OR notes:qu?ry')"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query(\"address:qu*ry OR notes:qu?ry\")"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query(`address:qu*ry OR notes:qu?ry`)"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query('address:query notes:query')"));
-    assertNotNull(parser.parse(
-            "SELECT id FROM test WHERE query(\"address:query notes:query\")"));
-    assertNotNull(parser.parse(
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query('address:query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query('address:query OR notes:query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query(\"address:query\")"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE query(\"address:query OR notes:query\")"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query(`address:query`)"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query(`address:query OR notes:query`)"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query('*:query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query(\"*:query\")"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query(`*:query`)"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query('address:*uery OR notes:?uery')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE query(\"address:*uery OR notes:?uery\")"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query(`address:*uery OR notes:?uery`)"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query('address:qu*ry OR notes:qu?ry')"));
+    assertNotNull(
+        parser.parse("SELECT id FROM test WHERE query(\"address:qu*ry OR notes:qu?ry\")"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query(`address:qu*ry OR notes:qu?ry`)"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query('address:query notes:query')"));
+    assertNotNull(parser.parse("SELECT id FROM test WHERE query(\"address:query notes:query\")"));
+    assertNotNull(
+        parser.parse(
             "SELECT id FROM test WHERE "
-                    + "query(\"Body:\'taste beer\' Tags:\'taste beer\'  Title:\'taste beer\'\")"));
+                + "query(\"Body:\'taste beer\' Tags:\'taste beer\'  Title:\'taste beer\'\")"));
   }
 
-
   @Test
   public void can_parse_match_relevance_function() {
     assertNotNull(parser.parse("SELECT * FROM test WHERE match(column, \"this is a test\")"));
@@ -419,19 +526,18 @@ public void can_parse_match_relevance_function() {
   public void can_parse_matchquery_relevance_function() {
     assertNotNull(parser.parse("SELECT * FROM test WHERE matchquery(column, \"this is a test\")"));
     assertNotNull(parser.parse("SELECT * FROM test WHERE matchquery(column, 'this is a test')"));
-    assertNotNull(parser.parse(
-        "SELECT * FROM test WHERE matchquery(`column`, \"this is a test\")"));
+    assertNotNull(
+        parser.parse("SELECT * FROM test WHERE matchquery(`column`, \"this is a test\")"));
     assertNotNull(parser.parse("SELECT * FROM test WHERE matchquery(`column`, 'this is a test')"));
     assertNotNull(parser.parse("SELECT * FROM test WHERE matchquery(column, 100500)"));
   }
 
   @Test
   public void can_parse_match_query_relevance_function() {
-    assertNotNull(parser.parse(
-        "SELECT * FROM test WHERE match_query(column, \"this is a test\")"));
+    assertNotNull(parser.parse("SELECT * FROM test WHERE match_query(column, \"this is a test\")"));
     assertNotNull(parser.parse("SELECT * FROM test WHERE match_query(column, 'this is a test')"));
-    assertNotNull(parser.parse(
-        "SELECT * FROM test WHERE match_query(`column`, \"this is a test\")"));
+    assertNotNull(
+        parser.parse("SELECT * FROM test WHERE match_query(`column`, \"this is a test\")"));
     assertNotNull(parser.parse("SELECT * FROM test WHERE match_query(`column`, 'this is a test')"));
     assertNotNull(parser.parse("SELECT * FROM test WHERE match_query(column, 100500)"));
   }
@@ -439,15 +545,57 @@ public void can_parse_match_query_relevance_function() {
   @Test
   public void can_parse_match_phrase_relevance_function() {
     assertNotNull(
-            parser.parse("SELECT * FROM test WHERE match_phrase(column, \"this is a test\")"));
+        parser.parse("SELECT * FROM test WHERE match_phrase(column, \"this is a test\")"));
     assertNotNull(parser.parse("SELECT * FROM test WHERE match_phrase(column, 'this is a test')"));
     assertNotNull(
-            parser.parse("SELECT * FROM test WHERE match_phrase(`column`, \"this is a test\")"));
+        parser.parse("SELECT * FROM test WHERE match_phrase(`column`, \"this is a test\")"));
     assertNotNull(
-            parser.parse("SELECT * FROM test WHERE match_phrase(`column`, 'this is a test')"));
+        parser.parse("SELECT * FROM test WHERE match_phrase(`column`, 'this is a test')"));
     assertNotNull(parser.parse("SELECT * FROM test WHERE match_phrase(column, 100500)"));
   }
 
+  @Test
+  public void can_parse_minute_of_day_function() {
+    assertNotNull(parser.parse("SELECT minute_of_day(\"12:23:34\");"));
+    assertNotNull(parser.parse("SELECT minute_of_day('12:23:34');"));
+    ;
+    assertNotNull(parser.parse("SELECT minute_of_day(\"2022-12-14 12:23:34\");"));
+    ;
+    assertNotNull(parser.parse("SELECT minute_of_day('2022-12-14 12:23:34');"));
+    ;
+  }
+
+  @Test
+  public void can_parse_sec_to_time_function() {
+    assertNotNull(parser.parse("SELECT sec_to_time(-6897)"));
+    assertNotNull(parser.parse("SELECT sec_to_time(6897)"));
+    assertNotNull(parser.parse("SELECT sec_to_time(6897.123)"));
+  }
+
+  @Test
+  public void can_parse_last_day_function() {
+    assertNotNull(parser.parse("SELECT last_day(\"2017-06-20\")"));
+    assertNotNull(parser.parse("SELECT last_day('2004-01-01 01:01:01')"));
+  }
+
+  @Test
+  public void can_parse_timestampadd_function() {
+    assertNotNull(parser.parse("SELECT TIMESTAMPADD(MINUTE, 1, '2003-01-02')"));
+    assertNotNull(parser.parse("SELECT TIMESTAMPADD(WEEK,1,'2003-01-02')"));
+  }
+
+  @Test
+  public void can_parse_timestampdiff_function() {
+    assertNotNull(parser.parse("SELECT TIMESTAMPDIFF(MINUTE, '2003-01-02', '2003-01-02')"));
+    assertNotNull(parser.parse("SELECT TIMESTAMPDIFF(WEEK,'2003-01-02','2003-01-02')"));
+  }
+
+  @Test
+  public void can_parse_to_seconds_function() {
+    assertNotNull(parser.parse("SELECT to_seconds(\"2023-02-20\")"));
+    assertNotNull(parser.parse("SELECT to_seconds(950501)"));
+  }
+
   @Test
   public void can_parse_wildcard_query_relevance_function() {
     assertNotNull(
@@ -459,43 +607,98 @@ public void can_parse_wildcard_query_relevance_function() {
     assertNotNull(
         parser.parse("SELECT * FROM test WHERE wildcard_query(`column`, 'this is a test*')"));
     assertNotNull(
-        parser.parse("SELECT * FROM test WHERE wildcard_query(`column`, 'this is a test*', "
-            + "boost=1.5, case_insensitive=true, rewrite=\"scoring_boolean\")"));
+        parser.parse(
+            "SELECT * FROM test WHERE wildcard_query(`column`, 'this is a test*', "
+                + "boost=1.5, case_insensitive=true, rewrite=\"scoring_boolean\")"));
+  }
+
+  @Test
+  public void can_parse_nested_function() {
+    assertNotNull(parser.parse("SELECT NESTED(PATH.INNER_FIELD) FROM TEST"));
+    assertNotNull(parser.parse("SELECT NESTED('PATH.INNER_FIELD') FROM TEST"));
+    assertNotNull(parser.parse("SELECT SUM(NESTED(PATH.INNER_FIELD)) FROM TEST"));
+    assertNotNull(parser.parse("SELECT NESTED(PATH.INNER_FIELD, PATH) FROM TEST"));
+    assertNotNull(parser.parse("SELECT * FROM TEST WHERE NESTED(PATH.INNER_FIELDS) = 'A'"));
+    assertNotNull(parser.parse("SELECT * FROM TEST WHERE NESTED(PATH.INNER_FIELDS, PATH) = 'A'"));
+    assertNotNull(parser.parse("SELECT FIELD FROM TEST ORDER BY nested(PATH.INNER_FIELD, PATH)"));
+  }
+
+  @Test
+  public void can_parse_yearweek_function() {
+    assertNotNull(parser.parse("SELECT yearweek('1987-01-01')"));
+    assertNotNull(parser.parse("SELECT yearweek('1987-01-01', 1)"));
   }
 
   @ParameterizedTest
   @MethodSource({
-      "matchPhraseComplexQueries",
-      "matchPhraseGeneratedQueries",
-      "generateMatchPhraseQueries",
-      "matchPhraseQueryComplexQueries"
+    "matchPhraseComplexQueries",
+    "matchPhraseGeneratedQueries",
+    "generateMatchPhraseQueries",
+    "matchPhraseQueryComplexQueries"
   })
   public void canParseComplexMatchPhraseArgsTest(String query) {
     assertNotNull(parser.parse(query));
   }
 
   @ParameterizedTest
-  @MethodSource({
-      "generateMatchPhrasePrefixQueries"
-  })
+  @MethodSource({"generateMatchPhrasePrefixQueries"})
   public void canParseComplexMatchPhrasePrefixQueries(String query) {
     assertNotNull(parser.parse(query));
   }
 
   private static Stream<String> matchPhraseComplexQueries() {
     return Stream.of(
-      "SELECT * FROM t WHERE match_phrase(c, 3)",
-      "SELECT * FROM t WHERE match_phrase(c, 3, fuzziness=AUTO)",
-      "SELECT * FROM t WHERE match_phrase(c, 3, zero_terms_query=\"all\")",
-      "SELECT * FROM t WHERE match_phrase(c, 3, lenient=true)",
-      "SELECT * FROM t WHERE match_phrase(c, 3, lenient='true')",
-      "SELECT * FROM t WHERE match_phrase(c, 3, operator=xor)",
-      "SELECT * FROM t WHERE match_phrase(c, 3, cutoff_frequency=0.04)",
-      "SELECT * FROM t WHERE match_phrase(c, 3, cutoff_frequency=0.04, analyzer = english, "
-              + "prefix_length=34, fuzziness='auto', minimum_should_match='2<-25% 9<-3')",
-      "SELECT * FROM t WHERE match_phrase(c, 3, minimum_should_match='2<-25% 9<-3')",
-      "SELECT * FROM t WHERE match_phrase(c, 3, operator='AUTO')"
-    );
+        "SELECT * FROM t WHERE match_phrase(c, 3)",
+        "SELECT * FROM t WHERE match_phrase(c, 3, fuzziness=AUTO)",
+        "SELECT * FROM t WHERE match_phrase(c, 3, zero_terms_query=\"all\")",
+        "SELECT * FROM t WHERE match_phrase(c, 3, lenient=true)",
+        "SELECT * FROM t WHERE match_phrase(c, 3, lenient='true')",
+        "SELECT * FROM t WHERE match_phrase(c, 3, operator=xor)",
+        "SELECT * FROM t WHERE match_phrase(c, 3, cutoff_frequency=0.04)",
+        "SELECT * FROM t WHERE match_phrase(c, 3, cutoff_frequency=0.04, analyzer = english, "
+            + "prefix_length=34, fuzziness='auto', minimum_should_match='2<-25% 9<-3')",
+        "SELECT * FROM t WHERE match_phrase(c, 3, minimum_should_match='2<-25% 9<-3')",
+        "SELECT * FROM t WHERE match_phrase(c, 3, operator='AUTO')");
+  }
+
+  @Test
+  public void canParseMatchQueryAlternateSyntax() {
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = matchquery('query')"));
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = matchquery(\"query\")"));
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = match_query('query')"));
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = match_query(\"query\")"));
+  }
+
+  @Test
+  public void canParseMatchPhraseAlternateSyntax() {
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = match_phrase('query')"));
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = match_phrase(\"query\")"));
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = matchphrase('query')"));
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = matchphrase(\"query\")"));
+  }
+
+  @Test
+  public void canParseMultiMatchAlternateSyntax() {
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = multi_match('query')"));
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = multi_match(\"query\")"));
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = multimatch('query')"));
+    assertNotNull(parser.parse("SELECT * FROM test WHERE Field = multimatch(\"query\")"));
+  }
+
+  @Test
+  public void canParseIfFunction() {
+    assertNotNull(parser.parse("SELECT IF(1 > 2, 1, 0)"));
+    assertNotNull(parser.parse("SELECT IF(1 < 2, 1, 0)"));
+    assertNotNull(parser.parse("SELECT IF(1 >= 2, 1, 0)"));
+    assertNotNull(parser.parse("SELECT IF(1 <= 2, 1, 0)"));
+    assertNotNull(parser.parse("SELECT IF(1 <> 2, 1, 0)"));
+    assertNotNull(parser.parse("SELECT IF(1 != 2, 1, 0)"));
+    assertNotNull(parser.parse("SELECT IF(1 = 2, 1, 0)"));
+    assertNotNull(parser.parse("SELECT IF(true, 1, 0)"));
+    assertNotNull(parser.parse("SELECT IF(1 IS NOT NULL, 1, 0)"));
+    assertNotNull(parser.parse("SELECT IF(NOT 1 > 2, 1, 0)"));
+    assertNotNull(parser.parse("SELECT IF(NOT 1 IN (0, 1), 1, 0)"));
+    assertNotNull(parser.parse("SELECT IF(NOT 1 IN (0, 1) OR 1 IS NOT NULL, 1, 0)"));
   }
 
   private static Stream<String> matchPhraseQueryComplexQueries() {
@@ -510,50 +713,51 @@ private static Stream<String> matchPhraseQueryComplexQueries() {
         "SELECT * FROM t WHERE matchphrasequery(c, 3, cutoff_frequency=0.04, analyzer = english, "
             + "prefix_length=34, fuzziness='auto', minimum_should_match='2<-25% 9<-3')",
         "SELECT * FROM t WHERE matchphrasequery(c, 3, minimum_should_match='2<-25% 9<-3')",
-        "SELECT * FROM t WHERE matchphrasequery(c, 3, operator='AUTO')"
-    );
+        "SELECT * FROM t WHERE matchphrasequery(c, 3, operator='AUTO')");
   }
 
   private static Stream<String> matchPhraseGeneratedQueries() {
     var matchArgs = new HashMap<String, Object[]>();
-    matchArgs.put("fuzziness", new String[]{ "AUTO", "AUTO:1,5", "1" });
-    matchArgs.put("fuzzy_transpositions", new Boolean[]{ true, false });
-    matchArgs.put("operator", new String[]{ "and", "or" });
-    matchArgs.put("minimum_should_match",
-            new String[]{ "3", "-2", "75%", "-25%", "3<90%", "2<-25% 9<-3" });
-    matchArgs.put("analyzer", new String[]{ "standard", "stop", "english" });
-    matchArgs.put("zero_terms_query", new String[]{ "none", "all" });
-    matchArgs.put("lenient", new Boolean[]{ true, false });
+    matchArgs.put("fuzziness", new String[] {"AUTO", "AUTO:1,5", "1"});
+    matchArgs.put("fuzzy_transpositions", new Boolean[] {true, false});
+    matchArgs.put("operator", new String[] {"and", "or"});
+    matchArgs.put(
+        "minimum_should_match", new String[] {"3", "-2", "75%", "-25%", "3<90%", "2<-25% 9<-3"});
+    matchArgs.put("analyzer", new String[] {"standard", "stop", "english"});
+    matchArgs.put("zero_terms_query", new String[] {"none", "all"});
+    matchArgs.put("lenient", new Boolean[] {true, false});
     // deprecated
-    matchArgs.put("cutoff_frequency", new Double[]{ .0, 0.001, 1., 42. });
-    matchArgs.put("prefix_length", new Integer[]{ 0, 2, 5 });
-    matchArgs.put("max_expansions", new Integer[]{ 0, 5, 20 });
-    matchArgs.put("boost", new Double[]{ .5, 1., 2.3 });
+    matchArgs.put("cutoff_frequency", new Double[] {.0, 0.001, 1., 42.});
+    matchArgs.put("prefix_length", new Integer[] {0, 2, 5});
+    matchArgs.put("max_expansions", new Integer[] {0, 5, 20});
+    matchArgs.put("boost", new Double[] {.5, 1., 2.3});
 
     return generateQueries("match", matchArgs);
   }
 
   private static Stream<String> generateMatchPhraseQueries() {
     var matchPhraseArgs = new HashMap<String, Object[]>();
-    matchPhraseArgs.put("analyzer", new String[]{ "standard", "stop", "english" });
-    matchPhraseArgs.put("max_expansions", new Integer[]{ 0, 5, 20 });
-    matchPhraseArgs.put("slop", new Integer[]{ 0, 1, 2 });
+    matchPhraseArgs.put("analyzer", new String[] {"standard", "stop", "english"});
+    matchPhraseArgs.put("max_expansions", new Integer[] {0, 5, 20});
+    matchPhraseArgs.put("slop", new Integer[] {0, 1, 2});
 
     return generateQueries("match_phrase", matchPhraseArgs);
   }
 
   private static Stream<String> generateMatchPhrasePrefixQueries() {
-    return generateQueries("match_phrase_prefix", ImmutableMap.<String, Object[]>builder()
-        .put("analyzer", new String[] {"standard", "stop", "english"})
-        .put("slop", new Integer[] {0, 1, 2})
-        .put("max_expansions", new Integer[] {0, 3, 10})
-        .put("zero_terms_query", new String[] {"NONE", "ALL", "NULL"})
-        .put("boost", new Float[] {-0.5f, 1.0f, 1.2f})
-        .build());
-  }
-
-  private static Stream<String> generateQueries(String function,
-                                                Map<String, Object[]> functionArgs) {
+    return generateQueries(
+        "match_phrase_prefix",
+        ImmutableMap.<String, Object[]>builder()
+            .put("analyzer", new String[] {"standard", "stop", "english"})
+            .put("slop", new Integer[] {0, 1, 2})
+            .put("max_expansions", new Integer[] {0, 3, 10})
+            .put("zero_terms_query", new String[] {"NONE", "ALL", "NULL"})
+            .put("boost", new Float[] {-0.5f, 1.0f, 1.2f})
+            .build());
+  }
+
+  private static Stream<String> generateQueries(
+      String function, Map<String, Object[]> functionArgs) {
     var rand = new Random(0);
 
     class QueryGenerator implements Iterator<String> {
@@ -561,7 +765,7 @@ class QueryGenerator implements Iterator<String> {
       private int currentQuery = 0;
 
       private String randomIdentifier() {
-        return RandomStringUtils.random(10, 0, 0,true, false, null, rand);
+        return RandomStringUtils.random(10, 0, 0, true, false, null, rand);
       }
 
       @Override
@@ -575,16 +779,17 @@ public String next() {
         currentQuery += 1;
 
         StringBuilder query = new StringBuilder();
-        query.append(String.format("SELECT * FROM test WHERE %s(%s, %s", function,
-            randomIdentifier(),
-            randomIdentifier()));
+        query.append(
+            String.format(
+                "SELECT * FROM test WHERE %s(%s, %s",
+                function, randomIdentifier(), randomIdentifier()));
         var args = new ArrayList<String>();
         for (var pair : functionArgs.entrySet()) {
           if (rand.nextBoolean()) {
             var arg = new StringBuilder();
             arg.append(rand.nextBoolean() ? "," : ", ");
-            arg.append(rand.nextBoolean() ? pair.getKey().toLowerCase()
-                    : pair.getKey().toUpperCase());
+            arg.append(
+                rand.nextBoolean() ? pair.getKey().toLowerCase() : pair.getKey().toUpperCase());
             arg.append(rand.nextBoolean() ? "=" : " = ");
             if (pair.getValue() instanceof String[] || rand.nextBoolean()) {
               var quoteSymbol = rand.nextBoolean() ? '\'' : '"';
diff --git a/sql/src/test/java/org/opensearch/sql/sql/domain/SQLQueryRequestTest.java b/sql/src/test/java/org/opensearch/sql/sql/domain/SQLQueryRequestTest.java
index 52a1f534e9..2b64b13b35 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/domain/SQLQueryRequestTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/domain/SQLQueryRequestTest.java
@@ -3,66 +3,77 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.domain;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.ImmutableMap;
+import java.util.HashMap;
 import java.util.Map;
 import org.json.JSONObject;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.protocol.response.format.Format;
 
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 public class SQLQueryRequestTest {
 
   @Test
-  public void shouldSupportQuery() {
+  public void should_support_query() {
     SQLQueryRequest request = SQLQueryRequestBuilder.request("SELECT 1").build();
     assertTrue(request.isSupported());
   }
 
   @Test
-  public void shouldSupportQueryWithJDBCFormat() {
-    SQLQueryRequest request = SQLQueryRequestBuilder.request("SELECT 1")
-                                                    .format("jdbc")
-                                                    .build();
-    assertTrue(request.isSupported());
-    assertEquals(request.format(), Format.JDBC);
+  public void should_support_query_with_JDBC_format() {
+    SQLQueryRequest request = SQLQueryRequestBuilder.request("SELECT 1").format("jdbc").build();
+    assertAll(
+        () -> assertTrue(request.isSupported()), () -> assertEquals(request.format(), Format.JDBC));
   }
 
   @Test
-  public void shouldSupportQueryWithQueryFieldOnly() {
+  public void should_support_query_with_query_field_only() {
     SQLQueryRequest request =
-        SQLQueryRequestBuilder.request("SELECT 1")
-                              .jsonContent("{\"query\": \"SELECT 1\"}")
-                              .build();
+        SQLQueryRequestBuilder.request("SELECT 1").jsonContent("{\"query\": \"SELECT 1\"}").build();
     assertTrue(request.isSupported());
   }
 
   @Test
-  public void shouldSupportQueryWithParameters() {
-    SQLQueryRequest request =
+  public void should_support_query_with_parameters() {
+    SQLQueryRequest requestWithContent =
         SQLQueryRequestBuilder.request("SELECT 1")
             .jsonContent("{\"query\": \"SELECT 1\", \"parameters\":[]}")
             .build();
-    assertTrue(request.isSupported());
+    SQLQueryRequest requestWithParams =
+        SQLQueryRequestBuilder.request("SELECT 1").params(Map.of("one", "two")).build();
+    assertAll(
+        () -> assertTrue(requestWithContent.isSupported()),
+        () -> assertTrue(requestWithParams.isSupported()));
   }
 
   @Test
-  public void shouldSupportQueryWithZeroFetchSize() {
+  public void should_support_query_without_parameters() {
+    SQLQueryRequest requestWithNoParams =
+        SQLQueryRequestBuilder.request("SELECT 1").params(Map.of()).build();
+    assertTrue(requestWithNoParams.isSupported());
+  }
+
+  @Test
+  public void should_support_query_with_zero_fetch_size() {
     SQLQueryRequest request =
         SQLQueryRequestBuilder.request("SELECT 1")
-                              .jsonContent("{\"query\": \"SELECT 1\", \"fetch_size\": 0}")
-                              .build();
+            .jsonContent("{\"query\": \"SELECT 1\", \"fetch_size\": 0}")
+            .build();
     assertTrue(request.isSupported());
   }
 
   @Test
-  public void shouldSupportQueryWithParametersAndZeroFetchSize() {
+  public void should_support_query_with_parameters_and_zero_fetch_size() {
     SQLQueryRequest request =
         SQLQueryRequestBuilder.request("SELECT 1")
             .jsonContent("{\"query\": \"SELECT 1\", \"fetch_size\": 0, \"parameters\":[]}")
@@ -71,86 +82,154 @@ public void shouldSupportQueryWithParametersAndZeroFetchSize() {
   }
 
   @Test
-  public void shouldSupportExplain() {
+  public void should_support_explain() {
     SQLQueryRequest explainRequest =
-        SQLQueryRequestBuilder.request("SELECT 1")
-                              .path("_plugins/_sql/_explain")
-                              .build();
-    assertTrue(explainRequest.isExplainRequest());
-    assertTrue(explainRequest.isSupported());
+        SQLQueryRequestBuilder.request("SELECT 1").path("_plugins/_sql/_explain").build();
+
+    assertAll(
+        () -> assertTrue(explainRequest.isExplainRequest()),
+        () -> assertTrue(explainRequest.isSupported()));
   }
 
   @Test
-  public void shouldNotSupportCursorRequest() {
+  public void should_support_cursor_request() {
     SQLQueryRequest fetchSizeRequest =
         SQLQueryRequestBuilder.request("SELECT 1")
-                              .jsonContent("{\"query\": \"SELECT 1\", \"fetch_size\": 5}")
-                              .build();
-    assertFalse(fetchSizeRequest.isSupported());
+            .jsonContent("{\"query\": \"SELECT 1\", \"fetch_size\": 5}")
+            .build();
 
     SQLQueryRequest cursorRequest =
-        SQLQueryRequestBuilder.request("SELECT 1")
-                              .jsonContent("{\"cursor\": \"abcdefgh...\"}")
-                              .build();
-    assertFalse(cursorRequest.isSupported());
+        SQLQueryRequestBuilder.request(null).cursor("abcdefgh...").build();
+
+    assertAll(
+        () -> assertTrue(fetchSizeRequest.isSupported()),
+        () -> assertTrue(cursorRequest.isSupported()));
+  }
+
+  @Test
+  public void should_support_cursor_close_request() {
+    SQLQueryRequest closeRequest =
+        SQLQueryRequestBuilder.request(null).cursor("pewpew").path("_plugins/_sql/close").build();
+
+    SQLQueryRequest emptyCloseRequest =
+        SQLQueryRequestBuilder.request(null).cursor("").path("_plugins/_sql/close").build();
+
+    SQLQueryRequest pagingRequest = SQLQueryRequestBuilder.request(null).cursor("pewpew").build();
+
+    assertAll(
+        () -> assertTrue(closeRequest.isSupported()),
+        () -> assertTrue(closeRequest.isCursorCloseRequest()),
+        () -> assertTrue(pagingRequest.isSupported()),
+        () -> assertFalse(pagingRequest.isCursorCloseRequest()),
+        () -> assertFalse(emptyCloseRequest.isSupported()),
+        () -> assertTrue(emptyCloseRequest.isCursorCloseRequest()));
+  }
+
+  @Test
+  public void should_not_support_request_with_empty_cursor() {
+    SQLQueryRequest requestWithEmptyCursor =
+        SQLQueryRequestBuilder.request(null).cursor("").build();
+    SQLQueryRequest requestWithNullCursor =
+        SQLQueryRequestBuilder.request(null).cursor(null).build();
+    assertAll(
+        () -> assertFalse(requestWithEmptyCursor.isSupported()),
+        () -> assertFalse(requestWithNullCursor.isSupported()));
+  }
+
+  @Test
+  public void should_not_support_request_with_unknown_field() {
+    SQLQueryRequest request =
+        SQLQueryRequestBuilder.request("SELECT 1").jsonContent("{\"pewpew\": 42}").build();
+    assertFalse(request.isSupported());
+  }
+
+  @Test
+  public void should_not_support_request_with_cursor_and_something_else() {
+    SQLQueryRequest requestWithQuery =
+        SQLQueryRequestBuilder.request("SELECT 1").cursor("n:12356").build();
+    SQLQueryRequest requestWithParams =
+        SQLQueryRequestBuilder.request(null).cursor("n:12356").params(Map.of("one", "two")).build();
+    SQLQueryRequest requestWithParamsWithFormat =
+        SQLQueryRequestBuilder.request(null)
+            .cursor("n:12356")
+            .params(Map.of("format", "jdbc"))
+            .build();
+    SQLQueryRequest requestWithParamsWithFormatAnd =
+        SQLQueryRequestBuilder.request(null)
+            .cursor("n:12356")
+            .params(Map.of("format", "jdbc", "something", "else"))
+            .build();
+    SQLQueryRequest requestWithFetchSize =
+        SQLQueryRequestBuilder.request(null)
+            .cursor("n:12356")
+            .jsonContent("{\"fetch_size\": 5}")
+            .build();
+    SQLQueryRequest requestWithNoParams =
+        SQLQueryRequestBuilder.request(null).cursor("n:12356").params(Map.of()).build();
+    SQLQueryRequest requestWithNoContent =
+        SQLQueryRequestBuilder.request(null).cursor("n:12356").jsonContent("{}").build();
+    assertAll(
+        () -> assertFalse(requestWithQuery.isSupported()),
+        () -> assertFalse(requestWithParams.isSupported()),
+        () -> assertFalse(requestWithFetchSize.isSupported()),
+        () -> assertTrue(requestWithNoParams.isSupported()),
+        () -> assertTrue(requestWithParamsWithFormat.isSupported()),
+        () -> assertFalse(requestWithParamsWithFormatAnd.isSupported()),
+        () -> assertTrue(requestWithNoContent.isSupported()));
   }
 
   @Test
-  public void shouldUseJDBCFormatByDefault() {
+  public void should_use_JDBC_format_by_default() {
     SQLQueryRequest request =
         SQLQueryRequestBuilder.request("SELECT 1").params(ImmutableMap.of()).build();
     assertEquals(request.format(), Format.JDBC);
   }
 
   @Test
-  public void shouldSupportCSVFormatAndSanitize() {
-    SQLQueryRequest csvRequest =
-        SQLQueryRequestBuilder.request("SELECT 1")
-                              .format("csv")
-                              .build();
-    assertTrue(csvRequest.isSupported());
-    assertEquals(csvRequest.format(), Format.CSV);
-    assertTrue(csvRequest.sanitize());
+  public void should_support_CSV_format_and_sanitize() {
+    SQLQueryRequest csvRequest = SQLQueryRequestBuilder.request("SELECT 1").format("csv").build();
+    assertAll(
+        () -> assertTrue(csvRequest.isSupported()),
+        () -> assertEquals(csvRequest.format(), Format.CSV),
+        () -> assertTrue(csvRequest.sanitize()));
   }
 
   @Test
-  public void shouldSkipSanitizeIfSetFalse() {
+  public void should_skip_sanitize_if_set_false() {
     ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
     Map<String, String> params = builder.put("format", "csv").put("sanitize", "false").build();
     SQLQueryRequest csvRequest = SQLQueryRequestBuilder.request("SELECT 1").params(params).build();
-    assertEquals(csvRequest.format(), Format.CSV);
-    assertFalse(csvRequest.sanitize());
+    assertAll(
+        () -> assertEquals(csvRequest.format(), Format.CSV),
+        () -> assertFalse(csvRequest.sanitize()));
   }
 
   @Test
-  public void shouldNotSupportOtherFormat() {
-    SQLQueryRequest csvRequest =
-        SQLQueryRequestBuilder.request("SELECT 1")
-            .format("other")
-            .build();
-    assertFalse(csvRequest.isSupported());
-    assertThrows(IllegalArgumentException.class, csvRequest::format,
-        "response in other format is not supported.");
+  public void should_not_support_other_format() {
+    SQLQueryRequest csvRequest = SQLQueryRequestBuilder.request("SELECT 1").format("other").build();
+
+    assertAll(
+        () -> assertFalse(csvRequest.isSupported()),
+        () ->
+            assertEquals(
+                "response in other format is not supported.",
+                assertThrows(IllegalArgumentException.class, csvRequest::format).getMessage()));
   }
 
   @Test
-  public void shouldSupportRawFormat() {
-    SQLQueryRequest csvRequest =
-            SQLQueryRequestBuilder.request("SELECT 1")
-                    .format("raw")
-                    .build();
+  public void should_support_raw_format() {
+    SQLQueryRequest csvRequest = SQLQueryRequestBuilder.request("SELECT 1").format("raw").build();
     assertTrue(csvRequest.isSupported());
   }
 
-  /**
-   * SQL query request build helper to improve test data setup readability.
-   */
+  /** SQL query request build helper to improve test data setup readability. */
   private static class SQLQueryRequestBuilder {
     private String jsonContent;
     private String query;
     private String path = "_plugins/_sql";
     private String format;
-    private Map<String, String> params;
+    private String cursor;
+    private Map<String, String> params = new HashMap<>();
 
     static SQLQueryRequestBuilder request(String query) {
       SQLQueryRequestBuilder builder = new SQLQueryRequestBuilder();
@@ -178,15 +257,17 @@ SQLQueryRequestBuilder params(Map<String, String> params) {
       return this;
     }
 
+    SQLQueryRequestBuilder cursor(String cursor) {
+      this.cursor = cursor;
+      return this;
+    }
+
     SQLQueryRequest build() {
-      if (jsonContent == null) {
-        jsonContent = "{\"query\": \"" + query + "\"}";
+      if (format != null) {
+        params.put("format", format);
       }
-      if (params != null) {
-        return new SQLQueryRequest(new JSONObject(jsonContent), query, path, params);
-      }
-      return new SQLQueryRequest(new JSONObject(jsonContent), query, path, format);
+      return new SQLQueryRequest(
+          jsonContent == null ? null : new JSONObject(jsonContent), query, path, params, cursor);
     }
   }
-
 }
diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/AnonymizerListenerTest.java b/sql/src/test/java/org/opensearch/sql/sql/parser/AnonymizerListenerTest.java
new file mode 100644
index 0000000000..4d2addf3d3
--- /dev/null
+++ b/sql/src/test/java/org/opensearch/sql/sql/parser/AnonymizerListenerTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.sql.parser;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.tree.ErrorNode;
+import org.junit.jupiter.api.Test;
+import org.opensearch.sql.common.antlr.CaseInsensitiveCharStream;
+import org.opensearch.sql.sql.antlr.AnonymizerListener;
+import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLLexer;
+import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser;
+
+public class AnonymizerListenerTest {
+
+  private final AnonymizerListener anonymizerListener = new AnonymizerListener();
+
+  /**
+   * Helper function to parse SQl queries for testing purposes.
+   *
+   * @param query SQL query to be anonymized.
+   */
+  private void parse(String query) {
+    OpenSearchSQLLexer lexer = new OpenSearchSQLLexer(new CaseInsensitiveCharStream(query));
+    OpenSearchSQLParser parser = new OpenSearchSQLParser(new CommonTokenStream(lexer));
+    parser.addParseListener(anonymizerListener);
+
+    parser.root();
+  }
+
+  @Test
+  public void queriesShouldHaveAnonymousFieldAndIndex() {
+    String query = "SELECT ABS(balance) FROM accounts WHERE age > 30 GROUP BY ABS(balance)";
+    String expectedQuery =
+        "( SELECT ABS ( identifier ) FROM table "
+            + "WHERE identifier > number GROUP BY ABS ( identifier ) )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesShouldAnonymousNumbers() {
+    String query = "SELECT ABS(20), LOG(20.20) FROM accounts";
+    String expectedQuery = "( SELECT ABS ( number ), LOG ( number ) FROM table )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesShouldHaveAnonymousBooleanLiterals() {
+    String query = "SELECT TRUE FROM accounts";
+    String expectedQuery = "( SELECT boolean_literal FROM table )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesShouldHaveAnonymousInputStrings() {
+    String query = "SELECT * FROM accounts WHERE name = 'Oliver'";
+    String expectedQuery = "( SELECT * FROM table WHERE identifier = 'string_literal' )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithAliasesShouldAnonymizeSensitiveData() {
+    String query = "SELECT balance AS b FROM accounts AS a";
+    String expectedQuery = "( SELECT identifier AS identifier FROM table AS identifier )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithFunctionsShouldAnonymizeSensitiveData() {
+    String query = "SELECT LTRIM(firstname) FROM accounts";
+    String expectedQuery = "( SELECT LTRIM ( identifier ) FROM table )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithAggregatesShouldAnonymizeSensitiveData() {
+    String query = "SELECT MAX(price) - MIN(price) from tickets";
+    String expectedQuery = "( SELECT MAX ( identifier ) - MIN ( identifier ) FROM table )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithSubqueriesShouldAnonymizeSensitiveData() {
+    String query =
+        "SELECT a.f, a.l, a.a FROM "
+            + "(SELECT firstname AS f, lastname AS l, age AS a FROM accounts WHERE age > 30) a";
+    String expectedQuery =
+        "( SELECT identifier.identifier, identifier.identifier, identifier.identifier FROM ( SELECT"
+            + " identifier AS identifier, identifier AS identifier, identifier AS identifier FROM"
+            + " table WHERE identifier > number ) identifier )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithLimitShouldAnonymizeSensitiveData() {
+    String query = "SELECT balance FROM accounts LIMIT 5";
+    String expectedQuery = "( SELECT identifier FROM table LIMIT number )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithOrderByShouldAnonymizeSensitiveData() {
+    String query = "SELECT firstname FROM accounts ORDER BY lastname";
+    String expectedQuery = "( SELECT identifier FROM table ORDER BY identifier )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithHavingShouldAnonymizeSensitiveData() {
+    String query = "SELECT SUM(balance) FROM accounts GROUP BY lastname HAVING COUNT(balance) > 2";
+    String expectedQuery =
+        "( SELECT SUM ( identifier ) FROM table "
+            + "GROUP BY identifier HAVING COUNT ( identifier ) > number )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithHighlightShouldAnonymizeSensitiveData() {
+    String query = "SELECT HIGHLIGHT(str0) FROM CALCS WHERE QUERY_STRING(['str0'], 'FURNITURE')";
+    String expectedQuery =
+        "( SELECT HIGHLIGHT ( identifier ) FROM table WHERE "
+            + "QUERY_STRING ( [ 'string_literal' ], 'string_literal' ) )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithMatchShouldAnonymizeSensitiveData() {
+    String query = "SELECT str0 FROM CALCS WHERE MATCH(str0, 'FURNITURE')";
+    String expectedQuery =
+        "( SELECT identifier FROM table " + "WHERE MATCH ( identifier, 'string_literal' ) )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithPositionShouldAnonymizeSensitiveData() {
+    String query = "SELECT POSITION('world' IN 'helloworld')";
+    String expectedQuery = "( SELECT POSITION ( 'string_literal' IN 'string_literal' ) )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithMatch_Bool_Prefix_ShouldAnonymizeSensitiveData() {
+    String query =
+        "SELECT firstname, address FROM accounts WHERE "
+            + "match_bool_prefix(address, 'Bristol Street', minimum_should_match=2)";
+    String expectedQuery =
+        "( SELECT identifier, identifier FROM table WHERE MATCH_BOOL_PREFIX "
+            + "( identifier, 'string_literal', MINIMUM_SHOULD_MATCH = number ) )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithGreaterOrEqualShouldAnonymizeSensitiveData() {
+    String query = "SELECT int0 FROM accounts WHERE int0 >= 0";
+    String expectedQuery = "( SELECT identifier FROM table WHERE identifier >= number )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithLessOrEqualShouldAnonymizeSensitiveData() {
+    String query = "SELECT int0 FROM accounts WHERE int0 <= 0";
+    String expectedQuery = "( SELECT identifier FROM table WHERE identifier <= number )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithNotEqualShouldAnonymizeSensitiveData() {
+    String query = "SELECT int0 FROM accounts WHERE int0 != 0";
+    String expectedQuery = "( SELECT identifier FROM table WHERE identifier != number )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  @Test
+  public void queriesWithNotEqualAlternateShouldAnonymizeSensitiveData() {
+    String query = "SELECT int0 FROM calcs WHERE int0 <> 0";
+    String expectedQuery = "( SELECT identifier FROM table WHERE identifier <> number )";
+    parse(query);
+    assertEquals(expectedQuery, anonymizerListener.getAnonymizedQueryString());
+  }
+
+  /** Test added for coverage, but the errorNode will not be hit normally. */
+  @Test
+  public void enterErrorNote() {
+    ErrorNode node = mock(ErrorNode.class);
+    anonymizerListener.visitErrorNode(node);
+  }
+}
diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/AstAggregationBuilderTest.java b/sql/src/test/java/org/opensearch/sql/sql/parser/AstAggregationBuilderTest.java
index 79896d9400..95188e20b6 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/parser/AstAggregationBuilderTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/parser/AstAggregationBuilderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
 import static java.util.Collections.emptyList;
@@ -30,7 +29,6 @@
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.opensearch.sql.ast.expression.AllFields;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 import org.opensearch.sql.ast.tree.Aggregation;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
@@ -60,10 +58,9 @@ void can_build_group_by_clause_with_scalar_expression() {
         buildAggregation("SELECT ABS(age + 1) FROM test GROUP BY ABS(age + 1)"),
         allOf(
             hasGroupByItems(
-                alias("ABS(+(age, 1))", function("ABS",
-                    function("+",
-                        qualifiedName("age"),
-                        intLiteral(1))))),
+                alias(
+                    "ABS(+(age, 1))",
+                    function("ABS", function("+", qualifiedName("age"), intLiteral(1))))),
             hasAggregators()));
   }
 
@@ -80,9 +77,7 @@ void can_build_group_by_clause_with_complicated_aggregators() {
   void can_build_group_by_clause_without_aggregators() {
     assertThat(
         buildAggregation("SELECT state FROM test GROUP BY state"),
-        allOf(
-            hasGroupByItems(alias("state", qualifiedName("state"))),
-            hasAggregators()));
+        allOf(hasGroupByItems(alias("state", qualifiedName("state"))), hasAggregators()));
   }
 
   @Test
@@ -102,50 +97,43 @@ void can_build_implicit_group_by_for_aggregator_in_having_clause() {
         buildAggregation("SELECT true FROM test HAVING AVG(age) > 30"),
         allOf(
             hasGroupByItems(),
-            hasAggregators(
-                alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
+            hasAggregators(alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
 
     assertThat(
-            buildAggregation("SELECT PI() FROM test HAVING AVG(age) > 30"),
-            allOf(
-                    hasGroupByItems(),
-                    hasAggregators(
-                            alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
+        buildAggregation("SELECT PI() FROM test HAVING AVG(age) > 30"),
+        allOf(
+            hasGroupByItems(),
+            hasAggregators(alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
 
     assertThat(
-            buildAggregation("SELECT ABS(1.5) FROM test HAVING AVG(age) > 30"),
-            allOf(
-                    hasGroupByItems(),
-                    hasAggregators(
-                            alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
+        buildAggregation("SELECT ABS(1.5) FROM test HAVING AVG(age) > 30"),
+        allOf(
+            hasGroupByItems(),
+            hasAggregators(alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
 
     assertThat(
-            buildAggregation("SELECT ABS(ABS(1.5)) FROM test HAVING AVG(age) > 30"),
-            allOf(
-                    hasGroupByItems(),
-                    hasAggregators(
-                            alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
+        buildAggregation("SELECT ABS(ABS(1.5)) FROM test HAVING AVG(age) > 30"),
+        allOf(
+            hasGroupByItems(),
+            hasAggregators(alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
 
     assertThat(
         buildAggregation("SELECT INTERVAL 1 DAY FROM test HAVING AVG(age) > 30"),
         allOf(
             hasGroupByItems(),
-            hasAggregators(
-                alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
+            hasAggregators(alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
 
     assertThat(
         buildAggregation("SELECT CAST(1 AS LONG) FROM test HAVING AVG(age) > 30"),
         allOf(
             hasGroupByItems(),
-            hasAggregators(
-                alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
+            hasAggregators(alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
 
     assertThat(
         buildAggregation("SELECT CASE WHEN true THEN 1 ELSE 2 END FROM test HAVING AVG(age) > 30"),
         allOf(
             hasGroupByItems(),
-            hasAggregators(
-                alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
+            hasAggregators(alias("AVG(age)", aggregate("AVG", qualifiedName("age"))))));
   }
 
   @Test
@@ -155,8 +143,7 @@ void can_build_distinct_aggregator() {
         allOf(
             hasGroupByItems(alias("age", qualifiedName("age"))),
             hasAggregators(
-                alias("COUNT(DISTINCT name)", distinctAggregate("COUNT", qualifiedName(
-                    "name"))))));
+                alias("COUNT(DISTINCT name)", distinctAggregate("COUNT", qualifiedName("name"))))));
   }
 
   @Test
@@ -168,8 +155,8 @@ void should_build_nothing_if_no_group_by_and_no_aggregators_in_select() {
   void should_replace_group_by_alias_by_expression_in_select_clause() {
     assertThat(
         buildAggregation("SELECT state AS s, name FROM test GROUP BY s, name"),
-        hasGroupByItems(alias("state", qualifiedName("state")),
-            alias("name", qualifiedName("name"))));
+        hasGroupByItems(
+            alias("state", qualifiedName("state")), alias("name", qualifiedName("name"))));
 
     assertThat(
         buildAggregation("SELECT ABS(age) AS a FROM test GROUP BY a"),
@@ -191,25 +178,30 @@ void should_replace_group_by_ordinal_by_expression_in_select_clause() {
 
   @Test
   void should_report_error_for_non_integer_ordinal_in_group_by() {
-    SemanticCheckException error = assertThrows(SemanticCheckException.class, () ->
-        buildAggregation("SELECT state AS s FROM test GROUP BY 1.5"));
-    assertEquals(
-        "Non-integer constant [1.5] found in ordinal",
-        error.getMessage());
+    SemanticCheckException error =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> buildAggregation("SELECT state AS s FROM test GROUP BY 1.5"));
+    assertEquals("Non-integer constant [1.5] found in ordinal", error.getMessage());
   }
 
-  @Disabled("This validation is supposed to be in analyzing phase. This test should be enabled "
+  @Disabled(
+      "This validation is supposed to be in analyzing phase. This test should be enabled "
           + "once https://github.com/opensearch-project/sql/issues/910 has been resolved")
   @Test
   void should_report_error_for_mismatch_between_select_and_group_by_items() {
-    SemanticCheckException error1 = assertThrows(SemanticCheckException.class, () ->
-        buildAggregation("SELECT name FROM test GROUP BY state"));
+    SemanticCheckException error1 =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> buildAggregation("SELECT name FROM test GROUP BY state"));
     assertEquals(
         "Expression [name] that contains non-aggregated column is not present in group by clause",
         error1.getMessage());
 
-    SemanticCheckException error2 = assertThrows(SemanticCheckException.class, () ->
-        buildAggregation("SELECT ABS(name + 1) FROM test GROUP BY name"));
+    SemanticCheckException error2 =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> buildAggregation("SELECT ABS(name + 1) FROM test GROUP BY name"));
     assertEquals(
         "Expression [Function(funcName=ABS, funcArgs=[Function(funcName=+, "
             + "funcArgs=[name, Literal(value=1, type=INTEGER)])])] that contains "
@@ -219,15 +211,19 @@ void should_report_error_for_mismatch_between_select_and_group_by_items() {
 
   @Test
   void should_report_error_for_non_aggregated_item_in_select_if_no_group_by() {
-    SemanticCheckException error1 = assertThrows(SemanticCheckException.class, () ->
-        buildAggregation("SELECT age, AVG(balance) FROM tests"));
+    SemanticCheckException error1 =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> buildAggregation("SELECT age, AVG(balance) FROM tests"));
     assertEquals(
         "Explicit GROUP BY clause is required because expression [age] "
             + "contains non-aggregated column",
         error1.getMessage());
 
-    SemanticCheckException error2 = assertThrows(SemanticCheckException.class, () ->
-        buildAggregation("SELECT ABS(age + 1), AVG(balance) FROM tests"));
+    SemanticCheckException error2 =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> buildAggregation("SELECT ABS(age + 1), AVG(balance) FROM tests"));
     assertEquals(
         "Explicit GROUP BY clause is required because expression [ABS(+(age, 1))] "
             + "contains non-aggregated column",
@@ -236,19 +232,25 @@ void should_report_error_for_non_aggregated_item_in_select_if_no_group_by() {
 
   @Test
   void should_report_error_for_group_by_ordinal_out_of_bound_of_select_list() {
-    SemanticCheckException error1 = assertThrows(SemanticCheckException.class, () ->
-        buildAggregation("SELECT age, AVG(balance) FROM tests GROUP BY 0"));
+    SemanticCheckException error1 =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> buildAggregation("SELECT age, AVG(balance) FROM tests GROUP BY 0"));
     assertEquals("Ordinal [0] is out of bound of select item list", error1.getMessage());
 
-    SemanticCheckException error2 = assertThrows(SemanticCheckException.class, () ->
-        buildAggregation("SELECT age, AVG(balance) FROM tests GROUP BY 3"));
+    SemanticCheckException error2 =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> buildAggregation("SELECT age, AVG(balance) FROM tests GROUP BY 3"));
     assertEquals("Ordinal [3] is out of bound of select item list", error2.getMessage());
   }
 
   @Test
   void should_report_error_for_non_aggregated_item_in_select_if_only_having() {
-    SemanticCheckException error = assertThrows(SemanticCheckException.class, () ->
-        buildAggregation("SELECT age FROM tests HAVING AVG(balance) > 30"));
+    SemanticCheckException error =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> buildAggregation("SELECT age FROM tests HAVING AVG(balance) > 30"));
     assertEquals(
         "Explicit GROUP BY clause is required because expression [age] "
             + "contains non-aggregated column",
@@ -263,10 +265,10 @@ private Matcher<UnresolvedPlan> hasAggregators(UnresolvedExpression... exprs) {
     return featureValueOf("aggregators", Aggregation::getAggExprList, exprs);
   }
 
-  private Matcher<UnresolvedPlan> featureValueOf(String name,
-                                                 Function<Aggregation,
-                                                     List<UnresolvedExpression>> getter,
-                                                 UnresolvedExpression... exprs) {
+  private Matcher<UnresolvedPlan> featureValueOf(
+      String name,
+      Function<Aggregation, List<UnresolvedExpression>> getter,
+      UnresolvedExpression... exprs) {
     Matcher<List<UnresolvedExpression>> subMatcher =
         (exprs.length == 0) ? equalTo(emptyList()) : equalTo(Arrays.asList(exprs));
     return new FeatureMatcher<UnresolvedPlan, List<UnresolvedExpression>>(subMatcher, name, "") {
@@ -296,5 +298,4 @@ private QuerySpecificationContext parse(String query) {
     parser.addErrorListener(new SyntaxAnalysisErrorListener());
     return parser.querySpecification();
   }
-
 }
diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/AstBuilderTest.java b/sql/src/test/java/org/opensearch/sql/sql/parser/AstBuilderTest.java
index 2aed4f2834..edee692500 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/parser/AstBuilderTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/parser/AstBuilderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
 import static java.util.Collections.emptyList;
@@ -33,21 +32,14 @@
 
 import com.google.common.collect.ImmutableList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
-import org.antlr.v4.runtime.tree.ParseTree;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
 import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.ast.expression.AllFields;
 import org.opensearch.sql.ast.expression.DataType;
 import org.opensearch.sql.ast.expression.Literal;
-import org.opensearch.sql.ast.tree.UnresolvedPlan;
+import org.opensearch.sql.ast.expression.NestedAllTupleFields;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
-import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
 
 class AstBuilderTest extends AstBuilderTestBase {
 
@@ -60,40 +52,31 @@ public void can_build_select_literals() {
             alias("'hello'", stringLiteral("hello")),
             alias("\"world\"", stringLiteral("world")),
             alias("false", booleanLiteral(false)),
-            alias("-4.567", doubleLiteral(-4.567))
-        ),
-        buildAST("SELECT 123, 'hello', \"world\", false, -4.567")
-    );
+            alias("-4.567", doubleLiteral(-4.567))),
+        buildAST("SELECT 123, 'hello', \"world\", false, -4.567"));
   }
 
   @Test
   public void can_build_select_function_call_with_alias() {
     assertEquals(
-        project(
-            relation("test"),
-            alias(
-                "ABS(age)",
-                function("ABS", qualifiedName("age")),
-                "a"
-            )
-        ),
-        buildAST("SELECT ABS(age) AS a FROM test")
-    );
+        project(relation("test"), alias("ABS(age)", function("ABS", qualifiedName("age")), "a")),
+        buildAST("SELECT ABS(age) AS a FROM test"));
   }
 
   @Test
   public void can_build_select_all_from_index() {
-    assertEquals(
-        project(
-            relation("test"),
-            AllFields.of()
-        ),
-        buildAST("SELECT * FROM test")
-    );
+    assertEquals(project(relation("test"), AllFields.of()), buildAST("SELECT * FROM test"));
 
     assertThrows(SyntaxCheckException.class, () -> buildAST("SELECT *"));
   }
 
+  @Test
+  public void can_build_nested_select_all() {
+    assertEquals(
+        project(relation("test"), alias("nested(field.*)", new NestedAllTupleFields("field"))),
+        buildAST("SELECT nested(field.*) FROM test"));
+  }
+
   @Test
   public void can_build_select_all_and_fields_from_index() {
     assertEquals(
@@ -101,32 +84,22 @@ public void can_build_select_all_and_fields_from_index() {
             relation("test"),
             AllFields.of(),
             alias("age", qualifiedName("age")),
-            alias("age", qualifiedName("age"), "a")
-        ),
-        buildAST("SELECT *, age, age as a FROM test")
-    );
+            alias("age", qualifiedName("age"), "a")),
+        buildAST("SELECT *, age, age as a FROM test"));
   }
 
   @Test
   public void can_build_select_fields_from_index() {
     assertEquals(
-        project(
-            relation("test"),
-            alias("age", qualifiedName("age"))
-        ),
-        buildAST("SELECT age FROM test")
-    );
+        project(relation("test"), alias("age", qualifiedName("age"))),
+        buildAST("SELECT age FROM test"));
   }
 
   @Test
   public void can_build_select_fields_with_alias() {
     assertEquals(
-        project(
-            relation("test"),
-            alias("age", qualifiedName("age"), "a")
-        ),
-        buildAST("SELECT age AS a FROM test")
-    );
+        project(relation("test"), alias("age", qualifiedName("age"), "a")),
+        buildAST("SELECT age AS a FROM test"));
   }
 
   @Test
@@ -134,17 +107,8 @@ public void can_build_select_fields_with_alias_quoted() {
     assertEquals(
         project(
             relation("test"),
-            alias(
-                "(age + 10)",
-                function("+", qualifiedName("age"), intLiteral(10)),
-                "Age_Expr"
-            )
-        ),
-        buildAST("SELECT"
-                + " (age + 10) AS `Age_Expr` "
-                + "FROM test"
-        )
-    );
+            alias("(age + 10)", function("+", qualifiedName("age"), intLiteral(10)), "Age_Expr")),
+        buildAST("SELECT" + " (age + 10) AS `Age_Expr` " + "FROM test"));
   }
 
   @Test
@@ -152,42 +116,27 @@ public void can_build_from_index_with_alias() {
     assertEquals(
         project(
             filter(
-                relation("test", "tt"),
-                function("=", qualifiedName("tt", "age"), intLiteral(30))),
-            alias("tt.name", qualifiedName("tt", "name"))
-        ),
-        buildAST("SELECT tt.name FROM test AS tt WHERE tt.age = 30")
-    );
+                relation("test", "tt"), function("=", qualifiedName("tt", "age"), intLiteral(30))),
+            alias("tt.name", qualifiedName("tt", "name"))),
+        buildAST("SELECT tt.name FROM test AS tt WHERE tt.age = 30"));
   }
 
   @Test
   public void can_build_from_index_with_alias_quoted() {
     assertEquals(
         project(
-            filter(
-                relation("test", "t"),
-                function("=", qualifiedName("t", "age"), intLiteral(30))),
-            alias("`t`.name", qualifiedName("t", "name"))
-        ),
-        buildAST("SELECT `t`.name FROM test `t` WHERE `t`.age = 30")
-    );
+            filter(relation("test", "t"), function("=", qualifiedName("t", "age"), intLiteral(30))),
+            alias("`t`.name", qualifiedName("t", "name"))),
+        buildAST("SELECT `t`.name FROM test `t` WHERE `t`.age = 30"));
   }
 
   @Test
   public void can_build_where_clause() {
     assertEquals(
         project(
-            filter(
-                relation("test"),
-                function(
-                    "=",
-                    qualifiedName("name"),
-                    stringLiteral("John"))
-            ),
-            alias("name", qualifiedName("name"))
-        ),
-        buildAST("SELECT name FROM test WHERE name = 'John'")
-    );
+            filter(relation("test"), function("=", qualifiedName("name"), stringLiteral("John"))),
+            alias("name", qualifiedName("name"))),
+        buildAST("SELECT name FROM test WHERE name = 'John'"));
   }
 
   @Test
@@ -196,8 +145,7 @@ public void can_build_count_literal() {
         project(
             agg(
                 relation("test"),
-                ImmutableList.of(
-                    alias("COUNT(1)", aggregate("COUNT", intLiteral(1)))),
+                ImmutableList.of(alias("COUNT(1)", aggregate("COUNT", intLiteral(1)))),
                 emptyList(),
                 emptyList(),
                 emptyList()),
@@ -211,8 +159,7 @@ public void can_build_count_star() {
         project(
             agg(
                 relation("test"),
-                ImmutableList.of(
-                    alias("COUNT(*)", aggregate("COUNT", AllFields.of()))),
+                ImmutableList.of(alias("COUNT(*)", aggregate("COUNT", AllFields.of()))),
                 emptyList(),
                 emptyList(),
                 emptyList()),
@@ -322,9 +269,7 @@ public void can_build_having_clause() {
                     emptyList(),
                     ImmutableList.of(alias("name", qualifiedName("name"))),
                     emptyList()),
-                function(">",
-                    aggregate("MIN", qualifiedName("balance")),
-                    intLiteral(1000))),
+                function(">", aggregate("MIN", qualifiedName("balance")), intLiteral(1000))),
             alias("name", qualifiedName("name")),
             alias("AVG(age)", aggregate("AVG", qualifiedName("age")))),
         buildAST("SELECT name, AVG(age) FROM test GROUP BY name HAVING MIN(balance) > 1000"));
@@ -337,14 +282,11 @@ public void can_build_having_condition_using_alias() {
             filter(
                 agg(
                     relation("test"),
-                    ImmutableList.of(
-                        alias("AVG(age)", aggregate("AVG", qualifiedName("age")))),
+                    ImmutableList.of(alias("AVG(age)", aggregate("AVG", qualifiedName("age")))),
                     emptyList(),
                     ImmutableList.of(alias("name", qualifiedName("name"))),
                     emptyList()),
-                function(">",
-                    aggregate("AVG", qualifiedName("age")),
-                    intLiteral(1000))),
+                function(">", aggregate("AVG", qualifiedName("age")), intLiteral(1000))),
             alias("name", qualifiedName("name")),
             alias("AVG(age)", aggregate("AVG", qualifiedName("age")), "a")),
         buildAST("SELECT name, AVG(age) AS a FROM test GROUP BY name HAVING a > 1000"));
@@ -354,9 +296,7 @@ public void can_build_having_condition_using_alias() {
   public void can_build_order_by_field_name() {
     assertEquals(
         project(
-            sort(
-                relation("test"),
-                field("name", argument("asc", booleanLiteral(true)))),
+            sort(relation("test"), field("name", argument("asc", booleanLiteral(true)))),
             alias("name", qualifiedName("name"))),
         buildAST("SELECT name FROM test ORDER BY name"));
   }
@@ -368,8 +308,7 @@ public void can_build_order_by_function() {
             sort(
                 relation("test"),
                 field(
-                    function("ABS", qualifiedName("name")),
-                    argument("asc", booleanLiteral(true)))),
+                    function("ABS", qualifiedName("name")), argument("asc", booleanLiteral(true)))),
             alias("name", qualifiedName("name"))),
         buildAST("SELECT name FROM test ORDER BY ABS(name)"));
   }
@@ -378,9 +317,7 @@ public void can_build_order_by_function() {
   public void can_build_order_by_alias() {
     assertEquals(
         project(
-            sort(
-                relation("test"),
-                field("name", argument("asc", booleanLiteral(true)))),
+            sort(relation("test"), field("name", argument("asc", booleanLiteral(true)))),
             alias("name", qualifiedName("name"), "n")),
         buildAST("SELECT name AS n FROM test ORDER BY n ASC"));
   }
@@ -389,9 +326,7 @@ public void can_build_order_by_alias() {
   public void can_build_order_by_ordinal() {
     assertEquals(
         project(
-            sort(
-                relation("test"),
-                field("name", argument("asc", booleanLiteral(false)))),
+            sort(relation("test"), field("name", argument("asc", booleanLiteral(false)))),
             alias("name", qualifiedName("name"))),
         buildAST("SELECT name FROM test ORDER BY 1 DESC"));
   }
@@ -418,8 +353,7 @@ public void can_build_select_distinct_clause() {
                 emptyList(),
                 emptyList(),
                 ImmutableList.of(
-                    alias("name", qualifiedName("name")),
-                    alias("age", qualifiedName("age"))),
+                    alias("name", qualifiedName("name")), alias("age", qualifiedName("age"))),
                 emptyList()),
             alias("name", qualifiedName("name")),
             alias("age", qualifiedName("age"))),
@@ -435,26 +369,21 @@ public void can_build_select_distinct_clause_with_function() {
                 emptyList(),
                 emptyList(),
                 ImmutableList.of(
-                    alias("SUBSTRING(name, 1, 2)",
+                    alias(
+                        "SUBSTRING(name, 1, 2)",
                         function(
-                            "SUBSTRING",
-                            qualifiedName("name"),
-                            intLiteral(1), intLiteral(2)))),
+                            "SUBSTRING", qualifiedName("name"), intLiteral(1), intLiteral(2)))),
                 emptyList()),
-            alias("SUBSTRING(name, 1, 2)",
-                function(
-                    "SUBSTRING",
-                    qualifiedName("name"),
-                    intLiteral(1), intLiteral(2)))),
+            alias(
+                "SUBSTRING(name, 1, 2)",
+                function("SUBSTRING", qualifiedName("name"), intLiteral(1), intLiteral(2)))),
         buildAST("SELECT DISTINCT SUBSTRING(name, 1, 2) FROM test"));
   }
 
   @Test
   public void can_build_select_all_clause() {
     assertEquals(
-        buildAST("SELECT name, age FROM test"),
-        buildAST("SELECT ALL name, age FROM test")
-    );
+        buildAST("SELECT name, age FROM test"), buildAST("SELECT ALL name, age FROM test"));
   }
 
   @Test
@@ -463,34 +392,43 @@ public void can_build_order_by_null_option() {
         project(
             sort(
                 relation("test"),
-                field("name",
+                field(
+                    "name",
                     argument("asc", booleanLiteral(true)),
                     argument("nullFirst", booleanLiteral(false)))),
-        alias("name", qualifiedName("name"))),
+            alias("name", qualifiedName("name"))),
         buildAST("SELECT name FROM test ORDER BY name NULLS LAST"));
   }
 
+  /**
+   * Ensure Nested function falls back to legacy engine when used in an HAVING clause. TODO Remove
+   * this test when support is added.
+   */
+  @Test
+  public void nested_in_having_clause_throws_exception() {
+    SyntaxCheckException exception =
+        assertThrows(
+            SyntaxCheckException.class,
+            () -> buildAST("SELECT count(*) FROM test HAVING nested(message.info)"));
+
+    assertEquals(
+        "Falling back to legacy engine. Nested function is not supported in the HAVING clause.",
+        exception.getMessage());
+  }
+
   @Test
   public void can_build_order_by_sort_order_keyword_insensitive() {
     assertEquals(
         project(
-            sort(
-                relation("test"),
-                field("age",
-                    argument("asc", booleanLiteral(true)))),
+            sort(relation("test"), field("age", argument("asc", booleanLiteral(true)))),
             alias("age", qualifiedName("age"))),
-        buildAST("SELECT age FROM test ORDER BY age ASC")
-    );
+        buildAST("SELECT age FROM test ORDER BY age ASC"));
 
     assertEquals(
         project(
-            sort(
-                relation("test"),
-                field("age",
-                    argument("asc", booleanLiteral(true)))),
+            sort(relation("test"), field("age", argument("asc", booleanLiteral(true)))),
             alias("age", qualifiedName("age"))),
-        buildAST("SELECT age FROM test ORDER BY age asc")
-    );
+        buildAST("SELECT age FROM test ORDER BY age asc"));
   }
 
   @Test
@@ -502,20 +440,32 @@ public void can_build_from_subquery() {
                     project(
                         relation("test"),
                         alias("firstname", qualifiedName("firstname"), "firstName"),
-                        alias("lastname", qualifiedName("lastname"), "lastName")
-                    ),
-                    "a"
-                ),
-                function(">", qualifiedName("age"), intLiteral(20))
-            ),
+                        alias("lastname", qualifiedName("lastname"), "lastName")),
+                    "a"),
+                function(">", qualifiedName("age"), intLiteral(20))),
             alias("a.firstName", qualifiedName("a", "firstName")),
             alias("lastName", qualifiedName("lastName"))),
         buildAST(
             "SELECT a.firstName, lastName FROM ("
                 + "SELECT firstname AS firstName, lastname AS lastName FROM test"
-                + ") AS a where age > 20"
-        )
-    );
+                + ") AS a where age > 20"));
+  }
+
+  @Test
+  public void can_build_from_subquery_with_backquoted_alias() {
+    assertEquals(
+        project(
+            relationSubquery(
+                project(
+                    relation("test"), alias("firstname", qualifiedName("firstname"), "firstName")),
+                "a"),
+            alias("a.firstName", qualifiedName("a", "firstName"))),
+        buildAST(
+            "SELECT a.firstName "
+                + "FROM ( "
+                + " SELECT `firstname` AS `firstName` "
+                + " FROM `test` "
+                + ") AS `a`"));
   }
 
   @Test
@@ -524,12 +474,9 @@ public void can_build_show_all_tables() {
         project(
             filter(
                 relation(TABLE_INFO),
-                function("like", qualifiedName("TABLE_NAME"), stringLiteral("%"))
-            ),
-            AllFields.of()
-        ),
-        buildAST("SHOW TABLES LIKE '%'")
-    );
+                function("like", qualifiedName("TABLE_NAME"), stringLiteral("%"))),
+            AllFields.of()),
+        buildAST("SHOW TABLES LIKE '%'"));
   }
 
   @Test
@@ -538,17 +485,14 @@ public void can_build_show_selected_tables() {
         project(
             filter(
                 relation(TABLE_INFO),
-                function("like", qualifiedName("TABLE_NAME"), stringLiteral("a_c%"))
-            ),
-            AllFields.of()
-        ),
-        buildAST("SHOW TABLES LIKE 'a_c%'")
-    );
+                function("like", qualifiedName("TABLE_NAME"), stringLiteral("a_c%"))),
+            AllFields.of()),
+        buildAST("SHOW TABLES LIKE 'a_c%'"));
   }
 
   /**
-   * Todo, ideally the identifier (%) couldn't be used in LIKE operator, only the string literal
-   * is allowed.
+   * Todo, ideally the identifier (%) couldn't be used in LIKE operator, only the string literal is
+   * allowed.
    */
   @Test
   public void show_compatible_with_old_engine_syntax() {
@@ -556,34 +500,23 @@ public void show_compatible_with_old_engine_syntax() {
         project(
             filter(
                 relation(TABLE_INFO),
-                function("like", qualifiedName("TABLE_NAME"), stringLiteral("%"))
-            ),
-            AllFields.of()
-        ),
-        buildAST("SHOW TABLES LIKE %")
-    );
+                function("like", qualifiedName("TABLE_NAME"), stringLiteral("%"))),
+            AllFields.of()),
+        buildAST("SHOW TABLES LIKE %"));
   }
 
   @Test
   public void describe_compatible_with_old_engine_syntax() {
     assertEquals(
-        project(
-            relation(mappingTable("a_c%")),
-            AllFields.of()
-        ),
-        buildAST("DESCRIBE TABLES LIKE a_c%")
-    );
+        project(relation(mappingTable("a_c%")), AllFields.of()),
+        buildAST("DESCRIBE TABLES LIKE a_c%"));
   }
 
   @Test
   public void can_build_describe_selected_tables() {
     assertEquals(
-        project(
-            relation(mappingTable("a_c%")),
-            AllFields.of()
-        ),
-        buildAST("DESCRIBE TABLES LIKE 'a_c%'")
-    );
+        project(relation(mappingTable("a_c%")), AllFields.of()),
+        buildAST("DESCRIBE TABLES LIKE 'a_c%'"));
   }
 
   @Test
@@ -592,17 +525,14 @@ public void can_build_describe_selected_tables_field_filter() {
         project(
             filter(
                 relation(mappingTable("a_c%")),
-                function("like", qualifiedName("COLUMN_NAME"), stringLiteral("name%"))
-            ),
-            AllFields.of()
-        ),
-        buildAST("DESCRIBE TABLES LIKE 'a_c%' COLUMNS LIKE 'name%'")
-    );
+                function("like", qualifiedName("COLUMN_NAME"), stringLiteral("name%"))),
+            AllFields.of()),
+        buildAST("DESCRIBE TABLES LIKE 'a_c%' COLUMNS LIKE 'name%'"));
   }
 
   /**
-   * Todo, ideally the identifier (%) couldn't be used in LIKE operator, only the string literal
-   * is allowed.
+   * Todo, ideally the identifier (%) couldn't be used in LIKE operator, only the string literal is
+   * allowed.
    */
   @Test
   public void describe_and_column_compatible_with_old_engine_syntax() {
@@ -610,23 +540,16 @@ public void describe_and_column_compatible_with_old_engine_syntax() {
         project(
             filter(
                 relation(mappingTable("a_c%")),
-                function("like", qualifiedName("COLUMN_NAME"), stringLiteral("name%"))
-            ),
-            AllFields.of()
-        ),
-        buildAST("DESCRIBE TABLES LIKE a_c% COLUMNS LIKE name%")
-    );
+                function("like", qualifiedName("COLUMN_NAME"), stringLiteral("name%"))),
+            AllFields.of()),
+        buildAST("DESCRIBE TABLES LIKE a_c% COLUMNS LIKE name%"));
   }
 
   @Test
   public void can_build_alias_by_keywords() {
     assertEquals(
-        project(
-            relation("test"),
-            alias("avg_age", qualifiedName("avg_age"), "avg")
-        ),
-        buildAST("SELECT avg_age AS avg FROM test")
-    );
+        project(relation("test"), alias("avg_age", qualifiedName("avg_age"), "avg")),
+        buildAST("SELECT avg_age AS avg FROM test"));
   }
 
   @Test
@@ -634,42 +557,20 @@ public void can_build_limit_clause() {
     assertEquals(
         project(
             limit(
-                sort(
-                    relation("test"),
-                    field("age", argument("asc", booleanLiteral(true)))
-                ),
-                10,
-                0
-            ),
+                sort(relation("test"), field("age", argument("asc", booleanLiteral(true)))), 10, 0),
             alias("name", qualifiedName("name")),
-            alias("age", qualifiedName("age"))
-        ),
-        buildAST("SELECT name, age FROM test ORDER BY age LIMIT 10")
-    );
+            alias("age", qualifiedName("age"))),
+        buildAST("SELECT name, age FROM test ORDER BY age LIMIT 10"));
   }
 
   @Test
   public void can_build_limit_clause_with_offset() {
     assertEquals(
-        project(
-            limit(
-                relation("test"),
-                10,
-                5
-            ),
-            alias("name", qualifiedName("name"))
-        ),
+        project(limit(relation("test"), 10, 5), alias("name", qualifiedName("name"))),
         buildAST("SELECT name FROM test LIMIT 10 OFFSET 5"));
 
     assertEquals(
-        project(
-            limit(
-                relation("test"),
-                10,
-                5
-            ),
-            alias("name", qualifiedName("name"))
-        ),
+        project(limit(relation("test"), 10, 5), alias("name", qualifiedName("name"))),
         buildAST("SELECT name FROM test LIMIT 5, 10"));
   }
 
@@ -677,11 +578,10 @@ public void can_build_limit_clause_with_offset() {
   public void can_build_qualified_name_highlight() {
     Map<String, Literal> args = new HashMap<>();
     assertEquals(
-        project(relation("test"),
-            alias("highlight(fieldA)",
-                highlight(AstDSL.qualifiedName("fieldA"), args))),
-        buildAST("SELECT highlight(fieldA) FROM test")
-    );
+        project(
+            relation("test"),
+            alias("highlight(fieldA)", highlight(AstDSL.qualifiedName("fieldA"), args))),
+        buildAST("SELECT highlight(fieldA) FROM test"));
   }
 
   @Test
@@ -690,23 +590,22 @@ public void can_build_qualified_highlight_with_arguments() {
     args.put("pre_tags", new Literal("<mark>", DataType.STRING));
     args.put("post_tags", new Literal("</mark>", DataType.STRING));
     assertEquals(
-        project(relation("test"),
-            alias("highlight(fieldA, pre_tags='<mark>', post_tags='</mark>')",
+        project(
+            relation("test"),
+            alias(
+                "highlight(fieldA, pre_tags='<mark>', post_tags='</mark>')",
                 highlight(AstDSL.qualifiedName("fieldA"), args))),
-        buildAST("SELECT highlight(fieldA, pre_tags='<mark>', post_tags='</mark>') "
-            + "FROM test")
-    );
+        buildAST(
+            "SELECT highlight(fieldA, pre_tags='<mark>', post_tags='</mark>') " + "FROM test"));
   }
 
   @Test
   public void can_build_string_literal_highlight() {
     Map<String, Literal> args = new HashMap<>();
     assertEquals(
-        project(relation("test"),
-            alias("highlight(\"fieldA\")",
-                highlight(AstDSL.stringLiteral("fieldA"), args))),
-        buildAST("SELECT highlight(\"fieldA\") FROM test")
-    );
+        project(
+            relation("test"),
+            alias("highlight(\"fieldA\")", highlight(AstDSL.stringLiteral("fieldA"), args))),
+        buildAST("SELECT highlight(\"fieldA\") FROM test"));
   }
-
 }
diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/AstBuilderTestBase.java b/sql/src/test/java/org/opensearch/sql/sql/parser/AstBuilderTestBase.java
index 2161eb5b1a..602f17ce85 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/parser/AstBuilderTestBase.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/parser/AstBuilderTestBase.java
@@ -10,9 +10,7 @@
 import org.opensearch.sql.sql.antlr.SQLSyntaxParser;
 
 public class AstBuilderTestBase {
-  /**
-   * SQL syntax parser that helps prepare parse tree as AstBuilder input.
-   */
+  /** SQL syntax parser that helps prepare parse tree as AstBuilder input. */
   private final SQLSyntaxParser parser = new SQLSyntaxParser();
 
   protected UnresolvedPlan buildAST(String query) {
diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java b/sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java
index 9af4119fdf..e89f2af9b0 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.opensearch.sql.ast.dsl.AstDSL.aggregate;
 import static org.opensearch.sql.ast.dsl.AstDSL.and;
+import static org.opensearch.sql.ast.dsl.AstDSL.between;
 import static org.opensearch.sql.ast.dsl.AstDSL.booleanLiteral;
 import static org.opensearch.sql.ast.dsl.AstDSL.caseWhen;
 import static org.opensearch.sql.ast.dsl.AstDSL.dateLiteral;
@@ -35,6 +35,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.util.HashMap;
+import java.util.stream.Stream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.jupiter.api.Test;
@@ -55,228 +56,195 @@ class AstExpressionBuilderTest {
 
   @Test
   public void canBuildStringLiteral() {
-    assertEquals(
-        stringLiteral("hello"),
-        buildExprAst("'hello'")
-    );
-    assertEquals(
-        stringLiteral("hello"),
-        buildExprAst("\"hello\"")
-    );
+    assertEquals(stringLiteral("hello"), buildExprAst("'hello'"));
+    assertEquals(stringLiteral("hello"), buildExprAst("\"hello\""));
   }
 
   @Test
   public void canBuildIntegerLiteral() {
-    assertEquals(
-        intLiteral(123),
-        buildExprAst("123")
-    );
-    assertEquals(
-        intLiteral(Integer.MAX_VALUE),
-        buildExprAst(String.valueOf(Integer.MAX_VALUE))
-    );
-    assertEquals(
-        intLiteral(Integer.MIN_VALUE),
-        buildExprAst(String.valueOf(Integer.MIN_VALUE))
-    );
+    assertEquals(intLiteral(123), buildExprAst("123"));
+    assertEquals(intLiteral(Integer.MAX_VALUE), buildExprAst(String.valueOf(Integer.MAX_VALUE)));
+    assertEquals(intLiteral(Integer.MIN_VALUE), buildExprAst(String.valueOf(Integer.MIN_VALUE)));
   }
 
   @Test
   public void canBuildLongLiteral() {
+    assertEquals(longLiteral(1234567890123L), buildExprAst("1234567890123"));
     assertEquals(
-        longLiteral(1234567890123L),
-        buildExprAst("1234567890123")
-    );
-    assertEquals(
-        longLiteral(Integer.MAX_VALUE + 1L),
-        buildExprAst(String.valueOf(Integer.MAX_VALUE + 1L))
-    );
+        longLiteral(Integer.MAX_VALUE + 1L), buildExprAst(String.valueOf(Integer.MAX_VALUE + 1L)));
     assertEquals(
-        longLiteral(Integer.MIN_VALUE - 1L),
-        buildExprAst(String.valueOf(Integer.MIN_VALUE - 1L))
-    );
+        longLiteral(Integer.MIN_VALUE - 1L), buildExprAst(String.valueOf(Integer.MIN_VALUE - 1L)));
   }
 
   @Test
   public void canBuildNegativeRealLiteral() {
-    assertEquals(
-        doubleLiteral(-4.567),
-        buildExprAst("-4.567")
-    );
+    assertEquals(doubleLiteral(-4.567), buildExprAst("-4.567"));
   }
 
   @Test
   public void canBuildBooleanLiteral() {
-    assertEquals(
-        booleanLiteral(true),
-        buildExprAst("true")
-    );
+    assertEquals(booleanLiteral(true), buildExprAst("true"));
   }
 
   @Test
   public void canBuildDateLiteral() {
-    assertEquals(
-        dateLiteral("2020-07-07"),
-        buildExprAst("DATE '2020-07-07'")
-    );
+    assertEquals(dateLiteral("2020-07-07"), buildExprAst("DATE '2020-07-07'"));
   }
 
   @Test
   public void canBuildTimeLiteral() {
-    assertEquals(
-        timeLiteral("11:30:45"),
-        buildExprAst("TIME '11:30:45'")
-    );
+    assertEquals(timeLiteral("11:30:45"), buildExprAst("TIME '11:30:45'"));
   }
 
   @Test
   public void canBuildTimestampLiteral() {
     assertEquals(
-        timestampLiteral("2020-07-07 11:30:45"),
-        buildExprAst("TIMESTAMP '2020-07-07 11:30:45'")
-    );
+        timestampLiteral("2020-07-07 11:30:45"), buildExprAst("TIMESTAMP '2020-07-07 11:30:45'"));
   }
 
   @Test
   public void canBuildIntervalLiteral() {
-    assertEquals(
-        intervalLiteral(1, DataType.INTEGER, "day"),
-        buildExprAst("interval 1 day")
-    );
+    assertEquals(intervalLiteral(1, DataType.INTEGER, "day"), buildExprAst("interval 1 day"));
   }
 
   @Test
   public void canBuildArithmeticExpression() {
+    assertEquals(function("+", intLiteral(1), intLiteral(2)), buildExprAst("1 + 2"));
+  }
+
+  @Test
+  public void canBuildArithmeticExpressionPrecedence() {
     assertEquals(
-        function("+", intLiteral(1), intLiteral(2)),
-        buildExprAst("1 + 2")
-    );
+        function("+", intLiteral(1), function("*", intLiteral(2), intLiteral(3))),
+        buildExprAst("1 + 2 * 3"));
   }
 
   @Test
   public void canBuildFunctionWithoutArguments() {
-    assertEquals(
-        function("PI"),
-        buildExprAst("PI()")
-    );
+    assertEquals(function("PI"), buildExprAst("PI()"));
   }
 
   @Test
   public void canBuildExpressionWithParentheses() {
     assertEquals(
-        function("*",
+        function(
+            "*",
             function("+", doubleLiteral(-1.0), doubleLiteral(2.3)),
-            function("-", intLiteral(3), intLiteral(1))
-        ),
-        buildExprAst("(-1.0 + 2.3) * (3 - 1)")
-    );
+            function("-", intLiteral(3), intLiteral(1))),
+        buildExprAst("(-1.0 + 2.3) * (3 - 1)"));
   }
 
   @Test
   public void canBuildFunctionCall() {
+    assertEquals(function("abs", intLiteral(-1)), buildExprAst("abs(-1)"));
+  }
+
+  @Test
+  public void canBuildExtractFunctionCall() {
+    assertEquals(
+        function("extract", stringLiteral("DAY"), dateLiteral("2023-02-09")).toString(),
+        buildExprAst("extract(DAY FROM \"2023-02-09\")").toString());
+  }
+
+  @Test
+  public void canBuildGetFormatFunctionCall() {
     assertEquals(
-        function("abs", intLiteral(-1)),
-        buildExprAst("abs(-1)")
-    );
+        function("get_format", stringLiteral("DATE"), stringLiteral("USA")),
+        buildExprAst("get_format(DATE,\"USA\")"));
   }
 
   @Test
   public void canBuildNestedFunctionCall() {
     assertEquals(
-        function("abs",
-            function("*",
-              function("abs", intLiteral(-5)),
-              intLiteral(-1)
-            )
-        ),
-        buildExprAst("abs(abs(-5) * -1)")
-    );
+        function("abs", function("*", function("abs", intLiteral(-5)), intLiteral(-1))),
+        buildExprAst("abs(abs(-5) * -1)"));
   }
 
   @Test
   public void canBuildDateAndTimeFunctionCall() {
     assertEquals(
         function("dayofmonth", dateLiteral("2020-07-07")),
-        buildExprAst("dayofmonth(DATE '2020-07-07')")
-    );
+        buildExprAst("dayofmonth(DATE '2020-07-07')"));
   }
 
   @Test
-  public void canBuildComparisonExpression() {
+  public void canBuildTimestampAddFunctionCall() {
     assertEquals(
-        function("!=", intLiteral(1), intLiteral(2)),
-        buildExprAst("1 != 2")
-    );
+        function("timestampadd", stringLiteral("WEEK"), intLiteral(1), dateLiteral("2023-03-14")),
+        buildExprAst("timestampadd(WEEK, 1, DATE '2023-03-14')"));
+  }
 
+  @Test
+  public void canBuildTimstampDiffFunctionCall() {
     assertEquals(
-        function("!=", intLiteral(1), intLiteral(2)),
-        buildExprAst("1 <> 2")
-    );
+        function(
+            "timestampdiff",
+            stringLiteral("WEEK"),
+            timestampLiteral("2023-03-15 00:00:01"),
+            dateLiteral("2023-03-14")),
+        buildExprAst("timestampdiff(WEEK, TIMESTAMP '2023-03-15 00:00:01', DATE '2023-03-14')"));
+  }
+
+  @Test
+  public void canBuildComparisonExpression() {
+    assertEquals(function("!=", intLiteral(1), intLiteral(2)), buildExprAst("1 != 2"));
+
+    assertEquals(function("!=", intLiteral(1), intLiteral(2)), buildExprAst("1 <> 2"));
   }
 
   @Test
   public void canBuildNullTestExpression() {
-    assertEquals(
-        function("is null", intLiteral(1)),
-        buildExprAst("1 is NULL")
-    );
+    assertEquals(function("is null", intLiteral(1)), buildExprAst("1 is NULL"));
 
-    assertEquals(
-        function("is not null", intLiteral(1)),
-        buildExprAst("1 IS NOT null")
-    );
+    assertEquals(function("is not null", intLiteral(1)), buildExprAst("1 IS NOT null"));
   }
 
   @Test
   public void canBuildNullTestExpressionWithNULLLiteral() {
-    assertEquals(
-        function("is null", nullLiteral()),
-        buildExprAst("NULL is NULL")
-    );
+    assertEquals(function("is null", nullLiteral()), buildExprAst("NULL is NULL"));
 
-    assertEquals(
-        function("is not null", nullLiteral()),
-        buildExprAst("NULL IS NOT null")
-    );
+    assertEquals(function("is not null", nullLiteral()), buildExprAst("NULL IS NOT null"));
   }
 
   @Test
   public void canBuildLikeExpression() {
     assertEquals(
         function("like", stringLiteral("str"), stringLiteral("st%")),
-        buildExprAst("'str' like 'st%'")
-    );
+        buildExprAst("'str' like 'st%'"));
 
     assertEquals(
         function("not like", stringLiteral("str"), stringLiteral("st%")),
-        buildExprAst("'str' not like 'st%'")
-    );
+        buildExprAst("'str' not like 'st%'"));
   }
 
   @Test
   public void canBuildRegexpExpression() {
     assertEquals(
         function("regexp", stringLiteral("str"), stringLiteral(".*")),
-        buildExprAst("'str' regexp '.*'")
-    );
+        buildExprAst("'str' regexp '.*'"));
   }
 
   @Test
-  public void canBuildLogicalExpression() {
+  public void canBuildBetweenExpression() {
     assertEquals(
-        and(booleanLiteral(true), booleanLiteral(false)),
-        buildExprAst("true AND false")
-    );
+        between(qualifiedName("age"), intLiteral(10), intLiteral(30)),
+        buildExprAst("age BETWEEN 10 AND 30"));
+  }
 
+  @Test
+  public void canBuildNotBetweenExpression() {
     assertEquals(
-        or(booleanLiteral(true), booleanLiteral(false)),
-        buildExprAst("true OR false")
-    );
+        not(between(qualifiedName("age"), intLiteral(10), intLiteral(30))),
+        buildExprAst("age NOT BETWEEN 10 AND 30"));
+  }
 
-    assertEquals(
-        not(booleanLiteral(false)),
-        buildExprAst("NOT false")
-    );
+  @Test
+  public void canBuildLogicalExpression() {
+    assertEquals(and(booleanLiteral(true), booleanLiteral(false)), buildExprAst("true AND false"));
+
+    assertEquals(or(booleanLiteral(true), booleanLiteral(false)), buildExprAst("true OR false"));
+
+    assertEquals(not(booleanLiteral(false)), buildExprAst("NOT false"));
   }
 
   @Test
@@ -305,8 +273,8 @@ public void canBuildWindowFunctionWithNullOrderSpecified() {
         window(
             function("DENSE_RANK"),
             ImmutableList.of(),
-            ImmutableList.of(ImmutablePair.of(
-                new SortOption(ASC, NULL_LAST), qualifiedName("age")))),
+            ImmutableList.of(
+                ImmutablePair.of(new SortOption(ASC, NULL_LAST), qualifiedName("age")))),
         buildExprAst("DENSE_RANK() OVER (ORDER BY age ASC NULLS LAST)"));
   }
 
@@ -314,35 +282,27 @@ public void canBuildWindowFunctionWithNullOrderSpecified() {
   public void canBuildStringLiteralHighlightFunction() {
     HashMap<String, Literal> args = new HashMap<>();
     assertEquals(
-        highlight(AstDSL.stringLiteral("fieldA"), args),
-        buildExprAst("highlight(\"fieldA\")")
-    );
+        highlight(AstDSL.stringLiteral("fieldA"), args), buildExprAst("highlight(\"fieldA\")"));
   }
 
   @Test
   public void canBuildQualifiedNameHighlightFunction() {
     HashMap<String, Literal> args = new HashMap<>();
     assertEquals(
-        highlight(AstDSL.qualifiedName("fieldA"), args),
-        buildExprAst("highlight(fieldA)")
-    );
+        highlight(AstDSL.qualifiedName("fieldA"), args), buildExprAst("highlight(fieldA)"));
   }
 
   @Test
   public void canBuildStringLiteralPositionFunction() {
     assertEquals(
-            function("position", stringLiteral("substr"), stringLiteral("str")),
-            buildExprAst("position(\"substr\" IN \"str\")")
-    );
+        function("position", stringLiteral("substr"), stringLiteral("str")),
+        buildExprAst("position(\"substr\" IN \"str\")"));
   }
 
   @Test
   public void canBuildWindowFunctionWithoutOrderBy() {
     assertEquals(
-        window(
-            function("RANK"),
-            ImmutableList.of(qualifiedName("state")),
-            ImmutableList.of()),
+        window(function("RANK"), ImmutableList.of(qualifiedName("state")), ImmutableList.of()),
         buildExprAst("RANK() OVER (PARTITION BY state)"));
   }
 
@@ -352,8 +312,7 @@ public void canBuildAggregateWindowFunction() {
         window(
             aggregate("AVG", qualifiedName("age")),
             ImmutableList.of(qualifiedName("state")),
-            ImmutableList.of(ImmutablePair.of(
-                new SortOption(null, null), qualifiedName("age")))),
+            ImmutableList.of(ImmutablePair.of(new SortOption(null, null), qualifiedName("age")))),
         buildExprAst("AVG(age) OVER (PARTITION BY state ORDER BY age)"));
   }
 
@@ -362,11 +321,8 @@ public void canBuildCaseConditionStatement() {
     assertEquals(
         caseWhen(
             null, // no else statement
-            when(
-                function(">", qualifiedName("age"), intLiteral(30)),
-                stringLiteral("age1"))),
-        buildExprAst("CASE WHEN age > 30 THEN 'age1' END")
-    );
+            when(function(">", qualifiedName("age"), intLiteral(30)), stringLiteral("age1"))),
+        buildExprAst("CASE WHEN age > 30 THEN 'age1' END"));
   }
 
   @Test
@@ -376,149 +332,168 @@ public void canBuildCaseValueStatement() {
             qualifiedName("age"),
             stringLiteral("age2"),
             when(intLiteral(30), stringLiteral("age1"))),
-        buildExprAst("CASE age WHEN 30 THEN 'age1' ELSE 'age2' END")
-    );
+        buildExprAst("CASE age WHEN 30 THEN 'age1' ELSE 'age2' END"));
   }
 
   @Test
   public void canBuildKeywordsAsIdentifiers() {
-    assertEquals(
-        qualifiedName("timestamp"),
-        buildExprAst("timestamp")
-    );
+    assertEquals(qualifiedName("timestamp"), buildExprAst("timestamp"));
   }
 
   @Test
   public void canBuildKeywordsAsIdentInQualifiedName() {
-    assertEquals(
-        qualifiedName("test", "timestamp"),
-        buildExprAst("test.timestamp")
-    );
+    assertEquals(qualifiedName("test", "timestamp"), buildExprAst("test.timestamp"));
+  }
+
+  @Test
+  public void canBuildMetaDataFieldAsQualifiedName() {
+    Stream.of("_id", "_index", "_sort", "_score", "_maxscore")
+        .forEach(field -> assertEquals(qualifiedName(field), buildExprAst(field)));
+  }
+
+  @Test
+  public void canBuildNonMetaDataFieldAsQualifiedName() {
+    Stream.of("id", "__id", "_routing", "___field")
+        .forEach(field -> assertEquals(qualifiedName(field), buildExprAst(field)));
   }
 
   @Test
   public void canCastFieldAsString() {
     assertEquals(
         AstDSL.cast(qualifiedName("state"), stringLiteral("string")),
-        buildExprAst("cast(state as string)")
-    );
+        buildExprAst("cast(state as string)"));
   }
 
   @Test
   public void canCastValueAsString() {
     assertEquals(
-        AstDSL.cast(intLiteral(1), stringLiteral("string")),
-        buildExprAst("cast(1 as string)")
-    );
+        AstDSL.cast(intLiteral(1), stringLiteral("string")), buildExprAst("cast(1 as string)"));
   }
 
   @Test
   public void filteredAggregation() {
     assertEquals(
-        AstDSL.filteredAggregate("avg", qualifiedName("age"),
-            function(">", qualifiedName("age"), intLiteral(20))),
-        buildExprAst("avg(age) filter(where age > 20)")
-    );
+        AstDSL.filteredAggregate(
+            "avg", qualifiedName("age"), function(">", qualifiedName("age"), intLiteral(20))),
+        buildExprAst("avg(age) filter(where age > 20)"));
   }
 
   @Test
   public void canBuildVarSamp() {
-    assertEquals(
-        aggregate("var_samp", qualifiedName("age")),
-        buildExprAst("var_samp(age)"));
+    assertEquals(aggregate("var_samp", qualifiedName("age")), buildExprAst("var_samp(age)"));
   }
 
   @Test
   public void canBuildVarPop() {
-    assertEquals(
-        aggregate("var_pop", qualifiedName("age")),
-        buildExprAst("var_pop(age)"));
+    assertEquals(aggregate("var_pop", qualifiedName("age")), buildExprAst("var_pop(age)"));
   }
 
   @Test
   public void canBuildVariance() {
-    assertEquals(
-        aggregate("variance", qualifiedName("age")),
-        buildExprAst("variance(age)"));
+    assertEquals(aggregate("variance", qualifiedName("age")), buildExprAst("variance(age)"));
   }
 
   @Test
   public void distinctCount() {
     assertEquals(
         AstDSL.distinctAggregate("count", qualifiedName("name")),
-        buildExprAst("count(distinct name)")
-    );
+        buildExprAst("count(distinct name)"));
   }
 
   @Test
   public void filteredDistinctCount() {
     assertEquals(
-        AstDSL.filteredDistinctCount("count", qualifiedName("name"), function(
-            ">", qualifiedName("age"), intLiteral(30))),
-        buildExprAst("count(distinct name) filter(where age > 30)")
-    );
+        AstDSL.filteredDistinctCount(
+            "count", qualifiedName("name"), function(">", qualifiedName("age"), intLiteral(30))),
+        buildExprAst("count(distinct name) filter(where age > 30)"));
+  }
+
+  @Test
+  public void canBuildPercentile() {
+    Object expected =
+        aggregate("percentile", qualifiedName("age"), unresolvedArg("percent", doubleLiteral(50D)));
+    assertEquals(expected, buildExprAst("percentile(age, 50)"));
+    assertEquals(expected, buildExprAst("percentile(age, 50.0)"));
+  }
+
+  @Test
+  public void canBuildPercentileWithCompression() {
+    Object expected =
+        aggregate(
+            "percentile",
+            qualifiedName("age"),
+            unresolvedArg("percent", doubleLiteral(50D)),
+            unresolvedArg("compression", doubleLiteral(100D)));
+    assertEquals(expected, buildExprAst("percentile(age, 50, 100)"));
+    assertEquals(expected, buildExprAst("percentile(age, 50.0, 100.0)"));
   }
 
   @Test
   public void matchPhraseQueryAllParameters() {
     assertEquals(
-        AstDSL.function("matchphrasequery",
-            unresolvedArg("field", stringLiteral("test")),
+        AstDSL.function(
+            "matchphrasequery",
+            unresolvedArg("field", qualifiedName("test")),
             unresolvedArg("query", stringLiteral("search query")),
             unresolvedArg("slop", stringLiteral("3")),
             unresolvedArg("analyzer", stringLiteral("standard")),
-            unresolvedArg("zero_terms_query", stringLiteral("NONE"))
-        ),
-        buildExprAst("matchphrasequery(test, 'search query', slop = 3"
-            + ", analyzer = 'standard', zero_terms_query='NONE'"
-            + ")")
-    );
+            unresolvedArg("zero_terms_query", stringLiteral("NONE"))),
+        buildExprAst(
+            "matchphrasequery(test, 'search query', slop = 3"
+                + ", analyzer = 'standard', zero_terms_query='NONE'"
+                + ")"));
   }
 
   @Test
   public void matchPhrasePrefixAllParameters() {
     assertEquals(
-        AstDSL.function("match_phrase_prefix",
-          unresolvedArg("field", stringLiteral("test")),
-          unresolvedArg("query", stringLiteral("search query")),
-          unresolvedArg("slop", stringLiteral("3")),
-          unresolvedArg("boost", stringLiteral("1.5")),
-          unresolvedArg("analyzer", stringLiteral("standard")),
-          unresolvedArg("max_expansions", stringLiteral("4")),
-          unresolvedArg("zero_terms_query", stringLiteral("NONE"))
-          ),
-        buildExprAst("match_phrase_prefix(test, 'search query', slop = 3, boost = 1.5"
-            + ", analyzer = 'standard', max_expansions = 4, zero_terms_query='NONE'"
-            + ")")
-    );
+        AstDSL.function(
+            "match_phrase_prefix",
+            unresolvedArg("field", qualifiedName("test")),
+            unresolvedArg("query", stringLiteral("search query")),
+            unresolvedArg("slop", stringLiteral("3")),
+            unresolvedArg("boost", stringLiteral("1.5")),
+            unresolvedArg("analyzer", stringLiteral("standard")),
+            unresolvedArg("max_expansions", stringLiteral("4")),
+            unresolvedArg("zero_terms_query", stringLiteral("NONE"))),
+        buildExprAst(
+            "match_phrase_prefix(test, 'search query', slop = 3, boost = 1.5"
+                + ", analyzer = 'standard', max_expansions = 4, zero_terms_query='NONE'"
+                + ")"));
   }
 
   @Test
   public void relevanceMatch() {
-    assertEquals(AstDSL.function("match",
-        unresolvedArg("field", stringLiteral("message")),
-        unresolvedArg("query", stringLiteral("search query"))),
-        buildExprAst("match('message', 'search query')")
-    );
-
-    assertEquals(AstDSL.function("match",
-        unresolvedArg("field", stringLiteral("message")),
-        unresolvedArg("query", stringLiteral("search query")),
-        unresolvedArg("analyzer", stringLiteral("keyword")),
-        unresolvedArg("operator", stringLiteral("AND"))),
+    assertEquals(
+        AstDSL.function(
+            "match",
+            unresolvedArg("field", qualifiedName("message")),
+            unresolvedArg("query", stringLiteral("search query"))),
+        buildExprAst("match('message', 'search query')"));
+
+    assertEquals(
+        AstDSL.function(
+            "match",
+            unresolvedArg("field", qualifiedName("message")),
+            unresolvedArg("query", stringLiteral("search query")),
+            unresolvedArg("analyzer", stringLiteral("keyword")),
+            unresolvedArg("operator", stringLiteral("AND"))),
         buildExprAst("match('message', 'search query', analyzer='keyword', operator='AND')"));
   }
 
   @Test
   public void relevanceMatchQuery() {
-    assertEquals(AstDSL.function("matchquery",
-            unresolvedArg("field", stringLiteral("message")),
+    assertEquals(
+        AstDSL.function(
+            "matchquery",
+            unresolvedArg("field", qualifiedName("message")),
             unresolvedArg("query", stringLiteral("search query"))),
-        buildExprAst("matchquery('message', 'search query')")
-    );
+        buildExprAst("matchquery('message', 'search query')"));
 
-    assertEquals(AstDSL.function("matchquery",
-            unresolvedArg("field", stringLiteral("message")),
+    assertEquals(
+        AstDSL.function(
+            "matchquery",
+            unresolvedArg("field", qualifiedName("message")),
             unresolvedArg("query", stringLiteral("search query")),
             unresolvedArg("analyzer", stringLiteral("keyword")),
             unresolvedArg("operator", stringLiteral("AND"))),
@@ -527,143 +502,298 @@ public void relevanceMatchQuery() {
 
   @Test
   public void relevanceMatch_Query() {
-    assertEquals(AstDSL.function("match_query",
-            unresolvedArg("field", stringLiteral("message")),
+    assertEquals(
+        AstDSL.function(
+            "match_query",
+            unresolvedArg("field", qualifiedName("message")),
             unresolvedArg("query", stringLiteral("search query"))),
-        buildExprAst("match_query('message', 'search query')")
-    );
+        buildExprAst("match_query('message', 'search query')"));
 
-    assertEquals(AstDSL.function("match_query",
-            unresolvedArg("field", stringLiteral("message")),
+    assertEquals(
+        AstDSL.function(
+            "match_query",
+            unresolvedArg("field", qualifiedName("message")),
             unresolvedArg("query", stringLiteral("search query")),
             unresolvedArg("analyzer", stringLiteral("keyword")),
             unresolvedArg("operator", stringLiteral("AND"))),
         buildExprAst("match_query('message', 'search query', analyzer='keyword', operator='AND')"));
   }
 
+  @Test
+  public void relevanceMatchQueryAltSyntax() {
+    assertEquals(
+        AstDSL.function(
+                "match_query",
+                unresolvedArg("field", stringLiteral("message")),
+                unresolvedArg("query", stringLiteral("search query")))
+            .toString(),
+        buildExprAst("message = match_query('search query')").toString());
+
+    assertEquals(
+        AstDSL.function(
+                "match_query",
+                unresolvedArg("field", stringLiteral("message")),
+                unresolvedArg("query", stringLiteral("search query")))
+            .toString(),
+        buildExprAst("message = match_query(\"search query\")").toString());
+
+    assertEquals(
+        AstDSL.function(
+                "matchquery",
+                unresolvedArg("field", stringLiteral("message")),
+                unresolvedArg("query", stringLiteral("search query")))
+            .toString(),
+        buildExprAst("message = matchquery('search query')").toString());
+
+    assertEquals(
+        AstDSL.function(
+                "matchquery",
+                unresolvedArg("field", stringLiteral("message")),
+                unresolvedArg("query", stringLiteral("search query")))
+            .toString(),
+        buildExprAst("message = matchquery(\"search query\")").toString());
+  }
+
+  @Test
+  public void relevanceMatchPhraseAltSyntax() {
+    assertEquals(
+        AstDSL.function(
+                "match_phrase",
+                unresolvedArg("field", stringLiteral("message")),
+                unresolvedArg("query", stringLiteral("search query")))
+            .toString(),
+        buildExprAst("message = match_phrase('search query')").toString());
+
+    assertEquals(
+        AstDSL.function(
+                "match_phrase",
+                unresolvedArg("field", stringLiteral("message")),
+                unresolvedArg("query", stringLiteral("search query")))
+            .toString(),
+        buildExprAst("message = match_phrase(\"search query\")").toString());
+
+    assertEquals(
+        AstDSL.function(
+                "matchphrase",
+                unresolvedArg("field", stringLiteral("message")),
+                unresolvedArg("query", stringLiteral("search query")))
+            .toString(),
+        buildExprAst("message = matchphrase('search query')").toString());
+
+    assertEquals(
+        AstDSL.function(
+                "matchphrase",
+                unresolvedArg("field", stringLiteral("message")),
+                unresolvedArg("query", stringLiteral("search query")))
+            .toString(),
+        buildExprAst("message = matchphrase(\"search query\")").toString());
+  }
+
+  @Test
+  public void relevanceMultiMatchAltSyntax() {
+    assertEquals(
+        AstDSL.function(
+            "multi_match",
+            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of("field1", 1.F))),
+            unresolvedArg("query", stringLiteral("search query"))),
+        buildExprAst("field1 = multi_match('search query')"));
+
+    assertEquals(
+        AstDSL.function(
+            "multi_match",
+            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of("field1", 1.F))),
+            unresolvedArg("query", stringLiteral("search query"))),
+        buildExprAst("field1 = multi_match(\"search query\")"));
+
+    assertEquals(
+        AstDSL.function(
+            "multimatch",
+            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of("field1", 1.F))),
+            unresolvedArg("query", stringLiteral("search query"))),
+        buildExprAst("field1 = multimatch('search query')"));
+
+    assertEquals(
+        AstDSL.function(
+            "multimatch",
+            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of("field1", 1.F))),
+            unresolvedArg("query", stringLiteral("search query"))),
+        buildExprAst("field1 = multimatch(\"search query\")"));
+  }
+
   @Test
   public void relevanceMulti_match() {
-    assertEquals(AstDSL.function("multi_match",
-            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field2", 3.2F, "field1", 1.F))),
+    assertEquals(
+        AstDSL.function(
+            "multi_match",
+            unresolvedArg(
+                "fields", new RelevanceFieldList(ImmutableMap.of("field2", 3.2F, "field1", 1.F))),
             unresolvedArg("query", stringLiteral("search query"))),
-        buildExprAst("multi_match(['field1', 'field2' ^ 3.2], 'search query')")
-    );
+        buildExprAst("multi_match(['field1', 'field2' ^ 3.2], 'search query')"));
 
-    assertEquals(AstDSL.function("multi_match",
-            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field2", 3.2F, "field1", 1.F))),
+    assertEquals(
+        AstDSL.function(
+            "multi_match",
+            unresolvedArg(
+                "fields", new RelevanceFieldList(ImmutableMap.of("field2", 3.2F, "field1", 1.F))),
             unresolvedArg("query", stringLiteral("search query")),
             unresolvedArg("analyzer", stringLiteral("keyword")),
             unresolvedArg("operator", stringLiteral("AND"))),
-        buildExprAst("multi_match(['field1', 'field2' ^ 3.2], 'search query',"
-            + "analyzer='keyword', 'operator'='AND')"));
+        buildExprAst(
+            "multi_match(['field1', 'field2' ^ 3.2], 'search query',"
+                + "analyzer='keyword', 'operator'='AND')"));
   }
 
   @Test
   public void relevanceMultimatch_alternate_parameter_syntax() {
-    assertEquals(AstDSL.function("multimatch",
-            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field1", 1F, "field2", 2F))),
+    assertEquals(
+        AstDSL.function(
+            "multimatch",
+            unresolvedArg(
+                "fields", new RelevanceFieldList(ImmutableMap.of("field1", 1F, "field2", 2F))),
             unresolvedArg("query", stringLiteral("search query"))),
-        buildExprAst("multimatch(query='search query', fields=['field1^1.0,field2^2.0'])")
-    );
+        buildExprAst("multimatch(query='search query', fields=['field1^1.0,field2^2.0'])"));
 
-    assertEquals(AstDSL.function("multimatch",
-            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field1", 1F, "field2", 2F))),
+    assertEquals(
+        AstDSL.function(
+            "multimatch",
+            unresolvedArg(
+                "fields", new RelevanceFieldList(ImmutableMap.of("field1", 1F, "field2", 2F))),
             unresolvedArg("query", stringLiteral("search query")),
             unresolvedArg("analyzer", stringLiteral("keyword")),
             unresolvedArg("operator", stringLiteral("AND"))),
-        buildExprAst("multimatch(query='search query', fields=['field1^1.0,field2^2.0'],"
-            + "analyzer='keyword', operator='AND')"));
+        buildExprAst(
+            "multimatch(query='search query', fields=['field1^1.0,field2^2.0'],"
+                + "analyzer='keyword', operator='AND')"));
   }
 
   @Test
   public void relevanceMultimatchquery_alternate_parameter_syntax() {
-    assertEquals(AstDSL.function("multimatchquery",
-            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field", 1F))),
+    assertEquals(
+        AstDSL.function(
+            "multimatchquery",
+            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of("field", 1F))),
             unresolvedArg("query", stringLiteral("search query"))),
-        buildExprAst("multimatchquery(query='search query', fields='field')")
-    );
+        buildExprAst("multimatchquery(query='search query', fields='field')"));
 
-    assertEquals(AstDSL.function("multimatchquery",
-            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field", 1F))),
+    assertEquals(
+        AstDSL.function(
+            "multimatchquery",
+            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of("field", 1F))),
             unresolvedArg("query", stringLiteral("search query")),
             unresolvedArg("analyzer", stringLiteral("keyword")),
             unresolvedArg("operator", stringLiteral("AND"))),
-        buildExprAst("multimatchquery(query='search query', fields='field',"
-            + "analyzer='keyword', 'operator'='AND')"));
+        buildExprAst(
+            "multimatchquery(query='search query', fields='field',"
+                + "analyzer='keyword', 'operator'='AND')"));
   }
 
   @Test
   public void relevanceSimple_query_string() {
-    assertEquals(AstDSL.function("simple_query_string",
-            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field2", 3.2F, "field1", 1.F))),
+    assertEquals(
+        AstDSL.function(
+            "simple_query_string",
+            unresolvedArg(
+                "fields", new RelevanceFieldList(ImmutableMap.of("field2", 3.2F, "field1", 1.F))),
             unresolvedArg("query", stringLiteral("search query"))),
-        buildExprAst("simple_query_string(['field1', 'field2' ^ 3.2], 'search query')")
-    );
+        buildExprAst("simple_query_string(['field1', 'field2' ^ 3.2], 'search query')"));
 
-    assertEquals(AstDSL.function("simple_query_string",
-            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field2", 3.2F, "field1", 1.F))),
+    assertEquals(
+        AstDSL.function(
+            "simple_query_string",
+            unresolvedArg(
+                "fields", new RelevanceFieldList(ImmutableMap.of("field2", 3.2F, "field1", 1.F))),
             unresolvedArg("query", stringLiteral("search query")),
             unresolvedArg("analyzer", stringLiteral("keyword")),
             unresolvedArg("operator", stringLiteral("AND"))),
-        buildExprAst("simple_query_string(['field1', 'field2' ^ 3.2], 'search query',"
-            + "analyzer='keyword', operator='AND')"));
+        buildExprAst(
+            "simple_query_string(['field1', 'field2' ^ 3.2], 'search query',"
+                + "analyzer='keyword', operator='AND')"));
   }
 
   @Test
   public void relevanceQuery_string() {
-    assertEquals(AstDSL.function("query_string",
-            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field2", 3.2F, "field1", 1.F))),
+    assertEquals(
+        AstDSL.function(
+            "query_string",
+            unresolvedArg(
+                "fields", new RelevanceFieldList(ImmutableMap.of("field2", 3.2F, "field1", 1.F))),
             unresolvedArg("query", stringLiteral("search query"))),
-        buildExprAst("query_string(['field1', 'field2' ^ 3.2], 'search query')")
-    );
+        buildExprAst("query_string(['field1', 'field2' ^ 3.2], 'search query')"));
 
-    assertEquals(AstDSL.function("query_string",
-            unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field2", 3.2F, "field1", 1.F))),
+    assertEquals(
+        AstDSL.function(
+            "query_string",
+            unresolvedArg(
+                "fields", new RelevanceFieldList(ImmutableMap.of("field2", 3.2F, "field1", 1.F))),
             unresolvedArg("query", stringLiteral("search query")),
             unresolvedArg("analyzer", stringLiteral("keyword")),
             unresolvedArg("time_zone", stringLiteral("Canada/Pacific")),
             unresolvedArg("tie_breaker", stringLiteral("1.3"))),
-        buildExprAst("query_string(['field1', 'field2' ^ 3.2], 'search query',"
-            + "analyzer='keyword', time_zone='Canada/Pacific', tie_breaker='1.3')"));
+        buildExprAst(
+            "query_string(['field1', 'field2' ^ 3.2], 'search query',"
+                + "analyzer='keyword', time_zone='Canada/Pacific', tie_breaker='1.3')"));
   }
 
   @Test
   public void relevanceWildcard_query() {
-    assertEquals(AstDSL.function("wildcard_query",
-            unresolvedArg("field", stringLiteral("field")),
+    assertEquals(
+        AstDSL.function(
+            "wildcard_query",
+            unresolvedArg("field", qualifiedName("field")),
             unresolvedArg("query", stringLiteral("search query*")),
             unresolvedArg("boost", stringLiteral("1.5")),
             unresolvedArg("case_insensitive", stringLiteral("true")),
             unresolvedArg("rewrite", stringLiteral("scoring_boolean"))),
-        buildExprAst("wildcard_query(field, 'search query*', boost=1.5,"
-            + "case_insensitive=true, rewrite='scoring_boolean'))")
-    );
+        buildExprAst(
+            "wildcard_query(field, 'search query*', boost=1.5,"
+                + "case_insensitive=true, rewrite='scoring_boolean'))"));
+  }
+
+  @Test
+  public void relevanceScore_query() {
+    assertEquals(
+        AstDSL.score(
+            AstDSL.function(
+                "query_string",
+                unresolvedArg(
+                    "fields",
+                    new RelevanceFieldList(ImmutableMap.of("field1", 1.F, "field2", 3.2F))),
+                unresolvedArg("query", stringLiteral("search query"))),
+            AstDSL.doubleLiteral(1.0)),
+        buildExprAst("score(query_string(['field1', 'field2' ^ 3.2], 'search query'))"));
+  }
+
+  @Test
+  public void relevanceScore_withBoost_query() {
+    assertEquals(
+        AstDSL.score(
+            AstDSL.function(
+                "query_string",
+                unresolvedArg(
+                    "fields",
+                    new RelevanceFieldList(ImmutableMap.of("field1", 1.F, "field2", 3.2F))),
+                unresolvedArg("query", stringLiteral("search query"))),
+            doubleLiteral(1.0)),
+        buildExprAst("score(query_string(['field1', 'field2' ^ 3.2], 'search query'), 1.0)"));
   }
 
   @Test
   public void relevanceQuery() {
-    assertEquals(AstDSL.function("query",
-                    unresolvedArg("query", stringLiteral("field1:query OR field2:query"))),
-            buildExprAst("query('field1:query OR field2:query')")
-    );
+    assertEquals(
+        AstDSL.function(
+            "query", unresolvedArg("query", stringLiteral("field1:query OR field2:query"))),
+        buildExprAst("query('field1:query OR field2:query')"));
 
-    assertEquals(AstDSL.function("query",
-                    unresolvedArg("query", stringLiteral("search query")),
-                    unresolvedArg("analyzer", stringLiteral("keyword")),
-                    unresolvedArg("time_zone", stringLiteral("Canada/Pacific")),
-                    unresolvedArg("tie_breaker", stringLiteral("1.3"))),
-            buildExprAst("query('search query',"
-                    + "analyzer='keyword', time_zone='Canada/Pacific', tie_breaker='1.3')"));
+    assertEquals(
+        AstDSL.function(
+            "query",
+            unresolvedArg("query", stringLiteral("search query")),
+            unresolvedArg("analyzer", stringLiteral("keyword")),
+            unresolvedArg("time_zone", stringLiteral("Canada/Pacific")),
+            unresolvedArg("tie_breaker", stringLiteral("1.3"))),
+        buildExprAst(
+            "query('search query',"
+                + "analyzer='keyword', time_zone='Canada/Pacific', tie_breaker='1.3')"));
   }
 
   @Test
@@ -677,7 +807,8 @@ public void canBuildInClause() {
         buildExprAst("age not in (20, 30)"));
 
     assertEquals(
-        AstDSL.in(qualifiedName("age"),
+        AstDSL.in(
+            qualifiedName("age"),
             AstDSL.function("abs", AstDSL.intLiteral(20)),
             AstDSL.function("abs", AstDSL.intLiteral(30))),
         buildExprAst("age in (abs(20), abs(30))"));
diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/AstHavingFilterBuilderTest.java b/sql/src/test/java/org/opensearch/sql/sql/parser/AstHavingFilterBuilderTest.java
index 1cb1ab5f8b..b2e4c54160 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/parser/AstHavingFilterBuilderTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/parser/AstHavingFilterBuilderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -30,8 +29,7 @@
 @ExtendWith(MockitoExtension.class)
 class AstHavingFilterBuilderTest {
 
-  @Mock
-  private QuerySpecification querySpec;
+  @Mock private QuerySpecification querySpec;
 
   private AstHavingFilterBuilder builder;
 
diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/AstNowLikeFunctionTest.java b/sql/src/test/java/org/opensearch/sql/sql/parser/AstNowLikeFunctionTest.java
index 19b48ca0bd..639d73e419 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/parser/AstNowLikeFunctionTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/parser/AstNowLikeFunctionTest.java
@@ -25,29 +25,29 @@
 class AstNowLikeFunctionTest extends AstBuilderTestBase {
 
   private static Stream<Arguments> allFunctions() {
-    return Stream.of("curdate",
-        "current_date",
-        "current_time",
-        "current_timestamp",
-        "curtime",
-        "localtimestamp",
-        "localtime",
-         "now",
-         "sysdate")
+    return Stream.of(
+            "curdate",
+            "current_date",
+            "current_time",
+            "current_timestamp",
+            "curtime",
+            "localtimestamp",
+            "localtime",
+            "now",
+            "sysdate",
+            "utc_date",
+            "utc_time",
+            "utc_timestamp")
         .map(Arguments::of);
   }
 
   private static Stream<Arguments> supportFsp() {
-    return Stream.of("sysdate")
-        .map(Arguments::of);
+    return Stream.of("sysdate").map(Arguments::of);
   }
 
   private static Stream<Arguments> supportShortcut() {
-    return Stream.of("current_date",
-            "current_time",
-            "current_timestamp",
-            "localtimestamp",
-            "localtime")
+    return Stream.of(
+            "current_date", "current_time", "current_timestamp", "localtimestamp", "localtime")
         .map(Arguments::of);
   }
 
@@ -56,12 +56,7 @@ private static Stream<Arguments> supportShortcut() {
   void project_call(String name) {
     String call = name + "()";
     assertEquals(
-        project(
-            values(emptyList()),
-            alias(call, function(name))
-        ),
-        buildAST("SELECT " + call)
-    );
+        project(values(emptyList()), alias(call, function(name))), buildAST("SELECT " + call));
   }
 
   @ParameterizedTest
@@ -70,29 +65,16 @@ void filter_call(String name) {
     String call = name + "()";
     assertEquals(
         project(
-            filter(
-                relation("test"),
-                function(
-                    "=",
-                    qualifiedName("data"),
-                    function(name))
-            ),
-            AllFields.of()
-        ),
-        buildAST("SELECT * FROM test WHERE data = " + call)
-    );
+            filter(relation("test"), function("=", qualifiedName("data"), function(name))),
+            AllFields.of()),
+        buildAST("SELECT * FROM test WHERE data = " + call));
   }
 
-
   @ParameterizedTest
   @MethodSource("supportFsp")
   void fsp(String name) {
     assertEquals(
-        project(
-            values(emptyList()),
-            alias(name + "(0)", function(name, intLiteral(0)))
-        ),
-        buildAST("SELECT " + name + "(0)")
-    );
+        project(values(emptyList()), alias(name + "(0)", function(name, intLiteral(0)))),
+        buildAST("SELECT " + name + "(0)"));
   }
 }
diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/AstQualifiedNameBuilderTest.java b/sql/src/test/java/org/opensearch/sql/sql/parser/AstQualifiedNameBuilderTest.java
index 92b535144f..b0a7592990 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/parser/AstQualifiedNameBuilderTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/parser/AstQualifiedNameBuilderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -51,6 +50,10 @@ public void canBuildQualifiedIdentifier() {
     buildFromQualifiers("account.location.city").expectQualifiedName("account", "location", "city");
   }
 
+  @Test
+  public void commonKeywordCanBeUsedAsIdentifier() {
+    buildFromIdentifier("type").expectQualifiedName("type");
+  }
 
   @Test
   public void functionNameCanBeUsedAsIdentifier() {
@@ -62,9 +65,10 @@ public void functionNameCanBeUsedAsIdentifier() {
 
   void assertFunctionNameCouldBeId(String antlrFunctionName) {
     List<String> functionList =
-        Arrays.stream(antlrFunctionName.split("\\|")).map(String::stripLeading)
-            .map(String::stripTrailing).collect(
-            Collectors.toList());
+        Arrays.stream(antlrFunctionName.split("\\|"))
+            .map(String::stripLeading)
+            .map(String::stripTrailing)
+            .collect(Collectors.toList());
 
     assertFalse(functionList.isEmpty());
     for (String functionName : functionList) {
@@ -105,5 +109,4 @@ private OpenSearchSQLParser createParser(String expr) {
       return parser;
     }
   }
-
 }
diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/AstSortBuilderTest.java b/sql/src/test/java/org/opensearch/sql/sql/parser/AstSortBuilderTest.java
index 3c8d155e65..f72f1ba0ff 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/parser/AstSortBuilderTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/parser/AstSortBuilderTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -40,14 +39,11 @@
 @ExtendWith(MockitoExtension.class)
 class AstSortBuilderTest {
 
-  @Mock
-  private QuerySpecification querySpec;
+  @Mock private QuerySpecification querySpec;
 
-  @Mock
-  private OrderByClauseContext orderByClause;
+  @Mock private OrderByClauseContext orderByClause;
 
-  @Mock
-  private UnresolvedPlan child;
+  @Mock private UnresolvedPlan child;
 
   @Test
   void can_build_sort_node() {
@@ -56,32 +52,35 @@ void can_build_sort_node() {
 
     ImmutableMap<SortOption, List<Argument>> expects =
         ImmutableMap.<SortOption, List<Argument>>builder()
-            .put(new SortOption(null, null),
-                ImmutableList.of(argument("asc", booleanLiteral(true))))
-            .put(new SortOption(ASC, null),
-                ImmutableList.of(argument("asc", booleanLiteral(true))))
-            .put(new SortOption(DESC, null),
+            .put(
+                new SortOption(null, null), ImmutableList.of(argument("asc", booleanLiteral(true))))
+            .put(new SortOption(ASC, null), ImmutableList.of(argument("asc", booleanLiteral(true))))
+            .put(
+                new SortOption(DESC, null),
                 ImmutableList.of(argument("asc", booleanLiteral(false))))
-            .put(new SortOption(null, NULL_LAST),
+            .put(
+                new SortOption(null, NULL_LAST),
                 ImmutableList.of(
                     argument("asc", booleanLiteral(true)),
                     argument("nullFirst", booleanLiteral(false))))
-            .put(new SortOption(DESC, NULL_FIRST),
+            .put(
+                new SortOption(DESC, NULL_FIRST),
                 ImmutableList.of(
                     argument("asc", booleanLiteral(false)),
                     argument("nullFirst", booleanLiteral(true))))
             .build();
 
-    expects.forEach((option, expect) -> {
-      when(querySpec.getOrderByOptions()).thenReturn(ImmutableList.of(option));
+    expects.forEach(
+        (option, expect) -> {
+          when(querySpec.getOrderByOptions()).thenReturn(ImmutableList.of(option));
 
-      AstSortBuilder sortBuilder = new AstSortBuilder(querySpec);
-      assertEquals(
-          new Sort(
-              child, // has to mock and attach child otherwise Guava ImmutableList NPE in getChild()
-              ImmutableList.of(field("name", expect))),
-          sortBuilder.visitOrderByClause(orderByClause).attach(child));
-    });
+          AstSortBuilder sortBuilder = new AstSortBuilder(querySpec);
+          assertEquals(
+              new Sort(
+                  child, // has to mock and attach child otherwise Guava ImmutableList NPE in
+                  // getChild()
+                  ImmutableList.of(field("name", expect))),
+              sortBuilder.visitOrderByClause(orderByClause).attach(child));
+        });
   }
-
 }
diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/context/QuerySpecificationTest.java b/sql/src/test/java/org/opensearch/sql/sql/parser/context/QuerySpecificationTest.java
index 2f75e89002..ed18b3e692 100644
--- a/sql/src/test/java/org/opensearch/sql/sql/parser/context/QuerySpecificationTest.java
+++ b/sql/src/test/java/org/opensearch/sql/sql/parser/context/QuerySpecificationTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.sql.parser.context;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,32 +34,27 @@ class QuerySpecificationTest {
 
   @Test
   void can_collect_group_by_items_in_group_by_clause() {
-    QuerySpecification querySpec = collect(
-        "SELECT name, ABS(age) FROM test GROUP BY name, ABS(age)");
+    QuerySpecification querySpec =
+        collect("SELECT name, ABS(age) FROM test GROUP BY name, ABS(age)");
 
     assertEquals(
-        ImmutableList.of(
-            qualifiedName("name"),
-            function("ABS", qualifiedName("age"))),
+        ImmutableList.of(qualifiedName("name"), function("ABS", qualifiedName("age"))),
         querySpec.getGroupByItems());
   }
 
   @Test
   void can_collect_select_items_in_select_clause() {
-    QuerySpecification querySpec = collect(
-        "SELECT name, ABS(age) FROM test");
+    QuerySpecification querySpec = collect("SELECT name, ABS(age) FROM test");
 
     assertEquals(
-        ImmutableList.of(
-            qualifiedName("name"),
-            function("ABS", qualifiedName("age"))),
+        ImmutableList.of(qualifiedName("name"), function("ABS", qualifiedName("age"))),
         querySpec.getSelectItems());
   }
 
   @Test
   void can_collect_aggregators_in_select_clause() {
-    QuerySpecification querySpec = collect(
-        "SELECT name, AVG(age), SUM(balance) FROM test GROUP BY name");
+    QuerySpecification querySpec =
+        collect("SELECT name, AVG(age), SUM(balance) FROM test GROUP BY name");
 
     assertEquals(
         ImmutableSet.of(
@@ -71,29 +65,25 @@ void can_collect_aggregators_in_select_clause() {
 
   @Test
   void can_collect_nested_aggregators_in_select_clause() {
-    QuerySpecification querySpec = collect(
-        "SELECT name, ABS(1 + AVG(age)) FROM test GROUP BY name");
+    QuerySpecification querySpec =
+        collect("SELECT name, ABS(1 + AVG(age)) FROM test GROUP BY name");
 
     assertEquals(
-        ImmutableSet.of(
-            alias("AVG(age)", aggregate("AVG", qualifiedName("age")))),
+        ImmutableSet.of(alias("AVG(age)", aggregate("AVG", qualifiedName("age")))),
         querySpec.getAggregators());
   }
 
   @Test
   void can_collect_alias_in_select_clause() {
-    QuerySpecification querySpec = collect(
-        "SELECT name AS n FROM test GROUP BY n");
+    QuerySpecification querySpec = collect("SELECT name AS n FROM test GROUP BY n");
 
-    assertEquals(
-        ImmutableMap.of("n", qualifiedName("name")),
-        querySpec.getSelectItemsByAlias());
+    assertEquals(ImmutableMap.of("n", qualifiedName("name")), querySpec.getSelectItemsByAlias());
   }
 
   @Test
   void should_deduplicate_same_aggregators() {
-    QuerySpecification querySpec = collect(
-        "SELECT AVG(age), AVG(balance), AVG(age) FROM test GROUP BY name");
+    QuerySpecification querySpec =
+        collect("SELECT AVG(age), AVG(balance), AVG(age) FROM test GROUP BY name");
 
     assertEquals(
         ImmutableSet.of(
@@ -119,20 +109,24 @@ void can_collect_sort_options_in_order_by_clause() {
 
   @Test
   void should_skip_sort_items_in_window_function() {
-    assertEquals(1,
-        collect("SELECT name, RANK() OVER(ORDER BY age) "
-            + "FROM test ORDER BY name"
-        ).getOrderByOptions().size());
+    assertEquals(
+        1,
+        collect("SELECT name, RANK() OVER(ORDER BY age) " + "FROM test ORDER BY name")
+            .getOrderByOptions()
+            .size());
   }
 
   @Test
   void can_collect_filtered_aggregation() {
     assertEquals(
-        ImmutableSet.of(alias("AVG(age) FILTER(WHERE age > 20)",
-            filteredAggregate("AVG", qualifiedName("age"),
-                function(">", qualifiedName("age"), intLiteral(20))))),
-        collect("SELECT AVG(age) FILTER(WHERE age > 20) FROM test").getAggregators()
-    );
+        ImmutableSet.of(
+            alias(
+                "AVG(age) FILTER(WHERE age > 20)",
+                filteredAggregate(
+                    "AVG",
+                    qualifiedName("age"),
+                    function(">", qualifiedName("age"), intLiteral(20))))),
+        collect("SELECT AVG(age) FILTER(WHERE age > 20) FROM test").getAggregators());
   }
 
   private QuerySpecification collect(String query) {
@@ -147,5 +141,4 @@ private QuerySpecificationContext parse(String query) {
     parser.addErrorListener(new SyntaxAnalysisErrorListener());
     return parser.querySpecification();
   }
-
 }
diff --git a/workbench/.cypress/integration/ui.spec.js b/workbench/.cypress/integration/ui.spec.js
deleted file mode 100644
index b552ba24cd..0000000000
--- a/workbench/.cypress/integration/ui.spec.js
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-/// <reference types="cypress" />
-
-import { edit } from 'brace';
-import { delay, files, testDataSet, testQueries, verifyDownloadData } from '../utils/constants';
-
-describe('Dump test data', () => {
-  it('Indexes test data for SQL and PPL', () => {
-    const dumpDataSet = (url, index) =>
-      cy.request(url).then((response) => {
-        cy.request({
-          method: 'POST',
-          form: true,
-          url: 'api/console/proxy',
-          headers: {
-            'content-type': 'application/json;charset=UTF-8',
-            'osd-xsrf': true,
-          },
-          qs: {
-            path: `${index}/_bulk`,
-            method: 'POST',
-          },
-          body: response.body,
-        });
-      });
-
-    testDataSet.forEach(({url, index}) => dumpDataSet(url, index));
-  });
-});
-
-describe('Test PPL UI', () => {
-  beforeEach(() => {
-    cy.visit('app/opensearch-query-workbench');
-    cy.wait(delay);
-    cy.get('.euiToggle__input[title=PPL]').click({ force: true });
-    cy.wait(delay);
-  });
-
-  it('Confirm results are empty', () => {
-    cy.get('.euiTextAlign')
-      .contains('Enter a query in the query editor above to see results.')
-      .should('have.length', 1);
-  });
-
-  it('Test Run button', () => {
-    cy.get('textarea.ace_text-input').eq(0).focus().type('source=accounts', { force: true });
-    cy.wait(delay);
-    cy.get('.euiButton__text').contains('Run').click({ force: true });
-    cy.wait(delay);
-    cy.get('.euiTab__content').contains('Events').click({ force: true });
-
-    cy.get('span.euiTableCellContent__text')
-      .eq(19)
-      .should((employer) => {
-        expect(employer).to.contain('Pyrami');
-      });
-  });
-
-  it('Test Clear button', () => {
-    cy.get('textarea.ace_text-input').eq(0).focus().type('source=accounts', { force: true });
-    cy.wait(delay);
-    cy.get('.euiButton__text').contains('Run').click({ force: true });
-    cy.wait(delay);
-    cy.get('.euiTab__content').contains('Events').click({ force: true });
-    cy.wait(delay);
-    cy.get('.euiButton__text').contains('Clear').click({ force: true });
-    cy.wait(delay);
-
-    cy.get('.euiTextAlign')
-      .contains('Enter a query in the query editor above to see results.')
-      .should('have.length', 1);
-    cy.get('.ace_content')
-      .eq(0)
-      .then((queryEditor) => {
-        const editor = edit(queryEditor[0]);
-        expect(editor.getValue()).to.equal('');
-      });
-  });
-
-  it('Test full screen view', () => {
-    cy.get('.euiButton__text').contains('Full screen view').should('not.exist');
-    cy.get('.euiTitle').contains('Query Workbench').should('exist');
-
-    cy.get('textarea.ace_text-input').eq(0).focus().type('source=accounts', { force: true });
-    cy.wait(delay);
-    cy.get('.euiButton__text').contains('Run').click({ force: true });
-    cy.wait(delay);
-    cy.get('.euiButton__text').contains('Full screen view').click({ force: true });
-
-    cy.get('.euiTitle').should('not.exist');
-
-    cy.get('button#exit-fullscreen-button').click({ force: true });
-    cy.wait(delay);
-    cy.get('.euiButton__text').contains('Full screen view').should('exist');
-    cy.get('.euiTitle').contains('Query Workbench').should('exist');
-  });
-});
-
-describe('Test SQL UI', () => {
-  beforeEach(() => {
-    cy.visit('app/opensearch-query-workbench');
-    cy.wait(delay);
-    cy.get('.euiToggle__input[title=SQL]').click({ force: true });
-    cy.wait(delay);
-  });
-
-  it('Confirm results are empty', () => {
-    cy.get('.euiTextAlign')
-      .contains('Enter a query in the query editor above to see results.')
-      .should('have.length', 1);
-  });
-
-  it('Test Run button and field search', () => {
-    cy.get('textarea.ace_text-input')
-      .eq(0)
-      .focus()
-      .type('{enter}select * from accounts where balance > 49500;', { force: true });
-    cy.wait(delay);
-    cy.get('.euiButton__text').contains('Run').click({ force: true });
-    cy.wait(delay);
-    cy.get('.euiTab__content').contains('accounts').click({ force: true });
-
-    cy.get('input.euiFieldSearch').type('marissa');
-    cy.get('span.euiTableCellContent__text')
-      .eq(13)
-      .should((account_number) => {
-        expect(account_number).to.contain('803');
-      });
-  });
-
-  it('Test Translate button', () => {
-    cy.get('textarea.ace_text-input').eq(0).focus().type('{selectall}{backspace}', { force: true });
-    cy.wait(delay);
-    cy.get('textarea.ace_text-input')
-      .eq(0)
-      .focus()
-      .type('{selectall}{backspace}select log(balance) from accounts where abs(age) > 20;', {
-        force: true,
-      });
-    cy.wait(delay);
-    cy.get('.euiButton__text').contains('Explain').click({ force: true });
-    cy.wait(delay);
-
-    // hard to get euiCodeBlock content, check length instead
-    cy.get('.euiCodeBlock__code').children().should('have.length', 13);
-  });
-
-  it('Test Clear button', () => {
-    cy.get('.euiButton__text').contains('Clear').click({ force: true });
-    cy.wait(delay);
-
-    cy.get('.ace_content')
-      .eq(0)
-      .then((queryEditor) => {
-        const editor = edit(queryEditor[0]);
-        expect(editor.getValue()).to.equal('');
-      });
-  });
-
-  it('Test full screen view', () => {
-    cy.get('.euiButton__text').contains('Full screen view').should('not.exist');
-    cy.get('.euiTitle').contains('Query Workbench').should('exist');
-
-    cy.get('.euiButton__text').contains('Run').click({ force: true });
-    cy.wait(delay);
-    cy.get('.euiButton__text').contains('Full screen view').click({ force: true });
-
-    cy.get('.euiTitle').should('not.exist');
-  });
-});
-
-describe('Test and verify SQL downloads', () => {
-  verifyDownloadData.map(({ title, url, file }) => {
-    it(title, () => {
-      cy.request({
-        method: 'POST',
-        form: true,
-        url: url,
-        headers: {
-          'content-type': 'application/json;charset=UTF-8',
-          'osd-xsrf': true,
-        },
-        body: {
-          query: 'select * from accounts where balance > 49500',
-        },
-      }).then((response) => {
-        if (title === 'Download and verify CSV' || title === 'Download and verify Text') {
-          expect(response.body.data.body).to.have.string(files[file]);
-        } else {
-          expect(response.body.data.resp).to.have.string(files[file]);
-        }
-      });
-    });
-  });
-});
-
-describe('Test table display', () => {
-  beforeEach(() => {
-    cy.visit('app/opensearch-query-workbench');
-    cy.wait(delay);
-    cy.get('.euiToggle__input[title=SQL]').click({ force: true });
-    cy.wait(delay);
-    cy.get('textarea.ace_text-input').eq(0).focus().type('{selectall}{backspace}', { force: true });
-    cy.wait(delay);
-  });
-
-  testQueries.map(({ title, query, cell_idx, expected_string }) => {
-    it(title, () => {
-      cy.get('textarea.ace_text-input')
-        .eq(0)
-        .focus()
-        .type(`{selectall}{backspace}${query}`, { force: true });
-      cy.wait(delay);
-      cy.get('.euiButton__text').contains('Run').click({ force: true });
-      cy.wait(delay);
-
-      cy.get('span.euiTableCellContent__text')
-        .eq(cell_idx)
-        .should((cell) => {
-          expect(cell).to.contain(expected_string);
-        });
-    });
-  });
-
-  it('Test nested fields display', () => {
-    cy.get('textarea.ace_text-input')
-      .eq(0)
-      .focus()
-      .type(`{selectall}{backspace}select * from employee_nested;`, { force: true });
-    cy.wait(delay);
-    cy.get('.euiButton__text').contains('Run').click({ force: true });
-    cy.wait(delay);
-
-    cy.get('button.euiLink').eq(2).click({ force: true });
-    cy.wait(delay);
-    cy.get('span.euiTableCellContent__text')
-      .eq(24)
-      .should((cell) => {
-        expect(cell).to.contain('comment_2_1');
-      });
-  });
-});
diff --git a/workbench/.cypress/plugins/index.js b/workbench/.cypress/plugins/index.js
deleted file mode 100644
index da3b59f2b6..0000000000
--- a/workbench/.cypress/plugins/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-/// <reference types="cypress" />
-
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-};
diff --git a/workbench/.cypress/support/commands.js b/workbench/.cypress/support/commands.js
deleted file mode 100644
index abc0af8632..0000000000
--- a/workbench/.cypress/support/commands.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add("login", (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
-
-const { ADMIN_AUTH } = require('./constants');
-
-Cypress.Commands.overwrite('visit', (originalFn, url, options) => {
-  // Add the basic auth header when security enabled in the OpenSearch cluster
-  // https://github.com/cypress-io/cypress/issues/1288
-  if (Cypress.env('security_enabled')) {
-    if (options) {
-      options.auth = ADMIN_AUTH;
-    } else {
-      options = { auth: ADMIN_AUTH };
-    }
-    // Add query parameters - select the default OpenSearch Dashboards tenant
-    options.qs = { security_tenant: 'private' };
-    return originalFn(url, options);
-  } else {
-    return originalFn(url, options);
-  }
-});
-
-// Be able to add default options to cy.request(), https://github.com/cypress-io/cypress/issues/726
-Cypress.Commands.overwrite('request', (originalFn, ...args) => {
-  let defaults = {};
-  // Add the basic authentication header when security enabled in the OpenSearch cluster
-  if (Cypress.env('security_enabled')) {
-    defaults.auth = ADMIN_AUTH;
-  }
-
-  let options = {};
-  if (typeof args[0] === 'object' && args[0] !== null) {
-    options = Object.assign({}, args[0]);
-  } else if (args.length === 1) {
-    [options.url] = args;
-  } else if (args.length === 2) {
-    [options.method, options.url] = args;
-  } else if (args.length === 3) {
-    [options.method, options.url, options.body] = args;
-  }
-
-  return originalFn(Object.assign({}, defaults, options));
-});
diff --git a/workbench/.cypress/support/constants.js b/workbench/.cypress/support/constants.js
deleted file mode 100644
index 1001fd49d4..0000000000
--- a/workbench/.cypress/support/constants.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export const ADMIN_AUTH = {
-  username: 'admin',
-  password: 'admin',
-};
diff --git a/workbench/.cypress/support/index.js b/workbench/.cypress/support/index.js
deleted file mode 100644
index 929137ae3f..0000000000
--- a/workbench/.cypress/support/index.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands';
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
-
-// Switch the base URL of OpenSearch when security enabled in the cluster
-if (Cypress.env('security_enabled')) {
-  Cypress.env('opensearch', 'https://localhost:9200');
-}
diff --git a/workbench/.cypress/tsconfig.json b/workbench/.cypress/tsconfig.json
deleted file mode 100644
index 36de33deef..0000000000
--- a/workbench/.cypress/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "compilerOptions": {
-    "allowJs": true,
-    "baseUrl": "../node_modules",
-    "types": ["cypress"]
-  },
-  "include": ["**/*.*"]
-}
diff --git a/workbench/.cypress/utils/constants.js b/workbench/.cypress/utils/constants.js
deleted file mode 100644
index 226b7121db..0000000000
--- a/workbench/.cypress/utils/constants.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-export const delay = 1000;
-
-export const testDataSet = [
-  {
-    url: 'https://raw.githubusercontent.com/opensearch-project/sql/main/integ-test/src/test/resources/accounts.json',
-    index: 'accounts',
-  },
-  {
-    url: 'https://raw.githubusercontent.com/opensearch-project/sql/main/integ-test/src/test/resources/employee_nested.json',
-    index: 'employee_nested'
-  }
-]
-
-export const verifyDownloadData = [
-  {
-    title: 'Download and verify JSON',
-    url: 'api/sql_console/sqljson',
-    file: 'JSONFile'
-  },
-  {
-    title: 'Download and verify JDBC',
-    url: 'api/sql_console/sqlquery',
-    file: 'JDBCFile'
-  },
-  {
-    title: 'Download and verify CSV',
-    url: 'api/sql_console/sqlcsv',
-    file: 'CSVFile'
-  },
-  {
-    title: 'Download and verify Text',
-    url: 'api/sql_console/sqltext',
-    file: 'TextFile'
-  },
-];
-
-export const testQueries = [
-  {
-    title: 'Test GROUP BY',
-    query: 'select count(*) from accounts group by gender;',
-    cell_idx: 3,
-    expected_string: '493'
-  },
-  {
-    title: 'Test GROUP BY with aliases and scalar function',
-    query: 'SELECT ABS(age) AS a FROM accounts GROUP BY ABS(age);',
-    cell_idx: 17,
-    expected_string: '27'
-  },
-  {
-    title: 'Test GROUP BY and HAVING',
-    query: 'SELECT age, MAX(balance) FROM accounts GROUP BY age HAVING MIN(balance) > 3000;',
-    cell_idx: 5,
-    expected_string: '49119'
-  },
-  {
-    title: 'Test ORDER BY',
-    query: 'SELECT account_number FROM accounts ORDER BY account_number DESC;',
-    cell_idx: 5,
-    expected_string: '998'
-  },
-  {
-    title: 'Test JOIN',
-    query: 'select a.account_number, a.firstname, a.lastname, e.id, e.name from accounts a join employee_nested e order by a.account_number;',
-    cell_idx: 45,
-    expected_string: 'Duke'
-  },
-];
-
-export const files = {
-  JSONFile:
-    `"hits":[{"_index":"accounts","_type":"_doc","_id":"842","_score":0,"_source":{"account_number":842,"balance":49587,"firstname":"Meagan","lastname":"Buckner","age":23,"gender":"F","address":"833 Bushwick Court","employer":"Biospan","email":"meaganbuckner@biospan.com","city":"Craig","state":"TX"}},{"_index":"accounts","_type":"_doc","_id":"854","_score":0,"_source":{"account_number":854,"balance":49795,"firstname":"Jimenez","lastname":"Barry","age":25,"gender":"F","address":"603 Cooper Street","employer":"Verton","email":"jimenezbarry@verton.com","city":"Moscow","state":"AL"}},{"_index":"accounts","_type":"_doc","_id":"97","_score":0,"_source":{"account_number":97,"balance":49671,"firstname":"Karen","lastname":"Trujillo","age":40,"gender":"F","address":"512 Cumberland Walk","employer":"Tsunamia","email":"karentrujillo@tsunamia.com","city":"Fredericktown","state":"MO"}},{"_index":"accounts","_type":"_doc","_id":"168","_score":0,"_source":{"account_number":168,"balance":49568,"firstname":"Carissa","lastname":"Simon","age":20,"gender":"M","address":"975 Flatbush Avenue","employer":"Zillacom","email":"carissasimon@zillacom.com","city":"Neibert","state":"IL"}},{"_index":"accounts","_type":"_doc","_id":"240","_score":0,"_source":{"account_number":240,"balance":49741,"firstname":"Oconnor","lastname":"Clay","age":35,"gender":"F","address":"659 Highland Boulevard","employer":"Franscene","email":"oconnorclay@franscene.com","city":"Kilbourne","state":"NH"}},{"_index":"accounts","_type":"_doc","_id":"803","_score":0,"_source":{"account_number":803,"balance":49567,"firstname":"Marissa","lastname":"Spears","age":25,"gender":"M","address":"963 Highland Avenue","employer":"Centregy","email":"marissaspears@centregy.com","city":"Bloomington","state":"MS"}},{"_index":"accounts","_type":"_doc","_id":"248","_score":0,"_source":{"account_number":248,"balance":49989,"firstname":"West","lastname":"England","age":36,"gender":"M","address":"717 Hendrickson Place","employer":"Obliq","email":"westengland@obliq.com","city":"Maury","state":"WA"}}]`,
-  JDBCFile:
-    `{"schema":[{"name":"account_number","type":"long"},{"name":"firstname","type":"text"},{"name":"address","type":"text"},{"name":"balance","type":"long"},{"name":"gender","type":"text"},{"name":"city","type":"text"},{"name":"employer","type":"text"},{"name":"state","type":"text"},{"name":"age","type":"long"},{"name":"email","type":"text"},{"name":"lastname","type":"text"}],"datarows":[[842,"Meagan","833 Bushwick Court",49587,"F","Craig","Biospan","TX",23,"meaganbuckner@biospan.com","Buckner"],[854,"Jimenez","603 Cooper Street",49795,"F","Moscow","Verton","AL",25,"jimenezbarry@verton.com","Barry"],[97,"Karen","512 Cumberland Walk",49671,"F","Fredericktown","Tsunamia","MO",40,"karentrujillo@tsunamia.com","Trujillo"],[168,"Carissa","975 Flatbush Avenue",49568,"M","Neibert","Zillacom","IL",20,"carissasimon@zillacom.com","Simon"],[240,"Oconnor","659 Highland Boulevard",49741,"F","Kilbourne","Franscene","NH",35,"oconnorclay@franscene.com","Clay"],[803,"Marissa","963 Highland Avenue",49567,"M","Bloomington","Centregy","MS",25,"marissaspears@centregy.com","Spears"],[248,"West","717 Hendrickson Place",49989,"M","Maury","Obliq","WA",36,"westengland@obliq.com","England"]],"total":7,"size":7,"status":200}`,
-  CSVFile:
-    `account_number,firstname,address,balance,gender,city,employer,state,age,email,lastname
-842,Meagan,833 Bushwick Court,49587,F,Craig,Biospan,TX,23,meaganbuckner@biospan.com,Buckner
-854,Jimenez,603 Cooper Street,49795,F,Moscow,Verton,AL,25,jimenezbarry@verton.com,Barry
-97,Karen,512 Cumberland Walk,49671,F,Fredericktown,Tsunamia,MO,40,karentrujillo@tsunamia.com,Trujillo
-168,Carissa,975 Flatbush Avenue,49568,M,Neibert,Zillacom,IL,20,carissasimon@zillacom.com,Simon
-240,Oconnor,659 Highland Boulevard,49741,F,Kilbourne,Franscene,NH,35,oconnorclay@franscene.com,Clay
-803,Marissa,963 Highland Avenue,49567,M,Bloomington,Centregy,MS,25,marissaspears@centregy.com,Spears
-248,West,717 Hendrickson Place,49989,M,Maury,Obliq,WA,36,westengland@obliq.com,England`,
-  TextFile:
-    `account_number|firstname|address|balance|gender|city|employer|state|age|email|lastname
-842|Meagan|833 Bushwick Court|49587|F|Craig|Biospan|TX|23|meaganbuckner@biospan.com|Buckner
-854|Jimenez|603 Cooper Street|49795|F|Moscow|Verton|AL|25|jimenezbarry@verton.com|Barry
-97|Karen|512 Cumberland Walk|49671|F|Fredericktown|Tsunamia|MO|40|karentrujillo@tsunamia.com|Trujillo
-168|Carissa|975 Flatbush Avenue|49568|M|Neibert|Zillacom|IL|20|carissasimon@zillacom.com|Simon
-240|Oconnor|659 Highland Boulevard|49741|F|Kilbourne|Franscene|NH|35|oconnorclay@franscene.com|Clay
-803|Marissa|963 Highland Avenue|49567|M|Bloomington|Centregy|MS|25|marissaspears@centregy.com|Spears
-248|West|717 Hendrickson Place|49989|M|Maury|Obliq|WA|36|westengland@obliq.com|England`,
-};
diff --git a/workbench/.gitignore b/workbench/.gitignore
deleted file mode 100644
index d3fce84065..0000000000
--- a/workbench/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-node_modules/
-/build/
-.cypress/screenshots
-.cypress/videos
-/target/*
diff --git a/workbench/.opensearch_dashboards-plugin-helpers.json b/workbench/.opensearch_dashboards-plugin-helpers.json
deleted file mode 100644
index 340532a661..0000000000
--- a/workbench/.opensearch_dashboards-plugin-helpers.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "serverSourcePatterns": [
-    "package.json",
-    "tsconfig.json",
-    "yarn.lock",
-    ".yarnrc",
-    "index.js",
-    "{lib,public,server,test}/**/*",
-    "!__tests__"
-  ]
-}
diff --git a/workbench/CODE_OF_CONDUCT.md b/workbench/CODE_OF_CONDUCT.md
deleted file mode 100644
index ed4f094f6d..0000000000
--- a/workbench/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## Code of Conduct
-
-This project has adopted an [Open Source Code of Conduct](https://github.com/opensearch-project/project-website/blob/main/CONTRIBUTING.md#code-of-conduct).
diff --git a/workbench/CONTRIBUTING.md b/workbench/CONTRIBUTING.md
deleted file mode 100644
index ce761c2eac..0000000000
--- a/workbench/CONTRIBUTING.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# Contributing Guidelines
-
-Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
-documentation, we greatly value feedback and contributions from our community.
-
-Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
-information to effectively respond to your bug report or contribution.
-
-
-## Reporting Bugs/Feature Requests
-
-We welcome you to use the GitHub issue tracker to report bugs or suggest features.
-
-When filing an issue, please check [existing open](https://github.com/opensearch-project/sql/issues?q=is%3Aissue+is%3Aopen+workbench), or [recently closed](https://github.com/opensearch-project/sql/issues?q=is%3Aissue+workbench+is%3Aclosed+), issues to make sure somebody else hasn't already
-reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
-
-* A reproducible test case or series of steps
-* The version of our code being used
-* Any modifications you've made relevant to the bug
-* Anything unusual about your environment or deployment
-
-
-## Contributing via Pull Requests
-Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
-
-1. You are working against the latest source on the *main* branch.
-2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
-3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
-
-To send us a pull request, please:
-
-1. Fork the repository.
-2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
-3. Ensure local tests pass.
-4. Commit to your fork using clear commit messages.
-5. Send us a pull request, answering any default questions in the pull request interface.
-6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
-
-GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
-[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
-
-
-## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any issue tagged ["good first issue"](https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3Aworkbench+label%3A%22good+first+issue%22) is a great place to start.
-
-
-## Code of Conduct
-
-This project has adopted an [Open Source Code of Conduct](https://github.com/opensearch-project/project-website/blob/main/CONTRIBUTING.md#code-of-conduct).
-
-
-## Security issue notifications
-
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue.
-
-
-## Licensing
-
-See the [LICENSE](LICENSE.TXT) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
diff --git a/workbench/CONTRIBUTORS.md b/workbench/CONTRIBUTORS.md
deleted file mode 100644
index 4299ae5e4e..0000000000
--- a/workbench/CONTRIBUTORS.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Contributors in order of last name:
-
-Peng Huo
-
-Abbas Hussain
-
-Anirudh Jadhav
-
-Joshua Li
-
-Francesca Paoletti
-
-Alolita Sharma
-
-Chloe Zhang
diff --git a/workbench/DEVELOPER_GUIDE.md b/workbench/DEVELOPER_GUIDE.md
deleted file mode 100644
index 9d564a3cd1..0000000000
--- a/workbench/DEVELOPER_GUIDE.md
+++ /dev/null
@@ -1,55 +0,0 @@
-## Developer Guide
-
-So you want to contribute code to this project? Excellent! We're glad you're here. Here's what you need to do.
-
-### Setup
-
-1. Download OpenSearch for the version that matches the [OpenSearch Dashboards version specified in package.json](./package.json#L8).
-1. Download and install the most recent version of [OpenSearch SQL plugin](https://github.com/opensearch-project/sql).
-1. Download the OpenSearch Dashboards source code for the [version specified in package.json](./package.json#L8) you want to set up.
-
-   See the [OpenSearch Dashboards contributing guide](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/CONTRIBUTING.md) to get started.
-   
-1. Change your node version to the version specified in `.node-version` inside the OpenSearch Dashboards root directory.
-1. cd into the OpenSearch Dashboards source code directory.
-1. Check out this package from version control into the `plugins` directory.
-```
-git clone git@github.com:opensearch-project/sql.git plugins --no-checkout
-cd plugins
-echo 'workbench/*' >> .git/info/sparse-checkout
-git config core.sparseCheckout true
-git checkout main
-```
-6. Run `yarn osd bootstrap` inside `OpenSearch-Dashboards/plugins/workbench`.
-
-Ultimately, your directory structure should look like this:
-
-```md
-.
-├── OpenSearch-Dashboards
-│   └── plugins
-│       └── workbench
-```
-
-
-## Build
-
-To build the plugin's distributable zip simply run `yarn build`.
-
-Example output: `./build/query-workbench-dashboards*.zip`
-
-
-## Run
-
-- `yarn start`
-
-  Starts OpenSearch Dashboards and includes this plugin. OpenSearch Dashboards will be available on `localhost:5601`.
-
-- `NODE_PATH=../../node_modules yarn test:jest`
-
-  Runs the plugin tests.
-
-
-### Submitting Changes
-
-See [CONTRIBUTING](CONTRIBUTING.md).
\ No newline at end of file
diff --git a/workbench/LICENSE.TXT b/workbench/LICENSE.TXT
deleted file mode 100644
index 67db858821..0000000000
--- a/workbench/LICENSE.TXT
+++ /dev/null
@@ -1,175 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
diff --git a/workbench/NOTICE b/workbench/NOTICE
deleted file mode 100644
index f42ba2537e..0000000000
--- a/workbench/NOTICE
+++ /dev/null
@@ -1,2 +0,0 @@
-OpenSearch Dashboards SQL Plugin
-Copyright OpenSearch Contributors
diff --git a/workbench/README.md b/workbench/README.md
deleted file mode 100644
index 870ee43df8..0000000000
--- a/workbench/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# OpenSearch Dashboards Query Workbench
-
-The OpenSearch Dashboards Query Workbench enables you to query your OpenSearch data using either SQL or PPL syntax from a dedicated OpenSearch Dashboards UI. You can download your query results data in JSON, JDBC, CSV and raw text formats.
-
-
-## Documentation
-
-Please see our technical [documentation](https://opensearch.org/docs/latest/search-plugins/sql/workbench/) to learn more about its features.
-
-
-## Contributing
-
-See [developer guide](DEVELOPER_GUIDE.md) and [how to contribute to this project](CONTRIBUTING.md). 
-
-## Getting Help
-
-If you find a bug, or have a feature request, please don't hesitate to open an issue in this repository.
-
-For more information, see [project website](https://opensearch.org/) and [documentation](https://opensearch.org/docs/latest/). If you need help and are unsure where to open an issue, try [forums](https://discuss.opendistrocommunity.dev/).
-
-## Code of Conduct
-
-This project has adopted the [Amazon Open Source Code of Conduct](CODE_OF_CONDUCT.md). For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq), or contact [opensource-codeofconduct@amazon.com](mailto:opensource-codeofconduct@amazon.com) with any additional questions or comments.
-
-## Security
-
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue.
-
-## License
-
-This project is licensed under the [Apache v2.0 License](../LICENSE.txt).
-
-## Copyright
-
-Copyright OpenSearch Contributors. See [NOTICE](./NOTICE) for details.
diff --git a/workbench/THIRD-PARTY b/workbench/THIRD-PARTY
deleted file mode 100644
index 1496b14e1c..0000000000
--- a/workbench/THIRD-PARTY
+++ /dev/null
@@ -1,397 +0,0 @@
-** @elastic/eui; version 23.1.0 -- https://elastic.github.io/eui/#/
-Copyright 2020 Elasticsearch BV
-** TSLint; version 6.1.2 -- https://github.com/palantir/tslint
-Copyright 2017 Palantir Technologies, Inc.
-** typescript; version 3.0.3 -- https://github.com/Microsoft/TypeScript
-/*!
-*****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-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
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-*****************************************************************************
-*/
-
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND
-DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction, and
-      distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by the
-      copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all other
-      entities that control, are controlled by, or are under common control
-      with that entity. For the purposes of this definition, "control" means
-      (i) the power, direct or indirect, to cause the direction or management
-      of such entity, whether by contract or otherwise, or (ii) ownership of
-      fifty percent (50%) or more of the outstanding shares, or (iii)
-      beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity exercising
-      permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation source,
-      and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but not limited
-      to compiled object code, generated documentation, and conversions to
-      other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or Object
-      form, made available under the License, as indicated by a copyright
-      notice that is included in or attached to the work (an example is
-      provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object form,
-      that is based on (or derived from) the Work and for which the editorial
-      revisions, annotations, elaborations, or other modifications represent,
-      as a whole, an original work of authorship. For the purposes of this
-      License, Derivative Works shall not include works that remain separable
-      from, or merely link (or bind by name) to the interfaces of, the Work and
-      Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including the original
-      version of the Work and any modifications or additions to that Work or
-      Derivative Works thereof, that is intentionally submitted to Licensor for
-      inclusion in the Work by the copyright owner or by an individual or Legal
-      Entity authorized to submit on behalf of the copyright owner. For the
-      purposes of this definition, "submitted" means any form of electronic,
-      verbal, or written communication sent to the Licensor or its
-      representatives, including but not limited to communication on electronic
-      mailing lists, source code control systems, and issue tracking systems
-      that are managed by, or on behalf of, the Licensor for the purpose of
-      discussing and improving the Work, but excluding communication that is
-      conspicuously marked or otherwise designated in writing by the copyright
-      owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity on
-      behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of this
-   License, each Contributor hereby grants to You a perpetual, worldwide,
-   non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-   reproduce, prepare Derivative Works of, publicly display, publicly perform,
-   sublicense, and distribute the Work and such Derivative Works in Source or
-   Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of this
-   License, each Contributor hereby grants to You a perpetual, worldwide,
-   non-exclusive, no-charge, royalty-free, irrevocable (except as stated in
-   this section) patent license to make, have made, use, offer to sell, sell,
-   import, and otherwise transfer the Work, where such license applies only to
-   those patent claims licensable by such Contributor that are necessarily
-   infringed by their Contribution(s) alone or by combination of their
-   Contribution(s) with the Work to which such Contribution(s) was submitted.
-   If You institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-   Contribution incorporated within the Work constitutes direct or contributory
-   patent infringement, then any patent licenses granted to You under this
-   License for that Work shall terminate as of the date such litigation is
-   filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the Work or
-   Derivative Works thereof in any medium, with or without modifications, and
-   in Source or Object form, provided that You meet the following conditions:
-
-      (a) You must give any other recipients of the Work or Derivative Works a
-      copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices stating
-      that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works that You
-      distribute, all copyright, patent, trademark, and attribution notices
-      from the Source form of the Work, excluding those notices that do not
-      pertain to any part of the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-      distribution, then any Derivative Works that You distribute must include
-      a readable copy of the attribution notices contained within such NOTICE
-      file, excluding those notices that do not pertain to any part of the
-      Derivative Works, in at least one of the following places: within a
-      NOTICE text file distributed as part of the Derivative Works; within the
-      Source form or documentation, if provided along with the Derivative
-      Works; or, within a display generated by the Derivative Works, if and
-      wherever such third-party notices normally appear. The contents of the
-      NOTICE file are for informational purposes only and do not modify the
-      License. You may add Your own attribution notices within Derivative Works
-      that You distribute, alongside or as an addendum to the NOTICE text from
-      the Work, provided that such additional attribution notices cannot be
-      construed as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and may
-      provide additional or different license terms and conditions for use,
-      reproduction, or distribution of Your modifications, or for any such
-      Derivative Works as a whole, provided Your use, reproduction, and
-      distribution of the Work otherwise complies with the conditions stated in
-      this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise, any
-   Contribution intentionally submitted for inclusion in the Work by You to the
-   Licensor shall be under the terms and conditions of this License, without
-   any additional terms or conditions. Notwithstanding the above, nothing
-   herein shall supersede or modify the terms of any separate license agreement
-   you may have executed with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor, except
-   as required for reasonable and customary use in describing the origin of the
-   Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or agreed to in
-   writing, Licensor provides the Work (and each Contributor provides its
-   Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied, including, without limitation, any
-   warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or
-   FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining
-   the appropriateness of using or redistributing the Work and assume any risks
-   associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory, whether
-   in tort (including negligence), contract, or otherwise, unless required by
-   applicable law (such as deliberate and grossly negligent acts) or agreed to
-   in writing, shall any Contributor be liable to You for damages, including
-   any direct, indirect, special, incidental, or consequential damages of any
-   character arising as a result of this License or out of the use or inability
-   to use the Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all other
-   commercial damages or losses), even if such Contributor has been advised of
-   the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing the Work
-   or Derivative Works thereof, You may choose to offer, and charge a fee for,
-   acceptance of support, warranty, indemnity, or other liability obligations
-   and/or rights consistent with this License. However, in accepting such
-   obligations, You may act only on Your own behalf and on Your sole
-   responsibility, not on behalf of any other Contributor, and only if You
-   agree to indemnify, defend, and hold each Contributor harmless for any
-   liability incurred by, or claims asserted against, such Contributor by
-   reason of your accepting any such warranty or additional liability. END OF
-   TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification
-within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
-
-* For @elastic/eui see also this required NOTICE:
-    Copyright 2017 Elasticsearch BV
-* For TSLint see also this required NOTICE:
-    Copyright 2017 Palantir Technologies, Inc.
-* For typescript see also this required NOTICE:
-    /*!
-    *****************************************************************************
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    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
-
-    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS
-    OF ANY
-    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-    MERCHANTABLITY OR NON-INFRINGEMENT.
-
-    See the Apache Version 2.0 License for specific language governing
-    permissions
-    and limitations under the License.
-    *****************************************************************************
-    */
-
-------
-
-** enzyme; version 3.1.0 -- http://airbnb.io/enzyme/
-Copyright (c) 2015 Airbnb, Inc.
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Airbnb, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-------
-
-** react; version 16.3.0 -- https://reactjs.org/
-Copyright (c) Facebook, Inc. and its affiliates.
-
-MIT License
-
-Copyright (c) Facebook, Inc. and its affiliates.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-------
-
-** expect.js; version 0.3.1 -- https://github.com/Automattic/expect.js/
-Copyright (c) 2011 Guillermo Rauch <guillermo@learnboost.com>
-Heavily borrows from should.js by TJ Holowaychuck - MIT.
-
-(The MIT License)
-
-Copyright (c) 2011 Guillermo Rauch <guillermo@learnboost.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the 'Software'), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-------
-
-** jest; version 23.6.0 -- https://jestjs.io/
-Copyright (c) 2014-present, Facebook, Inc.
-
-MIT License
-
-For Jest software
-
-Copyright (c) 2014-present, Facebook, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-------
-
-** @types/react; version 16.3.14 -- https://www.npmjs.com/package/@types/react
-These definitions were written by Asana https://asana.com, AssureSign
-http://www.assuresign.com, Microsoft https://microsoft.com, John Reilly
-https://github.com/johnnyreilly, Benoit Benezech https://github.com/bbenezech,
-Patricio Zavolinsky https://github.com/pzavolinsky, Digiguru
-https://github.com/digiguru, Eric Anderson https://github.com/ericanderson,
-Tanguy Krotoff https://github.com/tkrotoff, Dovydas Navickas
-https://github.com/DovydasNavickas, Stéphane Goetz https://github.com/onigoetz,
-Josh Rutherford https://github.com/theruther4d, Guilherme Hübner
-https://github.com/guilhermehubner, Ferdy Budhidharma
-https://github.com/ferdaber, Johann Rakotoharisoa
-https://github.com/jrakotoharisoa, Olivier Pascal
-https://github.com/pascaloliv, Martin Hochel https://github.com/hotell, Frank
-Li https://github.com/franklixuefei, Jessica Franco
-https://github.com/Kovensky, Paul Sherman https://github.com/pshrmn.
-
-This project is licensed under the MIT license.
-Copyrights are respective of each contributor listed at the beginning of each
-definition file.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/workbench/babel.config.js b/workbench/babel.config.js
deleted file mode 100644
index 19139b6863..0000000000
--- a/workbench/babel.config.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-// babelrc doesn't respect NODE_PATH anymore but using require does.
-// Alternative to install them locally in node_modules
-module.exports = {
-  presets: [require("@babel/preset-env"), require("@babel/preset-react"), require("@babel/preset-typescript")],
-  plugins: [require("@babel/plugin-proposal-class-properties"), require("@babel/plugin-proposal-object-rest-spread"), ["@babel/transform-runtime"]]
-};
diff --git a/workbench/common/index.ts b/workbench/common/index.ts
deleted file mode 100644
index a3d39b178b..0000000000
--- a/workbench/common/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-export const PLUGIN_ID = 'queryWorkbenchDashboards';
-export const PLUGIN_NAME = 'Query Workbench';
diff --git a/workbench/cypress.json b/workbench/cypress.json
deleted file mode 100644
index 53c4ba96d8..0000000000
--- a/workbench/cypress.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "baseUrl": "http://localhost:5601",
-  "video": true,
-  "fixturesFolder": ".cypress/fixtures",
-  "integrationFolder": ".cypress/integration",
-  "pluginsFile": ".cypress/plugins/index.js",
-  "screenshotsFolder": ".cypress/screenshots",
-  "supportFile": ".cypress/support/index.js",
-  "videosFolder": ".cypress/videos",
-  "requestTimeout": 60000,
-  "responseTimeout": 60000,
-  "defaultCommandTimeout": 60000,
-  "env": {
-    "opensearch": "localhost:9200",
-    "opensearchDashboards": "localhost:5601",
-    "security_enabled": true
-  }
-}
diff --git a/workbench/opensearch_dashboards.json b/workbench/opensearch_dashboards.json
deleted file mode 100644
index 1bd7b74c8e..0000000000
--- a/workbench/opensearch_dashboards.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "id": "queryWorkbenchDashboards",
-  "version": "2.5.0.0",
-  "opensearchDashboardsVersion": "2.5.0",
-  "server": true,
-  "ui": true,
-  "requiredPlugins": ["navigation"],
-  "optionalPlugins": []
-}
diff --git a/workbench/package.json b/workbench/package.json
deleted file mode 100644
index 08fd7dcb02..0000000000
--- a/workbench/package.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "name": "opensearch-query-workbench",
-  "version": "2.5.0.0",
-  "description": "Query Workbench",
-  "main": "index.js",
-  "license": "Apache-2.0",
-  "homepage": "https://github.com/opensearch-project/sql/tree/main/workbench",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/opensearch-project/sql/tree/main/workbench"
-  },
-  "scripts": {
-    "osd": "node ../../scripts/osd",
-    "opensearch": "node ../../scripts/opensearch",
-    "lint": "tslint .",
-    "start": "plugin-helpers start",
-    "test:server": "plugin-helpers test:server",
-    "test:browser": "plugin-helpers test:browser",
-    "test:jest": "../../node_modules/.bin/jest --config ./test/jest.config.js",
-    "build": "yarn plugin_helpers build",
-    "plugin_helpers": "node ../../scripts/plugin_helpers"
-  },
-  "dependencies": {
-    "brace": "0.11.1",
-    "react-double-scrollbar": "^0.0.15"
-  },
-  "devDependencies": {
-    "@testing-library/user-event": "^13.1.9",
-    "@types/hapi-latest": "npm:@types/hapi@18.0.3",
-    "@types/react-router-dom": "^5.3.2",
-    "cypress": "^5.0.0",
-    "eslint": "^6.8.0",
-    "eslint-plugin-no-unsanitized": "^3.0.2",
-    "eslint-plugin-prefer-object-spread": "^1.2.1",
-    "husky": "^4.2.5",
-    "jest-raw-loader": "^1.0.1",
-    "lint-staged": "^10.2.0",
-    "mutationobserver-shim": "^0.3.3",
-    "ts-jest": "^26.1.0",
-    "ts-node": "^8.9.1",
-    "tslint": "^6.1.2",
-    "tslint-config-prettier": "^1.18.0",
-    "tslint-plugin-prettier": "^2.0.1"
-  },
-  "resolutions": {
-    "**/@types/node": "^10.12.27",
-    "@types/react": "^16.3.14",
-    "**/@types/angular": "^1.6.50",
-    "**/@types/jest": "^24.0.9",
-    "**/@types/react-dom": "^16.0.5",
-    "**/@types/react-router-dom": "^4.3.1",
-    "eslint-utils": "^2.0.0",
-    "json-schema": "^0.4.0",
-    "**/@types/react": "^16.3.14",
-    "ansi-regex": "^5.0.1"
-  }
-}
diff --git a/workbench/public/ace-themes/sql_console.js b/workbench/public/ace-themes/sql_console.js
deleted file mode 100644
index c841db28da..0000000000
--- a/workbench/public/ace-themes/sql_console.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import * as ace from 'brace';
-
-ace.define('ace/theme/sql_console', ['require', 'exports', 'module', 'ace/lib/dom'], function (acequire, exports, module) {
-  exports.isDark = false;
-  exports.cssClass = 'ace-sql-console';
-  exports.cssText = require('../index.scss');
-
-  const dom = acequire('../lib/dom');
-  dom.importCssString(exports.cssText, exports.cssClass);
-});
diff --git a/workbench/public/app.scss b/workbench/public/app.scss
deleted file mode 100644
index 1f9a0be739..0000000000
--- a/workbench/public/app.scss
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-@import '../node_modules/@elastic/eui/src/global_styling/variables/colors';
-@import '../node_modules/@elastic/eui/src/global_styling/variables/size';
-
-.sql-console-query-container {
-  padding: $euiSizeL;
-}
-
-.sql-console-query-editor {
-  .sql-query-panel-header {
-    margin-top: -10px;
-  }
-  .resize-panel {
-    resize: vertical;
-    overflow: auto;
-    cursor: row-resize;
-  }
-  .sql-editor-link:visited {
-    background-color: rgb(255,255,255);
-  }
-}
-
-.sql-console-query-result{
-  .query-result-panel-header {
-    color: #3f3f3f;
-  }
-  scroll-behavior: smooth;
-  .tabs-container {
-    overflow: hidden;
-    margin: 3px;
-  }
-  .table-name {
-    color: #3f3f3f;
-    margin-bottom: 7px;
-  }
-  .table-item-count {
-    color: #8a9596;
-    font-weight: 370;
-  }
-  .sideNav-table {
-    border: solid 1px rgb(217, 217, 217);
-    border-collapse: separate;
-  }
-  .search-panel {
-    display: inline-flex;
-    width: 70%;
-  }
-  .search-bar {
-    width:80%;
-  }
-  .pagination-container {
-    padding: 10px;
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-
-  .tab-arrow-down-container {
-    padding: 25px;
-    height: 56px;
-    vertical-align: middle;
-    color: rgb(0, 121, 165);
-  }
-
-  .toggleContainer {
-    margin: 20px;
-  }
-}
-
-.sql-console-results-container {
-  margin-top: -17px;
-}
-
-.expanded-row {
-  /*background-color: rgb(232,243,246);
-  /*background-color: rgb(245,247,250);*/
-  border-collapse: separate;
-}
-
-.expanded-row:hover {
-  background-color: rgb(232,243,246);
-}
-
-.no-background {
-  background-color: rgba(0, 0, 0, 0);
-}
-
-/* Message Tab */
-.code-editor {
-  color: #006BB4;
-}
-
-.error-message {
-  color: red;
-}
-
-.successful-message{
-  color: #006BB4;
-}
diff --git a/workbench/public/application.tsx b/workbench/public/application.tsx
deleted file mode 100644
index 8957c22b4e..0000000000
--- a/workbench/public/application.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreStart } from '../../../src/core/public';
-import { AppPluginStartDependencies } from './types';
-import { WorkbenchApp } from './components/app';
-
-export const renderApp = (
-  { notifications, http, chrome }: CoreStart,
-  { navigation }: AppPluginStartDependencies,
-  { appBasePath, element }: AppMountParameters
-) => {
-  ReactDOM.render(
-    <WorkbenchApp
-      basename={appBasePath}
-      notifications={notifications}
-      http={http}
-      navigation={navigation}
-      chrome={chrome}
-    />,
-    element
-  );
-
-  return () => ReactDOM.unmountComponentAtNode(element);
-};
diff --git a/workbench/public/components/Header/Header.test.tsx b/workbench/public/components/Header/Header.test.tsx
deleted file mode 100644
index 7fc409b067..0000000000
--- a/workbench/public/components/Header/Header.test.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from "react";
-import "@testing-library/jest-dom/extend-expect";
-import { render } from "@testing-library/react";
-import Header from "./Header";
-
-
-describe("<Header /> spec", () => {
-  it("renders the component", () => {
-    render(<Header />);
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-});
diff --git a/workbench/public/components/Header/Header.tsx b/workbench/public/components/Header/Header.tsx
deleted file mode 100644
index beb82c1f2a..0000000000
--- a/workbench/public/components/Header/Header.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import React from 'react';
-import { EuiHorizontalRule } from '@elastic/eui';
-
-const Header = () => {
-  return (
-      <div>
-        <EuiHorizontalRule margin="none" />
-      </div>
-  );
-};
-
-export default Header;
diff --git a/workbench/public/components/Header/__snapshots__/Header.test.tsx.snap b/workbench/public/components/Header/__snapshots__/Header.test.tsx.snap
deleted file mode 100644
index 34fa845af8..0000000000
--- a/workbench/public/components/Header/__snapshots__/Header.test.tsx.snap
+++ /dev/null
@@ -1,11 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<Header /> spec renders the component 1`] = `
-<div>
-  <div>
-    <hr
-      class="euiHorizontalRule euiHorizontalRule--full"
-    />
-  </div>
-</div>
-`;
diff --git a/workbench/public/components/Main/__snapshots__/main.test.tsx.snap b/workbench/public/components/Main/__snapshots__/main.test.tsx.snap
deleted file mode 100644
index defafbdc77..0000000000
--- a/workbench/public/components/Main/__snapshots__/main.test.tsx.snap
+++ /dev/null
@@ -1,2688 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<Main /> spec click clear button 1`] = `
-<div>
-  <div>
-    <div
-      class="sql-console-query-container"
-    >
-      <div
-        class="query-language-switch"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem"
-          >
-            <h1
-              class="euiTitle euiTitle--large"
-            >
-              Query Workbench
-            </h1>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <fieldset
-              class="euiButtonGroup euiButtonGroup--medium euiButtonGroup--text query-language-switch"
-            >
-              <legend
-                class="euiScreenReaderOnly"
-              >
-                query-language-swtich
-              </legend>
-              <div
-                class="euiButtonGroup__buttons"
-              >
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton--fill euiButtonGroupButton-isSelected"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="SQL"
-                      title="SQL"
-                    >
-                      <input
-                        checked=""
-                        class="euiScreenReaderOnly"
-                        data-test-subj="SQL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      SQL
-                    </span>
-                  </span>
-                </label>
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="PPL"
-                      title="PPL"
-                    >
-                      <input
-                        class="euiScreenReaderOnly"
-                        data-test-subj="PPL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      PPL
-                    </span>
-                  </span>
-                </label>
-              </div>
-            </fieldset>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <a
-              class="euiButton euiButton--primary"
-              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              <span
-                class="euiButtonContent euiButtonContent--iconRight euiButton__content"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M13 8.5a.5.5 0 111 0V12a2 2 0 01-2 2H4a2 2 0 01-2-2V4a2 2 0 012-2h3.5a.5.5 0 010 1H4a1 1 0 00-1 1v8a1 1 0 001 1h8a1 1 0 001-1V8.5zm-5.12.339a.5.5 0 11-.706-.707L13.305 2H10.5a.5.5 0 110-1H14a1 1 0 011 1v3.5a.5.5 0 11-1 0V2.72L7.88 8.838z"
-                  />
-                </svg>
-                <span
-                  class="euiButton__text"
-                >
-                  SQL documentation
-                </span>
-              </span>
-            </a>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div>
-        <div
-          class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow sql-console-query-editor container-panel"
-        >
-          <div
-            class="euiText euiText--medium sql-query-panel-header"
-          >
-            <h3>
-              Query editor
-            </h3>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--s"
-          />
-          <div
-            class="euiCodeEditorWrapper"
-            data-test-subj="codeEditorContainer"
-            style="width: 100%; height: 7rem;"
-          >
-            <button
-              class="euiCodeEditorKeyboardHint"
-              data-test-subj="codeEditorHint"
-              id="some_html_id"
-            >
-              <p
-                class="euiText"
-              >
-                Press Enter to start editing.
-              </p>
-              <p
-                class="euiText"
-              >
-                When you're done, press Escape to stop editing.
-              </p>
-            </button>
-            <div
-              class=" ace_editor ace-sql-console"
-              id="some_html_id"
-              style="width: 100%; height: 7rem; font-size: 14px;"
-            >
-              <textarea
-                aria-label="Code Editor"
-                autocapitalize="off"
-                autocorrect="off"
-                class="ace_text-input"
-                spellcheck="false"
-                style="opacity: 0;"
-                tabindex="-1"
-                wrap="off"
-              />
-              <div
-                aria-hidden="true"
-                class="ace_gutter"
-              >
-                <div
-                  class="ace_layer ace_gutter-layer ace_folding-enabled"
-                />
-                <div
-                  class="ace_gutter-active-line"
-                />
-              </div>
-              <div
-                class="ace_scroller"
-              >
-                <div
-                  class="ace_content"
-                >
-                  <div
-                    class="ace_layer ace_print-margin-layer"
-                  >
-                    <div
-                      class="ace_print-margin"
-                      style="left: 4px; visibility: hidden;"
-                    />
-                  </div>
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_text-layer"
-                    style="padding: 0px 4px;"
-                  />
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_cursor-layer ace_hidden-cursors"
-                  >
-                    <div
-                      class="ace_cursor"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-v"
-                style="display: none; width: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="width: 20px;"
-                />
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-h"
-                style="display: none; height: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="height: 20px;"
-                />
-              </div>
-              <div
-                style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-              >
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                />
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                >
-                  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--l"
-          />
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionRow euiFlexGroup--responsive action-container"
-          >
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary euiButton--fill sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Run
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Clear
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Explain
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div
-        class="sql-console-query-result"
-      >
-        <div
-          class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow query-result-container"
-        >
-          <div
-            style="padding: 20px 20px 0px 20px;"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <div
-                  class="euiText euiText--medium query-result-panel-header"
-                >
-                  <h3>
-                    Results
-                  </h3>
-                </div>
-              </div>
-              <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
-              />
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-          <div
-            class="euiText euiText--medium"
-            style="color: rgb(63, 63, 63);"
-          >
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <h4>
-                No result
-              </h4>
-            </div>
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <p>
-                Enter a query in the query editor above to see results.
-              </p>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<Main /> spec click run button, and response causes an error 1`] = `
-<div>
-  <div>
-    <div
-      class="sql-console-query-container"
-    >
-      <div
-        class="query-language-switch"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem"
-          >
-            <h1
-              class="euiTitle euiTitle--large"
-            >
-              Query Workbench
-            </h1>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <fieldset
-              class="euiButtonGroup euiButtonGroup--medium euiButtonGroup--text query-language-switch"
-            >
-              <legend
-                class="euiScreenReaderOnly"
-              >
-                query-language-swtich
-              </legend>
-              <div
-                class="euiButtonGroup__buttons"
-              >
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton--fill euiButtonGroupButton-isSelected"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="SQL"
-                      title="SQL"
-                    >
-                      <input
-                        checked=""
-                        class="euiScreenReaderOnly"
-                        data-test-subj="SQL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      SQL
-                    </span>
-                  </span>
-                </label>
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="PPL"
-                      title="PPL"
-                    >
-                      <input
-                        class="euiScreenReaderOnly"
-                        data-test-subj="PPL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      PPL
-                    </span>
-                  </span>
-                </label>
-              </div>
-            </fieldset>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <a
-              class="euiButton euiButton--primary"
-              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              <span
-                class="euiButtonContent euiButtonContent--iconRight euiButton__content"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M13 8.5a.5.5 0 111 0V12a2 2 0 01-2 2H4a2 2 0 01-2-2V4a2 2 0 012-2h3.5a.5.5 0 010 1H4a1 1 0 00-1 1v8a1 1 0 001 1h8a1 1 0 001-1V8.5zm-5.12.339a.5.5 0 11-.706-.707L13.305 2H10.5a.5.5 0 110-1H14a1 1 0 011 1v3.5a.5.5 0 11-1 0V2.72L7.88 8.838z"
-                  />
-                </svg>
-                <span
-                  class="euiButton__text"
-                >
-                  SQL documentation
-                </span>
-              </span>
-            </a>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div>
-        <div
-          class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow sql-console-query-editor container-panel"
-        >
-          <div
-            class="euiText euiText--medium sql-query-panel-header"
-          >
-            <h3>
-              Query editor
-            </h3>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--s"
-          />
-          <div
-            class="euiCodeEditorWrapper"
-            data-test-subj="codeEditorContainer"
-            style="width: 100%; height: 7rem;"
-          >
-            <button
-              class="euiCodeEditorKeyboardHint"
-              data-test-subj="codeEditorHint"
-              id="some_html_id"
-            >
-              <p
-                class="euiText"
-              >
-                Press Enter to start editing.
-              </p>
-              <p
-                class="euiText"
-              >
-                When you're done, press Escape to stop editing.
-              </p>
-            </button>
-            <div
-              class=" ace_editor ace-sql-console"
-              id="some_html_id"
-              style="width: 100%; height: 7rem; font-size: 14px;"
-            >
-              <textarea
-                aria-label="Code Editor"
-                autocapitalize="off"
-                autocorrect="off"
-                class="ace_text-input"
-                spellcheck="false"
-                style="opacity: 0;"
-                tabindex="-1"
-                wrap="off"
-              />
-              <div
-                aria-hidden="true"
-                class="ace_gutter"
-              >
-                <div
-                  class="ace_layer ace_gutter-layer ace_folding-enabled"
-                />
-                <div
-                  class="ace_gutter-active-line"
-                />
-              </div>
-              <div
-                class="ace_scroller"
-              >
-                <div
-                  class="ace_content"
-                >
-                  <div
-                    class="ace_layer ace_print-margin-layer"
-                  >
-                    <div
-                      class="ace_print-margin"
-                      style="left: 4px; visibility: hidden;"
-                    />
-                  </div>
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_text-layer"
-                    style="padding: 0px 4px;"
-                  />
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_cursor-layer ace_hidden-cursors"
-                  >
-                    <div
-                      class="ace_cursor"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-v"
-                style="display: none; width: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="width: 20px;"
-                />
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-h"
-                style="display: none; height: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="height: 20px;"
-                />
-              </div>
-              <div
-                style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-              >
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                />
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                >
-                  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--l"
-          />
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionRow euiFlexGroup--responsive action-container"
-          >
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary euiButton--fill sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Run
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Clear
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Explain
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div
-        class="sql-console-query-result"
-      >
-        <div
-          class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow query-result-container"
-        >
-          <div
-            style="padding: 20px 20px 0px 20px;"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <div
-                  class="euiText euiText--medium query-result-panel-header"
-                >
-                  <h3>
-                    Results
-                  </h3>
-                </div>
-              </div>
-              <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
-              />
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-          <div
-            class="euiText euiText--medium"
-            style="color: rgb(63, 63, 63);"
-          >
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <h4>
-                No result
-              </h4>
-            </div>
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <p>
-                Enter a query in the query editor above to see results.
-              </p>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<Main /> spec click run button, and response is not ok 1`] = `
-<div>
-  <div>
-    <div
-      class="sql-console-query-container"
-    >
-      <div
-        class="query-language-switch"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem"
-          >
-            <h1
-              class="euiTitle euiTitle--large"
-            >
-              Query Workbench
-            </h1>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <fieldset
-              class="euiButtonGroup euiButtonGroup--medium euiButtonGroup--text query-language-switch"
-            >
-              <legend
-                class="euiScreenReaderOnly"
-              >
-                query-language-swtich
-              </legend>
-              <div
-                class="euiButtonGroup__buttons"
-              >
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton--fill euiButtonGroupButton-isSelected"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="SQL"
-                      title="SQL"
-                    >
-                      <input
-                        checked=""
-                        class="euiScreenReaderOnly"
-                        data-test-subj="SQL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      SQL
-                    </span>
-                  </span>
-                </label>
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="PPL"
-                      title="PPL"
-                    >
-                      <input
-                        class="euiScreenReaderOnly"
-                        data-test-subj="PPL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      PPL
-                    </span>
-                  </span>
-                </label>
-              </div>
-            </fieldset>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <a
-              class="euiButton euiButton--primary"
-              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              <span
-                class="euiButtonContent euiButtonContent--iconRight euiButton__content"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M13 8.5a.5.5 0 111 0V12a2 2 0 01-2 2H4a2 2 0 01-2-2V4a2 2 0 012-2h3.5a.5.5 0 010 1H4a1 1 0 00-1 1v8a1 1 0 001 1h8a1 1 0 001-1V8.5zm-5.12.339a.5.5 0 11-.706-.707L13.305 2H10.5a.5.5 0 110-1H14a1 1 0 011 1v3.5a.5.5 0 11-1 0V2.72L7.88 8.838z"
-                  />
-                </svg>
-                <span
-                  class="euiButton__text"
-                >
-                  SQL documentation
-                </span>
-              </span>
-            </a>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div>
-        <div
-          class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow sql-console-query-editor container-panel"
-        >
-          <div
-            class="euiText euiText--medium sql-query-panel-header"
-          >
-            <h3>
-              Query editor
-            </h3>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--s"
-          />
-          <div
-            class="euiCodeEditorWrapper"
-            data-test-subj="codeEditorContainer"
-            style="width: 100%; height: 7rem;"
-          >
-            <button
-              class="euiCodeEditorKeyboardHint"
-              data-test-subj="codeEditorHint"
-              id="some_html_id"
-            >
-              <p
-                class="euiText"
-              >
-                Press Enter to start editing.
-              </p>
-              <p
-                class="euiText"
-              >
-                When you're done, press Escape to stop editing.
-              </p>
-            </button>
-            <div
-              class=" ace_editor ace-sql-console"
-              id="some_html_id"
-              style="width: 100%; height: 7rem; font-size: 14px;"
-            >
-              <textarea
-                aria-label="Code Editor"
-                autocapitalize="off"
-                autocorrect="off"
-                class="ace_text-input"
-                spellcheck="false"
-                style="opacity: 0;"
-                tabindex="-1"
-                wrap="off"
-              />
-              <div
-                aria-hidden="true"
-                class="ace_gutter"
-              >
-                <div
-                  class="ace_layer ace_gutter-layer ace_folding-enabled"
-                />
-                <div
-                  class="ace_gutter-active-line"
-                />
-              </div>
-              <div
-                class="ace_scroller"
-              >
-                <div
-                  class="ace_content"
-                >
-                  <div
-                    class="ace_layer ace_print-margin-layer"
-                  >
-                    <div
-                      class="ace_print-margin"
-                      style="left: 4px; visibility: hidden;"
-                    />
-                  </div>
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_text-layer"
-                    style="padding: 0px 4px;"
-                  />
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_cursor-layer ace_hidden-cursors"
-                  >
-                    <div
-                      class="ace_cursor"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-v"
-                style="display: none; width: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="width: 20px;"
-                />
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-h"
-                style="display: none; height: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="height: 20px;"
-                />
-              </div>
-              <div
-                style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-              >
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                />
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                >
-                  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--l"
-          />
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionRow euiFlexGroup--responsive action-container"
-          >
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary euiButton--fill sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Run
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Clear
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Explain
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div
-        class="sql-console-query-result"
-      >
-        <div
-          class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow query-result-container"
-        >
-          <div
-            style="padding: 20px 20px 0px 20px;"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <div
-                  class="euiText euiText--medium query-result-panel-header"
-                >
-                  <h3>
-                    Results
-                  </h3>
-                </div>
-              </div>
-              <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
-              />
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-          <div
-            class="euiText euiText--medium"
-            style="color: rgb(63, 63, 63);"
-          >
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <h4>
-                No result
-              </h4>
-            </div>
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <p>
-                Enter a query in the query editor above to see results.
-              </p>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<Main /> spec click run button, and response is ok 1`] = `
-<div>
-  <div>
-    <div
-      class="sql-console-query-container"
-    >
-      <div
-        class="query-language-switch"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem"
-          >
-            <h1
-              class="euiTitle euiTitle--large"
-            >
-              Query Workbench
-            </h1>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <fieldset
-              class="euiButtonGroup euiButtonGroup--medium euiButtonGroup--text query-language-switch"
-            >
-              <legend
-                class="euiScreenReaderOnly"
-              >
-                query-language-swtich
-              </legend>
-              <div
-                class="euiButtonGroup__buttons"
-              >
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton--fill euiButtonGroupButton-isSelected"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="SQL"
-                      title="SQL"
-                    >
-                      <input
-                        checked=""
-                        class="euiScreenReaderOnly"
-                        data-test-subj="SQL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      SQL
-                    </span>
-                  </span>
-                </label>
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="PPL"
-                      title="PPL"
-                    >
-                      <input
-                        class="euiScreenReaderOnly"
-                        data-test-subj="PPL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      PPL
-                    </span>
-                  </span>
-                </label>
-              </div>
-            </fieldset>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <a
-              class="euiButton euiButton--primary"
-              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              <span
-                class="euiButtonContent euiButtonContent--iconRight euiButton__content"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M13 8.5a.5.5 0 111 0V12a2 2 0 01-2 2H4a2 2 0 01-2-2V4a2 2 0 012-2h3.5a.5.5 0 010 1H4a1 1 0 00-1 1v8a1 1 0 001 1h8a1 1 0 001-1V8.5zm-5.12.339a.5.5 0 11-.706-.707L13.305 2H10.5a.5.5 0 110-1H14a1 1 0 011 1v3.5a.5.5 0 11-1 0V2.72L7.88 8.838z"
-                  />
-                </svg>
-                <span
-                  class="euiButton__text"
-                >
-                  SQL documentation
-                </span>
-              </span>
-            </a>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div>
-        <div
-          class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow sql-console-query-editor container-panel"
-        >
-          <div
-            class="euiText euiText--medium sql-query-panel-header"
-          >
-            <h3>
-              Query editor
-            </h3>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--s"
-          />
-          <div
-            class="euiCodeEditorWrapper"
-            data-test-subj="codeEditorContainer"
-            style="width: 100%; height: 7rem;"
-          >
-            <button
-              class="euiCodeEditorKeyboardHint"
-              data-test-subj="codeEditorHint"
-              id="some_html_id"
-            >
-              <p
-                class="euiText"
-              >
-                Press Enter to start editing.
-              </p>
-              <p
-                class="euiText"
-              >
-                When you're done, press Escape to stop editing.
-              </p>
-            </button>
-            <div
-              class=" ace_editor ace-sql-console"
-              id="some_html_id"
-              style="width: 100%; height: 7rem; font-size: 14px;"
-            >
-              <textarea
-                aria-label="Code Editor"
-                autocapitalize="off"
-                autocorrect="off"
-                class="ace_text-input"
-                spellcheck="false"
-                style="opacity: 0;"
-                tabindex="-1"
-                wrap="off"
-              />
-              <div
-                aria-hidden="true"
-                class="ace_gutter"
-              >
-                <div
-                  class="ace_layer ace_gutter-layer ace_folding-enabled"
-                />
-                <div
-                  class="ace_gutter-active-line"
-                />
-              </div>
-              <div
-                class="ace_scroller"
-              >
-                <div
-                  class="ace_content"
-                >
-                  <div
-                    class="ace_layer ace_print-margin-layer"
-                  >
-                    <div
-                      class="ace_print-margin"
-                      style="left: 4px; visibility: hidden;"
-                    />
-                  </div>
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_text-layer"
-                    style="padding: 0px 4px;"
-                  />
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_cursor-layer ace_hidden-cursors"
-                  >
-                    <div
-                      class="ace_cursor"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-v"
-                style="display: none; width: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="width: 20px;"
-                />
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-h"
-                style="display: none; height: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="height: 20px;"
-                />
-              </div>
-              <div
-                style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-              >
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                />
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                >
-                  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--l"
-          />
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionRow euiFlexGroup--responsive action-container"
-          >
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary euiButton--fill sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Run
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Clear
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Explain
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div
-        class="sql-console-query-result"
-      >
-        <div
-          class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow query-result-container"
-        >
-          <div
-            style="padding: 20px 20px 0px 20px;"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <div
-                  class="euiText euiText--medium query-result-panel-header"
-                >
-                  <h3>
-                    Results
-                  </h3>
-                </div>
-              </div>
-              <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
-              />
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-          <div
-            class="euiText euiText--medium"
-            style="color: rgb(63, 63, 63);"
-          >
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <h4>
-                No result
-              </h4>
-            </div>
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <p>
-                Enter a query in the query editor above to see results.
-              </p>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<Main /> spec click run button, response fills null and missing values 1`] = `
-<div>
-  <div>
-    <div
-      class="sql-console-query-container"
-    >
-      <div
-        class="query-language-switch"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem"
-          >
-            <h1
-              class="euiTitle euiTitle--large"
-            >
-              Query Workbench
-            </h1>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <fieldset
-              class="euiButtonGroup euiButtonGroup--medium euiButtonGroup--text query-language-switch"
-            >
-              <legend
-                class="euiScreenReaderOnly"
-              >
-                query-language-swtich
-              </legend>
-              <div
-                class="euiButtonGroup__buttons"
-              >
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton--fill euiButtonGroupButton-isSelected"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="SQL"
-                      title="SQL"
-                    >
-                      <input
-                        checked=""
-                        class="euiScreenReaderOnly"
-                        data-test-subj="SQL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      SQL
-                    </span>
-                  </span>
-                </label>
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="PPL"
-                      title="PPL"
-                    >
-                      <input
-                        class="euiScreenReaderOnly"
-                        data-test-subj="PPL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      PPL
-                    </span>
-                  </span>
-                </label>
-              </div>
-            </fieldset>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <a
-              class="euiButton euiButton--primary"
-              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              <span
-                class="euiButtonContent euiButtonContent--iconRight euiButton__content"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M13 8.5a.5.5 0 111 0V12a2 2 0 01-2 2H4a2 2 0 01-2-2V4a2 2 0 012-2h3.5a.5.5 0 010 1H4a1 1 0 00-1 1v8a1 1 0 001 1h8a1 1 0 001-1V8.5zm-5.12.339a.5.5 0 11-.706-.707L13.305 2H10.5a.5.5 0 110-1H14a1 1 0 011 1v3.5a.5.5 0 11-1 0V2.72L7.88 8.838z"
-                  />
-                </svg>
-                <span
-                  class="euiButton__text"
-                >
-                  SQL documentation
-                </span>
-              </span>
-            </a>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div>
-        <div
-          class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow sql-console-query-editor container-panel"
-        >
-          <div
-            class="euiText euiText--medium sql-query-panel-header"
-          >
-            <h3>
-              Query editor
-            </h3>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--s"
-          />
-          <div
-            class="euiCodeEditorWrapper"
-            data-test-subj="codeEditorContainer"
-            style="width: 100%; height: 7rem;"
-          >
-            <button
-              class="euiCodeEditorKeyboardHint"
-              data-test-subj="codeEditorHint"
-              id="some_html_id"
-            >
-              <p
-                class="euiText"
-              >
-                Press Enter to start editing.
-              </p>
-              <p
-                class="euiText"
-              >
-                When you're done, press Escape to stop editing.
-              </p>
-            </button>
-            <div
-              class=" ace_editor ace-sql-console"
-              id="some_html_id"
-              style="width: 100%; height: 7rem; font-size: 14px;"
-            >
-              <textarea
-                aria-label="Code Editor"
-                autocapitalize="off"
-                autocorrect="off"
-                class="ace_text-input"
-                spellcheck="false"
-                style="opacity: 0;"
-                tabindex="-1"
-                wrap="off"
-              />
-              <div
-                aria-hidden="true"
-                class="ace_gutter"
-              >
-                <div
-                  class="ace_layer ace_gutter-layer ace_folding-enabled"
-                />
-                <div
-                  class="ace_gutter-active-line"
-                />
-              </div>
-              <div
-                class="ace_scroller"
-              >
-                <div
-                  class="ace_content"
-                >
-                  <div
-                    class="ace_layer ace_print-margin-layer"
-                  >
-                    <div
-                      class="ace_print-margin"
-                      style="left: 4px; visibility: hidden;"
-                    />
-                  </div>
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_text-layer"
-                    style="padding: 0px 4px;"
-                  />
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_cursor-layer ace_hidden-cursors"
-                  >
-                    <div
-                      class="ace_cursor"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-v"
-                style="display: none; width: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="width: 20px;"
-                />
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-h"
-                style="display: none; height: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="height: 20px;"
-                />
-              </div>
-              <div
-                style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-              >
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                />
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                >
-                  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--l"
-          />
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionRow euiFlexGroup--responsive action-container"
-          >
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary euiButton--fill sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Run
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Clear
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Explain
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div
-        class="sql-console-query-result"
-      >
-        <div
-          class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow query-result-container"
-        >
-          <div
-            style="padding: 20px 20px 0px 20px;"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <div
-                  class="euiText euiText--medium query-result-panel-header"
-                >
-                  <h3>
-                    Results
-                  </h3>
-                </div>
-              </div>
-              <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
-              />
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-          <div
-            class="euiText euiText--medium"
-            style="color: rgb(63, 63, 63);"
-          >
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <h4>
-                No result
-              </h4>
-            </div>
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <p>
-                Enter a query in the query editor above to see results.
-              </p>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<Main /> spec click translation button, and response is ok 1`] = `
-<div
-  aria-hidden="true"
-  data-aria-hidden="true"
->
-  <div>
-    <div
-      class="sql-console-query-container"
-    >
-      <div
-        class="query-language-switch"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem"
-          >
-            <h1
-              class="euiTitle euiTitle--large"
-            >
-              Query Workbench
-            </h1>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <fieldset
-              class="euiButtonGroup euiButtonGroup--medium euiButtonGroup--text query-language-switch"
-            >
-              <legend
-                class="euiScreenReaderOnly"
-              >
-                query-language-swtich
-              </legend>
-              <div
-                class="euiButtonGroup__buttons"
-              >
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton--fill euiButtonGroupButton-isSelected"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="SQL"
-                      title="SQL"
-                    >
-                      <input
-                        checked=""
-                        class="euiScreenReaderOnly"
-                        data-test-subj="SQL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      SQL
-                    </span>
-                  </span>
-                </label>
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="PPL"
-                      title="PPL"
-                    >
-                      <input
-                        class="euiScreenReaderOnly"
-                        data-test-subj="PPL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      PPL
-                    </span>
-                  </span>
-                </label>
-              </div>
-            </fieldset>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <a
-              class="euiButton euiButton--primary"
-              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              <span
-                class="euiButtonContent euiButtonContent--iconRight euiButton__content"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M13 8.5a.5.5 0 111 0V12a2 2 0 01-2 2H4a2 2 0 01-2-2V4a2 2 0 012-2h3.5a.5.5 0 010 1H4a1 1 0 00-1 1v8a1 1 0 001 1h8a1 1 0 001-1V8.5zm-5.12.339a.5.5 0 11-.706-.707L13.305 2H10.5a.5.5 0 110-1H14a1 1 0 011 1v3.5a.5.5 0 11-1 0V2.72L7.88 8.838z"
-                  />
-                </svg>
-                <span
-                  class="euiButton__text"
-                >
-                  SQL documentation
-                </span>
-              </span>
-            </a>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div>
-        <div
-          class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow sql-console-query-editor container-panel"
-        >
-          <div
-            class="euiText euiText--medium sql-query-panel-header"
-          >
-            <h3>
-              Query editor
-            </h3>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--s"
-          />
-          <div
-            class="euiCodeEditorWrapper"
-            data-test-subj="codeEditorContainer"
-            style="width: 100%; height: 7rem;"
-          >
-            <button
-              class="euiCodeEditorKeyboardHint"
-              data-test-subj="codeEditorHint"
-              id="some_html_id"
-            >
-              <p
-                class="euiText"
-              >
-                Press Enter to start editing.
-              </p>
-              <p
-                class="euiText"
-              >
-                When you're done, press Escape to stop editing.
-              </p>
-            </button>
-            <div
-              class=" ace_editor ace-sql-console"
-              id="some_html_id"
-              style="width: 100%; height: 7rem; font-size: 14px;"
-            >
-              <textarea
-                aria-label="Code Editor"
-                autocapitalize="off"
-                autocorrect="off"
-                class="ace_text-input"
-                spellcheck="false"
-                style="opacity: 0;"
-                tabindex="-1"
-                wrap="off"
-              />
-              <div
-                aria-hidden="true"
-                class="ace_gutter"
-              >
-                <div
-                  class="ace_layer ace_gutter-layer ace_folding-enabled"
-                />
-                <div
-                  class="ace_gutter-active-line"
-                />
-              </div>
-              <div
-                class="ace_scroller"
-              >
-                <div
-                  class="ace_content"
-                >
-                  <div
-                    class="ace_layer ace_print-margin-layer"
-                  >
-                    <div
-                      class="ace_print-margin"
-                      style="left: 4px; visibility: hidden;"
-                    />
-                  </div>
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_text-layer"
-                    style="padding: 0px 4px;"
-                  />
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_cursor-layer ace_hidden-cursors"
-                  >
-                    <div
-                      class="ace_cursor"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-v"
-                style="display: none; width: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="width: 20px;"
-                />
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-h"
-                style="display: none; height: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="height: 20px;"
-                />
-              </div>
-              <div
-                style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-              >
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                />
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                >
-                  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--l"
-          />
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionRow euiFlexGroup--responsive action-container"
-          >
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary euiButton--fill sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Run
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Clear
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Explain
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div
-        class="sql-console-query-result"
-      >
-        <div
-          class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow query-result-container"
-        >
-          <div
-            style="padding: 20px 20px 0px 20px;"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <div
-                  class="euiText euiText--medium query-result-panel-header"
-                >
-                  <h3>
-                    Results
-                  </h3>
-                </div>
-              </div>
-              <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
-              />
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-          <div
-            class="euiText euiText--medium"
-            style="color: rgb(63, 63, 63);"
-          >
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <h4>
-                No result
-              </h4>
-            </div>
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <p>
-                Enter a query in the query editor above to see results.
-              </p>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<Main /> spec renders the component 1`] = `
-<div>
-  <div>
-    <div
-      class="sql-console-query-container"
-    >
-      <div
-        class="query-language-switch"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem"
-          >
-            <h1
-              class="euiTitle euiTitle--large"
-            >
-              Query Workbench
-            </h1>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <fieldset
-              class="euiButtonGroup euiButtonGroup--medium euiButtonGroup--text query-language-switch"
-            >
-              <legend
-                class="euiScreenReaderOnly"
-              >
-                query-language-swtich
-              </legend>
-              <div
-                class="euiButtonGroup__buttons"
-              >
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton--fill euiButtonGroupButton-isSelected"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="SQL"
-                      title="SQL"
-                    >
-                      <input
-                        checked=""
-                        class="euiScreenReaderOnly"
-                        data-test-subj="SQL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      SQL
-                    </span>
-                  </span>
-                </label>
-                <label
-                  class="euiButtonGroupButton euiButtonGroupButton--text"
-                  for="some_html_id"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <span
-                      class="euiButton__text euiButtonGroupButton__textShift"
-                      data-text="PPL"
-                      title="PPL"
-                    >
-                      <input
-                        class="euiScreenReaderOnly"
-                        data-test-subj="PPL"
-                        id="some_html_id"
-                        name="some_html_id"
-                        type="radio"
-                        value=""
-                      />
-                      PPL
-                    </span>
-                  </span>
-                </label>
-              </div>
-            </fieldset>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <a
-              class="euiButton euiButton--primary"
-              href="https://opensearch.org/docs/latest/search-plugins/sql/index/"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              <span
-                class="euiButtonContent euiButtonContent--iconRight euiButton__content"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                />
-                <span
-                  class="euiButton__text"
-                >
-                  SQL documentation
-                </span>
-              </span>
-            </a>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div>
-        <div
-          class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow sql-console-query-editor container-panel"
-        >
-          <div
-            class="euiText euiText--medium sql-query-panel-header"
-          >
-            <h3>
-              Query editor
-            </h3>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--s"
-          />
-          <div
-            class="euiCodeEditorWrapper"
-            data-test-subj="codeEditorContainer"
-            style="width: 100%; height: 7rem;"
-          >
-            <button
-              class="euiCodeEditorKeyboardHint"
-              data-test-subj="codeEditorHint"
-              id="some_html_id"
-            >
-              <p
-                class="euiText"
-              >
-                Press Enter to start editing.
-              </p>
-              <p
-                class="euiText"
-              >
-                When you're done, press Escape to stop editing.
-              </p>
-            </button>
-            <div
-              class=" ace_editor ace-sql-console"
-              id="some_html_id"
-              style="width: 100%; height: 7rem; font-size: 14px;"
-            >
-              <textarea
-                aria-label="Code Editor"
-                autocapitalize="off"
-                autocorrect="off"
-                class="ace_text-input"
-                spellcheck="false"
-                style="opacity: 0;"
-                tabindex="-1"
-                wrap="off"
-              />
-              <div
-                aria-hidden="true"
-                class="ace_gutter"
-              >
-                <div
-                  class="ace_layer ace_gutter-layer ace_folding-enabled"
-                />
-                <div
-                  class="ace_gutter-active-line"
-                />
-              </div>
-              <div
-                class="ace_scroller"
-              >
-                <div
-                  class="ace_content"
-                >
-                  <div
-                    class="ace_layer ace_print-margin-layer"
-                  >
-                    <div
-                      class="ace_print-margin"
-                      style="left: 4px; visibility: hidden;"
-                    />
-                  </div>
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_text-layer"
-                    style="padding: 0px 4px;"
-                  />
-                  <div
-                    class="ace_layer ace_marker-layer"
-                  />
-                  <div
-                    class="ace_layer ace_cursor-layer ace_hidden-cursors"
-                  >
-                    <div
-                      class="ace_cursor"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-v"
-                style="display: none; width: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="width: 20px;"
-                />
-              </div>
-              <div
-                class="ace_scrollbar ace_scrollbar-h"
-                style="display: none; height: 20px;"
-              >
-                <div
-                  class="ace_scrollbar-inner"
-                  style="height: 20px;"
-                />
-              </div>
-              <div
-                style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-              >
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                />
-                <div
-                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-                >
-                  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--l"
-          />
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionRow euiFlexGroup--responsive action-container"
-          >
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary euiButton--fill sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Run
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Clear
-                  </span>
-                </span>
-              </button>
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <button
-                class="euiButton euiButton--primary sql-editor-button"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButton__content"
-                >
-                  <span
-                    class="euiButton__text"
-                  >
-                    Explain
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div
-        class="sql-console-query-result"
-      >
-        <div
-          class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow query-result-container"
-        >
-          <div
-            style="padding: 20px 20px 0px 20px;"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <div
-                  class="euiText euiText--medium query-result-panel-header"
-                >
-                  <h3>
-                    Results
-                  </h3>
-                </div>
-              </div>
-              <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
-              />
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-          <div
-            class="euiText euiText--medium"
-            style="color: rgb(63, 63, 63);"
-          >
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <h4>
-                No result
-              </h4>
-            </div>
-            <div
-              class="euiTextAlign euiTextAlign--center"
-            >
-              <p>
-                Enter a query in the query editor above to see results.
-              </p>
-            </div>
-          </div>
-          <div
-            class="euiSpacer euiSpacer--xxl"
-          />
-          <div
-            class="euiSpacer euiSpacer--xl"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/workbench/public/components/Main/index.ts b/workbench/public/components/Main/index.ts
deleted file mode 100644
index cb0bd312de..0000000000
--- a/workbench/public/components/Main/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-export { Main } from './main';
diff --git a/workbench/public/components/Main/main.test.tsx b/workbench/public/components/Main/main.test.tsx
deleted file mode 100644
index 8c08e0cc4a..0000000000
--- a/workbench/public/components/Main/main.test.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from "react";
-import "@testing-library/jest-dom/extend-expect";
-import { render, fireEvent } from "@testing-library/react";
-import { httpClientMock } from "../../../test/mocks";
-import {
-  mockQueryResultJDBCResponse,
-  mockNotOkQueryResultResponse,
-  mockQueryTranslationResponse,
-  mockResultWithNull
-} from "../../../test/mocks/mockData";
-import Main from "./main";
-
-const setBreadcrumbsMock = jest.fn();
-
-describe("<Main /> spec", () => {
-
-  it("renders the component", () => {
-    render(
-      <Main httpClient={httpClientMock} setBreadcrumbs={setBreadcrumbsMock} />
-    );
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-
-  it("click run button, and response is ok", async () => {
-    const client = httpClientMock;
-    client.post = jest.fn().mockResolvedValue(mockQueryResultJDBCResponse);
-
-    const { getByText } = render(
-      <Main httpClient={client} setBreadcrumbs={setBreadcrumbsMock} />
-    );
-    const onRunButton = getByText('Run');
-    const asyncTest = () => {
-      fireEvent.click(onRunButton);
-    };
-    await asyncTest();
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-
-  it("click run button, response fills null and missing values", async () => {
-    const client = httpClientMock;
-    client.post = jest.fn().mockResolvedValue(mockResultWithNull);
-
-    const { getByText } = render(
-      <Main httpClient={client} setBreadcrumbs={setBreadcrumbsMock} />
-    );
-    const onRunButton = getByText('Run');
-    const asyncTest = () => {
-      fireEvent.click(onRunButton);
-    };
-    await asyncTest();
-    expect(document.body.children[0]).toMatchSnapshot();
-  })
-
-  it("click run button, and response causes an error", async () => {
-    const client = httpClientMock;
-    client.post = jest.fn().mockRejectedValue('err');
-
-    const { getByText } = render(
-      <Main httpClient={client} setBreadcrumbs={setBreadcrumbsMock} />
-    );
-    const onRunButton = getByText('Run');
-    const asyncTest = () => {
-      fireEvent.click(onRunButton);
-    };
-    await asyncTest();
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-
-  it("click run button, and response is not ok", async () => {
-    const client = httpClientMock;
-    client.post = jest.fn().mockResolvedValue(mockNotOkQueryResultResponse);
-
-    const { getByText } = render(
-      <Main httpClient={client} setBreadcrumbs={setBreadcrumbsMock} />
-    );
-    const onRunButton = getByText('Run');
-    const asyncTest = () => {
-      fireEvent.click(onRunButton);
-    };
-    await asyncTest();
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-
-  it("click translation button, and response is ok", async () => {
-    const client = httpClientMock;
-    client.post = jest.fn().mockResolvedValue(mockQueryTranslationResponse);
-    const { getByText } = render(
-      <Main httpClient={client} setBreadcrumbs={setBreadcrumbsMock} />
-    );
-    const onTranslateButton = getByText('Explain');
-    const asyncTest = () => {
-      fireEvent.click(onTranslateButton);
-    };
-    await asyncTest();
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-
-  it("click clear button", async () => {
-    const client = httpClientMock;
-    const { getByText } = render(
-      <Main httpClient={client} setBreadcrumbs={setBreadcrumbsMock} />
-    );
-    const onClearButton = getByText('Clear');
-    const asyncTest = () => {
-      fireEvent.click(onClearButton);
-    };
-    await asyncTest();
-    expect(client.post).not.toHaveBeenCalled();
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-});
diff --git a/workbench/public/components/Main/main.tsx b/workbench/public/components/Main/main.tsx
deleted file mode 100644
index 9e0964988a..0000000000
--- a/workbench/public/components/Main/main.tsx
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
-import { IHttpResponse } from 'angular';
-import _ from 'lodash';
-import React from 'react';
-import { ChromeBreadcrumb, CoreStart } from '../../../../../src/core/public';
-import { MESSAGE_TAB_LABEL } from '../../utils/constants';
-import {
-  getDefaultTabId,
-  getDefaultTabLabel,
-  getQueries,
-  getSelectedResults,
-  Tree,
-} from '../../utils/utils';
-import { PPLPage } from '../PPLPage/PPLPage';
-import Switch from '../QueryLanguageSwitch/Switch';
-import QueryResults from '../QueryResults/QueryResults';
-import { SQLPage } from '../SQLPage/SQLPage';
-
-interface ResponseData {
-  ok: boolean;
-  resp: any;
-  body: any;
-}
-
-export interface ResponseDetail<T> {
-  fulfilled: boolean;
-  errorMessage?: string;
-  data?: T;
-}
-
-export type TranslateResult = { [key: string]: any };
-
-export interface QueryMessage {
-  text: any;
-  className: string;
-}
-
-export type QueryResult = {
-  fields: string[];
-  records: DataRow[];
-  message: string;
-};
-
-export interface Tab {
-  id: string;
-  name: string;
-  disabled: boolean;
-}
-
-export type ItemIdToExpandedRowMap = {
-  [key: string]: {
-    nodes: Tree;
-    expandedRow?: {};
-    selectedNodes?: { [key: string]: any };
-  };
-};
-
-export type DataRow = {
-  rowId: number;
-  data: { [key: string]: any };
-};
-
-interface MainProps {
-  httpClient: CoreStart['http'];
-  setBreadcrumbs: (newBreadcrumbs: ChromeBreadcrumb[]) => void;
-}
-
-interface MainState {
-  language: string;
-  sqlQueriesString: string;
-  pplQueriesString: string;
-  queries: string[];
-  queryTranslations: Array<ResponseDetail<TranslateResult>>;
-  queryResultsTable: Array<ResponseDetail<QueryResult>>;
-  queryResults: Array<ResponseDetail<string>>;
-  queryResultsJSON: Array<ResponseDetail<string>>;
-  queryResultsCSV: Array<ResponseDetail<string>>;
-  queryResultsTEXT: Array<ResponseDetail<string>>;
-  selectedTabName: string;
-  selectedTabId: string;
-  searchQuery: string;
-  itemIdToExpandedRowMap: ItemIdToExpandedRowMap;
-  messages: Array<QueryMessage>;
-  isResultFullScreen: boolean;
-}
-
-const SUCCESS_MESSAGE = 'Success';
-
-const errorQueryResponse = (queryResultResponseDetail: any) => {
-  let errorMessage =
-    queryResultResponseDetail.errorMessage +
-    ', this query is not runnable. \n \n' +
-    queryResultResponseDetail.data;
-  return errorMessage;
-};
-
-export function getQueryResultsForTable(
-  queryResults: ResponseDetail<string>[]
-): ResponseDetail<QueryResult>[] {
-  return queryResults.map(
-    (queryResultResponseDetail: ResponseDetail<string>): ResponseDetail<QueryResult> => {
-      if (!queryResultResponseDetail.fulfilled) {
-        return {
-          fulfilled: queryResultResponseDetail.fulfilled,
-          errorMessage: errorQueryResponse(queryResultResponseDetail),
-        };
-      } else {
-        const responseObj = queryResultResponseDetail.data
-          ? JSON.parse(queryResultResponseDetail.data)
-          : '';
-        let fields: string[] = [];
-        let dataRows: DataRow[] = [];
-
-        const schema: object[] = _.get(responseObj, 'schema');
-        const datarows: any[][] = _.get(responseObj, 'datarows');
-        let queryType = 'default';
-
-        for (const column of schema.values()) {
-          if (_.isEqual(_.get(column, 'name'), 'TABLE_NAME')) {
-            queryType = 'show';
-            for (const col of schema.values()) {
-              if (_.isEqual(_.get(col, 'name'), 'DATA_TYPE')) queryType = 'describe';
-            }
-          }
-        }
-
-        switch (queryType) {
-          case 'show':
-            fields[0] = 'TABLE_NAME';
-
-            let index: number = -1;
-            for (const [id, field] of schema.entries()) {
-              if (_.eq(_.get(field, 'name'), 'TABLE_NAME')) {
-                index = id;
-                break;
-              }
-            }
-
-            for (const [id, field] of datarows.entries()) {
-              let row: { [key: string]: any } = {};
-              row['TABLE_NAME'] = field[index];
-              let dataRow: DataRow = {
-                rowId: id,
-                data: row,
-              };
-              dataRows[id] = dataRow;
-            }
-            break;
-
-          case 'describe':
-          case 'default':
-            for (const [id, field] of schema.entries()) {
-              let alias: any = null;
-              try {
-                alias = _.get(field, 'alias');
-              } catch (e) {
-                console.log('No alias for field ' + field);
-              } finally {
-                fields[id] = !alias ? _.get(field, 'name') : alias;
-              }
-            }
-
-            for (const [id, data] of datarows.entries()) {
-              let row: { [key: string]: any } = {};
-              for (const index of schema.keys()) {
-                const fieldname = fields[index];
-                row[fieldname] = _.isNull(data[index]) ? '-' : data[index];
-              }
-              let dataRow: DataRow = {
-                rowId: id,
-                data: row,
-              };
-              dataRows[id] = dataRow;
-            }
-            break;
-
-          default:
-        }
-        return {
-          fulfilled: queryResultResponseDetail.fulfilled,
-          data: {
-            fields: fields,
-            records: dataRows,
-            message: SUCCESS_MESSAGE,
-          },
-        };
-      }
-    }
-  );
-}
-
-export class Main extends React.Component<MainProps, MainState> {
-  httpClient: CoreStart['http'];
-
-  constructor(props: MainProps) {
-    super(props);
-
-    this.onChange = this.onChange.bind(this);
-    this.state = {
-      language: 'SQL',
-      sqlQueriesString: 'SHOW tables LIKE %;',
-      pplQueriesString: '',
-      queries: [],
-      queryTranslations: [],
-      queryResultsTable: [],
-      queryResults: [],
-      queryResultsJSON: [],
-      queryResultsCSV: [],
-      queryResultsTEXT: [],
-      selectedTabName: MESSAGE_TAB_LABEL,
-      selectedTabId: MESSAGE_TAB_LABEL,
-      searchQuery: '',
-      itemIdToExpandedRowMap: {},
-      messages: [],
-      isResultFullScreen: false,
-    };
-
-    this.httpClient = this.props.httpClient;
-    this.updateSQLQueries = _.debounce(this.updateSQLQueries, 250).bind(this);
-    this.updatePPLQueries = _.debounce(this.updatePPLQueries, 250).bind(this);
-    this.setIsResultFullScreen = this.setIsResultFullScreen.bind(this);
-  }
-
-  componentDidMount() {
-    this.props.setBreadcrumbs([
-      {
-        text: 'Query Workbench',
-        href: '#',
-      },
-    ]);
-  }
-
-  processTranslateResponse(response: IHttpResponse<ResponseData>): ResponseDetail<TranslateResult> {
-    if (!response) {
-      return {
-        fulfilled: false,
-        errorMessage: 'no response',
-        data: undefined,
-      };
-    }
-    if (!response.data.ok) {
-      return {
-        fulfilled: false,
-        errorMessage: response.data.resp,
-        data: undefined,
-      };
-    }
-    return {
-      fulfilled: true,
-      data: response.data.resp,
-    };
-  }
-
-  processQueryResponse(response: IHttpResponse<ResponseData>): ResponseDetail<string> {
-    if (!response) {
-      return {
-        fulfilled: false,
-        errorMessage: 'no response',
-        data: '',
-      };
-    }
-    if (!response.data.ok) {
-      let err = response.data.resp;
-      console.log('Error occurred when processing query response: ', err);
-
-      // Exclude a special case from the error cases:
-      // When downloading the csv result, it gets the "Unable to parse/serialize body" response
-      // But data is also returned in data body. For this case:
-      // Mark fulfilled to true for this case to write the csv result to downloading file
-      if (response.data.body && err == 'Unable to parse/serialize body') {
-        return {
-          fulfilled: true,
-          errorMessage: err,
-          data: response.data.body,
-        };
-      }
-      return {
-        fulfilled: false,
-        errorMessage: err,
-        data: '',
-      };
-    }
-
-    return {
-      fulfilled: true,
-      data: response.data.resp,
-    };
-  }
-
-  onSelectedTabIdChange = (tab: Tab): void => {
-    this.setState({
-      selectedTabId: tab.id,
-      selectedTabName: tab.name,
-      searchQuery: '',
-      itemIdToExpandedRowMap: {},
-    });
-  };
-
-  onQueryChange = ({ query }: { query: any }) => {
-    // Reset pagination state.
-    this.setState({
-      searchQuery: query,
-      itemIdToExpandedRowMap: {},
-    });
-  };
-
-  updateExpandedMap = (map: ItemIdToExpandedRowMap): void => {
-    this.setState({ itemIdToExpandedRowMap: map });
-  };
-
-  // It returns the error or successful message to display in the Message Tab
-  getMessage(queryResultsForTable: ResponseDetail<QueryResult>[]): Array<QueryMessage> {
-    return queryResultsForTable.map((queryResult) => {
-      return {
-        text:
-          queryResult.fulfilled && queryResult.data
-            ? queryResult.data.message
-            : queryResult.errorMessage,
-        className: queryResult.fulfilled ? 'successful-message' : 'error-message',
-      };
-    });
-  }
-
-  getTranslateMessage(translationResult: ResponseDetail<TranslateResult>[]): Array<QueryMessage> {
-    return translationResult.map((translation) => {
-      return {
-        text: translation.data ? SUCCESS_MESSAGE : translation.errorMessage,
-        className: translation.fulfilled ? 'successful-message' : 'error-message',
-      };
-    });
-  }
-
-  onRun = (queriesString: string): void => {
-    const queries: string[] = getQueries(queriesString);
-    const language = this.state.language;
-    if (queries.length > 0) {
-      let endpoint = '../api/sql_console/' + (_.isEqual(language, 'SQL') ? 'sqlquery' : 'pplquery');
-      const responsePromise = Promise.all(
-        queries.map((query: string) =>
-          this.httpClient
-            .post(endpoint, { body: JSON.stringify({ query }) })
-            .catch((error: any) => {
-              this.setState({
-                messages: [
-                  {
-                    text: error.message,
-                    className: 'error-message',
-                  },
-                ],
-              });
-            })
-        )
-      );
-
-      Promise.all([responsePromise]).then(([response]) => {
-        const results: ResponseDetail<string>[] = response.map((response) =>
-          this.processQueryResponse(response as IHttpResponse<ResponseData>)
-        );
-        const resultTable: ResponseDetail<QueryResult>[] = getQueryResultsForTable(results);
-        this.setState(
-          {
-            queries: queries,
-            queryResults: results,
-            queryResultsTable: resultTable,
-            selectedTabId: getDefaultTabId(results),
-            selectedTabName: getDefaultTabLabel(results, queries[0]),
-            messages: this.getMessage(resultTable),
-            itemIdToExpandedRowMap: {},
-            queryResultsJSON: [],
-            queryResultsCSV: [],
-            queryResultsTEXT: [],
-            searchQuery: '',
-          },
-          () => console.log('Successfully updated the states')
-        ); // added callback function to handle async issues
-      });
-    }
-  };
-
-  onTranslate = (queriesString: string): void => {
-    const queries: string[] = getQueries(queriesString);
-    const language = this.state.language;
-
-    if (queries.length > 0) {
-      let endpoint =
-        '../api/sql_console/' + (_.isEqual(language, 'SQL') ? 'translatesql' : 'translateppl');
-      const translationPromise = Promise.all(
-        queries.map((query: string) =>
-          this.httpClient
-            .post(endpoint, { body: JSON.stringify({ query }) })
-            .catch((error: any) => {
-              this.setState({
-                messages: [
-                  {
-                    text: error.message,
-                    className: 'error-message',
-                  },
-                ],
-              });
-            })
-        )
-      );
-
-      Promise.all([translationPromise]).then(([translationResponse]) => {
-        const translationResult: ResponseDetail<
-          TranslateResult
-        >[] = translationResponse.map((translationResponse) =>
-          this.processTranslateResponse(translationResponse as IHttpResponse<ResponseData>)
-        );
-        const shouldCleanResults = queries == this.state.queries;
-        if (shouldCleanResults) {
-          this.setState({
-            queries,
-            queryTranslations: translationResult,
-            messages: this.getTranslateMessage(translationResult),
-          });
-        } else {
-          this.setState(
-            {
-              queries,
-              queryTranslations: translationResult,
-              messages: this.getTranslateMessage(translationResult),
-            },
-            () => console.log('Successfully updated the states')
-          );
-        }
-      });
-    }
-  };
-
-  getJson = (queries: string[]): void => {
-    if (queries.length > 0) {
-      Promise.all(
-        queries.map((query: string) =>
-          this.httpClient
-            .post('../api/sql_console/sqljson', { body: JSON.stringify({ query }) })
-            .catch((error: any) => {
-              this.setState({
-                messages: [
-                  {
-                    text: error.message,
-                    className: 'error-message',
-                  },
-                ],
-              });
-            })
-        )
-      ).then((response) => {
-        const results: ResponseDetail<string>[] = response.map((response) =>
-          this.processQueryResponse(response as IHttpResponse<ResponseData>)
-        );
-        this.setState(
-          {
-            queries,
-            queryResultsJSON: results,
-          },
-          () => console.log('Successfully updated the states')
-        );
-      });
-    }
-  };
-
-  getJdbc = (queries: string[]): void => {
-    const language = this.state.language;
-    if (queries.length > 0) {
-      let endpoint = '../api/sql_console/' + (_.isEqual(language, 'SQL') ? 'sqlquery' : 'pplquery');
-      Promise.all(
-        queries.map((query: string) =>
-          this.httpClient
-            .post(endpoint, { body: JSON.stringify({ query }) })
-            .catch((error: any) => {
-              this.setState({
-                messages: [
-                  {
-                    text: error.message,
-                    className: 'error-message',
-                  },
-                ],
-              });
-            })
-        )
-      ).then((jdbcResponse) => {
-        const jdbcResult: ResponseDetail<string>[] = jdbcResponse.map((jdbcResponse) =>
-          this.processQueryResponse(jdbcResponse as IHttpResponse<ResponseData>)
-        );
-        this.setState(
-          {
-            queries,
-            queryResults: jdbcResult,
-          },
-          () => console.log('Successfully updated the states')
-        );
-      });
-    }
-  };
-
-  getCsv = (queries: string[]): void => {
-    const language = this.state.language;
-    if (queries.length > 0) {
-      let endpoint = '../api/sql_console/' + (_.isEqual(language, 'SQL') ? 'sqlcsv' : 'pplcsv');
-      Promise.all(
-        queries.map((query: string) =>
-          this.httpClient
-            .post(endpoint, { body: JSON.stringify({ query }) })
-            .catch((error: any) => {
-              this.setState({
-                messages: [
-                  {
-                    text: error.message,
-                    className: 'error-message',
-                  },
-                ],
-              });
-            })
-        )
-      ).then((csvResponse) => {
-        const csvResult: ResponseDetail<string>[] = csvResponse.map((csvResponse) =>
-          this.processQueryResponse(csvResponse as IHttpResponse<ResponseData>)
-        );
-        this.setState(
-          {
-            queries,
-            queryResultsCSV: csvResult,
-          },
-          () => console.log('Successfully updated the states')
-        );
-      });
-    }
-  };
-
-  getText = (queries: string[]): void => {
-    const language = this.state.language;
-    if (queries.length > 0) {
-      let endpoint = '../api/sql_console/' + (_.isEqual(language, 'SQL') ? 'sqltext' : 'ppltext');
-      Promise.all(
-        queries.map((query: string) =>
-          this.httpClient
-            .post(endpoint, { body: JSON.stringify({ query }) })
-            .catch((error: any) => {
-              this.setState({
-                messages: [
-                  {
-                    text: error.message,
-                    className: 'error-message',
-                  },
-                ],
-              });
-            })
-        )
-      ).then((textResponse) => {
-        const textResult: ResponseDetail<string>[] = textResponse.map((textResponse) =>
-          this.processQueryResponse(textResponse as IHttpResponse<ResponseData>)
-        );
-        this.setState(
-          {
-            queries,
-            queryResultsTEXT: textResult,
-          },
-          () => console.log('Successfully updated the states')
-        );
-      });
-    }
-  };
-
-  onClear = (): void => {
-    this.setState({
-      queries: [],
-      queryTranslations: [],
-      queryResultsTable: [],
-      queryResults: [],
-      queryResultsCSV: [],
-      queryResultsJSON: [],
-      queryResultsTEXT: [],
-      messages: [],
-      selectedTabId: MESSAGE_TAB_LABEL,
-      selectedTabName: MESSAGE_TAB_LABEL,
-      itemIdToExpandedRowMap: {},
-    });
-  };
-
-  onChange = (id: string) => {
-    this.setState(
-      {
-        language: id,
-        queryResultsTable: [],
-      },
-      () => console.log('Successfully updated language to ', this.state.language)
-    ); // added callback function to handle async issues
-  };
-
-  updateSQLQueries(query: string) {
-    this.setState({
-      sqlQueriesString: query,
-    });
-  }
-
-  updatePPLQueries(query: string) {
-    this.setState({
-      pplQueriesString: query,
-    });
-  }
-
-  setIsResultFullScreen(isFullScreen: boolean) {
-    this.setState({
-      isResultFullScreen: isFullScreen,
-    });
-  }
-
-  render() {
-    let page;
-    let link;
-    let linkTitle;
-
-    if (this.state.language == 'SQL') {
-      page = (
-        <SQLPage
-          onRun={this.onRun}
-          onTranslate={this.onTranslate}
-          onClear={this.onClear}
-          sqlQuery={this.state.sqlQueriesString}
-          sqlTranslations={this.state.queryTranslations}
-          updateSQLQueries={this.updateSQLQueries}
-        />
-      );
-      link = 'https://opensearch.org/docs/latest/search-plugins/sql/index/';
-      linkTitle = 'SQL documentation';
-    } else {
-      page = (
-        <PPLPage
-          onRun={this.onRun}
-          onTranslate={this.onTranslate}
-          onClear={this.onClear}
-          pplQuery={this.state.pplQueriesString}
-          pplTranslations={this.state.queryTranslations}
-          updatePPLQueries={this.updatePPLQueries}
-        />
-      );
-      link = 'https://opensearch.org/docs/latest/observability-plugin/ppl/index/';
-      linkTitle = 'PPL documentation';
-    }
-
-    if (this.state.isResultFullScreen) {
-      return (
-        <div className="sql-console-query-result">
-          <QueryResults
-            language={this.state.language}
-            queries={this.state.queries}
-            queryResults={this.state.queryResultsTable}
-            queryResultsJDBC={getSelectedResults(this.state.queryResults, this.state.selectedTabId)}
-            queryResultsJSON={getSelectedResults(
-              this.state.queryResultsJSON,
-              this.state.selectedTabId
-            )}
-            queryResultsCSV={getSelectedResults(
-              this.state.queryResultsCSV,
-              this.state.selectedTabId
-            )}
-            queryResultsTEXT={getSelectedResults(
-              this.state.queryResultsTEXT,
-              this.state.selectedTabId
-            )}
-            messages={this.state.messages}
-            selectedTabId={this.state.selectedTabId}
-            selectedTabName={this.state.selectedTabName}
-            onSelectedTabIdChange={this.onSelectedTabIdChange}
-            itemIdToExpandedRowMap={this.state.itemIdToExpandedRowMap}
-            onQueryChange={this.onQueryChange}
-            updateExpandedMap={this.updateExpandedMap}
-            searchQuery={this.state.searchQuery}
-            tabsOverflow={false}
-            getJson={this.getJson}
-            getJdbc={this.getJdbc}
-            getCsv={this.getCsv}
-            getText={this.getText}
-            isResultFullScreen={this.state.isResultFullScreen}
-            setIsResultFullScreen={this.setIsResultFullScreen}
-          />
-        </div>
-      );
-    }
-
-    return (
-      <div>
-        <div className="sql-console-query-container">
-          <div className="query-language-switch">
-            <EuiFlexGroup alignItems="center">
-              <EuiFlexItem>
-                <EuiTitle size="l">
-                  <h1>Query Workbench</h1>
-                </EuiTitle>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <Switch onChange={this.onChange} language={this.state.language} />
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiButton href={link} target="_blank" iconType="popout" iconSide="right">
-                  {linkTitle}
-                </EuiButton>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </div>
-          <EuiSpacer size="l" />
-          <div>{page}</div>
-
-          <EuiSpacer size="l" />
-          <div className="sql-console-query-result">
-            <QueryResults
-              language={this.state.language}
-              queries={this.state.queries}
-              queryResults={this.state.queryResultsTable}
-              queryResultsJDBC={getSelectedResults(
-                this.state.queryResults,
-                this.state.selectedTabId
-              )}
-              queryResultsJSON={getSelectedResults(
-                this.state.queryResultsJSON,
-                this.state.selectedTabId
-              )}
-              queryResultsCSV={getSelectedResults(
-                this.state.queryResultsCSV,
-                this.state.selectedTabId
-              )}
-              queryResultsTEXT={getSelectedResults(
-                this.state.queryResultsTEXT,
-                this.state.selectedTabId
-              )}
-              messages={this.state.messages}
-              selectedTabId={this.state.selectedTabId}
-              selectedTabName={this.state.selectedTabName}
-              onSelectedTabIdChange={this.onSelectedTabIdChange}
-              itemIdToExpandedRowMap={this.state.itemIdToExpandedRowMap}
-              onQueryChange={this.onQueryChange}
-              updateExpandedMap={this.updateExpandedMap}
-              searchQuery={this.state.searchQuery}
-              tabsOverflow={false}
-              getJson={this.getJson}
-              getJdbc={this.getJdbc}
-              getCsv={this.getCsv}
-              getText={this.getText}
-              isResultFullScreen={this.state.isResultFullScreen}
-              setIsResultFullScreen={this.setIsResultFullScreen}
-            />
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
-
-export default Main;
diff --git a/workbench/public/components/PPLPage/PPLPage.test.tsx b/workbench/public/components/PPLPage/PPLPage.test.tsx
deleted file mode 100644
index a5e4f4bfbb..0000000000
--- a/workbench/public/components/PPLPage/PPLPage.test.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from "react";
-import "@testing-library/jest-dom/extend-expect";
-import { render, fireEvent } from "@testing-library/react";
-import { PPLPage } from "./PPLPage";
-
-
-describe("<PPLPage /> spec", () => {
-
-  it("renders the component", () => {
-    render(
-      <PPLPage
-        onRun={() => { }}
-        onTranslate={() => { }}
-        onClear={() => { }}
-        updatePPLQueries={() => { }}
-        pplTranslations={[]}
-        pplQuery={''}
-      />
-    );
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-
-  it('tests the action buttons', async () => {
-    const onRun = jest.fn();
-    const onTranslate = jest.fn();
-    const onClean = jest.fn();
-    const updateSQLQueries = jest.fn();
-
-    const { getByText } = render(
-      <PPLPage
-        onRun={onRun}
-        onTranslate={onTranslate}
-        onClear={onClean}
-        updatePPLQueries={updateSQLQueries}
-        pplTranslations={[]}
-        pplQuery={''}
-      />
-    );
-
-    expect(document.body.children[0]).toMatchSnapshot();
-
-    fireEvent.click(getByText('Run'));
-    expect(onRun).toHaveBeenCalledTimes(1);
-
-    fireEvent.click(getByText('Clear'));
-    expect(onClean).toHaveBeenCalledTimes(1);
-
-  });
-
-});
-
-
-
diff --git a/workbench/public/components/PPLPage/PPLPage.tsx b/workbench/public/components/PPLPage/PPLPage.tsx
deleted file mode 100644
index d80143a005..0000000000
--- a/workbench/public/components/PPLPage/PPLPage.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from "react";
-import {
-  EuiPanel,
-  EuiButton,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiText,
-  EuiCodeEditor,
-  EuiSpacer,
-  EuiCodeBlock,
-  EuiModal,
-  EuiModalBody,
-  EuiModalFooter,
-  EuiModalHeader,
-  EuiModalHeaderTitle,
-  EuiOverlayMask,
-} from "@elastic/eui";
-import { ResponseDetail, TranslateResult } from '../Main/main';
-import _ from 'lodash';
-
-interface PPLPageProps {
-  onRun: (query: string) => void,
-  onTranslate: (query: string) => void,
-  onClear: () => void,
-  updatePPLQueries: (query: string) => void,
-  pplQuery: string,
-  pplTranslations: ResponseDetail<TranslateResult>[]
-}
-
-interface PPLPageState {
-  pplQuery: string,
-  translation: string,
-  isModalVisible: boolean
-}
-
-export class PPLPage extends React.Component<PPLPageProps, PPLPageState> {
-  constructor(props: PPLPageProps) {
-    super(props);
-    this.state = {
-      pplQuery: this.props.pplQuery,
-      translation: "",
-      isModalVisible: false
-    };
-  }
-
-  setIsModalVisible(visible: boolean): void {
-    this.setState({
-      isModalVisible: visible
-    })
-  }
-
-  render() {
-
-    const closeModal = () => this.setIsModalVisible(false);
-    const showModal = () => this.setIsModalVisible(true);
-
-    const pplTranslationsNotEmpty = () => {
-      if (this.props.pplTranslations.length > 0) {
-        return this.props.pplTranslations[0].fulfilled;
-      }
-      return false;
-    }
-
-    const explainContent = pplTranslationsNotEmpty()
-      ? this.props.pplTranslations.map((queryTranslation: any) => JSON.stringify(queryTranslation.data, null, 2)).join("\n")
-      : 'This query is not explainable.';
-
-    let modal;
-
-    if (this.state.isModalVisible) {
-      modal = (
-        <EuiOverlayMask onClick={closeModal}>
-          <EuiModal onClose={closeModal} style={{ width: 800 }}>
-            <EuiModalHeader>
-              <EuiModalHeaderTitle>Explain</EuiModalHeaderTitle>
-            </EuiModalHeader>
-
-            <EuiModalBody>
-              <EuiCodeBlock
-                language="json"
-                fontSize="m"
-                isCopyable
-              >
-                {explainContent}
-              </EuiCodeBlock>
-            </EuiModalBody>
-
-            <EuiModalFooter>
-              <EuiButton onClick={closeModal} fill>
-                Close
-            </EuiButton>
-            </EuiModalFooter>
-          </EuiModal>
-        </EuiOverlayMask>
-      );
-    }
-
-    return (
-      <EuiPanel className="sql-console-query-editor container-panel" paddingSize="l">
-        <EuiText className="sql-query-panel-header"><h3>Query editor</h3></EuiText>
-        <EuiSpacer size="s" />
-        <EuiCodeEditor
-          theme="sql_console"
-          width="100%"
-          height="5rem"
-          value={this.props.pplQuery}
-          onChange={this.props.updatePPLQueries}
-          showPrintMargin={false}
-          setOptions={{
-            fontSize: "14px",
-            showLineNumbers: false,
-            showGutter: false,
-          }}
-          aria-label="Code Editor"
-        />
-        <EuiSpacer />
-        <EuiFlexGroup className="action-container" gutterSize="m">
-          <EuiFlexItem className="sql-editor-buttons"
-            grow={false}
-            onClick={() => this.props.onRun(this.props.pplQuery)}
-          >
-            <EuiButton fill={true} className="sql-editor-button" >
-              Run
-            </EuiButton>
-          </EuiFlexItem>
-          <EuiFlexItem
-            grow={false}
-            onClick={() => {
-              this.props.updatePPLQueries("");
-              this.props.onClear();
-            }}
-          >
-            <EuiButton className="sql-editor-button">
-              Clear
-            </EuiButton>
-          </EuiFlexItem>
-          <EuiFlexItem
-            grow={false}
-            onClick={() =>
-              this.props.onTranslate(this.props.pplQuery)
-            }
-          >
-            <EuiButton className="sql-editor-button" onClick={showModal}>
-              Explain
-            </EuiButton>
-            {modal}
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiPanel >
-    )
-  }
-}
diff --git a/workbench/public/components/PPLPage/__snapshots__/PPLPage.test.tsx.snap b/workbench/public/components/PPLPage/__snapshots__/PPLPage.test.tsx.snap
deleted file mode 100644
index c3c7067910..0000000000
--- a/workbench/public/components/PPLPage/__snapshots__/PPLPage.test.tsx.snap
+++ /dev/null
@@ -1,387 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<PPLPage /> spec renders the component 1`] = `
-<div>
-  <div
-    class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow sql-console-query-editor container-panel"
-  >
-    <div
-      class="euiText euiText--medium sql-query-panel-header"
-    >
-      <h3>
-        Query editor
-      </h3>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--s"
-    />
-    <div
-      class="euiCodeEditorWrapper"
-      data-test-subj="codeEditorContainer"
-      style="width: 100%; height: 5rem;"
-    >
-      <button
-        class="euiCodeEditorKeyboardHint"
-        data-test-subj="codeEditorHint"
-        id="some_html_id"
-      >
-        <p
-          class="euiText"
-        >
-          Press Enter to start editing.
-        </p>
-        <p
-          class="euiText"
-        >
-          When you're done, press Escape to stop editing.
-        </p>
-      </button>
-      <div
-        class=" ace_editor ace-tm"
-        id="some_html_id"
-        style="width: 100%; height: 5rem; font-size: 14px;"
-      >
-        <textarea
-          aria-label="Code Editor"
-          autocapitalize="off"
-          autocorrect="off"
-          class="ace_text-input"
-          spellcheck="false"
-          style="opacity: 0;"
-          tabindex="-1"
-          wrap="off"
-        />
-        <div
-          aria-hidden="true"
-          class="ace_gutter"
-          style="display: none;"
-        >
-          <div
-            class="ace_layer ace_gutter-layer ace_folding-enabled"
-          />
-          <div
-            class="ace_gutter-active-line"
-          />
-        </div>
-        <div
-          class="ace_scroller"
-        >
-          <div
-            class="ace_content"
-          >
-            <div
-              class="ace_layer ace_print-margin-layer"
-            >
-              <div
-                class="ace_print-margin"
-                style="left: 4px; visibility: hidden;"
-              />
-            </div>
-            <div
-              class="ace_layer ace_marker-layer"
-            />
-            <div
-              class="ace_layer ace_text-layer"
-              style="padding: 0px 4px;"
-            />
-            <div
-              class="ace_layer ace_marker-layer"
-            />
-            <div
-              class="ace_layer ace_cursor-layer ace_hidden-cursors"
-            >
-              <div
-                class="ace_cursor"
-              />
-            </div>
-          </div>
-        </div>
-        <div
-          class="ace_scrollbar ace_scrollbar-v"
-          style="display: none; width: 20px;"
-        >
-          <div
-            class="ace_scrollbar-inner"
-            style="width: 20px;"
-          />
-        </div>
-        <div
-          class="ace_scrollbar ace_scrollbar-h"
-          style="display: none; height: 20px;"
-        >
-          <div
-            class="ace_scrollbar-inner"
-            style="height: 20px;"
-          />
-        </div>
-        <div
-          style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-        >
-          <div
-            style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-          />
-          <div
-            style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-          >
-            XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--l"
-    />
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionRow euiFlexGroup--responsive action-container"
-    >
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero sql-editor-buttons"
-      >
-        <button
-          class="euiButton euiButton--primary euiButton--fill sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Run
-            </span>
-          </span>
-        </button>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <button
-          class="euiButton euiButton--primary sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Clear
-            </span>
-          </span>
-        </button>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <button
-          class="euiButton euiButton--primary sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Explain
-            </span>
-          </span>
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<PPLPage /> spec tests the action buttons 1`] = `
-<div>
-  <div
-    class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow sql-console-query-editor container-panel"
-  >
-    <div
-      class="euiText euiText--medium sql-query-panel-header"
-    >
-      <h3>
-        Query editor
-      </h3>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--s"
-    />
-    <div
-      class="euiCodeEditorWrapper"
-      data-test-subj="codeEditorContainer"
-      style="width: 100%; height: 5rem;"
-    >
-      <button
-        class="euiCodeEditorKeyboardHint"
-        data-test-subj="codeEditorHint"
-        id="some_html_id"
-      >
-        <p
-          class="euiText"
-        >
-          Press Enter to start editing.
-        </p>
-        <p
-          class="euiText"
-        >
-          When you're done, press Escape to stop editing.
-        </p>
-      </button>
-      <div
-        class=" ace_editor ace-tm"
-        id="some_html_id"
-        style="width: 100%; height: 5rem; font-size: 14px;"
-      >
-        <textarea
-          aria-label="Code Editor"
-          autocapitalize="off"
-          autocorrect="off"
-          class="ace_text-input"
-          spellcheck="false"
-          style="opacity: 0;"
-          tabindex="-1"
-          wrap="off"
-        />
-        <div
-          aria-hidden="true"
-          class="ace_gutter"
-          style="display: none;"
-        >
-          <div
-            class="ace_layer ace_gutter-layer ace_folding-enabled"
-          />
-          <div
-            class="ace_gutter-active-line"
-          />
-        </div>
-        <div
-          class="ace_scroller"
-        >
-          <div
-            class="ace_content"
-          >
-            <div
-              class="ace_layer ace_print-margin-layer"
-            >
-              <div
-                class="ace_print-margin"
-                style="left: 4px; visibility: hidden;"
-              />
-            </div>
-            <div
-              class="ace_layer ace_marker-layer"
-            />
-            <div
-              class="ace_layer ace_text-layer"
-              style="padding: 0px 4px;"
-            />
-            <div
-              class="ace_layer ace_marker-layer"
-            />
-            <div
-              class="ace_layer ace_cursor-layer ace_hidden-cursors"
-            >
-              <div
-                class="ace_cursor"
-              />
-            </div>
-          </div>
-        </div>
-        <div
-          class="ace_scrollbar ace_scrollbar-v"
-          style="display: none; width: 20px;"
-        >
-          <div
-            class="ace_scrollbar-inner"
-            style="width: 20px;"
-          />
-        </div>
-        <div
-          class="ace_scrollbar ace_scrollbar-h"
-          style="display: none; height: 20px;"
-        >
-          <div
-            class="ace_scrollbar-inner"
-            style="height: 20px;"
-          />
-        </div>
-        <div
-          style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-        >
-          <div
-            style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-          />
-          <div
-            style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-          >
-            XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--l"
-    />
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionRow euiFlexGroup--responsive action-container"
-    >
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero sql-editor-buttons"
-      >
-        <button
-          class="euiButton euiButton--primary euiButton--fill sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Run
-            </span>
-          </span>
-        </button>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <button
-          class="euiButton euiButton--primary sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Clear
-            </span>
-          </span>
-        </button>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <button
-          class="euiButton euiButton--primary sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Explain
-            </span>
-          </span>
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/workbench/public/components/QueryLanguageSwitch/Switch.test.tsx b/workbench/public/components/QueryLanguageSwitch/Switch.test.tsx
deleted file mode 100644
index 06eefbfffe..0000000000
--- a/workbench/public/components/QueryLanguageSwitch/Switch.test.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from "react";
-import "@testing-library/jest-dom/extend-expect";
-import { render } from "@testing-library/react";
-import Switch from "./Switch";
-
-
-const onChange = jest.fn();
-
-describe("<Switch /> spec", () => {
-  it("renders the component", () => {
-    render(<Switch onChange={onChange} language="SQL" />);
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-});
diff --git a/workbench/public/components/QueryLanguageSwitch/Switch.tsx b/workbench/public/components/QueryLanguageSwitch/Switch.tsx
deleted file mode 100644
index 3f3b7aad97..0000000000
--- a/workbench/public/components/QueryLanguageSwitch/Switch.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from "react";
-import _ from "lodash";
-import { EuiButtonGroup } from "@elastic/eui";
-// @ts-ignore
-import { htmlIdGenerator } from "@elastic/eui/lib/services";
-
-interface SwitchProps {
-    onChange: (id: string, value?: any) => void;
-    language: string;
-}
-
-interface SwitchState {
-    // language: string
-}
-
-const toggleButtons = [
-    {
-        id: 'SQL',
-        label: 'SQL',
-    },
-    {
-        id: 'PPL',
-        label: 'PPL',
-    },
-];
-
-class Switch extends React.Component<SwitchProps, SwitchState> {
-    constructor(props: SwitchProps) {
-        super(props);
-        this.state = {
-            language: 'SQL'
-        };
-    }
-
-    render() {
-
-        return (
-            <EuiButtonGroup className="query-language-switch"
-                legend="query-language-swtich"
-                options={toggleButtons}
-                onChange={(id) => this.props.onChange(id)}
-                idSelected={this.props.language}
-                buttonSize="m"
-            />
-        )
-    }
-}
-
-export default Switch;
diff --git a/workbench/public/components/QueryLanguageSwitch/__snapshots__/Switch.test.tsx.snap b/workbench/public/components/QueryLanguageSwitch/__snapshots__/Switch.test.tsx.snap
deleted file mode 100644
index 91643e7c5f..0000000000
--- a/workbench/public/components/QueryLanguageSwitch/__snapshots__/Switch.test.tsx.snap
+++ /dev/null
@@ -1,68 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<Switch /> spec renders the component 1`] = `
-<div>
-  <fieldset
-    class="euiButtonGroup euiButtonGroup--medium euiButtonGroup--text query-language-switch"
-  >
-    <legend
-      class="euiScreenReaderOnly"
-    >
-      query-language-swtich
-    </legend>
-    <div
-      class="euiButtonGroup__buttons"
-    >
-      <label
-        class="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton--fill euiButtonGroupButton-isSelected"
-        for="some_html_id"
-      >
-        <span
-          class="euiButtonContent euiButton__content"
-        >
-          <span
-            class="euiButton__text euiButtonGroupButton__textShift"
-            data-text="SQL"
-            title="SQL"
-          >
-            <input
-              checked=""
-              class="euiScreenReaderOnly"
-              data-test-subj="SQL"
-              id="some_html_id"
-              name="some_html_id"
-              type="radio"
-              value=""
-            />
-            SQL
-          </span>
-        </span>
-      </label>
-      <label
-        class="euiButtonGroupButton euiButtonGroupButton--text"
-        for="some_html_id"
-      >
-        <span
-          class="euiButtonContent euiButton__content"
-        >
-          <span
-            class="euiButton__text euiButtonGroupButton__textShift"
-            data-text="PPL"
-            title="PPL"
-          >
-            <input
-              class="euiScreenReaderOnly"
-              data-test-subj="PPL"
-              id="some_html_id"
-              name="some_html_id"
-              type="radio"
-              value=""
-            />
-            PPL
-          </span>
-        </span>
-      </label>
-    </div>
-  </fieldset>
-</div>
-`;
diff --git a/workbench/public/components/QueryResults/QueryResults.test.tsx b/workbench/public/components/QueryResults/QueryResults.test.tsx
deleted file mode 100644
index 336bf0a88d..0000000000
--- a/workbench/public/components/QueryResults/QueryResults.test.tsx
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from "react";
-import "regenerator-runtime";
-import "mutationobserver-shim";
-import "@testing-library/jest-dom/extend-expect";
-import { render, fireEvent, configure } from "@testing-library/react";
-import { mockQueryResults, mockQueries } from "../../../test/mocks/mockData";
-import { MESSAGE_TAB_LABEL } from "../../utils/constants";
-import QueryResults from "./QueryResults";
-import { Tab, ItemIdToExpandedRowMap, ResponseDetail, QueryResult } from "../Main/main";
-
-configure({ testIdAttribute: 'data-test-subj' });
-
-function renderSQLQueryResults(mockQueryResults: ResponseDetail<QueryResult>[],
-  mockQueries: string[] = [],
-  mockSearchQuery: string = '',
-  onSelectedTabIdChange: (tab: Tab) => void,
-  onQueryChange: () => {},
-  updateExpandedMap: (map: ItemIdToExpandedRowMap) => {},
-  getJson: (queries: string[]) => void,
-  getJdbc: (queries: string[]) => void,
-  getCsv: (queries: string[]) => void,
-  getText: (queries: string[]) => void,
-  setIsResultFullScreen: (isFullScreen: boolean) => void) {
-
-  return {
-    ...render(
-      <QueryResults
-        language='SQL'
-        queries={mockQueries}
-        queryResults={mockQueryResults}
-        queryResultsJDBC={''}
-        queryResultsJSON={''}
-        queryResultsCSV={''}
-        queryResultsTEXT={''}
-        messages={[]}
-        selectedTabId={'0'}
-        selectedTabName={MESSAGE_TAB_LABEL}
-        onSelectedTabIdChange={onSelectedTabIdChange}
-        itemIdToExpandedRowMap={{}}
-        onQueryChange={onQueryChange}
-        updateExpandedMap={updateExpandedMap}
-        searchQuery={mockSearchQuery}
-        tabsOverflow={true}
-        getJson={getJson}
-        getJdbc={getJdbc}
-        getCsv={getCsv}
-        getText={getText}
-        isResultFullScreen={false}
-        setIsResultFullScreen={setIsResultFullScreen}
-      />
-    ),
-  };
-}
-
-describe("<QueryResults /> spec", () => {
-  it("renders the component with no data", async () => {
-    (window as any).HTMLElement.prototype.scrollBy = function () { };
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-});
-
-describe("<QueryResults with data/> spec", () => {
-  const onSelectedTabIdChange = jest.fn();
-  const onQueryChange = jest.fn();
-  const updateExpandedMap = jest.fn();
-  const mockSearchQuery = "";
-  const getRawResponse = jest.fn();
-  const getJdbc = jest.fn();
-  const getCsv = jest.fn();
-  const getText = jest.fn();
-  const setIsResultFullScreen = jest.fn();
-  (window as any).HTMLElement.prototype.scrollBy = jest.fn();
-
-  it("renders the component with mock query results", async () => {
-    const { getAllByRole, getByText, getAllByText, getAllByTestId, getAllByLabelText } =
-      renderSQLQueryResults(mockQueryResults, mockQueries, mockSearchQuery, onSelectedTabIdChange, onQueryChange,
-        updateExpandedMap, getRawResponse, getJdbc, getCsv, getText, setIsResultFullScreen);
-
-    expect(document.body.children[0]).toMatchSnapshot();
-
-    // It tests that the selected tab is the first tab with results
-    expect(getAllByRole('tab')[0].getAttribute('aria-selected')).toEqual('false');
-    expect(getAllByRole('tab')[1].getAttribute('aria-selected')).toEqual('true');
-
-    //It tests that there is one tab for each QueryResult
-    expect(getAllByRole('tab')).toHaveLength(11);
-
-    // It tests Tab button
-    await fireEvent.click(getAllByRole('tab')[5]);
-
-    // TODO: uncomment this test when sorting is fixed
-    // It tests sorting
-    // await fireEvent.click(getAllByTestId('tableHeaderSortButton')[1]);
-
-    // It tests pagination
-    await fireEvent.click(getAllByLabelText('Page 2 of 2')[0]);
-    await fireEvent.click(getAllByText('Rows per page', { exact: false })[0]);
-    expect(getByText("10 rows"));
-    expect(getByText("20 rows"));
-    expect(getByText("50 rows"));
-    expect(getByText("100 rows"));
-    await fireEvent.click(getByText("20 rows"));
-  });
-
-  it("renders the component to test tabs down arrow", async () => {
-    const { getAllByTestId } = renderSQLQueryResults(mockQueryResults, mockQueries, mockSearchQuery, onSelectedTabIdChange,
-      onQueryChange, updateExpandedMap, getRawResponse, getJdbc, getCsv, getText, setIsResultFullScreen);
-
-    expect(document.body.children[0]).toMatchSnapshot();
-
-    // It tests right scrolling arrows
-    expect(getAllByTestId('slide-down'));
-    await fireEvent.click(getAllByTestId('slide-down')[0]);
-  });
-
-});
-
-
-function renderPPLQueryResults(mockQueryResults: ResponseDetail<QueryResult>[],
-  mockQueries: string[] = [],
-  mockSearchQuery: string = '',
-  onSelectedTabIdChange: (tab: Tab) => void,
-  onQueryChange: () => {},
-  updateExpandedMap: (map: ItemIdToExpandedRowMap) => {},
-  getJson: (queries: string[]) => void,
-  getJdbc: (queries: string[]) => void,
-  getCsv: (queries: string[]) => void,
-  getText: (queries: string[]) => void,
-  setIsResultFullScreen: (isFullScreen: boolean) => void) {
-
-  return {
-    ...render(
-      <QueryResults
-        language='PPL'
-        queries={mockQueries}
-        queryResults={mockQueryResults}
-        queryResultsJDBC={''}
-        queryResultsJSON={''}
-        queryResultsCSV={''}
-        queryResultsTEXT={''}
-        messages={[]}
-        selectedTabId={'0'}
-        selectedTabName={MESSAGE_TAB_LABEL}
-        onSelectedTabIdChange={onSelectedTabIdChange}
-        itemIdToExpandedRowMap={{}}
-        onQueryChange={onQueryChange}
-        updateExpandedMap={updateExpandedMap}
-        searchQuery={mockSearchQuery}
-        tabsOverflow={true}
-        getJson={getJson}
-        getJdbc={getJdbc}
-        getCsv={getCsv}
-        getText={getText}
-        isResultFullScreen={false}
-        setIsResultFullScreen={setIsResultFullScreen}
-      />
-    ),
-  };
-}
-
-describe("<QueryResults /> spec", () => {
-  it("renders the component with no data", async () => {
-    (window as any).HTMLElement.prototype.scrollBy = function () { };
-
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-});
-
-describe("<QueryResults with data/> spec", () => {
-  const onSelectedTabIdChange = jest.fn();
-  const onQueryChange = jest.fn();
-  const updateExpandedMap = jest.fn();
-  const mockSearchQuery = "";
-  const getRawResponse = jest.fn();
-  const getJdbc = jest.fn();
-  const getCsv = jest.fn();
-  const getText = jest.fn();
-  const setIsResultFullScreen = jest.fn();
-  (window as any).HTMLElement.prototype.scrollBy = jest.fn();
-
-  it("renders the component with mock query results", async () => {
-    const { getAllByRole, getByText, getAllByText, getAllByTestId, getAllByLabelText } =
-      renderPPLQueryResults(mockQueryResults, mockQueries, mockSearchQuery, onSelectedTabIdChange, onQueryChange,
-        updateExpandedMap, getRawResponse, getJdbc, getCsv, getText, setIsResultFullScreen);
-
-    expect(document.body.children[0]).toMatchSnapshot();
-
-    // It tests that the selected tab is the first tab with results
-    expect(getAllByRole('tab')[0].getAttribute('aria-selected')).toEqual('false');
-    expect(getAllByRole('tab')[1].getAttribute('aria-selected')).toEqual('true');
-
-    //It tests that there is one tab for each QueryResult
-    expect(getAllByRole('tab')).toHaveLength(11);
-
-    // It tests Tab button
-    await fireEvent.click(getAllByRole('tab')[5]);
-
-    // TODO: uncomment this test when sorting is fixed
-    // It tests sorting
-    // await fireEvent.click(getAllByTestId('tableHeaderSortButton')[1]);
-
-    // It tests pagination
-    await fireEvent.click(getAllByLabelText('Page 2 of 2')[0]);
-    await fireEvent.click(getAllByText('Rows per page', { exact: false })[0]);
-    expect(getByText("10 rows"));
-    expect(getByText("20 rows"));
-    expect(getByText("50 rows"));
-    expect(getByText("100 rows"));
-    await fireEvent.click(getByText("20 rows"));
-  });
-
-  it("renders the component to test tabs down arrow", async () => {
-    const { getAllByTestId } = renderPPLQueryResults(mockQueryResults, mockQueries, mockSearchQuery, onSelectedTabIdChange,
-      onQueryChange, updateExpandedMap, getRawResponse, getJdbc, getCsv, getText, setIsResultFullScreen);
-
-    expect(document.body.children[0]).toMatchSnapshot();
-
-    // It tests right scrolling arrows
-    expect(getAllByTestId('slide-down'));
-    await fireEvent.click(getAllByTestId('slide-down')[0]);
-  });
-
-});
diff --git a/workbench/public/components/QueryResults/QueryResults.tsx b/workbench/public/components/QueryResults/QueryResults.tsx
deleted file mode 100644
index 5acccac37d..0000000000
--- a/workbench/public/components/QueryResults/QueryResults.tsx
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from "react";
-// @ts-ignore
-import { SortableProperties, SortableProperty } from "@elastic/eui/lib/services";
-// @ts-ignore
-import { EuiPanel, EuiFlexGroup, EuiFlexItem, EuiTab, EuiTabs, EuiPopover, EuiContextMenuItem, EuiContextMenuPanel, EuiHorizontalRule, EuiSearchBar, Pager, EuiIcon, EuiText, EuiSpacer, EuiTextAlign, EuiButton, EuiButtonIcon, Comparators } from "@elastic/eui";
-import { QueryResult, QueryMessage, Tab, ResponseDetail, ItemIdToExpandedRowMap, DataRow } from "../Main/main";
-import QueryResultsBody from "./QueryResultsBody";
-import { getQueryIndex, needsScrolling, getSelectedResults } from "../../utils/utils";
-import { DEFAULT_NUM_RECORDS_PER_PAGE, MESSAGE_TAB_LABEL, TAB_CONTAINER_ID } from "../../utils/constants";
-import { PanelWrapper } from '../../utils/PanelWrapper';
-import _ from 'lodash';
-
-interface QueryResultsProps {
-  language: string;
-  queries: string[];
-  queryResults: ResponseDetail<QueryResult>[];
-  queryResultsJSON: string;
-  queryResultsJDBC: string;
-  queryResultsCSV: string;
-  queryResultsTEXT: string;
-  messages: QueryMessage[];
-  selectedTabName: string;
-  selectedTabId: string;
-  searchQuery: string;
-  tabsOverflow: boolean;
-  onSelectedTabIdChange: (tab: Tab) => void;
-  onQueryChange: (object: any) => void;
-  updateExpandedMap: (map: ItemIdToExpandedRowMap) => void;
-  itemIdToExpandedRowMap: ItemIdToExpandedRowMap;
-  getJson: (queries: string[]) => void;
-  getJdbc: (queries: string[]) => void;
-  getCsv: (queries: string[]) => void;
-  getText: (queries: string[]) => void;
-  isResultFullScreen: boolean;
-  setIsResultFullScreen: (isFullScreen: boolean) => void;
-}
-
-interface QueryResultsState {
-  isPopoverOpen: boolean;
-  tabsOverflow: boolean;
-  itemsPerPage: number;
-}
-
-class QueryResults extends React.Component<QueryResultsProps, QueryResultsState> {
-  public sortableColumns: Array<SortableProperty<string>>;
-  public sortableProperties: SortableProperties;
-  public sortedColumn: string;
-  public tabNames: string[];
-  public pager: Pager;
-
-  constructor(props: QueryResultsProps) {
-    super(props);
-
-    this.state = {
-      isPopoverOpen: false,
-      tabsOverflow: this.props.tabsOverflow ? this.props.tabsOverflow : false,
-      itemsPerPage: DEFAULT_NUM_RECORDS_PER_PAGE
-    };
-
-    this.sortableColumns = [];
-    this.sortedColumn = "";
-    this.sortableProperties = new SortableProperties(
-      [
-        {
-          name: "",
-          getValue: (item: any) => "",
-          isAscending: true
-        }
-      ],
-      ""
-    );
-
-    this.tabNames = [];
-    this.pager = new Pager(0, this.state.itemsPerPage);
-  }
-
-  componentDidUpdate() {
-    const showArrow = needsScrolling("tabsContainer");
-    if (showArrow !== this.state.tabsOverflow) {
-      this.setState({ tabsOverflow: showArrow });
-    }
-  }
-  // Actions for Tabs Button
-  showTabsMenu = (): void => {
-    this.setState(prevState => ({
-      isPopoverOpen: !prevState.isPopoverOpen
-    }));
-  };
-
-  slideTabsRight = (): void => {
-    if (document.getElementById(TAB_CONTAINER_ID)) {
-      document.getElementById(TAB_CONTAINER_ID)!.scrollBy(50, 0);
-    }
-  };
-
-  slideTabsLeft = (): void => {
-    if (document.getElementById(TAB_CONTAINER_ID)) {
-      document.getElementById(TAB_CONTAINER_ID)!.scrollBy(-50, 0);
-    }
-  };
-
-  closePopover = (): void => {
-    this.setState({
-      isPopoverOpen: false
-    });
-  };
-
-  onChangeItemsPerPage = (itemsPerPage: number) => {
-    this.pager.setItemsPerPage(itemsPerPage);
-    this.setState({
-      itemsPerPage
-    });
-  };
-
-  onChangePage = (pageIndex: number) => {
-    this.pager.goToPageIndex(pageIndex);
-    this.setState({});
-  };
-
-  updatePagination(totalItemsCount: number): void {
-    this.pager.setTotalItems(totalItemsCount);
-  }
-
-  // Update SORTABLE COLUMNS - All columns
-  updateSortableColumns = (queryResultsSelected: QueryResult) => {
-    if (this.sortableColumns.length != 0) {
-      this.sortableColumns = [];
-    }
-    queryResultsSelected.fields.map((field: string) => {
-      this.sortableColumns.push({
-        name: field,
-        getValue: (item: DataRow) => item.data[field],
-        isAscending: true
-      });
-    });
-    this.sortedColumn =
-      this.sortableColumns.length > 0 ? this.sortableColumns[0].name : "";
-    this.sortableProperties = new SortableProperties(
-      this.sortableColumns,
-      this.sortedColumn
-    );
-  }
-
-  searchItems(dataRows: DataRow[], searchQuery: string): DataRow[] {
-    let rows: { [key: string]: any }[] = [];
-    for (const row of dataRows) {
-      rows.push(row.data)
-    }
-    const searchResult = EuiSearchBar.Query.execute(searchQuery, rows);
-    let result: DataRow[] = [];
-    for (const row of searchResult) {
-      let dataRow: DataRow = {
-        // rowId does not matter here since the data rows would be sorted later
-        rowId: 0,
-        data: row
-      }
-      result.push(dataRow)
-    }
-    return result;
-  }
-
-  onSort = (prop: string, items: DataRow[]): DataRow[] => {
-    let sortedRows = this.sortDataRows(items, prop);
-    this.sortableProperties.sortOn(prop)
-    this.sortedColumn = prop;
-    return sortedRows;
-  }
-
-  sortDataRows(dataRows: DataRow[], field: string): DataRow[] {
-    const property = this.sortableProperties.getSortablePropertyByName(field);
-    const copy = [...dataRows];
-    let comparator = (a: DataRow, b: DataRow) => {
-      if (typeof property === "undefined") {
-        return 0;
-      }
-      let dataA = a.data;
-      let dataB = b.data;
-      if (dataA[field] && dataB[field]) {
-        if (dataA[field] > dataB[field]) {
-          return 1;
-        }
-        if (dataA[field] < dataB[field]) {
-          return -1;
-        }
-      }
-      return 0;
-    }
-    if (!this.sortableProperties.isAscendingByName(field)) {
-      Comparators.reverse(comparator);
-    }
-    return copy.sort(comparator);
-  }
-
-  renderTabs(): Tab[] {
-    const tabs = [
-      {
-        id: MESSAGE_TAB_LABEL,
-        name: _.truncate(MESSAGE_TAB_LABEL, { length: 17 }),
-        disabled: false
-      }
-    ];
-
-    this.tabNames = [];
-    if (this.props.queryResults) {
-      for (let i = 0; i < this.props.queryResults.length; i += 1) {
-        const tabName = this.props.language === "SQL" ? getQueryIndex(this.props.queries[i]) : "Events";
-        this.tabNames.push(tabName);
-        if (this.props.queryResults[i].fulfilled) {
-          tabs.push({
-            id: i.toString(),
-            name: tabName,
-            disabled: false
-          });
-        }
-      }
-    }
-    return tabs;
-  }
-
-  render() {
-    // Update PAGINATION and SORTABLE columns
-    const queryResultSelected = getSelectedResults(this.props.queryResults, this.props.selectedTabId);
-
-    if (queryResultSelected) {
-      const matchingItems: object[] = this.props.searchQuery
-        ? this.searchItems(queryResultSelected.records, this.props.searchQuery)
-        : queryResultSelected.records;
-      this.updatePagination(matchingItems.length);
-      this.updateSortableColumns(queryResultSelected);
-    }
-
-    // Action button with list of tabs, TODO: disable tabArrowRight and tabArrowLeft when no more scrolling is possible
-    const tabArrowDown = (
-      <EuiIcon
-        onClick={this.showTabsMenu}
-        type={"arrowDown"}
-      />
-    );
-    const tabs: Tab[] = this.renderTabs();
-    const tabsItems = tabs.map((tab, index) => (
-      <EuiContextMenuItem
-        key="10 rows"
-        icon="empty"
-        style={{ marginRight: 27 }}
-        onClick={() => {
-          this.closePopover();
-          this.pager.goToPageIndex(0);
-          this.sortableColumns = [];
-          this.props.onSelectedTabIdChange(tab);
-        }}
-      >
-        {tab.name}
-      </EuiContextMenuItem>
-    ));
-
-    const tabsButtons = tabs.map((tab, index) => (
-      <EuiTab
-        onClick={() => {
-          this.pager.goToPageIndex(0);
-          this.sortableColumns = [];
-          this.props.onSelectedTabIdChange(tab);
-        }}
-        isSelected={tab.id === this.props.selectedTabId}
-        disabled={tab.disabled}
-        key={index}
-      >
-        {tab.name}
-      </EuiTab>
-    ));
-
-    return (
-      <EuiPanel className="query-result-container" paddingSize="none">
-        <div style={{ padding: 20, paddingBottom: 0 }}>
-          <EuiFlexGroup>
-            <EuiFlexItem>
-              <EuiText className="query-result-panel-header">
-                <h3>Results</h3>
-              </EuiText>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              {this.props.queryResults.length > 0 && (
-                this.props.isResultFullScreen ?
-                  <EuiButtonIcon
-                    iconType="cross"
-                    color="text"
-                    id="exit-fullscreen-button"
-                    onClick={() => this.props.setIsResultFullScreen(false)}
-                  />
-                  :
-                  <EuiButton
-                    size="s"
-                    iconType="fullScreen"
-                    onClick={() => this.props.setIsResultFullScreen(true)}
-                  >
-                    Full screen view
-                </EuiButton>
-              )}
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </div>
-        {this.props.queryResults.length === 0 ? (
-          // show no results message instead of the results table when there are no results
-          <>
-            <EuiSpacer size="xxl" />
-            <EuiSpacer size="xl" />
-            <EuiText style={{ color: "#3f3f3f" }}>
-              <EuiTextAlign textAlign="center">
-                <h4>No result</h4>
-              </EuiTextAlign>
-              <EuiTextAlign textAlign="center">
-                <p>Enter a query in the query editor above to see results.</p>
-              </EuiTextAlign>
-            </EuiText>
-            <EuiSpacer size="xxl" />
-            <EuiSpacer size="xl" />
-          </>
-        ) : (
-            <>
-              <EuiFlexGroup
-                style={{
-                  padding: 5
-                }}
-              >
-                {/*TABS*/}
-                <EuiFlexGroup
-                  className="tabs-container"
-                  alignItems="center"
-                  gutterSize="s"
-                  id="tabsContainer"
-                >
-                  <EuiFlexItem
-                    style={{ marginTop: "8px" }}
-                    grow={false}
-                  >
-                    <EuiTabs style={{marginLeft: 7, marginBottom: 6}}>{tabsButtons}</EuiTabs>
-                  </EuiFlexItem>
-                </EuiFlexGroup>
-
-                {/*ARROW DOWN*/}
-                {this.state.tabsOverflow && (
-                  <div className="tab-arrow-down-container">
-                    <EuiFlexGroup>
-                      <EuiFlexItem grow={false}>
-                        <EuiPopover
-                          id="singlePanel"
-                          button={tabArrowDown}
-                          data-test-subj="slide-down"
-                          isOpen={this.state.isPopoverOpen}
-                          closePopover={this.closePopover}
-                          panelPaddingSize="none"
-                          anchorPosition="downLeft"
-                        >
-                          <EuiContextMenuPanel items={tabsItems} />
-                        </EuiPopover>
-                      </EuiFlexItem>
-                    </EuiFlexGroup>
-                  </div>
-                )}
-              </EuiFlexGroup>
-              <EuiHorizontalRule margin="none" />
-
-              {/*RESULTS TABLE*/}
-              <PanelWrapper shouldWrap={this.props.language === 'SQL' && this.props.selectedTabName !== MESSAGE_TAB_LABEL}>
-                <QueryResultsBody
-                  language={this.props.language}
-                  queries={this.props.queries}
-                  selectedTabId={this.props.selectedTabId}
-                  selectedTabName={this.props.selectedTabName}
-                  tabNames={this.tabNames}
-                  queryResultSelected={queryResultSelected}
-                  queryResultsJSON={this.props.queryResultsJSON}
-                  queryResultsJDBC={this.props.queryResultsJDBC}
-                  queryResultsCSV={this.props.queryResultsCSV}
-                  queryResultsTEXT={this.props.queryResultsTEXT}
-                  messages={this.props.messages}
-                  searchQuery={this.props.searchQuery}
-                  onQueryChange={this.props.onQueryChange}
-                  pager={this.pager}
-                  itemsPerPage={this.state.itemsPerPage}
-                  firstItemIndex={this.pager.getFirstItemIndex()}
-                  lastItemIndex={this.pager.getLastItemIndex()}
-                  onChangeItemsPerPage={this.onChangeItemsPerPage}
-                  onChangePage={this.onChangePage}
-                  sortedColumn={this.sortedColumn}
-                  sortableProperties={this.sortableProperties}
-                  itemIdToExpandedRowMap={this.props.itemIdToExpandedRowMap}
-                  updateExpandedMap={this.props.updateExpandedMap}
-                  getJson={this.props.getJson}
-                  getJdbc={this.props.getJdbc}
-                  getCsv={this.props.getCsv}
-                  getText={this.props.getText}
-                  onSort={this.onSort}
-                />
-              </PanelWrapper>
-            </>
-          )}
-      </EuiPanel>
-    );
-  }
-}
-export default QueryResults;
diff --git a/workbench/public/components/QueryResults/QueryResultsBody.test.tsx b/workbench/public/components/QueryResults/QueryResultsBody.test.tsx
deleted file mode 100644
index b0be92f692..0000000000
--- a/workbench/public/components/QueryResults/QueryResultsBody.test.tsx
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from "react";
-import "@testing-library/jest-dom/extend-expect";
-import { render, fireEvent, cleanup } from "@testing-library/react";
-import QueryResultsBody from "./QueryResultsBody";
-// @ts-ignore
-import { Pager } from "@elastic/eui/lib";
-// @ts-ignore
-import { SortableProperties } from "@elastic/eui/lib/services";
-import { mockQueryResults, mockQueryResultJSONResponse, mockErrorMessage, mockSuccessfulMessage, mockSortableColumns, mockQueryResultJDBCResponse } from "../../../test/mocks/mockData";
-import userEvent from "@testing-library/user-event";
-import { QueryMessage, QueryResult } from "../Main/main";
-
-
-function renderSQLQueryResultsBody(mockQueries: string[],
-  mockQueryResultsSelected: QueryResult,
-  mockQueryResultsRaw: string,
-  mockSortableProperties: SortableProperties,
-  messages: QueryMessage[],
-  onQueryChange: (query: object) => void,
-  updateExpandedMap: (map: object) => void,
-  onChangeItemsPerPage: (itemsPerPage: number) => void,
-  getJson: (queries: string[]) => void,
-  getJdbc: (queries: string[]) => void,
-  getCsv: (queries: string[]) => void,
-  getText: (queries: string[]) => void) {
-  return {
-    ...render(
-      <QueryResultsBody
-        language='SQL'
-        queries={[]}
-        selectedTabId={'0'}
-        selectedTabName={'Messages'}
-        tabNames={['Messages', 'Index_1']}
-        queryResultSelected={mockQueryResultsSelected}
-        queryResultsJSON={mockQueryResultsRaw}
-        queryResultsJDBC={mockQueryResultsRaw}
-        queryResultsCSV={mockQueryResultsRaw}
-        queryResultsTEXT={mockQueryResultsRaw}
-        messages={[]}
-        searchQuery={""}
-        onQueryChange={onQueryChange}
-        pager={new Pager(0, 10)}
-        itemsPerPage={10}
-        firstItemIndex={0}
-        lastItemIndex={10}
-        onChangeItemsPerPage={onChangeItemsPerPage}
-        onChangePage={() => { }}
-        sortedColumn={'col1'}
-        sortableProperties={mockSortableProperties}
-        itemIdToExpandedRowMap={{}}
-        updateExpandedMap={updateExpandedMap}
-        getJson={getJson}
-        getJdbc={getJdbc}
-        getCsv={getCsv}
-        getText={getText}
-      />
-    ),
-  };
-}
-
-describe("<QueryResultsBody /> spec", () => {
-
-  afterEach(cleanup);
-  const onQueryChange = jest.fn();
-  const updateExpandedMap = jest.fn();
-  const onChangeItemsPerPage = jest.fn();
-  const getJson = jest.fn();
-  const getJdbc = jest.fn();
-  const getCsv = jest.fn();
-  const getText = jest.fn();
-
-  it("renders the component", () => {
-    const mockSortableProperties = new SortableProperties(
-      [
-        {
-          name: "",
-          getValue: (item: any) => "",
-          isAscending: true
-        }
-      ],
-      ""
-    );
-
-    const { queryByTestId } = renderSQLQueryResultsBody(undefined, undefined, undefined,
-      mockSortableProperties, mockErrorMessage, onQueryChange, updateExpandedMap, onChangeItemsPerPage,
-      getJson, getJdbc, getCsv, getText);
-
-    // Download buttons, pagination, search area, table should not be visible when there is no data
-    expect(queryByTestId('Download')).toBeNull();
-    expect(queryByTestId('Rows per page')).toBeNull();
-    expect(queryByTestId('tableRow')).toBeNull();
-    expect(queryByTestId('Search')).toBeNull();
-
-    expect(document.body.children[0]).toMatchSnapshot();
-
-  });
-
-  it("renders component with mock QueryResults data", async () => {
-    const mockSortableProperties = new SortableProperties(
-      mockSortableColumns,
-      mockSortableColumns[0].name
-    );
-
-    (window as any).HTMLElement.prototype.scrollIntoView = function () { };
-
-    const { getAllByText, getAllByTestId, getAllByLabelText, getByText, getByPlaceholderText } =
-      renderSQLQueryResultsBody(undefined, mockQueryResults[0].data, mockQueryResultJSONResponse.data.resp, mockSortableProperties,
-        mockSuccessfulMessage, onQueryChange, updateExpandedMap, onChangeItemsPerPage, getJson, getJdbc,
-        getCsv, getText);
-    expect(document.body.children[0]).toMatchSnapshot();
-
-    // Test sorting
-    // await fireEvent.click(getAllByTestId('tableHeaderSortButton')[0]);
-    // expect(onSort).toHaveBeenCalled();
-
-    // Test pagination
-    await fireEvent.click(getAllByText('Rows per page', { exact: false })[0]);
-    expect(getByText("10 rows"));
-    expect(getByText("20 rows"));
-    expect(getByText("50 rows"));
-    expect(getByText("100 rows"));
-    await fireEvent.click(getByText("20 rows"));
-    expect(onChangeItemsPerPage).toHaveBeenCalled();
-
-    // Test nested tables - click on row icon
-    expect(getAllByLabelText('Expand').length).toBeGreaterThan(0);
-    await fireEvent.click(getAllByLabelText('Expand')[0]);
-    expect(updateExpandedMap).toHaveBeenCalledTimes(1);
-
-    // Test nested tables - click on cell link
-    await fireEvent.click(getAllByText('manufacturer: [2]', { exact: false })[0]);
-    expect(updateExpandedMap).toHaveBeenCalled();
-
-    // Tests download button
-    const downloadButton = getAllByText('Download')[0];
-    expect(downloadButton).not.toBe(null);
-    await fireEvent.click(downloadButton);
-    expect(getByText("Download JSON"));
-    expect(getByText("Download JDBC"));
-    expect(getByText("Download CSV"));
-    expect(getByText("Download Text"));
-    await fireEvent.click(getByText("Download JSON"));
-    await fireEvent.click(getByText("Download JDBC"));
-    await fireEvent.click(getByText("Download CSV"));
-    await fireEvent.click(getByText("Download Text"));
-
-    // Test search field
-    const searchField = getByPlaceholderText('Search keyword');
-    expect(searchField).not.toBe(null);
-    await userEvent.type(searchField, 'Test')
-    expect(onQueryChange).toHaveBeenCalled();
-
-    // Test collapse button
-    expect(document.body.children[0]).toMatchSnapshot();
-    expect(getAllByLabelText('Collapse').length).toBeGreaterThan(0);
-    await fireEvent.click(getAllByLabelText('Collapse')[0]);
-    expect(updateExpandedMap).toHaveBeenCalled();
-
-  });
-});
-
-
-function renderPPLQueryResultsBody(mockQueries: string[],
-  mockQueryResultsSelected: QueryResult,
-  mockQueryResultsRaw: string,
-  mockSortableProperties: SortableProperties,
-  messages: QueryMessage[],
-  onQueryChange: (query: object) => void,
-  updateExpandedMap: (map: object) => void,
-  onChangeItemsPerPage: (itemsPerPage: number) => void,
-  getJson: (queries: string[]) => void,
-  getJdbc: (queries: string[]) => void,
-  getCsv: (queries: string[]) => void,
-  getText: (queries: string[]) => void) {
-  return {
-    ...render(
-      <QueryResultsBody
-        language='PPL'
-        queries={[]}
-        selectedTabId={'0'}
-        selectedTabName={'Messages'}
-        tabNames={['Messages', 'Index_1']}
-        queryResultSelected={mockQueryResultsSelected}
-        queryResultsJSON={mockQueryResultsRaw}
-        queryResultsJDBC={mockQueryResultsRaw}
-        queryResultsCSV={mockQueryResultsRaw}
-        queryResultsTEXT={mockQueryResultsRaw}
-        messages={[]}
-        searchQuery={""}
-        onQueryChange={onQueryChange}
-        pager={new Pager(0, 10)}
-        itemsPerPage={10}
-        firstItemIndex={0}
-        lastItemIndex={10}
-        onChangeItemsPerPage={onChangeItemsPerPage}
-        onChangePage={() => { }}
-        sortedColumn={'col1'}
-        sortableProperties={mockSortableProperties}
-        itemIdToExpandedRowMap={{}}
-        updateExpandedMap={updateExpandedMap}
-        getJson={getJson}
-        getJdbc={getJdbc}
-        getCsv={getCsv}
-        getText={getText}
-      />
-    ),
-  };
-}
-
-describe("<QueryResultsBody /> spec", () => {
-
-  afterEach(cleanup);
-  const onQueryChange = jest.fn();
-  const updateExpandedMap = jest.fn();
-  const onChangeItemsPerPage = jest.fn();
-  const getJson = jest.fn();
-  const getJdbc = jest.fn();
-  const getCsv = jest.fn();
-  const getText = jest.fn();
-
-  it("renders the component", () => {
-    const mockSortableProperties = new SortableProperties(
-      [
-        {
-          name: "",
-          getValue: (item: any) => "",
-          isAscending: true
-        }
-      ],
-      ""
-    );
-
-    const { queryByTestId } = renderPPLQueryResultsBody(undefined, undefined, undefined,
-      mockSortableProperties, mockErrorMessage, onQueryChange, updateExpandedMap, onChangeItemsPerPage,
-      getJson, getJdbc, getCsv, getText);
-
-    // Download buttons, pagination, search area, table should not be visible when there is no data
-    expect(queryByTestId('Download')).toBeNull();
-    expect(queryByTestId('Rows per page')).toBeNull();
-    expect(queryByTestId('tableRow')).toBeNull();
-    expect(queryByTestId('Search')).toBeNull();
-
-    expect(document.body.children[0]).toMatchSnapshot();
-
-  });
-
-  it("renders component with mock QueryResults data", async () => {
-    const mockSortableProperties = new SortableProperties(
-      mockSortableColumns,
-      mockSortableColumns[0].name
-    );
-
-    (window as any).HTMLElement.prototype.scrollIntoView = function () { };
-
-    const { getAllByText, getAllByTestId, getAllByLabelText, getByText, getByPlaceholderText } =
-      renderPPLQueryResultsBody(undefined, mockQueryResults[0].data, mockQueryResultJDBCResponse.data.resp, mockSortableProperties,
-        mockSuccessfulMessage, onQueryChange, updateExpandedMap, onChangeItemsPerPage, getJson, getJdbc,
-        getCsv, getText);
-    expect(document.body.children[0]).toMatchSnapshot();
-
-    // Test sorting
-    // await fireEvent.click(getAllByTestId('tableHeaderSortButton')[0]);
-    // expect(onSort).toHaveBeenCalled();
-
-    // Test pagination
-    await fireEvent.click(getAllByText('Rows per page', { exact: false })[0]);
-    expect(getByText("10 rows"));
-    expect(getByText("20 rows"));
-    expect(getByText("50 rows"));
-    expect(getByText("100 rows"));
-    await fireEvent.click(getByText("20 rows"));
-    expect(onChangeItemsPerPage).toHaveBeenCalled();
-
-    // Test nested tables - click on row icon
-    expect(getAllByLabelText('Expand').length).toBeGreaterThan(0);
-    await fireEvent.click(getAllByLabelText('Expand')[0]);
-    expect(updateExpandedMap).toHaveBeenCalledTimes(1);
-
-    // Test nested tables - click on cell link
-    await fireEvent.click(getAllByText('manufacturer: [2]', { exact: false })[0]);
-    expect(updateExpandedMap).toHaveBeenCalled();
-
-  });
-});
diff --git a/workbench/public/components/QueryResults/QueryResultsBody.tsx b/workbench/public/components/QueryResults/QueryResultsBody.tsx
deleted file mode 100644
index 4f222d2b54..0000000000
--- a/workbench/public/components/QueryResults/QueryResultsBody.tsx
+++ /dev/null
@@ -1,938 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React, { Fragment } from "react";
-// @ts-ignore
-import { SortableProperties } from "@elastic/eui/lib/services";
-// @ts-ignore
-import { Comparators, EuiBasicTable, EuiCodeEditor, EuiModal, EuiModalBody, EuiModalFooter, EuiModalHeader, EuiModalHeaderTitle, EuiOverlayMask, EuiPanel, EuiPortal, EuiSearchBar, EuiSideNav } from "@elastic/eui";
-import {
-  EuiButton,
-  EuiButtonIcon,
-  EuiContextMenu,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiLink,
-  EuiPopover,
-  EuiTable,
-  EuiTableBody,
-  EuiTableHeader,
-  EuiTableHeaderCell,
-  EuiTablePagination,
-  EuiTableRow,
-  EuiTableRowCell,
-  EuiText,
-  Pager
-} from "@elastic/eui";
-import {
-  findRootNode,
-  getMessageString,
-  getRowTree,
-  isEmpty,
-  Node,
-  onDownloadFile,
-  scrollToNode
-} from "../../utils/utils";
-import "../../ace-themes/sql_console";
-import { COLUMN_WIDTH, PAGE_OPTIONS, SMALL_COLUMN_WIDTH } from "../../utils/constants";
-import { DataRow, ItemIdToExpandedRowMap, QueryMessage, QueryResult } from "../Main/main";
-import _ from "lodash";
-
-const DoubleScrollbar = require('react-double-scrollbar');
-
-interface QueryResultsBodyProps {
-  language: string;
-  queries: string[];
-  queryResultSelected: QueryResult;
-  queryResultsJDBC: string;
-  queryResultsCSV: string;
-  queryResultsJSON: string;
-  queryResultsTEXT: string;
-  tabNames: string[];
-  selectedTabName: string;
-  selectedTabId: string;
-  searchQuery: string;
-  sortableProperties: SortableProperties;
-  messages: QueryMessage[];
-  pager: Pager;
-  itemsPerPage: number;
-  firstItemIndex: number;
-  lastItemIndex: number;
-  itemIdToExpandedRowMap: ItemIdToExpandedRowMap;
-  sortedColumn: string;
-  onChangeItemsPerPage: (itemsPerPage: number) => void;
-  onChangePage: (pageIndex: number) => void;
-  onQueryChange: (query: object) => void;
-  updateExpandedMap: (map: ItemIdToExpandedRowMap) => void;
-  getJson: (queries: string[]) => void;
-  getJdbc: (queries: string[]) => void;
-  getCsv: (queries: string[]) => void;
-  getText: (queries: string[]) => void;
-  onSort: (column: string, rows: DataRow[]) => DataRow[];
-}
-
-interface QueryResultsBodyState {
-  itemIdToSelectedMap: object;
-  itemIdToOpenActionsPopoverMap: object;
-  incremental: boolean;
-  filters: boolean;
-  itemIdToExpandedRowMap: ItemIdToExpandedRowMap;
-  searchQuery: string;
-  selectedItemMap: object;
-  selectedItemName: string;
-  selectedItemData: object;
-  navView: boolean;
-  isPopoverOpen: boolean;
-  isDownloadPopoverOpen: boolean;
-  isModalVisible: boolean;
-  downloadErrorModal: any;
-}
-
-interface FieldValue {
-  hasExpandingRow: boolean;
-  hasExpandingArray: boolean;
-  value: string;
-  link: string;
-}
-
-class QueryResultsBody extends React.Component<QueryResultsBodyProps, QueryResultsBodyState> {
-  public items: DataRow[];
-  public columns: any[];
-  public panels: any[];
-  public expandedRowColSpan: number;
-
-  constructor(props: QueryResultsBodyProps) {
-    super(props);
-
-    this.state = {
-      itemIdToSelectedMap: {},
-      itemIdToOpenActionsPopoverMap: {},
-      incremental: true,
-      filters: false,
-      itemIdToExpandedRowMap: this.props.itemIdToExpandedRowMap,
-      searchQuery: this.props.searchQuery,
-      selectedItemMap: {},
-      selectedItemName: "",
-      selectedItemData: {},
-      navView: false,
-      isPopoverOpen: false,
-      isDownloadPopoverOpen: false,
-      isModalVisible: false,
-      downloadErrorModal: {}
-    };
-
-    this.expandedRowColSpan = 0;
-    this.items = [];
-    this.columns = [];
-
-    this.panels = [
-      {
-        id: 0,
-        items: [
-          {
-            name: "Download JSON",
-            onClick: () => {
-              this.onDownloadJSON();
-            }
-          },
-          {
-            name: "Download JDBC",
-            onClick: () => {
-              this.onDownloadJDBC();
-            }
-          },
-          {
-            name: "Download CSV",
-            onClick: () => {
-              this.onDownloadCSV();
-            }
-          },
-          {
-            name: "Download Text",
-            onClick: () => {
-              this.onDownloadText();
-            }
-          }
-        ]
-      }
-    ];
-  }
-
-  setIsModalVisible(visible: boolean): void {
-    this.setState({
-      isModalVisible: visible
-    })
-  }
-
-  getModal = (errorMessage: string): any => {
-    const closeModal = () => this.setIsModalVisible(false);
-    let modal = (
-      <EuiOverlayMask onClick={closeModal}>
-        <EuiModal onClose={closeModal}>
-          <EuiModalHeader>
-            <EuiModalHeaderTitle>Error</EuiModalHeaderTitle>
-          </EuiModalHeader>
-
-          <EuiModalBody>
-            <EuiText>
-              {errorMessage}
-            </EuiText>
-          </EuiModalBody>
-
-          <EuiModalFooter>
-            <EuiButton onClick={closeModal} fill>
-              Close
-            </EuiButton>
-          </EuiModalFooter>
-        </EuiModal>
-      </EuiOverlayMask>
-    );
-    return modal;
-  }
-
-  // Actions for Download files
-  onDownloadJSON() {
-    if (this.props.language == 'PPL') {
-      this.setState({
-        downloadErrorModal: this.getModal("PPL result in JSON format is not supported, please select JDBC format."),
-      })
-      this.setIsModalVisible(true);
-      return;
-    }
-    if (!this.props.queryResultsJSON) {
-      this.props.getJson(this.props.queries);
-    }
-    setTimeout(() => {
-      const jsonObject = JSON.parse(this.props.queryResultsJSON);
-      const data = JSON.stringify(jsonObject, undefined, 4);
-      onDownloadFile(data, "json", this.props.selectedTabName + ".json");
-    }, 2000);
-  };
-
-  onDownloadJDBC = (): void => {
-    if (!this.props.queryResultsJDBC) {
-      this.props.getJdbc(this.props.queries);
-    }
-    setTimeout(() => {
-      const jsonObject = JSON.parse(this.props.queryResultsJDBC);
-      const data = JSON.stringify(jsonObject, undefined, 4);
-      onDownloadFile(data, "json", this.props.selectedTabName + ".json");
-    }, 2000);
-  };
-
-  onDownloadCSV = (): void => {
-    if (this.props.language == 'PPL') {
-      this.setState({
-        downloadErrorModal: this.getModal("PPL result in CSV format is not supported, please select JDBC format."),
-      })
-      this.setIsModalVisible(true);
-      return;
-    }
-    if (!this.props.queryResultsCSV) {
-      this.props.getCsv(this.props.queries);
-    }
-    setTimeout(() => {
-      const data = this.props.queryResultsCSV;
-      onDownloadFile(data, "csv", this.props.selectedTabName + ".csv");
-    }, 2000);
-  };
-
-  onDownloadText = (): void => {
-    if (this.props.language == 'PPL') {
-      this.setState({
-        downloadErrorModal: this.getModal("PPL result in Text format is not supported, please select JDBC format."),
-      })
-      this.setIsModalVisible(true);
-      return;
-    }
-    if (!this.props.queryResultsTEXT) {
-      this.props.getText(this.props.queries);
-    }
-    setTimeout(() => {
-      const data = this.props.queryResultsTEXT;
-      onDownloadFile(data, "plain", this.props.selectedTabName + ".txt");
-    }, 2000);
-  };
-
-  // Actions for Downloads Button
-  onDownloadButtonClick = (): void => {
-    this.setState(prevState => ({
-      isDownloadPopoverOpen: !prevState.isDownloadPopoverOpen
-    }));
-  };
-
-  closeDownloadPopover = (): void => {
-    this.setState({
-      isDownloadPopoverOpen: false
-    });
-  };
-
-  // It filters table values that conatins the given items
-  getItems(records: DataRow[]) {
-    const matchingItems = this.props.searchQuery ? this.searchItems(records, this.props.searchQuery) : records;
-    let field: string = "";
-    if (_.get(this.props.sortedColumn, this.columns)) {
-      field = this.props.sortedColumn;
-    }
-    return this.sortDataRows(matchingItems, field);
-  }
-
-  searchItems(dataRows: DataRow[], searchQuery: string): DataRow[] {
-    let rows: { [key: string]: any }[] = [];
-    for (const row of dataRows) {
-      rows.push(row.data)
-    }
-    const searchResult = EuiSearchBar.Query.execute(searchQuery, rows);
-    let result: DataRow[] = [];
-    for (const row of searchResult) {
-      let dataRow: DataRow = {
-        // rowId does not matter here since the data rows would be sorted later
-        rowId: 0,
-        data: row
-      }
-      result.push(dataRow)
-    }
-    return result;
-  }
-
-  onSort(prop: string): void {
-    this.items = this.props.onSort(prop, this.items);
-    this.renderRows(this.items, this.columns, this.props.itemIdToExpandedRowMap);
-  }
-
-  sortDataRows(dataRows: DataRow[], field: string): DataRow[] {
-    const property = this.props.sortableProperties.getSortablePropertyByName(field);
-    const copy = [...dataRows];
-    let comparator = (a: DataRow, b: DataRow) => {
-      if (typeof property === "undefined") {
-        return 0;
-      }
-      let dataA = a.data;
-      let dataB = b.data;
-      if (dataA[field] && dataB[field]) {
-        if (dataA[field] > dataB[field]) {
-          return 1;
-        }
-        if (dataA[field] < dataB[field]) {
-          return -1;
-        }
-      }
-      return 0;
-    }
-    if (!this.props.sortableProperties.isAscendingByName(field)) {
-      Comparators.reverse(comparator);
-    }
-    return copy.sort(comparator);
-  }
-
-  // It processes field values and determines whether it should link to an expanded row or an expanded array
-  getFieldValue(fieldValue: any, field: string): FieldValue {
-    let hasExpandingRow: boolean = false;
-    let hasExpandingArray: boolean = false;
-    let value: string = "";
-    let link: string = "";
-
-    if (fieldValue === null) {
-      return {
-        hasExpandingRow: hasExpandingRow,
-        value: "",
-        hasExpandingArray,
-        link
-      };
-    }
-
-    if (typeof fieldValue === "boolean") {
-      return {
-        hasExpandingRow: hasExpandingRow,
-        value: String(fieldValue),
-        hasExpandingArray,
-        link
-      }
-    }
-
-    // Not an object or array
-    if (typeof fieldValue !== "object") {
-      return {
-        hasExpandingRow: hasExpandingRow,
-        value: fieldValue,
-        hasExpandingArray,
-        link
-      };
-    }
-
-    // Array of strings or objects
-    if (Array.isArray(fieldValue)) {
-      if (typeof fieldValue[0] !== "object") {
-        hasExpandingArray = true;
-        link = field.concat(": [", fieldValue.length.toString(), "]");
-      } else {
-        hasExpandingRow = true;
-        link = field.concat(": {", fieldValue.length.toString(), "}");
-      }
-    }
-    // Single object
-    else {
-      hasExpandingRow = true;
-      link = field.concat(": {1}");
-    }
-
-    return {
-      hasExpandingRow: hasExpandingRow,
-      hasExpandingArray: hasExpandingArray,
-      value: value,
-      link: link
-    };
-  }
-
-  addExpandingNodeIcon(node: Node, expandedRowMap: ItemIdToExpandedRowMap) {
-    return (
-      <EuiButtonIcon
-        style={{ marginLeft: -4 }}
-        onClick={() => this.toggleNodeData(node, expandedRowMap)}
-        aria-label={
-          expandedRowMap[node.nodeId] && expandedRowMap[node.nodeId].expandedRow
-            ? "Collapse"
-            : "Expand"
-        }
-        iconType={
-          expandedRowMap[node.nodeId] && expandedRowMap[node.nodeId].expandedRow
-            ? "minusInCircle"
-            : "plusInCircle"
-        }
-      />
-    );
-  }
-
-  addExpandingSideNavIcon(node: Node, expandedRowMap: ItemIdToExpandedRowMap) {
-    if (!node.parent) {
-      return;
-    }
-    return (
-      <EuiButtonIcon
-        onClick={() => this.updateExpandedRowMap(node, expandedRowMap)}
-        aria-label={
-          expandedRowMap[node.parent!.nodeId] &&
-            expandedRowMap[node.parent!.nodeId].selectedNodes &&
-            expandedRowMap[node.parent!.nodeId].selectedNodes.hasOwnProperty(node.nodeId)
-            ? "Collapse"
-            : "Expand"
-        }
-        iconType={
-          expandedRowMap[node.parent!.nodeId] &&
-            expandedRowMap[node.parent!.nodeId].selectedNodes &&
-            expandedRowMap[node.parent!.nodeId].selectedNodes.hasOwnProperty(node.nodeId)
-            ? "minusInCircle"
-            : "plusInCircle"
-        }
-      />
-    );
-  }
-
-  addExpandingIconColumn(columns: any[]) {
-    const expandIconColumn = [
-      {
-        id: "expandIcon",
-        label: "",
-        isSortable: false,
-        width: "30px"
-      }
-    ];
-
-    columns = expandIconColumn.concat(columns);
-    return columns;
-  }
-
-  updateSelectedNodes(parentNode: Node, selectedNode: Node, expandedRowMap: ItemIdToExpandedRowMap, keepOpen = false) {
-    if (!parentNode) {
-      return expandedRowMap;
-    }
-    const parentNodeId = parentNode.nodeId;
-
-    if (
-      expandedRowMap[parentNodeId] &&
-      expandedRowMap[parentNodeId].selectedNodes &&
-      expandedRowMap[parentNodeId].selectedNodes!.hasOwnProperty(selectedNode.nodeId) &&
-      !keepOpen
-    ) {
-      delete expandedRowMap[parentNodeId].selectedNodes[selectedNode.nodeId];
-    } else {
-      if (!expandedRowMap[parentNodeId].selectedNodes) {
-        expandedRowMap[parentNodeId].selectedNodes = {};
-      }
-      expandedRowMap[parentNodeId].selectedNodes[selectedNode.nodeId] = selectedNode.data;
-    }
-    return expandedRowMap;
-  }
-
-  updateExpandedRow(node: Node, expandedRowMap: ItemIdToExpandedRowMap) {
-    let newItemIdToExpandedRowMap = expandedRowMap;
-
-    if (expandedRowMap[node.nodeId]) {
-      newItemIdToExpandedRowMap[node.nodeId].expandedRow = (
-        <div id={node.nodeId} style={{ padding: "0 0 20px 19px" }}>
-          {this.renderNav(node, node.name, expandedRowMap)}
-        </div>
-      );
-    }
-    return newItemIdToExpandedRowMap;
-  }
-
-  updateExpandedRowMap(node: Node | undefined, expandedRowMap: ItemIdToExpandedRowMap, keepOpen = false) {
-    if (!node) {
-      return expandedRowMap;
-    }
-    let newItemIdToExpandedRowMap = this.updateSelectedNodes(node.parent, node, expandedRowMap, keepOpen);
-    const rootNode = findRootNode(node, expandedRowMap);
-    if (expandedRowMap[rootNode.nodeId]) {
-      newItemIdToExpandedRowMap = this.updateExpandedRow(node.parent, newItemIdToExpandedRowMap);
-      newItemIdToExpandedRowMap = this.updateExpandedRow(rootNode, newItemIdToExpandedRowMap);
-    }
-    this.props.updateExpandedMap(newItemIdToExpandedRowMap);
-  }
-
-  toggleNodeData = (node: Node, expandedRowMap: ItemIdToExpandedRowMap) => {
-    let newItemIdToExpandedRowMap = expandedRowMap;
-    const rootNode = findRootNode(node, expandedRowMap);
-
-    if (expandedRowMap[node.nodeId] && expandedRowMap[node.nodeId].expandedRow) {
-      delete newItemIdToExpandedRowMap[node.nodeId].expandedRow;
-    } else if (node.children && node.children.length > 0) {
-      newItemIdToExpandedRowMap = this.updateExpandedRow(node, expandedRowMap);
-    }
-
-    if (rootNode !== node) {
-      newItemIdToExpandedRowMap = this.updateExpandedRow(rootNode, expandedRowMap);
-    }
-
-    this.props.updateExpandedMap(newItemIdToExpandedRowMap);
-  };
-
-  getChildrenItems(nodes: Node[], parentNode: Node, expandedRowMap: ItemIdToExpandedRowMap) {
-    const itemList: any[] = [];
-
-    if (nodes.length === 0 && parentNode.data) {
-      const renderedData = this.renderNodeData(parentNode, expandedRowMap);
-      itemList.push(
-        this.createItem(expandedRowMap, parentNode, renderedData, {
-          items: [],
-        })
-      );
-    }
-
-    for (let i = 0; i < nodes.length; i++) {
-      itemList.push(
-        this.createItem(expandedRowMap, nodes[i], nodes[i].name,
-          {
-            icon: this.addExpandingSideNavIcon(nodes[i], expandedRowMap),
-            items: this.getChildrenItems(
-              nodes[i].children,
-              nodes[i],
-              expandedRowMap
-            )
-          })
-      );
-    }
-    return itemList;
-  }
-
-  createItem = (expandedRowMap: ItemIdToExpandedRowMap, node: Node, name: any, items = {}) => {
-    const nodeId = node.nodeId;
-    let isSelected: boolean | undefined = false;
-
-    if (!isEmpty(node.parent)) {
-      isSelected = expandedRowMap[node.parent!.nodeId] &&
-        expandedRowMap[node.parent!.nodeId].selectedNodes &&
-        expandedRowMap[node.parent!.nodeId].selectedNodes!.hasOwnProperty(nodeId);
-    }
-
-    return {
-      ...items,
-      id: nodeId,
-      name,
-      isSelected: isSelected,
-      onClick: () => console.log('open side nav'),
-    };
-  };
-
-  /************* Render Functions *************/
-
-  renderMessagesTab(): JSX.Element {
-    return (
-      <EuiCodeEditor
-        className={
-          this.props.messages && this.props.messages.length > 0
-            ? this.props.messages[0].className
-            : "successful-message"
-        }
-        mode="text"
-        theme="sql_console"
-        width="100%"
-        value={getMessageString(this.props.messages, this.props.tabNames)}
-        showPrintMargin={false}
-        readOnly={true}
-        setOptions={{
-          fontSize: "14px",
-          readOnly: true,
-          highlightActiveLine: false,
-          highlightGutterLine: false
-        }}
-        aria-label="Code Editor"
-      />
-    );
-  }
-
-  renderHeaderCells(columns: any[]) {
-    return columns.map((field: any) => {
-      const label: string = field.id === "expandIcon" ? field.label : field;
-      const colwidth = field.id === "expandIcon" ? SMALL_COLUMN_WIDTH : COLUMN_WIDTH;
-      return (
-        <EuiTableHeaderCell
-          key={label}
-          width={colwidth}
-          // onSort={this.onSort.bind(this, label)}
-          // isSorted={this.props.sortedColumn === label}
-          // isSortAscending={this.props.sortableProperties.isAscendingByName(label)}
-        >
-          {label}
-        </EuiTableHeaderCell>
-      );
-    });
-  }
-  // Inner tables sorting is not enabled
-  renderHeaderCellsWithNoSorting(columns: any[]) {
-    return columns.map((field: any) => {
-      const label = field.id === "expandIcon" ? field.label : field;
-      const colwidth = field.id === "expandIcon" ? field.width : COLUMN_WIDTH;
-      return (
-        <EuiTableHeaderCell key={label} width={colwidth}>
-          {label}
-        </EuiTableHeaderCell>
-      );
-    });
-  }
-
-  renderRow(item: DataRow, columns: string[], rowId: string, expandedRowMap: ItemIdToExpandedRowMap) {
-    let rows: any[] = [];
-    const data = item.data;
-    // If the data is an array or an object we add it to the expandedRowMap
-    if (data && ((typeof data === "object" && !isEmpty(data)) || (Array.isArray(data) && data.length > 0))
-    ) {
-      let rowItems: any[] = [];
-
-      if (Array.isArray(data)) {
-        rowItems = data;
-      } else {
-        rowItems.push(data);
-      }
-
-      for (let i = 0; i < rowItems.length; i++) {
-        let rowItem = rowItems[i];
-        let tableCells: Array<any> = [];
-        const tree = getRowTree(rowId, rowItem, expandedRowMap);
-
-        // Add nodes to expandedRowMap
-        if (!expandedRowMap[rowId] || !expandedRowMap[rowId].nodes) {
-          expandedRowMap[rowId] = { nodes: tree };
-        }
-        const expandingNode =
-          tree && tree._root.children.length > 0 ? this.addExpandingNodeIcon(tree._root, expandedRowMap) : "";
-
-        if (columns.length > 0) {
-          columns.map((field: any) => {
-            // Table cell
-            if (field.id !== "expandIcon") {
-              const fieldObj = this.getFieldValue(rowItem[field], field);
-              let fieldValue: any;
-
-              // If field is expandable
-              if (fieldObj.hasExpandingRow || fieldObj.hasExpandingArray) {
-                const fieldNode = expandedRowMap[tree._root.nodeId].nodes._root.children.find((node: Node) => node.name === field);
-                fieldValue = (
-                  <span>
-                    {" "}
-                    {fieldObj.value}
-                    <EuiLink
-                      color="primary"
-                      onClick={() => {
-                        this.updateExpandedRowMap(
-                          fieldNode,
-                          expandedRowMap,
-                          true
-                        );
-                        scrollToNode(tree._root.nodeId);
-                      }}
-                    >
-                      {fieldObj.link}
-                    </EuiLink>
-                  </span>
-                );
-              } else {
-                fieldValue = fieldObj.value;
-              }
-              tableCells.push(
-                <EuiTableRowCell
-                  key={`rowCell-${field}-${rowId}`}
-                  truncateText={false}
-                  textOnly={true}
-                >
-                  {fieldValue}
-                </EuiTableRowCell>
-              );
-            }
-
-            // Expanding icon cell
-            else {
-              tableCells.push(
-                <EuiTableRowCell id={tree._root.nodeId} key={`rowCell-expandIconRow-${rowId}`}>
-                  {expandingNode}
-                </EuiTableRowCell>
-              );
-            }
-          });
-        } else {
-          const fieldObj = this.getFieldValue(rowItem, "");
-          tableCells.push(
-            <EuiTableRowCell key={`rowCell-default-${rowId}`} truncateText={false} textOnly={true}>
-              {fieldObj.value}
-            </EuiTableRowCell>
-          );
-        }
-
-        const tableRow = <EuiTableRow key={`row-${rowId}`} data-test-subj={'tableRow'}>{tableCells}</EuiTableRow>;
-        let row = <Fragment key={`row-wrapper-${rowId}`}>{tableRow}</Fragment>;
-
-        if (expandedRowMap[rowId] && expandedRowMap[rowId].expandedRow) {
-          const tableRow = (
-            <EuiTableRow className="expanded-row" key={`expanded-row-${rowId}`}>
-              {tableCells}{" "}
-            </EuiTableRow>
-          );
-          const expandedRow = (
-            <EuiTableRow key={`row-${rowId}`}>{expandedRowMap[rowId].expandedRow}</EuiTableRow>
-          );
-          row = (
-            <Fragment key={`row-wrapper-${rowId}`}>
-              {tableRow}
-              {expandedRow}
-            </Fragment>
-          );
-        }
-        rows.push(row);
-      }
-    }
-    return rows;
-  }
-
-  renderRows(items: DataRow[], columns: string[], expandedRowMap: ItemIdToExpandedRowMap) {
-    let rows: any[] = [];
-    if (items) {
-      for (
-        let itemIndex = this.props.firstItemIndex;
-        itemIndex <= this.props.lastItemIndex;
-        itemIndex++
-      ) {
-        const item = items[itemIndex];
-        if (item) {
-          const rowId = item.rowId;
-          const rowsForItem = this.renderRow(
-            item,
-            columns,
-            rowId.toString(10),
-            expandedRowMap
-          );
-          rows.push(rowsForItem);
-        }
-      }
-    }
-    return rows;
-  }
-
-  renderSearchBar() {
-    const search = {
-      box: {
-        incremental: this.state.incremental,
-        placeholder: "Search keyword",
-        schema: true
-      }
-    };
-    return (
-      <div className="search-bar">
-        <EuiSearchBar
-          onChange={this.props.onQueryChange}
-          query={this.props.searchQuery}
-          {...search}
-        />
-      </div>
-    );
-  }
-
-  renderNodeData = (node: Node, expandedRowMap: ItemIdToExpandedRowMap) => {
-    let items: any[] = [];
-    let columns: string[] = [];
-    let records: any[] = [];
-    const data = node.data;
-
-    if (Array.isArray(data)) {
-      items = data;
-      columns = typeof items[0] === "object" ? Object.keys(items[0]) : [];
-    } else if (typeof data === "object") {
-      records.push(data);
-      items = records;
-      columns = this.addExpandingIconColumn(Object.keys(data));
-    }
-    let dataRow: DataRow = {
-      rowId: 0,
-      data: items
-    };
-
-    return (
-      <div>
-        <EuiTable className="sideNav-table">
-          <EuiTableHeader className="table-header">
-            {this.renderHeaderCellsWithNoSorting(columns)}
-          </EuiTableHeader>
-
-          <EuiTableBody>
-            {this.renderRow(dataRow, columns, node.nodeId.toString(), expandedRowMap)}
-          </EuiTableBody>
-        </EuiTable>
-      </div>
-    );
-  };
-
-  renderNav(node: Node, table_name: string, expandedRowMap: ItemIdToExpandedRowMap) {
-    const sideNav = [
-      {
-        items: this.getChildrenItems(node.children, node, expandedRowMap),
-        id: node.nodeId,
-        name: node.name,
-        isSelected: false,
-        onClick: () => console.log('open side nav'),
-      }
-    ];
-
-    return (
-      <EuiSideNav
-        mobileTitle="Navigate within $APP_NAME"
-        items={sideNav}
-        className="sideNavItem__items"
-        style={{ width: "300px", padding: "0 0 20px 9px" }}
-      />
-    );
-  }
-
-  render() {
-    // Action button with list of downloads
-    const downloadsButton = (
-      <EuiButton
-        iconType="arrowDown"
-        iconSide="right"
-        size="s"
-        onClick={this.onDownloadButtonClick}
-      >
-        Download
-      </EuiButton>
-    );
-
-    let modal;
-
-    if (this.state.isModalVisible) {
-      modal = this.state.downloadErrorModal;
-    }
-
-    if (
-      // this.props.selectedTabId === MESSAGE_TAB_LABEL ||
-      this.props.queryResultSelected == undefined
-    ) {
-      return this.renderMessagesTab();
-    } else {
-      if (this.props.queryResultSelected) {
-        this.items = this.getItems(this.props.queryResultSelected.records);
-        //Adding an extra empty column for the expanding icon
-        this.columns = this.addExpandingIconColumn(this.props.queryResultSelected.fields);
-        this.expandedRowColSpan = this.columns.length;
-      }
-
-      return (
-        <div>
-          {this.props.language === 'SQL' && (
-            <>
-              <EuiFlexGroup alignItems="flexStart" style={{ padding: 20, paddingBottom: 0 }}>
-                {/*Table name*/}
-                <EuiFlexItem>
-                  <EuiText className="table-name">
-                    <h4>
-                      {this.props.selectedTabName}
-                      <span className="table-item-count">{` (${this.items.length})`}</span>
-                    </h4>
-                  </EuiText>
-                  <div className="search-panel">
-                    {/*Search Bar*/}
-                    {this.renderSearchBar()}
-                  </div>
-                </EuiFlexItem>
-
-                {/*Download button*/}
-                <EuiFlexItem grow={false}>
-                  <div className="download-container">
-                    <EuiPopover
-                      className="download-button-container"
-                      id="singlePanel"
-                      button={downloadsButton}
-                      isOpen={this.state.isDownloadPopoverOpen}
-                      closePopover={this.closeDownloadPopover}
-                      panelPaddingSize="none"
-                      anchorPosition="downLeft"
-                    >
-                      <EuiContextMenu initialPanelId={0} panels={this.panels} />
-                    </EuiPopover>
-                  </div>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-              {modal}
-            </>
-          )}
-
-          {/*Table*/}
-          <div className="sql-console-results-container">
-            {/*Add a scrollbar on top of the table*/}
-            <DoubleScrollbar>
-              <EuiFlexGroup gutterSize="none">
-                <EuiFlexItem>
-                  <EuiTable>
-                    <EuiTableHeader className="table-header">
-                      {this.renderHeaderCells(this.columns)}
-                    </EuiTableHeader>
-
-                    <EuiTableBody>
-                      {this.renderRows(
-                        this.items,
-                        this.columns,
-                        this.props.itemIdToExpandedRowMap
-                      )}
-                    </EuiTableBody>
-                  </EuiTable>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </DoubleScrollbar>
-          </div>
-
-          <div className="pagination-container">
-            <EuiTablePagination
-              activePage={this.props.pager.getCurrentPageIndex()}
-              itemsPerPage={this.props.itemsPerPage}
-              itemsPerPageOptions={PAGE_OPTIONS}
-              pageCount={this.props.pager.getTotalPages()}
-              onChangeItemsPerPage={this.props.onChangeItemsPerPage}
-              onChangePage={this.props.onChangePage}
-            />
-          </div>
-        </div>
-      );
-    }
-  }
-}
-export default QueryResultsBody;
diff --git a/workbench/public/components/QueryResults/__snapshots__/QueryResults.test.tsx.snap b/workbench/public/components/QueryResults/__snapshots__/QueryResults.test.tsx.snap
deleted file mode 100644
index 3b5dbbc603..0000000000
--- a/workbench/public/components/QueryResults/__snapshots__/QueryResults.test.tsx.snap
+++ /dev/null
@@ -1,18849 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<QueryResults /> spec renders the component with no data 1`] = `undefined`;
-
-exports[`<QueryResults /> spec renders the component with no data 2`] = `undefined`;
-
-exports[`<QueryResults with data/> spec renders the component to test tabs down arrow 1`] = `
-<div>
-  <div
-    class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow query-result-container"
-  >
-    <div
-      style="padding: 20px 20px 0px 20px;"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-      >
-        <div
-          class="euiFlexItem"
-        >
-          <div
-            class="euiText euiText--medium query-result-panel-header"
-          >
-            <h3>
-              Results
-            </h3>
-          </div>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <button
-            class="euiButton euiButton--primary euiButton--small"
-            type="button"
-          >
-            <span
-              class="euiButtonContent euiButton__content"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M13 3v4h-1V4H9V3h4zM3 3h4v1H4v3H3V3zm10 10H9v-1h3V9h1v4zM3 13V9h1v3h3v1H3zM0 1.994C0 .893.895 0 1.994 0h12.012C15.107 0 16 .895 16 1.994v12.012A1.995 1.995 0 0114.006 16H1.994A1.995 1.995 0 010 14.006V1.994zm1 0v12.012c0 .548.446.994.994.994h12.012a.995.995 0 00.994-.994V1.994A.995.995 0 0014.006 1H1.994A.995.995 0 001 1.994z"
-                  fill-rule="evenodd"
-                />
-              </svg>
-              <span
-                class="euiButton__text"
-              >
-                Full screen view
-              </span>
-            </span>
-          </button>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-      style="padding: 5px;"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive tabs-container"
-        id="tabsContainer"
-      >
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-          style="margin-top: 8px;"
-        >
-          <div
-            class="euiTabs"
-            role="tablist"
-            style="margin-left: 7px; margin-bottom: 6px;"
-          >
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Output
-              </span>
-            </button>
-            <button
-              aria-selected="true"
-              class="euiTab euiTab-isSelected"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_1
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_2
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_3
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_4
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_5
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_6
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_7
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_8
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_9
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_10
-              </span>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div
-        class="tab-arrow-down-container"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorDownLeft"
-              data-test-subj="slide-down"
-              id="singlePanel"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M13.069 5.157L8.384 9.768a.546.546 0 01-.768 0L2.93 5.158a.552.552 0 00-.771 0 .53.53 0 000 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 000-.76.552.552 0 00-.771 0z"
-                    fill-rule="non-zero"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <hr
-      class="euiHorizontalRule euiHorizontalRule--full"
-    />
-    <div>
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-        style="padding: 20px 20px 0px 20px;"
-      >
-        <div
-          class="euiFlexItem"
-        >
-          <div
-            class="euiText euiText--medium table-name"
-          >
-            <h4>
-              Output
-              <span
-                class="table-item-count"
-              >
-                 (13)
-              </span>
-            </h4>
-          </div>
-          <div
-            class="search-panel"
-          >
-            <div
-              class="search-bar"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
-              >
-                <div
-                  class="euiFlexItem euiSearchBar__searchHolder"
-                >
-                  <div
-                    class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                  >
-                    <div
-                      class="euiFormControlLayout__childrenWrapper"
-                    >
-                      <input
-                        aria-label="This is a search bar. As you type, the results lower in the page will automatically filter."
-                        class="euiFieldSearch euiFieldSearch--fullWidth"
-                        placeholder="Search keyword"
-                        type="search"
-                        value=""
-                      />
-                      <div
-                        class="euiFormControlLayoutIcons"
-                      >
-                        <span
-                          class="euiFormControlLayoutCustomIcon"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
-                            focusable="false"
-                            height="16"
-                            role="img"
-                            viewBox="0 0 16 16"
-                            width="16"
-                            xmlns="http://www.w3.org/2000/svg"
-                          >
-                            <path
-                              d="M11.271 11.978l3.872 3.873a.502.502 0 00.708 0 .502.502 0 000-.708l-3.565-3.564c2.38-2.747 2.267-6.923-.342-9.532-2.73-2.73-7.17-2.73-9.898 0-2.728 2.729-2.728 7.17 0 9.9a6.955 6.955 0 004.949 2.05.5.5 0 000-1 5.96 5.96 0 01-4.242-1.757 6.01 6.01 0 010-8.486c2.337-2.34 6.143-2.34 8.484 0a6.01 6.01 0 010 8.486.5.5 0 00.034.738z"
-                            />
-                          </svg>
-                        </span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <div
-            class="download-container"
-          >
-            <div
-              class="euiPopover euiPopover--anchorDownLeft download-button-container"
-              id="singlePanel"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <button
-                  class="euiButton euiButton--primary euiButton--small"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButton__content"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M13.069 5.157L8.384 9.768a.546.546 0 01-.768 0L2.93 5.158a.552.552 0 00-.771 0 .53.53 0 000 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 000-.76.552.552 0 00-.771 0z"
-                        fill-rule="non-zero"
-                      />
-                    </svg>
-                    <span
-                      class="euiButton__text"
-                    >
-                      Download
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="sql-console-results-container"
-      >
-        <div>
-          <div
-            style="overflow-x: auto; overflow-y: hidden;"
-          >
-            <div
-              style="padding-top: 1px; width: auto;"
-            >
-               
-            </div>
-          </div>
-          <div
-            style="overflow: auto; overflow-y: hidden;"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <table
-                  class="euiTable euiTable--responsive"
-                  tabindex="-1"
-                >
-                  <thead
-                    class="table-header"
-                  >
-                    <tr>
-                      <td
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 27px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </span>
-                      </td>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="category"
-                          >
-                            category
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="currency"
-                          >
-                            currency
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_first_name"
-                          >
-                            customer_first_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_full_name"
-                          >
-                            customer_full_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_gender"
-                          >
-                            customer_gender
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_id"
-                          >
-                            customer_id
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_last_name"
-                          >
-                            customer_last_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_phone"
-                          >
-                            customer_phone
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="day_of_week"
-                          >
-                            day_of_week
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="day_of_week_i"
-                          >
-                            day_of_week_i
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="email"
-                          >
-                            email
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="manufacturer"
-                          >
-                            manufacturer
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="order_date"
-                          >
-                            order_date
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="order_id"
-                          >
-                            order_id
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="products"
-                          >
-                            products
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="sku"
-                          >
-                            sku
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="taxful_total_price"
-                          >
-                            taxful_total_price
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="taxless_total_price"
-                          >
-                            taxless_total_price
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="total_quantity"
-                          >
-                            total_quantity
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="total_unique_products"
-                          >
-                            total_unique_products
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="type"
-                          >
-                            type
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="user"
-                          >
-                            user
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="geoip"
-                          >
-                            geoip
-                          </span>
-                        </span>
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="0"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            teddy
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="1"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="2"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="3"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="4"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="5"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="6"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="7"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="8"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="9"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="pagination-container"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorUpRight"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <button
-                  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                  data-test-subj="tablePaginationPopoverButton"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--small euiIcon--inherit euiButtonContent__icon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M13.069 5.157L8.384 9.768a.546.546 0 01-.768 0L2.93 5.158a.552.552 0 00-.771 0 .53.53 0 000 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 000-.76.552.552 0 00-.771 0z"
-                        fill-rule="non-zero"
-                      />
-                    </svg>
-                    <span
-                      class="euiButtonEmpty__text"
-                    >
-                      Rows per page
-                      : 
-                      10
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <nav
-              class="euiPagination"
-            >
-              <button
-                aria-label="Previous page"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-                data-test-subj="pagination-button-previous"
-                disabled=""
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z"
-                    fill-rule="nonzero"
-                  />
-                </svg>
-              </button>
-              <ul
-                class="euiPagination__list"
-              >
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-current="true"
-                    aria-label="Page 1 of 2"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-0"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        1
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 2 of 2"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-1"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        2
-                      </span>
-                    </span>
-                  </button>
-                </li>
-              </ul>
-              <button
-                aria-label="Next page, 2"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-                data-test-subj="pagination-button-next"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
-                    fill-rule="nonzero"
-                  />
-                </svg>
-              </button>
-            </nav>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<QueryResults with data/> spec renders the component to test tabs down arrow 2`] = `
-<div>
-  <div
-    class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow query-result-container"
-  >
-    <div
-      style="padding: 20px 20px 0px 20px;"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-      >
-        <div
-          class="euiFlexItem"
-        >
-          <div
-            class="euiText euiText--medium query-result-panel-header"
-          >
-            <h3>
-              Results
-            </h3>
-          </div>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <button
-            class="euiButton euiButton--primary euiButton--small"
-            type="button"
-          >
-            <span
-              class="euiButtonContent euiButton__content"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M13 3v4h-1V4H9V3h4zM3 3h4v1H4v3H3V3zm10 10H9v-1h3V9h1v4zM3 13V9h1v3h3v1H3zM0 1.994C0 .893.895 0 1.994 0h12.012C15.107 0 16 .895 16 1.994v12.012A1.995 1.995 0 0114.006 16H1.994A1.995 1.995 0 010 14.006V1.994zm1 0v12.012c0 .548.446.994.994.994h12.012a.995.995 0 00.994-.994V1.994A.995.995 0 0014.006 1H1.994A.995.995 0 001 1.994z"
-                  fill-rule="evenodd"
-                />
-              </svg>
-              <span
-                class="euiButton__text"
-              >
-                Full screen view
-              </span>
-            </span>
-          </button>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-      style="padding: 5px;"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive tabs-container"
-        id="tabsContainer"
-      >
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-          style="margin-top: 8px;"
-        >
-          <div
-            class="euiTabs"
-            role="tablist"
-            style="margin-left: 7px; margin-bottom: 6px;"
-          >
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Output
-              </span>
-            </button>
-            <button
-              aria-selected="true"
-              class="euiTab euiTab-isSelected"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div
-        class="tab-arrow-down-container"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorDownLeft"
-              data-test-subj="slide-down"
-              id="singlePanel"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M13.069 5.157L8.384 9.768a.546.546 0 01-.768 0L2.93 5.158a.552.552 0 00-.771 0 .53.53 0 000 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 000-.76.552.552 0 00-.771 0z"
-                    fill-rule="non-zero"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <hr
-      class="euiHorizontalRule euiHorizontalRule--full"
-    />
-    <div>
-      <div
-        class="sql-console-results-container"
-      >
-        <div>
-          <div
-            style="overflow-x: auto; overflow-y: hidden;"
-          >
-            <div
-              style="padding-top: 1px; width: auto;"
-            >
-               
-            </div>
-          </div>
-          <div
-            style="overflow: auto; overflow-y: hidden;"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <table
-                  class="euiTable euiTable--responsive"
-                  tabindex="-1"
-                >
-                  <thead
-                    class="table-header"
-                  >
-                    <tr>
-                      <td
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 27px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </span>
-                      </td>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="category"
-                          >
-                            category
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="currency"
-                          >
-                            currency
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_first_name"
-                          >
-                            customer_first_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_full_name"
-                          >
-                            customer_full_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_gender"
-                          >
-                            customer_gender
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_id"
-                          >
-                            customer_id
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_last_name"
-                          >
-                            customer_last_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_phone"
-                          >
-                            customer_phone
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="day_of_week"
-                          >
-                            day_of_week
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="day_of_week_i"
-                          >
-                            day_of_week_i
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="email"
-                          >
-                            email
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="manufacturer"
-                          >
-                            manufacturer
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="order_date"
-                          >
-                            order_date
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="order_id"
-                          >
-                            order_id
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="products"
-                          >
-                            products
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="sku"
-                          >
-                            sku
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="taxful_total_price"
-                          >
-                            taxful_total_price
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="taxless_total_price"
-                          >
-                            taxless_total_price
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="total_quantity"
-                          >
-                            total_quantity
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="total_unique_products"
-                          >
-                            total_unique_products
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="type"
-                          >
-                            type
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="user"
-                          >
-                            user
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="geoip"
-                          >
-                            geoip
-                          </span>
-                        </span>
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="0"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            teddy
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="1"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="2"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="3"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="4"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="5"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="6"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="7"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="8"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="9"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="pagination-container"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorUpRight"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <button
-                  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                  data-test-subj="tablePaginationPopoverButton"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--small euiIcon--inherit euiButtonContent__icon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M13.069 5.157L8.384 9.768a.546.546 0 01-.768 0L2.93 5.158a.552.552 0 00-.771 0 .53.53 0 000 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 000-.76.552.552 0 00-.771 0z"
-                        fill-rule="non-zero"
-                      />
-                    </svg>
-                    <span
-                      class="euiButtonEmpty__text"
-                    >
-                      Rows per page
-                      : 
-                      10
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <nav
-              class="euiPagination"
-            >
-              <button
-                aria-label="Previous page"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-                data-test-subj="pagination-button-previous"
-                disabled=""
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z"
-                    fill-rule="nonzero"
-                  />
-                </svg>
-              </button>
-              <ul
-                class="euiPagination__list"
-              >
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-current="true"
-                    aria-label="Page 1 of 2"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-0"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        1
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 2 of 2"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-1"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        2
-                      </span>
-                    </span>
-                  </button>
-                </li>
-              </ul>
-              <button
-                aria-label="Next page, 2"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-                data-test-subj="pagination-button-next"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
-                    fill-rule="nonzero"
-                  />
-                </svg>
-              </button>
-            </nav>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<QueryResults with data/> spec renders the component with mock query results 1`] = `
-<div>
-  <div
-    class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow query-result-container"
-  >
-    <div
-      style="padding: 20px 20px 0px 20px;"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-      >
-        <div
-          class="euiFlexItem"
-        >
-          <div
-            class="euiText euiText--medium query-result-panel-header"
-          >
-            <h3>
-              Results
-            </h3>
-          </div>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <button
-            class="euiButton euiButton--primary euiButton--small"
-            type="button"
-          >
-            <span
-              class="euiButtonContent euiButton__content"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                class="euiButton__text"
-              >
-                Full screen view
-              </span>
-            </span>
-          </button>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-      style="padding: 5px;"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive tabs-container"
-        id="tabsContainer"
-      >
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-          style="margin-top: 8px;"
-        >
-          <div
-            class="euiTabs"
-            role="tablist"
-            style="margin-left: 7px; margin-bottom: 6px;"
-          >
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Output
-              </span>
-            </button>
-            <button
-              aria-selected="true"
-              class="euiTab euiTab-isSelected"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_1
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_2
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_3
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_4
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_5
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_6
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_7
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_8
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_9
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                index_10
-              </span>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div
-        class="tab-arrow-down-container"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorDownLeft"
-              data-test-subj="slide-down"
-              id="singlePanel"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon-isLoading"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <hr
-      class="euiHorizontalRule euiHorizontalRule--full"
-    />
-    <div>
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-        style="padding: 20px 20px 0px 20px;"
-      >
-        <div
-          class="euiFlexItem"
-        >
-          <div
-            class="euiText euiText--medium table-name"
-          >
-            <h4>
-              Output
-              <span
-                class="table-item-count"
-              >
-                 (13)
-              </span>
-            </h4>
-          </div>
-          <div
-            class="search-panel"
-          >
-            <div
-              class="search-bar"
-            >
-              <div
-                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
-              >
-                <div
-                  class="euiFlexItem euiSearchBar__searchHolder"
-                >
-                  <div
-                    class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                  >
-                    <div
-                      class="euiFormControlLayout__childrenWrapper"
-                    >
-                      <input
-                        aria-label="This is a search bar. As you type, the results lower in the page will automatically filter."
-                        class="euiFieldSearch euiFieldSearch--fullWidth"
-                        placeholder="Search keyword"
-                        type="search"
-                        value=""
-                      />
-                      <div
-                        class="euiFormControlLayoutIcons"
-                      >
-                        <span
-                          class="euiFormControlLayoutCustomIcon"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                            focusable="false"
-                            height="16"
-                            role="img"
-                            viewBox="0 0 16 16"
-                            width="16"
-                            xmlns="http://www.w3.org/2000/svg"
-                          />
-                        </span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <div
-            class="download-container"
-          >
-            <div
-              class="euiPopover euiPopover--anchorDownLeft download-button-container"
-              id="singlePanel"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <button
-                  class="euiButton euiButton--primary euiButton--small"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButton__content"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    />
-                    <span
-                      class="euiButton__text"
-                    >
-                      Download
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="sql-console-results-container"
-      >
-        <div>
-          <div
-            style="overflow-x: auto; overflow-y: hidden;"
-          >
-            <div
-              style="padding-top: 1px; width: auto;"
-            >
-               
-            </div>
-          </div>
-          <div
-            style="overflow: auto; overflow-y: hidden;"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <table
-                  class="euiTable euiTable--responsive"
-                  tabindex="-1"
-                >
-                  <thead
-                    class="table-header"
-                  >
-                    <tr>
-                      <td
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 27px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </span>
-                      </td>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="category"
-                          >
-                            category
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="currency"
-                          >
-                            currency
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_first_name"
-                          >
-                            customer_first_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_full_name"
-                          >
-                            customer_full_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_gender"
-                          >
-                            customer_gender
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_id"
-                          >
-                            customer_id
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_last_name"
-                          >
-                            customer_last_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_phone"
-                          >
-                            customer_phone
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="day_of_week"
-                          >
-                            day_of_week
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="day_of_week_i"
-                          >
-                            day_of_week_i
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="email"
-                          >
-                            email
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="manufacturer"
-                          >
-                            manufacturer
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="order_date"
-                          >
-                            order_date
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="order_id"
-                          >
-                            order_id
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="products"
-                          >
-                            products
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="sku"
-                          >
-                            sku
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="taxful_total_price"
-                          >
-                            taxful_total_price
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="taxless_total_price"
-                          >
-                            taxless_total_price
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="total_quantity"
-                          >
-                            total_quantity
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="total_unique_products"
-                          >
-                            total_unique_products
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="type"
-                          >
-                            type
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="user"
-                          >
-                            user
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="geoip"
-                          >
-                            geoip
-                          </span>
-                        </span>
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="0"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            teddy
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="1"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="2"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="3"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="4"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="5"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="6"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="7"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="8"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="9"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="pagination-container"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorUpRight"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <button
-                  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                  data-test-subj="tablePaginationPopoverButton"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    />
-                    <span
-                      class="euiButtonEmpty__text"
-                    >
-                      Rows per page
-                      : 
-                      10
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <nav
-              class="euiPagination"
-            >
-              <button
-                aria-label="Previous page"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-                data-test-subj="pagination-button-previous"
-                disabled=""
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                />
-              </button>
-              <ul
-                class="euiPagination__list"
-              >
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-current="true"
-                    aria-label="Page 1 of 2"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-0"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        1
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 2 of 2"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-1"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        2
-                      </span>
-                    </span>
-                  </button>
-                </li>
-              </ul>
-              <button
-                aria-label="Next page, 2"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-                data-test-subj="pagination-button-next"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                />
-              </button>
-            </nav>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<QueryResults with data/> spec renders the component with mock query results 2`] = `
-<div>
-  <div
-    class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow query-result-container"
-  >
-    <div
-      style="padding: 20px 20px 0px 20px;"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-      >
-        <div
-          class="euiFlexItem"
-        >
-          <div
-            class="euiText euiText--medium query-result-panel-header"
-          >
-            <h3>
-              Results
-            </h3>
-          </div>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <button
-            class="euiButton euiButton--primary euiButton--small"
-            type="button"
-          >
-            <span
-              class="euiButtonContent euiButton__content"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M13 3v4h-1V4H9V3h4zM3 3h4v1H4v3H3V3zm10 10H9v-1h3V9h1v4zM3 13V9h1v3h3v1H3zM0 1.994C0 .893.895 0 1.994 0h12.012C15.107 0 16 .895 16 1.994v12.012A1.995 1.995 0 0114.006 16H1.994A1.995 1.995 0 010 14.006V1.994zm1 0v12.012c0 .548.446.994.994.994h12.012a.995.995 0 00.994-.994V1.994A.995.995 0 0014.006 1H1.994A.995.995 0 001 1.994z"
-                  fill-rule="evenodd"
-                />
-              </svg>
-              <span
-                class="euiButton__text"
-              >
-                Full screen view
-              </span>
-            </span>
-          </button>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-      style="padding: 5px;"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive tabs-container"
-        id="tabsContainer"
-      >
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-          style="margin-top: 8px;"
-        >
-          <div
-            class="euiTabs"
-            role="tablist"
-            style="margin-left: 7px; margin-bottom: 6px;"
-          >
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Output
-              </span>
-            </button>
-            <button
-              aria-selected="true"
-              class="euiTab euiTab-isSelected"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-            <button
-              aria-selected="false"
-              class="euiTab"
-              role="tab"
-              type="button"
-            >
-              <span
-                class="euiTab__content"
-              >
-                Events
-              </span>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div
-        class="tab-arrow-down-container"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorDownLeft"
-              data-test-subj="slide-down"
-              id="singlePanel"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M13.069 5.157L8.384 9.768a.546.546 0 01-.768 0L2.93 5.158a.552.552 0 00-.771 0 .53.53 0 000 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 000-.76.552.552 0 00-.771 0z"
-                    fill-rule="non-zero"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <hr
-      class="euiHorizontalRule euiHorizontalRule--full"
-    />
-    <div>
-      <div
-        class="sql-console-results-container"
-      >
-        <div>
-          <div
-            style="overflow-x: auto; overflow-y: hidden;"
-          >
-            <div
-              style="padding-top: 1px; width: auto;"
-            >
-               
-            </div>
-          </div>
-          <div
-            style="overflow: auto; overflow-y: hidden;"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <table
-                  class="euiTable euiTable--responsive"
-                  tabindex="-1"
-                >
-                  <thead
-                    class="table-header"
-                  >
-                    <tr>
-                      <td
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 27px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </span>
-                      </td>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="category"
-                          >
-                            category
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="currency"
-                          >
-                            currency
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_first_name"
-                          >
-                            customer_first_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_full_name"
-                          >
-                            customer_full_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_gender"
-                          >
-                            customer_gender
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_id"
-                          >
-                            customer_id
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_last_name"
-                          >
-                            customer_last_name
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="customer_phone"
-                          >
-                            customer_phone
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="day_of_week"
-                          >
-                            day_of_week
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="day_of_week_i"
-                          >
-                            day_of_week_i
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="email"
-                          >
-                            email
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="manufacturer"
-                          >
-                            manufacturer
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="order_date"
-                          >
-                            order_date
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="order_id"
-                          >
-                            order_id
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="products"
-                          >
-                            products
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="sku"
-                          >
-                            sku
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="taxful_total_price"
-                          >
-                            taxful_total_price
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="taxless_total_price"
-                          >
-                            taxless_total_price
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="total_quantity"
-                          >
-                            total_quantity
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="total_unique_products"
-                          >
-                            total_unique_products
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="type"
-                          >
-                            type
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="user"
-                          >
-                            user
-                          </span>
-                        </span>
-                      </th>
-                      <th
-                        class="euiTableHeaderCell"
-                        role="columnheader"
-                        scope="col"
-                        style="width: 155px;"
-                      >
-                        <span
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="geoip"
-                          >
-                            geoip
-                          </span>
-                        </span>
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="0"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Teddy@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            teddy
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="1"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="2"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="3"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="4"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="5"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="6"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="7"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="8"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="euiTableRow"
-                      data-test-subj="tableRow"
-                    >
-                      <td
-                        class="euiTableRowCell"
-                        id="9"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <button
-                              aria-label="Expand"
-                              class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                              style="margin-left: -4px;"
-                              type="button"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </button>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                category: [1]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            EUR
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Eddie Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            MALE
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            38
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Underwood
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          />
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            Monday
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            0
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie@underwood-family.zzz
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                manufacturer: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2019-10-07T09:28:48+00:00
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            584677
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                products: {2}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                sku: [2]
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            36.98
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            2
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            order
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            eddie
-                          </span>
-                        </div>
-                      </td>
-                      <td
-                        class="euiTableRowCell"
-                      >
-                        <div
-                          class="euiTableCellContent"
-                        >
-                          <span
-                            class="euiTableCellContent__text"
-                          >
-                            <span>
-                               
-                              
-                              <button
-                                class="euiLink euiLink--primary"
-                                type="button"
-                              >
-                                geoip: {1}
-                              </button>
-                            </span>
-                          </span>
-                        </div>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="pagination-container"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorUpRight"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <button
-                  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                  data-test-subj="tablePaginationPopoverButton"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--small euiIcon--inherit euiButtonContent__icon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M13.069 5.157L8.384 9.768a.546.546 0 01-.768 0L2.93 5.158a.552.552 0 00-.771 0 .53.53 0 000 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 000-.76.552.552 0 00-.771 0z"
-                        fill-rule="non-zero"
-                      />
-                    </svg>
-                    <span
-                      class="euiButtonEmpty__text"
-                    >
-                      Rows per page
-                      : 
-                      10
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <nav
-              class="euiPagination"
-            >
-              <button
-                aria-label="Previous page"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-                data-test-subj="pagination-button-previous"
-                disabled=""
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z"
-                    fill-rule="nonzero"
-                  />
-                </svg>
-              </button>
-              <ul
-                class="euiPagination__list"
-              >
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-current="true"
-                    aria-label="Page 1 of 2"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-0"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        1
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-label="Page 2 of 2"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-1"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        2
-                      </span>
-                    </span>
-                  </button>
-                </li>
-              </ul>
-              <button
-                aria-label="Next page, 2"
-                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-                data-test-subj="pagination-button-next"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
-                    fill-rule="nonzero"
-                  />
-                </svg>
-              </button>
-            </nav>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/workbench/public/components/QueryResults/__snapshots__/QueryResultsBody.test.tsx.snap b/workbench/public/components/QueryResults/__snapshots__/QueryResultsBody.test.tsx.snap
deleted file mode 100644
index 5fff13c6da..0000000000
--- a/workbench/public/components/QueryResults/__snapshots__/QueryResultsBody.test.tsx.snap
+++ /dev/null
@@ -1,14934 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<QueryResultsBody /> spec renders component with mock QueryResults data 1`] = `
-<div>
-  <div>
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-      style="padding: 20px 20px 0px 20px;"
-    >
-      <div
-        class="euiFlexItem"
-      >
-        <div
-          class="euiText euiText--medium table-name"
-        >
-          <h4>
-            Messages
-            <span
-              class="table-item-count"
-            >
-               (13)
-            </span>
-          </h4>
-        </div>
-        <div
-          class="search-panel"
-        >
-          <div
-            class="search-bar"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
-            >
-              <div
-                class="euiFlexItem euiSearchBar__searchHolder"
-              >
-                <div
-                  class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                >
-                  <div
-                    class="euiFormControlLayout__childrenWrapper"
-                  >
-                    <input
-                      aria-label="This is a search bar. As you type, the results lower in the page will automatically filter."
-                      class="euiFieldSearch euiFieldSearch--fullWidth"
-                      placeholder="Search keyword"
-                      type="search"
-                      value=""
-                    />
-                    <div
-                      class="euiFormControlLayoutIcons"
-                    >
-                      <span
-                        class="euiFormControlLayoutCustomIcon"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                          focusable="false"
-                          height="16"
-                          role="img"
-                          viewBox="0 0 16 16"
-                          width="16"
-                          xmlns="http://www.w3.org/2000/svg"
-                        />
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <div
-          class="download-container"
-        >
-          <div
-            class="euiPopover euiPopover--anchorDownLeft download-button-container"
-            id="singlePanel"
-          >
-            <div
-              class="euiPopover__anchor"
-            >
-              <button
-                class="euiButton euiButton--primary euiButton--small"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButtonContent--iconRight euiButton__content"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                  <span
-                    class="euiButton__text"
-                  >
-                    Download
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="sql-console-results-container"
-    >
-      <div>
-        <div
-          style="overflow-x: auto; overflow-y: hidden;"
-        >
-          <div
-            style="padding-top: 1px; width: auto;"
-          >
-             
-          </div>
-        </div>
-        <div
-          style="overflow: auto; overflow-y: hidden;"
-        >
-          <div
-            class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
-          >
-            <div
-              class="euiFlexItem"
-            >
-              <table
-                class="euiTable euiTable--responsive"
-                tabindex="-1"
-              >
-                <thead
-                  class="table-header"
-                >
-                  <tr>
-                    <td
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 27px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </span>
-                    </td>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="category"
-                        >
-                          category
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="currency"
-                        >
-                          currency
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_first_name"
-                        >
-                          customer_first_name
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_full_name"
-                        >
-                          customer_full_name
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_gender"
-                        >
-                          customer_gender
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_id"
-                        >
-                          customer_id
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_last_name"
-                        >
-                          customer_last_name
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_phone"
-                        >
-                          customer_phone
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="day_of_week"
-                        >
-                          day_of_week
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="day_of_week_i"
-                        >
-                          day_of_week_i
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="email"
-                        >
-                          email
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="manufacturer"
-                        >
-                          manufacturer
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="order_date"
-                        >
-                          order_date
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="order_id"
-                        >
-                          order_id
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="products"
-                        >
-                          products
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="sku"
-                        >
-                          sku
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="taxful_total_price"
-                        >
-                          taxful_total_price
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="taxless_total_price"
-                        >
-                          taxless_total_price
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="total_quantity"
-                        >
-                          total_quantity
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="total_unique_products"
-                        >
-                          total_unique_products
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="type"
-                        >
-                          type
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="user"
-                        >
-                          user
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="geoip"
-                        >
-                          geoip
-                        </span>
-                      </span>
-                    </th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="0"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Teddy
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Teddy Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Teddy@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          teddy
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="1"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="2"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="3"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="4"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="5"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="6"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="7"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="8"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="9"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="10"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="pagination-container"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-      >
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <div
-            class="euiPopover euiPopover--anchorUpRight"
-          >
-            <div
-              class="euiPopover__anchor"
-            >
-              <button
-                class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                data-test-subj="tablePaginationPopoverButton"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                  <span
-                    class="euiButtonEmpty__text"
-                  >
-                    Rows per page
-                    : 
-                    10
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <nav
-            class="euiPagination"
-          >
-            <button
-              aria-label="Previous page"
-              class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-              data-test-subj="pagination-button-previous"
-              disabled=""
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              />
-            </button>
-            <ul
-              class="euiPagination__list"
-            />
-            <button
-              aria-label="Next page, 2"
-              class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-              data-test-subj="pagination-button-next"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              />
-            </button>
-          </nav>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<QueryResultsBody /> spec renders component with mock QueryResults data 2`] = `
-<div>
-  <div>
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--responsive"
-      style="padding: 20px 20px 0px 20px;"
-    >
-      <div
-        class="euiFlexItem"
-      >
-        <div
-          class="euiText euiText--medium table-name"
-        >
-          <h4>
-            Messages
-            <span
-              class="table-item-count"
-            >
-               (13)
-            </span>
-          </h4>
-        </div>
-        <div
-          class="search-panel"
-        >
-          <div
-            class="search-bar"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
-            >
-              <div
-                class="euiFlexItem euiSearchBar__searchHolder"
-              >
-                <div
-                  class="euiFormControlLayout euiFormControlLayout--fullWidth"
-                >
-                  <div
-                    class="euiFormControlLayout__childrenWrapper"
-                  >
-                    <input
-                      aria-label="This is a search bar. As you type, the results lower in the page will automatically filter."
-                      class="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
-                      placeholder="Search keyword"
-                      type="search"
-                      value=""
-                    />
-                    <div
-                      class="euiFormControlLayoutIcons"
-                    >
-                      <span
-                        class="euiFormControlLayoutCustomIcon"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                          focusable="false"
-                          height="16"
-                          role="img"
-                          viewBox="0 0 16 16"
-                          width="16"
-                          xmlns="http://www.w3.org/2000/svg"
-                        />
-                      </span>
-                    </div>
-                    <div
-                      class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                    >
-                      <button
-                        aria-label="Clear input"
-                        class="euiFormControlLayoutClearButton"
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutClearButton__icon"
-                          focusable="false"
-                          height="16"
-                          role="img"
-                          viewBox="0 0 16 16"
-                          width="16"
-                          xmlns="http://www.w3.org/2000/svg"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <div
-          class="download-container"
-        >
-          <div
-            class="euiPopover euiPopover--anchorDownLeft download-button-container"
-            id="singlePanel"
-          >
-            <div
-              class="euiPopover__anchor"
-            >
-              <button
-                class="euiButton euiButton--primary euiButton--small"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButtonContent--iconRight euiButton__content"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                  <span
-                    class="euiButton__text"
-                  >
-                    Download
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="sql-console-results-container"
-    >
-      <div>
-        <div
-          style="overflow-x: auto; overflow-y: hidden;"
-        >
-          <div
-            style="padding-top: 1px; width: auto;"
-          >
-             
-          </div>
-        </div>
-        <div
-          style="overflow: auto; overflow-y: hidden;"
-        >
-          <div
-            class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
-          >
-            <div
-              class="euiFlexItem"
-            >
-              <table
-                class="euiTable euiTable--responsive"
-                tabindex="-1"
-              >
-                <thead
-                  class="table-header"
-                >
-                  <tr>
-                    <td
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 27px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </span>
-                    </td>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="category"
-                        >
-                          category
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="currency"
-                        >
-                          currency
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_first_name"
-                        >
-                          customer_first_name
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_full_name"
-                        >
-                          customer_full_name
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_gender"
-                        >
-                          customer_gender
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_id"
-                        >
-                          customer_id
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_last_name"
-                        >
-                          customer_last_name
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_phone"
-                        >
-                          customer_phone
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="day_of_week"
-                        >
-                          day_of_week
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="day_of_week_i"
-                        >
-                          day_of_week_i
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="email"
-                        >
-                          email
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="manufacturer"
-                        >
-                          manufacturer
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="order_date"
-                        >
-                          order_date
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="order_id"
-                        >
-                          order_id
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="products"
-                        >
-                          products
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="sku"
-                        >
-                          sku
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="taxful_total_price"
-                        >
-                          taxful_total_price
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="taxless_total_price"
-                        >
-                          taxless_total_price
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="total_quantity"
-                        >
-                          total_quantity
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="total_unique_products"
-                        >
-                          total_unique_products
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="type"
-                        >
-                          type
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="user"
-                        >
-                          user
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="geoip"
-                        >
-                          geoip
-                        </span>
-                      </span>
-                    </th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr
-                    class="euiTableRow expanded-row"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="0"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Collapse"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Teddy
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Teddy Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Teddy@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          teddy
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                     
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                  >
-                    <div
-                      id="0"
-                      style="padding: 0px 0px 20px 19px;"
-                    >
-                      <nav
-                        class="euiSideNav sideNavItem__items"
-                        style="width: 300px; padding: 0px 0px 20px 9px;"
-                      >
-                        <div
-                          class="euiSideNav__content euiSideNav__contentMobile-xs euiSideNav__contentMobile-s"
-                          id="some_html_id"
-                        >
-                          <div
-                            class="euiSideNavItem euiSideNavItem--root euiSideNavItem--hasChildItems"
-                          >
-                            <button
-                              class="euiSideNavItemButton euiSideNavItemButton--isClickable"
-                              type="button"
-                            >
-                              <span
-                                class="euiSideNavItemButton__content"
-                              >
-                                <span
-                                  class="euiSideNavItemButton__label euiSideNavItemButton__label--truncated"
-                                />
-                              </span>
-                            </button>
-                            <div
-                              class="euiSideNavItem__items"
-                            >
-                              <div
-                                class="euiSideNavItem euiSideNavItem--trunk"
-                              >
-                                <button
-                                  class="euiSideNavItemButton euiSideNavItemButton--isClickable"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiSideNavItemButton__content"
-                                  >
-                                    <button
-                                      aria-label="Expand"
-                                      class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall euiSideNavItemButton__icon"
-                                      type="button"
-                                    >
-                                      <svg
-                                        aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                        focusable="false"
-                                        height="16"
-                                        role="img"
-                                        viewBox="0 0 16 16"
-                                        width="16"
-                                        xmlns="http://www.w3.org/2000/svg"
-                                      >
-                                        <path
-                                          d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                          fill-rule="evenodd"
-                                        />
-                                      </svg>
-                                    </button>
-                                    <span
-                                      class="euiSideNavItemButton__label euiSideNavItemButton__label--truncated"
-                                      title="category"
-                                    >
-                                      category
-                                    </span>
-                                  </span>
-                                </button>
-                              </div>
-                              <div
-                                class="euiSideNavItem euiSideNavItem--trunk euiSideNavItem--hasChildItems"
-                              >
-                                <button
-                                  class="euiSideNavItemButton euiSideNavItemButton--isClickable euiSideNavItemButton-isSelected"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiSideNavItemButton__content"
-                                  >
-                                    <button
-                                      aria-label="Collapse"
-                                      class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall euiSideNavItemButton__icon"
-                                      type="button"
-                                    >
-                                      <svg
-                                        aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                        focusable="false"
-                                        height="16"
-                                        role="img"
-                                        viewBox="0 0 16 16"
-                                        width="16"
-                                        xmlns="http://www.w3.org/2000/svg"
-                                      />
-                                    </button>
-                                    <span
-                                      class="euiSideNavItemButton__label euiSideNavItemButton__label--truncated"
-                                      title="manufacturer"
-                                    >
-                                      manufacturer
-                                    </span>
-                                  </span>
-                                </button>
-                                <div
-                                  class="euiSideNavItem__items"
-                                >
-                                  <div
-                                    class="euiSideNavItem euiSideNavItem--branch euiSideNavItem--hasChildItems"
-                                  >
-                                    <button
-                                      class="euiSideNavItemButton euiSideNavItemButton--isClickable euiSideNavItemButton-isSelected"
-                                      type="button"
-                                    >
-                                      <span
-                                        class="euiSideNavItemButton__content"
-                                      >
-                                        <span
-                                          class="euiSideNavItemButton__label euiSideNavItemButton__label--truncated"
-                                          title="ElitelligenceOceanavigations"
-                                        >
-                                          <div>
-                                            <table
-                                              class="euiTable sideNav-table euiTable--responsive"
-                                              tabindex="-1"
-                                            >
-                                              <thead
-                                                class="table-header"
-                                              >
-                                                <tr />
-                                              </thead>
-                                              <tbody>
-                                                <tr
-                                                  class="euiTableRow"
-                                                  data-test-subj="tableRow"
-                                                >
-                                                  <td
-                                                    class="euiTableRowCell"
-                                                  >
-                                                    <div
-                                                      class="euiTableCellContent"
-                                                    >
-                                                      <span
-                                                        class="euiTableCellContent__text"
-                                                      >
-                                                        Elitelligence
-                                                      </span>
-                                                    </div>
-                                                  </td>
-                                                </tr>
-                                                <tr
-                                                  class="euiTableRow"
-                                                  data-test-subj="tableRow"
-                                                >
-                                                  <td
-                                                    class="euiTableRowCell"
-                                                  >
-                                                    <div
-                                                      class="euiTableCellContent"
-                                                    >
-                                                      <span
-                                                        class="euiTableCellContent__text"
-                                                      >
-                                                        Oceanavigations
-                                                      </span>
-                                                    </div>
-                                                  </td>
-                                                </tr>
-                                              </tbody>
-                                            </table>
-                                          </div>
-                                        </span>
-                                      </span>
-                                    </button>
-                                    <div
-                                      class="euiSideNavItem__items"
-                                    />
-                                  </div>
-                                </div>
-                              </div>
-                              <div
-                                class="euiSideNavItem euiSideNavItem--trunk"
-                              >
-                                <button
-                                  class="euiSideNavItemButton euiSideNavItemButton--isClickable"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiSideNavItemButton__content"
-                                  >
-                                    <button
-                                      aria-label="Expand"
-                                      class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall euiSideNavItemButton__icon"
-                                      type="button"
-                                    >
-                                      <svg
-                                        aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                        focusable="false"
-                                        height="16"
-                                        role="img"
-                                        viewBox="0 0 16 16"
-                                        width="16"
-                                        xmlns="http://www.w3.org/2000/svg"
-                                      >
-                                        <path
-                                          d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                          fill-rule="evenodd"
-                                        />
-                                      </svg>
-                                    </button>
-                                    <span
-                                      class="euiSideNavItemButton__label euiSideNavItemButton__label--truncated"
-                                      title="products"
-                                    >
-                                      products
-                                    </span>
-                                  </span>
-                                </button>
-                              </div>
-                              <div
-                                class="euiSideNavItem euiSideNavItem--trunk"
-                              >
-                                <button
-                                  class="euiSideNavItemButton euiSideNavItemButton--isClickable"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiSideNavItemButton__content"
-                                  >
-                                    <button
-                                      aria-label="Expand"
-                                      class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall euiSideNavItemButton__icon"
-                                      type="button"
-                                    >
-                                      <svg
-                                        aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                        focusable="false"
-                                        height="16"
-                                        role="img"
-                                        viewBox="0 0 16 16"
-                                        width="16"
-                                        xmlns="http://www.w3.org/2000/svg"
-                                      >
-                                        <path
-                                          d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                          fill-rule="evenodd"
-                                        />
-                                      </svg>
-                                    </button>
-                                    <span
-                                      class="euiSideNavItemButton__label euiSideNavItemButton__label--truncated"
-                                      title="sku"
-                                    >
-                                      sku
-                                    </span>
-                                  </span>
-                                </button>
-                              </div>
-                              <div
-                                class="euiSideNavItem euiSideNavItem--trunk"
-                              >
-                                <button
-                                  class="euiSideNavItemButton euiSideNavItemButton--isClickable"
-                                  type="button"
-                                >
-                                  <span
-                                    class="euiSideNavItemButton__content"
-                                  >
-                                    <button
-                                      aria-label="Expand"
-                                      class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall euiSideNavItemButton__icon"
-                                      type="button"
-                                    >
-                                      <svg
-                                        aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                        focusable="false"
-                                        height="16"
-                                        role="img"
-                                        viewBox="0 0 16 16"
-                                        width="16"
-                                        xmlns="http://www.w3.org/2000/svg"
-                                      >
-                                        <path
-                                          d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                          fill-rule="evenodd"
-                                        />
-                                      </svg>
-                                    </button>
-                                    <span
-                                      class="euiSideNavItemButton__label euiSideNavItemButton__label--truncated"
-                                      title="geoip"
-                                    >
-                                      geoip
-                                    </span>
-                                  </span>
-                                </button>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </nav>
-                    </div>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="1"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="2"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="3"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="4"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="5"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="6"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="7"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="8"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="9"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="10"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="pagination-container"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-      >
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <div
-            class="euiPopover euiPopover--anchorUpRight"
-          >
-            <div
-              class="euiPopover__anchor"
-            >
-              <button
-                class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                data-test-subj="tablePaginationPopoverButton"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                  <span
-                    class="euiButtonEmpty__text"
-                  >
-                    Rows per page
-                    : 
-                    10
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <nav
-            class="euiPagination"
-          >
-            <button
-              aria-label="Previous page"
-              class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-              data-test-subj="pagination-button-previous"
-              disabled=""
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              />
-            </button>
-            <ul
-              class="euiPagination__list"
-            />
-            <button
-              aria-label="Next page, 2"
-              class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-              data-test-subj="pagination-button-next"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              />
-            </button>
-          </nav>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<QueryResultsBody /> spec renders component with mock QueryResults data 3`] = `
-<div>
-  <div>
-    <div
-      class="sql-console-results-container"
-    >
-      <div>
-        <div
-          style="overflow-x: auto; overflow-y: hidden;"
-        >
-          <div
-            style="padding-top: 1px; width: auto;"
-          >
-             
-          </div>
-        </div>
-        <div
-          style="overflow: auto; overflow-y: hidden;"
-        >
-          <div
-            class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
-          >
-            <div
-              class="euiFlexItem"
-            >
-              <table
-                class="euiTable euiTable--responsive"
-                tabindex="-1"
-              >
-                <thead
-                  class="table-header"
-                >
-                  <tr>
-                    <td
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 27px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </span>
-                    </td>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="category"
-                        >
-                          category
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="currency"
-                        >
-                          currency
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_first_name"
-                        >
-                          customer_first_name
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_full_name"
-                        >
-                          customer_full_name
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_gender"
-                        >
-                          customer_gender
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_id"
-                        >
-                          customer_id
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_last_name"
-                        >
-                          customer_last_name
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="customer_phone"
-                        >
-                          customer_phone
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="day_of_week"
-                        >
-                          day_of_week
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="day_of_week_i"
-                        >
-                          day_of_week_i
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="email"
-                        >
-                          email
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="manufacturer"
-                        >
-                          manufacturer
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="order_date"
-                        >
-                          order_date
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="order_id"
-                        >
-                          order_id
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="products"
-                        >
-                          products
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="sku"
-                        >
-                          sku
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="taxful_total_price"
-                        >
-                          taxful_total_price
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="taxless_total_price"
-                        >
-                          taxless_total_price
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="total_quantity"
-                        >
-                          total_quantity
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="total_unique_products"
-                        >
-                          total_unique_products
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="type"
-                        >
-                          type
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="user"
-                        >
-                          user
-                        </span>
-                      </span>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      role="columnheader"
-                      scope="col"
-                      style="width: 155px;"
-                    >
-                      <span
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                          title="geoip"
-                        >
-                          geoip
-                        </span>
-                      </span>
-                    </th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="0"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Teddy
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Teddy Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Teddy@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          teddy
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="1"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="2"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="3"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="4"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="5"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="6"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="7"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="8"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="9"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr
-                    class="euiTableRow"
-                    data-test-subj="tableRow"
-                  >
-                    <td
-                      class="euiTableRowCell"
-                      id="10"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <button
-                            aria-label="Expand"
-                            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            style="margin-left: -4px;"
-                            type="button"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                              focusable="false"
-                              height="16"
-                              role="img"
-                              viewBox="0 0 16 16"
-                              width="16"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M8 7h3.5a.5.5 0 110 1H8v3.5a.5.5 0 11-1 0V8H3.5a.5.5 0 010-1H7V3.5a.5.5 0 011 0V7zm-.5-7C11.636 0 15 3.364 15 7.5S11.636 15 7.5 15 0 11.636 0 7.5 3.364 0 7.5 0zm0 .882a6.618 6.618 0 100 13.236A6.618 6.618 0 007.5.882z"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                          </button>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              category: [1]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          EUR
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Eddie Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          MALE
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          38
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Underwood
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        />
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          Monday
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          0
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie@underwood-family.zzz
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              manufacturer: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2019-10-07T09:28:48+00:00
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          584677
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              products: {2}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              sku: [2]
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          36.98
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          2
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          order
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          eddie
-                        </span>
-                      </div>
-                    </td>
-                    <td
-                      class="euiTableRowCell"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
-                        <span
-                          class="euiTableCellContent__text"
-                        >
-                          <span>
-                             
-                            
-                            <button
-                              class="euiLink euiLink--primary"
-                              type="button"
-                            >
-                              geoip: {1}
-                            </button>
-                          </span>
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="pagination-container"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-      >
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <div
-            class="euiPopover euiPopover--anchorUpRight"
-          >
-            <div
-              class="euiPopover__anchor"
-            >
-              <button
-                class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                data-test-subj="tablePaginationPopoverButton"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--small euiIcon--inherit euiButtonContent__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M13.069 5.157L8.384 9.768a.546.546 0 01-.768 0L2.93 5.158a.552.552 0 00-.771 0 .53.53 0 000 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 000-.76.552.552 0 00-.771 0z"
-                      fill-rule="non-zero"
-                    />
-                  </svg>
-                  <span
-                    class="euiButtonEmpty__text"
-                  >
-                    Rows per page
-                    : 
-                    10
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <nav
-            class="euiPagination"
-          >
-            <button
-              aria-label="Previous page"
-              class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-              data-test-subj="pagination-button-previous"
-              disabled=""
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z"
-                  fill-rule="nonzero"
-                />
-              </svg>
-            </button>
-            <ul
-              class="euiPagination__list"
-            />
-            <button
-              aria-label="Next page, 2"
-              class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
-              data-test-subj="pagination-button-next"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
-                  fill-rule="nonzero"
-                />
-              </svg>
-            </button>
-          </nav>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<QueryResultsBody /> spec renders the component 1`] = `
-<div>
-  <div
-    class="euiCodeEditorWrapper"
-    data-test-subj="codeEditorContainer"
-    style="width: 100%;"
-  >
-    <button
-      class="euiCodeEditorKeyboardHint"
-      data-test-subj="codeEditorHint"
-      id="some_html_id"
-    >
-      <p
-        class="euiText"
-      >
-        Press Enter to start editing.
-      </p>
-      <p
-        class="euiText"
-      >
-        When you're done, press Escape to stop editing.
-      </p>
-    </button>
-    <div
-      class=" ace_editor ace-sql-console successful-message"
-      id="some_html_id"
-      style="width: 100%; height: 500px; font-size: 14px;"
-    >
-      <textarea
-        aria-label="Code Editor"
-        autocapitalize="off"
-        autocorrect="off"
-        class="ace_text-input"
-        spellcheck="false"
-        style="opacity: 0;"
-        tabindex="-1"
-        wrap="off"
-      />
-      <div
-        aria-hidden="true"
-        class="ace_gutter"
-      >
-        <div
-          class="ace_layer ace_gutter-layer ace_folding-enabled"
-        />
-        <div
-          class="ace_gutter-active-line"
-          style="display: none;"
-        />
-      </div>
-      <div
-        class="ace_scroller"
-      >
-        <div
-          class="ace_content"
-        >
-          <div
-            class="ace_layer ace_print-margin-layer"
-          >
-            <div
-              class="ace_print-margin"
-              style="left: 4px; visibility: hidden;"
-            />
-          </div>
-          <div
-            class="ace_layer ace_marker-layer"
-          />
-          <div
-            class="ace_layer ace_text-layer"
-            style="padding: 0px 4px;"
-          />
-          <div
-            class="ace_layer ace_marker-layer"
-          />
-          <div
-            class="ace_layer ace_cursor-layer ace_hidden-cursors"
-          >
-            <div
-              class="ace_cursor"
-            />
-          </div>
-        </div>
-      </div>
-      <div
-        class="ace_scrollbar ace_scrollbar-v"
-        style="display: none; width: 20px;"
-      >
-        <div
-          class="ace_scrollbar-inner"
-          style="width: 20px;"
-        />
-      </div>
-      <div
-        class="ace_scrollbar ace_scrollbar-h"
-        style="display: none; height: 20px;"
-      >
-        <div
-          class="ace_scrollbar-inner"
-          style="height: 20px;"
-        />
-      </div>
-      <div
-        style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-      >
-        <div
-          style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-        />
-        <div
-          style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-        >
-          XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<QueryResultsBody /> spec renders the component 2`] = `
-<div>
-  <div
-    class="euiCodeEditorWrapper"
-    data-test-subj="codeEditorContainer"
-    style="width: 100%;"
-  >
-    <button
-      class="euiCodeEditorKeyboardHint"
-      data-test-subj="codeEditorHint"
-      id="some_html_id"
-    >
-      <p
-        class="euiText"
-      >
-        Press Enter to start editing.
-      </p>
-      <p
-        class="euiText"
-      >
-        When you're done, press Escape to stop editing.
-      </p>
-    </button>
-    <div
-      class=" ace_editor ace-sql-console successful-message"
-      id="some_html_id"
-      style="width: 100%; height: 500px; font-size: 14px;"
-    >
-      <textarea
-        aria-label="Code Editor"
-        autocapitalize="off"
-        autocorrect="off"
-        class="ace_text-input"
-        spellcheck="false"
-        style="opacity: 0;"
-        tabindex="-1"
-        wrap="off"
-      />
-      <div
-        aria-hidden="true"
-        class="ace_gutter"
-      >
-        <div
-          class="ace_layer ace_gutter-layer ace_folding-enabled"
-        />
-        <div
-          class="ace_gutter-active-line"
-          style="display: none;"
-        />
-      </div>
-      <div
-        class="ace_scroller"
-      >
-        <div
-          class="ace_content"
-        >
-          <div
-            class="ace_layer ace_print-margin-layer"
-          >
-            <div
-              class="ace_print-margin"
-              style="left: 4px; visibility: hidden;"
-            />
-          </div>
-          <div
-            class="ace_layer ace_marker-layer"
-          />
-          <div
-            class="ace_layer ace_text-layer"
-            style="padding: 0px 4px;"
-          />
-          <div
-            class="ace_layer ace_marker-layer"
-          />
-          <div
-            class="ace_layer ace_cursor-layer ace_hidden-cursors"
-          >
-            <div
-              class="ace_cursor"
-            />
-          </div>
-        </div>
-      </div>
-      <div
-        class="ace_scrollbar ace_scrollbar-v"
-        style="display: none; width: 20px;"
-      >
-        <div
-          class="ace_scrollbar-inner"
-          style="width: 20px;"
-        />
-      </div>
-      <div
-        class="ace_scrollbar ace_scrollbar-h"
-        style="display: none; height: 20px;"
-      >
-        <div
-          class="ace_scrollbar-inner"
-          style="height: 20px;"
-        />
-      </div>
-      <div
-        style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-      >
-        <div
-          style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-        />
-        <div
-          style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-        >
-          XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/workbench/public/components/SQLPage/SQLPage.test.tsx b/workbench/public/components/SQLPage/SQLPage.test.tsx
deleted file mode 100644
index 7b08b5d883..0000000000
--- a/workbench/public/components/SQLPage/SQLPage.test.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from "react";
-import "@testing-library/jest-dom/extend-expect";
-import { render, fireEvent } from "@testing-library/react";
-import { SQLPage } from "./SQLPage";
-
-
-describe("<SQLPage /> spec", () => {
-
-  it("renders the component", () => {
-    render(
-      <SQLPage
-        onRun={() => { }}
-        onTranslate={() => { }}
-        onClear={() => { }}
-        updateSQLQueries={() => { }}
-        sqlTranslations={[]}
-        sqlQuery={''}
-      />
-    );
-    expect(document.body.children[0]).toMatchSnapshot();
-  });
-
-  it('tests the action buttons', async () => {
-    const onRun = jest.fn();
-    const onTranslate = jest.fn();
-    const onClean = jest.fn();
-    const updateSQLQueries = jest.fn();
-
-    const { getByText } = render(
-      <SQLPage
-        onRun={onRun}
-        onTranslate={onTranslate}
-        onClear={onClean}
-        updateSQLQueries={updateSQLQueries}
-        sqlTranslations={[]}
-        sqlQuery={''}
-      />
-    );
-
-    expect(document.body.children[0]).toMatchSnapshot();
-
-    fireEvent.click(getByText('Run'));
-    expect(onRun).toHaveBeenCalledTimes(1);
-
-    fireEvent.click(getByText('Clear'));
-    expect(onClean).toHaveBeenCalledTimes(1);
-
-    fireEvent.click(getByText('Explain'));
-    expect(onTranslate).toHaveBeenCalledTimes(1);
-
-  });
-
-});
-
-
-
diff --git a/workbench/public/components/SQLPage/SQLPage.tsx b/workbench/public/components/SQLPage/SQLPage.tsx
deleted file mode 100644
index 162d4c706d..0000000000
--- a/workbench/public/components/SQLPage/SQLPage.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from "react";
-import {
-  EuiPanel,
-  EuiButton,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiOverlayMask,
-  EuiModal,
-  EuiModalHeader,
-  EuiModalHeaderTitle,
-  EuiModalBody,
-  EuiModalFooter,
-  EuiCodeBlock,
-  EuiText,
-  EuiCodeEditor,
-  EuiSpacer,
-} from "@elastic/eui";
-import { ResponseDetail, TranslateResult } from '../Main/main';
-import _ from 'lodash';
-import "brace/mode/sql";
-import "../../ace-themes/sql_console";
-import 'brace/ext/language_tools';
-
-interface SQLPageProps {
-  onRun: (query: string) => void,
-  onTranslate: (query: string) => void,
-  onClear: () => void,
-  updateSQLQueries: (query: string) => void
-  sqlQuery: string,
-  sqlTranslations: ResponseDetail<TranslateResult>[]
-}
-
-interface SQLPageState {
-  sqlQuery: string,
-  translation: string,
-  isModalVisible: boolean
-}
-
-export class SQLPage extends React.Component<SQLPageProps, SQLPageState> {
-  constructor(props: SQLPageProps) {
-    super(props);
-    this.state = {
-      sqlQuery: this.props.sqlQuery,
-      translation: "",
-      isModalVisible: false
-    };
-  }
-
-  setIsModalVisible(visible: boolean): void {
-    this.setState({
-      isModalVisible: visible
-    })
-  }
-
-  render() {
-
-    const closeModal = () => this.setIsModalVisible(false);
-    const showModal = () => this.setIsModalVisible(true);
-
-    const sqlTranslationsNotEmpty = () => {
-      if (this.props.sqlTranslations.length > 0) {
-        return this.props.sqlTranslations[0].fulfilled;
-      }
-      return false;
-    }
-
-    const explainContent = sqlTranslationsNotEmpty()
-    ? this.props.sqlTranslations.map((queryTranslation: any) => JSON.stringify(queryTranslation.data, null, 2)).join("\n")
-    : 'This query is not explainable.';
-
-    let modal;
-
-    if (this.state.isModalVisible) {
-      modal = (
-        <EuiOverlayMask onClick={closeModal}>
-          <EuiModal onClose={closeModal} style={{ width: 800 }}>
-            <EuiModalHeader>
-              <EuiModalHeaderTitle>Explain</EuiModalHeaderTitle>
-            </EuiModalHeader>
-
-            <EuiModalBody>
-              <EuiCodeBlock
-                language="json"
-                fontSize="m"
-                isCopyable
-              >
-                {explainContent}
-              </EuiCodeBlock>
-            </EuiModalBody>
-
-            <EuiModalFooter>
-              <EuiButton onClick={closeModal} fill>
-                Close
-            </EuiButton>
-            </EuiModalFooter>
-          </EuiModal>
-        </EuiOverlayMask>
-      );
-    }
-
-    return (
-      <EuiPanel className="sql-console-query-editor container-panel" paddingSize="l">
-        <EuiText className="sql-query-panel-header"><h3>Query editor</h3></EuiText>
-        <EuiSpacer size="s" />
-        <EuiCodeEditor
-          mode="sql"
-          theme="sql_console"
-          width="100%"
-          height="7rem"
-          value={this.props.sqlQuery}
-          onChange={this.props.updateSQLQueries}
-          showPrintMargin={false}
-          setOptions={{
-            fontSize: "14px",
-            enableBasicAutocompletion: true,
-            enableLiveAutocompletion: true
-          }}
-          aria-label="Code Editor"
-        />
-        <EuiSpacer />
-        <EuiFlexGroup className="action-container" gutterSize="m">
-          <EuiFlexItem
-            grow={false}
-            onClick={() => this.props.onRun(this.props.sqlQuery)}
-          >
-            <EuiButton fill={true} className="sql-editor-button" >
-              Run
-            </EuiButton>
-          </EuiFlexItem>
-          <EuiFlexItem
-            grow={false}
-            onClick={() => {
-              this.props.updateSQLQueries("");
-              this.props.onClear();
-            }}
-          >
-            <EuiButton className="sql-editor-button">
-              Clear
-            </EuiButton>
-          </EuiFlexItem>
-          <EuiFlexItem
-            grow={false}
-            onClick={() =>
-              this.props.onTranslate(this.props.sqlQuery)
-            }
-          >
-            <EuiButton
-              className="sql-editor-button"
-              onClick={showModal}
-            >
-              Explain
-            </EuiButton>
-            {modal}
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiPanel>
-    )
-  }
-}
diff --git a/workbench/public/components/SQLPage/__snapshots__/SQLPage.test.tsx.snap b/workbench/public/components/SQLPage/__snapshots__/SQLPage.test.tsx.snap
deleted file mode 100644
index efdbd65e0d..0000000000
--- a/workbench/public/components/SQLPage/__snapshots__/SQLPage.test.tsx.snap
+++ /dev/null
@@ -1,385 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<SQLPage /> spec renders the component 1`] = `
-<div>
-  <div
-    class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow sql-console-query-editor container-panel"
-  >
-    <div
-      class="euiText euiText--medium sql-query-panel-header"
-    >
-      <h3>
-        Query editor
-      </h3>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--s"
-    />
-    <div
-      class="euiCodeEditorWrapper"
-      data-test-subj="codeEditorContainer"
-      style="width: 100%; height: 7rem;"
-    >
-      <button
-        class="euiCodeEditorKeyboardHint"
-        data-test-subj="codeEditorHint"
-        id="some_html_id"
-      >
-        <p
-          class="euiText"
-        >
-          Press Enter to start editing.
-        </p>
-        <p
-          class="euiText"
-        >
-          When you're done, press Escape to stop editing.
-        </p>
-      </button>
-      <div
-        class=" ace_editor ace-sql-console"
-        id="some_html_id"
-        style="width: 100%; height: 7rem; font-size: 14px;"
-      >
-        <textarea
-          aria-label="Code Editor"
-          autocapitalize="off"
-          autocorrect="off"
-          class="ace_text-input"
-          spellcheck="false"
-          style="opacity: 0;"
-          tabindex="-1"
-          wrap="off"
-        />
-        <div
-          aria-hidden="true"
-          class="ace_gutter"
-        >
-          <div
-            class="ace_layer ace_gutter-layer ace_folding-enabled"
-          />
-          <div
-            class="ace_gutter-active-line"
-          />
-        </div>
-        <div
-          class="ace_scroller"
-        >
-          <div
-            class="ace_content"
-          >
-            <div
-              class="ace_layer ace_print-margin-layer"
-            >
-              <div
-                class="ace_print-margin"
-                style="left: 4px; visibility: hidden;"
-              />
-            </div>
-            <div
-              class="ace_layer ace_marker-layer"
-            />
-            <div
-              class="ace_layer ace_text-layer"
-              style="padding: 0px 4px;"
-            />
-            <div
-              class="ace_layer ace_marker-layer"
-            />
-            <div
-              class="ace_layer ace_cursor-layer ace_hidden-cursors"
-            >
-              <div
-                class="ace_cursor"
-              />
-            </div>
-          </div>
-        </div>
-        <div
-          class="ace_scrollbar ace_scrollbar-v"
-          style="display: none; width: 20px;"
-        >
-          <div
-            class="ace_scrollbar-inner"
-            style="width: 20px;"
-          />
-        </div>
-        <div
-          class="ace_scrollbar ace_scrollbar-h"
-          style="display: none; height: 20px;"
-        >
-          <div
-            class="ace_scrollbar-inner"
-            style="height: 20px;"
-          />
-        </div>
-        <div
-          style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-        >
-          <div
-            style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-          />
-          <div
-            style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-          >
-            XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--l"
-    />
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionRow euiFlexGroup--responsive action-container"
-    >
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <button
-          class="euiButton euiButton--primary euiButton--fill sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Run
-            </span>
-          </span>
-        </button>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <button
-          class="euiButton euiButton--primary sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Clear
-            </span>
-          </span>
-        </button>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <button
-          class="euiButton euiButton--primary sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Explain
-            </span>
-          </span>
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<SQLPage /> spec tests the action buttons 1`] = `
-<div>
-  <div
-    class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow sql-console-query-editor container-panel"
-  >
-    <div
-      class="euiText euiText--medium sql-query-panel-header"
-    >
-      <h3>
-        Query editor
-      </h3>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--s"
-    />
-    <div
-      class="euiCodeEditorWrapper"
-      data-test-subj="codeEditorContainer"
-      style="width: 100%; height: 7rem;"
-    >
-      <button
-        class="euiCodeEditorKeyboardHint"
-        data-test-subj="codeEditorHint"
-        id="some_html_id"
-      >
-        <p
-          class="euiText"
-        >
-          Press Enter to start editing.
-        </p>
-        <p
-          class="euiText"
-        >
-          When you're done, press Escape to stop editing.
-        </p>
-      </button>
-      <div
-        class=" ace_editor ace-sql-console"
-        id="some_html_id"
-        style="width: 100%; height: 7rem; font-size: 14px;"
-      >
-        <textarea
-          aria-label="Code Editor"
-          autocapitalize="off"
-          autocorrect="off"
-          class="ace_text-input"
-          spellcheck="false"
-          style="opacity: 0;"
-          tabindex="-1"
-          wrap="off"
-        />
-        <div
-          aria-hidden="true"
-          class="ace_gutter"
-        >
-          <div
-            class="ace_layer ace_gutter-layer ace_folding-enabled"
-          />
-          <div
-            class="ace_gutter-active-line"
-          />
-        </div>
-        <div
-          class="ace_scroller"
-        >
-          <div
-            class="ace_content"
-          >
-            <div
-              class="ace_layer ace_print-margin-layer"
-            >
-              <div
-                class="ace_print-margin"
-                style="left: 4px; visibility: hidden;"
-              />
-            </div>
-            <div
-              class="ace_layer ace_marker-layer"
-            />
-            <div
-              class="ace_layer ace_text-layer"
-              style="padding: 0px 4px;"
-            />
-            <div
-              class="ace_layer ace_marker-layer"
-            />
-            <div
-              class="ace_layer ace_cursor-layer ace_hidden-cursors"
-            >
-              <div
-                class="ace_cursor"
-              />
-            </div>
-          </div>
-        </div>
-        <div
-          class="ace_scrollbar ace_scrollbar-v"
-          style="display: none; width: 20px;"
-        >
-          <div
-            class="ace_scrollbar-inner"
-            style="width: 20px;"
-          />
-        </div>
-        <div
-          class="ace_scrollbar ace_scrollbar-h"
-          style="display: none; height: 20px;"
-        >
-          <div
-            class="ace_scrollbar-inner"
-            style="height: 20px;"
-          />
-        </div>
-        <div
-          style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-        >
-          <div
-            style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-          />
-          <div
-            style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-          >
-            XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiSpacer euiSpacer--l"
-    />
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--directionRow euiFlexGroup--responsive action-container"
-    >
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <button
-          class="euiButton euiButton--primary euiButton--fill sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Run
-            </span>
-          </span>
-        </button>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <button
-          class="euiButton euiButton--primary sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Clear
-            </span>
-          </span>
-        </button>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <button
-          class="euiButton euiButton--primary sql-editor-button"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButton__content"
-          >
-            <span
-              class="euiButton__text"
-            >
-              Explain
-            </span>
-          </span>
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/workbench/public/components/app.tsx b/workbench/public/components/app.tsx
deleted file mode 100644
index 44f09b5f81..0000000000
--- a/workbench/public/components/app.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from 'react';
-import { I18nProvider } from '@osd/i18n/react';
-import { BrowserRouter as Router, Route } from 'react-router-dom';
-
-import { EuiPage, EuiPageBody } from '@elastic/eui';
-
-import { CoreStart } from '../../../../src/core/public';
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
-
-import { Main } from './Main';
-
-interface WorkbenchAppDeps {
-  basename: string;
-  notifications: CoreStart['notifications'];
-  http: CoreStart['http'];
-  navigation: NavigationPublicPluginStart;
-  chrome: CoreStart['chrome'];
-}
-
-const onChange = () => {};
-
-export const WorkbenchApp = ({ basename, notifications, http, navigation, chrome }: WorkbenchAppDeps) => {
-  return (
-    <Router basename={'/' + basename}>
-      <I18nProvider>
-        <div>
-          <EuiPage>
-            <EuiPageBody>
-              <Route 
-                path="/" 
-                render={(props) => 
-                  <Main 
-                    httpClient={http} 
-                    {...props} 
-                    setBreadcrumbs={chrome.setBreadcrumbs} 
-                  />
-                } 
-              />
-            </EuiPageBody>
-          </EuiPage>
-        </div>
-      </I18nProvider>
-    </Router>
-  );
-};
diff --git a/workbench/public/icons/minus.svg b/workbench/public/icons/minus.svg
deleted file mode 100644
index b5b887291c..0000000000
--- a/workbench/public/icons/minus.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
-	.st1{fill:#343741;}
-	.st2{fill:none;stroke:#343741;stroke-miterlimit:10;}
-</style>
-<g>
-	<path class="st1" d="M15,1v14H1V1H15 M16,0H0v16h16V0L16,0z"/>
-</g>
-<g>
-	<line class="st2" x1="2" y1="8" x2="14" y2="8"/>
-</g>
-</svg>
diff --git a/workbench/public/icons/plus.svg b/workbench/public/icons/plus.svg
deleted file mode 100644
index f4abed30f3..0000000000
--- a/workbench/public/icons/plus.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
-	.st1{fill:#343741;}
-	.st2{fill:none;stroke:#343741;stroke-miterlimit:10;}
-</style>
-<g>
-	<path class="st1" d="M15,1v14H1V1H15 M16,0H0v16h16V0L16,0z"/>
-</g>
-<g>
-	<line class="st2" x1="2" y1="8" x2="14" y2="8"/>
-</g>
-<g>
-	<line class="st2" x1="8" y1="14" x2="8" y2="2"/>
-</g>
-</svg>
diff --git a/workbench/public/icons/sql.svg b/workbench/public/icons/sql.svg
deleted file mode 100644
index 551168258e..0000000000
--- a/workbench/public/icons/sql.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;stroke:#343741;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st1{fill:none;stroke:#343741;stroke-width:2;stroke-miterlimit:10;}
-	.st2{fill:#343741;}
-</style>
-<g>
-	<rect x="1" y="1" class="st0" width="30" height="30"/>
-	<polygon class="st2" points="6,6 6,8.5 10.7,12 6,15.5 6,18 14,12 	"/>
-	<line class="st1" x1="15" y1="19" x2="26" y2="19"/>
-</g>
-</svg>
diff --git a/workbench/public/index.scss b/workbench/public/index.scss
deleted file mode 100644
index d0de8e301d..0000000000
--- a/workbench/public/index.scss
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-.ace-sql-console {
-  .ace_gutter {
-    background: rgb(237, 239, 243);
-    color: rgb(0, 0, 0);
-  }
-  .ace_print-margin {
-    width: 1px;
-    background: #e8e8e8;
-  }
-  .ace_fold {
-    background-color: #6b72e6;
-  }
-  background-color: rgb(245, 247, 250);
-  color: black;
-  .ace_marker-layer {
-    .ace_active-line.ace_active-line {
-      background-color: rgb(211, 218, 230);
-    }
-    .ace_selection {
-      background: rgb(181, 213, 255);
-    }
-    .ace_step {
-      background: rgb(252, 255, 0);
-    }
-    .ace_stack {
-      background: rgb(164, 229, 101);
-    }
-    .ace_bracket {
-      margin: -1px 0 0 -1px;
-      border: 1px solid rgb(192, 192, 192);
-    }
-    .ace_active-line {
-      background: rgba(0, 0, 0, 0.07);
-    }
-    .ace_selected-word {
-      background: rgb(250, 250, 255);
-      border: 1px solid rgb(200, 200, 250);
-    }
-  }
-  .ace_cursor {
-    color: black;
-  }
-  .ace_invisible {
-    color: rgb(191, 191, 191);
-  }
-  .ace_storage {
-    color: rgb(157, 106, 242);
-  }
-  .ace_keyword {
-    color: rgb(157, 106, 242);
-  }
-  .ace_constant {
-    color: rgb(197, 6, 11);
-  }
-  .ace_constant.ace_buildin {
-    color: rgb(88, 72, 246);
-  }
-  .ace_constant.ace_language {
-    color: rgb(88, 92, 246);
-  }
-  .ace_constant.ace_library {
-    color: rgb(6, 150, 14);
-  }
-  .ace_invalid {
-    background-color: rgba(255, 0, 0, 0.1);
-    color: red;
-  }
-  .ace_support.ace_function {
-    color: rgb(60, 76, 114);
-  }
-  .ace_support.ace_constant {
-    color: rgb(6, 150, 14);
-  }
-  .ace_support.ace_type {
-    color: rgb(109, 121, 222);
-  }
-  .ace_support.ace_class {
-    color: rgb(109, 121, 222);
-  }
-  .ace_keyword.ace_operator {
-    color: rgb(104, 118, 135);
-  }
-  .ace_string {
-    color: rgb(3, 106, 7);
-  }
-  .ace_comment {
-    color: rgb(76, 136, 107);
-  }
-  .ace_comment.ace_doc {
-    color: rgb(0, 102, 255);
-  }
-  .ace_comment.ace_doc.ace_tag {
-    color: rgb(128, 159, 191);
-  }
-  .ace_constant.ace_numeric {
-    color: rgb(0, 0, 205);
-  }
-  .ace_variable {
-    color: rgb(49, 132, 149);
-  }
-  .ace_xml-pe {
-    color: rgb(104, 104, 91);
-  }
-  .ace_entity.ace_name.ace_function {
-    color: #0000a2;
-  }
-  .ace_heading {
-    color: rgb(12, 7, 255);
-  }
-  .ace_list {
-    color: rgb(185, 6, 144);
-  }
-  .ace_meta.ace_tag {
-    color: rgb(0, 22, 142);
-  }
-  .ace_string.ace_regex {
-    color: rgb(255, 0, 0);
-  }
-  .ace_gutter-active-line {
-    background-color: rgb(211, 218, 230);
-  }
-  .ace_indent-guide {
-    background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==')
-      right repeat-y;
-  }
-}
-.ace-sql-console.ace_multiselect {
-  .ace_selection.ace_start {
-    box-shadow: 0 0 3px 0px white;
-  }
-}
-.ace_editor {
-  .ace-sql-console {
-    height: 200px;
-  }
-}
diff --git a/workbench/public/index.ts b/workbench/public/index.ts
deleted file mode 100644
index ddda203ebe..0000000000
--- a/workbench/public/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import './index.scss';
-
-import { WorkbenchPlugin } from './plugin';
-
-// This exports static code and TypeScript types,
-// as well as, OpenSearch Dashboards Platform `plugin()` initializer.
-export function plugin() {
-  return new WorkbenchPlugin();
-}
-export { WorkbenchPluginSetup, WorkbenchPluginStart } from './types';
diff --git a/workbench/public/less/main.less b/workbench/public/less/main.less
deleted file mode 100644
index d37108b08f..0000000000
--- a/workbench/public/less/main.less
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-.container {
-  margin-top: 30px;
-}
-
diff --git a/workbench/public/plugin.ts b/workbench/public/plugin.ts
deleted file mode 100644
index 11a082df7d..0000000000
--- a/workbench/public/plugin.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import { AppMountParameters, CoreSetup, CoreStart, Plugin } from '../../../src/core/public';
-import { WorkbenchPluginSetup, WorkbenchPluginStart, AppPluginStartDependencies } from './types';
-import { PLUGIN_NAME } from '../common';
-
-export class WorkbenchPlugin implements Plugin<WorkbenchPluginSetup, WorkbenchPluginStart> {
-  public setup(core: CoreSetup): WorkbenchPluginSetup {
-    // Register an application into the side navigation menu
-    core.application.register({
-      id: 'opensearch-query-workbench',
-      title: PLUGIN_NAME,
-      category: {
-        id: 'opensearch',
-        label: 'OpenSearch Plugins',
-        order: 2000,
-      },
-      order: 1000,
-      async mount(params: AppMountParameters) {
-        // Load application bundle
-        const { renderApp } = await import('./application');
-        // Get start services as specified in opensearch_dashboards.json
-        const [coreStart, depsStart] = await core.getStartServices();
-        // Render the application
-        return renderApp(coreStart, depsStart as AppPluginStartDependencies, params);
-      },
-    });
-
-    // Return methods that should be available to other plugins
-    return {};
-  }
-
-  public start(core: CoreStart): WorkbenchPluginStart {
-    return {};
-  }
-
-  public stop() {}
-}
diff --git a/workbench/public/types.ts b/workbench/public/types.ts
deleted file mode 100644
index b1fbd5bc3e..0000000000
--- a/workbench/public/types.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import { NavigationPublicPluginStart } from '../../../src/plugins/navigation/public';
-
-export interface WorkbenchPluginSetup {}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface WorkbenchPluginStart {}
-
-export interface AppPluginStartDependencies {
-  navigation: NavigationPublicPluginStart;
-}
diff --git a/workbench/public/utils/PanelWrapper.tsx b/workbench/public/utils/PanelWrapper.tsx
deleted file mode 100644
index a28f8ab73f..0000000000
--- a/workbench/public/utils/PanelWrapper.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import React from 'react'
-import { EuiPanel } from '@elastic/eui';
-
-export function PanelWrapper({ shouldWrap, children }: { shouldWrap: boolean; children: React.ReactNode }) {
-  return shouldWrap ?
-    <div style={{ backgroundColor: "#f5f7fa", padding: 25 }}>
-      <EuiPanel paddingSize="none">{children}</EuiPanel>
-    </div> : <>{children}</>;
-}
diff --git a/workbench/public/utils/constants.ts b/workbench/public/utils/constants.ts
deleted file mode 100644
index 7b93e07527..0000000000
--- a/workbench/public/utils/constants.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-// Table constants
-export const DEFAULT_NUM_RECORDS_PER_PAGE = 10;
-export const PAGE_OPTIONS = [10, 20, 50, 100];
-export const COLUMN_WIDTH = '155px';
-export const SMALL_COLUMN_WIDTH = '27px';
-
-// Tabs constants
-export const TAB_CONTAINER_ID = 'tabsContainer';
-export const MESSAGE_TAB_LABEL = 'Output';
diff --git a/workbench/public/utils/utils.ts b/workbench/public/utils/utils.ts
deleted file mode 100644
index fe8e0c04fb..0000000000
--- a/workbench/public/utils/utils.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import {ItemIdToExpandedRowMap, QueryMessage, ResponseDetail} from '../components/Main/main';
-import {MESSAGE_TAB_LABEL} from "./constants";
-
-// It returns an array of queries
-export const getQueries = (queriesString: string): string[] => {
-  if (queriesString == '') {
-    return [];
-  }
-
-  return queriesString
-    .split(';')
-    .map((query: string) => query.trim().replace(/[\r\n]+/g, ' '))
-    .filter((query: string) => query != '');
-};
-
-// It retrieves the index from the query. The index is used to label the query results tab
-export function getQueryIndex(query: string): string {
-  if (query) {
-    const queryFrom : string []= query.toLowerCase().split("from");
-
-    if (queryFrom.length > 1){
-      return queryFrom[1].split(" ")[1];
-    }
-  }
- return query;
-}
-
-// Tabs utils
-export function getDefaultTabId ( queryResults: ResponseDetail<string>[]) : string {
-  return queryResults && queryResults.length > 0 && queryResults[0].fulfilled ? "0" : MESSAGE_TAB_LABEL
-}
-
-export function getDefaultTabLabel ( queryResults: ResponseDetail<string>[], queryString: string  ) : string {
-
-  return queryResults && queryResults.length > 0 && queryResults[0].fulfilled ? getQueryIndex(queryString) : MESSAGE_TAB_LABEL
-}
-
-// It returns the results for the selected tab
-export function getSelectedResults (results: ResponseDetail<any>[], selectedTabId: string ): any {
-  const selectedIndex: number = parseInt(selectedTabId);
-  if (!Number.isNaN(selectedIndex) && results) {
-    const selectedResult: ResponseDetail<any> = results[selectedIndex];
-    return selectedResult && selectedResult.fulfilled ? selectedResult.data : undefined;
-  }
-  return undefined;
-}
-
-export function isEmpty (obj: object) : boolean {
-  for (const key in obj) {
-    if(obj.hasOwnProperty(key)) { return false; }
-  }
-  return true;
-}
-
-export function capitalizeFirstLetter(name: string): string {
-  return name && name.length > 0 ? name.charAt(0).toUpperCase() + name.slice(1) : name;
-}
-
-export function getMessageString(messages: QueryMessage[], tabNames: string[]): string {
-  return messages && messages.length > 0 && tabNames && tabNames.length > 0 ? messages.reduce( (finalMessage, message, currentIndex) => finalMessage.concat(capitalizeFirstLetter(tabNames[currentIndex]), ': ', messages[currentIndex].text, '\n\n'), '' ) : '';
-}
-
-export function scrollToNode(nodeId: string): void {
-  const element = document.getElementById(nodeId);
-  if (element) {
-    element.scrollIntoView();
-  }
-}
-
-// Download functions
-export function onDownloadFile(data: any, fileFormat: string, fileName: string) {
-  const encodedUri = encodeURIComponent(data);
-  const content = 'data:text/'+fileFormat+';charset=utf-8,' + encodedUri;
-  const link = document.createElement("a");
-  link.setAttribute('href', content);
-  link.setAttribute('download', fileName);
-  document.body.appendChild(link);
-  link.click();
-  document.body.removeChild(link);
-}
-
-export class Tree {
-  _root: Node;
-  constructor(data: any, rootId: string) {
-    this._root = new Node(data, rootId, '', this._root);
-  }
-}
-
-export class Node {
-  data: any;
-  name: string;
-  children: Node[];
-  parent: Node;
-  nodeId: string;
-
-  constructor(data: any, parentId: string, name = '', parent: Node ) {
-    this.data = data;
-    this.name = name;
-    this.children = [];
-    this.parent = parent;
-    this.nodeId = name === '' ? parentId : parentId + '_' + name;
-  }
-}
-
-// It creates a tree of nested objects or arrays for the row, where rootId is the rowId and item is the field value
-export function createRowTree(item: any, rootId: string) {
-  const tree = new Tree(item, rootId);
-  const root = tree._root;
-
-  if (typeof item === 'object') {
-    for (let j = 0; j < Object.keys(item).length; j++) {
-      const itemKey: string = Object.keys(item)[j];
-      let data = item[itemKey];
-      // If value of field is an array or an object it gets added to the tree
-      if (data !== null && (Array.isArray(data) || typeof data === 'object')) {
-        const firstNode = new Node(data, rootId, itemKey, root);
-        root.children.push(firstNode);
-      }
-    }
-  }
-  return tree;
-}
-
-// It returns the tree for the given nodeId if it exists or create a new one otherwise
-export function getRowTree(nodeId: string, item: any, expandedRowMap: ItemIdToExpandedRowMap) {
-  return expandedRowMap[nodeId] && expandedRowMap[nodeId].nodes
-    ? expandedRowMap[nodeId].nodes
-    : createRowTree(item, nodeId);
-}
-
-export function findRootNode(node: Node, expandedRowMap: ItemIdToExpandedRowMap){
-  const rootNodeId = node.nodeId.split('_')[0];
-  return expandedRowMap[rootNodeId].nodes._root;
-}
-
-/********* TABS Functions *********/
-//It checks if an element needs a scrolling
-export function needsScrolling(elementId: string){
-  const element = document.getElementById(elementId);
-  if (element === null) {
-    return false;
-  }
-  return element.scrollWidth > element.offsetWidth;
-}
diff --git a/workbench/release-notes/sql-workbench.release-notes-1.7.0.0.md b/workbench/release-notes/sql-workbench.release-notes-1.7.0.0.md
deleted file mode 100644
index 34c0ae444e..0000000000
--- a/workbench/release-notes/sql-workbench.release-notes-1.7.0.0.md
+++ /dev/null
@@ -1,51 +0,0 @@
-## 2020-05-04 Version 1.7.0.0 
-
-### Initial Release
-
-This is the first official release of Open Distro SQL Workbench.
-
-To use the SQL Workbench, you will need the [Open Distro SQL plugin](https://github.com/opendistro-for-elasticsearch/sql). This plugin you will be able to write SQL queries from a console UI directly through Kibana.
-
-
-### Features
-
-- Initialize SQL Kibana plugin ([#1](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/1))
-- SQL Kibana plugin functionality implementation ([#2](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/2))
-- Update plugin name and adjust dependency version ([#3](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/3))
-- Added kibana plugin helper configuration ([#4](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/4))
-- Adjust the service routes to call SQL plugin ([#5](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/5))
-- Bumped up the version to support v7.3 compatibility ([#6](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/6))
-- Updated configureation for v7.3 compatibility ([#7](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/7))
-- Opendistro-1.3 compatible with ES and Kibana 7.3 ([#8](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/8))
-- Changed kibana version to v7.3.2 ([#9](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/9))
-- Support v7.1.1 Compatibility ([#13](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/13))
-- Bump pr-branch to v1.3 ([#21](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/21))
-- Support v7.4 compatibility for kibana and sql-plugin ([#23](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/23))
-- Improve the performance by ridding of sending redundant requests ([#24](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/24))
-- Added raw format in download options ([#25](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/25))
-- Update the release notes for the first official release ([#27](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/27))
-- Updated test cases and snapshots ([#28](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/28))
-- Initial merge from development branches to master ([#31](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/31))
-- Support the result table to display results of DESCRIBE/SHOW/DELETE queries ([#37](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/37))
-- Adjust the appearance of SQL Workbench UI ([#38](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/38))
-- Migrated the default request format from Json to JDBC ([#41](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/41))
-- Support v7.6.1 compatibility ([#42](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/42))
-- Removed the overriding settings in css ([#44](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/44))
-- Updated outdated dependencies ([#47](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/47))
-- Updated open source code compliance ([#48](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/48))
-- Opendistro Release v1.7.0 ([#56](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/56))
-- Set up workflows for testing, building artifacts and releasing ([#58](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/58))
-- Update copyright from year 2019 to 2020 ([#59](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/59))
-- Moved release notes to dedicated folder ([#60](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/60))
-- Added contributors file ([#61](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/61))
-- Updated lastest yarn.lock for accurate dependency alert ([#62](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/62))
-- Updated snapshot ([#63](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/63))
-
-### Bug Fixes
-
-- Fixed the issue that response failed to be delivered in the console ([#10](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/10))
-- Fixed the issue that aggregation result not delivered in the table ([#26](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/26))
-- Fixed the issue that the table remains delivering the cached results table from the last query ([#30](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/30))
-- Fixed some dependency issues ([#36](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/36))
-- Fixed: fatal errors occur when import @elastic/eui modules in docker images ([#43](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/43))
-- BugFix: Corrected the downloaded .csv/.txt files to proper format ([#50](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/50))
diff --git a/workbench/release-notes/sql-workbench.release-notes-1.8.0.0.md b/workbench/release-notes/sql-workbench.release-notes-1.8.0.0.md
deleted file mode 100644
index 21e6f6d400..0000000000
--- a/workbench/release-notes/sql-workbench.release-notes-1.8.0.0.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## 2020-05-14 Version 1.8.0.0
-
-### Features
-#### Kibana Compatibility
-
-- Support v7.7.0 compatibility ([#67](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/67))
-
-#### Version 1.8.0.0 Release
-
-- Update release notes and contributors for v1.8 ([#68](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/68))
-- Update README.md ([#71](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/71))
-- Rename plugin name to sql-workbench ([#72](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/72))
diff --git a/workbench/release-notes/sql-workbench.release-notes-1.9.0.0.md b/workbench/release-notes/sql-workbench.release-notes-1.9.0.0.md
deleted file mode 100644
index fc1f38603b..0000000000
--- a/workbench/release-notes/sql-workbench.release-notes-1.9.0.0.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## 2020-06-23 Version 1.9.0.0
-
-### Features
-#### Kibana Compatibility
-
-- Support v7.8.0 compatibility ([#80](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/80))
-
-#### Version 1.9.0.0 Release
-
-- Bug fix: custom plugin icon displaying improperly ([#73](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/73))
-- Fix: column name in result table shows alias if alias exists ([#75](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/75))
diff --git a/workbench/release-notes/sql-workbench.release-notes-1.9.0.1.md b/workbench/release-notes/sql-workbench.release-notes-1.9.0.1.md
deleted file mode 100644
index 1c81c643bb..0000000000
--- a/workbench/release-notes/sql-workbench.release-notes-1.9.0.1.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## 2020-06-23 Version 1.9.0.1
-
-### Bug Fixes
-- Fix: Kibana did not load properly ([#81](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/81))
diff --git a/workbench/release-notes/sql-workbench.release-notes-1.9.0.2.md b/workbench/release-notes/sql-workbench.release-notes-1.9.0.2.md
deleted file mode 100644
index a3a87215c9..0000000000
--- a/workbench/release-notes/sql-workbench.release-notes-1.9.0.2.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## 2020-07-06 Version 1.9.0.2 (Current)
-
-### Bug Fixes
-- Fix: use column name if alias is an empty string ([#84](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/84))
diff --git a/workbench/server/clusters/index.js b/workbench/server/clusters/index.js
deleted file mode 100644
index 7e4de5785f..0000000000
--- a/workbench/server/clusters/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import createSqlCluster from './sql/createSqlCluster';
-
-export { createSqlCluster };
diff --git a/workbench/server/clusters/sql/createSqlCluster.js b/workbench/server/clusters/sql/createSqlCluster.js
deleted file mode 100644
index d7ae1e0b27..0000000000
--- a/workbench/server/clusters/sql/createSqlCluster.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import sqlPlugin from './sqlPlugin';
-import { CLUSTER, DEFAULT_HEADERS } from '../../services/utils/constants';
-
-export default function createSqlCluster(server) {
-  const { customHeaders, ...rest } = server.config().get('opensearch');
-  server.plugins.opensearch.createCluster(
-    CLUSTER.SQL,
-    {
-      plugins: [ sqlPlugin ],
-      customHeaders: { ...customHeaders, ...DEFAULT_HEADERS },
-      ...rest,
-    }
-  );
-}
diff --git a/workbench/server/clusters/sql/sqlPlugin.js b/workbench/server/clusters/sql/sqlPlugin.js
deleted file mode 100644
index df4b098b90..0000000000
--- a/workbench/server/clusters/sql/sqlPlugin.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import { SQL_TRANSLATE_ROUTE, SQL_QUERY_ROUTE, PPL_QUERY_ROUTE, PPL_TRANSLATE_ROUTE, FORMAT_CSV, FROMAT_JDBC, FORMAT_JSON, FORMAT_TEXT } from '../../services/utils/constants';
-
-export default function sqlPlugin(Client, config, components) {
-  const ca = components.clientAction.factory;
-
-  Client.prototype.sql = components.clientAction.namespaceFactory();
-  const sql = Client.prototype.sql.prototype;
-
-  sql.translateSQL = ca({
-    url: {
-      fmt: `${SQL_TRANSLATE_ROUTE}`,
-    },
-    needBody: true,
-    method: 'POST',
-  });
-
-  sql.translatePPL = ca({
-    url: {
-      fmt: `${PPL_TRANSLATE_ROUTE}`,
-    },
-    needBody: true,
-    method: 'POST',
-  });
-
-  sql.sqlQuery = ca({
-    url: {
-      fmt: `${SQL_QUERY_ROUTE}`,
-    },
-    needBody: true,
-    method: 'POST',
-  }); //default: jdbc
-
-  sql.pplQuery = ca({
-    url: {
-      fmt: `${PPL_QUERY_ROUTE}`,
-    },
-    needBody: true,
-    method: 'POST',
-  }); //default: jdbc
-
-  sql.sqlJson = ca({
-    url: {
-      fmt: `${SQL_QUERY_ROUTE}?${FORMAT_JSON}`,
-    },
-    needBody: true,
-    method: 'POST',
-  });
-
-  sql.pplJson = ca({
-    url: {
-      fmt: `${PPL_QUERY_ROUTE}?${FORMAT_JSON}`,
-    },
-    needBody: true,
-    method: 'POST',
-  });
-
-  sql.sqlCsv = ca({
-    url: {
-      fmt: `${SQL_QUERY_ROUTE}?${FORMAT_CSV}`,
-    },
-    needBody: true,
-    method: 'POST',
-  });
-
-  sql.pplCsv = ca({
-    url: {
-      fmt: `${PPL_QUERY_ROUTE}?${FORMAT_CSV}`,
-    },
-    needBody: true,
-    method: 'POST',
-  });
-
-  sql.sqlText = ca({
-    url: {
-      fmt: `${SQL_QUERY_ROUTE}?${FORMAT_TEXT}`,
-    },
-    needBody: true,
-    method: 'POST',
-  });
-
-  sql.pplText = ca({
-    url: {
-      fmt: `${PPL_QUERY_ROUTE}?${FORMAT_TEXT}`,
-    },
-    needBody: true,
-    method: 'POST',
-  });
-}
diff --git a/workbench/server/index.ts b/workbench/server/index.ts
deleted file mode 100644
index 70675883d8..0000000000
--- a/workbench/server/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import { PluginInitializerContext } from '../../../src/core/server';
-import { WorkbenchPlugin } from './plugin';
-
-//  This exports static code and TypeScript types,
-//  as well as, OpenSearch Dashboards Platform `plugin()` initializer.
-
-export function plugin(initializerContext: PluginInitializerContext) {
-  return new WorkbenchPlugin(initializerContext);
-}
-
-export { WorkbenchPluginSetup, WorkbenchPluginStart } from './types';
diff --git a/workbench/server/plugin.ts b/workbench/server/plugin.ts
deleted file mode 100644
index bf7329b103..0000000000
--- a/workbench/server/plugin.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  Logger,
-  ILegacyClusterClient,
-} from '../../../src/core/server';
-
-import { WorkbenchPluginSetup, WorkbenchPluginStart } from './types';
-import defineRoutes from './routes';
-import sqlPlugin from './clusters/sql/sqlPlugin'; 
-
-
-export class WorkbenchPlugin implements Plugin<WorkbenchPluginSetup, WorkbenchPluginStart> {
-  private readonly logger: Logger;
-
-  constructor(initializerContext: PluginInitializerContext) {
-    this.logger = initializerContext.logger.get();
-  }
-
-  public setup(core: CoreSetup) {
-    this.logger.debug('queryWorkbenchDashboards: Setup');
-    const router = core.http.createRouter();
-    const client: ILegacyClusterClient = core.opensearch.legacy.createClient(
-      'query_workbench',
-      {
-        plugins: [sqlPlugin]
-      }
-    )
-
-    // Register server side APIs
-    defineRoutes(router, client);
-
-    return {};
-  }
-
-  public start(core: CoreStart) {
-    this.logger.debug('queryWorkbenchDashboards: Started');
-    return {};
-  }
-
-  public stop() {}
-}
diff --git a/workbench/server/routes/index.ts b/workbench/server/routes/index.ts
deleted file mode 100644
index 077d0a3da5..0000000000
--- a/workbench/server/routes/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import { ILegacyClusterClient, IRouter } from '../../../../src/core/server';
-import registerTranslateRoute from './translate';
-import registerQueryRoute from './query';
-import TranslateService from '../services/TranslateService';
-import QueryService from '../services/QueryService';
-
-
-export default function (router: IRouter, client: ILegacyClusterClient) {
-  const translateService = new TranslateService(client);
-  registerTranslateRoute(router, translateService);
-
-  const queryService = new QueryService(client);
-  registerQueryRoute(router, queryService);
-}
diff --git a/workbench/server/routes/query.ts b/workbench/server/routes/query.ts
deleted file mode 100644
index 02526bb53d..0000000000
--- a/workbench/server/routes/query.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import { schema } from '@osd/config-schema';
-import { IOpenSearchDashboardsResponse, IRouter, ResponseError } from '../../../../src/core/server';
-import QueryService from '../services/QueryService';
-import {
-  ROUTE_PATH_SQL_QUERY,
-  ROUTE_PATH_PPL_QUERY,
-  ROUTE_PATH_SQL_CSV,
-  ROUTE_PATH_SQL_JSON,
-  ROUTE_PATH_SQL_TEXT,
-  ROUTE_PATH_PPL_CSV,
-  ROUTE_PATH_PPL_JSON,
-  ROUTE_PATH_PPL_TEXT,
-} from '../utils/constants';
-
-export default function query(server: IRouter, service: QueryService) {
-  server.post(
-    {
-      path: ROUTE_PATH_SQL_QUERY,
-      validate: {
-        body: schema.any(),
-      },
-    },
-    async (context, request, response): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
-      const retVal = await service.describeSQLQuery(request);
-      return response.ok({
-        body: retVal,
-      });
-    }
-  );
-
-  server.post(
-    {
-      path: ROUTE_PATH_PPL_QUERY,
-      validate: {
-        body: schema.any(),
-      },
-    },
-    async (context, request, response): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
-      const retVal = await service.describePPLQuery(request);
-      return response.ok({
-        body: retVal,
-      });
-    }
-  );
-
-  server.post(
-    {
-      path: ROUTE_PATH_SQL_CSV,
-      validate: {
-        body: schema.any(),
-      },
-    },
-    async (context, request, response): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
-      const retVal = await service.describeSQLCsv(request);
-      return response.ok({
-        body: retVal,
-      });
-    }
-  );
-
-  server.post(
-    {
-      path: ROUTE_PATH_PPL_CSV,
-      validate: {
-        body: schema.any(),
-      },
-    },
-    async (context, request, response): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
-      const retVal = await service.describePPLCsv(request);
-      return response.ok({
-        body: retVal,
-      });
-    }
-  );
-
-  server.post(
-    {
-      path: ROUTE_PATH_SQL_JSON,
-      validate: {
-        body: schema.any(),
-      },
-    },
-    async (context, request, response): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
-      const retVal = await service.describeSQLJson(request);
-      return response.ok({
-        body: retVal,
-      });
-    }
-  );
-
-  server.post(
-    {
-      path: ROUTE_PATH_PPL_JSON,
-      validate: {
-        body: schema.any(),
-      },
-    },
-    async (context, request, response): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
-      const retVal = await service.describePPLJson(request);
-      return response.ok({
-        body: retVal,
-      });
-    }
-  );
-
-  server.post(
-    {
-      path: ROUTE_PATH_SQL_TEXT,
-      validate: {
-        body: schema.any(),
-      },
-    },
-    async (context, request, response): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
-      const retVal = await service.describeSQLText(request);
-      return response.ok({
-        body: retVal,
-      });
-    }
-  );
-
-  server.post(
-    {
-      path: ROUTE_PATH_PPL_TEXT,
-      validate: {
-        body: schema.any(),
-      },
-    },
-    async (context, request, response): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
-      const retVal = await service.describePPLText(request);
-      return response.ok({
-        body: retVal,
-      });
-    }
-  );
-}
diff --git a/workbench/server/routes/translate.ts b/workbench/server/routes/translate.ts
deleted file mode 100644
index 57c7c69e49..0000000000
--- a/workbench/server/routes/translate.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import { schema } from '@osd/config-schema';
-import { IOpenSearchDashboardsResponse, IRouter, ResponseError } from '../../../../src/core/server';
-import TranslateService from '../services/TranslateService';
-
-export default function translate(server: IRouter, service: TranslateService) {
-  server.post(
-    {
-      path: '/api/sql_console/translatesql',
-      validate: {
-        body: schema.any(),
-      },
-    },
-    async (context, request, response): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
-      const retVal = await service.translateSQL(request);
-      return response.ok({
-        body: retVal,
-      });
-    }
-  );
-
-  server.post(
-    {
-      path: '/api/sql_console/translateppl',
-      validate: {
-        body: schema.any(),
-      },
-    },
-    async (context, request, response): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
-      const retVal = await service.translatePPL(request);
-      return response.ok({
-        body: retVal,
-      });
-    }
-  );
-}
diff --git a/workbench/server/services/QueryService.ts b/workbench/server/services/QueryService.ts
deleted file mode 100644
index 334257669d..0000000000
--- a/workbench/server/services/QueryService.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import 'core-js/stable';
-import 'regenerator-runtime/runtime';
-import _ from 'lodash';
-
-export default class QueryService {
-  private client: any;
-  constructor(client: any) {
-    this.client = client;
-  }
-
-  describeQueryInternal = async (request: any, format: string, responseFormat: string) => {
-    try {
-      const queryRequest = {
-        query: request.body.query,
-      };
-      const params = {
-        body: JSON.stringify(queryRequest),
-      };
-
-      const queryResponse = await this.client.asScoped(request).callAsCurrentUser(format, params);
-      return {
-        data: {
-          ok: true,
-          resp: _.isEqual(responseFormat, 'json') ? JSON.stringify(queryResponse) : queryResponse,
-        },
-      };
-    } catch (err) {
-      console.log(err);
-      return {
-        data: {
-          ok: false,
-          resp: err.message,
-          body: err.body
-        },
-      };
-    }
-  };
-
-  describeSQLQuery = async (request: any) => {
-    return this.describeQueryInternal(request, 'sql.sqlQuery', 'json');
-  };
-
-  describePPLQuery = async (request: any) => {
-    return this.describeQueryInternal(request, 'sql.pplQuery', 'json');
-  };
-
-  describeSQLCsv = async (request: any) => {
-    return this.describeQueryInternal(request, 'sql.sqlCsv', null);
-  };
-
-  describePPLCsv = async (request: any) => {
-    return this.describeQueryInternal(request, 'sql.pplCsv', null);
-  };
-
-  describeSQLJson = async (request: any) => {
-    return this.describeQueryInternal(request, 'sql.sqlJson', 'json');
-  };
-
-  describePPLJson = async (request: any) => {
-    return this.describeQueryInternal(request, 'sql.pplJson', 'json');
-  };
-
-  describeSQLText = async (request: any) => {
-    return this.describeQueryInternal(request, 'sql.sqlText', null);
-  };
-
-  describePPLText = async (request: any) => {
-    return this.describeQueryInternal(request, 'sql.pplText', null);
-  };
-}
diff --git a/workbench/server/services/TranslateService.ts b/workbench/server/services/TranslateService.ts
deleted file mode 100644
index c4b28e5699..0000000000
--- a/workbench/server/services/TranslateService.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-export default class TranslateService {
-  private client: any;
-
-  constructor(client: any) {
-    this.client = client;
-  }
-
-  translateSQL = async (request: any) => {
-    try {
-      const queryRequest = {
-        query: request.body.query,
-      };
-
-      const params = {
-        body: JSON.stringify(queryRequest),
-      };
-
-      const queryResponse = await this.client
-        .asScoped(request)
-        .callAsCurrentUser('sql.translateSQL', params);
-      const ret = {
-        data: {
-          ok: true,
-          resp: queryResponse,
-        },
-      };
-      return ret;
-    } catch (err) {
-      console.log(err);
-      return {
-        data: {
-          ok: false,
-          resp: err.message,
-        },
-      };
-    }
-  };
-
-  translatePPL = async (request: any) => {
-    try {
-      const queryRequest = {
-        query: request.body.query,
-      };
-
-      const params = {
-        body: JSON.stringify(queryRequest),
-      };
-
-      const queryResponse = await this.client
-        .asScoped(request)
-        .callAsCurrentUser('sql.translatePPL', params);
-      return {
-        data: {
-          ok: true,
-          resp: queryResponse,
-        },
-      };
-    } catch (err) {
-      console.log(err);
-      return {
-        data: {
-          ok: false,
-          resp: err.message,
-        },
-      };
-    }
-  };
-}
diff --git a/workbench/server/services/utils/constants.ts b/workbench/server/services/utils/constants.ts
deleted file mode 100644
index 043d84b53c..0000000000
--- a/workbench/server/services/utils/constants.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import { ParsedUrlQuery } from 'querystring';
-
-export const SQL_TRANSLATE_ROUTE = `/_plugins/_sql/_explain`;
-export const PPL_TRANSLATE_ROUTE = `/_plugins/_ppl/_explain`;
-export const SQL_QUERY_ROUTE = `/_plugins/_sql`;
-export const PPL_QUERY_ROUTE = `/_plugins/_ppl`;
-export const FORMAT_CSV = `format=csv`;
-export const FORMAT_JSON = `format=json`;
-export const FORMAT_TEXT = `format=raw`;
-
-export const DEFAULT_HEADERS = {
-  'Content-Type': 'application/json',
-  Accept: 'application/json',
-  'User-Agent': 'OpenSearch-Dashboards',
-};
-
-export const CLUSTER = {
-  ADMIN: 'admin',
-  SQL: 'opensearch-sql',
-  DATA: 'data',
-};
diff --git a/workbench/server/types.ts b/workbench/server/types.ts
deleted file mode 100644
index ffc99a0fbb..0000000000
--- a/workbench/server/types.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface WorkbenchPluginSetup {}
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface WorkbenchPluginStart {}
diff --git a/workbench/server/utils/constants.ts b/workbench/server/utils/constants.ts
deleted file mode 100644
index fab457eb2d..0000000000
--- a/workbench/server/utils/constants.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-export const ROUTE_PATH_SQL_QUERY = '/api/sql_console/sqlquery';
-export const ROUTE_PATH_PPL_QUERY = '/api/sql_console/pplquery';
-export const ROUTE_PATH_QUERY_CSV = '/api/sql_console/querycsv';
-export const ROUTE_PATH_SQL_CSV = '/api/sql_console/sqlcsv';
-export const ROUTE_PATH_PPL_CSV = '/api/sql_console/pplcsv';
-export const ROUTE_PATH_SQL_JSON = '/api/sql_console/sqljson';
-export const ROUTE_PATH_PPL_JSON = '/api/sql_console/ppljson';
-export const ROUTE_PATH_SQL_TEXT = '/api/sql_console/sqltext';
-export const ROUTE_PATH_PPL_TEXT = '/api/sql_console/ppltext';
diff --git a/workbench/test/jest.config.js b/workbench/test/jest.config.js
deleted file mode 100644
index 93af515b1e..0000000000
--- a/workbench/test/jest.config.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-module.exports = {
-  rootDir: "../",
-  setupFiles: ["<rootDir>/test/polyfills.ts", "<rootDir>/test/setupTests.ts"],
-  setupFilesAfterEnv: ["<rootDir>/test/setup.jest.ts"],
-  roots: ["<rootDir>"],
-  coverageDirectory: "./coverage",
-  moduleNameMapper: {
-    "\\.(css|less|scss)$": "<rootDir>/test/mocks/styleMock.ts",
-    "^ui/(.*)": "<rootDir>/../../src/ui/public/$1/",
-  },
-  coverageReporters: ["lcov", "text", "cobertura"],
-  testMatch: ["**/*.test.ts", "**/*.test.tsx"],
-  collectCoverageFrom: [
-    "!**/*.ts",
-    "**/*.tsx",
-    "!**/*.js",
-    "!**/*.jsx",
-    "!**/models/**",
-    "!**/node_modules/**",
-    "!**/index.ts",
-    "!<rootDir>/index.js",
-    "!<rootDir>/public/app.js",
-    "!<rootDir>/public/temporary/**",
-    "!<rootDir>/babel.config.js",
-    "!<rootDir>/test/**",
-    "!<rootDir>/server/**",
-    "!<rootDir>/coverage/**",
-    "!<rootDir>/scripts/**",
-    "!<rootDir>/build/**",
-    "!**/vendor/**",
-  ],
-  clearMocks: true,
-  testPathIgnorePatterns: ["<rootDir>/build/", "<rootDir>/node_modules/"],
-  testEnvironment: 'jsdom',
-};
diff --git a/workbench/test/mocks/browserServicesMock.ts b/workbench/test/mocks/browserServicesMock.ts
deleted file mode 100644
index 93b6cdcc90..0000000000
--- a/workbench/test/mocks/browserServicesMock.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import QueryService from "../../server/services/QueryService";
-import TranslateService from "../../server/services/TranslateService";
-import httpClientMock from "./httpClientMock";
-
-const queryService = new QueryService(httpClientMock);
-const translateService = new TranslateService(httpClientMock);
-
-export default { queryService, translateService };
diff --git a/workbench/test/mocks/httpClientMock.ts b/workbench/test/mocks/httpClientMock.ts
deleted file mode 100644
index 4cc4ef1372..0000000000
--- a/workbench/test/mocks/httpClientMock.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-const httpClientMock = jest.fn() as any;
-
-httpClientMock.delete = jest.fn();
-httpClientMock.get = jest.fn();
-httpClientMock.head = jest.fn();
-httpClientMock.post = jest.fn();
-httpClientMock.put = jest.fn();
-
-export default httpClientMock;
diff --git a/workbench/test/mocks/index.ts b/workbench/test/mocks/index.ts
deleted file mode 100644
index 45aabcd62b..0000000000
--- a/workbench/test/mocks/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import browserServicesMock from "./browserServicesMock";
-import httpClientMock from "./httpClientMock";
-import styleMock from "./styleMock";
-
-export { browserServicesMock, httpClientMock, styleMock };
diff --git a/workbench/test/mocks/mockData.ts b/workbench/test/mocks/mockData.ts
deleted file mode 100644
index 22b2eabaca..0000000000
--- a/workbench/test/mocks/mockData.ts
+++ /dev/null
@@ -1,2336 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// @ts-ignore
-import { SortableProperty } from "@elastic/eui/lib/services";
-
-export const mockQueryResults = [
-  {
-    "fulfilled": true,
-    "data": {
-      "fields": [
-        "category",
-        "currency",
-        "customer_first_name",
-        "customer_full_name",
-        "customer_gender",
-        "customer_id",
-        "customer_last_name",
-        "customer_phone",
-        "day_of_week",
-        "day_of_week_i",
-        "email",
-        "manufacturer",
-        "order_date",
-        "order_id",
-        "products",
-        "sku",
-        "taxful_total_price",
-        "taxless_total_price",
-        "total_quantity",
-        "total_unique_products",
-        "type",
-        "user",
-        "geoip"
-      ],
-      "records": [
-        {
-          rowId: 0,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Teddy",
-            "customer_full_name": "Teddy Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "Teddy@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "teddy",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 1,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 2,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 3,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 4,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 5,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 6,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 7,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 8,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 9,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 10,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 11,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        },
-        {
-          rowId: 12,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        }
-      ],
-      "message": "Successfull"
-    }
-  },
-  {
-    "fulfilled": true,
-    "data": {
-      "fields": [
-        "category",
-        "currency",
-        "customer_first_name",
-        "customer_full_name",
-        "customer_gender",
-        "customer_id",
-        "customer_last_name",
-        "customer_phone",
-        "day_of_week",
-        "day_of_week_i",
-        "email",
-        "manufacturer",
-        "order_date",
-        "order_id",
-        "products",
-        "sku",
-        "taxful_total_price",
-        "taxless_total_price",
-        "total_quantity",
-        "total_unique_products",
-        "type",
-        "user",
-        "geoip"
-      ],
-      "records": [
-        {
-          rowId: 0,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        }
-      ],
-      "message": "Successfull"
-    }
-  },
-  {
-    "fulfilled": true,
-    "data": {
-      "fields": [
-        "category",
-        "currency",
-        "customer_first_name",
-        "customer_full_name",
-        "customer_gender",
-        "customer_id",
-        "customer_last_name",
-        "customer_phone",
-        "day_of_week",
-        "day_of_week_i",
-        "email",
-        "manufacturer",
-        "order_date",
-        "order_id",
-        "products",
-        "sku",
-        "taxful_total_price",
-        "taxless_total_price",
-        "total_quantity",
-        "total_unique_products",
-        "type",
-        "user",
-        "geoip"
-      ],
-      "records": [
-        {
-          rowId: 0,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        }
-      ],
-      "message": "Successfull"
-    }
-  },
-  {
-    "fulfilled": true,
-    "data": {
-      "fields": [
-        "category",
-        "currency",
-        "customer_first_name",
-        "customer_full_name",
-        "customer_gender",
-        "customer_id",
-        "customer_last_name",
-        "customer_phone",
-        "day_of_week",
-        "day_of_week_i",
-        "email",
-        "manufacturer",
-        "order_date",
-        "order_id",
-        "products",
-        "sku",
-        "taxful_total_price",
-        "taxless_total_price",
-        "total_quantity",
-        "total_unique_products",
-        "type",
-        "user",
-        "geoip"
-      ],
-      "records": [
-        {
-          rowId: 0,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        }
-      ],
-      "message": "Successfull"
-    }
-  },
-  {
-    "fulfilled": true,
-    "data": {
-      "fields": [
-        "category",
-        "currency",
-        "customer_first_name",
-        "customer_full_name",
-        "customer_gender",
-        "customer_id",
-        "customer_last_name",
-        "customer_phone",
-        "day_of_week",
-        "day_of_week_i",
-        "email",
-        "manufacturer",
-        "order_date",
-        "order_id",
-        "products",
-        "sku",
-        "taxful_total_price",
-        "taxless_total_price",
-        "total_quantity",
-        "total_unique_products",
-        "type",
-        "user",
-        "geoip"
-      ],
-      "records": [
-        {
-          rowId: 0,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        }
-      ],
-      "message": "Successfull"
-    }
-  },
-  {
-    "fulfilled": true,
-    "data": {
-      "fields": [
-        "category",
-        "currency",
-        "customer_first_name",
-        "customer_full_name",
-        "customer_gender",
-        "customer_id",
-        "customer_last_name",
-        "customer_phone",
-        "day_of_week",
-        "day_of_week_i",
-        "email",
-        "manufacturer",
-        "order_date",
-        "order_id",
-        "products",
-        "sku",
-        "taxful_total_price",
-        "taxless_total_price",
-        "total_quantity",
-        "total_unique_products",
-        "type",
-        "user",
-        "geoip"
-      ],
-      "records": [
-        {
-          rowId: 0,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        }
-      ],
-      "message": "Successfull"
-    }
-  },
-  {
-    "fulfilled": true,
-    "data": {
-      "fields": [
-        "category",
-        "currency",
-        "customer_first_name",
-        "customer_full_name",
-        "customer_gender",
-        "customer_id",
-        "customer_last_name",
-        "customer_phone",
-        "day_of_week",
-        "day_of_week_i",
-        "email",
-        "manufacturer",
-        "order_date",
-        "order_id",
-        "products",
-        "sku",
-        "taxful_total_price",
-        "taxless_total_price",
-        "total_quantity",
-        "total_unique_products",
-        "type",
-        "user",
-        "geoip"
-      ],
-      "records": [
-        {
-          rowId: 0,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        }
-      ],
-      "message": "Successfull"
-    }
-  },
-  {
-    "fulfilled": true,
-    "data": {
-      "fields": [
-        "category",
-        "currency",
-        "customer_first_name",
-        "customer_full_name",
-        "customer_gender",
-        "customer_id",
-        "customer_last_name",
-        "customer_phone",
-        "day_of_week",
-        "day_of_week_i",
-        "email",
-        "manufacturer",
-        "order_date",
-        "order_id",
-        "products",
-        "sku",
-        "taxful_total_price",
-        "taxless_total_price",
-        "total_quantity",
-        "total_unique_products",
-        "type",
-        "user",
-        "geoip"
-      ],
-      "records": [
-        {
-          rowId: 0,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        }
-      ],
-      "message": "Successfull"
-    }
-  },
-  {
-    "fulfilled": true,
-    "data": {
-      "fields": [
-        "category",
-        "currency",
-        "customer_first_name",
-        "customer_full_name",
-        "customer_gender",
-        "customer_id",
-        "customer_last_name",
-        "customer_phone",
-        "day_of_week",
-        "day_of_week_i",
-        "email",
-        "manufacturer",
-        "order_date",
-        "order_id",
-        "products",
-        "sku",
-        "taxful_total_price",
-        "taxless_total_price",
-        "total_quantity",
-        "total_unique_products",
-        "type",
-        "user",
-        "geoip"
-      ],
-      "records": [
-        {
-          rowId: 0,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        }
-      ],
-      "message": "Successfull"
-    }
-  },
-  {
-    "fulfilled": true,
-    "data": {
-      "fields": [
-        "category",
-        "currency",
-        "customer_first_name",
-        "customer_full_name",
-        "customer_gender",
-        "customer_id",
-        "customer_last_name",
-        "customer_phone",
-        "day_of_week",
-        "day_of_week_i",
-        "email",
-        "manufacturer",
-        "order_date",
-        "order_id",
-        "products",
-        "sku",
-        "taxful_total_price",
-        "taxless_total_price",
-        "total_quantity",
-        "total_unique_products",
-        "type",
-        "user",
-        "geoip"
-      ],
-      "records": [
-        {
-          rowId: 0,
-          data:
-          {
-            "category": [
-              "Men's Clothing"
-            ],
-            "currency": "EUR",
-            "customer_first_name": "Eddie",
-            "customer_full_name": "Eddie Underwood",
-            "customer_gender": "MALE",
-            "customer_id": 38,
-            "customer_last_name": "Underwood",
-            "customer_phone": "",
-            "day_of_week": "Monday",
-            "day_of_week_i": 0,
-            "email": "eddie@underwood-family.zzz",
-            "manufacturer": [
-              "Elitelligence",
-              "Oceanavigations"
-            ],
-            "order_date": "2019-10-07T09:28:48+00:00",
-            "order_id": 584677,
-            "products": [
-              {
-                "base_price": 11.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Elitelligence",
-                "tax_amount": 0,
-                "product_id": 6283,
-                "category": "Men's Clothing",
-                "sku": "ZO0549605496",
-                "taxless_price": 11.99,
-                "unit_discount_amount": 0,
-                "min_price": 6.35,
-                "_id": "sold_product_584677_6283",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Basic T-shirt - dark blue/white",
-                "price": 11.99,
-                "taxful_price": 11.99,
-                "base_unit_price": 11.99
-              },
-              {
-                "base_price": 24.99,
-                "discount_percentage": 0,
-                "quantity": 1,
-                "manufacturer": "Oceanavigations",
-                "tax_amount": 0,
-                "product_id": 19400,
-                "category": "Men's Clothing",
-                "sku": "ZO0299602996",
-                "taxless_price": 24.99,
-                "unit_discount_amount": 0,
-                "min_price": 11.75,
-                "_id": "sold_product_584677_19400",
-                "discount_amount": 0,
-                "created_on": "2016-12-26T09:28:48+00:00",
-                "product_name": "Sweatshirt - grey multicolor",
-                "price": 24.99,
-                "taxful_price": 24.99,
-                "base_unit_price": 24.99
-              }
-            ],
-            "sku": [
-              "ZO0549605496",
-              "ZO0299602996"
-            ],
-            "taxful_total_price": 36.98,
-            "taxless_total_price": 36.98,
-            "total_quantity": 2,
-            "total_unique_products": 2,
-            "type": "order",
-            "user": "eddie",
-            "geoip": {
-              "country_iso_code": "EG",
-              "location": {
-                "lon": 31.3,
-                "lat": 30.1
-              },
-              "region_name": "Cairo Governorate",
-              "continent_name": "Africa",
-              "city_name": "Cairo"
-            }
-          }
-        }
-      ],
-      "message": "Successfull"
-    }
-  }
-];
-
-export const mockSortableColumns = getSortableColumns();
-
-function getSortableColumns() {
-  const sortableColumns: Array<SortableProperty<string>> = [];
-  mockQueryResults[0].data.fields.map((field: string) => {
-    sortableColumns.push({
-      name: field,
-      getValue: (item: any) => item[field],
-      isAscending: true
-    });
-  });
-  return sortableColumns;
-}
-
-
-export const mockQueries = ["select * from index_1",
-  "select * from index_2",
-  "select * from index_3",
-  "select * from index_4",
-  "select * from index_5",
-  "select * from index_6",
-  "select * from index_7",
-  "select * from index_8",
-  "select * from index_9",
-  "select * from index_10"];
-export const mockErrorMessage = [{ text: 'Error', className: 'error-message' }];
-export const mockSuccessfulMessage = [{ text: 'Successfull', className: 'successful-message' }];
-
-export const mockExpandedMap = new Map<number, { nodes: {}; expandedRow: {}; selectedNodes: {}; }>();
-mockExpandedMap[0] = {
-  expandedRow: {},
-  nodes: {},
-  selectedNodes: { "0_manufacturer": ["Elitelligence", "Oceanavigations"] }
-};
-
-export const mockQueryResultJSONResponse = {
-  "data": {
-    "ok": true,
-    "resp": "{\"took\":6,\"timed_out\":false,\"_shards\":{\"total\":1,\"successful\":1,\"skipped\":0,\"failed\":0},\"hits\":{\"total\":4675,\"max_score\":1,\"hits\":[{\"_index\":\"kibana_sample_data_ecommerce\",\"_type\":\"_doc\",\"_id\":\"zpOZZG0BTX1z5xbJBaBA\",\"_score\":1,\"_source\":{\"category\":[\"Men's Clothing\"],\"currency\":\"EUR\",\"customer_first_name\":\"Eddie\",\"customer_full_name\":\"Eddie Underwood\",\"customer_gender\":\"MALE\",\"customer_id\":38,\"customer_last_name\":\"Underwood\",\"customer_phone\":\"\",\"day_of_week\":\"Monday\",\"day_of_week_i\":0,\"email\":\"eddie@underwood-family.zzz\",\"manufacturer\":[\"Elitelligence\",\"Oceanavigations\"],\"order_date\":\"2019-10-07T09:28:48+00:00\",\"order_id\":584677,\"products\":[{\"base_price\":11.99,\"discount_percentage\":0,\"quantity\":1,\"manufacturer\":\"Elitelligence\",\"tax_amount\":0,\"product_id\":6283,\"category\":\"Men's Clothing\",\"sku\":\"ZO0549605496\",\"taxless_price\":11.99,\"unit_discount_amount\":0,\"min_price\":6.35,\"_id\":\"sold_product_584677_6283\",\"discount_amount\":0,\"created_on\":\"2016-12-26T09:28:48+00:00\",\"product_name\":\"Basic T-shirt - dark blue/white\",\"price\":11.99,\"taxful_price\":11.99,\"base_unit_price\":11.99},{\"base_price\":24.99,\"discount_percentage\":0,\"quantity\":1,\"manufacturer\":\"Oceanavigations\",\"tax_amount\":0,\"product_id\":19400,\"category\":\"Men's Clothing\",\"sku\":\"ZO0299602996\",\"taxless_price\":24.99,\"unit_discount_amount\":0,\"min_price\":11.75,\"_id\":\"sold_product_584677_19400\",\"discount_amount\":0,\"created_on\":\"2016-12-26T09:28:48+00:00\",\"product_name\":\"Sweatshirt - grey multicolor\",\"price\":24.99,\"taxful_price\":24.99,\"base_unit_price\":24.99}],\"sku\":[\"ZO0549605496\",\"ZO0299602996\"],\"taxful_total_price\":36.98,\"taxless_total_price\":36.98,\"total_quantity\":2,\"total_unique_products\":2,\"type\":\"order\",\"user\":\"eddie\",\"geoip\":{\"country_iso_code\":\"EG\",\"location\":{\"lon\":31.3,\"lat\":30.1},\"region_name\":\"Cairo Governorate\",\"continent_name\":\"Africa\",\"city_name\":\"Cairo\"}}}]}}"
-  }
-};
-
-export const mockQueryResultCSVResponse =
-{
-  "data": {
-    "ok": true,
-    "resp": "\"geoip,customer_first_name,customer_phone,type,manufacturer,products,customer_full_name,order_date,customer_last_name,day_of_week_i,total_quantity,currency,taxless_total_price,total_unique_products,category,customer_id,sku,order_id,user,customer_gender,email,day_of_week,taxful_total_price\\n{continent_name=Africa, city_name=Cairo, country_iso_code=EG, location={lon=31.3, lat=30.1}, region_name=Cairo Governorate},Eddie,,order,[Elitelligence, Oceanavigations],[{tax_amount=0, taxful_price=11.99, quantity=1, taxless_price=11.99, discount_amount=0, base_unit_price=11.99, discount_percentage=0, product_name=Basic T-shirt - dark blue/white, manufacturer=Elitelligence, min_price=6.35, created_on=2016-12-26T09:28:48+00:00, unit_discount_amount=0, price=11.99, product_id=6283, base_price=11.99, _id=sold_product_584677_6283, category=Men's Clothing, sku=ZO0549605496}, {tax_amount=0, taxful_price=24.99, quantity=1, taxless_price=24.99, discount_amount=0, base_unit_price=24.99, discount_percentage=0, product_name=Sweatshirt - grey multicolor, manufacturer=Oceanavigations, min_price=11.75, created_on=2016-12-26T09:28:48+00:00, unit_discount_amount=0, price=24.99, product_id=19400, base_price=24.99, _id=sold_product_584677_19400, category=Men's Clothing, sku=ZO0299602996}],Eddie Underwood,2019-10-07T09:28:48+00:00,Underwood,0,2,EUR,36.98,2,[Men's Clothing],38,[ZO0549605496, ZO0299602996],584677,eddie,MALE,eddie@underwood-family.zzz,Monday,36.98\""
-  }
-};
-
-export const mockQueryResultJDBCResponse =
-{
-  "data": {
-    "ok": true,
-    "resp": "{\"schema\":[{\"name\":\"type\",\"type\":\"keyword\"},{\"name\":\"day_of_week_i\",\"type\":\"integer\"},{\"name\":\"total_quantity\",\"type\":\"integer\"},{\"name\":\"taxless_total_price\",\"type\":\"half_float\"},{\"name\":\"total_unique_products\",\"type\":\"integer\"},{\"name\":\"sku\",\"type\":\"keyword\"},{\"name\":\"customer_first_name\",\"type\":\"text\"},{\"name\":\"customer_phone\",\"type\":\"keyword\"},{\"name\":\"customer_full_name\",\"type\":\"text\"},{\"name\":\"order_id\",\"type\":\"keyword\"},{\"name\":\"manufacturer\",\"type\":\"text\"},{\"name\":\"customer_last_name\",\"type\":\"text\"},{\"name\":\"currency\",\"type\":\"keyword\"},{\"name\":\"email\",\"type\":\"keyword\"},{\"name\":\"day_of_week\",\"type\":\"keyword\"},{\"name\":\"customer_birth_date\",\"type\":\"date\"},{\"name\":\"order_date\",\"type\":\"date\"},{\"name\":\"category\",\"type\":\"text\"},{\"name\":\"customer_id\",\"type\":\"keyword\"},{\"name\":\"user\",\"type\":\"keyword\"},{\"name\":\"customer_gender\",\"type\":\"keyword\"},{\"name\":\"taxful_total_price\",\"type\":\"half_float\"}],\"total\":4675,\"datarows\":[[\"order\",0,2,36.98,2,[\"ZO0549605496\",\"ZO0299602996\"],\"Eddie\",\"\",\"Eddie Underwood\",584677,[\"Elitelligence\",\"Oceanavigations\"],\"Underwood\",\"EUR\",\"eddie@underwood-family.zzz\",\"Monday\",null,\"2019-10-07T09:28:48+00:00\",[\"Men's Clothing\"],38,\"eddie\",\"MALE\",36.98],[\"order\",6,2,53.98,2,[\"ZO0489604896\",\"ZO0185501855\"],\"Mary\",\"\",\"Mary Bailey\",584021,[\"Champion Arts\",\"Pyramidustries\"],\"Bailey\",\"EUR\",\"mary@bailey-family.zzz\",\"Sunday\",null,\"2019-10-06T21:59:02+00:00\",[\"Women's Clothing\"],20,\"mary\",\"FEMALE\",53.98]],\"size\":200,\"status\":200}"
-  }
-};
-
-export const mockQueryTranslationResponse =
-{
-  "data": {
-    "ok": true,
-    "resp": "{\"from\":0,\"size\":200}"
-  }
-};
-
-export const mockNotOkQueryResultResponse =
-{
-  "data": {
-    "ok": false,
-    "resp": ""
-  }
-};
-
-export const mockResultWithNull =
-{
-  "data": {
-    "ok": true,
-    "resp": "\"schema\":[{\"name\":\"name\",\"type\":\"keyword\"},{\"name\":\"city\",\"type\":\"keyword\"}],\"datarows\":[[\"Hattie\",\"Seattle\"],[\"John\"]]"
-  }
-}
diff --git a/workbench/test/mocks/styleMock.ts b/workbench/test/mocks/styleMock.ts
deleted file mode 100644
index 09b94a4793..0000000000
--- a/workbench/test/mocks/styleMock.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-export default {};
diff --git a/workbench/test/polyfills.ts b/workbench/test/polyfills.ts
deleted file mode 100644
index 8ff420a1ed..0000000000
--- a/workbench/test/polyfills.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-// @ts-ignore
-import { MutationObserver } from "./polyfills/mutationObserver";
-
-Object.defineProperty(window, "MutationObserver", { value: MutationObserver });
diff --git a/workbench/test/polyfills/mutationObserver.js b/workbench/test/polyfills/mutationObserver.js
deleted file mode 100644
index 2024917f55..0000000000
--- a/workbench/test/polyfills/mutationObserver.js
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-/* eslint-disable */
-// transpiled typescript->javascript from
-// https://github.com/aurelia/pal-nodejs/blob/master/src/polyfills/mutation-observer.ts
-
-/*
- * Based on Shim for MutationObserver interface
- * Author: Graeme Yeates (github.com/megawac)
- * Repository: https://github.com/megawac/MutationObserver.js
- */
-import { EventEmitter } from "events";
-
-var __extends =
-  (this && this.__extends) ||
-  (function() {
-    var extendStatics =
-      Object.setPrototypeOf ||
-      ({ __proto__: [] } instanceof Array &&
-        function(d, b) {
-          d.__proto__ = b;
-        }) ||
-      function(d, b) {
-        for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-      };
-    return function(d, b) {
-      extendStatics(d, b);
-      function __() {
-        this.constructor = d;
-      }
-      d.prototype = b === null ? Object.create(b) : ((__.prototype = b.prototype), new __());
-    };
-  })();
-
-module.exports = {};
-
-Object.defineProperty(module.exports, "__esModule", { value: true });
-var Util = /** @class */ (function() {
-  function Util() {}
-  Util.clone = function($target, config) {
-    var recurse = true; // set true so childList we'll always check the first level
-    return (function copy($target) {
-      var elestruct = {
-        /** @type {Node} */
-        node: $target,
-        charData: null,
-        attr: null,
-        kids: null,
-      };
-      // Store current character data of target text or comment node if the config requests
-      // those properties to be observed.
-      if (config.charData && ($target.nodeType === 3 || $target.nodeType === 8)) {
-        elestruct.charData = $target.nodeValue;
-      } else {
-        // Add attr only if subtree is specified or top level and avoid if
-        // attributes is a document object (#13).
-        if (config.attr && recurse && $target.nodeType === 1) {
-          /**
-           * clone live attribute list to an object structure {name: val}
-           * @type {Object.<string, string>}
-           */
-          elestruct.attr = Util.reduce(
-            $target.attributes,
-            function(memo, attr) {
-              if (!config.afilter || config.afilter[attr.name]) {
-                memo[attr.name] = attr.value;
-              }
-              return memo;
-            },
-            {}
-          );
-        }
-        // whether we should iterate the children of $target node
-        if (recurse && (config.kids || config.charData || (config.attr && config.descendents))) {
-          /** @type {Array.<!Object>} : Array of custom clone */
-          elestruct.kids = Util.map($target.childNodes, copy);
-        }
-        recurse = config.descendents;
-      }
-      return elestruct;
-    })($target);
-  };
-  /**
-   * indexOf an element in a collection of custom nodes
-   *
-   * @param {NodeList} set
-   * @param {!Object} $node : A custom cloned nodeg333
-   * @param {number} idx : index to start the loop
-   * @return {number}
-   */
-  Util.indexOfCustomNode = function(set, $node, idx) {
-    var JSCompiler_renameProperty = function(a) {
-      return a;
-    };
-    return this.indexOf(set, $node, idx, JSCompiler_renameProperty("node"));
-  };
-  /**
-   * Attempt to uniquely id an element for hashing. We could optimize this for legacy browsers but it hopefully wont be called enough to be a concern
-   *
-   * @param {Node} $ele
-   * @return {(string|number)}
-   */
-  Util.getElementId = function($ele) {
-    try {
-      return $ele.id || ($ele[this.expando] = $ele[this.expando] || this.counter++);
-    } catch (e) {
-      // ie <8 will throw if you set an unknown property on a text node
-      try {
-        return $ele.nodeValue; // naive
-      } catch (shitie) {
-        // when text node is removed: https://gist.github.com/megawac/8355978 :(
-        return this.counter++;
-      }
-    }
-  };
-  /**
-   * **map** Apply a mapping function to each item of a set
-   * @param {Array|NodeList} set
-   * @param {Function} iterator
-   */
-  Util.map = function(set, iterator) {
-    var results = [];
-    for (var index = 0; index < set.length; index++) {
-      results[index] = iterator(set[index], index, set);
-    }
-    return results;
-  };
-  /**
-   * **Reduce** builds up a single result from a list of values
-   * @param {Array|NodeList|NamedNodeMap} set
-   * @param {Function} iterator
-   * @param {*} [memo] Initial value of the memo.
-   */
-  Util.reduce = function(set, iterator, memo) {
-    for (var index = 0; index < set.length; index++) {
-      memo = iterator(memo, set[index], index, set);
-    }
-    return memo;
-  };
-  /**
-   * **indexOf** find index of item in collection.
-   * @param {Array|NodeList} set
-   * @param {Object} item
-   * @param {number} idx
-   * @param {string} [prop] Property on set item to compare to item
-   */
-  Util.indexOf = function(set, item, idx, prop) {
-    for (; /*idx = ~~idx*/ idx < set.length; idx++) {
-      // start idx is always given as this is internal
-      if ((prop ? set[idx][prop] : set[idx]) === item) return idx;
-    }
-    return -1;
-  };
-  /**
-   * @param {Object} obj
-   * @param {(string|number)} prop
-   * @return {boolean}
-   */
-  Util.has = function(obj, prop) {
-    return obj[prop] !== undefined; // will be nicely inlined by gcc
-  };
-  Util.counter = 1;
-  Util.expando = "mo_id";
-  return Util;
-})();
-module.exports.Util = Util;
-var MutationObserver = /** @class */ (function() {
-  function MutationObserver(listener) {
-    var _this = this;
-    this._watched = [];
-    this._listener = null;
-    this._period = 30;
-    this._timeout = null;
-    this._disposed = false;
-    this._notifyListener = null;
-    this._watched = [];
-    this._listener = listener;
-    this._period = 30;
-    this._notifyListener = function() {
-      _this.scheduleMutationCheck(_this);
-    };
-  }
-  MutationObserver.prototype.observe = function($target, config) {
-    var settings = {
-      attr: !!(config.attributes || config.attributeFilter || config.attributeOldValue),
-      // some browsers enforce that subtree must be set with childList, attributes or characterData.
-      // We don't care as spec doesn't specify this rule.
-      kids: !!config.childList,
-      descendents: !!config.subtree,
-      charData: !!(config.characterData || config.characterDataOldValue),
-      afilter: null,
-    };
-    MutationNotifier.getInstance().on("changed", this._notifyListener);
-    var watched = this._watched;
-    // remove already observed target element from pool
-    for (var i = 0; i < watched.length; i++) {
-      if (watched[i].tar === $target) watched.splice(i, 1);
-    }
-    if (config.attributeFilter) {
-      /**
-       * converts to a {key: true} dict for faster lookup
-       * @type {Object.<String,Boolean>}
-       */
-      settings.afilter = Util.reduce(
-        config.attributeFilter,
-        function(a, b) {
-          a[b] = true;
-          return a;
-        },
-        {}
-      );
-    }
-    watched.push({
-      tar: $target,
-      fn: this.createMutationSearcher($target, settings),
-    });
-  };
-  MutationObserver.prototype.takeRecords = function() {
-    var mutations = [];
-    var watched = this._watched;
-    for (var i = 0; i < watched.length; i++) {
-      watched[i].fn(mutations);
-    }
-    return mutations;
-  };
-  MutationObserver.prototype.disconnect = function() {
-    this._watched = []; // clear the stuff being observed
-    MutationNotifier.getInstance().removeListener("changed", this._notifyListener);
-    this._disposed = true;
-    clearTimeout(this._timeout); // ready for garbage collection
-    this._timeout = null;
-  };
-  MutationObserver.prototype.createMutationSearcher = function($target, config) {
-    var _this = this;
-    /** type {Elestuct} */
-    var $oldstate = Util.clone($target, config); // create the cloned datastructure
-    /**
-     * consumes array of mutations we can push to
-     *
-     * @param {Array.<MutationRecord>} mutations
-     */
-    return function(mutations) {
-      var olen = mutations.length;
-      var dirty;
-      if (config.charData && $target.nodeType === 3 && $target.nodeValue !== $oldstate.charData) {
-        mutations.push(
-          new MutationRecord({
-            type: "characterData",
-            target: $target,
-            oldValue: $oldstate.charData,
-          })
-        );
-      }
-      // Alright we check base level changes in attributes... easy
-      if (config.attr && $oldstate.attr) {
-        _this.findAttributeMutations(mutations, $target, $oldstate.attr, config.afilter);
-      }
-      // check childlist or subtree for mutations
-      if (config.kids || config.descendents) {
-        dirty = _this.searchSubtree(mutations, $target, $oldstate, config);
-      }
-      // reclone data structure if theres changes
-      if (dirty || mutations.length !== olen) {
-        /** type {Elestuct} */
-        $oldstate = Util.clone($target, config);
-      }
-    };
-  };
-  MutationObserver.prototype.scheduleMutationCheck = function(observer) {
-    var _this = this;
-    // Only schedule if there isn't already a timer.
-    if (!observer._timeout) {
-      observer._timeout = setTimeout(function() {
-        return _this.mutationChecker(observer);
-      }, this._period);
-    }
-  };
-  MutationObserver.prototype.mutationChecker = function(observer) {
-    // allow scheduling a new timer.
-    observer._timeout = null;
-    var mutations = observer.takeRecords();
-    if (mutations.length) {
-      // fire away
-      // calling the listener with context is not spec but currently consistent with FF and WebKit
-      observer._listener(mutations, observer);
-    }
-  };
-  MutationObserver.prototype.searchSubtree = function(mutations, $target, $oldstate, config) {
-    var _this = this;
-    // Track if the tree is dirty and has to be recomputed (#14).
-    var dirty;
-    /*
-     * Helper to identify node rearrangment and stuff...
-     * There is no gaurentee that the same node will be identified for both added and removed nodes
-     * if the positions have been shuffled.
-     * conflicts array will be emptied by end of operation
-     */
-    var _resolveConflicts = function(conflicts, node, $kids, $oldkids, numAddedNodes) {
-      // the distance between the first conflicting node and the last
-      var distance = conflicts.length - 1;
-      // prevents same conflict being resolved twice consider when two nodes switch places.
-      // only one should be given a mutation event (note -~ is used as a math.ceil shorthand)
-      var counter = -~((distance - numAddedNodes) / 2);
-      var $cur;
-      var oldstruct;
-      var conflict;
-      while ((conflict = conflicts.pop())) {
-        $cur = $kids[conflict.i];
-        oldstruct = $oldkids[conflict.j];
-        // attempt to determine if there was node rearrangement... won't gaurentee all matches
-        // also handles case where added/removed nodes cause nodes to be identified as conflicts
-        if (config.kids && counter && Math.abs(conflict.i - conflict.j) >= distance) {
-          mutations.push(
-            new MutationRecord({
-              type: "childList",
-              target: node,
-              addedNodes: [$cur],
-              removedNodes: [$cur],
-              // haha don't rely on this please
-              nextSibling: $cur.nextSibling,
-              previousSibling: $cur.previousSibling,
-            })
-          );
-          counter--; // found conflict
-        }
-        // Alright we found the resorted nodes now check for other types of mutations
-        if (config.attr && oldstruct.attr) _this.findAttributeMutations(mutations, $cur, oldstruct.attr, config.afilter);
-        if (config.charData && $cur.nodeType === 3 && $cur.nodeValue !== oldstruct.charData) {
-          mutations.push(
-            new MutationRecord({
-              type: "characterData",
-              target: $cur,
-              oldValue: oldstruct.charData,
-            })
-          );
-        }
-        // now look @ subtree
-        if (config.descendents) _findMutations($cur, oldstruct);
-      }
-    };
-    /**
-     * Main worker. Finds and adds mutations if there are any
-     * @param {Node} node
-     * @param {!Object} old : A cloned data structure using internal clone
-     */
-    var _findMutations = function(node, old) {
-      var $kids = node.childNodes;
-      var $oldkids = old.kids;
-      var klen = $kids.length;
-      // $oldkids will be undefined for text and comment nodes
-      var olen = $oldkids ? $oldkids.length : 0;
-      // if (!olen && !klen) return; // both empty; clearly no changes
-      // we delay the intialization of these for marginal performance in the expected case (actually quite signficant on large subtrees when these would be otherwise unused)
-      // map of checked element of ids to prevent registering the same conflict twice
-      var map;
-      // array of potential conflicts (ie nodes that may have been re arranged)
-      var conflicts;
-      var id; // element id from getElementId helper
-      var idx; // index of a moved or inserted element
-      var oldstruct;
-      // current and old nodes
-      var $cur;
-      var $old;
-      // track the number of added nodes so we can resolve conflicts more accurately
-      var numAddedNodes = 0;
-      // iterate over both old and current child nodes at the same time
-      var i = 0;
-      var j = 0;
-      // while there is still anything left in $kids or $oldkids (same as i < $kids.length || j < $oldkids.length;)
-      while (i < klen || j < olen) {
-        // current and old nodes at the indexs
-        $cur = $kids[i];
-        oldstruct = $oldkids[j];
-        $old = oldstruct && oldstruct.node;
-        if ($cur === $old) {
-          // expected case - optimized for this case
-          // check attributes as specified by config
-          if (config.attr && oldstruct.attr) {
-            /* oldstruct.attr instead of textnode check */
-            _this.findAttributeMutations(mutations, $cur, oldstruct.attr, config.afilter);
-          }
-          // check character data if node is a comment or textNode and it's being observed
-          if (config.charData && oldstruct.charData !== undefined && $cur.nodeValue !== oldstruct.charData) {
-            mutations.push(
-              new MutationRecord({
-                type: "characterData",
-                target: $cur,
-              })
-            );
-          }
-          // resolve conflicts; it will be undefined if there are no conflicts - otherwise an array
-          if (conflicts) _resolveConflicts(conflicts, node, $kids, $oldkids, numAddedNodes);
-          // recurse on next level of children. Avoids the recursive call when there are no children left to iterate
-          if (config.descendents && ($cur.childNodes.length || (oldstruct.kids && oldstruct.kids.length))) _findMutations($cur, oldstruct);
-          i++;
-          j++;
-        } else {
-          // (uncommon case) lookahead until they are the same again or the end of children
-          dirty = true;
-          if (!map) {
-            // delayed initalization (big perf benefit)
-            map = {};
-            conflicts = [];
-          }
-          if ($cur) {
-            // check id is in the location map otherwise do a indexOf search
-            if (!map[(id = Util.getElementId($cur))]) {
-              // to prevent double checking
-              // mark id as found
-              map[id] = true;
-              // custom indexOf using comparitor checking oldkids[i].node === $cur
-              if ((idx = Util.indexOfCustomNode($oldkids, $cur, j)) === -1) {
-                if (config.kids) {
-                  mutations.push(
-                    new MutationRecord({
-                      type: "childList",
-                      target: node,
-                      addedNodes: [$cur],
-                      nextSibling: $cur.nextSibling,
-                      previousSibling: $cur.previousSibling,
-                    })
-                  );
-                  numAddedNodes++;
-                }
-              } else {
-                conflicts.push({
-                  i: i,
-                  j: idx,
-                });
-              }
-            }
-            i++;
-          }
-          if (
-            $old &&
-            // special case: the changes may have been resolved: i and j appear congurent so we can continue using the expected case
-            $old !== $kids[i]
-          ) {
-            if (!map[(id = Util.getElementId($old))]) {
-              map[id] = true;
-              if ((idx = Util.indexOf($kids, $old, i)) === -1) {
-                if (config.kids) {
-                  mutations.push(
-                    new MutationRecord({
-                      type: "childList",
-                      target: old.node,
-                      removedNodes: [$old],
-                      nextSibling: $oldkids[j + 1],
-                      previousSibling: $oldkids[j - 1],
-                    })
-                  );
-                  numAddedNodes--;
-                }
-              } else {
-                conflicts.push({
-                  i: idx,
-                  j: j,
-                });
-              }
-            }
-            j++;
-          }
-        } // end uncommon case
-      } // end loop
-      // resolve any remaining conflicts
-      if (conflicts) _resolveConflicts(conflicts, node, $kids, $oldkids, numAddedNodes);
-    };
-    _findMutations($target, $oldstate);
-    return dirty;
-  };
-  MutationObserver.prototype.findAttributeMutations = function(mutations, $target, $oldstate, filter) {
-    var checked = {};
-    var attributes = $target.attributes;
-    var attr;
-    var name;
-    var i = attributes.length;
-    while (i--) {
-      attr = attributes[i];
-      name = attr.name;
-      if (!filter || Util.has(filter, name)) {
-        if (attr.value !== $oldstate[name]) {
-          // The pushing is redundant but gzips very nicely
-          mutations.push(
-            new MutationRecord({
-              type: "attributes",
-              target: $target,
-              attributeName: name,
-              oldValue: $oldstate[name],
-              attributeNamespace: attr.namespaceURI, // in ie<8 it incorrectly will return undefined
-            })
-          );
-        }
-        checked[name] = true;
-      }
-    }
-    for (name in $oldstate) {
-      if (!checked[name]) {
-        mutations.push(
-          new MutationRecord({
-            target: $target,
-            type: "attributes",
-            attributeName: name,
-            oldValue: $oldstate[name],
-          })
-        );
-      }
-    }
-  };
-  return MutationObserver;
-})();
-module.exports.MutationObserver = MutationObserver;
-var MutationRecord = /** @class */ (function() {
-  function MutationRecord(data) {
-    var settings = {
-      type: null,
-      target: null,
-      addedNodes: [],
-      removedNodes: [],
-      previousSibling: null,
-      nextSibling: null,
-      attributeName: null,
-      attributeNamespace: null,
-      oldValue: null,
-    };
-    for (var prop in data) {
-      if (Util.has(settings, prop) && data[prop] !== undefined) settings[prop] = data[prop];
-    }
-    return settings;
-  }
-  return MutationRecord;
-})();
-module.exports.MutationRecord = MutationRecord;
-var MutationNotifier = /** @class */ (function(_super) {
-  __extends(MutationNotifier, _super);
-  function MutationNotifier() {
-    var _this = _super.call(this) || this;
-    _this.setMaxListeners(100);
-    return _this;
-  }
-  MutationNotifier.getInstance = function() {
-    if (!MutationNotifier._instance) {
-      MutationNotifier._instance = new MutationNotifier();
-    }
-    return MutationNotifier._instance;
-  };
-  MutationNotifier.prototype.destruct = function() {
-    this.removeAllListeners("changed");
-  };
-  MutationNotifier.prototype.notifyChanged = function(node) {
-    this.emit("changed", node);
-  };
-  MutationNotifier._instance = null;
-  return MutationNotifier;
-})(EventEmitter);
-module.exports.MutationNotifier = MutationNotifier;
diff --git a/workbench/test/setup.jest.ts b/workbench/test/setup.jest.ts
deleted file mode 100644
index 84bb96f217..0000000000
--- a/workbench/test/setup.jest.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-import "@testing-library/jest-dom/extend-expect";
-import 'mutationobserver-shim';
-import { configure } from "@testing-library/react";
-
-configure({ testIdAttribute: "data-test-subj" });
-
-jest.mock("@elastic/eui/lib/components/form/form_row/make_id", () => () => "some_make_id");
-
-jest.mock("@elastic/eui/lib/services/accessibility/html_id_generator", () => ({
-  htmlIdGenerator: () => {
-    return () => "some_html_id";
-  },
-}));
-
-// @ts-ignore
-window.Worker = function() {
-  this.postMessage = () => {};
-  // @ts-ignore
-  this.terminate = () => {};
-};
-
-// @ts-ignore
-window.URL = {
-  createObjectURL: () => {
-    return "";
-  },
-};
-
-jest.mock("@elastic/eui/lib/components/icon", () => ({
-  EuiIcon: () => "EuiIconMock",
-  __esModule: true,
-  IconPropType: require("@elastic/eui/lib/components/icon/icon").IconPropType,
-  ICON_TYPES: require("@elastic/eui/lib/components/icon/icon").TYPES,
-  ICON_SIZES: require("@elastic/eui/lib/components/icon/icon").SIZES,
-  ICON_COLORS: require("@elastic/eui/lib/components/icon/icon").COLORS,
-}));
diff --git a/workbench/test/setupTests.ts b/workbench/test/setupTests.ts
deleted file mode 100644
index 76e7c5bb43..0000000000
--- a/workbench/test/setupTests.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-require("babel-polyfill");
diff --git a/workbench/tsconfig.json b/workbench/tsconfig.json
deleted file mode 100644
index 628e2972a5..0000000000
--- a/workbench/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  // extend OpenSearch Dashboard's tsconfig, or use your own settings
-  "extends": "../../tsconfig.json",
-
-  // tell the TypeScript compiler where to find your source files
-  "include": ["server/**/*", "public/**/*", "test/**/*", "babel.config.js"],
-  "exclude": ["node_modules", "*/node_modules/"],
-
-  "compilerOptions": {
-    "skipLibCheck": true,
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": false,
-    "suppressImplicitAnyIndexErrors": true,
-    "lib": ["es5", "es2015", "es2017", "dom"]
-  }
-}
diff --git a/workbench/tslint.yaml b/workbench/tslint.yaml
deleted file mode 100644
index 89fec1d0af..0000000000
--- a/workbench/tslint.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-extends:
-  - tslint:recommended
-  - tslint-plugin-prettier
-  - tslint-config-prettier
-
-rulesDirectory:
-  - tslint-plugin-prettier
-  - src/dev/tslint/rules
-
-rules:
-  prettier: true
-  object-literal-sort-keys: false
-  interface-name: false
-  no-default-export: true
-  require-license-header:
-    - true
-    - |-
-      /*
-      * Copyright OpenSearch Contributors
-      * SPDX-License-Identifier: Apache-2.0
-      */
-  disallow-license-header:
-    - true
-    - |-
-      /*
-       * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-       * or more contributor license agreements. Licensed under the Elastic License;
-       * you may not use this file except in compliance with the Elastic License.
-       */
diff --git a/workbench/webpack.config.js b/workbench/webpack.config.js
deleted file mode 100644
index d8b2928085..0000000000
--- a/workbench/webpack.config.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-const path = require('path');
-import './public/ace-themes/sql_console.css';
-
-module.exports = {
-  debug: true,
-  mode: 'development',
-  entry: 'public/ace-themes/sql_console.css',
-  resolve: {
-    extensions: ['', '.js', '.jsx', '.ts', '.tsx']
-  },
-  module: {
-    rules: [
-      {
-        test: /\.css$/,
-        use: [
-          'style-loader',
-          {
-            loader: 'css-loader',
-            options: {
-              importLoaders: 1,
-              modules: true
-            }
-          }
-        ],
-        include: /\.module\.css$/
-      },
-      {
-        test: /\.css$/,
-        use: [
-          'style-loader',
-          'css-loader'
-        ],
-        exclude: /\.module\.css$/
-      }
-    ]
-  }
-}
diff --git a/workbench/yarn.lock b/workbench/yarn.lock
deleted file mode 100644
index 58182914c4..0000000000
--- a/workbench/yarn.lock
+++ /dev/null
@@ -1,2900 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@babel/code-frame@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
-  dependencies:
-    "@babel/highlight" "^7.18.6"
-
-"@babel/helper-validator-identifier@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
-  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
-
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/runtime@^7.12.5", "@babel/runtime@^7.7.6":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a"
-  integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@colors/colors@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
-  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
-
-"@cypress/listr-verbose-renderer@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#a77492f4b11dcc7c446a34b3e28721afd33c642a"
-  integrity sha512-EDiBsVPWC27DDLEJCo+dpl9ODHhdrwU57ccr9tspwCdG2ni0QVkf6LF0FGbhfujcjPxnXLIwsaks4sOrwrA4Qw==
-  dependencies:
-    chalk "^1.1.3"
-    cli-cursor "^1.0.2"
-    date-fns "^1.27.2"
-    figures "^1.7.0"
-
-"@cypress/request@^2.88.5":
-  version "2.88.10"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
-  integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    http-signature "~1.3.6"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^8.3.2"
-
-"@cypress/xvfb@^1.2.4":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a"
-  integrity sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==
-  dependencies:
-    debug "^3.1.0"
-    lodash.once "^4.1.1"
-
-"@hapi/hoek@^9.0.0":
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
-  integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
-
-"@hapi/topo@^5.0.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
-  integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
-  dependencies:
-    "@hapi/hoek" "^9.0.0"
-
-"@jest/types@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
-  integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^13.0.0"
-
-"@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
-
-"@samverschueren/stream-to-observable@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301"
-  integrity sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==
-  dependencies:
-    any-observable "^0.3.0"
-
-"@sideway/address@^4.1.3":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
-  integrity sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==
-  dependencies:
-    "@hapi/hoek" "^9.0.0"
-
-"@sideway/formula@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c"
-  integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==
-
-"@sideway/pinpoint@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
-  integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
-
-"@testing-library/user-event@^13.1.9":
-  version "13.5.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-13.5.0.tgz#69d77007f1e124d55314a2b73fd204b333b13295"
-  integrity sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-
-"@types/angular@^1.6.50":
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.8.4.tgz#a2cc163e508389c51d4c4119ebff6b9395cec472"
-  integrity sha512-wPS/ncJWhyxJsndsW1B6Ta8D4mi97x1yItSu+rkLDytU3oRIh2CFAjMuJceYwFAh9+DIohndWM0QBA9OU2Hv0g==
-
-"@types/boom@*":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@types/boom/-/boom-7.3.2.tgz#6269480d11098c26cfbfca5059403902a530847a"
-  integrity sha512-W8+6CANZz/BmgzATboKXvEDtO3SHSj86omcU/2pMCkUQhqhgucB8sgcmdRadXDEvXFRiRhME0rcyj1GIj3LC9w==
-
-"@types/catbox@*":
-  version "10.0.7"
-  resolved "https://registry.yarnpkg.com/@types/catbox/-/catbox-10.0.7.tgz#50a0f927924ace358cc0193c6d9f1790d4219fa6"
-  integrity sha512-8vjnM1eyHKwWfcbq7qb2NN4ltUgm4nVsT9QIM6IW4KqxbQbfQLbRApNTN+B3hvHvuFTHyvhJjZrBY3wNPp4tjA==
-
-"@types/hapi-latest@npm:@types/hapi@18.0.3":
-  version "18.0.3"
-  resolved "https://registry.yarnpkg.com/@types/hapi/-/hapi-18.0.3.tgz#e74c019f6a1b1c7f647fe014d3890adec9c0214a"
-  integrity sha512-UM03myDZ2UWbpqLSZqboK4L98F9r4GCcd9JOr2auhgC3iOd/69mvDggivOHhOYJKWHeCW/dECPHIB7DwQz00dw==
-  dependencies:
-    "@types/boom" "*"
-    "@types/catbox" "*"
-    "@types/iron" "*"
-    "@types/joi" "*"
-    "@types/mimos" "*"
-    "@types/node" "*"
-    "@types/podium" "*"
-    "@types/shot" "*"
-
-"@types/history@*":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@types/history/-/history-5.0.0.tgz#29f919f0c8e302763798118f45b19cab4a886f14"
-  integrity sha512-hy8b7Y1J8OGe6LbAjj3xniQrj3v6lsivCcrmf4TzSgPzLkhIeKgc5IZnT7ReIqmEuodjfO8EYAuoFvIrHi/+jQ==
-  dependencies:
-    history "*"
-
-"@types/history@^4.7.11":
-  version "4.7.11"
-  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64"
-  integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==
-
-"@types/iron@*":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@types/iron/-/iron-5.0.2.tgz#d64771b5c1d87d3c1a8a5bcaa3e02259069b8672"
-  integrity sha512-u1l5xO5BtLlPfeiy60vrC9Y30cR8gM7chD5npIAETZaOlGoT8KHqtQQpmlU5dZejhJSfIBSX0zBHnKW+0fw5qA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
-  integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
-
-"@types/istanbul-lib-report@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
-  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^1.1.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"
-  integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-    "@types/istanbul-lib-report" "*"
-
-"@types/istanbul-reports@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
-  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
-  dependencies:
-    "@types/istanbul-lib-report" "*"
-
-"@types/jest@^24.0.9":
-  version "24.9.1"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.1.tgz#02baf9573c78f1b9974a5f36778b366aa77bd534"
-  integrity sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==
-  dependencies:
-    jest-diff "^24.3.0"
-
-"@types/joi@*":
-  version "17.2.3"
-  resolved "https://registry.yarnpkg.com/@types/joi/-/joi-17.2.3.tgz#b7768ed9d84f1ebd393328b9f97c1cf3d2b94798"
-  integrity sha512-dGjs/lhrWOa+eO0HwgxCSnDm5eMGCsXuvLglMghJq32F6q5LyyNuXb41DHzrg501CKNOSSAHmfB7FDGeUnDmzw==
-  dependencies:
-    joi "*"
-
-"@types/mime-db@*":
-  version "1.43.1"
-  resolved "https://registry.yarnpkg.com/@types/mime-db/-/mime-db-1.43.1.tgz#c2a0522453bb9b6e84ee48b7eef765d19bcd519e"
-  integrity sha512-kGZJY+R+WnR5Rk+RPHUMERtb2qBRViIHCBdtUrY+NmwuGb8pQdfTqQiCKPrxpdoycl8KWm2DLdkpoSdt479XoQ==
-
-"@types/mimos@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/mimos/-/mimos-3.0.3.tgz#c1a35a5c31ae99eb86e6607962280c05989f3e57"
-  integrity sha512-jtStUPuHpJ+LVK+e1K9SbD2V00IOAqAKgVVkBRmCdHG20VQaE3KOt7FincknY1uyyZNq7MKF44Gs0fon2v9oig==
-  dependencies:
-    "@types/mime-db" "*"
-
-"@types/node@*", "@types/node@^10.12.27":
-  version "10.17.60"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
-  integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
-
-"@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
-
-"@types/podium@*":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/podium/-/podium-1.0.1.tgz#f51a419959584f2ffb8f849e5b33f2b99f7ee1f9"
-  integrity sha512-dcg8V5wKgrvNIBk2hzgK3gHobZ0u7pXW36NigfJq+lBA+/fqI6GAI0bdjLAEkZC67EsaVErtePkqipJPsszN7Q==
-
-"@types/prop-types@*":
-  version "15.7.5"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
-  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
-
-"@types/react-dom@^16.0.5":
-  version "16.9.16"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.16.tgz#c591f2ed1c6f32e9759dfa6eb4abfd8041f29e39"
-  integrity sha512-Oqc0RY4fggGA3ltEgyPLc3IV9T73IGoWjkONbsyJ3ZBn+UPPCYpU2ec0i3cEbJuEdZtkqcCF2l1zf2pBdgUGSg==
-  dependencies:
-    "@types/react" "^16"
-
-"@types/react-router-dom@^4.3.1":
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.5.tgz#72f229967690c890d00f96e6b85e9ee5780db31f"
-  integrity sha512-eFajSUASYbPHg2BDM1G8Btx+YqGgvROPIg6sBhl3O4kbDdYXdFdfrgQFf/pcBuQVObjfT9AL/dd15jilR5DIEA==
-  dependencies:
-    "@types/history" "*"
-    "@types/react" "*"
-    "@types/react-router" "*"
-
-"@types/react-router-dom@^5.3.2":
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83"
-  integrity sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==
-  dependencies:
-    "@types/history" "^4.7.11"
-    "@types/react" "*"
-    "@types/react-router" "*"
-
-"@types/react-router@*":
-  version "5.1.18"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.18.tgz#c8851884b60bc23733500d86c1266e1cfbbd9ef3"
-  integrity sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==
-  dependencies:
-    "@types/history" "^4.7.11"
-    "@types/react" "*"
-
-"@types/react@*", "@types/react@^16", "@types/react@^16.3.14":
-  version "16.14.33"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.33.tgz#eec5863d4d7814da37bc43b039a9ff9561e33f1b"
-  integrity sha512-JO6dkVjLvlAJi7wnGDgqlBdaePNSmUgyw5sS7HLy4B5F1+4Drztbx3SS8klecRvfp5y25YLYv/zq6O27FDh8gQ==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/scheduler@*":
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
-  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
-
-"@types/shot@*":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@types/shot/-/shot-4.0.1.tgz#a50f56bde37db57184cdb43174ba4fea9c0c7897"
-  integrity sha512-LUJWxDKYWmmUpVXDWZ78hFIrqb/ho9RoKqBAFRJw4OHOS3qCKCoXCyzrfmf24lbO4COYfqL0iEWNArOfKEYW9g==
-  dependencies:
-    "@types/node" "*"
-
-"@types/sinonjs__fake-timers@^6.0.1":
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz#0ecc1b9259b76598ef01942f547904ce61a6a77d"
-  integrity sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A==
-
-"@types/sizzle@^2.3.2":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef"
-  integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==
-
-"@types/yargs-parser@*":
-  version "21.0.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
-  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
-
-"@types/yargs@^13.0.0":
-  version "13.0.12"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.12.tgz#d895a88c703b78af0465a9de88aa92c61430b092"
-  integrity sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-"@types/yargs@^15.0.0":
-  version "15.0.14"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06"
-  integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-acorn-jsx@^5.2.0:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn@^7.1.1:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-ajv@^6.10.0, ajv@^6.10.2:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-colors@^4.1.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
-  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
-
-ansi-escapes@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
-ansi-regex@^2.0.0, ansi-regex@^3.0.0, ansi-regex@^4.0.0, ansi-regex@^4.1.0, ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-any-observable@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
-  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
-
-arch@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
-  integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
-
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
-
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
-async@^3.2.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
-  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
-  dependencies:
-    tweetnacl "^0.14.3"
-
-blob-util@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
-  integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==
-
-bluebird@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-brace@0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58"
-  integrity sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q==
-
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-bs-logger@0.x:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
-  integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
-  dependencies:
-    fast-json-stable-stringify "2.x"
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
-
-buffer-from@1.x, buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-
-builtin-modules@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==
-
-cachedir@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
-  integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
-
-chalk@^1.0.0, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-check-more-types@^2.24.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
-  integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==
-
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-cli-cursor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  integrity sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-cursor@^2.0.0, cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==
-  dependencies:
-    restore-cursor "^2.0.0"
-
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-table3@~0.6.0:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
-  integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
-  dependencies:
-    string-width "^4.2.0"
-  optionalDependencies:
-    "@colors/colors" "1.5.0"
-
-cli-truncate@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-  integrity sha512-f4r4yJnbT++qUPI9NR4XLDLq41gQ+uqnPItWG0F5ZkehuNiTTa3EY0S4AqTSUOeJ7/zU41oWPQSNkW5BqPL9bg==
-  dependencies:
-    slice-ansi "0.0.4"
-    string-width "^1.0.1"
-
-cli-truncate@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
-  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
-  dependencies:
-    slice-ansi "^3.0.0"
-    string-width "^4.2.0"
-
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-colorette@^2.0.16:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
-  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@^2.12.1:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
-
-commander@^6.2.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
-  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
-
-common-tags@^1.8.0:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
-  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
-
-compare-versions@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
-  integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-concat-stream@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
-
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
-cosmiconfig@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
-  integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
-cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^7.0.0:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-csstype@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
-  integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
-
-cypress@^5.0.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-5.6.0.tgz#6781755c3ddfd644ce3179fcd7389176c0c82280"
-  integrity sha512-cs5vG3E2JLldAc16+5yQxaVRLLqMVya5RlrfPWkC72S5xrlHFdw7ovxPb61s4wYweROKTyH01WQc2PFzwwVvyQ==
-  dependencies:
-    "@cypress/listr-verbose-renderer" "^0.4.1"
-    "@cypress/request" "^2.88.5"
-    "@cypress/xvfb" "^1.2.4"
-    "@types/sinonjs__fake-timers" "^6.0.1"
-    "@types/sizzle" "^2.3.2"
-    arch "^2.1.2"
-    blob-util "2.0.2"
-    bluebird "^3.7.2"
-    cachedir "^2.3.0"
-    chalk "^4.1.0"
-    check-more-types "^2.24.0"
-    cli-table3 "~0.6.0"
-    commander "^5.1.0"
-    common-tags "^1.8.0"
-    debug "^4.1.1"
-    eventemitter2 "^6.4.2"
-    execa "^4.0.2"
-    executable "^4.1.1"
-    extract-zip "^1.7.0"
-    fs-extra "^9.0.1"
-    getos "^3.2.1"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.3.2"
-    lazy-ass "^1.6.0"
-    listr "^0.14.3"
-    lodash "^4.17.19"
-    log-symbols "^4.0.0"
-    minimist "^1.2.5"
-    moment "^2.27.0"
-    ospath "^1.2.2"
-    pretty-bytes "^5.4.1"
-    ramda "~0.26.1"
-    request-progress "^3.0.0"
-    supports-color "^7.2.0"
-    tmp "~0.2.1"
-    untildify "^4.0.0"
-    url "^0.11.0"
-    yauzl "^2.10.0"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
-  dependencies:
-    assert-plus "^1.0.0"
-
-date-fns@^1.27.2:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
-
-debug@^2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.0.1, debug@^4.1.1, debug@^4.2.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
-
-deep-is@~0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
-diff-sequences@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
-  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
-
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-elegant-spinner@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-  integrity sha512-B+ZM+RXvRqQaAmkMlO/oSe5nMUOaUnyfGYCEHoR8wrXsZR2mA0XVibsxV1bvTwxdRWah1PkQqso2EzhILGHtEQ==
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-enquirer@^2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
-eslint-plugin-no-unsanitized@^3.0.2:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.2.0.tgz#a74239ae51363a5edbe6920eb34fe09aab925a9c"
-  integrity sha512-92opuXbjWmXcod94EyCKhp36V1QHLM/ArAST2ssgKOojALne0eZvSPfrg4oyr0EwTXvy0RJNe/Tkm33VkDUrKQ==
-
-eslint-plugin-prefer-object-spread@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-object-spread/-/eslint-plugin-prefer-object-spread-1.2.1.tgz#27fb91853690cceb3ae6101d9c8aecc6a67a402c"
-  integrity sha512-upA2W299LZNr49tGHmF0wUtFZw/fkQ+PkudsjZ0bP7dGFtRCFxItFtP39nDiet8u6rN/pOqhEYhBltW6T1OF5g==
-
-eslint-plugin-prettier@^2.2.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz#b4312dcf2c1d965379d7f9d5b5f8aaadc6a45904"
-  integrity sha512-CStQYJgALoQBw3FsBzH0VOVDRnJ/ZimUlpLm226U8qgqYJfPOY/CPK6wyRInMxh73HSKg5wyRwdS4BVYYHwokA==
-  dependencies:
-    fast-diff "^1.1.1"
-    jest-docblock "^21.0.0"
-
-eslint-scope@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-utils@^1.4.3, eslint-utils@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-visitor-keys@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint@^6.8.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
-  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    ajv "^6.10.0"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^1.4.3"
-    eslint-visitor-keys "^1.1.0"
-    espree "^6.1.2"
-    esquery "^1.0.1"
-    esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    inquirer "^7.0.0"
-    is-glob "^4.0.0"
-    js-yaml "^3.13.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.14"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.3"
-    progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^6.1.2"
-    strip-ansi "^5.2.0"
-    strip-json-comments "^3.0.1"
-    table "^5.2.3"
-    text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
-
-espree@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
-  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.1.0"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esquery@^1.0.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
-  dependencies:
-    estraverse "^5.1.0"
-
-esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-eventemitter2@^6.4.2:
-  version "6.4.7"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d"
-  integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==
-
-execa@^4.0.2, execa@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
-  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
-  dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
-
-executable@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
-  integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==
-  dependencies:
-    pify "^2.2.0"
-
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-  integrity sha512-MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==
-
-extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
-extract-zip@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
-  dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
-    yauzl "^2.10.0"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
-
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-diff@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-
-fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
-
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
-  dependencies:
-    pend "~1.2.0"
-
-figures@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
-  dependencies:
-    flat-cache "^2.0.1"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-find-versions@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965"
-  integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==
-  dependencies:
-    semver-regex "^3.1.2"
-
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
-  dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
-
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-fs-extra@^9.0.1:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
-  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
-get-own-enumerable-property-symbols@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
-  integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
-
-get-stream@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
-
-getos@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
-  integrity sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==
-  dependencies:
-    async "^3.2.0"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-parent@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@^7.1.1, glob@^7.1.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-dirs@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d"
-  integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==
-  dependencies:
-    ini "1.3.7"
-
-globals@^12.1.0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
-  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
-  dependencies:
-    type-fest "^0.8.1"
-
-graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-history@*:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
-  integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
-  dependencies:
-    "@babel/runtime" "^7.7.6"
-
-http-signature@~1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
-  integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^2.0.2"
-    sshpk "^1.14.1"
-
-human-signals@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
-  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
-
-husky@^4.2.5:
-  version "4.3.8"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d"
-  integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==
-  dependencies:
-    chalk "^4.0.0"
-    ci-info "^2.0.0"
-    compare-versions "^3.6.0"
-    cosmiconfig "^7.0.0"
-    find-versions "^4.0.0"
-    opencollective-postinstall "^2.0.2"
-    pkg-dir "^5.0.0"
-    please-upgrade-node "^3.2.0"
-    slash "^3.0.0"
-    which-pm-runs "^1.0.0"
-
-iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-import-fresh@^3.0.0, import-fresh@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-indent-string@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.3, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-ini@1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
-  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
-
-inquirer@^7.0.0:
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
-  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.19"
-    mute-stream "0.0.8"
-    run-async "^2.4.0"
-    rxjs "^6.6.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
-
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
-is-core-module@^2.9.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
-  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
-  dependencies:
-    has "^1.0.3"
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-glob@^4.0.0, is-glob@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-installed-globally@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
-  integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
-  dependencies:
-    global-dirs "^2.0.1"
-    is-path-inside "^3.0.1"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==
-
-is-observable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
-  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
-  dependencies:
-    symbol-observable "^1.1.0"
-
-is-path-inside@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
-is-promise@^2.1.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
-  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
-
-is-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
-  integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==
-
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
-
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
-
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
-
-jest-diff@^24.3.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
-  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
-  dependencies:
-    chalk "^2.0.1"
-    diff-sequences "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
-jest-docblock@^21.0.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
-  integrity sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==
-
-jest-get-type@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
-  integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
-
-jest-raw-loader@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz#ce9f56d54650f157c4a7d16d224ba5d613bcd626"
-  integrity sha512-g9oaAjeC4/rIJk1Wd3RxVbOfMizowM7LSjEJqa4R9qDX0OjQNABXOhH+GaznUp+DjTGVPi2vPPbQXyX87DOnYg==
-
-jest-util@^26.1.0:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
-  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    is-ci "^2.0.0"
-    micromatch "^4.0.2"
-
-joi@*:
-  version "17.6.0"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2"
-  integrity sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw==
-  dependencies:
-    "@hapi/hoek" "^9.0.0"
-    "@hapi/topo" "^5.0.0"
-    "@sideway/address" "^4.1.3"
-    "@sideway/formula" "^3.0.0"
-    "@sideway/pinpoint" "^2.0.0"
-
-js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
-
-json-parse-even-better-errors@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.4.0, json-schema@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
-
-json5@2.x:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsprim@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"
-  integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
-lazy-ass@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
-  integrity sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==
-
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-lines-and-columns@^1.1.6:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
-  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
-
-lint-staged@^10.2.0:
-  version "10.5.4"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.4.tgz#cd153b5f0987d2371fc1d2847a409a2fe705b665"
-  integrity sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg==
-  dependencies:
-    chalk "^4.1.0"
-    cli-truncate "^2.1.0"
-    commander "^6.2.0"
-    cosmiconfig "^7.0.0"
-    debug "^4.2.0"
-    dedent "^0.7.0"
-    enquirer "^2.3.6"
-    execa "^4.1.0"
-    listr2 "^3.2.2"
-    log-symbols "^4.0.0"
-    micromatch "^4.0.2"
-    normalize-path "^3.0.0"
-    please-upgrade-node "^3.2.0"
-    string-argv "0.3.1"
-    stringify-object "^3.3.0"
-
-listr-silent-renderer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-  integrity sha512-L26cIFm7/oZeSNVhWB6faeorXhMg4HNlb/dS/7jHhr708jxlXrtrBWo4YUxZQkc6dGoxEAe6J/D3juTRBUzjtA==
-
-listr-update-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
-  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
-  dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^2.3.0"
-    strip-ansi "^3.0.1"
-
-listr-verbose-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
-  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
-  dependencies:
-    chalk "^2.4.1"
-    cli-cursor "^2.1.0"
-    date-fns "^1.27.2"
-    figures "^2.0.0"
-
-listr2@^3.2.2:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e"
-  integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==
-  dependencies:
-    cli-truncate "^2.1.0"
-    colorette "^2.0.16"
-    log-update "^4.0.0"
-    p-map "^4.0.0"
-    rfdc "^1.3.0"
-    rxjs "^7.5.1"
-    through "^2.3.8"
-    wrap-ansi "^7.0.0"
-
-listr@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
-  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
-  dependencies:
-    "@samverschueren/stream-to-observable" "^0.3.0"
-    is-observable "^1.1.0"
-    is-promise "^2.1.0"
-    is-stream "^1.1.0"
-    listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.5.0"
-    listr-verbose-renderer "^0.5.0"
-    p-map "^2.0.0"
-    rxjs "^6.3.3"
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
-lodash.once@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
-
-lodash@4.x, lodash@^4.17.14, lodash@^4.17.19:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-log-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  integrity sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ==
-  dependencies:
-    chalk "^1.0.0"
-
-log-symbols@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
-  dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
-
-log-update@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==
-  dependencies:
-    ansi-escapes "^3.0.0"
-    cli-cursor "^2.0.0"
-    wrap-ansi "^3.0.1"
-
-log-update@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
-  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
-  dependencies:
-    ansi-escapes "^4.3.0"
-    cli-cursor "^3.1.0"
-    slice-ansi "^4.0.0"
-    wrap-ansi "^6.2.0"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-make-error@1.x, make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-micromatch@^4.0.2:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
-  dependencies:
-    braces "^3.0.2"
-    picomatch "^2.3.1"
-
-mime-db@1.52.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-minimatch@^3.0.4, minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.2.5, minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
-mkdirp@1.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
-
-moment@^2.27.0:
-  version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-mutationobserver-shim@^0.3.3:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz#8bf633b0c0b0291a1107255ed32c13088a8c5bf3"
-  integrity sha512-oRIDTyZQU96nAiz2AQyngwx1e89iApl2hN5AOYwyxLUB47UYsU3Wv9lJWqH5y/QdiYkc5HQLi23ZNB3fELdHcQ==
-
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-normalize-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-npm-run-path@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
-
-object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==
-
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==
-  dependencies:
-    mimic-fn "^1.0.0"
-
-onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-opencollective-postinstall@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
-  integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
-
-optionator@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
-
-ospath@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
-  integrity sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==
-
-p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-p-map@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-parse-json@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
-
-path-key@^3.0.0, path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
-
-picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pify@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
-
-pkg-dir@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
-  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
-  dependencies:
-    find-up "^5.0.0"
-
-please-upgrade-node@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
-  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
-  dependencies:
-    semver-compare "^1.0.0"
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
-
-pretty-bytes@^5.4.1:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
-  integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
-
-pretty-format@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
-  integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    ansi-regex "^4.0.0"
-    ansi-styles "^3.2.0"
-    react-is "^16.8.4"
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
-psl@^1.1.28:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
-  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
-
-ramda@~0.26.1:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
-  integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
-
-react-double-scrollbar@^0.0.15:
-  version "0.0.15"
-  resolved "https://registry.yarnpkg.com/react-double-scrollbar/-/react-double-scrollbar-0.0.15.tgz#e915ab8cb3b959877075f49436debfdb04288fe4"
-  integrity sha512-dLz3/WBIpgFnzFY0Kb4aIYBMT2BWomHuW2DH6/9jXfS6/zxRRBUFQ04My4HIB7Ma7QoRBpcy8NtkPeFgcGBpgg==
-
-react-is@^16.8.4:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-readable-stream@^2.2.2:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-regenerator-runtime@^0.13.4:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
-
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
-request-progress@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
-  integrity sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==
-  dependencies:
-    throttleit "^1.0.0"
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve@^1.3.2:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
-  dependencies:
-    is-core-module "^2.9.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  integrity sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==
-  dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
-
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
-rfdc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
-
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
-rxjs@^6.3.3, rxjs@^6.6.0:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^7.5.1:
-  version "7.5.6"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz#0446577557862afd6903517ce7cae79ecb9662bc"
-  integrity sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==
-  dependencies:
-    tslib "^2.1.0"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.2:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-semver-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
-
-semver-regex@^3.1.2:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.4.tgz#13053c0d4aa11d070a2f2872b6b1e3ae1e1971b4"
-  integrity sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA==
-
-semver@7.x:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^5.3.0, semver@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@^6.1.2:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-signal-exit@^3.0.2:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-  integrity sha512-up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw==
-
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
-  dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
-
-slice-ansi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
-  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
-source-map-support@^0.5.17:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
-sshpk@^1.14.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-string-argv@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
-  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-stringify-object@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
-  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
-  dependencies:
-    get-own-enumerable-property-symbols "^3.0.0"
-    is-obj "^1.0.1"
-    is-regexp "^1.0.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
-strip-json-comments@^3.0.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.1.0, supports-color@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-symbol-observable@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
-table@^5.2.3:
-  version "5.4.6"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
-  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
-  dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
-
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
-throttleit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
-  integrity sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==
-
-through@^2.3.6, through@^2.3.8:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
-tmp@~0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-ts-jest@^26.1.0:
-  version "26.5.6"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.6.tgz#c32e0746425274e1dfe333f43cd3c800e014ec35"
-  integrity sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA==
-  dependencies:
-    bs-logger "0.x"
-    buffer-from "1.x"
-    fast-json-stable-stringify "2.x"
-    jest-util "^26.1.0"
-    json5 "2.x"
-    lodash "4.x"
-    make-error "1.x"
-    mkdirp "1.x"
-    semver "7.x"
-    yargs-parser "20.x"
-
-ts-node@^8.9.1:
-  version "8.10.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d"
-  integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==
-  dependencies:
-    arg "^4.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    source-map-support "^0.5.17"
-    yn "3.1.1"
-
-tslib@^1.13.0, tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tslib@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
-
-tslint-config-prettier@^1.18.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37"
-  integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==
-
-tslint-plugin-prettier@^2.0.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz#73fe71bf9f03842ac48c104122ca9b1de012ecf4"
-  integrity sha512-F9e4K03yc9xuvv+A0v1EmjcnDwpz8SpCD8HzqSDe0eyg34cBinwn9JjmnnRrNAs4HdleRQj7qijp+P/JTxt4vA==
-  dependencies:
-    eslint-plugin-prettier "^2.2.0"
-    lines-and-columns "^1.1.6"
-    tslib "^1.7.1"
-
-tslint@^6.1.2:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904"
-  integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^4.0.1"
-    glob "^7.1.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.3"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.13.0"
-    tsutils "^2.29.0"
-
-tsutils@^2.29.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
-  dependencies:
-    tslib "^1.8.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
-  dependencies:
-    prelude-ls "~1.1.2"
-
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
-
-universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
-
-untildify@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
-  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
-
-uuid@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-v8-compile-cache@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-which-pm-runs@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.1.0.tgz#35ccf7b1a0fce87bd8b92a478c9d045785d3bf35"
-  integrity sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==
-
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-wrap-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yaml@^1.10.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
-yargs-parser@20.x:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
-yauzl@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
-
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==